From fedora-extras-commits at redhat.com Wed Nov 1 00:14:50 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 31 Oct 2006 17:14:50 -0700 Subject: rpms/darcs/devel darcs.spec,1.13,1.14 Message-ID: <200611010014.kA10EoU1006854@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6828 Modified Files: darcs.spec Log Message: rebuild for new libcurl Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- darcs.spec 28 Sep 2006 05:09:19 -0000 1.13 +++ darcs.spec 1 Nov 2006 00:14:20 -0000 1.14 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -89,6 +89,9 @@ %changelog +* Wed Nov 1 2006 Jens Petersen - 1.0.8-4 +- rebuild for new libcurl + * Thu Sep 28 2006 Jens Petersen - 1.0.8-3 - rebuild for FC6 - enable make check From fedora-extras-commits at redhat.com Wed Nov 1 00:29:22 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 31 Oct 2006 17:29:22 -0700 Subject: rpms/dap-freeform_handler/devel dap-freeform_handler.spec,1.8,1.9 Message-ID: <200611010029.kA10TMGS006950@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-freeform_handler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6929 Modified Files: dap-freeform_handler.spec Log Message: * Tue Oct 31 2006 Patrice Dumas 3.7.2-3 - rebuild for new libcurl soname (indirect dependency through libdap) Index: dap-freeform_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/dap-freeform_handler.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dap-freeform_handler.spec 4 Oct 2006 22:46:12 -0000 1.8 +++ dap-freeform_handler.spec 1 Nov 2006 00:28:52 -0000 1.9 @@ -1,7 +1,7 @@ Summary: FreeForm data handler for the OPeNDAP Data server Name: dap-freeform_handler Version: 3.7.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/freeform_handler-%{version}.tar.gz @@ -44,8 +44,11 @@ %doc COPYING COPYRIGHT NEWS README %changelog +* Tue Oct 31 2006 Patrice Dumas 3.7.2-3 +- rebuild for new libcurl soname (indirect dependency through libdap) + * Thu Oct 05 2006 Christian Iseli 3.7.2-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 * Wed Sep 20 2006 Patrice Dumas 3.7.2-1 - update to 3.7.2 From fedora-extras-commits at redhat.com Wed Nov 1 00:31:25 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 31 Oct 2006 17:31:25 -0700 Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler.spec,1.12,1.13 Message-ID: <200611010031.kA10VPeS007043@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018 Modified Files: dap-hdf4_handler.spec Log Message: * Tue Oct 31 2006 Patrice Dumas 3.7.2-4 - rebuild for new libcurl soname (indirect dependency through libdap) Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dap-hdf4_handler.spec 4 Oct 2006 22:44:55 -0000 1.12 +++ dap-hdf4_handler.spec 1 Nov 2006 00:30:55 -0000 1.13 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.7.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -20,7 +20,7 @@ %setup -q -n hdf4_handler-%{version} %build -%configure --disable-static +%configure make %{?_smp_mflags} %install @@ -37,8 +37,11 @@ %doc README %changelog +* Tue Oct 31 2006 Patrice Dumas 3.7.2-4 +- rebuild for new libcurl soname (indirect dependency through libdap) + * Thu Oct 05 2006 Christian Iseli 3.7.2-3 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Wed Sep 20 2006 Patrice Dumas 3.7.2-2 - update to 3.7.2 From fedora-extras-commits at redhat.com Wed Nov 1 00:33:44 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Tue, 31 Oct 2006 17:33:44 -0700 Subject: rpms/grads/devel grads.spec,1.17,1.18 Message-ID: <200611010033.kA10XikR007115@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/grads/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7090 Modified Files: grads.spec Log Message: * Tue Oct 31 2006 Patrice Dumas 1.9b4-18 - rebuild for new libcurl soname (indirect dependency through libnc-dap) Index: grads.spec =================================================================== RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- grads.spec 4 Oct 2006 22:36:59 -0000 1.17 +++ grads.spec 1 Nov 2006 00:33:14 -0000 1.18 @@ -1,6 +1,6 @@ Name: grads Version: 1.9b4 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Tool for easy acces, manipulation, and visualization of data Group: Applications/Engineering @@ -107,8 +107,11 @@ %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary %changelog +* Tue Oct 31 2006 Patrice Dumas 1.9b4-18 +- rebuild for new libcurl soname (indirect dependency through libnc-dap) + * Thu Oct 05 2006 Christian Iseli 1.9b4-17 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Wed Sep 20 2006 Patrice Dumas 1.9b4-16 - rebuild against libdap 3.7.2 From fedora-extras-commits at redhat.com Wed Nov 1 02:01:37 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 31 Oct 2006 19:01:37 -0700 Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.2,1.3 Message-ID: <200611010201.kA121bQY013464@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/eclipse-emf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10536 Modified Files: eclipse-emf.spec Log Message: * Tue Oct 31 2006 Andrew Overholt 2.2.1-1 - Change usage of copy-platform to work with upcoming changes to SDK. - Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation. Index: eclipse-emf.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-emf.spec 30 Oct 2006 17:53:31 -0000 1.2 +++ eclipse-emf.spec 1 Nov 2006 02:01:06 -0000 1.3 @@ -144,7 +144,7 @@ homedir=$(cd home > /dev/null && pwd) # See comments in the script to understand this. -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} +/bin/sh -x %{eclipse_base}/buildscripts/copy-platform `pwd`/SDK %{eclipse_base} SDK=$(cd SDK > /dev/null && pwd) # Build the EMF builder helper jars @@ -165,6 +165,7 @@ java -cp %{eclipse_base}/startup.jar \ -Duser.home=$homedir \ + -Dosgi.sharedConfiguration.area=$SDK/fragments/eclipse/configuration \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ -Dtype=plugin \ @@ -501,6 +502,10 @@ %doc %{_datadir}/java/emf/readme_standalone.html %changelog +* Tue Oct 31 2006 Andrew Overholt 2.2.1-1 +- Change usage of copy-platform to work with upcoming changes to SDK. +- Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation. + * Thu Oct 19 2006 Andrew Overholt 2.2.1-1 - 2.2.1. - Add sdk package, fix up inter-dependencies to match upstream. From fedora-extras-commits at redhat.com Wed Nov 1 02:02:45 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Tue, 31 Oct 2006 19:02:45 -0700 Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.3,1.4 Message-ID: <200611010202.kA122j6L013492@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/eclipse-emf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472 Modified Files: eclipse-emf.spec Log Message: Bump release. Index: eclipse-emf.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-emf.spec 1 Nov 2006 02:01:06 -0000 1.3 +++ eclipse-emf.spec 1 Nov 2006 02:02:15 -0000 1.4 @@ -8,7 +8,7 @@ Summary: Eclipse Modeling Framework (EMF) Name: eclipse-emf Version: %{major}.%{minor}.%{micro} -Release: 1%{?dist} +Release: 2%{?dist} License: Eclipse Public License Group: System Environment/Libraries URL: http://www.eclipse.org/emf/ @@ -502,7 +502,7 @@ %doc %{_datadir}/java/emf/readme_standalone.html %changelog -* Tue Oct 31 2006 Andrew Overholt 2.2.1-1 +* Tue Oct 31 2006 Andrew Overholt 2.2.1-2 - Change usage of copy-platform to work with upcoming changes to SDK. - Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation. From fedora-extras-commits at redhat.com Wed Nov 1 02:36:54 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 31 Oct 2006 19:36:54 -0700 Subject: rpms/quarry/FC-3 .cvsignore, 1.3, 1.4 quarry.spec, 1.3, 1.4 sources, 1.3, 1.4 gtp-client.diff, 1.1, NONE Message-ID: <200611010236.kA12ask1013908@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/quarry/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/FC-3 Modified Files: .cvsignore quarry.spec sources Removed Files: gtp-client.diff Log Message: Update to 0.1.20 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Oct 2006 13:34:11 -0000 1.3 +++ .cvsignore 1 Nov 2006 02:36:24 -0000 1.4 @@ -1 +1 @@ -quarry-0.1.19.tar.gz +quarry-0.1.20.tar.gz Index: quarry.spec =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-3/quarry.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- quarry.spec 10 Oct 2006 00:35:01 -0000 1.3 +++ quarry.spec 1 Nov 2006 02:36:24 -0000 1.4 @@ -1,23 +1,20 @@ Name: quarry -Version: 0.1.19 -Release: 2%{?dist} +Version: 0.1.20 +Release: 1%{?dist} Summary: A multi-purpose board game GUI Group: Amusements/Games License: GPL URL: http://home.gna.org/quarry/ Source0: http://download.gna.org/quarry/quarry-%{version}.tar.gz -Patch0: gtp-client.diff -#Source0: quarry-%{version}.tar.bz2 -#Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils BuildRequires: librsvg2-devel -BuildRequires: scrollkeeper +BuildRequires: scrollkeeper #Requires: -Requires(post): scrollkeeper -Requires(postun): scrollkeeper +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description Quarry is a multi-purpose GUI for several board games, at present Go, Amazons @@ -29,7 +26,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -44,10 +40,10 @@ # desktop file #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop %find_lang %{name} @@ -74,6 +70,9 @@ %changelog +* Tue Oct 31 2006 Michel Salim - 0.1.20-1 +- Update to 0.1.20 + * Mon Oct 9 2006 Michel Salim - 0.1.19-2 - Incorporated upstream patch to fix gtp-client string handling Index: sources =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Oct 2006 13:34:11 -0000 1.3 +++ sources 1 Nov 2006 02:36:24 -0000 1.4 @@ -1 +1 @@ -15314b4ec4f0c4bb5d0c7205e4a77f2e quarry-0.1.19.tar.gz +c731ca556e356635b3140d3efe2ded80 quarry-0.1.20.tar.gz --- gtp-client.diff DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 02:36:55 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 31 Oct 2006 19:36:55 -0700 Subject: rpms/quarry/FC-4 .cvsignore, 1.3, 1.4 quarry.spec, 1.3, 1.4 sources, 1.3, 1.4 gtp-client.diff, 1.1, NONE Message-ID: <200611010236.kA12at6E013913@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/quarry/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/FC-4 Modified Files: .cvsignore quarry.spec sources Removed Files: gtp-client.diff Log Message: Update to 0.1.20 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Oct 2006 13:34:12 -0000 1.3 +++ .cvsignore 1 Nov 2006 02:36:25 -0000 1.4 @@ -1 +1 @@ -quarry-0.1.19.tar.gz +quarry-0.1.20.tar.gz Index: quarry.spec =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-4/quarry.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- quarry.spec 10 Oct 2006 00:35:02 -0000 1.3 +++ quarry.spec 1 Nov 2006 02:36:25 -0000 1.4 @@ -1,23 +1,20 @@ Name: quarry -Version: 0.1.19 -Release: 2%{?dist} +Version: 0.1.20 +Release: 1%{?dist} Summary: A multi-purpose board game GUI Group: Amusements/Games License: GPL URL: http://home.gna.org/quarry/ Source0: http://download.gna.org/quarry/quarry-%{version}.tar.gz -Patch0: gtp-client.diff -#Source0: quarry-%{version}.tar.bz2 -#Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils BuildRequires: librsvg2-devel -BuildRequires: scrollkeeper +BuildRequires: scrollkeeper #Requires: -Requires(post): scrollkeeper -Requires(postun): scrollkeeper +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description Quarry is a multi-purpose GUI for several board games, at present Go, Amazons @@ -29,7 +26,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -44,10 +40,10 @@ # desktop file #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop %find_lang %{name} @@ -74,6 +70,9 @@ %changelog +* Tue Oct 31 2006 Michel Salim - 0.1.20-1 +- Update to 0.1.20 + * Mon Oct 9 2006 Michel Salim - 0.1.19-2 - Incorporated upstream patch to fix gtp-client string handling Index: sources =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Oct 2006 13:34:12 -0000 1.3 +++ sources 1 Nov 2006 02:36:25 -0000 1.4 @@ -1 +1 @@ -15314b4ec4f0c4bb5d0c7205e4a77f2e quarry-0.1.19.tar.gz +c731ca556e356635b3140d3efe2ded80 quarry-0.1.20.tar.gz --- gtp-client.diff DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 02:37:01 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 31 Oct 2006 19:37:01 -0700 Subject: rpms/quarry/FC-5 .cvsignore, 1.3, 1.4 quarry.spec, 1.4, 1.5 sources, 1.3, 1.4 gtp-client.diff, 1.1, NONE Message-ID: <200611010237.kA12b1Tt013918@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/quarry/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/FC-5 Modified Files: .cvsignore quarry.spec sources Removed Files: gtp-client.diff Log Message: Update to 0.1.20 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Oct 2006 13:34:17 -0000 1.3 +++ .cvsignore 1 Nov 2006 02:36:31 -0000 1.4 @@ -1 +1 @@ -quarry-0.1.19.tar.gz +quarry-0.1.20.tar.gz Index: quarry.spec =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-5/quarry.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- quarry.spec 10 Oct 2006 00:35:03 -0000 1.4 +++ quarry.spec 1 Nov 2006 02:36:31 -0000 1.5 @@ -1,23 +1,20 @@ Name: quarry -Version: 0.1.19 -Release: 2%{?dist} +Version: 0.1.20 +Release: 1%{?dist} Summary: A multi-purpose board game GUI Group: Amusements/Games License: GPL URL: http://home.gna.org/quarry/ Source0: http://download.gna.org/quarry/quarry-%{version}.tar.gz -Patch0: gtp-client.diff -#Source0: quarry-%{version}.tar.bz2 -#Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils BuildRequires: librsvg2-devel -BuildRequires: scrollkeeper +BuildRequires: scrollkeeper #Requires: -Requires(post): scrollkeeper -Requires(postun): scrollkeeper +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description Quarry is a multi-purpose GUI for several board games, at present Go, Amazons @@ -29,7 +26,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -44,10 +40,10 @@ # desktop file #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop %find_lang %{name} @@ -74,6 +70,9 @@ %changelog +* Tue Oct 31 2006 Michel Salim - 0.1.20-1 +- Update to 0.1.20 + * Mon Oct 9 2006 Michel Salim - 0.1.19-2 - Incorporated upstream patch to fix gtp-client string handling Index: sources =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Oct 2006 13:34:17 -0000 1.3 +++ sources 1 Nov 2006 02:36:31 -0000 1.4 @@ -1 +1 @@ -15314b4ec4f0c4bb5d0c7205e4a77f2e quarry-0.1.19.tar.gz +c731ca556e356635b3140d3efe2ded80 quarry-0.1.20.tar.gz --- gtp-client.diff DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 02:37:02 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 31 Oct 2006 19:37:02 -0700 Subject: rpms/quarry/FC-6 .cvsignore, 1.3, 1.4 quarry.spec, 1.4, 1.5 sources, 1.3, 1.4 gtp-client.diff, 1.1, NONE Message-ID: <200611010237.kA12b2qG013923@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/quarry/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/FC-6 Modified Files: .cvsignore quarry.spec sources Removed Files: gtp-client.diff Log Message: Update to 0.1.20 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Oct 2006 13:34:18 -0000 1.3 +++ .cvsignore 1 Nov 2006 02:36:31 -0000 1.4 @@ -1 +1 @@ -quarry-0.1.19.tar.gz +quarry-0.1.20.tar.gz Index: quarry.spec =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-6/quarry.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- quarry.spec 10 Oct 2006 00:35:03 -0000 1.4 +++ quarry.spec 1 Nov 2006 02:36:31 -0000 1.5 @@ -1,23 +1,20 @@ Name: quarry -Version: 0.1.19 -Release: 2%{?dist} +Version: 0.1.20 +Release: 1%{?dist} Summary: A multi-purpose board game GUI Group: Amusements/Games License: GPL URL: http://home.gna.org/quarry/ Source0: http://download.gna.org/quarry/quarry-%{version}.tar.gz -Patch0: gtp-client.diff -#Source0: quarry-%{version}.tar.bz2 -#Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils BuildRequires: librsvg2-devel -BuildRequires: scrollkeeper +BuildRequires: scrollkeeper #Requires: -Requires(post): scrollkeeper -Requires(postun): scrollkeeper +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description Quarry is a multi-purpose GUI for several board games, at present Go, Amazons @@ -29,7 +26,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -44,10 +40,10 @@ # desktop file #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop %find_lang %{name} @@ -74,6 +70,9 @@ %changelog +* Tue Oct 31 2006 Michel Salim - 0.1.20-1 +- Update to 0.1.20 + * Mon Oct 9 2006 Michel Salim - 0.1.19-2 - Incorporated upstream patch to fix gtp-client string handling Index: sources =================================================================== RCS file: /cvs/extras/rpms/quarry/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Oct 2006 13:34:18 -0000 1.3 +++ sources 1 Nov 2006 02:36:31 -0000 1.4 @@ -1 +1 @@ -15314b4ec4f0c4bb5d0c7205e4a77f2e quarry-0.1.19.tar.gz +c731ca556e356635b3140d3efe2ded80 quarry-0.1.20.tar.gz --- gtp-client.diff DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 02:37:07 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Tue, 31 Oct 2006 19:37:07 -0700 Subject: rpms/quarry/devel .cvsignore, 1.3, 1.4 quarry.spec, 1.4, 1.5 sources, 1.3, 1.4 gtp-client.diff, 1.1, NONE Message-ID: <200611010237.kA12b7nN013928@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/quarry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/devel Modified Files: .cvsignore quarry.spec sources Removed Files: gtp-client.diff Log Message: Update to 0.1.20 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quarry/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Oct 2006 13:34:18 -0000 1.3 +++ .cvsignore 1 Nov 2006 02:36:37 -0000 1.4 @@ -1 +1 @@ -quarry-0.1.19.tar.gz +quarry-0.1.20.tar.gz Index: quarry.spec =================================================================== RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- quarry.spec 10 Oct 2006 00:35:03 -0000 1.4 +++ quarry.spec 1 Nov 2006 02:36:37 -0000 1.5 @@ -1,23 +1,20 @@ Name: quarry -Version: 0.1.19 -Release: 2%{?dist} +Version: 0.1.20 +Release: 1%{?dist} Summary: A multi-purpose board game GUI Group: Amusements/Games License: GPL URL: http://home.gna.org/quarry/ Source0: http://download.gna.org/quarry/quarry-%{version}.tar.gz -Patch0: gtp-client.diff -#Source0: quarry-%{version}.tar.bz2 -#Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils BuildRequires: librsvg2-devel -BuildRequires: scrollkeeper +BuildRequires: scrollkeeper #Requires: -Requires(post): scrollkeeper -Requires(postun): scrollkeeper +Requires(post): scrollkeeper +Requires(postun): scrollkeeper %description Quarry is a multi-purpose GUI for several board games, at present Go, Amazons @@ -29,7 +26,6 @@ %prep %setup -q -%patch0 -p1 %build @@ -44,10 +40,10 @@ # desktop file #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop %find_lang %{name} @@ -74,6 +70,9 @@ %changelog +* Tue Oct 31 2006 Michel Salim - 0.1.20-1 +- Update to 0.1.20 + * Mon Oct 9 2006 Michel Salim - 0.1.19-2 - Incorporated upstream patch to fix gtp-client string handling Index: sources =================================================================== RCS file: /cvs/extras/rpms/quarry/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Oct 2006 13:34:18 -0000 1.3 +++ sources 1 Nov 2006 02:36:37 -0000 1.4 @@ -1 +1 @@ -15314b4ec4f0c4bb5d0c7205e4a77f2e quarry-0.1.19.tar.gz +c731ca556e356635b3140d3efe2ded80 quarry-0.1.20.tar.gz --- gtp-client.diff DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 02:51:12 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 31 Oct 2006 19:51:12 -0700 Subject: rpms/scim-input-pad/devel scim-input-pad.spec,1.8,1.9 Message-ID: <200611010251.kA12pCVG014189@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-input-pad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171 Modified Files: scim-input-pad.spec Log Message: - run autoconf for scim-input-pad-libexecdir.patch - remove %%with_libstdc_preview Index: scim-input-pad.spec =================================================================== RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-input-pad.spec 16 Sep 2006 15:52:34 -0000 1.8 +++ scim-input-pad.spec 1 Nov 2006 02:50:42 -0000 1.9 @@ -1,8 +1,6 @@ -%define with_libstdc_preview 0 - Name: scim-input-pad Version: 0.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: On-screen Input Pad for SCIM Group: System Environment/Libraries @@ -15,9 +13,8 @@ Patch1: scim-input-pad-libexecdir.patch BuildRequires: scim-devel -%if %{with_libstdc_preview} -Buildrequires: libstdc++so7-devel -%endif +# patch1 touches configure.ac +BuildRequires: autoconf Requires: scim %description @@ -27,25 +24,16 @@ %setup -q %patch0 -p0 -b .0-rpath %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 --disable-rpath -%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 DESTDIR=${RPM_BUILD_ROOT} install rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/Helper/input-pad.la @@ -75,6 +63,10 @@ %changelog +* Wed Nov 1 2006 Jens Petersen - 0.1.1-7 +- run autoconf for scim-input-pad-libexecdir.patch +- remove %%with_libstdc_preview + * Sun Sep 17 2006 Ryo Dairiki - 0.1.1-6 - mass rebuilding From fedora-extras-commits at redhat.com Wed Nov 1 02:53:18 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 31 Oct 2006 19:53:18 -0700 Subject: rpms/scim-input-pad/FC-6 scim-input-pad.spec,1.8,1.9 Message-ID: <200611010253.kA12rIRQ014256@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-input-pad/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14238 Modified Files: scim-input-pad.spec Log Message: - run autoconf for scim-input-pad-libexecdir.patch - remove %%with_libstdc_preview Index: scim-input-pad.spec =================================================================== RCS file: /cvs/extras/rpms/scim-input-pad/FC-6/scim-input-pad.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-input-pad.spec 16 Sep 2006 15:52:34 -0000 1.8 +++ scim-input-pad.spec 1 Nov 2006 02:52:48 -0000 1.9 @@ -1,8 +1,6 @@ -%define with_libstdc_preview 0 - Name: scim-input-pad Version: 0.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: On-screen Input Pad for SCIM Group: System Environment/Libraries @@ -15,9 +13,8 @@ Patch1: scim-input-pad-libexecdir.patch BuildRequires: scim-devel -%if %{with_libstdc_preview} -Buildrequires: libstdc++so7-devel -%endif +# patch1 touches configure.ac +BuildRequires: autoconf Requires: scim %description @@ -27,25 +24,16 @@ %setup -q %patch0 -p0 -b .0-rpath %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 --disable-rpath -%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 DESTDIR=${RPM_BUILD_ROOT} install rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/Helper/input-pad.la @@ -75,6 +63,10 @@ %changelog +* Wed Nov 1 2006 Jens Petersen - 0.1.1-7 +- run autoconf for scim-input-pad-libexecdir.patch +- remove %%with_libstdc_preview + * Sun Sep 17 2006 Ryo Dairiki - 0.1.1-6 - mass rebuilding From fedora-extras-commits at redhat.com Wed Nov 1 02:56:49 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 31 Oct 2006 19:56:49 -0700 Subject: rpms/scim-input-pad/FC-5 scim-input-pad.spec,1.9,1.10 Message-ID: <200611010256.kA12unCj014326@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-input-pad/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14310 Modified Files: scim-input-pad.spec Log Message: - run autoconf for scim-input-pad-libexecdir.patch Index: scim-input-pad.spec =================================================================== RCS file: /cvs/extras/rpms/scim-input-pad/FC-5/scim-input-pad.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-input-pad.spec 4 Aug 2006 07:07:29 -0000 1.9 +++ scim-input-pad.spec 1 Nov 2006 02:56:19 -0000 1.10 @@ -2,7 +2,7 @@ Name: scim-input-pad Version: 0.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: On-screen Input Pad for SCIM Group: System Environment/Libraries @@ -15,6 +15,8 @@ Patch1: scim-input-pad-libexecdir.patch BuildRequires: scim-devel +# patch1 touches configure.ac +BuildRequires: autoconf %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif @@ -23,10 +25,13 @@ %description Scim-input-pad is an on-screen input pad used to input symbols easily. + %prep %setup -q %patch0 -p0 -b .0-rpath %patch1 -p1 -b .1-libexec +# patch1 touches configure.ac +autoconf %build @@ -75,6 +80,9 @@ %changelog +* Wed Nov 1 2006 Jens Petersen - 0.1.1-6.fc5 +- run autoconf for scim-input-pad-libexecdir.patch + * Fri Aug 4 2006 Jens Petersen - 0.1.1-5.fc5 - fix libexecdir in wrapper script for new module path - rebuild against new libstdc++so7 (#197718) From fedora-extras-commits at redhat.com Wed Nov 1 07:51:38 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 1 Nov 2006 00:51:38 -0700 Subject: rpms/deskbar-applet/devel .cvsignore, 1.14, 1.15 deskbar-applet.spec, 1.32, 1.33 sources, 1.14, 1.15 Message-ID: <200611010751.kA17pckN030204@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30184 Modified Files: .cvsignore deskbar-applet.spec sources Log Message: 2.16.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 1 Oct 2006 22:03:15 -0000 1.14 +++ .cvsignore 1 Nov 2006 07:51:07 -0000 1.15 @@ -1 +1 @@ -deskbar-applet-2.16.0.tar.bz2 +deskbar-applet-2.16.1.tar.bz2 Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- deskbar-applet.spec 28 Oct 2006 22:08:21 -0000 1.32 +++ deskbar-applet.spec 1 Nov 2006 07:51:07 -0000 1.33 @@ -2,8 +2,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 2.16.0 -Release: 2%{?dist} +Version: 2.16.1 +Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -91,6 +91,9 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Nov 1 2006 Luke Macken - 2.16.1-1 +- 2.16.1 + * Sat Oct 28 2006 Luke Macken - 2.16.0-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 1 Oct 2006 22:03:15 -0000 1.14 +++ sources 1 Nov 2006 07:51:07 -0000 1.15 @@ -1 +1 @@ -9f14a65f75142cd5b233bf9376a1f946 deskbar-applet-2.16.0.tar.bz2 +b236c4d3d70fbc20164ba208de84e5db deskbar-applet-2.16.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 1 08:31:09 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 1 Nov 2006 01:31:09 -0700 Subject: rpms/python-dialog/FC-6 python-dialog.spec,1.8,1.9 Message-ID: <200611010831.kA18V915000985@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/python-dialog/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930/FC-6 Modified Files: python-dialog.spec Log Message: unghost *.pyo files Index: python-dialog.spec =================================================================== RCS file: /cvs/extras/rpms/python-dialog/FC-6/python-dialog.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-dialog.spec 30 Aug 2006 16:35:31 -0000 1.8 +++ python-dialog.spec 1 Nov 2006 08:30:39 -0000 1.9 @@ -1,10 +1,8 @@ -%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()") %{!?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-dialog Version: 2.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python interface to the Unix dialog utility Group: Development/Languages @@ -15,7 +13,6 @@ BuildArch: noarch BuildRequires: python-devel -Requires: python-abi = %{pyver} Requires: dialog %description @@ -43,12 +40,13 @@ %files %defattr(-,root,root,-) %doc demo.py AUTHORS COPYING DEBUGGING README TODO -%{python_sitelib}/dialog.py -%{python_sitelib}/dialog.pyc -%ghost %{python_sitelib}/dialog.pyo +%{python_sitelib}/dialog.py* %changelog +* Wed Nov 01 2006 Aurelien Bompard 2.7-5 +- unghost .pyo file + * Wed Aug 30 2006 Aurelien Bompard 2.7-4 - rebuild From fedora-extras-commits at redhat.com Wed Nov 1 08:31:10 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 1 Nov 2006 01:31:10 -0700 Subject: rpms/python-dialog/devel python-dialog.spec,1.8,1.9 Message-ID: <200611010831.kA18VAR6000988@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/python-dialog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930/devel Modified Files: python-dialog.spec Log Message: unghost *.pyo files Index: python-dialog.spec =================================================================== RCS file: /cvs/extras/rpms/python-dialog/devel/python-dialog.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-dialog.spec 30 Aug 2006 16:35:31 -0000 1.8 +++ python-dialog.spec 1 Nov 2006 08:30:40 -0000 1.9 @@ -1,10 +1,8 @@ -%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()") %{!?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-dialog Version: 2.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python interface to the Unix dialog utility Group: Development/Languages @@ -15,7 +13,6 @@ BuildArch: noarch BuildRequires: python-devel -Requires: python-abi = %{pyver} Requires: dialog %description @@ -43,12 +40,13 @@ %files %defattr(-,root,root,-) %doc demo.py AUTHORS COPYING DEBUGGING README TODO -%{python_sitelib}/dialog.py -%{python_sitelib}/dialog.pyc -%ghost %{python_sitelib}/dialog.pyo +%{python_sitelib}/dialog.py* %changelog +* Wed Nov 01 2006 Aurelien Bompard 2.7-5 +- unghost .pyo file + * Wed Aug 30 2006 Aurelien Bompard 2.7-4 - rebuild From fedora-extras-commits at redhat.com Wed Nov 1 08:31:08 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 1 Nov 2006 01:31:08 -0700 Subject: rpms/python-dialog/FC-5 python-dialog.spec,1.7,1.8 Message-ID: <200611010831.kA18V8bA000982@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/python-dialog/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930/FC-5 Modified Files: python-dialog.spec Log Message: unghost *.pyo files Index: python-dialog.spec =================================================================== RCS file: /cvs/extras/rpms/python-dialog/FC-5/python-dialog.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-dialog.spec 22 Feb 2006 15:59:31 -0000 1.7 +++ python-dialog.spec 1 Nov 2006 08:30:38 -0000 1.8 @@ -1,10 +1,8 @@ -%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()") %{!?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-dialog Version: 2.7 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Python interface to the Unix dialog utility Group: Development/Languages @@ -15,7 +13,6 @@ BuildArch: noarch BuildRequires: python-devel -Requires: python-abi = %{pyver} Requires: dialog %description @@ -43,12 +40,16 @@ %files %defattr(-,root,root,-) %doc demo.py AUTHORS COPYING DEBUGGING README TODO -%{python_sitelib}/dialog.py -%{python_sitelib}/dialog.pyc -%ghost %{python_sitelib}/dialog.pyo +%{python_sitelib}/dialog.py* %changelog +* Wed Nov 01 2006 Aurelien Bompard 2.7-5 +- unghost .pyo file + +* Wed Aug 30 2006 Aurelien Bompard 2.7-4 +- rebuild + * Wed Feb 22 2006 Aurelien Bompard 2.7-3 - rebuild for FC5 From fedora-extras-commits at redhat.com Wed Nov 1 10:52:57 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 03:52:57 -0700 Subject: rpms/gdeskcal import.log,1.7,1.8 Message-ID: <200611011052.kA1AqvvR007557@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7524 Modified Files: import.log Log Message: auto-import gdeskcal-1.0-4 on branch FC-5 from gdeskcal-1.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Oct 2006 14:04:20 -0000 1.7 +++ import.log 1 Nov 2006 10:52:27 -0000 1.8 @@ -4,3 +4,4 @@ gdeskcal-0_57_1-5:HEAD:gdeskcal-0.57.1-5.src.rpm:1144665627 gdeskcal-0_57_1-5:FC-5:gdeskcal-0.57.1-5.src.rpm:1144665747 gdeskcal-1_0-2:HEAD:gdeskcal-1.0-2.src.rpm:1160316248 +gdeskcal-1_0-4:FC-5:gdeskcal-1.0-4.src.rpm:1162378335 From fedora-extras-commits at redhat.com Wed Nov 1 10:52:58 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 03:52:58 -0700 Subject: rpms/gdeskcal/FC-5 .cvsignore, 1.3, 1.4 gdeskcal.desktop, 1.2, 1.3 gdeskcal.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200611011052.kA1AqwQL007563@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7524/FC-5 Modified Files: .cvsignore gdeskcal.desktop gdeskcal.spec sources Log Message: auto-import gdeskcal-1.0-4 on branch FC-5 from gdeskcal-1.0-4.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:22:43 -0000 1.3 +++ .cvsignore 1 Nov 2006 10:52:28 -0000 1.4 @@ -1 +1 @@ -gDeskCal-0_57_1.tar.gz +gDeskCal-1.0.tar.gz Index: gdeskcal.desktop =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdeskcal.desktop 8 Nov 2004 04:22:43 -0000 1.2 +++ gdeskcal.desktop 1 Nov 2006 10:52:28 -0000 1.3 @@ -1,9 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=gDeskCal -Comment=Calendar program for the Gnome Desktop. +Name=gDeskcal +Comment=A desktop calendar Exec=gdeskcal Icon=gdeskcal.png Terminal=false Type=Application Categories=Application;Utility; +StartupNotify=true Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gdeskcal.spec 10 Apr 2006 10:42:40 -0000 1.9 +++ gdeskcal.spec 1 Nov 2006 10:52:28 -0000 1.10 @@ -1,11 +1,11 @@ Name: gdeskcal -Version: 0.57.1 -Release: 5%{?dist} +Version: 1.0 +Release: 4%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL URL: http://www.pycage.de/software_gdeskcal.html -Source0: http://www.pycage.de/download/gDeskCal-0_57_1.tar.gz +Source0: http://www.pycage.de/download/gDeskCal-1.0.tar.gz Source1: gdeskcal.png Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,45 +22,54 @@ transparency with smooth alpha-blending and its appearance can be changed completely by using skins. - %prep %setup -q -n gDeskCal-%{version} %build - +%configure +make %{?_smp_mflags} %install -rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/ -mkdir -p ${RPM_BUILD_ROOT}/%{_datadir} -cp -a code data po skins ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/ -cp -a locale ${RPM_BUILD_ROOT}/%{_datadir}/ -cp -a gdeskcal ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version} -mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}/ -ln -sf %{_libdir}/%{name}-%{version}/gdeskcal ${RPM_BUILD_ROOT}/%{_bindir}/ -install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gdeskcal.png -%find_lang %{name} +rm -rf %{buildroot} +install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png +make DESTDIR=%{buildroot} install desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ +%if "%{?fedora}" <= "6" --add-category X-Fedora \ +%endif %{SOURCE2} +%find_lang gdesklets -%clean -rm -rf ${RPM_BUILD_ROOT} +%post +update-desktop-database &> /dev/null ||: + +%postun +update-desktop-database &> /dev/null ||: +%clean +rm -rf %{buildroot} -%files -f %{name}.lang +%files -f gdesklets.lang %defattr(-,root,root,-) -%doc AUTHORS LICENSE NEWS README README.i18n README.skins +%doc AUTHORS NEWS README %{_bindir}/gdeskcal %{_datadir}/applications/fedora-%{name}.desktop +%exclude %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_libdir}/%{name}-%{version} - +%{_libdir}/%{name}/ %changelog +* Wed Nov 01 2006 Paul F. Johnson 1.0-4 +- added post and postun +- conditional for the X-Fedora in the desktop icon +- fixed the spec file + +* Sat Oct 07 2006 Paul F. Johnson 1.0-1 +- bump to new version + * Fri Apr 7 2006 Paul F. Johnson 0.5.7.1-5 - rebuilt - minor spec changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:22:43 -0000 1.3 +++ sources 1 Nov 2006 10:52:28 -0000 1.4 @@ -1 +1 @@ -c2c1de1046e9026558c51e90fe6f8a9e gDeskCal-0_57_1.tar.gz +eddbf6387b9937c067e9c437f1abfacf gDeskCal-1.0.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 10:54:22 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 03:54:22 -0700 Subject: rpms/gdeskcal import.log,1.8,1.9 Message-ID: <200611011054.kA1AsMZe007651@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7620 Modified Files: import.log Log Message: auto-import gdeskcal-1.0-4 on branch FC-6 from gdeskcal-1.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 1 Nov 2006 10:52:27 -0000 1.8 +++ import.log 1 Nov 2006 10:53:52 -0000 1.9 @@ -5,3 +5,4 @@ gdeskcal-0_57_1-5:FC-5:gdeskcal-0.57.1-5.src.rpm:1144665747 gdeskcal-1_0-2:HEAD:gdeskcal-1.0-2.src.rpm:1160316248 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 From fedora-extras-commits at redhat.com Wed Nov 1 10:54:23 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 03:54:23 -0700 Subject: rpms/gdeskcal/FC-6 gdeskcal.desktop, 1.2, 1.3 gdeskcal.spec, 1.12, 1.13 Message-ID: <200611011054.kA1AsN4I007655@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7620/FC-6 Modified Files: gdeskcal.desktop gdeskcal.spec Log Message: auto-import gdeskcal-1.0-4 on branch FC-6 from gdeskcal-1.0-4.src.rpm Index: gdeskcal.desktop =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdeskcal.desktop 8 Nov 2004 04:22:43 -0000 1.2 +++ gdeskcal.desktop 1 Nov 2006 10:53:53 -0000 1.3 @@ -1,9 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=gDeskCal -Comment=Calendar program for the Gnome Desktop. +Name=gDeskcal +Comment=A desktop calendar Exec=gdeskcal Icon=gdeskcal.png Terminal=false Type=Application Categories=Application;Utility; +StartupNotify=true Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gdeskcal.spec 11 Oct 2006 11:36:27 -0000 1.12 +++ gdeskcal.spec 1 Nov 2006 10:53:53 -0000 1.13 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils perl(XML::Parser) +BuildRequires: desktop-file-utils Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -22,7 +22,6 @@ transparency with smooth alpha-blending and its appearance can be changed completely by using skins. - %prep %setup -q -n gDeskCal-%{version} @@ -32,33 +31,41 @@ %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_libdir}/%{name} -mkdir -p %{buildroot}%{_datadir}/pixmaps -mkdir -p %{buildroot}%{_bindir} -cp -a code data ical skins %{buildroot}/%{_libdir}/%{name}/ -install -m0755 gdeskcal %{buildroot}/%{_libdir}/%{name}/gdeskcal-bin -ln -sf %{_libdir}/%{name}/gdeskcal-bin %{buildroot}/%{_bindir}/%{name} install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png +make DESTDIR=%{buildroot} install + desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ +%if "%{?fedora}" <= "6" --add-category X-Fedora \ +%endif %{SOURCE2} +%find_lang gdesklets + +%post +update-desktop-database &> /dev/null ||: + +%postun +update-desktop-database &> /dev/null ||: + %clean rm -rf %{buildroot} -%files +%files -f gdesklets.lang %defattr(-,root,root,-) %doc AUTHORS NEWS README %{_bindir}/gdeskcal %{_datadir}/applications/fedora-%{name}.desktop +%exclude %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_libdir}/%{name} - +%{_libdir}/%{name}/ %changelog -* Sun Oct 08 2006 Paul F. Johnson 1.0-2 -- Remove using the real makeinstall as it's broken +* Wed Nov 01 2006 Paul F. Johnson 1.0-4 +- added post and postun +- conditional for the X-Fedora in the desktop icon +- fixed the spec file * Sat Oct 07 2006 Paul F. Johnson 1.0-1 - bump to new version From fedora-extras-commits at redhat.com Wed Nov 1 10:55:49 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 03:55:49 -0700 Subject: rpms/gdeskcal import.log,1.9,1.10 Message-ID: <200611011055.kA1AtnWs007757@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7724 Modified Files: import.log Log Message: auto-import gdeskcal-1.0-4 on branch devel from gdeskcal-1.0-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 1 Nov 2006 10:53:52 -0000 1.9 +++ import.log 1 Nov 2006 10:55:19 -0000 1.10 @@ -6,3 +6,4 @@ gdeskcal-1_0-2:HEAD:gdeskcal-1.0-2.src.rpm:1160316248 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 From fedora-extras-commits at redhat.com Wed Nov 1 10:55:50 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 03:55:50 -0700 Subject: rpms/gdeskcal/devel gdeskcal.desktop, 1.2, 1.3 gdeskcal.spec, 1.12, 1.13 Message-ID: <200611011055.kA1AtoQM007761@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7724/devel Modified Files: gdeskcal.desktop gdeskcal.spec Log Message: auto-import gdeskcal-1.0-4 on branch devel from gdeskcal-1.0-4.src.rpm Index: gdeskcal.desktop =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdeskcal.desktop 8 Nov 2004 04:22:43 -0000 1.2 +++ gdeskcal.desktop 1 Nov 2006 10:55:20 -0000 1.3 @@ -1,9 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=gDeskCal -Comment=Calendar program for the Gnome Desktop. +Name=gDeskcal +Comment=A desktop calendar Exec=gdeskcal Icon=gdeskcal.png Terminal=false Type=Application Categories=Application;Utility; +StartupNotify=true Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gdeskcal.spec 11 Oct 2006 11:36:27 -0000 1.12 +++ gdeskcal.spec 1 Nov 2006 10:55:20 -0000 1.13 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils perl(XML::Parser) +BuildRequires: desktop-file-utils Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -22,7 +22,6 @@ transparency with smooth alpha-blending and its appearance can be changed completely by using skins. - %prep %setup -q -n gDeskCal-%{version} @@ -32,33 +31,41 @@ %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_libdir}/%{name} -mkdir -p %{buildroot}%{_datadir}/pixmaps -mkdir -p %{buildroot}%{_bindir} -cp -a code data ical skins %{buildroot}/%{_libdir}/%{name}/ -install -m0755 gdeskcal %{buildroot}/%{_libdir}/%{name}/gdeskcal-bin -ln -sf %{_libdir}/%{name}/gdeskcal-bin %{buildroot}/%{_bindir}/%{name} install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png +make DESTDIR=%{buildroot} install + desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ +%if "%{?fedora}" <= "6" --add-category X-Fedora \ +%endif %{SOURCE2} +%find_lang gdesklets + +%post +update-desktop-database &> /dev/null ||: + +%postun +update-desktop-database &> /dev/null ||: + %clean rm -rf %{buildroot} -%files +%files -f gdesklets.lang %defattr(-,root,root,-) %doc AUTHORS NEWS README %{_bindir}/gdeskcal %{_datadir}/applications/fedora-%{name}.desktop +%exclude %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png -%{_libdir}/%{name} - +%{_libdir}/%{name}/ %changelog -* Sun Oct 08 2006 Paul F. Johnson 1.0-2 -- Remove using the real makeinstall as it's broken +* Wed Nov 01 2006 Paul F. Johnson 1.0-4 +- added post and postun +- conditional for the X-Fedora in the desktop icon +- fixed the spec file * Sat Oct 07 2006 Paul F. Johnson 1.0-1 - bump to new version From fedora-extras-commits at redhat.com Wed Nov 1 11:00:09 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 04:00:09 -0700 Subject: rpms/monodevelop/FC-5 monodevelop.spec,1.10,1.11 Message-ID: <200611011100.kA1B09eM007957@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/monodevelop/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7929 Modified Files: monodevelop.spec Log Message: Add R gtk-sharp2-gapi monodevelop.spec Index: monodevelop.spec =================================================================== RCS file: /cvs/extras/rpms/monodevelop/FC-5/monodevelop.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- monodevelop.spec 27 Oct 2006 22:12:05 -0000 1.10 +++ monodevelop.spec 1 Nov 2006 10:59:39 -0000 1.11 @@ -7,11 +7,11 @@ Summary: A full-featured IDE for Mono and Gtk sharp Name: monodevelop Version: 0.12 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz -URL: http://www.monodevelop.com +URL: http://go-mono.com/sources/%{name}/ Patch0: monodevelop-libdir.patch Patch1: monodevelop-config.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +23,7 @@ BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit %endif -Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel +Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi %description This package provides MonoDevelop, a full-featured IDE for Mono @@ -58,7 +58,9 @@ %find_lang %{name} desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ +%if "%{?fedora}" <= "6" --add-category X-Fedora \ +%endif --delete-original \ %{buildroot}%{_datadir}/applications/monodevelop.desktop @@ -96,9 +98,12 @@ %{__rm} -rf %{buildroot} %changelog +* Wed Nov 01 2006 Paul F. Johnson 0.12-7 +- Added R gtk-sharp2-gapi + * Fri Oct 27 2006 Paul F. Johnson 0.12-6 -- fix for SVN -- url now correct +- fixed url +- added R apr-devel * Wed Sep 27 2006 Paul F. Johnson 0.12-5 - pkgconfig fix From fedora-extras-commits at redhat.com Wed Nov 1 11:01:36 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 04:01:36 -0700 Subject: rpms/monodevelop/FC-6 monodevelop.spec,1.11,1.12 Message-ID: <200611011101.kA1B1at0010939@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/monodevelop/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8009 Modified Files: monodevelop.spec Log Message: Added R gtk-sharp2-gapi monodevelop.spec Index: monodevelop.spec =================================================================== RCS file: /cvs/extras/rpms/monodevelop/FC-6/monodevelop.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- monodevelop.spec 27 Oct 2006 22:14:43 -0000 1.11 +++ monodevelop.spec 1 Nov 2006 11:01:06 -0000 1.12 @@ -7,11 +7,11 @@ Summary: A full-featured IDE for Mono and Gtk sharp Name: monodevelop Version: 0.12 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz -URL: http://www.monodevelop.com +URL: http://go-mono.com/sources/%{name}/ Patch0: monodevelop-libdir.patch Patch1: monodevelop-config.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +23,7 @@ BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit %endif -Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel +Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi %description This package provides MonoDevelop, a full-featured IDE for Mono @@ -58,7 +58,9 @@ %find_lang %{name} desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ +%if "%{?fedora}" <= "6" --add-category X-Fedora \ +%endif --delete-original \ %{buildroot}%{_datadir}/applications/monodevelop.desktop @@ -96,6 +98,9 @@ %{__rm} -rf %{buildroot} %changelog +* Wed Nov 01 2006 Paul F. Johnson 0.12-7 +- Added R gtk-sharp2-gapi + * Fri Oct 27 2006 Paul F. Johnson 0.12-6 - fixed url - added R apr-devel From fedora-extras-commits at redhat.com Wed Nov 1 11:03:17 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 04:03:17 -0700 Subject: rpms/monodevelop/devel monodevelop.spec,1.11,1.12 Message-ID: <200611011103.kA1B3HCc011139@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/monodevelop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11104 Modified Files: monodevelop.spec Log Message: Added R: gtk-sharp2-gapi monodevelop.spec Index: monodevelop.spec =================================================================== RCS file: /cvs/extras/rpms/monodevelop/devel/monodevelop.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- monodevelop.spec 27 Oct 2006 22:17:07 -0000 1.11 +++ monodevelop.spec 1 Nov 2006 11:02:43 -0000 1.12 @@ -7,11 +7,11 @@ Summary: A full-featured IDE for Mono and Gtk sharp Name: monodevelop Version: 0.12 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz -URL: http://www.monodevelop.com +URL: http://go-mono.com/sources/%{name}/ Patch0: monodevelop-libdir.patch Patch1: monodevelop-config.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +23,7 @@ BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit %endif -Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel +Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi %description This package provides MonoDevelop, a full-featured IDE for Mono @@ -58,7 +58,9 @@ %find_lang %{name} desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ +%if "%{?fedora}" <= "6" --add-category X-Fedora \ +%endif --delete-original \ %{buildroot}%{_datadir}/applications/monodevelop.desktop @@ -96,6 +98,9 @@ %{__rm} -rf %{buildroot} %changelog +* Wed Nov 01 2006 Paul F. Johnson 0.12-7 +- Added R gtk-sharp2-gapi + * Fri Oct 27 2006 Paul F. Johnson 0.12-6 - fixed url - added R apr-devel From fedora-extras-commits at redhat.com Wed Nov 1 11:05:43 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 1 Nov 2006 04:05:43 -0700 Subject: rpms/guiloader/devel .cvsignore, 1.2, 1.3 guiloader.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611011105.kA1B5hDh011309@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/guiloader/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11229 Modified Files: .cvsignore guiloader.spec sources Log Message: Update to 2.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/guiloader/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Oct 2006 10:04:34 -0000 1.2 +++ .cvsignore 1 Nov 2006 11:05:13 -0000 1.3 @@ -1 +1 @@ -guiloader-2.8.0.tar.bz2 +guiloader-2.8.1.tar.bz2 Index: guiloader.spec =================================================================== RCS file: /cvs/extras/rpms/guiloader/devel/guiloader.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- guiloader.spec 5 Oct 2006 10:04:34 -0000 1.1 +++ guiloader.spec 1 Nov 2006 11:05:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: guiloader -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: Gideon GuiXml Loader Library Group: System Environment/Libraries @@ -78,7 +78,10 @@ %changelog -* Thu Oct 5 2006 Denis Leroy - 2.8.0-1 +* Wed Nov 1 2006 Denis Leroy - 2.8.1-1 +- Update to 2.8.1 + +* Thu Oct 5 2006 Denis Leroy - 2.8.0-2 - Added pkgconfig devel Requires * Sun Sep 3 2006 Denis Leroy - 2.8.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/guiloader/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Oct 2006 10:04:34 -0000 1.2 +++ sources 1 Nov 2006 11:05:13 -0000 1.3 @@ -1 +1 @@ -98980d8c65e53f0f5288d1ebdb652b70 guiloader-2.8.0.tar.bz2 +233d52e42a196667ba57cd9528cd2837 guiloader-2.8.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 1 11:37:12 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 1 Nov 2006 04:37:12 -0700 Subject: extras-buildsys/utils/pushscript Push.py,1.12,1.13 Message-ID: <200611011137.kA1BbCih011621@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11603 Modified Files: Push.py Log Message: Just a way to push without processing the post_cmds (such as repoclosure and upgradecheck). Index: Push.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Push.py 29 Oct 2006 18:03:18 -0000 1.12 +++ Push.py 1 Nov 2006 11:37:09 -0000 1.13 @@ -590,6 +590,9 @@ if '-f' in sys.argv[2:]: sys.argv.remove('-f') opts.force = True + if '-s' in sys.argv[2:]: + sys.argv.remove('-s') + cfg.post_cmds = [] diststopush = [] for d in sys.argv[2:]: From fedora-extras-commits at redhat.com Wed Nov 1 11:40:26 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 1 Nov 2006 04:40:26 -0700 Subject: extras-buildsys/utils/pushscript README,1.6,1.7 Message-ID: <200611011140.kA1BeQS2011658@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11640 Modified Files: README Log Message: document the List.py helper Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README 28 Oct 2006 23:01:15 -0000 1.6 +++ README 1 Nov 2006 11:40:24 -0000 1.7 @@ -34,3 +34,9 @@ extras-repoview -> pushscript/extras-repoview extras-repoprune -> pushscript/extras-repoprune +[...] + +Helpers: + + pushscript/List.py Extras + From fedora-extras-commits at redhat.com Wed Nov 1 13:49:46 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 1 Nov 2006 06:49:46 -0700 Subject: rpms/e2tools - New directory Message-ID: <200611011349.kA1Dnk4e018291@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/e2tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18287/e2tools Log Message: Directory /cvs/extras/rpms/e2tools added to the repository From fedora-extras-commits at redhat.com Wed Nov 1 13:49:52 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 1 Nov 2006 06:49:52 -0700 Subject: rpms/e2tools/devel - New directory Message-ID: <200611011349.kA1Dnq8w018305@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/e2tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18287/e2tools/devel Log Message: Directory /cvs/extras/rpms/e2tools/devel added to the repository From fedora-extras-commits at redhat.com Wed Nov 1 13:50:13 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 1 Nov 2006 06:50:13 -0700 Subject: rpms/e2tools Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611011350.kA1DoDpx018336@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/e2tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18330 Added Files: Makefile import.log Log Message: Setup of module e2tools --- NEW FILE Makefile --- # Top level Makefile for module e2tools 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 Wed Nov 1 13:50:19 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 1 Nov 2006 06:50:19 -0700 Subject: rpms/e2tools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611011350.kA1DoJIM018354@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/e2tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18330/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module e2tools --- 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 Nov 1 13:52:26 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 1 Nov 2006 06:52:26 -0700 Subject: rpms/e2tools/devel e2cp.1, NONE, 1.1 e2ln.1, NONE, 1.1 e2ls.1, NONE, 1.1 e2mkdir.1, NONE, 1.1 e2mv.1, NONE, 1.1 e2rm.1, NONE, 1.1 e2tail.1, NONE, 1.1 e2tools-fedora-fixes.patch, NONE, 1.1 e2tools-test.sh, NONE, 1.1 e2tools.7, NONE, 1.1 e2tools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611011352.kA1DqQSQ018494@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/e2tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18446/devel Modified Files: .cvsignore sources Added Files: e2cp.1 e2ln.1 e2ls.1 e2mkdir.1 e2mv.1 e2rm.1 e2tail.1 e2tools-fedora-fixes.patch e2tools-test.sh e2tools.7 e2tools.spec Log Message: auto-import e2tools-0.0.16-5 on branch devel from e2tools-0.0.16-5.src.rpm --- NEW FILE e2cp.1 --- .TH E2CP 1 "March 2, 2005" .\" .SH NAME e2cp \- copies files from/to an e2fs filesystem .\" .SH SYNOPSIS .B e2cp .RI [ options ] " files... dest" .\" .SH DESCRIPTION The \fBe2cp\fP command copies files to/from an e2fs filesystem from/to the machine's filesystem. .\" .SH OPTIONS A single `-' (dash) can be used instead of a file name to indicate standard input/output. .TP .B \-0 Input lines terminated by a null character. .TP .B \-a Absolute directory names - create directories instead of just copying into the destination. Only valid for copying into an ext2fs filesystem. .TP .B \-d \fIdest_dir\fP Destination of files to be copied. May be in the ext2fs filesystem or the host filesystem. .TP .B \-G \fIgid\fP Set the default group to gid. .TP .B \-O \fIuid\fP Set the default file owner to uid. .TP .B \-p Preserve host file attributes (permissions, times, etc.) when copying files. .TP .B \-P \fImode\fP Set the file permissions (ie 755, 666). .TP .B \-s \fIsrc_dir\fP The source of the files to be copied. .TP .B \-v Be verbose. .\" .SH SEE ALSO .BR e2tools (7), .BR e2ln (1), .BR e2ls (1), .BR e2mkdir (1), .BR e2mv (1), .BR e2rm (1), .BR e2tail (1). .\" .SH AUTHOR The \fBe2tools\fP were written by Keith Sheffield . .PP This manual page was written by Lucas Wall , for the Debian project (but may be used by others). --- NEW FILE e2ln.1 --- .TH E2LN 1 "March 2, 2005" .\" .SH NAME e2ln \- create hard links on an ext2 filesystem .\" .SH SYNOPSIS .B e2ln .RI [ options ] " source destination" .\" .SH DESCRIPTION The \fBe2ln\fP command is used to create hard links on an ext2 filesystem. .\" .SH OPTIONS .TP .B \-f Force the operation to remove any existing files. .TP .B \-s Create a symlink. .TP .B \-v Be verbose. .PP Note: creating symlinks is not operational at this time. .\" .SH SEE ALSO .BR e2tools (7), .BR e2mv (1), .BR e2ls (1), .BR e2mkdir (1), .BR e2cp (1), .BR e2rm (1), .BR e2tail (1). .\" .SH AUTHOR The \fBe2tools\fP were written by Keith Sheffield . .PP This manual page was written by Lucas Wall , for the Debian project (but may be used by others). --- NEW FILE e2ls.1 --- .TH E2LS 1 "March 2, 2005" .\" .SH NAME e2ls \- list files and directories on an ext2 filesystem .\" .SH SYNOPSIS .B e2ls .RI [ options ] " file_specification" .\" .SH DESCRIPTION The \fBe2ls\fP command is used to list files and directories on an ext2 filesystem. .PP Note: Files deleted via e2rm sometimes will show up even without the -D option. It is being investigated. .\" .SH OPTIONS .TP .B \-a Show hidden directories. .TP .B \-c Sort by creation time (must include -t when using -l). .TP .B \-d \fIdir\fP Open the ext2 filesystem specified by dir. .TP .B \-D Show deleted files bracketed with ><. .TP .B \-f No sorting of the file list. .TP .B \-i Show the inodes (very useful for the -l option). .TP .B \-l Long listing. .TP .B \-r Reverse the sort order. .TP .B \-t Sort by time. .\" .SH SEE ALSO .BR e2tools (7), .BR e2ln (1), .BR e2mv (1), .BR e2mkdir (1), .BR e2cp (1), .BR e2rm (1), .BR e2tail (1). .\" .SH AUTHOR The \fBe2tools\fP were written by Keith Sheffield . .PP This manual page was written by Lucas Wall , for the Debian project (but may be used by others). --- NEW FILE e2mkdir.1 --- .TH E2MKDIR 1 "March 2, 2005" .\" .SH NAME e2mkdir \- creates a directory on an ext2 filesystem .\" .SH SYNOPSIS .B e2mkdir .RI [ options ] " directory..." .\" .SH DESCRIPTION The \fBe2mkdir\fP command creates directories on an ext2 filesystem. It behaves similar to `mkdir -p'. .\" .SH OPTIONS .TP .B \-G \fIgid\fP Set the default group to gid. .TP .B \-O \fIuid\fP Set the default file owner to uid. .TP .B \-P \fImode\fP Set the file permissions (ie 755, 666). .TP .B \-v Be verbose. .\" .SH SEE ALSO .BR e2tools (7), .BR e2ln (1), .BR e2ls (1), .BR e2mv (1), .BR e2cp (1), .BR e2rm (1), .BR e2tail (1). .\" .SH AUTHOR The \fBe2tools\fP were written by Keith Sheffield . .PP This manual page was written by Lucas Wall , for the Debian project (but may be used by others). --- NEW FILE e2mv.1 --- .TH E2MV 1 "March 2, 2005" .\" .SH NAME e2mv \- moves or renames files on an ext2fs filesystem .\" .SH SYNOPSIS .B e2mv .RI [ options ] " files... dest" .\" .SH DESCRIPTION The \fBe2mv\fP command moves or renames files on an ext2fs filesystem. The source files must be explicitly stated. It does not use regular expressions, yet. .\" .SH OPTIONS .TP .B \-f Force the operation to remove any existing files. .TP .B \-s Swap names of the two files. .TP .B \-v Be verbose. .\" .SH SEE ALSO .BR e2tools (7), .BR e2ln (1), .BR e2ls (1), .BR e2mkdir (1), .BR e2cp (1), .BR e2rm (1), .BR e2tail (1). .\" .SH AUTHOR The \fBe2tools\fP were written by Keith Sheffield . .PP This manual page was written by Lucas Wall , for the Debian project (but may be used by others). --- NEW FILE e2rm.1 --- .TH E2RM 1 "March 2, 2005" .\" .SH NAME e2rm \- removes files and directories on an ext2 filesystem .\" .SH SYNOPSIS .B e2rm .RI [ options ] " files..." .\" .SH DESCRIPTION The \fBe2rm\fP command removes files and directories on an ext2 filesystem. .\" .SH OPTIONS .TP .B \-r Recursively delete files if a directory name is given. .TP .B \-v Be verbose. .\" .SH SEE ALSO .BR e2tools (7), .BR e2ln (1), .BR e2ls (1), .BR e2mkdir (1), .BR e2cp (1), .BR e2mv (1), .BR e2tail (1). .\" .SH AUTHOR The \fBe2tools\fP were written by Keith Sheffield . .PP This manual page was written by Lucas Wall , for the Debian project (but may be used by others). --- NEW FILE e2tail.1 --- .TH E2TAIL 1 "March 2, 2005" .\" .SH NAME e2tail \- a basic version of the tail command for an ext2 filesystem .\" .SH SYNOPSIS .B e2tail .RI [ options ] " file" .\" .SH DESCRIPTION The \fBe2tail\fP command implements a basic version of the tail command. .\" .SH OPTIONS .TP .B \-n \fInum_lines\fP The number of lines to display .TP .B \-f Output appended data as the file grows. This is inode dependent, so if the file is renamed, it will keep checking it. .TP .B \-F Output appended data as the file grows. This is file name dependent, so if the file is renamed, it will check on any new files with the same name as the original. This is useful for watching log files that may be rotated out occasionally. This was requested by a person in the computer security field for monitoring 'honeypot' type machines. .TP .B \-s \fIsleep_interval\fP The number of seconds to sleep before checking if the file has grown while in 'follow' mode. The default is 1. .\" .SH SEE ALSO .BR e2tools (7), .BR e2ln (1), .BR e2ls (1), .BR e2mkdir (1), .BR e2cp (1), .BR e2rm (1), .BR e2mv (1). .\" .SH AUTHOR The \fBe2tools\fP were written by Keith Sheffield . .PP This manual page was written by Lucas Wall , for the Debian project (but may be used by others). e2tools-fedora-fixes.patch: --- NEW FILE e2tools-fedora-fixes.patch --- Only in e2tools-0.0.16.fedora: _b Only in e2tools-0.0.16.fedora: configure.in~ diff -rup e2tools-0.0.16.orig/copy.c e2tools-0.0.16.fedora/copy.c --- e2tools-0.0.16.orig/copy.c 2004-04-07 03:15:20.000000000 +0200 +++ e2tools-0.0.16.fedora/copy.c 2006-07-17 11:55:48.000000000 +0200 @@ -239,11 +239,10 @@ copy(int argc, char *argv[]) { ext2_filsys fs = NULL; ext2_ino_t root; - ext2_ino_t orig_cwd; + ext2_ino_t orig_cwd = -1; ext2_ino_t cwd; char tmpbuf[BUF_SIZE]; char outpath[BUF_SIZE]; - char *last_filesys = NULL; char *cur_filesys = NULL; int retval; int c; @@ -251,7 +250,7 @@ copy(int argc, char *argv[]) char *dest_dir = NULL; char *in_file = NULL; char *out_file = NULL; - int max_out_len; + int max_out_len = -1; int keep = 0; int absolute = 0; int verbose = 0; @@ -1054,7 +1053,6 @@ read_string(char *inbuf) char *ptr; char *boundary; int c; - int cnt; boundary = inbuf + BUF_SIZE - 1; ptr = inbuf; Only in e2tools-0.0.16.fedora: copy.c~ diff -rup e2tools-0.0.16.orig/e2tools.h e2tools-0.0.16.fedora/e2tools.h --- e2tools-0.0.16.orig/e2tools.h 2004-04-07 03:15:55.000000000 +0200 +++ e2tools-0.0.16.fedora/e2tools.h 2006-07-17 12:02:16.000000000 +0200 @@ -57,44 +57,45 @@ extern int optreset; /* defined by BSD, #include #include #include +#include #include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" #define E2T_FORCE 1 #define E2T_DO_MV 2 -#ifndef COPY_C +/* from copy.c */ extern long copy(int argc, char *argv[]); extern int my_strcmp(const void *n1, const void *n2); -#endif -#ifdef LN_C + +/* from ln.c */ extern long do_ln(int argc, char *argv[]); extern long create_hard_link(ext2_filsys fs, ext2_ino_t cwd, ext2_ino_t new_file_ino, char *newfile, int ln_flags); -#endif -#ifndef LS_C + +/* from ls.c */ extern long do_list_dir(int argc, char *argv[]); -#endif -#ifndef MKDIR_C + +/* from mkdir.c */ extern long e2mkdir(int argc, char *argv[]); extern long create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd, char *dirname, struct stat *def_stat); -#endif +extern long change_cwd(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd, + char *dirname); -#ifdef MV_C + +/* from mv.c */ extern long do_mv(int argc, char *argv[]); extern long get_file_parts(ext2_filsys fs, ext2_ino_t root, char *pathname, ext2_ino_t *dir_ino, char **dir_name, char **base_name); -#endif - -#ifndef READ_C +/* from read.c */ extern long get_file(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd, char *infile, char *outfile, int keep); extern long retrieve_data(ext2_filsys fs, ext2_ino_t src, int dest_fd, @@ -102,17 +103,17 @@ extern long retrieve_data(ext2_filsys fs ext2_off_t *ret_pos); extern long read_to_eof(ext2_file_t infile, int dest_fd, ext2_off_t offset, ext2_off_t *ret_pos); -#endif -#ifndef RM_C + +/* from rm.c */ extern long e2rm(int argc, char *argv[]); #endif -#ifndef TAIL_C +/* from tail.c */ extern long do_tail(int argc, char *argv[]); -#endif -#ifndef UTIL_C + +/* from util.c */ extern mode_t ext2_mode_xlate(__u16 lmode); extern __u16 host_mode_xlate(mode_t hmode); extern long open_filesystem(char *name, ext2_filsys *fs, ext2_ino_t *root, int @@ -125,14 +126,12 @@ extern long rm_file(ext2_filsys fs, ext2 delfile); extern long delete_file(ext2_filsys fs, ext2_ino_t inode); extern void init_stat_buf(struct stat *buf); -#endif +extern int is_file_regexp(char *ptr); +extern regex_t *make_regexp(char *shell); -#ifndef WRITE_C +/* from write.c */ extern long put_file(ext2_filsys fs, ext2_ino_t cwd, char *infile, char *outfile, ext2_ino_t *outfile_ino, int keep, struct stat *def_stat); -#endif - -#endif Only in e2tools-0.0.16.fedora: e2tools.h~ Only in e2tools-0.0.16.fedora: e2tools-test.sh Only in e2tools-0.0.16.fedora: e2tools-test.sh~ diff -rup e2tools-0.0.16.orig/elist.c e2tools-0.0.16.fedora/elist.c --- e2tools-0.0.16.orig/elist.c 2004-04-06 22:00:16.000000000 +0200 +++ e2tools-0.0.16.fedora/elist.c 2006-07-17 11:44:07.000000000 +0200 @@ -41,6 +41,7 @@ /* Feature Test Switches */ /* Headers */ #include +#include #include "elist.h" #ifndef NULL @@ -79,8 +80,6 @@ elist_delete(elist_t *l, void (*data_fre void elist_free(elist_t *l, void (*data_free)(void *)) { - elist_t *n; - if (l) { do @@ -136,7 +135,7 @@ elist_insert(elist_t *l, void *data) return(l); } -void elist_sort(elist_t *l, int (sort_func)(void *, void *), int reverse) +void elist_sort(elist_t *l, int (*sort_func)(const void *, const void *), int reverse) { int c=0; elist_t *tl; Only in e2tools-0.0.16.fedora: elist.c~ Only in e2tools-0.0.16.fedora: _i diff -rup e2tools-0.0.16.orig/ln.c e2tools-0.0.16.fedora/ln.c --- e2tools-0.0.16.orig/ln.c 2002-06-30 07:54:02.000000000 +0200 +++ e2tools-0.0.16.fedora/ln.c 2006-07-17 11:44:27.000000000 +0200 @@ -95,7 +95,6 @@ do_ln(int argc, char *argv[]) int verbose=0; int force=0; int symlink=0; - int num_files; int errcnt=0; char *cur_filesys = NULL; ext2_filsys fs = NULL; Only in e2tools-0.0.16.fedora: ln.c~ diff -rup e2tools-0.0.16.orig/ls.c e2tools-0.0.16.fedora/ls.c --- e2tools-0.0.16.orig/ls.c 2004-04-07 05:31:39.000000000 +0200 +++ e2tools-0.0.16.fedora/ls.c 2006-07-17 11:48:12.000000000 +0200 @@ -143,7 +143,6 @@ static int list_dir_proc(ext2_ino_t dir, int entry, struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private) { - struct ext2_inode inode; char name[EXT2_NAME_LEN]; struct list_dir_struct *ls = (struct list_dir_struct *) private; int thislen; @@ -485,7 +484,7 @@ do_list_dir(int argc, char *argv[]) if (ls.options & DELETED_OPT) flags |= DIRENT_FLAG_INCLUDE_REMOVED; - if (retval = ext2fs_check_directory(fs, inode)) + if ((retval = ext2fs_check_directory(fs, inode))) { if (retval != EXT2_ET_NO_DIRECTORY) { @@ -703,7 +702,7 @@ void short_disp(ls_file_t *info, int *co char lbr, rbr; char tmp[300]; int thislen; - static max_col_size = 0; + static int max_col_size = 0; if (max_col_size == 0) { @@ -1023,9 +1022,7 @@ int creat_time_sort(void *n1, void *n2) elist_t * remove_ls_dups(elist_t *list) { elist_t *start = list; - elist_t *next; ls_file_t *cd; - ls_file_t *nd; int cnt=0; while(list != NULL) Only in e2tools-0.0.16.fedora: ls.c~ diff -rup e2tools-0.0.16.orig/Makefile.am e2tools-0.0.16.fedora/Makefile.am --- e2tools-0.0.16.orig/Makefile.am 2003-07-12 19:06:54.000000000 +0200 +++ e2tools-0.0.16.fedora/Makefile.am 2006-07-17 12:22:28.000000000 +0200 @@ -27,3 +27,11 @@ install-exec-hook: $(LN_S) -f e2cp $(DESTDIR)$(bindir)/e2mv $(LN_S) -f e2cp $(DESTDIR)$(bindir)/e2rm $(LN_S) -f e2cp $(DESTDIR)$(bindir)/e2tail + +uninstall-exec-hook: + $(RM) -f $(DESTDIR)$(bindir)/e2ln + $(RM) -f $(DESTDIR)$(bindir)/e2ls + $(RM) -f $(DESTDIR)$(bindir)/e2mkdir + $(RM) -f $(DESTDIR)$(bindir)/e2mv + $(RM) -f $(DESTDIR)$(bindir)/e2rm + $(RM) -f $(DESTDIR)$(bindir)/e2tail Only in e2tools-0.0.16.fedora: Makefile.am~ Only in e2tools-0.0.16.fedora: Makefile.in~ diff -rup e2tools-0.0.16.orig/mkdir.c e2tools-0.0.16.fedora/mkdir.c --- e2tools-0.0.16.orig/mkdir.c 2004-04-07 05:19:32.000000000 +0200 +++ e2tools-0.0.16.fedora/mkdir.c 2006-07-17 12:06:33.000000000 +0200 @@ -281,7 +281,6 @@ create_dir(ext2_filsys fs, ext2_ino_t ro ext2_ino_t parent; /* the parent directory inode number*/ ext2_ino_t child; /* the inode number of the new directory */ struct ext2_inode inode; /* inode of file/directory dirname */ - char *name; /* basename of the new directory */ long retval; /* function return value */ char *buf; int len; @@ -315,7 +314,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro parent = *cwd; /* allocate memory for the lookups */ - if ((retval = ext2fs_get_mem(fs->blocksize, (void **) &buf))) + if ((retval = ext2fs_get_mem(fs->blocksize, (void *) &buf))) { fprintf(stderr, "%s\n", error_message(retval)); return retval; @@ -357,16 +356,16 @@ create_dir(ext2_filsys fs, ext2_ino_t ro def_stat))) { fprintf(stderr, - "create_dir: error creating directory %s/%s:%d\n", + "create_dir: error creating directory %s/%s:%ld\n", dirname, dname, retval); - ext2fs_free_mem((void **) &buf); + ext2fs_free_mem((void *) &buf); return(retval); } } else { fprintf(stderr, "%s\n", error_message(retval)); - ext2fs_free_mem((void **) &buf); + ext2fs_free_mem((void *) &buf); return retval; } } @@ -380,7 +379,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro &parent))) { fprintf(stderr, "%s\n", error_message(retval)); - ext2fs_free_mem((void **) &buf); + ext2fs_free_mem((void *) &buf); return retval; } @@ -388,7 +387,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro if ((retval = ext2fs_read_inode(fs, parent, &inode))) { fprintf(stderr, "%s\n", error_message(retval)); - ext2fs_free_mem((void **) &buf); + ext2fs_free_mem((void *) &buf); return retval; } @@ -397,7 +396,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro { fprintf(stderr, "create_dir: %s/%s is not a directory: %o\n", dirname, dname, inode.i_mode); - ext2fs_free_mem((void **) &buf); + ext2fs_free_mem((void *) &buf); return(-1); } } @@ -407,7 +406,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro *--dname = '/'; dname = ptr; } - ext2fs_free_mem((void **) &buf); + ext2fs_free_mem((void *) &buf); *cwd = parent; } else @@ -415,7 +414,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro if ((retval = create_subdir(fs, root, cwd, dirname, def_stat))) { fprintf(stderr, - "create_dir: error creating directory %s:%d\n", + "create_dir: error creating directory %s:%ld\n", dirname, retval); return(retval); } @@ -493,7 +492,7 @@ long create_subdir(ext2_filsys fs, ext2_ return(0); } - /* ok, the directory doesn't exist + /* ok, the directory doesn't exist */ /* get a new inode number */ if ((retval = ext2fs_new_inode(fs, parent, LINUX_S_IFDIR | 0755, 0, &child))) { Only in e2tools-0.0.16.fedora: mkdir.c~ diff -rup e2tools-0.0.16.orig/mv.c e2tools-0.0.16.fedora/mv.c --- e2tools-0.0.16.orig/mv.c 2002-06-09 23:30:25.000000000 +0200 +++ e2tools-0.0.16.fedora/mv.c 2006-07-17 11:58:30.000000000 +0200 @@ -84,7 +84,6 @@ do_mv(int argc, char *argv[]) int verbose=0; int force=0; int swap_files=0; - int num_files; int errcnt=0; char *cur_filesys = NULL; ext2_filsys fs = NULL; Only in e2tools-0.0.16.fedora: mv.c~ Only in e2tools-0.0.16.fedora: mv.h Only in e2tools-0.0.16.fedora: mv.h~ diff -rup e2tools-0.0.16.orig/progress.c e2tools-0.0.16.fedora/progress.c --- e2tools-0.0.16.orig/progress.c 2002-06-26 13:18:07.000000000 +0200 +++ e2tools-0.0.16.fedora/progress.c 2006-07-17 11:46:38.000000000 +0200 @@ -27,6 +27,7 @@ /* System Headers */ #include #include +#include #include #include @@ -154,7 +155,7 @@ void update_progress(unsigned long num_b if (prog_sbuf != NULL && prog_time != tv.tv_sec) { prog_time = tv.tv_sec; - fprintf(stderr, "%s %10d / %10d\r", prog_file, num_bytes, + fprintf(stderr, "%s %10ld / %10ld\r", prog_file, num_bytes, prog_sbuf->st_size); fflush(stderr); } Only in e2tools-0.0.16.fedora: progress.c~ diff -rup e2tools-0.0.16.orig/read.c e2tools-0.0.16.fedora/read.c --- e2tools-0.0.16.orig/read.c 2002-08-08 09:58:35.000000000 +0200 +++ e2tools-0.0.16.fedora/read.c 2006-07-17 11:52:12.000000000 +0200 @@ -9,9 +9,7 @@ * */ -static char rcsid[] = "$Id: read.c,v 0.2 2002/08/08 07:58:35 ksheff Exp $"; - -static char copyright[] = "Copyright 2002 Keith W Sheffield"; +static char __attribute__ ((used)) copyright[] = "Copyright 2002 Keith W Sheffield"; #ifndef READ_C #define READ_C @@ -106,7 +104,6 @@ long get_file(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd, char *infile, char *outfile, int keep) { - int fd; ext2_ino_t src; int dest; int retval; Only in e2tools-0.0.16.fedora: read.c~ Only in e2tools-0.0.16.fedora: README~ diff -rup e2tools-0.0.16.orig/rm.c e2tools-0.0.16.fedora/rm.c --- e2tools-0.0.16.orig/rm.c 2004-04-07 04:00:43.000000000 +0200 +++ e2tools-0.0.16.fedora/rm.c 2006-07-21 16:13:25.000000000 +0200 @@ -244,8 +244,8 @@ e2rm(int argc, char *argv[]) retval = ext2fs_dir_iterate2(gbl_fs, curr_ino, DIRENT_FLAG_INCLUDE_EMPTY, 0, rm_dir_proc, - (void *) - (verbose) ? &verbose : NULL); + (void *) + ((verbose) ? &verbose : NULL)); } else { Only in e2tools-0.0.16.fedora: rm.c~ diff -rup e2tools-0.0.16.orig/tail.c e2tools-0.0.16.fedora/tail.c --- e2tools-0.0.16.orig/tail.c 2003-07-12 18:33:11.000000000 +0200 +++ e2tools-0.0.16.fedora/tail.c 2006-07-17 12:39:06.000000000 +0200 @@ -251,7 +251,6 @@ tail(ext2_filsys *fs_ptr, ext2_ino_t roo unsigned int bytes_to_read; unsigned int bytes_read; char *ptr; - off_t pos; struct ext2_inode inode; ext2_file_t tail_fd; ext2_off_t offset; @@ -320,7 +319,11 @@ tail(ext2_filsys *fs_ptr, ext2_ino_t roo if (bytes_to_read != bytes_read - 1) { ptr++; - write(1, ptr, bytes_read - bytes_to_read - 1); + if (0 > write(1, ptr, bytes_read - bytes_to_read - 1)) + { + perror("writing bytes to stdout"); + return -1; + } } offset = 0; /* make sure we break out of the main loop */ break; @@ -338,7 +341,12 @@ tail(ext2_filsys *fs_ptr, ext2_ino_t roo */ if (num_lines > 0) - write(1, buf, bytes_read); + { + if (0 > write(1, buf, bytes_read)) { + perror("writing bytes to stdout"); + return -1; + } + } /* retreive the current position in the file */ if ((retval = ext2fs_file_lseek(tail_fd, 0, EXT2_SEEK_CUR, &cur_pos))) Only in e2tools-0.0.16.fedora: tail.c~ diff -rup e2tools-0.0.16.orig/util.c e2tools-0.0.16.fedora/util.c --- e2tools-0.0.16.orig/util.c 2002-06-09 23:30:26.000000000 +0200 +++ e2tools-0.0.16.fedora/util.c 2006-07-17 11:45:25.000000000 +0200 @@ -276,10 +276,9 @@ make_regexp(char *shell) char *tmpstr; char *ptr; static regex_t reg; - int l; char c; - if (NULL == (tmpstr = alloca((strlen(shell)) << 1 + 3))) + if (NULL == (tmpstr = alloca(((strlen(shell)) << 1) + 3))) { perror("make_regexp"); return(NULL); Only in e2tools-0.0.16.fedora: util.c~ diff -rup e2tools-0.0.16.orig/write.c e2tools-0.0.16.fedora/write.c --- e2tools-0.0.16.orig/write.c 2004-04-07 03:12:30.000000000 +0200 +++ e2tools-0.0.16.fedora/write.c 2006-07-17 11:44:42.000000000 +0200 @@ -9,8 +9,6 @@ * and modified by Robert Sanders */ -static char rcsid[] = "$Id: write.c,v 0.5 2004/04/07 01:12:30 ksheff Exp $"; - #ifndef WRITE_C #define WRITE_C #endif Only in e2tools-0.0.16.fedora: write.c~ --- NEW FILE e2tools-test.sh --- #!/bin/sh # Simple test for est e2tools # Copyright (C) 2006 Hans Ulrich Niedermann # # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA set -ex # Caution: An image of 100G size needs 1.6GB on disk just to be formatted! for imgsize in 1M; do testimg="test-${imgsize}.img" trap "" EXIT # create sparse image file full of zeros rm -f "${testimg}" /bin/dd if=/dev/null of="${testimg}" bs=1 count=1 seek="$imgsize" # create file system on image file /sbin/mkfs.ext2 -F "${testimg}" # check a few things ./e2mkdir "${testimg}:/foo" ./e2ls -l "${testimg}:" ./e2mkdir "${testimg}:/bar" ./e2mkdir "${testimg}:/bla" ./e2ls -l "${testimg}:" for file in README configure; do ./e2cp "${file}" "${testimg}:/foo" ./e2ls -l "${testimg}:/foo" trap "rm -f ${file}.test-c" EXIT ./e2cp "${testimg}:/foo/${file}" "${file}.test-c" ./e2rm ${testimg}:/foo/${file} ./e2ls -l "${testimg}:/foo" cmp ${file} ${file}.test-c rm -f ${file}.test-c done # remove the test image rm -f "${testimg}" trap "" EXIT done exit 0 --- NEW FILE e2tools.7 --- .TH E2TOOLS 7 "March 2, 2005" .\" .SH NAME e2tools \- utilities to manipulate files in an ext2/ext3 filesystem .\" .SH DESCRIPTION E2tools is a simple set of GPL'ed utilities to read, write, and manipulate files in an ext2/ext3 filesystem. These utilities access a filesystem directly using the ext2fs library. I wrote these tools in order to copy files into a linux filesystem on a machine that does not have ext2 support. Of course, they can also be used on a linux machine to read/write to disk images or floppies without having to mount them or have root access. .PP Supported functionality: .TP .B e2cp copy files .TP .B e2mv move files .TP .B e2rm remove files .TP .B e2mkdir create directory .TP .B e2ln create hard links .TP .B e2ls list files/directories .TP .B e2tail output the last part of a file .PP In general, to specify a directory or file on an ext2 filesystem for the e2tools utilities, use the following form: .IP filesystem:directory_path .PP The filesystem can be an unmounted partition or a regular file that's been formatted to contain an ext2 filesystem. In general, if a command takes multiple file names on the command line, if the first one contains an ext2 file specification, the rest of the files are assumed to be on the same filesystem until another one is explicitly stated: .IP /tmp/boot.img:/tmp/file1 .IP /tmp/file2 .IP /tmp/file3 .IP /tmp/boot2.img:/tmp/file4 .PP Files 1-3 are on /tmp/boot.img and the last file is on /tmp/boot2.img .\" .SH SEE ALSO .BR e2cp (1), .BR e2ln (1), .BR e2ls (1), .BR e2mkdir (1), .BR e2mv (1), .BR e2rm (1), .BR e2tail (1). .\" .SH AUTHOR The \fBe2tools\fP were written by Keith Sheffield . .PP This manual page was written by Lucas Wall , for the Debian project (but may be used by others). --- NEW FILE e2tools.spec --- Name: e2tools Version: 0.0.16 Release: 5%{?dist} Summary: Manipulate files in unmounted ext2/ext3 filesystems Group: Applications/System License: GPL URL: http://home.earthlink.net/~k_sheff/sw/e2tools/ Source0: http://home.earthlink.net/~k_sheff/sw/e2tools/e2tools-0.0.16.tar.gz Source1: e2tools-test.sh # Thank you very much for the man pages from Debian package. Source2: e2cp.1 Source3: e2ln.1 Source4: e2ls.1 Source5: e2mkdir.1 Source6: e2mv.1 Source7: e2rm.1 Source8: e2tail.1 Source9: e2tools.7 Patch1: e2tools-fedora-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: e2fsprogs-devel >= 1.27 # For e2tools-test.sh BuildRequires: e2fsprogs, diffutils #Requires: %description A simple set of utilities to read, write, and manipulate files in an ext2/ext3 filesystem directly using the ext2fs library. This works - without root access - without the filesystem being mounted - without kernel ext2/ext3 support The utilities are: e2cp e2ln e2ls e2mkdir e2mv e2rm e2tail %prep %setup -q %patch1 -p1 %build %configure make %{?_smp_mflags} CPPFLAGS="-Wall -Werror" %check # Run tests for e in e2ln e2ls e2mkdir e2mv e2rm e2tail; do ln -s e2cp $e done sh %{SOURCE1} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1/ %{__install} \ %{SOURCE2} \ %{SOURCE3} \ %{SOURCE4} \ %{SOURCE5} \ %{SOURCE6} \ %{SOURCE7} \ %{SOURCE8} \ $RPM_BUILD_ROOT%{_mandir}/man1/ %{__install} -D %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/e2tools.7 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING ChangeLog TODO AUTHORS %{_bindir}/e2cp %{_bindir}/e2ln %{_bindir}/e2ls %{_bindir}/e2mkdir %{_bindir}/e2mv %{_bindir}/e2rm %{_bindir}/e2tail %doc %{_mandir}/man1/e2cp.1.gz %doc %{_mandir}/man1/e2ln.1.gz %doc %{_mandir}/man1/e2ls.1.gz %doc %{_mandir}/man1/e2mkdir.1.gz %doc %{_mandir}/man1/e2mv.1.gz %doc %{_mandir}/man1/e2rm.1.gz %doc %{_mandir}/man1/e2tail.1.gz %doc %{_mandir}/man7/e2tools.7.gz %changelog * Mon Jul 31 2006 Andreas Thienemann - 0.0.16-5 - fix broken cast in rm.c:248 (exhibited on x86_64, but buggy everywhere) from Hans Ulrich Niedermann * Mon Jul 17 2006 Andreas Thienemann - 0.0.16-4 - Introduced %%check * Mon Jul 17 2006 Hans Ulrich Niedermann - 0.0.16-3 - initial package for fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/e2tools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Nov 2006 13:50:19 -0000 1.1 +++ .cvsignore 1 Nov 2006 13:51:56 -0000 1.2 @@ -0,0 +1 @@ +e2tools-0.0.16.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/e2tools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Nov 2006 13:50:19 -0000 1.1 +++ sources 1 Nov 2006 13:51:56 -0000 1.2 @@ -0,0 +1 @@ +1829b2b261e0e0d07566066769b5b28b e2tools-0.0.16.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 13:52:25 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 1 Nov 2006 06:52:25 -0700 Subject: rpms/e2tools import.log,1.1,1.2 Message-ID: <200611011352.kA1DqPTw018490@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/e2tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18446 Modified Files: import.log Log Message: auto-import e2tools-0.0.16-5 on branch devel from e2tools-0.0.16-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/e2tools/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Nov 2006 13:50:13 -0000 1.1 +++ import.log 1 Nov 2006 13:51:55 -0000 1.2 @@ -0,0 +1 @@ +e2tools-0_0_16-5:HEAD:e2tools-0.0.16-5.src.rpm:1162389108 From fedora-extras-commits at redhat.com Wed Nov 1 13:55:46 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 1 Nov 2006 06:55:46 -0700 Subject: owners owners.list,1.1880,1.1881 Message-ID: <200611011355.kA1DtkA1018555@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18539 Modified Files: owners.list Log Message: Added e2tools Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1880 retrieving revision 1.1881 diff -u -r1.1880 -r1.1881 --- owners.list 31 Oct 2006 20:27:45 -0000 1.1880 +++ owners.list 1 Nov 2006 13:55:16 -0000 1.1881 @@ -321,6 +321,7 @@ Fedora Extras|dx-samples|Sample files for OpenDX|rpm at greysector.net|extras-qa at fedoraproject.org| Fedora Extras|dxpc|A Differential X Protocol Compressor|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|dynamite|Extract data compressed with PKWARE Data Compression Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|e2tools|Manipulate files in unmounted ext2/ext3 filesystems|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|echoping|TCP "echo" performance test|andreas at bawue.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 1 14:33:43 2006 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 1 Nov 2006 07:33:43 -0700 Subject: rpms/gg2/devel gg2-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gg2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611011433.kA1EXhKq021863@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/extras/rpms/gg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21840 Modified Files: .cvsignore gg2.spec sources Added Files: gg2-desktop.patch Log Message: - updated to 2.3.0 - fix desktop file - fix locale installation gg2-desktop.patch: --- NEW FILE gg2-desktop.patch --- --- gg2-2.3.0/gg2.desktop.r 2004-08-04 22:53:57.000000000 +0200 +++ gg2-2.3.0/gg2.desktop 2006-11-01 15:07:18.000000000 +0100 @@ -9,5 +9,5 @@ Icon=gg2.png Terminal=false Type=Application -Categories=Application;Network;InstantMessaging;GTK; +Categories=Network;InstantMessaging;GTK; # vi: encoding=utf-8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gg2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Sep 2006 20:15:19 -0000 1.2 +++ .cvsignore 1 Nov 2006 14:33:13 -0000 1.3 @@ -1 +1 @@ -gg2-2.2.9.tar.gz +gg2-2.3.0.tar.bz2 Index: gg2.spec =================================================================== RCS file: /cvs/extras/rpms/gg2/devel/gg2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gg2.spec 17 Sep 2006 20:15:19 -0000 1.1 +++ gg2.spec 1 Nov 2006 14:33:13 -0000 1.2 @@ -1,13 +1,14 @@ Name: gg2 -Version: 2.2.9 -Release: 7%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: GNU Gadu 2 - free talking Summary(es): GNU Gadu 2 - charlar libremente Summary(pl): GNU Gadu 2 - wolne gadanie License: GPL Group: Applications/Internet -Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.gz +Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.bz2 Patch0: %{name}-pc.patch +Patch1: %{name}-desktop.patch URL: http://www.gnugadu.org/ BuildRequires: arts-devel BuildRequires: autoconf @@ -196,6 +197,7 @@ %prep %setup -q %patch0 -p1 -b .p +%patch1 -p1 -b .d %build # autoreconf fails here @@ -238,14 +240,13 @@ chmod -x contrib/{gg2sms,mkgg2snap,plugin_example/build.sh} %{__make} install \ + localedir=%{_datadir}/locale \ DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_desktopdir} desktop-file-install --vendor Fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ - --add-category Application \ - --add-category Internet \ %{name}.desktop %find_lang %{name} --with-gnome @@ -347,6 +348,11 @@ %{_libdir}/pkgconfig/gg2_core.pc %changelog +* Mon Oct 16 2006 Dominik Mierzejewski 2.3.0-1 +- updated to 2.3.0 +- fix desktop file +- fix locale installation + * Sun Sep 17 2006 Dominik Mierzejewski 2.2.9-7 - removed perl Requires: from -devel - verified building with latest libgadu Index: sources =================================================================== RCS file: /cvs/extras/rpms/gg2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2006 20:15:19 -0000 1.2 +++ sources 1 Nov 2006 14:33:13 -0000 1.3 @@ -1 +1 @@ -e12c2153993dbbf66f8cefa3c628e7cd gg2-2.2.9.tar.gz +dbe6c0f85c9dbb115ee1911d8abbea33 gg2-2.3.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 1 14:51:42 2006 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 1 Nov 2006 07:51:42 -0700 Subject: rpms/gg2/FC-6 gg2-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gg2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611011451.kA1EpgoN022062@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/extras/rpms/gg2/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22039 Modified Files: .cvsignore gg2.spec sources Added Files: gg2-desktop.patch Log Message: - updated to 2.3.0 - fix desktop file - fix locale installation gg2-desktop.patch: --- NEW FILE gg2-desktop.patch --- --- gg2-2.3.0/gg2.desktop.r 2004-08-04 22:53:57.000000000 +0200 +++ gg2-2.3.0/gg2.desktop 2006-11-01 15:07:18.000000000 +0100 @@ -9,5 +9,5 @@ Icon=gg2.png Terminal=false Type=Application -Categories=Application;Network;InstantMessaging;GTK; +Categories=Network;InstantMessaging;GTK; # vi: encoding=utf-8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gg2/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Sep 2006 20:15:19 -0000 1.2 +++ .cvsignore 1 Nov 2006 14:51:12 -0000 1.3 @@ -1 +1 @@ -gg2-2.2.9.tar.gz +gg2-2.3.0.tar.bz2 Index: gg2.spec =================================================================== RCS file: /cvs/extras/rpms/gg2/FC-6/gg2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gg2.spec 17 Sep 2006 20:15:19 -0000 1.1 +++ gg2.spec 1 Nov 2006 14:51:12 -0000 1.2 @@ -1,13 +1,14 @@ Name: gg2 -Version: 2.2.9 -Release: 7%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: GNU Gadu 2 - free talking Summary(es): GNU Gadu 2 - charlar libremente Summary(pl): GNU Gadu 2 - wolne gadanie License: GPL Group: Applications/Internet -Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.gz +Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.bz2 Patch0: %{name}-pc.patch +Patch1: %{name}-desktop.patch URL: http://www.gnugadu.org/ BuildRequires: arts-devel BuildRequires: autoconf @@ -196,6 +197,7 @@ %prep %setup -q %patch0 -p1 -b .p +%patch1 -p1 -b .d %build # autoreconf fails here @@ -238,14 +240,13 @@ chmod -x contrib/{gg2sms,mkgg2snap,plugin_example/build.sh} %{__make} install \ + localedir=%{_datadir}/locale \ DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_desktopdir} desktop-file-install --vendor Fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ - --add-category Application \ - --add-category Internet \ %{name}.desktop %find_lang %{name} --with-gnome @@ -347,6 +348,11 @@ %{_libdir}/pkgconfig/gg2_core.pc %changelog +* Mon Oct 16 2006 Dominik Mierzejewski 2.3.0-1 +- updated to 2.3.0 +- fix desktop file +- fix locale installation + * Sun Sep 17 2006 Dominik Mierzejewski 2.2.9-7 - removed perl Requires: from -devel - verified building with latest libgadu Index: sources =================================================================== RCS file: /cvs/extras/rpms/gg2/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2006 20:15:19 -0000 1.2 +++ sources 1 Nov 2006 14:51:12 -0000 1.3 @@ -1 +1 @@ -e12c2153993dbbf66f8cefa3c628e7cd gg2-2.2.9.tar.gz +dbe6c0f85c9dbb115ee1911d8abbea33 gg2-2.3.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 1 14:52:55 2006 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 1 Nov 2006 07:52:55 -0700 Subject: rpms/gg2/FC-5 gg2-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gg2.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611011452.kA1Eqttf022129@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/extras/rpms/gg2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22106 Modified Files: .cvsignore gg2.spec sources Added Files: gg2-desktop.patch Log Message: - updated to 2.3.0 - fix desktop file - fix locale installation gg2-desktop.patch: --- NEW FILE gg2-desktop.patch --- --- gg2-2.3.0/gg2.desktop.r 2004-08-04 22:53:57.000000000 +0200 +++ gg2-2.3.0/gg2.desktop 2006-11-01 15:07:18.000000000 +0100 @@ -9,5 +9,5 @@ Icon=gg2.png Terminal=false Type=Application -Categories=Application;Network;InstantMessaging;GTK; +Categories=Network;InstantMessaging;GTK; # vi: encoding=utf-8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gg2/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Sep 2006 20:15:19 -0000 1.2 +++ .cvsignore 1 Nov 2006 14:52:24 -0000 1.3 @@ -1 +1 @@ -gg2-2.2.9.tar.gz +gg2-2.3.0.tar.bz2 Index: gg2.spec =================================================================== RCS file: /cvs/extras/rpms/gg2/FC-5/gg2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gg2.spec 17 Sep 2006 20:15:19 -0000 1.1 +++ gg2.spec 1 Nov 2006 14:52:24 -0000 1.2 @@ -1,13 +1,14 @@ Name: gg2 -Version: 2.2.9 -Release: 7%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: GNU Gadu 2 - free talking Summary(es): GNU Gadu 2 - charlar libremente Summary(pl): GNU Gadu 2 - wolne gadanie License: GPL Group: Applications/Internet -Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.gz +Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.bz2 Patch0: %{name}-pc.patch +Patch1: %{name}-desktop.patch URL: http://www.gnugadu.org/ BuildRequires: arts-devel BuildRequires: autoconf @@ -196,6 +197,7 @@ %prep %setup -q %patch0 -p1 -b .p +%patch1 -p1 -b .d %build # autoreconf fails here @@ -238,14 +240,13 @@ chmod -x contrib/{gg2sms,mkgg2snap,plugin_example/build.sh} %{__make} install \ + localedir=%{_datadir}/locale \ DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_desktopdir} desktop-file-install --vendor Fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ - --add-category Application \ - --add-category Internet \ %{name}.desktop %find_lang %{name} --with-gnome @@ -347,6 +348,11 @@ %{_libdir}/pkgconfig/gg2_core.pc %changelog +* Mon Oct 16 2006 Dominik Mierzejewski 2.3.0-1 +- updated to 2.3.0 +- fix desktop file +- fix locale installation + * Sun Sep 17 2006 Dominik Mierzejewski 2.2.9-7 - removed perl Requires: from -devel - verified building with latest libgadu Index: sources =================================================================== RCS file: /cvs/extras/rpms/gg2/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2006 20:15:19 -0000 1.2 +++ sources 1 Nov 2006 14:52:24 -0000 1.3 @@ -1 +1 @@ -e12c2153993dbbf66f8cefa3c628e7cd gg2-2.2.9.tar.gz +dbe6c0f85c9dbb115ee1911d8abbea33 gg2-2.3.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 1 15:09:26 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 1 Nov 2006 08:09:26 -0700 Subject: rpms/jd/devel .cvsignore, 1.9, 1.10 jd.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200611011509.kA1F9Q4E025245@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25219 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Nov 1 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061101 - cvs 061101 (23:59 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 31 Oct 2006 04:43:24 -0000 1.9 +++ .cvsignore 1 Nov 2006 15:08:56 -0000 1.10 @@ -1 +1 @@ -jd-1.8.0-cvs061030.tgz +jd-1.8.0-cvs061101.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jd.spec 31 Oct 2006 04:43:24 -0000 1.16 +++ jd.spec 1 Nov 2006 15:08:56 -0000 1.17 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag cvs061030 +%define strtag cvs061101 %define repoid 22352 @@ -103,8 +103,8 @@ %{icondir}/%{name}.png %changelog -* Mon Oct 30 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061030 -- cvs 061030 (25:15 JST) +* Wed Nov 1 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061101 +- cvs 061101 (23:59 JST) * Sat Oct 28 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061028 - Detect libSM and libICE for x86_64. Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 31 Oct 2006 04:43:24 -0000 1.9 +++ sources 1 Nov 2006 15:08:56 -0000 1.10 @@ -1 +1 @@ -5810c2bb6cb4b6ff8cc84000eb0c166a jd-1.8.0-cvs061030.tgz +8b38d865dfab3b5a17be7a921a8b701a jd-1.8.0-cvs061101.tgz From fedora-extras-commits at redhat.com Wed Nov 1 16:10:03 2006 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 1 Nov 2006 09:10:03 -0700 Subject: rpms/ctorrent/devel .cvsignore, 1.3, 1.4 ctorrent.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611011610.kA1GA3ir028783@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/extras/rpms/ctorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28763 Modified Files: .cvsignore ctorrent.spec sources Log Message: - upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307 - add more docs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctorrent/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Sep 2006 18:18:53 -0000 1.3 +++ .cvsignore 1 Nov 2006 16:09:33 -0000 1.4 @@ -1 +1 @@ -ctorrent-1.3.4.tar.bz2 +ctorrent-1.3.4-dnh2.1.tar.gz Index: ctorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ctorrent/devel/ctorrent.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ctorrent.spec 3 Oct 2006 21:56:47 -0000 1.4 +++ ctorrent.spec 1 Nov 2006 16:09:33 -0000 1.5 @@ -1,11 +1,13 @@ +%define dnh dnh2.1 + Name: ctorrent Version: 1.3.4 -Release: 2%{?dist} +Release: 3.%{dnh}%{?dist} Summary: BitTorrent Client written in C Group: Applications/Internet License: GPL -URL: http://ctorrent.sourceforge.net -Source0: http://switch.dl.sourceforge.net/sourceforge/ctorrent/%{name}-%{version}.tar.bz2 +URL: http://www.rahul.net/dholmes/ctorrent/ +Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -14,7 +16,7 @@ doesn't require any graphical component, such as an X server. %prep -%setup -q +%setup -q -n %{name}-%{dnh} %build %configure @@ -30,9 +32,13 @@ %files %defattr(-,root,root,-) %{_bindir}/ctorrent -%doc AUTHORS README NEWS +%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT %changelog +* Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski 1.3.4-3.dnh2.1 +- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307 +- add more docs + * Tue Oct 03 2006 Dominik 'Rathann' Mierzejewski 1.3.4-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctorrent/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Sep 2006 18:18:53 -0000 1.3 +++ sources 1 Nov 2006 16:09:33 -0000 1.4 @@ -1 +1 @@ -823010ec78215d476537c9eba9381cdd ctorrent-1.3.4.tar.bz2 +5cc1e46e1d1a3144f319cdec43256169 ctorrent-1.3.4-dnh2.1.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 16:29:16 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 1 Nov 2006 09:29:16 -0700 Subject: rpms/amarok/FC-5 amarok.spec,1.63,1.64 Message-ID: <200611011629.kA1GTGsI029025@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28978/FC-5 Modified Files: amarok.spec Log Message: fix description Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- amarok.spec 31 Oct 2006 11:01:33 -0000 1.63 +++ amarok.spec 1 Nov 2006 16:28:46 -0000 1.64 @@ -58,8 +58,8 @@ - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the KDE look, but with a unique touch -Amarok can use various engines to decode sound : gstreamer, helix -and xine (disabled by default for patent reasons) +Amarok can use various engines to decode sound : helix and xine. +(gstreamer is in the works) To use the helix engine, you'll have to install either HelixPlayer or RealPlayer From fedora-extras-commits at redhat.com Wed Nov 1 16:29:17 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 1 Nov 2006 09:29:17 -0700 Subject: rpms/amarok/FC-6 amarok.spec,1.64,1.65 Message-ID: <200611011629.kA1GTH5Y029028@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28978/FC-6 Modified Files: amarok.spec Log Message: fix description Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- amarok.spec 31 Oct 2006 11:01:42 -0000 1.64 +++ amarok.spec 1 Nov 2006 16:28:47 -0000 1.65 @@ -58,8 +58,8 @@ - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the KDE look, but with a unique touch -Amarok can use various engines to decode sound : gstreamer, helix -and xine (disabled by default for patent reasons) +Amarok can use various engines to decode sound : helix and xine. +(gstreamer is in the works) To use the helix engine, you'll have to install either HelixPlayer or RealPlayer From fedora-extras-commits at redhat.com Wed Nov 1 16:29:18 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 1 Nov 2006 09:29:18 -0700 Subject: rpms/amarok/devel amarok.spec,1.64,1.65 Message-ID: <200611011629.kA1GTIRo029029@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28978/devel Modified Files: amarok.spec Log Message: fix description Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- amarok.spec 31 Oct 2006 11:01:45 -0000 1.64 +++ amarok.spec 1 Nov 2006 16:28:48 -0000 1.65 @@ -58,8 +58,8 @@ - compatible with the .m3u and .pls formats for playlists - nice GUI, integrates into the KDE look, but with a unique touch -Amarok can use various engines to decode sound : gstreamer, helix -and xine (disabled by default for patent reasons) +Amarok can use various engines to decode sound : helix and xine. +(gstreamer is in the works) To use the helix engine, you'll have to install either HelixPlayer or RealPlayer From fedora-extras-commits at redhat.com Wed Nov 1 16:42:05 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 1 Nov 2006 09:42:05 -0700 Subject: rpms/guiloader-c++/devel .cvsignore, 1.2, 1.3 guiloader-c++.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611011642.kA1Gg5A7029191@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/guiloader-c++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29162 Modified Files: .cvsignore guiloader-c++.spec sources Log Message: Update to 2.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/guiloader-c++/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Oct 2006 09:29:59 -0000 1.2 +++ .cvsignore 1 Nov 2006 16:41:35 -0000 1.3 @@ -1 +1 @@ -guiloader-c++-2.8.0.tar.bz2 +guiloader-c++-2.8.1.tar.bz2 Index: guiloader-c++.spec =================================================================== RCS file: /cvs/extras/rpms/guiloader-c++/devel/guiloader-c++.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- guiloader-c++.spec 6 Oct 2006 09:29:59 -0000 1.1 +++ guiloader-c++.spec 1 Nov 2006 16:41:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: guiloader-c++ -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: C++ Binding to GuiLoader Library Group: System Environment/Libraries @@ -77,6 +77,9 @@ %changelog +* Wed Nov 1 2006 Denis Leroy - 2.8.1-1 +- Update to 2.8.1 + * Fri Oct 6 2006 Denis Leroy - 2.8.0-2 - Added pkgconfig devel Requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/guiloader-c++/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Oct 2006 09:29:59 -0000 1.2 +++ sources 1 Nov 2006 16:41:35 -0000 1.3 @@ -1 +1 @@ -c66f7ef235cbc82f1a0b1dd5cdb14848 guiloader-c++-2.8.0.tar.bz2 +22045cd53914fdcaf646802e4ce3f9c8 guiloader-c++-2.8.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 1 16:54:04 2006 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 1 Nov 2006 09:54:04 -0700 Subject: rpms/ctorrent/FC-6 .cvsignore, 1.3, 1.4 ctorrent.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611011654.kA1Gs4Vm029331@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/extras/rpms/ctorrent/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29306 Modified Files: .cvsignore ctorrent.spec sources Log Message: - upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307 - add more docs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Sep 2006 18:18:53 -0000 1.3 +++ .cvsignore 1 Nov 2006 16:53:33 -0000 1.4 @@ -1 +1 @@ -ctorrent-1.3.4.tar.bz2 +ctorrent-1.3.4-dnh2.1.tar.gz Index: ctorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-6/ctorrent.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ctorrent.spec 3 Oct 2006 21:56:47 -0000 1.4 +++ ctorrent.spec 1 Nov 2006 16:53:33 -0000 1.5 @@ -1,11 +1,13 @@ +%define dnh dnh2.1 + Name: ctorrent Version: 1.3.4 -Release: 2%{?dist} +Release: 3.%{dnh}%{?dist} Summary: BitTorrent Client written in C Group: Applications/Internet License: GPL -URL: http://ctorrent.sourceforge.net -Source0: http://switch.dl.sourceforge.net/sourceforge/ctorrent/%{name}-%{version}.tar.bz2 +URL: http://www.rahul.net/dholmes/ctorrent/ +Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -14,7 +16,7 @@ doesn't require any graphical component, such as an X server. %prep -%setup -q +%setup -q -n %{name}-%{dnh} %build %configure @@ -30,9 +32,13 @@ %files %defattr(-,root,root,-) %{_bindir}/ctorrent -%doc AUTHORS README NEWS +%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT %changelog +* Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski 1.3.4-3.dnh2.1 +- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307 +- add more docs + * Tue Oct 03 2006 Dominik 'Rathann' Mierzejewski 1.3.4-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Sep 2006 18:18:53 -0000 1.3 +++ sources 1 Nov 2006 16:53:33 -0000 1.4 @@ -1 +1 @@ -823010ec78215d476537c9eba9381cdd ctorrent-1.3.4.tar.bz2 +5cc1e46e1d1a3144f319cdec43256169 ctorrent-1.3.4-dnh2.1.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 16:56:48 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 1 Nov 2006 09:56:48 -0700 Subject: rpms/csound/FC-6 csound-5.03.0-default-opcodedir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 csound-5.03.0-enable-fluidsynth.patch, 1.2, 1.3 csound.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611011656.kA1GumqH029425@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/csound/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29397 Modified Files: .cvsignore csound-5.03.0-enable-fluidsynth.patch csound.spec sources Added Files: csound-5.03.0-default-opcodedir.patch Log Message: * Wed Nov 1 2006 Dan Williams 5.03.0-8 - CVS snapshot to pick up virtual Midi keyboard - Make the default for OPCODEDIR be where the plugins are actually installed csound-5.03.0-default-opcodedir.patch: --- NEW FILE csound-5.03.0-default-opcodedir.patch --- --- Csound5.03.0/Top/csmodule.c.default-plugindir 2006-11-01 10:44:42.000000000 -0500 +++ Csound5.03.0/Top/csmodule.c 2006-11-01 10:45:58.000000000 -0500 @@ -123,17 +123,20 @@ /* default directory to load plugins from if environment variable is not set */ #if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__))) # define ENABLE_OPCODEDIR_WARNINGS 1 -# ifdef CS_DEFAULT_PLUGINDIR -# undef CS_DEFAULT_PLUGINDIR +# ifndef CS_DEFAULT_PLUGINDIR +# ifndef USE_DOUBLE +# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins" +# else +# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins" +# endif # endif -# define CS_DEFAULT_PLUGINDIR "." #else # define ENABLE_OPCODEDIR_WARNINGS 0 # ifndef CS_DEFAULT_PLUGINDIR # ifndef USE_DOUBLE -# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins" +# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins" # else -# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64" +# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins" # endif # endif #endif Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/csound/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Sep 2006 18:09:14 -0000 1.2 +++ .cvsignore 1 Nov 2006 16:56:17 -0000 1.3 @@ -1,2 +1,3 @@ Csound5.03_manual.tgz Csound5.03_src.tgz +Csound5.03.0_src-cvs20061101.tar.bz2 csound-5.03.0-enable-fluidsynth.patch: Index: csound-5.03.0-enable-fluidsynth.patch =================================================================== RCS file: /cvs/extras/rpms/csound/FC-6/csound-5.03.0-enable-fluidsynth.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- csound-5.03.0-enable-fluidsynth.patch 29 Oct 2006 03:32:20 -0000 1.2 +++ csound-5.03.0-enable-fluidsynth.patch 1 Nov 2006 16:56:17 -0000 1.3 @@ -1,24 +1,24 @@ ---- Csound5.03.0/SConstruct.enable-fluidsynth 2006-10-21 11:03:22.000000000 -0400 -+++ Csound5.03.0/SConstruct 2006-10-23 15:36:10.000000000 -0400 -@@ -225,6 +225,9 @@ +--- Csound5.03.0/SConstruct.enable-fluidsynth 2006-11-01 09:50:30.000000000 -0500 ++++ Csound5.03.0/SConstruct 2006-11-01 10:36:08.000000000 -0500 +@@ -224,6 +224,9 @@ '0') opts.Add('isWinNT', 'On windows, if win2000 or NT is used', '%d' % withMSVC()) +opts.Add('useFluidsynth', + 'Set to 1 if you want OSC support', + '0') - - # Define the common part of the build environment. - # This section also sets up customized options for third-party libraries, which -@@ -426,6 +429,7 @@ - pdhfound = configure.CheckHeader("m_pd.h", language = "C") - tclhfound = configure.CheckHeader("tcl.h", language = "C") + opts.Add('buildCSEditor', + 'Set to 1 to build the Csound syntax highlighting text editor. Requires FLTK headers and libs', + '0') +@@ -437,6 +440,7 @@ + tmp = '%s/tcl.h' % i + tclhfound = tclhfound or configure.CheckHeader(tmp, language = "C") luaFound = configure.CheckHeader("lua.h", language = "C") +fluidsynthFound = configure.CheckHeader("fluidsynth.h", language = "C") swigFound = 'swig' in commonEnvironment['TOOLS'] print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)]) pythonFound = configure.CheckHeader("Python.h", language = "C") -@@ -1228,7 +1232,7 @@ +@@ -1263,7 +1267,7 @@ # FLUIDSYNTH OPCODES Index: csound.spec =================================================================== RCS file: /cvs/extras/rpms/csound/FC-6/csound.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- csound.spec 29 Oct 2006 03:32:20 -0000 1.3 +++ csound.spec 1 Nov 2006 16:56:17 -0000 1.4 @@ -11,7 +11,7 @@ Summary: Csound - sound synthesis language and library Name: csound Version: 5.03.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://csound.sourceforge.net/ License: LGPL Group: Applications/Multimedia @@ -28,7 +28,7 @@ BuildRequires: tk-devel tcl-devel BuildRequires: tetex tetex-latex libxslt -Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2 +Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2 # NOTE: # Manual sources aren't distributed, but may be extracted from CVS via... @@ -40,8 +40,7 @@ Patch1: csound-5.03.0-gstabs-disable-option.patch Patch2: csound-5.03.0-no-usr-local.patch Patch3: csound-5.03.0-disable-atsa.patch -Patch4: csound-5.03.0-remote-fixes.patch - +Patch4: csound-5.03.0-default-opcodedir.patch %description Csound is a sound and music synthesis system, providing facilities for @@ -184,7 +183,7 @@ %patch1 -p1 -b .gstabs-disable-option %patch2 -p1 -b .no-usr-local %patch3 -p1 -b .disable-atsa -%patch4 -p1 -b .remote-fixes +%patch4 -p1 -b .default-opcodedir tar xf %{SOURCE1} @@ -403,6 +402,10 @@ %doc tutorial/*.py %changelog +* Wed Nov 1 2006 Dan Williams 5.03.0-8 +- CVS snapshot to pick up virtual Midi keyboard +- Make the default for OPCODEDIR be where the plugins are actually installed + * Sat Oct 28 2006 Dan Williams 5.03.0-7 - Rebuild to drop old source tarball Index: sources =================================================================== RCS file: /cvs/extras/rpms/csound/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Oct 2006 03:32:20 -0000 1.3 +++ sources 1 Nov 2006 16:56:17 -0000 1.4 @@ -1,2 +1,2 @@ acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz -8f01e4b65c3cb046df04f7eae92448d5 Csound5.03_src-cvs20061027.tar.bz2 +5211f0c1fb54484c29de996e09ca6e3c Csound5.03.0_src-cvs20061101.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 1 17:01:27 2006 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 1 Nov 2006 10:01:27 -0700 Subject: rpms/ctorrent/FC-5 .cvsignore, 1.3, 1.4 ctorrent.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611011701.kA1H1R9d032434@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/extras/rpms/ctorrent/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29500 Modified Files: .cvsignore ctorrent.spec sources Log Message: - upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307 - add more docs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Sep 2006 18:23:05 -0000 1.3 +++ .cvsignore 1 Nov 2006 17:00:54 -0000 1.4 @@ -1 +1 @@ -ctorrent-1.3.4.tar.bz2 +ctorrent-1.3.4-dnh2.1.tar.gz Index: ctorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-5/ctorrent.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ctorrent.spec 21 Sep 2006 18:23:05 -0000 1.3 +++ ctorrent.spec 1 Nov 2006 17:00:54 -0000 1.4 @@ -1,11 +1,13 @@ +%define dnh dnh2.1 + Name: ctorrent Version: 1.3.4 -Release: 1%{?dist} +Release: 2.%{dnh}%{?dist} Summary: BitTorrent Client written in C Group: Applications/Internet License: GPL -URL: http://ctorrent.sourceforge.net -Source0: http://switch.dl.sourceforge.net/sourceforge/ctorrent/%{name}-%{version}.tar.bz2 +URL: http://www.rahul.net/dholmes/ctorrent/ +Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -14,7 +16,7 @@ doesn't require any graphical component, such as an X server. %prep -%setup -q +%setup -q -n %{name}-%{dnh} %build %configure @@ -30,9 +32,13 @@ %files %defattr(-,root,root,-) %{_bindir}/ctorrent -%doc AUTHORS README NEWS +%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT %changelog +* Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski 1.3.4-2.dnh2.1 +- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307 +- add more docs + * Thu Sep 21 2006 Dominik 'Rathann' Mierzejewski 1.3.4-1 - update to 1.3.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Sep 2006 18:23:05 -0000 1.3 +++ sources 1 Nov 2006 17:00:54 -0000 1.4 @@ -1 +1 @@ -823010ec78215d476537c9eba9381cdd ctorrent-1.3.4.tar.bz2 +5cc1e46e1d1a3144f319cdec43256169 ctorrent-1.3.4-dnh2.1.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 17:06:22 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Nov 2006 10:06:22 -0700 Subject: rpms/freefont - New directory Message-ID: <200611011706.kA1H6M1X032609@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/freefont In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32601/freefont Log Message: Directory /cvs/extras/rpms/freefont added to the repository From fedora-extras-commits at redhat.com Wed Nov 1 17:06:28 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Nov 2006 10:06:28 -0700 Subject: rpms/freefont/devel - New directory Message-ID: <200611011706.kA1H6Slv032626@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/freefont/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32601/freefont/devel Log Message: Directory /cvs/extras/rpms/freefont/devel added to the repository From fedora-extras-commits at redhat.com Wed Nov 1 17:06:56 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Nov 2006 10:06:56 -0700 Subject: rpms/freefont Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611011706.kA1H6uWo032702@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/freefont In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32696 Added Files: Makefile import.log Log Message: Setup of module freefont --- NEW FILE Makefile --- # Top level Makefile for module freefont 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 Wed Nov 1 17:07:02 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Nov 2006 10:07:02 -0700 Subject: rpms/freefont/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611011707.kA1H72k6032720@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/freefont/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32696/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module freefont --- 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 Nov 1 17:08:32 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Nov 2006 10:08:32 -0700 Subject: rpms/freefont import.log,1.1,1.2 Message-ID: <200611011708.kA1H8WcM000339@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/freefont In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv303 Modified Files: import.log Log Message: auto-import freefont-20060126-3.fc5 on branch devel from freefont-20060126-3.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freefont/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Nov 2006 17:06:56 -0000 1.1 +++ import.log 1 Nov 2006 17:08:02 -0000 1.2 @@ -0,0 +1 @@ +freefont-20060126-3_fc5:HEAD:freefont-20060126-3.fc5.src.rpm:1162400874 From fedora-extras-commits at redhat.com Wed Nov 1 17:08:33 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Nov 2006 10:08:33 -0700 Subject: rpms/freefont/devel freefont.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611011708.kA1H8XaP000343@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/freefont/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv303/devel Modified Files: .cvsignore sources Added Files: freefont.spec Log Message: auto-import freefont-20060126-3.fc5 on branch devel from freefont-20060126-3.fc5.src.rpm --- NEW FILE freefont.spec --- %define fontdir %{_datadir}/fonts/freefont Name: freefont Version: 20060126 Release: 3%{?dist} Summary: Free UCS Outline Fonts Group: User Interface/X License: GPL URL: http://www.nongnu.org/freefont/ Source: http://savannah.nongnu.org/download/freefont/freefont-ttf-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: %{_datadir}/fonts Obsoletes: freefont-ttf < %{version}-%{release} Provides: freefont-ttf = %{version}-%{release} %description This project aims to privide a set of free scalable (i.e., OpenType) fonts covering the ISO 10646/Unicode UCS (Universal Character Set). %prep %setup -q %build %install rm -rf %{buildroot} install -d %{buildroot}%{fontdir} install -p -m644 *.ttf %{buildroot}%{fontdir}/ %clean rm -rf %{buildroot} %post if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache %{fontdir} || : fi %postun if [ $1 -eq 0 ]; then if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache %{fontdir} || : fi fi %files %defattr(0644,root,root,0755) %doc AUTHORS ChangeLog CREDITS COPYING README %dir %{fontdir} %{fontdir}/*.ttf %changelog * Tue Oct 31 2006 Orion Poplawski 20060126-3 - BOO! - Make Provides/Osoletes versioned - Make setup quiet * Wed Oct 25 2006 Orion Poplawski 20060126-2 - Remove fonts.cache refs - fc-cache /usr/share/fonts/freefont * Thu Oct 12 2006 Orion Poplawski 20060126-1 - freefont-ttf-20060126 * Tue Dec 06 2005 Rex Dieter 20051206-1 - freefont-ttf-20051206 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freefont/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Nov 2006 17:07:02 -0000 1.1 +++ .cvsignore 1 Nov 2006 17:08:03 -0000 1.2 @@ -0,0 +1 @@ +freefont-ttf-20060126.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/freefont/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Nov 2006 17:07:02 -0000 1.1 +++ sources 1 Nov 2006 17:08:03 -0000 1.2 @@ -0,0 +1 @@ +822aba4e2ed065d9d3ded6e26e495854 freefont-ttf-20060126.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 17:13:06 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 1 Nov 2006 10:13:06 -0700 Subject: rpms/csound/devel .cvsignore, 1.4, 1.5 csound-5.03.0-enable-fluidsynth.patch, 1.2, 1.3 csound.spec, 1.5, 1.6 sources, 1.4, 1.5 csound-5.03.0-remote-fixes.patch, 1.2, NONE Message-ID: <200611011713.kA1HD6Q3000473@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/csound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv444 Modified Files: .cvsignore csound-5.03.0-enable-fluidsynth.patch csound.spec sources Removed Files: csound-5.03.0-remote-fixes.patch Log Message: * Wed Nov 1 2006 Dan Williams 5.03.0-8 - CVS snapshot to pick up virtual Midi keyboard - Make the default for OPCODEDIR be where the plugins are actually installed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Oct 2006 21:12:05 -0000 1.4 +++ .cvsignore 1 Nov 2006 17:12:36 -0000 1.5 @@ -1,4 +1,3 @@ Csound5.03_manual.tgz Csound5.03_src.tgz -Csound5.03_src-cvs20061023.tar.bz2 -Csound5.03_src-cvs20061027.tar.bz2 +Csound5.03.0_src-cvs20061101.tar.bz2 csound-5.03.0-enable-fluidsynth.patch: Index: csound-5.03.0-enable-fluidsynth.patch =================================================================== RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-enable-fluidsynth.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- csound-5.03.0-enable-fluidsynth.patch 24 Oct 2006 04:35:22 -0000 1.2 +++ csound-5.03.0-enable-fluidsynth.patch 1 Nov 2006 17:12:36 -0000 1.3 @@ -1,24 +1,24 @@ ---- Csound5.03.0/SConstruct.enable-fluidsynth 2006-10-21 11:03:22.000000000 -0400 -+++ Csound5.03.0/SConstruct 2006-10-23 15:36:10.000000000 -0400 -@@ -225,6 +225,9 @@ +--- Csound5.03.0/SConstruct.enable-fluidsynth 2006-11-01 09:50:30.000000000 -0500 ++++ Csound5.03.0/SConstruct 2006-11-01 10:36:08.000000000 -0500 +@@ -224,6 +224,9 @@ '0') opts.Add('isWinNT', 'On windows, if win2000 or NT is used', '%d' % withMSVC()) +opts.Add('useFluidsynth', + 'Set to 1 if you want OSC support', + '0') - - # Define the common part of the build environment. - # This section also sets up customized options for third-party libraries, which -@@ -426,6 +429,7 @@ - pdhfound = configure.CheckHeader("m_pd.h", language = "C") - tclhfound = configure.CheckHeader("tcl.h", language = "C") + opts.Add('buildCSEditor', + 'Set to 1 to build the Csound syntax highlighting text editor. Requires FLTK headers and libs', + '0') +@@ -437,6 +440,7 @@ + tmp = '%s/tcl.h' % i + tclhfound = tclhfound or configure.CheckHeader(tmp, language = "C") luaFound = configure.CheckHeader("lua.h", language = "C") +fluidsynthFound = configure.CheckHeader("fluidsynth.h", language = "C") swigFound = 'swig' in commonEnvironment['TOOLS'] print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)]) pythonFound = configure.CheckHeader("Python.h", language = "C") -@@ -1228,7 +1232,7 @@ +@@ -1263,7 +1267,7 @@ # FLUIDSYNTH OPCODES Index: csound.spec =================================================================== RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- csound.spec 27 Oct 2006 21:12:05 -0000 1.5 +++ csound.spec 1 Nov 2006 17:12:36 -0000 1.6 @@ -11,7 +11,7 @@ Summary: Csound - sound synthesis language and library Name: csound Version: 5.03.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://csound.sourceforge.net/ License: LGPL Group: Applications/Multimedia @@ -28,7 +28,7 @@ BuildRequires: tk-devel tcl-devel BuildRequires: tetex tetex-latex libxslt -Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2 +Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2 # NOTE: # Manual sources aren't distributed, but may be extracted from CVS via... @@ -40,8 +40,7 @@ Patch1: csound-5.03.0-gstabs-disable-option.patch Patch2: csound-5.03.0-no-usr-local.patch Patch3: csound-5.03.0-disable-atsa.patch -Patch4: csound-5.03.0-remote-fixes.patch - +Patch4: csound-5.03.0-default-opcodedir.patch %description Csound is a sound and music synthesis system, providing facilities for @@ -184,7 +183,7 @@ %patch1 -p1 -b .gstabs-disable-option %patch2 -p1 -b .no-usr-local %patch3 -p1 -b .disable-atsa -%patch4 -p1 -b .remote-fixes +%patch4 -p1 -b .default-opcodedir tar xf %{SOURCE1} @@ -403,6 +402,13 @@ %doc tutorial/*.py %changelog +* Wed Nov 1 2006 Dan Williams 5.03.0-8 +- CVS snapshot to pick up virtual Midi keyboard +- Make the default for OPCODEDIR be where the plugins are actually installed + +* Sat Oct 28 2006 Dan Williams 5.03.0-7 +- Rebuild to drop old source tarball + * Fri Oct 27 2006 Dan Williams 5.03.0-6 - Update to a cvs snapshot for the remote plugin and a few other fixes - Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits Index: sources =================================================================== RCS file: /cvs/extras/rpms/csound/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Oct 2006 21:12:05 -0000 1.4 +++ sources 1 Nov 2006 17:12:36 -0000 1.5 @@ -1,3 +1,2 @@ acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz -58b8a3f2f7729387acb7cd365191a979 Csound5.03_src-cvs20061023.tar.bz2 -8f01e4b65c3cb046df04f7eae92448d5 Csound5.03_src-cvs20061027.tar.bz2 +5211f0c1fb54484c29de996e09ca6e3c Csound5.03.0_src-cvs20061101.tar.bz2 --- csound-5.03.0-remote-fixes.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 17:15:25 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 1 Nov 2006 10:15:25 -0700 Subject: rpms/csound/devel csound-5.03.0-default-opcodedir.patch,NONE,1.1 Message-ID: <200611011715.kA1HFPqE000584@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/csound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv560 Added Files: csound-5.03.0-default-opcodedir.patch Log Message: Add forgotten patch csound-5.03.0-default-opcodedir.patch: --- NEW FILE csound-5.03.0-default-opcodedir.patch --- --- Csound5.03.0/Top/csmodule.c.default-plugindir 2006-11-01 10:44:42.000000000 -0500 +++ Csound5.03.0/Top/csmodule.c 2006-11-01 10:45:58.000000000 -0500 @@ -123,17 +123,20 @@ /* default directory to load plugins from if environment variable is not set */ #if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__))) # define ENABLE_OPCODEDIR_WARNINGS 1 -# ifdef CS_DEFAULT_PLUGINDIR -# undef CS_DEFAULT_PLUGINDIR +# ifndef CS_DEFAULT_PLUGINDIR +# ifndef USE_DOUBLE +# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins" +# else +# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins" +# endif # endif -# define CS_DEFAULT_PLUGINDIR "." #else # define ENABLE_OPCODEDIR_WARNINGS 0 # ifndef CS_DEFAULT_PLUGINDIR # ifndef USE_DOUBLE -# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins" +# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins" # else -# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64" +# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins" # endif # endif #endif From fedora-extras-commits at redhat.com Wed Nov 1 17:15:53 2006 From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann)) Date: Wed, 1 Nov 2006 10:15:53 -0700 Subject: rpms/ctorrent/FC-4 .cvsignore, 1.2, 1.3 ctorrent.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611011715.kA1HFr8q000599@cvs-int.fedora.redhat.com> Author: rathann Update of /cvs/extras/rpms/ctorrent/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv556 Modified Files: .cvsignore ctorrent.spec sources Log Message: - upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307 - add more docs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 May 2006 23:54:20 -0000 1.2 +++ .cvsignore 1 Nov 2006 17:15:22 -0000 1.3 @@ -1 +1 @@ -ctorrent-1.3.2.tar.gz +ctorrent-1.3.4-dnh2.1.tar.gz Index: ctorrent.spec =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-4/ctorrent.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ctorrent.spec 27 May 2006 23:54:20 -0000 1.1 +++ ctorrent.spec 1 Nov 2006 17:15:22 -0000 1.2 @@ -1,22 +1,22 @@ -Name: ctorrent -Version: 1.3.2 -Release: 3%{?dist} -Summary: BitTorrent Client written in C - -Group: Applications/Internet -License: GPL -URL: http://ctorrent.sourceforge.net -Source0: http://download.sourceforge.net/ctorrent/ctorrent-1.3.2.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define dnh dnh2.1 -BuildRequires: openssl-devel +Name: ctorrent +Version: 1.3.4 +Release: 1.%{dnh}%{?dist} +Summary: BitTorrent Client written in C +Group: Applications/Internet +License: GPL +URL: http://www.rahul.net/dholmes/ctorrent/ +Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: openssl-devel %description CTorrent is a BitTorrent Client written in C that doesn't require any graphical component, such as an X server. %prep -%setup -q +%setup -q -n %{name}-%{dnh} %build %configure @@ -32,9 +32,13 @@ %files %defattr(-,root,root,-) %{_bindir}/ctorrent -%doc AUTHORS README NEWS +%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT %changelog +* Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski 1.3.4-1.dnh2.1 +- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307 +- add more docs + * Wed May 24 2006 Andrea Veri 1.3.2-3 - Added openssl-devel to BR - Removed libc.so.6 libc.so.6(GLIBC_2.0), libc.so.6(GLIBC_2.1) in BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctorrent/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 May 2006 23:54:20 -0000 1.2 +++ sources 1 Nov 2006 17:15:22 -0000 1.3 @@ -1 +1 @@ -1bc787df91285a9cec8509617c3152d6 ctorrent-1.3.2.tar.gz +5cc1e46e1d1a3144f319cdec43256169 ctorrent-1.3.4-dnh2.1.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 17:17:39 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Nov 2006 10:17:39 -0700 Subject: rpms/ntfs-3g/FC-5 ntfs-3g.spec,1.2,1.3 Message-ID: <200611011717.kA1HHdXV000734@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ntfs-3g/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv639/FC-5 Modified Files: ntfs-3g.spec Log Message: Obsolete ntfsprogs-fuse, make useful symlinks so old users just keep working. Index: ntfs-3g.spec =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/FC-5/ntfs-3g.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ntfs-3g.spec 25 Oct 2006 14:53:27 -0000 1.2 +++ ntfs-3g.spec 1 Nov 2006 17:17:09 -0000 1.3 @@ -3,7 +3,7 @@ Name: ntfs-3g Summary: Linux NTFS userspace driver Version: 0 -Release: 0.4.%{buildrev}%{?dist} +Release: 0.5.%{buildrev}%{?dist} License: GPL Group: System Environment/Base Source0: http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz @@ -14,6 +14,7 @@ Requires: fuse Epoch: 1 Provides: ntfsprogs-fuse = %{epoch}:%{version}-%{release} +Obsoletes: ntfsprogs-fuse Provides: fuse-ntfs-3g = %{epoch}:%{version}-%{release} %description @@ -56,6 +57,13 @@ rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g +# Actually make some symlinks for simplicity... +# ... since we're obsoleting ntfsprogs-fuse +cd $RPM_BUILD_ROOT%{_bindir} +ln -s ntfs-3g ntfsmount +cd $RPM_BUILD_ROOT/sbin +ln -s mount.ntfs-3g mount.ntfs-fuse + %clean rm -rf $RPM_BUILD_ROOT @@ -67,7 +75,9 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING CREDITS NEWS README /sbin/mount.ntfs-3g +/sbin/mount.ntfs-fuse %{_bindir}/ntfs-3g +%{_bindir}/ntfsmount %{_libdir}/libntfs-3g.so.* %{_mandir}/man8/* @@ -77,6 +87,10 @@ %{_libdir}/libntfs-3g.so %changelog +* Wed Nov 1 2006 Tom "spot" Callaway 1:0-0.5.20070920 +- add an obsoletes for ntfsprogs-fuse +- make some convenience symlinks + * Wed Oct 25 2006 Tom "spot" Callaway 1:0-0.4.20070920 - add some extra Provides From fedora-extras-commits at redhat.com Wed Nov 1 17:17:40 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Nov 2006 10:17:40 -0700 Subject: rpms/ntfs-3g/FC-6 ntfs-3g.spec,1.2,1.3 Message-ID: <200611011717.kA1HHeAn000738@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ntfs-3g/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv639/FC-6 Modified Files: ntfs-3g.spec Log Message: Obsolete ntfsprogs-fuse, make useful symlinks so old users just keep working. Index: ntfs-3g.spec =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/ntfs-3g.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ntfs-3g.spec 25 Oct 2006 14:53:28 -0000 1.2 +++ ntfs-3g.spec 1 Nov 2006 17:17:10 -0000 1.3 @@ -3,7 +3,7 @@ Name: ntfs-3g Summary: Linux NTFS userspace driver Version: 0 -Release: 0.4.%{buildrev}%{?dist} +Release: 0.5.%{buildrev}%{?dist} License: GPL Group: System Environment/Base Source0: http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz @@ -14,6 +14,7 @@ Requires: fuse Epoch: 1 Provides: ntfsprogs-fuse = %{epoch}:%{version}-%{release} +Obsoletes: ntfsprogs-fuse Provides: fuse-ntfs-3g = %{epoch}:%{version}-%{release} %description @@ -56,6 +57,13 @@ rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g +# Actually make some symlinks for simplicity... +# ... since we're obsoleting ntfsprogs-fuse +cd $RPM_BUILD_ROOT%{_bindir} +ln -s ntfs-3g ntfsmount +cd $RPM_BUILD_ROOT/sbin +ln -s mount.ntfs-3g mount.ntfs-fuse + %clean rm -rf $RPM_BUILD_ROOT @@ -67,7 +75,9 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING CREDITS NEWS README /sbin/mount.ntfs-3g +/sbin/mount.ntfs-fuse %{_bindir}/ntfs-3g +%{_bindir}/ntfsmount %{_libdir}/libntfs-3g.so.* %{_mandir}/man8/* @@ -77,6 +87,10 @@ %{_libdir}/libntfs-3g.so %changelog +* Wed Nov 1 2006 Tom "spot" Callaway 1:0-0.5.20070920 +- add an obsoletes for ntfsprogs-fuse +- make some convenience symlinks + * Wed Oct 25 2006 Tom "spot" Callaway 1:0-0.4.20070920 - add some extra Provides From fedora-extras-commits at redhat.com Wed Nov 1 17:17:41 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Nov 2006 10:17:41 -0700 Subject: rpms/ntfs-3g/devel ntfs-3g.spec,1.2,1.3 Message-ID: <200611011717.kA1HHfG4000741@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ntfs-3g/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv639/devel Modified Files: ntfs-3g.spec Log Message: Obsolete ntfsprogs-fuse, make useful symlinks so old users just keep working. Index: ntfs-3g.spec =================================================================== RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ntfs-3g.spec 25 Oct 2006 14:53:29 -0000 1.2 +++ ntfs-3g.spec 1 Nov 2006 17:17:11 -0000 1.3 @@ -3,7 +3,7 @@ Name: ntfs-3g Summary: Linux NTFS userspace driver Version: 0 -Release: 0.4.%{buildrev}%{?dist} +Release: 0.5.%{buildrev}%{?dist} License: GPL Group: System Environment/Base Source0: http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz @@ -14,6 +14,7 @@ Requires: fuse Epoch: 1 Provides: ntfsprogs-fuse = %{epoch}:%{version}-%{release} +Obsoletes: ntfsprogs-fuse Provides: fuse-ntfs-3g = %{epoch}:%{version}-%{release} %description @@ -56,6 +57,13 @@ rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g +# Actually make some symlinks for simplicity... +# ... since we're obsoleting ntfsprogs-fuse +cd $RPM_BUILD_ROOT%{_bindir} +ln -s ntfs-3g ntfsmount +cd $RPM_BUILD_ROOT/sbin +ln -s mount.ntfs-3g mount.ntfs-fuse + %clean rm -rf $RPM_BUILD_ROOT @@ -67,7 +75,9 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING CREDITS NEWS README /sbin/mount.ntfs-3g +/sbin/mount.ntfs-fuse %{_bindir}/ntfs-3g +%{_bindir}/ntfsmount %{_libdir}/libntfs-3g.so.* %{_mandir}/man8/* @@ -77,6 +87,10 @@ %{_libdir}/libntfs-3g.so %changelog +* Wed Nov 1 2006 Tom "spot" Callaway 1:0-0.5.20070920 +- add an obsoletes for ntfsprogs-fuse +- make some convenience symlinks + * Wed Oct 25 2006 Tom "spot" Callaway 1:0-0.4.20070920 - add some extra Provides From fedora-extras-commits at redhat.com Wed Nov 1 17:22:57 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Nov 2006 10:22:57 -0700 Subject: owners owners.list,1.1881,1.1882 Message-ID: <200611011722.kA1HMvqx000984@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv966 Modified Files: owners.list Log Message: Add freefont Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1881 retrieving revision 1.1882 diff -u -r1.1881 -r1.1882 --- owners.list 1 Nov 2006 13:55:16 -0000 1.1881 +++ owners.list 1 Nov 2006 17:22:27 -0000 1.1882 @@ -421,6 +421,7 @@ Fedora Extras|freedoom-freedm|Deathmatch levels for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|freefont|Free UCS Outline Fonts|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|freehdl|A project to develop a free, open source, GPL'ed VHDL simulator for Linux|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 1 17:39:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 1 Nov 2006 10:39:21 -0700 Subject: rpms/asymptote/FC-4 .cvsignore, 1.10, 1.11 asymptote.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200611011739.kA1HdLsA001116@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048/FC-4 Modified Files: .cvsignore asymptote.spec sources Log Message: Update to 1.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 25 Oct 2006 22:18:16 -0000 1.10 +++ .cvsignore 1 Nov 2006 17:38:51 -0000 1.11 @@ -1 +1 @@ -asymptote-1.16.tar.gz +asymptote-1.17.tar.gz Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-4/asymptote.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- asymptote.spec 25 Oct 2006 22:18:16 -0000 1.11 +++ asymptote.spec 1 Nov 2006 17:38:51 -0000 1.12 @@ -4,7 +4,7 @@ %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote -Version: 1.16 +Version: 1.17 Release: 1%{?dist} Summary: Descriptive vector graphics language @@ -138,6 +138,9 @@ %changelog +* Wed Nov 1 2006 Jose Pedro Oliveira - 1.17-1 +- Update to 1.17. + * Wed Oct 25 2006 Jose Pedro Oliveira - 1.16-1 - Update to 1.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 25 Oct 2006 22:18:16 -0000 1.10 +++ sources 1 Nov 2006 17:38:51 -0000 1.11 @@ -1 +1 @@ -ebdaa519a7672caa8c294ef8d90b23d9 asymptote-1.16.tar.gz +6fee58869caf0bdc89da24978af8f1d6 asymptote-1.17.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 17:39:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 1 Nov 2006 10:39:22 -0700 Subject: rpms/asymptote/FC-5 .cvsignore, 1.10, 1.11 asymptote.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200611011739.kA1HdMeB001121@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048/FC-5 Modified Files: .cvsignore asymptote.spec sources Log Message: Update to 1.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 25 Oct 2006 22:18:17 -0000 1.10 +++ .cvsignore 1 Nov 2006 17:38:52 -0000 1.11 @@ -1 +1 @@ -asymptote-1.16.tar.gz +asymptote-1.17.tar.gz Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-5/asymptote.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- asymptote.spec 25 Oct 2006 22:18:17 -0000 1.11 +++ asymptote.spec 1 Nov 2006 17:38:52 -0000 1.12 @@ -4,7 +4,7 @@ %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote -Version: 1.16 +Version: 1.17 Release: 1%{?dist} Summary: Descriptive vector graphics language @@ -138,6 +138,9 @@ %changelog +* Wed Nov 1 2006 Jose Pedro Oliveira - 1.17-1 +- Update to 1.17. + * Wed Oct 25 2006 Jose Pedro Oliveira - 1.16-1 - Update to 1.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 25 Oct 2006 22:18:17 -0000 1.10 +++ sources 1 Nov 2006 17:38:52 -0000 1.11 @@ -1 +1 @@ -ebdaa519a7672caa8c294ef8d90b23d9 asymptote-1.16.tar.gz +6fee58869caf0bdc89da24978af8f1d6 asymptote-1.17.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 17:39:28 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 1 Nov 2006 10:39:28 -0700 Subject: rpms/asymptote/FC-6 .cvsignore, 1.10, 1.11 asymptote.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200611011739.kA1HdS8X001126@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048/FC-6 Modified Files: .cvsignore asymptote.spec sources Log Message: Update to 1.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-6/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 25 Oct 2006 22:18:17 -0000 1.10 +++ .cvsignore 1 Nov 2006 17:38:57 -0000 1.11 @@ -1 +1 @@ -asymptote-1.16.tar.gz +asymptote-1.17.tar.gz Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-6/asymptote.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- asymptote.spec 25 Oct 2006 22:18:17 -0000 1.11 +++ asymptote.spec 1 Nov 2006 17:38:57 -0000 1.12 @@ -4,7 +4,7 @@ %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote -Version: 1.16 +Version: 1.17 Release: 1%{?dist} Summary: Descriptive vector graphics language @@ -138,6 +138,9 @@ %changelog +* Wed Nov 1 2006 Jose Pedro Oliveira - 1.17-1 +- Update to 1.17. + * Wed Oct 25 2006 Jose Pedro Oliveira - 1.16-1 - Update to 1.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-6/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 25 Oct 2006 22:18:17 -0000 1.10 +++ sources 1 Nov 2006 17:38:57 -0000 1.11 @@ -1 +1 @@ -ebdaa519a7672caa8c294ef8d90b23d9 asymptote-1.16.tar.gz +6fee58869caf0bdc89da24978af8f1d6 asymptote-1.17.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 17:39:29 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 1 Nov 2006 10:39:29 -0700 Subject: rpms/asymptote/devel .cvsignore, 1.10, 1.11 asymptote.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200611011739.kA1HdTb2001131@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048/devel Modified Files: .cvsignore asymptote.spec sources Log Message: Update to 1.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 25 Oct 2006 22:18:18 -0000 1.10 +++ .cvsignore 1 Nov 2006 17:38:58 -0000 1.11 @@ -1 +1 @@ -asymptote-1.16.tar.gz +asymptote-1.17.tar.gz Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- asymptote.spec 25 Oct 2006 22:18:18 -0000 1.11 +++ asymptote.spec 1 Nov 2006 17:38:58 -0000 1.12 @@ -4,7 +4,7 @@ %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote -Version: 1.16 +Version: 1.17 Release: 1%{?dist} Summary: Descriptive vector graphics language @@ -138,6 +138,9 @@ %changelog +* Wed Nov 1 2006 Jose Pedro Oliveira - 1.17-1 +- Update to 1.17. + * Wed Oct 25 2006 Jose Pedro Oliveira - 1.16-1 - Update to 1.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 25 Oct 2006 22:18:18 -0000 1.10 +++ sources 1 Nov 2006 17:38:58 -0000 1.11 @@ -1 +1 @@ -ebdaa519a7672caa8c294ef8d90b23d9 asymptote-1.16.tar.gz +6fee58869caf0bdc89da24978af8f1d6 asymptote-1.17.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 17:48:30 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Nov 2006 10:48:30 -0700 Subject: rpms/gambas/devel gambas.spec,1.19,1.20 Message-ID: <200611011748.kA1HmUjH001337@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1319 Modified Files: gambas.spec Log Message: Clean up examples files. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gambas.spec 31 Oct 2006 22:35:57 -0000 1.19 +++ gambas.spec 1 Nov 2006 17:48:00 -0000 1.20 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.17 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -251,6 +251,12 @@ --add-category X-Fedora \ debian/gambas.desktop +# Pull buildroot out of the examples files +for i in `grep -lr "$RPM_BUILD_ROOT" $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/`; +do + sed -i 's|$RPM_BUILD_ROOT||g' $i; +done + %clean rm -rf $RPM_BUILD_ROOT @@ -416,6 +422,9 @@ %{_datadir}/gambas/info/gb.xml.libxml.xslt.* %changelog +* Wed Nov 1 2006 Tom "spot" Callaway 1.0.17-5 +- pull buildroot out of the examples files + * Tue Oct 31 2006 Tom "spot" Callaway 1.0.17-4 - a spoooky halloween bump for development From fedora-extras-commits at redhat.com Wed Nov 1 18:03:35 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 1 Nov 2006 11:03:35 -0700 Subject: fedora-security/audit fe4,1.86,1.87 fe5,1.94,1.95 fe6,1.7,1.8 Message-ID: <200611011803.kA1I3Z9H004439@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4417 Modified Files: fe4 fe5 fe6 Log Message: moodle #206516 issues fixed Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- fe4 28 Oct 2006 06:48:21 -0000 1.86 +++ fe4 1 Nov 2006 18:03:32 -0000 1.87 @@ -8,21 +8,21 @@ CVE-2006-5454 VULNERABLE (bugzilla) #212355 CVE-2006-5453 VULNERABLE (bugzilla) #212355 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973 -CVE-2006-5129 ** (moodle) #206516 +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 -CVE-2006-4943 ** (moodle) #206516 -CVE-2006-4942 ** (moodle) #206516 -CVE-2006-4941 ** (moodle) #206516 -CVE-2006-4940 ** (moodle) #206516 -CVE-2006-4939 ** (moodle) #206516 -CVE-2006-4938 ** (moodle) #206516 -CVE-2006-4937 ** (moodle) #206516 -CVE-2006-4936 ** (moodle) #206516 -CVE-2006-4935 ** (moodle) #206516 -CVE-2006-4786 ** (moodle) #206516 -CVE-2006-4785 ** (moodle) #206516 -CVE-2006-4784 ** (moodle) #206516 +CVE-2006-4943 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4942 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4941 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4940 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4939 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4938 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514 CVE-2006-4571 VULNERABLE (seamonkey, fixed 1.0.5) #209167 CVE-2006-4570 VULNERABLE (seamonkey, fixed 1.0.5) #209167 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- fe5 28 Oct 2006 20:17:41 -0000 1.94 +++ fe5 1 Nov 2006 18:03:32 -0000 1.95 @@ -8,21 +8,21 @@ CVE-2006-5454 VULNERABLE (bugzilla) #212355 CVE-2006-5453 VULNERABLE (bugzilla) #212355 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973 -CVE-2006-5129 ** (moodle) #206516 +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 -CVE-2006-4943 ** (moodle) #206516 -CVE-2006-4942 ** (moodle) #206516 -CVE-2006-4941 ** (moodle) #206516 -CVE-2006-4940 ** (moodle) #206516 -CVE-2006-4939 ** (moodle) #206516 -CVE-2006-4938 ** (moodle) #206516 -CVE-2006-4937 ** (moodle) #206516 -CVE-2006-4936 ** (moodle) #206516 -CVE-2006-4935 ** (moodle) #206516 -CVE-2006-4786 ** (moodle) #206516 -CVE-2006-4785 ** (moodle) #206516 -CVE-2006-4784 ** (moodle) #206516 +CVE-2006-4943 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4942 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4941 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4940 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4939 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4938 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514 CVE-2006-4571 version (seamonkey, fixed 1.0.5) #209167 CVE-2006-4570 version (seamonkey, fixed 1.0.5) #209167 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fe6 28 Oct 2006 20:17:41 -0000 1.7 +++ fe6 1 Nov 2006 18:03:32 -0000 1.8 @@ -8,21 +8,21 @@ CVE-2006-5454 VULNERABLE (bugzilla) #212355 CVE-2006-5453 VULNERABLE (bugzilla) #212355 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973 -CVE-2006-5129 ** (moodle) #206516 +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 -CVE-2006-4943 ** (moodle) #206516 -CVE-2006-4942 ** (moodle) #206516 -CVE-2006-4941 ** (moodle) #206516 -CVE-2006-4940 ** (moodle) #206516 -CVE-2006-4939 ** (moodle) #206516 -CVE-2006-4938 ** (moodle) #206516 -CVE-2006-4937 ** (moodle) #206516 -CVE-2006-4936 ** (moodle) #206516 -CVE-2006-4935 ** (moodle) #206516 -CVE-2006-4786 ** (moodle) #206516 -CVE-2006-4785 ** (moodle) #206516 -CVE-2006-4784 ** (moodle) #206516 +CVE-2006-4943 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4942 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4941 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4940 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4939 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4938 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514 CVE-2006-4571 version (seamonkey, fixed 1.0.5) #209167 CVE-2006-4570 version (seamonkey, fixed 1.0.5) #209167 From fedora-extras-commits at redhat.com Wed Nov 1 18:04:42 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Wed, 1 Nov 2006 11:04:42 -0700 Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.33,1.34 Message-ID: <200611011804.kA1I4gii004469@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4451 Modified Files: deskbar-applet.spec Log Message: add gnome-python2 to BR Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- deskbar-applet.spec 1 Nov 2006 07:51:07 -0000 1.33 +++ deskbar-applet.spec 1 Nov 2006 18:04:12 -0000 1.34 @@ -3,7 +3,7 @@ Name: deskbar-applet Version: 2.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -16,7 +16,7 @@ BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras BuildRequires: gettext evolution-data-server-devel gnome-desktop-devel BuildRequires: libSM-devel gnome-python2-applet desktop-file-utils -BuildRequires: perl(XML::Parser) +BuildRequires: perl(XML::Parser) gnome-python2 Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo Requires: gnome-python2-gconf pygtk2 gnome-python2-libwnck Requires(pre): GConf2 @@ -91,6 +91,9 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Nov 1 2006 Luke Macken - 2.16.1-2 +- Add gnome-python2 to BuildRequires + * Wed Nov 1 2006 Luke Macken - 2.16.1-1 - 2.16.1 From fedora-extras-commits at redhat.com Wed Nov 1 18:33:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Nov 2006 11:33:06 -0700 Subject: rpms/kdemultimedia-extras/devel .cvsignore, 1.5, 1.6 kdemultimedia-extras.spec, 1.12, 1.13 sources, 1.5, 1.6 kde-libtool.patch, 1.1, NONE kdemultimedia-3.4.0-arts_includes.patch, 1.1, NONE kdemultimedia-3.5.0-116958.patch, 1.1, NONE Message-ID: <200611011833.kA1IX67a004730@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4710 Modified Files: .cvsignore kdemultimedia-extras.spec sources Removed Files: kde-libtool.patch kdemultimedia-3.4.0-arts_includes.patch kdemultimedia-3.5.0-116958.patch Log Message: * Wed Nov 01 2006 Rex Dieter 6:3.5.5-0.3 - use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg) * Wed Oct 25 2006 Rex Dieter 6:3.5.5-0.2 - exclude kfile_mpeg from main pkg (it's in -extras-nonfree). Arguably, doesn't *have* to be marked nonfree, but that's another battle. * Wed Oct 04 2006 Rex Dieter 6:3.5.5-0.1 - -extras: own %%_datadir/apps/juk/pics - 3.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Aug 2006 18:41:46 -0000 1.5 +++ .cvsignore 1 Nov 2006 18:32:36 -0000 1.6 @@ -1,3 +1,4 @@ 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 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kdemultimedia-extras.spec 4 Oct 2006 19:44:29 -0000 1.12 +++ kdemultimedia-extras.spec 1 Nov 2006 18:32:36 -0000 1.13 @@ -31,7 +31,7 @@ %if "%{?nonfree}" == "1" %define _with_akode --with-akode BuildRequires: akode-extras -%define _with_lame --with-lame --disable-lametest +%define _with_lame --with-lame %define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -66,8 +66,8 @@ #if "%{?core}" == "1" Epoch: 6 #endif -Version: 3.5.4 -Release: 8%{?dist}%{?kde} +Version: 3.5.5 +Release: 0.3%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" @@ -107,8 +107,6 @@ %{?_with_jack:BuildRequires: jack-audio-connection-kit} %{?_with_polypaudio:BuildRequires: polypaudio-devel} -Patch0: kde-libtool.patch -Patch1: kdemultimedia-3.4.0-arts_includes.patch Patch2: kdemultimedia-3.5.3-config.patch Patch3: kdemultimedia-3.4.0-xdg.patch @@ -119,8 +117,6 @@ Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch -# akode: http://bugs.kde.org/116958 -Patch116958: kdemultimedia-3.5.0-116958.patch %if "%{?core}" == "1" %description @@ -159,7 +155,7 @@ %description %{summary}, including: * akode_artsplugin (akode) -* juk (libtunepimp) +* juk %{?_with_musicbrainz:(libtunepimp)} * kfile-plugins: flac, mpc (taglib) %endif @@ -189,17 +185,16 @@ %setup -q -n kdemultimedia %endif -#patch0 -p1 -b .libtool -%if "%{version}" < "3.5.3" -%patch1 -p1 -b .arts_include -%endif %patch2 -p1 -b .config %patch3 -p1 -b .xdg -#with mpeglib in -extras, not really needed -- Rex +#with mpeglib in -extras-nonfree, not really needed -- Rex #patch1000 -p1 -b .oggvorbis_artsplugin %{?nonfree:%patch74744 -p1 -b .74744} -%patch116958 -p1 -b .116958 + +%if "%{?patched:1}" != "1" +%patch1001 -p1 -b .omit_kfile_mpeg +%endif %if "%{is_release}" != "1" make -f admin/Makefile.common cvs @@ -220,11 +215,18 @@ %{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"} +# -- disable-new-ldflags for nonfree/fc6, since --as-needed fails for lame -- Rex +# until either binutils or lame (livna bug #1207) is fixed + %configure \ --includedir=%{_includedir}/kde \ --disable-rpath \ --disable-gcc-hidden-visibility \ +%if "%{?fedora}" == "6" && "%{?nonfree:1}" == "1" + --disable-new-ldflags \ +%else --enable-new-ldflags \ +%endif --disable-debug --disable-warnings \ --disable-dependency-tracking --enable-final \ --without-libltdl \ @@ -273,12 +275,10 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -#if "%{?juk:1}" == "1" desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" --vendor="" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -380,7 +380,7 @@ %if "%{?core}" == "1" %post -/sbin/ldconfig +/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 ||: @@ -388,16 +388,16 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun -/sbin/ldconfig +/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 || : -%endif +%endif %if "%{?extras}" == "1" -#if "%{?juk:1}" == "1" + %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -409,13 +409,16 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -#endif -%endif +%endif %if "%{?nonfree}" == "1" -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig ||: + +%postun +/sbin/ldconfig ||: + %endif @@ -440,37 +443,113 @@ %{_libdir}/mcop/* %{_libdir}/kde3/* -%files devel +%files devel -f devel.list %defattr(-,root,root,-) %{_includedir}/* %endif %if "%{?extras}" == "1" -%files -f extras.list +#files -f extras.list +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README -%dir %{_datadir}/apps/juk/ +# juk +%{_bindir}/juk +%{_datadir}/applications/kde/juk.desktop +%{_datadir}/apps/juk +%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop +%{_datadir}/icons/crystalsvg/*/*/juk* +%{_datadir}/icons/hicolor/*/*/juk* +# kfile-plugins +%{_libdir}/kde3/kfile_flac.* +%{_libdir}/kde3/kfile_mpc.* +%{_datadir}/services/kfile_flac.desktop +%{_datadir}/services/kfile_mpc.desktop +# akode_artsplugin (free bits) +%{_libdir}/libarts_akode.[ls][ao] +%{_libdir}/libarts_akode.so.* +%{_libdir}/mcop/akodeMPCPlayObject.mcopclass +%{_libdir}/mcop/akodePlayObject.mcopclass +%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass +%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass +%{_libdir}/mcop/akodeXiphPlayObject.mcopclass +%{_libdir}/mcop/akodearts.mcopclass +%{_libdir}/mcop/akodearts.mcoptype %endif %if "%{?nonfree}" == "1" -%files -f nonfree.list +#files -f nonfree.list +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README -%dir %{_datadir}/apps/videothumbnail/ -## FIXME? -- Rex +%{_bindir}/yaf-cdda +%{_bindir}/yaf-mpgplay +%{_bindir}/yaf-splay +%{_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}/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 +#defattr(-,root,root,-) +%{_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 +%{_libdir}/mcop/NULLPlayObject.mcopclass +%{_libdir}/mcop/OGGPlayObject.mcopclass +%{_libdir}/mcop/SplayPlayObject.mcopclass +%{_libdir}/mcop/WAVPlayObject.mcopclass +%{_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" +%{_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/ %endif - %clean rm -rf $RPM_BUILD_ROOT %changelog -* Wed Oct 04 2006 Rex Dieter 6:3.5.4-8 -- respin +* Wed Nov 01 2006 Rex Dieter 6:3.5.5-0.3 +- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg) + +* Wed Oct 25 2006 Rex Dieter 6:3.5.5-0.2 +- exclude kfile_mpeg from main pkg (it's in -extras-nonfree). + Arguably, doesn't *have* to be marked nonfree, but that's another battle. + +* Wed Oct 04 2006 Rex Dieter 6:3.5.5-0.1 +- -extras: own %%_datadir/apps/juk/pics +- 3.5.5 * Tue Sep 19 2006 Rex Dieter 6:3.5.4-7 - -extras: drop --with-musicbrainz (for now) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Aug 2006 18:41:46 -0000 1.5 +++ sources 1 Nov 2006 18:32:36 -0000 1.6 @@ -1 +1 @@ -3cf5d9173232cadcf9042d7a60605de3 kdemultimedia-3.5.4-patched.tar.bz2 +7439844e5105091e2b93b3821d999da5 kdemultimedia-3.5.5-patched.tar.bz2 --- kde-libtool.patch DELETED --- --- kdemultimedia-3.4.0-arts_includes.patch DELETED --- --- kdemultimedia-3.5.0-116958.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 18:36:54 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Nov 2006 11:36:54 -0700 Subject: rpms/gambas/devel gambas.spec,1.20,1.21 Message-ID: <200611011836.kA1Ias4I004832@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4816 Modified Files: gambas.spec Log Message: double quotes, not single quotes. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gambas.spec 1 Nov 2006 17:48:00 -0000 1.20 +++ gambas.spec 1 Nov 2006 18:36:24 -0000 1.21 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.17 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -254,7 +254,7 @@ # Pull buildroot out of the examples files for i in `grep -lr "$RPM_BUILD_ROOT" $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/`; do - sed -i 's|$RPM_BUILD_ROOT||g' $i; + sed -i "s|$RPM_BUILD_ROOT||g" $i; done %clean @@ -422,6 +422,9 @@ %{_datadir}/gambas/info/gb.xml.libxml.xslt.* %changelog +* Wed Nov 1 2006 Tom "spot" Callaway 1.0.17-6 +- double quotes, not single quotes + * Wed Nov 1 2006 Tom "spot" Callaway 1.0.17-5 - pull buildroot out of the examples files From fedora-extras-commits at redhat.com Wed Nov 1 18:55:18 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Nov 2006 11:55:18 -0700 Subject: rpms/kdemultimedia-extras/FC-6 .cvsignore, 1.5, 1.6 kdemultimedia-extras.spec, 1.12, 1.13 sources, 1.5, 1.6 kde-libtool.patch, 1.1, NONE kdemultimedia-3.4.0-arts_includes.patch, 1.1, NONE kdemultimedia-3.5.0-116958.patch, 1.1, NONE Message-ID: <200611011855.kA1ItIXo004956@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4935 Modified Files: .cvsignore kdemultimedia-extras.spec sources Removed Files: kde-libtool.patch kdemultimedia-3.4.0-arts_includes.patch kdemultimedia-3.5.0-116958.patch Log Message: * Wed Nov 01 2006 Rex Dieter 6:3.5.5-0.3 - use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg) * Wed Oct 25 2006 Rex Dieter 6:3.5.5-0.2 - exclude kfile_mpeg from main pkg (it's in -extras-nonfree). Arguably, doesn't *have* to be marked nonfree, but that's another battle. * Wed Oct 04 2006 Rex Dieter 6:3.5.5-0.1 - -extras: own %%_datadir/apps/juk/pics - 3.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Aug 2006 18:41:46 -0000 1.5 +++ .cvsignore 1 Nov 2006 18:54:48 -0000 1.6 @@ -1,3 +1,2 @@ -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 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-6/kdemultimedia-extras.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kdemultimedia-extras.spec 4 Oct 2006 19:44:29 -0000 1.12 +++ kdemultimedia-extras.spec 1 Nov 2006 18:54:48 -0000 1.13 @@ -31,7 +31,7 @@ %if "%{?nonfree}" == "1" %define _with_akode --with-akode BuildRequires: akode-extras -%define _with_lame --with-lame --disable-lametest +%define _with_lame --with-lame %define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -66,8 +66,8 @@ #if "%{?core}" == "1" Epoch: 6 #endif -Version: 3.5.4 -Release: 8%{?dist}%{?kde} +Version: 3.5.5 +Release: 0.3%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" @@ -107,8 +107,6 @@ %{?_with_jack:BuildRequires: jack-audio-connection-kit} %{?_with_polypaudio:BuildRequires: polypaudio-devel} -Patch0: kde-libtool.patch -Patch1: kdemultimedia-3.4.0-arts_includes.patch Patch2: kdemultimedia-3.5.3-config.patch Patch3: kdemultimedia-3.4.0-xdg.patch @@ -119,8 +117,6 @@ Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch -# akode: http://bugs.kde.org/116958 -Patch116958: kdemultimedia-3.5.0-116958.patch %if "%{?core}" == "1" %description @@ -159,7 +155,7 @@ %description %{summary}, including: * akode_artsplugin (akode) -* juk (libtunepimp) +* juk %{?_with_musicbrainz:(libtunepimp)} * kfile-plugins: flac, mpc (taglib) %endif @@ -189,17 +185,16 @@ %setup -q -n kdemultimedia %endif -#patch0 -p1 -b .libtool -%if "%{version}" < "3.5.3" -%patch1 -p1 -b .arts_include -%endif %patch2 -p1 -b .config %patch3 -p1 -b .xdg -#with mpeglib in -extras, not really needed -- Rex +#with mpeglib in -extras-nonfree, not really needed -- Rex #patch1000 -p1 -b .oggvorbis_artsplugin %{?nonfree:%patch74744 -p1 -b .74744} -%patch116958 -p1 -b .116958 + +%if "%{?patched:1}" != "1" +%patch1001 -p1 -b .omit_kfile_mpeg +%endif %if "%{is_release}" != "1" make -f admin/Makefile.common cvs @@ -220,11 +215,18 @@ %{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"} +# -- disable-new-ldflags for nonfree/fc6, since --as-needed fails for lame -- Rex +# until either binutils or lame (livna bug #1207) is fixed + %configure \ --includedir=%{_includedir}/kde \ --disable-rpath \ --disable-gcc-hidden-visibility \ +%if "%{?fedora}" == "6" && "%{?nonfree:1}" == "1" + --disable-new-ldflags \ +%else --enable-new-ldflags \ +%endif --disable-debug --disable-warnings \ --disable-dependency-tracking --enable-final \ --without-libltdl \ @@ -273,12 +275,10 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -#if "%{?juk:1}" == "1" desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" --vendor="" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -380,7 +380,7 @@ %if "%{?core}" == "1" %post -/sbin/ldconfig +/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 ||: @@ -388,16 +388,16 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun -/sbin/ldconfig +/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 || : -%endif +%endif %if "%{?extras}" == "1" -#if "%{?juk:1}" == "1" + %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -409,13 +409,16 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -#endif -%endif +%endif %if "%{?nonfree}" == "1" -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig ||: + +%postun +/sbin/ldconfig ||: + %endif @@ -440,37 +443,113 @@ %{_libdir}/mcop/* %{_libdir}/kde3/* -%files devel +%files devel -f devel.list %defattr(-,root,root,-) %{_includedir}/* %endif %if "%{?extras}" == "1" -%files -f extras.list +#files -f extras.list +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README -%dir %{_datadir}/apps/juk/ +# juk +%{_bindir}/juk +%{_datadir}/applications/kde/juk.desktop +%{_datadir}/apps/juk +%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop +%{_datadir}/icons/crystalsvg/*/*/juk* +%{_datadir}/icons/hicolor/*/*/juk* +# kfile-plugins +%{_libdir}/kde3/kfile_flac.* +%{_libdir}/kde3/kfile_mpc.* +%{_datadir}/services/kfile_flac.desktop +%{_datadir}/services/kfile_mpc.desktop +# akode_artsplugin (free bits) +%{_libdir}/libarts_akode.[ls][ao] +%{_libdir}/libarts_akode.so.* +%{_libdir}/mcop/akodeMPCPlayObject.mcopclass +%{_libdir}/mcop/akodePlayObject.mcopclass +%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass +%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass +%{_libdir}/mcop/akodeXiphPlayObject.mcopclass +%{_libdir}/mcop/akodearts.mcopclass +%{_libdir}/mcop/akodearts.mcoptype %endif %if "%{?nonfree}" == "1" -%files -f nonfree.list +#files -f nonfree.list +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README -%dir %{_datadir}/apps/videothumbnail/ -## FIXME? -- Rex +%{_bindir}/yaf-cdda +%{_bindir}/yaf-mpgplay +%{_bindir}/yaf-splay +%{_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}/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 +#defattr(-,root,root,-) +%{_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 +%{_libdir}/mcop/NULLPlayObject.mcopclass +%{_libdir}/mcop/OGGPlayObject.mcopclass +%{_libdir}/mcop/SplayPlayObject.mcopclass +%{_libdir}/mcop/WAVPlayObject.mcopclass +%{_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" +%{_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/ %endif - %clean rm -rf $RPM_BUILD_ROOT %changelog -* Wed Oct 04 2006 Rex Dieter 6:3.5.4-8 -- respin +* Wed Nov 01 2006 Rex Dieter 6:3.5.5-0.3 +- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg) + +* Wed Oct 25 2006 Rex Dieter 6:3.5.5-0.2 +- exclude kfile_mpeg from main pkg (it's in -extras-nonfree). + Arguably, doesn't *have* to be marked nonfree, but that's another battle. + +* Wed Oct 04 2006 Rex Dieter 6:3.5.5-0.1 +- -extras: own %%_datadir/apps/juk/pics +- 3.5.5 * Tue Sep 19 2006 Rex Dieter 6:3.5.4-7 - -extras: drop --with-musicbrainz (for now) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Aug 2006 18:41:46 -0000 1.5 +++ sources 1 Nov 2006 18:54:48 -0000 1.6 @@ -1 +1 @@ -3cf5d9173232cadcf9042d7a60605de3 kdemultimedia-3.5.4-patched.tar.bz2 +7439844e5105091e2b93b3821d999da5 kdemultimedia-3.5.5-patched.tar.bz2 --- kde-libtool.patch DELETED --- --- kdemultimedia-3.4.0-arts_includes.patch DELETED --- --- kdemultimedia-3.5.0-116958.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 18:56:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Nov 2006 11:56:24 -0700 Subject: rpms/kdemultimedia-extras/FC-5 .cvsignore, 1.5, 1.6 kdemultimedia-extras.spec, 1.7, 1.8 sources, 1.6, 1.7 kde-libtool.patch, 1.1, NONE kdemultimedia-3.4.0-arts_includes.patch, 1.1, NONE kdemultimedia-3.5.0-116958.patch, 1.1, NONE Message-ID: <200611011856.kA1IuOnS005026@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5006 Modified Files: .cvsignore kdemultimedia-extras.spec sources Removed Files: kde-libtool.patch kdemultimedia-3.4.0-arts_includes.patch kdemultimedia-3.5.0-116958.patch Log Message: * Wed Nov 01 2006 Rex Dieter 6:3.5.5-0.3 - use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg) * Wed Oct 25 2006 Rex Dieter 6:3.5.5-0.2 - exclude kfile_mpeg from main pkg (it's in -extras-nonfree). Arguably, doesn't *have* to be marked nonfree, but that's another battle. * Wed Oct 04 2006 Rex Dieter 6:3.5.5-0.1 - -extras: own %%_datadir/apps/juk/pics - 3.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Sep 2006 20:25:28 -0000 1.5 +++ .cvsignore 1 Nov 2006 18:55:54 -0000 1.6 @@ -1,3 +1,2 @@ -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 Index: kdemultimedia-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kdemultimedia-extras.spec 7 Oct 2006 12:07:27 -0000 1.7 +++ kdemultimedia-extras.spec 1 Nov 2006 18:55:54 -0000 1.8 @@ -31,7 +31,7 @@ %if "%{?nonfree}" == "1" %define _with_akode --with-akode BuildRequires: akode-extras -%define _with_lame --with-lame --disable-lametest +%define _with_lame --with-lame %define _with_taglib --with-taglib %define _with_xine --with-xine %endif @@ -66,8 +66,8 @@ #if "%{?core}" == "1" Epoch: 6 #endif -Version: 3.5.4 -Release: 8%{?dist}%{?kde} +Version: 3.5.5 +Release: 0.3%{?dist}%{?kde} License: GPL %if "%{?patched:1}" == "1" @@ -107,8 +107,6 @@ %{?_with_jack:BuildRequires: jack-audio-connection-kit} %{?_with_polypaudio:BuildRequires: polypaudio-devel} -Patch0: kde-libtool.patch -Patch1: kdemultimedia-3.4.0-arts_includes.patch Patch2: kdemultimedia-3.5.3-config.patch Patch3: kdemultimedia-3.4.0-xdg.patch @@ -119,8 +117,6 @@ Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch -# akode: http://bugs.kde.org/116958 -Patch116958: kdemultimedia-3.5.0-116958.patch %if "%{?core}" == "1" %description @@ -159,7 +155,7 @@ %description %{summary}, including: * akode_artsplugin (akode) -* juk (libtunepimp) +* juk %{?_with_musicbrainz:(libtunepimp)} * kfile-plugins: flac, mpc (taglib) %endif @@ -189,17 +185,16 @@ %setup -q -n kdemultimedia %endif -#patch0 -p1 -b .libtool -%if "%{version}" < "3.5.3" -%patch1 -p1 -b .arts_include -%endif %patch2 -p1 -b .config %patch3 -p1 -b .xdg -#with mpeglib in -extras, not really needed -- Rex +#with mpeglib in -extras-nonfree, not really needed -- Rex #patch1000 -p1 -b .oggvorbis_artsplugin %{?nonfree:%patch74744 -p1 -b .74744} -%patch116958 -p1 -b .116958 + +%if "%{?patched:1}" != "1" +%patch1001 -p1 -b .omit_kfile_mpeg +%endif %if "%{is_release}" != "1" make -f admin/Makefile.common cvs @@ -220,11 +215,18 @@ %{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"} +# -- disable-new-ldflags for nonfree/fc6, since --as-needed fails for lame -- Rex +# until either binutils or lame (livna bug #1207) is fixed + %configure \ --includedir=%{_includedir}/kde \ --disable-rpath \ --disable-gcc-hidden-visibility \ +%if "%{?fedora}" == "6" && "%{?nonfree:1}" == "1" + --disable-new-ldflags \ +%else --enable-new-ldflags \ +%endif --disable-debug --disable-warnings \ --disable-dependency-tracking --enable-final \ --without-libltdl \ @@ -273,12 +275,10 @@ make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module done -#if "%{?juk:1}" == "1" desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" --vendor="" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop -#endif %if "%{?debug}" == "1" # Conflicts check (debuging only) @@ -380,7 +380,7 @@ %if "%{?core}" == "1" %post -/sbin/ldconfig +/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 ||: @@ -388,16 +388,16 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun -/sbin/ldconfig +/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 || : -%endif +%endif %if "%{?extras}" == "1" -#if "%{?juk:1}" == "1" + %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: @@ -409,13 +409,16 @@ touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done -#endif -%endif +%endif %if "%{?nonfree}" == "1" -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig ||: + +%postun +/sbin/ldconfig ||: + %endif @@ -440,38 +443,113 @@ %{_libdir}/mcop/* %{_libdir}/kde3/* -%files devel +%files devel -f devel.list %defattr(-,root,root,-) %{_includedir}/* %endif %if "%{?extras}" == "1" -%files -f extras.list +#files -f extras.list +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README -%dir %{_datadir}/apps/juk/ -%dir %{_datadir}/apps/juk/pics +# juk +%{_bindir}/juk +%{_datadir}/applications/kde/juk.desktop +%{_datadir}/apps/juk +%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop +%{_datadir}/icons/crystalsvg/*/*/juk* +%{_datadir}/icons/hicolor/*/*/juk* +# kfile-plugins +%{_libdir}/kde3/kfile_flac.* +%{_libdir}/kde3/kfile_mpc.* +%{_datadir}/services/kfile_flac.desktop +%{_datadir}/services/kfile_mpc.desktop +# akode_artsplugin (free bits) +%{_libdir}/libarts_akode.[ls][ao] +%{_libdir}/libarts_akode.so.* +%{_libdir}/mcop/akodeMPCPlayObject.mcopclass +%{_libdir}/mcop/akodePlayObject.mcopclass +%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass +%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass +%{_libdir}/mcop/akodeXiphPlayObject.mcopclass +%{_libdir}/mcop/akodearts.mcopclass +%{_libdir}/mcop/akodearts.mcoptype %endif %if "%{?nonfree}" == "1" -%files -f nonfree.list +#files -f nonfree.list +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README -%dir %{_datadir}/apps/videothumbnail/ -## FIXME? -- Rex +%{_bindir}/yaf-cdda +%{_bindir}/yaf-mpgplay +%{_bindir}/yaf-splay +%{_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}/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 +#defattr(-,root,root,-) +%{_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 +%{_libdir}/mcop/NULLPlayObject.mcopclass +%{_libdir}/mcop/OGGPlayObject.mcopclass +%{_libdir}/mcop/SplayPlayObject.mcopclass +%{_libdir}/mcop/WAVPlayObject.mcopclass +%{_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" +%{_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/ %endif - %clean rm -rf $RPM_BUILD_ROOT %changelog -* Wed Oct 04 2006 Rex Dieter 6:3.5.4-8 +* Wed Nov 01 2006 Rex Dieter 6:3.5.5-0.3 +- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg) + +* Wed Oct 25 2006 Rex Dieter 6:3.5.5-0.2 +- exclude kfile_mpeg from main pkg (it's in -extras-nonfree). + Arguably, doesn't *have* to be marked nonfree, but that's another battle. + +* Wed Oct 04 2006 Rex Dieter 6:3.5.5-0.1 - -extras: own %%_datadir/apps/juk/pics +- 3.5.5 * Tue Sep 19 2006 Rex Dieter 6:3.5.4-7 - -extras: drop --with-musicbrainz (for now) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Sep 2006 20:25:28 -0000 1.6 +++ sources 1 Nov 2006 18:55:54 -0000 1.7 @@ -1 +1 @@ -3cf5d9173232cadcf9042d7a60605de3 kdemultimedia-3.5.4-patched.tar.bz2 +7439844e5105091e2b93b3821d999da5 kdemultimedia-3.5.5-patched.tar.bz2 --- kde-libtool.patch DELETED --- --- kdemultimedia-3.4.0-arts_includes.patch DELETED --- --- kdemultimedia-3.5.0-116958.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 19:06:46 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 1 Nov 2006 12:06:46 -0700 Subject: fedora-security/audit fc5,1.378,1.379 fc6,1.131,1.132 Message-ID: <200611011906.kA1J6kKm008126@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8106 Modified Files: fc5 fc6 Log Message: Note a new rpm issue Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- fc5 31 Oct 2006 19:47:47 -0000 1.378 +++ fc5 1 Nov 2006 19:06:43 -0000 1.379 @@ -12,6 +12,7 @@ CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4) CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4) CVE-2006-5467 VULNERABLE (ruby) #212396 +CVE-2006-5466 VULNERABLE (rpm) #212833 CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only) CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2) Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- fc6 31 Oct 2006 19:47:47 -0000 1.131 +++ fc6 1 Nov 2006 19:06:43 -0000 1.132 @@ -12,6 +12,7 @@ CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4) CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4) CVE-2006-5467 VULNERABLE (ruby) #212396 +CVE-2006-5466 VULNERABLE (rpm) #212833 CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2) From fedora-extras-commits at redhat.com Wed Nov 1 19:26:29 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Nov 2006 12:26:29 -0700 Subject: rpms/evolution-bogofilter/devel evolution-bogofilter.spec,1.1,1.2 Message-ID: <200611011926.kA1JQTZg008600@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/evolution-bogofilter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8584 Modified Files: evolution-bogofilter.spec Log Message: Bump for new evo in devel. Index: evolution-bogofilter.spec =================================================================== RCS file: /cvs/extras/rpms/evolution-bogofilter/devel/evolution-bogofilter.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-bogofilter.spec 1 Oct 2006 04:42:02 -0000 1.1 +++ evolution-bogofilter.spec 1 Nov 2006 19:25:59 -0000 1.2 @@ -3,7 +3,7 @@ Name: evolution-bogofilter Summary: A plugin for bogofilter support in evolution Version: 0.2.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://people.altlinux.ru/~mhz/software/projects/bf-eplugin/ @@ -54,6 +54,9 @@ %{_libdir}/evolution/%{evopluginver}/plugins/* %changelog +* Wed Nov 1 2006 Tom "spot" Callaway 0.2.0-4 +- bump for new evo in devel + * Fri Sep 29 2006 Tom "spot" Callaway 0.2.0-3 - add URL, even if it is a bit pointless - add docs From fedora-extras-commits at redhat.com Wed Nov 1 22:34:09 2006 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Wed, 1 Nov 2006 15:34:09 -0700 Subject: rpms/ruby-bdb - New directory Message-ID: <200611012234.kA1MY9wt018886@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/ruby-bdb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18881/ruby-bdb Log Message: Directory /cvs/extras/rpms/ruby-bdb added to the repository From fedora-extras-commits at redhat.com Wed Nov 1 22:34:14 2006 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Wed, 1 Nov 2006 15:34:14 -0700 Subject: rpms/ruby-bdb/devel - New directory Message-ID: <200611012234.kA1MYEmO018899@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/ruby-bdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18881/ruby-bdb/devel Log Message: Directory /cvs/extras/rpms/ruby-bdb/devel added to the repository From fedora-extras-commits at redhat.com Wed Nov 1 22:34:26 2006 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Wed, 1 Nov 2006 15:34:26 -0700 Subject: rpms/ruby-bdb Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611012234.kA1MYQ7o018930@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/ruby-bdb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18924 Added Files: Makefile import.log Log Message: Setup of module ruby-bdb --- NEW FILE Makefile --- # Top level Makefile for module ruby-bdb 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 Wed Nov 1 22:34:32 2006 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Wed, 1 Nov 2006 15:34:32 -0700 Subject: rpms/ruby-bdb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611012234.kA1MYWrA018946@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/ruby-bdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18924/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ruby-bdb --- 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 Nov 1 22:35:23 2006 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Wed, 1 Nov 2006 15:35:23 -0700 Subject: rpms/ruby-bdb/devel ruby-bdb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611012235.kA1MZNco019025@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/ruby-bdb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18987/devel Modified Files: .cvsignore sources Added Files: ruby-bdb.spec Log Message: auto-import ruby-bdb-0.5.9-6 on branch devel from ruby-bdb-0.5.9-6.src.rpm --- NEW FILE ruby-bdb.spec --- %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")} %define tarname bdb Summary: Sleepycat Berkeley DB and DB XML Name: ruby-bdb Version: 0.5.9 Release: 6%{?dist} License: Ruby License Group: Development/Libraries Source: ftp://moulon.inra.fr/pub/ruby/%{tarname}-%{version}.tar.gz URL: http://moulon.inra.fr/ruby/bdb.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby, ruby-devel, db4-devel Requires: ruby(abi) = 1.8 Provides: ruby(bdb) = %{version} %description Berkeley DB is an embedded database system that supports keyed access to data. %prep %setup -q -n %{tarname}-%{version} %build ruby extconf.rb make %{?_smp_mflags} %check make test %clean rm -rf $RPM_BUILD_ROOT %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %files %defattr(-,root,root) %doc Changes README.en bdb.html bdb.rd docs/ examples/ %{ruby_sitearch}/bdb.so %changelog * Fri Oct 20 2006 Michael Rice - 0.5.9-6 - Adjust to make 'test' * Thu Oct 19 2006 Michael Rice - 0.5.9-5 - Add make tests - Remove tests/ from package * Mon Oct 16 2006 Michael Rice - 0.5.9-4 - Remove unneeded Require for bdb (thanks Jason Tibbitts) * Mon Oct 09 2006 Michael Rice - 0.5.9-3 - add proper Requires per wiki guidelines - add provides per wiki guidelines - add -q into setup per bugzilla request 209965 - Change license to ruby license per bugzilla 209965 - Remove the conditional stuff since its not possible to build for older ruby in extras * Mon Oct 09 2006 Michael Rice - 0.5.9-2 - add smp_mflags to make line - remove find command and replace with list instead - add ruby_sitesearch for bdb.so - remove strip to create a debug package * Sun Sep 10 2006 Michael Rice 0.5.9-1 - 0.5.9 * Tue May 17 2005 Ian Macdonald 0.5.6-1 - 0.5.6 * Fri Dec 31 2004 Ian Macdonald 0.5.4-1 - 0.5.4 * Sat Nov 20 2004 Ian Macdonald 0.5.3-1 - 0.5.3 * Thu Nov 18 2004 Ian Macdonald 0.5.2-1 - 0.5.2 * Fri Jul 25 2003 Ian Macdonald 0.4.6-1 - 0.4.6 * Mon Jul 7 2003 Ian Macdonald 0.4.5-1 - 0.4.5 * Tue Jun 24 2003 Ian Macdonald 0.4.4-1 - 0.4.4 * Wed Jun 10 2003 Ian Macdonald 0.4.3-1 - 0.4.3 * Wed May 28 2003 Ian Macdonald 0.4.2-1 - 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ruby-bdb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Nov 2006 22:34:32 -0000 1.1 +++ .cvsignore 1 Nov 2006 22:34:53 -0000 1.2 @@ -0,0 +1 @@ +bdb-0.5.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ruby-bdb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Nov 2006 22:34:32 -0000 1.1 +++ sources 1 Nov 2006 22:34:53 -0000 1.2 @@ -0,0 +1 @@ +b4bb9f2811e395f9c7e49c7fd9a977b0 bdb-0.5.9.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 22:35:22 2006 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Wed, 1 Nov 2006 15:35:22 -0700 Subject: rpms/ruby-bdb import.log,1.1,1.2 Message-ID: <200611012235.kA1MZMVC019021@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/rpms/ruby-bdb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18987 Modified Files: import.log Log Message: auto-import ruby-bdb-0.5.9-6 on branch devel from ruby-bdb-0.5.9-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ruby-bdb/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Nov 2006 22:34:26 -0000 1.1 +++ import.log 1 Nov 2006 22:34:52 -0000 1.2 @@ -0,0 +1 @@ +ruby-bdb-0_5_9-6:HEAD:ruby-bdb-0.5.9-6.src.rpm:1162420488 From fedora-extras-commits at redhat.com Wed Nov 1 22:41:10 2006 From: fedora-extras-commits at redhat.com (Michael Rice (errr)) Date: Wed, 1 Nov 2006 15:41:10 -0700 Subject: owners owners.list,1.1882,1.1883 Message-ID: <200611012241.kA1MfAon019121@cvs-int.fedora.redhat.com> Author: errr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19078 Modified Files: owners.list Log Message: Adding my self as maintainer to ruby-bdb bug: 209965 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1882 retrieving revision 1.1883 diff -u -r1.1882 -r1.1883 --- owners.list 1 Nov 2006 17:22:27 -0000 1.1882 +++ owners.list 1 Nov 2006 22:40:40 -0000 1.1883 @@ -2026,6 +2026,7 @@ Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org| +Fedora Extras|ruby-bdb|A Ruby interface to Berkeley DB|miker5slow at grandecom.net|extras-qa at fedoraproject.org| Fedora Extras|ruby-mysql|A Ruby interface to MySQL|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|ruby-postgres|A Ruby interface to Postgres|dlutter at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ruby-racc|A Ruby LALR(1) Parser Generator|dlutter at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 1 22:41:30 2006 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Wed, 1 Nov 2006 15:41:30 -0700 Subject: rpms/sysprof/devel .cvsignore, 1.2, 1.3 sysprof.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200611012241.kA1MfUQw019126@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19082 Modified Files: .cvsignore sysprof.spec sources Log Message: version updated to 1.0.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sysprof/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Oct 2006 14:40:56 -0000 1.2 +++ .cvsignore 1 Nov 2006 22:40:59 -0000 1.3 @@ -1 +1 @@ -sysprof-1.0.3.tar.gz +sysprof-1.0.5.tar.gz Index: sysprof.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sysprof.spec 8 Oct 2006 21:31:17 -0000 1.3 +++ sysprof.spec 1 Nov 2006 22:40:59 -0000 1.4 @@ -1,6 +1,6 @@ Name: sysprof -Version: 1.0.3 -Release: 6%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: Sysprof is a sampling CPU profiler Group: Development/System License: GPL @@ -61,13 +61,16 @@ %{_datadir}/applications/*.desktop %changelog -* Sun Oct 8 2006 Gianluca Sforna 1.0.3-6 +* Wed Nov 1 2006 Gianluca Sforna 1.0.5-1 +- version update + +* Sun Oct 8 2006 Gianluca Sforna 1.0.3-6 - better to use ExclusiveArch %{ix86} (thanks Ville) -* Thu Oct 5 2006 Gianluca Sforna 1.0.3-5 +* Thu Oct 5 2006 Gianluca Sforna 1.0.3-5 - add ExclusiveArch to match sysprof-kmod supported archs -* Tue Oct 2 2006 Gianluca Sforna 1.0.3-4 +* Tue Oct 2 2006 Gianluca Sforna 1.0.3-4 - add .desktop file * Fri Sep 30 2006 Gianluca Sforna 1.0.3-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sysprof/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Oct 2006 14:40:56 -0000 1.2 +++ sources 1 Nov 2006 22:40:59 -0000 1.3 @@ -1 +1 @@ -8949fe32a073b84cb2abb7f9d608f755 sysprof-1.0.3.tar.gz +cc71e4cee32ebe4dca02c272d0877fb2 sysprof-1.0.5.tar.gz From fedora-extras-commits at redhat.com Wed Nov 1 22:49:30 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 15:49:30 -0700 Subject: rpms/gdeskcal/FC-5 gdeskcal.spec,1.10,1.11 Message-ID: <200611012249.kA1MnUK2019249@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19233 Modified Files: gdeskcal.spec Log Message: Added perl(XML::Parser) gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gdeskcal.spec 1 Nov 2006 10:52:28 -0000 1.10 +++ gdeskcal.spec 1 Nov 2006 22:49:00 -0000 1.11 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, perl(XML::Parser) Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 From fedora-extras-commits at redhat.com Wed Nov 1 22:51:14 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 15:51:14 -0700 Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.13,1.14 Message-ID: <200611012251.kA1MpEuv019317@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19299 Modified Files: gdeskcal.spec Log Message: Added BR perl(XML::Parser) gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gdeskcal.spec 1 Nov 2006 10:53:53 -0000 1.13 +++ gdeskcal.spec 1 Nov 2006 22:50:44 -0000 1.14 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, perl(XML::Parser) Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 From fedora-extras-commits at redhat.com Wed Nov 1 22:53:25 2006 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Wed, 1 Nov 2006 15:53:25 -0700 Subject: rpms/sysprof-kmod/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sysprof-kmod.spec, 1.9, 1.10 sysprof-config.patch, 1.1, NONE Message-ID: <200611012253.kA1MrPIf019404@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19361 Modified Files: .cvsignore sources sysprof-kmod.spec Removed Files: sysprof-config.patch Log Message: update to version 1.0.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Oct 2006 16:27:26 -0000 1.2 +++ .cvsignore 1 Nov 2006 22:52:55 -0000 1.3 @@ -1 +1 @@ -sysprof-1.0.3.tar.gz +sysprof-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Oct 2006 16:27:26 -0000 1.2 +++ sources 1 Nov 2006 22:52:55 -0000 1.3 @@ -1 +1 @@ -8949fe32a073b84cb2abb7f9d608f755 sysprof-1.0.3.tar.gz +cc71e4cee32ebe4dca02c272d0877fb2 sysprof-1.0.5.tar.gz Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sysprof-kmod.spec 17 Oct 2006 12:12:34 -0000 1.9 +++ sysprof-kmod.spec 1 Nov 2006 22:52:55 -0000 1.10 @@ -29,8 +29,8 @@ Name: %{kmod_name}-kmod -Version: 1.0.3 -Release: 5.%(echo %{kverrel} | tr - _) +Version: 1.0.5 +Release: 1.%(echo %{kverrel} | tr - _) Summary: Sysprof kernel module Group: System Environment/Kernel @@ -40,7 +40,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: %{kmod_name}-avoid_depmod.patch -Patch1: %{kmod_name}-config.patch ExclusiveArch: i586 i686 x86_64 @@ -64,7 +63,6 @@ %setup -q -c -T -a 0 pushd %{kmod_name}-%{version}* %patch0 -p1 -b .patch0 -%patch1 -p1 -b .patch1 # configure script breaks in mock builds (missing BRs), so we create here # a config.h with the needed symbol echo '#define PACKAGE_VERSION "%{version}"' > config.h @@ -105,6 +103,10 @@ %changelog +* Wed Nov 1 2006 Gianluca Sforna 1.0.5-1 +- version update +- drop upstreamed patch + * Tue Oct 17 2006 Gianluca Sforna - rebuild for kernel 2.6.18-1.2798 --- sysprof-config.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 1 22:53:40 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 15:53:40 -0700 Subject: rpms/gdeskcal/devel gdeskcal.spec,1.13,1.14 Message-ID: <200611012253.kA1Mrec6019409@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19367 Modified Files: gdeskcal.spec Log Message: Added BR perl(XML::Parser) gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gdeskcal.spec 1 Nov 2006 10:55:20 -0000 1.13 +++ gdeskcal.spec 1 Nov 2006 22:53:10 -0000 1.14 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, perl(XML::Parser) Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -62,6 +62,9 @@ %{_libdir}/%{name}/ %changelog +* Wed Nov 01 2006 Paul F. Johnson 1.0-5 +- added BR perl(xml-parser) + * Wed Nov 01 2006 Paul F. Johnson 1.0-4 - added post and postun - conditional for the X-Fedora in the desktop icon From fedora-extras-commits at redhat.com Wed Nov 1 22:58:15 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 15:58:15 -0700 Subject: rpms/anjuta-gdl import.log,1.5,1.6 Message-ID: <200611012258.kA1MwF5X019579@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta-gdl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19549 Modified Files: import.log Log Message: auto-import anjuta-gdl-0.6.1-5 on branch FC-5 from anjuta-gdl-0.6.1-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 9 Jul 2006 12:34:13 -0000 1.5 +++ import.log 1 Nov 2006 22:57:45 -0000 1.6 @@ -2,3 +2,4 @@ anjuta-gdl-0_6_1-2:HEAD:anjuta-gdl-0.6.1-2.src.rpm:1149112710 anjuta-gdl-0_6_1-3:HEAD:anjuta-gdl-0.6.1-3.src.rpm:1152396216 anjuta-gdl-0_6_1-4:HEAD:anjuta-gdl-0.6.1-4.src.rpm:1152448435 +anjuta-gdl-0_6_1-5:FC-5:anjuta-gdl-0.6.1-5.src.rpm:1162421844 From fedora-extras-commits at redhat.com Wed Nov 1 22:58:16 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 1 Nov 2006 15:58:16 -0700 Subject: rpms/anjuta-gdl/FC-5 anjuta-gdl.spec,1.6,1.7 Message-ID: <200611012258.kA1MwGhe019582@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta-gdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19549/FC-5 Modified Files: anjuta-gdl.spec Log Message: auto-import anjuta-gdl-0.6.1-5 on branch FC-5 from anjuta-gdl-0.6.1-5.src.rpm Index: anjuta-gdl.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta-gdl/FC-5/anjuta-gdl.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- anjuta-gdl.spec 30 Sep 2006 20:03:52 -0000 1.6 +++ anjuta-gdl.spec 1 Nov 2006 22:57:45 -0000 1.7 @@ -25,6 +25,7 @@ %prep %setup -q -n gdl-%{version} +sed -i -e "s/Name: gdl/Name: anjuta-gdl/" gdl-1.0.pc.in %build %configure --disable-static @@ -36,6 +37,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' %find_lang gdl-1 +mv %{buildroot}/%{_libdir}/pkgconfig/gdl-1.0.pc %{buildroot}/%{_libdir}/pkgconfig/anjuta-gdl-1.0.pc %clean rm -rf ${RPM_BUILD_ROOT} @@ -54,11 +56,11 @@ %defattr (-, root, root) %{_includedir}/libgdl-1.0 %{_libdir}/libgdl-1.so -%{_libdir}/pkgconfig/gdl-1.0.pc +%{_libdir}/pkgconfig/anjuta-gdl-1.0.pc %changelog -* Sat Sep 30 2006 Paul F. Johnson 0.6.1-5 -- rebuild +* Sun Jul 09 2006 Paul F. Johnson 0.6.1-5 +- renamed .pc file to anjuta-gdl as gdl is used by another package * Sun Jul 09 2006 Paul F. Johnson 0.6.1-4 - fixed the missing -devel package deps properly (thanks Mike) From fedora-extras-commits at redhat.com Thu Nov 2 04:47:33 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Wed, 1 Nov 2006 21:47:33 -0700 Subject: rpms/libibverbs import.log,1.13,1.14 Message-ID: <200611020447.kA24lXEv006953@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6917 Modified Files: import.log Log Message: auto-import libibverbs-1.0.4-1 on branch devel from libibverbs-1.0.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 2 May 2006 22:55:26 -0000 1.13 +++ import.log 2 Nov 2006 04:47:03 -0000 1.14 @@ -10,3 +10,4 @@ libibverbs-1_0_3-1:HEAD:libibverbs-1.0.3-1.src.rpm:1146610338 libibverbs-1_0_3-1:FC-5:libibverbs-1.0.3-1.src.rpm:1146610477 libibverbs-1_0_3-1:FC-4:libibverbs-1.0.3-1.src.rpm:1146610524 +libibverbs-1_0_4-1:HEAD:libibverbs-1.0.4-1.src.rpm:1162442818 From fedora-extras-commits at redhat.com Thu Nov 2 04:47:34 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Wed, 1 Nov 2006 21:47:34 -0700 Subject: rpms/libibverbs/devel .cvsignore, 1.7, 1.8 libibverbs.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200611020447.kA24lYN4006958@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6917/devel Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.4-1 on branch devel from libibverbs-1.0.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 May 2006 22:52:22 -0000 1.7 +++ .cvsignore 2 Nov 2006 04:47:04 -0000 1.8 @@ -1 +1 @@ -libibverbs-1.0.3.tar.gz +libibverbs-1.0.4.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libibverbs.spec 12 Sep 2006 18:08:08 -0000 1.7 +++ libibverbs.spec 2 Nov 2006 04:47:04 -0000 1.8 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0.3 +%define ver 1.0.4 Name: libibverbs -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_includedir}/sysfs/libsysfs.h @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu May 4 2006 Roland Dreier - 1.0.4-1 +- New upstream release + * Mon Mar 14 2006 Roland Dreier - 1.0.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 May 2006 22:52:22 -0000 1.7 +++ sources 2 Nov 2006 04:47:04 -0000 1.8 @@ -1 +1 @@ -344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz +f075cef91b9a1d3445c3859cb7880b2f libibverbs-1.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 04:52:14 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Wed, 1 Nov 2006 21:52:14 -0700 Subject: rpms/libibverbs/FC-4 libibverbs.spec,1.6,1.7 sources,1.7,1.8 Message-ID: <200611020452.kA24qE5e007138@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7090/FC-4 Modified Files: libibverbs.spec sources Log Message: Import libibverbs 1.0.4 release Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libibverbs.spec 2 May 2006 22:55:27 -0000 1.6 +++ libibverbs.spec 2 Nov 2006 04:51:44 -0000 1.7 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0.3 +%define ver 1.0.4 Name: libibverbs -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_includedir}/sysfs/libsysfs.h @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu May 4 2006 Roland Dreier - 1.0.4-1 +- New upstream release + * Mon Mar 14 2006 Roland Dreier - 1.0.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 May 2006 22:55:27 -0000 1.7 +++ sources 2 Nov 2006 04:51:44 -0000 1.8 @@ -1 +1 @@ -344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz +f075cef91b9a1d3445c3859cb7880b2f libibverbs-1.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 04:52:21 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Wed, 1 Nov 2006 21:52:21 -0700 Subject: rpms/libibverbs/FC-6 libibverbs.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <200611020452.kA24qLhO007146@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7090/FC-6 Modified Files: libibverbs.spec sources Log Message: Import libibverbs 1.0.4 release Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-6/libibverbs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libibverbs.spec 12 Sep 2006 18:08:08 -0000 1.7 +++ libibverbs.spec 2 Nov 2006 04:51:50 -0000 1.8 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0.3 +%define ver 1.0.4 Name: libibverbs -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_includedir}/sysfs/libsysfs.h @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu May 4 2006 Roland Dreier - 1.0.4-1 +- New upstream release + * Mon Mar 14 2006 Roland Dreier - 1.0.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 May 2006 22:52:22 -0000 1.7 +++ sources 2 Nov 2006 04:51:50 -0000 1.8 @@ -1 +1 @@ -344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz +f075cef91b9a1d3445c3859cb7880b2f libibverbs-1.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 04:52:15 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Wed, 1 Nov 2006 21:52:15 -0700 Subject: rpms/libibverbs/FC-5 libibverbs.spec,1.6,1.7 sources,1.7,1.8 Message-ID: <200611020452.kA24qFw3007142@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7090/FC-5 Modified Files: libibverbs.spec sources Log Message: Import libibverbs 1.0.4 release Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-5/libibverbs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libibverbs.spec 2 May 2006 22:54:40 -0000 1.6 +++ libibverbs.spec 2 Nov 2006 04:51:45 -0000 1.7 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0.3 +%define ver 1.0.4 Name: libibverbs -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: A library for direct userspace use of InfiniBand Group: System Environment/Libraries License: GPL/BSD Url: http://openib.org/ -Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.4.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_includedir}/sysfs/libsysfs.h @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu May 4 2006 Roland Dreier - 1.0.4-1 +- New upstream release + * Mon Mar 14 2006 Roland Dreier - 1.0.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 May 2006 22:54:40 -0000 1.7 +++ sources 2 Nov 2006 04:51:45 -0000 1.8 @@ -1 +1 @@ -344a4a385bf1013e9c6fef9e8a243771 libibverbs-1.0.3.tar.gz +f075cef91b9a1d3445c3859cb7880b2f libibverbs-1.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 07:39:01 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Thu, 2 Nov 2006 00:39:01 -0700 Subject: rpms/php-pecl-zip/devel .cvsignore, 1.7, 1.8 php-pecl-zip.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200611020739.kA27d1tl016679@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-zip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16659 Modified Files: .cvsignore php-pecl-zip.spec sources Log Message: update to 1.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Oct 2006 16:37:23 -0000 1.7 +++ .cvsignore 2 Nov 2006 07:38:31 -0000 1.8 @@ -1 +1 @@ -zip-1.7.5.tgz +zip-1.8.0.tgz Index: php-pecl-zip.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/devel/php-pecl-zip.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php-pecl-zip.spec 24 Oct 2006 16:37:23 -0000 1.7 +++ php-pecl-zip.spec 2 Nov 2006 07:38:31 -0000 1.8 @@ -6,7 +6,7 @@ Summary: A zip management extension Summary(fr): Une extension de gestion des ZIP Name: php-pecl-zip -Version: 1.7.5 +Version: 1.8.0 Release: 1%{?dist} License: PHP License Group: Development/Languages @@ -61,6 +61,9 @@ %{php_extdir}/zip.so %changelog +* Thu Nov 02 2006 Remi Collet 1.8.0-1 +- update to 1.8.0 + * Tue Oct 24 2006 Remi Collet 1.7.5-1 - update to 1.7.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Oct 2006 16:37:23 -0000 1.7 +++ sources 2 Nov 2006 07:38:31 -0000 1.8 @@ -1 +1 @@ -e5aaeaac4e0724f95aef1e4a5f2ef8b6 zip-1.7.5.tgz +21ba5f9055074a5dbf9cb55922b7262e zip-1.8.0.tgz From fedora-extras-commits at redhat.com Thu Nov 2 09:11:14 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 2 Nov 2006 02:11:14 -0700 Subject: fedora-security/audit fc5,1.379,1.380 fc6,1.132,1.133 Message-ID: <200611020911.kA29BElD022930@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22903 Modified Files: fc5 fc6 Log Message: Updates from last few days; I've not dealt with kde yet since some of the backports may have gone away with rebase Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- fc5 1 Nov 2006 19:06:43 -0000 1.379 +++ fc5 2 Nov 2006 09:11:11 -0000 1.380 @@ -1,17 +1,18 @@ -Up to date CVE as of CVE email 20061029 -Up to date FC5 as of 20061029 +Up to date CVE as of CVE email 20061101 +Up to date FC5 as of 20061101 ** are items that need attention +CVE-2006-5633 ignore (firefox) just a client DoS CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3) -CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4) +CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360 CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360 -CVE-2006-5470 VULNERABLE (wireshark, fixed 0.99.4) -CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4) -CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4) -CVE-2006-5467 VULNERABLE (ruby) #212396 +CVE-2006-5470 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] +CVE-2006-5469 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] +CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] +CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110] CVE-2006-5466 VULNERABLE (rpm) #212833 CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only) @@ -43,14 +44,14 @@ CVE-2006-4813 version (kernel, fixed 2.6.13) CVE-2006-4812 backport (php) [since FEDORA-2006-1024] ** CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056] -CVE-2006-4805 VULNERABLE (wireshark, fixed 0.99.4) +CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974] CVE-2006-4663 ignore (kernel) not a vulnerability CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024] CVE-2006-4624 version (mailman, fixed 2.1.9rc1) #205652 [since FEDORA-2006-1013] CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022] CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827 -CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4) +CVE-2006-4574 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] CVE-2006-4573 VULNERABLE (screen) #212057 CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3) CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977] @@ -1078,6 +1079,7 @@ CVE-2005-0488 backport (krb5) krb5-1.4.1-telnet-environ.patch CVE-2005-0473 version (gaim, fixed 1.1.3) CVE-2005-0472 version (gaim, fixed 1.1.3) +CVE-2005-0470 version (wpa_supplicant, fixed 0.2.7) CVE-2005-0469 version (krb5, fixed 1.4.1) CVE-2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch CVE-2005-0468 version (krb5, fixed 1.4.1) Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- fc6 1 Nov 2006 19:06:43 -0000 1.132 +++ fc6 2 Nov 2006 09:11:11 -0000 1.133 @@ -1,17 +1,18 @@ -Up to date CVE as of CVE email 20061029 -Up to date FC6 as of 20061029 +Up to date CVE as of CVE email 20061101 +Up to date FC6 as of 20061101 ** are items that need attention +CVE-2006-5633 ignore (firefox) just a client DoS CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3) -CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4) +CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360 CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360 -CVE-2006-5470 VULNERABLE (wireshark, fixed 0.99.4) -CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4) -CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4) -CVE-2006-5467 VULNERABLE (ruby) #212396 +CVE-2006-5470 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] +CVE-2006-5469 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] +CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] +CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1109] CVE-2006-5466 VULNERABLE (rpm) #212833 CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280 @@ -43,14 +44,14 @@ CVE-2006-4813 version (kernel, fixed 2.6.13) CVE-2006-4812 VULNERABLE (php) CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055] -CVE-2006-4805 VULNERABLE (wireshark, fixed 0.99.4) +CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] CVE-2006-4790 backport (gnutls, fixed 1.4.4) CVE-2006-4663 ignore (kernel) not a vulnerability CVE-2006-4625 ignore (php) safe mode isn't safe CVE-2006-4624 version (mailman, fixed 2.1.9rc1) CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) CVE-2006-4600 version (openldap, fixed 2.3.25) -CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4) +CVE-2006-4574 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] CVE-2006-4573 VULNERABLE (screen) #212057 CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3) CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) @@ -945,6 +946,7 @@ CVE-2005-0488 backport (krb5) krb5-1.4.1-telnet-environ.patch CVE-2005-0473 version (gaim, fixed 1.1.3) CVE-2005-0472 version (gaim, fixed 1.1.3) +CVE-2005-0470 version (wpa_supplicant, fixed 0.2.7) CVE-2005-0469 version (krb5, fixed 1.4.1) CVE-2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch CVE-2005-0468 version (krb5, fixed 1.4.1) From fedora-extras-commits at redhat.com Thu Nov 2 10:08:45 2006 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Thu, 2 Nov 2006 03:08:45 -0700 Subject: rpms/sysprof-kmod/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sysprof-kmod.spec, 1.9, 1.10 sysprof-config.patch, 1.1, NONE Message-ID: <200611021008.kA2A8j8J026106@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-serv26086 Modified Files: .cvsignore sources sysprof-kmod.spec Removed Files: sysprof-config.patch Log Message: Update version to 1.0.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Oct 2006 16:27:26 -0000 1.2 +++ .cvsignore 2 Nov 2006 10:08:14 -0000 1.3 @@ -1 +1 @@ -sysprof-1.0.3.tar.gz +sysprof-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Oct 2006 16:27:26 -0000 1.2 +++ sources 2 Nov 2006 10:08:14 -0000 1.3 @@ -1 +1 @@ -8949fe32a073b84cb2abb7f9d608f755 sysprof-1.0.3.tar.gz +cc71e4cee32ebe4dca02c272d0877fb2 sysprof-1.0.5.tar.gz Index: sysprof-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sysprof-kmod.spec 17 Oct 2006 12:12:34 -0000 1.9 +++ sysprof-kmod.spec 2 Nov 2006 10:08:14 -0000 1.10 @@ -29,8 +29,8 @@ Name: %{kmod_name}-kmod -Version: 1.0.3 -Release: 5.%(echo %{kverrel} | tr - _) +Version: 1.0.5 +Release: 1.%(echo %{kverrel} | tr - _) Summary: Sysprof kernel module Group: System Environment/Kernel @@ -40,7 +40,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: %{kmod_name}-avoid_depmod.patch -Patch1: %{kmod_name}-config.patch ExclusiveArch: i586 i686 x86_64 @@ -64,7 +63,6 @@ %setup -q -c -T -a 0 pushd %{kmod_name}-%{version}* %patch0 -p1 -b .patch0 -%patch1 -p1 -b .patch1 # configure script breaks in mock builds (missing BRs), so we create here # a config.h with the needed symbol echo '#define PACKAGE_VERSION "%{version}"' > config.h @@ -105,6 +103,10 @@ %changelog +* Thu Nov 2 2006 Gianluca Sforna 1.0.5-1 +- version update +- drop upstreamed patch + * Tue Oct 17 2006 Gianluca Sforna - rebuild for kernel 2.6.18-1.2798 --- sysprof-config.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 10:11:21 2006 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Thu, 2 Nov 2006 03:11:21 -0700 Subject: rpms/sysprof/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sysprof.spec, 1.3, 1.4 Message-ID: <200611021011.kA2ABLqb026161@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/sysprof/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26131 Modified Files: .cvsignore sources sysprof.spec Log Message: Updated version to 1.0.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sysprof/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Oct 2006 14:40:56 -0000 1.2 +++ .cvsignore 2 Nov 2006 10:10:51 -0000 1.3 @@ -1 +1 @@ -sysprof-1.0.3.tar.gz +sysprof-1.0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/sysprof/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Oct 2006 14:40:56 -0000 1.2 +++ sources 2 Nov 2006 10:10:51 -0000 1.3 @@ -1 +1 @@ -8949fe32a073b84cb2abb7f9d608f755 sysprof-1.0.3.tar.gz +cc71e4cee32ebe4dca02c272d0877fb2 sysprof-1.0.5.tar.gz Index: sysprof.spec =================================================================== RCS file: /cvs/extras/rpms/sysprof/FC-6/sysprof.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sysprof.spec 8 Oct 2006 21:31:17 -0000 1.3 +++ sysprof.spec 2 Nov 2006 10:10:51 -0000 1.4 @@ -1,6 +1,6 @@ Name: sysprof -Version: 1.0.3 -Release: 6%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: Sysprof is a sampling CPU profiler Group: Development/System License: GPL @@ -61,13 +61,16 @@ %{_datadir}/applications/*.desktop %changelog -* Sun Oct 8 2006 Gianluca Sforna 1.0.3-6 +* Thu Nov 2 2006 Gianluca Sforna 1.0.5-1 +- version update + +* Sun Oct 8 2006 Gianluca Sforna 1.0.3-6 - better to use ExclusiveArch %{ix86} (thanks Ville) -* Thu Oct 5 2006 Gianluca Sforna 1.0.3-5 +* Thu Oct 5 2006 Gianluca Sforna 1.0.3-5 - add ExclusiveArch to match sysprof-kmod supported archs -* Tue Oct 2 2006 Gianluca Sforna 1.0.3-4 +* Tue Oct 2 2006 Gianluca Sforna 1.0.3-4 - add .desktop file * Fri Sep 30 2006 Gianluca Sforna 1.0.3-3 From fedora-extras-commits at redhat.com Thu Nov 2 13:00:58 2006 From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu)) Date: Thu, 2 Nov 2006 06:00:58 -0700 Subject: comps comps-fe5.xml.in, 1.183, 1.184 comps-fe6.xml.in, 1.206, 1.207 comps-fe7.xml.in, 1.4, 1.5 Message-ID: <200611021300.kA2D0wH3000796@cvs-int.fedora.redhat.com> Author: jgu Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv762 Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: Added entries for sunifdef for FC-5 FC-6 and FC-7. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- comps-fe5.xml.in 31 Oct 2006 20:02:24 -0000 1.183 +++ comps-fe5.xml.in 2 Nov 2006 13:00:28 -0000 1.184 @@ -156,6 +156,7 @@ smarteiffel splint srecord + sunifdef svnmailer sysconftool sysprof Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- comps-fe6.xml.in 31 Oct 2006 20:07:05 -0000 1.206 +++ comps-fe6.xml.in 2 Nov 2006 13:00:28 -0000 1.207 @@ -188,6 +188,7 @@ splint Sprog srecord + sunifdef svn2cl svnmailer sysconftool Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- comps-fe7.xml.in 31 Oct 2006 20:07:05 -0000 1.4 +++ comps-fe7.xml.in 2 Nov 2006 13:00:28 -0000 1.5 @@ -188,6 +188,7 @@ splint Sprog srecord + sunifdef svn2cl svnmailer sysconftool From fedora-extras-commits at redhat.com Thu Nov 2 13:56:45 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Thu, 2 Nov 2006 06:56:45 -0700 Subject: rpms/mediawiki/FC-6 mediawiki.spec,1.8,1.9 Message-ID: <200611021356.kA2Duj9B004111@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4093 Modified Files: mediawiki.spec Log Message: Try to fix #212600. Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/FC-6/mediawiki.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mediawiki.spec 14 Oct 2006 09:35:59 -0000 1.8 +++ mediawiki.spec 2 Nov 2006 13:56:14 -0000 1.9 @@ -1,24 +1,24 @@ %define wikidir %{_var}/www/mediawiki -Name: mediawiki -Version: 1.8.2 -Release: 4%{?dist} -Summary: The PHP-based wiki software behind Wikipedia - -Group: Applications/Internet -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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Requires: httpd -Requires: php >= 4.1.2 -Requires: php-mysql -Requires: php-gd, diffutils, ImageMagick +Name: mediawiki +Version: 1.8.2 +Release: 5%{?dist} +Summary: A wiki engine + +Group: Applications/Internet +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Requires: httpd +Requires: php >= 5 +Requires: php-mysql +Requires: php-gd, diffutils, ImageMagick # to make sure the "apache" group is created before mediawiki is installed -Requires(pre): httpd +Requires(pre): httpd %description MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and @@ -30,12 +30,12 @@ %package math -Summary: Mathematical formula support for MediaWiki -Group: Applications/Internet +Summary: Mathematical formula support for MediaWiki +Group: Applications/Internet -BuildRequires: ocaml -Requires: mediawiki = %{version}-%{release} -Requires: ImageMagick tetex-latex tetex-dvips +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. @@ -50,22 +50,22 @@ %build cd math -make %{?_smp_mflags} +make %install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{wikidir} -cp -pr config extensions images includes languages $RPM_BUILD_ROOT%{wikidir} -cp -pr maintenance skins [[:lower:]]*.* $RPM_BUILD_ROOT%{wikidir} -%{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl - -install -d $RPM_BUILD_ROOT%{wikidir}/math -install math/texvc $RPM_BUILD_ROOT%{wikidir}/math -install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf +rm -rf %{buildroot} +install -d %{buildroot}%{wikidir} +cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir} +cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir} +%{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl + +install -d %{buildroot}%{wikidir}/math +install math/texvc %{buildroot}%{wikidir}/math +install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -90,6 +90,11 @@ %changelog +* Thu Nov 2 2006 Axel Thimm - 1.8.2-5 +- Fix depenencies, add versions. +- Add missing *.php files. +- Cosmetic changes. + * Sat Oct 14 2006 Axel Thimm - 1.8.2-4 - Update to 1.8.2. @@ -111,7 +116,7 @@ * Mon Feb 06 2006 Roozbeh Pournader - 1.5.6-5 - Put internal doc files in the right directory, renaming it - back to docs (#180177) + back to docs (#180177) * Sat Feb 04 2006 Roozbeh Pournader - 1.5.6-4 - Use Requires(pre) instead of PreReq (Mike McGrath) From fedora-extras-commits at redhat.com Thu Nov 2 14:49:50 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Thu, 2 Nov 2006 07:49:50 -0700 Subject: rpms/jd/devel .cvsignore, 1.10, 1.11 jd.spec, 1.17, 1.18 sources, 1.10, 1.11 Message-ID: <200611021449.kA2EnoO8007435@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7415 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Nov 1 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061102 - cvs 061102 (23:30 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 1 Nov 2006 15:08:56 -0000 1.10 +++ .cvsignore 2 Nov 2006 14:49:20 -0000 1.11 @@ -1 +1 @@ -jd-1.8.0-cvs061101.tgz +jd-1.8.0-cvs061102.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- jd.spec 1 Nov 2006 15:08:56 -0000 1.17 +++ jd.spec 2 Nov 2006 14:49:20 -0000 1.18 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag cvs061101 +%define strtag cvs061102 %define repoid 22352 @@ -103,8 +103,8 @@ %{icondir}/%{name}.png %changelog -* Wed Nov 1 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061101 -- cvs 061101 (23:59 JST) +* Wed Nov 1 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061102 +- cvs 061102 (23:30 JST) * Sat Oct 28 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061028 - Detect libSM and libICE for x86_64. Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 1 Nov 2006 15:08:56 -0000 1.10 +++ sources 2 Nov 2006 14:49:20 -0000 1.11 @@ -1 +1 @@ -8b38d865dfab3b5a17be7a921a8b701a jd-1.8.0-cvs061101.tgz +10acd84c05665bb70cbad02975c5dfc2 jd-1.8.0-cvs061102.tgz From fedora-extras-commits at redhat.com Thu Nov 2 15:23:42 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Thu, 2 Nov 2006 08:23:42 -0700 Subject: rpms/CGAL/devel CGAL-3.2.1-build-libCGALQt-shared.patch, 1.1, 1.2 CGAL.spec, 1.3, 1.4 Message-ID: <200611021523.kA2FNgrJ010846@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/CGAL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783/devel Modified Files: CGAL-3.2.1-build-libCGALQt-shared.patch CGAL.spec Log Message: Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675) CGAL-3.2.1-build-libCGALQt-shared.patch: Index: CGAL-3.2.1-build-libCGALQt-shared.patch =================================================================== RCS file: /cvs/extras/rpms/CGAL/devel/CGAL-3.2.1-build-libCGALQt-shared.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CGAL-3.2.1-build-libCGALQt-shared.patch 11 Sep 2006 13:27:07 -0000 1.1 +++ CGAL-3.2.1-build-libCGALQt-shared.patch 2 Nov 2006 15:23:11 -0000 1.2 @@ -45,7 +45,7 @@ +SOMAJOR=1 + +shared_lib: $(CGAL_OBJECTS) -+ $(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR}\ ++ $(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR} \ + `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ + $(CGAL_SHARED_LIB_LDFLAGS) -lGL + mv libCGALQt.so.$(SOVERSION) '$(CGAL_LIB_DESTINATION)' Index: CGAL.spec =================================================================== RCS file: /cvs/extras/rpms/CGAL/devel/CGAL.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CGAL.spec 15 Sep 2006 12:39:06 -0000 1.3 +++ CGAL.spec 2 Nov 2006 15:23:11 -0000 1.4 @@ -2,7 +2,7 @@ Name: CGAL Version: 3.2.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Computational Geometry Algorithms Library Group: System Environment/Libraries @@ -234,6 +234,9 @@ %changelog +* Thu Nov 2 2006 Laurent Rineau - 3.2.1-19 +- Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675) + * Fri Sep 15 2006 Laurent Rineau - 3.2.1-18 - Move LICENSE.OPENNL to %doc CGAL-devel (bug #206575). From fedora-extras-commits at redhat.com Thu Nov 2 15:23:40 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Thu, 2 Nov 2006 08:23:40 -0700 Subject: rpms/CGAL/FC-5 CGAL-3.2.1-build-libCGALQt-shared.patch, 1.1, 1.2 CGAL.spec, 1.3, 1.4 Message-ID: <200611021523.kA2FNe8C010840@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/CGAL/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783/FC-5 Modified Files: CGAL-3.2.1-build-libCGALQt-shared.patch CGAL.spec Log Message: Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675) CGAL-3.2.1-build-libCGALQt-shared.patch: Index: CGAL-3.2.1-build-libCGALQt-shared.patch =================================================================== RCS file: /cvs/extras/rpms/CGAL/FC-5/CGAL-3.2.1-build-libCGALQt-shared.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CGAL-3.2.1-build-libCGALQt-shared.patch 11 Sep 2006 13:27:07 -0000 1.1 +++ CGAL-3.2.1-build-libCGALQt-shared.patch 2 Nov 2006 15:23:09 -0000 1.2 @@ -45,7 +45,7 @@ +SOMAJOR=1 + +shared_lib: $(CGAL_OBJECTS) -+ $(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR}\ ++ $(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR} \ + `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ + $(CGAL_SHARED_LIB_LDFLAGS) -lGL + mv libCGALQt.so.$(SOVERSION) '$(CGAL_LIB_DESTINATION)' Index: CGAL.spec =================================================================== RCS file: /cvs/extras/rpms/CGAL/FC-5/CGAL.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CGAL.spec 15 Sep 2006 12:54:12 -0000 1.3 +++ CGAL.spec 2 Nov 2006 15:23:09 -0000 1.4 @@ -2,7 +2,7 @@ Name: CGAL Version: 3.2.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Computational Geometry Algorithms Library Group: System Environment/Libraries @@ -234,6 +234,9 @@ %changelog +* Thu Nov 2 2006 Laurent Rineau - 3.2.1-19 +- Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675) + * Fri Sep 15 2006 Laurent Rineau - 3.2.1-18 - Move LICENSE.OPENNL to %doc CGAL-devel (bug #206575). From fedora-extras-commits at redhat.com Thu Nov 2 15:23:41 2006 From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau)) Date: Thu, 2 Nov 2006 08:23:41 -0700 Subject: rpms/CGAL/FC-6 CGAL-3.2.1-build-libCGALQt-shared.patch, 1.1, 1.2 CGAL.spec, 1.3, 1.4 Message-ID: <200611021523.kA2FNfee010844@cvs-int.fedora.redhat.com> Author: rineau Update of /cvs/extras/rpms/CGAL/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783/FC-6 Modified Files: CGAL-3.2.1-build-libCGALQt-shared.patch CGAL.spec Log Message: Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675) CGAL-3.2.1-build-libCGALQt-shared.patch: Index: CGAL-3.2.1-build-libCGALQt-shared.patch =================================================================== RCS file: /cvs/extras/rpms/CGAL/FC-6/CGAL-3.2.1-build-libCGALQt-shared.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CGAL-3.2.1-build-libCGALQt-shared.patch 11 Sep 2006 13:27:07 -0000 1.1 +++ CGAL-3.2.1-build-libCGALQt-shared.patch 2 Nov 2006 15:23:10 -0000 1.2 @@ -45,7 +45,7 @@ +SOMAJOR=1 + +shared_lib: $(CGAL_OBJECTS) -+ $(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR}\ ++ $(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR} \ + `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ + $(CGAL_SHARED_LIB_LDFLAGS) -lGL + mv libCGALQt.so.$(SOVERSION) '$(CGAL_LIB_DESTINATION)' Index: CGAL.spec =================================================================== RCS file: /cvs/extras/rpms/CGAL/FC-6/CGAL.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CGAL.spec 15 Sep 2006 12:39:06 -0000 1.3 +++ CGAL.spec 2 Nov 2006 15:23:10 -0000 1.4 @@ -2,7 +2,7 @@ Name: CGAL Version: 3.2.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Computational Geometry Algorithms Library Group: System Environment/Libraries @@ -234,6 +234,9 @@ %changelog +* Thu Nov 2 2006 Laurent Rineau - 3.2.1-19 +- Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675) + * Fri Sep 15 2006 Laurent Rineau - 3.2.1-18 - Move LICENSE.OPENNL to %doc CGAL-devel (bug #206575). From fedora-extras-commits at redhat.com Thu Nov 2 15:45:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 2 Nov 2006 08:45:28 -0700 Subject: rpms/kdetoys/devel .cvsignore, 1.5, 1.6 kdetoys.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200611021545.kA2FjSEJ011185@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11161 Modified Files: .cvsignore kdetoys.spec sources Log Message: * Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 - 3.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Aug 2006 18:29:11 -0000 1.5 +++ .cvsignore 2 Nov 2006 15:44:58 -0000 1.6 @@ -1,2 +1,3 @@ kdetoys-3.5.3.tar.bz2 kdetoys-3.5.4.tar.bz2 +kdetoys-3.5.5.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/kdetoys.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdetoys.spec 29 Aug 2006 18:29:11 -0000 1.5 +++ kdetoys.spec 2 Nov 2006 15:44:58 -0000 1.6 @@ -3,8 +3,8 @@ Name: kdetoys Group: Amusements/Graphics Epoch: 7 -Version: 3.5.4 -Release: 2%{?dist}.1 +Version: 3.5.5 +Release: 1%{?dist} License: GPL Url: http://www.kde.org/ @@ -127,6 +127,9 @@ %changelog +* Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 +- 3.5.5 + * Tue Aug 29 2006 Rex Dieter 7:3.5.4-2.1 - fc6 respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Jul 2006 01:06:25 -0000 1.4 +++ sources 2 Nov 2006 15:44:58 -0000 1.5 @@ -1 +1 @@ -f959e936d05697ac6b1a0b066632b2fd kdetoys-3.5.4.tar.bz2 +2b03fd068209cf324396b75334f39aba kdetoys-3.5.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 15:47:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 2 Nov 2006 08:47:22 -0700 Subject: rpms/kdetoys/FC-6 .cvsignore, 1.5, 1.6 kdetoys.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200611021547.kA2FlMHV011265@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11240 Modified Files: .cvsignore kdetoys.spec sources Log Message: * Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 - 3.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdetoys/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 29 Aug 2006 18:29:11 -0000 1.5 +++ .cvsignore 2 Nov 2006 15:46:51 -0000 1.6 @@ -1,2 +1,3 @@ kdetoys-3.5.3.tar.bz2 kdetoys-3.5.4.tar.bz2 +kdetoys-3.5.5.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/extras/rpms/kdetoys/FC-6/kdetoys.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdetoys.spec 29 Aug 2006 18:29:11 -0000 1.5 +++ kdetoys.spec 2 Nov 2006 15:46:51 -0000 1.6 @@ -3,8 +3,8 @@ Name: kdetoys Group: Amusements/Graphics Epoch: 7 -Version: 3.5.4 -Release: 2%{?dist}.1 +Version: 3.5.5 +Release: 1%{?dist} License: GPL Url: http://www.kde.org/ @@ -127,6 +127,9 @@ %changelog +* Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 +- 3.5.5 + * Tue Aug 29 2006 Rex Dieter 7:3.5.4-2.1 - fc6 respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Jul 2006 01:06:25 -0000 1.4 +++ sources 2 Nov 2006 15:46:51 -0000 1.5 @@ -1 +1 @@ -f959e936d05697ac6b1a0b066632b2fd kdetoys-3.5.4.tar.bz2 +2b03fd068209cf324396b75334f39aba kdetoys-3.5.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 15:48:46 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 2 Nov 2006 08:48:46 -0700 Subject: rpms/kdetoys/FC-5 .cvsignore, 1.5, 1.6 kdetoys.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200611021548.kA2Fmk6Q011342@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11322 Modified Files: .cvsignore kdetoys.spec sources Log Message: * Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 - 3.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdetoys/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Aug 2006 12:00:39 -0000 1.5 +++ .cvsignore 2 Nov 2006 15:48:16 -0000 1.6 @@ -1,2 +1,3 @@ kdetoys-3.5.3.tar.bz2 kdetoys-3.5.4.tar.bz2 +kdetoys-3.5.5.tar.bz2 Index: kdetoys.spec =================================================================== RCS file: /cvs/extras/rpms/kdetoys/FC-5/kdetoys.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdetoys.spec 1 Aug 2006 15:19:51 -0000 1.5 +++ kdetoys.spec 2 Nov 2006 15:48:16 -0000 1.6 @@ -3,8 +3,8 @@ Name: kdetoys Group: Amusements/Graphics Epoch: 7 -Version: 3.5.3 -Release: 3%{?dist} +Version: 3.5.5 +Release: 1%{?dist} License: GPL Url: http://www.kde.org/ @@ -96,6 +96,8 @@ # not sure of the point for just one header file 'AmorIface.h' # omit (for now). rm -rf $RPM_BUILD_ROOT%{_includedir} +# la files, keep, they're just loadable modules, not shared libs +#rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %post @@ -125,9 +127,18 @@ %changelog -* Tue Aug 1 2006 Rex Dieter 7:3.5.3-3 +* Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 +- 3.5.5 + +* Tue Aug 29 2006 Rex Dieter 7:3.5.4-2.1 +- fc6 respin + +* Tue Aug 1 2006 Rex Dieter 7:3.5.4-2 - %%description: remove references to (long gone) kaphorism, kscore (#200877) +* Tue Jul 25 2006 Rex Dieter 7:3.5.4-1 +- kde-3.5.4 + * Wed May 24 2006 Rex Dieter 7:3.5.3-1 - kde-3.5.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Aug 2006 12:00:39 -0000 1.5 +++ sources 2 Nov 2006 15:48:16 -0000 1.6 @@ -1 +1 @@ -dbce8029253a6151546e3016f299f4ef kdetoys-3.5.3.tar.bz2 +2b03fd068209cf324396b75334f39aba kdetoys-3.5.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 15:56:22 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Thu, 2 Nov 2006 08:56:22 -0700 Subject: comps comps-fe6.xml.in,1.207,1.208 comps-fe7.xml.in,1.5,1.6 Message-ID: <200611021556.kA2FuMqC011449@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11431 Modified Files: comps-fe6.xml.in comps-fe7.xml.in Log Message: Remove packages not present in the repo. Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- comps-fe6.xml.in 2 Nov 2006 13:00:28 -0000 1.207 +++ comps-fe6.xml.in 2 Nov 2006 15:55:51 -0000 1.208 @@ -133,7 +133,6 @@ cvs2cl cvs2svn cvsgraph - cvsplot cvsps cvsweb darcs @@ -234,7 +233,6 @@ scite scribes scribes-templates - TeXmacs @@ -273,7 +271,6 @@ geant321 genius geda-docs - geda-example geda-gattrib geda-gnetlist geda-gschem @@ -318,7 +315,6 @@ qcad qucs R - R-gnomeGUI rrdtool scalapack scrip @@ -413,16 +409,13 @@ pipenightdreams powermanga ppracer - qascade qgo - qqo rafkill raidem rocksndiamonds rogue scorched3d shippy - sirius sopwith starfighter sturmbahnfahrer @@ -459,8 +452,6 @@ true true - alacarte - brightside buoh byzanz deskbar-applet @@ -470,7 +461,6 @@ gmpc gnochm gnome-applet-netspeed - gnome-applet-rhythmbox gnome-applet-sensors gnome-applet-timer gnome-theme-clearlooks-bigpack @@ -487,7 +477,6 @@ rss-glx-gnome-screensaver sabayon seahorse - smeg themes-backgrounds-gnome verbiste-gnome wallpapoz @@ -505,7 +494,6 @@ anjuta anjuta-docs - at-poke bakery-devel bit-devel bitgtkmm-devel @@ -521,7 +509,6 @@ gquilt gtk+extra gtk2hs - gtkalog gtkdatabox gtkmm24-devel libglademm24-devel @@ -561,7 +548,6 @@ gg2 gnome-blog gnome-ppp - gnome-telnet gnome-translate gnubiff gossip @@ -627,7 +613,6 @@ renrot showimg skencil - sodipodi tuxpaint ufraw wings @@ -679,26 +664,6 @@ - java - <_name>Java - <_description>Support for running programs written in the Java programming language. - true - false - - jikes - - - - java-development - <_name>Java Development - <_description>Support for developing programs in the Java programming language. - false - true - - jlint - - - kde-desktop <_name>KDE (K Desktop Environment) <_description>KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager. @@ -770,7 +735,6 @@ exim-doc milter-regex mlmmj - perl-Cyrus pyzor spamass-milter @@ -838,13 +802,11 @@ gnumeric gramps grisbi - gsview hnb koffice-suite krecipes lyx notecase - notemeister pybliographer qa-assistant qcad @@ -870,7 +832,6 @@ amarok audacity bin2iso - bmp brasero camE cdlabelgen @@ -879,7 +840,6 @@ gcdmaster gcfilms gcombust - glrellmms gnomad2 gnomebaker gnomeradio @@ -889,7 +849,6 @@ jack-audio-connection-kit kid3 kover - libvisual-plugins nomadsync regionset rosegarden4 @@ -962,7 +921,6 @@ ip6sic isic jfbterm - john kdirstat keychain ksmarttray @@ -1034,7 +992,6 @@ cone ctorrent ekg - elmo iperf irssi libtranslate @@ -1042,7 +999,6 @@ nail naim ncftp - nget ninja nmh pork @@ -1179,7 +1135,6 @@ xfce4-sensors-plugin xfce4-systemload-plugin xfce4-taskmanager - xfce4-toys xfce4-wavelan-plugin xfce4-weather-plugin xfce4-websearch-plugin @@ -1198,17 +1153,12 @@ x-software-development - glib2-devel - gtk-doc - gtk2-devel libxfce4mcs-devel libxfce4util-devel libxfcegui4-devel xfce-mcs-manager-devel xfce4-panel-devel xfce4-session-devel - glade2 - pygtk2-devel Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- comps-fe7.xml.in 2 Nov 2006 13:00:28 -0000 1.5 +++ comps-fe7.xml.in 2 Nov 2006 15:55:51 -0000 1.6 @@ -133,7 +133,6 @@ cvs2cl cvs2svn cvsgraph - cvsplot cvsps cvsweb darcs @@ -234,7 +233,6 @@ scite scribes scribes-templates - TeXmacs @@ -273,7 +271,6 @@ geant321 genius geda-docs - geda-example geda-gattrib geda-gnetlist geda-gschem @@ -318,7 +315,6 @@ qcad qucs R - R-gnomeGUI rrdtool scalapack scrip @@ -413,16 +409,13 @@ pipenightdreams powermanga ppracer - qascade qgo - qqo rafkill raidem rocksndiamonds rogue scorched3d shippy - sirius sopwith starfighter sturmbahnfahrer @@ -459,8 +452,6 @@ true true - alacarte - brightside buoh byzanz deskbar-applet @@ -470,7 +461,6 @@ gmpc gnochm gnome-applet-netspeed - gnome-applet-rhythmbox gnome-applet-sensors gnome-applet-timer gnome-theme-clearlooks-bigpack @@ -487,7 +477,6 @@ rss-glx-gnome-screensaver sabayon seahorse - smeg themes-backgrounds-gnome verbiste-gnome wallpapoz @@ -505,7 +494,6 @@ anjuta anjuta-docs - at-poke bakery-devel bit-devel bitgtkmm-devel @@ -521,7 +509,6 @@ gquilt gtk+extra gtk2hs - gtkalog gtkdatabox gtkmm24-devel libglademm24-devel @@ -561,7 +548,6 @@ gg2 gnome-blog gnome-ppp - gnome-telnet gnome-translate gnubiff gossip @@ -627,7 +613,6 @@ renrot showimg skencil - sodipodi tuxpaint ufraw wings @@ -679,26 +664,6 @@ - java - <_name>Java - <_description>Support for running programs written in the Java programming language. - true - false - - jikes - - - - java-development - <_name>Java Development - <_description>Support for developing programs in the Java programming language. - false - true - - jlint - - - kde-desktop <_name>KDE (K Desktop Environment) <_description>KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager. @@ -770,7 +735,6 @@ exim-doc milter-regex mlmmj - perl-Cyrus pyzor spamass-milter @@ -838,13 +802,11 @@ gnumeric gramps grisbi - gsview hnb koffice-suite krecipes lyx notecase - notemeister pybliographer qa-assistant qcad @@ -870,7 +832,6 @@ amarok audacity bin2iso - bmp brasero camE cdlabelgen @@ -879,7 +840,6 @@ gcdmaster gcfilms gcombust - glrellmms gnomad2 gnomebaker gnomeradio @@ -889,7 +849,6 @@ jack-audio-connection-kit kid3 kover - libvisual-plugins nomadsync regionset rosegarden4 @@ -962,7 +921,6 @@ ip6sic isic jfbterm - john kdirstat keychain ksmarttray @@ -1034,7 +992,6 @@ cone ctorrent ekg - elmo iperf irssi libtranslate @@ -1042,7 +999,6 @@ nail naim ncftp - nget ninja nmh pork @@ -1179,7 +1135,6 @@ xfce4-sensors-plugin xfce4-systemload-plugin xfce4-taskmanager - xfce4-toys xfce4-wavelan-plugin xfce4-weather-plugin xfce4-websearch-plugin @@ -1198,17 +1153,12 @@ x-software-development - glib2-devel - gtk-doc - gtk2-devel libxfce4mcs-devel libxfce4util-devel libxfcegui4-devel xfce-mcs-manager-devel xfce4-panel-devel xfce4-session-devel - glade2 - pygtk2-devel From fedora-extras-commits at redhat.com Thu Nov 2 16:14:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 2 Nov 2006 09:14:24 -0700 Subject: rpms/kdegraphics-extras/devel .cvsignore, 1.3, 1.4 kdegraphics-extras.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200611021614.kA2GEORm014598@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdegraphics-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573 Modified Files: .cvsignore kdegraphics-extras.spec sources Log Message: * Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 - 3.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdegraphics-extras/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Jul 2006 01:39:24 -0000 1.3 +++ .cvsignore 2 Nov 2006 16:13:54 -0000 1.4 @@ -1,2 +1,3 @@ kdegraphics-3.5.3.tar.bz2 kdegraphics-3.5.4.tar.bz2 +kdegraphics-3.5.5.tar.bz2 Index: kdegraphics-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics-extras/devel/kdegraphics-extras.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kdegraphics-extras.spec 11 Sep 2006 02:46:20 -0000 1.8 +++ kdegraphics-extras.spec 2 Nov 2006 16:13:54 -0000 1.9 @@ -20,8 +20,8 @@ Name: kdegraphics-extras %endif -Version: 3.5.4 -Release: 6%{?dist} +Version: 3.5.5 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia @@ -309,6 +309,9 @@ %changelog +* Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 +- 3.5.5 + * Sun Sep 10 2006 Rex Dieter 7:3.5.4-6 - -extras: fc6 respin for new(er) OpenEXR Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics-extras/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Jul 2006 01:39:24 -0000 1.3 +++ sources 2 Nov 2006 16:13:54 -0000 1.4 @@ -1,2 +1,3 @@ 56bd5537521dc94633f8effaace523cb kdegraphics-3.5.3.tar.bz2 de1f6d0597235f52186aaeeaabe7dc08 kdegraphics-3.5.4.tar.bz2 +cdbe15afc01c5da7af9557e803bbb7e6 kdegraphics-3.5.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 16:17:43 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Nov 2006 09:17:43 -0700 Subject: rpms/plplot/FC-5 plplot-5.6.1-font.patch, NONE, 1.1 plplot.spec, 1.19, 1.20 Message-ID: <200611021617.kA2GHhKu014703@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14667/FC-5 Modified Files: plplot.spec Added Files: plplot-5.6.1-font.patch Log Message: Point to the freefont package properly (bug #210517) plplot-5.6.1-font.patch: --- NEW FILE plplot-5.6.1-font.patch --- --- plplot-5.6.1/configure.font 2006-11-01 16:59:20.000000000 -0700 +++ plplot-5.6.1/configure 2006-11-01 16:59:58.000000000 -0700 @@ -23552,21 +23552,7 @@ ;; esac -# Check one of the usual fonts and the symbol font. -# If they are not found, warn and turn off freetype. -if test "$with_freetype" = "yes"; then - if test -r "$with_freetype_font_dir/$with_freetype_sans_font" -o -r "$with_freetype_font_dir/$with_symbol_font" ; then - freetype_font_dir="$with_freetype_font_dir" - fi - if test -z "$freetype_font_dir" ; then - { echo "$as_me:$LINENO: WARNING: \"freetype fonts not found - please check fonts. Freetype font support is disabled.\"," >&5 -echo "$as_me: WARNING: \"freetype fonts not found - please check fonts. Freetype font support is disabled.\"," >&2;} - with_freetype=no - else - echo "$as_me:$LINENO: result: fonts found in $freetype_font_dir" >&5 -echo "${ECHO_T}fonts found in $freetype_font_dir" >&6 - fi -fi +freetype_font_dir="$with_freetype_font_dir" if test "$with_freetype" = "yes"; then Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plplot.spec 6 Oct 2006 20:14:58 -0000 1.19 +++ plplot.spec 2 Nov 2006 16:17:13 -0000 1.20 @@ -2,7 +2,7 @@ Name: plplot Version: 5.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -12,6 +12,7 @@ Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.6.1-octave.patch Patch2: plplot-5.6.1-info.patch +Patch3: plplot-5.6.1-font.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ BuildRequires: wxGTK-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info +Requires: freefont %description PLplot is a library of functions that are useful for making scientific @@ -145,12 +147,13 @@ %patch0 -p1 -b .orig %patch1 -p1 -b .octave %patch2 -p1 -b .orig +%patch3 -p1 -b .font %patch6 -p1 -b .orig %build %configure --enable-f95 --disable-static --without-rpath --with-pthreads \ - --with-freetype-font-dir=/usr/share/fonts \ + --with-freetype-font-dir=/usr/share/fonts/freefont \ --with-libunicode=no --disable-cgm --disable-linuxvga \ --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ --with-prebuiltdoc @@ -347,6 +350,9 @@ %changelog +* Thu Nov 2 2006 - Orion Poplawski - 5.6.1-6 +- Point to the freefont package properly (bug #210517) + * Fri Oct 6 2006 - Orion Poplawski - 5.6.1-5 - Rebuild for new octave API version From fedora-extras-commits at redhat.com Thu Nov 2 16:17:44 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Nov 2006 09:17:44 -0700 Subject: rpms/plplot/FC-6 plplot-5.6.1-font.patch, NONE, 1.1 plplot.spec, 1.22, 1.23 Message-ID: <200611021617.kA2GHiNq014706@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14667/FC-6 Modified Files: plplot.spec Added Files: plplot-5.6.1-font.patch Log Message: Point to the freefont package properly (bug #210517) plplot-5.6.1-font.patch: --- NEW FILE plplot-5.6.1-font.patch --- --- plplot-5.6.1/configure.font 2006-11-01 16:59:20.000000000 -0700 +++ plplot-5.6.1/configure 2006-11-01 16:59:58.000000000 -0700 @@ -23552,21 +23552,7 @@ ;; esac -# Check one of the usual fonts and the symbol font. -# If they are not found, warn and turn off freetype. -if test "$with_freetype" = "yes"; then - if test -r "$with_freetype_font_dir/$with_freetype_sans_font" -o -r "$with_freetype_font_dir/$with_symbol_font" ; then - freetype_font_dir="$with_freetype_font_dir" - fi - if test -z "$freetype_font_dir" ; then - { echo "$as_me:$LINENO: WARNING: \"freetype fonts not found - please check fonts. Freetype font support is disabled.\"," >&5 -echo "$as_me: WARNING: \"freetype fonts not found - please check fonts. Freetype font support is disabled.\"," >&2;} - with_freetype=no - else - echo "$as_me:$LINENO: result: fonts found in $freetype_font_dir" >&5 -echo "${ECHO_T}fonts found in $freetype_font_dir" >&6 - fi -fi +freetype_font_dir="$with_freetype_font_dir" if test "$with_freetype" = "yes"; then Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/FC-6/plplot.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- plplot.spec 6 Oct 2006 20:13:17 -0000 1.22 +++ plplot.spec 2 Nov 2006 16:17:14 -0000 1.23 @@ -2,7 +2,7 @@ Name: plplot Version: 5.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library of functions for making scientific plots Group: Applications/Engineering @@ -12,6 +12,7 @@ Patch0: plplot-5.5.3-matwrap.patch Patch1: plplot-5.6.1-octave.patch Patch2: plplot-5.6.1-info.patch +Patch3: plplot-5.6.1-font.patch Patch6: plplot-5.6.0-x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ BuildRequires: wxGTK-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info +Requires: freefont %description PLplot is a library of functions that are useful for making scientific @@ -145,12 +147,13 @@ %patch0 -p1 -b .orig %patch1 -p1 -b .octave %patch2 -p1 -b .orig +%patch3 -p1 -b .font %patch6 -p1 -b .orig %build %configure --enable-f95 --disable-static --without-rpath --with-pthreads \ - --with-freetype-font-dir=/usr/share/fonts \ + --with-freetype-font-dir=/usr/share/fonts/freefont \ --with-libunicode=no --disable-cgm --disable-linuxvga \ --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \ --with-prebuiltdoc @@ -347,6 +350,9 @@ %changelog +* Thu Nov 2 2006 - Orion Poplawski - 5.6.1-8 +- Point to the freefont package properly (bug #210517) + * Fri Oct 6 2006 - Orion Poplawski - 5.6.1-7 - Rebuild for new octave API version From fedora-extras-commits at redhat.com Thu Nov 2 16:31:20 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Thu, 2 Nov 2006 09:31:20 -0700 Subject: status-report-scripts parseBZbugList,1.55,1.56 Message-ID: <200611021631.kA2GVKdM014928@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14910 Modified Files: parseBZbugList Log Message: Username/password are required to get members list. Index: parseBZbugList =================================================================== RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- parseBZbugList 30 Oct 2006 09:36:30 -0000 1.55 +++ parseBZbugList 2 Nov 2006 16:31:17 -0000 1.56 @@ -50,7 +50,7 @@ my %opt; my @options = ( "help", "repourl=s", "o=s", "d=s", "cvs=s", - "comps=s", "currel=i", "firstrel=i" ); + "comps=s", "currel=i", "firstrel=i", "u=s", "p=s" ); $main::repourl = "http://mirrors.kernel.org/fedora"; $main::members @@ -58,6 +58,8 @@ $main::cvsDir = "/export/scratch/extras"; $main::currel = 6; $main::firstrel = 1; +$main::username = "c4chris"; +$main::password = ""; if( ! GetOptions( \%opt, @options ) ) { &usage(); } @@ -67,6 +69,8 @@ $main::compsDir = $opt{"comps"} if defined $opt{"comps"}; $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::password = $opt{"p"} if defined $opt{"p"}; &usage() if defined $opt{'help'}; @@ -122,9 +126,9 @@ "php-pecl-sqlite" => 1, "wxPythonGTK2" => 1 ); -if ($main::members ne "") { +if ($main::members ne "" && $main::password ne "") { local *IN; - open IN, "wget -nv -O - --no-check-certificate \"$main::members\"|" + open IN, "wget --user=$main::username --password=$main::password -nv -O - --no-check-certificate \"$main::members\"|" or die "Failed to wget members list : $!"; while ( ) { s/\s+$//; @@ -978,8 +982,10 @@ -cvs extras CVS directory [$main::cvsDir] -firstrel first Fedora release number [$main::firstrel] -o owners.list file + -p password (to retrieve members list) -repourl Fedora core and extras SRPMS development repo base - [$main::repourl]\n"; + [$main::repourl] + -u username (to retrieve members list) [$main::username]\n"; exit 1; } From fedora-extras-commits at redhat.com Thu Nov 2 16:31:30 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Nov 2006 09:31:30 -0700 Subject: rpms/plplot/devel plplot-5.6.1-font.patch, NONE, 1.1 plplot-5.6.1-octave.patch, 1.1, 1.2 plplot.spec, 1.22, 1.23 Message-ID: <200611021631.kA2GVUNu014932@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14880 Modified Files: plplot-5.6.1-octave.patch plplot.spec Added Files: plplot-5.6.1-font.patch Log Message: - Point to the freefont package properly (bug #210517) - Move libriaries to -libs, -devel requires -libs for multilib support plplot-5.6.1-font.patch: --- NEW FILE plplot-5.6.1-font.patch --- --- plplot-5.6.1/configure.font 2006-11-01 16:59:20.000000000 -0700 +++ plplot-5.6.1/configure 2006-11-01 16:59:58.000000000 -0700 @@ -23552,21 +23552,7 @@ ;; esac -# Check one of the usual fonts and the symbol font. -# If they are not found, warn and turn off freetype. -if test "$with_freetype" = "yes"; then - if test -r "$with_freetype_font_dir/$with_freetype_sans_font" -o -r "$with_freetype_font_dir/$with_symbol_font" ; then - freetype_font_dir="$with_freetype_font_dir" - fi - if test -z "$freetype_font_dir" ; then - { echo "$as_me:$LINENO: WARNING: \"freetype fonts not found - please check fonts. Freetype font support is disabled.\"," >&5 -echo "$as_me: WARNING: \"freetype fonts not found - please check fonts. Freetype font support is disabled.\"," >&2;} - with_freetype=no - else - echo "$as_me:$LINENO: result: fonts found in $freetype_font_dir" >&5 -echo "${ECHO_T}fonts found in $freetype_font_dir" >&6 - fi -fi +freetype_font_dir="$with_freetype_font_dir" if test "$with_freetype" = "yes"; then plplot-5.6.1-octave.patch: Index: plplot-5.6.1-octave.patch =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.6.1-octave.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plplot-5.6.1-octave.patch 7 Aug 2006 21:39:24 -0000 1.1 +++ plplot-5.6.1-octave.patch 2 Nov 2006 16:30:59 -0000 1.2 @@ -67,39 +67,6 @@ printf ("Use PLplot: %s\n", use_plplot_state); -Index: plplot/test/plplot-test.sh.in -=================================================================== -RCS file: /cvsroot/plplot/plplot/test/plplot-test.sh.in,v -retrieving revision 1.37 -diff -u -r1.37 plplot-test.sh.in ---- plplot/test/plplot-test.sh.in 27 Jul 2006 21:55:35 -0000 1.37 -+++ plplot/test/plplot-test.sh.in 7 Aug 2006 17:45:44 -0000 -@@ -146,7 +146,7 @@ - perldir=$SRC_EXAMPLES_DIR/perl - javadir=$EXAMPLES_DIR/java - octave=@OCTAVE@ --octavedir=$SRC_EXAMPLES_DIR/../bindings/octave//:$SRC_EXAMPLES_DIR/octave//:@PLPLOT_OCTAVE_DIR@//:@OCTAVE_M_DIR@//:@OCTAVE_OCT_DIR@//: -+octavedir=$SRC_EXAMPLES_DIR/../bindings/octave - PATH=$EXAMPLES_DIR/../utils:@exec_prefix@/bin:$PATH - export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir PATH - -Index: plplot/test/test_octave.sh.in -=================================================================== -RCS file: /cvsroot/plplot/plplot/test/test_octave.sh.in,v -retrieving revision 1.4 -diff -u -r1.4 test_octave.sh.in ---- plplot/test/test_octave.sh.in 26 Apr 2006 14:36:02 -0000 1.4 -+++ plplot/test/test_octave.sh.in 7 Aug 2006 17:45:44 -0000 -@@ -30,7 +30,8 @@ - export LD_LIBRARY_PATH=$TOPDIR/src/.libs:$TOPDIR/lib/csa/.libs:$TOPDIR/lib/nn/.libs - - # Launch an Octave script that exercises all the demos --$octave -f -q -p $octavedir <&5 - echo $ECHO_N "checking Octave m dir... $ECHO_C" >&6 -- if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then -+ if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then - # Octave version 2.1 - - OCTAVE_M_DIR=`$OCTAVE -q -f <&5 - echo $ECHO_N "checking Octave oct dir... $ECHO_C" >&6 -- if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then -+ if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then - # Octave version 2.1 - - OCTAVE_OCT_DIR=`$OCTAVE -q -f < - 5.6.1-8 +- Point to the freefont package properly (bug #210517) +- Move libriaries to -libs, -devel requires -libs for multilib support + * Fri Oct 6 2006 - Orion Poplawski - 5.6.1-7 - Rebuild for new octave API version From fedora-extras-commits at redhat.com Thu Nov 2 16:45:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 2 Nov 2006 09:45:33 -0700 Subject: rpms/kdegraphics-extras/FC-6 .cvsignore, 1.3, 1.4 kdegraphics-extras.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200611021645.kA2GjXoS015075@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdegraphics-extras/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15052 Modified Files: .cvsignore kdegraphics-extras.spec sources Log Message: * Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 - 3.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdegraphics-extras/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Jul 2006 01:39:24 -0000 1.3 +++ .cvsignore 2 Nov 2006 16:45:01 -0000 1.4 @@ -1,2 +1,3 @@ kdegraphics-3.5.3.tar.bz2 kdegraphics-3.5.4.tar.bz2 +kdegraphics-3.5.5.tar.bz2 Index: kdegraphics-extras.spec =================================================================== RCS file: /cvs/extras/rpms/kdegraphics-extras/FC-6/kdegraphics-extras.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kdegraphics-extras.spec 11 Sep 2006 02:46:20 -0000 1.8 +++ kdegraphics-extras.spec 2 Nov 2006 16:45:01 -0000 1.9 @@ -20,8 +20,8 @@ Name: kdegraphics-extras %endif -Version: 3.5.4 -Release: 6%{?dist} +Version: 3.5.5 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia @@ -309,6 +309,9 @@ %changelog +* Thu Oct 05 2006 Rex Dieter 7:3.5.5-1 +- 3.5.5 + * Sun Sep 10 2006 Rex Dieter 7:3.5.4-6 - -extras: fc6 respin for new(er) OpenEXR Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdegraphics-extras/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Jul 2006 01:39:24 -0000 1.3 +++ sources 2 Nov 2006 16:45:01 -0000 1.4 @@ -1,2 +1 @@ -56bd5537521dc94633f8effaace523cb kdegraphics-3.5.3.tar.bz2 -de1f6d0597235f52186aaeeaabe7dc08 kdegraphics-3.5.4.tar.bz2 +cdbe15afc01c5da7af9557e803bbb7e6 kdegraphics-3.5.5.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 16:57:04 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Nov 2006 09:57:04 -0700 Subject: rpms/plplot/devel plplot-5.6.1-octave.patch,1.2,1.3 Message-ID: <200611021657.kA2Gv4kd015184@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15165 Modified Files: plplot-5.6.1-octave.patch Log Message: Restore original octave patch plplot-5.6.1-octave.patch: Index: plplot-5.6.1-octave.patch =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.6.1-octave.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plplot-5.6.1-octave.patch 2 Nov 2006 16:30:59 -0000 1.2 +++ plplot-5.6.1-octave.patch 2 Nov 2006 16:56:33 -0000 1.3 @@ -67,6 +67,39 @@ printf ("Use PLplot: %s\n", use_plplot_state); +Index: plplot/test/plplot-test.sh.in +=================================================================== +RCS file: /cvsroot/plplot/plplot/test/plplot-test.sh.in,v +retrieving revision 1.37 +diff -u -r1.37 plplot-test.sh.in +--- plplot/test/plplot-test.sh.in 27 Jul 2006 21:55:35 -0000 1.37 ++++ plplot/test/plplot-test.sh.in 7 Aug 2006 17:45:44 -0000 +@@ -146,7 +146,7 @@ + perldir=$SRC_EXAMPLES_DIR/perl + javadir=$EXAMPLES_DIR/java + octave=@OCTAVE@ +-octavedir=$SRC_EXAMPLES_DIR/../bindings/octave//:$SRC_EXAMPLES_DIR/octave//:@PLPLOT_OCTAVE_DIR@//:@OCTAVE_M_DIR@//:@OCTAVE_OCT_DIR@//: ++octavedir=$SRC_EXAMPLES_DIR/../bindings/octave + PATH=$EXAMPLES_DIR/../utils:@exec_prefix@/bin:$PATH + export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir PATH + +Index: plplot/test/test_octave.sh.in +=================================================================== +RCS file: /cvsroot/plplot/plplot/test/test_octave.sh.in,v +retrieving revision 1.4 +diff -u -r1.4 test_octave.sh.in +--- plplot/test/test_octave.sh.in 26 Apr 2006 14:36:02 -0000 1.4 ++++ plplot/test/test_octave.sh.in 7 Aug 2006 17:45:44 -0000 +@@ -30,7 +30,8 @@ + export LD_LIBRARY_PATH=$TOPDIR/src/.libs:$TOPDIR/lib/csa/.libs:$TOPDIR/lib/nn/.libs + + # Launch an Octave script that exercises all the demos +-$octave -f -q -p $octavedir <&5 + echo $ECHO_N "checking Octave m dir... $ECHO_C" >&6 +- if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then ++ if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then + # Octave version 2.1 + + OCTAVE_M_DIR=`$OCTAVE -q -f <&5 + echo $ECHO_N "checking Octave oct dir... $ECHO_C" >&6 +- if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then ++ if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then + # Octave version 2.1 + + OCTAVE_OCT_DIR=`$OCTAVE -q -f < Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18151 Modified Files: pcsc-perl.spec Log Message: * Thu Nov 2 2006 Ville Skytt?? - 1.4.4-2 - Rebuild with pcsc-lite 1.3.2 for extended APDU support. Index: pcsc-perl.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pcsc-perl.spec 28 Aug 2006 16:48:40 -0000 1.10 +++ pcsc-perl.spec 2 Nov 2006 17:01:11 -0000 1.11 @@ -3,7 +3,7 @@ Name: pcsc-perl Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl interface to the PC/SC smart card library Group: Development/Libraries @@ -60,6 +60,9 @@ %changelog +* Thu Nov 2 2006 Ville Skytt?? - 1.4.4-2 +- Rebuild with pcsc-lite 1.3.2 for extended APDU support. + * Tue Aug 15 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. From fedora-extras-commits at redhat.com Thu Nov 2 17:09:22 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Nov 2006 10:09:22 -0700 Subject: rpms/kdesvn/FC-5 .cvsignore, 1.10, 1.11 kdesvn.spec, 1.17, 1.18 sources, 1.10, 1.11 Message-ID: <200611021709.kA2H9MAr018365@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18305/FC-5 Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 1 Sep 2006 15:41:14 -0000 1.10 +++ .cvsignore 2 Nov 2006 17:08:51 -0000 1.11 @@ -1 +1 @@ -kdesvn-0.9.2.tar.bz2 +kdesvn-0.11.0.tar.bz2 Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-5/kdesvn.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- kdesvn.spec 1 Sep 2006 15:56:09 -0000 1.17 +++ kdesvn.spec 2 Nov 2006 17:08:51 -0000 1.18 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 0.9.2 +Version: 0.11.0 Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration @@ -7,7 +7,6 @@ License: GPL URL: http://www.alwins-world.de/programs/kdesvn/ Source0: http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{version}.tar.bz2 -Patch0: kdesvn-0.9.2-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: subversion-devel, kdelibs-devel, neon-devel, cmake, gettext @@ -39,7 +38,6 @@ %prep %setup -q -%patch -p0 -b .lib64 %build @@ -132,6 +130,10 @@ %changelog +* Wed Nov 1 2006 - Orion Poplawski - 0.11.0-1 +- Update to 0.11.0 +- Remove patch applied upstream + * Fri Sep 1 2006 - Orion Poplawski - 0.9.2-1 - Update to 0.9.2, uses cmake - Add patch from Rajko Albrecht to fix lib64 installs Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 1 Sep 2006 15:41:14 -0000 1.10 +++ sources 2 Nov 2006 17:08:51 -0000 1.11 @@ -1 +1 @@ -d21c5c6ddc00d1948014149ecffeb5d0 kdesvn-0.9.2.tar.bz2 +466ea28e5e66d0536ff57b9da4cc95bd kdesvn-0.11.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 17:09:23 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Nov 2006 10:09:23 -0700 Subject: rpms/kdesvn/FC-6 .cvsignore, 1.12, 1.13 kdesvn.spec, 1.22, 1.23 sources, 1.12, 1.13 Message-ID: <200611021709.kA2H9NiA018370@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18305/FC-6 Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-6/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 4 Oct 2006 22:46:26 -0000 1.12 +++ .cvsignore 2 Nov 2006 17:08:52 -0000 1.13 @@ -1 +1 @@ -kdesvn-0.10.0.tar.bz2 +kdesvn-0.11.0.tar.bz2 Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-6/kdesvn.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- kdesvn.spec 4 Oct 2006 22:46:26 -0000 1.22 +++ kdesvn.spec 2 Nov 2006 17:08:52 -0000 1.23 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration @@ -130,6 +130,9 @@ %changelog +* Wed Nov 1 2006 - Orion Poplawski - 0.11.0-1 +- Update to 0.11.0 + * Wed Oct 4 2006 - Orion Poplawski - 0.10.0-1 - Update to 0.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-6/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 4 Oct 2006 22:46:26 -0000 1.12 +++ sources 2 Nov 2006 17:08:52 -0000 1.13 @@ -1 +1 @@ -896d62ac8687236f05e984ba6cd69e6b kdesvn-0.10.0.tar.bz2 +466ea28e5e66d0536ff57b9da4cc95bd kdesvn-0.11.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 17:09:23 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Nov 2006 10:09:23 -0700 Subject: rpms/kdesvn/devel .cvsignore, 1.12, 1.13 kdesvn.spec, 1.22, 1.23 sources, 1.12, 1.13 Message-ID: <200611021709.kA2H9NTQ018375@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18305/devel Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 4 Oct 2006 22:46:26 -0000 1.12 +++ .cvsignore 2 Nov 2006 17:08:53 -0000 1.13 @@ -1 +1 @@ -kdesvn-0.10.0.tar.bz2 +kdesvn-0.11.0.tar.bz2 Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- kdesvn.spec 4 Oct 2006 22:46:26 -0000 1.22 +++ kdesvn.spec 2 Nov 2006 17:08:53 -0000 1.23 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration @@ -130,6 +130,9 @@ %changelog +* Wed Nov 1 2006 - Orion Poplawski - 0.11.0-1 +- Update to 0.11.0 + * Wed Oct 4 2006 - Orion Poplawski - 0.10.0-1 - Update to 0.10.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 4 Oct 2006 22:46:26 -0000 1.12 +++ sources 2 Nov 2006 17:08:53 -0000 1.13 @@ -1 +1 @@ -896d62ac8687236f05e984ba6cd69e6b kdesvn-0.10.0.tar.bz2 +466ea28e5e66d0536ff57b9da4cc95bd kdesvn-0.11.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 17:19:38 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Thu, 2 Nov 2006 10:19:38 -0700 Subject: status-report-scripts parseBZbugList,1.56,1.57 Message-ID: <200611021719.kA2HJcAF018574@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/fedora/status-report-scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18556 Modified Files: parseBZbugList Log Message: Add TODO item about open re-review tickets. Index: parseBZbugList =================================================================== RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- parseBZbugList 2 Nov 2006 16:31:17 -0000 1.56 +++ parseBZbugList 2 Nov 2006 17:19:35 -0000 1.57 @@ -25,6 +25,8 @@ # TODO stuff # See why count in "Inactive maintainers with open bug reports" is strange. # Maybe report a count of FE-DEADREVIEW. +# Do not warn about open review tickets when a package already exists +# in CVS with a dead.package file. use strict; use Getopt::Long; From fedora-extras-commits at redhat.com Thu Nov 2 17:22:28 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 2 Nov 2006 10:22:28 -0700 Subject: owners owners.list,1.1883,1.1884 Message-ID: <200611021722.kA2HMSVB018623@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18605 Modified Files: owners.list Log Message: Add crossvc to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1883 retrieving revision 1.1884 diff -u -r1.1883 -r1.1884 --- owners.list 1 Nov 2006 22:40:40 -0000 1.1883 +++ owners.list 2 Nov 2006 17:21:58 -0000 1.1884 @@ -239,6 +239,7 @@ Fedora Extras|crossfire|Crossfire game server|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|crossfire-client|Crossfire game client|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|crossfire-maps|Crossfire game server maps|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|crossvc|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|crystal|KDE window decoration|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org| Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Nov 2 17:31:10 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Nov 2006 10:31:10 -0700 Subject: rpms/plplot/devel plplot.spec,1.23,1.24 Message-ID: <200611021731.kA2HVAR4018727@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/plplot/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18709 Modified Files: plplot.spec Log Message: Change BR on gnome-python2 to gnome-python2-devel Index: plplot.spec =================================================================== RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- plplot.spec 2 Nov 2006 16:30:59 -0000 1.23 +++ plplot.spec 2 Nov 2006 17:30:40 -0000 1.24 @@ -20,7 +20,7 @@ BuildRequires: java-devel, libgcj-devel, ncurses-devel BuildRequires: gd-devel, tcl-devel, tk-devel BuildRequires: python-devel, pygtk2-devel, python-numeric -BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2 +BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel BuildRequires: perl(XML::DOM) BuildRequires: lasi-devel BuildRequires: wxGTK-devel @@ -364,6 +364,7 @@ * Thu Nov 2 2006 - Orion Poplawski - 5.6.1-8 - Point to the freefont package properly (bug #210517) - Move libriaries to -libs, -devel requires -libs for multilib support +- Change BR on gnome-python2 to gnome-python2-devel * Fri Oct 6 2006 - Orion Poplawski - 5.6.1-7 - Rebuild for new octave API version From fedora-extras-commits at redhat.com Thu Nov 2 17:50:25 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Thu, 2 Nov 2006 10:50:25 -0700 Subject: rpms/kadu/devel kadu.spec,1.15,1.16 sources,1.7,1.8 Message-ID: <200611021750.kA2HoPqI018915@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/kadu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18897 Modified Files: kadu.spec sources Log Message: * Thu Nov 02 2006 Micha?? Bentkowski - 0.5.0-0.18.20060915svn - Come back to 20060915 Index: kadu.spec =================================================================== RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kadu.spec 29 Oct 2006 11:49:20 -0000 1.15 +++ kadu.spec 2 Nov 2006 17:49:55 -0000 1.16 @@ -1,7 +1,7 @@ -%define cvs_date 20061029 +%define cvs_date 20060915 Name: kadu Version: 0.5.0 -Release: 0.17.%{cvs_date}svn%{?dist} +Release: 0.18.%{cvs_date}svn%{?dist} Summary: An Gadu-Gadu client for online messaging Group: Applications/Internet License: GPL @@ -453,6 +453,9 @@ %{_moddata}/data/weather %changelog +* Thu Nov 02 2006 Micha?? Bentkowski - 0.5.0-0.18.20060915svn +- Come back to 20060915 + * Sun Oct 29 2006 Micha?? Bentkowski - 0.5.0-0.17.20061029svn - Disabling kadu-amarok on ppc arch Index: sources =================================================================== RCS file: /cvs/extras/rpms/kadu/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Oct 2006 11:24:27 -0000 1.7 +++ sources 2 Nov 2006 17:49:55 -0000 1.8 @@ -1,3 +1,4 @@ +575746c975382dc7a7d275175449cb21 kadu-20060915.tar.bz2 62913be4ecb267b9bbf6d87dbb3e67e6 kadu-firewall-0.6.3.tar.gz 0fb5d8f465899ffbe96d44685e5e9955 amarok-1.17.tar.gz 9b0622b02a7190502519b2e3034ccec4 dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 @@ -15,4 +16,3 @@ 30833253a9f94eedc892767c1267536a weather-3.03.tar.bz2 422b0bfe2fe1d67620896576e3092ac8 xmms-1.30.tar.gz 270c19fc9fb3e96bcbce76c2077d3ec2 mail-current.tar.gz -203d4b6a041f39703a9b5d259a259c38 kadu-20061029.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 18:48:47 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 2 Nov 2006 11:48:47 -0700 Subject: comps comps-fe5.xml.in, 1.184, 1.185 comps-fe6.xml.in, 1.208, 1.209 comps-fe7.xml.in, 1.6, 1.7 Message-ID: <200611021848.kA2ImlBa022226@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206 Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: Add crossvc in comps.xml Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- comps-fe5.xml.in 2 Nov 2006 13:00:28 -0000 1.184 +++ comps-fe5.xml.in 2 Nov 2006 18:48:16 -0000 1.185 @@ -110,6 +110,7 @@ cpan2rpm cpanspec cppunit + crossvc curry cvsps cvsweb @@ -132,7 +133,6 @@ kuipc lcov lightning - lincvs lua mach mcrypt Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- comps-fe6.xml.in 2 Nov 2006 15:55:51 -0000 1.208 +++ comps-fe6.xml.in 2 Nov 2006 18:48:16 -0000 1.209 @@ -129,6 +129,7 @@ cpanspec cppunit cproto + crossvc curry cvs2cl cvs2svn @@ -157,7 +158,6 @@ kuipc lcov lightning - lincvs lua mach mcrypt Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- comps-fe7.xml.in 2 Nov 2006 15:55:51 -0000 1.6 +++ comps-fe7.xml.in 2 Nov 2006 18:48:16 -0000 1.7 @@ -129,6 +129,7 @@ cpanspec cppunit cproto + crossvc curry cvs2cl cvs2svn @@ -157,7 +158,6 @@ kuipc lcov lightning - lincvs lua mach mcrypt From fedora-extras-commits at redhat.com Thu Nov 2 18:58:30 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 2 Nov 2006 11:58:30 -0700 Subject: rpms/lincvs/FC-6 dead.package, NONE, 1.1 crossvc.desktop, 1.1, NONE crossvc.spec, 1.3, NONE sources, 1.6, NONE Message-ID: <200611021858.kA2IwUL9022316@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lincvs/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22311 Added Files: dead.package Removed Files: crossvc.desktop crossvc.spec sources Log Message: Retired lincvs in FC-6 --- NEW FILE dead.package --- Package was renamed into crossvc. --- crossvc.desktop DELETED --- --- crossvc.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 19:02:46 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 2 Nov 2006 12:02:46 -0700 Subject: rpms/lincvs/FC-5 dead.package, NONE, 1.1 crossvc.desktop, 1.1, NONE crossvc.spec, 1.3, NONE sources, 1.6, NONE Message-ID: <200611021902.kA2J2k7m025294@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/lincvs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25287 Added Files: dead.package Removed Files: crossvc.desktop crossvc.spec sources Log Message: Retired lincvs in FC-6 --- NEW FILE dead.package --- Package was renamed into crossvc. --- crossvc.desktop DELETED --- --- crossvc.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 19:07:27 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 2 Nov 2006 12:07:27 -0700 Subject: fedora-security/audit fc5,1.380,1.381 fc6,1.133,1.134 Message-ID: <200611021907.kA2J7R0b025412@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25392 Modified Files: fc5 fc6 Log Message: Note a new php issue Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.380 retrieving revision 1.381 diff -u -r1.380 -r1.381 --- fc5 2 Nov 2006 09:11:11 -0000 1.380 +++ fc5 2 Nov 2006 19:07:24 -0000 1.381 @@ -14,6 +14,7 @@ CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110] CVE-2006-5466 VULNERABLE (rpm) #212833 +CVE-2006-5465 VULNERABLE (php, fixed 5.2.0) #213732 CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only) CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2) Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- fc6 2 Nov 2006 09:11:11 -0000 1.133 +++ fc6 2 Nov 2006 19:07:24 -0000 1.134 @@ -14,6 +14,7 @@ CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1109] CVE-2006-5466 VULNERABLE (rpm) #212833 +CVE-2006-5465 VULNERABLE (php, fixed 5.2.0) #213732 CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2) From fedora-extras-commits at redhat.com Thu Nov 2 19:11:53 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 2 Nov 2006 12:11:53 -0700 Subject: fedora-security/audit fe4,1.87,1.88 Message-ID: <200611021911.kA2JBrbV025463@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25445 Modified Files: fe4 Log Message: Note that a backported fix for wv was applied. Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- fe4 1 Nov 2006 18:03:32 -0000 1.87 +++ fe4 2 Nov 2006 19:11:50 -0000 1.88 @@ -29,7 +29,7 @@ CVE-2006-4568 VULNERABLE (seamonkey, fixed 1.0.5) #209167 CVE-2006-4566 VULNERABLE (seamonkey, fixed 1.0.5) #209167 CVE-2006-4565 VULNERABLE (seamonkey, fixed 1.0.5) #209167 -CVE-2006-4513 VULNERABLE (wv) #212696 +CVE-2006-4513 backport (wv, fixed 1.0.3-3) #212696 CVE-2006-4513 ** (abiword) #212698 CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167 From fedora-extras-commits at redhat.com Thu Nov 2 19:21:43 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 2 Nov 2006 12:21:43 -0700 Subject: rpms/pgp-tools/devel .cvsignore, 1.6, 1.7 pgp-tools.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200611021921.kA2JLh7X025559@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25527 Modified Files: .cvsignore pgp-tools.spec sources Log Message: upgrade to 0.4.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Oct 2006 03:24:23 -0000 1.6 +++ .cvsignore 2 Nov 2006 19:21:12 -0000 1.7 @@ -1 +1 @@ -signing-party_0.4.8.orig.tar.gz +signing-party_0.4.9.orig.tar.gz Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pgp-tools.spec 8 Oct 2006 03:24:23 -0000 1.5 +++ pgp-tools.spec 2 Nov 2006 19:21:12 -0000 1.6 @@ -1,6 +1,6 @@ %define tarballname signing-party Name: pgp-tools -Version: 0.4.8 +Version: 0.4.9 Release: 1%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System @@ -77,6 +77,13 @@ %changelog +* Thu Nov 02 2006 Matt Domsch 0.4.9-1 +- upgrade to 0.4.9 + - Fix a bug with checking if we have exactly one or more keys that failed downloading. + - Mention in manpage that keyserver-options is a useful setting in + .caff/gnupghome/gpg.conf (Closes: debian #392811). + - q-p-encode From: header (Closes: debian #366745). + * Sat Oct 07 2006 Matt Domsch 0.4.8-1 - upgrade to 0.4.8 - gpglist: do not die with with-fingerprint (Closes: debian #382019). Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Oct 2006 03:24:23 -0000 1.6 +++ sources 2 Nov 2006 19:21:12 -0000 1.7 @@ -1 +1 @@ -61f4d997e0b989e70f8ae850680106a7 signing-party_0.4.8.orig.tar.gz +da6bc997b3b12bc504acee87001e8be1 signing-party_0.4.9.orig.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 19:23:26 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Nov 2006 12:23:26 -0700 Subject: fedora-security/audit fe3, 1.26, 1.27 fe4, 1.88, 1.89 fe5, 1.95, 1.96 fe6, 1.8, 1.9 Message-ID: <200611021923.kA2JNQll025680@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25656 Modified Files: fe3 fe4 fe5 fe6 Log Message: +CVE-2006-4248 ignore (thttpd, Debian specific issue) Index: fe3 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe3,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- fe3 28 Oct 2006 06:48:21 -0000 1.26 +++ fe3 2 Nov 2006 19:23:23 -0000 1.27 @@ -9,6 +9,7 @@ CVE-2006-4976 ** (php-adodb) #208299 CVE-2006-4513 VULNERABLE (wv) #212696 CVE-2006-4513 ** (abiword) #212698 +CVE-2006-4248 ignore (thttpd, Debian specific issue) CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163 CVE-2006-4192 VULNERABLE (libmodplug) CVE-2006-4182 version (clamav, fixed 0.88.5) #210973 Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- fe4 2 Nov 2006 19:11:50 -0000 1.88 +++ fe4 2 Nov 2006 19:23:23 -0000 1.89 @@ -33,6 +33,7 @@ CVE-2006-4513 ** (abiword) #212698 CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167 +CVE-2006-4248 ignore (thttpd, Debian specific issue) CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163 CVE-2006-4192 patch (libmodplug, fixed 0.7-4) CVE-2006-4182 version (clamav, fixed 0.88.5) #210973 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- fe5 1 Nov 2006 18:03:32 -0000 1.95 +++ fe5 2 Nov 2006 19:23:23 -0000 1.96 @@ -33,6 +33,7 @@ CVE-2006-4513 ** (abiword) #212698 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167 +CVE-2006-4248 ignore (thttpd, Debian specific issue) CVE-2006-4247 patch (plone, fixed 2.5-4) #209163 CVE-2006-4192 patch (libmodplug, fixed 0.8-3) CVE-2006-4182 version (clamav, fixed 0.88.5) #210973 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fe6 1 Nov 2006 18:03:32 -0000 1.8 +++ fe6 2 Nov 2006 19:23:23 -0000 1.9 @@ -33,6 +33,7 @@ CVE-2006-4513 ** (abiword) #212698 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167 +CVE-2006-4248 ignore (thttpd, Debian specific issue) CVE-2006-4247 patch (plone, fixed 2.5-4) #209163 CVE-2006-4192 patch (libmodplug, fixed 0.8-3) CVE-2006-4182 version (clamav, fixed 0.88.5) #210973 From fedora-extras-commits at redhat.com Thu Nov 2 19:39:32 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 2 Nov 2006 12:39:32 -0700 Subject: rpms/pgp-tools/FC-6 .cvsignore, 1.6, 1.7 pgp-tools.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200611021939.kA2JdWXG025797@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25777 Modified Files: .cvsignore pgp-tools.spec sources Log Message: update to 0.4.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Oct 2006 03:24:23 -0000 1.6 +++ .cvsignore 2 Nov 2006 19:39:02 -0000 1.7 @@ -1 +1 @@ -signing-party_0.4.8.orig.tar.gz +signing-party_0.4.9.orig.tar.gz Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-6/pgp-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pgp-tools.spec 8 Oct 2006 03:24:23 -0000 1.5 +++ pgp-tools.spec 2 Nov 2006 19:39:02 -0000 1.6 @@ -1,6 +1,6 @@ %define tarballname signing-party Name: pgp-tools -Version: 0.4.8 +Version: 0.4.9 Release: 1%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System @@ -77,6 +77,13 @@ %changelog +* Thu Nov 02 2006 Matt Domsch 0.4.9-1 +- upgrade to 0.4.9 + - Fix a bug with checking if we have exactly one or more keys that failed downloading. + - Mention in manpage that keyserver-options is a useful setting in + .caff/gnupghome/gpg.conf (Closes: debian #392811). + - q-p-encode From: header (Closes: debian #366745). + * Sat Oct 07 2006 Matt Domsch 0.4.8-1 - upgrade to 0.4.8 - gpglist: do not die with with-fingerprint (Closes: debian #382019). Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Oct 2006 03:24:23 -0000 1.6 +++ sources 2 Nov 2006 19:39:02 -0000 1.7 @@ -1 +1 @@ -61f4d997e0b989e70f8ae850680106a7 signing-party_0.4.8.orig.tar.gz +da6bc997b3b12bc504acee87001e8be1 signing-party_0.4.9.orig.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 19:41:07 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 2 Nov 2006 12:41:07 -0700 Subject: rpms/pgp-tools/FC-5 .cvsignore, 1.6, 1.7 pgp-tools.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200611021941.kA2Jf7Y0025873@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25851 Modified Files: .cvsignore pgp-tools.spec sources Log Message: update to 0.4.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Oct 2006 03:27:26 -0000 1.6 +++ .cvsignore 2 Nov 2006 19:40:37 -0000 1.7 @@ -1 +1 @@ -signing-party_0.4.8.orig.tar.gz +signing-party_0.4.9.orig.tar.gz Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/pgp-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pgp-tools.spec 8 Oct 2006 03:27:26 -0000 1.5 +++ pgp-tools.spec 2 Nov 2006 19:40:37 -0000 1.6 @@ -1,6 +1,6 @@ %define tarballname signing-party Name: pgp-tools -Version: 0.4.8 +Version: 0.4.9 Release: 1%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System @@ -77,6 +77,13 @@ %changelog +* Thu Nov 02 2006 Matt Domsch 0.4.9-1 +- upgrade to 0.4.9 + - Fix a bug with checking if we have exactly one or more keys that failed downloading. + - Mention in manpage that keyserver-options is a useful setting in + .caff/gnupghome/gpg.conf (Closes: debian #392811). + - q-p-encode From: header (Closes: debian #366745). + * Sat Oct 07 2006 Matt Domsch 0.4.8-1 - upgrade to 0.4.8 - gpglist: do not die with with-fingerprint (Closes: debian #382019). Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Oct 2006 03:27:26 -0000 1.6 +++ sources 2 Nov 2006 19:40:37 -0000 1.7 @@ -1 +1 @@ -61f4d997e0b989e70f8ae850680106a7 signing-party_0.4.8.orig.tar.gz +da6bc997b3b12bc504acee87001e8be1 signing-party_0.4.9.orig.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 19:42:43 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Thu, 2 Nov 2006 12:42:43 -0700 Subject: rpms/pgp-tools/FC-4 .cvsignore, 1.5, 1.6 pgp-tools.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200611021942.kA2Jghsp025947@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/pgp-tools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25923 Modified Files: .cvsignore pgp-tools.spec sources Log Message: update to 0.4.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Oct 2006 03:28:34 -0000 1.5 +++ .cvsignore 2 Nov 2006 19:42:13 -0000 1.6 @@ -1 +1 @@ -signing-party_0.4.8.orig.tar.gz +signing-party_0.4.9.orig.tar.gz Index: pgp-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/pgp-tools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pgp-tools.spec 8 Oct 2006 03:28:34 -0000 1.4 +++ pgp-tools.spec 2 Nov 2006 19:42:13 -0000 1.5 @@ -1,6 +1,6 @@ %define tarballname signing-party Name: pgp-tools -Version: 0.4.8 +Version: 0.4.9 Release: 1%{?dist} Summary: Collection of several utilities related to OpenPGP Group: Applications/System @@ -77,6 +77,13 @@ %changelog +* Thu Nov 02 2006 Matt Domsch 0.4.9-1 +- upgrade to 0.4.9 + - Fix a bug with checking if we have exactly one or more keys that failed downloading. + - Mention in manpage that keyserver-options is a useful setting in + .caff/gnupghome/gpg.conf (Closes: debian #392811). + - q-p-encode From: header (Closes: debian #366745). + * Sat Oct 07 2006 Matt Domsch 0.4.8-1 - upgrade to 0.4.8 - gpglist: do not die with with-fingerprint (Closes: debian #382019). Index: sources =================================================================== RCS file: /cvs/extras/rpms/pgp-tools/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Oct 2006 03:28:34 -0000 1.5 +++ sources 2 Nov 2006 19:42:13 -0000 1.6 @@ -1 +1 @@ -61f4d997e0b989e70f8ae850680106a7 signing-party_0.4.8.orig.tar.gz +da6bc997b3b12bc504acee87001e8be1 signing-party_0.4.9.orig.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 19:51:06 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 2 Nov 2006 12:51:06 -0700 Subject: rpms/magicor/devel .cvsignore, 1.2, 1.3 magicor.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611021951.kA2Jp6xK026047@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/magicor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26025 Modified Files: .cvsignore magicor.spec sources Log Message: * Thu Nov 2 2006 Hans de Goede 1.0-0.1.rc1 - New upstream release 1.0-rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Oct 2006 20:11:54 -0000 1.2 +++ .cvsignore 2 Nov 2006 19:50:36 -0000 1.3 @@ -1,2 +1,2 @@ -magicor-0.1.tar.gz -magicor-data-0.1.tar.gz +magicor-1.0-rc1.tar.gz +magicor-data-1.0-rc1.tar.gz Index: magicor.spec =================================================================== RCS file: /cvs/extras/rpms/magicor/devel/magicor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- magicor.spec 21 Oct 2006 20:11:54 -0000 1.1 +++ magicor.spec 2 Nov 2006 19:50:36 -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 pre_version rc1 + Name: magicor -Version: 0.1 -Release: 2%{?dist} +Version: 1.0 +Release: 0.1.%{pre_version}%{?dist} Summary: Push ice blocks around to extenguish all fires Group: Amusements/Games License: Public Domain URL: http://magicor.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Source1: http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}.tar.gz +Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz +Source1: http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz Source2: %{name}.desktop Source3: %{name}.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,7 +26,7 @@ %prep -%setup -q -b 1 +%setup -q -b 1 -n %{name}-%{version}-%{pre_version} sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \ scripts/Magicor-LevelEditor.py @@ -89,6 +91,9 @@ %changelog +* Thu Nov 2 2006 Hans de Goede 1.0-0.1.rc1 +- New upstream release 1.0-rc1 + * Sat Oct 21 2006 Hans de Goede 0.1-2 - Mark /etc/magicor.conf %%config(noreplace) Index: sources =================================================================== RCS file: /cvs/extras/rpms/magicor/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Oct 2006 20:11:54 -0000 1.2 +++ sources 2 Nov 2006 19:50:36 -0000 1.3 @@ -1,2 +1,2 @@ -d5872a5fb0457af8c14a0c392b824c68 magicor-0.1.tar.gz -0f9920721788147331d8e7d0a6d60a46 magicor-data-0.1.tar.gz +ad3e7562cd7e0d6a443951a08c4ab94b magicor-1.0-rc1.tar.gz +9c58c3ec1d0638f6f40db5e723bedbc2 magicor-data-1.0-rc1.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 19:52:18 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 2 Nov 2006 12:52:18 -0700 Subject: rpms/magicor/FC-6 .cvsignore, 1.2, 1.3 magicor.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611021952.kA2JqICU026111@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/magicor/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26091 Modified Files: .cvsignore magicor.spec sources Log Message: * Thu Nov 2 2006 Hans de Goede 1.0-0.1.rc1 - New upstream release 1.0-rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/magicor/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Oct 2006 20:11:54 -0000 1.2 +++ .cvsignore 2 Nov 2006 19:51:48 -0000 1.3 @@ -1,2 +1,2 @@ -magicor-0.1.tar.gz -magicor-data-0.1.tar.gz +magicor-1.0-rc1.tar.gz +magicor-data-1.0-rc1.tar.gz Index: magicor.spec =================================================================== RCS file: /cvs/extras/rpms/magicor/FC-6/magicor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- magicor.spec 21 Oct 2006 20:11:54 -0000 1.1 +++ magicor.spec 2 Nov 2006 19:51:48 -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 pre_version rc1 + Name: magicor -Version: 0.1 -Release: 2%{?dist} +Version: 1.0 +Release: 0.1.%{pre_version}%{?dist} Summary: Push ice blocks around to extenguish all fires Group: Amusements/Games License: Public Domain URL: http://magicor.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Source1: http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}.tar.gz +Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz +Source1: http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz Source2: %{name}.desktop Source3: %{name}.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,7 +26,7 @@ %prep -%setup -q -b 1 +%setup -q -b 1 -n %{name}-%{version}-%{pre_version} sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \ scripts/Magicor-LevelEditor.py @@ -89,6 +91,9 @@ %changelog +* Thu Nov 2 2006 Hans de Goede 1.0-0.1.rc1 +- New upstream release 1.0-rc1 + * Sat Oct 21 2006 Hans de Goede 0.1-2 - Mark /etc/magicor.conf %%config(noreplace) Index: sources =================================================================== RCS file: /cvs/extras/rpms/magicor/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Oct 2006 20:11:54 -0000 1.2 +++ sources 2 Nov 2006 19:51:48 -0000 1.3 @@ -1,2 +1,2 @@ -d5872a5fb0457af8c14a0c392b824c68 magicor-0.1.tar.gz -0f9920721788147331d8e7d0a6d60a46 magicor-data-0.1.tar.gz +ad3e7562cd7e0d6a443951a08c4ab94b magicor-1.0-rc1.tar.gz +9c58c3ec1d0638f6f40db5e723bedbc2 magicor-data-1.0-rc1.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 19:53:11 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 2 Nov 2006 12:53:11 -0700 Subject: rpms/magicor/FC-5 .cvsignore, 1.2, 1.3 magicor.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611021953.kA2JrBKO026181@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/magicor/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26156 Modified Files: .cvsignore magicor.spec sources Log Message: * Thu Nov 2 2006 Hans de Goede 1.0-0.1.rc1 - New upstream release 1.0-rc1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/magicor/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Oct 2006 20:11:54 -0000 1.2 +++ .cvsignore 2 Nov 2006 19:52:41 -0000 1.3 @@ -1,2 +1,2 @@ -magicor-0.1.tar.gz -magicor-data-0.1.tar.gz +magicor-1.0-rc1.tar.gz +magicor-data-1.0-rc1.tar.gz Index: magicor.spec =================================================================== RCS file: /cvs/extras/rpms/magicor/FC-5/magicor.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- magicor.spec 21 Oct 2006 20:11:54 -0000 1.1 +++ magicor.spec 2 Nov 2006 19:52:41 -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 pre_version rc1 + Name: magicor -Version: 0.1 -Release: 2%{?dist} +Version: 1.0 +Release: 0.1.%{pre_version}%{?dist} Summary: Push ice blocks around to extenguish all fires Group: Amusements/Games License: Public Domain URL: http://magicor.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Source1: http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}.tar.gz +Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz +Source1: http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz Source2: %{name}.desktop Source3: %{name}.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,7 +26,7 @@ %prep -%setup -q -b 1 +%setup -q -b 1 -n %{name}-%{version}-%{pre_version} sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \ scripts/Magicor-LevelEditor.py @@ -89,6 +91,9 @@ %changelog +* Thu Nov 2 2006 Hans de Goede 1.0-0.1.rc1 +- New upstream release 1.0-rc1 + * Sat Oct 21 2006 Hans de Goede 0.1-2 - Mark /etc/magicor.conf %%config(noreplace) Index: sources =================================================================== RCS file: /cvs/extras/rpms/magicor/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Oct 2006 20:11:54 -0000 1.2 +++ sources 2 Nov 2006 19:52:41 -0000 1.3 @@ -1,2 +1,2 @@ -d5872a5fb0457af8c14a0c392b824c68 magicor-0.1.tar.gz -0f9920721788147331d8e7d0a6d60a46 magicor-data-0.1.tar.gz +ad3e7562cd7e0d6a443951a08c4ab94b magicor-1.0-rc1.tar.gz +9c58c3ec1d0638f6f40db5e723bedbc2 magicor-data-1.0-rc1.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 20:45:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 2 Nov 2006 13:45:58 -0700 Subject: rpms/scorched3d/devel .cvsignore, 1.4, 1.5 scorched3d-help.patch, 1.3, 1.4 scorched3d-syslibs.patch, 1.3, 1.4 scorched3d-wx26.patch, 1.1, 1.2 scorched3d.spec, 1.17, 1.18 sources, 1.4, 1.5 Message-ID: <200611022045.kA2Kjw8n029444@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29409 Modified Files: .cvsignore scorched3d-help.patch scorched3d-syslibs.patch scorched3d-wx26.patch scorched3d.spec sources Log Message: * Tue Aug 29 2006 Hans de Goede 40.1c-1 - New upstream release 40.1c - Drop 64 bit patch (integrated upstream) - Don't install our data files in /usr/share/games, but in /usr/share - Some minor specfile cleanups Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jul 2006 20:04:07 -0000 1.4 +++ .cvsignore 2 Nov 2006 20:45:26 -0000 1.5 @@ -1 +1 @@ -Scorched3D-40-src.tar.gz +Scorched3D-40.1c-src.tar.gz scorched3d-help.patch: Index: scorched3d-help.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-help.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scorched3d-help.patch 16 Jul 2006 19:11:25 -0000 1.3 +++ scorched3d-help.patch 2 Nov 2006 20:45:26 -0000 1.4 @@ -1,25 +1,3 @@ -diff -ur scorched.orig/src/scorched/HtmlHelpDialog.cpp scorched/src/scorched/HtmlHelpDialog.cpp ---- scorched.orig/src/scorched/HtmlHelpDialog.cpp 2006-02-17 18:48:54.000000000 +0100 -+++ scorched/src/scorched/HtmlHelpDialog.cpp 2006-07-16 11:03:57.000000000 +0200 -@@ -137,13 +137,13 @@ - void HelpFrame::onHome(wxCommandEvent &event) - { - html_->HistoryClear(); -- html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8)); -+ html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8)); - } - - void showHtmlHelpDialog() - { - // For the moment just show the documentation in the default web browser -- showURL(formatString("file://%s", getDocFile("documentation/html/index.html"))); -+ showURL(formatString("file://%s", getDocFile("html/index.html"))); - - //HelpFrame *frame = new HelpFrame(); - //frame->Show(); -Only in scorched/src/scorched: HtmlHelpDialog.cpp.orig -Only in scorched/src/scorched: HtmlHelpDialog.cpp.rej -Only in scorched/src/scorched: HtmlHelpDialog.cpp~ diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp --- scorched.orig/src/scorched/MainDialog.cpp 2006-05-14 17:00:11.000000000 +0200 +++ scorched/src/scorched/MainDialog.cpp 2006-07-16 11:05:27.000000000 +0200 @@ -34,6 +12,3 @@ #endif // __DARWIN__ #endif // _WIN32 } -Only in scorched/src/scorched: MainDialog.cpp.orig -Only in scorched/src/scorched: MainDialog.cpp.rej -Only in scorched/src/scorched: MainDialog.cpp~ scorched3d-syslibs.patch: Index: scorched3d-syslibs.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-syslibs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scorched3d-syslibs.patch 16 Jul 2006 19:11:25 -0000 1.3 +++ scorched3d-syslibs.patch 2 Nov 2006 20:45:26 -0000 1.4 @@ -1,16 +1,16 @@ ---- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100 -+++ scorched/src/coms/NetServerProtocol.cpp 2006-07-16 11:36:19.000000000 +0200 +--- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-08-04 15:35:15.000000000 +0200 ++++ scorched/src/coms/NetServerProtocol.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -22,7 +22,7 @@ #include - #include + #include #include -#include +#include NetServerProtocol::NetServerProtocol() { ---- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100 -+++ scorched/src/coms/ComsMessageSender.cpp 2006-07-16 11:36:19.000000000 +0200 +--- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-09-08 17:07:59.000000000 +0200 ++++ scorched/src/coms/ComsMessageSender.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -27,7 +27,7 @@ #include #include @@ -21,7 +21,7 @@ bool ComsMessageSender::sendToServer(ComsMessage &message) --- scorched/src/XML/XMLParser.h.syslibs 2006-05-01 01:42:52.000000000 +0200 -+++ scorched/src/XML/XMLParser.h 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/XML/XMLParser.h 2006-10-31 20:11:27.000000000 +0100 @@ -21,7 +21,7 @@ #if !defined(__INCLUDE_XMLParserh_INCLUDE__) #define __INCLUDE_XMLParserh_INCLUDE__ @@ -31,18 +31,18 @@ #include class XMLParser ---- scorched/src/scorched/Makefile.am.syslibs 2006-07-15 17:14:50.000000000 +0200 -+++ scorched/src/scorched/Makefile.am 2006-07-16 11:36:47.000000000 +0200 -@@ -260,7 +260,6 @@ - ../common/Vector.h \ +--- scorched/src/scorched/Makefile.am.syslibs 2006-10-27 20:48:23.000000000 +0200 ++++ scorched/src/scorched/Makefile.am 2006-10-31 20:12:35.000000000 +0100 +@@ -271,7 +271,6 @@ + ../common/Vector4.h \ ../common/VectorLib.cpp \ ../common/VectorLib.h \ - ../common/snprintf.c \ ../3dsparse/ASEModelFactory.cpp \ ../3dsparse/ASEModelFactory.h \ ../3dsparse/Bone.cpp \ -@@ -602,95 +601,6 @@ - ../weapons/WeaponTranslate.h \ +@@ -637,96 +636,6 @@ + ../weapons/WeaponTypeAction.h \ ../weapons/WeaponVelocity.cpp \ ../weapons/WeaponVelocity.h \ - ../ode/array.cpp \ @@ -50,6 +50,7 @@ - ../ode/collision.h \ - ../ode/collision_kernel.cpp \ - ../ode/collision_kernel.h \ +- ../ode/collision_quadtreespace.cpp \ - ../ode/collision_space.cpp \ - ../ode/collision_space.h \ - ../ode/collision_space_internal.h \ @@ -137,7 +138,7 @@ ../actions/AddTarget.cpp \ ../actions/AddTarget.h \ ../actions/Animation.cpp \ -@@ -1100,14 +1010,6 @@ +@@ -1134,14 +1043,6 @@ ../XML/XMLParser.h \ ../XML/XMLStringBuffer.cpp \ ../XML/XMLStringBuffer.h \ @@ -152,18 +153,18 @@ ../target/Target.cpp \ ../target/Target.h \ ../target/TargetContainer.cpp \ ---- scorched/src/scorched/Makefile.in.syslibs 2006-07-15 17:15:28.000000000 +0200 -+++ scorched/src/scorched/Makefile.in 2006-07-16 11:37:23.000000000 +0200 -@@ -360,7 +360,6 @@ - ../common/Vector.h \ +--- scorched/src/scorched/Makefile.in.syslibs 2006-10-30 19:10:42.000000000 +0100 ++++ scorched/src/scorched/Makefile.in 2006-10-31 20:19:02.000000000 +0100 +@@ -372,7 +372,6 @@ + ../common/Vector4.h \ ../common/VectorLib.cpp \ ../common/VectorLib.h \ - ../common/snprintf.c \ ../3dsparse/ASEModelFactory.cpp \ ../3dsparse/ASEModelFactory.h \ ../3dsparse/Bone.cpp \ -@@ -702,95 +701,6 @@ - ../weapons/WeaponTranslate.h \ +@@ -738,96 +737,6 @@ + ../weapons/WeaponTypeAction.h \ ../weapons/WeaponVelocity.cpp \ ../weapons/WeaponVelocity.h \ - ../ode/array.cpp \ @@ -171,6 +172,7 @@ - ../ode/collision.h \ - ../ode/collision_kernel.cpp \ - ../ode/collision_kernel.h \ +- ../ode/collision_quadtreespace.cpp \ - ../ode/collision_space.cpp \ - ../ode/collision_space.h \ - ../ode/collision_space_internal.h \ @@ -258,7 +260,7 @@ ../actions/AddTarget.cpp \ ../actions/AddTarget.h \ ../actions/Animation.cpp \ -@@ -1200,14 +1110,6 @@ +@@ -1235,14 +1144,6 @@ ../XML/XMLParser.h \ ../XML/XMLStringBuffer.cpp \ ../XML/XMLStringBuffer.h \ @@ -273,20 +275,21 @@ ../target/Target.cpp \ ../target/Target.h \ ../target/TargetContainer.cpp \ -@@ -1426,7 +1328,7 @@ - SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \ - StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \ - StatsLoggerMySQL.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \ +@@ -1471,7 +1372,7 @@ + SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \ + StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \ + Triangle.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \ - VectorLib.$(OBJEXT) snprintf.$(OBJEXT) \ + VectorLib.$(OBJEXT) \ ASEModelFactory.$(OBJEXT) Bone.$(OBJEXT) Face.$(OBJEXT) \ ImageID.$(OBJEXT) ImageStore.$(OBJEXT) MSModelFactory.$(OBJEXT) \ Mesh.$(OBJEXT) MeshLOD.$(OBJEXT) MeshLODTri.$(OBJEXT) \ -@@ -1506,21 +1408,6 @@ - WeaponScatterPosition.$(OBJEXT) WeaponSkyFlash.$(OBJEXT) \ - WeaponSound.$(OBJEXT) WeaponTeleport.$(OBJEXT) \ - WeaponTranslate.$(OBJEXT) WeaponVelocity.$(OBJEXT) \ -- array.$(OBJEXT) collision_kernel.$(OBJEXT) \ +@@ -1558,22 +1459,7 @@ + WeaponTankPosition.$(OBJEXT) WeaponTankVelocity.$(OBJEXT) \ + WeaponTeamAction.$(OBJEXT) WeaponTeleport.$(OBJEXT) \ + WeaponTranslate.$(OBJEXT) WeaponTypeAction.$(OBJEXT) \ +- WeaponVelocity.$(OBJEXT) array.$(OBJEXT) \ +- collision_kernel.$(OBJEXT) collision_quadtreespace.$(OBJEXT) \ - collision_space.$(OBJEXT) collision_std.$(OBJEXT) \ - collision_transform.$(OBJEXT) collision_util.$(OBJEXT) \ - error.$(OBJEXT) export-dif.$(OBJEXT) fastdot.$(OBJEXT) \ @@ -301,21 +304,19 @@ - infblock.$(OBJEXT) infcodes.$(OBJEXT) inffast.$(OBJEXT) \ - inflate.$(OBJEXT) inftrees.$(OBJEXT) infutil.$(OBJEXT) \ - trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \ ++ WeaponVelocity.$(OBJEXT) \ AddTarget.$(OBJEXT) Animation.$(OBJEXT) \ CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \ Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \ -@@ -1625,8 +1512,8 @@ - TankAIStore.$(OBJEXT) TankAIStrings.$(OBJEXT) \ - ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) ShipGroup.$(OBJEXT) \ - XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \ -- XMLStringBuffer.$(OBJEXT) xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) \ -- xmltok.$(OBJEXT) Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ -+ XMLStringBuffer.$(OBJEXT) \ -+ Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ +@@ -1677,7 +1563,6 @@ + TankAIStrings.$(OBJEXT) ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) \ + ShipGroup.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \ + XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \ +- xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) xmltok.$(OBJEXT) \ + Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \ - TargetLife.$(OBJEXT) TargetParachute.$(OBJEXT) \ - TargetRenderer.$(OBJEXT) TargetShield.$(OBJEXT) \ -@@ -2178,35 +2065,9 @@ + TargetGroupEntry.$(OBJEXT) TargetLife.$(OBJEXT) \ +@@ -2252,36 +2137,9 @@ @AMDEP_TRUE@ ./$(DEPDIR)/WindowSetup.Po ./$(DEPDIR)/XMLFile.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/XMLNode.Po ./$(DEPDIR)/XMLParser.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/XMLStringBuffer.Po \ @@ -323,6 +324,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.lex.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.tab.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_kernel.Po \ +- at AMDEP_TRUE@ ./$(DEPDIR)/collision_quadtreespace.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_space.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_std.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_transform.Po \ @@ -352,20 +354,21 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -@@ -2386,7 +2247,6 @@ - Triangle.$(OBJEXT): ../common/Triangle.cpp +@@ -2468,7 +2326,6 @@ Vector.$(OBJEXT): ../common/Vector.cpp + Vector4.$(OBJEXT): ../common/Vector4.cpp VectorLib.$(OBJEXT): ../common/VectorLib.cpp -snprintf.$(OBJEXT): ../common/snprintf.c ASEModelFactory.$(OBJEXT): ../3dsparse/ASEModelFactory.cpp Bone.$(OBJEXT): ../3dsparse/Bone.cpp Face.$(OBJEXT): ../3dsparse/Face.cpp -@@ -2563,49 +2423,6 @@ - WeaponTeleport.$(OBJEXT): ../weapons/WeaponTeleport.cpp +@@ -2658,50 +2515,6 @@ WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp + WeaponTypeAction.$(OBJEXT): ../weapons/WeaponTypeAction.cpp WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp -array.$(OBJEXT): ../ode/array.cpp -collision_kernel.$(OBJEXT): ../ode/collision_kernel.cpp +-collision_quadtreespace.$(OBJEXT): ../ode/collision_quadtreespace.cpp -collision_space.$(OBJEXT): ../ode/collision_space.cpp -collision_std.$(OBJEXT): ../ode/collision_std.cpp -collision_transform.$(OBJEXT): ../ode/collision_transform.cpp @@ -410,7 +413,7 @@ AddTarget.$(OBJEXT): ../actions/AddTarget.cpp Animation.$(OBJEXT): ../actions/Animation.cpp CallbackWeapon.$(OBJEXT): ../actions/CallbackWeapon.cpp -@@ -2807,9 +2624,6 @@ +@@ -2902,9 +2715,6 @@ XMLNode.$(OBJEXT): ../XML/XMLNode.cpp XMLParser.$(OBJEXT): ../XML/XMLParser.cpp XMLStringBuffer.$(OBJEXT): ../XML/XMLStringBuffer.cpp @@ -420,7 +423,7 @@ Target.$(OBJEXT): ../target/Target.cpp TargetContainer.$(OBJEXT): ../target/TargetContainer.cpp TargetDamageCalc.$(OBJEXT): ../target/TargetDamageCalc.cpp -@@ -3476,56 +3290,9 @@ +@@ -3593,57 +3403,9 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNode.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLParser.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@ @@ -429,6 +432,7 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_kernel.Po at am__quote@ +- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_quadtreespace.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_space.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_std.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_transform.Po at am__quote@ @@ -477,7 +481,7 @@ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -3542,269 +3309,6 @@ +@@ -3660,269 +3422,6 @@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `cygpath -w $<` @@ -747,7 +751,7 @@ CCDEPMODE = @CCDEPMODE@ .cpp.o: -@@ -7395,306 +6897,6 @@ +@@ -7717,318 +7216,6 @@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WeaponVelocity.obj `cygpath -w ../weapons/WeaponVelocity.cpp` @@ -775,6 +779,18 @@ - at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.obj `cygpath -w ../ode/collision_kernel.cpp` - +-collision_quadtreespace.o: ../ode/collision_quadtreespace.cpp +- at AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.o' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.o `test -f '../ode/collision_quadtreespace.cpp' || echo '$(srcdir)/'`../ode/collision_quadtreespace.cpp +- +-collision_quadtreespace.obj: ../ode/collision_quadtreespace.cpp +- at AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.obj' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.obj `cygpath -w ../ode/collision_quadtreespace.cpp` +- -collision_space.o: ../ode/collision_space.cpp - at AMDEP_TRUE@ source='../ode/collision_space.cpp' object='collision_space.o' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@ @@ -1055,7 +1071,7 @@ @AMDEP_TRUE@ source='../actions/AddTarget.cpp' object='AddTarget.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/AddTarget.Po' tmpdepfile='$(DEPDIR)/AddTarget.TPo' @AMDEPBACKSLASH@ --- scorched/src/engine/ModFileEntry.cpp.syslibs 2006-04-13 00:49:26.000000000 +0200 -+++ scorched/src/engine/ModFileEntry.cpp 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/engine/ModFileEntry.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -21,7 +21,7 @@ #include #include @@ -1066,7 +1082,7 @@ #include --- scorched/src/tank/TankAvatar.cpp.syslibs 2006-02-13 18:54:27.000000000 +0100 -+++ scorched/src/tank/TankAvatar.cpp 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/tank/TankAvatar.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -22,7 +22,7 @@ #include #include @@ -1076,8 +1092,8 @@ #include GLTexture *TankAvatar::defaultTexture_ = 0; ---- scorched/src/landscape/HeightMapSender.cpp~ 2006-07-16 11:55:01.000000000 +0200 -+++ scorched/src/landscape/HeightMapSender.cpp 2006-07-16 11:55:01.000000000 +0200 +--- scorched/src/landscape/HeightMapSender.cpp.syslibs 2005-11-25 11:35:42.000000000 +0100 ++++ scorched/src/landscape/HeightMapSender.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -20,7 +20,7 @@ #include scorched3d-wx26.patch: Index: scorched3d-wx26.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-wx26.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scorched3d-wx26.patch 16 Jul 2006 19:11:25 -0000 1.1 +++ scorched3d-wx26.patch 2 Nov 2006 20:45:26 -0000 1.2 @@ -1,28 +1,3 @@ ---- scorched/src/scorched/NetLan.cpp~ 2006-07-16 12:50:44.000000000 +0200 -+++ scorched/src/scorched/NetLan.cpp 2006-07-16 12:50:44.000000000 +0200 -@@ -96,9 +96,9 @@ - // Radio Buttons - wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5); - IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, -- "Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP); -+ wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, -- "LAN", wxDefaultPosition, wxDefaultSize, 0); -+ wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0); - radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10); - radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0); - sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5); ---- scorched/src/scorched/OptionEntrySetter.cpp~ 2006-07-16 13:04:56.000000000 +0200 -+++ scorched/src/scorched/OptionEntrySetter.cpp 2006-07-16 13:04:56.000000000 +0200 -@@ -122,7 +122,7 @@ - { - sizer->Add(control = - new wxCheckBox(parent, -1, -- "", -+ wxT(""), - wxDefaultPosition, wxDefaultSize), - 0, wxALIGN_LEFT); - control->SetToolTip( --- scorched/src/scorched/NetLan.cpp~ 2006-07-16 20:36:19.000000000 +0200 +++ scorched/src/scorched/NetLan.cpp 2006-07-16 20:36:19.000000000 +0200 @@ -71,17 +71,11 @@ Index: scorched3d.spec =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- scorched3d.spec 29 Aug 2006 06:03:35 -0000 1.17 +++ scorched3d.spec 2 Nov 2006 20:45:26 -0000 1.18 @@ -1,27 +1,20 @@ Name: scorched3d -Version: 40 -Release: 2%{?dist} +Version: 40.1c +Release: 1%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPL URL: http://www.scorched3d.co.uk/ -Source0: http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz +Source0: http://dl.sf.net/%{name}/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop Patch1: %{name}-syslibs.patch Patch2: %{name}-wx26.patch -Patch4: %{name}-64bit.patch -Patch5: %{name}-openal.patch -Patch6: %{name}-help.patch +Patch3: %{name}-openal.patch +Patch4: %{name}-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel -BuildRequires: openal-devel -BuildRequires: freealut-devel -BuildRequires: SDL_net-devel -BuildRequires: ImageMagick -BuildRequires: libGLU-devel -BuildRequires: desktop-file-utils -BuildRequires: expat-devel -BuildRequires: ode-devel +BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel +BuildRequires: expat-devel ImageMagick desktop-file-utils +Requires: hicolor-icon-theme # Upstream naming compatibility Provides: Scorched3D = %{version}-%{release} @@ -42,13 +35,12 @@ %prep %setup -q -n scorched -rm -r autom4te.cache `find . -name Makefile` +rm -r `find . -name Makefile` rm -r src/zlib src/ode `find src/XML ! -name "X*"` -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch1 -p1 -z .syslibs +%patch2 -p1 -z .wx26 +%patch3 -p1 -z .openal +%patch4 -p1 -z .help # make rpmlint happy with debuginfo package chmod -x src/GLEXT/* # stop autoxxx from running @@ -58,29 +50,27 @@ %build -%configure \ - --disable-dependency-tracking \ - --datadir=%{_datadir}/games/%{name} \ - --with-docdir=$RPM_DOC_DIR/%{name}-%{version} +%configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \ + --with-docdir=%{_docdir}/%{name}-%{version} # LDFLAGS=-lode for use of system ode make %{?_smp_mflags} LDFLAGS=-lode -convert data/windows/tank2.ico tank2.png +convert data/windows/tank2.ico %{name}.png %install rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html . -desktop-file-install \ - --vendor fedora \ +# 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 \ - --mode 644 \ - --add-category X-Fedora \ + --add-category X-Fedora \ %{SOURCE1} -install -Dpm 644 tank2.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png - -mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps +install -p -m 644 %{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %clean @@ -88,22 +78,34 @@ %post -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : +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 -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : +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 TODO __docs/* -%{_bindir}/scorched3d -%{_datadir}/games/scorched3d/ -%{_datadir}/applications/*scorched3d.desktop -%{_datadir}/icons/hicolor/*/apps/scorched3d.png +%doc AUTHORS COPYING TODO html +%{_bindir}/%{name} +%{_datadir}/%{name} +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog +* Tue Aug 29 2006 Hans de Goede 40.1c-1 +- New upstream release 40.1c +- Drop 64 bit patch (integrated upstream) +- Don't install our data files in /usr/share/games, but in /usr/share +- Some minor specfile cleanups + * Tue Aug 29 2006 Hans de Goede 40-2 - FE6 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jul 2006 19:11:25 -0000 1.4 +++ sources 2 Nov 2006 20:45:26 -0000 1.5 @@ -1 +1 @@ -76b60b9f73d2c971d86bfac761989cf4 Scorched3D-40-src.tar.gz +a45c9446af99c943a19a4c9a7602531f Scorched3D-40.1c-src.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 20:47:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 2 Nov 2006 13:47:02 -0700 Subject: rpms/scorched3d/devel scorched3d-64bit.patch,1.6,NONE Message-ID: <200611022047.kA2Kl2v8029498@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29493 Removed Files: scorched3d-64bit.patch Log Message: remove integrated 64 bit patch --- scorched3d-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 20:49:07 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 2 Nov 2006 13:49:07 -0700 Subject: rpms/scorched3d/FC-6 .cvsignore, 1.4, 1.5 scorched3d-help.patch, 1.3, 1.4 scorched3d-syslibs.patch, 1.3, 1.4 scorched3d-wx26.patch, 1.1, 1.2 scorched3d.spec, 1.17, 1.18 sources, 1.4, 1.5 scorched3d-64bit.patch, 1.6, NONE Message-ID: <200611022049.kA2Kn7m3029560@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29525 Modified Files: .cvsignore scorched3d-help.patch scorched3d-syslibs.patch scorched3d-wx26.patch scorched3d.spec sources Removed Files: scorched3d-64bit.patch Log Message: * Tue Aug 29 2006 Hans de Goede 40.1c-1 - New upstream release 40.1c - Drop 64 bit patch (integrated upstream) - Don't install our data files in /usr/share/games, but in /usr/share - Some minor specfile cleanups Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jul 2006 20:04:07 -0000 1.4 +++ .cvsignore 2 Nov 2006 20:48:36 -0000 1.5 @@ -1 +1 @@ -Scorched3D-40-src.tar.gz +Scorched3D-40.1c-src.tar.gz scorched3d-help.patch: Index: scorched3d-help.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d-help.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scorched3d-help.patch 16 Jul 2006 19:11:25 -0000 1.3 +++ scorched3d-help.patch 2 Nov 2006 20:48:36 -0000 1.4 @@ -1,25 +1,3 @@ -diff -ur scorched.orig/src/scorched/HtmlHelpDialog.cpp scorched/src/scorched/HtmlHelpDialog.cpp ---- scorched.orig/src/scorched/HtmlHelpDialog.cpp 2006-02-17 18:48:54.000000000 +0100 -+++ scorched/src/scorched/HtmlHelpDialog.cpp 2006-07-16 11:03:57.000000000 +0200 -@@ -137,13 +137,13 @@ - void HelpFrame::onHome(wxCommandEvent &event) - { - html_->HistoryClear(); -- html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8)); -+ html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8)); - } - - void showHtmlHelpDialog() - { - // For the moment just show the documentation in the default web browser -- showURL(formatString("file://%s", getDocFile("documentation/html/index.html"))); -+ showURL(formatString("file://%s", getDocFile("html/index.html"))); - - //HelpFrame *frame = new HelpFrame(); - //frame->Show(); -Only in scorched/src/scorched: HtmlHelpDialog.cpp.orig -Only in scorched/src/scorched: HtmlHelpDialog.cpp.rej -Only in scorched/src/scorched: HtmlHelpDialog.cpp~ diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp --- scorched.orig/src/scorched/MainDialog.cpp 2006-05-14 17:00:11.000000000 +0200 +++ scorched/src/scorched/MainDialog.cpp 2006-07-16 11:05:27.000000000 +0200 @@ -34,6 +12,3 @@ #endif // __DARWIN__ #endif // _WIN32 } -Only in scorched/src/scorched: MainDialog.cpp.orig -Only in scorched/src/scorched: MainDialog.cpp.rej -Only in scorched/src/scorched: MainDialog.cpp~ scorched3d-syslibs.patch: Index: scorched3d-syslibs.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d-syslibs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scorched3d-syslibs.patch 16 Jul 2006 19:11:25 -0000 1.3 +++ scorched3d-syslibs.patch 2 Nov 2006 20:48:36 -0000 1.4 @@ -1,16 +1,16 @@ ---- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100 -+++ scorched/src/coms/NetServerProtocol.cpp 2006-07-16 11:36:19.000000000 +0200 +--- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-08-04 15:35:15.000000000 +0200 ++++ scorched/src/coms/NetServerProtocol.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -22,7 +22,7 @@ #include - #include + #include #include -#include +#include NetServerProtocol::NetServerProtocol() { ---- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100 -+++ scorched/src/coms/ComsMessageSender.cpp 2006-07-16 11:36:19.000000000 +0200 +--- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-09-08 17:07:59.000000000 +0200 ++++ scorched/src/coms/ComsMessageSender.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -27,7 +27,7 @@ #include #include @@ -21,7 +21,7 @@ bool ComsMessageSender::sendToServer(ComsMessage &message) --- scorched/src/XML/XMLParser.h.syslibs 2006-05-01 01:42:52.000000000 +0200 -+++ scorched/src/XML/XMLParser.h 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/XML/XMLParser.h 2006-10-31 20:11:27.000000000 +0100 @@ -21,7 +21,7 @@ #if !defined(__INCLUDE_XMLParserh_INCLUDE__) #define __INCLUDE_XMLParserh_INCLUDE__ @@ -31,18 +31,18 @@ #include class XMLParser ---- scorched/src/scorched/Makefile.am.syslibs 2006-07-15 17:14:50.000000000 +0200 -+++ scorched/src/scorched/Makefile.am 2006-07-16 11:36:47.000000000 +0200 -@@ -260,7 +260,6 @@ - ../common/Vector.h \ +--- scorched/src/scorched/Makefile.am.syslibs 2006-10-27 20:48:23.000000000 +0200 ++++ scorched/src/scorched/Makefile.am 2006-10-31 20:12:35.000000000 +0100 +@@ -271,7 +271,6 @@ + ../common/Vector4.h \ ../common/VectorLib.cpp \ ../common/VectorLib.h \ - ../common/snprintf.c \ ../3dsparse/ASEModelFactory.cpp \ ../3dsparse/ASEModelFactory.h \ ../3dsparse/Bone.cpp \ -@@ -602,95 +601,6 @@ - ../weapons/WeaponTranslate.h \ +@@ -637,96 +636,6 @@ + ../weapons/WeaponTypeAction.h \ ../weapons/WeaponVelocity.cpp \ ../weapons/WeaponVelocity.h \ - ../ode/array.cpp \ @@ -50,6 +50,7 @@ - ../ode/collision.h \ - ../ode/collision_kernel.cpp \ - ../ode/collision_kernel.h \ +- ../ode/collision_quadtreespace.cpp \ - ../ode/collision_space.cpp \ - ../ode/collision_space.h \ - ../ode/collision_space_internal.h \ @@ -137,7 +138,7 @@ ../actions/AddTarget.cpp \ ../actions/AddTarget.h \ ../actions/Animation.cpp \ -@@ -1100,14 +1010,6 @@ +@@ -1134,14 +1043,6 @@ ../XML/XMLParser.h \ ../XML/XMLStringBuffer.cpp \ ../XML/XMLStringBuffer.h \ @@ -152,18 +153,18 @@ ../target/Target.cpp \ ../target/Target.h \ ../target/TargetContainer.cpp \ ---- scorched/src/scorched/Makefile.in.syslibs 2006-07-15 17:15:28.000000000 +0200 -+++ scorched/src/scorched/Makefile.in 2006-07-16 11:37:23.000000000 +0200 -@@ -360,7 +360,6 @@ - ../common/Vector.h \ +--- scorched/src/scorched/Makefile.in.syslibs 2006-10-30 19:10:42.000000000 +0100 ++++ scorched/src/scorched/Makefile.in 2006-10-31 20:19:02.000000000 +0100 +@@ -372,7 +372,6 @@ + ../common/Vector4.h \ ../common/VectorLib.cpp \ ../common/VectorLib.h \ - ../common/snprintf.c \ ../3dsparse/ASEModelFactory.cpp \ ../3dsparse/ASEModelFactory.h \ ../3dsparse/Bone.cpp \ -@@ -702,95 +701,6 @@ - ../weapons/WeaponTranslate.h \ +@@ -738,96 +737,6 @@ + ../weapons/WeaponTypeAction.h \ ../weapons/WeaponVelocity.cpp \ ../weapons/WeaponVelocity.h \ - ../ode/array.cpp \ @@ -171,6 +172,7 @@ - ../ode/collision.h \ - ../ode/collision_kernel.cpp \ - ../ode/collision_kernel.h \ +- ../ode/collision_quadtreespace.cpp \ - ../ode/collision_space.cpp \ - ../ode/collision_space.h \ - ../ode/collision_space_internal.h \ @@ -258,7 +260,7 @@ ../actions/AddTarget.cpp \ ../actions/AddTarget.h \ ../actions/Animation.cpp \ -@@ -1200,14 +1110,6 @@ +@@ -1235,14 +1144,6 @@ ../XML/XMLParser.h \ ../XML/XMLStringBuffer.cpp \ ../XML/XMLStringBuffer.h \ @@ -273,20 +275,21 @@ ../target/Target.cpp \ ../target/Target.h \ ../target/TargetContainer.cpp \ -@@ -1426,7 +1328,7 @@ - SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \ - StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \ - StatsLoggerMySQL.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \ +@@ -1471,7 +1372,7 @@ + SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \ + StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \ + Triangle.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \ - VectorLib.$(OBJEXT) snprintf.$(OBJEXT) \ + VectorLib.$(OBJEXT) \ ASEModelFactory.$(OBJEXT) Bone.$(OBJEXT) Face.$(OBJEXT) \ ImageID.$(OBJEXT) ImageStore.$(OBJEXT) MSModelFactory.$(OBJEXT) \ Mesh.$(OBJEXT) MeshLOD.$(OBJEXT) MeshLODTri.$(OBJEXT) \ -@@ -1506,21 +1408,6 @@ - WeaponScatterPosition.$(OBJEXT) WeaponSkyFlash.$(OBJEXT) \ - WeaponSound.$(OBJEXT) WeaponTeleport.$(OBJEXT) \ - WeaponTranslate.$(OBJEXT) WeaponVelocity.$(OBJEXT) \ -- array.$(OBJEXT) collision_kernel.$(OBJEXT) \ +@@ -1558,22 +1459,7 @@ + WeaponTankPosition.$(OBJEXT) WeaponTankVelocity.$(OBJEXT) \ + WeaponTeamAction.$(OBJEXT) WeaponTeleport.$(OBJEXT) \ + WeaponTranslate.$(OBJEXT) WeaponTypeAction.$(OBJEXT) \ +- WeaponVelocity.$(OBJEXT) array.$(OBJEXT) \ +- collision_kernel.$(OBJEXT) collision_quadtreespace.$(OBJEXT) \ - collision_space.$(OBJEXT) collision_std.$(OBJEXT) \ - collision_transform.$(OBJEXT) collision_util.$(OBJEXT) \ - error.$(OBJEXT) export-dif.$(OBJEXT) fastdot.$(OBJEXT) \ @@ -301,21 +304,19 @@ - infblock.$(OBJEXT) infcodes.$(OBJEXT) inffast.$(OBJEXT) \ - inflate.$(OBJEXT) inftrees.$(OBJEXT) infutil.$(OBJEXT) \ - trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \ ++ WeaponVelocity.$(OBJEXT) \ AddTarget.$(OBJEXT) Animation.$(OBJEXT) \ CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \ Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \ -@@ -1625,8 +1512,8 @@ - TankAIStore.$(OBJEXT) TankAIStrings.$(OBJEXT) \ - ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) ShipGroup.$(OBJEXT) \ - XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \ -- XMLStringBuffer.$(OBJEXT) xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) \ -- xmltok.$(OBJEXT) Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ -+ XMLStringBuffer.$(OBJEXT) \ -+ Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ +@@ -1677,7 +1563,6 @@ + TankAIStrings.$(OBJEXT) ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) \ + ShipGroup.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \ + XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \ +- xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) xmltok.$(OBJEXT) \ + Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \ - TargetLife.$(OBJEXT) TargetParachute.$(OBJEXT) \ - TargetRenderer.$(OBJEXT) TargetShield.$(OBJEXT) \ -@@ -2178,35 +2065,9 @@ + TargetGroupEntry.$(OBJEXT) TargetLife.$(OBJEXT) \ +@@ -2252,36 +2137,9 @@ @AMDEP_TRUE@ ./$(DEPDIR)/WindowSetup.Po ./$(DEPDIR)/XMLFile.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/XMLNode.Po ./$(DEPDIR)/XMLParser.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/XMLStringBuffer.Po \ @@ -323,6 +324,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.lex.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.tab.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_kernel.Po \ +- at AMDEP_TRUE@ ./$(DEPDIR)/collision_quadtreespace.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_space.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_std.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_transform.Po \ @@ -352,20 +354,21 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -@@ -2386,7 +2247,6 @@ - Triangle.$(OBJEXT): ../common/Triangle.cpp +@@ -2468,7 +2326,6 @@ Vector.$(OBJEXT): ../common/Vector.cpp + Vector4.$(OBJEXT): ../common/Vector4.cpp VectorLib.$(OBJEXT): ../common/VectorLib.cpp -snprintf.$(OBJEXT): ../common/snprintf.c ASEModelFactory.$(OBJEXT): ../3dsparse/ASEModelFactory.cpp Bone.$(OBJEXT): ../3dsparse/Bone.cpp Face.$(OBJEXT): ../3dsparse/Face.cpp -@@ -2563,49 +2423,6 @@ - WeaponTeleport.$(OBJEXT): ../weapons/WeaponTeleport.cpp +@@ -2658,50 +2515,6 @@ WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp + WeaponTypeAction.$(OBJEXT): ../weapons/WeaponTypeAction.cpp WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp -array.$(OBJEXT): ../ode/array.cpp -collision_kernel.$(OBJEXT): ../ode/collision_kernel.cpp +-collision_quadtreespace.$(OBJEXT): ../ode/collision_quadtreespace.cpp -collision_space.$(OBJEXT): ../ode/collision_space.cpp -collision_std.$(OBJEXT): ../ode/collision_std.cpp -collision_transform.$(OBJEXT): ../ode/collision_transform.cpp @@ -410,7 +413,7 @@ AddTarget.$(OBJEXT): ../actions/AddTarget.cpp Animation.$(OBJEXT): ../actions/Animation.cpp CallbackWeapon.$(OBJEXT): ../actions/CallbackWeapon.cpp -@@ -2807,9 +2624,6 @@ +@@ -2902,9 +2715,6 @@ XMLNode.$(OBJEXT): ../XML/XMLNode.cpp XMLParser.$(OBJEXT): ../XML/XMLParser.cpp XMLStringBuffer.$(OBJEXT): ../XML/XMLStringBuffer.cpp @@ -420,7 +423,7 @@ Target.$(OBJEXT): ../target/Target.cpp TargetContainer.$(OBJEXT): ../target/TargetContainer.cpp TargetDamageCalc.$(OBJEXT): ../target/TargetDamageCalc.cpp -@@ -3476,56 +3290,9 @@ +@@ -3593,57 +3403,9 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNode.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLParser.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@ @@ -429,6 +432,7 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_kernel.Po at am__quote@ +- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_quadtreespace.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_space.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_std.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_transform.Po at am__quote@ @@ -477,7 +481,7 @@ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -3542,269 +3309,6 @@ +@@ -3660,269 +3422,6 @@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `cygpath -w $<` @@ -747,7 +751,7 @@ CCDEPMODE = @CCDEPMODE@ .cpp.o: -@@ -7395,306 +6897,6 @@ +@@ -7717,318 +7216,6 @@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WeaponVelocity.obj `cygpath -w ../weapons/WeaponVelocity.cpp` @@ -775,6 +779,18 @@ - at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.obj `cygpath -w ../ode/collision_kernel.cpp` - +-collision_quadtreespace.o: ../ode/collision_quadtreespace.cpp +- at AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.o' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.o `test -f '../ode/collision_quadtreespace.cpp' || echo '$(srcdir)/'`../ode/collision_quadtreespace.cpp +- +-collision_quadtreespace.obj: ../ode/collision_quadtreespace.cpp +- at AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.obj' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.obj `cygpath -w ../ode/collision_quadtreespace.cpp` +- -collision_space.o: ../ode/collision_space.cpp - at AMDEP_TRUE@ source='../ode/collision_space.cpp' object='collision_space.o' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@ @@ -1055,7 +1071,7 @@ @AMDEP_TRUE@ source='../actions/AddTarget.cpp' object='AddTarget.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/AddTarget.Po' tmpdepfile='$(DEPDIR)/AddTarget.TPo' @AMDEPBACKSLASH@ --- scorched/src/engine/ModFileEntry.cpp.syslibs 2006-04-13 00:49:26.000000000 +0200 -+++ scorched/src/engine/ModFileEntry.cpp 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/engine/ModFileEntry.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -21,7 +21,7 @@ #include #include @@ -1066,7 +1082,7 @@ #include --- scorched/src/tank/TankAvatar.cpp.syslibs 2006-02-13 18:54:27.000000000 +0100 -+++ scorched/src/tank/TankAvatar.cpp 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/tank/TankAvatar.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -22,7 +22,7 @@ #include #include @@ -1076,8 +1092,8 @@ #include GLTexture *TankAvatar::defaultTexture_ = 0; ---- scorched/src/landscape/HeightMapSender.cpp~ 2006-07-16 11:55:01.000000000 +0200 -+++ scorched/src/landscape/HeightMapSender.cpp 2006-07-16 11:55:01.000000000 +0200 +--- scorched/src/landscape/HeightMapSender.cpp.syslibs 2005-11-25 11:35:42.000000000 +0100 ++++ scorched/src/landscape/HeightMapSender.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -20,7 +20,7 @@ #include scorched3d-wx26.patch: Index: scorched3d-wx26.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d-wx26.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scorched3d-wx26.patch 16 Jul 2006 19:11:25 -0000 1.1 +++ scorched3d-wx26.patch 2 Nov 2006 20:48:36 -0000 1.2 @@ -1,28 +1,3 @@ ---- scorched/src/scorched/NetLan.cpp~ 2006-07-16 12:50:44.000000000 +0200 -+++ scorched/src/scorched/NetLan.cpp 2006-07-16 12:50:44.000000000 +0200 -@@ -96,9 +96,9 @@ - // Radio Buttons - wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5); - IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, -- "Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP); -+ wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, -- "LAN", wxDefaultPosition, wxDefaultSize, 0); -+ wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0); - radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10); - radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0); - sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5); ---- scorched/src/scorched/OptionEntrySetter.cpp~ 2006-07-16 13:04:56.000000000 +0200 -+++ scorched/src/scorched/OptionEntrySetter.cpp 2006-07-16 13:04:56.000000000 +0200 -@@ -122,7 +122,7 @@ - { - sizer->Add(control = - new wxCheckBox(parent, -1, -- "", -+ wxT(""), - wxDefaultPosition, wxDefaultSize), - 0, wxALIGN_LEFT); - control->SetToolTip( --- scorched/src/scorched/NetLan.cpp~ 2006-07-16 20:36:19.000000000 +0200 +++ scorched/src/scorched/NetLan.cpp 2006-07-16 20:36:19.000000000 +0200 @@ -71,17 +71,11 @@ Index: scorched3d.spec =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- scorched3d.spec 29 Aug 2006 06:03:35 -0000 1.17 +++ scorched3d.spec 2 Nov 2006 20:48:36 -0000 1.18 @@ -1,27 +1,20 @@ Name: scorched3d -Version: 40 -Release: 2%{?dist} +Version: 40.1c +Release: 1%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPL URL: http://www.scorched3d.co.uk/ -Source0: http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz +Source0: http://dl.sf.net/%{name}/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop Patch1: %{name}-syslibs.patch Patch2: %{name}-wx26.patch -Patch4: %{name}-64bit.patch -Patch5: %{name}-openal.patch -Patch6: %{name}-help.patch +Patch3: %{name}-openal.patch +Patch4: %{name}-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel -BuildRequires: openal-devel -BuildRequires: freealut-devel -BuildRequires: SDL_net-devel -BuildRequires: ImageMagick -BuildRequires: libGLU-devel -BuildRequires: desktop-file-utils -BuildRequires: expat-devel -BuildRequires: ode-devel +BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel +BuildRequires: expat-devel ImageMagick desktop-file-utils +Requires: hicolor-icon-theme # Upstream naming compatibility Provides: Scorched3D = %{version}-%{release} @@ -42,13 +35,12 @@ %prep %setup -q -n scorched -rm -r autom4te.cache `find . -name Makefile` +rm -r `find . -name Makefile` rm -r src/zlib src/ode `find src/XML ! -name "X*"` -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch1 -p1 -z .syslibs +%patch2 -p1 -z .wx26 +%patch3 -p1 -z .openal +%patch4 -p1 -z .help # make rpmlint happy with debuginfo package chmod -x src/GLEXT/* # stop autoxxx from running @@ -58,29 +50,27 @@ %build -%configure \ - --disable-dependency-tracking \ - --datadir=%{_datadir}/games/%{name} \ - --with-docdir=$RPM_DOC_DIR/%{name}-%{version} +%configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \ + --with-docdir=%{_docdir}/%{name}-%{version} # LDFLAGS=-lode for use of system ode make %{?_smp_mflags} LDFLAGS=-lode -convert data/windows/tank2.ico tank2.png +convert data/windows/tank2.ico %{name}.png %install rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html . -desktop-file-install \ - --vendor fedora \ +# 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 \ - --mode 644 \ - --add-category X-Fedora \ + --add-category X-Fedora \ %{SOURCE1} -install -Dpm 644 tank2.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png - -mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps +install -p -m 644 %{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %clean @@ -88,22 +78,34 @@ %post -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : +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 -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : +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 TODO __docs/* -%{_bindir}/scorched3d -%{_datadir}/games/scorched3d/ -%{_datadir}/applications/*scorched3d.desktop -%{_datadir}/icons/hicolor/*/apps/scorched3d.png +%doc AUTHORS COPYING TODO html +%{_bindir}/%{name} +%{_datadir}/%{name} +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog +* Tue Aug 29 2006 Hans de Goede 40.1c-1 +- New upstream release 40.1c +- Drop 64 bit patch (integrated upstream) +- Don't install our data files in /usr/share/games, but in /usr/share +- Some minor specfile cleanups + * Tue Aug 29 2006 Hans de Goede 40-2 - FE6 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jul 2006 19:11:25 -0000 1.4 +++ sources 2 Nov 2006 20:48:36 -0000 1.5 @@ -1 +1 @@ -76b60b9f73d2c971d86bfac761989cf4 Scorched3D-40-src.tar.gz +a45c9446af99c943a19a4c9a7602531f Scorched3D-40.1c-src.tar.gz --- scorched3d-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 21:14:58 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:14:58 -0700 Subject: rpms/autogen import.log,1.5,1.6 Message-ID: <200611022114.kA2LEwQt032738@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/autogen In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32707 Modified Files: import.log Log Message: auto-import autogen-5.8.7-3 on branch FC-5 from autogen-5.8.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/autogen/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 21 Oct 2006 11:15:59 -0000 1.5 +++ import.log 2 Nov 2006 21:14:28 -0000 1.6 @@ -2,3 +2,4 @@ autogen-5_8_5-7:FC-5:autogen-5.8.5-7.src.rpm:1157924662 autogen-5_8_7-1:HEAD:autogen-5.8.7-1.src.rpm:1161429254 autogen-5_8_7-1:FC-5:autogen-5.8.7-1.src.rpm:1161429346 +autogen-5_8_7-3:FC-5:autogen-5.8.7-3.src.rpm:1162502055 From fedora-extras-commits at redhat.com Thu Nov 2 21:14:59 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:14:59 -0700 Subject: rpms/autogen/FC-5 autogen.spec,1.4,1.5 Message-ID: <200611022114.kA2LExLE032741@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/autogen/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32707/FC-5 Modified Files: autogen.spec Log Message: auto-import autogen-5.8.7-3 on branch FC-5 from autogen-5.8.7-3.src.rpm Index: autogen.spec =================================================================== RCS file: /cvs/extras/rpms/autogen/FC-5/autogen.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- autogen.spec 23 Oct 2006 21:28:47 -0000 1.4 +++ autogen.spec 2 Nov 2006 21:14:29 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Sourcecode autogenerator Name: autogen Version: 5.8.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 @@ -13,6 +13,9 @@ Requires(preun): /sbin/install-info %{_sbindir}/alternatives Requires(post): /sbin/install-info %{_sbindir}/alternatives +Obsoletes: libopts-devel +Obsoletes: libopts + %description AutoGen is a tool designed to simplify the creation and maintenance of programes that contain large amounts of repetitious text. It is especially @@ -32,9 +35,10 @@ chmod 0644 COPYING %build -%configure --disable-autoopts +%configure #find -name Makefile -exec sed -i -e 's/-Werror//' {} \; -make LIBTOOL=%{_bindir}/libtool +make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} + # no smp flags as it falls over during build %install @@ -47,9 +51,7 @@ mv %{buildroot}/%{_bindir}/columns %{buildroot}/%{_bindir}/columns.autogen mv %{buildroot}/%{_bindir}/getdefs %{buildroot}/%{_bindir}/getdefs.autogen mkdir -p %{buildroot}/%{_sysconfdir}/alternatives -rm -f %{buildroot}/%{_datadir}/autogen/libopts-27.4.2.tar.gz -rm -f %{buildroot}/%{_libdir}/libopts* -rm -f %{buildroot}/%{_datadir}/aclocal/liboptschk.m4 +rm -f %{buildroot}/%{_datadir}/autogen/libopts*.tar.gz %check make check @@ -106,20 +108,25 @@ %{_infodir}/autogen.info* %{_bindir}/xml2ag %{_libdir}/libguileopts.so.0* +%{_libdir}/libopts.so.* %files devel %defattr(-,root,root) %{_datadir}/aclocal/autoopts.m4 +%{_datadir}/aclocal/liboptschk.m4 %{_libdir}/pkgconfig/autoopts.pc %exclude %{_mandir}/man3/* %{_mandir}/man1/autoopts-config* %exclude %{_includedir}/autoopts/ %{_bindir}/autoopts-config %{_libdir}/libguileopts.so +%{_libdir}/libopts.so +%{_includedir}/autoopts %changelog -* Mon Oct 23 2006 Paul F. Johnson 5.8.7-2 -- rebuild for newer libopts +* Thu Nov 02 2006 Paul F. Johnson 5.8.7-3 +- obsoletes libopts +- now links to it's own version of libopts shipped with the tarball * Fri Oct 21 2006 Paul F. Johnson 5.8.7-1 - bump to new version From fedora-extras-commits at redhat.com Thu Nov 2 21:16:33 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:16:33 -0700 Subject: rpms/autogen/FC-6 autogen.spec,1.4,1.5 Message-ID: <200611022116.kA2LGXGc000370@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/autogen/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv335/FC-6 Modified Files: autogen.spec Log Message: auto-import autogen-5.8.7-3 on branch FC-6 from autogen-5.8.7-3.src.rpm Index: autogen.spec =================================================================== RCS file: /cvs/extras/rpms/autogen/FC-6/autogen.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- autogen.spec 25 Oct 2006 06:36:24 -0000 1.4 +++ autogen.spec 2 Nov 2006 21:16:03 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Sourcecode autogenerator Name: autogen Version: 5.8.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 @@ -13,6 +13,9 @@ Requires(preun): /sbin/install-info %{_sbindir}/alternatives Requires(post): /sbin/install-info %{_sbindir}/alternatives +Obsoletes: libopts-devel +Obsoletes: libopts + %description AutoGen is a tool designed to simplify the creation and maintenance of programes that contain large amounts of repetitious text. It is especially @@ -32,9 +35,10 @@ chmod 0644 COPYING %build -%configure --disable-autoopts +%configure #find -name Makefile -exec sed -i -e 's/-Werror//' {} \; -make LIBTOOL=%{_bindir}/libtool +make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} + # no smp flags as it falls over during build %install @@ -47,9 +51,7 @@ mv %{buildroot}/%{_bindir}/columns %{buildroot}/%{_bindir}/columns.autogen mv %{buildroot}/%{_bindir}/getdefs %{buildroot}/%{_bindir}/getdefs.autogen mkdir -p %{buildroot}/%{_sysconfdir}/alternatives -rm -f %{buildroot}/%{_datadir}/autogen/libopts-27.4.2.tar.gz -rm -f %{buildroot}/%{_libdir}/libopts* -rm -f %{buildroot}/%{_datadir}/aclocal/liboptschk.m4 +rm -f %{buildroot}/%{_datadir}/autogen/libopts*.tar.gz %check make check @@ -106,20 +108,25 @@ %{_infodir}/autogen.info* %{_bindir}/xml2ag %{_libdir}/libguileopts.so.0* +%{_libdir}/libopts.so.* %files devel %defattr(-,root,root) %{_datadir}/aclocal/autoopts.m4 +%{_datadir}/aclocal/liboptschk.m4 %{_libdir}/pkgconfig/autoopts.pc %exclude %{_mandir}/man3/* %{_mandir}/man1/autoopts-config* %exclude %{_includedir}/autoopts/ %{_bindir}/autoopts-config %{_libdir}/libguileopts.so +%{_libdir}/libopts.so +%{_includedir}/autoopts %changelog -* Wed Oct 25 2006 Paul F. Johnson 5.8.7-2 -- rebuild +* Thu Nov 02 2006 Paul F. Johnson 5.8.7-3 +- obsoletes libopts +- now links to it's own version of libopts shipped with the tarball * Fri Oct 21 2006 Paul F. Johnson 5.8.7-1 - bump to new version From fedora-extras-commits at redhat.com Thu Nov 2 21:16:32 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:16:32 -0700 Subject: rpms/autogen import.log,1.6,1.7 Message-ID: <200611022116.kA2LGWrv000367@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/autogen In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv335 Modified Files: import.log Log Message: auto-import autogen-5.8.7-3 on branch FC-6 from autogen-5.8.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/autogen/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 2 Nov 2006 21:14:28 -0000 1.6 +++ import.log 2 Nov 2006 21:16:02 -0000 1.7 @@ -3,3 +3,4 @@ autogen-5_8_7-1:HEAD:autogen-5.8.7-1.src.rpm:1161429254 autogen-5_8_7-1:FC-5:autogen-5.8.7-1.src.rpm:1161429346 autogen-5_8_7-3:FC-5:autogen-5.8.7-3.src.rpm:1162502055 +autogen-5_8_7-3:FC-6:autogen-5.8.7-3.src.rpm:1162502151 From fedora-extras-commits at redhat.com Thu Nov 2 21:18:22 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:18:22 -0700 Subject: rpms/autogen import.log,1.7,1.8 Message-ID: <200611022118.kA2LIM1p000463@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/autogen In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv432 Modified Files: import.log Log Message: auto-import autogen-5.8.7-3 on branch devel from autogen-5.8.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/autogen/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 2 Nov 2006 21:16:02 -0000 1.7 +++ import.log 2 Nov 2006 21:17:51 -0000 1.8 @@ -4,3 +4,4 @@ autogen-5_8_7-1:FC-5:autogen-5.8.7-1.src.rpm:1161429346 autogen-5_8_7-3:FC-5:autogen-5.8.7-3.src.rpm:1162502055 autogen-5_8_7-3:FC-6:autogen-5.8.7-3.src.rpm:1162502151 +autogen-5_8_7-3:HEAD:autogen-5.8.7-3.src.rpm:1162502259 From fedora-extras-commits at redhat.com Thu Nov 2 21:18:22 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:18:22 -0700 Subject: rpms/autogen/devel autogen.spec,1.4,1.5 Message-ID: <200611022118.kA2LIMwt000466@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/autogen/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv432/devel Modified Files: autogen.spec Log Message: auto-import autogen-5.8.7-3 on branch devel from autogen-5.8.7-3.src.rpm Index: autogen.spec =================================================================== RCS file: /cvs/extras/rpms/autogen/devel/autogen.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- autogen.spec 25 Oct 2006 20:46:49 -0000 1.4 +++ autogen.spec 2 Nov 2006 21:17:52 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Sourcecode autogenerator Name: autogen Version: 5.8.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 @@ -13,6 +13,9 @@ Requires(preun): /sbin/install-info %{_sbindir}/alternatives Requires(post): /sbin/install-info %{_sbindir}/alternatives +Obsoletes: libopts-devel +Obsoletes: libopts + %description AutoGen is a tool designed to simplify the creation and maintenance of programes that contain large amounts of repetitious text. It is especially @@ -32,9 +35,10 @@ chmod 0644 COPYING %build -%configure --disable-autoopts +%configure #find -name Makefile -exec sed -i -e 's/-Werror//' {} \; -make LIBTOOL=%{_bindir}/libtool +make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} + # no smp flags as it falls over during build %install @@ -47,9 +51,7 @@ mv %{buildroot}/%{_bindir}/columns %{buildroot}/%{_bindir}/columns.autogen mv %{buildroot}/%{_bindir}/getdefs %{buildroot}/%{_bindir}/getdefs.autogen mkdir -p %{buildroot}/%{_sysconfdir}/alternatives -rm -f %{buildroot}/%{_datadir}/autogen/libopts-27.4.2.tar.gz -rm -f %{buildroot}/%{_libdir}/libopts* -rm -f %{buildroot}/%{_datadir}/aclocal/liboptschk.m4 +rm -f %{buildroot}/%{_datadir}/autogen/libopts*.tar.gz %check make check @@ -106,20 +108,25 @@ %{_infodir}/autogen.info* %{_bindir}/xml2ag %{_libdir}/libguileopts.so.0* +%{_libdir}/libopts.so.* %files devel %defattr(-,root,root) %{_datadir}/aclocal/autoopts.m4 +%{_datadir}/aclocal/liboptschk.m4 %{_libdir}/pkgconfig/autoopts.pc %exclude %{_mandir}/man3/* %{_mandir}/man1/autoopts-config* %exclude %{_includedir}/autoopts/ %{_bindir}/autoopts-config %{_libdir}/libguileopts.so +%{_libdir}/libopts.so +%{_includedir}/autoopts %changelog -* Wed Oct 25 2006 Paul F. Johnson 5.8.7-2 -- rebuild +* Thu Nov 02 2006 Paul F. Johnson 5.8.7-3 +- obsoletes libopts +- now links to it's own version of libopts shipped with the tarball * Fri Oct 21 2006 Paul F. Johnson 5.8.7-1 - bump to new version From fedora-extras-commits at redhat.com Thu Nov 2 21:21:40 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:21:40 -0700 Subject: rpms/libopts Makefile,1.1,NONE import.log,1.9,NONE Message-ID: <200611022121.kA2LLe1Y000546@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538/libopts Removed Files: Makefile import.log Log Message: Removing package - now part of autogen libopts/Makefile libopts/import.log libopts/FC-5/Makefile libopts/FC-5/branch libopts/FC-5/libopts.spec libopts/FC-5/sources libopts/FC-6/Makefile libopts/FC-6/branch libopts/FC-6/libopts.spec libopts/FC-6/sources libopts/devel/Makefile libopts/devel/libopts.spec libopts/devel/sources --- Makefile DELETED --- --- import.log DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 21:21:46 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:21:46 -0700 Subject: rpms/libopts/FC-5 Makefile, 1.1, NONE branch, 1.1, NONE libopts.spec, 1.5, NONE sources, 1.3, NONE Message-ID: <200611022121.kA2LLkLw000560@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538/libopts/FC-5 Removed Files: Makefile branch libopts.spec sources Log Message: Removing package - now part of autogen libopts/Makefile libopts/import.log libopts/FC-5/Makefile libopts/FC-5/branch libopts/FC-5/libopts.spec libopts/FC-5/sources libopts/FC-6/Makefile libopts/FC-6/branch libopts/FC-6/libopts.spec libopts/FC-6/sources libopts/devel/Makefile libopts/devel/libopts.spec libopts/devel/sources --- Makefile DELETED --- --- branch DELETED --- --- libopts.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 21:21:51 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:21:51 -0700 Subject: rpms/libopts/FC-6 Makefile, 1.1, NONE branch, 1.1, NONE libopts.spec, 1.6, NONE sources, 1.3, NONE Message-ID: <200611022121.kA2LLpUm000574@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538/libopts/FC-6 Removed Files: Makefile branch libopts.spec sources Log Message: Removing package - now part of autogen libopts/Makefile libopts/import.log libopts/FC-5/Makefile libopts/FC-5/branch libopts/FC-5/libopts.spec libopts/FC-5/sources libopts/FC-6/Makefile libopts/FC-6/branch libopts/FC-6/libopts.spec libopts/FC-6/sources libopts/devel/Makefile libopts/devel/libopts.spec libopts/devel/sources --- Makefile DELETED --- --- branch DELETED --- --- libopts.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 21:21:57 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:21:57 -0700 Subject: rpms/libopts/devel Makefile, 1.1, NONE libopts.spec, 1.6, NONE sources, 1.3, NONE Message-ID: <200611022121.kA2LLvkh000588@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538/libopts/devel Removed Files: Makefile libopts.spec sources Log Message: Removing package - now part of autogen libopts/Makefile libopts/import.log libopts/FC-5/Makefile libopts/FC-5/branch libopts/FC-5/libopts.spec libopts/FC-5/sources libopts/FC-6/Makefile libopts/FC-6/branch libopts/FC-6/libopts.spec libopts/FC-6/sources libopts/devel/Makefile libopts/devel/libopts.spec libopts/devel/sources --- Makefile DELETED --- --- libopts.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 21:25:07 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:25:07 -0700 Subject: rpms/gdeskcal/FC-5 gdeskcal.spec,1.11,1.12 Message-ID: <200611022125.kA2LP7E2000740@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv724 Modified Files: gdeskcal.spec Log Message: Added BR pygtk2-devel gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gdeskcal.spec 1 Nov 2006 22:49:00 -0000 1.11 +++ gdeskcal.spec 2 Nov 2006 21:24:37 -0000 1.12 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, perl(XML::Parser) +BuildRequires: desktop-file-utils, pygtk2-devel Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -62,6 +62,9 @@ %{_libdir}/%{name}/ %changelog +* Thu Nov 02 2006 Paul F. Johnson 1.0-6 +- a couple of small fixes + * Wed Nov 01 2006 Paul F. Johnson 1.0-4 - added post and postun - conditional for the X-Fedora in the desktop icon From fedora-extras-commits at redhat.com Thu Nov 2 21:26:26 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:26:26 -0700 Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.14,1.15 Message-ID: <200611022126.kA2LQQQn000804@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv788 Modified Files: gdeskcal.spec Log Message: Added BR pygtk2-devel gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gdeskcal.spec 1 Nov 2006 22:50:44 -0000 1.14 +++ gdeskcal.spec 2 Nov 2006 21:25:56 -0000 1.15 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, perl(XML::Parser) +BuildRequires: desktop-file-utils, pygtk2-devel Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -62,6 +62,9 @@ %{_libdir}/%{name}/ %changelog +* Thu Nov 02 2006 Paul F. Johnson 1.0-6 +- a couple of small fixes + * Wed Nov 01 2006 Paul F. Johnson 1.0-4 - added post and postun - conditional for the X-Fedora in the desktop icon From fedora-extras-commits at redhat.com Thu Nov 2 21:27:53 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:27:53 -0700 Subject: rpms/gdeskcal/devel gdeskcal.spec,1.14,1.15 Message-ID: <200611022127.kA2LRr0m000864@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv848 Modified Files: gdeskcal.spec Log Message: Added BR: pygtk2-devel gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gdeskcal.spec 1 Nov 2006 22:53:10 -0000 1.14 +++ gdeskcal.spec 2 Nov 2006 21:27:23 -0000 1.15 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, perl(XML::Parser) +BuildRequires: desktop-file-utils, pygtk2-devel Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -62,8 +62,8 @@ %{_libdir}/%{name}/ %changelog -* Wed Nov 01 2006 Paul F. Johnson 1.0-5 -- added BR perl(xml-parser) +* Thu Nov 02 2006 Paul F. Johnson 1.0-6 +- a couple of small fixes * Wed Nov 01 2006 Paul F. Johnson 1.0-4 - added post and postun From fedora-extras-commits at redhat.com Thu Nov 2 21:31:00 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:31:00 -0700 Subject: owners owners.list,1.1884,1.1885 Message-ID: <200611022131.kA2LV0eb000936@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv908 Modified Files: owners.list Log Message: Removed libopts - it is now part of autogen. Having the separate libopts was causing a big problem with autogen owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1884 retrieving revision 1.1885 diff -u -r1.1884 -r1.1885 --- owners.list 2 Nov 2006 17:21:58 -0000 1.1884 +++ owners.list 2 Nov 2006 21:30:30 -0000 1.1885 @@ -927,7 +927,6 @@ Fedora Extras|libopensync-plugin-kdepim|KDE plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-palm|Palm plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-python|Python plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|libopts|Options library for autogen|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|libosip|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net Fedora Extras|libosip2|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xelerance.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Nov 2 21:37:38 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:37:38 -0700 Subject: rpms/gdeskcal/FC-5 gdeskcal.spec,1.12,1.13 Message-ID: <200611022137.kA2LbcIa001171@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1095 Modified Files: gdeskcal.spec Log Message: ARGH! perl(xml::parser) vanished somewhere! gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gdeskcal.spec 2 Nov 2006 21:24:37 -0000 1.12 +++ gdeskcal.spec 2 Nov 2006 21:37:08 -0000 1.13 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, pygtk2-devel +BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser) Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -62,6 +62,9 @@ %{_libdir}/%{name}/ %changelog +* Thu Nov 02 2006 Paul F. Johnson 1.0.7 +- added BR perl(xml::parser) - it was there in -5 but vanished! + * Thu Nov 02 2006 Paul F. Johnson 1.0-6 - a couple of small fixes From fedora-extras-commits at redhat.com Thu Nov 2 21:39:29 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:39:29 -0700 Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.15,1.16 Message-ID: <200611022139.kA2LdTKR001265@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1247 Modified Files: gdeskcal.spec Log Message: ARGH! Somehow, perl(xml::parser) vanished! gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gdeskcal.spec 2 Nov 2006 21:25:56 -0000 1.15 +++ gdeskcal.spec 2 Nov 2006 21:38:58 -0000 1.16 @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, pygtk2-devel +BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser) Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 From fedora-extras-commits at redhat.com Thu Nov 2 21:41:11 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:41:11 -0700 Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.16,1.17 Message-ID: <200611022141.kA2LfBeQ001326@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1308 Modified Files: gdeskcal.spec Log Message: gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gdeskcal.spec 2 Nov 2006 21:38:58 -0000 1.16 +++ gdeskcal.spec 2 Nov 2006 21:40:41 -0000 1.17 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -62,6 +62,9 @@ %{_libdir}/%{name}/ %changelog +* Thu Nov 02 2006 Paul F. Johnson 1.0-7 +- added perl(xml::parser) + * Thu Nov 02 2006 Paul F. Johnson 1.0-6 - a couple of small fixes From fedora-extras-commits at redhat.com Thu Nov 2 21:43:24 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 2 Nov 2006 14:43:24 -0700 Subject: comps comps-fe6.xml.in,1.209,1.210 comps-fe7.xml.in,1.7,1.8 Message-ID: <200611022143.kA2LhOut001411@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1391 Modified Files: comps-fe6.xml.in comps-fe7.xml.in Log Message: added gcl Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- comps-fe6.xml.in 2 Nov 2006 18:48:16 -0000 1.209 +++ comps-fe6.xml.in 2 Nov 2006 21:42:54 -0000 1.210 @@ -143,6 +143,7 @@ fpc ftnchek gauche + gcl gforth ghc git Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- comps-fe7.xml.in 2 Nov 2006 18:48:16 -0000 1.7 +++ comps-fe7.xml.in 2 Nov 2006 21:42:54 -0000 1.8 @@ -143,6 +143,7 @@ fpc ftnchek gauche + gcl gforth ghc git From fedora-extras-commits at redhat.com Thu Nov 2 21:44:28 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 2 Nov 2006 14:44:28 -0700 Subject: comps comps-fe5.xml.in,1.185,1.186 Message-ID: <200611022144.kA2LiS7i001455@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1421 Modified Files: comps-fe5.xml.in Log Message: added gcl Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- comps-fe5.xml.in 2 Nov 2006 18:48:16 -0000 1.185 +++ comps-fe5.xml.in 2 Nov 2006 21:43:58 -0000 1.186 @@ -121,6 +121,7 @@ fpc ftnchek gauche + gcl gforth ghc git From fedora-extras-commits at redhat.com Thu Nov 2 21:44:33 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 14:44:33 -0700 Subject: rpms/gdeskcal/devel gdeskcal.spec,1.15,1.16 Message-ID: <200611022144.kA2LiXwm001458@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1417 Modified Files: gdeskcal.spec Log Message: Somewhere, perl(xml::parser) did vanish. It's now back gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gdeskcal.spec 2 Nov 2006 21:27:23 -0000 1.15 +++ gdeskcal.spec 2 Nov 2006 21:44:03 -0000 1.16 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, pygtk2-devel +BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser) Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -62,6 +62,9 @@ %{_libdir}/%{name}/ %changelog +* Thu Nov 02 2006 Paul F. Johnson 1.0-7 +- added perl(xml::parser) + * Thu Nov 02 2006 Paul F. Johnson 1.0-6 - a couple of small fixes From fedora-extras-commits at redhat.com Thu Nov 2 21:47:27 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 2 Nov 2006 14:47:27 -0700 Subject: comps comps-fe5.xml.in, 1.186, 1.187 comps-fe6.xml.in, 1.210, 1.211 comps-fe7.xml.in, 1.8, 1.9 Message-ID: <200611022147.kA2LlRTG001537@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1517 Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: added abcm2ps Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- comps-fe5.xml.in 2 Nov 2006 21:43:58 -0000 1.186 +++ comps-fe5.xml.in 2 Nov 2006 21:46:57 -0000 1.187 @@ -46,6 +46,7 @@ false true + abcm2ps BibTool conglomerate docbook2X Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- comps-fe6.xml.in 2 Nov 2006 21:42:54 -0000 1.210 +++ comps-fe6.xml.in 2 Nov 2006 21:46:57 -0000 1.211 @@ -46,6 +46,7 @@ false true + abcm2ps BibTool conglomerate docbook2X Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- comps-fe7.xml.in 2 Nov 2006 21:42:54 -0000 1.8 +++ comps-fe7.xml.in 2 Nov 2006 21:46:57 -0000 1.9 @@ -46,6 +46,7 @@ false true + abcm2ps BibTool conglomerate docbook2X From fedora-extras-commits at redhat.com Thu Nov 2 21:49:48 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 2 Nov 2006 14:49:48 -0700 Subject: comps comps-fe5.xml.in, 1.187, 1.188 comps-fe6.xml.in, 1.211, 1.212 comps-fe7.xml.in, 1.9, 1.10 Message-ID: <200611022149.kA2Lnm1R001571@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1549 Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: added ecl Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- comps-fe5.xml.in 2 Nov 2006 21:46:57 -0000 1.187 +++ comps-fe5.xml.in 2 Nov 2006 21:49:18 -0000 1.188 @@ -116,6 +116,7 @@ cvsps cvsweb darcs + ecl epydoc erlang flasm Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- comps-fe6.xml.in 2 Nov 2006 21:46:57 -0000 1.211 +++ comps-fe6.xml.in 2 Nov 2006 21:49:18 -0000 1.212 @@ -138,6 +138,7 @@ cvsps cvsweb darcs + ecl epydoc erlang flasm Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- comps-fe7.xml.in 2 Nov 2006 21:46:57 -0000 1.9 +++ comps-fe7.xml.in 2 Nov 2006 21:49:18 -0000 1.10 @@ -137,7 +137,8 @@ cvsgraph cvsps cvsweb - darcs + ecl + gcl epydoc erlang flasm From fedora-extras-commits at redhat.com Thu Nov 2 21:52:58 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Thu, 2 Nov 2006 14:52:58 -0700 Subject: comps comps-fe5.xml.in, 1.188, 1.189 comps-fe6.xml.in, 1.212, 1.213 comps-fe7.xml.in, 1.10, 1.11 Message-ID: <200611022152.kA2LqwMj001613@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1593 Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: added scons Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- comps-fe5.xml.in 2 Nov 2006 21:49:18 -0000 1.188 +++ comps-fe5.xml.in 2 Nov 2006 21:52:28 -0000 1.189 @@ -157,6 +157,7 @@ rpmdevtools rpmlint smarteiffel + scons splint srecord sunifdef Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- comps-fe6.xml.in 2 Nov 2006 21:49:18 -0000 1.212 +++ comps-fe6.xml.in 2 Nov 2006 21:52:28 -0000 1.213 @@ -186,6 +186,7 @@ regexxer rpmdevtools rpmlint + scons smarteiffel splint Sprog Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- comps-fe7.xml.in 2 Nov 2006 21:49:18 -0000 1.10 +++ comps-fe7.xml.in 2 Nov 2006 21:52:28 -0000 1.11 @@ -186,6 +186,7 @@ regexxer rpmdevtools rpmlint + scons smarteiffel splint Sprog From fedora-extras-commits at redhat.com Thu Nov 2 22:04:54 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 2 Nov 2006 15:04:54 -0700 Subject: rpms/gdeskcal/devel gdeskcal.spec,1.16,1.17 Message-ID: <200611022204.kA2M4smJ004753@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4706 Modified Files: gdeskcal.spec Log Message: Removed smp_mflags as it's annoying the RH buildsys gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gdeskcal.spec 2 Nov 2006 21:44:03 -0000 1.16 +++ gdeskcal.spec 2 Nov 2006 22:04:24 -0000 1.17 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -27,7 +27,8 @@ %build %configure -make %{?_smp_mflags} +make +# no multi build as it's annoying the buildsys %install rm -rf %{buildroot} @@ -62,6 +63,9 @@ %{_libdir}/%{name}/ %changelog +* 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 Thu Nov 2 22:05:21 2006 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Thu, 2 Nov 2006 15:05:21 -0700 Subject: rpms/mantis/devel .cvsignore, 1.4, 1.5 mantis.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <200611022205.kA2M5LRB004769@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/mantis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4731 Modified Files: .cvsignore mantis.spec sources Log Message: updated to 1.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Oct 2006 11:50:35 -0000 1.4 +++ .cvsignore 2 Nov 2006 22:04:50 -0000 1.5 @@ -1 +1 @@ -mantis_1.0.5.tar.gz +mantis-1.0.6.tar.gz Index: mantis.spec =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mantis.spec 10 Oct 2006 11:50:35 -0000 1.12 +++ mantis.spec 2 Nov 2006 22:04:50 -0000 1.13 @@ -6,13 +6,13 @@ Summary: Web-based bugtracking system Name: mantis -Version: 1.0.5 +Version: 1.0.6 Release: 1%{dist} License: GPL Group: Applications/Internet URL: http://www.mantisbugtracker.com/ BuildArch: noarch -Source0: http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz +Source0: http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}.tar.gz Patch0: mantis-1.0.0a3-iis.patch Patch1: mantis-0.19.2-noexamplecom.patch Patch2: mantis-1.0.0rc2-noadmin.patch @@ -48,7 +48,7 @@ %prep -%setup -q -n %{name}_%{version} +%setup -q %patch0 -p1 -b .iis %patch1 -p1 -b .noexamplecom %patch2 -p1 -b .noadmin @@ -133,6 +133,9 @@ %changelog +* Thu Nov 2 2006 Gianluca Sforna - 1.0.6-1 +- updated to 1.0.6 + * Tue Oct 10 2006 Gianluca Sforna - 1.0.5-1 - updated to 1.0.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Oct 2006 11:50:35 -0000 1.9 +++ sources 2 Nov 2006 22:04:50 -0000 1.10 @@ -1 +1 @@ -01c5fb87e5ac161a681471573711bcf6 mantis_1.0.5.tar.gz +64af171288bad777d6a1bba493e4a88b mantis-1.0.6.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 22:21:03 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Nov 2006 15:21:03 -0700 Subject: rpms/rxvt-unicode/FC-5 .cvsignore, 1.19, 1.20 rxvt-unicode.spec, 1.26, 1.27 sources, 1.19, 1.20 Message-ID: <200611022221.kA2ML3tR005176@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/rxvt-unicode/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/FC-5 Modified Files: .cvsignore rxvt-unicode.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Aug 2006 10:16:51 -0000 1.19 +++ .cvsignore 2 Nov 2006 22:20:33 -0000 1.20 @@ -1 +1 @@ -rxvt-unicode-7.9.tar.bz2 +rxvt-unicode-8.0.tar.bz2 Index: rxvt-unicode.spec =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-5/rxvt-unicode.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- rxvt-unicode.spec 8 Aug 2006 10:16:51 -0000 1.26 +++ rxvt-unicode.spec 2 Nov 2006 22:20:33 -0000 1.27 @@ -1,5 +1,5 @@ Name: rxvt-unicode -Version: 7.9 +Version: 8.0 Release: 1%{?dist} Summary: Rxvt-unicode is an unicode version of rxvt @@ -73,6 +73,10 @@ %{_libdir}/urxvt %changelog +* Thu Nov 02 2006 Andreas Bierfert +8.0-1 +- version upgrade + * Tue Aug 08 2006 Andreas Bierfert 7.9-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Aug 2006 10:16:51 -0000 1.19 +++ sources 2 Nov 2006 22:20:33 -0000 1.20 @@ -1 +1 @@ -7a0c73ccf0e31808ad37b61e730cd10e rxvt-unicode-7.9.tar.bz2 +e349f3d2bc8f4dfdf052cf63b4baa065 rxvt-unicode-8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 22:21:01 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Nov 2006 15:21:01 -0700 Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.18, 1.19 rxvt-unicode.spec, 1.21, 1.22 sources, 1.18, 1.19 Message-ID: <200611022221.kA2ML1qv005166@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/rxvt-unicode/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/FC-3 Modified Files: .cvsignore rxvt-unicode.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 18 Jul 2006 09:38:30 -0000 1.18 +++ .cvsignore 2 Nov 2006 22:20:31 -0000 1.19 @@ -1 +1 @@ -rxvt-unicode-7.8.tar.bz2 +rxvt-unicode-8.0.tar.bz2 Index: rxvt-unicode.spec =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- rxvt-unicode.spec 18 Jul 2006 09:38:30 -0000 1.21 +++ rxvt-unicode.spec 2 Nov 2006 22:20:31 -0000 1.22 @@ -1,5 +1,5 @@ Name: rxvt-unicode -Version: 7.8 +Version: 8.0 Release: 1%{?dist} Summary: Rxvt-unicode is an unicode version of rxvt @@ -68,6 +68,14 @@ %{_libdir}/urxvt %changelog +* Thu Nov 02 2006 Andreas Bierfert +8.0-1 +- version upgrade + +* Tue Aug 08 2006 Andreas Bierfert +7.9-1 +- version upgrade + * Tue Jul 18 2006 Andreas Bierfert 7.8-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 18 Jul 2006 09:38:30 -0000 1.18 +++ sources 2 Nov 2006 22:20:31 -0000 1.19 @@ -1 +1 @@ -8bb2746eaa814f90d795534d67d9198a rxvt-unicode-7.8.tar.bz2 +e349f3d2bc8f4dfdf052cf63b4baa065 rxvt-unicode-8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 22:21:02 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Nov 2006 15:21:02 -0700 Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.19, 1.20 rxvt-unicode.spec, 1.22, 1.23 sources, 1.19, 1.20 Message-ID: <200611022221.kA2ML2QM005171@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/rxvt-unicode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/FC-4 Modified Files: .cvsignore rxvt-unicode.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Aug 2006 10:16:51 -0000 1.19 +++ .cvsignore 2 Nov 2006 22:20:32 -0000 1.20 @@ -1 +1 @@ -rxvt-unicode-7.9.tar.bz2 +rxvt-unicode-8.0.tar.bz2 Index: rxvt-unicode.spec =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- rxvt-unicode.spec 8 Aug 2006 10:16:51 -0000 1.22 +++ rxvt-unicode.spec 2 Nov 2006 22:20:32 -0000 1.23 @@ -1,5 +1,5 @@ Name: rxvt-unicode -Version: 7.9 +Version: 8.0 Release: 1%{?dist} Summary: Rxvt-unicode is an unicode version of rxvt @@ -68,6 +68,10 @@ %{_libdir}/urxvt %changelog +* Thu Nov 02 2006 Andreas Bierfert +8.0-1 +- version upgrade + * Tue Aug 08 2006 Andreas Bierfert 7.9-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Aug 2006 10:16:51 -0000 1.19 +++ sources 2 Nov 2006 22:20:32 -0000 1.20 @@ -1 +1 @@ -7a0c73ccf0e31808ad37b61e730cd10e rxvt-unicode-7.9.tar.bz2 +e349f3d2bc8f4dfdf052cf63b4baa065 rxvt-unicode-8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 22:21:04 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Nov 2006 15:21:04 -0700 Subject: rpms/rxvt-unicode/FC-6 .cvsignore, 1.19, 1.20 rxvt-unicode.spec, 1.27, 1.28 sources, 1.19, 1.20 Message-ID: <200611022221.kA2ML44T005181@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/rxvt-unicode/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/FC-6 Modified Files: .cvsignore rxvt-unicode.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-6/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Aug 2006 10:16:52 -0000 1.19 +++ .cvsignore 2 Nov 2006 22:20:33 -0000 1.20 @@ -1 +1 @@ -rxvt-unicode-7.9.tar.bz2 +rxvt-unicode-8.0.tar.bz2 Index: rxvt-unicode.spec =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-6/rxvt-unicode.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- rxvt-unicode.spec 15 Sep 2006 06:53:39 -0000 1.27 +++ rxvt-unicode.spec 2 Nov 2006 22:20:33 -0000 1.28 @@ -1,6 +1,6 @@ Name: rxvt-unicode -Version: 7.9 -Release: 2%{?dist} +Version: 8.0 +Release: 1%{?dist} Summary: Rxvt-unicode is an unicode version of rxvt Group: User Interface/X @@ -73,6 +73,10 @@ %{_libdir}/urxvt %changelog +* Thu Nov 02 2006 Andreas Bierfert +8.0-1 +- version upgrade + * Fri Sep 15 2006 Andreas Bierfert 7.9-2 - FE6 rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/FC-6/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Aug 2006 10:16:52 -0000 1.19 +++ sources 2 Nov 2006 22:20:33 -0000 1.20 @@ -1 +1 @@ -7a0c73ccf0e31808ad37b61e730cd10e rxvt-unicode-7.9.tar.bz2 +e349f3d2bc8f4dfdf052cf63b4baa065 rxvt-unicode-8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 22:21:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Nov 2006 15:21:09 -0700 Subject: rpms/rxvt-unicode/devel .cvsignore, 1.19, 1.20 rxvt-unicode.spec, 1.27, 1.28 sources, 1.19, 1.20 Message-ID: <200611022221.kA2ML9Y6005186@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/rxvt-unicode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/devel Modified Files: .cvsignore rxvt-unicode.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Aug 2006 10:16:52 -0000 1.19 +++ .cvsignore 2 Nov 2006 22:20:39 -0000 1.20 @@ -1 +1 @@ -rxvt-unicode-7.9.tar.bz2 +rxvt-unicode-8.0.tar.bz2 Index: rxvt-unicode.spec =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- rxvt-unicode.spec 15 Sep 2006 06:53:39 -0000 1.27 +++ rxvt-unicode.spec 2 Nov 2006 22:20:39 -0000 1.28 @@ -1,6 +1,6 @@ Name: rxvt-unicode -Version: 7.9 -Release: 2%{?dist} +Version: 8.0 +Release: 1%{?dist} Summary: Rxvt-unicode is an unicode version of rxvt Group: User Interface/X @@ -73,6 +73,10 @@ %{_libdir}/urxvt %changelog +* Thu Nov 02 2006 Andreas Bierfert +8.0-1 +- version upgrade + * Fri Sep 15 2006 Andreas Bierfert 7.9-2 - FE6 rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Aug 2006 10:16:52 -0000 1.19 +++ sources 2 Nov 2006 22:20:39 -0000 1.20 @@ -1 +1 @@ -7a0c73ccf0e31808ad37b61e730cd10e rxvt-unicode-7.9.tar.bz2 +e349f3d2bc8f4dfdf052cf63b4baa065 rxvt-unicode-8.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 22:25:11 2006 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Thu, 2 Nov 2006 15:25:11 -0700 Subject: rpms/mantis/FC-6 .cvsignore, 1.4, 1.5 mantis.spec, 1.12, 1.13 sources, 1.9, 1.10 Message-ID: <200611022225.kA2MPBmK005333@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/mantis/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4924 Modified Files: .cvsignore mantis.spec sources Log Message: update to 1.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mantis/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Oct 2006 11:50:35 -0000 1.4 +++ .cvsignore 2 Nov 2006 22:24:41 -0000 1.5 @@ -1 +1 @@ -mantis_1.0.5.tar.gz +mantis-1.0.6.tar.gz Index: mantis.spec =================================================================== RCS file: /cvs/extras/rpms/mantis/FC-6/mantis.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mantis.spec 10 Oct 2006 11:50:35 -0000 1.12 +++ mantis.spec 2 Nov 2006 22:24:41 -0000 1.13 @@ -6,13 +6,13 @@ Summary: Web-based bugtracking system Name: mantis -Version: 1.0.5 +Version: 1.0.6 Release: 1%{dist} License: GPL Group: Applications/Internet URL: http://www.mantisbugtracker.com/ BuildArch: noarch -Source0: http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz +Source0: http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}.tar.gz Patch0: mantis-1.0.0a3-iis.patch Patch1: mantis-0.19.2-noexamplecom.patch Patch2: mantis-1.0.0rc2-noadmin.patch @@ -48,7 +48,7 @@ %prep -%setup -q -n %{name}_%{version} +%setup -q %patch0 -p1 -b .iis %patch1 -p1 -b .noexamplecom %patch2 -p1 -b .noadmin @@ -133,6 +133,9 @@ %changelog +* Thu Nov 2 2006 Gianluca Sforna - 1.0.6-1 +- updated to 1.0.6 + * Tue Oct 10 2006 Gianluca Sforna - 1.0.5-1 - updated to 1.0.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mantis/FC-6/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Oct 2006 11:50:35 -0000 1.9 +++ sources 2 Nov 2006 22:24:41 -0000 1.10 @@ -1 +1 @@ -01c5fb87e5ac161a681471573711bcf6 mantis_1.0.5.tar.gz +64af171288bad777d6a1bba493e4a88b mantis-1.0.6.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 22:27:03 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Thu, 2 Nov 2006 15:27:03 -0700 Subject: rpms/amsn/devel .cvsignore, 1.2, 1.3 amsn.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200611022227.kA2MR3ro005452@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5419 Modified Files: .cvsignore amsn.spec sources Log Message: * Thu Sep 2 2006 Sander Hoentjen - 0.96-1 - updated to 0.96 final - drop nolocate and locallibs patch because they were accepted upstream - changed URL because they moved the website Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amsn/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jun 2006 19:00:48 -0000 1.2 +++ .cvsignore 2 Nov 2006 22:26:32 -0000 1.3 @@ -1 +1 @@ -amsn-0.96rc1.tar.bz2 +amsn-0.96.tar.bz2 Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- amsn.spec 28 Aug 2006 10:34:46 -0000 1.4 +++ amsn.spec 2 Nov 2006 22:26:32 -0000 1.5 @@ -1,21 +1,17 @@ -%define alphatag rc1 - Name: amsn Version: 0.96 -Release: 0.13.%{alphatag}%{?dist} +Release: 1%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet License: GPL -URL: http://amsn.sourceforge.net/ -Source0: http://dl.sourceforge.net/amsn/%{name}-%{version}%{alphatag}.tar.bz2 +URL: http://www.amsn-project.net/ +Source0: http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2 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 -Patch1: amsn-0.96-configureac-nolocate.patch -Patch2: amsn-0.96-tkcximage-locallibs.patch -Patch3: amsn-0.96-system-bwidget.patch +Patch1: amsn-0.96-system-bwidget.patch %description This is an MSN Messenger clone for Unix, Windows, and Macintosh. @@ -33,17 +29,14 @@ snapshots with your webcam to use as your display picture. %prep -%setup -n %{name}-%{version}%{alphatag} -q -%patch1 -p1 -b .1-nolocate -%patch2 -p1 -b .2-locallibs -%patch3 -p1 -b .3-system-bwidget +%setup -q +%patch1 -p1 -b .1-system-bwidget rm -r utils/TkCximage/src/{jpeg,png,zlib} rm -r utils/BWidget-1.7.0 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in %{__sed} -i 's#mozilla#htmlview#' config.tcl %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "/usr/share/amsn/"#' amsn amsn-remote amsn-remote-CLI -%{__sed} -i 's#"##' amsn.desktop autoconf %build @@ -123,6 +116,11 @@ %changelog +* Thu Sep 2 2006 Sander Hoentjen - 0.96-1 +- updated to 0.96 final +- drop nolocate and locallibs patch because they were accepted upstream +- changed URL because they moved the website + * Tue Aug 28 2006 Sander Hoentjen - 0.96-0.13.rc1 - Tag error, so bumping the release Index: sources =================================================================== RCS file: /cvs/extras/rpms/amsn/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jun 2006 19:00:48 -0000 1.2 +++ sources 2 Nov 2006 22:26:32 -0000 1.3 @@ -1 +1 @@ -1b90fdbb0a51c7646f4d2e6b22f18711 amsn-0.96rc1.tar.bz2 +3df6b0d34ef1997a47c0b8af29b2547a amsn-0.96.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 2 22:33:05 2006 From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu)) Date: Thu, 2 Nov 2006 15:33:05 -0700 Subject: rpms/mantis/FC-5 .cvsignore, 1.3, 1.4 mantis.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200611022233.kA2MX5vf005603@cvs-int.fedora.redhat.com> Author: giallu Update of /cvs/extras/rpms/mantis/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5575 Modified Files: .cvsignore mantis.spec sources Log Message: updated to 1.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mantis/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Mar 2005 18:21:20 -0000 1.3 +++ .cvsignore 2 Nov 2006 22:32:35 -0000 1.4 @@ -1,2 +1 @@ -mantis-*.tar.gz -mantis-*.*.rpm +mantis-1.0.6.tar.gz Index: mantis.spec =================================================================== RCS file: /cvs/extras/rpms/mantis/FC-5/mantis.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mantis.spec 17 Oct 2006 09:21:59 -0000 1.13 +++ mantis.spec 2 Nov 2006 22:32:35 -0000 1.14 @@ -6,13 +6,13 @@ Summary: Web-based bugtracking system Name: mantis -Version: 1.0.5 -Release: 1%{dist}.1 +Version: 1.0.6 +Release: 1%{dist} License: GPL Group: Applications/Internet URL: http://www.mantisbugtracker.com/ BuildArch: noarch -Source0: http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz +Source0: http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}.tar.gz Patch0: mantis-1.0.0a3-iis.patch Patch1: mantis-0.19.2-noexamplecom.patch Patch2: mantis-1.0.0rc2-noadmin.patch @@ -48,7 +48,7 @@ %prep -%setup -q -n %{name}_%{version} +%setup -q %patch0 -p1 -b .iis %patch1 -p1 -b .noexamplecom %patch2 -p1 -b .noadmin @@ -133,6 +133,9 @@ %changelog +* Thu Nov 2 2006 Gianluca Sforna - 1.0.6-1 +- updated to 1.0.6 + * Tue Oct 17 2006 Gianluca Sforna - 1.0.5-1.1 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/mantis/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Oct 2006 09:59:10 -0000 1.9 +++ sources 2 Nov 2006 22:32:35 -0000 1.10 @@ -1 +1 @@ -01c5fb87e5ac161a681471573711bcf6 mantis_1.0.5.tar.gz +64af171288bad777d6a1bba493e4a88b mantis-1.0.6.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 22:34:18 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Nov 2006 15:34:18 -0700 Subject: rpms/libipoddevice/devel .cvsignore, 1.3, 1.4 libipoddevice.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200611022234.kA2MYI1J005686@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5658 Modified Files: .cvsignore libipoddevice.spec sources Log Message: * Thu Nov 2 2006 Christopher Aillon 0.5.1-1 - Update to 0.5.1 - BuildRequire: sg3_utils-devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 May 2006 18:28:57 -0000 1.3 +++ .cvsignore 2 Nov 2006 22:33:48 -0000 1.4 @@ -1 +1 @@ -libipoddevice-0.4.5.tar.gz +libipoddevice-0.5.1.tar.gz Index: libipoddevice.spec =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/libipoddevice.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libipoddevice.spec 1 Sep 2006 20:45:17 -0000 1.5 +++ libipoddevice.spec 2 Nov 2006 22:33:48 -0000 1.6 @@ -2,8 +2,8 @@ %define hal_ver 0.5.2 Name: libipoddevice -Version: 0.4.5 -Release: 3%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: Device-specific layer for the Apple iPod Group: Development/Libraries @@ -16,6 +16,7 @@ BuildRequires: hal-devel >= %{hal_ver} BuildRequires: libgtop2-devel >= %{libgtop_ver} BuildRequires: udev +BuildRequires: sg3_utils-devel %description libipoddevice is a device-specific layer for the Apple iPod @@ -57,6 +58,8 @@ %doc COPYING %{_bindir}/ipod %{_libdir}/libipoddevice.so.* +%{_libdir}/hal/hal-ipod-info +%{_datadir}/hal/fdi/policy/20thirdparty/20-ipod-info.fdi %files devel %{_libdir}/libipoddevice.so @@ -68,6 +71,10 @@ %changelog +* Thu Nov 2 2006 Christopher Aillon 0.5.1-1 +- Update to 0.5.1 +- BuildRequire: sg3_utils-devel + * Fri Sep 1 2006 Christopher Aillon 0.4.5-3 - Rebuild against newer toolchain Index: sources =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 May 2006 18:28:57 -0000 1.3 +++ sources 2 Nov 2006 22:33:48 -0000 1.4 @@ -1 +1 @@ -aac402761cf2eca2b16d14acf81dd2b3 libipoddevice-0.4.5.tar.gz +548806535b1f6eb260e7729030a7ea30 libipoddevice-0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Nov 2 22:41:55 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Thu, 2 Nov 2006 15:41:55 -0700 Subject: rpms/amsn/FC-6 .cvsignore, 1.2, 1.3 amsn.spec, 1.4, 1.5 sources, 1.2, 1.3 amsn-0.96-configureac-nolocate.patch, 1.1, NONE amsn-0.96-tkcximage-locallibs.patch, 1.1, NONE Message-ID: <200611022241.kA2Mftnc005802@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5781 Modified Files: .cvsignore amsn.spec sources Removed Files: amsn-0.96-configureac-nolocate.patch amsn-0.96-tkcximage-locallibs.patch Log Message: * Thu Sep 2 2006 Sander Hoentjen - 0.96-1 - updated to 0.96 final - drop nolocate and locallibs patch because they were accepted upstream - changed URL because they moved the website Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amsn/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jun 2006 19:00:48 -0000 1.2 +++ .cvsignore 2 Nov 2006 22:41:25 -0000 1.3 @@ -1 +1 @@ -amsn-0.96rc1.tar.bz2 +amsn-0.96.tar.bz2 Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/FC-6/amsn.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- amsn.spec 28 Aug 2006 10:34:46 -0000 1.4 +++ amsn.spec 2 Nov 2006 22:41:25 -0000 1.5 @@ -1,21 +1,17 @@ -%define alphatag rc1 - Name: amsn Version: 0.96 -Release: 0.13.%{alphatag}%{?dist} +Release: 1%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet License: GPL -URL: http://amsn.sourceforge.net/ -Source0: http://dl.sourceforge.net/amsn/%{name}-%{version}%{alphatag}.tar.bz2 +URL: http://www.amsn-project.net/ +Source0: http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2 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 -Patch1: amsn-0.96-configureac-nolocate.patch -Patch2: amsn-0.96-tkcximage-locallibs.patch -Patch3: amsn-0.96-system-bwidget.patch +Patch1: amsn-0.96-system-bwidget.patch %description This is an MSN Messenger clone for Unix, Windows, and Macintosh. @@ -33,17 +29,14 @@ snapshots with your webcam to use as your display picture. %prep -%setup -n %{name}-%{version}%{alphatag} -q -%patch1 -p1 -b .1-nolocate -%patch2 -p1 -b .2-locallibs -%patch3 -p1 -b .3-system-bwidget +%setup -q +%patch1 -p1 -b .1-system-bwidget rm -r utils/TkCximage/src/{jpeg,png,zlib} rm -r utils/BWidget-1.7.0 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in %{__sed} -i 's#mozilla#htmlview#' config.tcl %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "/usr/share/amsn/"#' amsn amsn-remote amsn-remote-CLI -%{__sed} -i 's#"##' amsn.desktop autoconf %build @@ -123,6 +116,11 @@ %changelog +* Thu Sep 2 2006 Sander Hoentjen - 0.96-1 +- updated to 0.96 final +- drop nolocate and locallibs patch because they were accepted upstream +- changed URL because they moved the website + * Tue Aug 28 2006 Sander Hoentjen - 0.96-0.13.rc1 - Tag error, so bumping the release Index: sources =================================================================== RCS file: /cvs/extras/rpms/amsn/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jun 2006 19:00:48 -0000 1.2 +++ sources 2 Nov 2006 22:41:25 -0000 1.3 @@ -1 +1 @@ -1b90fdbb0a51c7646f4d2e6b22f18711 amsn-0.96rc1.tar.bz2 +3df6b0d34ef1997a47c0b8af29b2547a amsn-0.96.tar.bz2 --- amsn-0.96-configureac-nolocate.patch DELETED --- --- amsn-0.96-tkcximage-locallibs.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 22:45:49 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Thu, 2 Nov 2006 15:45:49 -0700 Subject: rpms/amsn/FC-5 .cvsignore, 1.2, 1.3 amsn.spec, 1.1, 1.2 sources, 1.2, 1.3 amsn-0.96-configureac-nolocate.patch, 1.1, NONE amsn-0.96-tkcximage-locallibs.patch, 1.1, NONE Message-ID: <200611022245.kA2MjnEU005878@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5857 Modified Files: .cvsignore amsn.spec sources Removed Files: amsn-0.96-configureac-nolocate.patch amsn-0.96-tkcximage-locallibs.patch Log Message: * Thu Sep 2 2006 Sander Hoentjen - 0.96-1 - updated to 0.96 final - drop nolocate and locallibs patch because they were accepted upstream - changed URL because they moved the website Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amsn/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jun 2006 19:00:48 -0000 1.2 +++ .cvsignore 2 Nov 2006 22:45:19 -0000 1.3 @@ -1 +1 @@ -amsn-0.96rc1.tar.bz2 +amsn-0.96.tar.bz2 Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/FC-5/amsn.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amsn.spec 20 Jun 2006 19:00:48 -0000 1.1 +++ amsn.spec 2 Nov 2006 22:45:19 -0000 1.2 @@ -1,21 +1,17 @@ -%define alphatag rc1 - Name: amsn Version: 0.96 -Release: 0.11.%{alphatag}%{?dist} +Release: 1%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet License: GPL -URL: http://amsn.sourceforge.net/ -Source0: http://dl.sourceforge.net/amsn/%{name}-%{version}%{alphatag}.tar.bz2 +URL: http://www.amsn-project.net/ +Source0: http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2 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 -Patch1: amsn-0.96-configureac-nolocate.patch -Patch2: amsn-0.96-tkcximage-locallibs.patch -Patch3: amsn-0.96-system-bwidget.patch +Patch1: amsn-0.96-system-bwidget.patch %description This is an MSN Messenger clone for Unix, Windows, and Macintosh. @@ -33,17 +29,14 @@ snapshots with your webcam to use as your display picture. %prep -%setup -n %{name}-%{version}%{alphatag} -q -%patch1 -p1 -b .1-nolocate -%patch2 -p1 -b .2-locallibs -%patch3 -p1 -b .3-system-bwidget +%setup -q +%patch1 -p1 -b .1-system-bwidget rm -r utils/TkCximage/src/{jpeg,png,zlib} rm -r utils/BWidget-1.7.0 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in %{__sed} -i 's#mozilla#htmlview#' config.tcl %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "/usr/share/amsn/"#' amsn amsn-remote amsn-remote-CLI -%{__sed} -i 's#"##' amsn.desktop autoconf %build @@ -123,6 +116,17 @@ %changelog +* Thu Sep 2 2006 Sander Hoentjen - 0.96-1 +- updated to 0.96 final +- drop nolocate and locallibs patch because they were accepted upstream +- changed URL because they moved the website + +* Tue Aug 28 2006 Sander Hoentjen - 0.96-0.13.rc1 +- Tag error, so bumping the release + +* Tue Aug 28 2006 Sander Hoentjen - 0.96-0.12.rc1 +- FC6 mass rebuild + * Tue Jun 20 2006 Sander Hoentjen - 0.96-0.11.rc1 - requires sox, htmlview and tkdnd now - moved amsn, amsn-remote and amsn-remote-CLI to bindir Index: sources =================================================================== RCS file: /cvs/extras/rpms/amsn/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jun 2006 19:00:48 -0000 1.2 +++ sources 2 Nov 2006 22:45:19 -0000 1.3 @@ -1 +1 @@ -1b90fdbb0a51c7646f4d2e6b22f18711 amsn-0.96rc1.tar.bz2 +3df6b0d34ef1997a47c0b8af29b2547a amsn-0.96.tar.bz2 --- amsn-0.96-configureac-nolocate.patch DELETED --- --- amsn-0.96-tkcximage-locallibs.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 2 23:25:10 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Nov 2006 16:25:10 -0700 Subject: rpms/libipoddevice/devel libipoddevice.spec,1.6,1.7 Message-ID: <200611022325.kA2NPAEo009142@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9126 Modified Files: libipoddevice.spec Log Message: * Thu Nov 2 2006 Christopher Aillon 0.5.1-1 - BuildRequire: libxml2-devel Index: libipoddevice.spec =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/libipoddevice.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libipoddevice.spec 2 Nov 2006 22:33:48 -0000 1.6 +++ libipoddevice.spec 2 Nov 2006 23:24:39 -0000 1.7 @@ -14,6 +14,7 @@ BuildRequires: dbus-glib-devel BuildRequires: hal-devel >= %{hal_ver} +BuildRequires: libxml2-devel BuildRequires: libgtop2-devel >= %{libgtop_ver} BuildRequires: udev BuildRequires: sg3_utils-devel @@ -73,7 +74,7 @@ %changelog * Thu Nov 2 2006 Christopher Aillon 0.5.1-1 - Update to 0.5.1 -- BuildRequire: sg3_utils-devel +- BuildRequire: sg3_utils-devel libxml2-devel * Fri Sep 1 2006 Christopher Aillon 0.4.5-3 - Rebuild against newer toolchain From fedora-extras-commits at redhat.com Fri Nov 3 00:41:57 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 2 Nov 2006 17:41:57 -0700 Subject: rpms/tetex-tex4ht/devel AlDraTex.sty, NONE, 1.1 AlProTex.sty, NONE, 1.1 DraTex.sty, NONE, 1.1 ProTex.sty, NONE, 1.1 tetex-tex4ht-1.0-prev.patch, NONE, 1.1 tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch, NONE, 1.1 texmf.cnf.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 tetex-tex4ht.spec, 1.8, 1.9 tex4ht-env.patch, 1.1, NONE Message-ID: <200611030041.kA30fvM3015955@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15834 Modified Files: .cvsignore sources tetex-tex4ht.spec Added Files: AlDraTex.sty AlProTex.sty DraTex.sty ProTex.sty tetex-tex4ht-1.0-prev.patch tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch texmf.cnf.patch Removed Files: tex4ht-env.patch Log Message: * Fri Nov 3 2006 Patrice Dumas 1.0.2006_10_28_1705-1 - update - use debian patchset - remove the patch modifying paths in tex4ht.env, it is unneeded with kpathsee --- NEW FILE AlDraTex.sty --- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% v 1.7 % AlDraTex % % Copyright (C) 1992 Eitan M. Gurari % % % % This program can redistributed and/or modified under % % the terms of the LaTeX Project Public License % % Distributed from CTAN archives in directory % % macros/latex/base/lppl.txt; either version 1 of the % % License, or (at your option) any later version. % % % % However, you are allowed to modify this program % % without changing its name, if you modify its % % signature. Changes to the signature can be introduced % % with a directive of the form % % \message{signature} % % % % gurari at cse.ohio-state.edu % % http://http://www.cse.ohio-state.edu/~gurari/ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \expandafter\edef\csname :RestoreCatcodes\endcsname{% \catcode`\noexpand\noexpand\noexpand \^=\the\catcode`\^% } \catcode`\^=7 \expandafter\edef\csname :RestoreCatcodes\endcsname{% \csname :RestoreCatcodes\endcsname \catcode`\noexpand \_=\the\catcode`\_% \catcode`\noexpand :=\the\catcode`:% \catcode`\noexpand &=\the\catcode`&% \catcode`\noexpand \#=\the\catcode`\#% \catcode`\noexpand \^^M=\the\catcode`\^^M% \let\expandafter\noexpand \csname:RestoreCatcodes\endcsname=\noexpand\undefined} \catcode`\:=11 \ifx \AlDraTex\:undefined \def\AlDraTex{chart,diagram} \fi \newif\if:circle \newif\if:option \def\:CheckOption#1{ \def\:temp{#1} \:optionfalse \expandafter\:GetOptions\AlDraTex,,// } \def\:GetOptions#1,#2//{ \def\:next{#1} \ifx \:next\empty \else \ifx \:temp\:next \:optiontrue \let\:next=\relax \else \def\:next{\:GetOptions#2//} \fi \fi \:next } \def\:DefineExt#1{% \Define#1{\begingroup \:DraCatCodes \csname .:\string#1\endcsname}% \expandafter\Define\csname .:\string#1\endcsname} \IntVar\:C \IntVar\:Ca \IntVar\:Cb \IntVar\:Cc \newtoks\:tk \DecVar\Va \DecVar\Vb \DecVar\:Vc \DecVar\:Vd \DecVar\:Ve \Define\:GetX(2){\Va=#1;} \Define\:GetY(2){\Vb=#2;} \Define\:GetXY(2){\Va=#1;\Vb=#2;}\Define\:GetExit(2){ \:Vc=#1; \IF \LtDec(\:Vc,0) \THEN \:Vc=-\:Vc; \FI \:Vd=#2; \IF \LtDec(\:Vd,0) \THEN \:Vd=-\:Vd; \FI \IF \LtDec(\:Vd,\:Vc) \THEN \:Vd=\:Vc; \FI \Va=#1; \Vb=#2; \IF \GtDec(\:Vd,0) \THEN \Va/\:Vd; \Vb/\:Vd; \FI } \Define\:GetEdgeFront(1){\def\:EdgeFront{#1}} \Define\:Count(1){\:C+1;}\let\Defend=\noexpand \def\KeepSpaces{\def\:Spaces{\catcode`\ =10 \relax}} \def\RemoveSpaces{\let\:Spaces=\relax} \RemoveSpaces\def\:edef#1#2{\edef\:Temp{\noexpand\Define \noexpand#1{#2}}\:Temp } \:CheckOption{chart}\if:option \edef\AlDraTex{\AlDraTex,pie,bar,xy} \else \:CheckOption{pie}\if:option \edef\AlDraTex{\AlDraTex,chart} \else \:CheckOption{xy}\if:option \edef\AlDraTex{\AlDraTex,chart} \else \:CheckOption{bar}\if:option \edef\AlDraTex{\AlDraTex,chart} \fi\fi\fi\fi \:CheckOption{chart}\if:option \def\Compute#1(#2){\def\NextDefine{\::Comp#1(#2)}\Define\:Comp(#2)} \def\::Comp#1(#2){\Define\:Temp(#2){}\ifx \:Temp\:Comp \let\:Compute=\empty \else \Define\:Compute(1){\:Comp(##1)\:Return#1}\fi} \Compute\I(1){}\Define\:ChooseColor(1){ \IF \EqDec(#1,1) \THEN \SetBrush(0,0){} \ELSE\IF \EqDec(#1,2) \THEN \SetBrush(2pt\du,1pt\du){ \PenSize(0.2pt) \Units(1pt,1pt) \Move(0,-0.37) \Line(0,0.75)} \ELSE\IF \EqDec(#1,3) \THEN \SetBrush(1pt\du,2pt\du){ \PenSize(0.2pt) \Units(1pt,1pt) \Move(-0.37,0) \Line(0.75,0)} \ELSE\IF \EqDec(#1,4) \THEN \SetBrush(2pt\du,2pt\du){ \PenSize(0.2pt) \Units(1pt,1pt){\Move(-1,0)\Line(2,0)} \Move(0,-1)\Line(0,2)} \ELSE\IF \EqDec(#1,5) \THEN \SetBrush(5pt\du,2pt\du){ \PenSize(0.2pt) \Units(1pt,1pt) \Move(0,-0.37) \Line(0,0.75)} \ELSE\IF \EqDec(#1,6) \THEN \SetBrush(2pt\du,5pt\du){ \PenSize(0.2pt) \Units(1pt,1pt) \Move(-0.37,0) \Line(0.75,0)} \ELSE \SetBrush(#1pt\du,#1pt\du){ \Units(1pt,1pt)\PaintRect(0.37,0.37)} \FI\FI\FI\FI\FI\FI} \fi \:CheckOption{pie}\if:option \Define\PieChart{\begingroup \:Spaces \:PieChart} \Define\:PieChart(1){\endgroup \Table\:Temp{#1} \:Ve=0; \:Temp(0,99){\:total} \MarkLoc(o:) \MoveF(\:PieR) \MarkLoc(b:) \DSeg\:Vd(o:,b:) \MoveToLoc(o:) \:C=0; \:Temp(0,99){\:InsertSlice} } \Define\PieChartSpec(1){ \IF \EqText(,#1) \THEN\ELSE \:PieSpec(#1) \FI \:PieCol} \Define\:PieSpec(3){ \:edef\:PieR{#2} \:edef\:LblDist{#3} \IF \EqInt(1,#1) \THEN \def\:ReturnComp##1{\:slice(\Val##1,\Val##1)} \Define\:total(1){ \ifx \:Compute\empty \:Ve+##1; \else \let\:Return=\:ReturnAdd \:Compute(##1)\fi} \Define\:InsertSlice(1){ \ifx \:Compute\empty \:slice(##1,##1) \else \let\:Return=\:ReturnComp\:Compute(##1) \fi} \ELSE \def\:ReturnComp##1{\edef\:tempa{\Val##1}} \Define\:total(2){ \ifx \:Compute\empty \:Ve+##1; \else \let\:Return=\:ReturnAdd \:Compute(##1)\fi} \Define\:InsertSlice(2){ \ifx \:Compute\empty \:slice(##1,##2) \else \let\:Return=\:ReturnComp\:Compute(##1) \:slice(\:tempa,##2) \fi} \FI } \def\:ReturnAdd#1{\:Ve+#1;}\Define\:slice(2){ \:C+1; \Va=#1; \Va/\:Ve; \Va*360; { \Va/2; \Rotate(\Val\Va) \:DetachSlice \MarkLoc(o:) \MoveF(1pt\du) \MarkLoc(x:) \CSeg\:SetEnEx(x:,o:) \MoveToLoc(o:) \MoveF(\:LblDist) \:AdjChatLbl(0,99){\:MvLbl} \SliceText(--#2--) \MoveToLoc(o:) \Vb=\:Vd; \Vb+\Va; \Vb+\Va; \DrawOvalArc(\:PieR,\:PieR)(\Val\:Vd,\Val\Vb) \:Ca=0; \:PieColors(0,99){\:Ca+1;\:PaintPie} {\RotateTo(\Val\:Vd) \LineF(\:PieR)} \RotateTo(\Val\Vb) \LineF(\:PieR) } \Rotate(\Val\Va) \:Vd+\Va; } \Define\:SetEnEx(2){\:Vc=#1; \Vb=#2; \EntryExit(\Val\:Vc,\Val\Vb,0,0)} \Define\DetachSlices(2){ \IF \EqInt(#2,0) \THEN \Define\:DetachSlice{} \ELSE\IF \EqText(,#1) \THEN \def\:DetachSlice{ \MoveF(#2) } \ELSE \Table\:DSlice{#1} \Define\:OptDSlice(1){ \IF \EqInt(\:C,##1) \THEN \MoveF(#2) \FI} \Define\:DetachSlice{ \:DSlice(0,99){\:OptDSlice} } \FI \FI } \Define\MovePieLabels(1){ \IF \EqText(,#1) \THEN \Table\:AdjChatLbl{0,0,0} \ELSE \Table\:AdjChatLbl{0,0,0} \FI} \Define\:MvLbl(3){ \IF \EqInt(\:C,#1) \THEN \Move(#2,#3) \FI } \:DefineExt\:PieCol(1){\endgroup \IF \EqText(,#1) \THEN \ELSE \Table\:PieColors{#1} \FI} \Define\:PaintPie(1){{ \IF \EqInt(\:C,\:Ca) \THEN \IF \GtDec(#1,0) \THEN \:ChooseColor(#1) \:Ve=\:PieR; \IF \GtDec(\Va,90) \THEN \Va=\:Vd; \Va+181; \PaintOvalArc(\Val\:Ve,\Val\:Ve)(\Val\:Vd,\Val\Va) \Va-1; \:Vd=\Va; \FI \PaintOvalArc(\Val\:Ve,\Val\:Ve)(\Val\:Vd,\Val\Vb) \RotateTo(\Val\Vb) \MoveF(\:PieR) \MarkLoc(a:) \MoveToLoc(o:) \RotateTo(\Val\:Vd) \MoveF(\:PieR) \MarkLoc(b:) \PaintQuad(o:,o:,a:,b:) \MoveF(-0.5pt\du) \MarkLoc(b:) \MoveToLoc(o:) \Rotate(1) \MoveF(\:PieR) \MarkLoc(b':) \MoveToLoc(o:) \RotateTo(\Val\Vb) \MoveF(\:PieR) \MoveF(-0.5pt\du) \MarkLoc(a:) \MoveToLoc(o:) \Rotate(-1) \MoveF(\:PieR) \MarkLoc(a':) \PaintQuad(a:,a':,b':,b:) \FI \FI }}\Define\Legend(1){ \AlignGrid(-1,\:LgEn) \PictNode(2){ \EntryExit(-1,\:LgEn,0,0) \DrawRect(\:LgSzX,\:LgSzY) [...1863 lines suppressed...] \MarkLoc(a:) \MarkXLoc(IN:) \MarkXLoc(INc:) \MoveToLoc(o:) \CSeg\:MoveHV(o:,b:) \MarkXLoc(OUT:) \MarkLoc(b:) \MoveToLoc(o:) \CSeg\:MoveHV(o:,-12:) \MarkLoc(-12:) \MoveToLoc(a:) \CSeg\:DistH(a:,-12:) \IF \LtDec(\Va,0) \THEN \ifx H\:TreeDir \else \Move(\Val\Va,0) \fi \ELSE \ifx H\:TreeDir \Move(0,\Val\Va) \else \fi \FI \MarkXLoc(INx:) \MoveToLoc(o:) \CSeg\:MoveHV(o:,OUTx:) \MarkLoc(OUTx:) \MoveToLoc(b:) \CSeg\:DistH(b:,OUTx:) \IF \GtDec(\Va,0) \THEN \ifx H\:TreeDir \else \Move(\Val\Va,0) \fi \ELSE \ifx H\:TreeDir \Move(0,\Val\Va) \else \fi \FI \MarkXLoc(OUTx:) } \Define\:Clnd(2){ \MarkLoc(o:) \:TreeEnEx \:C=#1; \:LeafNode(#1..\Val\:Ca,#2) \ifx H\:TreeDir \MoveToNode(#1..\Val\:Ca,0,1) \MarkLoc(IN:) \MoveToNode(#1..\Val\:Ca,0,-1) \else \MoveToNode(#1..\Val\:Ca,-1,0) \MarkLoc(IN:) \MoveToNode(#1..\Val\:Ca,1,0) \fi \MarkLoc(OUT:) \MoveToLoc(o:) \CSeg\:MoveHV(o:,IN:) \MarkXLoc(IN:) \MarkXLoc(INc:) \MarkXLoc(INx:) \MoveToLoc(o:) \CSeg\:MoveHV(o:,OUT:) \MarkXLoc(OUT:) \MarkXLoc(OUTx:) } \Define\TreeAlign(3){ \let\:TreeDir=#1 \def\:EntryX{#2} \def\:EntryY{#3} \:AlignTree} \Define\:AlignTree(3){ \def\:AlignA{#1} \def\:AlignB{#2} \def\:AlignC{#3}} \TreeAlign(V,0,0)(0,0,0) \Define\:trcTree{\:TrcDiag{\immediate\write16{\space \:parmB..\Val\:Ca,\Val\:Cc..\Val\:Cb}}} \Define\:ChildLoc(2){ \IF \LtDec(#1,0) \THEN \Va=-#1; \ELSE \Va= #1; \FI \IF \LtDec(\Va,100) \THEN \::ChildLoc(#1,#2) \ELSE \Va/100; \:C[\Va]; \Vb=#1; \IF \GtDec(#1,0) \THEN \Vb-\:C 00; \ELSE \Vb+\:C 00; \FI \edef\:Temp{\noexpand\::ChildLoc (\Val\Vb,-\Val\:C2:,-\Val\:C1:,\Val\:C1:,\Val\:C2:)}\:Temp \FI } \Define\::ChildLoc(5){ \IF \LtDec(#1,-2) \THEN \MoveToLoc(#2) \:MoveH(#1,#1) \ELSE \IF \GtDec(#1,2) \THEN \MoveToLoc(#4) \:MoveH(#1,#1) \ELSE \IF \LtDec(#1,-1) \THEN \MoveToLoc(#3) \Va=#1; \Va+1; \CSeg[\Val\Va]\Move(#2,#3) \ELSE \IF \GtDec(#1,1) \THEN \MoveToLoc(#4) \Va=#1; \Va-1; \CSeg[\Val\Va]\Move(#4,#5) \ELSE \MoveToLoc(#3) \CSeg[0.5]\Move(#3,#4) \:MoveH(#1,#1) \FI \FI \FI \FI}\def\:GetIx#1..#2//{\:Ca=#1;\:Cb=#2;} \Define\::MoveToInv(3){ \Indirect{\let\:temp=}<#1.mvto> \expandafter\ifx\:temp\MoveToInv \:GetIx#1// \ifx H\:TreeDir \:Cb-#3; \else \:Cb-#2; \fi \edef\:Temp{\noexpand\MoveToInv(\Val\:Ca..\Val\:Cb, \ifx H\:TreeDir 0,#3 \else -#2,0 \fi)} \expandafter\:Temp \ELSE \ifx H\:TreeDir \Indirect<#1.mvto>(#1,0,#3) \else \Indirect<#1.mvto>(#1,-#2,0) \fi \FI } \def\MoveToInv{\:MoveToInv} \let\:MoveToInv=\MoveToRect \Define\::MergTree{ \edef\:Temp{\DoReg=\the\DoReg\relax} \Table\:tempa{\:frL} \Table\:tempb{\:frR} \:tempa(0,0){\:left} \:tempb(0,0){\:right} \IF \GtInt(\:dpR,\:dpL) \THEN \:both(\:dpL) \:DoReg=\:dpL \advance\:DoReg by 1\relax \:tempb(\:DoReg,\:dpR){\:copy} \let\:dpL=\:dpR \ELSE \:both(\:dpR) \IF \GtInt(\:dpL,\:dpR) \THEN \:DoReg=\:dpR \advance\:DoReg by 1\relax \:tempa(\:DoReg,\:dpL){\:copy} \FI \FI \:Temp } \Define\:copt(3){\::copt(#3,)} \Define\::copt(2){ \IF \EqText(#1,C) \THEN \let\:MergTree=\::MergTree \FI } \Define\:MeasureRow(3){ \:TrcDiag{{ \:tk={#1,#2,#3} \immediate\write16{\Val\:C..\Val\:Ca\space\space\the\:tk}}} \IF \EqInt(#2,0) \THEN \FigSize\Va\Vb{\:LeafNode(x,#3)} \ELSE \FigSize\Va\Vb{\:TreeNode(x,#3)} \FI \expandafter\expandafter\expandafter\:tempb \expandafter{\:tempa &} \edef\:tempa{\the\:tk #2,\Val\Va,\Val\Vb} \IF \LtDec(\:Vc,\:tempc) \THEN \:Vc=\:tempc; \FI } \Define\:AddVerTreeSp(1){ \:Ca+1; \Indirect+#1; \Va=#1; \Va*\:TreeEdgeSpec; \Indirect+\Va; } \:DefineExt\TreeSpace(3){\endgroup \IF \EqText(D,#1) \THEN \def\:OutOutx{OUT:} \def\:InInx{IN:} \FI \IF \EqText(C,#1) \THEN \def\:OutOutx{OUT:} \def\:InInx{INc:} \let\:Cspace=\:InInx \FI \IF \EqText(S,#1) \THEN \def\:OutOutx{OUTx:} \def\:InInx{INx:} \FI \:edef\:HorTreeSp{#2} \:edef\:VerTreeSp{#3} } \TreeSpace(S,10,20)\:DefineExt\AdjTree(1){\endgroup \IF \EqText(#1,) \THEN \Table\:TrSp{,,} \ELSE \Table\:TrSp{#1} \FI } \AdjTree()\Define\:unl(3){ \IF \EqText(#1,L) \THEN \IF \EqInt(\:Cc,#2) \THEN \TreeSpace(#3,0) \FI \ELSE \IF \EqText(#1,N) \THEN \:edef\:Temp{\noexpand\EqText(\Val\:Cc..\Val\:Ca,#2)} \IF \:Temp \THEN \TreeSpace(#3,0) \FI \FI \FI}\Define\:spbn(3){ \IF \EqText(#1,B) \THEN \:edef\:Temp{\noexpand\EqText(\Val\:Cc..\Val\:Cb,#2)} \IF \:Temp \THEN \:MoveH(#3,#3) \FI\FI}\Define\:lcalg(3){ \IF \EqText(#1,A) \THEN \:edef\:Temp{\noexpand\EqText(\Val\:C..\Val\:Ca,#2)} \IF \:Temp \THEN \:xalg(#3) \FI\FI} \Define\:xalg(2){ \def\:EntryX{#1} \:AlignTree(#2) } \Define\:mvpr(3){ \IF \EqText(#1,M) \THEN \:edef\:Temp{\noexpand\EqText(\Val\:C..\Val\:Ca,#2)} \IF \:Temp \THEN \:MoveH(#3,-#3) \FI\FI}\Define\TreeEdgeSpec(1){\:edef\:TreeEdgeSpec{#1}} \TreeEdgeSpec(0.5) \def\:ChkInv{\MoveToInv} \Define\:Temp{ \def\:MvToDivider##1..##2..{ \ifx H\:TreeDir \Indirect{\Move(\Val},0) \else \Indirect{\Move(0,-\Val}) \fi } }\:Temp \Define\TreeEdge(2){ \ifx H\:TreeDir \HHEdge(#1,#2,EdgeGuide) \else \VVEdge(#1,#2,EdgeGuide) \fi } \Define\:AddNodesAddr(1){ \Define\:temp{\gdef\:GetNodesAddr} \expandafter\expandafter\expandafter \:temp\expandafter{\:GetNodesAddr & #1 }} \Define\:SubTreeAddrs{ \Table\:AddrPoly{ \:GetNodesAddr} \:AddrPoly(\Val\:AddrCount,999){\:AddrCount+1;\:RecordAddr} } \Define\:RecordAddr(1){\MoveToLoc(#1) \MarkXLoc(#1) \MoveToLoc(#1;:11) \MarkXLoc(#1;:11)} \IntVar\:AddrCount\TreeSpec(\Node)()(\TreeEdge) \fi \let\if:option=\:undefined \let\:CheckOption=\:undefined \let\:GetOptions=\:undefined \let\AlDraTex=\:undefined \def\:aldwarn#1#2{\immediate \write16{---AlDraTeX warning--- \ifcase #1 insufficient space for arrow head %0 \or \string\Tree(too many values)(...) %1 \or edge from node #2 to itself %2 \or #2 not a grid point %3 \or too many entries in (#2) %4 \or too many rows: \Val\:C %5 \or row \Val\:C\space has too many columns: \Val\:Ca %6 \or \Val\:C\space(>5) entries in \string\BarChartSpec %7 \or more than one bar in \string\BarChartSpec(\the\:tk) %8 \or no font for \string\NewCIRCNode, trying `\string \font\string\CIRC=lcircle10 scaled\string\magstep5' %9 \or \string\PutNode(#2)? %10 \or \string\GridDiagram(#2)? less than 2 rows/columns %11 \fi}} \:RestoreCatcodes \endinput --- NEW FILE AlProTex.sty --- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % AlProTex.sty 2004-06-18-18:54 % % Copyright (C) 1992--2004 by Eitan M. Gurari % % % % This program can redistributed and/or modified under % % the terms of the LaTeX Project Public License % % Distributed from CTAN archives in directory % % macros/latex/base/lppl.txt; either version 1 of the % % License, or (at your option) any later version. % % % % However, you are allowed to modify this program % % without changing its name, if you modify its % % signature. Changes to the signature can be introduced % % with a directive of the form % % \message{signature} % % % % gurari at cse.ohio-state.edu % % http://www.cse.ohio-state.edu/~gurari % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \immediate\write-1{version 2004-06-18-18:54} \expandafter\edef\csname :RestoreCatcodes\endcsname{% \catcode`\noexpand\noexpand\noexpand \^=\the\catcode`\^% \catcode`\noexpand\noexpand\noexpand \_=\the\catcode`\_% } \catcode`\^=7 \catcode`\_=8 \expandafter\edef\csname :RestoreCatcodes\endcsname{% \csname :RestoreCatcodes\endcsname \csname du:cc\endcsname \catcode`\noexpand "=\the\catcode`\"% \catcode`\noexpand |=\the\catcode`\|% \catcode`\noexpand :=\the\catcode`:% \catcode`\noexpand @=\the\catcode`@% \catcode`\noexpand -=\the\catcode`-% \catcode`\noexpand +=\the\catcode`+% \catcode`\noexpand /=\the\catcode`/% \catcode`\noexpand .=\the\catcode`.% \catcode`\noexpand \^^M=\the\catcode`\^^M% \catcode`\noexpand \^^I=\the\catcode`\^^I% \catcode`\noexpand \%=\the\catcode`\%% \let\expandafter\noexpand \csname:RestoreCatcodes\endcsname=\noexpand\undefined} \catcode`\@=11 \catcode`\:=11 \catcode`\"=12 \catcode`\|=12 \def\TagLine[#1]{} \def\ResetLineCount{} \def\RefLine[#1]{} \def\ShowLineCount{} \def\HideLineCount{} \def\PauseLineCount{} \def\ContLineCount{} \def\:InitAlProTex#1,#2//{ \def\:InitAlProTex{#1}% \let\:ModifyOutputCodeO=\ModifyOutputCode \def\ModifyOutputCode{\def\Extension{#1}\:ModifyOutputCodeO} \ifx \html:addr\:UnDeF \def\AlProTex{#2}\else \ifx \html:addr\empty \def\AlProTex{#2}\else \def\AlProTex{html,#2}\fi \fi} \expandafter\:InitAlProTex\AlProTex,// \def\:temp{\csname newif\endcsname} \expandafter\ifx \csname :Optionfalse\endcsname\relax \expandafter\:temp \csname if:Option\endcsname \fi \def\:CheckOption#1{ \def\:temp{#1} \:Optionfalse \expandafter\:GetOptions\AlProTex,,// } \def\:GetOptions#1,#2//{ \def\:next{#1} \ifx \:next\empty \else \ifx \:temp\:next \:Optiontrue \let\:next=\relax \else \def\:next{\:GetOptions#2//} \fi \fi \:next } \def\:CntrlChar{`\\} \catcode`\|=0 |catcode`|\=12 |def|:notex{\} |catcode`|\=0 |catcode`||=12 \def\:temp{ \catcode`\@=12 \def\:temp##1{\catcode`\@=11 \:CheckOption{##1}} \:temp} \:temp{@} \if:Option \def\:CntrlChar{`\@} \catcode`\@=12 \def\:notex{@} \catcode`\@=11 \let\:ModifyAppendCodeII=\ModifyAppendCode \let\:ModifyShowCodeII=\ModifyShowCode \let\:ModifyOutputCodeII=\ModifyOutputCode \def\ModifyAppendCode{\catcode`\@=0 \catcode`\\=12 \:ModifyAppendCodeII} \def\ModifyOutputCode{\def\@{@}\:ModifyOutputCodeII} \def\ModifyShowCode#1{\:ModifyShowCodeII{#1}\def\@{\char64 }} \else \ifx \:ModifyAppendCodeII\:undefined \:CheckOption{|} \if:Option \def\:CntrlChar{`\|} \def\:notex{|} \let\:ModifyAppendCodeII=\ModifyAppendCode \let\:ModifyShowCodeII=\ModifyShowCode \let\:ModifyOutputCodeII=\ModifyOutputCode \def\ModifyAppendCode{\catcode`\|=0 \catcode`\\=12 \:ModifyAppendCodeII} \def\ModifyOutputCode{\def\|{|}\:ModifyOutputCodeII} \def\ModifyShowCode#1{\:ModifyShowCodeII{#1}\def\|{\char124 }} \else \ifx \:ModifyAppendCodeII\:undefined \:CheckOption{`} \if:Option \def\:CntrlChar{`\`} \def\:notex{`} \let\:ModifyAppendCodeII=\ModifyAppendCode \let\:ModifyShowCodeII=\ModifyShowCode \let\:ModifyOutputCodeII=\ModifyOutputCode \def\ModifyAppendCode{\catcode`\`=0 \catcode`\\=12 \:ModifyAppendCodeII} \def\ModifyOutputCode{\def\`{`}\:ModifyOutputCodeII} \def\ModifyShowCode#1{\:ModifyShowCodeII{#1}\def\`{\char96 }} \else \ifx \:ModifyAppendCodeII\:undefined \:CheckOption{?} \if:Option \def\:CntrlChar{`\?} \def\:notex{?} \let\:ModifyAppendCodeII=\ModifyAppendCode \let\:ModifyShowCodeII=\ModifyShowCode \let\:ModifyOutputCodeII=\ModifyOutputCode \def\ModifyAppendCode{\catcode`\?=0 \catcode`\\=12 \:ModifyAppendCodeII} \def\ModifyOutputCode{\def\?{?}\:ModifyOutputCodeII} \def\ModifyShowCode#1{\:ModifyShowCodeII{#1}\def\?{\char63 }} \fi \fi \fi \fi \fi \fi \fi\:CheckOption{xref} \if:Option \csname newread\endcsname\sdx:file \immediate\openin\sdx:file=\jobname.sdx \csname newwrite\endcsname\cdx:file \immediate\openout\cdx:file=\jobname.cpg \let\xref:OutputCode=\OutputCode \def\OutputCode#1{% {\Comment{ startcodefragment}{//}% \let\ProTexMssg=\:gobble \let\xref:ModifyOutputCode=\ModifyOutputCode \def\wrt:index##115{\immediate\write\cdx:file }% \def\ModifyOutputCode##1{\xref:ModifyOutputCode{##1}\bgroup \def\relax####115####215{\egroup \expandafter\wrt:index\:WriteCode }}% \xref:OutputCode#1}% \xref:OutputCode#1} \expandafter\ifx \csname tmp:cnt\endcsname\relax \csname newcount\endcsname\tmp:cnt \fi \def\change:cats#1#2#3{% \tmp:cnt#1 \def\no::catcodes{% \catcode\tmp:cnt#3 \ifnum\tmp:cnt<#2 \advance\tmp:cnt 1 \expandafter\no::catcodes \fi }% \no::catcodes } \def\scan:token{\futurelet\:next\check:ch} \def\check:ch{\ifx \:next\par \expandafter\end \else \expandafter\scan:ch\fi} \def\scan:ch#1{\relax \ifx #1\egroup \index:tok \expandafter\egroup\else \ifcat #1a% \ifx \index:tok\empty \change:cats{48}{57}{11}% 0--9 \fi \edef\index:tok{\index:tok#1}% \ifx \index:tok\start:comment \let\index:tok=\empty \let~=\scan:comment \change:cats{48}{57}{12}% 0--9 \fi \else \change:cats{48}{57}{12}% 0--9 \if \index:tok\empty \else \write:index{1 \sp:id\index:id \space1 \l:idel\index:tok\r:idel }% \write:index{2 \l:idel\index:tok\r:idel \space \sp:id\index:id }% \fi \let\index:tok=\empty \fi \expandafter~\fi} \def\sp:id#1{% \ifnum #1<10000 \space\fi \ifnum #1<1000 \space\fi \ifnum #1<100 \space\fi \ifnum #1<10 \space\fi #1} \catcode`\@=0 \catcode`\\=12 @relax @:CheckOption{html} @if:Option @def at scan:comment#1\<#2\>{% @def at index:tok{#2}% @afterassignment at exit:comment at tmp:cnt=} @else @def at scan:comment#1\<#2\>.{% @def at index:tok{#2}% @afterassignment at exit:comment at tmp:cnt=} @fi @catcode`@\=0 \catcode`\@=11 \def\start:comment{startcodefragment} \def\exit:comment#1//{\def\:temp{#1}% \ifx \:temp\open:comment \index:push \edef\index:level{I\index:level}% \ifx \prev:comment\index:tok \else \code:index{}% \fi \expandafter\edef\csname L \index:level\endcsname{% \expandafter\ifx \csname L \index:level\endcsname\relax \else \csname L \index:level\endcsname, \fi \the\tmp:cnt }% \let\prev:dir=u% \let\prev:comment=\index:tok% \else \code:index{I}% \edef\index:level{\expandafter\:gobble\index:level}% \let\prev:dir=d% \index:pop\index:pop\index:push \fi \let\index:tok=\empty \edef\index:id{\the\tmp:cnt}% \let~=\scan:token ~} \def\open:comment{...} \def\index:id{0} \def\index:level{} \let\prev:dir=f \def\:gobble#1{} \def\index:push{\edef\pd:mem{\the\tmp:cnt,\pd:mem}} \def\index:pop{\expandafter\do:pop\pd:mem//} \def\do:pop#1,#2//{% \if !#1!\tmp:cnt=-1 \else \tmp:cnt=#1\def\pd:mem{#2}\fi} \def\pd:mem{,} \def\code:index#1{% \if d\prev:dir \bgroup \edef\index:tok{\l:idel\prev:comment\r:idel\space /\the\tmp:cnt/% \expandafter\ifx \csname L #1\index:level\endcsname\relax \else , \csname L #1\index:level\endcsname \fi}% \write:index{3 \index:tok }% \expandafter\ifx \csname L #1\index:level\endcsname\relax \else \edef\:tmp{\noexpand\derive:index \space \csname L #1\index:level\endcsname,,}\:tmp \fi \egroup \expandafter\let\csname L #1\index:level\endcsname=\:UnDe \fi } \def\derive:index#1,{% \if !#1!\else \write:index{1\sp:id{#1} 2 \index:tok}\expandafter\derive:index\fi} \def\write:index{\immediate\write\cdx:file } \def\l:idel{<} \def\r:idel{>} \def\CodeIndex{% \immediate\closeout\cdx:file \def\read:sdx{% \ifeof\sdx:file \else \immediate\read\sdx:file to\sdx:in \sdx:in \expandafter\read:sdx \fi }\noindent\vrule\vbox{\tt \hsize=0.8\hsize \rightskip=3em plus 4em \leftskip=3em \parindent=0pt \ifnum \index:typ<4 \sdx:in \fi \read:sdx }% \immediate\closein\sdx:file % \immediate\openout\cdx:file=\jobname.cdx \bgroup \change:cats{0}{255}{12}% \change:cats{97}{122}{11}% a--z \change:cats{65}{90}{11}% A--Z \change:cats{95}{95}{11}% _ \let\index:tok=\empty \let~=\scan:token \expandafter~\input \jobname.cpg \egroup \immediate\write16{-- Have \jobname.cdx processed into \jobname.sdx --}% }% \let\xref:ModifyShowCode=\ModifyShowCode \def\ModifyShowCode#1{% \xref:ModifyShowCode{#1}% \let\xref:ModifyShowLastCode=\ModifyShowLastCode \def\ModifyShowLastCode{\xref:ModifyShowLastCode{#1}% \def\:BackTitle{\noindent\vrule\vtop{% \tt \hsize=0.8\hsize \rightskip=3em plus 4em \leftskip=3em \parindent=0pt --\the\:CodeNumber--: \small:index }}}} \def\small:index{% \ifnum \:CodeNumber<\index:num \else \sdx:in \ifeof\sdx:file \def\index:num{1000000}\gdef\index:typ{4}% \else \immediate\read\sdx:file to\sdx:in \expandafter\get:typ \sdx:in //% \fi \expandafter\small:index \fi} \def\get:typ#1 {% \gdef\index:typ{#1}% \ifnum #1>1 \def\index:num{1000000}\expandafter\id:gobble \else \expandafter\get:nm\fi} \def\id:gobble#1//{} \def\get:nm#1 #2//{\def\index:num{#1}} \def\index:num{0} \let\sdx:in=\empty \fi \:CheckOption{basic} \if:Option \def\AlProTex{[[]],<<<>>>,list,title,ClearCode} \def\:temp{\catcode`\`=12} \catcode`\;=0 \catcode`\\=12 ;expandafter;catcode ;:CntrlChar=13 ;ifnum 92=;:CntrlChar ;edef;:notex{;noexpand;::notex;noexpand\;:notex} ;fi ;ifnum 124=;:CntrlChar ;edef;:notex{;noexpand;::notex;noexpand|;:notex} ;fi ;ifnum 64=;:CntrlChar ;edef;:notex{;noexpand;::notex;noexpand@;:notex} ;fi ;ifnum 96=;:CntrlChar ;edef;:notex{;noexpand;::notex;noexpand`;:notex} ;fi ;:temp ;catcode`;\=0 ;catcode`;;=12 \def\::notex#1#2{\let\:notex=\:undefined \let\::notex=\:undefined % \ifx \documentstyle\:undefined \errmessage{LaTeX is missing}\fi \documentstyle{book} \let\cleardoublepage=\clearpage \textwidth=469.75499pt \textheight=643.20255pt \topmargin=-0.5in \oddsidemargin=0pt \evensidemargin=0pt \begin{document} \hbadness=10000 \vbadness=10000 \hfuzz=99in \vfuzz=\hfuzz \tableofcontents \begingroup % \def\:amp{#2} \def#1{\begingroup \catcode`\ =12 \catcode`\^^M=12 \catcode`\^^I=12 \expandafter\catcode\:CntrlChar=12 \:doAmp } % \def\:doAmp##1{\endgroup \if ##1< \def\:next####1#1>{\<####1\>}% \else \def\:next{##1}% \ifx \:next\:amp \else\if ##1c \def\:next{\:sect\chapter}% \else\if ##1s \def\:next{ \vfil\:sect\section}% \else\if ##1u \def\:next{ \vfil\:sect\subsection}% \else\if ##1v \def\:next{\expandafter\def\csname\string @xverbatim\endcsname########1#2{% ########1\end{verbatim}\egroup}% \bgroup\expandafter\catcode\:CntrlChar=12 \begin{verbatim}}% \else\if ##1o \def\:next####1#1<####2#1>{\OutputCode####1\<####2\>}% \else\if ##1n \def\:next{\ClearCode}% \else\if ##1e \def\:next{\endgroup\end{document}}% \else \edef\:next{\noexpand\errmessage{\:amp##1?}}% \fi\fi \fi\fi \fi\fi \fi\fi \fi \:next } % \:NoSpecials{12}{0}{255} \catcode`\ =10 \catcode`\^^M=5 \catcode`\^^I=10 \escapechar=\:CntrlChar \expandafter\catcode\:CntrlChar=13 } \def\:specialactive{\catcode`\_=13 \catcode`\~=13 \catcode`\\=13 \catcode`\#=13 \catcode`\$=13 \catcode`\%=13 \catcode`\^=13 \catcode`\&=13 \catcode`\{=13 \catcode`\}=13 } \def\:sect{\begingroup \:specialactive \::sect} \catcode`\/=0 \catcode`\[=1 \catcode`\]=2 \catcode`\@=6 \catcode`\*=14 \:specialactive /def/::sect at 1@2/par[/endgroup/begingroup /def~[/bgroup/tt/char126/egroup]* /def\[/bgroup/tt/char92/egroup]* /def#[/bgroup/tt/char35/egroup]* /def$[/bgroup/tt/char36/egroup]* /def%[/bgroup/tt/char37/egroup]* /def^[/bgroup/tt/char94/egroup]* /def_[/bgroup/tt/char95/egroup]* /def&[/bgroup/tt/char38/egroup]* /def{[/bgroup/tt/char123/egroup]* /def}[/bgroup/tt/char125/egroup]* /escapechar=92 @1[@2]/endgroup] /catcode`/\=0 \catcode`\#=6 \catcode`\$=3 \catcode`\%=14 \catcode`\^=7 \catcode`\&=4 \catcode`\{=1 \catcode`\}=2 \catcode`\_=8 \catcode`\/=12 \catcode`\[=12 \catcode`\]=12 \catcode`\@=11 \catcode`\*=12 \else \let\:CntrlChar=\:undefined \def\:notex{\let\:notex=\:undefined} \fi \:CheckOption{<<<>>>} \if:Option \def\:OpenCode#1#2{\def\:OpenCode{#1}\def\:CloseCode{#2}} \edef\:CloseCode{\noexpand\:OpenCode \ifx \CodeDel\:UnDefined{<<<}{>>>}\else \CodeDel\fi } \:CloseCode \let\:ModifyAppendCodeI=\ModifyAppendCode \catcode`\^^M=13 \edef\ModifyAppendCode{% \catcode`\noexpand\{=12 \catcode`\noexpand\}=12 % \let\noexpand\::ScanAppend=\noexpand\:ScanAppend % \def\noexpand\:ScanAppend\:OpenCode##1^^M##2\:CloseCode{% \noexpand\::ScanAppend{##2}}% \noexpand\:ModifyAppendCodeI}% \catcode`\^^M=5 \fi \:CheckOption{[]} \if:Option \else \:CheckOption{[[]]}\fi \def\:temp{} \if:Option \def\:temp{\csname newdimen\endcsname\:BoxDepth} \def\WindowTitle#1{{\leavevmode \leftskip=0em \rightskip=0em \parindent=0em \:BoxDepth=0.4pt \setbox0=\hbox{#1}% \advance\:BoxDepth by \dp0 \advance\:BoxDepth by 0.4mm \raise -\:BoxDepth \hbox{\vrule \vbox{\hrule \vskip 0.4mm \hbox{\hskip 0.4mm\relax #1\hskip 0.4mm}% \vskip 0.4mm \hrule}% \vrule}}} \let\:ModifyShowCodeIII=\ModifyShowCode \def\ModifyShowCode#1{\:ModifyShowCodeIII{#1}% \def\PortTitle##1{\WindowTitle{\WindowTitle{##1}}}% \def\:BackTitle{\hbox{---}}} \fi \:temp \:CheckOption{[[]]} \def\:temp{} \if:Option \let\:ShowCodeI=\:ShowCode \def\:ShowCode#1{\par\:FrameCode{\:ShowCodeI{#1}}} \def\:FrameCode#1{\vtop{% \advance\hsize by -\leftskip \noindent\vrule \vtop{\leftskip=0pt \advance\hsize by -0.8pt \hrule#1\hrule}\vrule}\vskip3pt minus1pt\relax} \let\:ModifyShowCodeV=\ModifyShowCode \def\ModifyShowCode#1{\:ModifyShowCodeV{#1}% \let\PortTitle=\:PortTitleI \def\:BottomTitle{}} \def\:PortTitleI#1{{\parindent=0pt \leftskip=0pt plus 0.5\hsize \rightskip=\leftskip #1\par \vskip-1ex \noindent\dotfill\null}} \let\:ModifyShowLastCodeI=\ModifyShowLastCode \def\ModifyShowLastCode#1{\:ModifyShowLastCodeI{#1}% \advance\leftskip by -2em } \fi \:temp \:CheckOption{list} \if:Option \def\:show{% \ifx \:title\empty \def\:show{\ShowCode-}% \else \def\:show{\ShowCode}% \fi \:show} \fi \catcode`\-=13 \catcode`\+=13 \if:Option \def\AfterCode#1{{% \def-##1##2{\def\:title{##1}}% \let+=\:ignoreII #1\relax \:show #1}} \def\:ignoreII#1#2{} \fi \catcode`\-=12 \catcode`\+=12 \:CheckOption{enumerate} \def\:temp{} \if:Option \def\:temp{\csname newcount\endcsname\:LineCount} \let\:ModifyShowLastCode=\ModifyShowLastCode \def\ModifyShowLastCode{\everypar={\:CountLines {\it \:ShowLineCount \quad}}% \let\:BottomTitleX=\:BottomTitle \def\:BottomTitle{\everypar={}\:BottomTitleX}% \:ModifyShowLastCode} \def\ResetLineCount{ \global\:LineCount=0 } \def\ShowLineCount{\def\:ShowLineCount{\ifnum\:LineCount<100 0\fi \ifnum\:LineCount<10 0\fi \the\:LineCount}} \def\HideLineCount{\def\:ShowLineCount{}} \def\ContLineCount{\def\:CountLines{\global\advance\:LineCount by 1 }} \def\PauseLineCount{\def\:CountLines{}} \ShowLineCount \ContLineCount \def\TagLine[#1]{% \edef\:temp{\noexpand\Tag\noexpand{C #1\noexpand}\noexpand{% \the\:LineCount\noexpand}}\:temp} \def\RefLine[#1]{\Ref{C #1}} \let\:ModifyOutputCodeZ=\ModifyOutputCode \def\ModifyOutputCode{\def\RefLine[##1]{}% \def\TagLine[##1]{}\:ModifyOutputCodeZ} \fi \:temp \:CheckOption{ClearCode} \if:Option \gdef\:EraseCode{} \def\ModifyCode#1{% \let\clearcode:id=\clearcode::id \def\:temp{\gdef\:EraseCode}% \expandafter\expandafter\expandafter \:temp\expandafter{\:EraseCode~#1}} \def\ClearCode{{% \def~##1{\global\let##1=\:undefined}% \:EraseCode \:CodeNumber=\clearcode::id \advance\:CodeNumber by 1 \xdef\clearcode::id{\the\:CodeNumber } }% \gdef\:EraseCode{}} \let\:ModifyShowCodeVI=\ModifyShowCode \let\:AfterCodeI=\AfterCode \let\:RefLineI=\RefLine \let\:TagLineI=\TagLine \def\ModifyShowCode#1{\:ModifyShowCodeVI{#1}% \def\RefLine[##1]{{\def\clearcode:id{0}\:RefLineI[##1]}}% \def\TagLine[##1]{{\def\clearcode:id{0}\:TagLineI[##1]}}% \let\clearcode:id=\clearcode::id} \def\AfterCode#1{\:AfterCodeI{#1}\def\clearcode:id{0}} \ifx\clearcode:id\:UnDef \gdef\clearcode:id{0} \gdef\clearcode::id{0} \fi \fi\:CheckOption{LibCode} \if:Option \def\LibCode{\bgroup \catcode`\ =9 \catcode`\^^M=9 \catcode`\^^I=9 \catcode`\,=13 \:LibCode} \def\:LibCode[#1]{\catcode`\,=12 \:LibC[#1]} \catcode`\,=13 \catcode`\^^M=13 \def\:LibC[#1]#2(){\egroup % \def,{ \noexpand\input\space}% \edef\:LibFiles{\noexpand\:checkoption , #1 }% \def\:next{\let\:xparms=\:parms % \begingroup % \let\LibCall=\:LibCall % \def\AddLibCall####1{}% \def\AddNestedLibCall####1{}% \def\ifLibEnd{\csname ifx\endcsname\:parms\empty}% \csname :LibFiles\endcsname \Comment{}{}% \FreeCode\<\:TempFileName\> \<\:TempFileName\><<< \ >>> % \edef\:temp{\noexpand\OutputCodE \noexpand\<\:TempFileName\noexpand\>}% \:temp \input \:TempFileName % \endgroup % \::LibC }% \def\:parms{#2}% \let\:xparms=\empty \::LibC % \let\:parms=\:UnDef \let\:xparms=\:UnDef}% \def\LibTempFileName#1{\def\:TempFileName{#1}} \LibTempFileName{lib.lib} \catcode`\,=12 \catcode`\^^M=9 \def\::LibC{% \ifx \:parms\empty \let\:next=\relax \else\ifx \:parms\:xparms \let\:next=\relax \:warn{No code for \string\LibCode\space\:parms} \fi\fi \:next} \def\LibShow#1{{\tt\par--- Include library component #1}} \def\:LibShow#1{% \AddLibCall{#1}% \LibShow{#1}} \def\:LibCall(#1,#2,#3){% \xdef\:parms{% (#1,#2,#3)% \:parms}% \def\temp{\global\let}% \expandafter\temp\csname#2 \endcsname=\:LibShow \gdef\:LibShow##1{% \AddNestedLibCall{(#1,#2,#3)}% \def\temp{\global\let\:LibShow=}% \expandafter\temp\csname#2 \endcsname }% } \def\:checkoption{% \def\:ShowCode##1{}% \def\ProTexMssg##1{}% % \def\ifoption##1{% \let\:rparms=\:parms \def\parms{}% \def\:lparms{}% \def\:cond{##1}% \def\:type{}% \let\:next=\:ifoption \:next \xdef\:parms{\:lparms\parms\:rparms}% \csname ifx\endcsname \:type\:cond \xdef\:parms{\:lparms\:rparms}% \edef\:next{\noexpand\:LibShow{\parms}}% \:next }% % \def\:ifoption{% \expandafter\:getoption\:rparms()% \ifx \:type\:cond \let\:next=\relax \fi \:next }% % \def\:getoption##1(){% \def\:temp{##1}% \ifx \:temp\empty \let\:next=\relax \else \::getoption##1()\fi }% % \def\::getoption(##1,##2,##3)##4(){% \edef\:lparms{\:lparms\parms}% \def\parms{(##1,##2,##3)}% \def\:rparms{##4}% \def\:type{##2}}% } \fi\def\TextIndex#1{} \def\SecIndex#1{} \def\ShowIndex{\:warn{\string\ShowIndex?}} \:CheckOption{ShowIndex} \def\:temp{} \catcode`\-=13 \catcode`\+=13 \if:Option \def\:temp{\csname newcount\endcsname \:IdxCount} \def\:GetTrc{% \immediate\read15 to \:x \ifx \:PAR\:x \let\:GetTrc=\relax \else \expandafter\:AddEntry\:x \fi \:GetTrc} \def\:PAR{\par} \def\:AddEntry#1{\def\:cs{#1}\futurelet\:p\:RemoveField} \def\:RemoveField{\ifx .\:p \def\:next##1 {\:AppendEntry} \else \let\:next=\:AppendEntry \fi \:next} \def\:AppendEntry#1#2#3{\def\:y{#1}% \ifx \:y\:NS \AppendCode\:idx{\endgroup \:Section{#2}{#3}\begingroup}% \expandafter\let\csname :idx\the\:IdxCount\endcsname=\:idx \def\:temp{\Code\:idx{}}% \expandafter\expandafter\expandafter\:temp\expandafter {\csname :idx\the\:IdxCount\endcsname}% \advance\:IdxCount by 1 \else\ifx \:y\:V \expandafter\ifx \csname :\:Title #2;;:\endcsname\relax \expandafter\Code\csname :\:Title #2;;:\endcsname{}{\?{#2}}% \fi \expandafter\AppendCode\csname :\:Title #2;;:\endcsname{ #3}% \:AddIdx{\csname :\:Title #2;;:\endcsname}% \else \edef\:cs{\expandafter\string\:cs.:} \edef\:cs{\expandafter\noexpand\csname\:cs\endcsname} \ifx \:y\:DT \expandafter\Code\:cs{}{\tr{#2}}% \else\ifx \:y\:ST \expandafter\AppendCode\:cs{ \underbar{#3}}% \:AddIdx{\:cs}% \else\ifx \:y\:SC \expandafter\AppendCode\:cs{ #3}% \:AddIdx{\:cs}% \fi\fi\fi\fi\fi}\def\:AddIdx{% \def\:y{\AppendCode\:idx}% \expandafter\expandafter\expandafter\:y\expandafter} \def\SecIndex#1{{\let\:refout=\:trcfile \def\:TagCs{.}% \Tag{section}{{#1};;}}} \def\TextIndex#1{{\let\:refout=\:trcfile \def\:TagCs{.}% \Tag{user}{#1;;}}} \let\i:ModifyShowCode=\ModifyShowCode \let\i:ModifyOutputCode=\ModifyOutputCode \def\ModifyOutputCode{% \ifx \:OpenCode\:UnDef \def\TextIndex##1{}% \else \let\TextIndex=\Text:Index \fi \i:ModifyOutputCode} \def\ModifyShowCode{% \ifx \:OpenCode\:UnDef \else \let\TextIndex=\::TextIndex \fi \i:ModifyShowCode } \let\:TextIndex=\TextIndex \catcode`\[=1 \catcode`\{=12 \catcode`\]=2 \catcode`\}=12 \def\::TextIndex{#1}[\:TextIndex[#1]] \def\Text:Index{#1}[] \catcode`\[=12 \catcode`\{=1 \catcode`\]=12 \catcode`\}=2 \def\:V{user} \def\:DT{DefineTitle} \def\:ST{ShowTitle} \def\:SC{ShowCode} \def\:NS{section} \def\:Title#1;;#2;;{#1} \def\:TitleA#1;;#2;;{$\triangleleft\triangleleft$ #1 $\triangleright\triangleright$} \def\:Index{\vfil\eject \Comment{}{}% \immediate\closeout\:trcfile \def\ModifyShowCode##1{}% \def\ModifyAppendCode##1{}% \def\ModifyFrontTitle##1{}% \def\ModifyShowLastCode##1{##1}% \def\AfterCode##1{}% \def\:WriteTrc##1{}% \let\:TraceDef=\:ignoreII \def\:warn##1{}% \def\:gobble##1{}% \let\CodeId=\:ignoreII \def\ModifyOutputCode##1{\def\:FileName{\jobname.xidx}}% \Code\:idx{}{\BeforeIndex\begingroup}% \:PauseIndex \immediate\openin15=\:jobname \:GetTrc \AppendCode\:idx{\endgroup}% {\def\?##1{\par\noindent{\tt\:Title ##1;;}\hfill}% \def\tr##1{\par\noindent{\tt\:TitleA ##1;;}\hfill}% \def\:Section##1##2{{\bf\smallskip\noindent{\:Title ##1;;}\hfill ##2\smallskip}}% \def\ModifyShowLastCode##1{% \leftskip=0pt \rightskip=0pt \def\:LastCode{\:idx}% \:SetShowIndex}% \let\:FrameCode=\empty \expandafter \ShowCode\:minus\:idx }} \def\:ignoreII#1#2{} \def\:SetShowIndex{\def-##1##2{\expandafter\def\csname \expandafter\:gobble##2\endcsname{}}% \def+##1##2{##1}} \def\BeforeIndex{} \def\:PauseIndex{} \def\PauseIndex{\def\PauseIndex{\immediate\read16 to \PressReturn}} \def\ShowIndex{{% \let\:SvCode=\Code \def\Code##1{\ModifyCode{##1}\:SvCode##1}% \ifx \::AddEntry\:undefined \else \let\:AddEntry=\::AddEntry \fi \:Index \global\let\:idx=\:undefined }% \xdef\:jobname{\jobname.trc\the\pageno}% \immediate\openout\:trcfile=\:jobname \relax } \xdef\:jobname{\jobname.trc} \fi \catcode`\-=12 \catcode`\+=12 \:temp \:CheckOption{title+} \if:Option \def\:temp{\def\AlProTex} \def\temp:{title,} \expandafter\expandafter\expandafter\expandafter\expandafter \expandafter\expandafter\:temp\expandafter\expandafter \expandafter{\expandafter \temp:\AlProTex} \fi \:CheckOption{title} \if:Option \def\:Name#1{<#1\string\>\endcsname} \def\:DoName#1{\expandafter#1\csname\:Name} \def\getTitle:env{\catcode`\_=11 }% \def\<{\bgroup \getTitle:env \cont:title}% \def\cont:title#1\>{\egroup\edef\CodeInputLineNo{\the\inputlineno}% \:DoName\ifx{#1}\relax \edef\:temp{\noexpand\Code\:DoName \noexpand{#1}\noexpand{#1\noexpand}}% \:DoName\let{#1}=\:undefined \else \def\:temp{\:DoName\AppendCode{#1}}\fi\:temp} \catcode`\.=10 \catcode`\ =13 \let\:ModifyShowCodeIV=\ModifyShowCode% \def\ModifyShowCode{% ..\def\:gobble##1{}% ..\def\<##1\>{{\def {\space}% ...\:DoName\ifx{##1}\relax% .....\let\AppendCode=\:gobble% .....\:DoName\Code{##1}{##1}{}\fi% ..\csname\:Name{##1}}}\:ModifyShowCodeIV}% \def\:OutputCodeI#1\<#2\>{% ...\let\:SaveSp= \def {}% ...\def\:temp{#2}% ...\ifx\:temp\empty.\def\:temp{ProTexOutput}% ...\else.\let\:temp=\empty.\fi% ...\expandafter\ifx.\csname.\:temp#2\endcsname\relax% ...\else.\immediate\write16{---.AlProTex. warning.---.% ......\string\OutputCode#1% ......\string\<#2\string\>\space.temporarily\space.% ......redefines.\:backslash#2}\fi% ...\edef\:FileName{\:temp#2}% ...\let =\:SaveSp% ...\expandafter\def\csname\:FileName\endcsname{\csname\:Name{#2}}% ...\def\:tempa{\:OutputCodeIV#1}% ...\expandafter\:tempa\csname\:FileName\endcsname% ..\endgroup}% \catcode`\ =10\catcode`\.=12 \let\:OutputCodeIV=\OutputCode \def\OutputCode{% \begingroup \def\<##1\>{\csname\:Name{##1}}% \let\:WriteTrcI=\:WriteTrc \def\:gobble##1{}% \def\:WriteTrc{\edef\:TagCs{\string\<\expandafter\expandafter \expandafter\:gobble \:TagCs\string\>}% \:WriteTrcI} \catcode` =13 \:OutputCodeI} \def\OutputCodE\<#1.#2\>{{ \:DoName\def{#1}{\<#1.#2\>} \OutputCode[#2]\<#1\>}} \def\FreeCode\<#1\>{{% \def\temp##1{\global\let##1=\:UnDefined}% \:DoName\temp{#1}}} \def\ShowCode#1{% \def\:test{#1}% \ifx \:test\:minus \def\:next{\:iname\:ShowCode}\else \def\:next{\:iname\:ShowCode#1}\fi \:next} \def\:iname#1#2{\def\:next{#2}\def\:temp{\<}% \ifx \:next\:temp \def\:next##1\>{\expandafter#1\csname\:Name{##1}}\else \def\:next{#1#2}\fi \:next} \def\::AddEntry#1{% \ifx #1\< \let\:Next=\:AddEntryA \else \def\:Next{\def\:cs{#1}\:AddEntryB}\fi \:Next } \def\:AddEntryA#1\>{% \edef\:cs{\expandafter\noexpand \csname#1:.\endcsname}\:AddEntryB} \def\:AddEntryB{% \futurelet\:p\:RemoveField}% \def\:RemoveField{\ifx .\:p \def\:next##1 {\:AppendEntry}% \else \let\:next=\:AppendEntry \fi \:next} \let\id:WriteTrc=\:WriteTrc \def\:WriteTrc#1{% \def\:temp{#1}\def\:tempa{ShowTitle}\ifx\:temp\:tempa \expandafter\def\expandafter\:TagCs\expandafter {\:TagCs.\the\:CodeNumber}% \fi \id:WriteTrc{#1}} \:CheckOption{macro} \if:Option \let\:saveMusp=\> \def\>{\ifmmode \expandafter\:saveMusp \else \expandafter\:CodeMacro \fi } \def\:CodeMacro(#1)#2\<{% \begingroup \:getcodeprms(\string\1,\string\2,\string\3,\string\4,% \string\5,\string\6,\string\7,\string\8,\string\9)% \xdef\:temp{()#2}% \endgroup \def\:next{#1}% \ifx\:next\empty \expandafter\ifx\csname\:temp\space :<\endcsname\relax \ifx\:EraseCode\:UnDef\else \expandafter\:adderase \csname\:temp\space :<\endcsname \fi \else \:warn{Redefine \string\>\:temp\string\<}% \fi \def\:next{\expandafter\:getpseducode \csname\:temp\space :<\endcsname{#2}}% \else \begingroup \:getcodeprms(#1,,,,,,,,,)% \:protectcommands \ModifyIndirectCode{(#1)#2}% \xdef\:next{\csname\:temp\space :<\endcsname}% \endgroup \fi \:next} \def\:adderase#1{% \def\:next{\gdef\:EraseCode}% \expandafter\expandafter\expandafter\:next\expandafter{\:EraseCode~#1}% } \def\:getpseducode#1#2{\begingroup \:defaultcats \ModifyAppendCode{}% \:getpseducodeI#1{#2}} \def\:getpseducodeI#1#2#3{\endgroup \def#1{\<#2\>{#3}}% }% \def\:getpseducodeII{% \ifx \:OpenCode\:UndDef \else \edef\:getpseducodeI{% \def\noexpand \:getpseducodeI####1####2####3\:OpenCode####4\:CloseCode{% \endgroup \def\noexpand\:temp{####3}% \noexpand\ifx\noexpand\:temp\noexpand\empty \def####1{\noexpand\<####2\noexpand \>\:OpenCode####4\:CloseCode}% \noexpand\else \errmessage{\string\>()...\string \<...?...\:OpenCode...\:CloseCode} \let####1=\noexpand\:UnDef \noexpand\fi }% }% \:getpseducodeI \fi \let\:getpseducodeII=\:UndDef } \catcode`\ =13 \catcode`\^^M=13 \catcode`\^^I=13 \catcode`\#=14 \catcode`\%=12 \def\:protectcommands{# \let\<=\relax# \let\>=\relax# \let\%=\csname# \expandafter\let\%NL%\endcsname=\relax# \let\%=\relax# \let\ =\relax# \let^^M=\relax# \let^^I=\relax# \ifx\TagLine\:UnDef\else\let\TagLine=\relax\fi# \ifx\RefLine\:UnDef\else\let\RefLine=\relax\fi# } \catcode`\#=6 \catcode`\%=14 \catcode`\ =10 \catcode`\^^M=9 \catcode`\^^I=10 \def\ModifyIndirectCode#1{} \def\:getcodeprms(#1,#2,#3,#4,#5,#6,#7,#8,#9){% \def\1{#1}% \def\2{#2}% \def\3{#3}% \def\4{#4}% \def\5{#5}% \def\6{#6}% \def\7{#7}% \def\8{#8}% \def\9##1,##2){\def\9{##1}}% \9#9,)} \fi \:CheckOption{title}\if:Option \def\TitleAlias#1#2{% \expandafter\let\csname C\string#1\endcsname=\<% \expandafter\let\csname O\string#1\endcsname=\OutputCode \def\<##1\>{\def\:temp{##1}\def\:tempa{#2}% \ifx \:temp\:tempa \def\:temp{\csname C\string#1\endcsname#1\>}\else \def\:temp{\csname C\string#1\endcsname##1\>}\fi \:temp} \def\OutputCode##1\<##2\>{\def\:temp{##2}\def\:tempa{#2}% \ifx \:temp\:tempa \def\:temp{\csname O\string#1\endcsname##1\<#1\>}% \else \def\:temp{\csname O\string#1\endcsname##1\<##2\>}\fi \:temp}} \fi \fi \:CheckOption{eline} \catcode`\%=12 \if:Option \let\:ModifyOutputCodeJ=\ModifyOutputCode \def\ModifyOutputCode{\def\:Ln{ %^^J}\:ModifyOutputCodeJ} \fi \catcode`\%=14 \:CheckOption{ShowFile} \if:Option \catcode`\^^I=13\catcode`\ =13\catcode`\^^M=13% \def\:ObeyIn{\CodeFont\parindent=0pt% \parskip=0pt\everypar{}% \:NoSpecials{12}{0}{255}\catcode`\ =13% \catcode`\^^M=13\catcode`\^^I=13% \def^^M{\leavevmode\par}\def^^I{ }% \def {\leavevmode\:Sp}}% \catcode`\^^M=5\catcode`\ =10\catcode`\^^I=10 \expandafter\ifx \csname :Sp\endcsname\relax \expandafter\def\csname :Sp\endcsname{ } \fi \def\ShowFile#1{{\:ObeyIn \openin15=#1 \ifeof15 \:warn{\string\ShowFile{#1}?}\else \input #1 \fi \closein15 }} \else \def\ShowFile#1{\:warn{\string\ShowFile?}} \fi\let\Note=\empty \let\EndNote=\empty \:CheckOption{NoShow} \if:Option \let\:svShowCode=\:ShowCode \def\ShowOn{\let\Note=\empty \let\:ShowCode=\:svShowCode} \def\ShowOff{\let\Note=\:NoShow \def\:ShowCode##1{}} \def\:NoShow{\begingroup \:NoSpecials{11}{0}{255}\:EndNoShow} \catcode`\/=0 \catcode`\\=11 /def/:EndNoShow#1\EndNote{/endgroup} /catcode`/\=0 /catcode`//=12 \fi\:CheckOption{ShowTop} \catcode`\-=13 \catcode`\+=13 \if:Option \def\:ShowTop#1{{\par \def\ModifyFrontTitle##1{\def\:AppendSign{}}% \def\ModifyShowLastCode##1{\let\:save=-% \def\:LastCode{#1}% \def-####1####2{\let-=\:save}% \def+####1####2{{\ShowSep\let+=\:ignoreII ####1}}}% \ShowCode#1}} \def\ShowSep{} \def\ShowTop{\:iname\:ShowTop} \def\:ignoreII#1#2{} \def\:iname#1#2{\def\:next{#2}\def\:temp{\<}% \ifx \:next\:temp \def\:next##1\>{\expandafter#1\csname\:Name{##1}}\else \def\:next{#1#2}\fi \:next} \fi \catcode`\-=12 \catcode`\+=12 \def\LinkPort{\:HRefCode{)\clearcode:id P:}} \def\LinkWindow{\:HRefCode{)\clearcode:id Z:}} \def\:HRefCode#1\<#2\>{} \:CheckOption{info} \if:Option \let\inf:ModifyOutputCode=\ModifyOutputCode \def\ModifyOutputCode#1{% \inf:ModifyOutputCode{#1}% \expandafter\ifx \csname \Extension :cdinfo\endcsname \relax \else \edef\:FileName{\:FileName}% \expandafter\expandafter\csname \Extension :cdinfo\endcsname \:FileName!*?: % \fi } \def\CodeInfo{\futurelet\:temp\cd:inf} \edef\cd:inf{\noexpand\ifx [\noexpand\:temp \let\noexpand\:temp=\noexpand\cdi:nf \noexpand\else \def\noexpand\:temp{\noexpand\cdi:nf [\:InitAlProTex]}\noexpand\fi \noexpand\:temp} \def\cdi:nf[#1]{\expandafter\def\csname #1:cdinfo\endcsname##1.##2!*?: } \fi \ifx \HCode\:UnDef \ifx \Htmltrue\:UnDef \def\:temp{\csname newif\endcsname} \expandafter\:temp \csname ifHtml\endcsname \Htmlfalse \fi \def\EndLink{\ifx \empty:lnk\empty \HCode{}\fi} \def\:HRef{\ifx [\:temp \expandafter\::HRef \else \expandafter\:::HRef \fi } \def\HT:tag{\ifx -\let:val \expandafter\H:Tag \else \expandafter\HTa:g\fi } \def\HTa:g{\H:Tag-} \def\Link{\let\:attr\empty \futurelet\let:val\HRefT:ag} \def\HRefT:ag{\ifx -\let:val \expandafter\H:RefTag \else \expandafter\HRefTa:g\fi } \def\HRefTa:g{\H:RefTag-} \def\H:RefTag#1{\futurelet\:temp\:HRefTag} \def\:HRefTag{\ifx [\:temp \expandafter\::HRefTag \else \expandafter\:::HRefTag \fi } \def\HCode#1{} \def\H:Tag#1#2{} \def\::HRef[#1]#2{} \def\:::HRef#1{} \def\::HRefTag[#1]#2#3{} \def\:::HRefTag#1#2{} \def\:TagHTag#1{} \fi \:CheckOption{html} \if:Option \else \:CheckOption{xhtml}\fi \if:Option \def\WindowTitle#1{\leavevmode\hbox{% \disable: \expandafter\ifx\csname \clearcode:id W-#1\endcsname\relax \let \:temp=\empty \else \edef\:temp{ \HREF:"\expandafter\get:href \csname \clearcode:id W-#1\endcsname -"}% \fi \html:addr \HCode{<\tag:A\:newlnch \NAME:"\expandafter\get:htag\last:haddr -"\:temp >}\ttl:del{<.}\HCode{}% \expandafter\expandafter\expandafter\global\expandafter\let \csname \clearcode:id W-#1\endcsname=\last:haddr % \expandafter\ifx\csname \clearcode:id :cw:#1\endcsname\relax \expandafter\expandafter\expandafter\global \expandafter\def\csname \clearcode:id :cw:#1\endcsname{0}% \Tag{)\clearcode:id Z:#1}{\last:haddr}% \fi \frag:href{)\clearcode:id P:#1}{}#1\HCode{}% % \:nextlink{\clearcode:id :cw:#1}{.>}% % }} \def\disable:{\let\rm=\empty \let\tt=\empty \let\sl=\empty \let\bf=\empty \let\it=\empty } \def\frag:href#1#2{% \HCode{<\tag:A\:newlnch \HREF:"% \expandafter\ifx \csname cw:#1\endcsname \relax \expandafter\get:href\last:haddr -% \else \expandafter\expandafter\expandafter\get:href\csname cw:#1\endcsname -% \fi "#2>}} \def\html:PortTitle#1{\hbox{% \disable: \bgroup \def\:Sp{\space}% \html:addr \ifx\:AppendSign\empty \HCode{<\tag:A\:newlnch \NAME:"\get:htag\last:haddr-">}% \expandafter\expandafter\expandafter\global\expandafter\edef \csname \clearcode:id 9:#1\endcsname{0}% \else \HCode{<\tag:A\:newlnch \HREF:"\expandafter\get:href \csname \space\clearcode:id P:#1\endcsname-" \NAME:"\get:htag\last:haddr-">}% \fi \ttl:del{<..}\HCode{}% \expandafter\expandafter\expandafter\global\expandafter\let \csname \space\clearcode:id P:#1\endcsname=\last:haddr \egroup % \bgroup \def\:Sp{\space}% \ifx\:AppendSign\empty \Tag{)\clearcode:id P:#1}{\last:haddr}% \fi \frag:href{)\clearcode:id Z:#1}{\ifx \:LastCodeLabel\empty \else \expandafter\html:codeid\:LastCodeLabel\fi % }% \egroup #1\HCode{}% % \:nextlink{\clearcode:id 9:#1}{..}% % }} \def\:HRefCode#1\<#2\>{{% \let\clearcode:id=\clearcode::id \expandafter\ifx\csname cw:#1#2\endcsname\relax \HCode{<\tag:A>}\else \HCode{<\tag:A\:newlnch \HREF:"}\expandafter\get:href \csname cw:#1#2\endcsname -\HCode{">}% \fi}} \def\:nextlink#1#2{% \bgroup \def\:Sp{\space}% \def\:lbl{)\the\tmp:cnt :#1}% \tmp:cnt=\csname #1\endcsname\space \html:addr \Tag{\:lbl}{\last:haddr}% \advance\tmp:cnt by 1\space \expandafter\xdef\csname #1\endcsname{\the\tmp:cnt}% \expandafter\ifx\csname cw:\:lbl\endcsname\relax \HCode{<\tag:A\:newlnch \NAME:"\expandafter\get:htag\last:haddr-">}% \else \HCode{<\tag:A\:newlnch \NAME:"\expandafter\get:htag\last:haddr-"\space \HREF:"\expandafter\expandafter\expandafter \get:href\:LikeRef{\:lbl}-">}% \fi \ttl:del{#2>}\HCode{}% \egroup } \def\:LikeRef#1{\csname cw:#1\endcsname} \let\html:ShowCode=\ShowCode \def\ShowCode{\par \html:ShowCode} \let\html:ModifyShowCode=\ModifyShowCode \def\ModifyShowCode#1{% \def\%##1\%{\c:protex##1\d:protex}% \html:ModifyShowCode{#1}% \let\PortTitle=\html:PortTitle \let\:FrontTitle=\frnt:ttl \def\:BackTitle{\b:protex\par}% \let\:CodeSkip=\empty \def\:TopTitle##1{{\:FrontTitle{##1}}}% \def\:BottomTitle{\:BackTitle}% \let\html:ModifyShowLastCode=\ModifyShowLastCode \ifx\:ModifyShowLastCode\:UnDeF \def\:CntLines##1{}\else \def\:CntLines{\:CountLines}\fi \def\ModifyShowLastCode##1{% \ifx \:test\:minus \def\:CodeSkip{{\par\parindent=0pt\leftskip=0pt \everypar{}\b:protex\par}% \global\:removeindenttrue}% \leavevmode\a:protex\par \else \global\:removeindenttrue \fi \html:ModifyShowLastCode{##1}% \everypar{\e:protex \:CntLines {\it \:ShowLineCount \quad}}% }% \f:protex % } \def\frnt:ttl#1{{\htmlprotex:par {\expandafter\ifx \csname ListCounter\endcsname\relax \else \:removeindentfalse \fi \leavevmode}% \PortTitle{#1}\:AppendSign}\a:protex }% \def\a:protex{% % \ifvmode \csname IgnorePar\endcsname % \else \hfil\break\fi % \csname EndP\endcsname \HCode{\ifx \:test\:minus \else
\fi \html:src\html:invisible}% \nobreak % \hskip\leftskip \hskip\parindent } \def\b:protex{\HCode{\html:BackTitle\html:src}} \def\e:protex{\HCode{
\html:invisible}} \def\c:protex{\HCode{}} \def\d:protex{\HCode{}} \def\f:protex{\def\:Sp{\HCode{\string }}} \long\def\c:ShowCode:#1#2#3#4#5#6{\def\a:protex{#1}% \def\b:protex{#2}\def\e:protex{#3}\def\c:protex{#4}% \def\d:protex{#5}\def\f:protex{\def\:Sp{#6}}} \def\L:Del{<..} \def\l:Del{<.} \def\R:Del{..>} \def\ttl:del#1{\def\:tempa{#1}% \ifx \:tempa\L:Del \L:del \else \ifx \:tempa\l:Del \l:del \else \ifx \:tempa\R:Del \R:del \else \r:del \fi\fi\fi} \def\HShowCode#1#2#3#4#5{% \def\:temp{#1#2}\ifx \:temp\empty \else \def\L:del{#1}\def\R:del{#2}\fi \def\:temp{#3#4}\ifx \:temp\empty \else \def\l:del{#3}\def\r:del{#4}\fi \def\:temp{#5}\ifx \:temp\empty \else \def\html:BackTitle{#5}\fi } \bgroup \catcode`\_=12 \gdef\:temp{\HShowCode{<..}{..>}{<.}{.>}{-_-_-}} \aftergroup\:temp \egroup \let\html:ProTexMssg=\ProTexMssg \def\ProTexMssg{% {\let\:gobble=\empty\def\:TagCs{\:FileName}\:WriteTrc{FileName}}% \html:ProTexMssg } \catcode`\^^I=13\catcode`\ =13\catcode`\^^M=13% \def\:ObeyIn{\CodeFont\parindent=0pt% \parskip=0pt\everypar{}% \:NoSpecials{12}{0}{255}\catcode`\ =13% \catcode`\^^M=13\catcode`\^^I=13% \def^^M{\leavevmode\e:protex\par}\def^^I{ }% \def {\leavevmode\:Sp}}% \catcode`\^^M=5\catcode`\ =10\catcode`\^^I=10 \expandafter\ifx \csname :Sp\endcsname\relax \expandafter\def\csname :Sp\endcsname{ } \fi \def\ShowFile#1{{\:ObeyIn \openin15=#1 \ifeof15 \:warn{\string\ShowFile{#1}?}\else \a:ShowFile\input #1 \b:ShowFile \fi \closein15 }} \def\a:ShowFile{\ifvmode \csname IgnorePar\endcsname\fi \csname EndP\endcsname \HCode{
\html:src\html:invisible}\hfill\break \f:protex } \def\b:ShowFile{\HCode{
\html:src}} \long\def\c:ShowFile:#1#2{\def\a:ShowFile{#1}\def\b:ShowFile{#2}} \def\html:codeid#1Q#2"#3{ \NAME: "Q#2"} \ifx \aXrefFile\:UnDef \let\aXrefFile=\empty \fi \def\CodeId#1#2{\expandafter\ifx \csname cw:)F\aXrefFile \file:id \empty F-\endcsname\relax \else\:LikeRef{)F\aXrefFile \file:id\empty F-}\fi \:sharp Q\make:addr{#2}"#1% \ifx \CodeInputLineNo\:UnDef \the\inputlineno \else \CodeInputLineNo\fi} \let\showttl:WriteTrc=\:WriteTrc \def\:WriteTrc#1{% \def\:temp{#1}\def\:tempa{ShowCode}\ifx\:temp\:tempa \def\:TagCs{\expandafter\trc:shw\:LastCodeLabel\trc:shw}% \else \ifx \id:WriteTrc\:Undef \def\:tempa{ShowTitle}\ifx\:temp\:tempa \expandafter\def\expandafter\:TagCs\expandafter {\:TagCs.\the\:CodeNumber}% \fi \fi \fi \showttl:WriteTrc{#1}} \def\trc:shw#1"#2\trc:shw{#2 "#1"} \ifx \footline\:UnDef \else \footline={\hfil} \headline={\hfil} \fi \def\HREF:{ href=} \def\tag:A{a} \def\NAME:{ name=} \def\make:addr#1{% \ifnum\clearcode:id>0 \romannumeral\clearcode:id Q\else PrTx\fi #1} \ifx\clearcode:id\:UnDef \def\clearcode::id{0} \def\clearcode:id{0} \fi \ifx \html:par\:UnDef \def\html:par{\HCode{

}} \fi \def\html:invisible{\string } \expandafter\ifx\csname htmlprotex:par\endcsname\relax \ifx\:removeindenttrue\:UnDef \def\:removeindenttrue{\let\:Undef=\:Undef} \fi \def\htmlprotex:par{{\everypar{}\csname HtmlPar\endcsname}\HCode{\html:src}} \fi \ifx\html:addr\:UnDeF \immediate\write16{--- needs --- tex4ht \jobname\space ---}% \ifx\tmp:cnt\:UnDeF \csname newcount\endcsname\tmp:cnt \fi \def\g:advance#1{\bgroup \def\:temp{#1}% \tmp:cnt=#1\afterassignment\:gplus \advance\tmp:cnt} \def\:gplus{\expandafter\xdef\:temp{\the\tmp:cnt}\egroup} \def\html:lbl{1} \def\html:addr{\xdef\last:haddr{\file:id-\html:lbl}% \g:advance\html:lbl by 1\relax } \ifx \file:id\:UnDef \gdef\file:id{1} \global\let\maxfile:id=\file:id \fi \hbadness=10000 \vbadness=10000 \:CheckOption{fussy} \if:Option \else \hfuzz=99in \vfuzz=\hfuzz \fi \hyphenpenalty=1000 \exhyphenpenalty=1000 \def\html:rightskip{\rightskip = 0pt plus 0.5\hsize minus0.5\hsize } \html:rightskip \ifx \ht:special\:UnDef \let\ht:special=\special \fi \def\HCode#1{\ifx \EndPicture\:UnDef \ifvmode\leavevmode\fi\ht:special{t4ht=#1}\fi} \let\:HCode=\HCode \def\NewLineChar{\bgroup \catcode`\^=7 \:NewLineChar} \def\:NewLineChar#1{\egroup \def\:newlnch{ #1}} \NewLineChar{^^J} \def\::HRef[#1]{\get:attr{#1}\::hRef\:::HRef} \def\::HRefTag[#1]{\get:attr{#1}\::hRefTag\:::HRefTag} \def\get:attr#1{\edef\:attr{\noexpand\get:atr #1 !*?: }\:attr} \def\get:atr#1 #2!*?: #3#4{\def\:attr{\space#2}% \def\:te:mpa{#1}\ifx \:te:mpa\empty \let\:te:mpa#4\else \def\:te:mpa{#3[#1]}\fi \:te:mpa} \def\H:Tag#1#2{\:TagHTag{#2}\HCode{<\tag:A\:newlnch \NAME:"#2"\empty:lnk>}} \def\::hRef[#1]#2{% \HCode{<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{}\else \HREF:"#1\if\relax#1\relax \else\:sharp #2\fi"\fi \:attr \empty:lnk>}} \def\:::HRef#1{% \HCode{<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{}\else \HREF:"\get:hfile{#1}\:sharp #1"\fi \:attr \empty:lnk>}} \def\::hRefTag[#1]#2#3{% \if\relax#3\relax\else\:TagHTag{#3}\fi \HCode{<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{#3}\else \HREF:"#1\if\relax#2\relax \else\:sharp #2\fi"\fi \if\relax#3\relax\else\space \NAME:"#3"\fi \:attr \empty:lnk>}} \def\:::HRefTag#1#2{% \if\relax#2\relax\else\:TagHTag{#2}\fi \HCode{<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{#2}% \else\HREF:"\get:hfile{#1}\:sharp #1"\fi \if\relax#2\relax\else\space \NAME:"#2"\fi \:attr \empty:lnk>}} \let\empty:lnk=\empty \def\NOHREF#1{\space} \def\:TagHTag#1{\ifx -\let:val\else \Tag{)Q\aXrefFile #1}{\file:id}\fi} \def\get:href{\expandafter\get::href} \def\get::href#1-#2-{\ifnum #1=\file:id\space \else \:LikeRef{)F\aXrefFile #1\empty F-}\fi \:sharp \make:addr{#2}} \def\get:htag{\expandafter\get::htag} \def\get::htag#1-#2-{\make:addr{#2}} \ifx \aXrefFile\:UnDef \let\aXrefFile=\empty \fi \def\get:hfile#1{% \expandafter\ifx\csname cw:)Q\aXrefFile #1\endcsname\relax \get at hfile{#1}% \else \expandafter\expandafter\expandafter\get::hfile \csname cw:)Q\aXrefFile #1\endcsname,//% \fi } \def\get::hfile#1,#2//{% \ifnum \file:id=0#1 \else \expandafter\ifx \csname cw:)F\aXrefFile #1% \empty F-\endcsname\relax \else \:LikeRef{)F\aXrefFile #1\empty F-}% \fi % \fi } \ifx\get at hfile\:Undef \let\get at hfile=\:gobble \fi \let\html:src=\empty \catcode`\#=12 \def\:sharp{#} \catcode`\#=6 \Htmltrue \fi \fi\:CheckOption{_^} \if:Option \def\du:cc{\catcode`\_=13 \catcode`\^=13 \let\du:cc=\:UnDef} \let\:sub=_ \let\:sup=^ \catcode`\_=13 \catcode`\^=13 \def_{\ifmmode \:sub \else \string_\fi} \def^{\ifmmode \:sup \else \string^\fi} \:CheckOption{html} \if:Option \else \:CheckOption{xhtml}\fi \if:Option \append:def\SUBOn{\def_{\ifmmode \:sub \else \string_\fi}} \append:def\SUPOn{\def^{\ifmmode \:sup \else \string^\fi}} \fi \fi\:CheckOption{pdf} \if:Option \ifx \hyper:link\:UnDef \let\:temp=\hyper:target \else \let\:temp=\:UnDef \fi \ifx \:temp\:UnDef \def\hyper:link{\hyperlink} \def\hyper:target{\hypertarget} \def\:temp{\ifx\pdfstartlink\:UnDef \let\pdfstartlink\pdfannotlink \fi \ifx \pdfstartlink\:UnDef \long\def\hyper:target##1##2{\special {html:}\special{html:}}% \long\def\hyper:link##1##2{\special {html:}##2\special{html:}}% \else \long\def\hyper:target##1##2{\pdfdest name {##1} xyz}% \long\def\hyper:link##1##2{% \leavevmode \pdfstartlink goto name {##1}##2\pdfendlink } % \fi } \ifx \hyperlink\:UnDef \:temp \else \ifx \hypertarget\:UnDef \:temp \fi \fi \fi \let\hyper::WindowTitle=\WindowTitle \def\WindowTitle#1{\bgroup \def\WindowTitle##1{##1}% \xdef\:temp{\noexpand\H:WindowTitle{#1}}\egroup \:temp} \def\H:WindowTitle#1{\leavevmode\hbox{% \expandafter\ifx\csname \clearcode:id W-#1\endcsname\relax \ttl:del{<.}% \else \hyper:link{\expandafter\get:href \csname \clearcode:id W-#1\endcsname -}{\ttl:del{<.}}% \fi \html:addr \hyper:target{\expandafter\get:htag\last:haddr -}{}% \expandafter\expandafter\expandafter\global\expandafter\let \csname \clearcode:id W-#1\endcsname=\last:haddr \expandafter\ifx\csname \clearcode:id :cw:#1\endcsname\relax \expandafter\expandafter\expandafter\global \expandafter\def\csname \clearcode:id :cw:#1\endcsname{0}% \Tag{)\clearcode:id Z:#1}{\last:haddr}% \fi \def\:temp##1{\leavevmode \hbox{$\triangleleft \triangleleft$}~##1~\hbox{$\triangleright \triangleright$}}% \ifx \:temp \hyper::WindowTitle \def\hyper::WindowTitle##1{~##1~}\fi \hyper::WindowTitle{\frag:href{)\clearcode:id P:#1}{#1}}% \:nextlink{\clearcode:id :cw:#1}{.>}% }} \let\hyper::ModifyShowCode=\ModifyShowCode \def\ModifyShowCode#1{% \hyper::ModifyShowCode{#1}% \let\H:PortTitle=\PortTitle \let\PortTitle=\hyper::PortTitle } \let\hyper::PortTitle=\PortTitle \def\hyper::PortTitle#1{\hbox{% \def\:Sp{ }% \bgroup \html:addr \hyper:target{\get:htag\last:haddr-}{}% \ifx\:AppendSign\empty \expandafter\expandafter\expandafter\global\expandafter\edef \csname \clearcode:id 9:#1\endcsname{0}% \ttl:del{<..}% \else \hyper:link{\expandafter\get:href \csname \space\clearcode:id P:#1\endcsname-}{\ttl:del{<..}}% \fi \expandafter\expandafter\expandafter\global\expandafter\let \csname \space\clearcode:id P:#1\endcsname=\last:haddr \egroup \bgroup \ifx\:AppendSign\empty \Tag{)\clearcode:id P:#1}{\last:haddr}% \fi \def\:temp##1{\leavevmode \hbox{$\triangleright \triangleright$}~##1~\hbox{$\triangleleft \triangleleft$}}% \ifx \:temp\H:PortTitle \def\H:PortTitle##1{~##1~}\fi \H:PortTitle{\frag:href{)\clearcode:id Z:#1}{#1}}% \egroup \:nextlink{\clearcode:id 9:#1}{..>}% }} \def\frag:href#1#2{% \hyper:link{% \expandafter\ifx \csname cw:#1\endcsname \relax \expandafter\get:href\last:haddr -% \else \expandafter\expandafter\expandafter \get:href\csname cw:#1\endcsname -% \fi}{#2}} \def\:nextlink#1#2{% \bgroup \def\:Sp{\space}% \def\:lbl{)\the\tmp:cnt :#1}% \tmp:cnt=\csname #1\endcsname\space \Tag{\:lbl}{\last:haddr}% \advance\tmp:cnt by 1\space \expandafter\xdef\csname #1\endcsname{\the\tmp:cnt}% \expandafter\ifx\csname cw:\:lbl\endcsname\relax \ttl:del{#2}% \else \hyper:link{\expandafter\expandafter\expandafter \get:href\:LikeRef{\:lbl}-}{\ttl:del{#2}}% \fi \egroup } \let\:sharp=\empty \def\clearcode::id{0} \def\clearcode:id{0} \def\file:id{1} \def\get:href{\expandafter\get::href} \def\get::href#1-#2-{\ifnum #1=\file:id\space \else \:LikeRef{)F\aXrefFile#1\empty F-}\fi \:sharp \make:addr{#2}} \def\get:htag{\expandafter\get::htag} \def\get::htag#1-#2-{\make:addr{#2}} \def\get:hfile#1{% \expandafter\ifx\csname cw:)Q\aXrefFile#1\endcsname\relax \get at hfile{#1}% \else \expandafter\expandafter\expandafter\get::hfile \csname cw:)Q\aXrefFile#1\endcsname,//% \fi } \ifx \aXrefFile\:UnDef \let\aXrefFile=\empty \fi \def\get::hfile#1,#2//{% \ifnum \file:id=0#1 \else \expandafter\ifx \csname cw:)F\aXrefFile#1% \empty F-\endcsname\relax \else \:LikeRef{)F\aXrefFile#1\empty F-}% \fi % \fi } \ifx\get at hfile\:Undef \let\get at hfile=\:gobble \fi \def\L:Del{<..} \def\l:Del{<.} \def\R:Del{..>} \def\ttl:del#1{\def\:tempa{#1}% \ifx \:tempa\L:Del \L:del \else \ifx \:tempa\l:Del \l:del \else \ifx \:tempa\R:Del \R:del \else \r:del \fi\fi\fi} \def\HShowCode#1#2#3#4#5{% \def\:temp{#1#2}\ifx \:temp\empty \else \def\L:del{#1}\def\R:del{#2}\fi \def\:temp{#3#4}\ifx \:temp\empty \else \def\l:del{#3}\def\r:del{#4}\fi \def\:temp{#5}\ifx \:temp\empty \else \def\html:BackTitle{#5}\fi } \HShowCode{$\triangleleft\triangleleft$} {$\triangleright\triangleright$} {$\triangleright\triangleright$} {$\triangleleft\triangleleft$} {} \ifx\tmp:cnt\:UnDeF \csname newcount\endcsname\tmp:cnt \fi \def\g:advance#1{\bgroup \def\:temp{#1}% \tmp:cnt=#1\afterassignment\:gplus \advance\tmp:cnt} \def\:gplus{\expandafter\xdef\:temp{\the\tmp:cnt}\egroup} \def\html:lbl{1} \def\html:addr{\xdef\last:haddr{\file:id-\html:lbl}% \g:advance\html:lbl by 1\relax } \def\make:addr#1{% \ifnum\clearcode:id>0 \romannumeral\clearcode:id Q\else PrTx\fi #1} \def\:LikeRef#1{\csname cw:#1\endcsname} \fi \def\AlProTex{\:warn{AlProTex already loaded}} \let\:InitAlProTex=\:undefined \let\:CheckOption=\:undefined \let\:GetOptions=\:undefined \def\:temp{ \let\:temp=\:undefined \csname :notex\endcsname \csname :getpseducodeII\endcsname \endinput} \:RestoreCatcodes \csname :temp\endcsname --- NEW FILE DraTex.sty --- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% v 1.6 % DraTex % % Copyright (C) 1992 by Eitan M. Gurari % % % % This program can redistributed and/or modified under % % the terms of the LaTeX Project Public License % % Distributed from CTAN archives in directory % % macros/latex/base/lppl.txt; either version 1 of the % % License, or (at your option) any later version. % % % % However, you are allowed to modify this program % % without changing its name, if you modify its % % signature. Changes to the signature can be introduced % % with a directive of the form % % \message{signature} % % % % gurari at cse.ohio-state.edu % % http://www.cse.ohio-state.edu/~gurari % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \expandafter\edef\csname :RestoreCatcodes\endcsname{% \catcode`\noexpand\noexpand\noexpand \^=\the\catcode`\^% } \catcode`\^=7 \expandafter\edef\csname :RestoreCatcodes\endcsname{% \csname :RestoreCatcodes\endcsname \catcode`\noexpand \_=\the\catcode`\_% \catcode`\noexpand :=\the\catcode`:% \catcode`\noexpand @=\the\catcode`@% \catcode`\noexpand /=\the\catcode`/% \catcode`\noexpand &=\the\catcode`&% \catcode`\noexpand \^^M=\the\catcode`\^^M% \catcode`\noexpand \^^I=\the\catcode`\^^I% \let\expandafter\noexpand \csname:RestoreCatcodes\endcsname=\noexpand\undefined} \catcode`\:11 \catcode`\@11 \let\:wlog\wlog \def\wlog#1{} \def\:wrn#1#2{\immediate\write\sixt@@n{--DraTeX warning-- \ifcase #1 DraTex.sty already loaded \or \string\Draw\space within \string\Draw \or Changing definition of \string#2 \or No intersection points: #2 \or Improper rotation of axes: #2 \or (#2) in \string\DSeg\space is a point \fi}} \def\:err#1#2{\errmessage{--DraTeX error-- \ifcase #1 \string#2\space meaningless in three dimensions \or \string#2\space meaningless in two dimensions \or No \string\MarkLoc(#2) \or \string#2 in three dimensions \or Too many parameters in definition \or \string\MoveFToOval(#2)? \fi}} \ifx\:Xunits\:undefined \else \:wrn0{} \fi \catcode`\ 9 \catcode`\^^M9 \catcode`\^^I9 \def\:UBorder{0} \newdimen\:LBorder \newdimen\:RBorder\chardef\:eight=8 \mathchardef\:cccvx=360 \newdimen\:mp \:mp 0.1\p@ \newdimen\:mmp \:mmp 0.01\p@ \newdimen\:mmmp \:mmmp 0.001\p@ \newdimen\:XC \:XC 90\p@ \newdimen\:CVXXX \:CVXXX180\p@ \newdimen\:CCCVX \:CCCVX\:cccvx\p@ \newdimen\:TeXLoc \newbox\:box\newif\if:IIID \newdimen\:Z \newdimen\:Zunits \newdimen\:Ex \newdimen\:Ey \newdimen\:Ez \def\:AbsVal#1{ \ifdim#1<\z at -\fi #1 } \def\:abs#1{\ifdim #1<\z@ #1-#1 \fi} \def\:AbsDif#1#2#3{ #1#2 \advance#1 -#3 \ifdim #1<\z@ #1-#1 \fi} \def\:diff#1#2#3{ #1#2 \advance#1 -#3 } \def\:average#1#2#3{ #1#2 \advance#1 #3 \divide#1 \tw@}\def\:Opt#1#2#3#4{ \def\:temp{ \ifx \:next\ifnum \def\:next{#3#1#4#2} \else\ifx \:next#1 \def\:next{#3} \else \def\:next{#3#1#4#2}\fi\fi \:next} \futurelet\:next\:temp}\def\Define#1{\:multid#1 \:Opt(){\:Define#1}0} \def\:DraCatCodes{\catcode`\ 9 \catcode`\^^M9 \expandafter\ifx \csname ;catcode\endcsname\relax % \expandafter\edef \csname ;catcode\endcsname{% \catcode`;\the\catcode`\;}% \fi % \catcode`;12 % % \catcode`\^^I9 \catcode`\&13 \catcode`\~13 } \def\:Define#1(#2){\begingroup \:DraCatCodes \::Define#1(#2)} \def\::Define#1(#2)#3{\endgroup \let\:NextDefine\NextDefine \let\NextDefine\relax \ifcase#2\relax \def#1{#3}\or \:TxtPar\def#1(##1){#3}\or \:TxtPar\def#1(##1,##2){#3}\or \:TxtPar\def#1(##1,##2,##3){#3}\or \:TxtPar\def#1(##1,##2,##3,##4){#3}\or \:TxtPar\def#1(##1,##2,##3,##4,##5){#3}\or \:TxtPar\def#1(##1,##2,##3,##4,##5,##6){#3}\or \:TxtPar\def#1(##1,##2,##3,##4,##5,##6,##7){#3}\or \:TxtPar\def#1(##1,##2,##3,##4,##5,##6,##7,##8){#3}\or \:TxtPar\def#1(##1,##2,##3,##4,##5,##6,##7,##8,##9){#3}\or \:err4{}\fi \let\:TxtPar\relax \:NextDefine} \let\NextDefine\relax\let\:TxtPar\relax \def\WarningOn{\def\:multid##1{ \ifx ##1\:undefined \else \:wrn2##1\fi}} \def\:gobble#1{} \def\WarningOff{\let\:multid\:gobble} \WarningOff \Define\Indirect{\futurelet\:next\:Indirect} \Define\:Indirect{\:theDoReg \ifx \:next< \def\:temp{\let\DoReg\:DoReg} \def\:next<##1>{\expandafter\:temp\csname :<##1>\endcsname} \else \def\:next##1<##2>{ \expandafter\ifx \csname :<##2> \endcsname \relax \def\:next{##1} \fi \:indrwrn\Define \:indrwrn\Object \:indrwrn\Table \:indrwrn\IntVar \:indrwrn\DecVar \def\:temp{\let\DoReg\:DoReg##1} \expandafter\:temp \csname :<##2> \endcsname} \fi \:next} \def\:indrwrn#1{ \def\:temp{#1} \ifx \:next\:temp \def\:wrn##1##2{\let\:wrn\::wrn} \fi} \let\::wrn\:wrn \Define\:Hline{ \setbox\:box\hbox{\vrule height0.5\:thickness depth 0.5\:thickness width\:x} {\:d\:X \advance\:d \wd\:box \advance\:X -\:TeXLoc \global\:TeXLoc\:d \vrule width\:X depth\z@ height\z@ \raise \:Y \box\:box} }\Define\:Vline{ \setbox\:box\hbox{\vrule width\:thickness \ifdim \:y>\z@ height\:y depth\z@ \else height\z@ depth-\:y \fi} \advance\:X -0.5\:thickness {\:d\:X \advance\:d \wd\:box \advance\:X -\:TeXLoc \global\:TeXLoc\:d \vrule width\:X depth\z@ height\z@ \raise \:Y \box\:box} }\Define\:MvTo(2){\:X#1\:Xunits \:Y#2\:Yunits} \Define\:Mv(2){\advance\:X #1\:Xunits \advance\:Y #2\:Yunits} \def\:DLn(#1,#2,{\:MvTo(#1,#2) \:LnTo(}\Define\:LnTo(2){ \:x#1\:Xunits \advance\:x -\:X \:y#2\:Yunits \advance\:y -\:Y \:Ln(\:x\du,\:y\du) }\Define\:Ln(2){ \:x#1\:Xunits \:y#2\:Yunits { \ifdim \:x<\z@ \advance\:X \:x \:x-\:x \advance\:Y \:y \:y-\:y \fi \:yy\:AbsVal\:y \:dd\:yy \advance\:dd \:x \ifdim \:dd>\:mmmp \ifdim \:x>\:yy { \ifdim\:X<\:LBorder \global\:LBorder\:X\fi \advance \:X \:x \ifdim \:X>\:RBorder \global\:RBorder\:X\fi\advance \:Y 0.5\:thickness \ifdim \:Y>\:UBorder \xdef\:UBorder{\the\:Y} \fi \advance \:Y \:y \ifdim \:Y>\:UBorder \xdef\:UBorder{\the\:Y} \fi } \let\:Yunitsy\:x \let\:Xunitsx\:y \let\:temp\:Hline \:dd0.6\:yy \:divide\:dd\:x \else { \advance \:X -0.5\:thickness \ifdim \:X<\:LBorder \global\:LBorder\:X \fi \advance \:X \:thickness \advance \:X \:x \ifdim \:X>\:RBorder \global\:RBorder\:X\fi \ifdim \:Y>\:UBorder \xdef\:UBorder{\the\:Y} \fi \advance \:Y \:y \ifdim \:Y>\:UBorder \xdef\:UBorder{\the\:Y} \fi } \let\:Yunitsy\:y \let\:Xunitsx\:x \let\:temp\:Vline \:dd0.6\:x \ifdim \:x>\:mmp \:divide\:dd\:yy \fi \fi \advance\:dd 0.4\p@ \:ragged\:Cons\:dd\:ragged \:HVLn \fi } \advance\:X \:x \advance\:Y \:y}\Define\:HVLn{ \:xx\:AbsVal\:Xunitsx \:divide\:xx\:ragged \advance\:xx 0.99\p@ \:K\:InCons\:xx \relax \ifnum \:K>\z@ \divide\:Xunitsx \:K \advance\:K \@ne \divide\:Yunitsy \:K \else \:K\@ne \fi \:NextLn} \Define\:NextLn{ \ifnum\:K=\z@ \let\:NextLn\relax \else { \:temp } \advance\:K \m at ne \advance\:X \:x \advance\:Y \:y \fi \:NextLn}\newdimen\:ragged \Define\Ragged(1){ \:ragged#1\p@ \:ragged0.1\:ragged } \Ragged(7.5) \Define\PaintUnderCurve(4){{ \:Z\:Y \def\:next{\Curve(#1,#2,#3,#4)} \MoveToLoc(#1) \:d\:X \MoveToLoc(#4) \advance\:d -\:X \ifdim \:AbsVal\:d<\:mmp \def\:next{} \else \def\:CrvLnTo(##1,##2){ \:x \:X \:y \:Y \:X\:DJ \:Y\:yyyy \:xx\:X \:dddd \:Y \:X\:x \:Y\:y { \advance\:Y \:dddd \divide\:Y \tw@ \advance\:Z -\:Y \advance\:Y 0.5\:Z \:dddd \:AbsVal \:Z \:d\z@ \def\:CrvLnTo{\:LnTo} \:yy\:Y \:dd\:dddd \:ddd\:dddd \::paint }} \fi \:next }} \Define\DoCurve(1){ \let\:StopCurve\:SlowCurve \def\:CMv(##1){ \:x\:X \:y\:Y \:MvTo(##1) \advance\:x -\:X \advance\:y -\:Y \:xxx \:x \:yyy\:y} \:DoCurve{\Curve(#1)} \let\:StopCurve\:FastCurve} \def\:DoCurve#1(#2)#3{{\XSaveUnits \def\:next{#1} \:MvTo(#2,#2) \:x\:AbsVal\:X \:y\:Y \:ddd\z@ \:length \:Z\:d \:divide\:Z{1.41421\p@} \edef\:tempa{\the\:DoDist} \global\:DoDist\z@ \def\:CrvLnTo(##1){ \MarkLoc(1^) \:CMv(##1) { \MarkLoc(2^) \:ddd\z@ \:length \:dd \:DoDist \global\advance\:DoDist \:d \:ddd \:DoDist \:divide\:ddd\:Z \DoReg\:InCons\:ddd \:Z\DoReg\:Z \ifdim \:Z>\:dd \advance\:Z -\:DoDist \advance\:dd -\:DoDist \:divide\:Z\:dd \advance\:X \:Cons\:Z\:xxx \advance\:Y \:Cons\:Z\:yyy \:DoRot \def\:CrvLnTo{\:LnTo} \def\:OvalLn{\:Ln} \XRecallUnits #3 \fi}} \:next \xdef\:DoDim{\:Cons\:DoDist} \global\:DoDist\:tempa } \let\DoDim\:DoDim} \newdimen\:DoDist\def\:DoRot{ \DSeg\RotateTo(1^,2^) } \def\DoLine(#1,#2)(#3)#4{ \MarkLoc($1) \Move(#1,#2) \def\:next{ { \MarkLoc($2) \DSeg\RotateTo($1,$2) \let\:DoRot\relax \edef\:RecallRagged{\the\:ragged} \MoveTo(#3,#3) \:x\:AbsVal\:X \:y\:Y \:ddd\z@ \:length \:ragged\:d \divide\:ragged \tw@ \DoCurve($1,$1,$2,$2)(#3) {\:ragged\:RecallRagged #4} } \let\DoDim\:DoDim} \:next } \def\Table#1{\begingroup \:DraCatCodes \:multid#1 \:DefineData#1} \def\:DefineData#1#2{\endgroup \let\:temp~ \def~{\noexpand~} \edef#1{\noexpand\:DoPoly\expandafter\noexpand\csname :\string#1\endcsname} \expandafter\edef \csname :\string#1\endcsname ##1{\noexpand\ifcase##1(#2)\noexpand\fi} \let~\:temp \:DoNextPoly \:DoNextPoly} \def\:OR{\let\:or\or} \:OR \catcode`\&13 \def&{)\noexpand\:or(} \def\TableData{\begingroup \:DraCatCodes \:TableData} \def\:TableData#1#2#3{\endgroup \Table\:temp{#3} \:K\z@ \:J\z@ \def\:tempa(##1){\advance\:J \@ne } \:temp(0,999){\:tempa} \let\:tempa& \def\:temp{\def#1} \def&##1&{ \ifnum \:K<\:J \advance\:K \@ne \ifnum \:K=\@ne \def#1{#2(##1)} \else \:IIIexpandafter\:temp\expandafter{ #1 & #2(##1) } \fi \else \let\:next\relax \fi \:next} \let\:next& && \let&\:tempa } \catcode`\&4 \def\:DoPoly#1(#2,#3)#4{ \expandafter\let \csname :Back\the\:level\endcsname\:or \expandafter\edef\csname :DoVars\the\:level\endcsname{ \:DoB\the\:DoB} \advance\:level \@ne \:DoB#3 \advance\:DoB -#2 \def\:PolyOr(##1){ \ifnum \:DoB=\z@ \:OR \else #4(##1) \advance\:DoB \m at ne \fi} \:OR \def\:temp{\let\:or\:PolyOr #4} \:IIIexpandafter\:temp#1{#2} \advance\:level \m at ne \csname :DoVars\the\:level\endcsname \def\:temp{\let\:or} \expandafter\:temp\csname :Back\the\:level\endcsname } \Define\PaintRect(2){\def\:next{{ \MarkLoc(^) \MoveToLoc(^) \Move( #1,0) \MarkLoc(^1) \Move(0,#2) \MarkLoc(^2) \Move(-#1,0) \MarkLoc(^3) \PaintQuad(^,^1,^2,^3) }}\:next} \Define\PaintRectAt(4){\def\:next{{ \MoveTo(#1,#2) \:Ex#3\p@ \advance\:Ex -#1\p@ \:Ey#4\p@ \advance\:Ey -#2\p@ \PaintRect(\:Cons\:Ex,\:Cons\:Ey)}} \:next}\def\::paint{ \ifdim \:d<\:ragged \advance\:xx -\:X \:yyy\:Y \:xxx\:dddd \advance\:Y \:yy \divide\:Y \tw@ \:average\:dddd\:dd\:ddd \def\:next{\:brush(\:xx,\z@)\:Y\:yyy\:dddd\:xxx} \else \divide\:d \tw@ \:average\:x\:X\:xx \:average\:y\:Y\:yy \:average\:dddd\:dd\:ddd \fi \:next}\Define\:paint{{ \:AbsDif\:d\:xx\:x \ifdim \:d<\:mmp \let\::paint\relax \else \ifdim \:y >\:yyy \:dd\:y \:y \:yyy \:yyy \:dd \fi \ifdim \:yy>\:yyyy \:dd\:yy \:yy\:yyyy \:yyyy\:dd \fi \:AbsDif\:dd\:yyyy\:yyy \:AbsDif\:ddd\:yy\:y \ifdim \:dd<\:ddd \:dd\:ddd \fi \ifdim \:d >\:dd \:d\:dd \fi \advance\:d \:d \:diff\:dd\:y\:yyy \:diff\:ddd\:yy\:yyyy \advance\:y -0.5\:dd \:abs\:dd \advance\:yy -0.5\:ddd \:abs\:ddd \:X\:x \:Y\:y \:average\:dddd\:dd\:ddd \def\:next{ \:lpaint \:rpaint } \fi \::paint }} \Define\:lpaint{ { \:xx\:x \:yy \:y \:ddd\:dddd \::paint} } \Define\:rpaint{ { \:X \:x \:Y \:y \:dd \:dddd \::paint} } \Define\PaintQuad(4){\def\:next{{\Units(1pt,1pt) \MoveToLoc(#1) \:x \:X \:y \:Y \MoveToLoc(#2) \:xx \:X \:yy \:Y \MoveToLoc(#3) \:xxx\:X \:yyy\:Y \MoveToLoc(#4) \:xxxx \:X \:yyyy \:Y \:paintQuad }}\:next} \def\:paintQuad{{ \:SetVal\:a\:x\:y\:xx\:yy\:xxxx\:yyyy \:SetVal\:b\:xx\:yy\:xxx\:yyy\:x\:y \:SetVal\:c\:xxx\:yyy\:xx\:yy\:xxxx\:yyyy \:SetVal\:cc\:xxxx\:yyyy\:xxx\:yyy\:x\:y \def\:A{\:a} \def\:B{\:b} \def\:C{\:c} \def\:D{\:cc} \:sort\:B\:A \:sort\:C\:B \:sort\:B\:A \:sort\:D\:C \:sort\:C\:B \:sort\:B\:A \let\:temp\relax \:IsTriang\:A\:B \:IsTriang\:B\:C \:IsTriang\:C\:D \:temp \:Quad\:A\:temp> \:xxxx\:xx \:yyyy\:yy \:Z\:d \:Quad\:D\:next< \:PrePaint(\:xx,\:yy,\:d,\:xxxx,\:yyyy,\:Z) \:temp \:next }} \Define\:PrePaint(6){ \:x#1 \:y#2 \:yyy#3 \:xx#4 \:yy#5 \:yyyy#6 \:paint }\def\:Quad#1#2#3{ \:GetVal#1\:x\:y0 \:GetVal#1\:xx\:yy1 \:GetVal#1\:xxx\:yyy2 \ifdim \:xx#3\:xxx \:ddd\:xx \:xx\:xxx \:xxx\:ddd \:ddd\:yy \:yy\:yyy \:yyy\:ddd \fi \def#2{} \:diff\:dd\:xxx\:xx \ifdim \ifdim\:AbsVal\:dd<\:mp \:yy=\:yyy \else \z@>\z@ \fi \:d\:yy \else \ifdim \:AbsVal\:dd>\:mp \:diff\:dd\:xxx\:x \:diff\:ddd\:yyy\:y \:divide\:ddd\:dd \:diff\:dd\:xx\:xxx \:ddd\:Cons\:ddd\:dd \advance\:ddd \:yyy \:d\:ddd \else \:d\:yyy \fi \edef#2{ \noexpand\:PrePaint (\the\:x ,\the\:y ,\the\:y, \the\:xx,\the\:yy,\the\:d) } \fi}\def\:SetVal#1#2#3#4#5#6#7{ \edef#1{(\the#2,\the#3,\the#4,\the#5,\the#6,\the#7)}} \def\:sort#1#2{ \ifdim \:IIIexpandafter\:field#1 < \:IIIexpandafter\:field#2 \let\:temp#1 \let#1#2 \let#2\:temp \fi } \Define\:field(6){#1} \def\:GetVal#1#2#3{ \:IIIexpandafter\::GetVal #1#2#3} \def\::GetVal(#1,#2,#3,#4,#5,#6)#7#8#9{ \ifcase #9 #7#1 #8#2\or #7#3 #8#4\or #7#5 #8#6 \fi} \def\:IsTriang#1#2{ \ifdim \:IIIexpandafter\:field#1 = \:IIIexpandafter\:field#2 \ifdim \:IIIexpandafter\:fieldB#1 = \:IIIexpandafter\:fieldB#2 \def\:temp{ \:FixTria } \fi \fi } \def\:FixTria{ \edef\:temp{\:IIIexpandafter\:FrsII\:B} \ifdim \:IIIexpandafter\:field\:A = \:IIIexpandafter\:field\:B \ifdim \:IIIexpandafter\:fieldB\:A = \:IIIexpandafter\:fieldB\:B \edef\:temp{\:IIIexpandafter\:FrsII\:C} \fi\fi \edef\:A{\:IIIexpandafter\:FrsII\:A} \edef\:D{\:IIIexpandafter\:FrsII\:D} \edef\:temp{ \def\noexpand\:a{(\:A,\:temp,\:D)} \def\noexpand\:b{(\:temp,\:A,\:D)} \def\noexpand\:c{\noexpand\:b} \def\noexpand\:cc{(\:D,\:A,\:temp)}} \:temp \def\:A{\:a} \def\:B{\:b} \def\:C{\:c} \def\:D{\:cc} } \Define\:fieldB(6){#2} \Define\:FrsII(6){#1,#2} \def\:IIIexpandafter{\expandafter\expandafter\expandafter} \Define\DrawRect(2){ \Line( #1,0) \Line(0, #2) \Line(-#1,0) \Line(0,-#2)} \Define\DrawRectAt(4){{ \MoveTo(#1,#2) \LineTo(#3,#2) \LineTo(#3,#4) \LineTo(#1,#4) \LineTo(#1,#2)}} \def\du#1{ \ifx#1\:Xunits \else\ifx#1\:Yunits \else\ifx#1\:Zunits \else #1 \fi \fi \fi} \let\:svdu=\du \Define\XSaveUnits{ \expandafter\edef\csname XRecallUnits\the\:level\endcsname{ \:StoreUnits} \advance\:level \@ne} \Define\XRecallUnits{ \advance\:level \m at ne \csname XRecallUnits\the\:level \endcsname} \Define\SaveUnits{ \edef\RecallUnits{ \:StoreUnits } } \Define\:StoreUnits{ \:Xunits \the\:Xunits \:Yunits \the\:Yunits \:Zunits \the\:Zunits \:Xunitsx\the\:Xunitsx \:Xunitsy\the\:Xunitsy \:Yunitsx\the\:Yunitsx \:Yunitsy\the\:Yunitsy } \Define\:SearchDir{ \ifdim \:x<\z@ \:x-\:x \:y-\:y \edef\:tempA{\advance\:ddd \ifdim \:y<\z@ - \fi\:CVXXX} \else \def\:tempA{} \fi \ifdim \:y<\z@ \edef\:tempA{\:ddd-\:ddd \advance\:ddd \:CCCVX \:tempA} \:y-\:y \fi \ifdim \:y>\:x \:ddd\:y \:y\:x \:x\:ddd \edef\:tempA{\advance\:ddd -\:XC \:ddd-\:ddd \:tempA} \fi \:divide\:y\:x \:d57.29578\:y \:ddd\:d \:sqr\:y \:K \@ne \Do(1,30){\advance\:K \tw@ \:d-\:Cons\:y\:d \:dd\:d \divide\:dd \:K \advance\:ddd \:dd } \advance\:ddd -0.49182\:dd \:tempA }\Define\Curve(4){\def\:next{{ \XSaveUnits \Units(1pt,1pt) \MoveToLoc(#1) \:DI \:X \:DK \:Y \MoveToLoc(#2) \:ddd \:X \:Ez \:Y \MoveToLoc(#3) \:dd\:X \:Ey\:Y \MoveToLoc(#4) \:DJ\:X \:yyyy\:Y \:Curve }}\:next} \Define\:FastCurve{ \:AbsDif\:d\:DI\:ddd \:AbsDif\:dddd\:DK\:Ez \advance\:d \:dddd \ifnum \:d<\:ragged \:AbsDif\:d\:DJ\:dd \:AbsDif\:dddd\:yyyy\:Ey \advance\:d \:dddd \fi} \let\:StopCurve\:FastCurve \Define\:SlowCurve{ \:AbsDif\:d\:DI\:DJ \:AbsDif\:dddd\:DK\:yyyy \advance\:d \:dddd } \Define\:Curve{ \:StopCurve \ifnum \:d<\:ragged \:X\:DI \:Y\:DK \:CrvLnTo(\:Cons\:DJ,\:Cons\:yyyy) \def\:SubCurves{} \fi \:SubCurves} \def\:CrvLnTo{\:LnTo}\Define\:SubCurves{ \:average\:yy\:DI\:ddd \:average\:Ex\:DK\:Ez \:average\:ddd\:ddd\:dd \:average\:Ez\:Ez\:Ey \:average\:dd\:dd\:DJ \:average\:Ey\:Ey\:yyyy \:average\:Zunits\:yy\:ddd \:average\:Vdirection\:Ex\:Ez \:average\:ddd\:ddd\:dd \:average\:Ez\:Ez\:Ey \:average\:DL\:Zunits\:ddd \:average\:xxxx\:Vdirection\:Ez { \:ddd \:yy \:Ez \:Ex \:dd\:Zunits \:Ey\:Vdirection \:DJ\:DL \:yyyy\:xxxx \:Curve } \:DI \:DL \:DK \:xxxx \:Curve } \def\MoveToCurve[#1]{ \Define\:BiSect(3){\MoveToLoc(##1) \CSeg[#1]\Move(##1,##2) \MarkLoc(##3) }\:MvToCrv} \Define\:MvToCrv(4){ \:BiSect(#1,#2,:a) \:BiSect(#2,#3,:b) \:BiSect(#3,#4,:c) \:BiSect(:a,:b,:A) \:BiSect(:b,:c,:B) \:BiSect(:A,:B,:Q)} \Define\:OvalDir(3){ \:CosSin{#3\p@} \:Zunits\p@ \:d#2\:Zunits \:x\:Cons\:d\:x \:Zunits\p@ \:d#1\:Zunits \:y\:Cons\:d\:y \:SearchDir }\Define\DrawOval (2){ \DrawOvalArc(#1,#2)(0,\:cccvx) } \Define\PaintOval (2){ \PaintOvalArc(#1,#2)(0,\:cccvx) } \Define\DrawCircle (1){ \DrawOval(#1,#1) } \Define\PaintCircle(1){ \PaintOval(#1,#1) } \def\DrawOvalArc(#1,#2)(#3,#4){{ \:xxxx#4\p@ \advance\:xxxx -#3\p@ \ifdim \:xxxx=\z@ \else \let\:SinOne\:SinB \:OvalDir(#1,#2,#3) \:DJ\:ddd \:OvalDir(#1,#2,#4) \:diff\:DI\:ddd\:DJ \ifdim\:DI<\z@ \advance\:DI \:CCCVX \fi \ifdim \:xxxx<\:CCCVX \else \:DI\:CCCVX \fi \:InitOval(#1,#2) \:CosSin\:DJ \:xxxx\:x \:yyyy\:y \:xx\:X \:yy\:Y \advance\:X \:Xx\:x \advance\:X \:Yx\:y \advance\:Y \:Xy\:x \advance\:Y \:Yy\:y \let\:Xunits\empty \let\:Yunits\empty \Do(1,\:InCons\:DI){ \:dd\:X \:ddd\:Y \:X\:xx \:Y\:yy \:AdvOv\:xxx\:yyy\:xxxx\:yyyy \:X\:dd \:Y\:ddd \advance\:xxx -\:X \advance\:yyy -\:Y \:d\:AbsVal\:xxx \advance\:d \:AbsVal\:yyy \ifdim \:d>\:ragged \:OvalLn(\:xxx,\:yyy) \fi } \:OvalDir(#1,#2,#4) \:CosSin\:ddd \advance\:xx \:Xx\:x \advance\:xx \:Yx\:y \advance\:yy \:Xy\:x \advance\:yy \:Yy\:y \advance\:xx -\:X \advance\:yy -\:Y \:OvalLn(\:xx,\:yy) \fi }} \def\:OvalLn{\:Ln}\def\DoOvalArc(#1)(#2){ \:xx\:X \:yy\:Y \def\:CMv(##1){ \:Mv(\:xxx,\:yyy) \:x\:xxx \:y\:yyy} \:DoCurve{ \:X\:xx \:Y\:yy \def\:DoRot{ \let\:Xunits\:XunitsReg \let\:Yunits\:YunitsReg \DSeg\RotateTo(1^,2^) } \let\::OvalLn\:CrvLnTo \Define\:OvalLn(2){ \:dd\:AbsVal####1 \advance\:dd \:AbsVal####2 \:divide\:dd\:ragged \:J\:InCons\:dd \advance\:J \@ne \divide####1 \:J \divide####2 \:J \Do(1,\:J){\::OvalLn(####1,####2)}} \DrawOvalArc(#1)(#2)}} \def\NextTable{\begingroup \:DraCatCodes \:NextTable} \def\:NextTable#1{\endgroup \def\:DoNextPoly{#1\NextTable{}}} \NextTable{}\def\:AdvOv#1#2#3#4{ \:d\:CosOne#3 \advance\:d -\:SinOne#4 #4\:CosOne#4 \advance#4 \:SinOne#3 #3\:d \divide#3 \:eight \divide#4 \:eight #1\:X #2\:Y \:d\:Xx#3 \advance\:d \:Yx#4 \advance#1 \:d \:d\:Xy#3 \advance\:d \:Yy#4 \advance#2 \:d } \def\:CosOne{7.99878} \def\:SinB{0.13962} \def\PaintOvalArc(#1,#2)(#3,#4){{ \ifdim #3\p@=#4\p@ \let\:next\relax \else \:d\:AbsVal{#1\:Xunits} \advance\:d \:AbsVal{#2\:Yunits} \ifdim \:d<3\:ragged \divide \:d \tw@ \PenSize(\:d) \:Mv(-0.5\:d\du,0) \:Ln(\:d\du,0) \else \:InitOval(#1,#2) \MarkLoc(o$) \RotateTo(#3) \MoveFToOval(#1,#2) \:Ex\:X \:Ey\:Y \edef\:FirstOvDir{\:Cons\:ddd\p@} \MoveToLoc(o$) \RotateTo(#4) \MoveFToOval(#1,#2) \:Ez \:X \:Vdirection \:Y \edef\:LastOvDir{\:Cons\:ddd\p@} \MoveToLoc(o$) \if:rotated \:Zunits\p@ \:Zunits#1\:Zunits \:xx\:Cons\:Zunits\:Xunitsx \:Zunits\p@ \:Zunits#2\:Zunits \:yy\:Cons\:Zunits\:Yunitsx \:x\:xx \:y\:yy \:ddd\z@ \:length \:ddd\:d \:divide\:xx\:ddd \:divide\:yy\:ddd \else \:xx\p@ \:yy\z@ \fi \:AbsDif\:d{#3\p@}{#4\p@} \ifdim \:d>359\p@ \:Ez-\:Xx\:xx \advance\:Ez -\:Yx\:yy \:Vdirection-\:Xy\:xx \advance\:Vdirection -\:Yy\:yy \advance\:Ez \:X \advance\:Vdirection \:Y \:setpaint\:PaintOvOv<> \else \:x\:xx \:y\:yy \:SearchDir \:xxx\:FirstOvDir \advance\:xxx -\:ddd \ifdim \:xxx<\z@ \advance\:xxx \:CCCVX \fi \:yyy\:LastOvDir \advance\:yyy -\:ddd \ifdim \:yyy<\z@ \advance\:yyy \:CCCVX \fi \:J\z@ \ifdim \:xxx<\:yyy \ifdim \:yyy<\:CVXXX \:Pntovln\:FirstOvDir\:FirstOvDir\:LastOvDir \else \ifdim \:xxx>\:CVXXX \:Pntovln\:FirstOvDir\:FirstOvDir\:LastOvDir \else \:yyy-\:yyy \advance\:yyy \:CCCVX \ifdim \:xxx<\:yyy \:setpaint\:PntLeftOvOv>< \:PntMovln\:FirstOvDir\:xx \else \:FxLx \:setpaint\:PntLeftOvOv>< \:Pntmovln\:LastOvDir \fi \fi \fi \else \ifdim \:xxx<\:CVXXX { \:setpaint\:PaintOvOv<> } \:FxLx \:setpaint\:PntLeftOvOv>< \:Usrch \:PaintMidOvLn\:LastOvDir\:FirstOvDir \else \ifdim \:yyy>\:CVXXX { \:FxLx \:setpaint\:PaintOvOv<> } \:setpaint\:PntLeftOvOv>< \:Dsrch \:PaintMidOvLn\:LastOvDir\:FirstOvDir \else \:xxx-\:xxx \advance\:xxx \:CCCVX \ifdim \:yyy<\:xxx \:setpaint\:PaintOvOv<> \:PntMovln\:FirstOvDir\:xx \else \:FxLx \:setpaint\:PaintOvOv<> \:Pntmovln\:LastOvDir \fi \fi \fi \fi \fi \fi \fi}}\def\:setpaint#1#2#3{{\aftergroup#1 \:d\:Xx\:xx \advance\:d \:Yx\:yy \ifdim \:d<\z@ \aftergroup#3 \else \aftergroup#2 \fi}} \def\:FxLx{\:d\:Ex \:Ex\:Ez \:Ez\:d} \def\:Pntovln#1{ \let\:SinOne\:SinB \:CosSin#1 \:xxxx\:Ex \:yyyy\:Ey \:Z\z@ \:PaintOvLn} \def\:PntMovln{ \:Dsrch \:FxLx \:xx\:ddd \:PaintOvLn} \def\:Pntmovln{ \:Usrch \:FxLx \:xx\:ddd \:PaintOvLn\:xx} \def\:PaintMidOvLn#1#2{ \:FxLx \:xx\:ddd \:PaintOvLn#1#2 \:xxx\:Ez \:yyy\:Vdirection \:ddd\:Xy\:x \advance\:ddd \:Yy\:y \advance\:ddd \:Y \:PaintSlice} \def\:PntLeftOvOv{ \:xx-\:xx \:yy-\:yy \:PaintOvOv} \def\:Dsrch{ \def\:SinOne{-\:SinB} \:xx\:x \:yy\:y \:SearchDir \:x\:xx \:y\:yy \:d\:Ey \:Ey\:Vdirection \:Vdirection\:d } \def\:Usrch{ \let\:SinOne\:SinB \:x\:xx \:y\:yy \:SearchDir \:x\:xx \:y\:yy}\def\:PaintOvLn#1#2{ \:diff\:dd\:Ey\:Vdirection \:diff\:ddd\:Ex\:Ez \ifdim \:AbsVal\:ddd>\:mp \:divide\:dd\:ddd \:d#2 \advance\:d -#1 \ifnum \:d<\z@ \advance\:d \:CCCVX \fi \:DoB\:InCons\:d \let\:next\:PntDo \:next \fi} \def\:PntDo{ \ifnum\:DoB=\z@ \let\:next\relax \else \::AdvOv\:x\:y \ifdim \:d>\:ragged \:ddd\:xxx \advance\:ddd -\:Ez \:ddd\:Cons\:dd\:ddd \advance\:ddd \:Vdirection \:PaintSlice \fi \advance\:DoB \m at ne \fi \:next}\Define\:PaintSlice{ \:AbsDif\:dddd\:yyy\:ddd \advance\:yyy \:ddd \divide\:yyy \tw@ { \advance\:dddd \:Z \divide\:dddd \tw@ \:X\:xxxx \:Y\:yyy \:xx\:xxx \advance\:xxx -\:xxxx \:d\z@ \:yy\:Y \:dd\:dddd \:ddd\:dddd \::paint } \:xxxx\:xxx \:yyyy\:yyy \:Z\:dddd \:J\z@} \def\::AdvOv#1#2{ \:AdvOv\:xxx\:yyy#1#2 \:AbsDif\:d\:xxxx\:xxx \advance\:J \@ne \ifnum \:J=\sixt@@n \multiply\:d \@cclvi \fi }\def\:PaintOvOv#1{ \def\:hdir{#1} \:xxx\:Xx\:xx \advance\:xxx \:Yx\:yy \:yyy\:Xy\:xx \advance\:yyy \:Yy\:yy \advance\:xxx \:X \advance\:yyy \:Y \:Z\z@ \:xxxx\:xxx \:yyyy\:yyy \:x\:xx \:y\:yy \:DoB\z@ \:J\z@ \let\:next\:scanOvOv \:next } \Define\:scanOvOv{ \advance\:DoB \@ne \advance\:J \@ne \:AbsDif\:d\:xxx\:Ez \ifdim \ifdim \:xxx\:hdir\:Ez - \else\ifdim \thr@@\:d<\:ragged - \else\ifnum \:DoB>358 - \fi \fi \fi \p@<\z@ \:ddd\:yyyy \advance\:ddd -0.5\:dddd \:yyy\:yyyy \advance\:yyy 0.5\:dddd \:xxx\:Ez \:PaintSlice \let\:next\relax \else \:d\:xx \advance\:d -\:x \:xxx\:yy \advance\:xxx -\:y \ifdim -\:Xx\:d\:hdir\:Yx\:xxx \let\:SinOne\:SinB \::AdvOv\:xx\:yy \ifdim \ifdim \:d >\:ragged - \else \ifnum \:J>\sixt@@n - \fi\fi \p@<\z@ \:J\z@ \def\:SinOne{-\:SinB} \:AdvOv\:dd\:ddd\:x\:y \:PaintSlice \fi \else \def\:SinOne{-\:SinB} \::AdvOv\:x\:y \ifdim \ifdim \:d >\:ragged - \else \ifnum \:J>\sixt@@n - \fi\fi \p@<\z@ \:J\z@ \let\:SinOne\:SinB \:AdvOv\:dd\:ddd\:xx\:yy \:PaintSlice \fi \fi \fi \:next}\Define\SetBrush{\:Opt[]\:SetBrush{}} \def\:SetBrush[#1](#2,#3)#4{ \def\:temp{#4} \ifx \:temp\empty \def\:brush{ \let\:Xunits\empty \let\:Yunits\empty \:thickness\:dddd \:Ln } \else \def\:BruShape{#4} \:dd#2\:Xunits \:ddd#3\:Yunits \edef\:Grd{ \:dd\the\:dd \:ddd\the\:ddd } \MarkLoc($$) \def\:temp{#1} \ifx \:temp\empty \:X\z@ \:Y\z@ \else \MoveTo(#1) \fi \edef\:BrOrg{ \:x\the\:X \:y\the\:Y } \MoveToLoc($$) \def\:brush(##1,##2){ \::brush } \fi } \SetBrush(,){}\def\::brush{{ \SetBrush(,){} \let\:Xunits\:XunitsReg \let\:Yunits\:YunitsReg \advance\:Y -0.5\:dddd \:yy\:Y \advance\:yy \:dddd \:BrOrg \:Grd \advance\:xx \:X \ifdim \:xx<\:X \:d\:X \:X\:xx \:xx\:d \fi \:GridPt\:X\:x\:dd \:GridPt\:Y\:y\:ddd \:x\:X \:DoBrush }}\Define\:DoBrush{ \ifdim \:Y>\:yy \let\:DoBrush\relax \else \ifdim \:X>\:xx \advance\:Y \:ddd \:X\:x \else { \:BruShape } \advance\:X \:dd \fi \fi \:DoBrush }\def\:GridPt#1#2#3{ \:xxxx#1 \advance#1 -#2 \:divide#1#3 #1\:InCons#1#3 \advance#1 #2 \ifdim #1=\:xxxx \else \ifdim \:xxxx>#2 \advance#1 #3 \fi \fi } \newcount\:IntId \edef\:IntCount{0\space} \newcount\:DecId \edef\:DecCount{0\space} \Define\:NewCount{\alloc@ 0\count \countdef \insc at unt } \Define\:NewDimen{\alloc@ 1\dimen \dimendef \insc at unt } \def\:NewVar#1#2#3#4#5{ \:multid#1 \def\:temp{ \csname \string#4\the#4\endcsname\z@ \edef#1{\noexpand#3 \csname \string#4\the#4\endcsname}} \def\:next{ \xdef#5{\the#4\space} #2#1 \def\:next{\global\let} \expandafter\:next \csname \string#4\the#4\endcsname#1 \:temp } \advance#4 \@ne \ifnum #4 > #5 \expandafter\:next \else \expandafter\:temp \fi } \def\IntVar#1{\:NewVar#1\:NewCount\:IntOp\:IntId\:IntCount} \def\DecVar#1{\:NewVar#1\:NewDimen\:DecOp\:DecId\:DecCount} \DecVar\Q \DecVar\R \DecVar\T \IntVar\I \IntVar\J \IntVar\K \def\WriteVal#1{\immediate\write\sixt@@n{...\string#1=#1;}} \newdimen\:X \newdimen\:Y \newdimen\:x \newdimen\:y \newdimen\:d \newdimen\:xx \newdimen\:yy \newdimen\:dd \newdimen\:xxx \newdimen\:yyy \newdimen\:ddd \newdimen\:xxxx\newdimen\:yyyy\newdimen\:dddd \newcount\:J \newcount\:K \newdimen\:DI \newdimen\:DJ \newdimen\:DK \newdimen\:DL \newtoks\:t \def\:IntFromPt#1#2{ \:d#2\relax \advance\:d \ifdim\:d<-0.5\p at -\fi 0.5\p@ #1\:d \divide#1 65536\relax} \def\:temp{\catcode`\p12 \catcode`\t12} \def\:Cons{\catcode`\p11 \catcode`\t11} \:temp \def\:Frac#1pt{#1} \def\:rnd#1.#2pt{#1} \:Cons \def\:Cons#1{\expandafter\:Frac\the#1} \def\:sqr#1{#1\expandafter\:Frac\the#1#1} \def\:InCons#1{\expandafter\:rnd\the#1}\def\:Val#1{#1;} \let\Val\:Val\def\:IntOp#1#2{\csname :Op#2\endcsname#1} \let\:SvIntOp\:IntOp \def\:PreIntOp{\let\:IntOp\empty \let\Val\empty} \def\:PostIntOp{\let\:IntOp\:SvIntOp \let\Val\:Val} \expandafter\def\csname :Op;\endcsname#1{ \the#1} \expandafter\def\csname :Op=\endcsname#1#2;{ \:PreIntOp#1#2\:PostIntOp} \expandafter\def\csname :Op+\endcsname#1#2;{ \:PreIntOp\advance #1 #2\:PostIntOp} \expandafter\def\csname :Op-\endcsname#1#2;{ \:PreIntOp\advance #1 -#2\:PostIntOp} \expandafter\def\csname :Op/\endcsname#1#2;{ \:PreIntOp\divide#1 #2\:PostIntOp} \expandafter\def\csname :Op*\endcsname#1#2;{ \:PreIntOp\multiply#1 #2\:PostIntOp} \def\:DecOp#1#2{ \csname :xOp#2\endcsname#1} \let\:SvDecOp\:DecOp \def\:PreDecOp{\let\:IntOp\the \def\:DecOp{\:Cons} \let\Val\empty \let\:du\empty} \def\:PostDecOp{\let\:IntOp\:SvIntOp \let\Val\:Val \let\:DecOp\:SvDecOp \let\:du\::du } \def\::du#1{\p@ \ifx#1\p@ \let\:temp\relax \else \def\:temp{\du{#1}} \fi\:temp} \:PostDecOp \expandafter\def\csname :xOp;\endcsname#1{ \:Cons#1} \expandafter\def\csname :Op[\endcsname#1#2];{ \:PreDecOp \:dd#2\p@ \:IntFromPt#1\:dd \:PostDecOp } \expandafter\def\csname :xOp=\endcsname#1#2;{ \:PreDecOp#1#2\p@\:PostDecOp } \expandafter\def\csname :xOp(\endcsname#1#2){ \:PreDecOp#1#2\p@\:PostDecOp } \expandafter\def\csname :xOp+\endcsname#1#2;{ \:PreDecOp\advance #1 #2\p@\:PostDecOp } \expandafter\def\csname :xOp-\endcsname#1#2;{ \:PreDecOp\advance #1 -#2\p@\:PostDecOp } \expandafter\def\csname :xOp*\endcsname#1#2;{ \:PreDecOp#1 #2#1\:PostDecOp } \expandafter\def\csname :xOp/\endcsname#1#2;{ \:PreDecOp \:divide#1{#2\p@} \:PostDecOp } \let\IF\ifnum \let\THEN\relax \let\ELSE\else \let\FI\fi \def\EqText(#1,#2){ \z@=\z@ \fi \def\:temp{#1} \def\:next{#2} \ifx \:temp\:next } \def\:IfInt#1(#2,#3){ \z@=\z@ \fi \:IntOp\:K=#2; \:IntOp\:J=#3; \ifnum \:K#1\:J } \def\:IfDim#1(#2,#3){ \z@=\z@ \fi \:DecOp\:d=#2; \:DecOp\:dd=#3; \ifdim \:d#1\:dd } \def\EqInt{ \:IfInt= } \def\LtInt{ \:IfInt< } \def\GtInt{ \:IfInt> } \def\EqDec{ \:IfDim= } \def\LtDec{ \:IfDim< } \def\GtDec{ \:IfDim> } \def\Do(#1,#2)#3{ \expandafter\let \csname :Back\the\:level\endcsname\:Do \expandafter\edef\csname :DoVars\the\:level\endcsname{ \DoReg\the\DoReg \:DoB\the\:DoB} \advance\:level \@ne \DoReg#1 \:DoB#2 \relax \ifnum \DoReg<\:DoB \def\:Do{\ifnum \DoReg>\:DoB \let\:Do\relax \else #3\advance\DoReg \@ne \fi \:Do} \else \def\:Do{\ifnum \DoReg<\:DoB \let\:Do\relax \else #3\advance\DoReg \m at ne \fi \:Do} \fi \def\:nextdo{ \:Do \advance\:level \m at ne \csname :DoVars\the\:level\endcsname \def\:temp{\let\:Do} \expandafter\:temp\csname :Back\the\:level\endcsname } \:nextdo} \let\:Do\relax \newcount\DoReg \let\:DoReg\DoReg \newcount\:DoB \newcount\:level\def\::divide#1{ \:DI\:DK \:dddd\:DL \advance\:DI -\:Cons\:dddd#1 \:IntFromPt\:J\:dddd \advance\:dddd -\:J\p@ \multiply\:J \@M \:IntFromPt\:K{\@M\:dddd} \advance\:J \:K \:dddd\@M\p@ \divide\:dddd \:J \advance#1 \:Cons\:DI\:dddd } \def\:divide#1#2{ \:DK#1 \:DL#2 #1\z@ \::divide#1 \::divide#1 \::divide#1 \::divide#1 \::divide#1 } \def\:Sqrt#1{ \ifdim #1<\:mmp #1\z@ \else \:dd#1 \divide\:dd \tw@ \def\::Sqrt{ \:ddd#1 \:divide\:ddd\:dd \:AbsDif\:d\:dd\:ddd \advance\:dd \:ddd \divide\:dd \tw@ \ifdim \:d < \:mmmp \let\::Sqrt\relax \fi \::Sqrt} \::Sqrt #1\:dd \fi }\Define\:length{ \:dd \:AbsVal \:ddd \:abs\:x \:abs\:y \ifdim \:dd<\:x \:dd\:x \fi \ifdim \:dd<\:y \:dd\:y \fi \ifdim \:dd>\:mp \:divide\:x\:dd \:sqr\:x \:divide\:y\:dd \:sqr\:y \:divide\:ddd\:dd \:sqr\:ddd \advance\:x \:y \advance\:x \:ddd \:y\:dd \:Sqrt\:x \:d\:Cons\:x\:y \else \:d\:dd \fi}\Define\:distance(2){\MarkLoc(@^) \MoveToLoc(#1) \:x \:X \:y \:Y \:ddd\:Z \MoveToLoc(#2) \advance\:x -\:X \advance\:y -\:Y \advance\:ddd -\if:IIID \:Z \else \:ddd \fi \:length \MoveToLoc(@^)}\def\:NormalizeDeg#1{ \:DL#1 \:K\:InCons\:DL \divide\:K \:cccvx \multiply\:K \:cccvx \advance #1 -\:K\p@ \ifdim #1<\z@ \advance #1 \:CCCVX \fi \ifdim #1=\z@ \ifdim\:DL=\z@ \else \advance #1 \:CCCVX \fi \fi }\def\:CosSin#1{ \:DK#1 \:NormalizeDeg\:DK \def\:tempA{} \ifdim \:CVXXX<\:DK \def\:tempA{\:y-\:y} \advance\:DK -\:CCCVX \:DK-\:DK \fi \ifdim \:XC<\:DK \edef\:tempA{\:x-\:x \:tempA} \advance\:DK -\:CVXXX \:DK-\:DK \fi \ifdim 45\p@<\:DK \edef\:tempA{\:d\:x \:x\:y \:y\:d \:tempA} \advance\:DK -\:XC \:DK-\:DK \fi \:x\p@ \:y0.01745\:DK \:d\:y \:K\@ne \edef\:next{\advance\:K \@ne \:sqr\:d \divide\:d \:K \advance} \:next \:x -\:d \:next \:y -\:d \:next \:x \:d \:next \:y \:d \:next \:x -\:d \:next \:y -\:d \:next \:x \:d \:next \:y \:d \:tempA } \Define\:rInitOval(2){ \XSaveUnits \let\du=\:rdu \:Zunits\p@ \:dd#1\:Zunits \:d\:Cons\:dd\:Xunitsx \edef\:Xx{\:Cons\:d} \:d\:Cons\:dd\:Xunitsy \edef\:Xy{\:Cons\:d} \:dd#2\:Zunits \:d\:Cons\:dd\:Yunitsx \edef\:Yx{\:Cons\:d} \:d\:Cons\:dd\:Yunitsy \edef\:Yy{\:Cons\:d} \XRecallUnits \let\du=\:svdu } \Define\:xyInitOval(2){ \:d#1\:Xunits \edef\:Xx{\:Cons\:d} \def\:Xy{0} \:d#2\:Yunits \edef\:Yy{\:Cons\:d} \def\:Yx{0} } \def\:FigSize#1#2#3{ \:x\:LBorder \:y\:RBorder \:d\:TeXLoc {\Object\:temp{#3} \setbox\:box\hbox{ \:temp \multiply\:x by \tw@ \multiply\:y by \tw@ \xdef\:FSize{ \noexpand#1=\:Cons\:x; \noexpand#2=\:Cons\:y;}}} \global\:LBorder\:x \global\:RBorder\:y \global\:TeXLoc \:d \:FSize} \expandafter\let \csname 0:Ln \endcsname\:Ln \expandafter\def\csname 1:Ln \endcsname{ \advance\:x -\:X \advance\:y -\:Y \csname 0:Ln \endcsname(\:x,\:y) } \newcount\:ClipLevel \:ClipLevel\@ne \Define\Clip{\futurelet\:next\:Clip} \Define\:Clip{ \ifx \:next[ \expandafter\:DefClipOut \else \expandafter\:DefClip \fi } \def\:DefClipOut[#1]{ \:DefClip(#1) } \Define\:DefClip(1){ \def\:temp{#1} \ifx \:temp\empty \:ClipLevel\@ne \def\:next{\let\:Ln} \expandafter\:next\csname 0:Ln \endcsname \else \def\:temp{\::DefClip(#1)} \fi \:temp } \Define\::DefClip(1){ \MarkLoc(^) \:x\:X \:y \:Y \Move(#1) \ifdim\:x>\:X \:dd\:X \:X\:x \:x\:dd \fi \ifdim\:y>\:Y \:dd\:Y \:Y\:y \:y\:dd \fi \advance\:ClipLevel \@ne \expandafter\edef\csname \the \:ClipLevel :Ln \endcsname{ \:xxx \the\:x \:yyy \the\:y \:xxxx\the\:X \:yyyy\the\:Y \ifx \:next[ \noexpand\:ClipOut \else \noexpand\:ClipIn \fi } \let\:Ln\:ClipLn \MoveToLoc(^) }\def\:ClipLn(#1,#2){ \:x#1\:Xunits \:y#2\:Yunits { \let\:Xunits\empty \let\:Yunits\empty \advance\:x \:X \advance\:y \:Y \ifdim \:x<\:X \:dd\:X \:X\:x \:x\:dd \:dd\:Y \:Y\:y \:y\:dd \fi \:diff\:dd\:X\:x \:diff\:ddd\:Y\:y \:Z \:AbsVal \:dd \advance\:Z \:AbsVal\:ddd \ifdim \:Z>\sixt@@n\p@ \divide\:dd 128 \divide\:ddd 128 \fi \:Z\:Cons\:y\:dd \advance\:Z -\:Cons\:x\:ddd \ifdim \:dd<\z@ \:dd-\:dd \:ddd-\:ddd \:Z-\:Z \fi \csname \the \:ClipLevel :Ln \endcsname } \advance\:X \:x \advance\:Y \:y }\Define\:ClipIn{ \def\:next{\let\:next} \expandafter\:next\csname \the \:ClipLevel :Ln \endcsname \advance\:ClipLevel \m at ne { \:ClipLeft\:xxxx \:ClipDown\:yyy \:ClipUp\:yyyy \:next } { \:ClipRight\:xxx \:ClipDown\:yyy \:ClipUp\:yyyy \:next } { \:ClipDown\:yyyy \:next } \:ClipUp\:yyy \:next } \Define\:ClipOut{ \:ClipLeft\:xxx \:ClipRight\:xxxx \:ClipUp \:yyyy \:ClipDown \:yyy \def\:next{\let\:next} \expandafter\:next \csname \the\:ClipLevel :Ln \endcsname \advance\:ClipLevel \m at ne \:next }\def\:ClipLeft#1{ \ifdim \:x<#1 \:KilledLine \else \ifdim \:X<#1 \:X#1 \ifdim \:dd>\:mmmp \:Y\:Cons\:ddd\:X \advance\:Y \:Z \:divide\:Y\:dd \fi \fi \fi \:CondKilLn } \def\:ClipRight#1{ \ifdim \:X>#1 \:KilledLine \else \ifdim \:x>#1 \:x#1 \ifdim \:dd>\:mmmp \:y\:Cons\:ddd\:x \advance\:y \:Z \:divide\:y\:dd \fi \fi \fi \:CondKilLn } \Define\:CondKilLn{ \:d\:x \advance\:d -\:X \ifdim \:d<\z@ \:d-\:d \fi \ifdim \:y<\:Y \advance\:d \:Y \advance\:d -\:y \else \advance\:d \:y \advance\:d -\:Y \fi \ifdim \:d<\:mmp \:KilledLine \fi \ifdim \:thickness=\z@ \:KilledLine \fi} \Define\:KilledLine{ \let\:ClipLeft\:gobble \let\:ClipRight\:gobble \let\:ClipUp \:gobble \let\:ClipDown \:gobble \let\:next\relax \expandafter\def\csname 1:Ln \endcsname{}}\def\:ClipUp#1{ \:AbsDif\:d\:y\:Y \ifdim \:d<\:ragged \advance\:y 0.5\:thickness \advance\:Y -0.5\:thickness \ifdim \:Y>#1 \:KilledLine \else \ifdim \:y>#1 \:thickness#1 \advance\:thickness -\:Y \advance\:Y 0.5\:thickness \:y\:Y \else \advance\:Y 0.5\:thickness \advance\:y -0.5\:thickness \fi \fi \:dd\p@ \:ddd\z@ \def\:temp{ \:Z\:Y } \:temp \else \let\:temp\relax \ifdim \ifdim\:Y<\:y\:Y\else\:y\fi >#1 \:KilledLine \else \ifdim \::ClipUp#1\:X\:Y \else \ifdim \::ClipUp#1\:x\:y \fi \fi \fi \fi \:CondKilLn } \def\::ClipUp#1#2#3{ #3>#1 #3#1 \ifdim \:AbsVal\:ddd>\:mmmp #2\:Cons\:dd#3 \advance#2 -\:Z \:divide#2\:ddd \fi }\def\:ClipDown#1{ \:Ex2#1 \:Flip\:y \:Flip\:Y \:ClipUp#1 \:Flip\:y \:Flip\:Y \:temp } \def\:Flip#1{ #1-#1 \advance#1 \:Ex } \Define\:SetDrawWidth{ \hsize\:RBorder \advance\hsize -\:LBorder \leftskip -\:LBorder \rightskip\z@} \newdimen\:thickness \:thickness0.75\p@ \Define\PenSize(1){\:thickness#1\relax} \Define\:Draw{ \ifvmode \noindent\hfil\fi \global\:TeXLoc\z@ \vbox\bgroup \begingroup \def\EndDraw{ \endgroup \:SetDrawWidth \egroup} \:DraCatCodes \parindent\z@ \everypar{} \leftskip\z@ \rightskip\z@ \boxmaxdepth\maxdimen \linepenalty10 \let\FigSize\:FigSize \def\Draw{\:wrn1{}} \:CommonIID \:InDraw } \Define\:CommonIID{\def\RotateTo{\:RotateTo} \def\Rotate{\:Rotate} \def\MoveF{\:MvF}\def\LineToLoc{\:LnToLoc}}\newdimen\:Xunits \:Xunits\p@ \newdimen\:Yunits \:Yunits\p@ \Define\:InDraw{\:Opt()\::InDraw{\:Xunits,\:Yunits}} \Define\::InDraw(2){ \:X\z@ \:Y\z@ \:Xunits#1 \relax \:Yunits#2 \:AdjRunits \global\:LBorder\z@ \global\:RBorder\z@ \gdef\:UBorder{0pt} \:loadIID \leavevmode } \Define\:Resize(2){ \:Xunits#1\:Xunits \relax \:Yunits#2\:Yunits \:AdjRunits } \Define\:Units(2){ \:Xunits#1 \relax \:Yunits#2 \:AdjRunits } \Define\:loadIID{ \def\LineAt{\:DLn} \def\LineTo{\:LnTo} \def\MoveTo{\:MvTo} \def\Line{\:Ln} \def\Move{\:Mv} \def\MoveF{\:MvF} \:rotatedfalse\def\:InitOval{\:xyInitOval} \def\Scale{\:Resize} \def\Units{\:Units}}\let\SaveAll\begingroup \let\RecallAll\endgroup \def\DrawOn{\def\Draw{\:Draw}} \DrawOn \def\DrawOff{\def\Draw{\begingroup \:J\@cclv \:NoDrawSpecials \:NoDraw}} \catcode`\/0 \catcode`\\11 /def/:NoDraw#1\EndDraw{/endgroup} /catcode`/\0 /catcode`//12 \def\:NoDrawSpecials{\catcode\:J11 \ifnum \:J=\z@ \let \:NoDrawSpecials\relax \fi \advance\:J \m at ne \:NoDrawSpecials} \let\:XunitsReg\:Xunits \let\:YunitsReg\:Yunits \Define\EntryExit(4){ \edef\:InOut##1{ \noexpand\ifcase ##1\space #1\noexpand\or #2\noexpand\or #3\noexpand\or #4\noexpand\fi}} \EntryExit(0,0,0,0)\Define\:DrawBox{ \:x0.5\wd\:box \:y\ht\:box \advance\:y \dp\:box \divide\:y \tw@ \advance \:X -\:InOut0\:x \advance \:Y -\:InOut1\:y { \advance \:X -\:x { \advance \:Y \:y \ifdim\:Y>\:UBorder \xdef\:UBorder{\the\:Y}\fi \ifdim\:X<\:LBorder \global\:LBorder\:X\fi \advance\:X \wd\:box \ifdim\:X>\:RBorder \global\:RBorder\:X\fi } \advance \:Y -\:y \advance \:Y \dp\:box {\:d\:X \advance\:d \wd\:box \advance\:X -\:TeXLoc \global\:TeXLoc\:d \vrule width\:X depth\z@ height\z@ \raise \:Y \box\:box} } \edef\MoveToExit(##1,##2){ \:X\the\:X \:Y\the\:Y \:x\the\:x \:y\the\:y \advance\:X ##1\:x \advance\:Y ##2\:y} \advance \:X \:InOut2\:x \advance \:Y \:InOut3\:y } \Define\ThreeDim{\:Opt[]\:ThreeDim{\p@}} \def\:ThreeDim[#1](#2){\::ThreeDim[#1](#2,,)} \def\::ThreeDim[#1](#2,#3,#4,#5){ \bgroup\begingroup \def\EndThreeDim{ \endgroup\egroup} \:IIIDtrue \:Zunits#1 \:Z\z@ \def\:temp{#4} \ifx \:temp\empty \:CosSin{#3\p@} \:divide\:x\:y \:Ey\:x \:CosSin{#2\p@} \:Ex\:Cons\:Ey\:x \:Ey\:Cons\:Ey\:y \let\:project\:projectPar \else \:Ex#2\:Xunits \:Ey#3\:Yunits \:Ez#4\:Zunits \let\:project\:projectPer \fi \def\LineAt{\:tDLn} \def\LineTo{\:tLnTo} \def\MoveTo{\:tMvTo} \def\Line{\:tLn} \def\Move{\:tMv} \def\Scale{\:tResize} \def\Units{\:tUnits}\def\RotateTo{\:tRotateTo} \def\Rotate{\:tRotate} \def\MoveF{\:tMvF} \:Vdirection\z@ \def\LineToLoc{\:tLnToLoc} } \Define\:projectPer{ \:diff\:x\:X\:Ex \:diff\:y\:Y\:Ey \:diff\:xxxx\:Z\:Ez \:divide\:x\:xxxx \:divide\:y\:xxxx \:x-\:Cons\:Ez\:x \:y-\:Cons\:Ez\:y \advance\:x \:Ex \advance\:y \:Ey} \Define\:projectPar{ \:x\:Cons\:Ex\:Z \advance\:x \:X \:y\:Cons\:Ey\:Z \advance\:y \:Y} \def\:tDLn(#1,#2,#3,{\:tMvTo(#1,#2,#3) \:tLnTo(} \Define\:tMvTo(3){ \:X#1\:Xunits \:Y#2\:Yunits \:Z#3\:Zunits} \Define\:tMv(3){ \advance\:X #1\:Xunits \advance\:Y #2\:Yunits \advance\:Z #3\:Zunits} \Define\:tResize(3){ \:Xunits#1\:Xunits \:Yunits#2\:Yunits \:Zunits#3\:Zunits \:AdjRunits} \Define\:tUnits(3){ \:Xunits#1 \relax \:Yunits#2 \relax \:Zunits#3 \:AdjRunits}\Define\:tLnTo(3){ \:project \edef\:temp{\:x\the\:x \:y\the\:y} \:X#1\:Xunits \:Y#2\:Yunits \:Z#3\:Zunits \:DLN} \Define\:tLn(3){ \:project \edef\:temp{\:x\the\:x \:y\the\:y} \advance\:X #1\:Xunits \advance\:Y #2\:Yunits \advance\:Z #3\:Zunits \:DLN} \Define\:DLN{ \TwoDim \:temp \LineTo(\:x\du,\:y\du) \EndTwoDim }\Define\TwoDim{\bgroup\begingroup \def\EndTwoDim{\endgroup\egroup} \:loadIID \if:IIID \:IIIDfalse \:project \:X\:x \:Y\:y \:CommonIID \fi \Units(\:Xunits,\:Yunits)} \newif\if:rotated \Define\RotatedAxes(2){\begingroup \def\EndRotatedAxes{\endgroup} \if:IIID \:IIIDfalse \:project \:X\:x \:Y\:y \:CommonIID \fi \:DK#2\p@ \advance\:DK -#1\p@ \advance\:DK -\:CVXXX \:NormalizeDeg\:DK \ifdim \:DK<\:mmp \:wrn4{(#1,#2)} \else \:DK#1\p@ \:NormalizeDeg\:DK \:CosSin\:DK \:Xunitsx\:x \:Xunitsy\:y \:DK#2\p@ \advance\:DK -\:XC \:NormalizeDeg\:DK \:CosSin\:DK \edef\Units(##1,##2){\noexpand\:Units(##1,##2) \:Xunitsx \:Cons\:Xunitsx\:Xunits \:Xunitsy \:Cons\:Xunitsy\:Xunits \:Yunitsx-\:Cons\:y\:Yunits \:Yunitsy \:Cons\:x\:Yunits } \fi \def\Scale{\:rResize} \def\MoveTo{\:rMvTo} \def\Move{\:rMv} \def\LineTo{\:rLnTo} \def\Line{\:rLn} \def\LineAt{\:rDLn} \def\MoveF{\:rMvF}\def\:InitOval{\:rInitOval} \MarkLoc(:org) \Units(\:Xunits,\:Yunits) \:rotatedtrue } \newdimen\:Xunitsx \newdimen\:Xunitsy \newdimen\:Yunitsx \newdimen\:Yunitsy \Define\:rResize(2){ \:Xunits #1\:Xunits \:Yunits #2\:Yunits \:Xunitsx#1\:Xunitsx \:Xunitsy#1\:Xunitsy \:Yunitsx#2\:Yunitsx \:Yunitsy#2\:Yunitsy } \def\:rdu#1{% \ifx #1\:Xunits \units:i\else \ifx #1\:Yunits \units:i\else \ifx #1\:Zunits \units:i\else #1\fi \fi \fi } \def\units:i{\Units(\p@,\p@)} \Define\:rMvTo{\MoveToLoc(:org) \:rMv} \Define\:rMv(1){ \:rxy(#1) \advance\:X \:x \advance\:Y \:y} \Define\:rLnTo(1){ \MarkLoc(:a) \:rMvTo(#1) {\LineToLoc(:a)} } \Define\:rLn(1){ \:rxy(#1) \:Ln(\:x\du,\:y\du) } \def\:rDLn(#1,#2,{\:rMvTo(#1,#2)\:rLnTo(} \Define\:rxy(2){ \XSaveUnits \let\du=\:rdu \:Zunits\p@ \:Zunits#1\:Zunits \:x\:Cons\:Zunits\:Xunitsx \:y\:Cons\:Zunits\:Xunitsy \XRecallUnits \XSaveUnits \:Zunits\p@ \:Zunits#2\:Zunits \advance\:x \:Cons\:Zunits\:Yunitsx \advance\:y \:Cons\:Zunits\:Yunitsy \XRecallUnits \let\du=\:svdu} \Define\:rMvF(1){ \:CosSin\:direction \XSaveUnits \let\du=\:rdu \:Zunits\p@ \:Zunits#1\:Zunits \:x\:Cons\:Zunits\:x \:y\:Cons\:Zunits\:y \edef\:temp{(\:Cons\:x,\:Cons\:y)} \expandafter\Move\:temp \XRecallUnits \let\du=\:svdu} \Define\:AdjRunits{ \:Xunitsx\:Xunits \:Xunitsy\z@ \:Yunitsx\z@ \:Yunitsy\:Yunits} \Define\Text{ \setbox\:box \vtop\bgroup \edef\DoReg{\the\DoReg} \hyphenpenalty\@M \exhyphenpenalty\@M \catcode`\ 10 \catcode`\^^M13 \catcode`\^^I10 \catcode`\&4 \let~\space \csname ;catcode\endcsname % % \:Text} \catcode`\^^M13 % \def\:Text(--#1--){% \:SetLines#1\hbox{}^^M--)^^M % \egroup % \if:IIID \TwoDim \:DrawBox \EndTwoDim % \else \:DrawBox \fi} % \def\:SetLines#1^^M{ % \def\:TextLine{#1} % \ifx \:TextLine\:LastLine \let\:temp\relax % \else \def\:temp{ % \:IndirectLines#1\relax~~--)~~\:SetLines}% \fi \:temp } \catcode`\^^M9 \def\:IndirectLines#1~~{ \def\:TextLine{#1} \ifx \:TextLine\:LastLine \let\:temp\relax \else \def\:temp{\:AddLine{#1}\:IndirectLines} \fi \:temp } \Define\:LastLine{--)} \def\:AddLine#1{ \ifvmode \noindent \hsize\z@ \else \hfil \penalty-500 \hbox{} \fi \hfil#1 \setbox\:box\hbox{#1} \ifdim \wd\:box>\hsize \hsize\wd\:box \fi}\def\TextPar#1#2{ \def\:TxtPar##1(##2){##1(--##2--)} \edef\:temp{\expandafter\noexpand\csname :\string#2\endcsname} \edef#2{\noexpand\:TextPar\expandafter\noexpand\:temp} \expandafter\let\:temp\:undefined \expandafter#1\:temp} \catcode`\^^M13 \def\:TextPar#1{\begingroup \catcode`\&4 % \csname ;catcode\endcsname % % \catcode`\ 10 \catcode`\^^M13 \catcode`\^^I10 % \:TPar{#1}} \catcode`\^^M9 % \def\:TPar#1(--#2--){\endgroup #1(--#2--) } \newdimen\:direction \newdimen\:Vdirection \Define\:Rotate(1){ \advance \:direction #1\p@ \:NormalizeDeg\:direction } \Define\:RotateTo(1){ \:direction #1\p@ \:NormalizeDeg\:direction } \Define\:tRotate(2){ \advance\:Vdirection #2\p@ \:NormalizeDeg\:Vdirection \:Rotate(#1)} \Define\:tRotateTo(2){ \:Vdirection #2\p@ \:NormalizeDeg\:Vdirection \:RotateTo(#1)} \Define\LineF(1){\MarkLoc(,)\MoveF(#1) {\LineToLoc(,)}} \Define\:MvF(1){ \:CosSin\:direction \:d#1\:Xunits \advance\:X \:Cons\:d\:x \:d#1\:Yunits \advance\:Y \:Cons\:d\:y } \Define\MoveFToOval(2){ \:NormalizeDeg\:direction \:CosSin\:direction \:Zunits\p@ \:d#2\:Zunits \:x\:Cons\:d\:x \ifdim \:d=\z@ \:err5{...,\:Cons\:d} \fi \:d#1\:Zunits \:y\:Cons\:d\:y \ifdim \:d=\z@ \:err5{\:Cons\:d,...} \fi \:SearchDir \XSaveUnits \if:rotated \:Zunits\p@ \:Zunits#1\:Zunits \:x\:Cons\:Zunits\:Xunits \:Zunits\p@ \:Zunits#2\:Zunits \:y\:Cons\:Zunits\:Yunits \else \:x#1\:Xunits \:y#2\:Yunits \fi \relax \Units(\:x,\:y) \:Vdirection\:direction \:direction\:ddd \MoveF(\@ne) \:direction\:Vdirection \XRecallUnits } \Define\:tMvF(1){ \:CosSin\:Vdirection \:d #1\:Zunits \advance\:Z \:Cons\:y\:d \:xx#1\:Xunits \:yy#1\:Yunits \:xx\:Cons\:x\:xx \:yy\:Cons\:x\:yy \:CosSin\:direction \:x\:Cons\:xx\:x \:y\:Cons\:yy\:y \advance\:X \:x \advance\:Y \:y } \Define\CSeg{\:Opt[]\:CSeg1} \def\:CSeg[#1]#2(#3,#4){ \MarkLoc($^) \MoveToLoc(#4) \:x\:X \:y\:Y \if:IIID \:d\:Z \fi \MoveToLoc(#3) \advance\:x -\:X \:x#1\:x \advance\:y -\:Y \:y#1\:y \if:IIID \advance\:d -\:Z \:d#1\:d \fi \:t{#2} \edef\:temp{\the\:t( \expandafter\:Frac\the\:x\noexpand\:du, \expandafter\:Frac\the\:y\noexpand\:du \if:IIID , \expandafter\:Frac\the\:d\noexpand\:du \fi)} \MoveToLoc($^) \:temp}\Define\LSeg{\:Opt[]\:LSeg1} \def\:LSeg[#1]#2(#3,#4){ \:distance(#3,#4) \:d#1\:d \:t{#2} \edef\:temp{\the\:t(\expandafter\:Frac\the\:d\noexpand\:du)} \:temp}\Define\DSeg{\:Opt[]\:DSeg1} \def\:DSeg[#1]#2(#3,#4){ \MarkLoc(^) \MoveToLoc(#4) \:xxx\:X \:yyy\:Y \:xxxx\:Z \MoveToLoc(#3) \advance\:xxx -\:X \advance\:yyy -\:Y \ifdim \:AbsVal\:xxx<\:mmmp \ifdim \:AbsVal\:yyy<\:mmmp \:wrn5{#3,#4} \fi\fi \if:IIID \advance \:xxxx -\:Z \:divide\:xxx\:Xunitsx \:divide\:yyy\:Yunitsy \:divide\:xxxx\:Zunits \:x\:xxx \:y\:yyy \:ddd\z@ \:length \:x\:d \:y\:xxxx \:SearchDir \:yyyy\:ddd \:x\:xxx \:y\:yyy \else \:x \:AbsVal\:Yunitsy \:y \:AbsVal\:Xunitsy \ifdim \:y>\:x \:x\:y \fi \:y \:AbsVal\:Yunitsx \ifdim \:y>\:x \:x\:y \fi \:y \:AbsVal\:Xunitsx \ifdim \:y>\:x \:x\:y \fi \:K \:InCons\:x \relax \ifnum \:K<\thr@@ \:K\@ne \else \ifnum \:K<\sixt@@n \:K4 \else \ifnum \:K<\:XC \:K\sixt@@n \else \ifnum \:K<\@m \:K\@cclvi \fi \fi \fi \fi \divide\:xxx \:K \divide\:yyy \:K \:x \:Cons\:Yunitsy\:xxx \advance\:x -\:Cons\:Yunitsx\:yyy \:y-\:Cons\:Xunitsy\:xxx \advance\:y \:Cons\:Xunitsx\:yyy \fi \:SearchDir \:ddd#1\:ddd \:t{#2} \edef\:temp{\the\:t( \:Cons\:ddd \if:IIID ,\:Cons\:yyyy \fi)} \MoveToLoc(^) \:temp} \def\:theDoReg{\def\DoReg{\the\:DoReg}} \Define\MarkLoc{ \:theDoReg \expandafter\edef \csname \:MarkLoc} \Define\MarkGLoc{ \:theDoReg \expandafter\xdef \csname \:MarkLoc} \Define\:MarkLoc(1){ Loc\space#1:\endcsname{ \:X\the\:X \:Y\the\:Y \if:IIID \:Z\the\:Z \fi } \let\DoReg\:DoReg } \Define\MoveToLoc(1){ \:theDoReg \expandafter\ifx \csname Loc\space#1:\endcsname\relax \:err2{#1}\fi \csname Loc\space#1:\endcsname \let\DoReg\:DoReg } \Define\MarkPLoc(1){ \:theDoReg \if:IIID \:project \expandafter\edef \csname Loc\space#1:\endcsname{ \:X\the\:x \:Y\the\:y \:Z\z@} \else \:err1\MarkPLoc \fi \let\DoReg\:DoReg} \Define\WriteLoc(1){{ \:theDoReg \edef\:temp{#1} \ifx \:temp\empty \else \MoveToLoc(#1) \fi \immediate\write\sixt@@n{... \:temp=(\the\:X,\the\:Y\if:IIID,\the\:Z\fi)}}} \Define\:LnToLoc(1){ \:x\:X \:y\:Y \MoveToLoc(#1) { \:LnTo(\:x\du,\:y\du) }} \Define\:tLnToLoc(1){ \:xx\:X \:yy\:Y \:dd\:Z \MoveToLoc(#1) { \:tLnTo(\:xx\du,\:yy\du,\:dd\du) }}\def\:GetLine#1#2#3#4#5{ \MoveToLoc(#1) \divide\:X \:eight \divide\:Y \:eight #3\:X #4\:Y \MoveToLoc(#2) \divide\:X \:eight \divide\:Y \:eight \advance #3 -\:X \advance #4 -\:Y #5\:Cons#3\:Y \advance #5 -\:Cons#4\:X \divide #3 \:eight \divide #4 \:eight \relax } \def\MoveToLL(#1,#2)(#3,#4){ \:GetLine{#1}{#2}\:x \:y \:xxx \:GetLine{#3}{#4}\:xx\:yy\:xxxx \:ddd \:Cons\:x \:yy \advance\:ddd -\:Cons\:xx\:y \ifdim \:AbsVal\:ddd < \:mmmp \:X\@cclv\p@ \:Y\:X \:wrn3{(\string#1,\string#2)(\string#3,\string#4)} \else \:divide\:xxx\:ddd \:divide\:xxxx\:ddd \:X\:Cons\:xxx\:xx \advance\:X -\:Cons\:xxxx\:x \:Y\:Cons\:xxx\:yy \advance\:Y -\:Cons\:xxxx\:y \fi }\Define\MoveToCC{\:Opt[]\:MoveToCC{}} \def\:MoveToCC[#1](#2,#3)(#4,#5){ \:UserUnits(#2,#3)(#4,#5) \:distance($#2,$#4) \ifnum \:d<\:mp \MoveToLoc(#3) \:wrn3{(#1,#2)(#3,#4)} \else \:xx \:d \:distance($#2,$#3) \:xxx\:d \:distance($#5,$#4) \:yy \:xxx \advance\:yy -\:d \:yyy\:xxx \advance\:yyy \:d \:divide\:yy\:xx \:yy\:Cons\:yy\:yyy \advance\:yy \:xx \divide\:yy \tw@ \:yyy \ifdim \:AbsVal\:xxx>\:AbsVal\:yy \:xxx \else \:yy \fi \ifdim \:AbsVal\:yyy<\:mp \:yyy\z@ \else \:divide\:xxx\:yyy \:sqr\:xxx \:yyyy\:yy \:divide\:yyyy\:yyy \:sqr\:yyyy \advance\:xxx -\:yyyy \:Sqrt\:xxx \:yyy\:Cons\:yyy\:xxx \fi \MoveToLoc($#4) \:x\:X \:y\:Y \:divide\:yy\:xx \MoveToLoc($#2) \advance\:x -\:X \advance\:y -\:Y \advance\:X \:Cons\:yy\:x \advance\:Y \:Cons\:yy\:y \:divide\:yyy\:xx \advance\:X #1\:Cons\:yyy\:y \advance\:Y -#1\:Cons\:yyy\:x \fi \:SysUnits }\def\:UserUnits(#1,#2)(#3,#4){ \:xx\:Xunitsx \:xxx\:Xunitsy \:yy\:Yunitsx \:yyy\:Yunitsy \:xxxx\:Cons\:yy\:xxx \advance\:xxxx \:Cons\:yyy\:xx \ifdim \:AbsVal\:xxxx>\:mmmp \:divide\:xx\:xxxx \:divide\:xxx{-\:xxxx} \:divide\:yy{\:xxxx} \:divide\:yyy\:xxxx \fi \:UnLoc(#1) \:UnLoc(#2) \:UnLoc(#3) \:UnLoc(#4)}\Define\:SysUnits{ \MoveTo(\:Cons\:X,\:Cons\:Y)}\Define\:UnLoc(1){ \MoveToLoc(#1) \:d\:Cons\:yyy\:X \advance\:d \:Cons\:yy\:Y \:Y\:Cons\:xx\:Y \advance\:Y \:Cons\:xxx\:X \:X\:d \MarkLoc($#1)}\def\MoveToLC{\:Opt[]\:MoveToLC{}} \def\:MoveToLC[#1](#2,#3)(#4,#5){ \:UserUnits(#2,#3)(#4,#5) \MoveToLoc($#2) \:x\:X \:y\:Y \MoveToLoc($#3) \advance\:x -\:X \advance\:y -\:Y \edef\:temp{ \:xxx\the\:x \:yyy\the\:y } \MoveToLoc($#4) \advance\:X \:y \advance\:Y -\:x \MarkLoc(^$) \MoveToLL($#4,^$)($#2,$#3) \MarkLoc(^$) \:distance($#4,$#5) \:xx\:d \:distance($#4,^$) \ifdim \:d>\:xx \:wrn3{(#2,#3)(#4,#5)} \else \ifdim \:d<\:mmp \:yy\:xx \else \:yy\:d \:divide\:yy\:xx \:sqr\:yy \:yy-\:yy \advance\:yy \p@ \:Sqrt\:yy \:yy\:Cons\:xx\:yy \fi \fi \:temp \:x\:xxx \:y\:yyy \:length \:xx\:d \:divide\:xxx\:xx \:divide\:yyy\:xx \advance\:X #1\:Cons\:yy\:xxx \advance\:Y #1\:Cons\:yy\:yyy \:SysUnits } \def\Object#1{\:Opt(){\:DefineSD#1}0} \def\:DefineSD#1(#2){\begingroup \:multid#1 \:DraCatCodes \:DefSD#1(#2)} \def\:DefSD#1(#2)#3{ \expandafter\::Define\csname\string#1.\endcsname(#2){ \:t{\:SubD{#3}} \if:IIID \edef\:temp{\noexpand\TwoDim \the\:t \noexpand\EndTwoDim} \else \def\:temp{\the\:t} \fi \:temp} \def#1{\def\:SDname{\csname\string#1.\endcsname} \:Opt[]\:CallSD{}}} \def\:CallSD[#1]{ \edef\:Entry{#1} \:SDname }\def\:SubD#1{ \let\::RecallXLoc\:AddXLoc \gdef\:AddXLoc{} \edef\:RecallBor{ \global\:LBorder \the\:LBorder \global\:RBorder \the\:RBorder \xdef\noexpand\:UBorder{\:UBorder} \global\:TeXLoc\the\:TeXLoc } \global\:TeXLoc\z@ \setbox\:box\vbox{\EntryExit(0,0,0,0) \begingroup \def\MarkXLoc{\:MarkXLoc} \:InDraw #1 \endgroup \:SetDrawWidth \let\:XLoc\relax \xdef\:AddXLoc{\:dd\the\:LBorder \:AddXLoc}} \:RecallBor \:ddd\dp\:box \ifx \:Entry\empty \:DrawBox \else \let\:RecallIn\:InOut \:x\:X \:y\:Y \def\:XLoc(##1,##2,##3){ \def\:temp{##1} \ifx \:temp\:Entry \:X\:x \advance\:X -##2 \:Y\:y \advance\:Y -##3 \fi} \:AddXLoc \advance\:X \:dd \advance\:Y -\:ddd \EntryExit(-1,-1,\:InOut2,\:InOut3) \:DrawBox \let\:InOut\:RecallIn \fi \MarkLoc(^) \MoveToExit(-1,-1) \:xxx\:X \:yyy\:Y \advance\:yyy \:ddd \def\:XLoc(##1,##2,##3){ \:X\:xxx \advance\:X ##2 \advance\:X -\:dd \:Y\:yyy \advance\:Y ##3 \MarkLoc(##1)} \:AddXLoc \MoveToLoc(^) \ifx \:Entry\empty \else \MoveToLoc(\:Entry) \fi \global\let\:AddXLoc\::RecallXLoc } \Define\:MarkXLoc(1){ \:theDoReg \let\:XLoc\relax \xdef\:AddXLoc{\:AddXLoc \:XLoc(#1,\the\:X,\the\:Y)} \let\DoReg\:DoReg} \catcode`\ 10 \catcode`\^^M5 \catcode`\^^I10 \let\wlog\:wlog \let\:wlog\:undefined \:RestoreCatcodes \tracingstats1 \endinput --- NEW FILE ProTex.sty --- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% v 1.5 % ProTex % % Copyright (C) 1990,1991 by Eitan M. Gurari % % % % This program can redistributed and/or modified under % % the terms of the LaTeX Project Public License % % Distributed from CTAN archives in directory % % macros/latex/base/lppl.txt; either version 1 of the % % License, or (at your option) any later version. % % % % However, you are allowed to modify this program % % without changing its name, if you modify its % % signature. Changes to the signature can be introduced % % with a directive of the form % % \message{signature} % % % % gurari at cse.ohio-state.edu % % http://www.cse.ohio-state.edu/~gurari % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \expandafter\edef\csname :RestoreCatcodes\endcsname{% \catcode`\noexpand :=\the\catcode`:% \catcode`\noexpand @=\the\catcode`@% \catcode`\noexpand -=\the\catcode`-% \catcode`\noexpand +=\the\catcode`+% \catcode`\noexpand ^=\the\catcode`^% \let\expandafter\noexpand\csname:RestoreCatcodes\endcsname= \noexpand\undefined} \catcode`\:=11 \catcode`\@=11 \catcode`\^=7 \def\:latexpg{\ifx\pageno\:undefined \let\pageno=\c at page \fi} \:latexpg \def\:minus{-} \catcode`\-=13 \catcode`\+=13 \def\Code#1#2{% {\:TraceDef#1{#2}}% \ifx #1\:undefined \else \def#1{}% \:warn{\string\Code\space redefines \string#1}\fi \ifx #1\:undefined \ModifyCode{#1}\fi \gdef#1{-{#2}{\string#1}}\AppendCode#1}\def\ModifyCode#1{} \def\:warn#1{\immediate \write16{l.\the\inputlineno \space\:minus\string- Warning \:minus\string- #1}} \def\:CheckCommand#1#2{% \def-##1##2{\let\:undefined=\relax}% \def+##1##2{}% #2\relax \ifx \:undefined\relax \else \errmessage{\string#1\string#2 without \string\Code\string#2}\fi} \def\AppendCode#1{% \begingroup \:CheckCommand\AppendCode#1% \:defaultcats \def\:ScanAppend##1{\endgroup \:ifempty{##1}\else \global\advance\:CodeNumber by 1 {\def\:TagCs{\string#1.\the\:CodeNumber}% \:WriteTrc{DefineCode}}% \:ExpandDef#1{+{##1}}{\noexpand {\CodeId{\string#1}{\the\:CodeNumber}\noexpand}}% \AfterCode{#1}% \fi}% \ModifyAppendCode{#1}\relax \:ScanAppend}\def\ModifyAppendCode#1{} \def\AfterCode#1{} \def\:ifempty#1{\def\:parm{#1}% \ifx \:parm\empty}\def\CodeId#1#2{#1.#2} \newcount\:CodeNumber \newtoks\:tokens \def\:ExpandDef#1#2#3{% \:tokens=\expandafter{#1#2}% \xdef#1{\the\:tokens #3}}\def\:defaultcats{% \:NoSpecials{12}{0}{255}% \:NoSpecials{11}{65}{90}% \:NoSpecials{11}{97}{122}% \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\ =13 \catcode`\^^M=13 \catcode`\^^I=13 } \def\:NoSpecials#1#2#3{\edef\:temp{\the\:CodeNumber}% \global\:CodeNumber=#3 \def\:next{\catcode\:CodeNumber=#1 \ifnum \:CodeNumber=#2 \let\:next=\relax \fi \global\advance\:CodeNumber by \:minus1 \:next}\:next \global\:CodeNumber=\:temp } \def-#1#2{{\CodeFont \WindowTitle{#1}}} \def+#1#2{} \def\WindowTitle#1{\leavevmode \hbox{$\triangleleft \triangleleft$}~#1~\hbox{$\triangleright \triangleright$}} \let\CodeFont=\tt \def\ShowCode#1{% \def\:test{#1}% \ifx \:test\:minus \expandafter\:ShowCode \else \:ShowCode#1\fi}\def\:ShowCode#1{% \begingroup \:ShowCommands \:SpTbLn \def\\{\char 92 }% \def\{{\char 123 }% \def\}{\char 125 }% \ifvmode \def\:Sp{\leavevmode\phantom{x}}% \def\:Tb{\:Sp\:Sp}% \def\:Ln{\leavevmode\par}% \else \def\:Sp{ }% \def\:Tb{ \ignorespaces}% \def\:Ln{\:Tb}% \fi \ifvmode \everypar={}% \:CodeSkip \parskip=0em \parindent=\:minus3em \advance \leftskip by 6em % \def\:TopTitle##1{{\:TitleShift \noindent \hfil \:FrontTitle{##1}\par \nobreak \smallskip}}% \def\:BottomTitle{{\par \nobreak \:TitleShift \noindent \hfil \:BackTitle\par}}% \else \def\:TopTitle##1{\:FrontTitle{##1} }% \def\:BottomTitle{ \:BackTitle}% \def\:CodeSkip{}% \fi \def\:FrontTitle##1{\PortTitle{##1}\:AppendSign}% \def\:BackTitle{\hbox{$\diamond\diamond\diamond$}}% % \def\PortTitle##1{\leavevmode \hbox{$\triangleright \triangleright$}~##1~\hbox{$\triangleleft \triangleleft$}}% \def-##1##2{}% \def+##1##2{\let+=\:next}% \def\:next##1##2{\def\:AppendSign{\char43 }}% \def\:AppendSign{}% #1\relax \def-##1##2{}% \def+##1##2{\def\:LastCodeLabel{##2}}% \def\:LastCodeLabel{}% #1\relax \ifx\:LastCodeLabel\empty\else {\def\:TagCs{\:LastCodeLabel}\:WriteTrc{ShowCode}}% \fi \CodeFont \:CheckCommand{\ShowCode}{#1}% \ModifyShowCode{#1}\relax \ifx \:test\:minus \else \def-##1##2{\:TopTitle{##1}}% \def+##1##2{}% \ModifyFrontTitle{#1}\relax #1\relax \fi \def-##1##2{}% \def+##1##2{\def\:LastCode{##1}}% \def\:LastCode{}% \ModifyLastCode{#1}\relax #1\relax\def-##1##2{{\def\:TagCs{##2}\:WriteTrc{ShowTitle}}% \WindowTitle{##1}}% \def+##1##2{}% \ModifyShowLastCode{#1}\relax \:LastCode \ifx \:test\:minus \else \:BottomTitle \fi \:CodeSkip \endgroup} \def\ModifyShowCode#1{} \def\:CodeSkip{\ifdim \CodeSkipAmount>0pt \vskip\:minus\lastskip \fi \vskip\CodeSkipAmount} \def\CodeSkipAmount{\medskipamount} \def\ShiftTitle#1{% \def\:TitleShift{\advance \leftskip by #1}} \ShiftTitle{\:minus6em} \def\ModifyFrontTitle#1{}\def\ModifyLastCode#1{} \def\ModifyShowLastCode#1{}\begingroup \catcode`\.=10 \catcode`\^^I=13 \catcode`\^^M=13% \catcode`\ =13% ...\gdef\:SpTbLn{% ......\def {\:Sp}\def^^M{\:Ln}\def^^I{\:Tb}}% \endgroup\begingroup \catcode`\{=12 \catcode`\}=12 \catcode`\[=1 \catcode`\]=2 \gdef\:lbrc[{] \gdef\:rbrc[}] \catcode`\,=0 \catcode`\\=12 ,gdef,:backslash[\] ,endgroup \catcode`\%=12 \catcode`\@=14 \def\:ShowCommands{@ \tempor \ifvmode \linepenalty=100 \def\NL%{$\rightarrow\rightarrow$\hfill\break}@ \def\%##1\%{{\CommentFont \def\:Tb{ \ignorespaces}@ \def\:Sp{ }@ \def\:Ln{\hfill\break}@ ##1}}@ \else \def\NL%{}@ \def\%##1\%{{\CommentFont ##1}}@ \fi} \def\CommentFont{\it} \def\:OutCommands{\def\NL%{}\def\%##1\%{}} \catcode`\%=14 \catcode`\@=11 \def\:OutputCode#1{% \begingroup \:OutCommands \:CheckCommand{\OutputCode}{#1}% \:latexpg {\def\:TagCs{\string#1}\:WriteTrc{OutputCode}}% \def\Tag##1##2{}\def\Ref##1{}% \:SpTbLn \def\:Sp{ }% \def\:Tb{\:Sp\:Sp}% \newlinechar`\^^J \def\:Ln{^^J}% \def\\{\:backslash}% \def\{{\:lbrc}% \def\}{\:rbrc}% \def\Extension{prg}% \def\:WriteCode{\immediate\write15{#1}}% % rules for expanding the code macros \def-##1##2{}% \def+##1##2{\:comment{##2\ifx \CodeId\:gobbleii\else...\fi}##1% \:comment{\ifx \CodeId\:gobbleii\else...\fi##2}}% % name for the auxiliary code file \def\:gobble##1{}% \def\:FileName{\expandafter \:gobble\string#1.\Extension}% % writing the file \ModifyOutputCode{#1}\relax \immediate\openout15=\:FileName \:WriteCode \immediate\closeout15 % notifying the user \ProTexMssg{\string-\string-\string- Writing file \string-\string-\string- \:FileName\space\string-\string-\string-}% \endgroup } \def\:gobbleii#1#2{} \def\ProTexMssg{\immediate\write16} \def\:ParOutputCode#1]#2{{% \let\:ModifyOutputCode=\ModifyOutputCode \def\ModifyOutputCode##1{\:ModifyOutputCode{##1}% \def\Extension{#1}}% \:OutputCode #2}} \def\OutputCode#1{% \ifx#1[\let\:next=\:ParOutputCode \else \def\:next{\:OutputCode#1}\fi \:next} \def\ModifyOutputCode#1{}\def\:comment#1{} \def\Comment{\begingroup \:defaultcats \::comment} \def\::comment#1#2{\endgroup \def\:flag{}% \:ifempty{#1}\else \def\:flag{.}\fi \:ifempty{#2}\else \def\:flag{.}\fi \ifx \:flag\empty \def\:comment##1{}% \else \def\:comment##1{#1##1#2}\fi} \def\Ref#1{% \:ifempty{#1}\:warn{Empty field in \noexpand\Ref}% \else \expandafter\ifx \csname cw:#1\endcsname \relax \:NoTag{#1}% \else \expandafter\csname cw:#1\endcsname \fi \fi} \def\Tag#1#2{% \:ifempty{#1}\:warn{First field empty in \noexpand\Tag}% \else \begingroup \:latexpg \edef\:head{\:TagCs\space{#1}{#2}}% \def\:write{\write\:refout}% \expandafter \expandafter \expandafter\:write \expandafter{\:head{\the\pageno}}% \endgroup \fi} \let\:trc=\Tag \def\:TagCs{\string\:CrossWord} \catcode`\-=12 \catcode`\+=12 \ifx \:refout\:UnDef \openin15 \jobname.xref \ifeof15 \immediate\write16{No file \jobname.xref} \def\:NoTag#1{\hbox{$???$}} \else \begingroup \def\:CrossWord#1#2#3{% \def\:parm{#2}% \ifx \:parm\empty \:AddTag{#1}{#3}\else \:AddTag{#1}{#2}\fi} \def\:AddTag#1#2{% \expandafter \ifx \csname cw:#1\endcsname \relax \def \:entries{#2}% \else \edef\:entries{\csname cw:#1\endcsname , #2}% \fi \expandafter \xdef \csname cw:#1\endcsname{\:entries}} \input \jobname.xref \endgroup \def\:NoTag#1{\hbox{$???$}% \:warn{\string\Ref\string{\string#1\string}?}} \fi \closein15 \fi \catcode`\-=13 \catcode`\+=13 \ifx \:refout\:UnDef \csname newwrite\endcsname\:refout \openout\:refout=\jobname.xref \fi \newwrite\:trcfile \immediate\openout\:trcfile=\jobname.trc \def\:WriteTrc#1{{\let\:refout=\:trcfile \:trc{\string#1}{\the\inputlineno}}} \def\:TraceDef#1#2{\:tokens={#2}% \immediate\write\:trcfile{% \string#1\space{DefineTitle}{{\the \:tokens};;\the\inputlineno}{}}} \def\:AlProTex{\ifx \:next[ \def\AlProTex[##1]##2{\egroup \def\AlProTex{##2}\input ##1 } \else \def\AlProTex##1{\egroup \def\AlProTex{##1}\input AlProTex.sty } \fi \let\:AlProTex=\:undefined \AlProTex} \def\AlProTex{\bgroup \catcode`\@=12 \catcode`\^=7 \catcode`\_=8 \futurelet\:next\:AlProTex} \ifx \inputlineno\undefined \csname newcount\endcsname\inputlineno \let\:oldNoSpecials=\:NoSpecials \def\:NoSpecials#1#2#3{\ifnum #3>127 \:oldNoSpecials{#1}{#2}{127}\else \:oldNoSpecials{#1}{#2}{#3}\fi } \fi \:RestoreCatcodes \endinput tetex-tex4ht-1.0-prev.patch: --- NEW FILE tetex-tex4ht-1.0-prev.patch --- --- tex4ht-1.0.2006_10_24_0142/debian/lit/rebuild.sh.prev 2006-10-31 11:10:45.000000000 +0100 +++ tex4ht-1.0.2006_10_24_0142/debian/lit/rebuild.sh 2006-11-03 00:08:29.000000000 +0100 @@ -3,6 +3,8 @@ # This program is released into the public domain. # You may do whatever you please with it. +set -x + # This script takes the literate sources for Eitan Gurari's TeX4HT # system and produces a directory tree like the one that is # distributed as a tar.gz archive. It is gleaned from the 3-4 line @@ -30,6 +32,8 @@ DESTDIR=${TOP}/dest DEBDIR=${TOP}/debian +unset TEXINPUTS TEXMFCNF TEX4HTINPUTS T4HTINPUTS \ + TEX4HTFONTSET TEXINPUTS_tex4ht TEXINPUTS_t4ht # We need a different texmf.cnf that expands # TeX's memory usage. We will create this in # the following directory: @@ -119,10 +123,13 @@ [ -d ${LITDIR} -a -d ${DEBDIR} ] || \ (echo "Must be in top-level source directory to run this"; exit 0) +rm -rf ${DESTDIR} + # Initialise the working environment mkdirheir makesomefiles setupenv + cd $DESTDIR # Make tex4ht.c @@ -131,8 +138,12 @@ # Make t4ht.c tex tex4ht-t4ht +# Make htcmd +tex tex4ht-htcmd + # Make scripts latex tex4ht-mkht +perl -c mk4ht.perl latex ./mkht-scripts.4ht # Make tex4ht.sty @@ -168,6 +179,7 @@ # The xttl files are for the experimental speech support. # These are built using xhlatex. +htlatex xtpipes "xhtml,3,next" "" "-d./" xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./" xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./" xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./" @@ -177,14 +189,18 @@ # Make font files. The Needs directives in this file cause "t4ht" to # move the files into their correct locations automatically. -tex tex4ht-fonts-noncjk -tex tex4ht-fonts-noncjk -tex4ht tex4ht-fonts-noncjk -t4ht tex4ht-fonts-noncjk -latex tex4ht-fonts-4hf -latex tex4ht-fonts-4hf -tex4ht tex4ht-fonts-4hf -t4ht tex4ht-fonts-4hf +for font in noncjk cjk; do +tex tex4ht-fonts-${font} +tex tex4ht-fonts-${font} +tex4ht tex4ht-fonts-${font} +t4ht tex4ht-fonts-${font} +done +for font in 4hf; do +latex tex4ht-fonts-${font} +latex tex4ht-fonts-${font} +tex4ht tex4ht-fonts-${font} +t4ht tex4ht-fonts-${font} +done movefiles texclean tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch: --- NEW FILE tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch --- --- tex4ht-1.0.2006_10_24_0142/lit/xtpipes.tex.nohome 2006-11-02 23:03:41.000000000 +0100 +++ tex4ht-1.0.2006_10_24_0142/lit/xtpipes.tex 2006-11-02 23:43:25.000000000 +0100 @@ -70,7 +70,7 @@ \def\StartDir{}\fi } \def\SLASH{/} -\def\MYdir{work.dir} +\def\MYdir{.} \expandafter\let\csname !/\endcsname\empty @@ -117,23 +117,21 @@ \AtEndDocument{\Needs{" - cd work.dir - ; javac -Xlint:unchecked xtpipes/*.java - -d /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/. + -d texmf/tex4ht/bin/. ; javac -Xlint:unchecked xtpipes/*/*.java - -d /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/. + -d texmf/tex4ht/bin/. ; javac -Xlint:unchecked xtpipes.java - -d /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/. + -d texmf/tex4ht/bin/. "}} % \Needs{"cp xtpipes.dtd xtpipes.dtd.1"} % \AddFile[xtpipes.dtd](/home/4/gurari/tex4ht.dir/texmf/tex4ht/bin){xtpipes.dtd.1}{xtpipes/lib} -\AddFile(/home/4/gurari/tex4ht.dir/texmf/tex4ht/bin){xtpipes.dtd}{xtpipes/lib} +\AddFile{xtpipes.dtd}{texmf/tex4ht/bin/xtpipes/lib} % \Needs{" @@ -2507,7 +2505,7 @@ \OutputCodE\ } -\AddFile(/home/4/gurari/tex4ht.dir/texmf/tex4ht/bin){xtpipes-default.4xt}{xtpipes/lib} +\AddFile{xtpipes-default.4xt}{texmf/tex4ht/bin/xtpipes/lib} texmf.cnf.patch: --- NEW FILE texmf.cnf.patch --- --- texmf.cnf.orig 2006-10-02 00:11:40.000000000 +0200 +++ texmf.cnf 2006-10-25 22:34:21.000000000 +0200 @@ -161,7 +161,7 @@ % Plain TeX. Have the command tex check all directories as a last % resort, we may have plain-compatible stuff anywhere. -TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.tex = $TEXMF/tex/{plain,generic,}//;. % Other plain-based formats. TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// @@ -177,7 +177,7 @@ % latex209, useful for macros that were written for 2.09 and do not % mention 2e at all, but can be used with 2e. TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// -TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.latex = $TEXMF/tex/{latex,generic,}//;. TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}// TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}// @@ -192,8 +192,8 @@ % e-TeX. This form of the input paths is borrowed from teTeX. A certain % variant of TDS is assumed here, unaffected by the build variables. -TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.elatex = $TEXMF/tex/{latex,generic,}//;. +TEXINPUTS.etex = $TEXMF/tex/{plain,generic,}//;. % pdfTeX. This form of the input paths is borrowed from teTeX. A certain % variant of TDS is assumed here, unaffected by the build variables. @@ -254,7 +254,7 @@ TEXINPUTS.pdfplatex = .;$TEXMF/tex/{platex,latex,generic,}// % Earlier entries override later ones, so put this last. -TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// +TEXINPUTS = $TEXMF/tex/{$progname,generic,}//;. % Metafont, MetaPost inputs. MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// @@ -388,6 +388,8 @@ % a program that uses the 'other text files' or 'other binary files' % search formats, you'll want to add their variables here as well. T4HTINPUTS = .;$TEXMF/tex4ht// +TEXINPUTS.tex4ht = .;$TEXMF/tex4ht// +TEXINPUTS.t4ht = .;$TEXMF/tex4ht/ht-fonts// % Architecture independent executables TEXMFSCRIPTS = $TEXMF/scripts// @@ -494,9 +496,9 @@ % For some xy-pic samples, you may need as much as 700000 words of memory. % For the vast majority of documents, 60000 or less will do. % -main_memory = 1000000 % words of inimemory available; also applies to inimf&mp -extra_mem_top = 0 % extra high memory for chars, tokens, etc. -extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. +main_memory = 25000000 % words of inimemory available; also applies to inimf&mp +extra_mem_top = 4000000 % extra high memory for chars, tokens, etc. +extra_mem_bot = 8000000 % extra low memory for boxes, glue, breakpoints, etc. % ConTeXt is a memory hog... extra_mem_top.context = 2000000 @@ -507,25 +509,25 @@ main_memory.xmltex = 2500000 % Words of font info for TeX (total size of all TFM files, approximately). -font_mem_size = 500000 +font_mem_size = 5000000 % Total number of fonts. Must be >= 50 and <= 2000 (without tex.ch changes). font_max = 2000 % Extra space for the hash table of control sequences (which allows 10K % names as distributed). -hash_extra = 50000 +hash_extra = 500000 % Max number of characters in all strings, including all error messages, % help texts, font names, control sequences. These values apply to TeX and MP. -pool_size = 1250000 +pool_size = 3000000 % Minimum pool space after TeX/MP's own strings; must be at least % 25000 less than pool_size, but doesn't need to be nearly that large. -string_vacancies = 90000 +string_vacancies = 200000 % Maximum number of strings. -max_strings = 100000 +max_strings = 1500000 % min pool space left after loading .fmt -pool_free = 47500 +pool_free = 475000 % Hyphenation trie. As distributed, the maximum is 65535; this should % work unless `unsigned short' is not supported or is smaller than 16 @@ -538,14 +540,14 @@ % German: 14000. % US English: 10000. % -trie_size = 262000 +trie_size = 300000 % Buffer size. TeX uses the buffer to contain input lines, but macro % expansion works by writing material into the buffer and reparsing the % line. As a consequence, certain constructs require the buffer to be % very large. As distributed, the size is 50000; most documents can be % handled within a tenth of this size. -buf_size = 200000 +buf_size = 300000 hyph_size = 1000 % number of hyphenation exceptions, >610 and <32767. nest_size = 500 % simultaneous semantic levels (e.g., groups) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Aug 2006 10:32:14 -0000 1.7 +++ .cvsignore 3 Nov 2006 00:41:27 -0000 1.8 @@ -1 +1,4 @@ -tex4ht-1.0.2006_08_26_2341.tar.gz +tex4ht-all-20050228.zip +tex4ht-lit-20061028.zip +tex4ht_20060913-1.diff.gz +tex4ht-1.0.2006_10_28_1705.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Aug 2006 18:27:01 -0000 1.8 +++ sources 3 Nov 2006 00:41:27 -0000 1.9 @@ -1,2 +1,4 @@ -2dd8bbec7cb147391ca08efe4ae7d445 tex4ht-1.0.2006_08_26_2341.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip +a2837b2bd29e66afb574f1d0f99d4190 tex4ht-lit-20061028.zip +a69edc1e15d23777bc89b9f3132930b0 tex4ht_20060913-1.diff.gz +de456f43632f5fb321f5bdbeeb92dfe1 tex4ht-1.0.2006_10_28_1705.tar.gz Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tetex-tex4ht.spec 6 Sep 2006 10:46:07 -0000 1.8 +++ tetex-tex4ht.spec 3 Nov 2006 00:41:27 -0000 1.9 @@ -2,8 +2,8 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2006_08_26_2341 -Release: 2%{?dist} +Version: 1.0.2006_10_28_1705 +Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing URL: http://www.cse.ohio-state.edu/~gurari/TeX4ht/ @@ -14,17 +14,39 @@ # unversioned upstream source, downloaded with wget -N #Source1 http://www.cse.ohio-state.edu/~gurari/TeX4ht/tex4ht-all.zip Source2: tex4ht-lppl.txt -Patch0: tex4ht-env.patch +# unversioned upstream litteral source, downloaded with wget -N +#Source3: http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-lit.zip +Source3: tex4ht-lit-20061028.zip +Source4: http://www.cse.ohio-state.edu/~gurari/tpf/ProTex.sty +Source5: http://www.cse.ohio-state.edu/~gurari/tpf/AlProTex.sty +Source6: http://www.cse.ohio-state.edu/~gurari/tpf/DraTex.sty +Source7: http://www.cse.ohio-state.edu/~gurari/tpf/AlDraTex.sty +#Patch0: tex4ht-1.0.2006_10_24_0142-paths.patch +# debian +Patch1: http://ftp.debian.org/debian/pool/main/t/tex4ht/tex4ht_20060913-1.diff.gz +# patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora +Patch2: texmf.cnf.patch +# update debian rebuild script +Patch3: tetex-tex4ht-1.0-prev.patch +# if building from litteral sources, install xtpipes files in dest +Patch4: tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /usr/bin/kpsewhich BuildRequires: tetex-fonts -Requires: ImageMagick +# for uudecode to generate the debian tutorial images +BuildRequires: sharutils +# pnmcrop and pnmtopng are in netpbm-progs. +Requires: netpbm-progs +# ImageMagick, pstoedit depends on ghostscript and gs is in ghostscript +Requires: ImageMagick pstoedit +# dvips is in tetex-dvips. tetex-latex depends on tetex-dvips. +# dvipng is in tetex. tetex-latex depends on tetex. Requires: tetex-latex Requires(post): /usr/bin/texhash Requires(postun): /usr/bin/texhash -Obsoletes: tex4ht -Provides: tex4ht +Obsoletes: tex4ht < %{version}-%{release} +Provides: tex4ht = %{version}-%{release} # description taken from ctan and modified %description @@ -38,15 +60,43 @@ %prep %setup -q -n tex4ht-%{version} -%patch -p 1 +%patch1 -p1 + +# apply debian path which avoids using xtpipes since we cannot compile it +patch -p1 < debian/patches/fix_mk4ht.diff + chmod a-x src/*.c cp %{SOURCE2} lppl.txt mkdir doc cp %{SOURCE1} doc pushd doc unzip tex4ht-all-*.zip -rm -f *.zip +rm *.zip popd +mkdir lit +cp %{SOURCE3} lit +pushd lit +unzip tex4ht-lit-*.zip +rm *.zip +chmod 0644 *.tex +popd +cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/ + +# avoid duplicating the debian patches while still allowing to rebuild +# from literate sources +patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff +patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff +%patch4 -p1 -b .nohome + +patch -p1 < debian/patches/add_manpage.diff + +cp %{PATCH2} debian/lit/ + +%patch3 -p1 -b .prev + +chmod a+x debian/lit/rebuild.sh* + +(cd debian/images; for i in *.uue; do uudecode $i; done; mv *.png ../html) find texmf -type f -exec chmod a-x \{\} \; @@ -55,12 +105,12 @@ CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H \ -DHAVE_SYS_DIR_H -DKPATHSEA -DENVFILE=\"%{_texmf}/tex4ht/base/unix/tex4ht.env\"" LDFLAGS=-lkpathsea -gcc -c $CFLAGS tex4ht.c -gcc -c $CFLAGS t4ht.c -gcc -o tex4ht tex4ht.o $LDFLAGS -gcc -o t4ht t4ht.o $LDFLAGS +gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS +gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS popd +# files in bin/ht/unix have a shebang but use xtpipes + # add shebangs to the scripts that lacks one for file in bin/unix/*; do if grep '^#! */' $file > /dev/null 2>&1; then continue; fi @@ -74,18 +124,31 @@ install -d -m755 $RPM_BUILD_ROOT%{_bindir} install -m755 src/tex4ht $RPM_BUILD_ROOT%{_bindir} install -m755 src/t4ht $RPM_BUILD_ROOT%{_bindir} +#install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir} install -m755 bin/unix/* $RPM_BUILD_ROOT%{_bindir} pushd texmf install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix cp tex4ht/base/unix/tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix -cp -r tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht +cp -pr tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex/generic -cp -r tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic +cp -pr tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic popd +cp -pr debian/html tutorial + +sed 's/Debian packaged/Debian and Fedora packaged/' debian/README.kpathsea \ + > README.kpathsea + +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +sed -e 's;@SCRIPTSDIR@;%{_bindir};' \ + -e 's;@TEX4HTDIR@;%{_texmf}/tex4ht/base/unix;' \ + -e 's;@TEXMFCNF@;%{_texmf}/web2c/texmf.cnf;' \ + -e 's;@HTFDIR@;%{_texmf}/tex4ht/ht-fonts;' \ + -e 's;@TEXDIR@;%{_texmf}/tex/generic/tex4ht;g' \ + src/tex4ht.man > $RPM_BUILD_ROOT%{_mandir}/man1/tex4ht.1 %clean rm -rf $RPM_BUILD_ROOT @@ -95,7 +158,8 @@ %{_texmf}/tex4ht/ %{_texmf}/tex/generic/tex4ht/ %{_bindir}/* -%doc lppl.txt doc +%{_mandir}/man1/tex4ht.1* +%doc lppl.txt doc tutorial README.kpathsea %post texhash > /dev/null 2>&1 || : @@ -104,6 +168,12 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Nov 3 2006 Patrice Dumas 1.0.2006_10_28_1705-1 +- update +- use debian patchset +- remove the patch modifying paths in tex4ht.env, it is unneeded with + kpathsee + * Mon Aug 28 2006 Patrice Dumas 1.0.2006_08_26_2341-2 - update --- tex4ht-env.patch DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 01:59:19 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 2 Nov 2006 18:59:19 -0700 Subject: rpms/cacti/FC-3 cacti.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200611030159.kA31xJ8M031888@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/FC-3 Modified Files: cacti.spec sources Log Message: upstream released new version as well as bz#198569 Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-3/cacti.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cacti.spec 22 Feb 2006 09:04:28 -0000 1.4 +++ cacti.spec 3 Nov 2006 01:58:49 -0000 1.5 @@ -1,6 +1,6 @@ Name: cacti -Version: 0.8.6h -Release: 6%{?dist} +Version: 0.8.6i +Release: 2%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -10,6 +10,9 @@ Source1: cacti-httpd.conf Source2: cacti.logrotate Source3: cacti.README.Fedora + +Patch1: cacti-0.8.6h-dbcfg.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp @@ -17,12 +20,6 @@ Requires(postun): /sbin/service BuildArch: noarch -Patch1: cacti-0.8.6h-dbcfg.patch -Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch -Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch -Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch -Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch - %description Cacti is a complete frontend to RRDTool. It stores all of the necessary information to create graphs and populate them with @@ -35,10 +32,6 @@ %prep %setup -q %patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 echo "#*/5 * * * * cacti %{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron @@ -51,7 +44,7 @@ %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/ -%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ +%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/ %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf @@ -65,6 +58,8 @@ ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log +ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/ +ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/ %clean rm -rf %{buildroot} @@ -104,8 +99,16 @@ %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Thu Sep 07 2006 Mike McGrath - 0.8.6i-2 +- Upstream released new version + +* Thu Sep 07 2006 Mike McGrath - 0.8.6h-7 +- Mass rebuild + * Wed Feb 22 2006 Mike McGrath - 0.8.6h-6 - Disabled Cron job by default Index: sources =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Feb 2006 01:42:50 -0000 1.2 +++ sources 3 Nov 2006 01:58:49 -0000 1.3 @@ -1 +1,2 @@ 5f6100b525b5b29e81f43cc7c55f4000 cacti-0.8.6h.tar.gz +341b5828d95db91f81f5fbba65411d63 cacti-0.8.6i.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 01:59:20 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 2 Nov 2006 18:59:20 -0700 Subject: rpms/cacti/FC-4 cacti.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200611030159.kA31xKe8031894@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/FC-4 Modified Files: cacti.spec sources Log Message: upstream released new version as well as bz#198569 Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-4/cacti.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cacti.spec 22 Feb 2006 09:04:48 -0000 1.4 +++ cacti.spec 3 Nov 2006 01:58:49 -0000 1.5 @@ -1,6 +1,6 @@ Name: cacti -Version: 0.8.6h -Release: 6%{?dist} +Version: 0.8.6i +Release: 2%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -10,6 +10,9 @@ Source1: cacti-httpd.conf Source2: cacti.logrotate Source3: cacti.README.Fedora + +Patch1: cacti-0.8.6h-dbcfg.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp @@ -17,12 +20,6 @@ Requires(postun): /sbin/service BuildArch: noarch -Patch1: cacti-0.8.6h-dbcfg.patch -Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch -Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch -Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch -Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch - %description Cacti is a complete frontend to RRDTool. It stores all of the necessary information to create graphs and populate them with @@ -35,10 +32,6 @@ %prep %setup -q %patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 echo "#*/5 * * * * cacti %{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron @@ -51,7 +44,7 @@ %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/ -%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ +%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/ %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf @@ -65,6 +58,8 @@ ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log +ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/ +ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/ %clean rm -rf %{buildroot} @@ -104,8 +99,16 @@ %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Thu Sep 07 2006 Mike McGrath - 0.8.6i-2 +- Upstream released new version + +* Thu Sep 07 2006 Mike McGrath - 0.8.6h-7 +- Mass rebuild + * Wed Feb 22 2006 Mike McGrath - 0.8.6h-6 - Disabled Cron job by default Index: sources =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Feb 2006 01:42:50 -0000 1.2 +++ sources 3 Nov 2006 01:58:49 -0000 1.3 @@ -1 +1,2 @@ 5f6100b525b5b29e81f43cc7c55f4000 cacti-0.8.6h.tar.gz +341b5828d95db91f81f5fbba65411d63 cacti-0.8.6i.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 01:59:21 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 2 Nov 2006 18:59:21 -0700 Subject: rpms/cacti/FC-5 cacti.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200611030159.kA31xLFf031900@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/FC-5 Modified Files: cacti.spec sources Log Message: upstream released new version as well as bz#198569 Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-5/cacti.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cacti.spec 22 Feb 2006 09:04:56 -0000 1.4 +++ cacti.spec 3 Nov 2006 01:58:50 -0000 1.5 @@ -1,6 +1,6 @@ Name: cacti -Version: 0.8.6h -Release: 6%{?dist} +Version: 0.8.6i +Release: 2%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -10,6 +10,9 @@ Source1: cacti-httpd.conf Source2: cacti.logrotate Source3: cacti.README.Fedora + +Patch1: cacti-0.8.6h-dbcfg.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp @@ -17,12 +20,6 @@ Requires(postun): /sbin/service BuildArch: noarch -Patch1: cacti-0.8.6h-dbcfg.patch -Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch -Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch -Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch -Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch - %description Cacti is a complete frontend to RRDTool. It stores all of the necessary information to create graphs and populate them with @@ -35,10 +32,6 @@ %prep %setup -q %patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 echo "#*/5 * * * * cacti %{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron @@ -51,7 +44,7 @@ %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/ -%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ +%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/ %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf @@ -65,6 +58,8 @@ ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log +ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/ +ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/ %clean rm -rf %{buildroot} @@ -104,8 +99,16 @@ %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Thu Sep 07 2006 Mike McGrath - 0.8.6i-2 +- Upstream released new version + +* Thu Sep 07 2006 Mike McGrath - 0.8.6h-7 +- Mass rebuild + * Wed Feb 22 2006 Mike McGrath - 0.8.6h-6 - Disabled Cron job by default Index: sources =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Feb 2006 01:42:50 -0000 1.2 +++ sources 3 Nov 2006 01:58:50 -0000 1.3 @@ -1 +1,2 @@ 5f6100b525b5b29e81f43cc7c55f4000 cacti-0.8.6h.tar.gz +341b5828d95db91f81f5fbba65411d63 cacti-0.8.6i.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 01:59:26 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 2 Nov 2006 18:59:26 -0700 Subject: rpms/cacti/devel .cvsignore, 1.2, 1.3 cacti.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200611030159.kA31xQlj031921@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/devel Modified Files: .cvsignore cacti.spec sources Log Message: upstream released new version as well as bz#198569 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cacti/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Feb 2006 01:42:50 -0000 1.2 +++ .cvsignore 3 Nov 2006 01:58:56 -0000 1.3 @@ -1 +1,2 @@ cacti-0.8.6h.tar.gz +cacti-0.8.6i.tar.gz Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cacti.spec 7 Sep 2006 20:31:46 -0000 1.5 +++ cacti.spec 3 Nov 2006 01:58:56 -0000 1.6 @@ -1,6 +1,6 @@ Name: cacti -Version: 0.8.6h -Release: 7%{?dist} +Version: 0.8.6i +Release: 2%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -10,6 +10,9 @@ Source1: cacti-httpd.conf Source2: cacti.logrotate Source3: cacti.README.Fedora + +Patch1: cacti-0.8.6h-dbcfg.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp @@ -17,12 +20,6 @@ Requires(postun): /sbin/service BuildArch: noarch -Patch1: cacti-0.8.6h-dbcfg.patch -Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch -Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch -Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch -Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch - %description Cacti is a complete frontend to RRDTool. It stores all of the necessary information to create graphs and populate them with @@ -35,10 +32,6 @@ %prep %setup -q %patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 echo "#*/5 * * * * cacti %{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron @@ -51,7 +44,7 @@ %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/ -%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ +%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/ %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf @@ -65,6 +58,8 @@ ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log +ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/ +ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/ %clean rm -rf %{buildroot} @@ -104,8 +99,13 @@ %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Thu Sep 07 2006 Mike McGrath - 0.8.6i-2 +- Upstream released new version + * Thu Sep 07 2006 Mike McGrath - 0.8.6h-7 - Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/cacti/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Feb 2006 01:42:50 -0000 1.2 +++ sources 3 Nov 2006 01:58:56 -0000 1.3 @@ -1 +1,2 @@ 5f6100b525b5b29e81f43cc7c55f4000 cacti-0.8.6h.tar.gz +341b5828d95db91f81f5fbba65411d63 cacti-0.8.6i.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 02:04:12 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 2 Nov 2006 19:04:12 -0700 Subject: rpms/cacti/FC-6 cacti.spec,1.5,1.6 sources,1.2,1.3 Message-ID: <200611030204.kA324ChH003258@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3180 Modified Files: cacti.spec sources Log Message: upstream released new version Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cacti.spec 7 Sep 2006 20:31:46 -0000 1.5 +++ cacti.spec 3 Nov 2006 02:03:42 -0000 1.6 @@ -1,6 +1,6 @@ Name: cacti -Version: 0.8.6h -Release: 7%{?dist} +Version: 0.8.6i +Release: 2%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -10,6 +10,9 @@ Source1: cacti-httpd.conf Source2: cacti.logrotate Source3: cacti.README.Fedora + +Patch1: cacti-0.8.6h-dbcfg.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp @@ -17,12 +20,6 @@ Requires(postun): /sbin/service BuildArch: noarch -Patch1: cacti-0.8.6h-dbcfg.patch -Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch -Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch -Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch -Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch - %description Cacti is a complete frontend to RRDTool. It stores all of the necessary information to create graphs and populate them with @@ -35,10 +32,6 @@ %prep %setup -q %patch1 -p0 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 echo "#*/5 * * * * cacti %{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron @@ -51,7 +44,7 @@ %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/ %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/ -%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ +%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/ %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/ %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf @@ -65,6 +58,8 @@ ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/ ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log +ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/ +ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/ %clean rm -rf %{buildroot} @@ -104,8 +99,13 @@ %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/ %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include +%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Thu Sep 07 2006 Mike McGrath - 0.8.6i-2 +- Upstream released new version + * Thu Sep 07 2006 Mike McGrath - 0.8.6h-7 - Mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Feb 2006 01:42:50 -0000 1.2 +++ sources 3 Nov 2006 02:03:42 -0000 1.3 @@ -1 +1,2 @@ 5f6100b525b5b29e81f43cc7c55f4000 cacti-0.8.6h.tar.gz +341b5828d95db91f81f5fbba65411d63 cacti-0.8.6i.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 02:06:58 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 2 Nov 2006 19:06:58 -0700 Subject: rpms/cacti/FC-6 cacti.spec,1.6,1.7 Message-ID: <200611030206.kA326wEv003701@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3546/FC-6 Modified Files: cacti.spec Log Message: release bump because Im a dumbass Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cacti.spec 3 Nov 2006 02:03:42 -0000 1.6 +++ cacti.spec 3 Nov 2006 02:06:28 -0000 1.7 @@ -1,6 +1,6 @@ Name: cacti Version: 0.8.6i -Release: 2%{?dist} +Release: 3%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -103,6 +103,9 @@ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Thu Sep 07 2006 Mike McGrath - 0.8.6i-3 +- Upstream released new version + * Thu Sep 07 2006 Mike McGrath - 0.8.6i-2 - Upstream released new version From fedora-extras-commits at redhat.com Fri Nov 3 02:06:59 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 2 Nov 2006 19:06:59 -0700 Subject: rpms/cacti/devel cacti.spec,1.6,1.7 Message-ID: <200611030206.kA326xiN003707@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3546/devel Modified Files: cacti.spec Log Message: release bump because Im a dumbass Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- cacti.spec 3 Nov 2006 01:58:56 -0000 1.6 +++ cacti.spec 3 Nov 2006 02:06:29 -0000 1.7 @@ -1,6 +1,6 @@ Name: cacti Version: 0.8.6i -Release: 2%{?dist} +Release: 3%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -103,6 +103,9 @@ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Thu Sep 07 2006 Mike McGrath - 0.8.6i-3 +- Upstream released new version + * Thu Sep 07 2006 Mike McGrath - 0.8.6i-2 - Upstream released new version From fedora-extras-commits at redhat.com Fri Nov 3 02:06:56 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 2 Nov 2006 19:06:56 -0700 Subject: rpms/cacti/FC-5 cacti.spec,1.5,1.6 Message-ID: <200611030206.kA326uF0003688@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/cacti/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3546/FC-5 Modified Files: cacti.spec Log Message: release bump because Im a dumbass Index: cacti.spec =================================================================== RCS file: /cvs/extras/rpms/cacti/FC-5/cacti.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cacti.spec 3 Nov 2006 01:58:50 -0000 1.5 +++ cacti.spec 3 Nov 2006 02:06:26 -0000 1.6 @@ -1,6 +1,6 @@ Name: cacti Version: 0.8.6i -Release: 2%{?dist} +Release: 3%{?dist} Summary: An rrd based graphing tool Group: Applications/System @@ -103,6 +103,9 @@ %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %changelog +* Thu Sep 07 2006 Mike McGrath - 0.8.6i-3 +- Upstream released new version + * Thu Sep 07 2006 Mike McGrath - 0.8.6i-2 - Upstream released new version From fedora-extras-commits at redhat.com Fri Nov 3 02:13:31 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Nov 2006 19:13:31 -0700 Subject: rpms/haddock/devel .cvsignore, 1.2, 1.3 haddock.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200611030213.kA32DVXU005025@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4744 Modified Files: .cvsignore haddock.spec sources Log Message: - update to 0.8 - use new cabal build system - update file list Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 Sep 2005 03:00:15 -0000 1.2 +++ .cvsignore 3 Nov 2006 02:13:01 -0000 1.3 @@ -1 +1 @@ -haddock-0.7-src.tar.gz +haddock-0.8-src.tar.gz Index: haddock.spec =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- haddock.spec 28 Sep 2006 01:26:09 -0000 1.4 +++ haddock.spec 3 Nov 2006 02:13:01 -0000 1.5 @@ -1,6 +1,6 @@ Name: haddock -Version: 0.7 -Release: 4%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Haddock documentation tool for annotated Haskell source code Group: Development/Tools @@ -32,24 +32,17 @@ %build -./configure --prefix=%{_prefix} --libdir=%{_libdir} -make %{?_smp_mflags} -(cd haddock/doc ; make html ) +runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir} +runhaskell Setup.lhs build +cd doc +test -f configure || autoreconf +./configure +make html %install rm -rf ${RPM_BUILD_ROOT} -%makeinstall - -# move datafiles into their expected location -mkdir ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version} -find ${RPM_BUILD_ROOT}%{_datadir} -type f | xargs mv --target-directory=${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version} - -sed -i -e "s!%{_libdir}/%{name}-%{version}!%{_libexecdir}!" ${RPM_BUILD_ROOT}%{_bindir}/%{name}-%{version} - -# drop versioned binary wrapper -rm ${RPM_BUILD_ROOT}%{_bindir}/%{name} -mv ${RPM_BUILD_ROOT}%{_bindir}/%{name}{-%{version},} +runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT} %clean @@ -62,14 +55,18 @@ %files %defattr(-,root,root) -%doc haddock/README -%doc haddock/doc/haddock +%doc README +%doc doc/haddock/* %{_bindir}/haddock -%{_libexecdir}/haddock.bin %{_datadir}/haddock-%{version} %changelog +* Fri Nov 3 2006 Jens Petersen - 0.8-1 +- update to 0.8 +- use new cabal build system +- update file list + * Thu Sep 28 2006 Jens Petersen - 0.7-4 - rebuild for FC6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Sep 2005 03:00:15 -0000 1.2 +++ sources 3 Nov 2006 02:13:01 -0000 1.3 @@ -1 +1 @@ -759419e78416d5f093190968a4dc18f5 haddock-0.7-src.tar.gz +0a1bb64e7642f64d2560dc258c570c1d haddock-0.8-src.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 03:17:01 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Nov 2006 20:17:01 -0700 Subject: rpms/haddock/devel haddock.spec,1.5,1.6 Message-ID: <200611030317.kA33H1Le010258@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10242 Modified Files: haddock.spec Log Message: buildrequire autoconf Index: haddock.spec =================================================================== RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- haddock.spec 3 Nov 2006 02:13:01 -0000 1.5 +++ haddock.spec 3 Nov 2006 03:16:31 -0000 1.6 @@ -9,7 +9,7 @@ Source0: http://www.haskell.org/haddock/%{name}-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc libxslt docbook-style-xsl +BuildRequires: ghc libxslt docbook-style-xsl autoconf # need chcon PreReq: coreutils @@ -66,6 +66,7 @@ - update to 0.8 - use new cabal build system - update file list +- buildrequire autoconf * Thu Sep 28 2006 Jens Petersen - 0.7-4 - rebuild for FC6 From fedora-extras-commits at redhat.com Fri Nov 3 04:08:50 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 21:08:50 -0700 Subject: rpms/perl-Tree-Simple/devel .cvsignore, 1.3, 1.4 perl-Tree-Simple.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200611030408.kA348op9013695@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13654 Modified Files: .cvsignore perl-Tree-Simple.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Apr 2006 06:23:12 -0000 1.3 +++ .cvsignore 3 Nov 2006 04:08:19 -0000 1.4 @@ -1 +1 @@ -Tree-Simple-1.16.tar.gz +Tree-Simple-1.17.tar.gz Index: perl-Tree-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/perl-Tree-Simple.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Tree-Simple.spec 5 Sep 2006 09:25:26 -0000 1.5 +++ perl-Tree-Simple.spec 3 Nov 2006 04:08:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Tree-Simple -Version: 1.16 -Release: 2%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Tree::Simple Perl module License: GPL or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 1.16-2 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Apr 2006 06:23:12 -0000 1.3 +++ sources 3 Nov 2006 04:08:19 -0000 1.4 @@ -1 +1 @@ -7f003a9af1aea6a9931c3de8fc49b3ab Tree-Simple-1.16.tar.gz +c1468eb79c414090bf16e2da4fc9637c Tree-Simple-1.17.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 04:09:45 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 21:09:45 -0700 Subject: rpms/perl-Tree-Simple/FC-6 .cvsignore, 1.3, 1.4 perl-Tree-Simple.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200611030409.kA349j0j013755@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13735 Modified Files: .cvsignore perl-Tree-Simple.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Apr 2006 06:23:12 -0000 1.3 +++ .cvsignore 3 Nov 2006 04:09:15 -0000 1.4 @@ -1 +1 @@ -Tree-Simple-1.16.tar.gz +Tree-Simple-1.17.tar.gz Index: perl-Tree-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-6/perl-Tree-Simple.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Tree-Simple.spec 5 Sep 2006 09:25:26 -0000 1.5 +++ perl-Tree-Simple.spec 3 Nov 2006 04:09:15 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Tree-Simple -Version: 1.16 -Release: 2%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Tree::Simple Perl module License: GPL or Artistic Group: Development/Libraries @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 1.16-2 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Apr 2006 06:23:12 -0000 1.3 +++ sources 3 Nov 2006 04:09:15 -0000 1.4 @@ -1 +1 @@ -7f003a9af1aea6a9931c3de8fc49b3ab Tree-Simple-1.16.tar.gz +c1468eb79c414090bf16e2da4fc9637c Tree-Simple-1.17.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 04:10:41 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 21:10:41 -0700 Subject: rpms/perl-Tree-Simple/FC-5 .cvsignore, 1.3, 1.4 perl-Tree-Simple.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611030410.kA34AfJi013792@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13764 Modified Files: .cvsignore perl-Tree-Simple.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Apr 2006 06:24:14 -0000 1.3 +++ .cvsignore 3 Nov 2006 04:10:11 -0000 1.4 @@ -1 +1 @@ -Tree-Simple-1.16.tar.gz +Tree-Simple-1.17.tar.gz Index: perl-Tree-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/perl-Tree-Simple.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Tree-Simple.spec 4 Apr 2006 06:24:14 -0000 1.4 +++ perl-Tree-Simple.spec 3 Nov 2006 04:10:11 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Tree-Simple -Version: 1.16 +Version: 1.17 Release: 1%{?dist} Summary: Tree::Simple Perl module License: GPL or Artistic @@ -50,6 +50,12 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 +- Upstream update. + +* Tue Sep 05 2006 Ralf Cors??pius - 1.16-2 +- Mass rebuild. + * Tue Apr 04 2006 Ralf Cors??pius - 1.16-1 - Upsteam update. - BR: Scalar::Util >= 1.18. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Apr 2006 06:24:14 -0000 1.3 +++ sources 3 Nov 2006 04:10:11 -0000 1.4 @@ -1 +1 @@ -7f003a9af1aea6a9931c3de8fc49b3ab Tree-Simple-1.16.tar.gz +c1468eb79c414090bf16e2da4fc9637c Tree-Simple-1.17.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 04:11:36 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 21:11:36 -0700 Subject: rpms/perl-Tree-Simple/FC-4 .cvsignore, 1.2, 1.3 perl-Tree-Simple.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611030411.kA34BaZP013833@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13800 Modified Files: .cvsignore perl-Tree-Simple.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Aug 2005 01:08:39 -0000 1.2 +++ .cvsignore 3 Nov 2006 04:11:06 -0000 1.3 @@ -1 +1 @@ -Tree-Simple-1.15.tar.gz +Tree-Simple-1.17.tar.gz Index: perl-Tree-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/perl-Tree-Simple.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Tree-Simple.spec 20 Aug 2005 01:16:28 -0000 1.2 +++ perl-Tree-Simple.spec 3 Nov 2006 04:11:06 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Tree-Simple -Version: 1.15 -Release: 2%{?dist} +Version: 1.17 +Release: 1%{?dist} Summary: Tree::Simple Perl module License: GPL or Artistic Group: Development/Libraries @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: perl(Scalar::Util) >= 1.18 BuildRequires: perl(Test::Exception) >= 0.15 BuildRequires: perl(Test::Pod) >= 1.14 BuildRequires: perl(Test::Pod::Coverage) >= 1.04 @@ -49,6 +50,19 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 +- Upstream update. + +* Tue Sep 05 2006 Ralf Cors??pius - 1.16-2 +- Mass rebuild. + +* Tue Apr 04 2006 Ralf Cors??pius - 1.16-1 +- Upsteam update. +- BR: Scalar::Util >= 1.18. + +* Tue Feb 28 2006 Ralf Cors??pius - 1.15-3 +- Rebuild for perl-5.8.8. + * Thu Aug 20 2005 Ralf Corsepius - 1.15-2 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Aug 2005 01:08:39 -0000 1.2 +++ sources 3 Nov 2006 04:11:06 -0000 1.3 @@ -1 +1 @@ -f4bb1afd402186952ea0b87ceeb3bc41 Tree-Simple-1.15.tar.gz +c1468eb79c414090bf16e2da4fc9637c Tree-Simple-1.17.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 04:15:49 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Nov 2006 21:15:49 -0700 Subject: rpms/gaim-rhythmbox - New directory Message-ID: <200611030415.kA34FnPK014072@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14068/gaim-rhythmbox Log Message: Directory /cvs/extras/rpms/gaim-rhythmbox added to the repository From fedora-extras-commits at redhat.com Fri Nov 3 04:15:50 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Nov 2006 21:15:50 -0700 Subject: rpms/gaim-rhythmbox/devel - New directory Message-ID: <200611030415.kA34Fo0t014086@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14068/gaim-rhythmbox/devel Log Message: Directory /cvs/extras/rpms/gaim-rhythmbox/devel added to the repository From fedora-extras-commits at redhat.com Fri Nov 3 04:16:06 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Nov 2006 21:16:06 -0700 Subject: rpms/gaim-rhythmbox Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611030416.kA34G6Fu014117@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14111 Added Files: Makefile import.log Log Message: Setup of module gaim-rhythmbox --- NEW FILE Makefile --- # Top level Makefile for module gaim-rhythmbox 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 Fri Nov 3 04:16:12 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Nov 2006 21:16:12 -0700 Subject: rpms/gaim-rhythmbox/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611030416.kA34GC0J014134@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14111/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gaim-rhythmbox --- 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 Fri Nov 3 04:17:45 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Nov 2006 21:17:45 -0700 Subject: rpms/gaim-rhythmbox import.log,1.1,1.2 Message-ID: <200611030417.kA34HjPj014215@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14180 Modified Files: import.log Log Message: auto-import gaim-rhythmbox-2.0-0.3.beta3 on branch devel from gaim-rhythmbox-2.0-0.3.beta3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Nov 2006 04:16:06 -0000 1.1 +++ import.log 3 Nov 2006 04:17:14 -0000 1.2 @@ -0,0 +1 @@ +gaim-rhythmbox-2_0-0_3_beta3:HEAD:gaim-rhythmbox-2.0-0.3.beta3.src.rpm:1162527424 From fedora-extras-commits at redhat.com Fri Nov 3 04:17:45 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Nov 2006 21:17:45 -0700 Subject: rpms/gaim-rhythmbox/devel gaim-rhythmbox-configure.diff, NONE, 1.1 gaim-rhythmbox.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611030417.kA34HjAC014219@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14180/devel Modified Files: .cvsignore sources Added Files: gaim-rhythmbox-configure.diff gaim-rhythmbox.spec Log Message: auto-import gaim-rhythmbox-2.0-0.3.beta3 on branch devel from gaim-rhythmbox-2.0-0.3.beta3.src.rpm gaim-rhythmbox-configure.diff: --- NEW FILE gaim-rhythmbox-configure.diff --- --- configure.orig 2006-09-24 02:36:08.000000000 -0400 +++ configure 2006-10-28 18:19:44.000000000 -0400 @@ -20593,7 +20593,7 @@ -GAIM_INSTALL="`$PKG_CONFIG gaim --variable=prefix`/lib/gaim" +GAIM_INSTALL="`$PKG_CONFIG gaim --variable=libdir`/gaim" ac_config_files="$ac_config_files Makefile src/Makefile" --- NEW FILE gaim-rhythmbox.spec --- %define prever beta3 Name: gaim-rhythmbox Version: 2.0 Release: 0.3.%{prever}%{?dist} Summary: Rhythmbox plugin for GAIM Group: Applications/Internet License: GPL URL: http://jon.oberheide.org/projects/gaim-rhythmbox/ Source0: http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}%{prever}.tar.gz Patch0: gaim-rhythmbox-configure.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim-devel BuildRequires: gtk2-devel BuildRequires: dbus-glib-devel dbus-devel Requires: rhythmbox %description The Gaim-Rhythmbox plugin will automatically update your Gaim user and status info with the currently playing music in Rhythmbox. If the artist and title are known, it will also attempt to create a link to the song's lyrics by using Google's "I'm Feeling Lucky" feature. Gaim-Rhythmbox will replace %rb in your user info and status message with the song information. %prep %setup -q -n %{name}-%{version}%{?prever} %patch0 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove .la file rm $RPM_BUILD_ROOT/%{_libdir}/gaim/gaim-rhythmbox.la %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/gaim/gaim-rhythmbox.so %changelog * Thu Nov 2 2006 Michel Salim 2.0-0.3.beta3 - Tidy up prever use, description field, and add files to documentation * Thu Nov 2 2006 Michel Salim 2.0-0.2.beta3 - Add missing BuildRequires * Sat Oct 28 2006 Michel Salim 2.0-0.1.beta3 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Nov 2006 04:16:12 -0000 1.1 +++ .cvsignore 3 Nov 2006 04:17:15 -0000 1.2 @@ -0,0 +1 @@ +gaim-rhythmbox-2.0beta3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Nov 2006 04:16:12 -0000 1.1 +++ sources 3 Nov 2006 04:17:15 -0000 1.2 @@ -0,0 +1 @@ +a9e836986dae7857b408120782264d5a gaim-rhythmbox-2.0beta3.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 04:26:15 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Nov 2006 21:26:15 -0700 Subject: owners owners.list,1.1885,1.1886 Message-ID: <200611030426.kA34QFTg014294@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14274 Modified Files: owners.list Log Message: Added gaim-rhythmbox Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1885 retrieving revision 1.1886 diff -u -r1.1885 -r1.1886 --- owners.list 2 Nov 2006 21:30:30 -0000 1.1885 +++ owners.list 3 Nov 2006 04:25:45 -0000 1.1886 @@ -450,6 +450,7 @@ Fedora Extras|gaim-guifications|Guifications plugin for GAIM|byte at fedoraproject.org|extras-qa at fedoraproject.org|tcallawa at redhat.com Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xelerance.com|extras-qa at fedoraproject.org| +Fedora Extras|gaim-rhythmbox|Rhythmbox plugin for GAIM|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|galago-daemon|Galago presence daemon|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|galago-filesystem|Galago filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Nov 3 04:44:35 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 21:44:35 -0700 Subject: rpms/perl-Test-LongString/devel .cvsignore, 1.3, 1.4 perl-Test-LongString.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200611030444.kA34iZZV014382@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14362 Modified Files: .cvsignore perl-Test-LongString.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.10-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Oct 2005 06:34:22 -0000 1.3 +++ .cvsignore 3 Nov 2006 04:44:05 -0000 1.4 @@ -1 +1 @@ -Test-LongString-0.09.tar.gz +Test-LongString-0.10.tar.gz Index: perl-Test-LongString.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/perl-Test-LongString.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Test-LongString.spec 5 Sep 2006 08:57:53 -0000 1.5 +++ perl-Test-LongString.spec 3 Nov 2006 04:44:05 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Test-LongString -Version: 0.09 -Release: 3%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Perl module to test long strings License: GPL or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.10-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 0.09-3 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Oct 2005 06:34:22 -0000 1.3 +++ sources 3 Nov 2006 04:44:05 -0000 1.4 @@ -1 +1 @@ -a956f4f0a8f7a8704f984523ce58fa66 Test-LongString-0.09.tar.gz +66f3fa30c0100d0f8d8089741964ad52 Test-LongString-0.10.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 04:55:49 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 21:55:49 -0700 Subject: rpms/perl-Tree-Simple/FC-4 .cvsignore, 1.3, 1.4 perl-Tree-Simple.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611030455.kA34tnLS014497@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Tree-Simple/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14477 Modified Files: .cvsignore perl-Tree-Simple.spec sources Log Message: Backout; FC-4's perl is to outdated to be able to build this package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Nov 2006 04:11:06 -0000 1.3 +++ .cvsignore 3 Nov 2006 04:55:19 -0000 1.4 @@ -1 +1 @@ -Tree-Simple-1.17.tar.gz +Tree-Simple-1.15.tar.gz Index: perl-Tree-Simple.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/perl-Tree-Simple.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Tree-Simple.spec 3 Nov 2006 04:11:06 -0000 1.3 +++ perl-Tree-Simple.spec 3 Nov 2006 04:55:19 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Tree-Simple -Version: 1.17 -Release: 1%{?dist} +Version: 1.15 +Release: 2%{?dist} Summary: Tree::Simple Perl module License: GPL or Artistic Group: Development/Libraries @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Scalar::Util) >= 1.18 BuildRequires: perl(Test::Exception) >= 0.15 BuildRequires: perl(Test::Pod) >= 1.14 BuildRequires: perl(Test::Pod::Coverage) >= 1.04 @@ -50,19 +49,6 @@ %{_mandir}/man3/* %changelog -* Fri Nov 03 2006 Ralf Cors??pius - 1.17-1 -- Upstream update. - -* Tue Sep 05 2006 Ralf Cors??pius - 1.16-2 -- Mass rebuild. - -* Tue Apr 04 2006 Ralf Cors??pius - 1.16-1 -- Upsteam update. -- BR: Scalar::Util >= 1.18. - -* Tue Feb 28 2006 Ralf Cors??pius - 1.15-3 -- Rebuild for perl-5.8.8. - * Thu Aug 20 2005 Ralf Corsepius - 1.15-2 - Spec cleanup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Nov 2006 04:11:06 -0000 1.3 +++ sources 3 Nov 2006 04:55:19 -0000 1.4 @@ -1 +1 @@ -c1468eb79c414090bf16e2da4fc9637c Tree-Simple-1.17.tar.gz +f4bb1afd402186952ea0b87ceeb3bc41 Tree-Simple-1.15.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:00:42 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Nov 2006 22:00:42 -0700 Subject: rpms/ghc/devel .cvsignore, 1.6, 1.7 ghc.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200611030500.kA350gGw014550@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14519 Modified Files: .cvsignore ghc.spec sources Log Message: - update to 6.6 release - buildrequire haddock >= 0.8 - fix summary of ghcver package (Michel Salim, #209574) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Apr 2006 07:59:27 -0000 1.6 +++ .cvsignore 3 Nov 2006 05:00:12 -0000 1.7 @@ -1 +1,2 @@ -ghc-6.4.2-src.tar.bz2 +ghc-6.6-src.tar.bz2 +ghc-6.6-src-extralibs.tar.bz2 Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ghc.spec 28 Sep 2006 01:44:23 -0000 1.16 +++ ghc.spec 3 Nov 2006 05:00:12 -0000 1.17 @@ -1,16 +1,17 @@ -%define ghcver ghc642 +%define ghcver ghc66 # speed up test builds by not building profiled libraries %define build_prof 1 %define build_doc 1 Name: ghc -Version: 6.4.2 -Release: 4%{?dist} +Version: 6.6 +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages -Source: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2 +Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2 +Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2 URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,7 +21,7 @@ Buildrequires: freeglut-devel, openal-devel %if %{build_doc} # haddock generates docs in libraries -Buildrequires: libxslt, docbook-style-xsl, haddock +Buildrequires: libxslt, docbook-style-xsl, haddock >= 0.8 %endif Prefix: %{_prefix} @@ -35,7 +36,7 @@ interface. %package -n %{ghcver} -Summary: Documentation for GHC +Summary: Glasgow Haskell Compilation system Group: Development/Languages Requires: gcc gmp-devel readline-devel @@ -79,7 +80,7 @@ %define __spec_install_post /usr/lib/rpm/brp-compress %prep -%setup -q -n ghc-%{version} +%setup -q -n ghc-%{version} -b1 %build %if !%{build_prof} @@ -154,7 +155,7 @@ %files -n %{ghcver} -f rpm-base-filelist %defattr(-,root,root,-) -%doc ghc/ANNOUNCE ghc/LICENSE ghc/README +%doc ANNOUNCE HACKING LICENSE README %{_bindir}/ghc*%{version} %config(noreplace) %{_libdir}/ghc-%{version}/package.conf %ghost %{_libdir}/ghc-%{version}/package.conf.old @@ -174,6 +175,11 @@ %changelog +* Fri Nov 3 2006 Jens Petersen - 6.6-1 +- update to 6.6 release +- buildrequire haddock >= 0.8 +- fix summary of ghcver package (Michel Salim, #209574) + * Thu Sep 28 2006 Jens Petersen - 6.4.2-4 - turn on docs generation again Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Sep 2006 12:34:59 -0000 1.8 +++ sources 3 Nov 2006 05:00:12 -0000 1.9 @@ -1 +1,2 @@ -a394bf14e94c3bca5507d568fcc03375 ghc-6.4.2-src.tar.bz2 +2427a8d7d14f86e0878df6b54938acf7 ghc-6.6-src.tar.bz2 +14b22fce36caffa509046361724bc119 ghc-6.6-src-extralibs.tar.bz2 From fedora-extras-commits at redhat.com Fri Nov 3 05:04:02 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:04:02 -0700 Subject: rpms/perl-Test-LongString/FC-6 .cvsignore, 1.3, 1.4 perl-Test-LongString.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200611030504.kA3542pb017608@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17583 Modified Files: .cvsignore perl-Test-LongString.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.10-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Oct 2005 06:34:22 -0000 1.3 +++ .cvsignore 3 Nov 2006 05:03:32 -0000 1.4 @@ -1 +1 @@ -Test-LongString-0.09.tar.gz +Test-LongString-0.10.tar.gz Index: perl-Test-LongString.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-6/perl-Test-LongString.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Test-LongString.spec 5 Sep 2006 08:57:53 -0000 1.5 +++ perl-Test-LongString.spec 3 Nov 2006 05:03:32 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-Test-LongString -Version: 0.09 -Release: 3%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Perl module to test long strings License: GPL or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.10-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 0.09-3 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Oct 2005 06:34:22 -0000 1.3 +++ sources 3 Nov 2006 05:03:32 -0000 1.4 @@ -1 +1 @@ -a956f4f0a8f7a8704f984523ce58fa66 Test-LongString-0.09.tar.gz +66f3fa30c0100d0f8d8089741964ad52 Test-LongString-0.10.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:05:02 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 2 Nov 2006 22:05:02 -0700 Subject: rpms/scribes/devel .cvsignore, 1.6, 1.7 scribes.spec, 1.18, 1.19 sources, 1.6, 1.7 Message-ID: <200611030505.kA3552Cd017672@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17645 Modified Files: .cvsignore scribes.spec sources Log Message: Update to new upstream release (0.2.9.91) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Oct 2006 05:55:57 -0000 1.6 +++ .cvsignore 3 Nov 2006 05:04:32 -0000 1.7 @@ -1 +1 @@ -scribes-0.2.9.89.tar.bz2 +scribes-0.2.9.91.tar.bz2 Index: scribes.spec =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- scribes.spec 28 Oct 2006 07:39:13 -0000 1.18 +++ scribes.spec 3 Nov 2006 05:04:32 -0000 1.19 @@ -3,8 +3,8 @@ %define python_module_name SCRIBES Name: scribes -Version: 0.2.9.89 -Release: 3%{?dist} +Version: 0.2.9.91 +Release: 1%{?dist} Summary: A sleek, simple, and powerful text editor for the GNOME desktop Group: Applications/Editors License: GPL @@ -153,6 +153,10 @@ %changelog +* Thu Nov 02 2006 Peter Gordon - 0.2.9.91-1 +- Update to upstream version 0.2.9.91, which fixes the ugly bracket-matched + highlighting that slipped into the 0.2.9.89 release (among other bugs) + * Sat Oct 28 2006 Peter Gordon - 0.2.9.89-3 - Drop Application category from the installed .desktop file Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Oct 2006 05:55:57 -0000 1.6 +++ sources 3 Nov 2006 05:04:32 -0000 1.7 @@ -1 +1 @@ -7e94cc1ddb8ac32820fabefaf9ed305d scribes-0.2.9.89.tar.bz2 +81b68ffa6f2662429ee199cb2e356cb9 scribes-0.2.9.91.tar.bz2 From fedora-extras-commits at redhat.com Fri Nov 3 05:06:35 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:06:35 -0700 Subject: rpms/perl-Test-LongString/FC-5 .cvsignore, 1.3, 1.4 perl-Test-LongString.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611030506.kA356Zmf017699@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17678 Modified Files: .cvsignore perl-Test-LongString.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.10-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Oct 2005 06:34:22 -0000 1.3 +++ .cvsignore 3 Nov 2006 05:06:04 -0000 1.4 @@ -1 +1 @@ -Test-LongString-0.09.tar.gz +Test-LongString-0.10.tar.gz Index: perl-Test-LongString.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-5/perl-Test-LongString.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Test-LongString.spec 28 Feb 2006 23:31:38 -0000 1.4 +++ perl-Test-LongString.spec 3 Nov 2006 05:06:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Test-LongString -Version: 0.09 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Perl module to test long strings License: GPL or Artistic Group: Development/Libraries @@ -51,6 +51,12 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.10-1 +- Upstream update. + +* Tue Sep 05 2006 Ralf Cors??pius - 0.09-3 +- Mass rebuild. + * Wed Mar 01 2006 Ralf Cors??pius - 0.09-2 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Oct 2005 06:34:22 -0000 1.3 +++ sources 3 Nov 2006 05:06:04 -0000 1.4 @@ -1 +1 @@ -a956f4f0a8f7a8704f984523ce58fa66 Test-LongString-0.09.tar.gz +66f3fa30c0100d0f8d8089741964ad52 Test-LongString-0.10.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:09:10 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:09:10 -0700 Subject: rpms/perl-Test-LongString/FC-4 .cvsignore, 1.3, 1.4 perl-Test-LongString.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611030509.kA359AQI017859@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Test-LongString/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17839 Modified Files: .cvsignore perl-Test-LongString.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.10-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Oct 2005 06:42:25 -0000 1.3 +++ .cvsignore 3 Nov 2006 05:08:40 -0000 1.4 @@ -1 +1 @@ -Test-LongString-0.09.tar.gz +Test-LongString-0.10.tar.gz Index: perl-Test-LongString.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-4/perl-Test-LongString.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Test-LongString.spec 7 Oct 2005 06:42:25 -0000 1.3 +++ perl-Test-LongString.spec 3 Nov 2006 05:08:40 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Test-LongString -Version: 0.09 +Version: 0.10 Release: 1%{?dist} Summary: Perl module to test long strings License: GPL or Artistic @@ -51,6 +51,15 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.10-1 +- Upstream update. + +* Tue Sep 05 2006 Ralf Cors??pius - 0.09-3 +- Mass rebuild. + +* Wed Mar 01 2006 Ralf Cors??pius - 0.09-2 +- Rebuild for perl-5.8.8. + * Fri Oct 07 2005 Ralf Corsepius - 0.09-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Oct 2005 06:42:25 -0000 1.3 +++ sources 3 Nov 2006 05:08:40 -0000 1.4 @@ -1 +1 @@ -a956f4f0a8f7a8704f984523ce58fa66 Test-LongString-0.09.tar.gz +66f3fa30c0100d0f8d8089741964ad52 Test-LongString-0.10.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:22:09 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 2 Nov 2006 22:22:09 -0700 Subject: rpms/scribes/FC-6 .cvsignore, 1.6, 1.7 scribes.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200611030522.kA35M9RX017980@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17960 Modified Files: .cvsignore scribes.spec sources Log Message: Update to new upstream release (0.2.9.91) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribes/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Oct 2006 05:59:37 -0000 1.6 +++ .cvsignore 3 Nov 2006 05:21:39 -0000 1.7 @@ -1 +1 @@ -scribes-0.2.9.89.tar.bz2 +scribes-0.2.9.91.tar.bz2 Index: scribes.spec =================================================================== RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- scribes.spec 28 Oct 2006 06:49:20 -0000 1.16 +++ scribes.spec 3 Nov 2006 05:21:39 -0000 1.17 @@ -3,7 +3,7 @@ %define python_module_name SCRIBES Name: scribes -Version: 0.2.9.89 +Version: 0.2.9.91 Release: 1%{?dist} Summary: A sleek, simple, and powerful text editor for the GNOME desktop Group: Applications/Editors @@ -153,6 +153,10 @@ %changelog +* Thu Nov 02 2006 Peter Gordon - 0.2.9.91-1 +- Update to upstream version 0.2.9.91, which fixes the ugly bracket-matched + highlighting that slipped into the 0.2.9.89 release (among other bugs) + * Wed Oct 18 2006 Peter Gordon - 0.2.9.89-1 - Update to new upstream version (0.2.9.89) - Update dbus-python dependency version (>= 0.70) Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribes/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Oct 2006 05:59:37 -0000 1.6 +++ sources 3 Nov 2006 05:21:39 -0000 1.7 @@ -1 +1 @@ -7e94cc1ddb8ac32820fabefaf9ed305d scribes-0.2.9.89.tar.bz2 +81b68ffa6f2662429ee199cb2e356cb9 scribes-0.2.9.91.tar.bz2 From fedora-extras-commits at redhat.com Fri Nov 3 05:30:36 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:30:36 -0700 Subject: rpms/perl-Params-Util/devel .cvsignore, 1.15, 1.16 perl-Params-Util.spec, 1.16, 1.17 sources, 1.15, 1.16 Message-ID: <200611030530.kA35UadA018097@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18074/devel Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.22-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 19 Oct 2006 09:39:09 -0000 1.15 +++ .cvsignore 3 Nov 2006 05:30:06 -0000 1.16 @@ -1 +1 @@ -Params-Util-0.21.tar.gz +Params-Util-0.22.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Params-Util.spec 19 Oct 2006 09:39:09 -0000 1.16 +++ perl-Params-Util.spec 3 Nov 2006 05:30:06 -0000 1.17 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.22-1 +- Upstream update. + * Thu Oct 19 2006 Ralf Cors??pius - 0.21-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Oct 2006 09:39:09 -0000 1.15 +++ sources 3 Nov 2006 05:30:06 -0000 1.16 @@ -1 +1 @@ -5d27fa5ba324e7b1e13671c16402870d Params-Util-0.21.tar.gz +47ff67318801dbc0aae41f94080cc8af Params-Util-0.22.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:31:15 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:31:15 -0700 Subject: rpms/perl-Params-Util/FC-6 .cvsignore, 1.15, 1.16 perl-Params-Util.spec, 1.16, 1.17 sources, 1.15, 1.16 Message-ID: <200611030531.kA35VF6W018125@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18103/FC-6 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.22-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-6/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 19 Oct 2006 09:39:09 -0000 1.15 +++ .cvsignore 3 Nov 2006 05:30:45 -0000 1.16 @@ -1 +1 @@ -Params-Util-0.21.tar.gz +Params-Util-0.22.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-6/perl-Params-Util.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Params-Util.spec 19 Oct 2006 09:39:09 -0000 1.16 +++ perl-Params-Util.spec 3 Nov 2006 05:30:45 -0000 1.17 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.22-1 +- Upstream update. + * Thu Oct 19 2006 Ralf Cors??pius - 0.21-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-6/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Oct 2006 09:39:09 -0000 1.15 +++ sources 3 Nov 2006 05:30:45 -0000 1.16 @@ -1 +1 @@ -5d27fa5ba324e7b1e13671c16402870d Params-Util-0.21.tar.gz +47ff67318801dbc0aae41f94080cc8af Params-Util-0.22.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:31:55 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:31:55 -0700 Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.15, 1.16 perl-Params-Util.spec, 1.15, 1.16 sources, 1.15, 1.16 Message-ID: <200611030531.kA35VtXv018151@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18131/FC-5 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.22-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 19 Oct 2006 09:40:35 -0000 1.15 +++ .cvsignore 3 Nov 2006 05:31:24 -0000 1.16 @@ -1 +1 @@ -Params-Util-0.21.tar.gz +Params-Util-0.22.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Params-Util.spec 19 Oct 2006 09:40:35 -0000 1.15 +++ perl-Params-Util.spec 3 Nov 2006 05:31:24 -0000 1.16 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.22-1 +- Upstream update. + * Thu Oct 19 2006 Ralf Cors??pius - 0.21-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Oct 2006 09:40:35 -0000 1.15 +++ sources 3 Nov 2006 05:31:24 -0000 1.16 @@ -1 +1 @@ -5d27fa5ba324e7b1e13671c16402870d Params-Util-0.21.tar.gz +47ff67318801dbc0aae41f94080cc8af Params-Util-0.22.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:32:34 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:32:34 -0700 Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.15, 1.16 perl-Params-Util.spec, 1.14, 1.15 sources, 1.15, 1.16 Message-ID: <200611030532.kA35WY9n018182@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Params-Util/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18157/FC-4 Modified Files: .cvsignore perl-Params-Util.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.22-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 19 Oct 2006 09:42:06 -0000 1.15 +++ .cvsignore 3 Nov 2006 05:32:04 -0000 1.16 @@ -1 +1 @@ -Params-Util-0.21.tar.gz +Params-Util-0.22.tar.gz Index: perl-Params-Util.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Params-Util.spec 19 Oct 2006 09:42:06 -0000 1.14 +++ perl-Params-Util.spec 3 Nov 2006 05:32:04 -0000 1.15 @@ -1,5 +1,5 @@ Name: perl-Params-Util -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Simple standalone param-checking functions License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.22-1 +- Upstream update. + * Thu Oct 19 2006 Ralf Cors??pius - 0.21-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Oct 2006 09:42:06 -0000 1.15 +++ sources 3 Nov 2006 05:32:04 -0000 1.16 @@ -1 +1 @@ -5d27fa5ba324e7b1e13671c16402870d Params-Util-0.21.tar.gz +47ff67318801dbc0aae41f94080cc8af Params-Util-0.22.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:43:48 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:43:48 -0700 Subject: rpms/perl-File-Remove/devel .cvsignore, 1.3, 1.4 perl-File-Remove.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200611030543.kA35hmDZ018440@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Remove/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18420/devel Modified Files: .cvsignore perl-File-Remove.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.33-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 14:25:45 -0000 1.3 +++ .cvsignore 3 Nov 2006 05:43:18 -0000 1.4 @@ -1 +1 @@ -File-Remove-0.31.tar.gz +File-Remove-0.33.tar.gz Index: perl-File-Remove.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-File-Remove.spec 5 Sep 2006 09:35:06 -0000 1.5 +++ perl-File-Remove.spec 3 Nov 2006 05:43:18 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-File-Remove -Version: 0.31 -Release: 3%{?dist} +Version: 0.33 +Release: 1%{?dist} Summary: Convenience module for removing files and directories License: GPL or Artistic Group: Development/Libraries @@ -9,6 +9,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +BuildRequires: perl(File::Spec) >= 0.84 +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Glob) + BuildArch: noarch %description @@ -36,12 +41,14 @@ %files %defattr(-,root,root,-) -# For license text(s), see the perl package. -%doc CHANGES README +%doc Changes README LICENSE %{perl_vendorlib}/File %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.33-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 0.31-3 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 14:25:45 -0000 1.3 +++ sources 3 Nov 2006 05:43:18 -0000 1.4 @@ -1 +1 @@ -8dbe965298ffe80415c3460635bb923f File-Remove-0.31.tar.gz +a72672453ccf9884121c788ea859b12d File-Remove-0.33.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:44:29 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:44:29 -0700 Subject: rpms/perl-File-Remove/FC-6 .cvsignore, 1.3, 1.4 perl-File-Remove.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200611030544.kA35iTSY018466@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Remove/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18446/FC-6 Modified Files: .cvsignore perl-File-Remove.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.33-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 14:25:45 -0000 1.3 +++ .cvsignore 3 Nov 2006 05:43:58 -0000 1.4 @@ -1 +1 @@ -File-Remove-0.31.tar.gz +File-Remove-0.33.tar.gz Index: perl-File-Remove.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/perl-File-Remove.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-File-Remove.spec 5 Sep 2006 09:35:06 -0000 1.5 +++ perl-File-Remove.spec 3 Nov 2006 05:43:58 -0000 1.6 @@ -1,6 +1,6 @@ Name: perl-File-Remove -Version: 0.31 -Release: 3%{?dist} +Version: 0.33 +Release: 1%{?dist} Summary: Convenience module for removing files and directories License: GPL or Artistic Group: Development/Libraries @@ -9,6 +9,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +BuildRequires: perl(File::Spec) >= 0.84 +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Glob) + BuildArch: noarch %description @@ -36,12 +41,14 @@ %files %defattr(-,root,root,-) -# For license text(s), see the perl package. -%doc CHANGES README +%doc Changes README LICENSE %{perl_vendorlib}/File %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.33-1 +- Upstream update. + * Tue Sep 05 2006 Ralf Cors??pius - 0.31-3 - Mass rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 14:25:45 -0000 1.3 +++ sources 3 Nov 2006 05:43:58 -0000 1.4 @@ -1 +1 @@ -8dbe965298ffe80415c3460635bb923f File-Remove-0.31.tar.gz +a72672453ccf9884121c788ea859b12d File-Remove-0.33.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:45:09 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:45:09 -0700 Subject: rpms/perl-File-Remove/FC-5 .cvsignore, 1.3, 1.4 perl-File-Remove.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611030545.kA35j9iS018494@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Remove/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18472/FC-5 Modified Files: .cvsignore perl-File-Remove.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.33-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 14:25:45 -0000 1.3 +++ .cvsignore 3 Nov 2006 05:44:38 -0000 1.4 @@ -1 +1 @@ -File-Remove-0.31.tar.gz +File-Remove-0.33.tar.gz Index: perl-File-Remove.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/perl-File-Remove.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-Remove.spec 28 Feb 2006 23:23:20 -0000 1.4 +++ perl-File-Remove.spec 3 Nov 2006 05:44:38 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-File-Remove -Version: 0.31 -Release: 2%{?dist} +Version: 0.33 +Release: 1%{?dist} Summary: Convenience module for removing files and directories License: GPL or Artistic Group: Development/Libraries @@ -9,6 +9,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +BuildRequires: perl(File::Spec) >= 0.84 +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Glob) + BuildArch: noarch %description @@ -36,12 +41,17 @@ %files %defattr(-,root,root,-) -# For license text(s), see the perl package. -%doc CHANGES README +%doc Changes README LICENSE %{perl_vendorlib}/File %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.33-1 +- Upstream update. + +* Tue Sep 05 2006 Ralf Cors??pius - 0.31-3 +- Mass rebuild. + * Wed Mar 01 2006 Ralf Cors??pius - 0.31-2 - Rebuild for perl-5.8.8. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 14:25:45 -0000 1.3 +++ sources 3 Nov 2006 05:44:38 -0000 1.4 @@ -1 +1 @@ -8dbe965298ffe80415c3460635bb923f File-Remove-0.31.tar.gz +a72672453ccf9884121c788ea859b12d File-Remove-0.33.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:45:49 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Thu, 2 Nov 2006 22:45:49 -0700 Subject: rpms/perl-File-Remove/FC-4 .cvsignore, 1.3, 1.4 perl-File-Remove.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611030545.kA35jnGI018520@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Remove/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18500/FC-4 Modified Files: .cvsignore perl-File-Remove.spec sources Log Message: * Fri Nov 03 2006 Ralf Cors??pius - 0.33-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 14:27:51 -0000 1.3 +++ .cvsignore 3 Nov 2006 05:45:19 -0000 1.4 @@ -1 +1 @@ -File-Remove-0.31.tar.gz +File-Remove-0.33.tar.gz Index: perl-File-Remove.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/perl-File-Remove.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Remove.spec 11 Jan 2006 14:27:51 -0000 1.3 +++ perl-File-Remove.spec 3 Nov 2006 05:45:19 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-File-Remove -Version: 0.31 +Version: 0.33 Release: 1%{?dist} Summary: Convenience module for removing files and directories License: GPL or Artistic @@ -9,6 +9,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +BuildRequires: perl(File::Spec) >= 0.84 +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Glob) + BuildArch: noarch %description @@ -36,12 +41,20 @@ %files %defattr(-,root,root,-) -# For license text(s), see the perl package. -%doc CHANGES README +%doc Changes README LICENSE %{perl_vendorlib}/File %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Ralf Cors??pius - 0.33-1 +- Upstream update. + +* Tue Sep 05 2006 Ralf Cors??pius - 0.31-3 +- Mass rebuild. + +* Wed Mar 01 2006 Ralf Cors??pius - 0.31-2 +- Rebuild for perl-5.8.8. + * Wed Jan 11 2006 Ralf Corsepius - 0.31-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 14:27:51 -0000 1.3 +++ sources 3 Nov 2006 05:45:19 -0000 1.4 @@ -1 +1 @@ -8dbe965298ffe80415c3460635bb923f File-Remove-0.31.tar.gz +a72672453ccf9884121c788ea859b12d File-Remove-0.33.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 05:48:20 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 2 Nov 2006 22:48:20 -0700 Subject: rpms/scorched3d/devel scorched3d.spec,1.18,1.19 Message-ID: <200611030548.kA35mKYJ018699@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18679 Modified Files: scorched3d.spec Log Message: * Fri Nov 3 2006 Hans de Goede 40.1c-2 - Add libvorbis-devel BR so that ogg/vorbis support gets build in Index: scorched3d.spec =================================================================== RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- scorched3d.spec 2 Nov 2006 20:45:26 -0000 1.18 +++ scorched3d.spec 3 Nov 2006 05:47:50 -0000 1.19 @@ -1,6 +1,6 @@ Name: scorched3d Version: 40.1c -Release: 1%{?dist} +Release: 2%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPL @@ -13,7 +13,7 @@ Patch4: %{name}-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel -BuildRequires: expat-devel ImageMagick desktop-file-utils +BuildRequires: expat-devel libvorbis-devel ImageMagick desktop-file-utils Requires: hicolor-icon-theme # Upstream naming compatibility Provides: Scorched3D = %{version}-%{release} @@ -100,7 +100,10 @@ %changelog -* Tue Aug 29 2006 Hans de Goede 40.1c-1 +* Fri Nov 3 2006 Hans de Goede 40.1c-2 +- Add libvorbis-devel BR so that ogg/vorbis support gets build in + +* Thu Nov 2 2006 Hans de Goede 40.1c-1 - New upstream release 40.1c - Drop 64 bit patch (integrated upstream) - Don't install our data files in /usr/share/games, but in /usr/share From fedora-extras-commits at redhat.com Fri Nov 3 07:28:21 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 3 Nov 2006 00:28:21 -0700 Subject: rpms/awstats/FC-5 awstats.spec,1.16,1.17 Message-ID: <200611030728.kA37SLZS025108@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25064/FC-5 Modified Files: awstats.spec Log Message: fix bug 213803 Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- awstats.spec 30 Oct 2006 14:23:25 -0000 1.16 +++ awstats.spec 3 Nov 2006 07:27:51 -0000 1.17 @@ -1,6 +1,6 @@ Name: awstats Version: 6.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -57,7 +57,7 @@ if [ -f %{_localstatedir}/log/httpd/access_log ] ; then exec perl %{_datadir}/awstats/tools/awstats_updateall.pl now \ - -confdir="%{_sysconfdir}/awstats" \ + -configdir="%{_sysconfdir}/awstats" \ -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null fi exit 0 @@ -176,6 +176,9 @@ %changelog +* Fri Nov 03 2006 Aurelien Bompard 6.5-6 +- fix typo in the cron job (bug 213803) + * Mon Oct 30 2006 Aurelien Bompard 6.5-5 - fix DOS encoding on logresolvemerge.pl From fedora-extras-commits at redhat.com Fri Nov 3 07:28:23 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 3 Nov 2006 00:28:23 -0700 Subject: rpms/awstats/FC-6 awstats.spec,1.16,1.17 Message-ID: <200611030728.kA37SNSG025111@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25064/FC-6 Modified Files: awstats.spec Log Message: fix bug 213803 Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/FC-6/awstats.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- awstats.spec 30 Oct 2006 14:05:07 -0000 1.16 +++ awstats.spec 3 Nov 2006 07:27:52 -0000 1.17 @@ -1,6 +1,6 @@ Name: awstats Version: 6.6 -Release: 0.3.beta%{?dist} +Release: 0.4.beta%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -54,7 +54,7 @@ if [ -f %{_localstatedir}/log/httpd/access_log ] ; then exec perl %{_datadir}/awstats/tools/awstats_updateall.pl now \ - -confdir="%{_sysconfdir}/awstats" \ + -configdir="%{_sysconfdir}/awstats" \ -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null fi exit 0 @@ -173,6 +173,9 @@ %changelog +* Fri Nov 03 2006 Aurelien Bompard 6.6-0.4.beta +- fix typo in the cron job (bug 213803) + * Mon Oct 30 2006 Aurelien Bompard 6.6-0.3.beta - fix DOS encoding on logresolvemerge.pl From fedora-extras-commits at redhat.com Fri Nov 3 07:28:23 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 3 Nov 2006 00:28:23 -0700 Subject: rpms/awstats/devel awstats.spec,1.16,1.17 Message-ID: <200611030728.kA37SNC7025114@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/awstats/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25064/devel Modified Files: awstats.spec Log Message: fix bug 213803 Index: awstats.spec =================================================================== RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- awstats.spec 30 Oct 2006 14:05:09 -0000 1.16 +++ awstats.spec 3 Nov 2006 07:27:53 -0000 1.17 @@ -1,6 +1,6 @@ Name: awstats Version: 6.6 -Release: 0.3.beta%{?dist} +Release: 0.4.beta%{?dist} Summary: Advanced Web Statistics License: GPL Group: Applications/Internet @@ -54,7 +54,7 @@ if [ -f %{_localstatedir}/log/httpd/access_log ] ; then exec perl %{_datadir}/awstats/tools/awstats_updateall.pl now \ - -confdir="%{_sysconfdir}/awstats" \ + -configdir="%{_sysconfdir}/awstats" \ -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null fi exit 0 @@ -173,6 +173,9 @@ %changelog +* Fri Nov 03 2006 Aurelien Bompard 6.6-0.4.beta +- fix typo in the cron job (bug 213803) + * Mon Oct 30 2006 Aurelien Bompard 6.6-0.3.beta - fix DOS encoding on logresolvemerge.pl From fedora-extras-commits at redhat.com Fri Nov 3 08:46:57 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 3 Nov 2006 01:46:57 -0700 Subject: rpms/python-formencode/devel .cvsignore, 1.4, 1.5 python-formencode.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200611030846.kA38kvQM028605@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-formencode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28585 Modified Files: .cvsignore python-formencode.spec sources Log Message: 0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-formencode/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Jul 2006 21:54:13 -0000 1.4 +++ .cvsignore 3 Nov 2006 08:46:26 -0000 1.5 @@ -1 +1 @@ -FormEncode-0.5.1.tar.gz +FormEncode-0.6.tar.gz Index: python-formencode.spec =================================================================== RCS file: /cvs/extras/rpms/python-formencode/devel/python-formencode.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-formencode.spec 3 Sep 2006 21:10:29 -0000 1.8 +++ python-formencode.spec 3 Nov 2006 08:46:26 -0000 1.9 @@ -2,14 +2,14 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: python-formencode -Version: 0.5.1 -Release: 3%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: HTML form validation, generation, and convertion package Group: Development/Libraries License: PSF URL: http://formencode.org/ -Source0: http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz +Source0: http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz Patch: %{name}-%{version}-badurl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -47,6 +47,9 @@ %{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info %changelog +* Fri Nov 3 2006 Luke Macken 0.6-1 +- 0.6 + * Sun Sep 3 2006 Luke Macken 0.5.1-3 - Rebuild for FC6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-formencode/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jul 2006 21:54:13 -0000 1.4 +++ sources 3 Nov 2006 08:46:26 -0000 1.5 @@ -1 +1 @@ -f240217726f1962762bcf889a16f4450 FormEncode-0.5.1.tar.gz +8504d515a8e25f1bba6842224b7494ae FormEncode-0.6.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 08:49:06 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 3 Nov 2006 01:49:06 -0700 Subject: rpms/python-formencode/devel python-formencode-0.6-badurl.patch, NONE, 1.1 python-formencode.spec, 1.9, 1.10 python-formencode-0.5.1-badurl.patch, 1.1, NONE Message-ID: <200611030849.kA38n6JW028700@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-formencode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28663 Modified Files: python-formencode.spec Added Files: python-formencode-0.6-badurl.patch Removed Files: python-formencode-0.5.1-badurl.patch Log Message: add patch and rebuild python-formencode-0.6-badurl.patch: --- NEW FILE python-formencode-0.6-badurl.patch --- --- setup.cfg.orig 2006-07-29 16:59:12.000000000 -0400 +++ setup.cfg 2006-07-29 16:59:16.000000000 -0400 @@ -1,5 +1,4 @@ [easy_install] -find_links = http://svn.pythonpaste.org/package_index.html [pudge] title = FormEncode Index: python-formencode.spec =================================================================== RCS file: /cvs/extras/rpms/python-formencode/devel/python-formencode.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-formencode.spec 3 Nov 2006 08:46:26 -0000 1.9 +++ python-formencode.spec 3 Nov 2006 08:48:36 -0000 1.10 @@ -3,7 +3,7 @@ Name: python-formencode Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTML form validation, generation, and convertion package Group: Development/Libraries @@ -47,6 +47,9 @@ %{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info %changelog +* Fri Nov 3 2006 Luke Macken 0.6-2 +- Rebuild + * Fri Nov 3 2006 Luke Macken 0.6-1 - 0.6 --- python-formencode-0.5.1-badurl.patch DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 09:20:39 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 3 Nov 2006 02:20:39 -0700 Subject: rpms/gdeskcal/devel gdeskcal.spec,1.17,1.18 Message-ID: <200611030920.kA39Kdib031970@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31950 Modified Files: gdeskcal.spec Log Message: Added BR gettext gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gdeskcal.spec 2 Nov 2006 22:04:24 -0000 1.17 +++ gdeskcal.spec 3 Nov 2006 09:20:08 -0000 1.18 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser) +BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser), gettext Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -63,6 +63,9 @@ %{_libdir}/%{name}/ %changelog +* Fri Nov 03 2006 Paul F. Johnson 1.0-9 +- added BR gettext + * Thu Nov 02 2006 Paul F. Johnson 1.0-8 - removed the smp_mflags as it was annoying the RH buildsys From fedora-extras-commits at redhat.com Fri Nov 3 09:46:31 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Fri, 3 Nov 2006 02:46:31 -0700 Subject: rpms/soundconverter/FC-5 .cvsignore, 1.6, 1.7 soundconverter.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200611030946.kA39kV6J032208@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/soundconverter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32188 Modified Files: .cvsignore soundconverter.spec sources Log Message: Update to 0.9.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Oct 2006 08:48:35 -0000 1.6 +++ .cvsignore 3 Nov 2006 09:46:00 -0000 1.7 @@ -1 +1 @@ -soundconverter-0.9.2.tar.gz +soundconverter-0.9.3.tar.gz Index: soundconverter.spec =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-5/soundconverter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- soundconverter.spec 17 Oct 2006 08:48:35 -0000 1.7 +++ soundconverter.spec 3 Nov 2006 09:46:00 -0000 1.8 @@ -1,5 +1,5 @@ Name: soundconverter -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: A simple sound converter application for GNOME @@ -62,6 +62,9 @@ %changelog +* Fri Nov 3 2006 Denis Leroy - 0.9.3-1 +- Update to 0.9.3 + * Tue Oct 17 2006 Denis Leroy - 0.9.2-1 - Update to 0.9.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Oct 2006 08:48:35 -0000 1.6 +++ sources 3 Nov 2006 09:46:00 -0000 1.7 @@ -1 +1 @@ -ecde29fc6847e8441e4fe5acb8ef26d1 soundconverter-0.9.2.tar.gz +4f54b5b706c2f69924936f6bd5b0bcd6 soundconverter-0.9.3.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 09:59:18 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Nov 2006 02:59:18 -0700 Subject: rpms/codeblocks/devel .cvsignore, 1.4, 1.5 codeblocks.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200611030959.kA39xIsX032343@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32323 Modified Files: .cvsignore codeblocks.spec sources Log Message: - update to revision 3170 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Oct 2006 07:50:41 -0000 1.4 +++ .cvsignore 3 Nov 2006 09:58:48 -0000 1.5 @@ -1 +1 @@ -codeblocks-svn3157.tar.bz2 +codeblocks-svn3170.tar.bz2 Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- codeblocks.spec 30 Oct 2006 07:50:41 -0000 1.3 +++ codeblocks.spec 3 Nov 2006 09:58:48 -0000 1.4 @@ -1,9 +1,9 @@ -%define rev 3157 -%define date 20061029 +%define rev 3170 +%define date 20061102 Name: codeblocks Version: 1.0 -Release: 0.11.%{date}svn%{rev}%{?dist} +Release: 0.12.%{date}svn%{rev}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPL @@ -225,6 +225,9 @@ %changelog +* Fri Nov 3 2006 Dan Horak 1.0-0.12.20061029svn3170 +- update to revision 3170 + * Mon Oct 30 2006 Dan Horak 1.0-0.11.20061029svn3157 - update to revision 3157 - kill rpath in the spec file using sed Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Oct 2006 07:50:41 -0000 1.4 +++ sources 3 Nov 2006 09:58:48 -0000 1.5 @@ -1 +1 @@ -da2093d8d0f32d8822836a4c95c71258 codeblocks-svn3157.tar.bz2 +bfcda3308b08a096edbc4c0328e98c4b codeblocks-svn3170.tar.bz2 From fedora-extras-commits at redhat.com Fri Nov 3 10:03:21 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Nov 2006 03:03:21 -0700 Subject: rpms/codeblocks/FC-6 .cvsignore, 1.4, 1.5 codeblocks.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200611031003.kA3A3L6W002912@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2881 Modified Files: .cvsignore codeblocks.spec sources Log Message: - update to revision 3170 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Oct 2006 08:39:39 -0000 1.4 +++ .cvsignore 3 Nov 2006 10:02:48 -0000 1.5 @@ -1 +1 @@ -codeblocks-svn3157.tar.bz2 +codeblocks-svn3170.tar.bz2 Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- codeblocks.spec 30 Oct 2006 08:39:39 -0000 1.3 +++ codeblocks.spec 3 Nov 2006 10:02:48 -0000 1.4 @@ -1,9 +1,9 @@ -%define rev 3157 -%define date 20061029 +%define rev 3170 +%define date 20061102 Name: codeblocks Version: 1.0 -Release: 0.11.%{date}svn%{rev}%{?dist} +Release: 0.12.%{date}svn%{rev}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPL @@ -225,6 +225,9 @@ %changelog +* Fri Nov 3 2006 Dan Horak 1.0-0.12.20061029svn3170 +- update to revision 3170 + * Mon Oct 30 2006 Dan Horak 1.0-0.11.20061029svn3157 - update to revision 3157 - kill rpath in the spec file using sed Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Oct 2006 08:39:39 -0000 1.4 +++ sources 3 Nov 2006 10:02:48 -0000 1.5 @@ -1 +1 @@ -da2093d8d0f32d8822836a4c95c71258 codeblocks-svn3157.tar.bz2 +bfcda3308b08a096edbc4c0328e98c4b codeblocks-svn3170.tar.bz2 From fedora-extras-commits at redhat.com Fri Nov 3 10:06:53 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Nov 2006 03:06:53 -0700 Subject: rpms/codeblocks/FC-5 .cvsignore, 1.4, 1.5 codeblocks.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200611031006.kA3A6reI003051@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/codeblocks/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3031 Modified Files: .cvsignore codeblocks.spec sources Log Message: - update to revision 3170 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Oct 2006 08:46:37 -0000 1.4 +++ .cvsignore 3 Nov 2006 10:06:23 -0000 1.5 @@ -1 +1 @@ -codeblocks-svn3157.tar.bz2 +codeblocks-svn3170.tar.bz2 Index: codeblocks.spec =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- codeblocks.spec 30 Oct 2006 08:46:37 -0000 1.3 +++ codeblocks.spec 3 Nov 2006 10:06:23 -0000 1.4 @@ -1,9 +1,9 @@ -%define rev 3157 -%define date 20061029 +%define rev 3170 +%define date 20061102 Name: codeblocks Version: 1.0 -Release: 0.11.%{date}svn%{rev}%{?dist} +Release: 0.12.%{date}svn%{rev}%{?dist} Summary: An open source, cross platform, free C++ IDE Group: Development/Tools License: GPL @@ -225,6 +225,9 @@ %changelog +* Fri Nov 3 2006 Dan Horak 1.0-0.12.20061029svn3170 +- update to revision 3170 + * Mon Oct 30 2006 Dan Horak 1.0-0.11.20061029svn3157 - update to revision 3157 - kill rpath in the spec file using sed Index: sources =================================================================== RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Oct 2006 08:46:37 -0000 1.4 +++ sources 3 Nov 2006 10:06:23 -0000 1.5 @@ -1 +1 @@ -da2093d8d0f32d8822836a4c95c71258 codeblocks-svn3157.tar.bz2 +bfcda3308b08a096edbc4c0328e98c4b codeblocks-svn3170.tar.bz2 From fedora-extras-commits at redhat.com Fri Nov 3 10:21:04 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Fri, 3 Nov 2006 03:21:04 -0700 Subject: rpms/soundconverter/FC-4 .cvsignore, 1.4, 1.5 soundconverter.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200611031021.kA3AL4pf003175@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/soundconverter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3153 Modified Files: .cvsignore soundconverter.spec sources Log Message: Update to 0.9.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Oct 2006 09:27:37 -0000 1.4 +++ .cvsignore 3 Nov 2006 10:20:34 -0000 1.5 @@ -1 +1 @@ -soundconverter-0.9.2.tar.gz +soundconverter-0.9.3.tar.gz Index: soundconverter.spec =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-4/soundconverter.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- soundconverter.spec 17 Oct 2006 09:27:37 -0000 1.5 +++ soundconverter.spec 3 Nov 2006 10:20:34 -0000 1.6 @@ -1,5 +1,5 @@ Name: soundconverter -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: A simple sound converter application for GNOME @@ -59,6 +59,9 @@ %changelog +* Fri Nov 3 2006 Denis Leroy - 0.9.3-1 +- Update to 0.9.3 + * Tue Oct 17 2006 Denis Leroy - 0.9.2-1 - Update to 0.9.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Oct 2006 09:27:37 -0000 1.4 +++ sources 3 Nov 2006 10:20:34 -0000 1.5 @@ -1 +1 @@ -ecde29fc6847e8441e4fe5acb8ef26d1 soundconverter-0.9.2.tar.gz +4f54b5b706c2f69924936f6bd5b0bcd6 soundconverter-0.9.3.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 11:21:40 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 04:21:40 -0700 Subject: rpms/scorched3d/FC-6 scorched3d.spec,1.18,1.19 Message-ID: <200611031121.kA3BLeTK006740@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6722 Modified Files: scorched3d.spec Log Message: * Fri Nov 3 2006 Hans de Goede 40.1c-2 - Add libvorbis-devel BR so that ogg/vorbis support gets build in Index: scorched3d.spec =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- scorched3d.spec 2 Nov 2006 20:48:36 -0000 1.18 +++ scorched3d.spec 3 Nov 2006 11:21:09 -0000 1.19 @@ -1,6 +1,6 @@ Name: scorched3d Version: 40.1c -Release: 1%{?dist} +Release: 2%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPL @@ -13,7 +13,7 @@ Patch4: %{name}-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel -BuildRequires: expat-devel ImageMagick desktop-file-utils +BuildRequires: expat-devel libvorbis-devel ImageMagick desktop-file-utils Requires: hicolor-icon-theme # Upstream naming compatibility Provides: Scorched3D = %{version}-%{release} @@ -100,7 +100,10 @@ %changelog -* Tue Aug 29 2006 Hans de Goede 40.1c-1 +* Fri Nov 3 2006 Hans de Goede 40.1c-2 +- Add libvorbis-devel BR so that ogg/vorbis support gets build in + +* Thu Nov 2 2006 Hans de Goede 40.1c-1 - New upstream release 40.1c - Drop 64 bit patch (integrated upstream) - Don't install our data files in /usr/share/games, but in /usr/share From fedora-extras-commits at redhat.com Fri Nov 3 11:24:09 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 04:24:09 -0700 Subject: rpms/scorched3d/FC-5 .cvsignore, 1.4, 1.5 scorched3d-help.patch, 1.3, 1.4 scorched3d-syslibs.patch, 1.3, 1.4 scorched3d-wx26.patch, 1.1, 1.2 scorched3d.spec, 1.16, 1.17 sources, 1.4, 1.5 scorched3d-64bit.patch, 1.6, NONE Message-ID: <200611031124.kA3BO9hS006832@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scorched3d/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6797 Modified Files: .cvsignore scorched3d-help.patch scorched3d-syslibs.patch scorched3d-wx26.patch scorched3d.spec sources Removed Files: scorched3d-64bit.patch Log Message: * Fri Nov 3 2006 Hans de Goede 40.1c-2 - Add libvorbis-devel BR so that ogg/vorbis support gets build in Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jul 2006 20:05:42 -0000 1.4 +++ .cvsignore 3 Nov 2006 11:23:38 -0000 1.5 @@ -1 +1 @@ -Scorched3D-40-src.tar.gz +Scorched3D-40.1c-src.tar.gz scorched3d-help.patch: Index: scorched3d-help.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-help.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scorched3d-help.patch 16 Jul 2006 20:05:42 -0000 1.3 +++ scorched3d-help.patch 3 Nov 2006 11:23:38 -0000 1.4 @@ -1,25 +1,3 @@ -diff -ur scorched.orig/src/scorched/HtmlHelpDialog.cpp scorched/src/scorched/HtmlHelpDialog.cpp ---- scorched.orig/src/scorched/HtmlHelpDialog.cpp 2006-02-17 18:48:54.000000000 +0100 -+++ scorched/src/scorched/HtmlHelpDialog.cpp 2006-07-16 11:03:57.000000000 +0200 -@@ -137,13 +137,13 @@ - void HelpFrame::onHome(wxCommandEvent &event) - { - html_->HistoryClear(); -- html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8)); -+ html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8)); - } - - void showHtmlHelpDialog() - { - // For the moment just show the documentation in the default web browser -- showURL(formatString("file://%s", getDocFile("documentation/html/index.html"))); -+ showURL(formatString("file://%s", getDocFile("html/index.html"))); - - //HelpFrame *frame = new HelpFrame(); - //frame->Show(); -Only in scorched/src/scorched: HtmlHelpDialog.cpp.orig -Only in scorched/src/scorched: HtmlHelpDialog.cpp.rej -Only in scorched/src/scorched: HtmlHelpDialog.cpp~ diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp --- scorched.orig/src/scorched/MainDialog.cpp 2006-05-14 17:00:11.000000000 +0200 +++ scorched/src/scorched/MainDialog.cpp 2006-07-16 11:05:27.000000000 +0200 @@ -34,6 +12,3 @@ #endif // __DARWIN__ #endif // _WIN32 } -Only in scorched/src/scorched: MainDialog.cpp.orig -Only in scorched/src/scorched: MainDialog.cpp.rej -Only in scorched/src/scorched: MainDialog.cpp~ scorched3d-syslibs.patch: Index: scorched3d-syslibs.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-syslibs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scorched3d-syslibs.patch 16 Jul 2006 20:05:42 -0000 1.3 +++ scorched3d-syslibs.patch 3 Nov 2006 11:23:38 -0000 1.4 @@ -1,16 +1,16 @@ ---- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100 -+++ scorched/src/coms/NetServerProtocol.cpp 2006-07-16 11:36:19.000000000 +0200 +--- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-08-04 15:35:15.000000000 +0200 ++++ scorched/src/coms/NetServerProtocol.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -22,7 +22,7 @@ #include - #include + #include #include -#include +#include NetServerProtocol::NetServerProtocol() { ---- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100 -+++ scorched/src/coms/ComsMessageSender.cpp 2006-07-16 11:36:19.000000000 +0200 +--- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-09-08 17:07:59.000000000 +0200 ++++ scorched/src/coms/ComsMessageSender.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -27,7 +27,7 @@ #include #include @@ -21,7 +21,7 @@ bool ComsMessageSender::sendToServer(ComsMessage &message) --- scorched/src/XML/XMLParser.h.syslibs 2006-05-01 01:42:52.000000000 +0200 -+++ scorched/src/XML/XMLParser.h 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/XML/XMLParser.h 2006-10-31 20:11:27.000000000 +0100 @@ -21,7 +21,7 @@ #if !defined(__INCLUDE_XMLParserh_INCLUDE__) #define __INCLUDE_XMLParserh_INCLUDE__ @@ -31,18 +31,18 @@ #include class XMLParser ---- scorched/src/scorched/Makefile.am.syslibs 2006-07-15 17:14:50.000000000 +0200 -+++ scorched/src/scorched/Makefile.am 2006-07-16 11:36:47.000000000 +0200 -@@ -260,7 +260,6 @@ - ../common/Vector.h \ +--- scorched/src/scorched/Makefile.am.syslibs 2006-10-27 20:48:23.000000000 +0200 ++++ scorched/src/scorched/Makefile.am 2006-10-31 20:12:35.000000000 +0100 +@@ -271,7 +271,6 @@ + ../common/Vector4.h \ ../common/VectorLib.cpp \ ../common/VectorLib.h \ - ../common/snprintf.c \ ../3dsparse/ASEModelFactory.cpp \ ../3dsparse/ASEModelFactory.h \ ../3dsparse/Bone.cpp \ -@@ -602,95 +601,6 @@ - ../weapons/WeaponTranslate.h \ +@@ -637,96 +636,6 @@ + ../weapons/WeaponTypeAction.h \ ../weapons/WeaponVelocity.cpp \ ../weapons/WeaponVelocity.h \ - ../ode/array.cpp \ @@ -50,6 +50,7 @@ - ../ode/collision.h \ - ../ode/collision_kernel.cpp \ - ../ode/collision_kernel.h \ +- ../ode/collision_quadtreespace.cpp \ - ../ode/collision_space.cpp \ - ../ode/collision_space.h \ - ../ode/collision_space_internal.h \ @@ -137,7 +138,7 @@ ../actions/AddTarget.cpp \ ../actions/AddTarget.h \ ../actions/Animation.cpp \ -@@ -1100,14 +1010,6 @@ +@@ -1134,14 +1043,6 @@ ../XML/XMLParser.h \ ../XML/XMLStringBuffer.cpp \ ../XML/XMLStringBuffer.h \ @@ -152,18 +153,18 @@ ../target/Target.cpp \ ../target/Target.h \ ../target/TargetContainer.cpp \ ---- scorched/src/scorched/Makefile.in.syslibs 2006-07-15 17:15:28.000000000 +0200 -+++ scorched/src/scorched/Makefile.in 2006-07-16 11:37:23.000000000 +0200 -@@ -360,7 +360,6 @@ - ../common/Vector.h \ +--- scorched/src/scorched/Makefile.in.syslibs 2006-10-30 19:10:42.000000000 +0100 ++++ scorched/src/scorched/Makefile.in 2006-10-31 20:19:02.000000000 +0100 +@@ -372,7 +372,6 @@ + ../common/Vector4.h \ ../common/VectorLib.cpp \ ../common/VectorLib.h \ - ../common/snprintf.c \ ../3dsparse/ASEModelFactory.cpp \ ../3dsparse/ASEModelFactory.h \ ../3dsparse/Bone.cpp \ -@@ -702,95 +701,6 @@ - ../weapons/WeaponTranslate.h \ +@@ -738,96 +737,6 @@ + ../weapons/WeaponTypeAction.h \ ../weapons/WeaponVelocity.cpp \ ../weapons/WeaponVelocity.h \ - ../ode/array.cpp \ @@ -171,6 +172,7 @@ - ../ode/collision.h \ - ../ode/collision_kernel.cpp \ - ../ode/collision_kernel.h \ +- ../ode/collision_quadtreespace.cpp \ - ../ode/collision_space.cpp \ - ../ode/collision_space.h \ - ../ode/collision_space_internal.h \ @@ -258,7 +260,7 @@ ../actions/AddTarget.cpp \ ../actions/AddTarget.h \ ../actions/Animation.cpp \ -@@ -1200,14 +1110,6 @@ +@@ -1235,14 +1144,6 @@ ../XML/XMLParser.h \ ../XML/XMLStringBuffer.cpp \ ../XML/XMLStringBuffer.h \ @@ -273,20 +275,21 @@ ../target/Target.cpp \ ../target/Target.h \ ../target/TargetContainer.cpp \ -@@ -1426,7 +1328,7 @@ - SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \ - StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \ - StatsLoggerMySQL.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \ +@@ -1471,7 +1372,7 @@ + SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \ + StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \ + Triangle.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \ - VectorLib.$(OBJEXT) snprintf.$(OBJEXT) \ + VectorLib.$(OBJEXT) \ ASEModelFactory.$(OBJEXT) Bone.$(OBJEXT) Face.$(OBJEXT) \ ImageID.$(OBJEXT) ImageStore.$(OBJEXT) MSModelFactory.$(OBJEXT) \ Mesh.$(OBJEXT) MeshLOD.$(OBJEXT) MeshLODTri.$(OBJEXT) \ -@@ -1506,21 +1408,6 @@ - WeaponScatterPosition.$(OBJEXT) WeaponSkyFlash.$(OBJEXT) \ - WeaponSound.$(OBJEXT) WeaponTeleport.$(OBJEXT) \ - WeaponTranslate.$(OBJEXT) WeaponVelocity.$(OBJEXT) \ -- array.$(OBJEXT) collision_kernel.$(OBJEXT) \ +@@ -1558,22 +1459,7 @@ + WeaponTankPosition.$(OBJEXT) WeaponTankVelocity.$(OBJEXT) \ + WeaponTeamAction.$(OBJEXT) WeaponTeleport.$(OBJEXT) \ + WeaponTranslate.$(OBJEXT) WeaponTypeAction.$(OBJEXT) \ +- WeaponVelocity.$(OBJEXT) array.$(OBJEXT) \ +- collision_kernel.$(OBJEXT) collision_quadtreespace.$(OBJEXT) \ - collision_space.$(OBJEXT) collision_std.$(OBJEXT) \ - collision_transform.$(OBJEXT) collision_util.$(OBJEXT) \ - error.$(OBJEXT) export-dif.$(OBJEXT) fastdot.$(OBJEXT) \ @@ -301,21 +304,19 @@ - infblock.$(OBJEXT) infcodes.$(OBJEXT) inffast.$(OBJEXT) \ - inflate.$(OBJEXT) inftrees.$(OBJEXT) infutil.$(OBJEXT) \ - trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \ ++ WeaponVelocity.$(OBJEXT) \ AddTarget.$(OBJEXT) Animation.$(OBJEXT) \ CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \ Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \ -@@ -1625,8 +1512,8 @@ - TankAIStore.$(OBJEXT) TankAIStrings.$(OBJEXT) \ - ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) ShipGroup.$(OBJEXT) \ - XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \ -- XMLStringBuffer.$(OBJEXT) xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) \ -- xmltok.$(OBJEXT) Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ -+ XMLStringBuffer.$(OBJEXT) \ -+ Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ +@@ -1677,7 +1563,6 @@ + TankAIStrings.$(OBJEXT) ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) \ + ShipGroup.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \ + XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \ +- xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) xmltok.$(OBJEXT) \ + Target.$(OBJEXT) TargetContainer.$(OBJEXT) \ TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \ - TargetLife.$(OBJEXT) TargetParachute.$(OBJEXT) \ - TargetRenderer.$(OBJEXT) TargetShield.$(OBJEXT) \ -@@ -2178,35 +2065,9 @@ + TargetGroupEntry.$(OBJEXT) TargetLife.$(OBJEXT) \ +@@ -2252,36 +2137,9 @@ @AMDEP_TRUE@ ./$(DEPDIR)/WindowSetup.Po ./$(DEPDIR)/XMLFile.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/XMLNode.Po ./$(DEPDIR)/XMLParser.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/XMLStringBuffer.Po \ @@ -323,6 +324,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.lex.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.tab.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_kernel.Po \ +- at AMDEP_TRUE@ ./$(DEPDIR)/collision_quadtreespace.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_space.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_std.Po \ - at AMDEP_TRUE@ ./$(DEPDIR)/collision_transform.Po \ @@ -352,20 +354,21 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -@@ -2386,7 +2247,6 @@ - Triangle.$(OBJEXT): ../common/Triangle.cpp +@@ -2468,7 +2326,6 @@ Vector.$(OBJEXT): ../common/Vector.cpp + Vector4.$(OBJEXT): ../common/Vector4.cpp VectorLib.$(OBJEXT): ../common/VectorLib.cpp -snprintf.$(OBJEXT): ../common/snprintf.c ASEModelFactory.$(OBJEXT): ../3dsparse/ASEModelFactory.cpp Bone.$(OBJEXT): ../3dsparse/Bone.cpp Face.$(OBJEXT): ../3dsparse/Face.cpp -@@ -2563,49 +2423,6 @@ - WeaponTeleport.$(OBJEXT): ../weapons/WeaponTeleport.cpp +@@ -2658,50 +2515,6 @@ WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp + WeaponTypeAction.$(OBJEXT): ../weapons/WeaponTypeAction.cpp WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp -array.$(OBJEXT): ../ode/array.cpp -collision_kernel.$(OBJEXT): ../ode/collision_kernel.cpp +-collision_quadtreespace.$(OBJEXT): ../ode/collision_quadtreespace.cpp -collision_space.$(OBJEXT): ../ode/collision_space.cpp -collision_std.$(OBJEXT): ../ode/collision_std.cpp -collision_transform.$(OBJEXT): ../ode/collision_transform.cpp @@ -410,7 +413,7 @@ AddTarget.$(OBJEXT): ../actions/AddTarget.cpp Animation.$(OBJEXT): ../actions/Animation.cpp CallbackWeapon.$(OBJEXT): ../actions/CallbackWeapon.cpp -@@ -2807,9 +2624,6 @@ +@@ -2902,9 +2715,6 @@ XMLNode.$(OBJEXT): ../XML/XMLNode.cpp XMLParser.$(OBJEXT): ../XML/XMLParser.cpp XMLStringBuffer.$(OBJEXT): ../XML/XMLStringBuffer.cpp @@ -420,7 +423,7 @@ Target.$(OBJEXT): ../target/Target.cpp TargetContainer.$(OBJEXT): ../target/TargetContainer.cpp TargetDamageCalc.$(OBJEXT): ../target/TargetDamageCalc.cpp -@@ -3476,56 +3290,9 @@ +@@ -3593,57 +3403,9 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNode.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLParser.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@ @@ -429,6 +432,7 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_kernel.Po at am__quote@ +- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_quadtreespace.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_space.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_std.Po at am__quote@ - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_transform.Po at am__quote@ @@ -477,7 +481,7 @@ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -3542,269 +3309,6 @@ +@@ -3660,269 +3422,6 @@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `cygpath -w $<` @@ -747,7 +751,7 @@ CCDEPMODE = @CCDEPMODE@ .cpp.o: -@@ -7395,306 +6897,6 @@ +@@ -7717,318 +7216,6 @@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WeaponVelocity.obj `cygpath -w ../weapons/WeaponVelocity.cpp` @@ -775,6 +779,18 @@ - at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.obj `cygpath -w ../ode/collision_kernel.cpp` - +-collision_quadtreespace.o: ../ode/collision_quadtreespace.cpp +- at AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.o' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.o `test -f '../ode/collision_quadtreespace.cpp' || echo '$(srcdir)/'`../ode/collision_quadtreespace.cpp +- +-collision_quadtreespace.obj: ../ode/collision_quadtreespace.cpp +- at AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.obj' libtool=no @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@ +- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.obj `cygpath -w ../ode/collision_quadtreespace.cpp` +- -collision_space.o: ../ode/collision_space.cpp - at AMDEP_TRUE@ source='../ode/collision_space.cpp' object='collision_space.o' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@ @@ -1055,7 +1071,7 @@ @AMDEP_TRUE@ source='../actions/AddTarget.cpp' object='AddTarget.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/AddTarget.Po' tmpdepfile='$(DEPDIR)/AddTarget.TPo' @AMDEPBACKSLASH@ --- scorched/src/engine/ModFileEntry.cpp.syslibs 2006-04-13 00:49:26.000000000 +0200 -+++ scorched/src/engine/ModFileEntry.cpp 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/engine/ModFileEntry.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -21,7 +21,7 @@ #include #include @@ -1066,7 +1082,7 @@ #include --- scorched/src/tank/TankAvatar.cpp.syslibs 2006-02-13 18:54:27.000000000 +0100 -+++ scorched/src/tank/TankAvatar.cpp 2006-07-16 11:36:19.000000000 +0200 ++++ scorched/src/tank/TankAvatar.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -22,7 +22,7 @@ #include #include @@ -1076,8 +1092,8 @@ #include GLTexture *TankAvatar::defaultTexture_ = 0; ---- scorched/src/landscape/HeightMapSender.cpp~ 2006-07-16 11:55:01.000000000 +0200 -+++ scorched/src/landscape/HeightMapSender.cpp 2006-07-16 11:55:01.000000000 +0200 +--- scorched/src/landscape/HeightMapSender.cpp.syslibs 2005-11-25 11:35:42.000000000 +0100 ++++ scorched/src/landscape/HeightMapSender.cpp 2006-10-31 20:11:27.000000000 +0100 @@ -20,7 +20,7 @@ #include scorched3d-wx26.patch: Index: scorched3d-wx26.patch =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-wx26.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scorched3d-wx26.patch 16 Jul 2006 20:05:42 -0000 1.1 +++ scorched3d-wx26.patch 3 Nov 2006 11:23:38 -0000 1.2 @@ -1,28 +1,3 @@ ---- scorched/src/scorched/NetLan.cpp~ 2006-07-16 12:50:44.000000000 +0200 -+++ scorched/src/scorched/NetLan.cpp 2006-07-16 12:50:44.000000000 +0200 -@@ -96,9 +96,9 @@ - // Radio Buttons - wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5); - IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, -- "Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP); -+ wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, -- "LAN", wxDefaultPosition, wxDefaultSize, 0); -+ wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0); - radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10); - radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0); - sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5); ---- scorched/src/scorched/OptionEntrySetter.cpp~ 2006-07-16 13:04:56.000000000 +0200 -+++ scorched/src/scorched/OptionEntrySetter.cpp 2006-07-16 13:04:56.000000000 +0200 -@@ -122,7 +122,7 @@ - { - sizer->Add(control = - new wxCheckBox(parent, -1, -- "", -+ wxT(""), - wxDefaultPosition, wxDefaultSize), - 0, wxALIGN_LEFT); - control->SetToolTip( --- scorched/src/scorched/NetLan.cpp~ 2006-07-16 20:36:19.000000000 +0200 +++ scorched/src/scorched/NetLan.cpp 2006-07-16 20:36:19.000000000 +0200 @@ -71,17 +71,11 @@ Index: scorched3d.spec =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- scorched3d.spec 17 Jul 2006 07:21:26 -0000 1.16 +++ scorched3d.spec 3 Nov 2006 11:23:38 -0000 1.17 @@ -1,27 +1,20 @@ Name: scorched3d -Version: 40 -Release: 1%{?dist} +Version: 40.1c +Release: 2%{?dist} Summary: Game based loosely on the classic DOS game Scorched Earth Group: Amusements/Games License: GPL URL: http://www.scorched3d.co.uk/ -Source0: http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz +Source0: http://dl.sf.net/%{name}/Scorched3D-%{version}-src.tar.gz Source1: %{name}.desktop Patch1: %{name}-syslibs.patch Patch2: %{name}-wx26.patch -Patch4: %{name}-64bit.patch -Patch5: %{name}-openal.patch -Patch6: %{name}-help.patch +Patch3: %{name}-openal.patch +Patch4: %{name}-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel -BuildRequires: openal-devel -BuildRequires: freealut-devel -BuildRequires: SDL_net-devel -BuildRequires: ImageMagick -BuildRequires: libGLU-devel -BuildRequires: desktop-file-utils -BuildRequires: expat-devel -BuildRequires: ode-devel +BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel +BuildRequires: expat-devel libvorbis-devel ImageMagick desktop-file-utils +Requires: hicolor-icon-theme # Upstream naming compatibility Provides: Scorched3D = %{version}-%{release} @@ -42,13 +35,12 @@ %prep %setup -q -n scorched -rm -r autom4te.cache `find . -name Makefile` +rm -r `find . -name Makefile` rm -r src/zlib src/ode `find src/XML ! -name "X*"` -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch1 -p1 -z .syslibs +%patch2 -p1 -z .wx26 +%patch3 -p1 -z .openal +%patch4 -p1 -z .help # make rpmlint happy with debuginfo package chmod -x src/GLEXT/* # stop autoxxx from running @@ -58,29 +50,27 @@ %build -%configure \ - --disable-dependency-tracking \ - --datadir=%{_datadir}/games/%{name} \ - --with-docdir=$RPM_DOC_DIR/%{name}-%{version} +%configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \ + --with-docdir=%{_docdir}/%{name}-%{version} # LDFLAGS=-lode for use of system ode make %{?_smp_mflags} LDFLAGS=-lode -convert data/windows/tank2.ico tank2.png +convert data/windows/tank2.ico %{name}.png %install rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html . -desktop-file-install \ - --vendor fedora \ +# 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 \ - --mode 644 \ - --add-category X-Fedora \ + --add-category X-Fedora \ %{SOURCE1} -install -Dpm 644 tank2.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png - -mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps +install -p -m 644 %{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps %clean @@ -88,22 +78,40 @@ %post -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : +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 -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : +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 TODO __docs/* -%{_bindir}/scorched3d -%{_datadir}/games/scorched3d/ -%{_datadir}/applications/*scorched3d.desktop -%{_datadir}/icons/hicolor/*/apps/scorched3d.png +%doc AUTHORS COPYING TODO html +%{_bindir}/%{name} +%{_datadir}/%{name} +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog +* Fri Nov 3 2006 Hans de Goede 40.1c-2 +- Add libvorbis-devel BR so that ogg/vorbis support gets build in + +* Thu Nov 2 2006 Hans de Goede 40.1c-1 +- New upstream release 40.1c +- Drop 64 bit patch (integrated upstream) +- Don't install our data files in /usr/share/games, but in /usr/share +- Some minor specfile cleanups + +* Tue Aug 29 2006 Hans de Goede 40-2 +- FE6 Rebuild + * Sun Jul 15 2006 Hans de Goede 40-1 - New upstream release 40 - Drop many upstreamed patches Index: sources =================================================================== RCS file: /cvs/extras/rpms/scorched3d/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jul 2006 20:05:42 -0000 1.4 +++ sources 3 Nov 2006 11:23:38 -0000 1.5 @@ -1 +1 @@ -76b60b9f73d2c971d86bfac761989cf4 Scorched3D-40-src.tar.gz +a45c9446af99c943a19a4c9a7602531f Scorched3D-40.1c-src.tar.gz --- scorched3d-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 12:39:36 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 3 Nov 2006 05:39:36 -0700 Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.17,1.18 Message-ID: <200611031239.kA3Cda3l010162@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/gdeskcal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145 Modified Files: gdeskcal.spec Log Message: Added gettext BR gdeskcal.spec Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gdeskcal.spec 2 Nov 2006 21:40:41 -0000 1.17 +++ gdeskcal.spec 3 Nov 2006 12:39:05 -0000 1.18 @@ -1,6 +1,6 @@ Name: gdeskcal Version: 1.0 -Release: 7%{?dist} +Release: 9%{?dist} Summary: Eye-candy calendar for your desktop Group: User Interface/Desktops License: GPL @@ -10,7 +10,7 @@ Source2: gdeskcal.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser) +BuildRequires: desktop-file-utils, pygtk2-devel, perl(XML::Parser), gettext Requires: pygtk2 >= 1.99.14 Requires: python >= 2.0.0 @@ -62,6 +62,9 @@ %{_libdir}/%{name}/ %changelog +* Fri Nov 03 2006 Paul F. Johnson 1.0-9 +- added gettext + * Thu Nov 02 2006 Paul F. Johnson 1.0-7 - added perl(xml::parser) From fedora-extras-commits at redhat.com Fri Nov 3 12:59:16 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 3 Nov 2006 05:59:16 -0700 Subject: rpms/jd/devel .cvsignore, 1.11, 1.12 jd.spec, 1.18, 1.19 sources, 1.11, 1.12 Message-ID: <200611031259.kA3CxGpf010308@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10288 Modified Files: .cvsignore jd.spec sources Log Message: * Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 - 1.8.0 beta 061103 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 2 Nov 2006 14:49:20 -0000 1.11 +++ .cvsignore 3 Nov 2006 12:58:46 -0000 1.12 @@ -1 +1 @@ -jd-1.8.0-cvs061102.tgz +jd-1.8.0-beta061103.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- jd.spec 2 Nov 2006 14:49:20 -0000 1.18 +++ jd.spec 3 Nov 2006 12:58:46 -0000 1.19 @@ -10,13 +10,13 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag cvs061102 -%define repoid 22352 +%define strtag beta061103 +%define repoid 22566 # Defined by vendor # -%define vendor_rel 4 +%define vendor_rel 5 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -43,8 +43,8 @@ Group: Applications/Internet License: GPL URL: http://jd4linux.sourceforge.jp/ -#Source0: http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz -Source0: %{name}-%{main_ver}-%{strtag}.tgz +Source0: http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz +#Source0: %{name}-%{main_ver}-%{strtag}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{gtkmmdevel} @@ -103,8 +103,8 @@ %{icondir}/%{name}.png %changelog -* Wed Nov 1 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061102 -- cvs 061102 (23:30 JST) +* Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 +- 1.8.0 beta 061103 * Sat Oct 28 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061028 - Detect libSM and libICE for x86_64. Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 2 Nov 2006 14:49:20 -0000 1.11 +++ sources 3 Nov 2006 12:58:46 -0000 1.12 @@ -1 +1 @@ -10acd84c05665bb70cbad02975c5dfc2 jd-1.8.0-cvs061102.tgz +fb89210bb7fa49b0fcdf3a28c1e22711 jd-1.8.0-beta061103.tgz From fedora-extras-commits at redhat.com Fri Nov 3 13:01:22 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 3 Nov 2006 06:01:22 -0700 Subject: rpms/jd/FC-6 .cvsignore, 1.7, 1.8 jd.spec, 1.8, 1.9 sources, 1.7, 1.8 jd-1.8.0-cvs061028-support-x86_64.patch, 1.1, NONE Message-ID: <200611031301.kA3D1MSc013269@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10344 Modified Files: .cvsignore jd.spec sources Removed Files: jd-1.8.0-cvs061028-support-x86_64.patch Log Message: * Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 - 1.8.0 beta 061103 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Oct 2006 05:32:41 -0000 1.7 +++ .cvsignore 3 Nov 2006 13:00:49 -0000 1.8 @@ -1 +1 @@ -jd-1.8.0-beta061023.tgz +jd-1.8.0-beta061103.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jd.spec 28 Oct 2006 17:37:39 -0000 1.8 +++ jd.spec 3 Nov 2006 13:00:49 -0000 1.9 @@ -10,17 +10,16 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag beta061023 -%define repoid 22352 +%define strtag beta061103 +%define repoid 22566 # Defined by vendor # -%define vendor_rel 3 +%define vendor_rel 5 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora -%define category X-Fedora %define gtkmmdevel gtkmm24-devel %define icondir %{_datadir}/icons/hicolor/96x96/apps/ @@ -46,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.0-cvs061028-support-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{gtkmmdevel} @@ -62,7 +60,6 @@ %prep %setup -q -n %{name}-%{main_ver}-%{strtag} -%patch0 -p1 -b .x86_64 find . -name CVS | sort -r | xargs %{__rm} -rf %build @@ -80,10 +77,11 @@ %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir} +# desktop-file-tools 0.10->0.11 change +# 0.11 no longer accepts Application, X-Fedora, X-Red-Hat-Base desktop-file-install \ --vendor %{vendorname} \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category %{category} \ %{name}.desktop %clean @@ -105,8 +103,16 @@ %{icondir}/%{name}.png %changelog -* Sat Oct 28 2006 Mamoru Tasaka - 1.8.0-0.3.beta061023 +* Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 +- 1.8.0 beta 061103 + +* Sat Oct 28 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061028 - Detect libSM and libICE for x86_64. +- cvs 061028 (23:59 JST) + +* Wed Oct 25 2006 Mamoru Tasaka - 1.8.0-0.3.beta061023 +- Remove some category from desktop files due to + desktop-file-utils change. * Tue Oct 24 2006 Mamoru Tasaka - 1.8.0-0.2.beta061023 - 1.8.0 beta 061023 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Oct 2006 05:32:41 -0000 1.7 +++ sources 3 Nov 2006 13:00:49 -0000 1.8 @@ -1 +1 @@ -31f5bf79fecf9d06f0bffd99b494c512 jd-1.8.0-beta061023.tgz +fb89210bb7fa49b0fcdf3a28c1e22711 jd-1.8.0-beta061103.tgz --- jd-1.8.0-cvs061028-support-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 13:03:35 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Fri, 3 Nov 2006 06:03:35 -0700 Subject: rpms/jd/FC-5 .cvsignore, 1.6, 1.7 jd.spec, 1.7, 1.8 sources, 1.6, 1.7 jd-1.8.0-cvs061028-support-x86_64.patch, 1.1, NONE Message-ID: <200611031303.kA3D3ZhJ013385@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13365 Modified Files: .cvsignore jd.spec sources Removed Files: jd-1.8.0-cvs061028-support-x86_64.patch Log Message: * Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 - 1.8.0 beta 061103 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Oct 2006 05:34:08 -0000 1.6 +++ .cvsignore 3 Nov 2006 13:03:03 -0000 1.7 @@ -1 +1 @@ -jd-1.8.0-beta061023.tgz +jd-1.8.0-beta061103.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jd.spec 28 Oct 2006 17:39:17 -0000 1.7 +++ jd.spec 3 Nov 2006 13:03:03 -0000 1.8 @@ -10,17 +10,16 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag beta061023 -%define repoid 22352 +%define strtag beta061103 +%define repoid 22566 # Defined by vendor # -%define vendor_rel 3 +%define vendor_rel 5 # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora -%define category X-Fedora %define gtkmmdevel gtkmm24-devel %define icondir %{_datadir}/icons/hicolor/96x96/apps/ @@ -46,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.0-cvs061028-support-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{gtkmmdevel} @@ -62,7 +60,6 @@ %prep %setup -q -n %{name}-%{main_ver}-%{strtag} -%patch0 -p1 -b .x86_64 find . -name CVS | sort -r | xargs %{__rm} -rf %build @@ -80,10 +77,11 @@ %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir} +# desktop-file-tools 0.10->0.11 change +# 0.11 no longer accepts Application, X-Fedora, X-Red-Hat-Base desktop-file-install \ --vendor %{vendorname} \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category %{category} \ %{name}.desktop %clean @@ -105,8 +103,16 @@ %{icondir}/%{name}.png %changelog -* Sat Oct 28 2006 Mamoru Tasaka - 1.8.0-0.3.beta061023 +* Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 +- 1.8.0 beta 061103 + +* Sat Oct 28 2006 Mamoru Tasaka - 1.8.0-0.4.cvs061028 - Detect libSM and libICE for x86_64. +- cvs 061028 (23:59 JST) + +* Wed Oct 25 2006 Mamoru Tasaka - 1.8.0-0.3.beta061023 +- Remove some category from desktop files due to + desktop-file-utils change. * Tue Oct 24 2006 Mamoru Tasaka - 1.8.0-0.2.beta061023 - 1.8.0 beta 061023 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Oct 2006 05:34:08 -0000 1.6 +++ sources 3 Nov 2006 13:03:03 -0000 1.7 @@ -1 +1 @@ -31f5bf79fecf9d06f0bffd99b494c512 jd-1.8.0-beta061023.tgz +fb89210bb7fa49b0fcdf3a28c1e22711 jd-1.8.0-beta061103.tgz --- jd-1.8.0-cvs061028-support-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 13:24:25 2006 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 3 Nov 2006 06:24:25 -0700 Subject: rpms/fwfstab - New directory Message-ID: <200611031324.kA3DOPK8013696@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwfstab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692/fwfstab Log Message: Directory /cvs/extras/rpms/fwfstab added to the repository From fedora-extras-commits at redhat.com Fri Nov 3 13:24:31 2006 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 3 Nov 2006 06:24:31 -0700 Subject: rpms/fwfstab/devel - New directory Message-ID: <200611031324.kA3DOVCW013710@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwfstab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692/fwfstab/devel Log Message: Directory /cvs/extras/rpms/fwfstab/devel added to the repository From fedora-extras-commits at redhat.com Fri Nov 3 13:24:45 2006 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 3 Nov 2006 06:24:45 -0700 Subject: rpms/fwfstab Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611031324.kA3DOjqo013743@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwfstab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13737 Added Files: Makefile import.log Log Message: Setup of module fwfstab --- NEW FILE Makefile --- # Top level Makefile for module fwfstab 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 Fri Nov 3 13:24:51 2006 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 3 Nov 2006 06:24:51 -0700 Subject: rpms/fwfstab/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611031324.kA3DOpUN013762@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwfstab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13737/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fwfstab --- 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 Fri Nov 3 13:25:42 2006 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 3 Nov 2006 06:25:42 -0700 Subject: rpms/fwfstab import.log,1.1,1.2 Message-ID: <200611031325.kA3DPgwU013851@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwfstab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13808 Modified Files: import.log Log Message: auto-import fwfstab-0.01.1-1 on branch devel from fwfstab-0.01.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fwfstab/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Nov 2006 13:24:45 -0000 1.1 +++ import.log 3 Nov 2006 13:25:12 -0000 1.2 @@ -0,0 +1 @@ +fwfstab-0_01_1-1:HEAD:fwfstab-0.01.1-1.src.rpm:1162560251 From fedora-extras-commits at redhat.com Fri Nov 3 13:25:42 2006 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 3 Nov 2006 06:25:42 -0700 Subject: rpms/fwfstab/devel fwfstab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611031325.kA3DPgSN013855@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/rpms/fwfstab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13808/devel Modified Files: .cvsignore sources Added Files: fwfstab.spec Log Message: auto-import fwfstab-0.01.1-1 on branch devel from fwfstab-0.01.1-1.src.rpm --- NEW FILE fwfstab.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?fedoraver: %define fedoraver %(test -e /etc/fedora-release && rpm -q fedora-release --qf "%{VERSION}")} Name: fwfstab Version: 0.01.1 Release: 1%{?dist} BuildArch: noarch Summary: A graphical file system table editor Group: Applications/System License: GPL URL: http://www.diffingo.com/content/view/32/45/lang,en/ Source0: http://www.diffingo.com/downloads/fwfstab/fwfstab-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils Requires: pygtk2 pygtk2-libglade redhat-artwork usermode %description fwfstab is a graphical file system table (fstab) editor, used to edit the /etc/fstab file. It lets users add, edit or remove new entries in a simple, straight-forward way. It is meant to make the task of editing the file system table easier without sacrificing flexibility. %prep %setup -q %build %install rm -rf $RPM_BUILD_ROOT install -d -p -m755 ${RPM_BUILD_ROOT}%{_bindir} install -D -p -m644 etc/pam.d/fwfstab ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwfstab install -D -p -m644 etc/security/console.apps/fwfstab ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwfstab install -D -p -m755 usr/share/fwfstab/fwfstab-runapp.py ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/fwfstab-runapp.py install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/__init__.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/__init__.py install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/BaseClasses.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/BaseClasses.py install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/Callbacks.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/Callbacks.py install -D -p -m644 usr/share/fwfstab/mountoptions ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/mountoptions install -D -p -m644 usr/share/fwfstab/fwfstab.glade ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/fwfstab.glade install -D -p -m755 usr/sbin/fwfstab ${RPM_BUILD_ROOT}%{_sbindir}/fwfstab ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwfstab desktop-file-install --vendor fedora\ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications\ --add-category X-Fedora\ usr/share/applications/fwfstab.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %dir %{_datadir}/fwfstab %dir %{python_sitelib}/fwfstab %{_bindir}/fwfstab %{_sbindir}/fwfstab %{_datadir}/fwfstab/* %{_datadir}/applications/fedora-*.desktop %{python_sitelib}/fwfstab/* %config(noreplace) %{_sysconfdir}/security/console.apps/fwfstab %config(noreplace) %{_sysconfdir}/pam.d/fwfstab %doc README COPYING CHANGELOG %changelog * Thu Nov 2 2006 Stewart Adam 0.01.1-1 - Update to 0.01.1 * Wed Nov 1 2006 Stewart Adam 0.01-3 - Bug fixes... Mount point comes before filesystem in /etc/fstab! * Mon Oct 29 2006 Stewart Adam 0.01-2 - Fix error with comments in fstab - Don't quit when there's an error parsing the fstab * Sat Oct 28 2006 Stewart Adam 0.01-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwfstab/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Nov 2006 13:24:50 -0000 1.1 +++ .cvsignore 3 Nov 2006 13:25:12 -0000 1.2 @@ -0,0 +1 @@ +fwfstab-0.01.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwfstab/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Nov 2006 13:24:50 -0000 1.1 +++ sources 3 Nov 2006 13:25:12 -0000 1.2 @@ -0,0 +1 @@ +fb87e760037a9497b1e8f47c8715e65d fwfstab-0.01.1.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 13:32:34 2006 From: fedora-extras-commits at redhat.com (Stewart Adam (firewing)) Date: Fri, 3 Nov 2006 06:32:34 -0700 Subject: owners owners.list,1.1886,1.1887 Message-ID: <200611031332.kA3DWYtN013933@cvs-int.fedora.redhat.com> Author: firewing Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13912 Modified Files: owners.list Log Message: Added 'fwfstab' Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1886 retrieving revision 1.1887 diff -u -r1.1886 -r1.1887 --- owners.list 3 Nov 2006 04:25:45 -0000 1.1886 +++ owners.list 3 Nov 2006 13:32:04 -0000 1.1887 @@ -439,6 +439,7 @@ Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org| Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| +Fedora Extras|fwfstab|A graphical file system table editor|s.adam at diffingo.com|extras-qa at fedoraproject.org| Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|fyre|A tool for creating artwork from chaotic functions|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net From fedora-extras-commits at redhat.com Fri Nov 3 13:43:34 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Fri, 3 Nov 2006 06:43:34 -0700 Subject: rpms/php-pecl-zip/FC-6 .cvsignore, 1.7, 1.8 php-pecl-zip.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200611031343.kA3DhYJr014029@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-zip/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14009 Modified Files: .cvsignore php-pecl-zip.spec sources Log Message: update to 1.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Oct 2006 05:25:50 -0000 1.7 +++ .cvsignore 3 Nov 2006 13:43:04 -0000 1.8 @@ -1 +1 @@ -zip-1.7.5.tgz +zip-1.8.0.tgz Index: php-pecl-zip.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/php-pecl-zip.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php-pecl-zip.spec 25 Oct 2006 05:25:50 -0000 1.7 +++ php-pecl-zip.spec 3 Nov 2006 13:43:04 -0000 1.8 @@ -6,7 +6,7 @@ Summary: A zip management extension Summary(fr): Une extension de gestion des ZIP Name: php-pecl-zip -Version: 1.7.5 +Version: 1.8.0 Release: 1%{?dist} License: PHP License Group: Development/Languages @@ -61,6 +61,9 @@ %{php_extdir}/zip.so %changelog +* Thu Nov 02 2006 Remi Collet 1.8.0-1 +- update to 1.8.0 + * Tue Oct 24 2006 Remi Collet 1.7.5-1 - update to 1.7.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Oct 2006 05:25:50 -0000 1.7 +++ sources 3 Nov 2006 13:43:04 -0000 1.8 @@ -1 +1 @@ -e5aaeaac4e0724f95aef1e4a5f2ef8b6 zip-1.7.5.tgz +21ba5f9055074a5dbf9cb55922b7262e zip-1.8.0.tgz From fedora-extras-commits at redhat.com Fri Nov 3 13:45:21 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Fri, 3 Nov 2006 06:45:21 -0700 Subject: rpms/php-pecl-zip/FC-5 .cvsignore, 1.7, 1.8 php-pecl-zip.spec, 1.6, 1.7 sources, 1.7, 1.8 Message-ID: <200611031345.kA3DjLtT014109@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pecl-zip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14087 Modified Files: .cvsignore php-pecl-zip.spec sources Log Message: update to 1.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Oct 2006 05:27:29 -0000 1.7 +++ .cvsignore 3 Nov 2006 13:44:51 -0000 1.8 @@ -1 +1 @@ -zip-1.7.5.tgz +zip-1.8.0.tgz Index: php-pecl-zip.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/php-pecl-zip.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- php-pecl-zip.spec 25 Oct 2006 05:27:29 -0000 1.6 +++ php-pecl-zip.spec 3 Nov 2006 13:44:51 -0000 1.7 @@ -6,7 +6,7 @@ Summary: A zip management extension Summary(fr): Une extension de gestion des ZIP Name: php-pecl-zip -Version: 1.7.5 +Version: 1.8.0 Release: 1%{?dist} License: PHP License Group: Development/Languages @@ -61,6 +61,9 @@ %{php_extdir}/zip.so %changelog +* Thu Nov 02 2006 Remi Collet 1.8.0-1 +- update to 1.8.0 + * Tue Oct 24 2006 Remi Collet 1.7.5-1 - update to 1.7.5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Oct 2006 05:27:29 -0000 1.7 +++ sources 3 Nov 2006 13:44:51 -0000 1.8 @@ -1 +1 @@ -e5aaeaac4e0724f95aef1e4a5f2ef8b6 zip-1.7.5.tgz +21ba5f9055074a5dbf9cb55922b7262e zip-1.8.0.tgz From fedora-extras-commits at redhat.com Fri Nov 3 15:34:07 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 08:34:07 -0700 Subject: rpms/alex4 - New directory Message-ID: <200611031534.kA3FY7Zb022204@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/alex4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22200/alex4 Log Message: Directory /cvs/extras/rpms/alex4 added to the repository From fedora-extras-commits at redhat.com Fri Nov 3 15:34:14 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 08:34:14 -0700 Subject: rpms/alex4/devel - New directory Message-ID: <200611031534.kA3FYEhE022220@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/alex4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22200/alex4/devel Log Message: Directory /cvs/extras/rpms/alex4/devel added to the repository From fedora-extras-commits at redhat.com Fri Nov 3 15:34:31 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 08:34:31 -0700 Subject: rpms/alex4 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611031534.kA3FYVld022249@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/alex4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22243 Added Files: Makefile import.log Log Message: Setup of module alex4 --- NEW FILE Makefile --- # Top level Makefile for module alex4 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 Fri Nov 3 15:34:37 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 08:34:37 -0700 Subject: rpms/alex4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611031534.kA3FYbVj022266@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/alex4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22243/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module alex4 --- 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 Fri Nov 3 15:35:53 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 08:35:53 -0700 Subject: rpms/alex4 import.log,1.1,1.2 Message-ID: <200611031535.kA3FZrsK022360@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/alex4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22323 Modified Files: import.log Log Message: auto-import alex4-1.0-2 on branch devel from alex4-1.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/alex4/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Nov 2006 15:34:30 -0000 1.1 +++ import.log 3 Nov 2006 15:35:23 -0000 1.2 @@ -0,0 +1 @@ +alex4-1_0-2:HEAD:alex4-1.0-2.src.rpm:1162568181 From fedora-extras-commits at redhat.com Fri Nov 3 15:35:54 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 08:35:54 -0700 Subject: rpms/alex4/devel alex4-unix.patch, NONE, 1.1 alex4.desktop, NONE, 1.1 alex4.png, NONE, 1.1 alex4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611031535.kA3FZsTA022364@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/alex4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22323/devel Modified Files: .cvsignore sources Added Files: alex4-unix.patch alex4.desktop alex4.png alex4.spec Log Message: auto-import alex4-1.0-2 on branch devel from alex4-1.0-2.src.rpm alex4-unix.patch: --- NEW FILE alex4-unix.patch --- --- alex4src/src/main.c.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/main.c 2006-11-03 13:26:37.000000000 +0100 @@ -38,6 +38,7 @@ #include "main.h" #include "edit.h" #include "shooter.h" +#include "unix.h" #include "../data/data.h" @@ -66,7 +67,6 @@ Tscroller hscroll; Thisc *hisc_table; Thisc *hisc_table_space; -char working_directory[1024]; // the map Tmap *map = NULL; @@ -126,6 +126,7 @@ int playing_original_game = 1; int init_ok = 0; +static FILE* log_fp = NULL; // // // // // // // // // // // // // // // // // // // // // @@ -154,20 +155,18 @@ // loggs the text to the text file void log2file(char *format, ...) { va_list ptr; /* get an arg pointer */ - FILE *fp; - fp = fopen("log.txt", "at"); - if (fp) { + if (log_fp) { /* initialize ptr to point to the first argument after the format string */ va_start(ptr, format); /* Write to logfile. */ - vfprintf(fp, format, ptr); // Write passed text. - fprintf(fp, "\n"); // New line.. + vfprintf(log_fp, format, ptr); // Write passed text. + fprintf(log_fp, "\n"); // New line.. va_end(ptr); - fclose(fp); + fflush(log_fp); } } @@ -618,6 +617,10 @@ BITMAP *bmp; int i; int w, h; +#ifdef __unix__ + char filename[512]; + char *homedir = get_homedir(); +#endif log2file("\nInit routines:"); @@ -625,7 +628,13 @@ log2file(" initializing allegro"); text_mode(-1); garble_string(init_string, 53); +#ifdef __unix__ + snprintf(filename, sizeof(filename), "%s/.alex4/alex4.ini", + homedir? homedir:"."); + override_config_file(filename); +#else set_config_file("alex4.ini"); +#endif set_window_close_button(FALSE); // install timers @@ -663,7 +672,7 @@ // init gfx - if (get_config_int("graphics", "fullscreen", 0)) { + if (get_config_int("graphics", "fullscreen", 1)) { w = get_config_int("graphics", "f_width", 640); h = get_config_int("graphics", "f_height", 480); } @@ -672,10 +681,10 @@ h = get_config_int("graphics", "w_height", 480); } - log2file(" entering gfx mode set in alex4.ini (%dx%d %s)", w, h, (get_config_int("graphics", "fullscreen", 0) ? "full" : "win")); + log2file(" entering gfx mode set in alex4.ini (%dx%d %s)", w, h, (get_config_int("graphics", "fullscreen", 1) ? "full" : "win")); if (set_gfx_mode( - (get_config_int("graphics", "fullscreen", 0) ? GFX_AUTODETECT_FULLSCREEN : GFX_AUTODETECT_WINDOWED), + (get_config_int("graphics", "fullscreen", 1) ? GFX_AUTODETECT_FULLSCREEN : GFX_AUTODETECT_WINDOWED), w, h, 0, 0)) { log2file(" *** failed"); log2file(" entering gfx mode (640x480 windowed)"); @@ -695,6 +704,7 @@ textout_centre(swap_screen, font, "loading...", 320, 200, 1); blit_to_screen(swap_screen); +#ifndef __unix__ // set switch modes and callbacks if (set_display_switch_mode(SWITCH_PAUSE) < 0) log2file(" * display switch mode failed"); @@ -702,6 +712,7 @@ log2file(" * display switch in failed"); if (set_display_switch_callback(SWITCH_OUT, display_switch_out) < 0) log2file(" * display switch out failed"); +#endif // set win title (no! really???) @@ -718,7 +729,7 @@ // load data log2file(" loading data"); packfile_password(init_string); - data = load_datafile("data/data.dat"); + data = load_datafile(DATADIR "data.dat"); packfile_password(NULL); if (data == NULL) { log2file(" *** failed"); @@ -728,7 +739,13 @@ // load options log2file(" loading options"); +#ifdef __unix__ + snprintf(filename, sizeof(filename), "%s/.alex4/alex4.sav", + homedir? homedir:"."); + pf = pack_fopen(filename, "rp"); +#else pf = pack_fopen("alex4.sav", "rp"); +#endif if (pf) { load_options(&options, pf); pack_fclose(pf); @@ -740,7 +757,13 @@ // loading highscores log2file(" loading hiscores"); +#ifdef __unix__ + snprintf(filename, sizeof(filename), "%s/.alex4/alex4.hi", + homedir? homedir:"."); + pf = pack_fopen(filename, "rp"); +#else pf = pack_fopen("alex4.hi", "rp"); +#endif if (pf) { load_hisc_table(hisc_table, pf); load_hisc_table(hisc_table_space, pf); @@ -776,7 +799,7 @@ log2file(" loading original maps"); packfile_password(init_string); num_levels = -1; // skip end object when counting - maps = load_datafile_callback("data/maps.dat", count_maps_callback); + maps = load_datafile_callback(DATADIR "maps.dat", count_maps_callback); packfile_password(NULL); if (maps == NULL) { log2file(" *** failed"); @@ -835,11 +858,12 @@ // install sound log2file(" installing sound"); set_volume_per_voice(0); - switch(get_config_int("sound", "sound_device", 0)) { + switch(get_config_int("sound", "sound_device", 1)) { case 1: i = DIGI_AUTODETECT; log2file(" DIGI_AUTODETECT selected (%d)", i); break; +#ifdef ALLEGRO_WINDOWS case 2: i = DIGI_DIRECTX(0); log2file(" DIGI_DIRECTX(0) selected (%d)", i); @@ -848,6 +872,20 @@ i = DIGI_DIRECTAMX(0); log2file(" DIGI_DIRECTAMX(0) selected (%d)", i); break; +#elif defined ALLEGRO_UNIX +#ifdef DIGI_OSS + case 2: + i = DIGI_OSS; + log2file(" DIGI_OSS selected (%d)", i); + break; +#endif +#ifdef DIGI_ALSA + case 3: + i = DIGI_ALSA; + log2file(" DIGI_ALSA selected (%d)", i); + break; +#endif +#endif default: i = -770405; // dummy number got_sound = 0; @@ -870,9 +908,9 @@ if (get_config_int("sound", "use_sound_datafile", 1)) { log2file(" loading sound datafile"); packfile_password(init_string); - sfx_data = load_datafile("data/sfx_44.dat"); + sfx_data = load_datafile(DATADIR "sfx_44.dat"); if (sfx_data == NULL) { - sfx_data = load_datafile("data/sfx_22.dat"); + sfx_data = load_datafile(DATADIR "sfx_22.dat"); log2file(" sfx_44.dat not found"); s = 0; } @@ -971,6 +1009,10 @@ void uninit_game() { int i; PACKFILE *pf; +#ifdef __unix__ + char filename[512]; + char *homedir = get_homedir(); +#endif log2file("\nExit routines:"); @@ -989,14 +1031,26 @@ // only save if everything was inited ok! if (init_ok) { log2file(" saving options"); +#ifdef __unix__ + snprintf(filename, sizeof(filename), "%s/.alex4/alex4.sav", + homedir? homedir:"."); + pf = pack_fopen(filename, "wp"); +#else pf = pack_fopen("alex4.sav", "wp"); +#endif if (pf) { save_options(&options, pf); pack_fclose(pf); } log2file(" saving highscores"); +#ifdef __unix__ + snprintf(filename, sizeof(filename), "%s/.alex4/alex4.hi", + homedir? homedir:"."); + pf = pack_fopen(filename, "wp"); +#else pf = pack_fopen("alex4.hi", "wp"); +#endif if (pf) { save_hisc_table(hisc_table, pf); save_hisc_table(hisc_table_space, pf); @@ -1289,7 +1343,7 @@ // poll music machine if (got_sound) al_poll_duh(dp); - if (mode == 1 && (keypressed() || is_fire(&ctrl) || is_jump(&ctrl) ) || my_counter > 200) { + if (((mode == 1) && (keypressed() || is_fire(&ctrl) || is_jump(&ctrl))) || (my_counter > 200)) { mode = 2; } @@ -1343,7 +1397,7 @@ if (space) { // get space bg packfile_password(init_string); - df = load_datafile_object("data/a45.dat", "BG1"); + df = load_datafile_object(DATADIR "a45.dat", "BG1"); packfile_password(NULL); if (df != NULL) { bg = df->dat; @@ -2149,7 +2203,7 @@ // calculates camera pos for map m considering player p void calculate_camera_pos(Tplayer *p, Tmap *m) { - static camera_type = 1; + static int camera_type = 1; if (p->actor->status == AC_BALL) { camera_type = 2; @@ -2841,6 +2895,10 @@ } else { PACKFILE *pf; +#ifdef __unix__ + char filename[512]; + char *homedir = get_homedir(); +#endif log2file(" level complete"); if (got_sound) stop_music(); if (level < MAX_LEVELS && playing_original_game) { @@ -2875,7 +2933,14 @@ // save options log2file(" saving options"); +#ifdef __unix__ + snprintf(filename, sizeof(filename), + "%s/.alex4/alex4.sav", + homedir? homedir:"."); + pf = pack_fopen(filename, "wp"); +#else pf = pack_fopen("alex4.sav", "wp"); +#endif if (pf) { save_options(&options, pf); pack_fclose(pf); @@ -2969,24 +3034,36 @@ // main int main(int argc, char **argv) { - FILE *fp; int i; char full_path[1024]; +#ifndef __unix__ + char working_directory[1024]; +#else + char *homedir = get_homedir(); +#endif // init allegro allegro_init(); +#ifdef __unix__ + // start logfile + snprintf(full_path, sizeof(full_path), "%s/.alex4", + homedir? homedir:"."); + check_and_create_dir(full_path); + snprintf(full_path, sizeof(full_path), "%s/.alex4/log.txt", + homedir? homedir:"."); + log_fp = fopen(full_path, "wt"); +#else // get working directory get_executable_name(full_path, 1024); replace_filename(working_directory, full_path, "", 1024); chdir(working_directory); - // start logfile - fp = fopen("log.txt", "wt"); - if (fp) { - fprintf(fp, "Alex 4 (%s) - log file\n-------------------\n", GAME_VERSION_STR); - fclose(fp); + log_fp = fopen("log.txt", "wt"); +#endif + if (log_fp) { + fprintf(log_fp, "Alex 4 (%s) - log file\n-------------------\n", GAME_VERSION_STR); } // log program arguments @@ -2994,7 +3071,9 @@ for(i = 0; i < argc; i ++) { log2file(" %s", argv[i]); } +#ifndef __unix__ log2file("Working directory is:\n %s", working_directory); +#endif // test wether to play real game // or custom levels @@ -3022,6 +3101,8 @@ uninit_game(); allegro_exit(); log2file("\nDone...\n"); + if (log_fp) + fclose(log_fp); return 0; } END_OF_MAIN(); --- alex4src/src/player.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/player.h 2006-11-03 13:26:37.000000000 +0100 @@ -60,4 +60,4 @@ void wound_player(Tplayer *p); void kill_player(Tplayer *p); -#endif \ No newline at end of file +#endif --- alex4src/src/map.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/map.h 2006-11-03 13:26:37.000000000 +0100 @@ -111,4 +111,4 @@ -#endif \ No newline at end of file +#endif --- /dev/null 2006-11-03 08:26:09.036129000 +0100 +++ alex4src/src/unix.c 2006-11-03 13:26:37.000000000 +0100 @@ -0,0 +1,82 @@ +#ifdef __unix__ +#include +#include +#include +#include +#include +#include +#include +#if defined(__DECC) && defined(VMS) +#include +static char *vms_to_unix_buffer = NULL; +static int convert_vms_to_unix(char *vms_dir_name) +{ + vms_to_unix_buffer = vms_dir_name; +} +#endif + +char *get_homedir(void) +{ + struct passwd *pw; + + if (!(pw = getpwuid(getuid()))) + { + fprintf(stderr, "Who are you? Not found in passwd database!!\n"); + return getenv("HOME"); + } + +#if defined(__DECC) && defined(VMS) + /* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix + Format. */ + decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1); + return vms_to_unix_buffer; +#else + return pw->pw_dir; +#endif +} +//----------------------------------------------------------------------------- +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; +} +#endif --- /dev/null 2006-11-03 08:26:09.036129000 +0100 +++ alex4src/src/Makefile 2006-11-03 13:26:37.000000000 +0100 @@ -0,0 +1,24 @@ +PREFIX = /usr/local +DATADIR = $(PREFIX)/share/$(TARGET) +CFLAGS = -g -Wall -Wno-deprecated-declarations -O2 +LDFLAGS = `allegro-config --libs` -laldmb -ldumb +DEFINES = -DDATADIR=\"$(DATADIR)/\" +OBJS = actor.o edit.o map.o player.o shooter.o unix.o \ + bullet.o hisc.o options.o script.o timer.o \ + control.o main.o particle.o scroller.o token.o +TARGET = alex4 + +$(TARGET): $(OBJS) + $(CC) $(LDFLAGS) -o $@ $^ + +%.o: %.c + $(CC) $(CFLAGS) $(DEFINES) -o $@ -c $< + +install: $(TARGET) + mkdir -p $(PREFIX)/bin + mkdir -p $(DATADIR) + install -p -m 755 $(TARGET) $(PREFIX)/bin + install -p -m 644 ../data/*.dat $(DATADIR) + +clean: + rm -f $(OBJS) $(TARGET) *~ --- alex4src/src/token.h.unix 2003-07-26 12:53:54.000000000 +0200 +++ alex4src/src/token.h 2006-11-03 13:26:37.000000000 +0100 @@ -41,4 +41,4 @@ Ttoken *tokenize(char *str); -#endif \ No newline at end of file +#endif --- alex4src/src/shooter.c.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/shooter.c 2006-11-03 13:26:37.000000000 +0100 @@ -1372,7 +1372,7 @@ // load data log2file(" loading shooter data"); packfile_password(get_init_string()); - s_data = load_datafile("data/a45.dat"); + s_data = load_datafile(DATADIR "a45.dat"); if (!s_data) { log2file(" *** failed"); return -1; --- alex4src/src/particle.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/particle.h 2006-11-03 13:26:37.000000000 +0100 @@ -54,4 +54,4 @@ void update_particle_with_map(Tparticle *p, Tmap *m); void create_burst(Tparticle *ps, int x, int y, int spread, int num, int life, int bmp); -#endif \ No newline at end of file +#endif --- /dev/null 2006-11-03 08:26:09.036129000 +0100 +++ alex4src/src/unix.h 2006-11-03 13:26:37.000000000 +0100 @@ -0,0 +1,6 @@ +#ifdef __unix__ + +char *get_homedir(); +int check_and_create_dir(const char *name); + +#endif --- alex4src/src/scroller.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/scroller.h 2006-11-03 13:26:37.000000000 +0100 @@ -51,4 +51,4 @@ -#endif \ No newline at end of file +#endif --- alex4src/src/map.c.unix 2003-07-28 18:50:36.000000000 +0200 +++ alex4src/src/map.c 2006-11-03 14:17:51.000000000 +0100 @@ -24,6 +24,7 @@ #include #include #include +#include #include "allegro.h" #include "map.h" #include "timer.h" @@ -64,7 +65,41 @@ return m; } - + +static void mem_to_int(int *dest, unsigned char *mem) +{ +#if __BYTE_ORDER == __LITTLE_ENDIAN + memcpy(dest, mem, 4); +#else + *dest = mem[0] | (((int)mem[1]) << 8) | (((int)mem[2]) << 16) | + (((int)mem[3]) << 24); +#endif +} + +static void fread_int(int *dest, FILE *fp) +{ +#if __BYTE_ORDER == __LITTLE_ENDIAN + fread(dest, 4, 1, fp); +#else + unsigned char buf[4]; + fread(buf, 1, 4, fp); + mem_to_int(dest, buf); +#endif +} + +static void fwrite_int(const int *src, FILE *fp) +{ +#if __BYTE_ORDER == __LITTLE_ENDIAN + fwrite(src, 4, 1, fp); +#else + unsigned char buf[4]; + buf[0] = *src; + buf[1] = *src >> 8; + buf[2] = *src >> 16; + buf[3] = *src >> 24; + fwrite(buf, 1, 4, fp); +#endif +} // loads one splendind map from disk Tmap *load_map(char *fname) { @@ -93,7 +128,19 @@ } // read datastruct - fread(m, sizeof(Tmap), 1, fp); + // a mapfile contain a raw dump of the Tmap struct made on an i386 + // the code below reads these struct dumps in an arch neutral manner + // Note this dumps contains pointers, these are not used because these + // ofcourse point to some no longer valid address. + fread(m, 64, 1, fp); // first 64 bytes data + fread_int(&(m->width), fp); + fread_int(&(m->height), fp); + fread(header, 4, 1, fp); // skip the first pointer + fread_int(&(m->offset_x), fp); + fread_int(&(m->offset_y), fp); + fread(header, 4, 1, fp); // skip the second pointer + fread_int(&(m->start_x), fp); + fread_int(&(m->start_y), fp); // read map data m->dat = malloc(m->width * m->height * sizeof(Tmappos)); @@ -116,8 +163,8 @@ // loads one splendind map from memory Tmap *load_map_from_memory(void *mem) { Tmap *m; - char header[6]; - char *c = (char *)mem; + unsigned char header[6]; + unsigned char *c = (unsigned char *)mem; // does the header match? @@ -137,9 +184,19 @@ } // read datastruct - // fread(m, sizeof(Tmap), 1, fp); - memcpy(m, c, sizeof(Tmap)); - c += sizeof(Tmap); + // a mapfile contain a raw dump of the Tmap struct made on an i386 + // the code below reads these struct dumps in an arch neutral manner + // Note this dumps contains pointers, these are not used because these + // ofcourse point to some no longer valid address. + memcpy(m, c, 64); c += 64; // first 64 bytes data + mem_to_int(&(m->width), c); c += 4; + mem_to_int(&(m->height), c); c += 4; + c += 4; // skip the first pointer + mem_to_int(&(m->offset_x), c); c += 4; + mem_to_int(&(m->offset_y), c); c += 4; + c += 4; // skip the second pointer + mem_to_int(&(m->start_x), c); c+= 4; + mem_to_int(&(m->start_y), c); c+= 4; // read map data m->dat = malloc(m->width * m->height * sizeof(Tmappos)); @@ -174,7 +231,18 @@ fwrite(header, 6, 1, fp); // write datastruct - fwrite(m, sizeof(Tmap), 1, fp); + // a mapfile should contain a raw dump of the Tmap struct as made on an + // i386 the code below writes a struct dump as an i386 in an arch + // neutral manner + fwrite(m, 64, 1, fp); // first 64 bytes data + fwrite_int(&(m->width), fp); + fwrite_int(&(m->height), fp); + fwrite(header, 4, 1, fp); // skip the first pointer + fwrite_int(&(m->offset_x), fp); + fwrite_int(&(m->offset_y), fp); + fwrite(header, 4, 1, fp); // skip the second pointer + fwrite_int(&(m->start_x), fp); + fwrite_int(&(m->start_y), fp); // write map data fwrite(m->dat, sizeof(Tmappos), m->width * m->height, fp); @@ -409,7 +477,7 @@ } if (mask == 5 && oy > 31 - ox) return mask; // 45 degree slope / - if (mask == 6 && oy > ox) return mask; // 45 degree slope \ + if (mask == 6 && oy > ox) return mask; // 45 degree slope \ . // the not so simple ones if (mask == 3 && oy > 31 - ox / 2) return mask; // 22 degree slope / (low) --- alex4src/src/shooter.h.unix 2003-07-26 12:53:54.000000000 +0200 +++ alex4src/src/shooter.h 2006-11-03 13:26:37.000000000 +0100 @@ -83,8 +83,8 @@ int difficulty; // player related - long unsigned int score; - long unsigned int show_score; + unsigned int score; + unsigned int show_score; int lives; int power_gauge; int power_level; @@ -118,4 +118,4 @@ int start_shooter(Tcontrol *c, int with_sound); -#endif \ No newline at end of file +#endif --- alex4src/src/timer.h.unix 2003-07-26 12:53:54.000000000 +0200 +++ alex4src/src/timer.h 2006-11-03 13:26:37.000000000 +0100 @@ -37,4 +37,4 @@ void fps_counter(void); void cycle_counter(void); -#endif \ No newline at end of file +#endif --- alex4src/src/main.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/main.h 2006-11-03 13:26:37.000000000 +0100 @@ -93,5 +93,8 @@ #define check_bb_collision(x1,y1,w1,h1,x2,y2,w2,h2) (!( ((x1)>=(x2)+(w2)) || ((x2)>=(x1)+(w1)) || \ ((y1)>=(y2)+(h2)) || ((y2)>=(y1)+(h1)) )) +#ifndef DATADIR +#define DATADIR "data/" +#endif -#endif \ No newline at end of file +#endif --- alex4src/src/script.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/script.h 2006-11-03 13:26:37.000000000 +0100 @@ -51,4 +51,4 @@ -#endif \ No newline at end of file +#endif --- alex4src/src/edit.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/edit.h 2006-11-03 13:26:37.000000000 +0100 @@ -37,4 +37,4 @@ void draw_edit_mode(BITMAP *bmp, Tmap *map, int mx, int my); void update_edit_mode(Tmap *map, BITMAP *bmp, int mx, int my, int mb); -#endif \ No newline at end of file +#endif --- alex4src/src/token.c.unix 2003-07-26 18:50:40.000000000 +0200 +++ alex4src/src/token.c 2006-11-03 13:26:37.000000000 +0100 @@ -67,7 +67,7 @@ // tokenizes the string str Ttoken *tokenize(char *str) { - Ttoken *tok_list, *tok_tmp; + Ttoken *tok_list, *tok_tmp = NULL; char word[256]; int a, b, c; int i = 0; --- alex4src/src/hisc.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/hisc.h 2006-11-03 13:26:37.000000000 +0100 @@ -48,4 +48,4 @@ void draw_hisc_post(Thisc *table, BITMAP *bmp, FONT *fnt, int x, int y, int color, int show_level); void draw_hisc_table(Thisc *table, BITMAP *bmp, FONT *fnt, int x, int y, int color, int show_level); -#endif \ No newline at end of file +#endif --- alex4src/src/options.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/options.h 2006-11-03 13:26:37.000000000 +0100 @@ -43,4 +43,4 @@ void load_options(Toptions *o, PACKFILE *fp); void reset_options(Toptions *o); -#endif \ No newline at end of file +#endif --- alex4src/src/timer.c.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/timer.c 2006-11-03 13:26:37.000000000 +0100 @@ -60,4 +60,4 @@ game_count ++; return TRUE; -} \ No newline at end of file +} --- alex4src/src/actor.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/actor.h 2006-11-03 13:26:37.000000000 +0100 @@ -91,4 +91,4 @@ void kill_actor(Tactor *a); -#endif \ No newline at end of file +#endif --- alex4src/src/bullet.h.unix 2003-07-26 12:53:52.000000000 +0200 +++ alex4src/src/bullet.h 2006-11-03 13:26:37.000000000 +0100 @@ -52,4 +52,4 @@ void update_bullet(Tbullet *b); void update_bullet_with_map(Tbullet *b, Tmap *m); -#endif \ No newline at end of file +#endif --- NEW FILE alex4.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Alex the Allegator 4 Comment=Old school platform game Exec=alex4 Icon=alex4.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; --- NEW FILE alex4.spec --- Name: alex4 Version: 1.0 Release: 2%{?dist} Summary: Alex the Allegator 4 - Platform game Group: Amusements/Games License: GPL URL: http://allegator.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/allegator/alex4src_data.zip Source1: alex4.desktop Source2: alex4.png Patch0: alex4-unix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel dumb-devel desktop-file-utils ImageMagick Requires: hicolor-icon-theme %description In the latest installment of the series Alex travels through the jungle in search of his kidnapped girlfriend. Plenty of classic platforming in four nice colors guaranteed! %prep %setup -q -n alex4src %patch0 -p1 -z .unix sed -i 's/\r//' *.txt %build pushd src make %{?_smp_mflags} PREFIX=%{_prefix} \ CFLAGS="$RPM_OPT_FLAGS -Wno-deprecated-declarations" popd %install rm -rf $RPM_BUILD_ROOT pushd src 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 \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -p -m 644 %{SOURCE2} \ $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 license.txt readme.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog * Fri Nov 3 2006 Hans de Goede 1.0-2 - Updated alex4-unix.patch to take big endian machines into account when loading maps * Thu Nov 2 2006 Hans de Goede 1.0-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/alex4/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Nov 2006 15:34:36 -0000 1.1 +++ .cvsignore 3 Nov 2006 15:35:24 -0000 1.2 @@ -0,0 +1 @@ +alex4src_data.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/alex4/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Nov 2006 15:34:36 -0000 1.1 +++ sources 3 Nov 2006 15:35:24 -0000 1.2 @@ -0,0 +1 @@ +c81b8e3813300a0cfbe828bcdff60fda alex4src_data.zip From fedora-extras-commits at redhat.com Fri Nov 3 15:44:37 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 08:44:37 -0700 Subject: owners owners.list,1.1887,1.1888 Message-ID: <200611031544.kA3FibB3022511@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22493 Modified Files: owners.list Log Message: added alex4 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1887 retrieving revision 1.1888 diff -u -r1.1887 -r1.1888 --- owners.list 3 Nov 2006 13:32:04 -0000 1.1887 +++ owners.list 3 Nov 2006 15:44:04 -0000 1.1888 @@ -35,6 +35,7 @@ Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|akode|Audio-decoding framework|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|alacarte|Simple menu editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|foolish at guezz.net,jpmahowald at gmail.com +Fedora Extras|alex4|Alex the Allegator 4 - Platform game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org Fedora Extras|alleggl|OpenGL support library for Allegro|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl Fedora Extras|AllegroOGG|Ogg library for use with the Allegro game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Nov 3 16:09:46 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 09:09:46 -0700 Subject: rpms/nyquist - New directory Message-ID: <200611031609.kA3G9kuH025635@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/nyquist In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25631/nyquist Log Message: Directory /cvs/extras/rpms/nyquist added to the repository From fedora-extras-commits at redhat.com Fri Nov 3 16:09:52 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 09:09:52 -0700 Subject: rpms/nyquist/devel - New directory Message-ID: <200611031609.kA3G9qbc025649@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/nyquist/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25631/nyquist/devel Log Message: Directory /cvs/extras/rpms/nyquist/devel added to the repository From fedora-extras-commits at redhat.com Fri Nov 3 16:10:13 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 09:10:13 -0700 Subject: rpms/nyquist Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611031610.kA3GADK7025688@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/nyquist In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25682 Added Files: Makefile import.log Log Message: Setup of module nyquist --- NEW FILE Makefile --- # Top level Makefile for module nyquist 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 Fri Nov 3 16:10:18 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 09:10:18 -0700 Subject: rpms/nyquist/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611031610.kA3GAIRq025710@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/nyquist/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25682/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nyquist --- 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 Fri Nov 3 16:21:27 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 09:21:27 -0700 Subject: rpms/nyquist import.log,1.1,1.2 Message-ID: <200611031621.kA3GLRqS025879@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/nyquist In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25841 Modified Files: import.log Log Message: auto-import nyquist-2.31-3 on branch devel from nyquist-2.31-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nyquist/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Nov 2006 16:10:12 -0000 1.1 +++ import.log 3 Nov 2006 16:20:57 -0000 1.2 @@ -0,0 +1 @@ +nyquist-2_31-3:HEAD:nyquist-2.31-3.src.rpm:1162570849 From fedora-extras-commits at redhat.com Fri Nov 3 16:21:28 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 09:21:28 -0700 Subject: rpms/nyquist/devel nyqsrc231-pafix.patch, NONE, 1.1 nyquist.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611031621.kA3GLS7A025883@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/nyquist/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25841/devel Modified Files: .cvsignore sources Added Files: nyqsrc231-pafix.patch nyquist.spec Log Message: auto-import nyquist-2.31-3 on branch devel from nyquist-2.31-3.src.rpm nyqsrc231-pafix.patch: --- NEW FILE nyqsrc231-pafix.patch --- --- nyquist/portaudio/pa_linux_alsa/pa_linux_alsa.c.pafix 2006-11-02 22:17:31.000000000 +0100 +++ nyquist/portaudio/pa_linux_alsa/pa_linux_alsa.c 2006-11-02 22:18:56.000000000 +0100 @@ -2248,7 +2248,7 @@ playbackAvail = playbackAvail == 0 ? INT_MAX : playbackAvail; /* Disregard if zero */ } - assert( !(captureAvail == playbackAvail == INT_MAX) ); + assert( !(captureAvail == INT_MAX && playbackAvail == INT_MAX) ); commonAvail = MIN( captureAvail, playbackAvail ); commonAvail -= commonAvail % stream->frames_per_period; --- NEW FILE nyquist.spec --- Name: nyquist Version: 2.31 Release: 3%{?dist} Summary: Sound synthesis and composition language with a Lisp syntax Group: Applications/Multimedia License: BSD URL: http://www-2.cs.cmu.edu/~music/music.software.html Source0: http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc231.zip Patch0: nyqsrc231-pafix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: dos2unix %description Nyquist is a language for sound synthesis and music composition. Unlike score languages that tend to deal only with events, or signal processing languages that tend to deal only with signals and synthesis, Nyquist handles both in a single integrated system. Nyquist is also flexible and easy to use because it is based on an interactive Lisp interpreter. %prep %setup -q -n nyquist %patch0 -p1 # remove cvs cruft find -name CVS | xargs rm -fr # add opt flags sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile # do not build with buggy readline support sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile # build with alsa sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile sed -i "s|^ALSA_OBJECTS =|ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o|" sys/unix/linux/Makefile # change end-of-line find -name "*.htm*" \ -or -name "*.lsp" \ -or -name "*.txt" \ -or -name "*.ny" \ -or -name "*.dat" | xargs dos2unix -q %build (cd misc; make %{?_smp_mflags}) make %{?_smp_mflags} -f sys/unix/linux/Makefile %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist mkdir -p $RPM_BUILD_ROOT%{_libexecdir} cp -pr runtime $RPM_BUILD_ROOT%{_datadir}/nyquist cp -pr lib $RPM_BUILD_ROOT%{_datadir}/nyquist cp -p ny $RPM_BUILD_ROOT%{_libexecdir} cat > $RPM_BUILD_ROOT%{_bindir}/ny < - 2.31-3 - added patch for portaudio bug * Thu Feb 2 2006 Gerard Milmeister - 2.31-2 - new version 2.31 * Sat Mar 26 2005 Gerard Milmeister - 2.30-1 - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nyquist/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Nov 2006 16:10:18 -0000 1.1 +++ .cvsignore 3 Nov 2006 16:20:57 -0000 1.2 @@ -0,0 +1 @@ +nyqsrc231.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/nyquist/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Nov 2006 16:10:18 -0000 1.1 +++ sources 3 Nov 2006 16:20:57 -0000 1.2 @@ -0,0 +1 @@ +49ff7053ce76b11f61685f22fd068928 nyqsrc231.zip From fedora-extras-commits at redhat.com Fri Nov 3 16:36:23 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 09:36:23 -0700 Subject: owners owners.list,1.1888,1.1889 Message-ID: <200611031636.kA3GaNIJ026048@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26029 Modified Files: owners.list Log Message: added nyquist Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1888 retrieving revision 1.1889 diff -u -r1.1888 -r1.1889 --- owners.list 3 Nov 2006 15:44:04 -0000 1.1888 +++ owners.list 3 Nov 2006 16:35:53 -0000 1.1889 @@ -1169,6 +1169,7 @@ Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|numpy|A fast multidimensional array facility for Python|jwilson at redhat.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net Fedora Extras|nuttcp|A network performance measurement tool intended for use by network and system managers|rvokal at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|nyquist|Sound synthesis and composition language with a Lisp syntax|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|obby|A library which provides synced document buffers|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|obconf|A graphical configuration editor for the Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Nov 3 16:41:39 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 3 Nov 2006 09:41:39 -0700 Subject: rpms/lilypond/devel .cvsignore, 1.5, 1.6 lilypond.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200611031641.kA3GfdwV026129@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26109 Modified Files: .cvsignore lilypond.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Oct 2006 21:47:48 -0000 1.5 +++ .cvsignore 3 Nov 2006 16:41:08 -0000 1.6 @@ -1 +1 @@ -lilypond-2.8.7.tar.gz +lilypond-2.8.8.tar.gz Index: lilypond.spec =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lilypond.spec 9 Oct 2006 21:47:48 -0000 1.5 +++ lilypond.spec 3 Nov 2006 16:41:08 -0000 1.6 @@ -1,5 +1,5 @@ Name: lilypond -Version: 2.8.7 +Version: 2.8.8 Release: 1%{?dist} Summary: A typesetting system for music notation @@ -89,6 +89,9 @@ %changelog +* Fri Nov 3 2006 Quentin Spencer 2.8.8-1 +- New release. + * Mon Oct 9 2006 Quentin Spencer 2.8.7-1 - New release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Oct 2006 21:47:48 -0000 1.5 +++ sources 3 Nov 2006 16:41:08 -0000 1.6 @@ -1 +1 @@ -f2513f545adb211a256c21cc6b28ab3a lilypond-2.8.7.tar.gz +2fe58ff2fcbc848def46ef287a693189 lilypond-2.8.8.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 19:06:49 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 12:06:49 -0700 Subject: rpms/kmenu-gnome import.log,1.5,1.6 Message-ID: <200611031906.kA3J6nPb003808@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kmenu-gnome In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3773 Modified Files: import.log Log Message: auto-import kmenu-gnome-0.6.1-2 on branch FC-6 from kmenu-gnome-0.6.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 15 Oct 2006 15:53:14 -0000 1.5 +++ import.log 3 Nov 2006 19:06:18 -0000 1.6 @@ -2,3 +2,4 @@ kmenu-gnome-0_6-4:HEAD:kmenu-gnome-0.6-4.src.rpm:1157408049 kmenu-gnome-0_6_0_1-2:FC-5:kmenu-gnome-0.6.0.1-2.src.rpm:1160927686 kmenu-gnome-0_6_0_1-2:HEAD:kmenu-gnome-0.6.0.1-2.src.rpm:1160927814 +kmenu-gnome-0_6_1-2:FC-6:kmenu-gnome-0.6.1-2.src.rpm:1162581027 From fedora-extras-commits at redhat.com Fri Nov 3 19:06:50 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 12:06:50 -0700 Subject: rpms/kmenu-gnome/FC-6 .cvsignore, 1.3, 1.4 kmenu-gnome.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611031906.kA3J6ogr003813@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kmenu-gnome/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3773/FC-6 Modified Files: .cvsignore kmenu-gnome.spec sources Log Message: auto-import kmenu-gnome-0.6.1-2 on branch FC-6 from kmenu-gnome-0.6.1-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Oct 2006 15:53:15 -0000 1.3 +++ .cvsignore 3 Nov 2006 19:06:19 -0000 1.4 @@ -1 +1 @@ -kmenu-gnome-0.6.0.1.tar.gz +31025-kmenu-gnome-0.6.1.tar.gz Index: kmenu-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/kmenu-gnome.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kmenu-gnome.spec 15 Oct 2006 15:53:15 -0000 1.3 +++ kmenu-gnome.spec 3 Nov 2006 19:06:19 -0000 1.4 @@ -1,16 +1,15 @@ %{?!_icondir:%define _icondir %{_datadir}/icons} Name: kmenu-gnome -Version: 0.6.0.1 +Version: 0.6.1 Release: 2%{?dist} Summary: K Menu with Gnome directory License: GPL/LGPL Group: User Interface/Desktops URL: http://ariszlo.tripod.com -#Source: http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz -#Use local tarball until new release to fix #208788: -Source: %{name}-%{version}.tar.gz + +Source: http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,13 +27,13 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged mkdir -p %{buildroot}%{_icondir}/Bluecurve/{16x16,24x24,32x32,48x48}/apps -mv %{name}/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged -mv %{name}/fc5-hide-bug196275.menu \ -%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged +cp xdg/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275 +cp xdg/fc5-hide-bug196275.menu \ +%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir} -#Ignore dangling-relative-symlink warnings +#Ignore dangling-relative-symlink warnings: #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps ln -s icon-office.png ooomain.png ) @@ -44,6 +43,7 @@ ln -s icon-office.png ooomain.png ) ( cd %{buildroot}%{_icondir}/Bluecurve/48x48/apps ln -s icon-office.png ooomain.png ) +#Stock icons ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps ln -s ../../../gnome/16x16/stock/generic/stock_calendar.png . ln -s ../../../gnome/16x16/stock/net/stock_contact.png . @@ -55,8 +55,6 @@ ln -s ../../../gnome/32x32/stock/io/stock_print.png . ln -s ../../../gnome/24x24/stock/document/stock_task.png . ) ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps -ln -s ../../../gnome/48x48/apps/accessibility-directory.png . -#ln -s ../../../gnome/48x48/apps/gnome-system.png . ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png . ln -s ../../../gnome/48x48/stock/net/stock_contact.png . ln -s ../../../gnome/48x48/stock/io/stock_print.png . ) @@ -89,6 +87,13 @@ %doc ChangeLog COPYING GPL LGPL README %Changelog +* Wed Nov 01 2006 Chitlesh Goorah - 0.6.1-2 +- New upstream release for FE + +* Sat Oct 28 2006 Ariszlo - 0.6.1-1 +- Removed link to accessibility-directory.png +- release 0.6.1 + * Sun Oct 15 2006 Chitlesh Goorah - 0.6.0.1-2 - Removed duplicate gnome-system.png Index: sources =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Oct 2006 15:53:15 -0000 1.3 +++ sources 3 Nov 2006 19:06:19 -0000 1.4 @@ -1 +1 @@ -b0759e688cafd1dcfbe6c34e9e533e33 kmenu-gnome-0.6.0.1.tar.gz +27425ea61069ece88565220033bd7cbb 31025-kmenu-gnome-0.6.1.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 19:08:30 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 12:08:30 -0700 Subject: rpms/kmenu-gnome import.log,1.6,1.7 Message-ID: <200611031908.kA3J8UWY003910@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kmenu-gnome In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3875 Modified Files: import.log Log Message: auto-import kmenu-gnome-0.6.1-2 on branch FC-5 from kmenu-gnome-0.6.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 Nov 2006 19:06:18 -0000 1.6 +++ import.log 3 Nov 2006 19:07:59 -0000 1.7 @@ -3,3 +3,4 @@ kmenu-gnome-0_6_0_1-2:FC-5:kmenu-gnome-0.6.0.1-2.src.rpm:1160927686 kmenu-gnome-0_6_0_1-2:HEAD:kmenu-gnome-0.6.0.1-2.src.rpm:1160927814 kmenu-gnome-0_6_1-2:FC-6:kmenu-gnome-0.6.1-2.src.rpm:1162581027 +kmenu-gnome-0_6_1-2:FC-5:kmenu-gnome-0.6.1-2.src.rpm:1162581127 From fedora-extras-commits at redhat.com Fri Nov 3 19:08:30 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 12:08:30 -0700 Subject: rpms/kmenu-gnome/FC-5 .cvsignore, 1.3, 1.4 kmenu-gnome.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611031908.kA3J8Uu5003915@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kmenu-gnome/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3875/FC-5 Modified Files: .cvsignore kmenu-gnome.spec sources Log Message: auto-import kmenu-gnome-0.6.1-2 on branch FC-5 from kmenu-gnome-0.6.1-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Oct 2006 15:51:07 -0000 1.3 +++ .cvsignore 3 Nov 2006 19:08:00 -0000 1.4 @@ -1 +1 @@ -kmenu-gnome-0.6.0.1.tar.gz +31025-kmenu-gnome-0.6.1.tar.gz Index: kmenu-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/kmenu-gnome.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kmenu-gnome.spec 15 Oct 2006 15:51:07 -0000 1.2 +++ kmenu-gnome.spec 3 Nov 2006 19:08:00 -0000 1.3 @@ -1,16 +1,15 @@ %{?!_icondir:%define _icondir %{_datadir}/icons} Name: kmenu-gnome -Version: 0.6.0.1 +Version: 0.6.1 Release: 2%{?dist} Summary: K Menu with Gnome directory License: GPL/LGPL Group: User Interface/Desktops URL: http://ariszlo.tripod.com -#Source: http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz -#Use local tarball until new release to fix #208788: -Source: %{name}-%{version}.tar.gz + +Source: http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,13 +27,13 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged mkdir -p %{buildroot}%{_icondir}/Bluecurve/{16x16,24x24,32x32,48x48}/apps -mv %{name}/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged -mv %{name}/fc5-hide-bug196275.menu \ -%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged +cp xdg/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275 +cp xdg/fc5-hide-bug196275.menu \ +%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir} -#Ignore dangling-relative-symlink warnings +#Ignore dangling-relative-symlink warnings: #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps ln -s icon-office.png ooomain.png ) @@ -44,6 +43,7 @@ ln -s icon-office.png ooomain.png ) ( cd %{buildroot}%{_icondir}/Bluecurve/48x48/apps ln -s icon-office.png ooomain.png ) +#Stock icons ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps ln -s ../../../gnome/16x16/stock/generic/stock_calendar.png . ln -s ../../../gnome/16x16/stock/net/stock_contact.png . @@ -55,8 +55,6 @@ ln -s ../../../gnome/32x32/stock/io/stock_print.png . ln -s ../../../gnome/24x24/stock/document/stock_task.png . ) ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps -ln -s ../../../gnome/48x48/apps/accessibility-directory.png . -#ln -s ../../../gnome/48x48/apps/gnome-system.png . ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png . ln -s ../../../gnome/48x48/stock/net/stock_contact.png . ln -s ../../../gnome/48x48/stock/io/stock_print.png . ) @@ -89,6 +87,13 @@ %doc ChangeLog COPYING GPL LGPL README %Changelog +* Wed Nov 01 2006 Chitlesh Goorah - 0.6.1-2 +- New upstream release for FE + +* Sat Oct 28 2006 Ariszlo - 0.6.1-1 +- Removed link to accessibility-directory.png +- release 0.6.1 + * Sun Oct 15 2006 Chitlesh Goorah - 0.6.0.1-2 - Removed duplicate gnome-system.png Index: sources =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Oct 2006 15:51:07 -0000 1.3 +++ sources 3 Nov 2006 19:08:00 -0000 1.4 @@ -1 +1 @@ -b0759e688cafd1dcfbe6c34e9e533e33 kmenu-gnome-0.6.0.1.tar.gz +27425ea61069ece88565220033bd7cbb 31025-kmenu-gnome-0.6.1.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 19:11:33 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 12:11:33 -0700 Subject: rpms/kmenu-gnome import.log,1.7,1.8 Message-ID: <200611031911.kA3JBX8o004068@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kmenu-gnome In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4028 Modified Files: import.log Log Message: auto-import kmenu-gnome-0.6.1-2 on branch devel from kmenu-gnome-0.6.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 3 Nov 2006 19:07:59 -0000 1.7 +++ import.log 3 Nov 2006 19:11:03 -0000 1.8 @@ -4,3 +4,4 @@ kmenu-gnome-0_6_0_1-2:HEAD:kmenu-gnome-0.6.0.1-2.src.rpm:1160927814 kmenu-gnome-0_6_1-2:FC-6:kmenu-gnome-0.6.1-2.src.rpm:1162581027 kmenu-gnome-0_6_1-2:FC-5:kmenu-gnome-0.6.1-2.src.rpm:1162581127 +kmenu-gnome-0_6_1-2:HEAD:kmenu-gnome-0.6.1-2.src.rpm:1162581312 From fedora-extras-commits at redhat.com Fri Nov 3 19:11:34 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 12:11:34 -0700 Subject: rpms/kmenu-gnome/devel .cvsignore, 1.3, 1.4 kmenu-gnome.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611031911.kA3JBYaH004073@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kmenu-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4028/devel Modified Files: .cvsignore kmenu-gnome.spec sources Log Message: auto-import kmenu-gnome-0.6.1-2 on branch devel from kmenu-gnome-0.6.1-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Oct 2006 15:53:15 -0000 1.3 +++ .cvsignore 3 Nov 2006 19:11:04 -0000 1.4 @@ -1 +1 @@ -kmenu-gnome-0.6.0.1.tar.gz +31025-kmenu-gnome-0.6.1.tar.gz Index: kmenu-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kmenu-gnome.spec 15 Oct 2006 15:53:15 -0000 1.3 +++ kmenu-gnome.spec 3 Nov 2006 19:11:04 -0000 1.4 @@ -1,16 +1,15 @@ %{?!_icondir:%define _icondir %{_datadir}/icons} Name: kmenu-gnome -Version: 0.6.0.1 +Version: 0.6.1 Release: 2%{?dist} Summary: K Menu with Gnome directory License: GPL/LGPL Group: User Interface/Desktops URL: http://ariszlo.tripod.com -#Source: http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz -#Use local tarball until new release to fix #208788: -Source: %{name}-%{version}.tar.gz + +Source: http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,13 +27,13 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged mkdir -p %{buildroot}%{_icondir}/Bluecurve/{16x16,24x24,32x32,48x48}/apps -mv %{name}/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged -mv %{name}/fc5-hide-bug196275.menu \ -%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged +cp xdg/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275 +cp xdg/fc5-hide-bug196275.menu \ +%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir} -#Ignore dangling-relative-symlink warnings +#Ignore dangling-relative-symlink warnings: #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps ln -s icon-office.png ooomain.png ) @@ -44,6 +43,7 @@ ln -s icon-office.png ooomain.png ) ( cd %{buildroot}%{_icondir}/Bluecurve/48x48/apps ln -s icon-office.png ooomain.png ) +#Stock icons ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps ln -s ../../../gnome/16x16/stock/generic/stock_calendar.png . ln -s ../../../gnome/16x16/stock/net/stock_contact.png . @@ -55,8 +55,6 @@ ln -s ../../../gnome/32x32/stock/io/stock_print.png . ln -s ../../../gnome/24x24/stock/document/stock_task.png . ) ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps -ln -s ../../../gnome/48x48/apps/accessibility-directory.png . -#ln -s ../../../gnome/48x48/apps/gnome-system.png . ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png . ln -s ../../../gnome/48x48/stock/net/stock_contact.png . ln -s ../../../gnome/48x48/stock/io/stock_print.png . ) @@ -89,6 +87,13 @@ %doc ChangeLog COPYING GPL LGPL README %Changelog +* Wed Nov 01 2006 Chitlesh Goorah - 0.6.1-2 +- New upstream release for FE + +* Sat Oct 28 2006 Ariszlo - 0.6.1-1 +- Removed link to accessibility-directory.png +- release 0.6.1 + * Sun Oct 15 2006 Chitlesh Goorah - 0.6.0.1-2 - Removed duplicate gnome-system.png Index: sources =================================================================== RCS file: /cvs/extras/rpms/kmenu-gnome/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Oct 2006 15:53:15 -0000 1.3 +++ sources 3 Nov 2006 19:11:04 -0000 1.4 @@ -1 +1 @@ -b0759e688cafd1dcfbe6c34e9e533e33 kmenu-gnome-0.6.0.1.tar.gz +27425ea61069ece88565220033bd7cbb 31025-kmenu-gnome-0.6.1.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:10:14 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:10:14 -0700 Subject: rpms/libgeda import.log,1.8,1.9 Message-ID: <200611032010.kA3KAEPw007939@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/libgeda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7839 Modified Files: import.log Log Message: auto-import libgeda-20061020-1 on branch FC-5 from libgeda-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libgeda/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 12 Oct 2006 18:44:00 -0000 1.8 +++ import.log 3 Nov 2006 20:09:44 -0000 1.9 @@ -5,3 +5,4 @@ libgeda-20060906-2:HEAD:libgeda-20060906-2.src.rpm:1157923568 libgeda-20060906-3:FC-5:libgeda-20060906-3.src.rpm:1160678794 libgeda-20060906-3:HEAD:libgeda-20060906-3.src.rpm:1160678840 +libgeda-20061020-1:FC-5:libgeda-20061020-1.src.rpm:1162584824 From fedora-extras-commits at redhat.com Fri Nov 3 20:10:15 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:10:15 -0700 Subject: rpms/libgeda/FC-5 .cvsignore, 1.4, 1.5 libgeda.spec, 1.4, 1.5 sources, 1.4, 1.5 libgeda-20060906-arc.patch, 1.1, NONE libgeda-20060906-configure.patch, 1.1, NONE Message-ID: <200611032010.kA3KAF3K007944@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/libgeda/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7839/FC-5 Modified Files: .cvsignore libgeda.spec sources Removed Files: libgeda-20060906-arc.patch libgeda-20060906-configure.patch Log Message: auto-import libgeda-20061020-1 on branch FC-5 from libgeda-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgeda/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:20:03 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:09:45 -0000 1.5 @@ -1 +1 @@ -libgeda-20060906.tar.gz +libgeda-20061020.tar.gz Index: libgeda.spec =================================================================== RCS file: /cvs/extras/rpms/libgeda/FC-5/libgeda.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgeda.spec 12 Oct 2006 18:43:15 -0000 1.4 +++ libgeda.spec 3 Nov 2006 20:09:45 -0000 1.5 @@ -1,6 +1,6 @@ Name: libgeda -Version: 20060906 -Release: 3%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Libraries for the gEDA project Group: System Environment/Libraries @@ -8,8 +8,8 @@ URL: http://www.geda.seul.org Source: ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-arc.patch -Patch1: %{name}-%{version}-configure.patch +#Patch0: %{name}-%{version}-arc.patch +#Patch1: %{name}-%{version}-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -44,8 +44,8 @@ %prep %setup -q -%patch0 -p0 -b o_arc_basic.c -%patch1 -p0 -b configure.ac +#%patch0 -p0 -b o_arc_basic.c +#%patch1 -p0 -b configure.ac %build @@ -91,6 +91,9 @@ %Changelog +* Wed Nov 01 2006 Chitlesh Goorah - 20061020-1 +- New upstreeam release + * Wed Oct 11 2006 Chitlesh Goorah - 20060906-3 - Fixes Bug 210121 Printing does not produce correct post-script - Changed ownership of prolog.ps from libgeda-doc to libgeda Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgeda/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:20:03 -0000 1.4 +++ sources 3 Nov 2006 20:09:45 -0000 1.5 @@ -1 +1 @@ -1199ba6a71f3c03081a82e19fa550bc3 libgeda-20060906.tar.gz +3caf1aeee5627706b9abe54f6601a7dc libgeda-20061020.tar.gz --- libgeda-20060906-arc.patch DELETED --- --- libgeda-20060906-configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 20:10:26 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:10:26 -0700 Subject: rpms/geda-examples import.log,1.4,1.5 Message-ID: <200611032010.kA3KAQ8V008004@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7894 Modified Files: import.log Log Message: auto-import geda-examples-20061020-1 on branch FC-5 from geda-examples-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-examples/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 10 Sep 2006 21:48:25 -0000 1.4 +++ import.log 3 Nov 2006 20:09:56 -0000 1.5 @@ -1,3 +1,4 @@ geda-examples-20060824-4:HEAD:geda-examples-20060824-4.src.rpm:1157536073 geda-examples-20060906-1:FC-5:geda-examples-20060906-1.src.rpm:1157925033 geda-examples-20060906-2:HEAD:geda-examples-20060906-2.src.rpm:1157925154 +geda-examples-20061020-1:FC-5:geda-examples-20061020-1.src.rpm:1162584846 From fedora-extras-commits at redhat.com Fri Nov 3 20:10:27 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:10:27 -0700 Subject: rpms/geda-examples/FC-5 .cvsignore, 1.3, 1.4 geda-examples.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032010.kA3KARbR008010@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-examples/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7894/FC-5 Modified Files: .cvsignore geda-examples.spec sources Log Message: auto-import geda-examples-20061020-1 on branch FC-5 from geda-examples-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-examples/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:46:58 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:09:57 -0000 1.4 @@ -1 +1 @@ -geda-examples-20060906.tar.gz +geda-examples-20061020.tar.gz Index: geda-examples.spec =================================================================== RCS file: /cvs/extras/rpms/geda-examples/FC-5/geda-examples.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-examples.spec 10 Sep 2006 21:46:58 -0000 1.2 +++ geda-examples.spec 3 Nov 2006 20:09:57 -0000 1.3 @@ -1,7 +1,7 @@ %define gedaexampledir %{_datadir}/gEDA/examples Name: geda-examples -Version: 20060906 +Version: 20061020 Release: 1%{?dist} Summary: Circuit examples for gEDA @@ -32,7 +32,7 @@ %install %{__rm} -rf %{buildroot} -%{__make} install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} #the above installs nothing, do this again manually %{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/ @@ -82,6 +82,12 @@ %{gedaexampledir}/RF_Amp %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream release + +* Sun Sep 10 2006 Chitlesh Goorah - 20061006-2 +- Rebuilt for FC-6 devel + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 - Upstream release 20060906 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-examples/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:46:58 -0000 1.3 +++ sources 3 Nov 2006 20:09:57 -0000 1.4 @@ -1 +1 @@ -10860925e2ee1e26cceb03a49f8f21db geda-examples-20060906.tar.gz +6e469eff8e2ecbab525bc16c8e22253a geda-examples-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:11:01 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:11:01 -0700 Subject: rpms/geda-gattrib import.log,1.4,1.5 Message-ID: <200611032011.kA3KB1Mk008113@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8018 Modified Files: import.log Log Message: auto-import geda-gattrib-20061020-1 on branch devel from geda-gattrib-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 10 Sep 2006 21:47:34 -0000 1.4 +++ import.log 3 Nov 2006 20:10:31 -0000 1.5 @@ -1,3 +1,4 @@ geda-gattrib-20060824-1:HEAD:geda-gattrib-20060824-1.src.rpm:1157469570 geda-gattrib-20060906-1:FC-5:geda-gattrib-20060906-1.src.rpm:1157924925 geda-gattrib-20060906-2:HEAD:geda-gattrib-20060906-2.src.rpm:1157925101 +geda-gattrib-20061020-1:HEAD:geda-gattrib-20061020-1.src.rpm:1162584880 From fedora-extras-commits at redhat.com Fri Nov 3 20:11:02 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:11:02 -0700 Subject: rpms/geda-gattrib/devel .cvsignore, 1.3, 1.4 geda-gattrib.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032011.kA3KB2KQ008120@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8018/devel Modified Files: .cvsignore geda-gattrib.spec sources Log Message: auto-import geda-gattrib-20061020-1 on branch devel from geda-gattrib-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:47:35 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:10:32 -0000 1.4 @@ -1 +1 @@ -geda-gattrib-20060906.tar.gz +geda-gattrib-20061020.tar.gz Index: geda-gattrib.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/devel/geda-gattrib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-gattrib.spec 10 Sep 2006 21:47:35 -0000 1.2 +++ geda-gattrib.spec 3 Nov 2006 20:10:32 -0000 1.3 @@ -1,6 +1,6 @@ Name: geda-gattrib -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Attribute editor for gEDA Group: Applications/Engineering @@ -13,7 +13,8 @@ Source2: gattrib.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgeda-devel, desktop-file-utils, autoconf +BuildRequires: libgeda-devel, desktop-file-utils +#, autoconf Requires: geda-symbols %description @@ -30,23 +31,24 @@ %setup -q %build -%{__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 +#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 %configure -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -make INSTALL="install -p" install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} desktop-file-install --vendor=fedora \ --add-category Engineering \ @@ -87,6 +89,9 @@ %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream Release + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 - Rebuilt for FC-6 devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:47:35 -0000 1.3 +++ sources 3 Nov 2006 20:10:32 -0000 1.4 @@ -1 +1 @@ -c6fdafcf6e9e0278105e73778b50c857 geda-gattrib-20060906.tar.gz +74295c8b0b0d78ebf0953673ecdfb28f geda-gattrib-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:11:35 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:11:35 -0700 Subject: rpms/geda-gnetlist import.log,1.7,1.8 Message-ID: <200611032011.kA3KBZec008208@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gnetlist In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8129 Modified Files: import.log Log Message: auto-import geda-gnetlist-20061020-1 on branch FC-5 from geda-gnetlist-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 10 Sep 2006 21:47:32 -0000 1.7 +++ import.log 3 Nov 2006 20:11:05 -0000 1.8 @@ -4,3 +4,4 @@ geda-gnetlist-20060824-2:HEAD:geda-gnetlist-20060824-2.src.rpm:1157471840 geda-gnetlist-20060906-1:FC-5:geda-gnetlist-20060906-1.src.rpm:1157924899 geda-gnetlist-20060906-2:HEAD:geda-gnetlist-20060906-2.src.rpm:1157925089 +geda-gnetlist-20061020-1:FC-5:geda-gnetlist-20061020-1.src.rpm:1162584914 From fedora-extras-commits at redhat.com Fri Nov 3 20:11:36 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:11:36 -0700 Subject: rpms/geda-gnetlist/FC-5 .cvsignore, 1.4, 1.5 geda-gnetlist.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200611032011.kA3KBa21008214@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gnetlist/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8129/FC-5 Modified Files: .cvsignore geda-gnetlist.spec sources Log Message: auto-import geda-gnetlist-20061020-1 on branch FC-5 from geda-gnetlist-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:44:25 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:11:06 -0000 1.5 @@ -1 +1 @@ -geda-gnetlist-20060906.tar.gz +geda-gnetlist-20061020.tar.gz Index: geda-gnetlist.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/FC-5/geda-gnetlist.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geda-gnetlist.spec 10 Sep 2006 21:44:25 -0000 1.4 +++ geda-gnetlist.spec 3 Nov 2006 20:11:06 -0000 1.5 @@ -1,7 +1,7 @@ %define gedadocdir %{_datadir}/gEDA/docs Name: geda-gnetlist -Version: 20060906 +Version: 20061020 Release: 1%{?dist} Summary: Netlister for the gEDA project @@ -74,6 +74,12 @@ %{gedadocdir}/man/gnetlist.html %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- Upstream release 20061020 + +* Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 +- Rebuilt for FC-6 devel + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 - Upstream release 20060906 @@ -159,8 +165,8 @@ - updated to version 20001006 * Thu Aug 10 2000 Emmanuel Rouat -- added '*' as manpage extension since Mandrake compresss it with -bzip2 while redhat use gzip +- added '*' as manpage extension since Mandrake compresss it with +bzip2 while redhat use gzip - rebuilt with latest rpm * Fri Jul 7 2000 Emmanuel Rouat Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:44:25 -0000 1.4 +++ sources 3 Nov 2006 20:11:06 -0000 1.5 @@ -1 +1 @@ -e70f4d1f2088d1b6516a205a041cdb9e geda-gnetlist-20060906.tar.gz +f9a06c48281b45cf70f4488a685339b0 geda-gnetlist-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:13:31 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:31 -0700 Subject: rpms/geda-gschem import.log,1.6,1.7 Message-ID: <200611032013.kA3KDVrO008581@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8341 Modified Files: import.log Log Message: auto-import geda-gschem-20061020-1 on branch FC-5 from geda-gschem-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 12 Oct 2006 18:48:13 -0000 1.6 +++ import.log 3 Nov 2006 20:13:00 -0000 1.7 @@ -3,3 +3,4 @@ geda-gschem-20060906-2:HEAD:geda-gschem-20060906-2.src.rpm:1157925079 geda-gschem-20060906-3:FC-5:geda-gschem-20060906-3.src.rpm:1160679025 geda-gschem-20060906-3:HEAD:geda-gschem-20060906-3.src.rpm:1160679092 +geda-gschem-20061020-1:FC-5:geda-gschem-20061020-1.src.rpm:1162585010 From fedora-extras-commits at redhat.com Fri Nov 3 20:13:39 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:39 -0700 Subject: rpms/geda-symbols/FC-5 .cvsignore, 1.4, 1.5 geda-symbols.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200611032013.kA3KDdsU008630@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-symbols/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8406/FC-5 Modified Files: .cvsignore geda-symbols.spec sources Log Message: auto-import geda-symbols-20061020-1 on branch FC-5 from geda-symbols-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:41:05 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:13:08 -0000 1.5 @@ -1 +1 @@ -geda-symbols-20060906.tar.gz +geda-symbols-20061020.tar.gz Index: geda-symbols.spec =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/FC-5/geda-symbols.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geda-symbols.spec 10 Sep 2006 21:41:05 -0000 1.5 +++ geda-symbols.spec 3 Nov 2006 20:13:08 -0000 1.6 @@ -1,5 +1,5 @@ Name: geda-symbols -Version: 20060906 +Version: 20061020 Release: 1%{?dist} Summary: Electronic symbols for gEDA @@ -63,6 +63,12 @@ %{_datadir}/gEDA/system-gafrc %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream release + +* Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 +- Rebuilt for FC-6 devel + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 - Upstream release 20060906 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:41:05 -0000 1.4 +++ sources 3 Nov 2006 20:13:08 -0000 1.5 @@ -1 +1 @@ -43d938b2cfa45e039c69b1d7e00643d9 geda-symbols-20060906.tar.gz +0cc22d0d36c5f2f1c09aa82eb6d0edf6 geda-symbols-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:13:39 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:39 -0700 Subject: rpms/geda-utils import.log,1.4,1.5 Message-ID: <200611032013.kA3KDdBj008638@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8423 Modified Files: import.log Log Message: auto-import geda-utils-20061020-1 on branch FC-5 from geda-utils-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-utils/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 10 Sep 2006 21:47:43 -0000 1.4 +++ import.log 3 Nov 2006 20:13:09 -0000 1.5 @@ -1,3 +1,4 @@ geda-utils-20060824-2:HEAD:geda-utils-20060824-2.src.rpm:1157495617 geda-utils-20060906-1:FC-5:geda-utils-20060906-1.src.rpm:1157924985 geda-utils-20060906-2:HEAD:geda-utils-20060906-2.src.rpm:1157925111 +geda-utils-20061020-1:FC-5:geda-utils-20061020-1.src.rpm:1162585038 From fedora-extras-commits at redhat.com Fri Nov 3 20:13:31 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:31 -0700 Subject: rpms/geda-gschem/FC-5 .cvsignore, 1.3, 1.4 geda-gschem.spec, 1.3, 1.4 sources, 1.3, 1.4 geda-gschem-ru.po.diff, 1.1, NONE Message-ID: <200611032013.kA3KDVvw008587@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-serv8341/FC-5 Modified Files: .cvsignore geda-gschem.spec sources Removed Files: geda-gschem-ru.po.diff Log Message: auto-import geda-gschem-20061020-1 on branch FC-5 from geda-gschem-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:43:33 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:13:01 -0000 1.4 @@ -1 +1 @@ -geda-gschem-20060906.tar.gz +geda-gschem-20061020.tar.gz Index: geda-gschem.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-5/geda-gschem.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geda-gschem.spec 12 Oct 2006 18:47:07 -0000 1.3 +++ geda-gschem.spec 3 Nov 2006 20:13:01 -0000 1.4 @@ -1,6 +1,6 @@ Name: geda-gschem -Version: 20060906 -Release: 3%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Electronics schematics editor Group: Applications/Engineering @@ -13,7 +13,8 @@ Source2: gschem.xpm # by Andy Shevchenko #206280 -Patch0: geda-gschem-ru.po.diff +#TO BE TESTED +#Patch0: geda-gschem-ru.po.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,26 +27,27 @@ %prep %setup -q -%patch0 -p0 -b ru.po +#%patch0 -p0 -b ru.po %build -%{__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 +# 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 %configure --with-docdir=%{_datadir}/gEDA/docs -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -make INSTALL="install -p" install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} install -d %{buildroot}%{_datadir}/gEDA/examples install -d %{buildroot}%{_datadir}/gEDA/scheme @@ -138,6 +140,9 @@ %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New Upstream Release + * Fri Sep 15 2006 Chitlesh Goorah - 20060906-3 - patch for russian translation by Andy Shevchenko #206280 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:43:33 -0000 1.3 +++ sources 3 Nov 2006 20:13:01 -0000 1.4 @@ -1 +1 @@ -8f224c572f30162928a9141b352c7558 geda-gschem-20060906.tar.gz +c00d1692984d4fc89476beded6c2d571 geda-gschem-20061020.tar.gz --- geda-gschem-ru.po.diff DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 20:13:38 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:38 -0700 Subject: rpms/geda-symbols import.log,1.10,1.11 Message-ID: <200611032013.kA3KDc22008609@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-symbols In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8406 Modified Files: import.log Log Message: auto-import geda-symbols-20061020-1 on branch FC-5 from geda-symbols-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 10 Sep 2006 21:43:25 -0000 1.10 +++ import.log 3 Nov 2006 20:13:07 -0000 1.11 @@ -7,3 +7,4 @@ geda-symbols-20060824-2:HEAD:geda-symbols-20060824-2.src.rpm:1157471543 geda-symbols-20060906-1:FC-5:geda-symbols-20060906-1.src.rpm:1157924713 geda-symbols-20060906-2:HEAD:geda-symbols-20060906-2.src.rpm:1157924853 +geda-symbols-20061020-1:FC-5:geda-symbols-20061020-1.src.rpm:1162585037 From fedora-extras-commits at redhat.com Fri Nov 3 20:13:44 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:44 -0700 Subject: rpms/geda-utils/FC-5 .cvsignore, 1.3, 1.4 geda-utils.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032013.kA3KDido008691@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8423/FC-5 Modified Files: .cvsignore geda-utils.spec sources Log Message: auto-import geda-utils-20061020-1 on branch FC-5 from geda-utils-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-utils/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:46:25 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:13:14 -0000 1.4 @@ -1 +1 @@ -geda-utils-20060906.tar.gz +geda-utils-20061020.tar.gz Index: geda-utils.spec =================================================================== RCS file: /cvs/extras/rpms/geda-utils/FC-5/geda-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-utils.spec 10 Sep 2006 21:46:25 -0000 1.2 +++ geda-utils.spec 3 Nov 2006 20:13:14 -0000 1.3 @@ -1,5 +1,5 @@ Name: geda-utils -Version: 20060906 +Version: 20061020 Release: 1%{?dist} Summary: Several utilities for the gEDA project @@ -65,6 +65,12 @@ %{_datadir}/gEDA/docs/readmes/README* %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New Upstream Release + +* Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 +- Rebuild for FC-6 devel + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 - Upstream release 20060906 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-utils/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:46:25 -0000 1.3 +++ sources 3 Nov 2006 20:13:14 -0000 1.4 @@ -1 +1 @@ -452326bae9bee19722da2627f0ea05d8 geda-utils-20060906.tar.gz +d54b7dc1e8c91dbc6aef94ee5dcf65a1 geda-utils-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:13:46 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:46 -0700 Subject: rpms/geda-gattrib import.log,1.5,1.6 Message-ID: <200611032013.kA3KDkU5008713@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8493 Modified Files: import.log Log Message: auto-import geda-gattrib-20061020-1 on branch FC-5 from geda-gattrib-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Nov 2006 20:10:31 -0000 1.5 +++ import.log 3 Nov 2006 20:13:16 -0000 1.6 @@ -2,3 +2,4 @@ geda-gattrib-20060906-1:FC-5:geda-gattrib-20060906-1.src.rpm:1157924925 geda-gattrib-20060906-2:HEAD:geda-gattrib-20060906-2.src.rpm:1157925101 geda-gattrib-20061020-1:HEAD:geda-gattrib-20061020-1.src.rpm:1162584880 +geda-gattrib-20061020-1:FC-5:geda-gattrib-20061020-1.src.rpm:1162585044 From fedora-extras-commits at redhat.com Fri Nov 3 20:13:47 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:47 -0700 Subject: rpms/geda-examples import.log,1.5,1.6 Message-ID: <200611032013.kA3KDlVK008717@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8494 Modified Files: import.log Log Message: auto-import geda-examples-20061020-1 on branch FC-6 from geda-examples-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-examples/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Nov 2006 20:09:56 -0000 1.5 +++ import.log 3 Nov 2006 20:13:16 -0000 1.6 @@ -2,3 +2,4 @@ geda-examples-20060906-1:FC-5:geda-examples-20060906-1.src.rpm:1157925033 geda-examples-20060906-2:HEAD:geda-examples-20060906-2.src.rpm:1157925154 geda-examples-20061020-1:FC-5:geda-examples-20061020-1.src.rpm:1162584846 +geda-examples-20061020-1:FC-6:geda-examples-20061020-1.src.rpm:1162585045 From fedora-extras-commits at redhat.com Fri Nov 3 20:13:47 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:47 -0700 Subject: rpms/geda-gattrib/FC-5 .cvsignore, 1.3, 1.4 geda-gattrib.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032013.kA3KDlOT008723@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-serv8493/FC-5 Modified Files: .cvsignore geda-gattrib.spec sources Log Message: auto-import geda-gattrib-20061020-1 on branch FC-5 from geda-gattrib-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:44:53 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:13:17 -0000 1.4 @@ -1 +1 @@ -geda-gattrib-20060906.tar.gz +geda-gattrib-20061020.tar.gz Index: geda-gattrib.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-5/geda-gattrib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-gattrib.spec 10 Sep 2006 21:44:53 -0000 1.2 +++ geda-gattrib.spec 3 Nov 2006 20:13:17 -0000 1.3 @@ -1,5 +1,5 @@ Name: geda-gattrib -Version: 20060906 +Version: 20061020 Release: 1%{?dist} Summary: Attribute editor for gEDA @@ -13,7 +13,8 @@ Source2: gattrib.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgeda-devel, desktop-file-utils, autoconf +BuildRequires: libgeda-devel, desktop-file-utils +#, autoconf Requires: geda-symbols %description @@ -30,23 +31,24 @@ %setup -q %build -%{__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 +#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 %configure -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -make INSTALL="install -p" install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} desktop-file-install --vendor=fedora \ --add-category Engineering \ @@ -87,6 +89,12 @@ %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream Release + +* Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 +- Rebuilt for FC-6 devel + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 - Upstream release 20060906 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:44:53 -0000 1.3 +++ sources 3 Nov 2006 20:13:17 -0000 1.4 @@ -1 +1 @@ -c6fdafcf6e9e0278105e73778b50c857 geda-gattrib-20060906.tar.gz +74295c8b0b0d78ebf0953673ecdfb28f geda-gattrib-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:13:48 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:13:48 -0700 Subject: rpms/geda-examples/FC-6 .cvsignore, 1.3, 1.4 geda-examples.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032013.kA3KDmER008728@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-examples/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8494/FC-6 Modified Files: .cvsignore geda-examples.spec sources Log Message: auto-import geda-examples-20061020-1 on branch FC-6 from geda-examples-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-examples/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:48:26 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:13:18 -0000 1.4 @@ -1 +1 @@ -geda-examples-20060906.tar.gz +geda-examples-20061020.tar.gz Index: geda-examples.spec =================================================================== RCS file: /cvs/extras/rpms/geda-examples/FC-6/geda-examples.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-examples.spec 10 Sep 2006 21:48:26 -0000 1.2 +++ geda-examples.spec 3 Nov 2006 20:13:18 -0000 1.3 @@ -1,8 +1,8 @@ %define gedaexampledir %{_datadir}/gEDA/examples Name: geda-examples -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Circuit examples for gEDA Group: Applications/Engineering @@ -32,7 +32,7 @@ %install %{__rm} -rf %{buildroot} -%{__make} install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} #the above installs nothing, do this again manually %{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/ @@ -82,7 +82,10 @@ %{gedaexampledir}/RF_Amp %Changelog -* Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream release + +* Sun Sep 10 2006 Chitlesh Goorah - 20061006-2 - Rebuilt for FC-6 devel * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-examples/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:48:26 -0000 1.3 +++ sources 3 Nov 2006 20:13:18 -0000 1.4 @@ -1 +1 @@ -10860925e2ee1e26cceb03a49f8f21db geda-examples-20060906.tar.gz +6e469eff8e2ecbab525bc16c8e22253a geda-examples-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:14:08 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:14:08 -0700 Subject: rpms/geda-gnetlist import.log,1.8,1.9 Message-ID: <200611032014.kA3KE8nH008858@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gnetlist In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8593 Modified Files: import.log Log Message: auto-import geda-gnetlist-20061020-1 on branch FC-6 from geda-gnetlist-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 3 Nov 2006 20:11:05 -0000 1.8 +++ import.log 3 Nov 2006 20:13:37 -0000 1.9 @@ -5,3 +5,4 @@ geda-gnetlist-20060906-1:FC-5:geda-gnetlist-20060906-1.src.rpm:1157924899 geda-gnetlist-20060906-2:HEAD:geda-gnetlist-20060906-2.src.rpm:1157925089 geda-gnetlist-20061020-1:FC-5:geda-gnetlist-20061020-1.src.rpm:1162584914 +geda-gnetlist-20061020-1:FC-6:geda-gnetlist-20061020-1.src.rpm:1162585064 From fedora-extras-commits at redhat.com Fri Nov 3 20:14:09 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:14:09 -0700 Subject: rpms/libgeda import.log,1.9,1.10 Message-ID: <200611032014.kA3KE9ZH008866@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/libgeda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8602 Modified Files: import.log Log Message: auto-import libgeda-20061020-1 on branch FC-6 from libgeda-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libgeda/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 3 Nov 2006 20:09:44 -0000 1.9 +++ import.log 3 Nov 2006 20:13:39 -0000 1.10 @@ -6,3 +6,4 @@ libgeda-20060906-3:FC-5:libgeda-20060906-3.src.rpm:1160678794 libgeda-20060906-3:HEAD:libgeda-20060906-3.src.rpm:1160678840 libgeda-20061020-1:FC-5:libgeda-20061020-1.src.rpm:1162584824 +libgeda-20061020-1:FC-6:libgeda-20061020-1.src.rpm:1162585066 From fedora-extras-commits at redhat.com Fri Nov 3 20:14:08 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:14:08 -0700 Subject: rpms/geda-gnetlist/FC-6 .cvsignore, 1.4, 1.5 geda-gnetlist.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200611032014.kA3KE8K3008863@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gnetlist/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8593/FC-6 Modified Files: .cvsignore geda-gnetlist.spec sources Log Message: auto-import geda-gnetlist-20061020-1 on branch FC-6 from geda-gnetlist-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:47:33 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:13:38 -0000 1.5 @@ -1 +1 @@ -geda-gnetlist-20060906.tar.gz +geda-gnetlist-20061020.tar.gz Index: geda-gnetlist.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/geda-gnetlist.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geda-gnetlist.spec 10 Sep 2006 21:47:33 -0000 1.4 +++ geda-gnetlist.spec 3 Nov 2006 20:13:38 -0000 1.5 @@ -1,8 +1,8 @@ %define gedadocdir %{_datadir}/gEDA/docs Name: geda-gnetlist -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Netlister for the gEDA project Group: Applications/Engineering @@ -74,6 +74,9 @@ %{gedadocdir}/man/gnetlist.html %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- Upstream release 20061020 + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 - Rebuilt for FC-6 devel @@ -162,8 +165,8 @@ - updated to version 20001006 * Thu Aug 10 2000 Emmanuel Rouat -- added '*' as manpage extension since Mandrake compresss it with -bzip2 while redhat use gzip +- added '*' as manpage extension since Mandrake compresss it with +bzip2 while redhat use gzip - rebuilt with latest rpm * Fri Jul 7 2000 Emmanuel Rouat Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:47:33 -0000 1.4 +++ sources 3 Nov 2006 20:13:38 -0000 1.5 @@ -1 +1 @@ -e70f4d1f2088d1b6516a205a041cdb9e geda-gnetlist-20060906.tar.gz +f9a06c48281b45cf70f4488a685339b0 geda-gnetlist-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:14:15 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:14:15 -0700 Subject: rpms/libgeda/FC-6 .cvsignore, 1.4, 1.5 libgeda.spec, 1.4, 1.5 sources, 1.4, 1.5 libgeda-20060906-arc.patch, 1.1, NONE libgeda-20060906-configure.patch, 1.1, NONE Message-ID: <200611032014.kA3KEF92008907@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/libgeda/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8602/FC-6 Modified Files: .cvsignore libgeda.spec sources Removed Files: libgeda-20060906-arc.patch libgeda-20060906-configure.patch Log Message: auto-import libgeda-20061020-1 on branch FC-6 from libgeda-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgeda/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:22:00 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:13:45 -0000 1.5 @@ -1 +1 @@ -libgeda-20060906.tar.gz +libgeda-20061020.tar.gz Index: libgeda.spec =================================================================== RCS file: /cvs/extras/rpms/libgeda/FC-6/libgeda.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgeda.spec 12 Oct 2006 18:44:01 -0000 1.4 +++ libgeda.spec 3 Nov 2006 20:13:45 -0000 1.5 @@ -1,6 +1,6 @@ Name: libgeda -Version: 20060906 -Release: 3%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Libraries for the gEDA project Group: System Environment/Libraries @@ -8,8 +8,8 @@ URL: http://www.geda.seul.org Source: ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-arc.patch -Patch1: %{name}-%{version}-configure.patch +#Patch0: %{name}-%{version}-arc.patch +#Patch1: %{name}-%{version}-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -44,8 +44,8 @@ %prep %setup -q -%patch0 -p0 -b o_arc_basic.c -%patch1 -p0 -b configure.ac +#%patch0 -p0 -b o_arc_basic.c +#%patch1 -p0 -b configure.ac %build @@ -91,6 +91,9 @@ %Changelog +* Wed Nov 01 2006 Chitlesh Goorah - 20061020-1 +- New upstreeam release + * Wed Oct 11 2006 Chitlesh Goorah - 20060906-3 - Fixes Bug 210121 Printing does not produce correct post-script - Changed ownership of prolog.ps from libgeda-doc to libgeda Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgeda/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:22:01 -0000 1.4 +++ sources 3 Nov 2006 20:13:45 -0000 1.5 @@ -1 +1 @@ -1199ba6a71f3c03081a82e19fa550bc3 libgeda-20060906.tar.gz +3caf1aeee5627706b9abe54f6601a7dc libgeda-20061020.tar.gz --- libgeda-20060906-arc.patch DELETED --- --- libgeda-20060906-configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 20:15:35 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:35 -0700 Subject: rpms/geda-gattrib import.log,1.6,1.7 Message-ID: <200611032015.kA3KFZ6a009333@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gattrib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9088 Modified Files: import.log Log Message: auto-import geda-gattrib-20061020-1 on branch FC-6 from geda-gattrib-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 Nov 2006 20:13:16 -0000 1.6 +++ import.log 3 Nov 2006 20:15:05 -0000 1.7 @@ -3,3 +3,4 @@ geda-gattrib-20060906-2:HEAD:geda-gattrib-20060906-2.src.rpm:1157925101 geda-gattrib-20061020-1:HEAD:geda-gattrib-20061020-1.src.rpm:1162584880 geda-gattrib-20061020-1:FC-5:geda-gattrib-20061020-1.src.rpm:1162585044 +geda-gattrib-20061020-1:FC-6:geda-gattrib-20061020-1.src.rpm:1162585153 From fedora-extras-commits at redhat.com Fri Nov 3 20:15:36 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:36 -0700 Subject: rpms/geda-gattrib/FC-6 .cvsignore, 1.3, 1.4 geda-gattrib.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032015.kA3KFajJ009339@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-serv9088/FC-6 Modified Files: .cvsignore geda-gattrib.spec sources Log Message: auto-import geda-gattrib-20061020-1 on branch FC-6 from geda-gattrib-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:47:35 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:15:06 -0000 1.4 @@ -1 +1 @@ -geda-gattrib-20060906.tar.gz +geda-gattrib-20061020.tar.gz Index: geda-gattrib.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/geda-gattrib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-gattrib.spec 10 Sep 2006 21:47:35 -0000 1.2 +++ geda-gattrib.spec 3 Nov 2006 20:15:06 -0000 1.3 @@ -1,6 +1,6 @@ Name: geda-gattrib -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Attribute editor for gEDA Group: Applications/Engineering @@ -13,7 +13,8 @@ Source2: gattrib.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgeda-devel, desktop-file-utils, autoconf +BuildRequires: libgeda-devel, desktop-file-utils +#, autoconf Requires: geda-symbols %description @@ -30,23 +31,24 @@ %setup -q %build -%{__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 +#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 %configure -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -make INSTALL="install -p" install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} desktop-file-install --vendor=fedora \ --add-category Engineering \ @@ -87,6 +89,9 @@ %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream Release + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 - Rebuilt for FC-6 devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:47:35 -0000 1.3 +++ sources 3 Nov 2006 20:15:06 -0000 1.4 @@ -1 +1 @@ -c6fdafcf6e9e0278105e73778b50c857 geda-gattrib-20060906.tar.gz +74295c8b0b0d78ebf0953673ecdfb28f geda-gattrib-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:15:32 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:32 -0700 Subject: rpms/geda-gschem import.log,1.7,1.8 Message-ID: <200611032015.kA3KFWaB009288@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9041 Modified Files: import.log Log Message: auto-import geda-gschem-20061020-1 on branch FC-6 from geda-gschem-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 3 Nov 2006 20:13:00 -0000 1.7 +++ import.log 3 Nov 2006 20:15:02 -0000 1.8 @@ -4,3 +4,4 @@ geda-gschem-20060906-3:FC-5:geda-gschem-20060906-3.src.rpm:1160679025 geda-gschem-20060906-3:HEAD:geda-gschem-20060906-3.src.rpm:1160679092 geda-gschem-20061020-1:FC-5:geda-gschem-20061020-1.src.rpm:1162585010 +geda-gschem-20061020-1:FC-6:geda-gschem-20061020-1.src.rpm:1162585139 From fedora-extras-commits at redhat.com Fri Nov 3 20:15:33 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:33 -0700 Subject: rpms/geda-gschem/FC-6 .cvsignore, 1.3, 1.4 geda-gschem.spec, 1.3, 1.4 sources, 1.3, 1.4 geda-gschem-ru.po.diff, 1.1, NONE Message-ID: <200611032015.kA3KFXcn009294@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-serv9041/FC-6 Modified Files: .cvsignore geda-gschem.spec sources Removed Files: geda-gschem-ru.po.diff Log Message: auto-import geda-gschem-20061020-1 on branch FC-6 from geda-gschem-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:47:14 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:15:02 -0000 1.4 @@ -1 +1 @@ -geda-gschem-20060906.tar.gz +geda-gschem-20061020.tar.gz Index: geda-gschem.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-6/geda-gschem.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geda-gschem.spec 12 Oct 2006 18:48:14 -0000 1.3 +++ geda-gschem.spec 3 Nov 2006 20:15:02 -0000 1.4 @@ -1,6 +1,6 @@ Name: geda-gschem -Version: 20060906 -Release: 3%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Electronics schematics editor Group: Applications/Engineering @@ -13,7 +13,8 @@ Source2: gschem.xpm # by Andy Shevchenko #206280 -Patch0: geda-gschem-ru.po.diff +#TO BE TESTED +#Patch0: geda-gschem-ru.po.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,26 +27,27 @@ %prep %setup -q -%patch0 -p0 -b ru.po +#%patch0 -p0 -b ru.po %build -%{__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 +# 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 %configure --with-docdir=%{_datadir}/gEDA/docs -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -make INSTALL="install -p" install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} install -d %{buildroot}%{_datadir}/gEDA/examples install -d %{buildroot}%{_datadir}/gEDA/scheme @@ -138,6 +140,9 @@ %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New Upstream Release + * Fri Sep 15 2006 Chitlesh Goorah - 20060906-3 - patch for russian translation by Andy Shevchenko #206280 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:47:14 -0000 1.3 +++ sources 3 Nov 2006 20:15:02 -0000 1.4 @@ -1 +1 @@ -8f224c572f30162928a9141b352c7558 geda-gschem-20060906.tar.gz +c00d1692984d4fc89476beded6c2d571 geda-gschem-20061020.tar.gz --- geda-gschem-ru.po.diff DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 20:15:45 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:45 -0700 Subject: rpms/geda-examples import.log,1.6,1.7 Message-ID: <200611032015.kA3KFjxG009408@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9158 Modified Files: import.log Log Message: auto-import geda-examples-20061020-1 on branch devel from geda-examples-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-examples/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 Nov 2006 20:13:16 -0000 1.6 +++ import.log 3 Nov 2006 20:15:15 -0000 1.7 @@ -3,3 +3,4 @@ geda-examples-20060906-2:HEAD:geda-examples-20060906-2.src.rpm:1157925154 geda-examples-20061020-1:FC-5:geda-examples-20061020-1.src.rpm:1162584846 geda-examples-20061020-1:FC-6:geda-examples-20061020-1.src.rpm:1162585045 +geda-examples-20061020-1:HEAD:geda-examples-20061020-1.src.rpm:1162585164 From fedora-extras-commits at redhat.com Fri Nov 3 20:15:46 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:46 -0700 Subject: rpms/geda-examples/devel .cvsignore, 1.3, 1.4 geda-examples.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032015.kA3KFkRj009419@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-examples/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9158/devel Modified Files: .cvsignore geda-examples.spec sources Log Message: auto-import geda-examples-20061020-1 on branch devel from geda-examples-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-examples/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:48:26 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:15:15 -0000 1.4 @@ -1 +1 @@ -geda-examples-20060906.tar.gz +geda-examples-20061020.tar.gz Index: geda-examples.spec =================================================================== RCS file: /cvs/extras/rpms/geda-examples/devel/geda-examples.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-examples.spec 10 Sep 2006 21:48:26 -0000 1.2 +++ geda-examples.spec 3 Nov 2006 20:15:15 -0000 1.3 @@ -1,8 +1,8 @@ %define gedaexampledir %{_datadir}/gEDA/examples Name: geda-examples -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Circuit examples for gEDA Group: Applications/Engineering @@ -32,7 +32,7 @@ %install %{__rm} -rf %{buildroot} -%{__make} install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} #the above installs nothing, do this again manually %{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/ @@ -82,7 +82,10 @@ %{gedaexampledir}/RF_Amp %Changelog -* Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream release + +* Sun Sep 10 2006 Chitlesh Goorah - 20061006-2 - Rebuilt for FC-6 devel * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-examples/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:48:26 -0000 1.3 +++ sources 3 Nov 2006 20:15:15 -0000 1.4 @@ -1 +1 @@ -10860925e2ee1e26cceb03a49f8f21db geda-examples-20060906.tar.gz +6e469eff8e2ecbab525bc16c8e22253a geda-examples-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:15:51 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:51 -0700 Subject: rpms/geda-utils import.log,1.5,1.6 Message-ID: <200611032015.kA3KFp9h009462@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9208 Modified Files: import.log Log Message: auto-import geda-utils-20061020-1 on branch FC-6 from geda-utils-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-utils/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Nov 2006 20:13:09 -0000 1.5 +++ import.log 3 Nov 2006 20:15:21 -0000 1.6 @@ -2,3 +2,4 @@ geda-utils-20060906-1:FC-5:geda-utils-20060906-1.src.rpm:1157924985 geda-utils-20060906-2:HEAD:geda-utils-20060906-2.src.rpm:1157925111 geda-utils-20061020-1:FC-5:geda-utils-20061020-1.src.rpm:1162585038 +geda-utils-20061020-1:FC-6:geda-utils-20061020-1.src.rpm:1162585170 From fedora-extras-commits at redhat.com Fri Nov 3 20:15:52 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:52 -0700 Subject: rpms/geda-symbols import.log,1.11,1.12 Message-ID: <200611032015.kA3KFqcS009480@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-symbols In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9209 Modified Files: import.log Log Message: auto-import geda-symbols-20061020-1 on branch FC-6 from geda-symbols-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 3 Nov 2006 20:13:07 -0000 1.11 +++ import.log 3 Nov 2006 20:15:21 -0000 1.12 @@ -8,3 +8,4 @@ geda-symbols-20060906-1:FC-5:geda-symbols-20060906-1.src.rpm:1157924713 geda-symbols-20060906-2:HEAD:geda-symbols-20060906-2.src.rpm:1157924853 geda-symbols-20061020-1:FC-5:geda-symbols-20061020-1.src.rpm:1162585037 +geda-symbols-20061020-1:FC-6:geda-symbols-20061020-1.src.rpm:1162585170 From fedora-extras-commits at redhat.com Fri Nov 3 20:15:52 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:52 -0700 Subject: rpms/geda-utils/FC-6 .cvsignore, 1.3, 1.4 geda-utils.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032015.kA3KFqbu009483@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-utils/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9208/FC-6 Modified Files: .cvsignore geda-utils.spec sources Log Message: auto-import geda-utils-20061020-1 on branch FC-6 from geda-utils-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-utils/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:47:44 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:15:22 -0000 1.4 @@ -1 +1 @@ -geda-utils-20060906.tar.gz +geda-utils-20061020.tar.gz Index: geda-utils.spec =================================================================== RCS file: /cvs/extras/rpms/geda-utils/FC-6/geda-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-utils.spec 10 Sep 2006 21:47:44 -0000 1.2 +++ geda-utils.spec 3 Nov 2006 20:15:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: geda-utils -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Several utilities for the gEDA project Group: Applications/Engineering @@ -65,6 +65,9 @@ %{_datadir}/gEDA/docs/readmes/README* %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New Upstream Release + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 - Rebuild for FC-6 devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-utils/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:47:44 -0000 1.3 +++ sources 3 Nov 2006 20:15:22 -0000 1.4 @@ -1 +1 @@ -452326bae9bee19722da2627f0ea05d8 geda-utils-20060906.tar.gz +d54b7dc1e8c91dbc6aef94ee5dcf65a1 geda-utils-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:15:58 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:15:58 -0700 Subject: rpms/geda-symbols/FC-6 .cvsignore, 1.4, 1.5 geda-symbols.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200611032015.kA3KFwnH009499@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-symbols/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9209/FC-6 Modified Files: .cvsignore geda-symbols.spec sources Log Message: auto-import geda-symbols-20061020-1 on branch FC-6 from geda-symbols-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:43:26 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:15:28 -0000 1.5 @@ -1 +1 @@ -geda-symbols-20060906.tar.gz +geda-symbols-20061020.tar.gz Index: geda-symbols.spec =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/FC-6/geda-symbols.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geda-symbols.spec 10 Sep 2006 21:43:26 -0000 1.5 +++ geda-symbols.spec 3 Nov 2006 20:15:28 -0000 1.6 @@ -1,6 +1,6 @@ Name: geda-symbols -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Electronic symbols for gEDA Group: Applications/Engineering @@ -63,6 +63,9 @@ %{_datadir}/gEDA/system-gafrc %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream release + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 - Rebuilt for FC-6 devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:43:26 -0000 1.4 +++ sources 3 Nov 2006 20:15:28 -0000 1.5 @@ -1 +1 @@ -43d938b2cfa45e039c69b1d7e00643d9 geda-symbols-20060906.tar.gz +0cc22d0d36c5f2f1c09aa82eb6d0edf6 geda-symbols-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:16:04 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:16:04 -0700 Subject: rpms/geda-gnetlist/devel .cvsignore, 1.4, 1.5 geda-gnetlist.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200611032016.kA3KG4lr009567@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gnetlist/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9289/devel Modified Files: .cvsignore geda-gnetlist.spec sources Log Message: auto-import geda-gnetlist-20061020-1 on branch devel from geda-gnetlist-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:47:33 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:15:34 -0000 1.5 @@ -1 +1 @@ -geda-gnetlist-20060906.tar.gz +geda-gnetlist-20061020.tar.gz Index: geda-gnetlist.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/devel/geda-gnetlist.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geda-gnetlist.spec 10 Sep 2006 21:47:33 -0000 1.4 +++ geda-gnetlist.spec 3 Nov 2006 20:15:34 -0000 1.5 @@ -1,8 +1,8 @@ %define gedadocdir %{_datadir}/gEDA/docs Name: geda-gnetlist -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Netlister for the gEDA project Group: Applications/Engineering @@ -74,6 +74,9 @@ %{gedadocdir}/man/gnetlist.html %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- Upstream release 20061020 + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 - Rebuilt for FC-6 devel @@ -162,8 +165,8 @@ - updated to version 20001006 * Thu Aug 10 2000 Emmanuel Rouat -- added '*' as manpage extension since Mandrake compresss it with -bzip2 while redhat use gzip +- added '*' as manpage extension since Mandrake compresss it with +bzip2 while redhat use gzip - rebuilt with latest rpm * Fri Jul 7 2000 Emmanuel Rouat Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:47:33 -0000 1.4 +++ sources 3 Nov 2006 20:15:34 -0000 1.5 @@ -1 +1 @@ -e70f4d1f2088d1b6516a205a041cdb9e geda-gnetlist-20060906.tar.gz +f9a06c48281b45cf70f4488a685339b0 geda-gnetlist-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:16:03 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:16:03 -0700 Subject: rpms/geda-gnetlist import.log,1.9,1.10 Message-ID: <200611032016.kA3KG3HK009561@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gnetlist In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9289 Modified Files: import.log Log Message: auto-import geda-gnetlist-20061020-1 on branch devel from geda-gnetlist-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gnetlist/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 3 Nov 2006 20:13:37 -0000 1.9 +++ import.log 3 Nov 2006 20:15:33 -0000 1.10 @@ -6,3 +6,4 @@ geda-gnetlist-20060906-2:HEAD:geda-gnetlist-20060906-2.src.rpm:1157925089 geda-gnetlist-20061020-1:FC-5:geda-gnetlist-20061020-1.src.rpm:1162584914 geda-gnetlist-20061020-1:FC-6:geda-gnetlist-20061020-1.src.rpm:1162585064 +geda-gnetlist-20061020-1:HEAD:geda-gnetlist-20061020-1.src.rpm:1162585177 From fedora-extras-commits at redhat.com Fri Nov 3 20:16:16 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:16:16 -0700 Subject: rpms/libgeda import.log,1.10,1.11 Message-ID: <200611032016.kA3KGGoK009580@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/libgeda In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9407 Modified Files: import.log Log Message: auto-import libgeda-20061020-1 on branch devel from libgeda-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libgeda/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 3 Nov 2006 20:13:39 -0000 1.10 +++ import.log 3 Nov 2006 20:15:46 -0000 1.11 @@ -7,3 +7,4 @@ libgeda-20060906-3:HEAD:libgeda-20060906-3.src.rpm:1160678840 libgeda-20061020-1:FC-5:libgeda-20061020-1.src.rpm:1162584824 libgeda-20061020-1:FC-6:libgeda-20061020-1.src.rpm:1162585066 +libgeda-20061020-1:HEAD:libgeda-20061020-1.src.rpm:1162585195 From fedora-extras-commits at redhat.com Fri Nov 3 20:16:22 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:16:22 -0700 Subject: rpms/libgeda/devel .cvsignore, 1.4, 1.5 libgeda.spec, 1.4, 1.5 sources, 1.4, 1.5 libgeda-20060906-arc.patch, 1.1, NONE libgeda-20060906-configure.patch, 1.1, NONE Message-ID: <200611032016.kA3KGMe2009621@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/libgeda/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9407/devel Modified Files: .cvsignore libgeda.spec sources Removed Files: libgeda-20060906-arc.patch libgeda-20060906-configure.patch Log Message: auto-import libgeda-20061020-1 on branch devel from libgeda-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgeda/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:22:00 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:15:51 -0000 1.5 @@ -1 +1 @@ -libgeda-20060906.tar.gz +libgeda-20061020.tar.gz Index: libgeda.spec =================================================================== RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libgeda.spec 12 Oct 2006 18:44:01 -0000 1.4 +++ libgeda.spec 3 Nov 2006 20:15:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: libgeda -Version: 20060906 -Release: 3%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Libraries for the gEDA project Group: System Environment/Libraries @@ -8,8 +8,8 @@ URL: http://www.geda.seul.org Source: ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-arc.patch -Patch1: %{name}-%{version}-configure.patch +#Patch0: %{name}-%{version}-arc.patch +#Patch1: %{name}-%{version}-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -44,8 +44,8 @@ %prep %setup -q -%patch0 -p0 -b o_arc_basic.c -%patch1 -p0 -b configure.ac +#%patch0 -p0 -b o_arc_basic.c +#%patch1 -p0 -b configure.ac %build @@ -91,6 +91,9 @@ %Changelog +* Wed Nov 01 2006 Chitlesh Goorah - 20061020-1 +- New upstreeam release + * Wed Oct 11 2006 Chitlesh Goorah - 20060906-3 - Fixes Bug 210121 Printing does not produce correct post-script - Changed ownership of prolog.ps from libgeda-doc to libgeda Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgeda/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:22:01 -0000 1.4 +++ sources 3 Nov 2006 20:15:51 -0000 1.5 @@ -1 +1 @@ -1199ba6a71f3c03081a82e19fa550bc3 libgeda-20060906.tar.gz +3caf1aeee5627706b9abe54f6601a7dc libgeda-20061020.tar.gz --- libgeda-20060906-arc.patch DELETED --- --- libgeda-20060906-configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 20:17:20 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:17:20 -0700 Subject: rpms/geda-gschem/devel .cvsignore, 1.3, 1.4 geda-gschem.spec, 1.3, 1.4 sources, 1.3, 1.4 geda-gschem-ru.po.diff, 1.1, NONE Message-ID: <200611032017.kA3KHKkT009827@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9693/devel Modified Files: .cvsignore geda-gschem.spec sources Removed Files: geda-gschem-ru.po.diff Log Message: auto-import geda-gschem-20061020-1 on branch devel from geda-gschem-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:47:14 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:16:50 -0000 1.4 @@ -1 +1 @@ -geda-gschem-20060906.tar.gz +geda-gschem-20061020.tar.gz Index: geda-gschem.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/devel/geda-gschem.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geda-gschem.spec 12 Oct 2006 18:48:14 -0000 1.3 +++ geda-gschem.spec 3 Nov 2006 20:16:50 -0000 1.4 @@ -1,6 +1,6 @@ Name: geda-gschem -Version: 20060906 -Release: 3%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Electronics schematics editor Group: Applications/Engineering @@ -13,7 +13,8 @@ Source2: gschem.xpm # by Andy Shevchenko #206280 -Patch0: geda-gschem-ru.po.diff +#TO BE TESTED +#Patch0: geda-gschem-ru.po.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,26 +27,27 @@ %prep %setup -q -%patch0 -p0 -b ru.po +#%patch0 -p0 -b ru.po %build -%{__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 +# 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 %configure --with-docdir=%{_datadir}/gEDA/docs -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -make INSTALL="install -p" install DESTDIR=%{buildroot} +%{__make} INSTALL="install -p" install DESTDIR=%{buildroot} install -d %{buildroot}%{_datadir}/gEDA/examples install -d %{buildroot}%{_datadir}/gEDA/scheme @@ -138,6 +140,9 @@ %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New Upstream Release + * Fri Sep 15 2006 Chitlesh Goorah - 20060906-3 - patch for russian translation by Andy Shevchenko #206280 Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:47:14 -0000 1.3 +++ sources 3 Nov 2006 20:16:50 -0000 1.4 @@ -1 +1 @@ -8f224c572f30162928a9141b352c7558 geda-gschem-20060906.tar.gz +c00d1692984d4fc89476beded6c2d571 geda-gschem-20061020.tar.gz --- geda-gschem-ru.po.diff DELETED --- From fedora-extras-commits at redhat.com Fri Nov 3 20:17:28 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:17:28 -0700 Subject: rpms/geda-utils import.log,1.6,1.7 Message-ID: <200611032017.kA3KHSeR009838@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9742 Modified Files: import.log Log Message: auto-import geda-utils-20061020-1 on branch devel from geda-utils-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-utils/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 3 Nov 2006 20:15:21 -0000 1.6 +++ import.log 3 Nov 2006 20:16:57 -0000 1.7 @@ -3,3 +3,4 @@ geda-utils-20060906-2:HEAD:geda-utils-20060906-2.src.rpm:1157925111 geda-utils-20061020-1:FC-5:geda-utils-20061020-1.src.rpm:1162585038 geda-utils-20061020-1:FC-6:geda-utils-20061020-1.src.rpm:1162585170 +geda-utils-20061020-1:HEAD:geda-utils-20061020-1.src.rpm:1162585266 From fedora-extras-commits at redhat.com Fri Nov 3 20:17:20 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:17:20 -0700 Subject: rpms/geda-gschem import.log,1.8,1.9 Message-ID: <200611032017.kA3KHKjc009824@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gschem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9693 Modified Files: import.log Log Message: auto-import geda-gschem-20061020-1 on branch devel from geda-gschem-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gschem/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 3 Nov 2006 20:15:02 -0000 1.8 +++ import.log 3 Nov 2006 20:16:49 -0000 1.9 @@ -5,3 +5,4 @@ geda-gschem-20060906-3:HEAD:geda-gschem-20060906-3.src.rpm:1160679092 geda-gschem-20061020-1:FC-5:geda-gschem-20061020-1.src.rpm:1162585010 geda-gschem-20061020-1:FC-6:geda-gschem-20061020-1.src.rpm:1162585139 +geda-gschem-20061020-1:HEAD:geda-gschem-20061020-1.src.rpm:1162585258 From fedora-extras-commits at redhat.com Fri Nov 3 20:17:28 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:17:28 -0700 Subject: rpms/geda-utils/devel .cvsignore, 1.3, 1.4 geda-utils.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611032017.kA3KHSc6009870@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9742/devel Modified Files: .cvsignore geda-utils.spec sources Log Message: auto-import geda-utils-20061020-1 on branch devel from geda-utils-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-utils/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Sep 2006 21:47:44 -0000 1.3 +++ .cvsignore 3 Nov 2006 20:16:58 -0000 1.4 @@ -1 +1 @@ -geda-utils-20060906.tar.gz +geda-utils-20061020.tar.gz Index: geda-utils.spec =================================================================== RCS file: /cvs/extras/rpms/geda-utils/devel/geda-utils.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geda-utils.spec 10 Sep 2006 21:47:44 -0000 1.2 +++ geda-utils.spec 3 Nov 2006 20:16:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: geda-utils -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Several utilities for the gEDA project Group: Applications/Engineering @@ -65,6 +65,9 @@ %{_datadir}/gEDA/docs/readmes/README* %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New Upstream Release + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 - Rebuild for FC-6 devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-utils/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Sep 2006 21:47:44 -0000 1.3 +++ sources 3 Nov 2006 20:16:58 -0000 1.4 @@ -1 +1 @@ -452326bae9bee19722da2627f0ea05d8 geda-utils-20060906.tar.gz +d54b7dc1e8c91dbc6aef94ee5dcf65a1 geda-utils-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:17:48 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:17:48 -0700 Subject: rpms/geda-symbols import.log,1.12,1.13 Message-ID: <200611032017.kA3KHmSf010011@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-symbols In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9792 Modified Files: import.log Log Message: auto-import geda-symbols-20061020-1 on branch devel from geda-symbols-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 3 Nov 2006 20:15:21 -0000 1.12 +++ import.log 3 Nov 2006 20:17:18 -0000 1.13 @@ -9,3 +9,4 @@ geda-symbols-20060906-2:HEAD:geda-symbols-20060906-2.src.rpm:1157924853 geda-symbols-20061020-1:FC-5:geda-symbols-20061020-1.src.rpm:1162585037 geda-symbols-20061020-1:FC-6:geda-symbols-20061020-1.src.rpm:1162585170 +geda-symbols-20061020-1:HEAD:geda-symbols-20061020-1.src.rpm:1162585288 From fedora-extras-commits at redhat.com Fri Nov 3 20:17:49 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:17:49 -0700 Subject: rpms/geda-symbols/devel .cvsignore, 1.4, 1.5 geda-symbols.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200611032017.kA3KHnrl010017@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-symbols/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9792/devel Modified Files: .cvsignore geda-symbols.spec sources Log Message: auto-import geda-symbols-20061020-1 on branch devel from geda-symbols-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:43:26 -0000 1.4 +++ .cvsignore 3 Nov 2006 20:17:19 -0000 1.5 @@ -1 +1 @@ -geda-symbols-20060906.tar.gz +geda-symbols-20061020.tar.gz Index: geda-symbols.spec =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/devel/geda-symbols.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geda-symbols.spec 10 Sep 2006 21:43:26 -0000 1.5 +++ geda-symbols.spec 3 Nov 2006 20:17:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: geda-symbols -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Electronic symbols for gEDA Group: Applications/Engineering @@ -63,6 +63,9 @@ %{_datadir}/gEDA/system-gafrc %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- New upstream release + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 - Rebuilt for FC-6 devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-symbols/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:43:26 -0000 1.4 +++ sources 3 Nov 2006 20:17:19 -0000 1.5 @@ -1 +1 @@ -43d938b2cfa45e039c69b1d7e00643d9 geda-symbols-20060906.tar.gz +0cc22d0d36c5f2f1c09aa82eb6d0edf6 geda-symbols-20061020.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 20:18:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 13:18:12 -0700 Subject: rpms/childsplay/FC-5 childsplay.desktop,1.1,1.2 Message-ID: <200611032018.kA3KICdu010080@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9939/FC-5 Modified Files: childsplay.desktop Log Message: add KidsGame to .desktop file catagories (bz 213890) Index: childsplay.desktop =================================================================== RCS file: /cvs/extras/rpms/childsplay/FC-5/childsplay.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay.desktop 11 May 2006 13:20:41 -0000 1.1 +++ childsplay.desktop 3 Nov 2006 20:17:41 -0000 1.2 @@ -8,5 +8,4 @@ Terminal=false StartupNotify=false Type=Application -Categories=Application;Game; -Version=0.81.8 +Categories=Application;Game;KidsGame; From fedora-extras-commits at redhat.com Fri Nov 3 20:18:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 13:18:12 -0700 Subject: rpms/childsplay/FC-6 childsplay.desktop,1.1,1.2 Message-ID: <200611032018.kA3KICqT010083@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9939/FC-6 Modified Files: childsplay.desktop Log Message: add KidsGame to .desktop file catagories (bz 213890) Index: childsplay.desktop =================================================================== RCS file: /cvs/extras/rpms/childsplay/FC-6/childsplay.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay.desktop 11 May 2006 13:20:41 -0000 1.1 +++ childsplay.desktop 3 Nov 2006 20:17:42 -0000 1.2 @@ -8,5 +8,4 @@ Terminal=false StartupNotify=false Type=Application -Categories=Application;Game; -Version=0.81.8 +Categories=Application;Game;KidsGame; From fedora-extras-commits at redhat.com Fri Nov 3 20:18:13 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 3 Nov 2006 13:18:13 -0700 Subject: rpms/childsplay/devel childsplay.desktop,1.1,1.2 Message-ID: <200611032018.kA3KIDSu010086@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/childsplay/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9939/devel Modified Files: childsplay.desktop Log Message: add KidsGame to .desktop file catagories (bz 213890) Index: childsplay.desktop =================================================================== RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- childsplay.desktop 11 May 2006 13:20:41 -0000 1.1 +++ childsplay.desktop 3 Nov 2006 20:17:43 -0000 1.2 @@ -8,5 +8,4 @@ Terminal=false StartupNotify=false Type=Application -Categories=Application;Game; -Version=0.81.8 +Categories=Application;Game;KidsGame; From fedora-extras-commits at redhat.com Fri Nov 3 20:43:00 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:43:00 -0700 Subject: rpms/kdmtheme import.log,1.3,1.4 Message-ID: <200611032043.kA3Kh02Z011689@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11641 Modified Files: import.log Log Message: auto-import kdmtheme-1.1.2-4 on branch FC-5 from kdmtheme-1.1.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 4 Sep 2006 22:43:14 -0000 1.3 +++ import.log 3 Nov 2006 20:42:30 -0000 1.4 @@ -1,2 +1,3 @@ kdmtheme-1_1_2-2:HEAD:kdmtheme-1.1.2-2.src.rpm:1156174278 kdmtheme-1_1_2-3:HEAD:kdmtheme-1.1.2-3.src.rpm:1157410021 +kdmtheme-1_1_2-4:FC-5:kdmtheme-1.1.2-4.src.rpm:1162586799 From fedora-extras-commits at redhat.com Fri Nov 3 20:43:01 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:43:01 -0700 Subject: rpms/kdmtheme/FC-5 kdmtheme.spec,1.1,1.2 Message-ID: <200611032043.kA3Kh1Ch011692@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11641/FC-5 Modified Files: kdmtheme.spec Log Message: auto-import kdmtheme-1.1.2-4 on branch FC-5 from kdmtheme-1.1.2-4.src.rpm Index: kdmtheme.spec =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/FC-5/kdmtheme.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kdmtheme.spec 21 Aug 2006 15:28:23 -0000 1.1 +++ kdmtheme.spec 3 Nov 2006 20:42:31 -0000 1.2 @@ -1,16 +1,16 @@ -Name: kdmtheme -Version: 1.1.2 -Release: 2%{?dist} -Summary: Theme Manager for KDM - -License: GPL -Group: User Interface/Desktops -URL: http://www.kde-look.org/content/show.php?content=22120 +Name: kdmtheme +Version: 1.1.2 +Release: 4%{?dist} +Summary: Theme Manager for KDM + +License: GPL +Group: User Interface/Desktops +URL: http://www.kde-look.org/content/show.php?content=22120 -Source0: http://beta.smileaf.org/files/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://beta.smileaf.org/files/%{name}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils, kdebase-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils, kdebase-devel Requires: kdebase %description @@ -28,24 +28,29 @@ --disable-warnings \ --disable-dependency-tracking \ --enable-final -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%{__rm} -rf %{buildroot} +%{__make} DESTDIR=%{buildroot} install + # Fix absolute symlink -rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common -ln -s ../common $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common +%{__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 -desktop-file-install --vendor fedora \ - --add-category X-Fedora \ - --add-category System \ - --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ - $RPM_BUILD_ROOT%{_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 $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) @@ -55,7 +60,17 @@ %{_libdir}/kde3/kcm_%{name}.so %{_docdir}/HTML/*/%{name}/ -%changelog + +%Changelog +* Fri Nov 03 2006 Chitlesh Goorah - 1.1.2-4 +- fixed proper kcmshell call + +* Tue Sep 05 2006 Chitlesh Goorah - 1.1.2-3 +- Rebuilt for FC6-devel + +* Tue Jun 13 2006 Chitlesh Goorah - 1.1.2-2 +- Minor fixes and removed useless BR + * Tue Jun 13 2006 Chitlesh Goorah - 1.1.2-1 - Corrected %%URL and %%configure From fedora-extras-commits at redhat.com Fri Nov 3 20:44:53 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:44:53 -0700 Subject: rpms/kdmtheme import.log,1.4,1.5 Message-ID: <200611032044.kA3Kireo011848@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11781 Modified Files: import.log Log Message: auto-import kdmtheme-1.1.2-4 on branch FC-6 from kdmtheme-1.1.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 3 Nov 2006 20:42:30 -0000 1.4 +++ import.log 3 Nov 2006 20:44:23 -0000 1.5 @@ -1,3 +1,4 @@ kdmtheme-1_1_2-2:HEAD:kdmtheme-1.1.2-2.src.rpm:1156174278 kdmtheme-1_1_2-3:HEAD:kdmtheme-1.1.2-3.src.rpm:1157410021 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 From fedora-extras-commits at redhat.com Fri Nov 3 20:44:54 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:44:54 -0700 Subject: rpms/kdmtheme/FC-6 kdmtheme.spec,1.2,1.3 Message-ID: <200611032044.kA3KisVK011851@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11781/FC-6 Modified Files: kdmtheme.spec Log Message: auto-import kdmtheme-1.1.2-4 on branch FC-6 from kdmtheme-1.1.2-4.src.rpm Index: kdmtheme.spec =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/FC-6/kdmtheme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdmtheme.spec 4 Sep 2006 22:43:15 -0000 1.2 +++ kdmtheme.spec 3 Nov 2006 20:44:24 -0000 1.3 @@ -1,6 +1,6 @@ Name: kdmtheme Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Theme Manager for KDM License: GPL @@ -28,7 +28,7 @@ --disable-warnings \ --disable-dependency-tracking \ --enable-final -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} @@ -45,6 +45,10 @@ --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} @@ -58,6 +62,9 @@ %Changelog +* Fri Nov 03 2006 Chitlesh Goorah - 1.1.2-4 +- fixed proper kcmshell call + * Tue Sep 05 2006 Chitlesh Goorah - 1.1.2-3 - Rebuilt for FC6-devel From fedora-extras-commits at redhat.com Fri Nov 3 20:48:05 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:48:05 -0700 Subject: rpms/kdmtheme import.log,1.5,1.6 Message-ID: <200611032048.kA3Km5Jw011955@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925 Modified Files: import.log Log Message: auto-import kdmtheme-1.1.2-4 on branch devel from kdmtheme-1.1.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Nov 2006 20:44:23 -0000 1.5 +++ import.log 3 Nov 2006 20:47:35 -0000 1.6 @@ -2,3 +2,4 @@ kdmtheme-1_1_2-3:HEAD:kdmtheme-1.1.2-3.src.rpm:1157410021 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 From fedora-extras-commits at redhat.com Fri Nov 3 20:48:06 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Fri, 3 Nov 2006 13:48:06 -0700 Subject: rpms/kdmtheme/devel kdmtheme.spec,1.2,1.3 Message-ID: <200611032048.kA3Km6s8011958@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/kdmtheme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925/devel Modified Files: kdmtheme.spec Log Message: auto-import kdmtheme-1.1.2-4 on branch devel from kdmtheme-1.1.2-4.src.rpm Index: kdmtheme.spec =================================================================== RCS file: /cvs/extras/rpms/kdmtheme/devel/kdmtheme.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kdmtheme.spec 4 Sep 2006 22:43:15 -0000 1.2 +++ kdmtheme.spec 3 Nov 2006 20:47:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: kdmtheme Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Theme Manager for KDM License: GPL @@ -28,7 +28,7 @@ --disable-warnings \ --disable-dependency-tracking \ --enable-final -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} @@ -45,6 +45,10 @@ --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} @@ -58,6 +62,9 @@ %Changelog +* Fri Nov 03 2006 Chitlesh Goorah - 1.1.2-4 +- fixed proper kcmshell call + * Tue Sep 05 2006 Chitlesh Goorah - 1.1.2-3 - Rebuilt for FC6-devel From fedora-extras-commits at redhat.com Fri Nov 3 20:55:09 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Fri, 3 Nov 2006 13:55:09 -0700 Subject: check-mirrors return-mirrorlist.py,1.18,1.19 Message-ID: <200611032055.kA3Kt9Bm012300@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/fedora/check-mirrors In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12282 Modified Files: return-mirrorlist.py Log Message: Added regular expression to take $ARCH out of the mirror list Index: return-mirrorlist.py =================================================================== RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- return-mirrorlist.py 26 Oct 2006 20:57:52 -0000 1.18 +++ return-mirrorlist.py 3 Nov 2006 20:55:06 -0000 1.19 @@ -29,6 +29,7 @@ import ConfigParser import cgi import sqlite +import re # prettier errors @@ -84,7 +85,7 @@ results = 0 for row in rows: for field in row: - print "%s" % field + print "%s" % re.sub('\$ARCH', self.arch, field) results = results + 1 if results == 0: From fedora-extras-commits at redhat.com Fri Nov 3 21:03:53 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 3 Nov 2006 14:03:53 -0700 Subject: rpms/mock/devel arch-specific-repo.patch, NONE, 1.1 mock.spec, 1.25, 1.26 Message-ID: <200611032103.kA3L3r9g015303@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15284 Modified Files: mock.spec Added Files: arch-specific-repo.patch Log Message: add patch to make mock repos arch specific arch-specific-repo.patch: --- NEW FILE arch-specific-repo.patch --- --- etc/fedora-4-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-ppc-core.cfg 2006-11-03 15:30:39.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 [local] name=local --- etc/fedora-5-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-i386-core.cfg 2006-11-03 15:43:12.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386 [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 [local] name=local --- etc/fedora-3-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-3-i386-core.cfg 2006-11-03 15:25:55.000000000 -0500 @@ -19,11 +19,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386 [groups] @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386 [local] name=local --- etc/fedora-5-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-x86_64-core.cfg 2006-11-03 15:46:11.000000000 -0500 @@ -21,11 +21,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64 [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64 [groups] name=groups @@ -33,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64 [local] name=local --- etc/fedora-5-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-ppc-core.cfg 2006-11-03 15:44:53.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc [local] name=local --- etc/fedora-6-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-x86_64-core.cfg 2006-11-03 15:50:34.000000000 -0500 @@ -21,7 +21,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64 + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64 [groups] name=groups @@ -29,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64 [local] name=local --- etc/fedora-devel-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-x86_64-core.cfg 2006-11-03 15:57:08.000000000 -0500 @@ -21,7 +21,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 [groups] name=groups @@ -29,7 +29,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64 [local] name=local --- etc/fedora-4-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-x86_64-core.cfg 2006-11-03 15:31:21.000000000 -0500 @@ -20,12 +20,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 [groups] name=groups @@ -33,6 +33,7 @@ [extras] name=extras +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 [local] --- etc/fedora-3-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-3-x86_64-core.cfg 2006-11-03 15:59:55.000000000 -0500 @@ -19,12 +19,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64 [local] name=local --- etc/fedora-devel-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-ppc-core.cfg 2006-11-03 15:56:39.000000000 -0500 @@ -20,7 +20,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc [groups] name=groups @@ -28,7 +28,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc [local] name=local --- etc/fedora-devel-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-i386-core.cfg 2006-11-03 15:55:54.000000000 -0500 @@ -20,7 +20,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 [groups] name=groups @@ -28,7 +28,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386 [local] name=local --- etc/fedora-4-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-i386-core.cfg 2006-11-03 15:29:44.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386 [groups] @@ -33,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386 [local] name=local --- etc/fedora-6-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-i386-core.cfg 2006-11-03 15:48:02.000000000 -0500 @@ -20,7 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386 + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386 [groups] name=groups @@ -28,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 [local] name=local --- etc/fedora-6-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-ppc-core.cfg 2006-11-03 15:49:06.000000000 -0500 @@ -20,7 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc [groups] name=groups @@ -28,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mock.spec 30 Oct 2006 21:29:50 -0000 1.25 +++ mock.spec 3 Nov 2006 21:03:23 -0000 1.26 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel +Patch0: arch-specific-repo.patch %description @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -73,6 +75,9 @@ %changelog +* Fri Nov 3 2006 Jesse Keating - 0.6.8-2 +- Add patch to fix repo files to use arch specific repos (#213516) + * Mon Oct 30 2006 Clark Williams - 0.6.8-1 - respun tarballs without buildsys rpms From fedora-extras-commits at redhat.com Fri Nov 3 21:13:00 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 3 Nov 2006 14:13:00 -0700 Subject: rpms/mock/FC-5 arch-specific-repo.patch, NONE, 1.1 mock.spec, 1.23, 1.24 Message-ID: <200611032113.kA3LD0H4015584@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15546/FC-5 Modified Files: mock.spec Added Files: arch-specific-repo.patch Log Message: Port devel changes back to FC-5 and FC-6 arch-specific-repo.patch: --- NEW FILE arch-specific-repo.patch --- --- etc/fedora-4-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-ppc-core.cfg 2006-11-03 15:30:39.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 [local] name=local --- etc/fedora-5-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-i386-core.cfg 2006-11-03 15:43:12.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386 [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 [local] name=local --- etc/fedora-3-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-3-i386-core.cfg 2006-11-03 15:25:55.000000000 -0500 @@ -19,11 +19,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386 [groups] @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386 [local] name=local --- etc/fedora-5-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-x86_64-core.cfg 2006-11-03 15:46:11.000000000 -0500 @@ -21,11 +21,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64 [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64 [groups] name=groups @@ -33,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64 [local] name=local --- etc/fedora-5-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-ppc-core.cfg 2006-11-03 15:44:53.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc [local] name=local --- etc/fedora-6-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-x86_64-core.cfg 2006-11-03 15:50:34.000000000 -0500 @@ -21,7 +21,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64 + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64 [groups] name=groups @@ -29,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64 [local] name=local --- etc/fedora-devel-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-x86_64-core.cfg 2006-11-03 15:57:08.000000000 -0500 @@ -21,7 +21,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 [groups] name=groups @@ -29,7 +29,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64 [local] name=local --- etc/fedora-4-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-x86_64-core.cfg 2006-11-03 15:31:21.000000000 -0500 @@ -20,12 +20,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 [groups] name=groups @@ -33,6 +33,7 @@ [extras] name=extras +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 [local] --- etc/fedora-3-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-3-x86_64-core.cfg 2006-11-03 15:59:55.000000000 -0500 @@ -19,12 +19,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64 [local] name=local --- etc/fedora-devel-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-ppc-core.cfg 2006-11-03 15:56:39.000000000 -0500 @@ -20,7 +20,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc [groups] name=groups @@ -28,7 +28,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc [local] name=local --- etc/fedora-devel-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-i386-core.cfg 2006-11-03 15:55:54.000000000 -0500 @@ -20,7 +20,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 [groups] name=groups @@ -28,7 +28,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386 [local] name=local --- etc/fedora-4-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-i386-core.cfg 2006-11-03 15:29:44.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386 [groups] @@ -33,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386 [local] name=local --- etc/fedora-6-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-i386-core.cfg 2006-11-03 15:48:02.000000000 -0500 @@ -20,7 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386 + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386 [groups] name=groups @@ -28,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 [local] name=local --- etc/fedora-6-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-ppc-core.cfg 2006-11-03 15:49:06.000000000 -0500 @@ -20,7 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc [groups] name=groups @@ -28,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mock.spec 30 Oct 2006 21:48:19 -0000 1.23 +++ mock.spec 3 Nov 2006 21:12:30 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel +Patch0: arch-specific-repo.patch %description @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -73,6 +75,9 @@ %changelog +* Fri Nov 3 2006 Jesse Keating - 0.6.8-2 +- Add patch to fix repo files to use arch specific repos (#213516) + * Mon Oct 30 2006 Clark Williams - 0.6.8-1 - respun tarballs without buildsys rpms From fedora-extras-commits at redhat.com Fri Nov 3 21:13:01 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Fri, 3 Nov 2006 14:13:01 -0700 Subject: rpms/mock/FC-6 arch-specific-repo.patch, NONE, 1.1 mock.spec, 1.24, 1.25 Message-ID: <200611032113.kA3LD1Gi015587@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15546/FC-6 Modified Files: mock.spec Added Files: arch-specific-repo.patch Log Message: Port devel changes back to FC-5 and FC-6 arch-specific-repo.patch: --- NEW FILE arch-specific-repo.patch --- --- etc/fedora-4-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-ppc-core.cfg 2006-11-03 15:30:39.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 [local] name=local --- etc/fedora-5-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-i386-core.cfg 2006-11-03 15:43:12.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386 [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 [local] name=local --- etc/fedora-3-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-3-i386-core.cfg 2006-11-03 15:25:55.000000000 -0500 @@ -19,11 +19,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386 [groups] @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386 [local] name=local --- etc/fedora-5-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-x86_64-core.cfg 2006-11-03 15:46:11.000000000 -0500 @@ -21,11 +21,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64 [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64 [groups] name=groups @@ -33,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64 [local] name=local --- etc/fedora-5-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-5-ppc-core.cfg 2006-11-03 15:44:53.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc [local] name=local --- etc/fedora-6-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-x86_64-core.cfg 2006-11-03 15:50:34.000000000 -0500 @@ -21,7 +21,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64 + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64 [groups] name=groups @@ -29,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64 [local] name=local --- etc/fedora-devel-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-x86_64-core.cfg 2006-11-03 15:57:08.000000000 -0500 @@ -21,7 +21,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 [groups] name=groups @@ -29,7 +29,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64 [local] name=local --- etc/fedora-4-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-x86_64-core.cfg 2006-11-03 15:31:21.000000000 -0500 @@ -20,12 +20,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 [groups] name=groups @@ -33,6 +33,7 @@ [extras] name=extras +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 [local] --- etc/fedora-3-x86_64-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-3-x86_64-core.cfg 2006-11-03 15:59:55.000000000 -0500 @@ -19,12 +19,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64 [groups] name=groups @@ -32,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64 [local] name=local --- etc/fedora-devel-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-ppc-core.cfg 2006-11-03 15:56:39.000000000 -0500 @@ -20,7 +20,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc [groups] name=groups @@ -28,7 +28,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc [local] name=local --- etc/fedora-devel-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-devel-i386-core.cfg 2006-11-03 15:55:54.000000000 -0500 @@ -20,7 +20,7 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 [groups] name=groups @@ -28,7 +28,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386 [local] name=local --- etc/fedora-4-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-4-i386-core.cfg 2006-11-03 15:29:44.000000000 -0500 @@ -20,11 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386 [groups] @@ -33,7 +33,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 +baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386 [local] name=local --- etc/fedora-6-i386-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-i386-core.cfg 2006-11-03 15:48:02.000000000 -0500 @@ -20,7 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386 + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386 [groups] name=groups @@ -28,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 [local] name=local --- etc/fedora-6-ppc-core.cfg.jk 2006-11-03 15:16:00.000000000 -0500 +++ etc/fedora-6-ppc-core.cfg 2006-11-03 15:49:06.000000000 -0500 @@ -20,7 +20,11 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc [groups] name=groups @@ -28,7 +32,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mock.spec 30 Oct 2006 21:48:20 -0000 1.24 +++ mock.spec 3 Nov 2006 21:12:31 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel +Patch0: arch-specific-repo.patch %description @@ -17,6 +18,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -73,6 +75,9 @@ %changelog +* Fri Nov 3 2006 Jesse Keating - 0.6.8-2 +- Add patch to fix repo files to use arch specific repos (#213516) + * Mon Oct 30 2006 Clark Williams - 0.6.8-1 - respun tarballs without buildsys rpms From fedora-extras-commits at redhat.com Fri Nov 3 21:32:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Nov 2006 14:32:54 -0700 Subject: rpms/perl-Net-SCP/devel perl-Net-SCP.spec,1.10,1.11 Message-ID: <200611032132.kA3LWs1q016479@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Net-SCP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16445 Modified Files: perl-Net-SCP.spec Log Message: Cleanup to more closely match cpanspec output. Index: perl-Net-SCP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SCP/devel/perl-Net-SCP.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Net-SCP.spec 28 Aug 2006 04:24:48 -0000 1.10 +++ perl-Net-SCP.spec 3 Nov 2006 21:32:23 -0000 1.11 @@ -1,62 +1,55 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Net-SCP Version: 0.07 -Release: 4%{dist} - +Release: 5%{?dist} Summary: Perl extension for secure copy protocol - License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-SCP/ -Source0: http://www.cpan.org/authors/id/I/IV/IVAN/Net-SCP-0.07.tar.gz +Source0: http://www.cpan.org/authors/id/I/IV/IVAN/Net-SCP-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch -BuildRequires: perl(Net::SSH), perl(String::ShellQuote) +BuildRequires: perl(Net::SSH) +BuildRequires: perl(String::ShellQuote) Requires: openssh-clients +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module implements a Perl interface to scp. - %prep %setup -q -n Net-SCP-%{version} chmod 644 Changes README SCP.pm - %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" - +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %install -rm -rf %{buildroot} -make install \ - PERL_INSTALL_ROOT=%{buildroot} \ - INSTALLARCHLIB=%{buildroot}%{perl_archlib} -find %{buildroot} -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* +rm -rf $RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -%check || : -make test +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/* -%clean -rm -rf %{buildroot} +%check +make test +%clean +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/Net -%{_mandir}/man3/*.3* - +%{perl_vendorlib}/* +%{_mandir}/man3/* %changelog +* Thu Nov 02 2006 Steven Pritchard 0.07-5 +- Cleanup to more closely match cpanspec output. + * Mon Aug 27 2006 Michael J. Knox - 0.07-4 - Rebuild for FC6 From fedora-extras-commits at redhat.com Fri Nov 3 21:38:54 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Nov 2006 14:38:54 -0700 Subject: rpms/perl-Archive-Extract/devel .cvsignore, 1.4, 1.5 perl-Archive-Extract.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200611032138.kA3Lcs0g016616@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Archive-Extract/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558 Modified Files: .cvsignore perl-Archive-Extract.spec sources Log Message: Update to 0.14. Use fixperms macro instead of our own chmod incantation. BR IPC::Cmd >= 0.29. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Aug 2006 21:43:00 -0000 1.4 +++ .cvsignore 3 Nov 2006 21:38:24 -0000 1.5 @@ -1 +1 @@ -Archive-Extract-0.12.tar.gz +Archive-Extract-0.14.tar.gz Index: perl-Archive-Extract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/perl-Archive-Extract.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Archive-Extract.spec 17 Sep 2006 22:38:27 -0000 1.4 +++ perl-Archive-Extract.spec 3 Nov 2006 21:38:24 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-Archive-Extract -Version: 0.12 -Release: 2%{?dist} +Version: 0.14 +Release: 1%{?dist} Summary: Generic archive extracting mechanism License: GPL or Artistic Group: Development/Libraries @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/K/KA/KANE/Archive-Extract-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(IPC::Cmd) >= 0.24 +BuildRequires: perl(IPC::Cmd) >= 0.29 BuildRequires: perl(Locale::Maketext::Simple) BuildRequires: perl(Module::Load::Conditional) >= 0.04 BuildRequires: perl(Params::Check) >= 0.07 @@ -32,7 +32,7 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%{_fixperms} $RPM_BUILD_ROOT/* %check make test @@ -47,6 +47,11 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Steven Pritchard 0.14-1 +- Update to 0.14. +- Use fixperms macro instead of our own chmod incantation. +- BR IPC::Cmd >= 0.29. + * Sun Sep 17 2006 Steven Pritchard 0.12-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Aug 2006 21:43:00 -0000 1.4 +++ sources 3 Nov 2006 21:38:24 -0000 1.5 @@ -1 +1 @@ -131e67f4356220e3cc279feb1ffd183a Archive-Extract-0.12.tar.gz +b25deb6aa5893c95cbe22d837ddd186c Archive-Extract-0.14.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 21:39:18 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 14:39:18 -0700 Subject: rpms/audacity/FC-6 .cvsignore, 1.3, 1.4 audacity-1.2.2-aboutdialog.patch, 1.1, 1.2 audacity.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200611032139.kA3LdIZc016654@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16595 Modified Files: .cvsignore audacity-1.2.2-aboutdialog.patch audacity.spec sources Log Message: new version 1.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Mar 2006 00:58:52 -0000 1.3 +++ .cvsignore 3 Nov 2006 21:38:47 -0000 1.4 @@ -1 +1 @@ -audacity-src-1.2.4b.tar.gz +audacity-src-1.2.5.tar.gz audacity-1.2.2-aboutdialog.patch: Index: audacity-1.2.2-aboutdialog.patch =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/audacity-1.2.2-aboutdialog.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- audacity-1.2.2-aboutdialog.patch 25 Nov 2004 00:01:49 -0000 1.1 +++ audacity-1.2.2-aboutdialog.patch 3 Nov 2006 21:38:47 -0000 1.2 @@ -1,15 +1,21 @@ -diff -Nur audacity-src-1.2.2-orig/src/AboutDialog.cpp audacity-src-1.2.2/src/AboutDialog.cpp ---- audacity-src-1.2.2-orig/src/AboutDialog.cpp 2004-08-26 05:27:33.000000000 +0200 -+++ audacity-src-1.2.2/src/AboutDialog.cpp 2004-05-03 19:14:36.000000000 +0200 -@@ -129,11 +125,9 @@ +--- audacity-src-1.2.5/src/AboutDialog.cpp.about 2006-11-03 22:05:02.000000000 +0100 ++++ audacity-src-1.2.5/src/AboutDialog.cpp 2006-11-03 22:06:22.000000000 +0100 +@@ -129,18 +129,9 @@ translatorCredits += _("translator_credits"); translatorCredits += ""; } - wxString localeStr = wxLocale::GetSystemEncodingName(); +- +- #if defined(__WXGTK__) && defined(wxUSE_UNICODE) && !wxCHECK_VERSION(2, 5, 0) +- // HTML Charsets are broken in wxGTK 2.4.x with unicode turned on +- wxString metaTag = ""; +- #else +- wxString metaTag = ""; +- #endif wxString creditStr = "" -- "" +- "" + metaTag + "" "" "" "

" Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- audacity.spec 27 Aug 2006 23:23:54 -0000 1.14 +++ audacity.spec 3 Nov 2006 21:38:47 -0000 1.15 @@ -1,21 +1,29 @@ -Name: audacity -Version: 1.2.4 -Release: 0.2.b%{?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.2.4b.tar.gz -Source1: audacity.png -Patch1: audacity-1.2.2-aboutdialog.patch -Patch2: audacity-1.2.3-gcc41.patch -Patch3: audacity-1.2.4b-missing-pango.patch +Name: audacity +Version: 1.2.5 +Release: 1%{?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.2.5.tar.gz +Source1: audacity.png +Patch1: audacity-1.2.2-aboutdialog.patch +Patch2: audacity-1.2.3-gcc41.patch +Patch3: audacity-1.2.4b-missing-pango.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libogg-devel, libvorbis-devel, zlib-devel, perl -BuildRequires: gettext, zip, flac-devel, ladspa-devel -BuildRequires: libsamplerate-devel, libsndfile-devel -BuildRequires: libid3tag-devel, desktop-file-utils +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: zlib-devel +BuildRequires: perl +BuildRequires: gettext +BuildRequires: zip +BuildRequires: flac-devel +BuildRequires: ladspa-devel +BuildRequires: libsamplerate-devel +BuildRequires: libsndfile-devel +BuildRequires: libid3tag-devel +BuildRequires: desktop-file-utils %{?_with_mp3:BuildRequires: libmad-devel} %{?_with_gtk2:BuildRequires: compat-wxGTK2-devel} %{!?_with_gtk2:BuildRequires: compat-wxGTK-devel} @@ -39,9 +47,9 @@ Linux/*BSD, MacOS, and Windows. %prep -%setup -q -n %{name}-src-%{version}b +%setup -q -n %{name}-src-%{version} %patch1 -p1 -b .aboutdialog -%patch2 -p1 -b .gcc4 +#%patch2 -p1 -b .gcc4 %{?_with_gtk2: %patch3 -p1 -b .missing-pango } cp -a src/Languages.cpp src/Languages.cpp.orig iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp @@ -111,6 +119,9 @@ %doc %{_datadir}/doc/* %changelog +* Fri Nov 3 2006 Gerard Milmeister - 1.2.5-1 +- new version 1.2.5 + * Mon Aug 28 2006 Gerard Milmeister - 1.2.4-0.2.b - Rebuild for FE6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Mar 2006 00:58:52 -0000 1.5 +++ sources 3 Nov 2006 21:38:47 -0000 1.6 @@ -1 +1 @@ -37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz +7558373bee9fd4e7195901b9c0a747f1 audacity-src-1.2.5.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 21:43:03 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 14:43:03 -0700 Subject: rpms/audacity/devel .cvsignore, 1.3, 1.4 audacity-1.2.2-aboutdialog.patch, 1.1, 1.2 audacity.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200611032143.kA3Lh3Fh016772@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16717/devel Modified Files: .cvsignore audacity-1.2.2-aboutdialog.patch audacity.spec sources Log Message: new version 1.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Mar 2006 00:58:52 -0000 1.3 +++ .cvsignore 3 Nov 2006 21:42:32 -0000 1.4 @@ -1 +1 @@ -audacity-src-1.2.4b.tar.gz +audacity-src-1.2.5.tar.gz audacity-1.2.2-aboutdialog.patch: Index: audacity-1.2.2-aboutdialog.patch =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity-1.2.2-aboutdialog.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- audacity-1.2.2-aboutdialog.patch 25 Nov 2004 00:01:49 -0000 1.1 +++ audacity-1.2.2-aboutdialog.patch 3 Nov 2006 21:42:32 -0000 1.2 @@ -1,15 +1,21 @@ -diff -Nur audacity-src-1.2.2-orig/src/AboutDialog.cpp audacity-src-1.2.2/src/AboutDialog.cpp ---- audacity-src-1.2.2-orig/src/AboutDialog.cpp 2004-08-26 05:27:33.000000000 +0200 -+++ audacity-src-1.2.2/src/AboutDialog.cpp 2004-05-03 19:14:36.000000000 +0200 -@@ -129,11 +125,9 @@ +--- audacity-src-1.2.5/src/AboutDialog.cpp.about 2006-11-03 22:05:02.000000000 +0100 ++++ audacity-src-1.2.5/src/AboutDialog.cpp 2006-11-03 22:06:22.000000000 +0100 +@@ -129,18 +129,9 @@ translatorCredits += _("translator_credits"); translatorCredits += "
"; } - wxString localeStr = wxLocale::GetSystemEncodingName(); +- +- #if defined(__WXGTK__) && defined(wxUSE_UNICODE) && !wxCHECK_VERSION(2, 5, 0) +- // HTML Charsets are broken in wxGTK 2.4.x with unicode turned on +- wxString metaTag = ""; +- #else +- wxString metaTag = ""; +- #endif wxString creditStr = "" -- "" +- "" + metaTag + "" "" "" "
" Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- audacity.spec 27 Aug 2006 23:23:54 -0000 1.14 +++ audacity.spec 3 Nov 2006 21:42:32 -0000 1.15 @@ -1,21 +1,29 @@ -Name: audacity -Version: 1.2.4 -Release: 0.2.b%{?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.2.4b.tar.gz -Source1: audacity.png -Patch1: audacity-1.2.2-aboutdialog.patch -Patch2: audacity-1.2.3-gcc41.patch -Patch3: audacity-1.2.4b-missing-pango.patch +Name: audacity +Version: 1.2.5 +Release: 1%{?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.2.5.tar.gz +Source1: audacity.png +Patch1: audacity-1.2.2-aboutdialog.patch +Patch2: audacity-1.2.3-gcc41.patch +Patch3: audacity-1.2.4b-missing-pango.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libogg-devel, libvorbis-devel, zlib-devel, perl -BuildRequires: gettext, zip, flac-devel, ladspa-devel -BuildRequires: libsamplerate-devel, libsndfile-devel -BuildRequires: libid3tag-devel, desktop-file-utils +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: zlib-devel +BuildRequires: perl +BuildRequires: gettext +BuildRequires: zip +BuildRequires: flac-devel +BuildRequires: ladspa-devel +BuildRequires: libsamplerate-devel +BuildRequires: libsndfile-devel +BuildRequires: libid3tag-devel +BuildRequires: desktop-file-utils %{?_with_mp3:BuildRequires: libmad-devel} %{?_with_gtk2:BuildRequires: compat-wxGTK2-devel} %{!?_with_gtk2:BuildRequires: compat-wxGTK-devel} @@ -39,9 +47,9 @@ Linux/*BSD, MacOS, and Windows. %prep -%setup -q -n %{name}-src-%{version}b +%setup -q -n %{name}-src-%{version} %patch1 -p1 -b .aboutdialog -%patch2 -p1 -b .gcc4 +#%patch2 -p1 -b .gcc4 %{?_with_gtk2: %patch3 -p1 -b .missing-pango } cp -a src/Languages.cpp src/Languages.cpp.orig iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp @@ -111,6 +119,9 @@ %doc %{_datadir}/doc/* %changelog +* Fri Nov 3 2006 Gerard Milmeister - 1.2.5-1 +- new version 1.2.5 + * Mon Aug 28 2006 Gerard Milmeister - 1.2.4-0.2.b - Rebuild for FE6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Mar 2006 00:58:52 -0000 1.5 +++ sources 3 Nov 2006 21:42:32 -0000 1.6 @@ -1 +1 @@ -37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz +7558373bee9fd4e7195901b9c0a747f1 audacity-src-1.2.5.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 21:43:02 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 14:43:02 -0700 Subject: rpms/audacity/FC-5 .cvsignore, 1.4, 1.5 audacity-1.2.2-aboutdialog.patch, 1.1, 1.2 audacity.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200611032143.kA3Lh27H016763@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16717/FC-5 Modified Files: .cvsignore audacity-1.2.2-aboutdialog.patch audacity.spec sources Log Message: new version 1.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Mar 2006 21:49:32 -0000 1.4 +++ .cvsignore 3 Nov 2006 21:42:31 -0000 1.5 @@ -1 +1 @@ -audacity-src-1.3.0b.tar.gz +audacity-src-1.2.5.tar.gz audacity-1.2.2-aboutdialog.patch: Index: audacity-1.2.2-aboutdialog.patch =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/audacity-1.2.2-aboutdialog.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- audacity-1.2.2-aboutdialog.patch 25 Nov 2004 00:01:49 -0000 1.1 +++ audacity-1.2.2-aboutdialog.patch 3 Nov 2006 21:42:31 -0000 1.2 @@ -1,15 +1,21 @@ -diff -Nur audacity-src-1.2.2-orig/src/AboutDialog.cpp audacity-src-1.2.2/src/AboutDialog.cpp ---- audacity-src-1.2.2-orig/src/AboutDialog.cpp 2004-08-26 05:27:33.000000000 +0200 -+++ audacity-src-1.2.2/src/AboutDialog.cpp 2004-05-03 19:14:36.000000000 +0200 -@@ -129,11 +125,9 @@ +--- audacity-src-1.2.5/src/AboutDialog.cpp.about 2006-11-03 22:05:02.000000000 +0100 ++++ audacity-src-1.2.5/src/AboutDialog.cpp 2006-11-03 22:06:22.000000000 +0100 +@@ -129,18 +129,9 @@ translatorCredits += _("translator_credits"); translatorCredits += "
"; } - wxString localeStr = wxLocale::GetSystemEncodingName(); +- +- #if defined(__WXGTK__) && defined(wxUSE_UNICODE) && !wxCHECK_VERSION(2, 5, 0) +- // HTML Charsets are broken in wxGTK 2.4.x with unicode turned on +- wxString metaTag = ""; +- #else +- wxString metaTag = ""; +- #endif wxString creditStr = "" -- "" +- "" + metaTag + "" "" "" "
" Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- audacity.spec 26 Mar 2006 21:49:32 -0000 1.14 +++ audacity.spec 3 Nov 2006 21:42:31 -0000 1.15 @@ -1,44 +1,43 @@ -Name: audacity -Version: 1.3.0 -Release: 1.beta.1%{?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.0b.tar.gz -Source1: audacity.png -#Patch1: audacity-1.2.2-aboutdialog.patch -#Patch2: audacity-1.2.3-gcc41.patch -#Patch3: audacity-1.2.4b-missing-pango.patch -Patch4: audacity-1.3.0b-gcc41.patch -Patch5: audacity-1.3.0b-lsrver.patch -Patch6: audacity-1.3.0b-install.patch +Name: audacity +Version: 1.2.5 +Release: 1%{?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.2.5.tar.gz +Source1: audacity.png +Patch1: audacity-1.2.2-aboutdialog.patch +Patch2: audacity-1.2.3-gcc41.patch +Patch3: audacity-1.2.4b-missing-pango.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel -BuildRequires: libvorbis-devel -BuildRequires: zlib-devel -BuildRequires: perl +BuildRequires: libvorbis-devel +BuildRequires: zlib-devel +BuildRequires: perl BuildRequires: gettext -BuildRequires: zip -BuildRequires: flac-devel -BuildRequires: ladspa-devel +BuildRequires: zip +BuildRequires: flac-devel +BuildRequires: ladspa-devel BuildRequires: libsamplerate-devel -BuildRequires: libsndfile-devel +BuildRequires: libsndfile-devel BuildRequires: libid3tag-devel -BuildRequires: desktop-file-utils -BuildRequires: wxGTK-devel >= 2.6.2 +BuildRequires: desktop-file-utils %{?_with_mp3:BuildRequires: libmad-devel} +%{?_with_gtk2:BuildRequires: compat-wxGTK2-devel} +%{!?_with_gtk2:BuildRequires: compat-wxGTK-devel} # libwx_gtk2-2.4.so: undefined reference to `pango_x_get_context' -#%{?_with_gtk2: BuildRequires: pango-devel} -Requires(post): desktop-file-utils, shared-mime-info -Requires(postun): desktop-file-utils, shared-mime-info +%{?_with_gtk2: BuildRequires: pango-devel} +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils # Compile options: # --with mp3 : enable mp3 support # --with gtk2 : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version # --with portaudiov19 : enable version 19 of portaudio (disables portmixer) + %description Audacity is a cross-platform multitrack audio editor. It allows you to record sounds directly or to import Ogg, WAV, AIFF, AU, IRCAM, or MP3 @@ -47,46 +46,28 @@ and the audio I/O currently uses OSS under Linux. Audacity runs on Linux/*BSD, MacOS, and Windows. - %prep -%setup -q -n %{name}-src-%{version}b-beta -#%patch1 -p1 -b .aboutdialog +%setup -q -n %{name}-src-%{version} +%patch1 -p1 -b .aboutdialog #%patch2 -p1 -b .gcc4 -#%{?_with_gtk2: %patch3 -p1 -b .missing-pango } -%patch4 -p1 -b .gcc41 -%patch5 -p1 -b .lsrver -%patch6 -p1 -b .install - -# convert Languages.cpp from latin1 to UTF-8 +%{?_with_gtk2: %patch3 -p1 -b .missing-pango } cp -a src/Languages.cpp src/Languages.cpp.orig iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp - -# is this still necessary? for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp do perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i done - %build # Push a softlink into PATH so the renamed wx-config inside # the compat-wxGTK2-devel package is found and taken. -#%define mybindir __mybin__ -#mkdir %{mybindir} -#ln -s $(which wx-2.4-config) %{mybindir}/wx-config -#export PATH=$(pwd)/%{mybindir}:$PATH - -%configure \ - --with-help \ - --with-libsndfile=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 +%define mybindir __mybin__ +mkdir %{mybindir} +ln -s $(which wx-2.4-config) %{mybindir}/wx-config +export PATH=$(pwd)/%{mybindir}:$PATH +%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} +make %install rm -rf ${RPM_BUILD_ROOT} @@ -105,7 +86,7 @@ Comment=A multitrack audio editor Encoding=UTF-8 X-Desktop-File-Install-Version=0.4 -MimeType=application/ogg;application/x-ogg;audio/x-ogg;audio/x-wav;audio/x-flac;audio/aiff;audio/x-aifc;audio/aiffc;audio/x-aiff;audio/basic;application/x-audacity-project +MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg StartupWMClass=Audacity EOF @@ -122,17 +103,12 @@ %clean rm -rf ${RPM_BUILD_ROOT} - %post -/usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1 || : /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || : - %postun -/usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1 || : /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || : - %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/* @@ -140,13 +116,11 @@ %{_mandir}/*/* %{_datadir}/applications/* %{_datadir}/pixmaps/* -%{_datadir}/mime/packages/* %doc %{_datadir}/doc/* - %changelog -* Sun Mar 26 2006 Gerard Milmeister - 1.3.0-1.beta.1 -- new version 1.3.0beta +* Fri Nov 3 2006 Gerard Milmeister - 1.2.5-1 +- new version 1.2.5 * Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b - Update to 1.2.4b (stable release). Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Mar 2006 21:49:32 -0000 1.6 +++ sources 3 Nov 2006 21:42:31 -0000 1.7 @@ -1 +1 @@ -d1c5a3359ad95eab6ca8b375972c1a91 audacity-src-1.3.0b.tar.gz +7558373bee9fd4e7195901b9c0a747f1 audacity-src-1.2.5.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 21:52:21 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 14:52:21 -0700 Subject: rpms/audacity/FC-6 audacity.spec,1.15,1.16 Message-ID: <200611032152.kA3LqLFt016916@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895 Modified Files: audacity.spec Log Message: Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- audacity.spec 3 Nov 2006 21:38:47 -0000 1.15 +++ audacity.spec 3 Nov 2006 21:51:51 -0000 1.16 @@ -1,6 +1,6 @@ Name: audacity Version: 1.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -57,6 +57,10 @@ do perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i done +%ifarch ppc ppc64 +# this flag is not available on ppc +perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.* +%endif %build # Push a softlink into PATH so the renamed wx-config inside @@ -119,6 +123,9 @@ %doc %{_datadir}/doc/* %changelog +* Fri Nov 3 2006 Gerard Milmeister - 1.2.5-2 +- remove -msse flag for ppc + * Fri Nov 3 2006 Gerard Milmeister - 1.2.5-1 - new version 1.2.5 From fedora-extras-commits at redhat.com Fri Nov 3 22:09:06 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 15:09:06 -0700 Subject: rpms/audacity/devel audacity.spec,1.15,1.16 Message-ID: <200611032209.kA3M96PA020085@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20064/devel Modified Files: audacity.spec Log Message: Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- audacity.spec 3 Nov 2006 21:42:32 -0000 1.15 +++ audacity.spec 3 Nov 2006 22:08:35 -0000 1.16 @@ -1,6 +1,6 @@ Name: audacity Version: 1.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -57,6 +57,10 @@ do perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i done +%ifarch ppc ppc64 +# this flag is not available on ppc +perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.* +%endif %build # Push a softlink into PATH so the renamed wx-config inside @@ -119,6 +123,9 @@ %doc %{_datadir}/doc/* %changelog +* Fri Nov 3 2006 Gerard Milmeister - 1.2.5-2 +- remove -msse flag for ppc + * Fri Nov 3 2006 Gerard Milmeister - 1.2.5-1 - new version 1.2.5 From fedora-extras-commits at redhat.com Fri Nov 3 22:12:54 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Fri, 3 Nov 2006 15:12:54 -0700 Subject: rpms/audacity/FC-5 audacity.spec,1.15,1.16 Message-ID: <200611032212.kA3MCs4Z020212@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20173 Modified Files: audacity.spec Log Message: Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- audacity.spec 3 Nov 2006 21:42:31 -0000 1.15 +++ audacity.spec 3 Nov 2006 22:12:24 -0000 1.16 @@ -1,6 +1,6 @@ Name: audacity Version: 1.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -57,6 +57,10 @@ do perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i done +%ifarch ppc ppc64 +# this flag is not available on ppc +perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.* +%endif %build # Push a softlink into PATH so the renamed wx-config inside @@ -119,6 +123,9 @@ %doc %{_datadir}/doc/* %changelog +* Fri Nov 3 2006 Gerard Milmeister - 1.2.5-2 +- remove -msse flag for ppc + * Fri Nov 3 2006 Gerard Milmeister - 1.2.5-1 - new version 1.2.5 From fedora-extras-commits at redhat.com Fri Nov 3 22:13:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Nov 2006 15:13:45 -0700 Subject: rpms/perl-DateTime/devel DateTime-LeapSecond-utf8.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 perl-DateTime.spec, 1.10, 1.11 sources, 1.10, 1.11 Message-ID: <200611032213.kA3MDjEQ020283@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-DateTime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20211 Modified Files: .cvsignore perl-DateTime.spec sources Added Files: DateTime-LeapSecond-utf8.patch Log Message: Update to DateTime 0.35. Update to DateTime::Locale 0.3101. LICENSE.icu seems to have been renamed LICENSE.cldr. Update to DateTime::TimeZone 0.54. Use fixperms macro instead of our own chmod incantation. Convert DateTime::LeapSecond to UTF-8 to avoid a rpmlint warning. DateTime-LeapSecond-utf8.patch: --- NEW FILE DateTime-LeapSecond-utf8.patch --- --- DateTime-0.35/lib/DateTime/LeapSecond.pm.orig 2006-02-28 19:15:01.000000000 -0600 +++ DateTime-0.35/lib/DateTime/LeapSecond.pm 2006-11-03 15:53:44.000000000 -0600 @@ -159,11 +159,11 @@ =head1 AUTHOR -Fl?vio Soibelmann Glock, Efglock at pucrs.brE +Fl??vio Soibelmann Glock, Efglock at pucrs.brE =head1 COPYRIGHT -Copyright (c) 2003 Fl?vio Soibelmann Glock. Copyright (c) 2004-2006 +Copyright (c) 2003 Fl??vio Soibelmann Glock. Copyright (c) 2004-2006 David Rolsky. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 29 Aug 2006 23:23:54 -0000 1.10 +++ .cvsignore 3 Nov 2006 22:13:14 -0000 1.11 @@ -1,3 +1,3 @@ -DateTime-0.34.tar.gz -DateTime-Locale-0.22.tar.gz -DateTime-TimeZone-0.48.tar.gz +DateTime-0.35.tar.gz +DateTime-Locale-0.3101.tar.gz +DateTime-TimeZone-0.54.tar.gz Index: perl-DateTime.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/perl-DateTime.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-DateTime.spec 29 Aug 2006 23:23:54 -0000 1.10 +++ perl-DateTime.spec 3 Nov 2006 22:13:14 -0000 1.11 @@ -1,9 +1,9 @@ -%define DTTimeZone_version 0.48 -%define DTLocale_version 0.22 +%define DTTimeZone_version 0.54 +%define DTLocale_version 0.3101 Name: perl-DateTime -Version: 0.34 -Release: 3%{?dist} +Version: 0.35 +Release: 1%{?dist} Epoch: 1 Summary: Date and time objects License: GPL or Artistic @@ -12,6 +12,7 @@ Source0: http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-%{version}.tar.gz Source1: http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-%{DTTimeZone_version}.tar.gz Source2: http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-%{DTLocale_version}.tar.gz +Patch0: DateTime-LeapSecond-utf8.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Module::Build) BuildRequires: perl(Params::Validate) >= 0.76 @@ -42,6 +43,10 @@ %setup -q -T -D -n DateTimeBundle -a 1 %setup -q -T -D -n DateTimeBundle -a 2 +cd DateTime-%{version} +%patch0 -p1 +cd - + cat > filter-provides.sh << EOF #!/bin/sh # Remove redundant unversioned provides of perl(DateTime) and perl(DateTime::TimeZone) @@ -88,12 +93,12 @@ find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \; find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; -chmod -R u+rwX,go+rX,go-w %{buildroot}/* +%{_fixperms} %{buildroot}/* # Move documentation into bundle area mkdir DT::Locale DT::TimeZone mv DateTime-%{version}/{CREDITS,Changes,LICENSE,README,TODO} . -mv DateTime-Locale-%{DTLocale_version}/{Changes,LICENSE.icu} DT::Locale +mv DateTime-Locale-%{DTLocale_version}/{Changes,LICENSE.cldr} DT::Locale mv DateTime-TimeZone-%{DTTimeZone_version}/{Changes,README} DT::TimeZone %check @@ -129,6 +134,14 @@ %{perl_vendorarch}/DateTime*.pm %changelog +* Fri Nov 03 2006 Steven Pritchard 1:0.35-1 +- Update to DateTime 0.35. +- Update to DateTime::Locale 0.3101. +- LICENSE.icu seems to have been renamed LICENSE.cldr. +- Update to DateTime::TimeZone 0.54. +- Use fixperms macro instead of our own chmod incantation. +- Convert DateTime::LeapSecond to UTF-8 to avoid a rpmlint warning. + * Tue Aug 29 2006 Steven Pritchard 1:0.34-3 - Update to DateTime::TimeZone 0.48. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DateTime/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 29 Aug 2006 23:23:54 -0000 1.10 +++ sources 3 Nov 2006 22:13:14 -0000 1.11 @@ -1,3 +1,3 @@ -71285d93eba0f92e3285a9e011fc33e1 DateTime-0.34.tar.gz -bcf9fa78efa8d00fad1293b9d860ce75 DateTime-Locale-0.22.tar.gz -5c23bc4002a2b67585fd9fa24a3514e3 DateTime-TimeZone-0.48.tar.gz +3734eafb22059c1ad706edfee66036fd DateTime-0.35.tar.gz +1c2b7b145c4f321c61f2cf32a625e942 DateTime-Locale-0.3101.tar.gz +37bf508b02d941eef2a8bf2990dcca48 DateTime-TimeZone-0.54.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 22:37:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Nov 2006 15:37:19 -0700 Subject: rpms/perl-IPC-Cmd/devel .cvsignore, 1.4, 1.5 perl-IPC-Cmd.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200611032237.kA3MbJ1Q020624@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IPC-Cmd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20599 Modified Files: .cvsignore perl-IPC-Cmd.spec sources Log Message: Update to 0.34. Explicitly BR Params::Check >= 0.20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Oct 2006 20:35:15 -0000 1.4 +++ .cvsignore 3 Nov 2006 22:36:49 -0000 1.5 @@ -1 +1 @@ -IPC-Cmd-0.32.tar.gz +IPC-Cmd-0.34.tar.gz Index: perl-IPC-Cmd.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/perl-IPC-Cmd.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IPC-Cmd.spec 17 Oct 2006 20:35:15 -0000 1.3 +++ perl-IPC-Cmd.spec 3 Nov 2006 22:36:49 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-IPC-Cmd -Version: 0.32 +Version: 0.34 Release: 1%{?dist} Summary: Finding and running system commands made easy License: GPL or Artistic @@ -10,7 +10,7 @@ BuildArch: noarch BuildRequires: perl(Locale::Maketext::Simple) BuildRequires: perl(Module::Load::Conditional) -BuildRequires: perl(Params::Check) +BuildRequires: perl(Params::Check) >= 0.20 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -47,6 +47,10 @@ %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Steven Pritchard 0.34-1 +- Update to 0.34. +- Explicitly BR Params::Check >= 0.20. + * Tue Oct 17 2006 Steven Pritchard 0.32-1 - Update to 0.32. - Use fixperms macro instead of our own chmod incantation. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Oct 2006 20:35:15 -0000 1.4 +++ sources 3 Nov 2006 22:36:49 -0000 1.5 @@ -1 +1 @@ -4a9828ce6bd63fedba46bca124743850 IPC-Cmd-0.32.tar.gz +cfd848ecb76e2a71757f74501396dd48 IPC-Cmd-0.34.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 22:40:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Nov 2006 15:40:50 -0700 Subject: rpms/perl-Term-UI/devel .cvsignore, 1.2, 1.3 perl-Term-UI.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611032240.kA3MeoKI020731@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Term-UI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20705 Modified Files: .cvsignore perl-Term-UI.spec sources Log Message: Update to 0.14. Use fixperms macro instead of our own chmod incantation. Include CHANGES in docs. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Term-UI/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Apr 2006 23:14:31 -0000 1.2 +++ .cvsignore 3 Nov 2006 22:40:19 -0000 1.3 @@ -1 +1 @@ -Term-UI-0.12.tar.gz +Term-UI-0.14.tar.gz Index: perl-Term-UI.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Term-UI/devel/perl-Term-UI.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Term-UI.spec 17 Sep 2006 22:26:21 -0000 1.2 +++ perl-Term-UI.spec 3 Nov 2006 22:40:19 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Term-UI -Version: 0.12 -Release: 2%{?dist} +Version: 0.14 +Release: 1%{?dist} Summary: Term::ReadLine UI made easy License: GPL or Artistic Group: Development/Libraries @@ -34,7 +34,7 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* +%{_fixperms} $RPM_BUILD_ROOT/* %check make test @@ -44,11 +44,16 @@ %files %defattr(-,root,root,-) -%doc README +%doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Nov 03 2006 Steven Pritchard 0.14-1 +- Update to 0.14. +- Use fixperms macro instead of our own chmod incantation. +- Include CHANGES in docs. + * Sat Sep 16 2006 Steven Pritchard 0.12-2 - Fix find option order. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Term-UI/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Apr 2006 23:14:31 -0000 1.2 +++ sources 3 Nov 2006 22:40:19 -0000 1.3 @@ -1 +1 @@ -b34442df078685f3e8b1197e1e98d1e6 Term-UI-0.12.tar.gz +a929235d67c718af3d1d431987796cd8 Term-UI-0.14.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 22:47:11 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 3 Nov 2006 15:47:11 -0700 Subject: rpms/perl-Apache-LogRegex/devel perl-Apache-LogRegex.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611032247.kA3MlBL0020859@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Apache-LogRegex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20839 Modified Files: perl-Apache-LogRegex.spec sources Log Message: Update to 1.4. Cleanup to more closely match cpanspec output. Index: perl-Apache-LogRegex.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/devel/perl-Apache-LogRegex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Apache-LogRegex.spec 26 Sep 2006 21:23:57 -0000 1.2 +++ perl-Apache-LogRegex.spec 3 Nov 2006 22:46:41 -0000 1.3 @@ -1,14 +1,12 @@ Name: perl-Apache-LogRegex -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Parse a line from an Apache logfile into a hash - -Group: Development/Libraries License: GPL or Artistic +Group: Development/Libraries URL: http://search.cpan.org/dist/Apache-LogRegex/ -Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PETERHI/Apache-LogRegex-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/P/PE/PETERHI/Apache-LogRegex-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -20,38 +18,38 @@ %prep %setup -q -n Apache-LogRegex-%{version} -perldoc -t perlartistic > Artistic -perldoc -t perlgpl > COPYING - %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 ';' -chmod -R u+w $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 README Artistic COPYING -%{perl_vendorlib}/Apache/ -%{_mandir}/man3/*.3* +%doc README +%{perl_vendorlib}/* +%{_mandir}/man3/* %changelog +* Mon Oct 30 2006 Steven Pritchard 1.4-1 +- Update to 1.4. +- Cleanup to more closely match cpanspec output. + * Tue Sep 26 2006 Steven Pritchard 1.3-1 - Update to 1.3. - Fix find option order. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2006 21:23:57 -0000 1.2 +++ sources 3 Nov 2006 22:46:41 -0000 1.3 @@ -1 +1 @@ -c45cbbf57fcd6aed4b5e745654530734 Apache-LogRegex-1.3.tar.gz +512fb013427ef3d1246f6d23fece5870 Apache-LogRegex-1.4.tar.gz From fedora-extras-commits at redhat.com Fri Nov 3 23:52:46 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 3 Nov 2006 16:52:46 -0700 Subject: rpms/raptor/devel raptor.spec,1.6,1.7 Message-ID: <200611032352.kA3NqkR7025010@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/raptor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24990 Modified Files: raptor.spec Log Message: Increment revision. Rebuild for new libcurl. Index: raptor.spec =================================================================== RCS file: /cvs/extras/rpms/raptor/devel/raptor.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- raptor.spec 4 Oct 2006 22:52:43 -0000 1.6 +++ raptor.spec 3 Nov 2006 23:52:16 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Raptor RDF Parser Toolkit for Redland Name: raptor Version: 1.4.9 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL or Apache License Version 2.0 Group: System Environment/Libraries Source: http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.9.tar.gz @@ -70,6 +70,9 @@ %{_bindir}/raptor-config %changelog +* Fri Nov 3 2006 Anthony Green 1.4.9-6 +- Rebuild for new libcurl. + * Thu Oct 05 2006 Christian Iseli 1.4.9-5 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-extras-commits at redhat.com Sat Nov 4 01:21:46 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:21:46 -0700 Subject: rpms/SoQt/devel .cvsignore, 1.6, 1.7 SoQt.spec, 1.18, 1.19 sources, 1.6, 1.7 Message-ID: <200611040121.kA41Lkvj031519@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31497/devel Modified Files: .cvsignore SoQt.spec sources Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Sep 2006 03:55:56 -0000 1.6 +++ .cvsignore 4 Nov 2006 01:21:15 -0000 1.7 @@ -1 +1 @@ -SoQt-1.4.0.tar.gz +SoQt-1.4.1.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- SoQt.spec 8 Sep 2006 03:55:56 -0000 1.18 +++ SoQt.spec 4 Nov 2006 01:21:15 -0000 1.19 @@ -3,7 +3,7 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: GPL @@ -94,6 +94,9 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 +- Upstream update. + * Tue Sep 08 2006 Ralf Cors??pius - 1.4.0-1 - Upstream update. - Add utf-8/doxygen hack. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Sep 2006 03:55:56 -0000 1.6 +++ sources 4 Nov 2006 01:21:15 -0000 1.7 @@ -1 +1 @@ -b1209e7a2ab1c598d72d1bc364ce5ce5 SoQt-1.4.0.tar.gz +6dddafb755e9afb9924da1d46f3cd0d4 SoQt-1.4.1.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 01:22:24 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:22:24 -0700 Subject: rpms/SoQt/FC-6 .cvsignore, 1.6, 1.7 SoQt.spec, 1.18, 1.19 sources, 1.6, 1.7 Message-ID: <200611040122.kA41MO05031545@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31525/FC-6 Modified Files: .cvsignore SoQt.spec sources Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Sep 2006 03:55:56 -0000 1.6 +++ .cvsignore 4 Nov 2006 01:21:53 -0000 1.7 @@ -1 +1 @@ -SoQt-1.4.0.tar.gz +SoQt-1.4.1.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-6/SoQt.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- SoQt.spec 8 Sep 2006 03:55:56 -0000 1.18 +++ SoQt.spec 4 Nov 2006 01:21:53 -0000 1.19 @@ -3,7 +3,7 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: GPL @@ -94,6 +94,9 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 +- Upstream update. + * Tue Sep 08 2006 Ralf Cors??pius - 1.4.0-1 - Upstream update. - Add utf-8/doxygen hack. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Sep 2006 03:55:56 -0000 1.6 +++ sources 4 Nov 2006 01:21:53 -0000 1.7 @@ -1 +1 @@ -b1209e7a2ab1c598d72d1bc364ce5ce5 SoQt-1.4.0.tar.gz +6dddafb755e9afb9924da1d46f3cd0d4 SoQt-1.4.1.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 01:23:02 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:23:02 -0700 Subject: rpms/SoQt/FC-5 .cvsignore, 1.6, 1.7 SoQt.spec, 1.17, 1.18 sources, 1.6, 1.7 Message-ID: <200611040123.kA41N2c2031573@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31551/FC-5 Modified Files: .cvsignore SoQt.spec sources Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Sep 2006 04:15:29 -0000 1.6 +++ .cvsignore 4 Nov 2006 01:22:32 -0000 1.7 @@ -1 +1 @@ -SoQt-1.4.0.tar.gz +SoQt-1.4.1.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-5/SoQt.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- SoQt.spec 8 Sep 2006 04:15:29 -0000 1.17 +++ SoQt.spec 4 Nov 2006 01:22:32 -0000 1.18 @@ -3,7 +3,7 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: GPL @@ -94,6 +94,9 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 +- Upstream update. + * Tue Sep 08 2006 Ralf Cors??pius - 1.4.0-1 - Upstream update. - Add utf-8/doxygen hack. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Sep 2006 04:15:29 -0000 1.6 +++ sources 4 Nov 2006 01:22:32 -0000 1.7 @@ -1 +1 @@ -b1209e7a2ab1c598d72d1bc364ce5ce5 SoQt-1.4.0.tar.gz +6dddafb755e9afb9924da1d46f3cd0d4 SoQt-1.4.1.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 01:23:40 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:23:40 -0700 Subject: rpms/SoQt/FC-4 .cvsignore, 1.5, 1.6 SoQt.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200611040123.kA41NeEc031599@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31579/FC-4 Modified Files: .cvsignore SoQt.spec sources Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 - Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Sep 2006 04:17:17 -0000 1.5 +++ .cvsignore 4 Nov 2006 01:23:10 -0000 1.6 @@ -1 +1 @@ -SoQt-1.4.0.tar.gz +SoQt-1.4.1.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/SoQt.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- SoQt.spec 8 Sep 2006 04:17:17 -0000 1.12 +++ SoQt.spec 4 Nov 2006 01:23:10 -0000 1.13 @@ -3,7 +3,7 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: GPL @@ -94,6 +94,9 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 +- Upstream update. + * Tue Sep 08 2006 Ralf Cors??pius - 1.4.0-1 - Upstream update. - Add utf-8/doxygen hack. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Sep 2006 04:17:17 -0000 1.5 +++ sources 4 Nov 2006 01:23:10 -0000 1.6 @@ -1 +1 @@ -b1209e7a2ab1c598d72d1bc364ce5ce5 SoQt-1.4.0.tar.gz +6dddafb755e9afb9924da1d46f3cd0d4 SoQt-1.4.1.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 01:45:03 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:45:03 -0700 Subject: rpms/SoQt/devel SoQt.spec,1.19,1.20 Message-ID: <200611040145.kA41j36v031908@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31882 Modified Files: SoQt.spec Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 - Inc Release due to buildsys bug. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- SoQt.spec 4 Nov 2006 01:21:15 -0000 1.19 +++ SoQt.spec 4 Nov 2006 01:44:33 -0000 1.20 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -94,6 +94,9 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 +- Inc Release due to buildsys bug. + * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 - Upstream update. From fedora-extras-commits at redhat.com Sat Nov 4 01:46:43 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:46:43 -0700 Subject: rpms/SoQt/FC-6 SoQt.spec,1.19,1.20 Message-ID: <200611040146.kA41kh14031973@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31957 Modified Files: SoQt.spec Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 - Inc Release due to buildsys bug. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-6/SoQt.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- SoQt.spec 4 Nov 2006 01:21:53 -0000 1.19 +++ SoQt.spec 4 Nov 2006 01:46:13 -0000 1.20 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -94,6 +94,9 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 +- Inc Release due to buildsys bug. + * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 - Upstream update. From fedora-extras-commits at redhat.com Sat Nov 4 01:48:19 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:48:19 -0700 Subject: rpms/SoQt/FC-5 SoQt.spec,1.18,1.19 Message-ID: <200611040148.kA41mJKK032033@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32017 Modified Files: SoQt.spec Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 - Inc Release due to buildsys bug. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-5/SoQt.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- SoQt.spec 4 Nov 2006 01:22:32 -0000 1.18 +++ SoQt.spec 4 Nov 2006 01:47:49 -0000 1.19 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -94,6 +94,9 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 +- Inc Release due to buildsys bug. + * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 - Upstream update. From fedora-extras-commits at redhat.com Sat Nov 4 01:52:42 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:52:42 -0700 Subject: rpms/SoQt/FC-4 SoQt.spec,1.13,1.14 Message-ID: <200611040152.kA41qgU4032122@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32106 Modified Files: SoQt.spec Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 - Inc Release due to buildsys bug. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-4/SoQt.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- SoQt.spec 4 Nov 2006 01:23:10 -0000 1.13 +++ SoQt.spec 4 Nov 2006 01:52:11 -0000 1.14 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -94,6 +94,9 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 +- Inc Release due to buildsys bug. + * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 - Upstream update. From fedora-extras-commits at redhat.com Sat Nov 4 01:54:43 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu)) Date: Fri, 3 Nov 2006 18:54:43 -0700 Subject: rpms/SoQt/FC-3 .cvsignore, 1.5, 1.6 SoQt.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200611040154.kA41she7032193@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32173 Modified Files: .cvsignore SoQt.spec sources Log Message: * Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 - Inc Release due to buildsys bug. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Sep 2006 04:18:55 -0000 1.5 +++ .cvsignore 4 Nov 2006 01:54:13 -0000 1.6 @@ -1 +1 @@ -SoQt-1.4.0.tar.gz +SoQt-1.4.1.tar.gz Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/SoQt.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SoQt.spec 8 Sep 2006 04:18:55 -0000 1.9 +++ SoQt.spec 4 Nov 2006 01:54:13 -0000 1.10 @@ -3,8 +3,8 @@ Summary: High-level 3D visualization library Name: SoQt -Version: 1.4.0 -Release: 1%{?dist} +Version: 1.4.1 +Release: 2%{?dist} License: GPL Group: System Environment/Libraries @@ -94,6 +94,12 @@ %{_mandir}/man?/*.?.gz %changelog +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-2 +- Inc Release due to buildsys bug. + +* Sat Nov 04 2006 Ralf Cors??pius - 1.4.1-1 +- Upstream update. + * Tue Sep 08 2006 Ralf Cors??pius - 1.4.0-1 - Upstream update. - Add utf-8/doxygen hack. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SoQt/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Sep 2006 04:18:55 -0000 1.5 +++ sources 4 Nov 2006 01:54:13 -0000 1.6 @@ -1 +1 @@ -b1209e7a2ab1c598d72d1bc364ce5ce5 SoQt-1.4.0.tar.gz +6dddafb755e9afb9924da1d46f3cd0d4 SoQt-1.4.1.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 04:32:46 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Fri, 3 Nov 2006 21:32:46 -0700 Subject: rpms/gaim-rhythmbox/FC-6 .cvsignore, 1.2, 1.3 gaim-rhythmbox.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611040432.kA44Wkef009614@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9573/FC-6 Modified Files: .cvsignore gaim-rhythmbox.spec sources Log Message: Update FC-6 and devel to 2.0beta4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Nov 2006 04:17:15 -0000 1.2 +++ .cvsignore 4 Nov 2006 04:32:16 -0000 1.3 @@ -1 +1 @@ -gaim-rhythmbox-2.0beta3.tar.gz +gaim-rhythmbox-2.0beta4.tar.gz Index: gaim-rhythmbox.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-6/gaim-rhythmbox.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gaim-rhythmbox.spec 3 Nov 2006 04:17:15 -0000 1.1 +++ gaim-rhythmbox.spec 4 Nov 2006 04:32:16 -0000 1.2 @@ -1,14 +1,13 @@ -%define prever beta3 +%define prever beta4 Name: gaim-rhythmbox Version: 2.0 -Release: 0.3.%{prever}%{?dist} +Release: 0.4.%{prever}%{?dist} Summary: Rhythmbox plugin for GAIM Group: Applications/Internet License: GPL URL: http://jon.oberheide.org/projects/gaim-rhythmbox/ Source0: http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}%{prever}.tar.gz -Patch0: gaim-rhythmbox-configure.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim-devel @@ -27,7 +26,6 @@ %prep %setup -q -n %{name}-%{version}%{?prever} -%patch0 %build @@ -53,6 +51,9 @@ %changelog +* Fri Nov 3 2006 Michel Salim 2.0-0.4.beta4 +- Update to beta4 + * Thu Nov 2 2006 Michel Salim 2.0-0.3.beta3 - Tidy up prever use, description field, and add files to documentation Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Nov 2006 04:17:15 -0000 1.2 +++ sources 4 Nov 2006 04:32:16 -0000 1.3 @@ -1 +1 @@ -a9e836986dae7857b408120782264d5a gaim-rhythmbox-2.0beta3.tar.gz +40d08481c38c8afd57d7c8b20d6dadbf gaim-rhythmbox-2.0beta4.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 04:32:47 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Fri, 3 Nov 2006 21:32:47 -0700 Subject: rpms/gaim-rhythmbox/devel .cvsignore, 1.2, 1.3 gaim-rhythmbox.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611040432.kA44WlRZ009619@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9573/devel Modified Files: .cvsignore gaim-rhythmbox.spec sources Log Message: Update FC-6 and devel to 2.0beta4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Nov 2006 04:17:15 -0000 1.2 +++ .cvsignore 4 Nov 2006 04:32:17 -0000 1.3 @@ -1 +1 @@ -gaim-rhythmbox-2.0beta3.tar.gz +gaim-rhythmbox-2.0beta4.tar.gz Index: gaim-rhythmbox.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/gaim-rhythmbox.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gaim-rhythmbox.spec 3 Nov 2006 04:17:15 -0000 1.1 +++ gaim-rhythmbox.spec 4 Nov 2006 04:32:17 -0000 1.2 @@ -1,14 +1,13 @@ -%define prever beta3 +%define prever beta4 Name: gaim-rhythmbox Version: 2.0 -Release: 0.3.%{prever}%{?dist} +Release: 0.4.%{prever}%{?dist} Summary: Rhythmbox plugin for GAIM Group: Applications/Internet License: GPL URL: http://jon.oberheide.org/projects/gaim-rhythmbox/ Source0: http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}%{prever}.tar.gz -Patch0: gaim-rhythmbox-configure.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim-devel @@ -27,7 +26,6 @@ %prep %setup -q -n %{name}-%{version}%{?prever} -%patch0 %build @@ -53,6 +51,9 @@ %changelog +* Fri Nov 3 2006 Michel Salim 2.0-0.4.beta4 +- Update to beta4 + * Thu Nov 2 2006 Michel Salim 2.0-0.3.beta3 - Tidy up prever use, description field, and add files to documentation Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Nov 2006 04:17:15 -0000 1.2 +++ sources 4 Nov 2006 04:32:17 -0000 1.3 @@ -1 +1 @@ -a9e836986dae7857b408120782264d5a gaim-rhythmbox-2.0beta3.tar.gz +40d08481c38c8afd57d7c8b20d6dadbf gaim-rhythmbox-2.0beta4.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 06:16:40 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 3 Nov 2006 23:16:40 -0700 Subject: rpms/R/FC-4 R.spec,1.17,1.18 Message-ID: <200611040616.kA46GevC015923@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/FC-4 Modified Files: R.spec Log Message: Update to current patched level to fix buffer overflow condition. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- R.spec 16 Oct 2006 21:09:25 -0000 1.17 +++ R.spec 4 Nov 2006 06:16:09 -0000 1.18 @@ -1,6 +1,6 @@ Name: R Version: 2.4.0 -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 @@ -16,6 +16,9 @@ BuildRequires: java-1.4.2-gcj-compat, lapack-devel Requires: evince, cups, firefox +# This syncs us with the "patched" development tree. +Patch0: R-2.4.0-patched-2006-11-03.patch + # These are the submodules that R provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are # provided for packager convenience. @@ -96,6 +99,7 @@ %prep %setup -q +%patch0 -p1 %build export R_PDFVIEWER="%{_bindir}/evince" @@ -115,7 +119,7 @@ --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib )\ - | egrep '^R is now|^ |^$' - > CAPABILITIES + | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -226,6 +230,9 @@ /sbin/ldconfig %changelog +* Fri Nov 3 2006 Tom "spot" Callaway 2.4.0-2 +- sync with patched 2006-11-03 level to fix PR#9339 + * Sun Oct 15 2006 Tom "spot" Callaway 2.4.0-1 - bump for 2.4.0 From fedora-extras-commits at redhat.com Sat Nov 4 06:16:42 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 3 Nov 2006 23:16:42 -0700 Subject: rpms/R/FC-6 R.spec,1.19,1.20 Message-ID: <200611040616.kA46Ggir015929@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/FC-6 Modified Files: R.spec Log Message: Update to current patched level to fix buffer overflow condition. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/FC-6/R.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- R.spec 16 Oct 2006 21:09:27 -0000 1.19 +++ R.spec 4 Nov 2006 06:16:11 -0000 1.20 @@ -1,6 +1,6 @@ Name: R Version: 2.4.0 -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 @@ -16,6 +16,9 @@ BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel Requires: evince, cups, firefox +# This syncs us with the "patched" development tree. +Patch0: R-2.4.0-patched-2006-11-03.patch + # These are the submodules that R provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are # provided for packager convenience. @@ -95,7 +98,8 @@ and header files. %prep -%setup -q +%setup -q +%patch0 -p1 %build export R_PDFVIEWER="%{_bindir}/evince" @@ -108,7 +112,7 @@ --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib )\ - | egrep '^R is now|^ |^$' - > CAPABILITIES + | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -219,6 +223,9 @@ /sbin/ldconfig %changelog +* Fri Nov 3 2006 Tom "spot" Callaway 2.4.0-2 +- sync with patched 2006-11-03 level to fix PR#9339 + * Sun Oct 15 2006 Tom "spot" Callaway 2.4.0-1 - bump for 2.4.0 From fedora-extras-commits at redhat.com Sat Nov 4 06:16:41 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 3 Nov 2006 23:16:41 -0700 Subject: rpms/R/FC-5 R.spec,1.17,1.18 Message-ID: <200611040616.kA46GfGd015926@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/FC-5 Modified Files: R.spec Log Message: Update to current patched level to fix buffer overflow condition. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/FC-5/R.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- R.spec 16 Oct 2006 21:09:26 -0000 1.17 +++ R.spec 4 Nov 2006 06:16:11 -0000 1.18 @@ -1,6 +1,6 @@ Name: R Version: 2.4.0 -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 @@ -16,6 +16,9 @@ BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel Requires: evince, cups, firefox +# This syncs us with the "patched" development tree. +Patch0: R-2.4.0-patched-2006-11-03.patch + # These are the submodules that R provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are # provided for packager convenience. @@ -95,7 +98,8 @@ and header files. %prep -%setup -q +%setup -q +%patch0 -p1 %build export R_PDFVIEWER="%{_bindir}/evince" @@ -108,7 +112,7 @@ --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib )\ - | egrep '^R is now|^ |^$' - > CAPABILITIES + | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -219,6 +223,9 @@ /sbin/ldconfig %changelog +* Fri Nov 3 2006 Tom "spot" Callaway 2.4.0-2 +- sync with patched 2006-11-03 level to fix PR#9339 + * Sun Oct 15 2006 Tom "spot" Callaway 2.4.0-1 - bump for 2.4.0 From fedora-extras-commits at redhat.com Sat Nov 4 06:16:42 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 3 Nov 2006 23:16:42 -0700 Subject: rpms/R/devel R.spec,1.19,1.20 Message-ID: <200611040616.kA46Ggtn015932@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/devel Modified Files: R.spec Log Message: Update to current patched level to fix buffer overflow condition. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/devel/R.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- R.spec 16 Oct 2006 21:09:27 -0000 1.19 +++ R.spec 4 Nov 2006 06:16:12 -0000 1.20 @@ -1,6 +1,6 @@ Name: R Version: 2.4.0 -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 @@ -16,6 +16,9 @@ BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel Requires: evince, cups, firefox +# This syncs us with the "patched" development tree. +Patch0: R-2.4.0-patched-2006-11-03.patch + # These are the submodules that R provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are # provided for packager convenience. @@ -95,7 +98,8 @@ and header files. %prep -%setup -q +%setup -q +%patch0 -p1 %build export R_PDFVIEWER="%{_bindir}/evince" @@ -108,7 +112,7 @@ --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib )\ - | egrep '^R is now|^ |^$' - > CAPABILITIES + | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -219,6 +223,9 @@ /sbin/ldconfig %changelog +* Fri Nov 3 2006 Tom "spot" Callaway 2.4.0-2 +- sync with patched 2006-11-03 level to fix PR#9339 + * Sun Oct 15 2006 Tom "spot" Callaway 2.4.0-1 - bump for 2.4.0 From fedora-extras-commits at redhat.com Sat Nov 4 06:19:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 3 Nov 2006 23:19:57 -0700 Subject: rpms/R/FC-5 R-2.4.0-patched-2006-11-03.patch,NONE,1.1 Message-ID: <200611040620.kA46JvNq016027@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/FC-5 Added Files: R-2.4.0-patched-2006-11-03.patch Log Message: Patch from upstream R-2.4.0-patched-2006-11-03.patch: --- NEW FILE R-2.4.0-patched-2006-11-03.patch --- diff -urp R-2.4.0.old/config.site R-2.4.0/config.site --- R-2.4.0.old/config.site 2006-09-04 09:41:48.000000000 -0500 +++ R-2.4.0/config.site 2006-10-28 14:36:13.000000000 -0500 @@ -43,12 +43,16 @@ ## If unspecified, a search is made for gcc and cc (in that order). ## To override this choice, specify the name of the command which runs ## the compiler here, for example 'c89'. +## It is also convenient to set the architecture here, e.g. 'gcc -m32'. +## NB, as from R 2.5.0 configure will append flags for C99 compliance, +## e.g. CC=gcc -std=gnu99 +## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS. ## CC= ## Debugging and optimization options for the C compiler. ## Use this to specify CFLAGS for the version of the C compiler ## specified above. -## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, +## If unspecified, defaults to '-g -O2' for gcc, ## and '-g' in all other cases except icc (for which see R-admin.html). ## CFLAGS= diff -urp R-2.4.0.old/configure R-2.4.0/configure --- R-2.4.0.old/configure 2006-10-03 05:01:50.000000000 -0500 +++ R-2.4.0/configure 2006-11-03 19:41:47.000000000 -0600 @@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +## next is a macro borrowed from autoconf 2.60 + echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_c99+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict(ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy work. +static void +test_varargs(const char *format, ...) +{ + va_list args; + va_start(args, format); + va_list args_copy; + va_copy(args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg(args_copy, const char *); + break; + case 'd': // int + number = va_arg(args_copy, int); + break; + case 'f': // float + fnumber = (float) va_arg(args_copy, double); + break; + default: + break; + } + } + va_end(args_copy); + va_end(args); +} + +int +main () +{ + + // Check bool and long long datatypes. + _Bool success = false; + long long int bignum = -1234567890LL; + unsigned long long int ubignum = 1234567890uLL; + + // Check restrict. + if (test_restrict("String literal") != 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs("s, d' f .", "string", 65, 34.234); + + // Check incomplete arrays work. + struct incomplete_array *ia = + malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = (double) i * 1.234; + + // Check named initialisers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[43] = 543; + + // work around unused variable warnings + return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_c99=$ac_arg +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + xno) + echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6 ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 [...9677 lines suppressed...] -48.24 496.53 (Rural Male) 0 0 0 t -48.24 389.83 (Rural Female) 0 0 0 t -48.24 283.13 (Urban Male) 0 0 0 t -48.24 176.43 (Urban Female) 0 0 0 t +63.36 469.38 (Rural Male) 0 0 0 t +63.36 379.24 (Rural Female) 0 0 0 t +63.36 289.10 (Urban Male) 0 0 0 t +63.36 198.96 (Urban Female) 0 0 0 t 0.75 setlinewidth [] 0 setdash 1 setlinecap 1 setlinejoin 10.00 setmiterlimit np -206.83 91.44 m -553.53 0 l +220.11 128.16 m +526.75 0 l o np -206.83 91.44 m +220.11 128.16 m 0 -10.80 l o np -299.08 91.44 m +307.90 128.16 m 0 -10.80 l o np -391.34 91.44 m +395.69 128.16 m 0 -10.80 l o np -483.60 91.44 m +483.48 128.16 m 0 -10.80 l o np -575.85 91.44 m +571.27 128.16 m 0 -10.80 l o np -668.11 91.44 m +659.06 128.16 m 0 -10.80 l o np -760.36 91.44 m +746.86 128.16 m 0 -10.80 l o -206.83 52.56 (10) .5 0 0 t -299.08 52.56 (20) .5 0 0 t -391.34 52.56 (30) .5 0 0 t -483.60 52.56 (40) .5 0 0 t -575.85 52.56 (50) .5 0 0 t -668.11 52.56 (60) .5 0 0 t -760.36 52.56 (70) .5 0 0 t -np -168.93 91.44 m -624.72 0 l -0 426.80 l --624.72 0 l -0 -426.80 l +220.11 89.28 (10) .5 0 0 t +307.90 89.28 (20) .5 0 0 t +395.69 89.28 (30) .5 0 0 t +483.48 89.28 (40) .5 0 0 t +571.27 89.28 (50) .5 0 0 t +659.06 89.28 (60) .5 0 0 t +746.86 89.28 (70) .5 0 0 t +np +184.05 128.16 m +594.48 0 l +0 360.56 l +-594.48 0 l +0 -360.56 l o 18.00 18.00 823.89 577.28 cl /ps 22 def /Font2 findfont 22 s 0 0 0 rgb -481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t +481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t ep %%Page: 5 5 bp @@ -3771,8 +3771,8 @@ np 0 -7.20 l o /ps 12 def /Font1 findfont 12 s -78.70 65.52 (1 e-11) .5 0 0 t -222.02 65.52 (1 e+53) .5 0 0 t +78.70 65.52 (1e-11) .5 0 0 t +222.02 65.52 (1e+53) .5 0 0 t 365.35 65.52 (1e+117) .5 0 0 t 508.68 65.52 (1e+181) .5 0 0 t 652.00 65.52 (1e+245) .5 0 0 t @@ -3800,8 +3800,8 @@ np 77.04 436.50 m -7.20 0 l o -59.76 92.27 (1 e-10) .5 0 90 t -59.76 178.32 (1 e+49) .5 0 90 t +59.76 92.27 (1e-10) .5 0 90 t +59.76 178.32 (1e+49) .5 0 90 t 59.76 264.38 (1e+108) .5 0 90 t 59.76 350.44 (1e+167) .5 0 90 t 59.76 436.50 (1e+226) .5 0 90 t diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R --- R-2.4.0.old/tests/reg-tests-1.R 2006-09-25 21:05:07.000000000 -0500 +++ R-2.4.0/tests/reg-tests-1.R 2006-10-28 14:36:01.000000000 -0500 @@ -4494,3 +4494,20 @@ test <- 1:10 try(test[2:4] <- ls) # fails stopifnot(!exists("*tmp*", where=1)) ## was true < 2.4.0 + + +## merge on zero-row data frames +L3 <- LETTERS[1:3] +d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE)) +e <- d[-1,] +merge(d, e, by.x = "x", by.y = "x", all.x = TRUE) +## + + +## PR#9313 +library(stats4) +g <- function(x, y) -cos(x) + abs(y) +fit1 <- mle(g, start = list(x = 0, y = 7)) +fit2 <- mle(g, start = list(y = 7, x = 0)) +stopifnot(all.equal(coef(fit1), coef(fit2))) +## Found different solutions in 2.4.0, as names were not remapped in fit2 diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R --- R-2.4.0.old/tests/reg-tests-2.R 2006-09-22 21:05:09.000000000 -0500 +++ R-2.4.0/tests/reg-tests-2.R 2006-10-28 14:36:01.000000000 -0500 @@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",") ### end of tests added in 2.4.0 ### + + +## Platform-specific behaviour in lowess reported to R-help +## 2006-10-12 by Frank Harrell +x <- c(0,7,8,14,15,120,242) +y <- c(122,128,130,158,110,110,92) +lowess(x, y, iter=0) +lowess(x, y) +## MAD of iterated residuals was zero, and result depended on the platform. + + +### end of tests added in 2.4.1 ### diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save --- R-2.4.0.old/tests/reg-tests-2.Rout.save 2006-09-25 21:05:07.000000000 -0500 +++ R-2.4.0/tests/reg-tests-2.Rout.save 2006-10-28 14:36:01.000000000 -0500 @@ -1,6 +1,6 @@ -R version 2.4.0 beta (2005-09-25 r39509) -Copyright (C) The R Foundation for Statistical Computing +R version 2.5.0 Under development (unstable) (2006-10-15 r39637) +Copyright (C) 2006 The R Foundation for Statistical Computing ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg > > ### end of tests added in 2.4.0 ### > +> +> ## Platform-specific behaviour in lowess reported to R-help +> ## 2006-10-12 by Frank Harrell +> x <- c(0,7,8,14,15,120,242) +> y <- c(122,128,130,158,110,110,92) +> lowess(x, y, iter=0) +$x +[1] 0 7 8 14 15 120 242 + +$y +[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903 92.00003 + +> lowess(x, y) +$x +[1] 0 7 8 14 15 120 242 + +$y +[1] 122 128 128 158 110 110 92 + +> ## MAD of iterated residuals was zero, and result depended on the platform. +> +> +> ### end of tests added in 2.4.1 ### +> diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION --- R-2.4.0.old/VERSION 2006-10-03 05:00:12.000000000 -0500 +++ R-2.4.0/VERSION 2006-10-03 07:19:25.000000000 -0500 @@ -1 +1 @@ -2.4.0 +2.4.0 Patched From fedora-extras-commits at redhat.com Sat Nov 4 06:19:58 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 3 Nov 2006 23:19:58 -0700 Subject: rpms/R/FC-6 R-2.4.0-patched-2006-11-03.patch,NONE,1.1 Message-ID: <200611040620.kA46Jw3h016042@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/FC-6 Added Files: R-2.4.0-patched-2006-11-03.patch Log Message: Patch from upstream R-2.4.0-patched-2006-11-03.patch: --- NEW FILE R-2.4.0-patched-2006-11-03.patch --- diff -urp R-2.4.0.old/config.site R-2.4.0/config.site --- R-2.4.0.old/config.site 2006-09-04 09:41:48.000000000 -0500 +++ R-2.4.0/config.site 2006-10-28 14:36:13.000000000 -0500 @@ -43,12 +43,16 @@ ## If unspecified, a search is made for gcc and cc (in that order). ## To override this choice, specify the name of the command which runs ## the compiler here, for example 'c89'. +## It is also convenient to set the architecture here, e.g. 'gcc -m32'. +## NB, as from R 2.5.0 configure will append flags for C99 compliance, +## e.g. CC=gcc -std=gnu99 +## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS. ## CC= ## Debugging and optimization options for the C compiler. ## Use this to specify CFLAGS for the version of the C compiler ## specified above. -## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, +## If unspecified, defaults to '-g -O2' for gcc, ## and '-g' in all other cases except icc (for which see R-admin.html). ## CFLAGS= diff -urp R-2.4.0.old/configure R-2.4.0/configure --- R-2.4.0.old/configure 2006-10-03 05:01:50.000000000 -0500 +++ R-2.4.0/configure 2006-11-03 19:41:47.000000000 -0600 @@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +## next is a macro borrowed from autoconf 2.60 + echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_c99+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict(ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy work. +static void +test_varargs(const char *format, ...) +{ + va_list args; + va_start(args, format); + va_list args_copy; + va_copy(args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg(args_copy, const char *); + break; + case 'd': // int + number = va_arg(args_copy, int); + break; + case 'f': // float + fnumber = (float) va_arg(args_copy, double); + break; + default: + break; + } + } + va_end(args_copy); + va_end(args); +} + +int +main () +{ + + // Check bool and long long datatypes. + _Bool success = false; + long long int bignum = -1234567890LL; + unsigned long long int ubignum = 1234567890uLL; + + // Check restrict. + if (test_restrict("String literal") != 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs("s, d' f .", "string", 65, 34.234); + + // Check incomplete arrays work. + struct incomplete_array *ia = + malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = (double) i * 1.234; + + // Check named initialisers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[43] = 543; + + // work around unused variable warnings + return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_c99=$ac_arg +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + xno) + echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6 ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 [...9677 lines suppressed...] -48.24 496.53 (Rural Male) 0 0 0 t -48.24 389.83 (Rural Female) 0 0 0 t -48.24 283.13 (Urban Male) 0 0 0 t -48.24 176.43 (Urban Female) 0 0 0 t +63.36 469.38 (Rural Male) 0 0 0 t +63.36 379.24 (Rural Female) 0 0 0 t +63.36 289.10 (Urban Male) 0 0 0 t +63.36 198.96 (Urban Female) 0 0 0 t 0.75 setlinewidth [] 0 setdash 1 setlinecap 1 setlinejoin 10.00 setmiterlimit np -206.83 91.44 m -553.53 0 l +220.11 128.16 m +526.75 0 l o np -206.83 91.44 m +220.11 128.16 m 0 -10.80 l o np -299.08 91.44 m +307.90 128.16 m 0 -10.80 l o np -391.34 91.44 m +395.69 128.16 m 0 -10.80 l o np -483.60 91.44 m +483.48 128.16 m 0 -10.80 l o np -575.85 91.44 m +571.27 128.16 m 0 -10.80 l o np -668.11 91.44 m +659.06 128.16 m 0 -10.80 l o np -760.36 91.44 m +746.86 128.16 m 0 -10.80 l o -206.83 52.56 (10) .5 0 0 t -299.08 52.56 (20) .5 0 0 t -391.34 52.56 (30) .5 0 0 t -483.60 52.56 (40) .5 0 0 t -575.85 52.56 (50) .5 0 0 t -668.11 52.56 (60) .5 0 0 t -760.36 52.56 (70) .5 0 0 t -np -168.93 91.44 m -624.72 0 l -0 426.80 l --624.72 0 l -0 -426.80 l +220.11 89.28 (10) .5 0 0 t +307.90 89.28 (20) .5 0 0 t +395.69 89.28 (30) .5 0 0 t +483.48 89.28 (40) .5 0 0 t +571.27 89.28 (50) .5 0 0 t +659.06 89.28 (60) .5 0 0 t +746.86 89.28 (70) .5 0 0 t +np +184.05 128.16 m +594.48 0 l +0 360.56 l +-594.48 0 l +0 -360.56 l o 18.00 18.00 823.89 577.28 cl /ps 22 def /Font2 findfont 22 s 0 0 0 rgb -481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t +481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t ep %%Page: 5 5 bp @@ -3771,8 +3771,8 @@ np 0 -7.20 l o /ps 12 def /Font1 findfont 12 s -78.70 65.52 (1 e-11) .5 0 0 t -222.02 65.52 (1 e+53) .5 0 0 t +78.70 65.52 (1e-11) .5 0 0 t +222.02 65.52 (1e+53) .5 0 0 t 365.35 65.52 (1e+117) .5 0 0 t 508.68 65.52 (1e+181) .5 0 0 t 652.00 65.52 (1e+245) .5 0 0 t @@ -3800,8 +3800,8 @@ np 77.04 436.50 m -7.20 0 l o -59.76 92.27 (1 e-10) .5 0 90 t -59.76 178.32 (1 e+49) .5 0 90 t +59.76 92.27 (1e-10) .5 0 90 t +59.76 178.32 (1e+49) .5 0 90 t 59.76 264.38 (1e+108) .5 0 90 t 59.76 350.44 (1e+167) .5 0 90 t 59.76 436.50 (1e+226) .5 0 90 t diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R --- R-2.4.0.old/tests/reg-tests-1.R 2006-09-25 21:05:07.000000000 -0500 +++ R-2.4.0/tests/reg-tests-1.R 2006-10-28 14:36:01.000000000 -0500 @@ -4494,3 +4494,20 @@ test <- 1:10 try(test[2:4] <- ls) # fails stopifnot(!exists("*tmp*", where=1)) ## was true < 2.4.0 + + +## merge on zero-row data frames +L3 <- LETTERS[1:3] +d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE)) +e <- d[-1,] +merge(d, e, by.x = "x", by.y = "x", all.x = TRUE) +## + + +## PR#9313 +library(stats4) +g <- function(x, y) -cos(x) + abs(y) +fit1 <- mle(g, start = list(x = 0, y = 7)) +fit2 <- mle(g, start = list(y = 7, x = 0)) +stopifnot(all.equal(coef(fit1), coef(fit2))) +## Found different solutions in 2.4.0, as names were not remapped in fit2 diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R --- R-2.4.0.old/tests/reg-tests-2.R 2006-09-22 21:05:09.000000000 -0500 +++ R-2.4.0/tests/reg-tests-2.R 2006-10-28 14:36:01.000000000 -0500 @@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",") ### end of tests added in 2.4.0 ### + + +## Platform-specific behaviour in lowess reported to R-help +## 2006-10-12 by Frank Harrell +x <- c(0,7,8,14,15,120,242) +y <- c(122,128,130,158,110,110,92) +lowess(x, y, iter=0) +lowess(x, y) +## MAD of iterated residuals was zero, and result depended on the platform. + + +### end of tests added in 2.4.1 ### diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save --- R-2.4.0.old/tests/reg-tests-2.Rout.save 2006-09-25 21:05:07.000000000 -0500 +++ R-2.4.0/tests/reg-tests-2.Rout.save 2006-10-28 14:36:01.000000000 -0500 @@ -1,6 +1,6 @@ -R version 2.4.0 beta (2005-09-25 r39509) -Copyright (C) The R Foundation for Statistical Computing +R version 2.5.0 Under development (unstable) (2006-10-15 r39637) +Copyright (C) 2006 The R Foundation for Statistical Computing ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg > > ### end of tests added in 2.4.0 ### > +> +> ## Platform-specific behaviour in lowess reported to R-help +> ## 2006-10-12 by Frank Harrell +> x <- c(0,7,8,14,15,120,242) +> y <- c(122,128,130,158,110,110,92) +> lowess(x, y, iter=0) +$x +[1] 0 7 8 14 15 120 242 + +$y +[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903 92.00003 + +> lowess(x, y) +$x +[1] 0 7 8 14 15 120 242 + +$y +[1] 122 128 128 158 110 110 92 + +> ## MAD of iterated residuals was zero, and result depended on the platform. +> +> +> ### end of tests added in 2.4.1 ### +> diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION --- R-2.4.0.old/VERSION 2006-10-03 05:00:12.000000000 -0500 +++ R-2.4.0/VERSION 2006-10-03 07:19:25.000000000 -0500 @@ -1 +1 @@ -2.4.0 +2.4.0 Patched From fedora-extras-commits at redhat.com Sat Nov 4 06:19:59 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 3 Nov 2006 23:19:59 -0700 Subject: rpms/R/devel R-2.4.0-patched-2006-11-03.patch,NONE,1.1 Message-ID: <200611040620.kA46Jxsk016057@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/devel Added Files: R-2.4.0-patched-2006-11-03.patch Log Message: Patch from upstream R-2.4.0-patched-2006-11-03.patch: --- NEW FILE R-2.4.0-patched-2006-11-03.patch --- diff -urp R-2.4.0.old/config.site R-2.4.0/config.site --- R-2.4.0.old/config.site 2006-09-04 09:41:48.000000000 -0500 +++ R-2.4.0/config.site 2006-10-28 14:36:13.000000000 -0500 @@ -43,12 +43,16 @@ ## If unspecified, a search is made for gcc and cc (in that order). ## To override this choice, specify the name of the command which runs ## the compiler here, for example 'c89'. +## It is also convenient to set the architecture here, e.g. 'gcc -m32'. +## NB, as from R 2.5.0 configure will append flags for C99 compliance, +## e.g. CC=gcc -std=gnu99 +## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS. ## CC= ## Debugging and optimization options for the C compiler. ## Use this to specify CFLAGS for the version of the C compiler ## specified above. -## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, +## If unspecified, defaults to '-g -O2' for gcc, ## and '-g' in all other cases except icc (for which see R-admin.html). ## CFLAGS= diff -urp R-2.4.0.old/configure R-2.4.0/configure --- R-2.4.0.old/configure 2006-10-03 05:01:50.000000000 -0500 +++ R-2.4.0/configure 2006-11-03 19:41:47.000000000 -0600 @@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +## next is a macro borrowed from autoconf 2.60 + echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_c99+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict(ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy work. +static void +test_varargs(const char *format, ...) +{ + va_list args; + va_start(args, format); + va_list args_copy; + va_copy(args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg(args_copy, const char *); + break; + case 'd': // int + number = va_arg(args_copy, int); + break; + case 'f': // float + fnumber = (float) va_arg(args_copy, double); + break; + default: + break; + } + } + va_end(args_copy); + va_end(args); +} + +int +main () +{ + + // Check bool and long long datatypes. + _Bool success = false; + long long int bignum = -1234567890LL; + unsigned long long int ubignum = 1234567890uLL; + + // Check restrict. + if (test_restrict("String literal") != 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs("s, d' f .", "string", 65, 34.234); + + // Check incomplete arrays work. + struct incomplete_array *ia = + malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = (double) i * 1.234; + + // Check named initialisers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[43] = 543; + + // work around unused variable warnings + return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_c99=$ac_arg +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + xno) + echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6 ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 [...9677 lines suppressed...] -48.24 496.53 (Rural Male) 0 0 0 t -48.24 389.83 (Rural Female) 0 0 0 t -48.24 283.13 (Urban Male) 0 0 0 t -48.24 176.43 (Urban Female) 0 0 0 t +63.36 469.38 (Rural Male) 0 0 0 t +63.36 379.24 (Rural Female) 0 0 0 t +63.36 289.10 (Urban Male) 0 0 0 t +63.36 198.96 (Urban Female) 0 0 0 t 0.75 setlinewidth [] 0 setdash 1 setlinecap 1 setlinejoin 10.00 setmiterlimit np -206.83 91.44 m -553.53 0 l +220.11 128.16 m +526.75 0 l o np -206.83 91.44 m +220.11 128.16 m 0 -10.80 l o np -299.08 91.44 m +307.90 128.16 m 0 -10.80 l o np -391.34 91.44 m +395.69 128.16 m 0 -10.80 l o np -483.60 91.44 m +483.48 128.16 m 0 -10.80 l o np -575.85 91.44 m +571.27 128.16 m 0 -10.80 l o np -668.11 91.44 m +659.06 128.16 m 0 -10.80 l o np -760.36 91.44 m +746.86 128.16 m 0 -10.80 l o -206.83 52.56 (10) .5 0 0 t -299.08 52.56 (20) .5 0 0 t -391.34 52.56 (30) .5 0 0 t -483.60 52.56 (40) .5 0 0 t -575.85 52.56 (50) .5 0 0 t -668.11 52.56 (60) .5 0 0 t -760.36 52.56 (70) .5 0 0 t -np -168.93 91.44 m -624.72 0 l -0 426.80 l --624.72 0 l -0 -426.80 l +220.11 89.28 (10) .5 0 0 t +307.90 89.28 (20) .5 0 0 t +395.69 89.28 (30) .5 0 0 t +483.48 89.28 (40) .5 0 0 t +571.27 89.28 (50) .5 0 0 t +659.06 89.28 (60) .5 0 0 t +746.86 89.28 (70) .5 0 0 t +np +184.05 128.16 m +594.48 0 l +0 360.56 l +-594.48 0 l +0 -360.56 l o 18.00 18.00 823.89 577.28 cl /ps 22 def /Font2 findfont 22 s 0 0 0 rgb -481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t +481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t ep %%Page: 5 5 bp @@ -3771,8 +3771,8 @@ np 0 -7.20 l o /ps 12 def /Font1 findfont 12 s -78.70 65.52 (1 e-11) .5 0 0 t -222.02 65.52 (1 e+53) .5 0 0 t +78.70 65.52 (1e-11) .5 0 0 t +222.02 65.52 (1e+53) .5 0 0 t 365.35 65.52 (1e+117) .5 0 0 t 508.68 65.52 (1e+181) .5 0 0 t 652.00 65.52 (1e+245) .5 0 0 t @@ -3800,8 +3800,8 @@ np 77.04 436.50 m -7.20 0 l o -59.76 92.27 (1 e-10) .5 0 90 t -59.76 178.32 (1 e+49) .5 0 90 t +59.76 92.27 (1e-10) .5 0 90 t +59.76 178.32 (1e+49) .5 0 90 t 59.76 264.38 (1e+108) .5 0 90 t 59.76 350.44 (1e+167) .5 0 90 t 59.76 436.50 (1e+226) .5 0 90 t diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R --- R-2.4.0.old/tests/reg-tests-1.R 2006-09-25 21:05:07.000000000 -0500 +++ R-2.4.0/tests/reg-tests-1.R 2006-10-28 14:36:01.000000000 -0500 @@ -4494,3 +4494,20 @@ test <- 1:10 try(test[2:4] <- ls) # fails stopifnot(!exists("*tmp*", where=1)) ## was true < 2.4.0 + + +## merge on zero-row data frames +L3 <- LETTERS[1:3] +d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE)) +e <- d[-1,] +merge(d, e, by.x = "x", by.y = "x", all.x = TRUE) +## + + +## PR#9313 +library(stats4) +g <- function(x, y) -cos(x) + abs(y) +fit1 <- mle(g, start = list(x = 0, y = 7)) +fit2 <- mle(g, start = list(y = 7, x = 0)) +stopifnot(all.equal(coef(fit1), coef(fit2))) +## Found different solutions in 2.4.0, as names were not remapped in fit2 diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R --- R-2.4.0.old/tests/reg-tests-2.R 2006-09-22 21:05:09.000000000 -0500 +++ R-2.4.0/tests/reg-tests-2.R 2006-10-28 14:36:01.000000000 -0500 @@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",") ### end of tests added in 2.4.0 ### + + +## Platform-specific behaviour in lowess reported to R-help +## 2006-10-12 by Frank Harrell +x <- c(0,7,8,14,15,120,242) +y <- c(122,128,130,158,110,110,92) +lowess(x, y, iter=0) +lowess(x, y) +## MAD of iterated residuals was zero, and result depended on the platform. + + +### end of tests added in 2.4.1 ### diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save --- R-2.4.0.old/tests/reg-tests-2.Rout.save 2006-09-25 21:05:07.000000000 -0500 +++ R-2.4.0/tests/reg-tests-2.Rout.save 2006-10-28 14:36:01.000000000 -0500 @@ -1,6 +1,6 @@ -R version 2.4.0 beta (2005-09-25 r39509) -Copyright (C) The R Foundation for Statistical Computing +R version 2.5.0 Under development (unstable) (2006-10-15 r39637) +Copyright (C) 2006 The R Foundation for Statistical Computing ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg > > ### end of tests added in 2.4.0 ### > +> +> ## Platform-specific behaviour in lowess reported to R-help +> ## 2006-10-12 by Frank Harrell +> x <- c(0,7,8,14,15,120,242) +> y <- c(122,128,130,158,110,110,92) +> lowess(x, y, iter=0) +$x +[1] 0 7 8 14 15 120 242 + +$y +[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903 92.00003 + +> lowess(x, y) +$x +[1] 0 7 8 14 15 120 242 + +$y +[1] 122 128 128 158 110 110 92 + +> ## MAD of iterated residuals was zero, and result depended on the platform. +> +> +> ### end of tests added in 2.4.1 ### +> diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION --- R-2.4.0.old/VERSION 2006-10-03 05:00:12.000000000 -0500 +++ R-2.4.0/VERSION 2006-10-03 07:19:25.000000000 -0500 @@ -1 +1 @@ -2.4.0 +2.4.0 Patched From fedora-extras-commits at redhat.com Sat Nov 4 06:20:27 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 3 Nov 2006 23:20:27 -0700 Subject: rpms/R/FC-4 R-2.4.0-patched-2006-11-03.patch, NONE, 1.1 R.spec, 1.18, 1.19 Message-ID: <200611040620.kA46KRlC016077@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/FC-4 Modified Files: R.spec Added Files: R-2.4.0-patched-2006-11-03.patch Log Message: Patch from upstream R-2.4.0-patched-2006-11-03.patch: --- NEW FILE R-2.4.0-patched-2006-11-03.patch --- diff -urp R-2.4.0.old/config.site R-2.4.0/config.site --- R-2.4.0.old/config.site 2006-09-04 09:41:48.000000000 -0500 +++ R-2.4.0/config.site 2006-10-28 14:36:13.000000000 -0500 @@ -43,12 +43,16 @@ ## If unspecified, a search is made for gcc and cc (in that order). ## To override this choice, specify the name of the command which runs ## the compiler here, for example 'c89'. +## It is also convenient to set the architecture here, e.g. 'gcc -m32'. +## NB, as from R 2.5.0 configure will append flags for C99 compliance, +## e.g. CC=gcc -std=gnu99 +## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS. ## CC= ## Debugging and optimization options for the C compiler. ## Use this to specify CFLAGS for the version of the C compiler ## specified above. -## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, +## If unspecified, defaults to '-g -O2' for gcc, ## and '-g' in all other cases except icc (for which see R-admin.html). ## CFLAGS= diff -urp R-2.4.0.old/configure R-2.4.0/configure --- R-2.4.0.old/configure 2006-10-03 05:01:50.000000000 -0500 +++ R-2.4.0/configure 2006-11-03 19:41:47.000000000 -0600 @@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +## next is a macro borrowed from autoconf 2.60 + echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_c99+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict(ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy work. +static void +test_varargs(const char *format, ...) +{ + va_list args; + va_start(args, format); + va_list args_copy; + va_copy(args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg(args_copy, const char *); + break; + case 'd': // int + number = va_arg(args_copy, int); + break; + case 'f': // float + fnumber = (float) va_arg(args_copy, double); + break; + default: + break; + } + } + va_end(args_copy); + va_end(args); +} + +int +main () +{ + + // Check bool and long long datatypes. + _Bool success = false; + long long int bignum = -1234567890LL; + unsigned long long int ubignum = 1234567890uLL; + + // Check restrict. + if (test_restrict("String literal") != 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs("s, d' f .", "string", 65, 34.234); + + // Check incomplete arrays work. + struct incomplete_array *ia = + malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = (double) i * 1.234; + + // Check named initialisers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[43] = 543; + + // work around unused variable warnings + return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_c99=$ac_arg +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + xno) + echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6 ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 [...9677 lines suppressed...] -48.24 496.53 (Rural Male) 0 0 0 t -48.24 389.83 (Rural Female) 0 0 0 t -48.24 283.13 (Urban Male) 0 0 0 t -48.24 176.43 (Urban Female) 0 0 0 t +63.36 469.38 (Rural Male) 0 0 0 t +63.36 379.24 (Rural Female) 0 0 0 t +63.36 289.10 (Urban Male) 0 0 0 t +63.36 198.96 (Urban Female) 0 0 0 t 0.75 setlinewidth [] 0 setdash 1 setlinecap 1 setlinejoin 10.00 setmiterlimit np -206.83 91.44 m -553.53 0 l +220.11 128.16 m +526.75 0 l o np -206.83 91.44 m +220.11 128.16 m 0 -10.80 l o np -299.08 91.44 m +307.90 128.16 m 0 -10.80 l o np -391.34 91.44 m +395.69 128.16 m 0 -10.80 l o np -483.60 91.44 m +483.48 128.16 m 0 -10.80 l o np -575.85 91.44 m +571.27 128.16 m 0 -10.80 l o np -668.11 91.44 m +659.06 128.16 m 0 -10.80 l o np -760.36 91.44 m +746.86 128.16 m 0 -10.80 l o -206.83 52.56 (10) .5 0 0 t -299.08 52.56 (20) .5 0 0 t -391.34 52.56 (30) .5 0 0 t -483.60 52.56 (40) .5 0 0 t -575.85 52.56 (50) .5 0 0 t -668.11 52.56 (60) .5 0 0 t -760.36 52.56 (70) .5 0 0 t -np -168.93 91.44 m -624.72 0 l -0 426.80 l --624.72 0 l -0 -426.80 l +220.11 89.28 (10) .5 0 0 t +307.90 89.28 (20) .5 0 0 t +395.69 89.28 (30) .5 0 0 t +483.48 89.28 (40) .5 0 0 t +571.27 89.28 (50) .5 0 0 t +659.06 89.28 (60) .5 0 0 t +746.86 89.28 (70) .5 0 0 t +np +184.05 128.16 m +594.48 0 l +0 360.56 l +-594.48 0 l +0 -360.56 l o 18.00 18.00 823.89 577.28 cl /ps 22 def /Font2 findfont 22 s 0 0 0 rgb -481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t +481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t ep %%Page: 5 5 bp @@ -3771,8 +3771,8 @@ np 0 -7.20 l o /ps 12 def /Font1 findfont 12 s -78.70 65.52 (1 e-11) .5 0 0 t -222.02 65.52 (1 e+53) .5 0 0 t +78.70 65.52 (1e-11) .5 0 0 t +222.02 65.52 (1e+53) .5 0 0 t 365.35 65.52 (1e+117) .5 0 0 t 508.68 65.52 (1e+181) .5 0 0 t 652.00 65.52 (1e+245) .5 0 0 t @@ -3800,8 +3800,8 @@ np 77.04 436.50 m -7.20 0 l o -59.76 92.27 (1 e-10) .5 0 90 t -59.76 178.32 (1 e+49) .5 0 90 t +59.76 92.27 (1e-10) .5 0 90 t +59.76 178.32 (1e+49) .5 0 90 t 59.76 264.38 (1e+108) .5 0 90 t 59.76 350.44 (1e+167) .5 0 90 t 59.76 436.50 (1e+226) .5 0 90 t diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R --- R-2.4.0.old/tests/reg-tests-1.R 2006-09-25 21:05:07.000000000 -0500 +++ R-2.4.0/tests/reg-tests-1.R 2006-10-28 14:36:01.000000000 -0500 @@ -4494,3 +4494,20 @@ test <- 1:10 try(test[2:4] <- ls) # fails stopifnot(!exists("*tmp*", where=1)) ## was true < 2.4.0 + + +## merge on zero-row data frames +L3 <- LETTERS[1:3] +d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE)) +e <- d[-1,] +merge(d, e, by.x = "x", by.y = "x", all.x = TRUE) +## + + +## PR#9313 +library(stats4) +g <- function(x, y) -cos(x) + abs(y) +fit1 <- mle(g, start = list(x = 0, y = 7)) +fit2 <- mle(g, start = list(y = 7, x = 0)) +stopifnot(all.equal(coef(fit1), coef(fit2))) +## Found different solutions in 2.4.0, as names were not remapped in fit2 diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R --- R-2.4.0.old/tests/reg-tests-2.R 2006-09-22 21:05:09.000000000 -0500 +++ R-2.4.0/tests/reg-tests-2.R 2006-10-28 14:36:01.000000000 -0500 @@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",") ### end of tests added in 2.4.0 ### + + +## Platform-specific behaviour in lowess reported to R-help +## 2006-10-12 by Frank Harrell +x <- c(0,7,8,14,15,120,242) +y <- c(122,128,130,158,110,110,92) +lowess(x, y, iter=0) +lowess(x, y) +## MAD of iterated residuals was zero, and result depended on the platform. + + +### end of tests added in 2.4.1 ### diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save --- R-2.4.0.old/tests/reg-tests-2.Rout.save 2006-09-25 21:05:07.000000000 -0500 +++ R-2.4.0/tests/reg-tests-2.Rout.save 2006-10-28 14:36:01.000000000 -0500 @@ -1,6 +1,6 @@ -R version 2.4.0 beta (2005-09-25 r39509) -Copyright (C) The R Foundation for Statistical Computing +R version 2.5.0 Under development (unstable) (2006-10-15 r39637) +Copyright (C) 2006 The R Foundation for Statistical Computing ISBN 3-900051-07-0 R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg > > ### end of tests added in 2.4.0 ### > +> +> ## Platform-specific behaviour in lowess reported to R-help +> ## 2006-10-12 by Frank Harrell +> x <- c(0,7,8,14,15,120,242) +> y <- c(122,128,130,158,110,110,92) +> lowess(x, y, iter=0) +$x +[1] 0 7 8 14 15 120 242 + +$y +[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903 92.00003 + +> lowess(x, y) +$x +[1] 0 7 8 14 15 120 242 + +$y +[1] 122 128 128 158 110 110 92 + +> ## MAD of iterated residuals was zero, and result depended on the platform. +> +> +> ### end of tests added in 2.4.1 ### +> diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION --- R-2.4.0.old/VERSION 2006-10-03 05:00:12.000000000 -0500 +++ R-2.4.0/VERSION 2006-10-03 07:19:25.000000000 -0500 @@ -1 +1 @@ -2.4.0 +2.4.0 Patched Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- R.spec 4 Nov 2006 06:16:09 -0000 1.18 +++ R.spec 4 Nov 2006 06:19:56 -0000 1.19 @@ -1,6 +1,6 @@ Name: R Version: 2.4.0 -Release: 2%{?dist} +Release: 2%{?dist}.1 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 @@ -230,6 +230,9 @@ /sbin/ldconfig %changelog +* Sat Nov 4 2006 Tom "spot" Callaway 2.4.0-2.1 +- minor bump to fix my idiot mistake in cvs for fc4 + * Fri Nov 3 2006 Tom "spot" Callaway 2.4.0-2 - sync with patched 2006-11-03 level to fix PR#9339 From fedora-extras-commits at redhat.com Sat Nov 4 08:58:46 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 4 Nov 2006 01:58:46 -0700 Subject: rpms/gaim-gaym/devel .cvsignore, 1.4, 1.5 gaim-gaym.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200611040858.kA48wkZs022906@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22883 Modified Files: .cvsignore gaim-gaym.spec sources Log Message: update to svn release 290 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Oct 2006 06:05:07 -0000 1.4 +++ .cvsignore 4 Nov 2006 08:58:16 -0000 1.5 @@ -1,2 +1,2 @@ -qrc-0.96-289svn.tar.gz -gaim-2.0.0beta3.tar.bz2 +qrc-0.96-290svn.tar.gz +gaim-2.0.0beta4.tar.gz Index: gaim-gaym.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gaim-gaym.spec 24 Oct 2006 06:05:07 -0000 1.3 +++ gaim-gaym.spec 4 Nov 2006 08:58:16 -0000 1.4 @@ -2,23 +2,23 @@ %define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }') %define gaim_max 2:3.0.0 -%define gaimsrcver 2.0.0beta3 +%define gaimsrcver 2.0.0beta4 # it's not quite 0.97, but it's definitely: # branch: fork-for-gaim-2 -# svn release: 289 -%define alphatag 289svn +# svn release: 290 +%define alphatag 290svn Name: gaim-gaym Version: 0.96 -Release: 3%{?alphatag:.2.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.4.%{alphatag}}%{?dist} Summary: A gay.com protocol plugin for gaim Group: Applications/Internet License: GPL URL: http://groups.yahoo.com/group/gaymplugin/ Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz -Source1: http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2 +Source1: http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim-devel < %{gaim_max}, gtk2-devel @@ -43,15 +43,15 @@ # copy the needed headers to the right places... for i in gaym/src bot-challenger gaym-extras/src ; do - cp gaim-%{gaimsrcver}/src/internal.h $i - cp gaim-%{gaimsrcver}/src/prefix.h $i + cp gaim-%{gaimsrcver}/libgaim/internal.h $i + cp gaim-%{gaimsrcver}/libgaim/prefix.h $i done rm -rf gaim-%{gaimsrcver} %build autoreconf --force --install -%configure --enable-display_options +%configure --enable-display_options --disable-gaym-extras make %{?_smp_mflags} @@ -70,12 +70,19 @@ # README.svn and README.mingw pertain to devel & win32 issues %doc ChangeLog COPYING INSTALL README TODO %{_libdir}/gaim/*.so -%{_datadir}/pixmaps/gaim/gaym %{_datadir}/pixmaps/gaim/status/default/* %exclude %{_libdir}/gaim/*.la %changelog +* Sat Nov 04 2006 Chris Weyl 0.96-3.4.290svn +- update to svn rel 290, tag fork-for-gaim-2 + +* Sun Oct 29 2006 Chris Weyl 0.96-3.3.289svn +- rebuilt with beta4 +- disable the extras plugin; beta4 breaks compilation :( +- gaim_url_fetch becomes gaim_util_fetch_url + * Mon Oct 23 2006 Chris Weyl 0.96-3.2.289svn - it helps to upload all sources to the lookaside cache. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Oct 2006 06:05:07 -0000 1.4 +++ sources 4 Nov 2006 08:58:16 -0000 1.5 @@ -1,2 +1,2 @@ -34e5740bf03eeb2bd68dfeac54404813 qrc-0.96-289svn.tar.gz -c077655e4dd251cf22c406777c985a74 gaim-2.0.0beta3.tar.bz2 +e21596c613f98a9d4661a1118757e35b qrc-0.96-290svn.tar.gz +9bd1d2a9191d4083ff8161b5683cc8a7 gaim-2.0.0beta4.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 08:59:52 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 4 Nov 2006 01:59:52 -0700 Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200611040859.kA48xqDt022971@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/gaim-gaym/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22949 Modified Files: gaim-gaym.spec sources Log Message: update to svn 290 Index: gaim-gaym.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-gaym.spec 24 Oct 2006 06:12:24 -0000 1.2 +++ gaim-gaym.spec 4 Nov 2006 08:59:22 -0000 1.3 @@ -2,23 +2,23 @@ %define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }') %define gaim_max 2:3.0.0 -%define gaimsrcver 2.0.0beta3 +%define gaimsrcver 2.0.0beta4 # it's not quite 0.97, but it's definitely: # branch: fork-for-gaim-2 -# svn release: 289 -%define alphatag 289svn +# svn release: 290 +%define alphatag 290svn Name: gaim-gaym Version: 0.96 -Release: 3%{?alphatag:.2.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.4.%{alphatag}}%{?dist} Summary: A gay.com protocol plugin for gaim Group: Applications/Internet License: GPL URL: http://groups.yahoo.com/group/gaymplugin/ Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz -Source1: http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2 +Source1: http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim-devel < %{gaim_max}, gtk2-devel @@ -43,15 +43,15 @@ # copy the needed headers to the right places... for i in gaym/src bot-challenger gaym-extras/src ; do - cp gaim-%{gaimsrcver}/src/internal.h $i - cp gaim-%{gaimsrcver}/src/prefix.h $i + cp gaim-%{gaimsrcver}/libgaim/internal.h $i + cp gaim-%{gaimsrcver}/libgaim/prefix.h $i done rm -rf gaim-%{gaimsrcver} %build autoreconf --force --install -%configure --enable-display_options +%configure --enable-display_options --disable-gaym-extras make %{?_smp_mflags} @@ -70,12 +70,19 @@ # README.svn and README.mingw pertain to devel & win32 issues %doc ChangeLog COPYING INSTALL README TODO %{_libdir}/gaim/*.so -%{_datadir}/pixmaps/gaim/gaym %{_datadir}/pixmaps/gaim/status/default/* %exclude %{_libdir}/gaim/*.la %changelog +* Sat Nov 04 2006 Chris Weyl 0.96-3.4.290svn +- update to svn rel 290, tag fork-for-gaim-2 + +* Sun Oct 29 2006 Chris Weyl 0.96-3.3.289svn +- rebuilt with beta4 +- disable the extras plugin; beta4 breaks compilation :( +- gaim_url_fetch becomes gaim_util_fetch_url + * Mon Oct 23 2006 Chris Weyl 0.96-3.2.289svn - it helps to upload all sources to the lookaside cache. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Oct 2006 06:12:24 -0000 1.3 +++ sources 4 Nov 2006 08:59:22 -0000 1.4 @@ -1,2 +1,2 @@ -34e5740bf03eeb2bd68dfeac54404813 qrc-0.96-289svn.tar.gz -c077655e4dd251cf22c406777c985a74 gaim-2.0.0beta3.tar.bz2 +e21596c613f98a9d4661a1118757e35b qrc-0.96-290svn.tar.gz +9bd1d2a9191d4083ff8161b5683cc8a7 gaim-2.0.0beta4.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 09:14:50 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 4 Nov 2006 02:14:50 -0700 Subject: rpms/plone/FC-6 .cvsignore, 1.12, 1.13 plone.spec, 1.19, 1.20 sources, 1.12, 1.13 Message-ID: <200611040914.kA49EoEe026264@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26207/FC-6 Modified Files: .cvsignore plone.spec sources Log Message: add Plone Hotfix 20061031 (bug 213983) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plone/FC-6/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 30 Oct 2006 18:22:07 -0000 1.12 +++ .cvsignore 4 Nov 2006 09:14:19 -0000 1.13 @@ -1 +1,2 @@ Plone-2.5.1-final.tar.gz +PloneHotFix20061031.tar.gz Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plone.spec 30 Oct 2006 18:22:07 -0000 1.19 +++ plone.spec 4 Nov 2006 09:14:19 -0000 1.20 @@ -6,14 +6,14 @@ Name: plone Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons URL: http://www.plone.org/ Source0: http://dl.sf.net/plone/Plone-%{version}-final.tar.gz #Source1: http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz -#Source10: http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz +Source10: http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz #Patch0: Plone-2.5-atxmlperms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,8 +28,9 @@ products. %prep -%setup -q -n Plone-%{version} -#%patch0 -p0 -b .atxmlperms +#%%setup -q -n Plone-%{version} -a 10 +# Hotfix +%setup -q -n Plone-%{version} -a 10 # Clean up sources find . -type d -name CVS | xargs rm -rf find . -type f -name .cvsignore | xargs rm -rf @@ -72,6 +73,9 @@ %changelog +* Sat Nov 04 2006 Aurelien Bompard 2.5.1-3 +- add Plone Hotfix 20061031 (bug 213983) + * Mon Oct 30 2006 Aurelien Bompard 2.5.1-1 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/plone/FC-6/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Oct 2006 18:22:07 -0000 1.12 +++ sources 4 Nov 2006 09:14:19 -0000 1.13 @@ -1 +1,2 @@ cb965ed5eb4f863b124c0151824a2b5a Plone-2.5.1-final.tar.gz +bc2b48651750bfc9e901664695e0e44c PloneHotFix20061031.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 09:14:49 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 4 Nov 2006 02:14:49 -0700 Subject: rpms/plone/FC-5 .cvsignore, 1.12, 1.13 plone.spec, 1.19, 1.20 sources, 1.12, 1.13 Message-ID: <200611040914.kA49Enks026259@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26207/FC-5 Modified Files: .cvsignore plone.spec sources Log Message: add Plone Hotfix 20061031 (bug 213983) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plone/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 30 Oct 2006 18:22:06 -0000 1.12 +++ .cvsignore 4 Nov 2006 09:14:18 -0000 1.13 @@ -1 +1,2 @@ Plone-2.5.1-final.tar.gz +PloneHotFix20061031.tar.gz Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plone.spec 30 Oct 2006 18:22:06 -0000 1.19 +++ plone.spec 4 Nov 2006 09:14:18 -0000 1.20 @@ -6,14 +6,14 @@ Name: plone Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons URL: http://www.plone.org/ Source0: http://dl.sf.net/plone/Plone-%{version}-final.tar.gz #Source1: http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz -#Source10: http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz +Source10: http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz #Patch0: Plone-2.5-atxmlperms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,8 +28,9 @@ products. %prep -%setup -q -n Plone-%{version} -#%patch0 -p0 -b .atxmlperms +#%%setup -q -n Plone-%{version} -a 10 +# Hotfix +%setup -q -n Plone-%{version} -a 10 # Clean up sources find . -type d -name CVS | xargs rm -rf find . -type f -name .cvsignore | xargs rm -rf @@ -72,6 +73,9 @@ %changelog +* Sat Nov 04 2006 Aurelien Bompard 2.5.1-3 +- add Plone Hotfix 20061031 (bug 213983) + * Mon Oct 30 2006 Aurelien Bompard 2.5.1-1 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/plone/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Oct 2006 18:22:06 -0000 1.12 +++ sources 4 Nov 2006 09:14:18 -0000 1.13 @@ -1 +1,2 @@ cb965ed5eb4f863b124c0151824a2b5a Plone-2.5.1-final.tar.gz +bc2b48651750bfc9e901664695e0e44c PloneHotFix20061031.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 09:14:55 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 4 Nov 2006 02:14:55 -0700 Subject: rpms/plone/devel .cvsignore, 1.12, 1.13 plone.spec, 1.19, 1.20 sources, 1.12, 1.13 Message-ID: <200611040914.kA49EtAg026269@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/plone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26207/devel Modified Files: .cvsignore plone.spec sources Log Message: add Plone Hotfix 20061031 (bug 213983) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 30 Oct 2006 17:27:20 -0000 1.12 +++ .cvsignore 4 Nov 2006 09:14:25 -0000 1.13 @@ -1 +1,2 @@ Plone-2.5.1-final.tar.gz +PloneHotFix20061031.tar.gz Index: plone.spec =================================================================== RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plone.spec 30 Oct 2006 18:22:08 -0000 1.19 +++ plone.spec 4 Nov 2006 09:14:25 -0000 1.20 @@ -6,14 +6,14 @@ Name: plone Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: User friendly and powerful open source Content Management System License: GPL Group: System Environment/Daemons URL: http://www.plone.org/ Source0: http://dl.sf.net/plone/Plone-%{version}-final.tar.gz #Source1: http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz -#Source10: http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz +Source10: http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz #Patch0: Plone-2.5-atxmlperms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,8 +28,9 @@ products. %prep -%setup -q -n Plone-%{version} -#%patch0 -p0 -b .atxmlperms +#%%setup -q -n Plone-%{version} -a 10 +# Hotfix +%setup -q -n Plone-%{version} -a 10 # Clean up sources find . -type d -name CVS | xargs rm -rf find . -type f -name .cvsignore | xargs rm -rf @@ -72,6 +73,9 @@ %changelog +* Sat Nov 04 2006 Aurelien Bompard 2.5.1-3 +- add Plone Hotfix 20061031 (bug 213983) + * Mon Oct 30 2006 Aurelien Bompard 2.5.1-1 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/plone/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Oct 2006 17:27:20 -0000 1.12 +++ sources 4 Nov 2006 09:14:25 -0000 1.13 @@ -1 +1,2 @@ cb965ed5eb4f863b124c0151824a2b5a Plone-2.5.1-final.tar.gz +bc2b48651750bfc9e901664695e0e44c PloneHotFix20061031.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 09:17:50 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 4 Nov 2006 02:17:50 -0700 Subject: rpms/perl-Event Makefile,1.2,1.3 Message-ID: <200611040917.kA49Ho1c026454@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Event In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385 Modified Files: Makefile Log Message: update to 1.08 Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Event/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 16 Oct 2006 04:37:24 -0000 1.2 +++ Makefile 4 Nov 2006 09:17:20 -0000 1.3 @@ -3,7 +3,7 @@ @cvs update # for target build-all -BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//') +BRANCHES := $(shell cat ../current-branches | sed -e 's/:.*//') # tag & build all non-legacy branches... build-all : From fedora-extras-commits at redhat.com Sat Nov 4 09:17:51 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 4 Nov 2006 02:17:51 -0700 Subject: rpms/perl-Event/FC-5 perl-Event.spec,1.3,1.4 sources,1.3,1.4 Message-ID: <200611040917.kA49HpGb026458@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Event/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385/FC-5 Modified Files: perl-Event.spec sources Log Message: update to 1.08 Index: perl-Event.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Event/FC-5/perl-Event.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Event.spec 16 Oct 2006 04:37:25 -0000 1.3 +++ perl-Event.spec 4 Nov 2006 09:17:21 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-Event -Version: 1.07 +Version: 1.08 Release: 1%{?dist} Summary: Event loop processing @@ -13,9 +13,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Time::HiRes) -# for some reason this isn't automagically picked up -Provides: perl(Event) = %{version} - %description The Event module provide a central facility to watch for various types of events and invoke a callback when these events occur. The idea is to delay the @@ -82,6 +79,9 @@ %changelog +* Sat Nov 04 2006 Chris Weyl 1.08-1 +- update to 1.08 + * Sun Oct 15 2006 Chris Weyl 1.07-1 - update to 1.07 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Event/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Oct 2006 04:37:25 -0000 1.3 +++ sources 4 Nov 2006 09:17:21 -0000 1.4 @@ -1 +1 @@ -34b6eaf0b3658cd800b7d8727be7e9c4 Event-1.07.tar.gz +475b5613c584256fa23b4215103f106c Event-1.08.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 09:17:57 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 4 Nov 2006 02:17:57 -0700 Subject: rpms/perl-Event/devel .cvsignore, 1.3, 1.4 perl-Event.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611040917.kA49Hv2a026467@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Event/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385/devel Modified Files: .cvsignore perl-Event.spec sources Log Message: update to 1.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Event/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Oct 2006 04:37:26 -0000 1.3 +++ .cvsignore 4 Nov 2006 09:17:27 -0000 1.4 @@ -1 +1 @@ -Event-1.07.tar.gz +Event-1.08.tar.gz Index: perl-Event.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Event/devel/perl-Event.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Event.spec 16 Oct 2006 04:37:26 -0000 1.4 +++ perl-Event.spec 4 Nov 2006 09:17:27 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Event -Version: 1.07 +Version: 1.08 Release: 1%{?dist} Summary: Event loop processing @@ -13,9 +13,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Time::HiRes) -# for some reason this isn't automagically picked up -Provides: perl(Event) = %{version} - %description The Event module provide a central facility to watch for various types of events and invoke a callback when these events occur. The idea is to delay the @@ -82,6 +79,9 @@ %changelog +* Sat Nov 04 2006 Chris Weyl 1.08-1 +- update to 1.08 + * Sun Oct 15 2006 Chris Weyl 1.07-1 - update to 1.07 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Event/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Oct 2006 04:37:26 -0000 1.3 +++ sources 4 Nov 2006 09:17:27 -0000 1.4 @@ -1 +1 @@ -34b6eaf0b3658cd800b7d8727be7e9c4 Event-1.07.tar.gz +475b5613c584256fa23b4215103f106c Event-1.08.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 09:17:56 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Sat, 4 Nov 2006 02:17:56 -0700 Subject: rpms/perl-Event/FC-6 perl-Event.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200611040917.kA49HuoS026462@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Event/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385/FC-6 Modified Files: perl-Event.spec sources Log Message: update to 1.08 Index: perl-Event.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Event/FC-6/perl-Event.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Event.spec 16 Oct 2006 04:37:26 -0000 1.4 +++ perl-Event.spec 4 Nov 2006 09:17:26 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Event -Version: 1.07 +Version: 1.08 Release: 1%{?dist} Summary: Event loop processing @@ -13,9 +13,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Time::HiRes) -# for some reason this isn't automagically picked up -Provides: perl(Event) = %{version} - %description The Event module provide a central facility to watch for various types of events and invoke a callback when these events occur. The idea is to delay the @@ -82,6 +79,9 @@ %changelog +* Sat Nov 04 2006 Chris Weyl 1.08-1 +- update to 1.08 + * Sun Oct 15 2006 Chris Weyl 1.07-1 - update to 1.07 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Event/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Oct 2006 04:37:26 -0000 1.3 +++ sources 4 Nov 2006 09:17:26 -0000 1.4 @@ -1 +1 @@ -34b6eaf0b3658cd800b7d8727be7e9c4 Event-1.07.tar.gz +475b5613c584256fa23b4215103f106c Event-1.08.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 09:37:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Nov 2006 02:37:45 -0700 Subject: fedora-security/audit fe4,1.89,1.90 fe5,1.96,1.97 fe6,1.9,1.10 Message-ID: <200611040937.kA49bkhf026693@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26671 Modified Files: fe4 fe5 fe6 Log Message: +CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- fe4 2 Nov 2006 19:23:23 -0000 1.89 +++ fe4 4 Nov 2006 09:37:43 -0000 1.90 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 CVE-2006-5455 VULNERABLE (bugzilla) #212355 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- fe5 2 Nov 2006 19:23:23 -0000 1.96 +++ fe5 4 Nov 2006 09:37:43 -0000 1.97 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 CVE-2006-5455 VULNERABLE (bugzilla) #212355 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fe6 2 Nov 2006 19:23:23 -0000 1.9 +++ fe6 4 Nov 2006 09:37:43 -0000 1.10 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 CVE-2006-5455 VULNERABLE (bugzilla) #212355 From fedora-extras-commits at redhat.com Sat Nov 4 12:04:43 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sat, 4 Nov 2006 05:04:43 -0700 Subject: comps comps-fe5.xml.in, 1.189, 1.190 comps-fe6.xml.in, 1.213, 1.214 comps-fe7.xml.in, 1.11, 1.12 Message-ID: <200611041204.kA4C4hDk004594@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4566 Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: added nyquist Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- comps-fe5.xml.in 2 Nov 2006 21:52:28 -0000 1.189 +++ comps-fe5.xml.in 4 Nov 2006 12:04:12 -0000 1.190 @@ -804,6 +804,7 @@ kid3 kover libvisual-plugins + nyquist regionset rosegarden4 soundconverter Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- comps-fe6.xml.in 2 Nov 2006 21:52:28 -0000 1.213 +++ comps-fe6.xml.in 4 Nov 2006 12:04:12 -0000 1.214 @@ -854,6 +854,7 @@ kid3 kover nomadsync + nyquist regionset rosegarden4 soundconverter Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- comps-fe7.xml.in 2 Nov 2006 21:52:28 -0000 1.11 +++ comps-fe7.xml.in 4 Nov 2006 12:04:12 -0000 1.12 @@ -854,6 +854,7 @@ kid3 kover nomadsync + nyquist regionset rosegarden4 soundconverter From fedora-extras-commits at redhat.com Sat Nov 4 12:26:02 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 4 Nov 2006 05:26:02 -0700 Subject: rpms/moomps/devel moomps.spec,1.14,1.15 Message-ID: <200611041226.kA4CQ2BQ004798@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4769 Modified Files: moomps.spec Log Message: properly support 64 bit architecture by passing library directories to make. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- moomps.spec 24 Oct 2006 18:50:31 -0000 1.14 +++ moomps.spec 4 Nov 2006 12:25:32 -0000 1.15 @@ -1,6 +1,6 @@ Name: moomps Version: 5.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -29,7 +29,7 @@ %setup -q %build -make %{?_smp_mflags} +make LIBDIR=%_libdir TCLLIBDIR=%_libdir %install rm -rf $RPM_BUILD_ROOT @@ -81,6 +81,10 @@ %changelog +* Sat Nov 4 2006 Jean-Luc Fontaine 5.7-2 +- properly support 64 bit architecture by passing library + directories to make + * Sat Oct 1 2006 Jean-Luc Fontaine 5.7-1 - 5.7 upstream release From fedora-extras-commits at redhat.com Sat Nov 4 12:28:34 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 4 Nov 2006 05:28:34 -0700 Subject: rpms/moomps/FC-6 moomps.spec,1.14,1.15 Message-ID: <200611041228.kA4CSY7K004877@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4861 Modified Files: moomps.spec Log Message: properly support 64 bit architecture by passing library directories to make. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-6/moomps.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- moomps.spec 24 Oct 2006 18:54:15 -0000 1.14 +++ moomps.spec 4 Nov 2006 12:28:04 -0000 1.15 @@ -1,6 +1,6 @@ Name: moomps Version: 5.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -29,7 +29,7 @@ %setup -q %build -make %{?_smp_mflags} +make LIBDIR=%_libdir TCLLIBDIR=%_libdir %install rm -rf $RPM_BUILD_ROOT @@ -81,6 +81,10 @@ %changelog +* Sat Nov 4 2006 Jean-Luc Fontaine 5.7-2 +- properly support 64 bit architecture by passing library + directories to make + * Sat Oct 1 2006 Jean-Luc Fontaine 5.7-1 - 5.7 upstream release From fedora-extras-commits at redhat.com Sat Nov 4 12:30:00 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 4 Nov 2006 05:30:00 -0700 Subject: rpms/moomps/FC-5 moomps.spec,1.13,1.14 Message-ID: <200611041230.kA4CU0Ae004937@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4921 Modified Files: moomps.spec Log Message: properly support 64 bit architecture by passing library directories to make. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- moomps.spec 24 Oct 2006 18:51:57 -0000 1.13 +++ moomps.spec 4 Nov 2006 12:29:30 -0000 1.14 @@ -1,6 +1,6 @@ Name: moomps Version: 5.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -29,7 +29,7 @@ %setup -q %build -make %{?_smp_mflags} +make LIBDIR=%_libdir TCLLIBDIR=%_libdir %install rm -rf $RPM_BUILD_ROOT @@ -81,6 +81,10 @@ %changelog +* Sat Nov 4 2006 Jean-Luc Fontaine 5.7-2 +- properly support 64 bit architecture by passing library + directories to make + * Sat Oct 1 2006 Jean-Luc Fontaine 5.7-1 - 5.7 upstream release From fedora-extras-commits at redhat.com Sat Nov 4 12:56:11 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 4 Nov 2006 05:56:11 -0700 Subject: owners owners.list,1.1889,1.1890 Message-ID: <200611041256.kA4CuBPL005127@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5106 Modified Files: owners.list Log Message: fix broken alex4 entry Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1889 retrieving revision 1.1890 diff -u -r1.1889 -r1.1890 --- owners.list 3 Nov 2006 16:35:53 -0000 1.1889 +++ owners.list 4 Nov 2006 12:55:41 -0000 1.1890 @@ -35,7 +35,7 @@ Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|akode|Audio-decoding framework|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|alacarte|Simple menu editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|foolish at guezz.net,jpmahowald at gmail.com -Fedora Extras|alex4|Alex the Allegator 4 - Platform game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org +Fedora Extras|alex4|Alex the Allegator 4 - Platform game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|alleggl|OpenGL support library for Allegro|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl Fedora Extras|AllegroOGG|Ogg library for use with the Allegro game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Nov 4 12:59:12 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Sat, 4 Nov 2006 05:59:12 -0700 Subject: rpms/amsn/devel amsn.spec, 1.5, 1.6 amsn-0.96-configureac-nolocate.patch, 1.1, NONE amsn-0.96-tkcximage-locallibs.patch, 1.1, NONE Message-ID: <200611041259.kA4CxC7Z005179@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5158 Modified Files: amsn.spec Removed Files: amsn-0.96-configureac-nolocate.patch amsn-0.96-tkcximage-locallibs.patch Log Message: * Thu Sep 4 2006 Sander Hoentjen - 0.96-2 - webcam now works (bug #206674) Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- amsn.spec 2 Nov 2006 22:26:32 -0000 1.5 +++ amsn.spec 4 Nov 2006 12:58:42 -0000 1.6 @@ -1,6 +1,6 @@ Name: amsn Version: 0.96 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet @@ -33,6 +33,11 @@ %patch1 -p1 -b .1-system-bwidget rm -r utils/TkCximage/src/{jpeg,png,zlib} rm -r utils/BWidget-1.7.0 + +# for webcam to work these paths need to be added because we move libs around +%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c +%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c + %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in %{__sed} -i 's#mozilla#htmlview#' config.tcl %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl @@ -116,6 +121,9 @@ %changelog +* Thu Sep 4 2006 Sander Hoentjen - 0.96-2 +- webcam now works (bug #206674) + * Thu Sep 2 2006 Sander Hoentjen - 0.96-1 - updated to 0.96 final - drop nolocate and locallibs patch because they were accepted upstream --- amsn-0.96-configureac-nolocate.patch DELETED --- --- amsn-0.96-tkcximage-locallibs.patch DELETED --- From fedora-extras-commits at redhat.com Sat Nov 4 13:01:32 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Sat, 4 Nov 2006 06:01:32 -0700 Subject: rpms/amsn/FC-6 amsn.spec,1.5,1.6 Message-ID: <200611041301.kA4D1WDf008171@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5240 Modified Files: amsn.spec Log Message: * Thu Sep 4 2006 Sander Hoentjen - 0.96-2 - webcam now works (bug #206674) Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/FC-6/amsn.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- amsn.spec 2 Nov 2006 22:41:25 -0000 1.5 +++ amsn.spec 4 Nov 2006 13:01:02 -0000 1.6 @@ -1,6 +1,6 @@ Name: amsn Version: 0.96 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet @@ -33,6 +33,11 @@ %patch1 -p1 -b .1-system-bwidget rm -r utils/TkCximage/src/{jpeg,png,zlib} rm -r utils/BWidget-1.7.0 + +# for webcam to work these paths need to be added because we move libs around +%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c +%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c + %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in %{__sed} -i 's#mozilla#htmlview#' config.tcl %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl @@ -116,6 +121,9 @@ %changelog +* Thu Sep 4 2006 Sander Hoentjen - 0.96-2 +- webcam now works (bug #206674) + * Thu Sep 2 2006 Sander Hoentjen - 0.96-1 - updated to 0.96 final - drop nolocate and locallibs patch because they were accepted upstream From fedora-extras-commits at redhat.com Sat Nov 4 13:04:06 2006 From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun)) Date: Sat, 4 Nov 2006 06:04:06 -0700 Subject: rpms/amsn/FC-5 amsn.spec,1.2,1.3 Message-ID: <200611041304.kA4D469M008261@cvs-int.fedora.redhat.com> Author: tjikkun Update of /cvs/extras/rpms/amsn/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8233 Modified Files: amsn.spec Log Message: * Thu Sep 4 2006 Sander Hoentjen - 0.96-2 - webcam now works (bug #206674) Index: amsn.spec =================================================================== RCS file: /cvs/extras/rpms/amsn/FC-5/amsn.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- amsn.spec 2 Nov 2006 22:45:19 -0000 1.2 +++ amsn.spec 4 Nov 2006 13:03:36 -0000 1.3 @@ -1,6 +1,6 @@ Name: amsn Version: 0.96 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MSN Messenger clone for Linux, Mac and Windows Group: Applications/Internet @@ -33,6 +33,11 @@ %patch1 -p1 -b .1-system-bwidget rm -r utils/TkCximage/src/{jpeg,png,zlib} rm -r utils/BWidget-1.7.0 + +# for webcam to work these paths need to be added because we move libs around +%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c +%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c + %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in %{__sed} -i 's#mozilla#htmlview#' config.tcl %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl @@ -116,6 +121,9 @@ %changelog +* Thu Sep 4 2006 Sander Hoentjen - 0.96-2 +- webcam now works (bug #206674) + * Thu Sep 2 2006 Sander Hoentjen - 0.96-1 - updated to 0.96 final - drop nolocate and locallibs patch because they were accepted upstream From fedora-extras-commits at redhat.com Sat Nov 4 13:05:18 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sat, 4 Nov 2006 06:05:18 -0700 Subject: rpms/mail-notification/devel mail-notification-fedora-plugin-hint.patch, NONE, 1.1 mail-notification.spec, 1.30, 1.31 Message-ID: <200611041305.kA4D5Ijg008338@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8315 Modified Files: mail-notification.spec Added Files: mail-notification-fedora-plugin-hint.patch Log Message: 3.0-9 -- add a patch that informs the user to install the evolution-plugin if he want to use mn with evo mail-notification-fedora-plugin-hint.patch: --- NEW FILE mail-notification-fedora-plugin-hint.patch --- diff -Naur mail-notification-3.0.org/src/mn-evolution-mailbox-properties.c mail-notification-3.0/src/mn-evolution-mailbox-properties.c --- mail-notification-3.0.org/src/mn-evolution-mailbox-properties.c 2006-11-04 13:28:17.000000000 +0100 +++ mail-notification-3.0/src/mn-evolution-mailbox-properties.c 2006-11-04 13:39:55.000000000 +0100 @@ -387,7 +387,7 @@ selfp->pbag = bonobo_object_release_unref(selfp->pbag, NULL); selfp->listener = bonobo_object_release_unref(selfp->listener, NULL); - label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded.")); + label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded and installed. Fedora ships the plugin in a sperate package called mail-notification-evolution-plugin you might need to install manually.")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mail-notification.spec 29 Oct 2006 15:26:17 -0000 1.30 +++ mail-notification.spec 4 Nov 2006 13:04:46 -0000 1.31 @@ -2,7 +2,7 @@ Name: mail-notification Version: 3.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -10,6 +10,7 @@ URL: http://www.nongnu.org/mailnotify/ Source0: http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz Source1: mail-notification-README.FEDORA +Patch0: mail-notification-fedora-plugin-hint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext >= 0.14.1 @@ -55,6 +56,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .patch0 cp %{SOURCE1} ./README.FEDORA # FIXME -- quick workaround for now sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure @@ -131,6 +133,10 @@ %changelog +* 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 + * Sun Oct 29 2006 Thorsten Leemhuis 3.0-8 - add workaround that hacks configure to allow building with evo 2.10 From fedora-extras-commits at redhat.com Sat Nov 4 13:05:49 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Sat, 4 Nov 2006 06:05:49 -0700 Subject: rpms/mock/devel arch-specific-repo.patch, 1.1, 1.2 mock.spec, 1.26, 1.27 Message-ID: <200611041305.kA4D5n9F008400@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8337 Modified Files: arch-specific-repo.patch mock.spec Log Message: Fix a typo arch-specific-repo.patch: Index: arch-specific-repo.patch =================================================================== RCS file: /cvs/extras/rpms/mock/devel/arch-specific-repo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- arch-specific-repo.patch 3 Nov 2006 21:03:23 -0000 1.1 +++ arch-specific-repo.patch 4 Nov 2006 13:05:18 -0000 1.2 @@ -5,12 +5,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc [groups] name=groups @@ -19,7 +19,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mock.spec 3 Nov 2006 21:03:23 -0000 1.26 +++ mock.spec 4 Nov 2006 13:05:18 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ %changelog +* Sat Nov 4 2006 Jesse Keating - 0.6.8-3 +- Fix a typo in the patch that added x86_64 repos for fc4ppc + * Fri Nov 3 2006 Jesse Keating - 0.6.8-2 - Add patch to fix repo files to use arch specific repos (#213516) From fedora-extras-commits at redhat.com Sat Nov 4 13:07:58 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Sat, 4 Nov 2006 06:07:58 -0700 Subject: rpms/mock/FC-5 arch-specific-repo.patch, 1.1, 1.2 mock.spec, 1.24, 1.25 Message-ID: <200611041307.kA4D7wO7008544@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8503/FC-5 Modified Files: arch-specific-repo.patch mock.spec Log Message: Port devel/ fixes back to FC-6 and FC-5 arch-specific-repo.patch: Index: arch-specific-repo.patch =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/arch-specific-repo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- arch-specific-repo.patch 3 Nov 2006 21:12:30 -0000 1.1 +++ arch-specific-repo.patch 4 Nov 2006 13:07:28 -0000 1.2 @@ -5,12 +5,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc [groups] name=groups @@ -19,7 +19,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mock.spec 3 Nov 2006 21:12:30 -0000 1.24 +++ mock.spec 4 Nov 2006 13:07:28 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ %changelog +* Sat Nov 4 2006 Jesse Keating - 0.6.8-3 +- Fix a typo in the patch that added x86_64 repos for fc4ppc + * Fri Nov 3 2006 Jesse Keating - 0.6.8-2 - Add patch to fix repo files to use arch specific repos (#213516) From fedora-extras-commits at redhat.com Sat Nov 4 13:07:59 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Sat, 4 Nov 2006 06:07:59 -0700 Subject: rpms/mock/FC-6 arch-specific-repo.patch, 1.1, 1.2 mock.spec, 1.25, 1.26 Message-ID: <200611041307.kA4D7xRV008548@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8503/FC-6 Modified Files: arch-specific-repo.patch mock.spec Log Message: Port devel/ fixes back to FC-6 and FC-5 arch-specific-repo.patch: Index: arch-specific-repo.patch =================================================================== RCS file: /cvs/extras/rpms/mock/FC-6/arch-specific-repo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- arch-specific-repo.patch 3 Nov 2006 21:12:31 -0000 1.1 +++ arch-specific-repo.patch 4 Nov 2006 13:07:28 -0000 1.2 @@ -5,12 +5,12 @@ [core] name=core -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os [updates-released] name=updates -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64 ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc [groups] name=groups @@ -19,7 +19,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4 -+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64 ++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mock.spec 3 Nov 2006 21:12:31 -0000 1.25 +++ mock.spec 4 Nov 2006 13:07:28 -0000 1.26 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ %changelog +* Sat Nov 4 2006 Jesse Keating - 0.6.8-3 +- Fix a typo in the patch that added x86_64 repos for fc4ppc + * Fri Nov 3 2006 Jesse Keating - 0.6.8-2 - Add patch to fix repo files to use arch specific repos (#213516) From fedora-extras-commits at redhat.com Sat Nov 4 13:21:45 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Nov 2006 06:21:45 -0700 Subject: rpms/WindowMaker/FC-5 WindowMaker-0.91.0-peter-appicon-bouncer2.patch, 1.1, 1.2 WindowMaker.spec, 1.18, 1.19 Message-ID: <200611041321.kA4DLjDn008775@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8704/FC-5 Modified Files: WindowMaker-0.91.0-peter-appicon-bouncer2.patch WindowMaker.spec Log Message: - fix #185579: bouncing animation will respect animations off setting - fix #211263: missing dependencies in devel package WindowMaker-0.91.0-peter-appicon-bouncer2.patch: Index: WindowMaker-0.91.0-peter-appicon-bouncer2.patch =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-5/WindowMaker-0.91.0-peter-appicon-bouncer2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WindowMaker-0.91.0-peter-appicon-bouncer2.patch 2 Mar 2006 14:16:26 -0000 1.1 +++ WindowMaker-0.91.0-peter-appicon-bouncer2.patch 4 Nov 2006 13:21:14 -0000 1.2 @@ -1,13 +1,3 @@ ---- WindowMaker-0.91.0/src/window.c.vns 2005-05-19 12:42:35 +0400 -+++ WindowMaker-0.91.0/src/window.c 2005-05-19 12:42:35 +0400 -@@ -1410,6 +1410,7 @@ - raise = True; - } - } -+ wAppBounce(app); - } - } - --- WindowMaker-0.91.0/src/application.c.vns 2005-05-19 12:42:35 +0400 +++ WindowMaker-0.91.0/src/application.c 2005-05-19 12:42:35 +0400 @@ -448,6 +448,16 @@ @@ -223,3 +213,17 @@ +{ +} +#endif +--- WindowMaker-0.92.0/src/window.c.orig 2006-11-04 09:57:52.000000000 +0100 ++++ WindowMaker-0.92.0/src/window.c 2006-11-04 10:00:33.000000000 +0100 +@@ -1399,6 +1399,11 @@ + raise = True; + } + } ++ /* only do the Bounce when animations are activated */ ++ if(!wPreferences.no_animations) ++ { ++ wAppBounce(app); ++ } + } + } + Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-5/WindowMaker.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- WindowMaker.spec 2 Mar 2006 22:57:20 -0000 1.18 +++ WindowMaker.spec 4 Nov 2006 13:21:14 -0000 1.19 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: User Interface/Desktops @@ -43,6 +43,8 @@ Patch207: WindowMaker-0.91.0-sga-moving-add.patch Patch208: WindowMaker-0.91.0-peter-newappicon.patch Patch209: WindowMaker-0.91.0-peter-mouse-placement.patch +# actually a fixed version that does respect animations of settings +# for the bounce animation. Fixes #185579. Patch210: WindowMaker-0.91.0-peter-appicon-bouncer2.patch Patch211: WindowMaker-0.91.0-sga-swpanel-customization.patch Patch212: WindowMaker-0.92.0-alt-newpo.patch @@ -66,6 +68,21 @@ Summary: libraries needed for WindowMaker. Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-proto-devel +Requires: libX11-devel +Requires: pkgconfig +Requires: libXinerama-devel +Requires: fontconfig-devel +Requires: freetype-devel +Requires: libXft-devel +Requires: libXext-devel +Requires: libXrender-devel +Requires: libtiff-devel +Requires: zlib-devel +Requires: libXpm-devel +Requires: libjpeg-devel +Requires: libpng-devel +Requires: libungif-devel %description @@ -193,6 +210,11 @@ %changelog +* Sat Nov 04 2006 Andreas Bierfert +0.92.0-9 +- fix #185579: bouncing animation will respect animations off setting +- fix #211263: missing dependencies in devel package + * Thu Mar 02 2006 Andreas Bierfert 0.92.0-8 - fix gdm detection From fedora-extras-commits at redhat.com Sat Nov 4 13:21:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Nov 2006 06:21:46 -0700 Subject: rpms/WindowMaker/FC-6 WindowMaker-0.91.0-peter-appicon-bouncer2.patch, 1.1, 1.2 WindowMaker.spec, 1.19, 1.20 Message-ID: <200611041321.kA4DLk1W008779@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8704/FC-6 Modified Files: WindowMaker-0.91.0-peter-appicon-bouncer2.patch WindowMaker.spec Log Message: - fix #185579: bouncing animation will respect animations off setting - fix #211263: missing dependencies in devel package WindowMaker-0.91.0-peter-appicon-bouncer2.patch: Index: WindowMaker-0.91.0-peter-appicon-bouncer2.patch =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-6/WindowMaker-0.91.0-peter-appicon-bouncer2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WindowMaker-0.91.0-peter-appicon-bouncer2.patch 2 Mar 2006 14:16:26 -0000 1.1 +++ WindowMaker-0.91.0-peter-appicon-bouncer2.patch 4 Nov 2006 13:21:15 -0000 1.2 @@ -1,13 +1,3 @@ ---- WindowMaker-0.91.0/src/window.c.vns 2005-05-19 12:42:35 +0400 -+++ WindowMaker-0.91.0/src/window.c 2005-05-19 12:42:35 +0400 -@@ -1410,6 +1410,7 @@ - raise = True; - } - } -+ wAppBounce(app); - } - } - --- WindowMaker-0.91.0/src/application.c.vns 2005-05-19 12:42:35 +0400 +++ WindowMaker-0.91.0/src/application.c 2005-05-19 12:42:35 +0400 @@ -448,6 +448,16 @@ @@ -223,3 +213,17 @@ +{ +} +#endif +--- WindowMaker-0.92.0/src/window.c.orig 2006-11-04 09:57:52.000000000 +0100 ++++ WindowMaker-0.92.0/src/window.c 2006-11-04 10:00:33.000000000 +0100 +@@ -1399,6 +1399,11 @@ + raise = True; + } + } ++ /* only do the Bounce when animations are activated */ ++ if(!wPreferences.no_animations) ++ { ++ wAppBounce(app); ++ } + } + } + Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/FC-6/WindowMaker.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- WindowMaker.spec 15 Sep 2006 13:40:04 -0000 1.19 +++ WindowMaker.spec 4 Nov 2006 13:21:15 -0000 1.20 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: User Interface/Desktops @@ -43,6 +43,8 @@ Patch207: WindowMaker-0.91.0-sga-moving-add.patch Patch208: WindowMaker-0.91.0-peter-newappicon.patch Patch209: WindowMaker-0.91.0-peter-mouse-placement.patch +# actually a fixed version that does respect animations of settings +# for the bounce animation. Fixes #185579. Patch210: WindowMaker-0.91.0-peter-appicon-bouncer2.patch Patch211: WindowMaker-0.91.0-sga-swpanel-customization.patch Patch212: WindowMaker-0.92.0-alt-newpo.patch @@ -66,6 +68,21 @@ Summary: libraries needed for WindowMaker. Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-proto-devel +Requires: libX11-devel +Requires: pkgconfig +Requires: libXinerama-devel +Requires: fontconfig-devel +Requires: freetype-devel +Requires: libXft-devel +Requires: libXext-devel +Requires: libXrender-devel +Requires: libtiff-devel +Requires: zlib-devel +Requires: libXpm-devel +Requires: libjpeg-devel +Requires: libpng-devel +Requires: libungif-devel %description @@ -193,6 +210,11 @@ %changelog +* Sat Nov 04 2006 Andreas Bierfert +0.92.0-10 +- fix #185579: bouncing animation will respect animations off setting +- fix #211263: missing dependencies in devel package + * Fri Sep 15 2006 Andreas Bierfert 0.92.0-9 - FE6 rebuild From fedora-extras-commits at redhat.com Sat Nov 4 13:21:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Nov 2006 06:21:46 -0700 Subject: rpms/WindowMaker/devel WindowMaker-0.91.0-peter-appicon-bouncer2.patch, 1.1, 1.2 WindowMaker.spec, 1.19, 1.20 Message-ID: <200611041321.kA4DLkBI008783@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8704/devel Modified Files: WindowMaker-0.91.0-peter-appicon-bouncer2.patch WindowMaker.spec Log Message: - fix #185579: bouncing animation will respect animations off setting - fix #211263: missing dependencies in devel package WindowMaker-0.91.0-peter-appicon-bouncer2.patch: Index: WindowMaker-0.91.0-peter-appicon-bouncer2.patch =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker-0.91.0-peter-appicon-bouncer2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WindowMaker-0.91.0-peter-appicon-bouncer2.patch 2 Mar 2006 14:16:26 -0000 1.1 +++ WindowMaker-0.91.0-peter-appicon-bouncer2.patch 4 Nov 2006 13:21:16 -0000 1.2 @@ -1,13 +1,3 @@ ---- WindowMaker-0.91.0/src/window.c.vns 2005-05-19 12:42:35 +0400 -+++ WindowMaker-0.91.0/src/window.c 2005-05-19 12:42:35 +0400 -@@ -1410,6 +1410,7 @@ - raise = True; - } - } -+ wAppBounce(app); - } - } - --- WindowMaker-0.91.0/src/application.c.vns 2005-05-19 12:42:35 +0400 +++ WindowMaker-0.91.0/src/application.c 2005-05-19 12:42:35 +0400 @@ -448,6 +448,16 @@ @@ -223,3 +213,17 @@ +{ +} +#endif +--- WindowMaker-0.92.0/src/window.c.orig 2006-11-04 09:57:52.000000000 +0100 ++++ WindowMaker-0.92.0/src/window.c 2006-11-04 10:00:33.000000000 +0100 +@@ -1399,6 +1399,11 @@ + raise = True; + } + } ++ /* only do the Bounce when animations are activated */ ++ if(!wPreferences.no_animations) ++ { ++ wAppBounce(app); ++ } + } + } + Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- WindowMaker.spec 15 Sep 2006 13:40:04 -0000 1.19 +++ WindowMaker.spec 4 Nov 2006 13:21:16 -0000 1.20 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: User Interface/Desktops @@ -43,6 +43,8 @@ Patch207: WindowMaker-0.91.0-sga-moving-add.patch Patch208: WindowMaker-0.91.0-peter-newappicon.patch Patch209: WindowMaker-0.91.0-peter-mouse-placement.patch +# actually a fixed version that does respect animations of settings +# for the bounce animation. Fixes #185579. Patch210: WindowMaker-0.91.0-peter-appicon-bouncer2.patch Patch211: WindowMaker-0.91.0-sga-swpanel-customization.patch Patch212: WindowMaker-0.92.0-alt-newpo.patch @@ -66,6 +68,21 @@ Summary: libraries needed for WindowMaker. Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-proto-devel +Requires: libX11-devel +Requires: pkgconfig +Requires: libXinerama-devel +Requires: fontconfig-devel +Requires: freetype-devel +Requires: libXft-devel +Requires: libXext-devel +Requires: libXrender-devel +Requires: libtiff-devel +Requires: zlib-devel +Requires: libXpm-devel +Requires: libjpeg-devel +Requires: libpng-devel +Requires: libungif-devel %description @@ -193,6 +210,11 @@ %changelog +* Sat Nov 04 2006 Andreas Bierfert +0.92.0-10 +- fix #185579: bouncing animation will respect animations off setting +- fix #211263: missing dependencies in devel package + * Fri Sep 15 2006 Andreas Bierfert 0.92.0-9 - FE6 rebuild From fedora-extras-commits at redhat.com Sat Nov 4 14:01:32 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 4 Nov 2006 07:01:32 -0700 Subject: rpms/telepathy-gabble/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 telepathy-gabble.spec, 1.13, 1.14 Message-ID: <200611041401.kA4E1WiB012004@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/telepathy-gabble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9593 Modified Files: .cvsignore sources telepathy-gabble.spec Log Message: * Sat Nov 4 2006 Brian Pepple - 0.4.3-1 - Update to 0.4.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 27 Oct 2006 17:43:07 -0000 1.13 +++ .cvsignore 4 Nov 2006 14:01:01 -0000 1.14 @@ -1 +1 @@ -telepathy-gabble-0.4.2.tar.gz +telepathy-gabble-0.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 27 Oct 2006 17:43:07 -0000 1.13 +++ sources 4 Nov 2006 14:01:01 -0000 1.14 @@ -1 +1 @@ -a1bc3939da26f9221b11806484d2b272 telepathy-gabble-0.4.2.tar.gz +fdf8fdb60a29243bff32c46fc707ab4c telepathy-gabble-0.4.3.tar.gz Index: telepathy-gabble.spec =================================================================== RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- telepathy-gabble.spec 27 Oct 2006 17:43:07 -0000 1.13 +++ telepathy-gabble.spec 4 Nov 2006 14:01:01 -0000 1.14 @@ -1,5 +1,5 @@ Name: telepathy-gabble -Version: 0.4.2 +Version: 0.4.3 Release: 1%{?dist} Summary: A Jabber/XMPP connection manager @@ -48,6 +48,9 @@ %changelog +* Sat Nov 4 2006 Brian Pepple - 0.4.3-1 +- Update to 0.4.3. + * Fri Oct 27 2006 Brian Pepple - 0.4.2-1 - Update to 0.4.2. From fedora-extras-commits at redhat.com Sat Nov 4 14:20:37 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 07:20:37 -0700 Subject: rpms/geda-gsymcheck import.log,1.6,1.7 Message-ID: <200611041420.kA4EKbbW012334@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gsymcheck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12270 Modified Files: import.log Log Message: auto-import geda-gsymcheck-20061020-1 on branch FC-5 from geda-gsymcheck-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 10 Sep 2006 21:47:27 -0000 1.6 +++ import.log 4 Nov 2006 14:20:07 -0000 1.7 @@ -3,3 +3,4 @@ geda-gsymcheck-20060824-1:HEAD:geda-gsymcheck-20060824-1.src.rpm:1157393474 geda-gsymcheck-20060906-1:FC-5:geda-gsymcheck-20060906-1.src.rpm:1157924902 geda-gsymcheck-20060906-2:HEAD:geda-gsymcheck-20060906-2.src.rpm:1157925096 +geda-gsymcheck-20061020-1:FC-5:geda-gsymcheck-20061020-1.src.rpm:1162650257 From fedora-extras-commits at redhat.com Sat Nov 4 14:20:38 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 07:20:38 -0700 Subject: rpms/geda-gsymcheck/FC-5 .cvsignore, 1.4, 1.5 geda-gsymcheck.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200611041420.kA4EKcd6012339@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gsymcheck/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12270/FC-5 Modified Files: .cvsignore geda-gsymcheck.spec sources Log Message: auto-import geda-gsymcheck-20061020-1 on branch FC-5 from geda-gsymcheck-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:44:27 -0000 1.4 +++ .cvsignore 4 Nov 2006 14:20:08 -0000 1.5 @@ -1 +1 @@ -geda-gsymcheck-20060906.tar.gz +geda-gsymcheck-20061020.tar.gz Index: geda-gsymcheck.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-5/geda-gsymcheck.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geda-gsymcheck.spec 10 Sep 2006 21:44:27 -0000 1.3 +++ geda-gsymcheck.spec 4 Nov 2006 14:20:08 -0000 1.4 @@ -1,5 +1,5 @@ Name: geda-gsymcheck -Version: 20060906 +Version: 20061020 Release: 1%{?dist} Summary: Symbol checker for electronics schematics editor @@ -53,6 +53,12 @@ %{_datadir}/gEDA/docs/man/gsymcheck.html %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- Upstream release 20060906 + +* Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 +- Rebuilt for FC-6 devel + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-1 - Upstream release 20060906 @@ -132,7 +138,7 @@ - updated to version 20010304 * Thu Aug 10 2000 Emmanuel Rouat -- added '*' as manpage extension because Mandrake compresses them +- added '*' as manpage extension because Mandrake compresses them with bzip2 while redhat use gzip - rebuilt with latest version of rpm Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:44:27 -0000 1.4 +++ sources 4 Nov 2006 14:20:08 -0000 1.5 @@ -1 +1 @@ -0c8e049f49326f20b11de686dd146128 geda-gsymcheck-20060906.tar.gz +729c8c32598a20ff8c551a96eef1a496 geda-gsymcheck-20061020.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 14:22:39 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 07:22:39 -0700 Subject: rpms/geda-gsymcheck import.log,1.7,1.8 Message-ID: <200611041422.kA4EMdJR012434@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gsymcheck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402 Modified Files: import.log Log Message: auto-import geda-gsymcheck-20061020-1 on branch FC-6 from geda-gsymcheck-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 4 Nov 2006 14:20:07 -0000 1.7 +++ import.log 4 Nov 2006 14:22:08 -0000 1.8 @@ -4,3 +4,4 @@ geda-gsymcheck-20060906-1:FC-5:geda-gsymcheck-20060906-1.src.rpm:1157924902 geda-gsymcheck-20060906-2:HEAD:geda-gsymcheck-20060906-2.src.rpm:1157925096 geda-gsymcheck-20061020-1:FC-5:geda-gsymcheck-20061020-1.src.rpm:1162650257 +geda-gsymcheck-20061020-1:FC-6:geda-gsymcheck-20061020-1.src.rpm:1162650379 From fedora-extras-commits at redhat.com Sat Nov 4 14:22:39 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 07:22:39 -0700 Subject: rpms/geda-gsymcheck/FC-6 .cvsignore, 1.4, 1.5 geda-gsymcheck.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200611041422.kA4EMd9S012439@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gsymcheck/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402/FC-6 Modified Files: .cvsignore geda-gsymcheck.spec sources Log Message: auto-import geda-gsymcheck-20061020-1 on branch FC-6 from geda-gsymcheck-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:47:28 -0000 1.4 +++ .cvsignore 4 Nov 2006 14:22:09 -0000 1.5 @@ -1 +1 @@ -geda-gsymcheck-20060906.tar.gz +geda-gsymcheck-20061020.tar.gz Index: geda-gsymcheck.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/geda-gsymcheck.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geda-gsymcheck.spec 10 Sep 2006 21:47:28 -0000 1.3 +++ geda-gsymcheck.spec 4 Nov 2006 14:22:09 -0000 1.4 @@ -1,6 +1,6 @@ Name: geda-gsymcheck -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Symbol checker for electronics schematics editor Group: Applications/Engineering @@ -53,6 +53,9 @@ %{_datadir}/gEDA/docs/man/gsymcheck.html %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- Upstream release 20060906 + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 - Rebuilt for FC-6 devel @@ -135,7 +138,7 @@ - updated to version 20010304 * Thu Aug 10 2000 Emmanuel Rouat -- added '*' as manpage extension because Mandrake compresses them +- added '*' as manpage extension because Mandrake compresses them with bzip2 while redhat use gzip - rebuilt with latest version of rpm Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:47:28 -0000 1.4 +++ sources 4 Nov 2006 14:22:09 -0000 1.5 @@ -1 +1 @@ -0c8e049f49326f20b11de686dd146128 geda-gsymcheck-20060906.tar.gz +729c8c32598a20ff8c551a96eef1a496 geda-gsymcheck-20061020.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 14:30:59 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 07:30:59 -0700 Subject: rpms/geda-gsymcheck import.log,1.8,1.9 Message-ID: <200611041430.kA4EUxGo012560@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gsymcheck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526 Modified Files: import.log Log Message: auto-import geda-gsymcheck-20061020-1 on branch devel from geda-gsymcheck-20061020-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 4 Nov 2006 14:22:08 -0000 1.8 +++ import.log 4 Nov 2006 14:30:29 -0000 1.9 @@ -5,3 +5,4 @@ geda-gsymcheck-20060906-2:HEAD:geda-gsymcheck-20060906-2.src.rpm:1157925096 geda-gsymcheck-20061020-1:FC-5:geda-gsymcheck-20061020-1.src.rpm:1162650257 geda-gsymcheck-20061020-1:FC-6:geda-gsymcheck-20061020-1.src.rpm:1162650379 +geda-gsymcheck-20061020-1:HEAD:geda-gsymcheck-20061020-1.src.rpm:1162650880 From fedora-extras-commits at redhat.com Sat Nov 4 14:31:00 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 07:31:00 -0700 Subject: rpms/geda-gsymcheck/devel .cvsignore, 1.4, 1.5 geda-gsymcheck.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200611041431.kA4EV09R012565@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/geda-gsymcheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526/devel Modified Files: .cvsignore geda-gsymcheck.spec sources Log Message: auto-import geda-gsymcheck-20061020-1 on branch devel from geda-gsymcheck-20061020-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Sep 2006 21:47:28 -0000 1.4 +++ .cvsignore 4 Nov 2006 14:30:30 -0000 1.5 @@ -1 +1 @@ -geda-gsymcheck-20060906.tar.gz +geda-gsymcheck-20061020.tar.gz Index: geda-gsymcheck.spec =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/geda-gsymcheck.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geda-gsymcheck.spec 10 Sep 2006 21:47:28 -0000 1.3 +++ geda-gsymcheck.spec 4 Nov 2006 14:30:30 -0000 1.4 @@ -1,6 +1,6 @@ Name: geda-gsymcheck -Version: 20060906 -Release: 2%{?dist} +Version: 20061020 +Release: 1%{?dist} Summary: Symbol checker for electronics schematics editor Group: Applications/Engineering @@ -53,6 +53,9 @@ %{_datadir}/gEDA/docs/man/gsymcheck.html %Changelog +* Thu Nov 02 2006 Chitlesh Goorah - 20061020-1 +- Upstream release 20060906 + * Sun Sep 10 2006 Chitlesh Goorah - 20060906-2 - Rebuilt for FC-6 devel @@ -135,7 +138,7 @@ - updated to version 20010304 * Thu Aug 10 2000 Emmanuel Rouat -- added '*' as manpage extension because Mandrake compresses them +- added '*' as manpage extension because Mandrake compresses them with bzip2 while redhat use gzip - rebuilt with latest version of rpm Index: sources =================================================================== RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Sep 2006 21:47:28 -0000 1.4 +++ sources 4 Nov 2006 14:30:30 -0000 1.5 @@ -1 +1 @@ -0c8e049f49326f20b11de686dd146128 geda-gsymcheck-20060906.tar.gz +729c8c32598a20ff8c551a96eef1a496 geda-gsymcheck-20061020.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 15:39:28 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 4 Nov 2006 08:39:28 -0700 Subject: rpms/gaim-rhythmbox/FC-5 .cvsignore, 1.2, 1.3 gaim-rhythmbox.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611041539.kA4FdS7S016049@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gaim-rhythmbox/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16029 Modified Files: .cvsignore gaim-rhythmbox.spec sources Log Message: Revert to 1.5.0.1 for FC5, which has only Gaim 1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Nov 2006 04:17:15 -0000 1.2 +++ .cvsignore 4 Nov 2006 15:38:58 -0000 1.3 @@ -1 +1 @@ -gaim-rhythmbox-2.0beta3.tar.gz +gaim-rhythmbox-1.5.0.1.tar.gz Index: gaim-rhythmbox.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-5/gaim-rhythmbox.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gaim-rhythmbox.spec 3 Nov 2006 04:17:15 -0000 1.1 +++ gaim-rhythmbox.spec 4 Nov 2006 15:38:58 -0000 1.2 @@ -1,20 +1,21 @@ -%define prever beta3 Name: gaim-rhythmbox -Version: 2.0 -Release: 0.3.%{prever}%{?dist} +Version: 1.5.0.1 +Release: 1%{?dist} Summary: Rhythmbox plugin for GAIM Group: Applications/Internet License: GPL URL: http://jon.oberheide.org/projects/gaim-rhythmbox/ -Source0: http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}%{prever}.tar.gz +Source0: http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}.tar.gz Patch0: gaim-rhythmbox-configure.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gaim-devel BuildRequires: gtk2-devel -BuildRequires: dbus-glib-devel dbus-devel -Requires: rhythmbox +BuildRequires: libbonobo-devel +BuildRequires: ORBit2-devel +BuildRequires: rhythmbox +Requires: gaim rhythmbox %description The Gaim-Rhythmbox plugin will automatically update your Gaim user and @@ -26,8 +27,8 @@ %prep -%setup -q -n %{name}-%{version}%{?prever} -%patch0 +%setup -q -n %{name}-%{version} +%patch0 -b .gaim-rhythmbox-configure %build @@ -53,11 +54,5 @@ %changelog -* Thu Nov 2 2006 Michel Salim 2.0-0.3.beta3 -- Tidy up prever use, description field, and add files to documentation - -* Thu Nov 2 2006 Michel Salim 2.0-0.2.beta3 -- Add missing BuildRequires - -* Sat Oct 28 2006 Michel Salim 2.0-0.1.beta3 +* Sat Nov 4 2006 Michel Salim 1.5.0.1-1 - Initial package Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Nov 2006 04:17:15 -0000 1.2 +++ sources 4 Nov 2006 15:38:58 -0000 1.3 @@ -1 +1 @@ -a9e836986dae7857b408120782264d5a gaim-rhythmbox-2.0beta3.tar.gz +e2b2f7d3b1ef2f9f89b6728629ecdab5 gaim-rhythmbox-1.5.0.1.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 15:54:53 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Sat, 4 Nov 2006 08:54:53 -0700 Subject: rpms/tcl-thread - New directory Message-ID: <200611041554.kA4FsrF2016257@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tcl-thread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253/tcl-thread Log Message: Directory /cvs/extras/rpms/tcl-thread added to the repository From fedora-extras-commits at redhat.com Sat Nov 4 15:54:59 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Sat, 4 Nov 2006 08:54:59 -0700 Subject: rpms/tcl-thread/devel - New directory Message-ID: <200611041554.kA4FsxQK016272@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tcl-thread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253/tcl-thread/devel Log Message: Directory /cvs/extras/rpms/tcl-thread/devel added to the repository From fedora-extras-commits at redhat.com Sat Nov 4 15:55:14 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Sat, 4 Nov 2006 08:55:14 -0700 Subject: rpms/tcl-thread Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611041555.kA4FtEuN016306@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tcl-thread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300 Added Files: Makefile import.log Log Message: Setup of module tcl-thread --- NEW FILE Makefile --- # Top level Makefile for module tcl-thread 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 Sat Nov 4 15:55:20 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Sat, 4 Nov 2006 08:55:20 -0700 Subject: rpms/tcl-thread/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611041555.kA4FtKjI016325@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tcl-thread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tcl-thread --- 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 Sat Nov 4 15:56:23 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Sat, 4 Nov 2006 08:56:23 -0700 Subject: rpms/tcl-thread import.log,1.1,1.2 Message-ID: <200611041556.kA4FuNe0016410@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tcl-thread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16375 Modified Files: import.log Log Message: auto-import tcl-thread-2.6.5-2 on branch devel from tcl-thread-2.6.5-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tcl-thread/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Nov 2006 15:55:14 -0000 1.1 +++ import.log 4 Nov 2006 15:55:52 -0000 1.2 @@ -0,0 +1 @@ +tcl-thread-2_6_5-2:HEAD:tcl-thread-2.6.5-2.src.rpm:1162655699 From fedora-extras-commits at redhat.com Sat Nov 4 15:56:23 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Sat, 4 Nov 2006 08:56:23 -0700 Subject: rpms/tcl-thread/devel tcl-thread-x86_64-build.patch, NONE, 1.1 tcl-thread.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611041556.kA4FuNPm016414@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tcl-thread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16375/devel Modified Files: .cvsignore sources Added Files: tcl-thread-x86_64-build.patch tcl-thread.spec Log Message: auto-import tcl-thread-2.6.5-2 on branch devel from tcl-thread-2.6.5-2.src.rpm tcl-thread-x86_64-build.patch: --- NEW FILE tcl-thread-x86_64-build.patch --- --- configure.orig 2006-11-02 14:42:53.000000000 -0800 +++ configure 2006-11-02 14:43:11.000000000 -0800 @@ -6155,6 +6155,7 @@ if test x"${gincdir}" = x -o x"${glibdir}" = x; then for i in \ + `ls -d ${libdir} 2>/dev/null`\ `ls -d ${exec_prefix}/lib 2>/dev/null`\ `ls -d ${prefix}/lib 2>/dev/null`\ `ls -d /usr/local/lib 2>/dev/null`\ --- aclocal.m4.orig 2006-11-02 14:42:57.000000000 -0800 +++ aclocal.m4 2006-11-02 14:43:04.000000000 -0800 @@ -40,6 +40,7 @@ ]) if test x"${gincdir}" = x -o x"${glibdir}" = x; then for i in \ + `ls -d ${libdir} 2>/dev/null`\ `ls -d ${exec_prefix}/lib 2>/dev/null`\ `ls -d ${prefix}/lib 2>/dev/null`\ `ls -d /usr/local/lib 2>/dev/null`\ --- NEW FILE tcl-thread.spec --- Name: tcl-thread Summary: Tcl Thread extension License: BSD Group: Development/Tools Version: 2.6.5 Release: 2%{?dist} Source: http://prdownloads.sourceforge.net/tcl/thread2.6.5.tar.gz URL: http://tcl.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcl-devel gdbm-devel Requires: tcl Patch0: tcl-thread-x86_64-build.patch %description Thread extension for the Tcl toolkit. You can use this extension to gain script level access to Tcl threading capabilities. %prep %setup -q -n thread%{version} %patch0 -p0 %build %configure --enable-threads --with-gdbm make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %check make DESTDIR=$RPM_BUILD_ROOT test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %doc license.terms README ChangeLog %{_libdir}/thread%{version} %{_mandir}/mann/* %changelog * Fri Nov 3 2006 - jwboyer at jdub.homelinux.org 2.6.5-2 - Update for review comments - Add patch to compile on x86_64 * Thu Oct 26 2006 - jwboyer at jdub.homelinux.org 2.6.5-1 - Initial tcl-threads Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tcl-thread/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Nov 2006 15:55:20 -0000 1.1 +++ .cvsignore 4 Nov 2006 15:55:53 -0000 1.2 @@ -0,0 +1 @@ +thread2.6.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tcl-thread/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Nov 2006 15:55:20 -0000 1.1 +++ sources 4 Nov 2006 15:55:53 -0000 1.2 @@ -0,0 +1 @@ +3c69b4a891590f23bb79a1fa98d879f7 thread2.6.5.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 16:05:24 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Sat, 4 Nov 2006 09:05:24 -0700 Subject: owners owners.list,1.1890,1.1891 Message-ID: <200611041605.kA4G5OTx019409@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19391 Modified Files: owners.list Log Message: Add tcl-thread Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1890 retrieving revision 1.1891 diff -u -r1.1890 -r1.1891 --- owners.list 4 Nov 2006 12:55:41 -0000 1.1890 +++ owners.list 4 Nov 2006 16:04:54 -0000 1.1891 @@ -2177,6 +2177,7 @@ Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|tango-icon-theme|Icons from Tango Project|raven at pmail.pl|extras-qa at fedoraproject.org| Fedora Extras|taskjuggler|Project management tool|petersen at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Nov 4 16:52:29 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 4 Nov 2006 09:52:29 -0700 Subject: rpms/gramps/devel .cvsignore, 1.14, 1.15 gramps.spec, 1.22, 1.23 sources, 1.14, 1.15 Message-ID: <200611041652.kA4GqTWf019966@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19946 Modified Files: .cvsignore gramps.spec sources Log Message: * Sat Nov 4 2006 Brian Pepple - 2.2.2-1 - Update to 2.2.2. - Add scriptlet for gtk+ icon cache. - Disable scrollkeeper & mime-install in configure. - Simplify files since we are no longer ghosting *.pyo files. - Drop X-Fedora desktop category. - Add BR on gnome-doc-utils. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 1 May 2006 15:16:56 -0000 1.14 +++ .cvsignore 4 Nov 2006 16:51:59 -0000 1.15 @@ -1 +1 @@ -gramps-2.0.11.tar.gz +gramps-2.2.2.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gramps.spec 6 Sep 2006 14:24:29 -0000 1.22 +++ gramps.spec 4 Nov 2006 16:51:59 -0000 1.23 @@ -1,6 +1,6 @@ Name: gramps -Version: 2.0.11 -Release: 5%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -19,6 +19,7 @@ BuildRequires: pygtk2-libglade BuildRequires: python-devel BuildRequires: scrollkeeper +BuildRequires: gnome-doc-utils Requires: gnome-python2-canvas Requires: gnome-python2-gconf @@ -51,24 +52,23 @@ %build -%configure --disable-schemas-install +%configure --disable-schemas-install --disable-scrollkeeper --disable-mime-install make %install rm -rf ${RPM_BUILD_ROOT} %makeinstall GNOME_DATADIR="${RPM_BUILD_ROOT}%{_datadir}" -rm -rf ${RPM_BUILD_ROOT}%{_localstatedir}/scrollkeeper -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome/ -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{application,mime.cache} -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses} -mkdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -cp -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ +#Remove duplicate doc +rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/COPYING + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ +cp -p $RPM_BUILD_ROOT%{_datadir}/%{name}/images/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/ + %find_lang %{name} desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop @@ -91,6 +91,8 @@ scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %preun @@ -105,49 +107,36 @@ scrollkeeper-update -q || : update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : +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 COPYING-DOCS FAQ NEWS TODO %{_bindir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/application-registry/%{name}.applications %{_datadir}/omf/%{name}/ %{_datadir}/mime/packages/%{name}.xml %{_datadir}/mime-info/* -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png %{_datadir}/icons/gnome/48x48/mimetypes/*.png %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_mandir}/man1/%{name}.1.gz -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/*.py -%{_datadir}/%{name}/*.pyc -%{_datadir}/%{name}/*.png -%{_datadir}/%{name}/*.jpg -%{_datadir}/%{name}/*.glade -%{_datadir}/%{name}/*.pyo -%{_datadir}/%{name}/data/ -%dir %{_datadir}/%{name}/dates -%{_datadir}/%{name}/dates/*.py -%{_datadir}/%{name}/dates/*.pyc -%{_datadir}/%{name}/dates/*.pyo -%dir %{_datadir}/%{name}/docgen -%{_datadir}/%{name}/docgen/*.py -%{_datadir}/%{name}/docgen/*.pyc -%{_datadir}/%{name}/docgen/*.pyo -%{_datadir}/%{name}/example/ -%{_datadir}/%{name}/gnome/ -%dir %{_datadir}/%{name}/plugins -%{_datadir}/%{name}/plugins/*.py -%{_datadir}/%{name}/plugins/*.pyc -%{_datadir}/%{name}/plugins/*.glade -%{_datadir}/%{name}/plugins/*.xml -%{_datadir}/%{name}/plugins/*.png -%{_datadir}/%{name}/plugins/*.pyo +%{_datadir}/gnome/help/%{name}/ %changelog +* Sat Nov 4 2006 Brian Pepple - 2.2.2-1 +- Update to 2.2.2. +- Add scriptlet for gtk+ icon cache. +- Disable scrollkeeper & mime-install in configure. +- Simplify files since we are no longer ghosting *.pyo files. +- Drop X-Fedora desktop category. +- Add BR on gnome-doc-utils. + * Wed Sep 6 2006 Brian Pepple - 2.0.11-5 - Don't ghost *.pyo files. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 1 May 2006 15:16:56 -0000 1.14 +++ sources 4 Nov 2006 16:51:59 -0000 1.15 @@ -1 +1 @@ -650873c3c571a921a9c42b975ced2105 gramps-2.0.11.tar.gz +c640782457bccc7324d17c1baf21701c gramps-2.2.2.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 17:06:13 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 4 Nov 2006 10:06:13 -0700 Subject: rpms/gqview/devel gqview-2.0.3-desktop.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gqview.spec, 1.10, 1.11 sources, 1.7, 1.8 gqview-2.0.0-desktop.patch, 1.2, NONE Message-ID: <200611041706.kA4H6DjK023012@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gqview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22989 Modified Files: .cvsignore gqview.spec sources Added Files: gqview-2.0.3-desktop.patch Removed Files: gqview-2.0.0-desktop.patch Log Message: * Sat Nov 4 2006 Michael Schwendt - 2.0.3-1 - update to 2.0.3 - .desktop patch: additional MIME types merged upstream gqview-2.0.3-desktop.patch: --- NEW FILE gqview-2.0.3-desktop.patch --- diff -Nur gqview-2.0.3-orig/gqview.desktop gqview-2.0.3/gqview.desktop --- gqview-2.0.3-orig/gqview.desktop 2006-11-03 00:05:28.000000000 +0100 +++ gqview-2.0.3/gqview.desktop 2006-11-04 17:58:52.000000000 +0100 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=GQview +Name=GQview Image Viewer GenericName=Image Viewer GenericName[et]=Piltide vaatur GenericName[tr]=Resim g??stericisi Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gqview/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Oct 2006 16:13:51 -0000 1.6 +++ .cvsignore 4 Nov 2006 17:05:41 -0000 1.7 @@ -1 +1 @@ -gqview-2.0.2.tar.gz +gqview-2.0.3.tar.gz Index: gqview.spec =================================================================== RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gqview.spec 14 Oct 2006 16:13:51 -0000 1.10 +++ gqview.spec 4 Nov 2006 17:05:41 -0000 1.11 @@ -1,11 +1,11 @@ Summary: Image browser and viewer Name: gqview -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} License: GPL Group: User Interface/X Source: http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz -Patch1: gqview-2.0.0-desktop.patch +Patch1: gqview-2.0.3-desktop.patch Patch2: gqview-2.0.0-editors.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) URL: http://gqview.sourceforge.net/ @@ -76,6 +76,10 @@ %changelog +* Sat Nov 4 2006 Michael Schwendt - 2.0.3-1 +- update to 2.0.3 +- .desktop patch: additional MIME types merged upstream + * Sat Oct 14 2006 Michael Schwendt - 2.0.2-1 - update to 2.0.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gqview/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Oct 2006 16:13:51 -0000 1.7 +++ sources 4 Nov 2006 17:05:41 -0000 1.8 @@ -1 +1 @@ -0bb325001b3cea88c2487c84e06ba738 gqview-2.0.2.tar.gz +8759106bcc16b50234b4b419064d245c gqview-2.0.3.tar.gz --- gqview-2.0.0-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Sat Nov 4 17:10:54 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 4 Nov 2006 10:10:54 -0700 Subject: rpms/gqview/devel gqview.spec,1.11,1.12 Message-ID: <200611041710.kA4HAs18023159@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gqview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23141 Modified Files: gqview.spec Log Message: UTF-8 conversion Index: gqview.spec =================================================================== RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gqview.spec 4 Nov 2006 17:05:41 -0000 1.11 +++ gqview.spec 4 Nov 2006 17:10:24 -0000 1.12 @@ -190,7 +190,7 @@ * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. -* Tue Feb 27 2001 Trond Eivind Glomsr?d +* Tue Feb 27 2001 Trond Eivind Glomsr??d - use %%{_tmppath} * Thu Jul 13 2000 Prospector From fedora-extras-commits at redhat.com Sat Nov 4 18:04:58 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Sat, 4 Nov 2006 11:04:58 -0700 Subject: rpms/gnubiff import.log,1.6,1.7 Message-ID: <200611041804.kA4I4wnR026619@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26587 Modified Files: import.log Log Message: auto-import gnubiff-2.2.3-1 on branch devel from gnubiff-2.2.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnubiff/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 16 Oct 2006 18:41:40 -0000 1.6 +++ import.log 4 Nov 2006 18:04:28 -0000 1.7 @@ -3,3 +3,4 @@ gnubiff-2_2_2-2_fc6:HEAD:gnubiff-2.2.2-2.fc6.src.rpm:1156786285 gnubiff-2_2_2-3:HEAD:gnubiff-2.2.2-3.src.rpm:1160768093 gnubiff-2_2_2-4:HEAD:gnubiff-2.2.2-4.src.rpm:1161024092 +gnubiff-2_2_3-1:HEAD:gnubiff-2.2.3-1.src.rpm:1162663463 From fedora-extras-commits at redhat.com Sat Nov 4 18:05:01 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Sat, 4 Nov 2006 11:05:01 -0700 Subject: rpms/gnubiff/devel .cvsignore, 1.3, 1.4 gnubiff.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200611041805.kA4I51BI026622@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26587/devel Modified Files: .cvsignore gnubiff.spec sources Log Message: auto-import gnubiff-2.2.3-1 on branch devel from gnubiff-2.2.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnubiff/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Aug 2006 23:59:53 -0000 1.3 +++ .cvsignore 4 Nov 2006 18:04:31 -0000 1.4 @@ -1 +1 @@ -gnubiff-2.2.2.tar.gz +gnubiff-2.2.3.tar.gz Index: gnubiff.spec =================================================================== RCS file: /cvs/extras/rpms/gnubiff/devel/gnubiff.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnubiff.spec 16 Oct 2006 18:41:41 -0000 1.5 +++ gnubiff.spec 4 Nov 2006 18:04:31 -0000 1.6 @@ -1,6 +1,6 @@ Name: gnubiff -Version: 2.2.2 -Release: 4%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Summary: A mail notification program Group: Applications/Internet @@ -64,6 +64,9 @@ %{_mandir}/man1/* %changelog +* Sun Nov 04 2006 Damien Durand - 2.2.3-1 +- Upgrade to 2.2.3 + * Sun Oct 15 2006 Damien Durand - 2.2.2-4 - Add perl-XML-Parser in BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnubiff/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Aug 2006 23:59:53 -0000 1.3 +++ sources 4 Nov 2006 18:04:31 -0000 1.4 @@ -1 +1 @@ -54e026ed12571350dcf8965a090dfa45 gnubiff-2.2.2.tar.gz +548c8a65ef27acbf23a134c67ce0f37b gnubiff-2.2.3.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 18:10:06 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Sat, 4 Nov 2006 11:10:06 -0700 Subject: rpms/gnubiff/FC-5 gnubiff.spec,1.1,NONE Message-ID: <200611041810.kA4IA6H0027037@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27031 Removed Files: gnubiff.spec Log Message: --- gnubiff.spec DELETED --- From fedora-extras-commits at redhat.com Sat Nov 4 18:11:23 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Sat, 4 Nov 2006 11:11:23 -0700 Subject: rpms/gnubiff/FC-5 gnubiff.spec,1.2,1.3 Message-ID: <200611041811.kA4IBNvR027100@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27075 Added Files: gnubiff.spec Log Message: Index: gnubiff.spec =================================================================== RCS file: gnubiff.spec diff -N gnubiff.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnubiff.spec 4 Nov 2006 18:10:53 -0000 1.3 @@ -0,0 +1,98 @@ +Name: gnubiff +Version: 2.2.3 +Release: 1%{?dist} +Summary: A mail notification program + +Group: Applications/Internet +License: GPL +URL: http://gnubiff.sourceforge.net/ +Source0: http://belnet.dl.sourceforge.net/sourceforge/gnubiff/%{name}-%{version}.tar.gz +Source1: %{name}.desktop +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gamin-devel, libglade2-devel, desktop-file-utils, gnome-panel-devel, openssl-devel, perl-XML-Parser +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info + +%description +Gnubiff is a mail notification program that periodically checks +for mail and displays headers when new mail has arrived + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir + +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + %{SOURCE1} + +%find_lang %{name} + +%post +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : +fi + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING NEWS README THANKS TODO +%{_bindir}/%{name} +%{_datadir}/%{name} +%{_infodir}/*.info.gz +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/*.png +%{_datadir}/gnome-2.0/ui +%{_libdir}/bonobo/servers +%{_mandir}/man1/* + +%changelog +* Sun Nov 04 2006 Damien Durand - 2.2.3-1 +- Upgrade to 2.2.3 + +* Sun Oct 15 2006 Damien Durand - 2.2.2-4 +- Add perl-XML-Parser in BR + +* Thu Oct 13 2006 Damien Durand - 2.2.2-3 +- Bump Release + +* Mon Aug 28 2006 Damien Durand - 2.2.2-2 +- Bump Release + +* Wed Aug 09 2006 Damien Durand - 2.2.2-1 +- Upgrade to 2.2.2 + +* Wed Apr 24 2006 Damien Durand - 2.2.1-2 +- Remove --prefix='pkg-config libpanelapplet-2.0 openssl --variable=prefix +- Remove ABOUT-NLS & Changelog in %file section +- Fixing %{_datadir}/info to {_infodir} + +* Tue Apr 23 2006 Damien Durand - 2.2.1-1 +- Upgrade to 2.2.1 +- Add --prefix='pkg-config libpanelapplet-2.0 openssl --variable=prefix in %configure section +- Add gnome-panel-devel, openssl-devel in BuildRequires + +* Sun Apr 21 2006 Damien Durand - 2.2.0-2 +- Add gettext-devel, remove gtk-devel in BuildRequires +- Add %{_datadir}/info/*.info.gz in files section +- Add %post and %preun sections + +* Wed Apr 19 2006 Damien Durand - 2.2.0-1 +- Initial package From fedora-extras-commits at redhat.com Sat Nov 4 18:13:00 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Sat, 4 Nov 2006 11:13:00 -0700 Subject: rpms/gnubiff/FC-5 sources,1.2,1.3 Message-ID: <200611041813.kA4ID0NF027160@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27144 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnubiff/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 May 2006 04:23:47 -0000 1.2 +++ sources 4 Nov 2006 18:12:30 -0000 1.3 @@ -1 +1 @@ -8d2ef679f42e7a593dc88b750d0cca4c gnubiff-2.2.1.tar.gz +548c8a65ef27acbf23a134c67ce0f37b gnubiff-2.2.3.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 18:14:38 2006 From: fedora-extras-commits at redhat.com (Damien Durand (splinux)) Date: Sat, 4 Nov 2006 11:14:38 -0700 Subject: rpms/gnubiff/FC-6 gnubiff.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200611041814.kA4IEcd6027252@cvs-int.fedora.redhat.com> Author: splinux Update of /cvs/extras/rpms/gnubiff/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27234 Modified Files: gnubiff.spec sources Log Message: Index: gnubiff.spec =================================================================== RCS file: /cvs/extras/rpms/gnubiff/FC-6/gnubiff.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnubiff.spec 16 Oct 2006 18:41:41 -0000 1.5 +++ gnubiff.spec 4 Nov 2006 18:14:08 -0000 1.6 @@ -1,6 +1,6 @@ Name: gnubiff -Version: 2.2.2 -Release: 4%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Summary: A mail notification program Group: Applications/Internet @@ -64,6 +64,9 @@ %{_mandir}/man1/* %changelog +* Sun Nov 04 2006 Damien Durand - 2.2.3-1 +- Upgrade to 2.2.3 + * Sun Oct 15 2006 Damien Durand - 2.2.2-4 - Add perl-XML-Parser in BR Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnubiff/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Aug 2006 23:59:53 -0000 1.3 +++ sources 4 Nov 2006 18:14:08 -0000 1.4 @@ -1 +1 @@ -54e026ed12571350dcf8965a090dfa45 gnubiff-2.2.2.tar.gz +548c8a65ef27acbf23a134c67ce0f37b gnubiff-2.2.3.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 18:21:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Nov 2006 11:21:19 -0700 Subject: rpms/vdr/FC-6 vdr-timercmds.conf, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr.spec, 1.1, 1.2 vdr-1.4.3-1.diff, 1.1, NONE Message-ID: <200611041821.kA4ILJYH027392@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/vdr/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27354/FC-6 Modified Files: .cvsignore sources vdr.spec Added Files: vdr-timercmds.conf Removed Files: vdr-1.4.3-1.diff Log Message: * Sat Nov 4 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. - Apply epgsearch and timer info patches. - Mark console.perms snippet noreplace again. --- NEW FILE vdr-timercmds.conf --- # Timer commands for VDR. See the vdr(5) manual page; the syntax is the # same as for reccmds.conf. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vdr/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Oct 2006 18:50:35 -0000 1.2 +++ .cvsignore 4 Nov 2006 18:20:48 -0000 1.3 @@ -1,3 +1,3 @@ -vdr-1.4.3-liemikuutio-1.13.diff.gz -vdr-1.4.3.tar.bz2 vdr_1.4.3-1.ds.diff.gz +vdr-1.4.4.tar.bz2 +vdr-1.4.4-liemikuutio-1.13.diff.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/vdr/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Oct 2006 18:50:35 -0000 1.2 +++ sources 4 Nov 2006 18:20:49 -0000 1.3 @@ -1,3 +1,3 @@ -ed95f0e5844816d313edcb7f7231e06a vdr-1.4.3-liemikuutio-1.13.diff.gz -9bb82d1f090dad746d784d147dbb0126 vdr-1.4.3.tar.bz2 a0f1441e534715a190e4507c2f58268f vdr_1.4.3-1.ds.diff.gz +3d5dbacda725f769099b774577d2e3af vdr-1.4.4.tar.bz2 +967281c1f666b24cbc3f46cd17dffe98 vdr-1.4.4-liemikuutio-1.13.diff.gz Index: vdr.spec =================================================================== RCS file: /cvs/extras/rpms/vdr/FC-6/vdr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vdr.spec 16 Oct 2006 18:50:35 -0000 1.1 +++ vdr.spec 4 Nov 2006 18:20:49 -0000 1.2 @@ -14,11 +14,11 @@ %define vdr_user vdr %define vdr_group video # From APIVERSION in config.h -%define apiver 1.4.3 +%define apiver 1.4.4 Name: vdr -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: Video Disk Recorder Group: Applications/Multimedia @@ -36,12 +36,12 @@ Source10: %{name}-README.package Source11: %{name}-skincurses.conf Source12: %{name}-sky.conf +Source13: %{name}-timercmds.conf Patch0: %{name}-channel+epg.patch Patch1: http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.3-1.ds.diff.gz -Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.3-liemikuutio-1.13.diff.gz +Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.4-liemikuutio-1.13.diff.gz Patch3: %{name}-1.4.1-paths.patch Patch4: %{name}-1.4.1-dumpable.patch -Patch10: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.3-1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel @@ -119,15 +119,14 @@ #patch -i debian/patches/12_skinclassic_icons.dpatch #patch -i debian/patches/15_cut_compensate_start_time.dpatch patch -i debian/patches/19_debian_osdbase_maxitems.dpatch -#patch -i debian/patches/opt-20_epgsearch.dpatch +patch -i debian/patches/opt-20_epgsearch.dpatch #patch -i debian/patches/opt-20_liemikuutio.dpatch patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch patch -i debian/patches/opt-20_suspend.dpatch -#patch -i debian/patches/opt-20_vdr-timer-info.dpatch +patch -i debian/patches/opt-20_vdr-timer-info.dpatch %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch10 -p1 # Fix up paths sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c @@ -152,6 +151,7 @@ PLUGINS/src/sky/{getskyepg.pl,README,HISTORY} cp -p %{SOURCE5} reccmds.conf +cp -p %{SOURCE13} timercmds.conf sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf # Unfortunately these can't have comments in them, so ship 'em empty. cat /dev/null > channels.conf @@ -343,8 +343,7 @@ %doc CONTRIBUTORS COPYING HISTORY* MANUAL README* UPDATE-1.[24].0 %config(noreplace) %{_sysconfdir}/sysconfig/vdr %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules -# Temporarily not noreplace for upgrade from 1.4.1-8 due to #202132 -%config %{_sysconfdir}/security/console.perms.d/*-%{name}.perms +%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms %config %{_sysconfdir}/sysconfig/vdr-plugins.d/ %{_initrddir}/vdr %{_bindir}/epg2html @@ -400,6 +399,11 @@ %endif %changelog +* Sat Nov 4 2006 Ville Skytt?? - 1.4.4-1 +- 1.4.4. +- Apply epgsearch and timer info patches. +- Mark console.perms snippet noreplace again. + * Sun Oct 15 2006 Ville Skytt?? - 1.4.3-3 - Apply upstream 1.4.3-1 maintenance patch. - Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13. --- vdr-1.4.3-1.diff DELETED --- From fedora-extras-commits at redhat.com Sat Nov 4 18:21:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Nov 2006 11:21:19 -0700 Subject: rpms/vdr/devel vdr-timercmds.conf, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr.spec, 1.1, 1.2 vdr-1.4.3-1.diff, 1.1, NONE Message-ID: <200611041821.kA4ILJh0027397@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/vdr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27354/devel Modified Files: .cvsignore sources vdr.spec Added Files: vdr-timercmds.conf Removed Files: vdr-1.4.3-1.diff Log Message: * Sat Nov 4 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. - Apply epgsearch and timer info patches. - Mark console.perms snippet noreplace again. --- NEW FILE vdr-timercmds.conf --- # Timer commands for VDR. See the vdr(5) manual page; the syntax is the # same as for reccmds.conf. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vdr/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Oct 2006 18:50:35 -0000 1.2 +++ .cvsignore 4 Nov 2006 18:20:49 -0000 1.3 @@ -1,3 +1,3 @@ -vdr-1.4.3-liemikuutio-1.13.diff.gz -vdr-1.4.3.tar.bz2 vdr_1.4.3-1.ds.diff.gz +vdr-1.4.4.tar.bz2 +vdr-1.4.4-liemikuutio-1.13.diff.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/vdr/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Oct 2006 18:50:35 -0000 1.2 +++ sources 4 Nov 2006 18:20:49 -0000 1.3 @@ -1,3 +1,3 @@ -ed95f0e5844816d313edcb7f7231e06a vdr-1.4.3-liemikuutio-1.13.diff.gz -9bb82d1f090dad746d784d147dbb0126 vdr-1.4.3.tar.bz2 a0f1441e534715a190e4507c2f58268f vdr_1.4.3-1.ds.diff.gz +3d5dbacda725f769099b774577d2e3af vdr-1.4.4.tar.bz2 +967281c1f666b24cbc3f46cd17dffe98 vdr-1.4.4-liemikuutio-1.13.diff.gz Index: vdr.spec =================================================================== RCS file: /cvs/extras/rpms/vdr/devel/vdr.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vdr.spec 16 Oct 2006 18:50:35 -0000 1.1 +++ vdr.spec 4 Nov 2006 18:20:49 -0000 1.2 @@ -14,11 +14,11 @@ %define vdr_user vdr %define vdr_group video # From APIVERSION in config.h -%define apiver 1.4.3 +%define apiver 1.4.4 Name: vdr -Version: 1.4.3 -Release: 3%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: Video Disk Recorder Group: Applications/Multimedia @@ -36,12 +36,12 @@ Source10: %{name}-README.package Source11: %{name}-skincurses.conf Source12: %{name}-sky.conf +Source13: %{name}-timercmds.conf Patch0: %{name}-channel+epg.patch Patch1: http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.3-1.ds.diff.gz -Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.3-liemikuutio-1.13.diff.gz +Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.4-liemikuutio-1.13.diff.gz Patch3: %{name}-1.4.1-paths.patch Patch4: %{name}-1.4.1-dumpable.patch -Patch10: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.3-1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel @@ -119,15 +119,14 @@ #patch -i debian/patches/12_skinclassic_icons.dpatch #patch -i debian/patches/15_cut_compensate_start_time.dpatch patch -i debian/patches/19_debian_osdbase_maxitems.dpatch -#patch -i debian/patches/opt-20_epgsearch.dpatch +patch -i debian/patches/opt-20_epgsearch.dpatch #patch -i debian/patches/opt-20_liemikuutio.dpatch patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch patch -i debian/patches/opt-20_suspend.dpatch -#patch -i debian/patches/opt-20_vdr-timer-info.dpatch +patch -i debian/patches/opt-20_vdr-timer-info.dpatch %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch10 -p1 # Fix up paths sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c @@ -152,6 +151,7 @@ PLUGINS/src/sky/{getskyepg.pl,README,HISTORY} cp -p %{SOURCE5} reccmds.conf +cp -p %{SOURCE13} timercmds.conf sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf # Unfortunately these can't have comments in them, so ship 'em empty. cat /dev/null > channels.conf @@ -343,8 +343,7 @@ %doc CONTRIBUTORS COPYING HISTORY* MANUAL README* UPDATE-1.[24].0 %config(noreplace) %{_sysconfdir}/sysconfig/vdr %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules -# Temporarily not noreplace for upgrade from 1.4.1-8 due to #202132 -%config %{_sysconfdir}/security/console.perms.d/*-%{name}.perms +%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms %config %{_sysconfdir}/sysconfig/vdr-plugins.d/ %{_initrddir}/vdr %{_bindir}/epg2html @@ -400,6 +399,11 @@ %endif %changelog +* Sat Nov 4 2006 Ville Skytt?? - 1.4.4-1 +- 1.4.4. +- Apply epgsearch and timer info patches. +- Mark console.perms snippet noreplace again. + * Sun Oct 15 2006 Ville Skytt?? - 1.4.3-3 - Apply upstream 1.4.3-1 maintenance patch. - Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13. --- vdr-1.4.3-1.diff DELETED --- From fedora-extras-commits at redhat.com Sat Nov 4 18:39:05 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 4 Nov 2006 11:39:05 -0700 Subject: common branches,1.5,1.6 Message-ID: <200611041839.kA4Id5U1027680@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27664 Modified Files: branches Log Message: add EPEL Index: branches =================================================================== RCS file: /cvs/extras/common/branches,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- branches 23 Oct 2006 14:12:37 -0000 1.5 +++ branches 4 Nov 2006 18:38:35 -0000 1.6 @@ -1,6 +1,8 @@ RHL-7:rhl7:.rhl7:rhl:7 RHL-8:rhl8:.rhl8:rhl:8 RHL-9:rhl9:.rhl9:rhl:9 +EL-4:el4:.el4:epel:4 +EL-5:el5:.el5:epel:5 FC-1:fc1:.fc1:fedora:1 FC-2:fc2:.fc2:fedora:2 FC-3:fc3:.fc3:fedora:3 From fedora-extras-commits at redhat.com Sat Nov 4 20:08:01 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 4 Nov 2006 13:08:01 -0700 Subject: rpms/scribes/devel .cvsignore, 1.7, 1.8 scribes.spec, 1.19, 1.20 sources, 1.7, 1.8 Message-ID: <200611042008.kA4K8193001751@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1730 Modified Files: .cvsignore scribes.spec sources Log Message: Update to 0.3 final release from upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Nov 2006 05:04:32 -0000 1.7 +++ .cvsignore 4 Nov 2006 20:07:31 -0000 1.8 @@ -1 +1 @@ -scribes-0.2.9.91.tar.bz2 +scribes-0.3.tar.bz2 Index: scribes.spec =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- scribes.spec 3 Nov 2006 05:04:32 -0000 1.19 +++ scribes.spec 4 Nov 2006 20:07:31 -0000 1.20 @@ -3,7 +3,7 @@ %define python_module_name SCRIBES Name: scribes -Version: 0.2.9.91 +Version: 0.3 Release: 1%{?dist} Summary: A sleek, simple, and powerful text editor for the GNOME desktop Group: Applications/Editors @@ -153,6 +153,9 @@ %changelog +* Sat Nov 04 2006 Peter Gordon - 0.3-1 +- Update to new upstream release (0.3 final) + * Thu Nov 02 2006 Peter Gordon - 0.2.9.91-1 - Update to upstream version 0.2.9.91, which fixes the ugly bracket-matched highlighting that slipped into the 0.2.9.89 release (among other bugs) Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribes/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Nov 2006 05:04:32 -0000 1.7 +++ sources 4 Nov 2006 20:07:31 -0000 1.8 @@ -1 +1 @@ -81b68ffa6f2662429ee199cb2e356cb9 scribes-0.2.9.91.tar.bz2 +2abe30a606fcb6aa310c7322df8e5ab7 scribes-0.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Nov 4 20:16:54 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 4 Nov 2006 13:16:54 -0700 Subject: rpms/scribes/FC-6 .cvsignore, 1.7, 1.8 scribes.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200611042016.kA4KGsQ3001867@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/scribes/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1847 Modified Files: .cvsignore scribes.spec sources Log Message: Update to 0.3 final release from upstream Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribes/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Nov 2006 05:21:39 -0000 1.7 +++ .cvsignore 4 Nov 2006 20:16:24 -0000 1.8 @@ -1 +1 @@ -scribes-0.2.9.91.tar.bz2 +scribes-0.3.tar.bz2 Index: scribes.spec =================================================================== RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- scribes.spec 3 Nov 2006 05:21:39 -0000 1.17 +++ scribes.spec 4 Nov 2006 20:16:24 -0000 1.18 @@ -3,7 +3,7 @@ %define python_module_name SCRIBES Name: scribes -Version: 0.2.9.91 +Version: 0.3 Release: 1%{?dist} Summary: A sleek, simple, and powerful text editor for the GNOME desktop Group: Applications/Editors @@ -153,6 +153,9 @@ %changelog +* Sat Nov 04 2006 Peter Gordon - 0.3-1 +- Update to new upstream release (0.3 final) + * Thu Nov 02 2006 Peter Gordon - 0.2.9.91-1 - Update to upstream version 0.2.9.91, which fixes the ugly bracket-matched highlighting that slipped into the 0.2.9.89 release (among other bugs) Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribes/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Nov 2006 05:21:39 -0000 1.7 +++ sources 4 Nov 2006 20:16:24 -0000 1.8 @@ -1 +1 @@ -81b68ffa6f2662429ee199cb2e356cb9 scribes-0.2.9.91.tar.bz2 +2abe30a606fcb6aa310c7322df8e5ab7 scribes-0.3.tar.bz2 From fedora-extras-commits at redhat.com Sat Nov 4 20:34:37 2006 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sat, 4 Nov 2006 13:34:37 -0700 Subject: rpms/pan/devel .cvsignore, 1.13, 1.14 pan.spec, 1.23, 1.24 sources, 1.13, 1.14 Message-ID: <200611042034.kA4KYbdC002002@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1982 Modified Files: .cvsignore pan.spec sources Log Message: update to latest upstream version "Lots of bugfixes this time as we try go get everything nailed down for 1.0. There are also a couple of speed improvements..." http://bugzilla.gnome.org/buglist.cgi?bug_id=358061,360375,361448,362436,364357,365990,363268,366542,366663,366665,367578,369008 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 22 Oct 2006 12:18:03 -0000 1.13 +++ .cvsignore 4 Nov 2006 20:34:07 -0000 1.14 @@ -1 +1 @@ -pan-0.117.tar.bz2 +pan-0.118.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- pan.spec 22 Oct 2006 15:10:11 -0000 1.23 +++ pan.spec 4 Nov 2006 20:34:07 -0000 1.24 @@ -1,7 +1,7 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.117 -Release: 2%{?dist} +Version: 0.118 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Internet @@ -60,8 +60,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog -* Sun Oct 22 2006 Alexander Dalloz - 1:0.117-2 -- Bump release to correct cvs commit mistake +* Sat Nov 04 2006 Alexander Dalloz - 1:0.118-1 +- Update to 0.118 * Sun Oct 22 2006 Alexander Dalloz - 1:0.117-1 - Update to 0.117 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Oct 2006 12:18:03 -0000 1.13 +++ sources 4 Nov 2006 20:34:07 -0000 1.14 @@ -1 +1 @@ -0545c24799f675db73f77cd3fa0bffa0 pan-0.117.tar.bz2 +03c8ed7192d0454684a0c17c6082b92a pan-0.118.tar.bz2 From fedora-extras-commits at redhat.com Sat Nov 4 20:59:15 2006 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sat, 4 Nov 2006 13:59:15 -0700 Subject: rpms/pan/FC-6 .cvsignore, 1.13, 1.14 pan.spec, 1.23, 1.24 sources, 1.13, 1.14 Message-ID: <200611042059.kA4KxFYQ002169@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pan/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2149 Modified Files: .cvsignore pan.spec sources Log Message: update to latest upstream version "Lots of bugfixes this time as we try go get everything nailed down for 1.0. There are also a couple of speed improvements..." http://bugzilla.gnome.org/buglist.cgi?bug_id=358061,360375,361448,362436,364357,365990,363268,366542,366663,366665,367578,369008 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 22 Oct 2006 12:18:03 -0000 1.13 +++ .cvsignore 4 Nov 2006 20:58:45 -0000 1.14 @@ -1 +1 @@ -pan-0.117.tar.bz2 +pan-0.118.tar.bz2 Index: pan.spec =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/pan.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- pan.spec 22 Oct 2006 15:10:11 -0000 1.23 +++ pan.spec 4 Nov 2006 20:58:45 -0000 1.24 @@ -1,7 +1,7 @@ Summary: A GNOME/GTK+ news reader for X Name: pan -Version: 0.117 -Release: 2%{?dist} +Version: 0.118 +Release: 1%{?dist} Epoch: 1 License: GPL Group: Applications/Internet @@ -60,8 +60,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog -* Sun Oct 22 2006 Alexander Dalloz - 1:0.117-2 -- Bump release to correct cvs commit mistake +* Sat Nov 04 2006 Alexander Dalloz - 1:0.118-1 +- Update to 0.118 * Sun Oct 22 2006 Alexander Dalloz - 1:0.117-1 - Update to 0.117 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pan/FC-6/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Oct 2006 12:18:03 -0000 1.13 +++ sources 4 Nov 2006 20:58:45 -0000 1.14 @@ -1 +1 @@ -0545c24799f675db73f77cd3fa0bffa0 pan-0.117.tar.bz2 +03c8ed7192d0454684a0c17c6082b92a pan-0.118.tar.bz2 From fedora-extras-commits at redhat.com Sat Nov 4 21:24:23 2006 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sat, 4 Nov 2006 14:24:23 -0700 Subject: rpms/keychain/devel .cvsignore, 1.4, 1.5 keychain.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200611042124.kA4LON74005310@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5280 Modified Files: .cvsignore keychain.spec sources Log Message: update to latest upstream version changes: # keychain 2.6.8 (24 Oct 2006) Save LC_ALL for gpg invocation so that pinentry-curses works. This affected peper and kloeri, though it seems to work for me in any case. # keychain 2.6.7 (24 Oct 2006) Prevent gpg_listmissing from accidentally loading keys Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Sep 2006 02:11:46 -0000 1.4 +++ .cvsignore 4 Nov 2006 21:23:53 -0000 1.5 @@ -1 +1 @@ -keychain-2.6.2.tar.bz2 +keychain-2.6.8.tar.bz2 Index: keychain.spec =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- keychain.spec 1 Sep 2006 02:11:46 -0000 1.6 +++ keychain.spec 4 Nov 2006 21:23:53 -0000 1.7 @@ -1,6 +1,6 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.6.2 +Version: 2.6.8 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -49,6 +49,9 @@ %{_mandir}/man1/keychain.1* %changelog +* Sat Nov 04 2006 Alexander Dalloz - 2.6.8-1 +- Update to 2.6.8. + * Fri Sep 01 2006 Alexander Dalloz - 2.6.2-1 - Update to 2.6.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Sep 2006 02:11:46 -0000 1.4 +++ sources 4 Nov 2006 21:23:53 -0000 1.5 @@ -1 +1 @@ -b20933be0fdbb0b32aa5eb7b5b082852 keychain-2.6.2.tar.bz2 +2a23b311e438ecebed5639b568738d28 keychain-2.6.8.tar.bz2 From fedora-extras-commits at redhat.com Sat Nov 4 21:27:58 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 14:27:58 -0700 Subject: owners owners.list,1.1891,1.1892 Message-ID: <200611042127.kA4LRwGZ005396@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5376/owners Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1891 retrieving revision 1.1892 diff -u -r1.1891 -r1.1892 --- owners.list 4 Nov 2006 16:04:54 -0000 1.1891 +++ owners.list 4 Nov 2006 21:27:28 -0000 1.1892 @@ -818,6 +818,7 @@ Fedora Extras|kshutdown|KShutDown is an advanced shut down utility for KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org| Fedora Extras|kst|Plots scientific data|matt at truch.net|extras-qa at fedoraproject.org| Fedora Extras|ksynaptics|KDE configuration for synaptics module|orion at cora.nwra.com|extras-qa at fedoraproject.org| +Fedora Extras|ktechlab|Development and simulation of microcontrollers and electronic circuits|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org| Fedora Extras|ktorrent|KTorrent is a BitTorrent program for KDE|wolters.liste at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|kxdocker|A Mac OSX style docker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| @@ -2242,6 +2243,7 @@ Fedora Extras|tolua++|A tool to integrate C/C++ code with Lua|packages at amiga-hardware.com|extras-qa at fedoraproject.org| Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|tong|A game of skill|wart at kobold.org|extras-qa at fedoraproject.org| +Fedora Extras|toped|IC Layout Editor|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org| Fedora Extras|tor|Anonymizing overlay network for TCP (The onion router)|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Nov 4 22:02:10 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 15:02:10 -0700 Subject: rpms/katapult import.log,1.3,1.4 Message-ID: <200611042202.kA4M2ATb008584@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8551 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-1 on branch FC-5 from katapult-0.3.1.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 2 Sep 2006 10:43:31 -0000 1.3 +++ import.log 4 Nov 2006 22:01:39 -0000 1.4 @@ -1,2 +1,3 @@ katapult-0_3_1_3-4:HEAD:katapult-0.3.1.3-4.src.rpm:1156067817 katapult-0_3_1_3-5:HEAD:katapult-0.3.1.3-5.src.rpm:1157194032 +katapult-0_3_1_4-1:FC-5:katapult-0.3.1.4-1.src.rpm:1162677950 From fedora-extras-commits at redhat.com Sat Nov 4 22:02:13 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 15:02:13 -0700 Subject: rpms/katapult/FC-5 .cvsignore, 1.2, 1.3 katapult.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611042202.kA4M2DJh008588@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8551/FC-5 Modified Files: .cvsignore katapult.spec sources Log Message: auto-import katapult-0.3.1.4-1 on branch FC-5 from katapult-0.3.1.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Aug 2006 09:54:05 -0000 1.2 +++ .cvsignore 4 Nov 2006 22:01:41 -0000 1.3 @@ -1 +1 @@ -katapult_0.3.1.3.orig.tar.gz +katapult_0.3.1.4.orig.tar.gz Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-5/katapult.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- katapult.spec 20 Aug 2006 09:54:05 -0000 1.1 +++ katapult.spec 4 Nov 2006 22:01:41 -0000 1.2 @@ -1,24 +1,24 @@ %{?!_icondir:%define _icondir %{_datadir}/icons} -Name: katapult -Version: 0.3.1.3 -Release: 4%{?dist} -Summary: Faster access to applications, bookmarks, and other items - -License: GPL -Group: User Interface/Desktops -URL: http://www.thekatapult.org.uk/ +Name: katapult +Version: 0.3.1.4 +Release: 1%{?dist} +Summary: Faster access to applications, bookmarks, and other items + +License: GPL +Group: User Interface/Desktops +URL: http://www.thekatapult.org.uk/ -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz +Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: kdelibs-devel, desktop-file-utils, automake %description Katapult is an application for KDE, designed to allow faster access to applications, bookmarks, and other items. It is plugin-based, so it can -launch anything that is has a plugin for. Its display is driven by -plugins as well, so its appearance is completely customizable. It was +launch anything that is has a plugin for. Its display is driven by +plugins as well, so its appearance is completely customizable. It was inspired by Quicksilver for OS X. %prep @@ -26,41 +26,39 @@ %build %configure --disable-rpath -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%{__rm} -rf %{buildroot} +%{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor fedora \ --add-category X-Fedora \ --add-category System \ --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ - $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop + --dir %{buildroot}%{_datadir}/applications/ \ + %{buildroot}%{_datadir}/applications/kde/%{name}.desktop + +%{__rm} -f %{buildroot}%{_libdir}/*.la %find_lang %{name} %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %post /sbin/ldconfig 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 /sbin/ldconfig 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 || : %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INDEX README TODO VERSION +%doc AUTHORS ChangeLog COPYING %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/services/%{name}* @@ -69,15 +67,21 @@ %{_icondir}/hicolor/128x128/actions/no.png %{_icondir}/hicolor/128x128/apps/%{name}.png %{_icondir}/hicolor/128x128/apps/xcalc.png +%{_icondir}/crystalsvg/128x128/actions/%{name}spellcheck.png +%{_icondir}/crystalsvg/scalable/actions/%{name}spellcheck.svgz %{_icondir}/hicolor/??x??/apps/%{name}.png %{_icondir}/hicolor/scalable/apps/%{name}.svgz %{_libdir}/kde3/* %{_libdir}/lib%{name}.so* -%{_libdir}/lib%{name}catalog.so* -%{_libdir}/lib%{name}display.so* -%exclude %{_libdir}/*.la -%changelog + +%Changelog +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-1 +- New upstream release + +* Sat Sep 02 2006 Chitlesh Goorah - 0.3.1.3-5 +- Rebuild for FC6-devel + * Fri Jul 14 2006 Chitlesh Goorah - 0.3.1.3-4 - removed useless devel package Index: sources =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Aug 2006 09:54:05 -0000 1.2 +++ sources 4 Nov 2006 22:01:41 -0000 1.3 @@ -1 +1 @@ -09ef2951e6e861b32fc63121e281f1da katapult_0.3.1.3.orig.tar.gz +818dee9454dc46e955b396d3a1cd4dd1 katapult_0.3.1.4.orig.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 22:02:54 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 4 Nov 2006 15:02:54 -0700 Subject: rpms/gnome-theme-clearlooks-bigpack/devel .cvsignore, 1.3, 1.4 gnome-theme-clearlooks-bigpack.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611042202.kA4M2sNw008647@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8627 Modified Files: .cvsignore gnome-theme-clearlooks-bigpack.spec sources Log Message: Add cairo-enabled themes; fix a bunch of aesthetic issues; fix URL Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Dec 2005 06:05:16 -0000 1.3 +++ .cvsignore 4 Nov 2006 22:02:24 -0000 1.4 @@ -1 +1,2 @@ Clearlooks-Big_Pack-0.6.x.tar.gz +ALL-CL-Big_Pack-Cairo-0.6.tar.gz Index: gnome-theme-clearlooks-bigpack.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnome-theme-clearlooks-bigpack.spec 12 Oct 2006 03:21:53 -0000 1.4 +++ gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:02:24 -0000 1.5 @@ -1,12 +1,16 @@ Name: gnome-theme-clearlooks-bigpack Version: 0.6 -Release: 2%{?dist} -Summary: Additional Clearlooks color schemes +Release: 3%{?dist} +Summary: Additional Clearlooks color schemes Group: User Interface/Desktops License: GPL -URL: http://www.gnome-look.org/content/show.php?content=25557 +URL: http://gnomethemes.org/?p=43 + Source0: http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz +## Using my own hosting so that the tarball will be versioned; have sent an +## inquiry about this to upstream. +Source1: http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -15,33 +19,46 @@ %description Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine. + %prep -%setup -q -c +%setup -b 0 -q -c +%setup -D -b 1 -q -c + %build +# Nothing to build... + %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes -cp -ap Clearlooks* $RPM_BUILD_ROOT%{_datadir}/themes +rm -rf %{buildroot} +mkdir -p %{buildroot}/%{_datadir}/themes +cp -ap Clearlooks* %{buildroot}%{_datadir}/themes + %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + %files %defattr(-,root,root,-) %{_datadir}/themes/* + %changelog -* Wed Oct 11 2006 Peter Gordon 0.6-2 +* Sat Nov 04 2006 Peter Gordon - 0.6-3 +- Fix homepage URL +- A bunch of aesthetic cleanups to the spec +- Add Cairo-enabled themes + +* Wed Oct 11 2006 Peter Gordon - 0.6-2 - Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel) - Use hard tabs instead of spaces for the tags for simplicity -* Fri Dec 23 2005 Ignacio Vazquez-Abrams 0.6-1 +* Fri Dec 23 2005 Ignacio Vazquez-Abrams - 0.6-1 - Upstream update -* Thu Apr 7 2005 Ignacio Vazquez-Abrams 0.5-1.fc4 +* Thu Apr 7 2005 Ignacio Vazquez-Abrams - 0.5-1.fc4 - Dist split -* Wed Apr 6 2005 Ignacio Vazquez-Abrams 0.5-1 +* Wed Apr 6 2005 Ignacio Vazquez-Abrams - 0.5-1 - Initial RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Dec 2005 06:05:17 -0000 1.3 +++ sources 4 Nov 2006 22:02:24 -0000 1.4 @@ -1 +1,2 @@ 9bf7ab320a7054c4ee1e8ee7ec97adca Clearlooks-Big_Pack-0.6.x.tar.gz +fbeb82065381d9cebe023e68e19a6d34 ALL-CL-Big_Pack-Cairo-0.6.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 22:05:17 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 15:05:17 -0700 Subject: rpms/katapult import.log,1.4,1.5 Message-ID: <200611042205.kA4M5HU6008725@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8693 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-1 on branch FC-6 from katapult-0.3.1.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 4 Nov 2006 22:01:39 -0000 1.4 +++ import.log 4 Nov 2006 22:04:44 -0000 1.5 @@ -1,3 +1,4 @@ katapult-0_3_1_3-4:HEAD:katapult-0.3.1.3-4.src.rpm:1156067817 katapult-0_3_1_3-5:HEAD:katapult-0.3.1.3-5.src.rpm:1157194032 katapult-0_3_1_4-1:FC-5:katapult-0.3.1.4-1.src.rpm:1162677950 +katapult-0_3_1_4-1:FC-6:katapult-0.3.1.4-1.src.rpm:1162678131 From fedora-extras-commits at redhat.com Sat Nov 4 22:05:18 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 15:05:18 -0700 Subject: rpms/katapult/FC-6 .cvsignore, 1.2, 1.3 katapult.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611042205.kA4M5I7B008730@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8693/FC-6 Modified Files: .cvsignore katapult.spec sources Log Message: auto-import katapult-0.3.1.4-1 on branch FC-6 from katapult-0.3.1.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Aug 2006 09:54:05 -0000 1.2 +++ .cvsignore 4 Nov 2006 22:04:48 -0000 1.3 @@ -1 +1 @@ -katapult_0.3.1.3.orig.tar.gz +katapult_0.3.1.4.orig.tar.gz Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-6/katapult.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- katapult.spec 2 Sep 2006 10:43:32 -0000 1.2 +++ katapult.spec 4 Nov 2006 22:04:48 -0000 1.3 @@ -1,8 +1,8 @@ %{?!_icondir:%define _icondir %{_datadir}/icons} Name: katapult -Version: 0.3.1.3 -Release: 5%{?dist} +Version: 0.3.1.4 +Release: 1%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL @@ -26,11 +26,11 @@ %build %configure --disable-rpath -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -make DESTDIR=%{buildroot} install +%{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor fedora \ --add-category X-Fedora \ @@ -58,7 +58,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INDEX README TODO VERSION +%doc AUTHORS ChangeLog COPYING %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/services/%{name}* @@ -67,15 +67,18 @@ %{_icondir}/hicolor/128x128/actions/no.png %{_icondir}/hicolor/128x128/apps/%{name}.png %{_icondir}/hicolor/128x128/apps/xcalc.png +%{_icondir}/crystalsvg/128x128/actions/%{name}spellcheck.png +%{_icondir}/crystalsvg/scalable/actions/%{name}spellcheck.svgz %{_icondir}/hicolor/??x??/apps/%{name}.png %{_icondir}/hicolor/scalable/apps/%{name}.svgz %{_libdir}/kde3/* %{_libdir}/lib%{name}.so* -%{_libdir}/lib%{name}catalog.so* -%{_libdir}/lib%{name}display.so* %Changelog +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-1 +- New upstream release + * Sat Sep 02 2006 Chitlesh Goorah - 0.3.1.3-5 - Rebuild for FC6-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Aug 2006 09:54:05 -0000 1.2 +++ sources 4 Nov 2006 22:04:48 -0000 1.3 @@ -1 +1 @@ -09ef2951e6e861b32fc63121e281f1da katapult_0.3.1.3.orig.tar.gz +818dee9454dc46e955b396d3a1cd4dd1 katapult_0.3.1.4.orig.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 22:07:01 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 4 Nov 2006 15:07:01 -0700 Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6 .cvsignore, 1.3, 1.4 gnome-theme-clearlooks-bigpack.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611042207.kA4M71vj008857@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8801 Modified Files: .cvsignore gnome-theme-clearlooks-bigpack.spec sources Log Message: Add cairo-enabled themes; fix a bunch of aesthetic issues; fix URL Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Dec 2005 06:05:16 -0000 1.3 +++ .cvsignore 4 Nov 2006 22:06:30 -0000 1.4 @@ -1 +1,2 @@ Clearlooks-Big_Pack-0.6.x.tar.gz +ALL-CL-Big_Pack-Cairo-0.6.tar.gz Index: gnome-theme-clearlooks-bigpack.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnome-theme-clearlooks-bigpack.spec 12 Oct 2006 03:21:53 -0000 1.4 +++ gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:06:30 -0000 1.5 @@ -1,12 +1,16 @@ Name: gnome-theme-clearlooks-bigpack Version: 0.6 -Release: 2%{?dist} -Summary: Additional Clearlooks color schemes +Release: 3%{?dist} +Summary: Additional Clearlooks color schemes Group: User Interface/Desktops License: GPL -URL: http://www.gnome-look.org/content/show.php?content=25557 +URL: http://gnomethemes.org/?p=43 + Source0: http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz +## Using my own hosting so that the tarball will be versioned; have sent an +## inquiry about this to upstream. +Source1: http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -15,24 +19,37 @@ %description Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine. + %prep -%setup -q -c +%setup -b 0 -q -c +%setup -D -b 1 -q -c + %build +# Nothing to build... + %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes -cp -ap Clearlooks* $RPM_BUILD_ROOT%{_datadir}/themes +rm -rf %{buildroot} +mkdir -p %{buildroot}/%{_datadir}/themes +cp -ap Clearlooks* %{buildroot}%{_datadir}/themes + %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + %files %defattr(-,root,root,-) %{_datadir}/themes/* + %changelog +* Sat Nov 04 2006 Peter Gordon - 0.6-3 +- Fix homepage URL +- A bunch of aesthetic cleanups to the spec +- Add Cairo-enabled themes + * Wed Oct 11 2006 Peter Gordon 0.6-2 - Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel) - Use hard tabs instead of spaces for the tags for simplicity Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Dec 2005 06:05:17 -0000 1.3 +++ sources 4 Nov 2006 22:06:30 -0000 1.4 @@ -1 +1,2 @@ 9bf7ab320a7054c4ee1e8ee7ec97adca Clearlooks-Big_Pack-0.6.x.tar.gz +fbeb82065381d9cebe023e68e19a6d34 ALL-CL-Big_Pack-Cairo-0.6.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 22:07:09 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 15:07:09 -0700 Subject: rpms/katapult import.log,1.5,1.6 Message-ID: <200611042207.kA4M79Fx008860@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8823 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-1 on branch devel from katapult-0.3.1.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 4 Nov 2006 22:04:44 -0000 1.5 +++ import.log 4 Nov 2006 22:06:37 -0000 1.6 @@ -2,3 +2,4 @@ katapult-0_3_1_3-5:HEAD:katapult-0.3.1.3-5.src.rpm:1157194032 katapult-0_3_1_4-1:FC-5:katapult-0.3.1.4-1.src.rpm:1162677950 katapult-0_3_1_4-1:FC-6:katapult-0.3.1.4-1.src.rpm:1162678131 +katapult-0_3_1_4-1:HEAD:katapult-0.3.1.4-1.src.rpm:1162678248 From fedora-extras-commits at redhat.com Sat Nov 4 22:07:10 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 15:07:10 -0700 Subject: rpms/katapult/devel .cvsignore, 1.2, 1.3 katapult.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611042207.kA4M7AY1008863@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8823/devel Modified Files: .cvsignore katapult.spec sources Log Message: auto-import katapult-0.3.1.4-1 on branch devel from katapult-0.3.1.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/katapult/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Aug 2006 09:54:05 -0000 1.2 +++ .cvsignore 4 Nov 2006 22:06:40 -0000 1.3 @@ -1 +1 @@ -katapult_0.3.1.3.orig.tar.gz +katapult_0.3.1.4.orig.tar.gz Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/devel/katapult.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- katapult.spec 2 Sep 2006 10:43:32 -0000 1.2 +++ katapult.spec 4 Nov 2006 22:06:40 -0000 1.3 @@ -1,8 +1,8 @@ %{?!_icondir:%define _icondir %{_datadir}/icons} Name: katapult -Version: 0.3.1.3 -Release: 5%{?dist} +Version: 0.3.1.4 +Release: 1%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL @@ -26,11 +26,11 @@ %build %configure --disable-rpath -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} -make DESTDIR=%{buildroot} install +%{__make} DESTDIR=%{buildroot} install desktop-file-install --vendor fedora \ --add-category X-Fedora \ @@ -58,7 +58,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INDEX README TODO VERSION +%doc AUTHORS ChangeLog COPYING %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/services/%{name}* @@ -67,15 +67,18 @@ %{_icondir}/hicolor/128x128/actions/no.png %{_icondir}/hicolor/128x128/apps/%{name}.png %{_icondir}/hicolor/128x128/apps/xcalc.png +%{_icondir}/crystalsvg/128x128/actions/%{name}spellcheck.png +%{_icondir}/crystalsvg/scalable/actions/%{name}spellcheck.svgz %{_icondir}/hicolor/??x??/apps/%{name}.png %{_icondir}/hicolor/scalable/apps/%{name}.svgz %{_libdir}/kde3/* %{_libdir}/lib%{name}.so* -%{_libdir}/lib%{name}catalog.so* -%{_libdir}/lib%{name}display.so* %Changelog +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-1 +- New upstream release + * Sat Sep 02 2006 Chitlesh Goorah - 0.3.1.3-5 - Rebuild for FC6-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/katapult/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Aug 2006 09:54:05 -0000 1.2 +++ sources 4 Nov 2006 22:06:40 -0000 1.3 @@ -1 +1 @@ -09ef2951e6e861b32fc63121e281f1da katapult_0.3.1.3.orig.tar.gz +818dee9454dc46e955b396d3a1cd4dd1 katapult_0.3.1.4.orig.tar.gz From fedora-extras-commits at redhat.com Sat Nov 4 22:15:24 2006 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sat, 4 Nov 2006 15:15:24 -0700 Subject: rpms/keychain/FC-6 .cvsignore, 1.4, 1.5 keychain.csh, 1.3, 1.4 keychain.sh, 1.3, 1.4 keychain.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200611042215.kA4MFOw0009234@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9118 Modified Files: .cvsignore keychain.csh keychain.sh keychain.spec sources Log Message: update to current upstream version fix https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=212190 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Sep 2006 02:11:46 -0000 1.4 +++ .cvsignore 4 Nov 2006 22:14:54 -0000 1.5 @@ -1 +1 @@ -keychain-2.6.2.tar.bz2 +keychain-2.6.8.tar.bz2 Index: keychain.csh =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-6/keychain.csh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keychain.csh 1 Dec 2005 13:28:40 -0000 1.3 +++ keychain.csh 4 Nov 2006 22:14:54 -0000 1.4 @@ -2,7 +2,7 @@ # read in user's keychain settings or use defaults running keychain set USERHOME = `getent passwd $USER | cut -d: -f6` -if ($HOME == $USERHOME && -f $HOME/.keychainrc) then +if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'` Index: keychain.sh =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-6/keychain.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keychain.sh 1 Dec 2005 13:28:40 -0000 1.3 +++ keychain.sh 4 Nov 2006 22:14:54 -0000 1.4 @@ -2,7 +2,7 @@ # read in user's keychain settings or use defaults running keychain USERHOME=`getent passwd $USER | cut -d: -f6` -if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then +if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then . $HOME/.keychainrc Index: keychain.spec =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-6/keychain.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- keychain.spec 1 Sep 2006 02:11:46 -0000 1.6 +++ keychain.spec 4 Nov 2006 22:14:54 -0000 1.7 @@ -1,6 +1,6 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.6.2 +Version: 2.6.8 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -49,6 +49,9 @@ %{_mandir}/man1/keychain.1* %changelog +* Sat Nov 04 2006 Alexander Dalloz - 2.6.8-1 +- Update to 2.6.8. + * Fri Sep 01 2006 Alexander Dalloz - 2.6.2-1 - Update to 2.6.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Sep 2006 02:11:46 -0000 1.4 +++ sources 4 Nov 2006 22:14:54 -0000 1.5 @@ -1 +1 @@ -b20933be0fdbb0b32aa5eb7b5b082852 keychain-2.6.2.tar.bz2 +2a23b311e438ecebed5639b568738d28 keychain-2.6.8.tar.bz2 From fedora-extras-commits at redhat.com Sat Nov 4 22:17:34 2006 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sat, 4 Nov 2006 15:17:34 -0700 Subject: rpms/keychain/FC-6 keychain.spec,1.7,1.8 Message-ID: <200611042217.kA4MHY15009380@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9355 Modified Files: keychain.spec Log Message: add missing fix for #212190 in %changelog Index: keychain.spec =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-6/keychain.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- keychain.spec 4 Nov 2006 22:14:54 -0000 1.7 +++ keychain.spec 4 Nov 2006 22:17:04 -0000 1.8 @@ -50,7 +50,8 @@ %changelog * Sat Nov 04 2006 Alexander Dalloz - 2.6.8-1 -- Update to 2.6.8. +- Update to 2.6.8 +- Fix #212190. * Fri Sep 01 2006 Alexander Dalloz - 2.6.2-1 - Update to 2.6.2. From fedora-extras-commits at redhat.com Sat Nov 4 22:22:27 2006 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sat, 4 Nov 2006 15:22:27 -0700 Subject: rpms/keychain/FC-5 .cvsignore, 1.4, 1.5 keychain.csh, 1.3, 1.4 keychain.sh, 1.3, 1.4 keychain.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200611042222.kA4MMRlg009464@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9440 Modified Files: .cvsignore keychain.csh keychain.sh keychain.spec sources Log Message: update to latest upstream version fix #212190 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Sep 2006 17:23:52 -0000 1.4 +++ .cvsignore 4 Nov 2006 22:21:57 -0000 1.5 @@ -1 +1 @@ -keychain-2.6.2.tar.bz2 +keychain-2.6.8.tar.bz2 Index: keychain.csh =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-5/keychain.csh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keychain.csh 1 Dec 2005 13:28:40 -0000 1.3 +++ keychain.csh 4 Nov 2006 22:21:57 -0000 1.4 @@ -2,7 +2,7 @@ # read in user's keychain settings or use defaults running keychain set USERHOME = `getent passwd $USER | cut -d: -f6` -if ($HOME == $USERHOME && -f $HOME/.keychainrc) then +if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'` Index: keychain.sh =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-5/keychain.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keychain.sh 1 Dec 2005 13:28:40 -0000 1.3 +++ keychain.sh 4 Nov 2006 22:21:57 -0000 1.4 @@ -2,7 +2,7 @@ # read in user's keychain settings or use defaults running keychain USERHOME=`getent passwd $USER | cut -d: -f6` -if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then +if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then . $HOME/.keychainrc Index: keychain.spec =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-5/keychain.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- keychain.spec 8 Sep 2006 17:23:52 -0000 1.5 +++ keychain.spec 4 Nov 2006 22:21:57 -0000 1.6 @@ -1,6 +1,6 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG -Version: 2.6.2 +Version: 2.6.8 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -49,9 +49,16 @@ %{_mandir}/man1/keychain.1* %changelog -* Fri Sep 08 2006 Alexander Dalloz - 2.6.2-1 +* Sat Nov 04 2006 Alexander Dalloz - 2.6.8-1 +- Update to 2.6.8 +- Fix #212190. + +* Fri Sep 01 2006 Alexander Dalloz - 2.6.2-1 - Update to 2.6.2. +* Tue Aug 29 2006 Alexander Dalloz - 2.6.1-2 +- Rebuild for FC6. + * Sat Nov 26 2005 Ville Skytt?? - 2.6.1-1 - Update to 2.6.1. - Invoke keychain with --noask in opt-in scripts in non-interactive shells Index: sources =================================================================== RCS file: /cvs/extras/rpms/keychain/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Sep 2006 17:23:52 -0000 1.4 +++ sources 4 Nov 2006 22:21:57 -0000 1.5 @@ -1 +1 @@ -b20933be0fdbb0b32aa5eb7b5b082852 keychain-2.6.2.tar.bz2 +2a23b311e438ecebed5639b568738d28 keychain-2.6.8.tar.bz2 From fedora-extras-commits at redhat.com Sat Nov 4 22:27:22 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 4 Nov 2006 15:27:22 -0700 Subject: rpms/gnome-theme-clearlooks-bigpack/FC-5 gnome-theme-clearlooks-bigpack.spec, 1.3, 1.4 Message-ID: <200611042227.kA4MRMHJ009541@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9525/FC-5 Modified Files: gnome-theme-clearlooks-bigpack.spec Log Message: Fix URL entry Index: gnome-theme-clearlooks-bigpack.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-5/gnome-theme-clearlooks-bigpack.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-theme-clearlooks-bigpack.spec 23 Dec 2005 06:05:17 -0000 1.3 +++ gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:26:52 -0000 1.4 @@ -5,7 +5,7 @@ Group: User Interface/Desktops License: GPL -URL: http://www.gnome-look.org/content/show.php?content=25557 +URL: http://gnomethemes.org/?p=43 Source0: http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From fedora-extras-commits at redhat.com Sat Nov 4 22:35:03 2006 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Sat, 4 Nov 2006 15:35:03 -0700 Subject: rpms/keychain/devel keychain.csh, 1.3, 1.4 keychain.sh, 1.3, 1.4 keychain.spec, 1.7, 1.8 Message-ID: <200611042235.kA4MZ32o009643@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/keychain/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9623 Modified Files: keychain.csh keychain.sh keychain.spec Log Message: add fix for bug #212190 Index: keychain.csh =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.csh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keychain.csh 1 Dec 2005 13:28:40 -0000 1.3 +++ keychain.csh 4 Nov 2006 22:34:33 -0000 1.4 @@ -2,7 +2,7 @@ # read in user's keychain settings or use defaults running keychain set USERHOME = `getent passwd $USER | cut -d: -f6` -if ($HOME == $USERHOME && -f $HOME/.keychainrc) then +if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \ sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'` Index: keychain.sh =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keychain.sh 1 Dec 2005 13:28:40 -0000 1.3 +++ keychain.sh 4 Nov 2006 22:34:33 -0000 1.4 @@ -2,7 +2,7 @@ # read in user's keychain settings or use defaults running keychain USERHOME=`getent passwd $USER | cut -d: -f6` -if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then +if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then . $HOME/.keychainrc Index: keychain.spec =================================================================== RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- keychain.spec 4 Nov 2006 21:23:53 -0000 1.7 +++ keychain.spec 4 Nov 2006 22:34:33 -0000 1.8 @@ -1,7 +1,7 @@ Name: keychain Summary: Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG Version: 2.6.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://www.gentoo.org/proj/en/keychain/ @@ -49,6 +49,9 @@ %{_mandir}/man1/keychain.1* %changelog +* Sat Nov 04 2006 Alexander Dalloz - 2.6.8-2 +- Fix #212190. + * Sat Nov 04 2006 Alexander Dalloz - 2.6.8-1 - Update to 2.6.8. From fedora-extras-commits at redhat.com Sat Nov 4 22:37:56 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 4 Nov 2006 15:37:56 -0700 Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6 gnome-theme-clearlooks-bigpack.spec, 1.5, 1.6 Message-ID: <200611042237.kA4MbuPg009738@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9706/FC-6 Modified Files: gnome-theme-clearlooks-bigpack.spec Log Message: Since we're doing the cairo-enabled theme goodness, ensure that we explicitly depend on gtk2-engines >= 2.8 Index: gnome-theme-clearlooks-bigpack.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:06:30 -0000 1.5 +++ gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:37:25 -0000 1.6 @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: gtk2-engines +Requires: gtk2-engines >= 2.8 %description Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine. @@ -45,6 +45,10 @@ %changelog +* Sat Nov 04 2006 Peter Gordon +- Explicitly depend on gtk2-engines >= 2.8, since we're doing Cairo-enabled + goodness + * Sat Nov 04 2006 Peter Gordon - 0.6-3 - Fix homepage URL - A bunch of aesthetic cleanups to the spec From fedora-extras-commits at redhat.com Sat Nov 4 22:37:56 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sat, 4 Nov 2006 15:37:56 -0700 Subject: rpms/gnome-theme-clearlooks-bigpack/devel gnome-theme-clearlooks-bigpack.spec, 1.5, 1.6 Message-ID: <200611042237.kA4Mbu56009741@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9706/devel Modified Files: gnome-theme-clearlooks-bigpack.spec Log Message: Since we're doing the cairo-enabled theme goodness, ensure that we explicitly depend on gtk2-engines >= 2.8 Index: gnome-theme-clearlooks-bigpack.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:02:24 -0000 1.5 +++ gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:37:26 -0000 1.6 @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: gtk2-engines +Requires: gtk2-engines >= 2.8 %description Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine. @@ -45,6 +45,10 @@ %changelog +* Sat Nov 04 2006 Peter Gordon +- Explicitly depend on gtk2-engines >= 2.8, since we're doing Cairo-enabled + goodness + * Sat Nov 04 2006 Peter Gordon - 0.6-3 - Fix homepage URL - A bunch of aesthetic cleanups to the spec From fedora-extras-commits at redhat.com Sat Nov 4 23:00:57 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 16:00:57 -0700 Subject: rpms/katapult import.log,1.6,1.7 Message-ID: <200611042300.kA4N0voq010281@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10246 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-2 on branch FC-5 from katapult-0.3.1.4-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 4 Nov 2006 22:06:37 -0000 1.6 +++ import.log 4 Nov 2006 23:00:27 -0000 1.7 @@ -3,3 +3,4 @@ katapult-0_3_1_4-1:FC-5:katapult-0.3.1.4-1.src.rpm:1162677950 katapult-0_3_1_4-1:FC-6:katapult-0.3.1.4-1.src.rpm:1162678131 katapult-0_3_1_4-1:HEAD:katapult-0.3.1.4-1.src.rpm:1162678248 +katapult-0_3_1_4-2:FC-5:katapult-0.3.1.4-2.src.rpm:1162681478 From fedora-extras-commits at redhat.com Sat Nov 4 23:00:58 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sat, 4 Nov 2006 16:00:58 -0700 Subject: rpms/katapult/FC-5 katapult.spec,1.2,1.3 Message-ID: <200611042300.kA4N0wMK010284@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10246/FC-5 Modified Files: katapult.spec Log Message: auto-import katapult-0.3.1.4-2 on branch FC-5 from katapult-0.3.1.4-2.src.rpm Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-5/katapult.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- katapult.spec 4 Nov 2006 22:01:41 -0000 1.2 +++ katapult.spec 4 Nov 2006 23:00:27 -0000 1.3 @@ -2,7 +2,7 @@ Name: katapult Version: 0.3.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL @@ -12,7 +12,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils, automake +BuildRequires: kdelibs-devel, desktop-file-utils, automake, intltool %description Katapult is an application for KDE, designed to allow faster access to @@ -76,6 +76,9 @@ %Changelog +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-2 +- Added intltool as BR + * Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-1 - New upstream release From fedora-extras-commits at redhat.com Sun Nov 5 00:00:55 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 4 Nov 2006 17:00:55 -0700 Subject: rpms/zeroinstall-injector/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zeroinstall-injector.spec, 1.2, 1.3 Message-ID: <200611050000.kA500txN013690@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/FC-3 Modified Files: .cvsignore sources zeroinstall-injector.spec Log Message: Update to 0.24 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Oct 2006 05:31:39 -0000 1.2 +++ .cvsignore 5 Nov 2006 00:00:24 -0000 1.3 @@ -1 +1 @@ -zeroinstall-injector-0.23.tar.gz.gpg +zeroinstall-injector-0.24.tar.gz.gpg Index: sources =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Oct 2006 05:31:39 -0000 1.2 +++ sources 5 Nov 2006 00:00:24 -0000 1.3 @@ -1 +1 @@ -52ad9f0b49e3f35ff9490d5a3fc98843 zeroinstall-injector-0.23.tar.gz.gpg +d543beb1742374b1d2d983f0d05388fc zeroinstall-injector-0.24.tar.gz.gpg Index: zeroinstall-injector.spec =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/zeroinstall-injector.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zeroinstall-injector.spec 8 Oct 2006 05:31:39 -0000 1.2 +++ zeroinstall-injector.spec 5 Nov 2006 00:00:24 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: zeroinstall-injector -Version: 0.23 +Version: 0.24 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -48,19 +48,19 @@ %dir %{python_sitelib}/zeroinstall/0launch-gui/ %dir %{python_sitelib}/zeroinstall/injector/ %dir %{python_sitelib}/zeroinstall/zerostore/ -%ghost %{python_sitelib}/zeroinstall/*.pyo -%{python_sitelib}/zeroinstall/*.py -%{python_sitelib}/zeroinstall/*.pyc -%ghost %{python_sitelib}/zeroinstall/*/*.pyo +%{python_sitelib}/zeroinstall/*.py* %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui %{python_sitelib}/zeroinstall/0launch-gui/README %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml -%{python_sitelib}/zeroinstall/*/*.py -%{python_sitelib}/zeroinstall/*/*.pyc +%{python_sitelib}/zeroinstall/*/*.py* %{_mandir}/man1/0* %changelog +* Sat Nov 4 2006 Michel Salim 0.24-1 +- Update to 0.24 +- Not ghosting .pyos any longer + * Sun Oct 8 2006 Michel Salim 0.23-1 - Update to 0.23 From fedora-extras-commits at redhat.com Sun Nov 5 00:00:56 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 4 Nov 2006 17:00:56 -0700 Subject: rpms/zeroinstall-injector/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zeroinstall-injector.spec, 1.2, 1.3 Message-ID: <200611050000.kA500u3M013695@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/FC-4 Modified Files: .cvsignore sources zeroinstall-injector.spec Log Message: Update to 0.24 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Oct 2006 05:31:40 -0000 1.2 +++ .cvsignore 5 Nov 2006 00:00:25 -0000 1.3 @@ -1 +1 @@ -zeroinstall-injector-0.23.tar.gz.gpg +zeroinstall-injector-0.24.tar.gz.gpg Index: sources =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Oct 2006 05:31:40 -0000 1.2 +++ sources 5 Nov 2006 00:00:25 -0000 1.3 @@ -1 +1 @@ -52ad9f0b49e3f35ff9490d5a3fc98843 zeroinstall-injector-0.23.tar.gz.gpg +d543beb1742374b1d2d983f0d05388fc zeroinstall-injector-0.24.tar.gz.gpg Index: zeroinstall-injector.spec =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/zeroinstall-injector.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zeroinstall-injector.spec 8 Oct 2006 05:31:40 -0000 1.2 +++ zeroinstall-injector.spec 5 Nov 2006 00:00:25 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: zeroinstall-injector -Version: 0.23 +Version: 0.24 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: python gnupg -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: PyXML pygtk2 gnupg %description @@ -35,7 +34,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -48,19 +47,19 @@ %dir %{python_sitelib}/zeroinstall/0launch-gui/ %dir %{python_sitelib}/zeroinstall/injector/ %dir %{python_sitelib}/zeroinstall/zerostore/ -%ghost %{python_sitelib}/zeroinstall/*.pyo -%{python_sitelib}/zeroinstall/*.py -%{python_sitelib}/zeroinstall/*.pyc -%ghost %{python_sitelib}/zeroinstall/*/*.pyo +%{python_sitelib}/zeroinstall/*.py* %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui %{python_sitelib}/zeroinstall/0launch-gui/README %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml -%{python_sitelib}/zeroinstall/*/*.py -%{python_sitelib}/zeroinstall/*/*.pyc +%{python_sitelib}/zeroinstall/*/*.py* %{_mandir}/man1/0* %changelog +* Sat Nov 4 2006 Michel Salim 0.24-1 +- Update to 0.24 +- Not ghosting .pyos any longer + * Sun Oct 8 2006 Michel Salim 0.23-1 - Update to 0.23 From fedora-extras-commits at redhat.com Sun Nov 5 00:01:02 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 4 Nov 2006 17:01:02 -0700 Subject: rpms/zeroinstall-injector/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zeroinstall-injector.spec, 1.2, 1.3 Message-ID: <200611050001.kA5012PG014472@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/FC-6 Modified Files: .cvsignore sources zeroinstall-injector.spec Log Message: Update to 0.24 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Oct 2006 05:31:42 -0000 1.2 +++ .cvsignore 5 Nov 2006 00:00:32 -0000 1.3 @@ -1 +1 @@ -zeroinstall-injector-0.23.tar.gz.gpg +zeroinstall-injector-0.24.tar.gz.gpg Index: sources =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Oct 2006 05:31:42 -0000 1.2 +++ sources 5 Nov 2006 00:00:32 -0000 1.3 @@ -1 +1 @@ -52ad9f0b49e3f35ff9490d5a3fc98843 zeroinstall-injector-0.23.tar.gz.gpg +d543beb1742374b1d2d983f0d05388fc zeroinstall-injector-0.24.tar.gz.gpg Index: zeroinstall-injector.spec =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-6/zeroinstall-injector.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zeroinstall-injector.spec 8 Oct 2006 05:31:42 -0000 1.2 +++ zeroinstall-injector.spec 5 Nov 2006 00:00:32 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: zeroinstall-injector -Version: 0.23 +Version: 0.24 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: python gnupg -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: PyXML pygtk2 gnupg %description @@ -35,7 +34,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -48,19 +47,19 @@ %dir %{python_sitelib}/zeroinstall/0launch-gui/ %dir %{python_sitelib}/zeroinstall/injector/ %dir %{python_sitelib}/zeroinstall/zerostore/ -%ghost %{python_sitelib}/zeroinstall/*.pyo -%{python_sitelib}/zeroinstall/*.py -%{python_sitelib}/zeroinstall/*.pyc -%ghost %{python_sitelib}/zeroinstall/*/*.pyo +%{python_sitelib}/zeroinstall/*.py* %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui %{python_sitelib}/zeroinstall/0launch-gui/README %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml -%{python_sitelib}/zeroinstall/*/*.py -%{python_sitelib}/zeroinstall/*/*.pyc +%{python_sitelib}/zeroinstall/*/*.py* %{_mandir}/man1/0* %changelog +* Sat Nov 4 2006 Michel Salim 0.24-1 +- Update to 0.24 +- Not ghosting .pyos any longer + * Sun Oct 8 2006 Michel Salim 0.23-1 - Update to 0.23 From fedora-extras-commits at redhat.com Sun Nov 5 00:01:01 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 4 Nov 2006 17:01:01 -0700 Subject: rpms/zeroinstall-injector/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zeroinstall-injector.spec, 1.2, 1.3 Message-ID: <200611050001.kA501172013702@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/FC-5 Modified Files: .cvsignore sources zeroinstall-injector.spec Log Message: Update to 0.24 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Oct 2006 05:31:41 -0000 1.2 +++ .cvsignore 5 Nov 2006 00:00:31 -0000 1.3 @@ -1 +1 @@ -zeroinstall-injector-0.23.tar.gz.gpg +zeroinstall-injector-0.24.tar.gz.gpg Index: sources =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Oct 2006 05:31:41 -0000 1.2 +++ sources 5 Nov 2006 00:00:31 -0000 1.3 @@ -1 +1 @@ -52ad9f0b49e3f35ff9490d5a3fc98843 zeroinstall-injector-0.23.tar.gz.gpg +d543beb1742374b1d2d983f0d05388fc zeroinstall-injector-0.24.tar.gz.gpg Index: zeroinstall-injector.spec =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/zeroinstall-injector.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zeroinstall-injector.spec 8 Oct 2006 05:31:41 -0000 1.2 +++ zeroinstall-injector.spec 5 Nov 2006 00:00:31 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: zeroinstall-injector -Version: 0.23 +Version: 0.24 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: python gnupg -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: PyXML pygtk2 gnupg %description @@ -35,7 +34,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -48,19 +47,19 @@ %dir %{python_sitelib}/zeroinstall/0launch-gui/ %dir %{python_sitelib}/zeroinstall/injector/ %dir %{python_sitelib}/zeroinstall/zerostore/ -%ghost %{python_sitelib}/zeroinstall/*.pyo -%{python_sitelib}/zeroinstall/*.py -%{python_sitelib}/zeroinstall/*.pyc -%ghost %{python_sitelib}/zeroinstall/*/*.pyo +%{python_sitelib}/zeroinstall/*.py* %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui %{python_sitelib}/zeroinstall/0launch-gui/README %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml -%{python_sitelib}/zeroinstall/*/*.py -%{python_sitelib}/zeroinstall/*/*.pyc +%{python_sitelib}/zeroinstall/*/*.py* %{_mandir}/man1/0* %changelog +* Sat Nov 4 2006 Michel Salim 0.24-1 +- Update to 0.24 +- Not ghosting .pyos any longer + * Sun Oct 8 2006 Michel Salim 0.23-1 - Update to 0.23 From fedora-extras-commits at redhat.com Sun Nov 5 00:01:03 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 4 Nov 2006 17:01:03 -0700 Subject: rpms/zeroinstall-injector/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zeroinstall-injector.spec, 1.2, 1.3 Message-ID: <200611050001.kA5013xx015380@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/devel Modified Files: .cvsignore sources zeroinstall-injector.spec Log Message: Update to 0.24 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Oct 2006 05:31:42 -0000 1.2 +++ .cvsignore 5 Nov 2006 00:00:33 -0000 1.3 @@ -1 +1 @@ -zeroinstall-injector-0.23.tar.gz.gpg +zeroinstall-injector-0.24.tar.gz.gpg Index: sources =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Oct 2006 05:31:42 -0000 1.2 +++ sources 5 Nov 2006 00:00:33 -0000 1.3 @@ -1 +1 @@ -52ad9f0b49e3f35ff9490d5a3fc98843 zeroinstall-injector-0.23.tar.gz.gpg +d543beb1742374b1d2d983f0d05388fc zeroinstall-injector-0.24.tar.gz.gpg Index: zeroinstall-injector.spec =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- zeroinstall-injector.spec 8 Oct 2006 05:31:42 -0000 1.2 +++ zeroinstall-injector.spec 5 Nov 2006 00:00:33 -0000 1.3 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: zeroinstall-injector -Version: 0.23 +Version: 0.24 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: python gnupg -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: PyXML pygtk2 gnupg %description @@ -35,7 +34,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -48,19 +47,19 @@ %dir %{python_sitelib}/zeroinstall/0launch-gui/ %dir %{python_sitelib}/zeroinstall/injector/ %dir %{python_sitelib}/zeroinstall/zerostore/ -%ghost %{python_sitelib}/zeroinstall/*.pyo -%{python_sitelib}/zeroinstall/*.py -%{python_sitelib}/zeroinstall/*.pyc -%ghost %{python_sitelib}/zeroinstall/*/*.pyo +%{python_sitelib}/zeroinstall/*.py* %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui %{python_sitelib}/zeroinstall/0launch-gui/README %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml -%{python_sitelib}/zeroinstall/*/*.py -%{python_sitelib}/zeroinstall/*/*.pyc +%{python_sitelib}/zeroinstall/*/*.py* %{_mandir}/man1/0* %changelog +* Sat Nov 4 2006 Michel Salim 0.24-1 +- Update to 0.24 +- Not ghosting .pyos any longer + * Sun Oct 8 2006 Michel Salim 0.23-1 - Update to 0.23 From fedora-extras-commits at redhat.com Sun Nov 5 03:32:29 2006 From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr)) Date: Sat, 4 Nov 2006 20:32:29 -0700 Subject: rpms/python-4Suite-XML/devel .cvsignore, 1.2, 1.3 python-4Suite-XML.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200611050332.kA53WTPS026753@cvs-int.fedora.redhat.com> Author: mitr Update of /cvs/extras/rpms/python-4Suite-XML/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26720 Modified Files: .cvsignore python-4Suite-XML.spec sources Log Message: * Sun Nov 5 2006 Miloslav Trmac - 1.0-1 - Update to 4Suite-XML-1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jan 2006 11:16:49 -0000 1.2 +++ .cvsignore 5 Nov 2006 03:31:58 -0000 1.3 @@ -1 +1 @@ -4Suite-XML-1.0b3.tar.bz2 +4Suite-XML-1.0.tar.bz2 Index: python-4Suite-XML.spec =================================================================== RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/python-4Suite-XML.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-4Suite-XML.spec 10 Sep 2006 20:33:02 -0000 1.3 +++ python-4Suite-XML.spec 5 Nov 2006 03:31:58 -0000 1.4 @@ -1,9 +1,9 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define ver 1.0b3 +%define ver 1.0 Name: python-4Suite-XML Version: 1.0 -Release: 0.5.b3 +Release: 1 Summary: A collection of XML-related technologies for Python Group: Development/Libraries @@ -13,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description 4Suite-XML is a suite of Python modules for XML and RDF processing. @@ -25,7 +24,7 @@ * Ft.Lib: Various support libraries that can be used independently. %prep -%setup -q -n 4Suite-%{ver} +%setup -q -n 4Suite-XML-%{ver} %build export CFLAGS="$RPM_OPT_FLAGS" @@ -40,13 +39,13 @@ %install rm -rf $RPM_BUILD_ROOT -python setup.py bdist_install -O1 --root=$RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT chmod a-x $RPM_BUILD_ROOT%{_datadir}/4Suite/Data/Stylesheets/*.xslt # Move documentation to the right place mv $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/html html -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/xml +rm $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/{COPYRIGHT,README} %clean rm -rf $RPM_BUILD_ROOT @@ -57,9 +56,13 @@ %{_bindir}/4* %exclude %{_libdir}/4Suite %{python_sitearch}/Ft +%{python_sitearch}/4Suite_XML-1.0-py2.4.egg-info %{_datadir}/4Suite %changelog +* Sun Nov 5 2006 Miloslav Trmac - 1.0-1 +- Update to 4Suite-XML-1.0 + * Sun Sep 10 2006 Miloslav Trmac - 1.0-0.5.b3 - Rebuild for Fedora Extras 6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Jan 2006 11:16:49 -0000 1.2 +++ sources 5 Nov 2006 03:31:58 -0000 1.3 @@ -1 +1 @@ -9decb8b1032415ae155fe9a917fe8126 4Suite-XML-1.0b3.tar.bz2 +6f87c2b25c507d65783a7ad9bf7de179 4Suite-XML-1.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Nov 5 09:23:22 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Sun, 5 Nov 2006 02:23:22 -0700 Subject: rpms/sparse - New directory Message-ID: <200611050923.kA59NMm3031184@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/sparse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31179/sparse Log Message: Directory /cvs/extras/rpms/sparse added to the repository From fedora-extras-commits at redhat.com Sun Nov 5 09:23:28 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Sun, 5 Nov 2006 02:23:28 -0700 Subject: rpms/sparse/devel - New directory Message-ID: <200611050923.kA59NSd1031208@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/sparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31179/sparse/devel Log Message: Directory /cvs/extras/rpms/sparse/devel added to the repository From fedora-extras-commits at redhat.com Sun Nov 5 09:23:42 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Sun, 5 Nov 2006 02:23:42 -0700 Subject: rpms/sparse Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611050923.kA59NgMU031264@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/sparse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31258 Added Files: Makefile import.log Log Message: Setup of module sparse --- NEW FILE Makefile --- # Top level Makefile for module sparse 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 Nov 5 09:23:48 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Sun, 5 Nov 2006 02:23:48 -0700 Subject: rpms/sparse/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611050923.kA59NmUg031291@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/sparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31258/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module sparse --- 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 Nov 5 09:24:39 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Sun, 5 Nov 2006 02:24:39 -0700 Subject: rpms/sparse import.log,1.1,1.2 Message-ID: <200611050924.kA59OdcI031455@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/sparse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31370 Modified Files: import.log Log Message: auto-import sparse-0-0.1.20061026git on branch devel from sparse-0-0.1.20061026git.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/sparse/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Nov 2006 09:23:42 -0000 1.1 +++ import.log 5 Nov 2006 09:24:09 -0000 1.2 @@ -0,0 +1 @@ +sparse-0-0_1_20061026git:HEAD:sparse-0-0.1.20061026git.src.rpm:1162718644 From fedora-extras-commits at redhat.com Sun Nov 5 09:24:39 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Sun, 5 Nov 2006 02:24:39 -0700 Subject: rpms/sparse/devel sparse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611050924.kA59Odio031461@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/sparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31370/devel Modified Files: .cvsignore sources Added Files: sparse.spec Log Message: auto-import sparse-0-0.1.20061026git on branch devel from sparse-0-0.1.20061026git.src.rpm --- NEW FILE sparse.spec --- %define snapshot_date 20061026 %define prerelease 1 %define alphatag %{snapshot_date}git Name: sparse Version: 0 Release: 0.%{prerelease}.%{alphatag}%{?dist} Summary: A semantic parser of source files Group: Development/Tools License: Open Software License URL: http://www.kernel.org/pub/scm/devel/sparse/sparse.git/ # git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git/ # snapshots also available at http://www.codemonkey.org.uk/projects/git-snapshots/sparse/ Source0: sparse-%{snapshot_date}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Sparse is a semantic parser of source files: it's neither a compiler (although it could be used as a front-end for one) nor is it a preprocessor (although it contains as a part of it a preprocessing phase). It is meant to be a small - and simple - library. Scanty and meager, and partly because of that easy to use. It has one mission in life: create a semantic parse tree for some arbitrary user for further analysis. It's not a tokenizer, nor is it some generic context-free parser. In fact, context (semantics) is what it's all about - figuring out not just what the grouping of tokens are, but what the _types_ are that the grouping implies. Sparse is primarily used in the development and debugging of the Linux kernel. %prep %setup -q -n sparse %build make %{?_smp_mflags} PREFIX="%{_prefix}" CFLAGS="%{optflags} -Wwrite-strings -fpic" %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_libdir} make install PREFIX=%{buildroot}%{_prefix} # no reason to ship libsparse.so until something exists that links against it rm %{buildroot}%{_bindir}/libsparse.so %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE README FAQ %{_bindir}/sparse %changelog * Thu Oct 26 2006 Matt Domsch 0-0.1.20061026git - Initial packaging for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sparse/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Nov 2006 09:23:47 -0000 1.1 +++ .cvsignore 5 Nov 2006 09:24:09 -0000 1.2 @@ -0,0 +1 @@ +sparse-20061026.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sparse/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Nov 2006 09:23:47 -0000 1.1 +++ sources 5 Nov 2006 09:24:09 -0000 1.2 @@ -0,0 +1 @@ +724e23dc62375879f75708f35f245e58 sparse-20061026.tar.bz2 From fedora-extras-commits at redhat.com Sun Nov 5 09:28:33 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Sun, 5 Nov 2006 02:28:33 -0700 Subject: owners owners.list,1.1892,1.1893 Message-ID: <200611050928.kA59SXU6031933@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31842 Modified Files: owners.list Log Message: add sparse Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1892 retrieving revision 1.1893 diff -u -r1.1892 -r1.1893 --- owners.list 4 Nov 2006 21:27:28 -0000 1.1892 +++ owners.list 5 Nov 2006 09:28:02 -0000 1.1893 @@ -2123,6 +2123,7 @@ Fedora Extras|source-highlight|Produces a document with syntax highlighting|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org| +Fedora Extras|sparse|A semantic parser of source files|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Nov 5 13:05:31 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 5 Nov 2006 06:05:31 -0700 Subject: rpms/katapult/FC-5 katapult.spec,1.3,1.4 Message-ID: <200611051305.kA5D5V6F005839@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5775/FC-5 Modified Files: katapult.spec Log Message: auto-import katapult-0.3.1.4-3 on branch FC-5 from katapult-0.3.1.4-3.src.rpm Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-5/katapult.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- katapult.spec 4 Nov 2006 23:00:27 -0000 1.3 +++ katapult.spec 5 Nov 2006 13:05:00 -0000 1.4 @@ -2,7 +2,7 @@ Name: katapult Version: 0.3.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL @@ -12,7 +12,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils, automake, intltool +BuildRequires: kdelibs-devel, desktop-file-utils, automake, gettext %description Katapult is an application for KDE, designed to allow faster access to @@ -76,6 +76,9 @@ %Changelog +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-3 +- Added gettext as BR instead of intltool + * Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-2 - Added intltool as BR From fedora-extras-commits at redhat.com Sun Nov 5 13:05:29 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 5 Nov 2006 06:05:29 -0700 Subject: rpms/katapult import.log,1.7,1.8 Message-ID: <200611051305.kA5D5T0k005834@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5775 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-3 on branch FC-5 from katapult-0.3.1.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 4 Nov 2006 23:00:27 -0000 1.7 +++ import.log 5 Nov 2006 13:04:53 -0000 1.8 @@ -4,3 +4,4 @@ katapult-0_3_1_4-1:FC-6:katapult-0.3.1.4-1.src.rpm:1162678131 katapult-0_3_1_4-1:HEAD:katapult-0.3.1.4-1.src.rpm:1162678248 katapult-0_3_1_4-2:FC-5:katapult-0.3.1.4-2.src.rpm:1162681478 +katapult-0_3_1_4-3:FC-5:katapult-0.3.1.4-3.src.rpm:1162732144 From fedora-extras-commits at redhat.com Sun Nov 5 13:16:48 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 5 Nov 2006 06:16:48 -0700 Subject: rpms/katapult import.log,1.8,1.9 Message-ID: <200611051316.kA5DGm1q007011@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6924 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-3 on branch FC-6 from katapult-0.3.1.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 5 Nov 2006 13:04:53 -0000 1.8 +++ import.log 5 Nov 2006 13:16:18 -0000 1.9 @@ -5,3 +5,4 @@ katapult-0_3_1_4-1:HEAD:katapult-0.3.1.4-1.src.rpm:1162678248 katapult-0_3_1_4-2:FC-5:katapult-0.3.1.4-2.src.rpm:1162681478 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 From fedora-extras-commits at redhat.com Sun Nov 5 13:16:49 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 5 Nov 2006 06:16:49 -0700 Subject: rpms/katapult/FC-6 katapult.spec,1.3,1.4 Message-ID: <200611051316.kA5DGnU3007016@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6924/FC-6 Modified Files: katapult.spec Log Message: auto-import katapult-0.3.1.4-3 on branch FC-6 from katapult-0.3.1.4-3.src.rpm Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/FC-6/katapult.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- katapult.spec 4 Nov 2006 22:04:48 -0000 1.3 +++ katapult.spec 5 Nov 2006 13:16:18 -0000 1.4 @@ -2,7 +2,7 @@ Name: katapult Version: 0.3.1.4 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL @@ -12,7 +12,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils, automake +BuildRequires: kdelibs-devel, desktop-file-utils, automake, gettext %description Katapult is an application for KDE, designed to allow faster access to @@ -76,6 +76,12 @@ %Changelog +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-3 +- Added gettext as BR instead of intltool + +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-2 +- Added intltool as BR + * Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-1 - New upstream release From fedora-extras-commits at redhat.com Sun Nov 5 13:18:57 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 5 Nov 2006 06:18:57 -0700 Subject: rpms/katapult import.log,1.9,1.10 Message-ID: <200611051318.kA5DIvnF007317@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7232 Modified Files: import.log Log Message: auto-import katapult-0.3.1.4-3 on branch devel from katapult-0.3.1.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/katapult/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 5 Nov 2006 13:16:18 -0000 1.9 +++ import.log 5 Nov 2006 13:18:27 -0000 1.10 @@ -6,3 +6,4 @@ katapult-0_3_1_4-2:FC-5:katapult-0.3.1.4-2.src.rpm:1162681478 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 From fedora-extras-commits at redhat.com Sun Nov 5 13:18:58 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 5 Nov 2006 06:18:58 -0700 Subject: rpms/katapult/devel katapult.spec,1.3,1.4 Message-ID: <200611051318.kA5DIwCH007321@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/rpms/katapult/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7232/devel Modified Files: katapult.spec Log Message: auto-import katapult-0.3.1.4-3 on branch devel from katapult-0.3.1.4-3.src.rpm Index: katapult.spec =================================================================== RCS file: /cvs/extras/rpms/katapult/devel/katapult.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- katapult.spec 4 Nov 2006 22:06:40 -0000 1.3 +++ katapult.spec 5 Nov 2006 13:18:27 -0000 1.4 @@ -2,7 +2,7 @@ Name: katapult Version: 0.3.1.4 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Faster access to applications, bookmarks, and other items License: GPL @@ -12,7 +12,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, desktop-file-utils, automake +BuildRequires: kdelibs-devel, desktop-file-utils, automake, gettext %description Katapult is an application for KDE, designed to allow faster access to @@ -76,6 +76,12 @@ %Changelog +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-3 +- Added gettext as BR instead of intltool + +* Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-2 +- Added intltool as BR + * Sat Nov 04 2006 Chitlesh Goorah - 0.3.1.4-1 - New upstream release From fedora-extras-commits at redhat.com Sun Nov 5 16:18:40 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Sun, 5 Nov 2006 09:18:40 -0700 Subject: rpms/jd/devel .cvsignore, 1.12, 1.13 jd.spec, 1.19, 1.20 sources, 1.12, 1.13 Message-ID: <200611051618.kA5GIeho003123@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3034 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Nov 4 2006 Mamoru Tasaka - 1.8.0-0.5.cvs061105 - cvs 061105 (23:59 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 3 Nov 2006 12:58:46 -0000 1.12 +++ .cvsignore 5 Nov 2006 16:18:10 -0000 1.13 @@ -1 +1 @@ -jd-1.8.0-beta061103.tgz +jd-1.8.0-cvs061105.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- jd.spec 3 Nov 2006 12:58:46 -0000 1.19 +++ jd.spec 5 Nov 2006 16:18:10 -0000 1.20 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag beta061103 +%define strtag cvs061105 %define repoid 22566 @@ -103,6 +103,9 @@ %{icondir}/%{name}.png %changelog +* Sat Nov 4 2006 Mamoru Tasaka - 1.8.0-0.5.cvs061105 +- cvs 061105 (23:59 JST) + * Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 - 1.8.0 beta 061103 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 3 Nov 2006 12:58:46 -0000 1.12 +++ sources 5 Nov 2006 16:18:10 -0000 1.13 @@ -1 +1 @@ -fb89210bb7fa49b0fcdf3a28c1e22711 jd-1.8.0-beta061103.tgz +99d1dc3707cfb4a074e9419e19a2b139 jd-1.8.0-cvs061105.tgz From fedora-extras-commits at redhat.com Sun Nov 5 16:24:26 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 5 Nov 2006 09:24:26 -0700 Subject: rpms/perl-Data-Compare/FC-5 .cvsignore, 1.2, 1.3 perl-Data-Compare.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611051624.kA5GOQRm003996@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Data-Compare/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3866/FC-5 Modified Files: .cvsignore perl-Data-Compare.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Aug 2006 14:38:45 -0000 1.2 +++ .cvsignore 5 Nov 2006 16:23:56 -0000 1.3 @@ -1 +1 @@ -Data-Compare-0.13.tar.gz +Data-Compare-0.14.tar.gz Index: perl-Data-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-5/perl-Data-Compare.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Data-Compare.spec 15 Aug 2006 14:38:45 -0000 1.1 +++ perl-Data-Compare.spec 5 Nov 2006 16:23:56 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Data-Compare -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compare perl data structures @@ -52,5 +52,8 @@ %changelog +* Sun Nov 5 2006 Jose Pedro Oliveira - 0.14-1 +- Update to 0.14. + * Sun Apr 09 2006 Jose Pedro Oliveira - 0.13-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Aug 2006 14:38:45 -0000 1.2 +++ sources 5 Nov 2006 16:23:56 -0000 1.3 @@ -1 +1 @@ -874a13f201c6948e84867f82d950907a Data-Compare-0.13.tar.gz +15a77e350d066277953af7993110680c Data-Compare-0.14.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 16:24:27 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 5 Nov 2006 09:24:27 -0700 Subject: rpms/perl-Data-Compare/FC-6 .cvsignore, 1.2, 1.3 perl-Data-Compare.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611051624.kA5GORtE004005@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Data-Compare/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3866/FC-6 Modified Files: .cvsignore perl-Data-Compare.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Aug 2006 14:38:45 -0000 1.2 +++ .cvsignore 5 Nov 2006 16:23:56 -0000 1.3 @@ -1 +1 @@ -Data-Compare-0.13.tar.gz +Data-Compare-0.14.tar.gz Index: perl-Data-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-6/perl-Data-Compare.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Data-Compare.spec 15 Aug 2006 14:38:45 -0000 1.1 +++ perl-Data-Compare.spec 5 Nov 2006 16:23:56 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Data-Compare -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compare perl data structures @@ -52,5 +52,8 @@ %changelog +* Sun Nov 5 2006 Jose Pedro Oliveira - 0.14-1 +- Update to 0.14. + * Sun Apr 09 2006 Jose Pedro Oliveira - 0.13-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Aug 2006 14:38:45 -0000 1.2 +++ sources 5 Nov 2006 16:23:56 -0000 1.3 @@ -1 +1 @@ -874a13f201c6948e84867f82d950907a Data-Compare-0.13.tar.gz +15a77e350d066277953af7993110680c Data-Compare-0.14.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 16:24:27 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 5 Nov 2006 09:24:27 -0700 Subject: rpms/perl-Data-Compare/devel .cvsignore, 1.2, 1.3 perl-Data-Compare.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611051624.kA5GORhI004010@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Data-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3866/devel Modified Files: .cvsignore perl-Data-Compare.spec sources Log Message: Update to 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Aug 2006 14:38:45 -0000 1.2 +++ .cvsignore 5 Nov 2006 16:23:57 -0000 1.3 @@ -1 +1 @@ -Data-Compare-0.13.tar.gz +Data-Compare-0.14.tar.gz Index: perl-Data-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/devel/perl-Data-Compare.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Data-Compare.spec 15 Aug 2006 14:38:45 -0000 1.1 +++ perl-Data-Compare.spec 5 Nov 2006 16:23:57 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Data-Compare -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Compare perl data structures @@ -52,5 +52,8 @@ %changelog +* Sun Nov 5 2006 Jose Pedro Oliveira - 0.14-1 +- Update to 0.14. + * Sun Apr 09 2006 Jose Pedro Oliveira - 0.13-1 - First build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Aug 2006 14:38:45 -0000 1.2 +++ sources 5 Nov 2006 16:23:57 -0000 1.3 @@ -1 +1 @@ -874a13f201c6948e84867f82d950907a Data-Compare-0.13.tar.gz +15a77e350d066277953af7993110680c Data-Compare-0.14.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 16:39:15 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sun, 5 Nov 2006 09:39:15 -0700 Subject: rpms/yakuake/FC-6 yakuake-getSessionName.diff, NONE, 1.1 yakuake.spec, 1.4, 1.5 Message-ID: <200611051639.kA5GdFXp005833@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5782 Modified Files: yakuake.spec Added Files: yakuake-getSessionName.diff Log Message: Add support for KonsoleScripts (#212862) yakuake-getSessionName.diff: --- NEW FILE yakuake-getSessionName.diff --- diff -ur yakuake-2.7.5/yakuake/src/dcop_interface.h yakuake-2.7.5-patched/yakuake/src/dcop_interface.h --- yakuake-2.7.5/yakuake/src/dcop_interface.h 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/dcop_interface.h 2006-08-08 14:10:16.721056702 +0300 @@ -43,6 +43,8 @@ virtual void slotToggleState() = 0; virtual void slotRenameSession(int id, const QString & name) = 0; + + virtual QString slotSessionName(int id) = 0; virtual void slotSetSessionTitleText(int id, const QString & name) = 0; virtual void slotRunCommandInSession(int id, const QString & value) = 0; }; diff -ur yakuake-2.7.5/yakuake/src/main_window.cpp yakuake-2.7.5-patched/yakuake/src/main_window.cpp --- yakuake-2.7.5/yakuake/src/main_window.cpp 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/main_window.cpp 2006-08-08 14:12:08.191976212 +0300 @@ -290,6 +290,16 @@ /****************************************************************************** +** Gets caption from an item given its id +*********************************/ + +QString MainWindow::slotSessionName(int id) +{ + return tabs_bar->getCaption(id); +} + + +/****************************************************************************** ** Open inline edit for the current item and show tab bar if necessary ************************************************************************/ diff -ur yakuake-2.7.5/yakuake/src/main_window.h yakuake-2.7.5-patched/yakuake/src/main_window.h --- yakuake-2.7.5/yakuake/src/main_window.h 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/main_window.h 2006-08-08 14:06:43.891845419 +0300 @@ -280,6 +280,7 @@ void slotPasteClipboard(); void slotRenameSession(int id, const QString & name); + QString slotSessionName(int id); void slotInteractiveRename(); void slotSetSessionTitleText(int id, const QString & name); void slotRunCommandInSession(int id, const QString & value); diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.cpp yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp --- yakuake-2.7.5/yakuake/src/tabbed_widget.cpp 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp 2006-08-08 13:59:13.379880079 +0300 @@ -157,6 +157,18 @@ /****************************************************************************** +** Gets Caption from an item given its id +*********************************/ + +QString TabbedWidget::getCaption(int id) +{ + int index = items.findIndex(id); + + return captions[index]; +} + + +/****************************************************************************** ** Open inline edit for the current item ******************************************/ diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.h yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h --- yakuake-2.7.5/yakuake/src/tabbed_widget.h 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h 2006-08-08 14:08:45.551397384 +0300 @@ -145,6 +145,7 @@ void selectPreviousItem(); void renameItem(int id, const QString & name); + QString getCaption(int id); void interactiveRename(); void setFontColor(const QColor & color); diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.cpp yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp --- yakuake-2.7.5/yakuake/src/tabs_bar.cpp 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp 2006-08-08 14:14:43.405611033 +0300 @@ -86,6 +86,16 @@ tabs_widget->renameItem(id, name); } +/****************************************************************************** +** Gets Caption from an item given its id +*********************************/ + +QString TabsBar::getCaption(int id) +{ + return tabs_widget->getCaption(id); +} + + /****************************************************************************** ** Open inline edit for the current item diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.h yakuake-2.7.5-patched/yakuake/src/tabs_bar.h --- yakuake-2.7.5/yakuake/src/tabs_bar.h 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.h 2006-08-08 14:15:04.210902512 +0300 @@ -127,6 +127,7 @@ int removeItem(int id); void renameItem(int id, const QString & name); + QString getCaption(int id); void interactiveRename(); Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-6/yakuake.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- yakuake.spec 15 Sep 2006 13:27:15 -0000 1.4 +++ yakuake.spec 5 Nov 2006 16:38:45 -0000 1.5 @@ -1,12 +1,14 @@ Name: yakuake Version: 2.7.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Terminal emulator for KDE Group: User Interface/Desktops License: GPL URL: http://extragear.kde.org/apps/yakuake/ Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2 +# http://www.kde-look.org/content/download.php?content=43873&id=2 +Patch0: http://ota.tr.spt.fi/~fisu81/stuff/konsolescripts/yakuake-getSessionName.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,6 +21,7 @@ %prep %setup -q +%patch0 -p1 %build @@ -79,6 +82,9 @@ %changelog +* Mon Oct 30 2006 Dawid Gajownik - 2.7.5-4 +- Add support for KonsoleScripts (#212862) + * Fri Sep 15 2006 Dawid Gajownik - 2.7.5-3 - Rebuild for FE6 - Update e-mail address From fedora-extras-commits at redhat.com Sun Nov 5 16:44:16 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Sun, 5 Nov 2006 09:44:16 -0700 Subject: rpms/yakuake/FC-5 yakuake-getSessionName.diff, NONE, 1.1 yakuake.spec, 1.3, 1.4 Message-ID: <200611051644.kA5GiGYb006124@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/yakuake/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6100 Modified Files: yakuake.spec Added Files: yakuake-getSessionName.diff Log Message: Add support for KonsoleScripts (#212862) yakuake-getSessionName.diff: --- NEW FILE yakuake-getSessionName.diff --- diff -ur yakuake-2.7.5/yakuake/src/dcop_interface.h yakuake-2.7.5-patched/yakuake/src/dcop_interface.h --- yakuake-2.7.5/yakuake/src/dcop_interface.h 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/dcop_interface.h 2006-08-08 14:10:16.721056702 +0300 @@ -43,6 +43,8 @@ virtual void slotToggleState() = 0; virtual void slotRenameSession(int id, const QString & name) = 0; + + virtual QString slotSessionName(int id) = 0; virtual void slotSetSessionTitleText(int id, const QString & name) = 0; virtual void slotRunCommandInSession(int id, const QString & value) = 0; }; diff -ur yakuake-2.7.5/yakuake/src/main_window.cpp yakuake-2.7.5-patched/yakuake/src/main_window.cpp --- yakuake-2.7.5/yakuake/src/main_window.cpp 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/main_window.cpp 2006-08-08 14:12:08.191976212 +0300 @@ -290,6 +290,16 @@ /****************************************************************************** +** Gets caption from an item given its id +*********************************/ + +QString MainWindow::slotSessionName(int id) +{ + return tabs_bar->getCaption(id); +} + + +/****************************************************************************** ** Open inline edit for the current item and show tab bar if necessary ************************************************************************/ diff -ur yakuake-2.7.5/yakuake/src/main_window.h yakuake-2.7.5-patched/yakuake/src/main_window.h --- yakuake-2.7.5/yakuake/src/main_window.h 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/main_window.h 2006-08-08 14:06:43.891845419 +0300 @@ -280,6 +280,7 @@ void slotPasteClipboard(); void slotRenameSession(int id, const QString & name); + QString slotSessionName(int id); void slotInteractiveRename(); void slotSetSessionTitleText(int id, const QString & name); void slotRunCommandInSession(int id, const QString & value); diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.cpp yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp --- yakuake-2.7.5/yakuake/src/tabbed_widget.cpp 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp 2006-08-08 13:59:13.379880079 +0300 @@ -157,6 +157,18 @@ /****************************************************************************** +** Gets Caption from an item given its id +*********************************/ + +QString TabbedWidget::getCaption(int id) +{ + int index = items.findIndex(id); + + return captions[index]; +} + + +/****************************************************************************** ** Open inline edit for the current item ******************************************/ diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.h yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h --- yakuake-2.7.5/yakuake/src/tabbed_widget.h 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h 2006-08-08 14:08:45.551397384 +0300 @@ -145,6 +145,7 @@ void selectPreviousItem(); void renameItem(int id, const QString & name); + QString getCaption(int id); void interactiveRename(); void setFontColor(const QColor & color); diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.cpp yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp --- yakuake-2.7.5/yakuake/src/tabs_bar.cpp 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp 2006-08-08 14:14:43.405611033 +0300 @@ -86,6 +86,16 @@ tabs_widget->renameItem(id, name); } +/****************************************************************************** +** Gets Caption from an item given its id +*********************************/ + +QString TabsBar::getCaption(int id) +{ + return tabs_widget->getCaption(id); +} + + /****************************************************************************** ** Open inline edit for the current item diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.h yakuake-2.7.5-patched/yakuake/src/tabs_bar.h --- yakuake-2.7.5/yakuake/src/tabs_bar.h 2006-03-21 20:14:26.000000000 +0200 +++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.h 2006-08-08 14:15:04.210902512 +0300 @@ -127,6 +127,7 @@ int removeItem(int id); void renameItem(int id, const QString & name); + QString getCaption(int id); void interactiveRename(); Index: yakuake.spec =================================================================== RCS file: /cvs/extras/rpms/yakuake/FC-5/yakuake.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- yakuake.spec 20 May 2006 16:33:12 -0000 1.3 +++ yakuake.spec 5 Nov 2006 16:43:46 -0000 1.4 @@ -1,12 +1,14 @@ Name: yakuake Version: 2.7.5 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Terminal emulator for KDE Group: User Interface/Desktops License: GPL URL: http://extragear.kde.org/apps/yakuake/ Source0: http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2 +# http://www.kde-look.org/content/download.php?content=43873&id=2 +Patch0: http://ota.tr.spt.fi/~fisu81/stuff/konsolescripts/yakuake-getSessionName.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -19,16 +21,17 @@ %prep %setup -q +%patch0 -p1 %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ - --disable-debug \ - --disable-dependency-tracking \ - --disable-rpath \ - --enable-final + --disable-debug \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-final make %{?_smp_mflags} @@ -39,12 +42,12 @@ desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ - --add-category Application \ - --add-category Utility \ - --add-category KDE \ - --add-category Qt \ - --delete-original \ - %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop + --add-category Application \ + --add-category Utility \ + --add-category KDE \ + --add-category Qt \ + --delete-original \ + %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh %find_lang %{name} @@ -53,7 +56,7 @@ %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x ${_bindir}/gtk-update-icon-cache ] ; then - ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun @@ -79,10 +82,17 @@ %changelog -* Sat May 20 2006 Dawid Gajownik - 2.7.5-2 +* Mon Oct 30 2006 Dawid Gajownik - 2.7.5-4 +- Add support for KonsoleScripts (#212862) + +* Fri Sep 15 2006 Dawid Gajownik - 2.7.5-3 +- Update e-mail address +- Fix mixed-use-of-spaces-and-tabs rpmlint warning + +* Sat May 20 2006 Dawid Gajownik - 2.7.5-2 - Add dist tag -* Sat May 20 2006 Dawid Gajownik - 2.7.5-1 +* Sat May 20 2006 Dawid Gajownik - 2.7.5-1 - Update to 2.7.5 - Add `--disable-dependency-tracking' and `--enable-final' options - Include translations From fedora-extras-commits at redhat.com Sun Nov 5 16:48:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 5 Nov 2006 09:48:52 -0700 Subject: rpms/perl-Data-Compare/devel perl-Data-Compare.spec,1.2,1.3 Message-ID: <200611051648.kA5GmqmQ006255@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Data-Compare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6233 Modified Files: perl-Data-Compare.spec Log Message: New BR: perl(Clone) is needed by t/deep-objects.t. Index: perl-Data-Compare.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Data-Compare/devel/perl-Data-Compare.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Data-Compare.spec 5 Nov 2006 16:23:57 -0000 1.2 +++ perl-Data-Compare.spec 5 Nov 2006 16:48:22 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Data-Compare Version: 0.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compare perl data structures Group: Development/Libraries @@ -12,6 +12,7 @@ BuildArch: noarch BuildRequires: perl(File::Find::Rule) BuildRequires: perl(Scalar::Properties) +BuildRequires: perl(Clone) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -52,6 +53,9 @@ %changelog +* Sun Nov 5 2006 Jose Pedro Oliveira - 0.14-2 +- New BR: perl(Clone) is needed by t/deep-objects.t. + * Sun Nov 5 2006 Jose Pedro Oliveira - 0.14-1 - Update to 0.14. From fedora-extras-commits at redhat.com Sun Nov 5 17:42:19 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Sun, 5 Nov 2006 10:42:19 -0700 Subject: rpms/ctapi-cyberjack/devel .cvsignore, 1.4, 1.5 ctapi-cyberjack.spec, 1.17, 1.18 sources, 1.4, 1.5 Message-ID: <200611051742.kA5HgJaB009654@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9620 Modified Files: .cvsignore ctapi-cyberjack.spec sources Log Message: update to version 2.0.12 of the lib Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Sep 2006 14:14:07 -0000 1.4 +++ .cvsignore 5 Nov 2006 17:41:48 -0000 1.5 @@ -1 +1 @@ -ctapi-cyberjack-2.0.11.tar.gz +ctapi-cyberjack-2.0.12.tar.gz Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ctapi-cyberjack.spec 16 Sep 2006 18:30:00 -0000 1.17 +++ ctapi-cyberjack.spec 5 Nov 2006 17:41:48 -0000 1.18 @@ -1,7 +1,7 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader -Version: 2.0.11 -Release: 6%{?dist} +Version: 2.0.12 +Release: 1%{?dist} Requires: %{_libdir}/ctapi #ExcludeArch: x86_64 @@ -11,7 +11,7 @@ #For FC4 #BuildRequires: libusb-devel readline-devel kernel-devel -URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.11/ctapi-cyberjack-2.0.11.tar.gz +URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.12/ctapi-cyberjack-2.0.12.tar.gz License: LGPL Group: Development/Libraries @@ -108,7 +108,6 @@ %{_libdir}/ctapi/libctapi-cyberjack.so.* %{_bindir}/cjgeldkarte %{_bindir}/ctsh -%{_bindir}/ctpin %{_sysconfdir}/* %files pcsc @@ -125,6 +124,9 @@ %{_libdir}/ctapi/libctapi-cyberjack.la %changelog +* Sun Nov 5 2006 Frank B??ttner - 2.0.12-1%{?dist} +- update to driver version 2.0.12 + * Sat Sep 16 2006 Frank B??ttner - 2.0.11-6%{?dist} - try %configure instead of configure Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Sep 2006 14:14:07 -0000 1.4 +++ sources 5 Nov 2006 17:41:48 -0000 1.5 @@ -1 +1 @@ -4c6c324a7d76fac0069013bcec549b4d ctapi-cyberjack-2.0.11.tar.gz +c85e4629692e26f87b02ff6d6da7a8c7 ctapi-cyberjack-2.0.12.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 17:56:31 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Sun, 5 Nov 2006 10:56:31 -0700 Subject: rpms/ctapi-cyberjack/FC-6 .cvsignore, 1.4, 1.5 ctapi-cyberjack.spec, 1.17, 1.18 sources, 1.4, 1.5 Message-ID: <200611051756.kA5HuVmm009783@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/ctapi-cyberjack/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9760 Modified Files: .cvsignore ctapi-cyberjack.spec sources Log Message: update to version 2.0.12 of the lib Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Sep 2006 14:14:07 -0000 1.4 +++ .cvsignore 5 Nov 2006 17:56:00 -0000 1.5 @@ -1 +1 @@ -ctapi-cyberjack-2.0.11.tar.gz +ctapi-cyberjack-2.0.12.tar.gz Index: ctapi-cyberjack.spec =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/ctapi-cyberjack.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ctapi-cyberjack.spec 16 Sep 2006 18:30:00 -0000 1.17 +++ ctapi-cyberjack.spec 5 Nov 2006 17:56:00 -0000 1.18 @@ -1,7 +1,7 @@ Name: ctapi-cyberjack Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader -Version: 2.0.11 -Release: 6%{?dist} +Version: 2.0.12 +Release: 1%{?dist} Requires: %{_libdir}/ctapi #ExcludeArch: x86_64 @@ -11,7 +11,7 @@ #For FC4 #BuildRequires: libusb-devel readline-devel kernel-devel -URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.11/ctapi-cyberjack-2.0.11.tar.gz +URL: http://support.reiner-sct.de/downloads/LINUX/V2.0.12/ctapi-cyberjack-2.0.12.tar.gz License: LGPL Group: Development/Libraries @@ -108,7 +108,6 @@ %{_libdir}/ctapi/libctapi-cyberjack.so.* %{_bindir}/cjgeldkarte %{_bindir}/ctsh -%{_bindir}/ctpin %{_sysconfdir}/* %files pcsc @@ -125,6 +124,9 @@ %{_libdir}/ctapi/libctapi-cyberjack.la %changelog +* Sun Nov 5 2006 Frank B??ttner - 2.0.12-1%{?dist} +- update to driver version 2.0.12 + * Sat Sep 16 2006 Frank B??ttner - 2.0.11-6%{?dist} - try %configure instead of configure Index: sources =================================================================== RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Sep 2006 14:14:07 -0000 1.4 +++ sources 5 Nov 2006 17:56:00 -0000 1.5 @@ -1 +1 @@ -4c6c324a7d76fac0069013bcec549b4d ctapi-cyberjack-2.0.11.tar.gz +c85e4629692e26f87b02ff6d6da7a8c7 ctapi-cyberjack-2.0.12.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 18:32:44 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 5 Nov 2006 11:32:44 -0700 Subject: owners owners.list,1.1893,1.1894 Message-ID: <200611051832.kA5IWiNu013055@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029 Modified Files: owners.list Log Message: orphaning zope, plone, mpc and gmpc Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1893 retrieving revision 1.1894 diff -u -r1.1893 -r1.1894 --- owners.list 5 Nov 2006 09:28:02 -0000 1.1893 +++ owners.list 5 Nov 2006 18:32:14 -0000 1.1894 @@ -537,7 +537,7 @@ Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org| Fedora Extras|glyph-keeper|Library for text rendering|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org| -Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|gmpc|GNOME frontend for the MPD|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnash|GNU flash movie player|pertusus at free.fr|extras-qa at fedoraproject.org|petersen at redhat.com Fedora Extras|gnet2|A simple network library built upon glib|tmraz at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|gnochm|CHM file viewer|pertusus at free.fr|extras-qa at fedoraproject.org| @@ -1092,7 +1092,7 @@ Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|mousepad|A simple text editor for Xfce|kevin at tummy.com|extras-qa at fedoraproject.org| -Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|mpc|Command-line client for MPD|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|mtd-utils|Utilities for dealing with MTD (flash) devices|dwmw2 at redhat.com|extras-qa at fedoraproject.org|jwboyer at jdub.homelinux.org Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org| Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -1812,7 +1812,7 @@ Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org| Fedora Extras|plib|Set of portable libraries especially useful for games|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|matthias at rpmforge.net Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl -Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|plone|User friendly and powerful open source Content Management System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|plotmm|GTKmm plot widget for scientific applications|karlthered at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|plotutils|GNU vector and raster graphics utilities and libraries|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org| @@ -2477,7 +2477,7 @@ Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org| Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org| -Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|zope|Application server in Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|zvbi|Raw VBI, Teletext and Closed Caption decoding library|packages at amiga-hardware.com|extras-qa at fedoraproject.org| Fedora Extras|zynaddsubfx|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Nov 5 19:09:14 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 12:09:14 -0700 Subject: rpms/libtasn1/FC-6 sources,1.7,1.8 libtasn1.spec,1.14,1.15 Message-ID: <200611051909.kA5J9EkC016250@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/FC-6 Modified Files: sources libtasn1.spec Log Message: - updated to 0.3.6 - BR valgrind Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 15 Sep 2006 17:45:37 -0000 1.7 +++ sources 5 Nov 2006 19:08:44 -0000 1.8 @@ -1,2 +1,2 @@ -6315b320944e3a4e4c4e73d98cb6123e libtasn1-0.3.5.tar.gz -dd3a54bd747c7017af9ad8a1746dbb06 libtasn1-0.3.5.tar.gz.sig +491e5434a2eaec6277b98f6b362210ba libtasn1-0.3.6.tar.gz.sig +1a373457a4e6ad3c1641a847e7c70cf4 libtasn1-0.3.6.tar.gz Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-6/libtasn1.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libtasn1.spec 15 Sep 2006 17:45:37 -0000 1.14 +++ libtasn1.spec 5 Nov 2006 19:08:44 -0000 1.15 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.5 +Version: 0.3.6 Release: %release_func 1 License: LGPL @@ -13,7 +13,7 @@ Source0: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz Source1: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz.sig BuildRoot: %_tmppath/%name-%version-%release-buildroot -BuildRequires: bison +BuildRequires: bison valgrind %package devel @@ -110,6 +110,10 @@ %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.3.6-1 +- updated to 0.3.6 +- BR valgrind + * Fri Sep 15 2006 Enrico Scholz - 0.3.5-1 - updated to 0.3.5 From fedora-extras-commits at redhat.com Sun Nov 5 19:09:15 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 12:09:15 -0700 Subject: rpms/libtasn1/FC-5 sources,1.7,1.8 libtasn1.spec,1.14,1.15 Message-ID: <200611051909.kA5J9F05016254@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/FC-5 Modified Files: sources libtasn1.spec Log Message: - updated to 0.3.6 - BR valgrind Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 15 Sep 2006 17:45:36 -0000 1.7 +++ sources 5 Nov 2006 19:08:44 -0000 1.8 @@ -1,2 +1,2 @@ -6315b320944e3a4e4c4e73d98cb6123e libtasn1-0.3.5.tar.gz -dd3a54bd747c7017af9ad8a1746dbb06 libtasn1-0.3.5.tar.gz.sig +491e5434a2eaec6277b98f6b362210ba libtasn1-0.3.6.tar.gz.sig +1a373457a4e6ad3c1641a847e7c70cf4 libtasn1-0.3.6.tar.gz Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-5/libtasn1.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libtasn1.spec 15 Sep 2006 17:45:36 -0000 1.14 +++ libtasn1.spec 5 Nov 2006 19:08:45 -0000 1.15 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.5 +Version: 0.3.6 Release: %release_func 1 License: LGPL @@ -13,7 +13,7 @@ Source0: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz Source1: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz.sig BuildRoot: %_tmppath/%name-%version-%release-buildroot -BuildRequires: bison +BuildRequires: bison valgrind %package devel @@ -110,6 +110,10 @@ %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.3.6-1 +- updated to 0.3.6 +- BR valgrind + * Fri Sep 15 2006 Enrico Scholz - 0.3.5-1 - updated to 0.3.5 From fedora-extras-commits at redhat.com Sun Nov 5 19:09:13 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 12:09:13 -0700 Subject: rpms/libtasn1/devel sources,1.7,1.8 libtasn1.spec,1.14,1.15 Message-ID: <200611051909.kA5J9Dsx016244@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/devel Modified Files: sources libtasn1.spec Log Message: - updated to 0.3.6 - BR valgrind Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 15 Sep 2006 17:45:37 -0000 1.7 +++ sources 5 Nov 2006 19:08:42 -0000 1.8 @@ -1,2 +1,2 @@ -6315b320944e3a4e4c4e73d98cb6123e libtasn1-0.3.5.tar.gz -dd3a54bd747c7017af9ad8a1746dbb06 libtasn1-0.3.5.tar.gz.sig +491e5434a2eaec6277b98f6b362210ba libtasn1-0.3.6.tar.gz.sig +1a373457a4e6ad3c1641a847e7c70cf4 libtasn1-0.3.6.tar.gz Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libtasn1.spec 15 Sep 2006 17:45:37 -0000 1.14 +++ libtasn1.spec 5 Nov 2006 19:08:42 -0000 1.15 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.5 +Version: 0.3.6 Release: %release_func 1 License: LGPL @@ -13,7 +13,7 @@ Source0: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz Source1: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz.sig BuildRoot: %_tmppath/%name-%version-%release-buildroot -BuildRequires: bison +BuildRequires: bison valgrind %package devel @@ -110,6 +110,10 @@ %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.3.6-1 +- updated to 0.3.6 +- BR valgrind + * Fri Sep 15 2006 Enrico Scholz - 0.3.5-1 - updated to 0.3.5 From fedora-extras-commits at redhat.com Sun Nov 5 19:10:25 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Nov 2006 12:10:25 -0700 Subject: rpms/abiword/devel .cvsignore, 1.15, 1.16 abiword.spec, 1.39, 1.40 sources, 1.15, 1.16 abiword-2.4.5-fontconfig.patch, 1.1, NONE Message-ID: <200611051910.kA5JAPfB016398@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298 Modified Files: .cvsignore abiword.spec sources Removed Files: abiword-2.4.5-fontconfig.patch Log Message: Update to 2.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Jul 2006 12:23:54 -0000 1.15 +++ .cvsignore 5 Nov 2006 19:09:55 -0000 1.16 @@ -1 +1 @@ -abiword-2.4.5.tar.bz2 +abiword-2.4.6.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- abiword.spec 12 Oct 2006 14:55:56 -0000 1.39 +++ abiword.spec 5 Nov 2006 19:09:55 -0000 1.40 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.4.5 -Release: 4%{?dist} +Version: 2.4.6 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -45,7 +45,6 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch -Patch2: abiword-2.4.5-fontconfig.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -55,7 +54,6 @@ %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .fontconfig %build cd abi @@ -137,6 +135,9 @@ %{_datadir}/icons/*png %changelog +* Sun Nov 05 2006 Marc Maurer - 1:2.4.6-1.fc7 +- Update to 2.4.6 + * Thu Oct 12 2006 Marc Maurer - 1:2.4.5-4.fc6 - Fix bug 207294 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 9 Jul 2006 12:23:54 -0000 1.15 +++ sources 5 Nov 2006 19:09:55 -0000 1.16 @@ -1 +1 @@ -e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2 +8ed5fb282b9741aca75b9e47500d39a1 abiword-2.4.6.tar.bz2 --- abiword-2.4.5-fontconfig.patch DELETED --- From fedora-extras-commits at redhat.com Sun Nov 5 19:22:26 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Nov 2006 12:22:26 -0700 Subject: rpms/abiword/FC-5 .cvsignore, 1.15, 1.16 abiword.spec, 1.38, 1.39 sources, 1.15, 1.16 Message-ID: <200611051922.kA5JMQb8016554@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16510 Modified Files: .cvsignore abiword.spec sources Log Message: Update to 2.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-5/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Jul 2006 12:16:48 -0000 1.15 +++ .cvsignore 5 Nov 2006 19:21:56 -0000 1.16 @@ -1 +1 @@ -abiword-2.4.5.tar.bz2 +abiword-2.4.6.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- abiword.spec 16 Jul 2006 11:22:22 -0000 1.38 +++ abiword.spec 5 Nov 2006 19:21:56 -0000 1.39 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.4.5 -Release: 2%{?dist} +Version: 2.4.6 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -135,6 +135,9 @@ %{_datadir}/icons/*png %changelog +* Sun Nov 05 2006 Marc Maurer - 1:2.4.6-1.fc5 +- Update to 2.4.6 + * Sat Jul 15 2006 Marc Maurer - 1:2.4.5-2.fc5 - Fix http://bugzilla.abisource.com/show_bug.cgi?id=10229 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 9 Jul 2006 12:16:48 -0000 1.15 +++ sources 5 Nov 2006 19:21:56 -0000 1.16 @@ -1 +1 @@ -e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2 +8ed5fb282b9741aca75b9e47500d39a1 abiword-2.4.6.tar.bz2 From fedora-extras-commits at redhat.com Sun Nov 5 19:38:28 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Nov 2006 12:38:28 -0700 Subject: rpms/abiword/FC-6 .cvsignore, 1.15, 1.16 abiword.spec, 1.39, 1.40 sources, 1.15, 1.16 abiword-2.4.5-fontconfig.patch, 1.1, NONE Message-ID: <200611051938.kA5JcS23016662@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16642 Modified Files: .cvsignore abiword.spec sources Removed Files: abiword-2.4.5-fontconfig.patch Log Message: Update to 2.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-6/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Jul 2006 12:23:54 -0000 1.15 +++ .cvsignore 5 Nov 2006 19:37:58 -0000 1.16 @@ -1 +1 @@ -abiword-2.4.5.tar.bz2 +abiword-2.4.6.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-6/abiword.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- abiword.spec 12 Oct 2006 14:55:56 -0000 1.39 +++ abiword.spec 5 Nov 2006 19:37:58 -0000 1.40 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.4.5 -Release: 4%{?dist} +Version: 2.4.6 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -45,7 +45,6 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.4.4-desktop.patch -Patch2: abiword-2.4.5-fontconfig.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -55,7 +54,6 @@ %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .fontconfig %build cd abi @@ -137,6 +135,9 @@ %{_datadir}/icons/*png %changelog +* Sun Nov 05 2006 Marc Maurer - 1:2.4.6-1.fc6 +- Update to 2.4.6 + * Thu Oct 12 2006 Marc Maurer - 1:2.4.5-4.fc6 - Fix bug 207294 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-6/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 9 Jul 2006 12:23:54 -0000 1.15 +++ sources 5 Nov 2006 19:37:58 -0000 1.16 @@ -1 +1 @@ -e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2 +8ed5fb282b9741aca75b9e47500d39a1 abiword-2.4.6.tar.bz2 --- abiword-2.4.5-fontconfig.patch DELETED --- From fedora-extras-commits at redhat.com Sun Nov 5 20:11:51 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:11:51 -0700 Subject: rpms/clamav/FC-6 sources,1.20,1.21 clamav.spec,1.43,1.44 Message-ID: <200611052011.kA5KBpgK019912@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/FC-6 Modified Files: sources clamav.spec Log Message: updated to 0.88.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-6/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 18 Oct 2006 07:22:18 -0000 1.20 +++ sources 5 Nov 2006 20:11:21 -0000 1.21 @@ -1,2 +1,2 @@ -d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz -5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig +db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz +38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-6/clamav.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- clamav.spec 18 Oct 2006 07:22:18 -0000 1.43 +++ clamav.spec 5 Nov 2006 20:11:21 -0000 1.44 @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.5 -Release: %release_func 1 +Version: 0.88.6 +Release: %release_func 1 License: GPL Group: Applications/File @@ -448,6 +448,9 @@ %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.88.6-1 +- updated to 0.88.6 + * Wed Oct 18 2006 Enrico Scholz - 0.88.5-1 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for From fedora-extras-commits at redhat.com Sun Nov 5 20:11:53 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:11:53 -0700 Subject: rpms/clamav/FC-4 sources,1.19,1.20 clamav.spec,1.35,1.36 Message-ID: <200611052011.kA5KBrl1019918@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/FC-4 Modified Files: sources clamav.spec Log Message: updated to 0.88.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 21 Oct 2006 09:30:58 -0000 1.19 +++ sources 5 Nov 2006 20:11:22 -0000 1.20 @@ -1,2 +1,2 @@ -d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz -5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig +db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz +38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- clamav.spec 21 Oct 2006 09:30:58 -0000 1.35 +++ clamav.spec 5 Nov 2006 20:11:22 -0000 1.36 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.5 +Version: 0.88.6 Release: %release_func 1 License: GPL @@ -432,6 +432,9 @@ %endif # _without_milter %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.88.6-1 +- updated to 0.88.6 + * Sat Oct 21 2006 Enrico Scholz - 0.88.5-1 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 From fedora-extras-commits at redhat.com Sun Nov 5 20:11:50 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:11:50 -0700 Subject: rpms/clamav/devel sources,1.20,1.21 clamav.spec,1.43,1.44 Message-ID: <200611052011.kA5KBovL019908@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/devel Modified Files: sources clamav.spec Log Message: updated to 0.88.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 18 Oct 2006 07:22:18 -0000 1.20 +++ sources 5 Nov 2006 20:11:19 -0000 1.21 @@ -1,2 +1,2 @@ -d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz -5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig +db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz +38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- clamav.spec 18 Oct 2006 07:22:18 -0000 1.43 +++ clamav.spec 5 Nov 2006 20:11:19 -0000 1.44 @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.5 -Release: %release_func 1 +Version: 0.88.6 +Release: %release_func 1 License: GPL Group: Applications/File @@ -448,6 +448,9 @@ %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.88.6-1 +- updated to 0.88.6 + * Wed Oct 18 2006 Enrico Scholz - 0.88.5-1 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for From fedora-extras-commits at redhat.com Sun Nov 5 20:11:53 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:11:53 -0700 Subject: rpms/clamav/FC-3 sources,1.17,1.18 clamav.spec,1.25,1.26 Message-ID: <200611052011.kA5KBrFc019922@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/FC-3 Modified Files: sources clamav.spec Log Message: updated to 0.88.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 21 Oct 2006 09:28:51 -0000 1.17 +++ sources 5 Nov 2006 20:11:23 -0000 1.18 @@ -1,2 +1,2 @@ -d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz -5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig +db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz +38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- clamav.spec 21 Oct 2006 09:28:51 -0000 1.25 +++ clamav.spec 5 Nov 2006 20:11:23 -0000 1.26 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.5 +Version: 0.88.6 Release: %release_func 1 License: GPL @@ -432,8 +432,11 @@ %endif # _without_milter %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.88.6-1 +- updated to 0.88.6 + * Sat Oct 21 2006 Enrico Scholz - 0.88.5-1 -- updated to 0.88.5 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 * Tue Aug 8 2006 Enrico Scholz - 0.88.4-1 - updated to 0.88.4 (SECURITY) From fedora-extras-commits at redhat.com Sun Nov 5 20:11:52 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:11:52 -0700 Subject: rpms/clamav/FC-5 sources,1.19,1.20 clamav.spec,1.38,1.39 Message-ID: <200611052011.kA5KBqfW019916@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/FC-5 Modified Files: sources clamav.spec Log Message: updated to 0.88.6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 18 Oct 2006 07:24:32 -0000 1.19 +++ sources 5 Nov 2006 20:11:21 -0000 1.20 @@ -1,2 +1,2 @@ -d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz -5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig +db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz +38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-5/clamav.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- clamav.spec 18 Oct 2006 07:24:32 -0000 1.38 +++ clamav.spec 5 Nov 2006 20:11:21 -0000 1.39 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.5 +Version: 0.88.6 Release: %release_func 1 License: GPL @@ -434,6 +434,9 @@ %endif # _without_milter %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.88.6-1 +- updated to 0.88.6 + * Wed Oct 18 2006 Enrico Scholz - 0.88.5-1 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 From fedora-extras-commits at redhat.com Sun Nov 5 20:28:29 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:28:29 -0700 Subject: rpms/opencdk/FC-5 .cvsignore,1.3,1.4 Message-ID: <200611052028.kA5KSTDZ020200@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20156/FC-5 Modified Files: .cvsignore Log Message: ignore some more files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Feb 2005 23:09:47 -0000 1.3 +++ .cvsignore 5 Nov 2006 20:27:59 -0000 1.4 @@ -1,2 +1,4 @@ opencdk*.tar.bz2* +opencdk*.tar.gz* opencdk*.tar.bz2.sig.asc +opencdk*.tar.gz.sig From fedora-extras-commits at redhat.com Sun Nov 5 20:28:31 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:28:31 -0700 Subject: rpms/opencdk/devel .cvsignore,1.4,1.5 Message-ID: <200611052028.kA5KSVaf020204@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20156/devel Modified Files: .cvsignore Log Message: ignore some more files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opencdk/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Sep 2006 06:40:23 -0000 1.4 +++ .cvsignore 5 Nov 2006 20:28:01 -0000 1.5 @@ -1,4 +1,4 @@ opencdk*.tar.bz2* -opencdk*.tar.bz2.sig.asc opencdk*.tar.gz* +opencdk*.tar.bz2.sig.asc opencdk*.tar.gz.sig From fedora-extras-commits at redhat.com Sun Nov 5 20:28:30 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:28:30 -0700 Subject: rpms/opencdk/FC-6 .cvsignore,1.4,1.5 Message-ID: <200611052028.kA5KSUg2020203@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20156/FC-6 Modified Files: .cvsignore Log Message: ignore some more files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Sep 2006 06:40:23 -0000 1.4 +++ .cvsignore 5 Nov 2006 20:28:00 -0000 1.5 @@ -1,4 +1,4 @@ opencdk*.tar.bz2* -opencdk*.tar.bz2.sig.asc opencdk*.tar.gz* +opencdk*.tar.bz2.sig.asc opencdk*.tar.gz.sig From fedora-extras-commits at redhat.com Sun Nov 5 20:29:51 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:29:51 -0700 Subject: rpms/opencdk/devel sources,1.5,1.6 opencdk.spec,1.9,1.10 Message-ID: <200611052029.kA5KTpJp020279@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20224/devel Modified Files: sources opencdk.spec Log Message: - updated to 0.5.11 - added pkgconfig file Index: sources =================================================================== RCS file: /cvs/extras/rpms/opencdk/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Sep 2006 18:01:04 -0000 1.5 +++ sources 5 Nov 2006 20:29:21 -0000 1.6 @@ -1,2 +1,2 @@ -7dd032032850719ccb6a75353e331f07 opencdk-0.5.9.tar.gz.sig -b692c2dc2cedd1435e2a2ef3f5a2c708 opencdk-0.5.9.tar.gz +de16f52a7f2215e3df9e81067ebae60d opencdk-0.5.11.tar.gz +6521460eb777c6fab25c71943e3b8d3e opencdk-0.5.11.tar.gz.sig Index: opencdk.spec =================================================================== RCS file: /cvs/extras/rpms/opencdk/devel/opencdk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- opencdk.spec 15 Sep 2006 18:01:04 -0000 1.9 +++ opencdk.spec 5 Nov 2006 20:29:21 -0000 1.10 @@ -4,7 +4,7 @@ Summary: Provides basic parts of the OpenPGP message format Name: opencdk -Version: 0.5.9 +Version: 0.5.11 Release: %release_func 1 License: GPL @@ -19,7 +19,7 @@ Summary: Files which are needed to develop applications using opencdk Group: Development/Libraries Requires: %name = %version-%release -Requires: libgcrypt-devel zlib-devel +Requires: libgcrypt-devel zlib-devel pkgconfig %description @@ -88,9 +88,14 @@ %_includedir/* %_libdir/*.a %_libdir/*.so +%_libdir/*/*.pc %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.5.11-1 +- updated to 0.5.11 +- added pkgconfig file + * Fri Sep 15 2006 Enrico Scholz - 0.5.9-1 - updated to 0.5.9 From fedora-extras-commits at redhat.com Sun Nov 5 20:29:52 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:29:52 -0700 Subject: rpms/opencdk/FC-6 sources,1.5,1.6 opencdk.spec,1.9,1.10 Message-ID: <200611052029.kA5KTqM7020283@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20224/FC-6 Modified Files: sources opencdk.spec Log Message: - updated to 0.5.11 - added pkgconfig file Index: sources =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Sep 2006 18:01:04 -0000 1.5 +++ sources 5 Nov 2006 20:29:22 -0000 1.6 @@ -1,2 +1,2 @@ -7dd032032850719ccb6a75353e331f07 opencdk-0.5.9.tar.gz.sig -b692c2dc2cedd1435e2a2ef3f5a2c708 opencdk-0.5.9.tar.gz +de16f52a7f2215e3df9e81067ebae60d opencdk-0.5.11.tar.gz +6521460eb777c6fab25c71943e3b8d3e opencdk-0.5.11.tar.gz.sig Index: opencdk.spec =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-6/opencdk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- opencdk.spec 15 Sep 2006 18:01:04 -0000 1.9 +++ opencdk.spec 5 Nov 2006 20:29:22 -0000 1.10 @@ -4,7 +4,7 @@ Summary: Provides basic parts of the OpenPGP message format Name: opencdk -Version: 0.5.9 +Version: 0.5.11 Release: %release_func 1 License: GPL @@ -19,7 +19,7 @@ Summary: Files which are needed to develop applications using opencdk Group: Development/Libraries Requires: %name = %version-%release -Requires: libgcrypt-devel zlib-devel +Requires: libgcrypt-devel zlib-devel pkgconfig %description @@ -88,9 +88,14 @@ %_includedir/* %_libdir/*.a %_libdir/*.so +%_libdir/*/*.pc %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.5.11-1 +- updated to 0.5.11 +- added pkgconfig file + * Fri Sep 15 2006 Enrico Scholz - 0.5.9-1 - updated to 0.5.9 From fedora-extras-commits at redhat.com Sun Nov 5 20:29:57 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 5 Nov 2006 13:29:57 -0700 Subject: rpms/opencdk/FC-5 sources,1.5,1.6 opencdk.spec,1.9,1.10 Message-ID: <200611052029.kA5KTvMx020289@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/opencdk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20224/FC-5 Modified Files: sources opencdk.spec Log Message: - updated to 0.5.11 - added pkgconfig file Index: sources =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Sep 2006 18:01:03 -0000 1.5 +++ sources 5 Nov 2006 20:29:27 -0000 1.6 @@ -1,2 +1,2 @@ -7dd032032850719ccb6a75353e331f07 opencdk-0.5.9.tar.gz.sig -b692c2dc2cedd1435e2a2ef3f5a2c708 opencdk-0.5.9.tar.gz +de16f52a7f2215e3df9e81067ebae60d opencdk-0.5.11.tar.gz +6521460eb777c6fab25c71943e3b8d3e opencdk-0.5.11.tar.gz.sig Index: opencdk.spec =================================================================== RCS file: /cvs/extras/rpms/opencdk/FC-5/opencdk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- opencdk.spec 15 Sep 2006 18:01:03 -0000 1.9 +++ opencdk.spec 5 Nov 2006 20:29:27 -0000 1.10 @@ -4,7 +4,7 @@ Summary: Provides basic parts of the OpenPGP message format Name: opencdk -Version: 0.5.9 +Version: 0.5.11 Release: %release_func 1 License: GPL @@ -19,7 +19,7 @@ Summary: Files which are needed to develop applications using opencdk Group: Development/Libraries Requires: %name = %version-%release -Requires: libgcrypt-devel zlib-devel +Requires: libgcrypt-devel zlib-devel pkgconfig %description @@ -88,9 +88,14 @@ %_includedir/* %_libdir/*.a %_libdir/*.so +%_libdir/*/*.pc %changelog +* Sun Nov 5 2006 Enrico Scholz - 0.5.11-1 +- updated to 0.5.11 +- added pkgconfig file + * Fri Sep 15 2006 Enrico Scholz - 0.5.9-1 - updated to 0.5.9 From fedora-extras-commits at redhat.com Sun Nov 5 21:28:31 2006 From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh)) Date: Sun, 5 Nov 2006 14:28:31 -0700 Subject: comps comps-fe5.xml.in, 1.190, 1.191 comps-fe6.xml.in, 1.214, 1.215 comps-fe7.xml.in, 1.12, 1.13 Message-ID: <200611052128.kA5LSVEw023629@cvs-int.fedora.redhat.com> Author: chitlesh Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23609/comps Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- comps-fe5.xml.in 4 Nov 2006 12:04:12 -0000 1.190 +++ comps-fe5.xml.in 5 Nov 2006 21:28:01 -0000 1.191 @@ -236,7 +236,7 @@ galculator gdl geant321 - genius + genius ghdl gnucap gpredict @@ -249,6 +249,7 @@ hmmer kicad kst + ktechlab lagan lapack libctl @@ -276,6 +277,7 @@ scrip sextractor SIBsim4 + toped wcstools xdrawchem Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- comps-fe6.xml.in 4 Nov 2006 12:04:12 -0000 1.214 +++ comps-fe6.xml.in 5 Nov 2006 21:28:01 -0000 1.215 @@ -273,7 +273,7 @@ galculator gdl geant321 - genius + genius geda-docs geda-gattrib geda-gnetlist @@ -295,6 +295,7 @@ kicad kpolynome kst + ktechlab lagan lapack libctl @@ -324,6 +325,7 @@ scrip sextractor SIBsim4 + toped veusz wcstools xcircuit Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- comps-fe7.xml.in 4 Nov 2006 12:04:12 -0000 1.12 +++ comps-fe7.xml.in 5 Nov 2006 21:28:01 -0000 1.13 @@ -273,7 +273,7 @@ galculator gdl geant321 - genius + genius geda-docs geda-gattrib geda-gnetlist @@ -295,6 +295,7 @@ kicad kpolynome kst + ktechlab lagan lapack libctl @@ -324,6 +325,7 @@ scrip sextractor SIBsim4 + toped veusz wcstools xcircuit From fedora-extras-commits at redhat.com Sun Nov 5 21:40:35 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Sun, 5 Nov 2006 14:40:35 -0700 Subject: rpms/abiword/FC-4 .cvsignore, 1.12, 1.13 abiword.spec, 1.27, 1.28 sources, 1.12, 1.13 Message-ID: <200611052140.kA5LeZYv023780@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23756 Modified Files: .cvsignore abiword.spec sources Log Message: Update to 2.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 9 Jul 2006 17:35:22 -0000 1.12 +++ .cvsignore 5 Nov 2006 21:40:05 -0000 1.13 @@ -1 +1 @@ -abiword-2.4.5.tar.bz2 +abiword-2.4.6.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- abiword.spec 16 Jul 2006 11:30:07 -0000 1.27 +++ abiword.spec 5 Nov 2006 21:40:05 -0000 1.28 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.4.5 -Release: 2%{?dist} +Version: 2.4.6 +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -136,6 +136,9 @@ %{_datadir}/icons/*png %changelog +* Sun Nov 05 2006 Marc Maurer - 1:2.4.6-1.fc4 +- Update to 2.4.6 + * Sun Jul 16 2006 Marc Maurer - 1:2.4.5-2.fc4 - Fix http://bugzilla.abisource.com/show_bug.cgi?id=10229 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 9 Jul 2006 17:35:22 -0000 1.12 +++ sources 5 Nov 2006 21:40:05 -0000 1.13 @@ -1 +1 @@ -e018669a154164d31c768f773a1c95b4 abiword-2.4.5.tar.bz2 +8ed5fb282b9741aca75b9e47500d39a1 abiword-2.4.6.tar.bz2 From fedora-extras-commits at redhat.com Sun Nov 5 21:53:47 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 5 Nov 2006 14:53:47 -0700 Subject: rpms/xaos/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xaos.spec, 1.3, 1.4 Message-ID: <200611052153.kA5LrlWJ023886@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/xaos/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23864 Modified Files: .cvsignore sources xaos.spec Log Message: new version 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xaos/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Jun 2006 16:06:21 -0000 1.2 +++ .cvsignore 5 Nov 2006 21:53:17 -0000 1.3 @@ -1 +1 @@ -XaoS-3.2.1.tar.gz +XaoS-3.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xaos/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Jun 2006 16:06:21 -0000 1.2 +++ sources 5 Nov 2006 21:53:17 -0000 1.3 @@ -1 +1 @@ -8df634737b276f9f172060f3ffc489be XaoS-3.2.1.tar.gz +bd347d6be1ff7e4f7a81975d82c36921 XaoS-3.2.2.tar.gz Index: xaos.spec =================================================================== RCS file: /cvs/extras/rpms/xaos/FC-6/xaos.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xaos.spec 28 Aug 2006 11:00:25 -0000 1.3 +++ xaos.spec 5 Nov 2006 21:53:17 -0000 1.4 @@ -1,12 +1,12 @@ Name: xaos -Version: 3.2.1 -Release: 4%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: A fast, portable real-time interactive fractal zoomer Group: Applications/Multimedia License: GPL URL: http://xaos.sourceforge.net -Source0: http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.1.tar.gz +Source0: http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.2.tar.gz Source1: xaos.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -39,7 +39,7 @@ %prep -%setup0 -q -n XaoS-%{version} +%setup0 -q -n XaoS # disable stripping binaries when installing sed -i 's| -s | |' Makefile.in @@ -120,6 +120,9 @@ %changelog +* Sun Nov 5 2006 Gerard Milmeister - 3.2.2-1 +- new version 3.2.2 + * Mon Aug 28 2006 Gerard Milmeister - 3.2.1-4 - Rebuild for FE6 - added BR: gettext From fedora-extras-commits at redhat.com Sun Nov 5 22:09:33 2006 From: fedora-extras-commits at redhat.com (Axel Thimm (athimm)) Date: Sun, 5 Nov 2006 15:09:33 -0700 Subject: rpms/mediawiki/devel mediawiki.spec,1.8,1.9 Message-ID: <200611052209.kA5M9X5C026899@cvs-int.fedora.redhat.com> Author: athimm Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26883 Modified Files: mediawiki.spec Log Message: Forward-port changes for FC-6. Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mediawiki.spec 14 Oct 2006 09:35:59 -0000 1.8 +++ mediawiki.spec 5 Nov 2006 22:09:03 -0000 1.9 @@ -1,24 +1,24 @@ %define wikidir %{_var}/www/mediawiki -Name: mediawiki -Version: 1.8.2 -Release: 4%{?dist} -Summary: The PHP-based wiki software behind Wikipedia - -Group: Applications/Internet -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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Requires: httpd -Requires: php >= 4.1.2 -Requires: php-mysql -Requires: php-gd, diffutils, ImageMagick +Name: mediawiki +Version: 1.8.2 +Release: 5%{?dist} +Summary: A wiki engine + +Group: Applications/Internet +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Requires: httpd +Requires: php >= 5 +Requires: php-mysql +Requires: php-gd, diffutils, ImageMagick # to make sure the "apache" group is created before mediawiki is installed -Requires(pre): httpd +Requires(pre): httpd %description MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and @@ -30,12 +30,12 @@ %package math -Summary: Mathematical formula support for MediaWiki -Group: Applications/Internet +Summary: Mathematical formula support for MediaWiki +Group: Applications/Internet -BuildRequires: ocaml -Requires: mediawiki = %{version}-%{release} -Requires: ImageMagick tetex-latex tetex-dvips +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. @@ -50,22 +50,22 @@ %build cd math -make %{?_smp_mflags} +make %install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{wikidir} -cp -pr config extensions images includes languages $RPM_BUILD_ROOT%{wikidir} -cp -pr maintenance skins [[:lower:]]*.* $RPM_BUILD_ROOT%{wikidir} -%{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl - -install -d $RPM_BUILD_ROOT%{wikidir}/math -install math/texvc $RPM_BUILD_ROOT%{wikidir}/math -install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf +rm -rf %{buildroot} +install -d %{buildroot}%{wikidir} +cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir} +cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir} +%{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl + +install -d %{buildroot}%{wikidir}/math +install math/texvc %{buildroot}%{wikidir}/math +install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -90,6 +90,11 @@ %changelog +* Thu Nov 2 2006 Axel Thimm - 1.8.2-5 +- Fix depenencies, add versions. +- Add missing *.php files. +- Cosmetic changes. + * Sat Oct 14 2006 Axel Thimm - 1.8.2-4 - Update to 1.8.2. @@ -111,7 +116,7 @@ * Mon Feb 06 2006 Roozbeh Pournader - 1.5.6-5 - Put internal doc files in the right directory, renaming it - back to docs (#180177) + back to docs (#180177) * Sat Feb 04 2006 Roozbeh Pournader - 1.5.6-4 - Use Requires(pre) instead of PreReq (Mike McGrath) From fedora-extras-commits at redhat.com Sun Nov 5 22:42:30 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 5 Nov 2006 15:42:30 -0700 Subject: rpms/xaos/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xaos.spec, 1.3, 1.4 Message-ID: <200611052242.kA5MgUwp027159@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/xaos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27118/devel Modified Files: .cvsignore sources xaos.spec Log Message: new version 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xaos/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Jun 2006 16:06:21 -0000 1.2 +++ .cvsignore 5 Nov 2006 22:41:59 -0000 1.3 @@ -1 +1 @@ -XaoS-3.2.1.tar.gz +XaoS-3.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xaos/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Jun 2006 16:06:21 -0000 1.2 +++ sources 5 Nov 2006 22:41:59 -0000 1.3 @@ -1 +1 @@ -8df634737b276f9f172060f3ffc489be XaoS-3.2.1.tar.gz +bd347d6be1ff7e4f7a81975d82c36921 XaoS-3.2.2.tar.gz Index: xaos.spec =================================================================== RCS file: /cvs/extras/rpms/xaos/devel/xaos.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xaos.spec 28 Aug 2006 11:00:25 -0000 1.3 +++ xaos.spec 5 Nov 2006 22:41:59 -0000 1.4 @@ -1,12 +1,12 @@ Name: xaos -Version: 3.2.1 -Release: 4%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: A fast, portable real-time interactive fractal zoomer Group: Applications/Multimedia License: GPL URL: http://xaos.sourceforge.net -Source0: http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.1.tar.gz +Source0: http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.2.tar.gz Source1: xaos.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -39,7 +39,7 @@ %prep -%setup0 -q -n XaoS-%{version} +%setup0 -q -n XaoS # disable stripping binaries when installing sed -i 's| -s | |' Makefile.in @@ -120,6 +120,9 @@ %changelog +* Sun Nov 5 2006 Gerard Milmeister - 3.2.2-1 +- new version 3.2.2 + * Mon Aug 28 2006 Gerard Milmeister - 3.2.1-4 - Rebuild for FE6 - added BR: gettext From fedora-extras-commits at redhat.com Sun Nov 5 22:42:29 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Sun, 5 Nov 2006 15:42:29 -0700 Subject: rpms/xaos/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xaos.spec, 1.2, 1.3 Message-ID: <200611052242.kA5MgT7R027154@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/xaos/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27118/FC-5 Modified Files: .cvsignore sources xaos.spec Log Message: new version 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xaos/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Jun 2006 16:06:21 -0000 1.2 +++ .cvsignore 5 Nov 2006 22:41:58 -0000 1.3 @@ -1 +1 @@ -XaoS-3.2.1.tar.gz +XaoS-3.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xaos/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Jun 2006 16:06:21 -0000 1.2 +++ sources 5 Nov 2006 22:41:58 -0000 1.3 @@ -1 +1 @@ -8df634737b276f9f172060f3ffc489be XaoS-3.2.1.tar.gz +bd347d6be1ff7e4f7a81975d82c36921 XaoS-3.2.2.tar.gz Index: xaos.spec =================================================================== RCS file: /cvs/extras/rpms/xaos/FC-5/xaos.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xaos.spec 10 Jun 2006 17:04:33 -0000 1.2 +++ xaos.spec 5 Nov 2006 22:41:58 -0000 1.3 @@ -1,12 +1,12 @@ Name: xaos -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: A fast, portable real-time interactive fractal zoomer Group: Applications/Multimedia License: GPL URL: http://xaos.sourceforge.net -Source0: http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.1.tar.gz +Source0: http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.2.tar.gz Source1: xaos.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -24,6 +24,7 @@ BuildRequires: texinfo BuildRequires: texinfo-tex BuildRequires: desktop-file-utils +BuildRequires: gettext Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -38,7 +39,7 @@ %prep -%setup0 -q -n XaoS-%{version} +%setup0 -q -n XaoS # disable stripping binaries when installing sed -i 's| -s | |' Makefile.in @@ -119,6 +120,13 @@ %changelog +* Sun Nov 5 2006 Gerard Milmeister - 3.2.2-1 +- new version 3.2.2 + +* Mon Aug 28 2006 Gerard Milmeister - 3.2.1-4 +- Rebuild for FE6 +- added BR: gettext + * Sat Jun 10 2006 Gerard Milmeister - 3.2.1-3 - disabled stripping of binaries From fedora-extras-commits at redhat.com Sun Nov 5 22:47:39 2006 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 5 Nov 2006 15:47:39 -0700 Subject: rpms/drivel/FC-3 drivel.spec,1.7,1.8 Message-ID: <200611052247.kA5MldQj027302@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/drivel/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27279 Modified Files: drivel.spec Log Message: Rebuild against new libcurl (devel only) Index: drivel.spec =================================================================== RCS file: /cvs/extras/rpms/drivel/FC-3/drivel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- drivel.spec 2 Sep 2006 17:01:55 -0000 1.7 +++ drivel.spec 5 Nov 2006 22:47:09 -0000 1.8 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.0 -Release: 0.3.%{cvsdate}cvs%{?dist} +Release: 0.4.%{cvsdate}cvs%{?dist} License: GPL Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -120,6 +120,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Sun Nov 5 2006 Paul W. Frields - 2.1.0-0.4.20060527cvs +- Rebuild against new libcurl + * Sat Sep 2 2006 Paul W. Frields - 2.1.0-0.3.20060527cvs - Add BuildRequires: intltool for build system happiness - Bump release for FC6 mass rebuild From fedora-extras-commits at redhat.com Sun Nov 5 22:48:16 2006 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 5 Nov 2006 15:48:16 -0700 Subject: rpms/drivel/FC-4 drivel.spec,1.7,1.8 Message-ID: <200611052248.kA5MmGWk027358@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/drivel/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27337 Modified Files: drivel.spec Log Message: Rebuild against new libcurl (devel only) Index: drivel.spec =================================================================== RCS file: /cvs/extras/rpms/drivel/FC-4/drivel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- drivel.spec 2 Sep 2006 17:01:59 -0000 1.7 +++ drivel.spec 5 Nov 2006 22:47:46 -0000 1.8 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.0 -Release: 0.3.%{cvsdate}cvs%{?dist} +Release: 0.4.%{cvsdate}cvs%{?dist} License: GPL Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -120,6 +120,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Sun Nov 5 2006 Paul W. Frields - 2.1.0-0.4.20060527cvs +- Rebuild against new libcurl + * Sat Sep 2 2006 Paul W. Frields - 2.1.0-0.3.20060527cvs - Add BuildRequires: intltool for build system happiness - Bump release for FC6 mass rebuild From fedora-extras-commits at redhat.com Sun Nov 5 22:48:54 2006 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 5 Nov 2006 15:48:54 -0700 Subject: rpms/drivel/FC-5 drivel.spec,1.7,1.8 Message-ID: <200611052248.kA5MmsGH027483@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/drivel/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27393 Modified Files: drivel.spec Log Message: Rebuild against new libcurl (devel only) Index: drivel.spec =================================================================== RCS file: /cvs/extras/rpms/drivel/FC-5/drivel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- drivel.spec 2 Sep 2006 17:02:00 -0000 1.7 +++ drivel.spec 5 Nov 2006 22:48:23 -0000 1.8 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.0 -Release: 0.3.%{cvsdate}cvs%{?dist} +Release: 0.4.%{cvsdate}cvs%{?dist} License: GPL Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -120,6 +120,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Sun Nov 5 2006 Paul W. Frields - 2.1.0-0.4.20060527cvs +- Rebuild against new libcurl + * Sat Sep 2 2006 Paul W. Frields - 2.1.0-0.3.20060527cvs - Add BuildRequires: intltool for build system happiness - Bump release for FC6 mass rebuild From fedora-extras-commits at redhat.com Sun Nov 5 22:49:08 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 5 Nov 2006 15:49:08 -0700 Subject: rpms/asymptote/FC-4 .cvsignore, 1.11, 1.12 asymptote.spec, 1.12, 1.13 sources, 1.11, 1.12 Message-ID: <200611052249.kA5Mn8Cp027536@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27417/FC-4 Modified Files: .cvsignore asymptote.spec sources Log Message: Update to 1.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Nov 2006 17:38:51 -0000 1.11 +++ .cvsignore 5 Nov 2006 22:48:38 -0000 1.12 @@ -1 +1 @@ -asymptote-1.17.tar.gz +asymptote-1.18.tar.gz Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-4/asymptote.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- asymptote.spec 1 Nov 2006 17:38:51 -0000 1.12 +++ asymptote.spec 5 Nov 2006 22:48:38 -0000 1.13 @@ -4,7 +4,7 @@ %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote -Version: 1.17 +Version: 1.18 Release: 1%{?dist} Summary: Descriptive vector graphics language @@ -138,6 +138,9 @@ %changelog +* Sun Nov 5 2006 Jose Pedro Oliveira - 1.18-1 +- Update to 1.18. + * Wed Nov 1 2006 Jose Pedro Oliveira - 1.17-1 - Update to 1.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Nov 2006 17:38:51 -0000 1.11 +++ sources 5 Nov 2006 22:48:38 -0000 1.12 @@ -1 +1 @@ -6fee58869caf0bdc89da24978af8f1d6 asymptote-1.17.tar.gz +00006bb1bb3a17bfca322dfa38ce0520 asymptote-1.18.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 22:49:09 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 5 Nov 2006 15:49:09 -0700 Subject: rpms/asymptote/FC-5 .cvsignore, 1.11, 1.12 asymptote.spec, 1.12, 1.13 sources, 1.11, 1.12 Message-ID: <200611052249.kA5Mn9hw027541@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27417/FC-5 Modified Files: .cvsignore asymptote.spec sources Log Message: Update to 1.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Nov 2006 17:38:52 -0000 1.11 +++ .cvsignore 5 Nov 2006 22:48:38 -0000 1.12 @@ -1 +1 @@ -asymptote-1.17.tar.gz +asymptote-1.18.tar.gz Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-5/asymptote.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- asymptote.spec 1 Nov 2006 17:38:52 -0000 1.12 +++ asymptote.spec 5 Nov 2006 22:48:38 -0000 1.13 @@ -4,7 +4,7 @@ %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote -Version: 1.17 +Version: 1.18 Release: 1%{?dist} Summary: Descriptive vector graphics language @@ -138,6 +138,9 @@ %changelog +* Sun Nov 5 2006 Jose Pedro Oliveira - 1.18-1 +- Update to 1.18. + * Wed Nov 1 2006 Jose Pedro Oliveira - 1.17-1 - Update to 1.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Nov 2006 17:38:52 -0000 1.11 +++ sources 5 Nov 2006 22:48:38 -0000 1.12 @@ -1 +1 @@ -6fee58869caf0bdc89da24978af8f1d6 asymptote-1.17.tar.gz +00006bb1bb3a17bfca322dfa38ce0520 asymptote-1.18.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 22:49:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 5 Nov 2006 15:49:14 -0700 Subject: rpms/asymptote/FC-6 .cvsignore, 1.11, 1.12 asymptote.spec, 1.12, 1.13 sources, 1.11, 1.12 Message-ID: <200611052249.kA5MnE8N027546@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27417/FC-6 Modified Files: .cvsignore asymptote.spec sources Log Message: Update to 1.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-6/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Nov 2006 17:38:57 -0000 1.11 +++ .cvsignore 5 Nov 2006 22:48:44 -0000 1.12 @@ -1 +1 @@ -asymptote-1.17.tar.gz +asymptote-1.18.tar.gz Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-6/asymptote.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- asymptote.spec 1 Nov 2006 17:38:57 -0000 1.12 +++ asymptote.spec 5 Nov 2006 22:48:44 -0000 1.13 @@ -4,7 +4,7 @@ %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote -Version: 1.17 +Version: 1.18 Release: 1%{?dist} Summary: Descriptive vector graphics language @@ -138,6 +138,9 @@ %changelog +* Sun Nov 5 2006 Jose Pedro Oliveira - 1.18-1 +- Update to 1.18. + * Wed Nov 1 2006 Jose Pedro Oliveira - 1.17-1 - Update to 1.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/FC-6/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Nov 2006 17:38:57 -0000 1.11 +++ sources 5 Nov 2006 22:48:44 -0000 1.12 @@ -1 +1 @@ -6fee58869caf0bdc89da24978af8f1d6 asymptote-1.17.tar.gz +00006bb1bb3a17bfca322dfa38ce0520 asymptote-1.18.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 22:49:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Sun, 5 Nov 2006 15:49:15 -0700 Subject: rpms/asymptote/devel .cvsignore, 1.11, 1.12 asymptote.spec, 1.12, 1.13 sources, 1.11, 1.12 Message-ID: <200611052249.kA5MnFNU027551@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/asymptote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27417/devel Modified Files: .cvsignore asymptote.spec sources Log Message: Update to 1.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Nov 2006 17:38:58 -0000 1.11 +++ .cvsignore 5 Nov 2006 22:48:45 -0000 1.12 @@ -1 +1 @@ -asymptote-1.17.tar.gz +asymptote-1.18.tar.gz Index: asymptote.spec =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- asymptote.spec 1 Nov 2006 17:38:58 -0000 1.12 +++ asymptote.spec 5 Nov 2006 22:48:45 -0000 1.13 @@ -4,7 +4,7 @@ %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp Name: asymptote -Version: 1.17 +Version: 1.18 Release: 1%{?dist} Summary: Descriptive vector graphics language @@ -138,6 +138,9 @@ %changelog +* Sun Nov 5 2006 Jose Pedro Oliveira - 1.18-1 +- Update to 1.18. + * Wed Nov 1 2006 Jose Pedro Oliveira - 1.17-1 - Update to 1.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/asymptote/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 1 Nov 2006 17:38:58 -0000 1.11 +++ sources 5 Nov 2006 22:48:45 -0000 1.12 @@ -1 +1 @@ -6fee58869caf0bdc89da24978af8f1d6 asymptote-1.17.tar.gz +00006bb1bb3a17bfca322dfa38ce0520 asymptote-1.18.tar.gz From fedora-extras-commits at redhat.com Sun Nov 5 22:49:31 2006 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 5 Nov 2006 15:49:31 -0700 Subject: rpms/drivel/FC-6 drivel.spec,1.7,1.8 Message-ID: <200611052249.kA5MnVCT027588@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/drivel/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27518 Modified Files: drivel.spec Log Message: Rebuild against new libcurl (devel only) Index: drivel.spec =================================================================== RCS file: /cvs/extras/rpms/drivel/FC-6/drivel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- drivel.spec 2 Sep 2006 17:01:47 -0000 1.7 +++ drivel.spec 5 Nov 2006 22:49:01 -0000 1.8 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.0 -Release: 0.3.%{cvsdate}cvs%{?dist} +Release: 0.4.%{cvsdate}cvs%{?dist} License: GPL Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -120,6 +120,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Sun Nov 5 2006 Paul W. Frields - 2.1.0-0.4.20060527cvs +- Rebuild against new libcurl + * Sat Sep 2 2006 Paul W. Frields - 2.1.0-0.3.20060527cvs - Add BuildRequires: intltool for build system happiness - Bump release for FC6 mass rebuild From fedora-extras-commits at redhat.com Sun Nov 5 22:50:08 2006 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 5 Nov 2006 15:50:08 -0700 Subject: rpms/drivel/devel drivel.spec,1.7,1.8 Message-ID: <200611052250.kA5Mo8qI027648@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/drivel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27628 Modified Files: drivel.spec Log Message: Rebuild against new libcurl (devel only) Index: drivel.spec =================================================================== RCS file: /cvs/extras/rpms/drivel/devel/drivel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- drivel.spec 2 Sep 2006 17:01:47 -0000 1.7 +++ drivel.spec 5 Nov 2006 22:49:38 -0000 1.8 @@ -4,7 +4,7 @@ Summary: A journal or "blog" client Name: drivel Version: 2.1.0 -Release: 0.3.%{cvsdate}cvs%{?dist} +Release: 0.4.%{cvsdate}cvs%{?dist} License: GPL Group: Applications/Internet Url: http://www.dropline.net/drivel @@ -120,6 +120,9 @@ %config %{_sysconfdir}/gconf/schemas/* %changelog +* Sun Nov 5 2006 Paul W. Frields - 2.1.0-0.4.20060527cvs +- Rebuild against new libcurl + * Sat Sep 2 2006 Paul W. Frields - 2.1.0-0.3.20060527cvs - Add BuildRequires: intltool for build system happiness - Bump release for FC6 mass rebuild From fedora-extras-commits at redhat.com Mon Nov 6 02:36:57 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 5 Nov 2006 19:36:57 -0700 Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.34,1.35 Message-ID: <200611060236.kA62avMW008479@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8461 Modified Files: deskbar-applet.spec Log Message: add gnome-python2-devel to BR Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- deskbar-applet.spec 1 Nov 2006 18:04:12 -0000 1.34 +++ deskbar-applet.spec 6 Nov 2006 02:36:26 -0000 1.35 @@ -3,7 +3,7 @@ Name: deskbar-applet Version: 2.16.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -16,7 +16,7 @@ BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras BuildRequires: gettext evolution-data-server-devel gnome-desktop-devel BuildRequires: libSM-devel gnome-python2-applet desktop-file-utils -BuildRequires: perl(XML::Parser) gnome-python2 +BuildRequires: perl(XML::Parser) gnome-python2-devel Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo Requires: gnome-python2-gconf pygtk2 gnome-python2-libwnck Requires(pre): GConf2 @@ -91,6 +91,9 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Sun Nov 5 2006 Luke Macken - 2.16-1-3 +- Add gnome-python2-devel to BR + * Wed Nov 1 2006 Luke Macken - 2.16.1-2 - Add gnome-python2 to BuildRequires From fedora-extras-commits at redhat.com Mon Nov 6 03:50:39 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Sun, 5 Nov 2006 20:50:39 -0700 Subject: fedora-updates-system README,1.1,1.2 Message-ID: <200611060350.kA63odwl012236@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/fedora/fedora-updates-system In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12218 Modified Files: README Log Message: test Index: README =================================================================== RCS file: /cvs/fedora/fedora-updates-system/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 22 Oct 2006 23:43:55 -0000 1.1 +++ README 6 Nov 2006 03:50:36 -0000 1.2 @@ -0,0 +1,2 @@ + + From fedora-extras-commits at redhat.com Mon Nov 6 03:56:40 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Sun, 5 Nov 2006 20:56:40 -0700 Subject: fedora-updates-system dev.cfg, NONE, 1.1 sample-prod.cfg, NONE, 1.1 setup.py, NONE, 1.1 start-updatessystem.py, NONE, 1.1 README, 1.2, 1.3 Message-ID: <200611060356.kA63ueDB012335@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/fedora/fedora-updates-system In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12305 Modified Files: README Added Files: dev.cfg sample-prod.cfg setup.py start-updatessystem.py Log Message: Initial import --- NEW FILE dev.cfg --- [global] # This is where all of your settings go for your development environment # Settings that are the same for both development and production # (such as template engine, encodings, etc.) all go in # updatessystem/config/app.cfg # DATABASE # pick the form for your database # sqlobject.dburi="postgres://username at hostname/databasename" # sqlobject.dburi="mysql://username:password at hostname:port/databasename" # sqlobject.dburi="sqlite:///file_name_and_path" # If you have sqlite, here's a simple default to get you started # in development sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite" # if you are using a database or table type without transactions # (MySQL default, for example), you should turn off transactions # by prepending notrans_ on the uri # sqlobject.dburi="notrans_mysql://username:password at hostname:port/databasename" # for Windows users, sqlite URIs look like: # sqlobject.dburi="sqlite:///drive_letter:/path/to/file" # SERVER # Some server parameters that you may want to tweak # server.socket_port=6543 # Enable the debug output at the end on pages. # log_debug_info_filter.on = False server.environment="development" autoreload.package="updatessystem" # session_filter.on = True # Set to True if you'd like to abort execution if a controller gets an # unexpected parameter. False by default tg.strict_parameters = True # LOGGING # Logging configuration generally follows the style of the standard # Python logging module configuration. Note that when specifying # log format messages, you need to use *() for formatting variables. # Deployment independent log configuration is in updatessystem/config/log.cfg [logging] [[loggers]] [[[updatessystem]]] level='DEBUG' qualname='updatessystem' handlers=['debug_out'] [[[allinfo]]] level='INFO' handlers=['debug_out'] [[[access]]] level='INFO' qualname='turbogears.access' handlers=['access_out'] propagate=0 --- NEW FILE sample-prod.cfg --- [global] # This is where all of your settings go for your production environment. # You'll copy this file over to your production server and provide it # as a command-line option to your start script. # Settings that are the same for both development and production # (such as template engine, encodings, etc.) all go in # updatessystem/config/app.cfg # pick the form for your database # sqlobject.dburi="postgres://username at hostname/databasename" # sqlobject.dburi="mysql://username:password at hostname:port/databasename" # sqlobject.dburi="sqlite:///file_name_and_path" # If you have sqlite, here's a simple default to get you started # in development sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite" # if you are using a database or table type without transactions # (MySQL default, for example), you should turn off transactions # by prepending notrans_ on the uri # sqlobject.dburi="notrans_mysql://username:password at hostname:port/databasename" # for Windows users, sqlite URIs look like: # sqlobject.dburi="sqlite:///drive_letter:/path/to/file" # SERVER server.environment="production" # Sets the number of threads the server uses # server.thread_pool = 1 # if this is part of a larger site, you can set the path # to the TurboGears instance here # server.webpath="" # session_filter.on = True # Set to True if you'd like to abort execution if a controller gets an # unexpected parameter. False by default # tg.strict_parameters = False # LOGGING # Logging configuration generally follows the style of the standard # Python logging module configuration. Note that when specifying # log format messages, you need to use *() for formatting variables. # Deployment independent log configuration is in updatessystem/config/log.cfg [logging] [[handlers]] [[[access_out]]] # set the filename as the first argument below args="('server.log',)" class='FileHandler' level='INFO' formatter='message_only' [[loggers]] [[[updatessystem]]] level='ERROR' qualname='updatessystem' handlers=['error_out'] [[[access]]] level='INFO' qualname='turbogears.access' handlers=['access_out'] propagate=0 --- NEW FILE setup.py --- from setuptools import setup, find_packages from turbogears.finddata import find_package_data import os execfile(os.path.join("updatessystem", "release.py")) setup( name="Fedora-Updates-System", version=version, # uncomment the following lines if you fill them out in release.py #description=description, #author=author, #author_email=email, #url=url, #download_url=download_url, #license=license, install_requires = [ "TurboGears >= 1.0b1", ], scripts = ["start-updatessystem.py"], zip_safe=False, packages=find_packages(), package_data = find_package_data(where='updatessystem', package='updatessystem'), keywords = [ # Use keywords if you'll be adding your package to the # Python Cheeseshop # if this has widgets, uncomment the next line # 'turbogears.widgets', # if this has a tg-admin command, uncomment the next line # 'turbogears.command', # if this has identity providers, uncomment the next line # 'turbogears.identity.provider', # If this is a template plugin, uncomment the next line # 'python.templating.engines', # If this is a full application, uncomment the next line # 'turbogears.app', ], classifiers = [ 'Development Status :: 3 - Alpha', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Topic :: Software Development :: Libraries :: Python Modules', 'Framework :: TurboGears', # if this is an application that you'll distribute through # the Cheeseshop, uncomment the next line # 'Framework :: TurboGears :: Applications', # if this is a package that includes widgets that you'll distribute # through the Cheeseshop, uncomment the next line # 'Framework :: TurboGears :: Widgets', ], test_suite = 'nose.collector', ) --- NEW FILE start-updatessystem.py --- #!/usr/bin/python import pkg_resources pkg_resources.require("TurboGears") import turbogears import cherrypy cherrypy.lowercase_api = True from os.path import * import sys # first look on the command line for a desired config file, # if it's not on the command line, then # look for setup.py in this directory. If it's not there, this script is # probably installed if len(sys.argv) > 1: turbogears.update_config(configfile=sys.argv[1], modulename="updatessystem.config") elif exists(join(dirname(__file__), "setup.py")): turbogears.update_config(configfile="dev.cfg", modulename="updatessystem.config") else: turbogears.update_config(configfile="prod.cfg", modulename="updatessystem.config") from updatessystem.controllers import Root turbogears.start_server(Root()) Index: README =================================================================== RCS file: /cvs/fedora/fedora-updates-system/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README 6 Nov 2006 03:50:36 -0000 1.2 +++ README 6 Nov 2006 03:56:37 -0000 1.3 @@ -1,2 +1,6 @@ +Fedora Updates System +http://fedoraproject.org/wiki/Infrastructure/UpdatesSystem +Luke Macken - +NOTE: This project is still under heavy development and is not yet ready + for production. From fedora-extras-commits at redhat.com Mon Nov 6 09:07:49 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 02:07:49 -0700 Subject: rpms/audacious/devel audacious.spec,1.11,1.12 Message-ID: <200611060907.kA697n9G031821@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/audacious/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31754 Modified Files: audacious.spec Log Message: - Rebuild because of the new curl - Don't BuildRequire desktop-file-utils twice Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- audacious.spec 20 Oct 2006 07:24:45 -0000 1.11 +++ audacious.spec 6 Nov 2006 09:07:19 -0000 1.12 @@ -1,6 +1,6 @@ Name: audacious Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0 -BuildRequires: zlib-devel, desktop-file-utils, alsa-lib-devel +BuildRequires: zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel BuildRequires: gnome-vfs2-devel, libglade2-devel >= 2.4, libsidplay-devel BuildRequires: libmpcdec-devel, libmusicbrainz-devel, GConf2-devel BuildRequires: taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2 @@ -31,7 +31,6 @@ BuildRequires: gettext, libsndfile-devel, curl-devel, libbinio-devel BuildRequires: arts-devel, libmodplug-devel, lirc-devel BuildRequires: jack-audio-connection-kit-devel, libsamplerate-devel -BuildRequires: desktop-file-utils >= 0.9 Requires(post): desktop-file-utils >= 0.9, /sbin/ldconfig Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig @@ -209,6 +208,10 @@ %changelog +* Mon Nov 06 2006 Jindrich Novy 1.1.2-3.fc6 +- Rebuild because of the new curl +- Don't BuildRequire desktop-file-utils twice + * Wed Oct 18 2006 Ralf Ertzinger 1.1.2-2.fc6 - Add Obsoletes/Provides for BMP From fedora-extras-commits at redhat.com Mon Nov 6 09:11:54 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 02:11:54 -0700 Subject: rpms/bzflag/devel bzflag.spec,1.28,1.29 Message-ID: <200611060911.kA69Bs52031961@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/bzflag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31945 Modified Files: bzflag.spec Log Message: - rebuild because of the new curl Index: bzflag.spec =================================================================== RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- bzflag.spec 28 Aug 2006 13:40:35 -0000 1.28 +++ bzflag.spec 6 Nov 2006 09:11:24 -0000 1.29 @@ -16,7 +16,7 @@ Summary: 3D multi-player tank battle game Name: bzflag Version: 2.0.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games URL: http://bzflag.org @@ -96,6 +96,9 @@ %{_mandir}/man*/* %changelog +* Mon Nov 06 2006 Jindrich Novy 2.0.8-4 +- rebuild because of the new curl + * Mon Aug 28 2006 Nils Philippsen 2.0.8-3 - FC6 mass rebuild From fedora-extras-commits at redhat.com Mon Nov 6 09:58:52 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 02:58:52 -0700 Subject: rpms/centericq/devel centericq.spec,1.25,1.26 Message-ID: <200611060958.kA69wqDQ000781@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv709 Modified Files: centericq.spec Log Message: - rebuild for the new curl Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- centericq.spec 12 Sep 2006 07:12:22 -0000 1.25 +++ centericq.spec 6 Nov 2006 09:58:22 -0000 1.26 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Text mode menu- and window-driven IM @@ -97,6 +97,9 @@ %exclude %{_includedir}/msn %changelog +* Mon Nov 06 2006 Jindrich Novy +- rebuild because of the new curl + * Tue Sep 12 2006 Andreas Bierfert 4.21.0-8 - FE6 rebuild From fedora-extras-commits at redhat.com Mon Nov 6 10:00:43 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 6 Nov 2006 03:00:43 -0700 Subject: fedora-security/audit fc5,1.381,1.382 fc6,1.134,1.135 Message-ID: <200611061000.kA6A0h8i001011@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv983 Modified Files: fc5 fc6 Log Message: Update with weekend CVE mails Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.381 retrieving revision 1.382 diff -u -r1.381 -r1.382 --- fc5 2 Nov 2006 19:07:24 -0000 1.381 +++ fc5 6 Nov 2006 10:00:40 -0000 1.382 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20061101 -Up to date FC5 as of 20061101 +Up to date CVE as of CVE email 20061105 +Up to date FC5 as of 20061105 ** are items that need attention +CVE-2006-5706 ** php, fixed 5.2.0 +CVE-2006-5701 ** kernel CVE-2006-5633 ignore (firefox) just a client DoS CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3) CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- fc6 2 Nov 2006 19:07:24 -0000 1.134 +++ fc6 6 Nov 2006 10:00:40 -0000 1.135 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20061101 -Up to date FC6 as of 20061101 +Up to date CVE as of CVE email 20061105 +Up to date FC6 as of 20061105 ** are items that need attention +CVE-2006-5706 ** php, fixed 5.2.0 +CVE-2006-5701 ** kernel CVE-2006-5633 ignore (firefox) just a client DoS CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3) CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] From fedora-extras-commits at redhat.com Mon Nov 6 10:52:14 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Nov 2006 03:52:14 -0700 Subject: rpms/lighttpd/devel lighttpd.logrotate, 1.2, 1.3 lighttpd.spec, 1.29, 1.30 Message-ID: <200611061052.kA6AqE2E007903@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7847/devel Modified Files: lighttpd.logrotate lighttpd.spec Log Message: Switch to using killall for log rotation to fix it when using workers. Index: lighttpd.logrotate =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.logrotate,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lighttpd.logrotate 4 Apr 2005 19:31:33 -0000 1.2 +++ lighttpd.logrotate 6 Nov 2006 10:51:43 -0000 1.3 @@ -3,6 +3,6 @@ notifempty sharedscripts postrotate - /bin/kill -HUP `cat /var/run/lighttpd.pid 2>/dev/null` 2>/dev/null || : + /usr/bin/killall -HUP lighttpd &>/dev/null || : endscript } Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- lighttpd.spec 16 Oct 2006 16:13:33 -0000 1.29 +++ lighttpd.spec 6 Nov 2006 10:51:43 -0000 1.30 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.13 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -174,6 +174,9 @@ %changelog +* Mon Nov 6 2006 Matthias Saou 1.4.13-3 +- Switch to using killall for log rotation to fix it when using workers. + * Mon Oct 16 2006 Matthias Saou 1.4.13-2 - Remove gcc-c++ build req, it's part of the defaults. - Add readline-devel build req, needed on RHEL4. From fedora-extras-commits at redhat.com Mon Nov 6 10:52:12 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Nov 2006 03:52:12 -0700 Subject: rpms/lighttpd/FC-5 lighttpd.logrotate, 1.2, 1.3 lighttpd.spec, 1.24, 1.25 Message-ID: <200611061052.kA6AqC3h007895@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7847/FC-5 Modified Files: lighttpd.logrotate lighttpd.spec Log Message: Switch to using killall for log rotation to fix it when using workers. Index: lighttpd.logrotate =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-5/lighttpd.logrotate,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lighttpd.logrotate 4 Apr 2005 19:31:33 -0000 1.2 +++ lighttpd.logrotate 6 Nov 2006 10:51:41 -0000 1.3 @@ -3,6 +3,6 @@ notifempty sharedscripts postrotate - /bin/kill -HUP `cat /var/run/lighttpd.pid 2>/dev/null` 2>/dev/null || : + /usr/bin/killall -HUP lighttpd &>/dev/null || : endscript } Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-5/lighttpd.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- lighttpd.spec 16 Oct 2006 13:45:57 -0000 1.24 +++ lighttpd.spec 6 Nov 2006 10:51:41 -0000 1.25 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.13 -Release: 1%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -21,7 +21,8 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++ +BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel +BuildRequires: readline-devel %{!?_without_ldap:BuildRequires: openldap-devel} %{?_with_gamin:BuildRequires: gamin-devel} %{!?_without_gdbm:BuildRequires: gdbm-devel} @@ -173,6 +174,13 @@ %changelog +* Mon Nov 6 2006 Matthias Saou 1.4.13-3 +- Switch to using killall for log rotation to fix it when using workers. + +* Mon Oct 16 2006 Matthias Saou 1.4.13-2 +- Remove gcc-c++ build req, it's part of the defaults. +- Add readline-devel build req, needed on RHEL4. + * Wed Oct 11 2006 Matthias Saou 1.4.13-1 - Update to 1.4.13, which contains the previous fix. From fedora-extras-commits at redhat.com Mon Nov 6 10:52:13 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Nov 2006 03:52:13 -0700 Subject: rpms/lighttpd/FC-6 lighttpd.logrotate, 1.2, 1.3 lighttpd.spec, 1.29, 1.30 Message-ID: <200611061052.kA6AqDPk007899@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7847/FC-6 Modified Files: lighttpd.logrotate lighttpd.spec Log Message: Switch to using killall for log rotation to fix it when using workers. Index: lighttpd.logrotate =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-6/lighttpd.logrotate,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lighttpd.logrotate 4 Apr 2005 19:31:33 -0000 1.2 +++ lighttpd.logrotate 6 Nov 2006 10:51:43 -0000 1.3 @@ -3,6 +3,6 @@ notifempty sharedscripts postrotate - /bin/kill -HUP `cat /var/run/lighttpd.pid 2>/dev/null` 2>/dev/null || : + /usr/bin/killall -HUP lighttpd &>/dev/null || : endscript } Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-6/lighttpd.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- lighttpd.spec 16 Oct 2006 16:13:33 -0000 1.29 +++ lighttpd.spec 6 Nov 2006 10:51:43 -0000 1.30 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.13 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -174,6 +174,9 @@ %changelog +* Mon Nov 6 2006 Matthias Saou 1.4.13-3 +- Switch to using killall for log rotation to fix it when using workers. + * Mon Oct 16 2006 Matthias Saou 1.4.13-2 - Remove gcc-c++ build req, it's part of the defaults. - Add readline-devel build req, needed on RHEL4. From fedora-extras-commits at redhat.com Mon Nov 6 11:06:10 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 6 Nov 2006 04:06:10 -0700 Subject: rpms/bluefish/devel bluefish.spec, 1.21, 1.22 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 Message-ID: <200611061106.kA6B6Aki011215@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11195 Modified Files: bluefish.spec sources .cvsignore Log Message: update to 1.0.7 update download URL don't add category X-Fedora in desktop files Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bluefish.spec 29 Aug 2006 10:21:44 -0000 1.21 +++ bluefish.spec 6 Nov 2006 11:05:39 -0000 1.22 @@ -1,11 +1,11 @@ Name: bluefish -Version: 1.0.5 -Release: 4%{?dist} +Version: 1.0.7 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 +Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 BuildRequires: desktop-file-utils @@ -39,11 +39,9 @@ %find_lang %{name} /usr/bin/desktop-file-install --vendor fedora --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/bluefish.desktop /usr/bin/desktop-file-install --vendor fedora --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/bluefish-project.desktop %clean @@ -71,6 +69,11 @@ %{_mandir}/man1/bluefish.1* %changelog +* Mon Nov 6 2006 Paul Howarth - 1.0.7-1 +- update to 1.0.7 +- update download URL +- don't add category X-Fedora in desktop files + * Tue Aug 29 2006 Paul Howarth - 1.0.5-4 - rebuild for dynamic linking speedups (FE6) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Feb 2006 11:46:25 -0000 1.8 +++ sources 6 Nov 2006 11:05:40 -0000 1.9 @@ -1 +1 @@ -26701c09d41e5dea987155cdc9d0ac94 bluefish-1.0.5.tar.bz2 +2c3b3c9c8f8e32b9473dfd879f216dea bluefish-1.0.7.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Feb 2006 11:46:25 -0000 1.8 +++ .cvsignore 6 Nov 2006 11:05:40 -0000 1.9 @@ -1 +1 @@ -bluefish-1.0.5.tar.bz2 +bluefish-1.0.7.tar.bz2 From fedora-extras-commits at redhat.com Mon Nov 6 11:31:45 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 6 Nov 2006 04:31:45 -0700 Subject: rpms/bluefish/FC-6 .cvsignore, 1.8, 1.9 bluefish.spec, 1.21, 1.22 sources, 1.8, 1.9 Message-ID: <200611061131.kA6BVj14011552@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11530 Modified Files: .cvsignore bluefish.spec sources Log Message: resync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Feb 2006 11:46:25 -0000 1.8 +++ .cvsignore 6 Nov 2006 11:31:14 -0000 1.9 @@ -1 +1 @@ -bluefish-1.0.5.tar.bz2 +bluefish-1.0.7.tar.bz2 Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-6/bluefish.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bluefish.spec 29 Aug 2006 10:21:44 -0000 1.21 +++ bluefish.spec 6 Nov 2006 11:31:14 -0000 1.22 @@ -1,11 +1,11 @@ Name: bluefish -Version: 1.0.5 -Release: 4%{?dist} +Version: 1.0.7 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 +Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 BuildRequires: desktop-file-utils @@ -39,11 +39,9 @@ %find_lang %{name} /usr/bin/desktop-file-install --vendor fedora --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/bluefish.desktop /usr/bin/desktop-file-install --vendor fedora --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/bluefish-project.desktop %clean @@ -71,6 +69,11 @@ %{_mandir}/man1/bluefish.1* %changelog +* Mon Nov 6 2006 Paul Howarth - 1.0.7-1 +- update to 1.0.7 +- update download URL +- don't add category X-Fedora in desktop files + * Tue Aug 29 2006 Paul Howarth - 1.0.5-4 - rebuild for dynamic linking speedups (FE6) Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Feb 2006 11:46:25 -0000 1.8 +++ sources 6 Nov 2006 11:31:14 -0000 1.9 @@ -1 +1 @@ -26701c09d41e5dea987155cdc9d0ac94 bluefish-1.0.5.tar.bz2 +2c3b3c9c8f8e32b9473dfd879f216dea bluefish-1.0.7.tar.bz2 From fedora-extras-commits at redhat.com Mon Nov 6 11:32:47 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 6 Nov 2006 04:32:47 -0700 Subject: rpms/bluefish/FC-5 .cvsignore, 1.8, 1.9 bluefish.spec, 1.19, 1.20 sources, 1.8, 1.9 Message-ID: <200611061132.kA6BWlRr011621@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11596 Modified Files: .cvsignore bluefish.spec sources Log Message: resync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Feb 2006 11:46:25 -0000 1.8 +++ .cvsignore 6 Nov 2006 11:32:17 -0000 1.9 @@ -1 +1 @@ -bluefish-1.0.5.tar.bz2 +bluefish-1.0.7.tar.bz2 Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-5/bluefish.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bluefish.spec 22 May 2006 07:45:30 -0000 1.19 +++ bluefish.spec 6 Nov 2006 11:32:17 -0000 1.20 @@ -1,11 +1,11 @@ Name: bluefish -Version: 1.0.5 -Release: 3%{?dist} +Version: 1.0.7 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 +Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 BuildRequires: desktop-file-utils @@ -39,11 +39,9 @@ %find_lang %{name} /usr/bin/desktop-file-install --vendor fedora --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/bluefish.desktop /usr/bin/desktop-file-install --vendor fedora --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/bluefish-project.desktop %clean @@ -71,6 +69,14 @@ %{_mandir}/man1/bluefish.1* %changelog +* Mon Nov 6 2006 Paul Howarth - 1.0.7-1 +- update to 1.0.7 +- update download URL +- don't add category X-Fedora in desktop files + +* Tue Aug 29 2006 Paul Howarth - 1.0.5-4 +- rebuild for dynamic linking speedups (FE6) + * Mon May 22 2006 Paul Howarth - 1.0.5-3 - fix broken debuginfo packages by not stripping binaries (#192617) - cosmetic changes to spec file Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Feb 2006 11:46:25 -0000 1.8 +++ sources 6 Nov 2006 11:32:17 -0000 1.9 @@ -1 +1 @@ -26701c09d41e5dea987155cdc9d0ac94 bluefish-1.0.5.tar.bz2 +2c3b3c9c8f8e32b9473dfd879f216dea bluefish-1.0.7.tar.bz2 From fedora-extras-commits at redhat.com Mon Nov 6 11:34:16 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 6 Nov 2006 04:34:16 -0700 Subject: rpms/bluefish/FC-4 .cvsignore, 1.8, 1.9 bluefish.spec, 1.17, 1.18 sources, 1.8, 1.9 Message-ID: <200611061134.kA6BYGWr011688@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11668 Modified Files: .cvsignore bluefish.spec sources Log Message: resync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Feb 2006 11:55:17 -0000 1.8 +++ .cvsignore 6 Nov 2006 11:33:46 -0000 1.9 @@ -1 +1 @@ -bluefish-1.0.5.tar.bz2 +bluefish-1.0.7.tar.bz2 Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bluefish.spec 22 May 2006 07:47:03 -0000 1.17 +++ bluefish.spec 6 Nov 2006 11:33:46 -0000 1.18 @@ -1,11 +1,11 @@ Name: bluefish -Version: 1.0.5 -Release: 3%{?dist} +Version: 1.0.7 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 +Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 BuildRequires: desktop-file-utils @@ -39,11 +39,9 @@ %find_lang %{name} /usr/bin/desktop-file-install --vendor fedora --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/bluefish.desktop /usr/bin/desktop-file-install --vendor fedora --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/bluefish-project.desktop %clean @@ -71,6 +69,14 @@ %{_mandir}/man1/bluefish.1* %changelog +* Mon Nov 6 2006 Paul Howarth - 1.0.7-1 +- update to 1.0.7 +- update download URL +- don't add category X-Fedora in desktop files + +* Tue Aug 29 2006 Paul Howarth - 1.0.5-4 +- rebuild for dynamic linking speedups (FE6) + * Mon May 22 2006 Paul Howarth - 1.0.5-3 - fix broken debuginfo packages by not stripping binaries (#192617) - cosmetic changes to spec file Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Feb 2006 11:55:17 -0000 1.8 +++ sources 6 Nov 2006 11:33:46 -0000 1.9 @@ -1 +1 @@ -26701c09d41e5dea987155cdc9d0ac94 bluefish-1.0.5.tar.bz2 +2c3b3c9c8f8e32b9473dfd879f216dea bluefish-1.0.7.tar.bz2 From fedora-extras-commits at redhat.com Mon Nov 6 12:31:25 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 05:31:25 -0700 Subject: rpms/icecast/devel icecast-curl.patch, NONE, 1.1 icecast.spec, 1.3, 1.4 Message-ID: <200611061231.kA6CVPNV015016@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/icecast/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14997 Modified Files: icecast.spec Added Files: icecast-curl.patch Log Message: - rebuild because of the new curl icecast-curl.patch: --- NEW FILE icecast-curl.patch --- --- icecast-2.3.1/src/auth_url.c.curl 2005-11-30 13:16:17.000000000 -0500 +++ icecast-2.3.1/src/auth_url.c 2006-11-06 07:21:06.000000000 -0500 @@ -518,7 +518,6 @@ curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->handle); curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L); - curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass); curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]); if (url_info->username && url_info->password) Index: icecast.spec =================================================================== RCS file: /cvs/extras/rpms/icecast/devel/icecast.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- icecast.spec 8 Sep 2006 17:27:54 -0000 1.3 +++ icecast.spec 6 Nov 2006 12:30:55 -0000 1.4 @@ -1,7 +1,7 @@ Summary: ShoutCast compatible streaming media server Name: icecast Version: 2.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: GPL URL: http://www.icecast.org/ @@ -10,6 +10,7 @@ Source2: icecast.init Source3: icecast.logrotate Source4: icecast.xml +Patch1: icecast-curl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: streaming-server @@ -36,6 +37,7 @@ %prep %setup -q +%patch1 -p1 -b .curl find -name "*.html" -or -name "*.jpg" -or -name "*.css" | xargs chmod 644 %{__sed} -i -e 's/icecast2/icecast/g' debian/icecast2.1 @@ -107,6 +109,9 @@ %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast %changelog +* Mon Nov 06 2006 Jindrich Novy - 2.3.1-4 +- rebuild because of the new curl + * Fri Sep 08 2006 Andreas Thienemann - 2.3.1-3 - FE6 Rebuild From fedora-extras-commits at redhat.com Mon Nov 6 12:58:04 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 05:58:04 -0700 Subject: rpms/rtorrent/devel rtorrent.spec,1.12,1.13 Message-ID: <200611061258.kA6Cw4cO015198@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/rtorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15182 Modified Files: rtorrent.spec Log Message: - rebuild against new curl Index: rtorrent.spec =================================================================== RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rtorrent.spec 29 Sep 2006 10:06:28 -0000 1.12 +++ rtorrent.spec 6 Nov 2006 12:57:33 -0000 1.13 @@ -2,7 +2,7 @@ License: GPL Group: Applications/Internet Version: 0.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: BitTorrent client based on libtorrent URL: http://rtorrent.rakshasa.no/ Source0: http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz @@ -40,6 +40,9 @@ %{_mandir}/man1/rtorrent* %changelog +* Mon Nov 06 2006 Jindrich Novy - 0.6.2-5 +- rebuild against new curl + * Fri Sep 29 2006 Chris Chabot - 0.6.2-4 - re-tag From fedora-extras-commits at redhat.com Mon Nov 6 13:09:10 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 06:09:10 -0700 Subject: rpms/sblim-wbemcli/devel sblim-wbemcli.spec,1.5,1.6 Message-ID: <200611061309.kA6D9AXN018272@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/sblim-wbemcli/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18256 Modified Files: sblim-wbemcli.spec Log Message: - rebuild against new curl Index: sblim-wbemcli.spec =================================================================== RCS file: /cvs/extras/rpms/sblim-wbemcli/devel/sblim-wbemcli.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sblim-wbemcli.spec 4 Oct 2006 23:09:24 -0000 1.5 +++ sblim-wbemcli.spec 6 Nov 2006 13:08:40 -0000 1.6 @@ -9,7 +9,7 @@ Summary: SBLIM WBEM Command Line Interface Name: sblim-wbemcli Version: 1.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: Systems Management/Base URL: http://www.sblim.org License: CPL @@ -47,10 +47,12 @@ %{_datadir}/%{name} %changelog +* Mon Nov 06 2006 Jindrich Novy 1.5.1-5 +- rebuild against new curl + * Thu Oct 05 2006 Christian Iseli 1.5.1-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - * Mon Nov 21 2005 Viktor Mihajlovski 1.5.1-1 - Upgrade to version 1.5.1 (SSL V3 enforced, default CACERT). Created Fedora/RH specific spec file. From fedora-extras-commits at redhat.com Mon Nov 6 13:17:16 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 06:17:16 -0700 Subject: rpms/gnupg2/devel .cvsignore, 1.15, 1.16 gnupg2.spec, 1.54, 1.55 sources, 1.17, 1.18 Message-ID: <200611061317.kA6DHGxf018398@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18378 Modified Files: .cvsignore gnupg2.spec sources Log Message: * Mon Nov 06 2006 Rex Dieter 1.9.95-1 - 1.9.95 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 25 Oct 2006 18:43:03 -0000 1.15 +++ .cvsignore 6 Nov 2006 13:16:45 -0000 1.16 @@ -1,2 +1,4 @@ gnupg-1.9.94.tar.bz2 gnupg-1.9.94.tar.bz2.sig +gnupg-1.9.95.tar.bz2 +gnupg-1.9.95.tar.bz2.sig Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- gnupg2.spec 25 Oct 2006 18:43:03 -0000 1.54 +++ gnupg2.spec 6 Nov 2006 13:16:45 -0000 1.55 @@ -1,5 +1,6 @@ -# Keep an eye on http://bugzilla.redhat.com/175744, in case these dirs go away or change +## Keep an eye on http://bugzilla.redhat.com/175744, +## in case these dirs go away or change %if "%{?fedora}" > "3" || "%{?rhel}" > "4" %define kde_scriptdir %{_sysconfdir}/kde %else @@ -11,7 +12,7 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 1.9.94 +Version: 1.9.95 Release: 1%{?dist} License: GPL @@ -183,7 +184,11 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 1.9.95-1 +- 1.9.95 + * Wed Oct 25 2006 Rex Dieter 1.9.94-1 +- 1.9.94 * Wed Oct 18 2006 Rex Dieter 1.9.93-1 - 1.9.93 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 25 Oct 2006 18:43:03 -0000 1.17 +++ sources 6 Nov 2006 13:16:45 -0000 1.18 @@ -1,2 +1,2 @@ -1da8c928948800efa2a13d4aecb8d013 gnupg-1.9.94.tar.bz2 -18c269ffc15801ee62e1add2644391ec gnupg-1.9.94.tar.bz2.sig +2f8f134c4b0a8a69f2017100e7a51101 gnupg-1.9.95.tar.bz2 +a0d38a16e7542e4c4fd10607fe029745 gnupg-1.9.95.tar.bz2.sig From fedora-extras-commits at redhat.com Mon Nov 6 13:20:23 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 06:20:23 -0700 Subject: rpms/streamtuner/devel streamtuner.spec,1.7,1.8 Message-ID: <200611061320.kA6DKNoj018478@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/streamtuner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18458 Modified Files: streamtuner.spec Log Message: - rebuild against new curl Index: streamtuner.spec =================================================================== RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- streamtuner.spec 15 Sep 2006 08:34:08 -0000 1.7 +++ streamtuner.spec 6 Nov 2006 13:19:53 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A stream directory browser Name: streamtuner Version: 0.99.99 -Release: 13%{?dist} +Release: 14%{?dist} URL: http://streamtuner.sourceforge.net Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz Source1: %{name}.png @@ -116,6 +116,9 @@ %changelog +* Mon Nov 06 2006 Jindrich Novy - 0.99.99-14 +- rebuild against new curl + * Fri Sep 15 2006 Matthias Haase - 0.99.99-13 - Rebuild for Fedora Extras 6 From fedora-extras-commits at redhat.com Mon Nov 6 13:36:34 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 06:36:34 -0700 Subject: rpms/octave-forge/devel octave-forge.spec,1.32,1.33 Message-ID: <200611061336.kA6DaY2N018664@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648 Modified Files: octave-forge.spec Log Message: - rebuild against the new curl Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- octave-forge.spec 4 Oct 2006 22:25:19 -0000 1.32 +++ octave-forge.spec 6 Nov 2006 13:36:04 -0000 1.33 @@ -1,6 +1,6 @@ Name: octave-forge Version: 2006.07.09 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -73,6 +73,9 @@ %changelog +* Mon Nov 06 2006 Jindrich Novy 2006.07.09-8 +- rebuild against the new curl + * Thu Oct 05 2006 Christian Iseli 2006.07.09-7 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-extras-commits at redhat.com Mon Nov 6 13:53:50 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 06:53:50 -0700 Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-curl.patch, NONE, 1.1 sylpheed-claws-plugins.spec, 1.23, 1.24 Message-ID: <200611061353.kA6Dro51018793@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774 Modified Files: sylpheed-claws-plugins.spec Added Files: sylpheed-claws-curl.patch Log Message: - rebuild against the new curl sylpheed-claws-curl.patch: --- NEW FILE sylpheed-claws-curl.patch --- --- sylpheed-claws-extra-plugins-2.5.2/rssyl-0.6.1/src/feed.c.curl 2006-09-25 12:55:29.000000000 -0400 +++ sylpheed-claws-extra-plugins-2.5.2/rssyl-0.6.1/src/feed.c 2006-11-06 08:42:55.000000000 -0500 @@ -121,7 +121,6 @@ curl_easy_setopt(eh, CURLOPT_URL, ctx->url); curl_easy_setopt(eh, CURLOPT_NOPROGRESS, 1); - curl_easy_setopt(eh, CURLOPT_MUTE, 1); curl_easy_setopt(eh, CURLOPT_WRITEDATA, f); curl_easy_setopt(eh, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(eh, CURLOPT_MAXREDIRS, 3); --- sylpheed-claws-extra-plugins-2.5.2/gtkhtml2_viewer-0.11/src/gtkhtml2_viewer.c.curl 2006-09-25 12:55:35.000000000 -0400 +++ sylpheed-claws-extra-plugins-2.5.2/gtkhtml2_viewer-0.11/src/gtkhtml2_viewer.c 2006-11-06 08:42:28.000000000 -0500 @@ -372,7 +372,6 @@ curl_easy_setopt(eh, CURLOPT_URL, ctx->url); curl_easy_setopt(eh, CURLOPT_NOPROGRESS, 1); - curl_easy_setopt(eh, CURLOPT_MUTE, 1); curl_easy_setopt(eh, CURLOPT_WRITEDATA, f); curl_easy_setopt(eh, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(eh, CURLOPT_MAXREDIRS, 3); Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sylpheed-claws-plugins.spec 20 Oct 2006 09:47:50 -0000 1.23 +++ sylpheed-claws-plugins.spec 6 Nov 2006 13:53:20 -0000 1.24 @@ -1,12 +1,13 @@ Name: sylpheed-claws-plugins Version: 2.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2 +Patch1: sylpheed-claws-curl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sylpheed-claws-devel >= %{version} @@ -183,6 +184,7 @@ %prep %setup -q -n sylpheed-claws-extra-plugins-%{version} +%patch1 -p1 -b .curl %build #acpi_notifier @@ -510,6 +512,9 @@ %exclude %{_includedir}/ical.h %changelog +* Mon Nov 06 2006 Jindrich Novy 2.5.2-5 +- rebuild against the new curl + * Fri Oct 20 2006 Andreas Bierfert 2.5.2-4 - rebuild From fedora-extras-commits at redhat.com Mon Nov 6 13:58:11 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 6 Nov 2006 06:58:11 -0700 Subject: rpms/abcMIDI/FC-5 .cvsignore, 1.11, 1.12 abcMIDI.spec, 1.11, 1.12 sources, 1.11, 1.12 Message-ID: <200611061358.kA6DwBGA018916@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcMIDI/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864/FC-5 Modified Files: .cvsignore abcMIDI.spec sources Log Message: new version 20061103 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 31 Oct 2006 14:07:49 -0000 1.11 +++ .cvsignore 6 Nov 2006 13:57:41 -0000 1.12 @@ -1 +1 @@ -abcMIDI-2006-10-27.zip +abcMIDI-2006-11-03.zip Index: abcMIDI.spec =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- abcMIDI.spec 31 Oct 2006 14:07:49 -0000 1.11 +++ abcMIDI.spec 6 Nov 2006 13:57:41 -0000 1.12 @@ -1,12 +1,12 @@ Name: abcMIDI -Version: 20061027 +Version: 20061103 Release: 1%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia License: GPL URL: http://abc.sourceforge.net/abcMIDI -Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip +Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-11-03.zip Patch0: abcmidi-snprintf.patch Patch1: abcmidi-sprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +65,9 @@ %changelog +* Mon Nov 6 2006 Gerard Milmeister - 20061103-1 +- new version 20061103 + * Tue Oct 31 2006 Gerard Milmeister - 20061027-1 - new version 20061027 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 31 Oct 2006 14:07:49 -0000 1.11 +++ sources 6 Nov 2006 13:57:41 -0000 1.12 @@ -1 +1 @@ -d162f0a583565f38b8bd2ab4cfcb745e abcMIDI-2006-10-27.zip +888a007986d0b02c789cdaaf1401a04c abcMIDI-2006-11-03.zip From fedora-extras-commits at redhat.com Mon Nov 6 13:58:12 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 6 Nov 2006 06:58:12 -0700 Subject: rpms/abcMIDI/FC-6 .cvsignore, 1.11, 1.12 abcMIDI.spec, 1.13, 1.14 sources, 1.11, 1.12 Message-ID: <200611061358.kA6DwCCi018921@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcMIDI/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864/FC-6 Modified Files: .cvsignore abcMIDI.spec sources Log Message: new version 20061103 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/FC-6/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 31 Oct 2006 14:07:50 -0000 1.11 +++ .cvsignore 6 Nov 2006 13:57:42 -0000 1.12 @@ -1 +1 @@ -abcMIDI-2006-10-27.zip +abcMIDI-2006-11-03.zip Index: abcMIDI.spec =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/FC-6/abcMIDI.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- abcMIDI.spec 31 Oct 2006 14:07:50 -0000 1.13 +++ abcMIDI.spec 6 Nov 2006 13:57:42 -0000 1.14 @@ -1,12 +1,12 @@ Name: abcMIDI -Version: 20061027 +Version: 20061103 Release: 1%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia License: GPL URL: http://abc.sourceforge.net/abcMIDI -Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip +Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-11-03.zip Patch0: abcmidi-snprintf.patch Patch1: abcmidi-sprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +65,9 @@ %changelog +* Mon Nov 6 2006 Gerard Milmeister - 20061103-1 +- new version 20061103 + * Tue Oct 31 2006 Gerard Milmeister - 20061027-1 - new version 20061027 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/FC-6/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 31 Oct 2006 14:07:50 -0000 1.11 +++ sources 6 Nov 2006 13:57:42 -0000 1.12 @@ -1 +1 @@ -d162f0a583565f38b8bd2ab4cfcb745e abcMIDI-2006-10-27.zip +888a007986d0b02c789cdaaf1401a04c abcMIDI-2006-11-03.zip From fedora-extras-commits at redhat.com Mon Nov 6 13:58:12 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Mon, 6 Nov 2006 06:58:12 -0700 Subject: rpms/abcMIDI/devel .cvsignore, 1.11, 1.12 abcMIDI.spec, 1.13, 1.14 sources, 1.11, 1.12 Message-ID: <200611061358.kA6DwCkg018926@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcMIDI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864/devel Modified Files: .cvsignore abcMIDI.spec sources Log Message: new version 20061103 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 31 Oct 2006 14:07:51 -0000 1.11 +++ .cvsignore 6 Nov 2006 13:57:42 -0000 1.12 @@ -1 +1 @@ -abcMIDI-2006-10-27.zip +abcMIDI-2006-11-03.zip Index: abcMIDI.spec =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- abcMIDI.spec 31 Oct 2006 14:07:51 -0000 1.13 +++ abcMIDI.spec 6 Nov 2006 13:57:42 -0000 1.14 @@ -1,12 +1,12 @@ Name: abcMIDI -Version: 20061027 +Version: 20061103 Release: 1%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia License: GPL URL: http://abc.sourceforge.net/abcMIDI -Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip +Source0: http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-11-03.zip Patch0: abcmidi-snprintf.patch Patch1: abcmidi-sprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,6 +65,9 @@ %changelog +* Mon Nov 6 2006 Gerard Milmeister - 20061103-1 +- new version 20061103 + * Tue Oct 31 2006 Gerard Milmeister - 20061027-1 - new version 20061027 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcMIDI/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 31 Oct 2006 14:07:51 -0000 1.11 +++ sources 6 Nov 2006 13:57:42 -0000 1.12 @@ -1 +1 @@ -d162f0a583565f38b8bd2ab4cfcb745e abcMIDI-2006-10-27.zip +888a007986d0b02c789cdaaf1401a04c abcMIDI-2006-11-03.zip From fedora-extras-commits at redhat.com Mon Nov 6 14:02:06 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 07:02:06 -0700 Subject: rpms/xmlrpc-c/devel xmlrpc-c.spec,1.10,1.11 Message-ID: <200611061402.kA6E26e9021886@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/xmlrpc-c/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21868 Modified Files: xmlrpc-c.spec Log Message: - rebuild against the new curl Index: xmlrpc-c.spec =================================================================== RCS file: /cvs/extras/rpms/xmlrpc-c/devel/xmlrpc-c.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xmlrpc-c.spec 2 Oct 2006 15:02:03 -0000 1.10 +++ xmlrpc-c.spec 6 Nov 2006 14:01:36 -0000 1.11 @@ -5,7 +5,7 @@ Summary: A lightweight RPC library based on XML and HTTP Name: xmlrpc-c Version: 1.06.05 -Release: %release_func 2 +Release: %release_func 3 License: BSD/PSF -- see COPYING Group: System Environment/Libraries URL: http://xmlrpc-c.sourceforge.net/ @@ -123,6 +123,9 @@ %changelog +* Mon Nov 6 2006 Jindrich Novy - 1.06.05-3 +- rebuild against the new curl + * Mon Oct 2 2006 Enrico Scholz - 1.06.05-2 - updated cmake patch - strip installed libraries From fedora-extras-commits at redhat.com Mon Nov 6 14:04:17 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 07:04:17 -0700 Subject: rpms/xdg-utils/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xdg-utils.spec, 1.9, 1.10 Message-ID: <200611061404.kA6E4HFP022075@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/xdg-utils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22050 Modified Files: .cvsignore sources xdg-utils.spec Log Message: * Mon Nov 06 2006 Rex Dieter 1.0.1-1 - xdg-utils-1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 Oct 2006 12:48:28 -0000 1.6 +++ .cvsignore 6 Nov 2006 14:03:45 -0000 1.7 @@ -1,3 +1,4 @@ clog xdg-utils-1.0rc1.tgz xdg-utils-1.0.tgz +xdg-utils-1.0.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 Oct 2006 12:48:28 -0000 1.6 +++ sources 6 Nov 2006 14:03:45 -0000 1.7 @@ -1 +1 @@ -69842bbf2eb627519680a904541308fa xdg-utils-1.0.tgz +d67b8e5eaace131c56ea7ae811c6f9f1 xdg-utils-1.0.1.tgz Index: xdg-utils.spec =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xdg-utils.spec 24 Oct 2006 15:48:23 -0000 1.9 +++ xdg-utils.spec 6 Nov 2006 14:03:45 -0000 1.10 @@ -1,8 +1,8 @@ Summary: Basic desktop integration functions Name: xdg-utils -Version: 1.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 1%{?dist} URL: http://portland.freedesktop.org/ Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz @@ -75,6 +75,9 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 1.0.1-1 +- xdg-utils-1.0.1 + * Tue Oct 24 2006 Rex Dieter Author: rdieter Update of /cvs/extras/rpms/xdg-utils/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22196 Modified Files: .cvsignore sources xdg-utils.spec Log Message: * Mon Nov 06 2006 Rex Dieter 1.0.1-1 - xdg-utils-1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 Oct 2006 12:48:28 -0000 1.6 +++ .cvsignore 6 Nov 2006 14:10:54 -0000 1.7 @@ -1,3 +1,4 @@ clog xdg-utils-1.0rc1.tgz xdg-utils-1.0.tgz +xdg-utils-1.0.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 Oct 2006 12:48:28 -0000 1.6 +++ sources 6 Nov 2006 14:10:54 -0000 1.7 @@ -1 +1 @@ -69842bbf2eb627519680a904541308fa xdg-utils-1.0.tgz +d67b8e5eaace131c56ea7ae811c6f9f1 xdg-utils-1.0.1.tgz Index: xdg-utils.spec =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-6/xdg-utils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xdg-utils.spec 24 Oct 2006 16:00:09 -0000 1.9 +++ xdg-utils.spec 6 Nov 2006 14:10:54 -0000 1.10 @@ -1,8 +1,8 @@ Summary: Basic desktop integration functions Name: xdg-utils -Version: 1.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 1%{?dist} URL: http://portland.freedesktop.org/ Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz @@ -75,6 +75,9 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 1.0.1-1 +- xdg-utils-1.0.1 + * Tue Oct 24 2006 Rex Dieter Author: rdieter Update of /cvs/extras/rpms/xdg-utils/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22271 Modified Files: .cvsignore sources xdg-utils.spec Log Message: * Mon Nov 06 2006 Rex Dieter 1.0.1-1 - xdg-utils-1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 Oct 2006 12:51:18 -0000 1.6 +++ .cvsignore 6 Nov 2006 14:11:40 -0000 1.7 @@ -1,3 +1,4 @@ clog xdg-utils-1.0rc1.tgz xdg-utils-1.0.tgz +xdg-utils-1.0.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 Oct 2006 12:51:18 -0000 1.6 +++ sources 6 Nov 2006 14:11:40 -0000 1.7 @@ -1 +1 @@ -69842bbf2eb627519680a904541308fa xdg-utils-1.0.tgz +d67b8e5eaace131c56ea7ae811c6f9f1 xdg-utils-1.0.1.tgz Index: xdg-utils.spec =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xdg-utils.spec 24 Oct 2006 16:01:45 -0000 1.8 +++ xdg-utils.spec 6 Nov 2006 14:11:40 -0000 1.9 @@ -1,8 +1,8 @@ Summary: Basic desktop integration functions Name: xdg-utils -Version: 1.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 1%{?dist} URL: http://portland.freedesktop.org/ Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz @@ -75,6 +75,9 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 1.0.1-1 +- xdg-utils-1.0.1 + * Tue Oct 24 2006 Rex Dieter Author: rdieter Update of /cvs/extras/rpms/xdg-utils/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22337 Modified Files: .cvsignore sources xdg-utils.spec Added Files: xdg-utils-1.0-mimeopen.patch Log Message: * Mon Nov 06 2006 Rex Dieter 1.0.1-1 - xdg-utils-1.0.1 xdg-utils-1.0-mimeopen.patch: --- NEW FILE xdg-utils-1.0-mimeopen.patch --- --- xdg-utils-1.0/scripts/xdg-open.mimeopen 2006-10-17 22:55:02.000000000 +0200 +++ xdg-utils-1.0/scripts/xdg-open 2006-10-17 22:55:15.000000000 +0200 @@ -360,6 +360,15 @@ open_generic() { + if mimeopen -v 2>/dev/null 1>&2; then + mimeopen -n "$1" + if [ $? -eq 0 ]; then + exit_success + else + exit_failure_operation_failed + fi + fi + IFS=":" for browser in $BROWSER; do if [ x"$browser" != x"" ]; then Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 Oct 2006 12:50:53 -0000 1.6 +++ .cvsignore 6 Nov 2006 14:12:27 -0000 1.7 @@ -1,3 +1,4 @@ clog xdg-utils-1.0rc1.tgz xdg-utils-1.0.tgz +xdg-utils-1.0.1.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 Oct 2006 12:50:53 -0000 1.6 +++ sources 6 Nov 2006 14:12:27 -0000 1.7 @@ -1 +1 @@ -69842bbf2eb627519680a904541308fa xdg-utils-1.0.tgz +d67b8e5eaace131c56ea7ae811c6f9f1 xdg-utils-1.0.1.tgz Index: xdg-utils.spec =================================================================== RCS file: /cvs/extras/rpms/xdg-utils/FC-4/xdg-utils.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xdg-utils.spec 10 Oct 2006 12:50:53 -0000 1.7 +++ xdg-utils.spec 6 Nov 2006 14:12:27 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Basic desktop integration functions Name: xdg-utils -Version: 1.0 +Version: 1.0.1 Release: 1%{?dist} URL: http://portland.freedesktop.org/ @@ -11,14 +11,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# Not really used (yet) -#BuildRequires: xmlto +Patch1: xdg-utils-1.0-mimeopen.patch Requires: desktop-file-utils ## kde-config -#Requires: kdelibs -# update-gtk-icon-cache -#Requires: gtk2 +#Requires(hint): kdelibs +## update-gtk-icon-cache +#Requires(hint): gtk2 +## mimeopen generic default +#Requires(hint): %{_bindir}/mimeopen +#Requires(hint): perl-File-MimeInfo %description @@ -46,6 +48,8 @@ %prep %setup -q -n %{name}-%{version}%{?beta} +%patch1 -p1 -b .mimeopen + %build %configure @@ -71,6 +75,15 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 1.0.1-1 +- xdg-utils-1.0.1 + +* Tue Oct 24 2006 Rex Dieter 1.0-2 +- prefer mimeopen as generic default (#210797) + * Tue Oct 10 2006 Rex Dieter 1.0-1 - 1.0(final) From fedora-extras-commits at redhat.com Mon Nov 6 14:13:13 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 07:13:13 -0700 Subject: rpms/xmms-scrobbler/devel xmms-scrobbler.spec,1.3,1.4 Message-ID: <200611061413.kA6EDDoN022418@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/xmms-scrobbler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22361 Modified Files: xmms-scrobbler.spec Log Message: - rebuild against the new curl Index: xmms-scrobbler.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/xmms-scrobbler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmms-scrobbler.spec 8 Sep 2006 17:45:24 -0000 1.3 +++ xmms-scrobbler.spec 6 Nov 2006 14:12:43 -0000 1.4 @@ -3,7 +3,7 @@ Summary: Audioscrobbler plugin for XMMS Name: xmms-scrobbler Version: 0.3.8.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.last.fm/downloads.php @@ -47,6 +47,9 @@ %changelog +* Mon Nov 06 2006 Jindrich Novy - 0.3.8.1-3 +- rebuild against the new curl + * Fri Sep 08 2006 Andreas Thienemann - 0.3.8.1-2 - FE6 Rebuild From fedora-extras-commits at redhat.com Mon Nov 6 14:44:13 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 07:44:13 -0700 Subject: rpms/xmoto/devel xmoto.spec,1.4,1.5 Message-ID: <200611061444.kA6EiDdn022645@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/xmoto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22629 Modified Files: xmoto.spec Log Message: - Rebuild against the new curl Index: xmoto.spec =================================================================== RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xmoto.spec 13 Sep 2006 20:57:31 -0000 1.4 +++ xmoto.spec 6 Nov 2006 14:43:43 -0000 1.5 @@ -1,6 +1,6 @@ Name: xmoto Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Challenging 2D Motocross Platform Game Group: Amusements/Games @@ -75,6 +75,9 @@ %changelog +* Mon Nov 6 2006 Jindrich Novy 0.2.0-2 +- Rebuild against the new curl + * Wed Sep 13 2006 Hugo Cisneiros 0.2.0-1 - New upstream release From fedora-extras-commits at redhat.com Mon Nov 6 15:08:05 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Mon, 6 Nov 2006 08:08:05 -0700 Subject: rpms/jd/devel .cvsignore, 1.13, 1.14 jd.spec, 1.20, 1.21 sources, 1.13, 1.14 Message-ID: <200611061508.kA6F857V025799@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25760 Modified Files: .cvsignore jd.spec sources Log Message: * Sat Nov 4 2006 Mamoru Tasaka - 1.8.0-0.5.cvs061106 - cvs 061106 (23:59 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 5 Nov 2006 16:18:10 -0000 1.13 +++ .cvsignore 6 Nov 2006 15:07:35 -0000 1.14 @@ -1 +1 @@ -jd-1.8.0-cvs061105.tgz +jd-1.8.0-cvs061106.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- jd.spec 5 Nov 2006 16:18:10 -0000 1.20 +++ jd.spec 6 Nov 2006 15:07:35 -0000 1.21 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag cvs061105 +%define strtag cvs061106 %define repoid 22566 @@ -103,8 +103,8 @@ %{icondir}/%{name}.png %changelog -* Sat Nov 4 2006 Mamoru Tasaka - 1.8.0-0.5.cvs061105 -- cvs 061105 (23:59 JST) +* Sat Nov 4 2006 Mamoru Tasaka - 1.8.0-0.5.cvs061106 +- cvs 061106 (23:59 JST) * Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 - 1.8.0 beta 061103 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 5 Nov 2006 16:18:10 -0000 1.13 +++ sources 6 Nov 2006 15:07:35 -0000 1.14 @@ -1 +1 @@ -99d1dc3707cfb4a074e9419e19a2b139 jd-1.8.0-cvs061105.tgz +5590a3ab50666cd728b9ea3d25389ac5 jd-1.8.0-cvs061106.tgz From fedora-extras-commits at redhat.com Mon Nov 6 15:08:08 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 08:08:08 -0700 Subject: rpms/PyQt-qscintilla/devel PyQt-qscintilla.spec,1.4,1.5 Message-ID: <200611061508.kA6F88TS025804@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyQt-qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25781 Modified Files: PyQt-qscintilla.spec Log Message: * Mon Nov 06 2006 Rex Dieter 3.16-6 - devel subpkg Index: PyQt-qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/PyQt-qscintilla.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PyQt-qscintilla.spec 29 Aug 2006 18:39:52 -0000 1.4 +++ PyQt-qscintilla.spec 6 Nov 2006 15:07:38 -0000 1.5 @@ -2,12 +2,12 @@ Summary: PyQt qscintilla extentions Name: PyQt-qscintilla Version: 3.16 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Languages -Url: http://www.riverbankcomputing.co.uk/pyqt/ -Source: http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-%{version}.tar.gz +Url: http://www.riverbankcomputing.com/pyqt/ +Source0: http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/PyQt-x11-gpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel @@ -15,13 +15,20 @@ BuildRequires: sip-devel %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)") -Requires: python-abi = %{python_ver} - +Requires: python-abi = %{python_ver} Requires: PyQt = %{version} %description %{summary}. +%package devel +Summary: Libraries and header files for %{name} development +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: sip-devel +%description devel +%{summary}. + %prep %setup -q -n PyQt-x11-gpl-%{version} @@ -51,13 +58,17 @@ %files %defattr(-,root,root,-) %doc LICENSE -# IMO, sip should own this -- Rex -%dir %{_datadir}/sip -%{_datadir}/sip/qtext/ %{python_sitedir}/qtext*.so +%files devel +%defattr(-,root,root,-) +%{_datadir}/sip/qtext/ + %changelog +* Mon Nov 06 2006 Rex Dieter 3.16-6 +- devel subpkg + * Tue Aug 29 2006 Rex Dieter 3.16-5 - fc6 respin From fedora-extras-commits at redhat.com Mon Nov 6 15:09:05 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 08:09:05 -0700 Subject: rpms/PyQt-qscintilla/FC-6 PyQt-qscintilla.spec,1.4,1.5 Message-ID: <200611061509.kA6F95GB025917@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyQt-qscintilla/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25892 Modified Files: PyQt-qscintilla.spec Log Message: * Mon Nov 06 2006 Rex Dieter 3.16-6 - devel subpkg Index: PyQt-qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-6/PyQt-qscintilla.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PyQt-qscintilla.spec 29 Aug 2006 18:39:52 -0000 1.4 +++ PyQt-qscintilla.spec 6 Nov 2006 15:08:35 -0000 1.5 @@ -2,12 +2,12 @@ Summary: PyQt qscintilla extentions Name: PyQt-qscintilla Version: 3.16 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Languages -Url: http://www.riverbankcomputing.co.uk/pyqt/ -Source: http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-%{version}.tar.gz +Url: http://www.riverbankcomputing.com/pyqt/ +Source0: http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/PyQt-x11-gpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel @@ -15,13 +15,20 @@ BuildRequires: sip-devel %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)") -Requires: python-abi = %{python_ver} - +Requires: python-abi = %{python_ver} Requires: PyQt = %{version} %description %{summary}. +%package devel +Summary: Libraries and header files for %{name} development +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: sip-devel +%description devel +%{summary}. + %prep %setup -q -n PyQt-x11-gpl-%{version} @@ -51,13 +58,17 @@ %files %defattr(-,root,root,-) %doc LICENSE -# IMO, sip should own this -- Rex -%dir %{_datadir}/sip -%{_datadir}/sip/qtext/ %{python_sitedir}/qtext*.so +%files devel +%defattr(-,root,root,-) +%{_datadir}/sip/qtext/ + %changelog +* Mon Nov 06 2006 Rex Dieter 3.16-6 +- devel subpkg + * Tue Aug 29 2006 Rex Dieter 3.16-5 - fc6 respin From fedora-extras-commits at redhat.com Mon Nov 6 15:10:56 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 08:10:56 -0700 Subject: rpms/PyQt-qscintilla/FC-5 PyQt-qscintilla.spec,1.3,1.4 Message-ID: <200611061510.kA6FAugC025995@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyQt-qscintilla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25969 Modified Files: PyQt-qscintilla.spec Log Message: * Mon Nov 06 2006 Rex Dieter 3.15-3 - devel subpkg Index: PyQt-qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-5/PyQt-qscintilla.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PyQt-qscintilla.spec 19 Jun 2006 11:59:00 -0000 1.3 +++ PyQt-qscintilla.spec 6 Nov 2006 15:10:26 -0000 1.4 @@ -2,7 +2,7 @@ Summary: PyQt qscintilla extentions Name: PyQt-qscintilla Version: 3.15 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Languages @@ -16,12 +16,19 @@ %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)") Requires: python-abi = %{python_ver} - Requires: PyQt = %{version} %description %{summary}. +%package devel +Summary: Libraries and header files for %{name} development +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: sip-devel +%description devel +%{summary}. + %prep %setup -q -n PyQt-x11-gpl-%{version} @@ -49,13 +56,17 @@ %files %defattr(-,root,root,-) %doc LICENSE -# IMO, sip should own this -%dir %{_datadir}/sip -%{_datadir}/sip/qtext/ %{python_sitedir}/qtext*.so +%files devel +%defattr(-,root,root,-) +%{_datadir}/sip/qtext/ + %changelog +* Mon Nov 06 2006 Rex Dieter 3.15-3 +- devel subpkg + * Mon Jun 05 2006 Rex Dieter 3.15-2 - own %%_datadir/sip From fedora-extras-commits at redhat.com Mon Nov 6 15:18:49 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 08:18:49 -0700 Subject: rpms/PyQt-qscintilla/FC-5 PyQt-qscintilla.spec,1.4,1.5 Message-ID: <200611061518.kA6FInhU026084@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyQt-qscintilla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26068 Modified Files: PyQt-qscintilla.spec Log Message: * Mon Nov 06 2006 Rex Dieter 3.15-4 - devel: Requires: PyQt-devel Index: PyQt-qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-5/PyQt-qscintilla.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PyQt-qscintilla.spec 6 Nov 2006 15:10:26 -0000 1.4 +++ PyQt-qscintilla.spec 6 Nov 2006 15:18:18 -0000 1.5 @@ -2,7 +2,7 @@ Summary: PyQt qscintilla extentions Name: PyQt-qscintilla Version: 3.15 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Languages @@ -26,6 +26,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: sip-devel +Requires: PyQt-devel %description devel %{summary}. @@ -64,6 +65,9 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 3.15-4 +- devel: Requires: PyQt-devel + * Mon Nov 06 2006 Rex Dieter 3.15-3 - devel subpkg From fedora-extras-commits at redhat.com Mon Nov 6 15:20:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 08:20:04 -0700 Subject: rpms/PyQt-qscintilla/devel PyQt-qscintilla.spec,1.5,1.6 Message-ID: <200611061520.kA6FK4IW026158@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyQt-qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26134 Modified Files: PyQt-qscintilla.spec Log Message: * Mon Nov 06 2006 Rex Dieter 3.16-7 - -devel: Requires: PyQt-devel Index: PyQt-qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/PyQt-qscintilla.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PyQt-qscintilla.spec 6 Nov 2006 15:07:38 -0000 1.5 +++ PyQt-qscintilla.spec 6 Nov 2006 15:19:33 -0000 1.6 @@ -2,7 +2,7 @@ Summary: PyQt qscintilla extentions Name: PyQt-qscintilla Version: 3.16 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Languages @@ -26,6 +26,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: sip-devel +Requires: PyQt-devel %description devel %{summary}. @@ -66,6 +67,9 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 3.16-7 +- -devel: Requires: PyQt-devel + * Mon Nov 06 2006 Rex Dieter 3.16-6 - devel subpkg From fedora-extras-commits at redhat.com Mon Nov 6 15:20:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 08:20:52 -0700 Subject: rpms/PyQt-qscintilla/FC-6 PyQt-qscintilla.spec,1.5,1.6 Message-ID: <200611061520.kA6FKqJ4026229@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyQt-qscintilla/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26211 Modified Files: PyQt-qscintilla.spec Log Message: * Mon Nov 06 2006 Rex Dieter 3.16-7 - -devel: Requires: PyQt-devel Index: PyQt-qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-6/PyQt-qscintilla.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PyQt-qscintilla.spec 6 Nov 2006 15:08:35 -0000 1.5 +++ PyQt-qscintilla.spec 6 Nov 2006 15:20:21 -0000 1.6 @@ -2,7 +2,7 @@ Summary: PyQt qscintilla extentions Name: PyQt-qscintilla Version: 3.16 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Languages @@ -26,6 +26,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: sip-devel +Requires: PyQt-devel %description devel %{summary}. @@ -66,6 +67,9 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 3.16-7 +- -devel: Requires: PyQt-devel + * Mon Nov 06 2006 Rex Dieter 3.16-6 - devel subpkg From fedora-extras-commits at redhat.com Mon Nov 6 15:25:01 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 6 Nov 2006 08:25:01 -0700 Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.12,1.13 Message-ID: <200611061525.kA6FP1ni026347@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26329 Modified Files: Config_Extras.py Log Message: enable Fedora Legacy for FC3+FC4 Index: Config_Extras.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Config_Extras.py 29 Oct 2006 18:03:18 -0000 1.12 +++ Config_Extras.py 6 Nov 2006 15:24:59 -0000 1.13 @@ -84,16 +84,16 @@ } # For RepoSupport.py features. -baserepos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'], - '4' : ['fedora-core','fedora-core-updates','fedora-extras'], +baserepos = { '3' : ['fedora-core','fedora-legacy-updates','fedora-extras'], + '4' : ['fedora-core','fedora-legacy-updates','fedora-extras'], '5' : ['fedora-core','fedora-core-updates','fedora-extras'], '6' : ['fedora-core','fedora-core-updates','fedora-extras'], 'development' : ['fedora-core','fedora-extras'] } # For RepoSupport.py features. -testrepos = { '3' : ['fedora-core-updates-testing'], - '4' : ['fedora-core-updates-testing'], +testrepos = { '3' : ['fedora-legacy-updates-testing'], + '4' : ['fedora-legacy-updates-testing'], '5' : ['fedora-core-updates-testing'], '6' : ['fedora-core-updates-testing'], 'development' : [] @@ -103,6 +103,8 @@ reponames = { 'fedora-core' : 'Fedora Core', 'fedora-core-updates' : 'Fedora Core Released Updates', 'fedora-core-updates-testing' : 'Fedora Core Test Updates', + 'fedora-legacy-updates' : 'Fedora Legacy Released Updates', + 'fedora-legacy-updates-testing' : 'Fedora Legacy Test Updates', 'fedora-extras' : 'Fedora Extras' } @@ -111,6 +113,8 @@ repourls = { 'fedora-core' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/os/', 'fedora-core-updates' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/updates/%s/%s/', 'fedora-core-updates-testing' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/%s/%s/', + 'fedora-legacy-updates' : 'http://download.fedoralegacy.org/fedora/%s/updates/%s/', + 'fedora-legacy-updates-testing' : 'http://download.fedoralegacy.org/fedora/%s/updates-testing/%s/', 'fedora-extras' : 'file:///srv/rpmbuild/extras/tree/extras/%s/%s/' } From fedora-extras-commits at redhat.com Mon Nov 6 15:30:40 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Mon, 6 Nov 2006 08:30:40 -0700 Subject: rpms/mock/devel arch-specific-repo.patch, 1.2, 1.3 mock.spec, 1.27, 1.28 Message-ID: <200611061530.kA6FUee7026423@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26391 Modified Files: arch-specific-repo.patch mock.spec Log Message: Oh no! I suck again! More typos in the patch arch-specific-repo.patch: Index: arch-specific-repo.patch =================================================================== RCS file: /cvs/extras/rpms/mock/devel/arch-specific-repo.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- arch-specific-repo.patch 4 Nov 2006 13:05:18 -0000 1.2 +++ arch-specific-repo.patch 6 Nov 2006 15:30:09 -0000 1.3 @@ -303,7 +303,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 ++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386 [local] name=local @@ -327,7 +327,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc ++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- mock.spec 4 Nov 2006 13:05:18 -0000 1.27 +++ mock.spec 6 Nov 2006 15:30:09 -0000 1.28 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ %changelog +* Mon Nov 6 2006 Jesse Keating - 0.6.8-4 +- Fix a couple typos pointing fc6 chroots to fe5. + * Sat Nov 4 2006 Jesse Keating - 0.6.8-3 - Fix a typo in the patch that added x86_64 repos for fc4ppc From fedora-extras-commits at redhat.com Mon Nov 6 15:31:50 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Mon, 6 Nov 2006 08:31:50 -0700 Subject: rpms/mock/FC-5 arch-specific-repo.patch, 1.2, 1.3 mock.spec, 1.25, 1.26 Message-ID: <200611061531.kA6FVof0026508@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26469/FC-5 Modified Files: arch-specific-repo.patch mock.spec Log Message: Port devel updates to FC-6 and FC-5 arch-specific-repo.patch: Index: arch-specific-repo.patch =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/arch-specific-repo.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- arch-specific-repo.patch 4 Nov 2006 13:07:28 -0000 1.2 +++ arch-specific-repo.patch 6 Nov 2006 15:31:20 -0000 1.3 @@ -303,7 +303,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 ++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386 [local] name=local @@ -327,7 +327,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc ++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mock.spec 4 Nov 2006 13:07:28 -0000 1.25 +++ mock.spec 6 Nov 2006 15:31:20 -0000 1.26 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ %changelog +* Mon Nov 6 2006 Jesse Keating - 0.6.8-4 +- Fix a couple typos pointing fc6 chroots to fe5. + * Sat Nov 4 2006 Jesse Keating - 0.6.8-3 - Fix a typo in the patch that added x86_64 repos for fc4ppc From fedora-extras-commits at redhat.com Mon Nov 6 15:31:51 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Mon, 6 Nov 2006 08:31:51 -0700 Subject: rpms/mock/FC-6 arch-specific-repo.patch, 1.2, 1.3 mock.spec, 1.26, 1.27 Message-ID: <200611061531.kA6FVpsF026512@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/mock/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26469/FC-6 Modified Files: arch-specific-repo.patch mock.spec Log Message: Port devel updates to FC-6 and FC-5 arch-specific-repo.patch: Index: arch-specific-repo.patch =================================================================== RCS file: /cvs/extras/rpms/mock/FC-6/arch-specific-repo.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- arch-specific-repo.patch 4 Nov 2006 13:07:28 -0000 1.2 +++ arch-specific-repo.patch 6 Nov 2006 15:31:20 -0000 1.3 @@ -303,7 +303,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386 ++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386 [local] name=local @@ -327,7 +327,7 @@ [extras] name=extras -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6 -+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc ++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc [local] name=local Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mock.spec 4 Nov 2006 13:07:28 -0000 1.26 +++ mock.spec 6 Nov 2006 15:31:20 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.6.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ %changelog +* Mon Nov 6 2006 Jesse Keating - 0.6.8-4 +- Fix a couple typos pointing fc6 chroots to fe5. + * Sat Nov 4 2006 Jesse Keating - 0.6.8-3 - Fix a typo in the patch that added x86_64 repos for fc4ppc From fedora-extras-commits at redhat.com Mon Nov 6 15:36:22 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Mon, 6 Nov 2006 08:36:22 -0700 Subject: rpms/git/devel git.spec,1.23,1.24 Message-ID: <200611061536.kA6FaM1k026623@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/git/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26607 Modified Files: git.spec Log Message: - rebuild against the new curl Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git/devel/git.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- git.spec 17 Oct 2006 18:31:21 -0000 1.23 +++ git.spec 6 Nov 2006 15:35:52 -0000 1.24 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.4.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -136,6 +136,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Nov 6 2006 Jindrich Novy 1.4.2.4-2 +- rebuild against the new curl + * Tue Oct 17 2006 Chris Wright 1.4.2.4-1 - git-1.4.2.4 From fedora-extras-commits at redhat.com Mon Nov 6 15:53:18 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 6 Nov 2006 08:53:18 -0700 Subject: rpms/audacious/devel audacious-1.1.2-mainwin-update.patch, NONE, 1.1 audacious.spec, 1.12, 1.13 Message-ID: <200611061553.kA6FrI7r026759@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26740 Modified Files: audacious.spec Added Files: audacious-1.1.2-mainwin-update.patch Log Message: - Decrease main window update frequency somewhat audacious-1.1.2-mainwin-update.patch: --- NEW FILE audacious-1.1.2-mainwin-update.patch --- diff -uNr audacious-fedora-1.1.2-orig/audacious/mainwin.h audacious-fedora-1.1.2/audacious/mainwin.h --- audacious-fedora-1.1.2-orig/audacious/mainwin.h 2006-11-06 15:54:10.000000000 +0100 +++ audacious-fedora-1.1.2/audacious/mainwin.h 2006-11-06 15:55:54.000000000 +0100 @@ -39,7 +39,7 @@ #define MAINWIN_TITLEBAR_HEIGHT (gint)14 #define MAINWIN_SHADED_HEIGHT MAINWIN_TITLEBAR_HEIGHT -#define MAINWIN_UPDATE_INTERVAL 10 +#define MAINWIN_UPDATE_INTERVAL 100 #define MAINWIN_DEFAULT_POS_X 20 #define MAINWIN_DEFAULT_POS_Y 20 Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- audacious.spec 6 Nov 2006 09:07:19 -0000 1.12 +++ audacious.spec 6 Nov 2006 15:52:48 -0000 1.13 @@ -1,6 +1,6 @@ Name: audacious Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -20,6 +20,7 @@ Patch6: audacious-1.1.1-shaded-skin.patch Patch7: audacious-1.1.1-controlsocket-name.patch Patch8: audacious-1.1.1-playlist-twenty.patch +Patch9: audacious-1.1.2-mainwin-update.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0 @@ -117,6 +118,9 @@ # Fix "%20" in playlist entries %patch8 -p1 -b playlist-twenty +# Decease main window update frequency when the player is idle +%patch9 -p1 -b mainwin-update + %build %configure \ --disable-rpath \ @@ -208,6 +212,9 @@ %changelog +* Mon Nov 06 2006 Ralf Ertzinger 1.1.2-4.fc7 +- Decrease main window update frequency somewhat + * Mon Nov 06 2006 Jindrich Novy 1.1.2-3.fc6 - Rebuild because of the new curl - Don't BuildRequire desktop-file-utils twice From fedora-extras-commits at redhat.com Mon Nov 6 16:49:12 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 09:49:12 -0700 Subject: rpms/libetpan/FC-3 .cvsignore, 1.9, 1.10 libetpan.spec, 1.8, 1.9 sources, 1.9, 1.10 Message-ID: <200611061649.kA6GnC6w030324@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/FC-3 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 19 Oct 2006 16:27:57 -0000 1.9 +++ .cvsignore 6 Nov 2006 16:48:41 -0000 1.10 @@ -1 +1 @@ -libetpan-0.47.tar.gz +libetpan-0.48.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libetpan.spec 19 Oct 2006 16:27:57 -0000 1.8 +++ libetpan.spec 6 Nov 2006 16:48:41 -0000 1.9 @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.47 +Version: 0.48 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,10 +65,18 @@ %{_libdir}/*.so %changelog +* Mon Nov 06 2006 Andreas Bierfert +0.48-1 +- version upgrade + * Thu Oct 19 2006 Andreas Bierfert 0.47-1 - version upgrade +* Sat Sep 30 2006 Andreas Bierfert +0.46-1 +- version upgrade + * Wed Apr 05 2006 Andreas Bierfert 0.45-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 Oct 2006 16:27:57 -0000 1.9 +++ sources 6 Nov 2006 16:48:41 -0000 1.10 @@ -1 +1 @@ -bdbe010dcd70fa358d7184b998c3228a libetpan-0.47.tar.gz +493de1bfc84c1e0f82fd865795e48ffb libetpan-0.48.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 16:49:15 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 09:49:15 -0700 Subject: rpms/libetpan/devel .cvsignore, 1.10, 1.11 libetpan.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200611061649.kA6GnFNq030342@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/devel Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 19 Oct 2006 16:28:00 -0000 1.10 +++ .cvsignore 6 Nov 2006 16:48:45 -0000 1.11 @@ -1 +1 @@ -libetpan-0.47.tar.gz +libetpan-0.48.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libetpan.spec 19 Oct 2006 16:28:00 -0000 1.14 +++ libetpan.spec 6 Nov 2006 16:48:45 -0000 1.15 @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.47 +Version: 0.48 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Mon Nov 06 2006 Andreas Bierfert +0.48-1 +- version upgrade + * Thu Oct 19 2006 Andreas Bierfert 0.47-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 19 Oct 2006 16:28:00 -0000 1.10 +++ sources 6 Nov 2006 16:48:45 -0000 1.11 @@ -1 +1 @@ -bdbe010dcd70fa358d7184b998c3228a libetpan-0.47.tar.gz +493de1bfc84c1e0f82fd865795e48ffb libetpan-0.48.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 16:49:13 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 09:49:13 -0700 Subject: rpms/libetpan/FC-4 .cvsignore, 1.10, 1.11 libetpan.spec, 1.9, 1.10 sources, 1.10, 1.11 Message-ID: <200611061649.kA6GnDDo030329@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/FC-4 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 19 Oct 2006 16:27:58 -0000 1.10 +++ .cvsignore 6 Nov 2006 16:48:42 -0000 1.11 @@ -1 +1 @@ -libetpan-0.47.tar.gz +libetpan-0.48.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libetpan.spec 19 Oct 2006 16:27:58 -0000 1.9 +++ libetpan.spec 6 Nov 2006 16:48:42 -0000 1.10 @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.47 +Version: 0.48 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Mon Nov 06 2006 Andreas Bierfert +0.48-1 +- version upgrade + * Thu Oct 19 2006 Andreas Bierfert 0.47-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 19 Oct 2006 16:27:58 -0000 1.10 +++ sources 6 Nov 2006 16:48:42 -0000 1.11 @@ -1 +1 @@ -bdbe010dcd70fa358d7184b998c3228a libetpan-0.47.tar.gz +493de1bfc84c1e0f82fd865795e48ffb libetpan-0.48.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 16:49:13 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 09:49:13 -0700 Subject: rpms/libetpan/FC-5 .cvsignore, 1.10, 1.11 libetpan.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <200611061649.kA6GnDsa030334@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/FC-5 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 19 Oct 2006 16:27:59 -0000 1.10 +++ .cvsignore 6 Nov 2006 16:48:43 -0000 1.11 @@ -1 +1 @@ -libetpan-0.47.tar.gz +libetpan-0.48.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/libetpan.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libetpan.spec 19 Oct 2006 16:27:59 -0000 1.12 +++ libetpan.spec 6 Nov 2006 16:48:43 -0000 1.13 @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.47 +Version: 0.48 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Mon Nov 06 2006 Andreas Bierfert +0.48-1 +- version upgrade + * Thu Oct 19 2006 Andreas Bierfert 0.47-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 19 Oct 2006 16:27:59 -0000 1.10 +++ sources 6 Nov 2006 16:48:43 -0000 1.11 @@ -1 +1 @@ -bdbe010dcd70fa358d7184b998c3228a libetpan-0.47.tar.gz +493de1bfc84c1e0f82fd865795e48ffb libetpan-0.48.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 16:49:14 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 09:49:14 -0700 Subject: rpms/libetpan/FC-6 .cvsignore, 1.10, 1.11 libetpan.spec, 1.14, 1.15 sources, 1.10, 1.11 Message-ID: <200611061649.kA6GnEis030339@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/FC-6 Modified Files: .cvsignore libetpan.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-6/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 19 Oct 2006 16:28:00 -0000 1.10 +++ .cvsignore 6 Nov 2006 16:48:44 -0000 1.11 @@ -1 +1 @@ -libetpan-0.47.tar.gz +libetpan-0.48.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-6/libetpan.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libetpan.spec 19 Oct 2006 16:28:00 -0000 1.14 +++ libetpan.spec 6 Nov 2006 16:48:44 -0000 1.15 @@ -1,5 +1,5 @@ Name: libetpan -Version: 0.47 +Version: 0.48 Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access @@ -43,7 +43,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la -chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Mon Nov 06 2006 Andreas Bierfert +0.48-1 +- version upgrade + * Thu Oct 19 2006 Andreas Bierfert 0.47-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-6/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 19 Oct 2006 16:28:00 -0000 1.10 +++ sources 6 Nov 2006 16:48:44 -0000 1.11 @@ -1 +1 @@ -bdbe010dcd70fa358d7184b998c3228a libetpan-0.47.tar.gz +493de1bfc84c1e0f82fd865795e48ffb libetpan-0.48.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 16:56:17 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 09:56:17 -0700 Subject: rpms/gnupg2/devel gnupg2.spec,1.55,1.56 Message-ID: <200611061656.kA6GuHZC030619@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30603 Modified Files: gnupg2.spec Log Message: * Mon Nov 06 2006 Rex Dieter 1.9.95-2 - fix (more) file conflicts with gnupg Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- gnupg2.spec 6 Nov 2006 13:16:45 -0000 1.55 +++ gnupg2.spec 6 Nov 2006 16:55:47 -0000 1.56 @@ -130,15 +130,12 @@ %find_lang %{name} -## NOTE: -#file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4 -#file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4 -#file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4 +# file conflicts with gnupg-1.x rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} +rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html} mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||: - -## Unpackaged files +# Unpackaged files rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -184,6 +181,9 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 1.9.95-2 +- fix (more) file conflicts with gnupg + * Mon Nov 06 2006 Rex Dieter 1.9.95-1 - 1.9.95 From fedora-extras-commits at redhat.com Mon Nov 6 17:11:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Nov 2006 10:11:43 -0700 Subject: rpms/gnupg2/devel gnupg2.spec,1.56,1.57 Message-ID: <200611061711.kA6HBhin001305@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1284 Modified Files: gnupg2.spec Log Message: Release++ Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- gnupg2.spec 6 Nov 2006 16:55:47 -0000 1.56 +++ gnupg2.spec 6 Nov 2006 17:11:13 -0000 1.57 @@ -13,7 +13,7 @@ Summary: Utility for secure communication and data storage Name: gnupg2 Version: 1.9.95 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Mon Nov 6 17:41:24 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Mon, 6 Nov 2006 10:41:24 -0700 Subject: rpms/bzr/devel .cvsignore, 1.7, 1.8 bzr.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200611061741.kA6HfOrN001574@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/bzr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1532 Modified Files: .cvsignore bzr.spec sources Log Message: - Update to 0.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Oct 2006 04:22:09 -0000 1.7 +++ .cvsignore 6 Nov 2006 17:40:53 -0000 1.8 @@ -1 +1 @@ -bzr-0.11.tar.gz +bzr-0.12.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bzr.spec 9 Oct 2006 04:22:09 -0000 1.10 +++ bzr.spec 6 Nov 2006 17:40:53 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.11 +Version: 0.12 Release: 1%{?dist} Summary: Friendly distributed version control system @@ -158,6 +158,9 @@ %{python_sitelib}/bzrlib/tests/* %changelog +* Thu Oct 30 2006 Toshio Kuratomi 0.12-1 +- Update to 0.12 + * Thu Oct 08 2006 Toshio Kuratomi 0.11-1 - Update to 0.11 - New download location. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Oct 2006 04:22:09 -0000 1.7 +++ sources 6 Nov 2006 17:40:53 -0000 1.8 @@ -1 +1 @@ -94fced266d6da6ed298e4738ca7414e0 bzr-0.11.tar.gz +68bf4e425a93bdf5961af9c3c35229bf bzr-0.12.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 17:41:48 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Mon, 6 Nov 2006 10:41:48 -0700 Subject: rpms/bzrtools/devel .cvsignore, 1.6, 1.7 bzrtools.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200611061741.kA6HfmQS001608@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1554 Modified Files: .cvsignore bzrtools.spec sources Log Message: - Update to 0.12.2 - The push command was renamed to rspush. Update the %description to match. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Oct 2006 04:36:29 -0000 1.6 +++ .cvsignore 6 Nov 2006 17:41:18 -0000 1.7 @@ -1 +1 @@ -bzrtools-0.11.0.tar.gz +bzrtools-0.12.2.tar.gz Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bzrtools.spec 9 Oct 2006 04:36:29 -0000 1.10 +++ bzrtools.spec 6 Nov 2006 17:41:18 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzrtools -Version: 0.11.0 +Version: 0.12.2 Release: 1%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG @@ -19,7 +19,7 @@ %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included plugins are: -* push - uses rsync to push local changes to a remote server +* rspush - uses rsync to push local changes to a remote server * annotate - prints a file annotated with the revision next to each line * baz-import - (Requres PyBaz) import an arch archive losslessly into bzr * shelve/unshelve - allows you to undo some changes, commit, and restore @@ -30,7 +30,7 @@ %prep -%setup -q +%setup -q -n %{name} %build @@ -43,6 +43,8 @@ # remove shebangs from all files as none should be executable scripts sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py +# No need to ship the tests +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/bzrtools/tests/ %clean rm -rf $RPM_BUILD_ROOT @@ -57,6 +59,10 @@ %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog +* Thu Oct 05 2006 Toshio Kuratomi 0.12.2-1 +- Update to 0.12.2 +- The push command was renamed to rspush. Update the %%description to match. + * Thu Oct 05 2006 Toshio Kuratomi 0.11.0-1 - Update to 0.11.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Oct 2006 04:36:29 -0000 1.6 +++ sources 6 Nov 2006 17:41:18 -0000 1.7 @@ -1 +1 @@ -8d34615bafbd40518e75509e7d3a8c04 bzrtools-0.11.0.tar.gz +3653679f3295deca085811e54da2b6fa bzrtools-0.12.2.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 17:56:32 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 6 Nov 2006 10:56:32 -0700 Subject: rpms/mftrace/devel .cvsignore, 1.3, 1.4 mftrace.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200611061756.kA6HuW2u001802@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1780 Modified Files: .cvsignore mftrace.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 May 2006 06:04:16 -0000 1.3 +++ .cvsignore 6 Nov 2006 17:56:02 -0000 1.4 @@ -1 +1 @@ -mftrace-1.2.4.tar.gz +mftrace-1.2.5.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/mftrace.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mftrace.spec 6 Sep 2006 19:14:30 -0000 1.6 +++ mftrace.spec 6 Nov 2006 17:56:02 -0000 1.7 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.2.4 -Release: 4%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -50,6 +50,9 @@ %changelog +* Mon Nov 6 2006 Quentin Spencer 1.2.5-1 +- New release. + * Mon Aug 28 2006 Quentin Spencer 1.2.4-4 - Rebuild for FC6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 May 2006 06:04:16 -0000 1.3 +++ sources 6 Nov 2006 17:56:02 -0000 1.4 @@ -1 +1 @@ -8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz +c74c812e4e7f63f63376a13b792249da mftrace-1.2.5.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 17:59:13 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 6 Nov 2006 10:59:13 -0700 Subject: rpms/mftrace/FC-6 .cvsignore, 1.3, 1.4 mftrace.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200611061759.kA6HxDLX001902@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1856 Modified Files: .cvsignore mftrace.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 May 2006 06:04:16 -0000 1.3 +++ .cvsignore 6 Nov 2006 17:58:43 -0000 1.4 @@ -1 +1 @@ -mftrace-1.2.4.tar.gz +mftrace-1.2.5.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-6/mftrace.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mftrace.spec 6 Sep 2006 19:14:30 -0000 1.6 +++ mftrace.spec 6 Nov 2006 17:58:43 -0000 1.7 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.2.4 -Release: 4%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -50,6 +50,9 @@ %changelog +* Mon Nov 6 2006 Quentin Spencer 1.2.5-1 +- New release. + * Mon Aug 28 2006 Quentin Spencer 1.2.4-4 - Rebuild for FC6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 May 2006 06:04:16 -0000 1.3 +++ sources 6 Nov 2006 17:58:43 -0000 1.4 @@ -1 +1 @@ -8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz +c74c812e4e7f63f63376a13b792249da mftrace-1.2.5.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 17:59:19 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 6 Nov 2006 10:59:19 -0700 Subject: rpms/dnsmasq/devel dnsmasq-2.35-conf-dir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 dnsmasq.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200611061759.kA6HxJEm001907@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1828 Modified Files: .cvsignore dnsmasq.spec sources Added Files: dnsmasq-2.35-conf-dir.patch Log Message: * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-1 - Update to 2.35 - Removed UPGRADING_to_2.0 from %%doc as per upstream change - Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!) - Added %%dir /etc/dnsmasq.d to %%files as per above RFE dnsmasq-2.35-conf-dir.patch: --- NEW FILE dnsmasq-2.35-conf-dir.patch --- diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example --- dnsmasq-2.35/dnsmasq.conf.example 2006-10-18 15:24:50.000000000 -0500 +++ dnsmasq-2.35-patched/dnsmasq.conf.example 2006-11-06 11:46:38.000000000 -0600 @@ -382,4 +382,4 @@ # Include a another lot of configuration options. #conf-file=/etc/dnsmasq.more.conf -#conf-dir=/etc/dnsmasq.d +conf-dir=/etc/dnsmasq.d Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Oct 2006 18:09:19 -0000 1.6 +++ .cvsignore 6 Nov 2006 17:58:49 -0000 1.7 @@ -1 +1 @@ -dnsmasq-2.34.tar.gz +dnsmasq-2.35.tar.gz Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dnsmasq.spec 24 Oct 2006 16:26:49 -0000 1.13 +++ dnsmasq.spec 6 Nov 2006 17:58:49 -0000 1.14 @@ -1,6 +1,6 @@ Name: dnsmasq -Version: 2.34 -Release: 2%{?dist} +Version: 2.35 +Release: 1%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%fedora" > "3" || "%aurora" > "2" @@ -39,6 +40,7 @@ %if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif +%patch2 -p1 %build make %{?_smp_mflags} @@ -78,8 +80,9 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface +%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%dir /etc/dnsmasq.d %if "%fedora" > "3" || "%aurora" > "2" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %endif @@ -89,6 +92,12 @@ %changelog +* Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-1 +- Update to 2.35 +- Removed UPGRADING_to_2.0 from %%doc as per upstream change +- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!) +- Added %%dir /etc/dnsmasq.d to %%files as per above RFE + * Tue Oct 24 2006 Patrick "Jima" Laughton 2.34-2 - Fixed BZ#212005 - Moved %%postun scriptlet to %%post, where it made more sense Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Oct 2006 18:09:19 -0000 1.6 +++ sources 6 Nov 2006 17:58:49 -0000 1.7 @@ -1 +1 @@ -a40b79bec295bb4631b1c033cf0bbdf1 dnsmasq-2.34.tar.gz +57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:01:50 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 6 Nov 2006 11:01:50 -0700 Subject: rpms/mftrace/FC-5 .cvsignore, 1.3, 1.4 mftrace.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200611061801.kA6I1odc005052@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/mftrace/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5001 Modified Files: .cvsignore mftrace.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 May 2006 06:12:39 -0000 1.3 +++ .cvsignore 6 Nov 2006 18:01:19 -0000 1.4 @@ -1 +1 @@ -mftrace-1.2.4.tar.gz +mftrace-1.2.5.tar.gz Index: mftrace.spec =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/mftrace.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mftrace.spec 20 May 2006 06:54:39 -0000 1.4 +++ mftrace.spec 6 Nov 2006 18:01:19 -0000 1.5 @@ -1,6 +1,6 @@ Name: mftrace -Version: 1.2.4 -Release: 2%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts Group: Applications/Publishing @@ -50,6 +50,9 @@ %changelog +* Mon Nov 6 2006 Quentin Spencer 1.2.5-1 +- New release. + * Sat May 20 2006 Quentin Spencer 1.2.4-2 - Make sure $RPM_OPT_FLAGS are used Index: sources =================================================================== RCS file: /cvs/extras/rpms/mftrace/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 May 2006 06:12:39 -0000 1.3 +++ sources 6 Nov 2006 18:01:19 -0000 1.4 @@ -1 +1 @@ -8abde3284dc7dc25c829bd4262f836ee mftrace-1.2.4.tar.gz +c74c812e4e7f63f63376a13b792249da mftrace-1.2.5.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:04:57 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Mon, 6 Nov 2006 11:04:57 -0700 Subject: rpms/bzr/FC-6 .cvsignore, 1.7, 1.8 bzr.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200611061804.kA6I4vWS005127@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/bzr/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5107 Modified Files: .cvsignore bzr.spec sources Log Message: - Update to 0.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Oct 2006 04:22:09 -0000 1.7 +++ .cvsignore 6 Nov 2006 18:04:27 -0000 1.8 @@ -1 +1 @@ -bzr-0.11.tar.gz +bzr-0.12.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-6/bzr.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bzr.spec 9 Oct 2006 04:22:09 -0000 1.10 +++ bzr.spec 6 Nov 2006 18:04:27 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.11 +Version: 0.12 Release: 1%{?dist} Summary: Friendly distributed version control system @@ -158,6 +158,9 @@ %{python_sitelib}/bzrlib/tests/* %changelog +* Thu Oct 30 2006 Toshio Kuratomi 0.12-1 +- Update to 0.12 + * Thu Oct 08 2006 Toshio Kuratomi 0.11-1 - Update to 0.11 - New download location. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Oct 2006 04:22:09 -0000 1.7 +++ sources 6 Nov 2006 18:04:27 -0000 1.8 @@ -1 +1 @@ -94fced266d6da6ed298e4738ca7414e0 bzr-0.11.tar.gz +68bf4e425a93bdf5961af9c3c35229bf bzr-0.12.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:08:45 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 6 Nov 2006 11:08:45 -0700 Subject: rpms/dnsmasq/devel dnsmasq.spec,1.14,1.15 Message-ID: <200611061808.kA6I8jHM005254@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5204 Modified Files: dnsmasq.spec Log Message: * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 - Stop creating /etc/sysconfig on %%install - Create /etc/dnsmasq.d on %%install Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dnsmasq.spec 6 Nov 2006 17:58:49 -0000 1.14 +++ dnsmasq.spec 6 Nov 2006 18:08:15 -0000 1.15 @@ -1,6 +1,6 @@ Name: dnsmasq Version: 2.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight DHCP/caching DNS server Group: System Environment/Daemons @@ -51,7 +51,7 @@ # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ $RPM_BUILD_ROOT%{_mandir}/man8 \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf @@ -92,6 +92,10 @@ %changelog +* Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 +- Stop creating /etc/sysconfig on %%install +- Create /etc/dnsmasq.d on %%install + * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-1 - Update to 2.35 - Removed UPGRADING_to_2.0 from %%doc as per upstream change From fedora-extras-commits at redhat.com Mon Nov 6 18:26:02 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 6 Nov 2006 11:26:02 -0700 Subject: rpms/dnsmasq/FC-6 dnsmasq-2.35-conf-dir.patch, NONE, 1.1 dnsmasq.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200611061826.kA6IQ2Ca005448@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5421 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.35-conf-dir.patch Log Message: * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 - Stop creating /etc/sysconfig on %%install - Create /etc/dnsmasq.d on %%install * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-1 - Update to 2.35 - Removed UPGRADING_to_2.0 from %%doc as per upstream change - Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!) - Added %%dir /etc/dnsmasq.d to %%files as per above RFE dnsmasq-2.35-conf-dir.patch: --- NEW FILE dnsmasq-2.35-conf-dir.patch --- diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example --- dnsmasq-2.35/dnsmasq.conf.example 2006-10-18 15:24:50.000000000 -0500 +++ dnsmasq-2.35-patched/dnsmasq.conf.example 2006-11-06 11:46:38.000000000 -0600 @@ -382,4 +382,4 @@ # Include a another lot of configuration options. #conf-file=/etc/dnsmasq.more.conf -#conf-dir=/etc/dnsmasq.d +conf-dir=/etc/dnsmasq.d Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-6/dnsmasq.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dnsmasq.spec 24 Oct 2006 16:37:10 -0000 1.13 +++ dnsmasq.spec 6 Nov 2006 18:25:32 -0000 1.14 @@ -1,5 +1,5 @@ Name: dnsmasq -Version: 2.34 +Version: 2.35 Release: 2%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%fedora" > "3" || "%aurora" > "2" @@ -39,6 +40,7 @@ %if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif +%patch2 -p1 %build make %{?_smp_mflags} @@ -49,7 +51,7 @@ # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ $RPM_BUILD_ROOT%{_mandir}/man8 \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf @@ -78,8 +80,9 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface +%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%dir /etc/dnsmasq.d %if "%fedora" > "3" || "%aurora" > "2" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %endif @@ -89,6 +92,16 @@ %changelog +* Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 +- Stop creating /etc/sysconfig on %%install +- Create /etc/dnsmasq.d on %%install + +* Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-1 +- Update to 2.35 +- Removed UPGRADING_to_2.0 from %%doc as per upstream change +- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!) +- Added %%dir /etc/dnsmasq.d to %%files as per above RFE + * Tue Oct 24 2006 Patrick "Jima" Laughton 2.34-2 - Fixed BZ#212005 - Moved %%postun scriptlet to %%post, where it made more sense Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Oct 2006 18:09:19 -0000 1.6 +++ sources 6 Nov 2006 18:25:32 -0000 1.7 @@ -1 +1 @@ -a40b79bec295bb4631b1c033cf0bbdf1 dnsmasq-2.34.tar.gz +57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:29:51 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Mon, 6 Nov 2006 11:29:51 -0700 Subject: rpms/bzr/FC-5 .cvsignore, 1.7, 1.8 bzr.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200611061829.kA6ITp77005543@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/bzr/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5512 Modified Files: .cvsignore bzr.spec sources Log Message: - Update to 0.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Oct 2006 04:34:22 -0000 1.7 +++ .cvsignore 6 Nov 2006 18:29:21 -0000 1.8 @@ -1 +1 @@ -bzr-0.11.tar.gz +bzr-0.12.tar.gz Index: bzr.spec =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/bzr.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bzr.spec 9 Oct 2006 04:34:22 -0000 1.10 +++ bzr.spec 6 Nov 2006 18:29:21 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.11 +Version: 0.12 Release: 1%{?dist} Summary: Friendly distributed version control system @@ -158,6 +158,9 @@ %{python_sitelib}/bzrlib/tests/* %changelog +* Thu Oct 30 2006 Toshio Kuratomi 0.12-1 +- Update to 0.12 + * Thu Oct 08 2006 Toshio Kuratomi 0.11-1 - Update to 0.11 - New download location. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzr/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Oct 2006 04:34:22 -0000 1.7 +++ sources 6 Nov 2006 18:29:21 -0000 1.8 @@ -1 +1 @@ -94fced266d6da6ed298e4738ca7414e0 bzr-0.11.tar.gz +68bf4e425a93bdf5961af9c3c35229bf bzr-0.12.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:30:49 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 6 Nov 2006 11:30:49 -0700 Subject: rpms/perl-Class-MOP Makefile,1.2,1.3 Message-ID: <200611061830.kA6IUn2b005645@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5568 Modified Files: Makefile Log Message: update to 0.36 Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 4 Oct 2006 04:13:51 -0000 1.2 +++ Makefile 6 Nov 2006 18:30:18 -0000 1.3 @@ -2,12 +2,14 @@ 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 WARNING: building for devel and FC-5 + @echo NOTICE: building for ${BRANCHES} @sleep 5s - @cd FC-5 && test -f dead.package || ( make tag && make plague ) - @cd devel && test -f dead.package || ( make tag && make plague ) + @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 Mon Nov 6 18:30:49 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 6 Nov 2006 11:30:49 -0700 Subject: rpms/perl-Class-MOP/FC-5 perl-Class-MOP.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611061830.kA6IUn1i005649@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5568/FC-5 Modified Files: perl-Class-MOP.spec sources Log Message: update to 0.36 Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-5/perl-Class-MOP.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-MOP.spec 4 Oct 2006 04:13:51 -0000 1.3 +++ perl-Class-MOP.spec 6 Nov 2006 18:30:19 -0000 1.4 @@ -1,7 +1,7 @@ Name: perl-Class-MOP -Version: 0.35 +Version: 0.36 Release: 1%{?dist} -Summary: Class::MOP Perl module +Summary: Metaobject programming model for Perl License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-MOP/ @@ -57,6 +57,10 @@ %{_mandir}/man3/* %changelog +* Mon Nov 06 2006 Chris Weyl 0.36-1 +- update to 0.36 +- update summary tag + * Tue Oct 03 2006 Chris Weyl 0.35-1 - update to 0.35 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 04:13:51 -0000 1.3 +++ sources 6 Nov 2006 18:30:19 -0000 1.4 @@ -1 +1 @@ -967208472643a15cfee9704b6ecb03eb Class-MOP-0.35.tar.gz +f46c6cedd8d88f081be0547d1775baf0 Class-MOP-0.36.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:30:56 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 6 Nov 2006 11:30:56 -0700 Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.3, 1.4 perl-Class-MOP.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611061830.kA6IUuaW005663@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5568/devel Modified Files: .cvsignore perl-Class-MOP.spec sources Log Message: update to 0.36 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Oct 2006 04:13:57 -0000 1.3 +++ .cvsignore 6 Nov 2006 18:30:25 -0000 1.4 @@ -1 +1 @@ -Class-MOP-0.35.tar.gz +Class-MOP-0.36.tar.gz Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-MOP.spec 4 Oct 2006 04:13:57 -0000 1.3 +++ perl-Class-MOP.spec 6 Nov 2006 18:30:25 -0000 1.4 @@ -1,7 +1,7 @@ Name: perl-Class-MOP -Version: 0.35 +Version: 0.36 Release: 1%{?dist} -Summary: Class::MOP Perl module +Summary: Metaobject programming model for Perl License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-MOP/ @@ -57,6 +57,10 @@ %{_mandir}/man3/* %changelog +* Mon Nov 06 2006 Chris Weyl 0.36-1 +- update to 0.36 +- update summary tag + * Tue Oct 03 2006 Chris Weyl 0.35-1 - update to 0.35 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 04:13:57 -0000 1.3 +++ sources 6 Nov 2006 18:30:25 -0000 1.4 @@ -1 +1 @@ -967208472643a15cfee9704b6ecb03eb Class-MOP-0.35.tar.gz +f46c6cedd8d88f081be0547d1775baf0 Class-MOP-0.36.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:30:50 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 6 Nov 2006 11:30:50 -0700 Subject: rpms/perl-Class-MOP/FC-6 perl-Class-MOP.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611061830.kA6IUo4g005655@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-MOP/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5568/FC-6 Modified Files: perl-Class-MOP.spec sources Log Message: update to 0.36 Index: perl-Class-MOP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-6/perl-Class-MOP.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Class-MOP.spec 4 Oct 2006 04:13:57 -0000 1.3 +++ perl-Class-MOP.spec 6 Nov 2006 18:30:20 -0000 1.4 @@ -1,7 +1,7 @@ Name: perl-Class-MOP -Version: 0.35 +Version: 0.36 Release: 1%{?dist} -Summary: Class::MOP Perl module +Summary: Metaobject programming model for Perl License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Class-MOP/ @@ -57,6 +57,10 @@ %{_mandir}/man3/* %changelog +* Mon Nov 06 2006 Chris Weyl 0.36-1 +- update to 0.36 +- update summary tag + * Tue Oct 03 2006 Chris Weyl 0.35-1 - update to 0.35 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 04:13:57 -0000 1.3 +++ sources 6 Nov 2006 18:30:20 -0000 1.4 @@ -1 +1 @@ -967208472643a15cfee9704b6ecb03eb Class-MOP-0.35.tar.gz +f46c6cedd8d88f081be0547d1775baf0 Class-MOP-0.36.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:32:57 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Mon, 6 Nov 2006 11:32:57 -0700 Subject: rpms/bzrtools/FC-6 .cvsignore, 1.6, 1.7 bzrtools.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200611061832.kA6IWvw5005846@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/bzrtools/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5821 Modified Files: .cvsignore bzrtools.spec sources Log Message: - Update to 0.12.2 - The push command was renamed to rspush. Update the %description to match. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Oct 2006 04:36:29 -0000 1.6 +++ .cvsignore 6 Nov 2006 18:32:27 -0000 1.7 @@ -1 +1 @@ -bzrtools-0.11.0.tar.gz +bzrtools-0.12.2.tar.gz Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-6/bzrtools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bzrtools.spec 9 Oct 2006 04:36:29 -0000 1.10 +++ bzrtools.spec 6 Nov 2006 18:32:27 -0000 1.11 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzrtools -Version: 0.11.0 +Version: 0.12.2 Release: 1%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG @@ -19,7 +19,7 @@ %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included plugins are: -* push - uses rsync to push local changes to a remote server +* rspush - uses rsync to push local changes to a remote server * annotate - prints a file annotated with the revision next to each line * baz-import - (Requres PyBaz) import an arch archive losslessly into bzr * shelve/unshelve - allows you to undo some changes, commit, and restore @@ -30,7 +30,7 @@ %prep -%setup -q +%setup -q -n %{name} %build @@ -43,6 +43,8 @@ # remove shebangs from all files as none should be executable scripts sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py +# No need to ship the tests +rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/bzrtools/tests/ %clean rm -rf $RPM_BUILD_ROOT @@ -57,6 +59,10 @@ %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo %changelog +* Thu Oct 05 2006 Toshio Kuratomi 0.12.2-1 +- Update to 0.12.2 +- The push command was renamed to rspush. Update the %%description to match. + * Thu Oct 05 2006 Toshio Kuratomi 0.11.0-1 - Update to 0.11.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Oct 2006 04:36:29 -0000 1.6 +++ sources 6 Nov 2006 18:32:27 -0000 1.7 @@ -1 +1 @@ -8d34615bafbd40518e75509e7d3a8c04 bzrtools-0.11.0.tar.gz +3653679f3295deca085811e54da2b6fa bzrtools-0.12.2.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:35:58 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 6 Nov 2006 11:35:58 -0700 Subject: rpms/lilypond/FC-6 .cvsignore, 1.5, 1.6 lilypond.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200611061835.kA6IZwac005892@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5869 Modified Files: .cvsignore lilypond.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Oct 2006 21:47:48 -0000 1.5 +++ .cvsignore 6 Nov 2006 18:35:28 -0000 1.6 @@ -1 +1 @@ -lilypond-2.8.7.tar.gz +lilypond-2.8.8.tar.gz Index: lilypond.spec =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-6/lilypond.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lilypond.spec 9 Oct 2006 21:47:48 -0000 1.5 +++ lilypond.spec 6 Nov 2006 18:35:28 -0000 1.6 @@ -1,5 +1,5 @@ Name: lilypond -Version: 2.8.7 +Version: 2.8.8 Release: 1%{?dist} Summary: A typesetting system for music notation @@ -89,6 +89,9 @@ %changelog +* Fri Nov 3 2006 Quentin Spencer 2.8.8-1 +- New release. + * Mon Oct 9 2006 Quentin Spencer 2.8.7-1 - New release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Oct 2006 21:47:48 -0000 1.5 +++ sources 6 Nov 2006 18:35:28 -0000 1.6 @@ -1 +1 @@ -f2513f545adb211a256c21cc6b28ab3a lilypond-2.8.7.tar.gz +2fe58ff2fcbc848def46ef287a693189 lilypond-2.8.8.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:38:21 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 6 Nov 2006 11:38:21 -0700 Subject: rpms/lilypond/FC-5 .cvsignore, 1.5, 1.6 lilypond.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200611061838.kA6IcLoh005975@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/lilypond/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5955 Modified Files: .cvsignore lilypond.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Oct 2006 21:50:10 -0000 1.5 +++ .cvsignore 6 Nov 2006 18:37:50 -0000 1.6 @@ -1 +1 @@ -lilypond-2.8.7.tar.gz +lilypond-2.8.8.tar.gz Index: lilypond.spec =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-5/lilypond.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lilypond.spec 9 Oct 2006 21:50:10 -0000 1.7 +++ lilypond.spec 6 Nov 2006 18:37:50 -0000 1.8 @@ -1,5 +1,5 @@ Name: lilypond -Version: 2.8.7 +Version: 2.8.8 Release: 1%{?dist} Summary: A typesetting system for music notation @@ -89,6 +89,9 @@ %changelog +* Mon Nov 6 2006 Quentin Spencer 2.8.8-1 +- New release. + * Mon Oct 9 2006 Quentin Spencer 2.8.7-1 - New release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lilypond/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Oct 2006 21:50:10 -0000 1.5 +++ sources 6 Nov 2006 18:37:50 -0000 1.6 @@ -1 +1 @@ -f2513f545adb211a256c21cc6b28ab3a lilypond-2.8.7.tar.gz +2fe58ff2fcbc848def46ef287a693189 lilypond-2.8.8.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:49:57 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 6 Nov 2006 11:49:57 -0700 Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.5,1.6 sources,1.4,1.5 Message-ID: <200611061849.kA6InvKU006117@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Moose/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067/FC-5 Modified Files: perl-Moose.spec sources Log Message: update to 0.15 Index: perl-Moose.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Moose.spec 10 Oct 2006 15:53:45 -0000 1.5 +++ perl-Moose.spec 6 Nov 2006 18:49:27 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Moose -Version: 0.14 +Version: 0.15 Release: 1%{?dist} Summary: Complete modern object system for Perl 5 License: GPL or Artistic @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Class::MOP) >= 0.34 +BuildRequires: perl(Class::MOP) >= 0.36 BuildRequires: perl(Module::Build) BuildRequires: perl(Sub::Exporter) >= 0.954 BuildRequires: perl(Sub::Install) >= 0.92 @@ -75,6 +75,9 @@ %{_mandir}/man3/* %changelog +* Mon Nov 06 2006 Chris Weyl 0.15-1 +- update to 0.15 + * Tue Oct 10 2006 Chris Weyl 0.14-1 - update to 0.14 - drop some cruft from the specfile Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Oct 2006 15:46:56 -0000 1.4 +++ sources 6 Nov 2006 18:49:27 -0000 1.5 @@ -1 +1 @@ -78839b212fb9712c37e60588042fc829 Moose-0.14.tar.gz +0249590cebe735f6abea29399cfdf2a4 Moose-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:49:58 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 6 Nov 2006 11:49:58 -0700 Subject: rpms/perl-Moose/FC-6 perl-Moose.spec,1.5,1.6 sources,1.4,1.5 Message-ID: <200611061849.kA6InwBE006121@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Moose/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067/FC-6 Modified Files: perl-Moose.spec sources Log Message: update to 0.15 Index: perl-Moose.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/FC-6/perl-Moose.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Moose.spec 10 Oct 2006 15:53:46 -0000 1.5 +++ perl-Moose.spec 6 Nov 2006 18:49:27 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Moose -Version: 0.14 +Version: 0.15 Release: 1%{?dist} Summary: Complete modern object system for Perl 5 License: GPL or Artistic @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Class::MOP) >= 0.34 +BuildRequires: perl(Class::MOP) >= 0.36 BuildRequires: perl(Module::Build) BuildRequires: perl(Sub::Exporter) >= 0.954 BuildRequires: perl(Sub::Install) >= 0.92 @@ -75,6 +75,9 @@ %{_mandir}/man3/* %changelog +* Mon Nov 06 2006 Chris Weyl 0.15-1 +- update to 0.15 + * Tue Oct 10 2006 Chris Weyl 0.14-1 - update to 0.14 - drop some cruft from the specfile Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Oct 2006 15:46:56 -0000 1.4 +++ sources 6 Nov 2006 18:49:27 -0000 1.5 @@ -1 +1 @@ -78839b212fb9712c37e60588042fc829 Moose-0.14.tar.gz +0249590cebe735f6abea29399cfdf2a4 Moose-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:49:58 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Mon, 6 Nov 2006 11:49:58 -0700 Subject: rpms/perl-Moose/devel .cvsignore, 1.4, 1.5 perl-Moose.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200611061849.kA6InwRY006126@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Moose/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067/devel Modified Files: .cvsignore perl-Moose.spec sources Log Message: update to 0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Oct 2006 15:46:56 -0000 1.4 +++ .cvsignore 6 Nov 2006 18:49:28 -0000 1.5 @@ -1 +1 @@ -Moose-0.14.tar.gz +Moose-0.15.tar.gz Index: perl-Moose.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Moose.spec 10 Oct 2006 15:53:46 -0000 1.5 +++ perl-Moose.spec 6 Nov 2006 18:49:28 -0000 1.6 @@ -1,5 +1,5 @@ Name: perl-Moose -Version: 0.14 +Version: 0.15 Release: 1%{?dist} Summary: Complete modern object system for Perl 5 License: GPL or Artistic @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Class::MOP) >= 0.34 +BuildRequires: perl(Class::MOP) >= 0.36 BuildRequires: perl(Module::Build) BuildRequires: perl(Sub::Exporter) >= 0.954 BuildRequires: perl(Sub::Install) >= 0.92 @@ -75,6 +75,9 @@ %{_mandir}/man3/* %changelog +* Mon Nov 06 2006 Chris Weyl 0.15-1 +- update to 0.15 + * Tue Oct 10 2006 Chris Weyl 0.14-1 - update to 0.14 - drop some cruft from the specfile Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Oct 2006 15:46:56 -0000 1.4 +++ sources 6 Nov 2006 18:49:28 -0000 1.5 @@ -1 +1 @@ -78839b212fb9712c37e60588042fc829 Moose-0.14.tar.gz +0249590cebe735f6abea29399cfdf2a4 Moose-0.15.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 18:51:43 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Mon, 6 Nov 2006 11:51:43 -0700 Subject: rpms/bzrtools/devel bzrtools.spec,1.11,1.12 Message-ID: <200611061851.kA6IphLG006155@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/bzrtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6139 Modified Files: bzrtools.spec Log Message: - Add the tests directory as bzr has an undocumented "selftest" subcommand that relies on them. Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bzrtools.spec 6 Nov 2006 17:41:18 -0000 1.11 +++ bzrtools.spec 6 Nov 2006 18:51:13 -0000 1.12 @@ -2,7 +2,7 @@ Name: bzrtools Version: 0.12.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -43,9 +43,6 @@ # remove shebangs from all files as none should be executable scripts sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py -# No need to ship the tests -rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/bzrtools/tests/ - %clean rm -rf $RPM_BUILD_ROOT @@ -57,8 +54,13 @@ %{python_sitelib}/bzrlib/plugins/bzrtools/*.py %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo +%{python_sitelib}/bzrlib/plugins/bzrtools/tests/ %changelog +* Mon Nov 06 2006 Toshio Kuratomi 0.12.2-2 +- Add the tests directory as bzr has an undocumented "selftest" subcommand + that relies on them. + * Thu Oct 05 2006 Toshio Kuratomi 0.12.2-1 - Update to 0.12.2 - The push command was renamed to rspush. Update the %%description to match. From fedora-extras-commits at redhat.com Mon Nov 6 18:55:29 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Mon, 6 Nov 2006 11:55:29 -0700 Subject: rpms/bzrtools/FC-6 bzrtools.spec,1.11,1.12 Message-ID: <200611061855.kA6ItTxX006416@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/bzrtools/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6400 Modified Files: bzrtools.spec Log Message: - Add the tests directory as bzr has an undocumented "selftest" subcommand that relies on them. Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-6/bzrtools.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bzrtools.spec 6 Nov 2006 18:32:27 -0000 1.11 +++ bzrtools.spec 6 Nov 2006 18:54:59 -0000 1.12 @@ -2,7 +2,7 @@ Name: bzrtools Version: 0.12.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -43,9 +43,6 @@ # remove shebangs from all files as none should be executable scripts sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py -# No need to ship the tests -rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/bzrtools/tests/ - %clean rm -rf $RPM_BUILD_ROOT @@ -57,8 +54,13 @@ %{python_sitelib}/bzrlib/plugins/bzrtools/*.py %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo +%{python_sitelib}/bzrlib/plugins/bzrtools/tests/ %changelog +* Mon Nov 06 2006 Toshio Kuratomi 0.12.2-2 +- Add the tests directory as bzr has an undocumented "selftest" subcommand + that relies on them. + * Thu Oct 05 2006 Toshio Kuratomi 0.12.2-1 - Update to 0.12.2 - The push command was renamed to rspush. Update the %%description to match. From fedora-extras-commits at redhat.com Mon Nov 6 18:59:50 2006 From: fedora-extras-commits at redhat.com (Patrick Laughton (jima)) Date: Mon, 6 Nov 2006 11:59:50 -0700 Subject: rpms/dnsmasq/FC-5 dnsmasq-2.35-conf-dir.patch, NONE, 1.1 dnsmasq.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200611061859.kA6IxoOA006505@cvs-int.fedora.redhat.com> Author: jima Update of /cvs/extras/rpms/dnsmasq/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6480 Modified Files: dnsmasq.spec sources Added Files: dnsmasq-2.35-conf-dir.patch Log Message: * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 - Stop creating /etc/sysconfig on %%install - Create /etc/dnsmasq.d on %%install * Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-1 - Update to 2.35 - Removed UPGRADING_to_2.0 from %%doc as per upstream change - Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!) - Added %%dir /etc/dnsmasq.d to %%files as per above RFE dnsmasq-2.35-conf-dir.patch: --- NEW FILE dnsmasq-2.35-conf-dir.patch --- diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example --- dnsmasq-2.35/dnsmasq.conf.example 2006-10-18 15:24:50.000000000 -0500 +++ dnsmasq-2.35-patched/dnsmasq.conf.example 2006-11-06 11:46:38.000000000 -0600 @@ -382,4 +382,4 @@ # Include a another lot of configuration options. #conf-file=/etc/dnsmasq.more.conf -#conf-dir=/etc/dnsmasq.d +conf-dir=/etc/dnsmasq.d Index: dnsmasq.spec =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dnsmasq.spec 24 Oct 2006 16:39:09 -0000 1.8 +++ dnsmasq.spec 6 Nov 2006 18:59:20 -0000 1.9 @@ -1,5 +1,5 @@ Name: dnsmasq -Version: 2.34 +Version: 2.35 Release: 2%{?dist} Summary: A lightweight DHCP/caching DNS server @@ -9,6 +9,7 @@ Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch +Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if "%fedora" > "3" || "%aurora" > "2" @@ -39,6 +40,7 @@ %if "%fedora" > "3" || "%aurora" > "2" %patch1 -p1 %endif +%patch2 -p1 %build make %{?_smp_mflags} @@ -49,7 +51,7 @@ # normally i'd do 'make install'...it's a bit messy, though mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \ $RPM_BUILD_ROOT%{_mandir}/man8 \ - $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \ + $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \ $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf @@ -78,8 +80,9 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface +%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf +%dir /etc/dnsmasq.d %if "%fedora" > "3" || "%aurora" > "2" %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf %endif @@ -89,6 +92,16 @@ %changelog +* Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-2 +- Stop creating /etc/sysconfig on %%install +- Create /etc/dnsmasq.d on %%install + +* Mon Nov 06 2006 Patrick "Jima" Laughton 2.35-1 +- Update to 2.35 +- Removed UPGRADING_to_2.0 from %%doc as per upstream change +- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!) +- Added %%dir /etc/dnsmasq.d to %%files as per above RFE + * Tue Oct 24 2006 Patrick "Jima" Laughton 2.34-2 - Fixed BZ#212005 - Moved %%postun scriptlet to %%post, where it made more sense Index: sources =================================================================== RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Oct 2006 18:19:48 -0000 1.6 +++ sources 6 Nov 2006 18:59:20 -0000 1.7 @@ -1 +1 @@ -a40b79bec295bb4631b1c033cf0bbdf1 dnsmasq-2.34.tar.gz +57b8643dc394cf2fbd1bced64536c6df dnsmasq-2.35.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 19:08:40 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 6 Nov 2006 12:08:40 -0700 Subject: rpms/libopm - New directory Message-ID: <200611061908.kA6J8eP6009630@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/libopm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9626/libopm Log Message: Directory /cvs/extras/rpms/libopm added to the repository From fedora-extras-commits at redhat.com Mon Nov 6 19:08:46 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 6 Nov 2006 12:08:46 -0700 Subject: rpms/libopm/devel - New directory Message-ID: <200611061908.kA6J8kNB009644@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/libopm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9626/libopm/devel Log Message: Directory /cvs/extras/rpms/libopm/devel added to the repository From fedora-extras-commits at redhat.com Mon Nov 6 19:09:04 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 6 Nov 2006 12:09:04 -0700 Subject: rpms/libopm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611061909.kA6J94jf009675@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/libopm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9669 Added Files: Makefile import.log Log Message: Setup of module libopm --- NEW FILE Makefile --- # Top level Makefile for module libopm 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 Mon Nov 6 19:09:05 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 6 Nov 2006 12:09:05 -0700 Subject: rpms/libopm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611061909.kA6J95aP009697@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/libopm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9669/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libopm --- 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 Nov 6 19:10:06 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 6 Nov 2006 12:10:06 -0700 Subject: rpms/libopm import.log,1.1,1.2 Message-ID: <200611061910.kA6JA6eF009784@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/libopm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744 Modified Files: import.log Log Message: auto-import libopm-0.1-3.20050731cvs on branch devel from libopm-0.1-3.20050731cvs.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Nov 2006 19:09:04 -0000 1.1 +++ import.log 6 Nov 2006 19:09:36 -0000 1.2 @@ -0,0 +1 @@ +libopm-0_1-3_20050731cvs:HEAD:libopm-0.1-3.20050731cvs.src.rpm:1162840169 From fedora-extras-commits at redhat.com Mon Nov 6 19:10:07 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 6 Nov 2006 12:10:07 -0700 Subject: rpms/libopm/devel libopm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611061910.kA6JA7r5009788@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/libopm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744/devel Modified Files: .cvsignore sources Added Files: libopm.spec Log Message: auto-import libopm-0.1-3.20050731cvs on branch devel from libopm-0.1-3.20050731cvs.src.rpm --- NEW FILE libopm.spec --- Summary: Blitzed open proxy monitor library Name: libopm Version: 0.1 Release: 3.20050731cvs%{?dist} License: GPL Group: System Environment/Libraries URL: http://wiki.blitzed.org/BOPM # cvs -z3 -d:pserver:anon at cvs.blitzed.org:/ co -D "20050731 23:59" libopm # find libopm -type f -name .cvsignore -exec rm -f {} ';' # find libopm -type d -name CVS -exec rm -rf {} 2>/dev/null ';' # mv -f libopm libopm-$(grep AC_INIT libopm/configure.in | sed -e 's/.*\[\(.*\)\].*/\1/') Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description An open proxy detection library, developed by the blitzed IRC network team. Its original use was to detect open proxies running on clients connecting to various IRC servers, but it has evolved to become a generic open proxy detection library. %package devel Summary: Headers and development libraries for libopm Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The libopm-devel package contains the header files and libraries necessary for developing applications which use libopm. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Don't install any libtool .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc ChangeLog LICENSE %{_libdir}/%{name}.so.* %files devel %defattr(-,root,root) %doc doc/libopm-api.txt %{_includedir}/opm* %{_libdir}/%{name}.so %changelog * Mon Nov 06 2006 Robert Scheck 0.1-3.20050731cvs - Changes to match with Fedora Packaging Guidelines (#212894 #c2, #c3, #c6) * Tue Oct 03 2006 Robert Scheck 0.1-2.20050731cvs - Upgrade to CVS 20050731 * Fri May 05 2006 Robert Scheck 0.1-1.20030106cvs - Upgrade to CVS 20030106 (equals with libopm from BOPM 3.1.2) - Initial spec file for Fedora Core Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libopm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Nov 2006 19:09:05 -0000 1.1 +++ .cvsignore 6 Nov 2006 19:09:37 -0000 1.2 @@ -0,0 +1 @@ +libopm-0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libopm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Nov 2006 19:09:05 -0000 1.1 +++ sources 6 Nov 2006 19:09:37 -0000 1.2 @@ -0,0 +1 @@ +5537327b4e76bd2c5074996b16cad361 libopm-0.1.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 19:11:08 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Mon, 6 Nov 2006 12:11:08 -0700 Subject: owners owners.list,1.1894,1.1895 Message-ID: <200611061911.kA6JB8d5009854@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9829 Modified Files: owners.list Log Message: Added libopm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1894 retrieving revision 1.1895 diff -u -r1.1894 -r1.1895 --- owners.list 5 Nov 2006 18:32:14 -0000 1.1894 +++ owners.list 6 Nov 2006 19:10:38 -0000 1.1895 @@ -931,6 +931,7 @@ Fedora Extras|libopensync-plugin-kdepim|KDE plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-palm|Palm plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-python|Python plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +Fedora Extras|libopm|Blitzed open proxy monitor library|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org| Fedora Extras|libosip|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net Fedora Extras|libosip2|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xelerance.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Nov 6 19:16:27 2006 From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio)) Date: Mon, 6 Nov 2006 12:16:27 -0700 Subject: rpms/bzrtools/FC-5 .cvsignore, 1.6, 1.7 bzrtools.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200611061916.kA6JGRvO009931@cvs-int.fedora.redhat.com> Author: toshio Update of /cvs/extras/rpms/bzrtools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9906 Modified Files: .cvsignore bzrtools.spec sources Log Message: - Update to 0.12.2 - The push command was renamed to rspush. Update the %%description to match. - Add the tests directory as bzr has an undocumented "selftest" subcommand that relies on them. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Oct 2006 04:38:16 -0000 1.6 +++ .cvsignore 6 Nov 2006 19:15:56 -0000 1.7 @@ -1 +1 @@ -bzrtools-0.11.0.tar.gz +bzrtools-0.12.2.tar.gz Index: bzrtools.spec =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-5/bzrtools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bzrtools.spec 9 Oct 2006 04:38:16 -0000 1.8 +++ bzrtools.spec 6 Nov 2006 19:15:56 -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: bzrtools -Version: 0.11.0 -Release: 1%{?dist} +Version: 0.12.2 +Release: 2%{?dist} Summary: A collection of utilities and plugins for Bazaar-NG Group: Development/Tools @@ -19,7 +19,7 @@ %description BzrTools is a collection of plugins for Bazaar-NG (bzr). Among the included plugins are: -* push - uses rsync to push local changes to a remote server +* rspush - uses rsync to push local changes to a remote server * annotate - prints a file annotated with the revision next to each line * baz-import - (Requres PyBaz) import an arch archive losslessly into bzr * shelve/unshelve - allows you to undo some changes, commit, and restore @@ -30,7 +30,7 @@ %prep -%setup -q +%setup -q -n %{name} %build @@ -43,7 +43,6 @@ # remove shebangs from all files as none should be executable scripts sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py - %clean rm -rf $RPM_BUILD_ROOT @@ -55,8 +54,17 @@ %{python_sitelib}/bzrlib/plugins/bzrtools/*.py %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo +%{python_sitelib}/bzrlib/plugins/bzrtools/tests/ %changelog +* Mon Nov 06 2006 Toshio Kuratomi 0.12.2-2 +- Add the tests directory as bzr has an undocumented "selftest" subcommand + that relies on them. + +* Thu Oct 05 2006 Toshio Kuratomi 0.12.2-1 +- Update to 0.12.2 +- The push command was renamed to rspush. Update the %%description to match. + * Thu Oct 05 2006 Toshio Kuratomi 0.11.0-1 - Update to 0.11.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bzrtools/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Oct 2006 04:38:16 -0000 1.6 +++ sources 6 Nov 2006 19:15:56 -0000 1.7 @@ -1 +1 @@ -8d34615bafbd40518e75509e7d3a8c04 bzrtools-0.11.0.tar.gz +3653679f3295deca085811e54da2b6fa bzrtools-0.12.2.tar.gz From fedora-extras-commits at redhat.com Mon Nov 6 19:34:21 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 6 Nov 2006 12:34:21 -0700 Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.13,1.14 Message-ID: <200611061934.kA6JYLi5010247@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10229 Modified Files: Config_Extras.py Log Message: legacy do not offer ppc Index: Config_Extras.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Config_Extras.py 6 Nov 2006 15:24:59 -0000 1.13 +++ Config_Extras.py 6 Nov 2006 19:34:19 -0000 1.14 @@ -85,7 +85,8 @@ # For RepoSupport.py features. baserepos = { '3' : ['fedora-core','fedora-legacy-updates','fedora-extras'], - '4' : ['fedora-core','fedora-legacy-updates','fedora-extras'], + '4' : ['fedora-core','fedora-core-updates','fedora-extras'], +# '4' : ['fedora-core','fedora-legacy-updates','fedora-extras'], '5' : ['fedora-core','fedora-core-updates','fedora-extras'], '6' : ['fedora-core','fedora-core-updates','fedora-extras'], 'development' : ['fedora-core','fedora-extras'] From fedora-extras-commits at redhat.com Mon Nov 6 19:40:20 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 6 Nov 2006 12:40:20 -0700 Subject: rpms/rssowl/devel rssowl.script,1.8,1.9 rssowl.spec,1.16,1.17 Message-ID: <200611061940.kA6JeKXE010297@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/rssowl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10275 Modified Files: rssowl.script rssowl.spec Log Message: * Mon Nov 06 2006 Andrew Overholt 1.2.2-7 - Use copy-platform in %%{_libdir}. - Use SWT in new %%{_libdir} location. Index: rssowl.script =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rssowl.script 4 Oct 2006 14:00:51 -0000 1.8 +++ rssowl.script 6 Nov 2006 19:39:49 -0000 1.9 @@ -10,7 +10,7 @@ fi export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME -exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@" +exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@" Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- rssowl.spec 4 Oct 2006 15:04:50 -0000 1.16 +++ rssowl.spec 6 Nov 2006 19:39:49 -0000 1.17 @@ -1,6 +1,6 @@ %define name rssowl %define version 1.2.2 -%define release 6%{?dist} +%define release 7%{?dist} Name: %name Summary: An RSS, RDF and Atom Newsreader @@ -59,9 +59,10 @@ rm doc/mpl-v11.txt %build -build-jar-repository -p lib swt-gtk-3.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 +build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib +ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar lib cd src ant deploy_linux @@ -136,6 +137,10 @@ %{_libdir}/gcj/%{name} %changelog +* Mon Nov 06 2006 Andrew Overholt 1.2.2-7 +- Use copy-platform in %%{_libdir}. +- Use SWT in new %%{_libdir} location. + * Wed Oct 4 2006 Anthony Green - 1.2.2-6 - Fix build classpath. From fedora-extras-commits at redhat.com Mon Nov 6 19:43:59 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 6 Nov 2006 12:43:59 -0700 Subject: rpms/rssowl/devel rssowl.spec,1.17,1.18 Message-ID: <200611061943.kA6Jhx8g010367@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/rssowl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10351 Modified Files: rssowl.spec Log Message: Remove erroneous comment. Fixes still apply. Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- rssowl.spec 6 Nov 2006 19:39:49 -0000 1.17 +++ rssowl.spec 6 Nov 2006 19:43:29 -0000 1.18 @@ -138,7 +138,6 @@ %changelog * Mon Nov 06 2006 Andrew Overholt 1.2.2-7 -- Use copy-platform in %%{_libdir}. - Use SWT in new %%{_libdir} location. * Wed Oct 4 2006 Anthony Green - 1.2.2-6 From fedora-extras-commits at redhat.com Mon Nov 6 19:45:27 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 6 Nov 2006 12:45:27 -0700 Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.4,1.5 Message-ID: <200611061945.kA6JjRKY010405@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/eclipse-emf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10384 Modified Files: eclipse-emf.spec Log Message: * Mon Nov 06 2006 Andrew Overholt 2.2.1-3 - Use copy-platform in %%{_libdir}. - Add Requires(post,postun) for sub-packages using rebuild-gcj-db. Index: eclipse-emf.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eclipse-emf.spec 1 Nov 2006 02:02:15 -0000 1.4 +++ eclipse-emf.spec 6 Nov 2006 19:44:56 -0000 1.5 @@ -8,7 +8,7 @@ Summary: Eclipse Modeling Framework (EMF) Name: eclipse-emf Version: %{major}.%{minor}.%{micro} -Release: 2%{?dist} +Release: 3%{?dist} License: Eclipse Public License Group: System Environment/Libraries URL: http://www.eclipse.org/emf/ @@ -63,6 +63,10 @@ Summary: Eclipse EMF SDO Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +%if %{gcj_support} +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 +%endif %package sdo-sdk Summary: Eclipse EMF SDO Source (SDK) @@ -73,6 +77,10 @@ Summary: Eclipse EMF XSD Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +%if %{gcj_support} +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 +%endif %package xsd-sdk Summary: Eclipse EMF XSD Source (SDK) @@ -84,6 +92,10 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-xsd = %{version}-%{release} +%if %{gcj_support} +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 +%endif %package standalone Summary: Eclipse EMF Standalone @@ -144,7 +156,7 @@ homedir=$(cd home > /dev/null && pwd) # See comments in the script to understand this. -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform `pwd`/SDK %{eclipse_base} +/bin/sh -x %{_libdir}/eclipse/buildscripts/copy-platform `pwd`/SDK %{eclipse_base} SDK=$(cd SDK > /dev/null && pwd) # Build the EMF builder helper jars @@ -163,10 +175,7 @@ echo "" > build/assemble.org.eclipse.emf.build.ant.all.xml echo "" > build/package.org.eclipse.emf.build.ant.all.xml -java -cp %{eclipse_base}/startup.jar \ - -Duser.home=$homedir \ - -Dosgi.sharedConfiguration.area=$SDK/fragments/eclipse/configuration \ - org.eclipse.core.launcher.Main \ +eclipse \ -application org.eclipse.ant.core.antRunner \ -Dtype=plugin \ -Did=org.eclipse.emf.build.ant \ @@ -176,8 +185,7 @@ -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml pushd build/plugins/org.eclipse.emf.build.ant -java -cp /usr/share/eclipse/startup.jar \ - org.eclipse.core.launcher.Main \ +eclipse \ -application org.eclipse.ant.core.antRunner \ -f build.xml build.update.jar popd @@ -197,11 +205,8 @@ # Remove the bits of the SDK that we don't need rm SDK/features/org.eclipse.pde.source* rm SDK/features/org.eclipse.jdt.source* -rm SDK/features/org.eclipse.sdk* rm SDK/plugins/org.eclipse.pde.source* rm SDK/plugins/org.eclipse.jdt.source* -rm SDK/plugins/org.eclipse.jdt.doc* -rm SDK/plugins/org.eclipse.sdk* # This tomcat chicanery will be fixed in a future Eclipse SDK RPM mkdir SDK2 pushd SDK @@ -233,6 +238,11 @@ # some notes about what we're doing here: # +# -Dosgi.sharedConfiguration.area=: we can't use the binary launcher since it +# doesn't see the EMF helper plugins so we +# have to set this manually. If it ever +# changes in the Eclipse SDK, we'll need to +# change it here. # -Duser.home=$homedir: override java.home in the vm so that eclipse only adds files in the buildroot # -Dcomponent=sdk: the component of EMF we want to build # -DjavacFailOnError=true: fail if there is an error @@ -243,6 +253,7 @@ # -DskipFetch=true: don't fetch the sources # -DbaseExists=true: don't download the SDK, we want to use the one in $SDK java -cp $SDK/startup.jar \ + -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ -Duser.home=$homedir \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ @@ -317,6 +328,12 @@ rm -rf ${RPM_BUILD_ROOT} %if %{gcj_support} +%post +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi + %post sdo if [ -x %{_bindir}/rebuild-gcj-db ] then @@ -502,6 +519,10 @@ %doc %{_datadir}/java/emf/readme_standalone.html %changelog +* Mon Nov 06 2006 Andrew Overholt 2.2.1-3 +- Use copy-platform in %%{_libdir}. +- Add Requires(post,postun) for sub-packages using rebuild-gcj-db. + * Tue Oct 31 2006 Andrew Overholt 2.2.1-2 - Change usage of copy-platform to work with upcoming changes to SDK. - Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation. From fedora-extras-commits at redhat.com Mon Nov 6 19:46:14 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 6 Nov 2006 12:46:14 -0700 Subject: rpms/azureus/devel azureus.script,1.10,1.11 azureus.spec,1.38,1.39 Message-ID: <200611061946.kA6JkEeK010533@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/azureus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10411 Modified Files: azureus.script azureus.spec Log Message: * Mon Nov 06 2006 Andrew Overholt 2.5.0.0-9 - Use new swt jar location. Index: azureus.script =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- azureus.script 28 Oct 2006 14:15:55 -0000 1.10 +++ azureus.script 6 Nov 2006 19:45:44 -0000 1.11 @@ -15,4 +15,4 @@ done; popd > /dev/null 2>&1 -LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@" +LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:`build-classpath jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@" Index: azureus.spec =================================================================== RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- azureus.spec 28 Oct 2006 14:15:55 -0000 1.38 +++ azureus.spec 6 Nov 2006 19:45:44 -0000 1.39 @@ -2,7 +2,7 @@ Name: azureus Version: 2.5.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A BitTorrent Client Group: Applications/Internet @@ -101,8 +101,9 @@ %build mkdir -p build/libs -build-jar-repository -p build/libs jakarta-commons-cli swt-gtk-3.2 log4j gnu-crypto gtk2.8 glib0.2 +build-jar-repository -p build/libs jakarta-commons-cli log4j gnu-crypto gtk2.8 glib0.2 ln -s /usr/share/java/gcj-endorsed/bcprov-1.33.jar build/libs +ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar build/libs find ./ -name osx | xargs rm -r find ./ -name macosx | xargs rm -r find ./ -name [Ww]in32\* | xargs rm -r @@ -115,7 +116,7 @@ cd plugins/azplugins unzip -q %{SOURCE5} rm -f *.jar `find ./ -name \*class` -find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:. +find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:. find ./ -name \*java | xargs rm jar cvf azplugins_1.9.jar . cd ../.. @@ -124,7 +125,7 @@ cd plugins/bdcc unzip *.jar rm -f *.jar `find ./ -name \*class` -find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:. +find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:. find ./ -name \*java | xargs rm jar cvf bdcc_2.2.2.jar . cd ../.. @@ -206,6 +207,9 @@ %{_libdir}/gcj/* %changelog +* Mon Nov 06 2006 Andrew Overholt 2.5.0.0-9 +- Use new swt jar location. + * Sat Oct 28 2006 Anthony Green 2.5.0.0-8 - Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it will run on non-gcj java alternatives. From fedora-extras-commits at redhat.com Mon Nov 6 19:49:30 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 6 Nov 2006 12:49:30 -0700 Subject: rpms/eclipse-gef/devel eclipse-gef.spec,1.3,1.4 Message-ID: <200611061949.kA6JnUKZ010702@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/eclipse-gef/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10680 Modified Files: eclipse-gef.spec Log Message: * Mon Nov 06 2006 Andrew Overholt 3.2.1-3 - Use copy-platform in %%{_libdir}. - Use binary launcher rather than startup.jar to guard against future osgi.sharedConfiguration.area changes. Index: eclipse-gef.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-gef/devel/eclipse-gef.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-gef.spec 19 Oct 2006 20:34:09 -0000 1.3 +++ eclipse-gef.spec 6 Nov 2006 19:49:00 -0000 1.4 @@ -16,7 +16,7 @@ Summary: Graphical Editor Framework (GEF) plugin for Eclipse Name: %{eclipse_name}-gef Version: %{majmin}.%{micro} -Release: 2%{?dist} +Release: 3%{?dist} License: Eclipse Public License Group: System Environment/Libraries URL: http://www.eclipse.org/gef/ @@ -137,7 +137,7 @@ %build # See comments in the script to understand this. -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} +/bin/sh -x %{_libdir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} SDK=$(cd SDK > /dev/null && pwd) mkdir home @@ -156,9 +156,7 @@ # put the plugins that have just been built # -DskipFetch=true: don't fetch the sources # -DbaseExists=true: don't download the SDK, we want to use the one in $SDK -java -cp $SDK/startup.jar \ - -Duser.home=$homedir \ - org.eclipse.core.launcher.Main \ +eclipse \ -application org.eclipse.ant.core.antRunner \ -Dcomponent=sdk \ -DjavacFailOnError=true \ @@ -169,9 +167,7 @@ -DbaseExists=true # build the examples -java -cp $SDK/startup.jar \ - -Duser.home=$homedir \ - org.eclipse.core.launcher.Main \ +eclipse \ -application org.eclipse.ant.core.antRunner \ -Dcomponent=examples \ -DjavacFailOnError=true \ @@ -250,6 +246,11 @@ %endif %changelog +* Mon Nov 06 2006 Andrew Overholt 3.2.1-3 +- Use copy-platform in %%{_libdir}. +- Use binary launcher rather than startup.jar to guard against future + osgi.sharedConfiguration.area changes. + * Thu Oct 19 2006 Andrew Overholt 3.2.1-2 - Fix buildroot (don't know how the wrong one slipped in). From fedora-extras-commits at redhat.com Mon Nov 6 20:18:49 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Nov 2006 13:18:49 -0700 Subject: rpms/vala - New directory Message-ID: <200611062018.kA6KInpX013920@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/vala In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13916/vala Log Message: Directory /cvs/extras/rpms/vala added to the repository From fedora-extras-commits at redhat.com Mon Nov 6 20:18:54 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Nov 2006 13:18:54 -0700 Subject: rpms/vala/devel - New directory Message-ID: <200611062018.kA6KIsmw013934@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/vala/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13916/vala/devel Log Message: Directory /cvs/extras/rpms/vala/devel added to the repository From fedora-extras-commits at redhat.com Mon Nov 6 20:19:13 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Nov 2006 13:19:13 -0700 Subject: rpms/vala Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611062019.kA6KJD3T013965@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/vala In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13959 Added Files: Makefile import.log Log Message: Setup of module vala --- NEW FILE Makefile --- # Top level Makefile for module vala 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 Mon Nov 6 20:19:19 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Nov 2006 13:19:19 -0700 Subject: rpms/vala/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611062019.kA6KJJao013983@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/vala/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13959/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module vala --- 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 Nov 6 20:21:08 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Nov 2006 13:21:08 -0700 Subject: rpms/vala import.log,1.1,1.2 Message-ID: <200611062021.kA6KL8Ya014082@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/vala In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14033 Modified Files: import.log Log Message: auto-import vala-0.0.5-1 on branch devel from vala-0.0.5-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/vala/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Nov 2006 20:19:13 -0000 1.1 +++ import.log 6 Nov 2006 20:20:38 -0000 1.2 @@ -0,0 +1 @@ +vala-0_0_5-1:HEAD:vala-0.0.5-1.src.rpm:1162844430 From fedora-extras-commits at redhat.com Mon Nov 6 20:21:09 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Nov 2006 13:21:09 -0700 Subject: rpms/vala/devel vala.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611062021.kA6KL9P9014086@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/vala/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14033/devel Modified Files: .cvsignore sources Added Files: vala.spec Log Message: auto-import vala-0.0.5-1 on branch devel from vala-0.0.5-1.src.rpm --- NEW FILE vala.spec --- Name: vala Version: 0.0.5 Release: 1%{?dist} Summary: A modern programming language for GNOME Group: Development/Languages License: LGPL URL: http://vala.paldo.org/ Source0: http://www.paldo.org/vala/vala-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel flex bison #Requires: %description Vala is a new programming language that aims to bring modern programming language features to GNOME developers without imposing any additional runtime requirements and without using a different ABI compared to applications and libraries written in C. valac, the Vala compiler, is a self-hosting compiler that translates Vala source code into C source and header files. It uses the GObject type system to create classes and interfaces declared in the Vala source code. It's also planned to generate GIDL files when gobject- introspection is ready. The syntax of Vala is similar to C#, modified to better fit the GObject type system. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel Development files for %{name}. This is not necessary for using the %{name} compiler. %prep %setup -q %build %configure # Don't use rpath! sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libvala.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL NEWS README %{_bindir}/valac %{_datadir}/vala %{_libdir}/libvala.so.* %files devel %defattr(-,root,root,-) %{_includedir}/vala-1.0 %{_libdir}/libvala.so %{_libdir}/pkgconfig/vala-1.0.pc %changelog * Mon Nov 6 2006 Michel Salim - 0.0.5-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/vala/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Nov 2006 20:19:18 -0000 1.1 +++ .cvsignore 6 Nov 2006 20:20:38 -0000 1.2 @@ -0,0 +1 @@ +vala-0.0.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/vala/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Nov 2006 20:19:18 -0000 1.1 +++ sources 6 Nov 2006 20:20:38 -0000 1.2 @@ -0,0 +1 @@ +ec3c9b717c49bd4fb207d368fe296475 vala-0.0.5.tar.bz2 From fedora-extras-commits at redhat.com Mon Nov 6 20:21:32 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Nov 2006 13:21:32 -0700 Subject: owners owners.list,1.1895,1.1896 Message-ID: <200611062021.kA6KLWiF014120@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14024 Modified Files: owners.list Log Message: Added vala to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1895 retrieving revision 1.1896 diff -u -r1.1895 -r1.1896 --- owners.list 6 Nov 2006 19:10:38 -0000 1.1895 +++ owners.list 6 Nov 2006 20:21:02 -0000 1.1896 @@ -2297,6 +2297,7 @@ Fedora Extras|uuid|Universally Unique Identifier library|steve at silug.org|extras-qa at fedoraproject.org| Fedora Extras|uw-imap|UW Server daemons for IMAP and POP network mail protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|v2strip|ID3v2 tags remover|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bluekuja at ubuntu.com +Fedora Extras|vala|A modern programming language for GNOME|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Nov 6 20:36:37 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Mon, 6 Nov 2006 13:36:37 -0700 Subject: rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.2,1.3 Message-ID: <200611062036.kA6KabAb014270@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/eclipse-emf/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14253 Modified Files: eclipse-emf.spec Log Message: * Mon Nov 06 2006 Andrew Overholt 2.2.1-2 - Add Requires(post,postun) for sub-packages using rebuild-gcj-db. - Change usage of copy-platform to work with upcoming changes to SDK. Index: eclipse-emf.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-emf.spec 30 Oct 2006 17:53:31 -0000 1.2 +++ eclipse-emf.spec 6 Nov 2006 20:36:06 -0000 1.3 @@ -8,7 +8,7 @@ Summary: Eclipse Modeling Framework (EMF) Name: eclipse-emf Version: %{major}.%{minor}.%{micro} -Release: 1%{?dist} +Release: 3%{?dist} License: Eclipse Public License Group: System Environment/Libraries URL: http://www.eclipse.org/emf/ @@ -63,6 +63,10 @@ Summary: Eclipse EMF SDO Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +%if %{gcj_support} +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 +%endif %package sdo-sdk Summary: Eclipse EMF SDO Source (SDK) @@ -73,6 +77,10 @@ Summary: Eclipse EMF XSD Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +%if %{gcj_support} +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 +%endif %package xsd-sdk Summary: Eclipse EMF XSD Source (SDK) @@ -84,6 +92,10 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-xsd = %{version}-%{release} +%if %{gcj_support} +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 +%endif %package standalone Summary: Eclipse EMF Standalone @@ -144,7 +156,7 @@ homedir=$(cd home > /dev/null && pwd) # See comments in the script to understand this. -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} +/bin/sh -x %{eclipse_base}/buildscripts/copy-platform `pwd`/SDK %{eclipse_base} SDK=$(cd SDK > /dev/null && pwd) # Build the EMF builder helper jars @@ -163,9 +175,7 @@ echo "" > build/assemble.org.eclipse.emf.build.ant.all.xml echo "" > build/package.org.eclipse.emf.build.ant.all.xml -java -cp %{eclipse_base}/startup.jar \ - -Duser.home=$homedir \ - org.eclipse.core.launcher.Main \ +eclipse \ -application org.eclipse.ant.core.antRunner \ -Dtype=plugin \ -Did=org.eclipse.emf.build.ant \ @@ -175,8 +185,7 @@ -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml pushd build/plugins/org.eclipse.emf.build.ant -java -cp /usr/share/eclipse/startup.jar \ - org.eclipse.core.launcher.Main \ +eclipse \ -application org.eclipse.ant.core.antRunner \ -f build.xml build.update.jar popd @@ -196,11 +205,8 @@ # Remove the bits of the SDK that we don't need rm SDK/features/org.eclipse.pde.source* rm SDK/features/org.eclipse.jdt.source* -rm SDK/features/org.eclipse.sdk* rm SDK/plugins/org.eclipse.pde.source* rm SDK/plugins/org.eclipse.jdt.source* -rm SDK/plugins/org.eclipse.jdt.doc* -rm SDK/plugins/org.eclipse.sdk* # This tomcat chicanery will be fixed in a future Eclipse SDK RPM mkdir SDK2 pushd SDK @@ -316,6 +322,12 @@ rm -rf ${RPM_BUILD_ROOT} %if %{gcj_support} +%post +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi + %post sdo if [ -x %{_bindir}/rebuild-gcj-db ] then @@ -501,6 +513,10 @@ %doc %{_datadir}/java/emf/readme_standalone.html %changelog +* Mon Nov 06 2006 Andrew Overholt 2.2.1-2 +- Add Requires(post,postun) for sub-packages using rebuild-gcj-db. +- Change usage of copy-platform to work with upcoming changes to SDK. + * Thu Oct 19 2006 Andrew Overholt 2.2.1-1 - 2.2.1. - Add sdk package, fix up inter-dependencies to match upstream. From fedora-extras-commits at redhat.com Mon Nov 6 21:01:26 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Nov 2006 14:01:26 -0700 Subject: rpms/xmms/FC-6 xmms-1.2.10-pls-188603.patch, NONE, 1.1 xmms.sh, NONE, 1.1 xmms.spec, 1.25, 1.26 Message-ID: <200611062101.kA6L1QCw019233@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16224/FC-6 Modified Files: xmms.spec Added Files: xmms-1.2.10-pls-188603.patch xmms.sh Log Message: * Mon Nov 6 2006 Ville Skytt?? - 1:1.2.10-29 - Work around incompatibilities with the Composite X extension (#213172). - Apply upstream playlist randomization improvements (#188603). xmms-1.2.10-pls-188603.patch: --- NEW FILE xmms-1.2.10-pls-188603.patch --- diff -u -p -r1.84 -r1.85 --- xmms/xmms/playlist.c 2004/03/21 16:41:56 1.84 +++ xmms/xmms/playlist.c 2004/04/12 19:06:58 1.85 @@ -1633,14 +1640,14 @@ static GList *playlist_shuffle_list(GLis for (node = list, i = 0; i < len; node = g_list_next(node), i++) ptrs[i] = node; - j = random() % len; + j = (int)(random() / (RAND_MAX + 1.0) * len); list = ptrs[j]; ptrs[j]->next = NULL; ptrs[j] = ptrs[0]; for (i = 1; i < len; i++) { - j = random() % (len - i); + j = (int)(random() / (RAND_MAX + 1.0) * (len - i)); list->prev = ptrs[i + j]; ptrs[i + j]->next = list; list = ptrs[i + j]; diff -u -p -r1.88 -r1.89 --- xmms/xmms/playlist.c 2005/05/06 23:57:03 1.88 +++ xmms/xmms/playlist.c 2005/05/07 01:47:35 1.89 @@ -563,7 +563,7 @@ void playlist_play(void) /* If there are entries */ if (g_list_length(skinlist)) { /* Get a random value to select the skin to use */ - int randval = random() % (g_list_length(skinlist) + 1); + int randval = (gint)(random() / (RAND_MAX + 1.0) * (g_list_length(skinlist) + 1)); /* If the random value is 0, use the default skin */ /* Otherwise subtract 1 from the random value and */ /* select the skin */ --- NEW FILE xmms.sh --- #!/bin/sh # https://bugzilla.redhat.com/213172 if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/xmms "$@" else exec /usr/libexec/xmms "$@" fi Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/FC-6/xmms.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xmms.spec 28 Aug 2006 16:06:01 -0000 1.25 +++ xmms.spec 6 Nov 2006 21:00:56 -0000 1.26 @@ -1,6 +1,6 @@ Name: xmms Version: 1.2.10 -Release: 28%{?dist} +Release: 29%{?dist} Epoch: 1 Summary: The X MultiMedia System, a media player @@ -12,6 +12,7 @@ # $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2 # $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10 Source0: %{name}-%{version}.patched.tar.bz2 +Source1: xmms.sh Source2: xmms.xpm Source3: rh_mp3.c # http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9 @@ -29,6 +30,7 @@ Patch10: %{name}-alsa-backport.patch Patch11: %{name}-1.2.10-gcc4.patch Patch12: %{name}-1.2.10-crossfade-0.3.9.patch +Patch13: %{name}-1.2.10-pls-188603.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel @@ -109,6 +111,8 @@ %patch11 -p1 -b .gcc4 # Fix for crossfade >= 0.3.9 to work properly %patch12 -p1 -b .crossfade +# Randomize playlists better +%patch13 -p1 -b .pls # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure @@ -141,6 +145,15 @@ # On FC5 x86_64, some get created even though we pass --disable-static rm -f $RPM_BUILD_ROOT%{_libdir}/xmms/*/*.a +# https://bugzilla.redhat.com/213172 +for bin in xmms wmxmms ; do + install -Dpm 755 $RPM_BUILD_ROOT%{_bindir}/$bin \ + $RPM_BUILD_ROOT%{_libexecdir}/$bin + sed -e "s|/usr/libexec/xmms|%{_libexecdir}/$bin|" %{SOURCE1} > \ + $RPM_BUILD_ROOT%{_bindir}/$bin + chmod 755 $RPM_BUILD_ROOT%{_bindir}/$bin +done + # Link to the desktop menu entry included in redhat-menus install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications ln -s ../desktop-menu-patches/redhat-audio-player.desktop \ @@ -175,6 +188,8 @@ %doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README %{_bindir}/xmms %{_bindir}/wmxmms +%{_libexecdir}/xmms +%{_libexecdir}/wmxmms %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*x*/apps/xmms.xpm %{_datadir}/xmms/ @@ -208,6 +223,10 @@ %changelog +* Mon Nov 6 2006 Ville Skytt?? - 1:1.2.10-29 +- Work around incompatibilities with the Composite X extension (#213172). +- Apply upstream playlist randomization improvements (#188603). + * Mon Aug 28 2006 Ville Skytt?? - 1:1.2.10-28 - Rebuild. From fedora-extras-commits at redhat.com Mon Nov 6 21:01:29 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Nov 2006 14:01:29 -0700 Subject: rpms/xmms/devel xmms-1.2.10-pls-188603.patch, NONE, 1.1 xmms.sh, NONE, 1.1 xmms.spec, 1.25, 1.26 Message-ID: <200611062101.kA6L1TsD019236@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16224/devel Modified Files: xmms.spec Added Files: xmms-1.2.10-pls-188603.patch xmms.sh Log Message: * Mon Nov 6 2006 Ville Skytt?? - 1:1.2.10-29 - Work around incompatibilities with the Composite X extension (#213172). - Apply upstream playlist randomization improvements (#188603). xmms-1.2.10-pls-188603.patch: --- NEW FILE xmms-1.2.10-pls-188603.patch --- diff -u -p -r1.84 -r1.85 --- xmms/xmms/playlist.c 2004/03/21 16:41:56 1.84 +++ xmms/xmms/playlist.c 2004/04/12 19:06:58 1.85 @@ -1633,14 +1640,14 @@ static GList *playlist_shuffle_list(GLis for (node = list, i = 0; i < len; node = g_list_next(node), i++) ptrs[i] = node; - j = random() % len; + j = (int)(random() / (RAND_MAX + 1.0) * len); list = ptrs[j]; ptrs[j]->next = NULL; ptrs[j] = ptrs[0]; for (i = 1; i < len; i++) { - j = random() % (len - i); + j = (int)(random() / (RAND_MAX + 1.0) * (len - i)); list->prev = ptrs[i + j]; ptrs[i + j]->next = list; list = ptrs[i + j]; diff -u -p -r1.88 -r1.89 --- xmms/xmms/playlist.c 2005/05/06 23:57:03 1.88 +++ xmms/xmms/playlist.c 2005/05/07 01:47:35 1.89 @@ -563,7 +563,7 @@ void playlist_play(void) /* If there are entries */ if (g_list_length(skinlist)) { /* Get a random value to select the skin to use */ - int randval = random() % (g_list_length(skinlist) + 1); + int randval = (gint)(random() / (RAND_MAX + 1.0) * (g_list_length(skinlist) + 1)); /* If the random value is 0, use the default skin */ /* Otherwise subtract 1 from the random value and */ /* select the skin */ --- NEW FILE xmms.sh --- #!/bin/sh # https://bugzilla.redhat.com/213172 if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/xmms "$@" else exec /usr/libexec/xmms "$@" fi Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xmms.spec 28 Aug 2006 16:06:01 -0000 1.25 +++ xmms.spec 6 Nov 2006 21:00:57 -0000 1.26 @@ -1,6 +1,6 @@ Name: xmms Version: 1.2.10 -Release: 28%{?dist} +Release: 29%{?dist} Epoch: 1 Summary: The X MultiMedia System, a media player @@ -12,6 +12,7 @@ # $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2 # $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10 Source0: %{name}-%{version}.patched.tar.bz2 +Source1: xmms.sh Source2: xmms.xpm Source3: rh_mp3.c # http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9 @@ -29,6 +30,7 @@ Patch10: %{name}-alsa-backport.patch Patch11: %{name}-1.2.10-gcc4.patch Patch12: %{name}-1.2.10-crossfade-0.3.9.patch +Patch13: %{name}-1.2.10-pls-188603.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel @@ -109,6 +111,8 @@ %patch11 -p1 -b .gcc4 # Fix for crossfade >= 0.3.9 to work properly %patch12 -p1 -b .crossfade +# Randomize playlists better +%patch13 -p1 -b .pls # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure @@ -141,6 +145,15 @@ # On FC5 x86_64, some get created even though we pass --disable-static rm -f $RPM_BUILD_ROOT%{_libdir}/xmms/*/*.a +# https://bugzilla.redhat.com/213172 +for bin in xmms wmxmms ; do + install -Dpm 755 $RPM_BUILD_ROOT%{_bindir}/$bin \ + $RPM_BUILD_ROOT%{_libexecdir}/$bin + sed -e "s|/usr/libexec/xmms|%{_libexecdir}/$bin|" %{SOURCE1} > \ + $RPM_BUILD_ROOT%{_bindir}/$bin + chmod 755 $RPM_BUILD_ROOT%{_bindir}/$bin +done + # Link to the desktop menu entry included in redhat-menus install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications ln -s ../desktop-menu-patches/redhat-audio-player.desktop \ @@ -175,6 +188,8 @@ %doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README %{_bindir}/xmms %{_bindir}/wmxmms +%{_libexecdir}/xmms +%{_libexecdir}/wmxmms %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*x*/apps/xmms.xpm %{_datadir}/xmms/ @@ -208,6 +223,10 @@ %changelog +* Mon Nov 6 2006 Ville Skytt?? - 1:1.2.10-29 +- Work around incompatibilities with the Composite X extension (#213172). +- Apply upstream playlist randomization improvements (#188603). + * Mon Aug 28 2006 Ville Skytt?? - 1:1.2.10-28 - Rebuild. From fedora-extras-commits at redhat.com Mon Nov 6 22:12:44 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Mon, 6 Nov 2006 15:12:44 -0700 Subject: rpms/sword/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200611062212.kA6MCiEJ024722@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/sword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24697 Modified Files: .cvsignore sources Log Message: Replace sword-src.rpm with sword tarball Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sword/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Oct 2006 18:57:47 -0000 1.3 +++ .cvsignore 6 Nov 2006 22:12:14 -0000 1.4 @@ -1 +1 @@ -sword-1.5.9-1.src.rpm +sword-1.5.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/sword/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Oct 2006 18:57:47 -0000 1.3 +++ sources 6 Nov 2006 22:12:14 -0000 1.4 @@ -1 +1 @@ -2718a640384bf378fc8d229514f8abbd sword-1.5.9-1.src.rpm +e1f1af8c2add8310d0bbcddc9af523b8 sword-1.5.9.tar.gz From fedora-extras-commits at redhat.com Tue Nov 7 01:15:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:15:47 -0700 Subject: rpms/sylpheed-claws/devel .cvsignore, 1.28, 1.29 sources, 1.29, 1.30 sylpheed-claws.spec, 1.54, 1.55 Message-ID: <200611070115.kA71Flrb001992@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/devel Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 20 Oct 2006 07:17:22 -0000 1.28 +++ .cvsignore 7 Nov 2006 01:15:17 -0000 1.29 @@ -1 +1 @@ -sylpheed-claws-2.5.6.tar.bz2 +sylpheed-claws-2.6.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 20 Oct 2006 07:17:22 -0000 1.29 +++ sources 7 Nov 2006 01:15:17 -0000 1.30 @@ -1 +1 @@ -f342f7be46a3d2771f6aaad44838e513 sylpheed-claws-2.5.6.tar.bz2 +c16d658bd7d48bbecc2574e70b95c560 sylpheed-claws-2.6.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sylpheed-claws.spec 20 Oct 2006 07:17:22 -0000 1.54 +++ sylpheed-claws.spec 7 Nov 2006 01:15:17 -0000 1.55 @@ -1,11 +1,11 @@ Name: sylpheed-claws -Version: 2.5.6 +Version: 2.6.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.6.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -24,7 +24,7 @@ BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel -BuildRequires: libetpan-devel >= 0.46 +BuildRequires: libetpan-devel >= 0.48 BuildRequires: libgnomeprintui22-devel %description @@ -169,6 +169,10 @@ %changelog +* Mon Nov 06 2006 Andreas Bierfert +2.6.0-1 +- version upgrade + * Thu Oct 19 2006 Andreas Bierfert 2.5.6-1 - version upgrade From fedora-extras-commits at redhat.com Tue Nov 7 01:15:44 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:15:44 -0700 Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.24, 1.25 sources, 1.25, 1.26 sylpheed-claws.spec, 1.48, 1.49 Message-ID: <200611070115.kA71Fim0001979@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/FC-4 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 20 Oct 2006 08:21:19 -0000 1.24 +++ .cvsignore 7 Nov 2006 01:15:14 -0000 1.25 @@ -1 +1 @@ -sylpheed-claws-2.5.6.tar.bz2 +sylpheed-claws-2.6.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 20 Oct 2006 08:21:19 -0000 1.25 +++ sources 7 Nov 2006 01:15:14 -0000 1.26 @@ -1 +1 @@ -f342f7be46a3d2771f6aaad44838e513 sylpheed-claws-2.5.6.tar.bz2 +c16d658bd7d48bbecc2574e70b95c560 sylpheed-claws-2.6.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sylpheed-claws.spec 20 Oct 2006 08:21:19 -0000 1.48 +++ sylpheed-claws.spec 7 Nov 2006 01:15:14 -0000 1.49 @@ -1,13 +1,13 @@ %define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi ) Name: sylpheed-claws -Version: 2.5.6 +Version: 2.6.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.6.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -26,7 +26,7 @@ BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel -BuildRequires: libetpan-devel >= 0.46 +BuildRequires: libetpan-devel >= 0.48 BuildRequires: libgnomeprintui22-devel BuildRequires: libtool @@ -179,6 +179,10 @@ %{_libdir}/sylpheed-claws/plugins/bogofilter.so %changelog +* Mon Nov 06 2006 Andreas Bierfert +2.6.0-1 +- version upgrade + * Fri Oct 20 2006 Andreas Bierfert 2.5.6-1 - version upgrade From fedora-extras-commits at redhat.com Tue Nov 7 01:15:45 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:15:45 -0700 Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.28, 1.29 sources, 1.29, 1.30 sylpheed-claws.spec, 1.53, 1.54 Message-ID: <200611070115.kA71Fja3001984@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/FC-5 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 20 Oct 2006 08:21:20 -0000 1.28 +++ .cvsignore 7 Nov 2006 01:15:15 -0000 1.29 @@ -1 +1 @@ -sylpheed-claws-2.5.6.tar.bz2 +sylpheed-claws-2.6.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 20 Oct 2006 08:21:20 -0000 1.29 +++ sources 7 Nov 2006 01:15:15 -0000 1.30 @@ -1 +1 @@ -f342f7be46a3d2771f6aaad44838e513 sylpheed-claws-2.5.6.tar.bz2 +c16d658bd7d48bbecc2574e70b95c560 sylpheed-claws-2.6.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sylpheed-claws.spec 20 Oct 2006 08:21:20 -0000 1.53 +++ sylpheed-claws.spec 7 Nov 2006 01:15:15 -0000 1.54 @@ -1,11 +1,11 @@ Name: sylpheed-claws -Version: 2.5.6 +Version: 2.6.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.6.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -24,7 +24,7 @@ BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel -BuildRequires: libetpan-devel >= 0.46 +BuildRequires: libetpan-devel >= 0.48 BuildRequires: libgnomeprintui22-devel %description @@ -168,6 +168,10 @@ %{_libdir}/sylpheed-claws/plugins/bogofilter.so %changelog +* Mon Nov 06 2006 Andreas Bierfert +2.6.0-1 +- version upgrade + * Fri Oct 20 2006 Andreas Bierfert 2.5.6-1 - version upgrade From fedora-extras-commits at redhat.com Tue Nov 7 01:15:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:15:46 -0700 Subject: rpms/sylpheed-claws/FC-6 .cvsignore, 1.28, 1.29 sources, 1.29, 1.30 sylpheed-claws.spec, 1.54, 1.55 Message-ID: <200611070115.kA71Fkjp001989@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/FC-6 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-6/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 20 Oct 2006 07:17:22 -0000 1.28 +++ .cvsignore 7 Nov 2006 01:15:16 -0000 1.29 @@ -1 +1 @@ -sylpheed-claws-2.5.6.tar.bz2 +sylpheed-claws-2.6.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-6/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 20 Oct 2006 07:17:22 -0000 1.29 +++ sources 7 Nov 2006 01:15:16 -0000 1.30 @@ -1 +1 @@ -f342f7be46a3d2771f6aaad44838e513 sylpheed-claws-2.5.6.tar.bz2 +c16d658bd7d48bbecc2574e70b95c560 sylpheed-claws-2.6.0.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-6/sylpheed-claws.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sylpheed-claws.spec 20 Oct 2006 07:17:22 -0000 1.54 +++ sylpheed-claws.spec 7 Nov 2006 01:15:16 -0000 1.55 @@ -1,11 +1,11 @@ Name: sylpheed-claws -Version: 2.5.6 +Version: 2.6.0 Release: 1%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.6.0.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -24,7 +24,7 @@ BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel -BuildRequires: libetpan-devel >= 0.46 +BuildRequires: libetpan-devel >= 0.48 BuildRequires: libgnomeprintui22-devel %description @@ -169,6 +169,10 @@ %changelog +* Mon Nov 06 2006 Andreas Bierfert +2.6.0-1 +- version upgrade + * Thu Oct 19 2006 Andreas Bierfert 2.5.6-1 - version upgrade From fedora-extras-commits at redhat.com Tue Nov 7 01:25:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:25:09 -0700 Subject: rpms/sylpheed-claws-plugins/FC-6 sylpheed-claws-plugins.spec, 1.23, 1.24 Message-ID: <200611070125.kA71P91J002246@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182/FC-6 Modified Files: sylpheed-claws-plugins.spec Log Message: - rebuild Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-6/sylpheed-claws-plugins.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sylpheed-claws-plugins.spec 20 Oct 2006 09:47:50 -0000 1.23 +++ sylpheed-claws-plugins.spec 7 Nov 2006 01:24:39 -0000 1.24 @@ -1,6 +1,6 @@ Name: sylpheed-claws-plugins Version: 2.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet @@ -510,6 +510,10 @@ %exclude %{_includedir}/ical.h %changelog +* Tue Nov 07 2006 Andreas Bierfert +2.5.2-5 +- rebuild + * Fri Oct 20 2006 Andreas Bierfert 2.5.2-4 - rebuild From fedora-extras-commits at redhat.com Tue Nov 7 01:25:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:25:08 -0700 Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.17, 1.18 Message-ID: <200611070125.kA71P8o9002240@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182/FC-4 Modified Files: sylpheed-claws-plugins.spec Log Message: - rebuild Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sylpheed-claws-plugins.spec 20 Oct 2006 09:47:48 -0000 1.17 +++ sylpheed-claws-plugins.spec 7 Nov 2006 01:24:38 -0000 1.18 @@ -1,6 +1,6 @@ Name: sylpheed-claws-plugins Version: 2.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet @@ -510,6 +510,10 @@ %exclude %{_includedir}/ical.h %changelog +* Tue Nov 07 2006 Andreas Bierfert +2.5.2-5 +- rebuild + * Fri Oct 20 2006 Andreas Bierfert 2.5.2-4 - rebuild From fedora-extras-commits at redhat.com Tue Nov 7 01:25:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:25:09 -0700 Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.22, 1.23 Message-ID: <200611070125.kA71P9b7002243@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182/FC-5 Modified Files: sylpheed-claws-plugins.spec Log Message: - rebuild Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sylpheed-claws-plugins.spec 20 Oct 2006 09:47:49 -0000 1.22 +++ sylpheed-claws-plugins.spec 7 Nov 2006 01:24:38 -0000 1.23 @@ -1,6 +1,6 @@ Name: sylpheed-claws-plugins Version: 2.5.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet @@ -510,6 +510,10 @@ %exclude %{_includedir}/ical.h %changelog +* Tue Nov 07 2006 Andreas Bierfert +2.5.2-5 +- rebuild + * Fri Oct 20 2006 Andreas Bierfert 2.5.2-4 - rebuild From fedora-extras-commits at redhat.com Tue Nov 7 01:25:10 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:25:10 -0700 Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.24, 1.25 Message-ID: <200611070125.kA71PAiX002249@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182/devel Modified Files: sylpheed-claws-plugins.spec Log Message: - rebuild Index: sylpheed-claws-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sylpheed-claws-plugins.spec 6 Nov 2006 13:53:20 -0000 1.24 +++ sylpheed-claws-plugins.spec 7 Nov 2006 01:24:40 -0000 1.25 @@ -1,6 +1,6 @@ Name: sylpheed-claws-plugins Version: 2.5.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Additional plugins for sylpheed-claws Group: Applications/Internet @@ -512,6 +512,10 @@ %exclude %{_includedir}/ical.h %changelog +* Tue Nov 07 2006 Andreas Bierfert +2.5.2-6 +- rebuild + * Mon Nov 06 2006 Jindrich Novy 2.5.2-5 - rebuild against the new curl From fedora-extras-commits at redhat.com Tue Nov 7 01:56:28 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:56:28 -0700 Subject: rpms/qiv/FC-6 qiv.sh,NONE,1.1 qiv.spec,1.11,1.12 Message-ID: <200611070156.kA71uSJN002411@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/qiv/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2379/FC-6 Modified Files: qiv.spec Added Files: qiv.sh Log Message: - fix #213581 --- NEW FILE qiv.sh --- #!/bin/sh # https://bugzilla.redhat.com/213581 if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/qiv "$@" else exec /usr/libexec/qiv "$@" fi Index: qiv.spec =================================================================== RCS file: /cvs/extras/rpms/qiv/FC-6/qiv.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qiv.spec 15 Sep 2006 06:49:06 -0000 1.11 +++ qiv.spec 7 Nov 2006 01:55:57 -0000 1.12 @@ -1,6 +1,6 @@ Name: qiv Version: 2.0 -Release: 6 +Release: 7 Summary: Quick Image Viewer @@ -8,6 +8,8 @@ License: GPL URL: http://www.klografx.net/qiv/ Source0: http://www.klografx.net/qiv/download/qiv-2.0-src.tgz +# fixes #213581 (script 'stolen' from xmms -> thanks ville) +Source1: qiv.sh Patch0: %{name}-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,9 +30,9 @@ %install rm -rf $RPM_BUILD_ROOT -install -Dpm 755 qiv $RPM_BUILD_ROOT%{_bindir}/qiv +install -Dpm 755 qiv $RPM_BUILD_ROOT%{_libexecdir}/qiv install -Dpm 644 qiv.1 $RPM_BUILD_ROOT%{_mandir}/man1/qiv.1 - +install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/qiv %clean rm -rf $RPM_BUILD_ROOT @@ -40,10 +42,14 @@ %defattr(-,root,root,-) %doc README README.CHANGES README.COPYING README.TODO qiv-command.example %{_bindir}/qiv +%{_libexecdir}/qiv %{_mandir}/man1/qiv.1* %changelog +* Tue Nov 07 2006 Andreas Bierfert 2.0-7 +- fix #213581 + * Fri Sep 15 2006 Andreas Bierfert 2.0-6 - FE6 rebuild From fedora-extras-commits at redhat.com Tue Nov 7 01:56:28 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:56:28 -0700 Subject: rpms/qiv/devel qiv.sh,NONE,1.1 qiv.spec,1.11,1.12 Message-ID: <200611070156.kA71uSBB002414@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/qiv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2379/devel Modified Files: qiv.spec Added Files: qiv.sh Log Message: - fix #213581 --- NEW FILE qiv.sh --- #!/bin/sh # https://bugzilla.redhat.com/213581 if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/qiv "$@" else exec /usr/libexec/qiv "$@" fi Index: qiv.spec =================================================================== RCS file: /cvs/extras/rpms/qiv/devel/qiv.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qiv.spec 15 Sep 2006 06:49:06 -0000 1.11 +++ qiv.spec 7 Nov 2006 01:55:58 -0000 1.12 @@ -1,6 +1,6 @@ Name: qiv Version: 2.0 -Release: 6 +Release: 7 Summary: Quick Image Viewer @@ -8,6 +8,8 @@ License: GPL URL: http://www.klografx.net/qiv/ Source0: http://www.klografx.net/qiv/download/qiv-2.0-src.tgz +# fixes #213581 (script 'stolen' from xmms -> thanks ville) +Source1: qiv.sh Patch0: %{name}-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,9 +30,9 @@ %install rm -rf $RPM_BUILD_ROOT -install -Dpm 755 qiv $RPM_BUILD_ROOT%{_bindir}/qiv +install -Dpm 755 qiv $RPM_BUILD_ROOT%{_libexecdir}/qiv install -Dpm 644 qiv.1 $RPM_BUILD_ROOT%{_mandir}/man1/qiv.1 - +install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/qiv %clean rm -rf $RPM_BUILD_ROOT @@ -40,10 +42,14 @@ %defattr(-,root,root,-) %doc README README.CHANGES README.COPYING README.TODO qiv-command.example %{_bindir}/qiv +%{_libexecdir}/qiv %{_mandir}/man1/qiv.1* %changelog +* Tue Nov 07 2006 Andreas Bierfert 2.0-7 +- fix #213581 + * Fri Sep 15 2006 Andreas Bierfert 2.0-6 - FE6 rebuild From fedora-extras-commits at redhat.com Tue Nov 7 01:58:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:58:53 -0700 Subject: rpms/qiv/FC-6 qiv.spec,1.12,1.13 Message-ID: <200611070158.kA71wrLF002536@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/qiv/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2506/FC-6 Modified Files: qiv.spec Log Message: - dist ?! Index: qiv.spec =================================================================== RCS file: /cvs/extras/rpms/qiv/FC-6/qiv.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- qiv.spec 7 Nov 2006 01:55:57 -0000 1.12 +++ qiv.spec 7 Nov 2006 01:58:23 -0000 1.13 @@ -1,6 +1,6 @@ Name: qiv Version: 2.0 -Release: 7 +Release: 7%{?dist} Summary: Quick Image Viewer From fedora-extras-commits at redhat.com Tue Nov 7 01:58:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 6 Nov 2006 18:58:54 -0700 Subject: rpms/qiv/devel qiv.spec,1.12,1.13 Message-ID: <200611070158.kA71wsNs002539@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/qiv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2506/devel Modified Files: qiv.spec Log Message: - dist ?! Index: qiv.spec =================================================================== RCS file: /cvs/extras/rpms/qiv/devel/qiv.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- qiv.spec 7 Nov 2006 01:55:58 -0000 1.12 +++ qiv.spec 7 Nov 2006 01:58:24 -0000 1.13 @@ -1,6 +1,6 @@ Name: qiv Version: 2.0 -Release: 7 +Release: 7%{?dist} Summary: Quick Image Viewer From fedora-extras-commits at redhat.com Tue Nov 7 02:56:43 2006 From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg)) Date: Mon, 6 Nov 2006 19:56:43 -0700 Subject: rpms/granule/devel granule.spec,1.1,1.2 Message-ID: <200611070256.kA72uhLO005989@cvs-int.fedora.redhat.com> Author: vlg Update of /cvs/extras/rpms/granule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5973 Modified Files: granule.spec Log Message: Removed libtool call. Index: granule.spec =================================================================== RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- granule.spec 22 Oct 2006 02:04:37 -0000 1.1 +++ granule.spec 7 Nov 2006 02:56:13 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Flashcards program based on Leitner methodology Name: granule Version: 1.2.3 -Release: 2 +Release: 3 License: GPL Group: Applications/Multimedia URL: http://granule.sourceforge.net/ @@ -27,8 +27,6 @@ %build -glib-gettextize --copy --force -intltoolize --automake --copy --force %configure make %{?_smp_mflags} @@ -65,16 +63,19 @@ %changelog +* Wed Nov 06 2006 Vladislav Grinchenko - 1.2.3-3 +- Removed libtool call. + * Wed Oct 18 2006 Michael Schwendt - 1.2.3-2 - Fix missing BR and remaining spec issues. -* Sat Oct 14 2006 Vladislav Grinchenko - 1.2.3 +* Sat Oct 14 2006 Vladislav Grinchenko - 1.2.3 - Overall makeup to adhere to the RPM packaging guidelines. -* Sun Nov 6 2005 Vladislav Grinchenko +* Sun Nov 6 2005 Vladislav Grinchenko - Fixed License tag -* Mon Jul 4 2005 Vladislav Grinchenko +* Mon Jul 4 2005 Vladislav Grinchenko - Changed XML dir. * Thu Jun 3 2004 Vladislav Grinchenko - 1.0.0 From fedora-extras-commits at redhat.com Tue Nov 7 03:36:43 2006 From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg)) Date: Mon, 6 Nov 2006 20:36:43 -0700 Subject: rpms/granule/FC-6 granule.spec,1.1,1.2 Message-ID: <200611070336.kA73ahr7009354@cvs-int.fedora.redhat.com> Author: vlg Update of /cvs/extras/rpms/granule/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9338 Modified Files: granule.spec Log Message: Removed unnecessary call to libtool. Index: granule.spec =================================================================== RCS file: /cvs/extras/rpms/granule/FC-6/granule.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- granule.spec 22 Oct 2006 02:04:37 -0000 1.1 +++ granule.spec 7 Nov 2006 03:36:12 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Flashcards program based on Leitner methodology Name: granule Version: 1.2.3 -Release: 2 +Release: 3 License: GPL Group: Applications/Multimedia URL: http://granule.sourceforge.net/ @@ -27,8 +27,6 @@ %build -glib-gettextize --copy --force -intltoolize --automake --copy --force %configure make %{?_smp_mflags} @@ -65,18 +63,21 @@ %changelog +* Wed Nov 06 2006 Vladislav Grinchenko - 1.2.3-3 +- Removed libtool call. + * Wed Oct 18 2006 Michael Schwendt - 1.2.3-2 - Fix missing BR and remaining spec issues. -* Sat Oct 14 2006 Vladislav Grinchenko - 1.2.3 +* Sat Oct 14 2006 Vladislav Grinchenko - 1.2.3 - Overall makeup to adhere to the RPM packaging guidelines. -* Sun Nov 6 2005 Vladislav Grinchenko +* Sun Nov 6 2005 Vladislav Grinchenko - Fixed License tag -* Mon Jul 4 2005 Vladislav Grinchenko +* Mon Jul 4 2005 Vladislav Grinchenko - Changed XML dir. -* Thu Jun 3 2004 Vladislav Grinchenko - 1.0.0 +* Thu Jun 3 2004 Vladislav Grinchenko - 1.0.0 - Initial release. From fedora-extras-commits at redhat.com Tue Nov 7 03:47:48 2006 From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg)) Date: Mon, 6 Nov 2006 20:47:48 -0700 Subject: rpms/granule/devel granule.spec,1.2,1.3 Message-ID: <200611070347.kA73lmAP009552@cvs-int.fedora.redhat.com> Author: vlg Update of /cvs/extras/rpms/granule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9536 Modified Files: granule.spec Log Message: Two tags of the same name collide? Index: granule.spec =================================================================== RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- granule.spec 7 Nov 2006 02:56:13 -0000 1.2 +++ granule.spec 7 Nov 2006 03:47:18 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Flashcards program based on Leitner methodology Name: granule Version: 1.2.3 -Release: 3 +Release: 4 License: GPL Group: Applications/Multimedia URL: http://granule.sourceforge.net/ @@ -63,7 +63,7 @@ %changelog -* Wed Nov 06 2006 Vladislav Grinchenko - 1.2.3-3 +* Wed Nov 06 2006 Vladislav Grinchenko - 1.2.3-4 - Removed libtool call. * Wed Oct 18 2006 Michael Schwendt - 1.2.3-2 From fedora-extras-commits at redhat.com Tue Nov 7 04:14:06 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Nov 2006 21:14:06 -0700 Subject: rpms/tile/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tile.spec, 1.3, 1.4 tile-0.7.2-broken-tclm4.patch, 1.1, NONE Message-ID: <200611070414.kA74E6AU012793@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12763 Modified Files: .cvsignore sources tile.spec Removed Files: tile-0.7.2-broken-tclm4.patch Log Message: Update to 0.7.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tile/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Feb 2006 07:34:08 -0000 1.2 +++ .cvsignore 7 Nov 2006 04:13:36 -0000 1.3 @@ -1 +1 @@ -tile-0.7.2.tar.gz +tile-0.7.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tile/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Feb 2006 07:34:08 -0000 1.2 +++ sources 7 Nov 2006 04:13:36 -0000 1.3 @@ -1 +1 @@ -9a941d213b77b804af042d5a9434c024 tile-0.7.2.tar.gz +1172c1875ae63d7a73d8ba27835e16d4 tile-0.7.8.tar.gz Index: tile.spec =================================================================== RCS file: /cvs/extras/rpms/tile/devel/tile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tile.spec 29 Aug 2006 00:56:00 -0000 1.3 +++ tile.spec 7 Nov 2006 04:13:36 -0000 1.4 @@ -1,13 +1,12 @@ Name: tile -Version: 0.7.2 -Release: 5%{?dist} +Version: 0.7.8 +Release: 1%{?dist} Summary: Modernized widgets for Tk -Group: Development/Libraries +Group: Development/Libraries License: MIT URL: http://tktable.sourceforge.net/tile/ -Source0: http://download.sourceforge.net/tktable/tile-0.7.2.tar.gz -Patch0: tile-0.7.2-broken-tclm4.patch +Source0: http://download.sourceforge.net/tktable/tile-0.7.8.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tcl tk @@ -28,7 +27,6 @@ %prep %setup -q -%patch0 -p1 %build %configure @@ -67,6 +65,10 @@ %{_libdir}/*.a %changelog +* Mon Nov 6 2006 Wart - 0.7.8-1 +- Update to 0.7.8 +- Remove patch; it was accepted upstream + * Mon Aug 28 2006 Wart - 0.7.2-5 - Rebuild for Fedora Extras --- tile-0.7.2-broken-tclm4.patch DELETED --- From fedora-extras-commits at redhat.com Tue Nov 7 04:15:18 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 6 Nov 2006 21:15:18 -0700 Subject: rpms/tile/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tile.spec, 1.3, 1.4 tile-0.7.2-broken-tclm4.patch, 1.1, NONE Message-ID: <200611070415.kA74FI5r012871@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tile/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12845 Modified Files: .cvsignore sources tile.spec Removed Files: tile-0.7.2-broken-tclm4.patch Log Message: Update to 0.7.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tile/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Feb 2006 07:34:08 -0000 1.2 +++ .cvsignore 7 Nov 2006 04:14:48 -0000 1.3 @@ -1 +1 @@ -tile-0.7.2.tar.gz +tile-0.7.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tile/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Feb 2006 07:34:08 -0000 1.2 +++ sources 7 Nov 2006 04:14:48 -0000 1.3 @@ -1 +1 @@ -9a941d213b77b804af042d5a9434c024 tile-0.7.2.tar.gz +1172c1875ae63d7a73d8ba27835e16d4 tile-0.7.8.tar.gz Index: tile.spec =================================================================== RCS file: /cvs/extras/rpms/tile/FC-6/tile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tile.spec 29 Aug 2006 00:56:00 -0000 1.3 +++ tile.spec 7 Nov 2006 04:14:48 -0000 1.4 @@ -1,13 +1,12 @@ Name: tile -Version: 0.7.2 -Release: 5%{?dist} +Version: 0.7.8 +Release: 1%{?dist} Summary: Modernized widgets for Tk -Group: Development/Libraries +Group: Development/Libraries License: MIT URL: http://tktable.sourceforge.net/tile/ -Source0: http://download.sourceforge.net/tktable/tile-0.7.2.tar.gz -Patch0: tile-0.7.2-broken-tclm4.patch +Source0: http://download.sourceforge.net/tktable/tile-0.7.8.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tcl tk @@ -28,7 +27,6 @@ %prep %setup -q -%patch0 -p1 %build %configure @@ -67,6 +65,10 @@ %{_libdir}/*.a %changelog +* Mon Nov 6 2006 Wart - 0.7.8-1 +- Update to 0.7.8 +- Remove patch; it was accepted upstream + * Mon Aug 28 2006 Wart - 0.7.2-5 - Rebuild for Fedora Extras --- tile-0.7.2-broken-tclm4.patch DELETED --- From fedora-extras-commits at redhat.com Tue Nov 7 10:12:58 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 7 Nov 2006 03:12:58 -0700 Subject: fedora-security/audit fc5,1.382,1.383 fc6,1.135,1.136 Message-ID: <200611071012.kA7ACw8C032244@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32224 Modified Files: fc5 fc6 Log Message: Yesterdays updates, not yet dealt with kde or python updates Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- fc5 6 Nov 2006 10:00:40 -0000 1.382 +++ fc5 7 Nov 2006 10:12:54 -0000 1.383 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20061105 -Up to date FC5 as of 20061105 +Up to date CVE as of CVE email 20061106 +Up to date FC5 as of 20061106 ** are items that need attention +CVE-2006-5757 ** kernel CVE-2006-5706 ** php, fixed 5.2.0 CVE-2006-5701 ** kernel CVE-2006-5633 ignore (firefox) just a client DoS Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- fc6 6 Nov 2006 10:00:40 -0000 1.135 +++ fc6 7 Nov 2006 10:12:54 -0000 1.136 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20061105 -Up to date FC6 as of 20061105 +Up to date CVE as of CVE email 20061106 +Up to date FC6 as of 20061106 ** are items that need attention +CVE-2006-5757 ** kernel CVE-2006-5706 ** php, fixed 5.2.0 CVE-2006-5701 ** kernel CVE-2006-5633 ignore (firefox) just a client DoS @@ -16,7 +17,7 @@ CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1109] CVE-2006-5466 VULNERABLE (rpm) #212833 -CVE-2006-5465 VULNERABLE (php, fixed 5.2.0) #213732 +CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDOA-2006-1169] CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2) From fedora-extras-commits at redhat.com Tue Nov 7 10:17:34 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 7 Nov 2006 03:17:34 -0700 Subject: fedora-security/audit fc5,1.383,1.384 Message-ID: <200611071017.kA7AHYlK032320@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32302 Modified Files: fc5 Log Message: Fix missed fc5 updates (python, php) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- fc5 7 Nov 2006 10:12:54 -0000 1.383 +++ fc5 7 Nov 2006 10:17:32 -0000 1.384 @@ -17,7 +17,7 @@ CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110] CVE-2006-5466 VULNERABLE (rpm) #212833 -CVE-2006-5465 VULNERABLE (php, fixed 5.2.0) #213732 +CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168] CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only) CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2) @@ -41,7 +41,7 @@ CVE-2006-5052 VULNERABLE (openssh, fixed 4.4) CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011] CVE-2006-4997 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] -CVE-2006-4980 VULNERABLE (python) #208166 +CVE-2006-4980 backport (python) #208166 [since FEDORA-2006-1049] CVE-2006-4925 ignore (openssh) client crash only CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011] CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr From fedora-extras-commits at redhat.com Tue Nov 7 11:42:20 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos)) Date: Tue, 7 Nov 2006 04:42:20 -0700 Subject: rpms/python-enchant/devel .cvsignore, 1.3, 1.4 python-enchant.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200611071142.kA7BgKgV003543@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-enchant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3521 Modified Files: .cvsignore python-enchant.spec sources Log Message: * Tue Nov 7 2006 Jos?? Matos - 1.2.0-1 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-enchant/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Feb 2006 08:29:15 -0000 1.3 +++ .cvsignore 7 Nov 2006 11:41:49 -0000 1.4 @@ -1 +1 @@ -pyenchant-1.1.5.tar.gz +pyenchant-1.2.0.tar.gz Index: python-enchant.spec =================================================================== RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-enchant.spec 4 Oct 2006 22:40:43 -0000 1.8 +++ python-enchant.spec 7 Nov 2006 11:41:49 -0000 1.9 @@ -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-enchant -Version: 1.1.5 -Release: 5%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Python bindings for Enchant spellchecking library Group: Development/Languages @@ -53,6 +53,9 @@ %changelog +* Tue Nov 7 2006 Jos?? Matos - 1.2.0-1 +- New upstream release + * Thu Oct 05 2006 Christian Iseli 1.1.5-5 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-enchant/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Feb 2006 08:29:15 -0000 1.3 +++ sources 7 Nov 2006 11:41:49 -0000 1.4 @@ -1 +1 @@ -d9a07392f1f0910635a221273ac9654d pyenchant-1.1.5.tar.gz +2fefef0868b110b1da7de89c08344dd2 pyenchant-1.2.0.tar.gz From fedora-extras-commits at redhat.com Tue Nov 7 12:41:10 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Tue, 7 Nov 2006 05:41:10 -0700 Subject: rpms/audacious/FC-6 audacious.spec,1.11,1.12 Message-ID: <200611071241.kA7CfAkU006808@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6790 Modified Files: audacious.spec Log Message: - Disable gnome-vfs, it causes too much trouble Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/FC-6/audacious.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- audacious.spec 20 Oct 2006 07:24:45 -0000 1.11 +++ audacious.spec 7 Nov 2006 12:40:40 -0000 1.12 @@ -1,6 +1,6 @@ Name: audacious Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0 -BuildRequires: zlib-devel, desktop-file-utils, alsa-lib-devel +BuildRequires: zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel BuildRequires: gnome-vfs2-devel, libglade2-devel >= 2.4, libsidplay-devel BuildRequires: libmpcdec-devel, libmusicbrainz-devel, GConf2-devel BuildRequires: taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2 @@ -31,7 +31,6 @@ BuildRequires: gettext, libsndfile-devel, curl-devel, libbinio-devel BuildRequires: arts-devel, libmodplug-devel, lirc-devel BuildRequires: jack-audio-connection-kit-devel, libsamplerate-devel -BuildRequires: desktop-file-utils >= 0.9 Requires(post): desktop-file-utils >= 0.9, /sbin/ldconfig Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig @@ -122,7 +121,7 @@ %configure \ --disable-rpath \ --enable-gconf \ - --enable-gnome-vfs \ + --disable-gnome-vfs \ --enable-amidiplug \ --disable-amidiplug-dummy \ --disable-dependency-tracking @@ -209,6 +208,9 @@ %changelog +* Tue Nov 7 2006 Ralf Ertzinger 1.1.2-3.fc6 +- Disable gnome-vfs, it causes too much trouble + * Wed Oct 18 2006 Ralf Ertzinger 1.1.2-2.fc6 - Add Obsoletes/Provides for BMP From fedora-extras-commits at redhat.com Tue Nov 7 13:13:27 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Tue, 7 Nov 2006 06:13:27 -0700 Subject: rpms/audacious/devel audacious-1.1.2-mainwin-update.patch, 1.1, 1.2 audacious.spec, 1.13, 1.14 Message-ID: <200611071313.kA7DDR7b009962@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9935 Modified Files: audacious-1.1.2-mainwin-update.patch audacious.spec Log Message: - Disable gnome-vfs, it causes too much trouble audacious-1.1.2-mainwin-update.patch: Index: audacious-1.1.2-mainwin-update.patch =================================================================== RCS file: /cvs/extras/rpms/audacious/devel/audacious-1.1.2-mainwin-update.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- audacious-1.1.2-mainwin-update.patch 6 Nov 2006 15:52:48 -0000 1.1 +++ audacious-1.1.2-mainwin-update.patch 7 Nov 2006 13:12:56 -0000 1.2 @@ -6,7 +6,7 @@ #define MAINWIN_SHADED_HEIGHT MAINWIN_TITLEBAR_HEIGHT -#define MAINWIN_UPDATE_INTERVAL 10 -+#define MAINWIN_UPDATE_INTERVAL 100 ++#define MAINWIN_UPDATE_INTERVAL 50 #define MAINWIN_DEFAULT_POS_X 20 #define MAINWIN_DEFAULT_POS_Y 20 Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- audacious.spec 6 Nov 2006 15:52:48 -0000 1.13 +++ audacious.spec 7 Nov 2006 13:12:56 -0000 1.14 @@ -1,6 +1,6 @@ Name: audacious Version: 1.1.2 -Release: 4%{?dist} +Release: 6%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -125,7 +125,7 @@ %configure \ --disable-rpath \ --enable-gconf \ - --enable-gnome-vfs \ + --disable-gnome-vfs \ --enable-amidiplug \ --disable-amidiplug-dummy \ --disable-dependency-tracking @@ -212,6 +212,9 @@ %changelog +* Tue Nov 7 2006 Ralf Ertzinger 1.1.2-6.fc7 +- Disable gnome-vfs, it causes too much trouble + * Mon Nov 06 2006 Ralf Ertzinger 1.1.2-4.fc7 - Decrease main window update frequency somewhat From fedora-extras-commits at redhat.com Tue Nov 7 13:42:25 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 7 Nov 2006 06:42:25 -0700 Subject: rpms/SIBsim4/devel .cvsignore, 1.6, 1.7 SIBsim4.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200611071342.kA7DgPw0010162@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/SIBsim4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10136 Modified Files: .cvsignore SIBsim4.spec sources Log Message: New version 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jun 2006 17:09:40 -0000 1.6 +++ .cvsignore 7 Nov 2006 13:41:55 -0000 1.7 @@ -1 +1 @@ -SIBsim4-0.13.tar.bz2 +SIBsim4-0.14.tar.gz Index: SIBsim4.spec =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/SIBsim4.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SIBsim4.spec 5 Sep 2006 18:26:30 -0000 1.7 +++ SIBsim4.spec 7 Nov 2006 13:41:55 -0000 1.8 @@ -1,11 +1,11 @@ Name: SIBsim4 -Version: 0.13 -Release: 2%{?dist} +Version: 0.14 +Release: 1%{?dist} Summary: Align expressed RNA sequences on a DNA template Group: Applications/Engineering License: GPL URL: http://sibsim4.sourceforge.net -Source0: http://dl.sf.net/sibsim4/%{name}-%{version}.tar.bz2 +Source0: http://dl.sf.net/sibsim4/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,6 +43,10 @@ %changelog +* Tue Nov 7 2006 Christian Iseli 0.14-0 +- Version 0.14. +- Source is .gz instead of .bz2. + * Tue Sep 5 2006 Christian Iseli 0.13-2 - Rebuild for FC 6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Jun 2006 17:09:40 -0000 1.6 +++ sources 7 Nov 2006 13:41:55 -0000 1.7 @@ -1 +1 @@ -526a8a3be41ead4b8a11fca073e28cc8 SIBsim4-0.13.tar.bz2 +b63af91d9cacf7d4f557d72119f934e5 SIBsim4-0.14.tar.gz From fedora-extras-commits at redhat.com Tue Nov 7 13:45:44 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 7 Nov 2006 06:45:44 -0700 Subject: rpms/SIBsim4/FC-6 .cvsignore, 1.6, 1.7 SIBsim4.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200611071345.kA7Dji2O010260@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/SIBsim4/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10235 Modified Files: .cvsignore SIBsim4.spec sources Log Message: New version 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jun 2006 17:09:40 -0000 1.6 +++ .cvsignore 7 Nov 2006 13:45:14 -0000 1.7 @@ -1 +1 @@ -SIBsim4-0.13.tar.bz2 +SIBsim4-0.14.tar.gz Index: SIBsim4.spec =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-6/SIBsim4.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SIBsim4.spec 5 Sep 2006 18:26:30 -0000 1.7 +++ SIBsim4.spec 7 Nov 2006 13:45:14 -0000 1.8 @@ -1,11 +1,11 @@ Name: SIBsim4 -Version: 0.13 -Release: 2%{?dist} +Version: 0.14 +Release: 1%{?dist} Summary: Align expressed RNA sequences on a DNA template Group: Applications/Engineering License: GPL URL: http://sibsim4.sourceforge.net -Source0: http://dl.sf.net/sibsim4/%{name}-%{version}.tar.bz2 +Source0: http://dl.sf.net/sibsim4/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,6 +43,10 @@ %changelog +* Tue Nov 7 2006 Christian Iseli 0.14-0 +- Version 0.14. +- Source is .gz instead of .bz2. + * Tue Sep 5 2006 Christian Iseli 0.13-2 - Rebuild for FC 6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Jun 2006 17:09:40 -0000 1.6 +++ sources 7 Nov 2006 13:45:14 -0000 1.7 @@ -1 +1 @@ -526a8a3be41ead4b8a11fca073e28cc8 SIBsim4-0.13.tar.bz2 +b63af91d9cacf7d4f557d72119f934e5 SIBsim4-0.14.tar.gz From fedora-extras-commits at redhat.com Tue Nov 7 13:48:58 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 7 Nov 2006 06:48:58 -0700 Subject: rpms/SIBsim4/FC-5 .cvsignore, 1.6, 1.7 SIBsim4.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200611071348.kA7Dmwtr010339@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/SIBsim4/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10319 Modified Files: .cvsignore SIBsim4.spec sources Log Message: New version 0.14. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jun 2006 17:12:11 -0000 1.6 +++ .cvsignore 7 Nov 2006 13:48:28 -0000 1.7 @@ -1 +1 @@ -SIBsim4-0.13.tar.bz2 +SIBsim4-0.14.tar.gz Index: SIBsim4.spec =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-5/SIBsim4.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SIBsim4.spec 19 Jun 2006 17:12:11 -0000 1.6 +++ SIBsim4.spec 7 Nov 2006 13:48:28 -0000 1.7 @@ -1,11 +1,11 @@ Name: SIBsim4 -Version: 0.13 +Version: 0.14 Release: 1%{?dist} Summary: Align expressed RNA sequences on a DNA template Group: Applications/Engineering License: GPL URL: http://sibsim4.sourceforge.net -Source0: http://dl.sf.net/sibsim4/%{name}-%{version}.tar.bz2 +Source0: http://dl.sf.net/sibsim4/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,6 +43,10 @@ %changelog +* Tue Nov 7 2006 Christian Iseli 0.14-1 +- Version 0.14. +- Source is .gz instead of .bz2. + * Fri Jun 19 2006 Christian Iseli 0.13-1 - Version 0.13. - No longer needs math lib. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Jun 2006 17:12:11 -0000 1.6 +++ sources 7 Nov 2006 13:48:28 -0000 1.7 @@ -1 +1 @@ -526a8a3be41ead4b8a11fca073e28cc8 SIBsim4-0.13.tar.bz2 +b63af91d9cacf7d4f557d72119f934e5 SIBsim4-0.14.tar.gz From fedora-extras-commits at redhat.com Tue Nov 7 15:01:19 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Tue, 7 Nov 2006 08:01:19 -0700 Subject: rpms/audacious/devel audacious.spec,1.14,1.15 Message-ID: <200611071501.kA7F1JCH016510@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13575 Modified Files: audacious.spec Log Message: - Add --enable-chardet Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- audacious.spec 7 Nov 2006 13:12:56 -0000 1.14 +++ audacious.spec 7 Nov 2006 15:00:48 -0000 1.15 @@ -1,6 +1,6 @@ Name: audacious Version: 1.1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -128,6 +128,7 @@ --disable-gnome-vfs \ --enable-amidiplug \ --disable-amidiplug-dummy \ + --enable-chardet \ --disable-dependency-tracking make V=1 %{?_smp_mflags} @@ -212,8 +213,9 @@ %changelog -* Tue Nov 7 2006 Ralf Ertzinger 1.1.2-6.fc7 +* Tue Nov 7 2006 Ralf Ertzinger 1.1.2-7.fc7 - Disable gnome-vfs, it causes too much trouble +- Add --enable-chardet * Mon Nov 06 2006 Ralf Ertzinger 1.1.2-4.fc7 - Decrease main window update frequency somewhat From fedora-extras-commits at redhat.com Tue Nov 7 15:04:54 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Tue, 7 Nov 2006 08:04:54 -0700 Subject: rpms/audacious/FC-6 audacious.spec,1.12,1.13 Message-ID: <200611071504.kA7F4sxN016583@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16567 Modified Files: audacious.spec Log Message: - Add --enable-chardet Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/FC-6/audacious.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- audacious.spec 7 Nov 2006 12:40:40 -0000 1.12 +++ audacious.spec 7 Nov 2006 15:04:23 -0000 1.13 @@ -1,6 +1,6 @@ Name: audacious Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -124,6 +124,7 @@ --disable-gnome-vfs \ --enable-amidiplug \ --disable-amidiplug-dummy \ + --enable-chardet \ --disable-dependency-tracking make V=1 %{?_smp_mflags} @@ -208,8 +209,9 @@ %changelog -* Tue Nov 7 2006 Ralf Ertzinger 1.1.2-3.fc6 +* Tue Nov 7 2006 Ralf Ertzinger 1.1.2-4.fc6 - Disable gnome-vfs, it causes too much trouble +- Add --enable-chardet * Wed Oct 18 2006 Ralf Ertzinger 1.1.2-2.fc6 - Add Obsoletes/Provides for BMP From fedora-extras-commits at redhat.com Tue Nov 7 16:18:28 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 7 Nov 2006 09:18:28 -0700 Subject: owners owners.list,1.1896,1.1897 Message-ID: <200611071618.kA7GISjl019928@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19908 Modified Files: owners.list Log Message: unorphaned mpc and gmpc Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1896 retrieving revision 1.1897 diff -u -r1.1896 -r1.1897 --- owners.list 6 Nov 2006 20:21:02 -0000 1.1896 +++ owners.list 7 Nov 2006 16:17:57 -0000 1.1897 @@ -537,7 +537,7 @@ Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org| Fedora Extras|glyph-keeper|Library for text rendering|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org| -Fedora Extras|gmpc|GNOME frontend for the MPD|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gmpc|GNOME frontend for the MPD|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|gnash|GNU flash movie player|pertusus at free.fr|extras-qa at fedoraproject.org|petersen at redhat.com Fedora Extras|gnet2|A simple network library built upon glib|tmraz at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|gnochm|CHM file viewer|pertusus at free.fr|extras-qa at fedoraproject.org| @@ -1093,7 +1093,7 @@ Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|mousepad|A simple text editor for Xfce|kevin at tummy.com|extras-qa at fedoraproject.org| -Fedora Extras|mpc|Command-line client for MPD|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|mpc|Command-line client for MPD|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|mtd-utils|Utilities for dealing with MTD (flash) devices|dwmw2 at redhat.com|extras-qa at fedoraproject.org|jwboyer at jdub.homelinux.org Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org| Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Nov 7 16:26:22 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:26:22 -0700 Subject: rpms/php-pear-Console-Getargs/devel .cvsignore, 1.3, 1.4 php-pear-Console-Getargs.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611071626.kA7GQMGr020133@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20113 Modified Files: .cvsignore php-pear-Console-Getargs.spec sources Log Message: update to 1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Oct 2006 16:43:00 -0000 1.3 +++ .cvsignore 7 Nov 2006 16:25:51 -0000 1.4 @@ -1 +1 @@ -Console_Getargs-1.3.2.tgz +Console_Getargs-1.3.3.tgz Index: php-pear-Console-Getargs.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/php-pear-Console-Getargs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-Console-Getargs.spec 4 Oct 2006 16:43:00 -0000 1.2 +++ php-pear-Console-Getargs.spec 7 Nov 2006 16:25:51 -0000 1.3 @@ -2,7 +2,7 @@ %define pear_name Console_Getargs Name: php-pear-Console-Getargs -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Command-line arguments and parameters parser Summary(fr): Analyseur des arguments et param??tres en ligne de commande @@ -82,6 +82,9 @@ %{pear_testdir}/%{pear_name} %changelog +* Tue Oct 7 2006 Remi Collet 1.3.3-1 +- update to 1.3.3 + * Wed Oct 4 2006 Remi Collet 1.3.2-1 - update to 1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 16:43:00 -0000 1.3 +++ sources 7 Nov 2006 16:25:51 -0000 1.4 @@ -1 +1 @@ -de2421c4d6409d84678d07afa2b59651 Console_Getargs-1.3.2.tgz +e35638dbaf82efbf9c431153b6dac796 Console_Getargs-1.3.3.tgz From fedora-extras-commits at redhat.com Tue Nov 7 16:30:21 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:30:21 -0700 Subject: rpms/php-pear-Net-FTP - New directory Message-ID: <200611071630.kA7GULlp020252@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-FTP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20248/php-pear-Net-FTP Log Message: Directory /cvs/extras/rpms/php-pear-Net-FTP added to the repository From fedora-extras-commits at redhat.com Tue Nov 7 16:30:27 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:30:27 -0700 Subject: rpms/php-pear-Net-FTP/devel - New directory Message-ID: <200611071630.kA7GURYM020266@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-FTP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20248/php-pear-Net-FTP/devel Log Message: Directory /cvs/extras/rpms/php-pear-Net-FTP/devel added to the repository From fedora-extras-commits at redhat.com Tue Nov 7 16:30:47 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:30:47 -0700 Subject: rpms/php-pear-Net-FTP Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611071630.kA7GUlRp020299@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-FTP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293 Added Files: Makefile import.log Log Message: Setup of module php-pear-Net-FTP --- NEW FILE Makefile --- # Top level Makefile for module php-pear-Net-FTP 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 Tue Nov 7 16:30:53 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:30:53 -0700 Subject: rpms/php-pear-Net-FTP/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611071630.kA7GUrBh020315@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-FTP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-Net-FTP --- 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 Nov 7 16:32:10 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:32:10 -0700 Subject: rpms/php-pear-Net-FTP import.log,1.1,1.2 Message-ID: <200611071632.kA7GWAPn020402@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-FTP In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365 Modified Files: import.log Log Message: auto-import php-pear-Net-FTP-1.3.2-1.fc6 on branch devel from php-pear-Net-FTP-1.3.2-1.fc6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-FTP/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Nov 2006 16:30:47 -0000 1.1 +++ import.log 7 Nov 2006 16:31:40 -0000 1.2 @@ -0,0 +1 @@ +php-pear-Net-FTP-1_3_2-1_fc6:HEAD:php-pear-Net-FTP-1.3.2-1.fc6.src.rpm:1162917091 From fedora-extras-commits at redhat.com Tue Nov 7 16:32:11 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:32:11 -0700 Subject: rpms/php-pear-Net-FTP/devel PHP-LICENSE-3.01, NONE, 1.1 php-pear-Net-FTP.spec, NONE, 1.1 xml2changelog, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611071632.kA7GWBtQ020406@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-FTP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365/devel Modified Files: .cvsignore sources Added Files: PHP-LICENSE-3.01 php-pear-Net-FTP.spec xml2changelog Log Message: auto-import php-pear-Net-FTP-1.3.2-1.fc6 on branch devel from php-pear-Net-FTP-1.3.2-1.fc6.src.rpm --- NEW FILE PHP-LICENSE-3.01 --- -------------------------------------------------------------------- The PHP License, version 3.01 Copyright (c) 1999 - 2006 The PHP Group. All rights reserved. -------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name "PHP" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact group at php.net. 4. Products derived from this software may not be called "PHP", nor may "PHP" appear in their name, without prior written permission from group at php.net. You may indicate that your software works in conjunction with PHP by saying "Foo for PHP" instead of calling it "PHP Foo" or "phpfoo" 5. The PHP Group may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. Once covered code has been published under a particular version of the license, you may always continue to use it under the terms of that version. You may also choose to use such covered code under the terms of any subsequent version of the license published by the PHP Group. No one other than the PHP Group has the right to modify the terms applicable to covered code created under this License. 6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes PHP software, freely available from ". THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------- This software consists of voluntary contributions made by many individuals on behalf of the PHP Group. The PHP Group can be contacted via Email at group at php.net. For more information on the PHP Group and the PHP project, please see . PHP includes the Zend Engine, freely available at . --- NEW FILE php-pear-Net-FTP.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Net_FTP Name: php-pear-Net-FTP Version: 1.3.2 Release: 1%{?dist} Summary: Provides an OO interface to the PHP FTP functions plus some additions Group: Development/Libraries License: PHP License URL: http://pear.php.net/package/Net_FTP Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz Source1: PHP-LICENSE-3.01 Source2: xml2changelog BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 dos2unix Requires: php-pear(PEAR) >= 1.3.0 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description Net_FTP allows you to communicate with FTP servers in a more comfortable way than the native FTP functions of PHP do. The class implements everything nativly supported by PHP and additionally features like recursive up- and downloading, dircreation and chmodding. It although implements an observer pattern to allow for example the view of a progress bar. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml %{__install} -m 644 -c %{SOURCE1} LICENSE cd %{pear_name}-%{version} %build cd %{pear_name}-%{version} # Empty build section, most likely nothing required. %install rm -rf $RPM_BUILD_ROOT docdir cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Move documentation mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir # Fix rpmlint warnings dos2unix ../docdir/example/observer.php # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean rm -rf $RPM_BUILD_ROOT %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc CHANGELOG LICENSE docdir/example %{pear_xmldir}/%{pear_name}.xml %{pear_phpdir}/Net %changelog * Sun Nov 5 2006 Remi Collet 1.3.2-1 - initial RPM (generated specfile + cleanup) - add CHANGELOG and LICENSE --- NEW FILE xml2changelog --- = "2"){ // Package.xml V 2.0 printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $xml->version->release, $xml->stability->release, $xml->version->api, $xml->stability->api, $xml->date, $xml->notes); foreach($xml->changelog->release as $rel) printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n", $rel->version->release, $rel->stability->release, $rel->version->api, $rel->stability->api, $rel->date, $rel->notes); } else { // Package.xml V 1.0 printf("* Version %s (%s) - %s\n\n%s\n\n", $xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes); foreach($xml->changelog->release as $rel) printf("* Version %s (%s) - %s\n\n%s\n\n", $rel->version, $rel->state, $rel->date, $rel->notes); } ?> Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-FTP/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Nov 2006 16:30:53 -0000 1.1 +++ .cvsignore 7 Nov 2006 16:31:41 -0000 1.2 @@ -0,0 +1 @@ +Net_FTP-1.3.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-FTP/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Nov 2006 16:30:53 -0000 1.1 +++ sources 7 Nov 2006 16:31:41 -0000 1.2 @@ -0,0 +1 @@ +fce386d6029e1171ab8f46c7568f2637 Net_FTP-1.3.2.tgz From fedora-extras-commits at redhat.com Tue Nov 7 16:35:29 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:35:29 -0700 Subject: owners owners.list,1.1897,1.1898 Message-ID: <200611071635.kA7GZTYK020466@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20450 Modified Files: owners.list Log Message: php-pear-Net-FTP Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1897 retrieving revision 1.1898 diff -u -r1.1897 -r1.1898 --- owners.list 7 Nov 2006 16:17:57 -0000 1.1897 +++ owners.list 7 Nov 2006 16:34:58 -0000 1.1898 @@ -1774,6 +1774,7 @@ Fedora Extras|php-pear-Mail-Mime|Classes to create and decode mime messages|fedora at theholbrooks.org|extras-qa at fedoraproject.org| Fedora Extras|php-pear-MDB2|Database Abstraction Layer|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Net-Curl|OO interface to PHP's cURL extension|chris.stone at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|php-pear-Net-FTP|Provides an OO interface to the PHP FTP functions plus some additions|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Net-SMTP|Provides an implementation of the SMTP protocol|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Net-Socket|Network Socket Interface|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Payment-Process|Unified payment processor|chris.stone at gmail.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Nov 7 16:38:59 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 7 Nov 2006 09:38:59 -0700 Subject: rpms/perl-Class-InsideOut/FC-6 perl-Class-InsideOut.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200611071638.kA7GcxXZ020589@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-serv20518/FC-6 Modified Files: perl-Class-InsideOut.spec sources Log Message: update to 1.03 Index: perl-Class-InsideOut.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-6/perl-Class-InsideOut.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-InsideOut.spec 1 Sep 2006 03:59:24 -0000 1.6 +++ perl-Class-InsideOut.spec 7 Nov 2006 16:38:29 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Class-InsideOut -Version: 1.02 -Release: 3%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: A safe, simple inside-out object construction kit Group: Development/Libraries @@ -45,11 +45,12 @@ %install rm -rf %{buildroot} + make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* +%{_fixperms} %{buildroot}/* %check make test @@ -61,12 +62,19 @@ %files %defattr(-,root,root,-) -%doc README Todo Changes LICENSE +# note that perl(base) ends up as a dep from the code under t/Object; however +# perl(base) is provided by perl, which is already a dep of this package, so +# no big deal. +%doc README Todo Changes LICENSE examples/ t/Object/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Tue Nov 07 2006 Chris Weyl 1.03-1 +- update to 1.03 +- minor spec tweaks + * Thu Aug 31 2006 Chris Weyl 1.02-3 - bump for mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Aug 2006 16:20:41 -0000 1.4 +++ sources 7 Nov 2006 16:38:29 -0000 1.5 @@ -1 +1 @@ -96d8ff279114bbd0ecbb26e890499b72 Class-InsideOut-1.02.tar.gz +ac3c30b555ecedb1c0da1f7380b99652 Class-InsideOut-1.03.tar.gz From fedora-extras-commits at redhat.com Tue Nov 7 16:39:00 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 7 Nov 2006 09:39:00 -0700 Subject: rpms/perl-Class-InsideOut/devel .cvsignore, 1.4, 1.5 perl-Class-InsideOut.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200611071639.kA7Gd0AX020594@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-serv20518/devel Modified Files: .cvsignore perl-Class-InsideOut.spec sources Log Message: update to 1.03 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Aug 2006 16:20:41 -0000 1.4 +++ .cvsignore 7 Nov 2006 16:38:30 -0000 1.5 @@ -1 +1 @@ -Class-InsideOut-1.02.tar.gz +Class-InsideOut-1.03.tar.gz Index: perl-Class-InsideOut.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/perl-Class-InsideOut.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Class-InsideOut.spec 1 Sep 2006 03:59:24 -0000 1.6 +++ perl-Class-InsideOut.spec 7 Nov 2006 16:38:30 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Class-InsideOut -Version: 1.02 -Release: 3%{?dist} +Version: 1.03 +Release: 1%{?dist} Summary: A safe, simple inside-out object construction kit Group: Development/Libraries @@ -45,11 +45,12 @@ %install rm -rf %{buildroot} + make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* +%{_fixperms} %{buildroot}/* %check make test @@ -61,12 +62,19 @@ %files %defattr(-,root,root,-) -%doc README Todo Changes LICENSE +# note that perl(base) ends up as a dep from the code under t/Object; however +# perl(base) is provided by perl, which is already a dep of this package, so +# no big deal. +%doc README Todo Changes LICENSE examples/ t/Object/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Tue Nov 07 2006 Chris Weyl 1.03-1 +- update to 1.03 +- minor spec tweaks + * Thu Aug 31 2006 Chris Weyl 1.02-3 - bump for mass rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Aug 2006 16:20:41 -0000 1.4 +++ sources 7 Nov 2006 16:38:30 -0000 1.5 @@ -1 +1 @@ -96d8ff279114bbd0ecbb26e890499b72 Class-InsideOut-1.02.tar.gz +ac3c30b555ecedb1c0da1f7380b99652 Class-InsideOut-1.03.tar.gz From fedora-extras-commits at redhat.com Tue Nov 7 16:38:57 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 7 Nov 2006 09:38:57 -0700 Subject: rpms/perl-Class-InsideOut Makefile,1.1,1.2 Message-ID: <200611071638.kA7Gcv3M020581@cvs-int.fedora.redhat.com> Author: cweyl Update of /cvs/extras/rpms/perl-Class-InsideOut In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20518 Modified Files: Makefile Log Message: update to 1.03 Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 7 Jul 2006 03:02:23 -0000 1.1 +++ Makefile 7 Nov 2006 16:38:27 -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 Nov 7 16:38:58 2006 From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl)) Date: Tue, 7 Nov 2006 09:38:58 -0700 Subject: rpms/perl-Class-InsideOut/FC-5 perl-Class-InsideOut.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200611071638.kA7Gcwod020585@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-serv20518/FC-5 Modified Files: perl-Class-InsideOut.spec sources Log Message: update to 1.03 Index: perl-Class-InsideOut.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-5/perl-Class-InsideOut.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-InsideOut.spec 16 Aug 2006 16:22:05 -0000 1.4 +++ perl-Class-InsideOut.spec 7 Nov 2006 16:38:28 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Class-InsideOut -Version: 1.02 +Version: 1.03 Release: 1%{?dist} Summary: A safe, simple inside-out object construction kit @@ -45,11 +45,12 @@ %install rm -rf %{buildroot} + make pure_install PERL_INSTALL_ROOT=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' -chmod -R u+w %{buildroot}/* +%{_fixperms} %{buildroot}/* %check make test @@ -61,12 +62,25 @@ %files %defattr(-,root,root,-) -%doc README Todo Changes LICENSE +# note that perl(base) ends up as a dep from the code under t/Object; however +# perl(base) is provided by perl, which is already a dep of this package, so +# no big deal. +%doc README Todo Changes LICENSE examples/ t/Object/ %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Tue Nov 07 2006 Chris Weyl 1.03-1 +- update to 1.03 +- minor spec tweaks + +* Thu Aug 31 2006 Chris Weyl 1.02-3 +- bump for mass rebuild + +* Wed Aug 16 2006 Chris Weyl 1.02-2 +- *sigh* tagging issues, so bump + * Wed Aug 16 2006 Chris Weyl 1.02-1 - update to 1.02 - dropped some depreciated spec bits Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Aug 2006 16:22:05 -0000 1.4 +++ sources 7 Nov 2006 16:38:28 -0000 1.5 @@ -1 +1 @@ -96d8ff279114bbd0ecbb26e890499b72 Class-InsideOut-1.02.tar.gz +ac3c30b555ecedb1c0da1f7380b99652 Class-InsideOut-1.03.tar.gz From fedora-extras-commits at redhat.com Tue Nov 7 16:49:34 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 7 Nov 2006 09:49:34 -0700 Subject: rpms/mpc/devel .cvsignore,1.3,1.4 mpc.spec,1.8,1.9 sources,1.3,1.4 Message-ID: <200611071649.kA7GnYbn020794@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/mpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20764 Modified Files: .cvsignore mpc.spec sources Log Message: * Tue Nov 07 2006 Adrian Reber - 0.12.0-1 - updated to 0.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mpc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Mar 2005 08:38:55 -0000 1.3 +++ .cvsignore 7 Nov 2006 16:49:03 -0000 1.4 @@ -1 +1 @@ -mpc-0.11.2.tar.gz +mpc-0.12.0.tar.bz2 Index: mpc.spec =================================================================== RCS file: /cvs/extras/rpms/mpc/devel/mpc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mpc.spec 30 Aug 2006 15:55:12 -0000 1.8 +++ mpc.spec 7 Nov 2006 16:49:03 -0000 1.9 @@ -1,12 +1,12 @@ Name: mpc Summary: Command-line client for MPD -Version: 0.11.2 -Release: 5%{?dist} +Version: 0.12.0 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.musicpd.org/mpc.shtml -Source0: http://mercury.chem.pitt.edu/~shank/mpc-0.11.2.tar.gz +Source0: http://mercury.chem.pitt.edu/~shank/mpc-0.12.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -47,6 +47,9 @@ %changelog +* Tue Nov 07 2006 Adrian Reber - 0.12.0-1 +- updated to 0.12.0 + * Wed Aug 30 2006 Aurelien Bompard 0.11.2-5 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/mpc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Mar 2005 08:38:55 -0000 1.3 +++ sources 7 Nov 2006 16:49:03 -0000 1.4 @@ -1 +1 @@ -c8411da7936662312cf9483f3490e285 mpc-0.11.2.tar.gz +9ec03c5f3d136a9a58ef665dfb100e52 mpc-0.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Nov 7 16:51:01 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:51:01 -0700 Subject: rpms/php-pear-Console-Getargs/FC-6 .cvsignore, 1.3, 1.4 php-pear-Console-Getargs.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200611071651.kA7Gp1re020880@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Console-Getargs/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20812 Modified Files: .cvsignore php-pear-Console-Getargs.spec sources Log Message: update to 1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Oct 2006 16:43:00 -0000 1.3 +++ .cvsignore 7 Nov 2006 16:50:30 -0000 1.4 @@ -1 +1 @@ -Console_Getargs-1.3.2.tgz +Console_Getargs-1.3.3.tgz Index: php-pear-Console-Getargs.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-6/php-pear-Console-Getargs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-pear-Console-Getargs.spec 4 Oct 2006 16:43:00 -0000 1.2 +++ php-pear-Console-Getargs.spec 7 Nov 2006 16:50:30 -0000 1.3 @@ -2,7 +2,7 @@ %define pear_name Console_Getargs Name: php-pear-Console-Getargs -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Command-line arguments and parameters parser Summary(fr): Analyseur des arguments et param??tres en ligne de commande @@ -82,6 +82,9 @@ %{pear_testdir}/%{pear_name} %changelog +* Tue Oct 7 2006 Remi Collet 1.3.3-1 +- update to 1.3.3 + * Wed Oct 4 2006 Remi Collet 1.3.2-1 - update to 1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 16:43:00 -0000 1.3 +++ sources 7 Nov 2006 16:50:30 -0000 1.4 @@ -1 +1 @@ -de2421c4d6409d84678d07afa2b59651 Console_Getargs-1.3.2.tgz +e35638dbaf82efbf9c431153b6dac796 Console_Getargs-1.3.3.tgz From fedora-extras-commits at redhat.com Tue Nov 7 16:53:04 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Tue, 7 Nov 2006 09:53:04 -0700 Subject: rpms/php-pear-Console-Getargs/FC-5 .cvsignore, 1.3, 1.4 php-pear-Console-Getargs.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200611071653.kA7Gr4fw020969@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Console-Getargs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945 Modified Files: .cvsignore php-pear-Console-Getargs.spec sources Log Message: update to 1.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Oct 2006 16:44:38 -0000 1.3 +++ .cvsignore 7 Nov 2006 16:52:34 -0000 1.4 @@ -1 +1 @@ -Console_Getargs-1.3.2.tgz +Console_Getargs-1.3.3.tgz Index: php-pear-Console-Getargs.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/php-pear-Console-Getargs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pear-Console-Getargs.spec 4 Oct 2006 16:44:38 -0000 1.3 +++ php-pear-Console-Getargs.spec 7 Nov 2006 16:52:34 -0000 1.4 @@ -2,7 +2,7 @@ %define pear_name Console_Getargs Name: php-pear-Console-Getargs -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Command-line arguments and parameters parser Summary(fr): Analyseur des arguments et param??tres en ligne de commande @@ -82,6 +82,9 @@ %{pear_testdir}/%{pear_name} %changelog +* Tue Oct 7 2006 Remi Collet 1.3.3-1 +- update to 1.3.3 + * Wed Oct 4 2006 Remi Collet 1.3.2-1 - update to 1.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Oct 2006 16:44:38 -0000 1.3 +++ sources 7 Nov 2006 16:52:34 -0000 1.4 @@ -1 +1 @@ -de2421c4d6409d84678d07afa2b59651 Console_Getargs-1.3.2.tgz +e35638dbaf82efbf9c431153b6dac796 Console_Getargs-1.3.3.tgz From fedora-extras-commits at redhat.com Tue Nov 7 16:56:17 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 7 Nov 2006 09:56:17 -0700 Subject: rpms/openal/FC-5 openal.spec,1.19,1.20 Message-ID: <200611071656.kA7GuHaK021095@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/FC-5 Modified Files: openal.spec Log Message: - fix #190438 Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/FC-5/openal.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- openal.spec 21 Aug 2006 07:41:16 -0000 1.19 +++ openal.spec 7 Nov 2006 16:55:47 -0000 1.20 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.6.20060204cvs%{?dist} +Release: 0.7.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -78,7 +78,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc - +rm -rf common/specification/CVS %clean rm -rf ${RPM_BUILD_ROOT} @@ -103,6 +103,10 @@ %changelog +* Tue Nov 07 2006 Andreas Bierfert +0.0.9-0.7.20060204 +- fix #190438 + * Mon Aug 21 2006 Andreas Bierfert 0.0.9-0.6.20060204 - apply patch from Hans de Goede (#202260) From fedora-extras-commits at redhat.com Tue Nov 7 16:56:16 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 7 Nov 2006 09:56:16 -0700 Subject: rpms/openal/FC-3 openal.spec,1.14,1.15 Message-ID: <200611071656.kA7GuGmU021089@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/FC-3 Modified Files: openal.spec Log Message: - fix #190438 Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/FC-3/openal.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- openal.spec 21 Aug 2006 07:55:37 -0000 1.14 +++ openal.spec 7 Nov 2006 16:55:46 -0000 1.15 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.5.20060204cvs%{?dist} +Release: 0.6.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -77,7 +77,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc - +rm -rf common/specification/CVS %clean rm -rf ${RPM_BUILD_ROOT} @@ -102,6 +102,10 @@ %changelog +* Tue Nov 07 2006 Andreas Bierfert +0.0.9-0.6.20060204 +- fix #190438 + * Mon Aug 21 2006 Andreas Bierfert 0.0.9-0.5.20060204 - apply patch from Hans de Goede (#202260) From fedora-extras-commits at redhat.com Tue Nov 7 16:56:17 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 7 Nov 2006 09:56:17 -0700 Subject: rpms/openal/FC-4 openal.spec,1.19,1.20 Message-ID: <200611071656.kA7GuH6a021092@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/FC-4 Modified Files: openal.spec Log Message: - fix #190438 Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- openal.spec 21 Aug 2006 07:55:38 -0000 1.19 +++ openal.spec 7 Nov 2006 16:55:47 -0000 1.20 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.5.20060204cvs%{?dist} +Release: 0.6.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -77,7 +77,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc - +rm -rf common/specification/CVS %clean rm -rf ${RPM_BUILD_ROOT} @@ -102,6 +102,10 @@ %changelog +* Tue Nov 07 2006 Andreas Bierfert +0.0.9-0.6.20060204 +- fix #190438 + * Mon Aug 21 2006 Andreas Bierfert 0.0.9-0.5.20060204 - apply patch from Hans de Goede (#202260) From fedora-extras-commits at redhat.com Tue Nov 7 16:56:24 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 7 Nov 2006 09:56:24 -0700 Subject: rpms/openal/devel openal.spec,1.20,1.21 Message-ID: <200611071656.kA7GuOl0021101@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/devel Modified Files: openal.spec Log Message: - fix #190438 Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- openal.spec 15 Sep 2006 06:42:03 -0000 1.20 +++ openal.spec 7 Nov 2006 16:55:54 -0000 1.21 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.8.20060204cvs%{?dist} +Release: 0.9.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -77,7 +77,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc - +rm -rf common/specification/CVS %clean rm -rf ${RPM_BUILD_ROOT} @@ -102,6 +102,10 @@ %changelog +* Sat Nov 04 2006 Andreas Bierfert +0.0.9-0.9.20060204 +- fix #190438 + * Fri Sep 15 2006 Andreas Bierfert 0.0.9-0.8.20060204 - FE6 rebuild From fedora-extras-commits at redhat.com Tue Nov 7 16:56:23 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 7 Nov 2006 09:56:23 -0700 Subject: rpms/openal/FC-6 openal.spec,1.20,1.21 Message-ID: <200611071656.kA7GuNDZ021098@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/openal/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/FC-6 Modified Files: openal.spec Log Message: - fix #190438 Index: openal.spec =================================================================== RCS file: /cvs/extras/rpms/openal/FC-6/openal.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- openal.spec 15 Sep 2006 06:42:03 -0000 1.20 +++ openal.spec 7 Nov 2006 16:55:53 -0000 1.21 @@ -1,6 +1,6 @@ Name: openal Version: 0.0.9 -Release: 0.8.20060204cvs%{?dist} +Release: 0.9.20060204cvs%{?dist} Summary: Open Audio Library Group: System Environment/Libraries @@ -77,7 +77,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc - +rm -rf common/specification/CVS %clean rm -rf ${RPM_BUILD_ROOT} @@ -102,6 +102,10 @@ %changelog +* Sat Nov 04 2006 Andreas Bierfert +0.0.9-0.9.20060204 +- fix #190438 + * Fri Sep 15 2006 Andreas Bierfert 0.0.9-0.8.20060204 - FE6 rebuild From fedora-extras-commits at redhat.com Tue Nov 7 17:28:05 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Tue, 7 Nov 2006 10:28:05 -0700 Subject: rpms/vpnc/devel vpnc-0.3.3-cloexec.patch, NONE, 1.1 vpnc.spec, 1.17, 1.18 Message-ID: <200611071728.kA7HS5Wi024402@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24383 Modified Files: vpnc.spec Added Files: vpnc-0.3.3-cloexec.patch Log Message: * Tue Nov 7 2006 Tomas Mraz - 0.3.3-13 - don't leak socket fds vpnc-0.3.3-cloexec.patch: --- NEW FILE vpnc-0.3.3-cloexec.patch --- --- vpnc-0.3.3/vpnc.c.cloexec 2006-11-07 18:00:52.000000000 +0100 +++ vpnc-0.3.3/vpnc.c 2006-11-07 18:06:29.000000000 +0100 @@ -221,6 +221,8 @@ if (sock < 0) error(1, errno, "making socket"); + fcntl(sock, F_SETFD, FD_CLOEXEC); + /* Give the socket a name. */ name.sin_family = AF_INET; name.sin_port = port; @@ -2216,6 +2218,7 @@ if (tunnelfd == -1) { error(1, errno, "socket(SOCK_RAW) failed"); } + fcntl(tunnelfd, F_SETFD, FD_CLOEXEC); } } if (dh_grp) Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- vpnc.spec 12 Sep 2006 16:38:12 -0000 1.17 +++ vpnc.spec 7 Nov 2006 17:27:35 -0000 1.18 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.3 -Release: 12 +Release: 13%{?dist} Summary: IPSec VPN client compatible with Cisco equipment @@ -14,6 +14,7 @@ Patch2: vpnc-0.3.3-ip-output.patch Patch3: vpnc-0.3.3-no-srcport.patch Patch4: vpnc-0.3.3-rekeying.patch +Patch5: vpnc-0.3.3-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +34,7 @@ %patch2 -p1 -b .ip-output %patch3 -p1 -b .no-srcport %patch4 -p1 -b .rekeying +%patch5 -p1 -b .cloexec %build make PREFIX=/usr @@ -65,6 +67,9 @@ %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup %changelog +* Tue Nov 7 2006 Tomas Mraz - 0.3.3-13 +- don't leak socket fds + * Tue Sep 12 2006 Tomas Mraz - 0.3.3-12 - drop hoplimit from ip route output (#205923) - let's try enabling -fstack-protector again, seems to work now From fedora-extras-commits at redhat.com Tue Nov 7 17:46:49 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Tue, 7 Nov 2006 10:46:49 -0700 Subject: rpms/vpnc/FC-6 vpnc-0.3.3-cloexec.patch, NONE, 1.1 vpnc.spec, 1.17, 1.18 Message-ID: <200611071746.kA7HknqB024548@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/vpnc/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24529 Modified Files: vpnc.spec Added Files: vpnc-0.3.3-cloexec.patch Log Message: * Tue Nov 7 2006 Tomas Mraz - 0.3.3-13 - don't leak socket fds vpnc-0.3.3-cloexec.patch: --- NEW FILE vpnc-0.3.3-cloexec.patch --- --- vpnc-0.3.3/vpnc.c.cloexec 2006-11-07 18:00:52.000000000 +0100 +++ vpnc-0.3.3/vpnc.c 2006-11-07 18:06:29.000000000 +0100 @@ -221,6 +221,8 @@ if (sock < 0) error(1, errno, "making socket"); + fcntl(sock, F_SETFD, FD_CLOEXEC); + /* Give the socket a name. */ name.sin_family = AF_INET; name.sin_port = port; @@ -2216,6 +2218,7 @@ if (tunnelfd == -1) { error(1, errno, "socket(SOCK_RAW) failed"); } + fcntl(tunnelfd, F_SETFD, FD_CLOEXEC); } } if (dh_grp) Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/FC-6/vpnc.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- vpnc.spec 12 Sep 2006 16:38:12 -0000 1.17 +++ vpnc.spec 7 Nov 2006 17:46:19 -0000 1.18 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.3 -Release: 12 +Release: 13%{?dist} Summary: IPSec VPN client compatible with Cisco equipment @@ -14,6 +14,7 @@ Patch2: vpnc-0.3.3-ip-output.patch Patch3: vpnc-0.3.3-no-srcport.patch Patch4: vpnc-0.3.3-rekeying.patch +Patch5: vpnc-0.3.3-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +34,7 @@ %patch2 -p1 -b .ip-output %patch3 -p1 -b .no-srcport %patch4 -p1 -b .rekeying +%patch5 -p1 -b .cloexec %build make PREFIX=/usr @@ -65,6 +67,9 @@ %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup %changelog +* Tue Nov 7 2006 Tomas Mraz - 0.3.3-13 +- don't leak socket fds + * Tue Sep 12 2006 Tomas Mraz - 0.3.3-12 - drop hoplimit from ip route output (#205923) - let's try enabling -fstack-protector again, seems to work now From fedora-extras-commits at redhat.com Tue Nov 7 19:10:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 7 Nov 2006 12:10:35 -0700 Subject: rpms/gcompris/devel .cvsignore, 1.4, 1.5 gcompris.spec, 1.16, 1.17 sources, 1.4, 1.5 gcompris-8.0-fullscreen.patch, 1.1, NONE gcompris-8.0-silence.patch, 1.1, NONE gcompris-8.0-warn.patch, 1.1, NONE gcompris.6, 1.1, NONE Message-ID: <200611071910.kA7JAZVr030988@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30964 Modified Files: .cvsignore gcompris.spec sources Removed Files: gcompris-8.0-fullscreen.patch gcompris-8.0-silence.patch gcompris-8.0-warn.patch gcompris.6 Log Message: * Tue Nov 7 2006 Hans de Goede 8.2-1 - New upstream release 8.2 - Drop most patches (integrated upstream) - Drop seperate / addon man page (integrated upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Oct 2006 14:41:12 -0000 1.4 +++ .cvsignore 7 Nov 2006 19:10:04 -0000 1.5 @@ -1 +1 @@ -gcompris-8.1.tar.gz +gcompris-8.2.tar.gz Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcompris.spec 15 Oct 2006 15:08:23 -0000 1.16 +++ gcompris.spec 7 Nov 2006 19:10:04 -0000 1.17 @@ -1,16 +1,12 @@ Name: gcompris -Version: 8.1 +Version: 8.2 Release: 1%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL URL: http://gcompris.net Source0: http://download.sf.net/%{name}/%{name}-%{version}.tar.gz -Source1: gcompris.6 -Patch0: gcompris-8.0-warn.patch -Patch1: gcompris-8.0-fullscreen.patch -Patch2: gcompris-8.0-silence.patch -Patch3: gcompris-8.1-icon.patch +Patch0: gcompris-8.1-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel python-devel gnet2-devel Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel @@ -180,6 +176,14 @@ Voice samples for the GCompris games in Russian. +%package sound-so +Summary: GCompris voices in Somali +Group: Amusements/Games + +%description sound-so +Voice samples for the GCompris games in Somali. + + %package sound-sv Summary: GCompris voices in Swedish Group: Amusements/Games @@ -215,9 +219,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp mv tmp docs/C/gcompris.info @@ -240,8 +241,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6 rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -440,6 +439,13 @@ %dir %{_datadir}/gcompris/boards/sounds %{_datadir}/gcompris/boards/sounds/ru +%files sound-so +%defattr(-,root,root,-) +%dir %{_datadir}/gcompris +%dir %{_datadir}/gcompris/boards +%dir %{_datadir}/gcompris/boards/sounds +%{_datadir}/gcompris/boards/sounds/so + %files sound-sv %defattr(-,root,root,-) %dir %{_datadir}/gcompris @@ -469,6 +475,11 @@ %changelog +* Tue Nov 7 2006 Hans de Goede 8.2-1 +- New upstream release 8.2 +- Drop most patches (integrated upstream) +- Drop seperate / addon man page (integrated upstream) + * Sun Oct 15 2006 Hans de Goede 8.1-1 - New upstream release 8.1 - Drop most patches (integrated upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcompris/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Oct 2006 14:41:12 -0000 1.4 +++ sources 7 Nov 2006 19:10:04 -0000 1.5 @@ -1 +1 @@ -439b70411ccdbd99c6391d6bfb5e6fb6 gcompris-8.1.tar.gz +56849e2b09bea6a47eb6f177cc85258f gcompris-8.2.tar.gz --- gcompris-8.0-fullscreen.patch DELETED --- --- gcompris-8.0-silence.patch DELETED --- --- gcompris-8.0-warn.patch DELETED --- --- gcompris.6 DELETED --- From fedora-extras-commits at redhat.com Tue Nov 7 19:11:49 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 7 Nov 2006 12:11:49 -0700 Subject: rpms/gcompris/FC-6 .cvsignore, 1.4, 1.5 gcompris.spec, 1.16, 1.17 sources, 1.4, 1.5 gcompris-8.0-fullscreen.patch, 1.1, NONE gcompris-8.0-silence.patch, 1.1, NONE gcompris-8.0-warn.patch, 1.1, NONE gcompris.6, 1.1, NONE Message-ID: <200611071911.kA7JBnrY031062@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31039 Modified Files: .cvsignore gcompris.spec sources Removed Files: gcompris-8.0-fullscreen.patch gcompris-8.0-silence.patch gcompris-8.0-warn.patch gcompris.6 Log Message: * Tue Nov 7 2006 Hans de Goede 8.2-1 - New upstream release 8.2 - Drop most patches (integrated upstream) - Drop seperate / addon man page (integrated upstream) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Oct 2006 14:41:12 -0000 1.4 +++ .cvsignore 7 Nov 2006 19:11:19 -0000 1.5 @@ -1 +1 @@ -gcompris-8.1.tar.gz +gcompris-8.2.tar.gz Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-6/gcompris.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcompris.spec 15 Oct 2006 15:08:23 -0000 1.16 +++ gcompris.spec 7 Nov 2006 19:11:19 -0000 1.17 @@ -1,16 +1,12 @@ Name: gcompris -Version: 8.1 +Version: 8.2 Release: 1%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL URL: http://gcompris.net Source0: http://download.sf.net/%{name}/%{name}-%{version}.tar.gz -Source1: gcompris.6 -Patch0: gcompris-8.0-warn.patch -Patch1: gcompris-8.0-fullscreen.patch -Patch2: gcompris-8.0-silence.patch -Patch3: gcompris-8.1-icon.patch +Patch0: gcompris-8.1-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: libgnomeui-devel sqlite-devel python-devel gnet2-devel Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel @@ -180,6 +176,14 @@ Voice samples for the GCompris games in Russian. +%package sound-so +Summary: GCompris voices in Somali +Group: Amusements/Games + +%description sound-so +Voice samples for the GCompris games in Somali. + + %package sound-sv Summary: GCompris voices in Swedish Group: Amusements/Games @@ -215,9 +219,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp mv tmp docs/C/gcompris.info @@ -240,8 +241,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6 rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -440,6 +439,13 @@ %dir %{_datadir}/gcompris/boards/sounds %{_datadir}/gcompris/boards/sounds/ru +%files sound-so +%defattr(-,root,root,-) +%dir %{_datadir}/gcompris +%dir %{_datadir}/gcompris/boards +%dir %{_datadir}/gcompris/boards/sounds +%{_datadir}/gcompris/boards/sounds/so + %files sound-sv %defattr(-,root,root,-) %dir %{_datadir}/gcompris @@ -469,6 +475,11 @@ %changelog +* Tue Nov 7 2006 Hans de Goede 8.2-1 +- New upstream release 8.2 +- Drop most patches (integrated upstream) +- Drop seperate / addon man page (integrated upstream) + * Sun Oct 15 2006 Hans de Goede 8.1-1 - New upstream release 8.1 - Drop most patches (integrated upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Oct 2006 14:41:12 -0000 1.4 +++ sources 7 Nov 2006 19:11:19 -0000 1.5 @@ -1 +1 @@ -439b70411ccdbd99c6391d6bfb5e6fb6 gcompris-8.1.tar.gz +56849e2b09bea6a47eb6f177cc85258f gcompris-8.2.tar.gz --- gcompris-8.0-fullscreen.patch DELETED --- --- gcompris-8.0-silence.patch DELETED --- --- gcompris-8.0-warn.patch DELETED --- --- gcompris.6 DELETED --- From fedora-extras-commits at redhat.com Tue Nov 7 19:17:11 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 7 Nov 2006 12:17:11 -0700 Subject: rpms/gcompris/FC-5 gcompris-8.1-icon.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gcompris.spec, 1.9, 1.10 sources, 1.3, 1.4 U006A.ogg, 1.1, NONE gcompris-7.4-xf86vidmode.patch, 1.4, NONE gcompris-7.4-xf86vidmode2.patch, 1.1, NONE gcompris-7.4-xf86vidmode3.patch, 1.1, NONE gcompris-click_on_letter.patch, 1.1, NONE gcompris-electric.patch, 1.1, NONE gcompris-nl.patch, 1.1, NONE gcompris-sys-assetml.patch, 1.1, NONE gcompris.6, 1.1, NONE Message-ID: <200611071917.kA7JHBCo031168@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gcompris/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31145 Modified Files: .cvsignore gcompris.spec sources Added Files: gcompris-8.1-icon.patch Removed Files: U006A.ogg gcompris-7.4-xf86vidmode.patch gcompris-7.4-xf86vidmode2.patch gcompris-7.4-xf86vidmode3.patch gcompris-click_on_letter.patch gcompris-electric.patch gcompris-nl.patch gcompris-sys-assetml.patch gcompris.6 Log Message: * Tue Nov 7 2006 Hans de Goede 8.2-1 - New upstream release 8.2 - Drop most patches (integrated upstream) - Drop seperate / addon man page (integrated upstream) gcompris-8.1-icon.patch: --- NEW FILE gcompris-8.1-icon.patch --- --- gcompris-8.1/src/gcompris/gcompris.c~ 2006-10-15 14:44:14.000000000 +0200 +++ gcompris-8.1/src/gcompris/gcompris.c 2006-10-15 14:44:14.000000000 +0200 @@ -625,7 +625,7 @@ * Set an icon for gcompris * ------------------------ */ - icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL); + icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL); if (!g_file_test (icon_file, G_FILE_TEST_EXISTS)) { /* Now check if this file is on the net */ icon_file = gc_net_get_url_from_file("gcompris.png", NULL); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Aug 2006 10:35:38 -0000 1.3 +++ .cvsignore 7 Nov 2006 19:16:40 -0000 1.4 @@ -1,2 +1 @@ -gcompris-7.4.tar.gz -gcompris-africa-patch.tar.gz +gcompris-8.2.tar.gz Index: gcompris.spec =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gcompris.spec 13 Aug 2006 10:35:38 -0000 1.9 +++ gcompris.spec 7 Nov 2006 19:16:40 -0000 1.10 @@ -1,29 +1,19 @@ Name: gcompris -Version: 7.4 -Release: 13%{?dist} +Version: 8.2 +Release: 1%{?dist} Summary: Educational suite for kids 2-10 years old Group: Amusements/Games License: GPL URL: http://gcompris.net Source0: http://download.sf.net/%{name}/%{name}-%{version}.tar.gz -Source1: gcompris.6 -Source2: U006A.ogg -Source3: gcompris-africa-patch.tar.gz -Patch1: gcompris-sys-assetml.patch -Patch2: gcompris-nl.patch -Patch3: gcompris-electric.patch -Patch4: gcompris-click_on_letter.patch -Patch5: gcompris-7.4-xf86vidmode.patch -Patch6: gcompris-7.4-xf86vidmode2.patch -Patch7: gcompris-7.4-xf86vidmode3.patch +Patch0: gcompris-8.1-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildrequires: libgnomeui-devel sqlite-devel libassetml-devel python-devel +Buildrequires: libgnomeui-devel sqlite-devel python-devel gnet2-devel Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel -Buildrequires: xorg-x11-proto-devel -Buildrequires: gnome-python2-canvas python-sqlite2 texinfo texi2html -Buildrequires: perl(XML::Parser) gettext desktop-file-utils gnuchess -Requires: gnuchess gnucap tuxpaint gcompris-flags -Requires: gnome-python2-canvas python-sqlite2 +Buildrequires: gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html +Buildrequires: texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess +Requires: gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme +Requires: pygtk2 python-sqlite2 Requires: %{name}-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -82,114 +72,116 @@ Developmental files for the core-engine library of GCompris +%package sound-cs +Summary: GCompris voices in Tsjech +Group: Amusements/Games + +%description sound-cs +Voice samples for the GCompris games in Tsjech. + + %package sound-da Summary: GCompris voices in Danish Group: Amusements/Games -Requires: /usr/share/assetml %description sound-da -Voice samples for the GCompris games in Danish, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Danish. %package sound-de Summary: GCompris voices in German Group: Amusements/Games -Requires: /usr/share/assetml %description sound-de -Voice samples for the GCompris games in German, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in German. %package sound-en Summary: GCompris voices in English Group: Amusements/Games -Requires: /usr/share/assetml %description sound-en -Voice samples for the GCompris games in English, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in English. %package sound-es Summary: GCompris voices in Spanish Group: Amusements/Games -Requires: /usr/share/assetml %description sound-es -Voice samples for the GCompris games in Spanish, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Spanish. %package sound-fi Summary: GCompris voices in Finish Group: Amusements/Games -Requires: /usr/share/assetml %description sound-fi -Voice samples for the GCompris games in Finish, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Finish. %package sound-fr Summary: GCompris voices in French Group: Amusements/Games -Requires: /usr/share/assetml %description sound-fr -Voice samples for the GCompris games in French, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in French. %package sound-hu Summary: GCompris voices in Hungarian Group: Amusements/Games -Requires: /usr/share/assetml %description sound-hu -Voice samples for the GCompris games in Hungarian, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Hungarian. %package sound-it Summary: GCompris voices in Italian Group: Amusements/Games -Requires: /usr/share/assetml %description sound-it -Voice samples for the GCompris games in Italian, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Italian. + + +%package sound-mr +Summary: GCompris voices in Indian Marathi +Group: Amusements/Games + +%description sound-mr +Voice samples for the GCompris games in Indian Marathi. %package sound-nl Summary: GCompris voices in Dutch Group: Amusements/Games -Requires: /usr/share/assetml %description sound-nl -Voice samples for the GCompris games in Dutch, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Dutch. %package sound-pt Summary: GCompris voices in Portuguese Group: Amusements/Games -Requires: /usr/share/assetml %description sound-pt -Voice samples for the GCompris games in Portuguese, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Portuguese. %package sound-ru Summary: GCompris voices in Russian Group: Amusements/Games -Requires: /usr/share/assetml %description sound-ru -Voice samples for the GCompris games in Russian, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Russian. + + +%package sound-so +Summary: GCompris voices in Somali +Group: Amusements/Games + +%description sound-so +Voice samples for the GCompris games in Somali. %package sound-sv @@ -197,8 +189,15 @@ Group: Amusements/Games %description sound-sv -Voice samples for the GCompris games in Swedish, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Swedish. + + +%package sound-tr +Summary: GCompris voices in Turk +Group: Amusements/Games + +%description sound-tr +Voice samples for the GCompris games in Turk. %package sound-eu @@ -206,8 +205,7 @@ Group: Amusements/Games %description sound-eu -Voice samples for the GCompris games in Basque, these come with an assetml -description so they could potentially be used by other packages. +Voice samples for the GCompris games in Basque. %package flags @@ -215,56 +213,20 @@ Group: Amusements/Games %description flags -Country flags for use with GCompris (60x40 PNG), these come with an assetml -description so they could potentially be used by other packages. +Country flags for use with GCompris (60x40 PNG). %prep %setup -q -%patch1 -p1 -z .sysassetml -E -# no backup files for this patch, otherwise they get installed under /usr/share -%patch2 -p1 -%patch3 -p1 -z .electric -%patch4 -p1 -z .click_on_letter -%patch5 -p1 -z .xf86vm -%patch6 -p1 -z .xf86vm2 -%patch7 -p1 -z .xf86vm3 +%patch0 -p1 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp mv tmp docs/C/gcompris.info -# fix gnome.canvas deprecation warnings -for i in src/boards/python.c `find src/boards/python -name "*.py"`; do - %{__sed} -i 's/gnome\.canvas/gnomecanvas/g' $i -done -# fix up broken dutch alphabet sounds -pushd boards/sounds/nl/alphabet -for i in U007{B..F}.ogg; do - mv $i `echo $i|%{__sed} s/7/6/` -done -cp %{SOURCE2} . -popd -# fix up missing dutch "ok zo" sound -pushd boards/sounds/nl/misc -cp ok.ogg check_answer.ogg -popd -# fixup african maps with files from CVS (BZ 197758) -tar xfz %{SOURCE3} -# these are no longer used -rm boards/geography/africa/north_africa.xcf \ - boards/geography/afrique/burundi.png \ - boards/geography/afrique/djibouti.png \ - boards/geography/afrique/equatorial_guinea.png \ - boards/geography/afrique/gambia.png \ - boards/geography/afrique/guinea_bissau.png \ - boards/geography/afrique/lesotho.png \ - boards/geography/afrique/rwanda.png \ - boards/geography/afrique/sierra_leone.png \ - boards/geography/afrique/swaziland.png %build # The configure check for python-gnome.canvas fails without X running, # --enable-py-build-only works around this -%configure --enable-py-build-only +%configure --enable-py-build-only --enable-gnet # we can't use %%{?_smp_mflags} because that breaks compilation! make # Fixup the desktop files a bit, we don't use a patch because that breaks @@ -279,8 +241,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6 rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -353,6 +313,7 @@ %{_datadir}/gcompris/boards/l* %{_datadir}/gcompris/boards/m* %{_datadir}/gcompris/boards/n* +%{_datadir}/gcompris/boards/o* %{_datadir}/gcompris/boards/p* %{_datadir}/gcompris/boards/r* %{_datadir}/gcompris/boards/s*.xml @@ -365,6 +326,7 @@ %{_datadir}/gcompris/boards/sounds/chronos %{_datadir}/gcompris/boards/sounds/LuneRouge %{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE +%{_datadir}/gcompris/boards/sounds/README %{_datadir}/gcompris/boards/submarine %{_datadir}/gcompris/boards/t* %{_datadir}/gcompris/boards/w* @@ -385,9 +347,15 @@ %{_libdir}/libgcompris-1.so %{_libdir}/pkgconfig/libgcompris-1.0.pc +%files sound-cs +%defattr(-,root,root,-) +%dir %{_datadir}/gcompris +%dir %{_datadir}/gcompris/boards +%dir %{_datadir}/gcompris/boards/sounds +%{_datadir}/gcompris/boards/sounds/cs + %files sound-da %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_da.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -395,7 +363,6 @@ %files sound-de %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_de.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -403,7 +370,6 @@ %files sound-en %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_en.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -411,7 +377,6 @@ %files sound-es %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_es.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -419,7 +384,6 @@ %files sound-fi %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_fi.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -427,7 +391,6 @@ %files sound-fr %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_fr.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -435,7 +398,6 @@ %files sound-hu %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_hu.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -443,15 +405,20 @@ %files sound-it %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_it.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds %{_datadir}/gcompris/boards/sounds/it +%files sound-mr +%defattr(-,root,root,-) +%dir %{_datadir}/gcompris +%dir %{_datadir}/gcompris/boards +%dir %{_datadir}/gcompris/boards/sounds +%{_datadir}/gcompris/boards/sounds/mr + %files sound-nl %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_nl.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -459,31 +426,42 @@ %files sound-pt %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_pt.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds %{_datadir}/gcompris/boards/sounds/pt +%{_datadir}/gcompris/boards/sounds/pt_BR %files sound-ru %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_ru.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds %{_datadir}/gcompris/boards/sounds/ru +%files sound-so +%defattr(-,root,root,-) +%dir %{_datadir}/gcompris +%dir %{_datadir}/gcompris/boards +%dir %{_datadir}/gcompris/boards/sounds +%{_datadir}/gcompris/boards/sounds/so + %files sound-sv %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_sv.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds %{_datadir}/gcompris/boards/sounds/sv +%files sound-tr +%defattr(-,root,root,-) +%dir %{_datadir}/gcompris +%dir %{_datadir}/gcompris/boards +%dir %{_datadir}/gcompris/boards/sounds +%{_datadir}/gcompris/boards/sounds/tr + %files sound-eu %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_*_eu.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %dir %{_datadir}/gcompris/boards/sounds @@ -491,13 +469,24 @@ %files flags %defattr(-,root,root,-) -%{_datadir}/assetml/gcompris_flags.assetml %dir %{_datadir}/gcompris %dir %{_datadir}/gcompris/boards %{_datadir}/gcompris/boards/flags %changelog +* Tue Nov 7 2006 Hans de Goede 8.2-1 +- New upstream release 8.2 +- Drop most patches (integrated upstream) +- Drop seperate / addon man page (integrated upstream) + +* Sun Oct 15 2006 Hans de Goede 8.1-1 +- New upstream release 8.1 +- Drop most patches (integrated upstream) + +* Mon Aug 28 2006 Hans de Goede 7.4-14 +- FE6 Rebuild + * Sun Aug 13 2006 Hans de Goede 7.4-13 - Fix BZ 197758 (backport from upstream CVS) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcompris/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Aug 2006 10:35:38 -0000 1.3 +++ sources 7 Nov 2006 19:16:40 -0000 1.4 @@ -1,2 +1 @@ -d80e55da21170a98d671c98b3e582cc3 gcompris-7.4.tar.gz -bc3d9ba72b4dd9742859ec6b90d12056 gcompris-africa-patch.tar.gz +56849e2b09bea6a47eb6f177cc85258f gcompris-8.2.tar.gz --- U006A.ogg DELETED --- --- gcompris-7.4-xf86vidmode.patch DELETED --- --- gcompris-7.4-xf86vidmode2.patch DELETED --- --- gcompris-7.4-xf86vidmode3.patch DELETED --- --- gcompris-click_on_letter.patch DELETED --- --- gcompris-electric.patch DELETED --- --- gcompris-nl.patch DELETED --- --- gcompris-sys-assetml.patch DELETED --- --- gcompris.6 DELETED --- From fedora-extras-commits at redhat.com Tue Nov 7 21:44:38 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Tue, 7 Nov 2006 14:44:38 -0700 Subject: rpms/audacity/FC-6 audacity.spec,1.16,1.17 Message-ID: <200611072144.kA7LicX6005306@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/FC-6 Modified Files: audacity.spec Log Message: Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- audacity.spec 3 Nov 2006 21:51:51 -0000 1.16 +++ audacity.spec 7 Nov 2006 21:44:07 -0000 1.17 @@ -1,6 +1,6 @@ Name: audacity Version: 1.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -57,7 +57,7 @@ do perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i done -%ifarch ppc ppc64 +%ifnarch %{ix86} x86_64 # this flag is not available on ppc perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.* %endif @@ -123,6 +123,9 @@ %doc %{_datadir}/doc/* %changelog +* Tue Nov 7 2006 Gerard Milmeister - 1.2.5-3 +- msse flag only on intel + * Fri Nov 3 2006 Gerard Milmeister - 1.2.5-2 - remove -msse flag for ppc From fedora-extras-commits at redhat.com Tue Nov 7 21:44:38 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Tue, 7 Nov 2006 14:44:38 -0700 Subject: rpms/audacity/devel audacity.spec,1.16,1.17 Message-ID: <200611072144.kA7LicUo005309@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/devel Modified Files: audacity.spec Log Message: Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- audacity.spec 3 Nov 2006 22:08:35 -0000 1.16 +++ audacity.spec 7 Nov 2006 21:44:08 -0000 1.17 @@ -1,6 +1,6 @@ Name: audacity Version: 1.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -57,7 +57,7 @@ do perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i done -%ifarch ppc ppc64 +%ifnarch %{ix86} x86_64 # this flag is not available on ppc perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.* %endif @@ -123,6 +123,9 @@ %doc %{_datadir}/doc/* %changelog +* Tue Nov 7 2006 Gerard Milmeister - 1.2.5-3 +- msse flag only on intel + * Fri Nov 3 2006 Gerard Milmeister - 1.2.5-2 - remove -msse flag for ppc From fedora-extras-commits at redhat.com Tue Nov 7 21:44:36 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi)) Date: Tue, 7 Nov 2006 14:44:36 -0700 Subject: rpms/audacity/FC-5 audacity.spec,1.16,1.17 Message-ID: <200611072144.kA7LiaEP005303@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/FC-5 Modified Files: audacity.spec Log Message: Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- audacity.spec 3 Nov 2006 22:12:24 -0000 1.16 +++ audacity.spec 7 Nov 2006 21:44:06 -0000 1.17 @@ -1,6 +1,6 @@ Name: audacity Version: 1.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -57,7 +57,7 @@ do perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i done -%ifarch ppc ppc64 +%ifnarch %{ix86} x86_64 # this flag is not available on ppc perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.* %endif @@ -123,6 +123,9 @@ %doc %{_datadir}/doc/* %changelog +* Tue Nov 7 2006 Gerard Milmeister - 1.2.5-3 +- msse flag only on intel + * Fri Nov 3 2006 Gerard Milmeister - 1.2.5-2 - remove -msse flag for ppc From fedora-extras-commits at redhat.com Tue Nov 7 22:35:58 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 7 Nov 2006 15:35:58 -0700 Subject: fedora-rpmdevtools rmdevelrpms.conf, 1.3, 1.4 rpmdev-rmdevelrpms, 1.2, 1.3 rpmdevtools.spec, 1.19, 1.20 Message-ID: <200611072235.kA7MZwiQ008584@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-rpmdevtools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8562 Modified Files: rmdevelrpms.conf rpmdev-rmdevelrpms rpmdevtools.spec Log Message: * Wed Nov 8 2006 Ville Skytt?? - Arch-qualify output of matched packages in rmdevelrpms and allow arch-qualified packages in the config file. Index: rmdevelrpms.conf =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/rmdevelrpms.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rmdevelrpms.conf 20 Aug 2006 15:40:44 -0000 1.3 +++ rmdevelrpms.conf 7 Nov 2006 22:35:56 -0000 1.4 @@ -2,17 +2,17 @@ # # To prevent rpmdev-rmdevelrpms from removing some packages, add them to # nondevpkgs. The value can be a Python tuple or a whitespace separated -# string. For example: -# nondevpkgs = ("foo-devel", "bar-devel") -# nondevpkgs = "foo-devel bar-devel" +# string containing package names or name.arch strings. For example: +# nondevpkgs = ("foo-devel.x86_64", "bar-devel") +# nondevpkgs = "foo-devel.x86_64 bar-devel" # nondevpkgs = "" # # To add packages to the removal list, add them to devpkgs. -# The value can be a Python tuple or a whitespace separated string. +# The value's format is the same as for nondevpkgs above. # For example: -# devpkgs = ("libfoo", "bar") -# devpkgs = "libfoo bar" +# devpkgs = ("libfoo", "bar.i386", "quux-tools.noarch") +# devpkgs = "libfoo bar.i386 quux-tools.noarch" # devpkgs = "" Index: rpmdev-rmdevelrpms =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-rmdevelrpms,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rpmdev-rmdevelrpms 2 Oct 2006 16:03:21 -0000 1.2 +++ rpmdev-rmdevelrpms 7 Nov 2006 22:35:56 -0000 1.3 @@ -24,7 +24,7 @@ import getopt, os, re, rpm, stat, sys, types -__version__ = "1.3" +__version__ = "1.4" dev_re = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE) @@ -66,10 +66,11 @@ if not hdr: return 0 name = hdr[rpm.RPMTAG_NAME] if not name: return 0 - if name in nondevpkgs: return 0 - if name in devpkgs: return 1 - if name in def_nondevpkgs: return 0 - if name in def_devpkgs: return 1 + na = "%s.%s" % (name, hdr[rpm.RPMTAG_ARCH]) + if name in nondevpkgs or na in nondevpkgs: return 0 + if name in devpkgs or na in devpkgs: return 1 + if name in def_nondevpkgs or na in def_nondevpkgs: return 0 + if name in def_devpkgs or na in def_devpkgs: return 1 if jdev_re.search(name): return 0 if dev_re.search(name): return 1 if test_re.search(name): return 1 @@ -177,16 +178,20 @@ confirm = 0 ts = rpm.TransactionSet("/") ts.setVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS)) - for pkg in ts.dbMatch(): + mi = ts.dbMatch() + for pkg in mi: if isDevelPkg(pkg): - # addErase behaves like "--allmatches" - ts.addErase(pkg[rpm.RPMTAG_NAME]) + ts.addErase(mi.instance()) ts.order() pkgs = [] try: te = ts.next() while te: - pkgs.append(te.NEVR()) + arch = te.A() + if arch: + pkgs.append("%s.%s" % (te.NEVR(), arch)) + else: + pkgs.append(te.NEVR()) te = ts.next() except StopIteration: pass @@ -196,6 +201,7 @@ print "Found %d devel packages:" % len(pkgs) for pkg in pkgs: print " %s" % pkg + # TODO: is there a way to get arch for the unresolved deps? unresolved = ts.check() if unresolved: print "...but removal would cause unresolved dependencies:" Index: rpmdevtools.spec =================================================================== RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- rpmdevtools.spec 25 Oct 2006 12:22:46 -0000 1.19 +++ rpmdevtools.spec 7 Nov 2006 22:35:56 -0000 1.20 @@ -120,6 +120,10 @@ %changelog +* Wed Nov 8 2006 Ville Skytt?? +- Arch-qualify output of matched packages in rmdevelrpms and allow + arch-qualified packages in the config file. + * Wed Oct 25 2006 Ville Skytt?? - 5.3-1 - Update spectool to 1.0.8, fixes #212108. From fedora-extras-commits at redhat.com Tue Nov 7 23:18:15 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:18:15 -0700 Subject: rpms/php-pear-Pager - New directory Message-ID: <200611072318.kA7NIF4f011862@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Pager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11858/php-pear-Pager Log Message: Directory /cvs/extras/rpms/php-pear-Pager added to the repository From fedora-extras-commits at redhat.com Tue Nov 7 23:18:21 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:18:21 -0700 Subject: rpms/php-pear-Pager/devel - New directory Message-ID: <200611072318.kA7NILaY011876@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Pager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11858/php-pear-Pager/devel Log Message: Directory /cvs/extras/rpms/php-pear-Pager/devel added to the repository From fedora-extras-commits at redhat.com Tue Nov 7 23:18:33 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:18:33 -0700 Subject: rpms/php-pear-Pager Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611072318.kA7NIXG0011907@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Pager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11901 Added Files: Makefile import.log Log Message: Setup of module php-pear-Pager --- NEW FILE Makefile --- # Top level Makefile for module php-pear-Pager 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 Tue Nov 7 23:18:39 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:18:39 -0700 Subject: rpms/php-pear-Pager/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611072318.kA7NIdEh011924@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Pager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11901/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-Pager --- 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 Nov 7 23:19:29 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:19:29 -0700 Subject: rpms/php-pear-Pager import.log,1.1,1.2 Message-ID: <200611072319.kA7NJTDm011997@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Pager In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11965 Modified Files: import.log Log Message: auto-import php-pear-Pager-2.4.2-1 on branch devel from php-pear-Pager-2.4.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-pear-Pager/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Nov 2006 23:18:33 -0000 1.1 +++ import.log 7 Nov 2006 23:18:59 -0000 1.2 @@ -0,0 +1 @@ +php-pear-Pager-2_4_2-1:HEAD:php-pear-Pager-2.4.2-1.src.rpm:1162941536 From fedora-extras-commits at redhat.com Tue Nov 7 23:19:30 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:19:30 -0700 Subject: rpms/php-pear-Pager/devel php-pear-Pager.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611072319.kA7NJUNX012001@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Pager/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11965/devel Modified Files: .cvsignore sources Added Files: php-pear-Pager.spec Log Message: auto-import php-pear-Pager-2.4.2-1 on branch devel from php-pear-Pager-2.4.2-1.src.rpm --- NEW FILE php-pear-Pager.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Pager Name: php-pear-Pager Version: 2.4.2 Release: 1%{?dist} Summary: Data paging class Group: Development/Libraries License: BSD URL: http://pear.php.net/package/Pager Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 dos2unix Requires: php-pear(PEAR) Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description It takes an array of data as input and pages it according to various parameters. It also builds links within a specified range, and allows complete customization of the output (it even works with front controllers and mod_rewrite). Two operating modes available: "Jumping" and "Sliding" window style. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} %build cd %{pear_name}-%{version} # Empty build section, most likely nothing required. %install cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Move documentation mkdir -p docdir mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir} # Fix rpmlint warning dos2unix docdir/%{pear_name}/examples/example.php %clean rm -rf $RPM_BUILD_ROOT %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %{pear_phpdir}/%{pear_name} %changelog * Sun Oct 29 2006 Christoper Stone 2.4.2-1 - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Pager/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Nov 2006 23:18:39 -0000 1.1 +++ .cvsignore 7 Nov 2006 23:19:00 -0000 1.2 @@ -0,0 +1 @@ +Pager-2.4.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Pager/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Nov 2006 23:18:39 -0000 1.1 +++ sources 7 Nov 2006 23:19:00 -0000 1.2 @@ -0,0 +1 @@ +9dd1fd0aee0e8039f1a4033f822d50c3 Pager-2.4.2.tgz From fedora-extras-commits at redhat.com Tue Nov 7 23:21:17 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:21:17 -0700 Subject: owners owners.list,1.1898,1.1899 Message-ID: <200611072321.kA7NLHgV012056@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12037 Modified Files: owners.list Log Message: php-pear-Pager Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1898 retrieving revision 1.1899 diff -u -r1.1898 -r1.1899 --- owners.list 7 Nov 2006 16:34:58 -0000 1.1898 +++ owners.list 7 Nov 2006 23:20:47 -0000 1.1899 @@ -1777,6 +1777,7 @@ Fedora Extras|php-pear-Net-FTP|Provides an OO interface to the PHP FTP functions plus some additions|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Net-SMTP|Provides an implementation of the SMTP protocol|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Net-Socket|Network Socket Interface|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| +Fedora Extras|php-pear-Pager|Data paging class|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Payment-Process|Unified payment processor|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-PEAR-Command-Packaging|Create RPM spec files from PEAR modules|rpm at timj.co.uk|extras-qa at fedoraproject.org| Fedora Extras|php-pear-PHP-Compat|Provides missing functionality for older versions of PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Nov 7 23:37:17 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:37:17 -0700 Subject: rpms/php-pear-Net-URL - New directory Message-ID: <200611072337.kA7NbHnJ012241@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Net-URL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12237/php-pear-Net-URL Log Message: Directory /cvs/extras/rpms/php-pear-Net-URL added to the repository From fedora-extras-commits at redhat.com Tue Nov 7 23:37:23 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:37:23 -0700 Subject: rpms/php-pear-Net-URL/devel - New directory Message-ID: <200611072337.kA7NbNFB012255@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Net-URL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12237/php-pear-Net-URL/devel Log Message: Directory /cvs/extras/rpms/php-pear-Net-URL/devel added to the repository From fedora-extras-commits at redhat.com Tue Nov 7 23:37:35 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:37:35 -0700 Subject: rpms/php-pear-Net-URL Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611072337.kA7NbZD9012286@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Net-URL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12280 Added Files: Makefile import.log Log Message: Setup of module php-pear-Net-URL --- NEW FILE Makefile --- # Top level Makefile for module php-pear-Net-URL 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 Tue Nov 7 23:37:41 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:37:41 -0700 Subject: rpms/php-pear-Net-URL/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611072337.kA7NbfvC012304@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Net-URL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12280/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-Net-URL --- 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 Nov 7 23:38:29 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:38:29 -0700 Subject: rpms/php-pear-Net-URL import.log,1.1,1.2 Message-ID: <200611072338.kA7NcTdN012376@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Net-URL In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12344 Modified Files: import.log Log Message: auto-import php-pear-Net-URL-1.0.14-1 on branch devel from php-pear-Net-URL-1.0.14-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-URL/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Nov 2006 23:37:35 -0000 1.1 +++ import.log 7 Nov 2006 23:37:59 -0000 1.2 @@ -0,0 +1 @@ +php-pear-Net-URL-1_0_14-1:HEAD:php-pear-Net-URL-1.0.14-1.src.rpm:1162942676 From fedora-extras-commits at redhat.com Tue Nov 7 23:38:30 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:38:30 -0700 Subject: rpms/php-pear-Net-URL/devel php-pear-Net-URL.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611072338.kA7NcUU2012380@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-Net-URL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12344/devel Modified Files: .cvsignore sources Added Files: php-pear-Net-URL.spec Log Message: auto-import php-pear-Net-URL-1.0.14-1 on branch devel from php-pear-Net-URL-1.0.14-1.src.rpm --- NEW FILE php-pear-Net-URL.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name Net_URL Name: php-pear-Net-URL Version: 1.0.14 Release: 1%{?dist} Summary: Easy parsing of URLs Group: Development/Libraries License: BSD URL: http://pear.php.net/package/Net_URL Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 Requires: php-pear(PEAR) Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description Provides easy parsing of URLs and their constituent parts. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} %build cd %{pear_name}-%{version} # Empty build section, most likely nothing required. %install cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Move documentation mkdir -p docdir mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean rm -rf $RPM_BUILD_ROOT %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/* %{pear_xmldir}/%{pear_name}.xml %{pear_phpdir}/Net %changelog * Sun Oct 29 2006 Christopher Stone 1.0.14-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-URL/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Nov 2006 23:37:41 -0000 1.1 +++ .cvsignore 7 Nov 2006 23:38:00 -0000 1.2 @@ -0,0 +1 @@ +Net_URL-1.0.14.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-URL/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Nov 2006 23:37:41 -0000 1.1 +++ sources 7 Nov 2006 23:38:00 -0000 1.2 @@ -0,0 +1 @@ +4be5ac05dc5a9bc54a33cec66d87eb0a Net_URL-1.0.14.tgz From fedora-extras-commits at redhat.com Tue Nov 7 23:40:11 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:40:11 -0700 Subject: owners owners.list,1.1899,1.1900 Message-ID: <200611072340.kA7NeBls012436@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12416 Modified Files: owners.list Log Message: php-pear-Net-URL Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1899 retrieving revision 1.1900 diff -u -r1.1899 -r1.1900 --- owners.list 7 Nov 2006 23:20:47 -0000 1.1899 +++ owners.list 7 Nov 2006 23:39:41 -0000 1.1900 @@ -1777,6 +1777,7 @@ Fedora Extras|php-pear-Net-FTP|Provides an OO interface to the PHP FTP functions plus some additions|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Net-SMTP|Provides an implementation of the SMTP protocol|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Net-Socket|Network Socket Interface|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| +Fedora Extras|php-pear-Net-URL|Easy parsing of URLs|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Pager|Data paging class|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Payment-Process|Unified payment processor|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-PEAR-Command-Packaging|Create RPM spec files from PEAR modules|rpm at timj.co.uk|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Nov 7 23:56:36 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:56:36 -0700 Subject: rpms/php-pear-HTTP-Request - New directory Message-ID: <200611072356.kA7Nua32012639@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-HTTP-Request In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12635/php-pear-HTTP-Request Log Message: Directory /cvs/extras/rpms/php-pear-HTTP-Request added to the repository From fedora-extras-commits at redhat.com Tue Nov 7 23:56:42 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:56:42 -0700 Subject: rpms/php-pear-HTTP-Request/devel - New directory Message-ID: <200611072356.kA7NugjX012653@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-HTTP-Request/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12635/php-pear-HTTP-Request/devel Log Message: Directory /cvs/extras/rpms/php-pear-HTTP-Request/devel added to the repository From fedora-extras-commits at redhat.com Tue Nov 7 23:56:55 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:56:55 -0700 Subject: rpms/php-pear-HTTP-Request Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611072356.kA7Nut9G012684@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-HTTP-Request In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678 Added Files: Makefile import.log Log Message: Setup of module php-pear-HTTP-Request --- NEW FILE Makefile --- # Top level Makefile for module php-pear-HTTP-Request 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 Tue Nov 7 23:57:01 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:57:01 -0700 Subject: rpms/php-pear-HTTP-Request/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611072357.kA7Nv1hX012702@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-HTTP-Request/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-pear-HTTP-Request --- 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 Nov 7 23:57:50 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:57:50 -0700 Subject: rpms/php-pear-HTTP-Request import.log,1.1,1.2 Message-ID: <200611072357.kA7NvoTK012778@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-HTTP-Request In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742 Modified Files: import.log Log Message: auto-import php-pear-HTTP-Request-1.4.0-1 on branch devel from php-pear-HTTP-Request-1.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Nov 2006 23:56:55 -0000 1.1 +++ import.log 7 Nov 2006 23:57:19 -0000 1.2 @@ -0,0 +1 @@ +php-pear-HTTP-Request-1_4_0-1:HEAD:php-pear-HTTP-Request-1.4.0-1.src.rpm:1162943836 From fedora-extras-commits at redhat.com Tue Nov 7 23:57:50 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:57:50 -0700 Subject: rpms/php-pear-HTTP-Request/devel php-pear-HTTP-Request.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611072357.kA7NvoOb012782@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/rpms/php-pear-HTTP-Request/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742/devel Modified Files: .cvsignore sources Added Files: php-pear-HTTP-Request.spec Log Message: auto-import php-pear-HTTP-Request-1.4.0-1 on branch devel from php-pear-HTTP-Request-1.4.0-1.src.rpm --- NEW FILE php-pear-HTTP-Request.spec --- %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name HTTP_Request Name: php-pear-HTTP-Request Version: 1.4.0 Release: 1%{?dist} Summary: Provides an easy way to perform HTTP requests Group: Development/Libraries License: BSD URL: http://pear.php.net/package/HTTP_Request Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 dos2unix Requires: php-pear(PEAR) >= 1.4.0b1 Requires: php-pear(Net_URL) >= 1.0.12 Requires: php-pear(Net_Socket) >= 1.0.2 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} %description Supports GET/POST/HEAD/TRACE/PUT/DELETE, Basic authentication, Proxy, Proxy Authentication, SSL, file uploads etc. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml cd %{pear_name}-%{version} %build cd %{pear_name}-%{version} # Empty build section, most likely nothing required. %install cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Move documentation mkdir -p docdir mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir} # Fix rpmlint warnings dos2unix docdir/%{pear_name}/docs/example.php dos2unix docdir/%{pear_name}/docs/download-progress.php %clean rm -rf $RPM_BUILD_ROOT %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ %{pear_name} >/dev/null || : fi %files %defattr(-,root,root,-) %doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/* %{pear_xmldir}/%{pear_name}.xml %{pear_phpdir}/HTTP %changelog * Sun Oct 29 2006 Christopher Stone 1.4.0-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Nov 2006 23:57:01 -0000 1.1 +++ .cvsignore 7 Nov 2006 23:57:20 -0000 1.2 @@ -0,0 +1 @@ +HTTP_Request-1.4.0.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Nov 2006 23:57:01 -0000 1.1 +++ sources 7 Nov 2006 23:57:20 -0000 1.2 @@ -0,0 +1 @@ +2aacf8ac8ce9aa865269f6b5e4c256b9 HTTP_Request-1.4.0.tgz From fedora-extras-commits at redhat.com Tue Nov 7 23:59:20 2006 From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris)) Date: Tue, 7 Nov 2006 16:59:20 -0700 Subject: owners owners.list,1.1900,1.1901 Message-ID: <200611072359.kA7NxKZ9012831@cvs-int.fedora.redhat.com> Author: xulchris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12815 Modified Files: owners.list Log Message: php-pear-HTTP-Request Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1900 retrieving revision 1.1901 diff -u -r1.1900 -r1.1901 --- owners.list 7 Nov 2006 23:39:41 -0000 1.1900 +++ owners.list 7 Nov 2006 23:58:50 -0000 1.1901 @@ -1768,6 +1768,7 @@ Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org| Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| +Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Log|Abstracted logging facility for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| Fedora Extras|php-pear-Mail|Class that provides multiple interfaces for sending emails|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 8 00:52:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 17:52:19 -0700 Subject: rpms/tbcload - New directory Message-ID: <200611080052.kA80qJ7Y019212@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tbcload In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19206/tbcload Log Message: Directory /cvs/extras/rpms/tbcload added to the repository From fedora-extras-commits at redhat.com Wed Nov 8 00:52:25 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 17:52:25 -0700 Subject: rpms/tbcload/devel - New directory Message-ID: <200611080052.kA80qPtS019234@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tbcload/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19206/tbcload/devel Log Message: Directory /cvs/extras/rpms/tbcload/devel added to the repository From fedora-extras-commits at redhat.com Wed Nov 8 00:52:36 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 17:52:36 -0700 Subject: rpms/tbcload Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611080052.kA80qah3019283@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tbcload In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19276 Added Files: Makefile import.log Log Message: Setup of module tbcload --- NEW FILE Makefile --- # Top level Makefile for module tbcload 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 Wed Nov 8 00:52:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 17:52:42 -0700 Subject: rpms/tbcload/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611080052.kA80qgwp019314@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tbcload/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19276/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tbcload --- 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 Nov 8 00:53:36 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 17:53:36 -0700 Subject: rpms/tbcload import.log,1.1,1.2 Message-ID: <200611080053.kA80rara019496@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tbcload In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406 Modified Files: import.log Log Message: auto-import tbcload-1.4-3.20061030cvs on branch devel from tbcload-1.4-3.20061030cvs.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tbcload/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Nov 2006 00:52:36 -0000 1.1 +++ import.log 8 Nov 2006 00:53:06 -0000 1.2 @@ -0,0 +1 @@ +tbcload-1_4-3_20061030cvs:HEAD:tbcload-1.4-3.20061030cvs.src.rpm:1162947183 From fedora-extras-commits at redhat.com Wed Nov 8 00:53:37 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 17:53:37 -0700 Subject: rpms/tbcload/devel tbcload-1.4-configure.patch, NONE, 1.1 tbcload.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611080053.kA80rbar019501@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tbcload/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406/devel Modified Files: .cvsignore sources Added Files: tbcload-1.4-configure.patch tbcload.spec Log Message: auto-import tbcload-1.4-3.20061030cvs on branch devel from tbcload-1.4-3.20061030cvs.src.rpm tbcload-1.4-configure.patch: --- NEW FILE tbcload-1.4-configure.patch --- --- configure.orig 2006-10-31 21:10:39.000000000 -0800 +++ configure 2006-10-31 21:12:24.000000000 -0800 @@ -1505,10 +1505,12 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then @@ -7051,7 +7053,7 @@ # results, and the version is kept in special file). if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then - system=MP-RAS-`awk '{print }' /etc/.relid'` + system=MP-RAS-`awk '{print }' /etc/.relid` fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` --- NEW FILE tbcload.spec --- %define cvsdate 20061030 Summary: Tcl bytecode loader Name: tbcload Version: 1.4 Release: 3.%{cvsdate}cvs%{?dist} License: BSD Group: Development/Libraries # cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tbcload-20061030cvs tbcload # tar czf tbcload-20061030cvs.tgz ./tbcload-20061030cvs Source0: tbcload-%{cvsdate}cvs.tgz Patch0: tbcload-1.4-configure.patch URL: http://tclpro.sourceforge.net/ Requires: tcl BuildRequires: tcl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description A Tcl bytecode loader that loads tcl bytecode files for faster loading and execution. %package devel Summary: Header files for compiling against tbcload Group: Development/Libraries Requires: %{name} = %{version}-%{release} tcl-devel %description devel Header files for compiling against tbcload %prep %setup -q -n %{name}-%{cvsdate}cvs %patch -p0 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check make test %clean rm -rf $RPM_BUILD_ROOT %files %doc ChangeLog license.terms %defattr(-,root,root) %{_libdir}/%{name}%{version} %files devel %defattr(-,root,root) %{_includedir}/*.h %changelog * Tue Nov 7 2006 Wart 1.4-3.20061030cvs - Fix rpmlint warning about changelog entries * Thu Nov 2 2006 Wart 1.4-2.20061030cvs - Added missing license file * Tue Oct 31 2006 Wart 1.4-1.20061030cvs - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tbcload/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Nov 2006 00:52:41 -0000 1.1 +++ .cvsignore 8 Nov 2006 00:53:07 -0000 1.2 @@ -0,0 +1 @@ +tbcload-20061030cvs.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tbcload/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Nov 2006 00:52:41 -0000 1.1 +++ sources 8 Nov 2006 00:53:07 -0000 1.2 @@ -0,0 +1 @@ +a62c0d6acc58fbe53dc285090ceff444 tbcload-20061030cvs.tgz From fedora-extras-commits at redhat.com Wed Nov 8 00:54:04 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 7 Nov 2006 17:54:04 -0700 Subject: rpms/soundconverter/FC-6 soundconverter-0.9.3-taglib.patch, NONE, 1.1 soundconverter.spec, 1.11, 1.12 Message-ID: <200611080054.kA80s4gP019563@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/soundconverter/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19474 Modified Files: soundconverter.spec Added Files: soundconverter-0.9.3-taglib.patch Log Message: Added patch to detect missing id3v2mux gst plugin (bz 214035) soundconverter-0.9.3-taglib.patch: --- NEW FILE soundconverter-0.9.3-taglib.patch --- --- soundconverter-0.9.3/src/soundconverter.py.orig 2006-11-08 01:47:19.000000000 +0100 +++ soundconverter-0.9.3/src/soundconverter.py 2006-11-08 01:48:21.000000000 +0100 @@ -1065,7 +1065,10 @@ cmd += "%s=%s " % (properties[self.mp3_mode][1], self.mp3_quality) - return cmd + " ! id3v2mux " + if (gst.element_factory_find("id3v2mux")): + return cmd + " ! id3v2mux " + else: + return cmd class FileList: """List of files added by the user.""" Index: soundconverter.spec =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-6/soundconverter.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- soundconverter.spec 19 Oct 2006 15:03:24 -0000 1.11 +++ soundconverter.spec 8 Nov 2006 00:53:34 -0000 1.12 @@ -1,12 +1,13 @@ Name: soundconverter Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple sound converter application for GNOME Group: Applications/Multimedia License: GPL URL: http://soundconverter.berlios.de/ Source0: http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz +Patch0: soundconverter-0.9.3-taglib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .taglib %build @@ -62,6 +64,9 @@ %changelog +* Wed Nov 8 2006 Denis Leroy - 0.9.3-2 +- Added patch to detect missing id3v2mux gst plugin + * Thu Oct 19 2006 Denis Leroy - 0.9.3-1 - Update to 0.9.3 From fedora-extras-commits at redhat.com Wed Nov 8 00:56:50 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 7 Nov 2006 17:56:50 -0700 Subject: rpms/soundconverter/FC-5 soundconverter-0.9.3-taglib.patch, NONE, 1.1 soundconverter.spec, 1.8, 1.9 Message-ID: <200611080056.kA80uoBj019760@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/soundconverter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19741 Modified Files: soundconverter.spec Added Files: soundconverter-0.9.3-taglib.patch Log Message: Added patch to detect missing id3v2mux gst plugin (bz 214035) soundconverter-0.9.3-taglib.patch: --- NEW FILE soundconverter-0.9.3-taglib.patch --- --- soundconverter-0.9.3/src/soundconverter.py.orig 2006-11-08 01:47:19.000000000 +0100 +++ soundconverter-0.9.3/src/soundconverter.py 2006-11-08 01:48:21.000000000 +0100 @@ -1065,7 +1065,10 @@ cmd += "%s=%s " % (properties[self.mp3_mode][1], self.mp3_quality) - return cmd + " ! id3v2mux " + if (gst.element_factory_find("id3v2mux")): + return cmd + " ! id3v2mux " + else: + return cmd class FileList: """List of files added by the user.""" Index: soundconverter.spec =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-5/soundconverter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- soundconverter.spec 3 Nov 2006 09:46:00 -0000 1.8 +++ soundconverter.spec 8 Nov 2006 00:56:20 -0000 1.9 @@ -1,12 +1,13 @@ Name: soundconverter Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple sound converter application for GNOME Group: Applications/Multimedia License: GPL URL: http://soundconverter.berlios.de/ Source0: http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz +Patch0: soundconverter-0.9.3-taglib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .taglib %build @@ -62,6 +64,9 @@ %changelog +* Wed Nov 8 2006 Denis Leroy - 0.9.3-2 +- Added patch to detect missing id3v2mux gst plugin + * Fri Nov 3 2006 Denis Leroy - 0.9.3-1 - Update to 0.9.3 From fedora-extras-commits at redhat.com Wed Nov 8 00:59:05 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 7 Nov 2006 17:59:05 -0700 Subject: rpms/soundconverter/devel soundconverter-0.9.3-taglib.patch, NONE, 1.1 soundconverter.spec, 1.11, 1.12 Message-ID: <200611080059.kA80x5wK019800@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/soundconverter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19781 Modified Files: soundconverter.spec Added Files: soundconverter-0.9.3-taglib.patch Log Message: Added patch to detect missing id3v2mux gst plugin (bz 214035) soundconverter-0.9.3-taglib.patch: --- NEW FILE soundconverter-0.9.3-taglib.patch --- --- soundconverter-0.9.3/src/soundconverter.py.orig 2006-11-08 01:47:19.000000000 +0100 +++ soundconverter-0.9.3/src/soundconverter.py 2006-11-08 01:48:21.000000000 +0100 @@ -1065,7 +1065,10 @@ cmd += "%s=%s " % (properties[self.mp3_mode][1], self.mp3_quality) - return cmd + " ! id3v2mux " + if (gst.element_factory_find("id3v2mux")): + return cmd + " ! id3v2mux " + else: + return cmd class FileList: """List of files added by the user.""" Index: soundconverter.spec =================================================================== RCS file: /cvs/extras/rpms/soundconverter/devel/soundconverter.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- soundconverter.spec 19 Oct 2006 15:03:24 -0000 1.11 +++ soundconverter.spec 8 Nov 2006 00:58:35 -0000 1.12 @@ -1,12 +1,13 @@ Name: soundconverter Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple sound converter application for GNOME Group: Applications/Multimedia License: GPL URL: http://soundconverter.berlios.de/ Source0: http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz +Patch0: soundconverter-0.9.3-taglib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 -b .taglib %build @@ -62,6 +64,9 @@ %changelog +* Wed Nov 8 2006 Denis Leroy - 0.9.3-2 +- Added patch to detect missing id3v2mux gst plugin + * Thu Oct 19 2006 Denis Leroy - 0.9.3-1 - Update to 0.9.3 From fedora-extras-commits at redhat.com Wed Nov 8 01:05:00 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 7 Nov 2006 18:05:00 -0700 Subject: rpms/soundconverter/FC-4 soundconverter-0.9.3-taglib.patch, NONE, 1.1 soundconverter.spec, 1.6, 1.7 Message-ID: <200611080105.kA8150S6022829@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/soundconverter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22810 Modified Files: soundconverter.spec Added Files: soundconverter-0.9.3-taglib.patch Log Message: Added patch to detect missing id3v2mux gst plugin (bz 214035) soundconverter-0.9.3-taglib.patch: --- NEW FILE soundconverter-0.9.3-taglib.patch --- --- soundconverter-0.9.3/src/soundconverter.py.orig 2006-11-08 01:47:19.000000000 +0100 +++ soundconverter-0.9.3/src/soundconverter.py 2006-11-08 01:48:21.000000000 +0100 @@ -1065,7 +1065,10 @@ cmd += "%s=%s " % (properties[self.mp3_mode][1], self.mp3_quality) - return cmd + " ! id3v2mux " + if (gst.element_factory_find("id3v2mux")): + return cmd + " ! id3v2mux " + else: + return cmd class FileList: """List of files added by the user.""" Index: soundconverter.spec =================================================================== RCS file: /cvs/extras/rpms/soundconverter/FC-4/soundconverter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- soundconverter.spec 3 Nov 2006 10:20:34 -0000 1.6 +++ soundconverter.spec 8 Nov 2006 01:04:30 -0000 1.7 @@ -1,12 +1,13 @@ Name: soundconverter Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple sound converter application for GNOME Group: Applications/Multimedia License: GPL URL: http://soundconverter.berlios.de/ Source0: http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz +Patch0: soundconverter-0.9.3-taglib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 -b .taglib %build %configure --disable-dependency-tracking @@ -59,6 +61,9 @@ %changelog +* Wed Nov 8 2006 Denis Leroy - 0.9.3-2 +- Added patch to detect missing id3v2mux gst plugin + * Fri Nov 3 2006 Denis Leroy - 0.9.3-1 - Update to 0.9.3 From fedora-extras-commits at redhat.com Wed Nov 8 01:19:33 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 7 Nov 2006 18:19:33 -0700 Subject: rpms/gtk2hs/devel .cvsignore, 1.2, 1.3 gtk2hs.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200611080119.kA81JXPK023059@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23038 Modified Files: .cvsignore gtk2hs.spec sources Log Message: - update to latest darcs snapshot for ghc66 - add soegtk and remove mogul ghc packages Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 May 2006 03:18:55 -0000 1.2 +++ .cvsignore 8 Nov 2006 01:19:03 -0000 1.3 @@ -1 +1 @@ -gtk2hs-0.9.10.tar.gz +gtk2hs-0.9.10.2.tar.gz Index: gtk2hs.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gtk2hs.spec 28 Sep 2006 05:37:36 -0000 1.5 +++ gtk2hs.spec 8 Nov 2006 01:19:03 -0000 1.6 @@ -1,14 +1,13 @@ -%define ghc_version 6.4.2 -%define ghcver ghc642 -#%%define mozver 1.5.0.6 +%define ghc_version 6.6 +%define ghcver ghc66 %define build_mozembed 1 %define build_cairo 1 Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs -Version: 0.9.10 -Release: 4%{?dist} +Version: 0.9.10.2 +Release: 0.20061107%{?dist} License: LGPL Group: Development/Libraries Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -60,8 +59,7 @@ management, unicode support, and wide coverage of Gtk+ 2 widgets. This package also includes the bindings for cairo, gconf, glade, glib, and -sourceview, and the mogul wrapper library. The libraries are compiled for -ghc-%{ghc_version}. +sourceview. The libraries are compiled for ghc-%{ghc_version}. %package doc @@ -99,7 +97,7 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q %build @@ -128,7 +126,7 @@ make DESTDIR=%{buildroot} install # make ghost files -for i in gconf glade glib gtk mogul sourceview \ +for i in gconf glade glib gtk sourceview soegtk \ %if %{build_cairo} cairo \ %endif @@ -158,10 +156,10 @@ cairo \ %endif gtk \ - mogul \ gconf \ glade \ sourceview \ + soegtk \ ; do %{ghcpkg_inst $i} done @@ -176,10 +174,10 @@ %preun -n %{ghcver}-%{name} if [ "$1" = 0 ]; then for i in \ + soegtk \ gconf \ glade \ sourceview \ - mogul \ gtk \ %if %{build_cairo} cairo \ @@ -218,35 +216,29 @@ %{gtk2hsdir}/cairo.package.conf %{gtk2hsdir}/libHScairo.a %ghost %{gtk2hsdir}/HScairo.o -%dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/cairo %endif %{gtk2hsdir}/gconf.package.conf %{gtk2hsdir}/libHSgconf.a %ghost %{gtk2hsdir}/HSgconf.o -%dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/gconf %{gtk2hsdir}/glade.package.conf %{gtk2hsdir}/libHSglade.a %ghost %{gtk2hsdir}/HSglade.o -%dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/glade %{gtk2hsdir}/glib.package.conf %{gtk2hsdir}/libHSglib.a %ghost %{gtk2hsdir}/HSglib.o -%dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/glib %dir %{gtk2hsdir}/include %{gtk2hsdir}/include/gtk2hs-config.h -%{gtk2hsdir}/mogul.package.conf -%{gtk2hsdir}/libHSmogul.a -%ghost %{gtk2hsdir}/HSmogul.o -%dir %{gtk2hsdir}/imports -%{gtk2hsdir}/imports/mogul +%{gtk2hsdir}/soegtk.package.conf +%{gtk2hsdir}/libHSsoegtk.a +%ghost %{gtk2hsdir}/HSsoegtk.o +%{gtk2hsdir}/imports/soegtk %{gtk2hsdir}/sourceview.package.conf %{gtk2hsdir}/libHSsourceview.a %ghost %{gtk2hsdir}/HSsourceview.o -%dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/sourceview @@ -261,12 +253,15 @@ %{gtk2hsdir}/mozembed.package.conf %{gtk2hsdir}/libHSmozembed.a %ghost %{gtk2hsdir}/HSmozembed.o -%dir %{gtk2hsdir}/imports %{gtk2hsdir}/imports/mozembed %endif %changelog +* Wed Nov 8 2006 Jens Petersen - 0.9.10.2-0 +- update to latest darcs snapshot for ghc66 +- add soegtk and remove mogul ghc packages + * Thu Sep 28 2006 Jens Petersen - 0.9.10-4 - rebuild for FC6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 May 2006 03:18:55 -0000 1.2 +++ sources 8 Nov 2006 01:19:03 -0000 1.3 @@ -1 +1 @@ -13d300e07153f37ba5893ac336b078bc gtk2hs-0.9.10.tar.gz +1da9b3f4d89d411f07d746dcb23d3414 gtk2hs-0.9.10.2.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 01:20:55 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 7 Nov 2006 18:20:55 -0700 Subject: rpms/gtk2hs/devel gtk2hs.spec,1.6,1.7 Message-ID: <200611080120.kA81Kt22023116@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/gtk2hs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23079 Modified Files: gtk2hs.spec Log Message: add .1 to release Index: gtk2hs.spec =================================================================== RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtk2hs.spec 8 Nov 2006 01:19:03 -0000 1.6 +++ gtk2hs.spec 8 Nov 2006 01:20:25 -0000 1.7 @@ -7,7 +7,7 @@ Summary: A Haskell GUI library based on the Gtk+ GUI toolkit Name: gtk2hs Version: 0.9.10.2 -Release: 0.20061107%{?dist} +Release: 0.1.20061107%{?dist} License: LGPL Group: Development/Libraries Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 01:21:37 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 18:21:37 -0700 Subject: owners owners.list,1.1901,1.1902 Message-ID: <200611080121.kA81LbRd023182@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23115 Modified Files: owners.list Log Message: Added tbcload Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1901 retrieving revision 1.1902 diff -u -r1.1901 -r1.1902 --- owners.list 7 Nov 2006 23:58:50 -0000 1.1901 +++ owners.list 8 Nov 2006 01:21:06 -0000 1.1902 @@ -2184,6 +2184,7 @@ Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|tango-icon-theme|Icons from Tango Project|raven at pmail.pl|extras-qa at fedoraproject.org| Fedora Extras|taskjuggler|Project management tool|petersen at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|tbcload|Tcl bytecode loader|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 8 01:26:48 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 18:26:48 -0700 Subject: rpms/tclcompiler - New directory Message-ID: <200611080126.kA81QmfB023239@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclcompiler In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23235/tclcompiler Log Message: Directory /cvs/extras/rpms/tclcompiler added to the repository From fedora-extras-commits at redhat.com Wed Nov 8 01:26:54 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 18:26:54 -0700 Subject: rpms/tclcompiler/devel - New directory Message-ID: <200611080126.kA81Qs4D023253@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclcompiler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23235/tclcompiler/devel Log Message: Directory /cvs/extras/rpms/tclcompiler/devel added to the repository From fedora-extras-commits at redhat.com Wed Nov 8 01:27:05 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 18:27:05 -0700 Subject: rpms/tclcompiler Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611080127.kA81R50N023284@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclcompiler In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23278 Added Files: Makefile import.log Log Message: Setup of module tclcompiler --- NEW FILE Makefile --- # Top level Makefile for module tclcompiler 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 Wed Nov 8 01:27:11 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 18:27:11 -0700 Subject: rpms/tclcompiler/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611080127.kA81RBgm023301@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclcompiler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23278/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tclcompiler --- 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 Nov 8 01:28:03 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 18:28:03 -0700 Subject: rpms/tclcompiler import.log,1.1,1.2 Message-ID: <200611080128.kA81S3iV023382@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclcompiler In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23347 Modified Files: import.log Log Message: auto-import tclcompiler-1.5-2.20061030cvs on branch devel from tclcompiler-1.5-2.20061030cvs.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tclcompiler/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Nov 2006 01:27:05 -0000 1.1 +++ import.log 8 Nov 2006 01:27:33 -0000 1.2 @@ -0,0 +1 @@ +tclcompiler-1_5-2_20061030cvs:HEAD:tclcompiler-1.5-2.20061030cvs.src.rpm:1162949250 From fedora-extras-commits at redhat.com Wed Nov 8 01:28:03 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 18:28:03 -0700 Subject: rpms/tclcompiler/devel tclcompiler-1.5-configure.patch, NONE, 1.1 tclcompiler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611080128.kA81S3mI023386@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tclcompiler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23347/devel Modified Files: .cvsignore sources Added Files: tclcompiler-1.5-configure.patch tclcompiler.spec Log Message: auto-import tclcompiler-1.5-2.20061030cvs on branch devel from tclcompiler-1.5-2.20061030cvs.src.rpm tclcompiler-1.5-configure.patch: --- NEW FILE tclcompiler-1.5-configure.patch --- --- configure.orig 2006-10-31 21:41:47.000000000 -0800 +++ configure 2006-10-31 21:41:31.000000000 -0800 @@ -1495,10 +1495,12 @@ # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \ + for i in `ls -d ${libdir} 2>/dev/null` \ + `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then @@ -6979,7 +6981,7 @@ # results, and the version is kept in special file). if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then - system=MP-RAS-`awk '{print }' /etc/.relid'` + system=MP-RAS-`awk '{print }' /etc/.relid` fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` --- NEW FILE tclcompiler.spec --- %define cvsdate 20061030 Summary: Tcl bytecode compiler Name: tclcompiler Version: 1.5 Release: 2.%{cvsdate}cvs%{?dist} License: BSD Group: Development/Libraries # cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclcompiler-20061030cvs tclcompiler # tar czf tclcompiler-20061030cvs.tgz ./tclcompiler-20061030cvs Source0: tclcompiler-%{cvsdate}cvs.tgz Patch0: tclcompiler-1.5-configure.patch URL: http://tclpro.sourceforge.net/ Requires: tcl BuildRequires: tbcload-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description A Tcl bytecode compiler that compiles .tcl script files into Tcl bytecode for faster loading and execution. %prep %setup -q -n %{name}-%{cvsdate}cvs %patch -p0 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check # fails because there is no test suite for this package. #make test %clean rm -rf $RPM_BUILD_ROOT %files %doc ChangeLog license.terms %defattr(-,root,root) %{_libdir}/%{name}%{version} %changelog * Thu Nov 2 2006 Wart 1.5-2.20061030cvs - Added missing license file * Tue Oct 31 2006 Wart 1.5-1.20061030cvs - Initial package for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tclcompiler/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Nov 2006 01:27:10 -0000 1.1 +++ .cvsignore 8 Nov 2006 01:27:33 -0000 1.2 @@ -0,0 +1 @@ +tclcompiler-20061030cvs.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tclcompiler/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Nov 2006 01:27:10 -0000 1.1 +++ sources 8 Nov 2006 01:27:33 -0000 1.2 @@ -0,0 +1 @@ +6e4c81bd2a1ee86d3043326c9615528b tclcompiler-20061030cvs.tgz From fedora-extras-commits at redhat.com Wed Nov 8 01:29:32 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 7 Nov 2006 18:29:32 -0700 Subject: owners owners.list,1.1902,1.1903 Message-ID: <200611080129.kA81TW2L023450@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23418 Modified Files: owners.list Log Message: Added tclcompiler Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1902 retrieving revision 1.1903 diff -u -r1.1902 -r1.1903 --- owners.list 8 Nov 2006 01:21:06 -0000 1.1902 +++ owners.list 8 Nov 2006 01:29:01 -0000 1.1903 @@ -2187,6 +2187,7 @@ Fedora Extras|tbcload|Tcl bytecode loader|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org| +Fedora Extras|tclcompiler|Tcl bytecode compiler|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 8 02:09:35 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Tue, 7 Nov 2006 19:09:35 -0700 Subject: rpms/shorewall/devel .cvsignore, 1.21, 1.22 shorewall.spec, 1.28, 1.29 sources, 1.21, 1.22 Message-ID: <200611080209.kA829Zvj026667@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26641 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 29 Sep 2006 22:41:57 -0000 1.21 +++ .cvsignore 8 Nov 2006 02:09:05 -0000 1.22 @@ -1 +1 @@ -shorewall-3.2.4.tar.bz2 +shorewall-3.2.5.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- shorewall.spec 29 Sep 2006 22:41:57 -0000 1.28 +++ shorewall.spec 8 Nov 2006 02:09:05 -0000 1.29 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.2.4 +Version: 3.2.5 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 Nov 07 2006 Robert Marcano - 3.2.5-1 +- Update to upstream 3.2.5 + * Fri Sep 29 2006 Robert Marcano - 3.2.4-1 - Update to upstream 3.2.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 29 Sep 2006 22:41:57 -0000 1.21 +++ sources 8 Nov 2006 02:09:05 -0000 1.22 @@ -1 +1 @@ -c23d666b22d0e13a0dab1e5c5593933a shorewall-3.2.4.tar.bz2 +7f3e80d8a1fe1d14dd15b00187ddc8e1 shorewall-3.2.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 02:12:31 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Tue, 7 Nov 2006 19:12:31 -0700 Subject: rpms/shorewall/FC-6 .cvsignore, 1.21, 1.22 shorewall.spec, 1.28, 1.29 sources, 1.21, 1.22 Message-ID: <200611080212.kA82CVaB026801@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26781 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-6/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 29 Sep 2006 22:41:57 -0000 1.21 +++ .cvsignore 8 Nov 2006 02:12:01 -0000 1.22 @@ -1 +1 @@ -shorewall-3.2.4.tar.bz2 +shorewall-3.2.5.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-6/shorewall.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- shorewall.spec 29 Sep 2006 22:41:57 -0000 1.28 +++ shorewall.spec 8 Nov 2006 02:12:01 -0000 1.29 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.2.4 +Version: 3.2.5 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 Nov 07 2006 Robert Marcano - 3.2.5-1 +- Update to upstream 3.2.5 + * Fri Sep 29 2006 Robert Marcano - 3.2.4-1 - Update to upstream 3.2.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-6/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 29 Sep 2006 22:41:57 -0000 1.21 +++ sources 8 Nov 2006 02:12:01 -0000 1.22 @@ -1 +1 @@ -c23d666b22d0e13a0dab1e5c5593933a shorewall-3.2.4.tar.bz2 +7f3e80d8a1fe1d14dd15b00187ddc8e1 shorewall-3.2.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 02:16:33 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Tue, 7 Nov 2006 19:16:33 -0700 Subject: rpms/shorewall/FC-5 .cvsignore, 1.19, 1.20 shorewall.spec, 1.26, 1.27 sources, 1.19, 1.20 Message-ID: <200611080216.kA82GXxL026873@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26853 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 29 Sep 2006 22:47:13 -0000 1.19 +++ .cvsignore 8 Nov 2006 02:16:03 -0000 1.20 @@ -1 +1 @@ -shorewall-3.2.4.tar.bz2 +shorewall-3.2.5.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/shorewall.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- shorewall.spec 29 Sep 2006 22:47:13 -0000 1.26 +++ shorewall.spec 8 Nov 2006 02:16:03 -0000 1.27 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.2.4 +Version: 3.2.5 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 Nov 07 2006 Robert Marcano - 3.2.5-1 +- Update to upstream 3.2.5 + * Fri Sep 29 2006 Robert Marcano - 3.2.4-1 - Update to upstream 3.2.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 29 Sep 2006 22:47:13 -0000 1.19 +++ sources 8 Nov 2006 02:16:03 -0000 1.20 @@ -1 +1 @@ -c23d666b22d0e13a0dab1e5c5593933a shorewall-3.2.4.tar.bz2 +7f3e80d8a1fe1d14dd15b00187ddc8e1 shorewall-3.2.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 02:18:07 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Tue, 7 Nov 2006 19:18:07 -0700 Subject: rpms/shorewall/FC-4 .cvsignore, 1.13, 1.14 shorewall.spec, 1.21, 1.22 sources, 1.13, 1.14 Message-ID: <200611080218.kA82I7CH026941@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26917 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.2.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 29 Sep 2006 22:48:23 -0000 1.13 +++ .cvsignore 8 Nov 2006 02:17:36 -0000 1.14 @@ -1 +1 @@ -shorewall-3.2.4.tar.bz2 +shorewall-3.2.5.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- shorewall.spec 29 Sep 2006 22:48:23 -0000 1.21 +++ shorewall.spec 8 Nov 2006 02:17:36 -0000 1.22 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.2.4 +Version: 3.2.5 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 Nov 07 2006 Robert Marcano - 3.2.5-1 +- Update to upstream 3.2.5 + * Fri Sep 29 2006 Robert Marcano - 3.2.4-1 - Update to upstream 3.2.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 29 Sep 2006 22:48:23 -0000 1.13 +++ sources 8 Nov 2006 02:17:36 -0000 1.14 @@ -1 +1 @@ -c23d666b22d0e13a0dab1e5c5593933a shorewall-3.2.4.tar.bz2 +7f3e80d8a1fe1d14dd15b00187ddc8e1 shorewall-3.2.5.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 02:25:38 2006 From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg)) Date: Tue, 7 Nov 2006 19:25:38 -0700 Subject: rpms/granule/FC-6 granule.spec,1.2,1.3 Message-ID: <200611080225.kA82Pcn4027049@cvs-int.fedora.redhat.com> Author: vlg Update of /cvs/extras/rpms/granule/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27029 Modified Files: granule.spec Log Message: Trying to resolve tag name conflict between different branches (devel vs FC-6). Index: granule.spec =================================================================== RCS file: /cvs/extras/rpms/granule/FC-6/granule.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- granule.spec 7 Nov 2006 03:36:12 -0000 1.2 +++ granule.spec 8 Nov 2006 02:25:08 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Flashcards program based on Leitner methodology Name: granule Version: 1.2.3 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://granule.sourceforge.net/ From fedora-extras-commits at redhat.com Wed Nov 8 05:48:16 2006 From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya)) Date: Tue, 7 Nov 2006 22:48:16 -0700 Subject: rpms/gdesklets/devel .cvsignore, 1.3, 1.4 gdesklets.spec, 1.20, 1.21 sources, 1.3, 1.4 Message-ID: <200611080548.kA85mGH1004460@cvs-int.fedora.redhat.com> Author: luya Update of /cvs/extras/rpms/gdesklets/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4440 Modified Files: .cvsignore gdesklets.spec sources Log Message: updated tarball and spec files Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdesklets/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jan 2006 23:21:09 -0000 1.3 +++ .cvsignore 8 Nov 2006 05:47:46 -0000 1.4 @@ -1 +1 @@ -gDesklets-0.35.3.tar.bz2 +gDesklets-0.35.4.tar.bz2 Index: gdesklets.spec =================================================================== RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gdesklets.spec 31 Aug 2006 21:59:38 -0000 1.20 +++ gdesklets.spec 8 Nov 2006 05:47:46 -0000 1.21 @@ -1,16 +1,15 @@ -Name: gdesklets -Version: 0.35.3 -Release: 14%{?dist} -Summary: Advanced architecture for desktop applets - -Group: User Interface/Desktops -License: GPL - -URL: http://www.gdesklets.org/ -Source0: http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2 -Patch0: Pyorbit-1.0-fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: gdesklets +Version: 0.35.4 +Release: 1%{?dist} +Summary: An interactive Imlib2 console for the X Window system +Group: User Interface/Desktops +License: GPL + +URL: http://www.gdesklets.org/ +Source0: http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext @@ -18,9 +17,7 @@ BuildRequires: gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils Requires: gnome-python2-gconf >= 2.6.0 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -#Requires(post): desktop-file-utils Requires(post): shared-mime-info -#Requires(postun): desktop-file-utils Requires(postun): shared-mime-info @@ -32,7 +29,6 @@ %prep %setup -q -n gDesklets-%{version} -%patch0 -p1 %build @@ -47,12 +43,12 @@ %find_lang %{name} desktop-file-install --vendor=fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - --add-category Accessories \ - --add-category Application \ - --add-category Utility \ - data/%{name}.desktop + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + --add-category Accessories \ + --add-category Application \ + --add-category Utility \ + data/%{name}.desktop mkdir -p ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/} ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png @@ -65,12 +61,9 @@ %post update-mime-database %{_datadir}/mime &> /dev/null || : -#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - %postun update-mime-database %{_datadir}/mime &> /dev/null || : -#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %clean @@ -90,43 +83,32 @@ %changelog -* Thu Aug 31 2006 Luya Tshimbalanga - 0.35-3-14 +* Tue Nov 07 2006 Luya Tshimbalanga - 0.35.4-1 +- Removed patch no longer needed +- Updated to 0.35.4 + +* Thu Aug 31 2006 Luya Tshimbalanga - 0.35.3-14 - Add patch related to pyorbit due to upstream bug -* Wed Aug 30 2006 Luya Tshimbalanga - 0.35-3-13.2 +* Wed Aug 30 2006 Luya Tshimbalanga - 0.35.3-13.2 - pyorbit for FC-4 is 2.0.1 (-_-) -* Wed Aug 30 2006 Luya Tshimbalanga - 0.35-3-13 +* Wed Aug 30 2006 Luya Tshimbalanga - 0.35.3-13 - Fixed a silly typo - Added intltool for BuildRequires -* Sun Aug 27 2006 Luya Tshimbalanga - 0.35-3-10 +* Sun Aug 27 2006 Luya Tshimbalanga - 0.35.3-10 - Removed unecessary comment -* Tue Aug 01 2006 Luya Tshimbalanga - 0.35.3-9 -- Rebuilt - * Wed Apr 19 2006 Luya Tshimbalanga - 0.35.3-8 - Remove conditional sign for pyorbit-devel -* Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-7 -- Bump - -* Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-6 -- Bump - * Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-5 - Ajusted pyorbit requirement for ppc64 * Thu Jan 19 2006 Luya Tshimbalanga - 0.35.3-4 - Rebuild for Fedora Extras 5 -* Thu Jan 19 2006 Luya Tshimbalanga - 0.35.3-2 -- Rebuilt - -* Mon Jan 16 2006 Luya Tshimbalanga - 0.35.3-1.1 -- Rebuilt - * Mon Jan 16 2006 Luya Tshimbalanga - 0.35.3-1 - Updated to 0.35.3 - Removed thumbmail @@ -159,27 +141,14 @@ - Fixed the right path for symbolic link * Sat Dec 3 2005 Luya Tshimbalanga - 0.35.2-19 -- Added disable-schemas-install on %_configure +- Added disable-schemas-install on configure - Trying to symlink using nrpms method based on FC3 version * Tue Nov 29 2005 Luya Tshimbalanga - 0.35.2-18 - Added patch against NullObject.py (thanks jwb) * Tue Nov 29 2005 Luya Tshimbalanga - 0.35.2-17 -- Reorganized names and fixed %_install - - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-16 -- Rebuild - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-15 -- Fixed %_install - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-14 -- Bump - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-13 -- Bump +- Reorganized names and fixed install * Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-12 - Removed pygtk2 @@ -197,12 +166,6 @@ * Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-8 - Fixed error on mime.cache -* Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-7 -- Rebuilt - -* Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-6 -- Rebuilt - * Wed Nov 16 2005 Luya Tshimbalanga - 0.35.2-5 - Added desktop-file-utils command for post and postun @@ -212,8 +175,5 @@ * Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-3 - Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net)) -* Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-2 -- bump - * Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-1 - Initial Fedora Extras package Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdesklets/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jan 2006 23:21:09 -0000 1.3 +++ sources 8 Nov 2006 05:47:46 -0000 1.4 @@ -1 +1 @@ -3f9ce7f2ca4522bc96cb9bc4a4b91774 gDesklets-0.35.3.tar.bz2 +2b4318ed80d451afd38a9f235dfb400a gDesklets-0.35.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 05:49:51 2006 From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya)) Date: Tue, 7 Nov 2006 22:49:51 -0700 Subject: rpms/gdesklets/devel Pyorbit-1.0-fix.patch,1.1,NONE Message-ID: <200611080549.kA85npLm004481@cvs-int.fedora.redhat.com> Author: luya Update of /cvs/extras/rpms/gdesklets/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4476 Removed Files: Pyorbit-1.0-fix.patch Log Message: removed patch. No longer needed --- Pyorbit-1.0-fix.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 05:52:47 2006 From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya)) Date: Tue, 7 Nov 2006 22:52:47 -0700 Subject: rpms/gdesklets/FC-6 .cvsignore, 1.3, 1.4 gdesklets.spec, 1.20, 1.21 sources, 1.3, 1.4 Pyorbit-1.0-fix.patch, 1.1, NONE Message-ID: <200611080552.kA85ql4x004572@cvs-int.fedora.redhat.com> Author: luya Update of /cvs/extras/rpms/gdesklets/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4552 Modified Files: .cvsignore gdesklets.spec sources Removed Files: Pyorbit-1.0-fix.patch Log Message: source updated to 0.35.4. spec updated. Remove pathc, no longer needed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jan 2006 23:21:09 -0000 1.3 +++ .cvsignore 8 Nov 2006 05:52:17 -0000 1.4 @@ -1 +1 @@ -gDesklets-0.35.3.tar.bz2 +gDesklets-0.35.4.tar.bz2 Index: gdesklets.spec =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-6/gdesklets.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gdesklets.spec 31 Aug 2006 21:59:38 -0000 1.20 +++ gdesklets.spec 8 Nov 2006 05:52:17 -0000 1.21 @@ -1,16 +1,15 @@ -Name: gdesklets -Version: 0.35.3 -Release: 14%{?dist} -Summary: Advanced architecture for desktop applets - -Group: User Interface/Desktops -License: GPL - -URL: http://www.gdesklets.org/ -Source0: http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2 -Patch0: Pyorbit-1.0-fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: gdesklets +Version: 0.35.4 +Release: 1%{?dist} +Summary: An interactive Imlib2 console for the X Window system +Group: User Interface/Desktops +License: GPL + +URL: http://www.gdesklets.org/ +Source0: http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext @@ -18,9 +17,7 @@ BuildRequires: gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils Requires: gnome-python2-gconf >= 2.6.0 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -#Requires(post): desktop-file-utils Requires(post): shared-mime-info -#Requires(postun): desktop-file-utils Requires(postun): shared-mime-info @@ -32,7 +29,6 @@ %prep %setup -q -n gDesklets-%{version} -%patch0 -p1 %build @@ -47,12 +43,12 @@ %find_lang %{name} desktop-file-install --vendor=fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - --add-category Accessories \ - --add-category Application \ - --add-category Utility \ - data/%{name}.desktop + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + --add-category Accessories \ + --add-category Application \ + --add-category Utility \ + data/%{name}.desktop mkdir -p ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/} ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png @@ -65,12 +61,9 @@ %post update-mime-database %{_datadir}/mime &> /dev/null || : -#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - %postun update-mime-database %{_datadir}/mime &> /dev/null || : -#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %clean @@ -90,43 +83,32 @@ %changelog -* Thu Aug 31 2006 Luya Tshimbalanga - 0.35-3-14 +* Tue Nov 07 2006 Luya Tshimbalanga - 0.35.4-1 +- Removed patch no longer needed +- Updated to 0.35.4 + +* Thu Aug 31 2006 Luya Tshimbalanga - 0.35.3-14 - Add patch related to pyorbit due to upstream bug -* Wed Aug 30 2006 Luya Tshimbalanga - 0.35-3-13.2 +* Wed Aug 30 2006 Luya Tshimbalanga - 0.35.3-13.2 - pyorbit for FC-4 is 2.0.1 (-_-) -* Wed Aug 30 2006 Luya Tshimbalanga - 0.35-3-13 +* Wed Aug 30 2006 Luya Tshimbalanga - 0.35.3-13 - Fixed a silly typo - Added intltool for BuildRequires -* Sun Aug 27 2006 Luya Tshimbalanga - 0.35-3-10 +* Sun Aug 27 2006 Luya Tshimbalanga - 0.35.3-10 - Removed unecessary comment -* Tue Aug 01 2006 Luya Tshimbalanga - 0.35.3-9 -- Rebuilt - * Wed Apr 19 2006 Luya Tshimbalanga - 0.35.3-8 - Remove conditional sign for pyorbit-devel -* Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-7 -- Bump - -* Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-6 -- Bump - * Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-5 - Ajusted pyorbit requirement for ppc64 * Thu Jan 19 2006 Luya Tshimbalanga - 0.35.3-4 - Rebuild for Fedora Extras 5 -* Thu Jan 19 2006 Luya Tshimbalanga - 0.35.3-2 -- Rebuilt - -* Mon Jan 16 2006 Luya Tshimbalanga - 0.35.3-1.1 -- Rebuilt - * Mon Jan 16 2006 Luya Tshimbalanga - 0.35.3-1 - Updated to 0.35.3 - Removed thumbmail @@ -159,27 +141,14 @@ - Fixed the right path for symbolic link * Sat Dec 3 2005 Luya Tshimbalanga - 0.35.2-19 -- Added disable-schemas-install on %_configure +- Added disable-schemas-install on configure - Trying to symlink using nrpms method based on FC3 version * Tue Nov 29 2005 Luya Tshimbalanga - 0.35.2-18 - Added patch against NullObject.py (thanks jwb) * Tue Nov 29 2005 Luya Tshimbalanga - 0.35.2-17 -- Reorganized names and fixed %_install - - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-16 -- Rebuild - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-15 -- Fixed %_install - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-14 -- Bump - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-13 -- Bump +- Reorganized names and fixed install * Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-12 - Removed pygtk2 @@ -197,12 +166,6 @@ * Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-8 - Fixed error on mime.cache -* Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-7 -- Rebuilt - -* Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-6 -- Rebuilt - * Wed Nov 16 2005 Luya Tshimbalanga - 0.35.2-5 - Added desktop-file-utils command for post and postun @@ -212,8 +175,5 @@ * Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-3 - Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net)) -* Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-2 -- bump - * Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-1 - Initial Fedora Extras package Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jan 2006 23:21:09 -0000 1.3 +++ sources 8 Nov 2006 05:52:17 -0000 1.4 @@ -1 +1 @@ -3f9ce7f2ca4522bc96cb9bc4a4b91774 gDesklets-0.35.3.tar.bz2 +2b4318ed80d451afd38a9f235dfb400a gDesklets-0.35.4.tar.bz2 --- Pyorbit-1.0-fix.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 05:56:00 2006 From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya)) Date: Tue, 7 Nov 2006 22:56:00 -0700 Subject: rpms/gdesklets/FC-5 .cvsignore, 1.3, 1.4 gdesklets.spec, 1.23, 1.24 sources, 1.3, 1.4 Message-ID: <200611080556.kA85u0Uw004662@cvs-int.fedora.redhat.com> Author: luya Update of /cvs/extras/rpms/gdesklets/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4639 Modified Files: .cvsignore gdesklets.spec sources Log Message: source updated to 0.35.4. spec updated. Remove patch, no longer needed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jan 2006 23:21:09 -0000 1.3 +++ .cvsignore 8 Nov 2006 05:55:30 -0000 1.4 @@ -1 +1 @@ -gDesklets-0.35.3.tar.bz2 +gDesklets-0.35.4.tar.bz2 Index: gdesklets.spec =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gdesklets.spec 31 Aug 2006 21:59:37 -0000 1.23 +++ gdesklets.spec 8 Nov 2006 05:55:30 -0000 1.24 @@ -1,16 +1,15 @@ -Name: gdesklets -Version: 0.35.3 -Release: 14%{?dist} -Summary: Advanced architecture for desktop applets - -Group: User Interface/Desktops -License: GPL - -URL: http://www.gdesklets.org/ -Source0: http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2 -Patch0: Pyorbit-1.0-fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: gdesklets +Version: 0.35.4 +Release: 1%{?dist} +Summary: An interactive Imlib2 console for the X Window system +Group: User Interface/Desktops +License: GPL + +URL: http://www.gdesklets.org/ +Source0: http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext @@ -18,9 +17,7 @@ BuildRequires: gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils Requires: gnome-python2-gconf >= 2.6.0 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -#Requires(post): desktop-file-utils Requires(post): shared-mime-info -#Requires(postun): desktop-file-utils Requires(postun): shared-mime-info @@ -32,7 +29,6 @@ %prep %setup -q -n gDesklets-%{version} -%patch0 -p1 %build @@ -47,12 +43,12 @@ %find_lang %{name} desktop-file-install --vendor=fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - --add-category Accessories \ - --add-category Application \ - --add-category Utility \ - data/%{name}.desktop + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + --add-category Accessories \ + --add-category Application \ + --add-category Utility \ + data/%{name}.desktop mkdir -p ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/} ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png @@ -65,12 +61,9 @@ %post update-mime-database %{_datadir}/mime &> /dev/null || : -#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - %postun update-mime-database %{_datadir}/mime &> /dev/null || : -#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %clean @@ -90,43 +83,32 @@ %changelog -* Thu Aug 31 2006 Luya Tshimbalanga - 0.35-3-14 +* Tue Nov 07 2006 Luya Tshimbalanga - 0.35.4-1 +- Removed patch no longer needed +- Updated to 0.35.4 + +* Thu Aug 31 2006 Luya Tshimbalanga - 0.35.3-14 - Add patch related to pyorbit due to upstream bug -* Wed Aug 30 2006 Luya Tshimbalanga - 0.35-3-13.2 +* Wed Aug 30 2006 Luya Tshimbalanga - 0.35.3-13.2 - pyorbit for FC-4 is 2.0.1 (-_-) -* Wed Aug 30 2006 Luya Tshimbalanga - 0.35-3-13 +* Wed Aug 30 2006 Luya Tshimbalanga - 0.35.3-13 - Fixed a silly typo - Added intltool for BuildRequires -* Sun Aug 27 2006 Luya Tshimbalanga - 0.35-3-10 +* Sun Aug 27 2006 Luya Tshimbalanga - 0.35.3-10 - Removed unecessary comment -* Tue Aug 01 2006 Luya Tshimbalanga - 0.35.3-9 -- Rebuilt - * Wed Apr 19 2006 Luya Tshimbalanga - 0.35.3-8 - Remove conditional sign for pyorbit-devel -* Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-7 -- Bump - -* Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-6 -- Bump - * Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-5 - Ajusted pyorbit requirement for ppc64 * Thu Jan 19 2006 Luya Tshimbalanga - 0.35.3-4 - Rebuild for Fedora Extras 5 -* Thu Jan 19 2006 Luya Tshimbalanga - 0.35.3-2 -- Rebuilt - -* Mon Jan 16 2006 Luya Tshimbalanga - 0.35.3-1.1 -- Rebuilt - * Mon Jan 16 2006 Luya Tshimbalanga - 0.35.3-1 - Updated to 0.35.3 - Removed thumbmail @@ -159,27 +141,14 @@ - Fixed the right path for symbolic link * Sat Dec 3 2005 Luya Tshimbalanga - 0.35.2-19 -- Added disable-schemas-install on %_configure +- Added disable-schemas-install on configure - Trying to symlink using nrpms method based on FC3 version * Tue Nov 29 2005 Luya Tshimbalanga - 0.35.2-18 - Added patch against NullObject.py (thanks jwb) * Tue Nov 29 2005 Luya Tshimbalanga - 0.35.2-17 -- Reorganized names and fixed %_install - - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-16 -- Rebuild - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-15 -- Fixed %_install - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-14 -- Bump - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-13 -- Bump +- Reorganized names and fixed install * Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-12 - Removed pygtk2 @@ -197,12 +166,6 @@ * Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-8 - Fixed error on mime.cache -* Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-7 -- Rebuilt - -* Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-6 -- Rebuilt - * Wed Nov 16 2005 Luya Tshimbalanga - 0.35.2-5 - Added desktop-file-utils command for post and postun @@ -212,8 +175,5 @@ * Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-3 - Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net)) -* Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-2 -- bump - * Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-1 - Initial Fedora Extras package Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jan 2006 23:21:09 -0000 1.3 +++ sources 8 Nov 2006 05:55:30 -0000 1.4 @@ -1 +1 @@ -3f9ce7f2ca4522bc96cb9bc4a4b91774 gDesklets-0.35.3.tar.bz2 +2b4318ed80d451afd38a9f235dfb400a gDesklets-0.35.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 05:59:10 2006 From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya)) Date: Tue, 7 Nov 2006 22:59:10 -0700 Subject: rpms/gdesklets/FC-4 .cvsignore, 1.3, 1.4 gdesklets.spec, 1.18, 1.19 sources, 1.3, 1.4 Pyorbit-1.0-fix.patch, 1.1, NONE Message-ID: <200611080559.kA85xAMb004752@cvs-int.fedora.redhat.com> Author: luya Update of /cvs/extras/rpms/gdesklets/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4729 Modified Files: .cvsignore gdesklets.spec sources Removed Files: Pyorbit-1.0-fix.patch Log Message: source updated to 0.35.4. spec updated. Remove patch, no longer needed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jan 2006 23:24:40 -0000 1.3 +++ .cvsignore 8 Nov 2006 05:58:40 -0000 1.4 @@ -1 +1 @@ -gDesklets-0.35.3.tar.bz2 +gDesklets-0.35.4.tar.bz2 Index: gdesklets.spec =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gdesklets.spec 31 Aug 2006 21:59:36 -0000 1.18 +++ gdesklets.spec 8 Nov 2006 05:58:40 -0000 1.19 @@ -1,23 +1,23 @@ -Name: gdesklets -Version: 0.35.3 -Release: 14%{?dist} -Summary: Advanced architecture for desktop applets - -Group: User Interface/Desktops -License: GPL -URL: http://www.gdesklets.org/ -Source0: http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2 -Patch0: Pyorbit-1.0-fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: gdesklets +Version: 0.35.4 +Release: 1%{?dist} +Summary: An interactive Imlib2 console for the X Window system + +Group: User Interface/Desktops +License: GPL + +URL: http://www.gdesklets.org/ +Source0: http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, -BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, intltool +BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext +BuildRequires: intltool BuildRequires: gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils Requires: gnome-python2-gconf >= 2.6.0 -#Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -#Requires(post): desktop-file-utils +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires(post): shared-mime-info -#Requires(postun): desktop-file-utils Requires(postun): shared-mime-info @@ -29,7 +29,6 @@ %prep %setup -q -n gDesklets-%{version} -%patch0 -p1 %build @@ -44,12 +43,12 @@ %find_lang %{name} desktop-file-install --vendor=fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ - --add-category Accessories \ - --add-category Application \ - --add-category Utility \ - data/%{name}.desktop + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + --add-category Accessories \ + --add-category Application \ + --add-category Utility \ + data/%{name}.desktop mkdir -p ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/} ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png @@ -62,12 +61,9 @@ %post update-mime-database %{_datadir}/mime &> /dev/null || : -#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - %postun update-mime-database %{_datadir}/mime &> /dev/null || : -#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %clean @@ -87,46 +83,32 @@ %changelog -* Thu Aug 31 2006 Luya Tshimbalanga - 0.35-3-14 +* Tue Nov 07 2006 Luya Tshimbalanga - 0.35.4-1 +- Removed patch no longer needed +- Updated to 0.35.4 + +* Thu Aug 31 2006 Luya Tshimbalanga - 0.35.3-14 - Add patch related to pyorbit due to upstream bug -* Wed Aug 30 2006 Luya Tshimbalanga - 0.35-3-13.2 +* Wed Aug 30 2006 Luya Tshimbalanga - 0.35.3-13.2 - pyorbit for FC-4 is 2.0.1 (-_-) -* Wed Aug 30 2006 Luya Tshimbalang - 0.35.3-13 +* Wed Aug 30 2006 Luya Tshimbalanga - 0.35.3-13 - Fixed a silly typo - Added intltool for BuildRequires * Sun Aug 27 2006 Luya Tshimbalanga - 0.35.3-10 -- Removed unecessary comment about GConf. - -* Wed Aug 02 2006 Luya Tshimbalanga - 0.35.3-9 -- Minor update to match Extras name guideline - -* Wed Apr 19 2006 Luya Tshimbalanga - 0.35.3-8.1 -- Removed libXau-devel and libXdmcp-devel as they don't belong to FC-4 +- Removed unecessary comment * Wed Apr 19 2006 Luya Tshimbalanga - 0.35.3-8 - Remove conditional sign for pyorbit-devel -* Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-7 -- Bump - -* Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-6 -- Bump - * Mon Apr 03 2006 Luya Tshimbalanga - 0.35.3-5 - Ajusted pyorbit requirement for ppc64 * Thu Jan 19 2006 Luya Tshimbalanga - 0.35.3-4 - Rebuild for Fedora Extras 5 -* Thu Jan 19 2006 Luya Tshimbalanga - 0.35.3-2 -- Rebuilt - -* Mon Jan 16 2006 Luya Tshimbalanga - 0.35.3-1.1 -- Rebuilt - * Mon Jan 16 2006 Luya Tshimbalanga - 0.35.3-1 - Updated to 0.35.3 - Removed thumbmail @@ -159,27 +141,14 @@ - Fixed the right path for symbolic link * Sat Dec 3 2005 Luya Tshimbalanga - 0.35.2-19 -- Added disable-schemas-install on %_configure +- Added disable-schemas-install on configure - Trying to symlink using nrpms method based on FC3 version * Tue Nov 29 2005 Luya Tshimbalanga - 0.35.2-18 - Added patch against NullObject.py (thanks jwb) * Tue Nov 29 2005 Luya Tshimbalanga - 0.35.2-17 -- Reorganized names and fixed %_install - - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-16 -- Rebuild - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-15 -- Fixed %_install - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-14 -- Bump - -* Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-13 -- Bump +- Reorganized names and fixed install * Mon Nov 21 2005 Luya Tshimbalanga - 0.35.2-12 - Removed pygtk2 @@ -197,12 +166,6 @@ * Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-8 - Fixed error on mime.cache -* Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-7 -- Rebuilt - -* Fri Nov 18 2005 Luya Tshimbalanga - 0.35.2-6 -- Rebuilt - * Wed Nov 16 2005 Luya Tshimbalanga - 0.35.2-5 - Added desktop-file-utils command for post and postun @@ -212,8 +175,5 @@ * Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-3 - Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net)) -* Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-2 -- bump - * Sat Nov 12 2005 Luya Tshimbalanga - 0.35.2-1 - Initial Fedora Extras package Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdesklets/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jan 2006 23:24:40 -0000 1.3 +++ sources 8 Nov 2006 05:58:40 -0000 1.4 @@ -1 +1 @@ -3f9ce7f2ca4522bc96cb9bc4a4b91774 gDesklets-0.35.3.tar.bz2 +2b4318ed80d451afd38a9f235dfb400a gDesklets-0.35.4.tar.bz2 --- Pyorbit-1.0-fix.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 06:09:37 2006 From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya)) Date: Tue, 7 Nov 2006 23:09:37 -0700 Subject: rpms/gdesklets/devel gdesklets.spec,1.21,1.22 Message-ID: <200611080609.kA869bOT007822@cvs-int.fedora.redhat.com> Author: luya Update of /cvs/extras/rpms/gdesklets/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7806 Modified Files: gdesklets.spec Log Message: spec updated. Removed gnome-python which is no longer on rawhide Index: gdesklets.spec =================================================================== RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gdesklets.spec 8 Nov 2006 05:47:46 -0000 1.21 +++ gdesklets.spec 8 Nov 2006 06:09:07 -0000 1.22 @@ -1,6 +1,6 @@ Name: gdesklets Version: 0.35.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An interactive Imlib2 console for the X Window system Group: User Interface/Desktops @@ -14,7 +14,7 @@ BuildRequires: python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext BuildRequires: libXau-devel, libXdmcp-devel, intltool -BuildRequires: gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils +BuildRequires: libgnome-devel > 2.6.0, desktop-file-utils Requires: gnome-python2-gconf >= 2.6.0 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires(post): shared-mime-info @@ -83,6 +83,9 @@ %changelog +* Tue Nov 07 2006 Luya Tshimbalanga - 0.35.4-2 +- Removed gnome-python for buildrequires + * Tue Nov 07 2006 Luya Tshimbalanga - 0.35.4-1 - Removed patch no longer needed - Updated to 0.35.4 From fedora-extras-commits at redhat.com Wed Nov 8 09:24:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 02:24:29 -0700 Subject: rpms/scummvm - New directory Message-ID: <200611080924.kA89OTxJ017598@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17594/scummvm Log Message: Directory /cvs/extras/rpms/scummvm added to the repository From fedora-extras-commits at redhat.com Wed Nov 8 09:24:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 02:24:34 -0700 Subject: rpms/scummvm/devel - New directory Message-ID: <200611080924.kA89OYvS017612@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17594/scummvm/devel Log Message: Directory /cvs/extras/rpms/scummvm/devel added to the repository From fedora-extras-commits at redhat.com Wed Nov 8 09:24:51 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 02:24:51 -0700 Subject: rpms/scummvm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611080924.kA89OpkX017643@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17637 Added Files: Makefile import.log Log Message: Setup of module scummvm --- NEW FILE Makefile --- # Top level Makefile for module scummvm 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 Wed Nov 8 09:24:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 02:24:57 -0700 Subject: rpms/scummvm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611080924.kA89Ovpr017661@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17637/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scummvm --- 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 Nov 8 09:26:26 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 02:26:26 -0700 Subject: rpms/scummvm import.log,1.1,1.2 Message-ID: <200611080926.kA89QQrv017755@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17717 Modified Files: import.log Log Message: auto-import scummvm-0.9.1-1 on branch devel from scummvm-0.9.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scummvm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Nov 2006 09:24:51 -0000 1.1 +++ import.log 8 Nov 2006 09:25:56 -0000 1.2 @@ -0,0 +1 @@ +scummvm-0_9_1-1:HEAD:scummvm-0.9.1-1.src.rpm:1162978017 From fedora-extras-commits at redhat.com Wed Nov 8 09:26:27 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 02:26:27 -0700 Subject: rpms/scummvm/devel scummvm-0.9.0-gcc41.patch, NONE, 1.1 scummvm-0.9.0-nostrip.patch, NONE, 1.1 scummvm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611080926.kA89QRYk017759@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17717/devel Modified Files: .cvsignore sources Added Files: scummvm-0.9.0-gcc41.patch scummvm-0.9.0-nostrip.patch scummvm.spec Log Message: auto-import scummvm-0.9.1-1 on branch devel from scummvm-0.9.1-1.src.rpm scummvm-0.9.0-gcc41.patch: --- NEW FILE scummvm-0.9.0-gcc41.patch --- diff -Naupr scummvm-0.9.0.orig/common/array.h scummvm-0.9.0/common/array.h --- scummvm-0.9.0.orig/common/array.h 2006-06-21 23:16:01.000000000 +0200 +++ scummvm-0.9.0/common/array.h 2006-10-29 18:26:41.000000000 +0100 @@ -48,11 +48,7 @@ public: _data[i] = array._data[i]; } -#ifdef __SYMBIAN32__ ~Array() -#else - ~Array() -#endif { if (_data) delete [] _data; diff -Naupr scummvm-0.9.0.orig/common/list.h scummvm-0.9.0/common/list.h --- scummvm-0.9.0.orig/common/list.h 2006-06-21 23:16:01.000000000 +0200 +++ scummvm-0.9.0/common/list.h 2006-10-29 18:28:48.000000000 +0100 @@ -129,11 +129,7 @@ public: insert(begin(), list.begin(), list.end()); } -#ifndef __SYMBIAN32__ - ~List() -#else ~List() -#endif { clear(); delete _anchor; scummvm-0.9.0-nostrip.patch: --- NEW FILE scummvm-0.9.0-nostrip.patch --- diff -Naupr scummvm-0.9.0.orig/Makefile scummvm-0.9.0/Makefile --- scummvm-0.9.0.orig/Makefile 2006-06-21 23:19:07.000000000 +0200 +++ scummvm-0.9.0/Makefile 2006-10-29 18:56:40.000000000 +0100 @@ -45,7 +45,7 @@ config.mak: $(srcdir)/configure install: all $(INSTALL) -d "$(DESTDIR)$(BINDIR)" - $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" + $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" --- NEW FILE scummvm.spec --- Name: scummvm Version: 0.9.1 Release: 1%{?dist} Summary: Interpreter for several adventure games Group: Applications/Emulators License: GPL URL: http://scummvm.sourceforge.net/ Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 ####### Icons extracted from icons/scummvm.ico with the gimp Source1: scummvm-icons.tar.gz Patch0: scummvm-0.9.0-gcc41.patch Patch1: scummvm-0.9.0-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel libvorbis-devel flac-devel zlib-devel nasm BuildRequires: desktop-file-utils Requires: hicolor-icon-theme %description ScummVM is an implementation of the SCUMM (Script Creation Utility for Maniac Mansion) engine used in various Lucas Arts games such as Monkey Island and Day of the Tentacle. At this time ScummVM should be considered ALPHA software, as it's still under heavy development. Be aware that while many games will work with few major bugs, crashes can happen. Also note that saved games can, and probably will, be incompatible between releases. Also ScummVM is capable of playing several non-SCUMM games. %prep %setup -q -a 1 %patch0 -p1 -b .gcc41 %patch1 -p1 -b .nostrip sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \ dists/%{name}.desktop %build # No rpm configure because scummvm's configure isn't a real configure and thus # doesn't understand some of the options %configure passes. This includes # -libdir, so rpmlint's complaints should be ignored. # The disables are so that these don't accidently get build in when rebuilding # on a system with the necesarry deps installed ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \ --datadir=%{_datadir} --disable-mpeg2 --disable-mad --disable-fluidsynth make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -D -p -m 0644 gui/themes/modern.ini \ $RPM_BUILD_ROOT%{_datadir}/%{name}/modern.ini install -D -p -m 0644 gui/themes/modern.zip \ $RPM_BUILD_ROOT%{_datadir}/%{name}/modern.zip # Remove doc files we want to include with %doc rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{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 \ --add-category X-Fedora \ dists/%{name}.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps install -m 644 %{name}-16x16.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png install -m 644 %{name}-32x32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png install -m 644 %{name}-48x48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png install -m 644 %{name}-128x128.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm %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 NEWS README TODO %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man6/%{name}.6* %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog * Sat Nov 4 2006 Hans de Goede 0.9.1-1 - New upstream release 0.9.1 - Prepare for inclusion into FE - Remove mp3 support (the same files are also available in ogg format) - Remove mpeg2 video support (problem, but only for one game I will request upstream to add theora support) * Sun Oct 29 2006 Matthias Saou 0.9.0-1 - Update to 0.9.0. - Spec file cleanup. - Add datadir patch from upstream in order to include themes. * Thu Mar 09 2006 Andreas Bierfert - switch to new release field - drop Epoch * Tue Feb 28 2006 Andreas Bierfert - add dist * Mon Feb 06 2006 Andreas Bierfert 0:0.8.2-0.lvn.1 - version upgrade * Mon Jan 30 2006 Andreas Bierfert 0:0.8.1-0.lvn.1 - version upgrade * Thu Dec 08 2005 Andreas Bierfert 0:0.8.0-0.lvn.2 - fix #693 (desktop entry) - beautify desktop-file-install * Sat Oct 29 2005 Andreas Bierfert 0:0.8.0-0.lvn.1 - version upgrade * Mon Jun 20 2005 Andreas Bierfert 0:0.7.1-0.lvn.3 - add --disable--mt32emu switch to fix build with gcc4 * Mon May 30 2005 Andreas Bierfert 0:0.7.1-0.lvn.2 - fix x86_64 build * Thu Mar 31 2005 Andreas Bierfert 0:0.7.1-0.lvn.1 - Version Upgrade * Tue Feb 22 2005 Andreas Bierfert 0:0.7.0-0.lvn.3 - add nasm <-> x86_64 * Tue Feb 22 2005 Andreas Bierfert 0:0.7.0-0.lvn.2 - fixed #371 (bild on non ix86 - David Woodhouse) * Fri Dec 24 2004 Andreas Bierfert 0:0.7.0-0.lvn.1 - added AUTHORS and TODO * Thu Dec 23 2004 Andreas Bierfert - added off. 0.7.0 sources * Sun Dec 19 2004 Andreas Bierfert - upgrade to 0.7.0 cvs (20041219), prep. for 0.7.0 - added more BuildRequires - if without-alsa is defined actually disable alsa via configure * Thu Nov 25 2004 Andreas Bierfert 0:0.6.1b-0.lvn.1 -upgrade to 0.6.1b * Thu May 27 2004 Andreas Bierfert 0:0.6.0-0.lvn.1 - upgrade to 0.6.0 * Thu Oct 02 2003 Andreas Bierfert 0:0.5.1-0.fdr.6 - removed #--- lines * Tue Sep 16 2003 Andreas Bierfert 0:0.5.1-0.fdr.5 - added ${RPM_OPT_FLAGS} * Mon Sep 08 2003 Andreas Bierfert 0:0.5.1-0.fdr.4 - added libvorbis-devel * Tue Sep 02 2003 Andreas Bierfert 0:0.5.1-0.fdr.3 - upgrade to new minor version * Wed Aug 06 2003 Andreas Bierfert 0:0.5.0-0.fdr.2 - upgrade to new major version * Fri Aug 01 2003 Andreas Bierfert 0:0.4.1-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scummvm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Nov 2006 09:24:57 -0000 1.1 +++ .cvsignore 8 Nov 2006 09:25:57 -0000 1.2 @@ -0,0 +1,2 @@ +scummvm-0.9.1.tar.bz2 +scummvm-icons.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scummvm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Nov 2006 09:24:57 -0000 1.1 +++ sources 8 Nov 2006 09:25:57 -0000 1.2 @@ -0,0 +1,2 @@ +30a82ad466bae223875e66ee14b94904 scummvm-0.9.1.tar.bz2 +b20d750de2c88e8aefea364afae1776c scummvm-icons.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 09:53:15 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 02:53:15 -0700 Subject: owners owners.list,1.1903,1.1904 Message-ID: <200611080953.kA89rFAq017948@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17932 Modified Files: owners.list Log Message: Add scummvm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1903 retrieving revision 1.1904 diff -u -r1.1903 -r1.1904 --- owners.list 8 Nov 2006 01:29:01 -0000 1.1903 +++ owners.list 8 Nov 2006 09:52:45 -0000 1.1904 @@ -1171,8 +1171,8 @@ Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|numpy|A fast multidimensional array facility for Python|jwilson at redhat.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net Fedora Extras|nuttcp|A network performance measurement tool intended for use by network and system managers|rvokal at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|nyquist|Sound synthesis and composition language with a Lisp syntax|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|nyquist|Sound synthesis and composition language with a Lisp syntax|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|obby|A library which provides synced document buffers|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|obconf|A graphical configuration editor for the Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|obmenu|A graphical menu editor for the Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org| @@ -2081,6 +2081,7 @@ Fedora Extras|scrip|Spherical Coordinate Remapping and Interpolation Package|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|scrot|Screen-shot capture using Imlib2|miker5slow at grandecom.net|extras-qa at fedoraproject.org| Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|scummvm|Interpreter for several adventure games|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|matthias at rpmforge.net Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 8 09:58:26 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 02:58:26 -0700 Subject: comps comps-fe5.xml.in, 1.191, 1.192 comps-fe6.xml.in, 1.215, 1.216 comps-fe7.xml.in, 1.13, 1.14 Message-ID: <200611080958.kA89wQak018061@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18041 Modified Files: comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in Log Message: Add alex4 Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- comps-fe5.xml.in 5 Nov 2006 21:28:01 -0000 1.191 +++ comps-fe5.xml.in 8 Nov 2006 09:57:56 -0000 1.192 @@ -302,6 +302,7 @@ abe abuse + alex4 atomix auriferous ballbuster Index: comps-fe6.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe6.xml.in,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- comps-fe6.xml.in 5 Nov 2006 21:28:01 -0000 1.215 +++ comps-fe6.xml.in 8 Nov 2006 09:57:56 -0000 1.216 @@ -352,6 +352,7 @@ abe abuse + alex4 atomix auriferous ballbuster Index: comps-fe7.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe7.xml.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- comps-fe7.xml.in 5 Nov 2006 21:28:01 -0000 1.13 +++ comps-fe7.xml.in 8 Nov 2006 09:57:56 -0000 1.14 @@ -352,6 +352,7 @@ abe abuse + alex4 atomix auriferous ballbuster From fedora-extras-commits at redhat.com Wed Nov 8 10:01:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 03:01:43 -0700 Subject: rpms/scummvm/devel scummvm.spec,1.1,1.2 Message-ID: <200611081001.kA8A1hsW021024@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/scummvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20996 Modified Files: scummvm.spec Log Message: don't use single % in comments Index: scummvm.spec =================================================================== RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scummvm.spec 8 Nov 2006 09:25:57 -0000 1.1 +++ scummvm.spec 8 Nov 2006 10:01:13 -0000 1.2 @@ -37,7 +37,7 @@ %build # No rpm configure because scummvm's configure isn't a real configure and thus -# doesn't understand some of the options %configure passes. This includes +# doesn't understand some of the options %%configure passes. This includes # -libdir, so rpmlint's complaints should be ignored. # The disables are so that these don't accidently get build in when rebuilding # on a system with the necesarry deps installed From fedora-extras-commits at redhat.com Wed Nov 8 11:36:01 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 8 Nov 2006 04:36:01 -0700 Subject: comps comps-fe5.xml,1.14,NONE comps-fe6.xml,1.18,NONE Message-ID: <200611081136.kA8Ba1A2026617@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26609 Removed Files: comps-fe5.xml comps-fe6.xml Log Message: misleading and not used as long as they are generated on-the-fly --- comps-fe5.xml DELETED --- --- comps-fe6.xml DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 11:37:27 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Wed, 8 Nov 2006 04:37:27 -0700 Subject: rpms/eclipse-subclipse/devel eclipse-subclipse-1.1.8-plugin-classpath.patch, NONE, 1.1 subclipse-fetch-1.1.8.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 eclipse-subclipse.spec, 1.2, 1.3 sources, 1.2, 1.3 eclipse-subclipse-1.1.5-plugin-classpath.patch, 1.1, NONE subclipse-fetch-1.1.5.sh, 1.1, NONE Message-ID: <200611081137.kA8BbRP1026782@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/eclipse-subclipse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26698 Modified Files: .cvsignore eclipse-subclipse.spec sources Added Files: eclipse-subclipse-1.1.8-plugin-classpath.patch subclipse-fetch-1.1.8.sh Removed Files: eclipse-subclipse-1.1.5-plugin-classpath.patch subclipse-fetch-1.1.5.sh Log Message: Update to upstream 1.1.8 eclipse-subclipse-1.1.8-plugin-classpath.patch: --- NEW FILE eclipse-subclipse-1.1.8-plugin-classpath.patch --- diff -Naur subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF --- subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF 2006-10-23 13:10:29.000000000 -0400 +++ subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF 2006-11-08 07:16:12.000000000 -0400 @@ -2,7 +2,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true Bundle-Version: 1.1.8 -Bundle-ClassPath: ., +Bundle-ClassPath: lib/subclipse-core.jar, lib/svnClientAdapter.jar, lib/svnjavahl.jar, lib/javasvn.jar, --- NEW FILE subclipse-fetch-1.1.8.sh --- #!/bin/sh VERSION=1.1.8 svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION find $VERSION -name \*.dll | xargs rm mv $VERSION subclipse-$VERSION tar -czf subclipse-$VERSION.tgz subclipse-$VERSION Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Aug 2006 00:56:47 -0000 1.2 +++ .cvsignore 8 Nov 2006 11:36:57 -0000 1.3 @@ -1 +1 @@ -subclipse-1.1.5.tgz +subclipse-1.1.8.tgz Index: eclipse-subclipse.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-subclipse.spec 28 Aug 2006 03:45:28 -0000 1.2 +++ eclipse-subclipse.spec 8 Nov 2006 11:36:57 -0000 1.3 @@ -7,7 +7,7 @@ Name: eclipse-subclipse -Version: 1.1.5 +Version: 1.1.8 Release: 2%{?dist} Summary: Subversion Eclipse plugin @@ -18,7 +18,7 @@ # Script to fetch the source code # the new source tarball does not includes the book feature and the layout is # different than the source repository -Source10: subclipse-fetch-1.1.5.sh +Source10: subclipse-fetch-1.1.8.sh # Disable javahl support temporaly until apparent classloader problem is fixed Patch0: eclipse-subclipse-1.0.1-default-javasvn.patch Patch1: svnClientAdapter-1.1.4-javac-target.patch @@ -26,7 +26,7 @@ # This patch is applied after the build has finished when unpacking the plugin # jar and replacing internal jars with links to its dependencies. It can not be # applied at "prep" stage because it causes errors at build time -Source50: eclipse-subclipse-1.1.5-plugin-classpath.patch +Source50: eclipse-subclipse-1.1.8-plugin-classpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -211,6 +211,9 @@ %{eclipse_base}/plugins/org.tigris.subversion.book_* %changelog +* Wed Nov 08 2006 Robert Marcano 1.1.8-2 +- Update to upstream 1.1.8 + * Mon Aug 28 2006 Robert Marcano 1.1.5-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Aug 2006 00:56:47 -0000 1.2 +++ sources 8 Nov 2006 11:36:57 -0000 1.3 @@ -1 +1 @@ -7c317c03fc7dc8fae0612c75e46564ae subclipse-1.1.5.tgz +bbc6dd6c7cb8107fe3906460b2f556e4 subclipse-1.1.8.tgz --- eclipse-subclipse-1.1.5-plugin-classpath.patch DELETED --- --- subclipse-fetch-1.1.5.sh DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 12:11:25 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 8 Nov 2006 05:11:25 -0700 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.23,1.24 Message-ID: <200611081211.kA8CBPJF030233@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30209 Modified Files: php-eaccelerator.spec Log Message: Change to require php-common instead of php, for fastcgi without apache. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- php-eaccelerator.spec 16 Oct 2006 16:44:20 -0000 1.23 +++ php-eaccelerator.spec 8 Nov 2006 12:10:55 -0000 1.24 @@ -16,15 +16,15 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Languages -URL: http://eaccelerator.sourceforge.net/ +URL: http://eaccelerator.net/ Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2 Patch0: eaccelerator-0.9.5-rc1-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: php-api = %{php_apiver} -Requires: php = %{php_version} +Requires: php-common = %{php_version} Provides: php-zend_extension Conflicts: php-mmcache BuildRequires: php, php-devel @@ -92,6 +92,9 @@ %changelog +* Wed Nov 8 2006 Matthias Saou 5.1.6_0.9.5-2 +- Change to require php-common instead of php, for fastcgi without apache. + * Mon Oct 16 2006 Matthias Saou 5.1.6_0.9.5-1 - Update to 0.9.5 final. - Add cleanup of the cache directory upon package removal. From fedora-extras-commits at redhat.com Wed Nov 8 13:28:29 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 8 Nov 2006 06:28:29 -0700 Subject: fedora-security/audit fc5,1.384,1.385 fc6,1.136,1.137 Message-ID: <200611081328.kA8DSTco000986@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv966 Modified Files: fc5 fc6 Log Message: Updates from yesterday and today, still to do kde and python Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.384 retrieving revision 1.385 diff -u -r1.384 -r1.385 --- fc5 7 Nov 2006 10:17:32 -0000 1.384 +++ fc5 8 Nov 2006 13:28:25 -0000 1.385 @@ -1,9 +1,12 @@ -Up to date CVE as of CVE email 20061106 -Up to date FC5 as of 20061106 +Up to date CVE as of CVE email 20061107 +Up to date FC5 as of 20061107 ** are items that need attention +CVE-2006-5783 ignore (firefox) disputed CVE-2006-5757 ** kernel +CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194] +CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194] CVE-2006-5706 ** php, fixed 5.2.0 CVE-2006-5701 ** kernel CVE-2006-5633 ignore (firefox) just a client DoS @@ -16,6 +19,8 @@ CVE-2006-5469 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110] +CVE-2006-5464 version (thunderbird) [since FEDORA-2006-1194] +CVE-2006-5463 version (thunderbird) [since FEDORA-2006-1194] CVE-2006-5466 VULNERABLE (rpm) #212833 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168] CVE-2006-5456 VULNERABLE (ImageMagick) #210921 Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- fc6 7 Nov 2006 10:12:54 -0000 1.136 +++ fc6 8 Nov 2006 13:28:25 -0000 1.137 @@ -1,9 +1,14 @@ -Up to date CVE as of CVE email 20061106 -Up to date FC6 as of 20061106 +Up to date CVE as of CVE email 20061107 +Up to date FC6 as of 20061107 ** are items that need attention +CVE-2006-5783 ignore (firefox) disputed CVE-2006-5757 ** kernel +CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191] +CVE-2006-5748 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192] +CVE-2006-5747 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191] +CVE-2006-5747 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192] CVE-2006-5706 ** php, fixed 5.2.0 CVE-2006-5701 ** kernel CVE-2006-5633 ignore (firefox) just a client DoS @@ -18,6 +23,10 @@ CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1109] CVE-2006-5466 VULNERABLE (rpm) #212833 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDOA-2006-1169] +CVE-2006-5464 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191] +CVE-2006-5464 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192] +CVE-2006-5463 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191] +CVE-2006-5463 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192] CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2) From fedora-extras-commits at redhat.com Wed Nov 8 13:56:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 06:56:22 -0700 Subject: rpms/PyQt-qscintilla/devel .cvsignore, 1.2, 1.3 PyQt-qscintilla.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200611081356.kA8DuM7L001129@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyQt-qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1109 Modified Files: .cvsignore PyQt-qscintilla.spec sources Log Message: * Mon Nov 06 2006 Rex Dieter 3.17-1 - PyQt-3.17 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Jun 2006 20:29:53 -0000 1.2 +++ .cvsignore 8 Nov 2006 13:55:52 -0000 1.3 @@ -1 +1,2 @@ PyQt-x11-gpl-3.16.tar.gz +PyQt-x11-gpl-3.17.tar.gz Index: PyQt-qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/PyQt-qscintilla.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- PyQt-qscintilla.spec 6 Nov 2006 15:19:33 -0000 1.6 +++ PyQt-qscintilla.spec 8 Nov 2006 13:55:52 -0000 1.7 @@ -1,8 +1,8 @@ Summary: PyQt qscintilla extentions Name: PyQt-qscintilla -Version: 3.16 -Release: 7%{?dist} +Version: 3.17 +Release: 1%{?dist} License: GPL Group: Development/Languages @@ -13,9 +13,12 @@ BuildRequires: qt-devel BuildRequires: qscintilla-devel BuildRequires: sip-devel +BuildRequires: python-devel %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" Requires: python-abi = %{python_ver} +%endif Requires: PyQt = %{version} %description @@ -67,6 +70,9 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 3.17-1 +- PyQt-3.17 + * Mon Nov 06 2006 Rex Dieter 3.16-7 - -devel: Requires: PyQt-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Jun 2006 20:29:53 -0000 1.2 +++ sources 8 Nov 2006 13:55:52 -0000 1.3 @@ -1 +1 @@ -5f7a32a15bf8afe17c0d0a0cc46de690 PyQt-x11-gpl-3.16.tar.gz +dd0ecb6258215cd8e47e6de1c37a6da2 PyQt-x11-gpl-3.17.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 14:12:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 07:12:30 -0700 Subject: rpms/eric/devel eric.spec,1.5,1.6 Message-ID: <200611081412.kA8ECUvf004311@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/eric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4295 Modified Files: eric.spec Log Message: * Mon Nov 06 2006 Rex Dieter 5.9.1-4 - BR: PyQt-qscintilla-devel - (unversioned) Requires: PyQt-qscintilla Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eric.spec 7 Sep 2006 19:52:25 -0000 1.5 +++ eric.spec 8 Nov 2006 14:11:59 -0000 1.6 @@ -5,7 +5,7 @@ Name: eric Summary: Python IDE Version: 3.9.1 -Release: 3%{?dist}%{?kde} +Release: 4%{?dist}%{?kde} License: GPL Group: Development/Tools @@ -25,19 +25,18 @@ Patch3: gen_sip_api-PyQt4.patch BuildRequires: desktop-file-utils -BuildRequires: PyQt-qscintilla +BuildRequires: PyQt-qscintilla-devel # PyQt api's BuildRequires: PyQt-devel -%global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) -%if "%{?pyqt_ver}" > "2" -Requires: PyQt = %{pyqt_ver} -%endif +# This can be left unversioned Requires: PyQt-qscintilla %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()") +%if "%{?python_ver}" > "2" Requires: python-abi = %{python_ver} +%endif %description eric3 is a full featured Python IDE that is written in PyQt using @@ -141,6 +140,10 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 5.9.1-4 +- BR: PyQt-qscintilla-devel +- (unversioned) Requires: PyQt-qscintilla + * Thu Sep 07 2006 Rex Dieter 5.9.1-3 - include .py[c,o] files again (with no %%ghost'ing) From fedora-extras-commits at redhat.com Wed Nov 8 14:14:31 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 07:14:31 -0700 Subject: rpms/eric/FC-6 eric.spec,1.5,1.6 Message-ID: <200611081414.kA8EEVbU004391@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/eric/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4375 Modified Files: eric.spec Log Message: * Mon Nov 06 2006 Rex Dieter 5.9.1-4 - BR: PyQt-qscintilla-devel - (unversioned) Requires: PyQt-qscintilla Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/FC-6/eric.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eric.spec 7 Sep 2006 19:52:25 -0000 1.5 +++ eric.spec 8 Nov 2006 14:14:01 -0000 1.6 @@ -5,7 +5,7 @@ Name: eric Summary: Python IDE Version: 3.9.1 -Release: 3%{?dist}%{?kde} +Release: 4%{?dist}%{?kde} License: GPL Group: Development/Tools @@ -25,19 +25,18 @@ Patch3: gen_sip_api-PyQt4.patch BuildRequires: desktop-file-utils -BuildRequires: PyQt-qscintilla +BuildRequires: PyQt-qscintilla-devel # PyQt api's BuildRequires: PyQt-devel -%global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) -%if "%{?pyqt_ver}" > "2" -Requires: PyQt = %{pyqt_ver} -%endif +# This can be left unversioned Requires: PyQt-qscintilla %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()") +%if "%{?python_ver}" > "2" Requires: python-abi = %{python_ver} +%endif %description eric3 is a full featured Python IDE that is written in PyQt using @@ -141,6 +140,10 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 5.9.1-4 +- BR: PyQt-qscintilla-devel +- (unversioned) Requires: PyQt-qscintilla + * Thu Sep 07 2006 Rex Dieter 5.9.1-3 - include .py[c,o] files again (with no %%ghost'ing) From fedora-extras-commits at redhat.com Wed Nov 8 14:15:56 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 07:15:56 -0700 Subject: rpms/eric/FC-5 eric.spec,1.5,1.6 Message-ID: <200611081415.kA8EFut8004464@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/eric/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4447 Modified Files: eric.spec Log Message: * Mon Nov 06 2006 Rex Dieter 5.9.1-4 - BR: PyQt-qscintilla-devel - (unversioned) Requires: PyQt-qscintilla Index: eric.spec =================================================================== RCS file: /cvs/extras/rpms/eric/FC-5/eric.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eric.spec 7 Sep 2006 19:53:08 -0000 1.5 +++ eric.spec 8 Nov 2006 14:15:25 -0000 1.6 @@ -5,7 +5,7 @@ Name: eric Summary: Python IDE Version: 3.9.1 -Release: 3%{?dist}%{?kde} +Release: 4%{?dist}%{?kde} License: GPL Group: Development/Tools @@ -25,19 +25,18 @@ Patch3: gen_sip_api-PyQt4.patch BuildRequires: desktop-file-utils -BuildRequires: PyQt-qscintilla +BuildRequires: PyQt-qscintilla-devel # PyQt api's BuildRequires: PyQt-devel -%global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) -%if "%{?pyqt_ver}" > "2" -Requires: PyQt = %{pyqt_ver} -%endif +# This can be left unversioned Requires: PyQt-qscintilla %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()") +%if "%{?python_ver}" > "2" Requires: python-abi = %{python_ver} +%endif %description eric3 is a full featured Python IDE that is written in PyQt using @@ -141,6 +140,10 @@ %changelog +* Mon Nov 06 2006 Rex Dieter 5.9.1-4 +- BR: PyQt-qscintilla-devel +- (unversioned) Requires: PyQt-qscintilla + * Thu Sep 07 2006 Rex Dieter 5.9.1-3 - include .py[c,o] files again (with no %%ghost'ing) From fedora-extras-commits at redhat.com Wed Nov 8 14:25:12 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 07:25:12 -0700 Subject: rpms/sbcl/FC-6 .cvsignore, 1.16, 1.17 sbcl.spec, 1.52, 1.53 sources, 1.18, 1.19 Message-ID: <200611081425.kA8EPCqu004579@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4559 Modified Files: .cvsignore sbcl.spec sources Log Message: * Thu Oct 26 2006 Rex Dieter 0.9.18-1 - sbcl-0.9.18 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-6/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 27 Sep 2006 13:06:00 -0000 1.16 +++ .cvsignore 8 Nov 2006 14:24:42 -0000 1.17 @@ -3,3 +3,4 @@ sbcl-0.9.8-powerpc-linux-binary.tar.bz2 sbcl-0.9.16-source.tar.bz2 sbcl-0.9.17-source.tar.bz2 +sbcl-0.9.18-source.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-6/sbcl.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sbcl.spec 27 Sep 2006 13:06:00 -0000 1.52 +++ sbcl.spec 8 Nov 2006 14:24:42 -0000 1.53 @@ -9,7 +9,7 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.17 +Version: 0.9.18 Release: 1%{?dist} License: BSD/MIT @@ -215,8 +215,11 @@ %changelog +* Thu Oct 26 2006 Rex Dieter 0.9.18-1 +- sbcl-0.9.18 + * Tue Sep 26 2006 Rex Dieter 0.9.17-1 -- 0.9.17 +- sbcl-0.9.17 * Mon Aug 28 2006 Rex Dieter 0.9.16-3 - fc6 respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-6/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 27 Sep 2006 13:06:00 -0000 1.18 +++ sources 8 Nov 2006 14:24:42 -0000 1.19 @@ -1 +1 @@ -1f2297931f35d6d84d632c30aa099c13 sbcl-0.9.17-source.tar.bz2 +a00122024746ecb81bfff1a328bb2336 sbcl-0.9.18-source.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 14:41:47 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 07:41:47 -0700 Subject: rpms/sbcl/FC-5 .cvsignore, 1.16, 1.17 sbcl.spec, 1.49, 1.50 sources, 1.18, 1.19 Message-ID: <200611081441.kA8EflEV004769@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4749 Modified Files: .cvsignore sbcl.spec sources Log Message: * Thu Oct 26 2006 Rex Dieter 0.9.18-1 - sbcl-0.9.18 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 27 Sep 2006 13:43:53 -0000 1.16 +++ .cvsignore 8 Nov 2006 14:41:17 -0000 1.17 @@ -3,3 +3,4 @@ sbcl-0.9.8-powerpc-linux-binary.tar.bz2 sbcl-0.9.16-source.tar.bz2 sbcl-0.9.17-source.tar.bz2 +sbcl-0.9.18-source.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sbcl.spec 27 Sep 2006 13:43:53 -0000 1.49 +++ sbcl.spec 8 Nov 2006 14:41:17 -0000 1.50 @@ -9,7 +9,7 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.17 +Version: 0.9.18 Release: 1%{?dist} License: BSD/MIT @@ -215,8 +215,11 @@ %changelog +* Thu Oct 26 2006 Rex Dieter 0.9.18-1 +- sbcl-0.9.18 + * Tue Sep 26 2006 Rex Dieter 0.9.17-1 -- 0.9.17 +- sbcl-0.9.17 * Mon Aug 28 2006 Rex Dieter 0.9.16-3 - fc6 respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 27 Sep 2006 13:43:53 -0000 1.18 +++ sources 8 Nov 2006 14:41:17 -0000 1.19 @@ -1 +1 @@ -1f2297931f35d6d84d632c30aa099c13 sbcl-0.9.17-source.tar.bz2 +a00122024746ecb81bfff1a328bb2336 sbcl-0.9.18-source.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 15:09:15 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 08:09:15 -0700 Subject: rpms/maxima/FC-6 maxima.spec,1.42,1.43 xmaxima.desktop,1.4,1.5 Message-ID: <200611081509.kA8F9Fa5008073@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8053 Modified Files: maxima.spec xmaxima.desktop Log Message: * Thu Oct 26 2006 Rex Dieter 5.10.0-7 - respin for sbcl-0.9.18 - fixup %triggerun's - drop dfi --add-category=X-Fedora Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-6/maxima.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- maxima.spec 2 Oct 2006 16:55:41 -0000 1.42 +++ maxima.spec 8 Nov 2006 15:08:45 -0000 1.43 @@ -6,7 +6,7 @@ Name: maxima Version: 5.10.0 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -158,7 +158,7 @@ Summary: Maxima compiled with SBCL Group: Applications/Engineering # almost any sbcl will do, but we want to be sure we're using the latest -- Rex -BuildRequires: sbcl >= 0.9.17 +BuildRequires: sbcl >= 0.9.18 # maxima requires the *same* (or very similar) version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) @@ -239,7 +239,7 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "X-Fedora" --vendor="fedora" \ + --vendor="fedora" \ %{SOURCE2} # emaxima LaTeX style @@ -303,11 +303,16 @@ ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||: %triggerun -- emacs-common -[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || : +if [ $2 -eq 0 ]; then + rm -f %{emacs_sitelisp}/maxima || : + rm -f %{emacs_sitelisp}/site-start.d/maxima-modes.el* ||: +fi %triggerun -- xemacs-common -[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || : - +if [ $2 -eq 0 ]; then + rm -f %{xemacs_sitelisp}/maxima || : + rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||: +fi %clean @@ -380,6 +385,11 @@ %changelog +* Thu Oct 26 2006 Rex Dieter 5.10.0-7 +- respin for sbcl-0.9.18 +- fixup %%triggerun's +- drop dfi --add-category=X-Fedora + * Mon Oct 02 2006 Rex Dieter 5.10.0-5 - update xdg-utils patch (for .dvi handling too) Index: xmaxima.desktop =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-6/xmaxima.desktop,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xmaxima.desktop 5 Jan 2006 14:56:22 -0000 1.4 +++ xmaxima.desktop 8 Nov 2006 15:08:45 -0000 1.5 @@ -5,5 +5,5 @@ Icon=maxima #MimeType= Type=Application -Categories=Application;Science;Education;Math; +Categories=Science;Education;Math; Encoding=UTF-8 From fedora-extras-commits at redhat.com Wed Nov 8 15:12:05 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Wed, 8 Nov 2006 08:12:05 -0700 Subject: rpms/qt4-qsa/devel qt4-qsa.spec,1.10,1.11 Message-ID: <200611081512.kA8FC5go008147@cvs-int.fedora.redhat.com> Author: frankb Update of /cvs/extras/rpms/qt4-qsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8131 Modified Files: qt4-qsa.spec Log Message: fix doc files Bug #214577 Index: qt4-qsa.spec =================================================================== RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qt4-qsa.spec 14 Oct 2006 16:04:15 -0000 1.10 +++ qt4-qsa.spec 8 Nov 2006 15:11:35 -0000 1.11 @@ -1,7 +1,7 @@ Name: qt4-qsa Summary: Qt Script for Applications Version: 1.2.1 -Release: 19%{?dist} +Release: 20%{?dist} BuildRequires: qt4-devel URL: http://www.trolltech.com/products/qt/addon/qsa @@ -95,10 +95,14 @@ %{qtinc}/* %{qtlib}/libqsa.so %{qtdir}/mkspecs/features/qsa.prf +%defattr(0644,root,root,0755) %doc examples %doc doc/html %changelog +* Mon Nov 08 2006 Frank B??ttner - 1.2.1-20%{?dist} +- fix doc files Bug #214577 + * Sat Oct 14 2006 Frank B??ttner - 1.2.1-19%{?dist} - back to old one because the patch for bug 210544 fails From fedora-extras-commits at redhat.com Wed Nov 8 15:19:34 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Nov 2006 08:19:34 -0700 Subject: rpms/anjuta import.log,1.24,1.25 Message-ID: <200611081519.kA8FJYvk008321@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8283 Modified Files: import.log Log Message: auto-import anjuta-2.0.2-10 on branch FC-5 from anjuta-2.0.2-10.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta/import.log,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- import.log 21 Oct 2006 11:20:03 -0000 1.24 +++ import.log 8 Nov 2006 15:19:03 -0000 1.25 @@ -21,3 +21,4 @@ anjuta-1_2_4a-7:FC-5:anjuta-1.2.4a-7.src.rpm:1157214616 anjuta-2_0_2-8:HEAD:anjuta-2.0.2-8.src.rpm:1161204122 anjuta-2_0_2-8:FC-5:anjuta-2.0.2-8.src.rpm:1161429591 +anjuta-2_0_2-10:FC-5:anjuta-2.0.2-10.src.rpm:1162999129 From fedora-extras-commits at redhat.com Wed Nov 8 15:19:34 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Nov 2006 08:19:34 -0700 Subject: rpms/anjuta/FC-5 anjuta-dialog.patch, NONE, 1.1 anjuta.spec, 1.22, 1.23 anjuta2.spec, 1.1, NONE Message-ID: <200611081519.kA8FJYbo008324@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8283/FC-5 Added Files: anjuta-dialog.patch anjuta.spec Removed Files: anjuta2.spec Log Message: auto-import anjuta-2.0.2-10 on branch FC-5 from anjuta-2.0.2-10.src.rpm anjuta-dialog.patch: --- NEW FILE anjuta-dialog.patch --- --- anjuta-2.0.2/src/action-callbacks.c 2005-03-13 10:55:26.000000000 +0000 +++ anjuta-2.0.2/src/action-callbacks-new.c 2006-11-08 14:31:26.000000000 +0000 @@ -177,5 +177,7 @@ on_about_activate (GtkAction * action, gpointer user_data) { GtkWidget *about_dlg = about_box_new (); + g_signal_connect_swapped(about_dlg, "response", + G_CALLBACK(gtk_widget_destroy), about_dlg); gtk_widget_show (about_dlg); } Index: anjuta.spec =================================================================== RCS file: anjuta.spec diff -N anjuta.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ anjuta.spec 8 Nov 2006 15:19:04 -0000 1.23 @@ -0,0 +1,179 @@ +Summary: Integrated Development Environment +Name: anjuta +Version: 2.0.2 +Release: 10%{?dist} +License: GPL +Group: Development/Tools +URL: http://www.anjuta.org +Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +Patch0: anjuta-dialog.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext +BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Epoch: 1 + +%description +Anjuta DevStudio is a versatile Integrated Development Environment (IDE) +on GNOME Desktop Environment and features a number of advanced +programming facilities. These include project management, application and +class wizards, an on-board interactive debugger, powerful source editor, +syntax highlighting, intellisense autocompletions, symbol navigation, +version controls, integrated GUI designing and other tools. + +%package devel +Summary: Libraries and include files for Anjuta plugins development +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libgnomeui-devel, libglade2-devel, pkgconfig + +%description devel +Libraries, header files and API docs for developing Anjuta plugins + +%package docs +Summary: Anjuta 2 documentation +Group: Documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires(post): scrollkeeper +Requires(postun): scrollkeeper + +%description docs +Anjuta 2 documentation + +%prep +%setup -q +sed -i 's/\r//' doc/ScintillaDoc.html +%{_bindir}/iconv -t UTF-8 THANKS -o THANKS +%{_bindir}/iconv -t UTF-8 COPYING -o COPYING +%{_bindir}/iconv -t UTF-8 NEWS -o NEWS +%{_bindir}/iconv -t UTF-8 README -o README +chmod 644 scintilla/*.cxx +chmod 644 scintilla/*.h +%patch0 -p1 -b .orig + +%build +%configure --disable-static --disable-plugin-subversion --enable-nls +%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,') +sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status +make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} INSTALL="install -c -p" install +%find_lang %{name} + +desktop-file-install --vendor fedora --delete-original \ + --dir %{buildroot}/%{_datadir}/applications \ + --add-category X-Fedora \ + %{buildroot}%{_datadir}/applications/%{name}.desktop + +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' + +%clean +rm -rf %{buildroot} + +%post +update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%post docs +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + +%postun docs +scrollkeeper-update -q || : + +%postun +update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README +%doc doc/ScintillaDoc.html +%{_bindir}/%{name}* +%{_bindir}/create_global_tags.sh +%{_bindir}/test_tm_buffer +%{_libdir}/lib%{name}*.so.* +%{_libdir}/%{name} +%{_datadir}/%{name} +%{_datadir}/applications/*%{name}.desktop +%{_datadir}/pixmaps/%{name} +%{_datadir}/doc/%{name} +%{_datadir}/application-registry/%{name}.applications +%{_datadir}/mime-info/%{name}.mime +%{_datadir}/mime-info/%{name}.keys +%{_datadir}/mime/packages/%{name}.xml +%{_datadir}/icons/hicolor/48x48/apps/anjuta* +%{_datadir}/icons/hicolor/scalable/apps/anjuta* +%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png +%{_mandir}/man1/anjuta* + +%files docs +%defattr(-,root, root, -) +%{_datadir}/gnome/help/%{name} +%{_datadir}/omf/%{name} + +%files devel +%defattr (-, root, root) +%{_includedir}/*%{name}* +%{_libdir}/pkgconfig/*%{name}* +%{_libdir}/lib%{name}*.so +%{_datadir}/gtk-doc/html/*%{name}* + +%changelog +* Wed Nov 08 2006 Paul F. Johnson 2.0.2-10 +- add patch for close dialog on the about window +- renamed spec file to anjuta + +* Sat Oct 28 2006 Paul F. Johnson 2.0.2-9 +- rebuild against new libopts + +* Tue Oct 17 2006 Paul F. Johnson 2.0.2-8 +- fix the INSTALL line in install +- fixed encoding on text files +- removed two docs (not really needed) +- fixed ldconfig + +* Sun Oct 15 2006 Paul F. Johnson 2.0.2-7 +- install keeps timestampe +- now keeps time stamps +- lots of BRs removed +- Moved docs Rs to the correct place +- fixed encodings + +* Sat Oct 14 2006 Paul F. Johnson 2.0.2-6 +- removed RPM_BUILD_ROOT +- fixed devel package +- altered update-mime-database +- fixed debuginfo permission problems +- altered R and BR + +* Wed Oct 11 2006 Paul F. Johnson 2.0.2-5 +- re-enabled docs +- multiple spec fixes +- spec file clean +- added gtksourceview-devel and gtksourceview to BR and R + +* Thu Jun 06 2006 Paul F. Johnson 2.0.2-2 +- Lotza fixes! + +* Tue May 23 2006 Paul F. Johnson 2.0.2-1 +- bump to new version + +* Thu Apr 27 2006 Paul F. Johnson 2.0.1-3 +- removed the hack from anjuta (1.2.4a) +- added anjuta-docs subpackage + +* Wed Apr 26 2006 Paul F. Johnson 2.0.1-2 +- removed smp_flags + +* Tue Feb 21 2006 Paul F. Johnson 2.0.1-1 +- Initial import for FC +- Sanitised the spec file somewhat +- Removed .a and .la files --- anjuta2.spec DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 15:21:35 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Nov 2006 08:21:35 -0700 Subject: rpms/anjuta import.log,1.25,1.26 Message-ID: <200611081521.kA8FLZLf008436@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8403 Modified Files: import.log Log Message: auto-import anjuta-2.0.2-10 on branch FC-6 from anjuta-2.0.2-10.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta/import.log,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- import.log 8 Nov 2006 15:19:03 -0000 1.25 +++ import.log 8 Nov 2006 15:21:05 -0000 1.26 @@ -22,3 +22,4 @@ anjuta-2_0_2-8:HEAD:anjuta-2.0.2-8.src.rpm:1161204122 anjuta-2_0_2-8:FC-5:anjuta-2.0.2-8.src.rpm:1161429591 anjuta-2_0_2-10:FC-5:anjuta-2.0.2-10.src.rpm:1162999129 +anjuta-2_0_2-10:FC-6:anjuta-2.0.2-10.src.rpm:1162999249 From fedora-extras-commits at redhat.com Wed Nov 8 15:21:36 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Nov 2006 08:21:36 -0700 Subject: rpms/anjuta/FC-6 anjuta-dialog.patch, NONE, 1.1 anjuta.spec, 1.23, 1.24 anjuta2.spec, 1.2, NONE Message-ID: <200611081521.kA8FLahl008439@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8403/FC-6 Added Files: anjuta-dialog.patch anjuta.spec Removed Files: anjuta2.spec Log Message: auto-import anjuta-2.0.2-10 on branch FC-6 from anjuta-2.0.2-10.src.rpm anjuta-dialog.patch: --- NEW FILE anjuta-dialog.patch --- --- anjuta-2.0.2/src/action-callbacks.c 2005-03-13 10:55:26.000000000 +0000 +++ anjuta-2.0.2/src/action-callbacks-new.c 2006-11-08 14:31:26.000000000 +0000 @@ -177,5 +177,7 @@ on_about_activate (GtkAction * action, gpointer user_data) { GtkWidget *about_dlg = about_box_new (); + g_signal_connect_swapped(about_dlg, "response", + G_CALLBACK(gtk_widget_destroy), about_dlg); gtk_widget_show (about_dlg); } Index: anjuta.spec =================================================================== RCS file: anjuta.spec diff -N anjuta.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ anjuta.spec 8 Nov 2006 15:21:06 -0000 1.24 @@ -0,0 +1,179 @@ +Summary: Integrated Development Environment +Name: anjuta +Version: 2.0.2 +Release: 10%{?dist} +License: GPL +Group: Development/Tools +URL: http://www.anjuta.org +Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +Patch0: anjuta-dialog.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext +BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Epoch: 1 + +%description +Anjuta DevStudio is a versatile Integrated Development Environment (IDE) +on GNOME Desktop Environment and features a number of advanced +programming facilities. These include project management, application and +class wizards, an on-board interactive debugger, powerful source editor, +syntax highlighting, intellisense autocompletions, symbol navigation, +version controls, integrated GUI designing and other tools. + +%package devel +Summary: Libraries and include files for Anjuta plugins development +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libgnomeui-devel, libglade2-devel, pkgconfig + +%description devel +Libraries, header files and API docs for developing Anjuta plugins + +%package docs +Summary: Anjuta 2 documentation +Group: Documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires(post): scrollkeeper +Requires(postun): scrollkeeper + +%description docs +Anjuta 2 documentation + +%prep +%setup -q +sed -i 's/\r//' doc/ScintillaDoc.html +%{_bindir}/iconv -t UTF-8 THANKS -o THANKS +%{_bindir}/iconv -t UTF-8 COPYING -o COPYING +%{_bindir}/iconv -t UTF-8 NEWS -o NEWS +%{_bindir}/iconv -t UTF-8 README -o README +chmod 644 scintilla/*.cxx +chmod 644 scintilla/*.h +%patch0 -p1 -b .orig + +%build +%configure --disable-static --disable-plugin-subversion --enable-nls +%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,') +sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status +make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} INSTALL="install -c -p" install +%find_lang %{name} + +desktop-file-install --vendor fedora --delete-original \ + --dir %{buildroot}/%{_datadir}/applications \ + --add-category X-Fedora \ + %{buildroot}%{_datadir}/applications/%{name}.desktop + +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' + +%clean +rm -rf %{buildroot} + +%post +update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%post docs +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + +%postun docs +scrollkeeper-update -q || : + +%postun +update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README +%doc doc/ScintillaDoc.html +%{_bindir}/%{name}* +%{_bindir}/create_global_tags.sh +%{_bindir}/test_tm_buffer +%{_libdir}/lib%{name}*.so.* +%{_libdir}/%{name} +%{_datadir}/%{name} +%{_datadir}/applications/*%{name}.desktop +%{_datadir}/pixmaps/%{name} +%{_datadir}/doc/%{name} +%{_datadir}/application-registry/%{name}.applications +%{_datadir}/mime-info/%{name}.mime +%{_datadir}/mime-info/%{name}.keys +%{_datadir}/mime/packages/%{name}.xml +%{_datadir}/icons/hicolor/48x48/apps/anjuta* +%{_datadir}/icons/hicolor/scalable/apps/anjuta* +%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png +%{_mandir}/man1/anjuta* + +%files docs +%defattr(-,root, root, -) +%{_datadir}/gnome/help/%{name} +%{_datadir}/omf/%{name} + +%files devel +%defattr (-, root, root) +%{_includedir}/*%{name}* +%{_libdir}/pkgconfig/*%{name}* +%{_libdir}/lib%{name}*.so +%{_datadir}/gtk-doc/html/*%{name}* + +%changelog +* Wed Nov 08 2006 Paul F. Johnson 2.0.2-10 +- add patch for close dialog on the about window +- renamed spec file to anjuta + +* Sat Oct 28 2006 Paul F. Johnson 2.0.2-9 +- rebuild against new libopts + +* Tue Oct 17 2006 Paul F. Johnson 2.0.2-8 +- fix the INSTALL line in install +- fixed encoding on text files +- removed two docs (not really needed) +- fixed ldconfig + +* Sun Oct 15 2006 Paul F. Johnson 2.0.2-7 +- install keeps timestampe +- now keeps time stamps +- lots of BRs removed +- Moved docs Rs to the correct place +- fixed encodings + +* Sat Oct 14 2006 Paul F. Johnson 2.0.2-6 +- removed RPM_BUILD_ROOT +- fixed devel package +- altered update-mime-database +- fixed debuginfo permission problems +- altered R and BR + +* Wed Oct 11 2006 Paul F. Johnson 2.0.2-5 +- re-enabled docs +- multiple spec fixes +- spec file clean +- added gtksourceview-devel and gtksourceview to BR and R + +* Thu Jun 06 2006 Paul F. Johnson 2.0.2-2 +- Lotza fixes! + +* Tue May 23 2006 Paul F. Johnson 2.0.2-1 +- bump to new version + +* Thu Apr 27 2006 Paul F. Johnson 2.0.1-3 +- removed the hack from anjuta (1.2.4a) +- added anjuta-docs subpackage + +* Wed Apr 26 2006 Paul F. Johnson 2.0.1-2 +- removed smp_flags + +* Tue Feb 21 2006 Paul F. Johnson 2.0.1-1 +- Initial import for FC +- Sanitised the spec file somewhat +- Removed .a and .la files --- anjuta2.spec DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 15:23:09 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 8 Nov 2006 08:23:09 -0700 Subject: rpms/jd/devel .cvsignore,1.14,1.15 sources,1.14,1.15 Message-ID: <200611081523.kA8FN9aR008542@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8514 Modified Files: .cvsignore sources Log Message: * Sat Nov 4 2006 Mamoru Tasaka - 1.8.0-0.5.cvs061106 - cvs 061106 (23:59 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 6 Nov 2006 15:07:35 -0000 1.14 +++ .cvsignore 8 Nov 2006 15:22:39 -0000 1.15 @@ -1 +1 @@ -jd-1.8.0-cvs061106.tgz +jd-1.8.0-rc061108.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 6 Nov 2006 15:07:35 -0000 1.14 +++ sources 8 Nov 2006 15:22:39 -0000 1.15 @@ -1 +1 @@ -5590a3ab50666cd728b9ea3d25389ac5 jd-1.8.0-cvs061106.tgz +1f2d616935b25598a8f8eb6218dff34f jd-1.8.0-rc061108.tgz From fedora-extras-commits at redhat.com Wed Nov 8 15:24:01 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Nov 2006 08:24:01 -0700 Subject: rpms/anjuta import.log,1.26,1.27 Message-ID: <200611081524.kA8FO1Nd008597@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8556 Modified Files: import.log Log Message: auto-import anjuta-2.0.2-10 on branch devel from anjuta-2.0.2-10.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta/import.log,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- import.log 8 Nov 2006 15:21:05 -0000 1.26 +++ import.log 8 Nov 2006 15:23:30 -0000 1.27 @@ -23,3 +23,4 @@ anjuta-2_0_2-8:FC-5:anjuta-2.0.2-8.src.rpm:1161429591 anjuta-2_0_2-10:FC-5:anjuta-2.0.2-10.src.rpm:1162999129 anjuta-2_0_2-10:FC-6:anjuta-2.0.2-10.src.rpm:1162999249 +anjuta-2_0_2-10:HEAD:anjuta-2.0.2-10.src.rpm:1162999392 From fedora-extras-commits at redhat.com Wed Nov 8 15:24:01 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Nov 2006 08:24:01 -0700 Subject: rpms/anjuta/devel anjuta-dialog.patch, NONE, 1.1 anjuta.spec, 1.23, 1.24 anjuta2.spec, 1.2, NONE Message-ID: <200611081524.kA8FO1PB008601@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8556/devel Added Files: anjuta-dialog.patch anjuta.spec Removed Files: anjuta2.spec Log Message: auto-import anjuta-2.0.2-10 on branch devel from anjuta-2.0.2-10.src.rpm anjuta-dialog.patch: --- NEW FILE anjuta-dialog.patch --- --- anjuta-2.0.2/src/action-callbacks.c 2005-03-13 10:55:26.000000000 +0000 +++ anjuta-2.0.2/src/action-callbacks-new.c 2006-11-08 14:31:26.000000000 +0000 @@ -177,5 +177,7 @@ on_about_activate (GtkAction * action, gpointer user_data) { GtkWidget *about_dlg = about_box_new (); + g_signal_connect_swapped(about_dlg, "response", + G_CALLBACK(gtk_widget_destroy), about_dlg); gtk_widget_show (about_dlg); } Index: anjuta.spec =================================================================== RCS file: anjuta.spec diff -N anjuta.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ anjuta.spec 8 Nov 2006 15:23:31 -0000 1.24 @@ -0,0 +1,179 @@ +Summary: Integrated Development Environment +Name: anjuta +Version: 2.0.2 +Release: 10%{?dist} +License: GPL +Group: Development/Tools +URL: http://www.anjuta.org +Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +Patch0: anjuta-dialog.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext +BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Epoch: 1 + +%description +Anjuta DevStudio is a versatile Integrated Development Environment (IDE) +on GNOME Desktop Environment and features a number of advanced +programming facilities. These include project management, application and +class wizards, an on-board interactive debugger, powerful source editor, +syntax highlighting, intellisense autocompletions, symbol navigation, +version controls, integrated GUI designing and other tools. + +%package devel +Summary: Libraries and include files for Anjuta plugins development +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libgnomeui-devel, libglade2-devel, pkgconfig + +%description devel +Libraries, header files and API docs for developing Anjuta plugins + +%package docs +Summary: Anjuta 2 documentation +Group: Documentation +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires(post): scrollkeeper +Requires(postun): scrollkeeper + +%description docs +Anjuta 2 documentation + +%prep +%setup -q +sed -i 's/\r//' doc/ScintillaDoc.html +%{_bindir}/iconv -t UTF-8 THANKS -o THANKS +%{_bindir}/iconv -t UTF-8 COPYING -o COPYING +%{_bindir}/iconv -t UTF-8 NEWS -o NEWS +%{_bindir}/iconv -t UTF-8 README -o README +chmod 644 scintilla/*.cxx +chmod 644 scintilla/*.h +%patch0 -p1 -b .orig + +%build +%configure --disable-static --disable-plugin-subversion --enable-nls +%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,') +sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status +make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} INSTALL="install -c -p" install +%find_lang %{name} + +desktop-file-install --vendor fedora --delete-original \ + --dir %{buildroot}/%{_datadir}/applications \ + --add-category X-Fedora \ + %{buildroot}%{_datadir}/applications/%{name}.desktop + +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' + +%clean +rm -rf %{buildroot} + +%post +update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%post docs +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + +%postun docs +scrollkeeper-update -q || : + +%postun +update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README +%doc doc/ScintillaDoc.html +%{_bindir}/%{name}* +%{_bindir}/create_global_tags.sh +%{_bindir}/test_tm_buffer +%{_libdir}/lib%{name}*.so.* +%{_libdir}/%{name} +%{_datadir}/%{name} +%{_datadir}/applications/*%{name}.desktop +%{_datadir}/pixmaps/%{name} +%{_datadir}/doc/%{name} +%{_datadir}/application-registry/%{name}.applications +%{_datadir}/mime-info/%{name}.mime +%{_datadir}/mime-info/%{name}.keys +%{_datadir}/mime/packages/%{name}.xml +%{_datadir}/icons/hicolor/48x48/apps/anjuta* +%{_datadir}/icons/hicolor/scalable/apps/anjuta* +%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png +%{_mandir}/man1/anjuta* + +%files docs +%defattr(-,root, root, -) +%{_datadir}/gnome/help/%{name} +%{_datadir}/omf/%{name} + +%files devel +%defattr (-, root, root) +%{_includedir}/*%{name}* +%{_libdir}/pkgconfig/*%{name}* +%{_libdir}/lib%{name}*.so +%{_datadir}/gtk-doc/html/*%{name}* + +%changelog +* Wed Nov 08 2006 Paul F. Johnson 2.0.2-10 +- add patch for close dialog on the about window +- renamed spec file to anjuta + +* Sat Oct 28 2006 Paul F. Johnson 2.0.2-9 +- rebuild against new libopts + +* Tue Oct 17 2006 Paul F. Johnson 2.0.2-8 +- fix the INSTALL line in install +- fixed encoding on text files +- removed two docs (not really needed) +- fixed ldconfig + +* Sun Oct 15 2006 Paul F. Johnson 2.0.2-7 +- install keeps timestampe +- now keeps time stamps +- lots of BRs removed +- Moved docs Rs to the correct place +- fixed encodings + +* Sat Oct 14 2006 Paul F. Johnson 2.0.2-6 +- removed RPM_BUILD_ROOT +- fixed devel package +- altered update-mime-database +- fixed debuginfo permission problems +- altered R and BR + +* Wed Oct 11 2006 Paul F. Johnson 2.0.2-5 +- re-enabled docs +- multiple spec fixes +- spec file clean +- added gtksourceview-devel and gtksourceview to BR and R + +* Thu Jun 06 2006 Paul F. Johnson 2.0.2-2 +- Lotza fixes! + +* Tue May 23 2006 Paul F. Johnson 2.0.2-1 +- bump to new version + +* Thu Apr 27 2006 Paul F. Johnson 2.0.1-3 +- removed the hack from anjuta (1.2.4a) +- added anjuta-docs subpackage + +* Wed Apr 26 2006 Paul F. Johnson 2.0.1-2 +- removed smp_flags + +* Tue Feb 21 2006 Paul F. Johnson 2.0.1-1 +- Initial import for FC +- Sanitised the spec file somewhat +- Removed .a and .la files --- anjuta2.spec DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 15:24:56 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 8 Nov 2006 08:24:56 -0700 Subject: rpms/jd/devel jd.spec,1.21,1.22 Message-ID: <200611081524.kA8FOu0g008664@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644 Modified Files: jd.spec Log Message: * Wed Nov 8 2006 Mamoru Tasaka - 1.8.0-0.5.rc061108 - 1.8.0 rc 061108 Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jd.spec 6 Nov 2006 15:07:35 -0000 1.21 +++ jd.spec 8 Nov 2006 15:24:26 -0000 1.22 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag cvs061106 -%define repoid 22566 +%define strtag rc061108 +%define repoid 22637 # Defined by vendor @@ -103,8 +103,8 @@ %{icondir}/%{name}.png %changelog -* Sat Nov 4 2006 Mamoru Tasaka - 1.8.0-0.5.cvs061106 -- cvs 061106 (23:59 JST) +* Wed Nov 8 2006 Mamoru Tasaka - 1.8.0-0.5.rc061108 +- 1.8.0 rc 061108 * Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 - 1.8.0 beta 061103 From fedora-extras-commits at redhat.com Wed Nov 8 15:26:27 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 8 Nov 2006 08:26:27 -0700 Subject: rpms/jd/FC-6 .cvsignore,1.8,1.9 jd.spec,1.9,1.10 sources,1.8,1.9 Message-ID: <200611081526.kA8FQRkF008854@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8767 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Nov 8 2006 Mamoru Tasaka - 1.8.0-0.5.rc061108 - 1.8.0 rc 061108 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Nov 2006 13:00:49 -0000 1.8 +++ .cvsignore 8 Nov 2006 15:25:57 -0000 1.9 @@ -1 +1 @@ -jd-1.8.0-beta061103.tgz +jd-1.8.0-rc061108.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jd.spec 3 Nov 2006 13:00:49 -0000 1.9 +++ jd.spec 8 Nov 2006 15:25:57 -0000 1.10 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag beta061103 -%define repoid 22566 +%define strtag rc061108 +%define repoid 22637 # Defined by vendor @@ -103,6 +103,9 @@ %{icondir}/%{name}.png %changelog +* Wed Nov 8 2006 Mamoru Tasaka - 1.8.0-0.5.rc061108 +- 1.8.0 rc 061108 + * Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 - 1.8.0 beta 061103 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 3 Nov 2006 13:00:49 -0000 1.8 +++ sources 8 Nov 2006 15:25:57 -0000 1.9 @@ -1 +1 @@ -fb89210bb7fa49b0fcdf3a28c1e22711 jd-1.8.0-beta061103.tgz +1f2d616935b25598a8f8eb6218dff34f jd-1.8.0-rc061108.tgz From fedora-extras-commits at redhat.com Wed Nov 8 15:30:09 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Wed, 8 Nov 2006 08:30:09 -0700 Subject: rpms/eclipse-subclipse/FC-6 eclipse-subclipse-1.1.8-plugin-classpath.patch, NONE, 1.1 subclipse-fetch-1.1.8.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 eclipse-subclipse.spec, 1.2, 1.3 sources, 1.2, 1.3 eclipse-subclipse-1.1.5-plugin-classpath.patch, 1.1, NONE subclipse-fetch-1.1.5.sh, 1.1, NONE Message-ID: <200611081530.kA8FU9U7008932@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/eclipse-subclipse/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8892 Modified Files: .cvsignore eclipse-subclipse.spec sources Added Files: eclipse-subclipse-1.1.8-plugin-classpath.patch subclipse-fetch-1.1.8.sh Removed Files: eclipse-subclipse-1.1.5-plugin-classpath.patch subclipse-fetch-1.1.5.sh Log Message: Update to upstream 1.1.8 eclipse-subclipse-1.1.8-plugin-classpath.patch: --- NEW FILE eclipse-subclipse-1.1.8-plugin-classpath.patch --- diff -Naur subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF --- subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF 2006-10-23 13:10:29.000000000 -0400 +++ subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF 2006-11-08 07:16:12.000000000 -0400 @@ -2,7 +2,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true Bundle-Version: 1.1.8 -Bundle-ClassPath: ., +Bundle-ClassPath: lib/subclipse-core.jar, lib/svnClientAdapter.jar, lib/svnjavahl.jar, lib/javasvn.jar, --- NEW FILE subclipse-fetch-1.1.8.sh --- #!/bin/sh VERSION=1.1.8 svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION find $VERSION -name \*.dll | xargs rm mv $VERSION subclipse-$VERSION tar -czf subclipse-$VERSION.tgz subclipse-$VERSION Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Aug 2006 00:56:47 -0000 1.2 +++ .cvsignore 8 Nov 2006 15:29:38 -0000 1.3 @@ -1 +1 @@ -subclipse-1.1.5.tgz +subclipse-1.1.8.tgz Index: eclipse-subclipse.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/eclipse-subclipse.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-subclipse.spec 28 Aug 2006 03:45:28 -0000 1.2 +++ eclipse-subclipse.spec 8 Nov 2006 15:29:38 -0000 1.3 @@ -7,7 +7,7 @@ Name: eclipse-subclipse -Version: 1.1.5 +Version: 1.1.8 Release: 2%{?dist} Summary: Subversion Eclipse plugin @@ -18,7 +18,7 @@ # Script to fetch the source code # the new source tarball does not includes the book feature and the layout is # different than the source repository -Source10: subclipse-fetch-1.1.5.sh +Source10: subclipse-fetch-1.1.8.sh # Disable javahl support temporaly until apparent classloader problem is fixed Patch0: eclipse-subclipse-1.0.1-default-javasvn.patch Patch1: svnClientAdapter-1.1.4-javac-target.patch @@ -26,7 +26,7 @@ # This patch is applied after the build has finished when unpacking the plugin # jar and replacing internal jars with links to its dependencies. It can not be # applied at "prep" stage because it causes errors at build time -Source50: eclipse-subclipse-1.1.5-plugin-classpath.patch +Source50: eclipse-subclipse-1.1.8-plugin-classpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -211,6 +211,9 @@ %{eclipse_base}/plugins/org.tigris.subversion.book_* %changelog +* Wed Nov 08 2006 Robert Marcano 1.1.8-2 +- Update to upstream 1.1.8 + * Mon Aug 28 2006 Robert Marcano 1.1.5-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Aug 2006 00:56:47 -0000 1.2 +++ sources 8 Nov 2006 15:29:38 -0000 1.3 @@ -1 +1 @@ -7c317c03fc7dc8fae0612c75e46564ae subclipse-1.1.5.tgz +bbc6dd6c7cb8107fe3906460b2f556e4 subclipse-1.1.8.tgz --- eclipse-subclipse-1.1.5-plugin-classpath.patch DELETED --- --- subclipse-fetch-1.1.5.sh DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 15:32:01 2006 From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka)) Date: Wed, 8 Nov 2006 08:32:01 -0700 Subject: rpms/jd/FC-5 .cvsignore,1.7,1.8 jd.spec,1.8,1.9 sources,1.7,1.8 Message-ID: <200611081532.kA8FW15Y009014@cvs-int.fedora.redhat.com> Author: mtasaka Update of /cvs/extras/rpms/jd/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8987 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Nov 8 2006 Mamoru Tasaka - 1.8.0-0.5.rc061108 - 1.8.0 rc 061108 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Nov 2006 13:03:03 -0000 1.7 +++ .cvsignore 8 Nov 2006 15:31:31 -0000 1.8 @@ -1 +1 @@ -jd-1.8.0-beta061103.tgz +jd-1.8.0-rc061108.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jd.spec 3 Nov 2006 13:03:03 -0000 1.8 +++ jd.spec 8 Nov 2006 15:31:31 -0000 1.9 @@ -10,8 +10,8 @@ # Defined by upsteam # %define main_ver 1.8.0 -%define strtag beta061103 -%define repoid 22566 +%define strtag rc061108 +%define repoid 22637 # Defined by vendor @@ -103,6 +103,9 @@ %{icondir}/%{name}.png %changelog +* Wed Nov 8 2006 Mamoru Tasaka - 1.8.0-0.5.rc061108 +- 1.8.0 rc 061108 + * Fri Nov 3 2006 Mamoru Tasaka - 1.8.0-0.5.beta061103 - 1.8.0 beta 061103 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Nov 2006 13:03:03 -0000 1.7 +++ sources 8 Nov 2006 15:31:31 -0000 1.8 @@ -1 +1 @@ -fb89210bb7fa49b0fcdf3a28c1e22711 jd-1.8.0-beta061103.tgz +1f2d616935b25598a8f8eb6218dff34f jd-1.8.0-rc061108.tgz From fedora-extras-commits at redhat.com Wed Nov 8 15:36:11 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 08:36:11 -0700 Subject: rpms/maxima/FC-5 maxima-5.10.0-xdg-utils.patch, NONE, 1.1 maxima.spec, 1.30, 1.31 xmaxima.desktop, 1.4, 1.5 maxima-5.10.0-xdg_open.patch, 1.1, NONE maxima-5.9.4-evince.patch, 1.1, NONE Message-ID: <200611081536.kA8FaB3K009210@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9188 Modified Files: maxima.spec xmaxima.desktop Added Files: maxima-5.10.0-xdg-utils.patch Removed Files: maxima-5.10.0-xdg_open.patch maxima-5.9.4-evince.patch Log Message: * Thu Oct 26 2006 Rex Dieter 5.10.0-7 - respin for sbcl-0.9.18 - fixup %%triggerun's - drop dfi --add-category=X-Fedora * Mon Oct 02 2006 Rex Dieter 5.10.0-5 - update xdg-utils patch (for .dvi handling too) maxima-5.10.0-xdg-utils.patch: --- NEW FILE maxima-5.10.0-xdg-utils.patch --- --- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.xdg_open 2006-09-11 10:38:01.000000000 -0500 +++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl 2006-10-02 11:46:43.000000000 -0500 @@ -215,9 +215,9 @@ } } else { - set selectedbrowser mozilla + set selectedbrowser xdg-open - foreach b { mozilla konqueror epiphany firefox netscape } { + foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } { if { ! [catch {exec which $b} ] } { set selectedbrowser $b break } } --- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl.xdg_open 2006-08-03 08:21:57.000000000 -0500 +++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl 2006-10-02 11:48:30.000000000 -0500 @@ -143,9 +143,9 @@ image/gif netmath image/png netmath image/jpeg netmath - application/postscript "ghostview -safer %s" - application/pdf "acroread %s" - application/x-dvi "xdvi %s" + application/postscript "xdg-open %s" + application/pdf "xdg-open %s" + application/x-dvi "xdg-open %s" } set maxima_priv(imagecounter) 0 --- maxima-5.10.0/src/plot.lisp.xdg_open 2006-08-26 06:13:40.000000000 -0500 +++ maxima-5.10.0/src/plot.lisp 2006-10-02 11:46:43.000000000 -0500 @@ -75,7 +75,7 @@ ((mlist) $plot_realpart nil) )) -(defvar $viewps_command "(ghostview \"~a\")") +(defvar $viewps_command "(xdg-open \"~a\")") ;; $plot_realpart option is false by default but *plot-realpart* is true because coerce-float-fun ;; is used outside of plot package too. Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- maxima.spec 2 Oct 2006 16:30:27 -0000 1.30 +++ maxima.spec 8 Nov 2006 15:35:40 -0000 1.31 @@ -6,7 +6,7 @@ Name: maxima Version: 5.10.0 -Release: 4%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -44,13 +44,11 @@ Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf -Patch1: maxima-5.10.0-xdg_open.patch +Patch1: maxima-5.10.0-xdg-utils.patch # (mysterious?) xemacs patch (don't use, for now) Patch2: maxima.el-xemacs.patch # use sbcl --disable-debugger Patch3: maxima-5.9.4-sbcl-disable-debugger.patch -# ghostview -> evince (ps/pdf viewer) -Patch4: maxima-5.9.4-evince.patch # emaxima fix from Camm Maguire Patch5: maxima-5.9.2-emaxima.patch # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647) @@ -97,7 +95,6 @@ Obsoletes: %{name}-xmaxima < %{version}-%{release} Requires: tk Requires: xdg-utils -#Requires: htmlview %description gui Tcl/Tk GUI interface for %{name} @@ -161,7 +158,7 @@ Summary: Maxima compiled with SBCL Group: Applications/Engineering # almost any sbcl will do, but we want to be sure we're using the latest -- Rex -BuildRequires: sbcl >= 0.9.17 +BuildRequires: sbcl >= 0.9.18 # maxima requires the *same* (or very similar) version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) @@ -185,9 +182,6 @@ %patch1 -p1 -b .xdg_open #patch2 -p1 -b .xemacs %patch3 -p1 -b .sbcl-disable-debugger -%if "%{?fedora}" > "3" -%patch4 -p1 -b .evince -%endif %patch5 -p1 -b .emaxima %if "%{?setarch_hack}" == "1" %patch6 -p1 -b .gcl-setarch @@ -245,7 +239,7 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "X-Fedora" --vendor="fedora" \ + --vendor="fedora" \ %{SOURCE2} # emaxima LaTeX style @@ -309,11 +303,16 @@ ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||: %triggerun -- emacs-common -[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || : +if [ $2 -eq 0 ]; then + rm -f %{emacs_sitelisp}/maxima || : + rm -f %{emacs_sitelisp}/site-start.d/maxima-modes.el* ||: +fi %triggerun -- xemacs-common -[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || : - +if [ $2 -eq 0 ]; then + rm -f %{xemacs_sitelisp}/maxima || : + rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||: +fi %clean @@ -386,8 +385,16 @@ %changelog +* Thu Oct 26 2006 Rex Dieter 5.10.0-7 +- respin for sbcl-0.9.18 +- fixup %%triggerun's +- drop dfi --add-category=X-Fedora + +* Mon Oct 02 2006 Rex Dieter 5.10.0-5 +- update xdg-utils patch (for .dvi handling too) + * Mon Oct 02 2006 Rex Dieter 5.10.0-4 -- -gui: htmlview -> xdg-open,Requires: xdg-utils +- -gui: htmlview -> xdg-open, Requires: xdg-utils * Tue Sep 26 2006 Rex Dieter 5.10.0-2 - respin for sbcl-0.9.17 Index: xmaxima.desktop =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-5/xmaxima.desktop,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xmaxima.desktop 5 Jan 2006 14:56:22 -0000 1.4 +++ xmaxima.desktop 8 Nov 2006 15:35:40 -0000 1.5 @@ -5,5 +5,5 @@ Icon=maxima #MimeType= Type=Application -Categories=Application;Science;Education;Math; +Categories=Science;Education;Math; Encoding=UTF-8 --- maxima-5.10.0-xdg_open.patch DELETED --- --- maxima-5.9.4-evince.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 15:39:26 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Wed, 8 Nov 2006 08:39:26 -0700 Subject: rpms/qt4-qsa/FC-6 qt4-qsa.spec,1.10,1.11 Message-ID: <200611081539.kA8FdQ3k009294@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-serv9271 Modified Files: qt4-qsa.spec Log Message: fix for bug 214577 Index: qt4-qsa.spec =================================================================== RCS file: /cvs/extras/rpms/qt4-qsa/FC-6/qt4-qsa.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qt4-qsa.spec 14 Oct 2006 16:04:15 -0000 1.10 +++ qt4-qsa.spec 8 Nov 2006 15:38:56 -0000 1.11 @@ -1,7 +1,7 @@ Name: qt4-qsa Summary: Qt Script for Applications Version: 1.2.1 -Release: 19%{?dist} +Release: 20%{?dist} BuildRequires: qt4-devel URL: http://www.trolltech.com/products/qt/addon/qsa @@ -95,10 +95,14 @@ %{qtinc}/* %{qtlib}/libqsa.so %{qtdir}/mkspecs/features/qsa.prf +%defattr(0644,root,root,0755) %doc examples %doc doc/html %changelog +* Mon Nov 08 2006 Frank B??ttner - 1.2.1-20%{?dist} +- fix doc files Bug #214577 + * Sat Oct 14 2006 Frank B??ttner - 1.2.1-19%{?dist} - back to old one because the patch for bug 210544 fails From fedora-extras-commits at redhat.com Wed Nov 8 15:58:16 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 8 Nov 2006 08:58:16 -0700 Subject: rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.3,1.4 Message-ID: <200611081558.kA8FwGBK009410@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/eclipse-emf/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9394 Modified Files: eclipse-emf.spec Log Message: * Wed Nov 08 2006 Andrew Overholt 2.2.1-3 - Remove the bits of the SDK that we don't need for building. Index: eclipse-emf.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-emf.spec 6 Nov 2006 20:36:06 -0000 1.3 +++ eclipse-emf.spec 8 Nov 2006 15:57:45 -0000 1.4 @@ -203,10 +203,12 @@ pushd ../.. rm SDK/plugins/org.eclipse.pde.build # Remove the bits of the SDK that we don't need +rm SDK/features/org.eclipse.sdk* rm SDK/features/org.eclipse.pde.source* rm SDK/features/org.eclipse.jdt.source* rm SDK/plugins/org.eclipse.pde.source* rm SDK/plugins/org.eclipse.jdt.source* +rm SDK/plugins/org.eclipse.sdk* # This tomcat chicanery will be fixed in a future Eclipse SDK RPM mkdir SDK2 pushd SDK @@ -513,6 +515,9 @@ %doc %{_datadir}/java/emf/readme_standalone.html %changelog +* Wed Nov 08 2006 Andrew Overholt 2.2.1-3 +- Remove the bits of the SDK that we don't need for building. + * Mon Nov 06 2006 Andrew Overholt 2.2.1-2 - Add Requires(post,postun) for sub-packages using rebuild-gcj-db. - Change usage of copy-platform to work with upcoming changes to SDK. From fedora-extras-commits at redhat.com Wed Nov 8 16:02:33 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb)) Date: Wed, 8 Nov 2006 09:02:33 -0700 Subject: rpms/qt4-qsa/FC-5 qt4-qsa.spec,1.4,1.5 Message-ID: <200611081602.kA8G2XHR012416@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-serv12398 Modified Files: qt4-qsa.spec Log Message: fix for bug #214577 Index: qt4-qsa.spec =================================================================== RCS file: /cvs/extras/rpms/qt4-qsa/FC-5/qt4-qsa.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qt4-qsa.spec 12 Oct 2006 18:40:01 -0000 1.4 +++ qt4-qsa.spec 8 Nov 2006 16:02:03 -0000 1.5 @@ -1,7 +1,7 @@ Name: qt4-qsa Summary: Qt Script for Applications Version: 1.2.1 -Release: 16%{?dist} +Release: 17%{?dist} BuildRequires: qt4-devel => 4.2 URL: http://www.trolltech.com/products/qt/addon/qsa @@ -94,10 +94,14 @@ %{qtinc}/* %{qtlib}/libqsa.so %{qtdir}/mkspecs/features/qsa.prf +%defattr(0644,root,root,0755) %doc examples %doc doc/html %changelog +* Mon Nov 08 2006 Frank B??ttner - 1.2.1-17%{?dist} +- fix doc files Bug #214577 + * Mon Aug 07 2006 Frank B??ttner - 1.2.1-16%{?dist} - fix build for EMT64 From fedora-extras-commits at redhat.com Wed Nov 8 16:22:44 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 8 Nov 2006 09:22:44 -0700 Subject: rpms/python-nltk/FC-3 python-nltk.spec,1.2,1.3 Message-ID: <200611081622.kA8GMikb012664@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/python-nltk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/FC-3 Modified Files: python-nltk.spec Log Message: Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution Index: python-nltk.spec =================================================================== RCS file: /cvs/extras/rpms/python-nltk/FC-3/python-nltk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-nltk.spec 6 Feb 2006 13:20:27 -0000 1.2 +++ python-nltk.spec 8 Nov 2006 16:22:13 -0000 1.3 @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-nltk -Version: 1.4.2 -Release: 1%{?dist} +Version: 1.4.4 +Release: 3%{?dist} Summary: Natural Language Toolkit Group: Development/Libraries @@ -14,7 +14,7 @@ BuildRequires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: python-numeric, tkinter +Requires: python-numarray, tkinter %description The Natural Language Toolkit is a Python package that simplifies the @@ -55,17 +55,16 @@ %dir %{python_sitelib}/nltk/test %dir %{python_sitelib}/nltk/tokenizer %dir %{python_sitelib}/nltk/tokenreader -%{python_sitelib}/nltk/*.py -%{python_sitelib}/nltk/*.pyc -%{python_sitelib}/nltk/*/*.py -%{python_sitelib}/nltk/*/*.pyc -%ghost %{python_sitelib}/nltk/*.pyo -%ghost %{python_sitelib}/nltk/*/*.pyo +%{python_sitelib}/nltk/*.py* +%{python_sitelib}/nltk/*/*.py* %changelog -* Mon Feb 6 2006 Michel Salim - 1.4.2-1 -- Downgrade to 1.4.2 for FC3 only, to match older version of Python installed +* Wed Nov 8 2006 Michel Salim - 1.4.4-3 +- Include *.pyos, for compliance with new Python guidelines -* Sun Sep 11 2005 Michel Salim - 1.4.4-1 +* Mon Oct 9 2006 Michel Salim - 1.4.4-2 +- Rebuild for FE6 + +* Sun Sep 11 2005 Michel Salim - 1.4.4-1 - Initial package From fedora-extras-commits at redhat.com Wed Nov 8 16:22:45 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 8 Nov 2006 09:22:45 -0700 Subject: rpms/python-nltk/FC-4 python-nltk.spec,1.1,1.2 Message-ID: <200611081622.kA8GMjMt012667@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/python-nltk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/FC-4 Modified Files: python-nltk.spec Log Message: Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution Index: python-nltk.spec =================================================================== RCS file: /cvs/extras/rpms/python-nltk/FC-4/python-nltk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-nltk.spec 17 Nov 2005 05:22:25 -0000 1.1 +++ python-nltk.spec 8 Nov 2006 16:22:15 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-nltk Version: 1.4.4 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Natural Language Toolkit Group: Development/Libraries @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: python -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-numarray, tkinter %description @@ -32,7 +31,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean @@ -55,14 +54,16 @@ %dir %{python_sitelib}/nltk/test %dir %{python_sitelib}/nltk/tokenizer %dir %{python_sitelib}/nltk/tokenreader -%{python_sitelib}/nltk/*.py -%{python_sitelib}/nltk/*.pyc -%{python_sitelib}/nltk/*/*.py -%{python_sitelib}/nltk/*/*.pyc -%ghost %{python_sitelib}/nltk/*.pyo -%ghost %{python_sitelib}/nltk/*/*.pyo +%{python_sitelib}/nltk/*.py* +%{python_sitelib}/nltk/*/*.py* %changelog +* Wed Nov 8 2006 Michel Salim - 1.4.4-3 +- Include *.pyos, for compliance with new Python guidelines + +* Mon Oct 9 2006 Michel Salim - 1.4.4-2 +- Rebuild for FE6 + * Sun Sep 11 2005 Michel Salim - 1.4.4-1 - Initial package From fedora-extras-commits at redhat.com Wed Nov 8 16:22:51 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 8 Nov 2006 09:22:51 -0700 Subject: rpms/python-nltk/FC-5 python-nltk.spec,1.1,1.2 Message-ID: <200611081622.kA8GMpgf012670@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/python-nltk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/FC-5 Modified Files: python-nltk.spec Log Message: Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution Index: python-nltk.spec =================================================================== RCS file: /cvs/extras/rpms/python-nltk/FC-5/python-nltk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-nltk.spec 17 Nov 2005 05:22:25 -0000 1.1 +++ python-nltk.spec 8 Nov 2006 16:22:20 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-nltk Version: 1.4.4 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Natural Language Toolkit Group: Development/Libraries @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: python -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-numarray, tkinter %description @@ -32,7 +31,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean @@ -55,14 +54,16 @@ %dir %{python_sitelib}/nltk/test %dir %{python_sitelib}/nltk/tokenizer %dir %{python_sitelib}/nltk/tokenreader -%{python_sitelib}/nltk/*.py -%{python_sitelib}/nltk/*.pyc -%{python_sitelib}/nltk/*/*.py -%{python_sitelib}/nltk/*/*.pyc -%ghost %{python_sitelib}/nltk/*.pyo -%ghost %{python_sitelib}/nltk/*/*.pyo +%{python_sitelib}/nltk/*.py* +%{python_sitelib}/nltk/*/*.py* %changelog +* Wed Nov 8 2006 Michel Salim - 1.4.4-3 +- Include *.pyos, for compliance with new Python guidelines + +* Mon Oct 9 2006 Michel Salim - 1.4.4-2 +- Rebuild for FE6 + * Sun Sep 11 2005 Michel Salim - 1.4.4-1 - Initial package From fedora-extras-commits at redhat.com Wed Nov 8 16:22:51 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 8 Nov 2006 09:22:51 -0700 Subject: rpms/python-nltk/FC-6 python-nltk.spec,1.2,1.3 Message-ID: <200611081622.kA8GMp7c012673@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/python-nltk/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/FC-6 Modified Files: python-nltk.spec Log Message: Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution Index: python-nltk.spec =================================================================== RCS file: /cvs/extras/rpms/python-nltk/FC-6/python-nltk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-nltk.spec 10 Oct 2006 00:45:00 -0000 1.2 +++ python-nltk.spec 8 Nov 2006 16:22:21 -0000 1.3 @@ -2,7 +2,7 @@ Name: python-nltk Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Natural Language Toolkit Group: Development/Libraries @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: python -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-numarray, tkinter %description @@ -32,7 +31,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean @@ -55,15 +54,14 @@ %dir %{python_sitelib}/nltk/test %dir %{python_sitelib}/nltk/tokenizer %dir %{python_sitelib}/nltk/tokenreader -%{python_sitelib}/nltk/*.py -%{python_sitelib}/nltk/*.pyc -%{python_sitelib}/nltk/*/*.py -%{python_sitelib}/nltk/*/*.pyc -%ghost %{python_sitelib}/nltk/*.pyo -%ghost %{python_sitelib}/nltk/*/*.pyo +%{python_sitelib}/nltk/*.py* +%{python_sitelib}/nltk/*/*.py* %changelog +* Wed Nov 8 2006 Michel Salim - 1.4.4-3 +- Include *.pyos, for compliance with new Python guidelines + * Mon Oct 9 2006 Michel Salim - 1.4.4-2 - Rebuild for FE6 From fedora-extras-commits at redhat.com Wed Nov 8 16:22:57 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 8 Nov 2006 09:22:57 -0700 Subject: rpms/python-nltk/devel python-nltk.spec,1.2,1.3 Message-ID: <200611081622.kA8GMvxh012676@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/python-nltk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/devel Modified Files: python-nltk.spec Log Message: Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution Index: python-nltk.spec =================================================================== RCS file: /cvs/extras/rpms/python-nltk/devel/python-nltk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-nltk.spec 10 Oct 2006 00:45:00 -0000 1.2 +++ python-nltk.spec 8 Nov 2006 16:22:27 -0000 1.3 @@ -2,7 +2,7 @@ Name: python-nltk Version: 1.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Natural Language Toolkit Group: Development/Libraries @@ -13,7 +13,6 @@ BuildArch: noarch BuildRequires: python -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-numarray, tkinter %description @@ -32,7 +31,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT %clean @@ -55,15 +54,14 @@ %dir %{python_sitelib}/nltk/test %dir %{python_sitelib}/nltk/tokenizer %dir %{python_sitelib}/nltk/tokenreader -%{python_sitelib}/nltk/*.py -%{python_sitelib}/nltk/*.pyc -%{python_sitelib}/nltk/*/*.py -%{python_sitelib}/nltk/*/*.pyc -%ghost %{python_sitelib}/nltk/*.pyo -%ghost %{python_sitelib}/nltk/*/*.pyo +%{python_sitelib}/nltk/*.py* +%{python_sitelib}/nltk/*/*.py* %changelog +* Wed Nov 8 2006 Michel Salim - 1.4.4-3 +- Include *.pyos, for compliance with new Python guidelines + * Mon Oct 9 2006 Michel Salim - 1.4.4-2 - Rebuild for FE6 From fedora-extras-commits at redhat.com Wed Nov 8 16:38:11 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Wed, 8 Nov 2006 09:38:11 -0700 Subject: rpms/mail-notification/FC-6 mail-notification-fedora-plugin-hint.patch, NONE, 1.1 mail-notification.spec, 1.29, 1.30 Message-ID: <200611081638.kA8GcBYj012943@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-serv12924 Modified Files: mail-notification.spec Added Files: mail-notification-fedora-plugin-hint.patch Log Message: 3.0-9 -- add a patch that informs the user to install the evolution-plugin if he want to use mn with evo mail-notification-fedora-plugin-hint.patch: --- NEW FILE mail-notification-fedora-plugin-hint.patch --- diff -Naur mail-notification-3.0.org/src/mn-evolution-mailbox-properties.c mail-notification-3.0/src/mn-evolution-mailbox-properties.c --- mail-notification-3.0.org/src/mn-evolution-mailbox-properties.c 2006-11-04 13:28:17.000000000 +0100 +++ mail-notification-3.0/src/mn-evolution-mailbox-properties.c 2006-11-04 13:39:55.000000000 +0100 @@ -387,7 +387,7 @@ selfp->pbag = bonobo_object_release_unref(selfp->pbag, NULL); selfp->listener = bonobo_object_release_unref(selfp->listener, NULL); - label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded.")); + label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded and installed. Fedora ships the plugin in a sperate package called mail-notification-evolution-plugin you might need to install manually.")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-6/mail-notification.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mail-notification.spec 2 Sep 2006 11:14:38 -0000 1.29 +++ mail-notification.spec 8 Nov 2006 16:37:41 -0000 1.30 @@ -1,6 +1,6 @@ Name: mail-notification Version: 3.0 -Release: 7%{?dist} +Release: 9%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -8,6 +8,7 @@ URL: http://www.nongnu.org/mailnotify/ Source0: http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz Source1: mail-notification-README.FEDORA +Patch0: mail-notification-fedora-plugin-hint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext >= 0.14.1 @@ -53,6 +54,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .patch0 cp %{SOURCE1} ./README.FEDORA %build @@ -127,6 +129,12 @@ %changelog +* 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 + * Sat Sep 02 2006 Thorsten Leemhuis 3.0-7 - don't run mail-notification with unset-obsolete-configuration at all From fedora-extras-commits at redhat.com Wed Nov 8 17:28:25 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 8 Nov 2006 10:28:25 -0700 Subject: rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.4,1.5 Message-ID: <200611081728.kA8HSPwx016217@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/eclipse-emf/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16201 Modified Files: eclipse-emf.spec Log Message: Bump release. Index: eclipse-emf.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eclipse-emf.spec 8 Nov 2006 15:57:45 -0000 1.4 +++ eclipse-emf.spec 8 Nov 2006 17:27:55 -0000 1.5 @@ -8,7 +8,7 @@ Summary: Eclipse Modeling Framework (EMF) Name: eclipse-emf Version: %{major}.%{minor}.%{micro} -Release: 3%{?dist} +Release: 4%{?dist} License: Eclipse Public License Group: System Environment/Libraries URL: http://www.eclipse.org/emf/ @@ -515,7 +515,7 @@ %doc %{_datadir}/java/emf/readme_standalone.html %changelog -* Wed Nov 08 2006 Andrew Overholt 2.2.1-3 +* Wed Nov 08 2006 Andrew Overholt 2.2.1-4 - Remove the bits of the SDK that we don't need for building. * Mon Nov 06 2006 Andrew Overholt 2.2.1-2 From fedora-extras-commits at redhat.com Wed Nov 8 17:29:31 2006 From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt)) Date: Wed, 8 Nov 2006 10:29:31 -0700 Subject: rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.5,1.6 Message-ID: <200611081729.kA8HTV5O016274@cvs-int.fedora.redhat.com> Author: overholt Update of /cvs/extras/rpms/eclipse-emf/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253 Modified Files: eclipse-emf.spec Log Message: Bump release. Index: eclipse-emf.spec =================================================================== RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eclipse-emf.spec 8 Nov 2006 17:27:55 -0000 1.5 +++ eclipse-emf.spec 8 Nov 2006 17:29:00 -0000 1.6 @@ -8,7 +8,7 @@ Summary: Eclipse Modeling Framework (EMF) Name: eclipse-emf Version: %{major}.%{minor}.%{micro} -Release: 4%{?dist} +Release: 5%{?dist} License: Eclipse Public License Group: System Environment/Libraries URL: http://www.eclipse.org/emf/ @@ -515,7 +515,7 @@ %doc %{_datadir}/java/emf/readme_standalone.html %changelog -* Wed Nov 08 2006 Andrew Overholt 2.2.1-4 +* Wed Nov 08 2006 Andrew Overholt 2.2.1-5 - Remove the bits of the SDK that we don't need for building. * Mon Nov 06 2006 Andrew Overholt 2.2.1-2 From fedora-extras-commits at redhat.com Wed Nov 8 17:32:20 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 8 Nov 2006 10:32:20 -0700 Subject: rpms/python-nltk/FC-3 python-nltk.spec,1.3,1.4 sources,1.3,1.4 Message-ID: <200611081732.kA8HWKX5016355@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/python-nltk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16337 Modified Files: python-nltk.spec sources Log Message: Fix source for FC3 Index: python-nltk.spec =================================================================== RCS file: /cvs/extras/rpms/python-nltk/FC-3/python-nltk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-nltk.spec 8 Nov 2006 16:22:13 -0000 1.3 +++ python-nltk.spec 8 Nov 2006 17:31:50 -0000 1.4 @@ -2,7 +2,7 @@ Name: python-nltk Version: 1.4.4 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: Natural Language Toolkit Group: Development/Libraries @@ -60,6 +60,9 @@ %changelog +* Wed Nov 8 2006 Michel Salim - 1.4.4-3.1 +- Rebuild with correct source + * Wed Nov 8 2006 Michel Salim - 1.4.4-3 - Include *.pyos, for compliance with new Python guidelines Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-nltk/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Feb 2006 13:20:27 -0000 1.3 +++ sources 8 Nov 2006 17:31:50 -0000 1.4 @@ -1 +1 @@ -f24e6ac9c2152e9cf6f9fa09e259d783 nltk-1.4.2.tar.gz +fb402d42d71844fe4483affa100814e5 nltk-1.4.4.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 18:00:12 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 11:00:12 -0700 Subject: owners owners.list,1.1904,1.1905 Message-ID: <200611081800.kA8I0CJi016601@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16570 Modified Files: owners.list Log Message: - de-orphan doulos-fonts, fonttools, gtranslator, translate-toolkit, and ttf2pt1 that were automatically orphaned - removed myself from CC list for spicctrl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1904 retrieving revision 1.1905 diff -u -r1.1904 -r1.1905 --- owners.list 8 Nov 2006 09:52:45 -0000 1.1904 +++ owners.list 8 Nov 2006 17:59:41 -0000 1.1905 @@ -307,7 +307,7 @@ Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|doulos-fonts|Doulos SIL fonts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info +Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|driftnet|Network image sniffer|bnocera at redhat.com|extras-qa at fedoraproject.org| @@ -409,7 +409,7 @@ Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|fontforge|An outline and bitmap font editor|kevin at tummy.com|extras-qa at fedoraproject.org|roozbeh at farsiweb.info Fedora Extras|fonts-hebrew-fancy|Fancy Hebrew fonts|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| -Fedora Extras|fonttools|A tool to convert True/OpenType fonts to XML and back|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info +Fedora Extras|fonttools|A tool to convert True/OpenType fonts to XML and back|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|foremost|Program that recovers files by carving them from a raw disk|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|fortune-firefly|An addon of Firefly quotes for fortune-mod|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org| @@ -640,7 +640,7 @@ Fedora Extras|gtkterm|Serial port terminal|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org| -Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info +Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|gts|GNU Triangulated Surface Library|ed at eh3.com|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtypist|GNU typing tutor|zing at fastmail.fm|extras-qa at fedoraproject.org| @@ -2130,7 +2130,7 @@ Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org| Fedora Extras|sparse|A semantic parser of source files|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| -Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info +Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|sqlite|An embeddable SQL engine in a C library|imlinux at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net @@ -2263,14 +2263,14 @@ Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org| Fedora Extras|trackballs|Steer a marble ball through a labyrinth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|trackballs-music|In-game music for Trackballs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| -Fedora Extras|translate-toolkit|A collection of tools to assist software localization|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info +Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|transmission|A lightweight GTK+ BitTorrent client|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|tre|POSIX compatible regexp library with approximate matching|rpm at greysector.net|extras-qa at fedoraproject.org| Fedora Extras|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|tremulous|First Person Shooter game based on the Quake 3 engine|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|tremulous-data|Data files for tremulous the FPS game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|tripwire|An IDS (Intrusion Detection System)|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info +Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| Fedora Extras|TurboGears|Back-to-front web development in Python|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 8 18:10:30 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 8 Nov 2006 11:10:30 -0700 Subject: rpms/galeon/FC-3 galeon.spec,1.9,1.10 Message-ID: <200611081810.kA8IAUGx019732@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19707 Modified Files: galeon.spec Log Message: Rebuild for mozilla 1.7.13 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-3/galeon.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- galeon.spec 28 Nov 2005 22:48:02 -0000 1.9 +++ galeon.spec 8 Nov 2006 18:10:00 -0000 1.10 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -93,6 +93,9 @@ %changelog +* Wed Nov 8 2006 Denis Leroy - 2.0.0-2 +- Rebuild for mozilla 1.7.13 + * Mon Nov 28 2005 Denis Leroy - 2.0.0-1 - Update to 2.0.0 From fedora-extras-commits at redhat.com Wed Nov 8 18:16:45 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 11:16:45 -0700 Subject: rpms/doulos-fonts/devel Makefile, 1.2, 1.3 doulos-fonts.spec, 1.2, 1.3 sources, 1.3, 1.4 dead.package, 1.1, NONE Message-ID: <200611081816.kA8IGjJx019948@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/doulos-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19923 Added Files: Makefile doulos-fonts.spec sources Removed Files: dead.package Log Message: * Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-2 - Rebuild to make package available in Rawhide again Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 8 Nov 2006 18:16:15 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: doulos-fonts +# $Id$ +NAME := doulos-fonts +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) Index: doulos-fonts.spec =================================================================== RCS file: doulos-fonts.spec diff -N doulos-fonts.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ doulos-fonts.spec 8 Nov 2006 18:16:15 -0000 1.3 @@ -0,0 +1,73 @@ +%define fontdir %{_datadir}/fonts/doulos + +Name: doulos-fonts +Version: 4.0.14 +Release: 2 +Summary: Doulos SIL fonts + +Group: User Interface/X +License: SIL Open Font License +URL: http://scripts.sil.org/DoulosSILFont +# Source0 can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload +Source0: DoulosSIL%{version}.r1.zip +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +%description +Doulos SIL provides glyphs for a wide range of Latin and Cyrillic characters. +Doulos is very similar to Times/Times New Roman, but only has a single +regular face. It is intended for use alongside other Times-like fonts where +a range of styles (italic, bold) are not needed. + + +%prep +%setup -q -c +%{__sed} -i 's/\r//' *.txt + +%build + + +%install +rm -rf $RPM_BUILD_ROOT + +install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} +install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} + +# "touch" all files we've got flagged as %ghost but which are not +# present in the RPM_BUILD_ROOT when RPM looks for files +/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts +fi + + +%postun +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts + fi +fi + + +%files +%defattr(0644,root,root,0755) +%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf + +%dir %{fontdir} +%{fontdir}/*.ttf +%ghost %{fontdir}/fonts.cache-1 + + +%changelog +* Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-2 +- Rebuild to make package available in Rawhide again + +* Sat Feb 18 2006 Roozbeh Pournader - 4.0.14-1 +- Initial packaging, based on gentium-fonts Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 8 Nov 2006 18:16:15 -0000 1.4 @@ -0,0 +1 @@ +70263b39119d488d432a04a4512cfc57 DoulosSIL4.0.14.r1.zip --- dead.package DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 18:27:30 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 8 Nov 2006 11:27:30 -0700 Subject: rpms/galeon/FC-6 galeon.spec,1.25,1.26 Message-ID: <200611081827.kA8IRUrN020077@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20061 Modified Files: galeon.spec Log Message: Rebuild for firefox 1.5.0.8 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-6/galeon.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- galeon.spec 19 Oct 2006 14:06:10 -0000 1.25 +++ galeon.spec 8 Nov 2006 18:27:00 -0000 1.26 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -110,6 +110,9 @@ %changelog +* Wed Nov 8 2006 Denis Leroy - 2.0.3-4 +- Rebuild for firefox 1.5.0.8 + * Thu Oct 19 2006 Denis Leroy - 2.0.3-3 - Added patch to fix flash plugin crash - Make package depend on gecko-devel From fedora-extras-commits at redhat.com Wed Nov 8 18:35:54 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Nov 2006 11:35:54 -0700 Subject: rpms/gkrellm/devel gkrellm-2.2.10-via686.patch, NONE, 1.1 gkrellm.spec, 1.5, 1.6 Message-ID: <200611081835.kA8IZsPq020228@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gkrellm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20209 Modified Files: gkrellm.spec Added Files: gkrellm-2.2.10-via686.patch Log Message: * Wed Nov 8 2006 Hans de Goede 2.2.10-2 - Add special case for via 686 volt sensors (bug 213304) gkrellm-2.2.10-via686.patch: --- NEW FILE gkrellm-2.2.10-via686.patch --- diff -ur gkrellm-2.2.10/src/sysdeps/linux.c gkrellm-2.2.10.new/src/sysdeps/linux.c --- gkrellm-2.2.10/src/sysdeps/linux.c 2006-10-27 00:06:07.000000000 +0200 +++ gkrellm-2.2.10.new/src/sysdeps/linux.c 2006-11-08 17:00:26.000000000 +0100 @@ -2016,6 +2016,7 @@ #ifdef HAVE_LIBSENSORS #include +#include static gboolean libsensors_init(void) @@ -2028,6 +2029,7 @@ gchar id_name[512], sensor_path[512]; gint type, n_sensors_added; ConfigMap *config_map; + char *endptr; f = fopen("/etc/sensors.conf", "r"); if (!f) @@ -2070,6 +2072,9 @@ */ snprintf(sensor_path, sizeof (sensor_path), "%s:%s", name->prefix, name->busname ? name->busname : "NULL"); + + /* For VIA 686 volt sensors special case */ + strtol(feature->name, &endptr, 10); if (!strncmp(feature->name, "temp", 4)) type = SENSOR_TEMPERATURE; @@ -2077,6 +2082,12 @@ type = SENSOR_FAN; else if (!strncmp(feature->name, "in", 2)) type = SENSOR_VOLTAGE; + /* HURRAY! special case for VIA 686 volt sensors, + which genius made up those feature names? */ + else if ((endptr[0] == 'V' && endptr[1] == 0) || + (endptr[0] == '.' && isdigit(endptr[1]) && + endptr[2] == 'V' && endptr[3] == 0)) + type = SENSOR_VOLTAGE; else { if (_GK.debug_level & DEBUG_SENSORS) Only in gkrellm-2.2.10.new/src/sysdeps: linux.c~ Index: gkrellm.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gkrellm.spec 31 Oct 2006 16:29:31 -0000 1.5 +++ gkrellm.spec 8 Nov 2006 18:35:24 -0000 1.6 @@ -1,6 +1,6 @@ Name: gkrellm Version: 2.2.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiple stacked system monitors in one process Group: Applications/System License: GPL @@ -15,6 +15,7 @@ Patch3: gkrellm-2.2.7-width.patch Patch4: gkrellm-2.2.9-libdir.patch Patch5: gkrellm-2.2.9-gkrellmd.conf.patch +Patch6: gkrellm-2.2.10-via686.patch BuildRequires: gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext %ifarch %{ix86} x86_64 BuildRequires: lm_sensors-devel @@ -67,6 +68,7 @@ %patch3 -p1 -z .width %patch4 -p1 -z .libdir2 %patch5 -p1 -z .conf-patch +%patch6 -p1 -z .via686 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i @@ -180,6 +182,9 @@ %changelog +* Wed Nov 8 2006 Hans de Goede 2.2.10-2 +- Add special case for via 686 volt sensors (bug 213304) + * Tue Oct 31 2006 Hans de Goede 2.2.10-1 - New upstream release 2.2.10 - Drop integrated lmsensors and sysfs sensors patches From fedora-extras-commits at redhat.com Wed Nov 8 18:51:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 8 Nov 2006 11:51:31 -0700 Subject: rpms/gqview/FC-4 gqview-2.0.3-desktop.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gqview.spec, 1.6, 1.7 sources, 1.6, 1.7 gqview-2.0.0-desktop.patch, 1.2, NONE Message-ID: <200611081851.kA8IpV3b020376@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gqview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20315/FC-4 Modified Files: .cvsignore gqview.spec sources Added Files: gqview-2.0.3-desktop.patch Removed Files: gqview-2.0.0-desktop.patch Log Message: sync with devel, latest minor updates gqview-2.0.3-desktop.patch: --- NEW FILE gqview-2.0.3-desktop.patch --- diff -Nur gqview-2.0.3-orig/gqview.desktop gqview-2.0.3/gqview.desktop --- gqview-2.0.3-orig/gqview.desktop 2006-11-03 00:05:28.000000000 +0100 +++ gqview-2.0.3/gqview.desktop 2006-11-04 17:58:52.000000000 +0100 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=GQview +Name=GQview Image Viewer GenericName=Image Viewer GenericName[et]=Piltide vaatur GenericName[tr]=Resim g??stericisi Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 May 2005 21:23:33 -0000 1.5 +++ .cvsignore 8 Nov 2006 18:51:00 -0000 1.6 @@ -1 +1 @@ -gqview-2.0.1.tar.gz +gqview-2.0.3.tar.gz Index: gqview.spec =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-4/gqview.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gqview.spec 14 May 2005 21:23:33 -0000 1.6 +++ gqview.spec 8 Nov 2006 18:51:00 -0000 1.7 @@ -1,11 +1,11 @@ Summary: Image browser and viewer Name: gqview -Version: 2.0.1 -Release: 1 +Version: 2.0.3 +Release: 1%{?dist} License: GPL Group: User Interface/X Source: http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz -Patch1: gqview-2.0.0-desktop.patch +Patch1: gqview-2.0.3-desktop.patch Patch2: gqview-2.0.0-editors.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) URL: http://gqview.sourceforge.net/ @@ -76,6 +76,22 @@ %changelog +* Sat Nov 4 2006 Michael Schwendt - 2.0.3-1 +- update to 2.0.3 +- .desktop patch: additional MIME types merged upstream + +* Sat Oct 14 2006 Michael Schwendt - 2.0.2-1 +- update to 2.0.2 + +* Mon Aug 28 2006 Michael Schwendt - 2.0.1-4 +- rebuilt + +* Wed Feb 15 2006 Michael Schwendt - 2.0.1-3 +- rebuilt for FC5 + +* Wed Aug 17 2005 Michael Schwendt - 2.0.1-2 +- rebuilt + * Sat May 14 2005 Michael Schwendt 2.0.1-1 - update to 2.0.1 @@ -174,7 +190,7 @@ * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. -* Tue Feb 27 2001 Trond Eivind Glomsr?d +* Tue Feb 27 2001 Trond Eivind Glomsr??d - use %%{_tmppath} * Thu Jul 13 2000 Prospector Index: sources =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 May 2005 21:23:33 -0000 1.6 +++ sources 8 Nov 2006 18:51:00 -0000 1.7 @@ -1 +1 @@ -acd8f1dad2b04389c1936adac1512e32 gqview-2.0.1.tar.gz +8759106bcc16b50234b4b419064d245c gqview-2.0.3.tar.gz --- gqview-2.0.0-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 18:51:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 8 Nov 2006 11:51:32 -0700 Subject: rpms/gqview/FC-6 gqview-2.0.3-desktop.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gqview.spec, 1.10, 1.11 sources, 1.7, 1.8 gqview-2.0.0-desktop.patch, 1.2, NONE Message-ID: <200611081851.kA8IpWlQ020386@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gqview/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20315/FC-6 Modified Files: .cvsignore gqview.spec sources Added Files: gqview-2.0.3-desktop.patch Removed Files: gqview-2.0.0-desktop.patch Log Message: sync with devel, latest minor updates gqview-2.0.3-desktop.patch: --- NEW FILE gqview-2.0.3-desktop.patch --- diff -Nur gqview-2.0.3-orig/gqview.desktop gqview-2.0.3/gqview.desktop --- gqview-2.0.3-orig/gqview.desktop 2006-11-03 00:05:28.000000000 +0100 +++ gqview-2.0.3/gqview.desktop 2006-11-04 17:58:52.000000000 +0100 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=GQview +Name=GQview Image Viewer GenericName=Image Viewer GenericName[et]=Piltide vaatur GenericName[tr]=Resim g??stericisi Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Oct 2006 16:13:51 -0000 1.6 +++ .cvsignore 8 Nov 2006 18:51:02 -0000 1.7 @@ -1 +1 @@ -gqview-2.0.2.tar.gz +gqview-2.0.3.tar.gz Index: gqview.spec =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-6/gqview.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gqview.spec 14 Oct 2006 16:13:51 -0000 1.10 +++ gqview.spec 8 Nov 2006 18:51:02 -0000 1.11 @@ -1,11 +1,11 @@ Summary: Image browser and viewer Name: gqview -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} License: GPL Group: User Interface/X Source: http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz -Patch1: gqview-2.0.0-desktop.patch +Patch1: gqview-2.0.3-desktop.patch Patch2: gqview-2.0.0-editors.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) URL: http://gqview.sourceforge.net/ @@ -76,6 +76,10 @@ %changelog +* Sat Nov 4 2006 Michael Schwendt - 2.0.3-1 +- update to 2.0.3 +- .desktop patch: additional MIME types merged upstream + * Sat Oct 14 2006 Michael Schwendt - 2.0.2-1 - update to 2.0.2 @@ -186,7 +190,7 @@ * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. -* Tue Feb 27 2001 Trond Eivind Glomsr?d +* Tue Feb 27 2001 Trond Eivind Glomsr??d - use %%{_tmppath} * Thu Jul 13 2000 Prospector Index: sources =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Oct 2006 16:13:51 -0000 1.7 +++ sources 8 Nov 2006 18:51:02 -0000 1.8 @@ -1 +1 @@ -0bb325001b3cea88c2487c84e06ba738 gqview-2.0.2.tar.gz +8759106bcc16b50234b4b419064d245c gqview-2.0.3.tar.gz --- gqview-2.0.0-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 18:51:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 8 Nov 2006 11:51:32 -0700 Subject: rpms/gqview/FC-5 gqview-2.0.3-desktop.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gqview.spec, 1.8, 1.9 sources, 1.6, 1.7 gqview-2.0.0-desktop.patch, 1.2, NONE Message-ID: <200611081851.kA8IpWkR020381@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gqview/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20315/FC-5 Modified Files: .cvsignore gqview.spec sources Added Files: gqview-2.0.3-desktop.patch Removed Files: gqview-2.0.0-desktop.patch Log Message: sync with devel, latest minor updates gqview-2.0.3-desktop.patch: --- NEW FILE gqview-2.0.3-desktop.patch --- diff -Nur gqview-2.0.3-orig/gqview.desktop gqview-2.0.3/gqview.desktop --- gqview-2.0.3-orig/gqview.desktop 2006-11-03 00:05:28.000000000 +0100 +++ gqview-2.0.3/gqview.desktop 2006-11-04 17:58:52.000000000 +0100 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=GQview +Name=GQview Image Viewer GenericName=Image Viewer GenericName[et]=Piltide vaatur GenericName[tr]=Resim g??stericisi Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 May 2005 21:23:33 -0000 1.5 +++ .cvsignore 8 Nov 2006 18:51:01 -0000 1.6 @@ -1 +1 @@ -gqview-2.0.1.tar.gz +gqview-2.0.3.tar.gz Index: gqview.spec =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-5/gqview.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gqview.spec 15 Feb 2006 02:13:40 -0000 1.8 +++ gqview.spec 8 Nov 2006 18:51:01 -0000 1.9 @@ -1,11 +1,11 @@ Summary: Image browser and viewer Name: gqview -Version: 2.0.1 -Release: 3 +Version: 2.0.3 +Release: 1%{?dist} License: GPL Group: User Interface/X Source: http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz -Patch1: gqview-2.0.0-desktop.patch +Patch1: gqview-2.0.3-desktop.patch Patch2: gqview-2.0.0-editors.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) URL: http://gqview.sourceforge.net/ @@ -76,6 +76,16 @@ %changelog +* Sat Nov 4 2006 Michael Schwendt - 2.0.3-1 +- update to 2.0.3 +- .desktop patch: additional MIME types merged upstream + +* Sat Oct 14 2006 Michael Schwendt - 2.0.2-1 +- update to 2.0.2 + +* Mon Aug 28 2006 Michael Schwendt - 2.0.1-4 +- rebuilt + * Wed Feb 15 2006 Michael Schwendt - 2.0.1-3 - rebuilt for FC5 @@ -180,7 +190,7 @@ * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. -* Tue Feb 27 2001 Trond Eivind Glomsr?d +* Tue Feb 27 2001 Trond Eivind Glomsr??d - use %%{_tmppath} * Thu Jul 13 2000 Prospector Index: sources =================================================================== RCS file: /cvs/extras/rpms/gqview/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 May 2005 21:23:33 -0000 1.6 +++ sources 8 Nov 2006 18:51:01 -0000 1.7 @@ -1 +1 @@ -acd8f1dad2b04389c1936adac1512e32 gqview-2.0.1.tar.gz +8759106bcc16b50234b4b419064d245c gqview-2.0.3.tar.gz --- gqview-2.0.0-desktop.patch DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 19:12:00 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 12:12:00 -0700 Subject: rpms/doulos-fonts/devel .cvsignore,1.3,1.4 Message-ID: <200611081912.kA8JC0Ia023585@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/doulos-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23564 Added Files: .cvsignore Log Message: Re-adding .cvsignore Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 8 Nov 2006 19:11:30 -0000 1.4 @@ -0,0 +1 @@ +DoulosSIL4.0.14.r1.zip From fedora-extras-commits at redhat.com Wed Nov 8 19:17:43 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 12:17:43 -0700 Subject: rpms/fonttools/devel Makefile, 1.2, 1.3 fonttools-20050315-20050624.patch, 1.2, 1.3 fonttools-unsigned-ranges.patch, 1.2, 1.3 fonttools.spec, 1.5, 1.6 sources, 1.3, 1.4 dead.package, 1.1, NONE Message-ID: <200611081917.kA8JHhOq023680@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23645 Added Files: Makefile fonttools-20050315-20050624.patch fonttools-unsigned-ranges.patch fonttools.spec sources Removed Files: dead.package Log Message: De-orphan Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 8 Nov 2006 19:17:12 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: fonttools +# $Id$ +NAME := fonttools +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) fonttools-20050315-20050624.patch: Index: fonttools-20050315-20050624.patch =================================================================== RCS file: fonttools-20050315-20050624.patch diff -N fonttools-20050315-20050624.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ fonttools-20050315-20050624.patch 8 Nov 2006 19:17:12 -0000 1.3 @@ -0,0 +1,279 @@ +diff -urN fonttools-20050315/Lib/fontTools/fondLib.py fonttools-20050624/Lib/fontTools/fondLib.py +--- fonttools-20050315/Lib/fontTools/fondLib.py 2002-10-29 19:19:25.000000000 +0330 ++++ fonttools-20050624/Lib/fontTools/fondLib.py 2005-06-24 14:05:16.000000000 +0430 +@@ -12,6 +12,7 @@ + DEBUG = 0 + + headerformat = """ ++ > + ffFlags: h + ffFamID: h + ffFirstChar: h +@@ -127,9 +128,9 @@ + def _getheader(self): + data = self.FOND.data + sstruct.unpack(headerformat, data[:28], self) +- self.ffProperty = struct.unpack("9h", data[28:46]) +- self.ffIntl = struct.unpack("hh", data[46:50]) +- self.ffVersion, = struct.unpack("h", data[50:FONDheadersize]) ++ self.ffProperty = struct.unpack(">9h", data[28:46]) ++ self.ffIntl = struct.unpack(">hh", data[46:50]) ++ self.ffVersion, = struct.unpack(">h", data[50:FONDheadersize]) + + if DEBUG: + self._rawheader = data[:FONDheadersize] +@@ -137,9 +138,9 @@ + + def _buildheader(self): + header = sstruct.pack(headerformat, self) +- header = header + apply(struct.pack, ("9h",) + self.ffProperty) +- header = header + apply(struct.pack, ("hh",) + self.ffIntl) +- header = header + struct.pack("h", self.ffVersion) ++ header = header + apply(struct.pack, (">9h",) + self.ffProperty) ++ header = header + apply(struct.pack, (">hh",) + self.ffIntl) ++ header = header + struct.pack(">h", self.ffVersion) + if DEBUG: + print "header is the same?", self._rawheader == header and 'yes.' or 'no.' + if self._rawheader <> header: +@@ -149,12 +150,12 @@ + def _getfontassociationtable(self): + data = self.FOND.data + offset = FONDheadersize +- numberofentries, = struct.unpack("h", data[offset:offset+2]) ++ numberofentries, = struct.unpack(">h", data[offset:offset+2]) + numberofentries = numberofentries + 1 + size = numberofentries * 6 + self.fontAssoc = [] + for i in range(offset + 2, offset + size, 6): +- self.fontAssoc.append(struct.unpack("3h", data[i:i+6])) ++ self.fontAssoc.append(struct.unpack(">3h", data[i:i+6])) + + self._endoffontassociationtable = offset + size + 2 + if DEBUG: +@@ -162,9 +163,9 @@ + self.parsedthings.append((offset, self._endoffontassociationtable, 'fontassociationtable')) + + def _buildfontassociationtable(self): +- data = struct.pack("h", len(self.fontAssoc) - 1) ++ data = struct.pack(">h", len(self.fontAssoc) - 1) + for size, stype, ID in self.fontAssoc: +- data = data + struct.pack("3h", size, stype, ID) ++ data = data + struct.pack(">3h", size, stype, ID) + + if DEBUG: + print "font association table is the same?", self._rawfontassociationtable == data and 'yes.' or 'no.' +@@ -194,10 +195,10 @@ + return + boxes = {} + data = self._rawoffsettable[6:] +- numstyles = struct.unpack("h", data[:2])[0] + 1 ++ numstyles = struct.unpack(">h", data[:2])[0] + 1 + data = data[2:] + for i in range(numstyles): +- style, l, b, r, t = struct.unpack("hhhhh", data[:10]) ++ style, l, b, r, t = struct.unpack(">hhhhh", data[:10]) + boxes[style] = (l, b, r, t) + data = data[10:] + self.boundingBoxes = boxes +@@ -206,9 +207,9 @@ + if self.boundingBoxes and self._rawoffsettable[:6] == '\0\0\0\0\0\6': + boxes = self.boundingBoxes.items() + boxes.sort() +- data = '\0\0\0\0\0\6' + struct.pack("h", len(boxes) - 1) ++ data = '\0\0\0\0\0\6' + struct.pack(">h", len(boxes) - 1) + for style, (l, b, r, t) in boxes: +- data = data + struct.pack("hhhhh", style, l, b, r, t) ++ data = data + struct.pack(">hhhhh", style, l, b, r, t) + self._rawoffsettable = data + + def _getglyphwidthtable(self): +@@ -217,15 +218,15 @@ + return + data = self.FOND.data + offset = self.ffWTabOff +- numberofentries, = struct.unpack("h", data[offset:offset+2]) ++ numberofentries, = struct.unpack(">h", data[offset:offset+2]) + numberofentries = numberofentries + 1 + count = offset + 2 + for i in range(numberofentries): +- stylecode, = struct.unpack("h", data[count:count+2]) ++ stylecode, = struct.unpack(">h", data[count:count+2]) + widthtable = self.widthTables[stylecode] = [] + count = count + 2 + for j in range(3 + self.ffLastChar - self.ffFirstChar): +- width, = struct.unpack("h", data[count:count+2]) ++ width, = struct.unpack(">h", data[count:count+2]) + widthtable.append(width) + count = count + 2 + +@@ -238,15 +239,15 @@ + self._rawglyphwidthtable = "" + return + numberofentries = len(self.widthTables) +- data = struct.pack('h', numberofentries - 1) ++ data = struct.pack('>h', numberofentries - 1) + tables = self.widthTables.items() + tables.sort() + for stylecode, table in tables: +- data = data + struct.pack('h', stylecode) ++ data = data + struct.pack('>h', stylecode) + if len(table) <> (3 + self.ffLastChar - self.ffFirstChar): + raise error, "width table has wrong length" + for width in table: +- data = data + struct.pack('h', width) ++ data = data + struct.pack('>h', width) + if DEBUG: + print "glyph width table is the same?", self._rawglyphwidthtable == data and 'yes.' or 'no.' + self._rawglyphwidthtable = data +@@ -257,17 +258,17 @@ + return + data = self.FOND.data + offset = self.ffKernOff +- numberofentries, = struct.unpack("h", data[offset:offset+2]) ++ numberofentries, = struct.unpack(">h", data[offset:offset+2]) + numberofentries = numberofentries + 1 + count = offset + 2 + for i in range(numberofentries): +- stylecode, = struct.unpack("h", data[count:count+2]) ++ stylecode, = struct.unpack(">h", data[count:count+2]) + count = count + 2 +- numberofpairs, = struct.unpack("h", data[count:count+2]) ++ numberofpairs, = struct.unpack(">h", data[count:count+2]) + count = count + 2 + kerntable = self.kernTables[stylecode] = [] + for j in range(numberofpairs): +- firstchar, secondchar, kerndistance = struct.unpack("cch", data[count:count+4]) ++ firstchar, secondchar, kerndistance = struct.unpack(">cch", data[count:count+4]) + kerntable.append((ord(firstchar), ord(secondchar), kerndistance)) + count = count + 4 + +@@ -281,14 +282,14 @@ + self.ffKernOff = 0 + return + numberofentries = len(self.kernTables) +- data = [struct.pack('h', numberofentries - 1)] ++ data = [struct.pack('>h', numberofentries - 1)] + tables = self.kernTables.items() + tables.sort() + for stylecode, table in tables: +- data.append(struct.pack('h', stylecode)) +- data.append(struct.pack('h', len(table))) # numberofpairs ++ data.append(struct.pack('>h', stylecode)) ++ data.append(struct.pack('>h', len(table))) # numberofpairs + for firstchar, secondchar, kerndistance in table: +- data.append(struct.pack("cch", chr(firstchar), chr(secondchar), kerndistance)) ++ data.append(struct.pack(">cch", chr(firstchar), chr(secondchar), kerndistance)) + + data = string.join(data, '') + +@@ -308,9 +309,9 @@ + return + data = self.FOND.data + self.fondClass, self.glyphTableOffset, self.styleMappingReserved, = \ +- struct.unpack("hll", data[offset:offset+10]) +- self.styleIndices = struct.unpack('48b', data[offset + 10:offset + 58]) +- stringcount, = struct.unpack('h', data[offset+58:offset+60]) ++ struct.unpack(">hll", data[offset:offset+10]) ++ self.styleIndices = struct.unpack('>48b', data[offset + 10:offset + 58]) ++ stringcount, = struct.unpack('>h', data[offset+58:offset+60]) + + count = offset + 60 + for i in range(stringcount): +@@ -331,14 +332,14 @@ + if not self.styleIndices: + self._rawstylemappingtable = "" + return +- data = struct.pack("hll", self.fondClass, self.glyphTableOffset, ++ data = struct.pack(">hll", self.fondClass, self.glyphTableOffset, + self.styleMappingReserved) + + self._packstylestrings() +- data = data + apply(struct.pack, ("48b",) + self.styleIndices) ++ data = data + apply(struct.pack, (">48b",) + self.styleIndices) + + stringcount = len(self.styleStrings) +- data = data + struct.pack("h", stringcount) ++ data = data + struct.pack(">h", stringcount) + for string in self.styleStrings: + data = data + chr(len(string)) + string + +@@ -401,7 +402,7 @@ + data = self._rawstylemappingtable + if not data: + return +- data = data[:2] + struct.pack("l", self.glyphTableOffset) + data[6:] ++ data = data[:2] + struct.pack(">l", self.glyphTableOffset) + data[6:] + self._rawstylemappingtable = data + + def _getglyphencodingsubtable(self): +@@ -410,7 +411,7 @@ + return + offset = self.ffStylOff + self.glyphTableOffset + data = self.FOND.data +- numberofentries, = struct.unpack("h", data[offset:offset+2]) ++ numberofentries, = struct.unpack(">h", data[offset:offset+2]) + count = offset + 2 + for i in range(numberofentries): + glyphcode = ord(data[count]) +@@ -430,7 +431,7 @@ + self._rawglyphencodingsubtable = "" + return + numberofentries = len(self.glyphEncoding) +- data = struct.pack("h", numberofentries) ++ data = struct.pack(">h", numberofentries) + items = self.glyphEncoding.items() + items.sort() + for glyphcode, glyphname in items: +diff -urN fonttools-20050315/Lib/fontTools/misc/psCharStrings.py fonttools-20050624/Lib/fontTools/misc/psCharStrings.py +--- fonttools-20050315/Lib/fontTools/misc/psCharStrings.py 2005-02-24 00:52:27.000000000 +0330 ++++ fonttools-20050624/Lib/fontTools/misc/psCharStrings.py 2005-05-07 13:11:12.000000000 +0430 +@@ -780,7 +780,8 @@ + # + def op_hflex(self, index): + dx1, dx2, dy2, dx3, dx4, dx5, dx6 = self.popall() +- dy1 = dy3 = dy4 = dy5 = dy6 = 0 ++ dy1 = dy3 = dy4 = dy6 = 0 ++ dy5 = -dy2 + self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3)) + self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) + def op_flex(self, index): +@@ -789,7 +790,9 @@ + self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) + def op_hflex1(self, index): + dx1, dy1, dx2, dy2, dx3, dx4, dx5, dy5, dx6 = self.popall() +- dy3 = dy4 = dy6 = 0 ++ dy3 = dy4 = 0 ++ dy6 = -(dy1 + dy2 + dy3 + dy4 + dy5) ++ + self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3)) + self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) + def op_flex1(self, index): +@@ -798,9 +801,9 @@ + dy = dy1 + dy2 + dy3 + dy4 + dy5 + if abs(dx) > abs(dy): + dx6 = d6 +- dy6 = 0 ++ dy6 = -dy + else: +- dx6 = 0 ++ dx6 = -dx + dy6 = d6 + self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3)) + self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6)) +diff -urN fonttools-20050315/Lib/fontTools/pens/basePen.py fonttools-20050624/Lib/fontTools/pens/basePen.py +--- fonttools-20050315/Lib/fontTools/pens/basePen.py 2005-03-08 13:20:55.000000000 +0330 ++++ fonttools-20050624/Lib/fontTools/pens/basePen.py 2005-04-10 17:48:42.000000000 +0430 +@@ -162,8 +162,11 @@ + of the base glyph and draws it onto self. + """ + from fontTools.pens.transformPen import TransformPen +- glyph = self.glyphSet.get(glyphName) +- if glyph is not None: ++ try: ++ glyph = self.glyphSet[glyphName] ++ except KeyError: ++ pass ++ else: + tPen = TransformPen(self, transformation) + glyph.draw(tPen) + fonttools-unsigned-ranges.patch: Index: fonttools-unsigned-ranges.patch =================================================================== RCS file: fonttools-unsigned-ranges.patch diff -N fonttools-unsigned-ranges.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ fonttools-unsigned-ranges.patch 8 Nov 2006 19:17:12 -0000 1.3 @@ -0,0 +1,17 @@ +--- fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py.unsigned-ranges 2006-05-08 17:13:17.000000000 +0330 ++++ fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py 2006-05-08 17:14:04.000000000 +0330 +@@ -52,10 +52,10 @@ + yStrikeoutPosition: h # strikeout position + sFamilyClass: h # font family class and subclass + panose: 10s # panose classification number +- ulUnicodeRange1: l # character range +- ulUnicodeRange2: l # character range +- ulUnicodeRange3: l # character range +- ulUnicodeRange4: l # character range ++ ulUnicodeRange1: L # character range ++ ulUnicodeRange2: L # character range ++ ulUnicodeRange3: L # character range ++ ulUnicodeRange4: L # character range + achVendID: 4s # font vendor identification + fsSelection: H # font selection flags + fsFirstCharIndex: H # first unicode character index Index: fonttools.spec =================================================================== RCS file: fonttools.spec diff -N fonttools.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ fonttools.spec 8 Nov 2006 19:17:12 -0000 1.6 @@ -0,0 +1,100 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define alphatag 20050624cvs + +Name: fonttools +Version: 2.0 +Release: 0.6.%{alphatag}%{?dist} +Summary: A tool to convert True/OpenType fonts to XML and back + +Group: Development/Tools +License: BSD +URL: http://sourceforge.net/projects/fonttools/ +Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2 +Patch1: fonttools-20050315-20050624.patch +Patch2: fonttools-unsigned-ranges.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel python-numeric +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: python-numeric + +Provides: ttx + +%description +TTX/FontTools is a tool for manipulating TrueType and OpenType fonts. It is +written in Python and has a BSD-style, open-source license. TTX can dump +TrueType and OpenType fonts to an XML-based text format and vice versa. + + +%prep +%setup -q -n %{name} +%patch1 -p1 -b .20050624 +%patch2 -p1 -b .unsigned-ranges + +%{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py +%{__chmod} a-x LICENSE.txt + + +%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 +rm -rf $RPM_BUILD_ROOT%{python_sitearch}/FontTools/fontTools/ttLib/test + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt +%doc Doc/bugs.txt Doc/ChangeLog.txt Doc/changes.txt Doc/documentation.html +%{python_sitearch}/FontTools.pth +%dir %{python_sitearch}/FontTools +%dir %{python_sitearch}/FontTools/fontTools +%dir %{python_sitearch}/FontTools/fontTools/encodings +%dir %{python_sitearch}/FontTools/fontTools/misc +%dir %{python_sitearch}/FontTools/fontTools/pens +%dir %{python_sitearch}/FontTools/fontTools/ttLib +%dir %{python_sitearch}/FontTools/fontTools/ttLib/tables +%{python_sitearch}/FontTools/*.py +%{python_sitearch}/FontTools/*.pyc +%ghost %{python_sitearch}/FontTools/*.pyo +%{python_sitearch}/FontTools/fontTools/*.py +%{python_sitearch}/FontTools/fontTools/*.pyc +%ghost %{python_sitearch}/FontTools/fontTools/*.pyo +%{python_sitearch}/FontTools/fontTools/*/*.py +%{python_sitearch}/FontTools/fontTools/*/*.pyc +%ghost %{python_sitearch}/FontTools/fontTools/*/*.pyo +%{python_sitearch}/FontTools/fontTools/*/*/*.py +%{python_sitearch}/FontTools/fontTools/*/*/*.pyc +%ghost %{python_sitearch}/FontTools/fontTools/*/*/*.pyo +%{python_sitearch}/FontTools/fontTools/misc/eexecOp.so +%{_bindir}/ttx + + +%changelog +* Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs +- Change specification of ulUnicodeRange1-4 to unsigned long + +* Mon Feb 13 2006 Roozbeh Pournader - 2.0-0.5.20050624cvs +- Rebuild for Fedora Extras 5 + +* Thu Feb 02 2006 Roozbeh Pournader - 2.0-0.4.20050624cvs +- Provide ttx + +* Wed Feb 01 2006 Roozbeh Pournader - 2.0-0.3.20050624cvs +- Use upstream snapshots, moving the difference into a patch +- Change alphatag time to the latest change in CVS +- Use %%{python_sitearch} instead of %%{python_sitelib} (for x86_86) +- Use sed instead of a patch to remove shebang + +* Sun Jan 08 2006 Roozbeh Pournader - 2.0-0.2.20060103cvs +- Add %%{?dist} tag + +* Fri Jan 06 2006 Roozbeh Pournader - 2.0-0.1.20060103cvs +- Initial packaging Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 8 Nov 2006 19:17:12 -0000 1.4 @@ -0,0 +1 @@ +b44a299a0530a2a4f65d1937aa99f734 fonttools-2005-03-15.210812.tar.bz2 --- dead.package DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 19:26:33 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 12:26:33 -0700 Subject: rpms/fonttools/devel fonttools.spec,1.6,1.7 Message-ID: <200611081926.kA8JQXZs023835@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783 Modified Files: fonttools.spec Log Message: * Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.7.20050624cvs - Rebuild to get into Rawhide Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fonttools.spec 8 Nov 2006 19:17:12 -0000 1.6 +++ fonttools.spec 8 Nov 2006 19:26:03 -0000 1.7 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.6.%{alphatag}%{?dist} +Release: 0.7.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -78,6 +78,9 @@ %changelog +* Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.7.20050624cvs +- Rebuild to get into Rawhide + * Mon May 08 2006 Roozbeh Pournader - 2.0-0.6.20050624cvs - Change specification of ulUnicodeRange1-4 to unsigned long From fedora-extras-commits at redhat.com Wed Nov 8 19:43:00 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Nov 2006 12:43:00 -0700 Subject: rpms/PyKDE/devel PyKDE.spec,1.5,1.6 Message-ID: <200611081943.kA8Jh01M025424@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyKDE/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25408 Modified Files: PyKDE.spec Log Message: * Wed Nov 08 2006 Rex Dieter 3.16.0-3 - (unversioned) Requires: PyQt - rebuild for PyQt-3.17 (fc7+) Index: PyKDE.spec =================================================================== RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PyKDE.spec 4 Oct 2006 19:37:49 -0000 1.5 +++ PyKDE.spec 8 Nov 2006 19:42:30 -0000 1.6 @@ -2,7 +2,7 @@ Summary: Python bindings for KDE Name: PyKDE Version: 3.16.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.riverbankcomputing.co.uk/pykde/ @@ -21,11 +21,12 @@ BuildRequires: sip-devel >= 4.4.3 BuildRequires: PyQt-devel >= 3.16 -%global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) -%if "%{?pyqt_ver}" > "2" -Requires: PyQt = %{pyqt_ver} -%endif - +## try to leave this unversioned, for now -- Rex +Requires: PyQt +#global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) +#if "%{?pyqt_ver}" > "2" +#Requires: PyQt = %{pyqt_ver} +#endif BuildRequires: kdelibs-devel kdebase %global kdelibs_ver %(kde-config --version 2>/dev/null | grep KDE | cut -d' ' -f2 | cut -d- -f1) @@ -90,6 +91,10 @@ %changelog +* Wed Nov 08 2006 Rex Dieter 3.16.0-3 +- (unversioned) Requires: PyQt +- rebuild for PyQt-3.17 (fc7+) + * Wed Oct 04 2006 Rex Dieter 3.16.0-2 - respin From fedora-extras-commits at redhat.com Wed Nov 8 19:47:19 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 12:47:19 -0700 Subject: rpms/translate-toolkit/devel .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 translate-toolkit.spec, 1.8, 1.9 dead.package, 1.1, NONE Message-ID: <200611081947.kA8JlJbd025556@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25534 Added Files: .cvsignore sources translate-toolkit.spec Removed Files: dead.package Log Message: De-orphan Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 8 Nov 2006 19:46:49 -0000 1.5 @@ -0,0 +1 @@ +translate-toolkit-0.8.tar.gz Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 8 Nov 2006 19:46:49 -0000 1.6 @@ -0,0 +1 @@ +81204110ab605435862b8999558e9649 translate-toolkit-0.8.tar.gz Index: translate-toolkit.spec =================================================================== RCS file: translate-toolkit.spec diff -N translate-toolkit.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ translate-toolkit.spec 8 Nov 2006 19:46:49 -0000 1.9 @@ -0,0 +1,96 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Name: translate-toolkit +Version: 0.8 +Release: 1%{?dist} +Summary: A collection of tools to assist software localization + +Group: Development/Tools +License: GPL +URL: http://translate.sourceforge.net/ +Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: python-elementtree +Requires: python-enchant + +%description +The Translate Toolkit includes programs to convert various localization +formats to the common gettext PO format and vice versa, and programs to +check and manage PO files. Also part of the package are programs to create +word counts, merge translations, and perform various checks on PO files. + + +%prep +%setup -q -n %{name}-%{version} + + +%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 + +# This removes the documentation files that were installed in site-packages +find $RPM_BUILD_ROOT%{python_sitelib}/translate -type f -name "[[:upper:]]*" | xargs rm -fv + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc ChangeLog translate/COPYING translate/README +%dir %{python_sitelib}/translate +%dir %{python_sitelib}/translate/tools +%dir %{python_sitelib}/translate/filters +%dir %{python_sitelib}/translate/storage +%dir %{python_sitelib}/translate/misc +%dir %{python_sitelib}/translate/convert +%{python_sitelib}/translate/*.py +%{python_sitelib}/translate/*.pyc +%ghost %{python_sitelib}/translate/*.pyo +%{python_sitelib}/translate/*/*.py +%{python_sitelib}/translate/*/*.pyc +%ghost %{python_sitelib}/translate/*/*.pyo +%{_bindir}/* + + +%changelog +* Mon Feb 20 2006 Roozbeh Pournader - 0.8-1 +- Update to final 0.8 + +* Sun Feb 19 2006 Roozbeh Pournader - 0.8-0.10.rc6 +- Fix a typo in po2dtd that made po2moz fail + +* Tue Feb 14 2006 Roozbeh Pournader - 0.8-0.9.rc6 +- Rebuild for Fedora Extras 5 + +* Tue Feb 07 2006 Roozbeh Pournader - 0.8-0.8.rc6 +- Require python-enchant for spellchecking support in pofilter + +* Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.7.rc6 +- Rebuild + +* Sat Feb 04 2006 Roozbeh Pournader - 0.8-0.6.rc6 +- Update to 0.8rc6 + +* Sat Jan 21 2006 Roozbeh Pournader - 0.8-0.5.rc5 +- Use sed instead of dos2unix + +* Mon Jan 09 2006 Roozbeh Pournader - 0.8-0.4.rc5 +- Own forgotten subdirectories + +* Mon Jan 09 2006 Roozbeh Pournader - 0.8-0.3.rc5 +- Fix the jToolkit requirement + +* Sun Jan 08 2006 Roozbeh Pournader - 0.8-0.2.rc5 +- Add %%{?dist} tag + +* Sat Jan 07 2006 Roozbeh Pournader - 0.8-0.1.rc5 +- Initial packaging --- dead.package DELETED --- From fedora-extras-commits at redhat.com Wed Nov 8 19:49:46 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 12:49:46 -0700 Subject: rpms/translate-toolkit/devel Makefile,1.2,1.3 Message-ID: <200611081949.kA8Jnkg1025604@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25588 Added Files: Makefile Log Message: Add forgotten Makefile Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 8 Nov 2006 19:49:16 -0000 1.3 @@ -0,0 +1,21 @@ +# Makefile for source rpm: translate-toolkit +# $Id$ +NAME := translate-toolkit +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) From fedora-extras-commits at redhat.com Wed Nov 8 19:53:11 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 12:53:11 -0700 Subject: rpms/translate-toolkit/devel translate-toolkit.spec,1.9,1.10 Message-ID: <200611081953.kA8JrBWo025635@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25619 Modified Files: translate-toolkit.spec Log Message: * Wed Nov 08 2006 Roozbeh Pournader - 0.8-2 - Rebuild to get into Rawhide Index: translate-toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/translate-toolkit.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- translate-toolkit.spec 8 Nov 2006 19:46:49 -0000 1.9 +++ translate-toolkit.spec 8 Nov 2006 19:52:41 -0000 1.10 @@ -2,7 +2,7 @@ Name: translate-toolkit Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of tools to assist software localization Group: Development/Tools @@ -62,6 +62,9 @@ %changelog +* Wed Nov 08 2006 Roozbeh Pournader - 0.8-2 +- Rebuild to get into Rawhide + * Mon Feb 20 2006 Roozbeh Pournader - 0.8-1 - Update to final 0.8 From fedora-extras-commits at redhat.com Wed Nov 8 19:58:24 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 12:58:24 -0700 Subject: rpms/doulos-fonts/FC-6 doulos-fonts.spec,1.3,1.4 Message-ID: <200611081958.kA8JwOnQ025763@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/doulos-fonts/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25742 Modified Files: doulos-fonts.spec Log Message: * Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-3 - Add dist tag Index: doulos-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/FC-6/doulos-fonts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- doulos-fonts.spec 8 Nov 2006 18:16:15 -0000 1.3 +++ doulos-fonts.spec 8 Nov 2006 19:57:53 -0000 1.4 @@ -2,7 +2,7 @@ Name: doulos-fonts Version: 4.0.14 -Release: 2 +Release: 3%{?dist} Summary: Doulos SIL fonts Group: User Interface/X @@ -66,6 +66,9 @@ %changelog +* Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-3 +- Add dist tag + * Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-2 - Rebuild to make package available in Rawhide again From fedora-extras-commits at redhat.com Wed Nov 8 19:59:06 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 12:59:06 -0700 Subject: rpms/doulos-fonts/devel doulos-fonts.spec,1.3,1.4 Message-ID: <200611081959.kA8Jx6T2025821@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/doulos-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25767 Modified Files: doulos-fonts.spec Log Message: * Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-3 - Add dist tag Index: doulos-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/devel/doulos-fonts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- doulos-fonts.spec 8 Nov 2006 18:16:15 -0000 1.3 +++ doulos-fonts.spec 8 Nov 2006 19:58:36 -0000 1.4 @@ -2,7 +2,7 @@ Name: doulos-fonts Version: 4.0.14 -Release: 2 +Release: 3%{?dist} Summary: Doulos SIL fonts Group: User Interface/X @@ -66,6 +66,9 @@ %changelog +* Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-3 +- Add dist tag + * Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-2 - Rebuild to make package available in Rawhide again From fedora-extras-commits at redhat.com Wed Nov 8 20:06:04 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 13:06:04 -0700 Subject: rpms/fonttools/devel fonttools.spec,1.7,1.8 Message-ID: <200611082006.kA8K64Bu028933@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28879 Modified Files: fonttools.spec Log Message: * Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.8.20050624cvs - De-ghost .pyo files Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fonttools.spec 8 Nov 2006 19:26:03 -0000 1.7 +++ fonttools.spec 8 Nov 2006 20:05:31 -0000 1.8 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.7.%{alphatag}%{?dist} +Release: 0.8.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -63,21 +63,24 @@ %dir %{python_sitearch}/FontTools/fontTools/ttLib/tables %{python_sitearch}/FontTools/*.py %{python_sitearch}/FontTools/*.pyc -%ghost %{python_sitearch}/FontTools/*.pyo +%{python_sitearch}/FontTools/*.pyo %{python_sitearch}/FontTools/fontTools/*.py %{python_sitearch}/FontTools/fontTools/*.pyc -%ghost %{python_sitearch}/FontTools/fontTools/*.pyo +%{python_sitearch}/FontTools/fontTools/*.pyo %{python_sitearch}/FontTools/fontTools/*/*.py %{python_sitearch}/FontTools/fontTools/*/*.pyc -%ghost %{python_sitearch}/FontTools/fontTools/*/*.pyo +%{python_sitearch}/FontTools/fontTools/*/*.pyo %{python_sitearch}/FontTools/fontTools/*/*/*.py %{python_sitearch}/FontTools/fontTools/*/*/*.pyc -%ghost %{python_sitearch}/FontTools/fontTools/*/*/*.pyo +%{python_sitearch}/FontTools/fontTools/*/*/*.pyo %{python_sitearch}/FontTools/fontTools/misc/eexecOp.so %{_bindir}/ttx %changelog +* Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.8.20050624cvs +- De-ghost .pyo files + * Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.7.20050624cvs - Rebuild to get into Rawhide From fedora-extras-commits at redhat.com Wed Nov 8 20:09:56 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 13:09:56 -0700 Subject: owners owners.list,1.1905,1.1906 Message-ID: <200611082009.kA8K9uGG029144@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29106 Modified Files: owners.list Log Message: re-orphan gtranslator and ttf2pt1: upstream silent Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1905 retrieving revision 1.1906 diff -u -r1.1905 -r1.1906 --- owners.list 8 Nov 2006 17:59:41 -0000 1.1905 +++ owners.list 8 Nov 2006 20:09:25 -0000 1.1906 @@ -640,7 +640,7 @@ Fedora Extras|gtkterm|Serial port terminal|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org| -Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| +Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info Fedora Extras|gts|GNU Triangulated Surface Library|ed at eh3.com|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtypist|GNU typing tutor|zing at fastmail.fm|extras-qa at fedoraproject.org| @@ -2270,7 +2270,7 @@ Fedora Extras|tremulous|First Person Shooter game based on the Quake 3 engine|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|tremulous-data|Data files for tremulous the FPS game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|tripwire|An IDS (Intrusion Detection System)|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| +Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| Fedora Extras|TurboGears|Back-to-front web development in Python|lmacken at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|tuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Nov 8 20:13:10 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Wed, 8 Nov 2006 13:13:10 -0700 Subject: rpms/kadu/FC-6 kadu-0.5.0-tabs_patch.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kadu.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200611082013.kA8KDAXb029276@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/kadu/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29253 Modified Files: .cvsignore kadu.spec sources Added Files: kadu-0.5.0-tabs_patch.patch Log Message: * Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.16.rc1 - Update kadu to RC1 - Update ext_info module to 2.0beta9 - Update powerkadu module to 20061026 - Update xmms module to 1.32 - Update amarok module to 1.19 - Amarok builds on all architectures again - Add tabs patch kadu-0.5.0-tabs_patch.patch: --- NEW FILE kadu-0.5.0-tabs_patch.patch --- --- ./modules/tabs/tabs.cpp.tabs_patch 2006-11-08 19:59:47.000000000 +0100 +++ ./modules/tabs/tabs.cpp 2006-11-08 20:01:02.000000000 +0100 @@ -83,7 +83,7 @@ Action* action = new Action( QPixmap(dataPath("kadu/modules/data/tabs/attach.png")), - tr("Attach this chat to tabs"), "tab_attach_action"); + tr("Attach this chat to tabs"), "tab_attach_action", Action::TypeChat); connect(action, SIGNAL(activated(const UserGroup*,const QWidget*,bool)), this, SLOT(onTabAttach(const UserGroup*))); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kadu/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Sep 2006 10:14:41 -0000 1.6 +++ .cvsignore 8 Nov 2006 20:12:40 -0000 1.7 @@ -1 +1,6 @@ kadu-20060915.tar.bz2 +powerkadu-20061026.tar.gz +kadu-0.5.0-rc1.tar.bz2 +ext_info-2.0beta9.tar.bz2 +xmms-1.32.tar.gz +amarok-1.19.tar.gz Index: kadu.spec =================================================================== RCS file: /cvs/extras/rpms/kadu/FC-6/kadu.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kadu.spec 10 Oct 2006 16:12:24 -0000 1.12 +++ kadu.spec 8 Nov 2006 20:12:40 -0000 1.13 @@ -1,31 +1,31 @@ -%define cvs_date 20060915 Name: kadu Version: 0.5.0 -Release: 0.15.%{cvs_date}svn%{?dist} +Release: 0.16.rc1%{?dist} Summary: An Gadu-Gadu client for online messaging Group: Applications/Internet License: GPL URL: http://www.kadu.net -Source0: http://www.kadu.net/download/snapshots/2006/kadu-%{cvs_date}.tar.bz2 +Source0: http://www.kadu.net/download/stable/kadu-0.5.0-rc1.tar.bz2 Source3: kadu.desktop # Sources 100-149 are external modules -Source100: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz -Source101: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.17.tar.gz +Source100: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.32.tar.gz +Source101: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.19.tar.gz Source102: http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz Source103: http://www.kadu.net/download/modules_mirror/mail-current.tar.gz Source104: http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz Source105: http://kadu.net/~blysk/weather-3.03.tar.bz2 -Source106: http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta8.tar.bz2 +Source106: http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta9.tar.bz2 Source107: http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 Source108: http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-1.3.5.tar.gz Source109: http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz Source110: http://kadu.net/~blysk/led_notify-0.9.tar.bz2 Source111: http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz Source112: http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2 -Source113: http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz +Source113: http://kadu.net/~patryk/powerkadu/powerkadu-20061026.tar.gz Source114: http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz Source115: http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2 Source116: http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz +Patch0: kadu-0.5.0-tabs_patch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel @@ -237,6 +237,8 @@ %setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules %setup -q -D -T -n kadu +%patch0 -p1 -b tabs_patch + ##==some changes in .config file #1. compile something as shared... # module_mail \ @@ -244,9 +246,7 @@ module_arts_sound \ module_esd_sound \ module_xmms \ -%ifnarch ppc64 x86_64 s390 s390x ia64 module_amarok \ -%endif module_filedesc \ module_spellchecker \ module_weather \ @@ -408,10 +408,8 @@ %mod_files2 xmms -%ifnarch ppc64 x86_64 s390 s390x ia64 %mod_files2 amarok -%endif %mod_files2 filedesc @@ -453,6 +451,15 @@ %{_moddata}/data/weather %changelog +* Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.16.rc1 +- Update kadu to RC1 +- Update ext_info module to 2.0beta9 +- Update powerkadu module to 20061026 +- Update xmms module to 1.32 +- Update amarok module to 1.19 +- Amarok builds on all architectures again +- Add tabs patch + * Tue Oct 10 2006 Micha?? Bentkowski - 0.5.0-0.15.20060915svn - Another fix to not rebuilding kadu-amarok Index: sources =================================================================== RCS file: /cvs/extras/rpms/kadu/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Sep 2006 10:14:41 -0000 1.6 +++ sources 8 Nov 2006 20:12:40 -0000 1.7 @@ -1,18 +1,18 @@ -575746c975382dc7a7d275175449cb21 kadu-20060915.tar.bz2 62913be4ecb267b9bbf6d87dbb3e67e6 kadu-firewall-0.6.3.tar.gz -0fb5d8f465899ffbe96d44685e5e9955 amarok-1.17.tar.gz 9b0622b02a7190502519b2e3034ccec4 dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 15e6ba4e7ec1cacce3290525cd51e696 exec_notify-20060424.tar.bz2 -4a120b52760f1b4093001e043d852d03 ext_info-2.0beta8.tar.bz2 d5e5718f3a64f33874a869b235bbdff7 filedesc-1.12.tar.gz e9d8676608f8c731f665ffc5c5288ad0 filtering-0.3.2-20060727-0.5.0.tar.bz2 6233a8ef21d901fc5fb91c0db40d0e32 kadu-iwait4u-1.3.tar.gz 739e2c76fdae17f570d1f4934958cae6 kadu-profiles-0.1.tar.gz 3f9e347fd775324f4077f2f6849a0de7 led_notify-0.9.tar.bz2 fae1f6bd3d4aca845ef5a57403b5b58c miastoplusa_sms-0.5-1.3.5.tar.gz -7148f9fbf312abd6a142339d453e1d90 powerkadu-20060719.tar.gz 6bf19f183eb4e5ea48e2a27d04da2ead spellchecker-0.18.tar.gz ef56085ab7d8e60be15d86d2c5f4a424 tabs-current.tar.gz 30833253a9f94eedc892767c1267536a weather-3.03.tar.bz2 -422b0bfe2fe1d67620896576e3092ac8 xmms-1.30.tar.gz 270c19fc9fb3e96bcbce76c2077d3ec2 mail-current.tar.gz +11436971c7c45bb4b70f3d6ed569f95c powerkadu-20061026.tar.gz +75e5ebd7d0952e5ac4d10ea87b8f3f60 kadu-0.5.0-rc1.tar.bz2 +69424cd8731b08962073c232c0505cfb ext_info-2.0beta9.tar.bz2 +e4ac1276f5326c5b17ef086ad2448e91 xmms-1.32.tar.gz +139e50cbe9ff2014ca35e9b3b4be1f67 amarok-1.19.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 20:15:48 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Wed, 8 Nov 2006 13:15:48 -0700 Subject: rpms/fonttools/FC-6 fonttools.spec,1.7,1.8 Message-ID: <200611082015.kA8KFmPd029361@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29336 Modified Files: fonttools.spec Log Message: * Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.8.20050624cvs - De-ghost .pyo files Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/FC-6/fonttools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fonttools.spec 8 Nov 2006 19:26:03 -0000 1.7 +++ fonttools.spec 8 Nov 2006 20:15:18 -0000 1.8 @@ -3,7 +3,7 @@ Name: fonttools Version: 2.0 -Release: 0.7.%{alphatag}%{?dist} +Release: 0.8.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools @@ -63,21 +63,24 @@ %dir %{python_sitearch}/FontTools/fontTools/ttLib/tables %{python_sitearch}/FontTools/*.py %{python_sitearch}/FontTools/*.pyc -%ghost %{python_sitearch}/FontTools/*.pyo +%{python_sitearch}/FontTools/*.pyo %{python_sitearch}/FontTools/fontTools/*.py %{python_sitearch}/FontTools/fontTools/*.pyc -%ghost %{python_sitearch}/FontTools/fontTools/*.pyo +%{python_sitearch}/FontTools/fontTools/*.pyo %{python_sitearch}/FontTools/fontTools/*/*.py %{python_sitearch}/FontTools/fontTools/*/*.pyc -%ghost %{python_sitearch}/FontTools/fontTools/*/*.pyo +%{python_sitearch}/FontTools/fontTools/*/*.pyo %{python_sitearch}/FontTools/fontTools/*/*/*.py %{python_sitearch}/FontTools/fontTools/*/*/*.pyc -%ghost %{python_sitearch}/FontTools/fontTools/*/*/*.pyo +%{python_sitearch}/FontTools/fontTools/*/*/*.pyo %{python_sitearch}/FontTools/fontTools/misc/eexecOp.so %{_bindir}/ttx %changelog +* Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.8.20050624cvs +- De-ghost .pyo files + * Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.7.20050624cvs - Rebuild to get into Rawhide From fedora-extras-commits at redhat.com Wed Nov 8 20:22:11 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 8 Nov 2006 13:22:11 -0700 Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.14,1.15 Message-ID: <200611082022.kA8KMB46029428@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29410 Modified Files: Config_Extras.py Log Message: a few useful comps.xml config values Index: Config_Extras.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Config_Extras.py 6 Nov 2006 19:34:19 -0000 1.14 +++ Config_Extras.py 8 Nov 2006 20:22:08 -0000 1.15 @@ -74,6 +74,15 @@ # repository symlinks to remove/create since they confuse createrepo repobuild_linkdict = {} +# comps.xml updating and installation +comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras update' +comps_up_pass2 = 'make' +comps_dangerousfiles = ['Makefile','update-comps','po/Makefile'] +comps_map = { 'development' : 'comps-fe7.xml', + '6' : 'comps-fe6.xml', + '5' : 'comps-fe5.xml', + } + diversion_dict = { 'mugshot' : stagesdir+'/fedora-extras'+'/mugshot', } From fedora-extras-commits at redhat.com Wed Nov 8 20:23:59 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 8 Nov 2006 13:23:59 -0700 Subject: extras-buildsys/utils/pushscript Comps.py,NONE,1.1 Message-ID: <200611082023.kA8KNx2T029456@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29439 Added Files: Comps.py Log Message: add Comps.py module --- NEW FILE Comps.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 errno, os, sys import commands, shutil, tempfile import Utils def _fingerprint(filename): """return MD5 fingerprint of a file""" import md5 m = md5.new() if os.path.isfile(filename): f = open(filename,'r') data = f.read() f.close() m.update(data) return m.hexdigest() class CompsUpdater: def __init__(self,cfg): self.tmpdir = None self.cfg = cfg def _cleanup(self): if self.tmpdir: shutil.rmtree(self.tmpdir) self.tmpdir = None def _backup(self): # Back up some security relevant files of the working-copy. # throws: OSError, IOError self.tmpdir = tempfile.mkdtemp('','.tmp',os.getcwd()) for sourcefile in self.cfg.comps_dangerousfiles: targetfile = os.path.join(self.tmpdir,sourcefile.replace('/','___')) if os.path.exists(sourcefile): shutil.copy2(sourcefile,targetfile) def _restoreBackup(self): # Restore backups. # throws: IOError for f in os.listdir(self.tmpdir): sourcefile = os.path.join(self.tmpdir,f) targetfile = f.replace('___','/') Utils.install_copy(sourcefile,targetfile,True) def Update(self): self.workdir = os.path.join(cfg.rundir,'comps') if not os.path.exists(self.workdir): print 'WARNING: %s missing! Manual setup needed.' % self.workdir return self.olddir= os.getcwd() try: os.chdir(self.workdir) self._backup() if self._update(self.cfg.comps_up_pass1): self._restoreBackup() if self._update(self.cfg.comps_up_pass2): for dist in self.cfg.alldists: self._install(dist) except IOError: os.chdir(self.olddir) self._cleanup() except OSError: os.chdir(self.olddir) self._cleanup() except KeyboardInterrupt: os.chdir(self.olddir) self._cleanup() raise os.chdir(self.olddir) self._cleanup() def _update(self,cmd): # Update working-copy. if cmd: (rc, rv) = commands.getstatusoutput(cmd) print rv if rc: print 'WARNING: comps update failed: %s' % cmd return False return True def _install(self,dist): # If a new comps file for this dist exists, make sure it's # well-formed. Else delete it and return. # throws: IOError, OSError compsnew = self.cfg.comps_map.get(dist,None) if not compsnew or not os.path.exists(compsnew): return compsvalid = 'comps.xml.valid' command = 'xmllint %s --output %s' % (compsnew,compsvalid) (rc, rv) = commands.getstatusoutput(command) if rc: print 'WARNING: malformed %s' % compsnew if os.path.exists(compsnew): os.remove(compsnew) return # Install new comps file only if fingerprint differs. # First repo gets a new copy, further repos a hardlink. oldfingerprint = None newfingerprint = _fingerprint(compsvalid) reporoot = os.path.join(self.cfg.treedir,dist) linkloc = None for arch in self.cfg.archdict[dist]: # list of repo archs compstarget = os.path.join(reporoot,arch,'comps.xml') if not oldfingerprint: oldfingerprint = _fingerprint(compstarget) if os.path.exists(compstarget) and (oldfingerprint == newfingerprint): # This copy of comps.xml is the same, don't overwrite it, # but use it as link source. linkloc = compstarget return print ' Updating %s' % compstarget if os.path.exists(compstarget): os.remove(compstarget) if linkloc: Utils.install_link_or_copy(linkloc,compstarget) else: Utils.install_copy(compsvalid,compstarget) linkloc = compstarget os.remove(compsvalid) def main(cfg): c = CompsUpdater(cfg) c.Update() if __name__ == '__main__': if len(sys.argv) < 2: print 'Usage: %s \n' % os.path.basename(sys.argv[0]) sys.exit(errno.EINVAL) cfg = Utils.load_config_module(sys.argv[1]) Utils.signer_gid_check(cfg.signersgid) os.umask(cfg.signersumask) main(cfg) sys.exit(0) From fedora-extras-commits at redhat.com Wed Nov 8 20:37:08 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Wed, 8 Nov 2006 13:37:08 -0700 Subject: rpms/kadu/devel kadu-0.5.0-tabs_patch.patch, NONE, 1.1 kadu.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200611082037.kA8Kb8pf029576@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/kadu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29534 Modified Files: kadu.spec sources Added Files: kadu-0.5.0-tabs_patch.patch Log Message: * Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.19.rc1 - Update kadu to RC1 - Update ext_info module to 2.0beta9 - Update powerkadu module to 20061026 - Update xmms module to 1.32 - Update amarok module to 1.19 - Amarok builds on all architectures again - Add tabs patch kadu-0.5.0-tabs_patch.patch: --- NEW FILE kadu-0.5.0-tabs_patch.patch --- --- ./modules/tabs/tabs.cpp.tabs_patch 2006-11-08 19:59:47.000000000 +0100 +++ ./modules/tabs/tabs.cpp 2006-11-08 20:01:02.000000000 +0100 @@ -83,7 +83,7 @@ Action* action = new Action( QPixmap(dataPath("kadu/modules/data/tabs/attach.png")), - tr("Attach this chat to tabs"), "tab_attach_action"); + tr("Attach this chat to tabs"), "tab_attach_action", Action::TypeChat); connect(action, SIGNAL(activated(const UserGroup*,const QWidget*,bool)), this, SLOT(onTabAttach(const UserGroup*))); Index: kadu.spec =================================================================== RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kadu.spec 2 Nov 2006 17:49:55 -0000 1.16 +++ kadu.spec 8 Nov 2006 20:36:38 -0000 1.17 @@ -1,32 +1,32 @@ -%define cvs_date 20060915 Name: kadu Version: 0.5.0 -Release: 0.18.%{cvs_date}svn%{?dist} +Release: 0.19.rc1%{?dist} Summary: An Gadu-Gadu client for online messaging Group: Applications/Internet License: GPL URL: http://www.kadu.net -Source0: http://www.kadu.net/download/snapshots/2006/kadu-%{cvs_date}.tar.bz2 +Source0: http://www.kadu.net/download/stable/kadu-0.5.0-rc1.tar.bz2 Source3: kadu.desktop # Sources 100-149 are external modules -Source100: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz -Source101: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.17.tar.gz +Source100: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.32.tar.gz +Source101: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.19.tar.gz Source102: http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz Source103: http://www.kadu.net/download/modules_mirror/mail-current.tar.gz Source104: http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz Source105: http://kadu.net/~blysk/weather-3.03.tar.bz2 -Source106: http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta8.tar.bz2 +Source106: http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta9.tar.bz2 Source107: http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 Source108: http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-1.3.5.tar.gz Source109: http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz Source110: http://kadu.net/~blysk/led_notify-0.9.tar.bz2 Source111: http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz Source112: http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2 -Source113: http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz +Source113: http://www.kadu.net/~patryk/powerkadu/powerkadu-20061026.tar.gz Source114: http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz Source115: http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2 Source116: http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz +Patch0: kadu-0.5.0-tabs_patch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel %define _kadudir %{_datadir}/kadu @@ -237,6 +237,8 @@ %setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules %setup -q -D -T -n kadu +%patch0 -p1 -b tabs_patch + ##==some changes in .config file #1. compile something as shared... # module_mail \ @@ -244,9 +246,7 @@ module_arts_sound \ module_esd_sound \ module_xmms \ -%ifnarch ppc64 x86_64 s390 s390x ia64 ppc module_amarok \ -%endif module_filedesc \ module_spellchecker \ module_weather \ @@ -408,10 +408,8 @@ %mod_files2 xmms -%ifnarch ppc64 x86_64 s390 s390x ia64 ppc %mod_files2 amarok -%endif %mod_files2 filedesc @@ -453,6 +451,15 @@ %{_moddata}/data/weather %changelog +* Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.19.rc1 +- Update kadu to RC1 +- Update ext_info module to 2.0beta9 +- Update powerkadu module to 20061026 +- Update xmms module to 1.32 +- Update amarok module to 1.19 +- Amarok builds on all architectures again +- Add tabs patch + * Thu Nov 02 2006 Micha?? Bentkowski - 0.5.0-0.18.20060915svn - Come back to 20060915 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kadu/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 Nov 2006 17:49:55 -0000 1.8 +++ sources 8 Nov 2006 20:36:38 -0000 1.9 @@ -1,18 +1,19 @@ -575746c975382dc7a7d275175449cb21 kadu-20060915.tar.bz2 62913be4ecb267b9bbf6d87dbb3e67e6 kadu-firewall-0.6.3.tar.gz -0fb5d8f465899ffbe96d44685e5e9955 amarok-1.17.tar.gz 9b0622b02a7190502519b2e3034ccec4 dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 15e6ba4e7ec1cacce3290525cd51e696 exec_notify-20060424.tar.bz2 -4a120b52760f1b4093001e043d852d03 ext_info-2.0beta8.tar.bz2 d5e5718f3a64f33874a869b235bbdff7 filedesc-1.12.tar.gz e9d8676608f8c731f665ffc5c5288ad0 filtering-0.3.2-20060727-0.5.0.tar.bz2 6233a8ef21d901fc5fb91c0db40d0e32 kadu-iwait4u-1.3.tar.gz 739e2c76fdae17f570d1f4934958cae6 kadu-profiles-0.1.tar.gz 3f9e347fd775324f4077f2f6849a0de7 led_notify-0.9.tar.bz2 fae1f6bd3d4aca845ef5a57403b5b58c miastoplusa_sms-0.5-1.3.5.tar.gz -7148f9fbf312abd6a142339d453e1d90 powerkadu-20060719.tar.gz 6bf19f183eb4e5ea48e2a27d04da2ead spellchecker-0.18.tar.gz ef56085ab7d8e60be15d86d2c5f4a424 tabs-current.tar.gz 30833253a9f94eedc892767c1267536a weather-3.03.tar.bz2 -422b0bfe2fe1d67620896576e3092ac8 xmms-1.30.tar.gz 270c19fc9fb3e96bcbce76c2077d3ec2 mail-current.tar.gz +11436971c7c45bb4b70f3d6ed569f95c powerkadu-20061026.tar.gz +75e5ebd7d0952e5ac4d10ea87b8f3f60 kadu-0.5.0-rc1.tar.bz2 +69424cd8731b08962073c232c0505cfb ext_info-2.0beta9.tar.bz2 +e4ac1276f5326c5b17ef086ad2448e91 xmms-1.32.tar.gz +139e50cbe9ff2014ca35e9b3b4be1f67 amarok-1.19.tar.gz + From fedora-extras-commits at redhat.com Wed Nov 8 20:41:15 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 8 Nov 2006 13:41:15 -0700 Subject: fedora-security/audit fe3, 1.27, 1.28 fe4, 1.90, 1.91 fe5, 1.97, 1.98 fe6, 1.10, 1.11 Message-ID: <200611082041.kA8KfFJ8029754@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29730 Modified Files: fe3 fe4 fe5 fe6 Log Message: +CVE-2006-480[6-9] ** (imlib2) #214676 Index: fe3 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe3,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- fe3 2 Nov 2006 19:23:23 -0000 1.27 +++ fe3 8 Nov 2006 20:41:12 -0000 1.28 @@ -7,6 +7,10 @@ CVE-2006-5295 version (clamav, fixed 0.88.5) #210973 CVE-2006-5111 version (libksba, fixed 0.9.14) CVE-2006-4976 ** (php-adodb) #208299 +CVE-2006-4809 ** (imlib2) #214676 +CVE-2006-4808 ** (imlib2) #214676 +CVE-2006-4807 ** (imlib2) #214676 +CVE-2006-4806 ** (imlib2) #214676 CVE-2006-4513 VULNERABLE (wv) #212696 CVE-2006-4513 ** (abiword) #212698 CVE-2006-4248 ignore (thttpd, Debian specific issue) Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- fe4 4 Nov 2006 09:37:43 -0000 1.90 +++ fe4 8 Nov 2006 20:41:12 -0000 1.91 @@ -21,6 +21,10 @@ CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4809 ** (imlib2) #214676 +CVE-2006-4808 ** (imlib2) #214676 +CVE-2006-4807 ** (imlib2) #214676 +CVE-2006-4806 ** (imlib2) #214676 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- fe5 4 Nov 2006 09:37:43 -0000 1.97 +++ fe5 8 Nov 2006 20:41:12 -0000 1.98 @@ -21,6 +21,10 @@ CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4809 ** (imlib2) #214676 +CVE-2006-4808 ** (imlib2) #214676 +CVE-2006-4807 ** (imlib2) #214676 +CVE-2006-4806 ** (imlib2) #214676 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fe6 4 Nov 2006 09:37:43 -0000 1.10 +++ fe6 8 Nov 2006 20:41:12 -0000 1.11 @@ -21,6 +21,10 @@ CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 +CVE-2006-4809 ** (imlib2) #214676 +CVE-2006-4808 ** (imlib2) #214676 +CVE-2006-4807 ** (imlib2) #214676 +CVE-2006-4806 ** (imlib2) #214676 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 From fedora-extras-commits at redhat.com Wed Nov 8 20:44:25 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Wed, 8 Nov 2006 13:44:25 -0700 Subject: rpms/kadu/FC-5 kadu-0.5.0-tabs_patch.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kadu.spec, 1.6, 1.7 sources, 1.6, 1.7 Message-ID: <200611082044.kA8KiPhQ029800@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/kadu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29777 Modified Files: .cvsignore kadu.spec sources Added Files: kadu-0.5.0-tabs_patch.patch Log Message: * Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.10.rc1 - Update kadu to RC1 - Update ext_info module to 2.0beta9 - Update powerkadu module to 20061026 - Update xmms module to 1.32 - Update amarok module to 1.19 - Amarok builds on all architectures again - Add tabs patch kadu-0.5.0-tabs_patch.patch: --- NEW FILE kadu-0.5.0-tabs_patch.patch --- --- ./modules/tabs/tabs.cpp.tabs_patch 2006-11-08 19:59:47.000000000 +0100 +++ ./modules/tabs/tabs.cpp 2006-11-08 20:01:02.000000000 +0100 @@ -83,7 +83,7 @@ Action* action = new Action( QPixmap(dataPath("kadu/modules/data/tabs/attach.png")), - tr("Attach this chat to tabs"), "tab_attach_action"); + tr("Attach this chat to tabs"), "tab_attach_action", Action::TypeChat); connect(action, SIGNAL(activated(const UserGroup*,const QWidget*,bool)), this, SLOT(onTabAttach(const UserGroup*))); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kadu/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Sep 2006 10:20:48 -0000 1.6 +++ .cvsignore 8 Nov 2006 20:43:55 -0000 1.7 @@ -1 +1 @@ -kadu-20060915.tar.bz2 +kadu-20061029.tar.bz2 Index: kadu.spec =================================================================== RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kadu.spec 10 Oct 2006 17:01:31 -0000 1.6 +++ kadu.spec 8 Nov 2006 20:43:55 -0000 1.7 @@ -1,31 +1,31 @@ -%define cvs_date 20060915 Name: kadu Version: 0.5.0 -Release: 0.9.%{cvs_date}svn%{?dist} +Release: 0.10.rc1%{?dist} Summary: An Gadu-Gadu client for online messaging Group: Applications/Internet License: GPL URL: http://www.kadu.net -Source0: http://www.kadu.net/download/snapshots/2006/kadu-%{cvs_date}.tar.bz2 +Source0: http://www.kadu.net/download/stable/kadu-0.5.0-rc1.tar.bz2 Source3: kadu.desktop # Sources 100-149 are external modules -Source100: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz -Source101: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.17.tar.gz +Source100: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.32.tar.gz +Source101: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.19.tar.gz Source102: http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz Source103: http://www.kadu.net/download/modules_mirror/mail-current.tar.gz Source104: http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz Source105: http://kadu.net/~blysk/weather-3.03.tar.bz2 -Source106: http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta8.tar.bz2 +Source106: http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta9.tar.bz2 Source107: http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 Source108: http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-1.3.5.tar.gz Source109: http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz Source110: http://kadu.net/~blysk/led_notify-0.9.tar.bz2 Source111: http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz Source112: http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2 -Source113: http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz +Source113: http://kadu.net/~patryk/powerkadu/powerkadu-20061026.tar.gz Source114: http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz Source115: http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2 Source116: http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz +Patch0: kadu-0.5.0-tabs_patch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel @@ -237,6 +237,8 @@ %setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules %setup -q -D -T -n kadu +%patch0 -p1 -b tabs_patch + ##==some changes in .config file #1. compile something as shared... # module_mail \ @@ -244,9 +246,7 @@ module_arts_sound \ module_esd_sound \ module_xmms \ -%ifnarch ppc64 x86_64 s390 s390x ia64 module_amarok \ -%endif module_filedesc \ module_spellchecker \ module_weather \ @@ -408,10 +408,8 @@ %mod_files2 xmms -%ifnarch ppc64 x86_64 s390 s390x ia64 %mod_files2 amarok -%endif %mod_files2 filedesc @@ -453,6 +451,15 @@ %{_moddata}/data/weather %changelog +* Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.10.rc1 +- Update kadu to RC1 +- Update ext_info module to 2.0beta9 +- Update powerkadu module to 20061026 +- Update xmms module to 1.32 +- Update amarok module to 1.19 +- Amarok builds on all architectures again +- Add tabs patch + * Tue Oct 10 2006 Micha?? Bentkowski - 0.5.0-0.9.20060915svn - Not rebuilding kadu-amarok on some archs Index: sources =================================================================== RCS file: /cvs/extras/rpms/kadu/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Sep 2006 10:20:48 -0000 1.6 +++ sources 8 Nov 2006 20:43:55 -0000 1.7 @@ -1,4 +1,3 @@ -575746c975382dc7a7d275175449cb21 kadu-20060915.tar.bz2 62913be4ecb267b9bbf6d87dbb3e67e6 kadu-firewall-0.6.3.tar.gz 0fb5d8f465899ffbe96d44685e5e9955 amarok-1.17.tar.gz 9b0622b02a7190502519b2e3034ccec4 dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 @@ -16,3 +15,4 @@ 30833253a9f94eedc892767c1267536a weather-3.03.tar.bz2 422b0bfe2fe1d67620896576e3092ac8 xmms-1.30.tar.gz 270c19fc9fb3e96bcbce76c2077d3ec2 mail-current.tar.gz +203d4b6a041f39703a9b5d259a259c38 kadu-20061029.tar.bz2 From fedora-extras-commits at redhat.com Wed Nov 8 20:53:09 2006 From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik)) Date: Wed, 8 Nov 2006 13:53:09 -0700 Subject: rpms/kadu/FC-5 kadu.spec,1.7,1.8 sources,1.7,1.8 Message-ID: <200611082053.kA8Kr9FK029893@cvs-int.fedora.redhat.com> Author: ecik Update of /cvs/extras/rpms/kadu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29875 Modified Files: kadu.spec sources Log Message: * Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.11.rc1 - Fixed sources file Index: kadu.spec =================================================================== RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kadu.spec 8 Nov 2006 20:43:55 -0000 1.7 +++ kadu.spec 8 Nov 2006 20:52:39 -0000 1.8 @@ -1,6 +1,6 @@ Name: kadu Version: 0.5.0 -Release: 0.10.rc1%{?dist} +Release: 0.11.rc1%{?dist} Summary: An Gadu-Gadu client for online messaging Group: Applications/Internet License: GPL @@ -451,6 +451,9 @@ %{_moddata}/data/weather %changelog +* Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.11.rc1 +- Fixed sources file + * Wed Nov 08 2006 Micha?? Bentkowski - 0.5.0-0.10.rc1 - Update kadu to RC1 - Update ext_info module to 2.0beta9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kadu/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 8 Nov 2006 20:43:55 -0000 1.7 +++ sources 8 Nov 2006 20:52:39 -0000 1.8 @@ -1,18 +1,19 @@ 62913be4ecb267b9bbf6d87dbb3e67e6 kadu-firewall-0.6.3.tar.gz -0fb5d8f465899ffbe96d44685e5e9955 amarok-1.17.tar.gz 9b0622b02a7190502519b2e3034ccec4 dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2 15e6ba4e7ec1cacce3290525cd51e696 exec_notify-20060424.tar.bz2 -4a120b52760f1b4093001e043d852d03 ext_info-2.0beta8.tar.bz2 d5e5718f3a64f33874a869b235bbdff7 filedesc-1.12.tar.gz e9d8676608f8c731f665ffc5c5288ad0 filtering-0.3.2-20060727-0.5.0.tar.bz2 6233a8ef21d901fc5fb91c0db40d0e32 kadu-iwait4u-1.3.tar.gz 739e2c76fdae17f570d1f4934958cae6 kadu-profiles-0.1.tar.gz 3f9e347fd775324f4077f2f6849a0de7 led_notify-0.9.tar.bz2 fae1f6bd3d4aca845ef5a57403b5b58c miastoplusa_sms-0.5-1.3.5.tar.gz -7148f9fbf312abd6a142339d453e1d90 powerkadu-20060719.tar.gz 6bf19f183eb4e5ea48e2a27d04da2ead spellchecker-0.18.tar.gz ef56085ab7d8e60be15d86d2c5f4a424 tabs-current.tar.gz 30833253a9f94eedc892767c1267536a weather-3.03.tar.bz2 -422b0bfe2fe1d67620896576e3092ac8 xmms-1.30.tar.gz 270c19fc9fb3e96bcbce76c2077d3ec2 mail-current.tar.gz -203d4b6a041f39703a9b5d259a259c38 kadu-20061029.tar.bz2 +11436971c7c45bb4b70f3d6ed569f95c powerkadu-20061026.tar.gz +75e5ebd7d0952e5ac4d10ea87b8f3f60 kadu-0.5.0-rc1.tar.bz2 +69424cd8731b08962073c232c0505cfb ext_info-2.0beta9.tar.bz2 +e4ac1276f5326c5b17ef086ad2448e91 xmms-1.32.tar.gz +139e50cbe9ff2014ca35e9b3b4be1f67 amarok-1.19.tar.gz + From fedora-extras-commits at redhat.com Wed Nov 8 22:09:34 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 8 Nov 2006 15:09:34 -0700 Subject: rpms/mimedefang/devel .cvsignore, 1.2, 1.3 README.FEDORA, 1.1, 1.2 mimedefang.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611082209.kA8M9YsI003876@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/mimedefang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3854 Modified Files: .cvsignore README.FEDORA mimedefang.spec sources Log Message: Upgrade to 2.58 and fixed quoting in example file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimedefang/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2006 17:19:57 -0000 1.2 +++ .cvsignore 8 Nov 2006 22:09:04 -0000 1.3 @@ -1 +1 @@ -mimedefang-2.57.tar.gz +mimedefang-2.58.tar.gz Index: README.FEDORA =================================================================== RCS file: /cvs/extras/rpms/mimedefang/devel/README.FEDORA,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.FEDORA 16 Sep 2006 17:19:57 -0000 1.1 +++ README.FEDORA 8 Nov 2006 22:09:04 -0000 1.2 @@ -7,7 +7,7 @@ example the following lines to your /etc/mail/sendmail.mc file: define(`MILTER', `1')dnl - define(`confMILTER_LOG_LEVEL', 6)dnl + define(`confMILTER_LOG_LEVEL', `6')dnl INPUT_MAIL_FILTER(`mimedefang', `S=unix:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=S:1m;R:1m;E:5m')dnl Use "service sendmail restart" to rebuild your /etc/mail/sendmail.cf file, run Index: mimedefang.spec =================================================================== RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimedefang.spec 3 Oct 2006 19:23:37 -0000 1.2 +++ mimedefang.spec 8 Nov 2006 22:09:04 -0000 1.3 @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.57 -Release: 5%{?dist} +Version: 2.58 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -86,6 +86,9 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Nov 08 2006 Robert Scheck 2.58-1 +- Upgrade to 2.58 (#212657) + * Tue Oct 03 2006 Robert Scheck 2.57-5 - Rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimedefang/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2006 17:19:57 -0000 1.2 +++ sources 8 Nov 2006 22:09:04 -0000 1.3 @@ -1 +1 @@ -e55b22dda54c4a3b52e1fbeb9135b0cf mimedefang-2.57.tar.gz +6424dd840f1a8251181bffb042e01961 mimedefang-2.58.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 22:10:55 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 8 Nov 2006 15:10:55 -0700 Subject: rpms/mimedefang/FC-6 .cvsignore, 1.2, 1.3 README.FEDORA, 1.1, 1.2 mimedefang.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611082210.kA8MAtKS003919@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/mimedefang/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3891 Modified Files: .cvsignore README.FEDORA mimedefang.spec sources Log Message: Upgrade to 2.58 and fixed quoting in example file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2006 17:19:57 -0000 1.2 +++ .cvsignore 8 Nov 2006 22:10:24 -0000 1.3 @@ -1 +1 @@ -mimedefang-2.57.tar.gz +mimedefang-2.58.tar.gz Index: README.FEDORA =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-6/README.FEDORA,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.FEDORA 16 Sep 2006 17:19:57 -0000 1.1 +++ README.FEDORA 8 Nov 2006 22:10:24 -0000 1.2 @@ -7,7 +7,7 @@ example the following lines to your /etc/mail/sendmail.mc file: define(`MILTER', `1')dnl - define(`confMILTER_LOG_LEVEL', 6)dnl + define(`confMILTER_LOG_LEVEL', `6')dnl INPUT_MAIL_FILTER(`mimedefang', `S=unix:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=S:1m;R:1m;E:5m')dnl Use "service sendmail restart" to rebuild your /etc/mail/sendmail.cf file, run Index: mimedefang.spec =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-6/mimedefang.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimedefang.spec 3 Oct 2006 19:23:37 -0000 1.2 +++ mimedefang.spec 8 Nov 2006 22:10:24 -0000 1.3 @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.57 -Release: 5%{?dist} +Version: 2.58 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -86,6 +86,9 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Nov 08 2006 Robert Scheck 2.58-1 +- Upgrade to 2.58 (#212657) + * Tue Oct 03 2006 Robert Scheck 2.57-5 - Rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2006 17:19:57 -0000 1.2 +++ sources 8 Nov 2006 22:10:24 -0000 1.3 @@ -1 +1 @@ -e55b22dda54c4a3b52e1fbeb9135b0cf mimedefang-2.57.tar.gz +6424dd840f1a8251181bffb042e01961 mimedefang-2.58.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 22:11:53 2006 From: fedora-extras-commits at redhat.com (Robert Scheck (robert)) Date: Wed, 8 Nov 2006 15:11:53 -0700 Subject: rpms/mimedefang/FC-5 .cvsignore, 1.2, 1.3 README.FEDORA, 1.1, 1.2 mimedefang.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611082211.kA8MBr9O003952@cvs-int.fedora.redhat.com> Author: robert Update of /cvs/extras/rpms/mimedefang/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3930 Modified Files: .cvsignore README.FEDORA mimedefang.spec sources Log Message: Upgrade to 2.58 and fixed quoting in example file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Sep 2006 17:19:57 -0000 1.2 +++ .cvsignore 8 Nov 2006 22:11:22 -0000 1.3 @@ -1 +1 @@ -mimedefang-2.57.tar.gz +mimedefang-2.58.tar.gz Index: README.FEDORA =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-5/README.FEDORA,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.FEDORA 16 Sep 2006 17:19:57 -0000 1.1 +++ README.FEDORA 8 Nov 2006 22:11:22 -0000 1.2 @@ -7,7 +7,7 @@ example the following lines to your /etc/mail/sendmail.mc file: define(`MILTER', `1')dnl - define(`confMILTER_LOG_LEVEL', 6)dnl + define(`confMILTER_LOG_LEVEL', `6')dnl INPUT_MAIL_FILTER(`mimedefang', `S=unix:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=S:1m;R:1m;E:5m')dnl Use "service sendmail restart" to rebuild your /etc/mail/sendmail.cf file, run Index: mimedefang.spec =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-5/mimedefang.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimedefang.spec 3 Oct 2006 19:24:15 -0000 1.2 +++ mimedefang.spec 8 Nov 2006 22:11:22 -0000 1.3 @@ -1,7 +1,7 @@ Summary: E-Mail filtering framework using Sendmail's Milter interface Name: mimedefang -Version: 2.57 -Release: 5%{?dist} +Version: 2.58 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.mimedefang.org/ @@ -86,6 +86,9 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %changelog +* Wed Nov 08 2006 Robert Scheck 2.58-1 +- Upgrade to 2.58 (#212657) + * Tue Oct 03 2006 Robert Scheck 2.57-5 - Rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimedefang/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Sep 2006 17:19:57 -0000 1.2 +++ sources 8 Nov 2006 22:11:22 -0000 1.3 @@ -1 +1 @@ -e55b22dda54c4a3b52e1fbeb9135b0cf mimedefang-2.57.tar.gz +6424dd840f1a8251181bffb042e01961 mimedefang-2.58.tar.gz From fedora-extras-commits at redhat.com Wed Nov 8 22:19:01 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Wed, 8 Nov 2006 15:19:01 -0700 Subject: owners owners.list,1.1906,1.1907 Message-ID: <200611082219.kA8MJ1xg004219@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4194 Modified Files: owners.list Log Message: Taking over spicctrl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1906 retrieving revision 1.1907 diff -u -r1.1906 -r1.1907 --- owners.list 8 Nov 2006 20:09:25 -0000 1.1906 +++ owners.list 8 Nov 2006 22:18:31 -0000 1.1907 @@ -2130,7 +2130,7 @@ Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org| Fedora Extras|sparse|A semantic parser of source files|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| -Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|sqlite|An embeddable SQL engine in a C library|imlinux at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net From fedora-extras-commits at redhat.com Wed Nov 8 23:38:41 2006 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 8 Nov 2006 16:38:41 -0700 Subject: rpms/bugzilla/FC-5 bugzilla-bz212355-fixvuln.patch, NONE, 1.1 bugzilla.spec, 1.2, 1.3 Message-ID: <200611082338.kA8NcfDV007862@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/bugzilla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7843 Modified Files: bugzilla.spec Added Files: bugzilla-bz212355-fixvuln.patch Log Message: Fixes for bz # 212355 - multiple vulnerabilities bugzilla-bz212355-fixvuln.patch: --- NEW FILE bugzilla-bz212355-fixvuln.patch --- diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/attachment.cgi bugzilla-2.22.1/attachment.cgi --- bugzilla-2.22/attachment.cgi 2006-04-09 11:28:49.000000000 -0700 +++ bugzilla-2.22.1/attachment.cgi 2006-10-14 14:07:19.000000000 -0700 @@ -130,6 +130,7 @@ sub validateID { my $param = @_ ? $_[0] : 'id'; + my $user = Bugzilla->user; # If we're not doing interdiffs, check if id wasn't specified and # prompt them with a page that allows them to choose an attachment. @@ -151,18 +152,18 @@ || ThrowUserError("invalid_attach_id", { attach_id => $cgi->param($param) }); # Make sure the attachment exists in the database. - SendSQL("SELECT bug_id, isprivate FROM attachments WHERE attach_id = $attach_id"); + SendSQL("SELECT bug_id, isprivate, submitter_id + FROM attachments WHERE attach_id = $attach_id"); MoreSQLData() || ThrowUserError("invalid_attach_id", { attach_id => $attach_id }); # Make sure the user is authorized to access this attachment's bug. - (my $bugid, my $isprivate) = FetchSQLData(); + my ($bugid, $isprivate, $submitter_id) = FetchSQLData(); ValidateBugID($bugid); - if ($isprivate && Param("insidergroup")) { - UserInGroup(Param("insidergroup")) - || ThrowUserError("auth_failure", {action => "access", - object => "attachment"}); + if ($isprivate && $user->id != $submitter_id && !$user->is_insider) { + ThrowUserError("auth_failure", {action => "access", + object => "attachment"}); } return ($attach_id,$bugid); @@ -199,17 +200,23 @@ sub validateCanEdit { my ($attach_id) = (@_); + my $user = Bugzilla->user; - # People in editbugs can edit all attachments - return if UserInGroup("editbugs"); + my $attachment = Bugzilla::Attachment->get($attach_id); # Bug 97729 - the submitter can edit their attachments - SendSQL("SELECT attach_id FROM attachments WHERE " . - "attach_id = $attach_id AND submitter_id = " . Bugzilla->user->id); + return if ($attachment->attacher->id == $user->id); - FetchSQLData() - || ThrowUserError("illegal_attachment_edit", - { attach_id => $attach_id }); + # Only people in the insider group can view private attachments. + if ($attachment->isprivate && !$user->is_insider) { + ThrowUserError('illegal_attachment_edit', {attach_id => $attachment->id}); + } + + # People in editbugs can edit all attachments + return if UserInGroup("editbugs"); + + # If we come here, then this attachment cannot be seen by the user. + ThrowUserError('illegal_attachment_edit', { attach_id => $attachment->id }); } sub validateCanChangeAttachment @@ -393,7 +400,8 @@ my @obsolete_ids = (); # Make sure the attachment id is valid and the user has permissions to view - # the bug to which it is attached. + # the bug to which it is attached. Make sure also that the user can view + # the attachment itself. foreach my $attachid ($cgi->param('obsolete')) { my $vars = {}; $vars->{'attach_id'} = $attachid; @@ -410,6 +418,9 @@ my ($bugid, $isobsolete, $description) = FetchSQLData(); + # Check that the user can modify this attachment + validateCanEdit($attachid); + $vars->{'description'} = $description; if ($bugid != $cgi->param('bugid')) @@ -424,8 +435,6 @@ ThrowCodeError("attachment_already_obsolete", $vars); } - # Check that the user can modify this attachment - validateCanEdit($attachid); push(@obsolete_ids, $attachid); } @@ -759,28 +768,35 @@ } else { - $vars->{other_patches} = []; + my @other_patches = (); if ($::interdiffbin && $::diffpath) { - # Get list of attachments on this bug. + # Get the list of attachments that the user can view in this bug. + my @attachments = @{Bugzilla::Attachment->get_attachments_by_bug($bugid)}; + # Extract patches only. + @attachments = grep {$_->ispatch == 1} @attachments; + # We want them sorted from newer to older. + @attachments = sort { $b->id <=> $a->id } @attachments; + # Ignore the current patch, but select the one right before it # chronologically. - SendSQL("SELECT attach_id, description FROM attachments WHERE bug_id = $bugid AND ispatch = 1 ORDER BY creation_ts DESC"); my $select_next_patch = 0; - while (my ($other_id, $other_desc) = FetchSQLData()) { - if ($other_id eq $attach_id) { - $select_next_patch = 1; - } else { - push @{$vars->{other_patches}}, { id => $other_id, desc => $other_desc, selected => $select_next_patch }; - if ($select_next_patch) { - $select_next_patch = 0; + foreach my $attach (@attachments) { + if ($attach->id == $attach_id) { + $select_next_patch = 1; + } + else { + push(@other_patches, { 'id' => $attach->id, + 'desc' => $attach->description, + 'selected' => $select_next_patch }); + $select_next_patch = 0; } - } } } $vars->{bugid} = $bugid; $vars->{attachid} = $attach_id; $vars->{description} = $description; + $vars->{other_patches} = \@other_patches; setup_template_patch_reader($last_reader, $format, $context); # Actually print out the patch $reader->iterate_string("Attachment $attach_id", $thedata); @@ -795,37 +811,10 @@ my $bugid = $cgi->param('bugid'); ValidateBugID($bugid); - # Retrieve the attachments from the database and write them into an array - # of hashes where each hash represents one attachment. - my $privacy = ""; - my $dbh = Bugzilla->dbh; - - if (Param("insidergroup") && !(UserInGroup(Param("insidergroup")))) { - $privacy = "AND isprivate < 1 "; + my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bugid); + foreach my $a (@$attachments) { + $a->{'isviewable'} = isViewable($a->contenttype); } - SendSQL("SELECT attach_id, " . - $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ", - mimetype, description, ispatch, isobsolete, isprivate, - LENGTH(thedata) - FROM attachments - INNER JOIN attach_data - ON attach_id = id - WHERE bug_id = $bugid $privacy - ORDER BY attach_id"); - my @attachments; # the attachments array - while (MoreSQLData()) - { - my %a; # the attachment hash - ($a{'attachid'}, $a{'date'}, $a{'contenttype'}, - $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'}, - $a{'datasize'}) = FetchSQLData(); - $a{'isviewable'} = isViewable($a{'contenttype'}); - $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'}, - 'is_active' => 1 }); - - # Add the hash representing the attachment to the array of attachments. - push @attachments, \%a; - } # Retrieve the bug summary (for displaying on screen) and assignee. SendSQL("SELECT short_desc, assigned_to FROM bugs " . @@ -834,7 +823,7 @@ # Define the variables and functions that will be passed to the UI template. $vars->{'bugid'} = $bugid; - $vars->{'attachments'} = \@attachments; + $vars->{'attachments'} = $attachments; $vars->{'bugassignee_id'} = $assignee_id; $vars->{'bugsummary'} = $bugsummary; $vars->{'GetBugLink'} = \&GetBugLink; @@ -922,8 +911,9 @@ validateIsPatch(); validateDescription(); - if (($attachurl =~ /^(http|https|ftp):\/\/\S+/) - && !(defined $cgi->upload('data'))) { [...12227 lines suppressed...] %] @@ -52,7 +52,7 @@ [% keyword.name FILTER html %] - [% keyword.description %] + [% keyword.description FILTER html_light %] [% IF keyword.bugcount > 0 %] diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/request/email.txt.tmpl bugzilla-2.22.1/template/en/default/request/email.txt.tmpl --- bugzilla-2.22/template/en/default/request/email.txt.tmpl 2005-12-29 16:32:37.000000000 -0800 +++ bugzilla-2.22.1/template/en/default/request/email.txt.tmpl 2006-07-05 19:20:08.000000000 -0700 @@ -61,7 +61,7 @@ [%- FILTER bullet = wrap(80) %] [% USE Bugzilla %] -[% IF Bugzilla.cgi.param("comment").length > 0 %] +[% IF Bugzilla.cgi.param("comment") && Bugzilla.cgi.param("comment").length > 0 %] ------- Additional Comments from [% user.identity %] [%+ Bugzilla.cgi.param("comment") %] [% END %] diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl --- bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl 2004-12-10 16:27:45.000000000 -0800 +++ bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl 2006-06-07 14:34:35.000000000 -0700 @@ -46,7 +46,7 @@

- Advanced Searching Using Boolean Charts: + Advanced Searching Using Boolean Charts:

diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl --- bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl 2005-04-11 15:34:50.000000000 -0700 +++ bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl 2006-05-22 17:22:29.000000000 -0700 @@ -33,7 +33,7 @@ [% PROCESS global/header.html.tmpl title = "Create New Data Set" - onload = "selectProduct(document.forms['chartform']);" + onload = "doOnSelectProduct(0);" javascript = js_data javascript_urls = [ "js/productform.js" ] %] diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/whine/schedule.html.tmpl bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl --- bugzilla-2.22/template/en/default/whine/schedule.html.tmpl 2005-09-12 07:03:01.000000000 -0700 +++ bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl 2006-10-14 15:05:59.000000000 -0700 @@ -82,6 +82,7 @@ + [% FOREACH event = events %] diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/testserver.pl bugzilla-2.22.1/testserver.pl --- bugzilla-2.22/testserver.pl 2006-01-05 03:07:01.000000000 -0800 +++ bugzilla-2.22.1/testserver.pl 2006-07-24 23:21:07.000000000 -0700 @@ -14,7 +14,7 @@ # Contributor(s): Joel Peshkin # Byron Jones -# testserver.pl is involked with the baseurl of the Bugzilla installation +# testserver.pl is invoked with the baseurl of the Bugzilla installation # as its only argument. It attempts to troubleshoot as many installation # issues as possible. @@ -194,6 +194,14 @@ print "TEST-FAILED Chart returned: $@\n"; } } + + eval 'use Template::Plugin::GD::Image'; + if ($@) { + print "TEST-FAILED Template::Plugin::GD is not installed.\n"; + } + else { + print "TEST-OK Template::Plugin::GD is installed.\n"; + } } sub fetch { diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/token.cgi bugzilla-2.22.1/token.cgi --- bugzilla-2.22/token.cgi 2005-10-24 16:11:55.000000000 -0700 +++ bugzilla-2.22.1/token.cgi 2006-09-22 16:25:51.000000000 -0700 @@ -67,9 +67,8 @@ $::token = $cgi->param('t'); # Make sure the token contains only valid characters in the right amount. - # Validate password will throw an error if token is invalid + # ValidatePassword will throw an error if token is invalid ValidatePassword($::token); - trick_taint($::token); # Only used in placeholders Bugzilla::Token::CleanTokenTable(); @@ -98,9 +97,11 @@ # If the user is requesting a password change, make sure they submitted # their login name and it exists in the database, and that the DB module is in -# the list of allowed verification methids. +# the list of allowed verification methods. +my $login_name; if ( $::action eq 'reqpw' ) { - defined $cgi->param('loginname') + $login_name = $cgi->param('loginname'); + defined $login_name || ThrowUserError("login_needed_for_password_change"); # check verification methods @@ -108,27 +109,25 @@ ThrowUserError("password_change_requests_not_allowed"); } - # Make sure the login name looks like an email address. - validate_email_syntax($cgi->param('loginname')) - || ThrowUserError('illegal_email_address', - {addr => $cgi->param('loginname')}); + validate_email_syntax($login_name) + || ThrowUserError('illegal_email_address', {addr => $login_name}); - my $loginname = $cgi->param('loginname'); - trick_taint($loginname); # Used only in a placeholder my ($user_id) = $dbh->selectrow_array('SELECT userid FROM profiles WHERE ' . $dbh->sql_istrcmp('login_name', '?'), - undef, $loginname); + undef, $login_name); $user_id || ThrowUserError("account_inexistent"); } # If the user is changing their password, make sure they submitted a new # password and that the new password is valid. +my $password; if ( $::action eq 'chgpw' ) { - defined $cgi->param('password') + $password = $cgi->param('password'); + defined $password && defined $cgi->param('matchpassword') || ThrowUserError("require_new_password"); - ValidatePassword($cgi->param('password'), $cgi->param('matchpassword')); + ValidatePassword($password, $cgi->param('matchpassword')); } ################################################################################ @@ -140,13 +139,13 @@ # that variable and runs the appropriate code. if ($::action eq 'reqpw') { - requestChangePassword(); + requestChangePassword($login_name); } elsif ($::action eq 'cfmpw') { confirmChangePassword(); } elsif ($::action eq 'cxlpw') { cancelChangePassword(); } elsif ($::action eq 'chgpw') { - changePassword(); + changePassword($password); } elsif ($::action eq 'cfmem') { confirmChangeEmail(); } elsif ($::action eq 'cxlem') { @@ -167,7 +166,8 @@ ################################################################################ sub requestChangePassword { - Bugzilla::Token::IssuePasswordToken($cgi->param('loginname')); + my ($login_name) = @_; + Bugzilla::Token::IssuePasswordToken($login_name); $vars->{'message'} = "password_change_request"; @@ -194,11 +194,11 @@ } sub changePassword { + my ($password) = @_; my $dbh = Bugzilla->dbh; # Create a crypted version of the new password - my $cryptedpassword = bz_crypt($cgi->param('password')); - trick_taint($cryptedpassword); # Used only in a placeholder + my $cryptedpassword = bz_crypt($password); # Get the user's ID from the tokens table. my ($userid) = $dbh->selectrow_array('SELECT userid FROM tokens diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/votes.cgi bugzilla-2.22.1/votes.cgi --- bugzilla-2.22/votes.cgi 2005-10-24 16:11:55.000000000 -0700 +++ bugzilla-2.22.1/votes.cgi 2006-10-13 06:01:57.000000000 -0700 @@ -358,7 +358,8 @@ $dbh->bz_unlock_tables(); $vars->{'type'} = "votes"; - $vars->{'mailrecipients'} = { 'changer' => $who }; + $vars->{'mailrecipients'} = { 'changer' => Bugzilla->user->login }; + $vars->{'title_tag'} = 'change_votes'; foreach my $bug_id (@updated_bugs) { $vars->{'id'} = $bug_id; Index: bugzilla.spec =================================================================== RCS file: /cvs/extras/rpms/bugzilla/FC-5/bugzilla.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bugzilla.spec 27 Jun 2006 12:55:03 -0000 1.2 +++ bugzilla.spec 8 Nov 2006 23:38:10 -0000 1.3 @@ -6,13 +6,14 @@ Name: bugzilla Version: 2.22 Group: Applications/Publishing -Release: 6%{?dist} +Release: 7%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Patch0: bugzilla-data-dir.patch Patch1: bugzilla-config-path.patch +Patch2: bugzilla-bz212355-fixvuln.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: smtpdaemon, webserver, graphviz, patchutils @@ -40,6 +41,7 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Filter unwanted Requires: cat << \EOF > %{name}-req @@ -125,6 +127,9 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Nov 8 2006 John Berninger - 2.22-7 +- Fix for BZ 212355 vulnerabilities + * Tue Jun 26 2006 John Berninger - 2.22-6 - Clean up BugzillaEmail requires (filter it out) From fedora-extras-commits at redhat.com Thu Nov 9 00:26:25 2006 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 8 Nov 2006 17:26:25 -0700 Subject: rpms/bugzilla/FC-6 bugzilla-bz212355-fixvuln.patch, NONE, 1.1 bugzilla.spec, 1.2, 1.3 Message-ID: <200611090026.kA90QPtD011195@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/bugzilla/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11175 Modified Files: bugzilla.spec Added Files: bugzilla-bz212355-fixvuln.patch Log Message: Fix for bz 212355 - multiple vulns bugzilla-bz212355-fixvuln.patch: --- NEW FILE bugzilla-bz212355-fixvuln.patch --- diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/attachment.cgi bugzilla-2.22.1/attachment.cgi --- bugzilla-2.22/attachment.cgi 2006-04-09 11:28:49.000000000 -0700 +++ bugzilla-2.22.1/attachment.cgi 2006-10-14 14:07:19.000000000 -0700 @@ -130,6 +130,7 @@ sub validateID { my $param = @_ ? $_[0] : 'id'; + my $user = Bugzilla->user; # If we're not doing interdiffs, check if id wasn't specified and # prompt them with a page that allows them to choose an attachment. @@ -151,18 +152,18 @@ || ThrowUserError("invalid_attach_id", { attach_id => $cgi->param($param) }); # Make sure the attachment exists in the database. - SendSQL("SELECT bug_id, isprivate FROM attachments WHERE attach_id = $attach_id"); + SendSQL("SELECT bug_id, isprivate, submitter_id + FROM attachments WHERE attach_id = $attach_id"); MoreSQLData() || ThrowUserError("invalid_attach_id", { attach_id => $attach_id }); # Make sure the user is authorized to access this attachment's bug. - (my $bugid, my $isprivate) = FetchSQLData(); + my ($bugid, $isprivate, $submitter_id) = FetchSQLData(); ValidateBugID($bugid); - if ($isprivate && Param("insidergroup")) { - UserInGroup(Param("insidergroup")) - || ThrowUserError("auth_failure", {action => "access", - object => "attachment"}); + if ($isprivate && $user->id != $submitter_id && !$user->is_insider) { + ThrowUserError("auth_failure", {action => "access", + object => "attachment"}); } return ($attach_id,$bugid); @@ -199,17 +200,23 @@ sub validateCanEdit { my ($attach_id) = (@_); + my $user = Bugzilla->user; - # People in editbugs can edit all attachments - return if UserInGroup("editbugs"); + my $attachment = Bugzilla::Attachment->get($attach_id); # Bug 97729 - the submitter can edit their attachments - SendSQL("SELECT attach_id FROM attachments WHERE " . - "attach_id = $attach_id AND submitter_id = " . Bugzilla->user->id); + return if ($attachment->attacher->id == $user->id); - FetchSQLData() - || ThrowUserError("illegal_attachment_edit", - { attach_id => $attach_id }); + # Only people in the insider group can view private attachments. + if ($attachment->isprivate && !$user->is_insider) { + ThrowUserError('illegal_attachment_edit', {attach_id => $attachment->id}); + } + + # People in editbugs can edit all attachments + return if UserInGroup("editbugs"); + + # If we come here, then this attachment cannot be seen by the user. + ThrowUserError('illegal_attachment_edit', { attach_id => $attachment->id }); } sub validateCanChangeAttachment @@ -393,7 +400,8 @@ my @obsolete_ids = (); # Make sure the attachment id is valid and the user has permissions to view - # the bug to which it is attached. + # the bug to which it is attached. Make sure also that the user can view + # the attachment itself. foreach my $attachid ($cgi->param('obsolete')) { my $vars = {}; $vars->{'attach_id'} = $attachid; @@ -410,6 +418,9 @@ my ($bugid, $isobsolete, $description) = FetchSQLData(); + # Check that the user can modify this attachment + validateCanEdit($attachid); + $vars->{'description'} = $description; if ($bugid != $cgi->param('bugid')) @@ -424,8 +435,6 @@ ThrowCodeError("attachment_already_obsolete", $vars); } - # Check that the user can modify this attachment - validateCanEdit($attachid); push(@obsolete_ids, $attachid); } @@ -759,28 +768,35 @@ } else { - $vars->{other_patches} = []; + my @other_patches = (); if ($::interdiffbin && $::diffpath) { - # Get list of attachments on this bug. + # Get the list of attachments that the user can view in this bug. + my @attachments = @{Bugzilla::Attachment->get_attachments_by_bug($bugid)}; + # Extract patches only. + @attachments = grep {$_->ispatch == 1} @attachments; + # We want them sorted from newer to older. + @attachments = sort { $b->id <=> $a->id } @attachments; + # Ignore the current patch, but select the one right before it # chronologically. - SendSQL("SELECT attach_id, description FROM attachments WHERE bug_id = $bugid AND ispatch = 1 ORDER BY creation_ts DESC"); my $select_next_patch = 0; - while (my ($other_id, $other_desc) = FetchSQLData()) { - if ($other_id eq $attach_id) { - $select_next_patch = 1; - } else { - push @{$vars->{other_patches}}, { id => $other_id, desc => $other_desc, selected => $select_next_patch }; - if ($select_next_patch) { - $select_next_patch = 0; + foreach my $attach (@attachments) { + if ($attach->id == $attach_id) { + $select_next_patch = 1; + } + else { + push(@other_patches, { 'id' => $attach->id, + 'desc' => $attach->description, + 'selected' => $select_next_patch }); + $select_next_patch = 0; } - } } } $vars->{bugid} = $bugid; $vars->{attachid} = $attach_id; $vars->{description} = $description; + $vars->{other_patches} = \@other_patches; setup_template_patch_reader($last_reader, $format, $context); # Actually print out the patch $reader->iterate_string("Attachment $attach_id", $thedata); @@ -795,37 +811,10 @@ my $bugid = $cgi->param('bugid'); ValidateBugID($bugid); - # Retrieve the attachments from the database and write them into an array - # of hashes where each hash represents one attachment. - my $privacy = ""; - my $dbh = Bugzilla->dbh; - - if (Param("insidergroup") && !(UserInGroup(Param("insidergroup")))) { - $privacy = "AND isprivate < 1 "; + my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bugid); + foreach my $a (@$attachments) { + $a->{'isviewable'} = isViewable($a->contenttype); } - SendSQL("SELECT attach_id, " . - $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ", - mimetype, description, ispatch, isobsolete, isprivate, - LENGTH(thedata) - FROM attachments - INNER JOIN attach_data - ON attach_id = id - WHERE bug_id = $bugid $privacy - ORDER BY attach_id"); - my @attachments; # the attachments array - while (MoreSQLData()) - { - my %a; # the attachment hash - ($a{'attachid'}, $a{'date'}, $a{'contenttype'}, - $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'}, - $a{'datasize'}) = FetchSQLData(); - $a{'isviewable'} = isViewable($a{'contenttype'}); - $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'}, - 'is_active' => 1 }); - - # Add the hash representing the attachment to the array of attachments. - push @attachments, \%a; - } # Retrieve the bug summary (for displaying on screen) and assignee. SendSQL("SELECT short_desc, assigned_to FROM bugs " . @@ -834,7 +823,7 @@ # Define the variables and functions that will be passed to the UI template. $vars->{'bugid'} = $bugid; - $vars->{'attachments'} = \@attachments; + $vars->{'attachments'} = $attachments; $vars->{'bugassignee_id'} = $assignee_id; $vars->{'bugsummary'} = $bugsummary; $vars->{'GetBugLink'} = \&GetBugLink; @@ -922,8 +911,9 @@ validateIsPatch(); validateDescription(); - if (($attachurl =~ /^(http|https|ftp):\/\/\S+/) - && !(defined $cgi->upload('data'))) { [...12227 lines suppressed...] %] @@ -52,7 +52,7 @@ [% keyword.name FILTER html %] - [% keyword.description %] + [% keyword.description FILTER html_light %] [% IF keyword.bugcount > 0 %] diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/request/email.txt.tmpl bugzilla-2.22.1/template/en/default/request/email.txt.tmpl --- bugzilla-2.22/template/en/default/request/email.txt.tmpl 2005-12-29 16:32:37.000000000 -0800 +++ bugzilla-2.22.1/template/en/default/request/email.txt.tmpl 2006-07-05 19:20:08.000000000 -0700 @@ -61,7 +61,7 @@ [%- FILTER bullet = wrap(80) %] [% USE Bugzilla %] -[% IF Bugzilla.cgi.param("comment").length > 0 %] +[% IF Bugzilla.cgi.param("comment") && Bugzilla.cgi.param("comment").length > 0 %] ------- Additional Comments from [% user.identity %] [%+ Bugzilla.cgi.param("comment") %] [% END %] diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl --- bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl 2004-12-10 16:27:45.000000000 -0800 +++ bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl 2006-06-07 14:34:35.000000000 -0700 @@ -46,7 +46,7 @@

- Advanced Searching Using Boolean Charts: + Advanced Searching Using Boolean Charts:

diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl --- bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl 2005-04-11 15:34:50.000000000 -0700 +++ bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl 2006-05-22 17:22:29.000000000 -0700 @@ -33,7 +33,7 @@ [% PROCESS global/header.html.tmpl title = "Create New Data Set" - onload = "selectProduct(document.forms['chartform']);" + onload = "doOnSelectProduct(0);" javascript = js_data javascript_urls = [ "js/productform.js" ] %] diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/whine/schedule.html.tmpl bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl --- bugzilla-2.22/template/en/default/whine/schedule.html.tmpl 2005-09-12 07:03:01.000000000 -0700 +++ bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl 2006-10-14 15:05:59.000000000 -0700 @@ -82,6 +82,7 @@ + [% FOREACH event = events %] diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/testserver.pl bugzilla-2.22.1/testserver.pl --- bugzilla-2.22/testserver.pl 2006-01-05 03:07:01.000000000 -0800 +++ bugzilla-2.22.1/testserver.pl 2006-07-24 23:21:07.000000000 -0700 @@ -14,7 +14,7 @@ # Contributor(s): Joel Peshkin # Byron Jones -# testserver.pl is involked with the baseurl of the Bugzilla installation +# testserver.pl is invoked with the baseurl of the Bugzilla installation # as its only argument. It attempts to troubleshoot as many installation # issues as possible. @@ -194,6 +194,14 @@ print "TEST-FAILED Chart returned: $@\n"; } } + + eval 'use Template::Plugin::GD::Image'; + if ($@) { + print "TEST-FAILED Template::Plugin::GD is not installed.\n"; + } + else { + print "TEST-OK Template::Plugin::GD is installed.\n"; + } } sub fetch { diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/token.cgi bugzilla-2.22.1/token.cgi --- bugzilla-2.22/token.cgi 2005-10-24 16:11:55.000000000 -0700 +++ bugzilla-2.22.1/token.cgi 2006-09-22 16:25:51.000000000 -0700 @@ -67,9 +67,8 @@ $::token = $cgi->param('t'); # Make sure the token contains only valid characters in the right amount. - # Validate password will throw an error if token is invalid + # ValidatePassword will throw an error if token is invalid ValidatePassword($::token); - trick_taint($::token); # Only used in placeholders Bugzilla::Token::CleanTokenTable(); @@ -98,9 +97,11 @@ # If the user is requesting a password change, make sure they submitted # their login name and it exists in the database, and that the DB module is in -# the list of allowed verification methids. +# the list of allowed verification methods. +my $login_name; if ( $::action eq 'reqpw' ) { - defined $cgi->param('loginname') + $login_name = $cgi->param('loginname'); + defined $login_name || ThrowUserError("login_needed_for_password_change"); # check verification methods @@ -108,27 +109,25 @@ ThrowUserError("password_change_requests_not_allowed"); } - # Make sure the login name looks like an email address. - validate_email_syntax($cgi->param('loginname')) - || ThrowUserError('illegal_email_address', - {addr => $cgi->param('loginname')}); + validate_email_syntax($login_name) + || ThrowUserError('illegal_email_address', {addr => $login_name}); - my $loginname = $cgi->param('loginname'); - trick_taint($loginname); # Used only in a placeholder my ($user_id) = $dbh->selectrow_array('SELECT userid FROM profiles WHERE ' . $dbh->sql_istrcmp('login_name', '?'), - undef, $loginname); + undef, $login_name); $user_id || ThrowUserError("account_inexistent"); } # If the user is changing their password, make sure they submitted a new # password and that the new password is valid. +my $password; if ( $::action eq 'chgpw' ) { - defined $cgi->param('password') + $password = $cgi->param('password'); + defined $password && defined $cgi->param('matchpassword') || ThrowUserError("require_new_password"); - ValidatePassword($cgi->param('password'), $cgi->param('matchpassword')); + ValidatePassword($password, $cgi->param('matchpassword')); } ################################################################################ @@ -140,13 +139,13 @@ # that variable and runs the appropriate code. if ($::action eq 'reqpw') { - requestChangePassword(); + requestChangePassword($login_name); } elsif ($::action eq 'cfmpw') { confirmChangePassword(); } elsif ($::action eq 'cxlpw') { cancelChangePassword(); } elsif ($::action eq 'chgpw') { - changePassword(); + changePassword($password); } elsif ($::action eq 'cfmem') { confirmChangeEmail(); } elsif ($::action eq 'cxlem') { @@ -167,7 +166,8 @@ ################################################################################ sub requestChangePassword { - Bugzilla::Token::IssuePasswordToken($cgi->param('loginname')); + my ($login_name) = @_; + Bugzilla::Token::IssuePasswordToken($login_name); $vars->{'message'} = "password_change_request"; @@ -194,11 +194,11 @@ } sub changePassword { + my ($password) = @_; my $dbh = Bugzilla->dbh; # Create a crypted version of the new password - my $cryptedpassword = bz_crypt($cgi->param('password')); - trick_taint($cryptedpassword); # Used only in a placeholder + my $cryptedpassword = bz_crypt($password); # Get the user's ID from the tokens table. my ($userid) = $dbh->selectrow_array('SELECT userid FROM tokens diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/votes.cgi bugzilla-2.22.1/votes.cgi --- bugzilla-2.22/votes.cgi 2005-10-24 16:11:55.000000000 -0700 +++ bugzilla-2.22.1/votes.cgi 2006-10-13 06:01:57.000000000 -0700 @@ -358,7 +358,8 @@ $dbh->bz_unlock_tables(); $vars->{'type'} = "votes"; - $vars->{'mailrecipients'} = { 'changer' => $who }; + $vars->{'mailrecipients'} = { 'changer' => Bugzilla->user->login }; + $vars->{'title_tag'} = 'change_votes'; foreach my $bug_id (@updated_bugs) { $vars->{'id'} = $bug_id; Index: bugzilla.spec =================================================================== RCS file: /cvs/extras/rpms/bugzilla/FC-6/bugzilla.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bugzilla.spec 27 Jun 2006 12:56:19 -0000 1.2 +++ bugzilla.spec 9 Nov 2006 00:25:54 -0000 1.3 @@ -6,13 +6,14 @@ Name: bugzilla Version: 2.22 Group: Applications/Publishing -Release: 6%{?dist} +Release: 7%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf Source2: README.fedora.bugzilla Patch0: bugzilla-data-dir.patch Patch1: bugzilla-config-path.patch +Patch2: bugzilla-bz212355-fixvuln.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: smtpdaemon, webserver, graphviz, patchutils @@ -40,6 +41,7 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Filter unwanted Requires: cat << \EOF > %{name}-req @@ -125,6 +127,9 @@ %{bzinstallprefix}/bugzilla/contrib %changelog +* Wed Nov 8 2006 John Berninger - 2.22-7 +- Fixes for bz # 212355 + * Tue Jun 26 2006 John Berninger - 2.22-6 - Clean up BugzillaEmail requires (filter it out) From fedora-extras-commits at redhat.com Thu Nov 9 00:43:58 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 8 Nov 2006 17:43:58 -0700 Subject: owners owners.list,1.1907,1.1908 Message-ID: <200611090043.kA90hw9k011269@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11253 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1907 retrieving revision 1.1908 diff -u -r1.1907 -r1.1908 --- owners.list 8 Nov 2006 22:18:31 -0000 1.1907 +++ owners.list 9 Nov 2006 00:43:28 -0000 1.1908 @@ -770,6 +770,7 @@ Fedora Extras|kbackup|Back up your data in a simple, user friendly way|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org| Fedora Extras|kchmviewer|CHM viewer|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|kcometen3|OpenGL Screensaver for KDE|packages at amiga-hardware.com|extras-qa at fedoraproject.org| Fedora Extras|kdeartwork-extras|Artwork Extras, including xscreensaver-based screensavers|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kdegraphics-extras|Extras for KDE graphics applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kdemultimedia-extras|Extras for KDE multimedia applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Nov 9 00:47:18 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 8 Nov 2006 17:47:18 -0700 Subject: rpms/kcometen3 - New directory Message-ID: <200611090047.kA90lImM011331@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kcometen3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11327/kcometen3 Log Message: Directory /cvs/extras/rpms/kcometen3 added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 00:47:24 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 8 Nov 2006 17:47:24 -0700 Subject: rpms/kcometen3/devel - New directory Message-ID: <200611090047.kA90lO3g011345@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kcometen3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11327/kcometen3/devel Log Message: Directory /cvs/extras/rpms/kcometen3/devel added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 00:47:43 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 8 Nov 2006 17:47:43 -0700 Subject: rpms/kcometen3 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611090047.kA90lhmY011379@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kcometen3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11373 Added Files: Makefile import.log Log Message: Setup of module kcometen3 --- NEW FILE Makefile --- # Top level Makefile for module kcometen3 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 Nov 9 00:47:49 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 8 Nov 2006 17:47:49 -0700 Subject: rpms/kcometen3/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611090047.kA90lnSi011396@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kcometen3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11373/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kcometen3 --- 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 Nov 9 00:48:55 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 8 Nov 2006 17:48:55 -0700 Subject: rpms/kcometen3 import.log,1.1,1.2 Message-ID: <200611090048.kA90mtxF011477@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kcometen3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445 Modified Files: import.log Log Message: auto-import kcometen3-1.1-4 on branch devel from kcometen3-1.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kcometen3/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Nov 2006 00:47:43 -0000 1.1 +++ import.log 9 Nov 2006 00:48:25 -0000 1.2 @@ -0,0 +1 @@ +kcometen3-1_1-4:HEAD:kcometen3-1.1-4.src.rpm:1163038622 From fedora-extras-commits at redhat.com Thu Nov 9 00:48:56 2006 From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks)) Date: Wed, 8 Nov 2006 17:48:56 -0700 Subject: rpms/kcometen3/devel kcometen3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611090049.kA90muiZ011481@cvs-int.fedora.redhat.com> Author: oddsocks Update of /cvs/extras/rpms/kcometen3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445/devel Modified Files: .cvsignore sources Added Files: kcometen3.spec Log Message: auto-import kcometen3-1.1-4 on branch devel from kcometen3-1.1-4.src.rpm --- NEW FILE kcometen3.spec --- Name: kcometen3 Version: 1.1 Release: 4%{?dist} Summary: An OpenGL screensaver for KDE Group: Amusements/Graphics License: GPL URL: http://user.cs.tu-berlin.de/~pmueller/ Source0: http://user.cs.tu-berlin.de/~pmueller/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: kdelibs-devel BuildRequires: libGLU-devel BuildRequires: libpng-devel BuildRequires: libICE-devel Requires: xscreensaver-base %description An OpenGL screensaver for KDE. %prep %setup -q # Permission cleanups for debug rpm chmod -x src/*.h src/*.cpp %build %configure --disable-rpath make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/kcometen3.kss %{_datadir}/applnk/System/ScreenSavers/kcometen3.desktop %{_datadir}/apps/kcometen3 %doc AUTHORS COPYING %changelog * Thu Nov 09 2006 Ian Chapman 1.1-4%{?dist} - Removed a few BRs which are imported by other BRs anyway * Mon Nov 06 2006 Ian Chapman 1.1-3%{?dist} - Potential migration to FE * Sat Jun 03 2006 Ian Chapman 1.1-2%{?dist} - Changed URL and source URL not to use a mirror - Replaced xorg-x11-devel buildrequire with libGLU-devel for compatibility with both modular and non modular X * Tue May 02 2006 Ian Chapman 1.1-1.iss - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kcometen3/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Nov 2006 00:47:48 -0000 1.1 +++ .cvsignore 9 Nov 2006 00:48:26 -0000 1.2 @@ -0,0 +1 @@ +kcometen3-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/kcometen3/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Nov 2006 00:47:48 -0000 1.1 +++ sources 9 Nov 2006 00:48:26 -0000 1.2 @@ -0,0 +1 @@ +36f846b6a3e5f71c4532070b1f17b717 kcometen3-1.1.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 00:57:11 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 8 Nov 2006 17:57:11 -0700 Subject: extras-buildsys/utils/pushscript Comps.py, 1.1, 1.2 Push.py, 1.13, 1.14 Message-ID: <200611090057.kA90vBVZ011582@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11562 Modified Files: Comps.py Push.py Log Message: enable Comps.py module in push process Index: Comps.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Comps.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Comps.py 8 Nov 2006 20:23:57 -0000 1.1 +++ Comps.py 9 Nov 2006 00:57:08 -0000 1.2 @@ -66,7 +66,7 @@ def Update(self): - self.workdir = os.path.join(cfg.rundir,'comps') + self.workdir = os.path.join(self.cfg.rundir,'comps') if not os.path.exists(self.workdir): print 'WARNING: %s missing! Manual setup needed.' % self.workdir return @@ -80,16 +80,14 @@ if self._update(self.cfg.comps_up_pass2): for dist in self.cfg.alldists: self._install(dist) + # TODO: Error-handling and reporting. We don't want these to + # be fatal. except IOError: - os.chdir(self.olddir) - self._cleanup() + pass except OSError: - os.chdir(self.olddir) - self._cleanup() + pass except KeyboardInterrupt: - os.chdir(self.olddir) - self._cleanup() - raise + pass os.chdir(self.olddir) self._cleanup() Index: Push.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Push.py 1 Nov 2006 11:37:09 -0000 1.13 +++ Push.py 9 Nov 2006 00:57:08 -0000 1.14 @@ -24,7 +24,7 @@ import tempfile import time -import Utils, MultiLib +import Utils, MultiLib, Comps import RepoBuild, RepoPrune, RepoView DEBUG = False @@ -638,6 +638,10 @@ if opts.force: changed = diststopush + print 'Processing comps.xml updates (Ctrl+C to skip)' + sys.stdout.flush() + Comps.main(cfg) + for dist in changed: if cfg.opts.repoprune: RepoPrune.main(cfg,dist) From fedora-extras-commits at redhat.com Thu Nov 9 01:25:37 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 8 Nov 2006 18:25:37 -0700 Subject: rpms/csound/FC-6 .cvsignore, 1.3, 1.4 csound.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200611090125.kA91PbmA014808@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/csound/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14784 Modified Files: .cvsignore csound.spec sources Log Message: * Wed Nov 8 2006 Dan Williams 5.03.0-9 - CVS snapshot for fixes to the virtual midi keyboard Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/csound/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Nov 2006 16:56:17 -0000 1.3 +++ .cvsignore 9 Nov 2006 01:25:07 -0000 1.4 @@ -1,3 +1,4 @@ Csound5.03_manual.tgz Csound5.03_src.tgz Csound5.03.0_src-cvs20061101.tar.bz2 +Csound5.03.0_src-cvs20061108.tar.bz2 Index: csound.spec =================================================================== RCS file: /cvs/extras/rpms/csound/FC-6/csound.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csound.spec 1 Nov 2006 16:56:17 -0000 1.4 +++ csound.spec 9 Nov 2006 01:25:07 -0000 1.5 @@ -11,7 +11,7 @@ Summary: Csound - sound synthesis language and library Name: csound Version: 5.03.0 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://csound.sourceforge.net/ License: LGPL Group: Applications/Multimedia @@ -28,7 +28,7 @@ BuildRequires: tk-devel tcl-devel BuildRequires: tetex tetex-latex libxslt -Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2 +Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061108.tar.bz2 # NOTE: # Manual sources aren't distributed, but may be extracted from CVS via... @@ -402,6 +402,9 @@ %doc tutorial/*.py %changelog +* Wed Nov 8 2006 Dan Williams 5.03.0-9 +- CVS snapshot for fixes to the virtual midi keyboard + * Wed Nov 1 2006 Dan Williams 5.03.0-8 - CVS snapshot to pick up virtual Midi keyboard - Make the default for OPCODEDIR be where the plugins are actually installed Index: sources =================================================================== RCS file: /cvs/extras/rpms/csound/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Nov 2006 16:56:17 -0000 1.4 +++ sources 9 Nov 2006 01:25:07 -0000 1.5 @@ -1,2 +1,2 @@ acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz -5211f0c1fb54484c29de996e09ca6e3c Csound5.03.0_src-cvs20061101.tar.bz2 +9e26eac5de2de842cabfbb759ed83fe4 Csound5.03.0_src-cvs20061108.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 9 01:28:30 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 8 Nov 2006 18:28:30 -0700 Subject: rpms/csound/devel .cvsignore, 1.5, 1.6 csound.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200611090128.kA91SUNL014910@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/csound/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14878 Modified Files: .cvsignore csound.spec sources Log Message: * Wed Nov 8 2006 Dan Williams 5.03.0-9 - CVS snapshot for fixes to the virtual midi keyboard Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Nov 2006 17:12:36 -0000 1.5 +++ .cvsignore 9 Nov 2006 01:28:00 -0000 1.6 @@ -1,3 +1,4 @@ Csound5.03_manual.tgz Csound5.03_src.tgz Csound5.03.0_src-cvs20061101.tar.bz2 +Csound5.03.0_src-cvs20061108.tar.bz2 Index: csound.spec =================================================================== RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- csound.spec 1 Nov 2006 17:12:36 -0000 1.6 +++ csound.spec 9 Nov 2006 01:28:00 -0000 1.7 @@ -11,7 +11,7 @@ Summary: Csound - sound synthesis language and library Name: csound Version: 5.03.0 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://csound.sourceforge.net/ License: LGPL Group: Applications/Multimedia @@ -28,7 +28,7 @@ BuildRequires: tk-devel tcl-devel BuildRequires: tetex tetex-latex libxslt -Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2 +Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061108.tar.bz2 # NOTE: # Manual sources aren't distributed, but may be extracted from CVS via... @@ -402,6 +402,9 @@ %doc tutorial/*.py %changelog +* Wed Nov 8 2006 Dan Williams 5.03.0-9 +- CVS snapshot for fixes to the virtual midi keyboard + * Wed Nov 1 2006 Dan Williams 5.03.0-8 - CVS snapshot to pick up virtual Midi keyboard - Make the default for OPCODEDIR be where the plugins are actually installed Index: sources =================================================================== RCS file: /cvs/extras/rpms/csound/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Nov 2006 17:12:36 -0000 1.5 +++ sources 9 Nov 2006 01:28:00 -0000 1.6 @@ -1,2 +1,2 @@ acebd377b0ca008d082657ef0270a949 Csound5.03_manual.tgz -5211f0c1fb54484c29de996e09ca6e3c Csound5.03.0_src-cvs20061101.tar.bz2 +9e26eac5de2de842cabfbb759ed83fe4 Csound5.03.0_src-cvs20061108.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 9 02:14:25 2006 From: fedora-extras-commits at redhat.com (John Berninger (jwb)) Date: Wed, 8 Nov 2006 19:14:25 -0700 Subject: rpms/bugzilla/devel .cvsignore, 1.2, 1.3 bugzilla.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611090214.kA92EPRW018235@cvs-int.fedora.redhat.com> Author: jwb Update of /cvs/extras/rpms/bugzilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18207 Modified Files: .cvsignore bugzilla.spec sources Log Message: Update to 2.22.1 to resolve bz 212355 - multiple vulns Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bugzilla/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jun 2006 17:53:13 -0000 1.2 +++ .cvsignore 9 Nov 2006 02:13:55 -0000 1.3 @@ -1 +1 @@ -bugzilla-2.22.tar.gz +bugzilla-2.22.1.tar.gz Index: bugzilla.spec =================================================================== RCS file: /cvs/extras/rpms/bugzilla/devel/bugzilla.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bugzilla.spec 27 Jun 2006 12:56:19 -0000 1.2 +++ bugzilla.spec 9 Nov 2006 02:13:55 -0000 1.3 @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 2.22 +Version: 2.22.1 Group: Applications/Publishing -Release: 6%{?dist} +Release: 1%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -125,7 +125,7 @@ %{bzinstallprefix}/bugzilla/contrib %changelog -* Tue Jun 26 2006 John Berninger - 2.22-6 +* Tue Jun 26 2006 John Berninger - 2.22.1-1 - Clean up BugzillaEmail requires (filter it out) * Mon Jun 26 2006 John Berninger - 2.22-5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bugzilla/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jun 2006 17:53:13 -0000 1.2 +++ sources 9 Nov 2006 02:13:55 -0000 1.3 @@ -1 +1 @@ -bbf2f1ec5607978d39855df104231973 bugzilla-2.22.tar.gz +d52e2818441f3c2a5caeddf6c40b9f00 bugzilla-2.22.1.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 02:44:50 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 8 Nov 2006 19:44:50 -0700 Subject: rpms/taskjuggler/FC-5 sources,1.2,1.3 taskjuggler.spec,1.1,1.2 Message-ID: <200611090244.kA92ioQK018445@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/taskjuggler/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18427 Modified Files: sources taskjuggler.spec Log Message: update to 2.3.0 (#212950) Index: sources =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Jun 2006 06:38:51 -0000 1.2 +++ sources 9 Nov 2006 02:44:20 -0000 1.3 @@ -1 +1 @@ -0f7a0301a6e1ec82378bbf4e2539af66 taskjuggler-2.2.0.tar.bz2 +c45b95507caf96ba39b7f40065c9f34b taskjuggler-2.3.0.tar.bz2 Index: taskjuggler.spec =================================================================== RCS file: /cvs/extras/rpms/taskjuggler/FC-5/taskjuggler.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- taskjuggler.spec 21 Jun 2006 06:38:51 -0000 1.1 +++ taskjuggler.spec 9 Nov 2006 02:44:20 -0000 1.2 @@ -1,5 +1,5 @@ Name: taskjuggler -Version: 2.2.0 +Version: 2.3.0 Release: 1%{?dist} Summary: Project management tool @@ -93,6 +93,9 @@ %changelog +* Thu Nov 9 2006 Jens Petersen - 2.3.0-1 +- update to 2.3.0 + * Mon May 8 2006 Jens Petersen - 2.2.0-1 - packaging fixes from John Mahowald (#166470) From fedora-extras-commits at redhat.com Thu Nov 9 02:51:15 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 8 Nov 2006 19:51:15 -0700 Subject: rpms/haddock/FC-6 haddock.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200611090251.kA92pFRX018544@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18516 Modified Files: haddock.spec sources Log Message: sync with devel: - update to 0.8 - use new cabal build system - update file list - buildrequire autoconf Index: haddock.spec =================================================================== RCS file: /cvs/extras/rpms/haddock/FC-6/haddock.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- haddock.spec 28 Sep 2006 01:26:09 -0000 1.4 +++ haddock.spec 9 Nov 2006 02:50:45 -0000 1.5 @@ -1,6 +1,6 @@ Name: haddock -Version: 0.7 -Release: 4%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Haddock documentation tool for annotated Haskell source code Group: Development/Tools @@ -9,7 +9,7 @@ Source0: http://www.haskell.org/haddock/%{name}-%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc libxslt docbook-style-xsl +BuildRequires: ghc libxslt docbook-style-xsl autoconf # need chcon PreReq: coreutils @@ -32,24 +32,17 @@ %build -./configure --prefix=%{_prefix} --libdir=%{_libdir} -make %{?_smp_mflags} -(cd haddock/doc ; make html ) +runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir} +runhaskell Setup.lhs build +cd doc +test -f configure || autoreconf +./configure +make html %install rm -rf ${RPM_BUILD_ROOT} -%makeinstall - -# move datafiles into their expected location -mkdir ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version} -find ${RPM_BUILD_ROOT}%{_datadir} -type f | xargs mv --target-directory=${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version} - -sed -i -e "s!%{_libdir}/%{name}-%{version}!%{_libexecdir}!" ${RPM_BUILD_ROOT}%{_bindir}/%{name}-%{version} - -# drop versioned binary wrapper -rm ${RPM_BUILD_ROOT}%{_bindir}/%{name} -mv ${RPM_BUILD_ROOT}%{_bindir}/%{name}{-%{version},} +runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT} %clean @@ -62,14 +55,19 @@ %files %defattr(-,root,root) -%doc haddock/README -%doc haddock/doc/haddock +%doc README +%doc doc/haddock/* %{_bindir}/haddock -%{_libexecdir}/haddock.bin %{_datadir}/haddock-%{version} %changelog +* Fri Nov 3 2006 Jens Petersen - 0.8-1 +- update to 0.8 +- use new cabal build system +- update file list +- buildrequire autoconf + * Thu Sep 28 2006 Jens Petersen - 0.7-4 - rebuild for FC6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/haddock/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 Sep 2005 03:00:15 -0000 1.2 +++ sources 9 Nov 2006 02:50:45 -0000 1.3 @@ -1 +1 @@ -759419e78416d5f093190968a4dc18f5 haddock-0.7-src.tar.gz +0a1bb64e7642f64d2560dc258c570c1d haddock-0.8-src.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 03:31:27 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 8 Nov 2006 20:31:27 -0700 Subject: rpms/ghc/FC-6 .cvsignore, 1.6, 1.7 ghc.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200611090331.kA93VRBN021898@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21846 Modified Files: .cvsignore ghc.spec sources Log Message: sync with devel: - update to 6.6 release - buildrequire haddock >= 0.8 - fix summary of ghcver package (Michel Salim, #209574) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Apr 2006 07:59:27 -0000 1.6 +++ .cvsignore 9 Nov 2006 03:30:56 -0000 1.7 @@ -1 +1,2 @@ -ghc-6.4.2-src.tar.bz2 +ghc-6.6-src.tar.bz2 +ghc-6.6-src-extralibs.tar.bz2 Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-6/ghc.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ghc.spec 28 Sep 2006 01:44:23 -0000 1.16 +++ ghc.spec 9 Nov 2006 03:30:56 -0000 1.17 @@ -1,16 +1,17 @@ -%define ghcver ghc642 +%define ghcver ghc66 # speed up test builds by not building profiled libraries %define build_prof 1 %define build_doc 1 Name: ghc -Version: 6.4.2 -Release: 4%{?dist} +Version: 6.6 +Release: 1%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages -Source: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2 +Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2 +Source1: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2 URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,7 +21,7 @@ Buildrequires: freeglut-devel, openal-devel %if %{build_doc} # haddock generates docs in libraries -Buildrequires: libxslt, docbook-style-xsl, haddock +Buildrequires: libxslt, docbook-style-xsl, haddock >= 0.8 %endif Prefix: %{_prefix} @@ -35,7 +36,7 @@ interface. %package -n %{ghcver} -Summary: Documentation for GHC +Summary: Glasgow Haskell Compilation system Group: Development/Languages Requires: gcc gmp-devel readline-devel @@ -79,7 +80,7 @@ %define __spec_install_post /usr/lib/rpm/brp-compress %prep -%setup -q -n ghc-%{version} +%setup -q -n ghc-%{version} -b1 %build %if !%{build_prof} @@ -154,7 +155,7 @@ %files -n %{ghcver} -f rpm-base-filelist %defattr(-,root,root,-) -%doc ghc/ANNOUNCE ghc/LICENSE ghc/README +%doc ANNOUNCE HACKING LICENSE README %{_bindir}/ghc*%{version} %config(noreplace) %{_libdir}/ghc-%{version}/package.conf %ghost %{_libdir}/ghc-%{version}/package.conf.old @@ -174,6 +175,11 @@ %changelog +* Thu Nov 9 2006 Jens Petersen - 6.6-1 +- update to 6.6 release +- buildrequire haddock >= 0.8 +- fix summary of ghcver package (Michel Salim, #209574) + * Thu Sep 28 2006 Jens Petersen - 6.4.2-4 - turn on docs generation again Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Sep 2006 12:34:59 -0000 1.8 +++ sources 9 Nov 2006 03:30:56 -0000 1.9 @@ -1 +1,2 @@ -a394bf14e94c3bca5507d568fcc03375 ghc-6.4.2-src.tar.bz2 +2427a8d7d14f86e0878df6b54938acf7 ghc-6.6-src.tar.bz2 +14b22fce36caffa509046361724bc119 ghc-6.6-src-extralibs.tar.bz2 From fedora-extras-commits at redhat.com Thu Nov 9 04:20:20 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 8 Nov 2006 21:20:20 -0700 Subject: rpms/sword/devel sword.spec, 1.11, 1.12 ar_EG-cp1256.conf, 1.1, NONE ar_EG-utf8.conf, 1.1, NONE Message-ID: <200611090420.kA94KK9J025193@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/sword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25156/devel Modified Files: sword.spec Removed Files: ar_EG-cp1256.conf ar_EG-utf8.conf Log Message: auto-import sword-1.5.9-1 on branch devel from sword-1.5.9-1.src.rpm Index: sword.spec =================================================================== RCS file: /cvs/extras/rpms/sword/devel/sword.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sword.spec 4 Oct 2006 22:36:34 -0000 1.11 +++ sword.spec 9 Nov 2006 04:19:49 -0000 1.12 @@ -1,21 +1,19 @@ Name: sword -Version: 1.5.8 -Release: 10%{?dist} +Version: 1.5.9 +Release: 1%{?dist} Summary: Free Bible Software Project Group: System Environment/Libraries License: GPL URL: http://www.crosswire.org/sword/ Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz -Source1: ar_EG-cp1256.conf -Source2: ar_EG-utf8.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sed >= 3.95 BuildRequires: openssl-devel BuildRequires: curl-devel BuildRequires: zlib-devel BuildRequires: libidn-devel +BuildRequires: libicu-devel icu %description The SWORD Project is the CrossWire Bible Society's free Bible software @@ -40,13 +38,9 @@ %prep %setup -q -%{__sed} -i 's?\r??' include/ftptrans.h -%{__sed} -i 's?\r??' include/ftplibftpt.h -%{__sed} -i 's?\r??' include/curlftpt.h - %build -%configure --disable-static +%configure --disable-static --with-icu make #%%{?_smp_mflags} sometimes causes build failure @@ -55,8 +49,6 @@ rm -rf %buildroot make install DESTDIR=%buildroot %__mkdir_p %buildroot%_datadir/sword/modules -install -p -m644 %{SOURCE1} %buildroot%_datadir/sword/locales.d/ -install -p -m644 %{SOURCE2} %buildroot%_datadir/sword/locales.d/ find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';' @@ -75,7 +67,7 @@ %doc samples doc %config(noreplace) %_sysconfdir/sword.conf %_bindir/* -%dir %_libdir/sword +%_libdir/sword/ %_libdir/libsword-%{version}.so %_datadir/sword @@ -88,8 +80,9 @@ %changelog -* Thu Oct 05 2006 Christian Iseli 1.5.8-10 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +* Wed Nov 08 2006 Deji Akingunola - 1.5.9-1 +- New release +- Build with icu support * Wed Sep 20 2006 Deji Akingunola - 1.5.8-9 - Take over from Michael A. Peters --- ar_EG-cp1256.conf DELETED --- --- ar_EG-utf8.conf DELETED --- From fedora-extras-commits at redhat.com Thu Nov 9 04:20:19 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 8 Nov 2006 21:20:19 -0700 Subject: rpms/sword import.log,1.2,1.3 Message-ID: <200611090420.kA94KJDD025190@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/sword In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25156 Modified Files: import.log Log Message: auto-import sword-1.5.9-1 on branch devel from sword-1.5.9-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/sword/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 7 Jun 2005 11:54:45 -0000 1.2 +++ import.log 9 Nov 2006 04:19:48 -0000 1.3 @@ -1 +1,2 @@ sword-1_5_8-1:HEAD:sword-1.5.8-1.src.rpm:1118145261 +sword-1_5_9-1:HEAD:sword-1.5.9-1.src.rpm:1163045983 From fedora-extras-commits at redhat.com Thu Nov 9 04:24:27 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 8 Nov 2006 21:24:27 -0700 Subject: rpms/gnomesword import.log,1.5,1.6 Message-ID: <200611090424.kA94ORfr025342@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310 Modified Files: import.log Log Message: auto-import gnomesword-2.1.8-1 on branch devel from gnomesword-2.1.8-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnomesword/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 15 Sep 2005 23:33:47 -0000 1.5 +++ import.log 9 Nov 2006 04:23:57 -0000 1.6 @@ -2,3 +2,4 @@ gnomesword-2_1_2-2_2:FC-4:gnomesword-2.1.2-2.2.src.rpm:1126783889 gnomesword-2_1_2-2_2:HEAD:gnomesword-2.1.2-2.2.src.rpm:1126784329 gnomesword-2_1_2-2_3_fc4:FC-3:gnomesword-2.1.2-2.3.fc4.src.rpm:1126827156 +gnomesword-2_1_8-1:HEAD:gnomesword-2.1.8-1.src.rpm:1163046233 From fedora-extras-commits at redhat.com Thu Nov 9 04:24:28 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 8 Nov 2006 21:24:28 -0700 Subject: rpms/gnomesword/devel .cvsignore, 1.4, 1.5 gnomesword.spec, 1.13, 1.14 sources, 1.5, 1.6 gnomesword-2.1.6-svn1213-kjvot.patch, 1.1, NONE Message-ID: <200611090424.kA94OSfp025347@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310/devel Modified Files: .cvsignore gnomesword.spec sources Removed Files: gnomesword-2.1.6-svn1213-kjvot.patch Log Message: auto-import gnomesword-2.1.8-1 on branch devel from gnomesword-2.1.8-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 25 Apr 2006 07:41:35 -0000 1.4 +++ .cvsignore 9 Nov 2006 04:23:58 -0000 1.5 @@ -1,3 +1 @@ -gnomesword-2.1.2.tar.gz -gnomesword-2.1.3.tar.gz -gnomesword-2.1.6.tar.gz +gnomesword-2.1.8.tar.gz Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnomesword.spec 4 Oct 2006 22:36:09 -0000 1.13 +++ gnomesword.spec 9 Nov 2006 04:23:58 -0000 1.14 @@ -1,17 +1,16 @@ Name: gnomesword -Version: 2.1.6 -Release: 5%{?dist} +Version: 2.1.8 +Release: 1%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text License: GPL URL: http://gnomesword.sourceforge.net/ Source0: http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz -Patch0: gnomesword-2.1.6-svn1213-kjvot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sed >= 3.95 -BuildRequires: sword-devel >= 1.5.8 +BuildRequires: sword-devel >= 1.5.9 BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gnome-spell @@ -34,7 +33,6 @@ %prep %setup -q -%patch0 -p1 %{__sed} -i 's?\r??' doc/help/C/legal.xml %{__sed} -i 's?\r??' doc/help/fr/legal.xml @@ -83,8 +81,8 @@ %changelog -* Thu Oct 05 2006 Christian Iseli 2.1.6-5 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 +* Wed Nov 08 2006 Deji Akingunola - 2.1.8-1 +- Update to new (unstable) version * Wed Sep 20 2006 Deji Akingunola - 2.1.6-4 - Add perl(XML::Parser) to the BRs Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Apr 2006 07:41:35 -0000 1.5 +++ sources 9 Nov 2006 04:23:58 -0000 1.6 @@ -1,2 +1 @@ -61191b987a1cfb502841f331bad8d8cd gnomesword-2.1.5.tar.gz -7ef05c560c594c3bc84beeb78a611efe gnomesword-2.1.6.tar.gz +fd648e8690e1c96b8f94b249eeb09b03 gnomesword-2.1.8.tar.gz --- gnomesword-2.1.6-svn1213-kjvot.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 9 05:12:51 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 8 Nov 2006 22:12:51 -0700 Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6 gnome-theme-clearlooks-bigpack.spec, 1.6, 1.7 Message-ID: <200611090512.kA95Cpo9028560@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/FC-6 Modified Files: gnome-theme-clearlooks-bigpack.spec Log Message: Spec fixes; explicitly require gtk2-engines >= 2.8 since we're doing cairo-enabled goodness Index: gnome-theme-clearlooks-bigpack.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:37:25 -0000 1.6 +++ gnome-theme-clearlooks-bigpack.spec 9 Nov 2006 05:12:20 -0000 1.7 @@ -45,14 +45,15 @@ %changelog -* Sat Nov 04 2006 Peter Gordon +* Sat Nov 04 2006 Peter Gordon - 0.6-4 - Explicitly depend on gtk2-engines >= 2.8, since we're doing Cairo-enabled goodness +- Add bug# to previous %%changelog entry. * Sat Nov 04 2006 Peter Gordon - 0.6-3 - Fix homepage URL - A bunch of aesthetic cleanups to the spec -- Add Cairo-enabled themes +- Add Cairo-enabled themes (resolves bug #214030) * Wed Oct 11 2006 Peter Gordon 0.6-2 - Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel) From fedora-extras-commits at redhat.com Thu Nov 9 05:12:52 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 8 Nov 2006 22:12:52 -0700 Subject: rpms/gnome-theme-clearlooks-bigpack/devel gnome-theme-clearlooks-bigpack.spec, 1.6, 1.7 Message-ID: <200611090512.kA95CqlA028563@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/devel Modified Files: gnome-theme-clearlooks-bigpack.spec Log Message: Spec fixes; explicitly require gtk2-engines >= 2.8 since we're doing cairo-enabled goodness Index: gnome-theme-clearlooks-bigpack.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnome-theme-clearlooks-bigpack.spec 4 Nov 2006 22:37:26 -0000 1.6 +++ gnome-theme-clearlooks-bigpack.spec 9 Nov 2006 05:12:21 -0000 1.7 @@ -1,6 +1,6 @@ Name: gnome-theme-clearlooks-bigpack Version: 0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Additional Clearlooks color schemes Group: User Interface/Desktops @@ -45,14 +45,15 @@ %changelog -* Sat Nov 04 2006 Peter Gordon +* Sat Nov 04 2006 Peter Gordon - 0.6-4 - Explicitly depend on gtk2-engines >= 2.8, since we're doing Cairo-enabled goodness +- Add bug# to previous %%changelog entry. * Sat Nov 04 2006 Peter Gordon - 0.6-3 - Fix homepage URL - A bunch of aesthetic cleanups to the spec -- Add Cairo-enabled themes +- Add Cairo-enabled themes (resolves bug #214030) * Wed Oct 11 2006 Peter Gordon - 0.6-2 - Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel) From fedora-extras-commits at redhat.com Thu Nov 9 05:16:16 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 8 Nov 2006 22:16:16 -0700 Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6 gnome-theme-clearlooks-bigpack.spec, 1.7, 1.8 Message-ID: <200611090516.kA95GG1m028596@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28579/FC-6 Modified Files: gnome-theme-clearlooks-bigpack.spec Log Message: Actually bump EVR properly for FC-6 branch... Index: gnome-theme-clearlooks-bigpack.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnome-theme-clearlooks-bigpack.spec 9 Nov 2006 05:12:20 -0000 1.7 +++ gnome-theme-clearlooks-bigpack.spec 9 Nov 2006 05:15:45 -0000 1.8 @@ -1,6 +1,6 @@ Name: gnome-theme-clearlooks-bigpack Version: 0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Additional Clearlooks color schemes Group: User Interface/Desktops From fedora-extras-commits at redhat.com Thu Nov 9 06:31:59 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 8 Nov 2006 23:31:59 -0700 Subject: rpms/gnomesword/devel gnomesword.spec,1.14,1.15 Message-ID: <200611090631.kA96Vx4m032026@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32010 Modified Files: gnomesword.spec Log Message: * Thu Nov 09 2006 Deji Akingunola - 2.1.8-2 - Fix Build requires Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnomesword.spec 9 Nov 2006 04:23:58 -0000 1.14 +++ gnomesword.spec 9 Nov 2006 06:31:28 -0000 1.15 @@ -1,6 +1,6 @@ Name: gnomesword Version: 2.1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text @@ -19,6 +19,7 @@ BuildRequires: libgnomeui-devel BuildRequires: scrollkeeper BuildRequires: perl(XML::Parser) +BuildRequires: libicu-devel icu Requires(post): scrollkeeper Requires(postun): scrollkeeper Obsoletes: gnomesword2 @@ -81,6 +82,9 @@ %changelog +* Thu Nov 09 2006 Deji Akingunola - 2.1.8-2 +- Fix Build requires + * Wed Nov 08 2006 Deji Akingunola - 2.1.8-1 - Update to new (unstable) version From fedora-extras-commits at redhat.com Thu Nov 9 06:45:48 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Wed, 8 Nov 2006 23:45:48 -0700 Subject: rpms/gnomesword/devel gnomesword.spec,1.15,1.16 Message-ID: <200611090645.kA96jmPc032111@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gnomesword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32095 Modified Files: gnomesword.spec Log Message: * Thu Nov 09 2006 Deji Akingunola - 2.1.8-3 - Seems parallel make is causing problems Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnomesword.spec 9 Nov 2006 06:31:28 -0000 1.15 +++ gnomesword.spec 9 Nov 2006 06:45:18 -0000 1.16 @@ -1,6 +1,6 @@ Name: gnomesword Version: 2.1.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text @@ -41,8 +41,8 @@ %build export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic" %configure -make %{?_smp_mflags} - +#make %{?_smp_mflags} : // Dosn't seem to work on i386 +make %install rm -rf %buildroot @@ -82,6 +82,9 @@ %changelog +* Thu Nov 09 2006 Deji Akingunola - 2.1.8-3 +- Seems parallel make is causing problems + * Thu Nov 09 2006 Deji Akingunola - 2.1.8-2 - Fix Build requires From fedora-extras-commits at redhat.com Thu Nov 9 07:14:09 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 9 Nov 2006 00:14:09 -0700 Subject: rpms/gperiodic import.log,1.4,1.5 Message-ID: <200611090714.kA97E99g002814@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/gperiodic In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2784 Modified Files: import.log Log Message: auto-import gperiodic-2.0.8-5 on branch devel from gperiodic-2.0.8-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gperiodic/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 14 Feb 2006 21:49:38 -0000 1.4 +++ import.log 9 Nov 2006 07:13:39 -0000 1.5 @@ -1,3 +1,4 @@ gperiodic-2_0_8-2:HEAD:gperiodic-2.0.8-2.src.rpm:1130708935 gperiodic-2_0_8-3:HEAD:gperiodic-2.0.8-3.src.rpm:1139607599 gperiodic-2_0_8-4:HEAD:gperiodic-2.0.8-4.src.rpm:1139953768 +gperiodic-2_0_8-5:HEAD:gperiodic-2.0.8-5.src.rpm:1163056409 From fedora-extras-commits at redhat.com Thu Nov 9 07:14:10 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 9 Nov 2006 00:14:10 -0700 Subject: rpms/gperiodic/devel gperiodic.spec,1.4,1.5 Message-ID: <200611090714.kA97EAit002817@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/gperiodic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2784/devel Modified Files: gperiodic.spec Log Message: auto-import gperiodic-2.0.8-5 on branch devel from gperiodic-2.0.8-5.src.rpm Index: gperiodic.spec =================================================================== RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gperiodic.spec 28 Aug 2006 07:07:24 -0000 1.4 +++ gperiodic.spec 9 Nov 2006 07:13:40 -0000 1.5 @@ -4,8 +4,8 @@ Release: 5%{?dist} License: GPL Group: Applications/Engineering -URL: http://koti.welho.com/jfrantz/software/gperiodic.html -Source: http://koti.welho.com/jfrantz/software/gperiodic-%{version}.tar.gz +URL: http://www.frantz.fi/software/gperiodic.php +Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, desktop-file-utils, gettext @@ -58,8 +58,8 @@ %doc README AUTHORS ChangeLog gpl.txt %changelog -* Mon Aug 28 2006 Eric Tanguy - 2.0.8-5 -- Rebuild for Fedora Extras 6 +* Thu Nov 09 2006 Eric Tanguy - 2.0.8-5 +- Modify URL in package descrpition and source * Tue Feb 14 2006 Eric Tanguy - 2.0.8-4 - Rebuild for FC5 From fedora-extras-commits at redhat.com Thu Nov 9 09:48:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 9 Nov 2006 02:48:47 -0700 Subject: rpms/imlib2/devel imlib2-1.3.0-loader_overflows.patch, NONE, 1.1 imlib2.spec, 1.24, 1.25 Message-ID: <200611090948.kA99mlw8009505@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/imlib2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9486 Modified Files: imlib2.spec Added Files: imlib2-1.3.0-loader_overflows.patch Log Message: * Thu Nov 9 2006 Hans de Goede 1.3.0-3 - Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to Ubuntu for the patch (bug 214676) imlib2-1.3.0-loader_overflows.patch: --- NEW FILE imlib2-1.3.0-loader_overflows.patch --- diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c --- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800 @@ -23,7 +23,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char immediate_load) { - int w, h, alpha; + int w=0, h=0, alpha=0; FILE *f; if (im->data) @@ -36,13 +36,15 @@ { char buf[256], buf2[256]; + memset(buf, 0, sizeof(buf)); + memset(buf2, 0, sizeof(buf)); if (!fgets(buf, 255, f)) { fclose(f); return 0; } sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha); - if (strcmp(buf2, "ARGB")) + if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383) { fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c --- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800 @@ -104,8 +104,9 @@ im->w = w = cinfo.output_width; im->h = h = cinfo.output_height; - if (cinfo.rec_outbuf_height > 16) + if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383) { + im->w = im->h = 0; jpeg_destroy_decompress(&cinfo); fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c --- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800 @@ -421,7 +421,7 @@ im->w = L2RWORD(ilbm.bmhd.data); im->h = L2RWORD(ilbm.bmhd.data + 2); - if (im->w <= 0 || im->h <= 0) ok = 0; + if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0; ilbm.depth = ilbm.bmhd.data[8]; if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */ @@ -453,6 +453,7 @@ } } if (!full || !ok) { + im->w = im->h = 0; freeilbm(&ilbm); return ok; } @@ -467,12 +468,13 @@ cancel = 0; plane[0] = NULL; + n = ilbm.depth; + if (ilbm.mask == 1) n++; + im->data = malloc(im->w * im->h * sizeof(DATA32)); - if (im->data) { - n = ilbm.depth; - if (ilbm.mask == 1) n++; + plane[0] = malloc(((im->w + 15) / 16) * 2 * n); + if (im->data && plane[0]) { - plane[0] = malloc(((im->w + 15) / 16) * 2 * n); for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2; z = ((im->w + 15) / 16) * 2 * n; @@ -511,6 +513,7 @@ * the memory for im->data. *----------*/ if (!ok) { + im->w = im->h = 0; if (im->data) free(im->data); im->data = NULL; } diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c --- imlib2-1.2.1/src/modules/loaders/loader_png.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c 2006-11-06 01:30:41.000000000 -0800 @@ -83,6 +83,13 @@ png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32), (png_uint_32 *) (&h32), &bit_depth, &color_type, &interlace_type, NULL, NULL); + if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383) + { + png_read_end(png_ptr, info_ptr); + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + fclose(f); + return 0; + } im->w = (int)w32; im->h = (int)h32; if (color_type == PNG_COLOR_TYPE_PALETTE) diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c --- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800 @@ -80,7 +80,7 @@ int i = 0; /* read numbers */ - while (c != EOF && !isspace(c)) + while (c != EOF && i+1 < sizeof(buf) && !isspace(c)) { buf[i++] = c; c = fgetc(f); diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c --- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800 @@ -319,6 +319,7 @@ { unsigned long datasize; unsigned char *bufptr; + unsigned char *bufend; DATA32 *dataptr; int y, pl = 0; @@ -348,6 +349,9 @@ /* bufptr is the next byte to be read from the buffer */ bufptr = filedata; + /* bufend is one past the last byte to be read from the buffer */ + bufend = filedata + datasize; + /* dataptr is the next 32-bit pixel to be filled in */ dataptr = im->data; @@ -365,7 +369,9 @@ else dataptr = im->data + (y * im->w); - for (x = 0; x < im->w; x++) /* for each pixel in the row */ + for (x = 0; + x < im->w && bufptr+bpp/8 < bufend; + x++) /* for each pixel in the row */ { switch (bpp) { @@ -422,8 +428,8 @@ unsigned char curbyte, red, green, blue, alpha; DATA32 *final_pixel = dataptr + im->w * im->h; - /* loop until we've got all the pixels */ - while (dataptr < final_pixel) + /* loop until we've got all the pixels or run out of input */ + while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend) { int count; @@ -441,7 +447,7 @@ green = *bufptr++; red = *bufptr++; alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, alpha); dataptr++; @@ -452,7 +458,7 @@ blue = *bufptr++; green = *bufptr++; red = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, (char)0xff); @@ -462,7 +468,7 @@ case 8: alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, alpha, alpha, alpha, (char)0xff); @@ -477,7 +483,7 @@ { int i; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { switch (bpp) { diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c --- imlib2-1.2.1/src/modules/loaders/loader_tiff.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c 2006-11-06 01:30:41.000000000 -0800 @@ -75,7 +75,7 @@ raster(TIFFRGBAImage_Extra * img, uint32 * rast, uint32 x, uint32 y, uint32 w, uint32 h) { - uint32 image_width, image_height; + int image_width, image_height; uint32 *pixel, pixel_value; int i, j, dy, rast_offset; DATA32 *buffer_pixel, *buffer = img->image->data; @@ -192,8 +192,16 @@ } rgba_image.image = im; - im->w = width = rgba_image.rgba.width; - im->h = height = rgba_image.rgba.height; + width = rgba_image.rgba.width; + height = rgba_image.rgba.height; + if (width < 1 || height < 1 || width >= 16384 || height >= 16384) + { + TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image); + TIFFClose(tif); + return 0; + } + im->w = width; + im->h = height; rgba_image.num_pixels = num_pixels = width * height; if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED) SET_FLAG(im->flags, F_HAS_ALPHA); Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- imlib2.spec 26 Oct 2006 22:22:38 -0000 1.24 +++ imlib2.spec 9 Nov 2006 09:48:17 -0000 1.25 @@ -1,23 +1,24 @@ -Summary: Image loading, saving, rendering, and manipulation library -Name: imlib2 -Version: 1.3.0 -Release: 2%{?dist} -License: BSD -Group: System Environment/Libraries -URL: http://www.enlightenment.org/Libraries/Imlib2/ -Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz -Patch0: imlib2-1.2.1-X11-path.patch +Summary: Image loading, saving, rendering, and manipulation library +Name: imlib2 +Version: 1.3.0 +Release: 3%{?dist} +License: BSD +Group: System Environment/Libraries +URL: http://www.enlightenment.org/Libraries/Imlib2/ +Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.1-X11-path.patch Patch1: imlib2-1.3.0-multilib.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: libjpeg-devel libpng-devel libtiff-devel -BuildRequires: giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel -BuildRequires: libX11-devel libXext-devel libid3tag-devel pkgconfig +Patch2: imlib2-1.3.0-loader_overflows.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: libjpeg-devel libpng-devel libtiff-devel +BuildRequires: giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel +BuildRequires: libX11-devel libXext-devel libid3tag-devel pkgconfig %package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig %description @@ -45,6 +46,7 @@ %setup -q %patch0 -p1 -b .x11-path %patch1 -p1 -b .multilib +%patch2 -p1 -b .overflow # sigh stop autoxxx from rerunning because of our patches above. touch aclocal.m4 touch configure @@ -114,6 +116,10 @@ %changelog +* Thu Nov 9 2006 Hans de Goede 1.3.0-3 +- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to + Ubuntu for the patch (bug 214676) + * Thu Oct 26 2006 Hans de Goede 1.3.0-2 - Multilib devel goodness (make -devel i386 and x86_64 parallel installable) - Fix bug 212469 From fedora-extras-commits at redhat.com Thu Nov 9 09:51:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 9 Nov 2006 02:51:29 -0700 Subject: rpms/imlib2/FC-6 imlib2-1.3.0-loader_overflows.patch, NONE, 1.1 imlib2-1.3.0-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 imlib2.spec, 1.22, 1.23 sources, 1.6, 1.7 Message-ID: <200611090951.kA99pTto009591@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/imlib2/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9563 Modified Files: .cvsignore imlib2.spec sources Added Files: imlib2-1.3.0-loader_overflows.patch imlib2-1.3.0-multilib.patch Log Message: * Thu Nov 9 2006 Hans de Goede 1.3.0-3 - Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to Ubuntu for the patch (bug 214676) imlib2-1.3.0-loader_overflows.patch: --- NEW FILE imlib2-1.3.0-loader_overflows.patch --- diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c --- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800 @@ -23,7 +23,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char immediate_load) { - int w, h, alpha; + int w=0, h=0, alpha=0; FILE *f; if (im->data) @@ -36,13 +36,15 @@ { char buf[256], buf2[256]; + memset(buf, 0, sizeof(buf)); + memset(buf2, 0, sizeof(buf)); if (!fgets(buf, 255, f)) { fclose(f); return 0; } sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha); - if (strcmp(buf2, "ARGB")) + if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383) { fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c --- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800 @@ -104,8 +104,9 @@ im->w = w = cinfo.output_width; im->h = h = cinfo.output_height; - if (cinfo.rec_outbuf_height > 16) + if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383) { + im->w = im->h = 0; jpeg_destroy_decompress(&cinfo); fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c --- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800 @@ -421,7 +421,7 @@ im->w = L2RWORD(ilbm.bmhd.data); im->h = L2RWORD(ilbm.bmhd.data + 2); - if (im->w <= 0 || im->h <= 0) ok = 0; + if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0; ilbm.depth = ilbm.bmhd.data[8]; if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */ @@ -453,6 +453,7 @@ } } if (!full || !ok) { + im->w = im->h = 0; freeilbm(&ilbm); return ok; } @@ -467,12 +468,13 @@ cancel = 0; plane[0] = NULL; + n = ilbm.depth; + if (ilbm.mask == 1) n++; + im->data = malloc(im->w * im->h * sizeof(DATA32)); - if (im->data) { - n = ilbm.depth; - if (ilbm.mask == 1) n++; + plane[0] = malloc(((im->w + 15) / 16) * 2 * n); + if (im->data && plane[0]) { - plane[0] = malloc(((im->w + 15) / 16) * 2 * n); for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2; z = ((im->w + 15) / 16) * 2 * n; @@ -511,6 +513,7 @@ * the memory for im->data. *----------*/ if (!ok) { + im->w = im->h = 0; if (im->data) free(im->data); im->data = NULL; } diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c --- imlib2-1.2.1/src/modules/loaders/loader_png.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c 2006-11-06 01:30:41.000000000 -0800 @@ -83,6 +83,13 @@ png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32), (png_uint_32 *) (&h32), &bit_depth, &color_type, &interlace_type, NULL, NULL); + if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383) + { + png_read_end(png_ptr, info_ptr); + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + fclose(f); + return 0; + } im->w = (int)w32; im->h = (int)h32; if (color_type == PNG_COLOR_TYPE_PALETTE) diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c --- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800 @@ -80,7 +80,7 @@ int i = 0; /* read numbers */ - while (c != EOF && !isspace(c)) + while (c != EOF && i+1 < sizeof(buf) && !isspace(c)) { buf[i++] = c; c = fgetc(f); diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c --- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800 @@ -319,6 +319,7 @@ { unsigned long datasize; unsigned char *bufptr; + unsigned char *bufend; DATA32 *dataptr; int y, pl = 0; @@ -348,6 +349,9 @@ /* bufptr is the next byte to be read from the buffer */ bufptr = filedata; + /* bufend is one past the last byte to be read from the buffer */ + bufend = filedata + datasize; + /* dataptr is the next 32-bit pixel to be filled in */ dataptr = im->data; @@ -365,7 +369,9 @@ else dataptr = im->data + (y * im->w); - for (x = 0; x < im->w; x++) /* for each pixel in the row */ + for (x = 0; + x < im->w && bufptr+bpp/8 < bufend; + x++) /* for each pixel in the row */ { switch (bpp) { @@ -422,8 +428,8 @@ unsigned char curbyte, red, green, blue, alpha; DATA32 *final_pixel = dataptr + im->w * im->h; - /* loop until we've got all the pixels */ - while (dataptr < final_pixel) + /* loop until we've got all the pixels or run out of input */ + while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend) { int count; @@ -441,7 +447,7 @@ green = *bufptr++; red = *bufptr++; alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, alpha); dataptr++; @@ -452,7 +458,7 @@ blue = *bufptr++; green = *bufptr++; red = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, (char)0xff); @@ -462,7 +468,7 @@ case 8: alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, alpha, alpha, alpha, (char)0xff); @@ -477,7 +483,7 @@ { int i; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { switch (bpp) { diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c --- imlib2-1.2.1/src/modules/loaders/loader_tiff.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c 2006-11-06 01:30:41.000000000 -0800 @@ -75,7 +75,7 @@ raster(TIFFRGBAImage_Extra * img, uint32 * rast, uint32 x, uint32 y, uint32 w, uint32 h) { - uint32 image_width, image_height; + int image_width, image_height; uint32 *pixel, pixel_value; int i, j, dy, rast_offset; DATA32 *buffer_pixel, *buffer = img->image->data; @@ -192,8 +192,16 @@ } rgba_image.image = im; - im->w = width = rgba_image.rgba.width; - im->h = height = rgba_image.rgba.height; + width = rgba_image.rgba.width; + height = rgba_image.rgba.height; + if (width < 1 || height < 1 || width >= 16384 || height >= 16384) + { + TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image); + TIFFClose(tif); + return 0; + } + im->w = width; + im->h = height; rgba_image.num_pixels = num_pixels = width * height; if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED) SET_FLAG(im->flags, F_HAS_ALPHA); imlib2-1.3.0-multilib.patch: --- NEW FILE imlib2-1.3.0-multilib.patch --- --- imlib2-1.3.0/configure.in~ 2006-10-27 00:18:39.000000000 +0200 +++ imlib2-1.3.0/configure.in 2006-10-27 00:18:39.000000000 +0200 @@ -190,7 +190,7 @@ AC_PATH_XTRA x_dir=${x_dir:-/usr/X11R6} x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + x_libs="-lX11 -lXext" AM_CONDITIONAL(BUILD_X11, true) AC_DEFINE(BUILD_X11, 1, [enabling X11 support]) else --- imlib2-1.3.0/configure~ 2006-10-27 00:18:25.000000000 +0200 +++ imlib2-1.3.0/configure 2006-10-27 00:18:25.000000000 +0200 @@ -23117,7 +23117,7 @@ x_dir=${x_dir:-/usr/X11R6} x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + x_libs="-lX11 -lXext" if true; then --- imlib2-1.3.0/imlib2-config.in~ 2006-10-27 00:17:29.000000000 +0200 +++ imlib2-1.3.0/imlib2-config.in 2006-10-27 00:17:29.000000000 +0200 @@ -45,8 +45,7 @@ echo $includes ;; --libs) - libdirs=-L at libdir@ - echo $libdirs -lImlib2 @my_libs@ + echo -lImlib2 @my_libs@ ;; *) echo "${usage}" 1>&2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Jul 2006 09:07:44 -0000 1.5 +++ .cvsignore 9 Nov 2006 09:50:58 -0000 1.6 @@ -1 +1 @@ -imlib2-1.2.2.tar.gz +imlib2-1.3.0.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-6/imlib2.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- imlib2.spec 28 Aug 2006 14:11:38 -0000 1.22 +++ imlib2.spec 9 Nov 2006 09:50:58 -0000 1.23 @@ -1,22 +1,24 @@ -Summary: Image loading, saving, rendering, and manipulation library -Name: imlib2 -Version: 1.2.2 -Release: 2%{?dist} -License: BSD -Group: System Environment/Libraries -URL: http://www.enlightenment.org/Libraries/Imlib2/ -Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz -Patch0: imlib2-1.2.1-X11-path.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: libjpeg-devel libpng-devel libtiff-devel -BuildRequires: libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel -BuildRequires: libX11-devel libXext-devel pkgconfig +Summary: Image loading, saving, rendering, and manipulation library +Name: imlib2 +Version: 1.3.0 +Release: 3%{?dist} +License: BSD +Group: System Environment/Libraries +URL: http://www.enlightenment.org/Libraries/Imlib2/ +Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.1-X11-path.patch +Patch1: imlib2-1.3.0-multilib.patch +Patch2: imlib2-1.3.0-loader_overflows.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: libjpeg-devel libpng-devel libtiff-devel +BuildRequires: giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel +BuildRequires: libX11-devel libXext-devel libid3tag-devel pkgconfig %package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig %description @@ -43,6 +45,13 @@ %prep %setup -q %patch0 -p1 -b .x11-path +%patch1 -p1 -b .multilib +%patch2 -p1 -b .overflow +# sigh stop autoxxx from rerunning because of our patches above. +touch aclocal.m4 +touch configure +touch config.h.in +touch `find -name Makefile.in` %build @@ -107,6 +116,18 @@ %changelog +* Thu Nov 9 2006 Hans de Goede 1.3.0-3 +- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to + Ubuntu for the patch (bug 214676) + +* Thu Oct 26 2006 Hans de Goede 1.3.0-2 +- Multilib devel goodness (make -devel i386 and x86_64 parallel installable) +- Fix bug 212469 +- Add libid3tag-devel to the BR's so id3tag support gets build in + +* Tue Oct 24 2006 Hans de Goede 1.3.0-1 +- New upstream release 1.3.0 + * Mon Aug 28 2006 Hans de Goede 1.2.2-2 - FE6 Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Jul 2006 09:07:44 -0000 1.6 +++ sources 9 Nov 2006 09:50:58 -0000 1.7 @@ -1 +1 @@ -07b2a7745ddd3c7c4480b50cb916174c imlib2-1.2.2.tar.gz +00b724fc6d2dcfa3045bb6a554bb2c8a imlib2-1.3.0.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 09:54:56 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 9 Nov 2006 02:54:56 -0700 Subject: rpms/imlib2/FC-5 imlib2-1.3.0-loader_overflows.patch, NONE, 1.1 imlib2-1.3.0-multilib.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 imlib2.spec, 1.19, 1.20 sources, 1.5, 1.6 Message-ID: <200611090954.kA99suNa009698@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/imlib2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9667 Modified Files: .cvsignore imlib2.spec sources Added Files: imlib2-1.3.0-loader_overflows.patch imlib2-1.3.0-multilib.patch Log Message: * Thu Nov 9 2006 Hans de Goede 1.3.0-3 - Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to Ubuntu for the patch (bug 214676) imlib2-1.3.0-loader_overflows.patch: --- NEW FILE imlib2-1.3.0-loader_overflows.patch --- diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c --- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800 @@ -23,7 +23,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char immediate_load) { - int w, h, alpha; + int w=0, h=0, alpha=0; FILE *f; if (im->data) @@ -36,13 +36,15 @@ { char buf[256], buf2[256]; + memset(buf, 0, sizeof(buf)); + memset(buf2, 0, sizeof(buf)); if (!fgets(buf, 255, f)) { fclose(f); return 0; } sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha); - if (strcmp(buf2, "ARGB")) + if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383) { fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c --- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800 @@ -104,8 +104,9 @@ im->w = w = cinfo.output_width; im->h = h = cinfo.output_height; - if (cinfo.rec_outbuf_height > 16) + if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383) { + im->w = im->h = 0; jpeg_destroy_decompress(&cinfo); fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c --- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800 @@ -421,7 +421,7 @@ im->w = L2RWORD(ilbm.bmhd.data); im->h = L2RWORD(ilbm.bmhd.data + 2); - if (im->w <= 0 || im->h <= 0) ok = 0; + if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0; ilbm.depth = ilbm.bmhd.data[8]; if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */ @@ -453,6 +453,7 @@ } } if (!full || !ok) { + im->w = im->h = 0; freeilbm(&ilbm); return ok; } @@ -467,12 +468,13 @@ cancel = 0; plane[0] = NULL; + n = ilbm.depth; + if (ilbm.mask == 1) n++; + im->data = malloc(im->w * im->h * sizeof(DATA32)); - if (im->data) { - n = ilbm.depth; - if (ilbm.mask == 1) n++; + plane[0] = malloc(((im->w + 15) / 16) * 2 * n); + if (im->data && plane[0]) { - plane[0] = malloc(((im->w + 15) / 16) * 2 * n); for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2; z = ((im->w + 15) / 16) * 2 * n; @@ -511,6 +513,7 @@ * the memory for im->data. *----------*/ if (!ok) { + im->w = im->h = 0; if (im->data) free(im->data); im->data = NULL; } diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c --- imlib2-1.2.1/src/modules/loaders/loader_png.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c 2006-11-06 01:30:41.000000000 -0800 @@ -83,6 +83,13 @@ png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32), (png_uint_32 *) (&h32), &bit_depth, &color_type, &interlace_type, NULL, NULL); + if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383) + { + png_read_end(png_ptr, info_ptr); + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + fclose(f); + return 0; + } im->w = (int)w32; im->h = (int)h32; if (color_type == PNG_COLOR_TYPE_PALETTE) diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c --- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800 @@ -80,7 +80,7 @@ int i = 0; /* read numbers */ - while (c != EOF && !isspace(c)) + while (c != EOF && i+1 < sizeof(buf) && !isspace(c)) { buf[i++] = c; c = fgetc(f); diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c --- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800 @@ -319,6 +319,7 @@ { unsigned long datasize; unsigned char *bufptr; + unsigned char *bufend; DATA32 *dataptr; int y, pl = 0; @@ -348,6 +349,9 @@ /* bufptr is the next byte to be read from the buffer */ bufptr = filedata; + /* bufend is one past the last byte to be read from the buffer */ + bufend = filedata + datasize; + /* dataptr is the next 32-bit pixel to be filled in */ dataptr = im->data; @@ -365,7 +369,9 @@ else dataptr = im->data + (y * im->w); - for (x = 0; x < im->w; x++) /* for each pixel in the row */ + for (x = 0; + x < im->w && bufptr+bpp/8 < bufend; + x++) /* for each pixel in the row */ { switch (bpp) { @@ -422,8 +428,8 @@ unsigned char curbyte, red, green, blue, alpha; DATA32 *final_pixel = dataptr + im->w * im->h; - /* loop until we've got all the pixels */ - while (dataptr < final_pixel) + /* loop until we've got all the pixels or run out of input */ + while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend) { int count; @@ -441,7 +447,7 @@ green = *bufptr++; red = *bufptr++; alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, alpha); dataptr++; @@ -452,7 +458,7 @@ blue = *bufptr++; green = *bufptr++; red = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, (char)0xff); @@ -462,7 +468,7 @@ case 8: alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, alpha, alpha, alpha, (char)0xff); @@ -477,7 +483,7 @@ { int i; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { switch (bpp) { diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c --- imlib2-1.2.1/src/modules/loaders/loader_tiff.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c 2006-11-06 01:30:41.000000000 -0800 @@ -75,7 +75,7 @@ raster(TIFFRGBAImage_Extra * img, uint32 * rast, uint32 x, uint32 y, uint32 w, uint32 h) { - uint32 image_width, image_height; + int image_width, image_height; uint32 *pixel, pixel_value; int i, j, dy, rast_offset; DATA32 *buffer_pixel, *buffer = img->image->data; @@ -192,8 +192,16 @@ } rgba_image.image = im; - im->w = width = rgba_image.rgba.width; - im->h = height = rgba_image.rgba.height; + width = rgba_image.rgba.width; + height = rgba_image.rgba.height; + if (width < 1 || height < 1 || width >= 16384 || height >= 16384) + { + TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image); + TIFFClose(tif); + return 0; + } + im->w = width; + im->h = height; rgba_image.num_pixels = num_pixels = width * height; if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED) SET_FLAG(im->flags, F_HAS_ALPHA); imlib2-1.3.0-multilib.patch: --- NEW FILE imlib2-1.3.0-multilib.patch --- --- imlib2-1.3.0/configure.in~ 2006-10-27 00:18:39.000000000 +0200 +++ imlib2-1.3.0/configure.in 2006-10-27 00:18:39.000000000 +0200 @@ -190,7 +190,7 @@ AC_PATH_XTRA x_dir=${x_dir:-/usr/X11R6} x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + x_libs="-lX11 -lXext" AM_CONDITIONAL(BUILD_X11, true) AC_DEFINE(BUILD_X11, 1, [enabling X11 support]) else --- imlib2-1.3.0/configure~ 2006-10-27 00:18:25.000000000 +0200 +++ imlib2-1.3.0/configure 2006-10-27 00:18:25.000000000 +0200 @@ -23117,7 +23117,7 @@ x_dir=${x_dir:-/usr/X11R6} x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + x_libs="-lX11 -lXext" if true; then --- imlib2-1.3.0/imlib2-config.in~ 2006-10-27 00:17:29.000000000 +0200 +++ imlib2-1.3.0/imlib2-config.in 2006-10-27 00:17:29.000000000 +0200 @@ -45,8 +45,7 @@ echo $includes ;; --libs) - libdirs=-L at libdir@ - echo $libdirs -lImlib2 @my_libs@ + echo -lImlib2 @my_libs@ ;; *) echo "${usage}" 1>&2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 19:09:39 -0000 1.4 +++ .cvsignore 9 Nov 2006 09:54:26 -0000 1.5 @@ -1 +1 @@ -imlib2-1.2.1.tar.gz +imlib2-1.3.0.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-5/imlib2.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- imlib2.spec 23 Jul 2006 08:19:55 -0000 1.19 +++ imlib2.spec 9 Nov 2006 09:54:26 -0000 1.20 @@ -1,22 +1,24 @@ -Summary: Image loading, saving, rendering, and manipulation library -Name: imlib2 -Version: 1.2.1 -Release: 6%{?dist} -License: BSD -Group: System Environment/Libraries -URL: http://www.enlightenment.org/Libraries/Imlib2/ -Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz -Patch0: imlib2-1.2.1-X11-path.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: libjpeg-devel libpng-devel libtiff-devel -BuildRequires: libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel -BuildRequires: libX11-devel libXext-devel +Summary: Image loading, saving, rendering, and manipulation library +Name: imlib2 +Version: 1.3.0 +Release: 3%{?dist} +License: BSD +Group: System Environment/Libraries +URL: http://www.enlightenment.org/Libraries/Imlib2/ +Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.2.1-X11-path.patch +Patch1: imlib2-1.3.0-multilib.patch +Patch2: imlib2-1.3.0-loader_overflows.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: libjpeg-devel libpng-devel libtiff-devel +BuildRequires: giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel +BuildRequires: libX11-devel libXext-devel libid3tag-devel pkgconfig %package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig +Summary: Development package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig %description @@ -43,6 +45,13 @@ %prep %setup -q %patch0 -p1 -b .x11-path +%patch1 -p1 -b .multilib +%patch2 -p1 -b .overflow +# sigh stop autoxxx from rerunning because of our patches above. +touch aclocal.m4 +touch configure +touch config.h.in +touch `find -name Makefile.in` %build @@ -83,12 +92,7 @@ %files %defattr(-,root,root,-) %doc COPYING AUTHORS README ChangeLog TODO -%{_bindir}/imlib2_view -%{_bindir}/imlib2_bumpmap -%{_bindir}/imlib2_colorspace -%{_bindir}/imlib2_conv -%{_bindir}/imlib2_poly -%{_bindir}/imlib2_show +%{_bindir}/imlib2_* %{_libdir}/libImlib2.so.* %dir %{_datadir}/imlib2/ %{_datadir}/imlib2/data/ @@ -112,6 +116,24 @@ %changelog +* Thu Nov 9 2006 Hans de Goede 1.3.0-3 +- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to + Ubuntu for the patch (bug 214676) + +* Thu Oct 26 2006 Hans de Goede 1.3.0-2 +- Multilib devel goodness (make -devel i386 and x86_64 parallel installable) +- Fix bug 212469 +- Add libid3tag-devel to the BR's so id3tag support gets build in + +* Tue Oct 24 2006 Hans de Goede 1.3.0-1 +- New upstream release 1.3.0 + +* Mon Aug 28 2006 Hans de Goede 1.2.2-2 +- FE6 Rebuild + +* Sun Jul 23 2006 Hans de Goede 1.2.2-1 +- New upstream release 1.2.2 + * Sun Jul 23 2006 Hans de Goede 1.2.1-6 - Taking over as maintainer since Anvil has other priorities - Long long due rebuild with new gcc for FC-5 (bug 185871) Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Sep 2005 19:09:39 -0000 1.5 +++ sources 9 Nov 2006 09:54:26 -0000 1.6 @@ -1 +1 @@ -e32970d03d8aee2885782312d0a7f15f imlib2-1.2.1.tar.gz +00b724fc6d2dcfa3045bb6a554bb2c8a imlib2-1.3.0.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 10:07:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 9 Nov 2006 03:07:35 -0700 Subject: rpms/imlib2/FC-4 imlib2-1.3.0-loader_overflows.patch, NONE, 1.1 imlib2.spec, 1.15, 1.16 Message-ID: <200611091007.kA9A7Zn4012932@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/imlib2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12910 Modified Files: imlib2.spec Added Files: imlib2-1.3.0-loader_overflows.patch Log Message: * Thu Nov 9 2006 Hans de Goede 1.2.1-2 - Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to Ubuntu for the patch (bug 214676) imlib2-1.3.0-loader_overflows.patch: --- NEW FILE imlib2-1.3.0-loader_overflows.patch --- diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c --- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800 @@ -23,7 +23,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char immediate_load) { - int w, h, alpha; + int w=0, h=0, alpha=0; FILE *f; if (im->data) @@ -36,13 +36,15 @@ { char buf[256], buf2[256]; + memset(buf, 0, sizeof(buf)); + memset(buf2, 0, sizeof(buf)); if (!fgets(buf, 255, f)) { fclose(f); return 0; } sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha); - if (strcmp(buf2, "ARGB")) + if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383) { fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c --- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800 @@ -104,8 +104,9 @@ im->w = w = cinfo.output_width; im->h = h = cinfo.output_height; - if (cinfo.rec_outbuf_height > 16) + if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383) { + im->w = im->h = 0; jpeg_destroy_decompress(&cinfo); fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c --- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800 @@ -421,7 +421,7 @@ im->w = L2RWORD(ilbm.bmhd.data); im->h = L2RWORD(ilbm.bmhd.data + 2); - if (im->w <= 0 || im->h <= 0) ok = 0; + if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0; ilbm.depth = ilbm.bmhd.data[8]; if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */ @@ -453,6 +453,7 @@ } } if (!full || !ok) { + im->w = im->h = 0; freeilbm(&ilbm); return ok; } @@ -467,12 +468,13 @@ cancel = 0; plane[0] = NULL; + n = ilbm.depth; + if (ilbm.mask == 1) n++; + im->data = malloc(im->w * im->h * sizeof(DATA32)); - if (im->data) { - n = ilbm.depth; - if (ilbm.mask == 1) n++; + plane[0] = malloc(((im->w + 15) / 16) * 2 * n); + if (im->data && plane[0]) { - plane[0] = malloc(((im->w + 15) / 16) * 2 * n); for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2; z = ((im->w + 15) / 16) * 2 * n; @@ -511,6 +513,7 @@ * the memory for im->data. *----------*/ if (!ok) { + im->w = im->h = 0; if (im->data) free(im->data); im->data = NULL; } diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c --- imlib2-1.2.1/src/modules/loaders/loader_png.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c 2006-11-06 01:30:41.000000000 -0800 @@ -83,6 +83,13 @@ png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32), (png_uint_32 *) (&h32), &bit_depth, &color_type, &interlace_type, NULL, NULL); + if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383) + { + png_read_end(png_ptr, info_ptr); + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + fclose(f); + return 0; + } im->w = (int)w32; im->h = (int)h32; if (color_type == PNG_COLOR_TYPE_PALETTE) diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c --- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800 @@ -80,7 +80,7 @@ int i = 0; /* read numbers */ - while (c != EOF && !isspace(c)) + while (c != EOF && i+1 < sizeof(buf) && !isspace(c)) { buf[i++] = c; c = fgetc(f); diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c --- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800 @@ -319,6 +319,7 @@ { unsigned long datasize; unsigned char *bufptr; + unsigned char *bufend; DATA32 *dataptr; int y, pl = 0; @@ -348,6 +349,9 @@ /* bufptr is the next byte to be read from the buffer */ bufptr = filedata; + /* bufend is one past the last byte to be read from the buffer */ + bufend = filedata + datasize; + /* dataptr is the next 32-bit pixel to be filled in */ dataptr = im->data; @@ -365,7 +369,9 @@ else dataptr = im->data + (y * im->w); - for (x = 0; x < im->w; x++) /* for each pixel in the row */ + for (x = 0; + x < im->w && bufptr+bpp/8 < bufend; + x++) /* for each pixel in the row */ { switch (bpp) { @@ -422,8 +428,8 @@ unsigned char curbyte, red, green, blue, alpha; DATA32 *final_pixel = dataptr + im->w * im->h; - /* loop until we've got all the pixels */ - while (dataptr < final_pixel) + /* loop until we've got all the pixels or run out of input */ + while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend) { int count; @@ -441,7 +447,7 @@ green = *bufptr++; red = *bufptr++; alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, alpha); dataptr++; @@ -452,7 +458,7 @@ blue = *bufptr++; green = *bufptr++; red = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, (char)0xff); @@ -462,7 +468,7 @@ case 8: alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, alpha, alpha, alpha, (char)0xff); @@ -477,7 +483,7 @@ { int i; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { switch (bpp) { diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c --- imlib2-1.2.1/src/modules/loaders/loader_tiff.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c 2006-11-06 01:30:41.000000000 -0800 @@ -75,7 +75,7 @@ raster(TIFFRGBAImage_Extra * img, uint32 * rast, uint32 x, uint32 y, uint32 w, uint32 h) { - uint32 image_width, image_height; + int image_width, image_height; uint32 *pixel, pixel_value; int i, j, dy, rast_offset; DATA32 *buffer_pixel, *buffer = img->image->data; @@ -192,8 +192,16 @@ } rgba_image.image = im; - im->w = width = rgba_image.rgba.width; - im->h = height = rgba_image.rgba.height; + width = rgba_image.rgba.width; + height = rgba_image.rgba.height; + if (width < 1 || height < 1 || width >= 16384 || height >= 16384) + { + TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image); + TIFFClose(tif); + return 0; + } + im->w = width; + im->h = height; rgba_image.num_pixels = num_pixels = width * height; if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED) SET_FLAG(im->flags, F_HAS_ALPHA); Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-4/imlib2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- imlib2.spec 20 Sep 2005 19:09:55 -0000 1.15 +++ imlib2.spec 9 Nov 2006 10:07:05 -0000 1.16 @@ -1,11 +1,12 @@ Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org/Libraries/Imlib2/ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz +Patch0: imlib2-1.3.0-loader_overflows.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel %{__perl} @@ -40,6 +41,7 @@ %prep %setup -q +%patch0 -p1 -b .overflow %build @@ -118,6 +120,10 @@ %changelog +* Thu Nov 9 2006 Hans de Goede 1.2.1-2 +- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to + Ubuntu for the patch (bug 214676) + * Sun Aug 28 2005 Ville Skytt?? - 1.2.1-1 - 1.2.1, patches applied/obsoleted upstream. - Improve summary and description, fix URL. From fedora-extras-commits at redhat.com Thu Nov 9 10:19:08 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 9 Nov 2006 03:19:08 -0700 Subject: rpms/mod_fcgid/FC-6 .cvsignore, 1.2, 1.3 configuration.htm, 1.1, 1.2 doc.htm, 1.1, 1.2 mod_fcgid.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611091019.kA9AJ8P5013072@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-serv13045 Modified Files: .cvsignore configuration.htm doc.htm mod_fcgid.spec sources Log Message: resync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Sep 2006 13:08:59 -0000 1.2 +++ .cvsignore 9 Nov 2006 10:18:38 -0000 1.3 @@ -1 +1 @@ -mod_fcgid.1.10.tar.gz +mod_fcgid.2.0.tar.gz Index: configuration.htm =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/configuration.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configuration.htm 6 Sep 2006 13:08:59 -0000 1.1 +++ configuration.htm 9 Nov 2006 10:18:38 -0000 1.2 @@ -9,62 +9,62 @@ -

This is a for regular fastcgi. 

LoadModule fcgid_module +

This is a for regular fastcgi. 

LoadModule fcgid_module modules/mod_fcgid.so

-<Location /fcgid>
-    SetHandler fcgid-script
-    Options ExecCGI
-    allow from all
+<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 +

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 /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 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 +

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
+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
+

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 *: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 /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>

@@ -79,23 +79,89 @@


-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

+<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
</Directory>

+

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 +(default On)

+

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

+ +
+

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 +(default On)

+ +

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

+ +
+

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 +(default On)

+

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

+

??

+

??

+ +

??

+

??

+

??

+

??

+

??

+

??

+

??

+

??

+

??

+

??

+

??

??

??

??

Index: doc.htm =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/doc.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- doc.htm 6 Sep 2006 13:08:59 -0000 1.1 +++ doc.htm 9 Nov 2006 10:18:38 -0000 1.2 @@ -51,7 +51,10 @@ (non-PHP, non-Ruby, non-Python) 

Configuration for suEXEC fastcgi

Configuration for PHP (UNIX)

Configuration for suPHP (UNIX)

Configuration -for PHP (Windows)

  +for PHP (Windows)

Configuration +for Authenticator

Configuration +for Authorizer

Configuration +for AccessChecker

 

  • There are @@ -90,9 +93,16 @@ 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 +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. +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: mod_fcgid.spec =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/mod_fcgid.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_fcgid.spec 6 Sep 2006 13:47:08 -0000 1.2 +++ mod_fcgid.spec 9 Nov 2006 10:18:38 -0000 1.3 @@ -10,13 +10,13 @@ %endif Name: mod_fcgid -Version: 1.10 -Release: 7%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: Apache2 module for high-performance server-side scripting Group: System Environment/Daemons License: GPL URL: http://fastcgi.coremail.cn/ -Source0: http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz +Source0: http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz Source1: fcgid.conf Source2: fastcgi.te Source3: fastcgi.fc @@ -144,6 +144,11 @@ %endif %changelog +* Mon Oct 30 2006 Paul Howarth 2.0-1 +- Update to 2.0 +- Source is now hosted at sourceforge.net +- Update docs + * Wed Sep 6 2006 Paul Howarth 1.10-7 - Include the right README* files Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Sep 2006 13:08:59 -0000 1.2 +++ sources 9 Nov 2006 10:18:38 -0000 1.3 @@ -1 +1 @@ -6c36b18548ca64864ed3dd4cb759062f mod_fcgid.1.10.tar.gz +3aa51f1e293e6d881028295a23021dae mod_fcgid.2.0.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 10:20:26 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 9 Nov 2006 03:20:26 -0700 Subject: rpms/imlib2/FC-3 imlib2-1.3.0-loader_overflows.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 imlib2.spec, 1.10, 1.11 sources, 1.4, 1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE Message-ID: <200611091020.kA9AKQZX013136@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/imlib2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082 Modified Files: .cvsignore imlib2.spec sources Added Files: imlib2-1.3.0-loader_overflows.patch Removed Files: imlib2-1.2.0-configure-xlib64.patch Log Message: * Thu Nov 9 2006 Hans de Goede 1.2.1-2 - Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to Ubuntu for the patch (bug 214676) imlib2-1.3.0-loader_overflows.patch: --- NEW FILE imlib2-1.3.0-loader_overflows.patch --- diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c --- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800 @@ -23,7 +23,7 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char immediate_load) { - int w, h, alpha; + int w=0, h=0, alpha=0; FILE *f; if (im->data) @@ -36,13 +36,15 @@ { char buf[256], buf2[256]; + memset(buf, 0, sizeof(buf)); + memset(buf2, 0, sizeof(buf)); if (!fgets(buf, 255, f)) { fclose(f); return 0; } sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha); - if (strcmp(buf2, "ARGB")) + if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383) { fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c --- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800 @@ -104,8 +104,9 @@ im->w = w = cinfo.output_width; im->h = h = cinfo.output_height; - if (cinfo.rec_outbuf_height > 16) + if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383) { + im->w = im->h = 0; jpeg_destroy_decompress(&cinfo); fclose(f); return 0; diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c --- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800 @@ -421,7 +421,7 @@ im->w = L2RWORD(ilbm.bmhd.data); im->h = L2RWORD(ilbm.bmhd.data + 2); - if (im->w <= 0 || im->h <= 0) ok = 0; + if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0; ilbm.depth = ilbm.bmhd.data[8]; if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */ @@ -453,6 +453,7 @@ } } if (!full || !ok) { + im->w = im->h = 0; freeilbm(&ilbm); return ok; } @@ -467,12 +468,13 @@ cancel = 0; plane[0] = NULL; + n = ilbm.depth; + if (ilbm.mask == 1) n++; + im->data = malloc(im->w * im->h * sizeof(DATA32)); - if (im->data) { - n = ilbm.depth; - if (ilbm.mask == 1) n++; + plane[0] = malloc(((im->w + 15) / 16) * 2 * n); + if (im->data && plane[0]) { - plane[0] = malloc(((im->w + 15) / 16) * 2 * n); for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2; z = ((im->w + 15) / 16) * 2 * n; @@ -511,6 +513,7 @@ * the memory for im->data. *----------*/ if (!ok) { + im->w = im->h = 0; if (im->data) free(im->data); im->data = NULL; } diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c --- imlib2-1.2.1/src/modules/loaders/loader_png.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c 2006-11-06 01:30:41.000000000 -0800 @@ -83,6 +83,13 @@ png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32), (png_uint_32 *) (&h32), &bit_depth, &color_type, &interlace_type, NULL, NULL); + if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383) + { + png_read_end(png_ptr, info_ptr); + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + fclose(f); + return 0; + } im->w = (int)w32; im->h = (int)h32; if (color_type == PNG_COLOR_TYPE_PALETTE) diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c --- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800 @@ -80,7 +80,7 @@ int i = 0; /* read numbers */ - while (c != EOF && !isspace(c)) + while (c != EOF && i+1 < sizeof(buf) && !isspace(c)) { buf[i++] = c; c = fgetc(f); diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c --- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800 @@ -319,6 +319,7 @@ { unsigned long datasize; unsigned char *bufptr; + unsigned char *bufend; DATA32 *dataptr; int y, pl = 0; @@ -348,6 +349,9 @@ /* bufptr is the next byte to be read from the buffer */ bufptr = filedata; + /* bufend is one past the last byte to be read from the buffer */ + bufend = filedata + datasize; + /* dataptr is the next 32-bit pixel to be filled in */ dataptr = im->data; @@ -365,7 +369,9 @@ else dataptr = im->data + (y * im->w); - for (x = 0; x < im->w; x++) /* for each pixel in the row */ + for (x = 0; + x < im->w && bufptr+bpp/8 < bufend; + x++) /* for each pixel in the row */ { switch (bpp) { @@ -422,8 +428,8 @@ unsigned char curbyte, red, green, blue, alpha; DATA32 *final_pixel = dataptr + im->w * im->h; - /* loop until we've got all the pixels */ - while (dataptr < final_pixel) + /* loop until we've got all the pixels or run out of input */ + while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend) { int count; @@ -441,7 +447,7 @@ green = *bufptr++; red = *bufptr++; alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, alpha); dataptr++; @@ -452,7 +458,7 @@ blue = *bufptr++; green = *bufptr++; red = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, red, green, blue, (char)0xff); @@ -462,7 +468,7 @@ case 8: alpha = *bufptr++; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { WRITE_RGBA(dataptr, alpha, alpha, alpha, (char)0xff); @@ -477,7 +483,7 @@ { int i; - for (i = 0; i < count; i++) + for (i = 0; i < count && dataptr < final_pixel; i++) { switch (bpp) { diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c --- imlib2-1.2.1/src/modules/loaders/loader_tiff.c 2006-11-06 01:27:59.000000000 -0800 +++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c 2006-11-06 01:30:41.000000000 -0800 @@ -75,7 +75,7 @@ raster(TIFFRGBAImage_Extra * img, uint32 * rast, uint32 x, uint32 y, uint32 w, uint32 h) { - uint32 image_width, image_height; + int image_width, image_height; uint32 *pixel, pixel_value; int i, j, dy, rast_offset; DATA32 *buffer_pixel, *buffer = img->image->data; @@ -192,8 +192,16 @@ } rgba_image.image = im; - im->w = width = rgba_image.rgba.width; - im->h = height = rgba_image.rgba.height; + width = rgba_image.rgba.width; + height = rgba_image.rgba.height; + if (width < 1 || height < 1 || width >= 16384 || height >= 16384) + { + TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image); + TIFFClose(tif); + return 0; + } + im->w = width; + im->h = height; rgba_image.num_pixels = num_pixels = width * height; if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED) SET_FLAG(im->flags, F_HAS_ALPHA); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3 +++ .cvsignore 9 Nov 2006 10:19:56 -0000 1.4 @@ -1 +1 @@ -imlib2-1.1.2.tar.gz +imlib2-1.2.1.tar.gz Index: imlib2.spec =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-3/imlib2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- imlib2.spec 5 Apr 2005 19:07:53 -0000 1.10 +++ imlib2.spec 9 Nov 2006 10:19:56 -0000 1.11 @@ -1,12 +1,12 @@ -Summary: Graphic library for file loading, saving, rendering, and manipulation +Summary: Image loading, saving, rendering, and manipulation library Name: imlib2 -Version: 1.2.0 -Release: 7.fc3 +Version: 1.2.1 +Release: 2%{?dist} License: BSD Group: System Environment/Libraries -URL: http://www.enlightenment.org/pages/imlib2.html +URL: http://www.enlightenment.org/Libraries/Imlib2/ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz -Patch0: imlib2-1.2.0-configure-xlib64.patch +Patch0: imlib2-1.3.0-loader_overflows.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel BuildRequires: libungif-devel freetype-devel libtool bzip2-devel %{__perl} @@ -19,43 +19,46 @@ %description -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %description devel This package contains development files for %{name}. -Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is -a completely new library. Imlib 2 can be installed alongside Imlib 1.x -without any problems since they are effectively different libraries -which have very similar functionality. Please see the homepage for the -long description of the differences. +Imlib 2 is a library that does image file loading and saving as well +as rendering, manipulation, arbitrary polygon support, etc. It does +ALL of these operations FAST. Imlib2 also tries to be highly +intelligent about doing them, so writing naive programs can be done +easily, without sacrificing speed. This is a complete rewrite over +the Imlib 1.x series. The architecture is more modular, simple, and +flexible. %prep %setup -q -%ifarch x86_64 -%patch0 -b .patch0 -%endif -# loaders need to link with the main lib -%{__perl} -pi -e \ - 's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ; - s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.* +%patch0 -p1 -b .overflow %build -%configure \ - --x-libraries=%{_prefix}/X11R6/%{_lib} \ - --with-pic \ +asmopts="--disable-mmx --disable-amd64" %ifarch %{ix86} ia64 - --enable-mmx -%else - --disable-mmx +asmopts="--enable-mmx --disable-amd64" %endif %ifarch x86_64 +asmopts="--disable-mmx --enable-amd64" +%endif + +%configure --disable-dependency-tracking \ + --x-libraries=%{_prefix}/X11R6/%{_lib} \ + --with-pic \ + $asmopts + +%ifarch x86_64 # fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs # returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz": %{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \ @@ -66,20 +69,14 @@ %install -rm -rf $RPM_BUILD_ROOT __doc +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool -cp -a doc __doc -rm -f __doc/Makefile* - -# remove unexpanded variable in pkgconfig file -sed -i -e 's!@requirements@!!g' ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/imlib2.pc - rm -f \ $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \ - $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test} + $RPM_BUILD_ROOT%{_bindir}/imlib2_test -# ship .la files due to a bug in kdelibs (see changelog): +# ship .la files due to a bug in kdelibs (bugzilla.fedora.us #2284): # $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \ @@ -93,7 +90,7 @@ %files %defattr(-,root,root,-) -%doc COPYING AUTHORS README ChangeLog TODO __doc/* +%doc COPYING AUTHORS README ChangeLog TODO %{_bindir}/imlib2_view %{_bindir}/imlib2_bumpmap %{_bindir}/imlib2_colorspace @@ -113,6 +110,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/*.gif doc/*.html %{_bindir}/imlib2-config %{_includedir}/Imlib2.h %{_libdir}/libImlib2.a @@ -122,7 +120,20 @@ %changelog -* Tue Apr 5 2005 Michael Schwendt - 1.2.0-7.fc3 +* Thu Nov 9 2006 Hans de Goede 1.2.1-2 +- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to + Ubuntu for the patch (bug 214676) + +* Sun Aug 28 2005 Ville Skytt?? - 1.2.1-1 +- 1.2.1, patches applied/obsoleted upstream. +- Improve summary and description, fix URL. +- Move HTML docs to -devel. +- Build with dependency tracking disabled. + +* Mon May 9 2005 Michael Schwendt - 1.2.0-8.fc4 +- Fix segfault in XPM loader (#156058). + +* Tue Apr 5 2005 Michael Schwendt - 1.2.0-7.fc4 - Fix broken pkgconfig file. * Fri Apr 1 2005 Michael Schwendt - 1.2.0-6 Index: sources =================================================================== RCS file: /cvs/extras/rpms/imlib2/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Jan 2005 09:43:09 -0000 1.4 +++ sources 9 Nov 2006 10:19:56 -0000 1.5 @@ -1 +1 @@ -853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz +e32970d03d8aee2885782312d0a7f15f imlib2-1.2.1.tar.gz --- imlib2-1.2.0-configure-xlib64.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 9 10:21:38 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 9 Nov 2006 03:21:38 -0700 Subject: rpms/mod_fcgid/FC-5 .cvsignore, 1.2, 1.3 configuration.htm, 1.1, 1.2 doc.htm, 1.1, 1.2 mod_fcgid.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200611091021.kA9ALc5u013210@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-serv13186 Modified Files: .cvsignore configuration.htm doc.htm mod_fcgid.spec sources Log Message: resync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Sep 2006 13:08:59 -0000 1.2 +++ .cvsignore 9 Nov 2006 10:21:07 -0000 1.3 @@ -1 +1 @@ -mod_fcgid.1.10.tar.gz +mod_fcgid.2.0.tar.gz Index: configuration.htm =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/configuration.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configuration.htm 6 Sep 2006 13:08:59 -0000 1.1 +++ configuration.htm 9 Nov 2006 10:21:07 -0000 1.2 @@ -9,62 +9,62 @@ -

    This is a for regular fastcgi. 

    LoadModule fcgid_module +

    This is a for regular fastcgi. 

    LoadModule fcgid_module modules/mod_fcgid.so

    -<Location /fcgid>
    -    SetHandler fcgid-script
    -    Options ExecCGI
    -    allow from all
    +<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 +

    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 /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 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 +

    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
    +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
    +

    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 *: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 /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>

    @@ -79,23 +79,89 @@


    -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

    +<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
    </Directory>

    +

    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 +(default On)

    +

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

    + +
    +

    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 +(default On)

    + +

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

    + +
    +

    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 +(default On)

    +

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

    +

    ??

    +

    ??

    + +

    ??

    +

    ??

    +

    ??

    +

    ??

    +

    ??

    +

    ??

    +

    ??

    +

    ??

    +

    ??

    +

    ??

    +

    ??

    ??

    ??

    ??

    Index: doc.htm =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/doc.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- doc.htm 6 Sep 2006 13:08:59 -0000 1.1 +++ doc.htm 9 Nov 2006 10:21:07 -0000 1.2 @@ -51,7 +51,10 @@ (non-PHP, non-Ruby, non-Python) 

    Configuration for suEXEC fastcgi

    Configuration for PHP (UNIX)

    Configuration for suPHP (UNIX)

    Configuration -for PHP (Windows)

      +for PHP (Windows)

    Configuration +for Authenticator

    Configuration +for Authorizer

    Configuration +for AccessChecker

     

    • There are @@ -90,9 +93,16 @@ 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 +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. +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: mod_fcgid.spec =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/mod_fcgid.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_fcgid.spec 6 Sep 2006 13:47:08 -0000 1.2 +++ mod_fcgid.spec 9 Nov 2006 10:21:07 -0000 1.3 @@ -10,13 +10,13 @@ %endif Name: mod_fcgid -Version: 1.10 -Release: 7%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: Apache2 module for high-performance server-side scripting Group: System Environment/Daemons License: GPL URL: http://fastcgi.coremail.cn/ -Source0: http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz +Source0: http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz Source1: fcgid.conf Source2: fastcgi.te Source3: fastcgi.fc @@ -144,6 +144,11 @@ %endif %changelog +* Mon Oct 30 2006 Paul Howarth 2.0-1 +- Update to 2.0 +- Source is now hosted at sourceforge.net +- Update docs + * Wed Sep 6 2006 Paul Howarth 1.10-7 - Include the right README* files Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Sep 2006 13:08:59 -0000 1.2 +++ sources 9 Nov 2006 10:21:07 -0000 1.3 @@ -1 +1 @@ -6c36b18548ca64864ed3dd4cb759062f mod_fcgid.1.10.tar.gz +3aa51f1e293e6d881028295a23021dae mod_fcgid.2.0.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 10:33:50 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 9 Nov 2006 03:33:50 -0700 Subject: extras-buildsys/utils/pushscript README,1.7,1.8 Message-ID: <200611091033.kA9AXokT013332@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314 Modified Files: README Log Message: add note about "comps" working-copy Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- README 1 Nov 2006 11:40:24 -0000 1.7 +++ README 9 Nov 2006 10:33:47 -0000 1.8 @@ -40,3 +40,18 @@ pushscript/List.py Extras +[...] + +comps.xml updates: + + Works with a manually exported "comps" module from Fedora Extras CVS + (/srv/rpmbuild/extras-push-rundir/comps) which is updated automatically + except for a few security relevant Makefiles and scripts which names + are defined in Config_Extras.py. If these files need an important update, + they must be verified and updated manually. + + The working-copy is created like this: + + $ cd /srv/rpmbuild/extras-push-rundir + $ LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras co comps + From fedora-extras-commits at redhat.com Thu Nov 9 10:52:36 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 9 Nov 2006 03:52:36 -0700 Subject: rpms/mail-notification/FC-6 mail-notification-fedora-plugin-hint.patch, 1.1, 1.2 mail-notification.spec, 1.30, 1.31 Message-ID: <200611091052.kA9Aqaee013390@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-serv13368 Modified Files: mail-notification-fedora-plugin-hint.patch mail-notification.spec Log Message: 3.0-10 -- Update patch (fix typo, clarify wording) mail-notification-fedora-plugin-hint.patch: Index: mail-notification-fedora-plugin-hint.patch =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-6/mail-notification-fedora-plugin-hint.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mail-notification-fedora-plugin-hint.patch 8 Nov 2006 16:37:41 -0000 1.1 +++ mail-notification-fedora-plugin-hint.patch 9 Nov 2006 10:52:05 -0000 1.2 @@ -6,7 +6,7 @@ selfp->listener = bonobo_object_release_unref(selfp->listener, NULL); - label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded.")); -+ label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded and installed. Fedora ships the plugin in a sperate package called mail-notification-evolution-plugin you might need to install manually.")); ++ label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is installed and loaded. Fedora ships the plugin in a separate package called mail-notification-evolution-plugin you might need to install manually.")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/FC-6/mail-notification.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mail-notification.spec 8 Nov 2006 16:37:41 -0000 1.30 +++ mail-notification.spec 9 Nov 2006 10:52:05 -0000 1.31 @@ -1,6 +1,6 @@ Name: mail-notification Version: 3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -129,6 +129,9 @@ %changelog +* 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 From fedora-extras-commits at redhat.com Thu Nov 9 10:53:51 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Thu, 9 Nov 2006 03:53:51 -0700 Subject: rpms/mail-notification/devel mail-notification-fedora-plugin-hint.patch, 1.1, 1.2 mail-notification.spec, 1.31, 1.32 Message-ID: <200611091053.kA9ArpoM013461@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/mail-notification/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13440 Modified Files: mail-notification-fedora-plugin-hint.patch mail-notification.spec Log Message: 3.0-10 -- Update patch (fix typo, clarify wording) mail-notification-fedora-plugin-hint.patch: Index: mail-notification-fedora-plugin-hint.patch =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-fedora-plugin-hint.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mail-notification-fedora-plugin-hint.patch 4 Nov 2006 13:04:46 -0000 1.1 +++ mail-notification-fedora-plugin-hint.patch 9 Nov 2006 10:53:20 -0000 1.2 @@ -6,7 +6,7 @@ selfp->listener = bonobo_object_release_unref(selfp->listener, NULL); - label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded.")); -+ label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded and installed. Fedora ships the plugin in a sperate package called mail-notification-evolution-plugin you might need to install manually.")); ++ label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is installed and loaded. Fedora ships the plugin in a separate package called mail-notification-evolution-plugin you might need to install manually.")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); Index: mail-notification.spec =================================================================== RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mail-notification.spec 4 Nov 2006 13:04:46 -0000 1.31 +++ mail-notification.spec 9 Nov 2006 10:53:20 -0000 1.32 @@ -2,7 +2,7 @@ Name: mail-notification Version: 3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -133,6 +133,9 @@ %changelog +* 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 From fedora-extras-commits at redhat.com Thu Nov 9 11:34:19 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 9 Nov 2006 04:34:19 -0700 Subject: fedora-security/audit fc5,1.385,1.386 fc6,1.137,1.138 Message-ID: <200611091134.kA9BYJXi021728@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21665 Modified Files: fc5 fc6 Log Message: Updates for new CVEs Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- fc5 8 Nov 2006 13:28:25 -0000 1.385 +++ fc5 9 Nov 2006 11:34:15 -0000 1.386 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20061107 -Up to date FC5 as of 20061107 +Up to date CVE as of CVE email 20061108 +Up to date FC5 as of 20061108 ** are items that need attention +CVE-2006-5823 ** kernel +CVE-2006-5794 ** openssh CVE-2006-5783 ignore (firefox) disputed CVE-2006-5757 ** kernel CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194] @@ -21,6 +23,7 @@ CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110] CVE-2006-5464 version (thunderbird) [since FEDORA-2006-1194] CVE-2006-5463 version (thunderbird) [since FEDORA-2006-1194] +CVE-2006-5462 version (thunderbird) [since FEDORA-2006-1194] CVE-2006-5466 VULNERABLE (rpm) #212833 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168] CVE-2006-5456 VULNERABLE (ImageMagick) #210921 @@ -53,6 +56,7 @@ CVE-2006-4813 version (kernel, fixed 2.6.13) CVE-2006-4812 backport (php) [since FEDORA-2006-1024] ** CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056] +CVE-2006-4810 ** texinfo CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141] CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974] CVE-2006-4663 ignore (kernel) not a vulnerability Index: fc6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc6,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- fc6 8 Nov 2006 13:28:25 -0000 1.137 +++ fc6 9 Nov 2006 11:34:15 -0000 1.138 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20061107 -Up to date FC6 as of 20061107 +Up to date CVE as of CVE email 20061108 +Up to date FC6 as of 20061108 ** are items that need attention +CVE-2006-5823 ** kernel +CVE-2006-5794 ** openssh CVE-2006-5783 ignore (firefox) disputed CVE-2006-5757 ** kernel CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191] @@ -27,6 +29,8 @@ CVE-2006-5464 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192] CVE-2006-5463 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191] CVE-2006-5463 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192] +CVE-2006-5462 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191] +CVE-2006-5462 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192] CVE-2006-5456 VULNERABLE (ImageMagick) #210921 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2) @@ -57,6 +61,7 @@ CVE-2006-4813 version (kernel, fixed 2.6.13) CVE-2006-4812 VULNERABLE (php) CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055] +CVE-2006-4810 ** texinfo CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140] CVE-2006-4790 backport (gnutls, fixed 1.4.4) CVE-2006-4663 ignore (kernel) not a vulnerability From fedora-extras-commits at redhat.com Thu Nov 9 11:41:37 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Thu, 9 Nov 2006 04:41:37 -0700 Subject: rpms/multican - New directory Message-ID: <200611091141.kA9BfbSZ021881@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/multican In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21877/multican Log Message: Directory /cvs/extras/rpms/multican added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 11:41:43 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Thu, 9 Nov 2006 04:41:43 -0700 Subject: rpms/multican/devel - New directory Message-ID: <200611091141.kA9Bfhc3021895@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/multican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21877/multican/devel Log Message: Directory /cvs/extras/rpms/multican/devel added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 11:42:05 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Thu, 9 Nov 2006 04:42:05 -0700 Subject: rpms/multican Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611091142.kA9Bg5R7021942@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/multican In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21936 Added Files: Makefile import.log Log Message: Setup of module multican --- NEW FILE Makefile --- # Top level Makefile for module multican 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 Nov 9 11:42:11 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Thu, 9 Nov 2006 04:42:11 -0700 Subject: rpms/multican/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611091142.kA9BgBqD021962@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/multican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21936/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module multican --- 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 Nov 9 11:43:20 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Thu, 9 Nov 2006 04:43:20 -0700 Subject: rpms/multican import.log,1.1,1.2 Message-ID: <200611091143.kA9BhKN1022052@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/multican In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22007 Modified Files: import.log Log Message: auto-import multican-0.0.4-1 on branch devel from multican-0.0.4-1.src.rpm initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/multican/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Nov 2006 11:42:05 -0000 1.1 +++ import.log 9 Nov 2006 11:42:50 -0000 1.2 @@ -0,0 +1 @@ +multican-0_0_4-1:HEAD:multican-0.0.4-1.src.rpm:1163072562 From fedora-extras-commits at redhat.com Thu Nov 9 11:43:21 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Thu, 9 Nov 2006 04:43:21 -0700 Subject: rpms/multican/devel multican.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611091143.kA9BhLN4022056@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/multican/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22007/devel Modified Files: .cvsignore sources Added Files: multican.spec Log Message: auto-import multican-0.0.4-1 on branch devel from multican-0.0.4-1.src.rpm initial import --- NEW FILE multican.spec --- Summary: Remote control utility for Canon cameras Name: multican Version: 0.0.4 Release: 1%{?dist} Source0: http://prdownloads.sourceforge.net/multican/%{name}-%{version}.tar.gz URL: http://multican.sourceforge.net/ License: GPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel >= 0.1.12 Requires: libusb >= 0.1.12 %description Multican is Canon EOS class USB remote control utility for 400D, 300D, 350D, 30D, 20D and 5D. It is possible to control more of Canon cameras in the same time up to six cameras attached. Multican allows scripted remote control of multiple cameras. %prep %setup -q %build make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT make BINDIR="$RPM_BUILD_ROOT%{_bindir}" install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING TODO README ChangeLog %{_bindir}/* %changelog * Tue Nov 07 2006 Jindrich Novy 0.0.4-1 - initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multican/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Nov 2006 11:42:11 -0000 1.1 +++ .cvsignore 9 Nov 2006 11:42:51 -0000 1.2 @@ -0,0 +1 @@ +multican-0.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/multican/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Nov 2006 11:42:11 -0000 1.1 +++ sources 9 Nov 2006 11:42:51 -0000 1.2 @@ -0,0 +1 @@ +a620f5a908f7ea7ea40724674f05ef0e multican-0.0.4.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 12:26:06 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 9 Nov 2006 05:26:06 -0700 Subject: extras-buildsys/utils/pushscript Utils.py,1.6,1.7 Message-ID: <200611091226.kA9CQ6SK025302@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25284 Modified Files: Utils.py Log Message: Index: Utils.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Utils.py 28 Oct 2006 00:54:49 -0000 1.6 +++ Utils.py 9 Nov 2006 12:26:03 -0000 1.7 @@ -199,6 +199,7 @@ if os.path.getmtime(repodir) > ref_mtime: return True ignored_dirs = ( + os.path.join(repodir, 'repodata', 'repoview'), os.path.join(repodir, 'repodata'), os.path.join(repodir, 'debug'), ) From fedora-extras-commits at redhat.com Thu Nov 9 12:31:23 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 9 Nov 2006 05:31:23 -0700 Subject: extras-buildsys/utils/pushscript Utils.py,1.7,1.8 Message-ID: <200611091231.kA9CVNaO025362@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25344 Modified Files: Utils.py Log Message: Index: Utils.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Utils.py 9 Nov 2006 12:26:03 -0000 1.7 +++ Utils.py 9 Nov 2006 12:31:20 -0000 1.8 @@ -199,7 +199,6 @@ if os.path.getmtime(repodir) > ref_mtime: return True ignored_dirs = ( - os.path.join(repodir, 'repodata', 'repoview'), os.path.join(repodir, 'repodata'), os.path.join(repodir, 'debug'), ) From fedora-extras-commits at redhat.com Thu Nov 9 13:42:49 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 9 Nov 2006 06:42:49 -0700 Subject: rpms/pungi - New directory Message-ID: <200611091342.kA9DgngX028617@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28613/pungi Log Message: Directory /cvs/extras/rpms/pungi added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 13:42:55 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 9 Nov 2006 06:42:55 -0700 Subject: rpms/pungi/devel - New directory Message-ID: <200611091342.kA9Dgt1w028631@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28613/pungi/devel Log Message: Directory /cvs/extras/rpms/pungi/devel added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 13:43:06 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 9 Nov 2006 06:43:06 -0700 Subject: rpms/pungi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611091343.kA9Dh6oT028662@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28656 Added Files: Makefile import.log Log Message: Setup of module pungi --- NEW FILE Makefile --- # Top level Makefile for module pungi 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 Nov 9 13:43:12 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 9 Nov 2006 06:43:12 -0700 Subject: rpms/pungi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611091343.kA9DhCQX028680@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28656/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pungi --- 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 Nov 9 13:44:00 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 9 Nov 2006 06:44:00 -0700 Subject: rpms/pungi import.log,1.1,1.2 Message-ID: <200611091344.kA9Di0gW028754@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28720 Modified Files: import.log Log Message: auto-import pungi-0.1.0-1 on branch devel from pungi-0.1.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pungi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Nov 2006 13:43:06 -0000 1.1 +++ import.log 9 Nov 2006 13:43:30 -0000 1.2 @@ -0,0 +1 @@ +pungi-0_1_0-1:HEAD:pungi-0.1.0-1.src.rpm:1163079833 From fedora-extras-commits at redhat.com Thu Nov 9 13:44:01 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Thu, 9 Nov 2006 06:44:01 -0700 Subject: rpms/pungi/devel pungi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611091344.kA9Di1QA028758@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/extras/rpms/pungi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28720/devel Modified Files: .cvsignore sources Added Files: pungi.spec Log Message: auto-import pungi-0.1.0-1 on branch devel from pungi-0.1.0-1.src.rpm --- NEW FILE pungi.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pungi Version: 0.1.0 Release: 1%{?dist} Summary: Distribution compose tool Group: Development/Tools License: GPL URL: http://linux.duke.edu/projects/%{name} Source0: http://linux.duke.edu/projects/%{name}/release/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: anaconda-runtime BuildArch: noarch %description A tool to create anaconda based installation trees/isos of a set of rpms. %prep %setup -q %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Authors Changelog COPYING GPL PLAN.gather PLAN.pungi README ToDo %config(noreplace) %{_sysconfdir}/pungi # For noarch packages: sitelib %{python_sitelib}/pypungi %{_bindir}/pungi %changelog * Wed Nov 8 2006 Jesse Keating - 0.1.0-1 - Initial spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pungi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Nov 2006 13:43:12 -0000 1.1 +++ .cvsignore 9 Nov 2006 13:43:30 -0000 1.2 @@ -0,0 +1 @@ +pungi-0.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pungi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Nov 2006 13:43:12 -0000 1.1 +++ sources 9 Nov 2006 13:43:31 -0000 1.2 @@ -0,0 +1 @@ +6fab9b1b9979aa59b9db5880abfe6136 pungi-0.1.0.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 13:48:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 9 Nov 2006 06:48:31 -0700 Subject: extras-buildsys/utils/pushscript Push.py,1.14,1.15 Message-ID: <200611091348.kA9DmVnB028861@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/fedora/extras-buildsys/utils/pushscript In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28843 Modified Files: Push.py Log Message: run less stuff with -s Index: Push.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Push.py 9 Nov 2006 00:57:08 -0000 1.14 +++ Push.py 9 Nov 2006 13:48:29 -0000 1.15 @@ -593,6 +593,8 @@ if '-s' in sys.argv[2:]: sys.argv.remove('-s') cfg.post_cmds = [] + cfg.opts.repoprune = False + cfg.opts.repoview = False diststopush = [] for d in sys.argv[2:]: From fedora-extras-commits at redhat.com Thu Nov 9 14:13:49 2006 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Thu, 9 Nov 2006 07:13:49 -0700 Subject: rpms/audacious/devel audacious.spec, 1.15, 1.16 audacious-1.1.2-mainwin-update.patch, 1.2, NONE Message-ID: <200611091413.kA9EDnt6031948@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/audacious/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31932 Modified Files: audacious.spec Removed Files: audacious-1.1.2-mainwin-update.patch Log Message: - Drop the main window update patch Index: audacious.spec =================================================================== RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- audacious.spec 7 Nov 2006 15:00:48 -0000 1.15 +++ audacious.spec 9 Nov 2006 14:13:19 -0000 1.16 @@ -1,6 +1,6 @@ Name: audacious Version: 1.1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A GTK2 based media player similar to xmms Group: Applications/Multimedia @@ -20,7 +20,6 @@ Patch6: audacious-1.1.1-shaded-skin.patch Patch7: audacious-1.1.1-controlsocket-name.patch Patch8: audacious-1.1.1-playlist-twenty.patch -Patch9: audacious-1.1.2-mainwin-update.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0 @@ -118,9 +117,6 @@ # Fix "%20" in playlist entries %patch8 -p1 -b playlist-twenty -# Decease main window update frequency when the player is idle -%patch9 -p1 -b mainwin-update - %build %configure \ --disable-rpath \ @@ -213,6 +209,9 @@ %changelog +* Thu Nov 9 2006 Ralf Ertzinger 1.1.2-8.fc7 +- Drop the main window update patch + * Tue Nov 7 2006 Ralf Ertzinger 1.1.2-7.fc7 - Disable gnome-vfs, it causes too much trouble - Add --enable-chardet --- audacious-1.1.2-mainwin-update.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 9 14:17:55 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 07:17:55 -0700 Subject: rpms/translate-toolkit/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 translate-toolkit.spec, 1.10, 1.11 Message-ID: <200611091417.kA9EHtIv032023@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31999 Modified Files: .cvsignore sources translate-toolkit.spec Log Message: clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Nov 2006 19:46:49 -0000 1.5 +++ .cvsignore 9 Nov 2006 14:17:25 -0000 1.6 @@ -1 +1 @@ -translate-toolkit-0.8.tar.gz +translate-toolkit-0.10.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Nov 2006 19:46:49 -0000 1.6 +++ sources 9 Nov 2006 14:17:25 -0000 1.7 @@ -1 +1 @@ -81204110ab605435862b8999558e9649 translate-toolkit-0.8.tar.gz +b9042e727f1dcd8b9427a7fb8127ba7e translate-toolkit-0.10.1.tar.bz2 Index: translate-toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/devel/translate-toolkit.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- translate-toolkit.spec 8 Nov 2006 19:52:41 -0000 1.10 +++ translate-toolkit.spec 9 Nov 2006 14:17:25 -0000 1.11 @@ -1,18 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: translate-toolkit -Version: 0.8 -Release: 2%{?dist} +Version: 0.10.1 +Release: 1%{?dist} Summary: A collection of tools to assist software localization Group: Development/Tools License: GPL URL: http://translate.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +BuildRequires: python-devel Requires: python-elementtree Requires: python-enchant @@ -24,11 +24,11 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install @@ -45,23 +45,25 @@ %files %defattr(-,root,root,-) -%doc ChangeLog translate/COPYING translate/README +%doc translate/ChangeLog translate/COPYING translate/README %dir %{python_sitelib}/translate %dir %{python_sitelib}/translate/tools %dir %{python_sitelib}/translate/filters %dir %{python_sitelib}/translate/storage %dir %{python_sitelib}/translate/misc %dir %{python_sitelib}/translate/convert -%{python_sitelib}/translate/*.py -%{python_sitelib}/translate/*.pyc -%ghost %{python_sitelib}/translate/*.pyo -%{python_sitelib}/translate/*/*.py -%{python_sitelib}/translate/*/*.pyc -%ghost %{python_sitelib}/translate/*/*.pyo +%{python_sitelib}/translate/*.py* +%{python_sitelib}/translate/*/*.py* %{_bindir}/* +%exclude %{_bindir}/*.pyc +%exclude %{_bindir}/*.pyo %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 0.10.1-1 +- Update to upstream 0.10.1 +- Cleanup based on latest Python packaging guidelines + * Wed Nov 08 2006 Roozbeh Pournader - 0.8-2 - Rebuild to get into Rawhide From fedora-extras-commits at redhat.com Thu Nov 9 14:19:28 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 07:19:28 -0700 Subject: rpms/translate-toolkit/FC-6 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 translate-toolkit.spec, 1.10, 1.11 Message-ID: <200611091419.kA9EJSVW032087@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32067 Modified Files: .cvsignore sources translate-toolkit.spec Log Message: clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Nov 2006 19:46:49 -0000 1.5 +++ .cvsignore 9 Nov 2006 14:18:58 -0000 1.6 @@ -1 +1 @@ -translate-toolkit-0.8.tar.gz +translate-toolkit-0.10.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Nov 2006 19:46:49 -0000 1.6 +++ sources 9 Nov 2006 14:18:58 -0000 1.7 @@ -1 +1 @@ -81204110ab605435862b8999558e9649 translate-toolkit-0.8.tar.gz +b9042e727f1dcd8b9427a7fb8127ba7e translate-toolkit-0.10.1.tar.bz2 Index: translate-toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-6/translate-toolkit.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- translate-toolkit.spec 8 Nov 2006 19:52:41 -0000 1.10 +++ translate-toolkit.spec 9 Nov 2006 14:18:58 -0000 1.11 @@ -1,18 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: translate-toolkit -Version: 0.8 -Release: 2%{?dist} +Version: 0.10.1 +Release: 1%{?dist} Summary: A collection of tools to assist software localization Group: Development/Tools License: GPL URL: http://translate.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +BuildRequires: python-devel Requires: python-elementtree Requires: python-enchant @@ -24,11 +24,11 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install @@ -45,23 +45,25 @@ %files %defattr(-,root,root,-) -%doc ChangeLog translate/COPYING translate/README +%doc translate/ChangeLog translate/COPYING translate/README %dir %{python_sitelib}/translate %dir %{python_sitelib}/translate/tools %dir %{python_sitelib}/translate/filters %dir %{python_sitelib}/translate/storage %dir %{python_sitelib}/translate/misc %dir %{python_sitelib}/translate/convert -%{python_sitelib}/translate/*.py -%{python_sitelib}/translate/*.pyc -%ghost %{python_sitelib}/translate/*.pyo -%{python_sitelib}/translate/*/*.py -%{python_sitelib}/translate/*/*.pyc -%ghost %{python_sitelib}/translate/*/*.pyo +%{python_sitelib}/translate/*.py* +%{python_sitelib}/translate/*/*.py* %{_bindir}/* +%exclude %{_bindir}/*.pyc +%exclude %{_bindir}/*.pyo %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 0.10.1-1 +- Update to upstream 0.10.1 +- Cleanup based on latest Python packaging guidelines + * Wed Nov 08 2006 Roozbeh Pournader - 0.8-2 - Rebuild to get into Rawhide From fedora-extras-commits at redhat.com Thu Nov 9 14:20:11 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 07:20:11 -0700 Subject: rpms/translate-toolkit/FC-5 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 translate-toolkit.spec, 1.7, 1.8 Message-ID: <200611091420.kA9EKB2h032155@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/translate-toolkit/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32093 Modified Files: .cvsignore sources translate-toolkit.spec Log Message: clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Feb 2006 13:06:04 -0000 1.3 +++ .cvsignore 9 Nov 2006 14:19:41 -0000 1.4 @@ -1 +1 @@ -translate-toolkit-0.8.tar.gz +translate-toolkit-0.10.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Feb 2006 13:06:04 -0000 1.4 +++ sources 9 Nov 2006 14:19:41 -0000 1.5 @@ -1 +1 @@ -81204110ab605435862b8999558e9649 translate-toolkit-0.8.tar.gz +b9042e727f1dcd8b9427a7fb8127ba7e translate-toolkit-0.10.1.tar.bz2 Index: translate-toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/translate-toolkit/FC-5/translate-toolkit.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- translate-toolkit.spec 20 Feb 2006 13:06:04 -0000 1.7 +++ translate-toolkit.spec 9 Nov 2006 14:19:41 -0000 1.8 @@ -1,18 +1,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: translate-toolkit -Version: 0.8 +Version: 0.10.1 Release: 1%{?dist} Summary: A collection of tools to assist software localization Group: Development/Tools License: GPL URL: http://translate.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +BuildRequires: python-devel Requires: python-elementtree Requires: python-enchant @@ -24,11 +24,11 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install @@ -45,23 +45,28 @@ %files %defattr(-,root,root,-) -%doc ChangeLog translate/COPYING translate/README +%doc translate/ChangeLog translate/COPYING translate/README %dir %{python_sitelib}/translate %dir %{python_sitelib}/translate/tools %dir %{python_sitelib}/translate/filters %dir %{python_sitelib}/translate/storage %dir %{python_sitelib}/translate/misc %dir %{python_sitelib}/translate/convert -%{python_sitelib}/translate/*.py -%{python_sitelib}/translate/*.pyc -%ghost %{python_sitelib}/translate/*.pyo -%{python_sitelib}/translate/*/*.py -%{python_sitelib}/translate/*/*.pyc -%ghost %{python_sitelib}/translate/*/*.pyo +%{python_sitelib}/translate/*.py* +%{python_sitelib}/translate/*/*.py* %{_bindir}/* +%exclude %{_bindir}/*.pyc +%exclude %{_bindir}/*.pyo %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 0.10.1-1 +- Update to upstream 0.10.1 +- Cleanup based on latest Python packaging guidelines + +* Wed Nov 08 2006 Roozbeh Pournader - 0.8-2 +- Rebuild to get into Rawhide + * Mon Feb 20 2006 Roozbeh Pournader - 0.8-1 - Update to final 0.8 From fedora-extras-commits at redhat.com Thu Nov 9 14:38:55 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 07:38:55 -0700 Subject: rpms/fonttools/devel .cvsignore, 1.3, 1.4 fonttools.spec, 1.8, 1.9 sources, 1.4, 1.5 fonttools-20050315-20050624.patch, 1.3, NONE Message-ID: <200611091438.kA9Ect2U032311@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/fonttools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32291 Modified Files: fonttools.spec sources Added Files: .cvsignore Removed Files: fonttools-20050315-20050624.patch Log Message: clog Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 9 Nov 2006 14:38:24 -0000 1.4 @@ -0,0 +1 @@ +fonttools-2006-02-23.085153.tar.bz2 Index: fonttools.spec =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fonttools.spec 8 Nov 2006 20:05:31 -0000 1.8 +++ fonttools.spec 9 Nov 2006 14:38:24 -0000 1.9 @@ -1,21 +1,18 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define alphatag 20050624cvs +%define alphatag 20060223cvs Name: fonttools Version: 2.0 -Release: 0.8.%{alphatag}%{?dist} +Release: 0.9.%{alphatag}%{?dist} Summary: A tool to convert True/OpenType fonts to XML and back Group: Development/Tools License: BSD URL: http://sourceforge.net/projects/fonttools/ -Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2 -Patch1: fonttools-20050315-20050624.patch -Patch2: fonttools-unsigned-ranges.patch +Source0: http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2006-02-23.085153.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-numeric -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-numeric Provides: ttx @@ -28,8 +25,6 @@ %prep %setup -q -n %{name} -%patch1 -p1 -b .20050624 -%patch2 -p1 -b .unsigned-ranges %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py %{__chmod} a-x LICENSE.txt @@ -61,23 +56,19 @@ %dir %{python_sitearch}/FontTools/fontTools/pens %dir %{python_sitearch}/FontTools/fontTools/ttLib %dir %{python_sitearch}/FontTools/fontTools/ttLib/tables -%{python_sitearch}/FontTools/*.py -%{python_sitearch}/FontTools/*.pyc -%{python_sitearch}/FontTools/*.pyo -%{python_sitearch}/FontTools/fontTools/*.py -%{python_sitearch}/FontTools/fontTools/*.pyc -%{python_sitearch}/FontTools/fontTools/*.pyo -%{python_sitearch}/FontTools/fontTools/*/*.py -%{python_sitearch}/FontTools/fontTools/*/*.pyc -%{python_sitearch}/FontTools/fontTools/*/*.pyo -%{python_sitearch}/FontTools/fontTools/*/*/*.py -%{python_sitearch}/FontTools/fontTools/*/*/*.pyc -%{python_sitearch}/FontTools/fontTools/*/*/*.pyo +%{python_sitearch}/FontTools/*.py* +%{python_sitearch}/FontTools/fontTools/*.py* +%{python_sitearch}/FontTools/fontTools/*/*.py* +%{python_sitearch}/FontTools/fontTools/*/*/*.py* %{python_sitearch}/FontTools/fontTools/misc/eexecOp.so %{_bindir}/ttx %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 2.0-0.9.20060223cvs +- Update to newer CVS snapshot dated 2006-02-23 +- Cleanup based on latest Python packaging guidelines + * Wed Nov 08 2006 Roozbeh Pournader - 2.0-0.8.20050624cvs - De-ghost .pyo files Index: sources =================================================================== RCS file: /cvs/extras/rpms/fonttools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2006 19:17:12 -0000 1.4 +++ sources 9 Nov 2006 14:38:24 -0000 1.5 @@ -1 +1 @@ -b44a299a0530a2a4f65d1937aa99f734 fonttools-2005-03-15.210812.tar.bz2 +ffddf5c5c6b327e1855b934e98782717 fonttools-2006-02-23.085153.tar.bz2 --- fonttools-20050315-20050624.patch DELETED --- From fedora-extras-commits at redhat.com Thu Nov 9 15:51:12 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Nov 2006 08:51:12 -0700 Subject: owners owners.list,1.1908,1.1909 Message-ID: <200611091551.kA9FpCH0003446@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3428 Modified Files: owners.list Log Message: assme primary maintainership of qscintilla Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1908 retrieving revision 1.1909 diff -u -r1.1908 -r1.1909 --- owners.list 9 Nov 2006 00:43:28 -0000 1.1908 +++ owners.list 9 Nov 2006 15:50:42 -0000 1.1909 @@ -1974,7 +1974,7 @@ Fedora Extras|qjackctl|Qt based JACK control application|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org| Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|qscintilla|A Scintilla port to Qt|icon at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|icon at fedoraproject.org,extras-qa at fedoraproject.org| Fedora Extras|qstat|Real-time Game Server Status for FPS game servers|andy at smile.org.ua|extras-qa at fedoraproject.org| Fedora Extras|qsynth|Qt based Fluidsynth GUI front end|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org| Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Nov 9 16:07:29 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 9 Nov 2006 09:07:29 -0700 Subject: rpms/tracker/devel - New directory Message-ID: <200611091607.kA9G7TJA006584@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6566/tracker/devel Log Message: Directory /cvs/extras/rpms/tracker/devel added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 16:07:27 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 9 Nov 2006 09:07:27 -0700 Subject: rpms/tracker - New directory Message-ID: <200611091607.kA9G7Rr0006570@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6566/tracker Log Message: Directory /cvs/extras/rpms/tracker added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 16:07:44 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 9 Nov 2006 09:07:44 -0700 Subject: rpms/tracker Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611091607.kA9G7isE006618@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6612 Added Files: Makefile import.log Log Message: Setup of module tracker --- NEW FILE Makefile --- # Top level Makefile for module tracker 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 Nov 9 16:07:50 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 9 Nov 2006 09:07:50 -0700 Subject: rpms/tracker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611091607.kA9G7oZC006636@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6612/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tracker --- 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 Nov 9 16:08:50 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 9 Nov 2006 09:08:50 -0700 Subject: rpms/tracker import.log,1.1,1.2 Message-ID: <200611091608.kA9G8oJC006714@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6681 Modified Files: import.log Log Message: auto-import tracker-0.5.1-1 on branch devel from tracker-0.5.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tracker/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Nov 2006 16:07:44 -0000 1.1 +++ import.log 9 Nov 2006 16:08:20 -0000 1.2 @@ -0,0 +1 @@ +tracker-0_5_1-1:HEAD:tracker-0.5.1-1.src.rpm:1163088496 From fedora-extras-commits at redhat.com Thu Nov 9 16:08:51 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 9 Nov 2006 09:08:51 -0700 Subject: rpms/tracker/devel tracker.spec, NONE, 1.1 trackerd.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611091608.kA9G8pQf006718@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6681/devel Modified Files: .cvsignore sources Added Files: tracker.spec trackerd.desktop Log Message: auto-import tracker-0.5.1-1 on branch devel from tracker-0.5.1-1.src.rpm --- NEW FILE tracker.spec --- Summary: An object database, tag/metadata database, search tool and indexer Name: tracker Version: 0.5.1 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.gnome.org/~jamiemcc/tracker/ Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz Source1: trackerd.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmime-devel, poppler-devel, gettext BuildRequires: gnome-desktop-devel, gamin-devel BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel %if "%fedora" >= "6" BuildRequires: sqlite-devel %else BuildRequires: dbus-devel, dbus-glib %endif %description Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. It consists of a common object database that allows entities to have an almost infinte number of properties, metadata (both embedded/harvested as well as user definable), a comprehensive database of keywords/tags and links to other entities. It provides additional features for file based objects including context linking and audit trails for a file object. It has the ability to index, store, harvest metadata. retrieve and search all types of files and other first class objects %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains the static libraries and header files needed for developing with tracker %prep %setup -q %build %if "%fedora" >= "6" %configure --disable-static --enable-external-sqlite %else %configure --disable-static %endif # make %{?_smp_mflags} fails make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install # Add an autostart for trackerd mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/ rm -rf %{buildroot}%{_libdir}/*.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/htmless %{_bindir}/o3totxt %{_bindir}/tracker* %{_datadir}/tracker/ %{_datadir}/pixmaps/tracker/ %{_datadir}/dbus-1/services/tracker.service %{_libdir}/*.so.* %{_mandir}/man1/tracker*.1.gz %{_sysconfdir}/xdg/autostart/trackerd.desktop %files devel %defattr(-, root, root, -) %{_includedir}/tracker* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog * Mon Nov 06 2006 Deji Akingunola - 0.5.1-1 - Update to new version * Mon Nov 06 2006 Deji Akingunola - 0.5.0-7 - Have the devel subpackage require pkgconfig - Make the description field not have more than 76 characters on a line - Fix up the RPM group * Mon Nov 06 2006 Deji Akingunola - 0.5.0-6 - Explicitly require dbus-devel and dbus-glib (needed for FC < 6) * Sun Nov 05 2006 Deji Akingunola - 0.5.0-5 - Remove unneeded BRs (gnome-utils-devel and openssl-devel) * Sun Nov 05 2006 Deji Akingunola - 0.5.0-4 - Add autostart desktop file. - Edit the package description as suggested in review * Sat Nov 04 2006 Deji Akingunola - 0.5.0-3 - More cleaups to the spec file. * Sat Nov 04 2006 Deji Akingunola - 0.5.0-2 - Add needed BRs * Sat Nov 04 2006 Deji Akingunola - 0.5.0-1 - Initial packaging for Fedora Extras --- NEW FILE trackerd.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Tracker Comment=Tracker indexer and search tool daemon Icon= Exec=trackerd Terminal=false Type=Application Categories= X-GNOME-Autostart-enabled=true Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Nov 2006 16:07:50 -0000 1.1 +++ .cvsignore 9 Nov 2006 16:08:21 -0000 1.2 @@ -0,0 +1 @@ +tracker-0.5.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Nov 2006 16:07:50 -0000 1.1 +++ sources 9 Nov 2006 16:08:21 -0000 1.2 @@ -0,0 +1 @@ +133f836b1fa768aac9fc8d3255176da5 tracker-0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 16:13:41 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 9 Nov 2006 09:13:41 -0700 Subject: owners owners.list,1.1909,1.1910 Message-ID: <200611091613.kA9GDfo6006853@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6834 Modified Files: owners.list Log Message: Add an entry for tracker Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1909 retrieving revision 1.1910 diff -u -r1.1909 -r1.1910 --- owners.list 9 Nov 2006 15:50:42 -0000 1.1909 +++ owners.list 9 Nov 2006 16:13:11 -0000 1.1910 @@ -2264,6 +2264,7 @@ Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org| Fedora Extras|trackballs|Steer a marble ball through a labyrinth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|trackballs-music|In-game music for Trackballs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|tracker|An object database, tag/metadata database, search tool and indexer|dakingun at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|transmission|A lightweight GTK+ BitTorrent client|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|tre|POSIX compatible regexp library with approximate matching|rpm at greysector.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Nov 9 16:23:19 2006 From: fedora-extras-commits at redhat.com (Remi Collet (remi)) Date: Thu, 9 Nov 2006 09:23:19 -0700 Subject: rpms/php-pear-Net-FTP/FC-6 php-pear-Net-FTP.spec,1.1,1.2 Message-ID: <200611091623.kA9GNJnq006963@cvs-int.fedora.redhat.com> Author: remi Update of /cvs/extras/rpms/php-pear-Net-FTP/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6947 Modified Files: php-pear-Net-FTP.spec Log Message: bump release to build under FC6 Index: php-pear-Net-FTP.spec =================================================================== RCS file: /cvs/extras/rpms/php-pear-Net-FTP/FC-6/php-pear-Net-FTP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-Net-FTP.spec 7 Nov 2006 16:31:41 -0000 1.1 +++ php-pear-Net-FTP.spec 9 Nov 2006 16:22:49 -0000 1.2 @@ -3,7 +3,7 @@ Name: php-pear-Net-FTP Version: 1.3.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Provides an OO interface to the PHP FTP functions plus some additions Group: Development/Libraries @@ -87,6 +87,9 @@ %changelog +* Thu Nov 9 2006 Remi Collet 1.3.2-1.fc6.1 +- bump release to build under FC6 + * Sun Nov 5 2006 Remi Collet 1.3.2-1 - initial RPM (generated specfile + cleanup) - add CHANGELOG and LICENSE From fedora-extras-commits at redhat.com Thu Nov 9 16:24:33 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 9 Nov 2006 09:24:33 -0700 Subject: rpms/tracker/devel tracker.spec,1.1,1.2 Message-ID: <200611091624.kA9GOXUJ007052@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/tracker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6969 Modified Files: tracker.spec Log Message: Use space not tabs in the headers for -devel Index: tracker.spec =================================================================== RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tracker.spec 9 Nov 2006 16:08:21 -0000 1.1 +++ tracker.spec 9 Nov 2006 16:24:03 -0000 1.2 @@ -32,11 +32,11 @@ It has the ability to index, store, harvest metadata. retrieve and search all types of files and other first class objects -%package devel -Summary: Headers for developing programs that will use %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +%package devel +Summary: Headers for developing programs that will use %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel This package contains the static libraries and header files needed for From fedora-extras-commits at redhat.com Thu Nov 9 16:28:53 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:28:53 -0700 Subject: rpms/doulos-fonts/devel .cvsignore, 1.4, 1.5 doulos-fonts.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200611091628.kA9GSrLg007121@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/doulos-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7101 Modified Files: .cvsignore doulos-fonts.spec sources Log Message: clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2006 19:11:30 -0000 1.4 +++ .cvsignore 9 Nov 2006 16:28:23 -0000 1.5 @@ -1 +1,2 @@ DoulosSIL4.0.14.r1.zip +DoulosSILLit4.0.14.r1.zip Index: doulos-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/devel/doulos-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- doulos-fonts.spec 8 Nov 2006 19:58:36 -0000 1.4 +++ doulos-fonts.spec 9 Nov 2006 16:28:23 -0000 1.5 @@ -2,14 +2,15 @@ Name: doulos-fonts Version: 4.0.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Doulos SIL fonts Group: User Interface/X License: SIL Open Font License URL: http://scripts.sil.org/DoulosSILFont -# Source0 can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload +# Sources can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload Source0: DoulosSIL%{version}.r1.zip +Source1: DoulosSILLit%{version}.r1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,8 +22,11 @@ %prep -%setup -q -c -%{__sed} -i 's/\r//' *.txt +%setup -q -c -a 1 +mv 0NRSI/RFS/documentation/DoulosSILLiteracy/FONTLOG.txt FONTLOG-Literacy.txt +mv DoulosSILLiteracy/*.ttf . +%{__sed} -i 's/\r//' *.txt + %build @@ -33,10 +37,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 - %clean rm -rf $RPM_BUILD_ROOT @@ -58,14 +58,17 @@ %files %defattr(0644,root,root,0755) -%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf +%doc FONTLOG.txt FONTLOG-Literacy.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 4.0.14-4 +- Include Doulos Literacy +- Don't include font cache files (fontconfig mechanism is changed) + * Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-3 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2006 18:16:15 -0000 1.4 +++ sources 9 Nov 2006 16:28:23 -0000 1.5 @@ -1 +1,2 @@ 70263b39119d488d432a04a4512cfc57 DoulosSIL4.0.14.r1.zip +c7cac6597ed75f4df89a9579a5d0e419 DoulosSILLit4.0.14.r1.zip From fedora-extras-commits at redhat.com Thu Nov 9 16:37:58 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:37:58 -0700 Subject: rpms/doulos-fonts/FC-6 .cvsignore, 1.4, 1.5 doulos-fonts.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200611091637.kA9Gbw0V007258@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/doulos-fonts/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7219 Modified Files: .cvsignore doulos-fonts.spec sources Log Message: clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Nov 2006 19:11:30 -0000 1.4 +++ .cvsignore 9 Nov 2006 16:37:28 -0000 1.5 @@ -1 +1,2 @@ DoulosSIL4.0.14.r1.zip +DoulosSILLit4.0.14.r1.zip Index: doulos-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/FC-6/doulos-fonts.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- doulos-fonts.spec 8 Nov 2006 19:57:53 -0000 1.4 +++ doulos-fonts.spec 9 Nov 2006 16:37:28 -0000 1.5 @@ -2,14 +2,15 @@ Name: doulos-fonts Version: 4.0.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Doulos SIL fonts Group: User Interface/X License: SIL Open Font License URL: http://scripts.sil.org/DoulosSILFont -# Source0 can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload +# Sources can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload Source0: DoulosSIL%{version}.r1.zip +Source1: DoulosSILLit%{version}.r1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,8 +22,11 @@ %prep -%setup -q -c -%{__sed} -i 's/\r//' *.txt +%setup -q -c -a 1 +mv 0NRSI/RFS/documentation/DoulosSILLiteracy/FONTLOG.txt FONTLOG-Literacy.txt +mv DoulosSILLiteracy/*.ttf . +%{__sed} -i 's/\r//' *.txt + %build @@ -33,10 +37,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 - %clean rm -rf $RPM_BUILD_ROOT @@ -58,14 +58,17 @@ %files %defattr(0644,root,root,0755) -%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf +%doc FONTLOG.txt FONTLOG-Literacy.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 4.0.14-4 +- Include Doulos Literacy +- Don't include font cache files (fontconfig mechanism is changed) + * Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-3 - Add dist tag Index: sources =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Nov 2006 18:16:15 -0000 1.4 +++ sources 9 Nov 2006 16:37:28 -0000 1.5 @@ -1 +1,2 @@ 70263b39119d488d432a04a4512cfc57 DoulosSIL4.0.14.r1.zip +c7cac6597ed75f4df89a9579a5d0e419 DoulosSILLit4.0.14.r1.zip From fedora-extras-commits at redhat.com Thu Nov 9 16:38:27 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:38:27 -0700 Subject: rpms/charis-fonts/devel charis-fonts.spec,1.2,1.3 Message-ID: <200611091638.kA9GcRJS007295@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/charis-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240 Modified Files: charis-fonts.spec Log Message: clog Index: charis-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- charis-fonts.spec 19 Sep 2006 23:42:38 -0000 1.2 +++ charis-fonts.spec 9 Nov 2006 16:37:57 -0000 1.3 @@ -2,7 +2,7 @@ Name: charis-fonts Version: 4.0.02 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Charis SIL fonts Group: User Interface/X @@ -37,10 +37,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 - %clean rm -rf $RPM_BUILD_ROOT @@ -66,10 +62,12 @@ %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 4.0.02-3 +- Remove ghost-ed fontconfig cache files + * Tue Sep 19 2006 Kevin Fenzi - 4.0.02-2 - Rebuild for fc6 - Add dist tag From fedora-extras-commits at redhat.com Thu Nov 9 16:39:38 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:39:38 -0700 Subject: rpms/doulos-fonts/FC-5 .cvsignore, 1.2, 1.3 doulos-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200611091639.kA9GdcFi007371@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/doulos-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7349 Modified Files: .cvsignore doulos-fonts.spec sources Log Message: clog Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2006 15:13:32 -0000 1.2 +++ .cvsignore 9 Nov 2006 16:39:08 -0000 1.3 @@ -1 +1,2 @@ DoulosSIL4.0.14.r1.zip +DoulosSILLit4.0.14.r1.zip Index: doulos-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/FC-5/doulos-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- doulos-fonts.spec 19 Feb 2006 15:13:32 -0000 1.1 +++ doulos-fonts.spec 9 Nov 2006 16:39:08 -0000 1.2 @@ -2,14 +2,15 @@ Name: doulos-fonts Version: 4.0.14 -Release: 1 +Release: 4%{?dist} Summary: Doulos SIL fonts Group: User Interface/X License: SIL Open Font License URL: http://scripts.sil.org/DoulosSILFont -# Source0 can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload +# Sources can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload Source0: DoulosSIL%{version}.r1.zip +Source1: DoulosSILLit%{version}.r1.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,8 +22,11 @@ %prep -%setup -q -c -%{__sed} -i 's/\r//' *.txt +%setup -q -c -a 1 +mv 0NRSI/RFS/documentation/DoulosSILLiteracy/FONTLOG.txt FONTLOG-Literacy.txt +mv DoulosSILLiteracy/*.ttf . +%{__sed} -i 's/\r//' *.txt + %build @@ -33,10 +37,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 - %clean rm -rf $RPM_BUILD_ROOT @@ -58,13 +58,22 @@ %files %defattr(0644,root,root,0755) -%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf +%doc FONTLOG.txt FONTLOG-Literacy.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 4.0.14-4 +- Include Doulos Literacy +- Don't include font cache files (fontconfig mechanism is changed) + +* Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-3 +- Add dist tag + +* Wed Nov 08 2006 Roozbeh Pournader - 4.0.14-2 +- Rebuild to make package available in Rawhide again + * Sat Feb 18 2006 Roozbeh Pournader - 4.0.14-1 - Initial packaging, based on gentium-fonts Index: sources =================================================================== RCS file: /cvs/extras/rpms/doulos-fonts/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2006 15:13:32 -0000 1.2 +++ sources 9 Nov 2006 16:39:08 -0000 1.3 @@ -1 +1,2 @@ 70263b39119d488d432a04a4512cfc57 DoulosSIL4.0.14.r1.zip +c7cac6597ed75f4df89a9579a5d0e419 DoulosSILLit4.0.14.r1.zip From fedora-extras-commits at redhat.com Thu Nov 9 16:40:48 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 9 Nov 2006 09:40:48 -0700 Subject: fedora-security/audit fe3, 1.28, 1.29 fe4, 1.91, 1.92 fe5, 1.98, 1.99 fe6, 1.11, 1.12 Message-ID: <200611091640.kA9GemkH007449@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7425 Modified Files: fe3 fe4 fe5 fe6 Log Message: Note imlib2 fixes. Index: fe3 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe3,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- fe3 8 Nov 2006 20:41:12 -0000 1.28 +++ fe3 9 Nov 2006 16:40:45 -0000 1.29 @@ -7,10 +7,10 @@ CVE-2006-5295 version (clamav, fixed 0.88.5) #210973 CVE-2006-5111 version (libksba, fixed 0.9.14) CVE-2006-4976 ** (php-adodb) #208299 -CVE-2006-4809 ** (imlib2) #214676 -CVE-2006-4808 ** (imlib2) #214676 -CVE-2006-4807 ** (imlib2) #214676 -CVE-2006-4806 ** (imlib2) #214676 +CVE-2006-4809 patch (imlib2, fixed 1.2.1-2) #214676 +CVE-2006-4808 patch (imlib2, fixed 1.2.1-2) #214676 +CVE-2006-4807 patch (imlib2, fixed 1.2.1-2) #214676 +CVE-2006-4806 patch (imlib2, fixed 1.2.1-2) #214676 CVE-2006-4513 VULNERABLE (wv) #212696 CVE-2006-4513 ** (abiword) #212698 CVE-2006-4248 ignore (thttpd, Debian specific issue) Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- fe4 8 Nov 2006 20:41:12 -0000 1.91 +++ fe4 9 Nov 2006 16:40:45 -0000 1.92 @@ -21,10 +21,10 @@ CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 -CVE-2006-4809 ** (imlib2) #214676 -CVE-2006-4808 ** (imlib2) #214676 -CVE-2006-4807 ** (imlib2) #214676 -CVE-2006-4806 ** (imlib2) #214676 +CVE-2006-4809 patch (imlib2, fixed 1.2.1-2) #214676 +CVE-2006-4808 patch (imlib2, fixed 1.2.1-2) #214676 +CVE-2006-4807 patch (imlib2, fixed 1.2.1-2) #214676 +CVE-2006-4806 patch (imlib2, fixed 1.2.1-2) #214676 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- fe5 8 Nov 2006 20:41:12 -0000 1.98 +++ fe5 9 Nov 2006 16:40:45 -0000 1.99 @@ -21,10 +21,10 @@ CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 -CVE-2006-4809 ** (imlib2) #214676 -CVE-2006-4808 ** (imlib2) #214676 -CVE-2006-4807 ** (imlib2) #214676 -CVE-2006-4806 ** (imlib2) #214676 +CVE-2006-4809 patch (imlib2, fixed 1.3.0-3) #214676 +CVE-2006-4808 patch (imlib2, fixed 1.3.0-3) #214676 +CVE-2006-4807 patch (imlib2, fixed 1.3.0-3) #214676 +CVE-2006-4806 patch (imlib2, fixed 1.3.0-3) #214676 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fe6 8 Nov 2006 20:41:12 -0000 1.11 +++ fe6 9 Nov 2006 16:40:45 -0000 1.12 @@ -21,10 +21,10 @@ CVE-2006-4937 version (moodle, fixed 1.6.3) #206516 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516 -CVE-2006-4809 ** (imlib2) #214676 -CVE-2006-4808 ** (imlib2) #214676 -CVE-2006-4807 ** (imlib2) #214676 -CVE-2006-4806 ** (imlib2) #214676 +CVE-2006-4809 patch (imlib2, fixed 1.3.0-3) #214676 +CVE-2006-4808 patch (imlib2, fixed 1.3.0-3) #214676 +CVE-2006-4807 patch (imlib2, fixed 1.3.0-3) #214676 +CVE-2006-4806 patch (imlib2, fixed 1.3.0-3) #214676 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516 From fedora-extras-commits at redhat.com Thu Nov 9 16:46:07 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:46:07 -0700 Subject: rpms/gentium-fonts/devel gentium-fonts.spec,1.3,1.4 Message-ID: <200611091646.kA9Gk7DP007485@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/gentium-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7469 Modified Files: gentium-fonts.spec Log Message: clog Index: gentium-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gentium-fonts/devel/gentium-fonts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gentium-fonts.spec 19 Sep 2006 23:22:57 -0000 1.3 +++ gentium-fonts.spec 9 Nov 2006 16:45:37 -0000 1.4 @@ -3,7 +3,7 @@ Name: gentium-fonts Version: 1.02 -Release: 4%{?dist} +Release: 5%{?dist} Summary: SIL Gentium fonts Group: User Interface/X @@ -39,11 +39,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-2 - %clean rm -rf $RPM_BUILD_ROOT @@ -69,11 +64,12 @@ %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 -%ghost %{fontdir}/fonts.cache-2 %changelog +* Thu Nov 09 2006 Roozbeh Pournader 1.02-5 +- Remove ghost-ed fontconfig caches (fontconfig mechanism is changed) + * Tue Sep 19 2006 Kevin Fenzi 1.02-4 - Rebuild for Fedora Extras 6 - Add dist tag From fedora-extras-commits at redhat.com Thu Nov 9 16:47:31 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:47:31 -0700 Subject: rpms/charis-fonts/FC-6 charis-fonts.spec,1.2,1.3 Message-ID: <200611091647.kA9GlVIT007550@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/charis-fonts/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7532 Modified Files: charis-fonts.spec Log Message: clog Index: charis-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/charis-fonts/FC-6/charis-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- charis-fonts.spec 19 Sep 2006 23:42:38 -0000 1.2 +++ charis-fonts.spec 9 Nov 2006 16:47:01 -0000 1.3 @@ -2,7 +2,7 @@ Name: charis-fonts Version: 4.0.02 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Charis SIL fonts Group: User Interface/X @@ -37,10 +37,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 - %clean rm -rf $RPM_BUILD_ROOT @@ -66,10 +62,12 @@ %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 4.0.02-3 +- Remove ghost-ed fontconfig cache files + * Tue Sep 19 2006 Kevin Fenzi - 4.0.02-2 - Rebuild for fc6 - Add dist tag From fedora-extras-commits at redhat.com Thu Nov 9 16:48:20 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:48:20 -0700 Subject: rpms/gentium-fonts/FC-5 gentium-fonts.spec,1.2,1.3 Message-ID: <200611091648.kA9GmKdt007577@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/gentium-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7556 Modified Files: gentium-fonts.spec Log Message: clog Index: gentium-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gentium-fonts/FC-5/gentium-fonts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gentium-fonts.spec 13 Feb 2006 18:32:03 -0000 1.2 +++ gentium-fonts.spec 9 Nov 2006 16:47:50 -0000 1.3 @@ -3,7 +3,7 @@ Name: gentium-fonts Version: 1.02 -Release: 3 +Release: 5%{?dist} Summary: SIL Gentium fonts Group: User Interface/X @@ -39,11 +39,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-2 - %clean rm -rf $RPM_BUILD_ROOT @@ -69,11 +64,16 @@ %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 -%ghost %{fontdir}/fonts.cache-2 %changelog +* Thu Nov 09 2006 Roozbeh Pournader 1.02-5 +- Remove ghost-ed fontconfig caches (fontconfig mechanism is changed) + +* Tue Sep 19 2006 Kevin Fenzi 1.02-4 +- Rebuild for Fedora Extras 6 +- Add dist tag + * Mon Feb 13 2006 Roozbeh Pournader 1.02-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Nov 9 16:49:54 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:49:54 -0700 Subject: rpms/charis-fonts/FC-5 charis-fonts.spec,1.1,1.2 Message-ID: <200611091649.kA9GnsPc007617@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/charis-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7599 Modified Files: charis-fonts.spec Log Message: * Thu Nov 09 2006 Roozbeh Pournader - 4.0.02-3 - Remove ghost-ed fontconfig cache files * Tue Sep 19 2006 Kevin Fenzi - 4.0.02-2 - Rebuild for fc6 - Add dist tag Index: charis-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/charis-fonts/FC-5/charis-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- charis-fonts.spec 19 Feb 2006 14:46:54 -0000 1.1 +++ charis-fonts.spec 9 Nov 2006 16:49:24 -0000 1.2 @@ -2,7 +2,7 @@ Name: charis-fonts Version: 4.0.02 -Release: 1 +Release: 3%{?dist} Summary: Charis SIL fonts Group: User Interface/X @@ -37,10 +37,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 - %clean rm -rf $RPM_BUILD_ROOT @@ -66,9 +62,15 @@ %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 %changelog +* Thu Nov 09 2006 Roozbeh Pournader - 4.0.02-3 +- Remove ghost-ed fontconfig cache files + +* Tue Sep 19 2006 Kevin Fenzi - 4.0.02-2 +- Rebuild for fc6 +- Add dist tag + * Sat Feb 18 2006 Roozbeh Pournader - 4.0.02-1 - Initial packaging, based on gentium-fonts From fedora-extras-commits at redhat.com Thu Nov 9 16:50:28 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 09:50:28 -0700 Subject: rpms/gentium-fonts/FC-6 gentium-fonts.spec,1.3,1.4 Message-ID: <200611091650.kA9GoSNl007640@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/gentium-fonts/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7623 Modified Files: gentium-fonts.spec Log Message: clog Index: gentium-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/gentium-fonts/FC-6/gentium-fonts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gentium-fonts.spec 19 Sep 2006 23:22:57 -0000 1.3 +++ gentium-fonts.spec 9 Nov 2006 16:49:58 -0000 1.4 @@ -3,7 +3,7 @@ Name: gentium-fonts Version: 1.02 -Release: 4%{?dist} +Release: 5%{?dist} Summary: SIL Gentium fonts Group: User Interface/X @@ -39,11 +39,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 -/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-2 - %clean rm -rf $RPM_BUILD_ROOT @@ -69,11 +64,12 @@ %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 -%ghost %{fontdir}/fonts.cache-2 %changelog +* Thu Nov 09 2006 Roozbeh Pournader 1.02-5 +- Remove ghost-ed fontconfig caches (fontconfig mechanism is changed) + * Tue Sep 19 2006 Kevin Fenzi 1.02-4 - Rebuild for Fedora Extras 6 - Add dist tag From fedora-extras-commits at redhat.com Thu Nov 9 16:57:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Nov 2006 09:57:22 -0700 Subject: rpms/qscintilla/devel .cvsignore, 1.2, 1.3 qscintilla.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200611091657.kA9GvM7a007734@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7688 Modified Files: .cvsignore qscintilla.spec sources Log Message: * Thu Nov 09 2006 Rex Dieter - 1.7-1 - QScintilla1-1.71-gpl-1.7.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qscintilla/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Sep 2005 15:10:44 -0000 1.2 +++ .cvsignore 9 Nov 2006 16:56:51 -0000 1.3 @@ -1 +1,2 @@ qscintilla-1.65-gpl-1.6.tar.gz +QScintilla1-1.71-gpl-1.7.tar.gz Index: qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/qscintilla/devel/qscintilla.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qscintilla.spec 3 Sep 2006 19:10:45 -0000 1.4 +++ qscintilla.spec 9 Nov 2006 16:56:51 -0000 1.5 @@ -1,24 +1,28 @@ -%define scintilla_ver 1.65 -%define qtdir %{_libdir}/qt-3.3 + +%define scintilla_ver 1.71 Name: qscintilla -Version: 1.6 -Release: 3.3%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: A Scintilla port to Qt License: GPL Group: Development/Tools Url: http://www.riverbankcomputing.co.uk/qscintilla/ -Source: http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz -Patch1: qscintilla-1.61-gpl-1.4-designer-incpath.patch +Source0: http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla1-%{scintilla_ver}-gpl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel >= 1:3.3, qt-devel < 1:3.4 +Patch1: qscintilla-1.61-gpl-1.4-designer-incpath.patch + +BuildRequires: qt-devel + +%global qtdir %(qmake -query QT_INSTALL_PREFIX) +%global qtdata %(qmake -query QT_INSTALL_DATA) +%global qtinc %{qtdir}/include +%global qtlib %{qtdir}/lib %description -QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech -and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, -MacOS/X). Qt v3 or later is required. +QScintilla is a port of Scintilla to the Qt GUI toolkit. This version of QScintilla is based on Scintilla v%{scintilla_ver}. @@ -27,28 +31,27 @@ Summary: QScintilla designer plugin Group: Development/Tools Requires: %{name} = %{version}-%{release} -Requires: qt-designer >= 1:3.3, qt-designer < 1:3.4 - +Requires: qt-designer %description designer -QScintillla designer plugin. - +%{summary}. %package devel Summary: QScintilla Development Files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: qt-devel >= 1:3.3, qt-devel < 1:3.4 - +Requires: qt-devel %description devel -These are the development files for QScintilla, needed to build against -QScintilla. +%{summary}. %prep -%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version} +%setup -q -n QScintilla1-%{scintilla_ver}-gpl-%{version} + %patch1 -p1 -b .designer-incpath + # fixups to support RPM_BUILD_ROOT/DESTDIR sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro + # fix permissions on doc files find doc example -type f -exec chmod 0644 {} ';' @@ -84,29 +87,31 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENSE NEWS README -%{qtdir}/lib/*.so.* -%{qtdir}/translations/* - +%{qtlib}/lib*.so.* +%{qtdata}/translations/* %files designer %defattr(-,root,root,-) %{qtdir}/plugins/designer/* - %files devel %defattr(-,root,root,-) %doc doc/html doc/Scintilla example -%{qtdir}/lib/*.so -%{qtdir}/include/* +%{qtlib}/lib*.so +%{qtinc}/* %changelog +* Thu Nov 09 2006 Rex Dieter - 1.7-1 +- QScintilla1-1.71-gpl-1.7.tar.gz + * Sun Sep 03 2006 Konstantin Ryabitsev - 1.6-3.3 - FC6 rebuild. - Export flags. Index: sources =================================================================== RCS file: /cvs/extras/rpms/qscintilla/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Sep 2005 15:10:44 -0000 1.2 +++ sources 9 Nov 2006 16:56:51 -0000 1.3 @@ -1 +1 @@ -8dbebef07cd2c934fbec3ee1bdfecfa3 qscintilla-1.65-gpl-1.6.tar.gz +145321e9e3ae7d4edc7f2bf6954b6763 QScintilla1-1.71-gpl-1.7.tar.gz From fedora-extras-commits at redhat.com Thu Nov 9 16:57:18 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 9 Nov 2006 09:57:18 -0700 Subject: fedora-security/audit fe5,1.99,1.100 fe6,1.12,1.13 Message-ID: <200611091657.kA9GvIL7007729@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7709 Modified Files: fe5 fe6 Log Message: CVE-2006-545[3-5] (bugzilla) fixed Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- fe5 9 Nov 2006 16:40:45 -0000 1.99 +++ fe5 9 Nov 2006 16:57:15 -0000 1.100 @@ -5,9 +5,9 @@ CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 -CVE-2006-5455 VULNERABLE (bugzilla) #212355 -CVE-2006-5454 VULNERABLE (bugzilla) #212355 -CVE-2006-5453 VULNERABLE (bugzilla) #212355 +CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355 +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-5129 version (moodle, fixed 1.6.3) #206516 CVE-2006-5111 version (libksba, fixed 0.9.14) Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fe6 9 Nov 2006 16:40:45 -0000 1.12 +++ fe6 9 Nov 2006 16:57:15 -0000 1.13 @@ -5,9 +5,9 @@ CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 -CVE-2006-5455 VULNERABLE (bugzilla) #212355 -CVE-2006-5454 VULNERABLE (bugzilla) #212355 -CVE-2006-5453 VULNERABLE (bugzilla) #212355 +CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355 +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-5129 version (moodle, fixed 1.6.3) #206516 CVE-2006-5111 version (libksba, fixed 0.9.14) From fedora-extras-commits at redhat.com Thu Nov 9 17:07:36 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 9 Nov 2006 10:07:36 -0700 Subject: owners owners.list,1.1910,1.1911 Message-ID: <200611091707.kA9H7a87010825@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10809 Modified Files: owners.list Log Message: orphan t1lib and t1utils, add myself to CC list for mediawiki Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1910 retrieving revision 1.1911 diff -u -r1.1910 -r1.1911 --- owners.list 9 Nov 2006 16:13:11 -0000 1.1910 +++ owners.list 9 Nov 2006 17:07:06 -0000 1.1911 @@ -1041,7 +1041,7 @@ Fedora Extras|mbuffer|Measuring Buffer is an enhanced version of buffer|alex at dalloz.de|extras-qa at fedoraproject.org| Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| -Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org +Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org,roozbeh at farsiweb.info Fedora Extras|MegaMek|A portable, network-enabled BattleTech engine|fitzsim at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|mercator|Terrain library for WorldForge client/server|wart at kobold.org|extras-qa at fedoraproject.org| @@ -2179,8 +2179,8 @@ Fedora Extras|sysprof|A sampling CPU profiler|giallu at gmail.com|extras-qa at fedoraproject.org|sandmann at daimi.au.dk Fedora Extras|sysprof-kmod|Sysprof kernel module|giallu at gmail.com|extras-qa at fedoraproject.org|sandmann at daimi.au.dk Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ankit644 at yahoo.com -Fedora Extras|t1lib|PostScript Type 1 font rasterizer|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt -Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt +Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|jamatos at fc.up.pt,roozbeh at farsiweb.info +Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|jamatos at fc.up.pt,roozbeh at farsiweb.info Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Nov 9 17:11:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 9 Nov 2006 10:11:39 -0700 Subject: fedora-security/audit fe3, 1.29, 1.30 fe4, 1.92, 1.93 fe5, 1.100, 1.101 fe6, 1.13, 1.14 Message-ID: <200611091711.kA9HBdYa010884@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10860 Modified Files: fe3 fe4 fe5 fe6 Log Message: +CVE-2006-5815 ** (proftpd) #214820 Index: fe3 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe3,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- fe3 9 Nov 2006 16:40:45 -0000 1.29 +++ fe3 9 Nov 2006 17:11:36 -0000 1.30 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-5815 ** (proftpd) #214820 CVE-2006-5602 VULNERABLE (xsupplicant) #212699 CVE-2006-5601 VULNERABLE (xsupplicant) #212700 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973 Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- fe4 9 Nov 2006 16:40:45 -0000 1.92 +++ fe4 9 Nov 2006 17:11:36 -0000 1.93 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-5815 ** (proftpd) #214820 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- fe5 9 Nov 2006 16:57:15 -0000 1.100 +++ fe5 9 Nov 2006 17:11:36 -0000 1.101 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-5815 ** (proftpd) #214820 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fe6 9 Nov 2006 16:57:15 -0000 1.13 +++ fe6 9 Nov 2006 17:11:36 -0000 1.14 @@ -2,6 +2,7 @@ ** are items that need attention +CVE-2006-5815 ** (proftpd) #214820 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 From fedora-extras-commits at redhat.com Thu Nov 9 17:16:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Nov 2006 10:16:24 -0700 Subject: rpms/PyQt-qscintilla/devel PyQt-qscintilla.spec,1.7,1.8 Message-ID: <200611091716.kA9HGOaH010921@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/PyQt-qscintilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10905 Modified Files: PyQt-qscintilla.spec Log Message: * Thu Nov 09 2006 Rex Dieter 3.17-2 - respin for qscintilla-1.7 (#214192) Index: PyQt-qscintilla.spec =================================================================== RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/PyQt-qscintilla.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- PyQt-qscintilla.spec 8 Nov 2006 13:55:52 -0000 1.7 +++ PyQt-qscintilla.spec 9 Nov 2006 17:15:53 -0000 1.8 @@ -2,7 +2,7 @@ Summary: PyQt qscintilla extentions Name: PyQt-qscintilla Version: 3.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Languages @@ -70,6 +70,9 @@ %changelog +* Thu Nov 09 2006 Rex Dieter 3.17-2 +- respin for qscintilla-1.7 (#214192) + * Mon Nov 06 2006 Rex Dieter 3.17-1 - PyQt-3.17 From fedora-extras-commits at redhat.com Thu Nov 9 17:18:33 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 9 Nov 2006 10:18:33 -0700 Subject: fedora-security/audit fe4,1.93,1.94 fe5,1.101,1.102 fe6,1.14,1.15 Message-ID: <200611091718.kA9HIXHx011006@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10984 Modified Files: fe4 fe5 fe6 Log Message: +CVE-2006-5xxx VULNERABLE (seamonkey, fixed 1.0.6) #214822 Index: fe4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe4,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- fe4 9 Nov 2006 17:11:36 -0000 1.93 +++ fe4 9 Nov 2006 17:18:31 -0000 1.94 @@ -3,9 +3,13 @@ ** are items that need attention CVE-2006-5815 ** (proftpd) #214820 +CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822 +CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 +CVE-2006-5464 VULNERABLE (seamonkey, fixed 1.0.6) #214822 +CVE-2006-5463 VULNERABLE (seamonkey, fixed 1.0.6) #214822 CVE-2006-5455 VULNERABLE (bugzilla) #212355 CVE-2006-5454 VULNERABLE (bugzilla) #212355 CVE-2006-5453 VULNERABLE (bugzilla) #212355 Index: fe5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe5,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- fe5 9 Nov 2006 17:11:36 -0000 1.101 +++ fe5 9 Nov 2006 17:18:31 -0000 1.102 @@ -3,9 +3,13 @@ ** are items that need attention CVE-2006-5815 ** (proftpd) #214820 +CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822 +CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 +CVE-2006-5464 VULNERABLE (seamonkey, fixed 1.0.6) #214822 +CVE-2006-5463 VULNERABLE (seamonkey, fixed 1.0.6) #214822 CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355 CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355 CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355 Index: fe6 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fe6,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fe6 9 Nov 2006 17:11:36 -0000 1.14 +++ fe6 9 Nov 2006 17:18:31 -0000 1.15 @@ -3,9 +3,13 @@ ** are items that need attention CVE-2006-5815 ** (proftpd) #214820 +CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822 +CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985 CVE-2006-5602 version (xsupplicant, fixed 1.2.6) CVE-2006-5601 VULNERABLE (xsupplicant) #212700 +CVE-2006-5464 VULNERABLE (seamonkey, fixed 1.0.6) #214822 +CVE-2006-5463 VULNERABLE (seamonkey, fixed 1.0.6) #214822 CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355 CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355 CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355 From fedora-extras-commits at redhat.com Thu Nov 9 17:25:52 2006 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 9 Nov 2006 10:25:52 -0700 Subject: rpms/espeak - New directory Message-ID: <200611091725.kA9HPqec011087@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11083/espeak Log Message: Directory /cvs/extras/rpms/espeak added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 17:25:58 2006 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 9 Nov 2006 10:25:58 -0700 Subject: rpms/espeak/devel - New directory Message-ID: <200611091725.kA9HPw6Q011101@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11083/espeak/devel Log Message: Directory /cvs/extras/rpms/espeak/devel added to the repository From fedora-extras-commits at redhat.com Thu Nov 9 17:26:27 2006 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 9 Nov 2006 10:26:27 -0700 Subject: rpms/espeak Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200611091726.kA9HQRW4011134@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11128 Added Files: Makefile import.log Log Message: Setup of module espeak --- NEW FILE Makefile --- # Top level Makefile for module espeak 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 Nov 9 17:26:33 2006 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 9 Nov 2006 10:26:33 -0700 Subject: rpms/espeak/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200611091726.kA9HQXtq011152@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11128/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module espeak --- 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 Nov 9 17:27:21 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 9 Nov 2006 10:27:21 -0700 Subject: owners owners.list,1.1911,1.1912 Message-ID: <200611091727.kA9HRLv6011223@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11176 Modified Files: owners.list Log Message: No time to co-maintain tla, sorry. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.1911 retrieving revision 1.1912 diff -u -r1.1911 -r1.1912 --- owners.list 9 Nov 2006 17:07:06 -0000 1.1911 +++ owners.list 9 Nov 2006 17:26:51 -0000 1.1912 @@ -2248,7 +2248,7 @@ Fedora Extras|tkdnd|Tk extension that adds native DnD|sander at hoentjen.eu|extras-qa at fedoraproject.org| Fedora Extras|tklib|Useful extensions for Tk|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|tla|The Low-Budget arch Revision Control System|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi +Fedora Extras|tla|The Low-Budget arch Revision Control System|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|tog-pegasus|The Open Group Pegasus WBEM/CIM server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|tolua++|A tool to integrate C/C++ code with Lua|packages at amiga-hardware.com|extras-qa at fedoraproject.org| Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Nov 9 17:28:49 2006 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 9 Nov 2006 10:28:49 -0700 Subject: rpms/espeak import.log,1.1,1.2 Message-ID: <200611091728.kA9HSn0S011304@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11252 Modified Files: import.log Log Message: auto-import espeak-1.16-4 on branch devel from espeak-1.16-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/espeak/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Nov 2006 17:26:27 -0000 1.1 +++ import.log 9 Nov 2006 17:28:18 -0000 1.2 @@ -0,0 +1 @@ +espeak-1_16-4:HEAD:espeak-1.16-4.src.rpm:1163093495 From fedora-extras-commits at redhat.com Thu Nov 9 17:28:49 2006 From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp)) Date: Thu, 9 Nov 2006 10:28:49 -0700 Subject: rpms/espeak/devel compiledict-amd64_sizeof.patch, NONE, 1.1 espeak.spec, NONE, 1.1 espeak_program_name.patch, NONE, 1.1 makefile_install_target.patch, NONE, 1.1 makefile_lpthread.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200611091728.kA9HSnDe011308@cvs-int.fedora.redhat.com> Author: faucamp Update of /cvs/extras/rpms/espeak/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11252/devel Modified Files: .cvsignore sources Added Files: compiledict-amd64_sizeof.patch espeak.spec espeak_program_name.patch makefile_install_target.patch makefile_lpthread.patch Log Message: auto-import espeak-1.16-4 on branch devel from espeak-1.16-4.src.rpm compiledict-amd64_sizeof.patch: --- NEW FILE compiledict-amd64_sizeof.patch --- # Modified version of patch provided by Nigel Rowe # Original patch available at https://sourceforge.net/tracker/download.php?group_id=159649&atid=812677&file_id=201024&aid=1588938 --- espeak-1.16-source/src/compiledict.cpp~ 2006-10-03 08:51:13.000000000 +1000 +++ espeak-1.16-source/src/compiledict.cpp 2006-11-02 08:46:10.000000000 +1100 @@ -442,9 +442,9 @@ while(p != NULL) { - length = *(p+4); - fwrite(p+4,length,1,f_out); - memcpy(&p,p,4); + length = *(p+sizeof(char *)); + fwrite(p+sizeof(char *),length,1,f_out); + memcpy(&p,p,sizeof(char *)); } fputc(0,f_out); } --- NEW FILE espeak.spec --- Name: espeak Version: 1.16 Release: 4%{?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-1.16-source.zip Patch0: makefile_lpthread.patch Patch1: makefile_install_target.patch Patch2: compiledict-amd64_sizeof.patch Patch3: espeak_program_name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: portaudio-devel %description eSpeak is a software speech synthesizer for English and other languages. eSpeak produces good quality English speech. It uses a different synthesis method from other open source TTS engines, and sounds quite different. It's perhaps not as natural or "smooth", but some people may find the articulation clearer and easier to listen to for long periods. eSpeak supports several languages, however in most cases these are initial drafts and need more work to improve them. It can run as a command line program to speak text from a file or from stdin. %package devel Summary: Development files for espeak Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Development files for eSpeak, a software speech synthesizer. %prep %setup -q -n espeak-%{version}-source chmod 0644 src/* %patch0 -p1 -b .pthread %patch1 -p1 -b .install_target %patch2 -p1 -b .amd64sizeof %patch3 -p1 -b .espeak_name # Prepare documentation mv docs html sed -i 's/\r//' License.txt %build cd src make %{?_smp_mflags} BIN_NAME=espeak CXXFLAGS="${RPM_OPT_FLAGS}" %install rm -rf %{buildroot} rmdir --ignore-fail-on-non-empty espeak-data/soundicons # Remove backup files in documentation created by espeak_program_name patch rm -f html/*.espeak_name cd src make install DESTDIR=%{buildroot} BINDIR=%{_bindir} INCDIR=%{_includedir}/espeak LIBDIR=%{_libdir} %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ReadMe ChangeLog License.txt html/ %{_bindir}/espeak %{_datadir}/espeak-data %{_libdir}/libespeak.so.* %files devel %defattr(-,root,root) %{_libdir}/*.so %{_includedir}/espeak %changelog * Tue Nov 07 2006 Francois Aucamp - 1.16-4 - Modified patch steps to create backups with different suffixes - Renamed patch file extensions to .patch - Added step in %%install to remove patch backup files in documentation * Sat Nov 04 2006 Francois Aucamp - 1.16-3 - Fixed source file permissions for -debuginfo package in %%prep - Added RPM_OPT_FLAGS to "make" command in %%build; removed RPM_OPT_FLAGS makefile patch - Modified makefile install target patch to include general support for setting compiler optimization flags via CXXFLAGS - Removed creation of .orig backup files during patching - Modified patch files to have different suffixes * Thu Nov 02 2006 Francois Aucamp - 1.16-2 - Added "install" target to makefile (makefile_install_target.patch) - Added patch to fix AMD64 sizeof(char *) assumption bug (upstream request ID 1588938) - Changed "portaudio" BuildRequires to "portaudio-devel" - Added patch to makefile to allow RPM_OPT_FLAGS - Added patch to replace all references to "speak" binary with "espeak" - Moved header files to /usr/include/espeak - Added rmdir command to "install" to remove empty soundicons directory * Wed Oct 04 2006 Francois Aucamp - 1.16-1 - Initial RPM build espeak_program_name.patch: --- NEW FILE espeak_program_name.patch --- diff -uNr espeak-1.16-source/docs/add_language.html espeak-1.16-source-mod/docs/add_language.html --- espeak-1.16-source/docs/add_language.html 2006-09-21 12:38:29.000000000 +0200 +++ espeak-1.16-source-mod/docs/add_language.html 2006-11-02 20:05:44.000000000 +0200 @@ -77,7 +77,7 @@ of two source files: en_rules (the spelling to phoneme rules) and en_list (an exceptions list, and attributes of certain words). The corresponding compiled data file is espeak-data/en_dict which is produced from en_rules -and en_list sources by the command: speak  --compile=en.

      +and en_list sources by the command: espeak  --compile=en.

      Details of the contents of the dictionary files are given in dictionary.html.

      The en_list file contains not @@ -110,7 +110,7 @@ voices file.

      6.5 Program Code

      -

      The behaviour of the speak program is +

      The behaviour of the espeak program is controlled by various options (eg. whether words are stressed on the first, last, or penultimate syllable). The function SetTranslator() at the start of the tr_languages.cpp file recognizes the language @@ -129,4 +129,4 @@

      - \ No newline at end of file + diff -uNr espeak-1.16-source/docs/commands.html espeak-1.16-source-mod/docs/commands.html --- espeak-1.16-source/docs/commands.html 2006-09-21 12:38:47.000000000 +0200 +++ espeak-1.16-source-mod/docs/commands.html 2006-11-02 20:01:50.000000000 +0200 @@ -11,47 +11,47 @@

      2.1 INSTALLATION

      -Place the "speak" executable file in the command path, eg in /usr/local/bin +Place the "espeak" executable file in the command path, eg in /usr/local/bin

      Place the "espeak-data" directory in /usr/share as /usr/share/espeak-data.
      Alternatively if it is placed in the user's home directory (i.e. /home/<user>/espeak-data) then that will be used instead.

      Dependencies

      -speak uses the PortAudio sound library (version 18), so you will need to have the libportaudio0 library package installed. It may be already, since it's used by other software, such as OpenOffice.org and the Audacity sound editor.

      -Some Linux distrubitions (eg. SuSe 10) have version 19 of PortAudio which has a slightly different API. The speak program can be compiled to use version 19 of PortAudio by copying the file portaudio19.h to portaudio.h before compiling.

      - The speak program may be compiled without using PortAudio, by removing the line

         #define USE_PORTAUDIO
+espeak uses the PortAudio sound library (version 18), so you will need to have the libportaudio0 library package installed.  It may be already, since it's used by other software, such as OpenOffice.org and the Audacity sound editor.
      
+Some Linux distrubitions (eg. SuSe 10) have version 19 of PortAudio which has a slightly different API. The espeak program can be compiled to use version 19 of PortAudio by copying the file portaudio19.h to portaudio.h before compiling.
      
+ The espeak program may be compiled without using PortAudio, by removing the line
         #define USE_PORTAUDIO
 
      in the file speech.h. 
 
       
      
 
      2.2 COMMAND OPTIONS
      
 
      
 
      2.2.1 Examples
      
 To use at the command line, type:
      
-   speak "This is a test"
      
+   espeak "This is a test"
      
 or
      
-   speak -f <text file>
+   espeak -f <text file>
 
      
 Or just type
      
-   speak
      
+   espeak
      
 followed by text on subsequent lines. Each line is spoken when
-RETURN is pressed.
      Use speak -x to see the corresponding phoneme codes.
+RETURN is pressed.
      Use espeak -x to see the corresponding phoneme codes.
 
       
      
 
      2.2.2 Use with KDE Text-to-Speech (KTTS)
      
 To add to KDE-Text-to-Speech Manager (KTTSMgr), use it as a "Command" talker
 with "command for speaking texts" set to:
      
-   cat %f | speak --stdin -w %w
+   cat %f | espeak --stdin -w %w
 
      
 Note:
 
        
-
      • When used by the KTTS system, I noticed a slight background hiss with the speech, which is not present when I use speak directly from the command line. This was because KDE sound default was set to "8 bits" rather than 16 bits.
-
      • KTTSMgr breaks the text into sentences to pass to the speech engine, but it mistakenly assumes sentence breaks when dots follow abbreviations and therefore pauses after the dots in "eg. Mr. John B. Smith etc."  Speaking a text file directly with speak gives better results in this respect.
-
      • Speaking text from a web page using KTTS often causes headings and image captions to be run together with the following text as a single sentence.  Speaking the HTML directly  with the -m option set (i.e. using speak -m -f text.html), may help if this is a problem. 
+
      • When used by the KTTS system, I noticed a slight background hiss with the speech, which is not present when I use espeak directly from the command line. This was because KDE sound default was set to "8 bits" rather than 16 bits.
+
      • KTTSMgr breaks the text into sentences to pass to the speech engine, but it mistakenly assumes sentence breaks when dots follow abbreviations and therefore pauses after the dots in "eg. Mr. John B. Smith etc."  Speaking a text file directly with espeak gives better results in this respect.
+
      • Speaking text from a web page using KTTS often causes headings and image captions to be run together with the following text as a single sentence.  Speaking the HTML directly  with the -m option set (i.e. using espeak -m -f text.html), may help if this is a problem. 
 
      
 
       
      
 
      2.2.3 The Command Line Options
      
 
      
 
      
-speak [options] ["words"]
      
+espeak [options] ["words"]
      
 
      Text input can be taken either from a file, from a string in the command, or from stdin.
 
      
 
      
@@ -118,7 +118,7 @@
 
      
 
      --compile[=<voice name>]
      
 
      
-Compile the pronunciation rule and dictionary lookup data from their source files in the current directory.  The Voice determines which language's files are compiled.  For example, if it's an English voice, then en_rules, en_list, and en_extra (if present), are compiled to replace en_dict  in the speak-data directory.  If no Voice is specified then the default Voice is used.
+Compile the pronunciation rule and dictionary lookup data from their source files in the current directory.  The Voice determines which language's files are compiled.  For example, if it's an English voice, then en_rules, en_list, and en_extra (if present), are compiled to replace en_dict  in the espeak-data directory.  If no Voice is specified then the default Voice is used.
 
      
 
      --punct[="<characters>"]
      
 
      
@@ -134,7 +134,7 @@
 
      2.2.4 The Input Text
      
 If the -m option is used to indicate marked-up text, then HTML can be spoken directly.
 
      
-As well as plain text, phoneme mnemonics can be used in the text input to speak.  They are enclosed within double square brackets.  Spaces are used to separate words and all stressed syllables must be marked explicitly.
      
+As well as plain text, phoneme mnemonics can be used in the text input to espeak.  They are enclosed within double square brackets.  Spaces are used to separate words and all stressed syllables must be marked explicitly.
      
    eg: [[D,Is Iz sVm f at n'EtIk t'Ekst 'InpUt]]
 
      
 
diff -uNr espeak-1.16-source/docs/index.html espeak-1.16-source-mod/docs/index.html
--- espeak-1.16-source/docs/index.html	2006-09-21 12:27:13.000000000 +0200
+++ espeak-1.16-source-mod/docs/index.html	2006-11-02 19:59:19.000000000 +0200
@@ -57,7 +57,7 @@
 
      
 speak was originally written for Acorn/RISC_OS computers starting in 1995. This version is an update and re-write, including a relaxation of the original memory and processing power constraints, and with support for additional languages if anyone is interested in doing so.
 
      
-The project name speak had already been taken by another project on SourceForge (for a Windows TTS front-end) so I added a letter 'e' to the front to make eSpeak.  For now, the program executable remains speak and is referred to as such in the documentation.
+The project name speak had already been taken by another project on SourceForge (for a Windows TTS front-end) so I added a letter 'e' to the front to make espeak.
 
     
   
diff -uNr espeak-1.16-source/docs/languages.html espeak-1.16-source-mod/docs/languages.html
--- espeak-1.16-source/docs/languages.html	2006-09-21 12:40:37.000000000 +0200
+++ espeak-1.16-source-mod/docs/languages.html	2006-11-02 20:03:17.000000000 +0200
@@ -27,8 +27,8 @@
 
 A number of Voice files are provided in the espeak-data/voices directory.
 You can select one of these with the -v <voice filename> parameter to the
-speak command, eg:
-
         speak -vaf
      
+espeak command, eg:
+
         espeak -vaf
      
 to speak using the Afrikaans voice.
 
      
 For details of the voice files see Voices.
@@ -37,7 +37,7 @@
 
      
 
      
 default
      
-
         This voice is used if none is specified in the speak command.  Copy your preferred voice to "default" so you can use the speak command without the need to specify a voice.
      
+
         This voice is used if none is specified in the espeak command.  Copy your preferred voice to "default" so you can use the espeak command without the need to specify a voice.

    3.2 English Voices

    diff -uNr espeak-1.16-source/docs/phonemes.html espeak-1.16-source-mod/docs/phonemes.html --- espeak-1.16-source/docs/phonemes.html 2006-09-21 12:40:52.000000000 +0200 +++ espeak-1.16-source-mod/docs/phonemes.html 2006-11-02 20:06:23.000000000 +0200 @@ -23,7 +23,7 @@

    The phoneme mnemonics are based on the scheme by Kirschenbaum: www.kirshenbaum.net/IPA/ascii-ipa.pdf, which gives the International Phonetic Alphabet equivalents.

    -Phoneme mnemonics can be used directly in the text input to speak. They are enclosed within double square brackets. Spaces are used to separate words and all stressed syllables must be marked explicitly. eg:
    +Phoneme mnemonics can be used directly in the text input to espeak. They are enclosed within double square brackets. Spaces are used to separate words and all stressed syllables must be marked explicitly. eg:
    [[D,Is Iz sVm f at n'EtIk t'Ekst 'InpUt]] 

      
diff -uNr espeak-1.16-source/docs/phontab.html espeak-1.16-source-mod/docs/phontab.html
--- espeak-1.16-source/docs/phontab.html	2006-09-21 12:05:22.000000000 +0200
+++ espeak-1.16-source-mod/docs/phontab.html	2006-11-02 20:07:04.000000000 +0200
@@ -36,7 +36,7 @@
 <parent> Is the name of a previously defined phoneme table whose phoneme definitions are inherited by this one.  The name base indicates the first (base) phoneme table.
 
      
 
      phonemenumber <integer>
-
      This statement is used at the start of the master phonemes file to define some specific code numbers for various phonemes which are used directly within the speak program.
+
      This statement is used at the start of the master phonemes file to define some specific code numbers for various phonemes which are used directly within the espeak program.
 
 
       
      
 
      Phoneme definitions
      
@@ -149,7 +149,7 @@
 
      Change to this if the next phoneme is not a vowel.
 
      
 
      lengthmod <integer>
-
      (C) Determines how this consonant affects the length of the previous vowel. This value is used as index into the length_mods table in the CalcLengths() function in the speak program.
+
      (C) Determines how this consonant affects the length of the previous vowel. This value is used as index into the length_mods table in the CalcLengths() function in the espeak program.
 
      
 
      vowelin <vowel transition data>
 
      (C) Specifies the effects of this consonant on the formants of a following vowel. See "vowel transitions", below.
@@ -180,7 +180,7 @@
 A <sound spec> in the phoneme table can refer to a WAV file, a formant sequence, or a mixture of both. It can also include a numeric value to adjust the length of the sound.
 
       
      
 
      Vowel Transitions
      
-These specify how a consonant affects an adjacent vowel.  A consonant may cause a transition in the vowel's formants as the mouth changes shape between the consonant and the vowel.  The following attributes may be specified.  Note that the maximum rate of change of formant frequencies is limited by the speak program.
      
+These specify how a consonant affects an adjacent vowel.  A consonant may cause a transition in the vowel's formants as the mouth changes shape between the consonant and the vowel.  The following attributes may be specified.  Note that the maximum rate of change of formant frequencies is limited by the espeak program.
      
 
        
 
        len=<integer>
 
        Nominal length of the transition in mS.  If omitted a default value is used.
diff -uNr espeak-1.16-source/docs/voices.html espeak-1.16-source-mod/docs/voices.html
--- espeak-1.16-source/docs/voices.html	2006-09-21 12:41:22.000000000 +0200
+++ espeak-1.16-source-mod/docs/voices.html	2006-11-02 20:04:35.000000000 +0200
@@ -15,9 +15,9 @@
 A Voice file specifies a language (and possibly a language variant or dialect) together with various attributes that affect the characteristics of the voice quality and how the language is spoken.
        
 Voice files are placed in the espeak-data/voices directory, or within subdirectories in there.
        
 The available voice files can be listed by:
        -   speak --voices
+   espeak --voices
 or
-   speak --voices=<language>
        
+   espeak --voices=<language>
 
        
 
        5.2 Contents of Voice Files
        
 The language attribute is mandatory.  All the other attributes are optional.
@@ -109,7 +109,7 @@
 
        
 dictionary  <name>
        
 
           Specifies which pair of dictionary files to use.  eg. "english"
-   indicates that speak-data/en_dict should
+   indicates that espeak-data/en_dict should
    be used to translate from words to phonemes.  This parameter is usually
    not needed as it is set by default to the first two letters of "language" parameter.
        
 
        
@@ -217,12 +217,12 @@
 
        5.3 Voice Files Provided
        
 A number of Voice files are provided in the espeak-data/voices directory.
 You can select one of these with the -v <voice filename> parameter to the
-speak command.
+espeak command.
 
        
 
        
 
        
 default
        
-
           This voice is used if none is specified in the speak command.  Copy your preferred voice to "default" so you can use the speak command without the need to specify a voice.
        
+
           This voice is used if none is specified in the espeak command.  Copy your preferred voice to "default" so you can use the espeak command without the need to specify a voice.
        
 
        
 For a list of voices provided for English and other languages see Languages.
 
diff -uNr espeak-1.16-source/ReadMe espeak-1.16-source-mod/ReadMe
--- espeak-1.16-source/ReadMe	2006-09-20 23:19:41.000000000 +0200
+++ espeak-1.16-source-mod/ReadMe	2006-11-02 19:57:40.000000000 +0200
@@ -6,9 +6,9 @@
 =========
 
 The  src  directory contains a simple  makefile  that compiles all the
-source files in the directory and produces a  "speak"  binary.
+source files in the directory and produces an  "espeak"  binary.
 
-When run, the "speak" program expects to find the  espeak-data  directory
+When run, the "espeak" program expects to find the  espeak-data  directory
 either in the user's home directory, or if not there, in /use/share.
 
 
@@ -17,7 +17,7 @@
 
 The makefile also compiles a shared library version of eSpeak and creates a
 file:  libespeak.so.1.xx  where xx is the version number.  This is not
-currently used by the "speak" program, but is available for use by other
+currently used by the "espeak" program, but is available for use by other
 software (eg. the next version of Speech Dispatcher).
 
 The API is described in the file:  speak_lib.h.
@@ -26,7 +26,7 @@
 Portaudio.
 ========== 
 
-The "speak" program uses the PortAudio sound interface library.  There are two
+The "espeak" program uses the PortAudio sound interface library.  There are two
 versions, V18 and V19 and their APIs are different.  Some Linux distributions
 use V18 (eg. Debian, Ubuntu) others (eg. SuSe) use V19.
 
diff -uNr espeak-1.16-source/src/Makefile espeak-1.16-source-mod/src/Makefile
--- espeak-1.16-source/src/Makefile	2006-11-02 20:09:34.000000000 +0200
+++ espeak-1.16-source-mod/src/Makefile	2006-11-02 19:55:45.000000000 +0200
@@ -6,7 +6,7 @@
 DATADIR=/usr/share/espeak-data
 
 RELEASE = 1.16
-BIN_NAME = speak
+BIN_NAME = espeak
 LIB_NAME = libespeak.so
 LIB_VERSION = 1
 LIBTAG = $(LIB_VERSION).$(RELEASE)

makefile_install_target.patch:

--- NEW FILE makefile_install_target.patch ---
diff -uNr espeak-1.16-source/src/Makefile espeak-1.16-source-mod/src/Makefile
--- espeak-1.16-source/src/Makefile	2006-10-03 00:59:36.000000000 +0200
+++ espeak-1.16-source-mod/src/Makefile	2006-11-04 18:29:51.000000000 +0200
@@ -1,3 +1,18 @@
+BINDIR=/usr/local/bin
+INCDIR=/usr/include/espeak
+LIBDIR=/usr/lib
+DATADIR=/usr/share/espeak-data
+
+RELEASE = 1.16
+BIN_NAME = speak
+LIB_NAME = libespeak.so
+LIB_VERSION = 1
+LIBTAG = $(LIB_VERSION).$(RELEASE)
+
+INSTALL = /usr/bin/install
+LN_SF = /bin/ln -sf
+MKDIR = mkdir -p
+
 speak_SOURCES = speak.cpp compiledict.cpp dictionary.cpp intonation.cpp \
 	readclause.cpp setlengths.cpp \
 	synthdata.cpp synthesize.cpp translate.cpp tr_english.cpp \
@@ -17,29 +32,48 @@
 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
 LIBS2=-lstdc++
 
+CXXFLAGS=-O2
 
 
-all: speak libespeak.so
-	mv libespeak.so libespeak.so.1.1.16
+all: $(BIN_NAME) $(LIB_NAME)
+	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) -O2 -Wall -pedantic -I. -c -fno-exceptions $<
+	$(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
 
-speak: $(OBJS1)
+$(BIN_NAME): $(OBJS1)
 	$(CXX) -o $@ $(OBJS1) $(LIBS1)
 
 
 
 x_%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -O2 -Wall -fpic -fvisibility=hidden -pedantic \
+	$(CXX) $(CXXFLAGS) -Wall -fpic -fvisibility=hidden -pedantic \
 	-I. -D LIBRARY -c -fno-exceptions $<  -o x_$*.o
 
-libespeak.so: $(OBJS2)
-	$(CXX) -shared -Wl,-soname,libespeak.so.1 -o $@ $(OBJS2) $(LIBS2)
-
+$(LIB_NAME): $(OBJS2)
+	$(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
+  
 clean:
 	rm -f *.o *~
 
 distclean: clean
-	rm -f speak
-	rm -f libespeak.so*
+	rm -f $(BIN_NAME)
+	rm -f $(LIB_NAME)*
+
+install: all
+	# Create directories
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(MKDIR) $(DESTDIR)$(LIBDIR)
+	$(MKDIR) $(DESTDIR)$(INCDIR)
+	$(MKDIR) $(DESTDIR)$(DATADIR)
+	# Install executable
+	$(INSTALL) -m 755 $(BIN_NAME) $(DESTDIR)$(BINDIR)
+	# Install shared library
+	$(INSTALL) -m 755 $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)
+	$(LN_SF) $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)/$(LIB_NAME).$(LIB_VERSION)
+	$(LN_SF) $(LIB_NAME).$(LIB_VERSION) $(DESTDIR)$(LIBDIR)/$(LIB_NAME)
+	# Install development headers
+	$(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR)
+	# Install data files
+	cp -prf ../espeak-data/* $(DESTDIR)$(DATADIR)
+
diff -uNr espeak-1.16-source/src/speech.h espeak-1.16-source-mod/src/speech.h
--- espeak-1.16-source/src/speech.h	2006-10-03 00:51:13.000000000 +0200
+++ espeak-1.16-source-mod/src/speech.h	2006-11-04 18:27:02.000000000 +0200
@@ -36,7 +36,10 @@
 #endif
 
 // will look for espeak_data directory here, and also in user's home directory
-#define PATH_ESPEAK_DATA  "/usr/share/espeak-data"
+#ifndef PATH_ESPEAK_DATA
+   #define PATH_ESPEAK_DATA  "/usr/share/espeak-data"
+#endif
+
 
 typedef unsigned short USHORT;
 typedef unsigned char  UCHAR;

makefile_lpthread.patch:

--- NEW FILE makefile_lpthread.patch ---
diff -uNr espeak-1.16-source/src/Makefile espeak-1.16-source-mod/src/Makefile
--- espeak-1.16-source/src/Makefile	2006-10-03 00:59:36.000000000 +0200
+++ espeak-1.16-source-mod/src/Makefile	2006-10-04 15:35:34.000000000 +0200
@@ -11,7 +11,7 @@
 
 SRCS1=$(speak_SOURCES)
 OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
-LIBS1=-lstdc++ -lportaudio
+LIBS1=-lstdc++ -lportaudio -lpthread
 
 SRCS2=$(libespeak_SOURCES)
 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Nov 2006 17:26:33 -0000	1.1
+++ .cvsignore	9 Nov 2006 17:28:19 -0000	1.2
@@ -0,0 +1 @@
+espeak-1.16-source.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Nov 2006 17:26:33 -0000	1.1
+++ sources	9 Nov 2006 17:28:19 -0000	1.2
@@ -0,0 +1 @@
+c376ea94cddda90b093f231926f7ba44  espeak-1.16-source.zip



From fedora-extras-commits at redhat.com  Thu Nov  9 17:30:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Nov 2006 10:30:05 -0700
Subject: fedora-security/extras-errata/errata FEDORA-EXTRAS-2006-004, NONE,
	1.1
Message-ID: <200611091730.kA9HU5E3011420@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/extras-errata/errata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11378/errata

Added Files:
	FEDORA-EXTRAS-2006-004 
Log Message:
FEDORA-EXTRAS-2006-004


--- NEW FILE FEDORA-EXTRAS-2006-004 ---
---------------------------------------------------------------------
Fedora Update Notification
FEDORA-EXTRAS-2006-004
2006-11-09
---------------------------------------------------------------------
Product:    Fedora Extras [3 4 5 6 devel]
Name:       imlib2
Version:    1.2.1-2 [FE 3 4], 1.3.0-3 [FE 5 6 devel]
Summary:    Image loading, saving, rendering, and manipulation library
Description:
Imlib 2 is a library that does image file loading and saving as well
as rendering, manipulation, arbitrary polygon support, etc.
---------------------------------------------------------------------
Update Information:

CVE IDs: CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809

M. Joonas Pihlaja discovered that imlib2 did not sufficiently verify the 
validity of ARGB, JPG, LBM, PNG, PNM, TGA, and TIFF images.  If a user 
were tricked into viewing or processing a specially crafted image with 
an application that uses imlib2, the flaws could be exploited to execute 
arbitrary code with the user's privileges.

Fedora Extras versions earlier then the versions mentioned above are
vulnerable to this problem, upgrade to fix this vulnerability.
---------------------------------------------------------------------
This update can be installed with the 'yum' update program.  Use 'yum
update package-name' at the command line.  For more information, refer
to 'Managing Software with yum,' available at
http://fedora.redhat.com/docs/yum/



From fedora-extras-commits at redhat.com  Thu Nov  9 17:29:59 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Nov 2006 10:29:59 -0700
Subject: fedora-security/extras-errata current_id,1.3,1.4
Message-ID: <200611091730.kA9HUTU0011424@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/extras-errata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11378

Modified Files:
	current_id 
Log Message:
FEDORA-EXTRAS-2006-004


Index: current_id
===================================================================
RCS file: /cvs/fedora/fedora-security/extras-errata/current_id,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- current_id	28 Jul 2006 16:04:35 -0000	1.3
+++ current_id	9 Nov 2006 17:29:57 -0000	1.4
@@ -1 +1 @@
-3
+4



From fedora-extras-commits at redhat.com  Thu Nov  9 17:45:08 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Thu, 9 Nov 2006 10:45:08 -0700
Subject: owners owners.list,1.1912,1.1913
Message-ID: <200611091745.kA9Hj8lD011630@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11606

Modified Files:
	owners.list 
Log Message:
Added package: "espeak"



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1912
retrieving revision 1.1913
diff -u -r1.1912 -r1.1913
--- owners.list	9 Nov 2006 17:26:51 -0000	1.1912
+++ owners.list	9 Nov 2006 17:44:38 -0000	1.1913
@@ -361,6 +361,7 @@
 Fedora Extras|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|erlang-esdl|Erlang OpenGL/SDL api and utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
+Fedora Extras|espeak|Software speech synthesizer (text-to-speech)|faucamp at csir.co.za|extras-qa at fedoraproject.org|
 Fedora Extras|evas|A hardware-accelerated canvas API|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|eventlog|Syslog-ng v2 support library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|evolution-bogofilter|A plugin for bogofilter support in evolution|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 17:53:28 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 9 Nov 2006 10:53:28 -0700
Subject: rpms/linphone/FC-6 linphone-1.4.1-libs.patch, NONE, 1.1 .cvsignore, 
	1.5, 1.6 linphone.spec, 1.22, 1.23 sources, 1.5,
	1.6 linphone-1.0.1-pkgconfig.patch, 1.1,
	NONE linphone-1.1.0-Werror.patch, 1.1,
	NONE linphone-1.2.0-gtkentry.patch, 1.1,
	NONE linphone-1.2.0-maxrtp.patch, 1.1,
	NONE linphone-1.2.0-ortp.patch, 1.1, NONE
Message-ID: <200611091753.kA9HrSTS011716@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11693

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.4.1-libs.patch 
Removed Files:
	linphone-1.0.1-pkgconfig.patch linphone-1.1.0-Werror.patch 
	linphone-1.2.0-gtkentry.patch linphone-1.2.0-maxrtp.patch 
	linphone-1.2.0-ortp.patch 
Log Message:
Update to 1.5.0

linphone-1.4.1-libs.patch:

--- NEW FILE linphone-1.4.1-libs.patch ---
diff -ru linphone-1.4.1.old/configure.in linphone-1.4.1.new/configure.in
--- linphone-1.4.1.old/configure.in	2006-09-18 02:28:20.000000000 -0500
+++ linphone-1.4.1.new/configure.in	2006-10-09 08:49:20.000000000 -0500
@@ -242,7 +242,7 @@
 
 AC_SUBST(STRICT_OPTIONS)
 
-AC_CONFIG_SUBDIRS( oRTP mediastreamer2 )
+AC_CONFIG_SUBDIRS( mediastreamer2 )
 
 dnl check for db2html (docbook) to generate html user manual
 AC_CHECK_PROG(have_db2html,db2html, yes, no)
@@ -258,12 +258,7 @@
 
 AC_DEFINE_UNQUOTED(LINPHONE_VERSION,"$PACKAGE_VERSION",[Linphone's version number])
 
-dnl Packaging: Pick oRTP version from ${top_srcdir}/oRTP/configure.ac
-dnl Feel free to propose an alternative & cleaner version...
-top_srcdir=`dirname $0`
-changequote(, )dnl
-ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'`
-changequote([, ])dnl
+ORTP_VERSION=0.11.0
 AC_SUBST([ORTP_VERSION])
 
 AC_OUTPUT([ 
diff -ru linphone-1.4.1.old/Makefile.am linphone-1.4.1.new/Makefile.am
--- linphone-1.4.1.old/Makefile.am	2006-09-11 07:58:46.000000000 -0500
+++ linphone-1.4.1.new/Makefile.am	2006-10-09 08:49:33.000000000 -0500
@@ -3,7 +3,7 @@
 # let make re-run automake upon need
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = m4 pixmaps po ipkg oRTP gsmlib mediastreamer2\
+SUBDIRS = m4 pixmaps po ipkg gsmlib mediastreamer2\
 		media_api exosip coreapi console gnome share
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2006 12:05:15 -0000	1.5
+++ .cvsignore	9 Nov 2006 17:52:58 -0000	1.6
@@ -1 +1 @@
-linphone-1.2.0.tar.gz
+linphone-1.5.0.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/linphone.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linphone.spec	30 Aug 2006 15:50:47 -0000	1.22
+++ linphone.spec	9 Nov 2006 17:52:58 -0000	1.23
@@ -1,24 +1,39 @@
 Name:           linphone
-Version:        1.2.0
-Release:        7%{?dist}
+Version:        1.5.0
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
-URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
+URL:            http://www.linphone.org/
+Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
-Patch1:         linphone-1.2.0-ortp.patch
-Patch2:         linphone-1.1.0-Werror.patch
-Patch3:         linphone-1.2.0-maxrtp.patch
-Patch4:         linphone-1.2.0-gtkentry.patch
+Patch1:         linphone-1.4.1-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires:  libosip2-devel speex-devel >= 1.0.5  gettext desktop-file-utils
-BuildRequires:  ortp-devel >= 0.7.1
+BuildRequires:  libosip2-devel
+BuildRequires:  ortp-devel = 0.11.0
+
+BuildRequires:  readline-devel
+BuildRequires:  ncurses-devel
+
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  glib2-devel
+BuildRequires:  alsa-lib-devel
+
+BuildRequires:  speex-devel >= 1.2
+
+BuildRequires:  desktop-file-utils
+
 BuildRequires:  perl(XML::Parser)
 
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  libtool
+BuildRequires:  intltool
+BuildRequires:  gettext
+
 %description
 Linphone is mostly sip compliant. It works successfully with these
 implementations:
@@ -27,7 +42,7 @@
     * Hotsip, a free of charge phone for Windows.
     * Vocal, an open source SIP stack from Vovida that includes a SIP proxy
         that works with linphone since version 0.7.1.
-    * Siproxd is a free sip proxy being developped by Thomas Ries because he
+    * Siproxd is a free sip proxy being developed by Thomas Ries because he
         would like to have linphone working behind his firewall. Siproxd is
         simple to setup and works perfectly with linphone.
     * Partysip aims at being a generic and fully functionnal SIP proxy. Visit
@@ -46,14 +61,27 @@
 %prep
 %setup -q
 %patch -p 1 -b .old
-%patch1 -p 1 -b .ortp
-%patch2 -p 1 -b .Werror
-%patch3 -p 1 -b .maxrtp
-%patch4 -p 1 -b .gtkentry
+%patch1 -p 1 -b .libs
+
 rm -r oRTP
 
+libtoolize --copy --force
+autoheader
+aclocal -I m4
+automake --force-missing --add-missing --copy
+autoconf
+rm -rf config.cache
+
+pushd mediastreamer2
+libtoolize --copy --force
+autoheader
+aclocal
+automake --force-missing --add-missing --copy
+autoconf
+popd
+
 %build
-%configure
+%configure --disable-static --disable-video
 make %{?_smp_mflags}
 
 %install
@@ -65,10 +93,11 @@
 desktop-file-install --vendor=fedora \
   --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
+  --remove-category Application \
   --add-category Telephony \
   --add-category GTK \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,12 +112,13 @@
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*.server
 %{_libdir}/liblinphone.so.*
+%{_libdir}/libmediastreamer.so.*
+%{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/gtk-doc/html/mediastreamer
 %{_datadir}/pixmaps/linphone
 %{_datadir}/pixmaps/linphone2.png
 %{_datadir}/sounds/linphone
@@ -96,12 +126,21 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/linphone
-%{_libdir}/liblinphone.a
-%{_libdir}/liblinphone.la
+%{_includedir}/mediastreamer2
 %{_libdir}/liblinphone.so
+%{_libdir}/libmediastreamer.so
+%{_libdir}/libquickstream.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 26 2006 Jeffrey C. Ollie  - 1.5.0-2
+- Don't forget to add new files and remove old ones!
+
+* Thu Oct 26 2006 Jeffrey C. Ollie  - 1.5.0-1
+- Update to 1.5.0
+- Fix spelling error in description.
+- Remove invalid categories on desktop file.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie  - 1.2.0-7
 - Bump release so that I can "make tag"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 12:05:15 -0000	1.5
+++ sources	9 Nov 2006 17:52:58 -0000	1.6
@@ -1 +1 @@
-bd5e513a665ce2e381afce64d569c707  linphone-1.2.0.tar.gz
+e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz


--- linphone-1.0.1-pkgconfig.patch DELETED ---


--- linphone-1.1.0-Werror.patch DELETED ---


--- linphone-1.2.0-gtkentry.patch DELETED ---


--- linphone-1.2.0-maxrtp.patch DELETED ---


--- linphone-1.2.0-ortp.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  9 18:05:25 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 9 Nov 2006 11:05:25 -0700
Subject: rpms/seamonkey/FC-5 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE find-external-requires, 1.1,
	NONE firefox-0.7.3-default-plugin-less-annoying.patch, 1.1,
	NONE firefox-0.7.3-psfonts.patch, 1.1,
	NONE firefox-1.0-prdtoa.patch, 1.1,
	NONE firefox-1.1-nss-system-nspr.patch, 1.1,
	NONE firefox-1.1-uriloader.patch, 1.1,
	NONE firefox-1.1-visibility.patch, 1.1,
	NONE firefox-1.5-with-system-nss.patch, 1.1,
	NONE firefox-1.5.0.1-dumpstack.patch, 1.1,
	NONE mozilla-1.4.1-ppc64.patch, 1.1,
	NONE mozilla-1.7.3-gnome-vfs-default-app.patch, 1.1,
	NONE mozilla-1.7.5-g-application-name.patch, 1.1,
	NONE mozilla-nspr-packages.patch, 1.1,
	NONE mozilla-psm-exclude-list, 1.1,
	NONE mozilla-xpcom-exclude-list, 1.1, NONE pango-cairo.patch,
	1.1, NONE seamonkey-1.0.1-dumpstack.patch, 1.1,
	NONE seamonkey-cairo-bug5136.patch, 1.1,
	NONE seamonkey-configure.patch, 1.4,
	NONE seamonkey-disable-visibility.patch, 1.1,
	NONE seamonkey-fedora-default-bookmarks.html, 1.1,
	NONE seamonkey-fedora-default-prefs.js, 1.2,
	NONE seamonkey-fedora-home-page.patch, 1.1,
	NONE seamonkey-icon.png, 1.1, NONE seamonkey-mail-icon.png, 1.1,
	NONE seamonkey-mail.desktop, 1.1, NONE seamonkey-make-package.pl,
	1.1, NONE seamonkey-mozconfig, 1.1, NONE seamonkey.desktop, 1.1,
	NONE seamonkey.sh.in, 1.1, NONE seamonkey.spec, 1.7,
	NONE sources, 1.6, NONE thunderbird-0.7.3-gnome-uriloader.patch,
	1.1, NONE thunderbird-1.5-bug304720.patch, 1.1, NONE
Message-ID: <200611091805.kA9I5Phg015046@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15021

Added Files:
	dead.package 
Removed Files:
	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:
The SeaMonkey Fedora Extras package for FC5
will be moved to Fedora Core
and it will made to obsolete the Mozilla package.



--- NEW FILE dead.package ---
The SeaMonkey Fedora Extras package for FC5
will be moved to Fedora Core 
and it will made to obsolete the Mozilla package.


--- 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  Thu Nov  9 18:55:19 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 11:55:19 -0700
Subject: rpms/gperiodic import.log,1.5,1.6
Message-ID: <200611091855.kA9ItJj6015607@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15568

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-5 on branch FC-6 from gperiodic-2.0.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	9 Nov 2006 07:13:39 -0000	1.5
+++ import.log	9 Nov 2006 18:54:48 -0000	1.6
@@ -2,3 +2,4 @@
 gperiodic-2_0_8-3:HEAD:gperiodic-2.0.8-3.src.rpm:1139607599
 gperiodic-2_0_8-4:HEAD:gperiodic-2.0.8-4.src.rpm:1139953768
 gperiodic-2_0_8-5:HEAD:gperiodic-2.0.8-5.src.rpm:1163056409
+gperiodic-2_0_8-5:FC-6:gperiodic-2.0.8-5.src.rpm:1163098476



From fedora-extras-commits at redhat.com  Thu Nov  9 18:55:20 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 11:55:20 -0700
Subject: rpms/gperiodic/FC-6 gperiodic.spec,1.4,1.5
Message-ID: <200611091855.kA9ItKfV015610@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15568/FC-6

Modified Files:
	gperiodic.spec 
Log Message:
auto-import gperiodic-2.0.8-5 on branch FC-6 from gperiodic-2.0.8-5.src.rpm


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/gperiodic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gperiodic.spec	28 Aug 2006 07:07:24 -0000	1.4
+++ gperiodic.spec	9 Nov 2006 18:54:49 -0000	1.5
@@ -4,8 +4,8 @@
 Release: 5%{?dist}
 License: GPL
 Group: Applications/Engineering
-URL: http://koti.welho.com/jfrantz/software/gperiodic.html
-Source: http://koti.welho.com/jfrantz/software/gperiodic-%{version}.tar.gz
+URL: http://www.frantz.fi/software/gperiodic.php
+Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -58,8 +58,8 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
-* Mon Aug 28 2006 Eric Tanguy  - 2.0.8-5
-- Rebuild for Fedora Extras 6
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
+- Modify URL in package descrpition and source
 
 * Tue Feb 14 2006 Eric Tanguy  - 2.0.8-4
 - Rebuild for FC5



From fedora-extras-commits at redhat.com  Thu Nov  9 18:56:41 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 11:56:41 -0700
Subject: rpms/gperiodic import.log,1.6,1.7
Message-ID: <200611091856.kA9IufOQ015701@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15671

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-5 on branch FC-5 from gperiodic-2.0.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	9 Nov 2006 18:54:48 -0000	1.6
+++ import.log	9 Nov 2006 18:56:11 -0000	1.7
@@ -3,3 +3,4 @@
 gperiodic-2_0_8-4:HEAD:gperiodic-2.0.8-4.src.rpm:1139953768
 gperiodic-2_0_8-5:HEAD:gperiodic-2.0.8-5.src.rpm:1163056409
 gperiodic-2_0_8-5:FC-6:gperiodic-2.0.8-5.src.rpm:1163098476
+gperiodic-2_0_8-5:FC-5:gperiodic-2.0.8-5.src.rpm:1163098561



From fedora-extras-commits at redhat.com  Thu Nov  9 18:56:42 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 11:56:42 -0700
Subject: rpms/gperiodic/FC-5 gperiodic.spec,1.3,1.4
Message-ID: <200611091856.kA9IugrK015704@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15671/FC-5

Modified Files:
	gperiodic.spec 
Log Message:
auto-import gperiodic-2.0.8-5 on branch FC-5 from gperiodic-2.0.8-5.src.rpm


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-5/gperiodic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gperiodic.spec	14 Feb 2006 21:49:45 -0000	1.3
+++ gperiodic.spec	9 Nov 2006 18:56:12 -0000	1.4
@@ -1,11 +1,11 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Engineering
-URL: http://koti.welho.com/jfrantz/software/gperiodic.html
-Source: http://koti.welho.com/jfrantz/software/gperiodic-%{version}.tar.gz
+URL: http://www.frantz.fi/software/gperiodic.php
+Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -58,6 +58,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
+- Modify URL in package descrpition and source
+
 * Tue Feb 14 2006 Eric Tanguy  - 2.0.8-4
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Thu Nov  9 19:06:26 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 9 Nov 2006 12:06:26 -0700
Subject: rpms/ganglia/devel ganglia.spec,1.2,1.3
Message-ID: <200611091906.kA9J6QUN018899@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ganglia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18788

Modified Files:
	ganglia.spec 
Log Message:
- Both gmetad and gmond need to run as the ganglia user, but its quite often the case that only one or the other is installed on a system. Have both try to create the ganglia user -- if both try on the same system, the second should silently fail (bz #214762).




Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/ganglia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ganglia.spec	5 Sep 2006 14:06:36 -0000	1.2
+++ ganglia.spec	9 Nov 2006 19:05:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.0.3
-Release:            10%{?dist}
+Release:            11%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -132,11 +132,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+### Both gmetad and gmond require user ganglia, but monitored
+### nodes only need gmond, servers only need gmetad... So have
+### both packages try to add the user (second one should just
+### fail silently).
 %pre gmetad
 ## Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
+%pre gmond
+## Add the "ganglia" user
+/usr/sbin/useradd -c "Ganglia Monitoring System" \
+        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
+
 %post gmond
 /sbin/chkconfig --add gmond
 
@@ -197,6 +206,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Nov 09 2006 Jarod Wilson  3.0.3-11
+- gmond also needs ganglia user (#214762)
+
 * Tue Sep 05 2006 Jarod Wilson  3.0.3-10
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Thu Nov  9 19:08:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 9 Nov 2006 12:08:13 -0700
Subject: rpms/ganglia/FC-6 ganglia.spec,1.2,1.3
Message-ID: <200611091908.kA9J8DUI018963@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ganglia/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18947

Modified Files:
	ganglia.spec 
Log Message:
- Both gmetad and gmond need to run as the ganglia user, but its quite often the case that only one or the other is installed on a system. Have both try to create the ganglia user -- if both try on the same system, the second should silently fail (bz #214762).




Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/FC-6/ganglia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ganglia.spec	5 Sep 2006 14:06:36 -0000	1.2
+++ ganglia.spec	9 Nov 2006 19:07:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.0.3
-Release:            10%{?dist}
+Release:            11%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -132,11 +132,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+### Both gmetad and gmond require user ganglia, but monitored
+### nodes only need gmond, servers only need gmetad... So have
+### both packages try to add the user (second one should just
+### fail silently).
 %pre gmetad
 ## Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
+%pre gmond
+## Add the "ganglia" user
+/usr/sbin/useradd -c "Ganglia Monitoring System" \
+        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
+
 %post gmond
 /sbin/chkconfig --add gmond
 
@@ -197,6 +206,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Nov 09 2006 Jarod Wilson  3.0.3-11
+- gmond also needs ganglia user (#214762)
+
 * Tue Sep 05 2006 Jarod Wilson  3.0.3-10
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Thu Nov  9 19:14:29 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 9 Nov 2006 12:14:29 -0700
Subject: rpms/python-nltk/FC-3 python-nltk-1.4.2-maxent.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 python-nltk.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611091914.kA9JETqN019049@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19025

Modified Files:
	.cvsignore python-nltk.spec sources 
Added Files:
	python-nltk-1.4.2-maxent.patch 
Log Message:
- Updated version 1.4.2 for FE3, with a patch to revert maxent.py to the version that does not require numarray


python-nltk-1.4.2-maxent.patch:

--- NEW FILE python-nltk-1.4.2-maxent.patch ---
--- nltk-1.4.2/nltk/classifier/maxent.py.orig	2004-07-19 06:43:49.000000000 -0400
+++ nltk-1.4.2/nltk/classifier/maxent.py	2006-11-09 14:10:32.000000000 -0500
@@ -5,7 +5,7 @@
 # URL: 
 # For license information, see LICENSE.TXT
 #
-# $Id: maxent.py,v 1.32 2004/07/19 05:34:37 edloper Exp $
+# $Id: maxent.py,v 1.31 2004/07/17 21:03:19 edloper Exp $
 
 """
 
@@ -14,33 +14,20 @@
 emperically consistant with the training data; and chooses the
 distribution with the highest entropy.  A probability distribution is
 X{emperically consistant} with a set of training data if its estimated
-frequency with which a class and a feature vector value co-occur is
-equal to the actual frequency in the data.
+frequency for each pair M{(c, f[i])} is equal to the pair's actual
+frequency in the data, where M{c} is a class and M{f[i]} is the M{i}th
+feature vector element.
+
+                 SUM[t|c[t]=c0] f[i][t]
+freq(c0, f[i]) = -----------------------
+                    SUM[t] f[i][t]
 
-for each pair M{(c, f[i])} is equal to the pair's actual
-frequency in the data, where M{c} is a class and M{f[i]} is a value
-for the M{i}th feature vector element.
 
-"""
-
-# This needs to be updated/fixed:!!
-"""
-                     SUM[t|t[CLASS]=c] t[FEATURE_VECTOR][i]
-actual freq(c, i) = ----------------------------------------
-                          SUM[t] t[FEATURE_VECTOR][i]
-
-
-                  SUM[t] P(t[CLASS]=c) t[FEATURE_VECTOR][i]
-est freq(c, i) = -------------------------------------------
-
-
-                         P(t[c]=c0) t[f][i]
-prob(c0, f[i]) = SUM[t] ---------------------------
-                          SUM[c]
-
-- C{t}: A token
-- C{t[CLASS]}: Token C{t}'s class
-- C{t[FEATURE_VECTOR]}: Token C{t}'s feature vector
+                 SUM[t] SUM[c] P(c[t]=c0) f[i][t]
+prob(c0, f[i]) = ---------------------------------
+                 
+c[t]
+f[i][t]
 
 
 the frequency of each (class, 
@@ -124,9 +111,9 @@
 from nltk import TaskI, PropertyIndirectionMixIn
 import time, types
 
-# Don't use from .. imports, because math and numarray provide
+# Don't use from .. imports, because math and Numeric provide
 # different definitions for useful functions (exp, log, etc.)
-import math, numarray
+import math, Numeric
 
 ##//////////////////////////////////////////////////////
 ##  Maxent Classifier
@@ -346,7 +333,7 @@
 # [XX] requires: features must be encoded with a GISFeatureEncoder!
 class GISMaxentClassifierTrainer(ClassifierTrainerI):
     def _fcount_emperical(self, train_toks):
-        fcount = numarray.zeros(self._weight_vector_len, 'd')
+        fcount = Numeric.zeros(self._weight_vector_len, 'd')
 
         for tok in train_toks:
             feature_vector = tok['FEATURE_VECTOR']
@@ -358,7 +345,7 @@
         return fcount
 
     def _fcount_estimated(self, classifier, train_toks):
-        fcount = numarray.zeros(self._weight_vector_len, 'd')
+        fcount = Numeric.zeros(self._weight_vector_len, 'd')
 
         for tok in train_toks:
             dist = classifier.get_class_probs(tok)
@@ -423,14 +410,14 @@
         # An array that is 1 whenever fcount_emperical is zero.  In
         # other words, it is one for any feature that's not attested
         # in the training data.  This is used to avoid division by zero.
-        unattested = numarray.zeros(len(fcount_emperical))
+        unattested = Numeric.zeros(len(fcount_emperical))
         for i in range(len(fcount_emperical)):
             if fcount_emperical[i] == 0: unattested[i] = 1
 
         # Build the classifier.  Start with weight=1 for each feature,
         # except for the unattested features.  Start those out at
         # zero, since we know that's the correct value.
-        weights = numarray.ones(len(fcount_emperical), 'd')
+        weights = Numeric.ones(len(fcount_emperical), 'd')
         weights -= unattested
         classifier = ConditionalExponentialClassifier(classes, weights)
 
@@ -553,7 +540,7 @@
             emperical frequency for feature M{i}.
         @rtype: C{array} of C{float}
         """
-        fcount = numarray.zeros(self._weight_vector_len, 'd')
+        fcount = Numeric.zeros(self._weight_vector_len, 'd')
 
         for tok in train_toks:
             feature_vector = tok['FEATURE_VECTOR']
@@ -672,12 +659,12 @@
         NEWTON_CONVERGE = 1e-12
         MAX_NEWTON = 30
         
-        deltas = numarray.ones(self._weight_vector_len, 'd')
+        deltas = Numeric.ones(self._weight_vector_len, 'd')
 
         # Precompute the A matrix:
         # A[nf][id] = sum ( p(text) * p(label|text) * f(text,label) )
         # over all label,text s.t. num_features[label,text]=nf
-        A = numarray.zeros((len(nfmap), self._weight_vector_len), 'd')
+        A = Numeric.zeros((len(nfmap), self._weight_vector_len), 'd')
 
         for i, tok in enumerate(train_toks):
             dist = classifier.get_class_probs(tok)
@@ -702,11 +689,11 @@
         #   - sum2[i][nf] = sum p(text)p(label|text)f[i](label,text)
         #                       nf exp(delta[i]nf)
         for rangenum in range(MAX_NEWTON):
-            nf_delta = numarray.outerproduct(nfarray, deltas)
-            exp_nf_delta = numarray.exp(nf_delta)
+            nf_delta = Numeric.outerproduct(nfarray, deltas)
+            exp_nf_delta = Numeric.exp(nf_delta)
             nf_exp_nf_delta = nftranspose * exp_nf_delta
-            sum1 = numarray.sum(exp_nf_delta * A) 
-            sum2 = numarray.sum(nf_exp_nf_delta * A)
+            sum1 = Numeric.sum(exp_nf_delta * A) 
+            sum2 = Numeric.sum(nf_exp_nf_delta * A)
 
             # Avoid division by zero.
             sum2 += unattested
@@ -715,8 +702,8 @@
             deltas -= (ffreq_emperical - sum1) / -sum2
 
             # We can stop once we converge.
-            n_error = (numarray.sum(abs((ffreq_emperical-sum1)))/
-                       numarray.sum(abs(deltas)))
+            n_error = (Numeric.sum(abs((ffreq_emperical-sum1)))/
+                       Numeric.sum(abs(deltas)))
             if n_error < NEWTON_CONVERGE:
                 return deltas
 
@@ -822,20 +809,20 @@
         nfmap = self._nfmap(train_toks)
         nfs = nfmap.items()
         nfs.sort(lambda x,y:cmp(x[1],y[1]))
-        nfarray = numarray.array([nf for (nf, i) in nfs], 'd')
-        nftranspose = numarray.reshape(nfarray, (len(nfarray), 1))
+        nfarray = Numeric.array([nf for (nf, i) in nfs], 'd')
+        nftranspose = Numeric.reshape(nfarray, (len(nfarray), 1))
 
         # An array that is 1 whenever ffreq_emperical is zero.  In
         # other words, it is one for any feature that's not attested
         # in the data.  This is used to avoid division by zero.
-        unattested = numarray.zeros(self._weight_vector_len, 'd')
+        unattested = Numeric.zeros(self._weight_vector_len, 'd')
         for i in range(len(unattested)):
             if ffreq_emperical[i] == 0: unattested[i] = 1
 
         # Build the classifier.  Start with weight=1 for each feature,
         # except for the unattested features.  Start those out at
         # zero, since we know that's the correct value.
-        weights = numarray.ones(self._weight_vector_len, 'd')
+        weights = Numeric.ones(self._weight_vector_len, 'd')
         weights -= unattested
         classifier = ConditionalExponentialClassifier(classes, weights)
                 
@@ -859,7 +846,7 @@
 
             # Use the deltas to update our weights.
             weights = classifier.weights()
-            weights *= numarray.exp(deltas)
+            weights *= Numeric.exp(deltas)
             classifier.set_weights(weights)
                         
             # Check log-likelihood cutoffs.
@@ -963,4 +950,4 @@
             s += '%5s=%.3f' % (val,prob)
         print s + ' ...'
     
-if __name__ == '__main__': demo(1)
+if __name__ == '__main__': demo(30)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 05:22:25 -0000	1.2
+++ .cvsignore	9 Nov 2006 19:13:59 -0000	1.3
@@ -1 +1 @@
-nltk-1.4.4.tar.gz
+nltk-1.4.2.tar.gz


Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/python-nltk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-nltk.spec	8 Nov 2006 17:31:50 -0000	1.4
+++ python-nltk.spec	9 Nov 2006 19:13:59 -0000	1.5
@@ -1,20 +1,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-nltk
-Version:        1.4.4
-Release:        3.1%{?dist}
+Version:        1.4.2
+Release:        2%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://nltk.sf.net/
 Source0:        http://dl.sourceforge.net/nltk/nltk-%{version}.tar.gz
+Patch0:         python-nltk-1.4.2-maxent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:  python
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:	python-numarray, tkinter
+Requires:	python-numeric, tkinter
 
 %description
 The Natural Language Toolkit is a Python package that simplifies the
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q -n nltk-%{version}
+%patch0 -p1 -b .maxent
 
 
 %build
@@ -60,14 +62,12 @@
 
 
 %changelog
-* Wed Nov  8 2006 Michel Salim  - 1.4.4-3.1
-- Rebuild with correct source
+* Thu Nov  9 2006 Michel Salim  - 1.4.2-2
+- Package .pyos in compliance with new policy
+- Revert maxent.py to a version that does not use numarray
 
-* Wed Nov  8 2006 Michel Salim  - 1.4.4-3
-- Include *.pyos, for compliance with new Python guidelines
+* Mon Feb  6 2006 Michel Salim  - 1.4.2-1
+- Downgrade to 1.4.2 for FC3 only, to match older version of Python installed
 
-* Mon Oct  9 2006 Michel Salim  - 1.4.4-2
-- Rebuild for FE6
-
-* Sun Sep 11 2005 Michel Salim  - 1.4.4-1
+* Sun Sep 11 2005 Michel Salim  - 1.4.4-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2006 17:31:50 -0000	1.4
+++ sources	9 Nov 2006 19:13:59 -0000	1.5
@@ -1 +1 @@
-fb402d42d71844fe4483affa100814e5  nltk-1.4.4.tar.gz
+f24e6ac9c2152e9cf6f9fa09e259d783  nltk-1.4.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 19:17:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:17:01 -0700
Subject: rpms/beneath-a-steel-sky - New directory
Message-ID: <200611091917.kA9JH1Xf019151@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19147/beneath-a-steel-sky

Log Message:
Directory /cvs/extras/rpms/beneath-a-steel-sky added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 19:17:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:17:07 -0700
Subject: rpms/beneath-a-steel-sky/devel - New directory
Message-ID: <200611091917.kA9JH7WI019165@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19147/beneath-a-steel-sky/devel

Log Message:
Directory /cvs/extras/rpms/beneath-a-steel-sky/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 19:17:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:17:25 -0700
Subject: rpms/beneath-a-steel-sky Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611091917.kA9JHP53019196@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19190

Added Files:
	Makefile import.log 
Log Message:
Setup of module beneath-a-steel-sky


--- NEW FILE Makefile ---
# Top level Makefile for module beneath-a-steel-sky
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 Nov  9 19:17:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:17:31 -0700
Subject: rpms/beneath-a-steel-sky/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611091917.kA9JHVoi019216@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19190/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beneath-a-steel-sky


--- 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 Nov  9 19:23:04 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:23:04 -0700
Subject: rpms/beneath-a-steel-sky import.log,1.1,1.2
Message-ID: <200611091923.kA9JN4T3019365@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322

Modified Files:
	import.log 
Log Message:
auto-import beneath-a-steel-sky-0.0348-2 on branch devel from beneath-a-steel-sky-0.0348-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Nov 2006 19:17:25 -0000	1.1
+++ import.log	9 Nov 2006 19:22:34 -0000	1.2
@@ -0,0 +1 @@
+beneath-a-steel-sky-0_0348-2:HEAD:beneath-a-steel-sky-0.0348-2.src.rpm:1163100834



From fedora-extras-commits at redhat.com  Thu Nov  9 19:23:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:23:05 -0700
Subject: rpms/beneath-a-steel-sky/devel beneath-a-steel-sky.desktop, NONE,
	1.1 beneath-a-steel-sky.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611091923.kA9JN54Z019369@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beneath-a-steel-sky.desktop beneath-a-steel-sky.spec 
Log Message:
auto-import beneath-a-steel-sky-0.0348-2 on branch devel from beneath-a-steel-sky-0.0348-2.src.rpm


--- NEW FILE beneath-a-steel-sky.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beneath a Steel Sky
Comment=Adventure Game
Exec=scummvm -f -p /usr/share/beneath-a-steel-sky sky
Icon=scummvm.png
Terminal=false
Type=Application
Categories=Application;Game;AdventureGame;
StartupNotify=false


--- NEW FILE beneath-a-steel-sky.spec ---
Name:           beneath-a-steel-sky
Version:        0.0348
Release:        2
Summary:        Beneath a Steel Sky - Adventure Game
Group:          Amusements/Games
# For further discussion on distribution rights see:
# http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
License:        Distributable
URL:            http://www.revolution.co.uk/_display.php?id=16
Source0:        http://www.mixnmojo.com/bss/BASS-Floppy.zip
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       scummvm >= 0.9.1, hicolor-icon-theme
Obsoletes:      bass <= 0-8
Provides:       bass = 0-8

%description
After the Dungeons and Dragons fantasy setting of Revolution's first game, Lure
of the Temptress, Revolution decided to go down a completely different avenue
with its second adventure game, Beneath a Steel Sky, that of Science Fiction.
A bleak vision of the future was imagined, where mind control and medical
science combined forces to repress the populace. Leading comic artist, Dave
Gibbons, joined the design team to visualise this desperate landscape. The
result is the cult classic Beneath a Steel Sky.

Notice that this package contains the floppy version, the CD version is also
available in the %{name}-cd package. The CD version contains
additional / longer cutscenes and voice acting, but also is much larger: the CD
version ways in at 70 MB where as this version is only 8 MB.


%prep
%setup -q -n sky-floppy


%build
# Nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 sky.* $RPM_BUILD_ROOT%{_datadir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc readme.txt
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Thu Nov  9 2006 Hans de Goede  0.0348-2
- Fix Source0 URL
- Various small specfile cleanups (bug 214057)

* Sun Nov  5 2006 Hans de Goede  0.0348-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Nov 2006 19:17:31 -0000	1.1
+++ .cvsignore	9 Nov 2006 19:22:35 -0000	1.2
@@ -0,0 +1 @@
+BASS-Floppy.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Nov 2006 19:17:31 -0000	1.1
+++ sources	9 Nov 2006 19:22:35 -0000	1.2
@@ -0,0 +1 @@
+cb968b4cfdde8491069915bf15d275b3  BASS-Floppy.zip



From fedora-extras-commits at redhat.com  Thu Nov  9 19:26:29 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 9 Nov 2006 12:26:29 -0700
Subject: rpms/ganglia/FC-5 ganglia.spec,1.1,1.2
Message-ID: <200611091926.kA9JQTx6019551@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ganglia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19535

Modified Files:
	ganglia.spec 
Log Message:
- Both gmetad and gmond need to run as the ganglia user, but its quite often the case that only one or the other is installed on a system. Have both try to create the ganglia user -- if both try on the same system, the second should silently fail (bz #214762).




Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/FC-5/ganglia.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ganglia.spec	15 Jun 2006 20:15:48 -0000	1.1
+++ ganglia.spec	9 Nov 2006 19:25:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ganglia
 Version:	3.0.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Ganglia Distributed Monitoring System
 
 Group:		Applications/Internet
@@ -129,11 +129,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+### Both gmetad and gmond require user ganglia, but monitored
+### nodes only need gmond, servers only need gmetad... So have
+### both packages try to add the user (second one should just
+### fail silently).
 %pre gmetad
 # Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
+%pre gmond
+# Add the "ganglia" user
+/usr/sbin/useradd -c "Ganglia Monitoring System" \
+        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
+
 %post gmond
 /sbin/chkconfig --add gmond
 
@@ -204,6 +213,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Nov 09 2006 Jarod Wilson  3.0.3-8
+- gmond also needs ganglia user (#214762)
+
 * Tue Jun 13 2006 Jarod Wilson  3.0.3-7
 - Clean up documentation
 



From fedora-extras-commits at redhat.com  Thu Nov  9 19:29:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:29:16 -0700
Subject: owners owners.list,1.1913,1.1914
Message-ID: <200611091929.kA9JTGxx019601@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19576

Modified Files:
	owners.list 
Log Message:
added beneath-a-steel-sky


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1913
retrieving revision 1.1914
diff -u -r1.1913 -r1.1914
--- owners.list	9 Nov 2006 17:44:38 -0000	1.1913
+++ owners.list	9 Nov 2006 19:28:46 -0000	1.1914
@@ -105,6 +105,7 @@
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 19:31:44 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 9 Nov 2006 12:31:44 -0700
Subject: rpms/sparse/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sparse.spec,
	1.1, 1.2
Message-ID: <200611091931.kA9JViPE019706@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19677

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
upgrade to 0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sparse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Nov 2006 09:24:09 -0000	1.2
+++ .cvsignore	9 Nov 2006 19:31:14 -0000	1.3
@@ -1 +1 @@
-sparse-20061026.tar.bz2
+sparse-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sparse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Nov 2006 09:24:09 -0000	1.2
+++ sources	9 Nov 2006 19:31:14 -0000	1.3
@@ -1 +1 @@
-724e23dc62375879f75708f35f245e58  sparse-20061026.tar.bz2
+367d1cb0a26db26e2da47a491bc95374  sparse-0.1.tar.gz


Index: sparse.spec
===================================================================
RCS file: /cvs/extras/rpms/sparse/devel/sparse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sparse.spec	5 Nov 2006 09:24:09 -0000	1.1
+++ sparse.spec	9 Nov 2006 19:31:14 -0000	1.2
@@ -1,17 +1,11 @@
-%define snapshot_date 20061026
-%define prerelease 1
-%define alphatag %{snapshot_date}git
 Name: sparse          
-Version: 0        
-Release: 0.%{prerelease}.%{alphatag}%{?dist}
-Summary: A semantic parser of source files
-
+Version: 0.1        
+Release: 1%{?dist}
+Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    Open Software License
-URL:        http://www.kernel.org/pub/scm/devel/sparse/sparse.git/    
-# git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git/
-# snapshots also available at http://www.codemonkey.org.uk/projects/git-snapshots/sparse/
-Source0:    sparse-%{snapshot_date}.tar.bz2
+URL:        http://kernel.org/pub/linux/kernel/people/josh/sparse/
+Source0:    http://kernel.org/pub/linux/kernel/people/josh/sparse/dist/sparse-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,7 +25,7 @@
 Sparse is primarily used in the development and debugging of the Linux kernel.
 
 %prep
-%setup -q -n sparse
+%setup -q
 
 
 %build
@@ -43,8 +37,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 make install PREFIX=%{buildroot}%{_prefix}
-# no reason to ship libsparse.so until something exists that links against it
-rm %{buildroot}%{_bindir}/libsparse.so
 
 %clean
 rm -rf %{buildroot}
@@ -54,7 +46,12 @@
 %defattr(-,root,root,-)
 %doc LICENSE README FAQ
 %{_bindir}/sparse
+%{_bindir}/cgcc
 
 %changelog
+* Thu Nov 09 2006 Matt Domsch  0.1-1
+- Upgrade to 0.1, no need for snapshots, yea!  New upstream maintainer.
+- cgcc now installed
+
 * Thu Oct 26 2006 Matt Domsch  0-0.1.20061026git
 - Initial packaging for Fedora Extras



From fedora-extras-commits at redhat.com  Thu Nov  9 19:40:12 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 12:40:12 -0700
Subject: rpms/libapreq2/devel .cvsignore, 1.15, 1.16 libapreq2.spec, 1.22,
	1.23 sources, 1.15, 1.16
Message-ID: <200611091940.kA9JeCBu019839@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19819

Modified Files:
	.cvsignore libapreq2.spec sources 
Log Message:
Bump up to 2.09-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Sep 2006 01:03:04 -0000	1.15
+++ .cvsignore	9 Nov 2006 19:39:42 -0000	1.16
@@ -1 +1 @@
-libapreq2-2.09-rc1.tar.gz
+libapreq2-2.09.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libapreq2.spec	16 Sep 2006 02:34:59 -0000	1.22
+++ libapreq2.spec	9 Nov 2006 19:39:42 -0000	1.23
@@ -2,13 +2,13 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.rc1.3.1%{?dist}
+Release:        0.rc2.1%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://httpd.apache.org/apreq/
-Source0:        http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09-rc1.tar.gz
+Source0:        http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09.tar.gz
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-2.07-rc3-ldflags.patch
@@ -54,11 +54,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
-cd ..
-rm -f %{name}-%{version}
-ln -s %{name}-%{version}-rc1 %{name}-%{version}
-cd %{name}-%{version}
+%setup -q
 
 # Filter unversioned provides for which there's a versioned one in perl-*:
 cat << \EOF > %{name}-perl-prov
@@ -120,7 +116,6 @@
 
 
 %clean
-rm -f ../%{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -158,6 +153,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Bojan Smojver  - 2.09-0.rc2.1
+- bump up to 2.09-rc2
+
 * Sat Sep 16 2006 Bojan Smojver  - 2.09-0.rc1.3.1
 - mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Sep 2006 01:03:04 -0000	1.15
+++ sources	9 Nov 2006 19:39:42 -0000	1.16
@@ -1 +1 @@
-fe69ccbd7198b0f7b4d6436c4d2cea12  libapreq2-2.09-rc1.tar.gz
+3cd98755da8a8431ef35a47461ad67d7  libapreq2-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 19:51:27 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 12:51:27 -0700
Subject: rpms/libapreq2/FC-6 .cvsignore, 1.15, 1.16 libapreq2.spec, 1.22,
	1.23 sources, 1.15, 1.16
Message-ID: <200611091951.kA9JpRSD019995@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/libapreq2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19969

Modified Files:
	.cvsignore libapreq2.spec sources 
Log Message:
Bump up to 2.09-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Sep 2006 01:03:04 -0000	1.15
+++ .cvsignore	9 Nov 2006 19:50:56 -0000	1.16
@@ -1 +1 @@
-libapreq2-2.09-rc1.tar.gz
+libapreq2-2.09.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-6/libapreq2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libapreq2.spec	16 Sep 2006 02:34:59 -0000	1.22
+++ libapreq2.spec	9 Nov 2006 19:50:56 -0000	1.23
@@ -2,13 +2,13 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.rc1.3.1%{?dist}
+Release:        0.rc2.1%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://httpd.apache.org/apreq/
-Source0:        http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09-rc1.tar.gz
+Source0:        http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09.tar.gz
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-2.07-rc3-ldflags.patch
@@ -54,11 +54,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
-cd ..
-rm -f %{name}-%{version}
-ln -s %{name}-%{version}-rc1 %{name}-%{version}
-cd %{name}-%{version}
+%setup -q
 
 # Filter unversioned provides for which there's a versioned one in perl-*:
 cat << \EOF > %{name}-perl-prov
@@ -120,7 +116,6 @@
 
 
 %clean
-rm -f ../%{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -158,6 +153,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Bojan Smojver  - 2.09-0.rc2.1
+- bump up to 2.09-rc2
+
 * Sat Sep 16 2006 Bojan Smojver  - 2.09-0.rc1.3.1
 - mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Sep 2006 01:03:04 -0000	1.15
+++ sources	9 Nov 2006 19:50:56 -0000	1.16
@@ -1 +1 @@
-fe69ccbd7198b0f7b4d6436c4d2cea12  libapreq2-2.09-rc1.tar.gz
+3cd98755da8a8431ef35a47461ad67d7  libapreq2-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 19:57:43 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 9 Nov 2006 12:57:43 -0700
Subject: rpms/seamonkey/FC-6 .cvsignore, 1.6, 1.7 seamonkey.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200611091957.kA9JvhIB020245@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20216

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
* Thu Nov 09 2006 Kai Engert  1.0.6-0.6
- SeaMonkey 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Sep 2006 01:31:47 -0000	1.6
+++ .cvsignore	9 Nov 2006 19:57:13 -0000	1.7
@@ -1 +1 @@
-seamonkey-1.0.5.source.tar.bz2
+seamonkey-1.0.6.source.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/seamonkey.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- seamonkey.spec	15 Sep 2006 01:31:47 -0000	1.11
+++ seamonkey.spec	9 Nov 2006 19:57:13 -0000	1.12
@@ -10,8 +10,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0.5
-Release:        1%{?dist}
+Version:        1.0.6
+Release:        0.6%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -432,6 +432,8 @@
 
 
 %changelog
+* Thu Nov 09 2006 Kai Engert  1.0.6-0.6
+- SeaMonkey 1.0.6
 * Thu Sep 14 2006 Kai Engert  1.0.5-1
 - SeaMonkey 1.0.5
 * Wed Sep 06 2006 Kai Engert  1.0.4-8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Sep 2006 01:31:47 -0000	1.6
+++ sources	9 Nov 2006 19:57:13 -0000	1.7
@@ -1 +1 @@
-a1b98cd4d2d0f71d50406f8cd3885a5e  seamonkey-1.0.5.source.tar.bz2
+16e1c6bab1e3832b22863933b5b032e7  seamonkey-1.0.6.source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  9 19:58:49 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 12:58:49 -0700
Subject: rpms/libmthca import.log,1.9,1.10
Message-ID: <200611091958.kA9JwnEs020319@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20285

Modified Files:
	import.log 
Log Message:
auto-import libmthca-1.0.3-1 on branch devel from libmthca-1.0.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmthca/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	13 Jun 2006 22:41:06 -0000	1.9
+++ import.log	9 Nov 2006 19:58:19 -0000	1.10
@@ -6,3 +6,4 @@
 libmthca-1_0-1:HEAD:libmthca-1.0-1.src.rpm:1142293099
 libmthca-1_0-1:FC-4:libmthca-1.0-1.src.rpm:1142293165
 libmthca-1_0_2-1:HEAD:libmthca-1.0.2-1.src.rpm:1150238464
+libmthca-1_0_3-1:HEAD:libmthca-1.0.3-1.src.rpm:1163102296



From fedora-extras-commits at redhat.com  Thu Nov  9 19:58:50 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 12:58:50 -0700
Subject: rpms/libmthca/devel .cvsignore, 1.6, 1.7 libmthca.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611091958.kA9JwoxX020324@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20285/devel

Modified Files:
	.cvsignore libmthca.spec sources 
Log Message:
auto-import libmthca-1.0.3-1 on branch devel from libmthca-1.0.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Jun 2006 22:41:07 -0000	1.6
+++ .cvsignore	9 Nov 2006 19:58:20 -0000	1.7
@@ -1 +1 @@
-libmthca-1.0.2.tar.gz
+libmthca-1.0.3.tar.gz


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/libmthca.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmthca.spec	12 Sep 2006 18:24:21 -0000	1.6
+++ libmthca.spec	9 Nov 2006 19:58:20 -0000	1.7
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.2
+%define ver      1.0.3
 
 Name: libmthca
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.2.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Wed Jul 26 2006 Roland Dreier  - 1.0.3-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jun 2006 22:41:07 -0000	1.6
+++ sources	9 Nov 2006 19:58:20 -0000	1.7
@@ -1 +1 @@
-c56d86caac7c002fd8df97ee9f94d9c7  libmthca-1.0.2.tar.gz
+bbcb07450c56b7105c79e33670e3bc81  libmthca-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 20:04:28 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 13:04:28 -0700
Subject: rpms/subversion-api-docs/devel .cvsignore, 1.1, 1.2 doxygen.conf,
	1.1, 1.2 sources, 1.1, 1.2 subversion-api-docs.spec, 1.6, 1.7
Message-ID: <200611092004.kA9K4Sc8023513@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23468

Modified Files:
	.cvsignore doxygen.conf sources subversion-api-docs.spec 
Log Message:
Bump up to 1.4.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 08:48:10 -0000	1.1
+++ .cvsignore	9 Nov 2006 20:03:56 -0000	1.2
@@ -0,0 +1 @@
+doxygen.conf


Index: doxygen.conf
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/doxygen.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doxygen.conf	9 Apr 2006 08:49:09 -0000	1.1
+++ doxygen.conf	9 Nov 2006 20:03:56 -0000	1.2
@@ -373,7 +373,7 @@
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
 # in the documentation.
 
-SHOW_DIRECTORIES       = YES
+SHOW_DIRECTORIES       = NO
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that 
 # doxygen should invoke to get the current version for each file (typically from the 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 08:48:10 -0000	1.1
+++ sources	9 Nov 2006 20:03:56 -0000	1.2
@@ -0,0 +1 @@
+0405b7a76514b3f8cd495a151cf2fd5b  doxygen.conf


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- subversion-api-docs.spec	16 Sep 2006 02:35:20 -0000	1.6
+++ subversion-api-docs.spec	9 Nov 2006 20:03:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		subversion-api-docs
-Version:	1.3.2
-Release:	2.1%{?dist}
+Version:	1.4.2
+Release:	1%{?dist}
 Summary:	Subversion API documentation
 
 Group:		Development/Tools
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Wed Nov 01 2006 Bojan Smojver  1.4.2-1
+- bump up to 1.4.2
+
 * Sat Sep 16 2006 Bojan Smojver  1.3.2-2.1
 - mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov  9 20:16:23 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 13:16:23 -0700
Subject: rpms/subversion-api-docs/devel sources,1.2,1.3
Message-ID: <200611092016.kA9KGN7B023751@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23730

Modified Files:
	sources 
Log Message:
OOPS! Uploaded doxygen.conf as a tarball by mistake. Revert.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 20:03:56 -0000	1.2
+++ sources	9 Nov 2006 20:15:52 -0000	1.3
@@ -1 +0,0 @@
-0405b7a76514b3f8cd495a151cf2fd5b  doxygen.conf



From fedora-extras-commits at redhat.com  Thu Nov  9 20:29:15 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 13:29:15 -0700
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.7,1.8
Message-ID: <200611092029.kA9KTFeM023821@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23803

Modified Files:
	subversion-api-docs.spec 
Log Message:
Re-tag for rebuild.



Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subversion-api-docs.spec	9 Nov 2006 20:03:56 -0000	1.7
+++ subversion-api-docs.spec	9 Nov 2006 20:28:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		subversion-api-docs
 Version:	1.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Subversion API documentation
 
 Group:		Development/Tools
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Wed Nov 01 2006 Bojan Smojver  1.4.2-2
+- re-tag for rebuild
+
 * Wed Nov 01 2006 Bojan Smojver  1.4.2-1
 - bump up to 1.4.2
 



From fedora-extras-commits at redhat.com  Thu Nov  9 20:47:54 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 13:47:54 -0700
Subject: rpms/libmthca/FC-4 libmthca.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <200611092047.kA9Klsur024062@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24012/FC-4

Modified Files:
	libmthca.spec sources 
Log Message:
Import libmthca 1.0.3 release


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/libmthca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmthca.spec	13 Jun 2006 22:43:04 -0000	1.5
+++ libmthca.spec	9 Nov 2006 20:47:24 -0000	1.6
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.2
+%define ver      1.0.3
 
 Name: libmthca
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.2.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Wed Jul 26 2006 Roland Dreier  - 1.0.3-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jun 2006 22:43:04 -0000	1.6
+++ sources	9 Nov 2006 20:47:24 -0000	1.7
@@ -1 +1 @@
-c56d86caac7c002fd8df97ee9f94d9c7  libmthca-1.0.2.tar.gz
+bbcb07450c56b7105c79e33670e3bc81  libmthca-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 20:47:56 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 13:47:56 -0700
Subject: rpms/libmthca/FC-6 libmthca.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <200611092047.kA9KluXE024068@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24012/FC-6

Modified Files:
	libmthca.spec sources 
Log Message:
Import libmthca 1.0.3 release


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-6/libmthca.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmthca.spec	12 Sep 2006 18:24:21 -0000	1.6
+++ libmthca.spec	9 Nov 2006 20:47:26 -0000	1.7
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.2
+%define ver      1.0.3
 
 Name: libmthca
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.2.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Wed Jul 26 2006 Roland Dreier  - 1.0.3-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jun 2006 22:41:07 -0000	1.6
+++ sources	9 Nov 2006 20:47:26 -0000	1.7
@@ -1 +1 @@
-c56d86caac7c002fd8df97ee9f94d9c7  libmthca-1.0.2.tar.gz
+bbcb07450c56b7105c79e33670e3bc81  libmthca-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 20:47:55 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 13:47:55 -0700
Subject: rpms/libmthca/FC-5 libmthca.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <200611092048.kA9Kltrf024066@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24012/FC-5

Modified Files:
	libmthca.spec sources 
Log Message:
Import libmthca 1.0.3 release


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-5/libmthca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmthca.spec	13 Jun 2006 22:43:05 -0000	1.5
+++ libmthca.spec	9 Nov 2006 20:47:25 -0000	1.6
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.2
+%define ver      1.0.3
 
 Name: libmthca
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.2.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Wed Jul 26 2006 Roland Dreier  - 1.0.3-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jun 2006 22:43:05 -0000	1.6
+++ sources	9 Nov 2006 20:47:25 -0000	1.7
@@ -1 +1 @@
-c56d86caac7c002fd8df97ee9f94d9c7  libmthca-1.0.2.tar.gz
+bbcb07450c56b7105c79e33670e3bc81  libmthca-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 21:00:52 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 9 Nov 2006 14:00:52 -0700
Subject: rpms/seamonkey/devel .cvsignore, 1.6, 1.7 seamonkey.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200611092100.kA9L0qYB024302@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24265

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
* Thu Nov 09 2006 Kai Engert  1.0.6-1
- SeaMonkey 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Sep 2006 01:31:47 -0000	1.6
+++ .cvsignore	9 Nov 2006 21:00:22 -0000	1.7
@@ -1 +1 @@
-seamonkey-1.0.5.source.tar.bz2
+seamonkey-1.0.6.source.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- seamonkey.spec	15 Sep 2006 01:31:47 -0000	1.11
+++ seamonkey.spec	9 Nov 2006 21:00:22 -0000	1.12
@@ -10,7 +10,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
@@ -432,6 +432,8 @@
 
 
 %changelog
+* Thu Nov 09 2006 Kai Engert  1.0.6-1
+- SeaMonkey 1.0.6
 * Thu Sep 14 2006 Kai Engert  1.0.5-1
 - SeaMonkey 1.0.5
 * Wed Sep 06 2006 Kai Engert  1.0.4-8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Sep 2006 01:31:47 -0000	1.6
+++ sources	9 Nov 2006 21:00:22 -0000	1.7
@@ -1 +1 @@
-a1b98cd4d2d0f71d50406f8cd3885a5e  seamonkey-1.0.5.source.tar.bz2
+16e1c6bab1e3832b22863933b5b032e7  seamonkey-1.0.6.source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  9 21:03:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 14:03:18 -0700
Subject: rpms/PyKDE/devel PyKDE.spec,1.6,1.7
Message-ID: <200611092103.kA9L3I7Q027320@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27300

Modified Files:
	PyKDE.spec 
Log Message:
* Thu Nov 09 2006 Rex Dieter  3.16.0-4
- kmimetype patch
- devel: Requires: sip-devel



Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PyKDE.spec	8 Nov 2006 19:42:30 -0000	1.6
+++ PyKDE.spec	9 Nov 2006 21:02:47 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: PyKDE-3.16.0-konsolepart.patch
+Patch2: PyKDE-3.16.0-kmimetype.patch
 
 BuildRequires: python-devel >= 2.3
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -43,6 +44,7 @@
 Summary: %{name} SIP files
 Group: 	 Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: sip-devel
 #Obsoletes: %{name}-docs < %{version}-%{release}
 Provides:  %{name}-docs = %{version}-%{release}
 %description devel
@@ -53,6 +55,7 @@
 %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}}
 
 %patch1 -p1 -b .konsolepart
+%patch2 -p1 -b .kmimetype
 
 
 %build
@@ -60,7 +63,7 @@
 
 %{__python} configure.py -L %{_lib} -d %{python_sitedir}
 
-# smp broken
+# smp broken, do the best we can
 make -k %{?_smp_mflags} || make
 
 
@@ -85,12 +88,14 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/* examples
-# %_datadir/sip should be owned by sip-devel (#206633) 
-#dir %{_datadir}/sip
 %{_datadir}/sip/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  3.16.0-4
+- kmimetype patch
+- devel: Requires: sip-devel
+
 * Wed Nov 08 2006 Rex Dieter  3.16.0-3
 - (unversioned) Requires: PyQt
 - rebuild for PyQt-3.17 (fc7+)



From fedora-extras-commits at redhat.com  Thu Nov  9 21:07:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 14:07:01 -0700
Subject: rpms/PyKDE/devel PyKDE-3.16.0-kmimetype.patch, NONE, 1.1 PyKDE.spec,
	1.7, 1.8
Message-ID: <200611092107.kA9L71Va027401@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27372

Modified Files:
	PyKDE.spec 
Added Files:
	PyKDE-3.16.0-kmimetype.patch 
Log Message:
oops, actually add new patch, Release++


PyKDE-3.16.0-kmimetype.patch:

--- NEW FILE PyKDE-3.16.0-kmimetype.patch ---
--- PyKDE-3.16.0/sip/kio/kmimetype.sip	2006-09-22 18:41:53.000000000 +0530
+++ PyKDE-3.16.0/sip/kio/kmimetype.sip	2006-11-06 05:27:39.000000000 +0530
@@ -101,7 +101,7 @@
 %If ( KDE_3_2_0 -  )
     static KMimeType::Ptr defaultMimeTypePtr ();
     QString              parentMimeType () const;
-    bool                 is (const QString&) const;
+    bool                 is (const QString&) const /PyName=is_/; //'is' is a reserved keyword in python
     static KMimeType::Ptr diagnoseFileName (const QString&, QString&);
 %End
 


Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PyKDE.spec	9 Nov 2006 21:02:47 -0000	1.7
+++ PyKDE.spec	9 Nov 2006 21:06:31 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -92,7 +92,7 @@
 
 
 %changelog
-* Thu Nov 09 2006 Rex Dieter  3.16.0-4
+* Thu Nov 09 2006 Rex Dieter  3.16.0-5
 - kmimetype patch
 - devel: Requires: sip-devel
 



From fedora-extras-commits at redhat.com  Thu Nov  9 21:52:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 14:52:48 -0700
Subject: rpms/PyKDE/FC-6 PyKDE-3.16.0-kmimetype.patch, NONE, 1.1 PyKDE.spec, 
	1.5, 1.6
Message-ID: <200611092152.kA9LqmkU027828@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27809

Modified Files:
	PyKDE.spec 
Added Files:
	PyKDE-3.16.0-kmimetype.patch 
Log Message:
* Thu Nov 09 2006 Rex Dieter  3.16.0-5
- kmimetype patch
- devel: Requires: sip-devel

* Wed Nov 08 2006 Rex Dieter  3.16.0-3
- (unversioned) Requires: PyQt


PyKDE-3.16.0-kmimetype.patch:

--- NEW FILE PyKDE-3.16.0-kmimetype.patch ---
--- PyKDE-3.16.0/sip/kio/kmimetype.sip	2006-09-22 18:41:53.000000000 +0530
+++ PyKDE-3.16.0/sip/kio/kmimetype.sip	2006-11-06 05:27:39.000000000 +0530
@@ -101,7 +101,7 @@
 %If ( KDE_3_2_0 -  )
     static KMimeType::Ptr defaultMimeTypePtr ();
     QString              parentMimeType () const;
-    bool                 is (const QString&) const;
+    bool                 is (const QString&) const /PyName=is_/; //'is' is a reserved keyword in python
     static KMimeType::Ptr diagnoseFileName (const QString&, QString&);
 %End
 


Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/FC-6/PyKDE.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PyKDE.spec	4 Oct 2006 19:37:49 -0000	1.5
+++ PyKDE.spec	9 Nov 2006 21:52:18 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 2%{?dist}
+Release: 5%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -11,6 +11,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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
 
 BuildRequires: python-devel >= 2.3
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -21,11 +23,12 @@
 
 BuildRequires: sip-devel >= 4.4.3 
 BuildRequires: PyQt-devel >= 3.16 
-%global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
-%if "%{?pyqt_ver}" > "2"
-Requires: PyQt = %{pyqt_ver}
-%endif
-
+## try to leave this unversioned, for now -- Rex
+Requires: PyQt
+#global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
+#if "%{?pyqt_ver}" > "2"
+#Requires: PyQt = %{pyqt_ver}
+#endif
 
 BuildRequires: kdelibs-devel kdebase
 %global kdelibs_ver %(kde-config --version 2>/dev/null | grep KDE | cut -d' ' -f2 | cut -d- -f1)
@@ -42,6 +45,7 @@
 Summary: %{name} SIP files
 Group: 	 Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: sip-devel
 #Obsoletes: %{name}-docs < %{version}-%{release}
 Provides:  %{name}-docs = %{version}-%{release}
 %description devel
@@ -52,6 +56,7 @@
 %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}}
 
 %patch1 -p1 -b .konsolepart
+%patch2 -p1 -b .kmimetype
 
 
 %build
@@ -59,7 +64,7 @@
 
 %{__python} configure.py -L %{_lib} -d %{python_sitedir}
 
-# smp broken
+# smp broken, do the best we can
 make -k %{?_smp_mflags} || make
 
 
@@ -84,12 +89,18 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/* examples
-# %_datadir/sip should be owned by sip-devel (#206633) 
-#dir %{_datadir}/sip
 %{_datadir}/sip/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  3.16.0-5
+- kmimetype patch
+- devel: Requires: sip-devel
+
+* Wed Nov 08 2006 Rex Dieter  3.16.0-3
+- (unversioned) Requires: PyQt
+- rebuild for PyQt-3.17 (fc7+)
+
 * Wed Oct 04 2006 Rex Dieter  3.16.0-2 
 - respin
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:10:52 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 9 Nov 2006 15:10:52 -0700
Subject: rpms/sparse/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sparse.spec,
	1.1, 1.2
Message-ID: <200611092210.kA9MAqXd030996@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30971

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
upgrade to 0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Nov 2006 09:24:09 -0000	1.2
+++ .cvsignore	9 Nov 2006 22:10:22 -0000	1.3
@@ -1 +1 @@
-sparse-20061026.tar.bz2
+sparse-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Nov 2006 09:24:09 -0000	1.2
+++ sources	9 Nov 2006 22:10:22 -0000	1.3
@@ -1 +1 @@
-724e23dc62375879f75708f35f245e58  sparse-20061026.tar.bz2
+367d1cb0a26db26e2da47a491bc95374  sparse-0.1.tar.gz


Index: sparse.spec
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-6/sparse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sparse.spec	5 Nov 2006 09:24:09 -0000	1.1
+++ sparse.spec	9 Nov 2006 22:10:22 -0000	1.2
@@ -1,17 +1,11 @@
-%define snapshot_date 20061026
-%define prerelease 1
-%define alphatag %{snapshot_date}git
 Name: sparse          
-Version: 0        
-Release: 0.%{prerelease}.%{alphatag}%{?dist}
-Summary: A semantic parser of source files
-
+Version: 0.1        
+Release: 1%{?dist}
+Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    Open Software License
-URL:        http://www.kernel.org/pub/scm/devel/sparse/sparse.git/    
-# git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git/
-# snapshots also available at http://www.codemonkey.org.uk/projects/git-snapshots/sparse/
-Source0:    sparse-%{snapshot_date}.tar.bz2
+URL:        http://kernel.org/pub/linux/kernel/people/josh/sparse/
+Source0:    http://kernel.org/pub/linux/kernel/people/josh/sparse/dist/sparse-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,7 +25,7 @@
 Sparse is primarily used in the development and debugging of the Linux kernel.
 
 %prep
-%setup -q -n sparse
+%setup -q
 
 
 %build
@@ -43,8 +37,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 make install PREFIX=%{buildroot}%{_prefix}
-# no reason to ship libsparse.so until something exists that links against it
-rm %{buildroot}%{_bindir}/libsparse.so
 
 %clean
 rm -rf %{buildroot}
@@ -54,7 +46,12 @@
 %defattr(-,root,root,-)
 %doc LICENSE README FAQ
 %{_bindir}/sparse
+%{_bindir}/cgcc
 
 %changelog
+* Thu Nov 09 2006 Matt Domsch  0.1-1
+- Upgrade to 0.1, no need for snapshots, yea!  New upstream maintainer.
+- cgcc now installed
+
 * Thu Oct 26 2006 Matt Domsch  0-0.1.20061026git
 - Initial packaging for Fedora Extras



From fedora-extras-commits at redhat.com  Thu Nov  9 22:12:18 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 9 Nov 2006 15:12:18 -0700
Subject: rpms/sparse/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sparse.spec,
	1.1, 1.2
Message-ID: <200611092212.kA9MCIjt031079@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31049

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
upgrade to 0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Nov 2006 09:24:09 -0000	1.2
+++ .cvsignore	9 Nov 2006 22:11:48 -0000	1.3
@@ -1 +1 @@
-sparse-20061026.tar.bz2
+sparse-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Nov 2006 09:24:09 -0000	1.2
+++ sources	9 Nov 2006 22:11:48 -0000	1.3
@@ -1 +1 @@
-724e23dc62375879f75708f35f245e58  sparse-20061026.tar.bz2
+367d1cb0a26db26e2da47a491bc95374  sparse-0.1.tar.gz


Index: sparse.spec
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-5/sparse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sparse.spec	5 Nov 2006 09:24:09 -0000	1.1
+++ sparse.spec	9 Nov 2006 22:11:48 -0000	1.2
@@ -1,17 +1,11 @@
-%define snapshot_date 20061026
-%define prerelease 1
-%define alphatag %{snapshot_date}git
 Name: sparse          
-Version: 0        
-Release: 0.%{prerelease}.%{alphatag}%{?dist}
-Summary: A semantic parser of source files
-
+Version: 0.1        
+Release: 1%{?dist}
+Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    Open Software License
-URL:        http://www.kernel.org/pub/scm/devel/sparse/sparse.git/    
-# git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git/
-# snapshots also available at http://www.codemonkey.org.uk/projects/git-snapshots/sparse/
-Source0:    sparse-%{snapshot_date}.tar.bz2
+URL:        http://kernel.org/pub/linux/kernel/people/josh/sparse/
+Source0:    http://kernel.org/pub/linux/kernel/people/josh/sparse/dist/sparse-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,7 +25,7 @@
 Sparse is primarily used in the development and debugging of the Linux kernel.
 
 %prep
-%setup -q -n sparse
+%setup -q
 
 
 %build
@@ -43,8 +37,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 make install PREFIX=%{buildroot}%{_prefix}
-# no reason to ship libsparse.so until something exists that links against it
-rm %{buildroot}%{_bindir}/libsparse.so
 
 %clean
 rm -rf %{buildroot}
@@ -54,7 +46,12 @@
 %defattr(-,root,root,-)
 %doc LICENSE README FAQ
 %{_bindir}/sparse
+%{_bindir}/cgcc
 
 %changelog
+* Thu Nov 09 2006 Matt Domsch  0.1-1
+- Upgrade to 0.1, no need for snapshots, yea!  New upstream maintainer.
+- cgcc now installed
+
 * Thu Oct 26 2006 Matt Domsch  0-0.1.20061026git
 - Initial packaging for Fedora Extras



From fedora-extras-commits at redhat.com  Thu Nov  9 22:51:36 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 9 Nov 2006 15:51:36 -0700
Subject: rpms/galeon/devel galeon.spec,1.25,1.26
Message-ID: <200611092251.kA9Mpa2U031490@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31474

Modified Files:
	galeon.spec 
Log Message:
- Rebuild for firefox 2
- Added explicit gecko version requirement
- Fixed noreplace rpmlint warning



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- galeon.spec	19 Oct 2006 14:06:10 -0000	1.25
+++ galeon.spec	9 Nov 2006 22:51:06 -0000	1.26
@@ -1,7 +1,9 @@
+%define gecko_ver 1.8.1
+
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -12,10 +14,13 @@
 BuildRequires:	gettext desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	gnome-desktop-devel
-BuildRequires:	gecko-devel
+BuildRequires:	gecko-devel = %{gecko_ver}
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
+
+Requires: gecko-libs = %{gecko_ver}
+
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires(pre):    GConf2
@@ -93,8 +98,8 @@
 %files -f galeon-2.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.README ChangeLog NEWS README INSTALL THANKS TODO FAQ FAQ.html README.ExtraPrefs
-%config %{_sysconfdir}/gconf/schemas/galeon.schemas
-%config %{_sysconfdir}/sound/events/galeon.soundlist
+%config(noreplace) %{_sysconfdir}/gconf/schemas/galeon.schemas
+%config(noreplace) %{_sysconfdir}/sound/events/galeon.soundlist
 %{_bindir}/galeon
 %{_mandir}/man1/galeon.1*
 %{_datadir}/galeon
@@ -110,6 +115,11 @@
 
 
 %changelog
+* Thu Nov  9 2006 Denis Leroy  - 2.0.3-4
+- Rebuild for firefox 2
+- Added explicit gecko version requirement
+- Fixed noreplace rpmlint warning
+
 * Thu Oct 19 2006 Denis Leroy  - 2.0.3-3
 - Added patch to fix flash plugin crash
 - Make package depend on gecko-devel



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:29 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:29 -0700
Subject: rpms/cacti/FC-3 cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.5,
	1.6
Message-ID: <200611092256.kA9MuTRa031654@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/FC-3

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-3/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:55:59 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:36 -0700
Subject: rpms/cacti/FC-6 cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.7,
	1.8
Message-ID: <200611092256.kA9MuaoV031671@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/FC-6

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:56:06 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:30 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:30 -0700
Subject: rpms/cacti/FC-4 cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.5,
	1.6
Message-ID: <200611092256.kA9MuUTx031658@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/FC-4

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-4/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:55:59 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:36 -0700
Subject: rpms/cacti/FC-5 cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.6,
	1.7
Message-ID: <200611092256.kA9MuafZ031667@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/FC-5

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-5/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:56:05 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:37 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:37 -0700
Subject: rpms/cacti/devel cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.7,
	1.8
Message-ID: <200611092256.kA9Mubwp031675@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/devel

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:56:07 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:08:13 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:08:13 -0700
Subject: rpms/commoncpp2/FC-5 commoncpp2.spec,1.1,1.2
Message-ID: <200611100008.kAA08Dcq005918@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5797/FC-5

Modified Files:
	commoncpp2.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: commoncpp2.spec
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-5/commoncpp2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commoncpp2.spec	6 Feb 2006 21:47:33 -0000	1.1
+++ commoncpp2.spec	10 Nov 2006 00:07:42 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: GNU Common C++ class framework
 Name: commoncpp2
-Version: 1.3.23
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -70,8 +70,8 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html
-%dir %{_includedir}/cc++2
-%{_includedir}/cc++2/*
+%dir %{_includedir}/cc++
+%{_includedir}/cc++/*
 %{_bindir}/ccgnu2-config
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libccext2.pc
@@ -80,8 +80,17 @@
 %{_infodir}/commoncpp2.info*
 
 %changelog
-* Sun Feb 05 2006 Andreas Thienemann  1.3.23-1
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0
+
+* Sun May 28 2006 Andreas Thienemann  - 1.4.2-1
+- Updated to 1.4.2
+
+* Sun May 28 2006 Andreas Thienemann  - 1.4.1-1
+- Updated to 1.4.1
+
+* Sun Feb 05 2006 Andreas Thienemann  - 1.3.23-1
 - Incorporated suggestions for extras
 
-* Fri Feb 03 2006 Andreas Thienemann  1.3.22-1
+* Fri Feb 03 2006 Andreas Thienemann  - 1.3.22-1
 - Initial spec.



From fedora-extras-commits at redhat.com  Fri Nov 10 00:08:15 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:08:15 -0700
Subject: rpms/commoncpp2/FC-6 commoncpp2.spec,1.3,1.4
Message-ID: <200611100008.kAA08FWR005932@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5797/FC-6

Modified Files:
	commoncpp2.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: commoncpp2.spec
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-6/commoncpp2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- commoncpp2.spec	8 Sep 2006 16:19:44 -0000	1.3
+++ commoncpp2.spec	10 Nov 2006 00:07:45 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: GNU Common C++ class framework
 Name: commoncpp2
-Version: 1.4.2
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -80,6 +80,9 @@
 %{_infodir}/commoncpp2.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0
+
 * Sun May 28 2006 Andreas Thienemann  - 1.4.2-1
 - Updated to 1.4.2
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:08:18 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:08:18 -0700
Subject: rpms/commoncpp2/devel commoncpp2.spec,1.3,1.4
Message-ID: <200611100008.kAA08I5B005935@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5797/devel

Modified Files:
	commoncpp2.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: commoncpp2.spec
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/devel/commoncpp2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- commoncpp2.spec	8 Sep 2006 16:19:44 -0000	1.3
+++ commoncpp2.spec	10 Nov 2006 00:07:47 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: GNU Common C++ class framework
 Name: commoncpp2
-Version: 1.4.2
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -80,6 +80,9 @@
 %{_infodir}/commoncpp2.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0
+
 * Sun May 28 2006 Andreas Thienemann  - 1.4.2-1
 - Updated to 1.4.2
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:14:55 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:14:55 -0700
Subject: rpms/ccrtp/devel ccrtp.spec,1.4,1.5
Message-ID: <200611100014.kAA0EtgK006213@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6163/devel

Modified Files:
	ccrtp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: ccrtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/ccrtp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ccrtp.spec	10 Sep 2006 21:20:05 -0000	1.4
+++ ccrtp.spec	10 Nov 2006 00:14:25 -0000	1.5
@@ -1,13 +1,13 @@
 Summary: Common C++ class framework for RTP/RTCP
 Name: ccrtp
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: http://download.sourceforge.net/gnutelephony/ccrtp-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: commoncpp2-devel, doxygen
+BuildRequires: commoncpp2-devel, doxygen, libgcrypt-devel
 
 %description
 ccRTP is a generic, extensible and efficient C++ framework for
@@ -77,6 +77,9 @@
 %{_infodir}/ccrtp.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0, fixing #209026
+
 * Sun Sep 10 2006 Andreas Thienemann  - 1.4.1-2
 - *bump*
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:14:53 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:14:53 -0700
Subject: rpms/ccrtp/FC-5 ccrtp.spec,1.1,1.2
Message-ID: <200611100014.kAA0Erko006209@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6163/FC-5

Modified Files:
	ccrtp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: ccrtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-5/ccrtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ccrtp.spec	28 Apr 2006 22:02:16 -0000	1.1
+++ ccrtp.spec	10 Nov 2006 00:14:23 -0000	1.2
@@ -1,13 +1,13 @@
 Summary: Common C++ class framework for RTP/RTCP
 Name: ccrtp
-Version: 1.3.7
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: http://download.sourceforge.net/gnutelephony/ccrtp-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: commoncpp2-devel
+BuildRequires: commoncpp2-devel, doxygen, libgcrypt-devel
 
 %description
 ccRTP is a generic, extensible and efficient C++ framework for
@@ -77,8 +77,20 @@
 %{_infodir}/ccrtp.info*
 
 %changelog
-* Mon Apr 24 2006 Andreas Thienemann  1.3.7-1
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0, fixing #209026
+
+* Sun Sep 10 2006 Andreas Thienemann  - 1.4.1-2
+- *bump*
+
+* Fri Sep 08 2006 Andreas Thienemann  - 1.4.1-1
+- Updated to 1.4.1
+
+* Sun Jul 23 2006 Andreas Thienemann  - 1.3.7-2
+- Added doxygen BuildRequire
+
+* Mon Apr 24 2006 Andreas Thienemann  - 1.3.7-1
 - Updated to 1.3.7
 
-* Fri Feb 03 2006 Andreas Thienemann  1.3.6-1
+* Fri Feb 03 2006 Andreas Thienemann  - 1.3.6-1
 - Initial spec.



From fedora-extras-commits at redhat.com  Fri Nov 10 00:14:54 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:14:54 -0700
Subject: rpms/ccrtp/FC-6 ccrtp.spec,1.4,1.5
Message-ID: <200611100014.kAA0Es6K006210@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6163/FC-6

Modified Files:
	ccrtp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: ccrtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-6/ccrtp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ccrtp.spec	10 Sep 2006 21:20:05 -0000	1.4
+++ ccrtp.spec	10 Nov 2006 00:14:24 -0000	1.5
@@ -1,13 +1,13 @@
 Summary: Common C++ class framework for RTP/RTCP
 Name: ccrtp
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: http://download.sourceforge.net/gnutelephony/ccrtp-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: commoncpp2-devel, doxygen
+BuildRequires: commoncpp2-devel, doxygen, libgcrypt-devel
 
 %description
 ccRTP is a generic, extensible and efficient C++ framework for
@@ -77,6 +77,9 @@
 %{_infodir}/ccrtp.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0, fixing #209026
+
 * Sun Sep 10 2006 Andreas Thienemann  - 1.4.1-2
 - *bump*
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:21:07 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:21:07 -0700
Subject: rpms/commoncpp2/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611100021.kAA0L7ur006427@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6376/FC-5

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Feb 2006 21:47:33 -0000	1.2
+++ .cvsignore	10 Nov 2006 00:20:37 -0000	1.3
@@ -1 +1 @@
-commoncpp2-1.3.23.tar.gz
+commoncpp2-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Feb 2006 21:47:33 -0000	1.2
+++ sources	10 Nov 2006 00:20:37 -0000	1.3
@@ -1 +1 @@
-7cf53157929876054cff3234f6ffaae7  commoncpp2-1.3.23.tar.gz
+c454fa913f2f1ce53a3ccea27ec4a068  commoncpp2-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:21:09 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:21:09 -0700
Subject: rpms/commoncpp2/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200611100021.kAA0L9Wx006435@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6376/devel

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2006 16:19:44 -0000	1.4
+++ .cvsignore	10 Nov 2006 00:20:39 -0000	1.5
@@ -1 +1 @@
-commoncpp2-1.4.2.tar.gz
+commoncpp2-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2006 16:19:44 -0000	1.4
+++ sources	10 Nov 2006 00:20:39 -0000	1.5
@@ -1 +1 @@
-4153ec41bc11c52f05f2f2e35cf66953  commoncpp2-1.4.2.tar.gz
+c454fa913f2f1ce53a3ccea27ec4a068  commoncpp2-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:21:08 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:21:08 -0700
Subject: rpms/commoncpp2/FC-6 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200611100021.kAA0L8UB006431@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6376/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2006 16:19:44 -0000	1.4
+++ .cvsignore	10 Nov 2006 00:20:38 -0000	1.5
@@ -1 +1 @@
-commoncpp2-1.4.2.tar.gz
+commoncpp2-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2006 16:19:44 -0000	1.4
+++ sources	10 Nov 2006 00:20:38 -0000	1.5
@@ -1 +1 @@
-4153ec41bc11c52f05f2f2e35cf66953  commoncpp2-1.4.2.tar.gz
+c454fa913f2f1ce53a3ccea27ec4a068  commoncpp2-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:33:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:33:14 -0700
Subject: rpms/ccrtp/FC-6 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200611100033.kAA0XEOr006816@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6766/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Sep 2006 16:10:13 -0000	1.3
+++ .cvsignore	10 Nov 2006 00:32:42 -0000	1.4
@@ -1 +1 @@
-ccrtp-1.4.1.tar.gz
+ccrtp-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 16:10:13 -0000	1.3
+++ sources	10 Nov 2006 00:32:42 -0000	1.4
@@ -1 +1 @@
-632aacddec2998f393d1773a078d881a  ccrtp-1.4.1.tar.gz
+019754d20b46b1b23f3bc368aa58d662  ccrtp-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:33:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:33:14 -0700
Subject: rpms/ccrtp/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611100033.kAA0XErK006815@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6766/FC-5

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2006 22:02:16 -0000	1.2
+++ .cvsignore	10 Nov 2006 00:32:42 -0000	1.3
@@ -1 +1 @@
-ccrtp-1.3.7.tar.gz
+ccrtp-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2006 22:02:16 -0000	1.2
+++ sources	10 Nov 2006 00:32:42 -0000	1.3
@@ -1 +1 @@
-6621be1852bd90c3dbbafa895618d8f0  ccrtp-1.3.7.tar.gz
+019754d20b46b1b23f3bc368aa58d662  ccrtp-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:33:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:33:14 -0700
Subject: rpms/ccrtp/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200611100033.kAA0XEkh006818@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6766/devel

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Sep 2006 16:10:13 -0000	1.3
+++ .cvsignore	10 Nov 2006 00:32:43 -0000	1.4
@@ -1 +1 @@
-ccrtp-1.4.1.tar.gz
+ccrtp-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 16:10:13 -0000	1.3
+++ sources	10 Nov 2006 00:32:43 -0000	1.4
@@ -1 +1 @@
-632aacddec2998f393d1773a078d881a  ccrtp-1.4.1.tar.gz
+019754d20b46b1b23f3bc368aa58d662  ccrtp-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:54:43 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 9 Nov 2006 17:54:43 -0700
Subject: rpms/bugzilla/FC-4 bugzilla-bz212355-fixvuln.patch, NONE,
	1.1 bugzilla.spec, 1.2, 1.3
Message-ID: <200611100054.kAA0shJB007091@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/bugzilla/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7067

Modified Files:
	bugzilla.spec 
Added Files:
	bugzilla-bz212355-fixvuln.patch 
Log Message:
Fix vuln's in bz 212355


bugzilla-bz212355-fixvuln.patch:

--- NEW FILE bugzilla-bz212355-fixvuln.patch ---
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/attachment.cgi bugzilla-2.22.1/attachment.cgi
--- bugzilla-2.22/attachment.cgi	2006-04-09 11:28:49.000000000 -0700
+++ bugzilla-2.22.1/attachment.cgi	2006-10-14 14:07:19.000000000 -0700
@@ -130,6 +130,7 @@
 sub validateID
 {
     my $param = @_ ? $_[0] : 'id';
+    my $user = Bugzilla->user;
 
     # If we're not doing interdiffs, check if id wasn't specified and
     # prompt them with a page that allows them to choose an attachment.
@@ -151,18 +152,18 @@
      || ThrowUserError("invalid_attach_id", { attach_id => $cgi->param($param) });
   
     # Make sure the attachment exists in the database.
-    SendSQL("SELECT bug_id, isprivate FROM attachments WHERE attach_id = $attach_id");
+    SendSQL("SELECT bug_id, isprivate, submitter_id
+             FROM attachments WHERE attach_id = $attach_id");
     MoreSQLData()
       || ThrowUserError("invalid_attach_id", { attach_id => $attach_id });
 
     # Make sure the user is authorized to access this attachment's bug.
-    (my $bugid, my $isprivate) = FetchSQLData();
+    my ($bugid, $isprivate, $submitter_id) = FetchSQLData();
 
     ValidateBugID($bugid);
-    if ($isprivate && Param("insidergroup")) {
-        UserInGroup(Param("insidergroup"))
-          || ThrowUserError("auth_failure", {action => "access",
-                                             object => "attachment"});
+    if ($isprivate && $user->id != $submitter_id && !$user->is_insider) {
+        ThrowUserError("auth_failure", {action => "access",
+                                        object => "attachment"});
     }
 
     return ($attach_id,$bugid);
@@ -199,17 +200,23 @@
 sub validateCanEdit
 {
     my ($attach_id) = (@_);
+    my $user = Bugzilla->user;
 
-    # People in editbugs can edit all attachments
-    return if UserInGroup("editbugs");
+    my $attachment = Bugzilla::Attachment->get($attach_id);
 
     # Bug 97729 - the submitter can edit their attachments
-    SendSQL("SELECT attach_id FROM attachments WHERE " .
-            "attach_id = $attach_id AND submitter_id = " . Bugzilla->user->id);
+    return if ($attachment->attacher->id == $user->id);
 
-    FetchSQLData()
-      || ThrowUserError("illegal_attachment_edit",
-                        { attach_id => $attach_id });
+    # Only people in the insider group can view private attachments.
+    if ($attachment->isprivate && !$user->is_insider) {
+        ThrowUserError('illegal_attachment_edit', {attach_id => $attachment->id});
+    }
+
+    # People in editbugs can edit all attachments
+    return if UserInGroup("editbugs");
+
+    # If we come here, then this attachment cannot be seen by the user.
+    ThrowUserError('illegal_attachment_edit', { attach_id => $attachment->id });
 }
 
 sub validateCanChangeAttachment 
@@ -393,7 +400,8 @@
   my @obsolete_ids = ();
 
   # Make sure the attachment id is valid and the user has permissions to view
-  # the bug to which it is attached.
+  # the bug to which it is attached. Make sure also that the user can view
+  # the attachment itself.
   foreach my $attachid ($cgi->param('obsolete')) {
     my $vars = {};
     $vars->{'attach_id'} = $attachid;
@@ -410,6 +418,9 @@
 
     my ($bugid, $isobsolete, $description) = FetchSQLData();
 
+    # Check that the user can modify this attachment
+    validateCanEdit($attachid);
+
     $vars->{'description'} = $description;
     
     if ($bugid != $cgi->param('bugid'))
@@ -424,8 +435,6 @@
       ThrowCodeError("attachment_already_obsolete", $vars);
     }
 
-    # Check that the user can modify this attachment
-    validateCanEdit($attachid);
     push(@obsolete_ids, $attachid);
   }
 
@@ -759,28 +768,35 @@
   }
   else
   {
-    $vars->{other_patches} = [];
+    my @other_patches = ();
     if ($::interdiffbin && $::diffpath) {
-      # Get list of attachments on this bug.
+      # Get the list of attachments that the user can view in this bug.
+      my @attachments = @{Bugzilla::Attachment->get_attachments_by_bug($bugid)};
+      # Extract patches only.
+      @attachments = grep {$_->ispatch == 1} @attachments;
+      # We want them sorted from newer to older.
+      @attachments = sort { $b->id <=> $a->id } @attachments;
+
       # Ignore the current patch, but select the one right before it
       # chronologically.
-      SendSQL("SELECT attach_id, description FROM attachments WHERE bug_id = $bugid AND ispatch = 1 ORDER BY creation_ts DESC");
       my $select_next_patch = 0;
-      while (my ($other_id, $other_desc) = FetchSQLData()) {
-        if ($other_id eq $attach_id) {
-          $select_next_patch = 1;
-        } else {
-          push @{$vars->{other_patches}}, { id => $other_id, desc => $other_desc, selected => $select_next_patch };
-          if ($select_next_patch) {
-            $select_next_patch = 0;
+      foreach my $attach (@attachments) {
+          if ($attach->id == $attach_id) {
+              $select_next_patch = 1;
+          }
+          else {
+              push(@other_patches, { 'id'       => $attach->id,
+                                     'desc'     => $attach->description,
+                                     'selected' => $select_next_patch });
+              $select_next_patch = 0;
           }
-        }
       }
     }
 
     $vars->{bugid} = $bugid;
     $vars->{attachid} = $attach_id;
     $vars->{description} = $description;
+    $vars->{other_patches} = \@other_patches;
     setup_template_patch_reader($last_reader, $format, $context);
     # Actually print out the patch
     $reader->iterate_string("Attachment $attach_id", $thedata);
@@ -795,37 +811,10 @@
     my $bugid = $cgi->param('bugid');
     ValidateBugID($bugid);
 
-    # Retrieve the attachments from the database and write them into an array
-    # of hashes where each hash represents one attachment.
-    my $privacy = "";
-    my $dbh = Bugzilla->dbh;
-
-    if (Param("insidergroup") && !(UserInGroup(Param("insidergroup")))) {
-        $privacy = "AND isprivate < 1 ";
+    my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bugid);
+    foreach my $a (@$attachments) {
+        $a->{'isviewable'} = isViewable($a->contenttype);
     }
-    SendSQL("SELECT attach_id, " .
-            $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ",
-            mimetype, description, ispatch, isobsolete, isprivate, 
-            LENGTH(thedata)
-            FROM attachments 
-            INNER JOIN attach_data
-            ON attach_id = id
-            WHERE bug_id = $bugid $privacy 
-            ORDER BY attach_id");
-  my @attachments; # the attachments array
-  while (MoreSQLData())
-  {
-    my %a; # the attachment hash
-    ($a{'attachid'}, $a{'date'}, $a{'contenttype'},
-     $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'},
-     $a{'datasize'}) = FetchSQLData();
-    $a{'isviewable'} = isViewable($a{'contenttype'});
-    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'},
-                                          'is_active' => 1 });
-
-    # Add the hash representing the attachment to the array of attachments.
-    push @attachments, \%a;
-  }
 
   # Retrieve the bug summary (for displaying on screen) and assignee.
   SendSQL("SELECT short_desc, assigned_to FROM bugs " .
@@ -834,7 +823,7 @@
 
   # Define the variables and functions that will be passed to the UI template.
   $vars->{'bugid'} = $bugid;
-  $vars->{'attachments'} = \@attachments;
+  $vars->{'attachments'} = $attachments;
   $vars->{'bugassignee_id'} = $assignee_id;
   $vars->{'bugsummary'} = $bugsummary;
   $vars->{'GetBugLink'} = \&GetBugLink;
@@ -922,8 +911,9 @@
     validateIsPatch();
     validateDescription();
   
-    if (($attachurl =~ /^(http|https|ftp):\/\/\S+/) 
-         && !(defined $cgi->upload('data'))) {
[...12227 lines suppressed...]
  %]
@@ -52,7 +52,7 @@
       
         [% keyword.name FILTER html %]
     
-    
      
+    
+    
+    
 


Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/mod_fcgid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_fcgid.spec	6 Sep 2006 13:47:08 -0000	1.2
+++ mod_fcgid.spec	9 Nov 2006 10:18:38 -0000	1.3
@@ -10,13 +10,13 @@
 %endif
 
 Name:           mod_fcgid
-Version:        1.10
-Release:        7%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Apache2 module for high-performance server-side scripting 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://fastcgi.coremail.cn/
-Source0:        http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz
+Source0:        http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
 Source1:        fcgid.conf
 Source2:        fastcgi.te
 Source3:        fastcgi.fc
@@ -144,6 +144,11 @@
 %endif
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth  2.0-1
+- Update to 2.0
+- Source is now hosted at sourceforge.net
+- Update docs
+
 * Wed Sep  6 2006 Paul Howarth  1.10-7
 - Include the right README* files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 13:08:59 -0000	1.2
+++ sources	9 Nov 2006 10:18:38 -0000	1.3
@@ -1 +1 @@
-6c36b18548ca64864ed3dd4cb759062f  mod_fcgid.1.10.tar.gz
+3aa51f1e293e6d881028295a23021dae  mod_fcgid.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 10:20:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 03:20:26 -0700
Subject: rpms/imlib2/FC-3 imlib2-1.3.0-loader_overflows.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 imlib2.spec, 1.10, 1.11 sources, 1.4,
	1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE
Message-ID: <200611091020.kA9AKQZX013136@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082

Modified Files:
	.cvsignore imlib2.spec sources 
Added Files:
	imlib2-1.3.0-loader_overflows.patch 
Removed Files:
	imlib2-1.2.0-configure-xlib64.patch 
Log Message:
* Thu Nov  9 2006 Hans de Goede  1.2.1-2
- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
  Ubuntu for the patch (bug 214676)


imlib2-1.3.0-loader_overflows.patch:

--- NEW FILE imlib2-1.3.0-loader_overflows.patch ---
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c
--- imlib2-1.2.1/src/modules/loaders/loader_argb.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c	2006-11-06 01:30:41.000000000 -0800
@@ -23,7 +23,7 @@
 load(ImlibImage * im, ImlibProgressFunction progress,
      char progress_granularity, char immediate_load)
 {
-   int                 w, h, alpha;
+   int                 w=0, h=0, alpha=0;
    FILE               *f;
 
    if (im->data)
@@ -36,13 +36,15 @@
    {
       char                buf[256], buf2[256];
 
+      memset(buf, 0, sizeof(buf));
+      memset(buf2, 0, sizeof(buf));
       if (!fgets(buf, 255, f))
         {
            fclose(f);
            return 0;
         }
       sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha);
-      if (strcmp(buf2, "ARGB"))
+      if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383)
         {
            fclose(f);
            return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c
--- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c	2006-11-06 01:33:01.000000000 -0800
@@ -104,8 +104,9 @@
         im->w = w = cinfo.output_width;
         im->h = h = cinfo.output_height;
 
-        if (cinfo.rec_outbuf_height > 16)
+        if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383)
           {
+	     im->w = im->h = 0;
              jpeg_destroy_decompress(&cinfo);
              fclose(f);
              return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c
--- imlib2-1.2.1/src/modules/loaders/loader_lbm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c	2006-11-06 01:30:41.000000000 -0800
@@ -421,7 +421,7 @@
 
         im->w = L2RWORD(ilbm.bmhd.data);
         im->h = L2RWORD(ilbm.bmhd.data + 2);
-        if (im->w <= 0 || im->h <= 0) ok = 0;
+        if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0;
 
         ilbm.depth = ilbm.bmhd.data[8];
         if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
@@ -453,6 +453,7 @@
         }
     }
     if (!full || !ok) {
+        im->w = im->h = 0;
         freeilbm(&ilbm);
         return ok;
     }
@@ -467,12 +468,13 @@
     cancel = 0;
     plane[0] = NULL;
 
+    n = ilbm.depth;
+    if (ilbm.mask == 1) n++;
+
     im->data = malloc(im->w * im->h * sizeof(DATA32));
-    if (im->data) {
-        n = ilbm.depth;
-        if (ilbm.mask == 1) n++;
+    plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
+    if (im->data && plane[0]) {
 
-        plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
         for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
 
         z = ((im->w + 15) / 16) * 2 * n;
@@ -511,6 +513,7 @@
    * the memory for im->data.
    *----------*/
     if (!ok) {
+        im->w = im->h = 0;
         if (im->data) free(im->data);
         im->data = NULL;
     }
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c
--- imlib2-1.2.1/src/modules/loaders/loader_png.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c	2006-11-06 01:30:41.000000000 -0800
@@ -83,6 +83,13 @@
         png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
                      (png_uint_32 *) (&h32), &bit_depth, &color_type,
                      &interlace_type, NULL, NULL);
+        if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383)
+           {
+              png_read_end(png_ptr, info_ptr);
+              png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+              fclose(f);
+              return 0;
+           }
         im->w = (int)w32;
         im->h = (int)h32;
         if (color_type == PNG_COLOR_TYPE_PALETTE)
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c
--- imlib2-1.2.1/src/modules/loaders/loader_pnm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c	2006-11-06 01:30:41.000000000 -0800
@@ -80,7 +80,7 @@
              int                 i = 0;
 
              /* read numbers */
-             while (c != EOF && !isspace(c))
+             while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
                {
                   buf[i++] = c;
                   c = fgetc(f);
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c
--- imlib2-1.2.1/src/modules/loaders/loader_tga.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c	2006-11-06 01:30:41.000000000 -0800
@@ -319,6 +319,7 @@
      {
         unsigned long       datasize;
         unsigned char      *bufptr;
+        unsigned char      *bufend;
         DATA32             *dataptr;
 
         int                 y, pl = 0;
@@ -348,6 +349,9 @@
         /* bufptr is the next byte to be read from the buffer */
         bufptr = filedata;
 
+        /* bufend is one past the last byte to be read from the buffer */
+        bufend = filedata + datasize;
+
         /* dataptr is the next 32-bit pixel to be filled in */
         dataptr = im->data;
 
@@ -365,7 +369,9 @@
                   else
                      dataptr = im->data + (y * im->w);
 
-                  for (x = 0; x < im->w; x++)   /* for each pixel in the row */
+                  for (x = 0;
+                       x < im->w && bufptr+bpp/8 < bufend;
+                       x++)   /* for each pixel in the row */
                     {
                        switch (bpp)
                          {
@@ -422,8 +428,8 @@
              unsigned char       curbyte, red, green, blue, alpha;
              DATA32             *final_pixel = dataptr + im->w * im->h;
 
-             /* loop until we've got all the pixels */
-             while (dataptr < final_pixel)
+             /* loop until we've got all the pixels or run out of input */
+             while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend)
                {
                   int                 count;
 
@@ -441,7 +447,7 @@
                               green = *bufptr++;
                               red = *bufptr++;
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue, alpha);
                                    dataptr++;
@@ -452,7 +458,7 @@
                               blue = *bufptr++;
                               green = *bufptr++;
                               red = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue,
                                               (char)0xff);
@@ -462,7 +468,7 @@
 
                            case 8:
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, alpha, alpha, alpha,
                                               (char)0xff);
@@ -477,7 +483,7 @@
                     {
                        int                 i;
 
-                       for (i = 0; i < count; i++)
+                       for (i = 0; i < count && dataptr < final_pixel; i++)
                          {
                             switch (bpp)
                               {
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c
--- imlib2-1.2.1/src/modules/loaders/loader_tiff.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c	2006-11-06 01:30:41.000000000 -0800
@@ -75,7 +75,7 @@
 raster(TIFFRGBAImage_Extra * img, uint32 * rast,
        uint32 x, uint32 y, uint32 w, uint32 h)
 {
-   uint32              image_width, image_height;
+   int                image_width, image_height;
    uint32             *pixel, pixel_value;
    int                 i, j, dy, rast_offset;
    DATA32             *buffer_pixel, *buffer = img->image->data;
@@ -192,8 +192,16 @@
      }
    
    rgba_image.image = im;
-   im->w = width = rgba_image.rgba.width;
-   im->h = height = rgba_image.rgba.height;
+   width = rgba_image.rgba.width;
+   height = rgba_image.rgba.height;
+   if (width < 1 || height < 1 || width >= 16384 || height >= 16384)
+     {
+        TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
+        TIFFClose(tif);
+        return 0;
+     }
+   im->w = width;
+   im->h = height;
    rgba_image.num_pixels = num_pixels = width * height;
    if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED)
       SET_FLAG(im->flags, F_HAS_ALPHA);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:35:58 -0000	1.3
+++ .cvsignore	9 Nov 2006 10:19:56 -0000	1.4
@@ -1 +1 @@
-imlib2-1.1.2.tar.gz
+imlib2-1.2.1.tar.gz


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-3/imlib2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- imlib2.spec	5 Apr 2005 19:07:53 -0000	1.10
+++ imlib2.spec	9 Nov 2006 10:19:56 -0000	1.11
@@ -1,12 +1,12 @@
-Summary:	Graphic library for file loading, saving, rendering, and manipulation
+Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
-Version:	1.2.0
-Release:	7.fc3
+Version:	1.2.1
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
-URL:		http://www.enlightenment.org/pages/imlib2.html
+URL:		http://www.enlightenment.org/Libraries/Imlib2/
 Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0:		imlib2-1.2.0-configure-xlib64.patch
+Patch0:		imlib2-1.3.0-loader_overflows.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:	libungif-devel freetype-devel libtool bzip2-devel %{__perl}
@@ -19,43 +19,46 @@
 
 
 %description
-Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is
-a completely new library. Imlib 2 can be installed alongside Imlib 1.x
-without any problems since they are effectively different libraries
-which have very similar functionality. Please see the homepage for the
-long description of the differences.
+Imlib 2 is a library that does image file loading and saving as well
+as rendering, manipulation, arbitrary polygon support, etc.  It does
+ALL of these operations FAST. Imlib2 also tries to be highly
+intelligent about doing them, so writing naive programs can be done
+easily, without sacrificing speed.  This is a complete rewrite over
+the Imlib 1.x series. The architecture is more modular, simple, and
+flexible.
 
 %description devel
 This package contains development files for %{name}.
 
-Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is
-a completely new library. Imlib 2 can be installed alongside Imlib 1.x
-without any problems since they are effectively different libraries
-which have very similar functionality. Please see the homepage for the
-long description of the differences.
+Imlib 2 is a library that does image file loading and saving as well
+as rendering, manipulation, arbitrary polygon support, etc.  It does
+ALL of these operations FAST. Imlib2 also tries to be highly
+intelligent about doing them, so writing naive programs can be done
+easily, without sacrificing speed.  This is a complete rewrite over
+the Imlib 1.x series. The architecture is more modular, simple, and
+flexible.
 
 
 %prep
 %setup -q
-%ifarch x86_64
-%patch0 -b .patch0
-%endif
-# loaders need to link with the main lib
-%{__perl} -pi -e \
-  's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ;
-   s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.*
+%patch0 -p1 -b .overflow
 
 
 %build
-%configure \
-  --x-libraries=%{_prefix}/X11R6/%{_lib} \
-  --with-pic \
+asmopts="--disable-mmx --disable-amd64"
 %ifarch %{ix86} ia64
-  --enable-mmx
-%else
-  --disable-mmx
+asmopts="--enable-mmx --disable-amd64"
 %endif
 %ifarch x86_64
+asmopts="--disable-mmx --enable-amd64"
+%endif
+
+%configure --disable-dependency-tracking \
+  --x-libraries=%{_prefix}/X11R6/%{_lib} \
+  --with-pic \
+  $asmopts
+
+%ifarch x86_64
 # fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
 # returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz":
 %{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \
@@ -66,20 +69,14 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT __doc
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
 
-cp -a doc __doc
-rm -f __doc/Makefile*
-
-# remove unexpanded variable in pkgconfig file
-sed -i -e 's!@requirements@!!g' ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/imlib2.pc
-
 rm -f \
   $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \
-  $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test}
+  $RPM_BUILD_ROOT%{_bindir}/imlib2_test
 
-# ship .la files due to a bug in kdelibs (see changelog):
+# ship .la files due to a bug in kdelibs (bugzilla.fedora.us #2284):
 #  $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
 
 
@@ -93,7 +90,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS README ChangeLog TODO __doc/*
+%doc COPYING AUTHORS README ChangeLog TODO
 %{_bindir}/imlib2_view
 %{_bindir}/imlib2_bumpmap
 %{_bindir}/imlib2_colorspace
@@ -113,6 +110,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/*.gif doc/*.html
 %{_bindir}/imlib2-config
 %{_includedir}/Imlib2.h
 %{_libdir}/libImlib2.a
@@ -122,7 +120,20 @@
 
 
 %changelog
-* Tue Apr  5 2005 Michael Schwendt  - 1.2.0-7.fc3
+* Thu Nov  9 2006 Hans de Goede  1.2.1-2
+- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
+  Ubuntu for the patch (bug 214676)
+
+* Sun Aug 28 2005 Ville Skytt??  - 1.2.1-1
+- 1.2.1, patches applied/obsoleted upstream.
+- Improve summary and description, fix URL.
+- Move HTML docs to -devel.
+- Build with dependency tracking disabled.
+
+* Mon May  9 2005 Michael Schwendt  - 1.2.0-8.fc4
+- Fix segfault in XPM loader (#156058).
+
+* Tue Apr  5 2005 Michael Schwendt  - 1.2.0-7.fc4
 - Fix broken pkgconfig file.
 
 * Fri Apr  1 2005 Michael Schwendt  - 1.2.0-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jan 2005 09:43:09 -0000	1.4
+++ sources	9 Nov 2006 10:19:56 -0000	1.5
@@ -1 +1 @@
-853fb77100ee3c3ca944f52c892ab49b  imlib2-1.2.0.tar.gz
+e32970d03d8aee2885782312d0a7f15f  imlib2-1.2.1.tar.gz


--- imlib2-1.2.0-configure-xlib64.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  9 10:21:38 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 9 Nov 2006 03:21:38 -0700
Subject: rpms/mod_fcgid/FC-5 .cvsignore, 1.2, 1.3 configuration.htm, 1.1,
	1.2 doc.htm, 1.1, 1.2 mod_fcgid.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611091021.kA9ALc5u013210@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-serv13186

Modified Files:
	.cvsignore configuration.htm doc.htm mod_fcgid.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 13:08:59 -0000	1.2
+++ .cvsignore	9 Nov 2006 10:21:07 -0000	1.3
@@ -1 +1 @@
-mod_fcgid.1.10.tar.gz
+mod_fcgid.2.0.tar.gz


Index: configuration.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/configuration.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configuration.htm	6 Sep 2006 13:08:59 -0000	1.1
+++ configuration.htm	9 Nov 2006 10:21:07 -0000	1.2
@@ -9,62 +9,62 @@
 
 
 
-
      This is a for regular fastcgi. 
      LoadModule fcgid_module           
+
      This is a for regular fastcgi. 
      LoadModule fcgid_module              
 modules/mod_fcgid.so
      
-<Location /fcgid>
               
-    SetHandler fcgid-script
               
-    Options ExecCGI
               
-    allow from all
               
+<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            
+
      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 /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 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         
+
      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
               
+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
          
+
      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 *: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 /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>
      
 
         
    
@@ -79,23 +79,89 @@
 
 
      
 

      
-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
           
+<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
          
 </Directory>
      
 
 
      
+
      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 
+(default On)
      
+
      Setting the FastCgiAuthenticatorAuthoritative directive 
+explicitly to Off allows authentication to be passed on to lower level 
+modules
      
+
+
      
+
      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 
+(default On)
      
+
+
      Setting the FastCgiAuthorizerAuthoritative directive explicitly 
+to Off allows authorization to be passed on to lower level modules
      
+
+
      
+
      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 
+(default On)
      
+
      Setting the FastCgiAccessCheckerAuthoritative directive 
+explicitly to Off allows access checking to be passed on to lower level 
+modules
      
+
      ??
      
+
      ??
      
+
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
 
      ??
      
 
      ??
      
 
      ??
      


Index: doc.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/doc.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doc.htm	6 Sep 2006 13:08:59 -0000	1.1
+++ doc.htm	9 Nov 2006 10:21:07 -0000	1.2
@@ -51,7 +51,10 @@
 (non-PHP, non-Ruby, non-Python) 
      Configuration
 for suEXEC fastcgi
      Configuration for PHP
 (UNIX)
      Configuration for suPHP (UNIX)
      Configuration
-for PHP (Windows)
       
+for PHP (Windows)
      Configuration
+for Authenticator
      Configuration
+for Authorizer
      Configuration
+for AccessChecker
       
 
      
 
        
   
      • There are
@@ -90,9 +93,16 @@
 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
+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.
+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: mod_fcgid.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/mod_fcgid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_fcgid.spec	6 Sep 2006 13:47:08 -0000	1.2
+++ mod_fcgid.spec	9 Nov 2006 10:21:07 -0000	1.3
@@ -10,13 +10,13 @@
 %endif
 
 Name:           mod_fcgid
-Version:        1.10
-Release:        7%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Apache2 module for high-performance server-side scripting 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://fastcgi.coremail.cn/
-Source0:        http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz
+Source0:        http://dl.sf.net/mod-fcgid/mod_fcgid.%{version}.tar.gz
 Source1:        fcgid.conf
 Source2:        fastcgi.te
 Source3:        fastcgi.fc
@@ -144,6 +144,11 @@
 %endif
 
 %changelog
+* Mon Oct 30 2006 Paul Howarth  2.0-1
+- Update to 2.0
+- Source is now hosted at sourceforge.net
+- Update docs
+
 * Wed Sep  6 2006 Paul Howarth  1.10-7
 - Include the right README* files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 13:08:59 -0000	1.2
+++ sources	9 Nov 2006 10:21:07 -0000	1.3
@@ -1 +1 @@
-6c36b18548ca64864ed3dd4cb759062f  mod_fcgid.1.10.tar.gz
+3aa51f1e293e6d881028295a23021dae  mod_fcgid.2.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 10:33:50 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  9 Nov 2006 03:33:50 -0700
Subject: extras-buildsys/utils/pushscript README,1.7,1.8
Message-ID: <200611091033.kA9AXokT013332@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13314

Modified Files:
	README 
Log Message:
add note about "comps" working-copy


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- README	1 Nov 2006 11:40:24 -0000	1.7
+++ README	9 Nov 2006 10:33:47 -0000	1.8
@@ -40,3 +40,18 @@
 
   pushscript/List.py Extras
 
+[...]
+
+comps.xml updates:
+
+  Works with a manually exported "comps" module from Fedora Extras CVS
+  (/srv/rpmbuild/extras-push-rundir/comps) which is updated automatically
+  except for a few security relevant Makefiles and scripts which names
+  are defined in Config_Extras.py. If these files need an important update,
+  they must be verified and updated manually.
+
+  The working-copy is created like this:
+
+  $ cd /srv/rpmbuild/extras-push-rundir
+  $ LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras co comps
+



From fedora-extras-commits at redhat.com  Thu Nov  9 10:52:36 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 9 Nov 2006 03:52:36 -0700
Subject: rpms/mail-notification/FC-6
	mail-notification-fedora-plugin-hint.patch, 1.1,
	1.2 mail-notification.spec, 1.30, 1.31
Message-ID: <200611091052.kA9Aqaee013390@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-serv13368

Modified Files:
	mail-notification-fedora-plugin-hint.patch 
	mail-notification.spec 
Log Message:
3.0-10 -- Update patch (fix typo, clarify wording)

mail-notification-fedora-plugin-hint.patch:

Index: mail-notification-fedora-plugin-hint.patch
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-6/mail-notification-fedora-plugin-hint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mail-notification-fedora-plugin-hint.patch	8 Nov 2006 16:37:41 -0000	1.1
+++ mail-notification-fedora-plugin-hint.patch	9 Nov 2006 10:52:05 -0000	1.2
@@ -6,7 +6,7 @@
      selfp->listener = bonobo_object_release_unref(selfp->listener, NULL);
  
 -    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded."));
-+    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded and installed. Fedora ships the plugin in a sperate package called mail-notification-evolution-plugin you might need to install manually."));
++    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is installed and loaded. Fedora ships the plugin in a separate package called mail-notification-evolution-plugin you might need to install manually."));
  
      gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
      gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-6/mail-notification.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mail-notification.spec	8 Nov 2006 16:37:41 -0000	1.30
+++ mail-notification.spec	9 Nov 2006 10:52:05 -0000	1.31
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        3.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -129,6 +129,9 @@
 
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Thu Nov  9 10:53:51 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 9 Nov 2006 03:53:51 -0700
Subject: rpms/mail-notification/devel
	mail-notification-fedora-plugin-hint.patch, 1.1,
	1.2 mail-notification.spec, 1.31, 1.32
Message-ID: <200611091053.kA9ArpoM013461@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13440

Modified Files:
	mail-notification-fedora-plugin-hint.patch 
	mail-notification.spec 
Log Message:
3.0-10 -- Update patch (fix typo, clarify wording)

mail-notification-fedora-plugin-hint.patch:

Index: mail-notification-fedora-plugin-hint.patch
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-fedora-plugin-hint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mail-notification-fedora-plugin-hint.patch	4 Nov 2006 13:04:46 -0000	1.1
+++ mail-notification-fedora-plugin-hint.patch	9 Nov 2006 10:53:20 -0000	1.2
@@ -6,7 +6,7 @@
      selfp->listener = bonobo_object_release_unref(selfp->listener, NULL);
  
 -    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded."));
-+    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded and installed. Fedora ships the plugin in a sperate package called mail-notification-evolution-plugin you might need to install manually."));
++    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is installed and loaded. Fedora ships the plugin in a separate package called mail-notification-evolution-plugin you might need to install manually."));
  
      gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
      gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mail-notification.spec	4 Nov 2006 13:04:46 -0000	1.31
+++ mail-notification.spec	9 Nov 2006 10:53:20 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:           mail-notification
 Version:        3.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -133,6 +133,9 @@
 
 
 %changelog
+* 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



From fedora-extras-commits at redhat.com  Thu Nov  9 11:34:19 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu,  9 Nov 2006 04:34:19 -0700
Subject: fedora-security/audit fc5,1.385,1.386 fc6,1.137,1.138
Message-ID: <200611091134.kA9BYJXi021728@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21665

Modified Files:
	fc5 fc6 
Log Message:
Updates for new CVEs



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- fc5	8 Nov 2006 13:28:25 -0000	1.385
+++ fc5	9 Nov 2006 11:34:15 -0000	1.386
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20061107
-Up to date FC5 as of 20061107
+Up to date CVE as of CVE email 20061108
+Up to date FC5 as of 20061108
 
 ** are items that need attention
 
+CVE-2006-5823 ** kernel
+CVE-2006-5794 ** openssh
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
@@ -21,6 +23,7 @@
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
 CVE-2006-5464 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5463 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5462 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
@@ -53,6 +56,7 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
+CVE-2006-4810 ** texinfo
 CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- fc6	8 Nov 2006 13:28:25 -0000	1.137
+++ fc6	9 Nov 2006 11:34:15 -0000	1.138
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20061107
-Up to date FC6 as of 20061107
+Up to date CVE as of CVE email 20061108
+Up to date FC6 as of 20061108
 
 ** are items that need attention
 
+CVE-2006-5823 ** kernel
+CVE-2006-5794 ** openssh
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
@@ -27,6 +29,8 @@
 CVE-2006-5464 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5463 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5463 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
+CVE-2006-5462 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
+CVE-2006-5462 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -57,6 +61,7 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055]
+CVE-2006-4810 ** texinfo
 CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability



From fedora-extras-commits at redhat.com  Thu Nov  9 11:41:37 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Thu, 9 Nov 2006 04:41:37 -0700
Subject: rpms/multican - New directory
Message-ID: <200611091141.kA9BfbSZ021881@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/multican
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21877/multican

Log Message:
Directory /cvs/extras/rpms/multican added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 11:41:43 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Thu, 9 Nov 2006 04:41:43 -0700
Subject: rpms/multican/devel - New directory
Message-ID: <200611091141.kA9Bfhc3021895@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/multican/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21877/multican/devel

Log Message:
Directory /cvs/extras/rpms/multican/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 11:42:05 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Thu, 9 Nov 2006 04:42:05 -0700
Subject: rpms/multican Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611091142.kA9Bg5R7021942@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/multican
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21936

Added Files:
	Makefile import.log 
Log Message:
Setup of module multican


--- NEW FILE Makefile ---
# Top level Makefile for module multican
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 Nov  9 11:42:11 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Thu, 9 Nov 2006 04:42:11 -0700
Subject: rpms/multican/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611091142.kA9BgBqD021962@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/multican/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21936/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module multican


--- 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 Nov  9 11:43:20 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Thu, 9 Nov 2006 04:43:20 -0700
Subject: rpms/multican import.log,1.1,1.2
Message-ID: <200611091143.kA9BhKN1022052@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/multican
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22007

Modified Files:
	import.log 
Log Message:
auto-import multican-0.0.4-1 on branch devel from multican-0.0.4-1.src.rpm
initial import


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/multican/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Nov 2006 11:42:05 -0000	1.1
+++ import.log	9 Nov 2006 11:42:50 -0000	1.2
@@ -0,0 +1 @@
+multican-0_0_4-1:HEAD:multican-0.0.4-1.src.rpm:1163072562



From fedora-extras-commits at redhat.com  Thu Nov  9 11:43:21 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Thu, 9 Nov 2006 04:43:21 -0700
Subject: rpms/multican/devel multican.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611091143.kA9BhLN4022056@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/multican/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22007/devel

Modified Files:
	.cvsignore sources 
Added Files:
	multican.spec 
Log Message:
auto-import multican-0.0.4-1 on branch devel from multican-0.0.4-1.src.rpm
initial import


--- NEW FILE multican.spec ---
Summary:	Remote control utility for Canon cameras
Name:		multican
Version:	0.0.4
Release:	1%{?dist}
Source0:	http://prdownloads.sourceforge.net/multican/%{name}-%{version}.tar.gz
URL:		http://multican.sourceforge.net/
License:	GPL
Group:		Applications/Multimedia
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libusb-devel >= 0.1.12
Requires:	libusb >= 0.1.12

%description
Multican is Canon EOS class USB remote control utility for 400D, 300D,
350D, 30D, 20D and 5D. It is possible to control more of Canon cameras
in the same time up to six cameras attached. Multican allows scripted
remote control of multiple cameras.

%prep
%setup -q

%build
make CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
make BINDIR="$RPM_BUILD_ROOT%{_bindir}" install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc COPYING TODO README ChangeLog
%{_bindir}/*

%changelog
* Tue Nov 07 2006 Jindrich Novy  0.0.4-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multican/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Nov 2006 11:42:11 -0000	1.1
+++ .cvsignore	9 Nov 2006 11:42:51 -0000	1.2
@@ -0,0 +1 @@
+multican-0.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multican/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Nov 2006 11:42:11 -0000	1.1
+++ sources	9 Nov 2006 11:42:51 -0000	1.2
@@ -0,0 +1 @@
+a620f5a908f7ea7ea40724674f05ef0e  multican-0.0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 12:26:06 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  9 Nov 2006 05:26:06 -0700
Subject: extras-buildsys/utils/pushscript Utils.py,1.6,1.7
Message-ID: <200611091226.kA9CQ6SK025302@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25284

Modified Files:
	Utils.py 
Log Message:
 


Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Utils.py	28 Oct 2006 00:54:49 -0000	1.6
+++ Utils.py	9 Nov 2006 12:26:03 -0000	1.7
@@ -199,6 +199,7 @@
     if os.path.getmtime(repodir) > ref_mtime:
         return True
     ignored_dirs = (
+        os.path.join(repodir, 'repodata', 'repoview'),
         os.path.join(repodir, 'repodata'),
         os.path.join(repodir, 'debug'),
         )



From fedora-extras-commits at redhat.com  Thu Nov  9 12:31:23 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  9 Nov 2006 05:31:23 -0700
Subject: extras-buildsys/utils/pushscript Utils.py,1.7,1.8
Message-ID: <200611091231.kA9CVNaO025362@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25344

Modified Files:
	Utils.py 
Log Message:
 


Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Utils.py	9 Nov 2006 12:26:03 -0000	1.7
+++ Utils.py	9 Nov 2006 12:31:20 -0000	1.8
@@ -199,7 +199,6 @@
     if os.path.getmtime(repodir) > ref_mtime:
         return True
     ignored_dirs = (
-        os.path.join(repodir, 'repodata', 'repoview'),
         os.path.join(repodir, 'repodata'),
         os.path.join(repodir, 'debug'),
         )



From fedora-extras-commits at redhat.com  Thu Nov  9 13:42:49 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 9 Nov 2006 06:42:49 -0700
Subject: rpms/pungi - New directory
Message-ID: <200611091342.kA9DgngX028617@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/pungi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28613/pungi

Log Message:
Directory /cvs/extras/rpms/pungi added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 13:42:55 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 9 Nov 2006 06:42:55 -0700
Subject: rpms/pungi/devel - New directory
Message-ID: <200611091342.kA9Dgt1w028631@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28613/pungi/devel

Log Message:
Directory /cvs/extras/rpms/pungi/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 13:43:06 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 9 Nov 2006 06:43:06 -0700
Subject: rpms/pungi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611091343.kA9Dh6oT028662@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/pungi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28656

Added Files:
	Makefile import.log 
Log Message:
Setup of module pungi


--- NEW FILE Makefile ---
# Top level Makefile for module pungi
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 Nov  9 13:43:12 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 9 Nov 2006 06:43:12 -0700
Subject: rpms/pungi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611091343.kA9DhCQX028680@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28656/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pungi


--- 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 Nov  9 13:44:00 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 9 Nov 2006 06:44:00 -0700
Subject: rpms/pungi import.log,1.1,1.2
Message-ID: <200611091344.kA9Di0gW028754@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/pungi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28720

Modified Files:
	import.log 
Log Message:
auto-import pungi-0.1.0-1 on branch devel from pungi-0.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pungi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Nov 2006 13:43:06 -0000	1.1
+++ import.log	9 Nov 2006 13:43:30 -0000	1.2
@@ -0,0 +1 @@
+pungi-0_1_0-1:HEAD:pungi-0.1.0-1.src.rpm:1163079833



From fedora-extras-commits at redhat.com  Thu Nov  9 13:44:01 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 9 Nov 2006 06:44:01 -0700
Subject: rpms/pungi/devel pungi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611091344.kA9Di1QA028758@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/pungi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28720/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pungi.spec 
Log Message:
auto-import pungi-0.1.0-1 on branch devel from pungi-0.1.0-1.src.rpm


--- NEW FILE pungi.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           pungi
Version:        0.1.0
Release:        1%{?dist}
Summary:        Distribution compose tool

Group:          Development/Tools
License:        GPL
URL:            http://linux.duke.edu/projects/%{name}
Source0:        http://linux.duke.edu/projects/%{name}/release/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       anaconda-runtime

BuildArch:      noarch

%description
A tool to create anaconda based installation trees/isos of a set of rpms.


%prep
%setup -q


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Authors Changelog COPYING GPL PLAN.gather PLAN.pungi README ToDo
%config(noreplace) %{_sysconfdir}/pungi
# For noarch packages: sitelib
%{python_sitelib}/pypungi
%{_bindir}/pungi


%changelog
* Wed Nov  8 2006 Jesse Keating  - 0.1.0-1
- Initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pungi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Nov 2006 13:43:12 -0000	1.1
+++ .cvsignore	9 Nov 2006 13:43:30 -0000	1.2
@@ -0,0 +1 @@
+pungi-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pungi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Nov 2006 13:43:12 -0000	1.1
+++ sources	9 Nov 2006 13:43:31 -0000	1.2
@@ -0,0 +1 @@
+6fab9b1b9979aa59b9db5880abfe6136  pungi-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 13:48:31 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu,  9 Nov 2006 06:48:31 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.14,1.15
Message-ID: <200611091348.kA9DmVnB028861@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28843

Modified Files:
	Push.py 
Log Message:
run less stuff with -s


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Push.py	9 Nov 2006 00:57:08 -0000	1.14
+++ Push.py	9 Nov 2006 13:48:29 -0000	1.15
@@ -593,6 +593,8 @@
     if '-s' in sys.argv[2:]:
         sys.argv.remove('-s')
         cfg.post_cmds = []
+        cfg.opts.repoprune = False
+        cfg.opts.repoview = False
     
     diststopush = []
     for d in sys.argv[2:]:



From fedora-extras-commits at redhat.com  Thu Nov  9 14:13:49 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 9 Nov 2006 07:13:49 -0700
Subject: rpms/audacious/devel audacious.spec, 1.15,
	1.16 audacious-1.1.2-mainwin-update.patch, 1.2, NONE
Message-ID: <200611091413.kA9EDnt6031948@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31932

Modified Files:
	audacious.spec 
Removed Files:
	audacious-1.1.2-mainwin-update.patch 
Log Message:

- Drop the main window update patch



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- audacious.spec	7 Nov 2006 15:00:48 -0000	1.15
+++ audacious.spec	9 Nov 2006 14:13:19 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -20,7 +20,6 @@
 Patch6:         audacious-1.1.1-shaded-skin.patch
 Patch7:         audacious-1.1.1-controlsocket-name.patch
 Patch8:         audacious-1.1.1-playlist-twenty.patch
-Patch9:         audacious-1.1.2-mainwin-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
@@ -118,9 +117,6 @@
 # Fix "%20" in playlist entries
 %patch8 -p1 -b playlist-twenty
 
-# Decease main window update frequency when the player is idle
-%patch9 -p1 -b mainwin-update
-
 %build
 %configure \
 	--disable-rpath \
@@ -213,6 +209,9 @@
 
 
 %changelog
+* Thu Nov 9 2006 Ralf Ertzinger  1.1.2-8.fc7
+- Drop the main window update patch
+
 * Tue Nov 7 2006 Ralf Ertzinger  1.1.2-7.fc7
 - Disable gnome-vfs, it causes too much trouble
 - Add --enable-chardet


--- audacious-1.1.2-mainwin-update.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  9 14:17:55 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 07:17:55 -0700
Subject: rpms/translate-toolkit/devel .cvsignore, 1.5, 1.6 sources, 1.6,
	1.7 translate-toolkit.spec, 1.10, 1.11
Message-ID: <200611091417.kA9EHtIv032023@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31999

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Nov 2006 19:46:49 -0000	1.5
+++ .cvsignore	9 Nov 2006 14:17:25 -0000	1.6
@@ -1 +1 @@
-translate-toolkit-0.8.tar.gz
+translate-toolkit-0.10.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Nov 2006 19:46:49 -0000	1.6
+++ sources	9 Nov 2006 14:17:25 -0000	1.7
@@ -1 +1 @@
-81204110ab605435862b8999558e9649  translate-toolkit-0.8.tar.gz
+b9042e727f1dcd8b9427a7fb8127ba7e  translate-toolkit-0.10.1.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/devel/translate-toolkit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- translate-toolkit.spec	8 Nov 2006 19:52:41 -0000	1.10
+++ translate-toolkit.spec	9 Nov 2006 14:17:25 -0000	1.11
@@ -1,18 +1,18 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 Summary:        A collection of tools to assist software localization
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://translate.sourceforge.net/
-Source0:        http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires:  python-devel
 Requires:       python-elementtree
 Requires:       python-enchant
 
@@ -24,11 +24,11 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 
 %install
@@ -45,23 +45,25 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog translate/COPYING translate/README
+%doc translate/ChangeLog translate/COPYING translate/README
 %dir %{python_sitelib}/translate
 %dir %{python_sitelib}/translate/tools
 %dir %{python_sitelib}/translate/filters
 %dir %{python_sitelib}/translate/storage
 %dir %{python_sitelib}/translate/misc
 %dir %{python_sitelib}/translate/convert
-%{python_sitelib}/translate/*.py
-%{python_sitelib}/translate/*.pyc
-%ghost %{python_sitelib}/translate/*.pyo
-%{python_sitelib}/translate/*/*.py
-%{python_sitelib}/translate/*/*.pyc
-%ghost %{python_sitelib}/translate/*/*.pyo
+%{python_sitelib}/translate/*.py*
+%{python_sitelib}/translate/*/*.py*
 %{_bindir}/*
+%exclude %{_bindir}/*.pyc
+%exclude %{_bindir}/*.pyo
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 0.10.1-1
+- Update to upstream 0.10.1
+- Cleanup based on latest Python packaging guidelines
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 0.8-2
 - Rebuild to get into Rawhide
 



From fedora-extras-commits at redhat.com  Thu Nov  9 14:19:28 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 07:19:28 -0700
Subject: rpms/translate-toolkit/FC-6 .cvsignore, 1.5, 1.6 sources, 1.6,
	1.7 translate-toolkit.spec, 1.10, 1.11
Message-ID: <200611091419.kA9EJSVW032087@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32067

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Nov 2006 19:46:49 -0000	1.5
+++ .cvsignore	9 Nov 2006 14:18:58 -0000	1.6
@@ -1 +1 @@
-translate-toolkit-0.8.tar.gz
+translate-toolkit-0.10.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Nov 2006 19:46:49 -0000	1.6
+++ sources	9 Nov 2006 14:18:58 -0000	1.7
@@ -1 +1 @@
-81204110ab605435862b8999558e9649  translate-toolkit-0.8.tar.gz
+b9042e727f1dcd8b9427a7fb8127ba7e  translate-toolkit-0.10.1.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/FC-6/translate-toolkit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- translate-toolkit.spec	8 Nov 2006 19:52:41 -0000	1.10
+++ translate-toolkit.spec	9 Nov 2006 14:18:58 -0000	1.11
@@ -1,18 +1,18 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 Summary:        A collection of tools to assist software localization
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://translate.sourceforge.net/
-Source0:        http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires:  python-devel
 Requires:       python-elementtree
 Requires:       python-enchant
 
@@ -24,11 +24,11 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 
 %install
@@ -45,23 +45,25 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog translate/COPYING translate/README
+%doc translate/ChangeLog translate/COPYING translate/README
 %dir %{python_sitelib}/translate
 %dir %{python_sitelib}/translate/tools
 %dir %{python_sitelib}/translate/filters
 %dir %{python_sitelib}/translate/storage
 %dir %{python_sitelib}/translate/misc
 %dir %{python_sitelib}/translate/convert
-%{python_sitelib}/translate/*.py
-%{python_sitelib}/translate/*.pyc
-%ghost %{python_sitelib}/translate/*.pyo
-%{python_sitelib}/translate/*/*.py
-%{python_sitelib}/translate/*/*.pyc
-%ghost %{python_sitelib}/translate/*/*.pyo
+%{python_sitelib}/translate/*.py*
+%{python_sitelib}/translate/*/*.py*
 %{_bindir}/*
+%exclude %{_bindir}/*.pyc
+%exclude %{_bindir}/*.pyo
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 0.10.1-1
+- Update to upstream 0.10.1
+- Cleanup based on latest Python packaging guidelines
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 0.8-2
 - Rebuild to get into Rawhide
 



From fedora-extras-commits at redhat.com  Thu Nov  9 14:20:11 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 07:20:11 -0700
Subject: rpms/translate-toolkit/FC-5 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 translate-toolkit.spec, 1.7, 1.8
Message-ID: <200611091420.kA9EKB2h032155@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32093

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Feb 2006 13:06:04 -0000	1.3
+++ .cvsignore	9 Nov 2006 14:19:41 -0000	1.4
@@ -1 +1 @@
-translate-toolkit-0.8.tar.gz
+translate-toolkit-0.10.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2006 13:06:04 -0000	1.4
+++ sources	9 Nov 2006 14:19:41 -0000	1.5
@@ -1 +1 @@
-81204110ab605435862b8999558e9649  translate-toolkit-0.8.tar.gz
+b9042e727f1dcd8b9427a7fb8127ba7e  translate-toolkit-0.10.1.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/FC-5/translate-toolkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- translate-toolkit.spec	20 Feb 2006 13:06:04 -0000	1.7
+++ translate-toolkit.spec	9 Nov 2006 14:19:41 -0000	1.8
@@ -1,18 +1,18 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        0.8
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        A collection of tools to assist software localization
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://translate.sourceforge.net/
-Source0:        http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+BuildRequires:  python-devel
 Requires:       python-elementtree
 Requires:       python-enchant
 
@@ -24,11 +24,11 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 
 %install
@@ -45,23 +45,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog translate/COPYING translate/README
+%doc translate/ChangeLog translate/COPYING translate/README
 %dir %{python_sitelib}/translate
 %dir %{python_sitelib}/translate/tools
 %dir %{python_sitelib}/translate/filters
 %dir %{python_sitelib}/translate/storage
 %dir %{python_sitelib}/translate/misc
 %dir %{python_sitelib}/translate/convert
-%{python_sitelib}/translate/*.py
-%{python_sitelib}/translate/*.pyc
-%ghost %{python_sitelib}/translate/*.pyo
-%{python_sitelib}/translate/*/*.py
-%{python_sitelib}/translate/*/*.pyc
-%ghost %{python_sitelib}/translate/*/*.pyo
+%{python_sitelib}/translate/*.py*
+%{python_sitelib}/translate/*/*.py*
 %{_bindir}/*
+%exclude %{_bindir}/*.pyc
+%exclude %{_bindir}/*.pyo
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 0.10.1-1
+- Update to upstream 0.10.1
+- Cleanup based on latest Python packaging guidelines
+
+* Wed Nov 08 2006 Roozbeh Pournader  - 0.8-2
+- Rebuild to get into Rawhide
+
 * Mon Feb 20 2006 Roozbeh Pournader  - 0.8-1
 - Update to final 0.8
 



From fedora-extras-commits at redhat.com  Thu Nov  9 14:38:55 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 07:38:55 -0700
Subject: rpms/fonttools/devel .cvsignore, 1.3, 1.4 fonttools.spec, 1.8,
	1.9 sources, 1.4, 1.5 fonttools-20050315-20050624.patch, 1.3, NONE
Message-ID: <200611091438.kA9Ect2U032311@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fonttools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32291

Modified Files:
	fonttools.spec sources 
Added Files:
	.cvsignore 
Removed Files:
	fonttools-20050315-20050624.patch 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	9 Nov 2006 14:38:24 -0000	1.4
@@ -0,0 +1 @@
+fonttools-2006-02-23.085153.tar.bz2


Index: fonttools.spec
===================================================================
RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fonttools.spec	8 Nov 2006 20:05:31 -0000	1.8
+++ fonttools.spec	9 Nov 2006 14:38:24 -0000	1.9
@@ -1,21 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define alphatag 20050624cvs
+%define alphatag 20060223cvs
 
 Name:           fonttools
 Version:        2.0
-Release:        0.8.%{alphatag}%{?dist}
+Release:        0.9.%{alphatag}%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://sourceforge.net/projects/fonttools/
-Source0:        http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2
-Patch1:         fonttools-20050315-20050624.patch
-Patch2:         fonttools-unsigned-ranges.patch
+Source0:        http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2006-02-23.085153.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel python-numeric
-Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:       python-numeric
 
 Provides:       ttx
@@ -28,8 +25,6 @@
 
 %prep
 %setup -q -n %{name}
-%patch1 -p1 -b .20050624
-%patch2 -p1 -b .unsigned-ranges
 
 %{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py
 %{__chmod} a-x LICENSE.txt
@@ -61,23 +56,19 @@
 %dir %{python_sitearch}/FontTools/fontTools/pens
 %dir %{python_sitearch}/FontTools/fontTools/ttLib
 %dir %{python_sitearch}/FontTools/fontTools/ttLib/tables
-%{python_sitearch}/FontTools/*.py
-%{python_sitearch}/FontTools/*.pyc
-%{python_sitearch}/FontTools/*.pyo
-%{python_sitearch}/FontTools/fontTools/*.py
-%{python_sitearch}/FontTools/fontTools/*.pyc
-%{python_sitearch}/FontTools/fontTools/*.pyo
-%{python_sitearch}/FontTools/fontTools/*/*.py
-%{python_sitearch}/FontTools/fontTools/*/*.pyc
-%{python_sitearch}/FontTools/fontTools/*/*.pyo
-%{python_sitearch}/FontTools/fontTools/*/*/*.py
-%{python_sitearch}/FontTools/fontTools/*/*/*.pyc
-%{python_sitearch}/FontTools/fontTools/*/*/*.pyo
+%{python_sitearch}/FontTools/*.py*
+%{python_sitearch}/FontTools/fontTools/*.py*
+%{python_sitearch}/FontTools/fontTools/*/*.py*
+%{python_sitearch}/FontTools/fontTools/*/*/*.py*
 %{python_sitearch}/FontTools/fontTools/misc/eexecOp.so
 %{_bindir}/ttx
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 2.0-0.9.20060223cvs
+- Update to newer CVS snapshot dated 2006-02-23
+- Cleanup based on latest Python packaging guidelines
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.8.20050624cvs
 - De-ghost .pyo files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fonttools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2006 19:17:12 -0000	1.4
+++ sources	9 Nov 2006 14:38:24 -0000	1.5
@@ -1 +1 @@
-b44a299a0530a2a4f65d1937aa99f734  fonttools-2005-03-15.210812.tar.bz2
+ffddf5c5c6b327e1855b934e98782717  fonttools-2006-02-23.085153.tar.bz2


--- fonttools-20050315-20050624.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  9 15:51:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 08:51:12 -0700
Subject: owners owners.list,1.1908,1.1909
Message-ID: <200611091551.kA9FpCH0003446@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3428

Modified Files:
	owners.list 
Log Message:
assme primary maintainership of qscintilla



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1908
retrieving revision 1.1909
diff -u -r1.1908 -r1.1909
--- owners.list	9 Nov 2006 00:43:28 -0000	1.1908
+++ owners.list	9 Nov 2006 15:50:42 -0000	1.1909
@@ -1974,7 +1974,7 @@
 Fedora Extras|qjackctl|Qt based JACK control application|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|qscintilla|A Scintilla port to Qt|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|icon at fedoraproject.org,extras-qa at fedoraproject.org|
 Fedora Extras|qstat|Real-time Game Server Status for FPS game servers|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|qsynth|Qt based Fluidsynth GUI front end|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 16:07:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 9 Nov 2006 09:07:29 -0700
Subject: rpms/tracker/devel - New directory
Message-ID: <200611091607.kA9G7TJA006584@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6566/tracker/devel

Log Message:
Directory /cvs/extras/rpms/tracker/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 16:07:27 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 9 Nov 2006 09:07:27 -0700
Subject: rpms/tracker - New directory
Message-ID: <200611091607.kA9G7Rr0006570@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6566/tracker

Log Message:
Directory /cvs/extras/rpms/tracker added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 16:07:44 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 9 Nov 2006 09:07:44 -0700
Subject: rpms/tracker Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611091607.kA9G7isE006618@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6612

Added Files:
	Makefile import.log 
Log Message:
Setup of module tracker


--- NEW FILE Makefile ---
# Top level Makefile for module tracker
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 Nov  9 16:07:50 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 9 Nov 2006 09:07:50 -0700
Subject: rpms/tracker/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611091607.kA9G7oZC006636@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6612/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tracker


--- 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 Nov  9 16:08:50 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 9 Nov 2006 09:08:50 -0700
Subject: rpms/tracker import.log,1.1,1.2
Message-ID: <200611091608.kA9G8oJC006714@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6681

Modified Files:
	import.log 
Log Message:
auto-import tracker-0.5.1-1 on branch devel from tracker-0.5.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tracker/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Nov 2006 16:07:44 -0000	1.1
+++ import.log	9 Nov 2006 16:08:20 -0000	1.2
@@ -0,0 +1 @@
+tracker-0_5_1-1:HEAD:tracker-0.5.1-1.src.rpm:1163088496



From fedora-extras-commits at redhat.com  Thu Nov  9 16:08:51 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 9 Nov 2006 09:08:51 -0700
Subject: rpms/tracker/devel tracker.spec, NONE, 1.1 trackerd.desktop, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611091608.kA9G8pQf006718@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6681/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tracker.spec trackerd.desktop 
Log Message:
auto-import tracker-0.5.1-1 on branch devel from tracker-0.5.1-1.src.rpm


--- NEW FILE tracker.spec ---
Summary: An object database, tag/metadata database, search tool and indexer
Name: tracker
Version: 0.5.1
Release: 1%{?dist}
License: GPL
Group: Applications/System
URL: http://www.gnome.org/~jamiemcc/tracker/
Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
Source1: trackerd.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gmime-devel, poppler-devel, gettext
BuildRequires: gnome-desktop-devel, gamin-devel
BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
%if "%fedora" >= "6"
BuildRequires: sqlite-devel
%else
BuildRequires: dbus-devel, dbus-glib
%endif

%description
Tracker is a powerful desktop-neutral first class object database,
tag/metadata database, search tool and indexer. 

It consists of a common object database that allows entities to have an
almost infinte number of properties, metadata (both embedded/harvested as
well as user definable), a comprehensive database of keywords/tags and
links to other entities.

It provides additional features for file based objects including context
linking and audit trails for a file object.

It has the ability to index, store, harvest metadata. retrieve and search  
all types of files and other first class objects

%package        devel
Summary:	Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:	pkgconfig

%description devel
This package contains the static libraries and header files needed for
developing with tracker

%prep
%setup -q

%build
%if "%fedora" >= "6"
%configure --disable-static --enable-external-sqlite
%else
%configure --disable-static
%endif
# make %{?_smp_mflags} fails
make

										
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install

# Add an autostart for trackerd
mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/

rm -rf %{buildroot}%{_libdir}/*.la

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/htmless
%{_bindir}/o3totxt
%{_bindir}/tracker*
%{_datadir}/tracker/
%{_datadir}/pixmaps/tracker/
%{_datadir}/dbus-1/services/tracker.service
%{_libdir}/*.so.*
%{_mandir}/man1/tracker*.1.gz
%{_sysconfdir}/xdg/autostart/trackerd.desktop

%files devel
%defattr(-, root, root, -)
%{_includedir}/tracker*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%changelog
* Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1
- Update to new version

* Mon Nov 06 2006 Deji Akingunola  - 0.5.0-7
- Have the devel subpackage require pkgconfig
- Make the description field not have more than 76 characters on a line
- Fix up the RPM group

* Mon Nov 06 2006 Deji Akingunola  - 0.5.0-6
- Explicitly require dbus-devel and dbus-glib (needed for FC < 6) 

* Sun Nov 05 2006 Deji Akingunola  - 0.5.0-5
- Remove unneeded BRs (gnome-utils-devel and openssl-devel) 

* Sun Nov 05 2006 Deji Akingunola  - 0.5.0-4
- Add autostart desktop file.
- Edit the package description as suggested in review

* Sat Nov 04 2006 Deji Akingunola  - 0.5.0-3
- More cleaups to the spec file.

* Sat Nov 04 2006 Deji Akingunola  - 0.5.0-2
- Add needed BRs

* Sat Nov 04 2006 Deji Akingunola  - 0.5.0-1
- Initial packaging for Fedora Extras


--- NEW FILE trackerd.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Tracker
Comment=Tracker indexer and search tool daemon
Icon=
Exec=trackerd
Terminal=false
Type=Application
Categories=
X-GNOME-Autostart-enabled=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Nov 2006 16:07:50 -0000	1.1
+++ .cvsignore	9 Nov 2006 16:08:21 -0000	1.2
@@ -0,0 +1 @@
+tracker-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Nov 2006 16:07:50 -0000	1.1
+++ sources	9 Nov 2006 16:08:21 -0000	1.2
@@ -0,0 +1 @@
+133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 16:13:41 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 9 Nov 2006 09:13:41 -0700
Subject: owners owners.list,1.1909,1.1910
Message-ID: <200611091613.kA9GDfo6006853@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6834

Modified Files:
	owners.list 
Log Message:
Add an entry for tracker



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1909
retrieving revision 1.1910
diff -u -r1.1909 -r1.1910
--- owners.list	9 Nov 2006 15:50:42 -0000	1.1909
+++ owners.list	9 Nov 2006 16:13:11 -0000	1.1910
@@ -2264,6 +2264,7 @@
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|trackballs|Steer a marble ball through a labyrinth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|trackballs-music|In-game music for Trackballs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|tracker|An object database, tag/metadata database, search tool and indexer|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|transmission|A lightweight GTK+ BitTorrent client|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|tre|POSIX compatible regexp library with approximate matching|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 16:23:19 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 9 Nov 2006 09:23:19 -0700
Subject: rpms/php-pear-Net-FTP/FC-6 php-pear-Net-FTP.spec,1.1,1.2
Message-ID: <200611091623.kA9GNJnq006963@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-FTP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6947

Modified Files:
	php-pear-Net-FTP.spec 
Log Message:
	bump release to build under FC6




Index: php-pear-Net-FTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-FTP/FC-6/php-pear-Net-FTP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Net-FTP.spec	7 Nov 2006 16:31:41 -0000	1.1
+++ php-pear-Net-FTP.spec	9 Nov 2006 16:22:49 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Net-FTP
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Provides an OO interface to the PHP FTP functions plus some additions
 
 Group:          Development/Libraries
@@ -87,6 +87,9 @@
 
 
 %changelog
+* Thu Nov  9 2006 Remi Collet  1.3.2-1.fc6.1
+- bump release to build under FC6
+
 * Sun Nov  5 2006 Remi Collet  1.3.2-1
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE



From fedora-extras-commits at redhat.com  Thu Nov  9 16:24:33 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 9 Nov 2006 09:24:33 -0700
Subject: rpms/tracker/devel tracker.spec,1.1,1.2
Message-ID: <200611091624.kA9GOXUJ007052@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6969

Modified Files:
	tracker.spec 
Log Message:
Use space not tabs in the headers for -devel



Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracker.spec	9 Nov 2006 16:08:21 -0000	1.1
+++ tracker.spec	9 Nov 2006 16:24:03 -0000	1.2
@@ -32,11 +32,11 @@
 It has the ability to index, store, harvest metadata. retrieve and search  
 all types of files and other first class objects
 
-%package        devel
-Summary:	Headers for developing programs that will use %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:	pkgconfig
+%package devel
+Summary: Headers for developing programs that will use %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 This package contains the static libraries and header files needed for



From fedora-extras-commits at redhat.com  Thu Nov  9 16:28:53 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:28:53 -0700
Subject: rpms/doulos-fonts/devel .cvsignore, 1.4, 1.5 doulos-fonts.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200611091628.kA9GSrLg007121@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/doulos-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7101

Modified Files:
	.cvsignore doulos-fonts.spec sources 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2006 19:11:30 -0000	1.4
+++ .cvsignore	9 Nov 2006 16:28:23 -0000	1.5
@@ -1 +1,2 @@
 DoulosSIL4.0.14.r1.zip
+DoulosSILLit4.0.14.r1.zip


Index: doulos-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/devel/doulos-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- doulos-fonts.spec	8 Nov 2006 19:58:36 -0000	1.4
+++ doulos-fonts.spec	9 Nov 2006 16:28:23 -0000	1.5
@@ -2,14 +2,15 @@
 
 Name:           doulos-fonts
 Version:        4.0.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Doulos SIL fonts
 
 Group:          User Interface/X
 License:        SIL Open Font License
 URL:            http://scripts.sil.org/DoulosSILFont
-# Source0 can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload
+# Sources can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload
 Source0:        DoulosSIL%{version}.r1.zip
+Source1:        DoulosSILLit%{version}.r1.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,8 +22,11 @@
 
 
 %prep
-%setup -q -c
-%{__sed} -i 's/\r//' *.txt
+%setup -q -c -a 1
+mv 0NRSI/RFS/documentation/DoulosSILLiteracy/FONTLOG.txt FONTLOG-Literacy.txt
+mv DoulosSILLiteracy/*.ttf .
+%{__sed} -i 's/\r//' *.txt 
+
 
 %build
 
@@ -33,10 +37,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,14 +58,17 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf
+%doc FONTLOG.txt FONTLOG-Literacy.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 4.0.14-4
+- Include Doulos Literacy
+- Don't include font cache files (fontconfig mechanism is changed)
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-3
 - Add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2006 18:16:15 -0000	1.4
+++ sources	9 Nov 2006 16:28:23 -0000	1.5
@@ -1 +1,2 @@
 70263b39119d488d432a04a4512cfc57  DoulosSIL4.0.14.r1.zip
+c7cac6597ed75f4df89a9579a5d0e419  DoulosSILLit4.0.14.r1.zip



From fedora-extras-commits at redhat.com  Thu Nov  9 16:37:58 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:37:58 -0700
Subject: rpms/doulos-fonts/FC-6 .cvsignore, 1.4, 1.5 doulos-fonts.spec, 1.4, 
	1.5 sources, 1.4, 1.5
Message-ID: <200611091637.kA9Gbw0V007258@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/doulos-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7219

Modified Files:
	.cvsignore doulos-fonts.spec sources 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2006 19:11:30 -0000	1.4
+++ .cvsignore	9 Nov 2006 16:37:28 -0000	1.5
@@ -1 +1,2 @@
 DoulosSIL4.0.14.r1.zip
+DoulosSILLit4.0.14.r1.zip


Index: doulos-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/FC-6/doulos-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- doulos-fonts.spec	8 Nov 2006 19:57:53 -0000	1.4
+++ doulos-fonts.spec	9 Nov 2006 16:37:28 -0000	1.5
@@ -2,14 +2,15 @@
 
 Name:           doulos-fonts
 Version:        4.0.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Doulos SIL fonts
 
 Group:          User Interface/X
 License:        SIL Open Font License
 URL:            http://scripts.sil.org/DoulosSILFont
-# Source0 can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload
+# Sources can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload
 Source0:        DoulosSIL%{version}.r1.zip
+Source1:        DoulosSILLit%{version}.r1.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,8 +22,11 @@
 
 
 %prep
-%setup -q -c
-%{__sed} -i 's/\r//' *.txt
+%setup -q -c -a 1
+mv 0NRSI/RFS/documentation/DoulosSILLiteracy/FONTLOG.txt FONTLOG-Literacy.txt
+mv DoulosSILLiteracy/*.ttf .
+%{__sed} -i 's/\r//' *.txt 
+
 
 %build
 
@@ -33,10 +37,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,14 +58,17 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf
+%doc FONTLOG.txt FONTLOG-Literacy.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 4.0.14-4
+- Include Doulos Literacy
+- Don't include font cache files (fontconfig mechanism is changed)
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-3
 - Add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2006 18:16:15 -0000	1.4
+++ sources	9 Nov 2006 16:37:28 -0000	1.5
@@ -1 +1,2 @@
 70263b39119d488d432a04a4512cfc57  DoulosSIL4.0.14.r1.zip
+c7cac6597ed75f4df89a9579a5d0e419  DoulosSILLit4.0.14.r1.zip



From fedora-extras-commits at redhat.com  Thu Nov  9 16:38:27 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:38:27 -0700
Subject: rpms/charis-fonts/devel charis-fonts.spec,1.2,1.3
Message-ID: <200611091638.kA9GcRJS007295@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/charis-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240

Modified Files:
	charis-fonts.spec 
Log Message:
clog


Index: charis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/devel/charis-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- charis-fonts.spec	19 Sep 2006 23:42:38 -0000	1.2
+++ charis-fonts.spec	9 Nov 2006 16:37:57 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           charis-fonts
 Version:        4.0.02
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Charis SIL fonts
 
 Group:          User Interface/X
@@ -37,10 +37,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,10 +62,12 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 4.0.02-3
+- Remove ghost-ed fontconfig cache files
+
 * Tue Sep 19 2006 Kevin Fenzi  - 4.0.02-2
 - Rebuild for fc6
 - Add dist tag



From fedora-extras-commits at redhat.com  Thu Nov  9 16:39:38 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:39:38 -0700
Subject: rpms/doulos-fonts/FC-5 .cvsignore, 1.2, 1.3 doulos-fonts.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200611091639.kA9GdcFi007371@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/doulos-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7349

Modified Files:
	.cvsignore doulos-fonts.spec sources 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Feb 2006 15:13:32 -0000	1.2
+++ .cvsignore	9 Nov 2006 16:39:08 -0000	1.3
@@ -1 +1,2 @@
 DoulosSIL4.0.14.r1.zip
+DoulosSILLit4.0.14.r1.zip


Index: doulos-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/FC-5/doulos-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doulos-fonts.spec	19 Feb 2006 15:13:32 -0000	1.1
+++ doulos-fonts.spec	9 Nov 2006 16:39:08 -0000	1.2
@@ -2,14 +2,15 @@
 
 Name:           doulos-fonts
 Version:        4.0.14
-Release:        1
+Release:        4%{?dist}
 Summary:        Doulos SIL fonts
 
 Group:          User Interface/X
 License:        SIL Open Font License
 URL:            http://scripts.sil.org/DoulosSILFont
-# Source0 can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload
+# Sources can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload
 Source0:        DoulosSIL%{version}.r1.zip
+Source1:        DoulosSILLit%{version}.r1.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -21,8 +22,11 @@
 
 
 %prep
-%setup -q -c
-%{__sed} -i 's/\r//' *.txt
+%setup -q -c -a 1
+mv 0NRSI/RFS/documentation/DoulosSILLiteracy/FONTLOG.txt FONTLOG-Literacy.txt
+mv DoulosSILLiteracy/*.ttf .
+%{__sed} -i 's/\r//' *.txt 
+
 
 %build
 
@@ -33,10 +37,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,13 +58,22 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf
+%doc FONTLOG.txt FONTLOG-Literacy.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 4.0.14-4
+- Include Doulos Literacy
+- Don't include font cache files (fontconfig mechanism is changed)
+
+* Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-3
+- Add dist tag
+
+* Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-2
+- Rebuild to make package available in Rawhide again
+
 * Sat Feb 18 2006 Roozbeh Pournader  - 4.0.14-1
 - Initial packaging, based on gentium-fonts


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Feb 2006 15:13:32 -0000	1.2
+++ sources	9 Nov 2006 16:39:08 -0000	1.3
@@ -1 +1,2 @@
 70263b39119d488d432a04a4512cfc57  DoulosSIL4.0.14.r1.zip
+c7cac6597ed75f4df89a9579a5d0e419  DoulosSILLit4.0.14.r1.zip



From fedora-extras-commits at redhat.com  Thu Nov  9 16:40:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Nov 2006 09:40:48 -0700
Subject: fedora-security/audit fe3, 1.28, 1.29 fe4, 1.91, 1.92 fe5, 1.98,
	1.99 fe6, 1.11, 1.12
Message-ID: <200611091640.kA9GemkH007449@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7425

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
Note imlib2 fixes.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fe3	8 Nov 2006 20:41:12 -0000	1.28
+++ fe3	9 Nov 2006 16:40:45 -0000	1.29
@@ -7,10 +7,10 @@
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
-CVE-2006-4809 ** (imlib2) #214676
-CVE-2006-4808 ** (imlib2) #214676
-CVE-2006-4807 ** (imlib2) #214676
-CVE-2006-4806 ** (imlib2) #214676
+CVE-2006-4809 patch (imlib2, fixed 1.2.1-2) #214676
+CVE-2006-4808 patch (imlib2, fixed 1.2.1-2) #214676
+CVE-2006-4807 patch (imlib2, fixed 1.2.1-2) #214676
+CVE-2006-4806 patch (imlib2, fixed 1.2.1-2) #214676
 CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4248 ignore (thttpd, Debian specific issue)


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- fe4	8 Nov 2006 20:41:12 -0000	1.91
+++ fe4	9 Nov 2006 16:40:45 -0000	1.92
@@ -21,10 +21,10 @@
 CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
-CVE-2006-4809 ** (imlib2) #214676
-CVE-2006-4808 ** (imlib2) #214676
-CVE-2006-4807 ** (imlib2) #214676
-CVE-2006-4806 ** (imlib2) #214676
+CVE-2006-4809 patch (imlib2, fixed 1.2.1-2) #214676
+CVE-2006-4808 patch (imlib2, fixed 1.2.1-2) #214676
+CVE-2006-4807 patch (imlib2, fixed 1.2.1-2) #214676
+CVE-2006-4806 patch (imlib2, fixed 1.2.1-2) #214676
 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fe5	8 Nov 2006 20:41:12 -0000	1.98
+++ fe5	9 Nov 2006 16:40:45 -0000	1.99
@@ -21,10 +21,10 @@
 CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
-CVE-2006-4809 ** (imlib2) #214676
-CVE-2006-4808 ** (imlib2) #214676
-CVE-2006-4807 ** (imlib2) #214676
-CVE-2006-4806 ** (imlib2) #214676
+CVE-2006-4809 patch (imlib2, fixed 1.3.0-3) #214676
+CVE-2006-4808 patch (imlib2, fixed 1.3.0-3) #214676
+CVE-2006-4807 patch (imlib2, fixed 1.3.0-3) #214676
+CVE-2006-4806 patch (imlib2, fixed 1.3.0-3) #214676
 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fe6	8 Nov 2006 20:41:12 -0000	1.11
+++ fe6	9 Nov 2006 16:40:45 -0000	1.12
@@ -21,10 +21,10 @@
 CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
-CVE-2006-4809 ** (imlib2) #214676
-CVE-2006-4808 ** (imlib2) #214676
-CVE-2006-4807 ** (imlib2) #214676
-CVE-2006-4806 ** (imlib2) #214676
+CVE-2006-4809 patch (imlib2, fixed 1.3.0-3) #214676
+CVE-2006-4808 patch (imlib2, fixed 1.3.0-3) #214676
+CVE-2006-4807 patch (imlib2, fixed 1.3.0-3) #214676
+CVE-2006-4806 patch (imlib2, fixed 1.3.0-3) #214676
 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516



From fedora-extras-commits at redhat.com  Thu Nov  9 16:46:07 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:46:07 -0700
Subject: rpms/gentium-fonts/devel gentium-fonts.spec,1.3,1.4
Message-ID: <200611091646.kA9Gk7DP007485@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7469

Modified Files:
	gentium-fonts.spec 
Log Message:
clog


Index: gentium-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/devel/gentium-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gentium-fonts.spec	19 Sep 2006 23:22:57 -0000	1.3
+++ gentium-fonts.spec	9 Nov 2006 16:45:37 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           gentium-fonts
 Version:        1.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SIL Gentium fonts
 
 Group:          User Interface/X
@@ -39,11 +39,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-2
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,11 +64,12 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  1.02-5
+- Remove ghost-ed fontconfig caches (fontconfig mechanism is changed)
+
 * Tue Sep 19 2006 Kevin Fenzi  1.02-4
 - Rebuild for Fedora Extras 6
 - Add dist tag



From fedora-extras-commits at redhat.com  Thu Nov  9 16:47:31 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:47:31 -0700
Subject: rpms/charis-fonts/FC-6 charis-fonts.spec,1.2,1.3
Message-ID: <200611091647.kA9GlVIT007550@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/charis-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7532

Modified Files:
	charis-fonts.spec 
Log Message:
clog


Index: charis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/FC-6/charis-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- charis-fonts.spec	19 Sep 2006 23:42:38 -0000	1.2
+++ charis-fonts.spec	9 Nov 2006 16:47:01 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           charis-fonts
 Version:        4.0.02
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Charis SIL fonts
 
 Group:          User Interface/X
@@ -37,10 +37,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,10 +62,12 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 4.0.02-3
+- Remove ghost-ed fontconfig cache files
+
 * Tue Sep 19 2006 Kevin Fenzi  - 4.0.02-2
 - Rebuild for fc6
 - Add dist tag



From fedora-extras-commits at redhat.com  Thu Nov  9 16:48:20 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:48:20 -0700
Subject: rpms/gentium-fonts/FC-5 gentium-fonts.spec,1.2,1.3
Message-ID: <200611091648.kA9GmKdt007577@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7556

Modified Files:
	gentium-fonts.spec 
Log Message:
clog


Index: gentium-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/FC-5/gentium-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gentium-fonts.spec	13 Feb 2006 18:32:03 -0000	1.2
+++ gentium-fonts.spec	9 Nov 2006 16:47:50 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           gentium-fonts
 Version:        1.02
-Release:        3
+Release:        5%{?dist}
 Summary:        SIL Gentium fonts
 
 Group:          User Interface/X
@@ -39,11 +39,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-2
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,11 +64,16 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  1.02-5
+- Remove ghost-ed fontconfig caches (fontconfig mechanism is changed)
+
+* Tue Sep 19 2006 Kevin Fenzi  1.02-4
+- Rebuild for Fedora Extras 6
+- Add dist tag
+
 * Mon Feb 13 2006 Roozbeh Pournader  1.02-3
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Thu Nov  9 16:49:54 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:49:54 -0700
Subject: rpms/charis-fonts/FC-5 charis-fonts.spec,1.1,1.2
Message-ID: <200611091649.kA9GnsPc007617@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/charis-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7599

Modified Files:
	charis-fonts.spec 
Log Message:
* Thu Nov 09 2006 Roozbeh Pournader  - 4.0.02-3
- Remove ghost-ed fontconfig cache files

* Tue Sep 19 2006 Kevin Fenzi  - 4.0.02-2
- Rebuild for fc6
- Add dist tag



Index: charis-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/charis-fonts/FC-5/charis-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- charis-fonts.spec	19 Feb 2006 14:46:54 -0000	1.1
+++ charis-fonts.spec	9 Nov 2006 16:49:24 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           charis-fonts
 Version:        4.0.02
-Release:        1
+Release:        3%{?dist}
 Summary:        Charis SIL fonts
 
 Group:          User Interface/X
@@ -37,10 +37,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,9 +62,15 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  - 4.0.02-3
+- Remove ghost-ed fontconfig cache files
+
+* Tue Sep 19 2006 Kevin Fenzi  - 4.0.02-2
+- Rebuild for fc6
+- Add dist tag
+
 * Sat Feb 18 2006 Roozbeh Pournader  - 4.0.02-1
 - Initial packaging, based on gentium-fonts



From fedora-extras-commits at redhat.com  Thu Nov  9 16:50:28 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 09:50:28 -0700
Subject: rpms/gentium-fonts/FC-6 gentium-fonts.spec,1.3,1.4
Message-ID: <200611091650.kA9GoSNl007640@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gentium-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7623

Modified Files:
	gentium-fonts.spec 
Log Message:
clog


Index: gentium-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/gentium-fonts/FC-6/gentium-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gentium-fonts.spec	19 Sep 2006 23:22:57 -0000	1.3
+++ gentium-fonts.spec	9 Nov 2006 16:49:58 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           gentium-fonts
 Version:        1.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SIL Gentium fonts
 
 Group:          User Interface/X
@@ -39,11 +39,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-2
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,11 +64,12 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 
 %changelog
+* Thu Nov 09 2006 Roozbeh Pournader  1.02-5
+- Remove ghost-ed fontconfig caches (fontconfig mechanism is changed)
+
 * Tue Sep 19 2006 Kevin Fenzi  1.02-4
 - Rebuild for Fedora Extras 6
 - Add dist tag



From fedora-extras-commits at redhat.com  Thu Nov  9 16:57:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 09:57:22 -0700
Subject: rpms/qscintilla/devel .cvsignore, 1.2, 1.3 qscintilla.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200611091657.kA9GvM7a007734@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7688

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Thu Nov 09 2006 Rex Dieter  - 1.7-1
- QScintilla1-1.71-gpl-1.7.tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
+++ .cvsignore	9 Nov 2006 16:56:51 -0000	1.3
@@ -1 +1,2 @@
 qscintilla-1.65-gpl-1.6.tar.gz
+QScintilla1-1.71-gpl-1.7.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qscintilla.spec	3 Sep 2006 19:10:45 -0000	1.4
+++ qscintilla.spec	9 Nov 2006 16:56:51 -0000	1.5
@@ -1,24 +1,28 @@
-%define         scintilla_ver   1.65
-%define         qtdir           %{_libdir}/qt-3.3
+
+%define         scintilla_ver   1.71
 
 Name:	        qscintilla 
-Version:        1.6
-Release:        3.3%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPL
 Group:          Development/Tools
 Url:            http://www.riverbankcomputing.co.uk/qscintilla/
-Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
-Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
+Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla1-%{scintilla_ver}-gpl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4
+Patch1: 	qscintilla-1.61-gpl-1.4-designer-incpath.patch
+
+BuildRequires:  qt-devel
+
+%global qtdir	%(qmake -query QT_INSTALL_PREFIX)
+%global qtdata	%(qmake -query QT_INSTALL_DATA)
+%global qtinc	%{qtdir}/include 
+%global qtlib	%{qtdir}/lib 
 
 %description
-QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
-and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
-MacOS/X).  Qt v3 or later is required.
+QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
 This version of QScintilla is based on Scintilla v%{scintilla_ver}.
 
@@ -27,28 +31,27 @@
 Summary:        QScintilla designer plugin 
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4
-
+Requires:       qt-designer
 %description designer
-QScintillla designer plugin.
-
+%{summary}.
 
 %package devel
 Summary:        QScintilla Development Files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4
-
+Requires:       qt-devel 
 %description devel
-These are the development files for QScintilla, needed to build against
-QScintilla.
+%{summary}.
 
 
 %prep
-%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
+%setup -q -n QScintilla1-%{scintilla_ver}-gpl-%{version}
+
 %patch1 -p1 -b .designer-incpath
+
 # fixups to support RPM_BUILD_ROOT/DESTDIR
 sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
+
 # fix permissions on doc files
 find doc example -type f -exec chmod 0644 {} ';'
 
@@ -84,29 +87,31 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
-%{qtdir}/lib/*.so.*
-%{qtdir}/translations/*
-
+%{qtlib}/lib*.so.*
+%{qtdata}/translations/*
 
 %files designer
 %defattr(-,root,root,-)
 %{qtdir}/plugins/designer/*
 
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html doc/Scintilla example
-%{qtdir}/lib/*.so
-%{qtdir}/include/*
+%{qtlib}/lib*.so
+%{qtinc}/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  - 1.7-1
+- QScintilla1-1.71-gpl-1.7.tar.gz
+
 * Sun Sep 03 2006 Konstantin Ryabitsev  - 1.6-3.3
 - FC6 rebuild.
 - Export flags.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 15:10:44 -0000	1.2
+++ sources	9 Nov 2006 16:56:51 -0000	1.3
@@ -1 +1 @@
-8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz
+145321e9e3ae7d4edc7f2bf6954b6763  QScintilla1-1.71-gpl-1.7.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 16:57:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Nov 2006 09:57:18 -0700
Subject: fedora-security/audit fe5,1.99,1.100 fe6,1.12,1.13
Message-ID: <200611091657.kA9GvIL7007729@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7709

Modified Files:
	fe5 fe6 
Log Message:
CVE-2006-545[3-5] (bugzilla) fixed


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fe5	9 Nov 2006 16:40:45 -0000	1.99
+++ fe5	9 Nov 2006 16:57:15 -0000	1.100
@@ -5,9 +5,9 @@
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
-CVE-2006-5455 VULNERABLE (bugzilla) #212355
-CVE-2006-5454 VULNERABLE (bugzilla) #212355
-CVE-2006-5453 VULNERABLE (bugzilla) #212355
+CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
+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-5129 version (moodle, fixed 1.6.3) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fe6	9 Nov 2006 16:40:45 -0000	1.12
+++ fe6	9 Nov 2006 16:57:15 -0000	1.13
@@ -5,9 +5,9 @@
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
-CVE-2006-5455 VULNERABLE (bugzilla) #212355
-CVE-2006-5454 VULNERABLE (bugzilla) #212355
-CVE-2006-5453 VULNERABLE (bugzilla) #212355
+CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
+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-5129 version (moodle, fixed 1.6.3) #206516
 CVE-2006-5111 version (libksba, fixed 0.9.14)



From fedora-extras-commits at redhat.com  Thu Nov  9 17:07:36 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Thu, 9 Nov 2006 10:07:36 -0700
Subject: owners owners.list,1.1910,1.1911
Message-ID: <200611091707.kA9H7a87010825@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10809

Modified Files:
	owners.list 
Log Message:
orphan t1lib and t1utils, add myself to CC list for mediawiki



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1910
retrieving revision 1.1911
diff -u -r1.1910 -r1.1911
--- owners.list	9 Nov 2006 16:13:11 -0000	1.1910
+++ owners.list	9 Nov 2006 17:07:06 -0000	1.1911
@@ -1041,7 +1041,7 @@
 Fedora Extras|mbuffer|Measuring Buffer is an enhanced version of buffer|alex at dalloz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
-Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org
+Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org,roozbeh at farsiweb.info
 Fedora Extras|MegaMek|A portable, network-enabled BattleTech engine|fitzsim at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|mercator|Terrain library for WorldForge client/server|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -2179,8 +2179,8 @@
 Fedora Extras|sysprof|A sampling CPU profiler|giallu at gmail.com|extras-qa at fedoraproject.org|sandmann at daimi.au.dk
 Fedora Extras|sysprof-kmod|Sysprof kernel module|giallu at gmail.com|extras-qa at fedoraproject.org|sandmann at daimi.au.dk
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ankit644 at yahoo.com
-Fedora Extras|t1lib|PostScript Type 1 font rasterizer|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt
-Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|jamatos at fc.up.pt
+Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|jamatos at fc.up.pt,roozbeh at farsiweb.info
+Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|jamatos at fc.up.pt,roozbeh at farsiweb.info
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 17:11:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Nov 2006 10:11:39 -0700
Subject: fedora-security/audit fe3, 1.29, 1.30 fe4, 1.92, 1.93 fe5, 1.100,
	1.101 fe6, 1.13, 1.14
Message-ID: <200611091711.kA9HBdYa010884@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10860

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-5815 ** (proftpd) #214820


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fe3	9 Nov 2006 16:40:45 -0000	1.29
+++ fe3	9 Nov 2006 17:11:36 -0000	1.30
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5602 VULNERABLE (xsupplicant) #212699
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- fe4	9 Nov 2006 16:40:45 -0000	1.92
+++ fe4	9 Nov 2006 17:11:36 -0000	1.93
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fe5	9 Nov 2006 16:57:15 -0000	1.100
+++ fe5	9 Nov 2006 17:11:36 -0000	1.101
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fe6	9 Nov 2006 16:57:15 -0000	1.13
+++ fe6	9 Nov 2006 17:11:36 -0000	1.14
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700



From fedora-extras-commits at redhat.com  Thu Nov  9 17:16:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 10:16:24 -0700
Subject: rpms/PyQt-qscintilla/devel PyQt-qscintilla.spec,1.7,1.8
Message-ID: <200611091716.kA9HGOaH010921@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10905

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
* Thu Nov 09 2006 Rex Dieter  3.17-2
- respin for qscintilla-1.7 (#214192)



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/PyQt-qscintilla.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PyQt-qscintilla.spec	8 Nov 2006 13:55:52 -0000	1.7
+++ PyQt-qscintilla.spec	9 Nov 2006 17:15:53 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: PyQt qscintilla extentions 
 Name: 	 PyQt-qscintilla
 Version: 3.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Development/Languages
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  3.17-2
+- respin for qscintilla-1.7 (#214192)
+
 * Mon Nov 06 2006 Rex Dieter  3.17-1
 - PyQt-3.17
 



From fedora-extras-commits at redhat.com  Thu Nov  9 17:18:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Nov 2006 10:18:33 -0700
Subject: fedora-security/audit fe4,1.93,1.94 fe5,1.101,1.102 fe6,1.14,1.15
Message-ID: <200611091718.kA9HIXHx011006@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10984

Modified Files:
	fe4 fe5 fe6 
Log Message:
+CVE-2006-5xxx VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- fe4	9 Nov 2006 17:11:36 -0000	1.93
+++ fe4	9 Nov 2006 17:18:31 -0000	1.94
@@ -3,9 +3,13 @@
 ** are items that need attention
 
 CVE-2006-5815 ** (proftpd) #214820
+CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
+CVE-2006-5464 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5463 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5455 VULNERABLE (bugzilla) #212355
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fe5	9 Nov 2006 17:11:36 -0000	1.101
+++ fe5	9 Nov 2006 17:18:31 -0000	1.102
@@ -3,9 +3,13 @@
 ** are items that need attention
 
 CVE-2006-5815 ** (proftpd) #214820
+CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
+CVE-2006-5464 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5463 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
 CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
 CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fe6	9 Nov 2006 17:11:36 -0000	1.14
+++ fe6	9 Nov 2006 17:18:31 -0000	1.15
@@ -3,9 +3,13 @@
 ** are items that need attention
 
 CVE-2006-5815 ** (proftpd) #214820
+CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
+CVE-2006-5464 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5463 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
 CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
 CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355



From fedora-extras-commits at redhat.com  Thu Nov  9 17:25:52 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Thu, 9 Nov 2006 10:25:52 -0700
Subject: rpms/espeak - New directory
Message-ID: <200611091725.kA9HPqec011087@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11083/espeak

Log Message:
Directory /cvs/extras/rpms/espeak added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 17:25:58 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Thu, 9 Nov 2006 10:25:58 -0700
Subject: rpms/espeak/devel - New directory
Message-ID: <200611091725.kA9HPw6Q011101@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11083/espeak/devel

Log Message:
Directory /cvs/extras/rpms/espeak/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 17:26:27 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Thu, 9 Nov 2006 10:26:27 -0700
Subject: rpms/espeak Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611091726.kA9HQRW4011134@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11128

Added Files:
	Makefile import.log 
Log Message:
Setup of module espeak


--- NEW FILE Makefile ---
# Top level Makefile for module espeak
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 Nov  9 17:26:33 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Thu, 9 Nov 2006 10:26:33 -0700
Subject: rpms/espeak/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611091726.kA9HQXtq011152@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11128/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module espeak


--- 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 Nov  9 17:27:21 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 9 Nov 2006 10:27:21 -0700
Subject: owners owners.list,1.1911,1.1912
Message-ID: <200611091727.kA9HRLv6011223@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11176

Modified Files:
	owners.list 
Log Message:
No time to co-maintain tla, sorry.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1911
retrieving revision 1.1912
diff -u -r1.1911 -r1.1912
--- owners.list	9 Nov 2006 17:07:06 -0000	1.1911
+++ owners.list	9 Nov 2006 17:26:51 -0000	1.1912
@@ -2248,7 +2248,7 @@
 Fedora Extras|tkdnd|Tk extension that adds native DnD|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|tklib|Useful extensions for Tk|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|tla|The Low-Budget arch Revision Control System|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|tla|The Low-Budget arch Revision Control System|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|tog-pegasus|The Open Group Pegasus WBEM/CIM server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tolua++|A tool to integrate C/C++ code with Lua|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 17:28:49 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Thu, 9 Nov 2006 10:28:49 -0700
Subject: rpms/espeak import.log,1.1,1.2
Message-ID: <200611091728.kA9HSn0S011304@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11252

Modified Files:
	import.log 
Log Message:
auto-import espeak-1.16-4 on branch devel from espeak-1.16-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/espeak/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Nov 2006 17:26:27 -0000	1.1
+++ import.log	9 Nov 2006 17:28:18 -0000	1.2
@@ -0,0 +1 @@
+espeak-1_16-4:HEAD:espeak-1.16-4.src.rpm:1163093495



From fedora-extras-commits at redhat.com  Thu Nov  9 17:28:49 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Thu, 9 Nov 2006 10:28:49 -0700
Subject: rpms/espeak/devel compiledict-amd64_sizeof.patch, NONE,
	1.1 espeak.spec, NONE, 1.1 espeak_program_name.patch, NONE,
	1.1 makefile_install_target.patch, NONE,
	1.1 makefile_lpthread.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611091728.kA9HSnDe011308@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11252/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compiledict-amd64_sizeof.patch espeak.spec 
	espeak_program_name.patch makefile_install_target.patch 
	makefile_lpthread.patch 
Log Message:
auto-import espeak-1.16-4 on branch devel from espeak-1.16-4.src.rpm

compiledict-amd64_sizeof.patch:

--- NEW FILE compiledict-amd64_sizeof.patch ---
# Modified version of patch provided by Nigel Rowe
# Original patch available at https://sourceforge.net/tracker/download.php?group_id=159649&atid=812677&file_id=201024&aid=1588938
--- espeak-1.16-source/src/compiledict.cpp~	2006-10-03 08:51:13.000000000 +1000
+++ espeak-1.16-source/src/compiledict.cpp	2006-11-02 08:46:10.000000000 +1100
@@ -442,9 +442,9 @@
 	
 		while(p != NULL)
 		{
-			length = *(p+4);
-			fwrite(p+4,length,1,f_out);
-			memcpy(&p,p,4);
+			length = *(p+sizeof(char *));
+			fwrite(p+sizeof(char *),length,1,f_out);
+			memcpy(&p,p,sizeof(char *));
 		}
 		fputc(0,f_out);
 	}


--- NEW FILE espeak.spec ---
Name:           espeak
Version:        1.16
Release:        4%{?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-1.16-source.zip
Patch0:         makefile_lpthread.patch
Patch1:         makefile_install_target.patch
Patch2:         compiledict-amd64_sizeof.patch
Patch3:         espeak_program_name.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  portaudio-devel


%description
eSpeak is a software speech synthesizer for English and other languages.

eSpeak produces good quality English speech. It uses a different synthesis
method from other open source TTS engines, and sounds quite different.
It's perhaps not as natural or "smooth", but some people may find the
articulation clearer and easier to listen to for long periods. eSpeak supports
several languages, however in most cases these are initial drafts and need more
work to improve them.

It can run as a command line program to speak text from a file or from stdin.


%package devel
Summary: Development files for espeak
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}


%description devel
Development files for eSpeak, a software speech synthesizer.


%prep
%setup -q -n espeak-%{version}-source
chmod 0644 src/* 
%patch0 -p1 -b .pthread
%patch1 -p1 -b .install_target
%patch2 -p1 -b .amd64sizeof
%patch3 -p1 -b .espeak_name
# Prepare documentation
mv docs html
sed -i 's/\r//' License.txt



%build
cd src
make %{?_smp_mflags} BIN_NAME=espeak CXXFLAGS="${RPM_OPT_FLAGS}"


%install
rm -rf %{buildroot}
rmdir --ignore-fail-on-non-empty espeak-data/soundicons
# Remove backup files in documentation created by espeak_program_name patch
rm -f html/*.espeak_name
cd src
make install DESTDIR=%{buildroot} BINDIR=%{_bindir} INCDIR=%{_includedir}/espeak LIBDIR=%{_libdir}


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ReadMe ChangeLog License.txt html/
%{_bindir}/espeak
%{_datadir}/espeak-data
%{_libdir}/libespeak.so.*


%files devel
%defattr(-,root,root)
%{_libdir}/*.so
%{_includedir}/espeak


%changelog
* Tue Nov 07 2006 Francois Aucamp  - 1.16-4
- Modified patch steps to create backups with different suffixes
- Renamed patch file extensions to .patch
- Added step in %%install to remove patch backup files in documentation

* Sat Nov 04 2006 Francois Aucamp  - 1.16-3
- Fixed source file permissions for -debuginfo package in %%prep
- Added RPM_OPT_FLAGS to "make" command in %%build; removed RPM_OPT_FLAGS makefile patch
- Modified makefile install target patch to include general support for setting compiler optimization flags via CXXFLAGS
- Removed creation of .orig backup files during patching
- Modified patch files to have different suffixes

* Thu Nov 02 2006 Francois Aucamp  - 1.16-2
- Added "install" target to makefile (makefile_install_target.patch)
- Added patch to fix AMD64 sizeof(char *) assumption bug (upstream request ID 1588938)
- Changed "portaudio" BuildRequires to "portaudio-devel"
- Added patch to makefile to allow RPM_OPT_FLAGS
- Added patch to replace all references to "speak" binary with "espeak"
- Moved header files to /usr/include/espeak
- Added rmdir command to "install" to remove empty soundicons directory

* Wed Oct 04 2006 Francois Aucamp  - 1.16-1
- Initial RPM build


espeak_program_name.patch:

--- NEW FILE espeak_program_name.patch ---
diff -uNr espeak-1.16-source/docs/add_language.html espeak-1.16-source-mod/docs/add_language.html
--- espeak-1.16-source/docs/add_language.html	2006-09-21 12:38:29.000000000 +0200
+++ espeak-1.16-source-mod/docs/add_language.html	2006-11-02 20:05:44.000000000 +0200
@@ -77,7 +77,7 @@
 of two source files: en_rules (the spelling to phoneme rules) and
 en_list (an exceptions list, and attributes of certain words). The corresponding compiled data
 file is espeak-data/en_dict which is produced from en_rules
-and en_list sources by the command: speak  --compile=en.
        
+and en_list sources by the command: espeak  --compile=en.
        
 
        Details of the contents of the
 dictionary files are given in dictionary.html.
        
 
        The en_list file contains not
@@ -110,7 +110,7 @@
 voices file.
        
 
        
 
        6.5 Program Code
        
-
        The behaviour of the speak program is
+
        The behaviour of the espeak program is
 controlled by various options (eg. whether words are stressed on the first,
 last, or penultimate syllable). The function SetTranslator() at the
 start of the tr_languages.cpp file recognizes the language
@@ -129,4 +129,4 @@
 
        
 
 
-
\ No newline at end of file
+
diff -uNr espeak-1.16-source/docs/commands.html espeak-1.16-source-mod/docs/commands.html
--- espeak-1.16-source/docs/commands.html	2006-09-21 12:38:47.000000000 +0200
+++ espeak-1.16-source-mod/docs/commands.html	2006-11-02 20:01:50.000000000 +0200
@@ -11,47 +11,47 @@
 
        
 
        2.1 INSTALLATION
        
 
        
-Place the "speak" executable file in the command path, eg in /usr/local/bin
+Place the "espeak" executable file in the command path, eg in /usr/local/bin
 
        
 Place the "espeak-data" directory in /usr/share as /usr/share/espeak-data.
        
 Alternatively if it is placed in the user's home directory (i.e. /home/<user>/espeak-data)
 then that will be used instead.
 
        
 
        Dependencies
        
-speak uses the PortAudio sound library (version 18), so you will need to have the libportaudio0 library package installed.  It may be already, since it's used by other software, such as OpenOffice.org and the Audacity sound editor.
        
-Some Linux distrubitions (eg. SuSe 10) have version 19 of PortAudio which has a slightly different API. The speak program can be compiled to use version 19 of PortAudio by copying the file portaudio19.h to portaudio.h before compiling.
        
- The speak program may be compiled without using PortAudio, by removing the line
           #define USE_PORTAUDIO
+espeak uses the PortAudio sound library (version 18), so you will need to have the libportaudio0 library package installed.  It may be already, since it's used by other software, such as OpenOffice.org and the Audacity sound editor.
        
+Some Linux distrubitions (eg. SuSe 10) have version 19 of PortAudio which has a slightly different API. The espeak program can be compiled to use version 19 of PortAudio by copying the file portaudio19.h to portaudio.h before compiling.
        
+ The espeak program may be compiled without using PortAudio, by removing the line
           #define USE_PORTAUDIO
 
        in the file speech.h. 
 
         
        
 
        2.2 COMMAND OPTIONS
        
 
        
 
        2.2.1 Examples
        
 To use at the command line, type:
        
-   speak "This is a test"
        
+   espeak "This is a test"
        
 or
        
-   speak -f <text file>
+   espeak -f <text file>
 
        
 Or just type
        
-   speak
        
+   espeak
        
 followed by text on subsequent lines. Each line is spoken when
-RETURN is pressed.
        Use speak -x to see the corresponding phoneme codes.
+RETURN is pressed.
        Use espeak -x to see the corresponding phoneme codes.
 
         
        
 
        2.2.2 Use with KDE Text-to-Speech (KTTS)
        
 To add to KDE-Text-to-Speech Manager (KTTSMgr), use it as a "Command" talker
 with "command for speaking texts" set to:
        
-   cat %f | speak --stdin -w %w
+   cat %f | espeak --stdin -w %w
 
        
 Note:
 
          
-
        • When used by the KTTS system, I noticed a slight background hiss with the speech, which is not present when I use speak directly from the command line. This was because KDE sound default was set to "8 bits" rather than 16 bits.
-
        • KTTSMgr breaks the text into sentences to pass to the speech engine, but it mistakenly assumes sentence breaks when dots follow abbreviations and therefore pauses after the dots in "eg. Mr. John B. Smith etc."  Speaking a text file directly with speak gives better results in this respect.
-
        • Speaking text from a web page using KTTS often causes headings and image captions to be run together with the following text as a single sentence.  Speaking the HTML directly  with the -m option set (i.e. using speak -m -f text.html), may help if this is a problem. 
+
        • When used by the KTTS system, I noticed a slight background hiss with the speech, which is not present when I use espeak directly from the command line. This was because KDE sound default was set to "8 bits" rather than 16 bits.
+
        • KTTSMgr breaks the text into sentences to pass to the speech engine, but it mistakenly assumes sentence breaks when dots follow abbreviations and therefore pauses after the dots in "eg. Mr. John B. Smith etc."  Speaking a text file directly with espeak gives better results in this respect.
+
        • Speaking text from a web page using KTTS often causes headings and image captions to be run together with the following text as a single sentence.  Speaking the HTML directly  with the -m option set (i.e. using espeak -m -f text.html), may help if this is a problem. 
 
        
 
         
        
 
        2.2.3 The Command Line Options
        
 
        
 
        
-speak [options] ["words"]
        
+espeak [options] ["words"]
        
 
        Text input can be taken either from a file, from a string in the command, or from stdin.
 
        
 
        
@@ -118,7 +118,7 @@
 
        
 
        --compile[=<voice name>]
        
 
        
-Compile the pronunciation rule and dictionary lookup data from their source files in the current directory.  The Voice determines which language's files are compiled.  For example, if it's an English voice, then en_rules, en_list, and en_extra (if present), are compiled to replace en_dict  in the speak-data directory.  If no Voice is specified then the default Voice is used.
+Compile the pronunciation rule and dictionary lookup data from their source files in the current directory.  The Voice determines which language's files are compiled.  For example, if it's an English voice, then en_rules, en_list, and en_extra (if present), are compiled to replace en_dict  in the espeak-data directory.  If no Voice is specified then the default Voice is used.
 
        
 
        --punct[="<characters>"]
        
 
        
@@ -134,7 +134,7 @@
 
        2.2.4 The Input Text
        
 If the -m option is used to indicate marked-up text, then HTML can be spoken directly.
 
        
-As well as plain text, phoneme mnemonics can be used in the text input to speak.  They are enclosed within double square brackets.  Spaces are used to separate words and all stressed syllables must be marked explicitly.
        
+As well as plain text, phoneme mnemonics can be used in the text input to espeak.  They are enclosed within double square brackets.  Spaces are used to separate words and all stressed syllables must be marked explicitly.
        
    eg: [[D,Is Iz sVm f at n'EtIk t'Ekst 'InpUt]]
 
        
 
diff -uNr espeak-1.16-source/docs/index.html espeak-1.16-source-mod/docs/index.html
--- espeak-1.16-source/docs/index.html	2006-09-21 12:27:13.000000000 +0200
+++ espeak-1.16-source-mod/docs/index.html	2006-11-02 19:59:19.000000000 +0200
@@ -57,7 +57,7 @@
 
        
 speak was originally written for Acorn/RISC_OS computers starting in 1995. This version is an update and re-write, including a relaxation of the original memory and processing power constraints, and with support for additional languages if anyone is interested in doing so.
 
        
-The project name speak had already been taken by another project on SourceForge (for a Windows TTS front-end) so I added a letter 'e' to the front to make eSpeak.  For now, the program executable remains speak and is referred to as such in the documentation.
+The project name speak had already been taken by another project on SourceForge (for a Windows TTS front-end) so I added a letter 'e' to the front to make espeak.
 
     
      
diff -uNr espeak-1.16-source/docs/languages.html espeak-1.16-source-mod/docs/languages.html
--- espeak-1.16-source/docs/languages.html	2006-09-21 12:40:37.000000000 +0200
+++ espeak-1.16-source-mod/docs/languages.html	2006-11-02 20:03:17.000000000 +0200
@@ -27,8 +27,8 @@
 
 A number of Voice files are provided in the espeak-data/voices directory.
 You can select one of these with the -v <voice filename> parameter to the
-speak command, eg:
-
         speak -vaf
      
+espeak command, eg:
+
         espeak -vaf
      
 to speak using the Afrikaans voice.
 
      
 For details of the voice files see Voices.
@@ -37,7 +37,7 @@
 
      
 
      
 default
      
-
         This voice is used if none is specified in the speak command.  Copy your preferred voice to "default" so you can use the speak command without the need to specify a voice.
      
+
         This voice is used if none is specified in the espeak command.  Copy your preferred voice to "default" so you can use the espeak command without the need to specify a voice.
      
 
      
 
 
      3.2 English Voices
      
diff -uNr espeak-1.16-source/docs/phonemes.html espeak-1.16-source-mod/docs/phonemes.html
--- espeak-1.16-source/docs/phonemes.html	2006-09-21 12:40:52.000000000 +0200
+++ espeak-1.16-source-mod/docs/phonemes.html	2006-11-02 20:06:23.000000000 +0200
@@ -23,7 +23,7 @@
 
      
 The phoneme mnemonics are based on the scheme by Kirschenbaum: www.kirshenbaum.net/IPA/ascii-ipa.pdf, which gives the International Phonetic Alphabet equivalents.
 
      
-Phoneme mnemonics can be used directly in the text input to speak.  They are enclosed within double square brackets.  Spaces are used to separate words and all stressed syllables must be marked explicitly. eg:
      
+Phoneme mnemonics can be used directly in the text input to espeak.  They are enclosed within double square brackets.  Spaces are used to separate words and all stressed syllables must be marked explicitly. eg:
      
 [[D,Is Iz sVm f at n'EtIk t'Ekst 'InpUt]]
 
        
 
      [% keyword.description %][% keyword.description FILTER html_light %]
     
       [% IF keyword.bugcount > 0 %]
         
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/request/email.txt.tmpl bugzilla-2.22.1/template/en/default/request/email.txt.tmpl
--- bugzilla-2.22/template/en/default/request/email.txt.tmpl	2005-12-29 16:32:37.000000000 -0800
+++ bugzilla-2.22.1/template/en/default/request/email.txt.tmpl	2006-07-05 19:20:08.000000000 -0700
@@ -61,7 +61,7 @@
 [%- FILTER bullet = wrap(80) %]
 
 [% USE Bugzilla %]
-[% IF Bugzilla.cgi.param("comment").length > 0 %]
+[% IF Bugzilla.cgi.param("comment") && Bugzilla.cgi.param("comment").length > 0 %]
 ------- Additional Comments from [% user.identity %]
 [%+ Bugzilla.cgi.param("comment") %]
 [% END %]
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl
--- bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl	2004-12-10 16:27:45.000000000 -0800
+++ bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl	2006-06-07 14:34:35.000000000 -0700
@@ -46,7 +46,7 @@
 
   
      
     
-      Advanced Searching Using Boolean Charts:
+      Advanced Searching Using Boolean Charts:
     
   
      
 
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl
--- bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl	2005-04-11 15:34:50.000000000 -0700
+++ bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl	2006-05-22 17:22:29.000000000 -0700
@@ -33,7 +33,7 @@
 
 [% PROCESS global/header.html.tmpl 
   title = "Create New Data Set"
-  onload = "selectProduct(document.forms['chartform']);"
+  onload = "doOnSelectProduct(0);"
   javascript = js_data 
   javascript_urls = [ "js/productform.js" ]
 %]
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/whine/schedule.html.tmpl bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl
--- bugzilla-2.22/template/en/default/whine/schedule.html.tmpl	2005-09-12 07:03:01.000000000 -0700
+++ bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl	2006-10-14 15:05:59.000000000 -0700
@@ -82,6 +82,7 @@
 
 
+
 
 [% FOREACH event = events %]
 
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/testserver.pl bugzilla-2.22.1/testserver.pl
--- bugzilla-2.22/testserver.pl	2006-01-05 03:07:01.000000000 -0800
+++ bugzilla-2.22.1/testserver.pl	2006-07-24 23:21:07.000000000 -0700
@@ -14,7 +14,7 @@
 # Contributor(s): Joel Peshkin 
 #                 Byron Jones 
 
-# testserver.pl is involked with the baseurl of the Bugzilla installation
+# testserver.pl is invoked with the baseurl of the Bugzilla installation
 # as its only argument.  It attempts to troubleshoot as many installation
 # issues as possible.
 
@@ -194,6 +194,14 @@
             print "TEST-FAILED Chart returned: $@\n";
         }
     }
+
+    eval 'use Template::Plugin::GD::Image';
+    if ($@) {
+        print "TEST-FAILED Template::Plugin::GD is not installed.\n";
+    }
+    else {
+        print "TEST-OK Template::Plugin::GD is installed.\n";
+    }
 }
 
 sub fetch {
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/token.cgi bugzilla-2.22.1/token.cgi
--- bugzilla-2.22/token.cgi	2005-10-24 16:11:55.000000000 -0700
+++ bugzilla-2.22.1/token.cgi	2006-09-22 16:25:51.000000000 -0700
@@ -67,9 +67,8 @@
   $::token = $cgi->param('t');
   
   # Make sure the token contains only valid characters in the right amount.
-  # Validate password will throw an error if token is invalid
+  # ValidatePassword will throw an error if token is invalid
   ValidatePassword($::token);
-  trick_taint($::token); # Only used in placeholders
 
   Bugzilla::Token::CleanTokenTable();
 
@@ -98,9 +97,11 @@
 
 # If the user is requesting a password change, make sure they submitted
 # their login name and it exists in the database, and that the DB module is in
-# the list of allowed verification methids.
+# the list of allowed verification methods.
+my $login_name;
 if ( $::action eq 'reqpw' ) {
-    defined $cgi->param('loginname')
+    $login_name = $cgi->param('loginname');
+    defined $login_name
       || ThrowUserError("login_needed_for_password_change");
 
     # check verification methods
@@ -108,27 +109,25 @@
         ThrowUserError("password_change_requests_not_allowed");
     }
 
-    # Make sure the login name looks like an email address.
-    validate_email_syntax($cgi->param('loginname'))
-      || ThrowUserError('illegal_email_address',
-                        {addr => $cgi->param('loginname')});
+    validate_email_syntax($login_name)
+      || ThrowUserError('illegal_email_address', {addr => $login_name});
 
-    my $loginname = $cgi->param('loginname');
-    trick_taint($loginname); # Used only in a placeholder
     my ($user_id) = $dbh->selectrow_array('SELECT userid FROM profiles WHERE ' .
                                           $dbh->sql_istrcmp('login_name', '?'),
-                                          undef, $loginname);
+                                          undef, $login_name);
     $user_id || ThrowUserError("account_inexistent");
 }
 
 # If the user is changing their password, make sure they submitted a new
 # password and that the new password is valid.
+my $password;
 if ( $::action eq 'chgpw' ) {
-    defined $cgi->param('password')
+    $password = $cgi->param('password');
+    defined $password
       && defined $cgi->param('matchpassword')
       || ThrowUserError("require_new_password");
 
-    ValidatePassword($cgi->param('password'), $cgi->param('matchpassword'));
+    ValidatePassword($password, $cgi->param('matchpassword'));
 }
 
 ################################################################################
@@ -140,13 +139,13 @@
 # that variable and runs the appropriate code.
 
 if ($::action eq 'reqpw') { 
-    requestChangePassword(); 
+    requestChangePassword($login_name);
 } elsif ($::action eq 'cfmpw') { 
     confirmChangePassword(); 
 } elsif ($::action eq 'cxlpw') { 
     cancelChangePassword(); 
 } elsif ($::action eq 'chgpw') { 
-    changePassword(); 
+    changePassword($password);
 } elsif ($::action eq 'cfmem') {
     confirmChangeEmail();
 } elsif ($::action eq 'cxlem') {
@@ -167,7 +166,8 @@
 ################################################################################
 
 sub requestChangePassword {
-    Bugzilla::Token::IssuePasswordToken($cgi->param('loginname'));
+    my ($login_name) = @_;
+    Bugzilla::Token::IssuePasswordToken($login_name);
 
     $vars->{'message'} = "password_change_request";
 
@@ -194,11 +194,11 @@
 }
 
 sub changePassword {
+    my ($password) = @_;
     my $dbh = Bugzilla->dbh;
 
     # Create a crypted version of the new password
-    my $cryptedpassword = bz_crypt($cgi->param('password'));
-    trick_taint($cryptedpassword); # Used only in a placeholder
+    my $cryptedpassword = bz_crypt($password);
 
     # Get the user's ID from the tokens table.
     my ($userid) = $dbh->selectrow_array('SELECT userid FROM tokens
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/votes.cgi bugzilla-2.22.1/votes.cgi
--- bugzilla-2.22/votes.cgi	2005-10-24 16:11:55.000000000 -0700
+++ bugzilla-2.22.1/votes.cgi	2006-10-13 06:01:57.000000000 -0700
@@ -358,7 +358,8 @@
     $dbh->bz_unlock_tables();
 
     $vars->{'type'} = "votes";
-    $vars->{'mailrecipients'} = { 'changer' => $who };
+    $vars->{'mailrecipients'} = { 'changer' => Bugzilla->user->login };
+    $vars->{'title_tag'} = 'change_votes';
 
     foreach my $bug_id (@updated_bugs) {
         $vars->{'id'} = $bug_id;


Index: bugzilla.spec
===================================================================
RCS file: /cvs/extras/rpms/bugzilla/FC-4/bugzilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bugzilla.spec	27 Jun 2006 12:53:05 -0000	1.2
+++ bugzilla.spec	10 Nov 2006 00:54:12 -0000	1.3
@@ -6,13 +6,14 @@
 Name: bugzilla
 Version: 2.22
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MPL
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-data-dir.patch
 Patch1: bugzilla-config-path.patch
+Patch2: bugzilla-bz212355-fixvuln.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: smtpdaemon, webserver, graphviz, patchutils
@@ -40,6 +41,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
@@ -125,6 +127,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Wed Nov  8 2006 John Berninger  - 2.22-7
+- Bz 212355 - fix multiple vulns
+
 * Tue Jun 26 2006 John Berninger  - 2.22-6
 - Clean up BugzillaEmail requires (filter it out)
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:58:01 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:58:01 -0700
Subject: rpms/mod_suphp/FC-6 mod_suphp.spec,1.11,1.12
Message-ID: <200611100058.kAA0w1XJ007244@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7194/FC-6

Modified Files:
	mod_suphp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/



Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-6/mod_suphp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_suphp.spec	10 Sep 2006 21:04:32 -0000	1.11
+++ mod_suphp.spec	10 Nov 2006 00:57:30 -0000	1.12
@@ -25,7 +25,7 @@
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -60,6 +60,7 @@
 %patch0 -p 1 -b .userdir
 %patch1 -p 1 -b .AddHandler
 %patch3 -p 1 -b .chroot
+%patch4 -p 1 -b .double-free
 
 # Patch source to conform to apr 1.x standards
 %if "%{fedora}" >= "5"
@@ -127,11 +128,14 @@
 
 
 %changelog
-* Fri Sep 08 2006 Andreas Thienemann  0.6.1-3
+* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
+- Fix double free corruption. For real this time. :-/
+
+* Fri Sep 08 2006 Andreas Thienemann  - 0.6.1-3
 - Finally fixed double free corruption #192415
 - Fixed up configuration creation
 
-* Wed May 24 2006 Andreas Thienemann  0.6.1-2
+* Wed May 24 2006 Andreas Thienemann  - 0.6.1-2
 - Corrected handler for mod_suphp.conf
 - Minor cleanups and fixes
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:58:01 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:58:01 -0700
Subject: rpms/mod_suphp/devel mod_suphp.spec,1.11,1.12
Message-ID: <200611100058.kAA0w12c007247@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7194/devel

Modified Files:
	mod_suphp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/



Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_suphp.spec	10 Sep 2006 21:04:32 -0000	1.11
+++ mod_suphp.spec	10 Nov 2006 00:57:31 -0000	1.12
@@ -25,7 +25,7 @@
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -60,6 +60,7 @@
 %patch0 -p 1 -b .userdir
 %patch1 -p 1 -b .AddHandler
 %patch3 -p 1 -b .chroot
+%patch4 -p 1 -b .double-free
 
 # Patch source to conform to apr 1.x standards
 %if "%{fedora}" >= "5"
@@ -127,11 +128,14 @@
 
 
 %changelog
-* Fri Sep 08 2006 Andreas Thienemann  0.6.1-3
+* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
+- Fix double free corruption. For real this time. :-/
+
+* Fri Sep 08 2006 Andreas Thienemann  - 0.6.1-3
 - Finally fixed double free corruption #192415
 - Fixed up configuration creation
 
-* Wed May 24 2006 Andreas Thienemann  0.6.1-2
+* Wed May 24 2006 Andreas Thienemann  - 0.6.1-2
 - Corrected handler for mod_suphp.conf
 - Minor cleanups and fixes
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:58:00 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:58:00 -0700
Subject: rpms/mod_suphp/FC-5 mod_suphp.conf, 1.1, 1.2 mod_suphp.spec, 1.10,
	1.11
Message-ID: <200611100058.kAA0w00g007241@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7194/FC-5

Modified Files:
	mod_suphp.conf mod_suphp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/



Index: mod_suphp.conf
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-5/mod_suphp.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_suphp.conf	6 Feb 2006 16:40:00 -0000	1.1
+++ mod_suphp.conf	10 Nov 2006 00:57:30 -0000	1.2
@@ -5,18 +5,14 @@
 
 LoadModule suphp_module modules/mod_suphp.so
 
-# Define PHP Types
-AddType application/x-httpd-php .php
-
 # To use suPHP to parse PHP-Files
-### Uncomment to activate mod_suphp
-#AddHandler x-httpd-php .php
 
 # This option tells mod_suphp if a PHP-script requested on this server (or
 # VirtualHost) should be run with the PHP-interpreter or returned to the
 # browser "as it is".
-suPHP_Engine on
-suPHP_AddHandler x-httpd-php
+### Uncomment to activate mod_suphp
+#suPHP_Engine on
+#suPHP_AddHandler x-httpd-php
 
 # This option tells mod_suphp which path to pass on to the PHP-interpreter
 # (by setting the PHPRC environment variable).


Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-5/mod_suphp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_suphp.spec	6 Feb 2006 23:44:45 -0000	1.10
+++ mod_suphp.spec	10 Nov 2006 00:57:30 -0000	1.11
@@ -1,26 +1,31 @@
-# Depending on what version of Fedora we're on, use a different php binary
+# Depending on what version of Fedora we're on, use a different php binary, different apr
+# and also different handler.
 %if 0%{?fedora}
    %if "%{fedora}" >= "5"
       %define php /usr/bin/php-cgi
+      %define handler php5-script
       %define apr /usr/bin/apr-1-config
    %endif
    %if "%{fedora}" == "4"
       %define php /usr/bin/php-cgi
+      %define handler x-httpd-php
       %define apr /usr/bin/apr-config
    %endif
    %if "%{fedora}" <= "3"
       %define php /usr/bin/php
+      %define handler x-httpd-php
       %define apr /usr/bin/apr-config
    %endif
 %else
    %define php /usr/bin/php
+      %define handler x-httpd-php
    %define apr /usr/bin/apr-config
 %endif
 
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.1
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -30,30 +35,47 @@
 Patch0: mod_suphp-0.6.1-userdir.patch
 Patch1: mod_suphp-0.6.1-AddHandler.patch
 Patch2: mod_suphp-0.6.1-apr.patch
+Patch3: mod_suphp-0.6.1-chroot.patch
+Patch4: mod_suphp-0.6.1-DoubleFree.patch
 URL: http://www.suphp.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.0, php
 Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
+Requires(post): policycoreutils
+Requires(postun): policycoreutils
 BuildRequires: httpd-devel >= 2.0, apr-devel
 
+
 %description
 suPHP is an apache module for executing PHP scripts with the permissions of
 their owners. It consists of an Apache module (mod_suphp) and a setuid root
 binary (suphp) that is called by the Apache module to change the uid of the
 process executing the PHP interpreter.
 
+Please take a look at %{_docdir}/%{name}-%{version}/README.fedora for 
+installation instructions.
+
 %prep
 %setup -q -n suphp-%{version}
 %patch0 -p 1 -b .userdir
 %patch1 -p 1 -b .AddHandler
+%patch3 -p 1 -b .chroot
+%patch4 -p 1 -b .double-free
 
 # Patch source to conform to apr 1.x standards
 %if "%{fedora}" >= "5"
 %patch2 -p 0 -b .apr
 %endif
 
+# fill placeholders
+sed -e 's|###PHP-BIN###|%{php}|g; s|###HANDLER###|%{handler}|g;' %{SOURCE1} > suphp.conf
+sed -e 's|###HANDLER###|%{handler}|g;' %{SOURCE2} > mod_suphp.conf
+sed -e 's|###HANDLER###|%{handler}|g;' %{SOURCE3} > README.fedora
+
+
 %build
 echo "Building mod_suphp with %{php} as PHP interpreter and %{apr} for the apr configuration script."
+echo "%{handler} is used as a AddHandler."
 %configure \
 	--with-apr=%{apr} \
 	--with-apxs=/usr/sbin/apxs \
@@ -73,6 +95,7 @@
 mv .libs/mod_suphp.so .
 popd
 
+
 %install
 rm -rf %{buildroot}
 
@@ -80,27 +103,42 @@
 %{__install} -m 755 -D src/apache2/mod_suphp.so %{buildroot}%{_libdir}/httpd/modules/mod_suphp.so
 
 # Install the config files
-sed -e 's@###PHP-BIN###@%{php}@' %{SOURCE1} > suphp.conf
 %{__install} -m 644 -D suphp.conf %{buildroot}%{_sysconfdir}/suphp.conf
-%{__install} -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf
+%{__install} -m 644 -D mod_suphp.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf
 
 # Rename docs
 cp doc/CONFIG CONFIG.suphp
 cp doc/apache/CONFIG CONFIG.apache
-cp %{SOURCE3} README.fedora
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+
+%postun
+
 %files
 %defattr(-,root,root)
 %doc README COPYING CONFIG.suphp CONFIG.apache README.fedora
-%attr (4755, root, root) %{_sbindir}/suphp
+%attr (4550, root, root) %{_sbindir}/suphp
 %{_libdir}/httpd/modules/*.so
 %config(noreplace) %{_sysconfdir}/suphp.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_suphp.conf
 
+
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
+- Fix double free corruption. For real this time. :-/
+
+* Fri Sep 08 2006 Andreas Thienemann  - 0.6.1-3
+- Finally fixed double free corruption #192415
+- Fixed up configuration creation
+
+* Wed May 24 2006 Andreas Thienemann  - 0.6.1-2
+- Corrected handler for mod_suphp.conf
+- Minor cleanups and fixes
+
 * Mon Feb 06 2006 Andreas Thienemann  0.6.1-1
 - Updated to 0.6.1
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:09:59 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:09:59 -0700
Subject: rpms/mboxgrep/FC-5 mboxgrep-debug.diff,NONE,1.1
Message-ID: <200611100109.kAA19xrM010753@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10744/FC-5

Added Files:
	mboxgrep-debug.diff 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files


mboxgrep-debug.diff:

--- NEW FILE mboxgrep-debug.diff ---
--- mboxgrep-0.7.9/src/Makefile.in.orig	2006-11-10 02:06:29.000000000 +0100
+++ mboxgrep-0.7.9/src/Makefile.in	2006-11-10 02:06:35.000000000 +0100
@@ -52,6 +52,6 @@
 .PHONY: install
 install: mboxgrep
 	$(INSTALL) -d $(prefix)/bin
-	$(INSTALL) -s $(TARGET) $(prefix)/bin
+	$(INSTALL) $(TARGET) $(prefix)/bin
 
 .NOEXPORT:



From fedora-extras-commits at redhat.com  Fri Nov 10 01:10:05 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:10:05 -0700
Subject: rpms/mboxgrep/FC-6 mboxgrep-debug.diff,NONE,1.1
Message-ID: <200611100110.kAA1A5fq010770@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10744/FC-6

Added Files:
	mboxgrep-debug.diff 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files


mboxgrep-debug.diff:

--- NEW FILE mboxgrep-debug.diff ---
--- mboxgrep-0.7.9/src/Makefile.in.orig	2006-11-10 02:06:29.000000000 +0100
+++ mboxgrep-0.7.9/src/Makefile.in	2006-11-10 02:06:35.000000000 +0100
@@ -52,6 +52,6 @@
 .PHONY: install
 install: mboxgrep
 	$(INSTALL) -d $(prefix)/bin
-	$(INSTALL) -s $(TARGET) $(prefix)/bin
+	$(INSTALL) $(TARGET) $(prefix)/bin
 
 .NOEXPORT:



From fedora-extras-commits at redhat.com  Fri Nov 10 01:10:41 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:10:41 -0700
Subject: rpms/mboxgrep/devel mboxgrep-debug.diff, NONE, 1.1 mboxgrep.spec,
	1.2, 1.3
Message-ID: <200611100110.kAA1Af3d010807@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10744/devel

Modified Files:
	mboxgrep.spec 
Added Files:
	mboxgrep-debug.diff 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files


mboxgrep-debug.diff:

--- NEW FILE mboxgrep-debug.diff ---
--- mboxgrep-0.7.9/src/Makefile.in.orig	2006-11-10 02:06:29.000000000 +0100
+++ mboxgrep-0.7.9/src/Makefile.in	2006-11-10 02:06:35.000000000 +0100
@@ -52,6 +52,6 @@
 .PHONY: install
 install: mboxgrep
 	$(INSTALL) -d $(prefix)/bin
-	$(INSTALL) -s $(TARGET) $(prefix)/bin
+	$(INSTALL) $(TARGET) $(prefix)/bin
 
 .NOEXPORT:


Index: mboxgrep.spec
===================================================================
RCS file: /cvs/extras/rpms/mboxgrep/devel/mboxgrep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mboxgrep.spec	8 Sep 2006 17:37:02 -0000	1.2
+++ mboxgrep.spec	10 Nov 2006 01:10:11 -0000	1.3
@@ -1,10 +1,11 @@
 Summary: Displays e-mail messages matching a pattern
 Name: mboxgrep
 Version: 0.7.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz
+Patch0: mboxgrep-debug.diff
 URL: http://www.mboxgrep.org
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, bzip2-devel, pcre-devel
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .debug
 
 %build
 %configure
@@ -49,6 +51,9 @@
 %{_infodir}/mboxgrep.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
+- Fixed up debug package to actually contain debugging files
+
 * Fri Sep 08 2006 Andreas Thienemann  - 0.7.9-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:12:09 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:12:09 -0700
Subject: rpms/mboxgrep/FC-5 mboxgrep.spec,1.1,1.2
Message-ID: <200611100112.kAA1C9wA011086@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11056/FC-5

Modified Files:
	mboxgrep.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files



Index: mboxgrep.spec
===================================================================
RCS file: /cvs/extras/rpms/mboxgrep/FC-5/mboxgrep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mboxgrep.spec	4 May 2006 03:22:55 -0000	1.1
+++ mboxgrep.spec	10 Nov 2006 01:11:39 -0000	1.2
@@ -1,10 +1,11 @@
 Summary: Displays e-mail messages matching a pattern
 Name: mboxgrep
 Version: 0.7.9
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz
+Patch0: mboxgrep-debug.diff
 URL: http://www.mboxgrep.org
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, bzip2-devel, pcre-devel
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .debug
 
 %build
 %configure
@@ -49,6 +51,12 @@
 %{_infodir}/mboxgrep.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
+- Fixed up debug package to actually contain debugging files
+
+* Fri Sep 08 2006 Andreas Thienemann  - 0.7.9-3
+- FE6 Rebuild
+
 * Wed Mar 29 2006 Andreas Thienemann  0.7.9-2
 - Cleaned up for FE
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:12:10 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:12:10 -0700
Subject: rpms/mboxgrep/FC-6 mboxgrep.spec,1.2,1.3
Message-ID: <200611100112.kAA1CAVj011089@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11056/FC-6

Modified Files:
	mboxgrep.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files



Index: mboxgrep.spec
===================================================================
RCS file: /cvs/extras/rpms/mboxgrep/FC-6/mboxgrep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mboxgrep.spec	8 Sep 2006 17:37:02 -0000	1.2
+++ mboxgrep.spec	10 Nov 2006 01:11:40 -0000	1.3
@@ -1,10 +1,11 @@
 Summary: Displays e-mail messages matching a pattern
 Name: mboxgrep
 Version: 0.7.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz
+Patch0: mboxgrep-debug.diff
 URL: http://www.mboxgrep.org
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, bzip2-devel, pcre-devel
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .debug
 
 %build
 %configure
@@ -49,6 +51,9 @@
 %{_infodir}/mboxgrep.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
+- Fixed up debug package to actually contain debugging files
+
 * Fri Sep 08 2006 Andreas Thienemann  - 0.7.9-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:15:11 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:15:11 -0700
Subject: rpms/mod_suphp/FC-5 mod_suphp-0.6.1-DoubleFree.patch,NONE,1.1
Message-ID: <200611100115.kAA1FBmV011352@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11345

Added Files:
	mod_suphp-0.6.1-DoubleFree.patch 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/


mod_suphp-0.6.1-DoubleFree.patch:

--- NEW FILE mod_suphp-0.6.1-DoubleFree.patch ---
diff -urNp suphp-0.6.1.orig/src/API_Linux.cpp suphp-0.6.1/src/API_Linux.cpp
--- suphp-0.6.1.orig/src/API_Linux.cpp	2006-06-19 18:39:17.000000000 +0100
+++ suphp-0.6.1/src/API_Linux.cpp	2006-06-19 18:37:38.000000000 +0100
@@ -42,7 +42,7 @@ extern char **environ;
 
 using namespace suPHP;
 
-SmartPtr suPHP::API_Linux::logger;
+SmartPtr* suPHP::API_Linux::logger;
 
 bool suPHP::API_Linux::isSymlink(const std::string path) const
     throw (SystemException) {
@@ -139,10 +139,10 @@ GroupInfo suPHP::API_Linux::getRealProce
 
 
 Logger& suPHP::API_Linux::getSystemLogger() {
-    if (suPHP::API_Linux::logger.get() == NULL) {
-	suPHP::API_Linux::logger.reset(new API_Linux_Logger());
+    if (suPHP::API_Linux::logger->get() == NULL) {
+	suPHP::API_Linux::logger->reset(new API_Linux_Logger());
     }
-    return *(suPHP::API_Linux::logger);
+    return **(suPHP::API_Linux::logger);
 }
 
 
diff -urNp suphp-0.6.1.orig/src/API_Linux.hpp suphp-0.6.1/src/API_Linux.hpp
--- suphp-0.6.1.orig/src/API_Linux.hpp	2006-06-19 18:39:17.000000000 +0100
+++ suphp-0.6.1/src/API_Linux.hpp	2006-06-19 18:43:23.000000000 +0100
@@ -41,9 +41,10 @@ namespace suPHP {
      */
     class API_Linux : public API {
     private:
-	static SmartPtr logger;
+	/* Try and avoid the "static initialization order fiasco" */
+	static SmartPtr* logger;
 	/**
-	 * Internal function for checking wheter path
+	 * Internal function for checking whether path
 	 * points to a symlink
 	 */
 	bool isSymlink(const std::string path) const 
@@ -57,6 +58,25 @@ namespace suPHP {
 
     public:
 	/**
+	 * Constructor
+	 */
+	API_Linux() {
+		logger = NULL;
+		logger = new SmartPtr;
+	};
+
+	/**
+	 * Destructor
+	 */
+	~API_Linux() {
+		if (logger != NULL) {
+			delete logger;
+		}
+		logger = NULL;
+	};
+	
+	
+	/**
 	 * Get environment variable
 	 */
 	virtual Environment getProcessEnvironment();



From fedora-extras-commits at redhat.com  Fri Nov 10 01:19:16 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:19:16 -0700
Subject: rpms/ddrescue/FC-6 dd_rescue.spec,1.1,1.2
Message-ID: <200611100119.kAA1JGBd011444@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11412/FC-6

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
- Fix debug package



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/FC-6/dd_rescue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dd_rescue.spec	8 Sep 2006 17:16:26 -0000	1.1
+++ dd_rescue.spec	10 Nov 2006 01:18:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        1
+Release:        2
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}/usr INSTASROOT=""
+make install DESTDIR=%{buildroot}/usr INSTASROOT="" INSTALLFLAGS=""
 pushd dd_rhelp-%{rhelp_version}/
 make install DESTDIR=%{buildroot}
 popd
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
+- Fix debug package
+
 * Fri Sep 08 2006 Andreas Thienemann  - 1.12-1
 - Updated to 1.12
 - Finally updated the package name to what we are actually shipping, 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:19:17 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:19:17 -0700
Subject: rpms/ddrescue/devel dd_rescue.spec,1.1,1.2
Message-ID: <200611100119.kAA1JHBO011447@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11412/devel

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
- Fix debug package



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/devel/dd_rescue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dd_rescue.spec	8 Sep 2006 17:16:26 -0000	1.1
+++ dd_rescue.spec	10 Nov 2006 01:18:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        1
+Release:        2
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}/usr INSTASROOT=""
+make install DESTDIR=%{buildroot}/usr INSTASROOT="" INSTALLFLAGS=""
 pushd dd_rhelp-%{rhelp_version}/
 make install DESTDIR=%{buildroot}
 popd
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
+- Fix debug package
+
 * Fri Sep 08 2006 Andreas Thienemann  - 1.12-1
 - Updated to 1.12
 - Finally updated the package name to what we are actually shipping, 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:22:04 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:22:04 -0700
Subject: rpms/ddrescue/devel dd_rescue.spec,1.2,1.3
Message-ID: <200611100122.kAA1M4WO011585@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11569

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
- *bump*



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/devel/dd_rescue.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dd_rescue.spec	10 Nov 2006 01:18:46 -0000	1.2
+++ dd_rescue.spec	10 Nov 2006 01:21:34 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        2
+Release:        3
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -56,7 +56,10 @@
 
 
 %changelog
-* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
+- *bump*
+
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-2
 - Fix debug package
 
 * Fri Sep 08 2006 Andreas Thienemann  - 1.12-1



From fedora-extras-commits at redhat.com  Fri Nov 10 01:23:31 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:23:31 -0700
Subject: rpms/ddrescue/FC-6 dd_rescue.spec,1.2,1.3
Message-ID: <200611100123.kAA1NVaK011666@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11639

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
- *bump*



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/FC-6/dd_rescue.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dd_rescue.spec	10 Nov 2006 01:18:46 -0000	1.2
+++ dd_rescue.spec	10 Nov 2006 01:23:01 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        2
+Release:        3
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -56,7 +56,10 @@
 
 
 %changelog
-* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
+- *bump*
+
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-2
 - Fix debug package
 
 * Fri Sep 08 2006 Andreas Thienemann  - 1.12-1



From fedora-extras-commits at redhat.com  Fri Nov 10 01:25:15 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:25:15 -0700
Subject: rpms/mod_suphp/FC-5 mod_suphp-0.6.1-chroot.patch,NONE,1.1
Message-ID: <200611100125.kAA1PFOC011739@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11730

Added Files:
	mod_suphp-0.6.1-chroot.patch 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/


mod_suphp-0.6.1-chroot.patch:

--- NEW FILE mod_suphp-0.6.1-chroot.patch ---
Hello list!

I've written a patch around the chroot() function in
suPHP 0.6.1. First I'll explain our old setup and why
we find this patch useful.

Since we are improving our webserver security at the
moment, we were looking for a possibility to
chroot() some users.

Our old setup consists of mod_php and PHP per VirtualHost
configurations like:
   php_admin_value open_basedir ...
   php_admin_value upload_tmp_dir ...
   ...
With disable_functions we disabled functions like exec(),
system(), etc to let the user stay in his open_basedir
(executed programs don't got the open_basedir
restrictions).

Some users requested the possibility to exec programs like
the ImageMagick tools, needed for Typo3 or other PHP
programs like PHP gallery. I know about the possibility to
configure a safe_mode_exec_dir within the php.ini, but it
is not the best solution.

The new suPHP version 0.6.1 offers the possibility to
chroot and it works nice. Though there are some problems:
- There is only one configuration file and the chroot-path
  is configured within the global config. If you want to
  chroot each virtual host into it's own chroot-jail it
  isn't possible.
- When chrooted the path of the php script stays like
  outsite the chroot environment.
  Example:
     before suPHP chroot()
     SCRIPT_FILENAME = /chroot/YOUR_SITE/var/www/index.php
     CURRENT_ROOT    = /
     CHROOT          = /chroot/YOUR_SITE/

     after suPHP chroot()
     SCRIPT_FILENAME = /chroot/YOUR_SITE/var/www/index.php
     CURRENT_ROOT    = /chroot/YOUR_SITE/

     PHP will look for a file called
        /chroot/YOUR_SITE/var/www/index.php
     inside the chroot environment.
     Infact the file is
        /var/www/index.php
     inside the chroot environment.

What the attached patch does:
- It adds a mod_suphp configuration option called
  "suPHP_Options" (the name might not be the best, but
  since suPHP_ConfigPath was already in use, I've choosen
  this name)
- It "translates" the script path after chroot() so that
  PHP will find the right script.

Here are the steps I used to build a chroot environment for
a virtual host:
- Create a directory structure for the chroot directory:
  $ mkdir -p /chroot/YOUR_SITE/\
{bin,etc,lib,tmp,usr/bin,usr/lib/,var/www}

- Copy the php binary and depending libraries into the
  chroot directory:
  $ ldd /usr/bin/php-cgi | sed -e \
's,.*=> /\(.*\) (0x.*,\1,' | while read lib; \
do
   LIBDIR="/chroot/YOUR_SITE/`dirname ${lib}`"; \
   test ! -d $LIBDIR && mkdir -p $LIBDIR; \
   cp -v /${lib} /chroot/YOUR_SITE/${lib}; \
done

- Copy a php.ini into the chroot directory and change the
  doc_root configuration parameter.
  $ cat /chroot/YOUR_SITE/etc/php.ini |
     sed -e 's,^doc_root.*$,doc_root ="/var/www/",' > \
     /chroot/YOUR_SITE/etc/php.ini

- Create a apache VirtualHost:
    
       ServerName YOUR_SITE.EXAMPLE
       ServerAdmin [11]YOU at YOUR_SITE.EXAMPLE

       DocumentRoot /chroot/YOUR_SITE/var/www/
       
          suPHP_Engine On
          suPHP_Options /chroot/YOUR_SITE-suphp.conf

          # chrooted view
          suPHP_ConfigPath /etc/
       
    

- Create a suPHP configuration file.
  Just pick the default file and set
     chroot=/chroot/YOUR_SITE/

WARNING there are some limitations with this patch:
- First, I'm not the best C, C++ developer and this is my
  first apache module work
- The code is mostly quick and dirty hacked, because I
  wanted to try if this would work.
- Only the apache2 module was patched.

I'd appreciate if you review this patch and post your
comments on this.

Greetings,
Jan

--- suphp-0.6.1/src/apache2/mod_suphp.c.orig	2006-05-24 04:31:35.000000000 +0200
+++ suphp-0.6.1/src/apache2/mod_suphp.c	2006-05-24 04:34:58.000000000 +0200
@@ -114,6 +114,7 @@
     char *target_user;
     char *target_group;
 #endif
+    char *suphp_options;
     apr_table_t *handlers;
 } suphp_conf;
 
@@ -130,7 +131,9 @@
     cfg->target_user = NULL;
     cfg->target_group = NULL;
 #endif
-    
+
+    cfg->suphp_options = NULL;
+
     /* Create table with 0 initial elements */
     /* This size may be increased for performance reasons */
     cfg->handlers = apr_table_make(p, 0);
@@ -175,6 +178,13 @@
     else
         merged->target_group = NULL;
 #endif
+
+    if (child->suphp_options)
+    	merged->suphp_options = apr_pstrdup(p, child->suphp_options);
+    else if (parent->suphp_options)
+	merged->suphp_options = apr_pstrdup(p, parent->suphp_options);
+    else
+	merged->suphp_options = NULL;
     
     merged->handlers = apr_table_overlay(p, child->handlers, parent->handlers);
     
@@ -265,6 +275,17 @@
     return NULL;
 }
 
+static const char *suphp_handle_cmd_options(cmd_parms *cmd, void *mconfig,
+                                           const char *arg)
+{
+    suphp_conf *cfg;
+    cfg = (suphp_conf *) mconfig;
+    
+    cfg->suphp_options = apr_pstrdup(cmd->pool, arg);
+    
+    return NULL;
+}
+
 
 #ifdef SUPHP_USE_USERGROUP
 static const char *suphp_handle_cmd_user_group(cmd_parms *cmd, void *mconfig,
@@ -315,6 +336,7 @@
 #endif
     AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
     AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
+	AP_INIT_TAKE1("suPHP_Options", suphp_handle_cmd_options, NULL, OR_OPTIONS, "The configuration file suPHP should use for this virtual host"),
     {NULL}
 };
 
@@ -436,6 +458,11 @@
     {
         apr_table_setn(r->subprocess_env, "SUPHP_PHP_CONFIG", apr_pstrdup(p, dconf->php_config));
     }
+
+    if (dconf->suphp_options)
+    {
+        apr_table_setn(r->subprocess_env, "SUPHP_OPTIONS", apr_pstrdup(p, dconf->suphp_options));
+    }
     
     apr_table_setn(r->subprocess_env, "SUPHP_HANDLER", r->handler);
     
--- suphp-0.6.1/src/Application.cpp.orig	2006-05-24 04:31:35.000000000 +0200
+++ suphp-0.6.1/src/Application.cpp	2006-05-24 04:34:13.000000000 +0200
@@ -50,16 +50,23 @@
     API& api = API_Helper::getSystemAPI();
     Logger& logger = api.getSystemLogger();
     
-#ifdef OPT_CONFIGFILE
-    File cfgFile = File(OPT_CONFIGFILE);
-#else
-    File cfgFile = File("/etc/suphp.conf");
-#endif
 
     std::string interpreter;
     TargetMode targetMode;
     Environment newEnv;
 
+    File cfgFile = File("");
+    
+    try {
+        cfgFile = File(env.getVar("SUPHP_OPTIONS").c_str());
+    } catch (KeyNotFoundException &e) {
+#ifdef OPT_CONFIGFILE
+	cfgFile = File(OPT_CONFIGFILE);
+#else
+	cfgFile = File("/etc/suphp.conf");
+#endif
+    }
+
     // Begin try block - soft exception cannot really be handled before
     // initialization
     try {
@@ -88,14 +95,23 @@
 	    return 1;
 	}
 
-	this->checkScriptFile(scriptFilename, config, env);
-
 	// Root privileges are needed for chroot()
 	// so do this before changing process permissions
 	if (config.getChrootPath().length() > 0) {
 	    api.chroot(config.getChrootPath());
+
+	    // after chroot() the SCRIPT_FILENAME path has changed
+	    // and needs to get "translated"
+	    std::string strChrootPath(config.getChrootPath());
+
+	    // TODO: check if there is a "/" at the beginning of scriptFilename
+	    scriptFilename.replace(scriptFilename.find(strChrootPath), strChrootPath.length(), "");
+	    env.setVar("DOCUMENT_ROOT", "/");
+	    env.setVar("SCRIPT_FILENAME", scriptFilename);
 	}
 
+	this->checkScriptFile(scriptFilename, config, env);
+
 	this->changeProcessPermissions(scriptFilename, config, env);
 
 	interpreter = this->getInterpreter(env, config);
@@ -396,6 +412,8 @@
 	env.deleteVar("SUPHP_AUTH_PW");
     if (env.hasVar("SUPHP_PHP_CONFIG"))
 	env.deleteVar("SUPHP_PHP_CONFIG");
+    if (env.hasVar("SUPHP_OPTIONS"))
+	env.deleteVar("SUPHP_OPTIONS");
     
     // Reset PATH
     env.putVar("PATH", config.getEnvPath());



From fedora-extras-commits at redhat.com  Fri Nov 10 01:29:03 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:29:03 -0700
Subject: rpms/ddrescue/devel dd_rescue.spec,1.3,1.4
Message-ID: <200611100129.kAA1T3EA012606@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12347

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-4
- Added dist-tag



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/devel/dd_rescue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dd_rescue.spec	10 Nov 2006 01:21:34 -0000	1.3
+++ dd_rescue.spec	10 Nov 2006 01:28:32 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-4
+- Added dist-tag
+
 * Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
 - *bump*
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:31:58 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:31:58 -0700
Subject: rpms/ddrescue/FC-6 dd_rescue.spec,1.3,1.4
Message-ID: <200611100131.kAA1VwPK012805@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12789

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-4
- Added dist-tag



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/FC-6/dd_rescue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dd_rescue.spec	10 Nov 2006 01:23:01 -0000	1.3
+++ dd_rescue.spec	10 Nov 2006 01:31:28 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-4
+- Added dist-tag
+
 * Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
 - *bump*
 



From fedora-extras-commits at redhat.com  Fri Nov 10 03:50:31 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 9 Nov 2006 20:50:31 -0700
Subject: rpms/seamonkey/FC-6 seamonkey.spec,1.12,1.13
Message-ID: <200611100350.kAA3oVSB019784@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19765

Modified Files:
	seamonkey.spec 
Log Message:
* Thu Nov 09 2006 Kai Engert  1.0.6-0.6.1
- Do not run regchrome.



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/seamonkey.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- seamonkey.spec	9 Nov 2006 19:57:13 -0000	1.12
+++ seamonkey.spec	10 Nov 2006 03:50:01 -0000	1.13
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.6
-Release:        0.6%{?dist}
+Release:        0.6.1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -258,9 +258,6 @@
   echo "skin,install,select,classic/1.0" >> chrome/lang/default.txt
   echo "locale,install,select,en-US" >> chrome/lang/default.txt
 
-  # set up the chrome rdf files
-  LD_LIBRARY_PATH=`pwd`:`pwd`/.. MOZILLA_FIVE_HOME=`pwd` MOZ_DISABLE_GNOME=1 ./regchrome
-
   # fix permissions of the chrome directories
   /usr/bin/find . -type d -perm 0700 -exec chmod 755 {} \; || :
 
@@ -432,6 +429,8 @@
 
 
 %changelog
+* Thu Nov 09 2006 Kai Engert  1.0.6-0.6.1
+- Do not run regchrome.
 * Thu Nov 09 2006 Kai Engert  1.0.6-0.6
 - SeaMonkey 1.0.6
 * Thu Sep 14 2006 Kai Engert  1.0.5-1



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:21 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:21 -0700
Subject: rpms/grhino/FC-3 grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200611100759.kAA7xLtN001108@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/FC-3

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:34 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:58:50 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:37:52 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:58:50 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	29 Oct 2006 20:15:18 -0000	1.5
+++ grhino.spec	10 Nov 2006 07:58:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:34 -0000	1.5
+++ sources	10 Nov 2006 07:58:50 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:22 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:22 -0700
Subject: rpms/grhino/FC-4 grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611100759.kAA7xMOg001114@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/FC-4

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:35 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:58:51 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:29:06 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:58:51 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	29 Oct 2006 20:15:19 -0000	1.6
+++ grhino.spec	10 Nov 2006 07:58:51 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:35 -0000	1.5
+++ sources	10 Nov 2006 07:58:51 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:27 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:27 -0700
Subject: rpms/grhino/FC-5 grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611100759.kAA7xRWL001120@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/FC-5

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:35 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:58:57 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:18:55 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:58:57 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	29 Oct 2006 20:15:25 -0000	1.6
+++ grhino.spec	10 Nov 2006 07:58:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:35 -0000	1.5
+++ sources	10 Nov 2006 07:58:57 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:28 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:28 -0700
Subject: rpms/grhino/FC-6 grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200611100759.kAA7xS6i001126@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/FC-6

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:36 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:58:58 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:18:55 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:58:58 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grhino.spec	29 Oct 2006 19:58:39 -0000	1.8
+++ grhino.spec	10 Nov 2006 07:58:58 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Oct 2006 19:58:39 -0000	1.7
+++ sources	10 Nov 2006 07:58:58 -0000	1.8
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:34 -0700
Subject: rpms/grhino/devel grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200611100759.kAA7xYUM001132@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/devel

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:36 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:59:04 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:18:55 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:59:04 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	29 Oct 2006 20:15:26 -0000	1.7
+++ grhino.spec	10 Nov 2006 07:59:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:36 -0000	1.5
+++ sources	10 Nov 2006 07:59:04 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 08:24:54 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 10 Nov 2006 01:24:54 -0700
Subject: rpms/yumex/FC-6 .cvsignore, 1.27, 1.28 sources, 1.35,
	1.36 yumex.spec, 1.41, 1.42
Message-ID: <200611100824.kAA8Os0j004463@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4424/FC-6

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 1.2.0-1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	25 Oct 2006 13:07:26 -0000	1.27
+++ .cvsignore	10 Nov 2006 08:24:23 -0000	1.28
@@ -1 +1 @@
-yumex-1.1.7.tar.gz
+yumex-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Oct 2006 13:07:26 -0000	1.35
+++ sources	10 Nov 2006 08:24:23 -0000	1.36
@@ -1 +1 @@
-307104c00fb4b00c140c353d38d42b6b  yumex-1.1.7.tar.gz
+ee017920c2d4b9be2a01605185677e14  yumex-1.2.0.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/yumex.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- yumex.spec	25 Oct 2006 13:07:26 -0000	1.41
+++ yumex.spec	10 Nov 2006 08:24:23 -0000	1.42
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.7
+Version:  1.2.0
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Nov 10 2006 Tim Lauridsen  - 1.2.0-1.0
+- Release 1.2.0-1.0
 * Wed Oct 25 2006 Tim Lauridsen  - 1.1.7-1.0
 - Development Release 1.1.7-1.0
 * Wed Oct 25 2006 Tim Lauridsen  - 1.1.6-1.0



From fedora-extras-commits at redhat.com  Fri Nov 10 08:24:55 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 10 Nov 2006 01:24:55 -0700
Subject: rpms/yumex/devel sources,1.35,1.36 yumex.spec,1.41,1.42
Message-ID: <200611100824.kAA8OtmU004467@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4424/devel

Modified Files:
	sources yumex.spec 
Log Message:
Release 1.2.0-1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Oct 2006 13:07:27 -0000	1.35
+++ sources	10 Nov 2006 08:24:24 -0000	1.36
@@ -1 +1 @@
-307104c00fb4b00c140c353d38d42b6b  yumex-1.1.7.tar.gz
+ee017920c2d4b9be2a01605185677e14  yumex-1.2.0.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- yumex.spec	25 Oct 2006 13:07:27 -0000	1.41
+++ yumex.spec	10 Nov 2006 08:24:24 -0000	1.42
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.7
+Version:  1.2.0
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Nov 10 2006 Tim Lauridsen  - 1.2.0-1.0
+- Release 1.2.0-1.0
 * Wed Oct 25 2006 Tim Lauridsen  - 1.1.7-1.0
 - Development Release 1.1.7-1.0
 * Wed Oct 25 2006 Tim Lauridsen  - 1.1.6-1.0



From fedora-extras-commits at redhat.com  Fri Nov 10 08:36:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:36:16 -0700
Subject: rpms/beneath-a-steel-sky-cd - New directory
Message-ID: <200611100836.kAA8aG6S004639@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4635/beneath-a-steel-sky-cd

Log Message:
Directory /cvs/extras/rpms/beneath-a-steel-sky-cd added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 08:36:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:36:22 -0700
Subject: rpms/beneath-a-steel-sky-cd/devel - New directory
Message-ID: <200611100836.kAA8aMBc004653@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4635/beneath-a-steel-sky-cd/devel

Log Message:
Directory /cvs/extras/rpms/beneath-a-steel-sky-cd/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 08:36:39 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:36:39 -0700
Subject: rpms/beneath-a-steel-sky-cd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611100836.kAA8advK004684@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4678

Added Files:
	Makefile import.log 
Log Message:
Setup of module beneath-a-steel-sky-cd


--- NEW FILE Makefile ---
# Top level Makefile for module beneath-a-steel-sky-cd
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  Fri Nov 10 08:36:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:36:44 -0700
Subject: rpms/beneath-a-steel-sky-cd/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611100836.kAA8aiZo004702@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4678/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beneath-a-steel-sky-cd


--- 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  Fri Nov 10 08:43:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:43:11 -0700
Subject: rpms/beneath-a-steel-sky-cd import.log,1.1,1.2
Message-ID: <200611100843.kAA8hBYG004791@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4758

Modified Files:
	import.log 
Log Message:
auto-import beneath-a-steel-sky-cd-0.0372-1 on branch devel from beneath-a-steel-sky-cd-0.0372-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky-cd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 08:36:38 -0000	1.1
+++ import.log	10 Nov 2006 08:42:41 -0000	1.2
@@ -0,0 +1 @@
+beneath-a-steel-sky-cd-0_0372-1:HEAD:beneath-a-steel-sky-cd-0.0372-1.src.rpm:1163148224



From fedora-extras-commits at redhat.com  Fri Nov 10 08:43:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:43:12 -0700
Subject: rpms/beneath-a-steel-sky-cd/devel beneath-a-steel-sky-cd.desktop,
	NONE, 1.1 beneath-a-steel-sky-cd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611100843.kAA8hCLB004795@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4758/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beneath-a-steel-sky-cd.desktop beneath-a-steel-sky-cd.spec 
Log Message:
auto-import beneath-a-steel-sky-cd-0.0372-1 on branch devel from beneath-a-steel-sky-cd-0.0372-1.src.rpm


--- NEW FILE beneath-a-steel-sky-cd.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beneath a Steel Sky (CD version)
Comment=Adventure Game
Exec=scummvm -f -p /usr/share/beneath-a-steel-sky-cd sky
Icon=scummvm.png
Terminal=false
Type=Application
Categories=Application;Game;AdventureGame;
StartupNotify=false


--- NEW FILE beneath-a-steel-sky-cd.spec ---
Name:           beneath-a-steel-sky-cd
Version:        0.0372
Release:        1
Summary:        Beneath a Steel Sky - Adventure Game - CD version
Group:          Amusements/Games
# For further discussion on distribution rights see:
# http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
License:        Distributable
URL:            http://www.revolution.co.uk/_display.php?id=16
Source0:        http://dl.sf.net/sourceforge/scummvm/bass-cd-1.2.zip
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       scummvm >= 0.9.1, hicolor-icon-theme

%description
After the Dungeons and Dragons fantasy setting of Revolution's first game, Lure
of the Temptress, Revolution decided to go down a completely different avenue
with its second adventure game, Beneath a Steel Sky, that of Science Fiction.
A bleak vision of the future was imagined, where mind control and medical
science combined forces to repress the populace. Leading comic artist, Dave
Gibbons, joined the design team to visualise this desperate landscape. The
result is the cult classic Beneath a Steel Sky.

This package contains the CD version, which contains additional / longer
cutscenes and voice acting, but also is much larger: 70 MB where as the also
available floppy version (package name beneath-a-steel-sky) is only 8 MB.


%prep
%setup -q -n bass-cd-1.2


%build
# Nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 sky.* $RPM_BUILD_ROOT%{_datadir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc readme.txt
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Sun Nov  5 2006 Hans de Goede  0.0372-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky-cd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 08:36:44 -0000	1.1
+++ .cvsignore	10 Nov 2006 08:42:42 -0000	1.2
@@ -0,0 +1 @@
+bass-cd-1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky-cd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 08:36:44 -0000	1.1
+++ sources	10 Nov 2006 08:42:42 -0000	1.2
@@ -0,0 +1 @@
+1d4401cd663715332abe8bb5431e356d  bass-cd-1.2.zip



From fedora-extras-commits at redhat.com  Fri Nov 10 08:44:36 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:44:36 -0700
Subject: rpms/flight-of-the-amazon-queen - New directory
Message-ID: <200611100844.kAA8ia4A004887@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4883/flight-of-the-amazon-queen

Log Message:
Directory /cvs/extras/rpms/flight-of-the-amazon-queen added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 08:44:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:44:42 -0700
Subject: rpms/flight-of-the-amazon-queen/devel - New directory
Message-ID: <200611100844.kAA8igiO004901@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4883/flight-of-the-amazon-queen/devel

Log Message:
Directory /cvs/extras/rpms/flight-of-the-amazon-queen/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 08:44:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:44:54 -0700
Subject: rpms/flight-of-the-amazon-queen Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200611100844.kAA8isWs004932@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4926

Added Files:
	Makefile import.log 
Log Message:
Setup of module flight-of-the-amazon-queen


--- NEW FILE Makefile ---
# Top level Makefile for module flight-of-the-amazon-queen
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  Fri Nov 10 08:44:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:44:54 -0700
Subject: rpms/flight-of-the-amazon-queen/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611100844.kAA8isvJ004949@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4926/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flight-of-the-amazon-queen


--- 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  Fri Nov 10 08:46:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:46:29 -0700
Subject: rpms/flight-of-the-amazon-queen import.log,1.1,1.2
Message-ID: <200611100846.kAA8kTr7005033@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5000

Modified Files:
	import.log 
Log Message:
auto-import flight-of-the-amazon-queen-1.0-1 on branch devel from flight-of-the-amazon-queen-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 08:44:53 -0000	1.1
+++ import.log	10 Nov 2006 08:45:58 -0000	1.2
@@ -0,0 +1 @@
+flight-of-the-amazon-queen-1_0-1:HEAD:flight-of-the-amazon-queen-1.0-1.src.rpm:1163148421



From fedora-extras-commits at redhat.com  Fri Nov 10 08:46:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:46:29 -0700
Subject: rpms/flight-of-the-amazon-queen/devel
	flight-of-the-amazon-queen.desktop, NONE,
	1.1 flight-of-the-amazon-queen.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611100846.kAA8kTXM005037@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5000/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flight-of-the-amazon-queen.desktop 
	flight-of-the-amazon-queen.spec 
Log Message:
auto-import flight-of-the-amazon-queen-1.0-1 on branch devel from flight-of-the-amazon-queen-1.0-1.src.rpm


--- NEW FILE flight-of-the-amazon-queen.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Flight of the Amazon Queen
Comment=Adventure Game
Exec=scummvm -f -p /usr/share/flight-of-the-amazon-queen queen
Icon=scummvm.png
Terminal=false
Type=Application
Categories=Application;Game;AdventureGame;
StartupNotify=false


--- NEW FILE flight-of-the-amazon-queen.spec ---
Name:           flight-of-the-amazon-queen
Version:        1.0
Release:        1
Summary:        Flight of the Amazon Queen - Adventure Game
Group:          Amusements/Games
# For further discussion on distribution rights see:
# http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
License:        Distributable
URL:            http://www.scummvm.org/downloads.php
Source0:        http://dl.sf.net/sourceforge/scummvm/FOTAQ_Floppy.zip
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       scummvm >= 0.9.1, hicolor-icon-theme

%description
It is 1949 and you play Joe King, pilot for hire with his small private plane
the 'Amazon Queen'. The game is a spoof of old timey radio adventure serials,
and as it begins we find Joe in one of those typical situations. It is 11:58
and 36 seconds and counting, Joe and his date are tied up in an abandoned
warehouse ("you really know how to show a girl a good time, Joe!"), and a bomb
is set to go off at midnight!

Of course they escape, in the nick of time, and immediately set us up for the
next 'adventure'. Joe suddenly remembers that he is scheduled to fly the famous
movie star, Faye Russell, to a photo shoot in the Amazon jungle the next
morning.

Notice that this package contains the floppy version, the CD version is also
available in the %{name}-cd package. The CD version contains
additional / longer cutscenes and voice acting, but also is much larger: the CD
version ways in at 37 MB where as this version is only 7 MB.


%prep
%setup -q -n FOTAQ_Floppy


%build
# Nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 queen.1 $RPM_BUILD_ROOT%{_datadir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc readme.txt
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Sun Nov  5 2006 Hans de Goede  1.0-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 08:44:54 -0000	1.1
+++ .cvsignore	10 Nov 2006 08:45:59 -0000	1.2
@@ -0,0 +1 @@
+FOTAQ_Floppy.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 08:44:54 -0000	1.1
+++ sources	10 Nov 2006 08:45:59 -0000	1.2
@@ -0,0 +1 @@
+eafb6bc4edc6255b871477cfc54312de  FOTAQ_Floppy.zip



From fedora-extras-commits at redhat.com  Fri Nov 10 09:31:12 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 10 Nov 2006 02:31:12 -0700
Subject: fedora-security/audit fc5,1.386,1.387 fc6,1.138,1.139
Message-ID: <200611100931.kAA9VClh008277@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8257

Modified Files:
	fc5 fc6 
Log Message:
Releases and some cleanup



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- fc5	9 Nov 2006 11:34:15 -0000	1.386
+++ fc5	10 Nov 2006 09:31:09 -0000	1.387
@@ -1,14 +1,16 @@
-Up to date CVE as of CVE email 20061108
-Up to date FC5 as of 20061108
+Up to date CVE as of CVE email 20061109
+Up to date FC5 as of 20061109
 
 ** are items that need attention
 
 CVE-2006-5823 ** kernel
-CVE-2006-5794 ** openssh
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5)
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5748 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5747 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5706 ** php, fixed 5.2.0
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
@@ -22,8 +24,11 @@
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
 CVE-2006-5464 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5464 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5463 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5463 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5462 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5462 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
@@ -57,6 +62,7 @@
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
 CVE-2006-4810 ** texinfo
+CVE-2006-4810 backport (texinfo) [since FEDORA-2006-1202]
 CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- fc6	9 Nov 2006 11:34:15 -0000	1.138
+++ fc6	10 Nov 2006 09:31:09 -0000	1.139
@@ -1,10 +1,10 @@
-Up to date CVE as of CVE email 20061108
-Up to date FC6 as of 20061108
+Up to date CVE as of CVE email 20061109
+Up to date FC6 as of 20061109
 
 ** are items that need attention
 
 CVE-2006-5823 ** kernel
-CVE-2006-5794 ** openssh
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5)
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
@@ -61,7 +61,7 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055]
-CVE-2006-4810 ** texinfo
+CVE-2006-4810 backport (texinfo) [since FEDORA-2006-1203]
 CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability



From fedora-extras-commits at redhat.com  Fri Nov 10 09:48:29 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 10 Nov 2006 02:48:29 -0700
Subject: rpms/liferea/FC-6 liferea.spec,1.54,1.55
Message-ID: <200611100948.kAA9mTaF008400@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/liferea/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8384

Modified Files:
	liferea.spec 
Log Message:
* Fri Nov 10 2006 Michael Schwendt  - 1.0.25-2
- Rebuild for new Firefox version (and update the Firefox "Requires").



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/liferea.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- liferea.spec	27 Oct 2006 16:04:43 -0000	1.54
+++ liferea.spec	10 Nov 2006 09:47:59 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -24,7 +24,8 @@
 BuildRequires:	dbus-devel
 %endif
 
-Requires:	firefox = 1.5.0.7
+#Requires:	firefox = 1.5.0.8
+Requires:	firefox = %(rpm -q firefox-devel --qf '%%{version}' 2>/dev/null)
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -108,6 +109,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michael Schwendt  - 1.0.25-2
+- Rebuild for new Firefox version (and update the Firefox "Requires").
+
 * Fri Oct 27 2006 Brian Pepple  - 1.0.25-1
 - Update to 1.0.25.
 - Drop X-Fedora category from desktop file.



From fedora-extras-commits at redhat.com  Fri Nov 10 12:36:05 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Fri, 10 Nov 2006 05:36:05 -0700
Subject: rpms/libatomic_ops/devel .cvsignore, 1.2, 1.3 libatomic_ops.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611101236.kAACa5uN018376@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/libatomic_ops/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18351

Modified Files:
	.cvsignore libatomic_ops.spec sources 
Log Message:
Update to upstream release 1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2006 14:47:29 -0000	1.2
+++ .cvsignore	10 Nov 2006 12:35:34 -0000	1.3
@@ -1 +1 @@
-libatomic_ops-1.1.tar.gz
+libatomic_ops-1.2.tar.gz


Index: libatomic_ops.spec
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/devel/libatomic_ops.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libatomic_ops.spec	9 Sep 2006 14:47:29 -0000	1.1
+++ libatomic_ops.spec	10 Nov 2006 12:35:34 -0000	1.2
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           libatomic_ops
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Atomic memory update operations
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Pierre Ossman  1.2-1
+- Update to 1.2.
+
 * Sat Sep  9 2006 Pierre Ossman  1.1-2
 - Fix naming of package.
 - General cleanup of spec file.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2006 14:47:29 -0000	1.2
+++ sources	10 Nov 2006 12:35:34 -0000	1.3
@@ -1 +1 @@
-359ed8a7c518eeb5f414102c7be24cf4  libatomic_ops-1.1.tar.gz
+1b65e48271c81e3fa2d7a9a69bab7504  libatomic_ops-1.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 13:52:31 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 10 Nov 2006 06:52:31 -0700
Subject: rpms/torcs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 torcs.spec, 
	1.13, 1.14 torcs-1.2.4-extraqualif.patch, 1.1,
	NONE torcs-1.2.4-track_cpp.patch, 1.1, NONE
Message-ID: <200611101352.kAADqV8c021760@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21737

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	torcs-1.2.4-extraqualif.patch torcs-1.2.4-track_cpp.patch 
Log Message:
Update to 1.3.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2005 07:49:42 -0000	1.5
+++ .cvsignore	10 Nov 2006 13:52:01 -0000	1.6
@@ -1,5 +1,5 @@
-TORCS-1.2.4-src-robots-base.tgz
-TORCS-1.2.4-src-robots-berniw.tgz
-TORCS-1.2.4-src-robots-bt.tgz
-TORCS-1.2.4-src-robots-olethros.tgz
-TORCS-1.2.4-src.tgz
+TORCS-1.3.0-src.tgz
+TORCS-1.3.0-src-robots-base.tgz
+TORCS-1.3.0-src-robots-berniw.tgz
+TORCS-1.3.0-src-robots-bt.tgz
+TORCS-1.3.0-src-robots-olethros.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2005 07:49:42 -0000	1.5
+++ sources	10 Nov 2006 13:52:01 -0000	1.6
@@ -1,5 +1,5 @@
-3afe0d23f1e637fe56efccd2b6e8a8f1  TORCS-1.2.4-src-robots-base.tgz
-40aed9595f91051e8468e8a19b65f809  TORCS-1.2.4-src-robots-berniw.tgz
-337eecc6e545aceda094d945e12c3023  TORCS-1.2.4-src-robots-bt.tgz
-13b1eeba1148ca57dc1d989fcb27d308  TORCS-1.2.4-src-robots-olethros.tgz
-f5b41bf29cb7b6160e5ead6e187380b6  TORCS-1.2.4-src.tgz
+915c89f9d3618d13dddd5bfb4d199539  TORCS-1.3.0-src.tgz
+da007d61447f38fbdbd22aec029cc26c  TORCS-1.3.0-src-robots-base.tgz
+abeb72ba3913ef0bde727fdaa9699eef  TORCS-1.3.0-src-robots-berniw.tgz
+ca8506aecc30bee308a5e198304b71b2  TORCS-1.3.0-src-robots-bt.tgz
+227d47687b821298fe6b2f147071e73f  TORCS-1.3.0-src-robots-olethros.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- torcs.spec	28 Aug 2006 16:40:15 -0000	1.13
+++ torcs.spec	10 Nov 2006 13:52:01 -0000	1.14
@@ -2,8 +2,8 @@
 
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.2.4
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -13,8 +13,6 @@
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
 Patch0: torcs-1.2.4-freealutfix.patch
-Patch1: torcs-1.2.4-track_cpp.patch
-Patch2: torcs-1.2.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
@@ -37,7 +35,7 @@
 %package robots
 Summary: The Open Racing Car Simulator robots
 Group: Amusements/Games
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description robots
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -50,20 +48,19 @@
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
 %patch0 -p1 -b .freealutfix
-%patch1 -p0 -b .track_cpp
-%patch2 -p1 -b .extraqualif
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
 
 %build
-# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4)
+# Force locations with modular X (for FC5+ and non-Fedora)
+# Required (1.2.4, still in 1.3.0)
 %configure \
 %if %{!?fedora:5}%{?fedora} >= 5
     --x-includes=%{_includedir} \
     --x-libraries=%{_libdir}
 %endif
-# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.2.4
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0
 %{__make}
 
 
@@ -90,7 +87,7 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
-# We need this for proper automatic stripping to take place (still in 1.2.3)
+# We need this for proper automatic stripping to take place (still in 1.3.0)
 find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x
 
 
@@ -100,7 +97,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG.html COPYING README.linux TODO.html
+%doc COPYING README README.linux
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/drivers/
@@ -163,6 +160,11 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  1.3.0-1
+- Update to 1.3.0.
+- Remove no longer needed track.cpp patch1.
+- Remove no longer needed extraqualif patch2.
+
 * Mon Aug 28 2006 Matthias Saou  1.2.4-4
 - FC6 rebuild.
 


--- torcs-1.2.4-extraqualif.patch DELETED ---


--- torcs-1.2.4-track_cpp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 10 13:53:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 10 Nov 2006 06:53:22 -0700
Subject: rpms/torcs-data/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 torcs-data.spec, 1.7, 1.8
Message-ID: <200611101353.kAADrMxG021829@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21804

Modified Files:
	.cvsignore sources torcs-data.spec 
Log Message:
Update to 1.3.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Oct 2005 07:49:43 -0000	1.4
+++ .cvsignore	10 Nov 2006 13:52:52 -0000	1.5
@@ -1,6 +1,6 @@
-TORCS-1.2.4-data-cars-extra.tgz
-TORCS-1.2.4-data-cars-nascar.tgz
-TORCS-1.2.4-data.tgz
-TORCS-1.2.4-data-tracks-dirt.tgz
-TORCS-1.2.4-data-tracks-oval.tgz
-TORCS-1.2.4-data-tracks-road.tgz
+TORCS-1.3.0-data-cars-extra.tgz
+TORCS-1.3.0-data-cars-nascar.tgz
+TORCS-1.3.0-data.tgz
+TORCS-1.3.0-data-tracks-dirt.tgz
+TORCS-1.3.0-data-tracks-oval.tgz
+TORCS-1.3.0-data-tracks-road.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Oct 2005 07:49:43 -0000	1.4
+++ sources	10 Nov 2006 13:52:52 -0000	1.5
@@ -1,6 +1,6 @@
-f11f0789885fe427f7b8958a17cc9f52  TORCS-1.2.4-data-cars-extra.tgz
-30e3ab4da6c503a6a7ba6eaf2898ede0  TORCS-1.2.4-data-cars-nascar.tgz
-0129c5c930bbc830964bd32024f9a47d  TORCS-1.2.4-data.tgz
-2464de31150f97da54d9e7609ca125fe  TORCS-1.2.4-data-tracks-dirt.tgz
-b7ddc6ad362bfafc6f66cfcc459ec30b  TORCS-1.2.4-data-tracks-oval.tgz
-9084b2700d71f86fedfc7a5f55959b0b  TORCS-1.2.4-data-tracks-road.tgz
+248ae5c165f703b22bd7224d7c2caed4  TORCS-1.3.0-data-cars-extra.tgz
+40de51f6a929d121f46dd47709d58b8b  TORCS-1.3.0-data-cars-nascar.tgz
+8bff8540f7994dce02d32ba8fb4ad8a8  TORCS-1.3.0-data.tgz
+7c1d5dab87d6c06ac8e7ba8bab30f0b1  TORCS-1.3.0-data-tracks-dirt.tgz
+a27ce8b505dfbf2caba91ac6cc802bab  TORCS-1.3.0-data-tracks-oval.tgz
+8e30d3cc03dafb8392d690d96459f317  TORCS-1.3.0-data-tracks-road.tgz


Index: torcs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/torcs-data.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- torcs-data.spec	13 Oct 2005 07:49:43 -0000	1.7
+++ torcs-data.spec	10 Nov 2006 13:52:52 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: The Open Racing Car Simulator data files
 Name: torcs-data
-Version: 1.2.4
+Version: 1.3.0
 Release: 1
 License: GPL and Free Art License
 Group: Amusements/Games
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  1.3.0-1
+- Update to 1.3.0.
+
 * Wed Oct 12 2005 Matthias Saou  1.2.4-1
 - Update to 1.2.4.
 



From fedora-extras-commits at redhat.com  Fri Nov 10 14:30:49 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 10 Nov 2006 07:30:49 -0700
Subject: extras-buildsys/server PackageJob.py,1.56,1.57
Message-ID: <200611101430.kAAEUnaW025194@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25176

Modified Files:
	PackageJob.py 
Log Message:
Don't traceback on error cleaning up job files; just log it.


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- PackageJob.py	31 Oct 2006 17:57:36 -0000	1.56
+++ PackageJob.py	10 Nov 2006 14:30:47 -0000	1.57
@@ -864,7 +864,10 @@
                     # the original SRPM.
                     if not os.path.exists(srpm_file):
                         shutil.copy(src_file, srpm_file)
-                os.remove(src_file)
+                try:
+                    os.remove(src_file)
+                except OSError, e:
+                    debugprint("%d: Error cleaning up job files - '%s'" % (self.uid, e))
 
         # If there were no builder-built SRPMs, keep the original around
         if not os.path.exists(srpm_file):



From fedora-extras-commits at redhat.com  Fri Nov 10 14:31:49 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 10 Nov 2006 07:31:49 -0700
Subject: extras-buildsys/server PackageJob.py,1.31.2.10,1.31.2.11
Message-ID: <200611101431.kAAEVnNc025229@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25211

Modified Files:
      Tag: STABLE_0_4
	PackageJob.py 
Log Message:
Don't traceback on error cleaning up job files; just log it.


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.10
retrieving revision 1.31.2.11
diff -u -r1.31.2.10 -r1.31.2.11
--- PackageJob.py	13 Mar 2006 04:16:34 -0000	1.31.2.10
+++ PackageJob.py	10 Nov 2006 14:31:47 -0000	1.31.2.11
@@ -653,7 +653,10 @@
                     # the original SRPM.
                     if not os.path.exists(srpm_file):
                         shutil.copy(src_file, srpm_file)
-                os.remove(src_file)
+                try:
+                    os.remove(src_file)
+                except OSError, e:
+                    debugprint("%d: Error cleaning up job files - '%s'" % (self.uid, e))
 
         # If there were no builder-built SRPMs, keep the original around
         if not os.path.exists(srpm_file):



From fedora-extras-commits at redhat.com  Fri Nov 10 16:11:40 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:11:40 -0700
Subject: rpms/bogl - New directory
Message-ID: <200611101611.kAAGBe6U031661@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31657/bogl

Log Message:
Directory /cvs/extras/rpms/bogl added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:11:45 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:11:45 -0700
Subject: rpms/bogl/devel - New directory
Message-ID: <200611101611.kAAGBjRT031675@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31657/bogl/devel

Log Message:
Directory /cvs/extras/rpms/bogl/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:12:03 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:12:03 -0700
Subject: rpms/bogl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611101612.kAAGC3qg031742@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736

Added Files:
	Makefile import.log 
Log Message:
Setup of module bogl


--- NEW FILE Makefile ---
# Top level Makefile for module bogl
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  Fri Nov 10 16:12:09 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:12:09 -0700
Subject: rpms/bogl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611101612.kAAGC9Ef031765@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bogl


--- 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  Fri Nov 10 16:13:37 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:13:37 -0700
Subject: rpms/phpMyAdmin - New directory
Message-ID: <200611101613.kAAGDbTA032005@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32001/phpMyAdmin

Log Message:
Directory /cvs/extras/rpms/phpMyAdmin added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:13:43 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:13:43 -0700
Subject: rpms/phpMyAdmin/devel - New directory
Message-ID: <200611101613.kAAGDhg9032021@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32001/phpMyAdmin/devel

Log Message:
Directory /cvs/extras/rpms/phpMyAdmin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:13:51 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:13:51 -0700
Subject: rpms/bogl import.log,1.1,1.2
Message-ID: <200611101613.kAAGDpDs032038@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31932

Modified Files:
	import.log 
Log Message:
auto-import bogl-0.1.18-13 on branch devel from bogl-0.1.18-13.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bogl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 16:12:03 -0000	1.1
+++ import.log	10 Nov 2006 16:13:21 -0000	1.2
@@ -0,0 +1 @@
+bogl-0_1_18-13:HEAD:bogl-0.1.18-13.src.rpm:1163175201



From fedora-extras-commits at redhat.com  Fri Nov 10 16:14:01 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:14:01 -0700
Subject: rpms/phpMyAdmin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611101614.kAAGE1pG032088@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32082

Added Files:
	Makefile import.log 
Log Message:
Setup of module phpMyAdmin


--- NEW FILE Makefile ---
# Top level Makefile for module phpMyAdmin
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  Fri Nov 10 16:13:51 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:13:51 -0700
Subject: rpms/bogl/devel bogl-0.1.18-1.1.sigchld.patch, NONE,
	1.1 bogl-0.1.18-1.2.gzip-fonts.patch, NONE,
	1.1 bogl-0.1.18-1.2.reduce-font.patch, NONE,
	1.1 bogl-0.1.18-1.2.term.patch, NONE,
	1.1 bogl-0.1.18-1.5.rh.patch, NONE,
	1.1 bogl-0.1.18-noexecstack.patch, NONE,
	1.1 bogl-0.1.9-2.6fbdev.patch, NONE, 1.1 bogl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611101613.kAAGDpHf032042@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31932/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bogl-0.1.18-1.1.sigchld.patch bogl-0.1.18-1.2.gzip-fonts.patch 
	bogl-0.1.18-1.2.reduce-font.patch bogl-0.1.18-1.2.term.patch 
	bogl-0.1.18-1.5.rh.patch bogl-0.1.18-noexecstack.patch 
	bogl-0.1.9-2.6fbdev.patch bogl.spec 
Log Message:
auto-import bogl-0.1.18-13 on branch devel from bogl-0.1.18-13.src.rpm

bogl-0.1.18-1.1.sigchld.patch:

--- NEW FILE bogl-0.1.18-1.1.sigchld.patch ---
--- bogl-0.1.18/bterm.c.sigchld	2005-09-20 00:44:06.000000000 +0200
+++ bogl-0.1.18/bterm.c	2005-09-20 00:46:01.000000000 +0200
@@ -124,7 +124,7 @@
 void sigchld(int sig)
 {
   int status;
-  if (waitpid(child_pid, &status, WNOHANG)) {
+  if (waitpid(child_pid, &status, WNOHANG) > 0) {
     child_pid = 0;
     /* Reset ownership and permissions of ttyfd device? */
     tcsetattr(0, TCSAFLUSH, &ttysave);

bogl-0.1.18-1.2.gzip-fonts.patch:

--- NEW FILE bogl-0.1.18-1.2.gzip-fonts.patch ---
* Tue Nov 26 2002 Adrian Havill 
- re-write font loader so it can load uncompressed or gzipped files

--- bogl-0.1.18/bterm.c.gzip-fonts	2006-11-05 15:59:28.000000000 +0100
+++ bogl-0.1.18/bterm.c	2006-11-05 15:59:28.000000000 +0100
@@ -186,7 +186,7 @@
 {
   struct bogl_font *font;
 
-  font = bogl_mmap_font (font_name);
+  font = bogl_load_font (font_name);
   if (font == NULL)
     {
       fprintf(stderr, "Bad font\n");
@@ -260,7 +260,7 @@
     return 1;
   }
 
-  if ((font = bogl_mmap_font(font_name)) == NULL) {
+  if ((font = bogl_load_font(font_name)) == NULL) {
     fprintf(stderr, "Bad font\n");
     return 1;
   }
--- bogl-0.1.18/bogl-bgf.c.gzip-fonts	2001-12-01 18:04:42.000000000 +0100
+++ bogl-0.1.18/bogl-bgf.c	2006-11-05 15:59:28.000000000 +0100
@@ -1,44 +1,130 @@
 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
 
+#include "bogl-bgf.h"
 #include "bogl.h"
-#include "bogl-font.h"
 
-struct bogl_font *bogl_mmap_font(char *file)
-{
-  int fd;
-  struct stat buf;
-  void *f;
-  struct bogl_font *font;
-
-  fd = open(file, O_RDONLY);
-  if (fd == -1)
-    return 0;
-
-  if (fstat(fd, &buf))
-    return 0;
-
-  f = mmap(0, buf.st_size, PROT_READ, MAP_SHARED, fd, 0);
-  if (f == (void *)-1)
-    return 0;
-
-  if (memcmp("BGF1", f, 4))
-    return 0;
-
-  font = (struct bogl_font *)malloc(sizeof(struct bogl_font));
-  if (!font)
-    return 0;
-
-  memcpy(font, f + 4, sizeof(*font));
-  font->name = ((void *)font->name - (void *)0) + f;
-  font->offset = ((void *)font->offset - (void *)0) + f;
-  font->index = ((void *)font->index - (void *)0) + f;
-  font->content = ((void *)font->content - (void *)0) + f;
+#define FONT_SIGNATURE "BGF1"
 
-  return font;
+static size_t get_gz_file_size(const char *path) {
+    size_t size = 0;
+    unsigned char buffer[4] = { 0 };
+    FILE *stream = NULL;
+ 
+    stream = fopen(path, "rb");
+    if (stream == NULL) {
+	perror(path);
+	return -1;
+    }
+    if (fread(buffer, sizeof(char), 2, stream) != 2) {
+        if (ferror(stream)) {
+	    perror(path);
+	    return -1;
+	}
+    }
+    if (memcmp(buffer, "\037\213", 2) == 0) {
+        uint32_t isize = 0;
+
+        if (fseek(stream, -4L, SEEK_END) == EOF) {
+	    perror(path);
+	    return -1;
+	}
+        if (fread(buffer, sizeof(char), (size_t) 4, stream) != 4) {
+            if (ferror(stream)) {
+		perror(path);
+		return -1;
+	    }
+            else {
+                fprintf(stderr, "%s: invalid gzip file\n", path);
+                return -1;
+            }
+        }
+        isize  = buffer[0];
+        isize |= buffer[1] << 8;
+        isize |= buffer[2] << 16;
+        isize |= buffer[3] << 24;
+
+	/* FIXME: ISIZE is not a reliable indicator of size for files >4GB.
+	 * On the other hand, if you have a font >4GB, you've got issues.
+	 */
+        size = (size_t) isize;
+    }
+    else {
+        if (fseek(stream, 0L, SEEK_END) == EOF) {
+	    perror(path);
+	    return -1;
+	}
+        if ((int) (size = (size_t) ftell(stream)) == EOF) {
+	    perror(path);
+	    return -1;
+	}
+    }
+    if (fclose(stream) == EOF) {
+	perror(path);
+	return -1;
+    }
+    return size;
+}
+
+struct bogl_font *bogl_load_font(const char *path) {
+    size_t size;
+    int errnum;
+    gzFile file;
+    void *bgf;
+    struct bogl_font *font;
+
+    size = (size_t) get_gz_file_size(path);
+    if (size == (size_t) -1)
+	return NULL;
+    if ((bgf = malloc(size)) == NULL) {
+	perror(path);
+	return NULL;
+    }
+    file = gzopen(path, "rb");
+    if (file == NULL) {
+        if (errno == 0) {
+            errno = ENOMEM;       // if 0 then zlib error == Z_MEM_ERROR
+        }
+	perror(path);
+	return NULL;
+    }
+    if (gzread(file, bgf, size) == -1) {
+        const char *msg = gzerror(file, &errnum);
+
+        if (errnum == Z_ERRNO) {
+            msg = strerror(errno);
+        }
+        fprintf(stderr, "%s: %s\n", path, msg);
+	return NULL;
+    }
+    if (gzclose(file) < 0) {
+        const char *msg = gzerror(file, &errnum);
+
+        if (errnum == Z_ERRNO) {
+            msg = strerror(errno);
+        }
+        fprintf(stderr, "%s: %s\n", path, msg);
+	return NULL;
+    }
+    if (memcmp(FONT_SIGNATURE, bgf, strlen(FONT_SIGNATURE)) != 0) {
+        fprintf(stderr, "%s: not a BGF font\n", path);
+	return NULL;
+    }
+    font = (struct bogl_font *) malloc(sizeof(struct bogl_font));
+    if (font == NULL) {
+	perror(path);
+	return NULL;
+    }
+    memcpy(font, bgf + strlen(FONT_SIGNATURE), sizeof(struct bogl_font));
+    font->name    = bgf + (ptrdiff_t) font->name;
+    font->offset  = bgf + (ptrdiff_t) font->offset;
+    font->index   = bgf + (ptrdiff_t) font->index;
+    font->content = bgf + (ptrdiff_t) font->content;
+    return font;
 }
--- bogl-0.1.18/bogl-bgf.h.gzip-fonts	2001-12-01 18:04:42.000000000 +0100
+++ bogl-0.1.18/bogl-bgf.h	2006-11-05 15:59:28.000000000 +0100
@@ -1,2 +1,2 @@
 
-struct bogl_font *bogl_mmap_font(char *file);
+struct bogl_font *bogl_load_font(const char *file);
--- bogl-0.1.18/Makefile.gzip-fonts	2006-11-05 15:59:44.000000000 +0100
+++ bogl-0.1.18/Makefile	2006-11-05 15:59:57.000000000 +0100
@@ -79,7 +79,7 @@
 	$(CC) -DSTANDALONE_TEST $(ALLCFLAGS) bowl-boxes.c $(LIBOBJECTS) -o bowl-boxes
 
 bterm: $(LIB) bterm.o bogl-term.o bogl-bgf.o
-	$(CC) $+ $(LIB) -o bterm
+	$(CC) $+ $(LIB) -lz -o bterm
 
 bdftobogl: $(LIBBOGLOBJECTS)
 %.c: %.bdf bdftobogl

bogl-0.1.18-1.2.reduce-font.patch:

--- NEW FILE bogl-0.1.18-1.2.reduce-font.patch ---
* Mon Dec 16 2002 Adrian Havill  0.1.9-11
- fixed broken reduce-font to test ENCODING x instead of STARTCHAR x

--- bogl-0.1.18/reduce-font.c.rh	2001-12-01 18:04:42.000000000 +0100
+++ bogl-0.1.18/reduce-font.c	2006-11-05 15:30:38.000000000 +0100
@@ -42,12 +42,31 @@
     printf (": %d\n", l);
 }
 
+char *
+cat_line(char *sofar, const char *line) {
+	char *buf;
+	size_t length;
+
+	length = sofar == NULL ? 0 : strlen(sofar);
+	length += strlen(line);
+	length++;
+	buf = sofar == NULL
+		? calloc(length, sizeof(char))
+		: realloc(sofar, sizeof(char) * length);
+	if (buf == NULL) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
+	}
+	return strcat(buf, line);
+}
+
 int
 main (int argc, char **argv)
 {
     FILE *font;
     char *buffer = NULL;
     char *locale = setlocale (LC_CTYPE, "");
+    char *onebdffmtchar = NULL;
     int error = 0;
 
     if (locale == NULL) {
@@ -152,14 +171,24 @@
                 if (!header)
                 {
                     if (strncmp (buf, "STARTCHAR ", 10) == 0)
+		    {
+			free(onebdffmtchar);
+			onebdffmtchar = NULL;
+		    }
+		    onebdffmtchar = cat_line(onebdffmtchar, buf);
+
+                    if (strncmp (buf, "ENCODING ", 9) == 0)
                     {
-                        wc = strtol (buf + 12, NULL, 16);
+                        wc = strtol (buf + 9, NULL, 10);
 
                         docopy = used[wc / 32] & (1 << (wc % 32));
                     }
-
-                    if (docopy)
-                        fprintf (stdout, buf);
+		    else if (strncmp (buf, "ENDCHAR", 7) == 0)
+		    {
+                        if (docopy)
+                            fputs (onebdffmtchar, stdout);
+			docopy = 0;
+		    }
                 }
             }
 

bogl-0.1.18-1.2.term.patch:

--- NEW FILE bogl-0.1.18-1.2.term.patch ---
--- bogl-0.1.18/bogl-term.c.term	2003-11-05 05:38:22.000000000 +0100
+++ bogl-0.1.18/bogl-term.c	2006-11-05 21:34:54.000000000 +0100
@@ -24,6 +24,9 @@
  * described by the terminfo source in "bterm.ti".
  */
 
+#include 
+#include 
+
 #include "bogl.h"
 #include "bogl-term.h"
 
@@ -353,6 +356,21 @@
         if (wc == 0)            /* 0 has a special meaning in term->screen[] */
             continue;
 
+        if (wc == 7) {          /* bell=^G: flash screen by XORing it twice */
+            for (i = 0; i < term->xsize * term->ysize; i++) {
+                term->screenfg[i] = term->screenfg[i] ^ 0x7;
+                term->screenbg[i] = term->screenbg[i] ^ 0x7;
+            }
+            bogl_term_redraw(term);
+            usleep(100000); // pause 1/10th of a second
+            for (i = 0; i < term->xsize * term->ysize; i++) {
+                term->screenfg[i] = term->screenfg[i] ^ 0x7;
+                term->screenbg[i] = term->screenbg[i] ^ 0x7;
+            }
+            bogl_term_redraw(term);
+            continue;
+        }
+
         if (wc == 8)
         {                       /* cub1=^H */
             if (term->xpos)

bogl-0.1.18-1.5.rh.patch:

--- NEW FILE bogl-0.1.18-1.5.rh.patch ---
--- bogl-0.1.18/Makefile.rh	2006-11-09 23:39:20.000000000 +0100
+++ bogl-0.1.18/Makefile	2006-11-09 23:42:27.000000000 +0100
@@ -4,11 +4,14 @@
 SONAME = libbogl.so.0
 SHARED_LIB = libbogl.so.0.1
 
+libdir = /usr/lib
+
 CFLAGS = -O2 -g -D_GNU_SOURCE
 WARNCFLAGS += -Wall -D_GNU_SOURCE
 ALLCFLAGS = $(CFLAGS) $(WARNCFLAGS) $(FBCFLAGS)
 
-architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+#architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+architecture := $(patsubst i%86,i386,$(shell uname -m))
 
 LIBOBJECTS = $(LIBBOGLOBJECTS) $(LIBBOMLOBJECTS) $(LIBBOWLOBJECTS)	\
 	$(LIBRSRCOBJECTS)
@@ -27,7 +30,7 @@
 	LIBBOGLOBJECTS += bogl-cfb.o bogl-pcfb.o bogl-tcfb.o
 endif
 
-ifneq (,$(filter i386 arm ia64 amd64,$(architecture)))
+ifneq (,$(filter i386 arm ia64 x86_64,$(architecture)))
 	FBCFLAGS += -DBOGL_VGA16_FB=1
 	LIBBOGLOBJECTS += bogl-vga16.o
 	SOURCES_DEP += bogl-vga16.c bogl-vga16.h
@@ -109,12 +112,12 @@
 endif
 
 install: all
-	install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl $(DESTDIR)/usr/bin
-	install -m644 $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SHARED_LIB)
-	ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(DEVLINK)
-	ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SONAME)
-	install -m644 $(LIB) $(DESTDIR)/usr/lib/$(LIB)
-	install -m644 *.h $(DESTDIR)/usr/include/bogl
+	install -d $(DESTDIR)/$(libdir) $(DESTDIR)/usr/include/bogl $(DESTDIR)/usr/bin
+	install -m755 $(SHARED_LIB) $(DESTDIR)/$(libdir)/$(SHARED_LIB)
+	ln -sf $(SHARED_LIB) $(DESTDIR)/$(libdir)/$(DEVLINK)
+	ln -sf $(SHARED_LIB) $(DESTDIR)/$(libdir)/$(SONAME)
+	install -m644 $(LIB) $(DESTDIR)/$(libdir)/$(LIB)
+	install -p -m644 *.h $(DESTDIR)/usr/include/bogl
 	install -m755 bdftobogl mergebdf bterm pngtobogl reduce-font $(DESTDIR)/usr/bin
 	install -d $(DESTDIR)/usr/share/terminfo
 	tic -o$(DESTDIR)/usr/share/terminfo bterm.ti
--- bogl-0.1.18/bterm.c.rh	2006-11-09 23:39:20.000000000 +0100
+++ bogl-0.1.18/bterm.c	2006-11-09 23:39:20.000000000 +0100
@@ -179,7 +179,7 @@
   ioctl(ttyfd, TIOCSWINSZ, &win);
 }
 
-static char *font_name;
+static char *font_name = "/usr/share/bogl/font.bgf.gz";
 static struct bogl_term *term;
 
 void reload_font(int sig)
@@ -297,7 +297,7 @@
   ntio.c_cc[VTIME] = 0;
   ntio.c_cflag |= CS8;
   ntio.c_line = 0;
-  tcsetattr(0, TCSAFLUSH, &ntio);
+  tcsetattr(0, TCSANOW, &ntio);
 
   set_window_size(ttyfd, term->xsize, term->ysize);
 

bogl-0.1.18-noexecstack.patch:

--- NEW FILE bogl-0.1.18-noexecstack.patch ---
--- bogl/bowl.c.noexecstack	2005-02-17 18:39:23.385647088 +0100
+++ bogl/bowl.c	2005-02-17 18:40:42.681592272 +0100
@@ -324,6 +324,14 @@
   }
 }
 
+static struct widget *callback_widget;
+
+static void
+callback (int percent)
+{
+  bowl_set_scale (callback_widget, percent);
+}
+
 /* Start up BOWL. */
 void
 bowl_init (void)
@@ -342,13 +350,6 @@
 
   if (!inited)
     {
-      struct widget *w;
-
-      void callback (int percent)
-	{
-	  bowl_set_scale (w, percent);
-	}
-
       bowl_init_palette(&pixmap_tux75);
 
       bowl_flush ();
@@ -356,7 +357,7 @@
         {
           bowl_title (_("Please wait"));
           bowl_new_text (_("Detecting mice..."));
-          w = bowl_new_scale (100);
+          callback_widget = bowl_new_scale (100);
           bowl_layout ();
           boml_init (callback);
         }

bogl-0.1.9-2.6fbdev.patch:

--- NEW FILE bogl-0.1.9-2.6fbdev.patch ---
--- bogl/bogl.c.26fb	2004-01-29 17:08:06.000000000 -0500
+++ bogl/bogl.c	2004-02-17 20:49:01.396524931 -0500
@@ -136,7 +136,11 @@
   if (-1 == ioctl (fb, FBIOGET_FSCREENINFO, &fb_fix)
       || -1 == ioctl (fb, FBIOGET_VSCREENINFO, &fb_var))
     return bogl_fail ("reading screen info: %s", strerror (errno));
-  
+
+  fb_var.activate = FB_ACTIVATE_NXTOPEN;
+  if (-1 == ioctl (fb, FBIOPUT_VSCREENINFO, &fb_var))
+      return bogl_fail ("setting fb screeninfo: %s", strerror (errno));
+
   bogl_xres = fb_var.xres;
   bogl_yres = fb_var.yres;
   bogl_bpp = fb_var.bits_per_pixel;


--- NEW FILE bogl.spec ---
Summary: A terminal program for displaying Unicode on the console
Name: bogl
Version: 0.1.18
Release: 13
URL: http://packages.debian.org/unstable/source/bogl
Source0: http://ftp.debian.org/debian/pool/main/b/bogl/bogl_0.1.18-1.5.tar.gz
Source1: 14x14cjk.bdf.gz
Patch0: bogl-0.1.18-1.1.sigchld.patch
Patch1: bogl-0.1.18-1.2.reduce-font.patch
Patch2: bogl-0.1.18-1.2.gzip-fonts.patch
Patch3: bogl-0.1.18-1.2.term.patch
Patch4: bogl-0.1.18-1.5.rh.patch
Patch5: bogl-0.1.9-2.6fbdev.patch
Patch6: bogl-0.1.18-noexecstack.patch
Epoch: 0
License: GPL
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gd-devel, libpng-devel

%description
BOGL stands for Ben's Own Graphics Library.  It is a small graphics
library for Linux kernel frame buffers.  It supports only very simple
graphics.

%package devel
Summary: Development files required to build BOGL applications
Group: Development/Libraries
Requires: bogl = %{epoch}:%{version}-%{release}

%description devel
The bogl-devel package contains the static libraries and header files
for writing BOGL applications.

%package bterm
Summary: A Unicode capable terminal program for the Linux frame buffer
Group: Applications/System
# Only for %{_datadir}/terminfo/b
Requires: ncurses

%description bterm
The bterm application is a terminal emulator that displays to a Linux
frame buffer.  It is able to display Unicode text on the console.

%prep
%setup -q -n bogl-0.1.18
%patch0 -p1 -b .sigchld
%patch1 -p1 -b .reduce-font
%patch2 -p1 -b .gzip-fonts
%patch3 -p1 -b .term
%patch4 -p1 -b .rh
%patch5 -p1 -b .26fbdev
%patch6 -p1 -b .noexecstack

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
gunzip -c %{SOURCE1} > font.bdf
./bdftobogl -b font.bdf > font.bgf

%install
rm -rf $RPM_BUILD_ROOT
make CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} install
mkdir -p $RPM_BUILD_ROOT/usr/share/bogl/
cp font.bgf $RPM_BUILD_ROOT/usr/share/bogl/
gzip -9 $RPM_BUILD_ROOT/usr/share/bogl/font.bgf

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc ChangeLog README debian/copyright
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root)
%{_bindir}/bdftobogl
%{_bindir}/mergebdf
%{_bindir}/pngtobogl
%{_bindir}/reduce-font
%exclude %{_libdir}/*.a
%{_libdir}/*.so
%{_includedir}/bogl

%files bterm
%defattr(-,root,root)
%doc README.BOGL-bterm debian/copyright
%{_bindir}/bterm
%{_datadir}/terminfo/b/bterm
/usr/share/bogl

%changelog
* Fri Nov 10 2006 Miloslav Trmac  - 0:0.1.18-13
- Add URL:
- Preserve modification date of header files
- Ship debian/copyright
- Compile all files with $RPM_OPT_FLAGS

* Sun Nov  5 2006 Miloslav Trmac  - 0:0.1.18-12
- Update to bogl-0.1.18-1.5
- Drop wlite
- Split rh.patch by functionality
- Move the default font to /usr/share/bogl, don't ship it as BDF
- Change to conform to Fedora packaging guidelines

* Tue Oct 17 2006 Miloslav Trmac  - 0:0.1.18-11.2.1.el5.1
- Rebuild for RHEL 5
- Use sysconf(_SC_PAGE_SIZE) instead  to fix build on IA-64

* Fri Feb 10 2006 Jesse Keating  - 0:0.1.18-11.2.1
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating  - 0:0.1.18-11.2
- rebuilt for new gcc4.1 snapshot and glibc changes

* Fri Dec 09 2005 Jesse Keating 
- rebuilt

* Thu Sep 22 2005 Miloslav Trmac  - 0:0.1.18-11
- Update to bogl-0.1.18-1.2

* Tue Sep 20 2005 Miloslav Trmac  - 0:0.1.18-10
- Simplify overzealous bogl-0.1.18-1.1.sigchld.patch

* Tue Sep 20 2005 Miloslav Trmac  - 0:0.1.18-9
- Update to bogl-0.1.18-1.1
- Don't ship unused ucs fonts in the SRPM
- Remove obsolete URL: (#168673)

* Sun Sep 18 2005 Miloslav Trmac  - 0:0.1.18-8
- Ship wlite and Unicode data licenses, and Changelog

* Fri Mar  4 2005 Miloslav Trmac  - 0:0.1.18-7
- Add missing includes in bogl-0.1.18-rh.patch
- Rebuild with gcc 4

* Thu Feb 17 2005 Miloslav Trmac  - 0:0.1.18-6
- Don't require executable stack
- Fix build with gcc 4
- Use $RPM_OPT_FLAGS

* Tue Nov 23 2004 Jeremy Katz  - 0:0.1.18-5
- don't build against dietlibc anymore on x86

* Wed Oct 20 2004 Jeremy Katz  - 0:0.1.18-4
- rebuild again

* Tue Oct 19 2004 Jeremy Katz  - 0:0.1.18-3
- rebuild against newer diet with fixed signal handling

* Mon Sep  6 2004 Jeremy Katz  - 0:0.1.18-2
- fPIC on ppc too (#130719)

* Mon Jul 05 2004 Akira TAGOH  0:0.1.18-1
- New upstream release.
  #113910 has been fixed in this release.
- bogl-0.1.18-rh.patch: updated to be able to apply it for this release.
- bogl-0.1.9-vga16-others.patch: removed. no need this patch anymore.

* Fri Jun 18 2004 Jeremy Katz  - 0:0.1.9-33
- fix build with gcc 3.4

* Tue Jun 15 2004 Elliot Lee 
- rebuilt

* Tue Mar 02 2004 Elliot Lee 
- rebuilt

* Wed Feb 18 2004 Jeremy Katz  - 0:0.1.9-31
- fix build

* Tue Feb 17 2004 Jeremy Katz  - 0:0.1.9-30
- fix to work with changed 2.6 fbdev semantics

* Fri Feb 13 2004 Elliot Lee 
- rebuilt

* Mon Dec 15 2003 Matt Wilson  0:0.1.9-28
- add BuildRequires: gd-devel, libpng-devel (#111165)

* Mon Aug 25 2003 Jeremy Katz  0:0.1.9-27
- add hack to fix #92240

* Wed Jun 04 2003 Elliot Lee 
- rebuilt

* Fri May 30 2003 Matt Wilson  0:0.1.9-25
- rebuild

* Fri May 30 2003 Matt Wilson  0:0.1.9-24
- enable vga16 support on ia64
- removed workaround for AMD64, kernel should be fixed now

* Tue May 06 2003 Phil Knirsch   0:0.1.9-23
- Bumped release and rebuilt due to new gd version.

* Wed Apr  2 2003 Matt Wilson  0:0.1.9-22
- add a workaround for AMD64 that calls iopl(3) in order to gain io
  port access until ioperm() is fixed (#87835).  Workaround for
  (#86321)
- gzip font.bgf

* Wed Mar 19 2003 Jeremy Katz  0:0.1.9-21
- include vga16fb support on x86_64 (#86321)

* Thu Feb 13 2003 Adrian Havill  0:0.1.9-20
- Change the font combo to add zh, change ja to k14 (#81717, #82888)

* Tue Feb 11 2003 Jeremy Katz  0:0.1.9-19
- actually do the test correctly
- buildrequire dietlibc on i386

* Tue Feb 11 2003 Jeremy Katz  0:0.1.9-18
- only fPIC on needed arches, and do it everywhere

* Mon Feb 10 2003 Matt Wilson  0:0.1.9-17
- always use wlite for bogl/bterm (for now) (#83980)
  (this makes bterm useless for any non-UTF-8 locale)
- fixed 'bterm' for the normal usage case

* Mon Feb  3 2003 Matt Wilson  0:0.1.9-16
- add back the Epoch: to support upgrading from betas

* Wed Jan 22 2003 Tim Powers 
- rebuilt

* Mon Dec 30 2002 Jeremy Katz  0.1.9-14
- build wlite with -fPIC
- fix deps of subpackages

* Sun Dec 29 2002 Florian La Roche 
- delete "Epoch: 0" line in spec file

* Mon Dec 16 2002 Adrian Havill  0.1.9-12
- added bogl.bdf.gz to allow us to reduce-font in loader build

* Mon Dec 16 2002 Adrian Havill  0.1.9-11
- fixed broken reduce-font to test ENCODING x instead of STARTCHAR x

* Mon Dec 16 2002 Matt Wilson  0.1.9-10
- made more changes to the rh patch to enable bogl embedding insode loader

* Tue Dec 10 2002 Matt Wilson 
- use all fb drivers on non-i386
- package wlite for use in loader
- use %%{_libdir} to get lib64 right

* Mon Dec 10 2002 Adrian Havill 
- swapped out utf8 code with new and improved wlite

* Tue Nov 26 2002 Adrian Havill 
- re-write font loader so it can load uncompressed or gzipped files
- utf8 lib updated
- fixed bug in bogl_term_new() so struct is inited (s/malloc/calloc/)
- added term bell (screen flash)
- changed background/foreground to pretty pretty blue/white

* Thu Nov 21 2002 Adrian Havill 
- updated utf8 library
- made bogl_term_out reset the state at every call so glibc
  and utf8.c behave consistently
- concatenated two Red Hat diff patches

* Wed Nov 20 2002 Adrian Havill 
- changed behavior of bogl_term_out to queue and save UTF broken between two
  buffers
- utf8 lib improvements

* Thu Nov 14 2002 root 
- integrate havill's utf8 for diet libs
- build and install font

* Tue Jul 23 2002 Matt Wilson 
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bogl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 16:12:09 -0000	1.1
+++ .cvsignore	10 Nov 2006 16:13:21 -0000	1.2
@@ -0,0 +1,2 @@
+14x14cjk.bdf.gz
+bogl_0.1.18-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bogl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 16:12:09 -0000	1.1
+++ sources	10 Nov 2006 16:13:21 -0000	1.2
@@ -0,0 +1,2 @@
+c08ab351a43a91632127f509aadc6797  14x14cjk.bdf.gz
+81aa55429880d424e40014f45770f8ec  bogl_0.1.18-1.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 16:14:07 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:14:07 -0700
Subject: rpms/phpMyAdmin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611101614.kAAGE71w032104@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32082/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module phpMyAdmin


--- 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  Fri Nov 10 16:16:20 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:16:20 -0700
Subject: rpms/phpMyAdmin import.log,1.1,1.2
Message-ID: <200611101616.kAAGGKfP032202@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32168

Modified Files:
	import.log 
Log Message:
auto-import phpMyAdmin-2.9.1-1alpha on branch devel from phpMyAdmin-2.9.1-1alpha.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 16:14:01 -0000	1.1
+++ import.log	10 Nov 2006 16:15:50 -0000	1.2
@@ -0,0 +1 @@
+phpMyAdmin-2_9_1-1alpha:HEAD:phpMyAdmin-2.9.1-1alpha.src.rpm:1163175335



From fedora-extras-commits at redhat.com  Fri Nov 10 16:16:20 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:16:20 -0700
Subject: rpms/phpMyAdmin/devel phpMyAdmin-config.inc.php, NONE,
	1.1 phpMyAdmin.htaccess, NONE, 1.1 phpMyAdmin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611101616.kAAGGK7H032206@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32168/devel

Modified Files:
	.cvsignore sources 
Added Files:
	phpMyAdmin-config.inc.php phpMyAdmin.htaccess phpMyAdmin.spec 
Log Message:
auto-import phpMyAdmin-2.9.1-1alpha on branch devel from phpMyAdmin-2.9.1-1alpha.src.rpm


--- NEW FILE phpMyAdmin-config.inc.php ---
= 4.3.0)
$cfg['Servers'][$i]['controluser']   = '';          // MySQL control user settings
                                                    // (this user must have read-only
$cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
                                                    // and "mysql/db" tables).
                                                    // The controluser is also
                                                    // used for all relational
                                                    // features (pmadb)
$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (config, http or cookie based)?
$cfg['Servers'][$i]['user']          = '';      // MySQL user
$cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                    // with 'config' auth_type)
$cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only
                                                    // this db is displayed in left frame
                                                    // It may also be an array of db-names, where sorting order is relevant.
$cfg['Servers'][$i]['hide_db']       = '';          // Database name to be hidden from listings
$cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname

$cfg['Servers'][$i]['pmadb']         = '';          // Database used for Relation, Bookmark and PDF Features
                                                    // (see scripts/create_tables.sql)
                                                    //   - leave blank for no support
                                                    //     DEFAULT: 'phpmyadmin'
$cfg['Servers'][$i]['bookmarktable'] = '';          // Bookmark table
                                                    //   - leave blank for no bookmark support
                                                    //     DEFAULT: 'pma_bookmark'
$cfg['Servers'][$i]['relation']      = '';          // table to describe the relation between links (see doc)
                                                    //   - leave blank for no relation-links support
                                                    //     DEFAULT: 'pma_relation'
$cfg['Servers'][$i]['table_info']    = '';          // table to describe the display fields
                                                    //   - leave blank for no display fields support
                                                    //     DEFAULT: 'pma_table_info'
$cfg['Servers'][$i]['table_coords']  = '';          // table to describe the tables position for the PDF schema
                                                    //   - leave blank for no PDF schema support
                                                    //     DEFAULT: 'pma_table_coords'
$cfg['Servers'][$i]['pdf_pages']     = '';          // table to describe pages of relationpdf
                                                    //   - leave blank if you don't want to use this
                                                    //     DEFAULT: 'pma_pdf_pages'
$cfg['Servers'][$i]['column_info']   = '';          // table to store column information
                                                    //   - leave blank for no column comments/mime types
                                                    //     DEFAULT: 'pma_column_info'
$cfg['Servers'][$i]['history']       = '';          // table to store SQL history
                                                    //   - leave blank for no SQL query history
                                                    //     DEFAULT: 'pma_history'
$cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your pma_* tables
                                                    // are up to date. This prevents compatibility
                                                    // checks and thereby increases performance.
$cfg['Servers'][$i]['AllowRoot']     = TRUE;        // whether to allow root login
$cfg['Servers'][$i]['AllowDeny']['order']           // Host authentication order, leave blank to not use
                                     = '';
$cfg['Servers'][$i]['AllowDeny']['rules']           // Host authentication rules, leave blank for defaults
                                     = array();
?>


--- NEW FILE phpMyAdmin.htaccess ---
# phpMyAdmin - Web based MySQL browser written in php
# 
# Allows only localhost by default
#
# But allowing phpMyAdmin to anyone other than localhost should be considered
# dangerous unless properly secured by SSL

Alias /phpMyAdmin /usr/share/phpMyAdmin

   order deny,allow
   deny from all
   allow from 127.0.0.1


# This directory does not require access over HTTP - taken from the original
# phpMyAdmin upstream tarball
#

    Order Deny,Allow
    Deny from All
    Allow from None


# This configuration prevents mod_security at phpMyAdmin directories from
# filtering SQL etc.
#

    
        SecFilterInheritance Off
    




--- NEW FILE phpMyAdmin.spec ---
Name: phpMyAdmin
Version: 2.9.1
Release: 1alpha
Summary: Web based MySQL browser written in php

Group:	Applications/Internet
License: GPL
URL: http://www.phpmyadmin.net/	
Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-rc2-all-languages.tar.bz2
Source1: phpMyAdmin-config.inc.php
Source2: phpMyAdmin.htaccess
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: webserver 
Requires: php >= 4.1.0
Requires: php-mysql  >= 4.1.0
Requires: php-mbstring >= 4.1.0
Requires(postun): /sbin/service
Requires(post): /sbin/service

%description
phpMyAdmin is a tool written in PHP intended to handle the administration of
MySQL over the Web. Currently it can create and drop databases,
create/drop/alter tables, delete/edit/add fields, execute any SQL statement,
manage keys on fields, manage privileges,export data into various formats and
is available in 50 languages

%prep
%setup -qn phpMyAdmin-%{version}-rc2-all-languages

%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
%{__cp} -ad ./* %{buildroot}/%{_datadir}/%{name}
%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf
%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php
ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php

%{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt
%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLCT]*
%{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess

%clean
rm -rf %{buildroot}

%post
/sbin/service httpd condrestart > /dev/null 2>&1 || :

%postun
/sbin/service httpd condrestart > /dev/null 2>&1 || :

%files
%defattr(-,root,root,-)
%doc INSTALL README LICENSE CREDITS TODO Documentation.txt
%{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf
%config(noreplace) %{_sysconfdir}/%{name}

%changelog
* Fri Nov 10 2006 Mike McGrath  2.9.1-1alpha
- Added alpha tag since this is a release candidate

* Tue Nov 07 2006 Mike McGrath  2.9.1-1
- Upstream released new version

* Wed Oct 04 2006 Mike McGrath  2.9.0.2-1
- Upstream released new version

* Thu Jul 06 2006 Mike McGrath  2.8.2-2
- Fixed a typo in the Apache config

* Mon Jul 03 2006 Mike McGrath  2.8.2-1
- Upstream released 2.8.2
- Added more restrictive directives to httpd/conf.d/phpMyAdmin.conf
- removed htaccess file from the libraries dir
- Specific versions for various requires

* Sat May 13 2006 Mike McGrath  2.8.0.4-1
- Upstream released 2.8.0.4
- Added requires php, instead of requires httpd, now using webserver

* Sun May 07 2006 Mike McGrath  2.8.0.3-2
- Added mysql-php and php-mbstring as a requires

* Thu Apr 07 2006 Mike McGrath  2.8.0.3-1
- Fixed XSS vulnerability: PMASA-2006-1
- It was possible to conduct an XSS attack with a direct call to some scripts
- under the themes directory.

* Tue Apr 04 2006 Mike McGrath  2.8.0.2-3
- Made config files actually configs
- Moved doc files to the doc dir

* Tue Apr 04 2006 Mike McGrath  2.8.0.2-2
- Moved everything to %{_datadir}
- Moved config file to /etc/
- Used description from phpMyAdmin project info

* Mon Apr 03 2006 Mike McGrath  2.8.0.2-1
- Initial Spec file creation for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 16:14:06 -0000	1.1
+++ .cvsignore	10 Nov 2006 16:15:50 -0000	1.2
@@ -0,0 +1 @@
+phpMyAdmin-2.9.1-rc2-all-languages.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 16:14:06 -0000	1.1
+++ sources	10 Nov 2006 16:15:50 -0000	1.2
@@ -0,0 +1 @@
+a49c0d06d98cf842b78f9686e642d952  phpMyAdmin-2.9.1-rc2-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov 10 16:17:12 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:17:12 -0700
Subject: owners owners.list,1.1914,1.1915
Message-ID: <200611101617.kAAGHCcg032259@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32238

Modified Files:
	owners.list 
Log Message:
Add bogl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1914
retrieving revision 1.1915
diff -u -r1.1914 -r1.1915
--- owners.list	9 Nov 2006 19:28:46 -0000	1.1914
+++ owners.list	10 Nov 2006 16:16:41 -0000	1.1915
@@ -129,6 +129,7 @@
 Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|bogl|A terminal program for displaying Unicode on the console|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|bogofilter|Fast anti-spam filtering by Bayesian statistical analysis|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|boo|Boo is an OO statically typed language for CLI|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 16:41:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:41:54 -0700
Subject: rpms/theora-exp - New directory
Message-ID: <200611101641.kAAGfsQF032522@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32517/theora-exp

Log Message:
Directory /cvs/extras/rpms/theora-exp added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:42:00 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:42:00 -0700
Subject: rpms/theora-exp/devel - New directory
Message-ID: <200611101642.kAAGg0ib032554@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32517/theora-exp/devel

Log Message:
Directory /cvs/extras/rpms/theora-exp/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:42:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:42:17 -0700
Subject: rpms/theora-exp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611101642.kAAGgHCc032585@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32579

Added Files:
	Makefile import.log 
Log Message:
Setup of module theora-exp


--- NEW FILE Makefile ---
# Top level Makefile for module theora-exp
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  Fri Nov 10 16:42:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:42:23 -0700
Subject: rpms/theora-exp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611101642.kAAGgNQW032601@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module theora-exp


--- 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  Fri Nov 10 16:42:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:42:26 -0700
Subject: owners owners.list,1.1915,1.1916
Message-ID: <200611101642.kAAGgQtO032611@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32529

Modified Files:
	owners.list 
Log Message:
added beneath-a-steel-sky-cd


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1915
retrieving revision 1.1916
diff -u -r1.1915 -r1.1916
--- owners.list	10 Nov 2006 16:16:41 -0000	1.1915
+++ owners.list	10 Nov 2006 16:41:56 -0000	1.1916
@@ -106,6 +106,7 @@
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 16:43:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:43:22 -0700
Subject: rpms/theora-exp import.log,1.1,1.2
Message-ID: <200611101643.kAAGhMxT032680@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32644

Modified Files:
	import.log 
Log Message:
auto-import theora-exp-0.0.1-0.1.svn12061 on branch devel from theora-exp-0.0.1-0.1.svn12061.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/theora-exp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 16:42:17 -0000	1.1
+++ import.log	10 Nov 2006 16:42:52 -0000	1.2
@@ -0,0 +1 @@
+theora-exp-0_0_1-0_1_svn12061:HEAD:theora-exp-0.0.1-0.1.svn12061.src.rpm:1163177036



From fedora-extras-commits at redhat.com  Fri Nov 10 16:43:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:43:23 -0700
Subject: rpms/theora-exp/devel theora-exp.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611101643.kAAGhNJS032684@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32644/devel

Modified Files:
	.cvsignore sources 
Added Files:
	theora-exp.spec 
Log Message:
auto-import theora-exp-0.0.1-0.1.svn12061 on branch devel from theora-exp-0.0.1-0.1.svn12061.src.rpm


--- NEW FILE theora-exp.spec ---
%define svn     svn12061

Name:           theora-exp
Version:        0.0.1
Release:        0.1.%{svn}%{?dist}
Summary:        Experimental theora decoder
Group:          System Environment/Libraries
License:        BSD
URL:            http://svn.xiph.org/trunk/theora-exp/
# create this by doing:
# svn co http://svn.xiph.org/trunk/theora-exp/
# rm -fr `find theora-exp -name .svn`
# rm -fr theora-exp/doc
# tar cvfz theora-exp-%{svn}.tar.gz theora-exp
Source0:        %{name}-%{svn}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtool libvorbis-devel SDL-devel libtheora-devel

%description
Experimental theora decoder with full support for the complete theora
specification (libtheora only supports a subset).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n %{name}
aclocal -I m4
autoheader
libtoolize --automake
automake --add-missing
autoconf


%build
%configure --disable-dependency-tracking --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libtheoradec.la


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_libdir}/libtheoradec.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/theora
%{_libdir}/libtheoradec.so
%{_libdir}/pkgconfig/theoradec.pc


%changelog
* Tue Nov  7 2006 Hans de Goede  0.0.1-0.1.svn12061
- New snapshot svn version 12061
- Various specfile improvements, thanks to Dmitry Butskoy

* Sun Jul 30 2006 Hans de Goede  0.0-0.1.20060730
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/theora-exp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 16:42:23 -0000	1.1
+++ .cvsignore	10 Nov 2006 16:42:53 -0000	1.2
@@ -0,0 +1 @@
+theora-exp-svn12061.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/theora-exp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 16:42:23 -0000	1.1
+++ sources	10 Nov 2006 16:42:53 -0000	1.2
@@ -0,0 +1 @@
+0866b55d727a888e553be2293f2ab9c8  theora-exp-svn12061.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 16:44:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:44:26 -0700
Subject: owners owners.list,1.1916,1.1917
Message-ID: <200611101644.kAAGiQkj032749@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32733

Modified Files:
	owners.list 
Log Message:
added flight-of-the-amazon-queen


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1916
retrieving revision 1.1917
diff -u -r1.1916 -r1.1917
--- owners.list	10 Nov 2006 16:41:56 -0000	1.1916
+++ owners.list	10 Nov 2006 16:43:55 -0000	1.1917
@@ -400,6 +400,7 @@
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flasm|Flash bytecode assembler disassembler|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 16:50:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:50:05 -0700
Subject: owners owners.list,1.1917,1.1918
Message-ID: <200611101650.kAAGo5Sh000356@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv338

Modified Files:
	owners.list 
Log Message:
added theora-exp


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1917
retrieving revision 1.1918
diff -u -r1.1917 -r1.1918
--- owners.list	10 Nov 2006 16:43:55 -0000	1.1917
+++ owners.list	10 Nov 2006 16:49:35 -0000	1.1918
@@ -2235,6 +2235,7 @@
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|theora-exp|Experimental theora decoder|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|thewidgetfactory|A tool for previewing widgets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 16:58:05 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 09:58:05 -0700
Subject: rpms/twinkle/devel twinkle.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200611101658.kAAGw5DA000488@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv465

Modified Files:
	twinkle.spec sources .cvsignore 
Log Message:
Upgrade to 0.9



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle.spec	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle.spec	10 Nov 2006 16:57:35 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           twinkle
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
-Patch0:		twinkle-libbind.patch
+Patch0:         twinkle-libbind.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
+- Upgrade to 0.9
+
 * Sun Sep 24 2006 Kevin Fenzi  - 0.8.1-2
 - Add bind-libbind-devel as a BuildRequires and link against it
   to fix private glibc symbols. 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 16:32:40 -0000	1.2
+++ sources	10 Nov 2006 16:57:35 -0000	1.3
@@ -1 +1 @@
-245ffd3b4a6f968d8f80d42f6aad079c  twinkle-0.8.1.tar.gz
+74ef85e9f4570cec10bd23d301f5549e  twinkle-0.9.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 16:32:40 -0000	1.2
+++ .cvsignore	10 Nov 2006 16:57:35 -0000	1.3
@@ -1 +1 @@
-twinkle-0.8.1.tar.gz
+twinkle-0.9.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 16:59:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri, 10 Nov 2006 09:59:20 -0700
Subject: owners owners.list,1.1918,1.1919
Message-ID: <200611101659.kAAGxKem000554@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538

Modified Files:
	owners.list 
Log Message:
Fix missing pipes and broken initial-CC...


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1918
retrieving revision 1.1919
diff -u -r1.1918 -r1.1919
--- owners.list	10 Nov 2006 16:49:35 -0000	1.1918
+++ owners.list	10 Nov 2006 16:58:50 -0000	1.1919
@@ -106,7 +106,7 @@
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -400,7 +400,7 @@
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flasm|Flash bytecode assembler disassembler|pertusus at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -1979,7 +1979,7 @@
 Fedora Extras|qjackctl|Qt based JACK control application|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|icon at fedoraproject.org,extras-qa at fedoraproject.org|
+Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org|icon at fedoraproject.org
 Fedora Extras|qstat|Real-time Game Server Status for FPS game servers|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|qsynth|Qt based Fluidsynth GUI front end|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -2235,7 +2235,7 @@
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
-Fedora Extras|theora-exp|Experimental theora decoder|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|theora-exp|Experimental theora decoder|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|thewidgetfactory|A tool for previewing widgets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 17:54:12 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 10:54:12 -0700
Subject: rpms/twinkle/FC-6 twinkle.spec, 1.1, 1.2 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611101754.kAAHsC0F003841@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3812

Modified Files:
	twinkle.spec .cvsignore sources 
Log Message:
Upgrade to 0.9



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/twinkle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle.spec	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle.spec	10 Nov 2006 17:53:41 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           twinkle
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
-Patch0:		twinkle-libbind.patch
+Patch0:         twinkle-libbind.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
+- Upgrade to 0.9
+
 * Sun Sep 24 2006 Kevin Fenzi  - 0.8.1-2
 - Add bind-libbind-devel as a BuildRequires and link against it
   to fix private glibc symbols. 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 16:32:40 -0000	1.2
+++ .cvsignore	10 Nov 2006 17:53:41 -0000	1.3
@@ -1 +1 @@
-twinkle-0.8.1.tar.gz
+twinkle-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 16:32:40 -0000	1.2
+++ sources	10 Nov 2006 17:53:41 -0000	1.3
@@ -1 +1 @@
-245ffd3b4a6f968d8f80d42f6aad079c  twinkle-0.8.1.tar.gz
+74ef85e9f4570cec10bd23d301f5549e  twinkle-0.9.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 18:04:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 11:04:11 -0700
Subject: rpms/twinkle/FC-6 twinkle.spec, 1.2, 1.3 twinkle-libbind.patch, 1.1,
	1.2
Message-ID: <200611101804.kAAI4BOu006922@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6901

Modified Files:
	twinkle.spec twinkle-libbind.patch 
Log Message:
Rebuild with correct libbind patch



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/twinkle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- twinkle.spec	10 Nov 2006 17:53:41 -0000	1.2
+++ twinkle.spec	10 Nov 2006 18:03:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-2
+- Rebuild with correct libbind patch
+
 * Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
 - Upgrade to 0.9
 

twinkle-libbind.patch:

Index: twinkle-libbind.patch
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/twinkle-libbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle-libbind.patch	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle-libbind.patch	10 Nov 2006 18:03:40 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur twinkle-0.8.1.orig/configure twinkle-0.8.1/configure
---- twinkle-0.8.1.orig/configure	2006-07-09 08:09:28.000000000 -0600
-+++ twinkle-0.8.1/configure	2006-09-24 14:16:26.000000000 -0600
-@@ -7949,10 +7949,10 @@
+diff -Nur twinkle-0.9.orig/configure twinkle-0.9/configure
+--- twinkle-0.9.orig/configure	2006-10-01 13:11:04.000000000 -0600
++++ twinkle-0.9/configure	2006-10-02 14:56:02.000000000 -0600
+@@ -7965,10 +7965,10 @@
  
  
  
@@ -15,7 +15,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7998,7 +7998,7 @@
+@@ -8014,7 +8014,7 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -24,21 +24,21 @@
        echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
-diff -Nur twinkle-0.8.1.orig/src/gui/Makefile twinkle-0.8.1/src/gui/Makefile
---- twinkle-0.8.1.orig/src/gui/Makefile	2006-07-09 08:10:02.000000000 -0600
-+++ twinkle-0.8.1/src/gui/Makefile	2006-09-24 16:12:14.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/Makefile twinkle-0.9/src/gui/Makefile
+--- twinkle-0.9.orig/src/gui/Makefile	2006-10-01 13:11:54.000000000 -0600
++++ twinkle-0.9/src/gui/Makefile	2006-10-02 14:57:34.000000000 -0600
 @@ -19,7 +19,7 @@
- INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/usr/include/cc++2 -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
+ INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
  LINK     = g++
  LFLAGS   = 
--LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
-+LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
+-LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
++LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
  AR       = ar cqs
  RANLIB   = 
  MOC      = $(QTDIR)/bin/moc
-diff -Nur twinkle-0.8.1.orig/src/gui/twinkle.pro twinkle-0.8.1/src/gui/twinkle.pro
---- twinkle-0.8.1.orig/src/gui/twinkle.pro	2006-07-07 12:44:07.000000000 -0600
-+++ twinkle-0.8.1/src/gui/twinkle.pro	2006-09-24 16:12:01.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/twinkle.pro twinkle-0.9/src/gui/twinkle.pro
+--- twinkle-0.9.orig/src/gui/twinkle.pro	2006-09-30 15:45:13.000000000 -0600
++++ twinkle-0.9/src/gui/twinkle.pro	2006-10-02 14:57:47.000000000 -0600
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
@@ -48,9 +48,9 @@
  
  DEFINES	+= QT_NO_STL
  
-diff -Nur twinkle-0.8.1.orig/src/Makefile.in twinkle-0.8.1/src/Makefile.in
---- twinkle-0.8.1.orig/src/Makefile.in	2006-07-09 08:09:32.000000000 -0600
-+++ twinkle-0.8.1/src/Makefile.in	2006-09-24 14:24:47.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/Makefile.in twinkle-0.9/src/Makefile.in
+--- twinkle-0.9.orig/src/Makefile.in	2006-10-01 13:11:08.000000000 -0600
++++ twinkle-0.9/src/Makefile.in	2006-10-02 14:56:28.000000000 -0600
 @@ -338,7 +338,7 @@
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
@@ -60,9 +60,9 @@
  	-lsndfile\
  	-lboost_regex
  
-diff -Nur twinkle-0.8.1.orig/src/sockets/dnssrv.cpp twinkle-0.8.1/src/sockets/dnssrv.cpp
---- twinkle-0.8.1.orig/src/sockets/dnssrv.cpp	2006-01-01 08:40:15.000000000 -0700
-+++ twinkle-0.8.1/src/sockets/dnssrv.cpp	2006-09-24 16:22:12.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/sockets/dnssrv.cpp twinkle-0.9/src/sockets/dnssrv.cpp
+--- twinkle-0.9.orig/src/sockets/dnssrv.cpp	2006-09-18 14:12:56.000000000 -0600
++++ twinkle-0.9/src/sockets/dnssrv.cpp	2006-10-02 14:57:22.000000000 -0600
 @@ -10,7 +10,6 @@
  #include 
  #include 



From fedora-extras-commits at redhat.com  Fri Nov 10 18:38:38 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Nov 2006 11:38:38 -0700
Subject: rpms/gperiodic/FC-6 gperiodic.spec,1.5,1.6
Message-ID: <200611101838.kAAIccIP007256@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240

Modified Files:
	gperiodic.spec 
Log Message:



Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/gperiodic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gperiodic.spec	9 Nov 2006 18:54:49 -0000	1.5
+++ gperiodic.spec	10 Nov 2006 18:38:08 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
@@ -58,6 +58,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-6
+- Rebuild for distag problem
+
 * Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
 - Modify URL in package descrpition and source
 



From fedora-extras-commits at redhat.com  Fri Nov 10 18:43:09 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 11:43:09 -0700
Subject: rpms/twinkle/FC-5 twinkle.spec, 1.1, 1.2 twinkle-libbind.patch, 1.1,
	1.2 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611101843.kAAIh9LY007998@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7866

Modified Files:
	twinkle.spec twinkle-libbind.patch .cvsignore sources 
Log Message:
Upgrade to 0.9



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-5/twinkle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle.spec	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle.spec	10 Nov 2006 18:42:38 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           twinkle
-Version:        0.8.1
+Version:        0.9
 Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
@@ -7,7 +7,7 @@
 License:        GPL
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
-Patch0:		twinkle-libbind.patch
+Patch0:         twinkle-libbind.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -60,6 +60,12 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-2
+- Rebuild with correct libbind patch
+
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
+- Upgrade to 0.9
+
 * Sun Sep 24 2006 Kevin Fenzi  - 0.8.1-2
 - Add bind-libbind-devel as a BuildRequires and link against it
   to fix private glibc symbols. 

twinkle-libbind.patch:

Index: twinkle-libbind.patch
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-5/twinkle-libbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle-libbind.patch	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle-libbind.patch	10 Nov 2006 18:42:38 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur twinkle-0.8.1.orig/configure twinkle-0.8.1/configure
---- twinkle-0.8.1.orig/configure	2006-07-09 08:09:28.000000000 -0600
-+++ twinkle-0.8.1/configure	2006-09-24 14:16:26.000000000 -0600
-@@ -7949,10 +7949,10 @@
+diff -Nur twinkle-0.9.orig/configure twinkle-0.9/configure
+--- twinkle-0.9.orig/configure	2006-10-01 13:11:04.000000000 -0600
++++ twinkle-0.9/configure	2006-10-02 14:56:02.000000000 -0600
+@@ -7965,10 +7965,10 @@
  
  
  
@@ -15,7 +15,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7998,7 +7998,7 @@
+@@ -8014,7 +8014,7 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -24,21 +24,21 @@
        echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
-diff -Nur twinkle-0.8.1.orig/src/gui/Makefile twinkle-0.8.1/src/gui/Makefile
---- twinkle-0.8.1.orig/src/gui/Makefile	2006-07-09 08:10:02.000000000 -0600
-+++ twinkle-0.8.1/src/gui/Makefile	2006-09-24 16:12:14.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/Makefile twinkle-0.9/src/gui/Makefile
+--- twinkle-0.9.orig/src/gui/Makefile	2006-10-01 13:11:54.000000000 -0600
++++ twinkle-0.9/src/gui/Makefile	2006-10-02 14:57:34.000000000 -0600
 @@ -19,7 +19,7 @@
- INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/usr/include/cc++2 -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
+ INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
  LINK     = g++
  LFLAGS   = 
--LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
-+LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
+-LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
++LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
  AR       = ar cqs
  RANLIB   = 
  MOC      = $(QTDIR)/bin/moc
-diff -Nur twinkle-0.8.1.orig/src/gui/twinkle.pro twinkle-0.8.1/src/gui/twinkle.pro
---- twinkle-0.8.1.orig/src/gui/twinkle.pro	2006-07-07 12:44:07.000000000 -0600
-+++ twinkle-0.8.1/src/gui/twinkle.pro	2006-09-24 16:12:01.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/twinkle.pro twinkle-0.9/src/gui/twinkle.pro
+--- twinkle-0.9.orig/src/gui/twinkle.pro	2006-09-30 15:45:13.000000000 -0600
++++ twinkle-0.9/src/gui/twinkle.pro	2006-10-02 14:57:47.000000000 -0600
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
@@ -48,9 +48,9 @@
  
  DEFINES	+= QT_NO_STL
  
-diff -Nur twinkle-0.8.1.orig/src/Makefile.in twinkle-0.8.1/src/Makefile.in
---- twinkle-0.8.1.orig/src/Makefile.in	2006-07-09 08:09:32.000000000 -0600
-+++ twinkle-0.8.1/src/Makefile.in	2006-09-24 14:24:47.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/Makefile.in twinkle-0.9/src/Makefile.in
+--- twinkle-0.9.orig/src/Makefile.in	2006-10-01 13:11:08.000000000 -0600
++++ twinkle-0.9/src/Makefile.in	2006-10-02 14:56:28.000000000 -0600
 @@ -338,7 +338,7 @@
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
@@ -60,9 +60,9 @@
  	-lsndfile\
  	-lboost_regex
  
-diff -Nur twinkle-0.8.1.orig/src/sockets/dnssrv.cpp twinkle-0.8.1/src/sockets/dnssrv.cpp
---- twinkle-0.8.1.orig/src/sockets/dnssrv.cpp	2006-01-01 08:40:15.000000000 -0700
-+++ twinkle-0.8.1/src/sockets/dnssrv.cpp	2006-09-24 16:22:12.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/sockets/dnssrv.cpp twinkle-0.9/src/sockets/dnssrv.cpp
+--- twinkle-0.9.orig/src/sockets/dnssrv.cpp	2006-09-18 14:12:56.000000000 -0600
++++ twinkle-0.9/src/sockets/dnssrv.cpp	2006-10-02 14:57:22.000000000 -0600
 @@ -10,7 +10,6 @@
  #include 
  #include 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 16:32:40 -0000	1.2
+++ .cvsignore	10 Nov 2006 18:42:38 -0000	1.3
@@ -1 +1 @@
-twinkle-0.8.1.tar.gz
+twinkle-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 16:32:40 -0000	1.2
+++ sources	10 Nov 2006 18:42:38 -0000	1.3
@@ -1 +1 @@
-245ffd3b4a6f968d8f80d42f6aad079c  twinkle-0.8.1.tar.gz
+74ef85e9f4570cec10bd23d301f5549e  twinkle-0.9.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 18:46:10 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 11:46:10 -0700
Subject: rpms/twinkle/devel twinkle-libbind.patch, 1.1, 1.2 twinkle.spec, 1.2,
	1.3
Message-ID: <200611101846.kAAIkAL3008613@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8492

Modified Files:
	twinkle-libbind.patch twinkle.spec 
Log Message:
Rebuild with correct libbind patch


twinkle-libbind.patch:

Index: twinkle-libbind.patch
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle-libbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle-libbind.patch	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle-libbind.patch	10 Nov 2006 18:45:39 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur twinkle-0.8.1.orig/configure twinkle-0.8.1/configure
---- twinkle-0.8.1.orig/configure	2006-07-09 08:09:28.000000000 -0600
-+++ twinkle-0.8.1/configure	2006-09-24 14:16:26.000000000 -0600
-@@ -7949,10 +7949,10 @@
+diff -Nur twinkle-0.9.orig/configure twinkle-0.9/configure
+--- twinkle-0.9.orig/configure	2006-10-01 13:11:04.000000000 -0600
++++ twinkle-0.9/configure	2006-10-02 14:56:02.000000000 -0600
+@@ -7965,10 +7965,10 @@
  
  
  
@@ -15,7 +15,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7998,7 +7998,7 @@
+@@ -8014,7 +8014,7 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -24,21 +24,21 @@
        echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
-diff -Nur twinkle-0.8.1.orig/src/gui/Makefile twinkle-0.8.1/src/gui/Makefile
---- twinkle-0.8.1.orig/src/gui/Makefile	2006-07-09 08:10:02.000000000 -0600
-+++ twinkle-0.8.1/src/gui/Makefile	2006-09-24 16:12:14.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/Makefile twinkle-0.9/src/gui/Makefile
+--- twinkle-0.9.orig/src/gui/Makefile	2006-10-01 13:11:54.000000000 -0600
++++ twinkle-0.9/src/gui/Makefile	2006-10-02 14:57:34.000000000 -0600
 @@ -19,7 +19,7 @@
- INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/usr/include/cc++2 -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
+ INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
  LINK     = g++
  LFLAGS   = 
--LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
-+LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
+-LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
++LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
  AR       = ar cqs
  RANLIB   = 
  MOC      = $(QTDIR)/bin/moc
-diff -Nur twinkle-0.8.1.orig/src/gui/twinkle.pro twinkle-0.8.1/src/gui/twinkle.pro
---- twinkle-0.8.1.orig/src/gui/twinkle.pro	2006-07-07 12:44:07.000000000 -0600
-+++ twinkle-0.8.1/src/gui/twinkle.pro	2006-09-24 16:12:01.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/twinkle.pro twinkle-0.9/src/gui/twinkle.pro
+--- twinkle-0.9.orig/src/gui/twinkle.pro	2006-09-30 15:45:13.000000000 -0600
++++ twinkle-0.9/src/gui/twinkle.pro	2006-10-02 14:57:47.000000000 -0600
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
@@ -48,9 +48,9 @@
  
  DEFINES	+= QT_NO_STL
  
-diff -Nur twinkle-0.8.1.orig/src/Makefile.in twinkle-0.8.1/src/Makefile.in
---- twinkle-0.8.1.orig/src/Makefile.in	2006-07-09 08:09:32.000000000 -0600
-+++ twinkle-0.8.1/src/Makefile.in	2006-09-24 14:24:47.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/Makefile.in twinkle-0.9/src/Makefile.in
+--- twinkle-0.9.orig/src/Makefile.in	2006-10-01 13:11:08.000000000 -0600
++++ twinkle-0.9/src/Makefile.in	2006-10-02 14:56:28.000000000 -0600
 @@ -338,7 +338,7 @@
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
@@ -60,9 +60,9 @@
  	-lsndfile\
  	-lboost_regex
  
-diff -Nur twinkle-0.8.1.orig/src/sockets/dnssrv.cpp twinkle-0.8.1/src/sockets/dnssrv.cpp
---- twinkle-0.8.1.orig/src/sockets/dnssrv.cpp	2006-01-01 08:40:15.000000000 -0700
-+++ twinkle-0.8.1/src/sockets/dnssrv.cpp	2006-09-24 16:22:12.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/sockets/dnssrv.cpp twinkle-0.9/src/sockets/dnssrv.cpp
+--- twinkle-0.9.orig/src/sockets/dnssrv.cpp	2006-09-18 14:12:56.000000000 -0600
++++ twinkle-0.9/src/sockets/dnssrv.cpp	2006-10-02 14:57:22.000000000 -0600
 @@ -10,7 +10,6 @@
  #include 
  #include 


Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- twinkle.spec	10 Nov 2006 16:57:35 -0000	1.2
+++ twinkle.spec	10 Nov 2006 18:45:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-2
+- Rebuild with correct libbind patch
+
 * Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
 - Upgrade to 0.9
 



From fedora-extras-commits at redhat.com  Fri Nov 10 19:11:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Nov 2006 12:11:52 -0700
Subject: rpms/gift-openft/devel gift-openft-0.2.1.6-fhs.patch, NONE,
	1.1 gift-openft.spec, 1.4, 1.5 gift-openft-0.2.1.6-lib64.patch,
	1.1, NONE
Message-ID: <200611101911.kAAJBq8i011936@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11912

Modified Files:
	gift-openft.spec 
Added Files:
	gift-openft-0.2.1.6-fhs.patch 
Removed Files:
	gift-openft-0.2.1.6-lib64.patch 
Log Message:
* Fri Nov 10 2006 Rex Dieter  0.2.1.6-5
- respin for new db4 (fc7)

* Tue Oct 31 2006 Rex Dieter  0.2.1.6-4
- cleanup lib64 patch (now -fhs patch)


gift-openft-0.2.1.6-fhs.patch:

--- NEW FILE gift-openft-0.2.1.6-fhs.patch ---
--- gift-openft-0.2.1.6/aclocal.m4.fhs	2005-04-30 19:05:50.000000000 -0500
+++ gift-openft-0.2.1.6/aclocal.m4	2006-10-31 07:34:12.000000000 -0600
@@ -6951,10 +6951,10 @@
      AC_SUBST(prefix)
    fi
 
-   plugindir=${prefix}/lib/giFT
+   plugindir=${libdir}/giFT
    AC_SUBST(plugindir)
 
-   datadir=${prefix}/share/giFT
+   datadir=${datadir}/giFT
    AC_SUBST(datadir)
   ])
 
--- gift-openft-0.2.1.6/configure.fhs	2005-04-30 19:05:57.000000000 -0500
+++ gift-openft-0.2.1.6/configure	2006-10-31 07:35:23.000000000 -0600
@@ -20198,10 +20198,10 @@
 
    fi
 
-   plugindir=${prefix}/lib/giFT
+   plugindir=${libdir}/giFT
 
 
-   datadir=${prefix}/share/giFT
+   datadir=${datadir}/giFT
 
 
 


Index: gift-openft.spec
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/devel/gift-openft.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gift-openft.spec	29 Aug 2006 17:36:44 -0000	1.4
+++ gift-openft.spec	10 Nov 2006 19:11:22 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: Openft plugin for giFT 
 Name:	 gift-openft	
 Version: 0.2.1.6
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group:	 System Environment/Libraries
@@ -10,7 +10,7 @@
 Source:	 http://dl.sourceforge.net/sourceforge/gift/gift-openft-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gift-openft-0.2.1.6-lib64.patch
+Patch1: gift-openft-0.2.1.6-fhs.patch
 
 BuildRequires: gift-devel
 BuildRequires: zlib-devel
@@ -23,7 +23,8 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .lib64
+# See also related gift bug: http://bugzilla.redhat.com/210114
+%patch1 -p1 -b .fhs
 
 
 %build
@@ -50,6 +51,12 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter  0.2.1.6-5
+- respin for new db4 (fc7)
+
+* Tue Oct 31 2006 Rex Dieter  0.2.1.6-4
+- cleanup lib64 patch (now -fhs patch)
+
 * Tue Aug 29 2006 Rex Dieter  0.2.1.6-3
 - fc6 respin
 


--- gift-openft-0.2.1.6-lib64.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 10 19:50:58 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 10 Nov 2006 12:50:58 -0700
Subject: rpms/poedit/devel poedit.spec,1.4,1.5
Message-ID: <200611101950.kAAJow7Z012204@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12186

Modified Files:
	poedit.spec 
Log Message:
Rebuild with new db4.



Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/poedit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poedit.spec	30 Oct 2006 15:26:55 -0000	1.4
+++ poedit.spec	10 Nov 2006 19:50:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           poedit
 Version:        1.3.6
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Fri Nov 10 2007 Konstantin Ryabitsev  - 1.3.6-1.1
+- Rebuild for newer db4 in devel
+
 * Mon Oct 30 2006 Konstantin Ryabitsev  - 1.3.6-1
 - Upstream 1.3.6
 



From fedora-extras-commits at redhat.com  Fri Nov 10 20:10:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 10 Nov 2006 13:10:39 -0700
Subject: rpms/ccache/FC-6 ccache.spec,1.13,1.14
Message-ID: <200611102010.kAAKAd28015409@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ccache/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15362/FC-6

Modified Files:
	ccache.spec 
Log Message:
* Fri Nov 10 2006 Ville Skytt??  - 2.4-7
- Require coreutils for triggers (#215030).



Index: ccache.spec
===================================================================
RCS file: /cvs/extras/rpms/ccache/FC-6/ccache.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ccache.spec	29 Aug 2006 19:56:32 -0000	1.13
+++ ccache.spec	10 Nov 2006 20:10:09 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -13,6 +13,9 @@
 Patch0:         %{name}-html-links.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires(triggerin): coreutils
+Requires(triggerpostun): coreutils
+
 %description
 ccache is a compiler cache.  It acts as a caching pre-processor to
 C/C++ compilers, using the -E compiler switch and a hash to detect
@@ -83,6 +86,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Ville Skytt??  - 2.4-7
+- Require coreutils for triggers (#215030).
+
 * Wed Aug  9 2006 Ville Skytt??  - 2.4-6
 - Add auto-symlink support for compat-gcc-34(-c++).
 - Untabify, escape macros in changelog.



From fedora-extras-commits at redhat.com  Fri Nov 10 20:10:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 10 Nov 2006 13:10:41 -0700
Subject: rpms/ccache/devel ccache.spec,1.13,1.14
Message-ID: <200611102010.kAAKAfoK015413@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ccache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15362/devel

Modified Files:
	ccache.spec 
Log Message:
* Fri Nov 10 2006 Ville Skytt??  - 2.4-7
- Require coreutils for triggers (#215030).



Index: ccache.spec
===================================================================
RCS file: /cvs/extras/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ccache.spec	29 Aug 2006 19:56:32 -0000	1.13
+++ ccache.spec	10 Nov 2006 20:10:10 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -13,6 +13,9 @@
 Patch0:         %{name}-html-links.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires(triggerin): coreutils
+Requires(triggerpostun): coreutils
+
 %description
 ccache is a compiler cache.  It acts as a caching pre-processor to
 C/C++ compilers, using the -E compiler switch and a hash to detect
@@ -83,6 +86,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Ville Skytt??  - 2.4-7
+- Require coreutils for triggers (#215030).
+
 * Wed Aug  9 2006 Ville Skytt??  - 2.4-6
 - Add auto-symlink support for compat-gcc-34(-c++).
 - Untabify, escape macros in changelog.



From fedora-extras-commits at redhat.com  Fri Nov 10 20:11:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:11:51 -0700
Subject: rpms/php-pear-Cache - New directory
Message-ID: <200611102011.kAAKBpji015536@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15532/php-pear-Cache

Log Message:
Directory /cvs/extras/rpms/php-pear-Cache added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 20:11:57 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:11:57 -0700
Subject: rpms/php-pear-Cache/devel - New directory
Message-ID: <200611102011.kAAKBvYh015551@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15532/php-pear-Cache/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Cache/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 20:12:17 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:12:17 -0700
Subject: rpms/php-pear-Cache Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611102012.kAAKCHd0015594@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Cache


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Cache
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  Fri Nov 10 20:12:23 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:12:23 -0700
Subject: rpms/php-pear-Cache/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611102012.kAAKCN0Y015617@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Cache


--- 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  Fri Nov 10 20:13:46 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:13:46 -0700
Subject: rpms/php-pear-Cache import.log,1.1,1.2
Message-ID: <200611102013.kAAKDkqN015714@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15680

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Cache-1.5.5-0.1.RC4.fc6 on branch devel from php-pear-Cache-1.5.5-0.1.RC4.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 20:12:16 -0000	1.1
+++ import.log	10 Nov 2006 20:13:15 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Cache-1_5_5-0_1_RC4_fc6:HEAD:php-pear-Cache-1.5.5-0.1.RC4.fc6.src.rpm:1163189586



From fedora-extras-commits at redhat.com  Fri Nov 10 20:13:47 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:13:47 -0700
Subject: rpms/php-pear-Cache/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-Cache.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611102013.kAAKDl3J015716@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15680/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-Cache.spec xml2changelog 
Log Message:
auto-import php-pear-Cache-1.5.5-0.1.RC4.fc6 on branch devel from php-pear-Cache-1.5.5-0.1.RC4.fc6.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-Cache.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Cache

%define beta RC4

Name:           php-pear-Cache
Version:        1.5.5

%if %{?beta:0}%{!?beta:1}
Release:        1%{?dist}
%else
Release:        0.1.%{beta}%{?dist}
%endif
Summary:        Framework for caching of arbitrary data

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Cache
Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR) >= 1.3.5
Requires(hint): php-pear(HTTP_Request)

%description
With the PEAR Cache you can cache the result of certain function
calls, as well as the output of a whole script run or share data
between applications.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}%{?beta}/%{pear_name}.xml
%{__install} -m 644 -c %{SOURCE1} LICENSE

cd %{pear_name}-%{version}%{?beta}


%build
cd %{pear_name}-%{version}%{?beta}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}%{?beta}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml


# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE

%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Cache.php
%{pear_phpdir}/Cache
%{pear_datadir}/Cache


%changelog
* Tue Oct  7 2006 Remi Collet  1.5.5-0.1.RC4
- use define beta (rather than fullversion)

* Tue Oct  7 2006 Remi Collet  1.5.5-0.1.rc4
- generated specfile (pear make-rpm-spec) + cleaning
- generated CHANGELOG
- add LICENSE



--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 20:12:23 -0000	1.1
+++ .cvsignore	10 Nov 2006 20:13:16 -0000	1.2
@@ -0,0 +1 @@
+Cache-1.5.5RC4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 20:12:23 -0000	1.1
+++ sources	10 Nov 2006 20:13:16 -0000	1.2
@@ -0,0 +1 @@
+d7ababc47030b1d69aba655156a41ea3  Cache-1.5.5RC4.tgz



From fedora-extras-commits at redhat.com  Fri Nov 10 20:16:12 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:16:12 -0700
Subject: owners owners.list,1.1919,1.1920
Message-ID: <200611102016.kAAKGCDn015773@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15757

Modified Files:
	owners.list 
Log Message:
	php-pear-Cache : Framework for caching of arbitrary data



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1919
retrieving revision 1.1920
diff -u -r1.1919 -r1.1920
--- owners.list	10 Nov 2006 16:58:50 -0000	1.1919
+++ owners.list	10 Nov 2006 20:15:42 -0000	1.1920
@@ -1767,6 +1767,7 @@
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Auth-SASL|Abstraction of various SASL mechanism responses|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Benchmark|Framework to benchmark PHP scripts or function calls|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Cache|Framework for caching of arbitrary data|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Console-Getargs|Command-line arguments and parameters parser|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Console-Table|Class that makes it easy to build console style tables|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 20:23:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 10 Nov 2006 13:23:36 -0700
Subject: fedora-security/audit fe3, 1.30, 1.31 fe4, 1.94, 1.95 fe5, 1.102,
	1.103 fe6, 1.15, 1.16
Message-ID: <200611102023.kAAKNaLD015853@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15828

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fe3	9 Nov 2006 17:11:36 -0000	1.30
+++ fe3	10 Nov 2006 20:23:33 -0000	1.31
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5602 VULNERABLE (xsupplicant) #212699
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- fe4	9 Nov 2006 17:18:31 -0000	1.94
+++ fe4	10 Nov 2006 20:23:33 -0000	1.95
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fe5	9 Nov 2006 17:18:31 -0000	1.102
+++ fe5	10 Nov 2006 20:23:33 -0000	1.103
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fe6	9 Nov 2006 17:18:31 -0000	1.15
+++ fe6	10 Nov 2006 20:23:33 -0000	1.16
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822



From fedora-extras-commits at redhat.com  Fri Nov 10 20:33:27 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Fri, 10 Nov 2006 13:33:27 -0700
Subject: rpms/cfengine/devel cfengine.spec,1.22,1.23
Message-ID: <200611102033.kAAKXRNM015959@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15943

Modified Files:
	cfengine.spec 
Log Message:
rebuild for new db4


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cfengine.spec	4 Oct 2006 22:21:29 -0000	1.22
+++ cfengine.spec	10 Nov 2006 20:32:57 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.1.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.21.tar.gz
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Jeff Sheltren  2.1.21-3
+- rebuild for db4 update
+
 * Thu Oct 05 2006 Christian Iseli  2.1.21-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Fri Nov 10 20:41:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 10 Nov 2006 13:41:35 -0700
Subject: rpms/vdradmin-am/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vdradmin-am.spec, 1.2, 1.3
Message-ID: <200611102041.kAAKfZMS016092@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16069

Modified Files:
	.cvsignore sources vdradmin-am.spec 
Log Message:
* Fri Nov 10 2006 Ville Skytt??  - 3.5.0-1
- 3.5.0, patch to retain autotimer functionality by default on upgrades.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Oct 2006 09:23:37 -0000	1.2
+++ .cvsignore	10 Nov 2006 20:41:05 -0000	1.3
@@ -1 +1 @@
-vdradmin-am-3.4.7.tar.bz2
+vdradmin-am-3.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Oct 2006 09:23:37 -0000	1.2
+++ sources	10 Nov 2006 20:41:05 -0000	1.3
@@ -1 +1 @@
-b3f862dfa078bdef05b52a841850c65a  vdradmin-am-3.4.7.tar.bz2
+945102178caec3f0012dc3aaffcf1014  vdradmin-am-3.5.0.tar.bz2


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdradmin-am.spec	25 Oct 2006 09:25:54 -0000	1.2
+++ vdradmin-am.spec	10 Nov 2006 20:41:05 -0000	1.3
@@ -3,8 +3,8 @@
 %define videodir  %(vdr-config --videodir  2>/dev/null || echo ERROR)
 
 Name:           vdradmin-am
-Version:        3.4.7
-Release:        3%{?dist}
+Version:        3.5.0
+Release:        1%{?dist}
 Summary:        Web interface for VDR
 
 Group:          Applications/Internet
@@ -37,7 +37,8 @@
 %{__perl} -pi -e \
   's|"/video"|"%{videodir}"| ;
    s|^(\$CONFIG\{VDRCONFDIR\}\s*=\s*")[^"]*(.*)|$1%{configdir}$2| ;
-   s|\$CONFIG\{VIDEODIR\}/epg\.data|%{cachedir}/epg.data|' \
+   s|\$CONFIG\{VIDEODIR\}/epg\.data|%{cachedir}/epg.data| ;
+   s|-s \$AT_FILENAME |-f \$AT_FILENAME|' \
   vdradmind.pl
 %{__perl} -pi -e \
   's/vdradmind\.pl/vdradmind/g ; s/(TH vdradmin )1/${1}8/' vdradmind.pl.1
@@ -100,7 +101,7 @@
 %files -f vdradmin.lang
 %defattr(-,root,root,-)
 %doc COPYING CREDITS FAQ HISTORY INSTALL README* contrib/*example convert.pl
-%doc %{name}-httpd.conf
+%doc %{name}-httpd.conf autotimer2searchtimer.pl
 %{_initrddir}/vdradmind
 %{_sbindir}/vdradmind
 /usr/share/vdradmin/
@@ -114,6 +115,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Ville Skytt??  - 3.5.0-1
+- 3.5.0, patch to retain autotimer functionality by default on upgrades.
+
 * Wed Oct 25 2006 Ville Skytt??  - 3.4.7-3
 - Improve description (#211043).
 



From fedora-extras-commits at redhat.com  Fri Nov 10 21:02:50 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Fri, 10 Nov 2006 14:02:50 -0700
Subject: rpms/seamonkey/FC-6 seamonkey.spec,1.13,1.14
Message-ID: <200611102102.kAAL2oxP019221@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19201

Modified Files:
	seamonkey.spec 
Log Message:
* Thu Nov 09 2006 Kai Engert  1.0.6-0.6.2
- Fix some .dat and .rdf ghost files.



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/seamonkey.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- seamonkey.spec	10 Nov 2006 03:50:01 -0000	1.13
+++ seamonkey.spec	10 Nov 2006 21:02:14 -0000	1.14
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.6
-Release:        0.6.1%{?dist}
+Release:        0.6.2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -319,6 +319,8 @@
 done
 touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/components/myspell
+touch $RPM_BUILD_ROOT%{mozdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{mozdir}/components/xpti.dat
 
 
 %clean
@@ -339,8 +341,8 @@
 %{_datadir}/pixmaps/seamonkey-icon.png
 %{_datadir}/pixmaps/seamonkey-mail-icon.png
 
-%verify (not md5 mtime size) %{mozdir}/components/compreg.dat
-%verify (not md5 mtime size) %{mozdir}/components/xpti.dat
+%ghost %{mozdir}/components/compreg.dat
+%ghost %{mozdir}/components/xpti.dat
 
 %{_mandir}/man1/seamonkey.1.gz
 
@@ -381,11 +383,7 @@
 
 %{mozdir}/defaults/pref/all-fedora.js
 
-
 %ghost %{mozdir}/chrome/chrome.rdf
-%ghost %{mozdir}/chrome/overlays.rdf
-%ghost %{mozdir}/chrome/stylesheets.rdf
-
 
 %ghost %{mozdir}/chrome/overlayinfo/browser/skin/stylesheets.rdf
 %ghost %{mozdir}/chrome/overlayinfo/global/skin/stylesheets.rdf
@@ -429,6 +427,8 @@
 
 
 %changelog
+* Thu Nov 09 2006 Kai Engert  1.0.6-0.6.2
+- Fix some .dat and .rdf ghost files.
 * Thu Nov 09 2006 Kai Engert  1.0.6-0.6.1
 - Do not run regchrome.
 * Thu Nov 09 2006 Kai Engert  1.0.6-0.6



From fedora-extras-commits at redhat.com  Fri Nov 10 21:21:37 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 10 Nov 2006 14:21:37 -0700
Subject: fedora-security/audit fc5,1.387,1.388 fc6,1.139,1.140
Message-ID: <200611102121.kAALLbwN019435@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19415

Modified Files:
	fc5 fc6 
Log Message:
Note the openssh bug id


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- fc5	10 Nov 2006 09:31:09 -0000	1.387
+++ fc5	10 Nov 2006 21:21:33 -0000	1.388
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-5823 ** kernel
-CVE-2006-5794 VULNERABLE (openssh, fixed 4.5)
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- fc6	10 Nov 2006 09:31:09 -0000	1.139
+++ fc6	10 Nov 2006 21:21:33 -0000	1.140
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-5823 ** kernel
-CVE-2006-5794 VULNERABLE (openssh, fixed 4.5)
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:21 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:21 -0700
Subject: rpms/grhino/devel .cvsignore, 1.6, 1.7 grhino.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <200611102129.kAALTLdG019606@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/devel

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:59:04 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:51 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grhino.spec	10 Nov 2006 07:59:04 -0000	1.8
+++ grhino.spec	10 Nov 2006 21:28:51 -0000	1.9
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 07:59:04 -0000	1.6
+++ sources	10 Nov 2006 21:28:51 -0000	1.7
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:17 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:17 -0700
Subject: rpms/grhino/FC-3 .cvsignore, 1.6, 1.7 grhino.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <200611102129.kAALTHBM019586@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/FC-3

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:58:50 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:47 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	10 Nov 2006 07:58:50 -0000	1.6
+++ grhino.spec	10 Nov 2006 21:28:47 -0000	1.7
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 07:58:50 -0000	1.6
+++ sources	10 Nov 2006 21:28:47 -0000	1.7
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:18 -0700
Subject: rpms/grhino/FC-4 .cvsignore, 1.6, 1.7 grhino.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <200611102129.kAALTI6B019592@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/FC-4

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:58:51 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:48 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	10 Nov 2006 07:58:51 -0000	1.7
+++ grhino.spec	10 Nov 2006 21:28:48 -0000	1.8
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 07:58:51 -0000	1.6
+++ sources	10 Nov 2006 21:28:48 -0000	1.7
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:20 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:20 -0700
Subject: rpms/grhino/FC-6 .cvsignore, 1.6, 1.7 grhino.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <200611102129.kAALTKFe019601@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/FC-6

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:58:58 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:50 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grhino.spec	10 Nov 2006 07:58:58 -0000	1.9
+++ grhino.spec	10 Nov 2006 21:28:50 -0000	1.10
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Nov 2006 07:58:58 -0000	1.8
+++ sources	10 Nov 2006 21:28:50 -0000	1.9
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:19 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:19 -0700
Subject: rpms/grhino/FC-5 .cvsignore, 1.6, 1.7 grhino.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <200611102129.kAALTJ0O019597@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/FC-5

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:58:57 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:49 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	10 Nov 2006 07:58:57 -0000	1.7
+++ grhino.spec	10 Nov 2006 21:28:49 -0000	1.8
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 07:58:57 -0000	1.6
+++ sources	10 Nov 2006 21:28:49 -0000	1.7
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 22:15:28 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Fri, 10 Nov 2006 15:15:28 -0700
Subject: rpms/subversion-api-docs/FC-6 subversion-api-docs.spec,1.7,1.8
Message-ID: <200611102215.kAAMFS6D023025@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23007

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.4.2.



Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/FC-6/subversion-api-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subversion-api-docs.spec	31 Oct 2006 19:52:24 -0000	1.7
+++ subversion-api-docs.spec	10 Nov 2006 22:14:58 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		subversion-api-docs
-Version:	1.4.0
+Version:	1.4.2
 Release:	1%{?dist}
 Summary:	Subversion API documentation
 
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Sat Nov 11 2006 Bojan Smojver  1.4.2-1
+- bump up to 1.4.2
+
 * Wed Nov 01 2006 Bojan Smojver  1.4.0-1
 - bump up to 1.4.0
 



From fedora-extras-commits at redhat.com  Sat Nov 11 00:00:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 10 Nov 2006 17:00:12 -0700
Subject: rpms/sylpheed-claws-plugins/FC-6 .cvsignore, 1.10, 1.11 sources,
	1.10, 1.11 sylpheed-claws-plugins.spec, 1.24, 1.25
Message-ID: <200611110000.kAB00Ca4000801@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv767

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2006 09:38:29 -0000	1.10
+++ .cvsignore	10 Nov 2006 23:59:41 -0000	1.11
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 09:38:29 -0000	1.10
+++ sources	10 Nov 2006 23:59:41 -0000	1.11
@@ -1 +1 @@
-db771d49bf9bde1cce075b93f8028a19  sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+621e011a8a801485a18202696343b0ce  sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-6/sylpheed-claws-plugins.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sylpheed-claws-plugins.spec	7 Nov 2006 01:24:39 -0000	1.24
+++ sylpheed-claws-plugins.spec	10 Nov 2006 23:59:41 -0000	1.25
@@ -1,6 +1,22 @@
+# define pulgin version
+%define acpinotifier	1.0.4
+%define attremover	1.0.3
+%define cachesaver	0.10.2
+%define	etpanprivacy	0.15.3
+%define fetchinfo	0.4.16
+%define gtkhtml2viewer 0.12
+%define maildir		0.24.2
+%define mailmbox	1.12.2
+%define newmail		0.0.7
+%define notification	0.6
+%define perl		0.9.5
+%define rssyl		0.7
+%define smime		0.5.6
+%define synce		0.6.4
+%define vcalendar	1.90
 Name:           sylpheed-claws-plugins
-Version:        2.5.2
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -182,82 +198,82 @@
 Evolution or Outlook.
 
 %prep
-%setup -q -n sylpheed-claws-extra-plugins-%{version}
+%setup -c -q -n sylpheed-claws-extra-plugins-%{version}
 
 %build
 #acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %configure --disable-static --disable-dependency-tracking --disable-rpath
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -265,77 +281,77 @@
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
  
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
@@ -350,11 +366,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-1.0.3/ChangeLog
-%doc acpi_notifier-1.0.3/COPYING
-%doc acpi_notifier-1.0.3/NEWS
-%doc acpi_notifier-1.0.3/AUTHORS
-%doc acpi_notifier-1.0.3/README
+%doc acpi_notifier-%{acpinotifier}/ChangeLog
+%doc acpi_notifier-%{acpinotifier}/COPYING
+%doc acpi_notifier-%{acpinotifier}/NEWS
+%doc acpi_notifier-%{acpinotifier}/AUTHORS
+%doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -369,39 +385,39 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-1.0.3/AUTHORS
-%doc att_remover-1.0.3/ChangeLog
-%doc att_remover-1.0.3/COPYING
-%doc att_remover-1.0.3/NEWS
-%doc att_remover-1.0.3/README
+%doc att_remover-%{attremover}/AUTHORS
+%doc att_remover-%{attremover}/ChangeLog
+%doc att_remover-%{attremover}/COPYING
+%doc att_remover-%{attremover}/NEWS
+%doc att_remover-%{attremover}/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
 %defattr(-,root,root,-)
-%doc cachesaver-0.10.2/AUTHORS
-%doc cachesaver-0.10.2/ChangeLog
-%doc cachesaver-0.10.2/COPYING
+%doc cachesaver-%{cachesaver}/AUTHORS
+%doc cachesaver-%{cachesaver}/ChangeLog
+%doc cachesaver-%{cachesaver}/COPYING
 %{_libdir}/sylpheed-claws/plugins/cachesaver*
 
 %files etpan-privacy
 %defattr(-,root,root,-)
-%doc etpan-privacy-0.15.3/AUTHORS
-%doc etpan-privacy-0.15.3/ChangeLog
-%doc etpan-privacy-0.15.3/COPYING
-%doc etpan-privacy-0.15.3/README
+%doc etpan-privacy-%{etpanprivacy}/AUTHORS
+%doc etpan-privacy-%{etpanprivacy}/ChangeLog
+%doc etpan-privacy-%{etpanprivacy}/COPYING
+%doc etpan-privacy-%{etpanprivacy}/README
 %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.16/ChangeLog
-%doc fetchinfo-plugin-0.4.16/COPYING
-%doc fetchinfo-plugin-0.4.16/README
+%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
+%doc fetchinfo-plugin-%{fetchinfo}/COPYING
+%doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
 %files gtkhtml2-viewer
 %defattr(-,root,root,-)
-%doc gtkhtml2_viewer-0.11/AUTHORS
-%doc gtkhtml2_viewer-0.11/COPYING
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -415,53 +431,53 @@
 
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.24.2/AUTHORS
-%doc maildir-0.24.2/ChangeLog
-%doc maildir-0.24.2/COPYING
-%doc maildir-0.24.2/README
-%doc maildir-0.24.2/doc/README.xml
+%doc maildir-%{maildir}/AUTHORS
+%doc maildir-%{maildir}/ChangeLog
+%doc maildir-%{maildir}/COPYING
+%doc maildir-%{maildir}/README
+%doc maildir-%{maildir}/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.12.2/AUTHORS
-%doc mailmbox-1.12.2/ChangeLog
-%doc mailmbox-1.12.2/COPYING
-%doc mailmbox-1.12.2/README
+%doc mailmbox-%{mailmbox}/AUTHORS
+%doc mailmbox-%{mailmbox}/ChangeLog
+%doc mailmbox-%{mailmbox}/COPYING
+%doc mailmbox-%{mailmbox}/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
 %files newmail
 %defattr(-,root,root,-)
-%doc newmail-0.0.7/AUTHORS
-%doc newmail-0.0.7/ChangeLog
-%doc newmail-0.0.7/COPYING
-%doc newmail-0.0.7/NEWS
-%doc newmail-0.0.7/README
+%doc newmail-%{newmail}/AUTHORS
+%doc newmail-%{newmail}/ChangeLog
+%doc newmail-%{newmail}/COPYING
+%doc newmail-%{newmail}/NEWS
+%doc newmail-%{newmail}/README
 %{_libdir}/sylpheed-claws/plugins/newmail.so
 
 %files notification
 %defattr(-,root,root,-)
-%doc notification_plugin-0.5/AUTHORS
-%doc notification_plugin-0.5/ChangeLog
-%doc notification_plugin-0.5/COPYING
-%doc notification_plugin-0.5/README
+%doc notification_plugin-%{notification}/AUTHORS
+%doc notification_plugin-%{notification}/ChangeLog
+%doc notification_plugin-%{notification}/COPYING
+%doc notification_plugin-%{notification}/README
 %{_libdir}/sylpheed-claws/plugins/notification_plugin.so
 
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.9.5/AUTHORS
-%doc perl_plugin-0.9.5/ChangeLog
-%doc perl_plugin-0.9.5/COPYING
-%doc perl_plugin-0.9.5/README
-%doc perl_plugin-0.9.5/sc_perl.pod
+%doc perl_plugin-%{perl}/AUTHORS
+%doc perl_plugin-%{perl}/ChangeLog
+%doc perl_plugin-%{perl}/COPYING
+%doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.6.1/AUTHORS
-%doc rssyl-0.6.1/ChangeLog
-%doc rssyl-0.6.1/COPYING
-%doc rssyl-0.6.1/TODO
+%doc rssyl-%{rssyl}/AUTHORS
+%doc rssyl-%{rssyl}/ChangeLog
+%doc rssyl-%{rssyl}/COPYING
+%doc rssyl-%{rssyl}/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -477,25 +493,25 @@
 
 %files smime
 %defattr(-,root,root,-)
-%doc smime-0.5.5/ChangeLog
-%doc smime-0.5.5/COPYING
-%doc smime-0.5.5/NEWS
-%{_libdir}/sylpheed-claws/plugins/smime.so
+%doc smime-%{smime}/ChangeLog
+%doc smime-%{smime}/COPYING
+%doc smime-%{smime}/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime*
 
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.6.4/AUTHORS
-%doc synce_plugin-0.6.4/ChangeLog
-%doc synce_plugin-0.6.4/COPYING
-%doc synce_plugin-0.6.4/README
+%doc synce_plugin-%{synce}/AUTHORS
+%doc synce_plugin-%{synce}/ChangeLog
+%doc synce_plugin-%{synce}/COPYING
+%doc synce_plugin-%{synce}/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.89.1/AUTHORS
-%doc vcalendar-1.89.1/ChangeLog
-%doc vcalendar-1.89.1/COPYING
-%doc vcalendar-1.89.1/README
+%doc vcalendar-%{vcalendar}/AUTHORS
+%doc vcalendar-%{vcalendar}/ChangeLog
+%doc vcalendar-%{vcalendar}/COPYING
+%doc vcalendar-%{vcalendar}/README
 %{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
@@ -510,6 +526,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Nov 09 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Tue Nov 07 2006 Andreas Bierfert 
 2.5.2-5
 - rebuild



From fedora-extras-commits at redhat.com  Sat Nov 11 00:10:37 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Fri, 10 Nov 2006 17:10:37 -0700
Subject: rpms/seamonkey/devel seamonkey.spec,1.12,1.13
Message-ID: <200611110010.kAB0AbWf003944@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3916

Modified Files:
	seamonkey.spec 
Log Message:
* Fri Nov 10 2006 Kai Engert  1.0.6-2
- Do not run regchrome.
- Fix some .dat and .rdf ghost files.



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- seamonkey.spec	9 Nov 2006 21:00:22 -0000	1.12
+++ seamonkey.spec	11 Nov 2006 00:10:07 -0000	1.13
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.6
-Release:        1%{?dist}
+Release:        2{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -258,9 +258,6 @@
   echo "skin,install,select,classic/1.0" >> chrome/lang/default.txt
   echo "locale,install,select,en-US" >> chrome/lang/default.txt
 
-  # set up the chrome rdf files
-  LD_LIBRARY_PATH=`pwd`:`pwd`/.. MOZILLA_FIVE_HOME=`pwd` MOZ_DISABLE_GNOME=1 ./regchrome
-
   # fix permissions of the chrome directories
   /usr/bin/find . -type d -perm 0700 -exec chmod 755 {} \; || :
 
@@ -322,6 +319,8 @@
 done
 touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/components/myspell
+touch $RPM_BUILD_ROOT%{mozdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{mozdir}/components/xpti.dat
 
 
 %clean
@@ -342,8 +341,8 @@
 %{_datadir}/pixmaps/seamonkey-icon.png
 %{_datadir}/pixmaps/seamonkey-mail-icon.png
 
-%verify (not md5 mtime size) %{mozdir}/components/compreg.dat
-%verify (not md5 mtime size) %{mozdir}/components/xpti.dat
+%ghost %{mozdir}/components/compreg.dat
+%ghost %{mozdir}/components/xpti.dat
 
 %{_mandir}/man1/seamonkey.1.gz
 
@@ -384,11 +383,7 @@
 
 %{mozdir}/defaults/pref/all-fedora.js
 
-
 %ghost %{mozdir}/chrome/chrome.rdf
-%ghost %{mozdir}/chrome/overlays.rdf
-%ghost %{mozdir}/chrome/stylesheets.rdf
-
 
 %ghost %{mozdir}/chrome/overlayinfo/browser/skin/stylesheets.rdf
 %ghost %{mozdir}/chrome/overlayinfo/global/skin/stylesheets.rdf
@@ -432,6 +427,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Kai Engert  1.0.6-2
+- Do not run regchrome.
+- Fix some .dat and .rdf ghost files.
 * Thu Nov 09 2006 Kai Engert  1.0.6-1
 - SeaMonkey 1.0.6
 * Thu Sep 14 2006 Kai Engert  1.0.5-1



From fedora-extras-commits at redhat.com  Sat Nov 11 00:14:52 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Fri, 10 Nov 2006 17:14:52 -0700
Subject: rpms/seamonkey/devel seamonkey.spec,1.13,1.14
Message-ID: <200611110014.kAB0Eq56004036@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4009

Modified Files:
	seamonkey.spec 
Log Message:
fix mistake in dist suffix



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- seamonkey.spec	11 Nov 2006 00:10:07 -0000	1.13
+++ seamonkey.spec	11 Nov 2006 00:14:22 -0000	1.14
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.6
-Release:        2{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Sat Nov 11 02:15:24 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:15:24 -0700
Subject: rpms/php-pear-XML-RSS - New directory
Message-ID: <200611110215.kAB2FOCg017626@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17622/php-pear-XML-RSS

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-RSS added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 02:15:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:15:30 -0700
Subject: rpms/php-pear-XML-RSS/devel - New directory
Message-ID: <200611110215.kAB2FUD0017640@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17622/php-pear-XML-RSS/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-RSS/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 02:15:36 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:15:36 -0700
Subject: rpms/php-pear-XML-RSS Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611110215.kAB2Facn017671@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17665

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-XML-RSS


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-XML-RSS
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  Sat Nov 11 02:15:37 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:15:37 -0700
Subject: rpms/php-pear-XML-RSS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611110215.kAB2FbdM017688@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17665/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-XML-RSS


--- 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  Sat Nov 11 02:16:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:16:28 -0700
Subject: rpms/php-pear-XML-RSS import.log,1.1,1.2
Message-ID: <200611110216.kAB2GSwa017767@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17734

Modified Files:
	import.log 
Log Message:
auto-import php-pear-XML-RSS-0.9.10-2 on branch devel from php-pear-XML-RSS-0.9.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-RSS/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 02:15:36 -0000	1.1
+++ import.log	11 Nov 2006 02:15:57 -0000	1.2
@@ -0,0 +1 @@
+php-pear-XML-RSS-0_9_10-2:HEAD:php-pear-XML-RSS-0.9.10-2.src.rpm:1163211354



From fedora-extras-commits at redhat.com  Sat Nov 11 02:16:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:16:28 -0700
Subject: rpms/php-pear-XML-RSS/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-XML-RSS.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611110216.kAB2GSD2017771@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17734/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-XML-RSS.spec 
Log Message:
auto-import php-pear-XML-RSS-0.9.10-2 on branch devel from php-pear-XML-RSS-0.9.10-2.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-XML-RSS.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name XML_RSS

Name:           php-pear-XML-RSS
Version:        0.9.10
Release:        2%{?dist}
Summary:        RSS parser

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/XML_RSS
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(XML_Parser) >= 1.0.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
Parser for Resource Description Framework (RDF) Site Summary (RSS)
documents.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
install -pm 644 -c %{SOURCE1} LICENSE
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc LICENSE
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/XML/RSS.php


%changelog
* Thu Nov 09 2006 Christopher Stone  0.9.10-2
- Added license file to %%doc
- Added versioned requires

* Sun Oct 29 2006 Christopher Stone  0.9.10-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-RSS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 02:15:37 -0000	1.1
+++ .cvsignore	11 Nov 2006 02:15:58 -0000	1.2
@@ -0,0 +1 @@
+XML_RSS-0.9.10.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-RSS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 02:15:37 -0000	1.1
+++ sources	11 Nov 2006 02:15:58 -0000	1.2
@@ -0,0 +1 @@
+eec8e6497bc1960cd7c155863f6f772a  XML_RSS-0.9.10.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 02:18:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:18:16 -0700
Subject: owners owners.list,1.1920,1.1921
Message-ID: <200611110218.kAB2IGec017827@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17807

Modified Files:
	owners.list 
Log Message:
php-pear-XML-RSS


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1920
retrieving revision 1.1921
diff -u -r1.1920 -r1.1921
--- owners.list	10 Nov 2006 20:15:42 -0000	1.1920
+++ owners.list	11 Nov 2006 02:17:46 -0000	1.1921
@@ -1797,6 +1797,7 @@
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Parser|XML parsing class based on PHP's bundled expat|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-XML-RSS|RSS parser|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Serializer|Swiss-army knife for reading and writing XML files|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Util|XML utility class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-apc|APC caches and optimizes PHP intermediate code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 02:51:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 19:51:53 -0700
Subject: rpms/gwget/devel .cvsignore, 1.8, 1.9 gwget-epiphany21x.patch, 1.2, 
	1.3 gwget.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200611110251.kAB2prtQ018048@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18016

Modified Files:
	.cvsignore gwget-epiphany21x.patch gwget.spec sources 
Log Message:
Update to 0.98.2 anf fix for #213480


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Jun 2006 21:10:27 -0000	1.8
+++ .cvsignore	11 Nov 2006 02:51:22 -0000	1.9
@@ -1 +1 @@
-gwget-0.97.tar.bz2
+gwget-0.98.2.tar.bz2

gwget-epiphany21x.patch:

Index: gwget-epiphany21x.patch
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget-epiphany21x.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gwget-epiphany21x.patch	15 Sep 2006 14:33:22 -0000	1.2
+++ gwget-epiphany21x.patch	11 Nov 2006 02:51:22 -0000	1.3
@@ -1,44 +1,41 @@
---- gwget-0.97/configure.in.orig	2006-01-05 22:13:55.000000000 +0100
-+++ gwget-0.97/configure.in	2006-09-15 13:32:02.000000000 +0200
-@@ -71,8 +71,14 @@
+--- gwget-0.98.2/configure.in.orig	2006-11-08 19:49:44.000000000 +0100
++++ gwget-0.98.2/configure.in	2006-11-11 03:04:53.000000000 +0100
+@@ -97,13 +97,15 @@
  
- dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
+ EPHY_VER=
+ AC_ARG_WITH([epiphany-version],
+-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
+-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
++        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17@:>@],
++                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 (default 1.6)]),
+         [EPHY_VER="$withval"])
+ 
+-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15 or 2.16
++dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16 or 2.17
  EPHY_AUTODETECT="(autodetect)"
--if pkg-config --exists epiphany-1.10; then
--               EPHY_VER=1.10
-+if pkg-config --exists epiphany-2.16; then
-+        EPHY_VER=2.16
-+elif pkg-config --exists epiphany-2.15; then
-+        EPHY_VER=2.15
-+elif pkg-config --exists epiphany-2.14; then
-+        EPHY_VER=2.14
-+elif pkg-config --exists epiphany-1.10; then
-+        EPHY_VER=1.10
- elif pkg-config --exists epiphany-1.8; then
-        	EPHY_VER=1.8
- elif pkg-config --exists epiphany-1.6; then
-@@ -107,11 +113,23 @@
-           AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
-           EPIPHANY_PKGCONFIG=epiphany-1.10
-           EPIPHANY_REQUIRED=1.9.0
-+elif test $EPHY_VER = "2.14"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.14
-+          EPIPHANY_REQUIRED=2.14
-+elif test $EPHY_VER = "2.15"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 215, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.15
-+          EPIPHANY_REQUIRED=2.15
-+elif test $EPHY_VER = "2.16"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 216, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.16
-+          EPIPHANY_REQUIRED=2.16
+-if pkg-config --exists epiphany-2.16; then
++if pkg-config --exists epiphany-2.17; then
++        EPHY_VER=2.17
++elif pkg-config --exists epiphany-2.16; then
+         EPHY_VER=2.16
+ elif pkg-config --exists epiphany-2.15; then
+         EPHY_VER=2.15
+@@ -158,13 +160,17 @@
+           EPIPHANY_PKGCONFIG=epiphany-2.16
+           EPIPHANY_REQUIRED=2.16
+           EPIPHANY_SHORTVER=216
++elif test "x$EPHY_VER" = "x2.17"; then
++          EPIPHANY_PKGCONFIG=epiphany-2.17
++          EPIPHANY_REQUIRED=2.17
++          EPIPHANY_SHORTVER=217
  else
       	AC_MSG_RESULT([no epiphany installed])
  fi
  
--if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
-+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"  || test $EPHY_VER = "2.14" || test $EPHY_VER = "2.15" || test $EPHY_VER = "2.16" ; then
+ if test -n "$EPIPHANY_SHORTVER" ; then
+ AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
+-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
++       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216 or 217)])
  AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
  
  LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gwget.spec	15 Sep 2006 13:41:11 -0000	1.17
+++ gwget.spec	11 Nov 2006 02:51:22 -0000	1.18
@@ -1,20 +1,23 @@
-%define epimajor 2.16
+%define epimajor 2.17
 
 Name:		gwget
-Version:	0.97
-Release:	7%{?dist}
+Version:	0.98.2
+Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gnome.org/projects/gwget
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.98/gwget-0.98.2.tar.bz2
 Source1:	gwget.desktop
 Patch0:		gwget-epiphany21x.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0
 BuildRequires:	libglade2-devel >= 2.0
+BuildRequires:	gnome-vfs2-devel >= 2.0
+BuildRequires:	dbus-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	intltool >= 0.29
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
@@ -46,7 +49,7 @@
 autoreconf -f
 
 %build
-export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+#export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -84,11 +87,9 @@
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_Gwget.server
 %{_sysconfdir}/gconf/schemas/gwget.schemas
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/idl/GNOME_Gwget.idl
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %files epiphany-extension
@@ -97,6 +98,15 @@
 
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  0.98.2-1
+- Update to 0.98.2.
+- Don't crash notification area (#213480).
+- Add support for epiphany 2.1.7.
+
+* Fri Sep 15 2006 Christoph Wickert  0.98.1-1
+- Update to 0.98.1.
+- BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
+
 * Fri Sep 15 2006 Christoph Wickert  0.97-7
 - Mass rebuild for Fedora Core 6.
 - Update epiphany-patch for epiphany <= 2.1.6.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Jun 2006 21:10:27 -0000	1.8
+++ sources	11 Nov 2006 02:51:22 -0000	1.9
@@ -1 +1 @@
-b31dd63a2b55f1c0c2dea58490ca8cd2  gwget-0.97.tar.bz2
+26bb748aff0769321bf1fd9b65735649  gwget-0.98.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 02:55:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 19:55:23 -0700
Subject: rpms/gwget/FC-6 .cvsignore, 1.8, 1.9 gwget-epiphany21x.patch, 1.2, 
	1.3 gwget.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200611110255.kAB2tNN3018175@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18133

Modified Files:
	.cvsignore gwget-epiphany21x.patch gwget.spec sources 
Log Message:
Update to 0.98.2 anf fix for #213480


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Jun 2006 21:10:27 -0000	1.8
+++ .cvsignore	11 Nov 2006 02:54:52 -0000	1.9
@@ -1 +1 @@
-gwget-0.97.tar.bz2
+gwget-0.98.2.tar.bz2

gwget-epiphany21x.patch:

Index: gwget-epiphany21x.patch
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/gwget-epiphany21x.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gwget-epiphany21x.patch	15 Sep 2006 14:33:22 -0000	1.2
+++ gwget-epiphany21x.patch	11 Nov 2006 02:54:52 -0000	1.3
@@ -1,44 +1,41 @@
---- gwget-0.97/configure.in.orig	2006-01-05 22:13:55.000000000 +0100
-+++ gwget-0.97/configure.in	2006-09-15 13:32:02.000000000 +0200
-@@ -71,8 +71,14 @@
+--- gwget-0.98.2/configure.in.orig	2006-11-08 19:49:44.000000000 +0100
++++ gwget-0.98.2/configure.in	2006-11-11 03:04:53.000000000 +0100
+@@ -97,13 +97,15 @@
  
- dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
+ EPHY_VER=
+ AC_ARG_WITH([epiphany-version],
+-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
+-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
++        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17@:>@],
++                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 (default 1.6)]),
+         [EPHY_VER="$withval"])
+ 
+-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15 or 2.16
++dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16 or 2.17
  EPHY_AUTODETECT="(autodetect)"
--if pkg-config --exists epiphany-1.10; then
--               EPHY_VER=1.10
-+if pkg-config --exists epiphany-2.16; then
-+        EPHY_VER=2.16
-+elif pkg-config --exists epiphany-2.15; then
-+        EPHY_VER=2.15
-+elif pkg-config --exists epiphany-2.14; then
-+        EPHY_VER=2.14
-+elif pkg-config --exists epiphany-1.10; then
-+        EPHY_VER=1.10
- elif pkg-config --exists epiphany-1.8; then
-        	EPHY_VER=1.8
- elif pkg-config --exists epiphany-1.6; then
-@@ -107,11 +113,23 @@
-           AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
-           EPIPHANY_PKGCONFIG=epiphany-1.10
-           EPIPHANY_REQUIRED=1.9.0
-+elif test $EPHY_VER = "2.14"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.14
-+          EPIPHANY_REQUIRED=2.14
-+elif test $EPHY_VER = "2.15"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 215, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.15
-+          EPIPHANY_REQUIRED=2.15
-+elif test $EPHY_VER = "2.16"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 216, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.16
-+          EPIPHANY_REQUIRED=2.16
+-if pkg-config --exists epiphany-2.16; then
++if pkg-config --exists epiphany-2.17; then
++        EPHY_VER=2.17
++elif pkg-config --exists epiphany-2.16; then
+         EPHY_VER=2.16
+ elif pkg-config --exists epiphany-2.15; then
+         EPHY_VER=2.15
+@@ -158,13 +160,17 @@
+           EPIPHANY_PKGCONFIG=epiphany-2.16
+           EPIPHANY_REQUIRED=2.16
+           EPIPHANY_SHORTVER=216
++elif test "x$EPHY_VER" = "x2.17"; then
++          EPIPHANY_PKGCONFIG=epiphany-2.17
++          EPIPHANY_REQUIRED=2.17
++          EPIPHANY_SHORTVER=217
  else
       	AC_MSG_RESULT([no epiphany installed])
  fi
  
--if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
-+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"  || test $EPHY_VER = "2.14" || test $EPHY_VER = "2.15" || test $EPHY_VER = "2.16" ; then
+ if test -n "$EPIPHANY_SHORTVER" ; then
+ AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
+-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
++       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216 or 217)])
  AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
  
  LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/gwget.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gwget.spec	15 Sep 2006 13:41:11 -0000	1.17
+++ gwget.spec	11 Nov 2006 02:54:52 -0000	1.18
@@ -1,20 +1,23 @@
-%define epimajor 2.16
+%define epimajor 2.17
 
 Name:		gwget
-Version:	0.97
-Release:	7%{?dist}
+Version:	0.98.2
+Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gnome.org/projects/gwget
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.98/gwget-0.98.2.tar.bz2
 Source1:	gwget.desktop
 Patch0:		gwget-epiphany21x.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0
 BuildRequires:	libglade2-devel >= 2.0
+BuildRequires:	gnome-vfs2-devel >= 2.0
+BuildRequires:	dbus-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	intltool >= 0.29
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
@@ -46,7 +49,7 @@
 autoreconf -f
 
 %build
-export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+#export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -84,11 +87,9 @@
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_Gwget.server
 %{_sysconfdir}/gconf/schemas/gwget.schemas
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/idl/GNOME_Gwget.idl
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %files epiphany-extension
@@ -97,6 +98,15 @@
 
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  0.98.2-1
+- Update to 0.98.2.
+- Don't crash notification area (#213480).
+- Add support for epiphany 2.1.7.
+
+* Fri Sep 15 2006 Christoph Wickert  0.98.1-1
+- Update to 0.98.1.
+- BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
+
 * Fri Sep 15 2006 Christoph Wickert  0.97-7
 - Mass rebuild for Fedora Core 6.
 - Update epiphany-patch for epiphany <= 2.1.6.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Jun 2006 21:10:27 -0000	1.8
+++ sources	11 Nov 2006 02:54:52 -0000	1.9
@@ -1 +1 @@
-b31dd63a2b55f1c0c2dea58490ca8cd2  gwget-0.97.tar.bz2
+26bb748aff0769321bf1fd9b65735649  gwget-0.98.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 02:56:07 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:56:07 -0700
Subject: rpms/python-nltk_lite - New directory
Message-ID: <200611110256.kAB2u7tt018193@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18189/python-nltk_lite

Log Message:
Directory /cvs/extras/rpms/python-nltk_lite added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 02:56:13 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:56:13 -0700
Subject: rpms/python-nltk_lite/devel - New directory
Message-ID: <200611110256.kAB2uDJT018211@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18189/python-nltk_lite/devel

Log Message:
Directory /cvs/extras/rpms/python-nltk_lite/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 02:56:44 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 19:56:44 -0700
Subject: rpms/gwget/FC-6 gwget.spec,1.18,1.19
Message-ID: <200611110256.kAB2uiB7018247@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18209

Modified Files:
	gwget.spec 
Log Message:
fix epiphany-version for FC6


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/gwget.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gwget.spec	11 Nov 2006 02:54:52 -0000	1.18
+++ gwget.spec	11 Nov 2006 02:56:13 -0000	1.19
@@ -1,4 +1,4 @@
-%define epimajor 2.17
+%define epimajor 2.16
 
 Name:		gwget
 Version:	0.98.2



From fedora-extras-commits at redhat.com  Sat Nov 11 02:56:52 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:56:52 -0700
Subject: rpms/python-nltk_lite Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611110256.kAB2uq49018262@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18256

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-nltk_lite


--- NEW FILE Makefile ---
# Top level Makefile for module python-nltk_lite
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  Sat Nov 11 02:56:58 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:56:58 -0700
Subject: rpms/python-nltk_lite/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611110256.kAB2uwN6018278@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18256/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-nltk_lite


--- 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  Sat Nov 11 02:58:15 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:58:15 -0700
Subject: rpms/python-nltk_lite import.log,1.1,1.2
Message-ID: <200611110258.kAB2wFKh018350@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18318

Modified Files:
	import.log 
Log Message:
auto-import python-nltk_lite-0.6.6-1 on branch devel from python-nltk_lite-0.6.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-nltk_lite/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 02:56:52 -0000	1.1
+++ import.log	11 Nov 2006 02:57:45 -0000	1.2
@@ -0,0 +1 @@
+python-nltk_lite-0_6_6-1:HEAD:python-nltk_lite-0.6.6-1.src.rpm:1163213848



From fedora-extras-commits at redhat.com  Sat Nov 11 02:58:16 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:58:16 -0700
Subject: rpms/python-nltk_lite/devel python-nltk_lite.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611110258.kAB2wGwR018354@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18318/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-nltk_lite.spec 
Log Message:
auto-import python-nltk_lite-0.6.6-1 on branch devel from python-nltk_lite-0.6.6-1.src.rpm


--- NEW FILE python-nltk_lite.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-nltk_lite
Version:        0.6.6
Release:        1%{?dist}
Summary:        Natural Language Toolkit

Group:          Development/Libraries
License:        GPL
URL:            http://nltk.sf.net/
Source0:        http://dl.sourceforge.net/nltk/nltk_lite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Obsoletes:      python-nltk <= 1.4.4-2%{?dist}

BuildRequires:  python
Requires:       python-numarray, tkinter

%description
NLTK is a Python package that simplifies the construction of programs
that process natural language; and defines standard interfaces between
the different components of an NLP system.  It was designed primarily
to help teach graduate and undergraduate students about computational
linguistics; but it is also useful as a framework for implementing
research projects.


%prep
%setup -q -n nltk_lite-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
# Make scripts executable
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/test/doctest_driver.py
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/stem/porter.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.TXT README.txt
%dir %{python_sitelib}/nltk_lite
%dir %{python_sitelib}/nltk_lite/chat
%dir %{python_sitelib}/nltk_lite/cluster
%dir %{python_sitelib}/nltk_lite/contrib
%dir %{python_sitelib}/nltk_lite/corpora
%dir %{python_sitelib}/nltk_lite/draw
%dir %{python_sitelib}/nltk_lite/misc
%dir %{python_sitelib}/nltk_lite/model
%dir %{python_sitelib}/nltk_lite/parse
%dir %{python_sitelib}/nltk_lite/stem
%dir %{python_sitelib}/nltk_lite/tag
%dir %{python_sitelib}/nltk_lite/test
%dir %{python_sitelib}/nltk_lite/tokenize
%{python_sitelib}/nltk_lite/*.py*
%{python_sitelib}/nltk_lite/*/*.py*


%changelog
* Mon Oct 30 2006 Michel Salim  - 0.6.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nltk_lite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 02:56:58 -0000	1.1
+++ .cvsignore	11 Nov 2006 02:57:46 -0000	1.2
@@ -0,0 +1 @@
+nltk_lite-0.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nltk_lite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 02:56:58 -0000	1.1
+++ sources	11 Nov 2006 02:57:46 -0000	1.2
@@ -0,0 +1 @@
+24fd97b553d421686fa30226b210c143  nltk_lite-0.6.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 03:13:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 20:13:56 -0700
Subject: rpms/gwget/FC-5 .cvsignore, 1.6, 1.7 gwget.spec, 1.14, 1.15 sources,
	1.6, 1.7
Message-ID: <200611110313.kAB3Du8a021646@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21620

Modified Files:
	.cvsignore gwget.spec sources 
Log Message:
update to 0.98.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Feb 2006 10:39:23 -0000	1.6
+++ .cvsignore	11 Nov 2006 03:13:25 -0000	1.7
@@ -1 +1 @@
-gwget-0.97.tar.bz2
+gwget-0.98.2.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/gwget.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gwget.spec	15 Jul 2006 15:18:37 -0000	1.14
+++ gwget.spec	11 Nov 2006 03:13:25 -0000	1.15
@@ -1,19 +1,24 @@
 %define epimajor 2.14
 
-Summary:	Graphical download manager that uses wget
 Name:		gwget
-Version:	0.97
-Release:	4%{?dist}
+Version:	0.98.2
+Release:	1%{?dist}
+Summary:	Graphical download manager that uses wget
+
 License:	GPL
 Group:		Applications/Internet
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
-Source1:	gwget.desktop
-Patch0:		gwget-epiphany214.patch
 URL:		http://gnome.org/projects/gwget
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.98/gwget-0.98.2.tar.bz2
+Source1:	gwget.desktop
+Patch0:		gwget-epiphany21x.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	libgnomeui-devel >= 2.0
 BuildRequires:	libglade2-devel >= 2.0
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	gnome-vfs2-devel >= 2.0
+BuildRequires:	dbus-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	intltool >= 0.29
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 Requires:	wget >= 1.9
@@ -44,8 +49,8 @@
 autoreconf -f
 
 %build
-export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
-%configure 
+#export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -54,14 +59,13 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 rm ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-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				\
+	%{SOURCE1}
 rm -f ${RPM_BUILD_ROOT}/%{_includedir}/gwget/*
 %find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions/libgwgetextension.a
 
 %clean
 rm -rf %{buildroot}
@@ -70,24 +74,22 @@
 # For GConf apps: install schemas as system default
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
 
 %preun
 # For GConf apps: uninstall app's system default schemas
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-uninstall-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
 
 
 %files -f %{name}.lang
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_Gwget.server
 %{_sysconfdir}/gconf/schemas/gwget.schemas
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/idl/GNOME_Gwget.idl
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %files epiphany-extension
@@ -96,9 +98,30 @@
 
 
 %changelog
-* Sat Jul 15 2006 Christoph Wickert  0.97-4
+* Sat Nov 11 2006 Christoph Wickert  0.98.2-1
+- Update to 0.98.2.
+- Don't crash notification area (#213480).
+- Add support for epiphany 2.1.7.
+
+* Fri Sep 15 2006 Christoph Wickert  0.98.1-1
+- Update to 0.98.1.
+- BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
+
+* Fri Sep 15 2006 Christoph Wickert  0.97-7
+- Mass rebuild for Fedora Core 6.
+- Update epiphany-patch for epiphany <= 2.1.6.
+- disable-static instead of removing .a files.
+- BuildRequire intltool instead of perl(XML::Parser).
+
+* Sat Jul 15 2006 Christoph Wickert  0.97-6
 - Fix BR to build in minimal build environment (#198919).
-- fix defattr.
+- Add patch to build against epiphany 2.1.5.
+
+* Mon Jun 26 2006 Christoph Wickert  0.97-5
+- bump release to fix broken upgrade path FE5 -> FE6.
+
+* Mon Jun 26 2006 Christoph Wickert  0.97-4
+- fix %%defattr.
 - fix summary and description of epiphany-extension subpackage.
 - fix BR of epiphany-extension subpackage.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Feb 2006 10:39:23 -0000	1.6
+++ sources	11 Nov 2006 03:13:25 -0000	1.7
@@ -1 +1 @@
-b31dd63a2b55f1c0c2dea58490ca8cd2  gwget-0.97.tar.bz2
+26bb748aff0769321bf1fd9b65735649  gwget-0.98.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 03:17:50 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 20:17:50 -0700
Subject: rpms/gwget/FC-5 gwget-epiphany21x.patch, NONE,
	1.1 gwget-epiphany214.patch, 1.1, NONE
Message-ID: <200611110317.kAB3HoF6021737@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21730

Added Files:
	gwget-epiphany21x.patch 
Removed Files:
	gwget-epiphany214.patch 
Log Message:
include the correct patch

gwget-epiphany21x.patch:

--- NEW FILE gwget-epiphany21x.patch ---
--- gwget-0.98.2/configure.in.orig	2006-11-08 19:49:44.000000000 +0100
+++ gwget-0.98.2/configure.in	2006-11-11 03:04:53.000000000 +0100
@@ -97,13 +97,15 @@
 
 EPHY_VER=
 AC_ARG_WITH([epiphany-version],
-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
+        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17@:>@],
+                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 (default 1.6)]),
         [EPHY_VER="$withval"])
 
-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15 or 2.16
+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16 or 2.17
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.16; then
+if pkg-config --exists epiphany-2.17; then
+        EPHY_VER=2.17
+elif pkg-config --exists epiphany-2.16; then
         EPHY_VER=2.16
 elif pkg-config --exists epiphany-2.15; then
         EPHY_VER=2.15
@@ -158,13 +160,17 @@
           EPIPHANY_PKGCONFIG=epiphany-2.16
           EPIPHANY_REQUIRED=2.16
           EPIPHANY_SHORTVER=216
+elif test "x$EPHY_VER" = "x2.17"; then
+          EPIPHANY_PKGCONFIG=epiphany-2.17
+          EPIPHANY_REQUIRED=2.17
+          EPIPHANY_SHORTVER=217
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
 if test -n "$EPIPHANY_SHORTVER" ; then
 AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216 or 217)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


--- gwget-epiphany214.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 06:15:06 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 10 Nov 2006 23:15:06 -0700
Subject: rpms/fuse import.log,1.8,1.9
Message-ID: <200611110615.kAB6F6rQ032277@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32238

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.6.0-1 on branch devel from fuse-2.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	3 May 2006 08:58:06 -0000	1.8
+++ import.log	11 Nov 2006 06:14:35 -0000	1.9
@@ -5,3 +5,4 @@
 fuse-2_5_3-1:HEAD:fuse-2.5.3-1.src.rpm:1146646447
 fuse-2_5_3-1:FC-4:fuse-2.5.3-1.src.rpm:1146646544
 fuse-2_5_3-1:FC-5:fuse-2.5.3-1.src.rpm:1146646666
+fuse-2_6_0-1:HEAD:fuse-2.6.0-1.src.rpm:1163225659



From fedora-extras-commits at redhat.com  Sat Nov 11 06:15:07 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 10 Nov 2006 23:15:07 -0700
Subject: rpms/fuse/devel .cvsignore, 1.6, 1.7 fuse-udev_rules.patch, 1.6,
	1.7 fuse.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200611110615.kAB6F70X032286@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32238/devel

Modified Files:
	.cvsignore fuse-udev_rules.patch fuse.spec sources 
Log Message:
auto-import fuse-2.6.0-1 on branch devel from fuse-2.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 May 2006 08:54:29 -0000	1.6
+++ .cvsignore	11 Nov 2006 06:14:37 -0000	1.7
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse-udev_rules.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse-udev_rules.patch	29 Oct 2006 19:30:32 -0000	1.6
+++ fuse-udev_rules.patch	11 Nov 2006 06:14:37 -0000	1.7
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fuse.spec	29 Oct 2006 19:30:32 -0000	1.13
+++ fuse.spec	11 Nov 2006 06:14:37 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov  2.5.3-5
 - Fixed udev-rule again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 May 2006 08:54:29 -0000	1.6
+++ sources	11 Nov 2006 06:14:37 -0000	1.7
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 06:40:40 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 23:40:40 -0700
Subject: rpms/libxfce4util/devel sources, 1.6, 1.7 .cvsignore, 1.6,
	1.7 libxfce4util.spec, 1.13, 1.14
Message-ID: <200611110640.kAB6eeir032476@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32452

Modified Files:
	sources .cvsignore libxfce4util.spec 
Log Message:
Update to 4.3.99.2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 01:39:07 -0000	1.6
+++ sources	11 Nov 2006 06:40:09 -0000	1.7
@@ -1 +1 @@
-5474fda120b0f28f3b86bee268467060  libxfce4util-4.3.99.1.tar.bz2
+4b327c64c292b2e672f69a0789deb2b7  libxfce4util-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 01:39:07 -0000	1.6
+++ .cvsignore	11 Nov 2006 06:40:09 -0000	1.7
@@ -1 +1 @@
-libxfce4util-4.3.99.1.tar.bz2
+libxfce4util-4.3.99.2.tar.bz2


Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libxfce4util.spec	6 Oct 2006 01:37:15 -0000	1.13
+++ libxfce4util.spec	11 Nov 2006 06:40:09 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD and LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4util-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2
 Group: Development/Libraries
 Requires: glib2 >= 2.0.0
 BuildRequires: glib2-devel >= 2.0.0
@@ -57,6 +57,9 @@
 %{_includedir}/xfce4
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 



From fedora-extras-commits at redhat.com  Sat Nov 11 06:50:06 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 23:50:06 -0700
Subject: rpms/libxfcegui4/devel libxfcegui4.spec, 1.16, 1.17 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110650.kAB6o6rT032566@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32544

Modified Files:
	libxfcegui4.spec sources .cvsignore 
Log Message:
Upgrade to 4.3.99.2



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libxfcegui4.spec	6 Oct 2006 01:38:33 -0000	1.16
+++ libxfcegui4.spec	11 Nov 2006 06:49:36 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gtk2 >= 2.0.6
@@ -67,6 +67,9 @@
 %{_includedir}/xfce4/*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Upgrade to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 01:42:24 -0000	1.5
+++ sources	11 Nov 2006 06:49:36 -0000	1.6
@@ -1 +1 @@
-519bca1ba08e51f03584ce6c007cd10d  libxfcegui4-4.3.99.1.tar.bz2
+98679c67ac65c376833deacec9fcbecf  libxfcegui4-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 01:42:24 -0000	1.5
+++ .cvsignore	11 Nov 2006 06:49:36 -0000	1.6
@@ -1 +1 @@
-libxfcegui4-4.3.99.1.tar.bz2
+libxfcegui4-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 06:54:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:54:53 -0700
Subject: rpms/pachi - New directory
Message-ID: <200611110654.kAB6srb5032702@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32698/pachi

Log Message:
Directory /cvs/extras/rpms/pachi added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 06:54:59 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:54:59 -0700
Subject: rpms/pachi/devel - New directory
Message-ID: <200611110654.kAB6sxKD032716@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32698/pachi/devel

Log Message:
Directory /cvs/extras/rpms/pachi/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 06:55:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:55:17 -0700
Subject: rpms/pachi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611110655.kAB6tHmN032749@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32743

Added Files:
	Makefile import.log 
Log Message:
Setup of module pachi


--- NEW FILE Makefile ---
# Top level Makefile for module pachi
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  Sat Nov 11 06:55:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:55:23 -0700
Subject: rpms/pachi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611110655.kAB6tNAW032767@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32743/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pachi


--- 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  Sat Nov 11 06:58:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:58:09 -0700
Subject: rpms/pachi import.log,1.1,1.2
Message-ID: <200611110658.kAB6w9RQ000421@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv375

Modified Files:
	import.log 
Log Message:
auto-import pachi-1.0-1 on branch devel from pachi-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pachi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 06:55:17 -0000	1.1
+++ import.log	11 Nov 2006 06:57:39 -0000	1.2
@@ -0,0 +1 @@
+pachi-1_0-1:HEAD:pachi-1.0-1.src.rpm:1163228966



From fedora-extras-commits at redhat.com  Sat Nov 11 06:58:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:58:10 -0700
Subject: rpms/pachi/devel pachi-fixes.patch, NONE, 1.1 pachi.desktop, NONE, 
	1.1 pachi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611110658.kAB6wAu2000425@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv375/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pachi-fixes.patch pachi.desktop pachi.spec 
Log Message:
auto-import pachi-1.0-1 on branch devel from pachi-1.0-1.src.rpm

pachi-fixes.patch:

--- NEW FILE pachi-fixes.patch ---
diff -ur Pachi/data/Makefile.in Pachi.new/data/Makefile.in
--- Pachi/data/Makefile.in	2002-12-08 15:01:27.000000000 +0100
+++ Pachi.new/data/Makefile.in	2006-11-10 14:44:29.000000000 +0100
@@ -229,8 +229,8 @@
 
 install-data-local:
 	for file in $(score_DATA); do\
-	    chgrp $(group) $(scoredir)/$$file; \
-	    chmod $(perms) $(scoredir)/$$file; \
+	    chgrp $(group) $(DESTDIR)$(scoredir)/$$file; \
+	    chmod $(perms) $(DESTDIR)$(scoredir)/$$file; \
 	done					    
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -ur Pachi/src/faes.cpp Pachi.new/src/faes.cpp
--- Pachi/src/faes.cpp	2004-03-28 20:14:10.000000000 +0200
+++ Pachi.new/src/faes.cpp	2006-11-10 14:57:33.000000000 +0100
@@ -16,6 +16,8 @@
     *                                                                 *
     *******************************************************************/
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
+#include 
 #include
 #include
 #include
@@ -31,6 +33,8 @@
 #include"proto.h"
 #include"credits.h"
 
+FILE *highscore_fp = NULL;
+
 #include"text.c"
 #include"init.c"
 #include"gfx.c"
@@ -55,6 +59,19 @@
 
 int main(int argc, char *argv[])
 {
+    gid_t realgid;
+    
+    highscore_fp = fopen("/var/games/pachi.hs", "r+");
+    
+    /* Figure out who we really are. */
+    realgid = getgid();
+
+    /* This is where we drop our setgid privileges. */
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        return 1;
+    }
+
     initsdl();
 
     if(argc > 1)
@@ -86,6 +103,9 @@
 	    do_hiscores();
 	}
     }
+    if (highscore_fp)
+        fclose(highscore_fp);
+
 //    outro();
     SDL_JoystickClose(joystick);
     SDL_Quit();
Only in Pachi.new/src: faes.cpp~
diff -ur Pachi/src/file.c Pachi.new/src/file.c
--- Pachi/src/file.c	2004-03-28 21:55:10.000000000 +0200
+++ Pachi.new/src/file.c	2006-11-10 14:57:31.000000000 +0100
@@ -96,7 +96,8 @@
     LoadT(&scorefont,DATADIR"/fonts/font16b.T");
     LoadT(&scorefont1,DATADIR"/fonts/font16d.T");
 
-    FILE *file = fopen(SCOREDIR"/data/scores.dat","rb");
+    FILE *file = highscore_fp; /* FIXME, this will crash if (file == NULL) */
+    rewind(file);
     for(int a=0; a < 10; a++)
     {
 	for(int b=0; b < 10; b++)
@@ -124,7 +125,8 @@
 }
 void save_hiscoredata()
 {
-    FILE *file = fopen(SCOREDIR"/data/scores.dat","rb+");
+    FILE *file = highscore_fp; /* FIXME, this will crash if (file == NULL) */
+    rewind(file);
 
     for(int a=0;a<10;a++)
     {    
--- pachi-1.0.orig/src/game.c
+++ pachi-1.0/src/game.c
@@ -324,7 +324,7 @@
 	}
     }
     int object_is_here=0; // esta variable indica si el objeto que sigue en la secuencia esta en la pantalla actual
-    int bright_x, bright_y; // variables que indica en que posicion debe aparecer el brillo del proximo objeto a recoger
+    int bright_x = 0, bright_y = 0; // variables que indica en que posicion debe aparecer el brillo del proximo objeto a recoger
     for(n=0;n<5;n++)
     {
 	if(mobject[(R_current-1)*5+n].seq==sequence)
--- pachi-1.0.orig/src/gameover.c
+++ pachi-1.0/src/gameover.c
@@ -21,7 +21,6 @@
     SDL_SetColorKey(scorefont,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont->format,0,0,0));
     SDL_SetColorKey(scorefont1,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont1->format,0,0,0));
     SDL_SetColorKey(scorefont1,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont1->format,0,0,0));
-    char plyername[]="          ";
     char diflevel[] ="      ";
     print_text(scorefont1,screen,16,16,30, 55,"         PACHI EL MARCIANO    TOP TEN         ");//scorename[a]);
     print_text(scorefont1,screen,16,16,30, 95,"NAME         STAGE    TIME    LEVEL     SCORE ");//scorename[a]);
@@ -103,7 +102,8 @@
 	    hiscore_events();
 	    SDL_FillRect(screen,&box,SDL_MapRGB(screen->format,0,0,0));
 	    print_text(scorefont1,screen,16,16,box.x+10,box.y+5,"ENTER YOUR NAME");
-	    print_text(scorefont1,screen,16,16,box.x+51+(namechar*16),box.y+29,".");
+	    for (int i = namechar; i < 10; i++)
+		print_text(scorefont1,screen,16,16,box.x+51+(i*16),box.y+29,".");
 	    print_text(scorefont,screen,16,16,box.x+51,box.y+24,"%s",playername);
 	    SDL_Flip(screen);
 	}
--- pachi-1.0.orig/src/intro.c
+++ pachi-1.0/src/intro.c
@@ -52,7 +52,6 @@
     double introtime=0;
     escape_exit=0;
     float title_alpha=0;
-    int title_done=0;
     int n=1;
     while(escape_exit==0)
     {
--- pachi-1.0.orig/src/input.c
+++ pachi-1.0/src/input.c
@@ -68,7 +68,7 @@
 		    {
 			namechar=0;
 			for(n=0;n<10;n++)
-			    playername[n] = '.';
+			    playername[n] = ' ';
 		    }
 		}
 	    }
@@ -167,7 +167,6 @@
 
 void code_events()
 {
-    int n;
     SDL_Event event;
     
     while(SDL_PollEvent(&event)==1)
@@ -304,7 +303,6 @@
 
 void game_events()
 {
-    int n;
     SDL_Event event;
     Uint8 *keys;
     
--- pachi-1.0.orig/src/output.c
+++ pachi-1.0/src/output.c
@@ -300,7 +300,6 @@
     if(num==CEMETERY || num==CAVES || num==CASTLE || num==CASTLE+1 || num==LAB)
     {
 	escape_exit=0;
-	SDL_Surface *temp;
 	switch(num)
 	{
 	    case CEMETERY:
--- pachi-1.0.orig/src/text.c
+++ pachi-1.0/src/text.c
@@ -15,7 +15,7 @@
     srctxt.y = 0;
     int linecounter = 0 ; // este contador se utiliza para saber en que linea imprimimos el texto
     int charpos = 0;
-    for(int charcounter = 0; charcounter <= (strlen(texto));charcounter++)
+    for(unsigned charcounter = 0; charcounter <= (strlen(texto));charcounter++)
     {
 	int curchar=texto[charcounter];
 	if(curchar == 94)


--- NEW FILE pachi.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Pachi El Marciano
Comment=2D platform game
Exec=pachi -f
Icon=pachi.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE pachi.spec ---
Name:           pachi
Version:        1.0
Release:        1%{?dist}
Summary:        Pachi El Marciano - Platform Game
Group:          Amusements/Games
License:        GPL
URL:            http://dragontech.sourceforge.net/index.php?main=pachi&lang=en
Source0:        http://dl.sf.net/sourceforge/dragontech/pachi_source.tgz
Source1:        %{name}.desktop
Patch0:         %{name}-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_mixer-devel desktop-file-utils ImageMagick

%description
Pachi El Marciano is a cool 2D platform game inspired by the likes of
Manic Miner, Jet Set Willy, and more from the '80s.


%prep
%setup -q -n Pachi
%patch0 -p1 -z .fixes


%build
%configure
make %{?_smp_mflags}
convert Tgfx/icon.bmp %{name}.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# easier then patching the Makefile
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_var}/games
mv $RPM_BUILD_ROOT%{_var}/lib/games/%{name}/data/scores.dat \
   $RPM_BUILD_ROOT%{_var}/games/%{name}.hs

# 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
install -p -m 644 %{name}.png \
  $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 COPYING ChangeLog README
%attr(2755,root,games) %{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%config(noreplace) %attr (0664,root,games) %{_var}/games/%{name}.hs


%changelog
* Fri Nov 10 2006 Hans de Goede  1.0-1
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pachi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 06:55:23 -0000	1.1
+++ .cvsignore	11 Nov 2006 06:57:40 -0000	1.2
@@ -0,0 +1 @@
+pachi_source.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pachi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 06:55:23 -0000	1.1
+++ sources	11 Nov 2006 06:57:40 -0000	1.2
@@ -0,0 +1 @@
+64906110d6236adc15c81910b43a1ae9  pachi_source.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 06:59:19 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 23:59:19 -0700
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110659.kAB6xJnS000531@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv502

Modified Files:
	libxfce4mcs.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libxfce4mcs.spec	6 Oct 2006 01:55:58 -0000	1.12
+++ libxfce4mcs.spec	11 Nov 2006 06:58:49 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
-Version: 4.3.99.1
-Release: 2%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4mcs-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -62,6 +62,9 @@
 %{_includedir}/xfce4/libxfce4mcs
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - remove unneeded prereq


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 01:48:05 -0000	1.5
+++ sources	11 Nov 2006 06:58:49 -0000	1.6
@@ -1 +1 @@
-ad70646a4ef699d7adcd409339f78884  libxfce4mcs-4.3.99.1.tar.bz2
+7ee4eab238e773b9dbf3fa1472643f6e  libxfce4mcs-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 01:48:05 -0000	1.5
+++ .cvsignore	11 Nov 2006 06:58:49 -0000	1.6
@@ -1 +1 @@
-libxfce4mcs-4.3.99.1.tar.bz2
+libxfce4mcs-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:00:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 11 Nov 2006 00:00:25 -0700
Subject: owners owners.list,1.1921,1.1922
Message-ID: <200611110700.kAB70PnU000625@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv590

Modified Files:
	owners.list 
Log Message:
added pachi


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1921
retrieving revision 1.1922
diff -u -r1.1921 -r1.1922
--- owners.list	11 Nov 2006 02:17:46 -0000	1.1921
+++ owners.list	11 Nov 2006 06:59:55 -0000	1.1922
@@ -1227,6 +1227,7 @@
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|p0rn-comfort|Support programs for browsing image-gallery sites|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|pachi|Pachi El Marciano - Platform Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|padevchooser|Control applet for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|alex at dalloz.de|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|pam_keyring|A PAM module that executes gnome-keyring-daemon and unlocks the default keyring|denis at poolshark.org|extras-qa at fedoraproject.org|redhat at flyn.org



From fedora-extras-commits at redhat.com  Sat Nov 11 07:01:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:01:15 -0700
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec, 1.9, 1.10 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110701.kAB71FF8003592@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv631

Modified Files:
	xfce-mcs-manager.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce-mcs-manager.spec	6 Oct 2006 02:06:08 -0000	1.9
+++ xfce-mcs-manager.spec	11 Nov 2006 07:00:45 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-manager-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: libxfce4mcs >= %{version}
@@ -61,6 +61,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Add period to description
 - Fix defattr


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:01:44 -0000	1.5
+++ sources	11 Nov 2006 07:00:45 -0000	1.6
@@ -1 +1 @@
-1a42226297b3b89f19bd17a6841f5c3a  xfce-mcs-manager-4.3.99.1.tar.bz2
+59d6d8f4f931b562b39ea1decdf9e29e  xfce-mcs-manager-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:01:44 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:00:45 -0000	1.6
@@ -1 +1 @@
-xfce-mcs-manager-4.3.99.1.tar.bz2
+xfce-mcs-manager-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:17:40 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 11 Nov 2006 00:17:40 -0700
Subject: comps comps-fe5.xml.in, 1.192, 1.193 comps-fe6.xml.in, 1.216,
	1.217 comps-fe7.xml.in, 1.14, 1.15
Message-ID: <200611110717.kAB7HeCF003881@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3861

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add fotaq, bass


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- comps-fe5.xml.in	8 Nov 2006 09:57:56 -0000	1.192
+++ comps-fe5.xml.in	11 Nov 2006 07:17:09 -0000	1.193
@@ -306,6 +306,8 @@
       atomix
       auriferous
       ballbuster
+      beneath-a-steel-sky
+      beneath-a-steel-sky-cd
       blobwars
       bsd-games
       bygfoot
@@ -323,6 +325,7 @@
       enigma
       fbg
       fillets-ng
+      flight-of-the-amazon-queen
       foobillard
       fortune-mod
       fRaBs


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- comps-fe6.xml.in	8 Nov 2006 09:57:56 -0000	1.216
+++ comps-fe6.xml.in	11 Nov 2006 07:17:09 -0000	1.217
@@ -356,6 +356,8 @@
       atomix
       auriferous
       ballbuster
+      beneath-a-steel-sky
+      beneath-a-steel-sky-cd
       blobwars
       bsd-games
       bygfoot
@@ -374,6 +376,7 @@
       enigma
       fbg
       fillets-ng
+      flight-of-the-amazon-queen
       foobillard
       fortune-mod
       fRaBs


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- comps-fe7.xml.in	8 Nov 2006 09:57:56 -0000	1.14
+++ comps-fe7.xml.in	11 Nov 2006 07:17:09 -0000	1.15
@@ -356,6 +356,8 @@
       atomix
       auriferous
       ballbuster
+      beneath-a-steel-sky
+      beneath-a-steel-sky-cd
       blobwars
       bsd-games
       bygfoot
@@ -374,6 +376,7 @@
       enigma
       fbg
       fillets-ng
+      flight-of-the-amazon-queen
       foobillard
       fortune-mod
       fRaBs



From fedora-extras-commits at redhat.com  Sat Nov 11 07:23:22 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:23:22 -0700
Subject: rpms/xfce4-panel/devel sources, 1.5, 1.6 .cvsignore, 1.5,
	1.6 xfce4-panel.spec, 1.17, 1.18
Message-ID: <200611110723.kAB7NM9N003963@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3943

Modified Files:
	sources .cvsignore xfce4-panel.spec 
Log Message:
Update to 4.3.99.2 



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:10:26 -0000	1.5
+++ sources	11 Nov 2006 07:22:51 -0000	1.6
@@ -1 +1 @@
-8647de295987605161c75650e4554fd8  xfce4-panel-4.3.99.1.tar.bz2
+53f96a9db5628ac1c629c9e5ecd842e4  xfce4-panel-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:10:26 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:22:51 -0000	1.6
@@ -1 +1 @@
-xfce4-panel-4.3.99.1.tar.bz2
+xfce4-panel-4.3.99.2.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfce4-panel.spec	6 Oct 2006 08:13:22 -0000	1.17
+++ xfce4-panel.spec	11 Nov 2006 07:22:51 -0000	1.18
@@ -1,10 +1,10 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.3.99.1
-Release: 7%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= %{version}
@@ -119,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Fri Oct  6 2006 Kevin Fenzi  - 4.3.99.1-7
 - List full old versions in Obsoletes
 



From fedora-extras-commits at redhat.com  Sat Nov 11 07:25:14 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:25:14 -0700
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec, 1.13, 1.14 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110725.kAB7PE2S004044@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4019

Modified Files:
	gtk-xfce-engine.spec sources .cvsignore 
Log Message:
Update to 2.3.99.2



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtk-xfce-engine.spec	6 Oct 2006 02:27:27 -0000	1.13
+++ gtk-xfce-engine.spec	11 Nov 2006 07:24:44 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
-Version: 2.3.99.1
-Release: 3%{?dist}
+Version: 2.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/gtk-xfce-engine-2.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/gtk-xfce-engine-2.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.0
@@ -35,6 +35,9 @@
 %{_datadir}/*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 2.3.99.2-1
+- Update to 2.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 2.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:13:53 -0000	1.5
+++ sources	11 Nov 2006 07:24:44 -0000	1.6
@@ -1 +1 @@
-d5e9e9f5113268a1a3662ee420d064f7  gtk-xfce-engine-2.3.99.1.tar.bz2
+430c004dd67bc6445d7a162e626566fb  gtk-xfce-engine-2.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:13:53 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:24:44 -0000	1.6
@@ -1 +1 @@
-gtk-xfce-engine-2.3.99.1.tar.bz2
+gtk-xfce-engine-2.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:27:49 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:27:49 -0700
Subject: rpms/exo/devel sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 exo.spec, 1.19,
	1.20
Message-ID: <200611110727.kAB7RnAx004134@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4113

Modified Files:
	sources .cvsignore exo.spec 
Log Message:
Update to 0.3.1.12rc2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 22:07:51 -0000	1.4
+++ sources	11 Nov 2006 07:27:19 -0000	1.5
@@ -1 +1 @@
-98d5493c898ab54b82b0835fc0e6df87  exo-0.3.1.10rc1.tar.bz2
+4c74431033c4c222efeccd4cf47ab65f  exo-0.3.1.12rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 22:07:51 -0000	1.4
+++ .cvsignore	11 Nov 2006 07:27:19 -0000	1.5
@@ -1 +1 @@
-exo-0.3.1.10rc1.tar.bz2
+exo-0.3.1.12rc2.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- exo.spec	6 Oct 2006 03:51:31 -0000	1.19
+++ exo.spec	11 Nov 2006 07:27:19 -0000	1.20
@@ -2,11 +2,11 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.1.10
-Release: 0.6.rc1%{?dist}
+Version: 0.3.1.12
+Release: 0.1.rc2%{?dist}
 License: LGPL
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/exo-0.3.1.12rc2.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: Development/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 Python libraries and header files for the exo library.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %patch0 -p1 -b x86_64-build
 
@@ -83,6 +83,7 @@
 %{_datadir}/xfce4/helpers
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/ja
+%{_datadir}/xfce4/doc/fr
 %{_mandir}/man1/exo-csource.1.gz
 %{_mandir}/man1/exo-open.1.gz
 %{_bindir}/exo-csource
@@ -93,6 +94,7 @@
 %{_libexecdir}/exo-helper-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
+%{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-other.png
@@ -112,6 +114,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 0.3.1.12-0.1.rc2
+- Update to 0.3.1.12rc2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.3.1.10-0.6.rc1
 - Added libxfce4util-devel Requires for the devel package
 



From fedora-extras-commits at redhat.com  Sat Nov 11 07:30:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:30:15 -0700
Subject: rpms/Thunar/devel Thunar.spec, 1.7, 1.8 sources, 1.2, 1.3 .cvsignore,
	1.2, 1.3
Message-ID: <200611110730.kAB7UFe3004251@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4220

Modified Files:
	Thunar.spec sources .cvsignore 
Log Message:
Upgrade to 0.5.0rc2



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Thunar.spec	9 Oct 2006 19:13:47 -0000	1.7
+++ Thunar.spec	11 Nov 2006 07:29:44 -0000	1.8
@@ -1,10 +1,10 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 0.4.0
-Release: 0.11.rc1%{?dist}
+Version: 0.5.0
+Release: 0.1.rc2%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Thunar-0.5.0rc2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fam-devel
@@ -49,7 +49,7 @@
 libraries and header files for the Thunar file manager.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %build
 %configure --enable-dbus --enable-final --enable-xsltproc --enable-gtk-doc
@@ -164,6 +164,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Nov 09 2006 Kevin Fenzi  - 0.5.0-0.1.rc2
+- Upgrade to 0.5.0rc2
+
 * Mon Oct 09 2006 Kevin Fenzi  - 0.4.0-0.11.rc1
 - Add shared-mime-info and xfce4-icon-theme as Requires (fixes #209592)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2006 22:55:50 -0000	1.2
+++ sources	11 Nov 2006 07:29:44 -0000	1.3
@@ -1 +1 @@
-b07ae97a69964112e0af84ba2f63585d  Thunar-0.4.0rc1.tar.bz2
+c97f6a011eb72b8653ad799290c71d52  Thunar-0.5.0rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 22:55:50 -0000	1.2
+++ .cvsignore	11 Nov 2006 07:29:44 -0000	1.3
@@ -1 +1 @@
-Thunar-0.4.0rc1.tar.bz2
+Thunar-0.5.0rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:43:27 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:43:27 -0700
Subject: rpms/Terminal/devel Terminal.spec, 1.13, 1.14 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200611110743.kAB7hRXn004369@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346

Modified Files:
	Terminal.spec sources .cvsignore 
Log Message:
Update to 0.2.5.8rc2



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Terminal.spec	6 Oct 2006 02:50:50 -0000	1.13
+++ Terminal.spec	11 Nov 2006 07:42:56 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.2.5.6
-Release: 0.3.rc1%{?dist}
+Version: 0.2.5.8
+Release: 0.1.rc2%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Terminal-0.2.5.6rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Terminal-0.2.5.8rc2.tar.bz2
 Group: User Interface/X
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel
@@ -18,7 +18,7 @@
 it unique among X terminal emulators. 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %build
 %configure
@@ -60,6 +60,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.2.5.8-0.1.rc2
+- Update to 0.2.5.8rc2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.2.5.6-0.4.rc1
 - Added gtk-update-icon-cache to post/postun
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 22:22:52 -0000	1.4
+++ sources	11 Nov 2006 07:42:56 -0000	1.5
@@ -1 +1 @@
-4aa04a71f3dd2d132ed3d10f174171ca  Terminal-0.2.5.6rc1.tar.bz2
+d2785c1b11c48ed012042faa708bbf94  Terminal-0.2.5.8rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 22:22:52 -0000	1.4
+++ .cvsignore	11 Nov 2006 07:42:56 -0000	1.5
@@ -1 +1 @@
-Terminal-0.2.5.6rc1.tar.bz2
+Terminal-0.2.5.8rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:45:07 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:45:07 -0700
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec, 1.10, 1.11 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110745.kAB7j71F004455@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4425

Modified Files:
	xfce4-appfinder.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-appfinder.spec	6 Oct 2006 05:57:08 -0000	1.10
+++ xfce4-appfinder.spec	11 Nov 2006 07:44:37 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-appfinder-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -49,6 +49,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Add period to description
 - Fix defattr


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:34:54 -0000	1.5
+++ sources	11 Nov 2006 07:44:37 -0000	1.6
@@ -1 +1 @@
-576b6af7ed7223cbdbccf7df509b8c9f  xfce4-appfinder-4.3.99.1.tar.bz2
+a4636f51d79eb68ba65098336d120d56  xfce4-appfinder-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:34:54 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:44:37 -0000	1.6
@@ -1 +1 @@
-xfce4-appfinder-4.3.99.1.tar.bz2
+xfce4-appfinder-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:47:48 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:47:48 -0700
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec, 1.11,
	1.12 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110747.kAB7lmuc004534@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4511

Modified Files:
	xfce4-icon-theme.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-icon-theme.spec	6 Oct 2006 05:59:03 -0000	1.11
+++ xfce4-icon-theme.spec	11 Nov 2006 07:47:18 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-icon-theme-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -37,6 +37,9 @@
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:38:12 -0000	1.5
+++ sources	11 Nov 2006 07:47:18 -0000	1.6
@@ -1 +1 @@
-ccdcd6aa7e03732347d785a826c81f84  xfce4-icon-theme-4.3.99.1.tar.bz2
+e8ad35bc50a84f620848f841d5167fb9  xfce4-icon-theme-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:38:12 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:47:18 -0000	1.6
@@ -1 +1 @@
-xfce4-icon-theme-4.3.99.1.tar.bz2
+xfce4-icon-theme-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:49:21 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:49:21 -0700
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec, 1.11, 1.12 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110749.kAB7nLww004617@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4590

Modified Files:
	xfce4-mixer.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-mixer.spec	6 Oct 2006 06:04:58 -0000	1.11
+++ xfce4-mixer.spec	11 Nov 2006 07:48:51 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-mixer-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.3.99.1
@@ -56,6 +56,9 @@
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - Add period to the end of description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:44:00 -0000	1.5
+++ sources	11 Nov 2006 07:48:51 -0000	1.6
@@ -1 +1 @@
-5836282f9795d10b65d41564a923f677  xfce4-mixer-4.3.99.1.tar.bz2
+9648fc403f9eb4baede230644bf5638d  xfce4-mixer-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:44:00 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:48:51 -0000	1.6
@@ -1 +1 @@
-xfce4-mixer-4.3.99.1.tar.bz2
+xfce4-mixer-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:51:19 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:51:19 -0700
Subject: rpms/xfce4-session/devel xfce4-session.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110751.kAB7pJRt004695@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4675

Modified Files:
	xfce4-session.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-session.spec	6 Oct 2006 06:06:11 -0000	1.12
+++ xfce4-session.spec	11 Nov 2006 07:50:49 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.3.99.1
-Release: 6%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-session-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-session-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= 4.3.99.1
@@ -113,6 +113,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-6
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:53:42 -0000	1.5
+++ sources	11 Nov 2006 07:50:49 -0000	1.6
@@ -1 +1 @@
-98c20381becc6fa84fae40be888b2ac7  xfce4-session-4.3.99.1.tar.bz2
+c2a4a306de2538a4425349587dccb7d9  xfce4-session-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:53:42 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:50:49 -0000	1.6
@@ -1 +1 @@
-xfce4-session-4.3.99.1.tar.bz2
+xfce4-session-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:52:57 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:52:57 -0700
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec, 1.11,
	1.12 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110752.kAB7qv6q004778@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756

Modified Files:
	xfce-mcs-plugins.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce-mcs-plugins.spec	6 Oct 2006 06:08:38 -0000	1.11
+++ xfce-mcs-plugins.spec	11 Nov 2006 07:52:27 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2
 Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -54,6 +54,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:56:40 -0000	1.5
+++ sources	11 Nov 2006 07:52:27 -0000	1.6
@@ -1 +1 @@
-98b0b149110056b93587c66852fc3194  xfce-mcs-plugins-4.3.99.1.tar.bz2
+6234425227e1145319bd75ef52fa97f5  xfce-mcs-plugins-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:56:40 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:52:27 -0000	1.6
@@ -1 +1 @@
-xfce-mcs-plugins-4.3.99.1.tar.bz2
+xfce-mcs-plugins-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:54:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:54:32 -0700
Subject: rpms/xfce-utils/devel xfce-utils.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110754.kAB7sW8k004867@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4842

Modified Files:
	xfce-utils.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce-utils.spec	6 Oct 2006 06:16:57 -0000	1.12
+++ xfce-utils.spec	11 Nov 2006 07:54:01 -0000	1.13
@@ -2,11 +2,11 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-utils-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2
 Source1: xfce4.desktop
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -81,6 +81,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-5
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:00:52 -0000	1.5
+++ sources	11 Nov 2006 07:54:01 -0000	1.6
@@ -1 +1 @@
-95448f642ee52cdb5ec20dc3c28dcc3b  xfce-utils-4.3.99.1.tar.bz2
+de6502dd93176b2a60e2e66bf052024f  xfce-utils-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:00:52 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:54:01 -0000	1.6
@@ -1 +1 @@
-xfce-utils-4.3.99.1.tar.bz2
+xfce-utils-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:56:29 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:56:29 -0700
Subject: rpms/xfdesktop/devel xfdesktop.spec, 1.14, 1.15 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110756.kAB7uTUr004945@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4925

Modified Files:
	xfdesktop.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfdesktop.spec	6 Oct 2006 06:20:34 -0000	1.14
+++ xfdesktop.spec	11 Nov 2006 07:55:59 -0000	1.15
@@ -1,10 +1,10 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfdesktop-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2
 
 # Change default for Fedora
 Patch0: xfdesktop-image-4.3.90.1.patch
@@ -81,6 +81,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-5
 - Fix defattr
 - Add period to the end of description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:04:46 -0000	1.5
+++ sources	11 Nov 2006 07:55:59 -0000	1.6
@@ -1 +1 @@
-ad4dc2ceeafe10ff69196e287f07090a  xfdesktop-4.3.99.1.tar.bz2
+d44a81b9da9598425d9dd8dcd1cd5485  xfdesktop-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:04:46 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:55:59 -0000	1.6
@@ -1 +1 @@
-xfdesktop-4.3.99.1.tar.bz2
+xfdesktop-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:58:41 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:58:41 -0700
Subject: rpms/xfprint/devel xfprint.spec, 1.15, 1.16 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110758.kAB7wffO005021@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5001

Modified Files:
	xfprint.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2 



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfprint.spec	6 Oct 2006 06:31:05 -0000	1.15
+++ xfprint.spec	11 Nov 2006 07:58:11 -0000	1.16
@@ -1,10 +1,10 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD
 URL: http://www.xfce.org
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfprint-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfprint-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -56,13 +56,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -75,7 +75,7 @@
 %{_datadir}/applications/*
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/icons/hicolor/*/*/*
+#%{_datadir}/icons/hicolor/*/*/*
 
 %files devel
 %defattr(-, root, root)
@@ -84,6 +84,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+- Disable icons for now since they were not included in 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:07:51 -0000	1.5
+++ sources	11 Nov 2006 07:58:11 -0000	1.6
@@ -1 +1 @@
-13657288cd3ffaaa8d3701bcb3d7740a  xfprint-4.3.99.1.tar.bz2
+c2eb9dee0002e875b91e73557f7354a1  xfprint-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:07:51 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:58:11 -0000	1.6
@@ -1 +1 @@
-xfprint-4.3.99.1.tar.bz2
+xfprint-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:00:28 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:00:28 -0700
Subject: rpms/xfwm4/devel xfwm4.spec, 1.16, 1.17 sources, 1.6, 1.7 .cvsignore,
	1.6, 1.7
Message-ID: <200611110800.kAB80S2R005118@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5081

Modified Files:
	xfwm4.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfwm4.spec	6 Oct 2006 06:33:27 -0000	1.16
+++ xfwm4.spec	11 Nov 2006 07:59:57 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-6
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 03:11:10 -0000	1.6
+++ sources	11 Nov 2006 07:59:57 -0000	1.7
@@ -1 +1 @@
-ab8fcfdf496f093bbe711a7d853deb33  xfwm4-4.3.99.1.tar.bz2
+3186d90ae752cce9687698c8bd6b26c3  xfwm4-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 03:11:10 -0000	1.6
+++ .cvsignore	11 Nov 2006 07:59:57 -0000	1.7
@@ -1 +1 @@
-xfwm4-4.3.99.1.tar.bz2
+xfwm4-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:02:36 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:02:36 -0700
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec, 1.10, 1.11 sources, 1.5, 
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110802.kAB82arB008145@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8122

Modified Files:
	xfwm4-themes.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfwm4-themes.spec	6 Oct 2006 06:35:01 -0000	1.10
+++ xfwm4-themes.spec	11 Nov 2006 08:01:57 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-themes-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfwm4
@@ -35,6 +35,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:13:39 -0000	1.5
+++ sources	11 Nov 2006 08:02:04 -0000	1.6
@@ -1 +1 @@
-48f6171c4eed813770e211ccfad8aeaf  xfwm4-themes-4.3.99.1.tar.bz2
+a77e9e700de66d38b6c4850a18283fb1  xfwm4-themes-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:13:39 -0000	1.5
+++ .cvsignore	11 Nov 2006 08:02:04 -0000	1.6
@@ -1 +1 @@
-xfwm4-themes-4.3.99.1.tar.bz2
+xfwm4-themes-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:04:46 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:04:46 -0700
Subject: rpms/orage/devel orage.spec, 1.4, 1.5 sources, 1.2, 1.3 .cvsignore, 
	1.2, 1.3
Message-ID: <200611110804.kAB84kjp008236@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8211

Modified Files:
	orage.spec sources .cvsignore 
Log Message:
Update 4.3.99.2



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- orage.spec	15 Oct 2006 18:11:32 -0000	1.4
+++ orage.spec	11 Nov 2006 08:04:16 -0000	1.5
@@ -1,10 +1,10 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.3.99.1
-Release: 6%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/orage-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xfce-mcs-manager-devel
@@ -69,6 +69,9 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update 4.3.99.2
+
 * Sun Oct 15 2006 Kevin Fenzi  - 4.3.99.1-6
 - xfce4-datetime-plugin is back, remove obsoletes and provides
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 03:32:29 -0000	1.2
+++ sources	11 Nov 2006 08:04:16 -0000	1.3
@@ -1 +1 @@
-511dce3a93aa6e34973989e4441f23ec  orage-4.3.99.1.tar.bz2
+40607e4b116c4d298745ef0672826cd8  orage-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 03:32:29 -0000	1.2
+++ .cvsignore	11 Nov 2006 08:04:16 -0000	1.3
@@ -1 +1 @@
-orage-4.3.99.1.tar.bz2
+orage-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:06:38 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:06:38 -0700
Subject: rpms/mousepad/devel mousepad.spec, 1.3, 1.4 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200611110806.kAB86coT008332@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mousepad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8309

Modified Files:
	mousepad.spec sources .cvsignore 
Log Message:
Update to 0.2.10



Index: mousepad.spec
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/mousepad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mousepad.spec	6 Oct 2006 03:00:43 -0000	1.3
+++ mousepad.spec	11 Nov 2006 08:06:07 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           mousepad
-Version:        0.2.8
-Release:        2%{?dist}
+Version:        0.2.10
+Release:        1%{?dist}
 Summary:        Mousepad - A simple text editor for Xfce
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-4.3.90.2/src/mousepad-0.2.8.tar.bz2
+Source0:        http://www.xfce.org/archive/xfce-4.3.99.2/src/mousepad-0.2.10.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxfcegui4-devel
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/* 
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.2.10-1
+- Update to 0.2.10
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.2.8-2
 - Fix typo in description 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 03:16:03 -0000	1.3
+++ sources	11 Nov 2006 08:06:07 -0000	1.4
@@ -1 +1 @@
-ad40c3b610123b7347094464a603e337  mousepad-0.2.8.tar.bz2
+c943c9408cbb35be73c45f75d945b34d  mousepad-0.2.10.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 03:16:03 -0000	1.3
+++ .cvsignore	11 Nov 2006 08:06:07 -0000	1.4
@@ -1 +1 @@
-mousepad-0.2.8.tar.bz2
+mousepad-0.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:42:59 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 11 Nov 2006 01:42:59 -0700
Subject: rpms/synce/FC-6 synce.spec,1.23,1.24
Message-ID: <200611110843.kAB8gx9M008622@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8592/FC-6

Modified Files:
	synce.spec 
Log Message:
- fix udev script (#215129, #208517)



Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/FC-6/synce.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- synce.spec	15 Sep 2006 13:20:59 -0000	1.23
+++ synce.spec	11 Nov 2006 08:42:29 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           synce
 Version:        0.9.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Serial connection support for Pocket PC devices
 
 Group:          Applications/Communications
@@ -122,7 +122,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/
 ln -s ../../udev/scripts/synce.dev $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/synce.dev
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-echo 'DRIVER="ipaq", NAME="ipaq", SYMLINK="ttyUSB%%n"' > \
+echo 'DRIVER=="ipaq", NAME="ipaq", SYMLINK+="ttyUSB%%n"' > \
     $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/50-ipaq.rules
 cp %{SOURCE7} README.Fedora
 
@@ -195,6 +195,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sat Nov 11 2006 Andreas Bierfert 
+0.9.1-9
+- fix udev script (#215129, #208517)
+
 * Fri Sep 15 2006 Andreas Bierfert 
 0.9.1-8
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Sat Nov 11 08:43:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 11 Nov 2006 01:43:00 -0700
Subject: rpms/synce/devel synce.spec,1.23,1.24
Message-ID: <200611110843.kAB8h0MC008625@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8592/devel

Modified Files:
	synce.spec 
Log Message:
- fix udev script (#215129, #208517)



Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- synce.spec	15 Sep 2006 13:20:59 -0000	1.23
+++ synce.spec	11 Nov 2006 08:42:30 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           synce
 Version:        0.9.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Serial connection support for Pocket PC devices
 
 Group:          Applications/Communications
@@ -122,7 +122,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/
 ln -s ../../udev/scripts/synce.dev $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/synce.dev
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-echo 'DRIVER="ipaq", NAME="ipaq", SYMLINK="ttyUSB%%n"' > \
+echo 'DRIVER=="ipaq", NAME="ipaq", SYMLINK+="ttyUSB%%n"' > \
     $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/50-ipaq.rules
 cp %{SOURCE7} README.Fedora
 
@@ -195,6 +195,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sat Nov 11 2006 Andreas Bierfert 
+0.9.1-9
+- fix udev script (#215129, #208517)
+
 * Fri Sep 15 2006 Andreas Bierfert 
 0.9.1-8
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Sat Nov 11 08:57:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:57:34 -0700
Subject: rpms/p0f/devel p0f.spec, 1.11, 1.12 sources, 1.5, 1.6 .cvsignore,
	1.5, 1.6
Message-ID: <200611110857.kAB8vYxO008755@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/p0f/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8735

Modified Files:
	p0f.spec sources .cvsignore 
Log Message:
Update to 2.0.8



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- p0f.spec	28 Aug 2006 04:30:47 -0000	1.11
+++ p0f.spec	11 Nov 2006 08:57:04 -0000	1.12
@@ -1,12 +1,12 @@
 Name: p0f
-Version: 2.0.7
-Release: 2%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
 
 Summary: Versatile passive OS fingerprinting tool
 Group: Applications/Internet
 License: GPL
 URL: http://lcamtuf.coredump.cx/p0f.shtml
-Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.7.tgz
+Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.8.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap-devel
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Kevin Fenzi  - 2.0.8-1
+- Update to 2.0.8
+
 * Sun Aug 27 2006 Kevin Fenzi  - 2.0.7-2
 - Rebuild for fc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2006 03:50:37 -0000	1.5
+++ sources	11 Nov 2006 08:57:04 -0000	1.6
@@ -1 +1 @@
-55c222cfb72a0e323e11e9744bbb6ff9  p0f-2.0.7.tgz
+1ccbcd8d4c95ef6dae841120d23c56a5  p0f-2.0.8.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2006 03:50:37 -0000	1.5
+++ .cvsignore	11 Nov 2006 08:57:04 -0000	1.6
@@ -1 +1 @@
-p0f-2.0.7.tgz
+p0f-2.0.8.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 09:06:07 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 02:06:07 -0700
Subject: rpms/p0f/FC-6 p0f.spec, 1.11, 1.12 sources, 1.5, 1.6 .cvsignore, 1.5,
	1.6
Message-ID: <200611110906.kAB967Z8011806@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/p0f/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11783

Modified Files:
	p0f.spec sources .cvsignore 
Log Message:
Update to 2.0.8



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-6/p0f.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- p0f.spec	28 Aug 2006 04:30:47 -0000	1.11
+++ p0f.spec	11 Nov 2006 09:05:36 -0000	1.12
@@ -1,12 +1,12 @@
 Name: p0f
-Version: 2.0.7
-Release: 2%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
 
 Summary: Versatile passive OS fingerprinting tool
 Group: Applications/Internet
 License: GPL
 URL: http://lcamtuf.coredump.cx/p0f.shtml
-Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.7.tgz
+Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.8.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap-devel
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Kevin Fenzi  - 2.0.8-1
+- Update to 2.0.8
+
 * Sun Aug 27 2006 Kevin Fenzi  - 2.0.7-2
 - Rebuild for fc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2006 03:50:37 -0000	1.5
+++ sources	11 Nov 2006 09:05:36 -0000	1.6
@@ -1 +1 @@
-55c222cfb72a0e323e11e9744bbb6ff9  p0f-2.0.7.tgz
+1ccbcd8d4c95ef6dae841120d23c56a5  p0f-2.0.8.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2006 03:50:37 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:05:36 -0000	1.6
@@ -1 +1 @@
-p0f-2.0.7.tgz
+p0f-2.0.8.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 09:09:41 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 02:09:41 -0700
Subject: rpms/p0f/FC-5 p0f.spec,1.9,1.10 sources,1.5,1.6 .cvsignore,1.5,1.6
Message-ID: <200611110909.kAB99fsE011964@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/p0f/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942

Modified Files:
	p0f.spec sources .cvsignore 
Log Message:
Upgrade to 2.0.8



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-5/p0f.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- p0f.spec	24 Aug 2006 03:54:20 -0000	1.9
+++ p0f.spec	11 Nov 2006 09:09:10 -0000	1.10
@@ -1,5 +1,5 @@
 Name: p0f
-Version: 2.0.7
+Version: 2.0.8
 Release: 1%{?dist}
 
 Summary: Versatile passive OS fingerprinting tool
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Kevin Fenzi  - 2.0.8-1
+- Upgrade to 2.0.8
+
 * Wed Aug 23 2006 Kevin Fenzi  - 2.0.7-1
 - Upgrade to 2.0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2006 03:54:20 -0000	1.5
+++ sources	11 Nov 2006 09:09:10 -0000	1.6
@@ -1 +1 @@
-55c222cfb72a0e323e11e9744bbb6ff9  p0f-2.0.7.tgz
+1ccbcd8d4c95ef6dae841120d23c56a5  p0f-2.0.8.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2006 03:54:20 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:09:10 -0000	1.6
@@ -1 +1 @@
-p0f-2.0.7.tgz
+p0f-2.0.8.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 09:27:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:27:44 -0700
Subject: rpms/em8300-kmod/FC-5 .cvsignore, 1.3, 1.4 em8300-kmod.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200611110927.kAB9RiMk012583@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-serv12563

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
- 0.16.0-rc2, build for kernel 2.6.18-1.2239.fc5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 18:17:12 -0000	1.3
+++ .cvsignore	11 Nov 2006 09:27:14 -0000	1.4
@@ -1 +1 @@
-em8300-nofirmware-0.16.0-rc1.tar.bz2
+em8300-nofirmware-0.16.0-rc2.tar.bz2


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- em8300-kmod.spec	16 Oct 2006 16:03:07 -0000	1.6
+++ em8300-kmod.spec	11 Nov 2006 09:27:14 -0000	1.7
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2200.fc5}
+%{!?kversion: %define kversion 2.6.18-1.2239.fc5}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -22,15 +22,15 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.0.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.0.rc2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
 #Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
-# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc2.tar.gz
 # with modules/em8300.uc removed
-Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
+Source0:        %{kmod_name}-nofirmware-%{version}-rc2.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,13 +44,13 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc1
+cd %{kmod_name}-%{version}-rc2
 %patch0 -p0
 %patch1 -p0
-sed -i -e 's|||' modules/*.[hc]
+sed -i -e '//d' modules/em8300_main.c
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
 done
 
 
@@ -67,8 +67,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
+    cd _kmod_build_$kvariant/modules && \
+    make install DESTDIR=$RPM_BUILD_ROOT \
+        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+    cd ../..
 done
 
 
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+- 0.16.0-rc2, build for kernel 2.6.18-1.2239.fc5.
+
 * Mon Oct 16 2006 Ville Skytt??  - 0.16.0-0.0.rc1
 - Build for kernel 2.6.18-1.2200.fc5.
 - Don't use .


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 18:17:12 -0000	1.3
+++ sources	11 Nov 2006 09:27:14 -0000	1.4
@@ -1 +1 @@
-969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b442b787026a262cdc3f74486302f43f  em8300-nofirmware-0.16.0-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:31:34 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:31:34 -0700
Subject: rpms/codeblocks/devel .cvsignore, 1.5, 1.6 codeblocks-plugins.patch,
	1.2, 1.3 codeblocks.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200611110931.kAB9VY0H012694@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12642

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3202
- fixed plugin loading on 64-bit platforms



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 09:58:48 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:31:04 -0000	1.6
@@ -1 +1 @@
-codeblocks-svn3170.tar.bz2
+codeblocks-svn3202.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-plugins.patch	8 Oct 2006 09:16:19 -0000	1.2
+++ codeblocks-plugins.patch	11 Nov 2006 09:31:04 -0000	1.3
@@ -1,14 +1,11 @@
-diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
---- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
-+++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200
-@@ -448,9 +448,7 @@
+--- src/sdk/configmanager.cpp.orig	2006-11-08 14:53:00.000000000 +0100
++++ src/sdk/configmanager.cpp	2006-11-08 17:48:05.000000000 +0100
+@@ -389,7 +389,7 @@
+             return ::wxGetCwd();
  
          case sdPluginsGlobal:
-         {
--            wxString p = ConfigManager::data_path_global + _T("/plugins");
--            if(!wxDirExists(p + wxFILE_SEP_PATH))
--                CreateDirRecursively(p + wxFILE_SEP_PATH);
-+            wxString p = _T("/usr/lib/codeblocks/plugins/");
-             return p;
-         }
+-            return ConfigManager::data_path_global + _T("/plugins");
++            return _T("@libdir@/codeblocks/plugins");
  
+         case sdPluginsUser:
+             return ConfigManager::data_path_user   + _T("/plugins");


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeblocks.spec	3 Nov 2006 09:58:48 -0000	1.4
+++ codeblocks.spec	11 Nov 2006 09:31:04 -0000	1.5
@@ -1,9 +1,9 @@
-%define		rev	3170
-%define		date	20061102
+%define		rev	3202
+%define		date	20061110
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.12.%{date}svn%{rev}%{?dist}
+Release:	0.13.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -53,7 +53,7 @@
 %prep
 
 %setup -q -n codeblocks
-%patch1 -p1
+%patch1
 %patch2 -p1
 %patch3
 
@@ -72,6 +72,9 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
 
+sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
+
+# generate revision.m4
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -225,7 +228,11 @@
 
 
 %changelog
-* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+* Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
+- update to revision 3202
+- fixed plugin loading on 64-bit platforms
+
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061102svn3170
 - update to revision 3170
 
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 09:58:48 -0000	1.5
+++ sources	11 Nov 2006 09:31:04 -0000	1.6
@@ -1 +1 @@
-bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2
+ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:33:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:33:08 -0700
Subject: rpms/em8300-kmod/FC-6 .cvsignore, 1.3, 1.4 em8300-kmod.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200611110933.kAB9X8Y0012784@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-serv12742/FC-6

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
- 0.16.0-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2006 20:18:24 -0000	1.3
+++ .cvsignore	11 Nov 2006 09:32:38 -0000	1.4
@@ -1 +1 @@
-em8300-nofirmware-0.16.0-rc1.tar.bz2
+em8300-nofirmware-0.16.0-rc2.tar.bz2


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- em8300-kmod.spec	17 Oct 2006 19:08:18 -0000	1.9
+++ em8300-kmod.spec	11 Nov 2006 09:32:38 -0000	1.10
@@ -27,15 +27,15 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.3.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.3.rc2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
 #Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
-# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc2.tar.gz
 # with modules/em8300.uc removed
-Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
+Source0:        %{kmod_name}-nofirmware-%{version}-rc2.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,13 +49,13 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc1
+cd %{kmod_name}-%{version}-rc2
 %patch0 -p0
 %patch1 -p0
-sed -i -e 's|||' modules/*.[hc]
+sed -i -e '//d' modules/em8300_main.c
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
 done
 
 
@@ -72,8 +72,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
+    cd _kmod_build_$kvariant/modules && \
+    make install DESTDIR=$RPM_BUILD_ROOT \
+        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+    cd ../..
 done
 
 
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+- 0.16.0-rc2.
+
 * Tue Oct 17 2006 Ville Skytt?? 
 - Rebuild for kernel 2.6.18-1.2798.fc6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2006 20:18:24 -0000	1.3
+++ sources	11 Nov 2006 09:32:38 -0000	1.4
@@ -1 +1 @@
-969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b442b787026a262cdc3f74486302f43f  em8300-nofirmware-0.16.0-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:33:09 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:33:09 -0700
Subject: rpms/em8300-kmod/devel .cvsignore, 1.3, 1.4 em8300-kmod.spec, 1.9, 
	1.10 sources, 1.3, 1.4
Message-ID: <200611110933.kAB9X9qf012789@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742/devel

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
- 0.16.0-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2006 20:18:24 -0000	1.3
+++ .cvsignore	11 Nov 2006 09:32:39 -0000	1.4
@@ -1 +1 @@
-em8300-nofirmware-0.16.0-rc1.tar.bz2
+em8300-nofirmware-0.16.0-rc2.tar.bz2


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- em8300-kmod.spec	17 Oct 2006 19:08:18 -0000	1.9
+++ em8300-kmod.spec	11 Nov 2006 09:32:39 -0000	1.10
@@ -27,15 +27,15 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.3.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.3.rc2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
 #Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
-# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc2.tar.gz
 # with modules/em8300.uc removed
-Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
+Source0:        %{kmod_name}-nofirmware-%{version}-rc2.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,13 +49,13 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc1
+cd %{kmod_name}-%{version}-rc2
 %patch0 -p0
 %patch1 -p0
-sed -i -e 's|||' modules/*.[hc]
+sed -i -e '//d' modules/em8300_main.c
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
 done
 
 
@@ -72,8 +72,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
+    cd _kmod_build_$kvariant/modules && \
+    make install DESTDIR=$RPM_BUILD_ROOT \
+        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+    cd ../..
 done
 
 
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+- 0.16.0-rc2.
+
 * Tue Oct 17 2006 Ville Skytt?? 
 - Rebuild for kernel 2.6.18-1.2798.fc6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2006 20:18:24 -0000	1.3
+++ sources	11 Nov 2006 09:32:39 -0000	1.4
@@ -1 +1 @@
-969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b442b787026a262cdc3f74486302f43f  em8300-nofirmware-0.16.0-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:35:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:35:27 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.10,1.11
Message-ID: <200611110935.kAB9ZRSO012884@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12851/devel

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix release in changelog.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- em8300-kmod.spec	11 Nov 2006 09:32:39 -0000	1.10
+++ em8300-kmod.spec	11 Nov 2006 09:34:56 -0000	1.11
@@ -84,7 +84,7 @@
 
 
 %changelog
-* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.3.rc2
 - 0.16.0-rc2.
 
 * Tue Oct 17 2006 Ville Skytt?? 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:35:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:35:26 -0700
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.10,1.11
Message-ID: <200611110935.kAB9ZQff012881@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-serv12851/FC-6

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix release in changelog.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- em8300-kmod.spec	11 Nov 2006 09:32:38 -0000	1.10
+++ em8300-kmod.spec	11 Nov 2006 09:34:56 -0000	1.11
@@ -84,7 +84,7 @@
 
 
 %changelog
-* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.3.rc2
 - 0.16.0-rc2.
 
 * Tue Oct 17 2006 Ville Skytt?? 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:37:35 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:37:35 -0700
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.5, 1.6 codeblocks-plugins.patch, 
	1.2, 1.3 codeblocks.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200611110937.kAB9bZbk012926@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12901

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3202
- fixed plugin loading on 64-bit platforms



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 10:02:48 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:37:05 -0000	1.6
@@ -1 +1 @@
-codeblocks-svn3170.tar.bz2
+codeblocks-svn3202.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-plugins.patch	8 Oct 2006 09:16:19 -0000	1.2
+++ codeblocks-plugins.patch	11 Nov 2006 09:37:05 -0000	1.3
@@ -1,14 +1,11 @@
-diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
---- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
-+++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200
-@@ -448,9 +448,7 @@
+--- src/sdk/configmanager.cpp.orig	2006-11-08 14:53:00.000000000 +0100
++++ src/sdk/configmanager.cpp	2006-11-08 17:48:05.000000000 +0100
+@@ -389,7 +389,7 @@
+             return ::wxGetCwd();
  
          case sdPluginsGlobal:
-         {
--            wxString p = ConfigManager::data_path_global + _T("/plugins");
--            if(!wxDirExists(p + wxFILE_SEP_PATH))
--                CreateDirRecursively(p + wxFILE_SEP_PATH);
-+            wxString p = _T("/usr/lib/codeblocks/plugins/");
-             return p;
-         }
+-            return ConfigManager::data_path_global + _T("/plugins");
++            return _T("@libdir@/codeblocks/plugins");
  
+         case sdPluginsUser:
+             return ConfigManager::data_path_user   + _T("/plugins");


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeblocks.spec	3 Nov 2006 10:02:48 -0000	1.4
+++ codeblocks.spec	11 Nov 2006 09:37:05 -0000	1.5
@@ -1,9 +1,9 @@
-%define		rev	3170
-%define		date	20061102
+%define		rev	3202
+%define		date	20061110
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.12.%{date}svn%{rev}%{?dist}
+Release:	0.13.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -53,7 +53,7 @@
 %prep
 
 %setup -q -n codeblocks
-%patch1 -p1
+%patch1
 %patch2 -p1
 %patch3
 
@@ -72,6 +72,9 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
 
+sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
+
+# generate revision.m4
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -225,7 +228,11 @@
 
 
 %changelog
-* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+* Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
+- update to revision 3202
+- fixed plugin loading on 64-bit platforms
+
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061102svn3170
 - update to revision 3170
 
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 10:02:48 -0000	1.5
+++ sources	11 Nov 2006 09:37:05 -0000	1.6
@@ -1 +1 @@
-bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2
+ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:40:26 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:40:26 -0700
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.5, 1.6 codeblocks-plugins.patch, 
	1.2, 1.3 codeblocks.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200611110940.kAB9eQwx013013@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12983

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3202
- fixed plugin loading on 64-bit platforms



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 10:06:23 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:39:56 -0000	1.6
@@ -1 +1 @@
-codeblocks-svn3170.tar.bz2
+codeblocks-svn3202.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-plugins.patch	8 Oct 2006 09:18:38 -0000	1.2
+++ codeblocks-plugins.patch	11 Nov 2006 09:39:56 -0000	1.3
@@ -1,14 +1,11 @@
-diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
---- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
-+++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200
-@@ -448,9 +448,7 @@
+--- src/sdk/configmanager.cpp.orig	2006-11-08 14:53:00.000000000 +0100
++++ src/sdk/configmanager.cpp	2006-11-08 17:48:05.000000000 +0100
+@@ -389,7 +389,7 @@
+             return ::wxGetCwd();
  
          case sdPluginsGlobal:
-         {
--            wxString p = ConfigManager::data_path_global + _T("/plugins");
--            if(!wxDirExists(p + wxFILE_SEP_PATH))
--                CreateDirRecursively(p + wxFILE_SEP_PATH);
-+            wxString p = _T("/usr/lib/codeblocks/plugins/");
-             return p;
-         }
+-            return ConfigManager::data_path_global + _T("/plugins");
++            return _T("@libdir@/codeblocks/plugins");
  
+         case sdPluginsUser:
+             return ConfigManager::data_path_user   + _T("/plugins");


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeblocks.spec	3 Nov 2006 10:06:23 -0000	1.4
+++ codeblocks.spec	11 Nov 2006 09:39:56 -0000	1.5
@@ -1,9 +1,9 @@
-%define		rev	3170
-%define		date	20061102
+%define		rev	3202
+%define		date	20061110
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.12.%{date}svn%{rev}%{?dist}
+Release:	0.13.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -53,7 +53,7 @@
 %prep
 
 %setup -q -n codeblocks
-%patch1 -p1
+%patch1
 %patch2 -p1
 %patch3
 
@@ -72,6 +72,9 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
 
+sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
+
+# generate revision.m4
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -225,7 +228,11 @@
 
 
 %changelog
-* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+* Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
+- update to revision 3202
+- fixed plugin loading on 64-bit platforms
+
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061102svn3170
 - update to revision 3170
 
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 10:06:23 -0000	1.5
+++ sources	11 Nov 2006 09:39:56 -0000	1.6
@@ -1 +1 @@
-bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2
+ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:47:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:47:05 -0700
Subject: rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.7,1.8
Message-ID: <200611110947.kAB9l5KO013123@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-serv13079/FC-5

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix build when installed kernel is not the target one.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- em8300-kmod.spec	11 Nov 2006 09:27:14 -0000	1.7
+++ em8300-kmod.spec	11 Nov 2006 09:46:35 -0000	1.8
@@ -67,9 +67,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
+    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
     make install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+        KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
     cd ../..
 done
 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:47:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:47:06 -0700
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.11,1.12
Message-ID: <200611110947.kAB9l6Qi013126@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-serv13079/FC-6

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix build when installed kernel is not the target one.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- em8300-kmod.spec	11 Nov 2006 09:34:56 -0000	1.11
+++ em8300-kmod.spec	11 Nov 2006 09:46:36 -0000	1.12
@@ -72,9 +72,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
+    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
     make install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+        KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
     cd ../..
 done
 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:47:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:47:12 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.11,1.12
Message-ID: <200611110947.kAB9lC1J013129@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13079/devel

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix build when installed kernel is not the target one.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- em8300-kmod.spec	11 Nov 2006 09:34:56 -0000	1.11
+++ em8300-kmod.spec	11 Nov 2006 09:46:41 -0000	1.12
@@ -72,9 +72,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
+    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
     make install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+        KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
     cd ../..
 done
 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:52:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 11 Nov 2006 02:52:02 -0700
Subject: rpms/scribus/FC-6 .cvsignore, 1.12, 1.13 scribus.spec, 1.23,
	1.24 sources, 1.12, 1.13
Message-ID: <200611110952.kAB9q2iE013300@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/FC-6

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Oct 2006 17:02:30 -0000	1.12
+++ .cvsignore	11 Nov 2006 09:51:31 -0000	1.13
@@ -1 +1 @@
-scribus-1.3.3.4.tar.bz2
+scribus-1.3.3.5.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-6/scribus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scribus.spec	4 Oct 2006 17:02:30 -0000	1.23
+++ scribus.spec	11 Nov 2006 09:51:31 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           scribus
-Version:        1.3.3.4
+Version:        1.3.3.5
 Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
@@ -7,7 +7,7 @@
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://dl.sf.net/scribus/scribus-1.3.3.4.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.3.5.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +136,10 @@
 %{_includedir}/scribus/
 
 %changelog
+* Sat Nov 11 2006 Andreas Bierfert 
+1.3.3.5-1
+- version upgrade
+
 * Wed Oct 04 2006 Andreas Bierfert 
 1.3.3.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Oct 2006 17:02:30 -0000	1.12
+++ sources	11 Nov 2006 09:51:31 -0000	1.13
@@ -1 +1 @@
-ccd7fb34a77b7e3d83e902fb3f5b731b  scribus-1.3.3.4.tar.bz2
+db4c06fa2b6f758aab17555d5253a632  scribus-1.3.3.5.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:52:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 11 Nov 2006 02:52:03 -0700
Subject: rpms/scribus/devel .cvsignore, 1.12, 1.13 scribus.spec, 1.23,
	1.24 sources, 1.12, 1.13
Message-ID: <200611110952.kAB9q3Xm013306@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/devel

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Oct 2006 17:02:30 -0000	1.12
+++ .cvsignore	11 Nov 2006 09:51:32 -0000	1.13
@@ -1 +1 @@
-scribus-1.3.3.4.tar.bz2
+scribus-1.3.3.5.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scribus.spec	4 Oct 2006 17:02:30 -0000	1.23
+++ scribus.spec	11 Nov 2006 09:51:32 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           scribus
-Version:        1.3.3.4
+Version:        1.3.3.5
 Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
@@ -7,7 +7,7 @@
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://dl.sf.net/scribus/scribus-1.3.3.4.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.3.5.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +136,10 @@
 %{_includedir}/scribus/
 
 %changelog
+* Sat Nov 11 2006 Andreas Bierfert 
+1.3.3.5-1
+- version upgrade
+
 * Wed Oct 04 2006 Andreas Bierfert 
 1.3.3.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Oct 2006 17:02:30 -0000	1.12
+++ sources	11 Nov 2006 09:51:32 -0000	1.13
@@ -1 +1 @@
-ccd7fb34a77b7e3d83e902fb3f5b731b  scribus-1.3.3.4.tar.bz2
+db4c06fa2b6f758aab17555d5253a632  scribus-1.3.3.5.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:54:24 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:54:24 -0700
Subject: rpms/qgit/devel .cvsignore, 1.9, 1.10 qgit.spec, 1.11, 1.12 sources,
	1.9, 1.10
Message-ID: <200611110954.kAB9sOre013418@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13398

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:17:24 -0000	1.9
+++ .cvsignore	11 Nov 2006 09:53:54 -0000	1.10
@@ -1 +1 @@
-qgit-1.5.2.tar.bz2
+qgit-1.5.3.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qgit.spec	30 Sep 2006 09:17:24 -0000	1.11
+++ qgit.spec	11 Nov 2006 09:53:54 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Dan Horak  1.5.3-1
+- update to upstream version 1.5.3
+
 * Sat Sep 30 2006 Dan Horak  1.5.2-1
 - update to upstream version 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:17:24 -0000	1.9
+++ sources	11 Nov 2006 09:53:54 -0000	1.10
@@ -1 +1 @@
-251568da2d93b0e621ea7a2cb7de611d  qgit-1.5.2.tar.bz2
+c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:57:44 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:57:44 -0700
Subject: rpms/qgit/FC-6 .cvsignore, 1.9, 1.10 qgit.spec, 1.11, 1.12 sources, 
	1.9, 1.10
Message-ID: <200611110957.kAB9viJ3013496@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13476

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:17:24 -0000	1.9
+++ .cvsignore	11 Nov 2006 09:57:13 -0000	1.10
@@ -1 +1 @@
-qgit-1.5.2.tar.bz2
+qgit-1.5.3.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/qgit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qgit.spec	30 Sep 2006 09:17:24 -0000	1.11
+++ qgit.spec	11 Nov 2006 09:57:13 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Dan Horak  1.5.3-1
+- update to upstream version 1.5.3
+
 * Sat Sep 30 2006 Dan Horak  1.5.2-1
 - update to upstream version 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:17:24 -0000	1.9
+++ sources	11 Nov 2006 09:57:13 -0000	1.10
@@ -1 +1 @@
-251568da2d93b0e621ea7a2cb7de611d  qgit-1.5.2.tar.bz2
+c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 10:00:36 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 03:00:36 -0700
Subject: rpms/qgit/FC-5 .cvsignore, 1.9, 1.10 qgit.spec, 1.10, 1.11 sources, 
	1.9, 1.10
Message-ID: <200611111000.kABA0a0i013583@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13559

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:19:03 -0000	1.9
+++ .cvsignore	11 Nov 2006 10:00:06 -0000	1.10
@@ -1 +1 @@
-qgit-1.5.2.tar.bz2
+qgit-1.5.3.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/qgit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qgit.spec	30 Sep 2006 09:19:03 -0000	1.10
+++ qgit.spec	11 Nov 2006 10:00:06 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Dan Horak  1.5.3-1
+- update to upstream version 1.5.3
+
 * Sat Sep 30 2006 Dan Horak  1.5.2-1
 - update to upstream version 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:19:03 -0000	1.9
+++ sources	11 Nov 2006 10:00:06 -0000	1.10
@@ -1 +1 @@
-251568da2d93b0e621ea7a2cb7de611d  qgit-1.5.2.tar.bz2
+c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 10:03:41 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 03:03:41 -0700
Subject: rpms/qgit/FC-4 .cvsignore, 1.9, 1.10 qgit.spec, 1.11, 1.12 sources, 
	1.9, 1.10
Message-ID: <200611111003.kABA3fFH016615@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16595

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:20:57 -0000	1.9
+++ .cvsignore	11 Nov 2006 10:03:10 -0000	1.10
@@ -1 +1 @@
-qgit-1.5.2.tar.bz2
+qgit-1.5.3.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/qgit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qgit.spec	30 Sep 2006 09:20:57 -0000	1.11
+++ qgit.spec	11 Nov 2006 10:03:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Dan Horak  1.5.3-1
+- update to upstream version 1.5.3
+
 * Sat Sep 30 2006 Dan Horak  1.5.2-1
 - update to upstream version 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:20:57 -0000	1.9
+++ sources	11 Nov 2006 10:03:10 -0000	1.10
@@ -1 +1 @@
-251568da2d93b0e621ea7a2cb7de611d  qgit-1.5.2.tar.bz2
+c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 10:48:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 03:48:20 -0700
Subject: fedora-security/audit fe4,1.95,1.96 fe5,1.103,1.104 fe6,1.16,1.17
Message-ID: <200611111048.kABAmKUa016866@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16844

Modified Files:
	fe4 fe5 fe6 
Log Message:
+CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- fe4	10 Nov 2006 20:23:33 -0000	1.95
+++ fe4	11 Nov 2006 10:48:17 -0000	1.96
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fe5	10 Nov 2006 20:23:33 -0000	1.103
+++ fe5	11 Nov 2006 10:48:17 -0000	1.104
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fe6	10 Nov 2006 20:23:33 -0000	1.16
+++ fe6	11 Nov 2006 10:48:17 -0000	1.17
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822



From fedora-extras-commits at redhat.com  Sat Nov 11 11:40:36 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 04:40:36 -0700
Subject: owners owners.list,1.1922,1.1923
Message-ID: <200611111140.kABBea7h020335@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20315

Modified Files:
	owners.list 
Log Message:
change e-mail joost at soeterbroek.com -> joost.soeterbroek at gmail.com


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1922
retrieving revision 1.1923
diff -u -r1.1922 -r1.1923
--- owners.list	11 Nov 2006 06:59:55 -0000	1.1922
+++ owners.list	11 Nov 2006 11:40:05 -0000	1.1923
@@ -194,7 +194,7 @@
 Fedora Extras|clanbomber|Bomberman-like multiplayer game that uses ClanLib|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ClanLib|Cross platform C++ game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ClanLib06|Version 0.6 of this Cross platform C++ game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|clearsilver|HTML template system|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|clement|An application to filter and manage E-mail traffic|jmp at safe.ca|extras-qa at fedoraproject.org|
 Fedora Extras|clips|CLIPS language for expert systems|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -539,7 +539,7 @@
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|glom|Database Designer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|glyph-keeper|Library for text rendering|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gmpc|GNOME frontend for the MPD|adrian at lisas.de|extras-qa at fedoraproject.org|
@@ -578,7 +578,7 @@
 Fedora Extras|gnomesword|GNOME-based Bible research tool|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|bdpepple at ameritech.net|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
-Fedora Extras|gnubg|A backgammon game and analyser|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnubg|A backgammon game and analyser|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnubiff|A mail notification program|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnucap|The Gnu Circuit Analysis Package|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
@@ -667,7 +667,7 @@
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
-Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|HelixPlayer|Open source media player based on the Helix framework|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -1017,7 +1017,7 @@
 Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lrmi|Library for calling real mode BIOS routines|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|lsscsi|List SCSI devices (or hosts) and associated information|coldwell at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|lua|A powerful light-weight programming language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|luks-tools|Utilities for working with LUKS-protected filesystems|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
@@ -2270,7 +2270,7 @@
 Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|trac|Trac is an integrated system for managing software projects|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|trackballs|Steer a marble ball through a labyrinth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|trackballs-music|In-game music for Trackballs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|tracker|An object database, tag/metadata database, search tool and indexer|dakingun at gmail.com|extras-qa at fedoraproject.org|
@@ -2458,7 +2458,7 @@
 Fedora Extras|xmms-adplug|XMMS plugin to play AdLib (OPL2) files|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-crossfade|A crossfade output plugin for XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 11:50:36 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 04:50:36 -0700
Subject: rpms/trac/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 trac.spec,
	1.10, 1.11
Message-ID: <200611111150.kABBoal8020393@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20373

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 16:55:32 -0000	1.6
+++ .cvsignore	11 Nov 2006 11:50:06 -0000	1.7
@@ -1 +1 @@
-trac-0.10.tar.gz
+trac-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 16:55:32 -0000	1.6
+++ sources	11 Nov 2006 11:50:06 -0000	1.7
@@ -1 +1 @@
-36c4ed1dee4709442cf9f3ac8891e8c7  trac-0.10.tar.gz
+55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trac.spec	28 Sep 2006 16:55:32 -0000	1.10
+++ trac.spec	11 Nov 2006 11:50:06 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
+- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
+
 * Thu Sep 28 2006 Joost Soeterbroek  - 0.10
 - upstream release 0.10 'Zengia'
 



From fedora-extras-commits at redhat.com  Sat Nov 11 13:05:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 11 Nov 2006 06:05:05 -0700
Subject: rpms/audacity/FC-6 audacity.spec,1.17,1.18
Message-ID: <200611111305.kABD559F026690@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/FC-6

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audacity.spec	7 Nov 2006 21:44:07 -0000	1.17
+++ audacity.spec	11 Nov 2006 13:04:34 -0000	1.18
@@ -90,7 +90,7 @@
 Comment=A multitrack audio editor
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.4
-MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;
 StartupWMClass=Audacity
 EOF
 
@@ -123,7 +123,8 @@
 %doc %{_datadir}/doc/*
 
 %changelog
-* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+* Sat Nov 11 2006 Gerard Milmeister  - 1.2.5-3
+- correct mime types in .desktop file
 - msse flag only on intel
 
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2



From fedora-extras-commits at redhat.com  Sat Nov 11 13:05:00 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 11 Nov 2006 06:05:00 -0700
Subject: rpms/audacity/FC-5 audacity.spec,1.17,1.18
Message-ID: <200611111305.kABD508u026687@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/FC-5

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audacity.spec	7 Nov 2006 21:44:06 -0000	1.17
+++ audacity.spec	11 Nov 2006 13:04:25 -0000	1.18
@@ -90,7 +90,7 @@
 Comment=A multitrack audio editor
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.4
-MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;
 StartupWMClass=Audacity
 EOF
 
@@ -123,7 +123,8 @@
 %doc %{_datadir}/doc/*
 
 %changelog
-* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+* Sat Nov 11 2006 Gerard Milmeister  - 1.2.5-3
+- correct mime types in .desktop file
 - msse flag only on intel
 
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2



From fedora-extras-commits at redhat.com  Sat Nov 11 13:05:07 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 11 Nov 2006 06:05:07 -0700
Subject: rpms/audacity/devel audacity.spec,1.17,1.18
Message-ID: <200611111305.kABD57BB026691@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/devel

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audacity.spec	7 Nov 2006 21:44:08 -0000	1.17
+++ audacity.spec	11 Nov 2006 13:04:36 -0000	1.18
@@ -90,7 +90,7 @@
 Comment=A multitrack audio editor
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.4
-MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;
 StartupWMClass=Audacity
 EOF
 
@@ -123,7 +123,8 @@
 %doc %{_datadir}/doc/*
 
 %changelog
-* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+* Sat Nov 11 2006 Gerard Milmeister  - 1.2.5-3
+- correct mime types in .desktop file
 - msse flag only on intel
 
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2



From fedora-extras-commits at redhat.com  Sat Nov 11 13:18:02 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 11 Nov 2006 06:18:02 -0700
Subject: comps comps-fe6.xml.in,1.217,1.218 comps-fe7.xml.in,1.15,1.16
Message-ID: <200611111318.kABDI2NF026845@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26823

Modified Files:
	comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Add fonttools and translate-toolkit



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- comps-fe6.xml.in	11 Nov 2006 07:17:09 -0000	1.217
+++ comps-fe6.xml.in	11 Nov 2006 13:17:32 -0000	1.218
@@ -200,6 +200,7 @@
       tla
       tolua++
       trac
+      translate-toolkit
       ucblogo
       utrac
       xbsql
@@ -606,6 +607,7 @@
       comix
       digikam
       fontforge
+      fonttools
       fyre
       gpp
       gqview


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- comps-fe7.xml.in	11 Nov 2006 07:17:09 -0000	1.15
+++ comps-fe7.xml.in	11 Nov 2006 13:17:32 -0000	1.16
@@ -200,6 +200,7 @@
       tla
       tolua++
       trac
+      translate-toolkit
       ucblogo
       utrac
       xbsql
@@ -606,6 +607,7 @@
       comix
       digikam
       fontforge
+      fonttools
       fyre
       gpp
       gqview



From fedora-extras-commits at redhat.com  Sat Nov 11 13:19:46 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 11 Nov 2006 06:19:46 -0700
Subject: comps comps-fe5.xml.in,1.193,1.194
Message-ID: <200611111319.kABDJk38026867@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26851

Modified Files:
	comps-fe5.xml.in 
Log Message:
add translate-toolkit, move fonttools to appropriate group



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- comps-fe5.xml.in	11 Nov 2006 07:17:09 -0000	1.193
+++ comps-fe5.xml.in	11 Nov 2006 13:19:16 -0000	1.194
@@ -72,7 +72,6 @@
       dejavu-fonts
       dejavu-fonts-experimental
       efont-unicode-bdf
-      fonttools
       lineak-defaultplugin
       lineak-xosdplugin
       lineakd
@@ -166,6 +165,7 @@
       sysprof
       tkcvs
       tla
+      translate-toolkit
       tolua++
       ucblogo
       utrac
@@ -554,6 +554,7 @@
       comix
       digikam
       fontforge
+      fonttools
       fyre
       gpp
       gqview



From fedora-extras-commits at redhat.com  Sat Nov 11 14:19:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:19:28 -0700
Subject: rpms/panelfm - New directory
Message-ID: <200611111419.kABEJSDm030349@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30345/panelfm

Log Message:
Directory /cvs/extras/rpms/panelfm added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 14:19:34 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:19:34 -0700
Subject: rpms/panelfm/devel - New directory
Message-ID: <200611111419.kABEJYEv030363@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30345/panelfm/devel

Log Message:
Directory /cvs/extras/rpms/panelfm/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 14:19:53 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:19:53 -0700
Subject: rpms/panelfm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611111419.kABEJrjX030394@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30388

Added Files:
	Makefile import.log 
Log Message:
Setup of module panelfm


--- NEW FILE Makefile ---
# Top level Makefile for module panelfm
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  Sat Nov 11 14:19:59 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:19:59 -0700
Subject: rpms/panelfm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611111419.kABEJxd9030412@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30388/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module panelfm


--- 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  Sat Nov 11 14:21:00 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:21:00 -0700
Subject: rpms/panelfm/devel panelfm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611111421.kABEL07l030494@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	panelfm.spec 
Log Message:
auto-import panelfm-1.1-2 on branch devel from panelfm-1.1-2.src.rpm


--- NEW FILE panelfm.spec ---
Name:           panelfm
Version:        1.1
Release:        2%{?dist}
Summary:        Quick File Manager Applet

Group:          Applications/File
License:        GPL
URL:            http://panelfm.sourceforge.net/
Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}.tar.gz

Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnomeui-devel
BuildRequires:  gnome-panel-devel

%description
PanelFM is a GNOME applet that provides quick access to the file system. It
uses popup menus to display files and directories. Multiple root points can be
defined for the main menu by creating a .panelfmrc containing a list of root
points, one on each line. Each root point must be an absolute path name.

%prep
%setup -q -n PanelFM

%{__sed} -i.local \
   -e 's|%{_prefix}/local|%{_prefix}|g' \
   panelfm.server
%{__sed} -i.flags \
   -e '/^LDFLAGS/s|^\(.*\)$|\1\n\nCFLAGS += $(OPTFLAGS)|' \
   makefile

%build
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"

%install
%{__rm} -rf %{buildroot}

for dir in \
   %{_bindir} %{_datadir}/pixmaps %{_libdir}/bonobo/servers \
   ; do
   %{__mkdir_p} %{buildroot}/$dir
done

%{__install} -c -m 755 panelfm %{buildroot}%{_bindir}
%{__install} -c -p -m 644 panelfm.xpm \
   %{buildroot}%{_datadir}/pixmaps
%{__install} -c -p -m 644  panelfm.server \
   %{buildroot}%{_libdir}/bonobo/servers

%{__chmod} 0644 README

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc COPYING README

%{_bindir}/*

%{_datadir}/pixmaps/*.xpm
%{_libdir}/bonobo/servers/*.server

%changelog
* Fri Nov 10 2006 Mamoru Tasaka  - 1.1-2
- Change BuildRoot

* Fri Nov 10 2006 Mamoru Tasaka  - 1.1-1
- Rewrite.

* Tue Oct 31 2006 Sawa  - 1.1
- version 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 14:19:58 -0000	1.1
+++ .cvsignore	11 Nov 2006 14:20:30 -0000	1.2
@@ -0,0 +1 @@
+panelfm.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 14:19:58 -0000	1.1
+++ sources	11 Nov 2006 14:20:30 -0000	1.2
@@ -0,0 +1 @@
+5a18f0beba718d6efaace22ed13c1b9e  panelfm.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 14:20:59 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:20:59 -0700
Subject: rpms/panelfm import.log,1.1,1.2
Message-ID: <200611111420.kABEKxBN030490@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452

Modified Files:
	import.log 
Log Message:
auto-import panelfm-1.1-2 on branch devel from panelfm-1.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/panelfm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 14:19:53 -0000	1.1
+++ import.log	11 Nov 2006 14:20:29 -0000	1.2
@@ -0,0 +1 @@
+panelfm-1_1-2:HEAD:panelfm-1.1-2.src.rpm:1163254823



From fedora-extras-commits at redhat.com  Sat Nov 11 14:30:49 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 07:30:49 -0700
Subject: rpms/trac/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 trac.spec, 1.9,
	1.10
Message-ID: <200611111430.kABEUnSl030667@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30608/FC-5

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 17:07:02 -0000	1.6
+++ .cvsignore	11 Nov 2006 14:30:19 -0000	1.7
@@ -1 +1 @@
-trac-0.10.tar.gz
+trac-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 17:07:02 -0000	1.6
+++ sources	11 Nov 2006 14:30:19 -0000	1.7
@@ -1 +1 @@
-36c4ed1dee4709442cf9f3ac8891e8c7  trac-0.10.tar.gz
+55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/trac.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- trac.spec	28 Sep 2006 17:07:02 -0000	1.9
+++ trac.spec	11 Nov 2006 14:30:19 -0000	1.10
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
+- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
+
 * Thu Sep 28 2006 Joost Soeterbroek  - 0.10
 - upstream release 0.10 'Zengia'
 



From fedora-extras-commits at redhat.com  Sat Nov 11 14:30:48 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 07:30:48 -0700
Subject: rpms/trac/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 trac.spec, 1.9,
	1.10
Message-ID: <200611111430.kABEUmRQ030662@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30608/FC-4

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 17:07:01 -0000	1.6
+++ .cvsignore	11 Nov 2006 14:30:18 -0000	1.7
@@ -1 +1 @@
-trac-0.10.tar.gz
+trac-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 17:07:01 -0000	1.6
+++ sources	11 Nov 2006 14:30:18 -0000	1.7
@@ -1 +1 @@
-36c4ed1dee4709442cf9f3ac8891e8c7  trac-0.10.tar.gz
+55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- trac.spec	28 Sep 2006 17:07:01 -0000	1.9
+++ trac.spec	11 Nov 2006 14:30:18 -0000	1.10
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
+- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
+
 * Thu Sep 28 2006 Joost Soeterbroek  - 0.10
 - upstream release 0.10 'Zengia'
 



From fedora-extras-commits at redhat.com  Sat Nov 11 14:30:55 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 07:30:55 -0700
Subject: rpms/trac/FC-6 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 trac.spec,
	1.10, 1.11
Message-ID: <200611111430.kABEUto4030672@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30608/FC-6

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 16:55:32 -0000	1.6
+++ .cvsignore	11 Nov 2006 14:30:24 -0000	1.7
@@ -1 +1 @@
-trac-0.10.tar.gz
+trac-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 16:55:32 -0000	1.6
+++ sources	11 Nov 2006 14:30:24 -0000	1.7
@@ -1 +1 @@
-36c4ed1dee4709442cf9f3ac8891e8c7  trac-0.10.tar.gz
+55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/trac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trac.spec	28 Sep 2006 16:55:32 -0000	1.10
+++ trac.spec	11 Nov 2006 14:30:24 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
+- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
+
 * Thu Sep 28 2006 Joost Soeterbroek  - 0.10
 - upstream release 0.10 'Zengia'
 



From fedora-extras-commits at redhat.com  Sat Nov 11 15:05:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:05:05 -0700
Subject: rpms/perl-Alien-wxWidgets/devel .cvsignore, 1.5,
	1.6 perl-Alien-wxWidgets.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611111505.kABF55j3001452@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386/devel

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.25.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Oct 2006 13:57:32 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:04:35 -0000	1.6
@@ -1 +1 @@
-Alien-wxWidgets-0.24.tar.gz
+Alien-wxWidgets-0.25.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:32 -0000	1.6
+++ perl-Alien-wxWidgets.spec	11 Nov 2006 15:04:35 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.24
+Version:        0.25
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.25-1
+- Update to 0.25.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.24-1
 - Update to 0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Oct 2006 13:57:32 -0000	1.5
+++ sources	11 Nov 2006 15:04:35 -0000	1.6
@@ -1 +1 @@
-40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz
+79e0404a36b37c1f8af4ce1f6be0537e  Alien-wxWidgets-0.25.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:05:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:05:01 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-5 .cvsignore, 1.4,
	1.5 perl-Alien-wxWidgets.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200611111505.kABF51o4001442@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386/FC-5

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.25.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Oct 2006 13:57:31 -0000	1.4
+++ .cvsignore	11 Nov 2006 15:04:31 -0000	1.5
@@ -1 +1 @@
-Alien-wxWidgets-0.24.tar.gz
+Alien-wxWidgets-0.25.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/perl-Alien-wxWidgets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:31 -0000	1.5
+++ perl-Alien-wxWidgets.spec	11 Nov 2006 15:04:31 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.24
+Version:        0.25
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.25-1
+- Update to 0.25.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.24-1
 - Update to 0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Oct 2006 13:57:31 -0000	1.4
+++ sources	11 Nov 2006 15:04:31 -0000	1.5
@@ -1 +1 @@
-40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz
+79e0404a36b37c1f8af4ce1f6be0537e  Alien-wxWidgets-0.25.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:05:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:05:03 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-6 .cvsignore, 1.5,
	1.6 perl-Alien-wxWidgets.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611111505.kABF53uS001446@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386/FC-6

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.25.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Oct 2006 13:57:32 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:04:32 -0000	1.6
@@ -1 +1 @@
-Alien-wxWidgets-0.24.tar.gz
+Alien-wxWidgets-0.25.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-6/perl-Alien-wxWidgets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:32 -0000	1.6
+++ perl-Alien-wxWidgets.spec	11 Nov 2006 15:04:32 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.24
+Version:        0.25
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.25-1
+- Update to 0.25.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.24-1
 - Update to 0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Oct 2006 13:57:32 -0000	1.5
+++ sources	11 Nov 2006 15:04:32 -0000	1.6
@@ -1 +1 @@
-40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz
+79e0404a36b37c1f8af4ce1f6be0537e  Alien-wxWidgets-0.25.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:13:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:13:50 -0700
Subject: rpms/perl-Sub-Uplevel/FC-5 .cvsignore, 1.5,
	1.6 perl-Sub-Uplevel.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611111513.kABFDoAu001821@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1769/FC-5

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jun 2006 12:38:27 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:13:20 -0000	1.6
@@ -1 +1 @@
-Sub-Uplevel-0.13.tar.gz
+Sub-Uplevel-0.14.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/perl-Sub-Uplevel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Sub-Uplevel.spec	23 Jun 2006 12:38:27 -0000	1.10
+++ perl-Sub-Uplevel.spec	11 Nov 2006 15:13:20 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Sub-Uplevel
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
@@ -37,9 +37,7 @@
 
 
 %check
-# Pod coverage fails if AUTHOR_TESTING defined.
-# AUTHOR_TESTING=1 ./Build test
-./Build test
+AUTHOR_TESTING=1 ./Build test
 
 
 %clean
@@ -48,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README examples/
 %{perl_vendorlib}/Sub/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Fri Jun 23 2006 Jose Pedro Oliveira  - 0.13-1
 - Update to 0.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jun 2006 12:38:27 -0000	1.5
+++ sources	11 Nov 2006 15:13:20 -0000	1.6
@@ -1 +1 @@
-16ea7df857d28cbf50ef668fe19559f7  Sub-Uplevel-0.13.tar.gz
+ed0cbc3ef75df91a22fd0d0404336765  Sub-Uplevel-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:13:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:13:51 -0700
Subject: rpms/perl-Sub-Uplevel/FC-6 .cvsignore, 1.5,
	1.6 perl-Sub-Uplevel.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611111513.kABFDpJC001826@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1769/FC-6

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jun 2006 11:19:36 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:13:21 -0000	1.6
@@ -1 +1 @@
-Sub-Uplevel-0.13.tar.gz
+Sub-Uplevel-0.14.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-6/perl-Sub-Uplevel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Sub-Uplevel.spec	23 Jun 2006 11:19:36 -0000	1.10
+++ perl-Sub-Uplevel.spec	11 Nov 2006 15:13:21 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Sub-Uplevel
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
@@ -37,9 +37,7 @@
 
 
 %check
-# Pod coverage fails if AUTHOR_TESTING defined.
-# AUTHOR_TESTING=1 ./Build test
-./Build test
+AUTHOR_TESTING=1 ./Build test
 
 
 %clean
@@ -48,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README examples/
 %{perl_vendorlib}/Sub/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Fri Jun 23 2006 Jose Pedro Oliveira  - 0.13-1
 - Update to 0.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jun 2006 11:19:36 -0000	1.5
+++ sources	11 Nov 2006 15:13:21 -0000	1.6
@@ -1 +1 @@
-16ea7df857d28cbf50ef668fe19559f7  Sub-Uplevel-0.13.tar.gz
+ed0cbc3ef75df91a22fd0d0404336765  Sub-Uplevel-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:13:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:13:52 -0700
Subject: rpms/perl-Sub-Uplevel/devel .cvsignore, 1.5,
	1.6 perl-Sub-Uplevel.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611111513.kABFDqo9001831@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1769/devel

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jun 2006 11:19:36 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:13:22 -0000	1.6
@@ -1 +1 @@
-Sub-Uplevel-0.13.tar.gz
+Sub-Uplevel-0.14.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Sub-Uplevel.spec	23 Jun 2006 11:19:36 -0000	1.10
+++ perl-Sub-Uplevel.spec	11 Nov 2006 15:13:22 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Sub-Uplevel
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
@@ -37,9 +37,7 @@
 
 
 %check
-# Pod coverage fails if AUTHOR_TESTING defined.
-# AUTHOR_TESTING=1 ./Build test
-./Build test
+AUTHOR_TESTING=1 ./Build test
 
 
 %clean
@@ -48,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README examples/
 %{perl_vendorlib}/Sub/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Fri Jun 23 2006 Jose Pedro Oliveira  - 0.13-1
 - Update to 0.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jun 2006 11:19:36 -0000	1.5
+++ sources	11 Nov 2006 15:13:22 -0000	1.6
@@ -1 +1 @@
-16ea7df857d28cbf50ef668fe19559f7  Sub-Uplevel-0.13.tar.gz
+ed0cbc3ef75df91a22fd0d0404336765  Sub-Uplevel-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:17:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 08:17:20 -0700
Subject: rpms/xfce4-genmon-plugin/devel xfce4-genmon-plugin.spec,1.6,1.7
Message-ID: <200611111517.kABFHKlO002027@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2011

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
Rebuild for XFCE 4.3.99.2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-genmon-plugin.spec	31 Oct 2006 01:04:35 -0000	1.6
+++ xfce4-genmon-plugin.spec	11 Nov 2006 15:16:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -41,6 +41,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  - 3.0-2
+- Rebuild for XFCE 4.3.99.2.
+
 * Thu Oct 31 2006 Christoph Wickert  - 3.0-1
 - Update to 3.0.
 - BR xfce4-dev-tools (bugzilla.xfce.org #2435) and gettext.



From fedora-extras-commits at redhat.com  Sat Nov 11 15:18:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 08:18:28 -0700
Subject: owners owners.list,1.1923,1.1924
Message-ID: <200611111518.kABFISra002105@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2087

Modified Files:
	owners.list 
Log Message:
add panelfm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1923
retrieving revision 1.1924
diff -u -r1.1923 -r1.1924
--- owners.list	11 Nov 2006 11:40:05 -0000	1.1923
+++ owners.list	11 Nov 2006 15:17:58 -0000	1.1924
@@ -1239,6 +1239,7 @@
 Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|paman|Management tool for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pan|A GNOME/GTK+ news reader for X|alex at dalloz.de|extras-qa at fedoraproject.org|mpeters at mac.com
+Fedora Extras|panelfm|Quick File Manager Applet|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|papyrus|A C++ canvas library similar to the Gnome canvas|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 15:20:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:20:33 -0700
Subject: rpms/perl-Module-ScanDeps/FC-6 .cvsignore, 1.9,
	1.10 perl-Module-ScanDeps.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <200611111520.kABFKXUg002222@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-serv2145/FC-6

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Oct 2006 13:28:37 -0000	1.9
+++ .cvsignore	11 Nov 2006 15:20:03 -0000	1.10
@@ -1 +1 @@
-Module-ScanDeps-0.68.tar.gz
+Module-ScanDeps-0.69.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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Module-ScanDeps.spec	28 Oct 2006 13:28:37 -0000	1.9
+++ perl-Module-ScanDeps.spec	11 Nov 2006 15:20:03 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.68
+Version:        0.69
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
+- Update to 0.69.
+
 * Sat Oct 28 2006 Jose Pedro Oliveira  - 0.68-1
 - Update to 0.68.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Oct 2006 13:28:37 -0000	1.9
+++ sources	11 Nov 2006 15:20:03 -0000	1.10
@@ -1 +1 @@
-747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz
+c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:20:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:20:34 -0700
Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.9,
	1.10 perl-Module-ScanDeps.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <200611111520.kABFKYFk002227@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-serv2145/devel

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Oct 2006 13:28:43 -0000	1.9
+++ .cvsignore	11 Nov 2006 15:20:03 -0000	1.10
@@ -1 +1 @@
-Module-ScanDeps-0.68.tar.gz
+Module-ScanDeps-0.69.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Module-ScanDeps.spec	28 Oct 2006 13:28:43 -0000	1.9
+++ perl-Module-ScanDeps.spec	11 Nov 2006 15:20:04 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.68
+Version:        0.69
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
+- Update to 0.69.
+
 * Sat Oct 28 2006 Jose Pedro Oliveira  - 0.68-1
 - Update to 0.68.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Oct 2006 13:28:43 -0000	1.9
+++ sources	11 Nov 2006 15:20:04 -0000	1.10
@@ -1 +1 @@
-747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz
+c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:20:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:20:32 -0700
Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.9,
	1.10 perl-Module-ScanDeps.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <200611111520.kABFKWAk002211@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-serv2145/FC-5

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Oct 2006 13:28:37 -0000	1.9
+++ .cvsignore	11 Nov 2006 15:20:02 -0000	1.10
@@ -1 +1 @@
-Module-ScanDeps-0.68.tar.gz
+Module-ScanDeps-0.69.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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Module-ScanDeps.spec	28 Oct 2006 13:28:37 -0000	1.9
+++ perl-Module-ScanDeps.spec	11 Nov 2006 15:20:02 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.68
+Version:        0.69
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
+- Update to 0.69.
+
 * Sat Oct 28 2006 Jose Pedro Oliveira  - 0.68-1
 - Update to 0.68.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Oct 2006 13:28:37 -0000	1.9
+++ sources	11 Nov 2006 15:20:02 -0000	1.10
@@ -1 +1 @@
-747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz
+c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:21:18 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:21:18 -0700
Subject: rpms/php-pear-Net-DIME - New directory
Message-ID: <200611111521.kABFLIIh002330@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2326/php-pear-Net-DIME

Log Message:
Directory /cvs/extras/rpms/php-pear-Net-DIME added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 15:21:24 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:21:24 -0700
Subject: rpms/php-pear-Net-DIME/devel - New directory
Message-ID: <200611111521.kABFLOnc002350@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2326/php-pear-Net-DIME/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Net-DIME/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 15:21:45 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:21:45 -0700
Subject: rpms/php-pear-Net-DIME Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611111521.kABFLjJb002419@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2413

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Net-DIME


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Net-DIME
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  Sat Nov 11 15:21:50 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:21:50 -0700
Subject: rpms/php-pear-Net-DIME/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611111521.kABFLoKp002436@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2413/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Net-DIME


--- 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  Sat Nov 11 15:23:03 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:23:03 -0700
Subject: rpms/php-pear-Net-DIME import.log,1.1,1.2
Message-ID: <200611111523.kABFN3Hg002521@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2487

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Net-DIME-0.3-1.fc6 on branch devel from php-pear-Net-DIME-0.3-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 15:21:45 -0000	1.1
+++ import.log	11 Nov 2006 15:22:32 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Net-DIME-0_3-1_fc6:HEAD:php-pear-Net-DIME-0.3-1.fc6.src.rpm:1163258543



From fedora-extras-commits at redhat.com  Sat Nov 11 15:23:03 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:23:03 -0700
Subject: rpms/php-pear-Net-DIME/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-Net-DIME.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611111523.kABFN3Nv002525@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2487/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-Net-DIME.spec xml2changelog 
Log Message:
auto-import php-pear-Net-DIME-0.3-1.fc6 on branch devel from php-pear-Net-DIME-0.3-1.fc6.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-Net-DIME.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Net_DIME

Name:           php-pear-Net-DIME
Version:        0.3
Release:        1%{?dist}
Summary:        Implements Direct Internet Message Encapsulation (DIME)

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Net_DIME
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}


%description
This is the initial independent release of the Net_DIME package.
Provides an implementation of "Direct Internet Message Encapsulation" (DIME) 
as defined at http://search.ietf.org/internet-drafts/draft-nielsen-dime-02.txt

Note : this specification has been superseded by the SOAP Message Transmission
Optimization Mechanism (MTOM) specification.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
%{__install} -m 644 -c %{SOURCE1} LICENSE

cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Net
%{pear_testdir}/%{pear_name}


%changelog
* Mon Nov  6 2006 Remi Collet  0.3-1
- initial RPM (generated specfile + cleanup)
- add CHANGELOG and LICENSE


--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 15:21:50 -0000	1.1
+++ .cvsignore	11 Nov 2006 15:22:33 -0000	1.2
@@ -0,0 +1 @@
+Net_DIME-0.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 15:21:50 -0000	1.1
+++ sources	11 Nov 2006 15:22:33 -0000	1.2
@@ -0,0 +1 @@
+5e740eff36c049f4dcb348c6fb24da11  Net_DIME-0.3.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:30:59 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:30:59 -0700
Subject: owners owners.list,1.1924,1.1925
Message-ID: <200611111530.kABFUxvI002727@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2671

Modified Files:
	owners.list 
Log Message:
	php-pear-Net-DIME



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1924
retrieving revision 1.1925
diff -u -r1.1924 -r1.1925
--- owners.list	11 Nov 2006 15:17:58 -0000	1.1924
+++ owners.list	11 Nov 2006 15:30:28 -0000	1.1925
@@ -1784,6 +1784,7 @@
 Fedora Extras|php-pear-Mail-Mime|Classes to create and decode mime messages|fedora at theholbrooks.org|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-MDB2|Database Abstraction Layer|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-Curl|OO interface to PHP's cURL extension|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Net-DIME|Implements Direct Internet Message Encapsulation (DIME)|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-FTP|Provides an OO interface to the PHP FTP functions plus some additions|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-SMTP|Provides an implementation of the SMTP protocol|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-Socket|Network Socket Interface|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 15:31:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:31:09 -0700
Subject: rpms/perl-Perl-Critic/devel .cvsignore, 1.2,
	1.3 perl-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611111531.kABFV9UM002732@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-serv2707

Modified Files:
	.cvsignore perl-Perl-Critic.spec sources 
Log Message:
Update to 0.21; the new BR needs to be packaged first


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 17:07:14 -0000	1.2
+++ .cvsignore	11 Nov 2006 15:30:39 -0000	1.3
@@ -1 +1 @@
-Perl-Critic-0.2.tar.gz
+Perl-Critic-0.21.tar.gz


Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Perl-Critic.spec	23 Sep 2006 17:07:14 -0000	1.1
+++ perl-Perl-Critic.spec	11 Nov 2006 15:30:39 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Perl-Critic
-Version:        0.2
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
@@ -15,7 +15,8 @@
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable)
-BuildRequires:  perl(PPI) >= 1.117
+BuildRequires:  perl(PPI) >= 1.118
+BuildRequires:  perl(Set::Scalar) >= 1.20
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Pod)
@@ -69,5 +70,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.21-1
+- Update to 0.21.
+- New BR: perl(Set::Scalar).
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 0.2-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 17:07:14 -0000	1.2
+++ sources	11 Nov 2006 15:30:39 -0000	1.3
@@ -1 +1 @@
-a31ab7c92cdb0501c1a3e298495f61c5  Perl-Critic-0.2.tar.gz
+0359235579986f76438d7a1180598feb  Perl-Critic-0.21.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:33:17 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 08:33:17 -0700
Subject: comps comps-fe5.xml.in, 1.194, 1.195 comps-fe6.xml.in, 1.218,
	1.219 comps-fe7.xml.in, 1.16, 1.17
Message-ID: <200611111533.kABFXHue002784@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2753

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add packages related to me


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- comps-fe5.xml.in	11 Nov 2006 13:19:16 -0000	1.194
+++ comps-fe5.xml.in	11 Nov 2006 15:32:47 -0000	1.195
@@ -279,6 +279,7 @@
       SIBsim4
       toped
       wcstools
+      wvs-data
       xdrawchem
     
   
@@ -436,6 +437,7 @@
       nautilus-image-converter
       nautilus-open-terminal
       nautilus-search-tool
+      panelfm
       rss-glx-gnome-screensaver
       sabayon
       seahorse
@@ -611,6 +613,7 @@
     false
     false
     
+      jfbterm
       scim-input-pad
       scim-skk
       scim-tomoe


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- comps-fe6.xml.in	11 Nov 2006 13:17:32 -0000	1.218
+++ comps-fe6.xml.in	11 Nov 2006 15:32:47 -0000	1.219
@@ -329,6 +329,7 @@
       toped
       veusz
       wcstools
+      wvs-data
       xcircuit
       xdrawchem
     
@@ -485,6 +486,7 @@
       nautilus-image-converter
       nautilus-open-terminal
       nautilus-search-tool
+      panelfm
       rss-glx-gnome-screensaver
       sabayon
       seahorse
@@ -670,6 +672,7 @@
     false
     false
     
+      jfbterm
       scim-input-pad
       scim-skk
       scim-tomoe


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- comps-fe7.xml.in	11 Nov 2006 13:17:32 -0000	1.16
+++ comps-fe7.xml.in	11 Nov 2006 15:32:47 -0000	1.17
@@ -329,6 +329,7 @@
       toped
       veusz
       wcstools
+      wvs-data
       xcircuit
       xdrawchem
     
@@ -485,6 +486,7 @@
       nautilus-image-converter
       nautilus-open-terminal
       nautilus-search-tool
+      panelfm
       rss-glx-gnome-screensaver
       sabayon
       seahorse
@@ -670,6 +672,7 @@
     false
     false
     
+      jfbterm
       scim-input-pad
       scim-skk
       scim-tomoe



From fedora-extras-commits at redhat.com  Sat Nov 11 15:37:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 08:37:08 -0700
Subject: rpms/xfce4-dev-tools/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-dev-tools.spec, 1.2, 1.3
Message-ID: <200611111537.kABFb8wI002944@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2886

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
Update to 4.3.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 13:31:04 -0000	1.2
+++ .cvsignore	11 Nov 2006 15:36:37 -0000	1.3
@@ -1 +1 @@
-xfce4-dev-tools-4.3.99.1.tar.bz2
+xfce4-dev-tools-4.3.99.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 13:31:04 -0000	1.2
+++ sources	11 Nov 2006 15:36:37 -0000	1.3
@@ -1 +1 @@
-dc6403caf82edfb896eb3878385b439a  xfce4-dev-tools-4.3.99.1.tar.bz2
+6f79a59eb7ed5a9a5e8ebef253a704f8  xfce4-dev-tools-4.3.99.2.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-dev-tools.spec	5 Oct 2006 13:51:59 -0000	1.2
+++ xfce4-dev-tools.spec	11 Nov 2006 15:36:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-dev-tools
-Version:	4.3.99.1
-Release:	3%{?dist}
+Version:	4.3.99.2
+Release:	1%{?dist}
 Summary:	Xfce developer tools
 
 Group:		Development/Tools
@@ -42,6 +42,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  - 4.3.99.2-1
+- Update to 4.3.99.2.
+
 * Tue Oct 03 2006 Christoph Wickert  - 4.3.99.1-3
 - Require gettext-devel.
 - Install m4 macros also to /usr/share/aclocal.



From fedora-extras-commits at redhat.com  Sat Nov 11 15:38:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:38:52 -0700
Subject: rpms/perl-Cairo/FC-5 .cvsignore, 1.4, 1.5 perl-Cairo.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611111538.kABFcqaP003114@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3062/FC-5

Modified Files:
	.cvsignore perl-Cairo.spec sources 
Log Message:
Update to 1.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2006 21:48:00 -0000	1.4
+++ .cvsignore	11 Nov 2006 15:38:21 -0000	1.5
@@ -1 +1 @@
-Cairo-1.01.tar.gz
+Cairo-1.02.tar.gz


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-5/perl-Cairo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Cairo.spec	26 Sep 2006 21:48:00 -0000	1.3
+++ perl-Cairo.spec	11 Nov 2006 15:38:21 -0000	1.4
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Cairo
-Version:        1.01
+Version:        1.02
 Release:        1%{?dist}
 Summary:        Perl interface to the cairo library
 
@@ -28,6 +28,7 @@
 
 %prep
 %setup -q -n Cairo-%{version}
+chmod -c a-x examples/*.pl
 
 
 %build
@@ -61,6 +62,12 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.02-1
+- Update to 1.02.
+
+* Mon Oct  2 2006 Jose Pedro Oliveira  - 1.01-2
+- Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
+
 * Tue Sep 26 2006 Jose Pedro Oliveira  - 1.01-1
 - Update to 1.01.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2006 21:48:00 -0000	1.4
+++ sources	11 Nov 2006 15:38:21 -0000	1.5
@@ -1 +1 @@
-d2c6641f1bc33834ea695ff56919c142  Cairo-1.01.tar.gz
+bf1a8443310aa580f7566b2024e55987  Cairo-1.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:38:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:38:52 -0700
Subject: rpms/perl-Cairo/FC-6 .cvsignore, 1.7, 1.8 perl-Cairo.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200611111538.kABFcqM0003119@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3062/FC-6

Modified Files:
	.cvsignore perl-Cairo.spec sources 
Log Message:
Update to 1.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 21:48:00 -0000	1.7
+++ .cvsignore	11 Nov 2006 15:38:22 -0000	1.8
@@ -1 +1 @@
-Cairo-1.01.tar.gz
+Cairo-1.02.tar.gz


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-6/perl-Cairo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Cairo.spec	2 Oct 2006 22:51:54 -0000	1.7
+++ perl-Cairo.spec	11 Nov 2006 15:38:22 -0000	1.8
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Cairo
-Version:        1.01
-Release:        2%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        Perl interface to the cairo library
 
 Group:          Development/Libraries
@@ -28,6 +28,7 @@
 
 %prep
 %setup -q -n Cairo-%{version}
+chmod -c a-x examples/*.pl
 
 
 %build
@@ -61,6 +62,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.02-1
+- Update to 1.02.
+
 * Mon Oct  2 2006 Jose Pedro Oliveira  - 1.01-2
 - Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 21:48:00 -0000	1.7
+++ sources	11 Nov 2006 15:38:22 -0000	1.8
@@ -1 +1 @@
-d2c6641f1bc33834ea695ff56919c142  Cairo-1.01.tar.gz
+bf1a8443310aa580f7566b2024e55987  Cairo-1.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:38:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:38:53 -0700
Subject: rpms/perl-Cairo/devel .cvsignore, 1.7, 1.8 perl-Cairo.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200611111538.kABFcr1E003124@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3062/devel

Modified Files:
	.cvsignore perl-Cairo.spec sources 
Log Message:
Update to 1.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 21:48:00 -0000	1.7
+++ .cvsignore	11 Nov 2006 15:38:23 -0000	1.8
@@ -1 +1 @@
-Cairo-1.01.tar.gz
+Cairo-1.02.tar.gz


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/perl-Cairo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Cairo.spec	2 Oct 2006 22:51:54 -0000	1.7
+++ perl-Cairo.spec	11 Nov 2006 15:38:23 -0000	1.8
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Cairo
-Version:        1.01
-Release:        2%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        Perl interface to the cairo library
 
 Group:          Development/Libraries
@@ -28,6 +28,7 @@
 
 %prep
 %setup -q -n Cairo-%{version}
+chmod -c a-x examples/*.pl
 
 
 %build
@@ -61,6 +62,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.02-1
+- Update to 1.02.
+
 * Mon Oct  2 2006 Jose Pedro Oliveira  - 1.01-2
 - Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 21:48:00 -0000	1.7
+++ sources	11 Nov 2006 15:38:23 -0000	1.8
@@ -1 +1 @@
-d2c6641f1bc33834ea695ff56919c142  Cairo-1.01.tar.gz
+bf1a8443310aa580f7566b2024e55987  Cairo-1.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:43:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 08:43:30 -0700
Subject: rpms/xfce4-dev-tools/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-dev-tools.spec, 1.2, 1.3
Message-ID: <200611111543.kABFhULn003276@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3256

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
Update to 4.3.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 13:31:04 -0000	1.2
+++ .cvsignore	11 Nov 2006 15:43:00 -0000	1.3
@@ -1 +1 @@
-xfce4-dev-tools-4.3.99.1.tar.bz2
+xfce4-dev-tools-4.3.99.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 13:31:04 -0000	1.2
+++ sources	11 Nov 2006 15:43:00 -0000	1.3
@@ -1 +1 @@
-dc6403caf82edfb896eb3878385b439a  xfce4-dev-tools-4.3.99.1.tar.bz2
+6f79a59eb7ed5a9a5e8ebef253a704f8  xfce4-dev-tools-4.3.99.2.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/FC-6/xfce4-dev-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-dev-tools.spec	5 Oct 2006 13:51:59 -0000	1.2
+++ xfce4-dev-tools.spec	11 Nov 2006 15:43:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-dev-tools
-Version:	4.3.99.1
-Release:	3%{?dist}
+Version:	4.3.99.2
+Release:	1%{?dist}
 Summary:	Xfce developer tools
 
 Group:		Development/Tools
@@ -42,6 +42,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  - 4.3.99.2-1
+- Update to 4.3.99.2.
+
 * Tue Oct 03 2006 Christoph Wickert  - 4.3.99.1-3
 - Require gettext-devel.
 - Install m4 macros also to /usr/share/aclocal.



From fedora-extras-commits at redhat.com  Sat Nov 11 15:50:02 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:50:02 -0700
Subject: rpms/php-pear-Cache/FC-6 php-pear-Cache.spec,1.1,1.2
Message-ID: <200611111550.kABFo274003431@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3412

Modified Files:
	php-pear-Cache.spec 
Log Message:
	bump release to allow FC6 build



Index: php-pear-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/FC-6/php-pear-Cache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Cache.spec	10 Nov 2006 20:13:16 -0000	1.1
+++ php-pear-Cache.spec	11 Nov 2006 15:49:32 -0000	1.2
@@ -9,7 +9,7 @@
 %if %{?beta:0}%{!?beta:1}
 Release:        1%{?dist}
 %else
-Release:        0.1.%{beta}%{?dist}
+Release:        0.1.%{beta}%{?dist}.1
 %endif
 Summary:        Framework for caching of arbitrary data
 
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Remi Collet  1.5.5-0.1.RC4.fc6.1
+- bump release to build en FC6
+
 * Tue Oct  7 2006 Remi Collet  1.5.5-0.1.RC4
 - use define beta (rather than fullversion)
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:05:56 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:05:56 -0700
Subject: rpms/gtkdatabox/FC-5 gtkdatabox.spec,1.6,1.7
Message-ID: <200611111605.kABG5uAd006642@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6626

Modified Files:
	gtkdatabox.spec 
Log Message:
Match version in devel



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-5/gtkdatabox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkdatabox.spec	18 Aug 2006 04:18:57 -0000	1.6
+++ gtkdatabox.spec	11 Nov 2006 16:05:25 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Fri Sep 15 2006 Eric Work  0.7.0.0-3
+- bumped version to prepare for FC6
+
 * Thu Aug 17 2006 Eric Work  0.7.0.0-2
 - removed devel post/postun scripts
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:07:08 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:07:08 -0700
Subject: rpms/gtkdatabox/FC-4 gtkdatabox.spec,1.6,1.7
Message-ID: <200611111607.kABG783h006724@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6701

Modified Files:
	gtkdatabox.spec 
Log Message:
Match devel version



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-4/gtkdatabox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkdatabox.spec	18 Aug 2006 04:18:19 -0000	1.6
+++ gtkdatabox.spec	11 Nov 2006 16:06:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Fri Sep 15 2006 Eric Work  0.7.0.0-3
+- bumped version to prepare for FC6
+
 * Thu Aug 17 2006 Eric Work  0.7.0.0-2
 - removed devel post/postun scripts
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:09:10 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 09:09:10 -0700
Subject: rpms/ochusha/devel
	ochusha-0.5.99.63.2-call-g_thread_init-once.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 ochusha.spec, 1.1, 1.2 sources,
	1.2, 1.3 ochusha-0.5.8.2-cookie-hana-mogera.patch, 1.1,
	NONE ochusha-0.5.8.2-glib-deprecated-option.patch, 1.1, NONE
Message-ID: <200611111609.kABG9Akr006844@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6797

Modified Files:
	.cvsignore ochusha.spec sources 
Added Files:
	ochusha-0.5.99.63.2-call-g_thread_init-once.patch 
Removed Files:
	ochusha-0.5.8.2-cookie-hana-mogera.patch 
	ochusha-0.5.8.2-glib-deprecated-option.patch 
Log Message:
* Sat Nov 11 2006 Mamoru Tasaka  0.5.99.63.2-0.1.cvs061111
- Update to 0.5.99.63.2


ochusha-0.5.99.63.2-call-g_thread_init-once.patch:

--- NEW FILE ochusha-0.5.99.63.2-call-g_thread_init-once.patch ---
--- ochusha-build/ochusha/main.cc.gthread	2006-11-07 22:24:08.000000000 +0900
+++ ochusha-build/ochusha/main.cc	2006-11-11 22:47:11.000000000 +0900
@@ -155,6 +155,7 @@
   g_option_context_set_help_enabled(option_context, TRUE);
 
   GError *error = NULL;
+  // g_option_context_parse calls g_thread_init
   g_option_context_parse(option_context, &argc, &argv, &error);
 
   if (error != NULL)
@@ -199,7 +200,7 @@
 
   xmlInitParser();
 
-  g_thread_init(NULL);
+  //g_thread_init(NULL);
 
   ochusha_gdk_lock = Lock::get_slave_lock();
   gdk_threads_set_lock_functions(ochusha_gdk_threads_enter,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Aug 2006 10:25:50 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:08:40 -0000	1.3
@@ -1 +1 @@
-ochusha-0.5.8.2.tar.bz2
+ochusha-0.5.99.63.2-cvs061111.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ochusha.spec	27 Aug 2006 10:25:50 -0000	1.1
+++ ochusha.spec	11 Nov 2006 16:08:40 -0000	1.2
@@ -1,67 +1,108 @@
+%define              with_system_ca_cert_file    1
+%define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
+
+%define              main_ver        0.5.99.63.2
+%define              strtag          cvs061111
+
+%define              vendor_rel      1
+%define              pre_release     1
+
+%if %{pre_release}
+%define              rel             0.%{vendor_rel}.%{strtag}%{?dist}
+%else
+%define              rel             %{vendor_rel}%{?dist}
+%endif
+
 Summary:             A GTK+ 2ch.net BBS Browser
 Name:                ochusha
-Version:             0.5.8.2
-Release:             3%{?dist}
+Version:             %{main_ver}
+Release:             %{rel}
 URL:                 http://ochusha.sourceforge.jp/
+%if %{pre_release}
+Source:              %{name}-%{main_ver}-%{strtag}.tar.bz2
+%else
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
-# These patches are from discussion on
-# http://pc8.2ch.net/test/read.cgi/linux/1148809116/
-Patch1:              ochusha-0.5.8.2-glib-deprecated-option.patch
-Patch2:              ochusha-0.5.8.2-cookie-hana-mogera.patch
+%endif
+Patch0:              ochusha-0.5.99.63.2-call-g_thread_init-once.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-Requires(post):      /sbin/ldconfig 
-Requires(post):      %{_bindir}/update-desktop-database
-Requires(post):      %{_bindir}/gtk-update-icon-cache
-Requires(postun):    /sbin/ldconfig
-Requires(postun):    %{_bindir}/update-desktop-database
-Requires(postun):    %{_bindir}/gtk-update-icon-cache
 Requires:            fonts-japanese
-BuildRequires:       gtk2-devel
+Requires:            %{system_ca_cert_file}
+
+BuildRequires:       libtool
+BuildRequires:       gettext
 BuildRequires:       libSM-devel
+BuildRequires:       libXt-devel
 BuildRequires:       libxml2-devel
+BuildRequires:       gtk2-devel
 BuildRequires:       openssl-devel
-BuildRequires:       zlib-devel
 BuildRequires:       desktop-file-utils
-BuildRequires:       libXt-devel
 
 %description
 The ochusha is BBS, especially 2ch.net, browser with GUI.
 It uses the GTK+ toolkit for all of its interface needs.
 The ochusha offers a sort of features such as multi-level
-popup view of `response's, inlining and popup view of
+popup view of `response's, embeded and popup view of
 images that helps users to interact with BBSs.
 
 %prep
+%if %{pre_release}
+%setup -q -n %{name}-%{main_ver}-%{strtag}
+%else
 %setup -q
+%endif
 
-%patch1 -p1 -b .glib
-%patch2 -p1 -b .cookie
+%patch0 -p1 -b .g_thread_init
 
 # change desktop entry to use png file in 
 # %{icondir}
-%{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' gtk2/ochusha.desktop.in
+%{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
+
+# Now rawhide has autoconf >= 2.60
+%{__sed} -i.ver -e 's|2.5\[.*\]|2.6[0-9]|' autogen.sh
+%{__chmod} 0755 autogen.sh
 
 %build
-%configure
+sh autogen.sh
+
+%configure \
+%if %{with_system_ca_cert_file}
+   --with-ca-cert-file=%{system_ca_cert_file}
+%endif
+
 %{__make} %{?_smp_flags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
+# find lang
+%find_lang %{name}
+%find_lang %{name}-properties
+
+%{__cat} *.lang > all.lang
+
+# License
+if test -f "oniguruma/COPYING"; then
+  %{__mv} oniguruma/COPYING oniguruma/COPYING.oniguruma
+fi
+
 # remove unneeded files
 %{__rm} -f %{buildroot}%{_libdir}/lib*.{a,la,so}
+%if %{with_system_ca_cert_file}
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/ca-bundle.crt
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/ochusha-gtkrc*
+%endif
 
 # install desktop file and delete original
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
       --delete-original \
       --vendor fedora \
+      --remove-category Application \
       --dir %{buildroot}%{_datadir}/applications \
-      --add-category X-Fedora \
       %{buildroot}%{_datadir}/ochusha/%{name}.desktop
 
 # link Icon png to icondir
@@ -82,10 +123,7 @@
 
 change_encoding EUCJP \
    BUGS ChangeLog INSTALL.jp NEWS README TODO \
-   gtk2/ochusha-gtkrc.gray
-
-# install mo files
-%find_lang %{name}
+   ochusha/ochusha-gtkrc.gray
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -94,27 +132,38 @@
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 %postun
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
 
-%files -f %{name}.lang
+%files -f all.lang
 %defattr(-,root,root)
-%doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog INSTALL* NEWS README TODO
-%doc gtk2/ochusha-gtkrc.*
+# BUGS is empty for now, however I include it for now.
+%doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+%doc ochusha/ochusha-gtkrc.*
+%doc oniguruma/COPYING.oniguruma
+
 %{_bindir}/ochusha
-%{_libdir}/*.so.*
+%{_libdir}/lib*
+
 %{_datadir}/applications/fedora-*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
-%{_datadir}/ochusha
-%{_mandir}/man*/ochusha.1*
 
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Nov 11 2006 Mamoru Tasaka  0.5.99.63.2-0.1.cvs061111
+- Update to 0.5.99.63.2
+
+* Fri Nov 03 2006  0.5.99.62-1
+- Version down.
+- Specify the CA certificate file bundled within openssl package.
+
 * Sat Aug 26 2006 Mamoru Tasaka  0.5.8.2-3
 - Install (link) icon to the usual directory and use 
   cache updating method.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Aug 2006 10:25:50 -0000	1.2
+++ sources	11 Nov 2006 16:08:40 -0000	1.3
@@ -1 +1 @@
-167edce1d41f766d18018175458373c7  ochusha-0.5.8.2.tar.bz2
+cf91062cc155ef2fef14e8ec0b8d1b8b  ochusha-0.5.99.63.2-cvs061111.tar.bz2


--- ochusha-0.5.8.2-cookie-hana-mogera.patch DELETED ---


--- ochusha-0.5.8.2-glib-deprecated-option.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:28:36 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:28:36 -0700
Subject: rpms/gtkdatabox/FC-5 gtkdatabox.spec,1.7,1.8
Message-ID: <200611111628.kABGSa7D008027@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7966/FC-5

Modified Files:
	gtkdatabox.spec 
Log Message:
bumped EVR to assure devel replaces FC6



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-5/gtkdatabox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkdatabox.spec	11 Nov 2006 16:05:25 -0000	1.7
+++ gtkdatabox.spec	11 Nov 2006 16:28:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.7.0.0-4
+- bumped EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.7.0.0-3
 - bumped version to prepare for FC6
 
@@ -68,4 +71,3 @@
 
 * Fri Jun 23 2006 Eric Work  0.5.3.0-1
 - initial release
-



From fedora-extras-commits at redhat.com  Sat Nov 11 16:28:37 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:28:37 -0700
Subject: rpms/gtkdatabox/devel gtkdatabox.spec,1.7,1.8
Message-ID: <200611111628.kABGSb1k008033@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7966/devel

Modified Files:
	gtkdatabox.spec 
Log Message:
bumped EVR to assure devel replaces FC6



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/devel/gtkdatabox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkdatabox.spec	15 Sep 2006 16:36:53 -0000	1.7
+++ gtkdatabox.spec	11 Nov 2006 16:28:07 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.7.0.0-4
+- bumped EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.7.0.0-3
 - bumped version to prepare for FC6
 
@@ -68,4 +71,3 @@
 
 * Fri Jun 23 2006 Eric Work  0.5.3.0-1
 - initial release
-



From fedora-extras-commits at redhat.com  Sat Nov 11 16:28:35 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:28:35 -0700
Subject: rpms/gtkdatabox/FC-4 gtkdatabox.spec,1.7,1.8
Message-ID: <200611111628.kABGSZxN008024@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7966/FC-4

Modified Files:
	gtkdatabox.spec 
Log Message:
bumped EVR to assure devel replaces FC6



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-4/gtkdatabox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkdatabox.spec	11 Nov 2006 16:06:37 -0000	1.7
+++ gtkdatabox.spec	11 Nov 2006 16:28:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.7.0.0-4
+- bumped EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.7.0.0-3
 - bumped version to prepare for FC6
 
@@ -68,4 +71,3 @@
 
 * Fri Jun 23 2006 Eric Work  0.5.3.0-1
 - initial release
-



From fedora-extras-commits at redhat.com  Sat Nov 11 16:28:37 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:28:37 -0700
Subject: rpms/gtkdatabox/FC-6 gtkdatabox.spec,1.7,1.8
Message-ID: <200611111628.kABGSbpn008030@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7966/FC-6

Modified Files:
	gtkdatabox.spec 
Log Message:
bumped EVR to assure devel replaces FC6



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-6/gtkdatabox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkdatabox.spec	15 Sep 2006 16:36:53 -0000	1.7
+++ gtkdatabox.spec	11 Nov 2006 16:28:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.7.0.0-4
+- bumped EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.7.0.0-3
 - bumped version to prepare for FC6
 
@@ -68,4 +71,3 @@
 
 * Fri Jun 23 2006 Eric Work  0.5.3.0-1
 - initial release
-



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:25 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:25 -0700
Subject: rpms/tripwire/FC-1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.2, 1.3 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTP3Q008207@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-1

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:28:55 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:28:55 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-1/tripwire.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tripwire.spec	8 Nov 2004 05:29:09 -0000	1.2
+++ tripwire.spec	11 Nov 2006 16:28:55 -0000	1.3
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:27 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:27 -0700
Subject: rpms/tripwire/FC-2 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.3, 1.4 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTRQI008212@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-2

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:28:56 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:28:56 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-2/tripwire.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tripwire.spec	8 Nov 2004 05:29:19 -0000	1.3
+++ tripwire.spec	11 Nov 2006 16:28:56 -0000	1.4
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:29 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:29 -0700
Subject: rpms/tripwire/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.6, 1.7 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTTPU008222@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-4

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:28:58 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:28:58 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-4/tripwire.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tripwire.spec	6 Apr 2005 22:13:34 -0000	1.6
+++ tripwire.spec	11 Nov 2006 16:28:58 -0000	1.7
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:32 -0700
Subject: rpms/centericq/FC-4 .cvsignore, 1.4, 1.5 centericq.spec, 1.22,
	1.23 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTWF9008237@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/FC-4

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:47:28 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:02 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- centericq.spec	2 Mar 2006 21:47:41 -0000	1.22
+++ centericq.spec	11 Nov 2006 16:29:02 -0000	1.23
@@ -23,7 +23,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:47:28 -0000	1.4
+++ sources	11 Nov 2006 16:29:02 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:28 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:28 -0700
Subject: rpms/tripwire/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.4, 1.5 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTSi5008217@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-3

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:28:57 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:28:57 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-3/tripwire.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tripwire.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tripwire.spec	11 Nov 2006 16:28:57 -0000	1.5
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:30 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:30 -0700
Subject: rpms/tripwire/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.6, 1.7 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTUwm008227@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-5

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:29:00 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:29:00 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-5/tripwire.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tripwire.spec	6 Apr 2005 22:13:34 -0000	1.6
+++ tripwire.spec	11 Nov 2006 16:29:00 -0000	1.7
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:31 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:31 -0700
Subject: rpms/centericq/FC-3 .cvsignore, 1.4, 1.5 centericq.spec, 1.12,
	1.13 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTVl9008232@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/FC-3

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:52:18 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:01 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- centericq.spec	2 Mar 2006 21:47:35 -0000	1.12
+++ centericq.spec	11 Nov 2006 16:29:01 -0000	1.13
@@ -23,7 +23,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:52:18 -0000	1.4
+++ sources	11 Nov 2006 16:29:01 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:34 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:34 -0700
Subject: rpms/centericq/FC-5 .cvsignore, 1.4, 1.5 centericq.spec, 1.24,
	1.25 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTYi3008242@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/FC-5

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:47:29 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:03 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-5/centericq.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- centericq.spec	2 Mar 2006 21:47:47 -0000	1.24
+++ centericq.spec	11 Nov 2006 16:29:03 -0000	1.25
@@ -24,7 +24,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:47:29 -0000	1.4
+++ sources	11 Nov 2006 16:29:03 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:35 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:35 -0700
Subject: rpms/centericq/FC-6 .cvsignore, 1.4, 1.5 centericq.spec, 1.25,
	1.26 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTZeE008247@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/FC-6

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:47:29 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:04 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-6/centericq.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- centericq.spec	12 Sep 2006 07:12:22 -0000	1.25
+++ centericq.spec	11 Nov 2006 16:29:04 -0000	1.26
@@ -24,7 +24,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:47:29 -0000	1.4
+++ sources	11 Nov 2006 16:29:04 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:36 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:36 -0700
Subject: rpms/centericq/devel .cvsignore, 1.4, 1.5 centericq.spec, 1.26,
	1.27 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTaqo008252@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/devel

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:47:29 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:05 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- centericq.spec	6 Nov 2006 09:58:22 -0000	1.26
+++ centericq.spec	11 Nov 2006 16:29:06 -0000	1.27
@@ -24,7 +24,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:47:29 -0000	1.4
+++ sources	11 Nov 2006 16:29:06 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:31:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 09:31:08 -0700
Subject: rpms/xfce4-battery-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3, 
	1.4 xfce4-battery-plugin.spec, 1.6, 1.7
Message-ID: <200611111631.kABGV8qn008419@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8397

Modified Files:
	.cvsignore sources xfce4-battery-plugin.spec 
Log Message:
Update to 0.4.90.3 on XFCE 4.3.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 10:53:26 -0000	1.3
+++ .cvsignore	11 Nov 2006 16:30:38 -0000	1.4
@@ -1 +1 @@
-xfce4-battery-plugin-0.4.90.2.tar.bz2
+xfce4-battery-plugin-0.4.90.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 10:53:26 -0000	1.3
+++ sources	11 Nov 2006 16:30:38 -0000	1.4
@@ -1 +1 @@
-4dd103909b3d5bb373c12b69da783a6c  xfce4-battery-plugin-0.4.90.2.tar.bz2
+98fbbe0eb2840d7ad4534f124029ebd0  xfce4-battery-plugin-0.4.90.3.tar.bz2


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-battery-plugin.spec	5 Oct 2006 10:53:26 -0000	1.6
+++ xfce4-battery-plugin.spec	11 Nov 2006 16:30:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
-Version:	0.4.90.2
-Release:	3%{?dist}
+Version:	0.4.90.3
+Release:	1%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,7 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
 BuildRequires:	gettext, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.3.99.1
+Requires:	xfce4-panel >= 4.3.99.2
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -42,6 +42,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 31 2006 Christoph Wickert  - 0.4.90.3-1
+- Update to 0.4.90.3 on XFCE 4.3.99.2.
+
 * Thu Oct 05 2006 Christoph Wickert  - 0.4.90.2-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:39:16 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Sat, 11 Nov 2006 09:39:16 -0700
Subject: owners owners.list,1.1925,1.1926
Message-ID: <200611111639.kABGdGAV008540@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8512

Modified Files:
	owners.list 
Log Message:
Hey! Lazy Fedora Extras package maintainer, I want to file a bug report for phpMyAdmin!
Package was approved as per https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187843



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1925
retrieving revision 1.1926
diff -u -r1.1925 -r1.1926
--- owners.list	11 Nov 2006 15:30:28 -0000	1.1925
+++ owners.list	11 Nov 2006 16:38:45 -0000	1.1926
@@ -1813,6 +1813,7 @@
 Fedora Extras|php-shout|libshout extension for PHP|fedora at theholbrooks.org|extras-qa at fedoraproject.org|
 Fedora Extras|php-Smarty|Template/Presentation Framework for PHP|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
+Fedora Extras|phpMyAdmin|Web based MySQL browser written in php|imlinux at gmail.com|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|picocom|Minimal serial communications program|jafo-redhat at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|pikdev|IDE for development of PICmicro based application (under Linux/KDE)|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 16:41:02 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:41:02 -0700
Subject: rpms/glitz/FC-5 glitz.spec,1.2,1.3
Message-ID: <200611111641.kABGf2bT008637@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/glitz/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8588/FC-5

Modified Files:
	glitz.spec 
Log Message:
bump EVR to assure devel replaces FC6



Index: glitz.spec
===================================================================
RCS file: /cvs/extras/rpms/glitz/FC-5/glitz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glitz.spec	8 Jun 2006 21:59:38 -0000	1.2
+++ glitz.spec	11 Nov 2006 16:40:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           glitz
 Version:        0.5.6
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        OpenGL image compositing library
 Group:          System Environment/Libraries
 License:        BSD
@@ -93,6 +93,12 @@
 %{_mandir}/man3/glitz-glx.3.gz
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.5.6-5
+- bump EVR to assure devel replaces FC6
+
+* Fri Sep 15 2006 Eric Work  0.5.6-4
+- bumped version to prepare for FC6
+
 * Wed Jun 07 2006 Eric Work  0.5.6-3
 - added missing requires to devel packages
 - moved man pages to devel packages



From fedora-extras-commits at redhat.com  Sat Nov 11 16:41:03 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:41:03 -0700
Subject: rpms/glitz/FC-6 glitz.spec,1.3,1.4
Message-ID: <200611111641.kABGf3ih008640@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/glitz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8588/FC-6

Modified Files:
	glitz.spec 
Log Message:
bump EVR to assure devel replaces FC6



Index: glitz.spec
===================================================================
RCS file: /cvs/extras/rpms/glitz/FC-6/glitz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glitz.spec	15 Sep 2006 16:34:01 -0000	1.3
+++ glitz.spec	11 Nov 2006 16:40:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glitz
 Version:        0.5.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OpenGL image compositing library
 Group:          System Environment/Libraries
 License:        BSD
@@ -93,6 +93,9 @@
 %{_mandir}/man3/glitz-glx.3.gz
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.5.6-5
+- bump EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.5.6-4
 - bumped version to prepare for FC6
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:41:04 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:41:04 -0700
Subject: rpms/glitz/devel glitz.spec,1.3,1.4
Message-ID: <200611111641.kABGf4CW008643@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/glitz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8588/devel

Modified Files:
	glitz.spec 
Log Message:
bump EVR to assure devel replaces FC6



Index: glitz.spec
===================================================================
RCS file: /cvs/extras/rpms/glitz/devel/glitz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glitz.spec	15 Sep 2006 16:34:01 -0000	1.3
+++ glitz.spec	11 Nov 2006 16:40:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glitz
 Version:        0.5.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OpenGL image compositing library
 Group:          System Environment/Libraries
 License:        BSD
@@ -93,6 +93,9 @@
 %{_mandir}/man3/glitz-glx.3.gz
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.5.6-5
+- bump EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.5.6-4
 - bumped version to prepare for FC6
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:44:59 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:44:59 -0700
Subject: owners owners.list,1.1926,1.1927
Message-ID: <200611111644.kABGixFW008818@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8802

Modified Files:
	owners.list 
Log Message:
Remove libsvg, libsvg-cairo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1926
retrieving revision 1.1927
diff -u -r1.1926 -r1.1927
--- owners.list	11 Nov 2006 16:38:45 -0000	1.1926
+++ owners.list	11 Nov 2006 16:44:29 -0000	1.1927
@@ -966,8 +966,6 @@
 Fedora Extras|libspectrum|The ZX Spectrum library required for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|libstroke|A stroke interface library|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|libsvg|A library for parsing SVG documents|work.eric at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|libsvg-cairo|Renders SVG content using cairo|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsx|Simple X library|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libsynaptics|Synaptics touchpad driver library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 17:00:55 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 10:00:55 -0700
Subject: rpms/Canna/FC-6 .cvsignore, 1.2, 1.3 Canna.spec, 1.5, 1.6 sources,
	1.2, 1.3 skk-dictionaries.patch, 1.1, NONE
Message-ID: <200611111700.kABH0twY008996@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Canna/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/FC-6

Modified Files:
	.cvsignore Canna.spec sources 
Removed Files:
	skk-dictionaries.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2005 09:29:14 -0000	1.2
+++ .cvsignore	11 Nov 2006 17:00:25 -0000	1.3
@@ -3,3 +3,4 @@
 pubdic-bonobo-20021028.tar.bz2
 shion.tar.gz
 zipcode-20030204.tar.bz2
+skk-dictionaries.patch.bz2


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-6/Canna.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Canna.spec	11 Sep 2006 02:52:53 -0000	1.5
+++ Canna.spec	11 Nov 2006 17:00:25 -0000	1.6
@@ -24,7 +24,7 @@
 Patch4: Canna-3.6-dont-grab-ctrl-o.patch
 Patch5: Canna-3.6-fix-warnings.patch
 ## some dictionaries were ported from SKK-JISYO.*
-Patch17: skk-dictionaries.patch
+Patch17: skk-dictionaries.patch.bz2
 Patch18: Canna-3.6-cannadic.patch
 Patch19: Canna-3.6-shion.patch
 Patch21: Canna-3.6-bonobo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 09:29:14 -0000	1.2
+++ sources	11 Nov 2006 17:00:25 -0000	1.3
@@ -3,3 +3,4 @@
 1c89701cc7a274068c3b265e2aa36ac2  pubdic-bonobo-20021028.tar.bz2
 9df0656abbcfdcc2001071805d23229b  shion.tar.gz
 d6287eb37f8b9151fa38cc2684952177  zipcode-20030204.tar.bz2
+00d90008e77e09884d9e76247e1b72d5  skk-dictionaries.patch.bz2


--- skk-dictionaries.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 17:00:54 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 10:00:54 -0700
Subject: rpms/Canna/FC-5 .cvsignore, 1.2, 1.3 Canna.spec, 1.4, 1.5 sources,
	1.2, 1.3 skk-dictionaries.patch, 1.1, NONE
Message-ID: <200611111700.kABH0sAU008991@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Canna/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/FC-5

Modified Files:
	.cvsignore Canna.spec sources 
Removed Files:
	skk-dictionaries.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2005 09:29:14 -0000	1.2
+++ .cvsignore	11 Nov 2006 17:00:23 -0000	1.3
@@ -3,3 +3,4 @@
 pubdic-bonobo-20021028.tar.bz2
 shion.tar.gz
 zipcode-20030204.tar.bz2
+skk-dictionaries.patch.bz2


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-5/Canna.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Canna.spec	7 Mar 2006 09:38:09 -0000	1.4
+++ Canna.spec	11 Nov 2006 17:00:23 -0000	1.5
@@ -24,7 +24,7 @@
 Patch4: Canna-3.6-dont-grab-ctrl-o.patch
 Patch5: Canna-3.6-fix-warnings.patch
 ## some dictionaries were ported from SKK-JISYO.*
-Patch17: skk-dictionaries.patch
+Patch17: skk-dictionaries.patch.bz2
 Patch18: Canna-3.6-cannadic.patch
 Patch19: Canna-3.6-shion.patch
 Patch21: Canna-3.6-bonobo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 09:29:14 -0000	1.2
+++ sources	11 Nov 2006 17:00:24 -0000	1.3
@@ -3,3 +3,4 @@
 1c89701cc7a274068c3b265e2aa36ac2  pubdic-bonobo-20021028.tar.bz2
 9df0656abbcfdcc2001071805d23229b  shion.tar.gz
 d6287eb37f8b9151fa38cc2684952177  zipcode-20030204.tar.bz2
+00d90008e77e09884d9e76247e1b72d5  skk-dictionaries.patch.bz2


--- skk-dictionaries.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 17:00:57 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 10:00:57 -0700
Subject: rpms/Canna/devel .cvsignore, 1.2, 1.3 Canna.spec, 1.5, 1.6 sources, 
	1.2, 1.3 skk-dictionaries.patch, 1.1, NONE
Message-ID: <200611111700.kABH0vBx009001@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Canna/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/devel

Modified Files:
	.cvsignore Canna.spec sources 
Removed Files:
	skk-dictionaries.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2005 09:29:14 -0000	1.2
+++ .cvsignore	11 Nov 2006 17:00:26 -0000	1.3
@@ -3,3 +3,4 @@
 pubdic-bonobo-20021028.tar.bz2
 shion.tar.gz
 zipcode-20030204.tar.bz2
+skk-dictionaries.patch.bz2


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Canna.spec	11 Sep 2006 02:52:53 -0000	1.5
+++ Canna.spec	11 Nov 2006 17:00:26 -0000	1.6
@@ -24,7 +24,7 @@
 Patch4: Canna-3.6-dont-grab-ctrl-o.patch
 Patch5: Canna-3.6-fix-warnings.patch
 ## some dictionaries were ported from SKK-JISYO.*
-Patch17: skk-dictionaries.patch
+Patch17: skk-dictionaries.patch.bz2
 Patch18: Canna-3.6-cannadic.patch
 Patch19: Canna-3.6-shion.patch
 Patch21: Canna-3.6-bonobo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 09:29:14 -0000	1.2
+++ sources	11 Nov 2006 17:00:27 -0000	1.3
@@ -3,3 +3,4 @@
 1c89701cc7a274068c3b265e2aa36ac2  pubdic-bonobo-20021028.tar.bz2
 9df0656abbcfdcc2001071805d23229b  shion.tar.gz
 d6287eb37f8b9151fa38cc2684952177  zipcode-20030204.tar.bz2
+00d90008e77e09884d9e76247e1b72d5  skk-dictionaries.patch.bz2


--- skk-dictionaries.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 17:26:46 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 11 Nov 2006 10:26:46 -0700
Subject: rpms/pan/devel .cvsignore, 1.14, 1.15 pan.spec, 1.24, 1.25 sources, 
	1.14, 1.15 pan-0.99-gi18n.patch, 1.1, NONE
Message-ID: <200611111726.kABHQkqD012167@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12118

Modified Files:
	.cvsignore pan.spec sources 
Removed Files:
	pan-0.99-gi18n.patch 
Log Message:
update to latest upstream release & removed obsolete patch file

This week's release has a handful of small but important bugfixes, as well
as some good speedups.

This should be the last pre-1.0 release (just like the previous two releases
also should've been. ;)

http://bugzilla.gnome.org/buglist.cgi?bug_id=373193,372616,372241,371720,371453,370930,370195,363166,355805




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Nov 2006 20:34:07 -0000	1.14
+++ .cvsignore	11 Nov 2006 17:26:16 -0000	1.15
@@ -1 +1 @@
-pan-0.118.tar.bz2
+pan-0.119.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pan.spec	4 Nov 2006 20:34:07 -0000	1.24
+++ pan.spec	11 Nov 2006 17:26:16 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.118
+Version:	0.119
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Nov 11 2006 Alexander Dalloz  - 1:0.119-1
+- Update to 0.119
+
 * Sat Nov 04 2006 Alexander Dalloz  - 1:0.118-1
 - Update to 0.118
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Nov 2006 20:34:07 -0000	1.14
+++ sources	11 Nov 2006 17:26:16 -0000	1.15
@@ -1 +1 @@
-03c8ed7192d0454684a0c17c6082b92a  pan-0.118.tar.bz2
+4ae2819c841a6e504c2f4aa51b752f8f  pan-0.119.tar.bz2


--- pan-0.99-gi18n.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 17:45:53 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 10:45:53 -0700
Subject: rpms/libxfce4util/FC-6 libxfce4util.spec, 1.13, 1.14 sources, 1.6, 
	1.7 .cvsignore, 1.6, 1.7
Message-ID: <200611111745.kABHjrH7012432@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12410

Modified Files:
	libxfce4util.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/FC-6/libxfce4util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libxfce4util.spec	6 Oct 2006 01:37:15 -0000	1.13
+++ libxfce4util.spec	11 Nov 2006 17:45:23 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD and LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4util-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2
 Group: Development/Libraries
 Requires: glib2 >= 2.0.0
 BuildRequires: glib2-devel >= 2.0.0
@@ -57,6 +57,9 @@
 %{_includedir}/xfce4
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 01:39:07 -0000	1.6
+++ sources	11 Nov 2006 17:45:23 -0000	1.7
@@ -1 +1 @@
-5474fda120b0f28f3b86bee268467060  libxfce4util-4.3.99.1.tar.bz2
+4b327c64c292b2e672f69a0789deb2b7  libxfce4util-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 01:39:07 -0000	1.6
+++ .cvsignore	11 Nov 2006 17:45:23 -0000	1.7
@@ -1 +1 @@
-libxfce4util-4.3.99.1.tar.bz2
+libxfce4util-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:42 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:42 -0700
Subject: rpms/zeroinstall-injector/FC-3 zeroinstall-x86_64-arch.patch, NONE, 
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHkgGT012561@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-3

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:24 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:12 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -29,13 +30,14 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +59,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:43 -0700
Subject: rpms/zeroinstall-injector/FC-4 zeroinstall-x86_64-arch.patch, NONE, 
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHkhaL012564@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-4

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:25 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:12 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:50 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:50 -0700
Subject: rpms/zeroinstall-injector/FC-6 zeroinstall-x86_64-arch.patch, NONE, 
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHkoD8012570@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-6

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-6/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:32 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:19 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:43 -0700
Subject: rpms/zeroinstall-injector/FC-5 zeroinstall-x86_64-arch.patch, NONE, 
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHkhdk012567@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-5

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:31 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:13 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:50 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:50 -0700
Subject: rpms/zeroinstall-injector/devel zeroinstall-x86_64-arch.patch, NONE,
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHko7p012573@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/devel

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:33 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:20 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:51:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 10:51:32 -0700
Subject: rpms/libxfcegui4/FC-6 libxfcegui4.spec, 1.16, 1.17 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111751.kABHpWfJ012808@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12786

Modified Files:
	libxfcegui4.spec sources .cvsignore 
Log Message:
Upgrade to 4.3.99.2



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/FC-6/libxfcegui4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libxfcegui4.spec	6 Oct 2006 01:38:33 -0000	1.16
+++ libxfcegui4.spec	11 Nov 2006 17:51:02 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gtk2 >= 2.0.6
@@ -67,6 +67,9 @@
 %{_includedir}/xfce4/*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Upgrade to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 01:42:24 -0000	1.5
+++ sources	11 Nov 2006 17:51:02 -0000	1.6
@@ -1 +1 @@
-519bca1ba08e51f03584ce6c007cd10d  libxfcegui4-4.3.99.1.tar.bz2
+98679c67ac65c376833deacec9fcbecf  libxfcegui4-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 01:42:24 -0000	1.5
+++ .cvsignore	11 Nov 2006 17:51:02 -0000	1.6
@@ -1 +1 @@
-libxfcegui4-4.3.99.1.tar.bz2
+libxfcegui4-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 17:56:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 10:56:18 -0700
Subject: rpms/perl-Email-Address/FC-5 .cvsignore, 1.6,
	1.7 perl-Email-Address.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200611111756.kABHuIwi012905@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12853/FC-5

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.880.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
+++ .cvsignore	11 Nov 2006 17:55:48 -0000	1.7
@@ -1 +1 @@
-Email-Address-1.871.tar.gz
+Email-Address-1.880.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/perl-Email-Address.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
+++ perl-Email-Address.spec	11 Nov 2006 17:55:48 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.871
+Version:        1.880
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
+- Update to 1.880.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.871-1
 - Update to 1.871.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Oct 2006 19:47:23 -0000	1.6
+++ sources	11 Nov 2006 17:55:48 -0000	1.7
@@ -1 +1 @@
-1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz
+8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 17:56:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 10:56:19 -0700
Subject: rpms/perl-Email-Address/FC-6 .cvsignore, 1.6,
	1.7 perl-Email-Address.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200611111756.kABHuJTw012910@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12853/FC-6

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.880.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
+++ .cvsignore	11 Nov 2006 17:55:49 -0000	1.7
@@ -1 +1 @@
-Email-Address-1.871.tar.gz
+Email-Address-1.880.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/perl-Email-Address.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
+++ perl-Email-Address.spec	11 Nov 2006 17:55:49 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.871
+Version:        1.880
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
+- Update to 1.880.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.871-1
 - Update to 1.871.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Oct 2006 19:47:23 -0000	1.6
+++ sources	11 Nov 2006 17:55:49 -0000	1.7
@@ -1 +1 @@
-1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz
+8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 17:56:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 10:56:20 -0700
Subject: rpms/perl-Email-Address/devel .cvsignore, 1.6,
	1.7 perl-Email-Address.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200611111756.kABHuKs0012915@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12853/devel

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.880.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
+++ .cvsignore	11 Nov 2006 17:55:49 -0000	1.7
@@ -1 +1 @@
-Email-Address-1.871.tar.gz
+Email-Address-1.880.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
+++ perl-Email-Address.spec	11 Nov 2006 17:55:49 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.871
+Version:        1.880
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
+- Update to 1.880.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.871-1
 - Update to 1.871.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Oct 2006 19:47:23 -0000	1.6
+++ sources	11 Nov 2006 17:55:49 -0000	1.7
@@ -1 +1 @@
-1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz
+8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 17:58:16 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 10:58:16 -0700
Subject: rpms/libxfce4mcs/FC-6 libxfce4mcs.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111758.kABHwG8J013109@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13084

Modified Files:
	libxfce4mcs.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/FC-6/libxfce4mcs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libxfce4mcs.spec	6 Oct 2006 01:55:58 -0000	1.12
+++ libxfce4mcs.spec	11 Nov 2006 17:57:46 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
-Version: 4.3.99.1
-Release: 2%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4mcs-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -62,6 +62,9 @@
 %{_includedir}/xfce4/libxfce4mcs
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - remove unneeded prereq


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 01:48:05 -0000	1.5
+++ sources	11 Nov 2006 17:57:46 -0000	1.6
@@ -1 +1 @@
-ad70646a4ef699d7adcd409339f78884  libxfce4mcs-4.3.99.1.tar.bz2
+7ee4eab238e773b9dbf3fa1472643f6e  libxfce4mcs-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 01:48:05 -0000	1.5
+++ .cvsignore	11 Nov 2006 17:57:46 -0000	1.6
@@ -1 +1 @@
-libxfce4mcs-4.3.99.1.tar.bz2
+libxfce4mcs-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 18:08:24 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 11:08:24 -0700
Subject: rpms/xfce-mcs-manager/FC-6 xfce-mcs-manager.spec, 1.9, 1.10 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111808.kABI8Ono016300@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16274

Modified Files:
	xfce-mcs-manager.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/FC-6/xfce-mcs-manager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce-mcs-manager.spec	6 Oct 2006 02:06:08 -0000	1.9
+++ xfce-mcs-manager.spec	11 Nov 2006 18:07:54 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-manager-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: libxfce4mcs >= %{version}
@@ -61,6 +61,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Add period to description
 - Fix defattr


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:01:44 -0000	1.5
+++ sources	11 Nov 2006 18:07:54 -0000	1.6
@@ -1 +1 @@
-1a42226297b3b89f19bd17a6841f5c3a  xfce-mcs-manager-4.3.99.1.tar.bz2
+59d6d8f4f931b562b39ea1decdf9e29e  xfce-mcs-manager-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:01:44 -0000	1.5
+++ .cvsignore	11 Nov 2006 18:07:54 -0000	1.6
@@ -1 +1 @@
-xfce-mcs-manager-4.3.99.1.tar.bz2
+xfce-mcs-manager-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 18:10:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 11:10:37 -0700
Subject: rpms/perl-Wx/FC-5 .cvsignore, 1.3, 1.4 perl-Wx.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611111810.kABIAbkX016403@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16330/FC-5

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.60.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Oct 2006 14:04:09 -0000	1.3
+++ .cvsignore	11 Nov 2006 18:10:07 -0000	1.4
@@ -1 +1 @@
-Wx-0.59.tar.gz
+Wx-0.60.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/perl-Wx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Wx.spec	21 Oct 2006 14:04:09 -0000	1.2
+++ perl-Wx.spec	11 Nov 2006 18:10:07 -0000	1.3
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.59
+Version:        0.60
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.22
+BuildRequires:  perl(Alien::wxWidgets) >= 0.25
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
+- Update to 0.60.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.59-1
 - Update to 0.59.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2006 14:04:09 -0000	1.3
+++ sources	11 Nov 2006 18:10:07 -0000	1.4
@@ -1 +1 @@
-8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz
+be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:10:38 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 11:10:38 -0700
Subject: rpms/perl-Wx/FC-6 .cvsignore, 1.3, 1.4 perl-Wx.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611111810.kABIAc87016408@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16330/FC-6

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.60.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Oct 2006 14:04:11 -0000	1.3
+++ .cvsignore	11 Nov 2006 18:10:08 -0000	1.4
@@ -1 +1 @@
-Wx-0.59.tar.gz
+Wx-0.60.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/perl-Wx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Wx.spec	21 Oct 2006 14:04:11 -0000	1.2
+++ perl-Wx.spec	11 Nov 2006 18:10:08 -0000	1.3
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.59
+Version:        0.60
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.22
+BuildRequires:  perl(Alien::wxWidgets) >= 0.25
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
+- Update to 0.60.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.59-1
 - Update to 0.59.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2006 14:04:11 -0000	1.3
+++ sources	11 Nov 2006 18:10:08 -0000	1.4
@@ -1 +1 @@
-8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz
+be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:10:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 11:10:44 -0700
Subject: rpms/perl-Wx/devel .cvsignore, 1.3, 1.4 perl-Wx.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611111810.kABIAiX7016413@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16330/devel

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.60.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Oct 2006 14:04:11 -0000	1.3
+++ .cvsignore	11 Nov 2006 18:10:14 -0000	1.4
@@ -1 +1 @@
-Wx-0.59.tar.gz
+Wx-0.60.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Wx.spec	21 Oct 2006 14:04:11 -0000	1.2
+++ perl-Wx.spec	11 Nov 2006 18:10:14 -0000	1.3
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.59
+Version:        0.60
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.22
+BuildRequires:  perl(Alien::wxWidgets) >= 0.25
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
+- Update to 0.60.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.59-1
 - Update to 0.59.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2006 14:04:11 -0000	1.3
+++ sources	11 Nov 2006 18:10:14 -0000	1.4
@@ -1 +1 @@
-8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz
+be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:10:53 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 11 Nov 2006 11:10:53 -0700
Subject: rpms/pan/FC-6 .cvsignore, 1.14, 1.15 pan.spec, 1.24, 1.25 sources, 
	1.14, 1.15 pan-0.99-gi18n.patch, 1.1, NONE
Message-ID: <200611111810.kABIArxf016427@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16297

Modified Files:
	.cvsignore pan.spec sources 
Removed Files:
	pan-0.99-gi18n.patch 
Log Message:
update to latest upstream release & removed obsolete patch file

This week's release has a handful of small but important bugfixes, as well
as some good speedups.

This should be the last pre-1.0 release (just like the previous two releases
also should've been.  ;) 

http://bugzilla.gnome.org/buglist.cgi?bug_id=373193,372616,372241,371720,371453,370930,370195,363166,355805




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Nov 2006 20:58:45 -0000	1.14
+++ .cvsignore	11 Nov 2006 18:10:23 -0000	1.15
@@ -1 +1 @@
-pan-0.118.tar.bz2
+pan-0.119.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/pan.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pan.spec	4 Nov 2006 20:58:45 -0000	1.24
+++ pan.spec	11 Nov 2006 18:10:23 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.118
+Version:	0.119
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Nov 11 2006 Alexander Dalloz  - 1:0.119-1
+- Update to 0.119
+
 * Sat Nov 04 2006 Alexander Dalloz  - 1:0.118-1
 - Update to 0.118
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Nov 2006 20:58:45 -0000	1.14
+++ sources	11 Nov 2006 18:10:23 -0000	1.15
@@ -1 +1 @@
-03c8ed7192d0454684a0c17c6082b92a  pan-0.118.tar.bz2
+4ae2819c841a6e504c2f4aa51b752f8f  pan-0.119.tar.bz2


--- pan-0.99-gi18n.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 18:18:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 11:18:34 -0700
Subject: rpms/openct/devel .cvsignore, 1.9, 1.10 openct.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200611111818.kABIIY2L016677@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16630/devel

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
- 0.6.10, udev rules fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Sep 2006 08:37:52 -0000	1.9
+++ .cvsignore	11 Nov 2006 18:18:04 -0000	1.10
@@ -1 +1 @@
-openct-0.6.9.tar.gz
+openct-0.6.10.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openct.spec	16 Oct 2006 18:24:51 -0000	1.19
+++ openct.spec	11 Nov 2006 18:18:04 -0000	1.20
@@ -1,8 +1,8 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.9
-Release:        3%{?dist}
+Version:        0.6.10
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -57,7 +57,6 @@
 %setup -q
 sh bootstrap # avoid standard rpaths on lib64 archs
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
-sed -i -e 's|^BUS="|BUS=="|' etc/openct.udev
 
 
 %build
@@ -160,6 +159,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
+- 0.6.10, udev rules fixed upstream.
+
 * Mon Oct 16 2006 Ville Skytt??  - 0.6.9-3
 - Fix udev rules for newer udev versions (#210868).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Sep 2006 08:37:52 -0000	1.9
+++ sources	11 Nov 2006 18:18:04 -0000	1.10
@@ -1 +1 @@
-26c7f8d9fabbd698303601cc7d844252  openct-0.6.9.tar.gz
+fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:18:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 11:18:33 -0700
Subject: rpms/openct/FC-6 .cvsignore, 1.9, 1.10 openct.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200611111818.kABIIXaD016670@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16630/FC-6

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
- 0.6.10, udev rules fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Sep 2006 08:37:52 -0000	1.9
+++ .cvsignore	11 Nov 2006 18:18:03 -0000	1.10
@@ -1 +1 @@
-openct-0.6.9.tar.gz
+openct-0.6.10.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/openct.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openct.spec	16 Oct 2006 18:24:51 -0000	1.19
+++ openct.spec	11 Nov 2006 18:18:03 -0000	1.20
@@ -1,8 +1,8 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.9
-Release:        3%{?dist}
+Version:        0.6.10
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -57,7 +57,6 @@
 %setup -q
 sh bootstrap # avoid standard rpaths on lib64 archs
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
-sed -i -e 's|^BUS="|BUS=="|' etc/openct.udev
 
 
 %build
@@ -160,6 +159,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
+- 0.6.10, udev rules fixed upstream.
+
 * Mon Oct 16 2006 Ville Skytt??  - 0.6.9-3
 - Fix udev rules for newer udev versions (#210868).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Sep 2006 08:37:52 -0000	1.9
+++ sources	11 Nov 2006 18:18:03 -0000	1.10
@@ -1 +1 @@
-26c7f8d9fabbd698303601cc7d844252  openct-0.6.9.tar.gz
+fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:20:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 11:20:11 -0700
Subject: rpms/xfce4-panel/FC-6 xfce4-panel.spec, 1.17, 1.18 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111820.kABIKB6e016829@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16804

Modified Files:
	xfce4-panel.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/FC-6/xfce4-panel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfce4-panel.spec	6 Oct 2006 08:13:22 -0000	1.17
+++ xfce4-panel.spec	11 Nov 2006 18:19:41 -0000	1.18
@@ -1,10 +1,10 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.3.99.1
-Release: 7%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= %{version}
@@ -119,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Fri Oct  6 2006 Kevin Fenzi  - 4.3.99.1-7
 - List full old versions in Obsoletes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:10:26 -0000	1.5
+++ sources	11 Nov 2006 18:19:41 -0000	1.6
@@ -1 +1 @@
-8647de295987605161c75650e4554fd8  xfce4-panel-4.3.99.1.tar.bz2
+53f96a9db5628ac1c629c9e5ecd842e4  xfce4-panel-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:10:26 -0000	1.5
+++ .cvsignore	11 Nov 2006 18:19:41 -0000	1.6
@@ -1 +1 @@
-xfce4-panel-4.3.99.1.tar.bz2
+xfce4-panel-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 18:27:59 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 11 Nov 2006 11:27:59 -0700
Subject: rpms/granule/devel granule.spec,1.3,1.4
Message-ID: <200611111827.kABIRxMV016946@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16917

Modified Files:
	granule.spec 
Log Message:
Added %{?dist} per buildsys request from Michael Schwendt 



Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- granule.spec	7 Nov 2006 03:47:18 -0000	1.3
+++ granule.spec	11 Nov 2006 18:27:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.2.3
-Release:    4
+Release:    4{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/



From fedora-extras-commits at redhat.com  Sat Nov 11 18:32:00 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 11 Nov 2006 11:32:00 -0700
Subject: rpms/granule/devel granule.spec,1.4,1.5
Message-ID: <200611111832.kABIW0gh017042@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17021

Modified Files:
	granule.spec 
Log Message:
Added missing percentage.



Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- granule.spec	11 Nov 2006 18:27:29 -0000	1.4
+++ granule.spec	11 Nov 2006 18:31:29 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.2.3
-Release:    4{?dist}
+Release:    4%{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/



From fedora-extras-commits at redhat.com  Sat Nov 11 18:48:04 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 11:48:04 -0700
Subject: rpms/gtk-xfce-engine/FC-6 gtk-xfce-engine.spec, 1.13, 1.14 sources, 
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111848.kABIm4Vo017225@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17205

Modified Files:
	gtk-xfce-engine.spec sources .cvsignore 
Log Message:
Update to 2.3.99.2



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-6/gtk-xfce-engine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtk-xfce-engine.spec	6 Oct 2006 02:27:27 -0000	1.13
+++ gtk-xfce-engine.spec	11 Nov 2006 18:47:34 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
-Version: 2.3.99.1
-Release: 3%{?dist}
+Version: 2.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/gtk-xfce-engine-2.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/gtk-xfce-engine-2.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.0
@@ -35,6 +35,9 @@
 %{_datadir}/*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 2.3.99.2-1
+- Update to 2.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 2.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:13:53 -0000	1.5
+++ sources	11 Nov 2006 18:47:34 -0000	1.6
@@ -1 +1 @@
-d5e9e9f5113268a1a3662ee420d064f7  gtk-xfce-engine-2.3.99.1.tar.bz2
+430c004dd67bc6445d7a162e626566fb  gtk-xfce-engine-2.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:13:53 -0000	1.5
+++ .cvsignore	11 Nov 2006 18:47:34 -0000	1.6
@@ -1 +1 @@
-gtk-xfce-engine-2.3.99.1.tar.bz2
+gtk-xfce-engine-2.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:07:06 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:07:06 -0700
Subject: rpms/exo/FC-6 exo.spec, 1.19, 1.20 sources, 1.4, 1.5 .cvsignore, 1.4,
	1.5
Message-ID: <200611111907.kABJ760N020330@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20303

Modified Files:
	exo.spec sources .cvsignore 
Log Message:
Update to 0.3.1.12rc2



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-6/exo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- exo.spec	6 Oct 2006 03:51:31 -0000	1.19
+++ exo.spec	11 Nov 2006 19:06:35 -0000	1.20
@@ -2,11 +2,11 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.1.10
-Release: 0.6.rc1%{?dist}
+Version: 0.3.1.12
+Release: 0.1.rc2%{?dist}
 License: LGPL
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/exo-0.3.1.12rc2.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: Development/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 Python libraries and header files for the exo library.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %patch0 -p1 -b x86_64-build
 
@@ -83,6 +83,7 @@
 %{_datadir}/xfce4/helpers
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/ja
+%{_datadir}/xfce4/doc/fr
 %{_mandir}/man1/exo-csource.1.gz
 %{_mandir}/man1/exo-open.1.gz
 %{_bindir}/exo-csource
@@ -93,6 +94,7 @@
 %{_libexecdir}/exo-helper-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
+%{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-other.png
@@ -112,6 +114,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 0.3.1.12-0.1.rc2
+- Update to 0.3.1.12rc2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.3.1.10-0.6.rc1
 - Added libxfce4util-devel Requires for the devel package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 22:07:51 -0000	1.4
+++ sources	11 Nov 2006 19:06:35 -0000	1.5
@@ -1 +1 @@
-98d5493c898ab54b82b0835fc0e6df87  exo-0.3.1.10rc1.tar.bz2
+4c74431033c4c222efeccd4cf47ab65f  exo-0.3.1.12rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 22:07:51 -0000	1.4
+++ .cvsignore	11 Nov 2006 19:06:35 -0000	1.5
@@ -1 +1 @@
-exo-0.3.1.10rc1.tar.bz2
+exo-0.3.1.12rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:15:30 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:15:30 -0700
Subject: rpms/Thunar/FC-6 Thunar.spec, 1.7, 1.8 sources, 1.2, 1.3 .cvsignore,
	1.2, 1.3
Message-ID: <200611111915.kABJFUec020530@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20508

Modified Files:
	Thunar.spec sources .cvsignore 
Log Message:
Upgrade to 0.5.0rc2



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/FC-6/Thunar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Thunar.spec	9 Oct 2006 19:13:47 -0000	1.7
+++ Thunar.spec	11 Nov 2006 19:15:00 -0000	1.8
@@ -1,10 +1,10 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 0.4.0
-Release: 0.11.rc1%{?dist}
+Version: 0.5.0
+Release: 0.1.rc2%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Thunar-0.5.0rc2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fam-devel
@@ -49,7 +49,7 @@
 libraries and header files for the Thunar file manager.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %build
 %configure --enable-dbus --enable-final --enable-xsltproc --enable-gtk-doc
@@ -164,6 +164,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Nov 09 2006 Kevin Fenzi  - 0.5.0-0.1.rc2
+- Upgrade to 0.5.0rc2
+
 * Mon Oct 09 2006 Kevin Fenzi  - 0.4.0-0.11.rc1
 - Add shared-mime-info and xfce4-icon-theme as Requires (fixes #209592)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2006 22:55:50 -0000	1.2
+++ sources	11 Nov 2006 19:15:00 -0000	1.3
@@ -1 +1 @@
-b07ae97a69964112e0af84ba2f63585d  Thunar-0.4.0rc1.tar.bz2
+c97f6a011eb72b8653ad799290c71d52  Thunar-0.5.0rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 22:55:50 -0000	1.2
+++ .cvsignore	11 Nov 2006 19:15:00 -0000	1.3
@@ -1 +1 @@
-Thunar-0.4.0rc1.tar.bz2
+Thunar-0.5.0rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:29:35 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:29:35 -0700
Subject: rpms/Terminal/FC-6 Terminal.spec, 1.13, 1.14 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200611111929.kABJTZm7020717@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20691

Modified Files:
	Terminal.spec sources .cvsignore 
Log Message:
Update to 0.2.5.8rc2



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/FC-6/Terminal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Terminal.spec	6 Oct 2006 02:50:50 -0000	1.13
+++ Terminal.spec	11 Nov 2006 19:29:05 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.2.5.6
-Release: 0.3.rc1%{?dist}
+Version: 0.2.5.8
+Release: 0.1.rc2%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Terminal-0.2.5.6rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Terminal-0.2.5.8rc2.tar.bz2
 Group: User Interface/X
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel
@@ -18,7 +18,7 @@
 it unique among X terminal emulators. 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %build
 %configure
@@ -60,6 +60,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.2.5.8-0.1.rc2
+- Update to 0.2.5.8rc2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.2.5.6-0.4.rc1
 - Added gtk-update-icon-cache to post/postun
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 22:22:52 -0000	1.4
+++ sources	11 Nov 2006 19:29:05 -0000	1.5
@@ -1 +1 @@
-4aa04a71f3dd2d132ed3d10f174171ca  Terminal-0.2.5.6rc1.tar.bz2
+d2785c1b11c48ed012042faa708bbf94  Terminal-0.2.5.8rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 22:22:52 -0000	1.4
+++ .cvsignore	11 Nov 2006 19:29:05 -0000	1.5
@@ -1 +1 @@
-Terminal-0.2.5.6rc1.tar.bz2
+Terminal-0.2.5.8rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:31:10 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:31:10 -0700
Subject: rpms/xfce4-appfinder/FC-6 xfce4-appfinder.spec, 1.10, 1.11 sources, 
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111931.kABJVA7w020842@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20796

Modified Files:
	xfce4-appfinder.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-6/xfce4-appfinder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-appfinder.spec	6 Oct 2006 05:57:08 -0000	1.10
+++ xfce4-appfinder.spec	11 Nov 2006 19:30:40 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-appfinder-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -49,6 +49,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Add period to description
 - Fix defattr


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:34:54 -0000	1.5
+++ sources	11 Nov 2006 19:30:40 -0000	1.6
@@ -1 +1 @@
-576b6af7ed7223cbdbccf7df509b8c9f  xfce4-appfinder-4.3.99.1.tar.bz2
+a4636f51d79eb68ba65098336d120d56  xfce4-appfinder-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:34:54 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:30:40 -0000	1.6
@@ -1 +1 @@
-xfce4-appfinder-4.3.99.1.tar.bz2
+xfce4-appfinder-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:31:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 12:31:20 -0700
Subject: rpms/xfce4-battery-plugin/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-battery-plugin.spec, 1.6, 1.7
Message-ID: <200611111931.kABJVKLO020884@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20819

Modified Files:
	.cvsignore sources xfce4-battery-plugin.spec 
Log Message:
Update to 0.4.90.3 on XFCE 4.3.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 10:53:26 -0000	1.3
+++ .cvsignore	11 Nov 2006 19:30:50 -0000	1.4
@@ -1 +1 @@
-xfce4-battery-plugin-0.4.90.2.tar.bz2
+xfce4-battery-plugin-0.4.90.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 10:53:26 -0000	1.3
+++ sources	11 Nov 2006 19:30:50 -0000	1.4
@@ -1 +1 @@
-4dd103909b3d5bb373c12b69da783a6c  xfce4-battery-plugin-0.4.90.2.tar.bz2
+98fbbe0eb2840d7ad4534f124029ebd0  xfce4-battery-plugin-0.4.90.3.tar.bz2


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-6/xfce4-battery-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-battery-plugin.spec	5 Oct 2006 10:53:26 -0000	1.6
+++ xfce4-battery-plugin.spec	11 Nov 2006 19:30:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
-Version:	0.4.90.2
-Release:	3%{?dist}
+Version:	0.4.90.3
+Release:	1%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,7 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
 BuildRequires:	gettext, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.3.99.1
+Requires:	xfce4-panel >= 4.3.99.2
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -42,6 +42,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 31 2006 Christoph Wickert  - 0.4.90.3-1
+- Update to 0.4.90.3 on XFCE 4.3.99.2.
+
 * Thu Oct 05 2006 Christoph Wickert  - 0.4.90.2-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sat Nov 11 19:32:44 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:32:44 -0700
Subject: rpms/xfce4-icon-theme/FC-6 xfce4-icon-theme.spec, 1.11, 1.12 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111932.kABJWivb020936@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20904

Modified Files:
	xfce4-icon-theme.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/FC-6/xfce4-icon-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-icon-theme.spec	6 Oct 2006 05:59:03 -0000	1.11
+++ xfce4-icon-theme.spec	11 Nov 2006 19:32:14 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-icon-theme-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -37,6 +37,9 @@
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:38:12 -0000	1.5
+++ sources	11 Nov 2006 19:32:14 -0000	1.6
@@ -1 +1 @@
-ccdcd6aa7e03732347d785a826c81f84  xfce4-icon-theme-4.3.99.1.tar.bz2
+e8ad35bc50a84f620848f841d5167fb9  xfce4-icon-theme-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:38:12 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:32:14 -0000	1.6
@@ -1 +1 @@
-xfce4-icon-theme-4.3.99.1.tar.bz2
+xfce4-icon-theme-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:33:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 12:33:27 -0700
Subject: rpms/xfce4-battery-plugin/devel xfce4-battery-plugin.spec,1.7,1.8
Message-ID: <200611111933.kABJXRS9021024@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20978/devel

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
fix date in changelog


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-battery-plugin.spec	11 Nov 2006 16:30:38 -0000	1.7
+++ xfce4-battery-plugin.spec	11 Nov 2006 19:32:56 -0000	1.8
@@ -42,7 +42,7 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Thu Oct 31 2006 Christoph Wickert  - 0.4.90.3-1
+* Sat Nov 11 2006 Christoph Wickert  - 0.4.90.3-1
 - Update to 0.4.90.3 on XFCE 4.3.99.2.
 
 * Thu Oct 05 2006 Christoph Wickert  - 0.4.90.2-3



From fedora-extras-commits at redhat.com  Sat Nov 11 19:33:25 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 12:33:25 -0700
Subject: rpms/xfce4-battery-plugin/FC-6 xfce4-battery-plugin.spec,1.7,1.8
Message-ID: <200611111933.kABJXPaq021021@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20978/FC-6

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
fix date in changelog


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-6/xfce4-battery-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-battery-plugin.spec	11 Nov 2006 19:30:50 -0000	1.7
+++ xfce4-battery-plugin.spec	11 Nov 2006 19:32:55 -0000	1.8
@@ -42,7 +42,7 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Thu Oct 31 2006 Christoph Wickert  - 0.4.90.3-1
+* Sat Nov 11 2006 Christoph Wickert  - 0.4.90.3-1
 - Update to 0.4.90.3 on XFCE 4.3.99.2.
 
 * Thu Oct 05 2006 Christoph Wickert  - 0.4.90.2-3



From fedora-extras-commits at redhat.com  Sat Nov 11 19:34:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:34:11 -0700
Subject: rpms/xfce4-mixer/FC-6 xfce4-mixer.spec, 1.11, 1.12 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111934.kABJYBQe021084@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21030

Modified Files:
	xfce4-mixer.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/FC-6/xfce4-mixer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-mixer.spec	6 Oct 2006 06:04:58 -0000	1.11
+++ xfce4-mixer.spec	11 Nov 2006 19:33:40 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-mixer-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.3.99.1
@@ -56,6 +56,9 @@
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - Add period to the end of description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:44:00 -0000	1.5
+++ sources	11 Nov 2006 19:33:40 -0000	1.6
@@ -1 +1 @@
-5836282f9795d10b65d41564a923f677  xfce4-mixer-4.3.99.1.tar.bz2
+9648fc403f9eb4baede230644bf5638d  xfce4-mixer-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:44:00 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:33:40 -0000	1.6
@@ -1 +1 @@
-xfce4-mixer-4.3.99.1.tar.bz2
+xfce4-mixer-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:35:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:35:34 -0700
Subject: rpms/xfce4-session/FC-6 xfce4-session.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111935.kABJZYJ8021168@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21148

Modified Files:
	xfce4-session.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-6/xfce4-session.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-session.spec	6 Oct 2006 06:06:11 -0000	1.12
+++ xfce4-session.spec	11 Nov 2006 19:35:04 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.3.99.1
-Release: 6%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-session-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-session-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= 4.3.99.1
@@ -113,6 +113,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-6
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:53:42 -0000	1.5
+++ sources	11 Nov 2006 19:35:04 -0000	1.6
@@ -1 +1 @@
-98c20381becc6fa84fae40be888b2ac7  xfce4-session-4.3.99.1.tar.bz2
+c2a4a306de2538a4425349587dccb7d9  xfce4-session-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:53:42 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:35:04 -0000	1.6
@@ -1 +1 @@
-xfce4-session-4.3.99.1.tar.bz2
+xfce4-session-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:36:59 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:36:59 -0700
Subject: rpms/xfce-mcs-plugins/FC-6 xfce-mcs-plugins.spec, 1.11, 1.12 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111936.kABJaxYS021271@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21229

Modified Files:
	xfce-mcs-plugins.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/FC-6/xfce-mcs-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce-mcs-plugins.spec	6 Oct 2006 06:08:38 -0000	1.11
+++ xfce-mcs-plugins.spec	11 Nov 2006 19:36:29 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2
 Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -54,6 +54,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:56:40 -0000	1.5
+++ sources	11 Nov 2006 19:36:29 -0000	1.6
@@ -1 +1 @@
-98b0b149110056b93587c66852fc3194  xfce-mcs-plugins-4.3.99.1.tar.bz2
+6234425227e1145319bd75ef52fa97f5  xfce-mcs-plugins-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:56:40 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:36:29 -0000	1.6
@@ -1 +1 @@
-xfce-mcs-plugins-4.3.99.1.tar.bz2
+xfce-mcs-plugins-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:37:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 12:37:23 -0700
Subject: rpms/xfce4-genmon-plugin/FC-6 xfce4-genmon-plugin.spec,1.6,1.7
Message-ID: <200611111937.kABJbNjY021312@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
Rebuild for XFCE 4.3.99.2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-6/xfce4-genmon-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-genmon-plugin.spec	31 Oct 2006 02:01:51 -0000	1.6
+++ xfce4-genmon-plugin.spec	11 Nov 2006 19:36:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -41,6 +41,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  - 3.0-2
+- Rebuild for XFCE 4.3.99.2.
+
 * Thu Oct 31 2006 Christoph Wickert  - 3.0-1
 - Update to 3.0.
 - BR xfce4-dev-tools (bugzilla.xfce.org #2435) and gettext.



From fedora-extras-commits at redhat.com  Sat Nov 11 19:38:19 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:38:19 -0700
Subject: rpms/xfce-utils/FC-6 xfce-utils.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111938.kABJcJhY021387@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21359

Modified Files:
	xfce-utils.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-6/xfce-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce-utils.spec	6 Oct 2006 06:16:57 -0000	1.12
+++ xfce-utils.spec	11 Nov 2006 19:37:49 -0000	1.13
@@ -2,11 +2,11 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-utils-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2
 Source1: xfce4.desktop
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -81,6 +81,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-5
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:00:52 -0000	1.5
+++ sources	11 Nov 2006 19:37:49 -0000	1.6
@@ -1 +1 @@
-95448f642ee52cdb5ec20dc3c28dcc3b  xfce-utils-4.3.99.1.tar.bz2
+de6502dd93176b2a60e2e66bf052024f  xfce-utils-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:00:52 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:37:49 -0000	1.6
@@ -1 +1 @@
-xfce-utils-4.3.99.1.tar.bz2
+xfce-utils-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:39:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:39:47 -0700
Subject: rpms/xfdesktop/FC-6 xfdesktop.spec, 1.14, 1.15 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111939.kABJdlng021467@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21442

Modified Files:
	xfdesktop.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-6/xfdesktop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfdesktop.spec	6 Oct 2006 06:20:34 -0000	1.14
+++ xfdesktop.spec	11 Nov 2006 19:39:17 -0000	1.15
@@ -1,10 +1,10 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfdesktop-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2
 
 # Change default for Fedora
 Patch0: xfdesktop-image-4.3.90.1.patch
@@ -81,6 +81,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-5
 - Fix defattr
 - Add period to the end of description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:04:46 -0000	1.5
+++ sources	11 Nov 2006 19:39:17 -0000	1.6
@@ -1 +1 @@
-ad4dc2ceeafe10ff69196e287f07090a  xfdesktop-4.3.99.1.tar.bz2
+d44a81b9da9598425d9dd8dcd1cd5485  xfdesktop-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:04:46 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:39:17 -0000	1.6
@@ -1 +1 @@
-xfdesktop-4.3.99.1.tar.bz2
+xfdesktop-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:41:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:41:15 -0700
Subject: rpms/xfprint/FC-6 xfprint.spec, 1.15, 1.16 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111941.kABJfFve021548@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21526

Modified Files:
	xfprint.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/FC-6/xfprint.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfprint.spec	6 Oct 2006 06:31:05 -0000	1.15
+++ xfprint.spec	11 Nov 2006 19:40:45 -0000	1.16
@@ -1,10 +1,10 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD
 URL: http://www.xfce.org
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfprint-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfprint-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -56,13 +56,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -75,7 +75,7 @@
 %{_datadir}/applications/*
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/icons/hicolor/*/*/*
+#%{_datadir}/icons/hicolor/*/*/*
 
 %files devel
 %defattr(-, root, root)
@@ -84,6 +84,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+- Disable icons for now since they were not included in 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:07:51 -0000	1.5
+++ sources	11 Nov 2006 19:40:45 -0000	1.6
@@ -1 +1 @@
-13657288cd3ffaaa8d3701bcb3d7740a  xfprint-4.3.99.1.tar.bz2
+c2eb9dee0002e875b91e73557f7354a1  xfprint-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:07:51 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:40:45 -0000	1.6
@@ -1 +1 @@
-xfprint-4.3.99.1.tar.bz2
+xfprint-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:42:43 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:42:43 -0700
Subject: rpms/xfwm4/FC-6 xfwm4.spec, 1.16, 1.17 sources, 1.6, 1.7 .cvsignore,
	1.6, 1.7
Message-ID: <200611111942.kABJghYf021633@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21610

Modified Files:
	xfwm4.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-6/xfwm4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfwm4.spec	6 Oct 2006 06:33:27 -0000	1.16
+++ xfwm4.spec	11 Nov 2006 19:42:13 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-6
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 03:11:10 -0000	1.6
+++ sources	11 Nov 2006 19:42:13 -0000	1.7
@@ -1 +1 @@
-ab8fcfdf496f093bbe711a7d853deb33  xfwm4-4.3.99.1.tar.bz2
+3186d90ae752cce9687698c8bd6b26c3  xfwm4-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 03:11:10 -0000	1.6
+++ .cvsignore	11 Nov 2006 19:42:13 -0000	1.7
@@ -1 +1 @@
-xfwm4-4.3.99.1.tar.bz2
+xfwm4-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:44:31 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:44:31 -0700
Subject: rpms/xfwm4-themes/FC-6 xfwm4-themes.spec, 1.10, 1.11 sources, 1.5, 
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111944.kABJiVZu021710@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21690

Modified Files:
	xfwm4-themes.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/FC-6/xfwm4-themes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfwm4-themes.spec	6 Oct 2006 06:35:01 -0000	1.10
+++ xfwm4-themes.spec	11 Nov 2006 19:44:01 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-themes-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfwm4
@@ -35,6 +35,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:13:39 -0000	1.5
+++ sources	11 Nov 2006 19:44:01 -0000	1.6
@@ -1 +1 @@
-48f6171c4eed813770e211ccfad8aeaf  xfwm4-themes-4.3.99.1.tar.bz2
+a77e9e700de66d38b6c4850a18283fb1  xfwm4-themes-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:13:39 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:44:01 -0000	1.6
@@ -1 +1 @@
-xfwm4-themes-4.3.99.1.tar.bz2
+xfwm4-themes-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:45:56 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:45:56 -0700
Subject: rpms/orage/FC-6 orage.spec, 1.4, 1.5 sources, 1.2, 1.3 .cvsignore,
	1.2, 1.3
Message-ID: <200611111945.kABJjuwe021787@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21767

Modified Files:
	orage.spec sources .cvsignore 
Log Message:
Update 4.3.99.2



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/FC-6/orage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- orage.spec	15 Oct 2006 18:11:32 -0000	1.4
+++ orage.spec	11 Nov 2006 19:45:26 -0000	1.5
@@ -1,10 +1,10 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.3.99.1
-Release: 6%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/orage-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xfce-mcs-manager-devel
@@ -69,6 +69,9 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update 4.3.99.2
+
 * Sun Oct 15 2006 Kevin Fenzi  - 4.3.99.1-6
 - xfce4-datetime-plugin is back, remove obsoletes and provides
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orage/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 03:32:29 -0000	1.2
+++ sources	11 Nov 2006 19:45:26 -0000	1.3
@@ -1 +1 @@
-511dce3a93aa6e34973989e4441f23ec  orage-4.3.99.1.tar.bz2
+40607e4b116c4d298745ef0672826cd8  orage-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orage/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 03:32:29 -0000	1.2
+++ .cvsignore	11 Nov 2006 19:45:26 -0000	1.3
@@ -1 +1 @@
-orage-4.3.99.1.tar.bz2
+orage-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:47:43 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:47:43 -0700
Subject: rpms/mousepad/FC-6 mousepad.spec, 1.3, 1.4 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200611111947.kABJlhp1021863@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mousepad/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21843

Modified Files:
	mousepad.spec sources .cvsignore 
Log Message:
Update to 0.2.10



Index: mousepad.spec
===================================================================
RCS file: /cvs/extras/rpms/mousepad/FC-6/mousepad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mousepad.spec	6 Oct 2006 03:00:43 -0000	1.3
+++ mousepad.spec	11 Nov 2006 19:47:13 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           mousepad
-Version:        0.2.8
-Release:        2%{?dist}
+Version:        0.2.10
+Release:        1%{?dist}
 Summary:        Mousepad - A simple text editor for Xfce
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-4.3.90.2/src/mousepad-0.2.8.tar.bz2
+Source0:        http://www.xfce.org/archive/xfce-4.3.99.2/src/mousepad-0.2.10.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxfcegui4-devel
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/* 
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.2.10-1
+- Update to 0.2.10
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.2.8-2
 - Fix typo in description 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousepad/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 03:16:03 -0000	1.3
+++ sources	11 Nov 2006 19:47:13 -0000	1.4
@@ -1 +1 @@
-ad40c3b610123b7347094464a603e337  mousepad-0.2.8.tar.bz2
+c943c9408cbb35be73c45f75d945b34d  mousepad-0.2.10.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousepad/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 03:16:03 -0000	1.3
+++ .cvsignore	11 Nov 2006 19:47:13 -0000	1.4
@@ -1 +1 @@
-mousepad-0.2.8.tar.bz2
+mousepad-0.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 20:58:45 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Sat, 11 Nov 2006 13:58:45 -0700
Subject: rpms/libatomic_ops/FC-6 .cvsignore, 1.2, 1.3 libatomic_ops.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611112058.kABKwjr2025290@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/libatomic_ops/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25265

Modified Files:
	.cvsignore libatomic_ops.spec sources 
Log Message:
Update to version 1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2006 14:47:29 -0000	1.2
+++ .cvsignore	11 Nov 2006 20:58:15 -0000	1.3
@@ -1 +1 @@
-libatomic_ops-1.1.tar.gz
+libatomic_ops-1.2.tar.gz


Index: libatomic_ops.spec
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-6/libatomic_ops.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libatomic_ops.spec	9 Sep 2006 14:47:29 -0000	1.1
+++ libatomic_ops.spec	11 Nov 2006 20:58:15 -0000	1.2
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           libatomic_ops
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Atomic memory update operations
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Pierre Ossman  1.2-1
+- Update to 1.2.
+
 * Sat Sep  9 2006 Pierre Ossman  1.1-2
 - Fix naming of package.
 - General cleanup of spec file.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2006 14:47:29 -0000	1.2
+++ sources	11 Nov 2006 20:58:15 -0000	1.3
@@ -1 +1 @@
-359ed8a7c518eeb5f414102c7be24cf4  libatomic_ops-1.1.tar.gz
+1b65e48271c81e3fa2d7a9a69bab7504  libatomic_ops-1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 21:00:40 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Sat, 11 Nov 2006 14:00:40 -0700
Subject: rpms/libatomic_ops/FC-5 .cvsignore, 1.2, 1.3 libatomic_ops.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611112100.kABL0e8f025380@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/libatomic_ops/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25356

Modified Files:
	.cvsignore libatomic_ops.spec sources 
Log Message:
Update to version 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2006 14:47:29 -0000	1.2
+++ .cvsignore	11 Nov 2006 21:00:10 -0000	1.3
@@ -1 +1 @@
-libatomic_ops-1.1.tar.gz
+libatomic_ops-1.2.tar.gz


Index: libatomic_ops.spec
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-5/libatomic_ops.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libatomic_ops.spec	9 Sep 2006 14:47:29 -0000	1.1
+++ libatomic_ops.spec	11 Nov 2006 21:00:10 -0000	1.2
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           libatomic_ops
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Atomic memory update operations
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Pierre Ossman  1.2-1
+- Update to 1.2.
+
 * Sat Sep  9 2006 Pierre Ossman  1.1-2
 - Fix naming of package.
 - General cleanup of spec file.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2006 14:47:29 -0000	1.2
+++ sources	11 Nov 2006 21:00:10 -0000	1.3
@@ -1 +1 @@
-359ed8a7c518eeb5f414102c7be24cf4  libatomic_ops-1.1.tar.gz
+1b65e48271c81e3fa2d7a9a69bab7504  libatomic_ops-1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 21:56:01 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sat, 11 Nov 2006 14:56:01 -0700
Subject: rpms/sysprof-kmod/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sysprof-kmod.spec, 1.8, 1.9
Message-ID: <200611112156.kABLu1h9028606@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-serv28583

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Log Message:
Updated for new upstream release and new FC5 kernel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2006 16:27:26 -0000	1.2
+++ .cvsignore	11 Nov 2006 21:55:31 -0000	1.3
@@ -1 +1 @@
-sysprof-1.0.3.tar.gz
+sysprof-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2006 16:27:26 -0000	1.2
+++ sources	11 Nov 2006 21:55:31 -0000	1.3
@@ -1 +1 @@
-8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz
+cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sysprof-kmod.spec	16 Oct 2006 16:25:34 -0000	1.8
+++ sysprof-kmod.spec	11 Nov 2006 21:55:31 -0000	1.9
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2200.fc5}
+%{!?kversion: %define kversion 2.6.18-1.2239.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"
 
@@ -24,8 +24,8 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.3
-Release:        3.%(echo %{kverrel} | tr - _)
+Version:        1.0.5
+Release:        1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -98,6 +98,10 @@
 
 
 %changelog
+* Sat Nov 11 2006 Gianluca Sforna  1.0.5-1
+- rebuild for new kernel 2.6.18-1.2239.fc5
+- update to 1.0.5
+                                                    
 * Mon Oct 16 2006 Gianluca Sforna 
 - rebuild for new kernel 2.6.18-1.2200.fc5
 



From fedora-extras-commits at redhat.com  Sat Nov 11 22:19:29 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sat, 11 Nov 2006 15:19:29 -0700
Subject: rpms/sysprof/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sysprof.spec, 1.4, 1.5
Message-ID: <200611112219.kABMJTqL031998@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31978

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
version update to 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2006 14:40:56 -0000	1.2
+++ .cvsignore	11 Nov 2006 22:18:59 -0000	1.3
@@ -1 +1 @@
-sysprof-1.0.3.tar.gz
+sysprof-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2006 14:40:56 -0000	1.2
+++ sources	11 Nov 2006 22:18:59 -0000	1.3
@@ -1 +1 @@
-8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz
+cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof.spec	8 Oct 2006 21:31:17 -0000	1.4
+++ sysprof.spec	11 Nov 2006 22:18:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sysprof      
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Nov 11 2006 Gianluca Sforna  1.0.5-1
+- version update
+
 * Sun Oct 8 2006 Gianluca Sforna  1.0.3-6
 - better to use ExclusiveArch %{ix86} (thanks Ville)
 



From fedora-extras-commits at redhat.com  Sat Nov 11 22:32:28 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 15:32:28 -0700
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200611112232.kABMWSmQ032143@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32105/FC-6

Modified Files:
	gaim-gaym.spec sources 
Log Message:
update to rel 291



Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gaim-gaym.spec	4 Nov 2006 08:59:22 -0000	1.3
+++ gaim-gaym.spec	11 Nov 2006 22:31:58 -0000	1.4
@@ -7,11 +7,11 @@
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
 #   svn release: 290
-%define alphatag 290svn
+%define alphatag 291svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.4.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.5.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Chris Weyl  0.96-3.5.291svn
+- update to svn rel 291, tag fork-for-gaim-2
+
 * Sat Nov 04 2006 Chris Weyl  0.96-3.4.290svn
 - update to svn rel 290, tag fork-for-gaim-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Nov 2006 08:59:22 -0000	1.4
+++ sources	11 Nov 2006 22:31:58 -0000	1.5
@@ -1,2 +1,2 @@
-e21596c613f98a9d4661a1118757e35b  qrc-0.96-290svn.tar.gz
 9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz
+a54d56efc5021c996dacf2d100f5da51  qrc-0.96-291svn.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 22:32:29 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 15:32:29 -0700
Subject: rpms/gaim-gaym/devel .cvsignore, 1.5, 1.6 gaim-gaym.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611112232.kABMWT0C032148@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32105/devel

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
update to rel 291



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Nov 2006 08:58:16 -0000	1.5
+++ .cvsignore	11 Nov 2006 22:31:59 -0000	1.6
@@ -1,2 +1,3 @@
 qrc-0.96-290svn.tar.gz
 gaim-2.0.0beta4.tar.gz
+qrc-0.96-291svn.tar.gz


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gaim-gaym.spec	4 Nov 2006 08:58:16 -0000	1.4
+++ gaim-gaym.spec	11 Nov 2006 22:31:59 -0000	1.5
@@ -7,11 +7,11 @@
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
 #   svn release: 290
-%define alphatag 290svn
+%define alphatag 291svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.4.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.5.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Chris Weyl  0.96-3.5.291svn
+- update to svn rel 291, tag fork-for-gaim-2
+
 * Sat Nov 04 2006 Chris Weyl  0.96-3.4.290svn
 - update to svn rel 290, tag fork-for-gaim-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Nov 2006 08:58:16 -0000	1.5
+++ sources	11 Nov 2006 22:31:59 -0000	1.6
@@ -1,2 +1,2 @@
-e21596c613f98a9d4661a1118757e35b  qrc-0.96-290svn.tar.gz
 9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz
+a54d56efc5021c996dacf2d100f5da51  qrc-0.96-291svn.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 23:23:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:23:01 -0700
Subject: rpms/perl-Set-Scalar - New directory
Message-ID: <200611112323.kABNN1c7002903@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2899/perl-Set-Scalar

Log Message:
Directory /cvs/extras/rpms/perl-Set-Scalar added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 23:23:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:23:07 -0700
Subject: rpms/perl-Set-Scalar/devel - New directory
Message-ID: <200611112323.kABNN7xt002917@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2899/perl-Set-Scalar/devel

Log Message:
Directory /cvs/extras/rpms/perl-Set-Scalar/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 23:23:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:23:21 -0700
Subject: rpms/perl-Set-Scalar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611112323.kABNNLiR002949@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2942

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Set-Scalar


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Set-Scalar
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  Sat Nov 11 23:23:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:23:27 -0700
Subject: rpms/perl-Set-Scalar/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611112323.kABNNRLK002967@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2942/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Set-Scalar


--- 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  Sat Nov 11 23:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:24:30 -0700
Subject: rpms/perl-Set-Scalar import.log,1.1,1.2
Message-ID: <200611112324.kABNOUfU003039@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007

Modified Files:
	import.log 
Log Message:
auto-import perl-Set-Scalar-1.20-1 on branch devel from perl-Set-Scalar-1.20-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Scalar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 23:23:21 -0000	1.1
+++ import.log	11 Nov 2006 23:23:59 -0000	1.2
@@ -0,0 +1 @@
+perl-Set-Scalar-1_20-1:HEAD:perl-Set-Scalar-1.20-1.src.rpm:1163287432



From fedora-extras-commits at redhat.com  Sat Nov 11 23:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:24:30 -0700
Subject: rpms/perl-Set-Scalar/devel perl-Set-Scalar.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611112324.kABNOURF003044@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Set-Scalar.spec 
Log Message:
auto-import perl-Set-Scalar-1.20-1 on branch devel from perl-Set-Scalar-1.20-1.src.rpm


--- NEW FILE perl-Set-Scalar.spec ---
Name:           perl-Set-Scalar
Version:        1.20
Release:        1%{?dist}
Summary:        Basic set operations

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Set-Scalar/
Source0:        http://www.cpan.org/authors/id/J/JH/JHI/Set-Scalar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.


%prep
%setup -q -n Set-Scalar-%{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 -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorlib}/Set/
%{_mandir}/man3/*.3pm*


%changelog
* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.20-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Scalar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 23:23:26 -0000	1.1
+++ .cvsignore	11 Nov 2006 23:24:00 -0000	1.2
@@ -0,0 +1 @@
+Set-Scalar-1.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Scalar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 23:23:26 -0000	1.1
+++ sources	11 Nov 2006 23:24:00 -0000	1.2
@@ -0,0 +1 @@
+ebef2b178117a07541bacfdbf7c86112  Set-Scalar-1.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 23:27:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:27:35 -0700
Subject: owners owners.list,1.1927,1.1928
Message-ID: <200611112327.kABNRZgp003161@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3145

Modified Files:
	owners.list 
Log Message:
New package: perl-Set-Scalar (#215160)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1927
retrieving revision 1.1928
diff -u -r1.1927 -r1.1928
--- owners.list	11 Nov 2006 16:44:29 -0000	1.1927
+++ owners.list	11 Nov 2006 23:27:05 -0000	1.1928
@@ -1638,6 +1638,7 @@
 Fedora Extras|perl-SDL|SDL bindings for the Perl language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Infinite|Sets of intervals|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Set-Scalar|Basic set operations|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Smart-Comments|Comments that do more than just sit there|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Nov 11 23:29:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:29:34 -0700
Subject: rpms/xfce4-eyes-plugin - New directory
Message-ID: <200611112329.kABNTYd1003239@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3234/xfce4-eyes-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-eyes-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 23:29:41 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:29:41 -0700
Subject: rpms/xfce4-eyes-plugin/devel - New directory
Message-ID: <200611112329.kABNTfP6003260@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3234/xfce4-eyes-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-eyes-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 23:30:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:30:04 -0700
Subject: rpms/xfce4-eyes-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611112330.kABNU4nk003322@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3312

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-eyes-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-eyes-plugin
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  Sat Nov 11 23:30:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:30:10 -0700
Subject: rpms/xfce4-eyes-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611112330.kABNUASL003340@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3312/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-eyes-plugin


--- 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  Sat Nov 11 23:31:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:31:30 -0700
Subject: rpms/xfce4-eyes-plugin import.log,1.1,1.2
Message-ID: <200611112331.kABNVU8x003423@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3390

Modified Files:
	import.log 
Log Message:
auto-import xfce4-eyes-plugin-4.3.99.1-1.fc7 on branch devel from xfce4-eyes-plugin-4.3.99.1-1.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 23:30:04 -0000	1.1
+++ import.log	11 Nov 2006 23:31:00 -0000	1.2
@@ -0,0 +1 @@
+xfce4-eyes-plugin-4_3_99_1-1_fc7:HEAD:xfce4-eyes-plugin-4.3.99.1-1.fc7.src.rpm:1163287852



From fedora-extras-commits at redhat.com  Sat Nov 11 23:31:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:31:31 -0700
Subject: rpms/xfce4-eyes-plugin/devel xfce4-eyes-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611112331.kABNVVZW003427@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3390/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-eyes-plugin.spec 
Log Message:
auto-import xfce4-eyes-plugin-4.3.99.1-1.fc7 on branch devel from xfce4-eyes-plugin-4.3.99.1-1.fc7.src.rpm


--- NEW FILE xfce4-eyes-plugin.spec ---
Name:		xfce4-eyes-plugin
Version:	4.3.99.1
Release:	1%{?dist}
Summary:	Eyes for the Xfce panel

Group:		User Interface/Desktops
License:	GPL
URL:		http://goodies.xfce.org/
Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2
BuildRequires:	libxml2-devel, gettext, perl(XML::Parser)
Requires:	xfce4-panel >= 4.3.99.1

%description
A xfce4 panel plugin that adds eyes which watch your every step. Scary!

%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}


%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


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%doc AUTHORS COPYING ChangeLog README
%{_libexecdir}/xfce4/panel-plugins/%{name}
%{_datadir}/xfce4/panel-plugins/*.desktop
%{_datadir}/icons/hicolor/48x48/apps/xfce4-eyes.png
%{_datadir}/xfce4/eyes


%changelog
* Sat Sep 23 2006 Christoph Wickert  - 4.3.99.1-1
- Initial Fedora Extras version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 23:30:10 -0000	1.1
+++ .cvsignore	11 Nov 2006 23:31:01 -0000	1.2
@@ -0,0 +1 @@
+xfce4-eyes-plugin-4.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 23:30:10 -0000	1.1
+++ sources	11 Nov 2006 23:31:01 -0000	1.2
@@ -0,0 +1 @@
+dd5bbf3f31ca7d959ec808983a419062  xfce4-eyes-plugin-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 23:48:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:48:20 -0700
Subject: rpms/perl-Cairo/devel .cvsignore, 1.8, 1.9 perl-Cairo.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200611112348.kABNmKlh003605@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3579

Modified Files:
	.cvsignore perl-Cairo.spec sources 
Log Message:
Update to 1.021.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Nov 2006 15:38:23 -0000	1.8
+++ .cvsignore	11 Nov 2006 23:47:50 -0000	1.9
@@ -1 +1 @@
-Cairo-1.02.tar.gz
+Cairo-1.021.tar.gz


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/perl-Cairo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Cairo.spec	11 Nov 2006 15:38:23 -0000	1.8
+++ perl-Cairo.spec	11 Nov 2006 23:47:50 -0000	1.9
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Cairo
-Version:        1.02
+Version:        1.021
 Release:        1%{?dist}
 Summary:        Perl interface to the cairo library
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.021-1
+- Update to 1.021.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 1.02-1
 - Update to 1.02.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Nov 2006 15:38:23 -0000	1.8
+++ sources	11 Nov 2006 23:47:50 -0000	1.9
@@ -1 +1 @@
-bf1a8443310aa580f7566b2024e55987  Cairo-1.02.tar.gz
+72696240a9ba97694209d0a0c7367b57  Cairo-1.021.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 00:06:45 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 17:06:45 -0700
Subject: rpms/perl-Perl-Critic/devel perl-Perl-Critic.spec,1.2,1.3
Message-ID: <200611120006.kAC06jTE006694@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-serv6676

Modified Files:
	perl-Perl-Critic.spec 
Log Message:
Note about Author tests


Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Perl-Critic.spec	11 Nov 2006 15:30:39 -0000	1.2
+++ perl-Perl-Critic.spec	12 Nov 2006 00:06:13 -0000	1.3
@@ -53,6 +53,8 @@
 
 
 %check
+# Author tests would require: Test::Kwalitee, Test::Spelling, File::Which, and aspell
+# TEST_AUTHOR=1 ./Build test
 ./Build test
 
 



From fedora-extras-commits at redhat.com  Sun Nov 12 00:18:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 17:18:52 -0700
Subject: rpms/perl-Test-Perl-Critic/devel .cvsignore, 1.2,
	1.3 perl-Test-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611120018.kAC0IqhE006971@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Perl-Critic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6943

Modified Files:
	.cvsignore perl-Test-Perl-Critic.spec sources 
Log Message:
Update to 0.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:31:10 -0000	1.2
+++ .cvsignore	12 Nov 2006 00:18:22 -0000	1.3
@@ -1 +1 @@
-Test-Perl-Critic-0.07.tar.gz
+Test-Perl-Critic-0.08.tar.gz


Index: perl-Test-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/devel/perl-Test-Perl-Critic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Perl-Critic.spec	26 Sep 2006 09:31:10 -0000	1.1
+++ perl-Test-Perl-Critic.spec	12 Nov 2006 00:18:22 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Perl-Critic
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Use Perl::Critic in test programs
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Perl::Critic)
+BuildRequires:  perl(Perl::Critic) >= 0.21
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jose Pedro Oliveira  - 0.08-1
+- Update to 0.08.
+
 * Sat Sep 23 2006 Jose Pedro Oliveira  - 0.07-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:31:10 -0000	1.2
+++ sources	12 Nov 2006 00:18:22 -0000	1.3
@@ -1 +1 @@
-91c1dc234b4c6ec1f06300085f0559cf  Test-Perl-Critic-0.07.tar.gz
+358946b1ca7bca56ea8b6ce77bdd4033  Test-Perl-Critic-0.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 01:05:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 18:05:31 -0700
Subject: owners owners.list,1.1928,1.1929
Message-ID: <200611120105.kAC15VfY010139@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10123

Modified Files:
	owners.list 
Log Message:
add xfce-eyes-plugin (#215158)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1928
retrieving revision 1.1929
diff -u -r1.1928 -r1.1929
--- owners.list	11 Nov 2006 23:27:05 -0000	1.1928
+++ owners.list	12 Nov 2006 01:04:57 -0000	1.1929
@@ -2410,6 +2410,7 @@
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-dev-tools|Xfce developer tools|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-eyes-plugin|Eyes for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 01:12:56 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sat, 11 Nov 2006 18:12:56 -0700
Subject: rpms/monotone/FC-5 .cvsignore, 1.10, 1.11 monotone.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <200611120112.kAC1Cuje010260@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10240

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
New upstream version 0.31


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Oct 2006 18:38:11 -0000	1.10
+++ .cvsignore	12 Nov 2006 01:12:26 -0000	1.11
@@ -1 +1 @@
-monotone-0.30.tar.gz
+monotone-0.31.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- monotone.spec	11 Oct 2006 19:54:19 -0000	1.18
+++ monotone.spec	12 Nov 2006 01:12:26 -0000	1.19
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.30
+Version: 0.31
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Roland McGrath  - 0.31-1
+- Updated for 0.31 release.
+
 * Tue Oct 10 2006 Roland McGrath  - 0.30-1
 - Updated for 0.30 release.
 - Fix service script to work around buggy init.d/functions. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 18:38:11 -0000	1.10
+++ sources	12 Nov 2006 01:12:26 -0000	1.11
@@ -1 +1 @@
-94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz
+5a5feb8d053a5993ab516a1186bb5883  monotone-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 03:14:36 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sat, 11 Nov 2006 20:14:36 -0700
Subject: rpms/monotone/devel .cvsignore, 1.10, 1.11 monotone.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <200611120314.kAC3Ead4016891@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16865

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
New upstream version 0.31


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Oct 2006 19:33:15 -0000	1.10
+++ .cvsignore	12 Nov 2006 03:14:05 -0000	1.11
@@ -1 +1 @@
-monotone-0.30.tar.gz
+monotone-0.31.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- monotone.spec	11 Oct 2006 19:54:20 -0000	1.18
+++ monotone.spec	12 Nov 2006 03:14:05 -0000	1.19
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.30
+Version: 0.31
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Roland McGrath  - 0.31-1
+- Updated for 0.31 release.
+
 * Tue Oct 10 2006 Roland McGrath  - 0.30-1
 - Updated for 0.30 release.
 - Fix service script to work around buggy init.d/functions. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 19:33:15 -0000	1.10
+++ sources	12 Nov 2006 03:14:05 -0000	1.11
@@ -1 +1 @@
-94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz
+5a5feb8d053a5993ab516a1186bb5883  monotone-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 03:16:17 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sat, 11 Nov 2006 20:16:17 -0700
Subject: rpms/monotone/FC-6 .cvsignore, 1.10, 1.11 monotone.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <200611120316.kAC3GHAa017002@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16982

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
New upstream version 0.31


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Oct 2006 19:33:15 -0000	1.10
+++ .cvsignore	12 Nov 2006 03:15:47 -0000	1.11
@@ -1 +1 @@
-monotone-0.30.tar.gz
+monotone-0.31.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-6/monotone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- monotone.spec	11 Oct 2006 19:54:20 -0000	1.18
+++ monotone.spec	12 Nov 2006 03:15:47 -0000	1.19
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.30
+Version: 0.31
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Roland McGrath  - 0.31-1
+- Updated for 0.31 release.
+
 * Tue Oct 10 2006 Roland McGrath  - 0.30-1
 - Updated for 0.30 release.
 - Fix service script to work around buggy init.d/functions. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 19:33:15 -0000	1.10
+++ sources	12 Nov 2006 03:15:47 -0000	1.11
@@ -1 +1 @@
-94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz
+5a5feb8d053a5993ab516a1186bb5883  monotone-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 03:42:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 20:42:35 -0700
Subject: rpms/xfce4-eyes-plugin/devel xfce4-eyes-plugin.spec,1.1,1.2
Message-ID: <200611120342.kAC3gZDm017278@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17262

Modified Files:
	xfce4-eyes-plugin.spec 
Log Message:
add %%defattr


Index: xfce4-eyes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/devel/xfce4-eyes-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-eyes-plugin.spec	11 Nov 2006 23:31:01 -0000	1.1
+++ xfce4-eyes-plugin.spec	12 Nov 2006 03:42:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-eyes-plugin
 Version:	4.3.99.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Eyes for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -49,6 +49,7 @@
 
 
 %files -f %{name}.lang
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
@@ -57,5 +58,8 @@
 
 
 %changelog
+* Sun Nov 12 2006 Christoph Wickert  - 4.3.99.1-2
+- Add %%defattr.
+
 * Sat Sep 23 2006 Christoph Wickert  - 4.3.99.1-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Sun Nov 12 03:58:17 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 20:58:17 -0700
Subject: rpms/xfce4-eyes-plugin/devel xfce4-eyes-plugin.spec,1.2,1.3
Message-ID: <200611120358.kAC3wH1R017411@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17395

Modified Files:
	xfce4-eyes-plugin.spec 
Log Message:
cosmetical change in files section


Index: xfce4-eyes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/devel/xfce4-eyes-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-eyes-plugin.spec	12 Nov 2006 03:42:04 -0000	1.2
+++ xfce4-eyes-plugin.spec	12 Nov 2006 03:57:47 -0000	1.3
@@ -54,7 +54,7 @@
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-eyes.png
-%{_datadir}/xfce4/eyes
+%{_datadir}/xfce4/eyes/
 
 
 %changelog



From fedora-extras-commits at redhat.com  Sun Nov 12 04:15:57 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 11 Nov 2006 21:15:57 -0700
Subject: rpms/gdesklets/devel gdesklets.spec,1.22,1.23
Message-ID: <200611120415.kAC4FvAQ020522@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20506

Modified Files:
	gdesklets.spec 
Log Message:
updated spec


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gdesklets.spec	8 Nov 2006 06:09:07 -0000	1.22
+++ gdesklets.spec	12 Nov 2006 04:15:26 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		gdesklets
 Version:	0.35.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An interactive Imlib2 console for the X Window system
 
 Group:		User Interface/Desktops
@@ -13,7 +13,7 @@
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires:  libXau-devel, libXdmcp-devel, intltool
+BuildRequires:  libXau-devel, libXdmcp-devel, intltool, gnome-python2-devel
 BuildRequires:  libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-3
+- Added gnome-python2-devel for buildrequires (rawhide)
+
 * Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-2
 - Removed gnome-python for buildrequires
 



From fedora-extras-commits at redhat.com  Sun Nov 12 05:01:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:35 -0700
Subject: rpms/eiciel - New directory
Message-ID: <200611120501.kAC51Zpw023428@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23411/eiciel

Log Message:
Directory /cvs/extras/rpms/eiciel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 05:01:41 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:41 -0700
Subject: rpms/eiciel/devel - New directory
Message-ID: <200611120501.kAC51fm4023793@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23411/eiciel/devel

Log Message:
Directory /cvs/extras/rpms/eiciel/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 05:01:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:48 -0700
Subject: owners owners.list,1.1929,1.1930
Message-ID: <200611120501.kAC51mES023803@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21528

Modified Files:
	owners.list 
Log Message:
add eiciel


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1929
retrieving revision 1.1930
diff -u -r1.1929 -r1.1930
--- owners.list	12 Nov 2006 01:04:57 -0000	1.1929
+++ owners.list	12 Nov 2006 05:01:18 -0000	1.1930
@@ -341,6 +341,7 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|efont-unicode-bdf|Unicode font by Electronic Font Open Laboratory|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|eggdrop|The world's most popular Open Source IRC bot|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
+Fedora Extras|eiciel|Graphical access control list (ACL) editor|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ejabberd|A distributed, fault-tolerant Jabber/XMPP server|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|ekg|Experimental Gadu-Gadu client|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 05:01:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:51 -0700
Subject: rpms/eiciel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611120501.kAC51pvG023819@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23813

Added Files:
	Makefile import.log 
Log Message:
Setup of module eiciel


--- NEW FILE Makefile ---
# Top level Makefile for module eiciel
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 Nov 12 05:01:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:58 -0700
Subject: rpms/eiciel/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611120501.kAC51wSm023832@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23813/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eiciel


--- 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 Nov 12 05:02:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:02:56 -0700
Subject: rpms/eiciel/devel eiciel-desktop.patch, NONE, 1.1 eiciel.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611120502.kAC52uq9023913@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eiciel-desktop.patch eiciel.spec 
Log Message:
auto-import eiciel-0.9.2-7.fc6 on branch devel from eiciel-0.9.2-7.fc6.src.rpm

eiciel-desktop.patch:

--- NEW FILE eiciel-desktop.patch ---
--- src/eiciel.desktop     2006-07-09 18:01:00.000000000 +0100
+++ src/eiciel.desktop     2006-07-09 18:04:33.000000000 +0100
@@ -7,9 +7,10 @@
 Comment=View or change ACL and User Extended Attributes on files and directories
 Comment[ca]=Visualitza o canvia la llista de control d'acc??s i els atributs d'usuari en fitxers i directoris
 Comment[es]=Visualiza o cambia la lista de control de acceso y los atributos de usuario en ficheros y directorios
-Exec=/home/roger/eiciel/TEST/bin/eiciel
-Icon=/home/roger/eiciel/TEST/share/eiciel/img/icona_eiciel_24.png
+Exec=/usr/bin/eiciel
+Icon=/usr/share/eiciel/img/icona_eiciel_24.png
 Terminal=false
 Type=Application
 Categories=Application;Accessories;GNOME;System;
-Version=0.9.1
+Version=0.9.5
+# The version refers to desktop file specification *not* eicel version



--- NEW FILE eiciel.spec ---
Name:           eiciel
Version:        0.9.2
Release:        7%{?dist}
Summary:        Graphical access control list (ACL) editor
Group:          Applications/System
License:        GPL
URL:            http://rofi.pinchito.com/eiciel
Source0:        http://rofi.pinchito.com/eiciel/download/%{name}-%{version}.tar.bz2
Patch0:         eiciel-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnomeui-devel gtkmm24-devel libacl-devel nautilus-devel
BuildRequires:  desktop-file-utils

%description
Graphical editor for access control lists (ACL) 
and extended attributes (XATTR), either as an 
extension within Nautilus, or as a standalone utility.


%prep
%setup -q
%patch0

# this really should not have been packaged with the source tarball
rm doc/C/eiciel.xml

%build
%configure --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%find_lang %{name}
desktop-file-install --vendor fedora                        \
        --dir %{buildroot}%{_datadir}/applications          \
        --add-category X-Fedora                             \
        --delete-original                                   \
        %{buildroot}%{_datadir}/applications/%{name}.desktop

# less is more
cd %{buildroot}%{_datadir}/%{name}/doc/C/figures
for img in `ls *.png` ; do
    if [ -e ../../../img/$img ] ; then
        rm $img
        ln -s ../../../img/$img
    fi
done

%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*%{name}*
%{_mandir}/man1/%{name}*
%{_libdir}/nautilus/extensions-1.0/lib%{name}*
%exclude %{_libdir}/nautilus/extensions-1.0/*.a
%exclude %{_libdir}/nautilus/extensions-1.0/*.la


%changelog
* Sat Nov 11 2006 Chris Weyl  0.9.2-7
- rm doc/C/eiciel.xml during prep; otherwise it isn't rebuilt properly

* Wed Nov 08 2006 Chris Weyl  0.9.2-6
- minor tweaks, resubmitted

* Sun Jul 09 2006 Andy Burns  0.9.2-5
- Drop excludes for .debug files
- Tidy up summary and description
- Make includes more precise
- Use .desktop file now accepted upstream (but with patch)
- Use existing .png file as icon instead of copy

* Mon Jul 03 2006 Andy Burns  0.9.2-4
- Change .debug excludes to work on x86_64 too

* Mon Jul 03 2006 Andy Burns  0.9.2-3
- Exclude *.debug files
- Remove macros from changelog section to shut up rpmlint
- Reduced file permissions on .spec and .desktop files

* Mon Jul 03 2006 Andy Burns  0.9.2-2
- Claim files under libdir more precisely
- Add nautilus to buildreqs

* Mon Jul 03 2006 Andy Burns  0.9.2-1
- Update source to 0.9.2
- Drop gcc4.1 patch accepted upstream

* Sat Feb 04 2006 Andy Burns  0.9-8
- Use __mkdir and __install macros

* Fri Feb 03 2006 Andy Burns  0.9-7
- Make version key in .desktop refer to fd.o spec ver, not eicel ver
- Actually install the .destop file
- Provide icon for .desktop file in /usr/share/pixmaps
- Replace all RPM_BUILD_ROOT macros with buildroot

* Fri Feb 03 2006 Andy Burns  0.9-6
- All docs are in doc
- All Requires were detected automatically
- Omit .la as well as .a
- Reset file permissions on source files
- Use find_lang for locale files
- Added .desktop file
- Change instances of eiciel to name macro

* Fri Feb 03 2006 Andy Burns  0.9-5
- Exclude .a library which is unlikely to be used
- Use more fine-grained file specs, particularly for man/doc files

* Thu Feb 02 2006 Andy Burns  0.9-4
- Attempt to fix rpmlint ownership warnings about man1 files/dirs

* Thu Feb 02 2006 Andy Burns  0.9-3
- Changed BuildRequires/Requires

* Thu Feb 02 2006 Andy Burns  0.9-2
- Added patch for gcc4.1

* Thu Feb 02 2006 Andy Burns  0.9-1
- Initial RPM build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 05:01:58 -0000	1.1
+++ .cvsignore	12 Nov 2006 05:02:25 -0000	1.2
@@ -0,0 +1 @@
+eiciel-0.9.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 05:01:58 -0000	1.1
+++ sources	12 Nov 2006 05:02:25 -0000	1.2
@@ -0,0 +1 @@
+72576cce092ff36a4fef0311bdc0dede  eiciel-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 05:02:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:02:55 -0700
Subject: rpms/eiciel import.log,1.1,1.2
Message-ID: <200611120502.kAC52s6T023911@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876

Modified Files:
	import.log 
Log Message:
auto-import eiciel-0.9.2-7.fc6 on branch devel from eiciel-0.9.2-7.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/eiciel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 05:01:51 -0000	1.1
+++ import.log	12 Nov 2006 05:02:24 -0000	1.2
@@ -0,0 +1 @@
+eiciel-0_9_2-7_fc6:HEAD:eiciel-0.9.2-7.fc6.src.rpm:1163307744



From fedora-extras-commits at redhat.com  Sun Nov 12 05:05:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:05:11 -0700
Subject: rpms/eiciel/devel eiciel.spec,1.1,1.2
Message-ID: <200611120505.kAC55BFM023969@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23953

Modified Files:
	eiciel.spec 
Log Message:
release bump


Index: eiciel.spec
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/eiciel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eiciel.spec	12 Nov 2006 05:02:25 -0000	1.1
+++ eiciel.spec	12 Nov 2006 05:04:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           eiciel
 Version:        0.9.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Graphical access control list (ACL) editor
 Group:          Applications/System
 License:        GPL
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Chris Weyl  0.9.2-8
+- bump
+
 * Sat Nov 11 2006 Chris Weyl  0.9.2-7
 - rm doc/C/eiciel.xml during prep; otherwise it isn't rebuilt properly
 



From fedora-extras-commits at redhat.com  Sun Nov 12 05:13:15 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 22:13:15 -0700
Subject: rpms/ochusha/devel .cvsignore, 1.3, 1.4 ochusha.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611120513.kAC5DFCt024077@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24047

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.1.cvs061112
- Update to 0.5.99.63.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Nov 2006 16:08:40 -0000	1.3
+++ .cvsignore	12 Nov 2006 05:12:44 -0000	1.4
@@ -1 +1 @@
-ochusha-0.5.99.63.2-cvs061111.tar.bz2
+ochusha-0.5.99.63.3-cvs061112.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ochusha.spec	11 Nov 2006 16:08:40 -0000	1.2
+++ ochusha.spec	12 Nov 2006 05:12:44 -0000	1.3
@@ -1,8 +1,8 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.2
-%define              strtag          cvs061111
+%define              main_ver        0.5.99.63.3
+%define              strtag          cvs061112
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -157,8 +157,8 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sat Nov 11 2006 Mamoru Tasaka  0.5.99.63.2-0.1.cvs061111
-- Update to 0.5.99.63.2
+* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.1.cvs061112
+- Update to 0.5.99.63.3
 
 * Fri Nov 03 2006  0.5.99.62-1
 - Version down.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Nov 2006 16:08:40 -0000	1.3
+++ sources	12 Nov 2006 05:12:44 -0000	1.4
@@ -1 +1 @@
-cf91062cc155ef2fef14e8ec0b8d1b8b  ochusha-0.5.99.63.2-cvs061111.tar.bz2
+7fd7b7e7fe1ff5911a5b536ab557d573  ochusha-0.5.99.63.3-cvs061112.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 05:23:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:23:58 -0700
Subject: comps comps-fe5.xml.in, 1.195, 1.196 comps-fe6.xml.in, 1.219,
	1.220 comps-fe7.xml.in, 1.17, 1.18
Message-ID: <200611120523.kAC5NwZc024255@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24235

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add eiciel



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- comps-fe5.xml.in	11 Nov 2006 15:32:47 -0000	1.195
+++ comps-fe5.xml.in	12 Nov 2006 05:23:27 -0000	1.196
@@ -850,6 +850,7 @@
       dkms
       ebtables
       ed2k_hash
+      eiciel
       enca
       environment-modules
       epylog


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- comps-fe6.xml.in	11 Nov 2006 15:32:47 -0000	1.219
+++ comps-fe6.xml.in	12 Nov 2006 05:23:27 -0000	1.220
@@ -908,6 +908,7 @@
       dkms
       ebtables
       ed2k_hash
+      eiciel
       emelfm2
       enca
       environment-modules


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- comps-fe7.xml.in	11 Nov 2006 15:32:47 -0000	1.17
+++ comps-fe7.xml.in	12 Nov 2006 05:23:27 -0000	1.18
@@ -908,6 +908,7 @@
       dkms
       ebtables
       ed2k_hash
+      eiciel
       emelfm2
       enca
       environment-modules



From fedora-extras-commits at redhat.com  Sun Nov 12 05:30:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 22:30:47 -0700
Subject: rpms/ochusha/devel ochusha-0.5.99.63.3-fix-ppc-typo.patch, NONE,
	1.1 ochusha.spec, 1.3, 1.4
Message-ID: <200611120530.kAC5Ul71024315@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24296

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-0.5.99.63.3-fix-ppc-typo.patch 
Log Message:
* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.1.cvs061112
- Update to 0.5.99.63.3


ochusha-0.5.99.63.3-fix-ppc-typo.patch:

--- NEW FILE ochusha-0.5.99.63.3-fix-ppc-typo.patch ---
--- ochusha-build/libtscore/virtual_machine.cc.typo	2006-11-11 06:46:44.000000000 +0900
+++ ochusha-build/libtscore/virtual_machine.cc	2006-11-12 14:26:43.000000000 +0900
@@ -365,7 +365,6 @@
 {
 #if defined(WORDS_BIGENDIAN) || SIZEOF_INT != 4
   const unsigned char *upc = (const unsigned char *)pc;
-  long value = ;
   return (long)upc[3] << 24 | (long)upc[2] << 16
     | (long)upc[1] << 8 | (long)upc[0];
 #else


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ochusha.spec	12 Nov 2006 05:12:44 -0000	1.3
+++ ochusha.spec	12 Nov 2006 05:30:16 -0000	1.4
@@ -4,7 +4,7 @@
 %define              main_ver        0.5.99.63.3
 %define              strtag          cvs061112
 
-%define              vendor_rel      1
+%define              vendor_rel      2
 %define              pre_release     1
 
 %if %{pre_release}
@@ -24,6 +24,7 @@
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
 %endif
 Patch0:              ochusha-0.5.99.63.2-call-g_thread_init-once.patch
+Patch1:              ochusha-0.5.99.63.3-fix-ppc-typo.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@
 %endif
 
 %patch0 -p1 -b .g_thread_init
+%patch1 -p1 -b .ppc_typo
 
 # change desktop entry to use png file in 
 # %{icondir}
@@ -157,7 +159,7 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.1.cvs061112
+* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061112
 - Update to 0.5.99.63.3
 
 * Fri Nov 03 2006  0.5.99.62-1



From fedora-extras-commits at redhat.com  Sun Nov 12 08:45:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:45:01 -0700
Subject: rpms/vdr-osdteletext - New directory
Message-ID: <200611120845.kAC8j1Fb001659@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1655/vdr-osdteletext

Log Message:
Directory /cvs/extras/rpms/vdr-osdteletext added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 08:45:07 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:45:07 -0700
Subject: rpms/vdr-osdteletext/devel - New directory
Message-ID: <200611120845.kAC8j7U5001675@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1655/vdr-osdteletext/devel

Log Message:
Directory /cvs/extras/rpms/vdr-osdteletext/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 08:45:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:45:26 -0700
Subject: rpms/vdr-osdteletext Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611120845.kAC8jQLh001707@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1701

Added Files:
	Makefile import.log 
Log Message:
Setup of module vdr-osdteletext


--- NEW FILE Makefile ---
# Top level Makefile for module vdr-osdteletext
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 Nov 12 08:45:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:45:32 -0700
Subject: rpms/vdr-osdteletext/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611120845.kAC8jWFa001724@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1701/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdr-osdteletext


--- 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 Nov 12 08:46:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:46:53 -0700
Subject: rpms/vdr-osdteletext import.log,1.1,1.2
Message-ID: <200611120846.kAC8krAg001814@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1778

Modified Files:
	import.log 
Log Message:
auto-import vdr-osdteletext-0.5.1-20 on branch devel from vdr-osdteletext-0.5.1-20.src.rpm
Initial import (#190344).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vdr-osdteletext/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 08:45:26 -0000	1.1
+++ import.log	12 Nov 2006 08:46:23 -0000	1.2
@@ -0,0 +1 @@
+vdr-osdteletext-0_5_1-20:HEAD:vdr-osdteletext-0.5.1-20.src.rpm:1163321174



From fedora-extras-commits at redhat.com  Sun Nov 12 08:46:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:46:54 -0700
Subject: rpms/vdr-osdteletext/devel vdr-osdteletext-0.5.1-i18n.patch, NONE, 
	1.1 vdr-osdteletext.conf, NONE, 1.1 vdr-osdteletext.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611120846.kAC8kssL001816@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1778/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vdr-osdteletext-0.5.1-i18n.patch vdr-osdteletext.conf 
	vdr-osdteletext.spec 
Log Message:
auto-import vdr-osdteletext-0.5.1-20 on branch devel from vdr-osdteletext-0.5.1-20.src.rpm
Initial import (#190344).

vdr-osdteletext-0.5.1-i18n.patch:

--- NEW FILE vdr-osdteletext-0.5.1-i18n.patch ---
--- osdteletext.c~	2005-08-16 17:19:25.000000000 +0300
+++ osdteletext.c	2006-01-22 22:43:09.000000000 +0200
@@ -208,12 +208,12 @@
       { "Action_kGreen",    tr("Green key") },
       { "Action_kYellow",   tr("Yellow key") },
       { "Action_kBlue",     tr("Blue key") },
-      { "Action_kPlay",     tr(cKey::ToString( kPlay)) },
-      //{ "Action_kPause",    tr(cKey::ToString( kPause)) },
-      { "Action_kStop",     tr(cKey::ToString( kStop)) },
-      //{ "Action_kRecord",   tr(cKey::ToString( kRecord)) },
-      { "Action_kFastFwd",  tr(cKey::ToString( kFastFwd)) },
-      { "Action_kFastRew",  tr(cKey::ToString( kFastRew)) }
+      { "Action_kPlay",     tr("Key$Play") },
+      //{ "Action_kPause",    tr("Key$Pause") },
+      { "Action_kStop",     tr("Key$Stop") },
+      //{ "Action_kRecord",   tr("Key$Record") },
+      { "Action_kFastFwd",  tr("Key$FastFwd") },
+      { "Action_kFastRew",  tr("Key$FastRew") }
    };
    
    cTeletextSetupPage::actionKeyNames = st_actionKeyNames;


--- NEW FILE vdr-osdteletext.conf ---
# Configuration snippet for vdr-osdteletext                          -*- sh -*-
#
# Add command line options to pass to the osdteletext plugin to PLUGIN_OPTIONS.
# See /usr/share/doc/vdr-osdteletext-*/README for info about available options.

PLUGIN_OPTIONS="-d /var/cache/vdr/osdteletext"


--- NEW FILE vdr-osdteletext.spec ---
%define pname     osdteletext
%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%define cachedir  %(vdr-config --cachedir   2>/dev/null || echo ERROR)
%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)

Name:           vdr-%{pname}
Version:        0.5.1
Release:        20%{?dist}
Summary:        OSD teletext plugin for VDR

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.wiesweg-online.de/linux/linux.html
Source0:        http://www.wiesweg-online.de/linux/vdr/%{name}-%{version}.tgz
Source1:        %{name}.conf
Patch0:         %{name}-0.5.1-i18n.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel >= 1.3.47
Requires:       vdr(abi) = %{apiver}

%description
The OSD teletext plugin displays teletext directly on VDR's on-screen
display, with sound and video from the current channel playing in the
background.


%prep
%setup -q -n %{pname}-%{version}
%patch0
for f in HISTORY README.DE ; do
  iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
sed -i -e s/VDRVERSION/APIVERSION/g Makefile


%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr libvdr-%{pname}.so


%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -dm 755 $RPM_BUILD_ROOT%{cachedir}/osdteletext
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d
sed -e 's|/var/cache/vdr/|%{cachedir}/|' < %{SOURCE1} \
  > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/osdteletext.conf
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/*.conf


%clean
rm -rf $RPM_BUILD_ROOT


%preun
if [ $1 -eq 0 ] ; then
  rm -rf %{cachedir}/osdteletext/*
fi


%files
%defattr(-,root,root,-)
%doc COPYING HISTORY README*
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%attr(-,%{vdr_user},root) %{cachedir}/osdteletext/


%changelog
* Sun Apr 30 2006 Ville Skytt??  - 0.5.1-20
- Rebuild for VDR 1.4.0.

* Mon Apr 17 2006 Ville Skytt??  - 0.5.1-19
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.

* Sun Mar 26 2006 Ville Skytt??  - 0.5.1-18
- Rebuild for VDR 1.3.45.

* Sat Mar 18 2006 Thorsten Leemhuis  - 0.5.1-17
- drop 0.lvn from release

* Wed Mar  1 2006 Ville Skytt??  - 0.5.1-0.lvn.17
- Rebuild for VDR 1.3.44.

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Sun Feb 19 2006 Ville Skytt??  - 0.5.1-0.lvn.16
- Rebuild for VDR 1.3.43.

* Sun Feb  5 2006 Ville Skytt??  - 0.5.1-0.lvn.15
- Rebuild for VDR 1.3.42.

* Sun Jan 22 2006 Ville Skytt??  - 0.5.1-0.lvn.14
- Fix translations with VDR >= 1.3.38.
- Rebuild for VDR 1.3.40.

* Sun Jan 15 2006 Ville Skytt??  - 0.5.1-0.lvn.13
- Rebuild for VDR 1.3.39.

* Sun Jan  8 2006 Ville Skytt??  - 0.5.1-0.lvn.12
- Rebuild for VDR 1.3.38.

* Mon Nov 28 2005 Ville Skytt??  - 0.5.1-0.lvn.11
- Rebuild for VDR 1.3.37.

* Sun Nov  6 2005 Ville Skytt??  - 0.5.1-0.lvn.10
- Rebuild for VDR 1.3.36.

* Tue Nov  1 2005 Ville Skytt??  - 0.5.1-0.lvn.9
- Rebuild for VDR 1.3.35.

* Mon Oct  3 2005 Ville Skytt??  - 0.5.1-0.lvn.8
- Rebuild for VDR 1.3.34.

* Sun Sep 25 2005 Ville Skytt??  - 0.5.1-0.lvn.7
- Rebuild for VDR 1.3.33.

* Sun Sep 11 2005 Ville Skytt??  - 0.5.1-0.lvn.6
- Rebuild for VDR 1.3.32.

* Sun Aug 28 2005 Ville Skytt??  - 0.5.1-0.lvn.5
- Rebuild for VDR 1.3.31.

* Sun Aug 21 2005 Ville Skytt??  - 0.5.1-0.lvn.4
- Rebuild for VDR 1.3.30.

* Tue Aug 16 2005 Ville Skytt??  - 0.5.1-0.lvn.3
- Sync with re-re-released upstream 0.5.1 tarball, cache dir is now
  stabilized at %%{cachedir}/osdteletext.
- Try to avoid build system problems by not using %%expand.
- Honor "vdr-config --user".
- Improve description.

* Fri Aug 12 2005 Ville Skytt??  - 0.5.1-0.lvn.2
- Sync with re-released upstream 0.5.1 tarball.

* Thu Aug 11 2005 Ville Skytt??  - 0.5.1-0.lvn.1
- 0.5.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr-osdteletext/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 08:45:32 -0000	1.1
+++ .cvsignore	12 Nov 2006 08:46:24 -0000	1.2
@@ -0,0 +1 @@
+vdr-osdteletext-0.5.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr-osdteletext/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 08:45:32 -0000	1.1
+++ sources	12 Nov 2006 08:46:24 -0000	1.2
@@ -0,0 +1 @@
+52c219e38a089504071237209ad114cd  vdr-osdteletext-0.5.1.tgz



From fedora-extras-commits at redhat.com  Sun Nov 12 08:48:52 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:48:52 -0700
Subject: rpms/vdr-osdteletext/devel vdr-osdteletext.spec,1.1,1.2
Message-ID: <200611120848.kAC8mqTs001880@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1864

Modified Files:
	vdr-osdteletext.spec 
Log Message:
* Sun Nov 12 2006 Ville Skytt??  - 0.5.1-26
- First FE build.



Index: vdr-osdteletext.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr-osdteletext/devel/vdr-osdteletext.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-osdteletext.spec	12 Nov 2006 08:46:24 -0000	1.1
+++ vdr-osdteletext.spec	12 Nov 2006 08:48:22 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.5.1
-Release:        20%{?dist}
+Release:        26%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 Group:          Applications/Multimedia
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Ville Skytt??  - 0.5.1-26
+- First FE build.
+
 * Sun Apr 30 2006 Ville Skytt??  - 0.5.1-20
 - Rebuild for VDR 1.4.0.
 



From fedora-extras-commits at redhat.com  Sun Nov 12 08:54:30 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:54:30 -0700
Subject: owners owners.list,1.1930,1.1931
Message-ID: <200611120854.kAC8sUnD001993@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971

Modified Files:
	owners.list 
Log Message:
+vdr-osdteletext (#190344)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1930
retrieving revision 1.1931
diff -u -r1.1930 -r1.1931
--- owners.list	12 Nov 2006 05:01:18 -0000	1.1930
+++ owners.list	12 Nov 2006 08:53:59 -0000	1.1931
@@ -2323,6 +2323,7 @@
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 08:57:15 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 01:57:15 -0700
Subject: rpms/gperiodic import.log,1.7,1.8
Message-ID: <200611120857.kAC8vFoc002114@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2061

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-7 on branch devel from gperiodic-2.0.8-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	9 Nov 2006 18:56:11 -0000	1.7
+++ import.log	12 Nov 2006 08:56:44 -0000	1.8
@@ -4,3 +4,4 @@
 gperiodic-2_0_8-5:HEAD:gperiodic-2.0.8-5.src.rpm:1163056409
 gperiodic-2_0_8-5:FC-6:gperiodic-2.0.8-5.src.rpm:1163098476
 gperiodic-2_0_8-5:FC-5:gperiodic-2.0.8-5.src.rpm:1163098561
+gperiodic-2_0_8-7:HEAD:gperiodic-2.0.8-7.src.rpm:1163321794



From fedora-extras-commits at redhat.com  Sun Nov 12 08:57:15 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 01:57:15 -0700
Subject: rpms/gperiodic/devel gperiodic-bh.patch, NONE, 1.1 gperiodic.spec,
	1.5, 1.6
Message-ID: <200611120857.kAC8vFai002117@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2061/devel

Modified Files:
	gperiodic.spec 
Added Files:
	gperiodic-bh.patch 
Log Message:
auto-import gperiodic-2.0.8-7 on branch devel from gperiodic-2.0.8-7.src.rpm

gperiodic-bh.patch:

--- NEW FILE gperiodic-bh.patch ---
--- ./table_data.h	2003-10-10 09:44:45.000000000 +0200
+++ ./table_data.h	2006-11-12 09:45:05.000000000 +0100
@@ -265,7 +265,7 @@ struct table_entry table [ELEMENTNUM+1] 
   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d2 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d3 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d4 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d6 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d7 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d9 7s1", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gperiodic.spec	9 Nov 2006 07:13:40 -0000	1.5
+++ gperiodic.spec	12 Nov 2006 08:56:45 -0000	1.6
@@ -1,11 +1,12 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
+Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
@@ -58,6 +60,12 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-7
+- Correct information for "Bh", Bohrium
+
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-6
+- Rebuild for distag problem
+
 * Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
 - Modify URL in package descrpition and source
 



From fedora-extras-commits at redhat.com  Sun Nov 12 08:57:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:57:45 -0700
Subject: rpms/vdr-subtitles - New directory
Message-ID: <200611120857.kAC8vjj5002169@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2165/vdr-subtitles

Log Message:
Directory /cvs/extras/rpms/vdr-subtitles added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 08:57:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:57:51 -0700
Subject: rpms/vdr-subtitles/devel - New directory
Message-ID: <200611120857.kAC8vpun002183@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2165/vdr-subtitles/devel

Log Message:
Directory /cvs/extras/rpms/vdr-subtitles/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 08:58:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:58:11 -0700
Subject: rpms/vdr-subtitles Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611120858.kAC8wBfX002231@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225

Added Files:
	Makefile import.log 
Log Message:
Setup of module vdr-subtitles


--- NEW FILE Makefile ---
# Top level Makefile for module vdr-subtitles
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 Nov 12 08:58:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:58:17 -0700
Subject: rpms/vdr-subtitles/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611120858.kAC8wH28002253@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdr-subtitles


--- 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 Nov 12 08:58:50 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 01:58:50 -0700
Subject: rpms/gperiodic import.log,1.8,1.9
Message-ID: <200611120858.kAC8wobe002324@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-7 on branch FC-6 from gperiodic-2.0.8-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	12 Nov 2006 08:56:44 -0000	1.8
+++ import.log	12 Nov 2006 08:58:19 -0000	1.9
@@ -5,3 +5,4 @@
 gperiodic-2_0_8-5:FC-6:gperiodic-2.0.8-5.src.rpm:1163098476
 gperiodic-2_0_8-5:FC-5:gperiodic-2.0.8-5.src.rpm:1163098561
 gperiodic-2_0_8-7:HEAD:gperiodic-2.0.8-7.src.rpm:1163321794
+gperiodic-2_0_8-7:FC-6:gperiodic-2.0.8-7.src.rpm:1163321889



From fedora-extras-commits at redhat.com  Sun Nov 12 08:58:50 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 01:58:50 -0700
Subject: rpms/gperiodic/FC-6 gperiodic-bh.patch, NONE, 1.1 gperiodic.spec,
	1.6, 1.7
Message-ID: <200611120858.kAC8woqQ002328@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265/FC-6

Modified Files:
	gperiodic.spec 
Added Files:
	gperiodic-bh.patch 
Log Message:
auto-import gperiodic-2.0.8-7 on branch FC-6 from gperiodic-2.0.8-7.src.rpm

gperiodic-bh.patch:

--- NEW FILE gperiodic-bh.patch ---
--- ./table_data.h	2003-10-10 09:44:45.000000000 +0200
+++ ./table_data.h	2006-11-12 09:45:05.000000000 +0100
@@ -265,7 +265,7 @@ struct table_entry table [ELEMENTNUM+1] 
   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d2 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d3 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d4 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d6 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d7 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d9 7s1", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/gperiodic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gperiodic.spec	10 Nov 2006 18:38:08 -0000	1.6
+++ gperiodic.spec	12 Nov 2006 08:58:20 -0000	1.7
@@ -1,11 +1,12 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
+Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
@@ -58,6 +60,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-7
+- Correct information for "Bh", Bohrium
+
 * Thu Nov 09 2006 Eric Tanguy  - 2.0.8-6
 - Rebuild for distag problem
 



From fedora-extras-commits at redhat.com  Sun Nov 12 08:59:31 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:59:31 -0700
Subject: rpms/vdr-subtitles import.log,1.1,1.2
Message-ID: <200611120859.kAC8xV0f002432@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371

Modified Files:
	import.log 
Log Message:
auto-import vdr-subtitles-0.4.0-1 on branch devel from vdr-subtitles-0.4.0-1.src.rpm
Initial import (#190346).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 08:58:11 -0000	1.1
+++ import.log	12 Nov 2006 08:59:01 -0000	1.2
@@ -0,0 +1 @@
+vdr-subtitles-0_4_0-1:HEAD:vdr-subtitles-0.4.0-1.src.rpm:1163321932



From fedora-extras-commits at redhat.com  Sun Nov 12 08:59:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:59:32 -0700
Subject: rpms/vdr-subtitles/devel vdr-subtitles.conf, NONE,
	1.1 vdr-subtitles.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611120859.kAC8xWI5002437@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vdr-subtitles.conf vdr-subtitles.spec 
Log Message:
auto-import vdr-subtitles-0.4.0-1 on branch devel from vdr-subtitles-0.4.0-1.src.rpm
Initial import (#190346).


--- NEW FILE vdr-subtitles.conf ---
# Configuration snippet for vdr-subtitles                            -*- sh -*-
#
# Add command line options to pass to the subtitles plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-subtitles.spec ---
%define pname     subtitles
%define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)

Name:           vdr-%{pname}
Version:        0.4.0
Release:        1%{?dist}
Summary:        DVB subtitles plugin for VDR

Group:          Applications/Multimedia
License:        GPL
URL:            http://virtanen.org/vdr/subtitles/
Source0:        http://virtanen.org/vdr/subtitles/files/%{name}-%{version}.tgz
Source1:        %{name}.conf
Patch0:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel >= 1.3.48
Requires:       vdr(abi) = %{apiver}

%description
There are two subtitling services specified in the DVB standards.  One
is the teletext subtitles and the other one is DVB subtitles.  The
main difference between these two is that the teletext subtitles are
text (sent via teletext service) and DVB subtitles are pixel-based
graphics.  This plugin implements a DVB subtitles decoder for VDR.
The plugin decodes and displays the subtitles and also adds the
selected subtitling streams to the VDR recordings.


%prep
%setup -q -n %{pname}-%{version}
find . -type d -name CVS | xargs rm -r
chmod 644 *
%patch0 -p1
#{__patch} < debian/patches/02_enable_selection.dpatch
sed -i -e s/0.3.11/0.4.0/ debian/patches/03_constness.dpatch
%{__patch} < debian/patches/03_constness.dpatch
%{__patch} < debian/patches/99_transparency_percentage.dpatch
sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile


%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all


%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -Dpm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
touch $RPM_BUILD_ROOT%{configdir}/plugins/subchannels.conf


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING HISTORY README
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%ghost %{configdir}/plugins/subchannels.conf


%changelog
* Sat May  6 2006 Ville Skytt??  - 0.4.0-1
- 0.4.0.

* Mon May  1 2006 Ville Skytt??  - 0.3.11-2
- Sync with 0.3.11-1.ds, enable transparency percentage patch.

* Sun Apr 30 2006 Ville Skytt??  - 0.3.11-1
- 0.3.11 + 0.3.10-5.ds, build for VDR 1.4.0.

* Mon Apr 17 2006 Ville Skytt??  - 0.3.10-8
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.

* Sun Mar 26 2006 Ville Skytt??  - 0.3.10-7
- Rebuild for VDR 1.3.45.

* Sat Mar 18 2006 Thorsten Leemhuis  - 0.3.10-6
- drop 0.lvn from release

* Sun Mar  5 2006 Ville Skytt??  - 0.3.10-0.lvn.6
- Sync with 0.3.10-3.ds.

* Wed Mar  1 2006 Ville Skytt??  - 0.3.10-0.lvn.5
- Rebuild for VDR 1.3.44.

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Tue Feb 21 2006 Ville Skytt??  - 0.3.10-0.lvn.4
- Sync with 0.3.10-2.ds.

* Sun Feb 19 2006 Ville Skytt??  - 0.3.10-0.lvn.3
- Sync with 0.3.10-1.ds, rebuild for VDR 1.3.43.

* Sun Feb  5 2006 Ville Skytt??  - 0.3.10-0.lvn.2
- Rebuild for VDR 1.3.42.

* Sun Jan 22 2006 Ville Skytt??  - 0.3.10-0.lvn.1
- 0.3.10.
- Rebuild for VDR 1.3.40.

* Sun Jan 15 2006 Ville Skytt??  - 0.3.8-1.lvn.13
- Rebuild for VDR 1.3.39.

* Tue Jan 10 2006 Ville Skytt??  - 0.3.8-1.lvn.12
- More fixes for VDR 1.3.38 from Rolf Ahrenberg.

* Sun Jan  8 2006 Ville Skytt??  - 0.3.8-1.lvn.11
- Rebuild/patch for VDR 1.3.38.

* Mon Nov 28 2005 Ville Skytt??  - 0.3.8-1.lvn.10
- Rebuild for VDR 1.3.37.

* Sun Nov  6 2005 Ville Skytt??  - 0.3.8-1.lvn.9
- Rebuild for VDR 1.3.36.

* Tue Nov  1 2005 Ville Skytt??  - 0.3.8-1.lvn.8
- Rebuild for VDR 1.3.35.

* Mon Oct  3 2005 Ville Skytt??  - 0.3.8-1.lvn.7
- Rebuild for VDR 1.3.34.

* Sun Sep 25 2005 Ville Skytt??  - 0.3.8-1.lvn.6
- Rebuild for VDR 1.3.33.

* Sun Sep 11 2005 Ville Skytt??  - 0.3.8-1.lvn.5
- Rebuild for VDR 1.3.32.

* Sun Aug 28 2005 Ville Skytt??  - 0.3.8-1.lvn.4
- Rebuild for VDR 1.3.31.

* Sun Aug 21 2005 Ville Skytt??  - 0.3.8-1.lvn.3
- Rebuild for VDR 1.3.30.

* Tue Aug 16 2005 Ville Skytt??  - 0.3.8-1.lvn.2
- Try to avoid build system problems by not using %%expand with vdr-config.

* Sat Aug 13 2005 Ville Skytt??  - 0.3.8-1.lvn.1
- Convert docs to UTF-8.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 08:58:17 -0000	1.1
+++ .cvsignore	12 Nov 2006 08:59:02 -0000	1.2
@@ -0,0 +1,2 @@
+vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
+vdr-subtitles-0.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 08:58:17 -0000	1.1
+++ sources	12 Nov 2006 08:59:02 -0000	1.2
@@ -0,0 +1,2 @@
+63dc32ac87c859cde5acbb854cdb537d  vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
+74780f7f296f1feac13f4358b97bd2f3  vdr-subtitles-0.4.0.tgz



From fedora-extras-commits at redhat.com  Sun Nov 12 09:00:14 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 02:00:14 -0700
Subject: rpms/gperiodic import.log,1.9,1.10
Message-ID: <200611120900.kAC90EIr002555@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2477

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-7 on branch FC-5 from gperiodic-2.0.8-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	12 Nov 2006 08:58:19 -0000	1.9
+++ import.log	12 Nov 2006 08:59:43 -0000	1.10
@@ -6,3 +6,4 @@
 gperiodic-2_0_8-5:FC-5:gperiodic-2.0.8-5.src.rpm:1163098561
 gperiodic-2_0_8-7:HEAD:gperiodic-2.0.8-7.src.rpm:1163321794
 gperiodic-2_0_8-7:FC-6:gperiodic-2.0.8-7.src.rpm:1163321889
+gperiodic-2_0_8-7:FC-5:gperiodic-2.0.8-7.src.rpm:1163321973



From fedora-extras-commits at redhat.com  Sun Nov 12 09:00:14 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 02:00:14 -0700
Subject: rpms/gperiodic/FC-5 gperiodic-bh.patch, NONE, 1.1 gperiodic.spec,
	1.4, 1.5
Message-ID: <200611120900.kAC90EiS002558@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2477/FC-5

Modified Files:
	gperiodic.spec 
Added Files:
	gperiodic-bh.patch 
Log Message:
auto-import gperiodic-2.0.8-7 on branch FC-5 from gperiodic-2.0.8-7.src.rpm

gperiodic-bh.patch:

--- NEW FILE gperiodic-bh.patch ---
--- ./table_data.h	2003-10-10 09:44:45.000000000 +0200
+++ ./table_data.h	2006-11-12 09:45:05.000000000 +0100
@@ -265,7 +265,7 @@ struct table_entry table [ELEMENTNUM+1] 
   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d2 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d3 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d4 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d6 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d7 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d9 7s1", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-5/gperiodic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gperiodic.spec	9 Nov 2006 18:56:12 -0000	1.4
+++ gperiodic.spec	12 Nov 2006 08:59:44 -0000	1.5
@@ -1,11 +1,12 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
+Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
@@ -58,6 +60,12 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-7
+- Correct information for "Bh", Bohrium
+
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-6
+- Rebuild for distag problem
+
 * Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
 - Modify URL in package descrpition and source
 



From fedora-extras-commits at redhat.com  Sun Nov 12 09:00:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 02:00:33 -0700
Subject: owners owners.list,1.1931,1.1932
Message-ID: <200611120900.kAC90XeL002601@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2515

Modified Files:
	owners.list 
Log Message:
+vdr-subtitles (#190346)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1931
retrieving revision 1.1932
diff -u -r1.1931 -r1.1932
--- owners.list	12 Nov 2006 08:53:59 -0000	1.1931
+++ owners.list	12 Nov 2006 09:00:03 -0000	1.1932
@@ -2324,6 +2324,7 @@
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 09:07:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 02:07:34 -0700
Subject: rpms/vdr-subtitles/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vdr-subtitles.spec, 1.1, 1.2
Message-ID: <200611120907.kAC97Yeb005877@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5823

Modified Files:
	.cvsignore sources vdr-subtitles.spec 
Log Message:
* Sun Nov 12 2006 Ville Skytt??  - 0.4.0-6
- First FE build.
- Update Darren's patchkit to 0.4.0-1.ds.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 08:59:02 -0000	1.2
+++ .cvsignore	12 Nov 2006 09:07:04 -0000	1.3
@@ -1,2 +1,2 @@
-vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
 vdr-subtitles-0.4.0.tgz
+vdr-plugin-subtitles_0.4.0-1.ds.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2006 08:59:02 -0000	1.2
+++ sources	12 Nov 2006 09:07:04 -0000	1.3
@@ -1,2 +1,2 @@
-63dc32ac87c859cde5acbb854cdb537d  vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
 74780f7f296f1feac13f4358b97bd2f3  vdr-subtitles-0.4.0.tgz
+e4cc6275a271789f35ae5e9eb01c31df  vdr-plugin-subtitles_0.4.0-1.ds.diff.gz


Index: vdr-subtitles.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/vdr-subtitles.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-subtitles.spec	12 Nov 2006 08:59:02 -0000	1.1
+++ vdr-subtitles.spec	12 Nov 2006 09:07:04 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        6%{?dist}
 Summary:        DVB subtitles plugin for VDR
 
 Group:          Applications/Multimedia
@@ -13,7 +13,7 @@
 URL:            http://virtanen.org/vdr/subtitles/
 Source0:        http://virtanen.org/vdr/subtitles/files/%{name}-%{version}.tgz
 Source1:        %{name}.conf
-Patch0:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
+Patch0:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr-plugin-subtitles_0.4.0-1.ds.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.3.48
@@ -34,10 +34,9 @@
 find . -type d -name CVS | xargs rm -r
 chmod 644 *
 %patch0 -p1
-#{__patch} < debian/patches/02_enable_selection.dpatch
-sed -i -e s/0.3.11/0.4.0/ debian/patches/03_constness.dpatch
-%{__patch} < debian/patches/03_constness.dpatch
-%{__patch} < debian/patches/99_transparency_percentage.dpatch
+#{__patch} -i debian/patches/02_enable_selection.dpatch
+%{__patch} -i debian/patches/03_constness.dpatch
+%{__patch} -i debian/patches/99_transparency_percentage.dpatch
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
 
 
@@ -68,6 +67,10 @@
 
 
 %changelog
+* Sun Nov 12 2006 Ville Skytt??  - 0.4.0-6
+- First FE build.
+- Update Darren's patchkit to 0.4.0-1.ds.
+
 * Sat May  6 2006 Ville Skytt??  - 0.4.0-1
 - 0.4.0.
 



From fedora-extras-commits at redhat.com  Sun Nov 12 09:10:49 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 02:10:49 -0700
Subject: rpms/deskbar-applet/devel .cvsignore, 1.15, 1.16 deskbar-applet.spec,
	1.35, 1.36 sources, 1.15, 1.16
Message-ID: <200611120910.kAC9AngM006011@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5983

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	1 Nov 2006 07:51:07 -0000	1.15
+++ .cvsignore	12 Nov 2006 09:10:18 -0000	1.16
@@ -1 +1 @@
-deskbar-applet-2.16.1.tar.bz2
+deskbar-applet-2.17.2.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- deskbar-applet.spec	6 Nov 2006 02:36:26 -0000	1.35
+++ deskbar-applet.spec	12 Nov 2006 09:10:18 -0000	1.36
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.16.1
-Release:        3%{?dist}
+Version:        2.17.2
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -91,6 +91,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sun Nov 12 2006 Luke Macken  - 2.17.2-1
+- 2.17.2
+
 * Sun Nov  5 2006 Luke Macken  - 2.16-1-3
 - Add gnome-python2-devel to BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	1 Nov 2006 07:51:07 -0000	1.15
+++ sources	12 Nov 2006 09:10:18 -0000	1.16
@@ -1 +1 @@
-b236c4d3d70fbc20164ba208de84e5db  deskbar-applet-2.16.1.tar.bz2
+825cd32ffff8c3a105cd3f4e04ec646e  deskbar-applet-2.17.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 09:20:22 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 02:20:22 -0700
Subject: comps comps-fe7.xml.in,1.18,1.19
Message-ID: <200611120920.kAC9KMjb006092@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6072

Modified Files:
	comps-fe7.xml.in 
Log Message:
+vdr-osdteletext, vdr-subtitles


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- comps-fe7.xml.in	12 Nov 2006 05:23:27 -0000	1.18
+++ comps-fe7.xml.in	12 Nov 2006 09:19:52 -0000	1.19
@@ -875,6 +875,8 @@
       tclabc
       ushare
       vdr
+      vdr-osdteletext
+      vdr-subtitles
       wmix
       xmms
       xmms-adplug



From fedora-extras-commits at redhat.com  Sun Nov 12 09:37:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 02:37:01 -0700
Subject: fedora-security/audit fe6,1.17,1.18
Message-ID: <200611120937.kAC9b1SN006266@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6248

Modified Files:
	fe6 
Log Message:
Seamonkey updated to 1.0.6.


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fe6	11 Nov 2006 10:48:17 -0000	1.17
+++ fe6	12 Nov 2006 09:36:58 -0000	1.18
@@ -5,13 +5,13 @@
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
-CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
-CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5748 version (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5747 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
-CVE-2006-5464 VULNERABLE (seamonkey, fixed 1.0.6) #214822
-CVE-2006-5463 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5464 version (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5463 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
 CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
 CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355



From fedora-extras-commits at redhat.com  Sun Nov 12 09:50:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 02:50:48 -0700
Subject: rpms/flight-of-the-amazon-queen-cd - New directory
Message-ID: <200611120950.kAC9omSM006332@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6328/flight-of-the-amazon-queen-cd

Log Message:
Directory /cvs/extras/rpms/flight-of-the-amazon-queen-cd added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 09:50:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 02:50:53 -0700
Subject: rpms/flight-of-the-amazon-queen-cd/devel - New directory
Message-ID: <200611120950.kAC9orck006346@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6328/flight-of-the-amazon-queen-cd/devel

Log Message:
Directory /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 09:51:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 02:51:12 -0700
Subject: rpms/flight-of-the-amazon-queen-cd Makefile, NONE, 1.1 import.log, 
	NONE, 1.1
Message-ID: <200611120951.kAC9pCup006377@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6371

Added Files:
	Makefile import.log 
Log Message:
Setup of module flight-of-the-amazon-queen-cd


--- NEW FILE Makefile ---
# Top level Makefile for module flight-of-the-amazon-queen-cd
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 Nov 12 09:51:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 02:51:13 -0700
Subject: rpms/flight-of-the-amazon-queen-cd/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611120951.kAC9pDLt006394@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6371/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flight-of-the-amazon-queen-cd


--- 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 Nov 12 10:11:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 03:11:29 -0700
Subject: rpms/flight-of-the-amazon-queen-cd import.log,1.1,1.2
Message-ID: <200611121011.kACABT3R009704@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9670

Modified Files:
	import.log 
Log Message:
auto-import flight-of-the-amazon-queen-cd-1.0-1 on branch devel from flight-of-the-amazon-queen-cd-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen-cd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 09:51:12 -0000	1.1
+++ import.log	12 Nov 2006 10:10:59 -0000	1.2
@@ -0,0 +1 @@
+flight-of-the-amazon-queen-cd-1_0-1:HEAD:flight-of-the-amazon-queen-cd-1.0-1.src.rpm:1163326970



From fedora-extras-commits at redhat.com  Sun Nov 12 10:11:30 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 03:11:30 -0700
Subject: rpms/flight-of-the-amazon-queen-cd/devel
	flight-of-the-amazon-queen-cd.desktop, NONE,
	1.1 flight-of-the-amazon-queen-cd.spec, NONE, 1.1 readme.txt,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611121011.kACABUTc009708@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9670/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flight-of-the-amazon-queen-cd.desktop 
	flight-of-the-amazon-queen-cd.spec readme.txt 
Log Message:
auto-import flight-of-the-amazon-queen-cd-1.0-1 on branch devel from flight-of-the-amazon-queen-cd-1.0-1.src.rpm


--- NEW FILE flight-of-the-amazon-queen-cd.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Flight of the Amazon Queen (CD version)
Comment=Adventure Game
Exec=scummvm -f -p /usr/share/flight-of-the-amazon-queen-cd queen
Icon=scummvm.png
Terminal=false
Type=Application
Categories=Application;Game;AdventureGame;
StartupNotify=false


--- NEW FILE flight-of-the-amazon-queen-cd.spec ---
Name:           flight-of-the-amazon-queen-cd
Version:        1.0
Release:        1
Summary:        Flight of the Amazon Queen - Adventure Game - CD version
Group:          Amusements/Games
# For further discussion on distribution rights see:
# http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
License:        Distributable
URL:            http://www.scummvm.org/downloads.php
# This is an ogg compressed sfx/speech variant. It has been rebuilded 
# from the original data using queenrebuild (scummvm tools).
#
# queenrebuild --ogg -Q -b 16 queen.1
Source0:        ftp://ftp.suse.com/pub/suse/i386/supplementary/X/FOTAQ/queen.1c.bz2
Source1:        %{name}.desktop
Source2:        ftp://ftp.suse.com/pub/suse/i386/supplementary/X/FOTAQ/readme.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       scummvm >= 0.9.1, hicolor-icon-theme

%description
It is 1949 and you play Joe King, pilot for hire with his small private plane
the 'Amazon Queen'. The game is a spoof of old timey radio adventure serials,
and as it begins we find Joe in one of those typical situations. It is 11:58
and 36 seconds and counting, Joe and his date are tied up in an abandoned
warehouse ("you really know how to show a girl a good time, Joe!"), and a bomb
is set to go off at midnight!

Of course they escape, in the nick of time, and immediately set us up for the
next 'adventure'. Joe suddenly remembers that he is scheduled to fly the famous
movie star, Faye Russell, to a photo shoot in the Amazon jungle the next
morning.

This package contains the CD version, which contains additional / longer
cutscenes and voice acting, but also is much larger: 37 MB where as the also
available floppy version (package flight-of-the-amazon-queen) is only 7 MB.


%prep
%setup -q -c -T
bzip2 -dc %{SOURCE0} > queen.1c
install -p -m 644 %{SOURCE2} .


%build
# Nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 queen.1c $RPM_BUILD_ROOT%{_datadir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc readme.txt
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Sun Nov  5 2006 Hans de Goede  1.0-1
- Initial FE package


--- NEW FILE readme.txt ---
Flight of the Amazon Queen (Talkie)                 (C) 1995- John Passfield &
-----------------------------------                           Steve Stamatiadis


March 15 2004
***************
	(Licence and legal stuff at the end of this file. Please read them.)

Once again, we here at ScummVM have the pleasure of bringing you yet another
classic adventure game, thanks to John Passfield and Steve Stamatiadis over at
Krome Studios in Australia. This game requires at least ScummVM 0.6.0 to play.

Flight of the Amazon Queen is a 2D point-and-click adventure game set in the 
1940s, originally published for DOS and the Amiga. 

You assume the role of Joe King, a pilot for hire who is given the job of flying
Faye Russell (a famous movie star) into the Amazon jungle for a photo shoot. Of
course, things never go according to plans. After an unfortunate turn of events
they find themselves stranded in the heart of the Amazon jungle, where Joe will
embark on a quest to rescue a kidnapped princess and in the process, discover
the true sinister intentions of a suspiciously located Lederhosen company. In a
rich 2D environment, Joe will cross paths with a variety of unlikely jungle
inhabitants including, but not limited to, a tribe of Amazon women and 6-foot-
tall pygmies.

Game Quickstart
***************
You need ScummVM version 0.6.0 or newer to play this game, which can be
downloaded at http://www.scummvm.org/.

ScummVM runs on many platforms, including many Unices and BSDs, Windows,
Mac OS X, Windows CE and others. However note that some platforms may not (yet)
be capable of playing all games. Please see the ScummVM Compatibility List for
information on newer versions.

You should always read the instructions included with the latest version of
ScummVM, but for here is a quick three-step guide for the impatient:

 1) Unzip the game to a directory and install ScummVM
 2) After running ScummVM, click the 'Add Game' button and browse to the 
    directory you just created.
 3) After adding the game to the list, on future plays simply select it
    from the 'Game List' and click 'Start'!

You can access the in-game save/load and options menu by using the 'Journal'
inventory item.

Enjoy!,
            James 'Ender' Brown,
            Project Co-Leader,
            ScummVM (http://www.scummvm.org/)

Neither of the game authors, nor ScummVM provide support for this game.
Walkthroughs and hints can easily be found online, but the in case of
technical problems, feel free to ask for help on the ScummVM forums.

********************************************************************************
Special Thanks:

          A full list of credits for ScummVM can be found in its README file,
however the following people deserve special credit... and as usual, the first
thanks should go to the creators of this game!

Steve Stamatiadis (www.spacecaptainsteve.com)
John Passfield	  (www.passfieldgames.com)

Thanks for, obviously, making a great game and giving us the honour of rewriting
the engine and releasing it as freeware.

Traditionally the next set of credits go to those who dug through the original
PC-release C source (which was a rather interesting port of the original Amiga 
AMOS version itself!) and re-engineered a new engine:
  David Eriksson, Gregory Montoir and Joost Peters.

Final credit goes to everybody else on the ScummVM team and my co-lead developer
Max Horn, who has kept everything running whilst I've been on a heat-induced
vacation thanks to a boiling summer here in Western Australia.
********************************************************************************
The Legal Stuff:

Preamble:
  Basically, give this game away, share it with your friends. Don't remove this
Readme, or pretend that you wrote it. You can include it in a software
collection, like a Linux distribution or coverdisk (which may be sold), but
using it in things like commercial adventure game collections without asking is
just playing dirty. You can modify the gamedata for such purposes as compressing
audio. This preamble is not legally binding, but is to clarify the intent of
the following licence.

Licence:
 1) You may distribute this game for free on any medium, provided this Readme
and all associated copyright notices and disclaimers are left intact.

 2) You may charge a reasonable copying fee for this archive, and may
distribute it in aggregate as part of a larger and possibly commercial software
distribution (such as a Linux distribution or magazine coverdisk). You must
provide proper attribution and ensure that this Readme and all associated
copyright notices and disclaimers are left intact.

 3) You may not charge a fee for the game itself. This includes reselling the
game as an individual item.

 4) You may modify the game as you wish.  You may also distribute modified
versions under the terms set forth in this licence, but with the additional
requirement that the work is marked with a prominent notice which states that
it is a modified version.

 5) All game content is (C) John Passfield and Steven Stamatiadis.
    The ScummVM engine is (C) The ScummVM Team (www.scummvm.org).

 6) THE GAME DATA IN THIS ARCHIVE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING AND NOT LIMITED TO ANY IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 09:51:13 -0000	1.1
+++ .cvsignore	12 Nov 2006 10:11:00 -0000	1.2
@@ -0,0 +1 @@
+queen.1c.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 09:51:13 -0000	1.1
+++ sources	12 Nov 2006 10:11:00 -0000	1.2
@@ -0,0 +1 @@
+10c38ba9fd533c29cf8a26424d27a9f8  queen.1c.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 10:50:27 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 12 Nov 2006 03:50:27 -0700
Subject: rpms/GeoIP/FC-5 .cvsignore, 1.4, 1.5 GeoIP.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200611121050.kACAoRcL009909@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9885

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Sun Sep 3 2006 Michael Fleming  1.4.0-3
- Upstream upgrade
- Added LICENSE.txt file to %doc, covering GeoIP country/city data license
  (bz #198137)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 May 2006 09:07:37 -0000	1.4
+++ .cvsignore	12 Nov 2006 10:49:57 -0000	1.5
@@ -1 +1,2 @@
-GeoIP-1.3.17.tar.gz
+GeoIP-1.4.0.tar.gz
+LICENSE.txt


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GeoIP.spec	18 May 2006 09:07:37 -0000	1.4
+++ GeoIP.spec	12 Nov 2006 10:49:57 -0000	1.5
@@ -1,11 +1,12 @@
 Name: GeoIP           
-Version: 1.3.17
-Release: 1%{?dist}
+Version: 1.4.0
+Release: 3%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
+Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: geoip < %{version}-%{release}
 Provides: geoip = %{version}-%{release}
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q 
+install -D -m644 %{SOURCE1} LICENSE.txt
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -51,7 +53,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO INSTALL 
+%doc AUTHORS COPYING ChangeLog README TODO INSTALL LICENSE*
 %{_libdir}/libGeoIP.so.*
 %{_libdir}/libGeoIPUpdate.so.*
 %{_bindir}/geoiplookup
@@ -71,6 +73,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Sun Sep 3 2006 Michael Fleming  1.4.0-3
+- Upstream upgrade
+- Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
+  (bz #198137)
+
 * Mon May 15 2006 Michael Fleming  1.3.17-1
 - New upstream release (minor fixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 May 2006 09:07:37 -0000	1.4
+++ sources	12 Nov 2006 10:49:57 -0000	1.5
@@ -1 +1,2 @@
-36ee129b4dce5990cea1cfda122dae93  GeoIP-1.3.17.tar.gz
+da09a3d9a1a91e3d16c0a29e6b056c15  GeoIP-1.4.0.tar.gz
+7a976ca11d0f2c6b1fa230b6d57c34d7  LICENSE.txt



From fedora-extras-commits at redhat.com  Sun Nov 12 10:53:18 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 12 Nov 2006 03:53:18 -0700
Subject: rpms/GeoIP/FC-4 .cvsignore, 1.4, 1.5 GeoIP.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200611121053.kACArInC009984@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9964

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Sun Sep 3 2006 Michael Fleming  1.4.0-3
- Upstream upgrade
- Added LICENSE.txt file to %doc, covering GeoIP country/city data license
  (bz #198137)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 May 2006 09:08:36 -0000	1.4
+++ .cvsignore	12 Nov 2006 10:52:48 -0000	1.5
@@ -1 +1,2 @@
-GeoIP-1.3.17.tar.gz
+GeoIP-1.4.0.tar.gz
+LICENSE.txt


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-4/GeoIP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GeoIP.spec	18 May 2006 09:08:36 -0000	1.3
+++ GeoIP.spec	12 Nov 2006 10:52:48 -0000	1.4
@@ -1,11 +1,12 @@
 Name: GeoIP           
-Version: 1.3.17
-Release: 1%{?dist}
+Version: 1.4.0
+Release: 3%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
+Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: geoip < %{version}-%{release}
 Provides: geoip = %{version}-%{release}
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q 
+install -D -m644 %{SOURCE1} LICENSE.txt
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -51,7 +53,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO INSTALL 
+%doc AUTHORS COPYING ChangeLog README TODO INSTALL LICENSE*
 %{_libdir}/libGeoIP.so.*
 %{_libdir}/libGeoIPUpdate.so.*
 %{_bindir}/geoiplookup
@@ -71,6 +73,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Sun Sep 3 2006 Michael Fleming  1.4.0-3
+- Upstream upgrade
+- Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
+  (bz #198137)
+
 * Mon May 15 2006 Michael Fleming  1.3.17-1
 - New upstream release (minor fixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 May 2006 09:08:36 -0000	1.4
+++ sources	12 Nov 2006 10:52:48 -0000	1.5
@@ -1 +1,2 @@
-36ee129b4dce5990cea1cfda122dae93  GeoIP-1.3.17.tar.gz
+da09a3d9a1a91e3d16c0a29e6b056c15  GeoIP-1.4.0.tar.gz
+7a976ca11d0f2c6b1fa230b6d57c34d7  LICENSE.txt



From fedora-extras-commits at redhat.com  Sun Nov 12 11:06:51 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:06:51 -0700
Subject: rpms/tinyca2 - New directory
Message-ID: <200611121106.kACB6piV013368@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13364/tinyca2

Log Message:
Directory /cvs/extras/rpms/tinyca2 added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 11:06:58 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:06:58 -0700
Subject: rpms/tinyca2/devel - New directory
Message-ID: <200611121106.kACB6waR013382@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13364/tinyca2/devel

Log Message:
Directory /cvs/extras/rpms/tinyca2/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 11:07:43 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:07:43 -0700
Subject: rpms/tinyca2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611121107.kACB7hxj013414@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13408

Added Files:
	Makefile import.log 
Log Message:
Setup of module tinyca2


--- NEW FILE Makefile ---
# Top level Makefile for module tinyca2
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 Nov 12 11:07:50 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:07:50 -0700
Subject: rpms/tinyca2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611121107.kACB7o9Z013427@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13408/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tinyca2


--- 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 Nov 12 11:09:19 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:09:19 -0700
Subject: rpms/tinyca2 import.log,1.1,1.2
Message-ID: <200611121109.kACB9JrC013520@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13480

Modified Files:
	import.log 
Log Message:
auto-import tinyca2-0.7.5-3.fc5x on branch devel from tinyca2-0.7.5-3.fc5x.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tinyca2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 11:07:43 -0000	1.1
+++ import.log	12 Nov 2006 11:08:49 -0000	1.2
@@ -0,0 +1 @@
+tinyca2-0_7_5-3_fc5x:HEAD:tinyca2-0.7.5-3.fc5x.src.rpm:1163329718



From fedora-extras-commits at redhat.com  Sun Nov 12 11:09:20 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:09:20 -0700
Subject: rpms/tinyca2/devel tinyca2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611121109.kACB9Kil013524@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13480/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tinyca2.spec 
Log Message:
auto-import tinyca2-0.7.5-3.fc5x on branch devel from tinyca2-0.7.5-3.fc5x.src.rpm


--- NEW FILE tinyca2.spec ---
%global pkgdatadir	%_datadir/%name

%{!?release_func:%global release_func() %1%{?dist}}

Name:		tinyca2
Version:	0.7.5
Release:	%release_func 3
Summary:	Simple graphical userinterface to manage a small CA

Group:		Applications/Productivity
License:	GPL
URL:		http://tinyca.sm-zone.net/
Source0:	http://tinyca.sm-zone.net/%name-%version.tar.bz2
BuildRoot:	%_tmppath/%name-%version-%release-root
BuildArch:	noarch

BuildRequires:	gettext desktop-file-utils
Requires:	openssl tar zip

# filter out the private symbols and do not export them
%global reqsed		sed -e '/perl(\\(GUI\\|HELPERS\\|KEY\\|TCONFIG\\|OpenSSL\\|CA\\|CERT\\|REQ\\)[:)]/d;p'
%global __perl_requires sh -x -c "%__perl_requires | %reqsed"
%global __perl_provides sh -x -c "%__perl_provides | %reqsed"


%description
TinyCA is a simple graphical userinterface written in Perl/Gtk to
manage a small CA (Certification Authority).  TinyCA works as a
frontend for openssl

Currently TinyCA supports the following features:

* Unlimited CAs possible
* Support for creating and managing SubCAs
* Creation and Revocation of x509 - S/MIME certificates
* PKCS#10 Requests can be imported and signed
* RSA and DSA keys can be generated and used
* ServerCertificates
  o Certificates can be exported as: PEM, DER, TXT and PKCS#12
  o Certificates may be used with e.g. Apache, Postfix, OpenLDAP,
    Cyrus, FreeS/WAN, OpenVPN, OpenSWAN, FreeRadius
* ClientCertificates
  o Certificates can be exported as: PEM, DER, TXT and PKCS#12
  o Certificates may be used with e.g. Netscape, Konqueror, Opera,
    Internet Explorer, Outlook (Express) and FreeS/WAN
* Certificate Revocation List
  o CRLs can be exported as: PEM, DER and TXT


%prep
%setup -q
rm -rf locale

sed -i -e 's!./\(lib\|templates\)!%pkgdatadir/\1!g;
           s!./locale/!%_datadir/locale!g' tinyca2


%build
cd po
for i in *.po; do
	base=${i%%.po}
	d=../locale/$base/LC_MESSAGES
	mkdir -p "$d"
	msgfmt "$i" -o "$d"/tinyca2.mo
done


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%pkgdatadir/{lib/GUI,templates},%_datadir,%_bindir}

cp -a locale $RPM_BUILD_ROOT%_datadir
install -p -m0755 tinyca2      $RPM_BUILD_ROOT%_bindir/
install -p -m0644 templates/*  $RPM_BUILD_ROOT%pkgdatadir/templates/
install -p -m0644 lib/*.pm     $RPM_BUILD_ROOT%pkgdatadir/lib/
install -p -m0644 lib/GUI/*.pm $RPM_BUILD_ROOT%pkgdatadir/lib/GUI/

desktop-file-install --vendor="fedora"				\
	--dir=$RPM_BUILD_ROOT%_datadir/applications		\
	tinyca2.desktop

%find_lang tinyca2


%clean
rm -rf $RPM_BUILD_ROOT


%files -f tinyca2.lang
%defattr(-,root,root,-)
%doc CHANGES
%_bindir/*
%_datadir/applications/*.desktop
%pkgdatadir


%changelog
* Sun Nov 12 2006 Enrico Scholz  - 0.7.5-3
- initial Fedora package (review #213600)
- removed the 'X-Fedora' category from the desktop file

* Thu Nov  2 2006 Enrico Scholz  - 0.7.5-2
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyca2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 11:07:49 -0000	1.1
+++ .cvsignore	12 Nov 2006 11:08:49 -0000	1.2
@@ -0,0 +1 @@
+tinyca2-0.7.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyca2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 11:07:49 -0000	1.1
+++ sources	12 Nov 2006 11:08:49 -0000	1.2
@@ -0,0 +1 @@
+a7f63806dbdc38a34ed58e42e79f4822  tinyca2-0.7.5.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 11:46:24 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:46:24 -0700
Subject: rpms/tinyca2/devel tinyca2.spec,1.1,1.2
Message-ID: <200611121146.kACBkOY7019921@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19905

Modified Files:
	tinyca2.spec 
Log Message:
made __perl_* actions silent


Index: tinyca2.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyca2/devel/tinyca2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyca2.spec	12 Nov 2006 11:08:49 -0000	1.1
+++ tinyca2.spec	12 Nov 2006 11:45:53 -0000	1.2
@@ -19,8 +19,8 @@
 
 # filter out the private symbols and do not export them
 %global reqsed		sed -e '/perl(\\(GUI\\|HELPERS\\|KEY\\|TCONFIG\\|OpenSSL\\|CA\\|CERT\\|REQ\\)[:)]/d;p'
-%global __perl_requires sh -x -c "%__perl_requires | %reqsed"
-%global __perl_provides sh -x -c "%__perl_provides | %reqsed"
+%global __perl_requires sh -c "%__perl_requires | %reqsed"
+%global __perl_provides sh -c "%__perl_provides | %reqsed"
 
 
 %description
@@ -98,6 +98,7 @@
 * Sun Nov 12 2006 Enrico Scholz  - 0.7.5-3
 - initial Fedora package (review #213600)
 - removed the 'X-Fedora' category from the desktop file
+- made __perl_* actions silent
 
 * Thu Nov  2 2006 Enrico Scholz  - 0.7.5-2
 - initial build



From fedora-extras-commits at redhat.com  Sun Nov 12 11:49:24 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:49:24 -0700
Subject: owners owners.list,1.1932,1.1933
Message-ID: <200611121149.kACBnOOV019957@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19941

Modified Files:
	owners.list 
Log Message:
added tinyca2


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1932
retrieving revision 1.1933
diff -u -r1.1932 -r1.1933
--- owners.list	12 Nov 2006 09:00:03 -0000	1.1932
+++ owners.list	12 Nov 2006 11:48:53 -0000	1.1933
@@ -2252,6 +2252,7 @@
 Fedora Extras|tiger|Security auditing tool for UNIX systems|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tile|Modernized widgets for Tk|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|tinyca2|Simple graphical userinterface to manage a small CA|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com
 Fedora Extras|tinyfugue|A MU* client|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|tiobench|Threaded I/O benchmark|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 11:57:23 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:57:23 -0700
Subject: rpms/tor/FC-5 sources,1.3,1.4 tor.spec,1.3,1.4
Message-ID: <200611121157.kACBvNYr020045@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20027

Modified Files:
	sources tor.spec 
Log Message:
updated to 0.1.1.25


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2006 12:04:45 -0000	1.3
+++ sources	12 Nov 2006 11:56:53 -0000	1.4
@@ -1,2 +1,2 @@
-28dea6a77a43b6e421e1bd7b2cc3d940  tor-0.1.1.24.tar.gz
-217c02c37858cf6048ba2b0a99d76014  tor-0.1.1.24.tar.gz.asc
+b001fa271b5935f3d9c5222809dbd2f1  tor-0.1.1.25.tar.gz
+30b6c339f851eca6c7a5d672cb57681e  tor-0.1.1.25.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/tor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tor.spec	7 Oct 2006 12:04:45 -0000	1.3
+++ tor.spec	12 Nov 2006 11:56:53 -0000	1.4
@@ -9,7 +9,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.1.1.24
+Version:	0.1.1.25
 Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
@@ -27,7 +27,7 @@
 Source1:	http://tor.eff.org/dist/%name-%version.tar.gz.asc
 Source2:	tor.logrotate
 Patch0:		tor-0.1.0.15-setgroups.patch
-BuildRoot:	%_tmppath/%name-%version-%release-root-%(%__id_u -n)
+BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	libevent-devel openssl-devel transfig tetex-latex ghostscript
 Requires:		init(%name)
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Enrico Scholz  - 0.1.1.25-1
+- updated to 0.1.1.25
+
 * Thu Oct  5 2006 Enrico Scholz  - 0.1.1.24-1
 - updated to 0.1.1.24
 



From fedora-extras-commits at redhat.com  Sun Nov 12 11:59:41 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:59:41 -0700
Subject: rpms/tor/FC-6 sources,1.3,1.4 tor.spec,1.4,1.5
Message-ID: <200611121159.kACBxfit020114@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20096

Modified Files:
	sources tor.spec 
Log Message:
updated to 0.1.1.25


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 06:29:54 -0000	1.3
+++ sources	12 Nov 2006 11:59:11 -0000	1.4
@@ -1,2 +1,2 @@
-28dea6a77a43b6e421e1bd7b2cc3d940  tor-0.1.1.24.tar.gz
-217c02c37858cf6048ba2b0a99d76014  tor-0.1.1.24.tar.gz.asc
+b001fa271b5935f3d9c5222809dbd2f1  tor-0.1.1.25.tar.gz
+30b6c339f851eca6c7a5d672cb57681e  tor-0.1.1.25.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-6/tor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tor.spec	5 Oct 2006 06:29:54 -0000	1.4
+++ tor.spec	12 Nov 2006 11:59:11 -0000	1.5
@@ -10,7 +10,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.1.1.24
+Version:	0.1.1.25
 Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Enrico Scholz  - 0.1.1.25-1
+- updated to 0.1.1.25
+
 * Thu Oct  5 2006 Enrico Scholz  - 0.1.1.24-1
 - updated to 0.1.1.24
 



From fedora-extras-commits at redhat.com  Sun Nov 12 12:16:18 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:16:18 -0700
Subject: rpms/pyserial - New directory
Message-ID: <200611121216.kACCGICS023316@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23312/pyserial

Log Message:
Directory /cvs/extras/rpms/pyserial added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 12:16:23 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:16:23 -0700
Subject: rpms/pyserial/devel - New directory
Message-ID: <200611121216.kACCGN6u023330@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23312/pyserial/devel

Log Message:
Directory /cvs/extras/rpms/pyserial/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 12:16:46 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:16:46 -0700
Subject: rpms/pyserial Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611121216.kACCGkm4023361@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23355

Added Files:
	Makefile import.log 
Log Message:
Setup of module pyserial


--- NEW FILE Makefile ---
# Top level Makefile for module pyserial
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 Nov 12 12:16:52 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:16:52 -0700
Subject: rpms/pyserial/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611121216.kACCGqg6023379@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23355/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyserial


--- 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 Nov 12 12:18:03 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:18:03 -0700
Subject: rpms/pyserial import.log,1.1,1.2
Message-ID: <200611121218.kACCI3si023455@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23419

Modified Files:
	import.log 
Log Message:
auto-import pyserial-2.2-4 on branch devel from pyserial-2.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pyserial/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 12:16:46 -0000	1.1
+++ import.log	12 Nov 2006 12:17:33 -0000	1.2
@@ -0,0 +1 @@
+pyserial-2_2-4:HEAD:pyserial-2.2-4.src.rpm:1163333843



From fedora-extras-commits at redhat.com  Sun Nov 12 12:18:03 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:18:03 -0700
Subject: rpms/pyserial/devel pyserial.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611121218.kACCI3K0023459@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23419/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pyserial.spec 
Log Message:
auto-import pyserial-2.2-4 on branch devel from pyserial-2.2-4.src.rpm


--- NEW FILE pyserial.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Python serial port access library
Name: pyserial
Version: 2.2
Release: 4%{?dist}
Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.zip
License: Python license
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://pyserial.sourceforge.net/
BuildRequires: python-devel
BuildArch: noarch

%description
This module encapsulates the access for the serial port. It provides backends
for standard Python running on Windows, Linux, BSD (possibly any POSIX
compilant system) and Jython. The module named "serial" automaticaly selects
the appropriate backend.

%prep
export UNZIP="-aa"
%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

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc LICENSE.txt CHANGES.txt README.txt examples
%{python_sitelib}/*

%changelog
* Mon Nov  6 2006 Paul P Komkoff Jr  - 2.2-4
- remove "export libdirname"

* Tue Oct 24 2006 Paul P Komkoff Jr  - 2.2-3
- Minor specfile fixes

* Sat Oct 14 2006 Paul P Komkoff Jr  - 2.2-2
- Minor specfile fixes

* Tue May  9 2006 Paul P Komkoff Jr  - 2.2-1
- Fedora Extras submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyserial/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 12:16:52 -0000	1.1
+++ .cvsignore	12 Nov 2006 12:17:33 -0000	1.2
@@ -0,0 +1 @@
+pyserial-2.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyserial/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 12:16:52 -0000	1.1
+++ sources	12 Nov 2006 12:17:33 -0000	1.2
@@ -0,0 +1 @@
+14e774b7b6e5aa52820f0590d3b8c4d9  pyserial-2.2.zip



From fedora-extras-commits at redhat.com  Sun Nov 12 12:23:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 05:23:55 -0700
Subject: fedora-security/audit fe4,1.96,1.97 fe5,1.104,1.105 fe6,1.18,1.19
Message-ID: <200611121223.kACCNtpG023529@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23507

Modified Files:
	fe4 fe5 fe6 
Log Message:
CVE-2006-5848 (trac) taken care of for FC4+


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- fe4	11 Nov 2006 10:48:17 -0000	1.96
+++ fe4	12 Nov 2006 12:23:53 -0000	1.97
@@ -3,7 +3,7 @@
 ** are items that need attention
 
 CVE-2006-5864 VULNERABLE (gv) #215136
-CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
+CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fe5	11 Nov 2006 10:48:17 -0000	1.104
+++ fe5	12 Nov 2006 12:23:53 -0000	1.105
@@ -3,7 +3,7 @@
 ** are items that need attention
 
 CVE-2006-5864 VULNERABLE (gv) #215136
-CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
+CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fe6	12 Nov 2006 09:36:58 -0000	1.18
+++ fe6	12 Nov 2006 12:23:53 -0000	1.19
@@ -3,7 +3,7 @@
 ** are items that need attention
 
 CVE-2006-5864 VULNERABLE (gv) #215136
-CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
+CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 version (seamonkey, fixed 1.0.6) #214822



From fedora-extras-commits at redhat.com  Sun Nov 12 17:09:50 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 10:09:50 -0700
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.12,1.13
Message-ID: <200611121709.kACH9o7C007220@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-serv7204

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sun Nov 12 2006 Ville Skytt?? 
- Rebuild for kernel 2.6.18-1.2849.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- em8300-kmod.spec	11 Nov 2006 09:46:36 -0000	1.12
+++ em8300-kmod.spec	12 Nov 2006 17:09:20 -0000	1.13
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2849.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Ville Skytt?? 
+- Rebuild for kernel 2.6.18-1.2849.fc6.
+
 * Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.3.rc2
 - 0.16.0-rc2.
 



From fedora-extras-commits at redhat.com  Sun Nov 12 17:25:22 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 12 Nov 2006 10:25:22 -0700
Subject: fedora-updates-system README,NONE,1.1
Message-ID: <200611121725.kACHPMrN007421@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-updates-system
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7404

Added Files:
	README 
Log Message:
Added Readme


--- NEW FILE README ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:30:34 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:30:34 -0700
Subject: rpms/libsvg-cairo/FC-5 Makefile, 1.1, NONE branch, 1.1,
	NONE libsvg-cairo.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200611121830.kACIUYgs010848@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10840/FC-5

Removed Files:
	Makefile branch libsvg-cairo.spec sources 
Log Message:
Setting libsvg as EOL



--- Makefile DELETED ---


--- branch DELETED ---


--- libsvg-cairo.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:30:40 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:30:40 -0700
Subject: rpms/libsvg-cairo/FC-6 Makefile, 1.1, NONE branch, 1.1,
	NONE libsvg-cairo.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <200611121830.kACIUeDl010861@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10840/FC-6

Removed Files:
	Makefile branch libsvg-cairo.spec sources 
Log Message:
Setting libsvg as EOL



--- Makefile DELETED ---


--- branch DELETED ---


--- libsvg-cairo.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:30:45 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:30:45 -0700
Subject: rpms/libsvg-cairo/devel Makefile, 1.1, NONE libsvg-cairo.spec, 1.3, 
	NONE sources, 1.2, NONE
Message-ID: <200611121830.kACIUjx0010877@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10840/devel

Removed Files:
	Makefile libsvg-cairo.spec sources 
Log Message:
Setting libsvg as EOL



--- Makefile DELETED ---


--- libsvg-cairo.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:31:31 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:31:31 -0700
Subject: rpms/libsvg-cairo/FC-5 dead.package,NONE,1.1
Message-ID: <200611121831.kACIVVbL010914@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907/FC-5

Added Files:
	dead.package 
Log Message:
Forgot to add dead.package files



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core



From fedora-extras-commits at redhat.com  Sun Nov 12 18:31:36 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:31:36 -0700
Subject: rpms/libsvg-cairo/FC-6 dead.package,NONE,1.1
Message-ID: <200611121831.kACIVabO010929@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907/FC-6

Added Files:
	dead.package 
Log Message:
Forgot to add dead.package files



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core



From fedora-extras-commits at redhat.com  Sun Nov 12 18:31:42 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:31:42 -0700
Subject: rpms/libsvg-cairo/devel dead.package,NONE,1.1
Message-ID: <200611121831.kACIVgL4010944@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907/devel

Added Files:
	dead.package 
Log Message:
Forgot to add dead.package files



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core



From fedora-extras-commits at redhat.com  Sun Nov 12 18:33:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 11:33:56 -0700
Subject: owners owners.list,1.1933,1.1934
Message-ID: <200611121833.kACIXu1K010991@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10975

Modified Files:
	owners.list 
Log Message:
added flight-of-the-amazon-queen-cd


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1933
retrieving revision 1.1934
diff -u -r1.1933 -r1.1934
--- owners.list	12 Nov 2006 11:48:53 -0000	1.1933
+++ owners.list	12 Nov 2006 18:33:25 -0000	1.1934
@@ -402,6 +402,7 @@
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flasm|Flash bytecode assembler disassembler|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|flight-of-the-amazon-queen-cd|Flight of the Amazon Queen - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -2323,9 +2324,9 @@
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 18:37:18 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 12 Nov 2006 11:37:18 -0700
Subject: rpms/moomps/devel moomps.spec,1.15,1.16
Message-ID: <200611121837.kACIbIVv011029@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11013

Modified Files:
	moomps.spec 
Log Message:
made package architecture dependant since for example Tcl
packages are under /usr/lib on i386 and /usr/lib64 on x86_64



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- moomps.spec	4 Nov 2006 12:25:32 -0000	1.15
+++ moomps.spec	12 Nov 2006 18:36:48 -0000	1.16
@@ -1,12 +1,11 @@
 Name: moomps
 Version: 5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
 Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
 URL: http://moodss.sourceforge.net/
-BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl >= 8.4.7
 Requires(pre): fedora-usermgmt >= 0.8
@@ -81,6 +80,10 @@
 
 
 %changelog
+* Tue Nov 7 2006 Jean-Luc Fontaine  5.7-3
+- made package architecture dependant since for example Tcl
+  packages are under /usr/lib on i386 and /usr/lib64 on x86_64
+
 * Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
 - properly support 64 bit architecture by passing library
   directories to make



From fedora-extras-commits at redhat.com  Sun Nov 12 18:38:49 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 11:38:49 -0700
Subject: comps comps-fe5.xml.in, 1.196, 1.197 comps-fe6.xml.in, 1.220,
	1.221 comps-fe7.xml.in, 1.19, 1.20
Message-ID: <200611121838.kACIcnj5011093@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11073

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add pachi and flight-of-the-amazon-queen-cd


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- comps-fe5.xml.in	12 Nov 2006 05:23:27 -0000	1.196
+++ comps-fe5.xml.in	12 Nov 2006 18:38:19 -0000	1.197
@@ -327,6 +327,7 @@
       fbg
       fillets-ng
       flight-of-the-amazon-queen
+      flight-of-the-amazon-queen-cd
       foobillard
       fortune-mod
       fRaBs
@@ -362,6 +363,7 @@
       njam
       oneko
       overgod
+      pachi
       pengupop
       pinball
       pingus


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- comps-fe6.xml.in	12 Nov 2006 05:23:27 -0000	1.220
+++ comps-fe6.xml.in	12 Nov 2006 18:38:19 -0000	1.221
@@ -379,6 +379,7 @@
       fbg
       fillets-ng
       flight-of-the-amazon-queen
+      flight-of-the-amazon-queen-cd
       foobillard
       fortune-mod
       fRaBs
@@ -415,6 +416,7 @@
       njam
       oneko
       overgod
+      pachi
       pengupop
       pinball
       pingus


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- comps-fe7.xml.in	12 Nov 2006 09:19:52 -0000	1.19
+++ comps-fe7.xml.in	12 Nov 2006 18:38:19 -0000	1.20
@@ -379,6 +379,7 @@
       fbg
       fillets-ng
       flight-of-the-amazon-queen
+      flight-of-the-amazon-queen-cd
       foobillard
       fortune-mod
       fRaBs
@@ -415,6 +416,7 @@
       njam
       oneko
       overgod
+      pachi
       pengupop
       pinball
       pingus



From fedora-extras-commits at redhat.com  Sun Nov 12 18:51:51 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:51:51 -0700
Subject: rpms/libsvg/FC-5 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE libsvg.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <200611121851.kACIpp2H011174@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11167/FC-5

Added Files:
	dead.package 
Removed Files:
	Makefile branch libsvg.spec sources 
Log Message:
Setting libsvg as EOL



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core


--- Makefile DELETED ---


--- branch DELETED ---


--- libsvg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:51:57 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:51:57 -0700
Subject: rpms/libsvg/FC-6 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE libsvg.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200611121851.kACIpvfX011189@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11167/FC-6

Added Files:
	dead.package 
Removed Files:
	Makefile branch libsvg.spec sources 
Log Message:
Setting libsvg as EOL



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core


--- Makefile DELETED ---


--- branch DELETED ---


--- libsvg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:52:03 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:52:03 -0700
Subject: rpms/libsvg/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE libsvg.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200611121852.kACIq3pV011204@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11167/devel

Added Files:
	dead.package 
Removed Files:
	Makefile libsvg.spec sources 
Log Message:
Setting libsvg as EOL



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core


--- Makefile DELETED ---


--- libsvg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 19:13:43 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 12:13:43 -0700
Subject: owners owners.list,1.1934,1.1935
Message-ID: <200611121913.kACJDhs3014377@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14347

Modified Files:
	owners.list 
Log Message:
Added libsvg, and libsvg-cairo back



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1934
retrieving revision 1.1935
diff -u -r1.1934 -r1.1935
--- owners.list	12 Nov 2006 18:33:25 -0000	1.1934
+++ owners.list	12 Nov 2006 19:13:13 -0000	1.1935
@@ -968,6 +968,8 @@
 Fedora Extras|libspectrum|The ZX Spectrum library required for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|libstroke|A stroke interface library|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
+Fedora Extras|libsvg|A library for parsing SVG documents|work.eric at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsvg-cairo|Renders SVG content using cairo|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsx|Simple X library|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libsynaptics|Synaptics touchpad driver library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 19:19:40 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 12:19:40 -0700
Subject: rpms/xmoto/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmoto.spec, 
	1.5, 1.6
Message-ID: <200611121919.kACJJesE014439@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14419

Modified Files:
	.cvsignore sources xmoto.spec 
Log Message:
* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Sep 2006 20:40:25 -0000	1.3
+++ .cvsignore	12 Nov 2006 19:19:09 -0000	1.4
@@ -1 +1 @@
-xmoto-0.2.0-src.tar.gz
+xmoto-0.2.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Sep 2006 20:40:25 -0000	1.3
+++ sources	12 Nov 2006 19:19:09 -0000	1.4
@@ -1 +1 @@
-0404467792034dd221b92303f2750ac7  xmoto-0.2.0-src.tar.gz
+bbf2f0c02ba2ffe1f65e4ca78b0a0bd3  xmoto-0.2.2-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmoto.spec	6 Nov 2006 14:43:43 -0000	1.5
+++ xmoto.spec	12 Nov 2006 19:19:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           xmoto
-Version:        0.2.0
-Release:        2%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games
@@ -29,7 +29,7 @@
 
 
 %build
-%configure
+%configure --with-enable-zoom=1
 make %{?_smp_mflags}
 
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
+- New upstream release
+
 * Mon Nov  6 2006 Jindrich Novy  0.2.0-2
 - Rebuild against the new curl
 



From fedora-extras-commits at redhat.com  Sun Nov 12 19:43:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 12:43:36 -0700
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.13,1.14
Message-ID: <200611121943.kACJhaMO014717@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-serv14695

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sun Nov 12 2006 Ville Skytt??  - 0.16.0-0.4.rc2
- Let rpmbuild strip modules.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- em8300-kmod.spec	12 Nov 2006 17:09:20 -0000	1.13
+++ em8300-kmod.spec	12 Nov 2006 19:43:05 -0000	1.14
@@ -27,7 +27,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.3.rc2.%(echo %{kverrel} | tr - _)
+Release:        0.4.rc2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -79,6 +79,7 @@
         KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
     cd ../..
 done
+chmod +x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*.ko
 
 
 %clean
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Ville Skytt??  - 0.16.0-0.4.rc2
+- Let rpmbuild strip modules.
+
 * Sun Nov 12 2006 Ville Skytt?? 
 - Rebuild for kernel 2.6.18-1.2849.fc6.
 



From fedora-extras-commits at redhat.com  Sun Nov 12 19:44:49 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 12:44:49 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.6,1.7
Message-ID: <200611121944.kACJinwV014782@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14766

Modified Files:
	xmoto.spec 
Log Message:



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xmoto.spec	12 Nov 2006 19:19:09 -0000	1.6
+++ xmoto.spec	12 Nov 2006 19:44:19 -0000	1.7
@@ -1,3 +1,6 @@
+# No debuginfo package due to faulty find-debuginfo.sh
+%define debug_package %{nil}
+
 Name:           xmoto
 Version:        0.2.2
 Release:        1%{?dist}



From fedora-extras-commits at redhat.com  Sun Nov 12 20:00:18 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 13:00:18 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.7,1.8
Message-ID: <200611122000.kACK0IDD014894@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14866

Modified Files:
	xmoto.spec 
Log Message:



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmoto.spec	12 Nov 2006 19:44:19 -0000	1.7
+++ xmoto.spec	12 Nov 2006 19:59:48 -0000	1.8
@@ -33,7 +33,7 @@
 
 %build
 %configure --with-enable-zoom=1
-make %{?_smp_mflags}
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Sun Nov 12 20:01:05 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:01:05 -0700
Subject: rpms/libsvg/FC-5 dead.package,1.1,1.2
Message-ID: <200611122001.kACK15nC017228@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14901/FC-5

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg/FC-5/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:51:51 -0000	1.1
+++ dead.package	12 Nov 2006 20:00:35 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:01:06 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:01:06 -0700
Subject: rpms/libsvg/devel dead.package,1.1,1.2
Message-ID: <200611122001.kACK16pP017568@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14901/devel

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:52:03 -0000	1.1
+++ dead.package	12 Nov 2006 20:00:36 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:01:05 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:01:05 -0700
Subject: rpms/libsvg/FC-6 dead.package,1.1,1.2
Message-ID: <200611122001.kACK15Mc017562@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14901/FC-6

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg/FC-6/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:51:57 -0000	1.1
+++ dead.package	12 Nov 2006 20:00:35 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:05 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:02:05 -0700
Subject: fedora-updates-system/Fedora_Updates_System.egg-info - New directory
Message-ID: <200611122002.kACK25fZ018012@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/Fedora_Updates_System.egg-info
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17986/Fedora_Updates_System.egg-info

Log Message:
Directory /cvs/fedora/fedora-updates-system/Fedora_Updates_System.egg-info added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:05 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:02:05 -0700
Subject: fedora-updates-system/updatessystem - New directory
Message-ID: <200611122002.kACK25BT018015@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17986/updatessystem

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:40 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:02:40 -0700
Subject: rpms/libsvg-cairo/devel dead.package,1.1,1.2
Message-ID: <200611122002.kACK2e8x018065@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982/devel

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg-cairo/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:31:42 -0000	1.1
+++ dead.package	12 Nov 2006 20:02:10 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:40 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:02:40 -0700
Subject: rpms/libsvg-cairo/FC-6 dead.package,1.1,1.2
Message-ID: <200611122002.kACK2eFP018063@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982/FC-6

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg-cairo/FC-6/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:31:36 -0000	1.1
+++ dead.package	12 Nov 2006 20:02:08 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:40 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:02:40 -0700
Subject: rpms/libsvg-cairo/FC-5 dead.package,1.1,1.2
Message-ID: <200611122002.kACK2eIT018064@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982/FC-5

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg-cairo/FC-5/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:31:31 -0000	1.1
+++ dead.package	12 Nov 2006 20:02:06 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:40 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:40 -0700
Subject: fedora-updates-system/updatessystem/templates - New directory
Message-ID: <200611122003.kACK3evU018186@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/templates

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/templates added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:41 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:41 -0700
Subject: fedora-updates-system/updatessystem/tests - New directory
Message-ID: <200611122003.kACK3f5W018196@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/tests

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/tests added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:38 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:38 -0700
Subject: fedora-updates-system/updatessystem/static - New directory
Message-ID: <200611122003.kACK3cNv018172@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/static

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/static added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:39 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:39 -0700
Subject: fedora-updates-system/updatessystem/sqlobject-history - New
	directory
Message-ID: <200611122003.kACK3doo018176@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/sqlobject-history
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/sqlobject-history

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/sqlobject-history added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:37 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:37 -0700
Subject: fedora-updates-system/updatessystem/jobs - New directory
Message-ID: <200611122003.kACK3bm2018158@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/jobs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/jobs

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/jobs added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:36 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:36 -0700
Subject: fedora-updates-system/updatessystem/catwalk-session - New directory
Message-ID: <200611122003.kACK3aJA018130@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/catwalk-session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/catwalk-session

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/catwalk-session added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:37 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:37 -0700
Subject: fedora-updates-system/updatessystem/config - New directory
Message-ID: <200611122003.kACK3bPN018144@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/config

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/config added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:05:45 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:05:45 -0700
Subject: fedora-updates-system/updatessystem/static/css - New directory
Message-ID: <200611122005.kACK5j82018257@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220/css

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/static/css added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:05:46 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:05:46 -0700
Subject: fedora-updates-system/updatessystem/static/images - New directory
Message-ID: <200611122005.kACK5k1F018262@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220/images

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/static/images added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:05:47 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:05:47 -0700
Subject: fedora-updates-system/updatessystem/static/javascript - New
	directory
Message-ID: <200611122005.kACK5lwL018265@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/javascript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220/javascript

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/static/javascript added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:00 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:00 -0700
Subject: fedora-updates-system/Fedora_Updates_System.egg-info PKG-INFO, NONE,
	1.1 SOURCES.txt, NONE, 1.1 dependency_links.txt, NONE,
	1.1 not-zip-safe, NONE, 1.1 paster_plugins.txt, NONE,
	1.1 requires.txt, NONE, 1.1 sqlobject.txt, NONE,
	1.1 top_level.txt, NONE, 1.1
Message-ID: <200611122008.kACK8050018365@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/Fedora_Updates_System.egg-info
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/Fedora_Updates_System.egg-info

Added Files:
	PKG-INFO SOURCES.txt dependency_links.txt not-zip-safe 
	paster_plugins.txt requires.txt sqlobject.txt top_level.txt 
Log Message:
initial import


--- NEW FILE PKG-INFO ---
Metadata-Version: 1.0
Name: Fedora-Updates-System
Version: 1.0
Summary: UNKNOWN
Home-page: UNKNOWN
Author: UNKNOWN
Author-email: UNKNOWN
License: UNKNOWN
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 3 - Alpha
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Classifier: Framework :: TurboGears


--- NEW FILE SOURCES.txt ---
README.txt
setup.py
start-updatessystem.py
Fedora_Updates_System.egg-info/PKG-INFO
Fedora_Updates_System.egg-info/SOURCES.txt
Fedora_Updates_System.egg-info/dependency_links.txt
Fedora_Updates_System.egg-info/not-zip-safe
Fedora_Updates_System.egg-info/paster_plugins.txt
Fedora_Updates_System.egg-info/requires.txt
Fedora_Updates_System.egg-info/sqlobject.txt
Fedora_Updates_System.egg-info/top_level.txt
updatessystem/__init__.py
updatessystem/controllers.py
updatessystem/json.py
updatessystem/model.py
updatessystem/release.py
updatessystem/config/__init__.py
updatessystem/templates/__init__.py
updatessystem/tests/__init__.py
updatessystem/tests/test_controllers.py
updatessystem/tests/test_model.py


--- NEW FILE dependency_links.txt ---



--- NEW FILE not-zip-safe ---



--- NEW FILE paster_plugins.txt ---
TurboGears
PasteScript


--- NEW FILE requires.txt ---
TurboGears >= 1.0b1

--- NEW FILE sqlobject.txt ---
db_module=updatessystem.model
history_dir=$base/updatessystem/sqlobject-history


--- NEW FILE top_level.txt ---
updatessystem



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:08 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:08 -0700
Subject: fedora-updates-system/updatessystem/static/images favicon.ico, NONE,
	1.1 header_inner.png, NONE, 1.1 info.png, NONE, 1.1 ok.png,
	NONE, 1.1 tg_under_the_hood.png, NONE,
	1.1 under_the_hood_blue.png, NONE, 1.1
Message-ID: <200611122008.kACK882N018475@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/static/images

Added Files:
	favicon.ico header_inner.png info.png ok.png 
	tg_under_the_hood.png under_the_hood_blue.png 
Log Message:
initial import


--- NEW FILE favicon.ico ---
GIF89a
}\??bD*$h5???? ??
?D??????`-??a@



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:09 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:09 -0700
Subject: fedora-updates-system/updatessystem/tests __init__.py, NONE,
	1.1 test_controllers.py, NONE, 1.1 test_model.py, NONE, 1.1
Message-ID: <200611122008.kACK89or018485@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/tests

Added Files:
	__init__.py test_controllers.py test_model.py 
Log Message:
initial import


--- NEW FILE __init__.py ---


--- NEW FILE test_controllers.py ---
from turbogears import testutil
from updatessystem.controllers import Root
import cherrypy

cherrypy.root = Root()

def test_method():
    "the index method should return a string called now"
    import types
    result = testutil.call(cherrypy.root.index)
    assert type(result["now"]) == types.StringType

def test_indextitle():
    "The mainpage should have the right title"
    testutil.createRequest("/")
    assert "Welcome to TurboGears" in cherrypy.response.body[0]


--- NEW FILE test_model.py ---
# If your project uses a database, you can set up database tests
# similar to what you see below. Be sure to set the db_uri to
# an appropriate uri for your testing database. sqlite is a good
# choice for testing, because you can use an in-memory database
# which is very fast.

from turbogears import testutil, database
# from updatessystem.model import YourDataClass, User

# database.set_db_uri("sqlite:///:memory:")

# class TestUser(testutil.DBTest):
#     def get_model(self):
#         return User
#     def test_creation(self):
#         "Object creation should set the name"
#         obj = User(user_name = "creosote",
#                       email_address = "spam at python.not",
#                       display_name = "Mr Creosote",
#                       password = "Wafer-thin Mint")
#         assert obj.display_name == "Mr Creosote"




From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:06 -0700
Subject: fedora-updates-system/updatessystem/config __init__.py, NONE,
	1.1 app.cfg, NONE, 1.1 log.cfg, NONE, 1.1
Message-ID: <200611122008.kACK86gt018431@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/config

Added Files:
	__init__.py app.cfg log.cfg 
Log Message:
initial import


--- NEW FILE __init__.py ---


--- NEW FILE app.cfg ---
[global]
# The settings in this file should not vary depending on the deployment
# environment. dev.cfg and prod.cfg are the locations for
# the different deployment settings. Settings in this file will
# be overridden by settings in those other files.

# The commented out values below are the defaults

# VIEW

# which view (template engine) to use if one is not specified in the
# template name
# tg.defaultview = "kid"

# The following kid settings determine the settings used by the kid serializer.

# One of (html|xml|json)
# kid.outputformat="html"

# kid.encoding="utf-8"

# The sitetemplate is used for overall styling of a site that
# includes multiple TurboGears applications
# tg.sitetemplate=""

# Allow every exposed function to be called as json,
# tg.allow_json = False

# List of Widgets to include on every page.
# for exemple ['turbogears.mochikit']
# tg.include_widgets = []

# Set to True if the scheduler should be started
# tg.scheduler = False

# VISIT TRACKING
# Each visit to your application will be assigned a unique visit ID tracked via
# a cookie sent to the visitor's browser.
# --------------

# Enable Visit tracking
visit.on=True

# Number of minutes a visit may be idle before it expires.
# visit.timeout=20

# The name of the cookie to transmit to the visitor's browser.
# visit.cookie.name="tg-visit"

# Domain name to specify when setting the cookie (must begin with . according to
# RFC 2109). The default (None) should work for most cases and will default to
# the machine to which the request was made. NOTE: localhost is NEVER a valid
# value and will NOT WORK.
# visit.cookie.domain=None

# Specific path for the cookie
# visit.cookie.path="/"

# The name of the VisitManager plugin to use for visitor tracking.
visit.manager="sqlobject"

# Database class to use for visit tracking
visit.soprovider.model = "updatessystem.model.Visit"

# IDENTITY
# General configuration of the TurboGears Identity management module
# --------

# Switch to turn on or off the Identity management module
identity.on=True

# [REQUIRED] URL to which CherryPy will internally redirect when an access
# control check fails. If Identity management is turned on, a value for this
# option must be specified.
identity.failure_url="/login"

# identity.provider='sqlobject'

# The names of the fields on the login form containing the visitor's user ID
# and password. In addition, the submit button is specified simply so its
# existence may be stripped out prior to passing the form data to the target
# controller.
# identity.form.user_name="user_name"
# identity.form.password="password"
# identity.form.submit="login"

# What sources should the identity provider consider when determining the
# identity associated with a request? Comma separated list of identity sources.
# Valid sources: form, visit, http_auth
# identity.source="form,http_auth,visit"

# SqlObjectIdentityProvider
# Configuration options for the default IdentityProvider
# -------------------------

# The classes you wish to use for your Identity model. Remember to not use reserved
# SQL keywords for class names (at least unless you specify a different table
# name using sqlmeta).
identity.soprovider.model.user="updatessystem.model.User"
identity.soprovider.model.group="updatessystem.model.Group"
identity.soprovider.model.permission="updatessystem.model.Permission"

# The password encryption algorithm used when comparing passwords against what's
# stored in the database. Valid values are 'md5' or 'sha1'. If you do not
# specify an encryption algorithm, passwords are expected to be clear text.
# The SqlObjectProvider *will* encrypt passwords supplied as part of your login
# form.  If you set the password through the password property, like:
# my_user.password = 'secret'
# the password will be encrypted in the database, provided identity is up and 
# running, or you have loaded the configuration specifying what encryption to
# use (in situations where identity may not yet be running, like tests).

# identity.soprovider.encryption_algorithm=None
[/static]
static_filter.on = True
static_filter.dir = "%(top_level_dir)s/static"

[/favicon.ico]
static_filter.on = True
static_filter.file = "%(top_level_dir)s/static/images/favicon.ico"


--- NEW FILE log.cfg ---
# LOGGING
# Logging is often deployment specific, but some handlers and
# formatters can be defined here.

[logging]
[[formatters]]
[[[message_only]]]
format='*(message)s'

[[[full_content]]]
format='*(asctime)s *(name)s *(levelname)s *(message)s'

[[handlers]]
[[[debug_out]]]
class='StreamHandler'
level='DEBUG'
args='(sys.stdout,)'
formatter='full_content'

[[[access_out]]]
class='StreamHandler'
level='INFO'
args='(sys.stdout,)'
formatter='message_only'

[[[error_out]]]
class='StreamHandler'
level='ERROR'
args='(sys.stdout,)'



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:07 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:07 -0700
Subject: fedora-updates-system/updatessystem/static/css style.css,NONE,1.1
Message-ID: <200611122008.kACK8754018472@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/static/css

Added Files:
	style.css 
Log Message:
initial import


--- NEW FILE style.css ---
/*
 * Quick mash-up of CSS for the TG quick start page.
 */

html, body, th, td {
  color: black;
  background-color: #ddd;
  font: x-small "Lucida Grande", "Lucida Sans Unicode", geneva, verdana, sans-serif;
  margin: 0;
  padding: 0;
}

#header {
  height: 80px;
  width: 777px;
  background: blue URL('../images/header_inner.png') no-repeat;
  border-left: 1px solid #aaa;
  border-right: 1px solid #aaa;
  margin: 0 auto 0 auto;
}

a.link, a, a.active {
  color: #369;
}


#main_content {
  color: black;
  font-size: 127%;
  background-color: white;
  width: 757px;
  margin: 0 auto 0 auto;
  border-left: 1px solid #aaa;
  border-right: 1px solid #aaa;
  padding: 10px;
}

#sidebar {
  border: 1px solid #aaa;
  background-color: #eee;
  margin: 0.5em;
  padding: 1em;
  float: right;
  width: 200px;
  font-size: 88%;
}

#sidebar h2 {
  margin-top: 0;
}

#sidebar ul {
  margin-left: 1.5em;
  padding-left: 0;
}

h1,h2,h3,h4,h5,h6,#getting_started_steps {
  font-family: "Century Schoolbook L", Georgia, serif;
  font-weight: bold;
}

h2 {
  font-size:150%
}

#getting_started_steps a {
  text-decoration:none;
}

#getting_started_steps a:hover {
  text-decoration:underline;
}

#getting_started_steps li {
  font-size:80%
  margin-bottom: 0.5em;
}

#getting_started_steps h2 {
  font-size:120%;
}

#getting_started_steps p {
  font: 100% "Lucida Grande", "Lucida Sans Unicode", geneva, verdana, sans-serif;
}

#footer {
  border: 1px solid #aaa;
  border-top: 0px none;
  color: #999;
  background-color: white;
  padding: 10px;
  font-size: 80%;
  text-align: center;
  width: 757px;
  margin: 0 auto 1em auto;
}

.code {
  font-family: monospace;
}

span.code {
  font-weight: bold;
  background: #eee;
}

#status_block {
	margin: 0 auto 0.5em auto;
	padding: 15px 10px 15px 55px;
  background: #cec URL('../images/ok.png') left center no-repeat;
	border: 1px solid #9c9;
  width: 450px;
  font-size: 120%;
  font-weight: bolder;
}

.notice {
  margin: 0.5em auto 0.5em auto;
  padding: 15px 10px 15px 55px;
  width: 450px;
  background: #eef URL('../images/info.png') left center no-repeat;
  border: 1px solid #cce;
}



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:09 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:09 -0700
Subject: fedora-updates-system/updatessystem/templates __init__.py, NONE,
	1.1 list.kid, NONE, 1.1 login.kid, NONE, 1.1 master.kid, NONE,
	1.1 new.kid, NONE, 1.1 welcome.kid, NONE, 1.1
Message-ID: <200611122008.kACK89V1018480@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/templates

Added Files:
	__init__.py list.kid login.kid master.kid new.kid welcome.kid 
Log Message:
initial import


--- NEW FILE __init__.py ---


--- NEW FILE list.kid ---




    
    Fedora Update System




    ${updates.display()}





--- NEW FILE login.kid ---




    
    Login
    



    
      
        
      Login
      
        
      ${message}
      
        
      
            
      
                
      
                    
                        
                    
                    
                        
                    
                
      
                
      
                    
                        
                    
                    
                        
                    
                
      
                
      
                    
                        
                    
                
      
            
      

            
                
            
        
      
    
      




--- NEW FILE master.kid ---





    
    Your title goes here
    
    
    



    
      
        
            Login
        
        
            Welcome ${tg.identity.user.display_name}.
            Logout
        
    
      

    
      

    
      

	






--- NEW FILE new.kid ---




    



    
      
        
      
            
      
                
                    ${update_form.display()}
                
            
      
        
      
    
      




--- NEW FILE welcome.kid ---




Welcome to TurboGears




      
  
      Your TurboGears application is now running.
      
  
  
  
      
    
        
      
      1. 
        
        Model
        
        
         Design models in the model.py.
        
          Edit dev.cfg to use a different backend, or start with a pre-configured SQLite database. 
        
          Use script tg-admin sql create to create the database tables.
        
      
        2. 
      
      2. 
        
        View
        
        
         Edit html-like templates in the /templates folder;
        
        Put all static contents in the /static folder. 
        
      
        3. 
      
      3. 
        
        Controller
        
        
         Edit  controllers.py and build your
          website structure with the simplicity of Python objects. 
        
          TurboGears will automatically reload itself when you modify your project. 
        
      
        4. 
    
      
    
       If you create something cool, please let people know, and consider contributing something back to the community.
      
  
      
  

      





From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:05 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:05 -0700
Subject: fedora-updates-system/updatessystem __init__.py, NONE,
	1.1 controllers.py, NONE, 1.1 json.py, NONE, 1.1 model.py,
	NONE, 1.1 new.py, NONE, 1.1 release.py, NONE, 1.1
Message-ID: <200611122008.kACK85ii018408@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem

Added Files:
	__init__.py controllers.py json.py model.py new.py release.py 
Log Message:
initial import


--- NEW FILE __init__.py ---


***** Error reading new file: [Errno 2] No such file or directory: 'controllers.py'

--- NEW FILE json.py ---
# This module provides helper functions for the JSON part of your
# view, if you are providing a JSON-based API for your app.

# Here's what most rules would look like:
# @jsonify.when("isinstance(obj, YourClass)")
# def jsonify_yourclass(obj):
#     return [obj.val1, obj.val2]
# The goal is to break your objects down into simple values:
# lists, dicts, numbers and strings

from turbojson.jsonify import jsonify

from turbojson.jsonify import jsonify_sqlobject
from updatessystem.model import User, Group, Permission

@jsonify.when('isinstance(obj, Group)')
def jsonify_group(obj):
    result = jsonify_sqlobject( obj )
    result["users"] = [u.user_name for u in obj.users]
    result["permissions"] = [p.permission_name for p in obj.permissions]
    return result

@jsonify.when('isinstance(obj, User)')
def jsonify_user(obj):
    result = jsonify_sqlobject( obj )
    del result['password']
    result["groups"] = [g.group_name for g in obj.groups]
    result["permissions"] = [p.permission_name for p in obj.permissions]
    return result

@jsonify.when('isinstance(obj, Permission)')
def jsonify_permission(obj):
    result = jsonify_sqlobject( obj )
    result["groups"] = [g.group_name for g in obj.groups]
    return result


***** Error reading new file: [Errno 2] No such file or directory: 'model.py'

***** Error reading new file: [Errno 2] No such file or directory: 'new.py'

***** Error reading new file: [Errno 2] No such file or directory: 'release.py'



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:07 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:07 -0700
Subject: fedora-updates-system/updatessystem/jobs __init__.py,NONE,1.1
Message-ID: <200611122008.kACK87eP018460@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/jobs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/jobs

Added Files:
	__init__.py 
Log Message:
initial import


***** Error reading new file: [Errno 2] No such file or directory: '__init__.py'



From fedora-extras-commits at redhat.com  Sun Nov 12 20:07:57 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:07:57 -0700
Subject: fedora-updates-system dev.cfg, NONE, 1.1 sample-prod.cfg, NONE,
	1.1 setup.py, NONE, 1.1 start-updatessystem.py, NONE,
	1.1 README, 1.1, 1.2
Message-ID: <200611122007.kACK7vFQ018345@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300

Modified Files:
	README 
Added Files:
	dev.cfg sample-prod.cfg setup.py start-updatessystem.py 
Log Message:
initial import


--- NEW FILE dev.cfg ---
[global]
# This is where all of your settings go for your development environment
# Settings that are the same for both development and production
# (such as template engine, encodings, etc.) all go in 
# updatessystem/config/app.cfg

# DATABASE

# pick the form for your database
# sqlobject.dburi="postgres://username at hostname/databasename"
# sqlobject.dburi="mysql://username:password at hostname:port/databasename"
# sqlobject.dburi="sqlite:///file_name_and_path"

# If you have sqlite, here's a simple default to get you started
# in development
sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite"


# if you are using a database or table type without transactions
# (MySQL default, for example), you should turn off transactions
# by prepending notrans_ on the uri
# sqlobject.dburi="notrans_mysql://username:password at hostname:port/databasename"

# for Windows users, sqlite URIs look like:
# sqlobject.dburi="sqlite:///drive_letter:/path/to/file"

# SERVER

# Some server parameters that you may want to tweak
# server.socket_port=6543

# Enable the debug output at the end on pages.
# log_debug_info_filter.on = False

server.environment="development"
autoreload.package="updatessystem"

# session_filter.on = True

# Set to True if you'd like to abort execution if a controller gets an
# unexpected parameter. False by default
tg.strict_parameters = True

# LOGGING
# Logging configuration generally follows the style of the standard
# Python logging module configuration. Note that when specifying
# log format messages, you need to use *() for formatting variables.
# Deployment independent log configuration is in updatessystem/config/log.cfg
[logging]

[[loggers]]
[[[updatessystem]]]
level='DEBUG'
qualname='updatessystem'
handlers=['debug_out']

[[[allinfo]]]
level='INFO'
handlers=['debug_out']

[[[access]]]
level='INFO'
qualname='turbogears.access'
handlers=['access_out']
propagate=0


--- NEW FILE sample-prod.cfg ---
[global]
# This is where all of your settings go for your production environment.
# You'll copy this file over to your production server and provide it
# as a command-line option to your start script.
# Settings that are the same for both development and production
# (such as template engine, encodings, etc.) all go in 
# updatessystem/config/app.cfg

# pick the form for your database
# sqlobject.dburi="postgres://username at hostname/databasename"
# sqlobject.dburi="mysql://username:password at hostname:port/databasename"
# sqlobject.dburi="sqlite:///file_name_and_path"

# If you have sqlite, here's a simple default to get you started
# in development
sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite"


# if you are using a database or table type without transactions
# (MySQL default, for example), you should turn off transactions
# by prepending notrans_ on the uri
# sqlobject.dburi="notrans_mysql://username:password at hostname:port/databasename"

# for Windows users, sqlite URIs look like:
# sqlobject.dburi="sqlite:///drive_letter:/path/to/file"


# SERVER

server.environment="production"

# Sets the number of threads the server uses
# server.thread_pool = 1

# if this is part of a larger site, you can set the path
# to the TurboGears instance here
# server.webpath=""

# session_filter.on = True

# Set to True if you'd like to abort execution if a controller gets an
# unexpected parameter. False by default
# tg.strict_parameters = False

# LOGGING
# Logging configuration generally follows the style of the standard
# Python logging module configuration. Note that when specifying
# log format messages, you need to use *() for formatting variables.
# Deployment independent log configuration is in updatessystem/config/log.cfg
[logging]

[[handlers]]

[[[access_out]]]
# set the filename as the first argument below
args="('server.log',)"
class='FileHandler'
level='INFO'
formatter='message_only'

[[loggers]]
[[[updatessystem]]]
level='ERROR'
qualname='updatessystem'
handlers=['error_out']

[[[access]]]
level='INFO'
qualname='turbogears.access'
handlers=['access_out']
propagate=0


--- NEW FILE setup.py ---
from setuptools import setup, find_packages
from turbogears.finddata import find_package_data

import os
execfile(os.path.join("updatessystem", "release.py"))

setup(
    name="Fedora-Updates-System",
    version=version,
    
    # uncomment the following lines if you fill them out in release.py
    #description=description,
    #author=author,
    #author_email=email,
    #url=url,
    #download_url=download_url,
    #license=license,
    
    install_requires = [
        "TurboGears >= 1.0b1",
    ],
    scripts = ["start-updatessystem.py"],
    zip_safe=False,
    packages=find_packages(),
    package_data = find_package_data(where='updatessystem',
                                     package='updatessystem'),
    keywords = [
        # Use keywords if you'll be adding your package to the
        # Python Cheeseshop
        
        # if this has widgets, uncomment the next line
        # 'turbogears.widgets',
        
        # if this has a tg-admin command, uncomment the next line
        # 'turbogears.command',
        
        # if this has identity providers, uncomment the next line
        # 'turbogears.identity.provider',
    
        # If this is a template plugin, uncomment the next line
        # 'python.templating.engines',
        
        # If this is a full application, uncomment the next line
        # 'turbogears.app',
    ],
    classifiers = [
        'Development Status :: 3 - Alpha',
        'Operating System :: OS Independent',
        'Programming Language :: Python',
        'Topic :: Software Development :: Libraries :: Python Modules',
        'Framework :: TurboGears',
        # if this is an application that you'll distribute through
        # the Cheeseshop, uncomment the next line
        # 'Framework :: TurboGears :: Applications',
        
        # if this is a package that includes widgets that you'll distribute
        # through the Cheeseshop, uncomment the next line
        # 'Framework :: TurboGears :: Widgets',
    ],
    test_suite = 'nose.collector',
    )
    


--- NEW FILE start-updatessystem.py ---
#!/usr/bin/python
import pkg_resources
pkg_resources.require("TurboGears")

import turbogears
import cherrypy
cherrypy.lowercase_api = True

from os.path import *
import sys

# first look on the command line for a desired config file,
# if it's not on the command line, then
# look for setup.py in this directory. If it's not there, this script is
# probably installed
if len(sys.argv) > 1:
    turbogears.update_config(configfile=sys.argv[1], 
        modulename="updatessystem.config")
elif exists(join(dirname(__file__), "setup.py")):
    turbogears.update_config(configfile="dev.cfg",
        modulename="updatessystem.config")
else:
    turbogears.update_config(configfile="prod.cfg",
        modulename="updatessystem.config")

from updatessystem.controllers import Root

turbogears.start_server(Root())


Index: README
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README	12 Nov 2006 17:25:20 -0000	1.1
+++ README	12 Nov 2006 20:07:50 -0000	1.2
@@ -0,0 +1,6 @@
+Fedora Updates System
+http://fedoraproject.org/wiki/Infrastructure/UpdatesSystem
+Luke Macken 
+
+NOTE: This project is still under heavy development and is not yet ready
+      for production.



From fedora-extras-commits at redhat.com  Sun Nov 12 20:17:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 12 Nov 2006 13:17:35 -0700
Subject: rpms/eiciel/devel .cvsignore, 1.2, 1.3 eiciel.spec, 1.2, 1.3 sources,
	1.2, 1.3 eiciel-desktop.patch, 1.1, NONE
Message-ID: <200611122017.kACKHZc0018623@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18603

Modified Files:
	.cvsignore eiciel.spec sources 
Removed Files:
	eiciel-desktop.patch 
Log Message:
update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 05:02:25 -0000	1.2
+++ .cvsignore	12 Nov 2006 20:17:05 -0000	1.3
@@ -1 +1,2 @@
 eiciel-0.9.2.tar.bz2
+eiciel-0.9.3.tar.bz2


Index: eiciel.spec
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/eiciel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eiciel.spec	12 Nov 2006 05:04:40 -0000	1.2
+++ eiciel.spec	12 Nov 2006 20:17:05 -0000	1.3
@@ -1,12 +1,11 @@
 Name:           eiciel
-Version:        0.9.2
-Release:        8%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Graphical access control list (ACL) editor
 Group:          Applications/System
 License:        GPL
 URL:            http://rofi.pinchito.com/eiciel
 Source0:        http://rofi.pinchito.com/eiciel/download/%{name}-%{version}.tar.bz2
-Patch0:         eiciel-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel gtkmm24-devel libacl-devel nautilus-devel
 BuildRequires:  desktop-file-utils
@@ -19,10 +18,9 @@
 
 %prep
 %setup -q
-%patch0
 
 # this really should not have been packaged with the source tarball
-rm doc/C/eiciel.xml
+rm doc/C/eiciel.xml src/eiciel.desktop
 
 %build
 %configure --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0
@@ -65,6 +63,11 @@
 
 
 %changelog
+* Sun Nov 12 2006 Chris Weyl  0.9.3-1
+- update to 0.9.3
+- nuke src/eiciel.desktop during prep, drop the patch and just let configure
+  do its thing
+
 * Sat Nov 11 2006 Chris Weyl  0.9.2-8
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2006 05:02:25 -0000	1.2
+++ sources	12 Nov 2006 20:17:05 -0000	1.3
@@ -1 +1 @@
-72576cce092ff36a4fef0311bdc0dede  eiciel-0.9.2.tar.bz2
+f948b8680c53237235cebc911bdac5cb  eiciel-0.9.3.tar.bz2


--- eiciel-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 20:28:43 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:28:43 -0700
Subject: rpms/blogtk/FC-3 blogtk.spec,1.3,1.4
Message-ID: <200611122028.kACKShH5018707@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18691

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-3/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:49 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:28:12 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:30:07 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:30:07 -0700
Subject: rpms/blogtk/FC-4 blogtk.spec,1.3,1.4
Message-ID: <200611122030.kACKU7WV018795@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18762

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-4/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:50 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:29:36 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:30:50 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:30:50 -0700
Subject: rpms/blogtk/FC-5 blogtk.spec,1.3,1.4
Message-ID: <200611122030.kACKUoNO018865@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18843

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-5/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:56 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:30:20 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:31:36 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:31:36 -0700
Subject: rpms/blogtk/FC-6 blogtk.spec,1.3,1.4
Message-ID: <200611122031.kACKVaUM018926@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18909

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-6/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:56 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:31:05 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:32:19 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:32:19 -0700
Subject: rpms/blogtk/devel blogtk.spec,1.3,1.4
Message-ID: <200611122032.kACKWJAS018986@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18969

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/devel/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:56 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:31:48 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:35:25 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:35:25 -0700
Subject: rpms/gnome-sudoku/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE gnome-sudoku-0.5.0-gtk-noload.patch, 1.1,
	NONE gnome-sudoku.spec, 1.12, NONE sources, 1.4, NONE
Message-ID: <200611122035.kACKZPhe019056@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19051

Added Files:
	dead.package 
Removed Files:
	Makefile gnome-sudoku-0.5.0-gtk-noload.patch gnome-sudoku.spec 
	sources 
Log Message:
Package moved to gnome-games, BZ #214626


--- NEW FILE dead.package ---
Package moved to gnome-games, BZ #214626


--- Makefile DELETED ---


--- gnome-sudoku-0.5.0-gtk-noload.patch DELETED ---


--- gnome-sudoku.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 20:41:21 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 13:41:21 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.8,1.9
Message-ID: <200611122041.kACKfLjm019098@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081

Modified Files:
	xmoto.spec 
Log Message:



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xmoto.spec	12 Nov 2006 19:59:48 -0000	1.8
+++ xmoto.spec	12 Nov 2006 20:40:51 -0000	1.9
@@ -49,6 +49,8 @@
         --add-category X-Fedora                                 \
         %{SOURCE1}
 
+# Locale files
+%find_lang %{name} %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,7 +69,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_bindir}/xmoto
@@ -75,6 +77,8 @@
 %{_datadir}/xmoto
 %{_datadir}/applications/fedora-xmoto.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xmoto.png
+%{_mandir}/mang/xmoto-edit.6.gz
+%{_mandir}/mang/xmoto.6.gz
 
 
 %changelog



From fedora-extras-commits at redhat.com  Sun Nov 12 22:46:24 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 15:46:24 -0700
Subject: rpms/xmoto/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmoto.spec,
	1.3, 1.4
Message-ID: <200611122246.kACMkO1D026225@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26205

Modified Files:
	.cvsignore sources xmoto.spec 
Log Message:
* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Sep 2006 20:41:23 -0000	1.3
+++ .cvsignore	12 Nov 2006 22:45:53 -0000	1.4
@@ -1 +1 @@
-xmoto-0.2.0-src.tar.gz
+xmoto-0.2.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Sep 2006 20:41:23 -0000	1.3
+++ sources	12 Nov 2006 22:45:53 -0000	1.4
@@ -1 +1 @@
-0404467792034dd221b92303f2750ac7  xmoto-0.2.0-src.tar.gz
+bbf2f0c02ba2ffe1f65e4ca78b0a0bd3  xmoto-0.2.2-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-5/xmoto.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmoto.spec	13 Sep 2006 21:13:11 -0000	1.3
+++ xmoto.spec	12 Nov 2006 22:45:53 -0000	1.4
@@ -1,5 +1,8 @@
+# No debuginfo package due to faulty find-debuginfo.sh
+%define debug_package %{nil}
+
 Name:           xmoto
-Version:        0.2.0
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
@@ -29,8 +32,8 @@
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --with-enable-zoom=1
+make
 
 
 %install
@@ -46,6 +49,8 @@
         --add-category X-Fedora                                 \
         %{SOURCE1}
 
+# Locale files
+%find_lang %{name} %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,7 +69,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_bindir}/xmoto
@@ -72,9 +77,17 @@
 %{_datadir}/xmoto
 %{_datadir}/applications/fedora-xmoto.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xmoto.png
+%{_mandir}/mang/xmoto-edit.6.gz
+%{_mandir}/mang/xmoto.6.gz
 
 
 %changelog
+* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
+- New upstream release
+
+* Mon Nov  6 2006 Jindrich Novy  0.2.0-2
+- Rebuild against the new curl
+
 * Wed Sep 13 2006 Hugo Cisneiros  0.2.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Nov 12 22:48:17 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 15:48:17 -0700
Subject: rpms/xmoto/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmoto.spec,
	1.4, 1.5
Message-ID: <200611122248.kACMmHI7026306@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26280

Modified Files:
	.cvsignore sources xmoto.spec 
Log Message:
* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Sep 2006 20:40:25 -0000	1.3
+++ .cvsignore	12 Nov 2006 22:47:47 -0000	1.4
@@ -1 +1 @@
-xmoto-0.2.0-src.tar.gz
+xmoto-0.2.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Sep 2006 20:40:25 -0000	1.3
+++ sources	12 Nov 2006 22:47:47 -0000	1.4
@@ -1 +1 @@
-0404467792034dd221b92303f2750ac7  xmoto-0.2.0-src.tar.gz
+bbf2f0c02ba2ffe1f65e4ca78b0a0bd3  xmoto-0.2.2-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-6/xmoto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmoto.spec	13 Sep 2006 20:57:31 -0000	1.4
+++ xmoto.spec	12 Nov 2006 22:47:47 -0000	1.5
@@ -1,5 +1,8 @@
+# No debuginfo package due to faulty find-debuginfo.sh
+%define debug_package %{nil}
+
 Name:           xmoto
-Version:        0.2.0
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
@@ -29,8 +32,8 @@
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --with-enable-zoom=1
+make
 
 
 %install
@@ -46,6 +49,8 @@
         --add-category X-Fedora                                 \
         %{SOURCE1}
 
+# Locale files
+%find_lang %{name} %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,7 +69,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_bindir}/xmoto
@@ -72,9 +77,17 @@
 %{_datadir}/xmoto
 %{_datadir}/applications/fedora-xmoto.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xmoto.png
+%{_mandir}/mang/xmoto-edit.6.gz
+%{_mandir}/mang/xmoto.6.gz
 
 
 %changelog
+* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
+- New upstream release
+
+* Mon Nov  6 2006 Jindrich Novy  0.2.0-2
+- Rebuild against the new curl
+
 * Wed Sep 13 2006 Hugo Cisneiros  0.2.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Nov 12 23:08:33 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun, 12 Nov 2006 16:08:33 -0700
Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.10,1.11
Message-ID: <200611122308.kACN8XSt029397@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-serv29367

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for new kernel



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sysprof-kmod.spec	2 Nov 2006 10:08:14 -0000	1.10
+++ sysprof-kmod.spec	12 Nov 2006 23:07:52 -0000	1.11
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2849.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"
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gianluca Sforna 
+- rebuild for kernel 2.6.18-1.2849
+
 * Thu Nov  2 2006 Gianluca Sforna  1.0.5-1
 - version update
 - drop upstreamed patch



From fedora-extras-commits at redhat.com  Sun Nov 12 23:09:38 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:09:38 -0700
Subject: rpms/ssmtp - New directory
Message-ID: <200611122309.kACN9c1W029523@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29519/ssmtp

Log Message:
Directory /cvs/extras/rpms/ssmtp added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 23:09:44 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:09:44 -0700
Subject: rpms/ssmtp/devel - New directory
Message-ID: <200611122309.kACN9iJt029537@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29519/ssmtp/devel

Log Message:
Directory /cvs/extras/rpms/ssmtp/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 23:10:20 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:10:20 -0700
Subject: rpms/ssmtp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611122310.kACNAKhJ029572@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29566

Added Files:
	Makefile import.log 
Log Message:
Setup of module ssmtp


--- NEW FILE Makefile ---
# Top level Makefile for module ssmtp
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 Nov 12 23:10:26 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:10:26 -0700
Subject: rpms/ssmtp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611122310.kACNAQDf029591@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29566/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ssmtp


--- 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 Nov 12 23:12:20 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:12:20 -0700
Subject: rpms/ssmtp import.log,1.1,1.2
Message-ID: <200611122312.kACNCKZa029680@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29642

Modified Files:
	import.log 
Log Message:
auto-import ssmtp-2.61-8 on branch devel from ssmtp-2.61-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 23:10:20 -0000	1.1
+++ import.log	12 Nov 2006 23:11:50 -0000	1.2
@@ -0,0 +1 @@
+ssmtp-2_61-8:HEAD:ssmtp-2.61-8.src.rpm:1163373195



From fedora-extras-commits at redhat.com  Sun Nov 12 23:12:21 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:12:21 -0700
Subject: rpms/ssmtp/devel ssmtp-2.50.3-maxsysuid.patch, NONE,
	1.1 ssmtp-2.61.6.patch, NONE, 1.1 ssmtp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611122312.kACNCLxI029684@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29642/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ssmtp-2.50.3-maxsysuid.patch ssmtp-2.61.6.patch ssmtp.spec 
Log Message:
auto-import ssmtp-2.61-8 on branch devel from ssmtp-2.61-8.src.rpm

ssmtp-2.50.3-maxsysuid.patch:

--- NEW FILE ssmtp-2.50.3-maxsysuid.patch ---
--- ssmtp-2.48/ssmtp.horig	Sun Feb 10 22:32:34 2002
+++ ssmtp-2.48/ssmtp.h	Mon Feb 25 13:39:44 2002
@@ -14,7 +14,7 @@
 #define MAXWAIT (10 * 60)	/* Maximum wait between commands, in seconds */
 #define MEDWAIT (5 * 60)
 
-#define MAXSYSUID 999		/* Highest UID which is a system account */
+#define MAXSYSUID 499		/* Highest UID which is a system account */
 
 #ifndef _POSIX_ARG_MAX
 #define MAXARGS 4096
--- ssmtp-2.48/ssmtp.conf.orig	Tue May  8 14:22:08 2001
+++ ssmtp-2.48/ssmtp.conf	Mon Feb 25 13:42:41 2002
@@ -2,7 +2,7 @@
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #

-# The person who gets all mail for userids < 1000
+# The person who gets all mail for userids < 500
 # Make this empty to disable rewriting.
 root=postmaster

ssmtp-2.61.6.patch:

--- NEW FILE ssmtp-2.61.6.patch ---
--- ssmtp-2.61.orig/configure
+++ ssmtp-2.61/configure
@@ -743,7 +743,7 @@
   CFLAGS="$ac_save_CFLAGS"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g -O2 -Wall"
   else
     CFLAGS="-g"
   fi
--- ssmtp-2.61.orig/ssmtp.conf
+++ ssmtp-2.61/ssmtp.conf
@@ -36,3 +36,8 @@
 
 # Use this RSA certificate.
 #TLSCert=/etc/ssl/certs/ssmtp.pem
+
+# Get enhanced (*really* enhanced) debugging information in the logs
+# If you want to have debugging of the config file parsing, move this option
+# to the top of the config file and uncomment
+#Debug=YES
--- ssmtp-2.61.orig/ssmtp.8
+++ ssmtp-2.61/ssmtp.8
@@ -1,4 +1,4 @@
-.TH SSMTP 8 "Last change: 5 February 2000"
+.TH SSMTP 8 "Last change: 4 February 2005"
 .SH NAME
 ssmtp, sendmail \- send a message using smtp
 .SH SYNOPSIS
@@ -103,7 +103,7 @@
 
 .TP
 \fB\-C\fP\fIfile\fP 
-(ignored) Use alternate configuration file.
+Use alternate configuration file.
 
 .TP
 \fB\-d\fP\fIX\fP
@@ -273,7 +273,7 @@
  /etc/ssmtp/revaliases - reverse aliases file
 
 .SH SEE ALSO
-RFC821, RFC822.
+RFC821, RFC822, ssmtp.conf(5).
 
 .SH AUTHORS
 Matt Ryan (mryan at debian.org)
--- ssmtp-2.61.orig/ssmtp.c
+++ ssmtp-2.61/ssmtp.c
@@ -12,7 +12,8 @@
  See COPYRIGHT for the license
 
 */
-#define VERSION "2.60.4"
+#define VERSION "2.61"
+#define _GNU_SOURCE
 
 #include 
 #include 
@@ -37,7 +38,8 @@
 #include "md5auth/hmac_md5.h"
 #endif
 #include "ssmtp.h"
-
+#include 
+#include "xgethostname.h"
 
 bool_t have_date = False;
 bool_t have_from = False;
@@ -51,6 +53,7 @@
 bool_t use_tls = False;			/* Use SSL to transfer mail to HUB */
 bool_t use_starttls = False;		/* SSL only after STARTTLS (RFC2487) */
 bool_t use_cert = False;		/* Use a certificate to transfer SSL mail */
+bool_t use_oldauth = False;		/* use old AUTH LOGIN username style */
 
 #define ARPADATE_LENGTH 32		/* Current date in RFC format */
 char arpadate[ARPADATE_LENGTH];
@@ -59,7 +62,7 @@
 char *auth_method = (char)NULL;		/* Mechanism for SMTP authentication */
 char *mail_domain = (char)NULL;
 char *from = (char)NULL;		/* Use this as the From: address */
-char hostname[MAXHOSTNAMELEN] = "localhost";
+char *hostname;
 char *mailhost = "mailhub";
 char *minus_f = (char)NULL;
 char *minus_F = (char)NULL;
@@ -68,6 +71,7 @@
 char *root = NULL;
 char *tls_cert = "/etc/ssl/certs/ssmtp.pem";	/* Default Certificate */
 char *uad = (char)NULL;
+char *config_file = (char)NULL;		/* alternate configuration file */
 
 headers_t headers, *ht;
 
@@ -93,6 +97,7 @@
 static char hextab[]="0123456789abcdef";
 #endif
 
+ssize_t outbytes;
 
 /*
 log_event() -- Write event to syslog (or log file if defined)
@@ -129,7 +134,7 @@
 #endif
 }
 
-void smtp_write(int fd, char *format, ...);
+ssize_t smtp_write(int fd, char *format, ...);
 int smtp_read(int fd, char *response);
 int smtp_read_all(int fd, char *response);
 int smtp_okay(int fd, char *response);
@@ -139,7 +144,8 @@
 */
 void dead_letter(void)
 {
-	char path[(MAXPATHLEN + 1)], buf[(BUF_SZ + 1)];
+	char *path;
+	char buf[(BUF_SZ + 1)];
 	struct passwd *pw;
 	uid_t uid;
 	FILE *fp;
@@ -150,7 +156,7 @@
 	if(isatty(fileno(stdin))) {
 		if(log_level > 0) {
 			log_event(LOG_ERR,
-				"stdin is a TTY - not saving to %s/dead.letter, pw->pw_dir");
+				"stdin is a TTY - not saving to %s/dead.letter", pw->pw_dir);
 		}
 		return;
 	}
@@ -163,16 +169,21 @@
 		return;
 	}
 
-	if(snprintf(path, BUF_SZ, "%s/dead.letter", pw->pw_dir) == -1) {
+#define DEAD_LETTER "/dead.letter"
+	path = malloc (strlen (pw->pw_dir) + sizeof (DEAD_LETTER));
+	if (!path) {
 		/* Can't use die() here since dead_letter() is called from die() */
 		exit(1);
 	}
-
+	memcpy (path, pw->pw_dir, strlen (pw->pw_dir));
+	memcpy (path + strlen (pw->pw_dir), DEAD_LETTER, sizeof (DEAD_LETTER));
+	
 	if((fp = fopen(path, "a")) == (FILE *)NULL) {
 		/* Perhaps the person doesn't have a homedir... */
 		if(log_level > 0) {
 			log_event(LOG_ERR, "Can't open %s failing horribly!", path);
 		}
+		free(path);
 		return;
 	}
 
@@ -189,6 +200,7 @@
 				"Can't close %s/dead.letter, possibly truncated", pw->pw_dir);
 		}
 	}
+	free(path);
 }
 
 /*
@@ -212,27 +224,22 @@
 	exit(1);
 }
 
+#ifndef _GNU_SOURCE
 /*
 basename() -- Return last element of path
 */
 char *basename(char *str)
 {
-	char buf[MAXPATHLEN +1], *p;
+	char *p;
 
-	if((p = strrchr(str, '/'))) {
-		if(strncpy(buf, ++p, MAXPATHLEN) == (char *)NULL) {
-			die("basename() -- strncpy() failed");
-		}
+	p = strrchr(str, '/');
+	if (!p) {
+		p = str;
 	}
-	else {
-		if(strncpy(buf, str, MAXPATHLEN) == (char *)NULL) {
-			die("basename() -- strncpy() failed");
-		}
-	}
-	buf[MAXPATHLEN] = (char)NULL;
 
-	return(strdup(buf));
+	return(strdup(p));
 }
+#endif /* _GNU_SOURCE */
 
 /*
 strip_pre_ws() -- Return pointer to first non-whitespace character
@@ -778,10 +785,69 @@
[...2899 lines suppressed...]
+
+# Program End
+exit 0
--- ssmtp-2.61.orig/debian/copyright
+++ ssmtp-2.61/debian/copyright
@@ -0,0 +1,17 @@
+This package is now maintained by Anibal Monsalve Salazar 
+and co-maintained by Santiago Ruano Rincon .
+
+This package was maintained by Matt Ryan.
+
+This package was maintained by Hugo Haas.
+and was put under the GPL in version 2.1.
+Version 2.1 was maintained by Christophe Lameter.
+
+Versions up to version 2.0 were maintained by  David Collier-Brown
+and available as "Public Domain" (whatever that means).
+
+You should have received a copy of the GNU General Public License with
+your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with
+the ssmtp source package as the file COPYING.  If not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
--- ssmtp-2.61.orig/debian/preinst
+++ ssmtp-2.61/debian/preinst
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+#
+# $Id: preinst,v 1.4 2001/03/21 20:29:27 matt Exp $
+#
+
+if test -s /etc/ssmtp.conf
+then
+	echo "Configuration files found in /etc, moving them to /etc/ssmtp"
+
+	mkdir /etc/ssmtp 2>/dev/null || true
+	mv -f /etc/ssmtp.conf /etc/ssmtp 2>/dev/null || true
+
+fi
+
+if test -s /etc/revaliases
+then
+	mkdir /etc/ssmtp 2>/dev/null || true
+	mv -f /etc/revaliases /etc/ssmtp 2>/dev/null || true
+fi
+
+# Program End
+exit 0
--- ssmtp-2.61.orig/debian/logcheck.server
+++ ssmtp-2.61/debian/logcheck.server
@@ -0,0 +1 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ sSMTP\[[0-9]+\]: Sent mail for .* \([0-9]+ Bye\) uid=[0-9]+ username=[\._[:alnum:]-]+ outbytes=[0-9]+$
--- ssmtp-2.61.orig/debian/templates
+++ ssmtp-2.61/debian/templates
@@ -0,0 +1,61 @@
+Template: ssmtp/overwriteconfig
+Type: boolean
+Default: true
+_Description: Automatically overwrite config files?
+ The mail configuration file /etc/ssmtp/ssmtp.conf can be automatically
+ updated on each upgrade with the information supplied to the debconf
+ database. If you do not want this to happen (ie/ you want to maintain
+ control of this file yourself) then set this option to have the program
+ never touch this file.
+
+Template: ssmtp/root
+Type: string
+Default: postmaster
+_Description: Who gets mail for userids < 1000?
+ Mail sent to a local user whose UID is less than 1000 will instead be
+ sent here. This is useful for daemons which mail reports to root and
+ other system UIDs.
+ Make this empty to disable rewriting.
+
+Template: ssmtp/mailhub
+Type: string
+Default: mail
+_Description: Name of your mailhub?
+ This sets the host to which mail is delivered. The actual machine
+ name is required; no MX records are consulted. Commonly, mailhosts
+ are named "mail.domain.com".
+
+Template: ssmtp/port
+Type: string
+Default: 25
+_Description: Remote SMTP port number
+ If your remote SMTP server listens on a port other than 25 (Standard/RFC)
+ then set it here.
+
+Template: ssmtp/rewritedomain
+Type: string
+_Description: What domain to masquerade as?
+ ssmtp will use "username at REWRITEDOMAIN" as the default From: address
+ for outgoing mail which contains only a local username.
+
+Template: ssmtp/mailname
+Type: string
+_Description: What name to store in /etc/mailname
+ This is the portion of the address after the '@' sign to be shown on
+ outgoing news and mail messages.
+
+Template: ssmtp/hostname
+Type: string
+_Description: Fully qualified hostname?
+ This should specify the real hostname of this machine, and will be
+ sent to the mailhub when delivering mail.
+
+Template: ssmtp/fromoverride
+Type: boolean
+Default: false
+_Description: Allow override of From: line in email header?
+ A "positive" response will permit local users to enter any From: line
+ in their messages without it being mangled, and cause ssmtp to rewrite
+ the envelope header with that address. A "negative" response will
+ disallow this, and use only the default address or addresses set in
+ /etc/ssmtp/revaliases.
--- ssmtp-2.61.orig/ssmtp.conf.5
+++ ssmtp-2.61/ssmtp.conf.5
@@ -0,0 +1,81 @@
+.\"/* Copyright 2004 Reuben Thomas
+.\" * All rights reserved
+.\" *
+.\" This man page is distributed under the GNU General Public License
+.\" version 2, or at your option, any later version. There is no warranty.
+.\"
+.Dd October 7, 2004
+.Dt SSMTP.CONF 5
+.Os
+.Sh NAME
+.Nm ssmtp.conf
+.Nd ssmtp configuration file
+.Sh DESCRIPTION
+.Nm ssmtp
+reads configuration data from
+.Pa /etc/ssmtp/ssmtp.conf
+The file contains keyword-argument pairs, one per line.
+Lines starting with
+.Ql #
+and empty lines are interpreted as comments.
+.Pp
+The possible keywords and their meanings are as follows (both are case-insensitive):
+.Bl -tag -width Ds
+.It Cm Root
+The user that gets all mail for userids less than 1000. If blank, address rewriting is disabled.
+.Pp
+.It Cm Mailhub
+The host to send mail to, in the form
+.Ar host No | Ar IP_addr No Oo : Ar port Oc .
+The default port is 25.
+.Pp
+.It Cm RewriteDomain
+The domain from which mail seems to come.
+for user authentication.
+.Pp
+.It Cm Hostname
+The full qualified name of the host.
+If not specified, the host is queried for its hostname.
+.Pp
+.It Cm FromLineOverride
+Specifies whether the From header of an email, if any, may override the default domain.
+The default is
+.Dq no .
+.Pp
+.It Cm UseTLS
+Specifies whether ssmtp uses TLS to talk to the SMTP server.
+The default is
+.Dq no .
+.Pp
+.It Cm UseSTARTTLS
+Specifies whether ssmtp does a EHLO/STARTTLS before starting SSL negotiation.
+See RFC 2487.
+.Pp
+.It Cm TLSCert
+The file name of an RSA certificate to use for TLS, if required.
+.Pp
+.It Cm AuthUser
+The user name to use for SMTP AUTH.
+The default is blank, in which case SMTP AUTH is not used.
+sent without
+.Pp
+.It Cm AuthPass
+The password to use for SMTP AUTH.
+.Pp
+.It Cm AuthMethod
+The authorization method to use.
+If unset, plain text is used.
+May also be set to
+.Dq cram-md5 .
+.Sh FILES
+.Bl -tag -width Ds
+.It Pa /etc/ssmtp/ssmtp.conf
+Contains configuration data for
+.Nm ssmtp .
+.El
+.Sh SEE ALSO
+.Xr ssmtp 8
+.Sh AUTHORS
+Matt Ryan (mryan at debian.org), Hugo Haas (hugo at debian.org), Christoph Lameter (clameter at debian.org)
+and Dave Collier-Brown (davecb at hobbes.ss.org).
+Reuben Thomas (rrt at sc3d.org) wrote the man page.


--- NEW FILE ssmtp.spec ---
Name:		ssmtp
Version:	2.61
Release:	8%{?dist}
Summary:	Extremely simple MTA to get mail off the system to a Mailhub
Group:		Applications/Internet
License:	GPL
URL:		http://packages.debian.org/stable/mail/ssmtp.html
Source0:	ftp://ftp.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.orig.tar.gz
#Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
Patch0:		%{name}-%{version}.6.patch
Patch1:		%{name}-2.50.3-maxsysuid.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
Requires(post):	%{_sbindir}/alternatives
Requires(preun):	%{_sbindir}/alternatives
BuildRequires:	openssl-devel


%description
A secure, effective and simple way of getting mail off a system to your mail
hub. It contains no suid-binaries or other dangerous things - no mail spool
to poke around in, and no daemons running in the background. Mail is simply
forwarded to the configured mailhost. Extremely easy configuration.

WARNING: the above is all it does; it does not receive mail, expand aliases
or manage a queue. That belongs on a mail hub with a system administrator.


%prep
%setup -q
%patch -p1
%patch1 -p1


%build
#on RHEL3 krb5 is somewhere else
#test -e /usr/include/krb5.h || CPPFLAGS="-I/usr/kerberos/include"
#CPPFLAGS=$(pkg-config --cflags-only-I openssl)
%if "0%{?dist}" == "0el3" 
	%define cppflags -I/usr/kerberos/include
%endif
%configure --enable-ssl --enable-md5auth --enable-inet6
%if "0%{?dist}" == "0el3" 
	make %{?_smp_mflags} CPPFLAGS=%{cppflags}
%else
	make %{?_smp_mflags}
%endif
%install 
rm -rf %{buildroot}
install -p -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name}
#install -p -D -m 755 generate_config_alt %{buildroot}%{_bindir}/generate_config_alt
mkdir %{buildroot}%{_bindir}/
install -p -D -m 644 revaliases %{buildroot}%{_sysconfdir}/ssmtp/revaliases
install -p -m 644 ssmtp.conf %{buildroot}%{_sysconfdir}/ssmtp/ssmtp.conf
install -p -D -m 644 ssmtp.8 %{buildroot}%{_mandir}/man8/ssmtp.8
install -p -D -m 644 debian/mailq.8 %{buildroot}%{_mandir}/man1/mailq.ssmtp.1
install -p -m 644 debian/newaliases.8 %{buildroot}%{_mandir}/man1/newaliases.ssmtp.1
install -p -D -m 644 ssmtp.conf.5 %{buildroot}%{_mandir}/man5/ssmtp.conf.5
ln -s %{_sbindir}/%{name} %{buildroot}%{_sbindir}/sendmail.ssmtp
ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/newaliases.ssmtp
ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/mailq.ssmtp


%clean
rm -rf %{buildroot}

%post
%{_sbindir}/alternatives  --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.ssmtp 30 \
	--slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.ssmtp \
	--slave %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.ssmtp \
	--slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/mailq.ssmtp.1.gz \
	--slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.ssmtp.1.gz \
	--slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man8/ssmtp.8.gz 


%preun
#only remove in case of erase (but not at upgrade)
if [ $1 -eq 0 ] ; then
	%{_sbindir}/alternatives --remove mta %{_sbindir}/sendmail.ssmtp
fi
exit 0

#%postun
#if [ $1 -eq 0 ] ; then
#	/usr/sbin/alternatives --auto mta
#fi
#exit 0

%files
%defattr(-,root,root,-)
%doc COPYING INSTALL README TLS CHANGELOG_OLD debian/changelog
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_mandir}/man1/*
%{_sbindir}/%{name}
#%{_bindir}/generate_config_alt
%{_sbindir}/sendmail.ssmtp
%{_bindir}/newaliases.ssmtp
%{_bindir}/mailq.ssmtp
%dir %{_sysconfdir}/ssmtp/
%config(noreplace) %{_sysconfdir}/ssmtp/revaliases
%config(noreplace) %{_sysconfdir}/ssmtp/ssmtp.conf


%changelog
* Mon Oct 10 2006 lonely wolf  2.61-8
- enabled IPv6 (just added this option to %%configure, the capability was already there)
- removed yet another man page from %%Provides
- cosmetic fixes - consistent use of macros
- added a missing Require
- I have also included a [commented] URL to the current patch (v9) provided by Debian. Because starting with version 8 the patch modifies the SSL libraries used. I will include this modification once I can perform more tests. 

* Mon Oct 10 2006 lonely wolf  2.61-7
- removed man pages and stubs from %%Provides

* Fri Sep 22 2006 lonely wolf  2.61-6
- cosmetic fixes

* Tue Apr 11 2006 lonely wolf  2.61-5
- cleaner hack for RHEL 3
- added back Provides: smtpdaemon
- correct typo in Provides
 
* Tue Apr 11 2006 lonely wolf  2.61-4
- hack for RHEL 3 which has krb5.h in a different place
 
* Mon Apr 10 2006 lonely wolf  2.61-3
- removed Requires: openssl
- removed Provides: smtpdaemon
- cleaning of %%files
- correct typos in version numbers in changelog
- disabled "alternatives --auto mta" in postrun macro, pending more tests

* Sat Apr 8 2006 lonely wolf  2.61-2
- fix spec file: consistent use of buildroot macro, no double "ssmtp" in files' name, switch back the name of the main patch to the one used by Debian
- removed the generate_config_alt script; it is ugly, buggy and completely replaces the default provided configuration file, including the comments (which are useful)
- add openssl to requires and openssl-devel to buildrequires
- fix pre/post install scriptlets (upgrade would have removed the files from the alternatives system)
- remove two unneeded files from the alternatives call; man sendmail will default to the page provided by ssmtp

* Thu Apr 6 2006 lonely wolf  2.61-1
- Initial rpm version, based on Debian sources & patch
- Includes patch from Mandrake to lower the default system UIDs from 1000 to 500
- Includes generate_config_alt, a small script to generate a customized ssmtp.conf (thus overriding the default one); beware that this script will completely replace the default ssmtp.conf.
- Customized to play nice in the alternatives environment


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 23:10:26 -0000	1.1
+++ .cvsignore	12 Nov 2006 23:11:51 -0000	1.2
@@ -0,0 +1 @@
+ssmtp_2.61.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 23:10:26 -0000	1.1
+++ sources	12 Nov 2006 23:11:51 -0000	1.2
@@ -0,0 +1 @@
+957e6fff08625fe34f4fc33d0925bbc9  ssmtp_2.61.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 23:23:24 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:23:24 -0700
Subject: owners owners.list,1.1935,1.1936
Message-ID: <200611122323.kACNNOdp029829@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29801/owners

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1935
retrieving revision 1.1936
diff -u -r1.1935 -r1.1936
--- owners.list	12 Nov 2006 19:13:13 -0000	1.1935
+++ owners.list	12 Nov 2006 23:22:54 -0000	1.1936
@@ -2154,6 +2154,7 @@
 Fedora Extras|srecord|Manipulate EPROM load files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|ss5|A socks firewall|matteo.ricchetti at libero.it|extras-qa at fedoraproject.org|matteo.ricchetti at libero.it
 Fedora Extras|sshfp|Generate SSHFP DNS records from knownhosts files or ssh-keyscan|paul at xelerance.com|extras-qa at fedoraproject.org|
+Fedora Extras|ssmtp|Extremely simple MTA to get mail off the system to a Mailhub|wolfy at nobugconsulting.ro|extras-qa at fedoraproject.org|
 Fedora Extras|ssss|Shamir's secret sharing scheme|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|steghide|A steganography program|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 23:43:21 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:43:21 -0700
Subject: rpms/Pound - New directory
Message-ID: <200611122343.kACNhLJb030067@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30063/Pound

Log Message:
Directory /cvs/extras/rpms/Pound added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 23:43:27 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:43:27 -0700
Subject: rpms/Pound/devel - New directory
Message-ID: <200611122343.kACNhRmW030081@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30063/Pound/devel

Log Message:
Directory /cvs/extras/rpms/Pound/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 23:43:46 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:43:46 -0700
Subject: rpms/Pound Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611122343.kACNhkV9030112@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30106

Added Files:
	Makefile import.log 
Log Message:
Setup of module Pound


--- NEW FILE Makefile ---
# Top level Makefile for module Pound
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 Nov 12 23:43:52 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:43:52 -0700
Subject: rpms/Pound/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611122343.kACNhqmf030130@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30106/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Pound


--- 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 Nov 12 23:45:06 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:45:06 -0700
Subject: rpms/Pound import.log,1.1,1.2
Message-ID: <200611122345.kACNj6P6030216@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30180

Modified Files:
	import.log 
Log Message:
auto-import Pound-2.1.6-2 on branch devel from Pound-2.1.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Pound/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 23:43:46 -0000	1.1
+++ import.log	12 Nov 2006 23:44:35 -0000	1.2
@@ -0,0 +1 @@
+Pound-2_1_6-2:HEAD:Pound-2.1.6-2.src.rpm:1163375067



From fedora-extras-commits at redhat.com  Sun Nov 12 23:45:06 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:45:06 -0700
Subject: rpms/Pound/devel Pound.spec, NONE, 1.1 pound.cfg, NONE,
	1.1 pound.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611122345.kACNj6rF030220@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30180/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Pound.spec pound.cfg pound.init 
Log Message:
auto-import Pound-2.1.6-2 on branch devel from Pound-2.1.6-2.src.rpm


--- NEW FILE Pound.spec ---
%define pound_user	pound
%define pound_group	%{pound_user}
%define pound_home	%{_localstatedir}/lib/pound

Name:		Pound          
Version:	2.1.6       
Release:	2%{?dist}
Summary:	Reverse proxy and load balancer        

Group:		System Environment/Daemons
License:	GPL        
URL:		http://apsis.ch/pound
           
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	openssl-devel, pcre-devel

Requires(pre):    %{_sbindir}/useradd
Requires(post):   /sbin/chkconfig
Requires(preun):  /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service

Source0:	http://apsis.ch/pound/%{name}-%{version}.tgz       
Source1:	pound.init
Source2:	pound.cfg

%description
The Pound program is a reverse proxy, load balancer and
HTTPS front-end for Web server(s). Pound was developed
to enable distributing the load among several Web-servers
and to allow for a convenient SSL wrapper for those Web
servers that do not offer it natively. Pound is distributed
under the GPL - no warranty, it's free to use, copy and
give away

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%{__install} -d %{buildroot}%{pound_home}
%{__install} -p -D -m 0755 -s pound %{buildroot}%{_sbindir}/pound
%{__install} -p -D -m 0755 -s poundctl %{buildroot}%{_sbindir}/poundctl
%{__install} -p -D -m 0644 pound.8 %{buildroot}%{_mandir}/man8/pound.8
%{__install} -p -D -m 0644 poundctl.8 %{buildroot}%{_mandir}/man8/poundctl.8
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/pound
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pound.cfg 

mkdir -p %{buildroot}%{_sysconfdir}/pki/tls/certs
touch %{buildroot}%{_sysconfdir}/pki/tls/certs/pound.pem

%clean
rm -rf %{buildroot}

%pre
%{_sbindir}/useradd -c "Pound user" -s /bin/false -r -d %{pound_home} \
    %{pound_user} 2>/dev/null || :

%post
/sbin/chkconfig --add pound

# generate dummy certificate
exec > /dev/null 2> /dev/null
if [ ! -f %{_sysconfdir}/pki/tls/certs/pound.pem ] ; then
pushd %{_sysconfdir}/pki/tls/certs
umask 077
cat << EOF | make pound.pem
--
SomeState
SomeCity
Pound Example Certificate
SomeOrganizationalUnit
localhost.localdomain
root at localhost.localdomain
EOF
chown root:pound pound.pem
chmod 640 pound.pem
popd
fi
exit 0

%preun
if [ $1 = 0 ]; then
	/sbin/service pound stop >/dev/null 2>&1
	/sbin/chkconfig --del pound
fi

%postun
if [ $1 -ge 1 ] ; then
        /sbin/service pound condrestart > /dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%doc CHANGELOG FAQ GPL.html README
%{_mandir}/man8/pound.8*
%{_mandir}/man8/poundctl.8*
%{_sbindir}/pound
%{_sbindir}/poundctl
%{_initrddir}/pound
%config(noreplace) %{_sysconfdir}/pound.cfg
%ghost %config(noreplace) %{_sysconfdir}/pki/tls/certs/pound.pem
%attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}

%changelog
* Wed Nov 08 2006  2.1.6-2
- Changed hardcoded paths into rpmmacros
* Mon Nov 06 2006  2.1.6-1
- Synced with upstream version
- Changed Summary
- Added an init script
- Added pound.cfg with an example configuration
- Added pound user and group
- A self-signed ssl certificate is created in %%post

* Fri Nov 03 2006  2.1.5-1
- initial version



--- NEW FILE pound.cfg ---
#
# Default pound.cfg
#
# Pound listens on port 80 for HTTP and port 443 for HTTPS
# and distributes requests to 2 backends running on localhost.
# see pound(8) for configuration directives.
# You can enable/disable backends with poundctl(8).
#

User "pound"
Group "pound"
Control "/var/lib/pound/pound.cfg"

ListenHTTP
    Address 0.0.0.0
    Port 80
End

ListenHTTPS
    Address 0.0.0.0
    Port    443
    Cert    "/etc/pki/tls/certs/pound.pem"
End

Service
    BackEnd
        Address 127.0.0.1
        Port    8000
    End
    
    BackEnd
        Address 127.0.0.1
        Port    8001
    End
End


--- NEW FILE pound.init ---
#!/bin/bash
#
# pound         This shell script starts the Pound load-balancer
#
# Author:       Ruben Kerkhof 
#
# chkconfig: - 85 15
#
# description:  Pound is a reverse proxy and load-balancer
# processname:  pound
# config: /etc/pound.cfg
# pidfile: /var/run/pound.pid
#

# source function library
. /etc/rc.d/init.d/functions

RETVAL=0

start() {
	echo -n $"Starting Pound: "
	daemon pound
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/pound
}

stop() {
	echo -n $"Stopping Pound: "
	killproc pound
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pound
}

restart() {
	stop
	start
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|force-reload|reload)
	restart
	;;
  condrestart)
	[ -f /var/lock/subsys/pound ] && restart
	;;
  status)
	status pound
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Pound/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 23:43:52 -0000	1.1
+++ .cvsignore	12 Nov 2006 23:44:36 -0000	1.2
@@ -0,0 +1 @@
+Pound-2.1.6.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Pound/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 23:43:52 -0000	1.1
+++ sources	12 Nov 2006 23:44:36 -0000	1.2
@@ -0,0 +1 @@
+d9cec1718f733e7d79a2e352b10c06d5  Pound-2.1.6.tgz



From fedora-extras-commits at redhat.com  Sun Nov 12 23:53:04 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:53:04 -0700
Subject: owners owners.list,1.1936,1.1937
Message-ID: <200611122353.kACNr4GO030339@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30270/owners

Modified Files:
	owners.list 
Log Message:
Added Pound



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1936
retrieving revision 1.1937
diff -u -r1.1936 -r1.1937
--- owners.list	12 Nov 2006 23:22:54 -0000	1.1936
+++ owners.list	12 Nov 2006 23:52:34 -0000	1.1937
@@ -1848,6 +1848,7 @@
 Fedora Extras|pork|Console based AIM client that looks like ircII|rmccabe at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|portaudio|Free, cross platform, open-source, audio I/O library|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|poster|Scales PostScript images to span multiple pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
+Fedora Extras|Pound|A reverse-proxy and load balancer|ruben at rubenkerkhof.com|extras-qa at fedoraproject.org|
 Fedora Extras|powerman|Remote Power Management Software|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|powermanga|Arcade 2D shoot-them-up game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ppracer|3D racing game featuring Tux|nphilipp at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 00:23:47 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sun, 12 Nov 2006 17:23:47 -0700
Subject: rpms/mlton/devel .cvsignore, 1.2, 1.3 mlton.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <200611130023.kAD0Nlq1001101@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1074

Modified Files:
	.cvsignore mlton.spec sources 
Log Message:
new mlton


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 13:51:57 -0000	1.2
+++ .cvsignore	13 Nov 2006 00:23:17 -0000	1.3
@@ -1,3 +1 @@
-mlton-20051202-1.src.tgz
-mlton-bootstrap.i386.tar.bz2
-mlton-bootstrap.ppc.tar.bz2
+mlton-20061107.tar.bz2


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlton.spec	1 Sep 2006 03:16:33 -0000	1.3
+++ mlton.spec	13 Nov 2006 00:23:17 -0000	1.4
@@ -1,14 +1,14 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20051202
-Release:	8%{?dist}.1
+Version:	20061107
+Release:	1%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	BSD style and MIT
 URL:		http://mlton.org/
-Source0:	http://mlton.org/pages/Download/attachments/mlton-%{version}-1.src.tgz
+Source0:	mlton-%{version}.tar.bz2
 %if %{mlton_bootstrap}
 # taken from mlton_20060213-1 from Debian
 Source1:	mlton-bootstrap.i386.tar.bz2
@@ -21,7 +21,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gmp-devel htmldoc tetex-latex which
+BuildRequires:	gmp-devel htmldoc tetex-latex
 %if ! %{mlton_bootstrap}
 BuildRequires:	mlton
 %endif
@@ -100,6 +100,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 12 2006 Adam Goode  - 20061107-1
+- New release, taken from svn://mlton.org/mlton/tags/on-20061107
+
 * Thu Aug 31 2006 Adam Goode  - 20051202-8.1
 - Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 13:51:57 -0000	1.2
+++ sources	13 Nov 2006 00:23:17 -0000	1.3
@@ -1,3 +1 @@
-766b25e39dff36da5f3ed81effd5471b  mlton-20051202-1.src.tgz
-34f8bf4c11cca4867beb3bccab04b0a5  mlton-bootstrap.i386.tar.bz2
-16358b27a8f86ec1aede640fff1c77ff  mlton-bootstrap.ppc.tar.bz2
+eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 01:58:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 18:58:31 -0700
Subject: rpms/xfce4-dict-plugin - New directory
Message-ID: <200611130158.kAD1wVSc004470@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4466/xfce4-dict-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-dict-plugin added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 01:58:37 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 18:58:37 -0700
Subject: rpms/xfce4-dict-plugin/devel - New directory
Message-ID: <200611130158.kAD1wbbI004485@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4466/xfce4-dict-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-dict-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 01:58:59 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 18:58:59 -0700
Subject: rpms/xfce4-dict-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611130158.kAD1wxgs004515@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4509

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-dict-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-dict-plugin
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  Mon Nov 13 01:59:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 18:59:04 -0700
Subject: rpms/xfce4-dict-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611130159.kAD1x4vl004532@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4509/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-dict-plugin


--- 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 Nov 13 02:00:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 19:00:23 -0700
Subject: rpms/xfce4-dict-plugin import.log,1.1,1.2
Message-ID: <200611130200.kAD20N1X004617@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4573

Modified Files:
	import.log 
Log Message:
auto-import xfce4-dict-plugin-0.2.0-2.fc6 on branch devel from xfce4-dict-plugin-0.2.0-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dict-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 01:58:58 -0000	1.1
+++ import.log	13 Nov 2006 01:59:53 -0000	1.2
@@ -0,0 +1 @@
+xfce4-dict-plugin-0_2_0-2_fc6:HEAD:xfce4-dict-plugin-0.2.0-2.fc6.src.rpm:1163383185



From fedora-extras-commits at redhat.com  Mon Nov 13 02:00:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 19:00:24 -0700
Subject: rpms/xfce4-dict-plugin/devel xfce4-dict-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611130200.kAD20O3P004621@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-dict-plugin.spec 
Log Message:
auto-import xfce4-dict-plugin-0.2.0-2.fc6 on branch devel from xfce4-dict-plugin-0.2.0-2.fc6.src.rpm


--- NEW FILE xfce4-dict-plugin.spec ---
Name:		xfce4-dict-plugin
Version:	0.2.0
Release:	2%{?dist}
Summary:	A XFCE panel plugin to query a Dict server

Group:		User Interface/Desktops
License:	GPL
URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0:	http://files.uvena.de/xfce4-dict-plugin/xfce4-dict-plugin-0.2.0.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2
BuildRequires:	libxml2-devel, gettext, perl(XML::Parser)
Requires:	xfce4-panel >= 4.3.99.2

%description
With this plugin you can query a dictionary server (see RFC 2229) to search 
for the translation or explanation of a word. You can also choose a dictionary 
offered by the server to improve your search results.

%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}


%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


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libexecdir}/xfce4/panel-plugins/%{name}
%{_datadir}/xfce4/panel-plugins/*.desktop
%{_datadir}/icons/hicolor/scalable/apps/dict-icon.svg


%changelog
* Sun Nov 12 2006 Christoph Wickert  - 0.2.0-2
- Add %%defattr (#215169).

* Sat Nov 11 2006 Christoph Wickert  - 0.2.0-1
- Update to 0.2.0.

* Sat Sep 23 2006 Christoph Wickert  - 0.1.0-1
- Initial Fedora Extras version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dict-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 01:59:04 -0000	1.1
+++ .cvsignore	13 Nov 2006 01:59:54 -0000	1.2
@@ -0,0 +1 @@
+xfce4-dict-plugin-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dict-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 01:59:04 -0000	1.1
+++ sources	13 Nov 2006 01:59:54 -0000	1.2
@@ -0,0 +1 @@
+ac2f3626858b7b6800ac43cc9de6e0bc  xfce4-dict-plugin-0.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 02:16:11 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 19:16:11 -0700
Subject: owners owners.list,1.1937,1.1938
Message-ID: <200611130216.kAD2GBEO007809@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7793

Modified Files:
	owners.list 
Log Message:
add xfce4-dict-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1937
retrieving revision 1.1938
diff -u -r1.1937 -r1.1938
--- owners.list	12 Nov 2006 23:52:34 -0000	1.1937
+++ owners.list	13 Nov 2006 02:15:41 -0000	1.1938
@@ -2418,6 +2418,7 @@
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-dev-tools|Xfce developer tools|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-dict-plugin|A Xfce panel plugin to query a Dict server|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-eyes-plugin|Eyes for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 02:36:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 12 Nov 2006 19:36:54 -0700
Subject: rpms/eiciel/devel .cvsignore, 1.3, 1.4 eiciel.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200611130236.kAD2asnW007926@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7906

Modified Files:
	.cvsignore eiciel.spec sources 
Log Message:
update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Nov 2006 20:17:05 -0000	1.3
+++ .cvsignore	13 Nov 2006 02:36:24 -0000	1.4
@@ -1,2 +1 @@
-eiciel-0.9.2.tar.bz2
-eiciel-0.9.3.tar.bz2
+eiciel-0.9.4.tar.bz2


Index: eiciel.spec
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/eiciel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eiciel.spec	12 Nov 2006 20:17:05 -0000	1.3
+++ eiciel.spec	13 Nov 2006 02:36:24 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           eiciel
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        Graphical access control list (ACL) editor
 Group:          Applications/System
@@ -19,8 +19,6 @@
 %prep
 %setup -q
 
-# this really should not have been packaged with the source tarball
-rm doc/C/eiciel.xml src/eiciel.desktop
 
 %build
 %configure --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0
@@ -63,6 +61,10 @@
 
 
 %changelog
+* Sun Nov 12 2006 Chris Weyl 
+- update to 0.9.4
+- src/eiciel.desktop and doc/C/eiciel.xml no longer in source tarball 
+
 * Sun Nov 12 2006 Chris Weyl  0.9.3-1
 - update to 0.9.3
 - nuke src/eiciel.desktop during prep, drop the patch and just let configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Nov 2006 20:17:05 -0000	1.3
+++ sources	13 Nov 2006 02:36:24 -0000	1.4
@@ -1 +1 @@
-f948b8680c53237235cebc911bdac5cb  eiciel-0.9.3.tar.bz2
+7678fe1da7959bed47f653b810f5f285  eiciel-0.9.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 05:49:39 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 22:49:39 -0700
Subject: rpms/scummvm/devel scummvm.spec,1.2,1.3
Message-ID: <200611130549.kAD5ndrG017817@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17801

Modified Files:
	scummvm.spec 
Log Message:
* 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)



Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scummvm.spec	8 Nov 2006 10:01:13 -0000	1.2
+++ scummvm.spec	13 Nov 2006 05:49:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scummvm
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPL
@@ -31,7 +31,7 @@
 %patch0 -p1 -b .gcc41
 %patch1 -p1 -b .nostrip
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
-sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \
+sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
 
 
@@ -60,7 +60,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   dists/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -106,6 +105,10 @@
 
 
 %changelog
+* 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)
+
 * Sat Nov  4 2006 Hans de Goede  0.9.1-1
 - New upstream release 0.9.1
 - Prepare for inclusion into FE



From fedora-extras-commits at redhat.com  Mon Nov 13 05:50:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 22:50:47 -0700
Subject: rpms/scummvm/FC-6 scummvm.spec,1.2,1.3
Message-ID: <200611130550.kAD5olvI017879@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17861

Modified Files:
	scummvm.spec 
Log Message:
* 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)



Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/FC-6/scummvm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scummvm.spec	8 Nov 2006 10:01:13 -0000	1.2
+++ scummvm.spec	13 Nov 2006 05:50:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scummvm
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPL
@@ -31,7 +31,7 @@
 %patch0 -p1 -b .gcc41
 %patch1 -p1 -b .nostrip
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
-sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \
+sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
 
 
@@ -60,7 +60,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   dists/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -106,6 +105,10 @@
 
 
 %changelog
+* 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)
+
 * Sat Nov  4 2006 Hans de Goede  0.9.1-1
 - New upstream release 0.9.1
 - Prepare for inclusion into FE



From fedora-extras-commits at redhat.com  Mon Nov 13 05:52:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 22:52:10 -0700
Subject: rpms/scummvm/FC-5 scummvm.spec,1.2,1.3
Message-ID: <200611130552.kAD5qA2o017939@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17923

Modified Files:
	scummvm.spec 
Log Message:
* 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)



Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/FC-5/scummvm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scummvm.spec	8 Nov 2006 10:01:13 -0000	1.2
+++ scummvm.spec	13 Nov 2006 05:51:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scummvm
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPL
@@ -31,7 +31,7 @@
 %patch0 -p1 -b .gcc41
 %patch1 -p1 -b .nostrip
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
-sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \
+sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
 
 
@@ -60,7 +60,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   dists/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -106,6 +105,10 @@
 
 
 %changelog
+* 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)
+
 * Sat Nov  4 2006 Hans de Goede  0.9.1-1
 - New upstream release 0.9.1
 - Prepare for inclusion into FE



From fedora-extras-commits at redhat.com  Mon Nov 13 06:00:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:00:49 -0700
Subject: rpms/nickle - New directory
Message-ID: <200611130600.kAD60nq1018096@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18092/nickle

Log Message:
Directory /cvs/extras/rpms/nickle added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 06:00:54 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:00:54 -0700
Subject: rpms/nickle/devel - New directory
Message-ID: <200611130600.kAD60sPM018110@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18092/nickle/devel

Log Message:
Directory /cvs/extras/rpms/nickle/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 06:01:16 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:01:16 -0700
Subject: rpms/nickle Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611130601.kAD61GL1021085@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21079

Added Files:
	Makefile import.log 
Log Message:
Setup of module nickle


--- NEW FILE Makefile ---
# Top level Makefile for module nickle
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  Mon Nov 13 06:01:26 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:01:26 -0700
Subject: rpms/nickle/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611130601.kAD61Qws021114@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21079/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nickle


--- 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 Nov 13 06:02:52 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:02:52 -0700
Subject: rpms/nickle/devel nickle.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611130602.kAD62qB6021195@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nickle.spec 
Log Message:
auto-import nickle-2.54-2 on branch devel from nickle-2.54-2.src.rpm


--- NEW FILE nickle.spec ---
Name:    nickle
Version: 2.54
Release: 2%{?dist}
Summary: A programming language-based prototyping environment

Group:   Development/Languages
License: MIT
URL:     http://nickle.org
Source0: http://nickle.org/release/nickle-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: ncurses-devel, readline-devel

%description
Nickle is a programming language based prototyping environment with
powerful programming and scripting capabilities. Nickle supports a
variety of datatypes, especially arbitrary precision numbers. The
programming language vaguely resembles C. Some things in C which do
not translate easily are different, some design choices have been made
differently, and a very few features are simply missing.

Nickle provides the functionality of UNIX bc, dc and expr in
much-improved form. It is also an ideal environment for prototyping
complex algorithms. Nickle's scripting capabilities make it a nice
replacement for spreadsheets in some applications, and its numeric
features nicely complement the limited numeric functionality of
text-oriented languages such as AWK and PERL.

%package devel
Summary:  Include files for Nickle
Group:    Development/Languages
Requires: %{name} = %{version}-%{release}

%description devel
Include files for Nickle, used for bulding external FFI (foreign
function interface) libraries (e.g. the Cairo interface for Nickle).

%prep
%setup -q


%build
%configure
make %{?_smp_flags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm `find examples -name 'Makefile*'`
rm examples/COPYING

# Fix permissions on example files
chmod a-x examples/menace2.5c
chmod a-x examples/turtle/snowflake.5c


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README README.name COPYING AUTHORS ChangeLog NEWS TODO examples
%{_bindir}/nickle
%{_datadir}/nickle/
%exclude %{_datadir}/nickle/COPYING
%exclude %{_datadir}/nickle/examples
%{_mandir}/man1/nickle.1*

%files devel
%defattr(-, root, root,-)
%{_includedir}/nickle

%changelog
* Sat Nov  4 2006 Michel Salim  2.54-2
- Only package example files once, remove leftover Makefiles

* Thu Nov  2 2006 Michel Salim  2.54-1
- Update to 2.54
- Use exclude macro instead of ghost

* Sun Mar 19 2006 Michel Salim  2.53-3
- Moved examples to doc
- Removed redundant COPYING files from examples

* Sun Mar  5 2006 Michel Salim  2.53-2
- Removed INSTALL from installed documentation
- Added description for devel package

* Sat Feb 18 2006 Michel Salim  2.53-1
- Initial Fedora package

* Thu Mar  1 2004 Mike A. Harris  2.29-2
- Initial rpm spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nickle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 06:01:25 -0000	1.1
+++ .cvsignore	13 Nov 2006 06:02:20 -0000	1.2
@@ -0,0 +1 @@
+nickle-2.54.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nickle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 06:01:25 -0000	1.1
+++ sources	13 Nov 2006 06:02:20 -0000	1.2
@@ -0,0 +1 @@
+ffc7b03a830e64ec0547777330ae00b8  nickle-2.54.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 06:02:52 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:02:52 -0700
Subject: rpms/nickle import.log,1.1,1.2
Message-ID: <200611130602.kAD62qxE021194@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157

Modified Files:
	import.log 
Log Message:
auto-import nickle-2.54-2 on branch devel from nickle-2.54-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nickle/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 06:01:16 -0000	1.1
+++ import.log	13 Nov 2006 06:02:19 -0000	1.2
@@ -0,0 +1 @@
+nickle-2_54-2:HEAD:nickle-2.54-2.src.rpm:1163397732



From fedora-extras-commits at redhat.com  Mon Nov 13 07:04:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:04:34 -0700
Subject: rpms/php-pear-HTML-Common - New directory
Message-ID: <200611130704.kAD74YH8024583@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24579/php-pear-HTML-Common

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-Common added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 07:04:38 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:04:38 -0700
Subject: rpms/php-pear-HTML-Common/devel - New directory
Message-ID: <200611130704.kAD74cEQ024594@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24579/php-pear-HTML-Common/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-Common/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 07:04:59 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:04:59 -0700
Subject: rpms/php-pear-HTML-Common Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611130704.kAD74x38024629@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24623

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTML-Common


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML-Common
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  Mon Nov 13 07:05:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:05:05 -0700
Subject: rpms/php-pear-HTML-Common/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611130705.kAD755V7024646@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24623/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML-Common


--- 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 Nov 13 07:06:04 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:06:04 -0700
Subject: rpms/php-pear-HTML-Common import.log,1.1,1.2
Message-ID: <200611130706.kAD764IQ024733@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24697

Modified Files:
	import.log 
Log Message:
auto-import php-pear-HTML-Common-1.2.3-2 on branch devel from php-pear-HTML-Common-1.2.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 07:04:59 -0000	1.1
+++ import.log	13 Nov 2006 07:05:33 -0000	1.2
@@ -0,0 +1 @@
+php-pear-HTML-Common-1_2_3-2:HEAD:php-pear-HTML-Common-1.2.3-2.src.rpm:1163401530



From fedora-extras-commits at redhat.com  Mon Nov 13 07:06:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:06:05 -0700
Subject: rpms/php-pear-HTML-Common/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-HTML-Common.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611130706.kAD765bF024737@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24697/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-HTML-Common.spec 
Log Message:
auto-import php-pear-HTML-Common-1.2.3-2 on branch devel from php-pear-HTML-Common-1.2.3-2.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-HTML-Common.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_Common

Name:           php-pear-HTML-Common
Version:        1.2.3
Release:        2%{?dist}
Summary:        Base class for other HTML classes

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/HTML_Common
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The PEAR::HTML_Common package provides methods for html code display and
attributes handling.
* Methods to set, remove, update html attributes.
* Handles comments in HTML code.
* Handles layout, tabs, line endings for nicer HTML code.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
install -pm 644 -c %{SOURCE1} LICENSE
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc LICENSE
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/*


%changelog
* Sat Nov 11 2006 Christopher Stone  1.2.3-2
- Add License file to %%doc
- Remove Requires PEAR

* Sun Oct 29 2006 Christopher Stone  1.2.3-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 07:05:02 -0000	1.1
+++ .cvsignore	13 Nov 2006 07:05:35 -0000	1.2
@@ -0,0 +1 @@
+HTML_Common-1.2.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 07:05:02 -0000	1.1
+++ sources	13 Nov 2006 07:05:35 -0000	1.2
@@ -0,0 +1 @@
+3598dd20e3be90ae445501e9c2d59506  HTML_Common-1.2.3.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 07:07:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:07:56 -0700
Subject: owners owners.list,1.1938,1.1939
Message-ID: <200611130707.kAD77uS9024849@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24833

Modified Files:
	owners.list 
Log Message:
php-pear-HTML-Common


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1938
retrieving revision 1.1939
diff -u -r1.1938 -r1.1939
--- owners.list	13 Nov 2006 02:15:41 -0000	1.1938
+++ owners.list	13 Nov 2006 07:07:25 -0000	1.1939
@@ -1779,6 +1779,7 @@
 Fedora Extras|php-pear-Date-Holidays|Driver based class to calculate holidays|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 07:25:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:25:51 -0700
Subject: rpms/php-pear-HTML-Table - New directory
Message-ID: <200611130725.kAD7Pp55025062@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/php-pear-HTML-Table

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-Table added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 07:25:57 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:25:57 -0700
Subject: rpms/php-pear-HTML-Table/devel - New directory
Message-ID: <200611130725.kAD7Pv24025081@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/php-pear-HTML-Table/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-Table/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 07:26:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:26:09 -0700
Subject: rpms/php-pear-HTML-Table Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611130726.kAD7Q9Vq025125@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25118

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTML-Table


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML-Table
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  Mon Nov 13 07:26:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:26:09 -0700
Subject: rpms/php-pear-HTML-Table/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611130726.kAD7Q9t2025142@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25118/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML-Table


--- 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 Nov 13 07:27:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:27:10 -0700
Subject: rpms/php-pear-HTML-Table import.log,1.1,1.2
Message-ID: <200611130727.kAD7RAtO025225@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25193

Modified Files:
	import.log 
Log Message:
auto-import php-pear-HTML-Table-1.7.5-1 on branch devel from php-pear-HTML-Table-1.7.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Table/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 07:26:08 -0000	1.1
+++ import.log	13 Nov 2006 07:26:39 -0000	1.2
@@ -0,0 +1 @@
+php-pear-HTML-Table-1_7_5-1:HEAD:php-pear-HTML-Table-1.7.5-1.src.rpm:1163402796



From fedora-extras-commits at redhat.com  Mon Nov 13 07:27:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:27:10 -0700
Subject: rpms/php-pear-HTML-Table/devel php-pear-HTML-Table.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611130727.kAD7RA9t025229@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25193/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-HTML-Table.spec 
Log Message:
auto-import php-pear-HTML-Table-1.7.5-1 on branch devel from php-pear-HTML-Table-1.7.5-1.src.rpm


--- NEW FILE php-pear-HTML-Table.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_Table

Name:           php-pear-HTML-Table
Version:        1.7.5
Release:        1%{?dist}
Summary:        Class to easily design HTML tables

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_Table
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(HTML_Common) >= 1.2.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The PEAR::HTML_Table package provides methods for easy and efficient design
of HTML tables.
- Lots of customization options.
- Tables can be modified at any time.
- The logic is the same as standard HTML editors.
- Handles col and rowspans.
- PHP code is shorter, easier to read and to maintain.
- Tables options can be reused.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/HTML/Table*


%changelog
* Sat Nov 11 2006 Christopher Stone  1.7.5-1
- Upstream Sync
- Add versioned requires

* Sun Oct 29 2006 Christopher Stone  1.7.4-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Table/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 07:26:09 -0000	1.1
+++ .cvsignore	13 Nov 2006 07:26:40 -0000	1.2
@@ -0,0 +1 @@
+HTML_Table-1.7.5.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Table/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 07:26:09 -0000	1.1
+++ sources	13 Nov 2006 07:26:40 -0000	1.2
@@ -0,0 +1 @@
+d76f133550d326c33f7fc556afb59555  HTML_Table-1.7.5.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 07:28:48 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:28:48 -0700
Subject: owners owners.list,1.1939,1.1940
Message-ID: <200611130728.kAD7Sm7K025283@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25267

Modified Files:
	owners.list 
Log Message:
php-pear-HTML-Table


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1939
retrieving revision 1.1940
diff -u -r1.1939 -r1.1940
--- owners.list	13 Nov 2006 07:07:25 -0000	1.1939
+++ owners.list	13 Nov 2006 07:28:17 -0000	1.1940
@@ -1780,6 +1780,7 @@
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTML-Table|Class to easily design HTML tables|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 08:21:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 13 Nov 2006 01:21:16 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 sylpheed-claws-plugins.spec, 1.18, 1.19
Message-ID: <200611130821.kAD8LGcX028676@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28568/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:38:23 -0000	1.9
+++ .cvsignore	13 Nov 2006 08:20:46 -0000	1.10
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:38:23 -0000	1.9
+++ sources	13 Nov 2006 08:20:46 -0000	1.10
@@ -1 +1 @@
-db771d49bf9bde1cce075b93f8028a19  sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+621e011a8a801485a18202696343b0ce  sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sylpheed-claws-plugins.spec	7 Nov 2006 01:24:38 -0000	1.18
+++ sylpheed-claws-plugins.spec	13 Nov 2006 08:20:46 -0000	1.19
@@ -1,6 +1,22 @@
+# define pulgin version
+%define acpinotifier	1.0.4
+%define attremover	1.0.3
+%define cachesaver	0.10.2
+%define	etpanprivacy	0.15.3
+%define fetchinfo	0.4.16
+%define gtkhtml2viewer 0.12
+%define maildir		0.24.2
+%define mailmbox	1.12.2
+%define newmail		0.0.7
+%define notification	0.6
+%define perl		0.9.5
+%define rssyl		0.7
+%define smime		0.5.6
+%define synce		0.6.4
+%define vcalendar	1.90
 Name:           sylpheed-claws-plugins
-Version:        2.5.2
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -182,82 +198,82 @@
 Evolution or Outlook.
 
 %prep
-%setup -q -n sylpheed-claws-extra-plugins-%{version}
+%setup -c -q -n sylpheed-claws-extra-plugins-%{version}
 
 %build
 #acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %configure --disable-static --disable-dependency-tracking --disable-rpath
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -265,77 +281,77 @@
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
  
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
@@ -350,11 +366,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-1.0.3/ChangeLog
-%doc acpi_notifier-1.0.3/COPYING
-%doc acpi_notifier-1.0.3/NEWS
-%doc acpi_notifier-1.0.3/AUTHORS
-%doc acpi_notifier-1.0.3/README
+%doc acpi_notifier-%{acpinotifier}/ChangeLog
+%doc acpi_notifier-%{acpinotifier}/COPYING
+%doc acpi_notifier-%{acpinotifier}/NEWS
+%doc acpi_notifier-%{acpinotifier}/AUTHORS
+%doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -369,39 +385,39 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-1.0.3/AUTHORS
-%doc att_remover-1.0.3/ChangeLog
-%doc att_remover-1.0.3/COPYING
-%doc att_remover-1.0.3/NEWS
-%doc att_remover-1.0.3/README
+%doc att_remover-%{attremover}/AUTHORS
+%doc att_remover-%{attremover}/ChangeLog
+%doc att_remover-%{attremover}/COPYING
+%doc att_remover-%{attremover}/NEWS
+%doc att_remover-%{attremover}/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
 %defattr(-,root,root,-)
-%doc cachesaver-0.10.2/AUTHORS
-%doc cachesaver-0.10.2/ChangeLog
-%doc cachesaver-0.10.2/COPYING
+%doc cachesaver-%{cachesaver}/AUTHORS
+%doc cachesaver-%{cachesaver}/ChangeLog
+%doc cachesaver-%{cachesaver}/COPYING
 %{_libdir}/sylpheed-claws/plugins/cachesaver*
 
 %files etpan-privacy
 %defattr(-,root,root,-)
-%doc etpan-privacy-0.15.3/AUTHORS
-%doc etpan-privacy-0.15.3/ChangeLog
-%doc etpan-privacy-0.15.3/COPYING
-%doc etpan-privacy-0.15.3/README
+%doc etpan-privacy-%{etpanprivacy}/AUTHORS
+%doc etpan-privacy-%{etpanprivacy}/ChangeLog
+%doc etpan-privacy-%{etpanprivacy}/COPYING
+%doc etpan-privacy-%{etpanprivacy}/README
 %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.16/ChangeLog
-%doc fetchinfo-plugin-0.4.16/COPYING
-%doc fetchinfo-plugin-0.4.16/README
+%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
+%doc fetchinfo-plugin-%{fetchinfo}/COPYING
+%doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
 %files gtkhtml2-viewer
 %defattr(-,root,root,-)
-%doc gtkhtml2_viewer-0.11/AUTHORS
-%doc gtkhtml2_viewer-0.11/COPYING
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -415,53 +431,53 @@
 
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.24.2/AUTHORS
-%doc maildir-0.24.2/ChangeLog
-%doc maildir-0.24.2/COPYING
-%doc maildir-0.24.2/README
-%doc maildir-0.24.2/doc/README.xml
+%doc maildir-%{maildir}/AUTHORS
+%doc maildir-%{maildir}/ChangeLog
+%doc maildir-%{maildir}/COPYING
+%doc maildir-%{maildir}/README
+%doc maildir-%{maildir}/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.12.2/AUTHORS
-%doc mailmbox-1.12.2/ChangeLog
-%doc mailmbox-1.12.2/COPYING
-%doc mailmbox-1.12.2/README
+%doc mailmbox-%{mailmbox}/AUTHORS
+%doc mailmbox-%{mailmbox}/ChangeLog
+%doc mailmbox-%{mailmbox}/COPYING
+%doc mailmbox-%{mailmbox}/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
 %files newmail
 %defattr(-,root,root,-)
-%doc newmail-0.0.7/AUTHORS
-%doc newmail-0.0.7/ChangeLog
-%doc newmail-0.0.7/COPYING
-%doc newmail-0.0.7/NEWS
-%doc newmail-0.0.7/README
+%doc newmail-%{newmail}/AUTHORS
+%doc newmail-%{newmail}/ChangeLog
+%doc newmail-%{newmail}/COPYING
+%doc newmail-%{newmail}/NEWS
+%doc newmail-%{newmail}/README
 %{_libdir}/sylpheed-claws/plugins/newmail.so
 
 %files notification
 %defattr(-,root,root,-)
-%doc notification_plugin-0.5/AUTHORS
-%doc notification_plugin-0.5/ChangeLog
-%doc notification_plugin-0.5/COPYING
-%doc notification_plugin-0.5/README
+%doc notification_plugin-%{notification}/AUTHORS
+%doc notification_plugin-%{notification}/ChangeLog
+%doc notification_plugin-%{notification}/COPYING
+%doc notification_plugin-%{notification}/README
 %{_libdir}/sylpheed-claws/plugins/notification_plugin.so
 
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.9.5/AUTHORS
-%doc perl_plugin-0.9.5/ChangeLog
-%doc perl_plugin-0.9.5/COPYING
-%doc perl_plugin-0.9.5/README
-%doc perl_plugin-0.9.5/sc_perl.pod
+%doc perl_plugin-%{perl}/AUTHORS
+%doc perl_plugin-%{perl}/ChangeLog
+%doc perl_plugin-%{perl}/COPYING
+%doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.6.1/AUTHORS
-%doc rssyl-0.6.1/ChangeLog
-%doc rssyl-0.6.1/COPYING
-%doc rssyl-0.6.1/TODO
+%doc rssyl-%{rssyl}/AUTHORS
+%doc rssyl-%{rssyl}/ChangeLog
+%doc rssyl-%{rssyl}/COPYING
+%doc rssyl-%{rssyl}/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -477,25 +493,25 @@
 
 %files smime
 %defattr(-,root,root,-)
-%doc smime-0.5.5/ChangeLog
-%doc smime-0.5.5/COPYING
-%doc smime-0.5.5/NEWS
-%{_libdir}/sylpheed-claws/plugins/smime.so
+%doc smime-%{smime}/ChangeLog
+%doc smime-%{smime}/COPYING
+%doc smime-%{smime}/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime*
 
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.6.4/AUTHORS
-%doc synce_plugin-0.6.4/ChangeLog
-%doc synce_plugin-0.6.4/COPYING
-%doc synce_plugin-0.6.4/README
+%doc synce_plugin-%{synce}/AUTHORS
+%doc synce_plugin-%{synce}/ChangeLog
+%doc synce_plugin-%{synce}/COPYING
+%doc synce_plugin-%{synce}/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.89.1/AUTHORS
-%doc vcalendar-1.89.1/ChangeLog
-%doc vcalendar-1.89.1/COPYING
-%doc vcalendar-1.89.1/README
+%doc vcalendar-%{vcalendar}/AUTHORS
+%doc vcalendar-%{vcalendar}/ChangeLog
+%doc vcalendar-%{vcalendar}/COPYING
+%doc vcalendar-%{vcalendar}/README
 %{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
@@ -510,6 +526,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Nov 09 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Tue Nov 07 2006 Andreas Bierfert 
 2.5.2-5
 - rebuild



From fedora-extras-commits at redhat.com  Mon Nov 13 08:21:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 13 Nov 2006 01:21:17 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 .cvsignore, 1.10, 1.11 sources,
	1.10, 1.11 sylpheed-claws-plugins.spec, 1.23, 1.24
Message-ID: <200611130821.kAD8LH45028681@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28568/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2006 09:38:23 -0000	1.10
+++ .cvsignore	13 Nov 2006 08:20:47 -0000	1.11
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 09:38:23 -0000	1.10
+++ sources	13 Nov 2006 08:20:47 -0000	1.11
@@ -1 +1 @@
-db771d49bf9bde1cce075b93f8028a19  sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+621e011a8a801485a18202696343b0ce  sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sylpheed-claws-plugins.spec	7 Nov 2006 01:24:38 -0000	1.23
+++ sylpheed-claws-plugins.spec	13 Nov 2006 08:20:47 -0000	1.24
@@ -1,6 +1,22 @@
+# define pulgin version
+%define acpinotifier	1.0.4
+%define attremover	1.0.3
+%define cachesaver	0.10.2
+%define	etpanprivacy	0.15.3
+%define fetchinfo	0.4.16
+%define gtkhtml2viewer 0.12
+%define maildir		0.24.2
+%define mailmbox	1.12.2
+%define newmail		0.0.7
+%define notification	0.6
+%define perl		0.9.5
+%define rssyl		0.7
+%define smime		0.5.6
+%define synce		0.6.4
+%define vcalendar	1.90
 Name:           sylpheed-claws-plugins
-Version:        2.5.2
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -182,82 +198,82 @@
 Evolution or Outlook.
 
 %prep
-%setup -q -n sylpheed-claws-extra-plugins-%{version}
+%setup -c -q -n sylpheed-claws-extra-plugins-%{version}
 
 %build
 #acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %configure --disable-static --disable-dependency-tracking --disable-rpath
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -265,77 +281,77 @@
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
  
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
@@ -350,11 +366,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-1.0.3/ChangeLog
-%doc acpi_notifier-1.0.3/COPYING
-%doc acpi_notifier-1.0.3/NEWS
-%doc acpi_notifier-1.0.3/AUTHORS
-%doc acpi_notifier-1.0.3/README
+%doc acpi_notifier-%{acpinotifier}/ChangeLog
+%doc acpi_notifier-%{acpinotifier}/COPYING
+%doc acpi_notifier-%{acpinotifier}/NEWS
+%doc acpi_notifier-%{acpinotifier}/AUTHORS
+%doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -369,39 +385,39 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-1.0.3/AUTHORS
-%doc att_remover-1.0.3/ChangeLog
-%doc att_remover-1.0.3/COPYING
-%doc att_remover-1.0.3/NEWS
-%doc att_remover-1.0.3/README
+%doc att_remover-%{attremover}/AUTHORS
+%doc att_remover-%{attremover}/ChangeLog
+%doc att_remover-%{attremover}/COPYING
+%doc att_remover-%{attremover}/NEWS
+%doc att_remover-%{attremover}/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
 %defattr(-,root,root,-)
-%doc cachesaver-0.10.2/AUTHORS
-%doc cachesaver-0.10.2/ChangeLog
-%doc cachesaver-0.10.2/COPYING
+%doc cachesaver-%{cachesaver}/AUTHORS
+%doc cachesaver-%{cachesaver}/ChangeLog
+%doc cachesaver-%{cachesaver}/COPYING
 %{_libdir}/sylpheed-claws/plugins/cachesaver*
 
 %files etpan-privacy
 %defattr(-,root,root,-)
-%doc etpan-privacy-0.15.3/AUTHORS
-%doc etpan-privacy-0.15.3/ChangeLog
-%doc etpan-privacy-0.15.3/COPYING
-%doc etpan-privacy-0.15.3/README
+%doc etpan-privacy-%{etpanprivacy}/AUTHORS
+%doc etpan-privacy-%{etpanprivacy}/ChangeLog
+%doc etpan-privacy-%{etpanprivacy}/COPYING
+%doc etpan-privacy-%{etpanprivacy}/README
 %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.16/ChangeLog
-%doc fetchinfo-plugin-0.4.16/COPYING
-%doc fetchinfo-plugin-0.4.16/README
+%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
+%doc fetchinfo-plugin-%{fetchinfo}/COPYING
+%doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
 %files gtkhtml2-viewer
 %defattr(-,root,root,-)
-%doc gtkhtml2_viewer-0.11/AUTHORS
-%doc gtkhtml2_viewer-0.11/COPYING
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -415,53 +431,53 @@
 
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.24.2/AUTHORS
-%doc maildir-0.24.2/ChangeLog
-%doc maildir-0.24.2/COPYING
-%doc maildir-0.24.2/README
-%doc maildir-0.24.2/doc/README.xml
+%doc maildir-%{maildir}/AUTHORS
+%doc maildir-%{maildir}/ChangeLog
+%doc maildir-%{maildir}/COPYING
+%doc maildir-%{maildir}/README
+%doc maildir-%{maildir}/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.12.2/AUTHORS
-%doc mailmbox-1.12.2/ChangeLog
-%doc mailmbox-1.12.2/COPYING
-%doc mailmbox-1.12.2/README
+%doc mailmbox-%{mailmbox}/AUTHORS
+%doc mailmbox-%{mailmbox}/ChangeLog
+%doc mailmbox-%{mailmbox}/COPYING
+%doc mailmbox-%{mailmbox}/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
 %files newmail
 %defattr(-,root,root,-)
-%doc newmail-0.0.7/AUTHORS
-%doc newmail-0.0.7/ChangeLog
-%doc newmail-0.0.7/COPYING
-%doc newmail-0.0.7/NEWS
-%doc newmail-0.0.7/README
+%doc newmail-%{newmail}/AUTHORS
+%doc newmail-%{newmail}/ChangeLog
+%doc newmail-%{newmail}/COPYING
+%doc newmail-%{newmail}/NEWS
+%doc newmail-%{newmail}/README
 %{_libdir}/sylpheed-claws/plugins/newmail.so
 
 %files notification
 %defattr(-,root,root,-)
-%doc notification_plugin-0.5/AUTHORS
-%doc notification_plugin-0.5/ChangeLog
-%doc notification_plugin-0.5/COPYING
-%doc notification_plugin-0.5/README
+%doc notification_plugin-%{notification}/AUTHORS
+%doc notification_plugin-%{notification}/ChangeLog
+%doc notification_plugin-%{notification}/COPYING
+%doc notification_plugin-%{notification}/README
 %{_libdir}/sylpheed-claws/plugins/notification_plugin.so
 
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.9.5/AUTHORS
-%doc perl_plugin-0.9.5/ChangeLog
-%doc perl_plugin-0.9.5/COPYING
-%doc perl_plugin-0.9.5/README
-%doc perl_plugin-0.9.5/sc_perl.pod
+%doc perl_plugin-%{perl}/AUTHORS
+%doc perl_plugin-%{perl}/ChangeLog
+%doc perl_plugin-%{perl}/COPYING
+%doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.6.1/AUTHORS
-%doc rssyl-0.6.1/ChangeLog
-%doc rssyl-0.6.1/COPYING
-%doc rssyl-0.6.1/TODO
+%doc rssyl-%{rssyl}/AUTHORS
+%doc rssyl-%{rssyl}/ChangeLog
+%doc rssyl-%{rssyl}/COPYING
+%doc rssyl-%{rssyl}/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -477,25 +493,25 @@
 
 %files smime
 %defattr(-,root,root,-)
-%doc smime-0.5.5/ChangeLog
-%doc smime-0.5.5/COPYING
-%doc smime-0.5.5/NEWS
-%{_libdir}/sylpheed-claws/plugins/smime.so
+%doc smime-%{smime}/ChangeLog
+%doc smime-%{smime}/COPYING
+%doc smime-%{smime}/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime*
 
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.6.4/AUTHORS
-%doc synce_plugin-0.6.4/ChangeLog
-%doc synce_plugin-0.6.4/COPYING
-%doc synce_plugin-0.6.4/README
+%doc synce_plugin-%{synce}/AUTHORS
+%doc synce_plugin-%{synce}/ChangeLog
+%doc synce_plugin-%{synce}/COPYING
+%doc synce_plugin-%{synce}/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.89.1/AUTHORS
-%doc vcalendar-1.89.1/ChangeLog
-%doc vcalendar-1.89.1/COPYING
-%doc vcalendar-1.89.1/README
+%doc vcalendar-%{vcalendar}/AUTHORS
+%doc vcalendar-%{vcalendar}/ChangeLog
+%doc vcalendar-%{vcalendar}/COPYING
+%doc vcalendar-%{vcalendar}/README
 %{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
@@ -510,6 +526,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Nov 09 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Tue Nov 07 2006 Andreas Bierfert 
 2.5.2-5
 - rebuild



From fedora-extras-commits at redhat.com  Mon Nov 13 08:21:18 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 13 Nov 2006 01:21:18 -0700
Subject: rpms/sylpheed-claws-plugins/devel .cvsignore, 1.10, 1.11 sources,
	1.10, 1.11 sylpheed-claws-plugins.spec, 1.25, 1.26
Message-ID: <200611130821.kAD8LI6F028686@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28568/devel

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2006 09:38:29 -0000	1.10
+++ .cvsignore	13 Nov 2006 08:20:48 -0000	1.11
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 09:38:29 -0000	1.10
+++ sources	13 Nov 2006 08:20:48 -0000	1.11
@@ -1 +1 @@
-db771d49bf9bde1cce075b93f8028a19  sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+621e011a8a801485a18202696343b0ce  sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sylpheed-claws-plugins.spec	7 Nov 2006 01:24:40 -0000	1.25
+++ sylpheed-claws-plugins.spec	13 Nov 2006 08:20:48 -0000	1.26
@@ -1,13 +1,28 @@
+# define pulgin version
+%define acpinotifier	1.0.4
+%define attremover	1.0.3
+%define cachesaver	0.10.2
+%define	etpanprivacy	0.15.3
+%define fetchinfo	0.4.16
+%define gtkhtml2viewer 0.12
+%define maildir		0.24.2
+%define mailmbox	1.12.2
+%define newmail		0.0.7
+%define notification	0.6
+%define perl		0.9.5
+%define rssyl		0.7
+%define smime		0.5.6
+%define synce		0.6.4
+%define vcalendar	1.90
 Name:           sylpheed-claws-plugins
-Version:        2.5.2
-Release:        6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
-Patch1:		sylpheed-claws-curl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -183,83 +198,82 @@
 Evolution or Outlook.
 
 %prep
-%setup -q -n sylpheed-claws-extra-plugins-%{version}
-%patch1 -p1 -b .curl
+%setup -c -q -n sylpheed-claws-extra-plugins-%{version}
 
 %build
 #acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %configure --disable-static --disable-dependency-tracking --disable-rpath
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -267,77 +281,77 @@
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
  
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
@@ -352,11 +366,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-1.0.3/ChangeLog
-%doc acpi_notifier-1.0.3/COPYING
-%doc acpi_notifier-1.0.3/NEWS
-%doc acpi_notifier-1.0.3/AUTHORS
-%doc acpi_notifier-1.0.3/README
+%doc acpi_notifier-%{acpinotifier}/ChangeLog
+%doc acpi_notifier-%{acpinotifier}/COPYING
+%doc acpi_notifier-%{acpinotifier}/NEWS
+%doc acpi_notifier-%{acpinotifier}/AUTHORS
+%doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -371,39 +385,39 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-1.0.3/AUTHORS
-%doc att_remover-1.0.3/ChangeLog
-%doc att_remover-1.0.3/COPYING
-%doc att_remover-1.0.3/NEWS
-%doc att_remover-1.0.3/README
+%doc att_remover-%{attremover}/AUTHORS
+%doc att_remover-%{attremover}/ChangeLog
+%doc att_remover-%{attremover}/COPYING
+%doc att_remover-%{attremover}/NEWS
+%doc att_remover-%{attremover}/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
 %defattr(-,root,root,-)
-%doc cachesaver-0.10.2/AUTHORS
-%doc cachesaver-0.10.2/ChangeLog
-%doc cachesaver-0.10.2/COPYING
+%doc cachesaver-%{cachesaver}/AUTHORS
+%doc cachesaver-%{cachesaver}/ChangeLog
+%doc cachesaver-%{cachesaver}/COPYING
 %{_libdir}/sylpheed-claws/plugins/cachesaver*
 
 %files etpan-privacy
 %defattr(-,root,root,-)
-%doc etpan-privacy-0.15.3/AUTHORS
-%doc etpan-privacy-0.15.3/ChangeLog
-%doc etpan-privacy-0.15.3/COPYING
-%doc etpan-privacy-0.15.3/README
+%doc etpan-privacy-%{etpanprivacy}/AUTHORS
+%doc etpan-privacy-%{etpanprivacy}/ChangeLog
+%doc etpan-privacy-%{etpanprivacy}/COPYING
+%doc etpan-privacy-%{etpanprivacy}/README
 %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.16/ChangeLog
-%doc fetchinfo-plugin-0.4.16/COPYING
-%doc fetchinfo-plugin-0.4.16/README
+%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
+%doc fetchinfo-plugin-%{fetchinfo}/COPYING
+%doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
 %files gtkhtml2-viewer
 %defattr(-,root,root,-)
-%doc gtkhtml2_viewer-0.11/AUTHORS
-%doc gtkhtml2_viewer-0.11/COPYING
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -417,53 +431,53 @@
 
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.24.2/AUTHORS
-%doc maildir-0.24.2/ChangeLog
-%doc maildir-0.24.2/COPYING
-%doc maildir-0.24.2/README
-%doc maildir-0.24.2/doc/README.xml
+%doc maildir-%{maildir}/AUTHORS
+%doc maildir-%{maildir}/ChangeLog
+%doc maildir-%{maildir}/COPYING
+%doc maildir-%{maildir}/README
+%doc maildir-%{maildir}/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.12.2/AUTHORS
-%doc mailmbox-1.12.2/ChangeLog
-%doc mailmbox-1.12.2/COPYING
-%doc mailmbox-1.12.2/README
+%doc mailmbox-%{mailmbox}/AUTHORS
+%doc mailmbox-%{mailmbox}/ChangeLog
+%doc mailmbox-%{mailmbox}/COPYING
+%doc mailmbox-%{mailmbox}/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
 %files newmail
 %defattr(-,root,root,-)
-%doc newmail-0.0.7/AUTHORS
-%doc newmail-0.0.7/ChangeLog
-%doc newmail-0.0.7/COPYING
-%doc newmail-0.0.7/NEWS
-%doc newmail-0.0.7/README
+%doc newmail-%{newmail}/AUTHORS
+%doc newmail-%{newmail}/ChangeLog
+%doc newmail-%{newmail}/COPYING
+%doc newmail-%{newmail}/NEWS
+%doc newmail-%{newmail}/README
 %{_libdir}/sylpheed-claws/plugins/newmail.so
 
 %files notification
 %defattr(-,root,root,-)
-%doc notification_plugin-0.5/AUTHORS
-%doc notification_plugin-0.5/ChangeLog
-%doc notification_plugin-0.5/COPYING
-%doc notification_plugin-0.5/README
+%doc notification_plugin-%{notification}/AUTHORS
+%doc notification_plugin-%{notification}/ChangeLog
+%doc notification_plugin-%{notification}/COPYING
+%doc notification_plugin-%{notification}/README
 %{_libdir}/sylpheed-claws/plugins/notification_plugin.so
 
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.9.5/AUTHORS
-%doc perl_plugin-0.9.5/ChangeLog
-%doc perl_plugin-0.9.5/COPYING
-%doc perl_plugin-0.9.5/README
-%doc perl_plugin-0.9.5/sc_perl.pod
+%doc perl_plugin-%{perl}/AUTHORS
+%doc perl_plugin-%{perl}/ChangeLog
+%doc perl_plugin-%{perl}/COPYING
+%doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.6.1/AUTHORS
-%doc rssyl-0.6.1/ChangeLog
-%doc rssyl-0.6.1/COPYING
-%doc rssyl-0.6.1/TODO
+%doc rssyl-%{rssyl}/AUTHORS
+%doc rssyl-%{rssyl}/ChangeLog
+%doc rssyl-%{rssyl}/COPYING
+%doc rssyl-%{rssyl}/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -479,25 +493,25 @@
 
 %files smime
 %defattr(-,root,root,-)
-%doc smime-0.5.5/ChangeLog
-%doc smime-0.5.5/COPYING
-%doc smime-0.5.5/NEWS
-%{_libdir}/sylpheed-claws/plugins/smime.so
+%doc smime-%{smime}/ChangeLog
+%doc smime-%{smime}/COPYING
+%doc smime-%{smime}/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime*
 
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.6.4/AUTHORS
-%doc synce_plugin-0.6.4/ChangeLog
-%doc synce_plugin-0.6.4/COPYING
-%doc synce_plugin-0.6.4/README
+%doc synce_plugin-%{synce}/AUTHORS
+%doc synce_plugin-%{synce}/ChangeLog
+%doc synce_plugin-%{synce}/COPYING
+%doc synce_plugin-%{synce}/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.89.1/AUTHORS
-%doc vcalendar-1.89.1/ChangeLog
-%doc vcalendar-1.89.1/COPYING
-%doc vcalendar-1.89.1/README
+%doc vcalendar-%{vcalendar}/AUTHORS
+%doc vcalendar-%{vcalendar}/ChangeLog
+%doc vcalendar-%{vcalendar}/COPYING
+%doc vcalendar-%{vcalendar}/README
 %{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
@@ -512,6 +526,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Nov 09 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Tue Nov 07 2006 Andreas Bierfert 
 2.5.2-6
 - rebuild



From fedora-extras-commits at redhat.com  Mon Nov 13 08:38:39 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 01:38:39 -0700
Subject: rpms/manedit/devel .cvsignore, 1.4, 1.5 Makefile, 1.3,
	1.4 manedit-0.7.1-allow-more_section.patch, NONE,
	1.1 manedit-0.7.1-makefile.patch, NONE,
	1.1 manedit-0.7.1-manbase.patch, NONE,
	1.1 manedit-0.7.1-remove-some-warning.patch, NONE,
	1.1 manedit.desktop, 1.2, 1.3 manedit.spec, 1.13,
	1.14 manview.desktop, NONE, 1.1 sources, 1.4, 1.5 dead.package,
	1.1, NONE
Message-ID: <200611130838.kAD8cdk6029263@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/manedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29226

Added Files:
	.cvsignore Makefile manedit-0.7.1-allow-more_section.patch 
	manedit-0.7.1-makefile.patch manedit-0.7.1-manbase.patch 
	manedit-0.7.1-remove-some-warning.patch manedit.desktop 
	manedit.spec manview.desktop sources 
Removed Files:
	dead.package 
Log Message:
Re-commit manedit


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	13 Nov 2006 08:38:09 -0000	1.5
@@ -0,0 +1 @@
+manedit-0.7.1.tar.bz2


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	13 Nov 2006 08:38:09 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: manedit
+# $Id$
+NAME := manedit
+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)

manedit-0.7.1-allow-more_section.patch:

--- NEW FILE manedit-0.7.1-allow-more_section.patch ---
--- manedit-0.7.1/manedit/main.c.section	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-10-28 15:21:31.000000000 +0900
@@ -553,7 +553,9 @@
 
 	    FileBrowserTypeListNew(
 		list, total,
-		".1 .2 .3 .4 .5 .6 .bz2 .gz",
+		".1 .2 .3 .4 .5 .6 .7 .8 "
+		".1x .2x .3x .4x .5x .6x .7x .8x "
+		".bz2 .gz",
 		"Manual page"
 	    );
 	    FileBrowserTypeListNew(

manedit-0.7.1-makefile.patch:

--- NEW FILE manedit-0.7.1-makefile.patch ---
--- manedit-0.7.1/manedit/Makefile.install.FreeBSD.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile.install.FreeBSD	2006-10-30 16:52:26.000000000 +0900
@@ -11,7 +11,7 @@
 #	PREFIX
 #
 
-INSTALL      = install -o root -g wheel
+INSTALL      = install -c -p
 INSTBINFLAGS = -m 0755
 INSTMANFLAGS = -m 0444
 INSTDATFLAGS = -m 0644
@@ -22,14 +22,14 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-MAN          = $(BIN).1.bz2
+MAN          = $(BIN).1
 ICON         = $(BIN).xpm
 MANVIEW_ICON = manview.xpm
 
 BIN_DIR   = $(PREFIX)/bin
-ICONS_DIR = $(PREFIX)/share/$(BIN)/icons
+ICONS_DIR = $(PREFIX)/share/pixmaps
 DATA_DIR  = $(PREFIX)/share/$(BIN)
-MAN_DIR   = $(PREFIX)/man/man1
+MAN_DIR   = $(PREFIX)/share/man/man1
 
 install:
 	$(INSTALL) -d $(INSTBINFLAGS) $(BIN_DIR)
--- manedit-0.7.1/manedit/Makefile.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile	2006-10-30 16:46:52.000000000 +0900
@@ -19,8 +19,9 @@
 #   absolutly sure that requires modification.
 #
 PREFIX ?= /usr
-LOCALBASE ?= /usr/local
-X11BASE ?= /usr/X11R6
+LOCALBASE ?= /usr/local/share
+X11BASE ?= /usr/share
+MANBASE ?= /usr/share
 
 
 # ########################################################################
@@ -54,10 +55,9 @@
 GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
 CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
           -DPREFIX=\"$(PREFIX)\" \
-          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
-
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" -DMANBASE=\"$(MANBASE)\"
 
+CPPFLAGS = 
 
 # ########################################################################
 # Dependant Libraries:
@@ -91,6 +91,10 @@
 #
 INC =
 
+####################################################################
+
+CFLAGS += $(OPTFLAGS)
+LIB += $(LDFLAGS)
 
 # ########################################################################
 # Program Source and Header Files:
@@ -116,7 +120,7 @@
 # Build Rules:
 #
 $(BIN): $(OBJ_C) $(OBJ_CPP)
-	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
 
 all: $(BIN) $(BIN).1.out
 
@@ -138,8 +142,8 @@
 # Manual Page Build/Subs Rule:
 #
 $(BIN).1.out: $(BIN).1
-	$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
+	$(SED)  -e 's|%%PREFIX%%|$(PREFIX)|g'  \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
 
 # ########################################################################

manedit-0.7.1-manbase.patch:

--- NEW FILE manedit-0.7.1-manbase.patch ---
--- manedit-0.7.1/manedit/pref.c.manbase	2006-08-26 05:00:00.000000000 +0200
+++ manedit-0.7.1/manedit/pref.c	2006-10-31 10:25:44.000000000 +0100
@@ -1708,24 +1708,16 @@
 #if defined(__FreeBSD__)
 	    text[0] = "/usr/share/man";
 #else
-	    text[0] = "/usr/man";
+	    text[0] = MANBASE"/man";
 #endif
 	    text[1] = "Global";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = LOCALBASE "/man";
-#else
-	    text[0] = "/usr/local/man";
-#endif
 	    text[1] = "Local";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = X11BASE"/man";
-#else
-	    text[0] = "/usr/X11R6/man";
-#endif
 	    text[1] = "X Window Systems";
 	    gtk_clist_append(GTK_CLIST(w), text);
 	}

manedit-0.7.1-remove-some-warning.patch:

--- NEW FILE manedit-0.7.1-remove-some-warning.patch ---
--- manedit-0.7.1/manedit/clipboard.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/clipboard.c	2006-11-12 02:17:31.000000000 +0900
@@ -2166,7 +2166,7 @@
 		);
 		if(tmp_text != NULL)
 		{
-		    strncpy(tmp_text, cb->data, cb->data_length);
+		    strncpy(tmp_text, (gchar *)cb->data, cb->data_length);
 		    tmp_text[cb->data_length] = '\0';
 
 		    w = gtk_label_new(tmp_text);
--- manedit-0.7.1/manedit/editor.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editor.c	2006-11-12 02:20:09.000000000 +0900
@@ -69,6 +69,7 @@
 #include "images/icon_replace_20x20.xpm"
 #include "images/icon_replace_all_20x20.xpm"
 
+#include 
 
 editor_item_struct *EditorItemNew(
 	editor_item_type type,
--- manedit-0.7.1/manedit/editorcb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorcb.c	2006-11-12 02:17:31.000000000 +0900
@@ -2856,7 +2856,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,		/* Foreground color */
 			NULL,		/* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2885,7 +2885,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2962,7 +2962,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2992,7 +2992,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
--- manedit-0.7.1/manedit/editordnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editordnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -965,7 +965,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 	data_sent = TRUE;
 
@@ -981,7 +981,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,      /* 8 bits per character */
-		s, strlen(s)
+		(guchar *)s, strlen(s)
 	    );
 	    data_sent = TRUE;
 	}
@@ -1367,7 +1367,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 		EditorFileLoad(editor, path, editor->selected_branch, FALSE);
 		g_free(path);
--- manedit-0.7.1/manedit/editorop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorop.c	2006-11-12 02:26:43.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 		/* For unlink() */
 
+#include 
+
 #include "../include/string.h"
 #include "../include/strexp.h"
 #include "../include/disk.h"
@@ -1143,7 +1145,10 @@
 	tmp_path = g_strdup(PrefixPaths(
 	    prog_tmp_path, "previewXXXXXX"
 	));
-	mkstemp(tmp_path);
+	if ((mkstemp(tmp_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", tmp_path);
+	  exit (1);
+	}
 
 	/* Here we play a trick, first record the full path name
 	 * on the item data and replace it with our tempory file path
--- manedit-0.7.1/manedit/fb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/fb.c	2006-11-12 02:17:31.000000000 +0900
@@ -1458,7 +1458,7 @@
 			selection_data,
 			GDK_SELECTION_TYPE_STRING,
 			8,	/* 8 bits per character */
-			buf, buf_len
+			(guchar *)buf, buf_len
 		    );
 		    data_sent = TRUE;
 		    g_free(buf);
@@ -1475,7 +1475,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,		/* 8 bits per character */
-		s,
+		(guchar *)s,
 		STRLEN(s) + 1	/* Include the '\0' character */
 	    );
 	    data_sent = TRUE;
--- manedit-0.7.1/manedit/guiutils.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/guiutils.c	2006-11-12 02:17:31.000000000 +0900
@@ -979,7 +979,7 @@
 		    g_free(name);
 		}
 	    }
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	    sel_rtn->length = STRLEN(s);
 
 	    /* Change the return type to string */
@@ -1024,7 +1024,7 @@
 	    gchar *s = (gchar *)g_malloc(len + 1);
 	    memcpy(s, selection_data->data, len);
 	    s[len] = '\0';
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	}
 }
 
@@ -3256,7 +3256,7 @@
 
 	/* Create bitmap */
 	bitmap = gdk_bitmap_create_from_data(
-	    window, xbm_data,
+	    window, (gchar *)xbm_data,
 	    width, height
 	);
 	g_free(xbm_data);	/* No longer needed */
--- manedit-0.7.1/manedit/main.c.warn	2006-11-12 02:17:31.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-11-12 02:21:38.000000000 +0900
@@ -3,6 +3,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #include "../include/disk.h"
 #include "../include/string.h"
 
--- manedit-0.7.1/manedit/maneditop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/maneditop.c	2006-11-12 02:29:24.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../include/disk.h"
 #include "../include/fio.h"
 #include "../include/string.h"
@@ -563,7 +565,11 @@
 		    item->full_path = STRDUP(PrefixPaths(
 			prog_tmp_path, "emergencyXXXXXX"
 		    ));
-		    mkstemp(item->full_path);
+		    if ((mkstemp(item->full_path)) == -1){
+		      fprintf(stderr, "Could not open %s\n",
+			      item->full_path);
+		      exit (1);
+		    }
 
 		    /* Save this branch */
 		    EditorFileSave(editor, branch);
--- manedit-0.7.1/manedit/mpfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/mpfio.c	2006-11-12 02:35:51.000000000 +0900
@@ -9,6 +9,8 @@
 #include 
 #endif
 
+#include 
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -286,7 +288,10 @@
 		return(NULL);
 	    }
 
-	    fread(buf, sizeof(char), buf_len, fp);
+	    if (!(fread(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fread failed\n");
+	      exit (1);
+	    }
 	    buf[buf_len] = '\0';
 
 	    FClose(fp);
@@ -462,7 +467,10 @@
             if(fp == NULL)
                 return;
 
-	    fwrite(buf, sizeof(char), buf_len, fp);
+	    if (!(fwrite(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fwrite failed\n");
+	      exit (1);
+	    }
 
             FClose(fp);
         }
--- manedit-0.7.1/manedit/prefop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/prefop.c	2006-11-12 02:56:13.000000000 +0900
@@ -75,6 +75,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
@@ -93,6 +94,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
--- manedit-0.7.1/manedit/viewerdnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerdnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -199,7 +199,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 
 	g_free(buf);
@@ -484,7 +484,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 
 		/* Load manual page into target viewer's view text */
--- manedit-0.7.1/manedit/viewerfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerfio.c	2006-11-12 02:40:38.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -174,11 +176,17 @@
 	stdout_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stdoutXXXXXX"
 	));
-	mkstemp(stdout_path);
+	if ((mkstemp(stdout_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stdout_path);
+	  exit (1);
+	}
 	stderr_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stderrXXXXXX"
 	));
-	mkstemp(stderr_path);
+	if ((mkstemp(stderr_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stderr_path);
+	  exit (1);
+	}
 
 	/* Delete prog_tmp_dir, it is no longer needed */
 	g_free(prog_tmp_dir);


Index: manedit.desktop
===================================================================
RCS file: manedit.desktop
diff -N manedit.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ manedit.desktop	13 Nov 2006 08:38:09 -0000	1.3
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=ManEdit
+Comment=UNIX Manual Page Editor
+Exec=manedit
+Icon=manedit
+Terminal=false
+Type=Application
+Categories=Application;Development;


Index: manedit.spec
===================================================================
RCS file: manedit.spec
diff -N manedit.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ manedit.spec	13 Nov 2006 08:38:09 -0000	1.14
@@ -0,0 +1,162 @@
+Name:           manedit
+Version:        0.7.1
+Release:        5%{?dist}
+Summary:        UNIX Manual Page Editor
+
+Group:          Development/Tools
+License:        GPL
+URL:            http://wolfpack.twu.net/ManEdit/
+Source0:        http://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
+Source1:        manedit.desktop
+Source2:        manview.desktop
+Patch0:         manedit-0.7.1-makefile.patch
+Patch1:         manedit-0.7.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
+BuildRequires:  gtk+-devel
+BuildRequires:  zlib-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  desktop-file-utils
+Requires:       man
+
+%description
+ManEdit is a UNIX manual page editor and viewer, 
+it is designed specifically for the editing of the 
+UNIX manual page format using an integrated XML interface.
+
+NOTE: This is a gtk+ package and some characters,
+especially UTF-8 characters will be garbled.
+
+%prep
+%setup -q
+
+# Base Makefile on FreeBSD style
+%{__cp} -p ./manedit/Makefile.FreeBSD ./manedit/Makefile
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .section
+%patch2 -p1 -b .manbase
+%patch3 -p1 -b .warn
+
+%build
+# I cannot understand this configure!!
+#%%configure
+
+pushd manedit
+%{__make} %{?_smp_mflags} \
+   OPTFLAGS="$RPM_OPT_FLAGS -DHAVE_GZIP -DHAVE_BZIP2" \
+   LDFLAGS="-lz -lbz2"
+%{__make} manedit.1.out ; %{__mv} -f manedit.1.out manedit.1
+popd
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+
+pushd manedit
+%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}
+%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+# 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 \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %{SOURCE1}
+
+desktop-file-install \
+   --vendor fedora \
+   --remove-category Application \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %{SOURCE2}
+
+# install icons
+# size 20 don't seems to be owned by hicolor-icon-theme
+for size in 16x16 48x48 ; do
+   %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/
+   for f in manedit mp_viewer ; do
+      %{__install} -c -p -m 644 images/${f}_${size}.xpm \
+         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/${f}.xpm
+   done
+done
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
+popd
+
+%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 AUTHORS LICENSE README
+
+%{_bindir}/man*
+
+%{_datadir}/icons/hicolor/*/apps/*.xpm
+%{_datadir}/applications/fedora-*.desktop
+
+%{_datadir}/%{name}/
+%{_mandir}/man1/%{name}.1*
+
+%changelog
+* Sat Nov 11 2006 Mamoru Tasaka  - 0.7.1-5
+- Remove some warnings.
+
+* Thu Nov  2 2006 Mamoru Tasaka  - 0.7.1-4
+- Add a comment about gtk+ issue on %%description.
+
+* Tue Oct 31 2006 Mamoru Tasaka  - 0.7.1-3
+- Install manview desktop, related icons.
+- Change Requires.
+- Remove manwrap
+
+* Sun Oct 29 2006 Mamoru Tasaka  - 0.7.1-2
+- Improve Makefile and mandir treatments, patches from Patrice Dumas.
+- Make man page.
+- Correct install directory.
+
+* Sat Oct 28 2006 Mamoru Tasaka  - 0.7.1-1
+- Re-submit to Fedora Extras.
+
+* Thu Apr 14 2005 Michael Schwendt  - 0.5.11-5
+- Fix build for GCC4.
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
+* Wed Feb  9 2005 Michael Schwendt  - 0:0.5.11-3
+- Add patch for multilib and substitute hardcoded 'lib' in %%prep.
+- Add patch to disable stripping.
+
+* Wed Nov 17 2004 Michael Schwendt  - 0:0.5.11-2
+- BR bzip2-devel + patch to enable bzip2, bump release
+
+* Sat Oct 3 2004 Nils O. Sel??sdal  - 0:0.5.11-0.fdr.1
+- Update to 0.5.11
+
+* Thu Oct 2 2003 Nils O. Sel??sdal  - 0:0.5.10-0.fdr.2
+- Put .desktop in its own file
+- Save .spec file as utf-8
+- use mainstream tar.bz2 instead of tgz
+
+* Wed Aug 27 2003 Nils O. Sel??sdal  - 0:0.5.10-0.fdr.1
+- Initial RPM for Fedora


--- NEW FILE manview.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=ManView
Comment=UNIX Manual Page Viewer
Exec=manview
Icon=mp_viewer
Terminal=false
Type=Application
Categories=Application;Graphics;


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	13 Nov 2006 08:38:09 -0000	1.5
@@ -0,0 +1 @@
+229586101245eb61018ff031c2efb247  manedit-0.7.1.tar.bz2


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 09:10:58 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 02:10:58 -0700
Subject: rpms/manedit/FC-5 manedit-0.7.1-allow-more_section.patch, NONE,
	1.1 manedit-0.7.1-makefile.patch, NONE,
	1.1 manedit-0.7.1-manbase.patch, NONE,
	1.1 manedit-0.7.1-remove-some-warning.patch, NONE,
	1.1 manview.desktop, NONE, 1.1 .cvsignore, 1.3,
	1.4 manedit.desktop, 1.1, 1.2 manedit.spec, 1.12, 1.13 sources,
	1.3, 1.4 manedit-0.5.11-bzip2.patch, 1.1,
	NONE manedit-0.5.11-gcc4.patch, 1.1,
	NONE manedit-0.5.11-multilib.patch, 1.1,
	NONE manedit-0.5.11-nostrip.patch, 1.1, NONE
Message-ID: <200611130910.kAD9Awnn032484@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/manedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32447

Modified Files:
	.cvsignore manedit.desktop manedit.spec sources 
Added Files:
	manedit-0.7.1-allow-more_section.patch 
	manedit-0.7.1-makefile.patch manedit-0.7.1-manbase.patch 
	manedit-0.7.1-remove-some-warning.patch manview.desktop 
Removed Files:
	manedit-0.5.11-bzip2.patch manedit-0.5.11-gcc4.patch 
	manedit-0.5.11-multilib.patch manedit-0.5.11-nostrip.patch 
Log Message:
* Sat Nov 11 2006 Mamoru Tasaka  - 0.7.1-5
- Remove some warnings.


manedit-0.7.1-allow-more_section.patch:

--- NEW FILE manedit-0.7.1-allow-more_section.patch ---
--- manedit-0.7.1/manedit/main.c.section	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-10-28 15:21:31.000000000 +0900
@@ -553,7 +553,9 @@
 
 	    FileBrowserTypeListNew(
 		list, total,
-		".1 .2 .3 .4 .5 .6 .bz2 .gz",
+		".1 .2 .3 .4 .5 .6 .7 .8 "
+		".1x .2x .3x .4x .5x .6x .7x .8x "
+		".bz2 .gz",
 		"Manual page"
 	    );
 	    FileBrowserTypeListNew(

manedit-0.7.1-makefile.patch:

--- NEW FILE manedit-0.7.1-makefile.patch ---
--- manedit-0.7.1/manedit/Makefile.install.FreeBSD.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile.install.FreeBSD	2006-10-30 16:52:26.000000000 +0900
@@ -11,7 +11,7 @@
 #	PREFIX
 #
 
-INSTALL      = install -o root -g wheel
+INSTALL      = install -c -p
 INSTBINFLAGS = -m 0755
 INSTMANFLAGS = -m 0444
 INSTDATFLAGS = -m 0644
@@ -22,14 +22,14 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-MAN          = $(BIN).1.bz2
+MAN          = $(BIN).1
 ICON         = $(BIN).xpm
 MANVIEW_ICON = manview.xpm
 
 BIN_DIR   = $(PREFIX)/bin
-ICONS_DIR = $(PREFIX)/share/$(BIN)/icons
+ICONS_DIR = $(PREFIX)/share/pixmaps
 DATA_DIR  = $(PREFIX)/share/$(BIN)
-MAN_DIR   = $(PREFIX)/man/man1
+MAN_DIR   = $(PREFIX)/share/man/man1
 
 install:
 	$(INSTALL) -d $(INSTBINFLAGS) $(BIN_DIR)
--- manedit-0.7.1/manedit/Makefile.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile	2006-10-30 16:46:52.000000000 +0900
@@ -19,8 +19,9 @@
 #   absolutly sure that requires modification.
 #
 PREFIX ?= /usr
-LOCALBASE ?= /usr/local
-X11BASE ?= /usr/X11R6
+LOCALBASE ?= /usr/local/share
+X11BASE ?= /usr/share
+MANBASE ?= /usr/share
 
 
 # ########################################################################
@@ -54,10 +55,9 @@
 GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
 CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
           -DPREFIX=\"$(PREFIX)\" \
-          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
-
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" -DMANBASE=\"$(MANBASE)\"
 
+CPPFLAGS = 
 
 # ########################################################################
 # Dependant Libraries:
@@ -91,6 +91,10 @@
 #
 INC =
 
+####################################################################
+
+CFLAGS += $(OPTFLAGS)
+LIB += $(LDFLAGS)
 
 # ########################################################################
 # Program Source and Header Files:
@@ -116,7 +120,7 @@
 # Build Rules:
 #
 $(BIN): $(OBJ_C) $(OBJ_CPP)
-	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
 
 all: $(BIN) $(BIN).1.out
 
@@ -138,8 +142,8 @@
 # Manual Page Build/Subs Rule:
 #
 $(BIN).1.out: $(BIN).1
-	$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
+	$(SED)  -e 's|%%PREFIX%%|$(PREFIX)|g'  \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
 
 # ########################################################################

manedit-0.7.1-manbase.patch:

--- NEW FILE manedit-0.7.1-manbase.patch ---
--- manedit-0.7.1/manedit/pref.c.manbase	2006-08-26 05:00:00.000000000 +0200
+++ manedit-0.7.1/manedit/pref.c	2006-10-31 10:25:44.000000000 +0100
@@ -1708,24 +1708,16 @@
 #if defined(__FreeBSD__)
 	    text[0] = "/usr/share/man";
 #else
-	    text[0] = "/usr/man";
+	    text[0] = MANBASE"/man";
 #endif
 	    text[1] = "Global";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = LOCALBASE "/man";
-#else
-	    text[0] = "/usr/local/man";
-#endif
 	    text[1] = "Local";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = X11BASE"/man";
-#else
-	    text[0] = "/usr/X11R6/man";
-#endif
 	    text[1] = "X Window Systems";
 	    gtk_clist_append(GTK_CLIST(w), text);
 	}

manedit-0.7.1-remove-some-warning.patch:

--- NEW FILE manedit-0.7.1-remove-some-warning.patch ---
--- manedit-0.7.1/manedit/clipboard.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/clipboard.c	2006-11-12 02:17:31.000000000 +0900
@@ -2166,7 +2166,7 @@
 		);
 		if(tmp_text != NULL)
 		{
-		    strncpy(tmp_text, cb->data, cb->data_length);
+		    strncpy(tmp_text, (gchar *)cb->data, cb->data_length);
 		    tmp_text[cb->data_length] = '\0';
 
 		    w = gtk_label_new(tmp_text);
--- manedit-0.7.1/manedit/editor.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editor.c	2006-11-12 02:20:09.000000000 +0900
@@ -69,6 +69,7 @@
 #include "images/icon_replace_20x20.xpm"
 #include "images/icon_replace_all_20x20.xpm"
 
+#include 
 
 editor_item_struct *EditorItemNew(
 	editor_item_type type,
--- manedit-0.7.1/manedit/editorcb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorcb.c	2006-11-12 02:17:31.000000000 +0900
@@ -2856,7 +2856,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,		/* Foreground color */
 			NULL,		/* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2885,7 +2885,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2962,7 +2962,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2992,7 +2992,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
--- manedit-0.7.1/manedit/editordnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editordnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -965,7 +965,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 	data_sent = TRUE;
 
@@ -981,7 +981,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,      /* 8 bits per character */
-		s, strlen(s)
+		(guchar *)s, strlen(s)
 	    );
 	    data_sent = TRUE;
 	}
@@ -1367,7 +1367,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 		EditorFileLoad(editor, path, editor->selected_branch, FALSE);
 		g_free(path);
--- manedit-0.7.1/manedit/editorop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorop.c	2006-11-12 02:26:43.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 		/* For unlink() */
 
+#include 
+
 #include "../include/string.h"
 #include "../include/strexp.h"
 #include "../include/disk.h"
@@ -1143,7 +1145,10 @@
 	tmp_path = g_strdup(PrefixPaths(
 	    prog_tmp_path, "previewXXXXXX"
 	));
-	mkstemp(tmp_path);
+	if ((mkstemp(tmp_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", tmp_path);
+	  exit (1);
+	}
 
 	/* Here we play a trick, first record the full path name
 	 * on the item data and replace it with our tempory file path
--- manedit-0.7.1/manedit/fb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/fb.c	2006-11-12 02:17:31.000000000 +0900
@@ -1458,7 +1458,7 @@
 			selection_data,
 			GDK_SELECTION_TYPE_STRING,
 			8,	/* 8 bits per character */
-			buf, buf_len
+			(guchar *)buf, buf_len
 		    );
 		    data_sent = TRUE;
 		    g_free(buf);
@@ -1475,7 +1475,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,		/* 8 bits per character */
-		s,
+		(guchar *)s,
 		STRLEN(s) + 1	/* Include the '\0' character */
 	    );
 	    data_sent = TRUE;
--- manedit-0.7.1/manedit/guiutils.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/guiutils.c	2006-11-12 02:17:31.000000000 +0900
@@ -979,7 +979,7 @@
 		    g_free(name);
 		}
 	    }
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	    sel_rtn->length = STRLEN(s);
 
 	    /* Change the return type to string */
@@ -1024,7 +1024,7 @@
 	    gchar *s = (gchar *)g_malloc(len + 1);
 	    memcpy(s, selection_data->data, len);
 	    s[len] = '\0';
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	}
 }
 
@@ -3256,7 +3256,7 @@
 
 	/* Create bitmap */
 	bitmap = gdk_bitmap_create_from_data(
-	    window, xbm_data,
+	    window, (gchar *)xbm_data,
 	    width, height
 	);
 	g_free(xbm_data);	/* No longer needed */
--- manedit-0.7.1/manedit/main.c.warn	2006-11-12 02:17:31.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-11-12 02:21:38.000000000 +0900
@@ -3,6 +3,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #include "../include/disk.h"
 #include "../include/string.h"
 
--- manedit-0.7.1/manedit/maneditop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/maneditop.c	2006-11-12 02:29:24.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../include/disk.h"
 #include "../include/fio.h"
 #include "../include/string.h"
@@ -563,7 +565,11 @@
 		    item->full_path = STRDUP(PrefixPaths(
 			prog_tmp_path, "emergencyXXXXXX"
 		    ));
-		    mkstemp(item->full_path);
+		    if ((mkstemp(item->full_path)) == -1){
+		      fprintf(stderr, "Could not open %s\n",
+			      item->full_path);
+		      exit (1);
+		    }
 
 		    /* Save this branch */
 		    EditorFileSave(editor, branch);
--- manedit-0.7.1/manedit/mpfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/mpfio.c	2006-11-12 02:35:51.000000000 +0900
@@ -9,6 +9,8 @@
 #include 
 #endif
 
+#include 
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -286,7 +288,10 @@
 		return(NULL);
 	    }
 
-	    fread(buf, sizeof(char), buf_len, fp);
+	    if (!(fread(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fread failed\n");
+	      exit (1);
+	    }
 	    buf[buf_len] = '\0';
 
 	    FClose(fp);
@@ -462,7 +467,10 @@
             if(fp == NULL)
                 return;
 
-	    fwrite(buf, sizeof(char), buf_len, fp);
+	    if (!(fwrite(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fwrite failed\n");
+	      exit (1);
+	    }
 
             FClose(fp);
         }
--- manedit-0.7.1/manedit/prefop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/prefop.c	2006-11-12 02:56:13.000000000 +0900
@@ -75,6 +75,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
@@ -93,6 +94,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
--- manedit-0.7.1/manedit/viewerdnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerdnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -199,7 +199,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 
 	g_free(buf);
@@ -484,7 +484,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 
 		/* Load manual page into target viewer's view text */
--- manedit-0.7.1/manedit/viewerfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerfio.c	2006-11-12 02:40:38.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -174,11 +176,17 @@
 	stdout_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stdoutXXXXXX"
 	));
-	mkstemp(stdout_path);
+	if ((mkstemp(stdout_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stdout_path);
+	  exit (1);
+	}
 	stderr_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stderrXXXXXX"
 	));
-	mkstemp(stderr_path);
+	if ((mkstemp(stderr_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stderr_path);
+	  exit (1);
+	}
 
 	/* Delete prog_tmp_dir, it is no longer needed */
 	g_free(prog_tmp_dir);


--- NEW FILE manview.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=ManView
Comment=UNIX Manual Page Viewer
Exec=manview
Icon=mp_viewer
Terminal=false
Type=Application
Categories=Application;Graphics;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:51:28 -0000	1.3
+++ .cvsignore	13 Nov 2006 09:10:27 -0000	1.4
@@ -1 +1 @@
-manedit-0.5.11.tar.bz2
+manedit-0.7.1.tar.bz2


Index: manedit.desktop
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/manedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manedit.desktop	8 Nov 2004 04:50:55 -0000	1.1
+++ manedit.desktop	13 Nov 2006 09:10:27 -0000	1.2
@@ -1,7 +1,10 @@
 [Desktop Entry]
-Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=ManEdit
+Comment=UNIX Manual Page Editor
 Exec=manedit
-Icon=/usr/share/icons/manedit.xpm
-Name=Manpage Editor
-Terminal=0
-Comment=GUI editor for creating man pages.
+Icon=manedit
+Terminal=false
+Type=Application
+Categories=Application;Development;


Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/manedit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- manedit.spec	2 Mar 2006 21:30:45 -0000	1.12
+++ manedit.spec	13 Nov 2006 09:10:27 -0000	1.13
@@ -1,79 +1,142 @@
 Name:           manedit
-Version:        0.5.11
-Release:        5
-Summary:        GUI editor for creating man pages
+Version:        0.7.1
+Release:        5%{?dist}
+Summary:        UNIX Manual Page Editor
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://wolfpack.twu.net/ManEdit/
-Source0:        ftp://wolfpack.twu.net/users/wolfpack/manedit-0.5.11.tar.bz2
+Source0:        http://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
 Source1:        manedit.desktop
-Patch:          manedit-0.5.11-bzip2.patch
-Patch1:         manedit-0.5.11-nostrip.patch
-Patch2:         manedit-0.5.11-multilib.patch
-Patch3:         manedit-0.5.11-gcc4.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source2:        manview.desktop
+Patch0:         manedit-0.7.1-makefile.patch
+Patch1:         manedit-0.7.1-allow-more_section.patch
+Patch2:         manedit-0.7.1-manbase.patch
+Patch3:         manedit-0.7.1-remove-some-warning.patch
 
-BuildRequires:  gtk+-devel zlib-devel desktop-file-utils bzip2-devel
-Requires:       groff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# This is gtk+ package
+BuildRequires:  gtk+-devel
+BuildRequires:  zlib-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  desktop-file-utils
+Requires:       man
 
 %description
-ManEdit is a UNIX Manual Page Integrated Development Environment.
-It has full UNIX manual page editing capabilities using an XML
-interface with instant preview. ManEdit uses the GTK+ widget set
-and requires the X Window Systems.
-
-%prep
-cat< - 0.7.1-5
+- Remove some warnings.
+
+* Thu Nov  2 2006 Mamoru Tasaka  - 0.7.1-4
+- Add a comment about gtk+ issue on %%description.
+
+* Tue Oct 31 2006 Mamoru Tasaka  - 0.7.1-3
+- Install manview desktop, related icons.
+- Change Requires.
+- Remove manwrap
+
+* Sun Oct 29 2006 Mamoru Tasaka  - 0.7.1-2
+- Improve Makefile and mandir treatments, patches from Patrice Dumas.
+- Make man page.
+- Correct install directory.
+
+* Sat Oct 28 2006 Mamoru Tasaka  - 0.7.1-1
+- Re-submit to Fedora Extras.
+
 * Thu Apr 14 2005 Michael Schwendt  - 0.5.11-5
 - Fix build for GCC4.
 
@@ -97,4 +160,3 @@
 
 * Wed Aug 27 2003 Nils O. Sel??sdal  - 0:0.5.10-0.fdr.1
 - Initial RPM for Fedora
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:51:28 -0000	1.3
+++ sources	13 Nov 2006 09:10:27 -0000	1.4
@@ -1 +1 @@
-0059e183650cf7bae18dd1de4fff1352  manedit-0.5.11.tar.bz2
+229586101245eb61018ff031c2efb247  manedit-0.7.1.tar.bz2


--- manedit-0.5.11-bzip2.patch DELETED ---


--- manedit-0.5.11-gcc4.patch DELETED ---


--- manedit-0.5.11-multilib.patch DELETED ---


--- manedit-0.5.11-nostrip.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 09:15:36 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 02:15:36 -0700
Subject: owners owners.list,1.1940,1.1941
Message-ID: <200611130915.kAD9FaOm032557@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32539

Modified Files:
	owners.list 
Log Message:
manedit is unorphaned.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1940
retrieving revision 1.1941
diff -u -r1.1940 -r1.1941
--- owners.list	13 Nov 2006 07:28:17 -0000	1.1940
+++ owners.list	13 Nov 2006 09:15:06 -0000	1.1941
@@ -1040,7 +1040,7 @@
 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|
 Fedora Extras|manaworld-music|Music files for manaworld|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|manedit|GUI editor for creating man pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|manedit|UNIX Manual Page Editor|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|mantis|A web-based bugtracking system|giallu at gmail.com|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 09:18:59 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 02:18:59 -0700
Subject: comps comps-fe5.xml.in, 1.197, 1.198 comps-fe6.xml.in, 1.221,
	1.222 comps-fe7.xml.in, 1.20, 1.21
Message-ID: <200611130918.kAD9Ixjv032603@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32582

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add manedit


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- comps-fe5.xml.in	12 Nov 2006 18:38:19 -0000	1.197
+++ comps-fe5.xml.in	13 Nov 2006 09:18:29 -0000	1.198
@@ -137,6 +137,7 @@
       lightning
       lua
       mach
+      manedit
       mcrypt
       meld
       mercurial


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- comps-fe6.xml.in	12 Nov 2006 18:38:19 -0000	1.221
+++ comps-fe6.xml.in	13 Nov 2006 09:18:29 -0000	1.222
@@ -163,6 +163,7 @@
       lightning
       lua
       mach
+      manedit
       mcrypt
       meld
       mercurial


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- comps-fe7.xml.in	12 Nov 2006 18:38:19 -0000	1.20
+++ comps-fe7.xml.in	13 Nov 2006 09:18:29 -0000	1.21
@@ -163,6 +163,7 @@
       lightning
       lua
       mach
+      manedit
       mcrypt
       meld
       mercurial



From fedora-extras-commits at redhat.com  Mon Nov 13 10:17:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Nov 2006 03:17:22 -0700
Subject: rpms/fillets-ng-data/devel fillets-ng-data-0.7.1-pairs.patch, NONE, 
	1.1 fillets-ng-data.spec, 1.4, 1.5
Message-ID: <200611131017.kADAHMOM003428@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fillets-ng-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3409

Modified Files:
	fillets-ng-data.spec 
Added Files:
	fillets-ng-data-0.7.1-pairs.patch 
Log Message:
Add pairs patch for lua 5.1 compatilibity (#212920, Ivo Danihelka).


fillets-ng-data-0.7.1-pairs.patch:

--- NEW FILE fillets-ng-data-0.7.1-pairs.patch ---
Index: columns/code.lua
===================================================================
RCS file: /cvsroot/fillets/fillets_data/script/columns/code.lua,v
retrieving revision 1.1
diff -u -r1.1 code.lua
--- columns/code.lua	4 Jul 2004 15:03:14 -0000	1.1
+++ columns/code.lua	31 Oct 2006 18:45:49 -0000
@@ -203,7 +203,7 @@
                     rada1beg.faze = 0
                 end,
             }
-            for index, advice in advices1 do
+            for index, advice in pairs(advices1) do
                 advice:updateAnim()
             end
         end
@@ -312,7 +312,7 @@
                     rada2beg.faze = 0
                 end,
             }
-            for index, advice in advices2 do
+            for index, advice in pairs(advices2) do
                 advice:updateAnim()
             end
         end
Index: gems/code.lua
===================================================================
RCS file: /cvsroot/fillets/fillets_data/script/gems/code.lua,v
retrieving revision 1.2
diff -u -r1.2 code.lua
--- gems/code.lua	18 Aug 2004 14:50:46 -0000	1.2
+++ gems/code.lua	31 Oct 2006 18:45:50 -0000
@@ -85,7 +85,7 @@
         end
 
         return function()
-            for key, gem in gems do
+            for key, gem in pairs(gems) do
                 gem.glob = gem.glob + 1
                 if isIn(gem.glob, {1, 2, 3}) then
                     gem.afaze = gem.afaze + 1
Index: share/Pickle.lua
===================================================================
RCS file: /cvsroot/fillets/fillets_data/script/share/Pickle.lua,v
retrieving revision 1.1
diff -u -r1.1 Pickle.lua
--- share/Pickle.lua	26 Jun 2004 00:22:12 -0000	1.1
+++ share/Pickle.lua	31 Oct 2006 18:45:50 -0000
@@ -78,7 +78,7 @@
   end
   for tnum = 1, table.getn(tables) do
     local t = tables[tnum]
-    local tcopy = {}; for i, v in t do tcopy[i] = v end
+    local tcopy = {}; for i, v in pairs(t) do tcopy[i] = v end
     for i, v in pairs(tcopy) do
       local ni, nv
       if type(i) == "table" then ni = tables[i[1]] else ni = i end


Index: fillets-ng-data.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/fillets-ng-data.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fillets-ng-data.spec	15 Sep 2006 08:48:18 -0000	1.4
+++ fillets-ng-data.spec	13 Nov 2006 10:16:52 -0000	1.5
@@ -1,11 +1,12 @@
 Summary: Game data files for Fish Fillets Next Generation
 Name: fillets-ng-data
 Version: 0.7.1
-Release: 1
+Release: 2
 License: GPL
 Group: Amusements/Games
 URL: http://fillets.sourceforge.net/
 Source: http://dl.sf.net/fillets/fillets-ng-data-%{version}.tar.gz
+Patch0: fillets-ng-data-0.7.1-pairs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: fillets-ng >= 0.6.0
 Obsoletes: fillets-ng-data-cs <= 0.6.0
@@ -24,6 +25,9 @@
 
 %prep
 %setup -q
+cd script
+%patch0 -p0
+cd ..
 
 
 %build
@@ -48,6 +52,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  0.7.1-2
+- Add pairs patch for lua 5.1 compatilibity (#212920, Ivo Danihelka).
+
 * Mon Aug 28 2006 Matthias Saou  0.7.1-1
 - Minor spec file changes.
 



From fedora-extras-commits at redhat.com  Mon Nov 13 11:16:40 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 13 Nov 2006 04:16:40 -0700
Subject: fedora-security/audit fc5,1.388,1.389 fc6,1.140,1.141
Message-ID: <200611131116.kADBGeJl007100@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7080

Modified Files:
	fc5 fc6 
Log Message:
Weekend updates; except for kde, python, kernel.  Time to clear those :)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- fc5	10 Nov 2006 21:21:33 -0000	1.388
+++ fc5	13 Nov 2006 11:16:37 -0000	1.389
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20061109
-Up to date FC5 as of 20061109
+Up to date CVE as of CVE email 20061112
+Up to date FC5 as of 20061112
 
 ** are items that need attention
 
@@ -11,7 +11,7 @@
 CVE-2006-5748 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5747 version (firefox) [since FEDORA-2006-1199]
-CVE-2006-5706 ** php, fixed 5.2.0
+CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
@@ -61,7 +61,6 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
-CVE-2006-4810 ** texinfo
 CVE-2006-4810 backport (texinfo) [since FEDORA-2006-1202]
 CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- fc6	10 Nov 2006 21:21:33 -0000	1.140
+++ fc6	13 Nov 2006 11:16:37 -0000	1.141
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20061109
-Up to date FC6 as of 20061109
+Up to date CVE as of CVE email 20061112
+Up to date FC6 as of 20061112
 
 ** are items that need attention
 
@@ -11,7 +11,7 @@
 CVE-2006-5748 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5747 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5747 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
-CVE-2006-5706 ** php, fixed 5.2.0
+CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)



From fedora-extras-commits at redhat.com  Mon Nov 13 12:45:54 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 05:45:54 -0700
Subject: rpms/ochusha/devel .cvsignore, 1.4, 1.5 ochusha.spec, 1.4,
	1.5 sources, 
	1.4, 1.5 ochusha-0.5.99.63.2-call-g_thread_init-once.patch, 1.1,
	NONE ochusha-0.5.99.63.3-fix-ppc-typo.patch, 1.1, NONE
Message-ID: <200611131245.kADCjsxi010519@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10496

Modified Files:
	.cvsignore ochusha.spec sources 
Removed Files:
	ochusha-0.5.99.63.2-call-g_thread_init-once.patch 
	ochusha-0.5.99.63.3-fix-ppc-typo.patch 
Log Message:
* Mon Nov 13 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061113
- Update to 0.5.99.63.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2006 05:12:44 -0000	1.4
+++ .cvsignore	13 Nov 2006 12:45:24 -0000	1.5
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061112.tar.bz2
+ochusha-0.5.99.63.3-cvs061113.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ochusha.spec	12 Nov 2006 05:30:16 -0000	1.4
+++ ochusha.spec	13 Nov 2006 12:45:24 -0000	1.5
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.3
-%define              strtag          cvs061112
+%define              strtag          cvs061113
 
 %define              vendor_rel      2
 %define              pre_release     1
@@ -23,8 +23,6 @@
 %else
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
 %endif
-Patch0:              ochusha-0.5.99.63.2-call-g_thread_init-once.patch
-Patch1:              ochusha-0.5.99.63.3-fix-ppc-typo.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -55,9 +53,6 @@
 %setup -q
 %endif
 
-%patch0 -p1 -b .g_thread_init
-%patch1 -p1 -b .ppc_typo
-
 # change desktop entry to use png file in 
 # %{icondir}
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
@@ -159,7 +154,7 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061112
+* Mon Nov 13 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061113
 - Update to 0.5.99.63.3
 
 * Fri Nov 03 2006  0.5.99.62-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2006 05:12:44 -0000	1.4
+++ sources	13 Nov 2006 12:45:24 -0000	1.5
@@ -1 +1 @@
-7fd7b7e7fe1ff5911a5b536ab557d573  ochusha-0.5.99.63.3-cvs061112.tar.bz2
+5ca01bb450e98685c2f979f144e0d8d1  ochusha-0.5.99.63.3-cvs061113.tar.bz2


--- ochusha-0.5.99.63.2-call-g_thread_init-once.patch DELETED ---


--- ochusha-0.5.99.63.3-fix-ppc-typo.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 12:58:54 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 05:58:54 -0700
Subject: rpms/jd/devel .cvsignore, 1.15, 1.16 jd.spec, 1.22, 1.23 sources,
	1.15, 1.16
Message-ID: <200611131258.kADCws8N010668@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10648

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Nov 13 2006 Mamoru Tasaka  - 1.8.0-0.6.cvs061112
- cvs 061112 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	8 Nov 2006 15:22:39 -0000	1.15
+++ .cvsignore	13 Nov 2006 12:58:24 -0000	1.16
@@ -1 +1 @@
-jd-1.8.0-rc061108.tgz
+jd-1.8.0-cvs061112.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jd.spec	8 Nov 2006 15:24:26 -0000	1.22
+++ jd.spec	13 Nov 2006 12:58:24 -0000	1.23
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        rc061108
+%define         strtag        cvs061112
 %define         repoid        22637
 
 
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -43,8 +43,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Nov 13 2006 Mamoru Tasaka  - 1.8.0-0.6.cvs061112
+- cvs 061112 (23:59 JST)
+
 * Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
 - 1.8.0 rc 061108
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	8 Nov 2006 15:22:39 -0000	1.15
+++ sources	13 Nov 2006 12:58:24 -0000	1.16
@@ -1 +1 @@
-1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz
+6fbae78257a68148a160b508b8f80d7a  jd-1.8.0-cvs061112.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 14:45:27 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:45:27 -0700
Subject: rpms/aumix - New directory
Message-ID: <200611131445.kADEjR8i017380@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17376/aumix

Log Message:
Directory /cvs/extras/rpms/aumix added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 14:45:33 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:45:33 -0700
Subject: rpms/aumix/devel - New directory
Message-ID: <200611131445.kADEjXEx017395@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17376/aumix/devel

Log Message:
Directory /cvs/extras/rpms/aumix/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 14:45:47 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:45:47 -0700
Subject: rpms/aumix Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131445.kADEjlkv017429@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17423

Added Files:
	Makefile import.log 
Log Message:
Setup of module aumix


--- NEW FILE Makefile ---
# Top level Makefile for module aumix
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  Mon Nov 13 14:45:53 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:45:53 -0700
Subject: rpms/aumix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611131445.kADEjral017446@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17423/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aumix


--- 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 Nov 13 14:47:02 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:47:02 -0700
Subject: rpms/aumix import.log,1.1,1.2
Message-ID: <200611131447.kADEl2Us017560@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512

Modified Files:
	import.log 
Log Message:
auto-import aumix-2.8-1 on branch devel from aumix-2.8-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/aumix/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 14:45:47 -0000	1.1
+++ import.log	13 Nov 2006 14:46:32 -0000	1.2
@@ -0,0 +1 @@
+aumix-2_8-1:HEAD:aumix-2.8-1.src.rpm:1163429187



From fedora-extras-commits at redhat.com  Mon Nov 13 14:47:03 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:47:03 -0700
Subject: rpms/aumix/devel aumix-2.8-bug-115869.patch, NONE,
	1.1 aumix-2.8-include-signal_h.patch, NONE,
	1.1 aumix-2.8-save_load.patch, NONE,
	1.1 aumix-fix-crackrock.patch, NONE,
	1.1 aumix-fix-cursor-color-on-exit.patch, NONE, 1.1 aumix.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611131447.kADEl3W2017564@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aumix-2.8-bug-115869.patch aumix-2.8-include-signal_h.patch 
	aumix-2.8-save_load.patch aumix-fix-crackrock.patch 
	aumix-fix-cursor-color-on-exit.patch aumix.spec 
Log Message:
auto-import aumix-2.8-1 on branch devel from aumix-2.8-1.src.rpm

aumix-2.8-bug-115869.patch:

--- NEW FILE aumix-2.8-bug-115869.patch ---
Patch by mharris to fix bug:

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=115869

--- src/mute.bug-115869	Thu Dec 23 11:56:42 2004
+++ src/mute	Thu Dec 23 11:56:55 2004
@@ -8,7 +8,8 @@
 volumes=$(aumix -vq |tr -d ,)
 if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
 	$(echo $volumes | awk '{print $3}') -ne 0 ]; then
-	aumix -S -v 0
+	aumix -S
+	aumix -v 0
 else
 	aumix -L > /dev/null
 fi

aumix-2.8-include-signal_h.patch:

--- NEW FILE aumix-2.8-include-signal_h.patch ---
--- src/common.h.include-signal_h	Sun May 18 01:40:04 2003
+++ src/common.h	Sun May 18 01:38:55 2003
@@ -37,6 +37,7 @@
 #include 		/* getenv() */
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

aumix-2.8-save_load.patch:

--- NEW FILE aumix-2.8-save_load.patch ---
--- aumix-2.7/src/common.c.save_load	Mon Jun 25 22:08:22 2001
+++ aumix-2.7/src/common.c	Mon Jun 25 22:16:30 2001
@@ -114,6 +114,7 @@
 int             main(int argc, char *argv[])
 {
 	int             optn, ii;
+	int		save = 0, load = 0;
 #ifdef HAVE_CURSES
 	int             setcolors = FALSE;
 #endif				/* HAVE_CURSES */
@@ -169,14 +170,10 @@
 				break;
 #endif				/* HAVE_CURSES */
 			case 'S':	/* Save to file. */
-				if (mixer_fd == -1)
-					ErrorExitWarn(InitializeMixer(device_filename), 'e');
-				ErrorExitWarn(SaveSettings(), 'e');
+				save = 1;
 				break;
 			case 'L':	/* Load from file. */
-				if (mixer_fd == -1)
-					ErrorExitWarn(InitializeMixer(device_filename), 'e');
-				ErrorExitWarn(LoadSettings(), 'e');
+				load = 1;
 				break;
 #if defined (HAVE_CURSES) || defined (HAVE_GTK)
 			case 'I':	/* User asked for interactive mode. */
@@ -192,6 +189,17 @@
 			}
 		}
 	}
+	if (save | load) {
+		if (mixer_fd == -1)
+			ErrorExitWarn(InitializeMixer(device_filename), 'e');
+		if (save)
+			ErrorExitWarn(SaveSettings(), 'e');
+		else
+			ErrorExitWarn(LoadSettings(), 'e');
+		close(mixer_fd);
+		exit(EXIT_SUCCESS);
+	}
+	
 #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
 /* Be interactive if no options were given. */
 	if (!interactive && argc <= 1)

aumix-fix-crackrock.patch:

--- NEW FILE aumix-fix-crackrock.patch ---
--- src/common.c.fix-crackrock	Thu Dec 23 12:48:25 2004
+++ src/common.c	Thu Dec 23 12:51:59 2004
@@ -19,6 +19,7 @@
  * Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include 
 #include "common.h"
 #ifdef HAVE_CURSES
 #include "curses.h"
@@ -612,17 +612,16 @@
 int             SetShowNoninter(int dev)
 {
 /* Change or display settings from the command line. */
-	char           *devstr, dest;
+	char           *devstr;
 	int             change = 0, tmp, left, right;
 	/* Increase or decrease levels, optionally by a number. */
 	if (!strncmp(optarg, "+", 1) || !strncmp(optarg, "-", 1)) {
 		ErrorExitWarn(ReadLevel(dev, &tmp), 'e');
 		right = tmp >> 8;	/* I'll take the high byte, */
 		left = tmp & 0xFF;	/* and you take the low byte. */
-		strncpy(&dest, (optarg + 1), 3);
-		change = 1;	/* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
-		if (atoi(&dest))
-			change = atoi(&dest);
+		change = (int) strtol(optarg, NULL, 10);
+		if (errno)
+			change = 1;	/* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
 		if (*optarg == '+') {	/* increase */
 			right += change;
 			left += change;

aumix-fix-cursor-color-on-exit.patch:

--- NEW FILE aumix-fix-cursor-color-on-exit.patch ---
michael at yohe.net - this fixes the blue cursor that appears on some terminals
as - CloseScreen() resets the color to default, but nothing ever gets printed
so the cursor was never updated.  Simply adding a carriage return does not
change the behavior, and will reset the cursor properly.

--- src/common.c	2002-11-25 10:07:08.000000000 -0600
+++ src/common.c	2002-11-25 10:06:50.000000000 -0600
@@ -251,6 +251,9 @@
 		close(mixer_fd);
 #if HAVE_CURSES
 		CloseScreen();
+		
+		/* simple carriage return to reset the cursor */
+		printf( "\n" );
 	}
 #endif				/* HAVE_CURSES */
 	exit(EXIT_SUCCESS);


--- NEW FILE aumix.spec ---
Name: aumix
Version: 2.8
Release: 1%{?dist}
Summary: Audio mixer based on ncurses
License: GPL
Group: Applications/Multimedia
URL: http://jpj.net/~trevor/aumix.html
Source0: http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.bz2
Patch0:  aumix-2.8-save_load.patch
Patch1:  aumix-2.8-include-signal_h.patch
Patch2:  aumix-fix-cursor-color-on-exit.patch
Patch3:  aumix-fix-crackrock.patch
Patch4:  aumix-2.8-bug-115869.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext ncurses-devel

%description
An audio mixer with a compact visual layout based on ncurses.

%prep
%setup -q
%patch0 -p1
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0

%build
%configure --without-gtk --without-gtk1
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall
%{__rm} -rf %{buildroot}/%{_bindir}/mute
%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root)
%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_bindir}/aumix
%{_bindir}/xaumix
%{_mandir}/man1/xaumix.*
%{_mandir}/man1/aumix.*
%{_datadir}/aumix

%changelog
* Wed Nov 08 2006 Gabriel L. Somlo  2.8-1
- initial Extras build based on latest Core CVS, including all their patches
- only building ncurses version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 14:45:53 -0000	1.1
+++ .cvsignore	13 Nov 2006 14:46:33 -0000	1.2
@@ -0,0 +1 @@
+aumix-2.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 14:45:53 -0000	1.1
+++ sources	13 Nov 2006 14:46:33 -0000	1.2
@@ -0,0 +1 @@
+dc3fc7209752207c23e7c94ab886b340  aumix-2.8.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 14:50:23 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:50:23 -0700
Subject: owners owners.list,1.1941,1.1942
Message-ID: <200611131450.kADEoNWa017659@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17640/owners

Modified Files:
	owners.list 
Log Message:
added aumix entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1941
retrieving revision 1.1942
diff -u -r1.1941 -r1.1942
--- owners.list	13 Nov 2006 09:15:06 -0000	1.1941
+++ owners.list	13 Nov 2006 14:49:52 -0000	1.1942
@@ -84,6 +84,7 @@
 Fedora Extras|atomix|Little mind game where you have to build molecules out of atoms lying around|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|audacious|A GTK2 based media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|aumix|Audio mixer based on ncurses|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|auriferous|Game inspired by the classic Loderunner|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|autobuild-applet|Panel applet for monitoring Test-AutoBuild server status|berrange at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|autogen|A tool to simplify handling large amounts of repeatitous text|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 15:09:26 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Nov 2006 08:09:26 -0700
Subject: rpms/torcs/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 torcs.spec, 
	1.12, 1.13 torcs-1.2.4-extraqualif.patch, 1.1,
	NONE torcs-1.2.4-track_cpp.patch, 1.1, NONE
Message-ID: <200611131509.kADF9QD2020873@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20835/FC-5

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	torcs-1.2.4-extraqualif.patch torcs-1.2.4-track_cpp.patch 
Log Message:
Backport 1.3.0 update from devel to FC-6 and FC-5 branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2005 07:49:42 -0000	1.5
+++ .cvsignore	13 Nov 2006 15:08:56 -0000	1.6
@@ -1,5 +1,5 @@
-TORCS-1.2.4-src-robots-base.tgz
-TORCS-1.2.4-src-robots-berniw.tgz
-TORCS-1.2.4-src-robots-bt.tgz
-TORCS-1.2.4-src-robots-olethros.tgz
-TORCS-1.2.4-src.tgz
+TORCS-1.3.0-src.tgz
+TORCS-1.3.0-src-robots-base.tgz
+TORCS-1.3.0-src-robots-berniw.tgz
+TORCS-1.3.0-src-robots-bt.tgz
+TORCS-1.3.0-src-robots-olethros.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2005 07:49:42 -0000	1.5
+++ sources	13 Nov 2006 15:08:56 -0000	1.6
@@ -1,5 +1,5 @@
-3afe0d23f1e637fe56efccd2b6e8a8f1  TORCS-1.2.4-src-robots-base.tgz
-40aed9595f91051e8468e8a19b65f809  TORCS-1.2.4-src-robots-berniw.tgz
-337eecc6e545aceda094d945e12c3023  TORCS-1.2.4-src-robots-bt.tgz
-13b1eeba1148ca57dc1d989fcb27d308  TORCS-1.2.4-src-robots-olethros.tgz
-f5b41bf29cb7b6160e5ead6e187380b6  TORCS-1.2.4-src.tgz
+915c89f9d3618d13dddd5bfb4d199539  TORCS-1.3.0-src.tgz
+da007d61447f38fbdbd22aec029cc26c  TORCS-1.3.0-src-robots-base.tgz
+abeb72ba3913ef0bde727fdaa9699eef  TORCS-1.3.0-src-robots-berniw.tgz
+ca8506aecc30bee308a5e198304b71b2  TORCS-1.3.0-src-robots-bt.tgz
+227d47687b821298fe6b2f147071e73f  TORCS-1.3.0-src-robots-olethros.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-5/torcs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- torcs.spec	10 Mar 2006 16:34:11 -0000	1.12
+++ torcs.spec	13 Nov 2006 15:08:56 -0000	1.13
@@ -2,8 +2,8 @@
 
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.2.4
-Release: 3%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -13,16 +13,15 @@
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
 Patch0: torcs-1.2.4-freealutfix.patch
-Patch1: torcs-1.2.4-track_cpp.patch
-Patch2: torcs-1.2.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
 BuildRequires: libpng-devel, libjpeg-devel, zlib-devel, openal-devel
 BuildRequires: desktop-file-utils
 # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
-%if %{!?fedora:5}%{?fedora} >= 5
-BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel, libXxf86vm-devel, libXrandr-devel, libXrender-devel
+%if %{!?fedora:6}%{?fedora} >= 5
+BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel
+BuildRequires: libXxf86vm-devel, libXrandr-devel, libXrender-devel
 %else
 BuildRequires: xorg-x11-devel
 %endif
@@ -36,7 +35,7 @@
 %package robots
 Summary: The Open Racing Car Simulator robots
 Group: Amusements/Games
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description robots
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -49,20 +48,19 @@
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
 %patch0 -p1 -b .freealutfix
-%patch1 -p0 -b .track_cpp
-%patch2 -p1 -b .extraqualif
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
 
 %build
-# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4)
+# Force locations with modular X (for FC5+ and non-Fedora)
+# Required (1.2.4, still in 1.3.0)
 %configure \
 %if %{!?fedora:5}%{?fedora} >= 5
     --x-includes=%{_includedir} \
     --x-libraries=%{_libdir}
 %endif
-# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.2.4
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0
 %{__make}
 
 
@@ -89,7 +87,7 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
-# We need this for proper automatic stripping to take place (still in 1.2.3)
+# We need this for proper automatic stripping to take place (still in 1.3.0)
 find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x
 
 
@@ -99,7 +97,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG.html COPYING README.linux TODO.html
+%doc COPYING README README.linux
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/drivers/
@@ -162,6 +160,14 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  1.3.0-1
+- Update to 1.3.0.
+- Remove no longer needed track.cpp patch1.
+- Remove no longer needed extraqualif patch2.
+
+* Mon Aug 28 2006 Matthias Saou  1.2.4-4
+- FC6 rebuild.
+
 * Fri Mar 10 2006 Matthias Saou  1.2.4-3
 - Remove patch that disabled checking for openal, since it also disabled
   linking against it, and caused nasty things to happen.


--- torcs-1.2.4-extraqualif.patch DELETED ---


--- torcs-1.2.4-track_cpp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 15:09:27 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Nov 2006 08:09:27 -0700
Subject: rpms/torcs/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 torcs.spec, 
	1.13, 1.14 torcs-1.2.4-extraqualif.patch, 1.1,
	NONE torcs-1.2.4-track_cpp.patch, 1.1, NONE
Message-ID: <200611131509.kADF9RLC020878@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20835/FC-6

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	torcs-1.2.4-extraqualif.patch torcs-1.2.4-track_cpp.patch 
Log Message:
Backport 1.3.0 update from devel to FC-6 and FC-5 branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2005 07:49:42 -0000	1.5
+++ .cvsignore	13 Nov 2006 15:08:57 -0000	1.6
@@ -1,5 +1,5 @@
-TORCS-1.2.4-src-robots-base.tgz
-TORCS-1.2.4-src-robots-berniw.tgz
-TORCS-1.2.4-src-robots-bt.tgz
-TORCS-1.2.4-src-robots-olethros.tgz
-TORCS-1.2.4-src.tgz
+TORCS-1.3.0-src.tgz
+TORCS-1.3.0-src-robots-base.tgz
+TORCS-1.3.0-src-robots-berniw.tgz
+TORCS-1.3.0-src-robots-bt.tgz
+TORCS-1.3.0-src-robots-olethros.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2005 07:49:42 -0000	1.5
+++ sources	13 Nov 2006 15:08:57 -0000	1.6
@@ -1,5 +1,5 @@
-3afe0d23f1e637fe56efccd2b6e8a8f1  TORCS-1.2.4-src-robots-base.tgz
-40aed9595f91051e8468e8a19b65f809  TORCS-1.2.4-src-robots-berniw.tgz
-337eecc6e545aceda094d945e12c3023  TORCS-1.2.4-src-robots-bt.tgz
-13b1eeba1148ca57dc1d989fcb27d308  TORCS-1.2.4-src-robots-olethros.tgz
-f5b41bf29cb7b6160e5ead6e187380b6  TORCS-1.2.4-src.tgz
+915c89f9d3618d13dddd5bfb4d199539  TORCS-1.3.0-src.tgz
+da007d61447f38fbdbd22aec029cc26c  TORCS-1.3.0-src-robots-base.tgz
+abeb72ba3913ef0bde727fdaa9699eef  TORCS-1.3.0-src-robots-berniw.tgz
+ca8506aecc30bee308a5e198304b71b2  TORCS-1.3.0-src-robots-bt.tgz
+227d47687b821298fe6b2f147071e73f  TORCS-1.3.0-src-robots-olethros.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-6/torcs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- torcs.spec	28 Aug 2006 16:40:15 -0000	1.13
+++ torcs.spec	13 Nov 2006 15:08:57 -0000	1.14
@@ -2,8 +2,8 @@
 
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.2.4
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -13,8 +13,6 @@
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
 Patch0: torcs-1.2.4-freealutfix.patch
-Patch1: torcs-1.2.4-track_cpp.patch
-Patch2: torcs-1.2.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
@@ -37,7 +35,7 @@
 %package robots
 Summary: The Open Racing Car Simulator robots
 Group: Amusements/Games
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description robots
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -50,20 +48,19 @@
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
 %patch0 -p1 -b .freealutfix
-%patch1 -p0 -b .track_cpp
-%patch2 -p1 -b .extraqualif
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
 
 %build
-# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4)
+# Force locations with modular X (for FC5+ and non-Fedora)
+# Required (1.2.4, still in 1.3.0)
 %configure \
 %if %{!?fedora:5}%{?fedora} >= 5
     --x-includes=%{_includedir} \
     --x-libraries=%{_libdir}
 %endif
-# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.2.4
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0
 %{__make}
 
 
@@ -90,7 +87,7 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
-# We need this for proper automatic stripping to take place (still in 1.2.3)
+# We need this for proper automatic stripping to take place (still in 1.3.0)
 find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x
 
 
@@ -100,7 +97,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG.html COPYING README.linux TODO.html
+%doc COPYING README README.linux
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/drivers/
@@ -163,6 +160,11 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  1.3.0-1
+- Update to 1.3.0.
+- Remove no longer needed track.cpp patch1.
+- Remove no longer needed extraqualif patch2.
+
 * Mon Aug 28 2006 Matthias Saou  1.2.4-4
 - FC6 rebuild.
 


--- torcs-1.2.4-extraqualif.patch DELETED ---


--- torcs-1.2.4-track_cpp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 15:41:29 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 08:41:29 -0700
Subject: comps comps-fe5.xml.in, 1.198, 1.199 comps-fe6.xml.in, 1.222,
	1.223 comps-fe7.xml.in, 1.21, 1.22
Message-ID: <200611131541.kADFfTub021718@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21660/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
added aumix



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- comps-fe5.xml.in	13 Nov 2006 09:18:29 -0000	1.198
+++ comps-fe5.xml.in	13 Nov 2006 15:40:59 -0000	1.199
@@ -797,6 +797,7 @@
       alsamixergui
       amarok
       audacity
+      aumix
       bin2iso
       bmp
       camE


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- comps-fe6.xml.in	13 Nov 2006 09:18:29 -0000	1.222
+++ comps-fe6.xml.in	13 Nov 2006 15:40:59 -0000	1.223
@@ -849,6 +849,7 @@
       alsamixergui
       amarok
       audacity
+      aumix
       bin2iso
       brasero
       camE


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- comps-fe7.xml.in	13 Nov 2006 09:18:29 -0000	1.21
+++ comps-fe7.xml.in	13 Nov 2006 15:40:59 -0000	1.22
@@ -849,6 +849,7 @@
       alsamixergui
       amarok
       audacity
+      aumix
       bin2iso
       brasero
       camE



From fedora-extras-commits at redhat.com  Mon Nov 13 16:22:21 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 09:22:21 -0700
Subject: rpms/gtk-gnutella/FC-5 .cvsignore, 1.5, 1.6 gtk-gnutella.spec, 1.8, 
	1.9 sources, 1.5, 1.6
Message-ID: <200611131622.kADGMLuR026065@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26045

Modified Files:
	.cvsignore gtk-gnutella.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Oct 2006 11:39:38 -0000	1.5
+++ .cvsignore	13 Nov 2006 16:21:51 -0000	1.6
@@ -1 +1 @@
-gtk-gnutella-0.96.2.tar.bz2
+gtk-gnutella-0.96.3.tar.bz2


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-gnutella.spec	23 Oct 2006 11:55:28 -0000	1.8
+++ gtk-gnutella.spec	13 Nov 2006 16:21:51 -0000	1.9
@@ -1,7 +1,7 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.2
+Version: 0.96.3
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
@@ -48,18 +48,18 @@
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
 install -D -m 644 extra_files/gtk-gnutella.16.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.32.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.svg \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
-desktop-file-install --vendor fedora --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Fedora                                   \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+desktop-file-install --vendor fedora --delete-original	\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	$RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang %{name}
 
@@ -77,10 +77,13 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 
-%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
+%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/shell.txt
 
 
 %changelog
+* Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
+- update to 0.96.3
+
 * Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
 - update to 0.96.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 11:39:38 -0000	1.5
+++ sources	13 Nov 2006 16:21:51 -0000	1.6
@@ -1 +1 @@
-a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2
+c6952037a10ea6d5ac5649e7b75f9d15  gtk-gnutella-0.96.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 16:36:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:36:57 -0700
Subject: rpms/perl-WWW-Babelfish - New directory
Message-ID: <200611131636.kADGavCe026374@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26370/perl-WWW-Babelfish

Log Message:
Directory /cvs/extras/rpms/perl-WWW-Babelfish added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 16:36:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:36:57 -0700
Subject: owners owners.list,1.1942,1.1943
Message-ID: <200611131636.kADGavuV026381@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26343

Modified Files:
	owners.list 
Log Message:
added perl-WWW-Babelfish


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1942
retrieving revision 1.1943
diff -u -r1.1942 -r1.1943
--- owners.list	13 Nov 2006 14:49:52 -0000	1.1942
+++ owners.list	13 Nov 2006 16:36:27 -0000	1.1943
@@ -1743,6 +1743,7 @@
 Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-version|Perl extension for Version Objects|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-WWW-Babelfish|Perl extension for translation via Babelfish or Google|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Bugzilla|Handles submission/update of bugzilla bugs via WWW::Mechanize|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Myspace|Access your myspace.com profile in Perl!|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Nov 13 16:37:03 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:37:03 -0700
Subject: rpms/perl-WWW-Babelfish/devel - New directory
Message-ID: <200611131637.kADGb3ZO026393@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26370/perl-WWW-Babelfish/devel

Log Message:
Directory /cvs/extras/rpms/perl-WWW-Babelfish/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 16:37:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:37:11 -0700
Subject: rpms/perl-WWW-Babelfish Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131637.kADGbBHN026419@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26413

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-WWW-Babelfish


--- NEW FILE Makefile ---
# Top level Makefile for module perl-WWW-Babelfish
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  Mon Nov 13 16:37:17 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:37:17 -0700
Subject: rpms/perl-WWW-Babelfish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611131637.kADGbHZH026435@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26413/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-WWW-Babelfish


--- 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 Nov 13 16:38:00 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:38:00 -0700
Subject: rpms/perl-WWW-Babelfish/devel perl-WWW-Babelfish.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611131638.kADGc0sO026496@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26460/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WWW-Babelfish.spec 
Log Message:
auto-import perl-WWW-Babelfish-0.15-1.fc6 on branch devel from perl-WWW-Babelfish-0.15-1.fc6.src.rpm


--- NEW FILE perl-WWW-Babelfish.spec ---
Name:           perl-WWW-Babelfish
Version:        0.15
Release:        1%{?dist}
Summary:        Perl extension for translation via Babelfish or Google
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Babelfish/
Source0:        http://www.cpan.org/authors/id/D/DU/DURIST/WWW-Babelfish-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(HTML::TokeParser)
BuildRequires:  perl(HTTP::Request)
BuildRequires:  perl(IO::String)
BuildRequires:  perl(LWP::UserAgent)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl interface to the WWW babelfish translation server.

%prep
%setup -q -n WWW-Babelfish-%{version}

%build
# nix internet-based tests
echo n | %{__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 {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Oct 26 2006 Chris Weyl  0.15-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Babelfish/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 16:37:17 -0000	1.1
+++ .cvsignore	13 Nov 2006 16:37:29 -0000	1.2
@@ -0,0 +1 @@
+WWW-Babelfish-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Babelfish/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 16:37:17 -0000	1.1
+++ sources	13 Nov 2006 16:37:29 -0000	1.2
@@ -0,0 +1 @@
+bc6293dabcbf5e96435fc8acaf8ac939  WWW-Babelfish-0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 16:37:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:37:59 -0700
Subject: rpms/perl-WWW-Babelfish import.log,1.1,1.2
Message-ID: <200611131637.kADGbxQa026492@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26460

Modified Files:
	import.log 
Log Message:
auto-import perl-WWW-Babelfish-0.15-1.fc6 on branch devel from perl-WWW-Babelfish-0.15-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Babelfish/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 16:37:11 -0000	1.1
+++ import.log	13 Nov 2006 16:37:29 -0000	1.2
@@ -0,0 +1 @@
+perl-WWW-Babelfish-0_15-1_fc6:HEAD:perl-WWW-Babelfish-0.15-1.fc6.src.rpm:1163435848



From fedora-extras-commits at redhat.com  Mon Nov 13 16:38:49 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:38:49 -0700
Subject: rpms/perl-WWW-Babelfish/devel perl-WWW-Babelfish.spec,1.1,1.2
Message-ID: <200611131638.kADGcn1K026548@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532

Modified Files:
	perl-WWW-Babelfish.spec 
Log Message:
release bump


Index: perl-WWW-Babelfish.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Babelfish/devel/perl-WWW-Babelfish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-WWW-Babelfish.spec	13 Nov 2006 16:37:29 -0000	1.1
+++ perl-WWW-Babelfish.spec	13 Nov 2006 16:38:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Babelfish
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for translation via Babelfish or Google
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -48,5 +48,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 13 2006 Chris Weyl  0.15-2
+- bump
+
 * Thu Oct 26 2006 Chris Weyl  0.15-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Mon Nov 13 16:43:47 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Mon, 13 Nov 2006 09:43:47 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.9,1.10
Message-ID: <200611131643.kADGhl2p026632@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26615

Modified Files:
	xmoto.spec 
Log Message:
* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
- Added again the debuginfo package (it's working)



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmoto.spec	12 Nov 2006 20:40:51 -0000	1.9
+++ xmoto.spec	13 Nov 2006 16:43:17 -0000	1.10
@@ -1,6 +1,3 @@
-# No debuginfo package due to faulty find-debuginfo.sh
-%define debug_package %{nil}
-
 Name:           xmoto
 Version:        0.2.2
 Release:        1%{?dist}
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
+- Added again the debuginfo package (it's working)
+
 * Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Nov 13 16:45:14 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Mon, 13 Nov 2006 09:45:14 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.10,1.11
Message-ID: <200611131645.kADGjEJM026664@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26646

Modified Files:
	xmoto.spec 
Log Message:



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmoto.spec	13 Nov 2006 16:43:17 -0000	1.10
+++ xmoto.spec	13 Nov 2006 16:44:44 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           xmoto
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Mon Nov 13 16:47:18 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Mon, 13 Nov 2006 09:47:18 -0700
Subject: rpms/xmoto/FC-6 xmoto.spec,1.5,1.6
Message-ID: <200611131647.kADGlIMo026731@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26708

Modified Files:
	xmoto.spec 
Log Message:
* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
- Added again the debuginfo package (it's working)



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-6/xmoto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmoto.spec	12 Nov 2006 22:47:47 -0000	1.5
+++ xmoto.spec	13 Nov 2006 16:46:48 -0000	1.6
@@ -1,9 +1,6 @@
-# No debuginfo package due to faulty find-debuginfo.sh
-%define debug_package %{nil}
-
 Name:           xmoto
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
+- Added again the debuginfo package (it's working)
+
 * Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Nov 13 16:48:31 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Mon, 13 Nov 2006 09:48:31 -0700
Subject: rpms/xmoto/FC-5 xmoto.spec,1.4,1.5
Message-ID: <200611131648.kADGmVmv026807@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26779

Modified Files:
	xmoto.spec 
Log Message:
* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
- Added again the debuginfo package (it's working)



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-5/xmoto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmoto.spec	12 Nov 2006 22:45:53 -0000	1.4
+++ xmoto.spec	13 Nov 2006 16:48:01 -0000	1.5
@@ -1,9 +1,6 @@
-# No debuginfo package due to faulty find-debuginfo.sh
-%define debug_package %{nil}
-
 Name:           xmoto
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
+- Added again the debuginfo package (it's working)
+
 * Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Nov 13 16:50:50 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Nov 2006 09:50:50 -0700
Subject: rpms/gnomesword/devel .cvsignore, 1.5, 1.6 gnomesword.spec, 1.16,
	1.17 sources, 1.6, 1.7
Message-ID: <200611131650.kADGoomN026919@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26892

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Mon Nov 13 2006 Deji Akingunola  - 2.1.9-1
- New release (2.1.9)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Nov 2006 04:23:58 -0000	1.5
+++ .cvsignore	13 Nov 2006 16:50:20 -0000	1.6
@@ -1 +1 @@
-gnomesword-2.1.8.tar.gz
+gnomesword-2.1.9.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnomesword.spec	9 Nov 2006 06:45:18 -0000	1.16
+++ gnomesword.spec	13 Nov 2006 16:50:20 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gnomesword           
-Version:        2.1.8
-Release:        3%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -41,7 +41,7 @@
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
-#make %{?_smp_mflags} : // Dosn't seem to work on i386
+#make %{?_smp_mflags} : // Doesn't seem to work on i386
 make
 
 %install
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Deji Akingunola  - 2.1.9-1
+- New release (2.1.9)
+
 * Thu Nov 09 2006 Deji Akingunola  - 2.1.8-3
 - Seems parallel make is causing problems
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Nov 2006 04:23:58 -0000	1.6
+++ sources	13 Nov 2006 16:50:20 -0000	1.7
@@ -1 +1 @@
-fd648e8690e1c96b8f94b249eeb09b03  gnomesword-2.1.8.tar.gz
+f6c5ebd5a7ee6d248682289e809f36bf  gnomesword-2.1.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 16:58:01 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 13 Nov 2006 09:58:01 -0700
Subject: owners owners.list,1.1943,1.1944
Message-ID: <200611131658.kADGw1LF027023@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27007

Modified Files:
	owners.list 
Log Message:
- add multican to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1943
retrieving revision 1.1944
diff -u -r1.1943 -r1.1944
--- owners.list	13 Nov 2006 16:36:27 -0000	1.1943
+++ owners.list	13 Nov 2006 16:57:31 -0000	1.1944
@@ -1105,6 +1105,7 @@
 Fedora Extras|mpc|Command-line client for MPD|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mtd-utils|Utilities for dealing with MTD (flash) devices|dwmw2 at redhat.com|extras-qa at fedoraproject.org|jwboyer at jdub.homelinux.org
 Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
+Fedora Extras|multican|Remote control utility for Canon cameras|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 17:05:19 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 10:05:19 -0700
Subject: rpms/gtk-gnutella/FC-6 gtk-gnutella.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <200611131705.kADH5JNc030086@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30062

Modified Files:
	gtk-gnutella.spec sources 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-6/gtk-gnutella.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-gnutella.spec	23 Oct 2006 12:04:16 -0000	1.9
+++ gtk-gnutella.spec	13 Nov 2006 17:04:49 -0000	1.10
@@ -1,7 +1,7 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.2
+Version: 0.96.3
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
@@ -48,18 +48,18 @@
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
 install -D -m 644 extra_files/gtk-gnutella.16.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.32.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.svg \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
-desktop-file-install --vendor fedora --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Fedora                                   \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+desktop-file-install --vendor fedora --delete-original	\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	$RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang %{name}
 
@@ -77,19 +77,16 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 
-%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
+%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/shell.txt
 
 
 %changelog
+* Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
+- update to 0.96.3
+
 * Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
 - update to 0.96.2
 
-* Fri Sep  1 2006 Dmitry Butskoy  - 0.96.1-3
-- rebuild for FC6
-
-* Mon Jul  3 2006 Dmitry Butskoy  - 0.96.1-2
-- add BR: gettext
-
 * Fri Feb 24 2006 Dmitry Butskoy  - 0.96.1-1
 - update to 0.96.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 12:04:16 -0000	1.5
+++ sources	13 Nov 2006 17:04:49 -0000	1.6
@@ -1 +1 @@
-a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2
+c6952037a10ea6d5ac5649e7b75f9d15  gtk-gnutella-0.96.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 17:25:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:25:51 -0700
Subject: rpms/perl-Moose-Policy - New directory
Message-ID: <200611131725.kADHPpRm030302@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30298/perl-Moose-Policy

Log Message:
Directory /cvs/extras/rpms/perl-Moose-Policy added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 17:25:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:25:52 -0700
Subject: owners owners.list,1.1944,1.1945
Message-ID: <200611131725.kADHPqNZ030309@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30275

Modified Files:
	owners.list 
Log Message:
added perl-Moose-Policy


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1944
retrieving revision 1.1945
diff -u -r1.1944 -r1.1945
--- owners.list	13 Nov 2006 16:57:31 -0000	1.1944
+++ owners.list	13 Nov 2006 17:25:21 -0000	1.1945
@@ -1563,6 +1563,7 @@
 Fedora Extras|perl-Module-Starter-PBP|Create a module as recommended in "Perl Best Practices"|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Moose|Complete modern object system for Perl 5|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Moose-Policy|Police your project/company-wide Moose policies|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MP3-Info|Manipulate / fetch info from MP3 audio files|chris.stone at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Nov 13 17:25:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:25:57 -0700
Subject: rpms/perl-Moose-Policy/devel - New directory
Message-ID: <200611131725.kADHPv6C030319@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30298/perl-Moose-Policy/devel

Log Message:
Directory /cvs/extras/rpms/perl-Moose-Policy/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 17:26:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:26:11 -0700
Subject: rpms/perl-Moose-Policy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611131726.kADHQBSQ030357@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30335/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Moose-Policy


--- 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 Nov 13 17:26:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:26:05 -0700
Subject: rpms/perl-Moose-Policy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131726.kADHQ594030341@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30335

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Moose-Policy


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Moose-Policy
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  Mon Nov 13 17:26:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:26:51 -0700
Subject: rpms/perl-Moose-Policy import.log,1.1,1.2
Message-ID: <200611131726.kADHQpix030414@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30382

Modified Files:
	import.log 
Log Message:
auto-import perl-Moose-Policy-0.02-1.fc6 on branch devel from perl-Moose-Policy-0.02-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Policy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 17:26:05 -0000	1.1
+++ import.log	13 Nov 2006 17:26:21 -0000	1.2
@@ -0,0 +1 @@
+perl-Moose-Policy-0_02-1_fc6:HEAD:perl-Moose-Policy-0.02-1.fc6.src.rpm:1163438781



From fedora-extras-commits at redhat.com  Mon Nov 13 17:26:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:26:52 -0700
Subject: rpms/perl-Moose-Policy/devel perl-Moose-Policy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611131726.kADHQqdZ030418@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30382/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Moose-Policy.spec 
Log Message:
auto-import perl-Moose-Policy-0.02-1.fc6 on branch devel from perl-Moose-Policy-0.02-1.fc6.src.rpm


--- NEW FILE perl-Moose-Policy.spec ---
Name:           perl-Moose-Policy
Version:        0.02
Release:        1%{?dist}
Summary:        Police your project/company-wide Moose policies
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Moose-Policy/
Source0:        http://www.cpan.org/authors/id/S/ST/STEVAN/Moose-Policy-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Moose) >= 0.11
# tests
BuildRequires:  perl(Test::Exception) >= 0.21
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to specify your project-wide or even company-wide
Moose meta-policy.

Most all of Moose's features can be customized through the use of custom
metaclasses, however fiddling with the metaclasses can be hairy. Moose::Policy
removes most of that hairiness and makes it possible to cleanly contain a set
of meta-level customizations in one easy to use module.

This is an early release of this module and it should not be considered to be
complete by any means. It is very basic implemenation at this point and will
likely get more feature-full over time, as people request features. So if you
have a suggestion/need/idea, please speak up.

%prep
%setup -q -n Moose-Policy-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
./Build test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Nov 06 2006 Chris Weyl  0.02-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Policy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 17:26:10 -0000	1.1
+++ .cvsignore	13 Nov 2006 17:26:22 -0000	1.2
@@ -0,0 +1 @@
+Moose-Policy-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Policy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 17:26:10 -0000	1.1
+++ sources	13 Nov 2006 17:26:22 -0000	1.2
@@ -0,0 +1 @@
+11b2e835e4b97563c4e459475bf9df90  Moose-Policy-0.02.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 17:28:27 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:28:27 -0700
Subject: rpms/perl-Moose-Policy/devel perl-Moose-Policy.spec,1.1,1.2
Message-ID: <200611131728.kADHSRN0030469@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452

Modified Files:
	perl-Moose-Policy.spec 
Log Message:
release bump


Index: perl-Moose-Policy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Policy/devel/perl-Moose-Policy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Moose-Policy.spec	13 Nov 2006 17:26:22 -0000	1.1
+++ perl-Moose-Policy.spec	13 Nov 2006 17:27:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Moose-Policy
 Version:        0.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Police your project/company-wide Moose policies
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -59,5 +59,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 13 2006 Chris Weyl  0.02-2
+- bump
+
 * Mon Nov 06 2006 Chris Weyl  0.02-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Mon Nov 13 17:30:36 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 10:30:36 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.9,1.10
Message-ID: <200611131730.kADHUaRZ030550@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30519

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-gnutella.spec	13 Nov 2006 16:21:51 -0000	1.9
+++ gtk-gnutella.spec	13 Nov 2006 17:30:06 -0000	1.10
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc, groff, gettext
+BuildRequires: libxml2-devel, byacc, groff, gettext, zlib-devel
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Mon Nov 13 17:40:54 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 10:40:54 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.10,1.11
Message-ID: <200611131740.kADHesPu030640@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30622

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-gnutella.spec	13 Nov 2006 17:30:06 -0000	1.10
+++ gtk-gnutella.spec	13 Nov 2006 17:40:24 -0000	1.11
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc, groff, gettext, zlib-devel
+BuildRequires: libxml2-devel, byacc, groff, gettext
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Mon Nov 13 18:11:05 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Nov 2006 11:11:05 -0700
Subject: rpms/proftpd/devel proftpd-1.3.0-cmdbufsize.patch, NONE,
	1.1 proftpd.spec, 1.20, 1.21
Message-ID: <200611131811.kADIB5SN001344@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1315

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.0-cmdbufsize.patch 
Log Message:
Include cmdbufsize patch (#214820).


proftpd-1.3.0-cmdbufsize.patch:

--- NEW FILE proftpd-1.3.0-cmdbufsize.patch ---
--- src/main.c	2006/09/29 16:38:16	1.292
+++ src/main.c	2006/10/31 22:49:03	1.293
@@ -116,6 +116,8 @@ static unsigned char have_dead_child = F
 
 static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
 
+#define PR_DEFAULT_CMD_BUFSZ 512
+
 static char **Argv = NULL;
 static char *LastArgv = NULL;
 static const char *PidPath = PR_PID_FILE_PATH;
@@ -832,16 +834,25 @@
       pr_timer_reset(TIMER_IDLE, NULL);
 
     if (cmd_buf_size == -1) {
-      long *buf_size = get_param_ptr(main_server->conf,
-        "CommandBufferSize", FALSE);
+      int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize",
+        FALSE);
 
-      if (buf_size == NULL || *buf_size <= 0)
-        cmd_buf_size = 512;
+      if (bufsz == NULL ||
+          *bufsz <= 0) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
+          "given, resetting to default buffer size (%u)",
+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*bufsz + 1 > sizeof(buf)) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
+          "given, resetting to default buffer size (%u)",
+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 
-      else if (*buf_size + 1 > sizeof(buf)) {
-	pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
-          "Resetting to 512.");
-	cmd_buf_size = 512;
+      } else {
+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
+        cmd_buf_size = (long) *bufsz;
       }
     }
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- proftpd.spec	28 Aug 2006 12:28:49 -0000	1.20
+++ proftpd.spec	13 Nov 2006 18:10:35 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -14,6 +14,7 @@
 Source6: proftpd.pam
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
+Patch2: proftpd-1.3.0-cmdbufsize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +67,7 @@
 %setup
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
+%patch2 -p0 -b .cmdbufsize
 
 
 %build
@@ -186,6 +188,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Matthias Saou  1.3.0-8
+- Include cmdbufsize patch (#214820).
+
 * Mon Aug 28 2006 Matthias Saou  1.3.0-7
 - FC6 rebuild.
 



From fedora-extras-commits at redhat.com  Mon Nov 13 18:13:54 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Nov 2006 11:13:54 -0700
Subject: rpms/lilypond/devel .cvsignore, 1.6, 1.7 lilypond.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611131813.kADIDsRr001433@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release, updated build requirements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Nov 2006 16:41:08 -0000	1.6
+++ .cvsignore	13 Nov 2006 18:13:24 -0000	1.7
@@ -1 +1 @@
-lilypond-2.8.8.tar.gz
+lilypond-2.10.0.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lilypond.spec	3 Nov 2006 16:41:08 -0000	1.6
+++ lilypond.spec	13 Nov 2006 18:13:24 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		lilypond
-Version:	2.8.8
+Version:	2.10.0
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
@@ -13,12 +13,13 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-Buildrequires:  t1utils bison flex mftrace ImageMagick
-BuildRequires:  gettext python-devel tetex
-BuildRequires:  texinfo >= 4.7
-BuildRequires:  guile-devel >= 1.6.4
+Buildrequires:  t1utils bison flex ImageMagick gettext tetex
+BuildRequires:  python-devel >= 2.4.0
+BuildRequires:  mftrace >= 1.1.19
+BuildRequires:  texinfo >= 4.8
+BuildRequires:  guile-devel >= 1.8
 BuildRequires:  ghostscript >= 8.15
-BuildRequires:  pango-devel >= 1.6.0
+BuildRequires:  pango-devel >= 1.12.0
 
 %description
 LilyPond is an automated music engraving system. It formats music
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Quentin Spencer  2.10.0-1
+- New release. Update build requirements for 2.10 series.
+
 * Fri Nov  3 2006 Quentin Spencer  2.8.8-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Nov 2006 16:41:08 -0000	1.6
+++ sources	13 Nov 2006 18:13:24 -0000	1.7
@@ -1 +1 @@
-2fe58ff2fcbc848def46ef287a693189  lilypond-2.8.8.tar.gz
+82e4487c5c1fa1d2e478d5974a3630df  lilypond-2.10.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 18:19:52 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:19:52 -0700
Subject: rpms/php-pear-HTML-QuickForm - New directory
Message-ID: <200611131819.kADIJqXD001496@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492/php-pear-HTML-QuickForm

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-QuickForm added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 18:19:58 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:19:58 -0700
Subject: rpms/php-pear-HTML-QuickForm/devel - New directory
Message-ID: <200611131819.kADIJwQO001510@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492/php-pear-HTML-QuickForm/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-QuickForm/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 18:20:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:20:10 -0700
Subject: rpms/php-pear-HTML-QuickForm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131820.kADIKAZB001542@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1535

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTML-QuickForm


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML-QuickForm
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  Mon Nov 13 18:20:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:20:16 -0700
Subject: rpms/php-pear-HTML-QuickForm/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611131820.kADIKGYZ001564@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1535/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML-QuickForm


--- 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 Nov 13 18:21:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:21:09 -0700
Subject: rpms/php-pear-HTML-QuickForm import.log,1.1,1.2
Message-ID: <200611131821.kADIL9kX001644@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1609

Modified Files:
	import.log 
Log Message:
auto-import php-pear-HTML-QuickForm-3.2.7-2 on branch devel from php-pear-HTML-QuickForm-3.2.7-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 18:20:10 -0000	1.1
+++ import.log	13 Nov 2006 18:20:38 -0000	1.2
@@ -0,0 +1 @@
+php-pear-HTML-QuickForm-3_2_7-2:HEAD:php-pear-HTML-QuickForm-3.2.7-2.src.rpm:1163442035



From fedora-extras-commits at redhat.com  Mon Nov 13 18:21:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:21:09 -0700
Subject: rpms/php-pear-HTML-QuickForm/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-HTML-QuickForm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611131821.kADIL9hU001648@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1609/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-HTML-QuickForm.spec 
Log Message:
auto-import php-pear-HTML-QuickForm-3.2.7-2 on branch devel from php-pear-HTML-QuickForm-3.2.7-2.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-HTML-QuickForm.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm

Name:           php-pear-HTML-QuickForm
Version:        3.2.7
Release:        2%{?dist}
Summary:        Class for creating, validating, processing HTML forms

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/HTML_QuickForm
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(HTML_Common) >= 1.2.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm package provides methods to dynamically create, validate
and render HTML forms.

Features:
* More than 20 ready-to-use form elements.
* XHTML compliant generated code.
* Numerous mixable and extendable validation rules.
* Automatic server-side validation and filtering.
* On request javascript code generation for client-side validation.
* File uploads support.
* Total customization of form rendering.
* Support for external template engines (ITX, Sigma, Flexy, Smarty).
* Pluggable elements, rules and renderers extensions.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
install -pm 644 -c %{SOURCE1} LICENSE
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/docs
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/HTML/QuickForm*


%changelog
* Mon Nov 13 2006 Christopher Stone  3.2.7-2
- Include PHP License in %%doc
- Add versioned Requires

* Sun Oct 29 2006 Christopher Stone  3.2.7-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 18:20:16 -0000	1.1
+++ .cvsignore	13 Nov 2006 18:20:39 -0000	1.2
@@ -0,0 +1 @@
+HTML_QuickForm-3.2.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 18:20:16 -0000	1.1
+++ sources	13 Nov 2006 18:20:39 -0000	1.2
@@ -0,0 +1 @@
+7d3cbe961e17996641abec79c953e3dd  HTML_QuickForm-3.2.7.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 18:23:21 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:23:21 -0700
Subject: owners owners.list,1.1945,1.1946
Message-ID: <200611131823.kADINLGV001780@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1721

Modified Files:
	owners.list 
Log Message:
php-pear-HTML-QuickForm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1945
retrieving revision 1.1946
diff -u -r1.1945 -r1.1946
--- owners.list	13 Nov 2006 17:25:21 -0000	1.1945
+++ owners.list	13 Nov 2006 18:22:51 -0000	1.1946
@@ -1785,6 +1785,7 @@
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Table|Class to easily design HTML tables|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTML-QuickForm|Class for creating, validating, processing HTML forms|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 18:28:44 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 11:28:44 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.11,1.12
Message-ID: <200611131828.kADISibW003310@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2935

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gtk-gnutella.spec	13 Nov 2006 17:40:24 -0000	1.11
+++ gtk-gnutella.spec	13 Nov 2006 18:28:10 -0000	1.12
@@ -33,8 +33,9 @@
 
 %build
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
+	-Dglibpth="%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
-	-Dccflags="$RPM_OPT_FLAGS -Wall" -Dcc=gcc -Doptimize="-O2" \
+	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
 	-Dofficial=true -ders
 make %{?_smp_mflags}
@@ -83,6 +84,7 @@
 %changelog
 * Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
 - update to 0.96.3
+- specify libdirs explicitly for Configure script (needed for x86_64)
 
 * Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
 - update to 0.96.2



From fedora-extras-commits at redhat.com  Mon Nov 13 19:10:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb))
Date: Mon, 13 Nov 2006 12:10:48 -0700
Subject: rpms/muine/FC-6 .cvsignore, 1.3, 1.4 muine.spec, 1.9, 1.10 sources, 
	1.3, 1.4
Message-ID: <200611131910.kADJAmDL008192@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8151

Modified Files:
	.cvsignore muine.spec sources 
Log Message:
Update to 0.8.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2006 11:59:35 -0000	1.3
+++ .cvsignore	13 Nov 2006 19:10:18 -0000	1.4
@@ -1 +1 @@
-muine-0.8.5.tar.gz
+muine-0.8.6.tar.gz


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-6/muine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- muine.spec	29 Sep 2006 00:04:27 -0000	1.9
+++ muine.spec	13 Nov 2006 19:10:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           muine
-Version:        0.8.5
-Release:        7%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -81,6 +81,9 @@
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +94,9 @@
 %postun
 update-desktop-database &> /dev/null ||:
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,7 +113,7 @@
 %{_libdir}/muine/*.exe*
 %{_libdir}/muine/plugins/InotifyPlugin.dll*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/muine.png
+%{_datadir}/icons/hicolor/*/apps/muine.*
 %{_libdir}/muine/plugins/TrayIcon.dll*
 %{_libdir}/muine/plugins/muine-tray-*.png
 
@@ -116,6 +122,9 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Nov 13 2006 Sindre Pedersen Bj??rdal  - 0.8.6-1
+- New release
+- Add gtk icon cache scriplet for new icons
 * Fri Sep 29 2006 Sindre Pedersen Bj??rdal  - 0.8.5-7
 - Removed replacement of libdir
 * Fri Sep 15 2006 Sindre Pedersen Bj??rdal  - 0.8.5-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2006 11:59:35 -0000	1.3
+++ sources	13 Nov 2006 19:10:18 -0000	1.4
@@ -1 +1 @@
-6960b21da5fd5cbc7a2e5a93a7bcd2a2  muine-0.8.5.tar.gz
+8646e439667896423c06cc2fcb67754f  muine-0.8.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:12:42 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:12:42 -0700
Subject: owners owners.list,1.1946,1.1947
Message-ID: <200611131912.kADJCguj008288@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8253/owners

Modified Files:
	owners.list 
Log Message:
Add mod_revocator



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1946
retrieving revision 1.1947
diff -u -r1.1946 -r1.1947
--- owners.list	13 Nov 2006 18:22:51 -0000	1.1946
+++ owners.list	13 Nov 2006 19:12:12 -0000	1.1947
@@ -1087,6 +1087,7 @@
 Fedora Extras|mod_geoip|GeoIP module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_mono|Mono module for Apache HTTP server|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|mod_nss|SSL/TLS module using NSS for the Apache HTTP server|rcritten at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|mod_revocator|CRL retrieval module for the Apache HTTP server|rcritten at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 19:12:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb))
Date: Mon, 13 Nov 2006 12:12:54 -0700
Subject: rpms/muine/devel muine.spec,1.9,1.10
Message-ID: <200611131912.kADJCssN008331@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8257

Modified Files:
	muine.spec 
Log Message:
"Update to 0.8.6"



Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/devel/muine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- muine.spec	29 Sep 2006 00:04:27 -0000	1.9
+++ muine.spec	13 Nov 2006 19:12:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           muine
-Version:        0.8.5
-Release:        7%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -81,6 +81,9 @@
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +94,9 @@
 %postun
 update-desktop-database &> /dev/null ||:
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,7 +113,7 @@
 %{_libdir}/muine/*.exe*
 %{_libdir}/muine/plugins/InotifyPlugin.dll*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/muine.png
+%{_datadir}/icons/hicolor/*/apps/muine.*
 %{_libdir}/muine/plugins/TrayIcon.dll*
 %{_libdir}/muine/plugins/muine-tray-*.png
 
@@ -116,6 +122,9 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Nov 13 2006 Sindre Pedersen Bj??rdal  - 0.8.6-1
+- New release
+- Add gtk icon cache scriplet for new icons
 * Fri Sep 29 2006 Sindre Pedersen Bj??rdal  - 0.8.5-7
 - Removed replacement of libdir
 * Fri Sep 15 2006 Sindre Pedersen Bj??rdal  - 0.8.5-6



From fedora-extras-commits at redhat.com  Mon Nov 13 19:14:12 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:14:12 -0700
Subject: rpms/mod_revocator - New directory
Message-ID: <200611131914.kADJECvB008528@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8523/mod_revocator

Log Message:
Directory /cvs/extras/rpms/mod_revocator added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 19:14:18 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:14:18 -0700
Subject: rpms/mod_revocator/devel - New directory
Message-ID: <200611131914.kADJEIP9008545@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8523/mod_revocator/devel

Log Message:
Directory /cvs/extras/rpms/mod_revocator/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 19:14:32 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:14:32 -0700
Subject: rpms/mod_revocator Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131914.kADJEWaN008583@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8577

Added Files:
	Makefile import.log 
Log Message:
Setup of module mod_revocator


--- NEW FILE Makefile ---
# Top level Makefile for module mod_revocator
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  Mon Nov 13 19:14:38 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:14:38 -0700
Subject: rpms/mod_revocator/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611131914.kADJEcqa008601@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8577/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mod_revocator


--- 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 Nov 13 19:15:40 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:15:40 -0700
Subject: rpms/mod_revocator import.log,1.1,1.2
Message-ID: <200611131915.kADJFe8k008686@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8651

Modified Files:
	import.log 
Log Message:
auto-import mod_revocator-1.0.2-1 on branch devel from mod_revocator-1.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mod_revocator/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 19:14:32 -0000	1.1
+++ import.log	13 Nov 2006 19:15:10 -0000	1.2
@@ -0,0 +1 @@
+mod_revocator-1_0_2-1:HEAD:mod_revocator-1.0.2-1.src.rpm:1163445304



From fedora-extras-commits at redhat.com  Mon Nov 13 19:15:41 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:15:41 -0700
Subject: rpms/mod_revocator/devel mod_revocator-libpath.patch, NONE,
	1.1 mod_revocator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611131915.kADJFfqn008690@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8651/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mod_revocator-libpath.patch mod_revocator.spec 
Log Message:
auto-import mod_revocator-1.0.2-1 on branch devel from mod_revocator-1.0.2-1.src.rpm

mod_revocator-libpath.patch:

--- NEW FILE mod_revocator-libpath.patch ---
diff -u mod_revocator-1.0.2.orig/revocator.conf mod_revocator-1.0.2/revocator.conf
--- mod_revocator-1.0.2.orig/revocator.conf	2006-08-04 14:49:33.000000000 -0400
+++ mod_revocator-1.0.2/revocator.conf	2006-10-16 10:10:33.000000000 -0400
@@ -1,4 +1,4 @@
-LoadModule rev_module modules/libmodrev.so
+LoadModule rev_module modules/mod_rev.so
 
 #   CRL Engine Switch:
 #   Enable/Disable CRL retrieval


--- NEW FILE mod_revocator.spec ---
Name: mod_revocator
Version: 1.0.2
Release: 1%{?dist}
Summary: CRL retrieval module for the Apache HTTP server
Group: System Environment/Daemons
License: Apache Software License
URL: http://directory.fedora.redhat.com/wiki/Mod_revocator
Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
BuildRequires: nss-pkcs11-devel >= 3.11
BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
BuildRequires: pkgconfig
BuildRequires: openldap-devel >= 2.2.29
Requires: httpd >= 0:2.0.52
Requires: nspr >= 4.6
Requires: nss >= 3.11, nss-tools >= 3.11
Requires: mod_nss >= 1.0.3
Patch1: mod_revocator-libpath.patch

%description
The mod_revocator module retrieves and installs remote
Certificate Revocate Lists (CRLs) into an Apache web server. 

%prep
%setup -q
%patch1 -p1

%build

CFLAGS="$RPM_OPT_FLAGS"
export CFLAGS

NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nspr`
NSPR_LIB_DIR=`/usr/bin/pkg-config --variable=libdir nspr`

NSS_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nss`
NSS_LIB_DIR=`/usr/bin/pkg-config --variable=libdir nss`

NSS_BIN=`/usr/bin/pkg-config --variable=exec_prefix nss`

%configure \
    --with-nss-lib=$NSS_LIB_DIR \
    --with-nss-inc=$NSS_INCLUDE_DIR \
    --with-nspr-lib=$NSPR_LIB_DIR \
    --with-nspr-inc=$NSPR_INCLUDE_DIR \
    --with-apr-config --enable-openldap

make %{?_smp_flags} all

%install
# The install target of the Makefile isn't used because that uses apxs
# which tries to enable the module in the build host httpd instead of in
# the build root.
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules
mkdir -p $RPM_BUILD_ROOT%{_bindir}

install -m 644 revocator.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -m 755 .libs/libmodrev.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/mod_rev.so
# Ugh, manually create the ldconfig symbolic links
version=`grep -v '^\#' ./libtool-version`
current=`echo $version | cut -d: -f1`
revision=`echo $version | cut -d: -f2`
age=`echo $version | cut -d: -f3`
install -m  755 .libs/librevocation.so.$current.$revision.$age $RPM_BUILD_ROOT%{_libdir}/
(cd $RPM_BUILD_ROOT%{_libdir} && ln -s librevocation.so.$current.$revision.$age librevocation.so.0)
(cd $RPM_BUILD_ROOT%{_libdir} && ln -s librevocation.so.$current.$revision.$age  librevocation.so)
install -m 755 ldapget $RPM_BUILD_ROOT%{_bindir}/

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README LICENSE docs/mod_revocator.html
%config(noreplace) %{_sysconfdir}/httpd/conf.d/revocator.conf
%{_libdir}/httpd/modules/mod_rev.so
# rpmlint will complain that librevocation.so is a shared library but this
# must be ignored because this file is loaded directly by name by the Apache
# module.
%{_libdir}/librevocation.*so*
%{_bindir}/ldapget

%changelog
* Mon Oct 16 2006 Rob Crittenden  1.0.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_revocator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 19:14:37 -0000	1.1
+++ .cvsignore	13 Nov 2006 19:15:11 -0000	1.2
@@ -0,0 +1 @@
+mod_revocator-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_revocator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 19:14:37 -0000	1.1
+++ sources	13 Nov 2006 19:15:11 -0000	1.2
@@ -0,0 +1 @@
+07307d8972e3442fd81d84e3852611c5  mod_revocator-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:17:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb))
Date: Mon, 13 Nov 2006 12:17:26 -0700
Subject: rpms/muine/FC-5 .cvsignore, 1.3, 1.4 muine.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200611131917.kADJHQd4008749@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8729

Modified Files:
	.cvsignore muine.spec sources 
Log Message:
Update to 0.8.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2006 12:30:43 -0000	1.3
+++ .cvsignore	13 Nov 2006 19:16:55 -0000	1.4
@@ -1 +1 @@
-muine-0.8.5.tar.gz
+muine-0.8.6.tar.gz


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-5/muine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- muine.spec	21 Jun 2006 12:30:43 -0000	1.4
+++ muine.spec	13 Nov 2006 19:16:55 -0000	1.5
@@ -1,7 +1,7 @@
 %define _libdir /usr/lib
 
 Name:           muine
-Version:        0.8.5
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        Music Player for GNOME
 
@@ -78,6 +78,10 @@
 
 %post
 update-desktop-database &> /dev/null ||:
+
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
@@ -92,6 +96,11 @@
 %postun
 update-desktop-database &> /dev/null ||:
 
+
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -108,10 +117,11 @@
 %{_libdir}/muine/*.exe*
 %{_libdir}/muine/plugins/InotifyPlugin.dll*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/muine.png
+%{_datadir}/icons/hicolor/*/apps/muine.*
 %{_libdir}/muine/plugins/TrayIcon.dll*
 %{_libdir}/muine/plugins/muine-tray-*.png
 
+
 %files devel 
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/muine/*.a


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2006 12:30:43 -0000	1.3
+++ sources	13 Nov 2006 19:16:55 -0000	1.4
@@ -1 +1 @@
-6960b21da5fd5cbc7a2e5a93a7bcd2a2  muine-0.8.5.tar.gz
+8646e439667896423c06cc2fcb67754f  muine-0.8.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:34:10 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Nov 2006 12:34:10 -0700
Subject: rpms/lilypond/FC-6 .cvsignore, 1.6, 1.7 lilypond.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611131934.kADJYA8e009019@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release, updated build requirements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Nov 2006 18:35:28 -0000	1.6
+++ .cvsignore	13 Nov 2006 19:33:40 -0000	1.7
@@ -1 +1 @@
-lilypond-2.8.8.tar.gz
+lilypond-2.10.0.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/lilypond.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lilypond.spec	6 Nov 2006 18:35:28 -0000	1.6
+++ lilypond.spec	13 Nov 2006 19:33:40 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		lilypond
-Version:	2.8.8
+Version:	2.10.0
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
@@ -13,12 +13,13 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-Buildrequires:  t1utils bison flex mftrace ImageMagick
-BuildRequires:  gettext python-devel tetex
-BuildRequires:  texinfo >= 4.7
-BuildRequires:  guile-devel >= 1.6.4
+Buildrequires:  t1utils bison flex ImageMagick gettext tetex
+BuildRequires:  python-devel >= 2.4.0
+BuildRequires:  mftrace >= 1.1.19
+BuildRequires:  texinfo >= 4.8
+BuildRequires:  guile-devel >= 1.8
 BuildRequires:  ghostscript >= 8.15
-BuildRequires:  pango-devel >= 1.6.0
+BuildRequires:  pango-devel >= 1.12.0
 
 %description
 LilyPond is an automated music engraving system. It formats music
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Quentin Spencer  2.10.0-1
+- New release. Update build requirements for 2.10 series.
+
 * Fri Nov  3 2006 Quentin Spencer  2.8.8-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Nov 2006 18:35:28 -0000	1.6
+++ sources	13 Nov 2006 19:33:40 -0000	1.7
@@ -1 +1 @@
-2fe58ff2fcbc848def46ef287a693189  lilypond-2.8.8.tar.gz
+82e4487c5c1fa1d2e478d5974a3630df  lilypond-2.10.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:59:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Nov 2006 12:59:13 -0700
Subject: rpms/perl-Perl-Critic/FC-6 .cvsignore, 1.2,
	1.3 perl-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611131959.kADJxDqh009262@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-serv9211/FC-6

Modified Files:
	.cvsignore perl-Perl-Critic.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 17:07:14 -0000	1.2
+++ .cvsignore	13 Nov 2006 19:58:43 -0000	1.3
@@ -1 +1 @@
-Perl-Critic-0.2.tar.gz
+Perl-Critic-0.21.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Perl-Critic.spec	23 Sep 2006 17:07:14 -0000	1.1
+++ perl-Perl-Critic.spec	13 Nov 2006 19:58:43 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Perl-Critic
-Version:        0.2
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
@@ -15,7 +15,8 @@
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable)
-BuildRequires:  perl(PPI) >= 1.117
+BuildRequires:  perl(PPI) >= 1.118
+BuildRequires:  perl(Set::Scalar) >= 1.20
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Pod)
@@ -52,6 +53,8 @@
 
 
 %check
+# Author tests would require: Test::Kwalitee, Test::Spelling, File::Which, and aspell
+# TEST_AUTHOR=1 ./Build test
 ./Build test
 
 
@@ -69,5 +72,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.21-1
+- Update to 0.21.
+- New BR: perl(Set::Scalar).
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 0.2-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 17:07:14 -0000	1.2
+++ sources	13 Nov 2006 19:58:43 -0000	1.3
@@ -1 +1 @@
-a31ab7c92cdb0501c1a3e298495f61c5  Perl-Critic-0.2.tar.gz
+0359235579986f76438d7a1180598feb  Perl-Critic-0.21.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:59:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Nov 2006 12:59:12 -0700
Subject: rpms/perl-Perl-Critic/FC-5 .cvsignore, 1.2,
	1.3 perl-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611131959.kADJxCCw009257@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-serv9211/FC-5

Modified Files:
	.cvsignore perl-Perl-Critic.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 17:07:14 -0000	1.2
+++ .cvsignore	13 Nov 2006 19:58:42 -0000	1.3
@@ -1 +1 @@
-Perl-Critic-0.2.tar.gz
+Perl-Critic-0.21.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Perl-Critic.spec	23 Sep 2006 17:07:14 -0000	1.1
+++ perl-Perl-Critic.spec	13 Nov 2006 19:58:42 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Perl-Critic
-Version:        0.2
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
@@ -15,7 +15,8 @@
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable)
-BuildRequires:  perl(PPI) >= 1.117
+BuildRequires:  perl(PPI) >= 1.118
+BuildRequires:  perl(Set::Scalar) >= 1.20
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Pod)
@@ -52,6 +53,8 @@
 
 
 %check
+# Author tests would require: Test::Kwalitee, Test::Spelling, File::Which, and aspell
+# TEST_AUTHOR=1 ./Build test
 ./Build test
 
 
@@ -69,5 +72,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.21-1
+- Update to 0.21.
+- New BR: perl(Set::Scalar).
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 0.2-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 17:07:14 -0000	1.2
+++ sources	13 Nov 2006 19:58:42 -0000	1.3
@@ -1 +1 @@
-a31ab7c92cdb0501c1a3e298495f61c5  Perl-Critic-0.2.tar.gz
+0359235579986f76438d7a1180598feb  Perl-Critic-0.21.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 20:10:18 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 13 Nov 2006 13:10:18 -0700
Subject: rpms/glipper import.log,1.5,1.6
Message-ID: <200611132010.kADKAIhQ012584@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12543

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.95-1 on branch devel from glipper-0.95-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	16 Oct 2006 20:06:18 -0000	1.5
+++ import.log	13 Nov 2006 20:09:48 -0000	1.6
@@ -2,3 +2,4 @@
 glipper-0_89-3_fc6:HEAD:glipper-0.89-3.fc6.src.rpm:1154108800
 glipper-0_89-4_fc6:HEAD:glipper-0.89-4.fc6.src.rpm:1156791617
 glipper-0_89-5:HEAD:glipper-0.89-5.src.rpm:1161029170
+glipper-0_95-1:HEAD:glipper-0.95-1.src.rpm:1163448587



From fedora-extras-commits at redhat.com  Mon Nov 13 20:10:19 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 13 Nov 2006 13:10:19 -0700
Subject: rpms/glipper/devel .cvsignore, 1.2, 1.3 glipper.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200611132010.kADKAJhJ012589@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12543/devel

Modified Files:
	.cvsignore glipper.spec sources 
Log Message:
auto-import glipper-0.95-1 on branch devel from glipper-0.95-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jul 2006 09:24:10 -0000	1.2
+++ .cvsignore	13 Nov 2006 20:09:49 -0000	1.3
@@ -1 +1 @@
-glipper-0.89.tar.gz
+glipper-0.95.tar.gz


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glipper.spec	16 Oct 2006 20:06:19 -0000	1.4
+++ glipper.spec	13 Nov 2006 20:09:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glipper
-Version:        0.89
-Release:        5%{?dist}
+Version:        0.95
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -41,11 +41,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-
+%{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Mon Nov 13 2006 Damien Durand  - 0.95-1
+- Update to 0.95 release
+- Fix Doc
+
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped
 
@@ -53,12 +58,12 @@
 - Bump release
 
 * Fri Jul 28 2006 Damien Durand  - 0.89-3
-- Fixed Desktop file
+- Fix Desktop file
 
 * Fri Jul 7 2006 Damien Durand  - 0.89-2
-- Fixed mixed-use-of-spaces-and-tabs in changelog
-- Added category Text and delete-original in desktop-file-install
-- Added intltool as BR
+- Fix mixed-use-of-spaces-and-tabs in changelog
+- Add category Text and delete-original in desktop-file-install
+- Add intltool as BR
 
 * Tue Apr 6 2006 Damien Durand  - 0.89-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2006 09:24:10 -0000	1.2
+++ sources	13 Nov 2006 20:09:49 -0000	1.3
@@ -1 +1 @@
-ad96d990d8b7dacd5decdfa1fe22d043  glipper-0.89.tar.gz
+d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 20:10:51 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 13 Nov 2006 13:10:51 -0700
Subject: extras-buildsys/server PackageJob.py,1.57,1.58
Message-ID: <200611132010.kADKApPb012644@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12626/server

Modified Files:
	PackageJob.py 
Log Message:
Fix bad import; found by Joe Todaro


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- PackageJob.py	10 Nov 2006 14:30:47 -0000	1.57
+++ PackageJob.py	13 Nov 2006 20:10:48 -0000	1.58
@@ -510,7 +510,7 @@
                 threshold = 5
             if use_yum_logger == True:
                 # For yum 2.x and earlier
-                base.log = logger.Logger(threshold=threshold, file_object=sys.stdout)
+                base.log = Logger(threshold=threshold, file_object=sys.stdout)
             else:
                 # Use python logging module (yum 3.x and later)
                 base.doLoggingSetup(threshold, 1)



From fedora-extras-commits at redhat.com  Mon Nov 13 20:13:38 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 13 Nov 2006 13:13:38 -0700
Subject: rpms/glipper/FC-6 glipper.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200611132013.kADKDc9I012789@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12769

Modified Files:
	glipper.spec sources 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/glipper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glipper.spec	16 Oct 2006 20:06:19 -0000	1.4
+++ glipper.spec	13 Nov 2006 20:13:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glipper
-Version:        0.89
-Release:        5%{?dist}
+Version:        0.95
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -41,11 +41,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-
+%{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Mon Nov 13 2006 Damien Durand  - 0.95-1
+- Update to 0.95 release
+- Fix Doc
+
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped
 
@@ -53,12 +58,12 @@
 - Bump release
 
 * Fri Jul 28 2006 Damien Durand  - 0.89-3
-- Fixed Desktop file
+- Fix Desktop file
 
 * Fri Jul 7 2006 Damien Durand  - 0.89-2
-- Fixed mixed-use-of-spaces-and-tabs in changelog
-- Added category Text and delete-original in desktop-file-install
-- Added intltool as BR
+- Fix mixed-use-of-spaces-and-tabs in changelog
+- Add category Text and delete-original in desktop-file-install
+- Add intltool as BR
 
 * Tue Apr 6 2006 Damien Durand  - 0.89-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2006 09:24:10 -0000	1.2
+++ sources	13 Nov 2006 20:13:07 -0000	1.3
@@ -1 +1 @@
-ad96d990d8b7dacd5decdfa1fe22d043  glipper-0.89.tar.gz
+d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 20:15:05 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 13 Nov 2006 13:15:05 -0700
Subject: rpms/glipper/FC-5 glipper.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200611132015.kADKF53v012853@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12833

Modified Files:
	glipper.spec sources 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/glipper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glipper.spec	28 Jul 2006 17:53:26 -0000	1.3
+++ glipper.spec	13 Nov 2006 20:14:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glipper
-Version:        0.89
-Release:        3%{?dist}
+Version:        0.95
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -41,18 +41,29 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-
+%{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Mon Nov 13 2006 Damien Durand  - 0.95-1
+- Update to 0.95 release
+- Fix Doc
+
+* Mon Oct 16 2006 Damien Durand  - 0.89-5
+- Bumped
+
+* Mon Aug 28 2006 Damien Durand  - 0.89-4
+- Bump release
+
 * Fri Jul 28 2006 Damien Durand  - 0.89-3
-- Fixed Desktop file
+- Fix Desktop file
 
 * Fri Jul 7 2006 Damien Durand  - 0.89-2
-- Fixed mixed-use-of-spaces-and-tabs in changelog
-- Added category Text and delete-original in desktop-file-install
-- Added intltool as BR
+- Fix mixed-use-of-spaces-and-tabs in changelog
+- Add category Text and delete-original in desktop-file-install
+- Add intltool as BR
 
 * Tue Apr 6 2006 Damien Durand  - 0.89-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2006 09:24:10 -0000	1.2
+++ sources	13 Nov 2006 20:14:35 -0000	1.3
@@ -1 +1 @@
-ad96d990d8b7dacd5decdfa1fe22d043  glipper-0.89.tar.gz
+d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 20:36:57 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 13:36:57 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.16, 1.17 gnupg2.spec, 1.57,
	1.58 sources, 1.18, 1.19
Message-ID: <200611132036.kADKavK7013239@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13217

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Mon Nov 13 2006 Rex Dieter  2.0-1
- 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Nov 2006 13:16:45 -0000	1.16
+++ .cvsignore	13 Nov 2006 20:36:26 -0000	1.17
@@ -1,4 +1,4 @@
-gnupg-1.9.94.tar.bz2
-gnupg-1.9.94.tar.bz2.sig
 gnupg-1.9.95.tar.bz2
 gnupg-1.9.95.tar.bz2.sig
+gnupg-2.0.0.tar.bz2
+gnupg-2.0.0.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnupg2.spec	6 Nov 2006 17:11:13 -0000	1.57
+++ gnupg2.spec	13 Nov 2006 20:36:26 -0000	1.58
@@ -7,18 +7,15 @@
 %define kde_scriptdir %{_prefix}
 %endif
 
-# define to build/include gpg2 binary
-%define _enable_gpg --enable-gpg
-
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.95
-Release: 2%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +23,8 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
+# http://lists.gnupg.org/pipermail/gnupg-devel/2006-November/023359.html 
+Patch1: gnupg-1.9.95-64bit.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 Patch3: gnupg-1.9.91-dearmor.patch
 
@@ -56,10 +55,8 @@
 Requires: fileutils util-linux
 Requires: pinentry >= 0.7.1
 
-%if "%{?_enable_gpg:1}" == "1"
 Provides: gpg
 Provides: openpgp
-%endif
 
 %description
 GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
@@ -79,6 +76,7 @@
 %prep
 %setup -q -n gnupg-%{version}
 
+#patch1 -p1 -b .64bit
 #patch2 -p1 -b .testverbose
 %patch3 -p1 -b .dearmor
 
@@ -96,15 +94,9 @@
 
 %build
 
-# see --disable-optimization below
-%ifarch x86_64
-#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O0|')"
-%endif
-
 %configure \
   --disable-rpath \
   --enable-selinux-support \
-  %{?_enable_gpg} \
 %ifarch x86_64
   --disable-optimization 
 %endif
@@ -113,11 +105,6 @@
 make 
 
 
-%check
-# some gpg2 tests (still) FAIL
-make -k check ||:
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -139,6 +126,11 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
+%check
+# some gpg2 tests (still) FAIL
+make -k check ||:
+
+
 %post
 /sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir ||:
 
@@ -147,15 +139,14 @@
   /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir ||:
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
-%if "%{?_enable_gpg:1}" == "1"
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
-%endif
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
@@ -176,11 +167,18 @@
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  2.0-1
+- 2.0
+
+* Fri Nov 10 2006 Rex Dieter  1.9.95-3
+- upstream 64bit patch
+
 * Mon Nov 06 2006 Rex Dieter  1.9.95-2
 - fix (more) file conflicts with gnupg
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Nov 2006 13:16:45 -0000	1.18
+++ sources	13 Nov 2006 20:36:26 -0000	1.19
@@ -1,2 +1,2 @@
-2f8f134c4b0a8a69f2017100e7a51101  gnupg-1.9.95.tar.bz2
-a0d38a16e7542e4c4fd10607fe029745  gnupg-1.9.95.tar.bz2.sig
+65dc5da3bd4ec127f81c584c8200d813  gnupg-2.0.0.tar.bz2.sig
+13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 20:45:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 13:45:58 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.58,1.59
Message-ID: <200611132045.kADKjw7x013398@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13371

Modified Files:
	gnupg2.spec 
Log Message:
drop upstreamed 64bit patch



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnupg2.spec	13 Nov 2006 20:36:26 -0000	1.58
+++ gnupg2.spec	13 Nov 2006 20:45:28 -0000	1.59
@@ -10,7 +10,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -24,7 +24,7 @@
 Source11: gpg-agent-shutdown.sh
 
 # http://lists.gnupg.org/pipermail/gnupg-devel/2006-November/023359.html 
-Patch1: gnupg-1.9.95-64bit.patch
+#Patch1: gnupg-1.9.95-64bit.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 Patch3: gnupg-1.9.91-dearmor.patch
 
@@ -173,8 +173,8 @@
 
 
 %changelog
-* Mon Nov 13 2006 Rex Dieter  2.0-1
-- 2.0
+* Mon Nov 13 2006 Rex Dieter  2.0.0-2
+- 2.0.0
 
 * Fri Nov 10 2006 Rex Dieter  1.9.95-3
 - upstream 64bit patch



From fedora-extras-commits at redhat.com  Mon Nov 13 21:26:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 14:26:03 -0700
Subject: rpms/libassuan/devel .cvsignore, 1.7, 1.8 libassuan.spec, 1.20,
	1.21 sources, 1.7, 1.8 libassuan-0.9.3-m4-2.patch, 1.1,
	NONE libassuan-0.9.3-m4.patch, 1.1, NONE
Message-ID: <200611132126.kADLQ3U7016643@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16621

Modified Files:
	.cvsignore libassuan.spec sources 
Removed Files:
	libassuan-0.9.3-m4-2.patch libassuan-0.9.3-m4.patch 
Log Message:
* Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
- 1.0.0
- rename -devel -> -static (+Obsoletes/Provides: %name-devel)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Oct 2006 18:37:19 -0000	1.7
+++ .cvsignore	13 Nov 2006 21:25:32 -0000	1.8
@@ -1,5 +1,4 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-0.9.2.tar.bz2.sig
-libassuan-0.9.2.tar.bz2
-libassuan-0.9.3.tar.bz2.sig
+libassuan-1.0.0.tar.bz2
+libassuan-1.0.0.tar.bz2.sig


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libassuan.spec	18 Oct 2006 14:07:08 -0000	1.20
+++ libassuan.spec	13 Nov 2006 21:25:32 -0000	1.21
@@ -1,34 +1,32 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 0.9.3
-Release: 2%{?dist}
+Version: 1.0.0 
+Release: 1%{?dist}
 
 License: LGPL
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libassuan-0.9.3-m4.patch
-Patch2: libassuan-0.9.3-m4-2.patch
-
 BuildRequires: pth-devel
 
 %description
 This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
 packages.
 
-%package devel
+%package static 
 Summary: GnuPG IPC library 
 Group: Development/Libraries
 Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Provides: %{name}-static = %{version}-%{release}
-%description devel
-This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
+Obsoletes: %{name}-devel < %{version}-%{release}
+Provides:  %{name}-devel = %{version}-%{release}
+%description static 
+This is the IPC static library used by GnuPG 1.9/2, GPGME and a few other
 packages.
 
 This package contains files needed to develop applications using %{name}.
@@ -37,9 +35,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .m4patch
-%patch2 -p0 -b .m4patch-2
-
 
 %build
 #ifarch x86_64
@@ -59,14 +54,14 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
-%check || :
+%check
 make check
 
 
-%post devel
+%post static 
 /sbin/install-info %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
 
-%postun devel
+%postun static 
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
 fi
@@ -76,7 +71,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files devel
+%files static 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
@@ -87,6 +82,10 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
+- 1.0.0
+- rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
+
 * Wed Oct 18 2006 Rex Dieter  - 0.9.3-2
 - another libassuan.m4 patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Oct 2006 18:37:19 -0000	1.7
+++ sources	13 Nov 2006 21:25:32 -0000	1.8
@@ -1,2 +1,2 @@
-a2e3cb948de5159728e73d53529ae7ad  libassuan-0.9.3.tar.bz2.sig
-60add4aebf1961436da3a470d6ac833c  libassuan-0.9.3.tar.bz2
+f1580ef149e629629a9639a5afdb5908  libassuan-1.0.0.tar.bz2
+c00497327001dcccf7d3a952f56030e4  libassuan-1.0.0.tar.bz2.sig


--- libassuan-0.9.3-m4-2.patch DELETED ---


--- libassuan-0.9.3-m4.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 21:34:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:34:46 -0700
Subject: rpms/gauche/FC-6 gauche.spec,1.4,1.5 gauche-jp.patch,1.1,NONE
Message-ID: <200611132134.kADLYkD2016850@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757/FC-6

Modified Files:
	gauche.spec 
Removed Files:
	gauche-jp.patch 
Log Message:
new version 0.8.8


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-6/gauche.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gauche.spec	28 Aug 2006 00:51:01 -0000	1.4
+++ gauche.spec	13 Nov 2006 21:34:16 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gauche
-Version:	0.8.7
-Release:	6%{?dist}
+Version:	0.8.8
+Release:	1%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz
-Patch0:		gauche-jp.patch
+Source:		http://download.sourceforge.net/gauche/Gauche-0.8.8.tgz
 Patch1:		gauche-arch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gdbm-devel
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n Gauche-%{version}
-%patch0 -p1
 %patch1 -p1
 
 
@@ -123,6 +121,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+- new version 0.8.8
+
 * Mon Aug 28 2006 Gerard Milmeister  - 0.8.7-6
 - Rebuild for FE6
 


--- gauche-jp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 21:34:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:34:45 -0700
Subject: rpms/gauche/FC-5 gauche.spec,1.3,1.4 gauche-jp.patch,1.1,NONE
Message-ID: <200611132134.kADLYjVT016847@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757/FC-5

Modified Files:
	gauche.spec 
Removed Files:
	gauche-jp.patch 
Log Message:
new version 0.8.8


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-5/gauche.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gauche.spec	3 May 2006 22:36:28 -0000	1.3
+++ gauche.spec	13 Nov 2006 21:34:15 -0000	1.4
@@ -1,13 +1,12 @@
 Name:		gauche
-Version:	0.8.7
-Release:	5%{?dist}
+Version:	0.8.8
+Release:	1%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz
-Patch0:		gauche-jp.patch
+Source:		http://download.sourceforge.net/gauche/Gauche-0.8.8.tgz
 Patch1:		gauche-arch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gdbm-devel
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n Gauche-%{version}
-%patch0 -p1
 %patch1 -p1
 
 
@@ -123,6 +121,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+- new version 0.8.8
+
 * Thu May  4 2006 Gerard Milmeister  - 0.8.7-5
 - added patch for consistent arch directories (gauche-arch.patch)
 


--- gauche-jp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 21:34:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:34:47 -0700
Subject: rpms/gauche/devel gauche.spec,1.4,1.5 gauche-jp.patch,1.1,NONE
Message-ID: <200611132134.kADLYlkA016853@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757/devel

Modified Files:
	gauche.spec 
Removed Files:
	gauche-jp.patch 
Log Message:
new version 0.8.8


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/gauche.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gauche.spec	28 Aug 2006 00:51:01 -0000	1.4
+++ gauche.spec	13 Nov 2006 21:34:17 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gauche
-Version:	0.8.7
-Release:	6%{?dist}
+Version:	0.8.8
+Release:	1%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz
-Patch0:		gauche-jp.patch
+Source:		http://download.sourceforge.net/gauche/Gauche-0.8.8.tgz
 Patch1:		gauche-arch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gdbm-devel
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n Gauche-%{version}
-%patch0 -p1
 %patch1 -p1
 
 
@@ -123,6 +121,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+- new version 0.8.8
+
 * Mon Aug 28 2006 Gerard Milmeister  - 0.8.7-6
 - Rebuild for FE6
 


--- gauche-jp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 21:40:10 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 14:40:10 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.59,1.60
Message-ID: <200611132140.kADLeATa017011@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16992

Modified Files:
	gnupg2.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  2.0.0-3
- BR: libassuan-static >= 1.0.0



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnupg2.spec	13 Nov 2006 20:45:28 -0000	1.59
+++ gnupg2.spec	13 Nov 2006 21:39:40 -0000	1.60
@@ -10,7 +10,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -33,7 +33,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 0.9.3
+BuildRequires: libassuan-static >= 1.0.0 
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  2.0.0-3
+- BR: libassuan-static >= 1.0.0
+
 * Mon Nov 13 2006 Rex Dieter  2.0.0-2
 - 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Nov 13 21:44:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:44:42 -0700
Subject: rpms/gauche-gl/devel Gauche-gl-fix.patch, 1.1, 1.2 gauche-gl.spec,
	1.3, 1.4
Message-ID: <200611132144.kADLigpU017106@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17085

Modified Files:
	Gauche-gl-fix.patch gauche-gl.spec 
Log Message:
new version 0.4.2

Gauche-gl-fix.patch:

Index: Gauche-gl-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/devel/Gauche-gl-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Gauche-gl-fix.patch	9 May 2006 19:27:29 -0000	1.1
+++ Gauche-gl-fix.patch	13 Nov 2006 21:44:12 -0000	1.2
@@ -1,15 +1,22 @@
---- Gauche-gl-0.4/src/gauche-gl.c.fix	2005-07-01 23:58:51.000000000 +0200
-+++ Gauche-gl-0.4/src/gauche-gl.c	2005-07-01 23:59:01.000000000 +0200
-@@ -136,11 +136,7 @@
-    supports GLX for the time being. */
+--- Gauche-gl-0.4.2/src/gauche-gl.c.fix	2006-11-13 22:39:05.000000000 +0100
++++ Gauche-gl-0.4.2/src/gauche-gl.c	2006-11-13 22:42:04.000000000 +0100
+@@ -139,18 +139,7 @@
+ */
  void *Scm_GLGetProcAddress(const char *name)
  {
--#if defined(GLX_VERSION_1_4)
+-#if defined(GLX_ARB_get_proc_address)
+-    if (glXGetProcAddressARB != NULL) {
+-        return glXGetProcAddressARB((const GLubyte*)name);
+-    }
+-#elif defined(GLX_VERSION_1_4)
 -    if (glXGetProcAddress != NULL) {
 -        return glXGetProcAddress(name);
 -    }
--#elif defined(GLX_ARB_get_proc_address)
-+#if defined(GLX_ARB_get_proc_address)
-     if (glXGetProcAddressARB != NULL) {
-         return glXGetProcAddressARB(name);
-     }
+-#elif defined(MacOSX)
+-    return glutGetProcAddress(name);
+-#endif /* !defined(GLX_VERSION_1_4) && !defined(GLX_ARB_get_proc_address) */
+-    Scm_Error("GL extension %s is not supported on this platform", name);
++    return glXGetProcAddressARB((const GLubyte*)name);
+ }
+ 
+ /* List of numbers -> array of doubles.  Returns # of elements. */


Index: gauche-gl.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/devel/gauche-gl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gauche-gl.spec	28 Aug 2006 09:31:53 -0000	1.3
+++ gauche-gl.spec	13 Nov 2006 21:44:12 -0000	1.4
@@ -1,14 +1,14 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gl
-Version:        0.4.1
-Release:        6%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:	OpenGL binding for Gauche
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.1.tgz
+Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.2.tgz
 Patch0:		Gauche-gl-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: 	gauche-devel = %{gauche_version}
@@ -29,7 +29,7 @@
 %prep
 %setup -q -n Gauche-gl-%{version}
 %patch0 -p1
-(cd src; mv gauche-gl.c.orig gauche-gl.c)
+
 
 %build
 %configure
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.2-1
+- new version 0.4.2
+
 * Fri May  5 2006 Gerard Milmeister  - 0.4.1-4
 - cleaned up Requires
 - removed unnecessary files



From fedora-extras-commits at redhat.com  Mon Nov 13 21:53:16 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:53:16 -0700
Subject: rpms/gauche/FC-5 .cvsignore, 1.2, 1.3 gauche.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200611132153.kADLrGgZ017239@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187/FC-5

Modified Files:
	.cvsignore gauche.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2006 22:05:18 -0000	1.2
+++ .cvsignore	13 Nov 2006 21:52:46 -0000	1.3
@@ -1 +1 @@
-Gauche-0.8.7.tgz
+Gauche-0.8.8.tgz


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-5/gauche.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gauche.spec	13 Nov 2006 21:34:15 -0000	1.4
+++ gauche.spec	13 Nov 2006 21:52:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gauche
 Version:	0.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
@@ -121,7 +121,7 @@
 
 
 %changelog
-* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-2
 - new version 0.8.8
 
 * Thu May  4 2006 Gerard Milmeister  - 0.8.7-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2006 22:05:18 -0000	1.2
+++ sources	13 Nov 2006 21:52:46 -0000	1.3
@@ -1 +1 @@
-5c7cb6eba7455c9877aec884b0088a25  Gauche-0.8.7.tgz
+ed12c4e28ec36f68629843c4e8725ccc  Gauche-0.8.8.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 21:53:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:53:17 -0700
Subject: rpms/gauche/FC-6 .cvsignore, 1.2, 1.3 gauche.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200611132153.kADLrHnG017244@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187/FC-6

Modified Files:
	.cvsignore gauche.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2006 22:05:18 -0000	1.2
+++ .cvsignore	13 Nov 2006 21:52:46 -0000	1.3
@@ -1 +1 @@
-Gauche-0.8.7.tgz
+Gauche-0.8.8.tgz


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-6/gauche.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gauche.spec	13 Nov 2006 21:34:16 -0000	1.5
+++ gauche.spec	13 Nov 2006 21:52:46 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gauche
 Version:	0.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
@@ -121,7 +121,7 @@
 
 
 %changelog
-* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-2
 - new version 0.8.8
 
 * Mon Aug 28 2006 Gerard Milmeister  - 0.8.7-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2006 22:05:18 -0000	1.2
+++ sources	13 Nov 2006 21:52:46 -0000	1.3
@@ -1 +1 @@
-5c7cb6eba7455c9877aec884b0088a25  Gauche-0.8.7.tgz
+ed12c4e28ec36f68629843c4e8725ccc  Gauche-0.8.8.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 21:53:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:53:17 -0700
Subject: rpms/gauche/devel .cvsignore, 1.2, 1.3 gauche.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200611132153.kADLrHgE017249@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187/devel

Modified Files:
	.cvsignore gauche.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2006 22:05:18 -0000	1.2
+++ .cvsignore	13 Nov 2006 21:52:47 -0000	1.3
@@ -1 +1 @@
-Gauche-0.8.7.tgz
+Gauche-0.8.8.tgz


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/gauche.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gauche.spec	13 Nov 2006 21:34:17 -0000	1.5
+++ gauche.spec	13 Nov 2006 21:52:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gauche
 Version:	0.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
@@ -121,7 +121,7 @@
 
 
 %changelog
-* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-2
 - new version 0.8.8
 
 * Mon Aug 28 2006 Gerard Milmeister  - 0.8.7-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2006 22:05:18 -0000	1.2
+++ sources	13 Nov 2006 21:52:47 -0000	1.3
@@ -1 +1 @@
-5c7cb6eba7455c9877aec884b0088a25  Gauche-0.8.7.tgz
+ed12c4e28ec36f68629843c4e8725ccc  Gauche-0.8.8.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 21:58:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb))
Date: Mon, 13 Nov 2006 14:58:28 -0700
Subject: rpms/muine/FC-6 muine-trayicon-transparency-bug-343698.patch, NONE, 
	1.1 muine.spec, 1.10, 1.11
Message-ID: <200611132158.kADLwSjs017409@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17384

Modified Files:
	muine.spec 
Added Files:
	muine-trayicon-transparency-bug-343698.patch 
Log Message:
Add patch to fix trayicon

muine-trayicon-transparency-bug-343698.patch:

--- NEW FILE muine-trayicon-transparency-bug-343698.patch ---
? muine-0.8.6.tar.gz
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/muine/ChangeLog,v
retrieving revision 1.701
diff -u -p -r1.701 ChangeLog
--- ChangeLog	10 Nov 2006 23:29:53 -0000	1.701
+++ ChangeLog	13 Nov 2006 21:49:07 -0000
@@ -1,3 +1,15 @@
+2006-11-13  Wouter Bolsterlee  
+
+	* plugins/Makefile.am:
+	* plugins/NotificationArea.cs:
+	* plugins/TrayIcon.cs:
+
+	Ported (copy/pasted) trayicon code from Banshee. It
+	seems newer and contains the previous muine-specific
+	patches to the trayicon code. Amongst possible other
+	things, this makes the muine trayicon transparent. Fixes
+	bug #343698.
+
 2006-11-10  Peter Johanson  
 
 	* NEWS: Add item about new Latvian translation.
Index: plugins/Makefile.am
===================================================================
RCS file: /cvs/gnome/muine/plugins/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- plugins/Makefile.am	21 Mar 2006 08:24:23 -0000	1.10
+++ plugins/Makefile.am	13 Nov 2006 21:49:07 -0000
@@ -22,7 +22,7 @@ DASHBOARD_PLUGIN_CSFILES =		\
 
 TRAY_ICON_CSFILES =			\
 	$(srcdir)/TrayIcon.cs		\
-	$(srcdir)/egg-sharp.cs
+	$(srcdir)/NotificationArea.cs
 
 TRAY_ICON_EXTRA_CSFILES =		\
 	$(top_builddir)/src/Defines.cs	\
Index: plugins/NotificationArea.cs
===================================================================
RCS file: plugins/NotificationArea.cs
diff -N plugins/NotificationArea.cs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plugins/NotificationArea.cs	13 Nov 2006 21:49:07 -0000
@@ -0,0 +1,513 @@
+/***************************************************************************
+ *  NotificationAreaIcon.cs
+ *
+ * Copyright (C) 2005 Todd Berman 
+ * Copyright (C) 2005 Ed Catmur 
+ * Copyright (C) 2005 Novell, Inc. (Miguel de Icaza, Aaron Bockover)
+ ****************************************************************************/
+
+/*  THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW: 
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),  
+ *  to deal in the Software without restriction, including without limitation  
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,  
+ *  and/or sell copies of the Software, and to permit persons to whom the  
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in 
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ *  DEALINGS IN THE SOFTWARE.
+ */
+
+// NOTE: throughout IntPtr is used for the Xlib long type, as this tends to 
+// have the correct width and does not require any configure checks.
+
+using System;
+using System.Runtime.InteropServices;
+
+using Gtk;
+using Gdk;
+
+#pragma warning disable 0169
+
+public class NotificationArea : Plug
+{
+	private uint stamp;
+	private Orientation orientation;
+	
+	private IntPtr selection_atom;
+	private IntPtr manager_atom;
+	private IntPtr system_tray_opcode_atom;
+	private IntPtr orientation_atom;
+	private IntPtr message_data_atom;
+	private IntPtr manager_window;
+	private FilterFunc filter;
+	
+	public NotificationArea (string name)
+	{
+		Title = name;
+		Init ();
+	}
+
+	public NotificationArea (string name, Gdk.Screen screen)
+	{
+		Title = name;
+		Screen = screen;
+		Init ();
+	}
+	
+	[DllImport ("libc")]
+	private static extern IntPtr memcpy (ref XClientMessageEvent.DataUnion dest, IntPtr src, IntPtr len);
+
+	public uint SendMessage (uint timeout, string message)
+	{
+		if (manager_window == IntPtr.Zero) {
+			return 0;
+		}
+		
+		byte[] arr = System.Text.Encoding.UTF8.GetBytes (message);
+		IntPtr unmanaged_arr = Marshal.AllocHGlobal (arr.Length);
+		Marshal.Copy (arr, 0, unmanaged_arr, arr.Length);
+
+		SendManagerMessage (SystemTrayMessage.BeginMessage, (IntPtr) Id, timeout, (uint) arr.Length, ++stamp);
+
+		gdk_error_trap_push ();
+	
+		for (int index = 0; index < message.Length; index += 20) {
+			XClientMessageEvent ev = new XClientMessageEvent ();
+		
+			IntPtr display = gdk_x11_display_get_xdisplay (Display.Handle);
+		
+			ev.type = XEventName.ClientMessage;
+			ev.window = (IntPtr) Id;
+			ev.format = 8;
+			ev.message_type = message_data_atom;
+       
+			int len = Math.Min (arr.Length - index, 20);
+			memcpy (ref ev.data, (IntPtr)((int)unmanaged_arr + index), (IntPtr)len);
+		
+			XSendEvent (display, manager_window, false, (IntPtr) EventMask.StructureNotifyMask, ref ev);
+			XSync (display, false);
+		}
+	
+		gdk_error_trap_pop ();
+	
+		return stamp;
+	}
+
+	public void CancelMessage (uint id)
+	{
+		if (id == 0) {
+			return;
+		}
+	
+		SendManagerMessage (SystemTrayMessage.CancelMessage, (IntPtr) Id, id, 0, 0);
+	}
+
+	private void Init ()
+	{
+		stamp = 1;
+		orientation = Orientation.Horizontal;
+		AddEvents ((int)EventMask.PropertyChangeMask);
+		filter = new FilterFunc (ManagerFilter);
+	}
+
+        [GLib.ConnectBefore]
+        private void TransparentExposeEvent (object obj, Gtk.ExposeEventArgs args)
+	{
+		Gtk.Widget widget = (Gtk.Widget)obj;
+		Gdk.Rectangle area = args.Event.Area;
+
+		widget.GdkWindow.ClearArea (area.X, area.Y, area.Width, area.Height);
+	}
+
+	private void MakeTransparentAgain (object obj, Gtk.StyleSetArgs args)
+	{
+		Gtk.Widget widget = (Gtk.Widget)obj;
+
+		widget.GdkWindow.SetBackPixmap (null, true);
+	}
+
+        private void MakeTransparent (object obj, EventArgs args)
+	{
+		Gtk.Widget widget = (Gtk.Widget)obj;
+		if (widget.IsNoWindow || widget.IsAppPaintable)
+			return;
+
+		widget.AppPaintable = true;
+		widget.DoubleBuffered = false;
+		widget.GdkWindow.SetBackPixmap (null, true);
+		widget.ExposeEvent += TransparentExposeEvent;
+		widget.StyleSet += MakeTransparentAgain;
+	}
+
+	protected override void OnRealized ()
+	{
+		base.OnRealized ();
+		MakeTransparent (this, EventArgs.Empty);
+		Display display = Screen.Display;
+		IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
+		selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
+		manager_atom = XInternAtom (xdisplay, "MANAGER", false);
+		system_tray_opcode_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_OPCODE", false);
+		orientation_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_ORIENTATION", false);
+		message_data_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_MESSAGE_DATA", false);
+		UpdateManagerWindow (false);
+		SendDockRequest ();
+		Screen.RootWindow.AddFilter (filter);
+	}
+
+	protected override void OnAdded (Gtk.Widget child)
+	{
+		child.Realized += MakeTransparent;
+		base.OnAdded (child);
+	}
+
+	protected override void OnUnrealized ()
+	{
+		if (manager_window != IntPtr.Zero) {
+			Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
+			if (gdkwin != null) {
+				gdkwin.RemoveFilter (filter);
+			}
+		}
+	
+		Screen.RootWindow.RemoveFilter (filter);
+		base.OnUnrealized ();
+	}
+
+	private void UpdateManagerWindow (bool dock_if_realized)
+	{
+		if(Handle == IntPtr.Zero || Display == null || Display.Handle == IntPtr.Zero) {
+			return;
+		}
+
+		IntPtr xdisplay = gdk_x11_display_get_xdisplay (Display.Handle);
+	
+		if (manager_window != IntPtr.Zero) {
+			return;
+		}
+	
+		XGrabServer (xdisplay);
+	
+		manager_window = XGetSelectionOwner (xdisplay, selection_atom);
+		if (manager_window != IntPtr.Zero) {
+			XSelectInput (xdisplay, manager_window, (IntPtr) (EventMask.StructureNotifyMask | EventMask.PropertyChangeMask));
+		}
+	
+		XUngrabServer (xdisplay);
+		XFlush (xdisplay);
+
+		if (manager_window != IntPtr.Zero) {
+			Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
+			if (gdkwin != null) {
+				gdkwin.AddFilter (filter);
+			}
+		
+			if (dock_if_realized && IsRealized) {
+				SendDockRequest ();
+			}
+		
+			GetOrientationProperty ();
+		}
+	}
+
+	private void SendDockRequest ()
+	{
+		SendManagerMessage (SystemTrayMessage.RequestDock, manager_window, Id, 0, 0);
+	}
+
+	private void SendManagerMessage (SystemTrayMessage message, IntPtr window, uint data1, uint data2, uint data3)
+	{
+		XClientMessageEvent ev = new XClientMessageEvent ();
+		IntPtr display;
+	
+		ev.type = XEventName.ClientMessage;
+		ev.window = window;
+		ev.message_type = system_tray_opcode_atom;
+		ev.format = 32;
+		ev.data.ptr1 = (IntPtr)gdk_x11_get_server_time (GdkWindow.Handle);
+		ev.data.ptr2 = (IntPtr)message;
+		ev.data.ptr3 = (IntPtr)data1;
+		ev.data.ptr4 = (IntPtr)data2;
+		ev.data.ptr5 = (IntPtr)data3;
+
+		display = gdk_x11_display_get_xdisplay (Display.Handle);
+		gdk_error_trap_push ();
+		XSendEvent (display, manager_window, false, (IntPtr) EventMask.NoEventMask, ref ev);
+		XSync (display, false);
+		gdk_error_trap_pop ();
+	}
+
+	private FilterReturn ManagerFilter (IntPtr xevent, Event evnt)
+	{
+		XAnyEvent xev = (XAnyEvent) Marshal.PtrToStructure (xevent, typeof(XAnyEvent));
+   
+		if (xev.type == XEventName.ClientMessage){
+			XClientMessageEvent xclient = (XClientMessageEvent) Marshal.PtrToStructure (xevent, typeof(XClientMessageEvent));
+
+			if (xclient.message_type == manager_atom && xclient.data.ptr2 == selection_atom) {
+				UpdateManagerWindow (true);
+				return FilterReturn.Continue;
+			}
+		}
+
+		if (xev.window == manager_window) {
+			if (xev.type == XEventName.PropertyNotify){
+				XPropertyEvent xproperty = (XPropertyEvent) Marshal.PtrToStructure (xevent, typeof(XPropertyEvent));
+				if (xproperty.atom == orientation_atom) {
+					GetOrientationProperty();
+					return FilterReturn.Continue;
+				}
+			}
+
+			if (xev.type == XEventName.DestroyNotify) {
+				ManagerWindowDestroyed();
+			}
+		}
+   
+		return FilterReturn.Continue;
+	}
+
+	private void ManagerWindowDestroyed ()
+	{
+		if (manager_window != IntPtr.Zero) {
+			Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint) manager_window);
+       
+			if (gdkwin != null) {
+				gdkwin.RemoveFilter (filter);
+			}
+       
+			manager_window = IntPtr.Zero;
+			UpdateManagerWindow (true);
+		}
+	}
+
+	private void GetOrientationProperty ()
+	{
+		IntPtr display;
+		IntPtr type;
+		int format;
+		IntPtr prop_return;
+		IntPtr nitems, bytes_after;
+		int error, result;
+
+		if (manager_window == IntPtr.Zero) {
+			return;
+		}
+
+		display = gdk_x11_display_get_xdisplay (Display.Handle);
+   
+		gdk_error_trap_push ();
+		type = IntPtr.Zero;
+   
+		result = XGetWindowProperty (display, manager_window, orientation_atom, (IntPtr) 0, 
+					     (IntPtr) System.Int32.MaxValue, false, (IntPtr) XAtom.Cardinal, out type, out format, 
+					     out nitems, out bytes_after, out prop_return);
+   
+		error = gdk_error_trap_pop ();
+
+		if (error != 0 || result != 0) {
+			return;
+		}
+
+		if (type == (IntPtr) XAtom.Cardinal) {
+			orientation = ((SystemTrayOrientation) Marshal.ReadInt32 (prop_return) == SystemTrayOrientation.Horz) 
+				? Orientation.Horizontal 
+				: Orientation.Vertical;
+		}
+
+		if (prop_return != IntPtr.Zero) {
+			XFree (prop_return);
+		}
+	}
+
+	[DllImport ("libgdk-x11-2.0.so.0")]
+	private static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
+
+	[DllImport ("libgdk-x11-2.0.so.0")]
+	private static extern int gdk_x11_get_server_time (IntPtr window);
+
+	[DllImport ("libgdk-x11-2.0.so.0")]
+	private static extern void gdk_error_trap_push ();
+
+	[DllImport ("libgdk-x11-2.0.so.0")]
+	private static extern int gdk_error_trap_pop ();
+
+	[DllImport ("libX11")]
+	private extern static IntPtr XInternAtom(IntPtr display, string atom_name, bool only_if_exists);
+
+	[DllImport ("libX11")]
+	private extern static void XGrabServer (IntPtr display);
+
+	[DllImport ("libX11")]
+	private extern static void XUngrabServer (IntPtr display);
+
+	[DllImport ("libX11")]
+	private extern static int XFlush (IntPtr display);
+
+	[DllImport ("libX11")]
+	private extern static int XSync (IntPtr display, bool discard);
+
+	[DllImport ("libX11")]
+	private extern static int XFree (IntPtr display);
+
+	[DllImport ("libX11")]
+	private extern static IntPtr XGetSelectionOwner (IntPtr display, IntPtr atom);
+
+	[DllImport ("libX11")]
+	private extern static IntPtr XSelectInput (IntPtr display, IntPtr window, IntPtr mask);
+
+	[DllImport ("libX11")]
+	private extern static int XSendEvent(IntPtr display, IntPtr window, bool propagate, IntPtr event_mask, 
+					     ref XClientMessageEvent send_event);
+
+	[DllImport("libX11")]
+	private extern static int XGetWindowProperty(IntPtr display, IntPtr w, IntPtr property, IntPtr long_offset, 
+						     IntPtr long_length, bool deleteProp, IntPtr req_type,
+						     out IntPtr actual_type_return, out int actual_format_return, 
+						     out IntPtr nitems_return, out IntPtr bytes_after_return, 
+						     out IntPtr prop_return);
+
+	[Flags]
+	private enum EventMask {
+		NoEventMask              = 0,
+		KeyPressMask             = 1 << 0,
+		KeyReleaseMask           = 1 << 1,
+		ButtonPressMask          = 1 << 2,
+		ButtonReleaseMask        = 1 << 3,
+		EnterWindowMask          = 1 << 4,
+		LeaveWindowMask          = 1 << 5,
+		PointerMotionMask        = 1 << 6,
+		PointerMotionHintMask    = 1 << 7,
+		Button1MotionMask        = 1 << 8,
+		Button2MotionMask        = 1 << 9,
+		Button3MotionMask        = 1 << 10,
+		Button4MotionMask        = 1 << 11,
+		Button5MotionMask        = 1 << 12,
+		ButtonMotionMask         = 1 << 13,
+		KeymapStateMask          = 1 << 14,
+		ExposureMask             = 1 << 15,
+		VisibilityChangeMask     = 1 << 16,
+		StructureNotifyMask      = 1 << 17,
+		ResizeRedirectMask       = 1 << 18,
+		SubstructureNotifyMask   = 1 << 19,
+		SubstructureRedirectMask = 1 << 20,
+		FocusChangeMask          = 1 << 21,
+		PropertyChangeMask       = 1 << 22,
+		ColormapChangeMask       = 1 << 23,
+		OwnerGrabButtonMask      = 1 << 24
+	}
+
+	private enum SystemTrayMessage {
+		RequestDock = 0,
+		BeginMessage = 1,
+		CancelMessage = 2
+	}
+
+	private enum SystemTrayOrientation {
+		Horz = 0,
+		Vert = 1
+	}
+
+	private enum XEventName {
+		KeyPress                = 2,
+		KeyRelease              = 3,
+		ButtonPress             = 4,
+		ButtonRelease           = 5,
+		MotionNotify            = 6,
+		EnterNotify             = 7,
+		LeaveNotify             = 8,
+		FocusIn                 = 9,
+		FocusOut                = 10,
+		KeymapNotify            = 11,
+		Expose                  = 12,
+		GraphicsExpose          = 13,
+		NoExpose                = 14,
+		VisibilityNotify        = 15,
+		CreateNotify            = 16,
+		DestroyNotify           = 17,
+		UnmapNotify             = 18,
+		MapNotify               = 19,
+		MapRequest              = 20,
+		ReparentNotify          = 21,
+		ConfigureNotify         = 22,
+		ConfigureRequest        = 23,
+		GravityNotify           = 24,
+		ResizeRequest           = 25,
+		CirculateNotify         = 26,
+		CirculateRequest        = 27,
+		PropertyNotify          = 28,
+		SelectionClear          = 29,
+		SelectionRequest        = 30,
+		SelectionNotify         = 31,
+		ColormapNotify          = 32,
+		ClientMessage           = 33,
+		MappingNotify           = 34,
+		TimerNotify             = 100,
+		LASTEvent
+	}
+
+	private enum XAtom {
+		Cardinal                = 6,
+		LASTAtom
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	private struct XAnyEvent 
+	{
+		internal XEventName    type;
+		internal IntPtr        serial;
+		internal bool          send_event;
+		internal IntPtr        display;
+		internal IntPtr        window;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	private struct XPropertyEvent 
+	{
+		internal XEventName    type;
+		internal IntPtr        serial;
+		internal bool          send_event;
+		internal IntPtr        display;
+		internal IntPtr        window;
+		internal IntPtr        atom;
+		internal IntPtr        time;
+		internal int           state;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	private struct XClientMessageEvent 
+	{
+		internal XEventName     type;
+		internal IntPtr         serial;
+		internal bool           send_event;
+		internal IntPtr         display;
+		internal IntPtr         window;
+		internal IntPtr         message_type;
+		internal int            format;
+    
+		[StructLayout(LayoutKind.Sequential)]
+		internal struct DataUnion 
+		{
+			internal IntPtr ptr1;
+			internal IntPtr ptr2;
+			internal IntPtr ptr3;
+			internal IntPtr ptr4;
+			internal IntPtr ptr5;
+		}
+    
+		internal DataUnion      data;
+	}
+}
+
+#pragma warning restore 0169
+
Index: plugins/TrayIcon.cs
===================================================================
RCS file: /cvs/gnome/muine/plugins/TrayIcon.cs,v
retrieving revision 1.8
diff -u -p -r1.8 TrayIcon.cs
--- plugins/TrayIcon.cs	8 Sep 2006 05:09:35 -0000	1.8
+++ plugins/TrayIcon.cs	13 Nov 2006 21:49:07 -0000
@@ -96,7 +96,7 @@ namespace Muine
 		// Methods :: Public :: Init
 		public void Init ()
 		{
-			icon = new Egg.TrayIcon (string_program);
+			icon = new NotificationArea (string_program);
 
 			icon.DestroyEvent += OnDestroyEvent;
 
Index: plugins/egg-sharp.cs
===================================================================
RCS file: plugins/egg-sharp.cs
diff -N plugins/egg-sharp.cs
--- plugins/egg-sharp.cs	29 May 2006 22:26:52 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2005 Todd Berman , Ed Catmur 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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.
- */
-
-// NOTE: throughout IntPtr is used for the Xlib long type, as this tends to 
-// have the correct width and does not require any configure checks.
-
-using System;
-using System.Runtime.InteropServices;
-
-using Gtk;
-using Gdk;
-
-namespace Egg
-{
-	public class TrayIcon : Plug
-	{
-		uint stamp;
-		Orientation orientation;
-		
-		IntPtr selection_atom;
-		IntPtr manager_atom;
-		IntPtr system_tray_opcode_atom;
-		IntPtr orientation_atom;
-		IntPtr message_data_atom;
-		IntPtr manager_window;
-		FilterFunc filter;
-		
-		public TrayIcon (string name)
-		{
-			Title = name;
-			Init ();
-		}
-		
-		public TrayIcon (string name, Gdk.Screen screen)
-		{
-			Title = name;
-			Screen = screen;
-			Init ();
-		}
-
-		[DllImport ("libc")]
-		private static extern IntPtr memcpy (ref XClientMessageEvent.DataUnion dest, IntPtr src, IntPtr len);
-
-		public uint SendMessage (uint timeout, string message)
-		{
-			if (manager_window == IntPtr.Zero)
-				return 0;
-
-			byte[] arr = System.Text.Encoding.UTF8.GetBytes (message);
-			IntPtr unmanaged_arr = Marshal.AllocHGlobal (arr.Length);
-			Marshal.Copy (arr, 0, unmanaged_arr, arr.Length);
-
-			SendManagerMessage (SystemTrayMessage.BeginMessage, (IntPtr) Id, timeout, (uint) arr.Length, ++stamp);
-
-			gdk_error_trap_push ();
-
-			for (int index = 0; index < message.Length; index += 20) {
-				XClientMessageEvent ev = new XClientMessageEvent ();
-
-				IntPtr display = gdk_x11_display_get_xdisplay (Display.Handle);
-
-				ev.type = XEventName.ClientMessage;
-				ev.window = (IntPtr) Id;
-				ev.format = 8;
-				ev.message_type = message_data_atom;
-
-				int len = Math.Min (arr.Length - index, 20);
-				memcpy (ref ev.data, (IntPtr)((int)unmanaged_arr + index), (IntPtr)len);
-
-				XSendEvent (display, manager_window, false, (IntPtr) EventMask.StructureNotifyMask, ref ev);
-				XSync (display, false);
-			}
-
-			gdk_error_trap_pop ();
-
-			return stamp;
-		}
-
-		public void CancelMessage (uint id)
-		{
-			if (id == 0)
-				return;
-
-			SendManagerMessage (SystemTrayMessage.CancelMessage, (IntPtr) Id, id, 0, 0);
-		}
-
-		private void Init ()
-		{
-			stamp = 1;
-			orientation = Orientation.Horizontal;
-			AddEvents ((int)EventMask.PropertyChangeMask);
-			filter = new FilterFunc (ManagerFilter);
-		}
-
-		protected override void OnRealized ()
-		{
-			base.OnRealized ();
-			Display display = Screen.Display;
-			IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
-			selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
-			manager_atom = XInternAtom (xdisplay, "MANAGER", false);
-			system_tray_opcode_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_OPCODE", false);
-			orientation_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_ORIENTATION", false);
-			message_data_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_MESSAGE_DATA", false);
-			UpdateManagerWindow (false);
-			SendDockRequest ();
-			Screen.RootWindow.AddFilter (filter);
-		}
-
-		protected override void OnUnrealized ()
-		{
-			if (manager_window != IntPtr.Zero)
-			{
-				Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
-				if (gdkwin != null)
-					gdkwin.RemoveFilter (filter);
-			}
-			
-			Screen.RootWindow.RemoveFilter (filter);
-			base.OnUnrealized ();
-		}
-
-		private void UpdateManagerWindow (bool dock_if_realized)
-		{
-			IntPtr xdisplay = gdk_x11_display_get_xdisplay (Display.Handle);
-
-			if (manager_window != IntPtr.Zero)
-				return;
-			
-			XGrabServer (xdisplay);
-
-			manager_window = XGetSelectionOwner (xdisplay, selection_atom);
-			if (manager_window != IntPtr.Zero)
-				XSelectInput (xdisplay, manager_window, EventMask.StructureNotifyMask | EventMask.PropertyChangeMask);
-			XUngrabServer (xdisplay);
-			XFlush (xdisplay);
-
-			if (manager_window != IntPtr.Zero) {
-				Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
-				if (gdkwin != null)
-					gdkwin.AddFilter (filter);
-				if (dock_if_realized && IsRealized)
-					SendDockRequest ();
-				GetOrientationProperty ();
-			}
-		}
-
-		private void SendDockRequest ()
-		{
-			SendManagerMessage (SystemTrayMessage.RequestDock, manager_window, Id, 0, 0);
-		}
-
-		private void SendManagerMessage (SystemTrayMessage message, IntPtr window, uint data1, uint data2, uint data3)
-		{
-			XClientMessageEvent ev = new XClientMessageEvent ();
-			IntPtr display;
-
-			ev.type = XEventName.ClientMessage;
-			ev.window = window;
-			ev.message_type = (IntPtr)system_tray_opcode_atom;
-			ev.format = 32;
-			ev.data.ptr1 = (IntPtr)gdk_x11_get_server_time (GdkWindow.Handle);
-			ev.data.ptr2 = (IntPtr)message;
-			ev.data.ptr3 = (IntPtr)data1;
-			ev.data.ptr4 = (IntPtr)data2;
-			ev.data.ptr5 = (IntPtr)data3;
-
-			display = gdk_x11_display_get_xdisplay (Display.Handle);
-			gdk_error_trap_push ();
-			XSendEvent (display, manager_window, false, (IntPtr)EventMask.NoEventMask, ref ev);
-			XSync (display, false);
-			gdk_error_trap_pop ();
-		}
-
-		private FilterReturn ManagerFilter (IntPtr xevent, Event evnt)
-		{
-			XAnyEvent xev = (XAnyEvent) Marshal.PtrToStructure (xevent, typeof(XAnyEvent));
-
-			if (xev.type == XEventName.ClientMessage){
-				XClientMessageEvent xclient = (XClientMessageEvent) Marshal.PtrToStructure (xevent, typeof(XClientMessageEvent));
-
-				if (xclient.message_type == manager_atom && xclient.data.ptr2 == selection_atom) {
-					UpdateManagerWindow (true);
-					return FilterReturn.Continue;
-				}
-			}
-
-			if (xev.window == manager_window) {
-				if (xev.type == XEventName.PropertyNotify){
-					XPropertyEvent xproperty = (XPropertyEvent) Marshal.PtrToStructure (xevent, typeof(XPropertyEvent));
-					if (xproperty.atom == orientation_atom) {
-						GetOrientationProperty();
-						return FilterReturn.Continue;
-					}
-				}
-
-				if (xev.type == XEventName.DestroyNotify) {
-					ManagerWindowDestroyed();
-				}
-			}
-
-			return FilterReturn.Continue;
-		}
-
-		private void ManagerWindowDestroyed ()
-		{
-			if (manager_window != IntPtr.Zero) {
-				Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint) manager_window);
-				if (gdkwin != null)
-					gdkwin.RemoveFilter (filter);
-				
-				manager_window = IntPtr.Zero;
-
-				UpdateManagerWindow (true);
-			}
-		}
-
-		private void GetOrientationProperty ()
-		{
-			IntPtr display;
-			IntPtr type;
-			int format;
-			IntPtr prop_return;
-			IntPtr nitems, bytes_after;
-			int error, result;
-
-			if (manager_window == IntPtr.Zero)
-				return;
-
-			display = gdk_x11_display_get_xdisplay (Display.Handle);
-			
-			gdk_error_trap_push ();
-			type = IntPtr.Zero;
-			result = XGetWindowProperty (display, manager_window, orientation_atom, (IntPtr) 0, (IntPtr) System.Int32.MaxValue, false, (IntPtr) XAtom.Cardinal, out type, out format, out nitems, out bytes_after, out prop_return);
-			error = gdk_error_trap_pop ();
-
-			if (error != 0 || result != 0)
-				return;
-
-			if (type == (IntPtr) XAtom.Cardinal)
-				orientation = ((SystemTrayOrientation) Marshal.ReadInt32 (prop_return) == SystemTrayOrientation.Horz) ? Orientation.Horizontal : Orientation.Vertical;
-
-			if (prop_return != IntPtr.Zero)
-				XFree (prop_return);
-		}
-
-		[DllImport ("gdk-x11-2.0")]
-		static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
-		[DllImport ("gdk-x11-2.0")]
-		static extern IntPtr gdk_x11_get_server_time (IntPtr window);
-		[DllImport ("gdk-x11-2.0")]
-		static extern void gdk_error_trap_push ();
-		[DllImport ("gdk-x11-2.0")]
-		static extern int gdk_error_trap_pop ();
-		
-		[DllImport ("libX11")]
-		extern static IntPtr XInternAtom(IntPtr display, string atom_name, bool only_if_exists);
-		[DllImport ("libX11")]
-		extern static void XGrabServer (IntPtr display);
-		[DllImport ("libX11")]
-		extern static void XUngrabServer (IntPtr display);
-		[DllImport ("libX11")]
-		extern static int XFlush (IntPtr display);
-		[DllImport ("libX11")]
-		extern static int XSync (IntPtr display, bool discard);
-		[DllImport ("libX11")]
-		extern static int XFree (IntPtr display);
-		[DllImport ("libX11")]
-		extern static IntPtr XGetSelectionOwner (IntPtr display, IntPtr atom);
-		[DllImport ("libX11")]
-		extern static IntPtr XSelectInput (IntPtr window, IntPtr display, EventMask mask);
-		[DllImport ("libX11")]
-		extern static int XSendEvent(IntPtr display, IntPtr window, bool propagate, IntPtr event_mask, ref XClientMessageEvent send_event);
-		[DllImport("libX11")]
-		extern static int XGetWindowProperty(IntPtr display, IntPtr w, IntPtr property, IntPtr long_offset, IntPtr long_length, bool deleteProp, IntPtr req_type, out IntPtr actual_type_return, out int actual_format_return, out IntPtr nitems_return, out IntPtr bytes_after_return, out IntPtr prop_return);
-	}
-
-	[Flags]
-	internal enum EventMask {
-		NoEventMask             = 0,
-		KeyPressMask            = 1<<0,
-		KeyReleaseMask          = 1<<1,
-		ButtonPressMask         = 1<<2,
-		ButtonReleaseMask       = 1<<3,
-		EnterWindowMask         = 1<<4,
-		LeaveWindowMask         = 1<<5,
-		PointerMotionMask       = 1<<6,
-		PointerMotionHintMask   = 1<<7,
-		Button1MotionMask       = 1<<8,
-		Button2MotionMask       = 1<<9,
-		Button3MotionMask       = 1<<10,
-		Button4MotionMask       = 1<<11,
-		Button5MotionMask       = 1<<12,
-		ButtonMotionMask        = 1<<13,
-		KeymapStateMask         = 1<<14,
-		ExposureMask            = 1<<15,
-		VisibilityChangeMask    = 1<<16,
-		StructureNotifyMask     = 1<<17,
-		ResizeRedirectMask      = 1<<18,
-                SubstructureNotifyMask  = 1<<19,
-		SubstructureRedirectMask= 1<<20,
-		FocusChangeMask         = 1<<21,
-		PropertyChangeMask      = 1<<22,
-		ColormapChangeMask      = 1<<23,
-		OwnerGrabButtonMask     = 1<<24
-	}
-
-	internal enum SystemTrayMessage
-	{
-		RequestDock = 0,
-		BeginMessage = 1,
-		CancelMessage = 2
-	}
-
-	internal enum SystemTrayOrientation
-	{
-		Horz = 0,
-		Vert = 1
-	}
-
-  	[StructLayout(LayoutKind.Sequential)]
-	internal struct XAnyEvent {
-		internal XEventName	type;
-		internal IntPtr		serial;
-		internal bool		send_event;
-		internal IntPtr		display;
-		internal IntPtr		window;
-	}
-	
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct XPropertyEvent {
-		internal XEventName	type;
-		internal IntPtr		serial;
-		internal bool		send_event;
-		internal IntPtr		display;
-		internal IntPtr		window;
-		internal IntPtr		atom;
-		internal IntPtr		time;
-		internal int		state;
-	}
-	
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct XClientMessageEvent {
-		internal XEventName     type;
-		internal IntPtr		serial;
-		internal bool           send_event;
-		internal IntPtr         display;
-		internal IntPtr         window;
-		internal IntPtr         message_type;
-		internal int            format;
- 		[StructLayout(LayoutKind.Sequential)]
- 		internal struct DataUnion {
-
- 			internal IntPtr ptr1;
- 			internal IntPtr ptr2;
- 			internal IntPtr ptr3;
- 			internal IntPtr ptr4;
- 			internal IntPtr ptr5;
- 		}
- 		internal DataUnion      data;
-	}
-
-	internal enum XEventName {
-		KeyPress                = 2,
-		KeyRelease              = 3,
-		ButtonPress             = 4,
-		ButtonRelease           = 5,
-		MotionNotify            = 6,
-		EnterNotify             = 7,
-		LeaveNotify             = 8,
-		FocusIn                 = 9,
-		FocusOut                = 10,
-		KeymapNotify            = 11,
-		Expose                  = 12,
-		GraphicsExpose          = 13,
-		NoExpose                = 14,
-		VisibilityNotify        = 15,
-		CreateNotify            = 16,
-		DestroyNotify           = 17,
-		UnmapNotify             = 18,
-		MapNotify               = 19,
-		MapRequest              = 20,
-		ReparentNotify          = 21,
-		ConfigureNotify         = 22,
-		ConfigureRequest        = 23,
-		GravityNotify           = 24,
-		ResizeRequest           = 25,
-		CirculateNotify         = 26,
-		CirculateRequest        = 27,
-		PropertyNotify          = 28,
-		SelectionClear          = 29,
-		SelectionRequest        = 30,
-		SelectionNotify         = 31,
-		ColormapNotify          = 32,
-		ClientMessage           = 33,
-		MappingNotify           = 34,
-		TimerNotify             = 100,
-		
-		LASTEvent
-	}
-
-	internal enum XAtom {
-		Cardinal                = 6,
-
-		LASTAtom
-	}
-}


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-6/muine.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- muine.spec	13 Nov 2006 19:10:18 -0000	1.10
+++ muine.spec	13 Nov 2006 21:57:57 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           muine
 Version:        0.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.muine-player.org/
 Source0:        http://muine-player.org/releases/muine-%{version}.tar.gz
+Patch0:		    muine-trayicon-transparency-bug-343698.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	mono-devel, gtk-sharp2-gapi, gtk-sharp2-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -122,6 +124,8 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Nov 13 2006 Sindre Pedersen Bj??rdal  - 0.8.6-2
+- Add patch to fix trayicon transparency
 * Mon Nov 13 2006 Sindre Pedersen Bj??rdal  - 0.8.6-1
 - New release
 - Add gtk icon cache scriplet for new icons



From fedora-extras-commits at redhat.com  Mon Nov 13 22:15:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 15:15:02 -0700
Subject: rpms/dirmngr/devel dirmngr.spec,1.4,1.5
Message-ID: <200611132215.kADMF2bA020683@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dirmngr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20665

Modified Files:
	dirmngr.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  0.9.6-2
- BR: libassuan-static



Index: dirmngr.spec
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dirmngr.spec	7 Sep 2006 20:04:03 -0000	1.4
+++ dirmngr.spec	13 Nov 2006 22:14:31 -0000	1.5
@@ -5,7 +5,7 @@
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
 Version: 0.9.6
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 
 License: GPL
 Group:	 System Environment/Libraries
@@ -18,9 +18,9 @@
 Source11: ldapservers.conf
 Source12: dirmngr.logrotate
 
+BuildRequires: libassuan-static
 BuildRequires: libgcrypt-devel >= 1.2.0
 BuildRequires: libksba-devel >= 1.0.0 
-BuildRequires: libassuan-devel >= 0.6.10
 buildRequires: pth-devel
 BuildRequires: openldap-devel
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  0.9.6-2
+- BR: libassuan-static
+
 * Tue Sep 05 2006 Rex Dieter  0.9.6-1
 - 0.9.6
 



From fedora-extras-commits at redhat.com  Mon Nov 13 22:20:10 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:20:10 -0700
Subject: rpms/gauche-gl/FC-5 .cvsignore, 1.2, 1.3 Gauche-gl-fix.patch, 1.1, 
	1.2 gauche-gl.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200611132220.kADMKA0m020825@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20768/FC-5

Modified Files:
	.cvsignore Gauche-gl-fix.patch gauche-gl.spec sources 
Log Message:
new version 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 May 2006 19:27:29 -0000	1.2
+++ .cvsignore	13 Nov 2006 22:19:39 -0000	1.3
@@ -1 +1 @@
-Gauche-gl-0.4.1.tgz
+Gauche-gl-0.4.2.tgz

Gauche-gl-fix.patch:

Index: Gauche-gl-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-5/Gauche-gl-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Gauche-gl-fix.patch	9 May 2006 19:27:29 -0000	1.1
+++ Gauche-gl-fix.patch	13 Nov 2006 22:19:39 -0000	1.2
@@ -1,15 +1,22 @@
---- Gauche-gl-0.4/src/gauche-gl.c.fix	2005-07-01 23:58:51.000000000 +0200
-+++ Gauche-gl-0.4/src/gauche-gl.c	2005-07-01 23:59:01.000000000 +0200
-@@ -136,11 +136,7 @@
-    supports GLX for the time being. */
+--- Gauche-gl-0.4.2/src/gauche-gl.c.fix	2006-11-13 22:39:05.000000000 +0100
++++ Gauche-gl-0.4.2/src/gauche-gl.c	2006-11-13 22:42:04.000000000 +0100
+@@ -139,18 +139,7 @@
+ */
  void *Scm_GLGetProcAddress(const char *name)
  {
--#if defined(GLX_VERSION_1_4)
+-#if defined(GLX_ARB_get_proc_address)
+-    if (glXGetProcAddressARB != NULL) {
+-        return glXGetProcAddressARB((const GLubyte*)name);
+-    }
+-#elif defined(GLX_VERSION_1_4)
 -    if (glXGetProcAddress != NULL) {
 -        return glXGetProcAddress(name);
 -    }
--#elif defined(GLX_ARB_get_proc_address)
-+#if defined(GLX_ARB_get_proc_address)
-     if (glXGetProcAddressARB != NULL) {
-         return glXGetProcAddressARB(name);
-     }
+-#elif defined(MacOSX)
+-    return glutGetProcAddress(name);
+-#endif /* !defined(GLX_VERSION_1_4) && !defined(GLX_ARB_get_proc_address) */
+-    Scm_Error("GL extension %s is not supported on this platform", name);
++    return glXGetProcAddressARB((const GLubyte*)name);
+ }
+ 
+ /* List of numbers -> array of doubles.  Returns # of elements. */


Index: gauche-gl.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-5/gauche-gl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gauche-gl.spec	9 May 2006 20:44:54 -0000	1.3
+++ gauche-gl.spec	13 Nov 2006 22:19:39 -0000	1.4
@@ -1,14 +1,14 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gl
-Version:        0.4.1
-Release:        5%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:	OpenGL binding for Gauche
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.1.tgz
+Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.2.tgz
 Patch0:		Gauche-gl-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: 	gauche-devel = %{gauche_version}
@@ -29,7 +29,7 @@
 %prep
 %setup -q -n Gauche-gl-%{version}
 %patch0 -p1
-(cd src; mv gauche-gl.c.orig gauche-gl.c)
+
 
 %build
 %configure
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.2-1
+- new version 0.4.2
+
 * Fri May  5 2006 Gerard Milmeister  - 0.4.1-4
 - cleaned up Requires
 - removed unnecessary files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 May 2006 19:27:29 -0000	1.2
+++ sources	13 Nov 2006 22:19:39 -0000	1.3
@@ -1 +1 @@
-a51b19a0f16f88ed6cd85c6e49cc6e75  Gauche-gl-0.4.1.tgz
+32e0670225a983e9df99f856825e1f63  Gauche-gl-0.4.2.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 22:20:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:20:11 -0700
Subject: rpms/gauche-gl/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611132220.kADMKBaV020838@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20768/devel

Modified Files:
	.cvsignore sources 
Log Message:
new version 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 May 2006 19:27:29 -0000	1.2
+++ .cvsignore	13 Nov 2006 22:19:41 -0000	1.3
@@ -1 +1 @@
-Gauche-gl-0.4.1.tgz
+Gauche-gl-0.4.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 May 2006 19:27:29 -0000	1.2
+++ sources	13 Nov 2006 22:19:41 -0000	1.3
@@ -1 +1 @@
-a51b19a0f16f88ed6cd85c6e49cc6e75  Gauche-gl-0.4.1.tgz
+32e0670225a983e9df99f856825e1f63  Gauche-gl-0.4.2.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 22:20:10 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:20:10 -0700
Subject: rpms/gauche-gl/FC-6 .cvsignore, 1.2, 1.3 Gauche-gl-fix.patch, 1.1, 
	1.2 gauche-gl.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200611132220.kADMKA8s020834@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20768/FC-6

Modified Files:
	.cvsignore Gauche-gl-fix.patch gauche-gl.spec sources 
Log Message:
new version 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 May 2006 19:27:29 -0000	1.2
+++ .cvsignore	13 Nov 2006 22:19:40 -0000	1.3
@@ -1 +1 @@
-Gauche-gl-0.4.1.tgz
+Gauche-gl-0.4.2.tgz

Gauche-gl-fix.patch:

Index: Gauche-gl-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/Gauche-gl-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Gauche-gl-fix.patch	9 May 2006 19:27:29 -0000	1.1
+++ Gauche-gl-fix.patch	13 Nov 2006 22:19:40 -0000	1.2
@@ -1,15 +1,22 @@
---- Gauche-gl-0.4/src/gauche-gl.c.fix	2005-07-01 23:58:51.000000000 +0200
-+++ Gauche-gl-0.4/src/gauche-gl.c	2005-07-01 23:59:01.000000000 +0200
-@@ -136,11 +136,7 @@
-    supports GLX for the time being. */
+--- Gauche-gl-0.4.2/src/gauche-gl.c.fix	2006-11-13 22:39:05.000000000 +0100
++++ Gauche-gl-0.4.2/src/gauche-gl.c	2006-11-13 22:42:04.000000000 +0100
+@@ -139,18 +139,7 @@
+ */
  void *Scm_GLGetProcAddress(const char *name)
  {
--#if defined(GLX_VERSION_1_4)
+-#if defined(GLX_ARB_get_proc_address)
+-    if (glXGetProcAddressARB != NULL) {
+-        return glXGetProcAddressARB((const GLubyte*)name);
+-    }
+-#elif defined(GLX_VERSION_1_4)
 -    if (glXGetProcAddress != NULL) {
 -        return glXGetProcAddress(name);
 -    }
--#elif defined(GLX_ARB_get_proc_address)
-+#if defined(GLX_ARB_get_proc_address)
-     if (glXGetProcAddressARB != NULL) {
-         return glXGetProcAddressARB(name);
-     }
+-#elif defined(MacOSX)
+-    return glutGetProcAddress(name);
+-#endif /* !defined(GLX_VERSION_1_4) && !defined(GLX_ARB_get_proc_address) */
+-    Scm_Error("GL extension %s is not supported on this platform", name);
++    return glXGetProcAddressARB((const GLubyte*)name);
+ }
+ 
+ /* List of numbers -> array of doubles.  Returns # of elements. */


Index: gauche-gl.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/gauche-gl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gauche-gl.spec	28 Aug 2006 09:31:53 -0000	1.3
+++ gauche-gl.spec	13 Nov 2006 22:19:40 -0000	1.4
@@ -1,8 +1,8 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gl
-Version:        0.4.1
-Release:        6%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:	OpenGL binding for Gauche
 
 Group:          Development/Languages
@@ -29,7 +29,7 @@
 %prep
 %setup -q -n Gauche-gl-%{version}
 %patch0 -p1
-(cd src; mv gauche-gl.c.orig gauche-gl.c)
+
 
 %build
 %configure
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.2-1
+- new version 0.4.2
+
 * Fri May  5 2006 Gerard Milmeister  - 0.4.1-4
 - cleaned up Requires
 - removed unnecessary files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 May 2006 19:27:29 -0000	1.2
+++ sources	13 Nov 2006 22:19:40 -0000	1.3
@@ -1 +1 @@
-a51b19a0f16f88ed6cd85c6e49cc6e75  Gauche-gl-0.4.1.tgz
+32e0670225a983e9df99f856825e1f63  Gauche-gl-0.4.2.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 22:27:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:27:43 -0700
Subject: owners owners.list,1.1947,1.1948
Message-ID: <200611132227.kADMRh01020992@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20967

Modified Files:
	owners.list 
Log Message:
Added python-nltk_lite and nickle to list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1947
retrieving revision 1.1948
diff -u -r1.1947 -r1.1948
--- owners.list	13 Nov 2006 19:12:12 -0000	1.1947
+++ owners.list	13 Nov 2006 22:27:12 -0000	1.1948
@@ -1165,6 +1165,7 @@
 Fedora Extras|nget|A utility for retrieving files using the NNTP protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ngrep|Network layer grep tool|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|ngspice|A mixed level/signal circuit simulator|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
+Fedora Extras|nickle|A programming language-based prototyping environment|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|ninja|A text based Internet Relay Chat (IRC) client|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nip2|Interactive image processing system|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|njam|Maze-game, eat all the cookies while avoiding the badguys|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -1936,6 +1937,7 @@
 Fedora Extras|python-mutagen|Python module to handle audio metadata|mr.ecik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-myghty|A Python-based templating system derived from HTML::Mason|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-nltk|Python-based Natural Language Toolkit|michel.salim at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-nltk_lite|Python-based Natural Language Toolkit|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-nose|A discovery-based unittest extension for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numarray|Python array manipulation and computational library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 22:28:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:28:48 -0700
Subject: rpms/gauche-gtk/FC-5 gauche-gtk.spec,1.1,1.2
Message-ID: <200611132228.kADMSmNH021065@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gtk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21003/FC-5

Modified Files:
	gauche-gtk.spec 
Log Message:
rebuilt for gauche 0.8.8


Index: gauche-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gtk/FC-5/gauche-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gauche-gtk.spec	15 May 2006 19:23:41 -0000	1.1
+++ gauche-gtk.spec	13 Nov 2006 22:28:18 -0000	1.2
@@ -1,8 +1,8 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gtk
 Version:        0.4.1
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:	Gauche extension module to use GTK
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.1-9
+- rebuilt for gauche 0.8.8
+
 * Fri May  5 2006 Gerard Milmeister  - 0.4.1-7
 - Added include flags for freetype
 - Added -fPIC flag 



From fedora-extras-commits at redhat.com  Mon Nov 13 22:28:49 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:28:49 -0700
Subject: rpms/gauche-gtk/FC-6 gauche-gtk.spec,1.2,1.3
Message-ID: <200611132228.kADMSnAv021072@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gtk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21003/FC-6

Modified Files:
	gauche-gtk.spec 
Log Message:
rebuilt for gauche 0.8.8


Index: gauche-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gtk/FC-6/gauche-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gauche-gtk.spec	28 Aug 2006 11:15:36 -0000	1.2
+++ gauche-gtk.spec	13 Nov 2006 22:28:18 -0000	1.3
@@ -1,8 +1,8 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gtk
 Version:        0.4.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:	Gauche extension module to use GTK
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.1-9
+- rebuilt for gauche 0.8.8
+
 * Mon Aug 28 2006 Gerard Milmeister  - 0.4.1-8
 - Rebuild for FE6
 



From fedora-extras-commits at redhat.com  Mon Nov 13 22:28:49 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:28:49 -0700
Subject: rpms/gauche-gtk/devel gauche-gtk.spec,1.2,1.3
Message-ID: <200611132228.kADMSnfG021076@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21003/devel

Modified Files:
	gauche-gtk.spec 
Log Message:
rebuilt for gauche 0.8.8


Index: gauche-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gtk/devel/gauche-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gauche-gtk.spec	28 Aug 2006 11:15:36 -0000	1.2
+++ gauche-gtk.spec	13 Nov 2006 22:28:19 -0000	1.3
@@ -1,8 +1,8 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gtk
 Version:        0.4.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:	Gauche extension module to use GTK
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.1-9
+- rebuilt for gauche 0.8.8
+
 * Mon Aug 28 2006 Gerard Milmeister  - 0.4.1-8
 - Rebuild for FE6
 



From fedora-extras-commits at redhat.com  Mon Nov 13 22:30:09 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Nov 2006 15:30:09 -0700
Subject: owners owners.list,1.1948,1.1949
Message-ID: <200611132230.kADMU9UW021143@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21106

Modified Files:
	owners.list 
Log Message:
newpg was actually dropped before FE(3) - no need for it to hang around here.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1948
retrieving revision 1.1949
diff -u -r1.1948 -r1.1949
--- owners.list	13 Nov 2006 22:27:12 -0000	1.1948
+++ owners.list	13 Nov 2006 22:29:38 -0000	1.1949
@@ -1155,7 +1155,6 @@
 Fedora Extras|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|denis at poolshark.org|extras-qa at fedoraproject.org|davidz at redhat.com
 Fedora Extras|neverball|Roll a ball through an obstacle course|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|new|A simple template system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
-Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|newsx|NNTP news exchange utility|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 22:33:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Nov 2006 15:33:51 -0700
Subject: owners owners.list,1.1949,1.1950
Message-ID: <200611132233.kADMXpUX021289@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21273/owners

Modified Files:
	owners.list 
Log Message:
co-maintain qemu


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1949
retrieving revision 1.1950
diff -u -r1.1949 -r1.1950
--- owners.list	13 Nov 2006 22:29:38 -0000	1.1949
+++ owners.list	13 Nov 2006 22:33:21 -0000	1.1950
@@ -1972,8 +1972,7 @@
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
-Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
+Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-zope-interface|Zope interfaces package|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -1990,7 +1989,7 @@
 Fedora Extras|qca-tls|Qt Cryptographic Architecture, TLS plugin|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|qcad|CAD program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|qcomicbook|Comic Viewing Program|scott at perturb.org|extras-qa at fedoraproject.org|
-Fedora Extras|qemu|QEMU is a FAST! processor emulator|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|qemu|QEMU is a FAST! processor emulator|dwmw2 at redhat.com|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
 Fedora Extras|qgit|Browser for GIT repositories|dan at danny.cz|extras-qa at fedoraproject.org|
 Fedora Extras|qgo|Graphical Go client and SGF editor|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|qhull|General dimension convex hull programs|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 22:34:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:34:55 -0700
Subject: rpms/spicctrl/FC-6 .cvsignore, 1.3, 1.4 Makefile, 1.2, 1.3 sources, 
	1.3, 1.4 spicctrl.spec, 1.4, 1.5 dead.package, 1.1, NONE
Message-ID: <200611132234.kADMYtCZ021397@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/spicctrl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21355/FC-6

Added Files:
	.cvsignore Makefile sources spicctrl.spec 
Removed Files:
	dead.package 
Log Message:
Resurrect spicctrl for FC-6 and devel



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	13 Nov 2006 22:34:25 -0000	1.4
@@ -0,0 +1 @@
+spicctrl-1.9.tar.bz2


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	13 Nov 2006 22:34:25 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: spicctrl
+# $Id$
+NAME := spicctrl
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	13 Nov 2006 22:34:25 -0000	1.4
@@ -0,0 +1 @@
+775a1959c03e59830303b8320ca379d2  spicctrl-1.9.tar.bz2


Index: spicctrl.spec
===================================================================
RCS file: spicctrl.spec
diff -N spicctrl.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ spicctrl.spec	13 Nov 2006 22:34:25 -0000	1.5
@@ -0,0 +1,84 @@
+Name:           spicctrl
+Version:        1.9
+Release:        4%{?dist}
+Summary:        Sony Vaio laptop SPIC control program
+
+Group:          Applications/System
+License:        GPL
+URL:            http://popies.net/sonypi/
+Source0:        http://popies.net/sonypi/spicctrl-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch:	%{ix86}
+
+%description
+spicctrl queries and sets a variety of parameters on Sony Vaio laptop
+computers, including AC Power status, battery status, screen brightness,
+and bluetooth device power status
+
+
+%prep
+%setup -q
+%{__sed} -i 's/ -O2 / $(RPM_OPT_FLAGS) /' Makefile
+
+
+%build
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m755 spicctrl $RPM_BUILD_ROOT%{_sbindir}
+install -p -m644 spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ ! -c /dev/sonypi ]; then
+	rm -f /dev/sonypi
+	mknod /dev/sonypi c 10 250
+fi
+if [ -e /etc/modprobe.conf ]; then
+	grep 'alias char-major-10-250 sonypi' /etc/modprobe.conf > /dev/null
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then
+		echo 'alias char-major-10-250 sonypi' >> /etc/modprobe.conf
+		echo 'options sonypi minor=250' >> /etc/modprobe.conf
+	fi
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGES LICENSE
+%{_sbindir}/spicctrl
+%{_mandir}/man1/spicctrl.1.gz
+
+
+%changelog
+* Sat May 20 2006 Roozbeh Pournader  1.9-4
+- Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct
+  man page permissions (Ville Skytt??)
+
+* Tue Feb 14 2006 Roozbeh Pournader  1.9-3
+- Rebuild for Fedora Extras 5
+
+* Tue Jan 31 2006 Roozbeh Pournader  1.9-2
+- Bumped release to a proper integer
+
+* Sun Jan 08 2006 Roozbeh Pournader  1.9-1.4
+- Add %%{?dist} tag
+
+* Mon Dec 26 2005 Roozbeh Pournader  1.9-1.3
+- Change ExclusiveArch to %%{ix86}
+
+* Mon Dec 26 2005 Roozbeh Pournader  1.9-1.2
+- Add ExclusiveArch
+
+* Thu Dec 22 2005 Roozbeh Pournader  1.9-1.1
+- First revision, based on upstream spec file


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 22:34:56 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:34:56 -0700
Subject: rpms/spicctrl/devel .cvsignore, 1.3, 1.4 Makefile, 1.2, 1.3 sources,
	1.3, 1.4 spicctrl.spec, 1.4, 1.5 dead.package, 1.1, NONE
Message-ID: <200611132234.kADMYu5f021403@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21355/devel

Added Files:
	.cvsignore Makefile sources spicctrl.spec 
Removed Files:
	dead.package 
Log Message:
Resurrect spicctrl for FC-6 and devel



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	13 Nov 2006 22:34:26 -0000	1.4
@@ -0,0 +1 @@
+spicctrl-1.9.tar.bz2


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	13 Nov 2006 22:34:26 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: spicctrl
+# $Id$
+NAME := spicctrl
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	13 Nov 2006 22:34:26 -0000	1.4
@@ -0,0 +1 @@
+775a1959c03e59830303b8320ca379d2  spicctrl-1.9.tar.bz2


Index: spicctrl.spec
===================================================================
RCS file: spicctrl.spec
diff -N spicctrl.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ spicctrl.spec	13 Nov 2006 22:34:26 -0000	1.5
@@ -0,0 +1,84 @@
+Name:           spicctrl
+Version:        1.9
+Release:        4%{?dist}
+Summary:        Sony Vaio laptop SPIC control program
+
+Group:          Applications/System
+License:        GPL
+URL:            http://popies.net/sonypi/
+Source0:        http://popies.net/sonypi/spicctrl-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch:	%{ix86}
+
+%description
+spicctrl queries and sets a variety of parameters on Sony Vaio laptop
+computers, including AC Power status, battery status, screen brightness,
+and bluetooth device power status
+
+
+%prep
+%setup -q
+%{__sed} -i 's/ -O2 / $(RPM_OPT_FLAGS) /' Makefile
+
+
+%build
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m755 spicctrl $RPM_BUILD_ROOT%{_sbindir}
+install -p -m644 spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ ! -c /dev/sonypi ]; then
+	rm -f /dev/sonypi
+	mknod /dev/sonypi c 10 250
+fi
+if [ -e /etc/modprobe.conf ]; then
+	grep 'alias char-major-10-250 sonypi' /etc/modprobe.conf > /dev/null
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then
+		echo 'alias char-major-10-250 sonypi' >> /etc/modprobe.conf
+		echo 'options sonypi minor=250' >> /etc/modprobe.conf
+	fi
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGES LICENSE
+%{_sbindir}/spicctrl
+%{_mandir}/man1/spicctrl.1.gz
+
+
+%changelog
+* Sat May 20 2006 Roozbeh Pournader  1.9-4
+- Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct
+  man page permissions (Ville Skytt??)
+
+* Tue Feb 14 2006 Roozbeh Pournader  1.9-3
+- Rebuild for Fedora Extras 5
+
+* Tue Jan 31 2006 Roozbeh Pournader  1.9-2
+- Bumped release to a proper integer
+
+* Sun Jan 08 2006 Roozbeh Pournader  1.9-1.4
+- Add %%{?dist} tag
+
+* Mon Dec 26 2005 Roozbeh Pournader  1.9-1.3
+- Change ExclusiveArch to %%{ix86}
+
+* Mon Dec 26 2005 Roozbeh Pournader  1.9-1.2
+- Add ExclusiveArch
+
+* Thu Dec 22 2005 Roozbeh Pournader  1.9-1.1
+- First revision, based on upstream spec file


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 22:38:19 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:38:19 -0700
Subject: rpms/spicctrl/FC-6 spicctrl.spec,1.5,1.6
Message-ID: <200611132238.kADMcJ0R021493@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/spicctrl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21477

Modified Files:
	spicctrl.spec 
Log Message:
Bump release number for rebuild



Index: spicctrl.spec
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/FC-6/spicctrl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spicctrl.spec	13 Nov 2006 22:34:25 -0000	1.5
+++ spicctrl.spec	13 Nov 2006 22:37:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           spicctrl
 Version:        1.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sony Vaio laptop SPIC control program
 
 Group:          Applications/System
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Michel Salim  1.9-5
+- Rebuild for Fedora Extras 6
+
 * Sat May 20 2006 Roozbeh Pournader  1.9-4
 - Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct
   man page permissions (Ville Skytt??)



From fedora-extras-commits at redhat.com  Mon Nov 13 22:40:47 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:40:47 -0700
Subject: rpms/spicctrl/devel spicctrl.spec,1.5,1.6
Message-ID: <200611132240.kADMel75021564@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21542

Modified Files:
	spicctrl.spec 
Log Message:
Bump up -devel release number to be in sync with FC-6



Index: spicctrl.spec
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/devel/spicctrl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spicctrl.spec	13 Nov 2006 22:34:26 -0000	1.5
+++ spicctrl.spec	13 Nov 2006 22:40:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           spicctrl
 Version:        1.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sony Vaio laptop SPIC control program
 
 Group:          Applications/System
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Michel Salim  1.9-5
+- Rebuild for Fedora Extras 6
+
 * Sat May 20 2006 Roozbeh Pournader  1.9-4
 - Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct
   man page permissions (Ville Skytt??)



From fedora-extras-commits at redhat.com  Mon Nov 13 22:44:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:44:30 -0700
Subject: rpms/gauche-gl/FC-6 gauche-gl.spec,1.4,1.5
Message-ID: <200611132244.kADMiUBP021722@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21693

Modified Files:
	gauche-gl.spec 
Log Message:



Index: gauche-gl.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/gauche-gl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gauche-gl.spec	13 Nov 2006 22:19:40 -0000	1.4
+++ gauche-gl.spec	13 Nov 2006 22:44:00 -0000	1.5
@@ -2,13 +2,13 @@
 
 Name:           gauche-gl
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:	OpenGL binding for Gauche
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.1.tgz
+Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.2.tgz
 Patch0:		Gauche-gl-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: 	gauche-devel = %{gauche_version}



From fedora-extras-commits at redhat.com  Mon Nov 13 22:44:32 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:44:32 -0700
Subject: rpms/logserial - New directory
Message-ID: <200611132244.kADMiWhW021729@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21725/logserial

Log Message:
Directory /cvs/extras/rpms/logserial added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 22:44:38 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:44:38 -0700
Subject: rpms/logserial/devel - New directory
Message-ID: <200611132244.kADMicOm021774@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21725/logserial/devel

Log Message:
Directory /cvs/extras/rpms/logserial/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 22:45:14 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:45:14 -0700
Subject: rpms/logserial Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611132245.kADMjEfD021852@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21845

Added Files:
	Makefile import.log 
Log Message:
Setup of module logserial


--- NEW FILE Makefile ---
# Top level Makefile for module logserial
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  Mon Nov 13 22:45:19 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:45:19 -0700
Subject: rpms/logserial/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611132245.kADMjJuv021871@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21845/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module logserial


--- 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 Nov 13 22:47:02 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:47:02 -0700
Subject: rpms/logserial import.log,1.1,1.2
Message-ID: <200611132247.kADMl2ZM022003@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21968

Modified Files:
	import.log 
Log Message:
auto-import logserial-0.4.2-3 on branch devel from logserial-0.4.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/logserial/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 22:45:14 -0000	1.1
+++ import.log	13 Nov 2006 22:46:32 -0000	1.2
@@ -0,0 +1 @@
+logserial-0_4_2-3:HEAD:logserial-0.4.2-3.src.rpm:1163458090



From fedora-extras-commits at redhat.com  Mon Nov 13 22:47:03 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:47:03 -0700
Subject: rpms/logserial/devel logserial-makefile.patch, NONE,
	1.1 logserial.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611132247.kADMl3X1022007@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21968/devel

Modified Files:
	.cvsignore sources 
Added Files:
	logserial-makefile.patch logserial.spec 
Log Message:
auto-import logserial-0.4.2-3 on branch devel from logserial-0.4.2-3.src.rpm

logserial-makefile.patch:

--- NEW FILE logserial-makefile.patch ---
--- Makefile	2003-04-12 19:41:07.000000000 +0300
+++ Makefile.new	2006-11-13 14:26:51.000000000 +0200
@@ -15,7 +15,8 @@ OBJS= logserial.o sysdep1.o
 OPTIMIZE= -O3 -m486 -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS
 DEBUG_FLAGS= #-g 
 
-CFLAGS= $(DEBUG_FLAGS) $(OPTIMIZE)
+#CFLAGS= $(DEBUG_FLAGS) $(OPTIMIZE)
+CFLAGS= -D_POSIX $(RPM_OPT_FLAGS)
 
 all: $(NAME)
 


--- NEW FILE logserial.spec ---
Name:           logserial
Version:        0.4.2 
Release:        3%{?dist}
Summary:        Package for logging incoming bytes on asynchronous serial ports

Group:          Applications/Communications
License:        GPL
URL:            http://www.ibiblio.org/pub/Linux/system/serial/logserial-0.4.2.lsm
Source0:        http://www.ibiblio.org/pub/Linux/system/serial/logserial-0.4.2.tar.gz
Patch0:         logserial-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Package for logging incoming bytes on asynchronous serial ports.
It was written for loging calls on our telephone central, but
you can use it for any devices connected to serial ports. From
version 0.4 it can be used to send data through serial line.

%prep
%setup -q
%patch -p0


%build

echo $RPM_OPT_FLAGS
echo $CFLAGS
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -p -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG README
%{_bindir}/%{name}




%changelog
* Mon Nov 13 2006 lonely wolf  0.4.2-3
- corrected the patch to make use of $RPM_OPT_FLAGS

* Sun Nov 12 2006 lonely wolf  0.4.2-2
- Modify the Makefile to make use of $RPM_OPT_FLAGS

* Mon Nov 07 2006 lonely wolf  0.4.2-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logserial/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 22:45:19 -0000	1.1
+++ .cvsignore	13 Nov 2006 22:46:32 -0000	1.2
@@ -0,0 +1 @@
+logserial-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logserial/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 22:45:19 -0000	1.1
+++ sources	13 Nov 2006 22:46:32 -0000	1.2
@@ -0,0 +1 @@
+833fff07602e4a21f447aa194d14ecd8  logserial-0.4.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 22:50:09 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:50:09 -0700
Subject: owners owners.list,1.1950,1.1951
Message-ID: <200611132250.kADMo9WH022073@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22057

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1950
retrieving revision 1.1951
diff -u -r1.1950 -r1.1951
--- owners.list	13 Nov 2006 22:33:21 -0000	1.1950
+++ owners.list	13 Nov 2006 22:49:38 -0000	1.1951
@@ -1015,6 +1015,7 @@
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|logserial|Package for logging incoming bytes on asynchronous serial ports|wolfy at nobugconsulting.ro|extras-qa at fedoraproject.org|
 Fedora Extras|lostirc|Simple IRC client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 22:54:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Mon, 13 Nov 2006 15:54:58 -0700
Subject: owners owners.list,1.1951,1.1952
Message-ID: <200611132254.kADMswlo022168@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22148

Modified Files:
	owners.list 
Log Message:
Fix breakage.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1951
retrieving revision 1.1952
diff -u -r1.1951 -r1.1952
--- owners.list	13 Nov 2006 22:49:38 -0000	1.1951
+++ owners.list	13 Nov 2006 22:54:28 -0000	1.1952
@@ -1786,8 +1786,8 @@
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|php-pear-HTML-Table|Class to easily design HTML tables|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-QuickForm|Class for creating, validating, processing HTML forms|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTML-Table|Class to easily design HTML tables|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|
@@ -1973,7 +1973,8 @@
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
-Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
+Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-zope-interface|Zope interfaces package|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 02:18:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 19:18:51 -0700
Subject: rpms/sbcl/devel sbcl.spec,1.53,1.54
Message-ID: <200611140218.kAE2IpbB002774@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2758

Modified Files:
	sbcl.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  0.9.18-2
- fix awol contrib/sb-bsd-sockets (#214568)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sbcl.spec	26 Oct 2006 12:52:20 -0000	1.53
+++ sbcl.spec	14 Nov 2006 02:18:21 -0000	1.54
@@ -4,13 +4,13 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
+%define sbcl_verbose 1 
 %define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -24,7 +24,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -33,17 +33,16 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
 # or
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.12-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
 BuildRequires: sbcl
@@ -112,7 +111,8 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+#export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 # setup local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
@@ -125,9 +125,11 @@
 #define my_setarch ./my_setarch
 
 # WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?)
-# at least until a better solution is found
-# http://bugzilla.redhat.com/bugzilla/169506
+# http://bugzilla.redhat.com/169506
 touch contrib/sb-posix/test-passed
+# WORKAROUND sb-bsd-sockets test failures
+# http://bugzilla.redhat.com/214568
+touch contrib/sb-bsd-sockets/test-passed
 
 # trick contrib/ modules to use optflags too 
 export EXTRA_CFLAGS="$CFLAGS"
@@ -144,18 +146,21 @@
 
 
 %check
-# santity check, did sb-posix get built/included?
-# http://bugzilla.redhat.com/bugzilla/169506
-SB_POSIX=%{_libdir}/sbcl/sb-posix
-if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then
-  echo "${SB_POSIX} awol!"
-  exit 1
-fi
+ERROR=0
+# santity check, essential contrib modules get built/included? 
+CONTRIBS="sb-posix sb-bsd-sockets"
+for CONTRIB in $CONTRIBS ; do
+  if [ ! -d $RPM_BUILD_ROOT%{_libdir}/sbcl/$CONTRIB ]; then
+    echo "WARNING: ${CONTRIB} awol!"
+    ERROR=1 
+  fi
+done
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
 %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
+exit $ERROR
 
 
 %install
@@ -215,6 +220,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  0.9.18-2
+- fix awol contrib/sb-bsd-sockets (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  0.9.18-1
 - sbcl-0.9.18
 



From fedora-extras-commits at redhat.com  Tue Nov 14 02:23:10 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 19:23:10 -0700
Subject: rpms/puppet/FC-6 .cvsignore, 1.8, 1.9 puppet.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <200611140223.kAE2NA01002934@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2875/FC-6

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Oct 2006 00:23:09 -0000	1.8
+++ .cvsignore	14 Nov 2006 02:22:40 -0000	1.9
@@ -1 +1 @@
-puppet-0.20.0.tgz
+puppet-0.20.1.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/puppet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- puppet.spec	24 Oct 2006 00:23:09 -0000	1.8
+++ puppet.spec	14 Nov 2006 02:22:40 -0000	1.9
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.20.0
+Version: 0.20.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Nov 13 2006 David Lutterkort  - 0.20.1-1
+- New version
+
 * Mon Oct 23 2006 David Lutterkort  - 0.20.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 00:23:09 -0000	1.8
+++ sources	14 Nov 2006 02:22:40 -0000	1.9
@@ -1 +1 @@
-0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz
+5d4a35b197f6342742bbd3561aac99e8  puppet-0.20.1.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 02:23:10 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 19:23:10 -0700
Subject: rpms/puppet/FC-5 .cvsignore, 1.8, 1.9 puppet.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <200611140223.kAE2NA86002929@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2875/FC-5

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Oct 2006 00:21:28 -0000	1.8
+++ .cvsignore	14 Nov 2006 02:22:39 -0000	1.9
@@ -1 +1 @@
-puppet-0.20.0.tgz
+puppet-0.20.1.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- puppet.spec	24 Oct 2006 00:21:28 -0000	1.8
+++ puppet.spec	14 Nov 2006 02:22:39 -0000	1.9
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.20.0
+Version: 0.20.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Nov 13 2006 David Lutterkort  - 0.20.1-1
+- New version
+
 * Mon Oct 23 2006 David Lutterkort  - 0.20.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 00:21:28 -0000	1.8
+++ sources	14 Nov 2006 02:22:39 -0000	1.9
@@ -1 +1 @@
-0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz
+5d4a35b197f6342742bbd3561aac99e8  puppet-0.20.1.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 02:23:16 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 19:23:16 -0700
Subject: rpms/puppet/devel .cvsignore, 1.8, 1.9 puppet.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <200611140223.kAE2NGEA002939@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2875/devel

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Oct 2006 00:26:21 -0000	1.8
+++ .cvsignore	14 Nov 2006 02:22:46 -0000	1.9
@@ -1 +1 @@
-puppet-0.20.0.tgz
+puppet-0.20.1.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/puppet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- puppet.spec	24 Oct 2006 00:26:21 -0000	1.8
+++ puppet.spec	14 Nov 2006 02:22:46 -0000	1.9
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.20.0
+Version: 0.20.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Nov 13 2006 David Lutterkort  - 0.20.1-1
+- New version
+
 * Mon Oct 23 2006 David Lutterkort  - 0.20.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 00:26:21 -0000	1.8
+++ sources	14 Nov 2006 02:22:46 -0000	1.9
@@ -1 +1 @@
-0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz
+5d4a35b197f6342742bbd3561aac99e8  puppet-0.20.1.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 02:57:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 19:57:12 -0700
Subject: rpms/maxima/devel maxima.spec,1.44,1.45
Message-ID: <200611140257.kAE2vCH5003217@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3200

Modified Files:
	maxima.spec 
Log Message:
* Fri Nov 10 2006 Rex Dieter  5.10.0-8
- omit sbcl-disable-debugger patch (#214568)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- maxima.spec	26 Oct 2006 20:37:14 -0000	1.44
+++ maxima.spec	14 Nov 2006 02:56:42 -0000	1.45
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -181,7 +181,7 @@
 
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
-%patch3 -p1 -b .sbcl-disable-debugger
+#patch3 -p1 -b .sbcl-disable-debugger
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -385,6 +385,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter  5.10.0-8
+- omit sbcl-disable-debugger patch (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  5.10.0-7
 - respin for sbcl-0.9.18
 - fixup %%triggerun's



From fedora-extras-commits at redhat.com  Tue Nov 14 02:59:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 19:59:35 -0700
Subject: rpms/sbcl/FC-6 sbcl.spec,1.53,1.54
Message-ID: <200611140259.kAE2xZcK003287@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3271

Modified Files:
	sbcl.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  0.9.18-2
- fix awol contrib/sb-bsd-sockets (#214568)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-6/sbcl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sbcl.spec	8 Nov 2006 14:24:42 -0000	1.53
+++ sbcl.spec	14 Nov 2006 02:59:05 -0000	1.54
@@ -4,13 +4,13 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
+%define sbcl_verbose 1 
 %define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -24,7 +24,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -33,17 +33,16 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
 # or
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.12-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
 BuildRequires: sbcl
@@ -112,7 +111,8 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+#export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 # setup local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
@@ -125,9 +125,11 @@
 #define my_setarch ./my_setarch
 
 # WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?)
-# at least until a better solution is found
-# http://bugzilla.redhat.com/bugzilla/169506
+# http://bugzilla.redhat.com/169506
 touch contrib/sb-posix/test-passed
+# WORKAROUND sb-bsd-sockets test failures
+# http://bugzilla.redhat.com/214568
+touch contrib/sb-bsd-sockets/test-passed
 
 # trick contrib/ modules to use optflags too 
 export EXTRA_CFLAGS="$CFLAGS"
@@ -144,18 +146,21 @@
 
 
 %check
-# santity check, did sb-posix get built/included?
-# http://bugzilla.redhat.com/bugzilla/169506
-SB_POSIX=%{_libdir}/sbcl/sb-posix
-if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then
-  echo "${SB_POSIX} awol!"
-  exit 1
-fi
+ERROR=0
+# santity check, essential contrib modules get built/included? 
+CONTRIBS="sb-posix sb-bsd-sockets"
+for CONTRIB in $CONTRIBS ; do
+  if [ ! -d $RPM_BUILD_ROOT%{_libdir}/sbcl/$CONTRIB ]; then
+    echo "WARNING: ${CONTRIB} awol!"
+    ERROR=1 
+  fi
+done
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
 %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
+exit $ERROR
 
 
 %install
@@ -215,6 +220,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  0.9.18-2
+- fix awol contrib/sb-bsd-sockets (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  0.9.18-1
 - sbcl-0.9.18
 



From fedora-extras-commits at redhat.com  Tue Nov 14 03:00:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 20:00:40 -0700
Subject: rpms/sbcl/FC-5 sbcl.spec,1.50,1.51
Message-ID: <200611140300.kAE30exT003371@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3350

Modified Files:
	sbcl.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  0.9.18-2
- fix awol contrib/sb-bsd-sockets (#214568)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sbcl.spec	8 Nov 2006 14:41:17 -0000	1.50
+++ sbcl.spec	14 Nov 2006 03:00:09 -0000	1.51
@@ -4,13 +4,13 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
+%define sbcl_verbose 1 
 %define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -24,7 +24,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -33,17 +33,16 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
 # or
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.12-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
 BuildRequires: sbcl
@@ -112,7 +111,8 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+#export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 # setup local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
@@ -125,9 +125,11 @@
 #define my_setarch ./my_setarch
 
 # WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?)
-# at least until a better solution is found
-# http://bugzilla.redhat.com/bugzilla/169506
+# http://bugzilla.redhat.com/169506
 touch contrib/sb-posix/test-passed
+# WORKAROUND sb-bsd-sockets test failures
+# http://bugzilla.redhat.com/214568
+touch contrib/sb-bsd-sockets/test-passed
 
 # trick contrib/ modules to use optflags too 
 export EXTRA_CFLAGS="$CFLAGS"
@@ -144,18 +146,21 @@
 
 
 %check
-# santity check, did sb-posix get built/included?
-# http://bugzilla.redhat.com/bugzilla/169506
-SB_POSIX=%{_libdir}/sbcl/sb-posix
-if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then
-  echo "${SB_POSIX} awol!"
-  exit 1
-fi
+ERROR=0
+# santity check, essential contrib modules get built/included? 
+CONTRIBS="sb-posix sb-bsd-sockets"
+for CONTRIB in $CONTRIBS ; do
+  if [ ! -d $RPM_BUILD_ROOT%{_libdir}/sbcl/$CONTRIB ]; then
+    echo "WARNING: ${CONTRIB} awol!"
+    ERROR=1 
+  fi
+done
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
 %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
+exit $ERROR
 
 
 %install
@@ -215,6 +220,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  0.9.18-2
+- fix awol contrib/sb-bsd-sockets (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  0.9.18-1
 - sbcl-0.9.18
 



From fedora-extras-commits at redhat.com  Tue Nov 14 03:05:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 20:05:59 -0700
Subject: rpms/libassuan/FC-6 .cvsignore, 1.7, 1.8 libassuan.spec, 1.20,
	1.21 sources, 1.7, 1.8 libassuan-0.9.3-m4-2.patch, 1.1,
	NONE libassuan-0.9.3-m4.patch, 1.1, NONE
Message-ID: <200611140305.kAE35xgu006513@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6491

Modified Files:
	.cvsignore libassuan.spec sources 
Removed Files:
	libassuan-0.9.3-m4-2.patch libassuan-0.9.3-m4.patch 
Log Message:
* Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
- 1.0.0
- rename -devel -> -static (+Obsoletes/Provides: %name-devel)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Oct 2006 18:37:19 -0000	1.7
+++ .cvsignore	14 Nov 2006 03:05:29 -0000	1.8
@@ -1,5 +1,4 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-0.9.2.tar.bz2.sig
-libassuan-0.9.2.tar.bz2
-libassuan-0.9.3.tar.bz2.sig
+libassuan-1.0.0.tar.bz2
+libassuan-1.0.0.tar.bz2.sig


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/libassuan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libassuan.spec	18 Oct 2006 14:07:08 -0000	1.20
+++ libassuan.spec	14 Nov 2006 03:05:29 -0000	1.21
@@ -1,34 +1,32 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 0.9.3
-Release: 2%{?dist}
+Version: 1.0.0 
+Release: 1%{?dist}
 
 License: LGPL
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libassuan-0.9.3-m4.patch
-Patch2: libassuan-0.9.3-m4-2.patch
-
 BuildRequires: pth-devel
 
 %description
 This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
 packages.
 
-%package devel
+%package static 
 Summary: GnuPG IPC library 
 Group: Development/Libraries
 Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Provides: %{name}-static = %{version}-%{release}
-%description devel
-This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
+Obsoletes: %{name}-devel < %{version}-%{release}
+Provides:  %{name}-devel = %{version}-%{release}
+%description static 
+This is the IPC static library used by GnuPG 1.9/2, GPGME and a few other
 packages.
 
 This package contains files needed to develop applications using %{name}.
@@ -37,9 +35,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .m4patch
-%patch2 -p0 -b .m4patch-2
-
 
 %build
 #ifarch x86_64
@@ -59,14 +54,14 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
-%check || :
+%check
 make check
 
 
-%post devel
+%post static 
 /sbin/install-info %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
 
-%postun devel
+%postun static 
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
 fi
@@ -76,7 +71,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files devel
+%files static 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
@@ -87,6 +82,10 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
+- 1.0.0
+- rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
+
 * Wed Oct 18 2006 Rex Dieter  - 0.9.3-2
 - another libassuan.m4 patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Oct 2006 18:37:19 -0000	1.7
+++ sources	14 Nov 2006 03:05:29 -0000	1.8
@@ -1,2 +1,2 @@
-a2e3cb948de5159728e73d53529ae7ad  libassuan-0.9.3.tar.bz2.sig
-60add4aebf1961436da3a470d6ac833c  libassuan-0.9.3.tar.bz2
+f1580ef149e629629a9639a5afdb5908  libassuan-1.0.0.tar.bz2
+c00497327001dcccf7d3a952f56030e4  libassuan-1.0.0.tar.bz2.sig


--- libassuan-0.9.3-m4-2.patch DELETED ---


--- libassuan-0.9.3-m4.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 03:22:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 20:22:23 -0700
Subject: rpms/eric/devel .cvsignore, 1.3, 1.4 eric.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <200611140322.kAE3MNYY006875@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6855

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
* Mon Nov 13 2006 Rex Dieter  5.9.2-1
- 5.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Jul 2006 12:16:56 -0000	1.3
+++ .cvsignore	14 Nov 2006 03:21:53 -0000	1.4
@@ -1,3 +1,4 @@
 gen_python_api_20050605.tar.gz
 gen_sip_api_20060711.tar.gz
 eric-3.9.1.tar.gz
+eric-3.9.2.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eric.spec	8 Nov 2006 14:11:59 -0000	1.6
+++ eric.spec	14 Nov 2006 03:21:53 -0000	1.7
@@ -4,8 +4,8 @@
 
 Name:	 eric
 Summary: Python IDE
-Version: 3.9.1
-Release: 4%{?dist}%{?kde}
+Version: 3.9.2
+Release: 1%{?dist}
 
 License: GPL
 Group:	 Development/Tools
@@ -15,7 +15,6 @@
 BuildArch: noarch
 
 Source1: http://www.die-offenbachs.de/detlev/contributions/gen_python_api_20050605.tar.gz
-#Source2: http://www.die-offenbachs.de/detlev/contributions/gen_sip_api_20060123.tar.gz
 Source2: http://www.die-offenbachs.de/detlev/contributions/gen_sip_api_20060711.tar.gz
 
 Source10: eric3.desktop
@@ -140,6 +139,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  5.9.2-1
+- 5.9.2
+
 * Mon Nov 06 2006 Rex Dieter  5.9.1-4
 - BR: PyQt-qscintilla-devel
 - (unversioned) Requires: PyQt-qscintilla


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jul 2006 12:16:56 -0000	1.3
+++ sources	14 Nov 2006 03:21:53 -0000	1.4
@@ -1,3 +1,3 @@
 fcea430a92e9d88089d91ce3099db282  gen_python_api_20050605.tar.gz
 8b19482530d51c47a02e43a4ca2bbb79  gen_sip_api_20060711.tar.gz
-7f62b297fa094e547faca7966ccd133d  eric-3.9.1.tar.gz
+b3168b9ccf1625950b6a8dcfbdfc7d35  eric-3.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 03:25:25 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:25:25 -0700
Subject: rpms/ruby-activesupport - New directory
Message-ID: <200611140325.kAE3PPBJ007001@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/ruby-activesupport

Log Message:
Directory /cvs/extras/rpms/ruby-activesupport added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 03:25:31 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:25:31 -0700
Subject: rpms/ruby-activesupport/devel - New directory
Message-ID: <200611140325.kAE3PVmU007024@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/ruby-activesupport/devel

Log Message:
Directory /cvs/extras/rpms/ruby-activesupport/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 03:25:56 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:25:56 -0700
Subject: rpms/ruby-activesupport Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611140325.kAE3PuHB007068@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7061

Added Files:
	Makefile import.log 
Log Message:
Setup of module ruby-activesupport


--- NEW FILE Makefile ---
# Top level Makefile for module ruby-activesupport
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  Tue Nov 14 03:25:58 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:25:58 -0700
Subject: rpms/ruby-activesupport/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611140325.kAE3PwIB007087@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7061/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ruby-activesupport


--- 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 Nov 14 03:27:09 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:27:09 -0700
Subject: rpms/ruby-activesupport import.log,1.1,1.2
Message-ID: <200611140327.kAE3R9Ke007183@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7151

Modified Files:
	import.log 
Log Message:
auto-import ruby-activesupport-1.3.1-2 on branch devel from ruby-activesupport-1.3.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ruby-activesupport/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 03:25:56 -0000	1.1
+++ import.log	14 Nov 2006 03:26:38 -0000	1.2
@@ -0,0 +1 @@
+ruby-activesupport-1_3_1-2:HEAD:ruby-activesupport-1.3.1-2.src.rpm:1163474790



From fedora-extras-commits at redhat.com  Tue Nov 14 03:27:10 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:27:10 -0700
Subject: rpms/ruby-activesupport/devel ruby-activesupport.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611140327.kAE3RAsP007187@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7151/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ruby-activesupport.spec 
Log Message:
auto-import ruby-activesupport-1.3.1-2 on branch devel from ruby-activesupport-1.3.1-2.src.rpm


--- NEW FILE ruby-activesupport.spec ---
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%define rname activesupport
Name:           ruby-%{rname}
Version:        1.3.1
Release:        2%{?dist}
Summary:        Utility classes and extension to Ruby's standard library
Group:          Development/Languages

License:        MIT
URL:            http://rubyforge.org/projects/activesupport/
Source0:        http://rubyforge.org/frs/download.php/9563/%{rname}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  ruby
Requires:       ruby(abi) = 1.8
Provides:       ruby(active_support) = 1.3.1

%description
Utility classes and extension to the standard library that were
required by Rails, but found of general use.

%prep
%setup -q -n %{rname}-%{version}

%build
export CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{ruby_sitelib}/
cp -pr lib/* $RPM_BUILD_ROOT/%{ruby_sitelib}/
chmod a-x $RPM_BUILD_ROOT/%{ruby_sitelib}/active_support/breakpoint.rb
find $RPM_BUILD_ROOT/%{ruby_sitelib} -type f -name '._*' | xargs rm

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG
%{ruby_sitelib}/active_support.rb
%{ruby_sitelib}/active_support


%changelog
* Mon Nov  6 2006 David Lutterkort  - 1.3.1-2
- Version the ruby(active_support) provides

* Wed Sep 20 2006  David Lutterkort  - 1.3.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-activesupport/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 03:25:57 -0000	1.1
+++ .cvsignore	14 Nov 2006 03:26:40 -0000	1.2
@@ -0,0 +1 @@
+activesupport-1.3.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-activesupport/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 03:25:57 -0000	1.1
+++ sources	14 Nov 2006 03:26:40 -0000	1.2
@@ -0,0 +1 @@
+4e3fce3bb07e1f66e6f40406291e3266  activesupport-1.3.1.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 03:29:48 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:29:48 -0700
Subject: owners owners.list,1.1952,1.1953
Message-ID: <200611140329.kAE3Tmx6007254@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7224

Modified Files:
	owners.list 
Log Message:
Added ruby-activesupport


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1952
retrieving revision 1.1953
diff -u -r1.1952 -r1.1953
--- owners.list	13 Nov 2006 22:54:28 -0000	1.1952
+++ owners.list	14 Nov 2006 03:29:18 -0000	1.1953
@@ -2062,6 +2062,7 @@
 Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|ruby-activesupport|Utility classes for Ruby|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-bdb|A Ruby interface to Berkeley DB|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-mysql|A Ruby interface to MySQL|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-postgres|A Ruby interface to Postgres|dlutter at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 03:34:08 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:34:08 -0700
Subject: rpms/ruby-activesupport/devel ruby-activesupport.spec,1.1,1.2
Message-ID: <200611140334.kAE3Y82i007318@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298

Modified Files:
	ruby-activesupport.spec 
Log Message:
Add dependency on ruby-irb (breakpoint.rb needs it)


Index: ruby-activesupport.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-activesupport/devel/ruby-activesupport.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-activesupport.spec	14 Nov 2006 03:26:40 -0000	1.1
+++ ruby-activesupport.spec	14 Nov 2006 03:33:38 -0000	1.2
@@ -2,7 +2,7 @@
 %define rname activesupport
 Name:           ruby-%{rname}
 Version:        1.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility classes and extension to Ruby's standard library
 Group:          Development/Languages
 
@@ -13,7 +13,7 @@
 
 BuildArch:      noarch
 BuildRequires:  ruby
-Requires:       ruby(abi) = 1.8
+Requires:       ruby(abi) = 1.8 ruby-irb
 Provides:       ruby(active_support) = 1.3.1
 
 %description
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 David Lutterkort  - 1.3.1-3
+- Add dependency on ruby-irb (breakpoint.rb needs it)
+
 * Mon Nov  6 2006 David Lutterkort  - 1.3.1-2
 - Version the ruby(active_support) provides
 



From fedora-extras-commits at redhat.com  Tue Nov 14 03:37:08 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 13 Nov 2006 20:37:08 -0700
Subject: rpms/lib3ds/devel lib3ds.spec,1.11,1.12
Message-ID: <200611140337.kAE3b8wH007418@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7402

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
- Add Provides: *-static.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/lib3ds.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lib3ds.spec	5 Sep 2006 09:09:13 -0000	1.11
+++ lib3ds.spec	14 Nov 2006 03:36:38 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -42,6 +42,7 @@
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
+Provides:	lib3ds-static = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
@@ -72,6 +73,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
+- Add Provides: *-static.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-9
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 14 03:49:58 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:49:58 -0700
Subject: rpms/php-pear-Structures-DataGrid - New directory
Message-ID: <200611140349.kAE3nwWo007526@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7522/php-pear-Structures-DataGrid

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 03:50:04 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:50:04 -0700
Subject: rpms/php-pear-Structures-DataGrid/devel - New directory
Message-ID: <200611140350.kAE3o40L007540@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7522/php-pear-Structures-DataGrid/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 03:50:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:50:15 -0700
Subject: rpms/php-pear-Structures-DataGrid Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200611140350.kAE3oF3p007571@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7565

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Structures-DataGrid


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Structures-DataGrid
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  Tue Nov 14 03:50:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:50:16 -0700
Subject: rpms/php-pear-Structures-DataGrid/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611140350.kAE3oGAP007588@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7565/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Structures-DataGrid


--- 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 Nov 14 03:51:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:51:05 -0700
Subject: rpms/php-pear-Structures-DataGrid import.log,1.1,1.2
Message-ID: <200611140351.kAE3p5Dq007663@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7629

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Structures-DataGrid-0.7.2-1 on branch devel from php-pear-Structures-DataGrid-0.7.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 03:50:15 -0000	1.1
+++ import.log	14 Nov 2006 03:50:34 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Structures-DataGrid-0_7_2-1:HEAD:php-pear-Structures-DataGrid-0.7.2-1.src.rpm:1163476232



From fedora-extras-commits at redhat.com  Tue Nov 14 03:51:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:51:05 -0700
Subject: rpms/php-pear-Structures-DataGrid/devel
	php-pear-Structures-DataGrid.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611140351.kAE3p58X007667@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7629/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Structures-DataGrid.spec 
Log Message:
auto-import php-pear-Structures-DataGrid-0.7.2-1 on branch devel from php-pear-Structures-DataGrid-0.7.2-1.src.rpm


--- NEW FILE php-pear-Structures-DataGrid.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Structures_DataGrid

Name:           php-pear-Structures-DataGrid
Version:        0.7.2
Release:        1%{?dist}
Summary:        A tabular structure for converting data

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Structures_DataGrid
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This package offers a toolkit to render out a datagrid in HTML format as well
as many other formats such as an XML Document, an Excel Spreadsheet, an XUL
Document and more. It also offers paging and sorting functionallity to limit
the data that is presented and processed. This concept is based on the .NET
Framework DataGrid control and works very well with database and XML result
sets.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/*


%changelog
* Sun Oct 29 2006 Christopher Stone  0.7.2-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 03:50:16 -0000	1.1
+++ .cvsignore	14 Nov 2006 03:50:35 -0000	1.2
@@ -0,0 +1 @@
+Structures_DataGrid-0.7.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 03:50:16 -0000	1.1
+++ sources	14 Nov 2006 03:50:35 -0000	1.2
@@ -0,0 +1 @@
+bb51347f4b792d733c22f6ffd594766c  Structures_DataGrid-0.7.2.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 03:53:04 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:53:04 -0700
Subject: owners owners.list,1.1953,1.1954
Message-ID: <200611140353.kAE3r4P0007720@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7704

Modified Files:
	owners.list 
Log Message:
php-pear-Structures-DataGrid


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1953
retrieving revision 1.1954
diff -u -r1.1953 -r1.1954
--- owners.list	14 Nov 2006 03:29:18 -0000	1.1953
+++ owners.list	14 Nov 2006 03:52:34 -0000	1.1954
@@ -1808,6 +1808,7 @@
 Fedora Extras|php-pear-PHP-CompatInfo|Find out version and extensions required for a piece of code to run|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 04:10:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:10:18 -0700
Subject: rpms/kaffeine - New directory
Message-ID: <200611140410.kAE4AIJ7010921@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10917/kaffeine

Log Message:
Directory /cvs/extras/rpms/kaffeine added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 04:10:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:10:24 -0700
Subject: rpms/kaffeine/devel - New directory
Message-ID: <200611140410.kAE4AO3G010943@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10917/kaffeine/devel

Log Message:
Directory /cvs/extras/rpms/kaffeine/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 04:10:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:10:36 -0700
Subject: rpms/kaffeine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611140410.kAE4Aavm010974@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10968

Added Files:
	Makefile import.log 
Log Message:
Setup of module kaffeine


--- NEW FILE Makefile ---
# Top level Makefile for module kaffeine
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  Tue Nov 14 04:10:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:10:42 -0700
Subject: rpms/kaffeine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611140410.kAE4AgEp010991@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10968/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kaffeine


--- 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 Nov 14 04:11:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:11:36 -0700
Subject: rpms/kaffeine import.log,1.1,1.2
Message-ID: <200611140411.kAE4BaU2011068@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11036

Modified Files:
	import.log 
Log Message:
auto-import kaffeine-0.8.2-5 on branch devel from kaffeine-0.8.2-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 04:10:36 -0000	1.1
+++ import.log	14 Nov 2006 04:11:05 -0000	1.2
@@ -0,0 +1 @@
+kaffeine-0_8_2-5:HEAD:kaffeine-0.8.2-5.src.rpm:1163477462



From fedora-extras-commits at redhat.com  Tue Nov 14 04:11:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:11:36 -0700
Subject: rpms/kaffeine/devel kaffeine.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611140411.kAE4Babp011072@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11036/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kaffeine.spec 
Log Message:
auto-import kaffeine-0.8.2-5 on branch devel from kaffeine-0.8.2-5.src.rpm


--- NEW FILE kaffeine.spec ---

%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
%define _with_gstreamer --with-gstreamer
%endif

%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
%define gst 08 
BuildRequires: libXtst-devel libXinerama-devel
%endif

## define to build nonfree bits (for that other repo)
#define nonfree 1

%if "%{?nonfree:1}" == "1"

Name:    kaffeine-extras-nonfree

%define  _with_lame --with-lame
Requires: kaffeine = %{version}
Patch1: kaffeine-0.8.2-codecs.patch
# split occurred here
Conflicts: kaffeine < 0.8.2-2

%else
# Fedora Review: http://bugzilla.redhat.com/213432
Name:    kaffeine
%endif

Version: 0.8.2
Release: 5%{?dist}

License: GPL
Summary: Xine-based media player
Group:   Applications/Multimedia
URL:     http://kaffeine.sourceforge.net/
Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
%{!?_without_dvb:BuildRequires: glibc-kernheaders }
%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
# not included in Extras, disabled
%{?_with_lame:BuildRequires: lame-devel}

## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
## everybondy should be using kde >= 3.5.4 by now... (:
#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
#if "%{?kdelibs_ver}" >= "3.5.4"
%define x_mplayer2_hack 1
Requires: kdelibs >= 6:3.5.4
#or
#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
#endif

%if "%{?nonfree:1}" == "1" 
%if "%{?fedora}" > "4"
# can view dvd's if libdvdcss is available
Requires(hint): libdvdcss
# extra/nonfree codec support
Requires(hint): xine-lib-extras-nonfree
%endif

%description
Nonfree support bits for kaffeine, including DVD playback, MP3
decoding, as well as extended audio/video codec support.

%else
%description
Kaffeine is a xine-based media player for KDE.  It plays back CDs,
and VCDs, and can decode all (local or streamed) multimedia formats 
supported by xine-lib.
Additionally, Kaffeine is fully integrated in KDE, it supports drag
and drop and provides an editable playlist, a bookmark system, a
Konqueror plugin, OSD and much more.

%package devel
Summary: Development files for %{name}
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: kdelibs-devel
%description devel
%{summary}.
%endif


%prep
%setup -q -n kaffeine-%{version}

%{?nonfree:%patch1 -p1 -b .codecs}

# fix perms on docs
chmod -x AUTHORS ChangeLog INSTALL TODO ||:


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh

# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS

%configure \
  --disable-rpath \
  --disable-gcc-hidden-visibility \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking --enable-final \
  %{?_without_dvb} \
  %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
  %{?_with_lame} %{!?_with_lame:--without-lame}

%if "%{?nonfree:1}" == "1"
make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
%else
make %{?_smp_mflags}
%endif


%install
rm -rf $RPM_BUILD_ROOT

%if "%{?nonfree:1}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
%else
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install \
  --vendor="" \
  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop

## File lists
# locale's
%find_lang %{name} 
# HTML (1.0)
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
  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

# Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%if "%{?nonfree:1}" == "1"
%files 
%defattr(-,root,root,-)
%{_libdir}/kde3/libkaffeinemp3lame.*
%{_datadir}/services/kaffeinemp3lame.desktop
%else

%post
/sbin/ldconfig ||:
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:

%postun
/sbin/ldconfig ||:
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
%{_libdir}/lib*.so.*
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
%{_datadir}/apps/kaffeine/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/profiles/
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/service*/*.desktop

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/lib*.so
%endif


%changelog
* Sat Nov 04 2006 Rex Dieter  0.8.2-6
- %%doc README

* Fri Nov 03 2006 Rex Dieter  0.8.2-5
- fix chmod so it actually works.

* Thu Nov 02 2006 Rex Dieter  0.8.2-4
- chmod -x AUTHORS ChangeLog TODO
- use rel symlinks under %%_docdir

* Wed Nov 01 2006 Rex Dieter  0.8.2-3
- update %%description to not mention any specific mm containers 
  (like AVI, WMV).

* Wed Nov 01 2006 Rex Dieter  0.8.2-2
- fixup for Extras
- support building kaffeine-extras-nonfree for that other repo. 

* Tue Sep 12 2006 Rex Dieter  0.8.2-1
- 0.8.2

* Thu Aug 10 2006 Rex Dieter  0.8.1-5
- for kdelibs >= 3.5.4, omit 
  /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)

* Thu May 18 2006 Rex Dieter  0.8.1-4
- BR: libXtst-devel libXinerama-devel (fc5+)

* Tue Apr 25 2006 Rex Dieter  0.8.1-3
- (re)enable gstreamer support (fc3+)

* Mon Apr 24 2006 Rex Dieter  0.8.1-1
- 0.8.1
- cdda patch (upsgream bug #1463542)

* Sat Mar 25 2006 Rex Dieter  0.7.1-4
- drop --vendor=livna
- fdo icon spec fix
- kaffeine-0.7.x-CVE-2006-0051.patch

* Thu Mar 09 2006 Andreas Bierfert 
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Thu Nov 03 2005 Rex Dieter  - 0.7.1-0.lvn.3
- update-desktop-database (#645)
- -devel pkg (#645)
- -gstreamer subpkg, marked experimental (due to upstream #1254363)
- omit -desktop patch (#645)
- use desktop-file-install (#645)

* Wed Sep  7 2005 Thorsten Leemhuis  - 0:0.7.1-0.lvn.2
- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64

* Sun Sep  4 2005 Ville Skytt??  - 0:0.7.1-0.lvn.1
- 0.7.1, gcc visibility hack no longer needed.

* Mon Aug  8 2005 Ville Skytt??  - 0:0.7-0.lvn.1
- 0.7, now with DVB support (FC4+ only).
- GStreamer support disabled by default due to upstream #1254363, rebuild
  with "--with gstreamer" to enable.
- Quick and dirty workaround for upstream #1253989.

* Sun Mar 20 2005 Ville Skytt??  - 0:0.6-0.lvn.1
- 0.6.

* Thu Dec 23 2004 Ville Skytt??  - 0:0.5-0.lvn.1
- Update to 0.5.

* Fri Nov  5 2004 Ville Skytt??  - 0:0.5-0.lvn.0.1.rc2
- Update to 0.5rc2.

* Sun Oct  3 2004 Ville Skytt??  - 0:0.5-0.lvn.0.1.rc1
- Update to 0.5rc1.
- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
- Purge libselinux workarounds, no longer needed.
- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
- Disable dependency tracking to speed up the build.
- Provide -devel.

* Sat May 22 2004 Ville Skytt??  - 0:0.4.3-0.lvn.1.b
- Update to 0.4.3b.
- Add workaround for https://bugzilla.redhat.com/123853

* Mon May  3 2004 Ville Skytt??  - 0:0.4.3-0.lvn.1
- Update to 0.4.3.

* Wed Mar 24 2004 Ville Skytt??  - 0:0.4.2-0.lvn.1
- Update to 0.4.2.

* Sat Jan 17 2004 Ville Skytt??  - 0:0.4.1-0.lvn.1
- Update to 0.4.1, patches applied upstream.
- Update description.

* Mon Nov 17 2003 Ville Skytt??  - 0:0.4-0.lvn.1
- Update to 0.4.
- Disable rpath.
- Add Gnome icon.

* Tue Jul 29 2003 Ville Skytt??  - 0:0.3.2-0.fdr.2
- Own directories under %%{_datadir}/icons.

* Tue Jul  8 2003 Ville Skytt??  - 0:0.3.2-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 04:10:42 -0000	1.1
+++ .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
@@ -0,0 +1 @@
+kaffeine-0.8.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 04:10:42 -0000	1.1
+++ sources	14 Nov 2006 04:11:06 -0000	1.2
@@ -0,0 +1 @@
+bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 04:14:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:14:08 -0700
Subject: owners owners.list,1.1954,1.1955
Message-ID: <200611140414.kAE4E82G011127@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11111

Modified Files:
	owners.list 
Log Message:
+kaffeine



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1954
retrieving revision 1.1955
diff -u -r1.1954 -r1.1955
--- owners.list	14 Nov 2006 03:52:34 -0000	1.1954
+++ owners.list	14 Nov 2006 04:13:37 -0000	1.1955
@@ -768,6 +768,7 @@
 Fedora Extras|kadischi|An application for Fedora-based LiveCD generation|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kadu|Gadu-Gadu client for online messaging|mr.ecik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|kadu-theme|Set of themes for Kadu|mr.ecik at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|kaffeine|Xine-based media player|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kanatest|Hiragana and Katakana drill tool|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|kannel|WAP and SMS gateway|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 05:44:56 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:44:56 -0700
Subject: rpms/cups-pdf - New directory
Message-ID: <200611140544.kAE5iuYT014644@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14640/cups-pdf

Log Message:
Directory /cvs/extras/rpms/cups-pdf added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 05:45:02 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:45:02 -0700
Subject: rpms/cups-pdf/devel - New directory
Message-ID: <200611140545.kAE5j2xT014659@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14640/cups-pdf/devel

Log Message:
Directory /cvs/extras/rpms/cups-pdf/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 05:45:28 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:45:28 -0700
Subject: rpms/cups-pdf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611140545.kAE5jSlH014709@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14685/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cups-pdf


--- 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 Nov 14 05:45:23 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:45:23 -0700
Subject: rpms/cups-pdf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611140545.kAE5jNNA014691@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14685

Added Files:
	Makefile import.log 
Log Message:
Setup of module cups-pdf


--- NEW FILE Makefile ---
# Top level Makefile for module cups-pdf
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  Tue Nov 14 05:46:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:46:55 -0700
Subject: rpms/cups-pdf import.log,1.1,1.2
Message-ID: <200611140546.kAE5kta9014807@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14769

Modified Files:
	import.log 
Log Message:
auto-import cups-pdf-2.4.2-2.fc7 on branch devel from cups-pdf-2.4.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 05:45:23 -0000	1.1
+++ import.log	14 Nov 2006 05:46:24 -0000	1.2
@@ -0,0 +1 @@
+cups-pdf-2_4_2-2_fc7:HEAD:cups-pdf-2.4.2-2.fc7.src.rpm:1163483175



From fedora-extras-commits at redhat.com  Tue Nov 14 05:46:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:46:55 -0700
Subject: rpms/cups-pdf/devel INSTALL.cups-pdf, NONE,
	1.1 INSTALL.fedora.cups-pdf, NONE, 1.1 cups-pdf-conf.patch, NONE,
	1.1 cups-pdf.spec, NONE, 1.1 cups_pdf-2.4.2.te, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611140546.kAE5ktSp014811@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14769/devel

Modified Files:
	.cvsignore sources 
Added Files:
	INSTALL.cups-pdf INSTALL.fedora.cups-pdf cups-pdf-conf.patch 
	cups-pdf.spec cups_pdf-2.4.2.te 
Log Message:
auto-import cups-pdf-2.4.2-2.fc7 on branch devel from cups-pdf-2.4.2-2.fc7.src.rpm


--- NEW FILE INSTALL.cups-pdf ---
# INSTALL instructions for the rpm version of cups-pdf

  Either you got a binary RPM "cups-pdf_version.ix86.rpm" or a Source RPM (SRPM) "cups-pdf-version.src.rpm"
  depending on this you have to proceed to the following steps.

# CONTENT

1) installing a binary RPM
2) installing a binary SRPM
3) restart CUPS and take a look at the logfiles


1) Installation of a binary RPM
  This package is build as relocatable RPM; this means, that you can set the path, where
  the binary of cups-pdf is installed. This is needed if you installed you CUPS e.g. with the prefix
  /usr/local and not in the standard path /usr/

  The RPM has to be installed with
  $ rpm -i cups-pdf-version.ix86.rpm
  (where "version" and the "x" have to be replaced with the real names)

  if you want to place the binary in an other path than /usr/libs/cups/backend, type
  $ rpm -i --prefix=/usr/local/ cups-pdf-version.ix86.rpm



2) Installation of a SRPM - "for the brave" of you
  First you have to recompile the SRPM with
  $ rpm --rebuild --target ix86 cups-pdf-version.src.rpm
  after successfull compilation you'll find the binaray RPM in you RPMdir
  e.g. under RedHat in /usr/src/redhat/RPMS/ix86/

  "for the brave" of you: passing compiler-flags to the SRPM is possible through
  $ rpm --rebuild --define "optflags -O3 -march=i686 -mcpu=i686" --target i686 cups-pdf-version.src.rpm
  for Redhat 9.0 you have to use
  $ rpmbuild --rebuild --define "optflags -O3 -march=i686 -mcpu=i686" --target i686 cups-pdf-version.src.rpm
  after successfull compilation you'll find the binaray RPM in you RPMdir
  e.g. under RedHat in /usr/src/redhat/RPMS/ix86/

  if you want to modify some paths, to have to extract the SPEC-File, then extract the Sources
  cups-pdf_version.tar.gz edit config.h then edit the same values in cups-pdf.spec, put the modified
  config.h in the archiv cups-pdf_version.tar.gz and recompile with
  $ rpm -ba --define "optflags -O3 -march=ix86 -mcpu=ix86" cups-pdf.spec

3) Restarting CUPS / Logfiles
  please restart CUPS and take a look into the cups-pdf error-log (usually located in /var/log/cups)
  you should see in the file cups-pdf_log something like
  Tue May 27 04:47:46 2003  [DEBUG] initialization finished
  Tue May 27 04:47:46 2003  [STATUS] identification string sent
  All right, you're ready to install a writer and ready to enjoy !

Please report all errors and suggestions around the RPM-Edition to the author of this document.

ver0.2 - 2003/09/09 Karlsruhe (Germany) Dirk Schwier 


--- NEW FILE INSTALL.fedora.cups-pdf ---
This cups-pdf RPM is designed to create a Cups-PDF virtual printer
during the installation, but only if cups is running.

You can create the virtual pinter using :
    /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m PostscriptColor.ppd -E

You can remove the virtual printer using
    /usr/sbin/lpadmin -x Cups-PDF


cups-pdf-conf.patch:

--- NEW FILE cups-pdf-conf.patch ---
--- extra/cups-pdf.conf.orig	2005-12-23 18:28:15.000000000 +0100
+++ extra/cups-pdf.conf	2005-12-23 23:07:22.000000000 +0100
@@ -41,6 +41,7 @@
 ### Default: /var/spool/cups-pdf/${USER}
 
 #Out /var/spool/cups-pdf/${USER}
+Out ${HOME}/Desktop
 
 ### Key: AnonDirName
 ##  ABSOLUTE path for anonymously created PDF files


--- NEW FILE cups-pdf.spec ---
# Module SElinux
%define module cups_pdf

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}
Group:          Applications/Publishing
Source0:        http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz
Source1:        INSTALL.cups-pdf
Source2:        INSTALL.fedora.cups-pdf
Source3:        %{module}-%{version}.te
Patch1:         cups-pdf-conf.patch
URL:            http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/
License:        GPL
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ghostscript, cups, policycoreutils
BuildRequires:  selinux-policy-devel, checkpolicy, cups-devel

# These are the defaults paths defined in config.h
# CUPS-PDF spool directory
%define CPSPOOL   %{_localstatedir}/spool/cups-pdf/SPOOL

# CUPS-PDF output directory
%define CPOUT     %{_localstatedir}/spool/cups-pdf

# CUPS-PDF log directory
%define CPLOG     %{_localstatedir}/log/cups

# CUPS-PDF cups-pdf.conf config file
%define ETCCUPS   %(cups-config --serverroot 2>/dev/null || echo %{_sysconfdir}/cups)

# Additional path to backend directory
%define CPBACKEND %(cups-config --serverbin  2>/dev/null || echo %{_libdir}/cups)/backend


%description
"cups-pdf" is a backend script for use with CUPS - the "Common UNIX Printing
System" (see more for CUPS under http://www.cups.org/). 
"cups-pdf" uses the ghostscript pdfwrite device to produce PDF Files.

This version has been modified to store the PDF files on the Desktop of the 
user. This behavior can be changed by editing the configuration file.

%description -l fr
"cups-pdf" est un script de traitement CUPS - le "Common UNIX Printing System"
(plus d'informations sur CUPS ?? l'adresse http://www.cups.org/). 
"cups-pdf" utilise ghostscript pour construire des fichiers au format PDF.

Cette version a ??t?? modifi??e pour produire les fichiers PDF sur le bureau
de l'utilisateur (dossier Desktop du r??pertoire d'accueil de l'utilisateur).
Ce comportement peut ??tre modifi?? en ??ditant le fichier de configuration.

%prep
echo CIBLE = %{name}-%{version}-%{release}
%setup -q -n %{name}-%{version}
%{__cp} %{SOURCE1} INSTALL
%{__cp} %{SOURCE2} INSTALL.fedora

# Relocate output on user's Desktop
%patch1 -p0

%build
pushd src
%{__cc} $RPM_OPT_FLAGS -o cups-pdf cups-pdf.c
popd

# SElinux 
%{__mkdir} selinux
pushd selinux
%{__cp} %{SOURCE3} %{module}.te
echo "%{CPOUT}   system_u:object_r:print_spool_t:s0"  >%{module}.fc
echo "%{CPSPOOL} system_u:object_r:print_spool_t:s0" >>%{module}.fc
make -f %{_datadir}/selinux/devel/Makefile
popd

# Avoid perl dependencies
%{__chmod} -x contrib/pstitleiconv-0.2/pstitleiconv
%{__chmod} -x contrib/cups-pdf-dispatch-0.1/cups-pdf-dispatch

%install
rm -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{CPBACKEND}
%{__mkdir_p} %{buildroot}%{CPSPOOL}
%{__mkdir_p} %{buildroot}%{CPOUT}
%{__mkdir_p} %{buildroot}%{CPLOG}
%{__mkdir_p} %{buildroot}%{CPBACKEND}
%{__mkdir_p} %{buildroot}%{ETCCUPS}
%{__mkdir_p} %{buildroot}%{_datadir}/cups/model/
%{__install} -m644 extra/PostscriptColor.ppd %{buildroot}%{_datadir}/cups/model/PostscriptColor.ppd
# %{__gzip} -d %{buildroot}%{_datadir}/cups/model/PostscriptColor.ppd.gz
%{__install} -m644 extra/cups-pdf.conf %{buildroot}%{ETCCUPS}/cups-pdf.conf
%{__install} -m755 src/cups-pdf %{buildroot}%{CPBACKEND}

# SElinux 
%{__mkdir_p} %{buildroot}%{_datadir}/selinux/packages/%{name}
%{__install} -m644 selinux/%{module}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{module}.pp

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc ChangeLog COPYING README INSTALL INSTALL.fedora contrib/
%dir %{CPSPOOL}
%dir %{CPOUT}
%attr(700, root, root) %{CPBACKEND}/cups-pdf
%config(noreplace) %{ETCCUPS}/cups-pdf.conf
%{_datadir}/cups/model/PostscriptColor.ppd
%{_datadir}/selinux/packages/%{name}/%{module}.pp

%post
# Install/update Selinux policy
semodule -i %{_datadir}/selinux/packages/%{name}/%{module}.pp || :
fixfiles -R %{name} restore

# First install : create the printer if cupsd is running
if [ "$1" -eq "1" -a -f "%{_var}/run/cupsd.pid" ]
then
    if [ -d /proc/$(cat %{_var}/run/cupsd.pid) ]
    then
        /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m PostscriptColor.ppd -E || :
    fi
fi

%postun
if [ "$1" -eq "0" ]; then
    # Delete the printer
    /usr/sbin/lpadmin -x Cups-PDF || :

    # Remove the SElinux policy.
    semodule -r %{module} || :
fi

%changelog
* Mon Nov 13 2006 Remi Collet  2.4.2-2
- review comments (URL, INSTALL.fedora as Source2, descr. rewrap)

* Mon Nov 13 2006 Remi Collet  2.4.2-1
- clean spec for Extras
- don't use "service cups restart", only test if cups is running

* Tue Oct 24 2006 Remi Collet  2.4.2-1.fc6.remi
- FC6 build

* Sat Oct  7 2006 Remi Collet  2.4.2-1.fc5.remi
- update to 2.4.2

* Tue May 16 2006 Remi Collet  2.4.0-1.fc{3,4,5}.remi
- update to 2.4.0
- add SElinux module
- spec cleanning

* Tue May 16 2006 Remi Collet  2.3.0-1.fc{3,4,5}.remi
- update to 2.3.0
- chmod 700 on %%{CPBACKEND}/cups-pdf for cups-1.2.0 on FC5

* Fri Apr 14 2006 Remi Collet  2.2.0-1.fc{3,4,5}.remi
- update to 2.2.0

* Sat Apr  8 2006 Remi Collet  2.1.1-1.fc{3,4,5}.remi
- update to 2.1.1

* Sun Mar 26 2006 Remi Collet  2.1.0-1.fc{3,4,5}.remi
- update to 2.1.0

* Sun Jan 29 2006 Remi Collet  2.0.5-1.fc{3,4}.remi
- update to 2.0.5

* Sun Jan 29 2006 Remi Collet  2.0.4-1.fc{3,4}.remi
- update to 2.0.4

* Sat Jan  7 2006 Remi Collet  2.0.3-1.fc{3,4}.remi
- update to 2.0.3

* Wed Jan  4 2006 Remi Collet  2.0.1-1.fc{3,4}.remi
- update to 2.0.1

* Tue Jan  3 2006 Remi Collet  2.0.0-2.fc#.remi
- output to Desktop
- defattr

* Fri Dec 23 2005 Remi Collet  2.0.0-1.fc4.remi
- update to 2.0.0 final

* Sat Nov  5 2005 Remi Collet  2.0-0.1.fc3.remi
- rebuild for FC3

* Sat Nov  5 2005 Remi Collet  2.0-0.1.fc4.remi
- update to 2.0 beta2
- rebuild for FC4
- conditionnal "post" and "postun" script, more robust
- cups-pdf-conf.patch (Out in $HOME)

* Mon Sep 26 2005 Christian Ellsworth C. 
- adapted to fit the new runtime config file of version 2.0

* Sat Sep 10 2005 Remi Collet  1.7.4-1.fc4.remi
- adapted to cups-pdf 1.7.4
- added auto remove a cups-pdf printer in "postun"
- added CHANGELOG, COPYING, README
- creating cups-pdf-home.patch

* Sat Mar 05 2005 Christian Ellsworth C. 
- adapted to cups-pdf 1.7.0
- added auto configure a cups-pdf printer

* Tue Feb 22 2005 Christian Ellsworth C. 
- adapted to cups-pdf 1.6.6

* Thu Aug 12 2004 Volker Behr 
- adapted to cups-pdf 1.5.2 

* Sat Jan 31 2004 Volker Behr 
- adapetd to cups-pdf 1.4.0 and new building environment

* Wed Jan 14 2004 Mark Lane 
- fixed the specfile so that x86_64 version installs the filter
- in /usr/lib64 instead of /usr/lib

* Sun Nov 02 2003 Volker Behr 
- third release of cups-pdf, RPM-Edition for cups-pdf 1.3

* Tue Sep 09 2003 Dirk Schwier 
- second Release of cups-pdf, RPM-Edition for cups-pdf 1.1

* Tue May 27 2003 Dirk Schwier 
- we're proud to present the first version of cups-pdf, RPM-Edition


--- NEW FILE cups_pdf-2.4.2.te ---
policy_module(cups_pdf,2.4.2)

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 05:45:28 -0000	1.1
+++ .cvsignore	14 Nov 2006 05:46:25 -0000	1.2
@@ -0,0 +1 @@
+cups-pdf_2.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 05:45:28 -0000	1.1
+++ sources	14 Nov 2006 05:46:25 -0000	1.2
@@ -0,0 +1 @@
+97b21ab9dc98659bfce17da921ee2790  cups-pdf_2.4.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 05:50:46 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:50:46 -0700
Subject: owners owners.list,1.1955,1.1956
Message-ID: <200611140550.kAE5okmR014889@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14868

Modified Files:
	owners.list 
Log Message:
	cups-pdf : Extension for creating pdf-Files with CUPS



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1955
retrieving revision 1.1956
diff -u -r1.1955 -r1.1956
--- owners.list	14 Nov 2006 04:13:37 -0000	1.1955
+++ owners.list	14 Nov 2006 05:50:16 -0000	1.1956
@@ -256,6 +256,7 @@
 Fedora Extras|ctorrent|BitTorrent Client written in C|rpm at greysector.net|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|cups-pdf|Extension for creating pdf-Files with CUPS|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2svn|CVS to Subversion Repository Converter|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 05:54:33 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:54:33 -0700
Subject: rpms/php-pear-Net-DIME/FC-6 php-pear-Net-DIME.spec,1.1,1.2
Message-ID: <200611140554.kAE5sXIT015019@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15003

Modified Files:
	php-pear-Net-DIME.spec 
Log Message:
	bump release



Index: php-pear-Net-DIME.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/FC-6/php-pear-Net-DIME.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Net-DIME.spec	11 Nov 2006 15:22:33 -0000	1.1
+++ php-pear-Net-DIME.spec	14 Nov 2006 05:54:03 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Net-DIME
 Version:        0.3
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Implements Direct Internet Message Encapsulation (DIME)
 
 Group:          Development/Libraries
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Remi Collet  0.3-1.fc6.1
+- bump release to build on FC6
+
 * Mon Nov  6 2006 Remi Collet  0.3-1
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE



From fedora-extras-commits at redhat.com  Tue Nov 14 07:22:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:22:38 -0700
Subject: rpms/Ri-li - New directory
Message-ID: <200611140722.kAE7McPs021595@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21591/Ri-li

Log Message:
Directory /cvs/extras/rpms/Ri-li added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 07:22:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:22:44 -0700
Subject: rpms/Ri-li/devel - New directory
Message-ID: <200611140722.kAE7MiRs021609@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21591/Ri-li/devel

Log Message:
Directory /cvs/extras/rpms/Ri-li/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 07:23:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:23:02 -0700
Subject: rpms/Ri-li Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611140723.kAE7N2vQ021640@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634

Added Files:
	Makefile import.log 
Log Message:
Setup of module Ri-li


--- NEW FILE Makefile ---
# Top level Makefile for module Ri-li
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  Tue Nov 14 07:23:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:23:07 -0700
Subject: rpms/Ri-li/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611140723.kAE7N7rS021657@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Ri-li


--- 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 Nov 14 07:29:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:29:26 -0700
Subject: owners owners.list,1.1956,1.1957
Message-ID: <200611140729.kAE7TQUs021819@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21799

Modified Files:
	owners.list 
Log Message:
added Ri-li


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1956
retrieving revision 1.1957
diff -u -r1.1956 -r1.1957
--- owners.list	14 Nov 2006 05:50:16 -0000	1.1956
+++ owners.list	14 Nov 2006 07:28:56 -0000	1.1957
@@ -255,8 +255,8 @@
 Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctorrent|BitTorrent Client written in C|rpm at greysector.net|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
-Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cups-pdf|Extension for creating pdf-Files with CUPS|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2svn|CVS to Subversion Repository Converter|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -2041,6 +2041,7 @@
 Fedora Extras|repoml|Tools and data for working with RepoML files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|revelation|Password manager for GNOME 2|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|Ri-li|Arcade game where you drive a toy wood engine|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|tamaster at pobox.com
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 07:31:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:31:23 -0700
Subject: rpms/Ri-li import.log,1.1,1.2
Message-ID: <200611140731.kAE7VNsP021887@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21854

Modified Files:
	import.log 
Log Message:
auto-import Ri-li-2.0.0-1 on branch devel from Ri-li-2.0.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Ri-li/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 07:23:02 -0000	1.1
+++ import.log	14 Nov 2006 07:30:52 -0000	1.2
@@ -0,0 +1 @@
+Ri-li-2_0_0-1:HEAD:Ri-li-2.0.0-1.src.rpm:1163490166



From fedora-extras-commits at redhat.com  Tue Nov 14 07:31:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:31:23 -0700
Subject: rpms/Ri-li/devel Ri-li.desktop, NONE, 1.1 Ri-li.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611140731.kAE7VNEE021891@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21854/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Ri-li.desktop Ri-li.spec 
Log Message:
auto-import Ri-li-2.0.0-1 on branch devel from Ri-li-2.0.0-1.src.rpm


--- NEW FILE Ri-li.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Ri-li
Comment=Arcade game where you drive a toy wood engine
Exec=Ri_li
Icon=Ri-li.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE Ri-li.spec ---
Name:           Ri-li
Version:        2.0.0
Release:        1%{?dist}
Summary:        Arcade game where you drive a toy wood engine
Group:          Amusements/Games
License:        GPL
URL:            http://ri-li.sourceforge.net/index.html
Source0:        http://dl.sf.net/sourceforge/ri-li/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_mixer-devel desktop-file-utils

%description
You drive a toy wood engine in many levels and you must collect all the coaches
to win. Full-featured: 18 languages, Colorful animated wood engine, 50 levels,
3 beautiful music tracks and many sound effects.


%prep
%setup -q
sed -i 's/\r//g' README COPYING AUTHORS NEWS


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# 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/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -m 644 data/Ri-li-icon-16x16.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -m 644 data/Ri-li-icon-32x32.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -m 644 data/Ri-li-icon-48x48.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%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 README COPYING AUTHORS NEWS
%{_bindir}/Ri_li
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png


%changelog
* Thu Nov  9 2006 Hans de Goede  2.0.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Ri-li/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 07:23:07 -0000	1.1
+++ .cvsignore	14 Nov 2006 07:30:53 -0000	1.2
@@ -0,0 +1 @@
+Ri-li-2.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Ri-li/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 07:23:07 -0000	1.1
+++ sources	14 Nov 2006 07:30:53 -0000	1.2
@@ -0,0 +1 @@
+e6dfa35616f5c84eb14ff82517cea796  Ri-li-2.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 07:40:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:40:54 -0700
Subject: comps comps-fe5.xml.in, 1.199, 1.200 comps-fe6.xml.in, 1.223,
	1.224 comps-fe7.xml.in, 1.22, 1.23
Message-ID: <200611140740.kAE7esp4022010@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21988

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add Ri-li to games


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- comps-fe5.xml.in	13 Nov 2006 15:40:59 -0000	1.199
+++ comps-fe5.xml.in	14 Nov 2006 07:40:24 -0000	1.200
@@ -375,6 +375,7 @@
       qqo
       rafkill
       raidem
+      Ri-li
       rocksndiamonds
       rogue
       scorched3d


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- comps-fe6.xml.in	13 Nov 2006 15:40:59 -0000	1.223
+++ comps-fe6.xml.in	14 Nov 2006 07:40:24 -0000	1.224
@@ -427,6 +427,7 @@
       qgo
       rafkill
       raidem
+      Ri-li
       rocksndiamonds
       rogue
       scorched3d


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- comps-fe7.xml.in	13 Nov 2006 15:40:59 -0000	1.22
+++ comps-fe7.xml.in	14 Nov 2006 07:40:24 -0000	1.23
@@ -427,6 +427,7 @@
       qgo
       rafkill
       raidem
+      Ri-li
       rocksndiamonds
       rogue
       scorched3d



From fedora-extras-commits at redhat.com  Tue Nov 14 10:24:54 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 14 Nov 2006 03:24:54 -0700
Subject: rpms/logserial/devel logserial.spec,1.1,1.2
Message-ID: <200611141024.kAEAOsXZ031699@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31683/devel

Modified Files:
	logserial.spec 
Log Message:



Index: logserial.spec
===================================================================
RCS file: /cvs/extras/rpms/logserial/devel/logserial.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logserial.spec	13 Nov 2006 22:46:32 -0000	1.1
+++ logserial.spec	14 Nov 2006 10:24:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           logserial
 Version:        0.4.2 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Package for logging incoming bytes on asynchronous serial ports
 
 Group:          Applications/Communications
@@ -22,9 +22,6 @@
 
 
 %build
-
-echo $RPM_OPT_FLAGS
-echo $CFLAGS
 make %{?_smp_mflags}
 
 
@@ -46,6 +43,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 lonely wolf  0.4.2-4
+- remove some debugging lines from the spec. No effect on generated binaries
+
 * Mon Nov 13 2006 lonely wolf  0.4.2-3
 - corrected the patch to make use of $RPM_OPT_FLAGS
 



From fedora-extras-commits at redhat.com  Tue Nov 14 10:28:43 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Nov 2006 03:28:43 -0700
Subject: rpms/gtkwave/devel gtkwave.spec, 1.27, 1.28 .cvsignore, 1.25,
	1.26 sources, 1.25, 1.26
Message-ID: <200611141028.kAEAShe2031742@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31717

Modified Files:
	gtkwave.spec .cvsignore sources 
Log Message:
update to 3.0.16


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtkwave.spec	30 Oct 2006 15:04:34 -0000	1.27
+++ gtkwave.spec	14 Nov 2006 10:28:13 -0000	1.28
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.15
+Version:		3.0.16
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 14 2006 Paul Howarth  3.0.16-1
+- update to 3.0.16
+
 * Mon Oct 30 2006 Paul Howarth  3.0.15-1
 - update to 3.0.15
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Oct 2006 15:04:34 -0000	1.25
+++ .cvsignore	14 Nov 2006 10:28:13 -0000	1.26
@@ -1 +1 @@
-gtkwave-3.0.15.tar.gz
+gtkwave-3.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Oct 2006 15:04:34 -0000	1.25
+++ sources	14 Nov 2006 10:28:13 -0000	1.26
@@ -1 +1 @@
-c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz
+d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 10:48:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Nov 2006 03:48:03 -0700
Subject: rpms/perl-Test-Perl-Critic/FC-6 .cvsignore, 1.2,
	1.3 perl-Test-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611141048.kAEAm3JH032004@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Perl-Critic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31963/FC-6

Modified Files:
	.cvsignore perl-Test-Perl-Critic.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:31:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 10:47:33 -0000	1.3
@@ -1 +1 @@
-Test-Perl-Critic-0.07.tar.gz
+Test-Perl-Critic-0.08.tar.gz


Index: perl-Test-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-6/perl-Test-Perl-Critic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Perl-Critic.spec	26 Sep 2006 09:31:10 -0000	1.1
+++ perl-Test-Perl-Critic.spec	14 Nov 2006 10:47:33 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Perl-Critic
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Use Perl::Critic in test programs
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Perl::Critic)
+BuildRequires:  perl(Perl::Critic) >= 0.21
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jose Pedro Oliveira  - 0.08-1
+- Update to 0.08.
+
 * Sat Sep 23 2006 Jose Pedro Oliveira  - 0.07-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:31:10 -0000	1.2
+++ sources	14 Nov 2006 10:47:33 -0000	1.3
@@ -1 +1 @@
-91c1dc234b4c6ec1f06300085f0559cf  Test-Perl-Critic-0.07.tar.gz
+358946b1ca7bca56ea8b6ce77bdd4033  Test-Perl-Critic-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 10:48:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Nov 2006 03:48:02 -0700
Subject: rpms/perl-Test-Perl-Critic/FC-5 .cvsignore, 1.2,
	1.3 perl-Test-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611141048.kAEAm2s7031999@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Perl-Critic/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31963/FC-5

Modified Files:
	.cvsignore perl-Test-Perl-Critic.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:31:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 10:47:32 -0000	1.3
@@ -1 +1 @@
-Test-Perl-Critic-0.07.tar.gz
+Test-Perl-Critic-0.08.tar.gz


Index: perl-Test-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-5/perl-Test-Perl-Critic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Perl-Critic.spec	26 Sep 2006 09:31:10 -0000	1.1
+++ perl-Test-Perl-Critic.spec	14 Nov 2006 10:47:32 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Perl-Critic
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Use Perl::Critic in test programs
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Perl::Critic)
+BuildRequires:  perl(Perl::Critic) >= 0.21
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jose Pedro Oliveira  - 0.08-1
+- Update to 0.08.
+
 * Sat Sep 23 2006 Jose Pedro Oliveira  - 0.07-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:31:10 -0000	1.2
+++ sources	14 Nov 2006 10:47:32 -0000	1.3
@@ -1 +1 @@
-91c1dc234b4c6ec1f06300085f0559cf  Test-Perl-Critic-0.07.tar.gz
+358946b1ca7bca56ea8b6ce77bdd4033  Test-Perl-Critic-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 10:57:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Nov 2006 03:57:27 -0700
Subject: rpms/perl-Wx/devel .cvsignore, 1.4, 1.5 perl-Wx.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611141057.kAEAvRBV032135@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32115

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.62.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2006 18:10:14 -0000	1.4
+++ .cvsignore	14 Nov 2006 10:56:57 -0000	1.5
@@ -1 +1 @@
-Wx-0.60.tar.gz
+Wx-0.62.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Wx.spec	11 Nov 2006 18:10:14 -0000	1.3
+++ perl-Wx.spec	14 Nov 2006 10:56:57 -0000	1.4
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.60
+Version:        0.62
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Jose Pedro Oliveira  - 0.62-1
+- Update to 0.62.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
 - Update to 0.60.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2006 18:10:14 -0000	1.4
+++ sources	14 Nov 2006 10:56:57 -0000	1.5
@@ -1 +1 @@
-be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz
+1e1edb47fd78931852268a04f096d47b  Wx-0.62.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 11:41:24 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 14 Nov 2006 04:41:24 -0700
Subject: rpms/GeoIP/FC-5 GeoIP.spec,1.5,1.6
Message-ID: <200611141141.kAEBfOQs003221@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3197

Modified Files:
	GeoIP.spec 
Log Message:
Fix date in changelog :-)




Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GeoIP.spec	12 Nov 2006 10:49:57 -0000	1.5
+++ GeoIP.spec	14 Nov 2006 11:40:54 -0000	1.6
@@ -73,7 +73,7 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
-* Sun Sep 3 2006 Michael Fleming  1.4.0-3
+* Tue Nov 14 2006 Michael Fleming  1.4.0-3
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
   (bz #198137)



From fedora-extras-commits at redhat.com  Tue Nov 14 11:43:14 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 14 Nov 2006 04:43:14 -0700
Subject: rpms/frozen-bubble/devel fb-server.init, NONE, 1.1 .cvsignore, 1.2, 
	1.3 frozen-bubble.spec, 1.2, 1.3 sources, 1.2,
	1.3 filter-depends.sh, 1.1, NONE filter-provides.sh, 1.1,
	NONE frozen-bubble-1.0.0-FBLE.pm.patch, 1.1,
	NONE frozen-bubble-1.0.0-perl-SDL.patch, 1.1,
	NONE frozen-bubble-build.patch, 1.1,
	NONE frozen-bubble-debian.patch, 1.1, NONE
Message-ID: <200611141143.kAEBhEFR003253@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3232

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Added Files:
	fb-server.init 
Removed Files:
	filter-depends.sh filter-provides.sh 
	frozen-bubble-1.0.0-FBLE.pm.patch 
	frozen-bubble-1.0.0-perl-SDL.patch frozen-bubble-build.patch 
	frozen-bubble-debian.patch 
Log Message:
Update to 2.0.0.



--- NEW FILE fb-server.init ---
#!/bin/sh
#
# fb-server      Frozen-Bubble server
#
# chkconfig: - 99 01
# description: this is the Frozen-Bubble server; it allows people to play \
#              Frozen-Bubble over the Internet.
# processname: fb-server
# pidfile: /var/run/fb-server.pid
# config: /etc/fb-server*.conf

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

conffiles=/etc/fb-server*.conf
servicename=fb-server

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting Frozen Bubble server(s): "
        ATLEASTONE=-1
        for file in $conffiles; do
            daemon --user fbubble "fb-server -c $file &>/dev/null"
            RETVAL=$?
            if [ "$ATLEASTONE" -ne 0 ]; then
                ATLEASTONE=$RETVAL
            fi
            echo
        done
	if [ $ATLEASTONE -eq 0 ]; then
            touch /var/lock/subsys/$servicename
        fi
	return $ATLEASTONE
}

stop() {
	echo -n $"Stopping Frozen Bubble server(s): "
        killproc fb-server
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
            rm -f /var/lock/subsys/$servicename
        fi
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  status)
        status fb-server
        RETVAL=$?
        ;;
  condrestart)
	[ -f /var/lock/subsys/$servicename ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2006 05:26:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 11:42:43 -0000	1.3
@@ -1 +1 @@
-frozen-bubble-1.0.0.tar.bz2
+frozen-bubble-2.0.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frozen-bubble.spec	28 Aug 2006 11:26:03 -0000	1.2
+++ frozen-bubble.spec	14 Nov 2006 11:42:43 -0000	1.3
@@ -1,30 +1,19 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        1.0.0
-Release:        10%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
-Source0:        http://zarb.org/~gc/fb/frozen-bubble-1.0.0.tar.bz2
+Source0:        http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
 Source1:        frozen-bubble.desktop
-Source2:        filter-depends.sh
-Source3:        filter-provides.sh
-Patch0:         %{name}-build.patch
-Patch1:         %{name}-debian.patch
-Patch2:         %{name}-1.0.0-FBLE.pm.patch
-Patch3:         %{name}-1.0.0-perl-SDL.patch
+Source2:        fb-server.init
 URL:            http://www.frozen-bubble.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, desktop-file-utils
+BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
+BuildRequires:  glib2-devel, gettext, desktop-file-utils
 Requires:       perl-SDL >= 2.1.3
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# hack filter out the autogenerated Provides for our private perl modules
-# (which are installed outside the perlvendorroot) and also filter out
-# the matching AutoRequires to still get an installable package
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
-%define __find_provides %{SOURCE3}
-
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
 and hours of 2p game, 3 professional quality 20-channels musics, 15 stereo
@@ -32,31 +21,51 @@
 You need this game.
 
 
+%package server
+Summary: Frozen Bubble network game dedicated server
+Group: System Environment/Daemons
+
+%description server
+Frozen Bubble network game dedicated server. The server is already included
+with the game in order to be launched automatically for LAN games, so you
+only need to install this package if you want to run a fully dedicated
+Frozen Bubble network game server.
+
+
 %prep
 %setup -q
-%patch0 -p0 -z .build
-%patch1 -p1 -z .deb
-# no backups for this patch otherwise they end up getting installed
-%patch2 -p0
-%patch3 -p0 -z .perl-SDL
-# The "min 1.19.0" requirement check for perl-SDL is broken
-sed -i 's|@if ! perl.*||g' Makefile
 # Add a directory to the module path for the app's private perl modules
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble-editor
+# Rename this README since the main server README has the same name
+mv server/init/README server/README.init
+# Change the example server configuration file to be a working one, which only
+# launches a LAN server and doesn't try to register itself on the Internet
+sed -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
 
 
 %build
-make %{?_smp_mflags} OPTIMIZE="${RPM_OPT_FLAGS}" PREFIX="%{_prefix}" \
-  INSTALLDIRS=vendor
+make %{?_smp_mflags} \
+    OPTIMIZE="${RPM_OPT_FLAGS}" \
+    CFLAGS="${RPM_OPT_FLAGS} `pkg-config glib-2.0 --cflags`" \
+    LIBS="`pkg-config glib-2.0 --libs`" \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    INSTALLDIRS=vendor
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{build_fbsyms,perllocal.pod}
-find $RPM_BUILD_ROOT -name .xvpics | xargs rm -rf
+make install \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
+# Clean up unneeded files
+rm -f `find $RPM_BUILD_ROOT -name perllocal.pod`
 chmod -R u+w $RPM_BUILD_ROOT/*
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
@@ -66,22 +75,29 @@
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/auto $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/*.pm $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 
-# below is the desktop file and icon stuff.
+# 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/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 icons/frozen-bubble-icon-16x16.png \
+install -D -p -m 644 icons/frozen-bubble-icon-16x16.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-32x32.png \
+install -D -p -m 644 icons/frozen-bubble-icon-32x32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-48x48.png \
+install -D -p -m 644 icons/frozen-bubble-icon-48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
+# Install server init script and default configuration
+install -D -p -m 755 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fb-server
+install -D -p -m 644 server/init/fb-server.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/fb-server.conf
+
+# Duplicate the server (it's tiny) to be used in both the game and standalone
+# server package
+cp -a $RPM_BUILD_ROOT%{_libexecdir}/%{name}/fb-server \
+      $RPM_BUILD_ROOT%{_bindir}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,18 +116,48 @@
 fi
 
 
-%files
+%post server
+/usr/sbin/useradd -r -s /sbin/nologin -d / fbubble || :
+/sbin/chkconfig --add fb-server
+
+%preun server
+if [ $1 -eq 0 ]; then
+    /sbin/service fb-server stop &>/dev/null || :
+    /sbin/chkconfig --del fb-server
+fi
+
+%postun server
+/usr/sbin/userdel fbubble || :
+if [ $1 -ge 1 ]; then
+    /sbin/service fb-server condrestart &>/dev/null || :
+fi
+
+
+%files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS COPYING NEWS README TIPS
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
-%{_datadir}/%{name}
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man6/%{name}*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
+%files server
+%defattr(-, root, root)
+%doc COPYING server/AUTHORS server/README*
+%config(noreplace) %{_sysconfdir}/fb-server.conf
+%{_sysconfdir}/rc.d/init.d/fb-server
+%{_bindir}/fb-server
+
 
 %changelog
+* Fri Oct 27 2006 Matthias Saou  2.0.0-1
+- Update to 2.0.0.
+- Add new SDL_Pango dependency.
+- New server standalone sub-package for the dedicated server.
+
 * Mon Aug 28 2006 Hans de Goede  1.0.0-10
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2006 05:26:10 -0000	1.2
+++ sources	14 Nov 2006 11:42:43 -0000	1.3
@@ -1 +1 @@
-2be5ead2aee72adc3fb643630a774b59  frozen-bubble-1.0.0.tar.bz2
+9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2


--- filter-depends.sh DELETED ---


--- filter-provides.sh DELETED ---


--- frozen-bubble-1.0.0-FBLE.pm.patch DELETED ---


--- frozen-bubble-1.0.0-perl-SDL.patch DELETED ---


--- frozen-bubble-build.patch DELETED ---


--- frozen-bubble-debian.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 11:59:48 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Nov 2006 04:59:48 -0700
Subject: rpms/gtkwave/FC-6 .cvsignore, 1.25, 1.26 gtkwave.spec, 1.27,
	1.28 sources, 1.25, 1.26
Message-ID: <200611141159.kAEBxmSk003383@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3363

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Oct 2006 15:07:21 -0000	1.25
+++ .cvsignore	14 Nov 2006 11:59:17 -0000	1.26
@@ -1 +1 @@
-gtkwave-3.0.15.tar.gz
+gtkwave-3.0.16.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/gtkwave.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtkwave.spec	30 Oct 2006 15:07:21 -0000	1.27
+++ gtkwave.spec	14 Nov 2006 11:59:18 -0000	1.28
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.15
+Version:		3.0.16
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 14 2006 Paul Howarth  3.0.16-1
+- update to 3.0.16
+
 * Mon Oct 30 2006 Paul Howarth  3.0.15-1
 - update to 3.0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Oct 2006 15:07:21 -0000	1.25
+++ sources	14 Nov 2006 11:59:18 -0000	1.26
@@ -1 +1 @@
-c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz
+d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 12:01:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Nov 2006 05:01:01 -0700
Subject: rpms/gtkwave/FC-5 .cvsignore, 1.25, 1.26 gtkwave.spec, 1.25,
	1.26 sources, 1.25, 1.26
Message-ID: <200611141201.kAEC11NB003484@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3459

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Oct 2006 15:08:41 -0000	1.25
+++ .cvsignore	14 Nov 2006 12:00:31 -0000	1.26
@@ -1 +1 @@
-gtkwave-3.0.15.tar.gz
+gtkwave-3.0.16.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtkwave.spec	30 Oct 2006 15:08:41 -0000	1.25
+++ gtkwave.spec	14 Nov 2006 12:00:31 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.15
+Version:		3.0.16
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 14 2006 Paul Howarth  3.0.16-1
+- update to 3.0.16
+
 * Mon Oct 30 2006 Paul Howarth  3.0.15-1
 - update to 3.0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Oct 2006 15:08:41 -0000	1.25
+++ sources	14 Nov 2006 12:00:31 -0000	1.26
@@ -1 +1 @@
-c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz
+d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 12:02:26 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Nov 2006 05:02:26 -0700
Subject: rpms/gtkwave/FC-4 .cvsignore, 1.25, 1.26 gtkwave.spec, 1.24,
	1.25 sources, 1.25, 1.26
Message-ID: <200611141202.kAEC2Qxw006542@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6520

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Oct 2006 15:10:03 -0000	1.25
+++ .cvsignore	14 Nov 2006 12:01:56 -0000	1.26
@@ -1 +1 @@
-gtkwave-3.0.15.tar.gz
+gtkwave-3.0.16.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtkwave.spec	30 Oct 2006 15:10:03 -0000	1.24
+++ gtkwave.spec	14 Nov 2006 12:01:56 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.15
+Version:		3.0.16
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 14 2006 Paul Howarth  3.0.16-1
+- update to 3.0.16
+
 * Mon Oct 30 2006 Paul Howarth  3.0.15-1
 - update to 3.0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Oct 2006 15:10:03 -0000	1.25
+++ sources	14 Nov 2006 12:01:56 -0000	1.26
@@ -1 +1 @@
-c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz
+d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 12:17:18 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Tue, 14 Nov 2006 05:17:18 -0700
Subject: rpms/gutenprint/devel gutenprint.spec,1.2,1.3
Message-ID: <200611141217.kAECHIad006747@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/gutenprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6724

Modified Files:
	gutenprint.spec 
Log Message:
Added Dependency for gutenprint-cups


Index: gutenprint.spec
===================================================================
RCS file: /cvs/extras/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gutenprint.spec	3 Oct 2006 04:34:07 -0000	1.2
+++ gutenprint.spec	14 Nov 2006 12:16:48 -0000	1.3
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.0.0
-Release:        0.15%{?dist}
+Release:        0.16%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -200,6 +200,7 @@
 Summary:        CUPS drivers for Canon, Epson, HP and compatible printers
 Group:          Applications/Publishing
 Requires:       cups >= 1.2.1-1.7
+Requires:	gimp-print-cups
 
 %description cups
 This package contains native CUPS support for a wide range of Canon,
@@ -379,6 +380,9 @@
 %{_datadir}/cups/model/gutenprint/5.0/zh_TW
 
 %changelog
+* Tue Nov 14 2006 Parag Nemade - 5.0.0-0.16
+- Added missing dependency of gimp-print-cups in gutenprint-cups
+
 * Thu Oct 03 2006 Parag Nemade - 5.0.0-0.15
 - Did some fix for tag issue
 



From fedora-extras-commits at redhat.com  Tue Nov 14 12:19:07 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 14 Nov 2006 05:19:07 -0700
Subject: rpms/frozen-bubble/FC-6 fb-server.init, NONE, 1.1 .cvsignore, 1.2, 
	1.3 frozen-bubble.spec, 1.2, 1.3 sources, 1.2,
	1.3 filter-depends.sh, 1.1, NONE filter-provides.sh, 1.1,
	NONE frozen-bubble-1.0.0-FBLE.pm.patch, 1.1,
	NONE frozen-bubble-1.0.0-perl-SDL.patch, 1.1,
	NONE frozen-bubble-build.patch, 1.1,
	NONE frozen-bubble-debian.patch, 1.1, NONE
Message-ID: <200611141219.kAECJ7n2006849@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6775/FC-6

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Added Files:
	fb-server.init 
Removed Files:
	filter-depends.sh filter-provides.sh 
	frozen-bubble-1.0.0-FBLE.pm.patch 
	frozen-bubble-1.0.0-perl-SDL.patch frozen-bubble-build.patch 
	frozen-bubble-debian.patch 
Log Message:
Update to 2.0.0.



--- NEW FILE fb-server.init ---
#!/bin/sh
#
# fb-server      Frozen-Bubble server
#
# chkconfig: - 99 01
# description: this is the Frozen-Bubble server; it allows people to play \
#              Frozen-Bubble over the Internet.
# processname: fb-server
# pidfile: /var/run/fb-server.pid
# config: /etc/fb-server*.conf

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

conffiles=/etc/fb-server*.conf
servicename=fb-server

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting Frozen Bubble server(s): "
        ATLEASTONE=-1
        for file in $conffiles; do
            daemon --user fbubble "fb-server -c $file &>/dev/null"
            RETVAL=$?
            if [ "$ATLEASTONE" -ne 0 ]; then
                ATLEASTONE=$RETVAL
            fi
            echo
        done
	if [ $ATLEASTONE -eq 0 ]; then
            touch /var/lock/subsys/$servicename
        fi
	return $ATLEASTONE
}

stop() {
	echo -n $"Stopping Frozen Bubble server(s): "
        killproc fb-server
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
            rm -f /var/lock/subsys/$servicename
        fi
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  status)
        status fb-server
        RETVAL=$?
        ;;
  condrestart)
	[ -f /var/lock/subsys/$servicename ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2006 05:26:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-frozen-bubble-1.0.0.tar.bz2
+frozen-bubble-2.0.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/frozen-bubble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frozen-bubble.spec	28 Aug 2006 11:26:03 -0000	1.2
+++ frozen-bubble.spec	14 Nov 2006 12:18:37 -0000	1.3
@@ -1,30 +1,19 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        1.0.0
-Release:        10%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
-Source0:        http://zarb.org/~gc/fb/frozen-bubble-1.0.0.tar.bz2
+Source0:        http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
 Source1:        frozen-bubble.desktop
-Source2:        filter-depends.sh
-Source3:        filter-provides.sh
-Patch0:         %{name}-build.patch
-Patch1:         %{name}-debian.patch
-Patch2:         %{name}-1.0.0-FBLE.pm.patch
-Patch3:         %{name}-1.0.0-perl-SDL.patch
+Source2:        fb-server.init
 URL:            http://www.frozen-bubble.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, desktop-file-utils
+BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
+BuildRequires:  glib2-devel, gettext, desktop-file-utils
 Requires:       perl-SDL >= 2.1.3
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# hack filter out the autogenerated Provides for our private perl modules
-# (which are installed outside the perlvendorroot) and also filter out
-# the matching AutoRequires to still get an installable package
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
-%define __find_provides %{SOURCE3}
-
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
 and hours of 2p game, 3 professional quality 20-channels musics, 15 stereo
@@ -32,31 +21,51 @@
 You need this game.
 
 
+%package server
+Summary: Frozen Bubble network game dedicated server
+Group: System Environment/Daemons
+
+%description server
+Frozen Bubble network game dedicated server. The server is already included
+with the game in order to be launched automatically for LAN games, so you
+only need to install this package if you want to run a fully dedicated
+Frozen Bubble network game server.
+
+
 %prep
 %setup -q
-%patch0 -p0 -z .build
-%patch1 -p1 -z .deb
-# no backups for this patch otherwise they end up getting installed
-%patch2 -p0
-%patch3 -p0 -z .perl-SDL
-# The "min 1.19.0" requirement check for perl-SDL is broken
-sed -i 's|@if ! perl.*||g' Makefile
 # Add a directory to the module path for the app's private perl modules
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble-editor
+# Rename this README since the main server README has the same name
+mv server/init/README server/README.init
+# Change the example server configuration file to be a working one, which only
+# launches a LAN server and doesn't try to register itself on the Internet
+sed -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
 
 
 %build
-make %{?_smp_mflags} OPTIMIZE="${RPM_OPT_FLAGS}" PREFIX="%{_prefix}" \
-  INSTALLDIRS=vendor
+make %{?_smp_mflags} \
+    OPTIMIZE="${RPM_OPT_FLAGS}" \
+    CFLAGS="${RPM_OPT_FLAGS} `pkg-config glib-2.0 --cflags`" \
+    LIBS="`pkg-config glib-2.0 --libs`" \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    INSTALLDIRS=vendor
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{build_fbsyms,perllocal.pod}
-find $RPM_BUILD_ROOT -name .xvpics | xargs rm -rf
+make install \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
+# Clean up unneeded files
+rm -f `find $RPM_BUILD_ROOT -name perllocal.pod`
 chmod -R u+w $RPM_BUILD_ROOT/*
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
@@ -66,22 +75,29 @@
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/auto $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/*.pm $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 
-# below is the desktop file and icon stuff.
+# 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/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 icons/frozen-bubble-icon-16x16.png \
+install -D -p -m 644 icons/frozen-bubble-icon-16x16.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-32x32.png \
+install -D -p -m 644 icons/frozen-bubble-icon-32x32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-48x48.png \
+install -D -p -m 644 icons/frozen-bubble-icon-48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
+# Install server init script and default configuration
+install -D -p -m 755 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fb-server
+install -D -p -m 644 server/init/fb-server.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/fb-server.conf
+
+# Duplicate the server (it's tiny) to be used in both the game and standalone
+# server package
+cp -a $RPM_BUILD_ROOT%{_libexecdir}/%{name}/fb-server \
+      $RPM_BUILD_ROOT%{_bindir}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,18 +116,48 @@
 fi
 
 
-%files
+%post server
+/usr/sbin/useradd -r -s /sbin/nologin -d / fbubble || :
+/sbin/chkconfig --add fb-server
+
+%preun server
+if [ $1 -eq 0 ]; then
+    /sbin/service fb-server stop &>/dev/null || :
+    /sbin/chkconfig --del fb-server
+fi
+
+%postun server
+/usr/sbin/userdel fbubble || :
+if [ $1 -ge 1 ]; then
+    /sbin/service fb-server condrestart &>/dev/null || :
+fi
+
+
+%files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS COPYING NEWS README TIPS
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
-%{_datadir}/%{name}
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man6/%{name}*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
+%files server
+%defattr(-, root, root)
+%doc COPYING server/AUTHORS server/README*
+%config(noreplace) %{_sysconfdir}/fb-server.conf
+%{_sysconfdir}/rc.d/init.d/fb-server
+%{_bindir}/fb-server
+
 
 %changelog
+* Fri Oct 27 2006 Matthias Saou  2.0.0-1
+- Update to 2.0.0.
+- Add new SDL_Pango dependency.
+- New server standalone sub-package for the dedicated server.
+
 * Mon Aug 28 2006 Hans de Goede  1.0.0-10
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2006 05:26:10 -0000	1.2
+++ sources	14 Nov 2006 12:18:37 -0000	1.3
@@ -1 +1 @@
-2be5ead2aee72adc3fb643630a774b59  frozen-bubble-1.0.0.tar.bz2
+9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2


--- filter-depends.sh DELETED ---


--- filter-provides.sh DELETED ---


--- frozen-bubble-1.0.0-FBLE.pm.patch DELETED ---


--- frozen-bubble-1.0.0-perl-SDL.patch DELETED ---


--- frozen-bubble-build.patch DELETED ---


--- frozen-bubble-debian.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 12:19:06 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 14 Nov 2006 05:19:06 -0700
Subject: rpms/frozen-bubble/FC-5 fb-server.init, NONE, 1.1 .cvsignore, 1.2, 
	1.3 frozen-bubble.spec, 1.2, 1.3 sources, 1.2,
	1.3 filter-depends.sh, 1.1, NONE filter-provides.sh, 1.1,
	NONE frozen-bubble-1.0.0-FBLE.pm.patch, 1.1,
	NONE frozen-bubble-1.0.0-perl-SDL.patch, 1.1,
	NONE frozen-bubble-build.patch, 1.1,
	NONE frozen-bubble-debian.patch, 1.1, NONE
Message-ID: <200611141219.kAECJ6kM006844@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6775/FC-5

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Added Files:
	fb-server.init 
Removed Files:
	filter-depends.sh filter-provides.sh 
	frozen-bubble-1.0.0-FBLE.pm.patch 
	frozen-bubble-1.0.0-perl-SDL.patch frozen-bubble-build.patch 
	frozen-bubble-debian.patch 
Log Message:
Update to 2.0.0.



--- NEW FILE fb-server.init ---
#!/bin/sh
#
# fb-server      Frozen-Bubble server
#
# chkconfig: - 99 01
# description: this is the Frozen-Bubble server; it allows people to play \
#              Frozen-Bubble over the Internet.
# processname: fb-server
# pidfile: /var/run/fb-server.pid
# config: /etc/fb-server*.conf

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

conffiles=/etc/fb-server*.conf
servicename=fb-server

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting Frozen Bubble server(s): "
        ATLEASTONE=-1
        for file in $conffiles; do
            daemon --user fbubble "fb-server -c $file &>/dev/null"
            RETVAL=$?
            if [ "$ATLEASTONE" -ne 0 ]; then
                ATLEASTONE=$RETVAL
            fi
            echo
        done
	if [ $ATLEASTONE -eq 0 ]; then
            touch /var/lock/subsys/$servicename
        fi
	return $ATLEASTONE
}

stop() {
	echo -n $"Stopping Frozen Bubble server(s): "
        killproc fb-server
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
            rm -f /var/lock/subsys/$servicename
        fi
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  status)
        status fb-server
        RETVAL=$?
        ;;
  condrestart)
	[ -f /var/lock/subsys/$servicename ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2006 05:26:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-frozen-bubble-1.0.0.tar.bz2
+frozen-bubble-2.0.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/frozen-bubble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frozen-bubble.spec	28 Aug 2006 11:26:03 -0000	1.2
+++ frozen-bubble.spec	14 Nov 2006 12:18:36 -0000	1.3
@@ -1,30 +1,19 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        1.0.0
-Release:        10%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
-Source0:        http://zarb.org/~gc/fb/frozen-bubble-1.0.0.tar.bz2
+Source0:        http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
 Source1:        frozen-bubble.desktop
-Source2:        filter-depends.sh
-Source3:        filter-provides.sh
-Patch0:         %{name}-build.patch
-Patch1:         %{name}-debian.patch
-Patch2:         %{name}-1.0.0-FBLE.pm.patch
-Patch3:         %{name}-1.0.0-perl-SDL.patch
+Source2:        fb-server.init
 URL:            http://www.frozen-bubble.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, desktop-file-utils
+BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
+BuildRequires:  glib2-devel, gettext, desktop-file-utils
 Requires:       perl-SDL >= 2.1.3
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# hack filter out the autogenerated Provides for our private perl modules
-# (which are installed outside the perlvendorroot) and also filter out
-# the matching AutoRequires to still get an installable package
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
-%define __find_provides %{SOURCE3}
-
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
 and hours of 2p game, 3 professional quality 20-channels musics, 15 stereo
@@ -32,31 +21,51 @@
 You need this game.
 
 
+%package server
+Summary: Frozen Bubble network game dedicated server
+Group: System Environment/Daemons
+
+%description server
+Frozen Bubble network game dedicated server. The server is already included
+with the game in order to be launched automatically for LAN games, so you
+only need to install this package if you want to run a fully dedicated
+Frozen Bubble network game server.
+
+
 %prep
 %setup -q
-%patch0 -p0 -z .build
-%patch1 -p1 -z .deb
-# no backups for this patch otherwise they end up getting installed
-%patch2 -p0
-%patch3 -p0 -z .perl-SDL
-# The "min 1.19.0" requirement check for perl-SDL is broken
-sed -i 's|@if ! perl.*||g' Makefile
 # Add a directory to the module path for the app's private perl modules
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble-editor
+# Rename this README since the main server README has the same name
+mv server/init/README server/README.init
+# Change the example server configuration file to be a working one, which only
+# launches a LAN server and doesn't try to register itself on the Internet
+sed -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
 
 
 %build
-make %{?_smp_mflags} OPTIMIZE="${RPM_OPT_FLAGS}" PREFIX="%{_prefix}" \
-  INSTALLDIRS=vendor
+make %{?_smp_mflags} \
+    OPTIMIZE="${RPM_OPT_FLAGS}" \
+    CFLAGS="${RPM_OPT_FLAGS} `pkg-config glib-2.0 --cflags`" \
+    LIBS="`pkg-config glib-2.0 --libs`" \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    INSTALLDIRS=vendor
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{build_fbsyms,perllocal.pod}
-find $RPM_BUILD_ROOT -name .xvpics | xargs rm -rf
+make install \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
+# Clean up unneeded files
+rm -f `find $RPM_BUILD_ROOT -name perllocal.pod`
 chmod -R u+w $RPM_BUILD_ROOT/*
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
@@ -66,22 +75,29 @@
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/auto $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/*.pm $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 
-# below is the desktop file and icon stuff.
+# 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/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 icons/frozen-bubble-icon-16x16.png \
+install -D -p -m 644 icons/frozen-bubble-icon-16x16.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-32x32.png \
+install -D -p -m 644 icons/frozen-bubble-icon-32x32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-48x48.png \
+install -D -p -m 644 icons/frozen-bubble-icon-48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
+# Install server init script and default configuration
+install -D -p -m 755 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fb-server
+install -D -p -m 644 server/init/fb-server.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/fb-server.conf
+
+# Duplicate the server (it's tiny) to be used in both the game and standalone
+# server package
+cp -a $RPM_BUILD_ROOT%{_libexecdir}/%{name}/fb-server \
+      $RPM_BUILD_ROOT%{_bindir}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,18 +116,48 @@
 fi
 
 
-%files
+%post server
+/usr/sbin/useradd -r -s /sbin/nologin -d / fbubble || :
+/sbin/chkconfig --add fb-server
+
+%preun server
+if [ $1 -eq 0 ]; then
+    /sbin/service fb-server stop &>/dev/null || :
+    /sbin/chkconfig --del fb-server
+fi
+
+%postun server
+/usr/sbin/userdel fbubble || :
+if [ $1 -ge 1 ]; then
+    /sbin/service fb-server condrestart &>/dev/null || :
+fi
+
+
+%files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS COPYING NEWS README TIPS
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
-%{_datadir}/%{name}
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man6/%{name}*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
+%files server
+%defattr(-, root, root)
+%doc COPYING server/AUTHORS server/README*
+%config(noreplace) %{_sysconfdir}/fb-server.conf
+%{_sysconfdir}/rc.d/init.d/fb-server
+%{_bindir}/fb-server
+
 
 %changelog
+* Fri Oct 27 2006 Matthias Saou  2.0.0-1
+- Update to 2.0.0.
+- Add new SDL_Pango dependency.
+- New server standalone sub-package for the dedicated server.
+
 * Mon Aug 28 2006 Hans de Goede  1.0.0-10
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2006 05:26:10 -0000	1.2
+++ sources	14 Nov 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-2be5ead2aee72adc3fb643630a774b59  frozen-bubble-1.0.0.tar.bz2
+9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2


--- filter-depends.sh DELETED ---


--- filter-provides.sh DELETED ---


--- frozen-bubble-1.0.0-FBLE.pm.patch DELETED ---


--- frozen-bubble-1.0.0-perl-SDL.patch DELETED ---


--- frozen-bubble-build.patch DELETED ---


--- frozen-bubble-debian.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 12:25:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:25:30 -0700
Subject: rpms/listen/FC-6 listen.spec,1.15,1.16
Message-ID: <200611141225.kAECPUT1006993@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6967

Modified Files:
	listen.spec 
Log Message:

Updated spec to fix build issue and some bugs fixes



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/listen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- listen.spec	20 Oct 2006 14:33:12 -0000	1.15
+++ listen.spec	14 Nov 2006 12:25:00 -0000	1.16
@@ -1,52 +1,56 @@
 Name:           listen
 Version:        0.5
-Release:        8.beta1%{?dist}
+Release:        9.beta1%{?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)
 
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig  
+ 
 Buildrequires: python-devel
+BuildRequires: python-ctypes
+BuildRequires: python-mutagen >= 1.6
+BuildRequires: python-sqlite2
+BuildRequires: dbus-python
 BuildRequires: pygtk2-devel 
 BuildRequires: gtk2-devel
-Buildrequires: pkgconfig
-Buildrequires: docbook2X
-BuildRequires: gettext
-Buildrequires: xorg-x11-server-Xvfb
-Buildrequires: xorg-x11-xauth
-Buildrequires: xorg-x11-fonts-base
-Buildrequires: xorg-x11-fonts-misc
 BuildRequires: gstreamer-python
-BuildRequires: dbus-python
-BuildRequires: python-sqlite2
-BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkhtml2
 BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
 BuildRequires: python-sexy
-BuildRequires: python-mutagen >= 1.6
+Buildrequires: xorg-x11-server-Xvfb
+Buildrequires: xorg-x11-xauth
+Buildrequires: xorg-x11-fonts-base
+Buildrequires: xorg-x11-fonts-misc
+Buildrequires: docbook2X
+BuildRequires: gettext
+Buildrequires: pkgconfig
 BuildRequires: desktop-file-utils
-
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig 
 
 # added explicit Requires
-Requires: python-mutagen >= 1.6
 Requires: python 
-Requires: pygtk2 
-Requires: gstreamer-python 
-Requires: dbus-python
-Requires: python-sqlite2
 Requires: python-ctypes
+Requires: python-mutagen >= 1.6
+Requires: python-sqlite2
+Requires: dbus-python
+Requires: pygtk2 
+Requires: gstreamer-python
 Requires: gnome-python2
 Requires: gnome-python2-extras
-Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
@@ -57,6 +61,7 @@
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
+
 %description
 Listen is a music manager and player for GNOME
 With listen you can:
@@ -83,15 +88,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}b1
-# the path is hardcoded in the Makefile
-%{__sed} -i 's/local//' Makefile
-# Under Fedora dockbook2x-man is renamed db2x_docbook2man
-%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
-# enable the use of %{find_lang} macros
-%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %ifarch x86_64
-# correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
+# correct path issue on x86_64 box
+%{__sed} -i 's/\/lib/\/lib64/' Makefile
 %endif
 
 %build
@@ -100,7 +103,7 @@
 # added - nolisten tcp -ac -terminate to fix build issue with mock
 %{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
 export DISPLAY=:$XDISPLAY
-xauth add $DISPLAY . EE
+xauth add :$XDISPLAY . EE
 make %{?_smp_mflags}
 
 
@@ -148,27 +151,32 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Fri Nov 20 2006 Ha??kel Gu??mar  0.5-8.beta1
+* Mon Nov 13 2006 Ha??kel Gu??mar  0.5-9.beta1
+- Fixed build issue
+- Replaced some sed one-liners by incremental patches
+- Minor bugs fixing (is Listen actively maintained ?)
+
+* Fri Oct 20 2006 Ha??kel Gu??mar  0.5-8.beta1
 - Fixed a path issue that prevent Listen to be launched on x86_64 
  systems. Now owns {_datadir}/%{name}
 
-* Sat Nov 14 2006 Ha??kel Gu??mar  0.5-7.beta1
+* Sat Oct 14 2006 Ha??kel Gu??mar  0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 
-* Thu Nov 12 2006 Ha??kel Gu??mar  0.5-6.beta1
+* Thu Oct 12 2006 Ha??kel Gu??mar  0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-5.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-4.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-4.beta1
 - Fixed build issue on x86_64
 
-* Sun Nov 08 2006 Ha??kel Gu??mar  0.5-3.beta1
+* Sun Oct 08 2006 Ha??kel Gu??mar  0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 
 
-* Thu Nov 05 2006 Ha??kel Gu??mar  0.5b1-2
+* Thu Oct 05 2006 Ha??kel Gu??mar  0.5b1-2
 - Added gettext and gtk2-devel as BR, fixed build issue with mock
 
 * Fri Sep 08 2006 Ha??kel Gu??mar  0.5b1-1
@@ -188,3 +196,6 @@
 
 * Thu May 11 2006 Ha??kel Gu??mar  0.4.3-1
 - First packaging
+
+
+



From fedora-extras-commits at redhat.com  Tue Nov 14 12:26:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:26:45 -0700
Subject: rpms/listen/FC-5 listen.spec,1.15,1.16
Message-ID: <200611141226.kAECQjEQ007042@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7000/FC-5

Modified Files:
	listen.spec 
Log Message:

Updated spec to fix build issue, some bugs fixes



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- listen.spec	20 Oct 2006 14:33:11 -0000	1.15
+++ listen.spec	14 Nov 2006 12:26:15 -0000	1.16
@@ -1,52 +1,56 @@
 Name:           listen
 Version:        0.5
-Release:        8.beta1%{?dist}
+Release:        9.beta1%{?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)
 
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig  
+ 
 Buildrequires: python-devel
+BuildRequires: python-ctypes
+BuildRequires: python-mutagen >= 1.6
+BuildRequires: python-sqlite2
+BuildRequires: dbus-python
 BuildRequires: pygtk2-devel 
 BuildRequires: gtk2-devel
-Buildrequires: pkgconfig
-Buildrequires: docbook2X
-BuildRequires: gettext
-Buildrequires: xorg-x11-server-Xvfb
-Buildrequires: xorg-x11-xauth
-Buildrequires: xorg-x11-fonts-base
-Buildrequires: xorg-x11-fonts-misc
 BuildRequires: gstreamer-python
-BuildRequires: dbus-python
-BuildRequires: python-sqlite2
-BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkhtml2
 BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
 BuildRequires: python-sexy
-BuildRequires: python-mutagen >= 1.6
+Buildrequires: xorg-x11-server-Xvfb
+Buildrequires: xorg-x11-xauth
+Buildrequires: xorg-x11-fonts-base
+Buildrequires: xorg-x11-fonts-misc
+Buildrequires: docbook2X
+BuildRequires: gettext
+Buildrequires: pkgconfig
 BuildRequires: desktop-file-utils
-
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig 
 
 # added explicit Requires
-Requires: python-mutagen >= 1.6
 Requires: python 
-Requires: pygtk2 
-Requires: gstreamer-python 
-Requires: dbus-python
-Requires: python-sqlite2
 Requires: python-ctypes
+Requires: python-mutagen >= 1.6
+Requires: python-sqlite2
+Requires: dbus-python
+Requires: pygtk2 
+Requires: gstreamer-python
 Requires: gnome-python2
 Requires: gnome-python2-extras
-Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
@@ -57,6 +61,7 @@
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
+
 %description
 Listen is a music manager and player for GNOME
 With listen you can:
@@ -83,15 +88,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}b1
-# the path is hardcoded in the Makefile
-%{__sed} -i 's/local//' Makefile
-# Under Fedora dockbook2x-man is renamed db2x_docbook2man
-%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
-# enable the use of %{find_lang} macros
-%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %ifarch x86_64
-# correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
+# correct path issue on x86_64 box
+%{__sed} -i 's/\/lib/\/lib64/' Makefile
 %endif
 
 %build
@@ -100,7 +103,7 @@
 # added - nolisten tcp -ac -terminate to fix build issue with mock
 %{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
 export DISPLAY=:$XDISPLAY
-xauth add $DISPLAY . EE
+xauth add :$XDISPLAY . EE
 make %{?_smp_mflags}
 
 
@@ -148,27 +151,32 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Fri Nov 20 2006 Ha??kel Gu??mar  0.5-8.beta1
+* Mon Nov 13 2006 Ha??kel Gu??mar  0.5-9.beta1
+- Fixed build issue
+- Replaced some sed one-liners by incremental patches
+- Minor bugs fixing (is Listen actively maintained ?)
+
+* Fri Oct 20 2006 Ha??kel Gu??mar  0.5-8.beta1
 - Fixed a path issue that prevent Listen to be launched on x86_64 
  systems. Now owns {_datadir}/%{name}
 
-* Sat Nov 14 2006 Ha??kel Gu??mar  0.5-7.beta1
+* Sat Oct 14 2006 Ha??kel Gu??mar  0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 
-* Thu Nov 12 2006 Ha??kel Gu??mar  0.5-6.beta1
+* Thu Oct 12 2006 Ha??kel Gu??mar  0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-5.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-4.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-4.beta1
 - Fixed build issue on x86_64
 
-* Sun Nov 08 2006 Ha??kel Gu??mar  0.5-3.beta1
+* Sun Oct 08 2006 Ha??kel Gu??mar  0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 
 
-* Thu Nov 05 2006 Ha??kel Gu??mar  0.5b1-2
+* Thu Oct 05 2006 Ha??kel Gu??mar  0.5b1-2
 - Added gettext and gtk2-devel as BR, fixed build issue with mock
 
 * Fri Sep 08 2006 Ha??kel Gu??mar  0.5b1-1
@@ -188,3 +196,6 @@
 
 * Thu May 11 2006 Ha??kel Gu??mar  0.4.3-1
 - First packaging
+
+
+



From fedora-extras-commits at redhat.com  Tue Nov 14 12:26:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:26:46 -0700
Subject: rpms/listen/devel listen.spec,1.15,1.16
Message-ID: <200611141226.kAECQkNB007045@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7000/devel

Modified Files:
	listen.spec 
Log Message:

Updated spec to fix build issue, some bugs fixes



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- listen.spec	20 Oct 2006 14:33:12 -0000	1.15
+++ listen.spec	14 Nov 2006 12:26:16 -0000	1.16
@@ -1,52 +1,56 @@
 Name:           listen
 Version:        0.5
-Release:        8.beta1%{?dist}
+Release:        9.beta1%{?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)
 
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig  
+ 
 Buildrequires: python-devel
+BuildRequires: python-ctypes
+BuildRequires: python-mutagen >= 1.6
+BuildRequires: python-sqlite2
+BuildRequires: dbus-python
 BuildRequires: pygtk2-devel 
 BuildRequires: gtk2-devel
-Buildrequires: pkgconfig
-Buildrequires: docbook2X
-BuildRequires: gettext
-Buildrequires: xorg-x11-server-Xvfb
-Buildrequires: xorg-x11-xauth
-Buildrequires: xorg-x11-fonts-base
-Buildrequires: xorg-x11-fonts-misc
 BuildRequires: gstreamer-python
-BuildRequires: dbus-python
-BuildRequires: python-sqlite2
-BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkhtml2
 BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
 BuildRequires: python-sexy
-BuildRequires: python-mutagen >= 1.6
+Buildrequires: xorg-x11-server-Xvfb
+Buildrequires: xorg-x11-xauth
+Buildrequires: xorg-x11-fonts-base
+Buildrequires: xorg-x11-fonts-misc
+Buildrequires: docbook2X
+BuildRequires: gettext
+Buildrequires: pkgconfig
 BuildRequires: desktop-file-utils
-
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig 
 
 # added explicit Requires
-Requires: python-mutagen >= 1.6
 Requires: python 
-Requires: pygtk2 
-Requires: gstreamer-python 
-Requires: dbus-python
-Requires: python-sqlite2
 Requires: python-ctypes
+Requires: python-mutagen >= 1.6
+Requires: python-sqlite2
+Requires: dbus-python
+Requires: pygtk2 
+Requires: gstreamer-python
 Requires: gnome-python2
 Requires: gnome-python2-extras
-Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
@@ -57,6 +61,7 @@
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
+
 %description
 Listen is a music manager and player for GNOME
 With listen you can:
@@ -83,15 +88,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}b1
-# the path is hardcoded in the Makefile
-%{__sed} -i 's/local//' Makefile
-# Under Fedora dockbook2x-man is renamed db2x_docbook2man
-%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
-# enable the use of %{find_lang} macros
-%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %ifarch x86_64
-# correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
+# correct path issue on x86_64 box
+%{__sed} -i 's/\/lib/\/lib64/' Makefile
 %endif
 
 %build
@@ -100,7 +103,7 @@
 # added - nolisten tcp -ac -terminate to fix build issue with mock
 %{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
 export DISPLAY=:$XDISPLAY
-xauth add $DISPLAY . EE
+xauth add :$XDISPLAY . EE
 make %{?_smp_mflags}
 
 
@@ -148,27 +151,32 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Fri Nov 20 2006 Ha??kel Gu??mar  0.5-8.beta1
+* Mon Nov 13 2006 Ha??kel Gu??mar  0.5-9.beta1
+- Fixed build issue
+- Replaced some sed one-liners by incremental patches
+- Minor bugs fixing (is Listen actively maintained ?)
+
+* Fri Oct 20 2006 Ha??kel Gu??mar  0.5-8.beta1
 - Fixed a path issue that prevent Listen to be launched on x86_64 
  systems. Now owns {_datadir}/%{name}
 
-* Sat Nov 14 2006 Ha??kel Gu??mar  0.5-7.beta1
+* Sat Oct 14 2006 Ha??kel Gu??mar  0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 
-* Thu Nov 12 2006 Ha??kel Gu??mar  0.5-6.beta1
+* Thu Oct 12 2006 Ha??kel Gu??mar  0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-5.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-4.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-4.beta1
 - Fixed build issue on x86_64
 
-* Sun Nov 08 2006 Ha??kel Gu??mar  0.5-3.beta1
+* Sun Oct 08 2006 Ha??kel Gu??mar  0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 
 
-* Thu Nov 05 2006 Ha??kel Gu??mar  0.5b1-2
+* Thu Oct 05 2006 Ha??kel Gu??mar  0.5b1-2
 - Added gettext and gtk2-devel as BR, fixed build issue with mock
 
 * Fri Sep 08 2006 Ha??kel Gu??mar  0.5b1-1
@@ -188,3 +196,6 @@
 
 * Thu May 11 2006 Ha??kel Gu??mar  0.4.3-1
 - First packaging
+
+
+



From fedora-extras-commits at redhat.com  Tue Nov 14 12:27:46 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Tue, 14 Nov 2006 05:27:46 -0700
Subject: rpms/gutenprint/FC-6 gutenprint.spec,1.2,1.3
Message-ID: <200611141227.kAECRk9d007074@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/gutenprint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7051

Modified Files:
	gutenprint.spec 
Log Message:



Index: gutenprint.spec
===================================================================
RCS file: /cvs/extras/rpms/gutenprint/FC-6/gutenprint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gutenprint.spec	3 Oct 2006 04:34:07 -0000	1.2
+++ gutenprint.spec	14 Nov 2006 12:27:16 -0000	1.3
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.0.0
-Release:        0.15%{?dist}
+Release:        0.16%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -200,6 +200,7 @@
 Summary:        CUPS drivers for Canon, Epson, HP and compatible printers
 Group:          Applications/Publishing
 Requires:       cups >= 1.2.1-1.7
+Requires:	gimp-print-cups
 
 %description cups
 This package contains native CUPS support for a wide range of Canon,
@@ -379,6 +380,9 @@
 %{_datadir}/cups/model/gutenprint/5.0/zh_TW
 
 %changelog
+* Tue Nov 14 2006 Parag Nemade - 5.0.0-0.16
+- Added missing dependency of gimp-print-cups in gutenprint-cups
+
 * Thu Oct 03 2006 Parag Nemade - 5.0.0-0.15
 - Did some fix for tag issue
 



From fedora-extras-commits at redhat.com  Tue Nov 14 12:30:59 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:30:59 -0700
Subject: rpms/listen/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611141230.kAECUxKd007221@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171/FC-5

Modified Files:
	.cvsignore sources 
Log Message:

Uploaded patchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2006 08:26:18 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
@@ -1 +1,5 @@
 listen-0.5b1.tar.gz
+Makefile.patch
+const.py.patch
+check.py.patch
+dialog.py.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Oct 2006 08:26:18 -0000	1.2
+++ sources	14 Nov 2006 12:30:29 -0000	1.3
@@ -1 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
+e72064d64d4611ea539878219ebfad22  Makefile.patch
+7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
+fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
+98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 12:31:00 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:31:00 -0700
Subject: rpms/listen/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611141231.kAECV0nb007229@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171/devel

Modified Files:
	.cvsignore sources 
Log Message:

Uploaded patchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2006 08:26:18 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:30:30 -0000	1.3
@@ -1 +1,5 @@
 listen-0.5b1.tar.gz
+Makefile.patch
+const.py.patch
+check.py.patch
+dialog.py.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Oct 2006 08:26:18 -0000	1.2
+++ sources	14 Nov 2006 12:30:30 -0000	1.3
@@ -1 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
+e72064d64d4611ea539878219ebfad22  Makefile.patch
+7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
+fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
+98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 12:31:00 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:31:00 -0700
Subject: rpms/listen/FC-6 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611141231.kAECV0nE007225@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171/FC-6

Modified Files:
	.cvsignore sources 
Log Message:

Uploaded patchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2006 08:26:18 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
@@ -1 +1,5 @@
 listen-0.5b1.tar.gz
+Makefile.patch
+const.py.patch
+check.py.patch
+dialog.py.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Oct 2006 08:26:18 -0000	1.2
+++ sources	14 Nov 2006 12:30:29 -0000	1.3
@@ -1 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
+e72064d64d4611ea539878219ebfad22  Makefile.patch
+7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
+fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
+98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 12:51:34 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 05:51:34 -0700
Subject: owners owners.list,1.1957,1.1958
Message-ID: <200611141251.kAECpYlQ007505@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7489

Modified Files:
	owners.list 
Log Message:
Added flite



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1957
retrieving revision 1.1958
diff -u -r1.1957 -r1.1958
--- owners.list	14 Nov 2006 07:28:56 -0000	1.1957
+++ owners.list	14 Nov 2006 12:51:03 -0000	1.1958
@@ -406,6 +406,7 @@
 Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|flight-of-the-amazon-queen-cd|Flight of the Amazon Queen - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|flite|Small, fast speech synthesis engine (text-to-speech)|faucamp at csir.co.za|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fluidsynth|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 12:59:35 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Nov 2006 05:59:35 -0700
Subject: rpms/knetworkmanager/FC-6 .cvsignore, 1.4,
	1.5 knetworkmanager-dbus.patch, 1.1, 1.2 knetworkmanager.spec,
	1.4, 1.5 sources, 1.4, 1.5 01-build-fix.patch, 1.1,
	NONE knetworkmanager-call-scn-not-yast.patch, 1.1, NONE
Message-ID: <200611141259.kAECxZbG007653@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/knetworkmanager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7591

Modified Files:
	.cvsignore knetworkmanager-dbus.patch knetworkmanager.spec 
	sources 
Removed Files:
	01-build-fix.patch knetworkmanager-call-scn-not-yast.patch 
Log Message:
 remove no longer needed patches update to new snapshot 
use kppp instead of system-config-network for dialup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Sep 2006 12:38:08 -0000	1.4
+++ .cvsignore	14 Nov 2006 12:59:04 -0000	1.5
@@ -1 +1 @@
-knetworkmanager-svn20060912.tar.bz2
+knetworkmanager-svn20061113.tar.bz2

knetworkmanager-dbus.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 knetworkmanager-dbus.patch
Index: knetworkmanager-dbus.patch
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/knetworkmanager-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- knetworkmanager-dbus.patch	11 Aug 2006 02:22:31 -0000	1.1
+++ knetworkmanager-dbus.patch	14 Nov 2006 12:59:04 -0000	1.2
@@ -1,20 +1,1477 @@
 diff -Nur knetworkmanager-orig/knetworkmanager/configure.in.in knetworkmanager/knetworkmanager/configure.in.in
---- knetworkmanager-orig/knetworkmanager/configure.in.in	2006-03-30 05:26:31.000000000 -0600
-+++ knetworkmanager/knetworkmanager/configure.in.in	2006-08-10 20:30:08.000000000 -0500
-@@ -36,10 +36,6 @@
-   CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
--  AC_CHECK_HEADER([dbus/connection.h],,[
--     AC_MSG_WARN([You need D-BUS/Qt3 bindings])
--     DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
--  ])
-   CPPFLAGS=$safe_CPPFLAGS
-   AC_LANG_RESTORE
+--- knetworkmanager-orig/knetworkmanager/configure.in.in	2006-09-22 08:29:20.000000000 -0500
++++ knetworkmanager/knetworkmanager/configure.in.in	2006-11-13 22:17:18.000000000 -0600
+@@ -7,9 +7,6 @@
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION, $KNETWORKMANAGER_VERSION, [KNetworkManager Version])
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION_STRING, "$KNETWORKMANAGER_VERSION", [KNetworkManager Version String])
  
+-# Check for D-Bus and HAL
+-
+-AC_MSG_CHECKING(for D-BUS)
+ 
+ # test if variables are already set
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+@@ -40,10 +37,6 @@
+ CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+-AC_CHECK_HEADER([dbus/connection.h],,[
+-	AC_MSG_WARN([You need D-Bus/Qt3 bindings])
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
+-])
+ CPPFLAGS=$safe_CPPFLAGS
+ AC_LANG_RESTORE
+ 
+@@ -51,6 +44,7 @@
+ AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse]))
+ if test "x$with_distro" = "x"; then
+ 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
++	AC_CHECK_FILE(/etc/fedora-release,with_distro="fedora")
+ 	if test "x$with_distro" = "x"; then
+ 		with_distro=`lsb_release -is`
+ 	fi
+@@ -65,7 +59,10 @@
+ 		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.)"
+ 			;;
+ 	esac
+diff -Nur knetworkmanager-orig/knetworkmanager/Makefile.in knetworkmanager/knetworkmanager/Makefile.in
+--- knetworkmanager-orig/knetworkmanager/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/knetworkmanager/Makefile.in	2006-11-13 22:14:46.000000000 -0600
+@@ -0,0 +1,751 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision$ 
++# @configure_input@
++
++# 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.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++subdir = knetworkmanager
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++	AUTHORS COPYING ChangeLog INSTALL NEWS TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++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)$(dbusservicedir)"
++dbusserviceDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(dbusservice_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTSCCONFIG = @ARTSCCONFIG@
++AUTOCONF = @AUTOCONF@
++AUTODIRS = @AUTODIRS@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CONF_FILES = @CONF_FILES@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DBUS_SYS_DIR = @DBUS_SYS_DIR@
++DCOPIDL = @DCOPIDL@
++DCOPIDL2CPP = @DCOPIDL2CPP@
++DCOPIDLNG = @DCOPIDLNG@
++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
++GMSGFMT = @GMSGFMT@
++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
++KCONFIG_COMPILER = @KCONFIG_COMPILER@
++KDECONFIG = @KDECONFIG@
++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
[...10899 lines suppressed...]
++
++
++install-data-local:
++	@echo ""
++	@echo ""
++	@echo "*************** Important *************************"
++	@echo ""
++	@echo "This module contains unreleased software."
++	@echo ""
++	@echo "The software may compile and work, but it may just"
++	@echo "as well neither compile nor work."
++	@echo ""
++	@echo "****************************************************"
++	@echo ""
++
++dist-hook:
++	cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
++apidox-am-yes:
++	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
++		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++	fi ; \
++	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++	test -d $(top_builddir)/apidocs || \
++		( cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--no-modulename --installdir=$(kde_libs_htmldir)/en \
++		--no-recurse $(abs_top_srcdir) . ) ; \
++	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \
++		$$abs_top_srcdir $(subdir)
++
++apidox-am-toplevel-yes:
++	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \
++		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++	fi ; \
++	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--no-modulename --installdir=$(kde_libs_htmldir)/en \
++		$$abs_top_srcdir
++
++apidox-am-no:
++
++apidox-am-toplevel-no:
++
++apidox:
++	@if test "$(subdir)" != "."; then \
++		$(MAKE) apidox-am- at KDE_HAS_DOXYGEN@ ;\
++	else \
++		$(MAKE) apidox-am-toplevel- at KDE_HAS_DOXYGEN@ ;\
++	fi
++
++install-data-local: install-apidox
++
++install-apidox:
++	@if test "$(subdir)" != "."; then \
++		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html ; \
++		if test -f $(top_builddir)/apidocs/$(subdir)/$(subdir).tag; then \
++		echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		fi; \
++		if test -d $(top_builddir)/apidocs/$(subdir)/html; then \
++			list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \
++			echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\
++			for file in $$list; do \
++				$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
++		done; \
++		fi; \
++	else\
++		if test -d $(top_builddir)/apidocs; then \
++		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
++		list=`cd $(top_builddir)/apidocs && ls -1`; \
++		echo "installing $(top_builddir)/apidocs/$$file" ;\
++		echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \
++		for file in $$list; do \
++			if test -f $(top_builddir)/apidocs/$$file; then \
++				$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
++			fi; \
++		done ; fi; \
++	fi
++
++uninstall-local: uninstall-apidox
++
++uninstall-apidox:
++	@if test "$(subdir)" != "."; then \
++		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
++			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		fi \
++	else \
++		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
++			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
++		fi \
++	fi
++
++install-apidox-recurse: install-apidox
++	@set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
++	    list='$(SUBDIRS)'; \
++	    for subdir in $$list; do \
++		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \
++		echo "Installing apidox from $$subdir"; \
++		if test "$$subdir" != "."; then \
++			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \
++		fi ; fi ;\
++	    done; \
++	fi
++
++.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
++
++# Local Variables:
++# mode: makefile
++# End:
++$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
++
++$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in
++
++$(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES)
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh
++
++$(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
++
++$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
++
++# defining default rules for files that may not be present
++$(top_srcdir)/Makefile.am.in:
++$(CONF_FILES):
++# 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.
++.NOEXPORT:
++
++#>+ 2
++KDE_DIST=knetworkmanager.lang.dbus subdirs Makefile.in knetworkmanager.lang INDEX configure.files config.h.in Makefile.am.dbus configure.in Makefile.cvs aclocal.m4 subdirs.dbus stamp-h1.dbus configure.in.in acinclude.m4 Makefile.am configure libtool.dbus Makefile.am.in 
++
++#>+ 2
++docs-am:
++
++#>+ 7
++force-reedit:
++	 \
++	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++	
++	cd $(top_srcdir) && perl admin/am_edit Makefile.in
++
++
++#>+ 21
++clean-bcheck: 
++	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
++
++bcheck: bcheck-recursive
++
++bcheck-am:
++	@for i in ; do \
++	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
++	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
++	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
++	        echo "$$i"; \
++	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++	            rm -f $$i.bchecktest.cc; exit 1; \
++	        fi ; \
++	        echo "" >> $$i.bchecktest.cc.class; \
++	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
++	        rm -f a.out; \
++	    fi ; \
++	done
++
++
++#>+ 3
++final:
++	$(MAKE) all-am
++
++#>+ 3
++final-install:
++	$(MAKE) install-am
++
++#>+ 3
++no-final:
++	$(MAKE) all-am
++
++#>+ 3
++no-final-install:
++	$(MAKE) install-am
++
++#>+ 3
++kde-rpo-clean:
++	-rm -f *.rpo
++
++#>+ 3
++nmcheck: 
++nmcheck-am: nmcheck
+diff -Nur knetworkmanager-orig/stamp-h1 knetworkmanager/stamp-h1
+--- knetworkmanager-orig/stamp-h1	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/stamp-h1	2006-11-13 22:14:28.000000000 -0600
+@@ -0,0 +1 @@
++timestamp for config.h
+diff -Nur knetworkmanager-orig/subdirs knetworkmanager/subdirs
+--- knetworkmanager-orig/subdirs	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/subdirs	2006-11-13 22:14:28.000000000 -0600
+@@ -0,0 +1 @@
++knetworkmanager


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/knetworkmanager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- knetworkmanager.spec	13 Sep 2006 12:38:08 -0000	1.4
+++ knetworkmanager.spec	14 Nov 2006 12:59:04 -0000	1.5
@@ -1,8 +1,8 @@
-%define		svn svn20060912
+%define		svn svn20061113
 
 Name:           knetworkmanager
 Version:        0.1
-Release:        0.1.%{svn}%{?dist}
+Release:        0.4.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -11,14 +11,8 @@
 Source0:        knetworkmanager-%{svn}.tar.bz2
 #script to make svn tarball
 Source1:	knetworkmanager-svn_checkout.sh
-# Patch Is required because SuSE have a broken kdepim-devel that exports non standard headers 
-# they also hard code the /opt/kde3/include path in there. the patch adds the needed header 
-# file and fixes the path
-Patch0:		http://aur.archlinux.org/packages/knetworkmanager-svn/knetworkmanager-svn/01-build-fix.patch
-# Suse Hard coded yast for dialup configuration. this patch calls System-config-network instead
-Patch1:		knetworkmanager-call-scn-not-yast.patch
 # Patch adds dbus support  as dbusqt3 is no longer in extras
-Patch2:		knetworkmanager-dbus.patch
+Patch0:		knetworkmanager-dbus.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,9 +25,7 @@
 
 %prep
 %setup -q -n knetworkmanager
-%patch0 -p0 
-%patch1 -p1 -b .eww-yast
-%patch2 -p1 -b .dbus
+%patch0 -p1 -b .dbus
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -54,7 +46,6 @@
 --remove-category=Network \
 --add-category=Applications \
 --add-category=System \
---add-category=X-Fedora \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop
 
@@ -93,6 +84,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.4.svn20061113
+- update to new svn snapshot  change dialup networking to call kppp
+
 * Wed Sep 13 2006 Dennis Gilmore  - 0.1-0.4.svn20060912
 - add BR on wireless-tools-devel update snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Sep 2006 12:38:08 -0000	1.4
+++ sources	14 Nov 2006 12:59:04 -0000	1.5
@@ -1 +1 @@
-8e189f0799aa3927a363c6c0c585613d  knetworkmanager-svn20060912.tar.bz2
+e7ecf02d0d9011dab93b665d8d3b28f6  knetworkmanager-svn20061113.tar.bz2


--- 01-build-fix.patch DELETED ---


--- knetworkmanager-call-scn-not-yast.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 13:00:10 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:00:10 -0700
Subject: rpms/flite - New directory
Message-ID: <200611141300.kAED0AQi007704@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7700/flite

Log Message:
Directory /cvs/extras/rpms/flite added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 13:00:16 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:00:16 -0700
Subject: rpms/flite/devel - New directory
Message-ID: <200611141300.kAED0Gfb007720@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7700/flite/devel

Log Message:
Directory /cvs/extras/rpms/flite/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 13:01:09 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:01:09 -0700
Subject: rpms/flite Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611141301.kAED19m3010752@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10403

Added Files:
	Makefile import.log 
Log Message:
Setup of module flite


--- NEW FILE Makefile ---
# Top level Makefile for module flite
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  Tue Nov 14 13:01:17 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:01:17 -0700
Subject: rpms/flite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611141301.kAED1Hv6010786@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10403/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flite


--- 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 Nov 14 13:05:30 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Nov 2006 06:05:30 -0700
Subject: rpms/knetworkmanager/FC-6 knetworkmanager.spec,1.5,1.6
Message-ID: <200611141305.kAED5UJ2010903@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/knetworkmanager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887

Modified Files:
	knetworkmanager.spec 
Log Message:
messed up checkin tag process :(



Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/knetworkmanager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- knetworkmanager.spec	14 Nov 2006 12:59:04 -0000	1.5
+++ knetworkmanager.spec	14 Nov 2006 13:04:55 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           knetworkmanager
 Version:        0.1
-Release:        0.4.%{svn}%{?dist}
+Release:        0.5.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.5.svn20061113
+- messed up check in :(
+
 * Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.4.svn20061113
 - update to new svn snapshot  change dialup networking to call kppp
 



From fedora-extras-commits at redhat.com  Tue Nov 14 13:08:20 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:08:20 -0700
Subject: rpms/flite/devel README-ALSA.txt, NONE,
	1.1 flite-1.3-alsa_support.patch, NONE,
	1.1 flite-1.3-doc_texinfo.patch, NONE,
	1.1 flite-1.3-sharedlibs.patch, NONE, 1.1 flite.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611141308.kAED8KYH011092@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11008/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README-ALSA.txt flite-1.3-alsa_support.patch 
	flite-1.3-doc_texinfo.patch flite-1.3-sharedlibs.patch 
	flite.spec 
Log Message:
auto-import flite-1.3-8 on branch devel from flite-1.3-8.src.rpm


--- NEW FILE README-ALSA.txt ---

Native ALSA support for Flite 1.3 - patch created by
Lukas Loehrer 


flite-1.3-alsa_support.patch:

--- NEW FILE flite-1.3-alsa_support.patch ---
diff -uNr flite-1.3-release/configure.in flite-1.3-release-mod/configure.in
--- flite-1.3-release/configure.in	2005-08-13 13:43:21.000000000 +0200
+++ flite-1.3-release-mod/configure.in	2006-11-13 21:16:27.000000000 +0200
@@ -206,10 +206,10 @@
 AC_CHECK_HEADER(sys/audioio.h,
               [AUDIODRIVER="sun"
                AUDIODEFS=-DCST_AUDIO_SUNOS])
-dnl AC_CHECK_HEADER(sys/asoundlib.h,
-dnl              [AUDIODRIVER="alsa"
-dnl	       AUDIODEFS=-DCST_AUDIO_ALSA
-dnl               AUDIOLIBS=-lasound])
+AC_CHECK_HEADER(alsa/asoundlib.h,
+              [AUDIODRIVER="alsa"
+	       AUDIODEFS=-DCST_AUDIO_ALSA
+               AUDIOLIBS=-lasound])
 AC_CHECK_HEADER(mmsystem.h,
 	      [AUDIODRIVER="wince"
 	       AUDIODEFS=-DCST_AUDIO_WINCE
diff -uNr flite-1.3-release/src/audio/au_alsa.c flite-1.3-release-mod/src/audio/au_alsa.c
--- flite-1.3-release/src/audio/au_alsa.c	1970-01-01 02:00:00.000000000 +0200
+++ flite-1.3-release-mod/src/audio/au_alsa.c	2006-11-13 21:16:54.000000000 +0200
@@ -0,0 +1,311 @@
+/*************************************************************************/
+/*                                                                       */
+/*                  Language Technologies Institute                      */
+/*                     Carnegie Mellon University                        */
+/*                        Copyright (c) 2000                             */
+/*                        All Rights Reserved.                           */
+/*                                                                       */
+/*  Permission is hereby granted, free of charge, to use and distribute  */
+/*  this software and its documentation without restriction, including   */
+/*  without limitation the rights to use, copy, modify, merge, publish,  */
+/*  distribute, sublicense, and/or sell copies of this work, and to      */
+/*  permit persons to whom this work is furnished to do so, subject to   */
+/*  the following conditions:                                            */
+/*   1. The code must retain the above copyright notice, this list of    */
+/*      conditions and the following disclaimer.                         */
+/*   2. Any modifications must be clearly marked as such.                */
+/*   3. Original authors' names are not deleted.                         */
+/*   4. The authors' names are not used to endorse or promote products   */
+/*      derived from this software without specific prior written        */
+/*      permission.                                                      */
+/*                                                                       */
+/*  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         */
+/*  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      */
+/*  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   */
+/*  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      */
+/*  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    */
+/*  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   */
+/*  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          */
+/*  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       */
+/*  THIS SOFTWARE.                                                       */
+/*                                                                       */
+/*********************************************************************** */
+/*             Author:  Lukas Loehrer (                                  */
+/*               Date:  January 2005                                     */
+/*************************************************************************/
+/*                                                                       */
+/*  Native access to alsa audio devices on Linux                         */
+/*  Tested with libasound version 1.0.10                                 */
+/*************************************************************************/
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "cst_string.h"
+#include "cst_wave.h"
+#include "cst_audio.h"
+
+#include 
+
+
+/*static char *pcm_dev_name = "hw:0,0"; */
+static char *pcm_dev_name ="default";
+
+static inline void print_pcm_state(snd_pcm_t *handle, char *msg)
+{
+  fprintf(stderr, "PCM state at %s = %s\n", msg,
+		  snd_pcm_state_name(snd_pcm_state(handle)));
+}
+
+cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt)
+{
+  cst_audiodev *ad;
+  unsigned 	int real_rate;
+  int err;
+
+  /* alsa specific stuff */
+  snd_pcm_t *pcm_handle;          
+  snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;
+  snd_pcm_hw_params_t *hwparams;
+  snd_pcm_format_t format;
+  snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED;
+
+  /* Allocate the snd_pcm_hw_params_t structure on the stack. */
+  snd_pcm_hw_params_alloca(&hwparams);
+
+  /* Open pcm device */
+  err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0);
+  if (err < 0) 
+  {
+	cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n",
+			   pcm_dev_name, snd_strerror(err));
+	return NULL;
+  }
+
+  /* Init hwparams with full configuration space */
+  err = snd_pcm_hw_params_any(pcm_handle, hwparams);
+  if (err < 0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err));
+	return NULL;
+  }
+
+  /* Set access mode */
+  err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access);
+  if (err < 0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err));
+	return NULL;
+  }
+
+  /* Determine matching alsa sample format */
+  /* This could be implemented in a more */
+  /* flexible way (byte order conversion). */
+  switch (fmt)
+  {
+  case CST_AUDIO_LINEAR16:
+	if (CST_LITTLE_ENDIAN)
+	  format = SND_PCM_FORMAT_S16_LE;
+	else
+	  format = SND_PCM_FORMAT_S16_BE;
+	break;
+  case CST_AUDIO_LINEAR8:
+	format = SND_PCM_FORMAT_U8;
+	break;
+  case CST_AUDIO_MULAW:
+	format = SND_PCM_FORMAT_MU_LAW;
+	break;
+  default:
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to find suitable format.\n");
+	return NULL;
+	break;
+  }
+
+  /* Set samble format */
+  err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format);
+  if (err <0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err));
+	return NULL;
+  }
+
+  /* Set sample rate near the disired rate */
+  real_rate = sps;
+  err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0);
+  if (err < 0)   
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err));
+	return NULL;
+  }
+  /*FIXME:  This is probably too strict */
+  assert(sps == real_rate);
+
+  /* Set number of channels */
+  assert(channels >0);
+  err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels);
+  if (err < 0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err));
+	return NULL;
+  }
+
+  /* Commit hardware parameters */
+  err = snd_pcm_hw_params(pcm_handle, hwparams);
+  if (err < 0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err));
+	return NULL;
+  }
+
+  /* Make sure the device is ready to accept data */
+  assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED);
+
+  /* Write hardware parameters to flite audio device data structure */
+  ad = cst_alloc(cst_audiodev, 1);
+  assert(ad != NULL);
+  ad->real_sps = ad->sps = sps;
+  ad->real_channels = ad->channels = channels;
+  ad->real_fmt = ad->fmt = fmt;
+  ad->platform_data = (void *) pcm_handle;
+
+  return ad;
+}
+
+int audio_close_alsa(cst_audiodev *ad)
+{
+  int result;
+  snd_pcm_t *pcm_handle;
+
+  if (ad == NULL)
+	return 0;
+
+  pcm_handle = (snd_pcm_t *) ad->platform_data;
+  result = snd_pcm_close(pcm_handle);
+  if (result < 0)
+  {
+	cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result));
+  }
+  cst_free(ad);
+  return result;
+}
+
+/* Returns zero if recovery was successful. */
+static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res)
+{
+  if (res == -EPIPE) /* xrun */
+  {
+	res = snd_pcm_prepare(pcm_handle);
+	if (res < 0) 
+	{
+	  /* Failed to recover from xrun */
+	  cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res));
+	  return res;
+	}
+  } 
+  else if (res == -ESTRPIPE) /* Suspend */
+  {
+	while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) 
+	{
+	  snd_pcm_wait(pcm_handle, 1000);
+	}
+	if (res < 0) 
+	{
+	  res = snd_pcm_prepare(pcm_handle);
+	  if (res <0) 
+	  {
+		/* Resume failed */
+		cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res));
+		return res;
+	  }
+	}
+  } 
+  else if (res < 0) 
+  {
+	/* Unknown failure */
+	cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res));
+	return res;
+  }
+  return 0;
+}
+
+int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes)
+{
+  size_t frame_size;
+  ssize_t num_frames, res;
+  snd_pcm_t *pcm_handle;
+  char *buf = (char *) samples;
+
+  /* Determine frame size in bytes */
+  frame_size  = audio_bps(ad->real_fmt) * ad->real_channels;
+  /* Require that only complete frames are handed in */
+  assert((num_bytes % frame_size) == 0);
+  num_frames = num_bytes / frame_size;
+  pcm_handle = (snd_pcm_t *) ad->platform_data;
+
+  while (num_frames > 0) 
+  {
+	res = snd_pcm_writei(pcm_handle, buf, num_frames);
+	if (res != num_frames) 
+	{
+	  if (res == -EAGAIN || (res > 0 && res < num_frames)) 
+	  {
+		snd_pcm_wait(pcm_handle, 100);
+	  }
+	  else if (recover_from_error(pcm_handle, res) < 0) 
+	  {
+		return -1;
+	  }
+	}
+
+	if (res >0) 
+	{
+	  num_frames -= res;
+	  buf += res * frame_size;
+	}
+  }
+  return num_bytes;
+}
+
+int audio_flush_alsa(cst_audiodev *ad)
+{
+  int result;
+  result = snd_pcm_drain((snd_pcm_t *) ad->platform_data);
+  if (result < 0)
+  {
+	cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
+  }
+	/* Prepare device for more data */
+  result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
+if (result < 0)
+  {
+	cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
+  }
+  return result;
+}
+
+int audio_drain_alsa(cst_audiodev *ad)
+{
+  int result;
+  result = snd_pcm_drop((snd_pcm_t *) ad->platform_data);
+  if (result < 0)
+  {
+	cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
+  }
+/* Prepare device for more data */
+  result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
+if (result < 0)
+  {
+	cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
+  }
+  return result;
+}

flite-1.3-doc_texinfo.patch:

--- NEW FILE flite-1.3-doc_texinfo.patch ---
diff -uNr flite-1.3-release/doc/flite.texi flite-1.3-mod/doc/flite.texi
--- flite-1.3-release/doc/flite.texi	2005-08-14 21:50:02.000000000 +0200
+++ flite-1.3-mod/doc/flite.texi	2006-05-08 12:39:54.000000000 +0200
@@ -711,14 +711,14 @@
 cst_voice *register_cmu_us_kal();
 
 int main(int argc, char **argv)
-{
+@{
     cst_voice *v;
 
     if (argc != 2)
-    {
+    @{
         fprintf(stderr,"usage: flite_test FILE\n");
         exit(-1);
-    }
+    @}
 
     flite_init();
 
@@ -726,7 +726,7 @@
 
     flite_file_to_speech(argv[1],v,"play");
 
-}
+@}
 @end example
 Assuming the shell variable FLITEDIR is set to the flite directory
 the following will compile the system (with appropriate changes for
diff -uNr flite-1.3-release/doc/Makefile flite-1.3-mod/doc/Makefile
--- flite-1.3-release/doc/Makefile	2005-01-04 00:55:33.000000000 +0200
+++ flite-1.3-mod/doc/Makefile	2006-05-08 12:39:45.000000000 +0200
@@ -50,7 +50,7 @@
 flite.html: flite.texi
 	@ if [ ! -d html ] ; \
           then mkdir -p html ; fi
-	(cd html; texi2html -number -split_chapter ../flite.texi)
+	(cd html; texi2html -number -split_chapter ../flite.texi; mv flite/* .; rmdir flite)
 	@ for i in html/*.html ; \
 	  do \
 	    sed 's///' $$i >ttt.html; \

flite-1.3-sharedlibs.patch:

--- NEW FILE flite-1.3-sharedlibs.patch ---
diff -uNr flite-1.3-release/config/common_make_rules flite-1.3-release-mod/config/common_make_rules
--- flite-1.3-release/config/common_make_rules	2004-12-20 00:20:43.000000000 +0200
+++ flite-1.3-release-mod/config/common_make_rules	2006-11-12 12:17:25.000000000 +0200
@@ -59,27 +59,35 @@
 endif
 OBJDIR=$(BUILDDIR)/obj/$(DIRNAME)
 BINDIR=$(BUILDDIR)/bin
+LIBDIR=$(BUILDDIR)/lib
 ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
 BINDIR=$(TOP)/bin
+LIBDIR=$(TOP)/lib
 endif
 
-LIBDIR=$(BUILDDIR)/lib
 BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
 
-FLITELIBS = $(BUILDDIR)/lib/libflite.a
-LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
+ifdef SHFLAGS
+FLITELIBS = $(LIBDIR)/libflite.so
+LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS)
+else
+FLITELIBS = $(LIBDIR)/libflite.a
+LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
+endif
 
 FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
 ifdef SHFLAGS
 SOOBJS = $(OBJS:.o=.os)
-FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
+FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%)
 ifdef LIBNAME
 ALL += $(OBJDIR)/.build_so
 endif
-endif
+else
 ifdef LIBNAME
 ALL += $(OBJDIR)/.build_lib
 endif
+endif
+
 # Only do some directories when you are not cross compiling
 ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
 OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS)
@@ -117,14 +125,14 @@
 	@ touch $(OBJDIR)/.build_so
 
 # Used in the lib/ directory and in building new voices
-$(OBJDIR)/%.so: %.shared.a
+%.so: %.shared.a
 	@ echo making $@
 	@ rm -rf shared_os && mkdir shared_os
-	@ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} 
+	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
 	@ (cd shared_os && ar x ../$<)
-	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-	@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
-	@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
+	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS)))
+	@ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
+	@ ln -s $@.${PROJECT_SHLIB_VERSION} $@
 	@ rm -rf shared_os
 
 $(OBJDIR)/.make_build_dirs:
diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile
--- flite-1.3-release/lib/Makefile	1970-01-01 02:00:00.000000000 +0200
+++ flite-1.3-release-mod/lib/Makefile	2006-11-12 12:17:40.000000000 +0200
@@ -0,0 +1,73 @@
+###########################################################################
+##                                                                       ##
+##                  Language Technologies Institute                      ##
+##                     Carnegie Mellon University                        ##
+##                        Copyright (c) 1999                             ##
+##                        All Rights Reserved.                           ##
+##                                                                       ##
+##  Permission is hereby granted, free of charge, to use and distribute  ##
+##  this software and its documentation without restriction, including   ##
+##  without limitation the rights to use, copy, modify, merge, publish,  ##
+##  distribute, sublicense, and/or sell copies of this work, and to      ##
+##  permit persons to whom this work is furnished to do so, subject to   ##
+##  the following conditions:                                            ##
+##   1. The code must retain the above copyright notice, this list of    ##
+##      conditions and the following disclaimer.                         ##
+##   2. Any modifications must be clearly marked as such.                ##
+##   3. Original authors' names are not deleted.                         ##
+##   4. The authors' names are not used to endorse or promote products   ##
+##      derived from this software without specific prior written        ##
+##      permission.                                                      ##
+##                                                                       ##
+##  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         ##
+##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
+##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
+##  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      ##
+##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
+##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
+##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
+##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
+##  THIS SOFTWARE.                                                       ##
+##                                                                       ##
+###########################################################################
+##                                                                       ##
+##    FLITE libraries                                                    ##
+##                                                                       ##
+###########################################################################
+TOP=..
+DIRNAME=lib
+BUILD_DIRS = 
+ALL_DIRS=
+FILES = Makefile
+LIBNAMES = flite flite_cmulex flite_usenglish \
+           flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb
+
+STATICLIBS= $(LIBNAMES:%=lib%.a)
+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
+#SHAREDLIBS = $(LIBNAMES:%=lib%.so)
+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
+                    $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
+ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
+
+ALL = shared_libs
+
+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
+
+include $(TOP)/config/common_make_rules
+
+ifdef SHFLAGS
+shared_libs: $(SHAREDLIBS)
+libflite_LDLIBS = -lm $(AUDIOLIBS)
+libflite_cmulex_LDLIBS = -lflite
+libflite_usenglish_LDLIBS = -lflite
+libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish
+libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish
+libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
+else
+shared_libs: nothing
+endif
+
+install:
+	@ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
+
diff -uNr flite-1.3-release/main/Makefile flite-1.3-release-mod/main/Makefile
--- flite-1.3-release/main/Makefile	2005-08-08 00:38:42.000000000 +0200
+++ flite-1.3-release-mod/main/Makefile	2006-11-12 11:44:46.000000000 +0200
@@ -50,11 +50,11 @@
 
 flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX) 
 flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
-flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
+flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so)
 
 flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX)
 flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
-flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
+flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so)
 
 include $(TOP)/config/common_make_rules
 
diff -uNr flite-1.3-release/Makefile flite-1.3-release-mod/Makefile
--- flite-1.3-release/Makefile	2005-11-01 15:40:45.000000000 +0200
+++ flite-1.3-release-mod/Makefile	2006-11-12 11:44:46.000000000 +0200
@@ -41,7 +41,7 @@
 ###########################################################################
 TOP=.
 DIRNAME=
-BUILD_DIRS = include src lang doc
+BUILD_DIRS = include src lang lib doc
 ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main
 CONFIG=configure configure.in config.sub config.guess \
        missing install-sh mkinstalldirs


--- NEW FILE flite.spec ---
Name:           flite
Version:        1.3
Release:        8%{?dist}
Summary:        Small, fast speech synthesis engine (text-to-speech)

Group:          Applications/Multimedia
License:        BSD-style
URL:            http://fife.speech.cs.cmu.edu/flite/
Source0:        http://fife.speech.cs.cmu.edu/flite/packed/%{name}-%{version}/%{name}-%{version}-release.tar.gz
Source1:        README-ALSA.txt
Patch0:         flite-1.3-sharedlibs.patch
Patch1:         flite-1.3-doc_texinfo.patch
Patch2:         flite-1.3-alsa_support.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  texi2html ed alsa-lib-devel autoconf


%description
Flite (festival-lite) is a small, fast run-time speech synthesis engine
developed at CMU and primarily designed for small embedded machines and/or
large servers. Flite is designed as an alternative synthesis engine to
Festival for voices built using the FestVox suite of voice building tools.


%package devel
Summary: Development files for flite
Group: Development/Libraries
Requires: flite = %{version}-%{release}


%description devel
Development files for Flite, a small, fast speech synthesis engine.


%prep
%setup -q -n %{name}-%{version}-release
%patch0 -p1 -b .flite-1.3-sharedlibs
%patch1 -p1 -b .flite-1.3-doc_texinfo
%patch2 -p1 -b .flite-1.3-alsa_support
cp -p %{SOURCE1} .


%build
autoconf
%configure --enable-shared --with-audio=alsa
# This package fails parallel make (thus cannot be built using "_smp_flags")
make
# Build documentation
cd doc
make flite.html


%install
rm -rf %{buildroot}
make install INSTALLBINDIR=%{buildroot}%{_bindir} INSTALLLIBDIR=%{buildroot}%{_libdir}  INSTALLINCDIR=%{buildroot}%{_includedir}/flite


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ACKNOWLEDGEMENTS README COPYING doc/html README-ALSA.txt
%{_libdir}/*.so.*
%{_bindir}/*


%files devel
%defattr(-,root,root)
%{_libdir}/*.so
%{_includedir}/flite


%changelog
* Tue Nov 14 2006 Francois Aucamp  - 1.3-8
- Added comment to %%build stating why "_smp_flags" isn't used with make

* Mon Nov 13 2006 Francois Aucamp  - 1.3-7
- Modified alsa support patch file to patch "configure.in" instead of "configure"
- Added "autoconf" step to %%build
- Added BuildRequires: autoconf
- Fixed patch backup file suffixes
- Renamed patch files to a more standard format
- Moved header files from /usr/include to /usr/include/flite
- Added -p option to all cp operations (to preserve timestamps)

* Sun Nov 12 2006 Francois Aucamp  - 1.3-6
- Recreated patch to allow shared libraries to build correctly (sharedlibs.patch)
- "flite" and "flite_time" binaries now link to flite shared libraries (sharedlibs.patch)
- Simplified the documentation patch filename
- Modified patch steps in %%prep to create backup files with different suffixes
- Removed "_smp_flags" macro from %%build for all archs

* Fri Oct 20 2006 Francois Aucamp  - 1.3-5
- Modified "build" so that "_smp_flags" is only used for i386 arch

* Mon Oct 10 2006 Francois Aucamp  - 1.3-4
- Removed "_smp_flags" macro from "build" for x86_64 arch

* Tue Sep 26 2006 Francois Aucamp  - 1.3-3
- Added README-ALSA.txt (Source1)
- Removed subpackage: flite-devel-static
- Modified shared libraries patch (Patch0) to prevent building static libraries
- Renamed patch files: Patch0, Patch1

* Tue Sep 26 2006 Francois Aucamp  - 1.3-2
- Added flite 1.3 ALSA patch (Patch2) by Lukas Loehrer - thanks Anthony Green for pointing it out
- Added configure option: --with-audio=alsa
- Added BuildRequires: alsa-lib-devel

* Fri Sep 22 2006 Francois Aucamp  - 1.3-1
- Initial RPM build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 13:01:16 -0000	1.1
+++ .cvsignore	14 Nov 2006 13:07:50 -0000	1.2
@@ -0,0 +1 @@
+flite-1.3-release.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 13:01:16 -0000	1.1
+++ sources	14 Nov 2006 13:07:50 -0000	1.2
@@ -0,0 +1 @@
+ae0aca1cb7b4801f4372f3a75a9e52b5  flite-1.3-release.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 13:08:19 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:08:19 -0700
Subject: rpms/flite import.log,1.1,1.2
Message-ID: <200611141308.kAED8Jg0011087@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11008

Modified Files:
	import.log 
Log Message:
auto-import flite-1.3-8 on branch devel from flite-1.3-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flite/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 13:01:08 -0000	1.1
+++ import.log	14 Nov 2006 13:07:49 -0000	1.2
@@ -0,0 +1 @@
+flite-1_3-8:HEAD:flite-1.3-8.src.rpm:1163509867



From fedora-extras-commits at redhat.com  Tue Nov 14 13:09:22 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Nov 2006 06:09:22 -0700
Subject: rpms/knetworkmanager/devel .cvsignore, 1.4,
	1.5 knetworkmanager-dbus.patch, 1.1, 1.2 knetworkmanager.spec,
	1.4, 1.5 sources, 1.4, 1.5 01-build-fix.patch, 1.1,
	NONE knetworkmanager-call-scn-not-yast.patch, 1.1, NONE
Message-ID: <200611141309.kAED9MtO011155@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/knetworkmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10989

Modified Files:
	.cvsignore knetworkmanager-dbus.patch knetworkmanager.spec 
	sources 
Removed Files:
	01-build-fix.patch knetworkmanager-call-scn-not-yast.patch 
Log Message:
update to new svn snapshot.  remove  un needed patches change dialup to use
kppp instead of system-config-network



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Sep 2006 12:38:08 -0000	1.4
+++ .cvsignore	14 Nov 2006 13:08:52 -0000	1.5
@@ -1 +1 @@
-knetworkmanager-svn20060912.tar.bz2
+knetworkmanager-svn20061113.tar.bz2

knetworkmanager-dbus.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 knetworkmanager-dbus.patch
Index: knetworkmanager-dbus.patch
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- knetworkmanager-dbus.patch	11 Aug 2006 02:22:31 -0000	1.1
+++ knetworkmanager-dbus.patch	14 Nov 2006 13:08:52 -0000	1.2
@@ -1,20 +1,1477 @@
 diff -Nur knetworkmanager-orig/knetworkmanager/configure.in.in knetworkmanager/knetworkmanager/configure.in.in
---- knetworkmanager-orig/knetworkmanager/configure.in.in	2006-03-30 05:26:31.000000000 -0600
-+++ knetworkmanager/knetworkmanager/configure.in.in	2006-08-10 20:30:08.000000000 -0500
-@@ -36,10 +36,6 @@
-   CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
--  AC_CHECK_HEADER([dbus/connection.h],,[
--     AC_MSG_WARN([You need D-BUS/Qt3 bindings])
--     DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
--  ])
-   CPPFLAGS=$safe_CPPFLAGS
-   AC_LANG_RESTORE
+--- knetworkmanager-orig/knetworkmanager/configure.in.in	2006-09-22 08:29:20.000000000 -0500
++++ knetworkmanager/knetworkmanager/configure.in.in	2006-11-13 22:17:18.000000000 -0600
+@@ -7,9 +7,6 @@
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION, $KNETWORKMANAGER_VERSION, [KNetworkManager Version])
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION_STRING, "$KNETWORKMANAGER_VERSION", [KNetworkManager Version String])
  
+-# Check for D-Bus and HAL
+-
+-AC_MSG_CHECKING(for D-BUS)
+ 
+ # test if variables are already set
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+@@ -40,10 +37,6 @@
+ CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+-AC_CHECK_HEADER([dbus/connection.h],,[
+-	AC_MSG_WARN([You need D-Bus/Qt3 bindings])
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
+-])
+ CPPFLAGS=$safe_CPPFLAGS
+ AC_LANG_RESTORE
+ 
+@@ -51,6 +44,7 @@
+ AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse]))
+ if test "x$with_distro" = "x"; then
+ 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
++	AC_CHECK_FILE(/etc/fedora-release,with_distro="fedora")
+ 	if test "x$with_distro" = "x"; then
+ 		with_distro=`lsb_release -is`
+ 	fi
+@@ -65,7 +59,10 @@
+ 		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.)"
+ 			;;
+ 	esac
+diff -Nur knetworkmanager-orig/knetworkmanager/Makefile.in knetworkmanager/knetworkmanager/Makefile.in
+--- knetworkmanager-orig/knetworkmanager/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/knetworkmanager/Makefile.in	2006-11-13 22:14:46.000000000 -0600
+@@ -0,0 +1,751 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision$ 
++# @configure_input@
++
++# 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.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++subdir = knetworkmanager
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++	AUTHORS COPYING ChangeLog INSTALL NEWS TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++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)$(dbusservicedir)"
++dbusserviceDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(dbusservice_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTSCCONFIG = @ARTSCCONFIG@
++AUTOCONF = @AUTOCONF@
++AUTODIRS = @AUTODIRS@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CONF_FILES = @CONF_FILES@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DBUS_SYS_DIR = @DBUS_SYS_DIR@
++DCOPIDL = @DCOPIDL@
++DCOPIDL2CPP = @DCOPIDL2CPP@
++DCOPIDLNG = @DCOPIDLNG@
++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
++GMSGFMT = @GMSGFMT@
++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
++KCONFIG_COMPILER = @KCONFIG_COMPILER@
++KDECONFIG = @KDECONFIG@
++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
[...10899 lines suppressed...]
++
++
++install-data-local:
++	@echo ""
++	@echo ""
++	@echo "*************** Important *************************"
++	@echo ""
++	@echo "This module contains unreleased software."
++	@echo ""
++	@echo "The software may compile and work, but it may just"
++	@echo "as well neither compile nor work."
++	@echo ""
++	@echo "****************************************************"
++	@echo ""
++
++dist-hook:
++	cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
++apidox-am-yes:
++	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
++		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++	fi ; \
++	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++	test -d $(top_builddir)/apidocs || \
++		( cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--no-modulename --installdir=$(kde_libs_htmldir)/en \
++		--no-recurse $(abs_top_srcdir) . ) ; \
++	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \
++		$$abs_top_srcdir $(subdir)
++
++apidox-am-toplevel-yes:
++	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \
++		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++	fi ; \
++	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--no-modulename --installdir=$(kde_libs_htmldir)/en \
++		$$abs_top_srcdir
++
++apidox-am-no:
++
++apidox-am-toplevel-no:
++
++apidox:
++	@if test "$(subdir)" != "."; then \
++		$(MAKE) apidox-am- at KDE_HAS_DOXYGEN@ ;\
++	else \
++		$(MAKE) apidox-am-toplevel- at KDE_HAS_DOXYGEN@ ;\
++	fi
++
++install-data-local: install-apidox
++
++install-apidox:
++	@if test "$(subdir)" != "."; then \
++		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html ; \
++		if test -f $(top_builddir)/apidocs/$(subdir)/$(subdir).tag; then \
++		echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		fi; \
++		if test -d $(top_builddir)/apidocs/$(subdir)/html; then \
++			list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \
++			echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\
++			for file in $$list; do \
++				$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
++		done; \
++		fi; \
++	else\
++		if test -d $(top_builddir)/apidocs; then \
++		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
++		list=`cd $(top_builddir)/apidocs && ls -1`; \
++		echo "installing $(top_builddir)/apidocs/$$file" ;\
++		echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \
++		for file in $$list; do \
++			if test -f $(top_builddir)/apidocs/$$file; then \
++				$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
++			fi; \
++		done ; fi; \
++	fi
++
++uninstall-local: uninstall-apidox
++
++uninstall-apidox:
++	@if test "$(subdir)" != "."; then \
++		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
++			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		fi \
++	else \
++		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
++			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
++		fi \
++	fi
++
++install-apidox-recurse: install-apidox
++	@set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
++	    list='$(SUBDIRS)'; \
++	    for subdir in $$list; do \
++		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \
++		echo "Installing apidox from $$subdir"; \
++		if test "$$subdir" != "."; then \
++			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \
++		fi ; fi ;\
++	    done; \
++	fi
++
++.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
++
++# Local Variables:
++# mode: makefile
++# End:
++$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
++
++$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in
++
++$(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES)
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh
++
++$(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
++
++$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
++
++# defining default rules for files that may not be present
++$(top_srcdir)/Makefile.am.in:
++$(CONF_FILES):
++# 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.
++.NOEXPORT:
++
++#>+ 2
++KDE_DIST=knetworkmanager.lang.dbus subdirs Makefile.in knetworkmanager.lang INDEX configure.files config.h.in Makefile.am.dbus configure.in Makefile.cvs aclocal.m4 subdirs.dbus stamp-h1.dbus configure.in.in acinclude.m4 Makefile.am configure libtool.dbus Makefile.am.in 
++
++#>+ 2
++docs-am:
++
++#>+ 7
++force-reedit:
++	 \
++	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++	
++	cd $(top_srcdir) && perl admin/am_edit Makefile.in
++
++
++#>+ 21
++clean-bcheck: 
++	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
++
++bcheck: bcheck-recursive
++
++bcheck-am:
++	@for i in ; do \
++	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
++	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
++	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
++	        echo "$$i"; \
++	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++	            rm -f $$i.bchecktest.cc; exit 1; \
++	        fi ; \
++	        echo "" >> $$i.bchecktest.cc.class; \
++	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
++	        rm -f a.out; \
++	    fi ; \
++	done
++
++
++#>+ 3
++final:
++	$(MAKE) all-am
++
++#>+ 3
++final-install:
++	$(MAKE) install-am
++
++#>+ 3
++no-final:
++	$(MAKE) all-am
++
++#>+ 3
++no-final-install:
++	$(MAKE) install-am
++
++#>+ 3
++kde-rpo-clean:
++	-rm -f *.rpo
++
++#>+ 3
++nmcheck: 
++nmcheck-am: nmcheck
+diff -Nur knetworkmanager-orig/stamp-h1 knetworkmanager/stamp-h1
+--- knetworkmanager-orig/stamp-h1	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/stamp-h1	2006-11-13 22:14:28.000000000 -0600
+@@ -0,0 +1 @@
++timestamp for config.h
+diff -Nur knetworkmanager-orig/subdirs knetworkmanager/subdirs
+--- knetworkmanager-orig/subdirs	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/subdirs	2006-11-13 22:14:28.000000000 -0600
+@@ -0,0 +1 @@
++knetworkmanager


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- knetworkmanager.spec	13 Sep 2006 12:38:08 -0000	1.4
+++ knetworkmanager.spec	14 Nov 2006 13:08:52 -0000	1.5
@@ -1,8 +1,8 @@
-%define		svn svn20060912
+%define		svn svn20061113
 
 Name:           knetworkmanager
 Version:        0.1
-Release:        0.1.%{svn}%{?dist}
+Release:        0.5.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -11,14 +11,8 @@
 Source0:        knetworkmanager-%{svn}.tar.bz2
 #script to make svn tarball
 Source1:	knetworkmanager-svn_checkout.sh
-# Patch Is required because SuSE have a broken kdepim-devel that exports non standard headers 
-# they also hard code the /opt/kde3/include path in there. the patch adds the needed header 
-# file and fixes the path
-Patch0:		http://aur.archlinux.org/packages/knetworkmanager-svn/knetworkmanager-svn/01-build-fix.patch
-# Suse Hard coded yast for dialup configuration. this patch calls System-config-network instead
-Patch1:		knetworkmanager-call-scn-not-yast.patch
 # Patch adds dbus support  as dbusqt3 is no longer in extras
-Patch2:		knetworkmanager-dbus.patch
+Patch0:		knetworkmanager-dbus.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,9 +25,7 @@
 
 %prep
 %setup -q -n knetworkmanager
-%patch0 -p0 
-%patch1 -p1 -b .eww-yast
-%patch2 -p1 -b .dbus
+%patch0 -p1 -b .dbus
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -54,7 +46,6 @@
 --remove-category=Network \
 --add-category=Applications \
 --add-category=System \
---add-category=X-Fedora \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop
 
@@ -93,6 +84,12 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.5.svn20061113
+- messed up check in :(
+
+* Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.4.svn20061113
+- update to new svn snapshot  change dialup networking to call kppp
+
 * Wed Sep 13 2006 Dennis Gilmore  - 0.1-0.4.svn20060912
 - add BR on wireless-tools-devel update snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Sep 2006 12:38:08 -0000	1.4
+++ sources	14 Nov 2006 13:08:52 -0000	1.5
@@ -1 +1 @@
-8e189f0799aa3927a363c6c0c585613d  knetworkmanager-svn20060912.tar.bz2
+e7ecf02d0d9011dab93b665d8d3b28f6  knetworkmanager-svn20061113.tar.bz2


--- 01-build-fix.patch DELETED ---


--- knetworkmanager-call-scn-not-yast.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 13:17:58 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 06:17:58 -0700
Subject: rpms/listen/devel listen.spec,1.16,1.17 sources,1.3,1.4
Message-ID: <200611141317.kAEDHwLx011324@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11296

Modified Files:
	listen.spec sources 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- listen.spec	14 Nov 2006 12:26:16 -0000	1.16
+++ listen.spec	14 Nov 2006 13:17:28 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}
+Release:        9.beta1%{?dist}.1
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:30:30 -0000	1.3
+++ sources	14 Nov 2006 13:17:28 -0000	1.4
@@ -1,5 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-e72064d64d4611ea539878219ebfad22  Makefile.patch
 7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
 fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
 98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
+46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 13:22:01 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 06:22:01 -0700
Subject: rpms/listen/FC-6 listen.spec,1.16,1.17 sources,1.3,1.4
Message-ID: <200611141322.kAEDM1Jw011432@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11414

Modified Files:
	listen.spec sources 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/listen.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- listen.spec	14 Nov 2006 12:25:00 -0000	1.16
+++ listen.spec	14 Nov 2006 13:21:31 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}
+Release:        9.beta1%{?dist}.1
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:30:29 -0000	1.3
+++ sources	14 Nov 2006 13:21:31 -0000	1.4
@@ -1,5 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-e72064d64d4611ea539878219ebfad22  Makefile.patch
 7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
 fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
 98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
+46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 13:23:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 06:23:48 -0700
Subject: rpms/listen/FC-5 listen.spec,1.16,1.17 sources,1.3,1.4
Message-ID: <200611141323.kAEDNmU1011504@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11481

Modified Files:
	listen.spec sources 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- listen.spec	14 Nov 2006 12:26:15 -0000	1.16
+++ listen.spec	14 Nov 2006 13:23:18 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}
+Release:        9.beta1%{?dist}.1
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:30:29 -0000	1.3
+++ sources	14 Nov 2006 13:23:18 -0000	1.4
@@ -1,5 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-e72064d64d4611ea539878219ebfad22  Makefile.patch
 7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
 fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
 98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
+46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 13:44:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 14 Nov 2006 06:44:08 -0700
Subject: rpms/maxima/FC-5 maxima.spec,1.31,1.32
Message-ID: <200611141344.kAEDi8T2011700@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11682

Modified Files:
	maxima.spec 
Log Message:
* Fri Nov 10 2006 Rex Dieter  5.10.0-8
- omit sbcl-disable-debugger patch (#214568)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- maxima.spec	8 Nov 2006 15:35:40 -0000	1.31
+++ maxima.spec	14 Nov 2006 13:43:37 -0000	1.32
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -181,7 +181,7 @@
 
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
-%patch3 -p1 -b .sbcl-disable-debugger
+#patch3 -p1 -b .sbcl-disable-debugger
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -385,6 +385,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter  5.10.0-8
+- omit sbcl-disable-debugger patch (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  5.10.0-7
 - respin for sbcl-0.9.18
 - fixup %%triggerun's



From fedora-extras-commits at redhat.com  Tue Nov 14 13:51:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 14 Nov 2006 06:51:28 -0700
Subject: rpms/jd/devel .cvsignore, 1.16, 1.17 jd.spec, 1.23, 1.24 sources,
	1.16, 1.17
Message-ID: <200611141351.kAEDpSum011805@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11785

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
- 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 Nov 2006 12:58:24 -0000	1.16
+++ .cvsignore	14 Nov 2006 13:50:57 -0000	1.17
@@ -1 +1 @@
-jd-1.8.0-cvs061112.tgz
+jd-1.8.0-061114.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jd.spec	13 Nov 2006 12:58:24 -0000	1.23
+++ jd.spec	14 Nov 2006 13:50:58 -0000	1.24
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061112
-%define         repoid        22637
+%define         strtag        061114
+%define         repoid        22722
 
 
 # Defined by vendor
 #
-%define         vendor_rel    6
+%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}
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Nov 13 2006 Mamoru Tasaka  - 1.8.0-0.6.cvs061112
-- cvs 061112 (23:59 JST)
+* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
+- 1.8.0
 
 * Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
 - 1.8.0 rc 061108


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Nov 2006 12:58:24 -0000	1.16
+++ sources	14 Nov 2006 13:50:58 -0000	1.17
@@ -1 +1 @@
-6fbae78257a68148a160b508b8f80d7a  jd-1.8.0-cvs061112.tgz
+1dc9ecba8d7430af27ed461155eb6708  jd-1.8.0-061114.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 13:53:20 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 14 Nov 2006 06:53:20 -0700
Subject: rpms/jd/FC-6 .cvsignore, 1.9, 1.10 jd.spec, 1.10, 1.11 sources, 1.9,
	1.10
Message-ID: <200611141353.kAEDrKpv011879@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11853

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
- 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Nov 2006 15:25:57 -0000	1.9
+++ .cvsignore	14 Nov 2006 13:52:50 -0000	1.10
@@ -1 +1 @@
-jd-1.8.0-rc061108.tgz
+jd-1.8.0-061114.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jd.spec	8 Nov 2006 15:25:57 -0000	1.10
+++ jd.spec	14 Nov 2006 13:52:50 -0000	1.11
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        rc061108
-%define         repoid        22637
+%define         strtag        061114
+%define         repoid        22722
 
 
 # Defined by vendor
 #
-%define         vendor_rel    5
+%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}
@@ -43,8 +43,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
+- 1.8.0
+
 * Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
 - 1.8.0 rc 061108
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Nov 2006 15:25:57 -0000	1.9
+++ sources	14 Nov 2006 13:52:50 -0000	1.10
@@ -1 +1 @@
-1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz
+1dc9ecba8d7430af27ed461155eb6708  jd-1.8.0-061114.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 13:55:07 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 14 Nov 2006 06:55:07 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.8,1.9 jd.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <200611141355.kAEDt7Fn011953@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11933

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
- 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Nov 2006 15:31:31 -0000	1.8
+++ .cvsignore	14 Nov 2006 13:54:36 -0000	1.9
@@ -1 +1 @@
-jd-1.8.0-rc061108.tgz
+jd-1.8.0-061114.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jd.spec	8 Nov 2006 15:31:31 -0000	1.9
+++ jd.spec	14 Nov 2006 13:54:36 -0000	1.10
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        rc061108
-%define         repoid        22637
+%define         strtag        061114
+%define         repoid        22722
 
 
 # Defined by vendor
 #
-%define         vendor_rel    5
+%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}
@@ -43,8 +43,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
+- 1.8.0
+
 * Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
 - 1.8.0 rc 061108
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Nov 2006 15:31:31 -0000	1.8
+++ sources	14 Nov 2006 13:54:36 -0000	1.9
@@ -1 +1 @@
-1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz
+1dc9ecba8d7430af27ed461155eb6708  jd-1.8.0-061114.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 13:57:35 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Nov 2006 06:57:35 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.12,1.13
Message-ID: <200611141357.kAEDvZbA012043@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gtk-gnutella.spec	13 Nov 2006 18:28:10 -0000	1.12
+++ gtk-gnutella.spec	14 Nov 2006 13:57:05 -0000	1.13
@@ -2,19 +2,25 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
 Version: 0.96.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
 BuildRequires: libxml2-devel, byacc, groff, gettext
+
+BuildRequires: gnutls-devel >= 1.0.16
+#comment out for now, it is experimental stuff...
+#BuildRequires: sqlite-devel >= 3.3.0
+
 BuildRequires: desktop-file-utils >= 0.2.90
 
 
@@ -33,7 +39,7 @@
 
 %build
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
-	-Dglibpth="%{_lib} %{_libdir}" \
+	-Dglibpth="/%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
 	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
@@ -82,6 +88,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dmitry Butskoy  - 0.96.3-2
+- switch GNU TLS support on
+
 * Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
 - update to 0.96.3
 - specify libdirs explicitly for Configure script (needed for x86_64)



From fedora-extras-commits at redhat.com  Tue Nov 14 13:59:28 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Nov 2006 06:59:28 -0700
Subject: rpms/gtk-gnutella/FC-6 gtk-gnutella.spec,1.10,1.11
Message-ID: <200611141359.kAEDxSJA012116@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12100

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-6/gtk-gnutella.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-gnutella.spec	13 Nov 2006 17:04:49 -0000	1.10
+++ gtk-gnutella.spec	14 Nov 2006 13:58:58 -0000	1.11
@@ -2,19 +2,25 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
 Version: 0.96.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
 BuildRequires: libxml2-devel, byacc, groff, gettext
+
+BuildRequires: gnutls-devel >= 1.0.16
+#comment out for now, it is experimental stuff...
+#BuildRequires: sqlite-devel >= 3.3.0
+
 BuildRequires: desktop-file-utils >= 0.2.90
 
 
@@ -33,8 +39,9 @@
 
 %build
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
+	-Dglibpth="/%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
-	-Dccflags="$RPM_OPT_FLAGS -Wall" -Dcc=gcc -Doptimize="-O2" \
+	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
 	-Dofficial=true -ders
 make %{?_smp_mflags}
@@ -81,8 +88,12 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dmitry Butskoy  - 0.96.3-2
+- switch GNU TLS support on
+
 * Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
 - update to 0.96.3
+- specify libdirs explicitly for Configure script (needed for x86_64)
 
 * Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
 - update to 0.96.2



From fedora-extras-commits at redhat.com  Tue Nov 14 14:14:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 07:14:05 -0700
Subject: rpms/listen/devel .cvsignore, 1.3, 1.4 listen.spec, 1.17,
	1.18 sources, 1.4, 1.5
Message-ID: <200611141414.kAEEE5ur015340@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15320

Modified Files:
	.cvsignore listen.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:30:30 -0000	1.3
+++ .cvsignore	14 Nov 2006 14:13:35 -0000	1.4
@@ -1,5 +1 @@
 listen-0.5b1.tar.gz
-Makefile.patch
-const.py.patch
-check.py.patch
-dialog.py.patch


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- listen.spec	14 Nov 2006 13:17:28 -0000	1.17
+++ listen.spec	14 Nov 2006 14:13:35 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.1
+Release:        9.beta1%{?dist}.2
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2006 13:17:28 -0000	1.4
+++ sources	14 Nov 2006 14:13:35 -0000	1.5
@@ -1,5 +1 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
-fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
-98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
-46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 14:17:37 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 07:17:37 -0700
Subject: rpms/listen/devel Makefile.patch, NONE, 1.1 check.py.patch, NONE,
	1.1 const.py.patch, NONE, 1.1 dialog.py.patch, NONE, 1.1
Message-ID: <200611141417.kAEEHbQL015423@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15409

Added Files:
	Makefile.patch check.py.patch const.py.patch dialog.py.patch 
Log Message:


Makefile.patch:

--- NEW FILE Makefile.patch ---
--- Makefile.old	2006-11-14 15:03:27.000000000 +0100
+++ Makefile	2006-11-14 15:03:08.000000000 +0100
@@ -2,11 +2,12 @@
 
 PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
 PREFIX ?= /usr
+LIB ?= /lib
 
 GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
 
 all: check mmkeys.so po-data
-	docbook2x-man listen.1.docbook
+	db2x_docbook2man listen.1.docbook
 	@echo "Done"
 	@echo "Type: make install now"
 
@@ -19,7 +20,7 @@
 
 daap.py:
 	cd daap && python ./setup.py build  && cd ..
-	cp daap/build/lib.*/* src/ -rf
+	cp daap/build$(LIB).*/* src/ -rf
 
 mmkeys.so:
 	cd mmkeys && make mmkeys.so && cd ..
@@ -40,29 +41,29 @@
 
 make-install-dirs: make-install-dirs-po
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/formats
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/source
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/library
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/widget
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	mkdir -p $(DESTDIR)$(PREFIX)/share/listen/img/source
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 
 make-install-dirs-po:
-	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES; done
+	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES; done
 
 install: make-install-dirs install-po
 	echo "DATA_DIR = \"$(PREFIX)/share/listen\"" > dists.py
-	install -m 644 dists.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/*.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)/lib/listen/formats
-	install -m 644 src/source/* $(DESTDIR)$(PREFIX)/lib/listen/source
-	install -m 644 src/library/* $(DESTDIR)$(PREFIX)/lib/listen/library
-	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)/lib/listen/widget
+	install -m 644 dists.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/*.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	install -m 644 src/source/* $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	install -m 644 src/library/* $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	install -m 755 data/*.glade $(DESTDIR)$(PREFIX)/share/listen/
 	install -m 755 data/img/*.png $(DESTDIR)$(PREFIX)/share/listen/img
 	install -m 755 data/img/source/*.png $(DESTDIR)$(PREFIX)/share/listen/img/source
@@ -70,11 +71,11 @@
 	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
 	
 	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
-	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
+	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)$(LIB)/listen/listen.py "$$@"'>listen ;
 	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
 
 install-po:
-	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES/; done
+	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p src/po/$$lang/LC_MESSAGES/ ;done

check.py.patch:

--- NEW FILE check.py.patch ---
--- ./check.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./check.py	        2006-11-13 19:22:43.000000000 +0100
@@ -56,7 +56,7 @@
     print "Checking for mutagen:",
     try: 
          import mutagen
-	 if float(mutagen.version_string) < 1.6:
+	 if float(mutagen.version_string[0:3]) < 1.6:
 		raise ImportError
     except ImportError:
         raise SystemExit("not found\n%s require mutagen >= 1.6.\n"

const.py.patch:

--- NEW FILE const.py.patch ---
--- ./src/const.py.old	2006-11-13 20:04:40.000000000 +0100
+++ ./src/const.py	2006-11-13 20:04:49.000000000 +0100
@@ -32,7 +32,7 @@
 
 APPNAME = "Music Player Listen"
 GETTEXT_APP="listen"
-GETTEXT_DIR = "po"
+GETTEXT_DIR = "/usr/share/locale"
 
 if True:
     CONFIG_DIR  = os.path.expanduser("~/.listen-test/")

dialog.py.patch:

--- NEW FILE dialog.py.patch ---
--- ./src/widget/dialog.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./src/widget/dialog.py	2006-11-13 19:59:34.000000000 +0100
@@ -326,5 +326,6 @@
         self.set_translator_credits(const.TRANSLATORS)
         self.set_version(const.VERSION)
         self.set_logo(gtk.gdk.pixbuf_new_from_file(const.PIXMAP_DIR+"listen_big.png"))
-        self.show_all()
-        
\ Pas de fin de ligne ?? la fin du fichier.
+        self.run()
+        self.destroy()
+        



From fedora-extras-commits at redhat.com  Tue Nov 14 14:27:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 07:27:23 -0700
Subject: rpms/listen/devel Makefile.patch,1.1,1.2
Message-ID: <200611141427.kAEERNxr015569@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15550

Modified Files:
	Makefile.patch 
Log Message:


Makefile.patch:

Index: Makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.patch	14 Nov 2006 14:17:37 -0000	1.1
+++ Makefile.patch	14 Nov 2006 14:26:52 -0000	1.2
@@ -1,5 +1,5 @@
---- Makefile.old	2006-11-14 15:03:27.000000000 +0100
-+++ Makefile	2006-11-14 15:03:08.000000000 +0100
+--- ./Makefile.old	2006-11-14 15:03:27.000000000 +0100
++++ ./Makefile	2006-11-14 15:03:08.000000000 +0100
 @@ -2,11 +2,12 @@
  
  PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl



From fedora-extras-commits at redhat.com  Tue Nov 14 14:57:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 14 Nov 2006 07:57:38 -0700
Subject: rpms/maxima/FC-6 maxima.spec,1.43,1.44
Message-ID: <200611141457.kAEEvcnI015808@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15789

Modified Files:
	maxima.spec 
Log Message:
* Fri Nov 10 2006 Rex Dieter  5.10.0-8
- omit sbcl-disable-debugger patch (#214568)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/maxima.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- maxima.spec	8 Nov 2006 15:08:45 -0000	1.43
+++ maxima.spec	14 Nov 2006 14:57:08 -0000	1.44
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -181,7 +181,7 @@
 
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
-%patch3 -p1 -b .sbcl-disable-debugger
+#patch3 -p1 -b .sbcl-disable-debugger
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -385,6 +385,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter  5.10.0-8
+- omit sbcl-disable-debugger patch (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  5.10.0-7
 - respin for sbcl-0.9.18
 - fixup %%triggerun's



From fedora-extras-commits at redhat.com  Tue Nov 14 15:15:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 08:15:15 -0700
Subject: rpms/listen/devel listen.spec,1.18,1.19
Message-ID: <200611141515.kAEFFFQk019141@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- listen.spec	14 Nov 2006 14:13:35 -0000	1.18
+++ listen.spec	14 Nov 2006 15:14:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.2
+Release:        9.beta1%{?dist}.3
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -94,7 +94,7 @@
 %patch3 -p1
 %ifarch x86_64
 # correct path issue on x86_64 box
-%{__sed} -i 's/\/lib/\/lib64/' Makefile
+%{__sed} -i 's/= \/lib/= \/lib64/' Makefile
 %endif
 
 %build



From fedora-extras-commits at redhat.com  Tue Nov 14 15:23:49 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:23:49 -0700
Subject: rpms/gpsim/devel .cvsignore, 1.3, 1.4 gpsim.spec, 1.11, 1.12 sources,
	1.3, 1.4
Message-ID: <200611141523.kAEFNnX5019281@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19261

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:39 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:23:19 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gpsim.spec	4 Oct 2006 22:19:01 -0000	1.11
+++ gpsim.spec	14 Nov 2006 15:23:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	9%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -8,8 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.happy_gcc
-Patch1:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -45,9 +43,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -82,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Thu Oct 05 2006 Christian Iseli  0.21.11-9
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:39 -0000	1.3
+++ sources	14 Nov 2006 15:23:19 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:26:44 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:26:44 -0700
Subject: rpms/gpsim/FC-6 .cvsignore, 1.3, 1.4 gpsim.spec, 1.11, 1.12 sources,
	1.3, 1.4
Message-ID: <200611141526.kAEFQiW1019355@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19335

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:39 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:26:14 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-6/gpsim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gpsim.spec	4 Oct 2006 22:19:01 -0000	1.11
+++ gpsim.spec	14 Nov 2006 15:26:14 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	9%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -8,8 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.happy_gcc
-Patch1:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -45,9 +43,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -82,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Thu Oct 05 2006 Christian Iseli  0.21.11-9
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:39 -0000	1.3
+++ sources	14 Nov 2006 15:26:14 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:28:53 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:28:53 -0700
Subject: rpms/gpsim/FC-5 .cvsignore, 1.3, 1.4 gpsim.spec, 1.9, 1.10 sources, 
	1.3, 1.4
Message-ID: <200611141528.kAEFSrWv019428@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:39 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:28:23 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-5/gpsim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gpsim.spec	23 Sep 2006 17:15:17 -0000	1.9
+++ gpsim.spec	14 Nov 2006 15:28:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	7%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -8,8 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.happy_gcc
-Patch1:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -45,9 +43,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -82,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Sat Sep 23 2006 Alain Portal  0.21.11-7
   - Add patch to fix a ktechlab crash, a ktechlab upstream contribution
     See http://ktechlab.org/download/gpsim.php


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:39 -0000	1.3
+++ sources	14 Nov 2006 15:28:23 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:30:34 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:30:34 -0700
Subject: rpms/gpsim/FC-4 .cvsignore, 1.3, 1.4 gpsim.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200611141530.kAEFUY0i019534@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19495

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:20 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:30:04 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-4/gpsim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gpsim.spec	23 Sep 2006 17:18:17 -0000	1.4
+++ gpsim.spec	14 Nov 2006 15:30:04 -0000	1.5
@@ -8,7 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -44,8 +43,6 @@
 
 %prep
 %setup -q
-%patch -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -80,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Sat Sep 23 2006 Alain Portal  0.21.11-3
   - Add patch to fix a ktechlab crash, a ktechlab upstream contribution
     See http://ktechlab.org/download/gpsim.php


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:20 -0000	1.3
+++ sources	14 Nov 2006 15:30:04 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:31:37 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:31:37 -0700
Subject: rpms/gpsim/FC-4 gpsim.spec,1.5,1.6
Message-ID: <200611141531.kAEFVbx6019570@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19546

Modified Files:
	gpsim.spec 
Log Message:
Fix version.


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-4/gpsim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gpsim.spec	14 Nov 2006 15:30:04 -0000	1.5
+++ gpsim.spec	14 Nov 2006 15:31:07 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	3%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 15:32:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 08:32:28 -0700
Subject: rpms/listen/devel listen.spec,1.19,1.20
Message-ID: <200611141532.kAEFWS0S019660@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19565

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- listen.spec	14 Nov 2006 15:14:44 -0000	1.19
+++ listen.spec	14 Nov 2006 15:31:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.3
+Release:        9.beta1%{?dist}.4
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -111,10 +111,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%ifarch x86_64
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
-%endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada



From fedora-extras-commits at redhat.com  Tue Nov 14 15:32:32 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Nov 2006 08:32:32 -0700
Subject: rpms/gtk-gnutella/devel gtk-gnutella.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <200611141532.kAEFWWG2019674@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19590

Modified Files:
	gtk-gnutella.spec sources 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-gnutella.spec	23 Oct 2006 12:04:16 -0000	1.9
+++ gtk-gnutella.spec	14 Nov 2006 15:32:02 -0000	1.10
@@ -1,20 +1,26 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.2
-Release: 1%{?dist}
+Version: 0.96.3
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
 BuildRequires: libxml2-devel, byacc, groff, gettext
+
+BuildRequires: gnutls-devel >= 1.0.16
+#comment out for now, it is experimental stuff...
+#BuildRequires: sqlite-devel >= 3.3.0
+
 BuildRequires: desktop-file-utils >= 0.2.90
 
 
@@ -33,8 +39,9 @@
 
 %build
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
+	-Dglibpth="/%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
-	-Dccflags="$RPM_OPT_FLAGS -Wall" -Dcc=gcc -Doptimize="-O2" \
+	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
 	-Dofficial=true -ders
 make %{?_smp_mflags}
@@ -48,18 +55,18 @@
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
 install -D -m 644 extra_files/gtk-gnutella.16.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.32.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.svg \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
-desktop-file-install --vendor fedora --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Fedora                                   \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+desktop-file-install --vendor fedora --delete-original	\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	$RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang %{name}
 
@@ -77,18 +84,19 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 
-%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
+%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/shell.txt
 
 
 %changelog
-* Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
-- update to 0.96.2
+* Tue Nov 14 2006 Dmitry Butskoy  - 0.96.3-2
+- switch GNU TLS support on
 
-* Fri Sep  1 2006 Dmitry Butskoy  - 0.96.1-3
-- rebuild for FC6
+* Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
+- update to 0.96.3
+- specify libdirs explicitly for Configure script (needed for x86_64)
 
-* Mon Jul  3 2006 Dmitry Butskoy  - 0.96.1-2
-- add BR: gettext
+* Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
+- update to 0.96.2
 
 * Fri Feb 24 2006 Dmitry Butskoy  - 0.96.1-1
 - update to 0.96.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 12:04:16 -0000	1.5
+++ sources	14 Nov 2006 15:32:02 -0000	1.6
@@ -1 +1 @@
-a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2
+c6952037a10ea6d5ac5649e7b75f9d15  gtk-gnutella-0.96.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 15:33:02 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:33:02 -0700
Subject: rpms/gpsim/FC-3 .cvsignore, 1.3, 1.4 gpsim.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200611141533.kAEFX2mc019729@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19666

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:19 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:32:32 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-3/gpsim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gpsim.spec	23 Sep 2006 17:21:42 -0000	1.4
+++ gpsim.spec	14 Nov 2006 15:32:32 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	3%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -8,7 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -44,8 +43,6 @@
 
 %prep
 %setup -q
-%patch -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -80,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Sat Sep 23 2006 Alain Portal  0.21.11-3
   - Add patch to fix a ktechlab crash, a ktechlab upstream contribution
     See http://ktechlab.org/download/gpsim.php


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:19 -0000	1.3
+++ sources	14 Nov 2006 15:32:32 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:37:15 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 14 Nov 2006 08:37:15 -0700
Subject: rpms/cobbler/FC-6 .cvsignore, 1.12, 1.13 cobbler.spec, 1.11,
	1.12 sources, 1.13, 1.14
Message-ID: <200611141537.kAEFbFMB019888@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19867

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Update to 0.3.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 Oct 2006 19:54:47 -0000	1.12
+++ .cvsignore	14 Nov 2006 15:36:44 -0000	1.13
@@ -9,3 +9,4 @@
 cobbler-0.2.9.tar.gz
 cobbler-0.3.0.tar.gz
 cobbler-0.3.1.tar.gz
+cobbler-0.3.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cobbler.spec	25 Oct 2006 19:54:47 -0000	1.11
+++ cobbler.spec	14 Nov 2006 15:36:44 -0000	1.12
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.1
+Version: 0.3.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,6 +39,7 @@
 %config(noreplace) /etc/cobbler/default.ks
 %config(noreplace) /etc/cobbler/kickstart_fc5.ks
 %config(noreplace) /etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.pxe
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -52,6 +53,12 @@
 
 %changelog
 
+* Tue Nov 14 2006 Michael DeHaan  - 0.3.3-1
+- Upstream changes (see CHANGELOG)
+
+* Thu Oct 26 2006 Michael DeHaan  - 0.3.2-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Oct 25 2006 Michael DeHaan  - 0.3.1-1
 - Upstream changes (see CHANGELOG)
 - Updated description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Oct 2006 19:54:47 -0000	1.13
+++ sources	14 Nov 2006 15:36:44 -0000	1.14
@@ -1 +1 @@
-0899462306f7da1e1423bd1fdaf679a1  cobbler-0.3.1.tar.gz
+2632fff6f62f8c07735ba729243a208b  cobbler-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:39:45 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 14 Nov 2006 08:39:45 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.7, 1.8 cobbler.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200611141539.kAEFdjTp019968@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19948

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Update to 0.3.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Oct 2006 19:56:50 -0000	1.7
+++ .cvsignore	14 Nov 2006 15:39:14 -0000	1.8
@@ -4,3 +4,4 @@
 cobbler-0.2.9.tar.gz
 cobbler-0.3.0.tar.gz
 cobbler-0.3.1.tar.gz
+cobbler-0.3.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cobbler.spec	25 Oct 2006 19:56:50 -0000	1.6
+++ cobbler.spec	14 Nov 2006 15:39:14 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.1
+Version: 0.3.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,6 +39,7 @@
 %config(noreplace) /etc/cobbler/default.ks
 %config(noreplace) /etc/cobbler/kickstart_fc5.ks
 %config(noreplace) /etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.pxe
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -52,6 +53,12 @@
 
 %changelog
 
+* Tue Nov 14 2006 Michael DeHaan  - 0.3.3-1
+- Upstream changes (see CHANGELOG)
+
+* Thu Oct 26 2006 Michael DeHaan  - 0.3.2-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Oct 25 2006 Michael DeHaan  - 0.3.1-1
 - Upstream changes (see CHANGELOG)
 - Updated description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Oct 2006 19:56:50 -0000	1.7
+++ sources	14 Nov 2006 15:39:14 -0000	1.8
@@ -1,2 +1 @@
-e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz
-0899462306f7da1e1423bd1fdaf679a1  cobbler-0.3.1.tar.gz
+2632fff6f62f8c07735ba729243a208b  cobbler-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:52:04 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:52:04 -0700
Subject: rpms/piklab/devel .cvsignore, 1.4, 1.5 piklab.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200611141552.kAEFq42d020131@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20111

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Oct 2006 08:20:22 -0000	1.4
+++ .cvsignore	14 Nov 2006 15:51:34 -0000	1.5
@@ -1 +1 @@
-piklab-0.12.1.tar.bz2
+piklab-0.12.2.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- piklab.spec	16 Oct 2006 08:22:14 -0000	1.6
+++ piklab.spec	14 Nov 2006 15:51:34 -0000	1.7
@@ -1,7 +1,7 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.1
+Version:	0.12.2
 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
@@ -16,8 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-Patch0:		%{name}-%{version}.desktop.typo-fr.patch
-Patch1:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-0.12.1.desktop.typo-fr.patch
+Patch1:		%{name}-0.12.1.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -120,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Tue Nov 14 2006  Alain Portal  0.12.2-1
+  - New upstream version
+
 * Mon Oct 16 2006  Alain Portal  0.12.1-1
   - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Oct 2006 08:20:22 -0000	1.5
+++ sources	14 Nov 2006 15:51:34 -0000	1.6
@@ -1 +1 @@
-b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2
+106496e489f7f65ea73cb8ee241b7f1e  piklab-0.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 15:54:08 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:54:08 -0700
Subject: rpms/piklab/FC-6 .cvsignore, 1.4, 1.5 piklab.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200611141554.kAEFs8JJ020239@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20198

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Oct 2006 08:20:22 -0000	1.4
+++ .cvsignore	14 Nov 2006 15:53:38 -0000	1.5
@@ -1 +1 @@
-piklab-0.12.1.tar.bz2
+piklab-0.12.2.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-6/piklab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- piklab.spec	16 Oct 2006 08:22:14 -0000	1.6
+++ piklab.spec	14 Nov 2006 15:53:38 -0000	1.7
@@ -1,7 +1,7 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.1
+Version:	0.12.2
 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
@@ -16,8 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-Patch0:		%{name}-%{version}.desktop.typo-fr.patch
-Patch1:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-0.12.1.desktop.typo-fr.patch
+Patch1:		%{name}-0.12.1.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -120,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Tue Nov 14 2006  Alain Portal  0.12.2-1
+  - New upstream version
+
 * Mon Oct 16 2006  Alain Portal  0.12.1-1
   - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Oct 2006 08:20:22 -0000	1.5
+++ sources	14 Nov 2006 15:53:38 -0000	1.6
@@ -1 +1 @@
-b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2
+106496e489f7f65ea73cb8ee241b7f1e  piklab-0.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 15:54:31 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 14 Nov 2006 08:54:31 -0700
Subject: rpms/ochusha/devel .cvsignore, 1.5, 1.6 ochusha.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611141554.kAEFsVNr020282@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20219

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Tue Nov 14 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061114
- Update to 0.5.99.63.3 cvs 061114



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Nov 2006 12:45:24 -0000	1.5
+++ .cvsignore	14 Nov 2006 15:54:01 -0000	1.6
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061113.tar.bz2
+ochusha-0.5.99.63.3-cvs061114.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ochusha.spec	13 Nov 2006 12:45:24 -0000	1.5
+++ ochusha.spec	14 Nov 2006 15:54:01 -0000	1.6
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.3
-%define              strtag          cvs061113
+%define              strtag          cvs061114
 
 %define              vendor_rel      2
 %define              pre_release     1
@@ -57,10 +57,6 @@
 # %{icondir}
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
-# Now rawhide has autoconf >= 2.60
-%{__sed} -i.ver -e 's|2.5\[.*\]|2.6[0-9]|' autogen.sh
-%{__chmod} 0755 autogen.sh
-
 %build
 sh autogen.sh
 
@@ -154,8 +150,8 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Mon Nov 13 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061113
-- Update to 0.5.99.63.3
+* Tue Nov 14 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061114
+- Update to 0.5.99.63.3 cvs 061114
 
 * Fri Nov 03 2006  0.5.99.62-1
 - Version down.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Nov 2006 12:45:24 -0000	1.5
+++ sources	14 Nov 2006 15:54:01 -0000	1.6
@@ -1 +1 @@
-5ca01bb450e98685c2f979f144e0d8d1  ochusha-0.5.99.63.3-cvs061113.tar.bz2
+2ffa3fb15ca8b3b1f75f0d7400cc3e8a  ochusha-0.5.99.63.3-cvs061114.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 15:55:23 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:55:23 -0700
Subject: rpms/piklab/FC-5 .cvsignore, 1.4, 1.5 piklab.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200611141555.kAEFtNUW020357@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20330

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Oct 2006 08:23:57 -0000	1.4
+++ .cvsignore	14 Nov 2006 15:54:53 -0000	1.5
@@ -1 +1 @@
-piklab-0.12.1.tar.bz2
+piklab-0.12.2.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- piklab.spec	16 Oct 2006 08:23:57 -0000	1.5
+++ piklab.spec	14 Nov 2006 15:54:53 -0000	1.6
@@ -1,7 +1,7 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.1
+Version:	0.12.2
 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
+* Tue Nov 14 2006  Alain Portal  0.12.2-1
+  - New upstream version
+
 * Mon Oct 16 2006  Alain Portal  0.12.1-1
   - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Oct 2006 08:23:57 -0000	1.5
+++ sources	14 Nov 2006 15:54:53 -0000	1.6
@@ -1 +1 @@
-b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2
+106496e489f7f65ea73cb8ee241b7f1e  piklab-0.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 16:00:01 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 09:00:01 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.6,1.7
Message-ID: <200611141600.kAEG01k9020461@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20433

Modified Files:
	piklab.spec 
Log Message:
Fix patches names.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- piklab.spec	14 Nov 2006 15:54:53 -0000	1.6
+++ piklab.spec	14 Nov 2006 15:59:30 -0000	1.7
@@ -16,8 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-Patch0:		%{name}-%{version}.desktop.typo-fr.patch
-Patch1:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-0.12.1.desktop.typo-fr.patch
+Patch1:		%{name}-0.12.1.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -120,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Tue Nov 14 2006  Alain Portal  0.12.2-1.1
+  - Fix patches name.
+
 * Tue Nov 14 2006  Alain Portal  0.12.2-1
   - New upstream version
 



From fedora-extras-commits at redhat.com  Tue Nov 14 16:02:08 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 09:02:08 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.7,1.8
Message-ID: <200611141602.kAEG28KG023521@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501

Modified Files:
	piklab.spec 
Log Message:
Fix release.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- piklab.spec	14 Nov 2006 15:59:30 -0000	1.7
+++ piklab.spec	14 Nov 2006 16:01:37 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	1%{?dist}
+Release:	1.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
 



From fedora-extras-commits at redhat.com  Tue Nov 14 16:40:16 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 09:40:16 -0700
Subject: rpms/listen/FC-6 .cvsignore, 1.3, 1.4 listen.spec, 1.17,
	1.18 sources, 1.4, 1.5
Message-ID: <200611141640.kAEGeG6a023812@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23786

Modified Files:
	.cvsignore listen.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
+++ .cvsignore	14 Nov 2006 16:39:46 -0000	1.4
@@ -1,5 +1 @@
 listen-0.5b1.tar.gz
-Makefile.patch
-const.py.patch
-check.py.patch
-dialog.py.patch


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/listen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- listen.spec	14 Nov 2006 13:21:31 -0000	1.17
+++ listen.spec	14 Nov 2006 16:39:46 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.1
+Release:        9.beta1%{?dist}.4
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -94,7 +94,7 @@
 %patch3 -p1
 %ifarch x86_64
 # correct path issue on x86_64 box
-%{__sed} -i 's/\/lib/\/lib64/' Makefile
+%{__sed} -i 's/= \/lib/= \/lib64/' Makefile
 %endif
 
 %build
@@ -111,10 +111,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%ifarch x86_64
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
-%endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2006 13:21:31 -0000	1.4
+++ sources	14 Nov 2006 16:39:46 -0000	1.5
@@ -1,5 +1 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
-fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
-98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
-46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 16:52:13 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Nov 2006 09:52:13 -0700
Subject: rpms/stellarium/devel stellarium-0.8.2-x64_1.patch, NONE,
	1.1 stellarium-0.8.2-x64_2.patch, NONE, 1.1 stellarium.spec,
	1.24, 1.25
Message-ID: <200611141652.kAEGqDdG023950@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23927

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64_1.patch stellarium-0.8.2-x64_2.patch 
Log Message:
Try to fix AMD64 problem

stellarium-0.8.2-x64_1.patch:

--- NEW FILE stellarium-0.8.2-x64_1.patch ---
--- src/translator.cpp  2006-10-05 09:12:12.000000000 +0100
+++ src/translator.cpp  2006-10-22 21:34:22.000000000 +0100
@@ -71,7 +71,7 @@
 	}

 	//change systemLangName to ISO 639 / ISO 3166.
-	unsigned int pos = Translator::systemLangName.find(':', 0);
+	std::string::size_type pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
 	       Translator::systemLangName.resize(pos);
 	pos = Translator::systemLangName.find('.', 0);

stellarium-0.8.2-x64_2.patch:

--- NEW FILE stellarium-0.8.2-x64_2.patch ---
--- stellarium-0.8.2/src/stel_core.cpp~	2006-11-13 23:06:16.000000000 +0100
+++ stellarium-0.8.2/src/stel_core.cpp	2006-11-13 23:06:16.000000000 +0100
@@ -70,8 +70,6 @@
     dataRoot = DATA_ROOT;
     recordActionCallback = recordCallback;
 
-    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
-    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
 
     tone_converter = new ToneReproductor();
     atmosphere = new Atmosphere();
@@ -135,6 +133,10 @@
 // Load core data and initialize with default values
 void StelCore::init(const InitParser& conf)
 {
+    // do NOT do this in the constructor as there is no valid GLcontext there!
+    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
+    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
+
     baseFontFile = getDataDir() + conf.get_str("gui", "base_font_name", "DejaVuSans.ttf");
 
     // Video Section


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- stellarium.spec	19 Oct 2006 20:19:18 -0000	1.24
+++ stellarium.spec	14 Nov 2006 16:51:43 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,7 +9,9 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
-Patch1:		stellarium-0.8.2-x64.patch
+Patch1:		stellarium-0.8.2-x64_1.patch
+Patch2:		stellarium-0.8.2-x64_2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -40,7 +42,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %configure
@@ -85,6 +88,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Nov 14 2006 Jochen Schmitt  0.8.2-3
+- Try to fix AMD64 problem (#210525)
+
 * Thu Oct 19 2006 Jochen Schmitt  0.8.2-2
 - Fix segfault on x64 systems (#210525)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 16:53:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 09:53:46 -0700
Subject: rpms/listen/FC-6 Makefile.patch, NONE, 1.1 check.py.patch, NONE,
	1.1 const.py.patch, NONE, 1.1 dialog.py.patch, NONE, 1.1
Message-ID: <200611141653.kAEGrkd6024008@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990

Added Files:
	Makefile.patch check.py.patch const.py.patch dialog.py.patch 
Log Message:


Makefile.patch:

--- NEW FILE Makefile.patch ---
--- ./Makefile.old	2006-11-14 15:03:27.000000000 +0100
+++ ./Makefile	2006-11-14 15:03:08.000000000 +0100
@@ -2,11 +2,12 @@
 
 PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
 PREFIX ?= /usr
+LIB ?= /lib
 
 GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
 
 all: check mmkeys.so po-data
-	docbook2x-man listen.1.docbook
+	db2x_docbook2man listen.1.docbook
 	@echo "Done"
 	@echo "Type: make install now"
 
@@ -19,7 +20,7 @@
 
 daap.py:
 	cd daap && python ./setup.py build  && cd ..
-	cp daap/build/lib.*/* src/ -rf
+	cp daap/build$(LIB).*/* src/ -rf
 
 mmkeys.so:
 	cd mmkeys && make mmkeys.so && cd ..
@@ -40,29 +41,29 @@
 
 make-install-dirs: make-install-dirs-po
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/formats
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/source
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/library
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/widget
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	mkdir -p $(DESTDIR)$(PREFIX)/share/listen/img/source
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 
 make-install-dirs-po:
-	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES; done
+	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES; done
 
 install: make-install-dirs install-po
 	echo "DATA_DIR = \"$(PREFIX)/share/listen\"" > dists.py
-	install -m 644 dists.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/*.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)/lib/listen/formats
-	install -m 644 src/source/* $(DESTDIR)$(PREFIX)/lib/listen/source
-	install -m 644 src/library/* $(DESTDIR)$(PREFIX)/lib/listen/library
-	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)/lib/listen/widget
+	install -m 644 dists.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/*.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	install -m 644 src/source/* $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	install -m 644 src/library/* $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	install -m 755 data/*.glade $(DESTDIR)$(PREFIX)/share/listen/
 	install -m 755 data/img/*.png $(DESTDIR)$(PREFIX)/share/listen/img
 	install -m 755 data/img/source/*.png $(DESTDIR)$(PREFIX)/share/listen/img/source
@@ -70,11 +71,11 @@
 	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
 	
 	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
-	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
+	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)$(LIB)/listen/listen.py "$$@"'>listen ;
 	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
 
 install-po:
-	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES/; done
+	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p src/po/$$lang/LC_MESSAGES/ ;done

check.py.patch:

--- NEW FILE check.py.patch ---
--- ./check.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./check.py	        2006-11-13 19:22:43.000000000 +0100
@@ -56,7 +56,7 @@
     print "Checking for mutagen:",
     try: 
          import mutagen
-	 if float(mutagen.version_string) < 1.6:
+	 if float(mutagen.version_string[0:3]) < 1.6:
 		raise ImportError
     except ImportError:
         raise SystemExit("not found\n%s require mutagen >= 1.6.\n"

const.py.patch:

--- NEW FILE const.py.patch ---
--- ./src/const.py.old	2006-11-13 20:04:40.000000000 +0100
+++ ./src/const.py	2006-11-13 20:04:49.000000000 +0100
@@ -32,7 +32,7 @@
 
 APPNAME = "Music Player Listen"
 GETTEXT_APP="listen"
-GETTEXT_DIR = "po"
+GETTEXT_DIR = "/usr/share/locale"
 
 if True:
     CONFIG_DIR  = os.path.expanduser("~/.listen-test/")

dialog.py.patch:

--- NEW FILE dialog.py.patch ---
--- ./src/widget/dialog.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./src/widget/dialog.py	2006-11-13 19:59:34.000000000 +0100
@@ -326,5 +326,6 @@
         self.set_translator_credits(const.TRANSLATORS)
         self.set_version(const.VERSION)
         self.set_logo(gtk.gdk.pixbuf_new_from_file(const.PIXMAP_DIR+"listen_big.png"))
-        self.show_all()
-        
\ Pas de fin de ligne ?? la fin du fichier.
+        self.run()
+        self.destroy()
+        



From fedora-extras-commits at redhat.com  Tue Nov 14 16:55:40 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Nov 2006 09:55:40 -0700
Subject: rpms/stellarium/FC-6 stellarium-0.8.2-x64_1.patch, NONE,
	1.1 stellarium-0.8.2-x64_2.patch, NONE, 1.1 stellarium.spec,
	1.24, 1.25
Message-ID: <200611141655.kAEGte68024066@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24041

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64_1.patch stellarium-0.8.2-x64_2.patch 
Log Message:
Try to fix AMD64 problem

stellarium-0.8.2-x64_1.patch:

--- NEW FILE stellarium-0.8.2-x64_1.patch ---
--- src/translator.cpp  2006-10-05 09:12:12.000000000 +0100
+++ src/translator.cpp  2006-10-22 21:34:22.000000000 +0100
@@ -71,7 +71,7 @@
 	}

 	//change systemLangName to ISO 639 / ISO 3166.
-	unsigned int pos = Translator::systemLangName.find(':', 0);
+	std::string::size_type pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
 	       Translator::systemLangName.resize(pos);
 	pos = Translator::systemLangName.find('.', 0);

stellarium-0.8.2-x64_2.patch:

--- NEW FILE stellarium-0.8.2-x64_2.patch ---
--- stellarium-0.8.2/src/stel_core.cpp~	2006-11-13 23:06:16.000000000 +0100
+++ stellarium-0.8.2/src/stel_core.cpp	2006-11-13 23:06:16.000000000 +0100
@@ -70,8 +70,6 @@
     dataRoot = DATA_ROOT;
     recordActionCallback = recordCallback;
 
-    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
-    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
 
     tone_converter = new ToneReproductor();
     atmosphere = new Atmosphere();
@@ -135,6 +133,10 @@
 // Load core data and initialize with default values
 void StelCore::init(const InitParser& conf)
 {
+    // do NOT do this in the constructor as there is no valid GLcontext there!
+    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
+    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
+
     baseFontFile = getDataDir() + conf.get_str("gui", "base_font_name", "DejaVuSans.ttf");
 
     // Video Section


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-6/stellarium.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- stellarium.spec	19 Oct 2006 20:19:18 -0000	1.24
+++ stellarium.spec	14 Nov 2006 16:55:10 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,7 +9,9 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
-Patch1:		stellarium-0.8.2-x64.patch
+Patch1:		stellarium-0.8.2-x64_1.patch
+Patch2:		stellarium-0.8.2-x64_2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -40,7 +42,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %configure
@@ -85,6 +88,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Nov 14 2006 Jochen Schmitt  0.8.2-3
+- Try to fix AMD64 problem (#210525)
+
 * Thu Oct 19 2006 Jochen Schmitt  0.8.2-2
 - Fix segfault on x64 systems (#210525)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 17:10:35 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 10:10:35 -0700
Subject: rpms/listen/FC-5 Makefile.patch, NONE, 1.1 check.py.patch, NONE,
	1.1 const.py.patch, NONE, 1.1 dialog.py.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 listen.spec, 1.17, 1.18 sources, 1.4, 1.5
Message-ID: <200611141710.kAEHAZC1027315@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27260

Modified Files:
	.cvsignore listen.spec sources 
Added Files:
	Makefile.patch check.py.patch const.py.patch dialog.py.patch 
Log Message:


Makefile.patch:

--- NEW FILE Makefile.patch ---
--- ./Makefile.old	2006-11-14 15:03:27.000000000 +0100
+++ ./Makefile	2006-11-14 15:03:08.000000000 +0100
@@ -2,11 +2,12 @@
 
 PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
 PREFIX ?= /usr
+LIB ?= /lib
 
 GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
 
 all: check mmkeys.so po-data
-	docbook2x-man listen.1.docbook
+	db2x_docbook2man listen.1.docbook
 	@echo "Done"
 	@echo "Type: make install now"
 
@@ -19,7 +20,7 @@
 
 daap.py:
 	cd daap && python ./setup.py build  && cd ..
-	cp daap/build/lib.*/* src/ -rf
+	cp daap/build$(LIB).*/* src/ -rf
 
 mmkeys.so:
 	cd mmkeys && make mmkeys.so && cd ..
@@ -40,29 +41,29 @@
 
 make-install-dirs: make-install-dirs-po
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/formats
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/source
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/library
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/widget
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	mkdir -p $(DESTDIR)$(PREFIX)/share/listen/img/source
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 
 make-install-dirs-po:
-	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES; done
+	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES; done
 
 install: make-install-dirs install-po
 	echo "DATA_DIR = \"$(PREFIX)/share/listen\"" > dists.py
-	install -m 644 dists.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/*.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)/lib/listen/formats
-	install -m 644 src/source/* $(DESTDIR)$(PREFIX)/lib/listen/source
-	install -m 644 src/library/* $(DESTDIR)$(PREFIX)/lib/listen/library
-	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)/lib/listen/widget
+	install -m 644 dists.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/*.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	install -m 644 src/source/* $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	install -m 644 src/library/* $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	install -m 755 data/*.glade $(DESTDIR)$(PREFIX)/share/listen/
 	install -m 755 data/img/*.png $(DESTDIR)$(PREFIX)/share/listen/img
 	install -m 755 data/img/source/*.png $(DESTDIR)$(PREFIX)/share/listen/img/source
@@ -70,11 +71,11 @@
 	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
 	
 	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
-	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
+	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)$(LIB)/listen/listen.py "$$@"'>listen ;
 	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
 
 install-po:
-	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES/; done
+	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p src/po/$$lang/LC_MESSAGES/ ;done

check.py.patch:

--- NEW FILE check.py.patch ---
--- ./check.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./check.py	        2006-11-13 19:22:43.000000000 +0100
@@ -56,7 +56,7 @@
     print "Checking for mutagen:",
     try: 
          import mutagen
-	 if float(mutagen.version_string) < 1.6:
+	 if float(mutagen.version_string[0:3]) < 1.6:
 		raise ImportError
     except ImportError:
         raise SystemExit("not found\n%s require mutagen >= 1.6.\n"

const.py.patch:

--- NEW FILE const.py.patch ---
--- ./src/const.py.old	2006-11-13 20:04:40.000000000 +0100
+++ ./src/const.py	2006-11-13 20:04:49.000000000 +0100
@@ -32,7 +32,7 @@
 
 APPNAME = "Music Player Listen"
 GETTEXT_APP="listen"
-GETTEXT_DIR = "po"
+GETTEXT_DIR = "/usr/share/locale"
 
 if True:
     CONFIG_DIR  = os.path.expanduser("~/.listen-test/")

dialog.py.patch:

--- NEW FILE dialog.py.patch ---
--- ./src/widget/dialog.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./src/widget/dialog.py	2006-11-13 19:59:34.000000000 +0100
@@ -326,5 +326,6 @@
         self.set_translator_credits(const.TRANSLATORS)
         self.set_version(const.VERSION)
         self.set_logo(gtk.gdk.pixbuf_new_from_file(const.PIXMAP_DIR+"listen_big.png"))
-        self.show_all()
-        
\ Pas de fin de ligne ?? la fin du fichier.
+        self.run()
+        self.destroy()
+        


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
+++ .cvsignore	14 Nov 2006 17:10:04 -0000	1.4
@@ -1,5 +1 @@
 listen-0.5b1.tar.gz
-Makefile.patch
-const.py.patch
-check.py.patch
-dialog.py.patch


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- listen.spec	14 Nov 2006 13:23:18 -0000	1.17
+++ listen.spec	14 Nov 2006 17:10:04 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.1
+Release:        9.beta1%{?dist}.4
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -94,7 +94,7 @@
 %patch3 -p1
 %ifarch x86_64
 # correct path issue on x86_64 box
-%{__sed} -i 's/\/lib/\/lib64/' Makefile
+%{__sed} -i 's/= \/lib/= \/lib64/' Makefile
 %endif
 
 %build
@@ -111,10 +111,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%ifarch x86_64
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
-%endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2006 13:23:18 -0000	1.4
+++ sources	14 Nov 2006 17:10:04 -0000	1.5
@@ -1,5 +1 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
-fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
-98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
-46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 17:33:10 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Nov 2006 10:33:10 -0700
Subject: rpms/stellarium/FC-5 stellarium-0.8.2-x64_1.patch, NONE,
	1.1 stellarium-0.8.2-x64_2.patch, NONE, 1.1 stellarium.spec,
	1.23, 1.24
Message-ID: <200611141733.kAEHXANl027605@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64_1.patch stellarium-0.8.2-x64_2.patch 
Log Message:
Try to fix AMD64 problem

stellarium-0.8.2-x64_1.patch:

--- NEW FILE stellarium-0.8.2-x64_1.patch ---
--- src/translator.cpp  2006-10-05 09:12:12.000000000 +0100
+++ src/translator.cpp  2006-10-22 21:34:22.000000000 +0100
@@ -71,7 +71,7 @@
 	}

 	//change systemLangName to ISO 639 / ISO 3166.
-	unsigned int pos = Translator::systemLangName.find(':', 0);
+	std::string::size_type pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
 	       Translator::systemLangName.resize(pos);
 	pos = Translator::systemLangName.find('.', 0);

stellarium-0.8.2-x64_2.patch:

--- NEW FILE stellarium-0.8.2-x64_2.patch ---
--- stellarium-0.8.2/src/stel_core.cpp~	2006-11-13 23:06:16.000000000 +0100
+++ stellarium-0.8.2/src/stel_core.cpp	2006-11-13 23:06:16.000000000 +0100
@@ -70,8 +70,6 @@
     dataRoot = DATA_ROOT;
     recordActionCallback = recordCallback;
 
-    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
-    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
 
     tone_converter = new ToneReproductor();
     atmosphere = new Atmosphere();
@@ -135,6 +133,10 @@
 // Load core data and initialize with default values
 void StelCore::init(const InitParser& conf)
 {
+    // do NOT do this in the constructor as there is no valid GLcontext there!
+    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
+    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
+
     baseFontFile = getDataDir() + conf.get_str("gui", "base_font_name", "DejaVuSans.ttf");
 
     // Video Section


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- stellarium.spec	15 Oct 2006 19:41:38 -0000	1.23
+++ stellarium.spec	14 Nov 2006 17:32:40 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}.2
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,7 +9,9 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
-Patch1:	        stellarium-0.8.2-x64.patch
+Patch1:	        stellarium-0.8.2-x64_1.patch
+Patch2:		stellarium-0.8.2-x64_2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -40,7 +42,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %configure
@@ -85,6 +88,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Nov 14 2006 Jochen Schmitt  0.8.2-3
+- Try to fix AMD64 problem (#210525)
+
 * Sun Oct 15 2006 Jochen Schmitt  0.8.2-1.2
 - Fix segfault on x64 systems (#210525)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 17:35:39 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 14 Nov 2006 10:35:39 -0700
Subject: rpms/glipper import.log,1.6,1.7
Message-ID: <200611141735.kAEHZdFX027732@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27699

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.95-2 on branch devel from glipper-0.95-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	13 Nov 2006 20:09:48 -0000	1.6
+++ import.log	14 Nov 2006 17:35:09 -0000	1.7
@@ -3,3 +3,4 @@
 glipper-0_89-4_fc6:HEAD:glipper-0.89-4.fc6.src.rpm:1156791617
 glipper-0_89-5:HEAD:glipper-0.89-5.src.rpm:1161029170
 glipper-0_95-1:HEAD:glipper-0.95-1.src.rpm:1163448587
+glipper-0_95-2:HEAD:glipper-0.95-2.src.rpm:1163525699



From fedora-extras-commits at redhat.com  Tue Nov 14 17:35:40 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 14 Nov 2006 10:35:40 -0700
Subject: rpms/glipper/devel glipper.spec,1.5,1.6
Message-ID: <200611141735.kAEHZeIq027735@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27699/devel

Modified Files:
	glipper.spec 
Log Message:
auto-import glipper-0.95-2 on branch devel from glipper-0.95-2.src.rpm


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glipper.spec	13 Nov 2006 20:09:49 -0000	1.5
+++ glipper.spec	14 Nov 2006 17:35:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
 
 
 %description
@@ -47,9 +47,11 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 14 2006 Damien Durand  - 0.95-2
+- Add gnome-doc-utils in BR
+
 * Mon Nov 13 2006 Damien Durand  - 0.95-1
 - Update to 0.95 release
-- Fix Doc
 
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped



From fedora-extras-commits at redhat.com  Tue Nov 14 17:38:31 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 14 Nov 2006 10:38:31 -0700
Subject: rpms/glipper/FC-6 glipper.spec,1.5,1.6
Message-ID: <200611141738.kAEHcV7L027865@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27849

Modified Files:
	glipper.spec 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/glipper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glipper.spec	13 Nov 2006 20:13:07 -0000	1.5
+++ glipper.spec	14 Nov 2006 17:38:00 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
 
 
 %description
@@ -47,9 +47,11 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 14 2006 Damien Durand  - 0.95-2
+- Add gnome-doc-utils in BR
+
 * Mon Nov 13 2006 Damien Durand  - 0.95-1
 - Update to 0.95 release
-- Fix Doc
 
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped



From fedora-extras-commits at redhat.com  Tue Nov 14 17:40:12 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 14 Nov 2006 10:40:12 -0700
Subject: rpms/glipper/FC-5 glipper.spec,1.4,1.5
Message-ID: <200611141740.kAEHeCgD027931@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27911

Modified Files:
	glipper.spec 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/glipper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glipper.spec	13 Nov 2006 20:14:35 -0000	1.4
+++ glipper.spec	14 Nov 2006 17:39:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
 
 
 %description
@@ -47,9 +47,11 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 14 2006 Damien Durand  - 0.95-2
+- Add gnome-doc-utils in BR
+
 * Mon Nov 13 2006 Damien Durand  - 0.95-1
 - Update to 0.95 release
-- Fix Doc
 
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped



From fedora-extras-commits at redhat.com  Tue Nov 14 17:49:29 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Tue, 14 Nov 2006 10:49:29 -0700
Subject: rpms/kadu/devel .cvsignore, 1.7, 1.8 kadu.spec, 1.17, 1.18 sources, 
	1.9, 1.10
Message-ID: <200611141749.kAEHnTnK028098@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28076

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Mon Nov 14 2006 Micha?? Bentkowski  - 0.5.0-0.20.rc1
- Add advanced_userlist, osdhints_notify and screenshot modules



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Oct 2006 11:24:27 -0000	1.7
+++ .cvsignore	14 Nov 2006 17:48:58 -0000	1.8
@@ -1 +1,4 @@
 kadu-20061029.tar.bz2
+advanced_userlist-20061010.tar.bz2
+kadu-osdhints_notify-0.3.2.1.tar.gz
+screenshot-0.4.4.tar.gz


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kadu.spec	8 Nov 2006 20:36:38 -0000	1.17
+++ kadu.spec	14 Nov 2006 17:48:58 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		kadu
 Version:	0.5.0
-Release:	0.19.rc1%{?dist}
+Release:	0.20.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -25,6 +25,9 @@
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+Source117:	http://www.kadu.net/~joi/advanced_userlist/packages/advanced_userlist-20061010.tar.bz2
+Source118:	http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-0.3.2.1.tar.gz
+Source119:	http://scripts.one.pl/screenshot/devel/0.5.0/screenshot-0.4.4.tar.gz
 
 Patch0:		kadu-0.5.0-tabs_patch.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -230,11 +233,32 @@
 %description wmaker_docking
 WindowMaker docking module
 
-
+%package advanced_userlist
+Summary:	Advanced_userlist module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description advanced_userlist
+User list: support for priorities (VIP/NIP) and
+changing order of sorting functions.
+
+%package osdhints_notify
+Summary:	Osdhints_notify module for Kadu
+Group:		Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description osdhints_notify
+Notification by OSD-like hints
+
+%package screenshot
+Summary:        Screenshot module for Kadu
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description screenshot
+Adds a possibility to select a screen's fragment
+and send image with its content.
 
 %prep
 %setup -q -n kadu
-%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
+%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -a 117 -a 118 -a 119 -n kadu/modules
 %setup -q -D -T -n kadu
 
 %patch0 -p1 -b tabs_patch
@@ -261,7 +285,10 @@
 	module_profiles \
 	module_mail \
 	module_exec_notify \
-	module_firewall
+	module_firewall \
+	module_advanced_userlist \
+	module_osdhints_notify \
+	module_screenshot \
 	module_wmaker_docking"
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
@@ -444,6 +471,15 @@
 
 %mod_files mail
 
+%files advanced_userlist
+%defattr(-,root,root,-)
+%{_modlib}/advanced_userlist.so
+%{_moddata}/advanced_userlist.desc
+
+%mod_files2 osdhints_notify
+
+%mod_files2 screenshot
+
 %files weather
 %defattr(-,root,root,-)
 %{_modlib}/weather.so
@@ -451,6 +487,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Mon Nov 14 2006 Micha?? Bentkowski  - 0.5.0-0.20.rc1
+- Add advanced_userlist, osdhints_notify and screenshot modules
+
 * Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.19.rc1
 - Update kadu to RC1
 - Update ext_info module to 2.0beta9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Nov 2006 20:36:38 -0000	1.9
+++ sources	14 Nov 2006 17:48:58 -0000	1.10
@@ -16,4 +16,6 @@
 69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
 e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
 139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
-
+403490d44e9650261809cdbca0de816a  advanced_userlist-20061010.tar.bz2
+4568a1cf1b242642a1fc6629969d05dd  kadu-osdhints_notify-0.3.2.1.tar.gz
+c6da85999cfebef413d228dca9c7d91f  screenshot-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 17:54:04 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Tue, 14 Nov 2006 10:54:04 -0700
Subject: rpms/kadu/FC-6 .cvsignore, 1.7, 1.8 kadu.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <200611141754.kAEHs40L028193@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28173

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Mon Nov 13 2006 Micha?? Bentkowski  - 0.5.0-0.17.rc1
- Add advanced_userlist, osdhints_notify and screenshot modules



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Nov 2006 20:12:40 -0000	1.7
+++ .cvsignore	14 Nov 2006 17:53:34 -0000	1.8
@@ -1,6 +1,4 @@
-kadu-20060915.tar.bz2
-powerkadu-20061026.tar.gz
-kadu-0.5.0-rc1.tar.bz2
-ext_info-2.0beta9.tar.bz2
-xmms-1.32.tar.gz
-amarok-1.19.tar.gz
+kadu-20061029.tar.bz2
+advanced_userlist-20061010.tar.bz2
+kadu-osdhints_notify-0.3.2.1.tar.gz
+screenshot-0.4.4.tar.gz


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/kadu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kadu.spec	8 Nov 2006 20:12:40 -0000	1.13
+++ kadu.spec	14 Nov 2006 17:53:34 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		kadu
 Version:	0.5.0
-Release:	0.16.rc1%{?dist}
+Release:	0.17.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -25,6 +25,9 @@
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+Source117:	http://www.kadu.net/~joi/advanced_userlist/packages/advanced_userlist-20061010.tar.bz2
+Source118:	http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-0.3.2.1.tar.gz
+Source119:	http://scripts.one.pl/screenshot/devel/0.5.0/screenshot-0.4.4.tar.gz
 Patch0:		kadu-0.5.0-tabs_patch.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -230,11 +233,32 @@
 %description wmaker_docking
 WindowMaker docking module
 
+%package advanced_userlist
+Summary:	Advanced_userlist module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description advanced_userlist
+User list: support for priorities (VIP/NIP) and
+changing order of sorting functions.
+
+%package osdhints_notify
+Summary:	Osdhints_notify module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description osdhints_notify
+Notification by OSD-like hints
 
+%package screenshot
+Summary:	Screenshot module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description screenshot
+Adds a possibility to select a screen's fragment
+and send image with its content.
 
 %prep
 %setup -q -n kadu
-%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
+%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -a 117 -a 118 -a 119 -n kadu/modules
 %setup -q -D -T -n kadu
 
 %patch0 -p1 -b tabs_patch
@@ -261,7 +285,10 @@
 	module_profiles \
 	module_mail \
 	module_exec_notify \
-	module_firewall
+	module_firewall \
+	module_advanced_userlist \
+	module_osdhints_notify \
+	module_screenshot \
 	module_wmaker_docking"
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
@@ -450,7 +477,19 @@
 %{_moddata}/weather.desc
 %{_moddata}/data/weather
 
+%files advanced_userlist
+%defattr(-,root,root,-)
+%{_modlib}/advanced_userlist.so
+%{_moddata}/advanced_userlist.desc
+
+%mod_files2 osdhints_notify
+
+%mod_files2 screenshot
+
 %changelog
+* Mon Nov 13 2006 Micha?? Bentkowski  - 0.5.0-0.17.rc1
+- Add advanced_userlist, osdhints_notify and screenshot modules
+
 * Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.16.rc1
 - Update kadu to RC1
 - Update ext_info module to 2.0beta9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Nov 2006 20:12:40 -0000	1.7
+++ sources	14 Nov 2006 17:53:34 -0000	1.8
@@ -16,3 +16,6 @@
 69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
 e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
 139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
+403490d44e9650261809cdbca0de816a  advanced_userlist-20061010.tar.bz2
+4568a1cf1b242642a1fc6629969d05dd  kadu-osdhints_notify-0.3.2.1.tar.gz
+c6da85999cfebef413d228dca9c7d91f  screenshot-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 17:59:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Tue, 14 Nov 2006 10:59:45 -0700
Subject: rpms/kadu/FC-5 .cvsignore, 1.7, 1.8 kadu.spec, 1.8, 1.9 sources, 1.8,
	1.9
Message-ID: <200611141759.kAEHxj4Y028291@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28269

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Mon Nov 13 2006 Micha?? Bentkowski  - 0.5.0-0.12.rc1
- Add advanced_userlist, osdhints_notify and screenshot modules



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Nov 2006 20:43:55 -0000	1.7
+++ .cvsignore	14 Nov 2006 17:59:15 -0000	1.8
@@ -1 +1,4 @@
 kadu-20061029.tar.bz2
+advanced_userlist-20061010.tar.bz2
+kadu-osdhints_notify-0.3.2.1.tar.gz
+screenshot-0.4.4.tar.gz


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kadu.spec	8 Nov 2006 20:52:39 -0000	1.8
+++ kadu.spec	14 Nov 2006 17:59:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		kadu
 Version:	0.5.0
-Release:	0.11.rc1%{?dist}
+Release:	0.12.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -25,6 +25,9 @@
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+Source117:	http://www.kadu.net/~joi/advanced_userlist/packages/advanced_userlist-20061010.tar.bz2
+Source118:	http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-0.3.2.1.tar.gz
+Source119:	http://scripts.one.pl/screenshot/devel/0.5.0/screenshot-0.4.4.tar.gz
 Patch0:		kadu-0.5.0-tabs_patch.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -230,11 +233,32 @@
 %description wmaker_docking
 WindowMaker docking module
 
+%package advanced_userlist
+Summary:	Advanced_userlist module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description advanced_userlist
+User list: support for priorities (VIP/NIP) and
+changing order of sorting functions.
+
+%package osdhints_notify
+Summary:	Osdhints_notify module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description osdhints_notify
+Notification by OSD-like hints
 
+%package screenshot
+Summary:	Screenshot module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description screenshot
+Adds a possibility to select a screen's fragment
+and send image with its content.
 
 %prep
 %setup -q -n kadu
-%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
+%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -a 117 -a 118 -a 119 -n kadu/modules
 %setup -q -D -T -n kadu
 
 %patch0 -p1 -b tabs_patch
@@ -261,7 +285,10 @@
 	module_profiles \
 	module_mail \
 	module_exec_notify \
-	module_firewall
+	module_firewall \
+	module_advanced_userlist \
+	module_osdhints_notify \
+	module_screenshot \
 	module_wmaker_docking"
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
@@ -450,7 +477,19 @@
 %{_moddata}/weather.desc
 %{_moddata}/data/weather
 
+%files advanced_userlist
+%defattr(-,root,root,-)
+%{_modlib}/advanced_userlist.so
+%{_moddata}/advanced_userlist.desc
+
+%mod_files2 osdhints_notify
+
+%mod_files2 screenshot
+
 %changelog
+* Mon Nov 13 2006 Micha?? Bentkowski  - 0.5.0-0.12.rc1
+- Add advanced_userlist, osdhints_notify and screenshot modules
+
 * Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.11.rc1
 - Fixed sources file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Nov 2006 20:52:39 -0000	1.8
+++ sources	14 Nov 2006 17:59:15 -0000	1.9
@@ -16,4 +16,6 @@
 69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
 e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
 139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
-
+403490d44e9650261809cdbca0de816a  advanced_userlist-20061010.tar.bz2
+4568a1cf1b242642a1fc6629969d05dd  kadu-osdhints_notify-0.3.2.1.tar.gz
+c6da85999cfebef413d228dca9c7d91f  screenshot-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 18:09:29 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 14 Nov 2006 11:09:29 -0700
Subject: fedora-security/audit fc5,1.389,1.390
Message-ID: <200611141809.kAEI9TEc031429@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31411/audit

Modified Files:
	fc5 
Log Message:
Update with FEDORA-2006-1221 (kernel)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- fc5	13 Nov 2006 11:16:37 -0000	1.389
+++ fc5	14 Nov 2006 18:09:26 -0000	1.390
@@ -3,18 +3,18 @@
 
 ** are items that need attention
 
-CVE-2006-5823 ** kernel
+CVE-2006-5823 version (kernel) [since FEDORA-2006-1221]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
 CVE-2006-5783 ignore (firefox) disputed
-CVE-2006-5757 ** kernel
+CVE-2006-5757 version (kernel) [since FEDORA-2006-1221]
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5748 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5747 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
-CVE-2006-5701 ** kernel
+CVE-2006-5701 VULNERABLE (kernel, not upstream)
 CVE-2006-5633 ignore (firefox) just a client DoS
-CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
+CVE-2006-5619 version (kernel, fixed 2.6.18.2, fixed 2.6.19-rc4) [since FEDORA-2006-1221]
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
@@ -33,7 +33,7 @@
 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
-CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
+CVE-2006-5331 VULNERABLE (kernel, fixed 2.6.19-rc3)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5229 ignore (openssh) reported not an issue
@@ -71,7 +71,7 @@
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
 CVE-2006-4574 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4573 VULNERABLE (screen) #212057
-CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
+CVE-2006-4572 VULNERABLE (kernel, fixed 2.6.19-rc4)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7) [since FEDORA-2006-976]



From fedora-extras-commits at redhat.com  Tue Nov 14 18:10:06 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 14 Nov 2006 11:10:06 -0700
Subject: fedora-security/audit fc6,1.141,1.142
Message-ID: <200611141810.kAEIA63b031453@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31435/audit

Modified Files:
	fc6 
Log Message:
Update with FEDORA-2006-1223 (kernel)



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- fc6	13 Nov 2006 11:16:37 -0000	1.141
+++ fc6	14 Nov 2006 18:10:03 -0000	1.142
@@ -3,18 +3,18 @@
 
 ** are items that need attention
 
-CVE-2006-5823 ** kernel
+CVE-2006-5823 version (kernel) [since FEDORA-2006-1223]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
 CVE-2006-5783 ignore (firefox) disputed
-CVE-2006-5757 ** kernel
+CVE-2006-5757 version (kernel) [since FEDORA-2006-1223]
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5748 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5747 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5747 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
-CVE-2006-5701 ** kernel
+CVE-2006-5701 VULNERABLE (kernel, not upstream)
 CVE-2006-5633 ignore (firefox) just a client DoS
-CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
+CVE-2006-5619 version (kernel, fixed 2.6.18.2, fixed 2.6.19-rc4) [since FEDORA-2006-1223]
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
@@ -33,7 +33,7 @@
 CVE-2006-5462 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
-CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
+CVE-2006-5331 VULNERABLE (kernel, fixed 2.6.19-rc3)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5229 ignore (openssh) not reproduced
@@ -71,7 +71,7 @@
 CVE-2006-4600 version (openldap, fixed 2.3.25)
 CVE-2006-4574 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-4573 VULNERABLE (screen) #212057
-CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
+CVE-2006-4572 VULNERABLE (kernel, fixed 2.6.19-rc4)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7)
 CVE-2006-4570 version (thunderbird, fixed 1.5.0.7)



From fedora-extras-commits at redhat.com  Tue Nov 14 18:18:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 11:18:43 -0700
Subject: rpms/qemu/devel qemu-0.8.2-mb-nops.diff, NONE, 1.1 qemu.spec, 1.21,
	1.22
Message-ID: <200611141818.kAEIIh3W031521@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/qemu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31502

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.8.2-mb-nops.diff 
Log Message:
* Mon Nov 13 2006 Hans de Goede  0.8.2-4
- Backport patch to make FC6 guests work by Kevin Kofler
   (bz 207843).


qemu-0.8.2-mb-nops.diff:

--- NEW FILE qemu-0.8.2-mb-nops.diff ---
===================================================================
RCS file: /sources/qemu/qemu/target-i386/translate.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qemu/target-i386/translate.c	2006/07/10 19:53:04	1.59
+++ qemu/target-i386/translate.c	2006/09/03 17:09:02	1.60
@@ -1615,6 +1615,56 @@
     *offset_ptr = disp;
 }
 
+static void gen_nop_modrm(DisasContext *s, int modrm)
+{
+    int mod, rm, base, code;
+
+    mod = (modrm >> 6) & 3;
+    if (mod == 3)
+        return;
+    rm = modrm & 7;
+
+    if (s->aflag) {
+
+        base = rm;
+        
+        if (base == 4) {
+            code = ldub_code(s->pc++);
+            base = (code & 7);
+        }
+        
+        switch (mod) {
+        case 0:
+            if (base == 5) {
+                s->pc += 4;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 4;
+            break;
+        }
+    } else {
+        switch (mod) {
+        case 0:
+            if (rm == 6) {
+                s->pc += 2;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 2;
+            break;
+        }
+    }
+}
+
 /* used for LEA and MOV AX, mem */
 static void gen_add_A0_ds_seg(DisasContext *s)
 {
@@ -5791,10 +5841,15 @@
             gen_lea_modrm(s, modrm, ®_addr, &offset_addr);
             /* nothing more to do */
             break;
-        default:
-            goto illegal_op;
+        default: /* nop (multi byte) */
+            gen_nop_modrm(s, modrm);
+            break;
         }
         break;
+    case 0x119 ... 0x11f: /* nop (multi byte) */
+        modrm = ldub_code(s->pc++);
+        gen_nop_modrm(s, modrm);
+        break;
     case 0x120: /* mov reg, crN */
     case 0x122: /* mov crN, reg */
         if (s->cpl != 0) {


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qemu.spec	11 Sep 2006 07:36:43 -0000	1.21
+++ qemu.spec	14 Nov 2006 18:18:12 -0000	1.22
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -18,6 +18,7 @@
 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
@@ -44,6 +45,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 ./configure \
@@ -92,6 +94,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Nov 13 2006 Hans de Goede  0.8.2-4
+- Backport patch to make FC6 guests work by Kevin Kofler
+   (bz 207843).
+
 * Mon Sep 11 2006 David Woodhouse  0.8.2-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Nov 14 18:20:15 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 11:20:15 -0700
Subject: rpms/qemu/FC-6 qemu-0.8.2-mb-nops.diff, NONE, 1.1 qemu.spec, 1.21,
	1.22
Message-ID: <200611141820.kAEIKFJ6031591@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/qemu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31571

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.8.2-mb-nops.diff 
Log Message:
* Mon Nov 13 2006 Hans de Goede  0.8.2-4
- Backport patch to make FC6 guests work by Kevin Kofler
   (bz 207843).


qemu-0.8.2-mb-nops.diff:

--- NEW FILE qemu-0.8.2-mb-nops.diff ---
===================================================================
RCS file: /sources/qemu/qemu/target-i386/translate.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qemu/target-i386/translate.c	2006/07/10 19:53:04	1.59
+++ qemu/target-i386/translate.c	2006/09/03 17:09:02	1.60
@@ -1615,6 +1615,56 @@
     *offset_ptr = disp;
 }
 
+static void gen_nop_modrm(DisasContext *s, int modrm)
+{
+    int mod, rm, base, code;
+
+    mod = (modrm >> 6) & 3;
+    if (mod == 3)
+        return;
+    rm = modrm & 7;
+
+    if (s->aflag) {
+
+        base = rm;
+        
+        if (base == 4) {
+            code = ldub_code(s->pc++);
+            base = (code & 7);
+        }
+        
+        switch (mod) {
+        case 0:
+            if (base == 5) {
+                s->pc += 4;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 4;
+            break;
+        }
+    } else {
+        switch (mod) {
+        case 0:
+            if (rm == 6) {
+                s->pc += 2;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 2;
+            break;
+        }
+    }
+}
+
 /* used for LEA and MOV AX, mem */
 static void gen_add_A0_ds_seg(DisasContext *s)
 {
@@ -5791,10 +5841,15 @@
             gen_lea_modrm(s, modrm, ®_addr, &offset_addr);
             /* nothing more to do */
             break;
-        default:
-            goto illegal_op;
+        default: /* nop (multi byte) */
+            gen_nop_modrm(s, modrm);
+            break;
         }
         break;
+    case 0x119 ... 0x11f: /* nop (multi byte) */
+        modrm = ldub_code(s->pc++);
+        gen_nop_modrm(s, modrm);
+        break;
     case 0x120: /* mov reg, crN */
     case 0x122: /* mov crN, reg */
         if (s->cpl != 0) {


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-6/qemu.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qemu.spec	11 Sep 2006 07:36:43 -0000	1.21
+++ qemu.spec	14 Nov 2006 18:19:44 -0000	1.22
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -18,6 +18,7 @@
 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
@@ -44,6 +45,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 ./configure \
@@ -92,6 +94,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Nov 13 2006 Hans de Goede  0.8.2-4
+- Backport patch to make FC6 guests work by Kevin Kofler
+   (bz 207843).
+
 * Mon Sep 11 2006 David Woodhouse  0.8.2-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Nov 14 18:23:41 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 11:23:41 -0700
Subject: rpms/qemu/FC-5 qemu-0.8.2-mb-nops.diff, NONE, 1.1 .cvsignore, 1.5, 
	1.6 qemu.spec, 1.14, 1.15 sources, 1.5,
	1.6 qemu-0.8.1-syscall-macros.patch, 1.2, NONE
Message-ID: <200611141823.kAEINfp1031686@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/qemu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31663

Modified Files:
	.cvsignore qemu.spec sources 
Added Files:
	qemu-0.8.2-mb-nops.diff 
Removed Files:
	qemu-0.8.1-syscall-macros.patch 
Log Message:
* Mon Nov 13 2006 Hans de Goede  0.8.2-4
- Backport patch to make FC6 guests work by Kevin Kofler
   (bz 207843).


qemu-0.8.2-mb-nops.diff:

--- NEW FILE qemu-0.8.2-mb-nops.diff ---
===================================================================
RCS file: /sources/qemu/qemu/target-i386/translate.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qemu/target-i386/translate.c	2006/07/10 19:53:04	1.59
+++ qemu/target-i386/translate.c	2006/09/03 17:09:02	1.60
@@ -1615,6 +1615,56 @@
     *offset_ptr = disp;
 }
 
+static void gen_nop_modrm(DisasContext *s, int modrm)
+{
+    int mod, rm, base, code;
+
+    mod = (modrm >> 6) & 3;
+    if (mod == 3)
+        return;
+    rm = modrm & 7;
+
+    if (s->aflag) {
+
+        base = rm;
+        
+        if (base == 4) {
+            code = ldub_code(s->pc++);
+            base = (code & 7);
+        }
+        
+        switch (mod) {
+        case 0:
+            if (base == 5) {
+                s->pc += 4;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 4;
+            break;
+        }
+    } else {
+        switch (mod) {
+        case 0:
+            if (rm == 6) {
+                s->pc += 2;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 2;
+            break;
+        }
+    }
+}
+
 /* used for LEA and MOV AX, mem */
 static void gen_add_A0_ds_seg(DisasContext *s)
 {
@@ -5791,10 +5841,15 @@
             gen_lea_modrm(s, modrm, ®_addr, &offset_addr);
             /* nothing more to do */
             break;
-        default:
-            goto illegal_op;
+        default: /* nop (multi byte) */
+            gen_nop_modrm(s, modrm);
+            break;
         }
         break;
+    case 0x119 ... 0x11f: /* nop (multi byte) */
+        modrm = ldub_code(s->pc++);
+        gen_nop_modrm(s, modrm);
+        break;
     case 0x120: /* mov reg, crN */
     case 0x122: /* mov crN, reg */
         if (s->cpl != 0) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jun 2006 00:00:44 -0000	1.5
+++ .cvsignore	14 Nov 2006 18:23:11 -0000	1.6
@@ -1 +1 @@
-qemu-0.8.1.tar.gz
+qemu-0.8.2.tar.gz


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qemu.spec	8 Jun 2006 10:18:31 -0000	1.14
+++ qemu.spec	14 Nov 2006 18:23:11 -0000	1.15
@@ -1,63 +1,71 @@
+# For FC >= 6 we have gcc 3.4, for FC <= 5 we have gcc 3.2
+%if %{!?fedora:6}%{?fedora} >= 6
+%define gccver 34
+%else
+%define gccver 32
+%endif
+
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.8.1
-Release: 3%{?dist}
-
+Version: 0.8.2
+Release: 4%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
-URL: http://fabrice.bellard.free.fr/qemu
+URL: http://www.qemu.org/
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
 Patch1: qemu-0.8.0-sdata.patch
-Patch2: qemu-0.8.1-syscall-macros.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-32 zlib-devel texi2html
-PreReq: /sbin/chkconfig
-PreReq: /sbin/service
-ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64
+BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service /sbin/chkconfig
+Requires(postun): /sbin/service
+ExclusiveArch: %{ix86} x86_64 ppc alpha sparc armv4l
 
 %description
-By using dynamic translation it achieves a reasonable speed while being easy
-to port on new host CPUs. QEMU has two operating modes:
+QEMU is a generic and open source processor emulator which achieves a good
+emulation speed by using dynamic translation. QEMU has two operating modes:
 
+ * Full system emulation. In this mode, QEMU emulates a full system (for
+   example a PC), including a processor and various peripherials. It can be
+   used to launch different Operating Systems without rebooting the PC or
+   to debug system code.
  * User mode emulation. In this mode, QEMU can launch Linux processes compiled
-   for one CPU on another CPU. Linux system calls are converted because of
-   endianness and 32/64 bit mismatches. Wine (Windows emulation) and DOSEMU
-   (DOS emulation) are the main targets for QEMU.
- * Full system emulation. In this mode, QEMU emulates a full system, including
-   a processor and various peripherals. Currently, it is only used to launch
-   an x86 Linux kernel on an x86 Linux system. It enables easier testing and
-   debugging of system code. It can also be used to provide virtual hosting
-   of several virtual PC on a single server.
+   for one CPU on another CPU.
 
-As QEMU requires no host kernel patches to run, it is very safe and easy to use.
+As QEMU requires no host kernel patches to run, it is safe and easy to use.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \
-%ifarch x86_64
-   --target-list="i386-user arm-user armeb-user ppc-user mips-user mipsel-user i386-softmmu ppc-softmmu  x86_64-softmmu mips-softmmu arm-softmmu" \
-%endif
-   --cc=gcc32 --enable-alsa
-make
+./configure \
+    --prefix=%{_prefix} \
+    --interp-prefix=%{_prefix}/qemu-%%M \
+    --cc=gcc%{gccver} \
+    --enable-alsa
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make prefix="${RPM_BUILD_ROOT}%{_prefix}" \
-	bindir="${RPM_BUILD_ROOT}%{_bindir}" \
-	sharedir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" \
-	mandir="${RPM_BUILD_ROOT}%{_mandir}" \
-	docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
-	datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
+     bindir="${RPM_BUILD_ROOT}%{_bindir}" \
+     sharedir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" \
+     mandir="${RPM_BUILD_ROOT}%{_mandir}" \
+     docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
+     datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
 
-install -D $RPM_SOURCE_DIR/qemu.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
+install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,22 +74,52 @@
 /sbin/chkconfig --add qemu
 
 %preun
-if [ $1 = 0 ]; then
-        /sbin/service qemu stop > /dev/null 2>&1
+if [ $1 -eq 0 ]; then
+    /sbin/service qemu stop &>/dev/null || :
+    /sbin/chkconfig --del qemu
+fi
+
+%postun
+if [ $1 -ge 1 ]; then
+    /sbin/service qemu condrestart &>/dev/null || :
 fi
-/sbin/chkconfig --del qemu
 
 %files
 %defattr(-,root,root)
 %doc Changelog README README.distrib TODO
-%doc qemu-tech.texi qemu-doc.texi
-%doc *.html
-%{_bindir}/qemu*
-%{_prefix}/share/qemu
-%{_mandir}/man?/*
+%doc qemu-doc.html qemu-tech.html
 %config %{_sysconfdir}/rc.d/init.d/qemu
+%{_bindir}/qemu*
+%{_prefix}/share/qemu/
+%{_mandir}/man1/*
 
 %changelog
+* Mon Nov 13 2006 Hans de Goede  0.8.2-4
+- Backport patch to make FC6 guests work by Kevin Kofler
+   (bz 207843).
+
+* Mon Sep 11 2006 David Woodhouse  0.8.2-3
+- Rebuild
+
+* Thu Aug 24 2006 Matthias Saou  0.8.2-2
+- Remove the target-list iteration for x86_64 since they all build again.
+- Make gcc32 vs. gcc34 conditional on %%{fedora} to share the same spec for
+  FC5 and FC6.
+
+* Wed Aug 23 2006 Matthias Saou  0.8.2-1
+- Update to 0.8.2 (#200065).
+- Drop upstreamed syscall-macros patch2.
+- Put correct scriplet dependencies.
+- Force install mode for the init script to avoid umask problems.
+- Add %%postun condrestart for changes to the init script to be applied if any.
+- Update description with the latest "about" from the web page (more current).
+- Update URL to qemu.org one like the Source.
+- Add which build requirement.
+- Don't include texi files in %%doc since we ship them in html.
+- Switch to using gcc34 on devel, FC5 still has gcc32.
+- Add kernheaders patch to fix linux/compiler.h inclusion.
+- Add target-sparc patch to fix compiling on ppc (some int32 to float).
+
 * Thu Jun  8 2006 David Woodhouse  0.8.1-3
 - More header abuse in modify_ldt(), change BuildRoot:
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jun 2006 00:00:44 -0000	1.5
+++ sources	14 Nov 2006 18:23:11 -0000	1.6
@@ -1 +1 @@
-67d924324a5ab79d017bd97a1e767285  qemu-0.8.1.tar.gz
+5b3a89eb2f256a8a6f3bb07f7b3f1b07  qemu-0.8.2.tar.gz


--- qemu-0.8.1-syscall-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 18:32:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 11:32:54 -0700
Subject: rpms/qemu/FC-5 qemu-0.8.2-kernheaders.patch, NONE,
	1.1 qemu-0.8.2-target-sparc.patch, NONE, 1.1
Message-ID: <200611141832.kAEIWsFw031874@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/qemu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864

Added Files:
	qemu-0.8.2-kernheaders.patch qemu-0.8.2-target-sparc.patch 
Log Message:
* Mon Nov 13 2006 Hans de Goede  0.8.2-4
- Backport patch to make FC6 guests work by Kevin Kofler
   (bz 207843).


qemu-0.8.2-kernheaders.patch:

--- NEW FILE qemu-0.8.2-kernheaders.patch ---
diff -Naupr qemu-0.8.2.orig/usb-linux.c qemu-0.8.2/usb-linux.c
--- qemu-0.8.2.orig/usb-linux.c	2006-07-22 19:23:34.000000000 +0200
+++ qemu-0.8.2/usb-linux.c	2006-08-23 18:47:16.000000000 +0200
@@ -26,7 +26,6 @@
 #if defined(__linux__)
 #include 
 #include 
-#include 
 #include 
 #include 
 

qemu-0.8.2-target-sparc.patch:

--- NEW FILE qemu-0.8.2-target-sparc.patch ---
diff -Naupr qemu-0.8.2.orig/target-sparc/op_helper.c qemu-0.8.2/target-sparc/op_helper.c
--- qemu-0.8.2.orig/target-sparc/op_helper.c	2006-07-22 19:23:34.000000000 +0200
+++ qemu-0.8.2/target-sparc/op_helper.c	2006-08-24 10:58:30.000000000 +0200
@@ -12,12 +12,12 @@ void raise_exception(int tt)
 #ifdef USE_INT_TO_FLOAT_HELPERS
 void do_fitos(void)
 {
-    FT0 = int32_to_float32(*((int32_t *)&FT1));
+    FT0 = int32_to_float32(*((int32_t *)&FT1), &env->fp_status);
 }
 
 void do_fitod(void)
 {
-    DT0 = int32_to_float64(*((int32_t *)&FT1));
+    DT0 = int32_to_float64(*((int32_t *)&FT1), &env->fp_status);
 }
 #endif
 



From fedora-extras-commits at redhat.com  Tue Nov 14 18:39:05 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 11:39:05 -0700
Subject: rpms/rrdtool/devel rrdtool.spec,1.24,1.25
Message-ID: <200611141839.kAEId5EM031946@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31928

Modified Files:
	rrdtool.spec 
Log Message:
- Conditionalize python, php and tcl bits (Resolves #203275)




Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rrdtool.spec	25 Oct 2006 19:28:53 -0000	1.24
+++ rrdtool.spec	14 Nov 2006 18:38:35 -0000	1.25
@@ -1,10 +1,13 @@
+%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.2.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -13,13 +16,8 @@
 Patch0: rrdtool-1.2.13-php.patch
 Patch1: rrdtool-1.2.15-initrrdtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-c++, openssl-devel
+BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
-BuildRequires: freetype-devel, python-devel >= 2.3
-
-%{!?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
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -60,18 +58,24 @@
 %description perl
 The Perl RRDtool bindings
 
+%if %{with_python}
 %package python
 Summary: Python RRDtool bindings
 Group: Development/Languages
-BuildRequires: python
+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
@@ -84,7 +88,9 @@
 %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
@@ -96,12 +102,15 @@
 
 %description tcl
 The %{name}-tcl package includes RRDtool bindings for Tcl.
+%endif
 
 %prep
 %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
+%endif
 %patch1 -p1 -b .initrrdtool
 
 # Fix to find correct python dir on lib64
@@ -115,11 +124,20 @@
 
 %build
 %configure \
-    --disable-static \
-    --with-pic \
+    --with-perl-options='INSTALLDIRS="vendor"' \
+%if %{with_tcl}
     --enable-tcl-site \
     --with-tcllib=%{_libdir} \
-    --with-perl-options='INSTALLDIRS="vendor"'
+%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' \
@@ -135,6 +153,7 @@
 %{__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/
@@ -144,6 +163,7 @@
 %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmp}
+%endif
 
 # Fix @perl@ and @PERL@
 find examples/ -type f \
@@ -156,6 +176,7 @@
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 # 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
@@ -166,6 +187,7 @@
 ; Enable rrdtool extension module
 extension=rrdtool.so
 __EOF__
+%endif
 
 # Pesky RRDp.pm...
 %{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
@@ -224,24 +246,33 @@
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
 
+%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 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)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 19:14:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 12:14:13 -0700
Subject: rpms/rrdtool/FC-5 rrdtool.spec,1.24,1.25
Message-ID: <200611141914.kAEJEDCU002704@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2671/FC-5

Modified Files:
	rrdtool.spec 
Log Message:
Conditionalize build of python, php and tcl bits (Resolves #203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rrdtool.spec	25 Oct 2006 19:37:47 -0000	1.24
+++ rrdtool.spec	14 Nov 2006 19:13:43 -0000	1.25
@@ -1,10 +1,13 @@
+%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.2.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -13,13 +16,8 @@
 Patch0: rrdtool-1.2.13-php.patch
 Patch1: rrdtool-1.2.15-initrrdtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-c++, openssl-devel
+BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
-BuildRequires: freetype-devel, python-devel >= 2.3
-
-%{!?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
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -60,18 +58,24 @@
 %description perl
 The Perl RRDtool bindings
 
+%if %{with_python}
 %package python
 Summary: Python RRDtool bindings
 Group: Development/Languages
-BuildRequires: python
+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
@@ -84,7 +88,9 @@
 %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
@@ -96,12 +102,15 @@
 
 %description tcl
 The %{name}-tcl package includes RRDtool bindings for Tcl.
+%endif
 
 %prep
 %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
+%endif
 %patch1 -p1 -b .initrrdtool
 
 # Fix to find correct python dir on lib64
@@ -115,11 +124,20 @@
 
 %build
 %configure \
-    --disable-static \
-    --with-pic \
+    --with-perl-options='INSTALLDIRS="vendor"' \
+%if %{with_tcl}
     --enable-tcl-site \
     --with-tcllib=%{_libdir} \
-    --with-perl-options='INSTALLDIRS="vendor"'
+%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' \
@@ -135,6 +153,7 @@
 %{__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/
@@ -144,6 +163,7 @@
 %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmp}
+%endif
 
 # Fix @perl@ and @PERL@
 find examples/ -type f \
@@ -156,6 +176,7 @@
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 # 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
@@ -166,6 +187,7 @@
 ; Enable rrdtool extension module
 extension=rrdtool.so
 __EOF__
+%endif
 
 # Pesky RRDp.pm...
 %{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
@@ -224,24 +246,33 @@
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
 
+%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 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)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 19:14:14 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 12:14:14 -0700
Subject: rpms/rrdtool/FC-6 rrdtool.spec,1.24,1.25
Message-ID: <200611141914.kAEJEEkJ002707@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2671/FC-6

Modified Files:
	rrdtool.spec 
Log Message:
Conditionalize build of python, php and tcl bits (Resolves #203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-6/rrdtool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rrdtool.spec	25 Oct 2006 19:35:22 -0000	1.24
+++ rrdtool.spec	14 Nov 2006 19:13:44 -0000	1.25
@@ -1,10 +1,13 @@
+%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.2.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -13,13 +16,8 @@
 Patch0: rrdtool-1.2.13-php.patch
 Patch1: rrdtool-1.2.15-initrrdtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-c++, openssl-devel
+BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
-BuildRequires: freetype-devel, python-devel >= 2.3
-
-%{!?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
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -60,18 +58,24 @@
 %description perl
 The Perl RRDtool bindings
 
+%if %{with_python}
 %package python
 Summary: Python RRDtool bindings
 Group: Development/Languages
-BuildRequires: python
+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
@@ -84,7 +88,9 @@
 %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
@@ -96,12 +102,15 @@
 
 %description tcl
 The %{name}-tcl package includes RRDtool bindings for Tcl.
+%endif
 
 %prep
 %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
+%endif
 %patch1 -p1 -b .initrrdtool
 
 # Fix to find correct python dir on lib64
@@ -115,11 +124,20 @@
 
 %build
 %configure \
-    --disable-static \
-    --with-pic \
+    --with-perl-options='INSTALLDIRS="vendor"' \
+%if %{with_tcl}
     --enable-tcl-site \
     --with-tcllib=%{_libdir} \
-    --with-perl-options='INSTALLDIRS="vendor"'
+%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' \
@@ -135,6 +153,7 @@
 %{__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/
@@ -144,6 +163,7 @@
 %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmp}
+%endif
 
 # Fix @perl@ and @PERL@
 find examples/ -type f \
@@ -156,6 +176,7 @@
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 # 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
@@ -166,6 +187,7 @@
 ; Enable rrdtool extension module
 extension=rrdtool.so
 __EOF__
+%endif
 
 # Pesky RRDp.pm...
 %{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
@@ -224,24 +246,33 @@
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
 
+%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 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)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 20:19:18 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:19:18 -0700
Subject: rpms/compat-libosip2 - New directory
Message-ID: <200611142019.kAEKJIHt006196@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6190/compat-libosip2

Log Message:
Directory /cvs/extras/rpms/compat-libosip2 added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 20:19:24 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:19:24 -0700
Subject: rpms/compat-libosip2/devel - New directory
Message-ID: <200611142019.kAEKJOLW006210@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6190/compat-libosip2/devel

Log Message:
Directory /cvs/extras/rpms/compat-libosip2/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 20:19:39 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:19:39 -0700
Subject: rpms/compat-libosip2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611142019.kAEKJdAu006241@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6235

Added Files:
	Makefile import.log 
Log Message:
Setup of module compat-libosip2


--- NEW FILE Makefile ---
# Top level Makefile for module compat-libosip2
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  Tue Nov 14 20:19:44 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:19:44 -0700
Subject: rpms/compat-libosip2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611142019.kAEKJiU2006257@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6235/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compat-libosip2


--- 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 Nov 14 20:20:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:20:45 -0700
Subject: rpms/compat-libosip2 import.log,1.1,1.2
Message-ID: <200611142020.kAEKKjjs006339@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6302

Modified Files:
	import.log 
Log Message:
auto-import compat-libosip2-2.2.2-8.fc6 on branch devel from compat-libosip2-2.2.2-8.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 20:19:38 -0000	1.1
+++ import.log	14 Nov 2006 20:20:15 -0000	1.2
@@ -0,0 +1 @@
+compat-libosip2-2_2_2-8_fc6:HEAD:compat-libosip2-2.2.2-8.fc6.src.rpm:1163535661



From fedora-extras-commits at redhat.com  Tue Nov 14 20:20:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:20:45 -0700
Subject: rpms/compat-libosip2/devel compat-libosip2.spec, NONE,
	1.1 libosip2-2.2.2-x64.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611142020.kAEKKjU6006343@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6302/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compat-libosip2.spec libosip2-2.2.2-x64.patch 
Log Message:
auto-import compat-libosip2-2.2.2-8.fc6 on branch devel from compat-libosip2-2.2.2-8.fc6.src.rpm


--- NEW FILE compat-libosip2.spec ---
Name:           compat-libosip2
Version:        2.2.2
Release:        8%{?dist}

Summary:        oSIP is an implementation of SIP

Group:          System Environment/Libraries
License:        LGPL

URL:            http://www.gnu.org/software/osip/
Source0:        http://ftp.gnu.org/gnu/osip/libosip2-%{version}.tar.gz

Patch:          libosip2-2.2.2-x64.patch

Provides:       libosip2 = 2.2.2-5%{?dist}
Obsoletes:      libosip2 < 2.2.2-5%{?dist}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
oSIP is an implementation of SIP.

SIP stands for the Session Initiation Protocol and is described by the
rfc3261 (wich deprecates rfc2543). This library aims to provide
multimedia and telecom software developers an easy and powerful
interface to initiate and control SIP based sessions in their
applications. SIP is a open standard replacement from IETF for H.323.

This is a compatibility package for applications that have not been
rewritten to use the APIs in newer versions of libosip2.

%package        devel
Summary:        Development libraries for oSIP
Group:          Development/Libraries

Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

Provides:       libosip2-devel = 2.2.2-5%{?dist}
Obsoletes:      libosip2-devel < 2.2.2-5%{?dist}

%description    devel
The GNU oSIP library is written in C and get no dependencies except the
standard C library. oSIP is thread safe and will generally be used in a
multi-threaded application. Nevertheless, this is optional.

oSIP is little in size and code and thus could be use to implement IP
soft-phone as well as embedded SIP software. oSIP is not limited to endpoint
agents, and can also be used to implement "SIP proxy".

oSIP does not intend to provide a high layer API for controlling "SIP Session"
at this step. Instead, it currently provides an API for the SIP message parser,
SDP message parser, and library to handle "SIP transactions" as defined by the
SIP document.

%prep
%setup -q -n libosip2-%{version}
%patch -p1 -b .x64

%{__perl} -pi.compat -e 's/-l([^2]+2)?/-l\1-2.2.2/g' libosip2.pc.in

%build
%configure --disable-static --includedir=%{_includedir}/osip2-2.2.2
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
mv %{buildroot}%{_mandir}/man1/osip.1 %{buildroot}%{_mandir}/man1/osip2-2.2.2.1
mv %{buildroot}%{_libdir}/libosip2.so %{buildroot}%{_libdir}/libosip2-2.2.2.so
mv %{buildroot}%{_libdir}/libosipparser2.so %{buildroot}%{_libdir}/libosipparser2-2.2.2.so
mv %{buildroot}%{_libdir}/pkgconfig/libosip2.pc %{buildroot}%{_libdir}/pkgconfig/libosip2-2.2.2.pc

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING ChangeLog FEATURES HISTORY NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/osip2-2.2.2
%{_includedir}/osip2-2.2.2/osip2
%{_includedir}/osip2-2.2.2/osipparser2
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man1/*.1*

%changelog
* Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-8
- Add Obsoletes

* Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-7
- Fix up provides/obsoletes/conflicts
- Fix package name

* Sat Nov 11 2006 Jeffrey C. Ollie  - 2.2.2-6
- Reconfigure as a compat- package

* Wed Aug 30 2006 Jeffrey C. Ollie  - 2.2.2-4
- Bump release and rebuild.

* Thu Feb 23 2006 Ignacio Vazquez-Abrams  2.2.2-3
- Fix for AMD64

* Mon Feb 13 2006 Ignacio Vazquez-Abrams  2.2.2-2
- Rebuild for Fedora Extras 5

* Thu Dec 22 2005 Ignacio Vazquez-Abrams  2.2.2-1
- Upstream update

* Sat Oct 15 2005 Ignacio Vazquez-Abrams  2.2.1-1
- Upstream update
- Disable static library

* Thu Apr  7 2005 Michael Schwendt 
- rebuilt

* Thu Mar 24 2005 Ignacio Vazquez-Abrams  2.2.0-2
- Renamed osip.1 and moved to -devel

* Thu Mar 24 2005 Ignacio Vazquez-Abrams  2.2.0-1
- Initial RPM release.

libosip2-2.2.2-x64.patch:

--- NEW FILE libosip2-2.2.2-x64.patch ---
--- libosip2-2.2.2/src/osipparser2/osip_parser_cfg.c.x64	2006-02-23 13:29:36.000000000 -0500
+++ libosip2-2.2.2/src/osipparser2/osip_parser_cfg.c	2006-02-23 13:31:48.000000000 -0500
@@ -32,8 +32,15 @@
  * Anyway, this mechanism improves the search time (from binary seach (log(n)) to 1).
  */
 
-#define HASH_TABLE_SIZE 150     /* set this to the hash table size, 150 is the first size
-                                   where no conflicts occur                               */
+#ifndef HASH_TABLE_SIZE
+#ifdef __amd64__
+#define HASH_TABLE_SIZE 450
+#else
+#define HASH_TABLE_SIZE 150     /* set this to the hash table size, 150 is the
+				   first size where no conflicts occur */
+#endif
+#endif
+
 static int hdr_ref_table[HASH_TABLE_SIZE];      /* the hashtable contains indices to the pconfig table    */
 
 /*
@@ -146,6 +153,10 @@
       } else
         {
           /* oops, conflict!-> change the hash table or use another hash function size */
+	  
+	  OSIP_TRACE (osip_trace
+		(__FILE__, __LINE__, OSIP_ERROR, NULL,
+		"conflict with current hashtable size\n"));
           return -1;
         }
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 20:19:44 -0000	1.1
+++ .cvsignore	14 Nov 2006 20:20:15 -0000	1.2
@@ -0,0 +1 @@
+libosip2-2.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 20:19:44 -0000	1.1
+++ sources	14 Nov 2006 20:20:15 -0000	1.2
@@ -0,0 +1 @@
+40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 20:30:43 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:30:43 -0700
Subject: rpms/beryl-core - New directory
Message-ID: <200611142030.kAEKUhiR006621@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/beryl-core

Log Message:
Directory /cvs/extras/rpms/beryl-core added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 20:30:49 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:30:49 -0700
Subject: rpms/beryl-core/devel - New directory
Message-ID: <200611142030.kAEKUnNR006640@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/beryl-core/devel

Log Message:
Directory /cvs/extras/rpms/beryl-core/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 20:31:04 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:31:04 -0700
Subject: rpms/beryl-core Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611142031.kAEKV4QH006677@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6671

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-core


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-core
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  Tue Nov 14 20:31:10 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:31:10 -0700
Subject: rpms/beryl-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611142031.kAEKVAwS006694@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6671/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-core


--- 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 Nov 14 20:32:06 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:32:06 -0700
Subject: rpms/beryl-core/devel beryl-core.spec, NONE,
	1.1 mesa-6.4.1-x86_64-fixes-1.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611142032.kAEKW6UL006791@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6749/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-core.spec mesa-6.4.1-x86_64-fixes-1.patch 
Log Message:
auto-import beryl-core-0.1.2-3.fc6 on branch devel from beryl-core-0.1.2-3.fc6.src.rpm


--- NEW FILE beryl-core.spec ---
Name:           beryl-core
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        3%{?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
Patch0:         mesa-6.4.1-x86_64-fixes-1.patch

# libdrm is not avaliable on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       mesa-libGL >= 6.5-9
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

Provides:       beryl = %{name}-%{version}

BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
BuildRequires:  startup-notification-devel >= 0.7
BuildRequires:  gettext-devel, libtool, intltool
BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
BuildRequires:  dbus-glib, dbus-devel, librsvg2-devel

%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.


%package devel
Summary: Development packages for beryl
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
The beryl-core-devel package includes the header
and library files for the beryl-core
package.


%prep
%setup -q
%patch0 -p0 -b .mesa64
#autoreconf -v --install


%build
%configure --enable-librsvg --enable-libsvg-cairo
ln -s %{_includedir}/X11 mesa/include/
ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
# Parallel builds currently broken
#make %{?_smp_mflags}
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# Kill static lib and libtool lib
rm -f $RPM_BUILD_ROOT%{_libdir}/libberylsettings.{a,la}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/beryl*
%dir %{_datadir}/beryl
%{_datadir}/beryl/*.png
%{_mandir}/man1/beryl*
%{_libdir}/libberylsettings.so.0
%{_libdir}/libberylsettings.so.0.0.0


%files devel
%defattr(-,root,root,-)
%{_libdir}/libberylsettings.so
%{_libdir}/pkgconfig/*.pc
%dir %{_includedir}/beryl
%{_includedir}/beryl/*.h
%{_mandir}/man3/beryl*


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-3
- Put man3 in -devel, remove dead libsvg-cairo-devel BR

* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarballs, now that they finally exist
- Add proper ldconfig bits

* Thu Nov 09 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson  0.1.1-3
- Trim Requires: down a bit

* Thu Oct 26 2006 Jarod Wilson  0.1.1-2
- BR cleanups, should allow building on FC5 - devel

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Move autoreconf bits to prep section

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build

mesa-6.4.1-x86_64-fixes-1.patch:

--- NEW FILE mesa-6.4.1-x86_64-fixes-1.patch ---
--- Mesa-6.4.1/src/glx/x11/indirect_vertex_array.c	2005-08-19 20:53:26.000000000 +0200
+++ mesa/src/glx/x11/indirect_vertex_array.c	2005-12-14 12:28:02.000000000 +0100
@@ -123,10 +123,10 @@
     struct array_state_vector * arrays;
 
     unsigned array_count;
-    unsigned texture_units = 1;
+    int texture_units = 1;
     unsigned i;
     unsigned j;
-    unsigned vertex_program_attribs = 0;
+    int vertex_program_attribs = 0;
 
     GLboolean got_fog = GL_FALSE;
     GLboolean got_secondary_color = GL_FALSE;
@@ -643,11 +643,10 @@
 
     GLubyte * pc;
     size_t elements_per_request;
-    unsigned total_requests = 0;
+    size_t total_requests = 0;
     unsigned i;
     size_t total_sent = 0;
 
-
     pc = emit_DrawArrays_header_old( gc, arrays, & elements_per_request,
 				     & total_requests, mode, count);
 
@@ -773,7 +772,7 @@
 
     GLubyte * pc;
     size_t elements_per_request;
-    unsigned total_requests = 0;
+    size_t total_requests = 0;
     unsigned i;
     unsigned req;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 20:31:10 -0000	1.1
+++ .cvsignore	14 Nov 2006 20:31:35 -0000	1.2
@@ -0,0 +1 @@
+beryl-core-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 20:31:10 -0000	1.1
+++ sources	14 Nov 2006 20:31:35 -0000	1.2
@@ -0,0 +1 @@
+045aceb6e48e997c952d942fbe841e76  beryl-core-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 20:32:05 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:32:05 -0700
Subject: rpms/beryl-core import.log,1.1,1.2
Message-ID: <200611142032.kAEKW5Ff006787@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6749

Modified Files:
	import.log 
Log Message:
auto-import beryl-core-0.1.2-3.fc6 on branch devel from beryl-core-0.1.2-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 20:31:04 -0000	1.1
+++ import.log	14 Nov 2006 20:31:35 -0000	1.2
@@ -0,0 +1 @@
+beryl-core-0_1_2-3_fc6:HEAD:beryl-core-0.1.2-3.fc6.src.rpm:1163536291



From fedora-extras-commits at redhat.com  Tue Nov 14 20:35:20 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:35:20 -0700
Subject: owners owners.list,1.1958,1.1959
Message-ID: <200611142035.kAEKZKLB006860@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6844

Modified Files:
	owners.list 
Log Message:
Add beryl-core


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1958
retrieving revision 1.1959
diff -u -r1.1958 -r1.1959
--- owners.list	14 Nov 2006 12:51:03 -0000	1.1958
+++ owners.list	14 Nov 2006 20:34:50 -0000	1.1959
@@ -108,6 +108,7 @@
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-core|Beryl OpenGL window and compositing manager|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 20:40:12 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:40:12 -0700
Subject: owners owners.list,1.1959,1.1960
Message-ID: <200611142040.kAEKeC75006945@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6929

Modified Files:
	owners.list 
Log Message:
Adding compat-libosip2


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1959
retrieving revision 1.1960
diff -u -r1.1959 -r1.1960
--- owners.list	14 Nov 2006 20:34:50 -0000	1.1959
+++ owners.list	14 Nov 2006 20:39:42 -0000	1.1960
@@ -217,6 +217,7 @@
 Fedora Extras|commoncpp2|GNU Common C++ class framework|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|compat-erlang|Compatibility version of Erlang|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|compat-libgda|Library for writing gnome database programs|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|compat-libosip2|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|compat-wxGTK|Compatibility version of the wxWidgets GUI library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|compat-wxPythonGTK2|Compatibility version of the wxWidgets GUI toolkit for Python|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|compface|Library for handling X-Faces|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 20:52:20 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:52:20 -0700
Subject: rpms/libosip2/FC-6 .cvsignore, 1.4, 1.5 libosip2.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200611142052.kAEKqKG8007055@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7027

Modified Files:
	.cvsignore libosip2.spec sources 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 23:59:46 -0000	1.4
+++ .cvsignore	14 Nov 2006 20:51:50 -0000	1.5
@@ -1 +1 @@
-libosip2-2.2.2.tar.gz
+libosip2-3.0.1.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-6/libosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libosip2.spec	30 Aug 2006 14:55:43 -0000	1.9
+++ libosip2.spec	14 Nov 2006 20:51:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libosip2
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -8,7 +8,6 @@
 License:        LGPL
 URL:            http://www.gnu.org/software/osip/
 Source0:        http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
-Patch:          libosip2-2.2.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -41,20 +40,19 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x64
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT%{_mandir}/man1/osip.1 $RPM_BUILD_ROOT%{_mandir}/man1/osip2.1
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+mv %{buildroot}%{_mandir}/man1/osip.1 %{buildroot}%{_mandir}/man1/osip2.1
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -74,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
+- Update to 3.0.1 and remove unnecessary patch.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie  - 2.2.2-4
 - Bump release and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 23:59:46 -0000	1.4
+++ sources	14 Nov 2006 20:51:50 -0000	1.5
@@ -1 +1 @@
-40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz
+417833bb363ffd7c762ff17c931651df  libosip2-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 20:54:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 14 Nov 2006 13:54:36 -0700
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.23, 1.24 abcm2ps.spec, 1.25,
	1.26 sources, 1.23, 1.24
Message-ID: <200611142054.kAEKsatF007129@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7077/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	2 Oct 2006 20:32:46 -0000	1.23
+++ .cvsignore	14 Nov 2006 20:54:06 -0000	1.24
@@ -1,2 +1,2 @@
-abcm2ps-5.1.1.tar.gz
+abcm2ps-5.1.2.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/abcm2ps.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- abcm2ps.spec	2 Oct 2006 20:32:46 -0000	1.25
+++ abcm2ps.spec	14 Nov 2006 20:54:06 -0000	1.26
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.1
+Version:        5.1.2
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
+- new version 5.1.2
+
 * Mon Oct  2 2006 Gerard Milmeister  - 5.1.1-1
 - new version 5.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	2 Oct 2006 20:32:46 -0000	1.23
+++ sources	14 Nov 2006 20:54:06 -0000	1.24
@@ -1,2 +1,2 @@
-48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
+2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Nov 14 20:54:37 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 14 Nov 2006 13:54:37 -0700
Subject: rpms/abcm2ps/FC-6 .cvsignore, 1.24, 1.25 abcm2ps.spec, 1.27,
	1.28 sources, 1.24, 1.25
Message-ID: <200611142054.kAEKsbHB007134@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7077/FC-6

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	2 Oct 2006 20:31:45 -0000	1.24
+++ .cvsignore	14 Nov 2006 20:54:07 -0000	1.25
@@ -1,2 +1,2 @@
-abcm2ps-5.1.1.tar.gz
+abcm2ps-5.1.2.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/abcm2ps.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- abcm2ps.spec	2 Oct 2006 20:31:45 -0000	1.27
+++ abcm2ps.spec	14 Nov 2006 20:54:07 -0000	1.28
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.1
+Version:        5.1.2
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
+- new version 5.1.2
+
 * Mon Oct  2 2006 Gerard Milmeister  - 5.1.1-1
 - new version 5.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Oct 2006 20:31:45 -0000	1.24
+++ sources	14 Nov 2006 20:54:07 -0000	1.25
@@ -1,2 +1,2 @@
-48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
+2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Nov 14 20:54:38 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 14 Nov 2006 13:54:38 -0700
Subject: rpms/abcm2ps/devel .cvsignore, 1.24, 1.25 abcm2ps.spec, 1.27,
	1.28 sources, 1.24, 1.25
Message-ID: <200611142054.kAEKscne007139@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7077/devel

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	2 Oct 2006 20:31:45 -0000	1.24
+++ .cvsignore	14 Nov 2006 20:54:07 -0000	1.25
@@ -1,2 +1,2 @@
-abcm2ps-5.1.1.tar.gz
+abcm2ps-5.1.2.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- abcm2ps.spec	2 Oct 2006 20:31:45 -0000	1.27
+++ abcm2ps.spec	14 Nov 2006 20:54:07 -0000	1.28
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.1
+Version:        5.1.2
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
+- new version 5.1.2
+
 * Mon Oct  2 2006 Gerard Milmeister  - 5.1.1-1
 - new version 5.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Oct 2006 20:31:45 -0000	1.24
+++ sources	14 Nov 2006 20:54:07 -0000	1.25
@@ -1,2 +1,2 @@
-48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
+2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Nov 14 21:01:06 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 14:01:06 -0700
Subject: rpms/libosip2/FC-6 libosip2-2.2.2-x64.patch,1.1,NONE
Message-ID: <200611142101.kAEL16La009409@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9063

Removed Files:
	libosip2-2.2.2-x64.patch 
Log Message:
Don't forget to remove outdated patch.


--- libosip2-2.2.2-x64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 21:04:22 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 14:04:22 -0700
Subject: rpms/libosip2/devel .cvsignore, 1.4, 1.5 libosip2.spec, 1.9,
	1.10 sources, 1.4, 1.5 libosip2-2.2.2-x64.patch, 1.1, NONE
Message-ID: <200611142104.kAEL4M5m010338@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10318

Modified Files:
	.cvsignore libosip2.spec sources 
Removed Files:
	libosip2-2.2.2-x64.patch 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 23:59:46 -0000	1.4
+++ .cvsignore	14 Nov 2006 21:03:51 -0000	1.5
@@ -1 +1 @@
-libosip2-2.2.2.tar.gz
+libosip2-3.0.1.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/libosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libosip2.spec	30 Aug 2006 14:55:43 -0000	1.9
+++ libosip2.spec	14 Nov 2006 21:03:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libosip2
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -8,7 +8,6 @@
 License:        LGPL
 URL:            http://www.gnu.org/software/osip/
 Source0:        http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
-Patch:          libosip2-2.2.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -41,20 +40,19 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x64
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT%{_mandir}/man1/osip.1 $RPM_BUILD_ROOT%{_mandir}/man1/osip2.1
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+mv %{buildroot}%{_mandir}/man1/osip.1 %{buildroot}%{_mandir}/man1/osip2.1
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -74,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
+- Update to 3.0.1 and remove unnecessary patch.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie  - 2.2.2-4
 - Bump release and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 23:59:46 -0000	1.4
+++ sources	14 Nov 2006 21:03:51 -0000	1.5
@@ -1 +1 @@
-40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz
+417833bb363ffd7c762ff17c931651df  libosip2-3.0.1.tar.gz


--- libosip2-2.2.2-x64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 21:20:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Nov 2006 14:20:45 -0700
Subject: owners owners.list,1.1960,1.1961
Message-ID: <200611142120.kAELKj5Z010632@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10599

Modified Files:
	owners.list 
Log Message:
Change my email address.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1960
retrieving revision 1.1961
diff -u -r1.1960 -r1.1961
--- owners.list	14 Nov 2006 20:39:42 -0000	1.1960
+++ owners.list	14 Nov 2006 21:20:15 -0000	1.1961
@@ -12,7 +12,7 @@
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 Fedora Extras|915resolution|Intel video BIOS hack to support certain resolutions|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|aalib|An ASCII art library|garrick at usc.edu|extras-qa at fedoraproject.org|
-Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|abcde|A Better CD Encoder|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abcMIDI|ABC to/from MIDI conversion utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -100,7 +100,7 @@
 Fedora Extras|banshee|Music tool to easily import, manage, and play selections from your iPod|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|baobab|Graphical tool to analyse directory trees|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|barcode|Generates barcodes from text strings|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|bash-completion|Programmable completion for Bash|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|bash-completion|Programmable completion for Bash|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|basket|Notes taker for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -156,7 +156,7 @@
 Fedora Extras|bzr-gtk|Bazaar plugin for GTK+ interfaces to most Bazaar operations|wtogami at redhat.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|bzrtools|A collection of utilities and plugins for Bazaar-NG|shahms at shahms.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cabextract|A Microsoft Cabinet file extractor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|cairomm|C++ wrapper for cairo|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|cal3d|Skeletal based 3-D character animation library|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
@@ -164,12 +164,12 @@
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|CastPodder|A multimedia aggregator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ccache|Compiler cache|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
-Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|ccid|Generic USB CCID smart card reader driver|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|ccrtp|Common C++ class framework for RTP/RTCP|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|cd-discid|utility to get CDDB discid information|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cd-discid|utility to get CDDB discid information|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cdiff|Diff readability enhancer for color terminals|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases|rpm at greysector.net|extras-qa at fedoraproject.org|harald at redhat.com
 Fedora Extras|cdo|A program for manipulating GRIB/NetCDF/SERVICE/EXTRA files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|cegui|Free library providing windowing and widgets for graphics APIs / engines|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
@@ -210,7 +210,7 @@
 Fedora Extras|cohoba|GNOME interface for Telepathy|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|coldet|3D Collision Detection Library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|colordiff|Color terminal highlighter for diff files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|comix|A user-friendly, customizable image viewer|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
@@ -253,20 +253,20 @@
 Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|csound|A sound synthesis language and library|dcbw at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctorrent|BitTorrent Client written in C|rpm at greysector.net|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|cups-pdf|Extension for creating pdf-Files with CUPS|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2svn|CVS to Subversion Repository Converter|icon at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cvsgraph|A CVS/RCS repository grapher|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsplot|Cvsplot collects statistics from CVS controlled files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cvsps|Patchset tool for CVS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cvsps|Patchset tool for CVS|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsup|CVS-Optimized General-Purpose Network File Distribution System client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsutils|CVS Utilities|rc040203 at freenet.de|extras-qa at fedoraproject.org|
-Fedora Extras|cvsweb|Web interface for CVS repositories|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cvsweb|Web interface for CVS repositories|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cyphesis|WorldForge game server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|cyrus-imapd|A high-performance mail server with IMAP, POP3, NNTP and SIEVE support|jdennis at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|d4x|Downloader for X that supports resuming and many other features|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -322,9 +322,9 @@
 Fedora Extras|dssi|Disposable Soft Synth Interface|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dstat|System Status Monitor|scott at perturb.org|extras-qa at fedoraproject.org|
 Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|dumpasn1|ASN.1 object dump utility|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
-Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dx|Open source version of IBM's Visualization Data Explorer|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|dx-samples|Sample files for OpenDX|rpm at greysector.net|extras-qa at fedoraproject.org|
@@ -349,8 +349,8 @@
 Fedora Extras|ejabberd|A distributed, fault-tolerant Jabber/XMPP server|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|ekg|Experimental Gadu-Gadu client|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|em8300|DXR3/Hollywood Plus MPEG decoder card support tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|em8300-kmod|Kernel modules for DXR3/Hollywood Plus MPEG decoder cards|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|em8300|DXR3/Hollywood Plus MPEG decoder card support tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|em8300-kmod|Kernel modules for DXR3/Hollywood Plus MPEG decoder cards|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|ed at eh3.com
 Fedora Extras|emacs-common-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-vm|Emacs VM mailreader|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
@@ -390,7 +390,7 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-package-config-apt|Fedora configuration files for the apt-rpm package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
-Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xelerance.com|extras-qa at fedoraproject.org|
@@ -433,7 +433,7 @@
 Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|freedoom|Open-source data files for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedoom-freedm|Deathmatch levels for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|freedroid|Clone of the C64 Game Paradroid|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freefont|Free UCS Outline Fonts|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -494,7 +494,7 @@
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdmap|A tool which allows to visualize disk space|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gdome2|DOM level 2 library for accessing XML files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|geda-docs|Documentation for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-examples|Circuit examples for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-gattrib|Attribute editor for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
@@ -528,10 +528,10 @@
 Fedora Extras|gkrellm|Multiple stacked system monitors in one process|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-volume|GKrellM volume plugin|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-wifi|Wireless monitor plugin for the GNU Krell Monitors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -671,7 +671,7 @@
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
 Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|hddtemp|Hard disk temperature tool|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
@@ -693,11 +693,11 @@
 Fedora Extras|ht2html|The www.python.org Web site generator|ifoox at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|htb-util|Another tool to make your life easier with HTB|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|htmldoc|A tool for converting HTML source files into HTML, PostScript, or PDF|adam at spicenitz.org|extras-qa at fedoraproject.org|
-Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|htop|Interactive process viewer|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|http_ping|HTTP latency measuring utility|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hugs98|Haskell Interpreter|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunky-fonts|Modified Bitstream Vera fonts with additional letters|gajownik at gmail.com|extras-qa at fedoraproject.org|
@@ -709,9 +709,9 @@
 Fedora Extras|ices|Source streaming for Icecast|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|id3-py|Python ID3 tag library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|id3v2|A command line id3v2 tag editor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ifm|Interactive Fiction Mapper|chris at chrisgrau.com|extras-qa at fedoraproject.org|
 Fedora Extras|ifplugd|Detect and take action when an ethernet cable is unplugged|jamatos at fc.up.pt|extras-qa at fedoraproject.org|aaron.bennett at olin.edu
 Fedora Extras|iftop|Command line tool that displays bandwidth usage on an interface|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -800,7 +800,7 @@
 Fedora Extras|keyutils|Kernel key management utilities|dhowells at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kicad|Electronic schematic diagrams and printed circuit board artwork|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|kid3|Efficient ID3 tagger|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kiosktool|KIOSK administration tool for KDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -828,7 +828,7 @@
 Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|paul at xelerance.com|extras-qa at fedoraproject.org|
-Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ksensors|An lm_sensors frontend for KDE|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kshutdown|KShutDown is an advanced shut down utility for KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kst|Plots scientific data|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|ksynaptics|KDE configuration for synaptics module|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -907,7 +907,7 @@
 Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libhugetlbfs|A library which provides easy access to huge pages of memory|drfickle at k-lug.org|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
-Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libid3tag|ID3 tag manipulation library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libifp|A general-purpose library-driver for iRiver's iFP portable audio players|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libipoddevice|Provides device-level support for the Apple iPod|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libjingle|GoogleTalk implementation of Jingle|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -922,7 +922,7 @@
 Fedora Extras|libmatroska|An open Audio/Video container format|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmodelfile|Library for accessing various model file formats|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libmodplug|Modplug mod music file format library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmtp|MTP client library|triad at df.lth.se|extras-qa at fedoraproject.org|
@@ -1013,9 +1013,9 @@
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
-Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|lirc|The Linux Infrared Remote Control package|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
+Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
 Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -1038,7 +1038,7 @@
 Fedora Extras|m17n-db|m17n-lib datafiles for input and output|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|m17n-lib|multilingual text library|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
 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
@@ -1154,7 +1154,7 @@
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org|
 Fedora Extras|netlabel_tools|Tools to manage the Linux NetLabel subsystem|james.antill at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|netmask|Utility for determining network masks|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|netpanzer|An Online Multiplayer Tactical Warfare Game|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|netpanzer-data|Data files for netpanzer|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|NetworkManager-openvpn|NetworkManager VPN integration for OpenVPN|tim at niemueller.de|extras-qa at fedoraproject.org|
@@ -1163,7 +1163,7 @@
 Fedora Extras|new|A simple template system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|newsx|NNTP news exchange utility|rpm at greysector.net|extras-qa at fedoraproject.org|
-Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
@@ -1211,7 +1211,7 @@
 Fedora Extras|openbabel|Chemistry software file format converter|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|openct|Middleware framework for smart card terminals|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|rc040203 at freenet.de|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -1219,7 +1219,7 @@
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openpbx|The Truly Open Source PBX|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|opensc|SmartCard library and applications|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
@@ -1261,9 +1261,9 @@
 Fedora Extras|pavumeter|Volume meter for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcb|An interactive printed circuit board editor|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
-Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
-Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -1339,7 +1339,7 @@
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Clone|Recursively copy perl datatypes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Compress-Bzip2|Interface to Bzip2 compression library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Config-General|Generic configuration module for Perl|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1504,7 +1504,7 @@
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Cmd|Finding and running system commands made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1552,7 +1552,7 @@
 Fedora Extras|perl-Maypole|MVC web application framework|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-MIME-Types|MIME types module for Perl|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1565,7 +1565,7 @@
 Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-ScanDeps|Recursively scan Perl code for dependencies|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Starter|A simple starter kit for any module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Starter-PBP|Create a module as recommended in "Perl Best Practices"|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1573,7 +1573,7 @@
 Fedora Extras|perl-Moose-Policy|Police your project/company-wide Moose policies|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MP3-Info|Manipulate / fetch info from MP3 audio files|chris.stone at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Jabber|Net::Jabber - Jabber client library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-LibIDN|Perl bindings for GNU LibIDN|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1594,7 +1594,7 @@
 Fedora Extras|perl-Package-Constants|List all constants declared in a package|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Package-Generator|Generate new packages quickly and easily|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PadWalker|Play with other peoples' lexical variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Coerce|Allows your classes to do coercion of parameters|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1651,7 +1651,7 @@
 Fedora Extras|perl-Scalar-Properties|Run-time properties on scalar variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SDL|SDL bindings for the Perl language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Infinite|Sets of intervals|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Scalar|Basic set operations|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Smart-Comments|Comments that do more than just sit there|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1668,7 +1668,7 @@
 Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Statistics-Descriptive|Perl module of basic descriptive statistical functions|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Format|Sprintf-like string formatting capabilities with arbitrary format definitions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Exporter|Sophisticated exporter for custom-built routines|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1720,7 +1720,7 @@
 Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Diff|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Levenshtein|Text::Levenshtein Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Quoted|Extract the structure of a quoted mail message|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1768,7 +1768,7 @@
 Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML-Parser-Syck|Perl Wrapper for the YAML Parser Extension: libsyck|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,oliver at linux-kernel.at
-Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pessulus|A lockdown editor for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
@@ -1872,7 +1872,7 @@
 Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|prozilla|An advanced Linux download manager|kushaldas at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|pscan|Limited problem scanner for C source files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pstoedit|Translates PostScript into other vector formats|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
@@ -1926,8 +1926,8 @@
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|jamatos at fc.up.pt|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
-Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|python-id3|ID3 tag library for Python|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-id3|ID3 tag library for Python|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-imaging|Python's own image processing library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-json|A JSON reader and writer for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
@@ -2057,9 +2057,9 @@
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|rpld|RPL/RIPL remote boot daemon|i at stingr.net|extras-qa at fedoraproject.org|
-Fedora Extras|rpmdevtools|RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|rpmdevtools|RPM Development Tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
-Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|rpmlint|RPM correctness checker|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|jwilson at redhat.com|extras-qa at fedoraproject.org|
@@ -2191,7 +2191,7 @@
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|swaks|Command-line SMTP transaction tester|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
@@ -2319,7 +2319,7 @@
 Fedora Extras|twinkle|A SIP Soft Phone|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|ucarp|Common Address Redundancy Protocol (CARP) for Unix|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ucblogo|An interpreter for the Logo programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-Fedora Extras|ucl|Portable lossless data compression library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ucl|Portable lossless data compression library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|udftools|Linux UDF Filesystem userspace utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|udunits|A library for manipulating units of physical quantities|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ufraw|Tool to retrieve raw image data from digital cameras|nphilipp at redhat.com|extras-qa at fedoraproject.org|
@@ -2332,7 +2332,7 @@
 Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|unshield|Install InstallShield applications on a Pocket PC|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|up-imapproxy|University of Pittsburgh IMAP Proxy|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
-Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|upx|The Ultimate Packer for eXecutables|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ushare|UPnP (TM) A/V Media Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
@@ -2345,10 +2345,10 @@
 Fedora Extras|vala|A modern programming language for GNOME|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr|Video Disk Recorder|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdradmin-am|Web interface for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|
@@ -2363,7 +2363,7 @@
 Fedora Extras|vorbisgain|Adds tags to Ogg Vorbis files to adjust the volume|bdpepple at ameritech.net|extras-qa at fedoraproject.org|noa at resare.com
 Fedora Extras|vpnc|IPSec VPN client compatible with Cisco equipment|tmraz at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|w3c-markup-validator|W3C Markup Validator|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wallpapoz|Gnome Multi Backgrounds and Wallpapers Configuration Tool|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
@@ -2421,10 +2421,10 @@
 Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xdg-utils|Basic desktop integration functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|xdrawchem|2D chemical structures drawing tool|rpm at greysector.net|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs|A different version of Emacs|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-sumo|XEmacs Lisp packages|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xeuphoric|An oric emulator capable of emulating the full family|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -2476,7 +2476,7 @@
 Fedora Extras|xfwm4|Next generation window manager for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xgalaxy|Galaxian / Galaga like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|scop at fedoraproject.org
 Fedora Extras|xkeycaps|Graphical front end to xmodmap|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
@@ -2484,16 +2484,16 @@
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-adplug|XMMS plugin to play AdLib (OPL2) files|triad at df.lth.se|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-crossfade|A crossfade output plugin for XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-musepack|X MultiMedia System input plugin to play musepack (mpc) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-scrobbler|Audioscrobbler plugin for XMMS|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 21:32:32 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Nov 2006 14:32:32 -0700
Subject: rpms/smb4k/FC-6 .cvsignore, 1.10, 1.11 smb4k.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200611142132.kAELWWhr010798@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10773

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Sep 2006 22:31:35 -0000	1.10
+++ .cvsignore	14 Nov 2006 21:32:02 -0000	1.11
@@ -1 +1 @@
-smb4k-0.7.3.tar.bz2
+smb4k-0.7.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/smb4k.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smb4k.spec	26 Sep 2006 22:31:35 -0000	1.14
+++ smb4k.spec	14 Nov 2006 21:32:02 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.3
+Version:	0.7.4
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 14 2006 Marcin Garski  0.7.4-1
+- Updated to version 0.7.4
+
 * Wed Sep 27 2006 Marcin Garski  0.7.3-1
 - Updated to version 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Sep 2006 22:31:35 -0000	1.10
+++ sources	14 Nov 2006 21:32:02 -0000	1.11
@@ -1 +1 @@
-7cd1d8b0b02fb6eb982bc9f561fec1f6  smb4k-0.7.3.tar.bz2
+69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 22:00:06 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Nov 2006 15:00:06 -0700
Subject: rpms/smb4k/FC-5 .cvsignore, 1.10, 1.11 smb4k.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <200611142200.kAEM06NZ011009@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10989

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Sep 2006 22:35:19 -0000	1.10
+++ .cvsignore	14 Nov 2006 21:59:36 -0000	1.11
@@ -1 +1 @@
-smb4k-0.7.3.tar.bz2
+smb4k-0.7.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- smb4k.spec	26 Sep 2006 22:35:19 -0000	1.13
+++ smb4k.spec	14 Nov 2006 21:59:36 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.3
+Version:	0.7.4
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 14 2006 Marcin Garski  0.7.4-1
+- Updated to version 0.7.4
+
 * Wed Sep 27 2006 Marcin Garski  0.7.3-1
 - Updated to version 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Sep 2006 22:35:19 -0000	1.10
+++ sources	14 Nov 2006 21:59:36 -0000	1.11
@@ -1 +1 @@
-7cd1d8b0b02fb6eb982bc9f561fec1f6  smb4k-0.7.3.tar.bz2
+69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 22:01:15 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Nov 2006 15:01:15 -0700
Subject: rpms/smb4k/devel .cvsignore, 1.10, 1.11 smb4k.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200611142201.kAEM1Fmq014054@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11061

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Sep 2006 22:31:35 -0000	1.10
+++ .cvsignore	14 Nov 2006 22:00:45 -0000	1.11
@@ -1 +1 @@
-smb4k-0.7.3.tar.bz2
+smb4k-0.7.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smb4k.spec	26 Sep 2006 22:31:35 -0000	1.14
+++ smb4k.spec	14 Nov 2006 22:00:45 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.3
+Version:	0.7.4
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 14 2006 Marcin Garski  0.7.4-1
+- Updated to version 0.7.4
+
 * Wed Sep 27 2006 Marcin Garski  0.7.3-1
 - Updated to version 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Sep 2006 22:31:35 -0000	1.10
+++ sources	14 Nov 2006 22:00:45 -0000	1.11
@@ -1 +1 @@
-7cd1d8b0b02fb6eb982bc9f561fec1f6  smb4k-0.7.3.tar.bz2
+69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 22:02:23 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 15:02:23 -0700
Subject: rpms/python-musicbrainz2/devel .cvsignore, 1.2,
	1.3 python-musicbrainz2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611142202.kAEM2Nw9014207@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-musicbrainz2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14129

Modified Files:
	.cvsignore python-musicbrainz2.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 01:17:55 -0000	1.2
+++ .cvsignore	14 Nov 2006 22:01:53 -0000	1.3
@@ -1 +1 @@
-python-musicbrainz2-0.3.1.tar.gz
+python-musicbrainz2-0.4.0.tar.gz


Index: python-musicbrainz2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/devel/python-musicbrainz2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-musicbrainz2.spec	17 Aug 2006 01:17:55 -0000	1.1
+++ python-musicbrainz2.spec	14 Nov 2006 22:01:53 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-musicbrainz2
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Library which provides access to the MusicBrainz Database
 
 Group:          Development/Languages
@@ -43,9 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt CHANGES.txt COPYING.txt INSTALL.txt README.txt
+%{_bindir}/mb-submit-disc
 %{python_sitelib}/musicbrainz2
 
 %changelog
+* Tue Nov 14 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0.
+
 * Wed Aug 16 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Add Requires for python-ctypes and libmusicbrainz.
 - Add check section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 01:17:55 -0000	1.2
+++ sources	14 Nov 2006 22:01:53 -0000	1.3
@@ -1 +1 @@
-2ff59193f357c84e9e7b2f89356c0939  python-musicbrainz2-0.3.1.tar.gz
+7d2cf926dfd3c1f785cd2128a82e8c6e  python-musicbrainz2-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 22:06:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 15:06:13 -0700
Subject: rpms/python-musicbrainz2/FC-6 .cvsignore, 1.2,
	1.3 python-musicbrainz2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611142206.kAEM6Dpr014285@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-musicbrainz2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14265

Modified Files:
	.cvsignore python-musicbrainz2.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 01:17:55 -0000	1.2
+++ .cvsignore	14 Nov 2006 22:05:40 -0000	1.3
@@ -1 +1 @@
-python-musicbrainz2-0.3.1.tar.gz
+python-musicbrainz2-0.4.0.tar.gz


Index: python-musicbrainz2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-6/python-musicbrainz2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-musicbrainz2.spec	17 Aug 2006 01:17:55 -0000	1.1
+++ python-musicbrainz2.spec	14 Nov 2006 22:05:40 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-musicbrainz2
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Library which provides access to the MusicBrainz Database
 
 Group:          Development/Languages
@@ -43,9 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt CHANGES.txt COPYING.txt INSTALL.txt README.txt
+%{_bindir}/mb-submit-disc
 %{python_sitelib}/musicbrainz2
 
 %changelog
+* Tue Nov 14 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0.
+
 * Wed Aug 16 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Add Requires for python-ctypes and libmusicbrainz.
 - Add check section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 01:17:55 -0000	1.2
+++ sources	14 Nov 2006 22:05:40 -0000	1.3
@@ -1 +1 @@
-2ff59193f357c84e9e7b2f89356c0939  python-musicbrainz2-0.3.1.tar.gz
+7d2cf926dfd3c1f785cd2128a82e8c6e  python-musicbrainz2-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 22:08:38 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 15:08:38 -0700
Subject: rpms/python-musicbrainz2/FC-5 .cvsignore, 1.2,
	1.3 python-musicbrainz2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611142208.kAEM8c95014414@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-musicbrainz2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14392

Modified Files:
	.cvsignore python-musicbrainz2.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 01:17:55 -0000	1.2
+++ .cvsignore	14 Nov 2006 22:08:08 -0000	1.3
@@ -1 +1 @@
-python-musicbrainz2-0.3.1.tar.gz
+python-musicbrainz2-0.4.0.tar.gz


Index: python-musicbrainz2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-5/python-musicbrainz2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-musicbrainz2.spec	17 Aug 2006 01:17:55 -0000	1.1
+++ python-musicbrainz2.spec	14 Nov 2006 22:08:08 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-musicbrainz2
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Library which provides access to the MusicBrainz Database
 
 Group:          Development/Languages
@@ -43,9 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt CHANGES.txt COPYING.txt INSTALL.txt README.txt
+%{_bindir}/mb-submit-disc
 %{python_sitelib}/musicbrainz2
 
 %changelog
+* Tue Nov 14 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0.
+
 * Wed Aug 16 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Add Requires for python-ctypes and libmusicbrainz.
 - Add check section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 01:17:55 -0000	1.2
+++ sources	14 Nov 2006 22:08:08 -0000	1.3
@@ -1 +1 @@
-2ff59193f357c84e9e7b2f89356c0939  python-musicbrainz2-0.3.1.tar.gz
+7d2cf926dfd3c1f785cd2128a82e8c6e  python-musicbrainz2-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 22:20:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 15:20:19 -0700
Subject: rpms/amavisd-new/devel amavisd-new.spec,1.10,1.11
Message-ID: <200611142220.kAEMKJcQ014500@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14484

Modified Files:
	amavisd-new.spec 
Log Message:
Add dependency on file. (#215492)


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- amavisd-new.spec	14 Oct 2006 17:04:11 -0000	1.10
+++ amavisd-new.spec	14 Nov 2006 22:19:48 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        2%{?prerelease:.%{prerelease}}%{?dist}
+Release:        3%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -22,6 +22,7 @@
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
 Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
+Requires:       file
 Requires:       bzip2
 Requires:       gzip
 Requires:       arj
@@ -152,6 +153,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-3
+- Add dependency on file. (#215492)
+
 * Sat Oct 14 2006 Steven Pritchard  2.4.3-2
 - Fix permissions on the cron.daily script.
 



From fedora-extras-commits at redhat.com  Tue Nov 14 23:13:47 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:13:47 -0700
Subject: rpms/anjuta import.log,1.27,1.28
Message-ID: <200611142313.kAENDlcY017895@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17862

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-11 on branch devel from anjuta-2.0.2-11.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- import.log	8 Nov 2006 15:23:30 -0000	1.27
+++ import.log	14 Nov 2006 23:13:16 -0000	1.28
@@ -24,3 +24,4 @@
 anjuta-2_0_2-10:FC-5:anjuta-2.0.2-10.src.rpm:1162999129
 anjuta-2_0_2-10:FC-6:anjuta-2.0.2-10.src.rpm:1162999249
 anjuta-2_0_2-10:HEAD:anjuta-2.0.2-10.src.rpm:1162999392
+anjuta-2_0_2-11:HEAD:anjuta-2.0.2-11.src.rpm:1163545983



From fedora-extras-commits at redhat.com  Tue Nov 14 23:13:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:13:48 -0700
Subject: rpms/anjuta/devel scintillagtk.patch, NONE, 1.1 anjuta.spec, 1.24,
	1.25
Message-ID: <200611142313.kAENDmDu017898@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17862/devel

Modified Files:
	anjuta.spec 
Added Files:
	scintillagtk.patch 
Log Message:
auto-import anjuta-2.0.2-11 on branch devel from anjuta-2.0.2-11.src.rpm

scintillagtk.patch:

--- NEW FILE scintillagtk.patch ---
--- anjuta-2.0.2/scintilla/ScintillaGTK.cxx	2006-04-27 21:30:27.000000000 +0100
+++ anjuta-2.0.2/scintilla/ScintillaGTK-new.cxx	2006-11-14 22:34:06.000000000 +0000
@@ -2193,7 +2193,7 @@
 	paintState = notPainting;
 
 	if (rgnUpdate) {
-		g_free(rgnUpdate);
+		gdk_region_destroy(rgnUpdate);
 	}
 	rgnUpdate = 0;
 


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- anjuta.spec	8 Nov 2006 15:23:31 -0000	1.24
+++ anjuta.spec	14 Nov 2006 23:13:17 -0000	1.25
@@ -1,12 +1,13 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
 Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: anjuta-dialog.patch
+Patch1: scintillagtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
 BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
@@ -51,6 +52,7 @@
 chmod 644 scintilla/*.cxx
 chmod 644 scintilla/*.h
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 %build
 %configure --disable-static --disable-plugin-subversion --enable-nls
@@ -127,6 +129,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Tue Nov 14 2006 Paul F. Johnson  2.0.2-11
+- scintilla gtk fix
+
 * Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
 - add patch for close dialog on the about window
 - renamed spec file to anjuta



From fedora-extras-commits at redhat.com  Tue Nov 14 23:14:49 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Nov 2006 16:14:49 -0700
Subject: owners owners.list,1.1961,1.1962
Message-ID: <200611142314.kAENEn9r017971@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17935

Modified Files:
	owners.list 
Log Message:
Uh-oh, that address change was not the brightest idea, revert.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1961
retrieving revision 1.1962
diff -u -r1.1961 -r1.1962
--- owners.list	14 Nov 2006 21:20:15 -0000	1.1961
+++ owners.list	14 Nov 2006 23:14:19 -0000	1.1962
@@ -12,7 +12,7 @@
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 Fedora Extras|915resolution|Intel video BIOS hack to support certain resolutions|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|aalib|An ASCII art library|garrick at usc.edu|extras-qa at fedoraproject.org|
-Fedora Extras|abcde|A Better CD Encoder|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abcMIDI|ABC to/from MIDI conversion utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -100,7 +100,7 @@
 Fedora Extras|banshee|Music tool to easily import, manage, and play selections from your iPod|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|baobab|Graphical tool to analyse directory trees|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|barcode|Generates barcodes from text strings|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|bash-completion|Programmable completion for Bash|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|bash-completion|Programmable completion for Bash|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|basket|Notes taker for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -156,7 +156,7 @@
 Fedora Extras|bzr-gtk|Bazaar plugin for GTK+ interfaces to most Bazaar operations|wtogami at redhat.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|bzrtools|A collection of utilities and plugins for Bazaar-NG|shahms at shahms.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|cabextract|A Microsoft Cabinet file extractor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|cairomm|C++ wrapper for cairo|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|cal3d|Skeletal based 3-D character animation library|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
@@ -164,12 +164,12 @@
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|CastPodder|A multimedia aggregator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|ccache|Compiler cache|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
-Fedora Extras|ccid|Generic USB CCID smart card reader driver|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|ccrtp|Common C++ class framework for RTP/RTCP|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|cd-discid|utility to get CDDB discid information|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cdiff|Diff readability enhancer for color terminals|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cd-discid|utility to get CDDB discid information|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases|rpm at greysector.net|extras-qa at fedoraproject.org|harald at redhat.com
 Fedora Extras|cdo|A program for manipulating GRIB/NetCDF/SERVICE/EXTRA files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|cegui|Free library providing windowing and widgets for graphics APIs / engines|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
@@ -210,7 +210,7 @@
 Fedora Extras|cohoba|GNOME interface for Telepathy|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|coldet|3D Collision Detection Library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|colordiff|Color terminal highlighter for diff files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|comix|A user-friendly, customizable image viewer|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
@@ -253,20 +253,20 @@
 Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|csound|A sound synthesis language and library|dcbw at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctorrent|BitTorrent Client written in C|rpm at greysector.net|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|cups-pdf|Extension for creating pdf-Files with CUPS|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2svn|CVS to Subversion Repository Converter|icon at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cvsgraph|A CVS/RCS repository grapher|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvsplot|Cvsplot collects statistics from CVS controlled files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cvsps|Patchset tool for CVS|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cvsps|Patchset tool for CVS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvsup|CVS-Optimized General-Purpose Network File Distribution System client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsutils|CVS Utilities|rc040203 at freenet.de|extras-qa at fedoraproject.org|
-Fedora Extras|cvsweb|Web interface for CVS repositories|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cvsweb|Web interface for CVS repositories|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cyphesis|WorldForge game server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|cyrus-imapd|A high-performance mail server with IMAP, POP3, NNTP and SIEVE support|jdennis at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|d4x|Downloader for X that supports resuming and many other features|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -322,9 +322,9 @@
 Fedora Extras|dssi|Disposable Soft Synth Interface|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dstat|System Status Monitor|scott at perturb.org|extras-qa at fedoraproject.org|
 Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|dumpasn1|ASN.1 object dump utility|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
-Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dx|Open source version of IBM's Visualization Data Explorer|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|dx-samples|Sample files for OpenDX|rpm at greysector.net|extras-qa at fedoraproject.org|
@@ -349,8 +349,8 @@
 Fedora Extras|ejabberd|A distributed, fault-tolerant Jabber/XMPP server|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|ekg|Experimental Gadu-Gadu client|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|em8300|DXR3/Hollywood Plus MPEG decoder card support tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|em8300-kmod|Kernel modules for DXR3/Hollywood Plus MPEG decoder cards|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|em8300|DXR3/Hollywood Plus MPEG decoder card support tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|em8300-kmod|Kernel modules for DXR3/Hollywood Plus MPEG decoder cards|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|ed at eh3.com
 Fedora Extras|emacs-common-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-vm|Emacs VM mailreader|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
@@ -390,7 +390,7 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-package-config-apt|Fedora configuration files for the apt-rpm package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
-Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xelerance.com|extras-qa at fedoraproject.org|
@@ -433,7 +433,7 @@
 Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|freedoom|Open-source data files for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedoom-freedm|Deathmatch levels for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|freedroid|Clone of the C64 Game Paradroid|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freefont|Free UCS Outline Fonts|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -494,7 +494,7 @@
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdmap|A tool which allows to visualize disk space|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gdome2|DOM level 2 library for accessing XML files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|geda-docs|Documentation for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-examples|Circuit examples for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-gattrib|Attribute editor for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
@@ -528,10 +528,10 @@
 Fedora Extras|gkrellm|Multiple stacked system monitors in one process|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-volume|GKrellM volume plugin|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-wifi|Wireless monitor plugin for the GNU Krell Monitors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -671,7 +671,7 @@
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
 Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|hddtemp|Hard disk temperature tool|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
@@ -693,11 +693,11 @@
 Fedora Extras|ht2html|The www.python.org Web site generator|ifoox at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|htb-util|Another tool to make your life easier with HTB|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htmldoc|A tool for converting HTML source files into HTML, PostScript, or PDF|adam at spicenitz.org|extras-qa at fedoraproject.org|
-Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htop|Interactive process viewer|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|http_ping|HTTP latency measuring utility|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hugs98|Haskell Interpreter|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunky-fonts|Modified Bitstream Vera fonts with additional letters|gajownik at gmail.com|extras-qa at fedoraproject.org|
@@ -709,9 +709,9 @@
 Fedora Extras|ices|Source streaming for Icecast|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|id3-py|Python ID3 tag library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|id3v2|A command line id3v2 tag editor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ifm|Interactive Fiction Mapper|chris at chrisgrau.com|extras-qa at fedoraproject.org|
 Fedora Extras|ifplugd|Detect and take action when an ethernet cable is unplugged|jamatos at fc.up.pt|extras-qa at fedoraproject.org|aaron.bennett at olin.edu
 Fedora Extras|iftop|Command line tool that displays bandwidth usage on an interface|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -800,7 +800,7 @@
 Fedora Extras|keyutils|Kernel key management utilities|dhowells at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kicad|Electronic schematic diagrams and printed circuit board artwork|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|kid3|Efficient ID3 tagger|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kiosktool|KIOSK administration tool for KDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -828,7 +828,7 @@
 Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|paul at xelerance.com|extras-qa at fedoraproject.org|
-Fedora Extras|ksensors|An lm_sensors frontend for KDE|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kshutdown|KShutDown is an advanced shut down utility for KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kst|Plots scientific data|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|ksynaptics|KDE configuration for synaptics module|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -907,7 +907,7 @@
 Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libhugetlbfs|A library which provides easy access to huge pages of memory|drfickle at k-lug.org|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
-Fedora Extras|libid3tag|ID3 tag manipulation library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libifp|A general-purpose library-driver for iRiver's iFP portable audio players|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libipoddevice|Provides device-level support for the Apple iPod|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libjingle|GoogleTalk implementation of Jingle|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -922,7 +922,7 @@
 Fedora Extras|libmatroska|An open Audio/Video container format|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmodelfile|Library for accessing various model file formats|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|libmodplug|Modplug mod music file format library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmtp|MTP client library|triad at df.lth.se|extras-qa at fedoraproject.org|
@@ -1013,9 +1013,9 @@
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|lirc|The Linux Infrared Remote Control package|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
-Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
+Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -1038,7 +1038,7 @@
 Fedora Extras|m17n-db|m17n-lib datafiles for input and output|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|m17n-lib|multilingual text library|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
+Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 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
@@ -1154,7 +1154,7 @@
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org|
 Fedora Extras|netlabel_tools|Tools to manage the Linux NetLabel subsystem|james.antill at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|netmask|Utility for determining network masks|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|netpanzer|An Online Multiplayer Tactical Warfare Game|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|netpanzer-data|Data files for netpanzer|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|NetworkManager-openvpn|NetworkManager VPN integration for OpenVPN|tim at niemueller.de|extras-qa at fedoraproject.org|
@@ -1163,7 +1163,7 @@
 Fedora Extras|new|A simple template system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|newsx|NNTP news exchange utility|rpm at greysector.net|extras-qa at fedoraproject.org|
-Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
@@ -1211,7 +1211,7 @@
 Fedora Extras|openbabel|Chemistry software file format converter|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|openct|Middleware framework for smart card terminals|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|rc040203 at freenet.de|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -1219,7 +1219,7 @@
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openpbx|The Truly Open Source PBX|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|opensc|SmartCard library and applications|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
@@ -1261,9 +1261,9 @@
 Fedora Extras|pavumeter|Volume meter for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcb|An interactive printed circuit board editor|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
-Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
-Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -1339,7 +1339,7 @@
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Clone|Recursively copy perl datatypes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Compress-Bzip2|Interface to Bzip2 compression library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Config-General|Generic configuration module for Perl|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1504,7 +1504,7 @@
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Cmd|Finding and running system commands made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1552,7 +1552,7 @@
 Fedora Extras|perl-Maypole|MVC web application framework|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-MIME-Types|MIME types module for Perl|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1565,7 +1565,7 @@
 Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-ScanDeps|Recursively scan Perl code for dependencies|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Starter|A simple starter kit for any module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Starter-PBP|Create a module as recommended in "Perl Best Practices"|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1573,7 +1573,7 @@
 Fedora Extras|perl-Moose-Policy|Police your project/company-wide Moose policies|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MP3-Info|Manipulate / fetch info from MP3 audio files|chris.stone at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Jabber|Net::Jabber - Jabber client library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-LibIDN|Perl bindings for GNU LibIDN|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1594,7 +1594,7 @@
 Fedora Extras|perl-Package-Constants|List all constants declared in a package|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Package-Generator|Generate new packages quickly and easily|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PadWalker|Play with other peoples' lexical variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Coerce|Allows your classes to do coercion of parameters|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1651,7 +1651,7 @@
 Fedora Extras|perl-Scalar-Properties|Run-time properties on scalar variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SDL|SDL bindings for the Perl language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Infinite|Sets of intervals|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Scalar|Basic set operations|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Smart-Comments|Comments that do more than just sit there|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1668,7 +1668,7 @@
 Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Statistics-Descriptive|Perl module of basic descriptive statistical functions|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Format|Sprintf-like string formatting capabilities with arbitrary format definitions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Exporter|Sophisticated exporter for custom-built routines|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1720,7 +1720,7 @@
 Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Diff|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Levenshtein|Text::Levenshtein Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Quoted|Extract the structure of a quoted mail message|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1768,7 +1768,7 @@
 Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML-Parser-Syck|Perl Wrapper for the YAML Parser Extension: libsyck|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,oliver at linux-kernel.at
-Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pessulus|A lockdown editor for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
@@ -1872,7 +1872,7 @@
 Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|prozilla|An advanced Linux download manager|kushaldas at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|pscan|Limited problem scanner for C source files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pstoedit|Translates PostScript into other vector formats|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
@@ -1926,8 +1926,8 @@
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|jamatos at fc.up.pt|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
-Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|python-id3|ID3 tag library for Python|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|python-id3|ID3 tag library for Python|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|python-imaging|Python's own image processing library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-json|A JSON reader and writer for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
@@ -2057,9 +2057,9 @@
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|rpld|RPL/RIPL remote boot daemon|i at stingr.net|extras-qa at fedoraproject.org|
-Fedora Extras|rpmdevtools|RPM Development Tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|rpmdevtools|RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
-Fedora Extras|rpmlint|RPM correctness checker|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|jwilson at redhat.com|extras-qa at fedoraproject.org|
@@ -2191,7 +2191,7 @@
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|swaks|Command-line SMTP transaction tester|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
@@ -2319,7 +2319,7 @@
 Fedora Extras|twinkle|A SIP Soft Phone|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|ucarp|Common Address Redundancy Protocol (CARP) for Unix|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ucblogo|An interpreter for the Logo programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-Fedora Extras|ucl|Portable lossless data compression library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ucl|Portable lossless data compression library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|udftools|Linux UDF Filesystem userspace utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|udunits|A library for manipulating units of physical quantities|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ufraw|Tool to retrieve raw image data from digital cameras|nphilipp at redhat.com|extras-qa at fedoraproject.org|
@@ -2332,7 +2332,7 @@
 Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|unshield|Install InstallShield applications on a Pocket PC|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|up-imapproxy|University of Pittsburgh IMAP Proxy|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
-Fedora Extras|upx|The Ultimate Packer for eXecutables|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ushare|UPnP (TM) A/V Media Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
@@ -2345,10 +2345,10 @@
 Fedora Extras|vala|A modern programming language for GNOME|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdr|Video Disk Recorder|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdradmin-am|Web interface for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|
@@ -2363,7 +2363,7 @@
 Fedora Extras|vorbisgain|Adds tags to Ogg Vorbis files to adjust the volume|bdpepple at ameritech.net|extras-qa at fedoraproject.org|noa at resare.com
 Fedora Extras|vpnc|IPSec VPN client compatible with Cisco equipment|tmraz at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|w3c-markup-validator|W3C Markup Validator|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wallpapoz|Gnome Multi Backgrounds and Wallpapers Configuration Tool|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
@@ -2421,10 +2421,10 @@
 Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xdg-utils|Basic desktop integration functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|xdrawchem|2D chemical structures drawing tool|rpm at greysector.net|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs|A different version of Emacs|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-sumo|XEmacs Lisp packages|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xeuphoric|An oric emulator capable of emulating the full family|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -2476,7 +2476,7 @@
 Fedora Extras|xfwm4|Next generation window manager for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xgalaxy|Galaxian / Galaga like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|scop at fedoraproject.org
+Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|xkeycaps|Graphical front end to xmodmap|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
@@ -2484,16 +2484,16 @@
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-adplug|XMMS plugin to play AdLib (OPL2) files|triad at df.lth.se|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-crossfade|A crossfade output plugin for XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-musepack|X MultiMedia System input plugin to play musepack (mpc) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-scrobbler|Audioscrobbler plugin for XMMS|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 23:15:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:15:32 -0700
Subject: rpms/anjuta import.log,1.28,1.29
Message-ID: <200611142315.kAENFWIK018015@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17980

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-11 on branch FC-5 from anjuta-2.0.2-11.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- import.log	14 Nov 2006 23:13:16 -0000	1.28
+++ import.log	14 Nov 2006 23:15:02 -0000	1.29
@@ -25,3 +25,4 @@
 anjuta-2_0_2-10:FC-6:anjuta-2.0.2-10.src.rpm:1162999249
 anjuta-2_0_2-10:HEAD:anjuta-2.0.2-10.src.rpm:1162999392
 anjuta-2_0_2-11:HEAD:anjuta-2.0.2-11.src.rpm:1163545983
+anjuta-2_0_2-11:FC-5:anjuta-2.0.2-11.src.rpm:1163546088



From fedora-extras-commits at redhat.com  Tue Nov 14 23:15:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:15:33 -0700
Subject: rpms/anjuta/FC-5 scintillagtk.patch,NONE,1.1 anjuta.spec,1.23,1.24
Message-ID: <200611142315.kAENFX9N018018@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17980/FC-5

Modified Files:
	anjuta.spec 
Added Files:
	scintillagtk.patch 
Log Message:
auto-import anjuta-2.0.2-11 on branch FC-5 from anjuta-2.0.2-11.src.rpm

scintillagtk.patch:

--- NEW FILE scintillagtk.patch ---
--- anjuta-2.0.2/scintilla/ScintillaGTK.cxx	2006-04-27 21:30:27.000000000 +0100
+++ anjuta-2.0.2/scintilla/ScintillaGTK-new.cxx	2006-11-14 22:34:06.000000000 +0000
@@ -2193,7 +2193,7 @@
 	paintState = notPainting;
 
 	if (rgnUpdate) {
-		g_free(rgnUpdate);
+		gdk_region_destroy(rgnUpdate);
 	}
 	rgnUpdate = 0;
 


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- anjuta.spec	8 Nov 2006 15:19:04 -0000	1.23
+++ anjuta.spec	14 Nov 2006 23:15:02 -0000	1.24
@@ -1,12 +1,13 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
 Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: anjuta-dialog.patch
+Patch1: scintillagtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
 BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
@@ -51,6 +52,7 @@
 chmod 644 scintilla/*.cxx
 chmod 644 scintilla/*.h
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 %build
 %configure --disable-static --disable-plugin-subversion --enable-nls
@@ -127,6 +129,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Tue Nov 14 2006 Paul F. Johnson  2.0.2-11
+- scintilla gtk fix
+
 * Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
 - add patch for close dialog on the about window
 - renamed spec file to anjuta



From fedora-extras-commits at redhat.com  Tue Nov 14 23:17:06 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:17:06 -0700
Subject: rpms/anjuta import.log,1.29,1.30
Message-ID: <200611142317.kAENH6LF018112@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18079

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-11 on branch FC-6 from anjuta-2.0.2-11.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- import.log	14 Nov 2006 23:15:02 -0000	1.29
+++ import.log	14 Nov 2006 23:16:36 -0000	1.30
@@ -26,3 +26,4 @@
 anjuta-2_0_2-10:HEAD:anjuta-2.0.2-10.src.rpm:1162999392
 anjuta-2_0_2-11:HEAD:anjuta-2.0.2-11.src.rpm:1163545983
 anjuta-2_0_2-11:FC-5:anjuta-2.0.2-11.src.rpm:1163546088
+anjuta-2_0_2-11:FC-6:anjuta-2.0.2-11.src.rpm:1163546180



From fedora-extras-commits at redhat.com  Tue Nov 14 23:17:07 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:17:07 -0700
Subject: rpms/anjuta/FC-6 scintillagtk.patch,NONE,1.1 anjuta.spec,1.24,1.25
Message-ID: <200611142317.kAENH7cQ018115@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18079/FC-6

Modified Files:
	anjuta.spec 
Added Files:
	scintillagtk.patch 
Log Message:
auto-import anjuta-2.0.2-11 on branch FC-6 from anjuta-2.0.2-11.src.rpm

scintillagtk.patch:

--- NEW FILE scintillagtk.patch ---
--- anjuta-2.0.2/scintilla/ScintillaGTK.cxx	2006-04-27 21:30:27.000000000 +0100
+++ anjuta-2.0.2/scintilla/ScintillaGTK-new.cxx	2006-11-14 22:34:06.000000000 +0000
@@ -2193,7 +2193,7 @@
 	paintState = notPainting;
 
 	if (rgnUpdate) {
-		g_free(rgnUpdate);
+		gdk_region_destroy(rgnUpdate);
 	}
 	rgnUpdate = 0;
 


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-6/anjuta.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- anjuta.spec	8 Nov 2006 15:21:06 -0000	1.24
+++ anjuta.spec	14 Nov 2006 23:16:36 -0000	1.25
@@ -1,12 +1,13 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
 Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: anjuta-dialog.patch
+Patch1: scintillagtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
 BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
@@ -51,6 +52,7 @@
 chmod 644 scintilla/*.cxx
 chmod 644 scintilla/*.h
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 %build
 %configure --disable-static --disable-plugin-subversion --enable-nls
@@ -127,6 +129,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Tue Nov 14 2006 Paul F. Johnson  2.0.2-11
+- scintilla gtk fix
+
 * Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
 - add patch for close dialog on the about window
 - renamed spec file to anjuta



From fedora-extras-commits at redhat.com  Wed Nov 15 01:16:00 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:16:00 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.8,1.9
Message-ID: <200611150116.kAF1G0vC024919@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24903

Modified Files:
	piklab.spec 
Log Message:
Remove no more needed patches. Fix EVR.



Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- piklab.spec	14 Nov 2006 16:01:37 -0000	1.8
+++ piklab.spec	15 Nov 2006 01:15:29 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	1.1%{?dist}
+Release:	2%{?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
+* Tue Nov 14 2006  Alain Portal  0.12.2-2
+  - Fix EVR.
+
 * Tue Nov 14 2006  Alain Portal  0.12.2-1.1
   - Fix patches name.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 01:18:49 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:18:49 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.9,1.10
Message-ID: <200611150118.kAF1Ingw024979@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24963

Modified Files:
	piklab.spec 
Log Message:
Fix changelog date.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- piklab.spec	15 Nov 2006 01:15:29 -0000	1.9
+++ piklab.spec	15 Nov 2006 01:18:18 -0000	1.10
@@ -120,7 +120,7 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
-* Tue Nov 14 2006  Alain Portal  0.12.2-2
+* Wed Nov 15 2006  Alain Portal  0.12.2-2
   - Fix EVR.
 
 * Tue Nov 14 2006  Alain Portal  0.12.2-1.1



From fedora-extras-commits at redhat.com  Wed Nov 15 01:21:35 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:21:35 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.10,1.11
Message-ID: <200611150121.kAF1LZoJ025070@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25022

Modified Files:
	piklab.spec 
Log Message:
GRRRRRRR.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- piklab.spec	15 Nov 2006 01:18:18 -0000	1.10
+++ piklab.spec	15 Nov 2006 01:21:05 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	2%{?dist}
+Release:	3%{?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,7 +120,7 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
-* Wed Nov 15 2006  Alain Portal  0.12.2-2
+* Wed Nov 15 2006  Alain Portal  0.12.2-3
   - Fix EVR.
 
 * Tue Nov 14 2006  Alain Portal  0.12.2-1.1



From fedora-extras-commits at redhat.com  Wed Nov 15 01:23:23 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:23:23 -0700
Subject: rpms/piklab/FC-6 piklab.spec,1.7,1.8
Message-ID: <200611150123.kAF1NNcO025158@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25141

Modified Files:
	piklab.spec 
Log Message:
Remove no more needed patches. Fix EVR.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-6/piklab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- piklab.spec	14 Nov 2006 15:53:38 -0000	1.7
+++ piklab.spec	15 Nov 2006 01:22:53 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	1%{?dist}
+Release:	3%{?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
+* Wed Nov 15 2006  Alain Portal  0.12.2-3
+  - Fix EVR.
+
 * Tue Nov 14 2006  Alain Portal  0.12.2-1
   - New upstream version
 



From fedora-extras-commits at redhat.com  Wed Nov 15 01:25:15 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:25:15 -0700
Subject: rpms/piklab/devel piklab.spec,1.7,1.8
Message-ID: <200611150125.kAF1PFGw025217@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25201

Modified Files:
	piklab.spec 
Log Message:
Remove no more needed patches. Fix EVR.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- piklab.spec	14 Nov 2006 15:51:34 -0000	1.7
+++ piklab.spec	15 Nov 2006 01:24:44 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	1%{?dist}
+Release:	3%{?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
+* Wed Nov 15 2006  Alain Portal  0.12.2-3
+  - Fix EVR.
+
 * Tue Nov 14 2006  Alain Portal  0.12.2-1
   - New upstream version
 



From fedora-extras-commits at redhat.com  Wed Nov 15 01:56:10 2006
From: fedora-extras-commits at redhat.com (Callum Lerwick (seg))
Date: Tue, 14 Nov 2006 18:56:10 -0700
Subject: rpms/rosegarden4/devel .cvsignore, 1.2, 1.3 rosegarden4.spec, 1.3, 
	1.4 sources, 1.2, 1.3 rosegarden-4-1.2.3-build-fixes.patch, 1.1,
	NONE
Message-ID: <200611150156.kAF1uAQW025518@cvs-int.fedora.redhat.com>

Author: seg

Update of /cvs/extras/rpms/rosegarden4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25496

Modified Files:
	.cvsignore rosegarden4.spec sources 
Removed Files:
	rosegarden-4-1.2.3-build-fixes.patch 
Log Message:
* Sat Nov 11 2006 Callum Lerwick  - 1.4.0-1
- New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 21:29:33 -0000	1.2
+++ .cvsignore	15 Nov 2006 01:55:40 -0000	1.3
@@ -1 +1 @@
-rosegarden-4-1.2.3.tar.bz2
+rosegarden-1.4.0.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/devel/rosegarden4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rosegarden4.spec	5 Sep 2006 08:05:40 -0000	1.3
+++ rosegarden4.spec	15 Nov 2006 01:55:40 -0000	1.4
@@ -1,14 +1,13 @@
 Name:      rosegarden4
-Version:   1.2.3
-Release:   5%{?dist}
+Version:   1.4.0
+Release:   1%{?dist}
 Summary:   MIDI, audio and notation editor
 Group:     Applications/Multimedia
 License:   GPL
 URL:       http://www.rosegardenmusic.com/
-Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-4-%{version}.tar.bz2
-Patch0:    rosegarden-4-1.2.3-build-fixes.patch
-Patch1:    rosegarden-4-desktop-file.patch
-Patch2:    rosegarden-4-1.2.3-lib64.patch
+Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
+Patch0:    rosegarden-4-desktop-file.patch
+Patch1:    rosegarden-4-1.2.3-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: scons
@@ -34,12 +33,11 @@
 musicians, music students, and small studio or home recording environments. 
 
 %prep
-%setup -q -n rosegarden-4-%{version}
+%setup -q -n rosegarden-%{version}
 %patch0 -p1
-%patch1 -p1
 # Look for LADSPA/DSSI plugins in the correct place on x86_64
 %ifarch x86_64
-%patch2 -p1
+%patch1 -p1
 %endif
 
 %build
@@ -90,7 +88,7 @@
 %{_datadir}/applications/fedora-rosegarden.desktop
 %{_datadir}/apps/rosegarden/
 %{_docdir}/HTML/*/rosegarden/
-%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.xpm
+%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.png
 %{_datadir}/icons/hicolor/16x16/mimetypes/x-rosegarden.png
 %{_datadir}/icons/hicolor/32x32/apps/rosegarden.png
 %{_datadir}/icons/hicolor/32x32/mimetypes/x-rosegarden.png
@@ -107,6 +105,9 @@
 %{_datadir}/mimelnk/audio/x-soundfont.desktop
 
 %changelog
+* Sat Nov 11 2006 Callum Lerwick  - 1.4.0-1
+- New upstream version.
+
 * Tue Sep 05 2006 Callum Lerwick  - 1.2.3-5
 - Bump for FC6 mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 21:29:33 -0000	1.2
+++ sources	15 Nov 2006 01:55:40 -0000	1.3
@@ -1 +1 @@
-e7fb7ebcb21ac6841ac5cfd6683f5fb2  rosegarden-4-1.2.3.tar.bz2
+17a0e5a781ffe5d8c8bc8044573151c3  rosegarden-1.4.0.tar.bz2


--- rosegarden-4-1.2.3-build-fixes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 15 02:25:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 19:25:57 -0700
Subject: rpms/amavisd-new/FC-6 amavisd-new.spec,1.10,1.11
Message-ID: <200611150225.kAF2PvJ3032595@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32503

Modified Files:
	amavisd-new.spec 
Log Message:
Add dependency on file. (#215492)


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-6/amavisd-new.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- amavisd-new.spec	14 Oct 2006 17:04:11 -0000	1.10
+++ amavisd-new.spec	15 Nov 2006 02:25:27 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        2%{?prerelease:.%{prerelease}}%{?dist}
+Release:        3%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -22,6 +22,7 @@
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
 Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
+Requires:       file
 Requires:       bzip2
 Requires:       gzip
 Requires:       arj
@@ -152,6 +153,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-3
+- Add dependency on file. (#215492)
+
 * Sat Oct 14 2006 Steven Pritchard  2.4.3-2
 - Fix permissions on the cron.daily script.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 02:32:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 19:32:55 -0700
Subject: rpms/amavisd-new/devel amavisd-new.spec,1.11,1.12
Message-ID: <200611150232.kAF2Wtu6001247@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1152

Modified Files:
	amavisd-new.spec 
Log Message:
Rebuild.


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amavisd-new.spec	14 Nov 2006 22:19:48 -0000	1.11
+++ amavisd-new.spec	15 Nov 2006 02:32:24 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        3%{?prerelease:.%{prerelease}}%{?dist}
+Release:        4%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -153,6 +153,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-4
+- Rebuild.
+
 * Tue Nov 14 2006 Steven Pritchard  2.4.3-3
 - Add dependency on file. (#215492)
 



From fedora-extras-commits at redhat.com  Wed Nov 15 02:35:51 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 19:35:51 -0700
Subject: rpms/amavisd-new/FC-6 amavisd-new.spec,1.11,1.12
Message-ID: <200611150235.kAF2Zp1v001746@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654

Modified Files:
	amavisd-new.spec 
Log Message:
Rebuild.


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-6/amavisd-new.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amavisd-new.spec	15 Nov 2006 02:25:27 -0000	1.11
+++ amavisd-new.spec	15 Nov 2006 02:35:20 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        3%{?prerelease:.%{prerelease}}%{?dist}
+Release:        4%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -153,6 +153,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-4
+- Rebuild.
+
 * Tue Nov 14 2006 Steven Pritchard  2.4.3-3
 - Add dependency on file. (#215492)
 



From fedora-extras-commits at redhat.com  Wed Nov 15 02:37:59 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 19:37:59 -0700
Subject: rpms/amavisd-new/FC-5 amavisd-new.spec,1.7,1.8
Message-ID: <200611150237.kAF2bxgO002118@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2028

Modified Files:
	amavisd-new.spec 
Log Message:
Add dependency on file. (#215492)


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-new.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amavisd-new.spec	15 Oct 2006 00:23:28 -0000	1.7
+++ amavisd-new.spec	15 Nov 2006 02:37:29 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        2%{?prerelease:.%{prerelease}}%{?dist}
+Release:        4%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -22,6 +22,7 @@
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
 Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
+Requires:       file
 Requires:       bzip2
 Requires:       gzip
 Requires:       arj
@@ -152,6 +153,12 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-4
+- Rebuild.
+
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-3
+- Add dependency on file. (#215492)
+
 * Sat Oct 14 2006 Steven Pritchard  2.4.3-2
 - Fix permissions on the cron.daily script.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 04:34:02 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 21:34:02 -0700
Subject: rpms/ncview/devel ncview.spec,1.5,1.6
Message-ID: <200611150434.kAF4Y2Ee015130@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15080/devel

Modified Files:
	ncview.spec 
Log Message:
bz 215632



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/devel/ncview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncview.spec	2 Sep 2006 15:48:42 -0000	1.5
+++ ncview.spec	15 Nov 2006 04:33:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -46,6 +46,11 @@
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview
 chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+mv ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview \
+   ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/X11
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,11 +61,14 @@
 %doc README COPYING
 %{_bindir}/*
 %{_datadir}/ncview
-%{_libdir}/X11/app-defaults/*
+%{_datadir}/X11/app-defaults/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill  - 1.92e-9
+- bz 215632
+
 * Sat Sep  2 2006 Ed Hill  - 1.92e-8
 - rebuild for imminent FC-6 release
 



From fedora-extras-commits at redhat.com  Wed Nov 15 04:34:00 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 21:34:00 -0700
Subject: rpms/ncview/FC-5 ncview.spec,1.4,1.5
Message-ID: <200611150434.kAF4Y028015124@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15080/FC-5

Modified Files:
	ncview.spec 
Log Message:
bz 215632



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-5/ncview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncview.spec	17 Feb 2006 03:02:10 -0000	1.4
+++ ncview.spec	15 Nov 2006 04:33:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -46,6 +46,11 @@
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview
 chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+mv ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview \
+   ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/X11
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,11 +61,14 @@
 %doc README COPYING
 %{_bindir}/*
 %{_datadir}/ncview
-%{_libdir}/X11/app-defaults/*
+%{_datadir}/X11/app-defaults/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill  - 1.92e-8
+- bz 215632
+
 * Thu Feb 16 2006 Ed Hill  - 1.92e-7
 - rebuild for new gcc
 



From fedora-extras-commits at redhat.com  Wed Nov 15 04:34:02 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 21:34:02 -0700
Subject: rpms/ncview/FC-6 ncview.spec,1.5,1.6
Message-ID: <200611150434.kAF4Y2nG015127@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15080/FC-6

Modified Files:
	ncview.spec 
Log Message:
bz 215632



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-6/ncview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncview.spec	2 Sep 2006 15:48:42 -0000	1.5
+++ ncview.spec	15 Nov 2006 04:33:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -46,6 +46,11 @@
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview
 chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+mv ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview \
+   ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/X11
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,11 +61,14 @@
 %doc README COPYING
 %{_bindir}/*
 %{_datadir}/ncview
-%{_libdir}/X11/app-defaults/*
+%{_datadir}/X11/app-defaults/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill  - 1.92e-9
+- bz 215632
+
 * Sat Sep  2 2006 Ed Hill  - 1.92e-8
 - rebuild for imminent FC-6 release
 



From fedora-extras-commits at redhat.com  Wed Nov 15 04:47:09 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Tue, 14 Nov 2006 21:47:09 -0700
Subject: rpms/mlton/devel mlton-debuginfo.patch,1.1,1.2
Message-ID: <200611150447.kAF4l99e015324@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15305

Modified Files:
	mlton-debuginfo.patch 
Log Message:
debug

mlton-debuginfo.patch:

Index: mlton-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlton-debuginfo.patch	9 Jul 2006 13:51:57 -0000	1.1
+++ mlton-debuginfo.patch	15 Nov 2006 04:46:38 -0000	1.2
@@ -1,24 +1,24 @@
-diff -ur mlton-20051202~/bytecode/Makefile mlton-20051202/bytecode/Makefile
---- mlton-20051202~/bytecode/Makefile	2005-11-30 13:36:52.000000000 -0500
-+++ mlton-20051202/bytecode/Makefile	2006-06-25 18:14:13.000000000 -0400
+diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
+--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/bytecode/Makefile	2006-11-14 23:18:42.000000000 -0500
 @@ -10,7 +10,7 @@
  all: interpret.o interpret-gdb.o print-opcodes
  
  CC = gcc -std=gnu99
 -CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
 +CFLAGS = -fomit-frame-pointer -g -I../runtime -I../include -Wall
- 
- ifeq ($(TARGET_ARCH), amd64)
- CFLAGS += -mtune=opteron -m32 
-diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
---- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
-+++ mlton-20051202/Makefile	2006-06-25 18:13:45.000000000 -0400
-@@ -402,17 +402,6 @@
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
+diff -ur mlton-20061107~/Makefile mlton-20061107/Makefile
+--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
++++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
+@@ -411,17 +411,6 @@
  	if $(GZIP_MAN); then						\
  		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
  	fi
 -	case "$(TARGET_OS)" in						\
--	cygwin|darwin|solaris)						\
+-	aix|cygwin|darwin|solaris)					\
 -	;;								\
 -	*)								\
 -		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
@@ -31,15 +31,15 @@
  
  .PHONY: install-docs
  install-docs:
-diff -ur mlton-20051202~/runtime/Makefile mlton-20051202/runtime/Makefile
---- mlton-20051202~/runtime/Makefile	2005-11-29 18:05:07.000000000 -0500
-+++ mlton-20051202/runtime/Makefile	2006-06-25 18:13:45.000000000 -0400
+diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
+--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/runtime/Makefile	2006-11-14 23:20:40.000000000 -0500
 @@ -49,7 +49,7 @@
  endif
  
  CC = gcc -std=gnu99
 -CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
 +CFLAGS = -O2 -Wall -g -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
- DEBUGFLAGS = $(CFLAGS) -gstabs+ -g2
- 
- CFILES = 							\
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)



From fedora-extras-commits at redhat.com  Wed Nov 15 05:18:41 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 22:18:41 -0700
Subject: rpms/ncview/FC-5 ncview.spec,1.5,1.6
Message-ID: <200611150518.kAF5IfK4018538@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18522

Modified Files:
	ncview.spec 
Log Message:
cleanup app-defaults install



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-5/ncview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncview.spec	15 Nov 2006 04:33:28 -0000	1.5
+++ ncview.spec	15 Nov 2006 05:18:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -40,16 +40,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
-mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
+cat > install-appdef < - 1.92e-9
+- cleanup app-defaults install (check-buildroot)
+
 * Tue Nov 14 2006 Ed Hill  - 1.92e-8
 - bz 215632
 



From fedora-extras-commits at redhat.com  Wed Nov 15 05:30:05 2006
From: fedora-extras-commits at redhat.com (Callum Lerwick (seg))
Date: Tue, 14 Nov 2006 22:30:05 -0700
Subject: rpms/rosegarden4/FC-6 .cvsignore, 1.2, 1.3 rosegarden4.spec, 1.3,
	1.4 sources, 1.2, 1.3 rosegarden-4-1.2.3-build-fixes.patch, 1.1, NONE
Message-ID: <200611150530.kAF5U5Fi018691@cvs-int.fedora.redhat.com>

Author: seg

Update of /cvs/extras/rpms/rosegarden4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18654

Modified Files:
	.cvsignore rosegarden4.spec sources 
Removed Files:
	rosegarden-4-1.2.3-build-fixes.patch 
Log Message:
* Sat Nov 11 2006 Callum Lerwick  - 1.4.0-1
- New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 21:29:33 -0000	1.2
+++ .cvsignore	15 Nov 2006 05:29:35 -0000	1.3
@@ -1 +1 @@
-rosegarden-4-1.2.3.tar.bz2
+rosegarden-1.4.0.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/rosegarden4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rosegarden4.spec	5 Sep 2006 08:05:40 -0000	1.3
+++ rosegarden4.spec	15 Nov 2006 05:29:35 -0000	1.4
@@ -1,14 +1,13 @@
 Name:      rosegarden4
-Version:   1.2.3
-Release:   5%{?dist}
+Version:   1.4.0
+Release:   1%{?dist}
 Summary:   MIDI, audio and notation editor
 Group:     Applications/Multimedia
 License:   GPL
 URL:       http://www.rosegardenmusic.com/
-Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-4-%{version}.tar.bz2
-Patch0:    rosegarden-4-1.2.3-build-fixes.patch
-Patch1:    rosegarden-4-desktop-file.patch
-Patch2:    rosegarden-4-1.2.3-lib64.patch
+Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
+Patch0:    rosegarden-4-desktop-file.patch
+Patch1:    rosegarden-4-1.2.3-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: scons
@@ -34,12 +33,11 @@
 musicians, music students, and small studio or home recording environments. 
 
 %prep
-%setup -q -n rosegarden-4-%{version}
+%setup -q -n rosegarden-%{version}
 %patch0 -p1
-%patch1 -p1
 # Look for LADSPA/DSSI plugins in the correct place on x86_64
 %ifarch x86_64
-%patch2 -p1
+%patch1 -p1
 %endif
 
 %build
@@ -90,7 +88,7 @@
 %{_datadir}/applications/fedora-rosegarden.desktop
 %{_datadir}/apps/rosegarden/
 %{_docdir}/HTML/*/rosegarden/
-%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.xpm
+%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.png
 %{_datadir}/icons/hicolor/16x16/mimetypes/x-rosegarden.png
 %{_datadir}/icons/hicolor/32x32/apps/rosegarden.png
 %{_datadir}/icons/hicolor/32x32/mimetypes/x-rosegarden.png
@@ -107,6 +105,9 @@
 %{_datadir}/mimelnk/audio/x-soundfont.desktop
 
 %changelog
+* Sat Nov 11 2006 Callum Lerwick  - 1.4.0-1
+- New upstream version.
+
 * Tue Sep 05 2006 Callum Lerwick  - 1.2.3-5
 - Bump for FC6 mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 21:29:33 -0000	1.2
+++ sources	15 Nov 2006 05:29:35 -0000	1.3
@@ -1 +1 @@
-e7fb7ebcb21ac6841ac5cfd6683f5fb2  rosegarden-4-1.2.3.tar.bz2
+17a0e5a781ffe5d8c8bc8044573151c3  rosegarden-1.4.0.tar.bz2


--- rosegarden-4-1.2.3-build-fixes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 15 06:11:51 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 23:11:51 -0700
Subject: rpms/ncview/FC-5 ncview.spec,1.6,1.7
Message-ID: <200611150611.kAF6BpGp022002@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21986

Modified Files:
	ncview.spec 
Log Message:
more cleanups for check-buildroot



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-5/ncview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ncview.spec	15 Nov 2006 05:18:11 -0000	1.6
+++ ncview.spec	15 Nov 2006 06:11:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -37,6 +37,7 @@
 #  The parallel build was tested and it does NOT work.
 #  make %{?_smp_mflags}
 make
+sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < ncview.1.sed > ncview.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +67,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill  - 1.92e-10
+- more cleanups for check-buildroot
+
 * Tue Nov 14 2006 Ed Hill  - 1.92e-9
 - cleanup app-defaults install (check-buildroot)
 



From fedora-extras-commits at redhat.com  Wed Nov 15 06:22:58 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 23:22:58 -0700
Subject: rpms/ncview/devel ncview.spec,1.6,1.7
Message-ID: <200611150622.kAF6Mw1q022127@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22091

Modified Files:
	ncview.spec 
Log Message:
more cleanups



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/devel/ncview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ncview.spec	15 Nov 2006 04:33:32 -0000	1.6
+++ ncview.spec	15 Nov 2006 06:22:28 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -37,19 +37,20 @@
 #  The parallel build was tested and it does NOT work.
 #  make %{?_smp_mflags}
 make
+sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < ncview.1.sed > ncview.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
-mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
+cat > install-appdef < - 1.92e-10
+- more cleanups for check-buildroot
+
 * Tue Nov 14 2006 Ed Hill  - 1.92e-9
 - bz 215632
 



From fedora-extras-commits at redhat.com  Wed Nov 15 06:23:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 23:23:15 -0700
Subject: rpms/ncview/FC-6 ncview.spec,1.6,1.7
Message-ID: <200611150623.kAF6NF2A022168@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22110

Modified Files:
	ncview.spec 
Log Message:
more cleanups



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-6/ncview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ncview.spec	15 Nov 2006 04:33:31 -0000	1.6
+++ ncview.spec	15 Nov 2006 06:22:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -37,19 +37,20 @@
 #  The parallel build was tested and it does NOT work.
 #  make %{?_smp_mflags}
 make
+sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < ncview.1.sed > ncview.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
-mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
+cat > install-appdef < - 1.92e-10
+- more cleanups for check-buildroot
+
 * Tue Nov 14 2006 Ed Hill  - 1.92e-9
 - bz 215632
 



From fedora-extras-commits at redhat.com  Wed Nov 15 06:49:35 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Tue, 14 Nov 2006 23:49:35 -0700
Subject: rpms/gcin/devel NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.11, 1.12 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150649.kAF6nZ2l022369@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22340

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:14:47 -0000	1.8
+++ .cvsignore	15 Nov 2006 06:49:04 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	20 Oct 2006 08:14:47 -0000	1.11
+++ gcin.spec	15 Nov 2006 06:49:04 -0000	1.12
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +32,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -37,6 +40,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -50,10 +54,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -103,6 +107,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:14:47 -0000	1.2
+++ im-client.patch	15 Nov 2006 06:49:04 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:14:47 -0000	1.8
+++ sources	15 Nov 2006 06:49:04 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 06:58:35 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Tue, 14 Nov 2006 23:58:35 -0700
Subject: rpms/gcin/FC-6 NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.11, 1.12 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150658.kAF6wZK1022486@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22447

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:14:47 -0000	1.8
+++ .cvsignore	15 Nov 2006 06:58:05 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	20 Oct 2006 08:14:47 -0000	1.11
+++ gcin.spec	15 Nov 2006 06:58:05 -0000	1.12
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +32,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -37,6 +40,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -50,10 +54,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -103,6 +107,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:14:47 -0000	1.2
+++ im-client.patch	15 Nov 2006 06:58:05 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:14:47 -0000	1.8
+++ sources	15 Nov 2006 06:58:05 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 07:07:42 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 15 Nov 2006 00:07:42 -0700
Subject: rpms/gcin/FC-5 NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.11, 1.12 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150707.kAF77gnb025636@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25607

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:17:28 -0000	1.8
+++ .cvsignore	15 Nov 2006 07:07:12 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	20 Oct 2006 08:17:28 -0000	1.11
+++ gcin.spec	15 Nov 2006 07:07:12 -0000	1.12
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +32,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -37,6 +40,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -50,10 +54,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -103,6 +107,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:17:28 -0000	1.2
+++ im-client.patch	15 Nov 2006 07:07:12 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:17:28 -0000	1.8
+++ sources	15 Nov 2006 07:07:12 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 07:15:14 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 15 Nov 2006 00:15:14 -0700
Subject: rpms/gcin/FC-4 NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.12, 1.13 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150715.kAF7FEOj025736@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25705

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:22:14 -0000	1.8
+++ .cvsignore	15 Nov 2006 07:14:44 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	20 Oct 2006 08:22:14 -0000	1.12
+++ gcin.spec	15 Nov 2006 07:14:44 -0000	1.13
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -28,6 +30,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -35,6 +38,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,10 +52,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -101,6 +105,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:22:14 -0000	1.2
+++ im-client.patch	15 Nov 2006 07:14:44 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:22:14 -0000	1.8
+++ sources	15 Nov 2006 07:14:44 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 07:22:03 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 15 Nov 2006 00:22:03 -0700
Subject: rpms/gcin/FC-3 NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.11, 1.12 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150722.kAF7M3h6025824@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25792

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:31:38 -0000	1.8
+++ .cvsignore	15 Nov 2006 07:21:32 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	20 Oct 2006 08:31:38 -0000	1.11
+++ gcin.spec	15 Nov 2006 07:21:32 -0000	1.12
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -28,6 +30,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -35,6 +38,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,10 +52,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -101,6 +105,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:31:38 -0000	1.2
+++ im-client.patch	15 Nov 2006 07:21:32 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:31:38 -0000	1.8
+++ sources	15 Nov 2006 07:21:32 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 07:36:11 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 15 Nov 2006 00:36:11 -0700
Subject: rpms/gcin/FC-3 tray.patch,NONE,1.1 gcin.spec,1.12,1.13
Message-ID: <200611150736.kAF7aBpv025975@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25955

Modified Files:
	gcin.spec 
Added Files:
	tray.patch 
Log Message:
add tray.patch

tray.patch:

--- NEW FILE tray.patch ---
--- gcin-1.2.9/tray.c.orig	2006-11-14 17:54:43.000000000 +0800
+++ gcin-1.2.9/tray.c	2006-11-15 15:31:43.000000000 +0800
@@ -285,7 +285,7 @@
   pango_layout_set_font_description(pango, desc);
 #if 1
   // strange bug, why do we need this ?
-  desc = pango_layout_get_font_description(pango);
+  //desc = pango_layout_get_font_description(pango);
 #endif
   pango_font_description_set_size(desc, 9 * PANGO_SCALE);
 


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	15 Nov 2006 07:21:32 -0000	1.12
+++ gcin.spec	15 Nov 2006 07:35:40 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         tray.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -31,6 +32,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .tray
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -105,6 +107,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-2
+- add tray.patch
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Wed Nov 15 10:25:43 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 15 Nov 2006 03:25:43 -0700
Subject: fedora-security/audit fc5,1.390,1.391
Message-ID: <200611151025.kAFAPhFb005252@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5212

Modified Files:
	fc5 
Log Message:
CVE updates, fix consistency



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- fc5	14 Nov 2006 18:09:26 -0000	1.390
+++ fc5	15 Nov 2006 10:25:39 -0000	1.391
@@ -1,10 +1,10 @@
 Up to date CVE as of CVE email 20061112
-Up to date FC5 as of 20061112
+Up to date FC5 as of 20061114
 
 ** are items that need attention
 
 CVE-2006-5823 version (kernel) [since FEDORA-2006-1221]
-CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 version (kernel) [since FEDORA-2006-1221]
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
@@ -23,26 +23,27 @@
 CVE-2006-5469 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
+CVE-2006-5466 VULNERABLE (rpm) #212833
+CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5464 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5464 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5463 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5463 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5462 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5462 version (firefox) [since FEDORA-2006-1199]
-CVE-2006-5466 VULNERABLE (rpm) #212833
-CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
+CVE-2006-5461 VULNERABLE (avahi, fixed 0.6.15)
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
 CVE-2006-5331 VULNERABLE (kernel, fixed 2.6.19-rc3)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5229 ignore (openssh) reported not an issue
-CVE-2006-5215 VULNERABLE (xorg-x11-xdm) bz#212167
-CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5215 VULNERABLE (kdebase) bz#212166
-CVE-2006-5214 VULNERABLE (xorg-x11-xdm) bz#212167
-CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5214 VULNERABLE (kdebase) bz#212166
+CVE-2006-5215 VULNERABLE (xorg-x11-xdm) #212167
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit) #212167
+CVE-2006-5215 VULNERABLE (kdebase) #212166
+CVE-2006-5214 VULNERABLE (xorg-x11-xdm) #212167
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit) #212167
+CVE-2006-5214 VULNERABLE (kdebase) #212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield
@@ -422,10 +423,10 @@
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1608 ignore (php) safe mode isn't safe
 CVE-2006-1549 ignore (php) this is not a security issue
-CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
-CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
-CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
-CVE-2006-1542 backport (python) bz#169046 [since FEDORA-2006-689]
+CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) #187544
+CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) #187544
+CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) #187544
+CVE-2006-1542 backport (python) #169046 [since FEDORA-2006-689]
 CVE-2006-1531 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490]
 CVE-2006-1531 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1530 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490]
@@ -434,7 +435,7 @@
 CVE-2006-1529 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1528 version (kernel, fixed 2.6.13)
 CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499]
-CVE-2006-1526 backport (xorg-x11-server, fixed 1.1.1 at least) bz#189802 [since FEDORA-2006-483] xorg-x11-server-1.0.1-render-tris-CVE-2006-1526.patch
+CVE-2006-1526 backport (xorg-x11-server, fixed 1.1.1 at least) #189802 [since FEDORA-2006-483] xorg-x11-server-1.0.1-render-tris-CVE-2006-1526.patch
 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421]
 CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421]
 CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421]
@@ -446,11 +447,11 @@
 CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289]
 CVE-2006-1470 version (openldap, not 2.3.24 at least) #197278
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
-CVE-2006-1354 VULNERABLE (freeradius, fixed 1.1.2 at least) bz#186084
+CVE-2006-1354 VULNERABLE (freeradius, fixed 1.1.2 at least) #186084
 CVE-2006-1343 version (kernel, fixed 2.6.16.19) [since FEDORA-2006-698]
 CVE-2006-1342 version (kernel, not 2.6) not vulnerable
 CVE-2006-1335 version (gnome-screensaver, fixed 2.14)
-CVE-2006-1296 version (beagle, fixed 0.2.4) bz#185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188
+CVE-2006-1296 version (beagle, fixed 0.2.4) #185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188
 CVE-2006-1273 ignore (firefox) this issue only affects IE
 CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues
 CVE-2006-1242 version (kernel, fixed 2.6.16.1) [since FEDORA-2006-233]
@@ -462,16 +463,16 @@
 CVE-2006-1078 ignore (httpd) not a vulnerability
 CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1061 version (curl, fixed 7.15.3) [since FEDORA-2006-933] was backport since FEDORA-2006-189
-CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
-CVE-2006-1058 backport (busybox) bz#187386 [since FEDORA-2006-510]
-CVE-2006-1057 version (gdm, fixed 2.14.1) bz#188303 [since FEDORA-2006-338]
+CVE-2006-1059 version (samba, fixed 3.0.22 at least) #187170 [since FEDORA-2006-259]
+CVE-2006-1058 backport (busybox) #187386 [since FEDORA-2006-510]
+CVE-2006-1057 version (gdm, fixed 2.14.1) #188303 [since FEDORA-2006-338]
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421]
 CVE-2006-1052 version (kernel, fixed 2.6.16) [since FEDORA-2006-421] was patch-2.6.16-rc6 since FEDORA-2006-233
 CVE-2006-1045 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490]
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe
-CVE-2006-0996 version (php, fixed 5.1.4) bz#187511 [since FEDORA-2006-289]
+CVE-2006-0996 version (php, fixed 5.1.4) #187511 [since FEDORA-2006-289]
 CVE-2006-0903 version (mysql, 4.1.19) #183261 [since FEDORA-2006-553]
 CVE-2006-0884 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490]
 CVE-2006-0836 ignore (thunderbird) only crash on manual import
@@ -724,7 +725,7 @@
 CVE-2005-3089 version (firefox, fixed 1.0.7)
 CVE-2005-3088 ignore (fetchmail) fetchmailconf not shipped
 CVE-2005-3055 version (kernel, fixed 2.6.14 at least)
-CVE-2005-3054 ignore (php) see bz#169857
+CVE-2005-3054 ignore (php) see #169857
 CVE-2005-3053 version (kernel)
 CVE-2005-3044 version (kernel, fixed 2.6.13.2)
 CVE-2005-3011 backport (texinfo) texinfo-CAN-2005-3011.patch
@@ -1104,7 +1105,7 @@
 CVE-2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
 CVE-2005-0455 version (HelixPlayer, fixed 1.0.3)
 CVE-2005-0449 version (kernel, fixed 2.6.11)
-CVE-2005-0448 version (perl, fixed 5.8.6) bz#173793
+CVE-2005-0448 version (perl, fixed 5.8.6) #173793
 CVE-2005-0446 version (squid, fixed 2.5.STABLE9)
 CVE-2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020
 CVE-2005-0403 version (kernel) not upstream
@@ -1241,7 +1242,7 @@
 CVE-2004-2541 ignore (cscope) blocked by FORTIFY_SOURCE
 CVE-2004-2536 version (kernel, fixed 2.6.7)
 CVE-2004-2531 version (gnutls, fixed 1.0.17)
-CVE-2004-2480 ignore (squid) bz#166523, not reproducable
+CVE-2004-2480 ignore (squid) #166523, not reproducable
 CVE-2004-2479 version (squid, fixed 2.5.STABLE8)
 CVE-2004-2396 version (passwd, fixed 0.69)
 CVE-2004-2395 version (passwd, fixed 0.69)



From fedora-extras-commits at redhat.com  Wed Nov 15 10:26:08 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 15 Nov 2006 03:26:08 -0700
Subject: fedora-security/audit fc6,1.142,1.143
Message-ID: <200611151026.kAFAQ8bA005336@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5304

Modified Files:
	fc6 
Log Message:
CVE updates, fix consistency



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- fc6	14 Nov 2006 18:10:03 -0000	1.142
+++ fc6	15 Nov 2006 10:26:06 -0000	1.143
@@ -1,10 +1,10 @@
 Up to date CVE as of CVE email 20061112
-Up to date FC6 as of 20061112
+Up to date FC6 as of 20061114
 
 ** are items that need attention
 
 CVE-2006-5823 version (kernel) [since FEDORA-2006-1223]
-CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 version (kernel) [since FEDORA-2006-1223]
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
@@ -31,18 +31,19 @@
 CVE-2006-5463 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5462 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5462 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
+CVE-2006-5461 VULNERABLE (avahi, fixed 0.6.15)
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
-CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
+CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) #213280
 CVE-2006-5331 VULNERABLE (kernel, fixed 2.6.19-rc3)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
-CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5215 VULNERABLE (kdebase) bz#212166
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit) #212167
+CVE-2006-5215 VULNERABLE (kdebase) #212166
 CVE-2006-5214 version (xorg-x11-xdm)
-CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5214 VULNERABLE (kdebase) bz#212166
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit) #212167
+CVE-2006-5214 VULNERABLE (kdebase) #212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
@@ -118,15 +119,15 @@
 CVE-2006-4262 backport (cscope) 
 CVE-2006-4253 version (firefox, fixed 1.5.0.7)
 CVE-2006-4253 version (thunderbird, fixed 1.5.0.7)
-CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203428
-CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203434
+CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) #203428
+CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) #203434
 CVE-2006-4146 backport (gdb)
 CVE-2006-4145 version (kernel, fixed 2.6.17.10, fixed 2.6.18-rc5) needs a better upstream fix
 CVE-2006-4144 backport (ImageMagick, fixed 6.2.9)
 CVE-2006-4096 backport (bind)
 CVE-2006-4095 backport (bind)
 CVE-2006-4093 version (kernel, fixed 2.6.17.9, fixed 2.6.18-rc5)
-CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) bz#202675
+CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) #202675
 CVE-2006-4020 version (php, fixed 5.1.5)
 CVE-2006-4019 version (squirrelmail, fixed 1.4.8)
 CVE-2006-3918 version (httpd, fixed 2.2.2)
@@ -187,7 +188,7 @@
 CVE-2006-3469 version (mysql)
 CVE-2006-3468 version (kernel, fixed 2.6.17.8, fixed 2.6.18-rc4)
 CVE-2006-3467 version (freetype, fixed 2.2)
-CVE-2006-3467 ignore (vnc) bz#204052 not a vulnerability
+CVE-2006-3467 ignore (vnc) #204052 not a vulnerability
 CVE-2006-3467 backport (libXfont) fdo-7535.patch
 CVE-2006-3465 backport (libtiff) libtiff-3.8.2-ormandy.patch
 CVE-2006-3464 backport (libtiff) libtiff-3.8.2-ormandy.patch
@@ -260,7 +261,7 @@
 CVE-2006-2753 version (mysql, fixed 5.0.22)
 CVE-2006-2723 ignore (firefox) disputed
 CVE-2006-2661 version (freetype, fixed 2.2.1)
-CVE-2006-2660 ignore (php) see bz#195539
+CVE-2006-2660 ignore (php) see #195539
 CVE-2006-2656 backport (libtiff) tiffsplit-overflow.patch
 CVE-2006-2629 ignore (kernel) couldn't be reproduced on FC
 CVE-2006-2613 ignore (firefox) This isn't an issue on FC



From fedora-extras-commits at redhat.com  Wed Nov 15 11:02:55 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 15 Nov 2006 04:02:55 -0700
Subject: fedora-security/audit fc5,1.391,1.392 fc6,1.143,1.144
Message-ID: <200611151102.kAFB2t7p011143@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11121/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-5701, CVE-2006-5757 and CVE-2006-5823



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- fc5	15 Nov 2006 10:25:39 -0000	1.391
+++ fc5	15 Nov 2006 11:02:50 -0000	1.392
@@ -3,16 +3,16 @@
 
 ** are items that need attention
 
-CVE-2006-5823 version (kernel) [since FEDORA-2006-1221]
+CVE-2006-5823 backport (kernel) [since FEDORA-2006-1221]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed
-CVE-2006-5757 version (kernel) [since FEDORA-2006-1221]
+CVE-2006-5757 backport (kernel, fixed 2.6.19-rc2) [since FEDORA-2006-1221]
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5748 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5747 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
-CVE-2006-5701 VULNERABLE (kernel, not upstream)
+CVE-2006-5701 VULNERABLE (kernel) squashfs is not included upstream
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 version (kernel, fixed 2.6.18.2, fixed 2.6.19-rc4) [since FEDORA-2006-1221]
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- fc6	15 Nov 2006 10:26:06 -0000	1.143
+++ fc6	15 Nov 2006 11:02:50 -0000	1.144
@@ -3,16 +3,16 @@
 
 ** are items that need attention
 
-CVE-2006-5823 version (kernel) [since FEDORA-2006-1223]
+CVE-2006-5823 backport (kernel) [since FEDORA-2006-1223]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed
-CVE-2006-5757 version (kernel) [since FEDORA-2006-1223]
+CVE-2006-5757 backport (kernel, fixed 2.6.19-rc2) [since FEDORA-2006-1223]
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5748 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5747 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5747 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
-CVE-2006-5701 VULNERABLE (kernel, not upstream)
+CVE-2006-5701 VULNERABLE (kernel) squashfs is not included upstream
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 version (kernel, fixed 2.6.18.2, fixed 2.6.19-rc4) [since FEDORA-2006-1223]
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]



From fedora-extras-commits at redhat.com  Wed Nov 15 11:24:10 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 15 Nov 2006 04:24:10 -0700
Subject: fedora-security/audit fc5,1.392,1.393 fc6,1.144,1.145
Message-ID: <200611151124.kAFBOAtZ013354@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13334

Modified Files:
	fc5 fc6 
Log Message:
Deal with the tricky rebases of kdebase, oprofile, python which needed
more auditing at the source code to verify the outstanding vulnerabilities.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- fc5	15 Nov 2006 11:02:50 -0000	1.392
+++ fc5	15 Nov 2006 11:24:07 -0000	1.393
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20061112
+Up to date CVE as of CVE email 20061114
 Up to date FC5 as of 20061114
 
 ** are items that need attention
@@ -40,10 +40,10 @@
 CVE-2006-5229 ignore (openssh) reported not an issue
 CVE-2006-5215 VULNERABLE (xorg-x11-xdm) #212167
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit) #212167
-CVE-2006-5215 VULNERABLE (kdebase) #212166
+CVE-2006-5215 ignore (kdebase) #212166 links to xinit Xsession
 CVE-2006-5214 VULNERABLE (xorg-x11-xdm) #212167
 CVE-2006-5214 VULNERABLE (xorg-x11-xinit) #212167
-CVE-2006-5214 VULNERABLE (kdebase) #212166
+CVE-2006-5214 ignore (kdebase) #212166 links to xinit Xsession
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield
@@ -55,7 +55,7 @@
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022]
-CVE-2006-4980 backport (python) #208166 [since FEDORA-2006-1049]
+CVE-2006-4980 backport (python, fixed 2.4.4 at least) #208166 [since FEDORA-2006-1049]
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
@@ -493,7 +493,7 @@
 CVE-2006-0670 VULNERABLE (bluez-hcidump)
 CVE-2006-0645 version (gnutls, fixed 1.2.10)
 CVE-2006-0591 version (postgresql, fixed 8.0.6)
-CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch
+CVE-2006-0576 backport (oprofile, fixed 0.9.2 at least) oprofile_opcontrol.patch
 CVE-2006-0558 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-0557 version (kernel, fixed 2.6.15.6) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0555 version (kernel, fixed 2.6.16) patch-2.6.16-rc6-git3 [since FEDORA-2006-233]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- fc6	15 Nov 2006 11:02:50 -0000	1.144
+++ fc6	15 Nov 2006 11:24:07 -0000	1.145
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20061112
+Up to date CVE as of CVE email 20061114
 Up to date FC6 as of 20061114
 
 ** are items that need attention
@@ -40,10 +40,10 @@
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit) #212167
-CVE-2006-5215 VULNERABLE (kdebase) #212166
+CVE-2006-5215 ignore (kdebase) #212166 links to xinit Xsession
 CVE-2006-5214 version (xorg-x11-xdm)
 CVE-2006-5214 VULNERABLE (xorg-x11-xinit) #212167
-CVE-2006-5214 VULNERABLE (kdebase) #212166
+CVE-2006-5214 ignore (kdebase) #212166 links to xinit Xsession
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
@@ -55,7 +55,7 @@
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4)
 CVE-2006-4997 version (kernel, fixed 2.6.18)
-CVE-2006-4980 backport (python)
+CVE-2006-4980 version (python, fixed 2.4.4 at least) [since FEDORA-2006-1050] was backport since GA
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 backport (openssh, fixed 4.4)
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
@@ -163,7 +163,7 @@
 CVE-2006-3745 version (kernel, fixed 2.6.17.10, fixed 2.6.18-rc5)
 CVE-2006-3744 backport (ImageMagick)
 CVE-2006-3743 backport (ImageMagick)
-CVE-2006-3742 backport (kdebase) inside kdebase-3.5.4-2-redhat.patch
+CVE-2006-3742 backport (kdebase) inside kdebase-3.5.5-redhat-pam.patch
 CVE-2006-3741 ignore (kernel, fixed 2.6.18-rc7) ia64 only
 CVE-2006-3740 version (libXfont, fixed 1.2.2)
 CVE-2006-3739 version (libXfont, fixed 1.2.2)
@@ -441,7 +441,7 @@
 CVE-2006-0670 version (bluez-hcidump, fixed 1.30)
 CVE-2006-0645 version (gnutls, fixed 1.2.10)
 CVE-2006-0591 version (postgresql, fixed 8.0.6)
-CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch
+CVE-2006-0576 version (oprofile, fixed 0.9.2 at least) [since FEDORA-2006-1172] was backport since GA
 CVE-2006-0558 version (kernel, fixed 2.6.16)
 CVE-2006-0557 version (kernel, fixed 2.6.15.6)
 CVE-2006-0555 version (kernel, fixed 2.6.16)



From fedora-extras-commits at redhat.com  Wed Nov 15 12:04:04 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:04:04 -0700
Subject: rpms/python-twisted-core/devel - New directory
Message-ID: <200611151204.kAFC44n5016619@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16604/python-twisted-core/devel

Log Message:
Directory /cvs/extras/rpms/python-twisted-core/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 12:03:40 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:03:40 -0700
Subject: rpms/python-twisted-core - New directory
Message-ID: <200611151203.kAFC3eT4016608@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16604/python-twisted-core

Log Message:
Directory /cvs/extras/rpms/python-twisted-core added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 12:04:23 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:04:23 -0700
Subject: rpms/python-twisted-core Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611151204.kAFC4NOY016653@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16647

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-twisted-core


--- NEW FILE Makefile ---
# Top level Makefile for module python-twisted-core
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  Wed Nov 15 12:04:30 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:04:30 -0700
Subject: rpms/python-twisted-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611151204.kAFC4UnJ016666@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16647/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-twisted-core


--- 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 Nov 15 12:05:52 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:05:52 -0700
Subject: rpms/python-twisted-core/devel python-twisted-core.spec, NONE,
	1.1 twisted-dropin-cache, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611151205.kAFC5q51016753@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16716/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-twisted-core.spec twisted-dropin-cache 
Log Message:
auto-import python-twisted-core-2.4.0-5 on branch devel from python-twisted-core-2.4.0-5.src.rpm


--- NEW FILE python-twisted-core.spec ---
%{?!python:%define python python}
%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

%define origname TwistedCore

Name:           %{python}-twisted-core
Version:        2.4.0
Release:        5%{?dist}
Summary:        An asynchronous networking framework written in Python

Group:          Development/Libraries
License:        MIT
URL:            http://twistedmatrix.com/trac/wiki/TwistedCore
Source0:        http://tmrc.mit.edu/mirror/twisted/Twisted/2.4/%{origname}-%{version}.tar.bz2
Source1:        twisted-dropin-cache
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  %{python}-devel
BuildRequires:  %{python}-zope-interface

# for FC3 and earlier
%if "%{pybasever}" < "2.4"
Requires:       python(abi) = %{pybasever}
%endif

Requires:       %{python}-zope-interface
Requires:       pyOpenSSL

%description
An extensible framework for Python programming, with special focus
on event-based network programming and multiprotocol integration.

It is expected that one day the project will expanded to the point
that the framework will seamlessly integrate with mail, web, DNS,
netnews, IRC, RDBMSs, desktop environments, and your toaster.

%package doc
Summary:        Documentation for Twisted Core
Group:          Documentation
Requires:       python-twisted-core = %{version}-%{release}

%description doc
Documentation for Twisted Core.

%package zsh
Summary:        Tab completion for Zsh and Twisted Core
Group:          System Environment/Shells
Requires:       python-twisted-core = %{version}-%{release}
Requires:       zsh

%description zsh
Tab completions for Zsh and Twisted Core.

%prep
%setup -n %{origname}-%{version} -q
%{__sed} -i -e '/^#! *\/usr\/bin\/python/d' twisted/internet/glib2reactor.py
%{__sed} -i -e '/^#!\/bin\/python/d'        twisted/trial/test/scripttest.py

find doc -name \*.py | xargs chmod a-x
chmod a-x doc/howto/listings/pb/copy_receiver.tac
%{__sed} -i 's/\r//' doc/howto/listings/udp/MulticastClient.py
%{__sed} -i 's/\r//' doc/howto/listings/udp/MulticastServer.py

# Generate a brief README.zsh
awk '/^Zsh Notes:/,/^Have fun!/' twisted/python/zshcomp.py > README.zsh

%build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT

# cfsupport is support for MacOSX Core Foundations, so we can delete it
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/twisted/internet/cfsupport

# iocpreactor is a win32 reactor, so we can delete it
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/twisted/internet/iocpreactor

# Man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
cp -a doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
rm -rf doc/man

# Zsh tab complete stub (a la teratorn)
mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
sed 's#python -c#%{__python} -c#g' < twisted/python/_twisted_zsh_stub > _twisted_zsh_stub.MOD
install -m 644 _twisted_zsh_stub.MOD $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_twisted_zsh_stub

# remove the version we won't use
rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/python/_twisted_zsh_stub

# script to regenerate dropin.cache
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}

rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/protocols/_c_urlarg.c
rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/spread/cBanana.c

%clean
rm -rf $RPM_BUILD_ROOT

%post -p %{_libexecdir}/twisted-dropin-cache

%files
%defattr(-,root,root,-)
%doc CREDITS LICENSE NEWS README
%{_bindir}/manhole
%{_bindir}/mktap
%{_bindir}/tap2deb
%{_bindir}/tap2rpm
%{_bindir}/tapconvert
%{_bindir}/tkmktap
%{_bindir}/trial
%{_bindir}/twistd
%{_libexecdir}/twisted-dropin-cache

%{_mandir}/man1/*

%dir %{python_sitearch}/twisted/
%{python_sitearch}/twisted/*.py*

%{python_sitearch}/twisted/application/
%{python_sitearch}/twisted/cred/
%{python_sitearch}/twisted/enterprise/
%{python_sitearch}/twisted/internet/

%dir %{python_sitearch}/twisted/manhole/
%{python_sitearch}/twisted/manhole/*.py*
%{python_sitearch}/twisted/manhole/*.glade

%{python_sitearch}/twisted/manhole/ui/
%{python_sitearch}/twisted/manhole/ui/*.py*
%{python_sitearch}/twisted/manhole/ui/*.glade
%{python_sitearch}/twisted/manhole/ui/gtkrc

%{python_sitearch}/twisted/persisted/
%{python_sitearch}/twisted/persisted/journal/

%dir %{python_sitearch}/twisted/plugins/
%{python_sitearch}/twisted/plugins/*.py*
%ghost %{python_sitearch}/twisted/plugins/dropin.cache

%dir %{python_sitearch}/twisted/protocols/
%{python_sitearch}/twisted/protocols/*.py*
%{python_sitearch}/twisted/protocols/*.so

%{python_sitearch}/twisted/protocols/gps/
%{python_sitearch}/twisted/protocols/mice/

%dir %{python_sitearch}/twisted/python/
%{python_sitearch}/twisted/python/*.py*

%dir %{python_sitearch}/twisted/python/zsh/
%{python_sitearch}/twisted/python/zsh/README
%{python_sitearch}/twisted/python/zsh/_*

%{python_sitearch}/twisted/scripts/

%dir %{python_sitearch}/twisted/spread/
%{python_sitearch}/twisted/spread/*.py*
%{python_sitearch}/twisted/spread/*.so

%dir %{python_sitearch}/twisted/spread/ui/
%{python_sitearch}/twisted/spread/ui/*.py*
%{python_sitearch}/twisted/spread/ui/*.glade

%{python_sitearch}/twisted/tap/

%dir %{python_sitearch}/twisted/test/
%{python_sitearch}/twisted/test/*.py*
%{python_sitearch}/twisted/test/server.pem

%dir %{python_sitearch}/twisted/trial/
%{python_sitearch}/twisted/trial/*.py*

%dir %{python_sitearch}/twisted/trial/test/
%{python_sitearch}/twisted/trial/test/*.py*
%{python_sitearch}/twisted/trial/test/notpython

%files doc
%defattr(-,root,root,-)
%doc doc/*

%files zsh
%defattr(-,root,root,-)
%doc README.zsh
%{_datadir}/zsh/site-functions/_twisted_zsh_stub

%changelog
* Tue Nov 07 2006 Thomas Vander Stichele 
- 2.4.0-5
- incorporate suggestsions by Paul Howarth:
- fix groups for doc and zsh
- don't package _twisted_zsh_stub from the python_sitearch dir
- generate README.zsh

* Wed Nov 01 2006 Thomas Vander Stichele 
- 2.4.0-4
- incorporate changes by Jeffrey C. Ollie:
- add doc and zsh subpackage
- remove executable bits from documentation files to avoid dependencies
- remove shebang from some files
- fix up end of line on some files
- remove .c files from being packaged

* Tue Sep 26 2006 Thomas Vander Stichele 
- 2.4.0-3
- no longer ghost .pyo files

* Fri Jun 09 2006 Thomas Vander Stichele 
- 2.4.0-2
- add twisted-dropin-cache script and use it
- ghost the dropin.cache file

* Wed Jun 07 2006 Thomas Vander Stichele 
- 2.4.0-1
- upstream release
- require pyOpenSSL as it is named in Extras

* Mon Oct 10 2005 Jeff Pitman  2.1.0-1
- upstream release

* Tue Aug 23 2005 Jeff Pitman  2.0.1-1
- upstream release

* Mon Apr 04 2005 Jeff Pitman  2.0.0-2
- add zsh support

* Fri Mar 25 2005 Jeff Pitman  2.0.0-1
- final release

* Thu Mar 17 2005 Jeff Pitman  2.0.0-0.2.a3
- dropped web2

* Wed Mar 16 2005 Jeff Pitman  2.0.0-0.1.a3
- upstream release

* Sat Mar 12 2005 Jeff Pitman  2.0.0-0.1.a2
- new prerelease; FE versioning

* Mon Feb 07 2005 Jeff Pitman  2.0.0a1-1
- prep for split

* Fri Aug 20 2004 Jeff Pitman  1.3.0-1
- new version

* Mon Apr 19 2004 Jeff Pitman  1.2.0-3
- vaultize

* Mon Apr 12 2004 Jeff Pitman  1.2.0-2
- require pyOpenSSL, SOAPpy, openssh-clients, crypto, dia so trial can run



--- NEW FILE twisted-dropin-cache ---
#!/usr/bin/env python
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4

# this program regenerates the dropin.cache file for twisted,
# or for the modules specified on the command line

import sys
from twisted.plugin import IPlugin, getPlugins

which = None
if len(sys.argv) > 1:
    which = sys.argv[1:]

if not which:
    list(getPlugins(IPlugin))
else:
    from twisted.python import reflect
    for w in which:
        try:
            module = reflect.namedAny(w)
        except AttributeError:
            sys.stderr.write("No module '%s' found.\n" % w)
            continue
        list(getPlugins(IPlugin, module))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 12:04:29 -0000	1.1
+++ .cvsignore	15 Nov 2006 12:05:21 -0000	1.2
@@ -0,0 +1 @@
+TwistedCore-2.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 12:04:29 -0000	1.1
+++ sources	15 Nov 2006 12:05:21 -0000	1.2
@@ -0,0 +1 @@
+042a57f65fe919a9234047d7ce8c43f1  TwistedCore-2.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 12:05:50 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:05:50 -0700
Subject: rpms/python-twisted-core import.log,1.1,1.2
Message-ID: <200611151205.kAFC5ovL016749@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16716

Modified Files:
	import.log 
Log Message:
auto-import python-twisted-core-2.4.0-5 on branch devel from python-twisted-core-2.4.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-core/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 12:04:23 -0000	1.1
+++ import.log	15 Nov 2006 12:05:20 -0000	1.2
@@ -0,0 +1 @@
+python-twisted-core-2_4_0-5:HEAD:python-twisted-core-2.4.0-5.src.rpm:1163592312



From fedora-extras-commits at redhat.com  Wed Nov 15 12:09:06 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:09:06 -0700
Subject: owners owners.list,1.1962,1.1963
Message-ID: <200611151209.kAFC961c016816@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16800/owners

Modified Files:
	owners.list 
Log Message:
adding python-twisted-core



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1962
retrieving revision 1.1963
diff -u -r1.1962 -r1.1963
--- owners.list	14 Nov 2006 23:14:19 -0000	1.1962
+++ owners.list	15 Nov 2006 12:08:35 -0000	1.1963
@@ -1979,6 +1979,7 @@
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-twisted-core|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 15:02:41 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:02:41 -0700
Subject: rpms/phpMyAdmin/FC-5 phpMyAdmin.spec,1.1,1.2
Message-ID: <200611151502.kAFF2fcD026751@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26706/FC-5

Modified Files:
	phpMyAdmin.spec 
Log Message:
Fixes for bug 215159


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-5/phpMyAdmin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.spec	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.spec	15 Nov 2006 15:02:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 1alpha
+Release: 2alpha
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -40,7 +40,8 @@
 ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php
 
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLCT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/CREDITS
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess
 
 %clean
@@ -60,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
+- Fixed 215159
+
 * Fri Nov 10 2006 Mike McGrath  2.9.1-1alpha
 - Added alpha tag since this is a release candidate
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:02:51 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:02:51 -0700
Subject: rpms/phpMyAdmin/FC-6 phpMyAdmin.spec,1.1,1.2
Message-ID: <200611151502.kAFF2p51026756@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26706/FC-6

Modified Files:
	phpMyAdmin.spec 
Log Message:
Fixes for bug 215159


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/phpMyAdmin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.spec	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.spec	15 Nov 2006 15:02:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 1alpha
+Release: 2alpha
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -40,7 +40,8 @@
 ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php
 
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLCT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/CREDITS
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess
 
 %clean
@@ -60,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
+- Fixed 215159
+
 * Fri Nov 10 2006 Mike McGrath  2.9.1-1alpha
 - Added alpha tag since this is a release candidate
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:02:51 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:02:51 -0700
Subject: rpms/phpMyAdmin/devel phpMyAdmin.spec,1.1,1.2
Message-ID: <200611151502.kAFF2pcu026755@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26706/devel

Modified Files:
	phpMyAdmin.spec 
Log Message:
Fixes for bug 215159


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.spec	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.spec	15 Nov 2006 15:02:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 1alpha
+Release: 2alpha
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -40,7 +40,8 @@
 ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php
 
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLCT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/CREDITS
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess
 
 %clean
@@ -60,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
+- Fixed 215159
+
 * Fri Nov 10 2006 Mike McGrath  2.9.1-1alpha
 - Added alpha tag since this is a release candidate
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:22:56 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 08:22:56 -0700
Subject: rpms/beryl-core/devel beryl-core.spec,1.1,1.2
Message-ID: <200611151522.kAFFMucl026913@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26893

Modified Files:
	beryl-core.spec 
Log Message:
- Don't Provides: beryl, instead create meta-packages
- Explicitly turn off use of libsvg-cairo
- Fix for hosed-up release tarball including .o files...

Users should be able to install everything via 'yum install beryl' or desktop environment specific stuff via 'yum install beryl-(gnome|kde)'. Well, once all the other bits are actually in the repo too...




Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-core.spec	14 Nov 2006 20:31:35 -0000	1.1
+++ beryl-core.spec	15 Nov 2006 15:22:26 -0000	1.2
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,8 +17,6 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-Provides:       beryl = %{name}-%{version}
-
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
@@ -47,15 +45,56 @@
 and library files for the beryl-core
 package.
 
+%package -n beryl
+Summary: Beryl meta-package to install all beryl components
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: beryl-gnome = %{version}-%{release}
+Requires: beryl-kde = %{version}-%{release}
+Requires: bdock >= %{version}
+
+%description -n beryl
+This is a meta-package, which depends on all available beryl bits,
+making it easy for users to get all things beryl installed.
+
+%package -n beryl-gnome
+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}, beryl-dbus >= %{version}
+Requires: beryl-vidcap >= %{version}
+Requires: emerald >= %{version}, emerald-themes >= %{version}
+Requires: heliodor >= %{version}
+
+%description -n beryl-gnome
+This is a meta-package, which depends on all available beryl bits
+relevant to the Gnome desktop environment, making it easy for
+users to install all the beryl bits for Gnome.
+
+%package -n beryl-kde
+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}, beryl-vidcap >= %{version}
+Requires: emerald >= %{version}, emerald-themes >= %{version}
+Requires: aquamarine >= %{version}
+
+%description -n beryl-kde
+This is a meta-package, which depends on all available beryl bits
+relevant to the KDE desktop environment, making it easy for
+users to install all the beryl bits for KDE.
 
 %prep
 %setup -q
 %patch0 -p0 -b .mesa64
-#autoreconf -v --install
+# Somebody hosed up the release tarball...
+find mesa/src -name "*.o" | xargs rm -f
 
 
 %build
-%configure --enable-librsvg --enable-libsvg-cairo
+%configure
 ln -s %{_includedir}/X11 mesa/include/
 ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
 # Parallel builds currently broken
@@ -96,8 +135,21 @@
 %{_includedir}/beryl/*.h
 %{_mandir}/man3/beryl*
 
+%files -n beryl
+%defattr(-,root,root,-)
+
+%files -n beryl-gnome
+%defattr(-,root,root,-)
+
+%files -n beryl-kde
+%defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 14 2006 Jarod Wilson  0.1.2-4
+- Don't Provides: beryl, instead create meta-packages
+- Minimize config flags, the build figures it out itself
+- Fix for hosed-up release tarball including .o files...
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-3
 - Put man3 in -devel, remove dead libsvg-cairo-devel BR
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:38:45 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:38:45 -0700
Subject: rpms/phpMyAdmin/FC-6 phpMyAdmin.spec,1.2,1.3
Message-ID: <200611151538.kAFFcjgg027176@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27129/FC-6

Modified Files:
	phpMyAdmin.spec 
Log Message:
Added dist tag


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/phpMyAdmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phpMyAdmin.spec	15 Nov 2006 15:02:17 -0000	1.2
+++ phpMyAdmin.spec	15 Nov 2006 15:38:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 2alpha
+Release: 3alpha%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -61,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-3alpha
+- Added dist tag
+
 * Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
 - Fixed 215159
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:38:44 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:38:44 -0700
Subject: rpms/phpMyAdmin/FC-5 phpMyAdmin.spec,1.2,1.3
Message-ID: <200611151538.kAFFcicE027173@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27129/FC-5

Modified Files:
	phpMyAdmin.spec 
Log Message:
Added dist tag


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-5/phpMyAdmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phpMyAdmin.spec	15 Nov 2006 15:02:10 -0000	1.2
+++ phpMyAdmin.spec	15 Nov 2006 15:38:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 2alpha
+Release: 3alpha%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -61,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-3alpha
+- Added dist tag
+
 * Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
 - Fixed 215159
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:38:46 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:38:46 -0700
Subject: rpms/phpMyAdmin/devel phpMyAdmin.spec,1.2,1.3
Message-ID: <200611151538.kAFFckiL027179@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27129/devel

Modified Files:
	phpMyAdmin.spec 
Log Message:
Added dist tag


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phpMyAdmin.spec	15 Nov 2006 15:02:19 -0000	1.2
+++ phpMyAdmin.spec	15 Nov 2006 15:38:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 2alpha
+Release: 3alpha%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -61,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-3alpha
+- Added dist tag
+
 * Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
 - Fixed 215159
 



From fedora-extras-commits at redhat.com  Wed Nov 15 16:41:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 15 Nov 2006 09:41:46 -0700
Subject: rpms/qt4/devel qt4.spec,1.26,1.27
Message-ID: <200611151641.kAFGfkC1030599@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30582

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter  4.2.1-3
- move libQtDesigner to -x11



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4.spec	28 Oct 2006 18:51:14 -0000	1.26
+++ qt4.spec	15 Nov 2006 16:41:16 -0000	1.27
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -134,7 +134,7 @@
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-x11 = %{version}-%{release}
+Requires: %{name}-x11 
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -402,12 +402,12 @@
 %files x11 
 %defattr(-,root,root,-)
 %{qt_libdir}/libQt3Support.so.*
+%{qt_libdir}/libQtAssistantClient.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%if "%{version}" >= "4.2.0"
-%{qt_libdir}/libQtAssistantClient.so.*
-%endif
 %{qtdir}/plugins/*
 %exclude %{qtdir}/plugins/designer
 %exclude %{qtdir}/plugins/sqldrivers
@@ -449,8 +449,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -509,14 +507,17 @@
 
 
 %changelog
-* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+* Wed Nov 15 2006 Rex Dieter  4.2.1-3
+- move libQtDesigner to -x11
+
+* Mon Oct 23 2006 Rex Dieter  4.2.1-2
 - use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter  4.2.1-1
 - 4.2.1
 
-* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+* Wed Oct 04 2006 Rex Dieter  4.2.0-1
 - 4.2.0(final)
 
 * Thu Sep 28 2006 Kevin Kofler  4.2.0-0.9.20060927



From fedora-extras-commits at redhat.com  Wed Nov 15 17:24:43 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 10:24:43 -0700
Subject: rpms/compat-libosip2/devel compat-libosip2.spec,1.1,1.2
Message-ID: <200611151724.kAFHOhQH003170@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3152

Modified Files:
	compat-libosip2.spec 
Log Message:
Bump release to work around bad CVS tag.


Index: compat-libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/devel/compat-libosip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-libosip2.spec	14 Nov 2006 20:20:15 -0000	1.1
+++ compat-libosip2.spec	15 Nov 2006 17:24:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           compat-libosip2
 Version:        2.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -94,6 +94,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Nov 15 2006 Jeffrey C. Ollie  - 2.2.2-9
+- Bump release to workaround bad CVS tag.
+
 * Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-8
 - Add Obsoletes
 



From fedora-extras-commits at redhat.com  Wed Nov 15 17:26:11 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 10:26:11 -0700
Subject: rpms/compat-libosip2/FC-6 compat-libosip2.spec,1.1,1.2
Message-ID: <200611151726.kAFHQBXR003244@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3223

Modified Files:
	compat-libosip2.spec 
Log Message:
Bump release to work around bad CVS tag.


Index: compat-libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/FC-6/compat-libosip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-libosip2.spec	14 Nov 2006 20:20:15 -0000	1.1
+++ compat-libosip2.spec	15 Nov 2006 17:25:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           compat-libosip2
 Version:        2.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -94,6 +94,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Nov 15 2006 Jeffrey C. Ollie  - 2.2.2-9
+- Bump release to workaround bad CVS tag.
+
 * Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-8
 - Add Obsoletes
 



From fedora-extras-commits at redhat.com  Wed Nov 15 17:28:00 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 10:28:00 -0700
Subject: rpms/compat-libosip2/FC-5 compat-libosip2.spec,1.1,1.2
Message-ID: <200611151728.kAFHS0Io003323@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3299

Modified Files:
	compat-libosip2.spec 
Log Message:
Bump release to work around bad CVS tag.


Index: compat-libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/FC-5/compat-libosip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-libosip2.spec	14 Nov 2006 20:20:15 -0000	1.1
+++ compat-libosip2.spec	15 Nov 2006 17:27:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           compat-libosip2
 Version:        2.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -94,6 +94,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Nov 15 2006 Jeffrey C. Ollie  - 2.2.2-9
+- Bump release to workaround bad CVS tag.
+
 * Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-8
 - Add Obsoletes
 



From fedora-extras-commits at redhat.com  Wed Nov 15 17:31:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 10:31:21 -0700
Subject: rpms/libosip2/FC-5 .cvsignore, 1.4, 1.5 libosip2.spec, 1.8,
	1.9 sources, 1.4, 1.5 libosip2-2.2.2-x64.patch, 1.1, NONE
Message-ID: <200611151731.kAFHVLoD003462@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3438

Modified Files:
	.cvsignore libosip2.spec sources 
Removed Files:
	libosip2-2.2.2-x64.patch 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 23:59:46 -0000	1.4
+++ .cvsignore	15 Nov 2006 17:30:51 -0000	1.5
@@ -1 +1 @@
-libosip2-2.2.2.tar.gz
+libosip2-3.0.1.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-5/libosip2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libosip2.spec	23 Feb 2006 19:11:03 -0000	1.8
+++ libosip2.spec	15 Nov 2006 17:30:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libosip2
-Version:        2.2.2
-Release:        3%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -8,7 +8,6 @@
 License:        LGPL
 URL:            http://www.gnu.org/software/osip/
 Source0:        http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
-Patch:          libosip2-2.2.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -41,20 +40,19 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x64
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT%{_mandir}/man1/osip.1 $RPM_BUILD_ROOT%{_mandir}/man1/osip2.1
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+mv %{buildroot}%{_mandir}/man1/osip.1 %{buildroot}%{_mandir}/man1/osip2.1
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -74,6 +72,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
+- Update to 3.0.1 and remove unnecessary patch.
+
+* Wed Aug 30 2006 Jeffrey C. Ollie  - 2.2.2-4
+- Bump release and rebuild.
+
 * Thu Feb 23 2006 Ignacio Vazquez-Abrams  2.2.2-3
 - Fix for AMD64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 23:59:46 -0000	1.4
+++ sources	15 Nov 2006 17:30:51 -0000	1.5
@@ -1 +1 @@
-40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz
+417833bb363ffd7c762ff17c931651df  libosip2-3.0.1.tar.gz


--- libosip2-2.2.2-x64.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 15 17:48:42 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 15 Nov 2006 10:48:42 -0700
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.6,1.7
Message-ID: <200611151748.kAFHmgF8003730@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3669

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Rebuild to pick up libbtctl i/f bump



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-phone-manager.spec	28 Oct 2006 22:50:04 -0000	1.6
+++ gnome-phone-manager.spec	15 Nov 2006 17:48:12 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -81,6 +81,9 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Nov 15 2006 Linus Walleij  0.8-5
+- Rebuild to pick up libbtctl i/f bump.
+
 * Sun Oct 29 2006 Linus Walleij  0.8-4
 - Rebuild to pick up libedataserver i/f bump.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 18:02:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Nov 2006 11:02:28 -0700
Subject: rpms/w3c-markup-validator/devel .cvsignore, 1.5, 1.6 sources, 1.5, 
	1.6 w3c-markup-validator.spec, 1.12, 1.13
Message-ID: <200611151802.kAFI2S6Y006880@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6833/devel

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Log Message:
* Wed Nov 15 2006 Ville Skytt??  - 0.7.4-1
- 0.7.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Oct 2006 21:13:31 -0000	1.5
+++ .cvsignore	15 Nov 2006 18:01:57 -0000	1.6
@@ -1,2 +1,2 @@
-validator-0_7_3.tar.gz
-sgml-lib-0_7_3.tar.gz
+validator-0_7_4.tar.gz
+sgml-lib-0_7_4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 21:13:31 -0000	1.5
+++ sources	15 Nov 2006 18:01:57 -0000	1.6
@@ -1,2 +1,2 @@
-8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
-ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz
+e5fbda9e67c6d904fca2b80f7052c1e5  validator-0_7_4.tar.gz
+bb72a0bb7d31b2ceff13ac966a0ff62f  sgml-lib-0_7_4.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- w3c-markup-validator.spec	31 Oct 2006 19:36:46 -0000	1.12
+++ w3c-markup-validator.spec	15 Nov 2006 18:01:57 -0000	1.13
@@ -1,8 +1,8 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -46,15 +46,15 @@
 %patch1 -p1
 %patch2 -p2
 %patch3 -p2
-rm -f htdocs/images/debian.png
+find . -name "*.orig" -print0 | xargs -0 rm
 
 # Localize configs.
 %{__perl} -pi -e \
   's|/usr/local/validator\b|%{_datadir}/%{name}|' \
   htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/*
 %{__perl} -pi -e \
-  's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}|' \
-  htdocs/config/validator.conf
+  's|\$base(_path)?/htdocs/sgml-lib|%{_datadir}/sgml/%{name}|i' \
+  htdocs/config/validator.conf httpd/cgi-bin/check
 
 # Move config out of the way
 mv htdocs/config __config
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Wed Nov 15 2006 Ville Skytt??  - 0.7.4-1
+- 0.7.4.
+
 * Tue Oct 31 2006 Ville Skytt??  - 0.7.3-2
 - Reference HTML 4.01 DTDs directly instead of making all system catalogs
   available - something in the catalogs breaks at least XHTML 1.0 (#213131).



From fedora-extras-commits at redhat.com  Wed Nov 15 18:02:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Nov 2006 11:02:26 -0700
Subject: rpms/w3c-markup-validator/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 w3c-markup-validator.spec, 1.12, 1.13
Message-ID: <200611151802.kAFI2QcG006877@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6833/FC-6

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Log Message:
* Wed Nov 15 2006 Ville Skytt??  - 0.7.4-1
- 0.7.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Oct 2006 21:13:25 -0000	1.5
+++ .cvsignore	15 Nov 2006 18:01:56 -0000	1.6
@@ -1,2 +1,2 @@
-validator-0_7_3.tar.gz
-sgml-lib-0_7_3.tar.gz
+validator-0_7_4.tar.gz
+sgml-lib-0_7_4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 21:13:25 -0000	1.5
+++ sources	15 Nov 2006 18:01:56 -0000	1.6
@@ -1,2 +1,2 @@
-8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
-ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz
+e5fbda9e67c6d904fca2b80f7052c1e5  validator-0_7_4.tar.gz
+bb72a0bb7d31b2ceff13ac966a0ff62f  sgml-lib-0_7_4.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/w3c-markup-validator.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- w3c-markup-validator.spec	31 Oct 2006 19:36:40 -0000	1.12
+++ w3c-markup-validator.spec	15 Nov 2006 18:01:56 -0000	1.13
@@ -1,8 +1,8 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -46,15 +46,15 @@
 %patch1 -p1
 %patch2 -p2
 %patch3 -p2
-rm -f htdocs/images/debian.png
+find . -name "*.orig" -print0 | xargs -0 rm
 
 # Localize configs.
 %{__perl} -pi -e \
   's|/usr/local/validator\b|%{_datadir}/%{name}|' \
   htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/*
 %{__perl} -pi -e \
-  's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}|' \
-  htdocs/config/validator.conf
+  's|\$base(_path)?/htdocs/sgml-lib|%{_datadir}/sgml/%{name}|i' \
+  htdocs/config/validator.conf httpd/cgi-bin/check
 
 # Move config out of the way
 mv htdocs/config __config
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Wed Nov 15 2006 Ville Skytt??  - 0.7.4-1
+- 0.7.4.
+
 * Tue Oct 31 2006 Ville Skytt??  - 0.7.3-2
 - Reference HTML 4.01 DTDs directly instead of making all system catalogs
   available - something in the catalogs breaks at least XHTML 1.0 (#213131).



From fedora-extras-commits at redhat.com  Wed Nov 15 18:12:29 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Wed, 15 Nov 2006 11:12:29 -0700
Subject: rpms/wcstools/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wcstools.spec, 1.4, 1.5
Message-ID: <200611151812.kAFICTSS007079@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7059

Modified Files:
	.cvsignore sources wcstools.spec 
Log Message:
* Tue Oct 10 2006 Sergio Pascual  3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual  3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual  3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual  3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual  3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual  3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual  3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual  3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 11:28:24 -0000	1.3
+++ .cvsignore	15 Nov 2006 18:11:59 -0000	1.4
@@ -1 +1 @@
-wcstools-3.6.6beta.tar.gz
+wcstools-3.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Oct 2006 11:28:24 -0000	1.3
+++ sources	15 Nov 2006 18:11:59 -0000	1.4
@@ -1 +1 @@
-cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz
+c41af2de22949f40957276978f48e0d7  wcstools-3.6.6.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-6/wcstools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools.spec	10 Oct 2006 11:28:24 -0000	1.4
+++ wcstools.spec	15 Nov 2006 18:11:59 -0000	1.5
@@ -1,12 +1,12 @@
 Name: wcstools
 Version: 3.6.6
-Release: 0.1.beta%{?dist}
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Sergio Pascual  3.6.6-1
+- New upstream source 3.6.6
 * Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
 - New upstream source 3.6.6beta
 * Mon Sep 4 2006 Sergio Pascual  3.6.5-3



From fedora-extras-commits at redhat.com  Wed Nov 15 18:39:50 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:39:50 -0700
Subject: rpms/beryl-settings - New directory
Message-ID: <200611151839.kAFIdokr007773@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7769/beryl-settings

Log Message:
Directory /cvs/extras/rpms/beryl-settings added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 18:39:56 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:39:56 -0700
Subject: rpms/beryl-settings/devel - New directory
Message-ID: <200611151839.kAFIduKK007787@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7769/beryl-settings/devel

Log Message:
Directory /cvs/extras/rpms/beryl-settings/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 18:40:07 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:40:07 -0700
Subject: rpms/beryl-settings Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611151840.kAFIe7P2007818@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7812

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-settings


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-settings
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  Wed Nov 15 18:40:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:40:13 -0700
Subject: rpms/beryl-settings/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611151840.kAFIeD17007836@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7812/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-settings


--- 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 Nov 15 18:41:02 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:41:02 -0700
Subject: rpms/beryl-settings import.log,1.1,1.2
Message-ID: <200611151841.kAFIf2kC007913@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7879

Modified Files:
	import.log 
Log Message:
auto-import beryl-settings-0.1.2-2.fc7 on branch devel from beryl-settings-0.1.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 18:40:07 -0000	1.1
+++ import.log	15 Nov 2006 18:40:31 -0000	1.2
@@ -0,0 +1 @@
+beryl-settings-0_1_2-2_fc7:HEAD:beryl-settings-0.1.2-2.fc7.src.rpm:1163616028



From fedora-extras-commits at redhat.com  Wed Nov 15 18:41:02 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:41:02 -0700
Subject: rpms/beryl-settings/devel beryl-settings.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611151841.kAFIf2it007917@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7879/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-settings.spec 
Log Message:
auto-import beryl-settings-0.1.2-2.fc7 on branch devel from beryl-settings-0.1.2-2.fc7.src.rpm


--- NEW FILE beryl-settings.spec ---
Name:           beryl-settings
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        2%{?dist}

Summary:        Beryl OpenGL window and compositing manager GUI config utility
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}
BuildRequires:  libtool, gtk2-devel >= 2.8.0, gettext-devel
BuildRequires:  libXcomposite-devel, libXdamage-devel
BuildRequires:  gnome-desktop-devel, desktop-file-utils
BuildRequires:  intltool, perl-XML-Parser
BuildRequires:  dbus-glib, dbus-devel, librsvg2-devel


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

This package contains a graphical configuration tool
to configure Beryl's plugins and the composite window
manager.


%prep
%setup -q
#autoreconf -v --install
#glib-gettextize --copy --force
#intltoolize --automake --copy --force
perl -pi -e 's/png/svg/g' misc/beryl-settings.desktop

%build
%configure --enable-librsvg
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
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 \
  $RPM_BUILD_ROOT%{_datadir}/applications/beryl-settings.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/beryl-settings
%{_datadir}/beryl/hints
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.svg
%{_mandir}/man1/beryl-settings.1.gz


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson  0.1.1-3
- Fix desktop file to point to proper icon file

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Add missing BR: libtool, gtk2-devel >= 2.8.0, gettext-devel,
  libXcomposite-devel, libXdamage-devel

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Thu Oct 05 2006 Jarod Wilson  0.1.0-3
- Really fix duplicate menu entries this time

* Thu Oct 05 2006 Jarod Wilson  0.1.0-2
- Fix duplicate menu entries
- Add proper post/postun

* Tue Oct 03 2006 - Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 18:40:13 -0000	1.1
+++ .cvsignore	15 Nov 2006 18:40:32 -0000	1.2
@@ -0,0 +1 @@
+beryl-settings-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 18:40:13 -0000	1.1
+++ sources	15 Nov 2006 18:40:32 -0000	1.2
@@ -0,0 +1 @@
+882aac1837f92dc20b92927900a917f3  beryl-settings-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 19:08:15 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 15 Nov 2006 12:08:15 -0700
Subject: fedora-security/audit fc5,1.393,1.394 fc6,1.145,1.146
Message-ID: <200611151908.kAFJ8FXE011222@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11197

Modified Files:
	fc5 fc6 
Log Message:
Note a new elinks issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- fc5	15 Nov 2006 11:24:07 -0000	1.393
+++ fc5	15 Nov 2006 19:08:05 -0000	1.394
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5924 VULNERABLE (elinks) [#215734]
 CVE-2006-5823 backport (kernel) [since FEDORA-2006-1221]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- fc6	15 Nov 2006 11:24:07 -0000	1.145
+++ fc6	15 Nov 2006 19:08:05 -0000	1.146
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5924 ignore (elinks) no smbclient support
 CVE-2006-5823 backport (kernel) [since FEDORA-2006-1223]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed



From fedora-extras-commits at redhat.com  Wed Nov 15 19:12:43 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:12:43 -0700
Subject: rpms/beryl-plugins - New directory
Message-ID: <200611151912.kAFJCh6W011492@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487/beryl-plugins

Log Message:
Directory /cvs/extras/rpms/beryl-plugins added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 19:12:48 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:12:48 -0700
Subject: rpms/beryl-plugins/devel - New directory
Message-ID: <200611151912.kAFJCmZ1011505@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487/beryl-plugins/devel

Log Message:
Directory /cvs/extras/rpms/beryl-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 19:13:00 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:13:00 -0700
Subject: rpms/beryl-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611151913.kAFJD0NI011547@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-plugins
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  Wed Nov 15 19:13:06 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:13:06 -0700
Subject: rpms/beryl-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611151913.kAFJD6ew011565@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-plugins


--- 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 Nov 15 19:13:58 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:13:58 -0700
Subject: rpms/beryl-plugins import.log,1.1,1.2
Message-ID: <200611151913.kAFJDwsa011647@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613

Modified Files:
	import.log 
Log Message:
auto-import beryl-plugins-0.1.2-2.fc7 on branch devel from beryl-plugins-0.1.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 19:13:00 -0000	1.1
+++ import.log	15 Nov 2006 19:13:27 -0000	1.2
@@ -0,0 +1 @@
+beryl-plugins-0_1_2-2_fc7:HEAD:beryl-plugins-0.1.2-2.fc7.src.rpm:1163618004



From fedora-extras-commits at redhat.com  Wed Nov 15 19:13:58 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:13:58 -0700
Subject: rpms/beryl-plugins/devel beryl-plugins.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611151913.kAFJDwnv011651@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-plugins.spec 
Log Message:
auto-import beryl-plugins-0.1.2-2.fc7 on branch devel from beryl-plugins-0.1.2-2.fc7.src.rpm


--- NEW FILE beryl-plugins.spec ---
Name:           beryl-plugins
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        2%{?dist}

Summary:        Beryl OpenGL window and compositing manager plug-ins
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}, fedora-logos

BuildRequires:  beryl-core-devel >= %{version}, gnome-desktop-devel
BuildRequires:  libtool, gettext-devel
BuildRequires:  freeglut-devel, intltool, libdrm-devel
BuildRequires:  libwnck-devel, desktop-file-utils
BuildRequires:  librsvg2-devel, libX11-devel
BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
BuildRequires:  libXcomposite-devel, libXdamage-devel, libXext-devel
BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Beryl has a flexible plug-in system, which the
contents of this package take advantage of.


%prep
%setup -q
#autoreconf -v --install
perl -pi -e 's,beryl/cubecaps.png,rhgb/main-logo.png,g' \
    src/cube.settings

%build
%configure --enable-librsvg --disable-libsvg-cairo
# Parallel builds currently broken
#make %{?_smp_mflags}
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%dir %{_libdir}/beryl
%{_libdir}/beryl/*.so
%{_datadir}/beryl/*.png


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Switch to upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson  0.1.1-3
- Fedora-branded cube caps (Chitlesh Goorah)

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Add missing BR: libtool, gettext-devel

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 19:13:06 -0000	1.1
+++ .cvsignore	15 Nov 2006 19:13:28 -0000	1.2
@@ -0,0 +1 @@
+beryl-plugins-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 19:13:06 -0000	1.1
+++ sources	15 Nov 2006 19:13:28 -0000	1.2
@@ -0,0 +1 @@
+6721bf8bd5fcbe0cabb0a67caa920fcb  beryl-plugins-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 19:15:17 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 12:15:17 -0700
Subject: rpms/libeXosip2/devel .cvsignore, 1.5, 1.6 libeXosip2.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200611151915.kAFJFHXc011723@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11693

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2006 05:18:01 -0000	1.5
+++ .cvsignore	15 Nov 2006 19:14:47 -0000	1.6
@@ -1 +1 @@
-libeXosip2-2.2.3.tar.gz
+libeXosip2-3.0.1.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/libeXosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libeXosip2.spec	29 Aug 2006 00:57:54 -0000	1.9
+++ libeXosip2.spec	15 Nov 2006 19:14:47 -0000	1.10
@@ -1,12 +1,11 @@
-
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 2.2.3
-Release: 3%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/exosip/libeXosip2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 05:18:01 -0000	1.5
+++ sources	15 Nov 2006 19:14:47 -0000	1.6
@@ -1 +1 @@
-837a35f085890eac3328ac402b24383b  libeXosip2-2.2.3.tar.gz
+bd52d81c83306c5ba260939537d69577  libeXosip2-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 15 19:16:37 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:16:37 -0700
Subject: owners owners.list,1.1963,1.1964
Message-ID: <200611151916.kAFJGb5h011792@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11738

Modified Files:
	owners.list 
Log Message:
Add beryl-plugins and beryl-settings


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1963
retrieving revision 1.1964
diff -u -r1.1963 -r1.1964
--- owners.list	15 Nov 2006 12:08:35 -0000	1.1963
+++ owners.list	15 Nov 2006 19:16:07 -0000	1.1964
@@ -109,6 +109,8 @@
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-core|Beryl OpenGL window and compositing manager|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-plugins|Beryl OpenGL window and compositing manager plugins|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-settings|Beryl OpenGL window and compositing manager settings utility|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 19:18:07 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Wed, 15 Nov 2006 12:18:07 -0700
Subject: rpms/wcstools/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wcstools.spec, 1.4, 1.5
Message-ID: <200611151918.kAFJI76g011845@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11798

Modified Files:
	.cvsignore sources wcstools.spec 
Log Message:
* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual  3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual  3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual  3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual  3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual  3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual  3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual  3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 11:28:24 -0000	1.3
+++ .cvsignore	15 Nov 2006 19:17:37 -0000	1.4
@@ -1 +1 @@
-wcstools-3.6.6beta.tar.gz
+wcstools-3.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Oct 2006 11:28:24 -0000	1.3
+++ sources	15 Nov 2006 19:17:37 -0000	1.4
@@ -1 +1 @@
-cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz
+c41af2de22949f40957276978f48e0d7  wcstools-3.6.6.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/wcstools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools.spec	10 Oct 2006 11:28:24 -0000	1.4
+++ wcstools.spec	15 Nov 2006 19:17:37 -0000	1.5
@@ -1,12 +1,12 @@
 Name: wcstools
 Version: 3.6.6
-Release: 0.1.beta%{?dist}
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,8 @@
 
 
 %changelog
+* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
+- New upstream source 3.6.6
 * Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
 - New upstream source 3.6.6beta
 * Mon Sep 4 2006 Sergio Pascual  3.6.5-3



From fedora-extras-commits at redhat.com  Wed Nov 15 19:18:23 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 12:18:23 -0700
Subject: rpms/libeXosip2/FC-6 .cvsignore, 1.5, 1.6 libeXosip2.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200611151918.kAFJINii011862@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11825

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2006 05:18:01 -0000	1.5
+++ .cvsignore	15 Nov 2006 19:17:53 -0000	1.6
@@ -1 +1 @@
-libeXosip2-2.2.3.tar.gz
+libeXosip2-3.0.1.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-6/libeXosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libeXosip2.spec	29 Aug 2006 00:57:54 -0000	1.9
+++ libeXosip2.spec	15 Nov 2006 19:17:53 -0000	1.10
@@ -1,12 +1,11 @@
-
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 2.2.3
-Release: 3%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/exosip/libeXosip2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 05:18:01 -0000	1.5
+++ sources	15 Nov 2006 19:17:53 -0000	1.6
@@ -1 +1 @@
-837a35f085890eac3328ac402b24383b  libeXosip2-2.2.3.tar.gz
+bd52d81c83306c5ba260939537d69577  libeXosip2-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 15 19:20:19 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Wed, 15 Nov 2006 12:20:19 -0700
Subject: rpms/wcstools/FC-6 wcstools.spec,1.5,1.6
Message-ID: <200611151920.kAFJKJRk011982@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11962

Modified Files:
	wcstools.spec 
Log Message:
Fixed date of last modification in changelog



Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-6/wcstools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wcstools.spec	15 Nov 2006 18:11:59 -0000	1.5
+++ wcstools.spec	15 Nov 2006 19:19:48 -0000	1.6
@@ -82,7 +82,7 @@
 
 
 %changelog
-* Tue Oct 10 2006 Sergio Pascual  3.6.6-1
+* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
 - New upstream source 3.6.6
 * Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
 - New upstream source 3.6.6beta



From fedora-extras-commits at redhat.com  Wed Nov 15 19:26:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 12:26:13 -0700
Subject: rpms/libeXosip2/FC-5 .cvsignore, 1.5, 1.6 libeXosip2.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200611151926.kAFJQDVN012072@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12052

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2006 05:13:03 -0000	1.5
+++ .cvsignore	15 Nov 2006 19:25:43 -0000	1.6
@@ -1 +1 @@
-libeXosip2-2.2.3.tar.gz
+libeXosip2-3.0.1.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-5/libeXosip2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libeXosip2.spec	6 Jun 2006 03:33:01 -0000	1.8
+++ libeXosip2.spec	15 Nov 2006 19:25:43 -0000	1.9
@@ -1,12 +1,11 @@
-
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 2.2.3
-Release: 2%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/exosip/libeXosip2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel
@@ -70,7 +69,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Mon Jun  5 2006 Jeffrey C. Ollie  - 2.2.3
+* Mon Aug 28 2006 Jeffrey C. Ollie  - 2.2.3-3
+- Bump release and rebuild.
+
+* Mon Jun  5 2006 Jeffrey C. Ollie  - 2.2.3-2
 - Add BR for doxygen.
 
 * Mon May 29 2006 Jeffrey C. Ollie  - 2.2.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 05:13:03 -0000	1.5
+++ sources	15 Nov 2006 19:25:43 -0000	1.6
@@ -1 +1 @@
-837a35f085890eac3328ac402b24383b  libeXosip2-2.2.3.tar.gz
+bd52d81c83306c5ba260939537d69577  libeXosip2-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 15 19:51:41 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Wed, 15 Nov 2006 12:51:41 -0700
Subject: rpms/wcstools/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wcstools.spec, 1.3, 1.4
Message-ID: <200611151951.kAFJpf7k012218@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12198

Modified Files:
	.cvsignore sources wcstools.spec 
Log Message:
* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Wed Aug 30 2006 Sergio Pascual  3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual  3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual  3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual  3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual  3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual  3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 16:21:29 -0000	1.3
+++ .cvsignore	15 Nov 2006 19:51:11 -0000	1.4
@@ -1 +1 @@
-wcstools-3.6.6beta.tar.gz
+wcstools-3.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Oct 2006 16:21:29 -0000	1.3
+++ sources	15 Nov 2006 19:51:11 -0000	1.4
@@ -1 +1 @@
-cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz
+c41af2de22949f40957276978f48e0d7  wcstools-3.6.6.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/wcstools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wcstools.spec	10 Oct 2006 16:21:29 -0000	1.3
+++ wcstools.spec	15 Nov 2006 19:51:11 -0000	1.4
@@ -1,12 +1,12 @@
 Name: wcstools
 Version: 3.6.6
-Release: 0.1.beta%{?dist}
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,8 @@
 
 
 %changelog
+* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
+- New upstream source 3.6.6
 * Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
 - New upstream source 3.6.6beta
 * Wed Aug 30 2006 Sergio Pascual  3.6.5-2



From fedora-extras-commits at redhat.com  Wed Nov 15 21:10:30 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:10:30 -0700
Subject: rpms/beryl-manager - New directory
Message-ID: <200611152110.kAFLAUEd018669@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18665/beryl-manager

Log Message:
Directory /cvs/extras/rpms/beryl-manager added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:10:35 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:10:35 -0700
Subject: rpms/beryl-manager/devel - New directory
Message-ID: <200611152110.kAFLAZqd018685@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18665/beryl-manager/devel

Log Message:
Directory /cvs/extras/rpms/beryl-manager/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:10:49 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:10:49 -0700
Subject: rpms/beryl-manager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611152110.kAFLAnga018718@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18712

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-manager


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-manager
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  Wed Nov 15 21:10:55 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:10:55 -0700
Subject: rpms/beryl-manager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611152110.kAFLAt27018736@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18712/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-manager


--- 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 Nov 15 21:11:45 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:11:45 -0700
Subject: rpms/beryl-manager import.log,1.1,1.2
Message-ID: <200611152111.kAFLBjcr018816@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18781

Modified Files:
	import.log 
Log Message:
auto-import beryl-manager-0.1.2-2.fc7 on branch devel from beryl-manager-0.1.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 21:10:49 -0000	1.1
+++ import.log	15 Nov 2006 21:11:15 -0000	1.2
@@ -0,0 +1 @@
+beryl-manager-0_1_2-2_fc7:HEAD:beryl-manager-0.1.2-2.fc7.src.rpm:1163625072



From fedora-extras-commits at redhat.com  Wed Nov 15 21:11:46 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:11:46 -0700
Subject: rpms/beryl-manager/devel beryl-manager-0.1.1-pidof.patch, NONE,
	1.1 beryl-manager.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611152111.kAFLBkcu018820@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18781/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-manager-0.1.1-pidof.patch beryl-manager.spec 
Log Message:
auto-import beryl-manager-0.1.2-2.fc7 on branch devel from beryl-manager-0.1.2-2.fc7.src.rpm

beryl-manager-0.1.1-pidof.patch:

--- NEW FILE beryl-manager-0.1.1-pidof.patch ---
--- beryl-manager-0.1.1/src/main.c.orig	2006-10-26 11:00:37.000000000 -0400
+++ beryl-manager-0.1.1/src/main.c	2006-10-26 11:00:56.000000000 -0400
@@ -274,7 +274,7 @@
 }
 gboolean is_running(const gchar * command)
 {
-    gchar* cmd = g_strconcat("pidof ", command,NULL);
+    gchar* cmd = g_strconcat("/sbin/pidof ", command,NULL);
     gchar* pret;
     gint i;
 
@@ -442,7 +442,7 @@
                 if (WMs[i].Kill)
                 {
                     gchar * pret;
-                    gchar * cm = g_strconcat("pidof ",WMs[i].Grep,NULL);
+                    gchar * cm = g_strconcat("/sbin/pidof ",WMs[i].Grep,NULL);
 
                     if (!g_spawn_command_line_sync(cm,&pret,NULL,NULL,NULL))
                         g_warning(_("No pidof, this may not work right."));


--- NEW FILE beryl-manager.spec ---
Name:           beryl-manager
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
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
Patch0:         beryl-manager-0.1.1-pidof.patch

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
BuildRequires:  libtool, gettext-devel
BuildRequires:  dbus-glib, dbus-devel, intltool, perl-XML-Parser


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Beryl-manager is a tray application to keep beryl
up and running, switch window managers, decorators,
launch beryl-settings and the beryl theme tool.


%prep
%setup -q
# Use absolute path to pidof, not in most users' $PATH
%patch0 -p1 -b .pidof
#autoreconf -v --install
#glib-gettextize --copy --force
#intltoolize --automake --copy --force


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/beryl-manager
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/beryl-manager.1.gz


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Add missing BR: libtool, gettext-devel

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Thu Oct 05 2006 Jarod Wilson  0.1.0-2
- Fix for pidof not in users' $PATH

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 21:10:55 -0000	1.1
+++ .cvsignore	15 Nov 2006 21:11:15 -0000	1.2
@@ -0,0 +1 @@
+beryl-manager-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 21:10:55 -0000	1.1
+++ sources	15 Nov 2006 21:11:15 -0000	1.2
@@ -0,0 +1 @@
+50c0235d59369674827ceaec7d36e53b  beryl-manager-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 21:15:48 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:15:48 -0700
Subject: owners owners.list,1.1964,1.1965
Message-ID: <200611152115.kAFLFmqB018880@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18860

Modified Files:
	owners.list 
Log Message:
Add beryl-manager


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1964
retrieving revision 1.1965
diff -u -r1.1964 -r1.1965
--- owners.list	15 Nov 2006 19:16:07 -0000	1.1964
+++ owners.list	15 Nov 2006 21:15:17 -0000	1.1965
@@ -109,6 +109,7 @@
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-core|Beryl OpenGL window and compositing manager|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-manager|Beryl OpenGL window and compositing manager control application|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-plugins|Beryl OpenGL window and compositing manager plugins|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-settings|Beryl OpenGL window and compositing manager settings utility|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 21:34:55 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:34:55 -0700
Subject: rpms/dar - New directory
Message-ID: <200611152134.kAFLYtPu019084@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19080/dar

Log Message:
Directory /cvs/extras/rpms/dar added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:35:01 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:35:01 -0700
Subject: rpms/dar/devel - New directory
Message-ID: <200611152135.kAFLZ1GH019098@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19080/dar/devel

Log Message:
Directory /cvs/extras/rpms/dar/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:35:16 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:35:16 -0700
Subject: rpms/dar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611152135.kAFLZG06019129@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123

Added Files:
	Makefile import.log 
Log Message:
Setup of module dar


--- NEW FILE Makefile ---
# Top level Makefile for module dar
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  Wed Nov 15 21:35:22 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:35:22 -0700
Subject: rpms/dar/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611152135.kAFLZMcW019146@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dar


--- 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 Nov 15 21:36:59 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:36:59 -0700
Subject: rpms/dar import.log,1.1,1.2
Message-ID: <200611152136.kAFLaxfL019234@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19197

Modified Files:
	import.log 
Log Message:
auto-import dar-2.3.1-3 on branch devel from dar-2.3.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 21:35:16 -0000	1.1
+++ import.log	15 Nov 2006 21:36:29 -0000	1.2
@@ -0,0 +1 @@
+dar-2_3_1-3:HEAD:dar-2.3.1-3.src.rpm:1163626582



From fedora-extras-commits at redhat.com  Wed Nov 15 21:37:00 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:37:00 -0700
Subject: rpms/dar/devel README.Fedora, NONE, 1.1 dar.spec, NONE,
	1.1 man.dar.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611152137.kAFLb0IT019238@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19197/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora dar.spec man.dar.patch 
Log Message:
auto-import dar-2.3.1-3 on branch devel from dar-2.3.1-3.src.rpm


--- NEW FILE README.Fedora ---
Due to fedora policy and the apparent inability of the current version of
glibc to compile a true static binary, the dar-static package/binaries have
not been built or included with this package.  If you would like to build
static binaries, you can download the source RPM file from the Fedora Extras
repository and recompile it with "--with static" to enable the static binary
and library files.

-Chris Petersen, Fedora package maintainer, 2006-11-14


--- NEW FILE dar.spec ---
#
# Specfile for DAR, the disk archiver
#
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=210790
#

# Static build is disabled by default by fedora policy, but also because the
# latest versions of glibc don't seem to compile proper static binaries.  Use
# "--with static" to enable the static subpackage
%define with_static %{?_with_static: 1} %{?!_with_static: 0}

#
# Basic descriptive tags for this package:
#
Name:           dar
Version:        2.3.1
Release:        3%{?dist}
Summary:        Collection of scripts for making/restoring CD/DVD backups

URL:            http://dar.linux.free.fr/
License:        GPL
Group:          Applications/Archiving

################################################################################

Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:        README.Fedora

Patch:          man.dar.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

################################################################################

BuildRequires:  bzip2-devel
BuildRequires:  openssl-devel

Requires:       par2cmdline

################################################################################

%description
DAR is a command line tool to backup a directory tree and files. DAR is
able to make differential backups, split them over a set of disks or files
of a given size, use compression, filter files or subtrees to be saved or
not saved, directly access and restore given files. DAR is also able
to handle extented attributes, and can make remote backups through an
ssh session for example. Finally, DAR handles save and restore of hard
and symbolic links.

################################################################################

%package -n libdar
Group:      System Environment/Libraries
Summary:    Library providing support for the DAR API

%description -n libdar
Common library code for DAR.

################################################################################

%package -n libdar-devel
Group:      Development/Libraries
Summary:    Development files for libdar
Requires:   libdar = %{version}-%{release}

%description -n libdar-devel
This package contains the header files and libraries for developing
programs that use the DAR API (libdar).

################################################################################
# The following two subpackages are only built when enabled via "--with static"
################################################################################

%if %{with_static}

%package -n dar-static
Group:      Applications/System
Summary:    Statically linked version of dar

%description -n dar-static
Statically linked version of dar that can be installed onto backup disks for
easier file retrieval.

%package -n libdar-static-devel
Group:      Development/Libraries
Summary:    Statically linked dar library files

%description -nlibdar-static-devel
Statically linked version of dar libraries that can be installed onto backup
disks for easier file retrieval.

%endif

################################################################################

%prep
%setup -q

%patch -p0 -b .man

################################################################################

%build

# Options
%if %{with_static}
    STATIC=""
%else
    STATIC="--disable-dar-static --disable-static"
%endif

%configure --disable-build-html $STATIC

make %{?_smp_mflags}

################################################################################

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

# Remove the libtool archive files
rm -f  $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig

# Delete the sample files that we can't seem to disable
rm -rf $RPM_BUILD_ROOT/%{_datadir}/dar/

# Remove the doc makefiles so they don't get installed along with the other files.
rm -f doc/Makefile*
rm -f doc/*/Makefile*

# Rename the documentation directory so it makes more sense after installation.
mv doc html

# Sample scripts should not be executable
chmod 0644 html/samples/*

# Install the fedora readme
cp -a %{SOURCE1} .

################################################################################

%clean
rm -rf $RPM_BUILD_ROOT

################################################################################

%post   -n libdar -p /sbin/ldconfig
%postun -n libdar -p /sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc html/ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO README.Fedora

%{_bindir}/dar
%{_bindir}/dar_cp
%{_bindir}/dar_manager
%{_bindir}/dar_slave
%{_bindir}/dar_xform
%{_mandir}/man1/*

################################################################################

%files -n libdar
%defattr(-,root,root,-)
%{_libdir}/*.so.*

################################################################################

%files -n libdar-devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

################################################################################

%if %{with_static}

%files -n dar-static
%defattr(-,root,root,-)
%{_bindir}/dar_static

################################################################################

%files -n libdar-static-devel
%defattr(-,root,root,-)
%{_libdir}/*.a

################################################################################
%endif

%changelog

* Tue Nov 14 2006 Chris Petersen                   2.3.1-3
- Fix/standardize Requires/Provides for libdar and libdar-devel
- Remove redundant zlib-devel (covered by openssl-devel)
- Update README.Fedora with my name/date, as requested in the ticket
- Add a patch to fix a funky character in man/dar.1

* Fri Nov 04 2006 Chris Petersen                   2.3.1-2
- Add README.Fedora explaining why we do not include static binaries (upstream's request)
- Add libdar-static-devel subpackage to hold the *.a files
- Disable static subpackages by default, enabled via "--with static" for those who want to compile them

* Thu May 11 2006 Chris Petersen                   2.3.1-1
- Initial package, compiled from half a dozen third party packages


man.dar.patch:

--- NEW FILE man.dar.patch ---
--- man/dar.1.orig	2006-11-14 20:03:39.000000000 -0800
+++ man/dar.1	2006-11-14 20:04:08.000000000 -0800
@@ -338,7 +338,7 @@
  - a , if -af option has been placed before -A on the command-line (or in a included file, see -B option). For more about that feature see -af option below.
 .TP 20
 -@, --aux-ref []/
-specifies an auxiliary archive of reference. This option is only available with -+ option (merging). Over -A option which is mandatory with -+ option, you may give a second archive of reference thanks to the -% option. This allows one to merge two archive in a single one. See also -$, -? and -% for other options concerning auxiliary archive of reference.
+specifies an auxiliary archive of reference. This option is only available with -+ option (merging). Over -A option which is mandatory with -+ option, you may give a second archive of reference thanks to the -% option. This allows one to merge two archive in a single one. See also -$, -~ and -% for other options concerning auxiliary archive of reference.
 .TP 20
 -$, --aux-key [[]:]
 same as -J but for the auxiliary archive of reference (-@ option).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 21:35:21 -0000	1.1
+++ .cvsignore	15 Nov 2006 21:36:29 -0000	1.2
@@ -0,0 +1 @@
+dar-2.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 21:35:21 -0000	1.1
+++ sources	15 Nov 2006 21:36:29 -0000	1.2
@@ -0,0 +1 @@
+cdeb693c9c4a0adcdb39da67e0067d38  dar-2.3.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 15 21:43:53 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:43:53 -0700
Subject: rpms/dar/devel dar.spec,1.1,1.2
Message-ID: <200611152143.kAFLhrhF019309@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19293

Modified Files:
	dar.spec 
Log Message:
Change the summary to something more appropriate to what dar actually is


Index: dar.spec
===================================================================
RCS file: /cvs/extras/rpms/dar/devel/dar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dar.spec	15 Nov 2006 21:36:29 -0000	1.1
+++ dar.spec	15 Nov 2006 21:43:23 -0000	1.2
@@ -14,8 +14,8 @@
 #
 Name:           dar
 Version:        2.3.1
-Release:        3%{?dist}
-Summary:        Collection of scripts for making/restoring CD/DVD backups
+Release:        4%{?dist}
+Summary:        Software for making/restoring incremental CD/DVD backups
 
 URL:            http://dar.linux.free.fr/
 License:        GPL
@@ -195,6 +195,9 @@
 
 %changelog
 
+* Wed Nov 15 2006 Chris Petersen                   2.3.1-4
+- Change the main summary -- this is no longer a "collection of scripts"
+
 * Tue Nov 14 2006 Chris Petersen                   2.3.1-3
 - Fix/standardize Requires/Provides for libdar and libdar-devel
 - Remove redundant zlib-devel (covered by openssl-devel)



From fedora-extras-commits at redhat.com  Wed Nov 15 21:45:52 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:45:52 -0700
Subject: owners owners.list,1.1965,1.1966
Message-ID: <200611152145.kAFLjqwM019333@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19317

Modified Files:
	owners.list 
Log Message:
Add new package:  dar -- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=210790


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1965
retrieving revision 1.1966
diff -u -r1.1965 -r1.1966
--- owners.list	15 Nov 2006 21:15:17 -0000	1.1965
+++ owners.list	15 Nov 2006 21:45:22 -0000	1.1966
@@ -278,6 +278,7 @@
 Fedora Extras|dap-hdf4_handler|HDF4 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|dap-netcdf_handler|NetCDF 3 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|dap-server|Basic request handling for DAP servers|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|dar|Software for making/restoring incremental CD/DVD backups|rpm at forevermore.net|extras-qa at fedoraproject.org|
 Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dates|Small, lightweight calendar|jkeating at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|db4o|db4o is an object orientated database system for .NET|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 21:58:55 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:58:55 -0700
Subject: rpms/emerald - New directory
Message-ID: <200611152158.kAFLwtGp019451@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19447/emerald

Log Message:
Directory /cvs/extras/rpms/emerald added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:59:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:59:01 -0700
Subject: rpms/emerald/devel - New directory
Message-ID: <200611152159.kAFLx1QT019465@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19447/emerald/devel

Log Message:
Directory /cvs/extras/rpms/emerald/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:59:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:59:13 -0700
Subject: rpms/emerald Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611152159.kAFLxDW7019496@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19490

Added Files:
	Makefile import.log 
Log Message:
Setup of module emerald


--- NEW FILE Makefile ---
# Top level Makefile for module emerald
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  Wed Nov 15 21:59:19 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:59:19 -0700
Subject: rpms/emerald/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611152159.kAFLxJ5t019510@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19490/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emerald


--- 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 Nov 15 22:00:07 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 15:00:07 -0700
Subject: rpms/emerald import.log,1.1,1.2
Message-ID: <200611152200.kAFM07MC019594@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554

Modified Files:
	import.log 
Log Message:
auto-import emerald-0.1.2-3.fc7 on branch devel from emerald-0.1.2-3.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/emerald/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 21:59:13 -0000	1.1
+++ import.log	15 Nov 2006 21:59:37 -0000	1.2
@@ -0,0 +1 @@
+emerald-0_1_2-3_fc7:HEAD:emerald-0.1.2-3.fc7.src.rpm:1163627974



From fedora-extras-commits at redhat.com  Wed Nov 15 22:00:08 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 15:00:08 -0700
Subject: rpms/emerald/devel emerald.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611152200.kAFM08IA019598@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emerald.spec 
Log Message:
auto-import emerald-0.1.2-3.fc7 on branch devel from emerald-0.1.2-3.fc7.src.rpm


--- NEW FILE emerald.spec ---
Name:           emerald
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        3%{?dist}

Summary:        Themeable window decorator and compositing manager for Beryl
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}
BuildRequires:  libtool, gettext-devel, libwnck-devel
BuildRequires:  libXcomposite-devel, libXdamage-devel
BuildRequires:  gtk2-devel, intltool, desktop-file-utils
BuildRequires:  dbus-glib, dbus-devel, librsvg2-devel
BuildRequires:  startup-notification-devel, perl-XML-Parser


%description
Emerald is themeable window decorator and compositing 
manager for Beryl. Launch Theme Manager from
beryl-manager to change themes.


%package devel
Summary: Development files for emerald
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
The emerald-devel package provides development files
for emerald, the themeable window decorator for beryl.


%prep
%setup -q
# Should only have one Exec line in a desktop file...
perl -pi -e 's|Exec=emerald-theme-manager -i||g' misc/emerald-theme-manager.desktop
# Death to rpaths...
perl -pi -e 's|hardcode_into_libs=.*|hardcode_into_libs=no|g' configure
perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' configure
perl -pi -e 's|runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' configure


%build
%configure --enable-librsvg --disable-mime-update
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
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 \
  $RPM_BUILD_ROOT%{_datadir}/applications/emerald-theme-manager.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
update-mime-database %{_datadir}/mime &>/dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :

%postun
/sbin/ldconfig
update-mime-database %{_datadir}/mime &>/dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/*
%{_datadir}/pixmaps/*
%dir %{_libdir}/emerald
%{_libdir}/emerald/*
%{_libdir}/libemeraldengine.so.*
%dir %{_datadir}/emerald
%dir %{_datadir}/emerald/theme
%{_datadir}/emerald/theme/*
%{_datadir}/emerald/settings.ini
%{_datadir}/applications/*
%{_datadir}/mime-info/*
%{_datadir}/mime/packages/*
%{_datadir}/icons/hicolor/48x48/mimetypes/*
%{_mandir}/man1/*.1*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libemeraldengine.so

%changelog
* Wed Nov 15 2006 Jarod Wilson  0.1.2-3
- Kill rpaths

* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Add missing BR: libtool, gettext-devel, libwnck-devel,
  libXdamage, libXcomposite

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Thu Oct 05 2006 Jarod Wilson  0.1.0-3
- Really fix the duplicate menu entries this time

* Thu Oct 05 2006 Jarod Wilson  0.1.0-2
- Fix duplicate menu entries

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emerald/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 21:59:19 -0000	1.1
+++ .cvsignore	15 Nov 2006 21:59:38 -0000	1.2
@@ -0,0 +1 @@
+emerald-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emerald/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 21:59:19 -0000	1.1
+++ sources	15 Nov 2006 21:59:38 -0000	1.2
@@ -0,0 +1 @@
+c273fe82c7e3b2867f05073f3b012708  emerald-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 22:04:15 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 15:04:15 -0700
Subject: comps comps-fe7.xml.in,1.23,1.24
Message-ID: <200611152204.kAFM4FjO022644@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22628

Modified Files:
	comps-fe7.xml.in 
Log Message:
add dar to comps.fe7


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- comps-fe7.xml.in	14 Nov 2006 07:40:24 -0000	1.23
+++ comps-fe7.xml.in	15 Nov 2006 22:03:43 -0000	1.24
@@ -911,6 +911,7 @@
       connect-proxy
       convmv
       crack
+      dar
       denyhosts
       dkms
       ebtables



From fedora-extras-commits at redhat.com  Wed Nov 15 22:06:40 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 15:06:40 -0700
Subject: owners owners.list,1.1966,1.1967
Message-ID: <200611152206.kAFM6eFA022673@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22657

Modified Files:
	owners.list 
Log Message:
fix my email address for dar


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1966
retrieving revision 1.1967
diff -u -r1.1966 -r1.1967
--- owners.list	15 Nov 2006 21:45:22 -0000	1.1966
+++ owners.list	15 Nov 2006 22:06:05 -0000	1.1967
@@ -278,7 +278,7 @@
 Fedora Extras|dap-hdf4_handler|HDF4 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|dap-netcdf_handler|NetCDF 3 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|dap-server|Basic request handling for DAP servers|pertusus at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|dar|Software for making/restoring incremental CD/DVD backups|rpm at forevermore.net|extras-qa at fedoraproject.org|
+Fedora Extras|dar|Software for making/restoring incremental CD/DVD backups|lists at forevermore.net|extras-qa at fedoraproject.org|
 Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dates|Small, lightweight calendar|jkeating at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|db4o|db4o is an object orientated database system for .NET|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 22:18:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 15:18:13 -0700
Subject: owners owners.list,1.1967,1.1968
Message-ID: <200611152218.kAFMID3w022810@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22790

Modified Files:
	owners.list 
Log Message:
Add emerald


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1967
retrieving revision 1.1968
diff -u -r1.1967 -r1.1968
--- owners.list	15 Nov 2006 22:06:05 -0000	1.1967
+++ owners.list	15 Nov 2006 22:17:42 -0000	1.1968
@@ -360,6 +360,7 @@
 Fedora Extras|emacs-vm|Emacs VM mailreader|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|embryo|A C like scripting language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|emerald|Beryl OpenGL window and compositing manager window decorator|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 23:00:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 15 Nov 2006 16:00:04 -0700
Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.24,1.25
Message-ID: <200611152300.kAFN04dW022936@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Build/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22918

Modified Files:
	perl-Module-Build.spec 
Log Message:
Don't BR Pod::Readme.  (#215558)


Index: perl-Module-Build.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-Module-Build.spec	17 Sep 2006 22:42:38 -0000	1.24
+++ perl-Module-Build.spec	15 Nov 2006 22:59:34 -0000	1.25
@@ -3,7 +3,7 @@
 Name:           perl-Module-Build
 # When the module version is x.yz, set Version to x.yz00.
 Version:        0.2805
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for building and installing Perl modules
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -15,7 +15,8 @@
 BuildRequires:  perl(ExtUtils::CBuilder) >= 0.15
 BuildRequires:  perl(ExtUtils::ParseXS) >= 1.02
 BuildRequires:  perl(YAML)
-BuildRequires:  perl(Pod::Readme) >= 0.04
+# Avoid a circular build dependency (#215558).
+#BuildRequires:  perl(Pod::Readme) >= 0.04
 #BuildRequires:  perl(version) >= 0.661
 Requires:       perl(Archive::Tar) >= 1.08
 Requires:       perl(ExtUtils::CBuilder) >= 0.15
@@ -64,6 +65,9 @@
 %{_mandir}/man3/Module::Build*.3*
 
 %changelog
+* Wed Nov 15 2006 Steven Pritchard  0.2805-3
+- Don't BR Pod::Readme.  (#215558)
+
 * Sun Sep 17 2006 Steven Pritchard  0.2805-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 23:44:12 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 15 Nov 2006 16:44:12 -0700
Subject: rpms/grads/devel grads.spec,1.18,1.19
Message-ID: <200611152344.kAFNiClP026215@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26198

Modified Files:
	grads.spec 
Log Message:
* Thu Nov 16 2006 Patrice Dumas  1.9b4-19
- don't ship wgrib but depend on it



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- grads.spec	1 Nov 2006 00:33:14 -0000	1.18
+++ grads.spec	15 Nov 2006 23:43:41 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -39,6 +39,9 @@
 BuildRequires:  libXmu-devel libX11-devel
 BuildRequires:  automake
 
+# in a separate package now
+Requires:       wgrib
+
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
 that is used for easy access, manipulation, and visualization of earth science
@@ -46,6 +49,7 @@
 (Scientific Data Sets). GrADS has been implemented worldwide on a variety of
 commonly used operating systems and is freely distributed over the Internet.
 
+
 %prep
 %setup -q
 %patch -p1
@@ -53,8 +57,8 @@
 %patch -P 2 -p1
 # change path to datas to %{_datadir}/%{name}
 sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gx.h
-# copy grib notice
-cp %{SOURCE2} .
+# no need to copy grib notice anymore, since it is in a separate package
+#cp %{SOURCE2} .
 cp %{SOURCE6} .
 # copy hdf include wrapper file
 cp %{SOURCE7} src
@@ -77,6 +81,7 @@
 make %{?_smp_mflags}
 cp -r doc html
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -90,6 +95,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc COPYRIGHT html README.xorg grads-copyright_summary
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
@@ -101,12 +107,15 @@
 %{_bindir}/gxps
 %{_bindir}/gxtran
 %{_bindir}/stnmap
-%{_bindir}/wgrib
+# wgrib is in a separate package
+%exclude %{_bindir}/wgrib
 %{_datadir}/grads/
 
-%doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas  1.9b4-19
+- don't ship wgrib but depend on it
+
 * Tue Oct 31 2006 Patrice Dumas  1.9b4-18
 - rebuild for new libcurl soname (indirect dependency through libnc-dap)
 



From fedora-extras-commits at redhat.com  Thu Nov 16 01:08:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 15 Nov 2006 18:08:46 -0700
Subject: rpms/uuid/FC-5 ossp-uuid.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 uuid.spec, 1.1, 1.2
Message-ID: <200611160108.kAG18k77032685@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/uuid/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32660

Modified Files:
	.cvsignore sources uuid.spec 
Added Files:
	ossp-uuid.patch 
Log Message:
Sync with devel/FC-6.

ossp-uuid.patch:

--- NEW FILE ossp-uuid.patch ---
diff -urN uuid-1.5.1.orig/Makefile.PL uuid-1.5.1/Makefile.PL
--- uuid-1.5.1.orig/Makefile.PL	2006-01-15 12:37:43.000000000 -0600
+++ uuid-1.5.1/Makefile.PL	2006-09-21 15:59:40.000000000 -0500
@@ -44,7 +44,7 @@
 all pure_all:
 	\@if [ ! -d build ]; then mkdir build; fi
 	\@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi
-	\@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi
+	\@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi
 	\@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi
 	\@cd perl && \$(MAKE) \$(MFLAGS) \$\@
 
diff -urN uuid-1.5.1.orig/Makefile.in uuid-1.5.1/Makefile.in
--- uuid-1.5.1.orig/Makefile.in	2006-07-31 07:20:03.000000000 -0500
+++ uuid-1.5.1/Makefile.in	2006-09-21 16:06:31.000000000 -0500
@@ -61,13 +61,13 @@
 PHP         = @PHP@
 PG_CONFIG   = @PG_CONFIG@
 
-LIB_NAME    = libuuid.la
+LIB_NAME    = libossp-uuid.la
 LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
 
-DCE_NAME    = libuuid_dce.la
+DCE_NAME    = libossp-uuid_dce.la
 DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
 
-CXX_NAME    = libuuid++.la
+CXX_NAME    = libossp-uuid++.la
 CXX_OBJS    = uuid++.lo $(LIB_OBJS)
 
 PRG_NAME    = uuid
@@ -78,10 +78,10 @@
 PERL_NAME   = $(S)/perl/blib/lib/OSSP/uuid.pm
 PERL_OBJS   = $(S)/perl/uuid.pm
 
-PHP_NAME    = $(S)/php/modules/uuid.so
+PHP_NAME    = $(S)/php/modules/ossp-uuid.so
 PHP_OBJS    = $(S)/php/uuid.c
 
-PGSQL_NAME  = $(S)/pgsql/libuuid.so
+PGSQL_NAME  = $(S)/pgsql/libossp-uuid.so
 PGSQL_OBJS  = $(S)/pgsql/uuid.c
 
 TARGETS     = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@
@@ -230,7 +230,7 @@
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
 	$(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
 	$(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
-	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
+	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 	$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
 	- at if [ ".$(WITH_DCE)" = .yes ]; then \
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
@@ -240,7 +240,7 @@
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
 	fi
-	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
+	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
@@ -275,7 +275,7 @@
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \
 	fi
-	-$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
+	-$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
 	    $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
@@ -289,7 +289,7 @@
 	    echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
 	    $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
 	fi
-	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
 	-$(RM) $(DESTDIR)$(bindir)/uuid-config
 	-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
diff -urN uuid-1.5.1.orig/perl/Makefile.PL uuid-1.5.1/perl/Makefile.PL
--- uuid-1.5.1.orig/perl/Makefile.PL	2006-01-13 00:44:33.000000000 -0600
+++ uuid-1.5.1/perl/Makefile.PL	2006-09-21 15:59:40.000000000 -0500
@@ -33,9 +33,9 @@
 use ExtUtils::MakeMaker;
 
 #   determine source directory
-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
-               grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
-    or die "no source directory found (where libuuid.la is located)";
+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
+               grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
+    or die "no source directory found (where libossp-uuid.la is located)";
 
 #   determine extra build options
 my $compat = 0;
@@ -47,7 +47,7 @@
     VERSION_FROM      => 'uuid.pm',
     ABSTRACT_FROM     => 'uuid.pod',
     PREREQ_PM         => {},
-    LIBS              => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
+    LIBS              => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
     DEFINE            => '',
     INC               => "-I. -I$srcdir",
     PM                => { 'uuid.pm'   => '$(INST_LIBDIR)/uuid.pm',
diff -urN uuid-1.5.1.orig/pgsql/Makefile uuid-1.5.1/pgsql/Makefile
--- uuid-1.5.1.orig/pgsql/Makefile	2006-07-31 07:36:58.000000000 -0500
+++ uuid-1.5.1/pgsql/Makefile	2006-09-21 16:07:23.000000000 -0500
@@ -17,13 +17,13 @@
 top_builddir      := $(dir $(PGXS))../..
 include           $(top_builddir)/src/Makefile.global
     
-NAME              = uuid
+NAME              = ossp-uuid
 OBJS              = uuid.o
 SO_MAJOR_VERSION  = 1
 SO_MINOR_VERSION  = 0
 
 override CPPFLAGS := -I.. $(CPPFLAGS)
-SHLIB_LINK        := -L../.libs -luuid
+SHLIB_LINK        := -L../.libs -lossp-uuid
 SHLIB_LINK        += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic")
 rpath             :=
 
@@ -33,16 +33,16 @@
 include           $(top_builddir)/src/Makefile.shlib
 
 uuid.sql: uuid.sql.in
-	sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql
+	sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
+	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
 	$(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql
 
 uninstall:
-	-rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
+	-rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
 	-rm -f $(DESTDIR)$(datadir)/uuid.sql
 
 clean distclean: clean-lib
diff -urN uuid-1.5.1.orig/php/Makefile.local uuid-1.5.1/php/Makefile.local
--- uuid-1.5.1.orig/php/Makefile.local	2006-07-31 06:41:46.000000000 -0500
+++ uuid-1.5.1/php/Makefile.local	2006-09-21 15:59:40.000000000 -0500
@@ -48,7 +48,7 @@
 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
 	echo "installing PHP$$version API into $$extdir"; \
 	./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \
-	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \
+	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \
 	./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php
 
 clean:
diff -urN uuid-1.5.1.orig/php/config.m4 uuid-1.5.1/php/config.m4
--- uuid-1.5.1.orig/php/config.m4	2006-01-13 00:44:34.000000000 -0600
+++ uuid-1.5.1/php/config.m4	2006-09-21 15:59:40.000000000 -0500
@@ -34,7 +34,7 @@
     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
     PHP_ADD_LIBPATH([..], )
-    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
+    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
     PHP_ADD_INCLUDE([..])
     PHP_SUBST(UUID_SHARED_LIBADD)
     dnl  avoid conflict with libc's uuid_create(3)
diff -urN uuid-1.5.1.orig/php/uuid.ts uuid-1.5.1/php/uuid.ts
--- uuid-1.5.1.orig/php/uuid.ts	2006-01-13 00:44:34.000000000 -0600
+++ uuid-1.5.1/php/uuid.ts	2006-09-21 15:59:40.000000000 -0500
@@ -34,9 +34,9 @@
 
 $php_version = $argv[1];
 
-print "++ loading DSO uuid.so (low-level API)\n";
+print "++ loading DSO ossp-uuid.so (low-level API)\n";
 if (!extension_loaded('uuid')) {
-    dl('modules/uuid.so');
+    dl('modules/ossp-uuid.so');
 }
 
 print "++ loading PHP uuid.php${php_version} (high-level API)\n";
diff -urN uuid-1.5.1.orig/uuid-config.in uuid-1.5.1/uuid-config.in
--- uuid-1.5.1.orig/uuid-config.in	2006-01-13 00:44:30.000000000 -0600
+++ uuid-1.5.1/uuid-config.in	2006-09-21 15:59:40.000000000 -0500
@@ -120,7 +120,7 @@
             output_extra="$output_extra $uuid_ldflags"
             ;;
         --libs)
-            output="$output -luuid"
+            output="$output -lossp-uuid"
             output_extra="$output_extra $uuid_libs"
             ;;
         * )
diff -urN uuid-1.5.1.orig/uuid.pc.in uuid-1.5.1/uuid.pc.in
--- uuid-1.5.1.orig/uuid.pc.in	2006-01-13 00:44:30.000000000 -0600
+++ uuid-1.5.1/uuid.pc.in	2006-09-21 15:59:40.000000000 -0500
@@ -37,6 +37,6 @@
 Version: @UUID_VERSION_RAW@
 URL: http://www.ossp.org/pkg/lib/uuid/
 Cflags: -I${includedir}
-Libs: -L${libdir} -luuid
+Libs: -L${libdir} -lossp-uuid
 Libs.private: @LIBS@
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 May 2006 14:20:21 -0000	1.2
+++ .cvsignore	16 Nov 2006 01:08:12 -0000	1.3
@@ -1 +1 @@
-uuid-1.4.2.tar.gz
+uuid-1.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 May 2006 14:20:21 -0000	1.2
+++ sources	16 Nov 2006 01:08:12 -0000	1.3
@@ -1 +1 @@
-fdfe93bc134dfb73814456c3b444dda1  uuid-1.4.2.tar.gz
+d7df0c4cb02dad7ce3e1ec8fc669f724  uuid-1.5.1.tar.gz


Index: uuid.spec
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-5/uuid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uuid.spec	24 May 2006 14:20:21 -0000	1.1
+++ uuid.spec	16 Nov 2006 01:08:12 -0000	1.2
@@ -1,11 +1,12 @@
 Name:           uuid
-Version:        1.4.2
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        2%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.ossp.org/pkg/lib/uuid/
 Source0:        ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz
+Patch0:         ossp-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  /usr/bin/libtool
 
@@ -95,9 +96,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # Build the library.
+export LIB_NAME=libossp-uuid.la
+export DCE_NAME=libossp-uuid_dce.la
+export CXX_NAME=libossp-uuid++.la
+export PHP_NAME=$RPM_SOURCE_DIR/php/modules/ossp-uuid.so
+export PGSQL_NAME=$RPM_SOURCE_DIR/pgsql/libossp-uuid.so
 %configure \
     --disable-static \
     --without-perl \
@@ -178,25 +185,25 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
 %{_bindir}/uuid
-%{_libdir}/libuuid.so.*
+%{_libdir}/libossp-uuid.so.*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/uuid-config
 %{_includedir}/uuid.h
-%{_libdir}/libuuid.so
-%{_libdir}/pkgconfig/uuid.pc
-%{_mandir}/man3/uuid.3*
+%{_libdir}/libossp-uuid.so
+%{_libdir}/pkgconfig/ossp-uuid.pc
+%{_mandir}/man3/ossp-uuid.3*
 
 %files c++
 %defattr(-,root,root,-)
-%{_libdir}/libuuid++.so.*
+%{_libdir}/libossp-uuid++.so.*
 
 %files c++-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid++.hh
-%{_libdir}/libuuid++.so
+%{_libdir}/libossp-uuid++.so
 %{_mandir}/man3/uuid++.3*
 
 %files perl
@@ -218,14 +225,26 @@
 
 %files dce
 %defattr(-,root,root,-)
-%{_libdir}/libuuid_dce.so.*
+%{_libdir}/libossp-uuid_dce.so.*
 
 %files dce-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid_dce.h
-%{_libdir}/libuuid_dce.so
+%{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli  1.5.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Mon Aug 28 2006 Steven Pritchard  1.5.1-1
+- Update to 1.5.1.
+
+* Sat Jul 29 2006 Steven Pritchard  1.5.0-1
+- Update to 1.5.0.
+- Rename libuuid* to libossp-uuid*, uuid.3 to ossp-uuid.3, and uuid.pc
+  to ossp-uuid.pc to avoid conflicts with e2fsprogs-devel (#198520).
+- Clean out the pgsql directory.  (Some cruft shipped with this release.)
+
 * Wed May 24 2006 Steven Pritchard  1.4.2-4
 - Remove static php module.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 01:11:37 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 15 Nov 2006 18:11:37 -0700
Subject: rpms/uuid/FC-4 ossp-uuid.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 uuid.spec, 1.1, 1.2
Message-ID: <200611160111.kAG1Bbh5000383@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/uuid/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv357

Modified Files:
	.cvsignore sources uuid.spec 
Added Files:
	ossp-uuid.patch 
Log Message:
Sync with devel/FC-6.

ossp-uuid.patch:

--- NEW FILE ossp-uuid.patch ---
diff -urN uuid-1.5.1.orig/Makefile.PL uuid-1.5.1/Makefile.PL
--- uuid-1.5.1.orig/Makefile.PL	2006-01-15 12:37:43.000000000 -0600
+++ uuid-1.5.1/Makefile.PL	2006-09-21 15:59:40.000000000 -0500
@@ -44,7 +44,7 @@
 all pure_all:
 	\@if [ ! -d build ]; then mkdir build; fi
 	\@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi
-	\@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi
+	\@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi
 	\@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi
 	\@cd perl && \$(MAKE) \$(MFLAGS) \$\@
 
diff -urN uuid-1.5.1.orig/Makefile.in uuid-1.5.1/Makefile.in
--- uuid-1.5.1.orig/Makefile.in	2006-07-31 07:20:03.000000000 -0500
+++ uuid-1.5.1/Makefile.in	2006-09-21 16:06:31.000000000 -0500
@@ -61,13 +61,13 @@
 PHP         = @PHP@
 PG_CONFIG   = @PG_CONFIG@
 
-LIB_NAME    = libuuid.la
+LIB_NAME    = libossp-uuid.la
 LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
 
-DCE_NAME    = libuuid_dce.la
+DCE_NAME    = libossp-uuid_dce.la
 DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
 
-CXX_NAME    = libuuid++.la
+CXX_NAME    = libossp-uuid++.la
 CXX_OBJS    = uuid++.lo $(LIB_OBJS)
 
 PRG_NAME    = uuid
@@ -78,10 +78,10 @@
 PERL_NAME   = $(S)/perl/blib/lib/OSSP/uuid.pm
 PERL_OBJS   = $(S)/perl/uuid.pm
 
-PHP_NAME    = $(S)/php/modules/uuid.so
+PHP_NAME    = $(S)/php/modules/ossp-uuid.so
 PHP_OBJS    = $(S)/php/uuid.c
 
-PGSQL_NAME  = $(S)/pgsql/libuuid.so
+PGSQL_NAME  = $(S)/pgsql/libossp-uuid.so
 PGSQL_OBJS  = $(S)/pgsql/uuid.c
 
 TARGETS     = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@
@@ -230,7 +230,7 @@
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
 	$(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
 	$(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
-	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
+	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 	$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
 	- at if [ ".$(WITH_DCE)" = .yes ]; then \
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
@@ -240,7 +240,7 @@
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
 	fi
-	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
+	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
@@ -275,7 +275,7 @@
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \
 	fi
-	-$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
+	-$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
 	    $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
@@ -289,7 +289,7 @@
 	    echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
 	    $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
 	fi
-	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
 	-$(RM) $(DESTDIR)$(bindir)/uuid-config
 	-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
diff -urN uuid-1.5.1.orig/perl/Makefile.PL uuid-1.5.1/perl/Makefile.PL
--- uuid-1.5.1.orig/perl/Makefile.PL	2006-01-13 00:44:33.000000000 -0600
+++ uuid-1.5.1/perl/Makefile.PL	2006-09-21 15:59:40.000000000 -0500
@@ -33,9 +33,9 @@
 use ExtUtils::MakeMaker;
 
 #   determine source directory
-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
-               grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
-    or die "no source directory found (where libuuid.la is located)";
+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
+               grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
+    or die "no source directory found (where libossp-uuid.la is located)";
 
 #   determine extra build options
 my $compat = 0;
@@ -47,7 +47,7 @@
     VERSION_FROM      => 'uuid.pm',
     ABSTRACT_FROM     => 'uuid.pod',
     PREREQ_PM         => {},
-    LIBS              => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
+    LIBS              => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
     DEFINE            => '',
     INC               => "-I. -I$srcdir",
     PM                => { 'uuid.pm'   => '$(INST_LIBDIR)/uuid.pm',
diff -urN uuid-1.5.1.orig/pgsql/Makefile uuid-1.5.1/pgsql/Makefile
--- uuid-1.5.1.orig/pgsql/Makefile	2006-07-31 07:36:58.000000000 -0500
+++ uuid-1.5.1/pgsql/Makefile	2006-09-21 16:07:23.000000000 -0500
@@ -17,13 +17,13 @@
 top_builddir      := $(dir $(PGXS))../..
 include           $(top_builddir)/src/Makefile.global
     
-NAME              = uuid
+NAME              = ossp-uuid
 OBJS              = uuid.o
 SO_MAJOR_VERSION  = 1
 SO_MINOR_VERSION  = 0
 
 override CPPFLAGS := -I.. $(CPPFLAGS)
-SHLIB_LINK        := -L../.libs -luuid
+SHLIB_LINK        := -L../.libs -lossp-uuid
 SHLIB_LINK        += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic")
 rpath             :=
 
@@ -33,16 +33,16 @@
 include           $(top_builddir)/src/Makefile.shlib
 
 uuid.sql: uuid.sql.in
-	sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql
+	sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
+	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
 	$(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql
 
 uninstall:
-	-rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
+	-rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
 	-rm -f $(DESTDIR)$(datadir)/uuid.sql
 
 clean distclean: clean-lib
diff -urN uuid-1.5.1.orig/php/Makefile.local uuid-1.5.1/php/Makefile.local
--- uuid-1.5.1.orig/php/Makefile.local	2006-07-31 06:41:46.000000000 -0500
+++ uuid-1.5.1/php/Makefile.local	2006-09-21 15:59:40.000000000 -0500
@@ -48,7 +48,7 @@
 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
 	echo "installing PHP$$version API into $$extdir"; \
 	./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \
-	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \
+	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \
 	./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php
 
 clean:
diff -urN uuid-1.5.1.orig/php/config.m4 uuid-1.5.1/php/config.m4
--- uuid-1.5.1.orig/php/config.m4	2006-01-13 00:44:34.000000000 -0600
+++ uuid-1.5.1/php/config.m4	2006-09-21 15:59:40.000000000 -0500
@@ -34,7 +34,7 @@
     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
     PHP_ADD_LIBPATH([..], )
-    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
+    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
     PHP_ADD_INCLUDE([..])
     PHP_SUBST(UUID_SHARED_LIBADD)
     dnl  avoid conflict with libc's uuid_create(3)
diff -urN uuid-1.5.1.orig/php/uuid.ts uuid-1.5.1/php/uuid.ts
--- uuid-1.5.1.orig/php/uuid.ts	2006-01-13 00:44:34.000000000 -0600
+++ uuid-1.5.1/php/uuid.ts	2006-09-21 15:59:40.000000000 -0500
@@ -34,9 +34,9 @@
 
 $php_version = $argv[1];
 
-print "++ loading DSO uuid.so (low-level API)\n";
+print "++ loading DSO ossp-uuid.so (low-level API)\n";
 if (!extension_loaded('uuid')) {
-    dl('modules/uuid.so');
+    dl('modules/ossp-uuid.so');
 }
 
 print "++ loading PHP uuid.php${php_version} (high-level API)\n";
diff -urN uuid-1.5.1.orig/uuid-config.in uuid-1.5.1/uuid-config.in
--- uuid-1.5.1.orig/uuid-config.in	2006-01-13 00:44:30.000000000 -0600
+++ uuid-1.5.1/uuid-config.in	2006-09-21 15:59:40.000000000 -0500
@@ -120,7 +120,7 @@
             output_extra="$output_extra $uuid_ldflags"
             ;;
         --libs)
-            output="$output -luuid"
+            output="$output -lossp-uuid"
             output_extra="$output_extra $uuid_libs"
             ;;
         * )
diff -urN uuid-1.5.1.orig/uuid.pc.in uuid-1.5.1/uuid.pc.in
--- uuid-1.5.1.orig/uuid.pc.in	2006-01-13 00:44:30.000000000 -0600
+++ uuid-1.5.1/uuid.pc.in	2006-09-21 15:59:40.000000000 -0500
@@ -37,6 +37,6 @@
 Version: @UUID_VERSION_RAW@
 URL: http://www.ossp.org/pkg/lib/uuid/
 Cflags: -I${includedir}
-Libs: -L${libdir} -luuid
+Libs: -L${libdir} -lossp-uuid
 Libs.private: @LIBS@
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 May 2006 14:20:21 -0000	1.2
+++ .cvsignore	16 Nov 2006 01:11:07 -0000	1.3
@@ -1 +1 @@
-uuid-1.4.2.tar.gz
+uuid-1.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 May 2006 14:20:21 -0000	1.2
+++ sources	16 Nov 2006 01:11:07 -0000	1.3
@@ -1 +1 @@
-fdfe93bc134dfb73814456c3b444dda1  uuid-1.4.2.tar.gz
+d7df0c4cb02dad7ce3e1ec8fc669f724  uuid-1.5.1.tar.gz


Index: uuid.spec
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-4/uuid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uuid.spec	24 May 2006 14:20:21 -0000	1.1
+++ uuid.spec	16 Nov 2006 01:11:07 -0000	1.2
@@ -1,11 +1,12 @@
 Name:           uuid
-Version:        1.4.2
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        2%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.ossp.org/pkg/lib/uuid/
 Source0:        ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz
+Patch0:         ossp-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  /usr/bin/libtool
 
@@ -95,9 +96,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # Build the library.
+export LIB_NAME=libossp-uuid.la
+export DCE_NAME=libossp-uuid_dce.la
+export CXX_NAME=libossp-uuid++.la
+export PHP_NAME=$RPM_SOURCE_DIR/php/modules/ossp-uuid.so
+export PGSQL_NAME=$RPM_SOURCE_DIR/pgsql/libossp-uuid.so
 %configure \
     --disable-static \
     --without-perl \
@@ -178,25 +185,25 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
 %{_bindir}/uuid
-%{_libdir}/libuuid.so.*
+%{_libdir}/libossp-uuid.so.*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/uuid-config
 %{_includedir}/uuid.h
-%{_libdir}/libuuid.so
-%{_libdir}/pkgconfig/uuid.pc
-%{_mandir}/man3/uuid.3*
+%{_libdir}/libossp-uuid.so
+%{_libdir}/pkgconfig/ossp-uuid.pc
+%{_mandir}/man3/ossp-uuid.3*
 
 %files c++
 %defattr(-,root,root,-)
-%{_libdir}/libuuid++.so.*
+%{_libdir}/libossp-uuid++.so.*
 
 %files c++-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid++.hh
-%{_libdir}/libuuid++.so
+%{_libdir}/libossp-uuid++.so
 %{_mandir}/man3/uuid++.3*
 
 %files perl
@@ -218,14 +225,26 @@
 
 %files dce
 %defattr(-,root,root,-)
-%{_libdir}/libuuid_dce.so.*
+%{_libdir}/libossp-uuid_dce.so.*
 
 %files dce-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid_dce.h
-%{_libdir}/libuuid_dce.so
+%{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli  1.5.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Mon Aug 28 2006 Steven Pritchard  1.5.1-1
+- Update to 1.5.1.
+
+* Sat Jul 29 2006 Steven Pritchard  1.5.0-1
+- Update to 1.5.0.
+- Rename libuuid* to libossp-uuid*, uuid.3 to ossp-uuid.3, and uuid.pc
+  to ossp-uuid.pc to avoid conflicts with e2fsprogs-devel (#198520).
+- Clean out the pgsql directory.  (Some cruft shipped with this release.)
+
 * Wed May 24 2006 Steven Pritchard  1.4.2-4
 - Remove static php module.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 03:42:11 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:42:11 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager - New directory
Message-ID: <200611160342.kAG3gB5C007308@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7304/php-pear-Structures-DataGrid-Renderer-Pager

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 03:42:17 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:42:17 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel - New
	directory
Message-ID: <200611160342.kAG3gHZh007322@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7304/php-pear-Structures-DataGrid-Renderer-Pager/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 03:42:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:42:28 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200611160342.kAG3gSdk007353@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7347

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Structures-DataGrid-Renderer-Pager


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Structures-DataGrid-Renderer-Pager
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 Nov 16 03:42:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:42:29 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel .cvsignore, 
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611160342.kAG3gTPA007370@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7347/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Structures-DataGrid-Renderer-Pager


--- 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 Nov 16 03:43:12 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:43:12 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager import.log, 1.1,
	1.2
Message-ID: <200611160343.kAG3hCAT007445@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7413

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1 on branch devel from php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 03:42:28 -0000	1.1
+++ import.log	16 Nov 2006 03:42:42 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Structures-DataGrid-Renderer-Pager-0_1_0-1:HEAD:php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1.src.rpm:1163648559



From fedora-extras-commits at redhat.com  Thu Nov 16 03:43:13 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:43:13 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel
	php-pear-Structures-DataGrid-Renderer-Pager.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611160343.kAG3hD8k007449@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7413/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Structures-DataGrid-Renderer-Pager.spec 
Log Message:
auto-import php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1 on branch devel from php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1.src.rpm


--- NEW FILE php-pear-Structures-DataGrid-Renderer-Pager.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Structures_DataGrid_Renderer_Pager

Name:           php-pear-Structures-DataGrid-Renderer-Pager
Version:        0.1.0
Release:        1%{?dist}
Summary:        Renderer driver using PEAR::Pager

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Structures_DataGrid_Renderer_Pager
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(Pager) php-pear(Structures_DataGrid)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is a Renderer driver for Structures_DataGrid using PEAR::Pager.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Structures/DataGrid/Renderer


%changelog
* Sun Oct 29 2006 Christopher Stone  0.1.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 03:42:29 -0000	1.1
+++ .cvsignore	16 Nov 2006 03:42:43 -0000	1.2
@@ -0,0 +1 @@
+Structures_DataGrid_Renderer_Pager-0.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 03:42:29 -0000	1.1
+++ sources	16 Nov 2006 03:42:43 -0000	1.2
@@ -0,0 +1 @@
+6604bb72ff0b78c8651cd17eef0d5fe4  Structures_DataGrid_Renderer_Pager-0.1.0.tgz



From fedora-extras-commits at redhat.com  Thu Nov 16 03:45:14 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:45:14 -0700
Subject: owners owners.list,1.1968,1.1969
Message-ID: <200611160345.kAG3jEs2007520@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7490

Modified Files:
	owners.list 
Log Message:
php-pear-Structures-DataGrid-Renderer-Pager


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1968
retrieving revision 1.1969
diff -u -r1.1968 -r1.1969
--- owners.list	15 Nov 2006 22:17:42 -0000	1.1968
+++ owners.list	16 Nov 2006 03:44:44 -0000	1.1969
@@ -1819,6 +1819,7 @@
 Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 04:05:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:05:09 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel - New
	directory
Message-ID: <200611160405.kAG4594v010696@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10681/php-pear-Structures-DataGrid-Renderer-Smarty/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 04:05:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:05:05 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty - New directory
Message-ID: <200611160405.kAG455Lp010685@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10681/php-pear-Structures-DataGrid-Renderer-Smarty

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 04:05:31 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:05:31 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200611160405.kAG45V9x010736@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Structures-DataGrid-Renderer-Smarty


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Structures-DataGrid-Renderer-Smarty
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 Nov 16 04:05:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:05:34 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel .cvsignore, 
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611160405.kAG45Y1N010747@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Structures-DataGrid-Renderer-Smarty


--- 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 Nov 16 04:06:26 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:06:26 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel
	php-pear-Structures-DataGrid-Renderer-Smarty.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611160406.kAG46Qw7010826@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10792/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Structures-DataGrid-Renderer-Smarty.spec 
Log Message:
auto-import php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1 on branch devel from php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1.src.rpm


--- NEW FILE php-pear-Structures-DataGrid-Renderer-Smarty.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Structures_DataGrid_Renderer_Smarty

Name:           php-pear-Structures-DataGrid-Renderer-Smarty
Version:        0.1.2
Release:        1%{?dist}
Summary:        Renderer driver using Smarty

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Structures_DataGrid_Renderer_Smarty
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(Structures_DataGrid_Renderer_Pager)
Requires:       php-Smarty
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is a Rendering driver for Structures_DataGrid using Smarty. It adds the
necessary variables and functions to a Smarty instance, in order to build a
full-featured DataGrid within a Smarty template.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Structures/DataGrid/Renderer/Smarty.php


%changelog
* Sun Oct 29 2006 Christopher Stone  0.1.2-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 04:05:34 -0000	1.1
+++ .cvsignore	16 Nov 2006 04:05:55 -0000	1.2
@@ -0,0 +1 @@
+Structures_DataGrid_Renderer_Smarty-0.1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 04:05:34 -0000	1.1
+++ sources	16 Nov 2006 04:05:55 -0000	1.2
@@ -0,0 +1 @@
+a5e209d09588b82c3e46b6f4d7fef242  Structures_DataGrid_Renderer_Smarty-0.1.2.tgz



From fedora-extras-commits at redhat.com  Thu Nov 16 04:06:24 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:06:24 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty import.log, 1.1,
	1.2
Message-ID: <200611160406.kAG46Oft010824@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10792

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1 on branch devel from php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 04:05:31 -0000	1.1
+++ import.log	16 Nov 2006 04:05:53 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Structures-DataGrid-Renderer-Smarty-0_1_2-1:HEAD:php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1.src.rpm:1163649950



From fedora-extras-commits at redhat.com  Thu Nov 16 04:08:00 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 15 Nov 2006 21:08:00 -0700
Subject: rpms/mlton/devel mlton.spec,1.4,1.5
Message-ID: <200611160408.kAG480A2010901@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10864

Modified Files:
	mlton.spec 
Log Message:
version


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mlton.spec	13 Nov 2006 00:23:17 -0000	1.4
+++ mlton.spec	16 Nov 2006 04:07:29 -0000	1.5
@@ -44,6 +44,9 @@
 %prep
 %setup -q
 
+# instantiate version numbers
+make version
+
 # build documentation as PDF
 %patch -P 0 -p1
 # enable -g and disable strip so debuginfo packages work



From fedora-extras-commits at redhat.com  Thu Nov 16 04:08:22 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:08:22 -0700
Subject: owners owners.list,1.1969,1.1970
Message-ID: <200611160408.kAG48M88010907@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10883

Modified Files:
	owners.list 
Log Message:
php-pear-Structures-DataGrid-Renderer-Smarty


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1969
retrieving revision 1.1970
diff -u -r1.1969 -r1.1970
--- owners.list	16 Nov 2006 03:44:44 -0000	1.1969
+++ owners.list	16 Nov 2006 04:07:48 -0000	1.1970
@@ -1820,6 +1820,7 @@
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Structures-DataGrid-Renderer-Smarty|Renderer driver using Smarty|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 04:37:22 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 15 Nov 2006 21:37:22 -0700
Subject: rpms/gtk2hs/devel .cvsignore, 1.3, 1.4 gtk2hs.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200611160437.kAG4bM6W011241@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11220

Modified Files:
	.cvsignore gtk2hs.spec sources 
Log Message:
update to latest snapshot with header filelist fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2006 01:19:03 -0000	1.3
+++ .cvsignore	16 Nov 2006 04:36:51 -0000	1.4
@@ -1 +1 @@
-gtk2hs-0.9.10.2.tar.gz
+gtk2hs-0.9.10.2-20061116.tar.gz


Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtk2hs.spec	8 Nov 2006 01:20:25 -0000	1.7
+++ gtk2hs.spec	16 Nov 2006 04:36:51 -0000	1.8
@@ -1,3 +1,5 @@
+%define snapdate 20061116
+
 %define ghc_version 6.6
 %define ghcver ghc66
 
@@ -7,10 +9,10 @@
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
 Version:        0.9.10.2
-Release:        0.1.20061107%{?dist}
+Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}-%{snapdate}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
@@ -97,7 +99,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -258,7 +260,7 @@
 
 
 %changelog
-* Wed Nov  8 2006 Jens Petersen  - 0.9.10.2-0
+* Thu Nov 16 2006 Jens Petersen  - 0.9.10.2-0.1
 - update to latest darcs snapshot for ghc66
 - add soegtk and remove mogul ghc packages
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2006 01:19:03 -0000	1.3
+++ sources	16 Nov 2006 04:36:51 -0000	1.4
@@ -1 +1 @@
-1da9b3f4d89d411f07d746dcb23d3414  gtk2hs-0.9.10.2.tar.gz
+58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 04:44:05 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 15 Nov 2006 21:44:05 -0700
Subject: rpms/gtk2hs/FC-6 .cvsignore, 1.2, 1.3 gtk2hs.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200611160444.kAG4i5Sw011343@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11323

Modified Files:
	.cvsignore gtk2hs.spec sources 
Log Message:
sync with devel for ghc66
- update to latest darcs snapshot for ghc66
- add soegtk and remove mogul ghc packages



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 May 2006 03:18:55 -0000	1.2
+++ .cvsignore	16 Nov 2006 04:43:35 -0000	1.3
@@ -1 +1 @@
-gtk2hs-0.9.10.tar.gz
+gtk2hs-0.9.10.2-20061116.tar.gz


Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/gtk2hs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk2hs.spec	28 Sep 2006 05:37:36 -0000	1.5
+++ gtk2hs.spec	16 Nov 2006 04:43:35 -0000	1.6
@@ -1,17 +1,19 @@
-%define ghc_version 6.4.2
-%define ghcver ghc642
-#%%define mozver 1.5.0.6
+%define snapdate 20061116
+
+%define ghc_version 6.6
+%define ghcver ghc66
 
 %define build_mozembed 1
 %define build_cairo 1
 
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
-Version:        0.9.10
-Release:        4%{?dist}
+Version:        0.9.10.2
+Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapd
+ate:-%{snapdate}}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
@@ -60,8 +62,7 @@
 management, unicode support, and wide coverage of Gtk+ 2 widgets.
 
 This package also includes the bindings for cairo, gconf, glade, glib, and
-sourceview, and the mogul wrapper library.  The libraries are compiled for
-ghc-%{ghc_version}.
+sourceview.  The libraries are compiled for ghc-%{ghc_version}.
 
 
 %package doc
@@ -99,7 +100,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q %{?snapdate:-n %{name}-%{version}}
 
 
 %build
@@ -128,7 +129,7 @@
 make DESTDIR=%{buildroot} install
 
 # make ghost files
-for i in gconf glade glib gtk mogul sourceview \
+for i in gconf glade glib gtk sourceview soegtk \
 %if %{build_cairo}
         cairo \
 %endif
@@ -158,10 +159,10 @@
         cairo \
 %endif
         gtk \
-        mogul \
         gconf \
         glade \
         sourceview \
+	soegtk \
 ; do
 %{ghcpkg_inst $i}
 done
@@ -176,10 +177,10 @@
 %preun -n %{ghcver}-%{name}
 if [ "$1" = 0 ]; then
   for i in \
+	soegtk \
         gconf \
         glade \
         sourceview \
-        mogul \
         gtk \
 %if %{build_cairo}
         cairo \
@@ -218,35 +219,29 @@
 %{gtk2hsdir}/cairo.package.conf
 %{gtk2hsdir}/libHScairo.a
 %ghost %{gtk2hsdir}/HScairo.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/cairo
 %endif
 %{gtk2hsdir}/gconf.package.conf
 %{gtk2hsdir}/libHSgconf.a
 %ghost %{gtk2hsdir}/HSgconf.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/gconf
 %{gtk2hsdir}/glade.package.conf
 %{gtk2hsdir}/libHSglade.a
 %ghost %{gtk2hsdir}/HSglade.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/glade
 %{gtk2hsdir}/glib.package.conf
 %{gtk2hsdir}/libHSglib.a
 %ghost %{gtk2hsdir}/HSglib.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/glib
 %dir %{gtk2hsdir}/include
 %{gtk2hsdir}/include/gtk2hs-config.h
-%{gtk2hsdir}/mogul.package.conf
-%{gtk2hsdir}/libHSmogul.a
-%ghost %{gtk2hsdir}/HSmogul.o
-%dir %{gtk2hsdir}/imports
-%{gtk2hsdir}/imports/mogul
+%{gtk2hsdir}/soegtk.package.conf
+%{gtk2hsdir}/libHSsoegtk.a
+%ghost %{gtk2hsdir}/HSsoegtk.o
+%{gtk2hsdir}/imports/soegtk
 %{gtk2hsdir}/sourceview.package.conf
 %{gtk2hsdir}/libHSsourceview.a
 %ghost %{gtk2hsdir}/HSsourceview.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/sourceview
 
 
@@ -261,12 +256,15 @@
 %{gtk2hsdir}/mozembed.package.conf
 %{gtk2hsdir}/libHSmozembed.a
 %ghost %{gtk2hsdir}/HSmozembed.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/mozembed
 %endif
 
 
 %changelog
+* Thu Nov 16 2006 Jens Petersen  - 0.9.10.2-0.1
+- update to latest darcs snapshot for ghc66
+- add soegtk and remove mogul ghc packages
+
 * Thu Sep 28 2006 Jens Petersen  - 0.9.10-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 May 2006 03:18:55 -0000	1.2
+++ sources	16 Nov 2006 04:43:35 -0000	1.3
@@ -1 +1 @@
-13d300e07153f37ba5893ac336b078bc  gtk2hs-0.9.10.tar.gz
+58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 05:50:20 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 15 Nov 2006 22:50:20 -0700
Subject: rpms/gtk2hs/devel gtk2hs.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200611160550.kAG5oK1J014627@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14604

Modified Files:
	gtk2hs.spec sources 
Log Message:
fix tarball to really include those missing header files



Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk2hs.spec	16 Nov 2006 04:36:51 -0000	1.8
+++ gtk2hs.spec	16 Nov 2006 05:49:50 -0000	1.9
@@ -12,7 +12,7 @@
 Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}-%{snapdate}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
@@ -99,7 +99,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q %{?snapdate:-n %{name}-%{version}}
 
 
 %build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Nov 2006 04:36:51 -0000	1.4
+++ sources	16 Nov 2006 05:49:50 -0000	1.5
@@ -1 +1 @@
-58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz
+0ea8686c934318a590476d4046779ddf  gtk2hs-0.9.10.2-20061116.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 06:08:56 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:08:56 -0700
Subject: rpms/php-pear-SOAP - New directory
Message-ID: <200611160608.kAG68u8v017765@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761/php-pear-SOAP

Log Message:
Directory /cvs/extras/rpms/php-pear-SOAP added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 06:08:58 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:08:58 -0700
Subject: rpms/php-pear-SOAP/devel - New directory
Message-ID: <200611160608.kAG68w2i017774@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761/php-pear-SOAP/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-SOAP/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 06:09:28 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:09:28 -0700
Subject: rpms/php-pear-SOAP Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611160609.kAG69SVW017826@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17820

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-SOAP


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-SOAP
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 Nov 16 06:09:32 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:09:32 -0700
Subject: rpms/php-pear-SOAP/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611160609.kAG69WER017837@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17820/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-SOAP


--- 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 Nov 16 06:10:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:10:48 -0700
Subject: rpms/php-pear-SOAP/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-SOAP.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611160610.kAG6AmYs017978@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17934/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-SOAP.spec xml2changelog 
Log Message:
auto-import php-pear-SOAP-0.9.4-1.fc6 on branch devel from php-pear-SOAP-0.9.4-1.fc6.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-SOAP.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name SOAP

Name:           php-pear-SOAP
Version:        0.9.4
Release:        1%{?dist}
Summary:        Simple Object Access Protocol (SOAP) Client/Server for PHP

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/SOAP
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Requires:       php-pear(PEAR), php-pear(HTTP_Request)
Requires(hint): php-pear(Mail), php-pear(Mail_Mime), php-pear(Net_DIME)
Provides:       php-pear(%{pear_name}) = %{version}

%description
Implementation of Simple Object Access Protocol (SOAP) protocol and services.
 

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
%{__install} -m 644 -c %{SOURCE1} LICENSE

cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir


# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE docdir/*

%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/SOAP


%changelog
* Mon Nov  6 2006 Remi Collet  0.9.4-1
- initial RPM (generated specfile + cleanup)
- add CHANGELOG and LICENSE


--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-SOAP/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 06:09:32 -0000	1.1
+++ .cvsignore	16 Nov 2006 06:10:18 -0000	1.2
@@ -0,0 +1 @@
+SOAP-0.9.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-SOAP/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 06:09:32 -0000	1.1
+++ sources	16 Nov 2006 06:10:18 -0000	1.2
@@ -0,0 +1 @@
+87a26a8abc3ca75fdbe5d307e26102fa  SOAP-0.9.4.tgz



From fedora-extras-commits at redhat.com  Thu Nov 16 06:10:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:10:48 -0700
Subject: rpms/php-pear-SOAP import.log,1.1,1.2
Message-ID: <200611160610.kAG6AmAb017974@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17934

Modified Files:
	import.log 
Log Message:
auto-import php-pear-SOAP-0.9.4-1.fc6 on branch devel from php-pear-SOAP-0.9.4-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-SOAP/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 06:09:28 -0000	1.1
+++ import.log	16 Nov 2006 06:10:17 -0000	1.2
@@ -0,0 +1 @@
+php-pear-SOAP-0_9_4-1_fc6:HEAD:php-pear-SOAP-0.9.4-1.fc6.src.rpm:1163657408



From fedora-extras-commits at redhat.com  Thu Nov 16 06:16:25 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:16:25 -0700
Subject: owners owners.list,1.1970,1.1971
Message-ID: <200611160616.kAG6GPCF018048@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18032

Modified Files:
	owners.list 
Log Message:
	php-pear-SOAP : Simple Object Access Protocol (SOAP) Client/Server for PHP



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1970
retrieving revision 1.1971
diff -u -r1.1970 -r1.1971
--- owners.list	16 Nov 2006 04:07:48 -0000	1.1970
+++ owners.list	16 Nov 2006 06:15:55 -0000	1.1971
@@ -1818,6 +1818,7 @@
 Fedora Extras|php-pear-PHP-CompatInfo|Find out version and extensions required for a piece of code to run|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-SOAP|Simple Object Access Protocol (SOAP) Client/Server for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Smarty|Renderer driver using Smarty|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 06:26:45 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 15 Nov 2006 23:26:45 -0700
Subject: rpms/mlton/FC-6 .cvsignore, 1.2, 1.3 mlton-debuginfo.patch, 1.1,
	1.2 mlton.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200611160626.kAG6QjIT018186@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18161

Modified Files:
	.cvsignore mlton-debuginfo.patch mlton.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 13:51:57 -0000	1.2
+++ .cvsignore	16 Nov 2006 06:26:14 -0000	1.3
@@ -1,3 +1 @@
-mlton-20051202-1.src.tgz
-mlton-bootstrap.i386.tar.bz2
-mlton-bootstrap.ppc.tar.bz2
+mlton-20061107.tar.bz2

mlton-debuginfo.patch:

Index: mlton-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/mlton-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlton-debuginfo.patch	9 Jul 2006 13:51:57 -0000	1.1
+++ mlton-debuginfo.patch	16 Nov 2006 06:26:14 -0000	1.2
@@ -1,24 +1,24 @@
-diff -ur mlton-20051202~/bytecode/Makefile mlton-20051202/bytecode/Makefile
---- mlton-20051202~/bytecode/Makefile	2005-11-30 13:36:52.000000000 -0500
-+++ mlton-20051202/bytecode/Makefile	2006-06-25 18:14:13.000000000 -0400
+diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
+--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/bytecode/Makefile	2006-11-14 23:18:42.000000000 -0500
 @@ -10,7 +10,7 @@
  all: interpret.o interpret-gdb.o print-opcodes
  
  CC = gcc -std=gnu99
 -CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
 +CFLAGS = -fomit-frame-pointer -g -I../runtime -I../include -Wall
- 
- ifeq ($(TARGET_ARCH), amd64)
- CFLAGS += -mtune=opteron -m32 
-diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
---- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
-+++ mlton-20051202/Makefile	2006-06-25 18:13:45.000000000 -0400
-@@ -402,17 +402,6 @@
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
+diff -ur mlton-20061107~/Makefile mlton-20061107/Makefile
+--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
++++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
+@@ -411,17 +411,6 @@
  	if $(GZIP_MAN); then						\
  		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
  	fi
 -	case "$(TARGET_OS)" in						\
--	cygwin|darwin|solaris)						\
+-	aix|cygwin|darwin|solaris)					\
 -	;;								\
 -	*)								\
 -		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
@@ -31,15 +31,15 @@
  
  .PHONY: install-docs
  install-docs:
-diff -ur mlton-20051202~/runtime/Makefile mlton-20051202/runtime/Makefile
---- mlton-20051202~/runtime/Makefile	2005-11-29 18:05:07.000000000 -0500
-+++ mlton-20051202/runtime/Makefile	2006-06-25 18:13:45.000000000 -0400
+diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
+--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/runtime/Makefile	2006-11-14 23:20:40.000000000 -0500
 @@ -49,7 +49,7 @@
  endif
  
  CC = gcc -std=gnu99
 -CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
 +CFLAGS = -O2 -Wall -g -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
- DEBUGFLAGS = $(CFLAGS) -gstabs+ -g2
- 
- CFILES = 							\
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/mlton.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlton.spec	1 Sep 2006 03:16:33 -0000	1.3
+++ mlton.spec	16 Nov 2006 06:26:14 -0000	1.4
@@ -1,14 +1,14 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20051202
-Release:	8%{?dist}.1
+Version:	20061107
+Release:	1%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	BSD style and MIT
 URL:		http://mlton.org/
-Source0:	http://mlton.org/pages/Download/attachments/mlton-%{version}-1.src.tgz
+Source0:	mlton-%{version}.tar.bz2
 %if %{mlton_bootstrap}
 # taken from mlton_20060213-1 from Debian
 Source1:	mlton-bootstrap.i386.tar.bz2
@@ -21,7 +21,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gmp-devel htmldoc tetex-latex which
+BuildRequires:	gmp-devel htmldoc tetex-latex
 %if ! %{mlton_bootstrap}
 BuildRequires:	mlton
 %endif
@@ -44,6 +44,9 @@
 %prep
 %setup -q
 
+# instantiate version numbers
+make version
+
 # build documentation as PDF
 %patch -P 0 -p1
 # enable -g and disable strip so debuginfo packages work
@@ -100,6 +103,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 12 2006 Adam Goode  - 20061107-1
+- New release, taken from svn://mlton.org/mlton/tags/on-20061107
+
 * Thu Aug 31 2006 Adam Goode  - 20051202-8.1
 - Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 13:51:57 -0000	1.2
+++ sources	16 Nov 2006 06:26:14 -0000	1.3
@@ -1,3 +1 @@
-766b25e39dff36da5f3ed81effd5471b  mlton-20051202-1.src.tgz
-34f8bf4c11cca4867beb3bccab04b0a5  mlton-bootstrap.i386.tar.bz2
-16358b27a8f86ec1aede640fff1c77ff  mlton-bootstrap.ppc.tar.bz2
+eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 07:37:31 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 16 Nov 2006 00:37:31 -0700
Subject: rpms/brasero/devel .cvsignore, 1.3, 1.4 brasero.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611160737.kAG7bVkZ021726@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21706

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
Update to 0.5.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Oct 2006 10:05:09 -0000	1.3
+++ .cvsignore	16 Nov 2006 07:37:00 -0000	1.4
@@ -1 +1 @@
-brasero-0.5.0.tar.bz2
+brasero-0.5.1.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brasero.spec	30 Oct 2006 10:05:09 -0000	1.2
+++ brasero.spec	16 Nov 2006 07:37:00 -0000	1.3
@@ -1,6 +1,6 @@
 
 Name:      brasero
-Version:   0.5.0
+Version:   0.5.1
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Denis Leroy  - 0.5.1-1
+- Update to 0.5.1
+
 * Sun Oct 29 2006 Denis Leroy  - 0.5.0-1
 - Update to 0.5.0
 - Updated icon paths


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Oct 2006 10:05:09 -0000	1.3
+++ sources	16 Nov 2006 07:37:00 -0000	1.4
@@ -1 +1 @@
-9cf947c4ca681e9ee66600022e697c80  brasero-0.5.0.tar.bz2
+f578d2aaf6b434f91beb935f112728e2  brasero-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 07:40:46 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 16 Nov 2006 00:40:46 -0700
Subject: rpms/brasero/FC-6 .cvsignore, 1.3, 1.4 brasero.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611160740.kAG7ek5T021814@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21790

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
Update to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Oct 2006 09:31:24 -0000	1.3
+++ .cvsignore	16 Nov 2006 07:40:16 -0000	1.4
@@ -1 +1 @@
-brasero-0.5.0.tar.bz2
+brasero-0.5.1.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/brasero.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brasero.spec	30 Oct 2006 09:31:24 -0000	1.2
+++ brasero.spec	16 Nov 2006 07:40:16 -0000	1.3
@@ -1,6 +1,6 @@
 
 Name:      brasero
-Version:   0.5.0
+Version:   0.5.1
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Denis Leroy  - 0.5.1-1
+- Update to 0.5.1
+
 * Sun Oct 29 2006 Denis Leroy  - 0.5.0-1
 - Update to 0.5.0
 - Updated icon paths


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Oct 2006 09:31:24 -0000	1.3
+++ sources	16 Nov 2006 07:40:16 -0000	1.4
@@ -1 +1 @@
-9cf947c4ca681e9ee66600022e697c80  brasero-0.5.0.tar.bz2
+f578d2aaf6b434f91beb935f112728e2  brasero-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 07:51:02 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 16 Nov 2006 00:51:02 -0700
Subject: rpms/gtk2hs/FC-6 sources,1.3,1.4
Message-ID: <200611160751.kAG7p2KF021933@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21915

Modified Files:
	sources 
Log Message:
fixed tarball



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2006 04:43:35 -0000	1.3
+++ sources	16 Nov 2006 07:50:32 -0000	1.4
@@ -1 +1 @@
-58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz
+0ea8686c934318a590476d4046779ddf  gtk2hs-0.9.10.2-20061116.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 07:54:58 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 16 Nov 2006 00:54:58 -0700
Subject: rpms/gtk2hs/FC-6 gtk2hs.spec,1.6,1.7
Message-ID: <200611160754.kAG7swaP022002@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21981

Modified Files:
	gtk2hs.spec 
Log Message:
fix the mispasted source line



Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/gtk2hs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk2hs.spec	16 Nov 2006 04:43:35 -0000	1.6
+++ gtk2hs.spec	16 Nov 2006 07:54:27 -0000	1.7
@@ -12,8 +12,7 @@
 Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapd
-ate:-%{snapdate}}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}



From fedora-extras-commits at redhat.com  Thu Nov 16 07:55:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 00:55:53 -0700
Subject: rpms/wine/devel .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 wine-README-Fedora, 1.1, 1.2 wine-notepad.desktop, 1.1,
	1.2 wine-regedit.desktop, 1.1, 1.2 wine-uninstaller.desktop, 1.1,
	1.2 wine-winecfg.desktop, 1.1, 1.2 wine-winefile.desktop, 1.1,
	1.2 wine-winhelp.desktop, 1.1, 1.2 wine.init, 1.3, 1.4 wine.spec,
	1.38, 1.39
Message-ID: <200611160755.kAG7trGj022107@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22000/devel

Modified Files:
	.cvsignore sources wine-README-Fedora wine-notepad.desktop 
	wine-regedit.desktop wine-uninstaller.desktop 
	wine-winecfg.desktop wine-winefile.desktop 
	wine-winhelp.desktop wine.init wine.spec 
Log Message:
- version upgrade
- fix init script (#213230)
- fix twain subpackage content (#213396)
- create wine submenu (#205024)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	28 Oct 2006 05:51:35 -0000	1.25
+++ .cvsignore	16 Nov 2006 07:55:22 -0000	1.26
@@ -1 +1 @@
-wine-0.9.24-fe.tar.bz2
+wine-0.9.25-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	28 Oct 2006 05:51:35 -0000	1.26
+++ sources	16 Nov 2006 07:55:23 -0000	1.27
@@ -1 +1 @@
-1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2
+4d26cc14b481f2ab7026c23d83086753  wine-0.9.25-fe.tar.bz2


Index: wine-README-Fedora
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-README-Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-README-Fedora	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-README-Fedora	16 Nov 2006 07:55:23 -0000	1.2
@@ -1,15 +1,22 @@
-Wine directory structure used in Fedora Core Linux:
-===================================================
+Wine directory structure used in Fedora Linux:
+==============================================
 
-\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
-default. It is created with (empty) C:\windows and C:\windows\system
+${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for it 
+by default. It is created with (empty) C:\windows and C:\windows\system
 directories, needed to operate Wine without an existing Windows
-installation, if it doesn't already exists.
+installation, if it does not already exist.
 
 If you want to use Wine with an existing Windows installation that is
 mounted, for example, in /mnt/windows-c, change the symlink
-\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
+${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
 defaults set by installation.
 
-If you do this, you can safely remove \${HOME}/.wine/drive_c.
-(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)
+If you do this, you can safely remove ${HOME}/.wine/drive_c.
+(Alternatively, just mount your Windows partition to ${HOME}/.wine/drive_c.)
+
+Wine bugs:
+==========
+If you find a bug, please take the time to move your ${HOME}/.wine directory
+someplace and try with a fresh version (like mv ${HOME}/.wine{,-save}). If the
+bug is still there look trough https://bugzilla.redhat.com and see if the bug
+is already reported. In case it is not please report it.


Index: wine-notepad.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-notepad.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-notepad.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-notepad.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-regedit.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-regedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-regedit.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-regedit.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-uninstaller.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-uninstaller.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-uninstaller.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-uninstaller.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winecfg.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-winecfg.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winecfg.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winecfg.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winefile.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-winefile.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winefile.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winefile.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winhelp.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-winhelp.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winhelp.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winhelp.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine.init
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine.init	2 Jan 2006 09:04:37 -0000	1.3
+++ wine.init	16 Nov 2006 07:55:23 -0000	1.4
@@ -11,10 +11,15 @@
 RETVAL=0
 
 start() {
-	echo -n $"Registering binary handler for Windows applications"
-	/sbin/modprobe binfmt_misc &>/dev/null
-	echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
-	echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+# fix bug on changing runlevels #213230
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+	    echo -n $"Binary handler for Windows applications already registered"
+	else	
+	    echo -n $"Registering binary handler for Windows applications"
+	    /sbin/modprobe binfmt_misc &>/dev/null
+	    echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	    echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	fi
 }
 
 stop() {


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wine.spec	28 Oct 2006 05:51:35 -0000	1.38
+++ wine.spec	16 Nov 2006 07:55:23 -0000	1.39
@@ -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.24
+Version:	0.9.25
 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.24-fe.tar.bz2
+Source0:        wine-0.9.25-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -515,7 +515,6 @@
 %{_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
@@ -657,6 +656,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/wine/twain.dll16
 %{_libdir}/wine/twain_32.dll.so
+%{_libdir}/wine/sane.ds.so
 
 %files capi
 %defattr(-,root,root,-)
@@ -691,6 +691,13 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* 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)
+
 * Sat Oct 28 2006 Andreas Bierfert 
 0.9.24-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Nov 16 07:55:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 00:55:52 -0700
Subject: rpms/wine/FC-6 .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 wine-README-Fedora, 1.1, 1.2 wine-notepad.desktop, 1.1,
	1.2 wine-regedit.desktop, 1.1, 1.2 wine-uninstaller.desktop, 1.1,
	1.2 wine-winecfg.desktop, 1.1, 1.2 wine-winefile.desktop, 1.1,
	1.2 wine-winhelp.desktop, 1.1, 1.2 wine.init, 1.3, 1.4 wine.spec,
	1.38, 1.39
Message-ID: <200611160755.kAG7tq4B022093@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22000/FC-6

Modified Files:
	.cvsignore sources wine-README-Fedora wine-notepad.desktop 
	wine-regedit.desktop wine-uninstaller.desktop 
	wine-winecfg.desktop wine-winefile.desktop 
	wine-winhelp.desktop wine.init wine.spec 
Log Message:
- version upgrade
- fix init script (#213230)
- fix twain subpackage content (#213396)
- create wine submenu (#205024)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	28 Oct 2006 05:51:29 -0000	1.25
+++ .cvsignore	16 Nov 2006 07:55:22 -0000	1.26
@@ -1 +1 @@
-wine-0.9.24-fe.tar.bz2
+wine-0.9.25-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	28 Oct 2006 05:51:29 -0000	1.26
+++ sources	16 Nov 2006 07:55:22 -0000	1.27
@@ -1 +1 @@
-1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2
+4d26cc14b481f2ab7026c23d83086753  wine-0.9.25-fe.tar.bz2


Index: wine-README-Fedora
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-README-Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-README-Fedora	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-README-Fedora	16 Nov 2006 07:55:22 -0000	1.2
@@ -1,15 +1,22 @@
-Wine directory structure used in Fedora Core Linux:
-===================================================
+Wine directory structure used in Fedora Linux:
+==============================================
 
-\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
-default. It is created with (empty) C:\windows and C:\windows\system
+${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for it 
+by default. It is created with (empty) C:\windows and C:\windows\system
 directories, needed to operate Wine without an existing Windows
-installation, if it doesn't already exists.
+installation, if it does not already exist.
 
 If you want to use Wine with an existing Windows installation that is
 mounted, for example, in /mnt/windows-c, change the symlink
-\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
+${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
 defaults set by installation.
 
-If you do this, you can safely remove \${HOME}/.wine/drive_c.
-(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)
+If you do this, you can safely remove ${HOME}/.wine/drive_c.
+(Alternatively, just mount your Windows partition to ${HOME}/.wine/drive_c.)
+
+Wine bugs:
+==========
+If you find a bug, please take the time to move your ${HOME}/.wine directory
+someplace and try with a fresh version (like mv ${HOME}/.wine{,-save}). If the
+bug is still there look trough https://bugzilla.redhat.com and see if the bug
+is already reported. In case it is not please report it.


Index: wine-notepad.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-notepad.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-notepad.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-notepad.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-regedit.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-regedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-regedit.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-regedit.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-uninstaller.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-uninstaller.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-uninstaller.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-uninstaller.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winecfg.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-winecfg.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winecfg.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winecfg.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winefile.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-winefile.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winefile.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winefile.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winhelp.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-winhelp.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winhelp.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winhelp.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine.init
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine.init	2 Jan 2006 09:04:37 -0000	1.3
+++ wine.init	16 Nov 2006 07:55:22 -0000	1.4
@@ -11,10 +11,15 @@
 RETVAL=0
 
 start() {
-	echo -n $"Registering binary handler for Windows applications"
-	/sbin/modprobe binfmt_misc &>/dev/null
-	echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
-	echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+# fix bug on changing runlevels #213230
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+	    echo -n $"Binary handler for Windows applications already registered"
+	else	
+	    echo -n $"Registering binary handler for Windows applications"
+	    /sbin/modprobe binfmt_misc &>/dev/null
+	    echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	    echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	fi
 }
 
 stop() {


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wine.spec	28 Oct 2006 05:51:29 -0000	1.38
+++ wine.spec	16 Nov 2006 07:55:22 -0000	1.39
@@ -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.24
+Version:	0.9.25
 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.24-fe.tar.bz2
+Source0:        wine-0.9.25-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -515,7 +515,6 @@
 %{_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
@@ -657,6 +656,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/wine/twain.dll16
 %{_libdir}/wine/twain_32.dll.so
+%{_libdir}/wine/sane.ds.so
 
 %files capi
 %defattr(-,root,root,-)
@@ -691,6 +691,13 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* 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)
+
 * Sat Oct 28 2006 Andreas Bierfert 
 0.9.24-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Nov 16 09:42:43 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 16 Nov 2006 02:42:43 -0700
Subject: fedora-security/audit fc5,1.394,1.395 fc6,1.146,1.147
Message-ID: <200611160942.kAG9gh6R028676@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28656

Modified Files:
	fc5 fc6 
Log Message:
Fix elinks CVE name



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- fc5	15 Nov 2006 19:08:05 -0000	1.394
+++ fc5	16 Nov 2006 09:42:40 -0000	1.395
@@ -1,9 +1,9 @@
-Up to date CVE as of CVE email 20061114
-Up to date FC5 as of 20061114
+Up to date CVE as of CVE email 20061115
+Up to date FC5 as of 20061115
 
 ** are items that need attention
 
-CVE-2006-5924 VULNERABLE (elinks) [#215734]
+CVE-2006-5925 VULNERABLE (elinks) [#215734]
 CVE-2006-5823 backport (kernel) [since FEDORA-2006-1221]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- fc6	15 Nov 2006 19:08:05 -0000	1.146
+++ fc6	16 Nov 2006 09:42:40 -0000	1.147
@@ -1,9 +1,9 @@
-Up to date CVE as of CVE email 20061114
-Up to date FC6 as of 20061114
+Up to date CVE as of CVE email 20061115
+Up to date FC6 as of 20061115
 
 ** are items that need attention
 
-CVE-2006-5924 ignore (elinks) no smbclient support
+CVE-2006-5925 ignore (elinks) no smbclient support
 CVE-2006-5823 backport (kernel) [since FEDORA-2006-1223]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed



From fedora-extras-commits at redhat.com  Thu Nov 16 11:03:11 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 16 Nov 2006 04:03:11 -0700
Subject: rpms/proftpd/devel proftpd-1.3.0-mod_tls.patch, NONE,
	1.1 proftpd.spec, 1.21, 1.22
Message-ID: <200611161103.kAGB3B2u002762@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2740

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.0-mod_tls.patch 
Log Message:
Include mod_tls patch (#214820 too).


proftpd-1.3.0-mod_tls.patch:

--- NEW FILE proftpd-1.3.0-mod_tls.patch ---
This is a possible fix Ralf S. Engelschall 
has made myself for the X.509 issue of mod_tls.c

Index: contrib/mod_tls.c
--- contrib/mod_tls.c.orig      2005-11-08 18:59:49 +0100
+++ contrib/mod_tls.c   2006-11-15 17:54:43 +0100
@@ -2421,6 +2421,8 @@
      datalen = BIO_get_mem_data(mem, &data);

   if (data) {
+    if (datalen > sizeof(buf)-1)
+        datalen = sizeof(buf)-1;
     memset(&buf, '\0', sizeof(buf));
     memcpy(buf, data, datalen);
     buf[datalen] = '\0';


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- proftpd.spec	13 Nov 2006 18:10:35 -0000	1.21
+++ proftpd.spec	16 Nov 2006 11:02:41 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -15,6 +15,7 @@
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
 Patch2: proftpd-1.3.0-cmdbufsize.patch
+Patch3: proftpd-1.3.0-mod_tls.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +69,7 @@
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
 %patch2 -p0 -b .cmdbufsize
+%patch3 -p0 -b .mod_tls
 
 
 %build
@@ -188,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Matthias Saou  1.3.0-9
+- Include mod_tls patch (#214820 too).
+
 * Mon Nov 13 2006 Matthias Saou  1.3.0-8
 - Include cmdbufsize patch (#214820).
 



From fedora-extras-commits at redhat.com  Thu Nov 16 15:24:33 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:24:33 -0700
Subject: owners owners.list,1.1971,1.1972
Message-ID: <200611161524.kAGFOXT6016235@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16219

Modified Files:
	owners.list 
Log Message:
Add emerald-themes


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1971
retrieving revision 1.1972
diff -u -r1.1971 -r1.1972
--- owners.list	16 Nov 2006 06:15:55 -0000	1.1971
+++ owners.list	16 Nov 2006 15:24:03 -0000	1.1972
@@ -361,6 +361,7 @@
 Fedora Extras|embryo|A C like scripting language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|emerald|Beryl OpenGL window and compositing manager window decorator|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|emerald-themes|Themes for Emerald, a Beryl OpenGL window and compositing manager window decorator|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 15:25:49 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:25:49 -0700
Subject: rpms/emerald-themes - New directory
Message-ID: <200611161525.kAGFPnAC016293@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16289/emerald-themes

Log Message:
Directory /cvs/extras/rpms/emerald-themes added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 15:25:50 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:25:50 -0700
Subject: rpms/emerald-themes/devel - New directory
Message-ID: <200611161525.kAGFPogd016307@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16289/emerald-themes/devel

Log Message:
Directory /cvs/extras/rpms/emerald-themes/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 15:26:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:26:01 -0700
Subject: rpms/emerald-themes Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611161526.kAGFQ1m9016338@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16332

Added Files:
	Makefile import.log 
Log Message:
Setup of module emerald-themes


--- NEW FILE Makefile ---
# Top level Makefile for module emerald-themes
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 Nov 16 15:26:07 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:26:07 -0700
Subject: rpms/emerald-themes/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611161526.kAGFQ78O016356@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16332/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emerald-themes


--- 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 Nov 16 15:26:58 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:26:58 -0700
Subject: rpms/emerald-themes/devel emerald-themes.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611161526.kAGFQwp9016432@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emerald-themes.spec 
Log Message:
auto-import emerald-themes-0.1.2-2.fc7 on branch devel from emerald-themes-0.1.2-2.fc7.src.rpm


--- NEW FILE emerald-themes.spec ---
Name:           emerald-themes
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        2%{?dist}

Summary:        Themes for Emerald, the window decorator for Beryl
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

BuildArch:      noarch

Requires:       beryl-core >= %{version}, emerald >= %{version}
BuildRequires:  libtool


%description
Emerald is themeable window decorator and compositing 
manager for Beryl. Launch Theme Manager from
beryl-manager to change themes.

This package contains themes for emerald.


%prep
%setup -q
#autoreconf -v --install

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*~" | xargs rm -f
chmod a+r $RPM_BUILD_ROOT%{_datadir}/emerald/themes/Scaled_Black_Mod/*
rm -f $RPM_BUILD_ROOT%{_datadir}/emerald/themes/import.sh

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_datadir}/emerald/*


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarball, now that there is one
- Remove import.sh, only used during build

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Fix perms on Scaled_Black_Mod theme
- Add missing BR: libtool

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core and emerald of at least the same version
- Move autoreconf bits to prep section

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emerald-themes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 15:26:07 -0000	1.1
+++ .cvsignore	16 Nov 2006 15:26:28 -0000	1.2
@@ -0,0 +1 @@
+emerald-themes-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emerald-themes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 15:26:07 -0000	1.1
+++ sources	16 Nov 2006 15:26:28 -0000	1.2
@@ -0,0 +1 @@
+c5aa35e30d3476f05a469f1baac16341  emerald-themes-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 15:26:57 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:26:57 -0700
Subject: rpms/emerald-themes import.log,1.1,1.2
Message-ID: <200611161526.kAGFQvhP016428@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16396

Modified Files:
	import.log 
Log Message:
auto-import emerald-themes-0.1.2-2.fc7 on branch devel from emerald-themes-0.1.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/emerald-themes/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 15:26:01 -0000	1.1
+++ import.log	16 Nov 2006 15:26:27 -0000	1.2
@@ -0,0 +1 @@
+emerald-themes-0_1_2-2_fc7:HEAD:emerald-themes-0.1.2-2.fc7.src.rpm:1163690784



From fedora-extras-commits at redhat.com  Thu Nov 16 16:22:28 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 16 Nov 2006 09:22:28 -0700
Subject: rpms/swaks/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 swaks.spec, 
	1.3, 1.4
Message-ID: <200611161622.kAGGMSdc019784@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/swaks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19764

Modified Files:
	.cvsignore sources swaks.spec 
Log Message:
* Thu Nov 16 2006 Jason L Tibbitts III  - 20061116.0-1
- Update to 20061116.0.
- Add perl(Digest::SHA1) requirement.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/swaks/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2006 01:40:04 -0000	1.2
+++ .cvsignore	16 Nov 2006 16:21:57 -0000	1.3
@@ -1 +1 @@
-swaks.20060621.0
+swaks.20061116.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/swaks/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2006 01:40:04 -0000	1.2
+++ sources	16 Nov 2006 16:21:57 -0000	1.3
@@ -1 +1 @@
-c2ae5a5466e663bb7649377c6951fad6  swaks.20060621.0
+0be5dfe89ec415f0296680d61b3e4849  swaks.20061116.0


Index: swaks.spec
===================================================================
RCS file: /cvs/extras/rpms/swaks/devel/swaks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- swaks.spec	1 Sep 2006 01:40:04 -0000	1.3
+++ swaks.spec	16 Nov 2006 16:21:57 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           swaks
-Version:        20060621.0
+Version:        20061116.0
 Release:        1%{?dist}
 Summary:        Command-line SMTP transaction tester
 
@@ -11,6 +11,7 @@
 BuildArch:	noarch
 
 Requires:	perl(Authen::DigestMD5)
+Requires:	perl(Digest::SHA1)
 Requires:	perl(Net::DNS)
 Requires:	perl(Net::SSLeay)
 Requires:	perl(Time::HiRes)
@@ -40,6 +41,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 16 2006 Jason L Tibbitts III  - 20061116.0-1
+- Update to 20061116.0.
+- Add perl(Digest::SHA1) requirement.
+
 * Thu Aug 31 2006 Jason L Tibbitts III  - 20060621.0-1
 - Update to 20060621.0.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 16:24:04 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 16 Nov 2006 09:24:04 -0700
Subject: rpms/swaks/devel swaks.20050709.1,1.1,NONE
Message-ID: <200611161624.kAGGO4XC019815@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/swaks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19810

Removed Files:
	swaks.20050709.1 
Log Message:
Remove errant file.



--- swaks.20050709.1 DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 16 16:57:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 09:57:46 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200611161657.kAGGvkDZ020188@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20137/FC-5

Modified Files:
	perl-Moose.spec sources 
Log Message:
update to 0.17



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Moose.spec	6 Nov 2006 18:49:27 -0000	1.6
+++ perl-Moose.spec	16 Nov 2006 16:57:15 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.15
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-1
+- update to 0.17
+
 * Mon Nov 06 2006 Chris Weyl  0.15-1
 - update to 0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Nov 2006 18:49:27 -0000	1.5
+++ sources	16 Nov 2006 16:57:15 -0000	1.6
@@ -1 +1 @@
-0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz
+42de30613ed0f127a88bd65876eddd27  Moose-0.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 16:57:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 09:57:46 -0700
Subject: rpms/perl-Moose/FC-6 perl-Moose.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200611161657.kAGGvkNC020192@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20137/FC-6

Modified Files:
	perl-Moose.spec sources 
Log Message:
update to 0.17



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-6/perl-Moose.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Moose.spec	6 Nov 2006 18:49:27 -0000	1.6
+++ perl-Moose.spec	16 Nov 2006 16:57:16 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.15
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-1
+- update to 0.17
+
 * Mon Nov 06 2006 Chris Weyl  0.15-1
 - update to 0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Nov 2006 18:49:27 -0000	1.5
+++ sources	16 Nov 2006 16:57:16 -0000	1.6
@@ -1 +1 @@
-0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz
+42de30613ed0f127a88bd65876eddd27  Moose-0.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 16:57:47 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 09:57:47 -0700
Subject: rpms/perl-Moose/devel .cvsignore, 1.5, 1.6 perl-Moose.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200611161657.kAGGvl5p020197@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20137/devel

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
update to 0.17



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Nov 2006 18:49:28 -0000	1.5
+++ .cvsignore	16 Nov 2006 16:57:17 -0000	1.6
@@ -1 +1 @@
-Moose-0.15.tar.gz
+Moose-0.17.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Moose.spec	6 Nov 2006 18:49:28 -0000	1.6
+++ perl-Moose.spec	16 Nov 2006 16:57:17 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.15
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-1
+- update to 0.17
+
 * Mon Nov 06 2006 Chris Weyl  0.15-1
 - update to 0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Nov 2006 18:49:28 -0000	1.5
+++ sources	16 Nov 2006 16:57:17 -0000	1.6
@@ -1 +1 @@
-0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz
+42de30613ed0f127a88bd65876eddd27  Moose-0.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 17:18:10 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 16 Nov 2006 10:18:10 -0700
Subject: rpms/jd/devel .cvsignore, 1.17, 1.18 jd.spec, 1.24, 1.25 sources,
	1.17, 1.18
Message-ID: <200611161718.kAGHIAQ7023467@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23443

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Nov 16 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061116
- cvs 061116 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	14 Nov 2006 13:50:57 -0000	1.17
+++ .cvsignore	16 Nov 2006 17:17:39 -0000	1.18
@@ -1 +1 @@
-jd-1.8.0-061114.tgz
+jd-1.8.1-cvs061116.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jd.spec	14 Nov 2006 13:50:58 -0000	1.24
+++ jd.spec	16 Nov 2006 17:17:39 -0000	1.25
@@ -9,8 +9,8 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      1.8.0
-%define         strtag        061114
+%define         main_ver      1.8.1
+%define         strtag        cvs061116
 %define         repoid        22722
 
 
@@ -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}
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Nov 16 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061116
+- cvs 061116 (23:59 JST)
+
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	14 Nov 2006 13:50:58 -0000	1.17
+++ sources	16 Nov 2006 17:17:39 -0000	1.18
@@ -1 +1 @@
-1dc9ecba8d7430af27ed461155eb6708  jd-1.8.0-061114.tgz
+5861afcc6d6894864510a8768ce3e4fd  jd-1.8.1-cvs061116.tgz



From fedora-extras-commits at redhat.com  Thu Nov 16 17:22:03 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 16 Nov 2006 10:22:03 -0700
Subject: rpms/gossip/devel .cvsignore, 1.16, 1.17 gossip.spec, 1.31,
	1.32 sources, 1.16, 1.17
Message-ID: <200611161722.kAGHM3ct023550@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23530

Modified Files:
	.cvsignore gossip.spec sources 
Log Message:
* Thu Nov 16 2006 Brian Pepple  - 0.19-1
- Update to 0.19.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Oct 2006 00:31:50 -0000	1.16
+++ .cvsignore	16 Nov 2006 17:21:32 -0000	1.17
@@ -1 +1 @@
-gossip-0.18.tar.bz2
+gossip-0.19.tar.bz2


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gossip.spec	17 Oct 2006 00:31:50 -0000	1.31
+++ gossip.spec	16 Nov 2006 17:21:33 -0000	1.32
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           gossip
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        Gnome Jabber Client
 
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Brian Pepple  - 0.19-1
+- Update to 0.19.
+
 * Mon Oct 16 2006 Brian Pepple  - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Oct 2006 00:31:50 -0000	1.16
+++ sources	16 Nov 2006 17:21:33 -0000	1.17
@@ -1 +1 @@
-bb5be4bcb259c36c64e1809b665f7de6  gossip-0.18.tar.bz2
+49c60c4467d17948f7243a169c65775c  gossip-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 17:29:37 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 16 Nov 2006 10:29:37 -0700
Subject: rpms/perl-File-MimeInfo/devel perl-File-MimeInfo.spec,1.1,1.2
Message-ID: <200611161729.kAGHTbdS023656@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23640

Modified Files:
	perl-File-MimeInfo.spec 
Log Message:
* Thu Nov 16 2006 Patrice Dumas  0.13-3
- add a Requires on shared-mime-info (Bug #215972)



Index: perl-File-MimeInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/devel/perl-File-MimeInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-MimeInfo.spec	14 Oct 2006 21:42:51 -0000	1.1
+++ perl-File-MimeInfo.spec	16 Nov 2006 17:29:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-File-MimeInfo
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Determine file type and open application
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(File::BaseDir) perl(File::DesktopEntry)
+Requires:       shared-mime-info
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas  0.13-3
+- add a Requires on shared-mime-info (Bug #215972)
+
 * Wed Oct 11 2006 Patrice Dumas  0.13-2
 - add an option to launch mimeopen non interactively
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:31:29 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 16 Nov 2006 10:31:29 -0700
Subject: rpms/ochusha/devel .cvsignore, 1.6, 1.7 ochusha.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611161731.kAGHVT6S023803@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23740

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Thu Nov 16 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061116
- Update to 0.5.99.63.3 cvs 061116



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Nov 2006 15:54:01 -0000	1.6
+++ .cvsignore	16 Nov 2006 17:30:59 -0000	1.7
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061114.tar.bz2
+ochusha-0.5.99.63.3-cvs061116.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ochusha.spec	14 Nov 2006 15:54:01 -0000	1.6
+++ ochusha.spec	16 Nov 2006 17:30:59 -0000	1.7
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.3
-%define              strtag          cvs061114
+%define              strtag          cvs061116
 
 %define              vendor_rel      2
 %define              pre_release     1
@@ -150,8 +150,8 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Tue Nov 14 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061114
-- Update to 0.5.99.63.3 cvs 061114
+* Thu Nov 16 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061116
+- Update to 0.5.99.63.3 cvs 061116
 
 * Fri Nov 03 2006  0.5.99.62-1
 - Version down.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Nov 2006 15:54:01 -0000	1.6
+++ sources	16 Nov 2006 17:30:59 -0000	1.7
@@ -1 +1 @@
-2ffa3fb15ca8b3b1f75f0d7400cc3e8a  ochusha-0.5.99.63.3-cvs061114.tar.bz2
+a4f068bb0c128688a050bda77c1a31cb  ochusha-0.5.99.63.3-cvs061116.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 17:31:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 10:31:36 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.7,1.8
Message-ID: <200611161731.kAGHVaY0023808@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738/FC-5

Modified Files:
	perl-Moose.spec 
Log Message:
add new conditional br's for tests



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Moose.spec	16 Nov 2006 16:57:15 -0000	1.7
+++ perl-Moose.spec	16 Nov 2006 17:31:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Moose
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -27,6 +27,8 @@
 # commented out as Locale::US's license is ambiguous at the moment, precluding
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
+# optional test #4 (yes, I know IO::File is core)
+BuildRequires:  perl(IO::File), perl(IO::String)
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -75,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-2
+- add IO::File and IO::String to br's for testing
+
 * Thu Nov 16 2006 Chris Weyl  0.17-1
 - update to 0.17
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:31:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 10:31:37 -0700
Subject: rpms/perl-Moose/FC-6 perl-Moose.spec,1.7,1.8
Message-ID: <200611161731.kAGHVbEm023811@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738/FC-6

Modified Files:
	perl-Moose.spec 
Log Message:
add new conditional br's for tests



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-6/perl-Moose.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Moose.spec	16 Nov 2006 16:57:16 -0000	1.7
+++ perl-Moose.spec	16 Nov 2006 17:31:07 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Moose
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -27,6 +27,8 @@
 # commented out as Locale::US's license is ambiguous at the moment, precluding
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
+# optional test #4 (yes, I know IO::File is core)
+BuildRequires:  perl(IO::File), perl(IO::String)
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -75,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-2
+- add IO::File and IO::String to br's for testing
+
 * Thu Nov 16 2006 Chris Weyl  0.17-1
 - update to 0.17
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:31:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 10:31:43 -0700
Subject: rpms/perl-Moose/devel perl-Moose.spec,1.7,1.8
Message-ID: <200611161731.kAGHVh2P023814@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738/devel

Modified Files:
	perl-Moose.spec 
Log Message:
add new conditional br's for tests



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Moose.spec	16 Nov 2006 16:57:17 -0000	1.7
+++ perl-Moose.spec	16 Nov 2006 17:31:13 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Moose
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -27,6 +27,8 @@
 # commented out as Locale::US's license is ambiguous at the moment, precluding
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
+# optional test #4 (yes, I know IO::File is core)
+BuildRequires:  perl(IO::File), perl(IO::String)
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -75,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-2
+- add IO::File and IO::String to br's for testing
+
 * Thu Nov 16 2006 Chris Weyl  0.17-1
 - update to 0.17
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:33:38 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 16 Nov 2006 10:33:38 -0700
Subject: check-mirrors check-mirrors.py, 1.32, 1.33 return-mirrorlist.py,
	1.19, 1.20
Message-ID: <200611161733.kAGHXcbn023888@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23868

Modified Files:
	check-mirrors.py return-mirrorlist.py 
Log Message:
Changes submitted by Mike Canann


Index: check-mirrors.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- check-mirrors.py	26 Oct 2006 20:57:52 -0000	1.32
+++ check-mirrors.py	16 Nov 2006 17:33:36 -0000	1.33
@@ -74,7 +74,7 @@
 
 class RepoDB:
     def __init__(self, db):
-        (self.dbconn, self.dbcursor) = self.connect(db)
+        (self.dbconn, self.dbcursor) = self.connect(db, timeout=25.0)
         self.initdb(0)
         return None
 


Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- return-mirrorlist.py	3 Nov 2006 20:55:06 -0000	1.19
+++ return-mirrorlist.py	16 Nov 2006 17:33:36 -0000	1.20
@@ -148,7 +148,7 @@
 
     def connect(self):
         try:
-            conn = sqlite.connect(self.db)
+            conn = sqlite.connect(self.db, timeout=20.0)
             cursor = conn.cursor()
         except sqlite.Error, errmsg:
             errorprint('Failed to connect to database: %s' % db)
@@ -305,10 +305,10 @@
         else:
             if form.has_key('top'):
                 if not mirrors.printTopMirrors(form['top'].value):
-                    print canonical
+                    print "%s" % re.sub('\$ARCH', arch, canonical)
             else:
                 if not mirrors.printMirrors():
-                    print canonical
+                    print "%s" % re.sub('\$ARCH', arch, canonical)
             
 #        fo = open(return_file, 'r')
 #        for line in fo.readlines():



From fedora-extras-commits at redhat.com  Thu Nov 16 17:37:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 16 Nov 2006 10:37:38 -0700
Subject: rpms/perl-File-MimeInfo/FC-5 perl-File-MimeInfo.spec,1.1,1.2
Message-ID: <200611161737.kAGHbcfV023931@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23899/FC-5

Modified Files:
	perl-File-MimeInfo.spec 
Log Message:
* Thu Nov 16 2006 Patrice Dumas  0.13-3
- add a Requires on shared-mime-info (Bug #215972)



Index: perl-File-MimeInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/FC-5/perl-File-MimeInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-MimeInfo.spec	14 Oct 2006 21:42:51 -0000	1.1
+++ perl-File-MimeInfo.spec	16 Nov 2006 17:37:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-File-MimeInfo
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Determine file type and open application
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(File::BaseDir) perl(File::DesktopEntry)
+Requires:       shared-mime-info
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas  0.13-3
+- add a Requires on shared-mime-info (Bug #215972)
+
 * Wed Oct 11 2006 Patrice Dumas  0.13-2
 - add an option to launch mimeopen non interactively
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:37:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 16 Nov 2006 10:37:39 -0700
Subject: rpms/perl-File-MimeInfo/FC-6 perl-File-MimeInfo.spec,1.1,1.2
Message-ID: <200611161737.kAGHbdE1023934@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23899/FC-6

Modified Files:
	perl-File-MimeInfo.spec 
Log Message:
* Thu Nov 16 2006 Patrice Dumas  0.13-3
- add a Requires on shared-mime-info (Bug #215972)



Index: perl-File-MimeInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/FC-6/perl-File-MimeInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-MimeInfo.spec	14 Oct 2006 21:42:51 -0000	1.1
+++ perl-File-MimeInfo.spec	16 Nov 2006 17:37:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-File-MimeInfo
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Determine file type and open application
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(File::BaseDir) perl(File::DesktopEntry)
+Requires:       shared-mime-info
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas  0.13-3
+- add a Requires on shared-mime-info (Bug #215972)
+
 * Wed Oct 11 2006 Patrice Dumas  0.13-2
 - add an option to launch mimeopen non interactively
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:58:36 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 16 Nov 2006 10:58:36 -0700
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 telepathy-butterfly.spec, 1.3, 1.4
Message-ID: <200611161758.kAGHwaJq024110@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24088

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Thu Nov 16 2006 Brian Pepple  - 0.1.3-1
- Update to 0.1.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Oct 2006 17:07:49 -0000	1.4
+++ .cvsignore	16 Nov 2006 17:58:05 -0000	1.5
@@ -1 +1 @@
-telepathy-butterfly-0.1.2.tar.gz
+telepathy-butterfly-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2006 17:07:49 -0000	1.4
+++ sources	16 Nov 2006 17:58:05 -0000	1.5
@@ -1 +1 @@
-e52f238d9716b45961d28b424a9c0e6e  telepathy-butterfly-0.1.2.tar.gz
+288494daa096eeb685d57bdad8bc5b5f  telepathy-butterfly-0.1.3.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-butterfly.spec	8 Oct 2006 17:07:49 -0000	1.3
+++ telepathy-butterfly.spec	16 Nov 2006 17:58:05 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Brian Pepple  - 0.1.3-1
+- Update to 0.1.3.
+
 * Sun Oct  8 2006 Brian Pepple  - 0.1.2-1
 - Update to 0.1.2.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:59:27 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 16 Nov 2006 10:59:27 -0700
Subject: check-mirrors check-mirrors.py,1.33,1.34
Message-ID: <200611161759.kAGHxRjb024183@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24165

Modified Files:
	check-mirrors.py 
Log Message:
oops


Index: check-mirrors.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- check-mirrors.py	16 Nov 2006 17:33:36 -0000	1.33
+++ check-mirrors.py	16 Nov 2006 17:59:24 -0000	1.34
@@ -74,13 +74,13 @@
 
 class RepoDB:
     def __init__(self, db):
-        (self.dbconn, self.dbcursor) = self.connect(db, timeout=25.0)
+        (self.dbconn, self.dbcursor) = self.connect(db)
         self.initdb(0)
         return None
 
     def connect(self, db):
         try:
-            conn = sqlite.connect(db)
+            conn = sqlite.connect(db, timeout=25.0)
             cursor = conn.cursor()
         except sqlite.Error, errmsg:
             errorprint('Failed to connect to database: %s' % db)



From fedora-extras-commits at redhat.com  Thu Nov 16 18:03:03 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 16 Nov 2006 11:03:03 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 telepathy-gabble.spec, 1.14, 1.15
Message-ID: <200611161803.kAGI33Jk027227@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Nov 16 2006 Brian Pepple  - 0.4.5-1
- Update to 0.4.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Nov 2006 14:01:01 -0000	1.14
+++ .cvsignore	16 Nov 2006 18:02:32 -0000	1.15
@@ -1 +1 @@
-telepathy-gabble-0.4.3.tar.gz
+telepathy-gabble-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Nov 2006 14:01:01 -0000	1.14
+++ sources	16 Nov 2006 18:02:32 -0000	1.15
@@ -1 +1 @@
-fdf8fdb60a29243bff32c46fc707ab4c  telepathy-gabble-0.4.3.tar.gz
+225c8ee2e71818c3be4b4ca9b8d8a988  telepathy-gabble-0.4.5.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- telepathy-gabble.spec	4 Nov 2006 14:01:01 -0000	1.14
+++ telepathy-gabble.spec	16 Nov 2006 18:02:32 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.3
+Version:        0.4.5
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Brian Pepple  - 0.4.5-1
+- Update to 0.4.5.
+
 * Sat Nov  4 2006 Brian Pepple  - 0.4.3-1
 - Update to 0.4.3.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 18:53:18 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:53:18 -0700
Subject: owners owners.list,1.1972,1.1973
Message-ID: <200611161853.kAGIrIAS027777@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27761

Modified Files:
	owners.list 
Log Message:
Add zabbix


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1972
retrieving revision 1.1973
diff -u -r1.1972 -r1.1973
--- owners.list	16 Nov 2006 15:24:03 -0000	1.1972
+++ owners.list	16 Nov 2006 18:52:47 -0000	1.1973
@@ -2533,6 +2533,7 @@
 Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 Fedora Extras|z88dk|Z80 cross compiler|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|zabbix|Open-source monitoring solution for your IT infrastructure|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|zaptel|Tools and libraries for using/configuring/monitoring Zapata telephony interfaces|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|zasx|Asteroid like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 18:55:37 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:55:37 -0700
Subject: rpms/zabbix - New directory
Message-ID: <200611161855.kAGItb0l027838@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27834/zabbix

Log Message:
Directory /cvs/extras/rpms/zabbix added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 18:55:43 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:55:43 -0700
Subject: rpms/zabbix/devel - New directory
Message-ID: <200611161855.kAGIth7F027852@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27834/zabbix/devel

Log Message:
Directory /cvs/extras/rpms/zabbix/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 18:55:55 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:55:55 -0700
Subject: rpms/zabbix Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611161855.kAGItttW027883@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27877

Added Files:
	Makefile import.log 
Log Message:
Setup of module zabbix


--- NEW FILE Makefile ---
# Top level Makefile for module zabbix
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 Nov 16 18:56:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:56:01 -0700
Subject: rpms/zabbix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611161856.kAGIu1JD027901@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27877/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zabbix


--- 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 Nov 16 18:57:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:57:01 -0700
Subject: rpms/zabbix import.log,1.1,1.2
Message-ID: <200611161857.kAGIv1WV028032@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27996

Modified Files:
	import.log 
Log Message:
auto-import zabbix-1.1.4-2.fc7 on branch devel from zabbix-1.1.4-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zabbix/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 18:55:55 -0000	1.1
+++ import.log	16 Nov 2006 18:56:30 -0000	1.2
@@ -0,0 +1 @@
+zabbix-1_1_4-2_fc7:HEAD:zabbix-1.1.4-2.fc7.src.rpm:1163703387



From fedora-extras-commits at redhat.com  Thu Nov 16 18:57:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:57:01 -0700
Subject: rpms/zabbix/devel zabbix-agent.init, NONE, 1.1 zabbix-logrotate.in, 
	NONE, 1.1 zabbix-server.init, NONE, 1.1 zabbix-web.conf, NONE,
	1.1 zabbix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611161857.kAGIv1Fk028036@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	zabbix-agent.init zabbix-logrotate.in zabbix-server.init 
	zabbix-web.conf zabbix.spec 
Log Message:
auto-import zabbix-1.1.4-2.fc7 on branch devel from zabbix-1.1.4-2.fc7.src.rpm


--- NEW FILE zabbix-agent.init ---
#! /bin/sh
#
# chkconfig: - 85 15
# description: zabbix agent daemon
#

# zabbix details
ZABBIX_AGENTD=/usr/bin/zabbix_agentd
CONF=/etc/zabbix/zabbix_agentd.conf
PIDFILE=/var/run/zabbix-agent.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $ZABBIX_AGENTD ] || exit 0
[ -e $CONF ] || exit 0

RETVAL=0

case "$1" in
    start)
        echo -n "Starting zabbix agent: "
        daemon $ZABBIX_AGENTD -c $CONF
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix-agent
        ;;
    stop)
        echo -n "Shutting down zabbix agent: "
        killproc zabbix_agentd
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix-agent
        ;;
    restart|reload)
        $0 stop
        $0 start
        RETVAL=$?
        ;;
    status)
        status zabbix_agentd
        RETVAL=$?
        ;;
    *)
	echo "Usage: $0 {start|stop|restart|reload|status}"
	exit 1
	;;
esac

exit $RETVAL



--- NEW FILE zabbix-logrotate.in ---
/var/log/zabbix/zabbix_COMPONENT.log {
	missingok
	monthly
	notifempty
	compress
	create 0664 zabbix zabbix
}


--- NEW FILE zabbix-server.init ---
#! /bin/sh
#
# chkconfig: - 85 15
# description: zabbix server daemon
#

# zabbix details
ZABBIX=/usr/bin/zabbix_server
CONF=/etc/zabbix/zabbix_server.conf
PIDFILE=/var/run/zabbix.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $ZABBIX ] || exit 0
[ -e $CONF ] || exit 0

RETVAL=0

case "$1" in
    start)
        echo -n "Starting zabbix server: "
        daemon $ZABBIX -c $CONF
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix
        ;;
    stop)
        echo -n "Shutting down zabbix server: "
        killproc zabbix_server
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix
        ;;
    restart|reload)
        $0 stop
        $0 start
        RETVAL=$?
        ;;
    status)
        status zabbix_server
        RETVAL=$?
        ;;
    *)
	echo "Usage: $0 {start|stop|restart|reload|status}"
	exit 1
	;;
esac

exit $RETVAL



--- NEW FILE zabbix-web.conf ---
#
# Zabbix monitoring system php web frontend
#

Alias /zabbix /usr/share/zabbix


    Options FollowSymLinks
    AllowOverride None
    Order allow,deny
    Allow from all



    Order deny,allow
    Deny from all
    
        Order deny,allow
        Deny from all
    



    Order deny,allow
    Deny from all
    
        Order deny,allow
        Deny from all
    



--- NEW FILE zabbix.spec ---
Name:           zabbix
Version:        1.1.4
Release:        2%{?dist}
Summary:        Open-source monitoring solution for your IT infrastructure

Group:          Applications/Internet
License:        GPL
URL:            http://www.zabbix.com/
Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Source1:        zabbix-web.conf
Source2:        zabbix-server.init
Source3:        zabbix-agent.init
Source4:        zabbix-logrotate.in
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%define database mysql
%define zdb mysql
%define with_postgresql %{?_with_postgresql: 1} %{?!_with_postgresql: 0}

# Zabbix can only be built with mysql -or- postgresql
# support. We build with mysql by default, but you can
# pass --with postgresql to build with postgresql instead.
%if %{with_postgresql}
%define database postgresql
%define zdb pgsql
%endif

BuildRequires:  %{database}-devel, net-snmp-devel
BuildRequires:  openldap-devel, gnutls-devel
Requires:       logrotate, fping, net-snmp-libs
Requires(pre):      /usr/sbin/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig
Requires(preun):    /sbin/service

%description
ZABBIX is software that monitors numerous parameters of a
network and the health and integrity of servers. ZABBIX
uses a flexible notification mechanism that allows users
to configure e-mail based alerts for virtually any event.
This allows a fast reaction to server problems. ZABBIX
offers excellent reporting and data visualisation features
based on the stored data. This makes ZABBIX ideal for
capacity planning.

ZABBIX supports both polling and trapping. All ZABBIX
reports and statistics, as well as configuration
parameters are accessed through a web-based front end. A
web-based front end ensures that the status of your network
and the health of your servers can be assessed from any
location. Properly configured, ZABBIX can play an important
role in monitoring IT infrastructure. This is equally true
for small organisations with a few servers and for large
companies with a multitude of servers.


%package agent
Summary:        Zabbix Agent
Group:          Applications/Internet
Requires:       logrotate
Requires(pre):      /usr/sbin/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig
Requires(preun):    /sbin/service

%description agent
The zabbix client agent, to be installed on monitored systems.

%package web
Summary:        Zabbix Web Frontend
Group:          Applications/Internet
Requires:       php-%{zdb}, php-gd

%description web
The php frontend to display the zabbix web interface.

%prep
%setup -q

# fix up some lib64 issues
%{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \
    configure

# fix up pt_br
%{__chmod} a-x frontends/php/include/locales/pt_br.inc.php
%{__sed} -i 's/\r//' frontends/php/include/locales/pt_br.inc.php

%build
%configure \
    --enable-server \
    --enable-agent \
    --with-%{zdb} \
    --with-net-snmp \
    --with-ldap \
    --disable-static

# --disable-static is partially broken atm,
# -static still gets into CFLAGS, so fix up in make
# (and even then, .a files still show their face...)
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
# set up some required directories
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
mkdir -p $RPM_BUILD_ROOT%{_datadir}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
# php frontend
cp -a frontends/php $RPM_BUILD_ROOT%{_datadir}/%{name}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/include/db.inc.php \
    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
ln -s ../../../..%{_sysconfdir}/%{name}/db.inc.php \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/include/db.inc.php
# kill off .htaccess files, options set in SOURCE1
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/.htaccess
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/classes/.htaccess
# drop config files in place
install -m 0644 misc/conf/zabbix_agent.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
cat misc/conf/zabbix_agentd.conf | sed \
    -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \
    -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \
    > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf
cat misc/conf/zabbix_server.conf | sed \
    -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \
    -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \
    -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \
    -e 's|DBUser=root|DBUser=zabbix|g' \
    -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \
    > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_server.conf
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
# log rotation
cat %{SOURCE4} | sed -e 's|COMPONENT|server|g' > \
     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix
cat %{SOURCE4} | sed -e 's|COMPONENT|agentd|g' > \
     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent
# init scripts
install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix
install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent

make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a

%clean
rm -rf $RPM_BUILD_ROOT

%pre
# Add the "zabbix" user
/usr/sbin/useradd -c "Zabbix Monitoring System" \
        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} zabbix 2> /dev/null || :

%pre agent
# Add the "zabbix" user
/usr/sbin/useradd -c "Zabbix Monitoring System" \
        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} zabbix 2> /dev/null || :

%post
/sbin/chkconfig --add zabbix

%post agent
/sbin/chkconfig --add zabbix-agent

%preun
if [ "$1" = 0 ]
then
  /sbin/service zabbix stop >/dev/null 2>&1 || :
  /sbin/chkconfig --del zabbix
fi

%preun agent
if [ "$1" = 0 ]
then
  /sbin/service zabbix-agent stop >/dev/null 2>&1 || :
  /sbin/chkconfig --del zabbix-agent
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ NEWS README
%doc create/data create/%{database}
%dir %{_sysconfdir}/%{name}
%{_bindir}/zabbix_server
%{_sysconfdir}/init.d/zabbix
%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
%config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{name}
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{name}

%files agent
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ NEWS README
%dir %{_sysconfdir}/%{name}
%{_bindir}/zabbix_agent
%{_bindir}/zabbix_agentd
%{_bindir}/zabbix_sender
%{_bindir}/zabbix_get
%{_sysconfdir}/init.d/zabbix-agent
%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
%config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
%config(noreplace) %{_sysconfdir}/%{name}/zabbix_agentd.conf
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{name}
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{name}

%files web
%defattr(-,root,root,-)
%doc README
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/db.inc.php
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%{_datadir}/%{name}

%changelog
* Thu Nov 16 2006 Jarod Wilson  1.1.4-2
- Fix up pt_br
- Add Req-pre on useradd

* Wed Nov 15 2006 Jarod Wilson  1.1.4-1
- Update to 1.1.4

* Tue Nov 14 2006 Jarod Wilson  1.1.3-3
- Add BR: gnutls-devel, R: net-snmp-libs

* Tue Nov 14 2006 Jarod Wilson  1.1.3-2
- Fix php-pgsql Requires

* Tue Nov 14 2006 Jarod Wilson  1.1.3-1
- Update to 1.1.3

* Mon Oct 02 2006 Jarod Wilson  1.1.2-1
- Update to 1.1.2
- Enable alternate building with postgresql support

* Thu Aug 17 2006 Jarod Wilson  1.1.1-2
- Yank out Requires: mysql-server
- Add Requires: for php-gd and fping

* Tue Aug 15 2006 Jarod Wilson  1.1.1-1
- Update to 1.1.1
- More macroification
- Fix up zabbix-web Requires:
- Prep for enabling postgres support

* Thu Jul 27 2006 Jarod Wilson  1.1-2
- Add Requires: on chkconfig and service
- Remove openssl-devel from BR, mysql-devel pulls it in
- Alter scriptlets to match Fedora conventions

* Tue Jul 11 2006 Jarod Wilson  1.1-1
- Initial build for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zabbix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 18:56:01 -0000	1.1
+++ .cvsignore	16 Nov 2006 18:56:31 -0000	1.2
@@ -0,0 +1 @@
+zabbix-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zabbix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 18:56:01 -0000	1.1
+++ sources	16 Nov 2006 18:56:31 -0000	1.2
@@ -0,0 +1 @@
+8e733e41506dd34759daba01deeeefd9  zabbix-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 19:08:02 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:02 -0700
Subject: rpms/perl-HTML-Table - New directory
Message-ID: <200611161908.kAGJ82L3031133@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31127/perl-HTML-Table

Log Message:
Directory /cvs/extras/rpms/perl-HTML-Table added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 19:08:22 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:22 -0700
Subject: rpms/perl-HTML-Table/devel - New directory
Message-ID: <200611161908.kAGJ8MVV031147@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31127/perl-HTML-Table/devel

Log Message:
Directory /cvs/extras/rpms/perl-HTML-Table/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 19:08:47 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:47 -0700
Subject: rpms/perl-HTML-Table/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611161908.kAGJ8lKo031212@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31191/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTML-Table


--- 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 Nov 16 19:08:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:43 -0700
Subject: rpms/perl-HTML-Table Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611161908.kAGJ8hZv031197@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31191

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-HTML-Table


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTML-Table
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 Nov 16 19:08:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:52 -0700
Subject: owners owners.list,1.1973,1.1974
Message-ID: <200611161908.kAGJ8qZe031223@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31139

Modified Files:
	owners.list 
Log Message:
Added perl-HTML-Table



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1973
retrieving revision 1.1974
diff -u -r1.1973 -r1.1974
--- owners.list	16 Nov 2006 18:52:47 -0000	1.1973
+++ owners.list	16 Nov 2006 19:08:22 -0000	1.1974
@@ -1478,6 +1478,7 @@
 Fedora Extras|perl-HTML-FormatText-WithLinks|HTML to text conversion with links as footnotes|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTML-Table|Create HTML tables using simple interface|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-TableExtract|A Perl module for extracting content in HTML tables|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Nov 16 19:09:56 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:09:56 -0700
Subject: rpms/perl-HTML-Table import.log,1.1,1.2
Message-ID: <200611161909.kAGJ9u0l031288@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31256

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Table-2.04a-1.fc6 on branch devel from perl-HTML-Table-2.04a-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Table/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 19:08:43 -0000	1.1
+++ import.log	16 Nov 2006 19:09:21 -0000	1.2
@@ -0,0 +1 @@
+perl-HTML-Table-2_04a-1_fc6:HEAD:perl-HTML-Table-2.04a-1.fc6.src.rpm:1163704156



From fedora-extras-commits at redhat.com  Thu Nov 16 19:09:56 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:09:56 -0700
Subject: rpms/perl-HTML-Table/devel perl-HTML-Table.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611161910.kAGJ9ubF031290@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31256/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-HTML-Table.spec 
Log Message:
auto-import perl-HTML-Table-2.04a-1.fc6 on branch devel from perl-HTML-Table-2.04a-1.fc6.src.rpm


--- NEW FILE perl-HTML-Table.spec ---
Name:           perl-HTML-Table
Version:        2.04a
Release:        1%{?dist}
Summary:        Create HTML tables using simple interface
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-Table/
Source0:        http://www.cpan.org/modules/by-module/HTML/HTML-Table-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
HTML::Table is used to generate HTML tables for CGI scripts.  By using the
methods provided fairly complex tables can be created, manipulated, then
 printed from Perl scripts.  The module also greatly simplifies creating
tables within tables from Perl.  It is possible to create an entire table
using the methods provided and never use an HTML tag.

HTML::Table also allows for creating dynamically sized tables via its addRow
and addCol methods.  These methods automatically resize the table if passed
more cell values than will fit in the current table grid.

Methods are provided for nearly all valid table, row, and cell tags specified
for HTML 3.0.


%prep
%setup -q -n HTML-Table-%{version}
for f in Changes Table.pm
do
   iconv -f ISO-8859-1 -t UTF-8 -o ${f}.UTF-8 $f
   mv ${f}.UTF-8 $f
done


%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 ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*


%changelog
* Tue Nov  7 2007 Orion Poplawski  2.04a-1
- Update to 2.04a

* Wed Oct 12 2005 Orion Poplawski  2.02-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Table/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 19:08:47 -0000	1.1
+++ .cvsignore	16 Nov 2006 19:09:23 -0000	1.2
@@ -0,0 +1 @@
+HTML-Table-2.04a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Table/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 19:08:47 -0000	1.1
+++ sources	16 Nov 2006 19:09:23 -0000	1.2
@@ -0,0 +1 @@
+12c107450c8759e9dc0f8dea91297132  HTML-Table-2.04a.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 19:31:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 16 Nov 2006 12:31:15 -0700
Subject: comps comps-fe5.xml.in,1.200,1.201 comps-fe6.xml.in,1.224,1.225
Message-ID: <200611161931.kAGJVFSF031556@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31535

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
+vdr-osdteletext, vdr-subtitles


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- comps-fe5.xml.in	14 Nov 2006 07:40:24 -0000	1.200
+++ comps-fe5.xml.in	16 Nov 2006 19:30:45 -0000	1.201
@@ -829,6 +829,8 @@
       tclabc
       ushare
       vdr
+      vdr-osdteletext
+      vdr-subtitles
       xmms
       xmms-cdread
       xmms-flac


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- comps-fe6.xml.in	14 Nov 2006 07:40:24 -0000	1.224
+++ comps-fe6.xml.in	16 Nov 2006 19:30:45 -0000	1.225
@@ -880,6 +880,8 @@
       tclabc
       ushare
       vdr
+      vdr-osdteletext
+      vdr-subtitles
       wmix
       xmms
       xmms-adplug



From fedora-extras-commits at redhat.com  Thu Nov 16 20:16:29 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Thu, 16 Nov 2006 13:16:29 -0700
Subject: rpms/aumix/devel aumix.spec,1.1,1.2
Message-ID: <200611162016.kAGKGTIs002754@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2736

Modified Files:
	aumix.spec 
Log Message:
bumped rel. to 10 to stop buildsys complaining about conflict w. old FC3 package



Index: aumix.spec
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/aumix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix.spec	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix.spec	16 Nov 2006 20:15:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 1%{?dist}
+Release: 10%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPL
 Group: Applications/Multimedia
@@ -48,6 +48,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Thu Nov 16 2006 Gabriel L. Somlo  2.8-10
+- bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package
+
 * Wed Nov 08 2006 Gabriel L. Somlo  2.8-1
 - initial Extras build based on latest Core CVS, including all their patches
 - only building ncurses version



From fedora-extras-commits at redhat.com  Thu Nov 16 20:18:04 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Thu, 16 Nov 2006 13:18:04 -0700
Subject: rpms/aumix/FC-6 aumix.spec,1.1,1.2
Message-ID: <200611162018.kAGKI4Ut002849@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2820

Modified Files:
	aumix.spec 
Log Message:
bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package



Index: aumix.spec
===================================================================
RCS file: /cvs/extras/rpms/aumix/FC-6/aumix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix.spec	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix.spec	16 Nov 2006 20:17:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 1%{?dist}
+Release: 10%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPL
 Group: Applications/Multimedia
@@ -48,6 +48,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Thu Nov 16 2006 Gabriel L. Somlo  2.8-10
+- bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package
+
 * Wed Nov 08 2006 Gabriel L. Somlo  2.8-1
 - initial Extras build based on latest Core CVS, including all their patches
 - only building ncurses version



From fedora-extras-commits at redhat.com  Thu Nov 16 20:19:13 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Thu, 16 Nov 2006 13:19:13 -0700
Subject: rpms/aumix/FC-5 aumix.spec,1.1,1.2
Message-ID: <200611162019.kAGKJDRi002914@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2898

Modified Files:
	aumix.spec 
Log Message:
bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package



Index: aumix.spec
===================================================================
RCS file: /cvs/extras/rpms/aumix/FC-5/aumix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix.spec	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix.spec	16 Nov 2006 20:18:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 1%{?dist}
+Release: 10%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPL
 Group: Applications/Multimedia
@@ -48,6 +48,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Thu Nov 16 2006 Gabriel L. Somlo  2.8-10
+- bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package
+
 * Wed Nov 08 2006 Gabriel L. Somlo  2.8-1
 - initial Extras build based on latest Core CVS, including all their patches
 - only building ncurses version



From fedora-extras-commits at redhat.com  Thu Nov 16 20:31:06 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 16 Nov 2006 13:31:06 -0700
Subject: rpms/stratagus/FC-5 stratagus--lua-5.1.diff, 1.1, 1.2 stratagus.spec,
	1.8, 1.9
Message-ID: <200611162031.kAGKV6cW003099@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018/FC-5

Modified Files:
	stratagus--lua-5.1.diff stratagus.spec 
Log Message:
Finally, got it work with Lua5.1

stratagus--lua-5.1.diff:

Index: stratagus--lua-5.1.diff
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/stratagus--lua-5.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stratagus--lua-5.1.diff	16 Sep 2006 10:59:22 -0000	1.1
+++ stratagus--lua-5.1.diff	16 Nov 2006 20:30:35 -0000	1.2
@@ -95,3 +95,78 @@
  
  	DebugPrint("Garbage collect (after): %d/%d\n" _C_
  		lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+--- src/stratagus/script.c.hdg	2006-11-14 23:35:39.000000000 +0100
++++ src/stratagus/script.c	2006-11-14 23:35:39.000000000 +0100
+@@ -149,6 +149,23 @@
+ 	return status;
+ }
+ 
++static int traceback (lua_State *L) {
++  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  if (!lua_istable(L, -1)) {
++    lua_pop(L, 1);
++    return 1;
++  }
++  lua_getfield(L, -1, "traceback");
++  if (!lua_isfunction(L, -1)) {
++    lua_pop(L, 2);
++    return 1;
++  }
++  lua_pushvalue(L, 1);  /* pass error message */
++  lua_pushinteger(L, 2);  /* skip this function and traceback */
++  lua_call(L, 2, 1);  /* call debug.traceback */
++  return 1;
++}
++
+ /**
+ **  Call a lua function
+ **
+@@ -159,19 +176,19 @@
+ */
+ int LuaCall(int narg, int clear)
+ {
+-	int status;
+-	int base;
+-
+-	base = lua_gettop(Lua) - narg;      // function index
+-	lua_pushliteral(Lua, "_TRACEBACK");
+-	lua_rawget(Lua, LUA_GLOBALSINDEX);  // get traceback function
+-	lua_insert(Lua, base);              // put it under chunk and args
+-	signal(SIGINT, laction);
+-	status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
+-	signal(SIGINT, SIG_DFL);
+-	lua_remove(Lua, base);              // remove traceback function
+-
+-	return report(status);
++  int status;
++  int base = lua_gettop(Lua) - narg;  /* function index */
++  lua_pushcfunction(Lua, traceback);  /* push traceback function */
++  lua_insert(Lua, base);  /* put it under chunk and args */
++  signal(SIGINT, laction);
++  status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
++  signal(SIGINT, SIG_DFL);
++  lua_remove(Lua, base);  /* remove traceback function */
++#if 0
++  /* force a complete garbage collection in case of errors */
++  if (status != 0) lua_gc(Lua, LUA_GCCOLLECT, 0);
++#endif
++  return report(status);
+ }
+ 
+ /**
+--- src/ai/script_ai.c.hdg	2004-06-25 01:37:30.000000000 +0200
++++ src/ai/script_ai.c	2006-11-14 23:42:58.000000000 +0100
+@@ -349,7 +349,11 @@
+ 	lua_call(l, 1, 1);
+ 	lua_pushstring(l, "name");
+ 	lua_gettable(l, -2);
+-	aitype->FunctionName = strdup(lua_tostring(l, -1));
++	value = lua_tostring(l, -1);
++	if (value)
++		aitype->FunctionName = strdup(lua_tostring(l, -1));
++	else
++		aitype->FunctionName = NULL;
+ 	lua_pop(l, 2); // FIXME : check if this value is correct.
+ 	// We can have opcode of this function with string.dump(function)
+ 	// Problems are for sub functions...
+


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/stratagus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- stratagus.spec	16 Sep 2006 10:59:22 -0000	1.8
+++ stratagus.spec	16 Nov 2006 20:30:35 -0000	1.9
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Thu Nov 16 2006 Peter Lemenkov  2.1-10
+- Applied patches from Hans de Goede
+
 * Sat Sep 16 2006 Peter Lemenkov  2.1-9%{?dist}
 - Added necessary BuildRequires
 



From fedora-extras-commits at redhat.com  Thu Nov 16 20:31:05 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 16 Nov 2006 13:31:05 -0700
Subject: rpms/stratagus/FC-4 stratagus--lua-5.1.diff, 1.1, 1.2 stratagus.spec,
	1.8, 1.9
Message-ID: <200611162031.kAGKV5k4003095@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018/FC-4

Modified Files:
	stratagus--lua-5.1.diff stratagus.spec 
Log Message:
Finally, got it work with Lua5.1

stratagus--lua-5.1.diff:

Index: stratagus--lua-5.1.diff
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-4/stratagus--lua-5.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stratagus--lua-5.1.diff	16 Sep 2006 10:58:31 -0000	1.1
+++ stratagus--lua-5.1.diff	16 Nov 2006 20:30:35 -0000	1.2
@@ -95,3 +95,78 @@
  
  	DebugPrint("Garbage collect (after): %d/%d\n" _C_
  		lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+--- src/stratagus/script.c.hdg	2006-11-14 23:35:39.000000000 +0100
++++ src/stratagus/script.c	2006-11-14 23:35:39.000000000 +0100
+@@ -149,6 +149,23 @@
+ 	return status;
+ }
+ 
++static int traceback (lua_State *L) {
++  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  if (!lua_istable(L, -1)) {
++    lua_pop(L, 1);
++    return 1;
++  }
++  lua_getfield(L, -1, "traceback");
++  if (!lua_isfunction(L, -1)) {
++    lua_pop(L, 2);
++    return 1;
++  }
++  lua_pushvalue(L, 1);  /* pass error message */
++  lua_pushinteger(L, 2);  /* skip this function and traceback */
++  lua_call(L, 2, 1);  /* call debug.traceback */
++  return 1;
++}
++
+ /**
+ **  Call a lua function
+ **
+@@ -159,19 +176,19 @@
+ */
+ int LuaCall(int narg, int clear)
+ {
+-	int status;
+-	int base;
+-
+-	base = lua_gettop(Lua) - narg;      // function index
+-	lua_pushliteral(Lua, "_TRACEBACK");
+-	lua_rawget(Lua, LUA_GLOBALSINDEX);  // get traceback function
+-	lua_insert(Lua, base);              // put it under chunk and args
+-	signal(SIGINT, laction);
+-	status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
+-	signal(SIGINT, SIG_DFL);
+-	lua_remove(Lua, base);              // remove traceback function
+-
+-	return report(status);
++  int status;
++  int base = lua_gettop(Lua) - narg;  /* function index */
++  lua_pushcfunction(Lua, traceback);  /* push traceback function */
++  lua_insert(Lua, base);  /* put it under chunk and args */
++  signal(SIGINT, laction);
++  status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
++  signal(SIGINT, SIG_DFL);
++  lua_remove(Lua, base);  /* remove traceback function */
++#if 0
++  /* force a complete garbage collection in case of errors */
++  if (status != 0) lua_gc(Lua, LUA_GCCOLLECT, 0);
++#endif
++  return report(status);
+ }
+ 
+ /**
+--- src/ai/script_ai.c.hdg	2004-06-25 01:37:30.000000000 +0200
++++ src/ai/script_ai.c	2006-11-14 23:42:58.000000000 +0100
+@@ -349,7 +349,11 @@
+ 	lua_call(l, 1, 1);
+ 	lua_pushstring(l, "name");
+ 	lua_gettable(l, -2);
+-	aitype->FunctionName = strdup(lua_tostring(l, -1));
++	value = lua_tostring(l, -1);
++	if (value)
++		aitype->FunctionName = strdup(lua_tostring(l, -1));
++	else
++		aitype->FunctionName = NULL;
+ 	lua_pop(l, 2); // FIXME : check if this value is correct.
+ 	// We can have opcode of this function with string.dump(function)
+ 	// Problems are for sub functions...
+


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-4/stratagus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- stratagus.spec	16 Sep 2006 10:58:31 -0000	1.8
+++ stratagus.spec	16 Nov 2006 20:30:35 -0000	1.9
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Thu Nov 16 2006 Peter Lemenkov  2.1-10
+- Applied patches from Hans de Goede
+
 * Sat Sep 16 2006 Peter Lemenkov  2.1-9%{?dist}
 - Added necessary BuildRequires
 



From fedora-extras-commits at redhat.com  Thu Nov 16 20:31:07 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 16 Nov 2006 13:31:07 -0700
Subject: rpms/stratagus/FC-6 stratagus--lua-5.1.diff, 1.1, 1.2 stratagus.spec,
	1.11, 1.12
Message-ID: <200611162031.kAGKV7j3003103@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018/FC-6

Modified Files:
	stratagus--lua-5.1.diff stratagus.spec 
Log Message:
Finally, got it work with Lua5.1

stratagus--lua-5.1.diff:

Index: stratagus--lua-5.1.diff
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-6/stratagus--lua-5.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stratagus--lua-5.1.diff	15 Sep 2006 21:00:04 -0000	1.1
+++ stratagus--lua-5.1.diff	16 Nov 2006 20:30:36 -0000	1.2
@@ -95,3 +95,78 @@
  
  	DebugPrint("Garbage collect (after): %d/%d\n" _C_
  		lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+--- src/stratagus/script.c.hdg	2006-11-14 23:35:39.000000000 +0100
++++ src/stratagus/script.c	2006-11-14 23:35:39.000000000 +0100
+@@ -149,6 +149,23 @@
+ 	return status;
+ }
+ 
++static int traceback (lua_State *L) {
++  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  if (!lua_istable(L, -1)) {
++    lua_pop(L, 1);
++    return 1;
++  }
++  lua_getfield(L, -1, "traceback");
++  if (!lua_isfunction(L, -1)) {
++    lua_pop(L, 2);
++    return 1;
++  }
++  lua_pushvalue(L, 1);  /* pass error message */
++  lua_pushinteger(L, 2);  /* skip this function and traceback */
++  lua_call(L, 2, 1);  /* call debug.traceback */
++  return 1;
++}
++
+ /**
+ **  Call a lua function
+ **
+@@ -159,19 +176,19 @@
+ */
+ int LuaCall(int narg, int clear)
+ {
+-	int status;
+-	int base;
+-
+-	base = lua_gettop(Lua) - narg;      // function index
+-	lua_pushliteral(Lua, "_TRACEBACK");
+-	lua_rawget(Lua, LUA_GLOBALSINDEX);  // get traceback function
+-	lua_insert(Lua, base);              // put it under chunk and args
+-	signal(SIGINT, laction);
+-	status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
+-	signal(SIGINT, SIG_DFL);
+-	lua_remove(Lua, base);              // remove traceback function
+-
+-	return report(status);
++  int status;
++  int base = lua_gettop(Lua) - narg;  /* function index */
++  lua_pushcfunction(Lua, traceback);  /* push traceback function */
++  lua_insert(Lua, base);  /* put it under chunk and args */
++  signal(SIGINT, laction);
++  status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
++  signal(SIGINT, SIG_DFL);
++  lua_remove(Lua, base);  /* remove traceback function */
++#if 0
++  /* force a complete garbage collection in case of errors */
++  if (status != 0) lua_gc(Lua, LUA_GCCOLLECT, 0);
++#endif
++  return report(status);
+ }
+ 
+ /**
+--- src/ai/script_ai.c.hdg	2004-06-25 01:37:30.000000000 +0200
++++ src/ai/script_ai.c	2006-11-14 23:42:58.000000000 +0100
+@@ -349,7 +349,11 @@
+ 	lua_call(l, 1, 1);
+ 	lua_pushstring(l, "name");
+ 	lua_gettable(l, -2);
+-	aitype->FunctionName = strdup(lua_tostring(l, -1));
++	value = lua_tostring(l, -1);
++	if (value)
++		aitype->FunctionName = strdup(lua_tostring(l, -1));
++	else
++		aitype->FunctionName = NULL;
+ 	lua_pop(l, 2); // FIXME : check if this value is correct.
+ 	// We can have opcode of this function with string.dump(function)
+ 	// Problems are for sub functions...
+


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-6/stratagus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stratagus.spec	16 Sep 2006 10:48:38 -0000	1.11
+++ stratagus.spec	16 Nov 2006 20:30:36 -0000	1.12
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Thu Nov 16 2006 Peter Lemenkov  2.1-10
+- Applied patches from Hans de Goede
+
 * Sat Sep 16 2006 Peter Lemenkov  2.1-9%{?dist}
 - Added necessary BuildRequires
 



From fedora-extras-commits at redhat.com  Thu Nov 16 20:31:12 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 16 Nov 2006 13:31:12 -0700
Subject: rpms/stratagus/devel stratagus--lua-5.1.diff, 1.1,
	1.2 stratagus.spec, 1.11, 1.12
Message-ID: <200611162031.kAGKVCXb003107@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018/devel

Modified Files:
	stratagus--lua-5.1.diff stratagus.spec 
Log Message:
Finally, got it work with Lua5.1

stratagus--lua-5.1.diff:

Index: stratagus--lua-5.1.diff
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus--lua-5.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stratagus--lua-5.1.diff	15 Sep 2006 21:00:04 -0000	1.1
+++ stratagus--lua-5.1.diff	16 Nov 2006 20:30:42 -0000	1.2
@@ -95,3 +95,78 @@
  
  	DebugPrint("Garbage collect (after): %d/%d\n" _C_
  		lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+--- src/stratagus/script.c.hdg	2006-11-14 23:35:39.000000000 +0100
++++ src/stratagus/script.c	2006-11-14 23:35:39.000000000 +0100
+@@ -149,6 +149,23 @@
+ 	return status;
+ }
+ 
++static int traceback (lua_State *L) {
++  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  if (!lua_istable(L, -1)) {
++    lua_pop(L, 1);
++    return 1;
++  }
++  lua_getfield(L, -1, "traceback");
++  if (!lua_isfunction(L, -1)) {
++    lua_pop(L, 2);
++    return 1;
++  }
++  lua_pushvalue(L, 1);  /* pass error message */
++  lua_pushinteger(L, 2);  /* skip this function and traceback */
++  lua_call(L, 2, 1);  /* call debug.traceback */
++  return 1;
++}
++
+ /**
+ **  Call a lua function
+ **
+@@ -159,19 +176,19 @@
+ */
+ int LuaCall(int narg, int clear)
+ {
+-	int status;
+-	int base;
+-
+-	base = lua_gettop(Lua) - narg;      // function index
+-	lua_pushliteral(Lua, "_TRACEBACK");
+-	lua_rawget(Lua, LUA_GLOBALSINDEX);  // get traceback function
+-	lua_insert(Lua, base);              // put it under chunk and args
+-	signal(SIGINT, laction);
+-	status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
+-	signal(SIGINT, SIG_DFL);
+-	lua_remove(Lua, base);              // remove traceback function
+-
+-	return report(status);
++  int status;
++  int base = lua_gettop(Lua) - narg;  /* function index */
++  lua_pushcfunction(Lua, traceback);  /* push traceback function */
++  lua_insert(Lua, base);  /* put it under chunk and args */
++  signal(SIGINT, laction);
++  status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
++  signal(SIGINT, SIG_DFL);
++  lua_remove(Lua, base);  /* remove traceback function */
++#if 0
++  /* force a complete garbage collection in case of errors */
++  if (status != 0) lua_gc(Lua, LUA_GCCOLLECT, 0);
++#endif
++  return report(status);
+ }
+ 
+ /**
+--- src/ai/script_ai.c.hdg	2004-06-25 01:37:30.000000000 +0200
++++ src/ai/script_ai.c	2006-11-14 23:42:58.000000000 +0100
+@@ -349,7 +349,11 @@
+ 	lua_call(l, 1, 1);
+ 	lua_pushstring(l, "name");
+ 	lua_gettable(l, -2);
+-	aitype->FunctionName = strdup(lua_tostring(l, -1));
++	value = lua_tostring(l, -1);
++	if (value)
++		aitype->FunctionName = strdup(lua_tostring(l, -1));
++	else
++		aitype->FunctionName = NULL;
+ 	lua_pop(l, 2); // FIXME : check if this value is correct.
+ 	// We can have opcode of this function with string.dump(function)
+ 	// Problems are for sub functions...
+


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stratagus.spec	16 Sep 2006 10:48:38 -0000	1.11
+++ stratagus.spec	16 Nov 2006 20:30:42 -0000	1.12
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Thu Nov 16 2006 Peter Lemenkov  2.1-10
+- Applied patches from Hans de Goede
+
 * Sat Sep 16 2006 Peter Lemenkov  2.1-9%{?dist}
 - Added necessary BuildRequires
 



From fedora-extras-commits at redhat.com  Thu Nov 16 20:33:40 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 16 Nov 2006 13:33:40 -0700
Subject: owners owners.list,1.1974,1.1975
Message-ID: <200611162033.kAGKXeAq003262@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3201

Modified Files:
	owners.list 
Log Message:
pyserial - Python serial port access library


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1974
retrieving revision 1.1975
diff -u -r1.1974 -r1.1975
--- owners.list	16 Nov 2006 19:08:22 -0000	1.1974
+++ owners.list	16 Nov 2006 20:33:10 -0000	1.1975
@@ -1905,6 +1905,7 @@
 Fedora Extras|pypoker-eval|Python interface to poker-eval|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
 Fedora Extras|PyQt-qscintilla|PyQt qscintilla extentions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org|jamatos at fc.up.pt
+Fedora Extras|pyserial|Python serial port access library|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|rvokal at redhat.com|extras-qa at fedoraproject.org|byte at fedoraproject.org



From fedora-extras-commits at redhat.com  Thu Nov 16 20:58:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 13:58:19 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.60,1.61
Message-ID: <200611162058.kAGKwJd7003436@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3420

Modified Files:
	gnupg2.spec 
Log Message:
* Thu Nov 16 2006 Rex Dieter  2.0.0-4
- update %description
- drop dearmor patch



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnupg2.spec	13 Nov 2006 21:39:40 -0000	1.60
+++ gnupg2.spec	16 Nov 2006 20:57:49 -0000	1.61
@@ -10,7 +10,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -23,10 +23,7 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
-# http://lists.gnupg.org/pipermail/gnupg-devel/2006-November/023359.html 
-#Patch1: gnupg-1.9.95-64bit.patch
-Patch2: gnupg-1.9.16-testverbose.patch
-Patch3: gnupg-1.9.91-dearmor.patch
+Patch1: gnupg-1.9.16-testverbose.patch
 
 Obsoletes: newpg < 0.9.5
 
@@ -59,26 +56,31 @@
 Provides: openpgp
 
 %description
-GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
-code and the previous newpg package.  It will eventually lead to a
-GnuPG 2.0 release.  Note that GnuPG 1.4 and 1.9 are not always in sync
-and thus features and bug fixes done in 1.4 are not necessarily
-available in 1.9.
-
-You should use this GnuPG version if you want to use the gpg-agent or
-gpgsm (the S/MIME variant of gpg).  Note that the gpg-agent is also
-helpful when using the standard gpg versions (1.4.x as well as some of
-the old 1.2.x).  There are no problems installing 1.4 and 1.9
-alongside; in act we suggest to do this.
+GnuPG is GNU's tool for secure communication and data storage.  It can
+be used to encrypt data and to create digital signatures.  It includes
+an advanced key management facility and is compliant with the proposed
+OpenPGP Internet standard as described in RFC2440 and the S/MIME
+standard as described by several RFCs.
+
+GnuPG 2.0 is the stable version of GnuPG integrating support for
+OpenPGP and S/MIME.  It does not conflict with an installed 1.x
+OpenPGP-only version.
+
+GnuPG 2.0 is a newer version of GnuPG with additional support for
+S/MIME.  It has a different design philosophy that splits
+functionality up into several modules.  Both versions may be installed
+simultaneously without any conflict (gpg is called gpg2 in GnuPG 2).
+In fact, the gpg version from GnuPG 1.x is able to make use of the
+gpg-agent as included in GnuPG 2 and allows for seamless passphrase
+caching.  The advantage of GnupG 1.x is its smaller size and no
+dependency on other modules at run and build time.
 
 
 
 %prep
 %setup -q -n gnupg-%{version}
 
-#patch1 -p1 -b .64bit
-#patch2 -p1 -b .testverbose
-%patch3 -p1 -b .dearmor
+#patch1 -p1 -b .testverbose
 
 # 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,
@@ -91,6 +93,9 @@
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
+# need scratch gpg database for tests
+mkdir -p $HOME/.gnupg 
+
 
 %build
 
@@ -173,6 +178,10 @@
 
 
 %changelog
+* Thu Nov 16 2006 Rex Dieter  2.0.0-4
+- update %%description
+- drop dearmor patch
+
 * Mon Nov 13 2006 Rex Dieter  2.0.0-3
 - BR: libassuan-static >= 1.0.0
 



From fedora-extras-commits at redhat.com  Thu Nov 16 21:00:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 14:00:16 -0700
Subject: rpms/gnupg2/FC-6 .cvsignore, 1.14, 1.15 gnupg2.spec, 1.53,
	1.54 sources, 1.16, 1.17 gnupg-1.9.91-dearmor.patch, 1.1, NONE
Message-ID: <200611162100.kAGL0GPk003537@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3506

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.91-dearmor.patch 
Log Message:
* Thu Nov 16 2006 Rex Dieter  2.0.0-4
- update %%description
- drop dearmor patch

* Mon Nov 13 2006 Rex Dieter  2.0.0-3
- BR: libassuan-static >= 1.0.0

* Mon Nov 13 2006 Rex Dieter  2.0.0-2
- 2.0.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	18 Oct 2006 18:43:44 -0000	1.14
+++ .cvsignore	16 Nov 2006 20:59:45 -0000	1.15
@@ -1,2 +1,4 @@
-gnupg-1.9.93.tar.bz2
-gnupg-1.9.93.tar.bz2.sig
+gnupg-1.9.95.tar.bz2
+gnupg-1.9.95.tar.bz2.sig
+gnupg-2.0.0.tar.bz2
+gnupg-2.0.0.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/gnupg2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnupg2.spec	18 Oct 2006 18:43:44 -0000	1.53
+++ gnupg2.spec	16 Nov 2006 20:59:45 -0000	1.54
@@ -1,23 +1,21 @@
 
-# Keep an eye on http://bugzilla.redhat.com/175744, in case these dirs go away or change
+## Keep an eye on http://bugzilla.redhat.com/175744, 
+## in case these dirs go away or change
 %if "%{?fedora}" > "3" || "%{?rhel}" > "4"
 %define kde_scriptdir %{_sysconfdir}/kde
 %else
 %define kde_scriptdir %{_prefix}
 %endif
 
-# define to build/include gpg2 binary
-%define _enable_gpg --enable-gpg
-
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.93
-Release: 1%{?dist}
+Version: 2.0.0
+Release: 4%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,15 +23,14 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
-Patch2: gnupg-1.9.16-testverbose.patch
-Patch3: gnupg-1.9.91-dearmor.patch
+Patch1: gnupg-1.9.16-testverbose.patch
 
 Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 0.9.3
+BuildRequires: libassuan-static >= 1.0.0 
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -55,31 +52,35 @@
 Requires: fileutils util-linux
 Requires: pinentry >= 0.7.1
 
-%if "%{?_enable_gpg:1}" == "1"
 Provides: gpg
 Provides: openpgp
-%endif
 
 %description
-GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
-code and the previous newpg package.  It will eventually lead to a
-GnuPG 2.0 release.  Note that GnuPG 1.4 and 1.9 are not always in sync
-and thus features and bug fixes done in 1.4 are not necessarily
-available in 1.9.
-
-You should use this GnuPG version if you want to use the gpg-agent or
-gpgsm (the S/MIME variant of gpg).  Note that the gpg-agent is also
-helpful when using the standard gpg versions (1.4.x as well as some of
-the old 1.2.x).  There are no problems installing 1.4 and 1.9
-alongside; in act we suggest to do this.
+GnuPG is GNU's tool for secure communication and data storage.  It can
+be used to encrypt data and to create digital signatures.  It includes
+an advanced key management facility and is compliant with the proposed
+OpenPGP Internet standard as described in RFC2440 and the S/MIME
+standard as described by several RFCs.
+
+GnuPG 2.0 is the stable version of GnuPG integrating support for
+OpenPGP and S/MIME.  It does not conflict with an installed 1.x
+OpenPGP-only version.
+
+GnuPG 2.0 is a newer version of GnuPG with additional support for
+S/MIME.  It has a different design philosophy that splits
+functionality up into several modules.  Both versions may be installed
+simultaneously without any conflict (gpg is called gpg2 in GnuPG 2).
+In fact, the gpg version from GnuPG 1.x is able to make use of the
+gpg-agent as included in GnuPG 2 and allows for seamless passphrase
+caching.  The advantage of GnupG 1.x is its smaller size and no
+dependency on other modules at run and build time.
 
 
 
 %prep
 %setup -q -n gnupg-%{version}
 
-#patch2 -p1 -b .testverbose
-%patch3 -p1 -b .dearmor
+#patch1 -p1 -b .testverbose
 
 # 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,
@@ -92,17 +93,15 @@
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
+# need scratch gpg database for tests
+mkdir -p $HOME/.gnupg 
 
-%build
 
-%ifarch x86_64
-#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O1|')"
-%endif
+%build
 
 %configure \
   --disable-rpath \
   --enable-selinux-support \
-  %{?_enable_gpg} \
 %ifarch x86_64
   --disable-optimization 
 %endif
@@ -111,11 +110,6 @@
 make 
 
 
-%check
-# some gpg2 tests (still) FAIL
-make -k check ||:
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -128,18 +122,20 @@
 
 %find_lang %{name}
 
-## NOTE:
-#file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-#file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-#file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+# file conflicts with gnupg-1.x 
 rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
+rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html}
 mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
 
-
-## Unpackaged files
+# Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
+%check
+# some gpg2 tests (still) FAIL
+make -k check ||:
+
+
 %post
 /sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir ||:
 
@@ -148,15 +144,14 @@
   /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir ||:
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
-%if "%{?_enable_gpg:1}" == "1"
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
-%endif
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
@@ -177,11 +172,34 @@
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 16 2006 Rex Dieter  2.0.0-4
+- update %%description
+- drop dearmor patch
+
+* Mon Nov 13 2006 Rex Dieter  2.0.0-3
+- BR: libassuan-static >= 1.0.0
+
+* Mon Nov 13 2006 Rex Dieter  2.0.0-2
+- 2.0.0
+
+* Fri Nov 10 2006 Rex Dieter  1.9.95-3
+- upstream 64bit patch
+
+* Mon Nov 06 2006 Rex Dieter  1.9.95-2
+- fix (more) file conflicts with gnupg
+
+* Mon Nov 06 2006 Rex Dieter  1.9.95-1
+- 1.9.95
+
+* Wed Oct 25 2006 Rex Dieter  1.9.94-1
+- 1.9.94
+
 * Wed Oct 18 2006 Rex Dieter  1.9.93-1
 - 1.9.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Oct 2006 18:43:44 -0000	1.16
+++ sources	16 Nov 2006 20:59:46 -0000	1.17
@@ -1,2 +1,2 @@
-fc2d20e6e8aba396953768b503bf07fe  gnupg-1.9.93.tar.bz2.sig
-84b1af5b6c489fcbbbbf4f219aaf2526  gnupg-1.9.93.tar.bz2
+65dc5da3bd4ec127f81c584c8200d813  gnupg-2.0.0.tar.bz2.sig
+13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2


--- gnupg-1.9.91-dearmor.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 16 21:04:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 14:04:31 -0700
Subject: rpms/qt4/FC-6 qt4.spec,1.26,1.27
Message-ID: <200611162104.kAGL4VpF006638@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6622

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter  4.2.1-3
- move libQtDesigner to -x11



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/qt4.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4.spec	24 Oct 2006 11:47:42 -0000	1.26
+++ qt4.spec	16 Nov 2006 21:04:01 -0000	1.27
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -134,7 +134,7 @@
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-x11 = %{version}-%{release}
+Requires: %{name}-x11 
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -402,12 +402,12 @@
 %files x11 
 %defattr(-,root,root,-)
 %{qt_libdir}/libQt3Support.so.*
+%{qt_libdir}/libQtAssistantClient.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%if "%{version}" >= "4.2.0"
-%{qt_libdir}/libQtAssistantClient.so.*
-%endif
 %{qtdir}/plugins/*
 %exclude %{qtdir}/plugins/designer
 %exclude %{qtdir}/plugins/sqldrivers
@@ -449,8 +449,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -509,14 +507,17 @@
 
 
 %changelog
-* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+* Wed Nov 15 2006 Rex Dieter  4.2.1-3
+- move libQtDesigner to -x11
+
+* Mon Oct 23 2006 Rex Dieter  4.2.1-2
 - use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter  4.2.1-1
 - 4.2.1
 
-* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+* Wed Oct 04 2006 Rex Dieter  4.2.0-1
 - 4.2.0(final)
 
 * Thu Sep 28 2006 Kevin Kofler  4.2.0-0.9.20060927



From fedora-extras-commits at redhat.com  Thu Nov 16 21:06:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 14:06:14 -0700
Subject: rpms/qt4/FC-5 qt4.spec,1.21,1.22
Message-ID: <200611162106.kAGL6ERF006708@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6692

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter  4.2.1-3
- move libQtDesigner to -x11



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qt4.spec	23 Oct 2006 23:08:15 -0000	1.21
+++ qt4.spec	16 Nov 2006 21:05:37 -0000	1.22
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -134,7 +134,7 @@
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-x11 = %{version}-%{release}
+Requires: %{name}-x11 
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -402,12 +402,12 @@
 %files x11 
 %defattr(-,root,root,-)
 %{qt_libdir}/libQt3Support.so.*
+%{qt_libdir}/libQtAssistantClient.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%if "%{version}" >= "4.2.0"
-%{qt_libdir}/libQtAssistantClient.so.*
-%endif
 %{qtdir}/plugins/*
 %exclude %{qtdir}/plugins/designer
 %exclude %{qtdir}/plugins/sqldrivers
@@ -449,8 +449,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -509,14 +507,17 @@
 
 
 %changelog
-* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+* Wed Nov 15 2006 Rex Dieter  4.2.1-3
+- move libQtDesigner to -x11
+
+* Mon Oct 23 2006 Rex Dieter  4.2.1-2
 - use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter  4.2.1-1
 - 4.2.1
 
-* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+* Wed Oct 04 2006 Rex Dieter  4.2.0-1
 - 4.2.0(final)
 
 * Thu Sep 28 2006 Kevin Kofler  4.2.0-0.9.20060927



From fedora-extras-commits at redhat.com  Thu Nov 16 21:10:19 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 14:10:19 -0700
Subject: rpms/iksemel/devel iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.3,
	1.4
Message-ID: <200611162110.kAGLAJjK006883@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6860

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
Fix 64 bit issues.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("child");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("I'm fixing parser&tester for "<" and ">" chars.");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("Jabber Site");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("1234 lala ] ]] ]]] ]]>4321");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234  lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("abcd
      <escape>      ");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("john&mary");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("\xFF");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iksemel.spec	29 Aug 2006 00:49:56 -0000	1.3
+++ iksemel.spec	16 Nov 2006 21:09:49 -0000	1.4
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,7 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +116,11 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 1.2-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 21:15:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 14:15:27 -0700
Subject: rpms/qt4/FC-4 qt4.spec,1.16,1.17
Message-ID: <200611162115.kAGLFRt1007016@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6977

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter  4.1.5-3
- move libQtDesigner to -x11
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qt4.spec	23 Oct 2006 23:06:49 -0000	1.16
+++ qt4.spec	16 Nov 2006 21:14:57 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -67,9 +67,12 @@
 BuildRequires: freetype-devel
 BuildRequires: zlib-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -353,6 +356,8 @@
 %dir %{qtdir}/bin/
 %dir %{qt_datadir}
 %{qt_libdir}/libQtCore.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtNetwork.so.*
 %{qt_libdir}/libQtSql.so.*
 %{qt_libdir}/libQtTest.so.*
@@ -402,8 +407,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -462,6 +465,10 @@
 
 
 %changelog
+* Wed Nov 15 2006 Rex Dieter  4.1.5-3
+- move libQtDesigner to -x11
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
 * Mon Oct 23 2006 Rex Dieter  4.1.5-2
 - fix qm2ts conflict with qt-devel
 



From fedora-extras-commits at redhat.com  Thu Nov 16 21:15:41 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 16 Nov 2006 14:15:41 -0700
Subject: rpms/sylpheed/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sylpheed.spec, 1.41, 1.42
Message-ID: <200611162115.kAGLFf95007050@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6998

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
* Thu Nov 16 2006 Michael Schwendt  - 2.2.10-1
- Update to 2.2.10 (recommended bug-fixes only).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Sep 2006 08:28:36 -0000	1.22
+++ .cvsignore	16 Nov 2006 21:15:10 -0000	1.23
@@ -1,2 +1,2 @@
-sylpheed-2.2.9.tar.bz2.asc
-sylpheed-2.2.9.tar.bz2
+sylpheed-2.2.10.tar.bz2
+sylpheed-2.2.10.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Sep 2006 08:28:36 -0000	1.22
+++ sources	16 Nov 2006 21:15:10 -0000	1.23
@@ -1,2 +1,2 @@
-987cc37cfa2ad1116c5c60e4f399be30  sylpheed-2.2.9.tar.bz2.asc
-45e9e89775613b0afb732fbc11c73d26  sylpheed-2.2.9.tar.bz2
+68709cd07d2416c7aaeacf2c6921b1a2  sylpheed-2.2.10.tar.bz2
+ddbaab7d093c35592927a0cd426631ad  sylpheed-2.2.10.tar.bz2.asc


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sylpheed.spec	2 Oct 2006 19:40:12 -0000	1.41
+++ sylpheed.spec	16 Nov 2006 21:15:10 -0000	1.42
@@ -4,8 +4,8 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.2.9
-Release: 2%{?dist}
+Version: 2.2.10
+Release: 1%{?dist}
 License: GPL
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -84,6 +84,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 16 2006 Michael Schwendt  - 2.2.10-1
+- Update to 2.2.10 (recommended bug-fixes only).
+
 * Mon Oct 02 2006 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Nov 16 21:28:43 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 14:28:43 -0700
Subject: rpms/iksemel/devel iksemel.spec,1.4,1.5
Message-ID: <200611162128.kAGLSh3O007158@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7142

Modified Files:
	iksemel.spec 
Log Message:
Don't 'make check' on PPC.


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iksemel.spec	16 Nov 2006 21:09:49 -0000	1.4
+++ iksemel.spec	16 Nov 2006 21:28:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           iksemel
 Version:        1.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
 Group:          System Environment/Libraries
@@ -75,7 +75,9 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
+%ifnarch ppp
 make check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -116,6 +118,9 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
+- Don't run make check on PPC - tests failing.
+
 * Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
 - Add patch from Hans de Goede that fixes 64 bit issues
 - Re-enable "make check".



From fedora-extras-commits at redhat.com  Thu Nov 16 21:47:04 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 16 Nov 2006 14:47:04 -0700
Subject: rpms/dejavu-fonts import.log,1.89,1.90
Message-ID: <200611162147.kAGLl4H5007320@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7288

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.12-0.1.rc1.fc7 on branch devel from dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm
2.12-rc1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- import.log	22 Oct 2006 18:06:28 -0000	1.89
+++ import.log	16 Nov 2006 21:46:34 -0000	1.90
@@ -86,3 +86,4 @@
 dejavu-fonts-2_10_0-2_fc6:HEAD:dejavu-fonts-2.10.0-2.fc6.src.rpm:1159094676
 dejavu-fonts-2_11-1_fc6:HEAD:dejavu-fonts-2.11-1.fc6.src.rpm:1161539797
 dejavu-fonts-2_11-1_fc5:FC-5:dejavu-fonts-2.11-1.fc5.src.rpm:1161540378
+dejavu-fonts-2_12-0_1_rc1_fc7:HEAD:dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm:1163713579



From fedora-extras-commits at redhat.com  Thu Nov 16 21:47:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 16 Nov 2006 14:47:05 -0700
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.24, 1.25 dejavu-fonts.spec,
	1.47, 1.48 sources, 1.24, 1.25
Message-ID: <200611162147.kAGLl5KA007325@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7288/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.12-0.1.rc1.fc7 on branch devel from dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm
2.12-rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Oct 2006 17:56:48 -0000	1.24
+++ .cvsignore	16 Nov 2006 21:46:35 -0000	1.25
@@ -1 +1 @@
-dejavu-sfd-2.11.tar.gz
+dejavu-sfd-20061115-1287.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- dejavu-fonts.spec	22 Oct 2006 17:56:48 -0000	1.47
+++ dejavu-fonts.spec	16 Nov 2006 21:46:35 -0000	1.48
@@ -1,8 +1,8 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-#%define alphatag        20060913svn1149
+%define alphatag        .rc1
 
-%define archiveversion  2.11
+%define archiveversion  20061115-1287
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 
@@ -11,8 +11,8 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.11
-Release:   1%{?dist}
+Version:   2.12
+Release:   0.1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -154,10 +154,12 @@
 
 
 %changelog
-* Sun Oct 22 2006 Nicolas Mailhot 
-- 2.11
-- forget about the "condensed" generic, based on current feedback
-- new minimal fontforge BR
+* Thu Nov 16 2006 Nicolas Mailhot 
+- 2.12-0.1.rc1
+- 2.12-rc1 (a.k.a. 20061115svn1287)
+- ??????WARNING!!! this version reintroduces ligatures, since pulling them didn't
+  motivate Firefox people to fix their bug (in ~ 6 months). If you hit this
+  complain Firefox-side
 
 * Sun Sep 24 2006 Nicolas Mailhot 
 - 2.10.0-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Oct 2006 17:56:48 -0000	1.24
+++ sources	16 Nov 2006 21:46:35 -0000	1.25
@@ -1 +1 @@
-64a34c66b1dbbdaccc108bd40a101d9c  dejavu-sfd-2.11.tar.gz
+2320d60a8bd5d080fa2dfc040f459149  dejavu-sfd-20061115-1287.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 21:52:35 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 16 Nov 2006 14:52:35 -0700
Subject: rpms/dejavu-fonts import.log,1.90,1.91
Message-ID: <200611162152.kAGLqZwl007433@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7403

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.12-0.2.rc1.fc7 on branch devel from dejavu-fonts-2.12-0.2.rc1.fc7.src.rpm
fixup


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- import.log	16 Nov 2006 21:46:34 -0000	1.90
+++ import.log	16 Nov 2006 21:52:05 -0000	1.91
@@ -87,3 +87,4 @@
 dejavu-fonts-2_11-1_fc6:HEAD:dejavu-fonts-2.11-1.fc6.src.rpm:1161539797
 dejavu-fonts-2_11-1_fc5:FC-5:dejavu-fonts-2.11-1.fc5.src.rpm:1161540378
 dejavu-fonts-2_12-0_1_rc1_fc7:HEAD:dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm:1163713579
+dejavu-fonts-2_12-0_2_rc1_fc7:HEAD:dejavu-fonts-2.12-0.2.rc1.fc7.src.rpm:1163713911



From fedora-extras-commits at redhat.com  Thu Nov 16 21:52:36 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 16 Nov 2006 14:52:36 -0700
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.48,1.49
Message-ID: <200611162152.kAGLqaBN007436@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7403/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.12-0.2.rc1.fc7 on branch devel from dejavu-fonts-2.12-0.2.rc1.fc7.src.rpm
fixup


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- dejavu-fonts.spec	16 Nov 2006 21:46:35 -0000	1.48
+++ dejavu-fonts.spec	16 Nov 2006 21:52:06 -0000	1.49
@@ -12,7 +12,7 @@
 
 Name:      dejavu-fonts
 Version:   2.12
-Release:   0.1%{?alphatag}%{?dist}
+Release:   0.2%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -155,7 +155,7 @@
 
 %changelog
 * Thu Nov 16 2006 Nicolas Mailhot 
-- 2.12-0.1.rc1
+- 2.12-0.2.rc1
 - 2.12-rc1 (a.k.a. 20061115svn1287)
 - ??????WARNING!!! this version reintroduces ligatures, since pulling them didn't
   motivate Firefox people to fix their bug (in ~ 6 months). If you hit this



From fedora-extras-commits at redhat.com  Thu Nov 16 21:57:38 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 14:57:38 -0700
Subject: rpms/iksemel/devel iksemel.spec,1.5,1.6
Message-ID: <200611162157.kAGLvc1w007510@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7494

Modified Files:
	iksemel.spec 
Log Message:
Fix typo.


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iksemel.spec	16 Nov 2006 21:28:13 -0000	1.5
+++ iksemel.spec	16 Nov 2006 21:57:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           iksemel
 Version:        1.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
 Group:          System Environment/Libraries
@@ -75,7 +75,7 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-%ifnarch ppp
+%ifnarch ppc
 make check
 %endif
 
@@ -118,6 +118,9 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-13
+- ppp != ppc
+
 * Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
 - Don't run make check on PPC - tests failing.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 22:17:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:17:56 -0700
Subject: rpms/unshield/FC-3 unshield-x86-64.patch, NONE, 1.1 unshield.spec,
	1.2, 1.3
Message-ID: <200611162217.kAGMHuAB010889@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/FC-3

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/FC-3/unshield.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unshield.spec	13 Sep 2005 10:59:06 -0000	1.2
+++ unshield.spec	16 Nov 2006 22:17:26 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-3
+- fix #212516 (thanks to Hans de Goede)
+
 * Tue Sep 13 2005 Andreas Bierfert 
 0.5-2
 - add dist



From fedora-extras-commits at redhat.com  Thu Nov 16 22:17:57 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:17:57 -0700
Subject: rpms/unshield/FC-4 unshield-x86-64.patch, NONE, 1.1 unshield.spec,
	1.2, 1.3
Message-ID: <200611162217.kAGMHvfi010892@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/FC-4

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/FC-4/unshield.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unshield.spec	13 Sep 2005 10:59:06 -0000	1.2
+++ unshield.spec	16 Nov 2006 22:17:27 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-3
+- fix #212516 (thanks to Hans de Goede)
+
 * Tue Sep 13 2005 Andreas Bierfert 
 0.5-2
 - add dist



From fedora-extras-commits at redhat.com  Thu Nov 16 22:17:58 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:17:58 -0700
Subject: rpms/unshield/FC-5 unshield-x86-64.patch, NONE, 1.1 unshield.spec,
	1.3, 1.4
Message-ID: <200611162218.kAGMHwJT010895@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/FC-5

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/FC-5/unshield.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unshield.spec	16 Feb 2006 23:07:03 -0000	1.3
+++ unshield.spec	16 Nov 2006 22:17:27 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-4
+- fix #212516 (thanks to Hans de Goede)
+
 * Thu Feb 16 2006 Andreas Bierfert 
 0.5-3
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Thu Nov 16 22:18:04 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:18:04 -0700
Subject: rpms/unshield/FC-6 unshield-x86-64.patch, NONE, 1.1 unshield.spec,
	1.5, 1.6
Message-ID: <200611162218.kAGMI4pV010898@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/FC-6

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/FC-6/unshield.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unshield.spec	4 Oct 2006 23:01:35 -0000	1.5
+++ unshield.spec	16 Nov 2006 22:17:33 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-6
+- fix #212516 (thanks to Hans de Goede)
+
 * Thu Oct 05 2006 Christian Iseli  0.5-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Nov 16 22:18:04 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:18:04 -0700
Subject: rpms/unshield/devel unshield-x86-64.patch, NONE, 1.1 unshield.spec, 
	1.5, 1.6
Message-ID: <200611162218.kAGMI4N3010901@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/devel

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/unshield.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unshield.spec	4 Oct 2006 23:01:35 -0000	1.5
+++ unshield.spec	16 Nov 2006 22:17:34 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-6
+- fix #212516 (thanks to Hans de Goede)
+
 * Thu Oct 05 2006 Christian Iseli  0.5-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Nov 16 22:48:59 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 16 Nov 2006 15:48:59 -0700
Subject: rpms/lilypond-doc/devel .cvsignore, 1.5, 1.6 lilypond-doc.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611162248.kAGMmxgr011307@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11287

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Oct 2006 13:31:46 -0000	1.5
+++ .cvsignore	16 Nov 2006 22:48:28 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7-1.documentation.tar.bz2
+lilypond-2.10.0-2.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/lilypond-doc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lilypond-doc.spec	10 Oct 2006 13:31:46 -0000	1.4
+++ lilypond-doc.spec	16 Nov 2006 22:48:28 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           lilypond-doc
-Version:        2.8.7
-Release:	1%{?dist}
+Version:        2.10.0
+Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
 Group:		Applications/Publishing
 License:	GPL
 URL:		http://www.lilypond.org
-Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-1.documentation.tar.bz2
+Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-2.documentation.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Quentin Spencer  2.10.0-1
+- New release.
+
 * Tue Oct 10 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Oct 2006 13:31:46 -0000	1.5
+++ sources	16 Nov 2006 22:48:28 -0000	1.6
@@ -1 +1 @@
-492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2
+b4fae3abd129e0a19ceddb3dae03fb28  lilypond-2.10.0-2.documentation.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 22:59:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 15:59:29 -0700
Subject: rpms/iksemel/FC-6 iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.3,
	1.4
Message-ID: <200611162259.kAGMxTjp011426@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11400

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
64bit fixes.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("child");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("I'm fixing parser&tester for "<" and ">" chars.");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("Jabber Site");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("1234 lala ] ]] ]]] ]]>4321");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234  lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("abcd
      <escape>      ");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("john&mary");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("\xFF");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/FC-6/iksemel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iksemel.spec	29 Aug 2006 00:49:56 -0000	1.3
+++ iksemel.spec	16 Nov 2006 22:58:59 -0000	1.4
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        10%{?dist}
+Release:        13%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,9 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+%ifnarch ppc
+make check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +118,17 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-13
+- ppp != ppc
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
+- Don't run make check on PPC - tests failing.
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 1.2-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 23:01:34 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 16:01:34 -0700
Subject: rpms/iksemel/FC-5 iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.2,
	1.3
Message-ID: <200611162301.kAGN1YiU014529@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11520

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
64bit fixes.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("child");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("I'm fixing parser&tester for "<" and ">" chars.");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("Jabber Site");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("1234 lala ] ]] ]]] ]]>4321");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234  lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("abcd
      <escape>      ");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("john&mary");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("\xFF");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/FC-5/iksemel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iksemel.spec	3 Aug 2006 00:54:14 -0000	1.2
+++ iksemel.spec	16 Nov 2006 23:00:57 -0000	1.3
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        6%{?dist}
+Release:        13%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,9 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+%ifnarch ppc
+make check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +118,20 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-13
+- ppp != ppc
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
+- Don't run make check on PPC - tests failing.
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
+* Mon Aug 28 2006 Jeffrey C. Ollie  - 1.2-10
+- Bump release and rebuild.
+
 * Wed Aug  2 2006 Jeffrey C. Ollie  - 1.2-6
 - Temporarily disable make check until problems with it can be figured out.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 23:04:06 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 16 Nov 2006 16:04:06 -0700
Subject: rpms/flow-tools/devel flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.10, 1.11
Message-ID: <200611162304.kAGN46hH014598@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14579

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz212928

flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/flow-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flow-tools.spec	10 Sep 2006 09:22:53 -0000	1.10
+++ flow-tools.spec	16 Nov 2006 23:03:36 -0000	1.11
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,6 +14,7 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
 * Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 16 23:07:55 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 16:07:55 -0700
Subject: rpms/iksemel/FC-4 iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.2,
	1.3
Message-ID: <200611162307.kAGN7tY8014650@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14619

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
64bit fixes.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("child");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("I'm fixing parser&tester for "<" and ">" chars.");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("Jabber Site");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("1234 lala ] ]] ]]] ]]>4321");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234  lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("abcd
      <escape>      ");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("john&mary");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("\xFF");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/FC-4/iksemel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iksemel.spec	3 Aug 2006 00:55:17 -0000	1.2
+++ iksemel.spec	16 Nov 2006 23:07:24 -0000	1.3
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        6%{?dist}
+Release:        13%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,9 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+%ifnarch ppc
+make check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +118,20 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-13
+- ppp != ppc
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
+- Don't run make check on PPC - tests failing.
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
+* Mon Aug 28 2006 Jeffrey C. Ollie  - 1.2-10
+- Bump release and rebuild.
+
 * Wed Aug  2 2006 Jeffrey C. Ollie  - 1.2-6
 - Temporarily disable make check until problems with it can be figured out.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 23:22:39 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 16:22:39 -0700
Subject: rpms/beryl-core/devel beryl-core.spec,1.2,1.3
Message-ID: <200611162322.kAGNMdZx014876@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14859

Modified Files:
	beryl-core.spec 
Log Message:
Fix up -devel Requires to minimize pain in sub-packages


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beryl-core.spec	15 Nov 2006 15:22:26 -0000	1.2
+++ beryl-core.spec	16 Nov 2006 23:22:09 -0000	1.3
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -39,6 +40,12 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+# These Requires: are things (most) beryl sub-packages
+# need to build, so they can minimally BR: beryl-core-devel
+Requires: libX11-devel, libXfixes-devel, libXrender-devel
+Requires: libXdamage-devel, libXcomposite-devel >= 0.3
+Requires: libXext-devel, libXinerama-devel, libXrandr-devel
+Requires: libSM-devel, libpng-devel, startup-notification-devel
 
 %description devel
 The beryl-core-devel package includes the header
@@ -145,6 +152,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Nov 16 2006 Jarod Wilson  0.1.2-5
+- Add BR: libXinerama-devel
+- Fix up R: for beryl-core-devel
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-4
 - Don't Provides: beryl, instead create meta-packages
 - Minimize config flags, the build figures it out itself



From fedora-extras-commits at redhat.com  Thu Nov 16 23:23:24 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 16:23:24 -0700
Subject: rpms/beryl-core/FC-6 beryl-core.spec,1.2,1.3
Message-ID: <200611162323.kAGNNOpS014923@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-serv14888

Modified Files:
	beryl-core.spec 
Log Message:
Fix up -devel Requires to minimize pain in sub-packages


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beryl-core.spec	15 Nov 2006 15:22:26 -0000	1.2
+++ beryl-core.spec	16 Nov 2006 23:22:54 -0000	1.3
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -39,6 +40,12 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+# These Requires: are things (most) beryl sub-packages
+# need to build, so they can minimally BR: beryl-core-devel
+Requires: libX11-devel, libXfixes-devel, libXrender-devel
+Requires: libXdamage-devel, libXcomposite-devel >= 0.3
+Requires: libXext-devel, libXinerama-devel, libXrandr-devel
+Requires: libSM-devel, libpng-devel, startup-notification-devel
 
 %description devel
 The beryl-core-devel package includes the header
@@ -145,6 +152,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Nov 16 2006 Jarod Wilson  0.1.2-5
+- Add BR: libXinerama-devel
+- Fix up R: for beryl-core-devel
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-4
 - Don't Provides: beryl, instead create meta-packages
 - Minimize config flags, the build figures it out itself



From fedora-extras-commits at redhat.com  Fri Nov 17 00:22:57 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:22:57 -0700
Subject: rpms/gcin/devel NewCJ3.cin,1.1,1.2 gcin.spec,1.12,1.13
Message-ID: <200611170022.kAH0Mv2R018478@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18460

Modified Files:
	NewCJ3.cin gcin.spec 
Log Message:
add gcin129update.patch and update NewCj3.cin


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin	15 Nov 2006 06:49:04 -0000	1.1
+++ NewCJ3.cin	17 Nov 2006 00:22:26 -0000	1.2
@@ -52,7 +52,6 @@
 ... ???
 ... ???
 ... ???
-.; ???
 ' ???
 '' "
 '' "
@@ -171,7 +170,6 @@
 ;a ???
 ;b ???
 ;c ???
-;cu ???
 ;d ???
 ;e ???
 ;f ???
@@ -194,7 +192,9 @@
 ;s ???
 ;t ???
 ;u ???
+;ui ??????
 ;uu ??????
+;uio ?????????
 ;u; ???
 ;v ???
 ;w ???
@@ -216,7 +216,7 @@
 b ???
 b ???
 b ???
-b; ???
+b; ???
 b;; ??????
 c ???
 c ???
@@ -249,7 +249,7 @@
 f ???
 f ???
 f ???
-f; ???
+f; ???
 g ???
 g ???
 g ???
@@ -297,7 +297,7 @@
 l ???
 l ???
 l ???
-l; ???
+l; ???
 m ???
 m ???
 m ???
@@ -347,7 +347,7 @@
 q ???
 q ???
 q ???
-q; ???
+q; ???
 r ???
 r ??
 r ???
@@ -382,7 +382,6 @@
 t ???
 t ???
 t; ???
-t;; ???
 u ???
 u ???
 u ???
@@ -410,7 +409,6 @@
 w ???
 w ???
 w; ???
-w;; ???
 x ???
 x ???
 x ???
@@ -459,7 +457,6 @@
 w. ???
 x. ???
 x. ??
-x.; ??
 y. ???
 z. ???
 a, ???
@@ -493,11 +490,9 @@
 ab ???
 ac ???
 ad ???
-ad; ???
 ae ???
 af ???
 af ???
-af; ???
 ag ???
 ah ???
 ai ???
@@ -526,7 +521,7 @@
 bd ???
 be ???
 bf ???
-bf; ???
+bf; ?????????
 bg ???
 bg ???
 bh ???
@@ -537,8 +532,8 @@
 bm ???
 bm ???
 bm ???
+bn ???
 bn ???
-bn; ???
 bo ???
 bp ???
 bq ???
@@ -546,7 +541,6 @@
 bs ???
 bt ???
 bt ???
-bt; ???
 bu ???
 bv ???
 bw ???
@@ -571,21 +565,18 @@
 ck ???
 cl ???
 cl ???
-cl; ???
 cm ???
 cn ???
 cn; ???
 co ???
 cp ???
-cq ???
-cq; ???
+cq ???
 cr ???
 cs ???
 ct ???
 cu ???
 cu; ???
 cv ???
-cv; ???
 cw ???
 cx ???
 cx; ??????
@@ -605,14 +596,12 @@
 dh ???
 di ???
 di ???
-di; ???
 dj ???
 dk ???
 dk ???
 dl ???
 dm ???
 dm ???
-dm; ???
 dn ???
 do ???
 dp ???
@@ -630,11 +619,11 @@
 ea ???
 ea ???
 ea ???
-ea; ???
 eb ???
 ec ???
 ec ???
 ed ???
+ee ???
 ee ???
 ef ???
 eg ???
@@ -692,7 +681,6 @@
 ga ???
 gb ???
 gb ???
-gb; ???
 gc ???
 gd ???
 ge ???
@@ -715,7 +703,6 @@
 gt ???
 gu ???
 gu ???
-gu; ???
 gv ???
 gw ???
 gx ???
@@ -724,38 +711,28 @@
 ha ???
 hb ???
 hc ???
-hc; ???
 hd ???
 hd; ???
 he ???
-he; ???
 hf ???
 hg ???
-hg; ???
 hh ???
-hh; ???
 hi ???
 hi ???
 hi; ???
 hj ???
 hk ???
-hk; ???
 hl ???
-hm ???
 hm ???
-hm; ???
 hn ???
-hn; ???
 ho ???
 ho ???
-ho; ???
 hp ???
-hp; ???
 hq ???
 hr ???
 hs ???
 hs ???
-hs; ???
+hs; ???
 ht ???
 ht; ???
 ht;; ??????
@@ -766,26 +743,18 @@
 hw; ??????
 hx ???
 hx; ???
-hy ???
-hy; ???
+hy ???
 hz ???
 ia ???
 ib ???
-ib; ???
 ic ???
 id ???
 id ???
-id; ???
-id; ???
 ie ???
-if ???
-if; ??????
+if ??????
 ig ???
 ih ???
-ih; ???
 ii ???
-ii ???
-ii; ???
 ij ???
 ik ???
 il ???
@@ -794,16 +763,15 @@
 io ???
 io; ???
 io; ???
-ip ???
+ip ???
 ip ???
 ip ???
-ip; ???
+ip ???
 iq ???
 ir ???
 is ???
 it ???
 it ???
-it; ???
 iu ???
 iv ???
 iv; ???
@@ -813,8 +781,8 @@
 iz ???
 izo ??????
 ja ???
+jb ???
 jb ???
-jb; ???
 jc ???
 jd ???
 jd ???
@@ -824,8 +792,6 @@
 jh ???
 ji ???
 jj ???
-jj; ???
-jj; ???
 jk ???
 jk; ???
 jl ???
@@ -837,7 +803,6 @@
 jp ???
 jq ???
 jr ???
-jr; ???
 js ???
 jt ???
 ju ???
@@ -849,13 +814,11 @@
 ka ???
 kb ???
 kb ???
-kb; ???
 kc ???
 kd ???
 ke ???
 kf ???
 kf ???
-kf; ???
 kg ???
 kh ???
 ki ???
@@ -866,18 +829,16 @@
 km ???
 kn ???
 kn ???
-kn; ???
 ko ???
 ko; ???
+kp ???
 kp ???
-kp; ???
 kq ???
 kr ???
 ks ???
 kt ???
 ku ???
 ku ???
-ku; ???
 ku; ???
 kv ???
 kw ???
@@ -885,9 +846,7 @@
 ky ???
 kz ???
 la ???
-la; ???
 lb ???
-lb; ???
 lc ???
 ld ???
 le ???
@@ -908,85 +867,70 @@
 ls ???
 lt ???
 lu ???
-lu; ???
 lv ???
 lw ???
+lw; ???
 lx ???
 ly ???
 lz ???
 ma ???
 mb ???
-mb; ???
 mc ???
-mc; ???
 md ???
 me ???
 me ???
 me ???
 me; ???
 mf ???
-mf; ???
 mg ???
+mh ???
 mh ???
-mh; ???
 mi ???
 mi; ???
 mj ???
 mk ???
-mk; ???
+mk; ???
+ml ???
 ml ???
-ml; ???
 mm ???
-mm ???
-mm; ???
 mn ???
 mo ???
-mo; ???
 mp ???
 mq ???
 mr ???
 ms ???
-ms; ???
 mt ???
-mt; ???
+mu ???
 mu ???
 mu ???
-mu; ???
-mv ???
+mv ???
 mv ???
-mv; ???
 mw ???
+mw; ???
 mx ???
 my ???
 mz ???
 na ???
 nb ???
-nb; ???
 nc ???
 nd ???
 ne ???
-ne; ???
 nf ???
 ng ???
 nh ???
 ni ???
 ni ???
-ni; ???
-ni; ???
-ni;; ???
 nj ???
 nk ???
 nl ???
 nl ???
-nl; ???
 nm ???
 nn ???
 no ???
 no ???
 no ???
-no No.
-no; ???
 np ???
+nq ???
 nq ???
 nq ???
 nq; ???
@@ -998,7 +942,6 @@
 nw ???
 nx ???
 nx ???
-nx; ???
 ny ???
 nz ???
 oa ???
@@ -1010,8 +953,8 @@
 ob ???
 ob ???
 ob; ???
+oc ???
 oc ???
-oc; ???
 od ???
 od ???
 od ???
@@ -1039,7 +982,6 @@
 og ???
 og ???
 og ???
-og; ???
 oh ???
 oh ???
 oh ???
@@ -1056,7 +998,6 @@
 oi ???
 oi ???
 oi ???
-oi; ???
 oj ???
 oj ???
 oj ???
@@ -1075,9 +1016,7 @@
 om ???
 om ???
 om ???
-om; ???
 on ???
-on; ???
 oo ???
 oo ???
 oo ???
@@ -1118,7 +1057,6 @@
 oq ???
 oq ???
 or ???
-or; ???
 or ???
 or ???
 or ???
@@ -1162,10 +1100,10 @@
 ou ???
 ou ???
 ou ???
-ou; ???
 ov ???
-ov; ???
+ow ???
 ow ???
+ow; ???
 ow ???
 ow ???
 ow ???
@@ -1177,7 +1115,6 @@
 ow ???
 ow ???
 ow ???
-ow; ???
 ox ???
 oy ???
 oy ???
@@ -1191,14 +1128,13 @@
 oy ???
 oy ???
 oy ???
-oy; ???
 oz ???
 pa ???
 pa ???
 pa; ???
 pb ???
+pc ???
 pc ???
-pc; ???
 pd ???
 pe ???
 pe; ??????
@@ -1207,14 +1143,13 @@
 ph ???
 pi ???
 pi ???
-pi; ???
 pj ???
+pk ???
 pk ???
-pk; ???
 pl ???
 pm ???
+pn ???
 pn ???
-pn; ???
 po ???
 pp ???
 pq ???
@@ -1227,74 +1162,66 @@
 px ???
 py ???
 pz ???
+qa ???
 qa ???
-qa; ???
+qb ???
 qb ???
-qb; ???
+qc ???
 qc ???
-qc; ???
+qd ???
 qd ???
-qd; ???
 qe ???
 qf ???
 qg ???
 qh ???
 qi ???
 qj ???
-qj; ???
 qk ???
 ql ???
 qm ???
-qm; ???
 qn ???
 qo ???
 qp ???
-qq ???
+qq ???
 qr ???
 qs ???
 qt ???
 qu ???
-qu; ???
 qv ???
 qw ???
 qx ???
+qy ???
 qy ???
-qy; ???
 qz ???
 ra ???
 rb ???
-rb; ???
 rc ???
 rc ???
-rc; ???
 rd ???
 re ???
 rf ???
-rf; ???
 rg ???
 rh ???
 ri ???
 rj ???
 rk ???
+rk; ???
 rl ???
 rm ???
 rn ???
 ro ???
 rp ???
-rp; ???
 rq ???
 rr ???
 rs ???
-rt ???
+rt ???
 ru ???
-ru; ???
 ru; ???
 rv ???
 rw ???
 rx ???
 ry ???
 rz ???
-rz; ???
 sa ???
 sb ???
 sc ???
@@ -1314,12 +1241,10 @@
 sp ???
 sq ???
 sr ???
-sr; ???
 ss ???
 st ???
-su ???
 su ???
-su; ???
+su ???
 sv ???
 sw ???
 sw; ???
@@ -1327,7 +1252,6 @@
 sy ???
 sz ???
 ta ???
-ta; ???
 tb ???
 tc ???
 tc ???
@@ -1335,25 +1259,22 @@
 te ???
 tf ???
 tg ???
-tg; ???
 th ???
+ti ???
 ti ???
-ti; ???
+tj ???
 tj ???
-tj; ???
 tj; ???
 tk ???
 tk; ???
 tl ???
 tm ???
-tm; ???
 tn ???
-tn; ???
 tn; ???
 tn; ???
 to ???
+tp ???
 tp ???
-tp; ???
 tq ???
 tr ???
 ts ???
@@ -1361,16 +1282,14 @@
 tt ???
 tt ???
 tt ???
-tt; ???
-tu ???
-tu; ???
+tt; ???
+tu ???
 tv ???
 tv; ???
 tw ???
 tw ???
 tw; ???
 tw; ???
-tw;; ???
 tx ???
 ty ???
 tz ???
@@ -1404,8 +1323,8 @@
 uy ???
 uz ???
 va ???
-vb ???
-vb; ???
+va; ???
+vb ???
 vc ???
 vd ???
 ve ???
@@ -1416,32 +1335,29 @@
 vi ???
 vj ???
 vk ???
-vk; ???
-vl ???
-vl ???
+vl ???
 vl ???
 vl; ???
+vm ???
 vm ???
-vm; ???
+vm; ???
 vn ???
 vo ???
 vo; ???
 vp ???
 vq ???
 vr ???
-vr; ???
 vs ???
 vt ???
+vu ???
 vu ???
-vu; ???
+vv ???
 vv ???
-vv; ???
 vw ???
 vx ???
-vy ???
-vy; ???
+vy ???
+vz ???
 vz ???
-vz; ???
 wa ???
 wb ???
 wc ???
@@ -1451,13 +1367,11 @@
 we ???
 wf ???
 wg ???
-wg; ???
 wh ???
 wi ???
 wj ???
 wj ???
 wk ???
-wk ???
 wl ???
 wm ???
 wn ???
@@ -1468,14 +1382,13 @@
 ws ???
 wt ???
 wu ???
+wv ???
 wv ???
-wv; ???
-ww ???
+ww ???
 wx ???
 wy ???
 wz ???
 wz ???
-wz; ???
 xa ???
 xb ???
 xc ???
@@ -1491,7 +1404,6 @@
 xm ???
 xn ???
 xo ???
-xo; ??
 xp ???
 xq ???
 xr ???
@@ -1518,30 +1430,28 @@
 yj ???
 yj; ???
 yk ???
-yk; ???
 yl ???
 ym ???
 yn ???
 yo ???
 yo; ???
+yp ???
 yp ???
-yp; ???
 yp; ???
 yq ???
 yr ???
+ys ???
 ys ???
-ys; ???
 yt ???
+yu ???
 yu ???
-yu; ???
 yv ???
 yw ???
 yx ???
+yy ???
 yy ???
-yy; ???
 yy, ??????
 yz ???
-yz; ???
 za ???
 zb ???
 zc ???
@@ -1555,7 +1465,7 @@
 zk ???
 zl ???
 zm ???
-zm; ???
+zm ???
 zn ???
 zo ???
 zp ???
@@ -1564,12 +1474,12 @@
 zs ???
 zt ???
 zu ???
-zu; ???
+zu ???
 zv ???
 zw ???
 zx ???
 zy ???
-zy; ???
+zy ???
 zz ???
 aaa ???
 aaa ???
@@ -6623,6 +6533,7 @@
 nbp ???
 nbp; ???
 nbu ???
+ncj ????????????
 ncz ???
 nde ???
 ndk ???
@@ -7052,10 +6963,9 @@
 ojg ???
 oji ???
 ojj ???
+ojk ???
 ojk ???
 ojk ???
-ojk ???
-ojk; ???
 ojm ???
 ojm ???
 ojm; ???
@@ -8546,20 +8456,8 @@
 rgc ???
 rgc ???
 rgc ???
-rgc (?????????)a
-rgc (?????????|||)??????
-rgc =???=b
-rgc ???????????????|||??????
 rgc; ???
 rgg ???
-rgg (????????????)
-rgg ???(???_???;)???
-rgg ??????~??????~
-rgg (??????O???)
-rgg .......\(><)/
-rgg ???*@??@*???
-rgg O_o
-rgg ???(???_???;)?????????~??????~
 rgi ???
 rgj ???
 rgk ???
@@ -9681,9 +9579,8 @@
 tmb ???
 tmb ???
 tmb; ???
-tmc ???
 tmc ???
-tmc; ???
+tmc ???
 tmd ???
 tmd ???
 tmd; ???
@@ -19631,6 +19528,7 @@
 somr ???
 sonl ???
 sorc ???
+sorr ?????????
 sphf ???
 sphh ???
 sqnl ???
@@ -28614,7 +28512,6 @@
 bopo ???
 boqa ???
 boqb ???
-boqh ????????????
 borb ????
 borg ????
 bort ????


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	15 Nov 2006 06:49:04 -0000	1.12
+++ gcin.spec	17 Nov 2006 00:22:27 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         gcin129update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .up
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -107,6 +109,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+- add gcin129update.patch
+- update NewCJ3.cin
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Fri Nov 17 00:25:49 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:25:49 -0700
Subject: rpms/gcin/devel gcin129update.patch,NONE,1.1 gcin.spec,1.13,1.14
Message-ID: <200611170025.kAH0PnCd018561@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18528

Modified Files:
	gcin.spec 
Added Files:
	gcin129update.patch 
Log Message:
add gcin129update.patch

gcin129update.patch:

--- NEW FILE gcin129update.patch ---
diff -urN gcin-1.2.9.orig/Changelog gcin-1.2.9/Changelog
--- gcin-1.2.9.orig/Changelog	2006-11-14 18:24:09.000000000 +0800
+++ gcin-1.2.9/Changelog	2006-11-15 18:52:02.000000000 +0800
@@ -1,5 +1,5 @@
 ** UTF-8 encoding **
-1.2.9:
+1.2.9: (11/15/2006)
 - ???????????? tray icons ???????????? ~/.gcin/icons ???????????? symbolic link ?????????
 - ????????????????????????????????? tray icons??????????????????????????????
 - ???????????????????????????????????????????????????????????????????????????
@@ -7,7 +7,7 @@
 - ???????????????????????? FC6??????????????????????????????
 - ????????? WM(fvwm1) ?????????????????????????????????????????????????????? keyboard focus ??????????????????????????? gcin ??? window????????????????????? click ????????????????????????????????????????????????????????? WM or X11 server ???????????? focus ??????????????? override_redirect ??? window???
 - FreeBSD /usr/bin/bash ??????????????? ./configure ?????????????????? /bin/bash -> /usr/bin/bash
-- libgcin-im-client.so ?????? soname???thanks to caleb
+- libgcin-im-client.so ?????? soname???thanks to candyz
 
 
 1.2.8: (10/19/2006)
diff -urN gcin-1.2.9.orig/configure gcin-1.2.9/configure
--- gcin-1.2.9.orig/configure	2006-11-06 09:29:26.000000000 +0800
+++ gcin-1.2.9/configure	2006-11-15 18:53:54.000000000 +0800
@@ -74,7 +74,7 @@
   echo "/bin/bash -> /usr/bin/bash"
   for i in scripts/*
   do
-    sed -e "s~/bin~/usr/bin" < $i > $i.tmp
+    sed -e "s~/bin~/usr/bin~" < $i > $i.tmp
     mv $i.tmp $i
   done
 fi
diff -urN gcin-1.2.9.orig/data/tsin.src gcin-1.2.9/data/tsin.src
--- gcin-1.2.9.orig/data/tsin.src	2006-11-15 13:05:04.000000000 +0800
+++ gcin-1.2.9/data/tsin.src	2006-11-15 18:56:36.000000000 +0800
@@ -1049,6 +1049,7 @@
 ?????? ???4 ?????? 0
 ?????? ???4 ??????4 0
 ????????????????????? ???4 ?????????2 ???2 ??? ???2 ?????????2 ??????3 0
+????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
 ???????????? ???4 ???2 ???4 ?????????3 0
 ???????????? ???4 ???2 ?????????3 ?????????3 0
 ???????????? ???4 ???2 ??? ?????????3 0
@@ -1439,6 +1440,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????4 ?????????2 ??????2 0
 ???????????? ??????2 ??????4 ?????????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -1448,6 +1450,7 @@
 ???????????? ??????2 ??????4 ?????? ??????4 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ??????4 0
+????????? ??????2 ??????4 ?????????4 0
 ????????? ??????2 ??????4 ??????2 0
 ???????????? ??????2 ??????2 ??????3 ?????????4 0
 ?????? ??????2 ?????????2 0
@@ -1458,6 +1461,7 @@
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????? 0
 ???????????? ??????2 ??????2 ???3 ?????????3 0
+???????????? ??????2 ??????2 ??????2 ??????4 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ??????3 ?????? 0
 ?????? ??????2 ??????2 0
@@ -2442,6 +2446,7 @@
 ????????? ??????3 ??????4 ?????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????2 0
+????????? ??????3 ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
@@ -2547,6 +2552,7 @@
 ?????? ??? ??? 0
 ???????????? ??? ?????? ??????3 ????????? 0
 ?????? ??? ?????????3 0
+???????????? ???2 ???4 ??????2 ?????????4 0
 ?????? ???2 ???4 0
 ?????? ???2 ???4 0
 ???????????? ???2 ??? ???2 ??????4 0
@@ -2556,19 +2562,23 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ????????? 0
 ????????? ???2 ???4 ????????? 0
+???????????? ???2 ??????4 ??????2 ?????????2 0
 ???????????? ???2 ?????? ???2 ??????4 0
 ???????????? ???2 ??????2 ???3 ?????????4 0
+????????????????????? ???2 ??????2 ?????????4 ????????? ????????? ??????4 ??????3 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????3 ???2 ????????? 0
 ???????????? ???2 ??????2 ???2 ???4 0
 ???????????? ???2 ??????2 ??????2 ???4 0
 ????????? ???2 ??????3 ?????????2 0
 ?????? ???2 ??????4 0
+???????????? ???2 ??????3 ??????2 ??????4 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????4 ??? ?????? 0
 ???????????? ???2 ??????4 ??????4 ??????3 0
 ???????????? ???2 ???3 ?????????2 ??????3 0
 ???????????? ???2 ???4 ??????2 ?????? 0
+???????????? ???2 ?????? ???2 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ???2 ??????4 0
 ???????????? ???2 ??????3 ??????2 ?????????4 0
@@ -2577,6 +2587,8 @@
 ???????????? ???2 ?????? ???4 ???2 0
 ??????????????? ???2 ??????4 ???3 ??? ??????4 0
 ?????? ???2 ??????4 0
+???????????? ???2 ????????? ???2 ??????4 0
+???????????? ???2 ?????????4 ?????? ??????2 0
 ???????????? ???2 ?????????2 ???2 ??????4 0
 ????????? ???2 ?????????3 ??????2 0
 ???????????? ???2 ?????????2 ?????? ?????????2 0
@@ -2585,19 +2597,26 @@
 ????????? ???2 ?????????2 ???4 0
 ?????? ???2 ??????3 0
 ???????????? ???2 ??????3 ???2 ????????? 0
+???????????? ???2 ??????3 ??????3 ?????????3 0
 ???????????? ???2 ??????3 ?????? ?????????4 0
+???????????? ???2 ?????? ????????? ???4 0
 ?????? ???2 ??????2 0
 ??????????????? ???2 ?????? ??????4 ??????3 ??????4 0
+???????????? ???2 ??????2 ????????? ??????4 0
 ????????? ???2 ??????3 ??????2 0
 ?????? ???2 ??????2 0
 ????????? ???2 ??????3 ?????????4 0
+???????????? ???2 ??????4 ??????4 ???3 0
+???????????? ???2 ??????4 ???4 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ??????3 ???3 0
+??????????????? ???2 ??????2 ??????2 ??????4 ?????? 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ??????4 ???3 0
 ???????????? ???2 ?????????4 ???2 ????????? 0
 ???????????? ???2 ??????2 ?????? ??????2 0
 ?????? ???2 ??????2 0
+????????? ???2 ?????????2 ?????????4 0
 ?????? ???2 ?????????2 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
@@ -2610,6 +2629,8 @@
 ?????? ???2 ??????4 0
 ????????? ???2 ??????4 ??????3 0
 ???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ?????? ?????????4 0
+??????????????? ???2 ??????4 ??????2 ??? ??????4 0
 ?????? ???2 ?????????2 0
 ???????????? ???2 ??????4 ??????3 ??????3 0
 ?????? ???2 ?????????4 0
@@ -2618,13 +2639,18 @@
 ????????? ???2 ?????? ??????1 0
 ????????? ???2 ????????? ???2 0
 ?????? ???2 ????????? 0
+??????????????? ???2 ????????? ???4 ?????? ????????? 0
 ???????????? ???2 ????????? ?????????4 ??????3 0
+???????????? ???2 ????????? ?????????3 ??????4 0
 ??????????????? ???2 ????????? ?????????3 ??????4 ??????1 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ???2 ??????3 0
+??????????????? ???2 ????????? ??????2 ??????4 ??????4 0
+???????????? ???2 ??????3 ??????4 ??????4 0
 ???????????? ???2 ??????3 ??????3 ??????2 0
 ???????????? ???2 ??????3 ??????4 ?????? 0
 ???????????? ???2 ??????3 ?????????4 ??????4 0
+???????????? ???2 ??????3 ?????????4 ?????????4 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ??????????????? ???2 ??????4 ??????4 ??? ?????? 0
 ?????? ???2 ??????2 0
@@ -2632,7 +2658,10 @@
 ?????? ???2 ?????? 0
 ???????????? ???2 ?????? ??? ??????2 0
 ???????????? ???2 ??????2 ???2 ????????? 0
+????????? ???2 ??????3 ???2 0
 ???????????? ???2 ??????4 ???2 ???4 0
+??????????????? ???2 ??????4 ?????????2 ??????2 ?????????4 0
+???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ????????? ??????3 ????????? 0
 ?????? ???2 ?????????4 0
@@ -2650,7 +2679,9 @@
 ?????? ???2 ?????????2 0
 ????????? ???2 ?????????2 ??????1 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????2 0
 ?????? ???2 ?????????2 0
+???????????? ???2 ?????????2 ???2 ?????????4 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ?????????4 ??? ??????2 0
 ???????????? ???2 ?????????4 ??????3 ??????2 0
@@ -2666,12 +2697,19 @@
 ?????? ???2 ?????????2 0
 ???????????? ???2 ?????????4 ?????? ???2 0
 ?????? ???2 ??? 0
+????????? ???2 ???3 ?????????4 0
 ???????????? ???2 ???3 ?????????4 ??????1 0
 ??????????????? ???2 ?????? ??????4 ??????3 ?????? 0
 ???????????? ???2 ??????4 ?????????4 ???3 0
+??????????????? ???2 ??????4 ??????3 ?????????4 ??????4 0
+?????? ???2 ??????4 0
+????????? ???2 ??????4 ???2 0
 ???????????? ???2 ????????? ?????? ??????3 0
 ?????? ???2 ???3 0
 ????????? ???2 ??????2 ???4 0
+???????????? ???2 ?????? ??????2 ??????4 0
+???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ??????3 ??????4 0
 ???????????? ???2 ??? ???4 ????????? 0
 ???????????? ???2 ???2 ???2 ??????4 0
 ????????? ???2 ???4 ???2 0
@@ -2684,6 +2722,7 @@
 ?????? ???2 ??????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ?????? ?????????2 0
+???????????? ???2 ???4 ????????? ?????? 0
 ?????? ???2 ?????????4 0
 ????????? ???2 ????????? ?????????4 0
 ???????????? ???2 ?????????2 ??????2 ??? 0
@@ -2692,6 +2731,7 @@
 ?????????????????? ???2 ?????????3 ??????2 ??????4 ??????2 ??????2 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ???????????? ???2 ?????????3 ??????4 ??????2 0
+???????????? ???2 ?????????3 ??????4 ????????? 0
 ???????????? ???2 ?????????3 ???4 ???4 0
 ???????????? ???2 ?????????3 ???4 ?????????2 0
 ?????? ???3 ??? 0
@@ -2955,6 +2995,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????3 0
+????????? ??????4 ??????4 ?????????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ?????????2 0
 ?????? ??????4 ?????????2 0
@@ -3674,6 +3715,7 @@
 ????????? ??????3 ??????3 ?????????4 0
 ?????? ??????3 ???4 0
 ???????????? ??????3 ??????4 ????????? ?????? 0
+?????? ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -5947,6 +5989,7 @@
 ???????????? ??????2 ??????4 ???2 ?????????2 0
 ?????? ??????2 ??????4 0
 ????????????????????? ??????2 ??????3 ??????4 ??????2 ???2 ???2 ??????4 0
+?????? ??????2 ??????4 0
 ???????????? ??????2 ??????4 ??? ????????? 0
 ?????? ??????2 ?????????4 0
 ????????? ??????2 ????????? ??????2 0
@@ -6197,6 +6240,8 @@
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ???3 ??????4 0
 ?????? ??????4 ?????????2 0
+???????????? ??????4 ??????3 ??????4 ?????????2 0
+??????????????? ??????4 ??????3 ??????4 ?????????2 ?????? 0
 ???????????? ??????4 ??????3 ??????4 ???3 0
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????2 ??????2 ??????4 0
@@ -6299,6 +6344,7 @@
 ????????? ??????4 ?????? ??????4 0
 ?????? ??????4 ??????2 0
 ????????? ??????4 ??????2 ?????????4 0
+???????????? ??????4 ??????2 ?????????3 ??????3 0
 ????????? ??????4 ??????3 ????????? 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ?????????3 ??????2 0
@@ -6515,7 +6561,9 @@
 ???????????? ?????? ??????3 ?????????4 ?????????2 0
 ?????? ?????? ???3 0
 ???????????? ??????2 ??????2 ?????? ?????? 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ????????? ??????2 ?????? ??????2 0
 ???????????? ??????2 ??????2 ?????? ????????? 0
 ?????? ??????2 ?????? 0
@@ -7118,11 +7166,13 @@
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ??????4 ?????????4 ?????? 0
 ???????????? ??????3 ????????? ?????????2 ?????????4 0
 ????????? ??????3 ?????????2 ?????? 0
 ?????? ??????3 ????????? 0
 ????????? ??????3 ????????? ??????1 0
 ???????????? ??????3 ????????? ??????3 ???4 0
+????????? ??????3 ????????? ??????2 0
 ????????? ??????3 ??????2 ??????2 0
 ????????? ??????3 ??????4 ??? 0
 ?????? ??????3 ??????2 0
@@ -7456,6 +7506,7 @@
 ????????? ??????2 ????????? ??????3 0
 ????????? ??????2 ????????? ?????? 0
 ????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????2 0
 ???????????? ??????2 ?????? ???4 ??????4 0
 ???????????? ??????2 ?????? ??????3 ?????????4 0
 ?????? ??????2 ?????????4 0
@@ -7509,6 +7560,7 @@
 ????????? ??????3 ???2 ??????1 0
 ????????? ??????3 ???4 ????????? 0
 ????????? ??????3 ???4 ?????????3 0
+?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ???4 0
@@ -7974,6 +8026,7 @@
 ?????? ?????????2 ?????? 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????3 ???2 ??????2 ?????? 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ?????????3 0
@@ -7994,10 +8047,13 @@
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ??? ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ???????????? ?????????2 ?????????2 ??????4 ???3 0
+?????? ?????????2 ????????? 0
 ????????? ?????????2 ????????? ??????4 0
+????????? ?????????2 ????????? ??????2 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ????????? ?????????2 ??? ?????????3 0
@@ -8195,6 +8251,7 @@
 ???????????????????????? ?????????2 ????????? ???4 ?????????3 ???4 ?????????4 ??????2 ??????2 0
 ??????????????????????????? ?????????2 ????????? ???4 ?????????3 ??? ???4 ?????????4 ??????2 ??????2 0
 ?????? ?????????2 ?????????4 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ????????? 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????4 0
@@ -8380,6 +8437,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ?????? 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????2 0
@@ -8648,6 +8706,7 @@
 ????????? ?????? ?????????2 ????????? 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ?????????2 0
+????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ??? 0
 ???????????? ?????? ?????????2 ??????3 ??????4 0
@@ -10358,6 +10417,7 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????4 0
 ???????????? ?????? ????????? ????????? ?????????2 0
 ???????????? ?????? ????????? ?????? ??????3 0
 ?????? ?????? ????????? 0
@@ -10526,6 +10586,7 @@
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????3 ???4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ??????4 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ??????3 0
@@ -10706,6 +10767,7 @@
 ????????? ??????4 ??????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????3 0
+?????? ??????4 ?????????3 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
@@ -10719,6 +10781,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -11194,6 +11257,7 @@
 ????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ??????2 ????????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????2 0
@@ -12041,6 +12105,7 @@
 ???????????? ??????2 ???2 ??????4 ??????4 0
 ?????? ??????2 ??????3 0
 ?????? ??????2 ??????4 0
+?????? ??????2 ?????? 0
 ???????????? ??????2 ??????3 ??????4 ??????4 0
 ?????? ??????2 ?????????3 0
 ?????? ??????2 ??????4 0
@@ -12073,6 +12138,7 @@
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????2 ???2 ??????4 0
 ???????????? ?????? ??????2 ???2 ??????4 0
+?????? ?????? ??????2 0
 ?????? ?????? ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????2 0
@@ -12168,6 +12234,8 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????3 0
+??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????3 0
 ?????? ?????? ???2 0
@@ -12336,6 +12404,7 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ???3 ?????????3 0
 ????????? ????????? ????????? ????????? 0
@@ -12492,6 +12561,7 @@
 ???????????? ????????? ????????? ??????4 ??????4 0
 ???????????? ????????? ????????? ?????? ???4 0
 ?????? ????????? ????????? 0
+???????????? ????????? ??????2 ??????2 ?????????4 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ??????2 ??????4 ?????????4 0
@@ -13045,6 +13115,7 @@
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????3 0
 ?????? ?????????2 ?????? 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ?????? 0
@@ -13097,16 +13168,20 @@
 ?????? ?????????4 ??????3 0
 ???????????? ?????????4 ??????2 ???4 ?????? 0
 ?????? ?????????4 ?????? 0
+???????????? ?????????4 ??????4 ???2 ?????????4 0
 ?????? ?????????4 ?????? 0
 ???????????? ?????????4 ?????????4 ??? ?????????4 0
+???????????? ?????????4 ?????????4 ?????????4 ?????????4 0
 ???????????? ?????????4 ??????3 ?????????2 ?????? 0
 ???????????? ?????????4 ?????? ?????????2 ??????4 0
 ???????????? ?????????4 ?????? ??? ?????? 0
 ?????? ?????????4 ??????3 0
+???????????? ?????????4 ??????3 ??????4 ?????? 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ??????4 0
 ?????? ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
+???????????? ?????????4 ????????? ??????2 ??????3 0
 ?????? ?????????4 ???4 0
 ???????????? ?????????4 ??????4 ????????? ?????? 0
 ?????? ?????????4 ??? 0
@@ -13930,6 +14005,7 @@
 ????????? ??????4 ?????? ?????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????2 0
+????????????????????? ??????4 ?????? ??? ?????????4 ????????? ?????????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????1 0
 ???????????? ??????4 ?????????2 ??????3 ?????????4 0
@@ -14847,6 +14923,7 @@
 ???????????? ?????????2 ??????4 ????????? ??????2 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????3 0
+????????? ?????????2 ??????3 ??????3 0
 ?????? ?????????2 ?????????2 0
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ???2 0
@@ -15078,6 +15155,7 @@
 ???????????? ?????????4 ??????2 ??????3 ???3 0
 ???????????? ?????????4 ??????2 ????????? ??????4 0
 ?????????????????? ?????????4 ??????2 ????????? ?????????4 ??????2 ???2 0
+???????????? ?????????4 ??????2 ????????? ??????2 0
 ?????????????????? ?????????4 ??????2 ??????4 ??????4 ??????4 ???3 0
 ?????? ?????????4 ??????4 0
 ?????? ??????2 ??????3 0
@@ -15389,7 +15467,9 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ???4 0
 ????????? ??????4 ?????????4 ?????????3 0
+????????? ??????4 ?????????4 ?????????3 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ??????4 0
@@ -16031,8 +16111,10 @@
 ?????? ?????? ??????2 0
 ?????? ?????? ??? 0
 ?????? ??????3 ???4 0
+????????? ??????3 ???4 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ?????? ??????4 ???3 0
 ?????? ??????3 ??????3 0
 ?????? ??????3 ???4 0
 ?????? ??????4 ??????3 0
@@ -16712,6 +16794,7 @@
 ?????? ?????????3 ?????????2 0
 ???????????? ?????????3 ????????? ??????4 ??????2 0
 ???????????? ????????? ?????? ???4 ?????????4 0
+???????????? ????????? ??????2 ?????? ?????? 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ?????? ????????? ??????2 0
@@ -17655,6 +17738,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ????????? ????????? ????????? ?????????2 0
 ?????? ????????? ?????????4 0
 ???????????? ????????? ?????????2 ??????4 ?????????4 0
@@ -18586,6 +18670,7 @@
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ??????3 0
+????????? ??????2 ??????2 ??????2 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ????????? 0
 ???????????? ??????2 ??????3 ??????2 ??????2 0
@@ -18661,6 +18746,7 @@
 ?????? ??????4 ??????3 0
 ???????????? ??????4 ??????3 ?????????2 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ??????3 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ????????? ???3 ??????3 0
 ?????? ??????4 ?????????4 0
@@ -18830,6 +18916,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ?????????3 ????????? ?????? 0
 ?????? ?????????4 ??????2 0
+????????? ?????????4 ??????2 ?????????3 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ??????3 0
@@ -19311,7 +19398,11 @@
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
+???????????? ?????????2 ?????????2 ???4 ???4 0
+???????????? ?????????2 ?????? ?????????3 ??????4 0
+???????????? ?????????2 ?????? ??????4 ?????????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ???4 ??????3 0
 ???????????? ?????????2 ??????2 ????????? ??????2 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????2 0
@@ -19332,6 +19423,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ???4 ??????2 ??????2 0
 ???????????? ?????????4 ?????????3 ?????? ???2 0
+???????????? ?????????4 ?????????3 ?????? ???2 0
 ????????? ?????????4 ??????2 ??????1 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ?????? ??????4 ??????3 0
@@ -19380,6 +19472,7 @@
 ???????????? ?????????2 ??????2 ?????????2 ???4 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????4 0
+????????? ?????????2 ??????4 ?????? 0
 ????????? ?????????2 ????????? ?????? 0
 ???????????? ?????????2 ????????? ????????? ??????3 0
 ?????? ?????????2 ????????? 0
@@ -19993,6 +20086,7 @@
 ?????? ????????? ?????????3 0
 ???????????? ????????? ?????????3 ?????????3 ??????4 0
 ?????? ????????? ?????????4 0
+????????? ????????? ?????????4 ??????4 0
 ?????? ????????? ?????????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ?????????4 0
@@ -20027,6 +20121,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????3 0
+?????? ????????? ?????????4 0
 ?????? ????????? ??????4 0
 ????????? ????????? ??????4 ??????4 0
 ?????? ????????? ??????2 0
@@ -20428,6 +20523,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ???3 0
 ?????? ????????? ???4 0
+?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ??????3 ??????2 ??????4 0
@@ -20456,6 +20552,7 @@
 ?????? ????????? ??????2 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????3 ??????4 ??????4 0
 ?????? ????????? ????????? 0
 ???????????? ????????? ????????? ????????? ???4 0
 ????????? ????????? ????????? ??????4 0
@@ -20482,6 +20579,7 @@
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????2 ??????4 ?????? 0
 ???????????? ????????? ??????4 ??????4 ??????2 0
 ????????? ????????? ??????4 ????????? 0
 ?????? ????????? ????????? 0
@@ -20904,6 +21002,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ????????? ??????4 ??????2 0
+??? ?????????3 0
 ???????????? ?????????3 ???2 ??????2 ??? 0
 ?????? ?????????3 ???4 0
 ?????? ?????????3 ?????? 0
@@ -20961,6 +21060,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ?????????4 0
 ?????? ?????????3 ?????????3 0
+?????? ?????????3 ?????????3 0
 ?????? ?????????3 ????????? 0
 ?????? ?????????3 ?????????2 0
 ?????? ?????????3 ?????????4 0
@@ -21211,6 +21311,7 @@
 ?????? ?????????3 ??? 0
 ???????????? ?????????3 ??? ???4 ???2 0
 ?????? ?????????3 ??????4 0
+?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????4 ????????? ??????2 0
 ?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????2 ??????4 ?????????2 0
@@ -21631,6 +21732,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ??????3 0
 ?????? ?????????3 ?????? 0
+????????? ?????????3 ??????2 ??????4 0
 ???????????? ?????????3 ??????3 ??? ?????? 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ??????4 0
@@ -21892,6 +21994,7 @@
 ???????????? ?????????2 ??????2 ?????????4 ?????????4 0
 ????????? ?????????2 ??????4 ??????2 0
 ???????????? ?????????2 ??????4 ????????? ??????4 0
+???????????? ?????????2 ??????4 ??????3 ?????????3 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ???????????? ?????????2 ?????????4 ??????3 ???2 0
@@ -22084,6 +22187,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ???2 0
 ???????????? ?????? ???4 ??????4 ?????????2 0
+???????????? ?????? ??????4 ??????4 ???4 0
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????4 ?????? ?????????4 0
 ?????? ?????? ??????4 0
@@ -22114,13 +22218,16 @@
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????3 0
 ???????????? ??????2 ??????4 ??????4 ??????2 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????2 ??????2 ??????3 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????????3 0
+????????? ??????2 ??????4 ??????1 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ?????? 0
@@ -22177,6 +22284,7 @@
 ???????????? ??????2 ????????? ???4 ??????2 0
 ?????? ??????2 ????????? 0
 ????????? ??????2 ????????? ??????3 0
+????????? ??????2 ????????? ??????3 0
 ???????????? ??????2 ???3 ??????4 ??????4 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
@@ -22191,6 +22299,7 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????2 ??? ??????2 0
 ?????? ??????2 ???4 0
+?????? ??????2 ??????4 0
 ????????? ??????3 ???2 ????????? 0
 ?????? ??????3 ???4 0
 ?????? ??????3 ?????? 0
@@ -22430,6 +22539,7 @@
 ?????? ?????????3 ?????????4 0
 ???????????????????????? ?????????3 ??????4 ??????2 ??????2 ???2 ??????3 ??? ????????? 0
 ???????????? ?????????3 ?????????2 ????????? ????????? 0
+???????????? ?????????3 ??????4 ?????????2 ??????4 0
 ????????? ?????????3 ??????4 ?????????2 0
 ????????? ?????????3 ??????4 ??????4 0
 ?????? ?????????3 ??????2 0
@@ -25542,8 +25652,11 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ??????2 0
 ????????? ???2 ???4 ??????2 0
+????????? ???2 ???4 ?????????4 0
 ????????? ???2 ???4 ?????????4 0
 ???????????? ???2 ???4 ?????????4 ??????1 0
+????????? ???2 ???4 ?????????2 0
+???????????? ???2 ???4 ?????????2 ????????? 0
 ????????? ???2 ???4 ??????2 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
@@ -25687,6 +25800,7 @@
 ?????? ???3 ????????? 0
 ?????? ???3 ?????????4 0
 ?????? ???3 ?????????2 0
+?????? ???3 ??????3 0
 ?????? ???3 ??????4 0
 ?????? ???3 ?????????3 0
 ?????? ???3 ?????????4 0
@@ -25751,6 +25865,7 @@
 ?????? ???4 ?????????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ?????????4 0
+????????? ???4 ????????? ????????? 0
 ?????? ???4 ??????2 0
 ???????????? ???4 ?????????2 ??????4 ??????2 0
 ?????? ???4 ??????2 0
@@ -25761,6 +25876,7 @@
 ?????? ???4 ??????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ???2 0
+????????? ???4 ??????4 ??????2 0
 ???????????? ???4 ??????4 ??????4 ??????4 0
 ?????? ???4 ?????????2 0
 ?????? ???4 ?????????2 0
@@ -25928,6 +26044,7 @@
 ???????????? ??????4 ??????2 ?????? ??????2 0
 ????????? ??????4 ?????????2 ??????2 0
 ???????????? ?????? ??????2 ?????????4 ?????????4 0
+????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
 ?????? ?????? ????????? 0
 ???????????? ?????? ????????? ??????3 ??????3 0
 ?????? ?????? ??????2 0
@@ -25938,6 +26055,7 @@
 ???????????? ?????? ??????4 ??????4 ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????3 0
+???????????? ?????? ?????????4 ??????4 ??????3 0
 ?????? ?????? ??????3 0
 ????????? ?????? ??????2 ??????3 0
 ?????? ?????? ?????? 0
@@ -25947,6 +26065,7 @@
 ???????????? ?????? ?????????4 ??????2 ??????4 0
 ???????????? ?????? ?????????3 ??????3 ???3 0
 ???????????? ?????? ??????4 ????????? ??????3 0
+???????????? ?????? ?????? ??????4 ??????4 0
 ?????? ?????? ???4 0
 ??????????????? ?????? ??????2 ??????3 ??????2 ??????1 0
 ?????? ?????? ??????3 0
@@ -26061,6 +26180,7 @@
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
 ????????? ??????4 ??????4 ??????3 0
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ????????? ??????4 ??????4 ?????? 0
@@ -26266,6 +26386,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ??????3 ?????????2 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????4 0
@@ -26488,6 +26609,7 @@
 ?????? ??????3 ??????4 0
 ????????? ??????3 ??????4 ?????????2 0
 ?????? ??????3 ??????4 0
+?????? ??????3 ??????3 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -26564,6 +26686,7 @@
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????? 0
 ???????????? ??????4 ??????2 ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ????????? ??????4 ???4 ??????1 0
@@ -27051,6 +27174,7 @@
 ?????? ???2 ?????????3 0
 ?????? ???2 ???3 0
 ?????? ???2 ??????3 0
+?????? ???3 ????????? 0
 ?????? ???3 ??????4 0
 ?????? ???3 ??????3 0
 ?????? ???3 ??????2 0
@@ -27262,11 +27386,14 @@
 ?????? ?????? ??????4 0
 ??? ??????2 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
+?????? ??????2 ??????3 0
 ????????? ??????2 ????????? ????????? 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
+????????? ??????2 ?????? ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ????????? 0
@@ -28337,6 +28464,7 @@
 ???????????????????????? ??? ??? ????????? ???2 ?????? ??? ?????? ???2 0
 ???????????? ??? ??? ????????? ??????4 0
 ?????? ??? ???2 0
+????????? ??? ???4 ??????4 0
 ?????? ??? ?????? 0
 ?????? ??? ??????3 0
 ?????? ??? ??????3 0
@@ -29455,6 +29583,7 @@
 ?????? ??????4 ???3 0
 ?????? ??????4 ???4 0
 ???????????? ?????? ???4 ?????????4 ?????????2 0
+?????? ?????? ???4 0
 ?????? ?????? ???4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
@@ -30115,8 +30244,10 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????2 0
+????????? ??????3 ??????2 ?????? 0
 ???????????? ??????3 ??????4 ?????? ??????2 0
 ????????? ??????3 ?????? ??????4 0
+?????? ??????3 ????????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ???2 0
 ???????????? ??????4 ???3 ??????4 ??????4 0
@@ -30229,6 +30360,7 @@
 ????????? ?????????4 ???4 ?????? 0
 ???????????? ?????????4 ???4 ?????????4 ??????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????2 0
@@ -30414,6 +30546,7 @@
 ?????? ????????? ?????????3 0
 ????????? ????????? ????????? ???3 0
 ???????????? ????????? ?????????3 ??????2 ?????????4 0
+????????? ????????? ??????2 ????????? 0
 ?????? ????????? ??????4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ?????????3 0
@@ -30989,6 +31122,7 @@
 ?????? ??? ??????2 0
 ?????? ??? ??????3 0
 ????????? ??? ??????3 ???2 0
+?????? ??? ??????3 0
 ?????? ??? ?????? 0
 ?????? ??? ??????4 0
 ?????? ??? ??????4 0
@@ -31008,10 +31142,12 @@
 ?????? ??? ???2 0
 ?????? ??? ???2 0
 ???????????? ??? ???4 ????????? ?????????4 0
+?????? ??? ??????3 0
 ?????? ??? ??????4 0
 ???????????? ??? ?????? ??????4 ?????????4 0
 ?????? ??? ??????3 0
 ?????? ??? ???4 0
+???????????? ??? ???4 ??????4 ???3 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
@@ -31398,6 +31534,7 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ???????????? ??????3 ??????2 ???2 ??????4 0
+????????? ??????3 ??????4 ??????4 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????3 0
@@ -31453,6 +31590,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????? 0
+????????? ?????? ?????????2 ??????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????4 ??????2 0
@@ -31466,6 +31604,8 @@
 ?????? ?????? ??????3 0
 ???????????? ?????? ??????3 ??????4 ?????????2 0
 ?????? ?????? ??? 0
+????????? ?????? ??????3 ??????3 0
+????????? ?????? ??????3 ??????4 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ???3 0
 ????????? ??????4 ???3 ?????????4 0
@@ -31739,6 +31879,7 @@
 ???????????? ?????????4 ?????????3 ??????4 ??????1 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ?????????2 0
+???????????? ?????????4 ??????4 ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
 ????????? ?????????4 ????????? ??????1 0
 ???????????? ?????????4 ?????????4 ??????4 ??????1 0
@@ -31863,6 +32004,7 @@
 ?????? ???2 ?????????4 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????4 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
 ?????? ???2 ?????????4 0
@@ -31934,6 +32076,7 @@
 ???????????? ?????? ?????? ???2 ?????????4 0
 ?????? ?????? ?????? 0
 ?????? ??????4 ??????4 0
+????????? ??????4 ??????4 ?????????4 0
 ???????????? ??????4 ??????3 ??? ????????? 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
@@ -31943,6 +32086,7 @@
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
+????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -32135,6 +32279,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ??????4 0
 ????????? ?????? ??????4 ??????3 0
+???????????? ??????2 ???2 ??????2 ??????4 0
 ?????? ??????2 ???2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -32144,6 +32289,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ?????????3 0
+???????????? ??????2 ????????? ??????4 ?????????2 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
 ???????????? ??????2 ???2 ????????? ????????? 0
@@ -32187,6 +32333,10 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????3 ??????2 ???2 0
 ?????? ??????2 ????????? 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ???4 0
+????????? ??????2 ????????? ??????4 0
 ????????????????????? ??????2 ????????? ?????? ??????3 ??????2 ??????2 ?????????3 0
 ???????????? ??????2 ?????? ??????4 ?????????2 0
 ?????? ??????2 ???4 0
@@ -32986,61 +33136,9 @@
 ?????? ??? ??? 0
 ?????? ??? ??? 0
 ?????? ??? ??? 0
-????????? ??????4 ?????????4 ?????????4 0
-?????? ?????????2 ??????4 0
-?????? ??????3 ?????? 0
-???????????? ??????4 ??????2 ?????????3 ??????3 0
-????????? ??????3 ????????? ??????2 0
-???????????? ??????3 ??????4 ?????????4 ?????? 0
-????????? ??????3 ??????3 ?????? 0
-????????? ?????????3 ??????2 ??????4 0
-?????? ??????3 ????????? 0
-????????? ??????3 ??????2 ?????? 0
-????????? ???4 ????????? ????????? 0
-????????? ???4 ??????4 ??????2 0
-????????? ?????? ??????3 ??????4 0
-????????? ?????? ??????3 ??????3 0
-????????? ?????? ?????????2 ??????2 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ???4 0
-?????? ??????4 ??????2 0
-????????? ??????2 ??????4 ??????1 0
-????????? ??????2 ????????? ??????3 0
-?????? ??????2 ??????3 0
-???????????? ?????? ?????????4 ??????4 ??????3 0
-?????? ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ??????2 ?????? ??????2 0
-???????????? ?????? ?????? ??????4 ??????4 0
-????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
-?????? ??????4 ??????4 0
-???????????? ??????2 ??????2 ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ???2 ???4 ?????????4 0
-???????????? ???2 ???4 ?????????2 ????????? 0
-????????? ???2 ???4 ?????????2 0
-?????? ?????????2 ????????? 0
-???????????? ?????????2 ??????2 ??? ??????4 0
-????????? ?????????2 ????????? ??????2 0
-???????????? ?????? ??????4 ??????4 ???4 0
-???????????? ??????2 ???2 ??????2 ??????4 0
-???????????? ??????2 ????????? ??????4 ?????????2 0
-????????? ??????4 ?????????4 ???4 0
-????????? ??????4 ?????????4 ?????????3 0
-????????? ??????3 ???4 ??????2 0
-???????????? ??????3 ?????? ??????4 ???3 0
-???????????? ??????2 ??????2 ??????2 ??????4 0
-???????????? ??????2 ??????4 ?????????2 ??????2 0
-?????? ??????4 ?????????4 0
-????????? ??????4 ??????4 ?????????2 0
-??? ?????????3 0
-?????? ?????????3 ?????????3 0
-????????? ??????2 ??????2 ??????2 0
-?????? ?????? ??????3 0
-??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
-?????? ???3 ??????3 0
-????????? ????????? ?????????4 ??????4 0
-????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
-????????? ??????3 ??????4 ??????4 0
+????????? ?????? ????????? ??????3 0
+??????????????? ??? ??? ??????3 ??????4 ??????4 0
+?????? ??????3 ??????2 0
+?????? ?????? ????????? 0
+?????? ?????? ????????? 0
+?????? ?????????3 ????????? 0
Binary files gcin-1.2.9.orig/.tedfilepos and gcin-1.2.9/.tedfilepos differ
diff -urN gcin-1.2.9.orig/tenv gcin-1.2.9/tenv
--- gcin-1.2.9.orig/tenv	2006-10-19 14:18:38.000000000 +0800
+++ gcin-1.2.9/tenv	2006-11-15 13:10:24.000000000 +0800
@@ -11,6 +11,6 @@
 gcinpid=$!
 sleep 1
 export LD_PRELOAD=./im-client/libgcin-im-client.so
-#gedit
-leafpad
+gedit
+#leafpad
 pkill gcin.test


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec	17 Nov 2006 00:22:27 -0000	1.13
+++ gcin.spec	17 Nov 2006 00:25:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -109,8 +109,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
-* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-3
 - add gcin129update.patch
+
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
 - update NewCJ3.cin
 
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1



From fedora-extras-commits at redhat.com  Fri Nov 17 00:27:53 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 16 Nov 2006 17:27:53 -0700
Subject: rpms/mlton/FC-5 .cvsignore, 1.2, 1.3 mlton-debuginfo.patch, 1.1,
	1.2 mlton.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611170027.kAH0Rro2018635@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18606

Modified Files:
	.cvsignore mlton-debuginfo.patch mlton.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 13:51:57 -0000	1.2
+++ .cvsignore	17 Nov 2006 00:27:22 -0000	1.3
@@ -1,3 +1 @@
-mlton-20051202-1.src.tgz
-mlton-bootstrap.i386.tar.bz2
-mlton-bootstrap.ppc.tar.bz2
+mlton-20061107.tar.bz2

mlton-debuginfo.patch:

Index: mlton-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/mlton-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlton-debuginfo.patch	9 Jul 2006 13:51:57 -0000	1.1
+++ mlton-debuginfo.patch	17 Nov 2006 00:27:22 -0000	1.2
@@ -1,24 +1,24 @@
-diff -ur mlton-20051202~/bytecode/Makefile mlton-20051202/bytecode/Makefile
---- mlton-20051202~/bytecode/Makefile	2005-11-30 13:36:52.000000000 -0500
-+++ mlton-20051202/bytecode/Makefile	2006-06-25 18:14:13.000000000 -0400
+diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
+--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/bytecode/Makefile	2006-11-14 23:18:42.000000000 -0500
 @@ -10,7 +10,7 @@
  all: interpret.o interpret-gdb.o print-opcodes
  
  CC = gcc -std=gnu99
 -CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
 +CFLAGS = -fomit-frame-pointer -g -I../runtime -I../include -Wall
- 
- ifeq ($(TARGET_ARCH), amd64)
- CFLAGS += -mtune=opteron -m32 
-diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
---- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
-+++ mlton-20051202/Makefile	2006-06-25 18:13:45.000000000 -0400
-@@ -402,17 +402,6 @@
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
+diff -ur mlton-20061107~/Makefile mlton-20061107/Makefile
+--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
++++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
+@@ -411,17 +411,6 @@
  	if $(GZIP_MAN); then						\
  		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
  	fi
 -	case "$(TARGET_OS)" in						\
--	cygwin|darwin|solaris)						\
+-	aix|cygwin|darwin|solaris)					\
 -	;;								\
 -	*)								\
 -		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
@@ -31,15 +31,15 @@
  
  .PHONY: install-docs
  install-docs:
-diff -ur mlton-20051202~/runtime/Makefile mlton-20051202/runtime/Makefile
---- mlton-20051202~/runtime/Makefile	2005-11-29 18:05:07.000000000 -0500
-+++ mlton-20051202/runtime/Makefile	2006-06-25 18:13:45.000000000 -0400
+diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
+--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/runtime/Makefile	2006-11-14 23:20:40.000000000 -0500
 @@ -49,7 +49,7 @@
  endif
  
  CC = gcc -std=gnu99
 -CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
 +CFLAGS = -O2 -Wall -g -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
- DEBUGFLAGS = $(CFLAGS) -gstabs+ -g2
- 
- CFILES = 							\
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/mlton.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mlton.spec	11 Jul 2006 11:15:43 -0000	1.2
+++ mlton.spec	17 Nov 2006 00:27:22 -0000	1.3
@@ -1,14 +1,14 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20051202
-Release:	8%{?dist}
+Version:	20061107
+Release:	1%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	BSD style and MIT
 URL:		http://mlton.org/
-Source0:	http://mlton.org/pages/Download/attachments/mlton-%{version}-1.src.tgz
+Source0:	mlton-%{version}.tar.bz2
 %if %{mlton_bootstrap}
 # taken from mlton_20060213-1 from Debian
 Source1:	mlton-bootstrap.i386.tar.bz2
@@ -21,7 +21,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gmp-devel htmldoc tetex-latex which
+BuildRequires:	gmp-devel htmldoc tetex-latex
 %if ! %{mlton_bootstrap}
 BuildRequires:	mlton
 %endif
@@ -44,6 +44,9 @@
 %prep
 %setup -q
 
+# instantiate version numbers
+make version
+
 # build documentation as PDF
 %patch -P 0 -p1
 # enable -g and disable strip so debuginfo packages work
@@ -100,6 +103,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 12 2006 Adam Goode  - 20061107-1
+- New release, taken from svn://mlton.org/mlton/tags/on-20061107
+
+* Thu Aug 31 2006 Adam Goode  - 20051202-8.1
+- Mass rebuild
+
 * Sun Jul  9 2006 Adam Goode  - 20051202-8
 - Conditionalize bootstrapping and disable it
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 13:51:57 -0000	1.2
+++ sources	17 Nov 2006 00:27:22 -0000	1.3
@@ -1,3 +1 @@
-766b25e39dff36da5f3ed81effd5471b  mlton-20051202-1.src.tgz
-34f8bf4c11cca4867beb3bccab04b0a5  mlton-bootstrap.i386.tar.bz2
-16358b27a8f86ec1aede640fff1c77ff  mlton-bootstrap.ppc.tar.bz2
+eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov 17 00:30:03 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:30:03 -0700
Subject: rpms/gcin/FC-6 gcin129update.patch, NONE, 1.1 NewCJ3.cin, 1.1,
	1.2 gcin.spec, 1.12, 1.13
Message-ID: <200611170030.kAH0U3so018719@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18690

Modified Files:
	NewCJ3.cin gcin.spec 
Added Files:
	gcin129update.patch 
Log Message:
add gcin129update.patch and update NewCj3.cin

gcin129update.patch:

--- NEW FILE gcin129update.patch ---
diff -urN gcin-1.2.9.orig/Changelog gcin-1.2.9/Changelog
--- gcin-1.2.9.orig/Changelog	2006-11-14 18:24:09.000000000 +0800
+++ gcin-1.2.9/Changelog	2006-11-15 18:52:02.000000000 +0800
@@ -1,5 +1,5 @@
 ** UTF-8 encoding **
-1.2.9:
+1.2.9: (11/15/2006)
 - ???????????? tray icons ???????????? ~/.gcin/icons ???????????? symbolic link ?????????
 - ????????????????????????????????? tray icons??????????????????????????????
 - ???????????????????????????????????????????????????????????????????????????
@@ -7,7 +7,7 @@
 - ???????????????????????? FC6??????????????????????????????
 - ????????? WM(fvwm1) ?????????????????????????????????????????????????????? keyboard focus ??????????????????????????? gcin ??? window????????????????????? click ????????????????????????????????????????????????????????? WM or X11 server ???????????? focus ??????????????? override_redirect ??? window???
 - FreeBSD /usr/bin/bash ??????????????? ./configure ?????????????????? /bin/bash -> /usr/bin/bash
-- libgcin-im-client.so ?????? soname???thanks to caleb
+- libgcin-im-client.so ?????? soname???thanks to candyz
 
 
 1.2.8: (10/19/2006)
diff -urN gcin-1.2.9.orig/configure gcin-1.2.9/configure
--- gcin-1.2.9.orig/configure	2006-11-06 09:29:26.000000000 +0800
+++ gcin-1.2.9/configure	2006-11-15 18:53:54.000000000 +0800
@@ -74,7 +74,7 @@
   echo "/bin/bash -> /usr/bin/bash"
   for i in scripts/*
   do
-    sed -e "s~/bin~/usr/bin" < $i > $i.tmp
+    sed -e "s~/bin~/usr/bin~" < $i > $i.tmp
     mv $i.tmp $i
   done
 fi
diff -urN gcin-1.2.9.orig/data/tsin.src gcin-1.2.9/data/tsin.src
--- gcin-1.2.9.orig/data/tsin.src	2006-11-15 13:05:04.000000000 +0800
+++ gcin-1.2.9/data/tsin.src	2006-11-15 18:56:36.000000000 +0800
@@ -1049,6 +1049,7 @@
 ?????? ???4 ?????? 0
 ?????? ???4 ??????4 0
 ????????????????????? ???4 ?????????2 ???2 ??? ???2 ?????????2 ??????3 0
+????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
 ???????????? ???4 ???2 ???4 ?????????3 0
 ???????????? ???4 ???2 ?????????3 ?????????3 0
 ???????????? ???4 ???2 ??? ?????????3 0
@@ -1439,6 +1440,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????4 ?????????2 ??????2 0
 ???????????? ??????2 ??????4 ?????????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -1448,6 +1450,7 @@
 ???????????? ??????2 ??????4 ?????? ??????4 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ??????4 0
+????????? ??????2 ??????4 ?????????4 0
 ????????? ??????2 ??????4 ??????2 0
 ???????????? ??????2 ??????2 ??????3 ?????????4 0
 ?????? ??????2 ?????????2 0
@@ -1458,6 +1461,7 @@
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????? 0
 ???????????? ??????2 ??????2 ???3 ?????????3 0
+???????????? ??????2 ??????2 ??????2 ??????4 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ??????3 ?????? 0
 ?????? ??????2 ??????2 0
@@ -2442,6 +2446,7 @@
 ????????? ??????3 ??????4 ?????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????2 0
+????????? ??????3 ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
@@ -2547,6 +2552,7 @@
 ?????? ??? ??? 0
 ???????????? ??? ?????? ??????3 ????????? 0
 ?????? ??? ?????????3 0
+???????????? ???2 ???4 ??????2 ?????????4 0
 ?????? ???2 ???4 0
 ?????? ???2 ???4 0
 ???????????? ???2 ??? ???2 ??????4 0
@@ -2556,19 +2562,23 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ????????? 0
 ????????? ???2 ???4 ????????? 0
+???????????? ???2 ??????4 ??????2 ?????????2 0
 ???????????? ???2 ?????? ???2 ??????4 0
 ???????????? ???2 ??????2 ???3 ?????????4 0
+????????????????????? ???2 ??????2 ?????????4 ????????? ????????? ??????4 ??????3 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????3 ???2 ????????? 0
 ???????????? ???2 ??????2 ???2 ???4 0
 ???????????? ???2 ??????2 ??????2 ???4 0
 ????????? ???2 ??????3 ?????????2 0
 ?????? ???2 ??????4 0
+???????????? ???2 ??????3 ??????2 ??????4 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????4 ??? ?????? 0
 ???????????? ???2 ??????4 ??????4 ??????3 0
 ???????????? ???2 ???3 ?????????2 ??????3 0
 ???????????? ???2 ???4 ??????2 ?????? 0
+???????????? ???2 ?????? ???2 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ???2 ??????4 0
 ???????????? ???2 ??????3 ??????2 ?????????4 0
@@ -2577,6 +2587,8 @@
 ???????????? ???2 ?????? ???4 ???2 0
 ??????????????? ???2 ??????4 ???3 ??? ??????4 0
 ?????? ???2 ??????4 0
+???????????? ???2 ????????? ???2 ??????4 0
+???????????? ???2 ?????????4 ?????? ??????2 0
 ???????????? ???2 ?????????2 ???2 ??????4 0
 ????????? ???2 ?????????3 ??????2 0
 ???????????? ???2 ?????????2 ?????? ?????????2 0
@@ -2585,19 +2597,26 @@
 ????????? ???2 ?????????2 ???4 0
 ?????? ???2 ??????3 0
 ???????????? ???2 ??????3 ???2 ????????? 0
+???????????? ???2 ??????3 ??????3 ?????????3 0
 ???????????? ???2 ??????3 ?????? ?????????4 0
+???????????? ???2 ?????? ????????? ???4 0
 ?????? ???2 ??????2 0
 ??????????????? ???2 ?????? ??????4 ??????3 ??????4 0
+???????????? ???2 ??????2 ????????? ??????4 0
 ????????? ???2 ??????3 ??????2 0
 ?????? ???2 ??????2 0
 ????????? ???2 ??????3 ?????????4 0
+???????????? ???2 ??????4 ??????4 ???3 0
+???????????? ???2 ??????4 ???4 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ??????3 ???3 0
+??????????????? ???2 ??????2 ??????2 ??????4 ?????? 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ??????4 ???3 0
 ???????????? ???2 ?????????4 ???2 ????????? 0
 ???????????? ???2 ??????2 ?????? ??????2 0
 ?????? ???2 ??????2 0
+????????? ???2 ?????????2 ?????????4 0
 ?????? ???2 ?????????2 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
@@ -2610,6 +2629,8 @@
 ?????? ???2 ??????4 0
 ????????? ???2 ??????4 ??????3 0
 ???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ?????? ?????????4 0
+??????????????? ???2 ??????4 ??????2 ??? ??????4 0
 ?????? ???2 ?????????2 0
 ???????????? ???2 ??????4 ??????3 ??????3 0
 ?????? ???2 ?????????4 0
@@ -2618,13 +2639,18 @@
 ????????? ???2 ?????? ??????1 0
 ????????? ???2 ????????? ???2 0
 ?????? ???2 ????????? 0
+??????????????? ???2 ????????? ???4 ?????? ????????? 0
 ???????????? ???2 ????????? ?????????4 ??????3 0
+???????????? ???2 ????????? ?????????3 ??????4 0
 ??????????????? ???2 ????????? ?????????3 ??????4 ??????1 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ???2 ??????3 0
+??????????????? ???2 ????????? ??????2 ??????4 ??????4 0
+???????????? ???2 ??????3 ??????4 ??????4 0
 ???????????? ???2 ??????3 ??????3 ??????2 0
 ???????????? ???2 ??????3 ??????4 ?????? 0
 ???????????? ???2 ??????3 ?????????4 ??????4 0
+???????????? ???2 ??????3 ?????????4 ?????????4 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ??????????????? ???2 ??????4 ??????4 ??? ?????? 0
 ?????? ???2 ??????2 0
@@ -2632,7 +2658,10 @@
 ?????? ???2 ?????? 0
 ???????????? ???2 ?????? ??? ??????2 0
 ???????????? ???2 ??????2 ???2 ????????? 0
+????????? ???2 ??????3 ???2 0
 ???????????? ???2 ??????4 ???2 ???4 0
+??????????????? ???2 ??????4 ?????????2 ??????2 ?????????4 0
+???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ????????? ??????3 ????????? 0
 ?????? ???2 ?????????4 0
@@ -2650,7 +2679,9 @@
 ?????? ???2 ?????????2 0
 ????????? ???2 ?????????2 ??????1 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????2 0
 ?????? ???2 ?????????2 0
+???????????? ???2 ?????????2 ???2 ?????????4 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ?????????4 ??? ??????2 0
 ???????????? ???2 ?????????4 ??????3 ??????2 0
@@ -2666,12 +2697,19 @@
 ?????? ???2 ?????????2 0
 ???????????? ???2 ?????????4 ?????? ???2 0
 ?????? ???2 ??? 0
+????????? ???2 ???3 ?????????4 0
 ???????????? ???2 ???3 ?????????4 ??????1 0
 ??????????????? ???2 ?????? ??????4 ??????3 ?????? 0
 ???????????? ???2 ??????4 ?????????4 ???3 0
+??????????????? ???2 ??????4 ??????3 ?????????4 ??????4 0
+?????? ???2 ??????4 0
+????????? ???2 ??????4 ???2 0
 ???????????? ???2 ????????? ?????? ??????3 0
 ?????? ???2 ???3 0
 ????????? ???2 ??????2 ???4 0
+???????????? ???2 ?????? ??????2 ??????4 0
+???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ??????3 ??????4 0
 ???????????? ???2 ??? ???4 ????????? 0
 ???????????? ???2 ???2 ???2 ??????4 0
 ????????? ???2 ???4 ???2 0
@@ -2684,6 +2722,7 @@
 ?????? ???2 ??????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ?????? ?????????2 0
+???????????? ???2 ???4 ????????? ?????? 0
 ?????? ???2 ?????????4 0
 ????????? ???2 ????????? ?????????4 0
 ???????????? ???2 ?????????2 ??????2 ??? 0
@@ -2692,6 +2731,7 @@
 ?????????????????? ???2 ?????????3 ??????2 ??????4 ??????2 ??????2 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ???????????? ???2 ?????????3 ??????4 ??????2 0
+???????????? ???2 ?????????3 ??????4 ????????? 0
 ???????????? ???2 ?????????3 ???4 ???4 0
 ???????????? ???2 ?????????3 ???4 ?????????2 0
 ?????? ???3 ??? 0
@@ -2955,6 +2995,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????3 0
+????????? ??????4 ??????4 ?????????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ?????????2 0
 ?????? ??????4 ?????????2 0
@@ -3674,6 +3715,7 @@
 ????????? ??????3 ??????3 ?????????4 0
 ?????? ??????3 ???4 0
 ???????????? ??????3 ??????4 ????????? ?????? 0
+?????? ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -5947,6 +5989,7 @@
 ???????????? ??????2 ??????4 ???2 ?????????2 0
 ?????? ??????2 ??????4 0
 ????????????????????? ??????2 ??????3 ??????4 ??????2 ???2 ???2 ??????4 0
+?????? ??????2 ??????4 0
 ???????????? ??????2 ??????4 ??? ????????? 0
 ?????? ??????2 ?????????4 0
 ????????? ??????2 ????????? ??????2 0
@@ -6197,6 +6240,8 @@
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ???3 ??????4 0
 ?????? ??????4 ?????????2 0
+???????????? ??????4 ??????3 ??????4 ?????????2 0
+??????????????? ??????4 ??????3 ??????4 ?????????2 ?????? 0
 ???????????? ??????4 ??????3 ??????4 ???3 0
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????2 ??????2 ??????4 0
@@ -6299,6 +6344,7 @@
 ????????? ??????4 ?????? ??????4 0
 ?????? ??????4 ??????2 0
 ????????? ??????4 ??????2 ?????????4 0
+???????????? ??????4 ??????2 ?????????3 ??????3 0
 ????????? ??????4 ??????3 ????????? 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ?????????3 ??????2 0
@@ -6515,7 +6561,9 @@
 ???????????? ?????? ??????3 ?????????4 ?????????2 0
 ?????? ?????? ???3 0
 ???????????? ??????2 ??????2 ?????? ?????? 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ????????? ??????2 ?????? ??????2 0
 ???????????? ??????2 ??????2 ?????? ????????? 0
 ?????? ??????2 ?????? 0
@@ -7118,11 +7166,13 @@
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ??????4 ?????????4 ?????? 0
 ???????????? ??????3 ????????? ?????????2 ?????????4 0
 ????????? ??????3 ?????????2 ?????? 0
 ?????? ??????3 ????????? 0
 ????????? ??????3 ????????? ??????1 0
 ???????????? ??????3 ????????? ??????3 ???4 0
+????????? ??????3 ????????? ??????2 0
 ????????? ??????3 ??????2 ??????2 0
 ????????? ??????3 ??????4 ??? 0
 ?????? ??????3 ??????2 0
@@ -7456,6 +7506,7 @@
 ????????? ??????2 ????????? ??????3 0
 ????????? ??????2 ????????? ?????? 0
 ????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????2 0
 ???????????? ??????2 ?????? ???4 ??????4 0
 ???????????? ??????2 ?????? ??????3 ?????????4 0
 ?????? ??????2 ?????????4 0
@@ -7509,6 +7560,7 @@
 ????????? ??????3 ???2 ??????1 0
 ????????? ??????3 ???4 ????????? 0
 ????????? ??????3 ???4 ?????????3 0
+?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ???4 0
@@ -7974,6 +8026,7 @@
 ?????? ?????????2 ?????? 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????3 ???2 ??????2 ?????? 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ?????????3 0
@@ -7994,10 +8047,13 @@
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ??? ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ???????????? ?????????2 ?????????2 ??????4 ???3 0
+?????? ?????????2 ????????? 0
 ????????? ?????????2 ????????? ??????4 0
+????????? ?????????2 ????????? ??????2 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ????????? ?????????2 ??? ?????????3 0
@@ -8195,6 +8251,7 @@
 ???????????????????????? ?????????2 ????????? ???4 ?????????3 ???4 ?????????4 ??????2 ??????2 0
 ??????????????????????????? ?????????2 ????????? ???4 ?????????3 ??? ???4 ?????????4 ??????2 ??????2 0
 ?????? ?????????2 ?????????4 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ????????? 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????4 0
@@ -8380,6 +8437,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ?????? 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????2 0
@@ -8648,6 +8706,7 @@
 ????????? ?????? ?????????2 ????????? 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ?????????2 0
+????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ??? 0
 ???????????? ?????? ?????????2 ??????3 ??????4 0
@@ -10358,6 +10417,7 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????4 0
 ???????????? ?????? ????????? ????????? ?????????2 0
 ???????????? ?????? ????????? ?????? ??????3 0
 ?????? ?????? ????????? 0
@@ -10526,6 +10586,7 @@
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????3 ???4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ??????4 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ??????3 0
@@ -10706,6 +10767,7 @@
 ????????? ??????4 ??????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????3 0
+?????? ??????4 ?????????3 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
@@ -10719,6 +10781,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -11194,6 +11257,7 @@
 ????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ??????2 ????????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????2 0
@@ -12041,6 +12105,7 @@
 ???????????? ??????2 ???2 ??????4 ??????4 0
 ?????? ??????2 ??????3 0
 ?????? ??????2 ??????4 0
+?????? ??????2 ?????? 0
 ???????????? ??????2 ??????3 ??????4 ??????4 0
 ?????? ??????2 ?????????3 0
 ?????? ??????2 ??????4 0
@@ -12073,6 +12138,7 @@
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????2 ???2 ??????4 0
 ???????????? ?????? ??????2 ???2 ??????4 0
+?????? ?????? ??????2 0
 ?????? ?????? ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????2 0
@@ -12168,6 +12234,8 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????3 0
+??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????3 0
 ?????? ?????? ???2 0
@@ -12336,6 +12404,7 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ???3 ?????????3 0
 ????????? ????????? ????????? ????????? 0
@@ -12492,6 +12561,7 @@
 ???????????? ????????? ????????? ??????4 ??????4 0
 ???????????? ????????? ????????? ?????? ???4 0
 ?????? ????????? ????????? 0
+???????????? ????????? ??????2 ??????2 ?????????4 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ??????2 ??????4 ?????????4 0
@@ -13045,6 +13115,7 @@
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????3 0
 ?????? ?????????2 ?????? 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ?????? 0
@@ -13097,16 +13168,20 @@
 ?????? ?????????4 ??????3 0
 ???????????? ?????????4 ??????2 ???4 ?????? 0
 ?????? ?????????4 ?????? 0
+???????????? ?????????4 ??????4 ???2 ?????????4 0
 ?????? ?????????4 ?????? 0
 ???????????? ?????????4 ?????????4 ??? ?????????4 0
+???????????? ?????????4 ?????????4 ?????????4 ?????????4 0
 ???????????? ?????????4 ??????3 ?????????2 ?????? 0
 ???????????? ?????????4 ?????? ?????????2 ??????4 0
 ???????????? ?????????4 ?????? ??? ?????? 0
 ?????? ?????????4 ??????3 0
+???????????? ?????????4 ??????3 ??????4 ?????? 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ??????4 0
 ?????? ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
+???????????? ?????????4 ????????? ??????2 ??????3 0
 ?????? ?????????4 ???4 0
 ???????????? ?????????4 ??????4 ????????? ?????? 0
 ?????? ?????????4 ??? 0
@@ -13930,6 +14005,7 @@
 ????????? ??????4 ?????? ?????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????2 0
+????????????????????? ??????4 ?????? ??? ?????????4 ????????? ?????????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????1 0
 ???????????? ??????4 ?????????2 ??????3 ?????????4 0
@@ -14847,6 +14923,7 @@
 ???????????? ?????????2 ??????4 ????????? ??????2 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????3 0
+????????? ?????????2 ??????3 ??????3 0
 ?????? ?????????2 ?????????2 0
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ???2 0
@@ -15078,6 +15155,7 @@
 ???????????? ?????????4 ??????2 ??????3 ???3 0
 ???????????? ?????????4 ??????2 ????????? ??????4 0
 ?????????????????? ?????????4 ??????2 ????????? ?????????4 ??????2 ???2 0
+???????????? ?????????4 ??????2 ????????? ??????2 0
 ?????????????????? ?????????4 ??????2 ??????4 ??????4 ??????4 ???3 0
 ?????? ?????????4 ??????4 0
 ?????? ??????2 ??????3 0
@@ -15389,7 +15467,9 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ???4 0
 ????????? ??????4 ?????????4 ?????????3 0
+????????? ??????4 ?????????4 ?????????3 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ??????4 0
@@ -16031,8 +16111,10 @@
 ?????? ?????? ??????2 0
 ?????? ?????? ??? 0
 ?????? ??????3 ???4 0
+????????? ??????3 ???4 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ?????? ??????4 ???3 0
 ?????? ??????3 ??????3 0
 ?????? ??????3 ???4 0
 ?????? ??????4 ??????3 0
@@ -16712,6 +16794,7 @@
 ?????? ?????????3 ?????????2 0
 ???????????? ?????????3 ????????? ??????4 ??????2 0
 ???????????? ????????? ?????? ???4 ?????????4 0
+???????????? ????????? ??????2 ?????? ?????? 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ?????? ????????? ??????2 0
@@ -17655,6 +17738,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ????????? ????????? ????????? ?????????2 0
 ?????? ????????? ?????????4 0
 ???????????? ????????? ?????????2 ??????4 ?????????4 0
@@ -18586,6 +18670,7 @@
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ??????3 0
+????????? ??????2 ??????2 ??????2 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ????????? 0
 ???????????? ??????2 ??????3 ??????2 ??????2 0
@@ -18661,6 +18746,7 @@
 ?????? ??????4 ??????3 0
 ???????????? ??????4 ??????3 ?????????2 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ??????3 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ????????? ???3 ??????3 0
 ?????? ??????4 ?????????4 0
@@ -18830,6 +18916,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ?????????3 ????????? ?????? 0
 ?????? ?????????4 ??????2 0
+????????? ?????????4 ??????2 ?????????3 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ??????3 0
@@ -19311,7 +19398,11 @@
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
+???????????? ?????????2 ?????????2 ???4 ???4 0
+???????????? ?????????2 ?????? ?????????3 ??????4 0
+???????????? ?????????2 ?????? ??????4 ?????????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ???4 ??????3 0
 ???????????? ?????????2 ??????2 ????????? ??????2 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????2 0
@@ -19332,6 +19423,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ???4 ??????2 ??????2 0
 ???????????? ?????????4 ?????????3 ?????? ???2 0
+???????????? ?????????4 ?????????3 ?????? ???2 0
 ????????? ?????????4 ??????2 ??????1 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ?????? ??????4 ??????3 0
@@ -19380,6 +19472,7 @@
 ???????????? ?????????2 ??????2 ?????????2 ???4 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????4 0
+????????? ?????????2 ??????4 ?????? 0
 ????????? ?????????2 ????????? ?????? 0
 ???????????? ?????????2 ????????? ????????? ??????3 0
 ?????? ?????????2 ????????? 0
@@ -19993,6 +20086,7 @@
 ?????? ????????? ?????????3 0
 ???????????? ????????? ?????????3 ?????????3 ??????4 0
 ?????? ????????? ?????????4 0
+????????? ????????? ?????????4 ??????4 0
 ?????? ????????? ?????????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ?????????4 0
@@ -20027,6 +20121,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????3 0
+?????? ????????? ?????????4 0
 ?????? ????????? ??????4 0
 ????????? ????????? ??????4 ??????4 0
 ?????? ????????? ??????2 0
@@ -20428,6 +20523,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ???3 0
 ?????? ????????? ???4 0
+?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ??????3 ??????2 ??????4 0
@@ -20456,6 +20552,7 @@
 ?????? ????????? ??????2 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????3 ??????4 ??????4 0
 ?????? ????????? ????????? 0
 ???????????? ????????? ????????? ????????? ???4 0
 ????????? ????????? ????????? ??????4 0
@@ -20482,6 +20579,7 @@
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????2 ??????4 ?????? 0
 ???????????? ????????? ??????4 ??????4 ??????2 0
 ????????? ????????? ??????4 ????????? 0
 ?????? ????????? ????????? 0
@@ -20904,6 +21002,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ????????? ??????4 ??????2 0
+??? ?????????3 0
 ???????????? ?????????3 ???2 ??????2 ??? 0
 ?????? ?????????3 ???4 0
 ?????? ?????????3 ?????? 0
@@ -20961,6 +21060,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ?????????4 0
 ?????? ?????????3 ?????????3 0
+?????? ?????????3 ?????????3 0
 ?????? ?????????3 ????????? 0
 ?????? ?????????3 ?????????2 0
 ?????? ?????????3 ?????????4 0
@@ -21211,6 +21311,7 @@
 ?????? ?????????3 ??? 0
 ???????????? ?????????3 ??? ???4 ???2 0
 ?????? ?????????3 ??????4 0
+?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????4 ????????? ??????2 0
 ?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????2 ??????4 ?????????2 0
@@ -21631,6 +21732,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ??????3 0
 ?????? ?????????3 ?????? 0
+????????? ?????????3 ??????2 ??????4 0
 ???????????? ?????????3 ??????3 ??? ?????? 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ??????4 0
@@ -21892,6 +21994,7 @@
 ???????????? ?????????2 ??????2 ?????????4 ?????????4 0
 ????????? ?????????2 ??????4 ??????2 0
 ???????????? ?????????2 ??????4 ????????? ??????4 0
+???????????? ?????????2 ??????4 ??????3 ?????????3 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ???????????? ?????????2 ?????????4 ??????3 ???2 0
@@ -22084,6 +22187,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ???2 0
 ???????????? ?????? ???4 ??????4 ?????????2 0
+???????????? ?????? ??????4 ??????4 ???4 0
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????4 ?????? ?????????4 0
 ?????? ?????? ??????4 0
@@ -22114,13 +22218,16 @@
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????3 0
 ???????????? ??????2 ??????4 ??????4 ??????2 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????2 ??????2 ??????3 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????????3 0
+????????? ??????2 ??????4 ??????1 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ?????? 0
@@ -22177,6 +22284,7 @@
 ???????????? ??????2 ????????? ???4 ??????2 0
 ?????? ??????2 ????????? 0
 ????????? ??????2 ????????? ??????3 0
+????????? ??????2 ????????? ??????3 0
 ???????????? ??????2 ???3 ??????4 ??????4 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
@@ -22191,6 +22299,7 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????2 ??? ??????2 0
 ?????? ??????2 ???4 0
+?????? ??????2 ??????4 0
 ????????? ??????3 ???2 ????????? 0
 ?????? ??????3 ???4 0
 ?????? ??????3 ?????? 0
@@ -22430,6 +22539,7 @@
 ?????? ?????????3 ?????????4 0
 ???????????????????????? ?????????3 ??????4 ??????2 ??????2 ???2 ??????3 ??? ????????? 0
 ???????????? ?????????3 ?????????2 ????????? ????????? 0
+???????????? ?????????3 ??????4 ?????????2 ??????4 0
 ????????? ?????????3 ??????4 ?????????2 0
 ????????? ?????????3 ??????4 ??????4 0
 ?????? ?????????3 ??????2 0
@@ -25542,8 +25652,11 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ??????2 0
 ????????? ???2 ???4 ??????2 0
+????????? ???2 ???4 ?????????4 0
 ????????? ???2 ???4 ?????????4 0
 ???????????? ???2 ???4 ?????????4 ??????1 0
+????????? ???2 ???4 ?????????2 0
+???????????? ???2 ???4 ?????????2 ????????? 0
 ????????? ???2 ???4 ??????2 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
@@ -25687,6 +25800,7 @@
 ?????? ???3 ????????? 0
 ?????? ???3 ?????????4 0
 ?????? ???3 ?????????2 0
+?????? ???3 ??????3 0
 ?????? ???3 ??????4 0
 ?????? ???3 ?????????3 0
 ?????? ???3 ?????????4 0
@@ -25751,6 +25865,7 @@
 ?????? ???4 ?????????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ?????????4 0
+????????? ???4 ????????? ????????? 0
 ?????? ???4 ??????2 0
 ???????????? ???4 ?????????2 ??????4 ??????2 0
 ?????? ???4 ??????2 0
@@ -25761,6 +25876,7 @@
 ?????? ???4 ??????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ???2 0
+????????? ???4 ??????4 ??????2 0
 ???????????? ???4 ??????4 ??????4 ??????4 0
 ?????? ???4 ?????????2 0
 ?????? ???4 ?????????2 0
@@ -25928,6 +26044,7 @@
 ???????????? ??????4 ??????2 ?????? ??????2 0
 ????????? ??????4 ?????????2 ??????2 0
 ???????????? ?????? ??????2 ?????????4 ?????????4 0
+????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
 ?????? ?????? ????????? 0
 ???????????? ?????? ????????? ??????3 ??????3 0
 ?????? ?????? ??????2 0
@@ -25938,6 +26055,7 @@
 ???????????? ?????? ??????4 ??????4 ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????3 0
+???????????? ?????? ?????????4 ??????4 ??????3 0
 ?????? ?????? ??????3 0
 ????????? ?????? ??????2 ??????3 0
 ?????? ?????? ?????? 0
@@ -25947,6 +26065,7 @@
 ???????????? ?????? ?????????4 ??????2 ??????4 0
 ???????????? ?????? ?????????3 ??????3 ???3 0
 ???????????? ?????? ??????4 ????????? ??????3 0
+???????????? ?????? ?????? ??????4 ??????4 0
 ?????? ?????? ???4 0
 ??????????????? ?????? ??????2 ??????3 ??????2 ??????1 0
 ?????? ?????? ??????3 0
@@ -26061,6 +26180,7 @@
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
 ????????? ??????4 ??????4 ??????3 0
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ????????? ??????4 ??????4 ?????? 0
@@ -26266,6 +26386,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ??????3 ?????????2 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????4 0
@@ -26488,6 +26609,7 @@
 ?????? ??????3 ??????4 0
 ????????? ??????3 ??????4 ?????????2 0
 ?????? ??????3 ??????4 0
+?????? ??????3 ??????3 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -26564,6 +26686,7 @@
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????? 0
 ???????????? ??????4 ??????2 ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ????????? ??????4 ???4 ??????1 0
@@ -27051,6 +27174,7 @@
 ?????? ???2 ?????????3 0
 ?????? ???2 ???3 0
 ?????? ???2 ??????3 0
+?????? ???3 ????????? 0
 ?????? ???3 ??????4 0
 ?????? ???3 ??????3 0
 ?????? ???3 ??????2 0
@@ -27262,11 +27386,14 @@
 ?????? ?????? ??????4 0
 ??? ??????2 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
+?????? ??????2 ??????3 0
 ????????? ??????2 ????????? ????????? 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
+????????? ??????2 ?????? ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ????????? 0
@@ -28337,6 +28464,7 @@
 ???????????????????????? ??? ??? ????????? ???2 ?????? ??? ?????? ???2 0
 ???????????? ??? ??? ????????? ??????4 0
 ?????? ??? ???2 0
+????????? ??? ???4 ??????4 0
 ?????? ??? ?????? 0
 ?????? ??? ??????3 0
 ?????? ??? ??????3 0
@@ -29455,6 +29583,7 @@
 ?????? ??????4 ???3 0
 ?????? ??????4 ???4 0
 ???????????? ?????? ???4 ?????????4 ?????????2 0
+?????? ?????? ???4 0
 ?????? ?????? ???4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
@@ -30115,8 +30244,10 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????2 0
+????????? ??????3 ??????2 ?????? 0
 ???????????? ??????3 ??????4 ?????? ??????2 0
 ????????? ??????3 ?????? ??????4 0
+?????? ??????3 ????????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ???2 0
 ???????????? ??????4 ???3 ??????4 ??????4 0
@@ -30229,6 +30360,7 @@
 ????????? ?????????4 ???4 ?????? 0
 ???????????? ?????????4 ???4 ?????????4 ??????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????2 0
@@ -30414,6 +30546,7 @@
 ?????? ????????? ?????????3 0
 ????????? ????????? ????????? ???3 0
 ???????????? ????????? ?????????3 ??????2 ?????????4 0
+????????? ????????? ??????2 ????????? 0
 ?????? ????????? ??????4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ?????????3 0
@@ -30989,6 +31122,7 @@
 ?????? ??? ??????2 0
 ?????? ??? ??????3 0
 ????????? ??? ??????3 ???2 0
+?????? ??? ??????3 0
 ?????? ??? ?????? 0
 ?????? ??? ??????4 0
 ?????? ??? ??????4 0
@@ -31008,10 +31142,12 @@
 ?????? ??? ???2 0
 ?????? ??? ???2 0
 ???????????? ??? ???4 ????????? ?????????4 0
+?????? ??? ??????3 0
 ?????? ??? ??????4 0
 ???????????? ??? ?????? ??????4 ?????????4 0
 ?????? ??? ??????3 0
 ?????? ??? ???4 0
+???????????? ??? ???4 ??????4 ???3 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
@@ -31398,6 +31534,7 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ???????????? ??????3 ??????2 ???2 ??????4 0
+????????? ??????3 ??????4 ??????4 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????3 0
@@ -31453,6 +31590,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????? 0
+????????? ?????? ?????????2 ??????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????4 ??????2 0
@@ -31466,6 +31604,8 @@
 ?????? ?????? ??????3 0
 ???????????? ?????? ??????3 ??????4 ?????????2 0
 ?????? ?????? ??? 0
+????????? ?????? ??????3 ??????3 0
+????????? ?????? ??????3 ??????4 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ???3 0
 ????????? ??????4 ???3 ?????????4 0
@@ -31739,6 +31879,7 @@
 ???????????? ?????????4 ?????????3 ??????4 ??????1 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ?????????2 0
+???????????? ?????????4 ??????4 ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
 ????????? ?????????4 ????????? ??????1 0
 ???????????? ?????????4 ?????????4 ??????4 ??????1 0
@@ -31863,6 +32004,7 @@
 ?????? ???2 ?????????4 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????4 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
 ?????? ???2 ?????????4 0
@@ -31934,6 +32076,7 @@
 ???????????? ?????? ?????? ???2 ?????????4 0
 ?????? ?????? ?????? 0
 ?????? ??????4 ??????4 0
+????????? ??????4 ??????4 ?????????4 0
 ???????????? ??????4 ??????3 ??? ????????? 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
@@ -31943,6 +32086,7 @@
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
+????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -32135,6 +32279,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ??????4 0
 ????????? ?????? ??????4 ??????3 0
+???????????? ??????2 ???2 ??????2 ??????4 0
 ?????? ??????2 ???2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -32144,6 +32289,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ?????????3 0
+???????????? ??????2 ????????? ??????4 ?????????2 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
 ???????????? ??????2 ???2 ????????? ????????? 0
@@ -32187,6 +32333,10 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????3 ??????2 ???2 0
 ?????? ??????2 ????????? 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ???4 0
+????????? ??????2 ????????? ??????4 0
 ????????????????????? ??????2 ????????? ?????? ??????3 ??????2 ??????2 ?????????3 0
 ???????????? ??????2 ?????? ??????4 ?????????2 0
 ?????? ??????2 ???4 0
@@ -32986,61 +33136,9 @@
 ?????? ??? ??? 0
 ?????? ??? ??? 0
 ?????? ??? ??? 0
-????????? ??????4 ?????????4 ?????????4 0
-?????? ?????????2 ??????4 0
-?????? ??????3 ?????? 0
-???????????? ??????4 ??????2 ?????????3 ??????3 0
-????????? ??????3 ????????? ??????2 0
-???????????? ??????3 ??????4 ?????????4 ?????? 0
-????????? ??????3 ??????3 ?????? 0
-????????? ?????????3 ??????2 ??????4 0
-?????? ??????3 ????????? 0
-????????? ??????3 ??????2 ?????? 0
-????????? ???4 ????????? ????????? 0
-????????? ???4 ??????4 ??????2 0
-????????? ?????? ??????3 ??????4 0
-????????? ?????? ??????3 ??????3 0
-????????? ?????? ?????????2 ??????2 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ???4 0
-?????? ??????4 ??????2 0
-????????? ??????2 ??????4 ??????1 0
-????????? ??????2 ????????? ??????3 0
-?????? ??????2 ??????3 0
-???????????? ?????? ?????????4 ??????4 ??????3 0
-?????? ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ??????2 ?????? ??????2 0
-???????????? ?????? ?????? ??????4 ??????4 0
-????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
-?????? ??????4 ??????4 0
-???????????? ??????2 ??????2 ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ???2 ???4 ?????????4 0
-???????????? ???2 ???4 ?????????2 ????????? 0
-????????? ???2 ???4 ?????????2 0
-?????? ?????????2 ????????? 0
-???????????? ?????????2 ??????2 ??? ??????4 0
-????????? ?????????2 ????????? ??????2 0
-???????????? ?????? ??????4 ??????4 ???4 0
-???????????? ??????2 ???2 ??????2 ??????4 0
-???????????? ??????2 ????????? ??????4 ?????????2 0
-????????? ??????4 ?????????4 ???4 0
-????????? ??????4 ?????????4 ?????????3 0
-????????? ??????3 ???4 ??????2 0
-???????????? ??????3 ?????? ??????4 ???3 0
-???????????? ??????2 ??????2 ??????2 ??????4 0
-???????????? ??????2 ??????4 ?????????2 ??????2 0
-?????? ??????4 ?????????4 0
-????????? ??????4 ??????4 ?????????2 0
-??? ?????????3 0
-?????? ?????????3 ?????????3 0
-????????? ??????2 ??????2 ??????2 0
-?????? ?????? ??????3 0
-??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
-?????? ???3 ??????3 0
-????????? ????????? ?????????4 ??????4 0
-????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
-????????? ??????3 ??????4 ??????4 0
+????????? ?????? ????????? ??????3 0
+??????????????? ??? ??? ??????3 ??????4 ??????4 0
+?????? ??????3 ??????2 0
+?????? ?????? ????????? 0
+?????? ?????? ????????? 0
+?????? ?????????3 ????????? 0
Binary files gcin-1.2.9.orig/.tedfilepos and gcin-1.2.9/.tedfilepos differ
diff -urN gcin-1.2.9.orig/tenv gcin-1.2.9/tenv
--- gcin-1.2.9.orig/tenv	2006-10-19 14:18:38.000000000 +0800
+++ gcin-1.2.9/tenv	2006-11-15 13:10:24.000000000 +0800
@@ -11,6 +11,6 @@
 gcinpid=$!
 sleep 1
 export LD_PRELOAD=./im-client/libgcin-im-client.so
-#gedit
-leafpad
+gedit
+#leafpad
 pkill gcin.test


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin	15 Nov 2006 06:58:05 -0000	1.1
+++ NewCJ3.cin	17 Nov 2006 00:29:32 -0000	1.2
@@ -52,7 +52,6 @@
 ... ???
 ... ???
 ... ???
-.; ???
 ' ???
 '' "
 '' "
@@ -171,7 +170,6 @@
 ;a ???
 ;b ???
 ;c ???
-;cu ???
 ;d ???
 ;e ???
 ;f ???
@@ -194,7 +192,9 @@
 ;s ???
 ;t ???
 ;u ???
+;ui ??????
 ;uu ??????
+;uio ?????????
 ;u; ???
 ;v ???
 ;w ???
@@ -216,7 +216,7 @@
 b ???
 b ???
 b ???
-b; ???
+b; ???
 b;; ??????
 c ???
 c ???
@@ -249,7 +249,7 @@
 f ???
 f ???
 f ???
-f; ???
+f; ???
 g ???
 g ???
 g ???
@@ -297,7 +297,7 @@
 l ???
 l ???
 l ???
-l; ???
+l; ???
 m ???
 m ???
 m ???
@@ -347,7 +347,7 @@
 q ???
 q ???
 q ???
-q; ???
+q; ???
 r ???
 r ??
 r ???
@@ -382,7 +382,6 @@
 t ???
 t ???
 t; ???
-t;; ???
 u ???
 u ???
 u ???
@@ -410,7 +409,6 @@
 w ???
 w ???
 w; ???
-w;; ???
 x ???
 x ???
 x ???
@@ -459,7 +457,6 @@
 w. ???
 x. ???
 x. ??
-x.; ??
 y. ???
 z. ???
 a, ???
@@ -493,11 +490,9 @@
 ab ???
 ac ???
 ad ???
-ad; ???
 ae ???
 af ???
 af ???
-af; ???
 ag ???
 ah ???
 ai ???
@@ -526,7 +521,7 @@
 bd ???
 be ???
 bf ???
-bf; ???
+bf; ?????????
 bg ???
 bg ???
 bh ???
@@ -537,8 +532,8 @@
 bm ???
 bm ???
 bm ???
+bn ???
 bn ???
-bn; ???
 bo ???
 bp ???
 bq ???
@@ -546,7 +541,6 @@
 bs ???
 bt ???
 bt ???
-bt; ???
 bu ???
 bv ???
 bw ???
@@ -571,21 +565,18 @@
 ck ???
 cl ???
 cl ???
-cl; ???
 cm ???
 cn ???
 cn; ???
 co ???
 cp ???
-cq ???
-cq; ???
+cq ???
 cr ???
 cs ???
 ct ???
 cu ???
 cu; ???
 cv ???
-cv; ???
 cw ???
 cx ???
 cx; ??????
@@ -605,14 +596,12 @@
 dh ???
 di ???
 di ???
-di; ???
 dj ???
 dk ???
 dk ???
 dl ???
 dm ???
 dm ???
-dm; ???
 dn ???
 do ???
 dp ???
@@ -630,11 +619,11 @@
 ea ???
 ea ???
 ea ???
-ea; ???
 eb ???
 ec ???
 ec ???
 ed ???
+ee ???
 ee ???
 ef ???
 eg ???
@@ -692,7 +681,6 @@
 ga ???
 gb ???
 gb ???
-gb; ???
 gc ???
 gd ???
 ge ???
@@ -715,7 +703,6 @@
 gt ???
 gu ???
 gu ???
-gu; ???
 gv ???
 gw ???
 gx ???
@@ -724,38 +711,28 @@
 ha ???
 hb ???
 hc ???
-hc; ???
 hd ???
 hd; ???
 he ???
-he; ???
 hf ???
 hg ???
-hg; ???
 hh ???
-hh; ???
 hi ???
 hi ???
 hi; ???
 hj ???
 hk ???
-hk; ???
 hl ???
-hm ???
 hm ???
-hm; ???
 hn ???
-hn; ???
 ho ???
 ho ???
-ho; ???
 hp ???
-hp; ???
 hq ???
 hr ???
 hs ???
 hs ???
-hs; ???
+hs; ???
 ht ???
 ht; ???
 ht;; ??????
@@ -766,26 +743,18 @@
 hw; ??????
 hx ???
 hx; ???
-hy ???
-hy; ???
+hy ???
 hz ???
 ia ???
 ib ???
-ib; ???
 ic ???
 id ???
 id ???
-id; ???
-id; ???
 ie ???
-if ???
-if; ??????
+if ??????
 ig ???
 ih ???
-ih; ???
 ii ???
-ii ???
-ii; ???
 ij ???
 ik ???
 il ???
@@ -794,16 +763,15 @@
 io ???
 io; ???
 io; ???
-ip ???
+ip ???
 ip ???
 ip ???
-ip; ???
+ip ???
 iq ???
 ir ???
 is ???
 it ???
 it ???
-it; ???
 iu ???
 iv ???
 iv; ???
@@ -813,8 +781,8 @@
 iz ???
 izo ??????
 ja ???
+jb ???
 jb ???
-jb; ???
 jc ???
 jd ???
 jd ???
@@ -824,8 +792,6 @@
 jh ???
 ji ???
 jj ???
-jj; ???
-jj; ???
 jk ???
 jk; ???
 jl ???
@@ -837,7 +803,6 @@
 jp ???
 jq ???
 jr ???
-jr; ???
 js ???
 jt ???
 ju ???
@@ -849,13 +814,11 @@
 ka ???
 kb ???
 kb ???
-kb; ???
 kc ???
 kd ???
 ke ???
 kf ???
 kf ???
-kf; ???
 kg ???
 kh ???
 ki ???
@@ -866,18 +829,16 @@
 km ???
 kn ???
 kn ???
-kn; ???
 ko ???
 ko; ???
+kp ???
 kp ???
-kp; ???
 kq ???
 kr ???
 ks ???
 kt ???
 ku ???
 ku ???
-ku; ???
 ku; ???
 kv ???
 kw ???
@@ -885,9 +846,7 @@
 ky ???
 kz ???
 la ???
-la; ???
 lb ???
-lb; ???
 lc ???
 ld ???
 le ???
@@ -908,85 +867,70 @@
 ls ???
 lt ???
 lu ???
-lu; ???
 lv ???
 lw ???
+lw; ???
 lx ???
 ly ???
 lz ???
 ma ???
 mb ???
-mb; ???
 mc ???
-mc; ???
 md ???
 me ???
 me ???
 me ???
 me; ???
 mf ???
-mf; ???
 mg ???
+mh ???
 mh ???
-mh; ???
 mi ???
 mi; ???
 mj ???
 mk ???
-mk; ???
+mk; ???
+ml ???
 ml ???
-ml; ???
 mm ???
-mm ???
-mm; ???
 mn ???
 mo ???
-mo; ???
 mp ???
 mq ???
 mr ???
 ms ???
-ms; ???
 mt ???
-mt; ???
+mu ???
 mu ???
 mu ???
-mu; ???
-mv ???
+mv ???
 mv ???
-mv; ???
 mw ???
+mw; ???
 mx ???
 my ???
 mz ???
 na ???
 nb ???
-nb; ???
 nc ???
 nd ???
 ne ???
-ne; ???
 nf ???
 ng ???
 nh ???
 ni ???
 ni ???
-ni; ???
-ni; ???
-ni;; ???
 nj ???
 nk ???
 nl ???
 nl ???
-nl; ???
 nm ???
 nn ???
 no ???
 no ???
 no ???
-no No.
-no; ???
 np ???
+nq ???
 nq ???
 nq ???
 nq; ???
@@ -998,7 +942,6 @@
 nw ???
 nx ???
 nx ???
-nx; ???
 ny ???
 nz ???
 oa ???
@@ -1010,8 +953,8 @@
 ob ???
 ob ???
 ob; ???
+oc ???
 oc ???
-oc; ???
 od ???
 od ???
 od ???
@@ -1039,7 +982,6 @@
 og ???
 og ???
 og ???
-og; ???
 oh ???
 oh ???
 oh ???
@@ -1056,7 +998,6 @@
 oi ???
 oi ???
 oi ???
-oi; ???
 oj ???
 oj ???
 oj ???
@@ -1075,9 +1016,7 @@
 om ???
 om ???
 om ???
-om; ???
 on ???
-on; ???
 oo ???
 oo ???
 oo ???
@@ -1118,7 +1057,6 @@
 oq ???
 oq ???
 or ???
-or; ???
 or ???
 or ???
 or ???
@@ -1162,10 +1100,10 @@
 ou ???
 ou ???
 ou ???
-ou; ???
 ov ???
-ov; ???
+ow ???
 ow ???
+ow; ???
 ow ???
 ow ???
 ow ???
@@ -1177,7 +1115,6 @@
 ow ???
 ow ???
 ow ???
-ow; ???
 ox ???
 oy ???
 oy ???
@@ -1191,14 +1128,13 @@
 oy ???
 oy ???
 oy ???
-oy; ???
 oz ???
 pa ???
 pa ???
 pa; ???
 pb ???
+pc ???
 pc ???
-pc; ???
 pd ???
 pe ???
 pe; ??????
@@ -1207,14 +1143,13 @@
 ph ???
 pi ???
 pi ???
-pi; ???
 pj ???
+pk ???
 pk ???
-pk; ???
 pl ???
 pm ???
+pn ???
 pn ???
-pn; ???
 po ???
 pp ???
 pq ???
@@ -1227,74 +1162,66 @@
 px ???
 py ???
 pz ???
+qa ???
 qa ???
-qa; ???
+qb ???
 qb ???
-qb; ???
+qc ???
 qc ???
-qc; ???
+qd ???
 qd ???
-qd; ???
 qe ???
 qf ???
 qg ???
 qh ???
 qi ???
 qj ???
-qj; ???
 qk ???
 ql ???
 qm ???
-qm; ???
 qn ???
 qo ???
 qp ???
-qq ???
+qq ???
 qr ???
 qs ???
 qt ???
 qu ???
-qu; ???
 qv ???
 qw ???
 qx ???
+qy ???
 qy ???
-qy; ???
 qz ???
 ra ???
 rb ???
-rb; ???
 rc ???
 rc ???
-rc; ???
 rd ???
 re ???
 rf ???
-rf; ???
 rg ???
 rh ???
 ri ???
 rj ???
 rk ???
+rk; ???
 rl ???
 rm ???
 rn ???
 ro ???
 rp ???
-rp; ???
 rq ???
 rr ???
 rs ???
-rt ???
+rt ???
 ru ???
-ru; ???
 ru; ???
 rv ???
 rw ???
 rx ???
 ry ???
 rz ???
-rz; ???
 sa ???
 sb ???
 sc ???
@@ -1314,12 +1241,10 @@
 sp ???
 sq ???
 sr ???
-sr; ???
 ss ???
 st ???
-su ???
 su ???
-su; ???
+su ???
 sv ???
 sw ???
 sw; ???
@@ -1327,7 +1252,6 @@
 sy ???
 sz ???
 ta ???
-ta; ???
 tb ???
 tc ???
 tc ???
@@ -1335,25 +1259,22 @@
 te ???
 tf ???
 tg ???
-tg; ???
 th ???
+ti ???
 ti ???
-ti; ???
+tj ???
 tj ???
-tj; ???
 tj; ???
 tk ???
 tk; ???
 tl ???
 tm ???
-tm; ???
 tn ???
-tn; ???
 tn; ???
 tn; ???
 to ???
+tp ???
 tp ???
-tp; ???
 tq ???
 tr ???
 ts ???
@@ -1361,16 +1282,14 @@
 tt ???
 tt ???
 tt ???
-tt; ???
-tu ???
-tu; ???
+tt; ???
+tu ???
 tv ???
 tv; ???
 tw ???
 tw ???
 tw; ???
 tw; ???
-tw;; ???
 tx ???
 ty ???
 tz ???
@@ -1404,8 +1323,8 @@
 uy ???
 uz ???
 va ???
-vb ???
-vb; ???
+va; ???
+vb ???
 vc ???
 vd ???
 ve ???
@@ -1416,32 +1335,29 @@
 vi ???
 vj ???
 vk ???
-vk; ???
-vl ???
-vl ???
+vl ???
 vl ???
 vl; ???
+vm ???
 vm ???
-vm; ???
+vm; ???
 vn ???
 vo ???
 vo; ???
 vp ???
 vq ???
 vr ???
-vr; ???
 vs ???
 vt ???
+vu ???
 vu ???
-vu; ???
+vv ???
 vv ???
-vv; ???
 vw ???
 vx ???
-vy ???
-vy; ???
+vy ???
+vz ???
 vz ???
-vz; ???
 wa ???
 wb ???
 wc ???
@@ -1451,13 +1367,11 @@
 we ???
 wf ???
 wg ???
-wg; ???
 wh ???
 wi ???
 wj ???
 wj ???
 wk ???
-wk ???
 wl ???
 wm ???
 wn ???
@@ -1468,14 +1382,13 @@
 ws ???
 wt ???
 wu ???
+wv ???
 wv ???
-wv; ???
-ww ???
+ww ???
 wx ???
 wy ???
 wz ???
 wz ???
-wz; ???
 xa ???
 xb ???
 xc ???
@@ -1491,7 +1404,6 @@
 xm ???
 xn ???
 xo ???
-xo; ??
 xp ???
 xq ???
 xr ???
@@ -1518,30 +1430,28 @@
 yj ???
 yj; ???
 yk ???
-yk; ???
 yl ???
 ym ???
 yn ???
 yo ???
 yo; ???
+yp ???
 yp ???
-yp; ???
 yp; ???
 yq ???
 yr ???
+ys ???
 ys ???
-ys; ???
 yt ???
+yu ???
 yu ???
-yu; ???
 yv ???
 yw ???
 yx ???
+yy ???
 yy ???
-yy; ???
 yy, ??????
 yz ???
-yz; ???
 za ???
 zb ???
 zc ???
@@ -1555,7 +1465,7 @@
 zk ???
 zl ???
 zm ???
-zm; ???
+zm ???
 zn ???
 zo ???
 zp ???
@@ -1564,12 +1474,12 @@
 zs ???
 zt ???
 zu ???
-zu; ???
+zu ???
 zv ???
 zw ???
 zx ???
 zy ???
-zy; ???
+zy ???
 zz ???
 aaa ???
 aaa ???
@@ -6623,6 +6533,7 @@
 nbp ???
 nbp; ???
 nbu ???
+ncj ????????????
 ncz ???
 nde ???
 ndk ???
@@ -7052,10 +6963,9 @@
 ojg ???
 oji ???
 ojj ???
+ojk ???
 ojk ???
 ojk ???
-ojk ???
-ojk; ???
 ojm ???
 ojm ???
 ojm; ???
@@ -8546,20 +8456,8 @@
 rgc ???
 rgc ???
 rgc ???
-rgc (?????????)a
-rgc (?????????|||)??????
-rgc =???=b
-rgc ???????????????|||??????
 rgc; ???
 rgg ???
-rgg (????????????)
-rgg ???(???_???;)???
-rgg ??????~??????~
-rgg (??????O???)
-rgg .......\(><)/
-rgg ???*@??@*???
-rgg O_o
-rgg ???(???_???;)?????????~??????~
 rgi ???
 rgj ???
 rgk ???
@@ -9681,9 +9579,8 @@
 tmb ???
 tmb ???
 tmb; ???
-tmc ???
 tmc ???
-tmc; ???
+tmc ???
 tmd ???
 tmd ???
 tmd; ???
@@ -19631,6 +19528,7 @@
 somr ???
 sonl ???
 sorc ???
+sorr ?????????
 sphf ???
 sphh ???
 sqnl ???
@@ -28614,7 +28512,6 @@
 bopo ???
 boqa ???
 boqb ???
-boqh ????????????
 borb ????
 borg ????
 bort ????


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	15 Nov 2006 06:58:05 -0000	1.12
+++ gcin.spec	17 Nov 2006 00:29:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         gcin129update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .up
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -107,6 +109,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+- add gcin129update.patch
+- update NewCJ3.cin
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Fri Nov 17 00:33:21 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:33:21 -0700
Subject: rpms/gcin/FC-5 gcin129update.patch, NONE, 1.1 NewCJ3.cin, 1.1,
	1.2 gcin.spec, 1.12, 1.13
Message-ID: <200611170033.kAH0XLkU018806@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785

Modified Files:
	NewCJ3.cin gcin.spec 
Added Files:
	gcin129update.patch 
Log Message:
add gcin129update.patch and update NewCj3.cin

gcin129update.patch:

--- NEW FILE gcin129update.patch ---
diff -urN gcin-1.2.9.orig/Changelog gcin-1.2.9/Changelog
--- gcin-1.2.9.orig/Changelog	2006-11-14 18:24:09.000000000 +0800
+++ gcin-1.2.9/Changelog	2006-11-15 18:52:02.000000000 +0800
@@ -1,5 +1,5 @@
 ** UTF-8 encoding **
-1.2.9:
+1.2.9: (11/15/2006)
 - ???????????? tray icons ???????????? ~/.gcin/icons ???????????? symbolic link ?????????
 - ????????????????????????????????? tray icons??????????????????????????????
 - ???????????????????????????????????????????????????????????????????????????
@@ -7,7 +7,7 @@
 - ???????????????????????? FC6??????????????????????????????
 - ????????? WM(fvwm1) ?????????????????????????????????????????????????????? keyboard focus ??????????????????????????? gcin ??? window????????????????????? click ????????????????????????????????????????????????????????? WM or X11 server ???????????? focus ??????????????? override_redirect ??? window???
 - FreeBSD /usr/bin/bash ??????????????? ./configure ?????????????????? /bin/bash -> /usr/bin/bash
-- libgcin-im-client.so ?????? soname???thanks to caleb
+- libgcin-im-client.so ?????? soname???thanks to candyz
 
 
 1.2.8: (10/19/2006)
diff -urN gcin-1.2.9.orig/configure gcin-1.2.9/configure
--- gcin-1.2.9.orig/configure	2006-11-06 09:29:26.000000000 +0800
+++ gcin-1.2.9/configure	2006-11-15 18:53:54.000000000 +0800
@@ -74,7 +74,7 @@
   echo "/bin/bash -> /usr/bin/bash"
   for i in scripts/*
   do
-    sed -e "s~/bin~/usr/bin" < $i > $i.tmp
+    sed -e "s~/bin~/usr/bin~" < $i > $i.tmp
     mv $i.tmp $i
   done
 fi
diff -urN gcin-1.2.9.orig/data/tsin.src gcin-1.2.9/data/tsin.src
--- gcin-1.2.9.orig/data/tsin.src	2006-11-15 13:05:04.000000000 +0800
+++ gcin-1.2.9/data/tsin.src	2006-11-15 18:56:36.000000000 +0800
@@ -1049,6 +1049,7 @@
 ?????? ???4 ?????? 0
 ?????? ???4 ??????4 0
 ????????????????????? ???4 ?????????2 ???2 ??? ???2 ?????????2 ??????3 0
+????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
 ???????????? ???4 ???2 ???4 ?????????3 0
 ???????????? ???4 ???2 ?????????3 ?????????3 0
 ???????????? ???4 ???2 ??? ?????????3 0
@@ -1439,6 +1440,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????4 ?????????2 ??????2 0
 ???????????? ??????2 ??????4 ?????????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -1448,6 +1450,7 @@
 ???????????? ??????2 ??????4 ?????? ??????4 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ??????4 0
+????????? ??????2 ??????4 ?????????4 0
 ????????? ??????2 ??????4 ??????2 0
 ???????????? ??????2 ??????2 ??????3 ?????????4 0
 ?????? ??????2 ?????????2 0
@@ -1458,6 +1461,7 @@
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????? 0
 ???????????? ??????2 ??????2 ???3 ?????????3 0
+???????????? ??????2 ??????2 ??????2 ??????4 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ??????3 ?????? 0
 ?????? ??????2 ??????2 0
@@ -2442,6 +2446,7 @@
 ????????? ??????3 ??????4 ?????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????2 0
+????????? ??????3 ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
@@ -2547,6 +2552,7 @@
 ?????? ??? ??? 0
 ???????????? ??? ?????? ??????3 ????????? 0
 ?????? ??? ?????????3 0
+???????????? ???2 ???4 ??????2 ?????????4 0
 ?????? ???2 ???4 0
 ?????? ???2 ???4 0
 ???????????? ???2 ??? ???2 ??????4 0
@@ -2556,19 +2562,23 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ????????? 0
 ????????? ???2 ???4 ????????? 0
+???????????? ???2 ??????4 ??????2 ?????????2 0
 ???????????? ???2 ?????? ???2 ??????4 0
 ???????????? ???2 ??????2 ???3 ?????????4 0
+????????????????????? ???2 ??????2 ?????????4 ????????? ????????? ??????4 ??????3 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????3 ???2 ????????? 0
 ???????????? ???2 ??????2 ???2 ???4 0
 ???????????? ???2 ??????2 ??????2 ???4 0
 ????????? ???2 ??????3 ?????????2 0
 ?????? ???2 ??????4 0
+???????????? ???2 ??????3 ??????2 ??????4 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????4 ??? ?????? 0
 ???????????? ???2 ??????4 ??????4 ??????3 0
 ???????????? ???2 ???3 ?????????2 ??????3 0
 ???????????? ???2 ???4 ??????2 ?????? 0
+???????????? ???2 ?????? ???2 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ???2 ??????4 0
 ???????????? ???2 ??????3 ??????2 ?????????4 0
@@ -2577,6 +2587,8 @@
 ???????????? ???2 ?????? ???4 ???2 0
 ??????????????? ???2 ??????4 ???3 ??? ??????4 0
 ?????? ???2 ??????4 0
+???????????? ???2 ????????? ???2 ??????4 0
+???????????? ???2 ?????????4 ?????? ??????2 0
 ???????????? ???2 ?????????2 ???2 ??????4 0
 ????????? ???2 ?????????3 ??????2 0
 ???????????? ???2 ?????????2 ?????? ?????????2 0
@@ -2585,19 +2597,26 @@
 ????????? ???2 ?????????2 ???4 0
 ?????? ???2 ??????3 0
 ???????????? ???2 ??????3 ???2 ????????? 0
+???????????? ???2 ??????3 ??????3 ?????????3 0
 ???????????? ???2 ??????3 ?????? ?????????4 0
+???????????? ???2 ?????? ????????? ???4 0
 ?????? ???2 ??????2 0
 ??????????????? ???2 ?????? ??????4 ??????3 ??????4 0
+???????????? ???2 ??????2 ????????? ??????4 0
 ????????? ???2 ??????3 ??????2 0
 ?????? ???2 ??????2 0
 ????????? ???2 ??????3 ?????????4 0
+???????????? ???2 ??????4 ??????4 ???3 0
+???????????? ???2 ??????4 ???4 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ??????3 ???3 0
+??????????????? ???2 ??????2 ??????2 ??????4 ?????? 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ??????4 ???3 0
 ???????????? ???2 ?????????4 ???2 ????????? 0
 ???????????? ???2 ??????2 ?????? ??????2 0
 ?????? ???2 ??????2 0
+????????? ???2 ?????????2 ?????????4 0
 ?????? ???2 ?????????2 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
@@ -2610,6 +2629,8 @@
 ?????? ???2 ??????4 0
 ????????? ???2 ??????4 ??????3 0
 ???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ?????? ?????????4 0
+??????????????? ???2 ??????4 ??????2 ??? ??????4 0
 ?????? ???2 ?????????2 0
 ???????????? ???2 ??????4 ??????3 ??????3 0
 ?????? ???2 ?????????4 0
@@ -2618,13 +2639,18 @@
 ????????? ???2 ?????? ??????1 0
 ????????? ???2 ????????? ???2 0
 ?????? ???2 ????????? 0
+??????????????? ???2 ????????? ???4 ?????? ????????? 0
 ???????????? ???2 ????????? ?????????4 ??????3 0
+???????????? ???2 ????????? ?????????3 ??????4 0
 ??????????????? ???2 ????????? ?????????3 ??????4 ??????1 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ???2 ??????3 0
+??????????????? ???2 ????????? ??????2 ??????4 ??????4 0
+???????????? ???2 ??????3 ??????4 ??????4 0
 ???????????? ???2 ??????3 ??????3 ??????2 0
 ???????????? ???2 ??????3 ??????4 ?????? 0
 ???????????? ???2 ??????3 ?????????4 ??????4 0
+???????????? ???2 ??????3 ?????????4 ?????????4 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ??????????????? ???2 ??????4 ??????4 ??? ?????? 0
 ?????? ???2 ??????2 0
@@ -2632,7 +2658,10 @@
 ?????? ???2 ?????? 0
 ???????????? ???2 ?????? ??? ??????2 0
 ???????????? ???2 ??????2 ???2 ????????? 0
+????????? ???2 ??????3 ???2 0
 ???????????? ???2 ??????4 ???2 ???4 0
+??????????????? ???2 ??????4 ?????????2 ??????2 ?????????4 0
+???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ????????? ??????3 ????????? 0
 ?????? ???2 ?????????4 0
@@ -2650,7 +2679,9 @@
 ?????? ???2 ?????????2 0
 ????????? ???2 ?????????2 ??????1 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????2 0
 ?????? ???2 ?????????2 0
+???????????? ???2 ?????????2 ???2 ?????????4 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ?????????4 ??? ??????2 0
 ???????????? ???2 ?????????4 ??????3 ??????2 0
@@ -2666,12 +2697,19 @@
 ?????? ???2 ?????????2 0
 ???????????? ???2 ?????????4 ?????? ???2 0
 ?????? ???2 ??? 0
+????????? ???2 ???3 ?????????4 0
 ???????????? ???2 ???3 ?????????4 ??????1 0
 ??????????????? ???2 ?????? ??????4 ??????3 ?????? 0
 ???????????? ???2 ??????4 ?????????4 ???3 0
+??????????????? ???2 ??????4 ??????3 ?????????4 ??????4 0
+?????? ???2 ??????4 0
+????????? ???2 ??????4 ???2 0
 ???????????? ???2 ????????? ?????? ??????3 0
 ?????? ???2 ???3 0
 ????????? ???2 ??????2 ???4 0
+???????????? ???2 ?????? ??????2 ??????4 0
+???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ??????3 ??????4 0
 ???????????? ???2 ??? ???4 ????????? 0
 ???????????? ???2 ???2 ???2 ??????4 0
 ????????? ???2 ???4 ???2 0
@@ -2684,6 +2722,7 @@
 ?????? ???2 ??????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ?????? ?????????2 0
+???????????? ???2 ???4 ????????? ?????? 0
 ?????? ???2 ?????????4 0
 ????????? ???2 ????????? ?????????4 0
 ???????????? ???2 ?????????2 ??????2 ??? 0
@@ -2692,6 +2731,7 @@
 ?????????????????? ???2 ?????????3 ??????2 ??????4 ??????2 ??????2 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ???????????? ???2 ?????????3 ??????4 ??????2 0
+???????????? ???2 ?????????3 ??????4 ????????? 0
 ???????????? ???2 ?????????3 ???4 ???4 0
 ???????????? ???2 ?????????3 ???4 ?????????2 0
 ?????? ???3 ??? 0
@@ -2955,6 +2995,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????3 0
+????????? ??????4 ??????4 ?????????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ?????????2 0
 ?????? ??????4 ?????????2 0
@@ -3674,6 +3715,7 @@
 ????????? ??????3 ??????3 ?????????4 0
 ?????? ??????3 ???4 0
 ???????????? ??????3 ??????4 ????????? ?????? 0
+?????? ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -5947,6 +5989,7 @@
 ???????????? ??????2 ??????4 ???2 ?????????2 0
 ?????? ??????2 ??????4 0
 ????????????????????? ??????2 ??????3 ??????4 ??????2 ???2 ???2 ??????4 0
+?????? ??????2 ??????4 0
 ???????????? ??????2 ??????4 ??? ????????? 0
 ?????? ??????2 ?????????4 0
 ????????? ??????2 ????????? ??????2 0
@@ -6197,6 +6240,8 @@
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ???3 ??????4 0
 ?????? ??????4 ?????????2 0
+???????????? ??????4 ??????3 ??????4 ?????????2 0
+??????????????? ??????4 ??????3 ??????4 ?????????2 ?????? 0
 ???????????? ??????4 ??????3 ??????4 ???3 0
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????2 ??????2 ??????4 0
@@ -6299,6 +6344,7 @@
 ????????? ??????4 ?????? ??????4 0
 ?????? ??????4 ??????2 0
 ????????? ??????4 ??????2 ?????????4 0
+???????????? ??????4 ??????2 ?????????3 ??????3 0
 ????????? ??????4 ??????3 ????????? 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ?????????3 ??????2 0
@@ -6515,7 +6561,9 @@
 ???????????? ?????? ??????3 ?????????4 ?????????2 0
 ?????? ?????? ???3 0
 ???????????? ??????2 ??????2 ?????? ?????? 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ????????? ??????2 ?????? ??????2 0
 ???????????? ??????2 ??????2 ?????? ????????? 0
 ?????? ??????2 ?????? 0
@@ -7118,11 +7166,13 @@
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ??????4 ?????????4 ?????? 0
 ???????????? ??????3 ????????? ?????????2 ?????????4 0
 ????????? ??????3 ?????????2 ?????? 0
 ?????? ??????3 ????????? 0
 ????????? ??????3 ????????? ??????1 0
 ???????????? ??????3 ????????? ??????3 ???4 0
+????????? ??????3 ????????? ??????2 0
 ????????? ??????3 ??????2 ??????2 0
 ????????? ??????3 ??????4 ??? 0
 ?????? ??????3 ??????2 0
@@ -7456,6 +7506,7 @@
 ????????? ??????2 ????????? ??????3 0
 ????????? ??????2 ????????? ?????? 0
 ????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????2 0
 ???????????? ??????2 ?????? ???4 ??????4 0
 ???????????? ??????2 ?????? ??????3 ?????????4 0
 ?????? ??????2 ?????????4 0
@@ -7509,6 +7560,7 @@
 ????????? ??????3 ???2 ??????1 0
 ????????? ??????3 ???4 ????????? 0
 ????????? ??????3 ???4 ?????????3 0
+?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ???4 0
@@ -7974,6 +8026,7 @@
 ?????? ?????????2 ?????? 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????3 ???2 ??????2 ?????? 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ?????????3 0
@@ -7994,10 +8047,13 @@
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ??? ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ???????????? ?????????2 ?????????2 ??????4 ???3 0
+?????? ?????????2 ????????? 0
 ????????? ?????????2 ????????? ??????4 0
+????????? ?????????2 ????????? ??????2 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ????????? ?????????2 ??? ?????????3 0
@@ -8195,6 +8251,7 @@
 ???????????????????????? ?????????2 ????????? ???4 ?????????3 ???4 ?????????4 ??????2 ??????2 0
 ??????????????????????????? ?????????2 ????????? ???4 ?????????3 ??? ???4 ?????????4 ??????2 ??????2 0
 ?????? ?????????2 ?????????4 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ????????? 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????4 0
@@ -8380,6 +8437,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ?????? 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????2 0
@@ -8648,6 +8706,7 @@
 ????????? ?????? ?????????2 ????????? 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ?????????2 0
+????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ??? 0
 ???????????? ?????? ?????????2 ??????3 ??????4 0
@@ -10358,6 +10417,7 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????4 0
 ???????????? ?????? ????????? ????????? ?????????2 0
 ???????????? ?????? ????????? ?????? ??????3 0
 ?????? ?????? ????????? 0
@@ -10526,6 +10586,7 @@
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????3 ???4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ??????4 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ??????3 0
@@ -10706,6 +10767,7 @@
 ????????? ??????4 ??????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????3 0
+?????? ??????4 ?????????3 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
@@ -10719,6 +10781,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -11194,6 +11257,7 @@
 ????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ??????2 ????????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????2 0
@@ -12041,6 +12105,7 @@
 ???????????? ??????2 ???2 ??????4 ??????4 0
 ?????? ??????2 ??????3 0
 ?????? ??????2 ??????4 0
+?????? ??????2 ?????? 0
 ???????????? ??????2 ??????3 ??????4 ??????4 0
 ?????? ??????2 ?????????3 0
 ?????? ??????2 ??????4 0
@@ -12073,6 +12138,7 @@
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????2 ???2 ??????4 0
 ???????????? ?????? ??????2 ???2 ??????4 0
+?????? ?????? ??????2 0
 ?????? ?????? ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????2 0
@@ -12168,6 +12234,8 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????3 0
+??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????3 0
 ?????? ?????? ???2 0
@@ -12336,6 +12404,7 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ???3 ?????????3 0
 ????????? ????????? ????????? ????????? 0
@@ -12492,6 +12561,7 @@
 ???????????? ????????? ????????? ??????4 ??????4 0
 ???????????? ????????? ????????? ?????? ???4 0
 ?????? ????????? ????????? 0
+???????????? ????????? ??????2 ??????2 ?????????4 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ??????2 ??????4 ?????????4 0
@@ -13045,6 +13115,7 @@
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????3 0
 ?????? ?????????2 ?????? 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ?????? 0
@@ -13097,16 +13168,20 @@
 ?????? ?????????4 ??????3 0
 ???????????? ?????????4 ??????2 ???4 ?????? 0
 ?????? ?????????4 ?????? 0
+???????????? ?????????4 ??????4 ???2 ?????????4 0
 ?????? ?????????4 ?????? 0
 ???????????? ?????????4 ?????????4 ??? ?????????4 0
+???????????? ?????????4 ?????????4 ?????????4 ?????????4 0
 ???????????? ?????????4 ??????3 ?????????2 ?????? 0
 ???????????? ?????????4 ?????? ?????????2 ??????4 0
 ???????????? ?????????4 ?????? ??? ?????? 0
 ?????? ?????????4 ??????3 0
+???????????? ?????????4 ??????3 ??????4 ?????? 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ??????4 0
 ?????? ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
+???????????? ?????????4 ????????? ??????2 ??????3 0
 ?????? ?????????4 ???4 0
 ???????????? ?????????4 ??????4 ????????? ?????? 0
 ?????? ?????????4 ??? 0
@@ -13930,6 +14005,7 @@
 ????????? ??????4 ?????? ?????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????2 0
+????????????????????? ??????4 ?????? ??? ?????????4 ????????? ?????????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????1 0
 ???????????? ??????4 ?????????2 ??????3 ?????????4 0
@@ -14847,6 +14923,7 @@
 ???????????? ?????????2 ??????4 ????????? ??????2 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????3 0
+????????? ?????????2 ??????3 ??????3 0
 ?????? ?????????2 ?????????2 0
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ???2 0
@@ -15078,6 +15155,7 @@
 ???????????? ?????????4 ??????2 ??????3 ???3 0
 ???????????? ?????????4 ??????2 ????????? ??????4 0
 ?????????????????? ?????????4 ??????2 ????????? ?????????4 ??????2 ???2 0
+???????????? ?????????4 ??????2 ????????? ??????2 0
 ?????????????????? ?????????4 ??????2 ??????4 ??????4 ??????4 ???3 0
 ?????? ?????????4 ??????4 0
 ?????? ??????2 ??????3 0
@@ -15389,7 +15467,9 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ???4 0
 ????????? ??????4 ?????????4 ?????????3 0
+????????? ??????4 ?????????4 ?????????3 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ??????4 0
@@ -16031,8 +16111,10 @@
 ?????? ?????? ??????2 0
 ?????? ?????? ??? 0
 ?????? ??????3 ???4 0
+????????? ??????3 ???4 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ?????? ??????4 ???3 0
 ?????? ??????3 ??????3 0
 ?????? ??????3 ???4 0
 ?????? ??????4 ??????3 0
@@ -16712,6 +16794,7 @@
 ?????? ?????????3 ?????????2 0
 ???????????? ?????????3 ????????? ??????4 ??????2 0
 ???????????? ????????? ?????? ???4 ?????????4 0
+???????????? ????????? ??????2 ?????? ?????? 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ?????? ????????? ??????2 0
@@ -17655,6 +17738,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ????????? ????????? ????????? ?????????2 0
 ?????? ????????? ?????????4 0
 ???????????? ????????? ?????????2 ??????4 ?????????4 0
@@ -18586,6 +18670,7 @@
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ??????3 0
+????????? ??????2 ??????2 ??????2 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ????????? 0
 ???????????? ??????2 ??????3 ??????2 ??????2 0
@@ -18661,6 +18746,7 @@
 ?????? ??????4 ??????3 0
 ???????????? ??????4 ??????3 ?????????2 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ??????3 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ????????? ???3 ??????3 0
 ?????? ??????4 ?????????4 0
@@ -18830,6 +18916,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ?????????3 ????????? ?????? 0
 ?????? ?????????4 ??????2 0
+????????? ?????????4 ??????2 ?????????3 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ??????3 0
@@ -19311,7 +19398,11 @@
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
+???????????? ?????????2 ?????????2 ???4 ???4 0
+???????????? ?????????2 ?????? ?????????3 ??????4 0
+???????????? ?????????2 ?????? ??????4 ?????????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ???4 ??????3 0
 ???????????? ?????????2 ??????2 ????????? ??????2 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????2 0
@@ -19332,6 +19423,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ???4 ??????2 ??????2 0
 ???????????? ?????????4 ?????????3 ?????? ???2 0
+???????????? ?????????4 ?????????3 ?????? ???2 0
 ????????? ?????????4 ??????2 ??????1 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ?????? ??????4 ??????3 0
@@ -19380,6 +19472,7 @@
 ???????????? ?????????2 ??????2 ?????????2 ???4 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????4 0
+????????? ?????????2 ??????4 ?????? 0
 ????????? ?????????2 ????????? ?????? 0
 ???????????? ?????????2 ????????? ????????? ??????3 0
 ?????? ?????????2 ????????? 0
@@ -19993,6 +20086,7 @@
 ?????? ????????? ?????????3 0
 ???????????? ????????? ?????????3 ?????????3 ??????4 0
 ?????? ????????? ?????????4 0
+????????? ????????? ?????????4 ??????4 0
 ?????? ????????? ?????????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ?????????4 0
@@ -20027,6 +20121,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????3 0
+?????? ????????? ?????????4 0
 ?????? ????????? ??????4 0
 ????????? ????????? ??????4 ??????4 0
 ?????? ????????? ??????2 0
@@ -20428,6 +20523,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ???3 0
 ?????? ????????? ???4 0
+?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ??????3 ??????2 ??????4 0
@@ -20456,6 +20552,7 @@
 ?????? ????????? ??????2 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????3 ??????4 ??????4 0
 ?????? ????????? ????????? 0
 ???????????? ????????? ????????? ????????? ???4 0
 ????????? ????????? ????????? ??????4 0
@@ -20482,6 +20579,7 @@
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????2 ??????4 ?????? 0
 ???????????? ????????? ??????4 ??????4 ??????2 0
 ????????? ????????? ??????4 ????????? 0
 ?????? ????????? ????????? 0
@@ -20904,6 +21002,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ????????? ??????4 ??????2 0
+??? ?????????3 0
 ???????????? ?????????3 ???2 ??????2 ??? 0
 ?????? ?????????3 ???4 0
 ?????? ?????????3 ?????? 0
@@ -20961,6 +21060,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ?????????4 0
 ?????? ?????????3 ?????????3 0
+?????? ?????????3 ?????????3 0
 ?????? ?????????3 ????????? 0
 ?????? ?????????3 ?????????2 0
 ?????? ?????????3 ?????????4 0
@@ -21211,6 +21311,7 @@
 ?????? ?????????3 ??? 0
 ???????????? ?????????3 ??? ???4 ???2 0
 ?????? ?????????3 ??????4 0
+?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????4 ????????? ??????2 0
 ?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????2 ??????4 ?????????2 0
@@ -21631,6 +21732,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ??????3 0
 ?????? ?????????3 ?????? 0
+????????? ?????????3 ??????2 ??????4 0
 ???????????? ?????????3 ??????3 ??? ?????? 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ??????4 0
@@ -21892,6 +21994,7 @@
 ???????????? ?????????2 ??????2 ?????????4 ?????????4 0
 ????????? ?????????2 ??????4 ??????2 0
 ???????????? ?????????2 ??????4 ????????? ??????4 0
+???????????? ?????????2 ??????4 ??????3 ?????????3 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ???????????? ?????????2 ?????????4 ??????3 ???2 0
@@ -22084,6 +22187,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ???2 0
 ???????????? ?????? ???4 ??????4 ?????????2 0
+???????????? ?????? ??????4 ??????4 ???4 0
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????4 ?????? ?????????4 0
 ?????? ?????? ??????4 0
@@ -22114,13 +22218,16 @@
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????3 0
 ???????????? ??????2 ??????4 ??????4 ??????2 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????2 ??????2 ??????3 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????????3 0
+????????? ??????2 ??????4 ??????1 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ?????? 0
@@ -22177,6 +22284,7 @@
 ???????????? ??????2 ????????? ???4 ??????2 0
 ?????? ??????2 ????????? 0
 ????????? ??????2 ????????? ??????3 0
+????????? ??????2 ????????? ??????3 0
 ???????????? ??????2 ???3 ??????4 ??????4 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
@@ -22191,6 +22299,7 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????2 ??? ??????2 0
 ?????? ??????2 ???4 0
+?????? ??????2 ??????4 0
 ????????? ??????3 ???2 ????????? 0
 ?????? ??????3 ???4 0
 ?????? ??????3 ?????? 0
@@ -22430,6 +22539,7 @@
 ?????? ?????????3 ?????????4 0
 ???????????????????????? ?????????3 ??????4 ??????2 ??????2 ???2 ??????3 ??? ????????? 0
 ???????????? ?????????3 ?????????2 ????????? ????????? 0
+???????????? ?????????3 ??????4 ?????????2 ??????4 0
 ????????? ?????????3 ??????4 ?????????2 0
 ????????? ?????????3 ??????4 ??????4 0
 ?????? ?????????3 ??????2 0
@@ -25542,8 +25652,11 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ??????2 0
 ????????? ???2 ???4 ??????2 0
+????????? ???2 ???4 ?????????4 0
 ????????? ???2 ???4 ?????????4 0
 ???????????? ???2 ???4 ?????????4 ??????1 0
+????????? ???2 ???4 ?????????2 0
+???????????? ???2 ???4 ?????????2 ????????? 0
 ????????? ???2 ???4 ??????2 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
@@ -25687,6 +25800,7 @@
 ?????? ???3 ????????? 0
 ?????? ???3 ?????????4 0
 ?????? ???3 ?????????2 0
+?????? ???3 ??????3 0
 ?????? ???3 ??????4 0
 ?????? ???3 ?????????3 0
 ?????? ???3 ?????????4 0
@@ -25751,6 +25865,7 @@
 ?????? ???4 ?????????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ?????????4 0
+????????? ???4 ????????? ????????? 0
 ?????? ???4 ??????2 0
 ???????????? ???4 ?????????2 ??????4 ??????2 0
 ?????? ???4 ??????2 0
@@ -25761,6 +25876,7 @@
 ?????? ???4 ??????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ???2 0
+????????? ???4 ??????4 ??????2 0
 ???????????? ???4 ??????4 ??????4 ??????4 0
 ?????? ???4 ?????????2 0
 ?????? ???4 ?????????2 0
@@ -25928,6 +26044,7 @@
 ???????????? ??????4 ??????2 ?????? ??????2 0
 ????????? ??????4 ?????????2 ??????2 0
 ???????????? ?????? ??????2 ?????????4 ?????????4 0
+????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
 ?????? ?????? ????????? 0
 ???????????? ?????? ????????? ??????3 ??????3 0
 ?????? ?????? ??????2 0
@@ -25938,6 +26055,7 @@
 ???????????? ?????? ??????4 ??????4 ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????3 0
+???????????? ?????? ?????????4 ??????4 ??????3 0
 ?????? ?????? ??????3 0
 ????????? ?????? ??????2 ??????3 0
 ?????? ?????? ?????? 0
@@ -25947,6 +26065,7 @@
 ???????????? ?????? ?????????4 ??????2 ??????4 0
 ???????????? ?????? ?????????3 ??????3 ???3 0
 ???????????? ?????? ??????4 ????????? ??????3 0
+???????????? ?????? ?????? ??????4 ??????4 0
 ?????? ?????? ???4 0
 ??????????????? ?????? ??????2 ??????3 ??????2 ??????1 0
 ?????? ?????? ??????3 0
@@ -26061,6 +26180,7 @@
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
 ????????? ??????4 ??????4 ??????3 0
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ????????? ??????4 ??????4 ?????? 0
@@ -26266,6 +26386,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ??????3 ?????????2 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????4 0
@@ -26488,6 +26609,7 @@
 ?????? ??????3 ??????4 0
 ????????? ??????3 ??????4 ?????????2 0
 ?????? ??????3 ??????4 0
+?????? ??????3 ??????3 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -26564,6 +26686,7 @@
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????? 0
 ???????????? ??????4 ??????2 ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ????????? ??????4 ???4 ??????1 0
@@ -27051,6 +27174,7 @@
 ?????? ???2 ?????????3 0
 ?????? ???2 ???3 0
 ?????? ???2 ??????3 0
+?????? ???3 ????????? 0
 ?????? ???3 ??????4 0
 ?????? ???3 ??????3 0
 ?????? ???3 ??????2 0
@@ -27262,11 +27386,14 @@
 ?????? ?????? ??????4 0
 ??? ??????2 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
+?????? ??????2 ??????3 0
 ????????? ??????2 ????????? ????????? 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
+????????? ??????2 ?????? ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ????????? 0
@@ -28337,6 +28464,7 @@
 ???????????????????????? ??? ??? ????????? ???2 ?????? ??? ?????? ???2 0
 ???????????? ??? ??? ????????? ??????4 0
 ?????? ??? ???2 0
+????????? ??? ???4 ??????4 0
 ?????? ??? ?????? 0
 ?????? ??? ??????3 0
 ?????? ??? ??????3 0
@@ -29455,6 +29583,7 @@
 ?????? ??????4 ???3 0
 ?????? ??????4 ???4 0
 ???????????? ?????? ???4 ?????????4 ?????????2 0
+?????? ?????? ???4 0
 ?????? ?????? ???4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
@@ -30115,8 +30244,10 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????2 0
+????????? ??????3 ??????2 ?????? 0
 ???????????? ??????3 ??????4 ?????? ??????2 0
 ????????? ??????3 ?????? ??????4 0
+?????? ??????3 ????????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ???2 0
 ???????????? ??????4 ???3 ??????4 ??????4 0
@@ -30229,6 +30360,7 @@
 ????????? ?????????4 ???4 ?????? 0
 ???????????? ?????????4 ???4 ?????????4 ??????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????2 0
@@ -30414,6 +30546,7 @@
 ?????? ????????? ?????????3 0
 ????????? ????????? ????????? ???3 0
 ???????????? ????????? ?????????3 ??????2 ?????????4 0
+????????? ????????? ??????2 ????????? 0
 ?????? ????????? ??????4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ?????????3 0
@@ -30989,6 +31122,7 @@
 ?????? ??? ??????2 0
 ?????? ??? ??????3 0
 ????????? ??? ??????3 ???2 0
+?????? ??? ??????3 0
 ?????? ??? ?????? 0
 ?????? ??? ??????4 0
 ?????? ??? ??????4 0
@@ -31008,10 +31142,12 @@
 ?????? ??? ???2 0
 ?????? ??? ???2 0
 ???????????? ??? ???4 ????????? ?????????4 0
+?????? ??? ??????3 0
 ?????? ??? ??????4 0
 ???????????? ??? ?????? ??????4 ?????????4 0
 ?????? ??? ??????3 0
 ?????? ??? ???4 0
+???????????? ??? ???4 ??????4 ???3 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
@@ -31398,6 +31534,7 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ???????????? ??????3 ??????2 ???2 ??????4 0
+????????? ??????3 ??????4 ??????4 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????3 0
@@ -31453,6 +31590,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????? 0
+????????? ?????? ?????????2 ??????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????4 ??????2 0
@@ -31466,6 +31604,8 @@
 ?????? ?????? ??????3 0
 ???????????? ?????? ??????3 ??????4 ?????????2 0
 ?????? ?????? ??? 0
+????????? ?????? ??????3 ??????3 0
+????????? ?????? ??????3 ??????4 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ???3 0
 ????????? ??????4 ???3 ?????????4 0
@@ -31739,6 +31879,7 @@
 ???????????? ?????????4 ?????????3 ??????4 ??????1 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ?????????2 0
+???????????? ?????????4 ??????4 ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
 ????????? ?????????4 ????????? ??????1 0
 ???????????? ?????????4 ?????????4 ??????4 ??????1 0
@@ -31863,6 +32004,7 @@
 ?????? ???2 ?????????4 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????4 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
 ?????? ???2 ?????????4 0
@@ -31934,6 +32076,7 @@
 ???????????? ?????? ?????? ???2 ?????????4 0
 ?????? ?????? ?????? 0
 ?????? ??????4 ??????4 0
+????????? ??????4 ??????4 ?????????4 0
 ???????????? ??????4 ??????3 ??? ????????? 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
@@ -31943,6 +32086,7 @@
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
+????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -32135,6 +32279,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ??????4 0
 ????????? ?????? ??????4 ??????3 0
+???????????? ??????2 ???2 ??????2 ??????4 0
 ?????? ??????2 ???2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -32144,6 +32289,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ?????????3 0
+???????????? ??????2 ????????? ??????4 ?????????2 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
 ???????????? ??????2 ???2 ????????? ????????? 0
@@ -32187,6 +32333,10 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????3 ??????2 ???2 0
 ?????? ??????2 ????????? 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ???4 0
+????????? ??????2 ????????? ??????4 0
 ????????????????????? ??????2 ????????? ?????? ??????3 ??????2 ??????2 ?????????3 0
 ???????????? ??????2 ?????? ??????4 ?????????2 0
 ?????? ??????2 ???4 0
@@ -32986,61 +33136,9 @@
 ?????? ??? ??? 0
 ?????? ??? ??? 0
 ?????? ??? ??? 0
-????????? ??????4 ?????????4 ?????????4 0
-?????? ?????????2 ??????4 0
-?????? ??????3 ?????? 0
-???????????? ??????4 ??????2 ?????????3 ??????3 0
-????????? ??????3 ????????? ??????2 0
-???????????? ??????3 ??????4 ?????????4 ?????? 0
-????????? ??????3 ??????3 ?????? 0
-????????? ?????????3 ??????2 ??????4 0
-?????? ??????3 ????????? 0
-????????? ??????3 ??????2 ?????? 0
-????????? ???4 ????????? ????????? 0
-????????? ???4 ??????4 ??????2 0
-????????? ?????? ??????3 ??????4 0
-????????? ?????? ??????3 ??????3 0
-????????? ?????? ?????????2 ??????2 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ???4 0
-?????? ??????4 ??????2 0
-????????? ??????2 ??????4 ??????1 0
-????????? ??????2 ????????? ??????3 0
-?????? ??????2 ??????3 0
-???????????? ?????? ?????????4 ??????4 ??????3 0
-?????? ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ??????2 ?????? ??????2 0
-???????????? ?????? ?????? ??????4 ??????4 0
-????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
-?????? ??????4 ??????4 0
-???????????? ??????2 ??????2 ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ???2 ???4 ?????????4 0
-???????????? ???2 ???4 ?????????2 ????????? 0
-????????? ???2 ???4 ?????????2 0
-?????? ?????????2 ????????? 0
-???????????? ?????????2 ??????2 ??? ??????4 0
-????????? ?????????2 ????????? ??????2 0
-???????????? ?????? ??????4 ??????4 ???4 0
-???????????? ??????2 ???2 ??????2 ??????4 0
-???????????? ??????2 ????????? ??????4 ?????????2 0
-????????? ??????4 ?????????4 ???4 0
-????????? ??????4 ?????????4 ?????????3 0
-????????? ??????3 ???4 ??????2 0
-???????????? ??????3 ?????? ??????4 ???3 0
-???????????? ??????2 ??????2 ??????2 ??????4 0
-???????????? ??????2 ??????4 ?????????2 ??????2 0
-?????? ??????4 ?????????4 0
-????????? ??????4 ??????4 ?????????2 0
-??? ?????????3 0
-?????? ?????????3 ?????????3 0
-????????? ??????2 ??????2 ??????2 0
-?????? ?????? ??????3 0
-??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
-?????? ???3 ??????3 0
-????????? ????????? ?????????4 ??????4 0
-????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
-????????? ??????3 ??????4 ??????4 0
+????????? ?????? ????????? ??????3 0
+??????????????? ??? ??? ??????3 ??????4 ??????4 0
+?????? ??????3 ??????2 0
+?????? ?????? ????????? 0
+?????? ?????? ????????? 0
+?????? ?????????3 ????????? 0
Binary files gcin-1.2.9.orig/.tedfilepos and gcin-1.2.9/.tedfilepos differ
diff -urN gcin-1.2.9.orig/tenv gcin-1.2.9/tenv
--- gcin-1.2.9.orig/tenv	2006-10-19 14:18:38.000000000 +0800
+++ gcin-1.2.9/tenv	2006-11-15 13:10:24.000000000 +0800
@@ -11,6 +11,6 @@
 gcinpid=$!
 sleep 1
 export LD_PRELOAD=./im-client/libgcin-im-client.so
-#gedit
-leafpad
+gedit
+#leafpad
 pkill gcin.test


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin	15 Nov 2006 07:07:12 -0000	1.1
+++ NewCJ3.cin	17 Nov 2006 00:32:51 -0000	1.2
@@ -52,7 +52,6 @@
 ... ???
 ... ???
 ... ???
-.; ???
 ' ???
 '' "
 '' "
@@ -171,7 +170,6 @@
 ;a ???
 ;b ???
 ;c ???
-;cu ???
 ;d ???
 ;e ???
 ;f ???
@@ -194,7 +192,9 @@
 ;s ???
 ;t ???
 ;u ???
+;ui ??????
 ;uu ??????
+;uio ?????????
 ;u; ???
 ;v ???
 ;w ???
@@ -216,7 +216,7 @@
 b ???
 b ???
 b ???
-b; ???
+b; ???
 b;; ??????
 c ???
 c ???
@@ -249,7 +249,7 @@
 f ???
 f ???
 f ???
-f; ???
+f; ???
 g ???
 g ???
 g ???
@@ -297,7 +297,7 @@
 l ???
 l ???
 l ???
-l; ???
+l; ???
 m ???
 m ???
 m ???
@@ -347,7 +347,7 @@
 q ???
 q ???
 q ???
-q; ???
+q; ???
 r ???
 r ??
 r ???
@@ -382,7 +382,6 @@
 t ???
 t ???
 t; ???
-t;; ???
 u ???
 u ???
 u ???
@@ -410,7 +409,6 @@
 w ???
 w ???
 w; ???
-w;; ???
 x ???
 x ???
 x ???
@@ -459,7 +457,6 @@
 w. ???
 x. ???
 x. ??
-x.; ??
 y. ???
 z. ???
 a, ???
@@ -493,11 +490,9 @@
 ab ???
 ac ???
 ad ???
-ad; ???
 ae ???
 af ???
 af ???
-af; ???
 ag ???
 ah ???
 ai ???
@@ -526,7 +521,7 @@
 bd ???
 be ???
 bf ???
-bf; ???
+bf; ?????????
 bg ???
 bg ???
 bh ???
@@ -537,8 +532,8 @@
 bm ???
 bm ???
 bm ???
+bn ???
 bn ???
-bn; ???
 bo ???
 bp ???
 bq ???
@@ -546,7 +541,6 @@
 bs ???
 bt ???
 bt ???
-bt; ???
 bu ???
 bv ???
 bw ???
@@ -571,21 +565,18 @@
 ck ???
 cl ???
 cl ???
-cl; ???
 cm ???
 cn ???
 cn; ???
 co ???
 cp ???
-cq ???
-cq; ???
+cq ???
 cr ???
 cs ???
 ct ???
 cu ???
 cu; ???
 cv ???
-cv; ???
 cw ???
 cx ???
 cx; ??????
@@ -605,14 +596,12 @@
 dh ???
 di ???
 di ???
-di; ???
 dj ???
 dk ???
 dk ???
 dl ???
 dm ???
 dm ???
-dm; ???
 dn ???
 do ???
 dp ???
@@ -630,11 +619,11 @@
 ea ???
 ea ???
 ea ???
-ea; ???
 eb ???
 ec ???
 ec ???
 ed ???
+ee ???
 ee ???
 ef ???
 eg ???
@@ -692,7 +681,6 @@
 ga ???
 gb ???
 gb ???
-gb; ???
 gc ???
 gd ???
 ge ???
@@ -715,7 +703,6 @@
 gt ???
 gu ???
 gu ???
-gu; ???
 gv ???
 gw ???
 gx ???
@@ -724,38 +711,28 @@
 ha ???
 hb ???
 hc ???
-hc; ???
 hd ???
 hd; ???
 he ???
-he; ???
 hf ???
 hg ???
-hg; ???
 hh ???
-hh; ???
 hi ???
 hi ???
 hi; ???
 hj ???
 hk ???
-hk; ???
 hl ???
-hm ???
 hm ???
-hm; ???
 hn ???
-hn; ???
 ho ???
 ho ???
-ho; ???
 hp ???
-hp; ???
 hq ???
 hr ???
 hs ???
 hs ???
-hs; ???
+hs; ???
 ht ???
 ht; ???
 ht;; ??????
@@ -766,26 +743,18 @@
 hw; ??????
 hx ???
 hx; ???
-hy ???
-hy; ???
+hy ???
 hz ???
 ia ???
 ib ???
-ib; ???
 ic ???
 id ???
 id ???
-id; ???
-id; ???
 ie ???
-if ???
-if; ??????
+if ??????
 ig ???
 ih ???
-ih; ???
 ii ???
-ii ???
-ii; ???
 ij ???
 ik ???
 il ???
@@ -794,16 +763,15 @@
 io ???
 io; ???
 io; ???
-ip ???
+ip ???
 ip ???
 ip ???
-ip; ???
+ip ???
 iq ???
 ir ???
 is ???
 it ???
 it ???
-it; ???
 iu ???
 iv ???
 iv; ???
@@ -813,8 +781,8 @@
 iz ???
 izo ??????
 ja ???
+jb ???
 jb ???
-jb; ???
 jc ???
 jd ???
 jd ???
@@ -824,8 +792,6 @@
 jh ???
 ji ???
 jj ???
-jj; ???
-jj; ???
 jk ???
 jk; ???
 jl ???
@@ -837,7 +803,6 @@
 jp ???
 jq ???
 jr ???
-jr; ???
 js ???
 jt ???
 ju ???
@@ -849,13 +814,11 @@
 ka ???
 kb ???
 kb ???
-kb; ???
 kc ???
 kd ???
 ke ???
 kf ???
 kf ???
-kf; ???
 kg ???
 kh ???
 ki ???
@@ -866,18 +829,16 @@
 km ???
 kn ???
 kn ???
-kn; ???
 ko ???
 ko; ???
+kp ???
 kp ???
-kp; ???
 kq ???
 kr ???
 ks ???
 kt ???
 ku ???
 ku ???
-ku; ???
 ku; ???
 kv ???
 kw ???
@@ -885,9 +846,7 @@
 ky ???
 kz ???
 la ???
-la; ???
 lb ???
-lb; ???
 lc ???
 ld ???
 le ???
@@ -908,85 +867,70 @@
 ls ???
 lt ???
 lu ???
-lu; ???
 lv ???
 lw ???
+lw; ???
 lx ???
 ly ???
 lz ???
 ma ???
 mb ???
-mb; ???
 mc ???
-mc; ???
 md ???
 me ???
 me ???
 me ???
 me; ???
 mf ???
-mf; ???
 mg ???
+mh ???
 mh ???
-mh; ???
 mi ???
 mi; ???
 mj ???
 mk ???
-mk; ???
+mk; ???
+ml ???
 ml ???
-ml; ???
 mm ???
-mm ???
-mm; ???
 mn ???
 mo ???
-mo; ???
 mp ???
 mq ???
 mr ???
 ms ???
-ms; ???
 mt ???
-mt; ???
+mu ???
 mu ???
 mu ???
-mu; ???
-mv ???
+mv ???
 mv ???
-mv; ???
 mw ???
+mw; ???
 mx ???
 my ???
 mz ???
 na ???
 nb ???
-nb; ???
 nc ???
 nd ???
 ne ???
-ne; ???
 nf ???
 ng ???
 nh ???
 ni ???
 ni ???
-ni; ???
-ni; ???
-ni;; ???
 nj ???
 nk ???
 nl ???
 nl ???
-nl; ???
 nm ???
 nn ???
 no ???
 no ???
 no ???
-no No.
-no; ???
 np ???
+nq ???
 nq ???
 nq ???
 nq; ???
@@ -998,7 +942,6 @@
 nw ???
 nx ???
 nx ???
-nx; ???
 ny ???
 nz ???
 oa ???
@@ -1010,8 +953,8 @@
 ob ???
 ob ???
 ob; ???
+oc ???
 oc ???
-oc; ???
 od ???
 od ???
 od ???
@@ -1039,7 +982,6 @@
 og ???
 og ???
 og ???
-og; ???
 oh ???
 oh ???
 oh ???
@@ -1056,7 +998,6 @@
 oi ???
 oi ???
 oi ???
-oi; ???
 oj ???
 oj ???
 oj ???
@@ -1075,9 +1016,7 @@
 om ???
 om ???
 om ???
-om; ???
 on ???
-on; ???
 oo ???
 oo ???
 oo ???
@@ -1118,7 +1057,6 @@
 oq ???
 oq ???
 or ???
-or; ???
 or ???
 or ???
 or ???
@@ -1162,10 +1100,10 @@
 ou ???
 ou ???
 ou ???
-ou; ???
 ov ???
-ov; ???
+ow ???
 ow ???
+ow; ???
 ow ???
 ow ???
 ow ???
@@ -1177,7 +1115,6 @@
 ow ???
 ow ???
 ow ???
-ow; ???
 ox ???
 oy ???
 oy ???
@@ -1191,14 +1128,13 @@
 oy ???
 oy ???
 oy ???
-oy; ???
 oz ???
 pa ???
 pa ???
 pa; ???
 pb ???
+pc ???
 pc ???
-pc; ???
 pd ???
 pe ???
 pe; ??????
@@ -1207,14 +1143,13 @@
 ph ???
 pi ???
 pi ???
-pi; ???
 pj ???
+pk ???
 pk ???
-pk; ???
 pl ???
 pm ???
+pn ???
 pn ???
-pn; ???
 po ???
 pp ???
 pq ???
@@ -1227,74 +1162,66 @@
 px ???
 py ???
 pz ???
+qa ???
 qa ???
-qa; ???
+qb ???
 qb ???
-qb; ???
+qc ???
 qc ???
-qc; ???
+qd ???
 qd ???
-qd; ???
 qe ???
 qf ???
 qg ???
 qh ???
 qi ???
 qj ???
-qj; ???
 qk ???
 ql ???
 qm ???
-qm; ???
 qn ???
 qo ???
 qp ???
-qq ???
+qq ???
 qr ???
 qs ???
 qt ???
 qu ???
-qu; ???
 qv ???
 qw ???
 qx ???
+qy ???
 qy ???
-qy; ???
 qz ???
 ra ???
 rb ???
-rb; ???
 rc ???
 rc ???
-rc; ???
 rd ???
 re ???
 rf ???
-rf; ???
 rg ???
 rh ???
 ri ???
 rj ???
 rk ???
+rk; ???
 rl ???
 rm ???
 rn ???
 ro ???
 rp ???
-rp; ???
 rq ???
 rr ???
 rs ???
-rt ???
+rt ???
 ru ???
-ru; ???
 ru; ???
 rv ???
 rw ???
 rx ???
 ry ???
 rz ???
-rz; ???
 sa ???
 sb ???
 sc ???
@@ -1314,12 +1241,10 @@
 sp ???
 sq ???
 sr ???
-sr; ???
 ss ???
 st ???
-su ???
 su ???
-su; ???
+su ???
 sv ???
 sw ???
 sw; ???
@@ -1327,7 +1252,6 @@
 sy ???
 sz ???
 ta ???
-ta; ???
 tb ???
 tc ???
 tc ???
@@ -1335,25 +1259,22 @@
 te ???
 tf ???
 tg ???
-tg; ???
 th ???
+ti ???
 ti ???
-ti; ???
+tj ???
 tj ???
-tj; ???
 tj; ???
 tk ???
 tk; ???
 tl ???
 tm ???
-tm; ???
 tn ???
-tn; ???
 tn; ???
 tn; ???
 to ???
+tp ???
 tp ???
-tp; ???
 tq ???
 tr ???
 ts ???
@@ -1361,16 +1282,14 @@
 tt ???
 tt ???
 tt ???
-tt; ???
-tu ???
-tu; ???
+tt; ???
+tu ???
 tv ???
 tv; ???
 tw ???
 tw ???
 tw; ???
 tw; ???
-tw;; ???
 tx ???
 ty ???
 tz ???
@@ -1404,8 +1323,8 @@
 uy ???
 uz ???
 va ???
-vb ???
-vb; ???
+va; ???
+vb ???
 vc ???
 vd ???
 ve ???
@@ -1416,32 +1335,29 @@
 vi ???
 vj ???
 vk ???
-vk; ???
-vl ???
-vl ???
+vl ???
 vl ???
 vl; ???
+vm ???
 vm ???
-vm; ???
+vm; ???
 vn ???
 vo ???
 vo; ???
 vp ???
 vq ???
 vr ???
-vr; ???
 vs ???
 vt ???
+vu ???
 vu ???
-vu; ???
+vv ???
 vv ???
-vv; ???
 vw ???
 vx ???
-vy ???
-vy; ???
+vy ???
+vz ???
 vz ???
-vz; ???
 wa ???
 wb ???
 wc ???
@@ -1451,13 +1367,11 @@
 we ???
 wf ???
 wg ???
-wg; ???
 wh ???
 wi ???
 wj ???
 wj ???
 wk ???
-wk ???
 wl ???
 wm ???
 wn ???
@@ -1468,14 +1382,13 @@
 ws ???
 wt ???
 wu ???
+wv ???
 wv ???
-wv; ???
-ww ???
+ww ???
 wx ???
 wy ???
 wz ???
 wz ???
-wz; ???
 xa ???
 xb ???
 xc ???
@@ -1491,7 +1404,6 @@
 xm ???
 xn ???
 xo ???
-xo; ??
 xp ???
 xq ???
 xr ???
@@ -1518,30 +1430,28 @@
 yj ???
 yj; ???
 yk ???
-yk; ???
 yl ???
 ym ???
 yn ???
 yo ???
 yo; ???
+yp ???
 yp ???
-yp; ???
 yp; ???
 yq ???
 yr ???
+ys ???
 ys ???
-ys; ???
 yt ???
+yu ???
 yu ???
-yu; ???
 yv ???
 yw ???
 yx ???
+yy ???
 yy ???
-yy; ???
 yy, ??????
 yz ???
-yz; ???
 za ???
 zb ???
 zc ???
@@ -1555,7 +1465,7 @@
 zk ???
 zl ???
 zm ???
-zm; ???
+zm ???
 zn ???
 zo ???
 zp ???
@@ -1564,12 +1474,12 @@
 zs ???
 zt ???
 zu ???
-zu; ???
+zu ???
 zv ???
 zw ???
 zx ???
 zy ???
-zy; ???
+zy ???
 zz ???
 aaa ???
 aaa ???
@@ -6623,6 +6533,7 @@
 nbp ???
 nbp; ???
 nbu ???
+ncj ????????????
 ncz ???
 nde ???
 ndk ???
@@ -7052,10 +6963,9 @@
 ojg ???
 oji ???
 ojj ???
+ojk ???
 ojk ???
 ojk ???
-ojk ???
-ojk; ???
 ojm ???
 ojm ???
 ojm; ???
@@ -8546,20 +8456,8 @@
 rgc ???
 rgc ???
 rgc ???
-rgc (?????????)a
-rgc (?????????|||)??????
-rgc =???=b
-rgc ???????????????|||??????
 rgc; ???
 rgg ???
-rgg (????????????)
-rgg ???(???_???;)???
-rgg ??????~??????~
-rgg (??????O???)
-rgg .......\(><)/
-rgg ???*@??@*???
-rgg O_o
-rgg ???(???_???;)?????????~??????~
 rgi ???
 rgj ???
 rgk ???
@@ -9681,9 +9579,8 @@
 tmb ???
 tmb ???
 tmb; ???
-tmc ???
 tmc ???
-tmc; ???
+tmc ???
 tmd ???
 tmd ???
 tmd; ???
@@ -19631,6 +19528,7 @@
 somr ???
 sonl ???
 sorc ???
+sorr ?????????
 sphf ???
 sphh ???
 sqnl ???
@@ -28614,7 +28512,6 @@
 bopo ???
 boqa ???
 boqb ???
-boqh ????????????
 borb ????
 borg ????
 bort ????


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	15 Nov 2006 07:07:12 -0000	1.12
+++ gcin.spec	17 Nov 2006 00:32:51 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         gcin129update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .up
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -107,6 +109,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+- add gcin129update.patch
+- update NewCJ3.cin
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Fri Nov 17 00:36:19 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:36:19 -0700
Subject: rpms/gcin/FC-4 gcin129update.patch, NONE, 1.1 NewCJ3.cin, 1.1,
	1.2 gcin.spec, 1.13, 1.14
Message-ID: <200611170036.kAH0aJLm018876@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18855

Modified Files:
	NewCJ3.cin gcin.spec 
Added Files:
	gcin129update.patch 
Log Message:
add gcin129update.patch and update NewCj3.cin

gcin129update.patch:

--- NEW FILE gcin129update.patch ---
diff -urN gcin-1.2.9.orig/Changelog gcin-1.2.9/Changelog
--- gcin-1.2.9.orig/Changelog	2006-11-14 18:24:09.000000000 +0800
+++ gcin-1.2.9/Changelog	2006-11-15 18:52:02.000000000 +0800
@@ -1,5 +1,5 @@
 ** UTF-8 encoding **
-1.2.9:
+1.2.9: (11/15/2006)
 - ???????????? tray icons ???????????? ~/.gcin/icons ???????????? symbolic link ?????????
 - ????????????????????????????????? tray icons??????????????????????????????
 - ???????????????????????????????????????????????????????????????????????????
@@ -7,7 +7,7 @@
 - ???????????????????????? FC6??????????????????????????????
 - ????????? WM(fvwm1) ?????????????????????????????????????????????????????? keyboard focus ??????????????????????????? gcin ??? window????????????????????? click ????????????????????????????????????????????????????????? WM or X11 server ???????????? focus ??????????????? override_redirect ??? window???
 - FreeBSD /usr/bin/bash ??????????????? ./configure ?????????????????? /bin/bash -> /usr/bin/bash
-- libgcin-im-client.so ?????? soname???thanks to caleb
+- libgcin-im-client.so ?????? soname???thanks to candyz
 
 
 1.2.8: (10/19/2006)
diff -urN gcin-1.2.9.orig/configure gcin-1.2.9/configure
--- gcin-1.2.9.orig/configure	2006-11-06 09:29:26.000000000 +0800
+++ gcin-1.2.9/configure	2006-11-15 18:53:54.000000000 +0800
@@ -74,7 +74,7 @@
   echo "/bin/bash -> /usr/bin/bash"
   for i in scripts/*
   do
-    sed -e "s~/bin~/usr/bin" < $i > $i.tmp
+    sed -e "s~/bin~/usr/bin~" < $i > $i.tmp
     mv $i.tmp $i
   done
 fi
diff -urN gcin-1.2.9.orig/data/tsin.src gcin-1.2.9/data/tsin.src
--- gcin-1.2.9.orig/data/tsin.src	2006-11-15 13:05:04.000000000 +0800
+++ gcin-1.2.9/data/tsin.src	2006-11-15 18:56:36.000000000 +0800
@@ -1049,6 +1049,7 @@
 ?????? ???4 ?????? 0
 ?????? ???4 ??????4 0
 ????????????????????? ???4 ?????????2 ???2 ??? ???2 ?????????2 ??????3 0
+????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
 ???????????? ???4 ???2 ???4 ?????????3 0
 ???????????? ???4 ???2 ?????????3 ?????????3 0
 ???????????? ???4 ???2 ??? ?????????3 0
@@ -1439,6 +1440,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????4 ?????????2 ??????2 0
 ???????????? ??????2 ??????4 ?????????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -1448,6 +1450,7 @@
 ???????????? ??????2 ??????4 ?????? ??????4 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ??????4 0
+????????? ??????2 ??????4 ?????????4 0
 ????????? ??????2 ??????4 ??????2 0
 ???????????? ??????2 ??????2 ??????3 ?????????4 0
 ?????? ??????2 ?????????2 0
@@ -1458,6 +1461,7 @@
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????? 0
 ???????????? ??????2 ??????2 ???3 ?????????3 0
+???????????? ??????2 ??????2 ??????2 ??????4 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ??????3 ?????? 0
 ?????? ??????2 ??????2 0
@@ -2442,6 +2446,7 @@
 ????????? ??????3 ??????4 ?????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????2 0
+????????? ??????3 ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
@@ -2547,6 +2552,7 @@
 ?????? ??? ??? 0
 ???????????? ??? ?????? ??????3 ????????? 0
 ?????? ??? ?????????3 0
+???????????? ???2 ???4 ??????2 ?????????4 0
 ?????? ???2 ???4 0
 ?????? ???2 ???4 0
 ???????????? ???2 ??? ???2 ??????4 0
@@ -2556,19 +2562,23 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ????????? 0
 ????????? ???2 ???4 ????????? 0
+???????????? ???2 ??????4 ??????2 ?????????2 0
 ???????????? ???2 ?????? ???2 ??????4 0
 ???????????? ???2 ??????2 ???3 ?????????4 0
+????????????????????? ???2 ??????2 ?????????4 ????????? ????????? ??????4 ??????3 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????3 ???2 ????????? 0
 ???????????? ???2 ??????2 ???2 ???4 0
 ???????????? ???2 ??????2 ??????2 ???4 0
 ????????? ???2 ??????3 ?????????2 0
 ?????? ???2 ??????4 0
+???????????? ???2 ??????3 ??????2 ??????4 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????4 ??? ?????? 0
 ???????????? ???2 ??????4 ??????4 ??????3 0
 ???????????? ???2 ???3 ?????????2 ??????3 0
 ???????????? ???2 ???4 ??????2 ?????? 0
+???????????? ???2 ?????? ???2 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ???2 ??????4 0
 ???????????? ???2 ??????3 ??????2 ?????????4 0
@@ -2577,6 +2587,8 @@
 ???????????? ???2 ?????? ???4 ???2 0
 ??????????????? ???2 ??????4 ???3 ??? ??????4 0
 ?????? ???2 ??????4 0
+???????????? ???2 ????????? ???2 ??????4 0
+???????????? ???2 ?????????4 ?????? ??????2 0
 ???????????? ???2 ?????????2 ???2 ??????4 0
 ????????? ???2 ?????????3 ??????2 0
 ???????????? ???2 ?????????2 ?????? ?????????2 0
@@ -2585,19 +2597,26 @@
 ????????? ???2 ?????????2 ???4 0
 ?????? ???2 ??????3 0
 ???????????? ???2 ??????3 ???2 ????????? 0
+???????????? ???2 ??????3 ??????3 ?????????3 0
 ???????????? ???2 ??????3 ?????? ?????????4 0
+???????????? ???2 ?????? ????????? ???4 0
 ?????? ???2 ??????2 0
 ??????????????? ???2 ?????? ??????4 ??????3 ??????4 0
+???????????? ???2 ??????2 ????????? ??????4 0
 ????????? ???2 ??????3 ??????2 0
 ?????? ???2 ??????2 0
 ????????? ???2 ??????3 ?????????4 0
+???????????? ???2 ??????4 ??????4 ???3 0
+???????????? ???2 ??????4 ???4 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ??????3 ???3 0
+??????????????? ???2 ??????2 ??????2 ??????4 ?????? 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ??????4 ???3 0
 ???????????? ???2 ?????????4 ???2 ????????? 0
 ???????????? ???2 ??????2 ?????? ??????2 0
 ?????? ???2 ??????2 0
+????????? ???2 ?????????2 ?????????4 0
 ?????? ???2 ?????????2 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
@@ -2610,6 +2629,8 @@
 ?????? ???2 ??????4 0
 ????????? ???2 ??????4 ??????3 0
 ???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ?????? ?????????4 0
+??????????????? ???2 ??????4 ??????2 ??? ??????4 0
 ?????? ???2 ?????????2 0
 ???????????? ???2 ??????4 ??????3 ??????3 0
 ?????? ???2 ?????????4 0
@@ -2618,13 +2639,18 @@
 ????????? ???2 ?????? ??????1 0
 ????????? ???2 ????????? ???2 0
 ?????? ???2 ????????? 0
+??????????????? ???2 ????????? ???4 ?????? ????????? 0
 ???????????? ???2 ????????? ?????????4 ??????3 0
+???????????? ???2 ????????? ?????????3 ??????4 0
 ??????????????? ???2 ????????? ?????????3 ??????4 ??????1 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ???2 ??????3 0
+??????????????? ???2 ????????? ??????2 ??????4 ??????4 0
+???????????? ???2 ??????3 ??????4 ??????4 0
 ???????????? ???2 ??????3 ??????3 ??????2 0
 ???????????? ???2 ??????3 ??????4 ?????? 0
 ???????????? ???2 ??????3 ?????????4 ??????4 0
+???????????? ???2 ??????3 ?????????4 ?????????4 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ??????????????? ???2 ??????4 ??????4 ??? ?????? 0
 ?????? ???2 ??????2 0
@@ -2632,7 +2658,10 @@
 ?????? ???2 ?????? 0
 ???????????? ???2 ?????? ??? ??????2 0
 ???????????? ???2 ??????2 ???2 ????????? 0
+????????? ???2 ??????3 ???2 0
 ???????????? ???2 ??????4 ???2 ???4 0
+??????????????? ???2 ??????4 ?????????2 ??????2 ?????????4 0
+???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ????????? ??????3 ????????? 0
 ?????? ???2 ?????????4 0
@@ -2650,7 +2679,9 @@
 ?????? ???2 ?????????2 0
 ????????? ???2 ?????????2 ??????1 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????2 0
 ?????? ???2 ?????????2 0
+???????????? ???2 ?????????2 ???2 ?????????4 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ?????????4 ??? ??????2 0
 ???????????? ???2 ?????????4 ??????3 ??????2 0
@@ -2666,12 +2697,19 @@
 ?????? ???2 ?????????2 0
 ???????????? ???2 ?????????4 ?????? ???2 0
 ?????? ???2 ??? 0
+????????? ???2 ???3 ?????????4 0
 ???????????? ???2 ???3 ?????????4 ??????1 0
 ??????????????? ???2 ?????? ??????4 ??????3 ?????? 0
 ???????????? ???2 ??????4 ?????????4 ???3 0
+??????????????? ???2 ??????4 ??????3 ?????????4 ??????4 0
+?????? ???2 ??????4 0
+????????? ???2 ??????4 ???2 0
 ???????????? ???2 ????????? ?????? ??????3 0
 ?????? ???2 ???3 0
 ????????? ???2 ??????2 ???4 0
+???????????? ???2 ?????? ??????2 ??????4 0
+???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ??????3 ??????4 0
 ???????????? ???2 ??? ???4 ????????? 0
 ???????????? ???2 ???2 ???2 ??????4 0
 ????????? ???2 ???4 ???2 0
@@ -2684,6 +2722,7 @@
 ?????? ???2 ??????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ?????? ?????????2 0
+???????????? ???2 ???4 ????????? ?????? 0
 ?????? ???2 ?????????4 0
 ????????? ???2 ????????? ?????????4 0
 ???????????? ???2 ?????????2 ??????2 ??? 0
@@ -2692,6 +2731,7 @@
 ?????????????????? ???2 ?????????3 ??????2 ??????4 ??????2 ??????2 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ???????????? ???2 ?????????3 ??????4 ??????2 0
+???????????? ???2 ?????????3 ??????4 ????????? 0
 ???????????? ???2 ?????????3 ???4 ???4 0
 ???????????? ???2 ?????????3 ???4 ?????????2 0
 ?????? ???3 ??? 0
@@ -2955,6 +2995,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????3 0
+????????? ??????4 ??????4 ?????????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ?????????2 0
 ?????? ??????4 ?????????2 0
@@ -3674,6 +3715,7 @@
 ????????? ??????3 ??????3 ?????????4 0
 ?????? ??????3 ???4 0
 ???????????? ??????3 ??????4 ????????? ?????? 0
+?????? ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -5947,6 +5989,7 @@
 ???????????? ??????2 ??????4 ???2 ?????????2 0
 ?????? ??????2 ??????4 0
 ????????????????????? ??????2 ??????3 ??????4 ??????2 ???2 ???2 ??????4 0
+?????? ??????2 ??????4 0
 ???????????? ??????2 ??????4 ??? ????????? 0
 ?????? ??????2 ?????????4 0
 ????????? ??????2 ????????? ??????2 0
@@ -6197,6 +6240,8 @@
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ???3 ??????4 0
 ?????? ??????4 ?????????2 0
+???????????? ??????4 ??????3 ??????4 ?????????2 0
+??????????????? ??????4 ??????3 ??????4 ?????????2 ?????? 0
 ???????????? ??????4 ??????3 ??????4 ???3 0
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????2 ??????2 ??????4 0
@@ -6299,6 +6344,7 @@
 ????????? ??????4 ?????? ??????4 0
 ?????? ??????4 ??????2 0
 ????????? ??????4 ??????2 ?????????4 0
+???????????? ??????4 ??????2 ?????????3 ??????3 0
 ????????? ??????4 ??????3 ????????? 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ?????????3 ??????2 0
@@ -6515,7 +6561,9 @@
 ???????????? ?????? ??????3 ?????????4 ?????????2 0
 ?????? ?????? ???3 0
 ???????????? ??????2 ??????2 ?????? ?????? 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ????????? ??????2 ?????? ??????2 0
 ???????????? ??????2 ??????2 ?????? ????????? 0
 ?????? ??????2 ?????? 0
@@ -7118,11 +7166,13 @@
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ??????4 ?????????4 ?????? 0
 ???????????? ??????3 ????????? ?????????2 ?????????4 0
 ????????? ??????3 ?????????2 ?????? 0
 ?????? ??????3 ????????? 0
 ????????? ??????3 ????????? ??????1 0
 ???????????? ??????3 ????????? ??????3 ???4 0
+????????? ??????3 ????????? ??????2 0
 ????????? ??????3 ??????2 ??????2 0
 ????????? ??????3 ??????4 ??? 0
 ?????? ??????3 ??????2 0
@@ -7456,6 +7506,7 @@
 ????????? ??????2 ????????? ??????3 0
 ????????? ??????2 ????????? ?????? 0
 ????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????2 0
 ???????????? ??????2 ?????? ???4 ??????4 0
 ???????????? ??????2 ?????? ??????3 ?????????4 0
 ?????? ??????2 ?????????4 0
@@ -7509,6 +7560,7 @@
 ????????? ??????3 ???2 ??????1 0
 ????????? ??????3 ???4 ????????? 0
 ????????? ??????3 ???4 ?????????3 0
+?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ???4 0
@@ -7974,6 +8026,7 @@
 ?????? ?????????2 ?????? 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????3 ???2 ??????2 ?????? 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ?????????3 0
@@ -7994,10 +8047,13 @@
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ??? ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ???????????? ?????????2 ?????????2 ??????4 ???3 0
+?????? ?????????2 ????????? 0
 ????????? ?????????2 ????????? ??????4 0
+????????? ?????????2 ????????? ??????2 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ????????? ?????????2 ??? ?????????3 0
@@ -8195,6 +8251,7 @@
 ???????????????????????? ?????????2 ????????? ???4 ?????????3 ???4 ?????????4 ??????2 ??????2 0
 ??????????????????????????? ?????????2 ????????? ???4 ?????????3 ??? ???4 ?????????4 ??????2 ??????2 0
 ?????? ?????????2 ?????????4 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ????????? 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????4 0
@@ -8380,6 +8437,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ?????? 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????2 0
@@ -8648,6 +8706,7 @@
 ????????? ?????? ?????????2 ????????? 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ?????????2 0
+????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ??? 0
 ???????????? ?????? ?????????2 ??????3 ??????4 0
@@ -10358,6 +10417,7 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????4 0
 ???????????? ?????? ????????? ????????? ?????????2 0
 ???????????? ?????? ????????? ?????? ??????3 0
 ?????? ?????? ????????? 0
@@ -10526,6 +10586,7 @@
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????3 ???4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ??????4 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ??????3 0
@@ -10706,6 +10767,7 @@
 ????????? ??????4 ??????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????3 0
+?????? ??????4 ?????????3 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
@@ -10719,6 +10781,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -11194,6 +11257,7 @@
 ????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ??????2 ????????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????2 0
@@ -12041,6 +12105,7 @@
 ???????????? ??????2 ???2 ??????4 ??????4 0
 ?????? ??????2 ??????3 0
 ?????? ??????2 ??????4 0
+?????? ??????2 ?????? 0
 ???????????? ??????2 ??????3 ??????4 ??????4 0
 ?????? ??????2 ?????????3 0
 ?????? ??????2 ??????4 0
@@ -12073,6 +12138,7 @@
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????2 ???2 ??????4 0
 ???????????? ?????? ??????2 ???2 ??????4 0
+?????? ?????? ??????2 0
 ?????? ?????? ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????2 0
@@ -12168,6 +12234,8 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????3 0
+??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????3 0
 ?????? ?????? ???2 0
@@ -12336,6 +12404,7 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ???3 ?????????3 0
 ????????? ????????? ????????? ????????? 0
@@ -12492,6 +12561,7 @@
 ???????????? ????????? ????????? ??????4 ??????4 0
 ???????????? ????????? ????????? ?????? ???4 0
 ?????? ????????? ????????? 0
+???????????? ????????? ??????2 ??????2 ?????????4 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ??????2 ??????4 ?????????4 0
@@ -13045,6 +13115,7 @@
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????3 0
 ?????? ?????????2 ?????? 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ?????? 0
@@ -13097,16 +13168,20 @@
 ?????? ?????????4 ??????3 0
 ???????????? ?????????4 ??????2 ???4 ?????? 0
 ?????? ?????????4 ?????? 0
+???????????? ?????????4 ??????4 ???2 ?????????4 0
 ?????? ?????????4 ?????? 0
 ???????????? ?????????4 ?????????4 ??? ?????????4 0
+???????????? ?????????4 ?????????4 ?????????4 ?????????4 0
 ???????????? ?????????4 ??????3 ?????????2 ?????? 0
 ???????????? ?????????4 ?????? ?????????2 ??????4 0
 ???????????? ?????????4 ?????? ??? ?????? 0
 ?????? ?????????4 ??????3 0
+???????????? ?????????4 ??????3 ??????4 ?????? 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ??????4 0
 ?????? ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
+???????????? ?????????4 ????????? ??????2 ??????3 0
 ?????? ?????????4 ???4 0
 ???????????? ?????????4 ??????4 ????????? ?????? 0
 ?????? ?????????4 ??? 0
@@ -13930,6 +14005,7 @@
 ????????? ??????4 ?????? ?????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????2 0
+????????????????????? ??????4 ?????? ??? ?????????4 ????????? ?????????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????1 0
 ???????????? ??????4 ?????????2 ??????3 ?????????4 0
@@ -14847,6 +14923,7 @@
 ???????????? ?????????2 ??????4 ????????? ??????2 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????3 0
+????????? ?????????2 ??????3 ??????3 0
 ?????? ?????????2 ?????????2 0
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ???2 0
@@ -15078,6 +15155,7 @@
 ???????????? ?????????4 ??????2 ??????3 ???3 0
 ???????????? ?????????4 ??????2 ????????? ??????4 0
 ?????????????????? ?????????4 ??????2 ????????? ?????????4 ??????2 ???2 0
+???????????? ?????????4 ??????2 ????????? ??????2 0
 ?????????????????? ?????????4 ??????2 ??????4 ??????4 ??????4 ???3 0
 ?????? ?????????4 ??????4 0
 ?????? ??????2 ??????3 0
@@ -15389,7 +15467,9 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ???4 0
 ????????? ??????4 ?????????4 ?????????3 0
+????????? ??????4 ?????????4 ?????????3 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ??????4 0
@@ -16031,8 +16111,10 @@
 ?????? ?????? ??????2 0
 ?????? ?????? ??? 0
 ?????? ??????3 ???4 0
+????????? ??????3 ???4 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ?????? ??????4 ???3 0
 ?????? ??????3 ??????3 0
 ?????? ??????3 ???4 0
 ?????? ??????4 ??????3 0
@@ -16712,6 +16794,7 @@
 ?????? ?????????3 ?????????2 0
 ???????????? ?????????3 ????????? ??????4 ??????2 0
 ???????????? ????????? ?????? ???4 ?????????4 0
+???????????? ????????? ??????2 ?????? ?????? 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ?????? ????????? ??????2 0
@@ -17655,6 +17738,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ????????? ????????? ????????? ?????????2 0
 ?????? ????????? ?????????4 0
 ???????????? ????????? ?????????2 ??????4 ?????????4 0
@@ -18586,6 +18670,7 @@
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ??????3 0
+????????? ??????2 ??????2 ??????2 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ????????? 0
 ???????????? ??????2 ??????3 ??????2 ??????2 0
@@ -18661,6 +18746,7 @@
 ?????? ??????4 ??????3 0
 ???????????? ??????4 ??????3 ?????????2 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ??????3 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ????????? ???3 ??????3 0
 ?????? ??????4 ?????????4 0
@@ -18830,6 +18916,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ?????????3 ????????? ?????? 0
 ?????? ?????????4 ??????2 0
+????????? ?????????4 ??????2 ?????????3 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ??????3 0
@@ -19311,7 +19398,11 @@
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
+???????????? ?????????2 ?????????2 ???4 ???4 0
+???????????? ?????????2 ?????? ?????????3 ??????4 0
+???????????? ?????????2 ?????? ??????4 ?????????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ???4 ??????3 0
 ???????????? ?????????2 ??????2 ????????? ??????2 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????2 0
@@ -19332,6 +19423,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ???4 ??????2 ??????2 0
 ???????????? ?????????4 ?????????3 ?????? ???2 0
+???????????? ?????????4 ?????????3 ?????? ???2 0
 ????????? ?????????4 ??????2 ??????1 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ?????? ??????4 ??????3 0
@@ -19380,6 +19472,7 @@
 ???????????? ?????????2 ??????2 ?????????2 ???4 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????4 0
+????????? ?????????2 ??????4 ?????? 0
 ????????? ?????????2 ????????? ?????? 0
 ???????????? ?????????2 ????????? ????????? ??????3 0
 ?????? ?????????2 ????????? 0
@@ -19993,6 +20086,7 @@
 ?????? ????????? ?????????3 0
 ???????????? ????????? ?????????3 ?????????3 ??????4 0
 ?????? ????????? ?????????4 0
+????????? ????????? ?????????4 ??????4 0
 ?????? ????????? ?????????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ?????????4 0
@@ -20027,6 +20121,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????3 0
+?????? ????????? ?????????4 0
 ?????? ????????? ??????4 0
 ????????? ????????? ??????4 ??????4 0
 ?????? ????????? ??????2 0
@@ -20428,6 +20523,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ???3 0
 ?????? ????????? ???4 0
+?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ??????3 ??????2 ??????4 0
@@ -20456,6 +20552,7 @@
 ?????? ????????? ??????2 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????3 ??????4 ??????4 0
 ?????? ????????? ????????? 0
 ???????????? ????????? ????????? ????????? ???4 0
 ????????? ????????? ????????? ??????4 0
@@ -20482,6 +20579,7 @@
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????2 ??????4 ?????? 0
 ???????????? ????????? ??????4 ??????4 ??????2 0
 ????????? ????????? ??????4 ????????? 0
 ?????? ????????? ????????? 0
@@ -20904,6 +21002,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ????????? ??????4 ??????2 0
+??? ?????????3 0
 ???????????? ?????????3 ???2 ??????2 ??? 0
 ?????? ?????????3 ???4 0
 ?????? ?????????3 ?????? 0
@@ -20961,6 +21060,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ?????????4 0
 ?????? ?????????3 ?????????3 0
+?????? ?????????3 ?????????3 0
 ?????? ?????????3 ????????? 0
 ?????? ?????????3 ?????????2 0
 ?????? ?????????3 ?????????4 0
@@ -21211,6 +21311,7 @@
 ?????? ?????????3 ??? 0
 ???????????? ?????????3 ??? ???4 ???2 0
 ?????? ?????????3 ??????4 0
+?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????4 ????????? ??????2 0
 ?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????2 ??????4 ?????????2 0
@@ -21631,6 +21732,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ??????3 0
 ?????? ?????????3 ?????? 0
+????????? ?????????3 ??????2 ??????4 0
 ???????????? ?????????3 ??????3 ??? ?????? 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ??????4 0
@@ -21892,6 +21994,7 @@
 ???????????? ?????????2 ??????2 ?????????4 ?????????4 0
 ????????? ?????????2 ??????4 ??????2 0
 ???????????? ?????????2 ??????4 ????????? ??????4 0
+???????????? ?????????2 ??????4 ??????3 ?????????3 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ???????????? ?????????2 ?????????4 ??????3 ???2 0
@@ -22084,6 +22187,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ???2 0
 ???????????? ?????? ???4 ??????4 ?????????2 0
+???????????? ?????? ??????4 ??????4 ???4 0
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????4 ?????? ?????????4 0
 ?????? ?????? ??????4 0
@@ -22114,13 +22218,16 @@
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????3 0
 ???????????? ??????2 ??????4 ??????4 ??????2 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????2 ??????2 ??????3 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????????3 0
+????????? ??????2 ??????4 ??????1 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ?????? 0
@@ -22177,6 +22284,7 @@
 ???????????? ??????2 ????????? ???4 ??????2 0
 ?????? ??????2 ????????? 0
 ????????? ??????2 ????????? ??????3 0
+????????? ??????2 ????????? ??????3 0
 ???????????? ??????2 ???3 ??????4 ??????4 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
@@ -22191,6 +22299,7 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????2 ??? ??????2 0
 ?????? ??????2 ???4 0
+?????? ??????2 ??????4 0
 ????????? ??????3 ???2 ????????? 0
 ?????? ??????3 ???4 0
 ?????? ??????3 ?????? 0
@@ -22430,6 +22539,7 @@
 ?????? ?????????3 ?????????4 0
 ???????????????????????? ?????????3 ??????4 ??????2 ??????2 ???2 ??????3 ??? ????????? 0
 ???????????? ?????????3 ?????????2 ????????? ????????? 0
+???????????? ?????????3 ??????4 ?????????2 ??????4 0
 ????????? ?????????3 ??????4 ?????????2 0
 ????????? ?????????3 ??????4 ??????4 0
 ?????? ?????????3 ??????2 0
@@ -25542,8 +25652,11 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ??????2 0
 ????????? ???2 ???4 ??????2 0
+????????? ???2 ???4 ?????????4 0
 ????????? ???2 ???4 ?????????4 0
 ???????????? ???2 ???4 ?????????4 ??????1 0
+????????? ???2 ???4 ?????????2 0
+???????????? ???2 ???4 ?????????2 ????????? 0
 ????????? ???2 ???4 ??????2 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
@@ -25687,6 +25800,7 @@
 ?????? ???3 ????????? 0
 ?????? ???3 ?????????4 0
 ?????? ???3 ?????????2 0
+?????? ???3 ??????3 0
 ?????? ???3 ??????4 0
 ?????? ???3 ?????????3 0
 ?????? ???3 ?????????4 0
@@ -25751,6 +25865,7 @@
 ?????? ???4 ?????????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ?????????4 0
+????????? ???4 ????????? ????????? 0
 ?????? ???4 ??????2 0
 ???????????? ???4 ?????????2 ??????4 ??????2 0
 ?????? ???4 ??????2 0
@@ -25761,6 +25876,7 @@
 ?????? ???4 ??????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ???2 0
+????????? ???4 ??????4 ??????2 0
 ???????????? ???4 ??????4 ??????4 ??????4 0
 ?????? ???4 ?????????2 0
 ?????? ???4 ?????????2 0
@@ -25928,6 +26044,7 @@
 ???????????? ??????4 ??????2 ?????? ??????2 0
 ????????? ??????4 ?????????2 ??????2 0
 ???????????? ?????? ??????2 ?????????4 ?????????4 0
+????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
 ?????? ?????? ????????? 0
 ???????????? ?????? ????????? ??????3 ??????3 0
 ?????? ?????? ??????2 0
@@ -25938,6 +26055,7 @@
 ???????????? ?????? ??????4 ??????4 ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????3 0
+???????????? ?????? ?????????4 ??????4 ??????3 0
 ?????? ?????? ??????3 0
 ????????? ?????? ??????2 ??????3 0
 ?????? ?????? ?????? 0
@@ -25947,6 +26065,7 @@
 ???????????? ?????? ?????????4 ??????2 ??????4 0
 ???????????? ?????? ?????????3 ??????3 ???3 0
 ???????????? ?????? ??????4 ????????? ??????3 0
+???????????? ?????? ?????? ??????4 ??????4 0
 ?????? ?????? ???4 0
 ??????????????? ?????? ??????2 ??????3 ??????2 ??????1 0
 ?????? ?????? ??????3 0
@@ -26061,6 +26180,7 @@
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
 ????????? ??????4 ??????4 ??????3 0
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ????????? ??????4 ??????4 ?????? 0
@@ -26266,6 +26386,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ??????3 ?????????2 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????4 0
@@ -26488,6 +26609,7 @@
 ?????? ??????3 ??????4 0
 ????????? ??????3 ??????4 ?????????2 0
 ?????? ??????3 ??????4 0
+?????? ??????3 ??????3 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -26564,6 +26686,7 @@
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????? 0
 ???????????? ??????4 ??????2 ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ????????? ??????4 ???4 ??????1 0
@@ -27051,6 +27174,7 @@
 ?????? ???2 ?????????3 0
 ?????? ???2 ???3 0
 ?????? ???2 ??????3 0
+?????? ???3 ????????? 0
 ?????? ???3 ??????4 0
 ?????? ???3 ??????3 0
 ?????? ???3 ??????2 0
@@ -27262,11 +27386,14 @@
 ?????? ?????? ??????4 0
 ??? ??????2 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
+?????? ??????2 ??????3 0
 ????????? ??????2 ????????? ????????? 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
+????????? ??????2 ?????? ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ????????? 0
@@ -28337,6 +28464,7 @@
 ???????????????????????? ??? ??? ????????? ???2 ?????? ??? ?????? ???2 0
 ???????????? ??? ??? ????????? ??????4 0
 ?????? ??? ???2 0
+????????? ??? ???4 ??????4 0
 ?????? ??? ?????? 0
 ?????? ??? ??????3 0
 ?????? ??? ??????3 0
@@ -29455,6 +29583,7 @@
 ?????? ??????4 ???3 0
 ?????? ??????4 ???4 0
 ???????????? ?????? ???4 ?????????4 ?????????2 0
+?????? ?????? ???4 0
 ?????? ?????? ???4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
@@ -30115,8 +30244,10 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????2 0
+????????? ??????3 ??????2 ?????? 0
 ???????????? ??????3 ??????4 ?????? ??????2 0
 ????????? ??????3 ?????? ??????4 0
+?????? ??????3 ????????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ???2 0
 ???????????? ??????4 ???3 ??????4 ??????4 0
@@ -30229,6 +30360,7 @@
 ????????? ?????????4 ???4 ?????? 0
 ???????????? ?????????4 ???4 ?????????4 ??????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????2 0
@@ -30414,6 +30546,7 @@
 ?????? ????????? ?????????3 0
 ????????? ????????? ????????? ???3 0
 ???????????? ????????? ?????????3 ??????2 ?????????4 0
+????????? ????????? ??????2 ????????? 0
 ?????? ????????? ??????4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ?????????3 0
@@ -30989,6 +31122,7 @@
 ?????? ??? ??????2 0
 ?????? ??? ??????3 0
 ????????? ??? ??????3 ???2 0
+?????? ??? ??????3 0
 ?????? ??? ?????? 0
 ?????? ??? ??????4 0
 ?????? ??? ??????4 0
@@ -31008,10 +31142,12 @@
 ?????? ??? ???2 0
 ?????? ??? ???2 0
 ???????????? ??? ???4 ????????? ?????????4 0
+?????? ??? ??????3 0
 ?????? ??? ??????4 0
 ???????????? ??? ?????? ??????4 ?????????4 0
 ?????? ??? ??????3 0
 ?????? ??? ???4 0
+???????????? ??? ???4 ??????4 ???3 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
@@ -31398,6 +31534,7 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ???????????? ??????3 ??????2 ???2 ??????4 0
+????????? ??????3 ??????4 ??????4 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????3 0
@@ -31453,6 +31590,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????? 0
+????????? ?????? ?????????2 ??????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????4 ??????2 0
@@ -31466,6 +31604,8 @@
 ?????? ?????? ??????3 0
 ???????????? ?????? ??????3 ??????4 ?????????2 0
 ?????? ?????? ??? 0
+????????? ?????? ??????3 ??????3 0
+????????? ?????? ??????3 ??????4 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ???3 0
 ????????? ??????4 ???3 ?????????4 0
@@ -31739,6 +31879,7 @@
 ???????????? ?????????4 ?????????3 ??????4 ??????1 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ?????????2 0
+???????????? ?????????4 ??????4 ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
 ????????? ?????????4 ????????? ??????1 0
 ???????????? ?????????4 ?????????4 ??????4 ??????1 0
@@ -31863,6 +32004,7 @@
 ?????? ???2 ?????????4 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????4 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
 ?????? ???2 ?????????4 0
@@ -31934,6 +32076,7 @@
 ???????????? ?????? ?????? ???2 ?????????4 0
 ?????? ?????? ?????? 0
 ?????? ??????4 ??????4 0
+????????? ??????4 ??????4 ?????????4 0
 ???????????? ??????4 ??????3 ??? ????????? 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
@@ -31943,6 +32086,7 @@
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
+????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -32135,6 +32279,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ??????4 0
 ????????? ?????? ??????4 ??????3 0
+???????????? ??????2 ???2 ??????2 ??????4 0
 ?????? ??????2 ???2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -32144,6 +32289,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ?????????3 0
+???????????? ??????2 ????????? ??????4 ?????????2 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
 ???????????? ??????2 ???2 ????????? ????????? 0
@@ -32187,6 +32333,10 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????3 ??????2 ???2 0
 ?????? ??????2 ????????? 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ???4 0
+????????? ??????2 ????????? ??????4 0
 ????????????????????? ??????2 ????????? ?????? ??????3 ??????2 ??????2 ?????????3 0
 ???????????? ??????2 ?????? ??????4 ?????????2 0
 ?????? ??????2 ???4 0
@@ -32986,61 +33136,9 @@
 ?????? ??? ??? 0
 ?????? ??? ??? 0
 ?????? ??? ??? 0
-????????? ??????4 ?????????4 ?????????4 0
-?????? ?????????2 ??????4 0
-?????? ??????3 ?????? 0
-???????????? ??????4 ??????2 ?????????3 ??????3 0
-????????? ??????3 ????????? ??????2 0
-???????????? ??????3 ??????4 ?????????4 ?????? 0
-????????? ??????3 ??????3 ?????? 0
-????????? ?????????3 ??????2 ??????4 0
-?????? ??????3 ????????? 0
-????????? ??????3 ??????2 ?????? 0
-????????? ???4 ????????? ????????? 0
-????????? ???4 ??????4 ??????2 0
-????????? ?????? ??????3 ??????4 0
-????????? ?????? ??????3 ??????3 0
-????????? ?????? ?????????2 ??????2 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ???4 0
-?????? ??????4 ??????2 0
-????????? ??????2 ??????4 ??????1 0
-????????? ??????2 ????????? ??????3 0
-?????? ??????2 ??????3 0
-???????????? ?????? ?????????4 ??????4 ??????3 0
-?????? ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ??????2 ?????? ??????2 0
-???????????? ?????? ?????? ??????4 ??????4 0
-????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
-?????? ??????4 ??????4 0
-???????????? ??????2 ??????2 ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ???2 ???4 ?????????4 0
-???????????? ???2 ???4 ?????????2 ????????? 0
-????????? ???2 ???4 ?????????2 0
-?????? ?????????2 ????????? 0
-???????????? ?????????2 ??????2 ??? ??????4 0
-????????? ?????????2 ????????? ??????2 0
-???????????? ?????? ??????4 ??????4 ???4 0
-???????????? ??????2 ???2 ??????2 ??????4 0
-???????????? ??????2 ????????? ??????4 ?????????2 0
-????????? ??????4 ?????????4 ???4 0
-????????? ??????4 ?????????4 ?????????3 0
-????????? ??????3 ???4 ??????2 0
-???????????? ??????3 ?????? ??????4 ???3 0
-???????????? ??????2 ??????2 ??????2 ??????4 0
-???????????? ??????2 ??????4 ?????????2 ??????2 0
-?????? ??????4 ?????????4 0
-????????? ??????4 ??????4 ?????????2 0
-??? ?????????3 0
-?????? ?????????3 ?????????3 0
-????????? ??????2 ??????2 ??????2 0
-?????? ?????? ??????3 0
-??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
-?????? ???3 ??????3 0
-????????? ????????? ?????????4 ??????4 0
-????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
-????????? ??????3 ??????4 ??????4 0
+????????? ?????? ????????? ??????3 0
+??????????????? ??? ??? ??????3 ??????4 ??????4 0
+?????? ??????3 ??????2 0
+?????? ?????? ????????? 0
+?????? ?????? ????????? 0
+?????? ?????????3 ????????? 0
Binary files gcin-1.2.9.orig/.tedfilepos and gcin-1.2.9/.tedfilepos differ
diff -urN gcin-1.2.9.orig/tenv gcin-1.2.9/tenv
--- gcin-1.2.9.orig/tenv	2006-10-19 14:18:38.000000000 +0800
+++ gcin-1.2.9/tenv	2006-11-15 13:10:24.000000000 +0800
@@ -11,6 +11,6 @@
 gcinpid=$!
 sleep 1
 export LD_PRELOAD=./im-client/libgcin-im-client.so
-#gedit
-leafpad
+gedit
+#leafpad
 pkill gcin.test


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin	15 Nov 2006 07:14:44 -0000	1.1
+++ NewCJ3.cin	17 Nov 2006 00:35:49 -0000	1.2
@@ -52,7 +52,6 @@
 ... ???
 ... ???
 ... ???
-.; ???
 ' ???
 '' "
 '' "
@@ -171,7 +170,6 @@
 ;a ???
 ;b ???
 ;c ???
-;cu ???
 ;d ???
 ;e ???
 ;f ???
@@ -194,7 +192,9 @@
 ;s ???
 ;t ???
 ;u ???
+;ui ??????
 ;uu ??????
+;uio ?????????
 ;u; ???
 ;v ???
 ;w ???
@@ -216,7 +216,7 @@
 b ???
 b ???
 b ???
-b; ???
+b; ???
 b;; ??????
 c ???
 c ???
@@ -249,7 +249,7 @@
 f ???
 f ???
 f ???
-f; ???
+f; ???
 g ???
 g ???
 g ???
@@ -297,7 +297,7 @@
 l ???
 l ???
 l ???
-l; ???
+l; ???
 m ???
 m ???
 m ???
@@ -347,7 +347,7 @@
 q ???
 q ???
 q ???
-q; ???
+q; ???
 r ???
 r ??
 r ???
@@ -382,7 +382,6 @@
 t ???
 t ???
 t; ???
-t;; ???
 u ???
 u ???
 u ???
@@ -410,7 +409,6 @@
 w ???
 w ???
 w; ???
-w;; ???
 x ???
 x ???
 x ???
@@ -459,7 +457,6 @@
 w. ???
 x. ???
 x. ??
-x.; ??
 y. ???
 z. ???
 a, ???
@@ -493,11 +490,9 @@
 ab ???
 ac ???
 ad ???
-ad; ???
 ae ???
 af ???
 af ???
-af; ???
 ag ???
 ah ???
 ai ???
@@ -526,7 +521,7 @@
 bd ???
 be ???
 bf ???
-bf; ???
+bf; ?????????
 bg ???
 bg ???
 bh ???
@@ -537,8 +532,8 @@
 bm ???
 bm ???
 bm ???
+bn ???
 bn ???
-bn; ???
 bo ???
 bp ???
 bq ???
@@ -546,7 +541,6 @@
 bs ???
 bt ???
 bt ???
-bt; ???
 bu ???
 bv ???
 bw ???
@@ -571,21 +565,18 @@
 ck ???
 cl ???
 cl ???
-cl; ???
 cm ???
 cn ???
 cn; ???
 co ???
 cp ???
-cq ???
-cq; ???
+cq ???
 cr ???
 cs ???
 ct ???
 cu ???
 cu; ???
 cv ???
-cv; ???
 cw ???
 cx ???
 cx; ??????
@@ -605,14 +596,12 @@
 dh ???
 di ???
 di ???
-di; ???
 dj ???
 dk ???
 dk ???
 dl ???
 dm ???
 dm ???
-dm; ???
 dn ???
 do ???
 dp ???
@@ -630,11 +619,11 @@
 ea ???
 ea ???
 ea ???
-ea; ???
 eb ???
 ec ???
 ec ???
 ed ???
+ee ???
 ee ???
 ef ???
 eg ???
@@ -692,7 +681,6 @@
 ga ???
 gb ???
 gb ???
-gb; ???
 gc ???
 gd ???
 ge ???
@@ -715,7 +703,6 @@
 gt ???
 gu ???
 gu ???
-gu; ???
 gv ???
 gw ???
 gx ???
@@ -724,38 +711,28 @@
 ha ???
 hb ???
 hc ???
-hc; ???
 hd ???
 hd; ???
 he ???
-he; ???
 hf ???
 hg ???
-hg; ???
 hh ???
-hh; ???
 hi ???
 hi ???
 hi; ???
 hj ???
 hk ???
-hk; ???
 hl ???
-hm ???
 hm ???
-hm; ???
 hn ???
-hn; ???
 ho ???
 ho ???
-ho; ???
 hp ???
-hp; ???
 hq ???
 hr ???
 hs ???
 hs ???
-hs; ???
+hs; ???
 ht ???
 ht; ???
 ht;; ??????
@@ -766,26 +743,18 @@
 hw; ??????
 hx ???
 hx; ???
-hy ???
-hy; ???
+hy ???
 hz ???
 ia ???
 ib ???
-ib; ???
 ic ???
 id ???
 id ???
-id; ???
-id; ???
 ie ???
-if ???
-if; ??????
+if ??????
 ig ???
 ih ???
-ih; ???
 ii ???
-ii ???
-ii; ???
 ij ???
 ik ???
 il ???
@@ -794,16 +763,15 @@
 io ???
 io; ???
 io; ???
-ip ???
+ip ???
 ip ???
 ip ???
-ip; ???
+ip ???
 iq ???
 ir ???
 is ???
 it ???
 it ???
-it; ???
 iu ???
 iv ???
 iv; ???
@@ -813,8 +781,8 @@
 iz ???
 izo ??????
 ja ???
+jb ???
 jb ???
-jb; ???
 jc ???
 jd ???
 jd ???
@@ -824,8 +792,6 @@
 jh ???
 ji ???
 jj ???
-jj; ???
-jj; ???
 jk ???
 jk; ???
 jl ???
@@ -837,7 +803,6 @@
 jp ???
 jq ???
 jr ???
-jr; ???
 js ???
 jt ???
 ju ???
@@ -849,13 +814,11 @@
 ka ???
 kb ???
 kb ???
-kb; ???
 kc ???
 kd ???
 ke ???
 kf ???
 kf ???
-kf; ???
 kg ???
 kh ???
 ki ???
@@ -866,18 +829,16 @@
 km ???
 kn ???
 kn ???
-kn; ???
 ko ???
 ko; ???
+kp ???
 kp ???
-kp; ???
 kq ???
 kr ???
 ks ???
 kt ???
 ku ???
 ku ???
-ku; ???
 ku; ???
 kv ???
 kw ???
@@ -885,9 +846,7 @@
 ky ???
 kz ???
 la ???
-la; ???
 lb ???
-lb; ???
 lc ???
 ld ???
 le ???
@@ -908,85 +867,70 @@
 ls ???
 lt ???
 lu ???
-lu; ???
 lv ???
 lw ???
+lw; ???
 lx ???
 ly ???
 lz ???
 ma ???
 mb ???
-mb; ???
 mc ???
-mc; ???
 md ???
 me ???
 me ???
 me ???
 me; ???
 mf ???
-mf; ???
 mg ???
+mh ???
 mh ???
-mh; ???
 mi ???
 mi; ???
 mj ???
 mk ???
-mk; ???
+mk; ???
+ml ???
 ml ???
-ml; ???
 mm ???
-mm ???
-mm; ???
 mn ???
 mo ???
-mo; ???
 mp ???
 mq ???
 mr ???
 ms ???
-ms; ???
 mt ???
-mt; ???
+mu ???
 mu ???
 mu ???
-mu; ???
-mv ???
+mv ???
 mv ???
-mv; ???
 mw ???
+mw; ???
 mx ???
 my ???
 mz ???
 na ???
 nb ???
-nb; ???
 nc ???
 nd ???
 ne ???
-ne; ???
 nf ???
 ng ???
 nh ???
 ni ???
 ni ???
-ni; ???
-ni; ???
-ni;; ???
 nj ???
 nk ???
 nl ???
 nl ???
-nl; ???
 nm ???
 nn ???
 no ???
 no ???
 no ???
-no No.
-no; ???
 np ???
+nq ???
 nq ???
 nq ???
 nq; ???
@@ -998,7 +942,6 @@
 nw ???
 nx ???
 nx ???
-nx; ???
 ny ???
 nz ???
 oa ???
@@ -1010,8 +953,8 @@
 ob ???
 ob ???
 ob; ???
+oc ???
 oc ???
-oc; ???
 od ???
 od ???
 od ???
@@ -1039,7 +982,6 @@
 og ???
 og ???
 og ???
-og; ???
 oh ???
 oh ???
 oh ???
@@ -1056,7 +998,6 @@
 oi ???
 oi ???
 oi ???
-oi; ???
 oj ???
 oj ???
 oj ???
@@ -1075,9 +1016,7 @@
 om ???
 om ???
 om ???
-om; ???
 on ???
-on; ???
 oo ???
 oo ???
 oo ???
@@ -1118,7 +1057,6 @@
 oq ???
 oq ???
 or ???
-or; ???
 or ???
 or ???
 or ???
@@ -1162,10 +1100,10 @@
 ou ???
 ou ???
 ou ???
-ou; ???
 ov ???
-ov; ???
+ow ???
 ow ???
+ow; ???
 ow ???
 ow ???
 ow ???
@@ -1177,7 +1115,6 @@
 ow ???
 ow ???
 ow ???
-ow; ???
 ox ???
 oy ???
 oy ???
@@ -1191,14 +1128,13 @@
 oy ???
 oy ???
 oy ???
-oy; ???
 oz ???
 pa ???
 pa ???
 pa; ???
 pb ???
+pc ???
 pc ???
-pc; ???
 pd ???
 pe ???
 pe; ??????
@@ -1207,14 +1143,13 @@
 ph ???
 pi ???
 pi ???
-pi; ???
 pj ???
+pk ???
 pk ???
-pk; ???
 pl ???
 pm ???
+pn ???
 pn ???
-pn; ???
 po ???
 pp ???
 pq ???
@@ -1227,74 +1162,66 @@
 px ???
 py ???
 pz ???
+qa ???
 qa ???
-qa; ???
+qb ???
 qb ???
-qb; ???
+qc ???
 qc ???
-qc; ???
+qd ???
 qd ???
-qd; ???
 qe ???
 qf ???
 qg ???
 qh ???
 qi ???
 qj ???
-qj; ???
 qk ???
 ql ???
 qm ???
-qm; ???
 qn ???
 qo ???
 qp ???
-qq ???
+qq ???
 qr ???
 qs ???
 qt ???
 qu ???
-qu; ???
 qv ???
 qw ???
 qx ???
+qy ???
 qy ???
-qy; ???
 qz ???
 ra ???
 rb ???
-rb; ???
 rc ???
 rc ???
-rc; ???
 rd ???
 re ???
 rf ???
-rf; ???
 rg ???
 rh ???
 ri ???
 rj ???
 rk ???
+rk; ???
 rl ???
 rm ???
 rn ???
 ro ???
 rp ???
-rp; ???
 rq ???
 rr ???
 rs ???
-rt ???
+rt ???
 ru ???
-ru; ???
 ru; ???
 rv ???
 rw ???
 rx ???
 ry ???
 rz ???
-rz; ???
 sa ???
 sb ???
 sc ???
@@ -1314,12 +1241,10 @@
 sp ???
 sq ???
 sr ???
-sr; ???
 ss ???
 st ???
-su ???
 su ???
-su; ???
+su ???
 sv ???
 sw ???
 sw; ???
@@ -1327,7 +1252,6 @@
 sy ???
 sz ???
 ta ???
-ta; ???
 tb ???
 tc ???
 tc ???
@@ -1335,25 +1259,22 @@
 te ???
 tf ???
 tg ???
-tg; ???
 th ???
+ti ???
 ti ???
-ti; ???
+tj ???
 tj ???
-tj; ???
 tj; ???
 tk ???
 tk; ???
 tl ???
 tm ???
-tm; ???
 tn ???
-tn; ???
 tn; ???
 tn; ???
 to ???
+tp ???
 tp ???
-tp; ???
 tq ???
 tr ???
 ts ???
@@ -1361,16 +1282,14 @@
 tt ???
 tt ???
 tt ???
-tt; ???
-tu ???
-tu; ???
+tt; ???
+tu ???
 tv ???
 tv; ???
 tw ???
 tw ???
 tw; ???
 tw; ???
-tw;; ???
 tx ???
 ty ???
 tz ???
@@ -1404,8 +1323,8 @@
 uy ???
 uz ???
 va ???
-vb ???
-vb; ???
+va; ???
+vb ???
 vc ???
 vd ???
 ve ???
@@ -1416,32 +1335,29 @@
 vi ???
 vj ???
 vk ???
-vk; ???
-vl ???
-vl ???
+vl ???
 vl ???
 vl; ???
+vm ???
 vm ???
-vm; ???
+vm; ???
 vn ???
 vo ???
 vo; ???
 vp ???
 vq ???
 vr ???
-vr; ???
 vs ???
 vt ???
+vu ???
 vu ???
-vu; ???
+vv ???
 vv ???
-vv; ???
 vw ???
 vx ???
-vy ???
-vy; ???
+vy ???
+vz ???
 vz ???
-vz; ???
 wa ???
 wb ???
 wc ???
@@ -1451,13 +1367,11 @@
 we ???
 wf ???
 wg ???
-wg; ???
 wh ???
 wi ???
 wj ???
 wj ???
 wk ???
-wk ???
 wl ???
 wm ???
 wn ???
@@ -1468,14 +1382,13 @@
 ws ???
 wt ???
 wu ???
+wv ???
 wv ???
-wv; ???
-ww ???
+ww ???
 wx ???
 wy ???
 wz ???
 wz ???
-wz; ???
 xa ???
 xb ???
 xc ???
@@ -1491,7 +1404,6 @@
 xm ???
 xn ???
 xo ???
-xo; ??
 xp ???
 xq ???
 xr ???
@@ -1518,30 +1430,28 @@
 yj ???
 yj; ???
 yk ???
-yk; ???
 yl ???
 ym ???
 yn ???
 yo ???
 yo; ???
+yp ???
 yp ???
-yp; ???
 yp; ???
 yq ???
 yr ???
+ys ???
 ys ???
-ys; ???
 yt ???
+yu ???
 yu ???
-yu; ???
 yv ???
 yw ???
 yx ???
+yy ???
 yy ???
-yy; ???
 yy, ??????
 yz ???
-yz; ???
 za ???
 zb ???
 zc ???
@@ -1555,7 +1465,7 @@
 zk ???
 zl ???
 zm ???
-zm; ???
+zm ???
 zn ???
 zo ???
 zp ???
@@ -1564,12 +1474,12 @@
 zs ???
 zt ???
 zu ???
-zu; ???
+zu ???
 zv ???
 zw ???
 zx ???
 zy ???
-zy; ???
+zy ???
 zz ???
 aaa ???
 aaa ???
@@ -6623,6 +6533,7 @@
 nbp ???
 nbp; ???
 nbu ???
+ncj ????????????
 ncz ???
 nde ???
 ndk ???
@@ -7052,10 +6963,9 @@
 ojg ???
 oji ???
 ojj ???
+ojk ???
 ojk ???
 ojk ???
-ojk ???
-ojk; ???
 ojm ???
 ojm ???
 ojm; ???
@@ -8546,20 +8456,8 @@
 rgc ???
 rgc ???
 rgc ???
-rgc (?????????)a
-rgc (?????????|||)??????
-rgc =???=b
-rgc ???????????????|||??????
 rgc; ???
 rgg ???
-rgg (????????????)
-rgg ???(???_???;)???
-rgg ??????~??????~
-rgg (??????O???)
-rgg .......\(><)/
-rgg ???*@??@*???
-rgg O_o
-rgg ???(???_???;)?????????~??????~
 rgi ???
 rgj ???
 rgk ???
@@ -9681,9 +9579,8 @@
 tmb ???
 tmb ???
 tmb; ???
-tmc ???
 tmc ???
-tmc; ???
+tmc ???
 tmd ???
 tmd ???
 tmd; ???
@@ -19631,6 +19528,7 @@
 somr ???
 sonl ???
 sorc ???
+sorr ?????????
 sphf ???
 sphh ???
 sqnl ???
@@ -28614,7 +28512,6 @@
 bopo ???
 boqa ???
 boqb ???
-boqh ????????????
 borb ????
 borg ????
 bort ????


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec	15 Nov 2006 07:14:44 -0000	1.13
+++ gcin.spec	17 Nov 2006 00:35:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         gcin129update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -31,6 +32,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .up
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -105,6 +107,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+- add gcin129update.patch
+- update NewCJ3.cin
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Fri Nov 17 03:02:03 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:02:03 -0700
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec,1.10,1.11
Message-ID: <200611170302.kAH323Jp028865@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28797

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
Add libxfcegui4-devel to requires on devel subpackage



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce-mcs-manager.spec	11 Nov 2006 07:00:45 -0000	1.10
+++ xfce-mcs-manager.spec	17 Nov 2006 03:01:29 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.3.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2
@@ -22,6 +22,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libxfce4mcs-devel
+Requires: libxfcegui4-devel 
 Requires: gtk2-devel
 
 %description devel
@@ -61,6 +62,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-2
+- Add libxfcegui4-devel to requires on devel subpackage
+
 * Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
 - Update to 4.3.99.2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 03:28:19 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 16 Nov 2006 20:28:19 -0700
Subject: rpms/perl-File-Remove/devel .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611170328.kAH3SJqH029376@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:43:18 -0000	1.4
+++ .cvsignore	17 Nov 2006 03:27:48 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Remove.spec	3 Nov 2006 05:43:18 -0000	1.6
+++ perl-File-Remove.spec	17 Nov 2006 03:27:48 -0000	1.7
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:43:18 -0000	1.4
+++ sources	17 Nov 2006 03:27:48 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 17 03:28:56 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 16 Nov 2006 20:28:56 -0700
Subject: rpms/perl-File-Remove/FC-6 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611170328.kAH3SuaE029402@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29382

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:43:58 -0000	1.4
+++ .cvsignore	17 Nov 2006 03:28:26 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/perl-File-Remove.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Remove.spec	3 Nov 2006 05:43:58 -0000	1.6
+++ perl-File-Remove.spec	17 Nov 2006 03:28:26 -0000	1.7
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:43:58 -0000	1.4
+++ sources	17 Nov 2006 03:28:26 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 17 03:29:33 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 16 Nov 2006 20:29:33 -0700
Subject: rpms/perl-File-Remove/FC-5 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200611170329.kAH3TXwu029433@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29408

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:44:38 -0000	1.4
+++ .cvsignore	17 Nov 2006 03:29:03 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/perl-File-Remove.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-File-Remove.spec	3 Nov 2006 05:44:38 -0000	1.5
+++ perl-File-Remove.spec	17 Nov 2006 03:29:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:44:38 -0000	1.4
+++ sources	17 Nov 2006 03:29:03 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 17 03:30:12 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 16 Nov 2006 20:30:12 -0700
Subject: rpms/perl-File-Remove/FC-4 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611170330.kAH3UCxr029474@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29443

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:45:19 -0000	1.4
+++ .cvsignore	17 Nov 2006 03:29:41 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/perl-File-Remove.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-Remove.spec	3 Nov 2006 05:45:19 -0000	1.4
+++ perl-File-Remove.spec	17 Nov 2006 03:29:41 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:45:19 -0000	1.4
+++ sources	17 Nov 2006 03:29:41 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 17 03:31:31 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:31:31 -0700
Subject: rpms/exo/devel exo.spec,1.20,1.21
Message-ID: <200611170331.kAH3VVv6029633@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29545

Modified Files:
	exo.spec 
Log Message:
Rebuild with fixed xfce-mcs-manager-devel
Add exo-preferred-applicatons-settings.so



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- exo.spec	11 Nov 2006 07:27:19 -0000	1.20
+++ exo.spec	17 Nov 2006 03:31:00 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.12
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/exo-0.3.1.12rc2.tar.bz2
@@ -94,6 +94,7 @@
 %{_libexecdir}/exo-helper-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
+%{_libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so
 %{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
@@ -114,6 +115,10 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Nov 16 2006 Kevin Fenzi  - 0.3.1.12-0.2.rc2
+- Rebuild with fixed xfce-mcs-manager-devel
+- Add exo-preferred-applicatons-settings.so
+
 * Thu Nov  9 2006 Kevin Fenzi  - 0.3.1.12-0.1.rc2
 - Update to 0.3.1.12rc2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 03:45:28 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:45:28 -0700
Subject: rpms/Terminal/devel Terminal.spec,1.14,1.15
Message-ID: <200611170345.kAH3jSDn029803@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29785

Modified Files:
	Terminal.spec 
Log Message:
Add startup-notification-devel and dbus-glib-devel to BuildRequires



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Terminal.spec	11 Nov 2006 07:42:56 -0000	1.14
+++ Terminal.spec	17 Nov 2006 03:44:58 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.2.5.8
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Terminal-0.2.5.8rc2.tar.bz2
@@ -11,6 +11,8 @@
 BuildRequires: exo-devel >= 0.3.1
 BuildRequires: libSM-devel
 BuildRequires: gettext
+BuildRequires: startup-notification-devel
+BuildRequires: dbus-glib-devel
 
 %description
 Terminal is a lightweight and easy to use terminal emulator application
@@ -60,6 +62,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Nov 16 2006 Kevin Fenzi  - 0.2.5.8-0.2.rc2
+- Add startup-notification-devel and dbus-glib-devel to BuildRequires
+
 * Fri Nov 10 2006 Kevin Fenzi  - 0.2.5.8-0.1.rc2
 - Update to 0.2.5.8rc2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 03:47:17 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:47:17 -0700
Subject: rpms/xfce-mcs-manager/FC-6 xfce-mcs-manager.spec,1.10,1.11
Message-ID: <200611170347.kAH3lHrP029869@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29853

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
Add libxfcegui4-devel to requires on devel subpackage



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/FC-6/xfce-mcs-manager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce-mcs-manager.spec	11 Nov 2006 18:07:54 -0000	1.10
+++ xfce-mcs-manager.spec	17 Nov 2006 03:46:47 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.3.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2
@@ -22,6 +22,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libxfce4mcs-devel
+Requires: libxfcegui4-devel 
 Requires: gtk2-devel
 
 %description devel
@@ -61,6 +62,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-2
+- Add libxfcegui4-devel to requires on devel subpackage
+
 * Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
 - Update to 4.3.99.2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 03:58:38 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:58:38 -0700
Subject: rpms/exo/FC-6 exo.spec,1.20,1.21
Message-ID: <200611170358.kAH3wcG8029966@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29945

Modified Files:
	exo.spec 
Log Message:
Rebuild with fixed xfce-mcs-manager-devel
Add exo-preferred-applicatons-settings.so



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-6/exo.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- exo.spec	11 Nov 2006 19:06:35 -0000	1.20
+++ exo.spec	17 Nov 2006 03:58:07 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.12
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/exo-0.3.1.12rc2.tar.bz2
@@ -94,6 +94,7 @@
 %{_libexecdir}/exo-helper-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
+%{_libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so
 %{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
@@ -114,6 +115,10 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Nov 16 2006 Kevin Fenzi  - 0.3.1.12-0.2.rc2
+- Rebuild with fixed xfce-mcs-manager-devel
+- Add exo-preferred-applicatons-settings.so
+
 * Thu Nov  9 2006 Kevin Fenzi  - 0.3.1.12-0.1.rc2
 - Update to 0.3.1.12rc2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 04:11:29 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 21:11:29 -0700
Subject: rpms/Terminal/FC-6 Terminal.spec,1.14,1.15
Message-ID: <200611170411.kAH4BTuF000617@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv592

Modified Files:
	Terminal.spec 
Log Message:
Add startup-notification-devel and dbus-glib-devel to BuildRequires



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/FC-6/Terminal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Terminal.spec	11 Nov 2006 19:29:05 -0000	1.14
+++ Terminal.spec	17 Nov 2006 04:10:59 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.2.5.8
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Terminal-0.2.5.8rc2.tar.bz2
@@ -11,6 +11,8 @@
 BuildRequires: exo-devel >= 0.3.1
 BuildRequires: libSM-devel
 BuildRequires: gettext
+BuildRequires: startup-notification-devel
+BuildRequires: dbus-glib-devel
 
 %description
 Terminal is a lightweight and easy to use terminal emulator application
@@ -60,6 +62,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Nov 16 2006 Kevin Fenzi  - 0.2.5.8-0.2.rc2
+- Add startup-notification-devel and dbus-glib-devel to BuildRequires
+
 * Fri Nov 10 2006 Kevin Fenzi  - 0.2.5.8-0.1.rc2
 - Update to 0.2.5.8rc2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 05:14:34 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 16 Nov 2006 22:14:34 -0700
Subject: rpms/php-pear-SOAP/FC-6 php-pear-SOAP.spec,1.1,1.2
Message-ID: <200611170514.kAH5EYKU005354@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5315

Modified Files:
	php-pear-SOAP.spec 
Log Message:
	bump release



Index: php-pear-SOAP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-SOAP/FC-6/php-pear-SOAP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-SOAP.spec	16 Nov 2006 06:10:18 -0000	1.1
+++ php-pear-SOAP.spec	17 Nov 2006 05:14:04 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-SOAP
 Version:        0.9.4
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Simple Object Access Protocol (SOAP) Client/Server for PHP
 
 Group:          Development/Libraries
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Fri Nov 17 2006 Remi Collet  0.9.4-1.fc6.1
+- dump release
+
 * Mon Nov  6 2006 Remi Collet  0.9.4-1
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE



From fedora-extras-commits at redhat.com  Fri Nov 17 14:46:19 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 17 Nov 2006 07:46:19 -0700
Subject: rpms/lilypond-doc/FC-6 .cvsignore, 1.5, 1.6 lilypond-doc.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <200611171446.kAHEkJbe003707@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3687

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Oct 2006 13:31:46 -0000	1.5
+++ .cvsignore	17 Nov 2006 14:45:48 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7-1.documentation.tar.bz2
+lilypond-2.10.0-2.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/lilypond-doc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lilypond-doc.spec	10 Oct 2006 13:31:46 -0000	1.4
+++ lilypond-doc.spec	17 Nov 2006 14:45:48 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           lilypond-doc
-Version:        2.8.7
-Release:	1%{?dist}
+Version:        2.10.0
+Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
 Group:		Applications/Publishing
 License:	GPL
 URL:		http://www.lilypond.org
-Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-1.documentation.tar.bz2
+Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-2.documentation.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Quentin Spencer  2.10.0-1
+- New release.
+
 * Tue Oct 10 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Oct 2006 13:31:46 -0000	1.5
+++ sources	17 Nov 2006 14:45:48 -0000	1.6
@@ -1 +1 @@
-492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2
+b4fae3abd129e0a19ceddb3dae03fb28  lilypond-2.10.0-2.documentation.tar.bz2



From richardokohII at yahoo.redhat.com  Sun Nov 19 11:56:07 2006
From: richardokohII at yahoo.redhat.com (Richard Okoh)
Date: Sun, 19 Nov 2006 12:56:07 +0100 (CET)
Subject: I WILL ASSIST YOU GET YOUR PAYMENT RELEASED 
Message-ID: <20061119115607.04D7F18B892@jedrzejow.pl>


FROM: Richard Okoh       PRIVATE AND CONFIDENTIAL
      # 3 Onyeama Street, Zone 2 
      Wuse Abuja.                
 
My Dear, 

I know that this letter will come to you with a great suprise, my name is Mr. Richard Okoh chairman consultative monetary panel, and this is in regards to your outstanding payment.
 
I took my time to carrying out a proper verification exercise on this subject matter and all the complications, which was created by some selfish officials who have various interests on the transaction. which I discovered that despite all efforts put in for you to be able to have what rightfully belong to you, all effort being made could not yield any result.
 
In a summary, this is my proposal I have contacted a friend of mine who is a politician and a lawyer by profession he is contesting for a Governor in one of the state here in my country. I was able to talk to him  regarding to your project and he promise to assist and make sure you get your payment realeased to you.
 
Finally, if this is ok by you I can be reach on Telephone Number:+234-805-6224255 Email:okohrichard02 at rediffmail.com as soon as I have your confirmation toward this subject I will arrange for a meeting with the parties concerned, then get back to you and you will be deeply amazed on how soon this transaction will come to an end.
 
Note that you must be carried along on each and every step to actualize this transaction. When i hear from you we can talk more on how  to proceed and what gets to us.
 
Best regards
 
Mr.Richard Okoh
CHAIRMAN 






From fedora-extras-commits at redhat.com  Tue Nov 21 06:20:16 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 21 Nov 2006 01:20:16 -0500
Subject: rpms/nagios/devel nagios.logrotate,1.2,1.3
Message-ID: <200611210620.kAL6KGKW006301@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6286

Modified Files:
	nagios.logrotate 
Log Message:
removed return


Index: nagios.logrotate
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.logrotate	21 Nov 2006 06:01:28 -0000	1.2
+++ nagios.logrotate	21 Nov 2006 06:19:46 -0000	1.3
@@ -13,4 +13,3 @@
 #       create 644 nagios nagios
 #}
 
-



From fedora-extras-commits at redhat.com  Tue Nov 21 06:31:52 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 01:31:52 -0500
Subject: rpms/openvrml - New directory
Message-ID: <200611210631.kAL6VqUS006580@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6576/openvrml

Log Message:
Directory /cvs/extras/rpms/openvrml added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 06:31:57 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 01:31:57 -0500
Subject: rpms/openvrml/devel - New directory
Message-ID: <200611210631.kAL6VvWR006595@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6576/openvrml/devel

Log Message:
Directory /cvs/extras/rpms/openvrml/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 06:32:18 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 01:32:18 -0500
Subject: rpms/openvrml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611210632.kAL6WIFr006642@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6619/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openvrml


--- 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 Nov 21 06:32:13 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 01:32:13 -0500
Subject: rpms/openvrml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611210632.kAL6WDFo006625@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6619

Added Files:
	Makefile import.log 
Log Message:
Setup of module openvrml


--- NEW FILE Makefile ---
# Top level Makefile for module openvrml
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  Tue Nov 21 06:38:42 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:38:42 -0500
Subject: rpms/php-pear-Services-Weather - New directory
Message-ID: <200611210638.kAL6cgk0006876@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6872/php-pear-Services-Weather

Log Message:
Directory /cvs/extras/rpms/php-pear-Services-Weather added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 06:38:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:38:48 -0500
Subject: rpms/php-pear-Services-Weather/devel - New directory
Message-ID: <200611210638.kAL6cmoP006889@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6872/php-pear-Services-Weather/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Services-Weather/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 06:39:08 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:39:08 -0500
Subject: rpms/php-pear-Services-Weather Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200611210639.kAL6d8IF006921@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6915

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Services-Weather


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Services-Weather
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  Tue Nov 21 06:39:13 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:39:13 -0500
Subject: rpms/php-pear-Services-Weather/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611210639.kAL6dDoW006936@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6915/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Services-Weather


--- 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 Nov 21 06:44:00 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:44:00 -0500
Subject: owners owners.list,1.1975,1.1976
Message-ID: <200611210644.kAL6i0Sd007027@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7010

Modified Files:
	owners.list 
Log Message:
	php-pear-Services-Weather : Interface to various online weather-services Description



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1975
retrieving revision 1.1976
diff -u -r1.1975 -r1.1976
--- owners.list	16 Nov 2006 20:33:10 -0000	1.1975
+++ owners.list	21 Nov 2006 06:43:30 -0000	1.1976
@@ -1820,6 +1820,7 @@
 Fedora Extras|php-pear-PHP-CompatInfo|Find out version and extensions required for a piece of code to run|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Services-Weather|Interface to various online weather-services Description|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-SOAP|Simple Object Access Protocol (SOAP) Client/Server for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 06:53:53 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 01:53:53 -0500
Subject: rpms/libEMF/devel libEMF-amd64.patch, NONE, 1.1 libEMF.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611210653.kAL6rrVJ007914@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libEMF/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7892

Modified Files:
	.cvsignore sources 
Added Files:
	libEMF-amd64.patch libEMF.spec 
Log Message:
initial import into devel branch


libEMF-amd64.patch:

--- NEW FILE libEMF-amd64.patch ---
--- libEMF-1.0.3/libemf/libemf.h.amd64	2004-11-11 23:33:43.000000000 +0100
+++ libEMF-1.0.3/libemf/libemf.h	2006-11-19 00:54:37.000000000 +0100
@@ -306,6 +306,7 @@
 	fread( &word, sizeof(INT16), 1, fp_ );
       return *this;
     }
+#if !(defined(_LP64) || defined(__alpha__))
     /*!
      * Output a double word (long) to the stream (swabbed).
      * \param word word (long) to output.
@@ -374,6 +375,7 @@
 	fread( &long_, sizeof(LONG), 1, fp_ );
       return *this;
     }
+#endif
     /*!
      * Output a (long) int to the stream (swabbed).
      * \param int_ (long) int to output.
--- libEMF-1.0.3/include/libEMF/wine/winbase.h.amd64	2004-07-29 08:20:38.000000000 +0200
+++ libEMF-1.0.3/include/libEMF/wine/winbase.h	2006-11-19 00:55:17.000000000 +0100
@@ -1802,6 +1802,7 @@
 VOID        WINAPI SetLastError(DWORD);
 #endif  /* __i386__ && __GNUC__ */
 
+#if 0
 /* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */
 static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare )
 {
@@ -1812,6 +1813,7 @@
 {
     return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
 }
+#endif
 
 #ifdef __WINE__
 #define GetCurrentProcess() ((HANDLE)0xffffffff)
--- libEMF-1.0.3/include/libEMF/wine/winnt.h.amd64	2005-08-07 17:50:12.000000000 +0200
+++ libEMF-1.0.3/include/libEMF/wine/winnt.h	2006-11-19 00:54:37.000000000 +0100
@@ -29,10 +29,14 @@
 
 /* Architecture dependent settings. */
 /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 # undef  WORDS_BIGENDIAN
 # undef  BITFIELDS_BIGENDIAN
 # define ALLOW_UNALIGNED_ACCESS
+#elif defined(__alpha__)
+# undef  WORDS_BIGENDIAN
+# undef  BITFIELDS_BIGENDIAN
+# undef  ALLOW_UNALIGNED_ACCESS
 #elif defined(__sparc__)
 # define WORDS_BIGENDIAN
 # define BITFIELDS_BIGENDIAN
@@ -222,8 +226,13 @@
 typedef unsigned short  WORD,       *PWORD,    *LPWORD;
 typedef int             INT,        *PINT,     *LPINT;
 typedef unsigned int    UINT,       *PUINT,    *LPUINT;
+#if defined(_LP64) || defined(__alpha__)
+typedef unsigned int    DWORD,      *PDWORD,   *LPDWORD;
+typedef unsigned int    ULONG,      *PULONG,   *LPULONG;
+#else
 typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
 typedef unsigned long   ULONG,      *PULONG,   *LPULONG;
+#endif
 typedef float           FLOAT,      *PFLOAT,   *LPFLOAT;
 typedef double          DOUBLE,     *PDOUBLE,  *LPDOUBLE;
 typedef double          DATE;
@@ -263,7 +272,11 @@
 typedef BYTE            BOOLEAN,    *PBOOLEAN;
 typedef char            CHAR,       *PCHAR;
 typedef short           SHORT,      *PSHORT;
+#if defined(_LP64) || defined(__alpha__)
+typedef int             LONG,       *PLONG,    *LPLONG;
+#else
 typedef long            LONG,       *PLONG,    *LPLONG;
+#endif
 
 /* Some systems might have wchar_t, but we really need 16 bit characters */
 #ifndef WINE_WCHAR_DEFINED
@@ -652,6 +665,11 @@
 
 #endif  /* __i386__ */
 
+#ifdef __x86_64__
+#define CONTEXT_FULL		1
+typedef struct _CONTEXT CONTEXT;
+#endif
+
 /* Alpha context definitions */
 #ifdef _ALPHA_
 


--- NEW FILE libEMF.spec ---
Summary:	A library for generating Enhanced Metafiles
Summary(pl):	Biblioteka do generowania plik??w w formacie Enhanced Metafile
Name:		libEMF
Version:	1.0.3
Release:	3%{?dist}
License:	LGPL/GPL
Group:		System Environment/Libraries
Source0:	http://dl.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
# Source0-md5:	a4e91fd8077ce5f540f569e20e8ef7ff
Patch0:		%{name}-amd64.patch
URL:		http://libemf.sourceforge.net/
BuildRequires:	libstdc++-devel
BuildRequires:	libtool
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)

%description
libEMF is a library for generating Enhanced Metafiles on systems which
don't natively support the ECMA-234 Graphics Device Interface
(GDI). The library is intended to be used as a driver for other
graphics programs such as Grace or gnuplot. Therefore, it implements a
very limited subset of the GDI.

%description -l pl
libEMF to biblioteka do generowania plik??w w formacie Enhanced
Metafile na systemach nie obs??uguj??cych natywnie systemu graficznego
ECMA-234 GDI. Biblioteka ma s??u??y?? jako sterownik dla innych program??w
graficznych, takich jak Grace czy gnuplot. Z tego powodu ma
zaimplementowany bardzo ograniczony podzbi??r GDI.

%package devel
Summary:	libEMF header files
Summary(pl):	Pliki nag????wkowe libEMF
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	libstdc++-devel

%description devel
libEMF header files.

%description devel -l pl
Pliki nag????wkowe libEMF.

%prep
%setup -q
%patch0 -p1 -b .amd64
chmod 0644 libemf/libemf.h

%build
# supplied libtool is broken (no C++ libraries support)
%{__libtoolize} --force
%{__aclocal}
%{__autoconf}
%{__automake}
%configure \
	--disable-static \
	--enable-editing

%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

export CPPROG="cp -p"
%{__make} install \
	DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/libEMF.la

%check
%{__make} check

%clean
rm -rf $RPM_BUILD_ROOT

%post	-p /sbin/ldconfig
%postun	-p /sbin/ldconfig

%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_libdir}/lib*.so.*

%files devel
%defattr(644,root,root,755)
%doc doc/html
%attr(755,root,root) %{_libdir}/lib*.so
%{_includedir}/libEMF

%changelog
* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.0.3-3
- remove executable bit from libemf.h

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.0.3-2
- added license texts
- preserved timestamps during install
- added %%check section

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.0.3-1
- adapted PLD spec
- enhanced amd64 patch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libEMF/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 06:04:56 -0000	1.1
+++ .cvsignore	21 Nov 2006 06:53:23 -0000	1.2
@@ -0,0 +1 @@
+libEMF-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libEMF/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 06:04:56 -0000	1.1
+++ sources	21 Nov 2006 06:53:23 -0000	1.2
@@ -0,0 +1 @@
+a4e91fd8077ce5f540f569e20e8ef7ff  libEMF-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 07:40:38 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 02:40:38 -0500
Subject: rpms/gparted/devel gparted.spec,1.14,1.15
Message-ID: <200611210740.kAL7ecBT008348@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8307

Modified Files:
	gparted.spec 
Log Message:
* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
- Rebuild for new parted



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gparted.spec	13 Sep 2006 22:36:12 -0000	1.14
+++ gparted.spec	21 Nov 2006 07:40:08 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
+- Rebuild for new parted
+
 * Wed Sep 13 2006 Deji Akingunola  - 0.3.1-1
 - New version 0.3.1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 07:41:19 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:41:19 -0500
Subject: rpms/mirage - New directory
Message-ID: <200611210741.kAL7fJJL008439@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8435/mirage

Log Message:
Directory /cvs/extras/rpms/mirage added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 07:41:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:41:25 -0500
Subject: rpms/mirage/devel - New directory
Message-ID: <200611210741.kAL7fPAK008452@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8435/mirage/devel

Log Message:
Directory /cvs/extras/rpms/mirage/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 07:41:45 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:41:45 -0500
Subject: rpms/mirage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611210741.kAL7fjWV008519@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8498/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mirage


--- 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 Nov 21 07:41:39 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:41:39 -0500
Subject: rpms/mirage Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611210741.kAL7fdSO008504@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8498

Added Files:
	Makefile import.log 
Log Message:
Setup of module mirage


--- NEW FILE Makefile ---
# Top level Makefile for module mirage
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  Tue Nov 21 07:42:00 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:42:00 -0500
Subject: rpms/jd/devel .cvsignore, 1.18, 1.19 jd.spec, 1.25, 1.26 sources,
	1.18, 1.19
Message-ID: <200611210742.kAL7g0N4008550@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8462

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061120
- cvs 061120 (23:50 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	16 Nov 2006 17:17:39 -0000	1.18
+++ .cvsignore	21 Nov 2006 07:41:29 -0000	1.19
@@ -1 +1 @@
-jd-1.8.1-cvs061116.tgz
+jd-1.8.1-cvs061120.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jd.spec	16 Nov 2006 17:17:39 -0000	1.25
+++ jd.spec	21 Nov 2006 07:41:29 -0000	1.26
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061116
+%define         strtag        cvs061120
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Nov 16 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061116
-- cvs 061116 (23:59 JST)
+* Mon Nov 20 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061120
+- cvs 061120 (23:50 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	16 Nov 2006 17:17:39 -0000	1.18
+++ sources	21 Nov 2006 07:41:29 -0000	1.19
@@ -1 +1 @@
-5861afcc6d6894864510a8768ce3e4fd  jd-1.8.1-cvs061116.tgz
+fe1f6b3350d0f59dc0e8c832caed26d8  jd-1.8.1-cvs061120.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 07:42:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:42:41 -0500
Subject: rpms/mirage import.log,1.1,1.2
Message-ID: <200611210742.kAL7gfPu008647@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8599

Modified Files:
	import.log 
Log Message:
auto-import mirage-0.8.1-1 on branch devel from mirage-0.8.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mirage/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 07:41:39 -0000	1.1
+++ import.log	21 Nov 2006 07:42:11 -0000	1.2
@@ -0,0 +1 @@
+mirage-0_8_1-1:HEAD:mirage-0.8.1-1.src.rpm:1164094931



From fedora-extras-commits at redhat.com  Tue Nov 21 07:42:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:42:41 -0500
Subject: rpms/mirage/devel mirage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611210742.kAL7gfjK008651@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8599/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mirage.spec 
Log Message:
auto-import mirage-0.8.1-1 on branch devel from mirage-0.8.1-1.src.rpm


--- NEW FILE mirage.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		mirage
Version:	0.8.1
Release:	1%{?dist}
Summary:	A fast and simple image viewer

Group:		Amusements/Graphics
License:	GPL
URL:		http://mirageiv.berlios.de/
Source0:	http://download.berlios.de/mirageiv/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python-devel
BuildRequires:	desktop-file-utils
Requires:	pygtk2
Requires:	gnome-python2-gconf

%description
Mirage is a fast and simple GTK+ image viewer. Because it 
depends only on PyGTK, Mirage is ideal for users who wish to 
keep their computers lean while still having a clean image viewer.

%prep
%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
%{__python} setup.py build

%install
%{__rm} -rf $RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

# fix permission
%{__chmod} 0755 $RPM_BUILD_ROOT%{python_sitearch}/*.py

# remove document files
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/[A-Z]*

# install desktop file
desktop-file-install \
	--delete-original \
	--remove-category 'Application' \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--vendor fedora \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

# gettext files
%{find_lang} %{name}

%post
%{_bindir}/update-desktop-database &> /dev/null || :

%postun
%{_bindir}/update-desktop-database &> /dev/null || :

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README TODO TRANSLATORS

%{_bindir}/%{name}
%{python_sitearch}/%{name}.py*
%{python_sitearch}/*.so

%{_datadir}/%{name}/
%{_datadir}/pixmaps/*.png

%{_datadir}/applications/*%{name}.desktop

%changelog
* Sat Nov 18 2006 Mamoru Tasaka  - 0.8.1-1
- Initial packaging to import to Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 07:41:45 -0000	1.1
+++ .cvsignore	21 Nov 2006 07:42:11 -0000	1.2
@@ -0,0 +1 @@
+mirage-0.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 07:41:45 -0000	1.1
+++ sources	21 Nov 2006 07:42:11 -0000	1.2
@@ -0,0 +1 @@
+c87da5b76f856fd7a759a355259b76ed  mirage-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 07:43:43 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:43:43 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.7, 1.8 ochusha.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200611210743.kAL7hhGd008783@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8703

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka  0.5.99.63.5-0.1.cvs061120
- 0.5.99.63.5 cvs 061120 (20:00 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Nov 2006 17:30:59 -0000	1.7
+++ .cvsignore	21 Nov 2006 07:43:13 -0000	1.8
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061116.tar.bz2
+ochusha-0.5.99.63.5-cvs061120.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ochusha.spec	16 Nov 2006 17:30:59 -0000	1.7
+++ ochusha.spec	21 Nov 2006 07:43:13 -0000	1.8
@@ -1,10 +1,10 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.3
-%define              strtag          cvs061116
+%define              main_ver        0.5.99.63.5
+%define              strtag          cvs061120
 
-%define              vendor_rel      2
+%define              vendor_rel      1
 %define              pre_release     1
 
 %if %{pre_release}
@@ -53,8 +53,7 @@
 %setup -q
 %endif
 
-# change desktop entry to use png file in 
-# %{icondir}
+# change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
 %build
@@ -75,15 +74,20 @@
 %find_lang %{name}
 %find_lang %{name}-properties
 
-%{__cat} *.lang > all.lang
+%{__cat} %{name}.lang %{name}-properties.lang > all.lang
 
-# License
+# Licenses.
 if test -f "oniguruma/COPYING"; then
   %{__mv} oniguruma/COPYING oniguruma/COPYING.oniguruma
 fi
+if test -f "libochushagtk_lgpl/COPYING"; then
+  %{__mv} libochushagtk_lgpl/COPYING libochushagtk_lgpl/COPYING.libochushagtk_lgpl
+fi
 
 # remove unneeded files
-%{__rm} -f %{buildroot}%{_libdir}/lib*.{a,la,so}
+%{__rm} -f %{buildroot}/%{_libdir}/*.a
+%{__rm} -f %{buildroot}/%{_libdir}/*.la
+%{__rm} -f %{buildroot}/%{_libdir}/*.so
 %if %{with_system_ca_cert_file}
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ca-bundle.crt
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ochusha-gtkrc*
@@ -98,10 +102,10 @@
       --dir %{buildroot}%{_datadir}/applications \
       %{buildroot}%{_datadir}/ochusha/%{name}.desktop
 
-# link Icon png to icondir
+# link icon to icondir according to Icon Theme Specification.
 %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-ln -sf ../../../../ochusha/ochusha48.png \
-   %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+%{__ln_s} -f ../../../../ochusha/ochusha48.png \
+	%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 # change documents' encoding to UTF-8.
 change_encoding(){
@@ -133,30 +137,36 @@
 
 %files -f all.lang
 %defattr(-,root,root)
-# BUGS is empty for now, however I include it for now.
 %doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 %doc ochusha/ochusha-gtkrc.*
 %doc oniguruma/COPYING.oniguruma
+%doc libochushagtk_lgpl/COPYING.libochushagtk_lgpl
 
 %{_bindir}/ochusha
+%{_datadir}/%{name}/*
+%{_datadir}/applications/fedora-%{name}.desktop
+%dir %{_datadir}/%{name}
 %{_libdir}/lib*
+%{_mandir}/man1/%{name}.1*
 
-%{_datadir}/applications/fedora-*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
-
-%{_mandir}/man1/%{name}.1*
-
 %changelog
-* Thu Nov 16 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061116
-- Update to 0.5.99.63.3 cvs 061116
+* Mon Nov 20 2006 Mamoru Tasaka  0.5.99.63.5-0.1.cvs061120
+- 0.5.99.63.5 cvs 061120 (20:00 JST)
+
+* Sat Nov 18 2006 
+- COPYING files of oniguruma and libochushagtk_lgpl will be installed
+  as COPYING.oniguruma and COPYING.libochushagtk_lgpl.
 
 * Fri Nov 03 2006  0.5.99.62-1
 - Version down.
 - Specify the CA certificate file bundled within openssl package.
 
+* Mon Sep 19 2006  0.6-1
+- Version up.
+- Change request fields for gtk+-2.6 and libxml2-2.6.
+
 * Sat Aug 26 2006 Mamoru Tasaka  0.5.8.2-3
 - Install (link) icon to the usual directory and use 
   cache updating method.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Nov 2006 17:30:59 -0000	1.7
+++ sources	21 Nov 2006 07:43:13 -0000	1.8
@@ -1 +1 @@
-a4f068bb0c128688a050bda77c1a31cb  ochusha-0.5.99.63.3-cvs061116.tar.bz2
+d3ce8f7cfe119ab7490cb4043d8357bb  ochusha-0.5.99.63.5-cvs061120.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 07:44:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 02:44:29 -0500
Subject: rpms/tracker import.log,1.2,1.3
Message-ID: <200611210744.kAL7iTgs008896@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8820

Modified Files:
	import.log 
Log Message:
auto-import tracker-0.5.2-1 on branch devel from tracker-0.5.2-1.src.rpm
Update to 0.5.2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tracker/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	9 Nov 2006 16:08:20 -0000	1.2
+++ import.log	21 Nov 2006 07:43:59 -0000	1.3
@@ -1 +1,2 @@
 tracker-0_5_1-1:HEAD:tracker-0.5.1-1.src.rpm:1163088496
+tracker-0_5_2-1:HEAD:tracker-0.5.2-1.src.rpm:1164095041



From fedora-extras-commits at redhat.com  Tue Nov 21 07:44:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 02:44:29 -0500
Subject: rpms/tracker/devel tracker-desktop.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 tracker.spec, 1.2, 1.3 trackerd.desktop,
	1.1, NONE
Message-ID: <200611210744.kAL7iTIh008901@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8820/devel

Modified Files:
	.cvsignore sources tracker.spec 
Added Files:
	tracker-desktop.patch 
Removed Files:
	trackerd.desktop 
Log Message:
auto-import tracker-0.5.2-1 on branch devel from tracker-0.5.2-1.src.rpm
Update to 0.5.2

tracker-desktop.patch:

--- NEW FILE tracker-desktop.patch ---
--- Makefile.in	2006-11-20 13:34:48.000000000 -0500
+++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
@@ -66,8 +66,9 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+xdgconfigDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgconfig_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -299,7 +300,9 @@
 target_alias = @target_alias@
 SUBDIRS = data src filters thumbnailers docs po
 pkgconfigdir = $(libdir)/pkgconfig
+xdgconfigdir = $(sysconfdir)/xdg/autostart
 pkgconfig_DATA = tracker.pc
+xdgconfig_DATA= trackerd.desktop
 debian_files = \
 	debian/changelog \
 	debian/compat \
@@ -331,12 +334,11 @@
 
 EXTRA_DIST = \
 	$(pkgconfig_DATA) \
+	$(xdgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	configure.in \
 	rdf-query-examples/*.rdf \
-	trackerd.desktop \
-	trackerd-kde.desktop \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
@@ -422,6 +424,15 @@
 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
+install-xdgconfigDATA: $(xdgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
@@ -430,6 +441,13 @@
 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
+uninstall-xdgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -710,7 +728,7 @@
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -758,7 +776,7 @@
 
 info-am:
 
-install-data-am: install-pkgconfigDATA
+install-data-am: install-pkgconfigDATA install-xdgconfigDATA
 
 install-exec-am:
 
--- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
+++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
@@ -8,5 +8,8 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true
--- src/tracker-search-tool/tracker-search-tool.desktop.in	2006-11-20 08:11:41.000000000 -0500
+++ src/tracker-search-tool/tracker-search-tool.desktop.in.new	2006-11-20 20:24:40.000000000 -0500
@@ -6,6 +6,6 @@
 Icon=gnome-searchtool
 Terminal=false
 Type=Application
-Categories=GTK;Application;Utility;
+Categories=GTK;Utility;
 StartupNotify=true
-NoDisplay=true 
+NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 16:08:21 -0000	1.2
+++ .cvsignore	21 Nov 2006 07:43:59 -0000	1.3
@@ -1 +1 @@
-tracker-0.5.1.tar.gz
+tracker-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 16:08:21 -0000	1.2
+++ sources	21 Nov 2006 07:43:59 -0000	1.3
@@ -1 +1 @@
-133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz
+1bccb8522668a791366aeb25d43b5da7  tracker-0.5.2.tar.gz


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tracker.spec	9 Nov 2006 16:24:03 -0000	1.2
+++ tracker.spec	21 Nov 2006 07:43:59 -0000	1.3
@@ -1,16 +1,17 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
 Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
-Source1: trackerd.desktop
+Patch0: tracker-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmime-devel, poppler-devel, gettext
 BuildRequires: gnome-desktop-devel, gamin-devel
 BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
+BuildRequires: desktop-file-utils, intltool
 %if "%fedora" >= "6"
 BuildRequires: sqlite-devel
 %else
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .desktop
 
 %build
 %if "%fedora" >= "6"
@@ -59,12 +61,19 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-# Add an autostart for trackerd
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/
+# Add an autostart for trackerd (for KDE)
+mkdir -p %{buildroot}%{_datadir}/autostart
+cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
+
+desktop-file-install --delete-original                   \
+        --vendor="fedora"                           \
+        --dir=%{buildroot}%{_datadir}/applications   \
+        %{buildroot}%{_datadir}/applications/%{name}-search-tool.desktop
 
 rm -rf %{buildroot}%{_libdir}/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -72,7 +81,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
@@ -80,7 +89,9 @@
 %{_bindir}/tracker*
 %{_datadir}/tracker/
 %{_datadir}/pixmaps/tracker/
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/autostart/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/tracker*.1.gz
 %{_sysconfdir}/xdg/autostart/trackerd.desktop
@@ -92,6 +103,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
+- Update to 0.5.2
+
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1
 - Update to new version
 


--- trackerd.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 07:54:47 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 21 Nov 2006 02:54:47 -0500
Subject: rpms/buoh/FC-6 .cvsignore, 1.2, 1.3 buoh.spec, 1.17, 1.18 sources,
	1.2, 1.3
Message-ID: <200611210754.kAL7sllP009109@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9090

Modified Files:
	.cvsignore buoh.spec sources 
Log Message:
Upgrading to new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Dec 2005 22:14:29 -0000	1.2
+++ .cvsignore	21 Nov 2006 07:54:16 -0000	1.3
@@ -1 +0,0 @@
-buoh-0.8.1.tar.gz


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/buoh.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- buoh.spec	11 Sep 2006 15:58:30 -0000	1.17
+++ buoh.spec	21 Nov 2006 07:54:16 -0000	1.18
@@ -1,11 +1,11 @@
 Name:             buoh
 License:          GPL
 Group:            Applications/Internet
-Version:          0.8.1
-Release:          13
+Version:          0.8.2
+Release:          1
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
-Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
+Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
 Requires(post):   GConf2
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
+* Tue Nov 21 2006 Chris Chabot  - 0.8.2-1
+- New upstream version
+
 * Mon Sep 11 2006 Chris Chabot  - 0.8.1-13
 - FC6 retag & rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2005 22:14:29 -0000	1.2
+++ sources	21 Nov 2006 07:54:16 -0000	1.3
@@ -1 +0,0 @@
-5d05a51d7c6616d93e93df3465b49fe7  buoh-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 07:56:43 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 21 Nov 2006 02:56:43 -0500
Subject: rpms/buoh/devel buoh.spec,1.17,1.18
Message-ID: <200611210756.kAL7uhCn009131@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9116

Modified Files:
	buoh.spec 
Log Message:
Upgrading to new upstream version


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- buoh.spec	11 Sep 2006 15:58:30 -0000	1.17
+++ buoh.spec	21 Nov 2006 07:56:13 -0000	1.18
@@ -1,11 +1,11 @@
 Name:             buoh
 License:          GPL
 Group:            Applications/Internet
-Version:          0.8.1
-Release:          13
+Version:          0.8.2
+Release:          1
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
-Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
+Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
 Requires(post):   GConf2
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
+* Tue Nov 21 2006 Chris Chabot  - 0.8.2-1
+- New upstream version
+
 * Mon Sep 11 2006 Chris Chabot  - 0.8.1-13
 - FC6 retag & rebuild
 



From fedora-extras-commits at redhat.com  Tue Nov 21 08:06:37 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 21 Nov 2006 03:06:37 -0500
Subject: rpms/ghdl/devel ghdl-svn89.patch, NONE, 1.1 ghdl.spec, 1.26,
	1.27 ghdl-svn73.patch, 1.1, NONE
Message-ID: <200611210806.kAL86bV3009212@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9194

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn89.patch 
Removed Files:
	ghdl-svn73.patch 
Log Message:
update to svn89


ghdl-svn89.patch:

--- NEW FILE ghdl-svn89.patch ---
diff -urN ghdl-0.25/vhdl/back_end.ads ghdl-0.26dev/vhdl/back_end.ads
--- ghdl-0.25/vhdl/back_end.ads	2005-09-22 23:07:25.000000000 +0200
+++ ghdl-0.26dev/vhdl/back_end.ads	2006-11-20 00:36:24.000000000 +0100
@@ -29,6 +29,14 @@
    Library_To_File_Name : Library_To_File_Name_Acc :=
      Default_Library_To_File_Name'Access;
 
+   --  Back-end options.
+   type Parse_Option_Acc is access function (Opt : String) return Boolean;
+   Parse_Option : Parse_Option_Acc := null;
+
+   --  Disp back-end option help.
+   type Disp_Option_Acc is access procedure;
+   Disp_Option : Disp_Option_Acc := null;
+
    --  UNIT is a design unit from parse.
    --  According to the current back-end, do what is necessary.
    --
@@ -46,8 +54,5 @@
    --  May be NULL for no additionnal checks.
    type Sem_Foreign_Acc is access procedure (Decl : Iir);
    Sem_Foreign : Sem_Foreign_Acc := null;
-
-   --procedure Finish_Compilation
-   --  (Unit : Iir_Design_Unit; Main : Boolean := False);
 end Back_End;
 
diff -urN ghdl-0.25/vhdl/bug.adb ghdl-0.26dev/vhdl/bug.adb
--- ghdl-0.25/vhdl/bug.adb	2005-11-18 02:34:12.000000000 +0100
+++ ghdl-0.26dev/vhdl/bug.adb	2006-11-20 00:36:24.000000000 +0100
@@ -70,7 +70,7 @@
       Put_Line
         (Standard_Error,
          "Please report this bug on http://gna.org/projects/ghdl");
-      Put_Line (Standard_Error, "GHDL version: " & Ghdl_Version);
+      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "In directory: " &
                 GNAT.Directory_Operations.Get_Current_Dir);
diff -urN ghdl-0.25/vhdl/canon.adb ghdl-0.26dev/vhdl/canon.adb
--- ghdl-0.25/vhdl/canon.adb	2006-07-29 06:42:30.000000000 +0200
+++ ghdl-0.26dev/vhdl/canon.adb	2006-11-20 00:36:24.000000000 +0100
@@ -847,22 +847,6 @@
       end loop;
    end Canon_Sequential_Stmts;
 
-   procedure Add_Driver_For_Signal (Driver_List : Iir_List;
-                                    Signal : Iir)
-   is
-      Choice : Iir;
-   begin
-      if Get_Kind (Signal) = Iir_Kind_Aggregate then
-         Choice := Get_Association_Choices_Chain (Signal);
-         while Choice /= Null_Iir loop
-            Add_Driver_For_Signal (Driver_List, Get_Associated (Choice));
-            Choice := Get_Chain (Choice);
-         end loop;
-      else
-         Add_Element (Driver_List, Get_Longuest_Static_Prefix (Signal));
-      end if;
-   end Add_Driver_For_Signal;
-
    -- Create a statement transform from concurrent_signal_assignment
    -- statement STMT (either selected or conditional).
    -- waveform transformation is not done.
@@ -895,9 +879,6 @@
       --      reserved word POSTPONED.
       Set_Postponed_Flag (Proc, Get_Postponed_Flag (Proc));
 
-      Set_Driver_List (Proc, Create_Iir_List);
-      Add_Driver_For_Signal (Get_Driver_List (Proc), Get_Target (Stmt));
-
       Canon_Extract_Sensitivity (Get_Target (Stmt), Sensitivity_List, True);
 
       if Canon_Flag_Expressions then
@@ -966,7 +947,6 @@
       Assoc_Chain : Iir;
       Assoc : Iir;
       Imp : Iir;
-      Driver_List : Iir_Driver_List;
       Inter : Iir;
       Sensitivity_List : Iir_List;
       Is_Sensitized : Boolean;
@@ -1014,7 +994,6 @@
          Get_Parameter_Association_Chain (Call),
          Call);
       Set_Parameter_Association_Chain (Call, Assoc_Chain);
-      Driver_List := Null_Iir_List;
       Assoc := Assoc_Chain;
 
       --  LRM93 9.3
@@ -1034,18 +1013,6 @@
                   Canon_Extract_Sensitivity
                     (Get_Actual (Assoc), Sensitivity_List, False);
                end if;
-               --  LRM 2.1.1.2 Signal Parameters
-               if Get_Kind (Inter) = Iir_Kind_Signal_Interface_Declaration
-                 and then Get_Mode (Inter) in Iir_Out_Modes
-               then
-                  if Driver_List = Null_Iir_List then
-                     Driver_List := Create_Iir_List;
-                     Set_Driver_List (Proc, Driver_List);
-                  end if;
-                  Add_Element
-                    (Driver_List,
-                     Get_Longuest_Static_Prefix (Get_Actual (Assoc)));
-               end if;
             when Iir_Kind_Association_Element_Open
               | Iir_Kind_Association_Element_By_Individual =>
                null;
diff -urN ghdl-0.25/vhdl/disp_tree.adb ghdl-0.26dev/vhdl/disp_tree.adb
--- ghdl-0.25/vhdl/disp_tree.adb	2005-10-26 14:31:21.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_tree.adb	2006-11-20 00:36:24.000000000 +0100
@@ -1023,8 +1023,6 @@
             Disp_Depth (Get_Subprogram_Depth (Tree));
             Header ("subprogram_body:");
             Disp_Tree_Flat (Get_Subprogram_Body (Tree), Ntab);
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("attribute_value_chain:");
             Disp_Tree_Flat_Chain (Get_Attribute_Value_Chain (Tree), Ntab);
          when Iir_Kind_Procedure_Body
@@ -1423,8 +1421,6 @@
                Header ("sensivity list:");
                Disp_Tree_List (Get_Sensitivity_List (Tree), Ntab, True);
             end if;
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("declaration_chain:");
             Disp_Tree_Chain (Get_Declaration_Chain (Tree), Ntab);
             Header ("process statements:");
diff -urN ghdl-0.25/vhdl/disp_vhdl.adb ghdl-0.26dev/vhdl/disp_vhdl.adb
--- ghdl-0.25/vhdl/disp_vhdl.adb	2006-07-09 03:55:28.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_vhdl.adb	2006-11-20 00:36:24.000000000 +0100
@@ -893,25 +893,6 @@
       Put_Line (";");
    end Disp_Object_Declaration;
 
-   procedure Disp_Driver_List (List: Iir_Driver_List; Indent : Count)
-   is
-      El: Iir;
-   begin
-      if List = Null_Iir_List or else Get_Nbr_Elements (List) = 0 then
-         return;
-      end if;
-      Set_Col (Indent);
-      Put_Line ("-- drivers needed for signals:");
-      for I in Natural loop
-         El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
-         Set_Col (Indent);
-         Put ("--   ");
-         Disp_Expression (El);
-         New_Line;
-      end loop;
-   end Disp_Driver_List;
-
    procedure Disp_Subprogram_Declaration (Subprg: Iir)
    is
       Indent: Count;
@@ -943,10 +924,6 @@
          when others =>
             raise Internal_Error;
       end case;
-
-      if Get_Kind (Subprg) = Iir_Kind_Procedure_Declaration then
-         Disp_Driver_List (Get_Driver_List (Subprg), Indent);
-      end if;
    end Disp_Subprogram_Declaration;
 
    procedure Disp_Subprogram_Body (Subprg : Iir)
@@ -1517,7 +1494,6 @@
       else
          New_Line;
       end if;
-      Disp_Driver_List (Get_Driver_List (Process), Start + Indentation);
       Disp_Declaration_Chain (Process, Start + Indentation);
       Set_Col (Start);
       Put_Line ("begin");
@@ -2312,10 +2288,10 @@
             Disp_Concurrent_Conditional_Signal_Assignment (An_Iir);
          when Iir_Kinds_Dyadic_Operator =>
             Disp_Dyadic_Operator (An_Iir);
-         when Iir_Kind_Signal_Interface_Declaration =>
+         when Iir_Kind_Signal_Interface_Declaration
+           | Iir_Kind_Signal_Declaration
+           | Iir_Kind_Object_Alias_Declaration =>
             Disp_Name_Of (An_Iir);
-         when Iir_Kind_Signal_Declaration =>
-            Disp_Identifier (An_Iir);
          when Iir_Kind_Enumeration_Literal =>
             Disp_Identifier (An_Iir);
          when Iir_Kind_Component_Instantiation_Statement =>
@@ -2330,8 +2306,11 @@
             Disp_Package_Declaration (An_Iir);
          when Iir_Kind_Wait_Statement =>
             Disp_Wait_Statement (An_Iir);
-         when Iir_Kind_Selected_Name =>
-            Disp_Name (An_Iir);
[...4509 lines suppressed...]
+         end if;
+         return Create_Var_Identifier_From_Buffer (L);
       end Create_Var_Identifier;
 
       function Create_Uniq_Identifier return Var_Ident_Type
@@ -22728,19 +23323,6 @@
          end case;
       end Translate_Succ_Pred_Attribute;
 
-      --  Read the boolean attribute (active or event) FIELD of simple signal
-      --  SIG.
-      function Read_Bool_Signal_Attribute (Sig : O_Enode; Field : O_Fnode)
-                                          return O_Enode
-      is
-         S : O_Enode;
-      begin
-         S := New_Convert_Ov (Sig, Ghdl_Signal_Ptr);
-         return New_Value
-           (New_Selected_Element (New_Access_Element (S), Field));
-         --Ghdl_Signal_Event_Node));
-      end Read_Bool_Signal_Attribute;
-
       type Bool_Sigattr_Data_Type is record
          Label : O_Snode;
          Field : O_Fnode;
@@ -22752,8 +23334,7 @@
          pragma Unreferenced (Targ_Type);
       begin
          Gen_Exit_When (Data.Label,
-                        Read_Bool_Signal_Attribute (New_Value (M2Lv (Targ)),
-                                                    Data.Field));
+                        New_Value (Get_Signal_Field (Targ, Data.Field)));
       end Bool_Sigattr_Non_Composite_Signal;
 
       function Bool_Sigattr_Prepare_Data_Composite
@@ -22819,7 +23400,7 @@
          if Get_Kind (Prefix_Type) in Iir_Kinds_Scalar_Type_Definition then
             --  Effecient handling for a scalar signal.
             Name := Chap6.Translate_Name (Prefix);
-            return Read_Bool_Signal_Attribute (New_Value (M2Lv (Name)), Field);
+            return New_Value (Get_Signal_Field (Name, Field));
          else
             --  Element per element handling for composite signals.
             Res := Create_Temp (Std_Boolean_Type_Node);
@@ -22839,13 +23420,14 @@
 
       function Translate_Event_Attribute (Attr : Iir) return O_Enode is
       begin
-         return Translate_Bool_Signal_Attribute (Attr, Ghdl_Signal_Event_Node);
+         return Translate_Bool_Signal_Attribute
+           (Attr, Ghdl_Signal_Event_Field);
       end Translate_Event_Attribute;
 
       function Translate_Active_Attribute (Attr : Iir) return O_Enode is
       begin
          return Translate_Bool_Signal_Attribute
-           (Attr, Ghdl_Signal_Active_Node);
+           (Attr, Ghdl_Signal_Active_Field);
       end Translate_Active_Attribute;
 
       --  Read signal value FIELD of signal SIG.
@@ -22862,11 +23444,20 @@
            (New_Unchecked_Address (New_Selected_Element (T, Field), S_Type));
       end Get_Signal_Value_Field;
 
+      function Get_Signal_Field (Sig : Mnode; Field : O_Fnode)
+                                return O_Lnode
+      is
+         S : O_Enode;
+      begin
+         S := New_Convert_Ov (New_Value (M2Lv (Sig)), Ghdl_Signal_Ptr);
+         return New_Selected_Element (New_Access_Element (S), Field);
+      end Get_Signal_Field;
+
       function Read_Last_Value (Sig : O_Enode; Sig_Type : Iir) return O_Enode
       is
       begin
          return New_Value (Get_Signal_Value_Field
-                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Node));
+                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Field));
       end Read_Last_Value;
 
       function Translate_Last_Value is new Chap7.Translate_Signal_Value
@@ -27031,39 +27622,53 @@
         (Chararray_Type, New_Unsigned_Literal (Ghdl_Index_Type, 8));
       New_Type_Decl (Get_Identifier ("__ghdl_scalar_bytes"),
                      Ghdl_Scalar_Bytes);
+
+      Ghdl_Signal_Ptr := New_Access_Type (O_Tnode_Null);
+      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+
       --  Type __signal_signal is record
       Start_Record_Type (Rec);
-      New_Record_Field (Rec, Ghdl_Signal_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Value_Field,
                         Get_Identifier ("value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Field,
                         Get_Identifier ("driving_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Field,
                         Get_Identifier ("last_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Field,
                         Get_Identifier ("last_event"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Field,
                         Get_Identifier ("last_active"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Chain_Field,
+                        Get_Identifier ("active_chain"),
+                        Ghdl_Signal_Ptr);
+      New_Record_Field (Rec, Ghdl_Signal_Event_Field,
                         Get_Identifier ("event"),
                         Std_Boolean_Type_Node);
-      New_Record_Field (Rec, Ghdl_Signal_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Field,
                         Get_Identifier ("active"),
                         Std_Boolean_Type_Node);
+      New_Record_Field (Rec, Ghdl_Signal_Has_Active_Field,
+                        Get_Identifier ("has_active"),
+                        Ghdl_Bool_Type);
       Finish_Record_Type (Rec, Ghdl_Signal_Type);
       New_Type_Decl (Get_Identifier ("__ghdl_signal"), Ghdl_Signal_Type);
 
-      Ghdl_Signal_Ptr := New_Access_Type (Ghdl_Signal_Type);
-      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+      Finish_Access_Type (Ghdl_Signal_Ptr, Ghdl_Signal_Type);
 
       Ghdl_Signal_Ptr_Ptr := New_Access_Type (Ghdl_Signal_Ptr);
       New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr_ptr"),
                      Ghdl_Signal_Ptr_Ptr);
 
+      New_Var_Decl (Ghdl_Signal_Active_Chain,
+                    Get_Identifier ("__ghdl_signal_active_chain"),
+                    O_Storage_External,
+                    Ghdl_Signal_Ptr);
+
       --  procedure __ghdl_signal_merge_rti
       --       (sig : ghdl_signal_ptr; rti : ghdl_rti_access)
       Start_Procedure_Decl
@@ -27305,6 +27910,17 @@
       New_Interface_Decl (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
       Finish_Subprogram_Decl (Interfaces, Ghdl_Process_Add_Driver);
 
+      --  procedure __ghdl_signal_direct_driver (sig : __ghdl_signal_ptr;
+      --                                         Drv : Ghdl_Ptr_type);
+      Start_Procedure_Decl
+        (Interfaces, Get_Identifier ("__ghdl_signal_direct_driver"),
+         O_Storage_External);
+      New_Interface_Decl
+        (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
+      New_Interface_Decl
+        (Interfaces, Param, Get_Identifier ("drv"), Ghdl_Ptr_Type);
+      Finish_Subprogram_Decl (Interfaces, Ghdl_Signal_Direct_Driver);
+
       declare
          procedure Create_Signal_Conversion (Name : String; Res : out O_Dnode)
          is
diff -urN ghdl-0.25/vhdl/translation.ads ghdl-0.26dev/vhdl/translation.ads
--- ghdl-0.25/vhdl/translation.ads	2006-08-02 06:13:50.000000000 +0200
+++ ghdl-0.26dev/vhdl/translation.ads	2006-11-20 00:36:15.000000000 +0100
@@ -61,6 +61,21 @@
    --  If set, do not generate code for unused implicit subprograms.
    Flag_Discard_Unused_Implicit : Boolean := False;
 
+   --  If set, dump drivers per process during compilation.
+   Flag_Dump_Drivers : Boolean := False;
+
+   --  If set, try to create direct drivers.
+   Flag_Direct_Drivers : Boolean := True;
+
+   --  If set, checks ranges (subtype ranges).
+   Flag_Range_Checks : Boolean := True;
+
+   --  If set, checks indexes (arrays index and slice).
+   Flag_Index_Checks : Boolean := True;
+
+   --  If set, do not create identifiers (for in memory compilation).
+   Flag_Discard_Identifiers : Boolean := False;
+
    type Foreign_Kind_Type is (Foreign_Unknown,
                               Foreign_Vhpidirect,
                               Foreign_Intrinsic);
diff -urN ghdl-0.25/vhdl/version.ads ghdl-0.26dev/vhdl/version.ads
--- ghdl-0.25/vhdl/version.ads	2006-08-11 05:15:55.000000000 +0200
+++ ghdl-0.26dev/vhdl/version.ads	2006-11-20 00:36:24.000000000 +0100
@@ -1,4 +1,5 @@
 package Version is
-   Ghdl_Version : constant String :=
-      "GHDL 0.25 (20060811) [Sokcho edition]";
+   Ghdl_Release : constant String :=
+      "GHDL 0.26dev (20060819) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.26dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ghdl.spec	5 Oct 2006 23:30:43 -0000	1.26
+++ ghdl.spec	21 Nov 2006 08:06:06 -0000	1.27
@@ -1,6 +1,6 @@
 %define gccver 4.1.1
 %define ghdlver 0.25
-%define ghdlsvnver 73
+%define ghdlsvnver 89
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Mon Nov 20 2006 Thomas Sailer  - 0.25-0.89svn.0
+- update to svn89
+
 * Fri Oct  6 2006 Thomas Sailer  - 0.25-0.73svn.0
 - update to svn73
 


--- ghdl-svn73.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 08:26:56 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 21 Nov 2006 03:26:56 -0500
Subject: rpms/sylpheed/FC-6 .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sylpheed.spec, 1.41, 1.42
Message-ID: <200611210826.kAL8QuVX009293@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9272

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
upstream bug-fix release // use .1 release since tag is used on devel branch because of a non-updated "common" dir ;)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-6/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Sep 2006 08:28:36 -0000	1.22
+++ .cvsignore	21 Nov 2006 08:26:26 -0000	1.23
@@ -1,2 +1,2 @@
-sylpheed-2.2.9.tar.bz2.asc
-sylpheed-2.2.9.tar.bz2
+sylpheed-2.2.10.tar.bz2
+sylpheed-2.2.10.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-6/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Sep 2006 08:28:36 -0000	1.22
+++ sources	21 Nov 2006 08:26:26 -0000	1.23
@@ -1,2 +1,2 @@
-987cc37cfa2ad1116c5c60e4f399be30  sylpheed-2.2.9.tar.bz2.asc
-45e9e89775613b0afb732fbc11c73d26  sylpheed-2.2.9.tar.bz2
+68709cd07d2416c7aaeacf2c6921b1a2  sylpheed-2.2.10.tar.bz2
+ddbaab7d093c35592927a0cd426631ad  sylpheed-2.2.10.tar.bz2.asc


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-6/sylpheed.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sylpheed.spec	2 Oct 2006 19:40:12 -0000	1.41
+++ sylpheed.spec	21 Nov 2006 08:26:26 -0000	1.42
@@ -4,8 +4,8 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.2.9
-Release: 2%{?dist}
+Version: 2.2.10
+Release: 1%{?dist}.1
 License: GPL
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -84,6 +84,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 16 2006 Michael Schwendt  - 2.2.10-1
+- Update to 2.2.10 (recommended bug-fixes only).
+
 * Mon Oct 02 2006 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Nov 21 08:27:46 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 03:27:46 -0500
Subject: rpms/tracker import.log,1.3,1.4
Message-ID: <200611210827.kAL8RkOd009404@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9366

Modified Files:
	import.log 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-6 from tracker-0.5.2-1.src.rpm
Update to 0.5.2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tracker/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Nov 2006 07:43:59 -0000	1.3
+++ import.log	21 Nov 2006 08:27:16 -0000	1.4
@@ -1,2 +1,3 @@
 tracker-0_5_1-1:HEAD:tracker-0.5.1-1.src.rpm:1163088496
 tracker-0_5_2-1:HEAD:tracker-0.5.2-1.src.rpm:1164095041
+tracker-0_5_2-1:FC-6:tracker-0.5.2-1.src.rpm:1164097639



From fedora-extras-commits at redhat.com  Tue Nov 21 08:27:46 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 03:27:46 -0500
Subject: rpms/tracker/FC-6 tracker-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 
	1.3 sources, 1.2, 1.3 tracker.spec, 1.2, 1.3 trackerd.desktop,
	1.1, NONE
Message-ID: <200611210827.kAL8RkG3009409@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9366/FC-6

Modified Files:
	.cvsignore sources tracker.spec 
Added Files:
	tracker-desktop.patch 
Removed Files:
	trackerd.desktop 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-6 from tracker-0.5.2-1.src.rpm
Update to 0.5.2

tracker-desktop.patch:

--- NEW FILE tracker-desktop.patch ---
--- Makefile.am	2006-11-20 23:57:45.000000000 -0500
+++ Makefile.am.new	2006-11-20 23:58:00.000000000 -0500
@@ -1,7 +1,9 @@
 SUBDIRS = data src filters thumbnailers docs po
 
 pkgconfigdir = $(libdir)/pkgconfig
+xdgconfigdir = $(sysconfdir)/xdg/autostart
 pkgconfig_DATA = tracker.pc
+xdgconfig_DATA = trackerd.desktop
 
 debian_files = \
 	debian/changelog \
@@ -34,12 +36,11 @@
 
 EXTRA_DIST = \
 	$(pkgconfig_DATA) \
+	$(xdgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	configure.in \
 	rdf-query-examples/*.rdf \
-	trackerd.desktop \
-	trackerd-kde.desktop \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
--- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
+++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
@@ -8,5 +8,8 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true
--- src/tracker-search-tool/tracker-search-tool.desktop.in	2006-11-20 08:11:41.000000000 -0500
+++ src/tracker-search-tool/tracker-search-tool.desktop.in.new	2006-11-20 20:24:40.000000000 -0500
@@ -6,6 +6,6 @@
 Icon=gnome-searchtool
 Terminal=false
 Type=Application
-Categories=GTK;Application;Utility;
+Categories=GTK;Utility;
 StartupNotify=true
-NoDisplay=true 
+NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 16:08:21 -0000	1.2
+++ .cvsignore	21 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-tracker-0.5.1.tar.gz
+tracker-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 16:08:21 -0000	1.2
+++ sources	21 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz
+1bccb8522668a791366aeb25d43b5da7  tracker-0.5.2.tar.gz


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tracker.spec	9 Nov 2006 16:24:03 -0000	1.2
+++ tracker.spec	21 Nov 2006 08:27:16 -0000	1.3
@@ -1,16 +1,17 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
 Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
-Source1: trackerd.desktop
+Patch0: tracker-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmime-devel, poppler-devel, gettext
 BuildRequires: gnome-desktop-devel, gamin-devel
 BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
+BuildRequires: desktop-file-utils, intltool
 %if "%fedora" >= "6"
 BuildRequires: sqlite-devel
 %else
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .desktop
 
 %build
 %if "%fedora" >= "6"
@@ -59,12 +61,19 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-# Add an autostart for trackerd
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/
+# Add an autostart for trackerd (for KDE)
+mkdir -p %{buildroot}%{_datadir}/autostart
+cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
+
+desktop-file-install --delete-original                   \
+        --vendor="fedora"                           \
+        --dir=%{buildroot}%{_datadir}/applications   \
+        %{buildroot}%{_datadir}/applications/%{name}-search-tool.desktop
 
 rm -rf %{buildroot}%{_libdir}/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -72,7 +81,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
@@ -80,7 +89,9 @@
 %{_bindir}/tracker*
 %{_datadir}/tracker/
 %{_datadir}/pixmaps/tracker/
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/autostart/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/tracker*.1.gz
 %{_sysconfdir}/xdg/autostart/trackerd.desktop
@@ -92,6 +103,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
+- Update to 0.5.2
+
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1
 - Update to new version
 


--- trackerd.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 08:33:32 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 21 Nov 2006 03:33:32 -0500
Subject: rpms/libpng10/devel libpng-1.0.21-soname.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libpng10.spec, 1.4, 1.5 sources, 1.2,
	1.3 libpng-1.0.20-soname.patch, 1.1, NONE
Message-ID: <200611210833.kAL8XWg0009547@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libpng10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9525

Modified Files:
	.cvsignore libpng10.spec sources 
Added Files:
	libpng-1.0.21-soname.patch 
Removed Files:
	libpng-1.0.20-soname.patch 
Log Message:
update to 1.0.21 to address DoS issue (#216263, CVE-2006-5793)
update soname patch


libpng-1.0.21-soname.patch:

--- NEW FILE libpng-1.0.21-soname.patch ---
--- libpng-1.0.21/ltmain.sh	2006-08-01 15:46:17.000000000 +0100
+++ libpng-1.0.21/ltmain.sh	2006-08-01 15:46:52.000000000 +0100
@@ -3270,7 +3270,7 @@
 	esac
 
 	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]|[0-9].[0-9][0-9]) ;;
 	*)
 	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- libpng-1.0.21/Makefile.am	2006-11-15 12:49:56.000000000 +0000
+++ libpng-1.0.21/Makefile.am	2006-11-18 10:50:43.000000000 +0000
@@ -45,7 +45,7 @@
 	-version-number 0:@PNGLIB_MINOR@:0
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_MINOR@:0
+	-version-number 2:1:0. at PNGLIB_MINOR@
 
 if HAVE_LD_VERSION_SCRIPT
   # Versioned symbols and restricted exports
--- libpng-1.0.21/Makefile.in	2006-11-15 12:50:12.000000000 +0000
+++ libpng-1.0.21/Makefile.in	2006-11-18 10:51:25.000000000 +0000
@@ -291,7 +291,7 @@
 	0:@PNGLIB_MINOR@:0 $(am__append_1) $(am__append_2)
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_MINOR@:0
+	-version-number 2:1:0. at PNGLIB_MINOR@
 
 @HAVE_LD_VERSION_SCRIPT_FALSE at libpng10_la_DEPENDENCIES = libpng.sym
 @HAVE_LD_VERSION_SCRIPT_TRUE at libpng10_la_DEPENDENCIES = libpng.vers


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jul 2006 07:21:50 -0000	1.2
+++ .cvsignore	21 Nov 2006 08:33:02 -0000	1.3
@@ -1 +1 @@
-libpng-1.0.20.tar.bz2
+libpng-1.0.21.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpng10.spec	1 Oct 2006 13:54:52 -0000	1.4
+++ libpng10.spec	21 Nov 2006 08:33:02 -0000	1.5
@@ -1,12 +1,12 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.20
-Release:	4%{?dist}
+Version:	1.0.21
+Release:	1%{?dist}
 License:	zlib License
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
-Patch0:		libpng-1.0.20-soname.patch
+Patch0:		libpng-1.0.21-soname.patch
 Patch1:		libpng-1.0.20-pngconf.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
@@ -108,6 +108,10 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Sat Nov 18 2006 Paul Howarth  1.0.21-1
+- update to 1.0.21 to address DoS issue (#216263, CVE-2006-5793)
+- update soname patch
+
 * Sun Oct  1 2006 Paul Howarth  1.0.20-4
 - rebuild with latest toolchain
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jul 2006 07:21:50 -0000	1.2
+++ sources	21 Nov 2006 08:33:02 -0000	1.3
@@ -1 +1 @@
-7c2fb566d3e5e70c8a5eeb719e67f26b  libpng-1.0.20.tar.bz2
+17cca7846f8019acfb8fc1868ea99d2e  libpng-1.0.21.tar.bz2


--- libpng-1.0.20-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 08:50:08 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 03:50:08 -0500
Subject: rpms/tracker/FC-6 tracker-desktop.patch, 1.1, 1.2 tracker.spec, 1.3,
	1.4
Message-ID: <200611210850.kAL8o8mF009685@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9665

Modified Files:
	tracker-desktop.patch tracker.spec 
Log Message:
* Tue Nov 21 2006 Deji Akingunola  - 0.5.2-1
- Patching Makefile.am doesn't work!


tracker-desktop.patch:

Index: tracker-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracker-desktop.patch	21 Nov 2006 08:27:16 -0000	1.1
+++ tracker-desktop.patch	21 Nov 2006 08:49:38 -0000	1.2
@@ -1,16 +1,27 @@
---- Makefile.am	2006-11-20 23:57:45.000000000 -0500
-+++ Makefile.am.new	2006-11-20 23:58:00.000000000 -0500
-@@ -1,7 +1,9 @@
+--- Makefile.in	2006-11-20 13:34:48.000000000 -0500
++++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
+@@ -66,8 +66,9 @@
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
++am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
++xdgconfigDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgconfig_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -299,7 +300,9 @@
+ target_alias = @target_alias@
  SUBDIRS = data src filters thumbnailers docs po
- 
  pkgconfigdir = $(libdir)/pkgconfig
 +xdgconfigdir = $(sysconfdir)/xdg/autostart
  pkgconfig_DATA = tracker.pc
-+xdgconfig_DATA = trackerd.desktop
- 
++xdgconfig_DATA= trackerd.desktop
  debian_files = \
  	debian/changelog \
-@@ -34,12 +36,11 @@
+ 	debian/compat \
+@@ -331,12 +334,11 @@
  
  EXTRA_DIST = \
  	$(pkgconfig_DATA) \
@@ -24,6 +35,54 @@
  	intltool-extract.in \
  	intltool-merge.in \
  	intltool-update.in \
+@@ -422,6 +424,15 @@
+ 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
++install-xdgconfigDATA: $(xdgconfig_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
++	@list='$(xdgconfig_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
++	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
++	done
+ 
+ uninstall-pkgconfigDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -430,6 +441,13 @@
+ 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
++uninstall-xdgconfigDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(xdgconfig_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
++	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -710,7 +728,7 @@
+ all-am: Makefile $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
++	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -758,7 +776,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-pkgconfigDATA
++install-data-am: install-pkgconfigDATA install-xdgconfigDATA
+ 
+ install-exec-am:
+ 
 --- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
 +++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
 @@ -8,5 +8,8 @@


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tracker.spec	21 Nov 2006 08:27:16 -0000	1.3
+++ tracker.spec	21 Nov 2006 08:49:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
@@ -103,7 +103,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
+* Tue Nov 21 2006 Deji Akingunola  - 0.5.2-1
+- Patching Makefile.am doesn't work!
+
+* Mon Nov 20 2006 Deji Akingunola  - 0.5.2-1
 - Update to 0.5.2
 
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1



From fedora-extras-commits at redhat.com  Tue Nov 21 08:51:05 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 21 Nov 2006 03:51:05 -0500
Subject: rpms/libpng10/FC-6 libpng-1.0.21-soname.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libpng10.spec, 1.4, 1.5 sources, 1.2,
	1.3 libpng-1.0.20-soname.patch, 1.1, NONE
Message-ID: <200611210851.kAL8p5Dl009753@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libpng10/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9729

Modified Files:
	.cvsignore libpng10.spec sources 
Added Files:
	libpng-1.0.21-soname.patch 
Removed Files:
	libpng-1.0.20-soname.patch 
Log Message:
resync with devel

libpng-1.0.21-soname.patch:

--- NEW FILE libpng-1.0.21-soname.patch ---
--- libpng-1.0.21/ltmain.sh	2006-08-01 15:46:17.000000000 +0100
+++ libpng-1.0.21/ltmain.sh	2006-08-01 15:46:52.000000000 +0100
@@ -3270,7 +3270,7 @@
 	esac
 
 	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]|[0-9].[0-9][0-9]) ;;
 	*)
 	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- libpng-1.0.21/Makefile.am	2006-11-15 12:49:56.000000000 +0000
+++ libpng-1.0.21/Makefile.am	2006-11-18 10:50:43.000000000 +0000
@@ -45,7 +45,7 @@
 	-version-number 0:@PNGLIB_MINOR@:0
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_MINOR@:0
+	-version-number 2:1:0. at PNGLIB_MINOR@
 
 if HAVE_LD_VERSION_SCRIPT
   # Versioned symbols and restricted exports
--- libpng-1.0.21/Makefile.in	2006-11-15 12:50:12.000000000 +0000
+++ libpng-1.0.21/Makefile.in	2006-11-18 10:51:25.000000000 +0000
@@ -291,7 +291,7 @@
 	0:@PNGLIB_MINOR@:0 $(am__append_1) $(am__append_2)
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_MINOR@:0
+	-version-number 2:1:0. at PNGLIB_MINOR@
 
 @HAVE_LD_VERSION_SCRIPT_FALSE at libpng10_la_DEPENDENCIES = libpng.sym
 @HAVE_LD_VERSION_SCRIPT_TRUE at libpng10_la_DEPENDENCIES = libpng.vers


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpng10/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jul 2006 07:21:50 -0000	1.2
+++ .cvsignore	21 Nov 2006 08:50:35 -0000	1.3
@@ -1 +1 @@
-libpng-1.0.20.tar.bz2
+libpng-1.0.21.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/extras/rpms/libpng10/FC-6/libpng10.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpng10.spec	1 Oct 2006 13:54:52 -0000	1.4
+++ libpng10.spec	21 Nov 2006 08:50:35 -0000	1.5
@@ -1,12 +1,12 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.20
-Release:	4%{?dist}
+Version:	1.0.21
+Release:	1%{?dist}
 License:	zlib License
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
-Patch0:		libpng-1.0.20-soname.patch
+Patch0:		libpng-1.0.21-soname.patch
 Patch1:		libpng-1.0.20-pngconf.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
@@ -108,6 +108,10 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Sat Nov 18 2006 Paul Howarth  1.0.21-1
+- update to 1.0.21 to address DoS issue (#216263, CVE-2006-5793)
+- update soname patch
+
 * Sun Oct  1 2006 Paul Howarth  1.0.20-4
 - rebuild with latest toolchain
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpng10/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jul 2006 07:21:50 -0000	1.2
+++ sources	21 Nov 2006 08:50:35 -0000	1.3
@@ -1 +1 @@
-7c2fb566d3e5e70c8a5eeb719e67f26b  libpng-1.0.20.tar.bz2
+17cca7846f8019acfb8fc1868ea99d2e  libpng-1.0.21.tar.bz2


--- libpng-1.0.20-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 09:01:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 04:01:41 -0500
Subject: rpms/xscreensaver/devel
	xscreensaver-5.01-webcollage-default-nonet.patch, NONE,
	1.1 xscreensaver.spec, 1.33, 1.34
Message-ID: <200611210901.kAL91fYS009892@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9874

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.01-webcollage-default-nonet.patch 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka  - 1:5.01-5
- Require xorg-x11-resutils (#216245)


xscreensaver-5.01-webcollage-default-nonet.patch:

--- NEW FILE xscreensaver-5.01-webcollage-default-nonet.patch ---
--- xscreensaver-5.01/hacks/config/webcollage.xml.nonet	2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.01/hacks/config/webcollage.xml	2006-11-06 04:29:32.000000000 +0900
@@ -20,7 +20,7 @@
 
   
 
-
+  
 
   <_description>
 This program makes collages out of random images pulled off of the
--- xscreensaver-5.01/driver/XScreenSaver.ad.in.nonet	2006-11-06 04:14:04.000000000 +0900
+++ xscreensaver-5.01/driver/XScreenSaver.ad.in	2006-11-06 04:19:38.000000000 +0900
@@ -302,10 +302,12 @@
 				fiberlamp -root				    \n\
 				boxfit -root				    \n\
 				celtic -root				    \n\
-- default-n:			webcollage -root			    \n\
+- default-n:			webcollage -root			      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:  "WebCollage (whacked)"					      \
 				webcollage -root -filter		      \
-				  'vidwhacker -stdin -stdout'		    \n\
+				  'vidwhacker -stdin -stdout'		      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:			vidwhacker -root			    \n\
 									      \
 @GL_KLUDGE@ GL:			gears -root				    \n\


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xscreensaver.spec	29 Sep 2006 14:41:33 -0000	1.33
+++ xscreensaver.spec	21 Nov 2006 09:01:11 -0000	1.34
@@ -2,7 +2,7 @@
 
 %define version       5.01
 %define beta_ver      %{nil}
-%define fedora_rel    3
+%define fedora_rel    5
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -25,6 +25,7 @@
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch8:          xscreensaver-5.00b5-include-directory.patch
+Patch21:         xscreensaver-5.01-webcollage-default-nonet.patch
 Patch114:        xscreensaver-5.01a1-pam-popup-passwindow.patch
 
 %package base
@@ -50,6 +51,7 @@
 BuildRequires:   fedora-release
 Requires:        /etc/pam.d/system-auth
 Requires:        pam > %{pam_ver}
+Requires:        xorg-x11-resutils
 Provides:        xscreensaver = %{epoch}:%{version}-%{release}
 Obsoletes:       xscreensaver
 
@@ -135,6 +137,7 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch8 -p1 -b .include-dir
+%patch21 -p1 -b .nonet
 # don't apply for now
 %if %{allow_non_passwd}
 %patch114 -p1 -b .non-passwd
@@ -272,7 +275,7 @@
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
    --add-category X-Red-Hat-Base                         \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # This function prints a list of things that get installed.
 # It does this by parsing the output of a dummy run of "make install".
@@ -335,7 +338,6 @@
 
 # create desktop entry for gnome-screensaver
 create_desktop(){
-   set +x
    COMMAND=`cat $1 | sed -n -e 's|^.*$|\1|p'`
    ARG=`cat $1 | sed -n -e 's|^.*> $2
    echo "Type=Application" >> $2
    echo "Categories=Screensaver" >> $2
-   set -x
 }
 
 cd $dd
@@ -378,13 +384,12 @@
       desktop=xscreensaver-`basename $file`
       desktop=${desktop%.xml}.desktop
 
-      set -x
+      echo + create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       echo ${SAVERDIR}/$desktop >> $glist
-      set +x
    done
+   set -x
 done
-set -x
 
 # Make sure all files are readable by all, and writable only by owner.
 #
@@ -409,6 +414,12 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Nov 20 2006 Mamoru Tasaka  - 1:5.01-5
+- Require xorg-x11-resutils (#216245)
+
+* Sun Nov  5 2006 Mamoru Tasaka  - 1:5.01-4
+- No net connection by default for webcollage (possibly fix #214095 ?)
+
 * Fri Sep 29 2006 Mamoru Tasaka  - 1:5.01-3
 - Fix the arguments of desktop files (#208560)
 



From fedora-extras-commits at redhat.com  Tue Nov 21 09:06:08 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 04:06:08 -0500
Subject: rpms/xscreensaver/FC-6
	xscreensaver-5.01-webcollage-default-nonet.patch, NONE,
	1.1 xscreensaver.spec, 1.33, 1.34
Message-ID: <200611210906.kAL968ok010452@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10434

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.01-webcollage-default-nonet.patch 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka  - 1:5.01-5
- Require xorg-x11-resutils (#216245)


xscreensaver-5.01-webcollage-default-nonet.patch:

--- NEW FILE xscreensaver-5.01-webcollage-default-nonet.patch ---
--- xscreensaver-5.01/hacks/config/webcollage.xml.nonet	2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.01/hacks/config/webcollage.xml	2006-11-06 04:29:32.000000000 +0900
@@ -20,7 +20,7 @@
 
   
 
-
+  
 
   <_description>
 This program makes collages out of random images pulled off of the
--- xscreensaver-5.01/driver/XScreenSaver.ad.in.nonet	2006-11-06 04:14:04.000000000 +0900
+++ xscreensaver-5.01/driver/XScreenSaver.ad.in	2006-11-06 04:19:38.000000000 +0900
@@ -302,10 +302,12 @@
 				fiberlamp -root				    \n\
 				boxfit -root				    \n\
 				celtic -root				    \n\
-- default-n:			webcollage -root			    \n\
+- default-n:			webcollage -root			      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:  "WebCollage (whacked)"					      \
 				webcollage -root -filter		      \
-				  'vidwhacker -stdin -stdout'		    \n\
+				  'vidwhacker -stdin -stdout'		      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:			vidwhacker -root			    \n\
 									      \
 @GL_KLUDGE@ GL:			gears -root				    \n\


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/FC-6/xscreensaver.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xscreensaver.spec	29 Sep 2006 14:41:33 -0000	1.33
+++ xscreensaver.spec	21 Nov 2006 09:05:38 -0000	1.34
@@ -2,7 +2,7 @@
 
 %define version       5.01
 %define beta_ver      %{nil}
-%define fedora_rel    3
+%define fedora_rel    5
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -25,6 +25,7 @@
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch8:          xscreensaver-5.00b5-include-directory.patch
+Patch21:         xscreensaver-5.01-webcollage-default-nonet.patch
 Patch114:        xscreensaver-5.01a1-pam-popup-passwindow.patch
 
 %package base
@@ -50,6 +51,7 @@
 BuildRequires:   fedora-release
 Requires:        /etc/pam.d/system-auth
 Requires:        pam > %{pam_ver}
+Requires:        xorg-x11-resutils
 Provides:        xscreensaver = %{epoch}:%{version}-%{release}
 Obsoletes:       xscreensaver
 
@@ -135,6 +137,7 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch8 -p1 -b .include-dir
+%patch21 -p1 -b .nonet
 # don't apply for now
 %if %{allow_non_passwd}
 %patch114 -p1 -b .non-passwd
@@ -272,7 +275,7 @@
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
    --add-category X-Red-Hat-Base                         \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # This function prints a list of things that get installed.
 # It does this by parsing the output of a dummy run of "make install".
@@ -335,7 +338,6 @@
 
 # create desktop entry for gnome-screensaver
 create_desktop(){
-   set +x
    COMMAND=`cat $1 | sed -n -e 's|^.*$|\1|p'`
    ARG=`cat $1 | sed -n -e 's|^.*> $2
    echo "Type=Application" >> $2
    echo "Categories=Screensaver" >> $2
-   set -x
 }
 
 cd $dd
@@ -378,13 +384,12 @@
       desktop=xscreensaver-`basename $file`
       desktop=${desktop%.xml}.desktop
 
-      set -x
+      echo + create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       echo ${SAVERDIR}/$desktop >> $glist
-      set +x
    done
+   set -x
 done
-set -x
 
 # Make sure all files are readable by all, and writable only by owner.
 #
@@ -409,6 +414,12 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Nov 20 2006 Mamoru Tasaka  - 1:5.01-5
+- Require xorg-x11-resutils (#216245)
+
+* Sun Nov  5 2006 Mamoru Tasaka  - 1:5.01-4
+- No net connection by default for webcollage (possibly fix #214095 ?)
+
 * Fri Sep 29 2006 Mamoru Tasaka  - 1:5.01-3
 - Fix the arguments of desktop files (#208560)
 



From fedora-extras-commits at redhat.com  Tue Nov 21 09:19:57 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 04:19:57 -0500
Subject: rpms/tracker import.log,1.4,1.5
Message-ID: <200611210919.kAL9Jvpb010581@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10548

Modified Files:
	import.log 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-5 from tracker-0.5.2-1.src.rpm
Update to 0.5.2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tracker/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	21 Nov 2006 08:27:16 -0000	1.4
+++ import.log	21 Nov 2006 09:19:27 -0000	1.5
@@ -1,3 +1,4 @@
 tracker-0_5_1-1:HEAD:tracker-0.5.1-1.src.rpm:1163088496
 tracker-0_5_2-1:HEAD:tracker-0.5.2-1.src.rpm:1164095041
 tracker-0_5_2-1:FC-6:tracker-0.5.2-1.src.rpm:1164097639
+tracker-0_5_2-1:FC-5:tracker-0.5.2-1.src.rpm:1164100770



From fedora-extras-commits at redhat.com  Tue Nov 21 09:19:57 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 04:19:57 -0500
Subject: rpms/tracker/FC-5 tracker-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 
	1.3 sources, 1.2, 1.3 tracker.spec, 1.2, 1.3 trackerd.desktop,
	1.1, NONE
Message-ID: <200611210920.kAL9JvJi010586@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10548/FC-5

Modified Files:
	.cvsignore sources tracker.spec 
Added Files:
	tracker-desktop.patch 
Removed Files:
	trackerd.desktop 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-5 from tracker-0.5.2-1.src.rpm
Update to 0.5.2

tracker-desktop.patch:

--- NEW FILE tracker-desktop.patch ---
--- Makefile.in	2006-11-20 13:34:48.000000000 -0500
+++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
@@ -66,8 +66,9 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+xdgconfigDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgconfig_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -299,7 +300,9 @@
 target_alias = @target_alias@
 SUBDIRS = data src filters thumbnailers docs po
 pkgconfigdir = $(libdir)/pkgconfig
+xdgconfigdir = $(sysconfdir)/xdg/autostart
 pkgconfig_DATA = tracker.pc
+xdgconfig_DATA= trackerd.desktop
 debian_files = \
 	debian/changelog \
 	debian/compat \
@@ -331,12 +334,11 @@
 
 EXTRA_DIST = \
 	$(pkgconfig_DATA) \
+	$(xdgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	configure.in \
 	rdf-query-examples/*.rdf \
-	trackerd.desktop \
-	trackerd-kde.desktop \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
@@ -422,6 +424,15 @@
 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
+install-xdgconfigDATA: $(xdgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
@@ -430,6 +441,13 @@
 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
+uninstall-xdgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -710,7 +728,7 @@
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -758,7 +776,7 @@
 
 info-am:
 
-install-data-am: install-pkgconfigDATA
+install-data-am: install-pkgconfigDATA install-xdgconfigDATA
 
 install-exec-am:
 
--- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
+++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
@@ -8,5 +8,8 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true
--- src/tracker-search-tool/tracker-search-tool.desktop.in	2006-11-20 08:11:41.000000000 -0500
+++ src/tracker-search-tool/tracker-search-tool.desktop.in.new	2006-11-20 20:24:40.000000000 -0500
@@ -6,6 +6,6 @@
 Icon=gnome-searchtool
 Terminal=false
 Type=Application
-Categories=GTK;Application;Utility;
+Categories=GTK;Utility;
 StartupNotify=true
-NoDisplay=true 
+NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 16:08:21 -0000	1.2
+++ .cvsignore	21 Nov 2006 09:19:27 -0000	1.3
@@ -1 +1 @@
-tracker-0.5.1.tar.gz
+tracker-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 16:08:21 -0000	1.2
+++ sources	21 Nov 2006 09:19:27 -0000	1.3
@@ -1 +1 @@
-133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz
+1bccb8522668a791366aeb25d43b5da7  tracker-0.5.2.tar.gz


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-5/tracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tracker.spec	9 Nov 2006 16:24:03 -0000	1.2
+++ tracker.spec	21 Nov 2006 09:19:27 -0000	1.3
@@ -1,16 +1,17 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
 Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
-Source1: trackerd.desktop
+Patch0: tracker-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmime-devel, poppler-devel, gettext
 BuildRequires: gnome-desktop-devel, gamin-devel
 BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
+BuildRequires: desktop-file-utils, intltool
 %if "%fedora" >= "6"
 BuildRequires: sqlite-devel
 %else
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .desktop
 
 %build
 %if "%fedora" >= "6"
@@ -59,12 +61,19 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-# Add an autostart for trackerd
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/
+# Add an autostart for trackerd (for KDE)
+mkdir -p %{buildroot}%{_datadir}/autostart
+cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
+
+desktop-file-install --delete-original                   \
+        --vendor="fedora"                           \
+        --dir=%{buildroot}%{_datadir}/applications   \
+        %{buildroot}%{_datadir}/applications/%{name}-search-tool.desktop
 
 rm -rf %{buildroot}%{_libdir}/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -72,7 +81,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
@@ -80,7 +89,9 @@
 %{_bindir}/tracker*
 %{_datadir}/tracker/
 %{_datadir}/pixmaps/tracker/
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/autostart/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/tracker*.1.gz
 %{_sysconfdir}/xdg/autostart/trackerd.desktop
@@ -92,6 +103,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Nov 21 2006 Deji Akingunola  - 0.5.2-1
+- Update to 0.5.2
+
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1
 - Update to new version
 


--- trackerd.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 09:24:04 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 04:24:04 -0500
Subject: owners owners.list,1.1976,1.1977
Message-ID: <200611210924.kAL9O4ou010714@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10696

Modified Files:
	owners.list 
Log Message:
add mirage


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1976
retrieving revision 1.1977
diff -u -r1.1976 -r1.1977
--- owners.list	21 Nov 2006 06:43:30 -0000	1.1976
+++ owners.list	21 Nov 2006 09:23:34 -0000	1.1977
@@ -1082,6 +1082,7 @@
 Fedora Extras|mimedefang|E-Mail filtering framework using Sendmail's Milter interface|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|mirage|A fast and simple image viewer|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|mirrormagic|Puzzle game where you steer a beam of light using mirrors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|mISDN|Userspace part of Modular ISDN stack|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 09:31:41 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 21 Nov 2006 04:31:41 -0500
Subject: rpms/sylpheed/FC-5 .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 sylpheed.spec, 1.34, 1.35
Message-ID: <200611210931.kAL9VfjD010759@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10739

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
upstream bug-fix release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Sep 2006 00:38:43 -0000	1.20
+++ .cvsignore	21 Nov 2006 09:31:11 -0000	1.21
@@ -1,2 +1,2 @@
-sylpheed-2.2.9.tar.bz2.asc
-sylpheed-2.2.9.tar.bz2
+sylpheed-2.2.10.tar.bz2
+sylpheed-2.2.10.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	25 Sep 2006 00:39:12 -0000	1.20
+++ sources	21 Nov 2006 09:31:11 -0000	1.21
@@ -1,2 +1,2 @@
-987cc37cfa2ad1116c5c60e4f399be30  sylpheed-2.2.9.tar.bz2.asc
-45e9e89775613b0afb732fbc11c73d26  sylpheed-2.2.9.tar.bz2
+68709cd07d2416c7aaeacf2c6921b1a2  sylpheed-2.2.10.tar.bz2
+ddbaab7d093c35592927a0cd426631ad  sylpheed-2.2.10.tar.bz2.asc


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-5/sylpheed.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sylpheed.spec	25 Sep 2006 00:38:43 -0000	1.34
+++ sylpheed.spec	21 Nov 2006 09:31:11 -0000	1.35
@@ -4,7 +4,7 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.2.9
+Version: 2.2.10
 Release: 1%{?dist}
 License: GPL
 URL: http://sylpheed.sraoss.jp/
@@ -84,6 +84,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 16 2006 Michael Schwendt  - 2.2.10-1
+- Update to 2.2.10 (recommended bug-fixes only).
+
 * Sat Sep 23 2006 Michael Schwendt  - 2.2.9-1
 - Update to 2.2.9 (also works around #201949).
 - New upstream URLs.



From fedora-extras-commits at redhat.com  Tue Nov 21 10:06:39 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 21 Nov 2006 05:06:39 -0500
Subject: rpms/glom/devel .cvsignore, 1.5, 1.6 glom.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200611211006.kALA6dVE011260@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11241

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Oct 2006 10:16:43 -0000	1.5
+++ .cvsignore	21 Nov 2006 10:06:09 -0000	1.6
@@ -1 +1 @@
-glom-1.2.0.tar.bz2
+glom-1.2.1.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glom.spec	19 Oct 2006 10:16:43 -0000	1.4
+++ glom.spec	21 Nov 2006 10:06:09 -0000	1.5
@@ -1,5 +1,5 @@
 %define major_version  1.2
-%define minor_version  0
+%define minor_version  1
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Denis Leroy  - 1.2.1-2
+- Update to 1.2.1
+
 * Thu Oct 19 2006 Denis Leroy  - 1.2.0-2
 - Rebuild with correct sources files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Oct 2006 10:16:43 -0000	1.5
+++ sources	21 Nov 2006 10:06:09 -0000	1.6
@@ -1 +1 @@
-690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2
+406c28f1bb4e704c7c4fb56a48893f21  glom-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 10:10:49 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 21 Nov 2006 05:10:49 -0500
Subject: rpms/glom/FC-6 .cvsignore, 1.5, 1.6 glom.spec, 1.4, 1.5 sources, 1.5,
	1.6
Message-ID: <200611211010.kALAAn2a011363@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11342

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Oct 2006 10:16:43 -0000	1.5
+++ .cvsignore	21 Nov 2006 10:10:19 -0000	1.6
@@ -1 +1 @@
-glom-1.2.0.tar.bz2
+glom-1.2.1.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-6/glom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glom.spec	19 Oct 2006 10:16:43 -0000	1.4
+++ glom.spec	21 Nov 2006 10:10:19 -0000	1.5
@@ -1,5 +1,5 @@
 %define major_version  1.2
-%define minor_version  0
+%define minor_version  1
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Denis Leroy  - 1.2.1-2
+- Update to 1.2.1
+
 * Thu Oct 19 2006 Denis Leroy  - 1.2.0-2
 - Rebuild with correct sources files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Oct 2006 10:16:43 -0000	1.5
+++ sources	21 Nov 2006 10:10:19 -0000	1.6
@@ -1 +1 @@
-690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2
+406c28f1bb4e704c7c4fb56a48893f21  glom-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 10:12:46 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 21 Nov 2006 05:12:46 -0500
Subject: rpms/glom/FC-5 .cvsignore, 1.4, 1.5 glom.spec, 1.3, 1.4 sources, 1.4,
	1.5
Message-ID: <200611211012.kALACkMM011440@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Oct 2006 10:21:41 -0000	1.4
+++ .cvsignore	21 Nov 2006 10:12:16 -0000	1.5
@@ -1 +1 @@
-glom-1.2.0.tar.bz2
+glom-1.2.1.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/glom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glom.spec	19 Oct 2006 10:21:41 -0000	1.3
+++ glom.spec	21 Nov 2006 10:12:16 -0000	1.4
@@ -1,5 +1,5 @@
 %define major_version  1.2
-%define minor_version  0
+%define minor_version  1
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Denis Leroy  - 1.2.1-1
+- Update to 1.2.1
+
 * Thu Oct 19 2006 Denis Leroy  - 1.2.0-1
 - Update to 1.2.0
 - Added omf directory


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Oct 2006 10:21:41 -0000	1.4
+++ sources	21 Nov 2006 10:12:16 -0000	1.5
@@ -1 +1 @@
-690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2
+406c28f1bb4e704c7c4fb56a48893f21  glom-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:02 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 05:36:02 -0500
Subject: comps comps-fe5.xml.in, 1.201, 1.202 comps-fe6.xml.in, 1.225,
	1.226 comps-fe7.xml.in, 1.24, 1.25
Message-ID: <200611211036.kALAa2Dj011703@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11627

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add mirage


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- comps-fe5.xml.in	16 Nov 2006 19:30:45 -0000	1.201
+++ comps-fe5.xml.in	21 Nov 2006 10:35:31 -0000	1.202
@@ -569,6 +569,7 @@
       gwenview
       inkscape
       k3d
+      mirage
       pstoedit
       pydot
       qiv


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- comps-fe6.xml.in	16 Nov 2006 19:30:45 -0000	1.225
+++ comps-fe6.xml.in	21 Nov 2006 10:35:31 -0000	1.226
@@ -623,6 +623,7 @@
       inkscape
       ipe
       k3d
+      mirage
       optipng
       pstoedit
       pydot


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- comps-fe7.xml.in	15 Nov 2006 22:03:43 -0000	1.24
+++ comps-fe7.xml.in	21 Nov 2006 10:35:31 -0000	1.25
@@ -623,6 +623,7 @@
       inkscape
       ipe
       k3d
+      mirage
       optipng
       pstoedit
       pydot



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:10 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 21 Nov 2006 05:36:10 -0500
Subject: rpms/stratagus/FC-4 stratagus.spec,1.9,1.10
Message-ID: <200611211036.kALAaAt2011706@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11647/FC-4

Modified Files:
	stratagus.spec 
Log Message:
Fixed bug #216166


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-4/stratagus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- stratagus.spec	16 Nov 2006 20:30:35 -0000	1.9
+++ stratagus.spec	21 Nov 2006 10:35:40 -0000	1.10
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -48,6 +48,7 @@
 %patch2
 %patch3
 %patch4
+sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
 
 %build
 %configure  	--with-x \
@@ -79,6 +80,9 @@
 
 %changelog
 
+* Sat Nov 18 2006 Peter Lemenkov  2.1-11
+- fix for bug #216166 suggested by Hans de Goede
+
 * Thu Nov 16 2006 Peter Lemenkov  2.1-10
 - Applied patches from Hans de Goede
 



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:10 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 21 Nov 2006 05:36:10 -0500
Subject: rpms/stratagus/FC-5 stratagus.spec,1.9,1.10
Message-ID: <200611211036.kALAaAPB011709@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11647/FC-5

Modified Files:
	stratagus.spec 
Log Message:
Fixed bug #216166


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/stratagus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- stratagus.spec	16 Nov 2006 20:30:35 -0000	1.9
+++ stratagus.spec	21 Nov 2006 10:35:40 -0000	1.10
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -48,6 +48,7 @@
 %patch2
 %patch3
 %patch4
+sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
 
 %build
 %configure  	--with-x \
@@ -79,6 +80,9 @@
 
 %changelog
 
+* Sat Nov 18 2006 Peter Lemenkov  2.1-11
+- fix for bug #216166 suggested by Hans de Goede
+
 * Thu Nov 16 2006 Peter Lemenkov  2.1-10
 - Applied patches from Hans de Goede
 



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:16 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 21 Nov 2006 05:36:16 -0500
Subject: rpms/stratagus/devel stratagus.spec,1.12,1.13
Message-ID: <200611211036.kALAaGWW011715@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11647/devel

Modified Files:
	stratagus.spec 
Log Message:
Fixed bug #216166


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stratagus.spec	16 Nov 2006 20:30:42 -0000	1.12
+++ stratagus.spec	21 Nov 2006 10:35:46 -0000	1.13
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -48,6 +48,7 @@
 %patch2
 %patch3
 %patch4
+sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
 
 %build
 %configure  	--with-x \
@@ -79,6 +80,9 @@
 
 %changelog
 
+* Sat Nov 18 2006 Peter Lemenkov  2.1-11
+- fix for bug #216166 suggested by Hans de Goede
+
 * Thu Nov 16 2006 Peter Lemenkov  2.1-10
 - Applied patches from Hans de Goede
 



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:15 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 21 Nov 2006 05:36:15 -0500
Subject: rpms/stratagus/FC-6 stratagus.spec,1.12,1.13
Message-ID: <200611211036.kALAaFFL011712@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11647/FC-6

Modified Files:
	stratagus.spec 
Log Message:
Fixed bug #216166


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-6/stratagus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stratagus.spec	16 Nov 2006 20:30:36 -0000	1.12
+++ stratagus.spec	21 Nov 2006 10:35:45 -0000	1.13
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -48,6 +48,7 @@
 %patch2
 %patch3
 %patch4
+sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
 
 %build
 %configure  	--with-x \
@@ -79,6 +80,9 @@
 
 %changelog
 
+* Sat Nov 18 2006 Peter Lemenkov  2.1-11
+- fix for bug #216166 suggested by Hans de Goede
+
 * Thu Nov 16 2006 Peter Lemenkov  2.1-10
 - Applied patches from Hans de Goede
 



From fedora-extras-commits at redhat.com  Tue Nov 21 11:17:34 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:17:34 -0500
Subject: owners owners.list,1.1977,1.1978
Message-ID: <200611211117.kALBHYfY012119@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098

Modified Files:
	owners.list 
Log Message:
Add myself as the maintainer of libEMF and chemtool.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1977
retrieving revision 1.1978
diff -u -r1.1977 -r1.1978
--- owners.list	21 Nov 2006 09:23:34 -0000	1.1977
+++ owners.list	21 Nov 2006 11:17:04 -0000	1.1978
@@ -188,6 +188,7 @@
 Fedora Extras|cgoban|X board for playing go|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|chemtool|A program for 2D drawing organic molecules|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|chess|3D chess game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|childsplay|Suite of educational games for young children|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|childsplay_plugins|Plugins for childsplay (educational games for young children)|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -865,6 +866,7 @@
 Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|lib765|765 chipset library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|libEMF|A library for generating Enhanced Metafiles|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libapreq2|Apache HTTP request library|bojan at rexursive.com|extras-qa at fedoraproject.org|
 Fedora Extras|libassa|C++ network-oriented application framework|3rdshift at comcast.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 11:18:57 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:18:57 -0500
Subject: owners owners.list,1.1978,1.1979
Message-ID: <200611211118.kALBIvtF012275@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12183

Modified Files:
	owners.list 
Log Message:
Sort into proper position.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1978
retrieving revision 1.1979
diff -u -r1.1978 -r1.1979
--- owners.list	21 Nov 2006 11:17:04 -0000	1.1978
+++ owners.list	21 Nov 2006 11:18:27 -0000	1.1979
@@ -866,7 +866,6 @@
 Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|lib765|765 chipset library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|libEMF|A library for generating Enhanced Metafiles|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libapreq2|Apache HTTP request library|bojan at rexursive.com|extras-qa at fedoraproject.org|
 Fedora Extras|libassa|C++ network-oriented application framework|3rdshift at comcast.net|extras-qa at fedoraproject.org|
@@ -888,6 +887,7 @@
 Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libebml|The Extensible Binary Meta Language library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libedit|The NetBSD Editline library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|libEMF|A library for generating Enhanced Metafiles|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|libetpan|Portable, efficient middleware for different kinds of mail access|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 11:20:49 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:20:49 -0500
Subject: rpms/chemtool - New directory
Message-ID: <200611211120.kALBKncB012510@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12505/chemtool

Log Message:
Directory /cvs/extras/rpms/chemtool added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 11:20:54 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:20:54 -0500
Subject: rpms/chemtool/devel - New directory
Message-ID: <200611211120.kALBKsQd012530@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12505/chemtool/devel

Log Message:
Directory /cvs/extras/rpms/chemtool/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 11:21:12 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:21:12 -0500
Subject: rpms/chemtool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211121.kALBLCn1012585@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12578

Added Files:
	Makefile import.log 
Log Message:
Setup of module chemtool


--- NEW FILE Makefile ---
# Top level Makefile for module chemtool
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  Tue Nov 21 11:21:17 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:21:17 -0500
Subject: rpms/chemtool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211121.kALBLHR8012605@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12578/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module chemtool


--- 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 Nov 21 11:25:43 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:25:43 -0500
Subject: rpms/chemtool import.log,1.1,1.2
Message-ID: <200611211125.kALBPhNl013044@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13006

Modified Files:
	import.log 
Log Message:
auto-import chemtool-1.6.9-5 on branch devel from chemtool-1.6.9-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/chemtool/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 11:21:12 -0000	1.1
+++ import.log	21 Nov 2006 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+chemtool-1_6_9-5:HEAD:chemtool-1.6.9-5.src.rpm:1164108369



From fedora-extras-commits at redhat.com  Tue Nov 21 11:25:44 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:25:44 -0500
Subject: rpms/chemtool/devel chemtool-compile.patch, NONE,
	1.1 chemtool-desktop.patch, NONE, 1.1 chemtool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211125.kALBPiYW013048@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13006/devel

Modified Files:
	.cvsignore sources 
Added Files:
	chemtool-compile.patch chemtool-desktop.patch chemtool.spec 
Log Message:
auto-import chemtool-1.6.9-5 on branch devel from chemtool-1.6.9-5.src.rpm

chemtool-compile.patch:

--- NEW FILE chemtool-compile.patch ---
--- chemtool-1.6.9/src-cht/cht-2.5.c.compile	2006-01-23 21:05:41.000000000 +0100
+++ chemtool-1.6.9/src-cht/cht-2.5.c	2006-11-19 01:11:59.000000000 +0100
@@ -121,11 +121,6 @@
 #define LACK_MEMMOVE
 #define LACK_MEMCPY
 
-#else
-
-#define LACK_LABS       /* Undefine these if your library has these */
-#define LACK_MEMMOVE
-
 #endif
 #endif
 
@@ -593,13 +588,15 @@
 
 /* In case your system lacks these... */
 
+#ifdef LACK_LABS
 long my_labs(x)
 long x;
 {
     return((x > 0) ? x : -x);
 }
+#endif /* LACK_LABS */
 
-
+#ifdef LACK_MEMMOVE
 #ifdef __STDC__
 Anyptr my_memmove(Anyptr d, Const Anyptr s, size_t n)
 #else
@@ -623,8 +620,9 @@
     }
     return d;
 }
+#endif /* LACK_MEMMOVE */
 
-
+#ifdef LACK_MEMCPY
 #ifdef __STDC__
 Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n)
 #else
@@ -638,7 +636,9 @@
 	*dd++ = *ss++;
     return d;
 }
+#endif /* LACK_MEMCPY */
 
+#ifdef LACK_MEMCMP
 #ifdef __STDC__
 int my_memcmp(Const Anyptr s1, Const Anyptr s2, size_t n)
 #else
@@ -654,7 +654,9 @@
 	    return i;
     return 0;
 }
+#endif /* LACK_MEMCMP */
 
+#ifdef LACK_MEMSET
 #ifdef __STDC__
 Anyptr my_memset(Anyptr d, int c, size_t n)
 #else
@@ -669,7 +671,7 @@
 	*dd++ = c;
     return d;
 }
-
+#endif /* LACK_MEMSET */
 
 int my_toupper(c)
 int c;
--- chemtool-1.6.9/inout.c.compile	2006-02-27 22:36:58.000000000 +0100
+++ chemtool-1.6.9/inout.c	2006-11-19 01:16:12.000000000 +0100
@@ -13,7 +13,7 @@
 #include "gdk/gdkprivate.h"
 #include 
 #ifdef EMF
-#include 
+#include 
 #endif
 
 #ifdef GTK2

chemtool-desktop.patch:

--- NEW FILE chemtool-desktop.patch ---
--- chemtool-1.6.9/pld/chemtool.desktop.d	2006-01-23 21:05:41.000000000 +0100
+++ chemtool-1.6.9/pld/chemtool.desktop	2006-11-19 01:35:05.000000000 +0100
@@ -1,15 +1,14 @@
 [Desktop Entry]
 Name=Chemtool
 Comment=Molecules 2D drawing program
-Name[cs_CZ.ISO8859-2]=Chemtool
-Comment[cs_CZ.ISO8859-2]=Editor molekul
-Comment[de_DE.ISO8859-1]=Molek?leditor
-Comment[pl_PL.ISO8859-2]=Edytor molek??
+Comment[cs]=Editor molekul
+Comment[de]=Molek??leditor
+Comment[pl]=Edytor moleku??
 Exec=chemtool
 Icon=chemtool.xpm
 Terminal=false
-MultipleArgs=false
+Encoding=UTF-8
 Type=Application
 MimeType=application/x-chemtool;Application
-InitialPreference=2
+X-InitialPreference=2
 


--- NEW FILE chemtool.spec ---
Summary: A program for 2D drawing organic molecules
Name: chemtool
Version: 1.6.9
Release: 5%{?dist}
License: GPL
Group: Applications/Editors
Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
Patch0: %{name}-compile.patch
Patch1: %{name}-desktop.patch
URL: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: libEMF-devel
BuildRequires: libXt-devel
BuildRequires: gnome-mime-data
BuildRequires: kdelibs
Requires: openbabel
Requires: transfig

%description
Chemtool is a program for drawing organic molecules easily and store them
in a variety of output formats including as a X bitmap, Xfig, SVG or EPS
file.  It runs under the X Window System using the GTK widget set.

%prep
%setup -q
%patch0 -p1 -b .compile
%patch1 -p1 -b .d

%build
%configure \
  --enable-emf \
  --with-kdedir=%{_prefix} \
  --with-gnomedir=%{_prefix}
%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_datadir}/{applications,mimelnk/application,mime-info,mime-types,pixmaps} \
        $RPM_BUILD_ROOT{%{_datadir}/icons/hicolor/{32x32/mimetypes,48x48/apps}}

# fix line endings
pushd examples
tr -d '\r' < 14263232.mol > 14263232.mol.unix && mv -f 14263232.mol.unix 14263232.mol
tr -d '\r' < sample.sdf > sample.sdf.unix && mv -f sample.sdf.unix sample.sdf
popd

%{__make} DESTDIR=$RPM_BUILD_ROOT install

install -p kde/mimelnk/application/x-chemtool.desktop     $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
install -p kde/icons/hicolor/32x32/mimetypes/chemtool.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/mimetypes
desktop-file-install --vendor=fedora \
                     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
                     --add-category=Education \
                     --add-category=Science \
                     --add-category=Chemistry \
                     pld/chemtool.desktop
install -p gnome/gnome-application-chemtool.png           $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/chemtool.png
install -p chemtool.xpm                                   $RPM_BUILD_ROOT%{_datadir}/pixmaps

%{__rm} $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/chemtool.desktop
%{__rm} $RPM_BUILD_ROOT%{_datadir}/pixmaps/mc/gnome-application-chemtool.png

%find_lang %{name}

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/update-desktop-database &> /dev/null ||:

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/update-desktop-database &> /dev/null ||:

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog README TODO examples
%attr(755,root,root) %{_bindir}/*
%{_datadir}/mimelnk/application/*
%{_datadir}/mime-types/chemtool.*
%{_datadir}/pixmaps/*.xpm
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*

%changelog
* Mon Nov 20 2006 Dominik 'Rathann' Mierzejewski  1.6.9-5
- keep the whole examples dir in docs
- add update-desktop-database call to post{,un} scripts

* Mon Nov 20 2006 Dominik 'Rathann' Mierzejewski  1.6.9-4
- fix build without mock

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.6.9-3
- added missing BRs
- add scriptlets to update icon cache

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.6.9-2
- don't use non-standard macros

* Fri Nov 17 2006 Dominik 'Rathann' Mierzejewski  1.6.9-1
- initial build, based on bioxray.dk and PLD specfiles


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chemtool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 11:21:17 -0000	1.1
+++ .cvsignore	21 Nov 2006 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+chemtool-1.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chemtool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 11:21:17 -0000	1.1
+++ sources	21 Nov 2006 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+d13b16c019a9912cf0c3de07ca5bcd29  chemtool-1.6.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 11:55:53 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 21 Nov 2006 06:55:53 -0500
Subject: rpms/proftpd/devel proftpd-1.3.0-cmdbufsize.patch, 1.1,
	1.2 proftpd.spec, 1.22, 1.23
Message-ID: <200611211155.kALBtrZj013305@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13285

Modified Files:
	proftpd-1.3.0-cmdbufsize.patch proftpd.spec 
Log Message:
Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).


proftpd-1.3.0-cmdbufsize.patch:

Index: proftpd-1.3.0-cmdbufsize.patch
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd-1.3.0-cmdbufsize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proftpd-1.3.0-cmdbufsize.patch	13 Nov 2006 18:10:35 -0000	1.1
+++ proftpd-1.3.0-cmdbufsize.patch	21 Nov 2006 11:55:23 -0000	1.2
@@ -1,6 +1,6 @@
---- src/main.c	2006/09/29 16:38:16	1.292
-+++ src/main.c	2006/10/31 22:49:03	1.293
-@@ -116,6 +116,8 @@ static unsigned char have_dead_child = F
+--- proftpd-1.3.0/src/main.c.cmdbufsize	2006-03-15 19:41:01.000000000 +0000
++++ proftpd-1.3.0/src/main.c	2006-11-17 16:53:35.000000000 +0000
+@@ -116,6 +116,8 @@
  
  static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
  
@@ -9,28 +9,27 @@
  static char **Argv = NULL;
  static char *LastArgv = NULL;
  static const char *PidPath = PR_PID_FILE_PATH;
-@@ -832,16 +834,25 @@
-       pr_timer_reset(TIMER_IDLE, NULL);
- 
-     if (cmd_buf_size == -1) {
--      long *buf_size = get_param_ptr(main_server->conf,
--        "CommandBufferSize", FALSE);
-+      int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize",
-+        FALSE);
+@@ -823,13 +825,26 @@
+       long *buf_size = get_param_ptr(main_server->conf,
+         "CommandBufferSize", FALSE);
  
 -      if (buf_size == NULL || *buf_size <= 0)
 -        cmd_buf_size = 512;
-+      if (bufsz == NULL ||
-+          *bufsz <= 0) {
-+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++      if (buf_size == NULL) {
++        pr_log_debug(DEBUG1, "no CommandBufferSize size given, "
++          "using default buffer size (%u)", (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
++
++      } else if (*buf_size <= 0) {
++	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
 +          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
 +        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 +
-+      } else if (*bufsz + 1 > sizeof(buf)) {
-+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++      } else if (*buf_size + 1 > sizeof(buf)) {
++	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
 +          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
 +	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
  
 -      else if (*buf_size + 1 > sizeof(buf)) {
@@ -38,8 +37,8 @@
 -          "Resetting to 512.");
 -	cmd_buf_size = 512;
 +      } else {
-+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
-+        cmd_buf_size = (long) *bufsz;
++        pr_log_debug(DEBUG1, "setting CommandBufferSize to %ld", *buf_size);
++        cmd_buf_size = (long) *buf_size;
        }
      }
  


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- proftpd.spec	16 Nov 2006 11:02:41 -0000	1.22
+++ proftpd.spec	21 Nov 2006 11:55:23 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Matthias Saou  1.3.0-10
+- Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
+
 * Thu Nov 16 2006 Matthias Saou  1.3.0-9
 - Include mod_tls patch (#214820 too).
 



From fedora-extras-commits at redhat.com  Tue Nov 21 12:36:02 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 07:36:02 -0500
Subject: rpms/sysprof/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof.spec, 1.4, 1.5
Message-ID: <200611211236.kALCa2ut013588@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13557

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
Version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 10:10:51 -0000	1.3
+++ .cvsignore	21 Nov 2006 12:35:32 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 10:10:51 -0000	1.3
+++ sources	21 Nov 2006 12:35:32 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/sysprof.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof.spec	2 Nov 2006 10:10:51 -0000	1.4
+++ sysprof.spec	21 Nov 2006 12:35:32 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           sysprof      
-Version:        1.0.5
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
@@ -61,6 +61,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Thu Nov  2 2006 Gianluca Sforna  1.0.5-1
 - version update
 



From fedora-extras-commits at redhat.com  Tue Nov 21 12:37:14 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 07:37:14 -0500
Subject: rpms/sysprof-kmod/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof-kmod.spec, 1.11, 1.12
Message-ID: <200611211237.kALCbEql013613@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-serv13594

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Log Message:
version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 10:08:14 -0000	1.3
+++ .cvsignore	21 Nov 2006 12:36:44 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 10:08:14 -0000	1.3
+++ sources	21 Nov 2006 12:36:44 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sysprof-kmod.spec	12 Nov 2006 23:07:52 -0000	1.11
+++ sysprof-kmod.spec	21 Nov 2006 12:36:44 -0000	1.12
@@ -29,7 +29,7 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.5
+Version:        1.0.7
 Release:        1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Mon Nov 13 2006 Gianluca Sforna 
 - rebuild for kernel 2.6.18-1.2849
 



From fedora-extras-commits at redhat.com  Tue Nov 21 13:04:53 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 08:04:53 -0500
Subject: rpms/sysprof-kmod/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof-kmod.spec, 1.10, 1.11
Message-ID: <200611211304.kALD4rFI013928@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13869

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Log Message:
Version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Nov 2006 22:52:55 -0000	1.3
+++ .cvsignore	21 Nov 2006 13:04:23 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2006 22:52:55 -0000	1.3
+++ sources	21 Nov 2006 13:04:23 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sysprof-kmod.spec	1 Nov 2006 22:52:55 -0000	1.10
+++ sysprof-kmod.spec	21 Nov 2006 13:04:23 -0000	1.11
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2849.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"
 
@@ -29,8 +29,8 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.5
-Release:        1.%(echo %{kverrel} | tr - _)
+Version:        1.0.7
+Release:        1.1%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -103,6 +103,10 @@
 
 
 %changelog
+* Sun Nov 19 2006 Gianluca Sforna  1.0.7-1.1
+- version update
+- use Release 1.1 to be sure EVR in devel is newer than FC6
+
 * Wed Nov  1 2006 Gianluca Sforna  1.0.5-1
 - version update
 - drop upstreamed patch



From fedora-extras-commits at redhat.com  Tue Nov 21 13:08:09 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 08:08:09 -0500
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.11,1.12
Message-ID: <200611211308.kALD89br014000@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13968

Modified Files:
	sysprof-kmod.spec 
Log Message:
dot missing in Version tag



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sysprof-kmod.spec	21 Nov 2006 13:04:23 -0000	1.11
+++ sysprof-kmod.spec	21 Nov 2006 13:07:39 -0000	1.12
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.7
-Release:        1.1%(echo %{kverrel} | tr - _)
+Release:        1.1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel



From fedora-extras-commits at redhat.com  Tue Nov 21 13:09:18 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 08:09:18 -0500
Subject: rpms/sysprof/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof.spec, 1.4, 1.5
Message-ID: <200611211309.kALD9IkK014080@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14049

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Nov 2006 22:40:59 -0000	1.3
+++ .cvsignore	21 Nov 2006 13:08:48 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2006 22:40:59 -0000	1.3
+++ sources	21 Nov 2006 13:08:48 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof.spec	1 Nov 2006 22:40:59 -0000	1.4
+++ sysprof.spec	21 Nov 2006 13:08:48 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           sysprof      
-Version:        1.0.5
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
@@ -61,6 +61,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Wed Nov  1 2006 Gianluca Sforna  1.0.5-1
 - version update
 



From fedora-extras-commits at redhat.com  Tue Nov 21 13:18:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 21 Nov 2006 08:18:34 -0500
Subject: rpms/gnupg2/devel gnupg-1.9.91-dearmor.patch,1.1,NONE
Message-ID: <200611211318.kALDIYsP014226@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14221

Removed Files:
	gnupg-1.9.91-dearmor.patch 
Log Message:
drop deprecated patch



--- gnupg-1.9.91-dearmor.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 13:18:54 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 21 Nov 2006 08:18:54 -0500
Subject: rpms/proftpd/devel proftpd.spec,1.23,1.24
Message-ID: <200611211318.kALDIsUZ014237@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14200

Modified Files:
	proftpd.spec 
Log Message:
Fix patch level.



Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- proftpd.spec	21 Nov 2006 11:55:23 -0000	1.23
+++ proftpd.spec	21 Nov 2006 13:18:24 -0000	1.24
@@ -68,7 +68,7 @@
 %setup
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
-%patch2 -p0 -b .cmdbufsize
+%patch2 -p1 -b .cmdbufsize
 %patch3 -p0 -b .mod_tls
 
 



From fedora-extras-commits at redhat.com  Tue Nov 21 13:30:22 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 21 Nov 2006 08:30:22 -0500
Subject: rpms/gnome-translate/FC-5 gnome-translate.spec,1.8,1.9
Message-ID: <200611211330.kALDUMpM014333@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14316

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/FC-5/gnome-translate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-translate.spec	14 Aug 2006 16:59:04 -0000	1.8
+++ gnome-translate.spec	21 Nov 2006 13:29:52 -0000	1.9
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 8%{?dist}
+Release: 11%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -14,9 +14,6 @@
 Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
 BuildRequires: eel2-devel >= 2.13.0, libtranslate-devel, aspell-devel
-%if "%{?dist}" == ".fc5"
-BuildRequires: gnome-keyring-devel
-%endif
 
 BuildRequires: desktop-file-utils >= 0.2.90
 BuildRequires: startup-notification-devel >= 0.5
@@ -60,7 +57,6 @@
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   --add-category X-Fedora                                   \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
@@ -124,11 +120,20 @@
 
 
 %changelog
-* Mon Aug 14 2006 Dmitry Butskoy  - 0.99-8
+* Tue Nov 21 2006 Dmitry Butskoy  - 0.99-11
+- Don't set "ShowOnlyIn=Gnome" flag, it is not needed.
+
+* Fri Sep  1 2006 Dmitry Butskoy  - 0.99-10
+- rebuild for FC6
+
+* Mon Aug 14 2006 Dmitry Butskoy  - 0.99-9
 - add patch to properly restore selected languages from
   the previous invocation (required for recent gtk2 libraries)
 - drop killall -HUP in scripts -- no more needed.
 
+* Sun Jul 16 2006 Dmitry Butskoy  - 0.99-8
+- rebuild for new libgail
+
 * Tue Apr 11 2006 Dmitry Butskoy  - 0.99-7
 - use "export-dynamic" for the linker, as it is recommended
   by upstream (Solves #188491)



From fedora-extras-commits at redhat.com  Tue Nov 21 13:44:22 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 08:44:22 -0500
Subject: rpms/quodlibet/devel .cvsignore, 1.2, 1.3 dl-quodlibet-plugins.sh,
	1.1, 1.2 quodlibet.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611211344.kALDiMBk014591@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14570

Modified Files:
	.cvsignore dl-quodlibet-plugins.sh quodlibet.spec sources 
Log Message:
Update to 0.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 14:48:13 -0000	1.2
+++ .cvsignore	21 Nov 2006 13:43:52 -0000	1.3
@@ -1,2 +1,2 @@
-quodlibet-0.23.1.tar.gz
+quodlibet-0.24.tar.gz
 quodlibet-plugins.tar.bz2


Index: dl-quodlibet-plugins.sh
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/dl-quodlibet-plugins.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dl-quodlibet-plugins.sh	7 Oct 2006 14:48:13 -0000	1.1
+++ dl-quodlibet-plugins.sh	21 Nov 2006 13:43:52 -0000	1.2
@@ -15,7 +15,7 @@
 #
 # download plugins from Quod Libet SVN
 #
-plugin_revision=3702
+plugin_revision=3905
 plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"
 
 svn -q export -r$plugin_revision $plugin_url


Index: quodlibet.spec
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/quodlibet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quodlibet.spec	7 Oct 2006 14:48:13 -0000	1.1
+++ quodlibet.spec	21 Nov 2006 13:43:52 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           quodlibet
-Version:        0.23.1
+Version:        0.24
 Release:        1%{?dist}
 Summary:        A music management program
 
@@ -27,7 +27,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 
-Requires:       python-mutagen >= 1.5
+Requires:       python-mutagen >= 1.8
 Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.8
 Requires:       gstreamer-python >= 0.10
@@ -122,6 +122,9 @@
 %{_mandir}/man1/quodlibet.1*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.24-1
+- Update to 0.24
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 0.23.1-1
 - Update to 0.23.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 14:48:13 -0000	1.2
+++ sources	21 Nov 2006 13:43:52 -0000	1.3
@@ -1,2 +1,2 @@
-8b9d4f4dc0850b48cfe9b4b390722ef4  quodlibet-0.23.1.tar.gz
-4defba03c3f4b5f12b4c35331f4409fc  quodlibet-plugins.tar.bz2
+39718994ee234d0c442d9db330d7445a  quodlibet-0.24.tar.gz
+79a9aa92622d11f7ae00cbb83ba5232c  quodlibet-plugins.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 13:45:38 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 08:45:38 -0500
Subject: rpms/quodlibet/FC-6 .cvsignore, 1.2, 1.3 dl-quodlibet-plugins.sh,
	1.1, 1.2 quodlibet.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611211345.kALDjclV014659@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14637

Modified Files:
	.cvsignore dl-quodlibet-plugins.sh quodlibet.spec sources 
Log Message:
Update to 0.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 14:48:13 -0000	1.2
+++ .cvsignore	21 Nov 2006 13:45:08 -0000	1.3
@@ -1,2 +1,2 @@
-quodlibet-0.23.1.tar.gz
+quodlibet-0.24.tar.gz
 quodlibet-plugins.tar.bz2


Index: dl-quodlibet-plugins.sh
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-6/dl-quodlibet-plugins.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dl-quodlibet-plugins.sh	7 Oct 2006 14:48:13 -0000	1.1
+++ dl-quodlibet-plugins.sh	21 Nov 2006 13:45:08 -0000	1.2
@@ -15,7 +15,7 @@
 #
 # download plugins from Quod Libet SVN
 #
-plugin_revision=3702
+plugin_revision=3905
 plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"
 
 svn -q export -r$plugin_revision $plugin_url


Index: quodlibet.spec
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-6/quodlibet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quodlibet.spec	7 Oct 2006 14:48:13 -0000	1.1
+++ quodlibet.spec	21 Nov 2006 13:45:08 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           quodlibet
-Version:        0.23.1
+Version:        0.24
 Release:        1%{?dist}
 Summary:        A music management program
 
@@ -27,7 +27,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 
-Requires:       python-mutagen >= 1.5
+Requires:       python-mutagen >= 1.8
 Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.8
 Requires:       gstreamer-python >= 0.10
@@ -122,6 +122,9 @@
 %{_mandir}/man1/quodlibet.1*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.24-1
+- Update to 0.24
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 0.23.1-1
 - Update to 0.23.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 14:48:13 -0000	1.2
+++ sources	21 Nov 2006 13:45:08 -0000	1.3
@@ -1,2 +1,2 @@
-8b9d4f4dc0850b48cfe9b4b390722ef4  quodlibet-0.23.1.tar.gz
-4defba03c3f4b5f12b4c35331f4409fc  quodlibet-plugins.tar.bz2
+39718994ee234d0c442d9db330d7445a  quodlibet-0.24.tar.gz
+79a9aa92622d11f7ae00cbb83ba5232c  quodlibet-plugins.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 13:46:34 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 08:46:34 -0500
Subject: rpms/quodlibet/FC-5 .cvsignore, 1.2, 1.3 dl-quodlibet-plugins.sh,
	1.1, 1.2 quodlibet.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611211346.kALDkYUI014724@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14703

Modified Files:
	.cvsignore dl-quodlibet-plugins.sh quodlibet.spec sources 
Log Message:
Update to 0.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 14:48:13 -0000	1.2
+++ .cvsignore	21 Nov 2006 13:46:04 -0000	1.3
@@ -1,2 +1,2 @@
-quodlibet-0.23.1.tar.gz
+quodlibet-0.24.tar.gz
 quodlibet-plugins.tar.bz2


Index: dl-quodlibet-plugins.sh
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-5/dl-quodlibet-plugins.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dl-quodlibet-plugins.sh	7 Oct 2006 14:48:13 -0000	1.1
+++ dl-quodlibet-plugins.sh	21 Nov 2006 13:46:04 -0000	1.2
@@ -15,7 +15,7 @@
 #
 # download plugins from Quod Libet SVN
 #
-plugin_revision=3702
+plugin_revision=3905
 plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"
 
 svn -q export -r$plugin_revision $plugin_url


Index: quodlibet.spec
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-5/quodlibet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quodlibet.spec	7 Oct 2006 14:48:13 -0000	1.1
+++ quodlibet.spec	21 Nov 2006 13:46:04 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           quodlibet
-Version:        0.23.1
+Version:        0.24
 Release:        1%{?dist}
 Summary:        A music management program
 
@@ -27,7 +27,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 
-Requires:       python-mutagen >= 1.5
+Requires:       python-mutagen >= 1.8
 Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.8
 Requires:       gstreamer-python >= 0.10
@@ -122,6 +122,9 @@
 %{_mandir}/man1/quodlibet.1*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.24-1
+- Update to 0.24
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 0.23.1-1
 - Update to 0.23.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 14:48:13 -0000	1.2
+++ sources	21 Nov 2006 13:46:04 -0000	1.3
@@ -1,2 +1,2 @@
-8b9d4f4dc0850b48cfe9b4b390722ef4  quodlibet-0.23.1.tar.gz
-4defba03c3f4b5f12b4c35331f4409fc  quodlibet-plugins.tar.bz2
+39718994ee234d0c442d9db330d7445a  quodlibet-0.24.tar.gz
+79a9aa92622d11f7ae00cbb83ba5232c  quodlibet-plugins.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 14:18:01 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:18:01 -0500
Subject: rpms/php-pear-DB-DataObject/devel - New directory
Message-ID: <200611211418.kALEI1JZ015010@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14993/php-pear-DB-DataObject/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-DataObject/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:17:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:17:56 -0500
Subject: rpms/php-pear-DB-DataObject - New directory
Message-ID: <200611211417.kALEHu4G014997@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14993/php-pear-DB-DataObject

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-DataObject added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:18:12 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:18:12 -0500
Subject: rpms/php-pear-DB-DataObject Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211418.kALEIChK015041@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15035

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-DB-DataObject


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-DB-DataObject
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  Tue Nov 21 14:18:17 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:18:17 -0500
Subject: rpms/php-pear-DB-DataObject/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611211418.kALEIHTe015056@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15035/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-DB-DataObject


--- 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 Nov 21 14:19:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:19:05 -0500
Subject: rpms/php-pear-DB-DataObject import.log,1.1,1.2
Message-ID: <200611211419.kALEJ5Bk015159@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15095

Modified Files:
	import.log 
Log Message:
auto-import php-pear-DB-DataObject-1.8.4-2 on branch devel from php-pear-DB-DataObject-1.8.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 14:18:12 -0000	1.1
+++ import.log	21 Nov 2006 14:18:35 -0000	1.2
@@ -0,0 +1 @@
+php-pear-DB-DataObject-1_8_4-2:HEAD:php-pear-DB-DataObject-1.8.4-2.src.rpm:1164118722



From fedora-extras-commits at redhat.com  Tue Nov 21 14:19:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:19:05 -0500
Subject: rpms/php-pear-DB-DataObject/devel php-pear-DB-DataObject.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211419.kALEJ5vG015163@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15095/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-DB-DataObject.spec 
Log Message:
auto-import php-pear-DB-DataObject-1.8.4-2 on branch devel from php-pear-DB-DataObject-1.8.4-2.src.rpm


--- NEW FILE php-pear-DB-DataObject.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name DB_DataObject

Name:           php-pear-DB-DataObject
Version:        1.8.4
Release:        2%{?dist}
Summary:        An SQL Builder, Object Interface to Database Tables

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/DB_DataObject
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR)
Requires:       php-pear(DB) >= 1.7.0 php-pear(Date) >= 1.4.3
Requires(hint): php-pear(MDB2) >= 2.0.0 php-pear(Validate) >= 0.1.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
DataObject performs 2 tasks:
1. Builds SQL statements based on the objects vars and the builder methods.
2. acts as a datastore for a table row.

The core class is designed to be extended for each of your tables so that you
put the data logic inside the data classes. Included is a Generator to make
your configuration files and your base classes.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

# Move createTables script to %{bindir}
mv $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/createTables.php $RPM_BUILD_ROOT%{_bindir}
chmod +x $RPM_BUILD_ROOT%{_bindir}/createTables.php
ln -s ../../../../..%{_bindir}/createTables.php $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
%{_bindir}/createTables.php
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/DB/DataObject*
%exclude %{_bindir}/DB/scripts/DB_DataObject_createTables.bat


%changelog
* Fri Nov 17 2006 Christohper Stone  1.8.4-2
- Fix version number in %%changelog
- Add versioned Requires
- Move createTables script to %%{_bindir}

* Sun Oct 29 2006 Christopher Stone  1.8.4-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 14:18:17 -0000	1.1
+++ .cvsignore	21 Nov 2006 14:18:35 -0000	1.2
@@ -0,0 +1 @@
+DB_DataObject-1.8.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 14:18:17 -0000	1.1
+++ sources	21 Nov 2006 14:18:35 -0000	1.2
@@ -0,0 +1 @@
+770c44d243066340d639b063235dcc02  DB_DataObject-1.8.4.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 14:19:43 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 21 Nov 2006 09:19:43 -0500
Subject: rpms/gnome-translate/FC-6 gnome-translate.spec,1.10,1.11
Message-ID: <200611211419.kALEJhlZ015218@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15199

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/FC-6/gnome-translate.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-translate.spec	1 Sep 2006 14:09:30 -0000	1.10
+++ gnome-translate.spec	21 Nov 2006 14:19:13 -0000	1.11
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -14,9 +14,6 @@
 Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
 BuildRequires: eel2-devel >= 2.13.0, libtranslate-devel, aspell-devel
-%if "%{?dist}" == ".fc5"
-BuildRequires: gnome-keyring-devel
-%endif
 
 BuildRequires: desktop-file-utils >= 0.2.90
 BuildRequires: startup-notification-devel >= 0.5
@@ -60,7 +57,6 @@
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   --add-category X-Fedora                                   \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
@@ -124,6 +120,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dmitry Butskoy  - 0.99-11
+- Don't set "ShowOnlyIn=Gnome" flag, it is not needed.
+
 * Fri Sep  1 2006 Dmitry Butskoy  - 0.99-10
 - rebuild for FC6
 



From fedora-extras-commits at redhat.com  Tue Nov 21 14:20:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:20:46 -0500
Subject: owners owners.list,1.1979,1.1980
Message-ID: <200611211420.kALEKkCh015286@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15266

Modified Files:
	owners.list 
Log Message:
php-pear-DB-DataObject


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1979
retrieving revision 1.1980
diff -u -r1.1979 -r1.1980
--- owners.list	21 Nov 2006 11:18:27 -0000	1.1979
+++ owners.list	21 Nov 2006 14:20:16 -0000	1.1980
@@ -1799,6 +1799,7 @@
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date-Holidays|Driver based class to calculate holidays|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-DB-DataObject|An SQL Builder, Object Interface to Database Tables|chris.stone at gmail.com|extrasqa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-QuickForm|Class for creating, validating, processing HTML forms|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 14:21:29 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 21 Nov 2006 09:21:29 -0500
Subject: rpms/gnome-translate/devel gnome-translate.spec,1.10,1.11
Message-ID: <200611211421.kALELTvb015317@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15294

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-translate.spec	1 Sep 2006 14:09:30 -0000	1.10
+++ gnome-translate.spec	21 Nov 2006 14:20:59 -0000	1.11
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -14,9 +14,6 @@
 Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
 BuildRequires: eel2-devel >= 2.13.0, libtranslate-devel, aspell-devel
-%if "%{?dist}" == ".fc5"
-BuildRequires: gnome-keyring-devel
-%endif
 
 BuildRequires: desktop-file-utils >= 0.2.90
 BuildRequires: startup-notification-devel >= 0.5
@@ -60,7 +57,6 @@
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   --add-category X-Fedora                                   \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
@@ -124,6 +120,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dmitry Butskoy  - 0.99-11
+- Don't set "ShowOnlyIn=Gnome" flag, it is not needed.
+
 * Fri Sep  1 2006 Dmitry Butskoy  - 0.99-10
 - rebuild for FC6
 



From fedora-extras-commits at redhat.com  Tue Nov 21 14:38:19 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:38:19 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder - New directory
Message-ID: <200611211438.kALEcJgE015590@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586/php-pear-DB-DataObject-FormBuilder

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:38:24 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:38:24 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder/devel - New directory
Message-ID: <200611211438.kALEcOP6015603@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586/php-pear-DB-DataObject-FormBuilder/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:38:35 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:38:35 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200611211438.kALEcZ3k015633@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-DB-DataObject-FormBuilder


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-DB-DataObject-FormBuilder
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  Tue Nov 21 14:38:41 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:38:41 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611211438.kALEcfGN015648@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-DB-DataObject-FormBuilder


--- 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 Nov 21 14:39:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:39:30 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder import.log,1.1,1.2
Message-ID: <200611211439.kALEdUts015723@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15687

Modified Files:
	import.log 
Log Message:
auto-import php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5 on branch devel from php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 14:38:35 -0000	1.1
+++ import.log	21 Nov 2006 14:39:00 -0000	1.2
@@ -0,0 +1 @@
+php-pear-DB-DataObject-FormBuilder-1_0_0-0_1_RC5:HEAD:php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5.src.rpm:1164119947



From fedora-extras-commits at redhat.com  Tue Nov 21 14:39:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:39:30 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder/devel
	php-pear-DB-DataObject-FormBuilder.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211439.kALEdUcs015725@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15687/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-DB-DataObject-FormBuilder.spec 
Log Message:
auto-import php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5 on branch devel from php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5.src.rpm


--- NEW FILE php-pear-DB-DataObject-FormBuilder.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name DB_DataObject_FormBuilder
%define beta RC5

Name:           php-pear-DB-DataObject-FormBuilder
Version:        1.0.0
Release:        0.1.%{beta}%{?dist}
Summary:        Automatically build HTML_QuickForm objects

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/DB_DataObject_FormBuilder
Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{beta}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(DB_DataObject) php-pear(HTML_QuickForm)
Requires(hint): php-pear(Date) php-pear(HTML_Table)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
DB_DataObject_FormBuilder will aid you in rapid application development using
the packages DB_DataObject and HTML_QuickForm. For having a quick but working
prototype of your application, simply model the database, run DataObject's
createTable script over it and write a script that passes one of the resulting
objects to the FormBuilder class. The FormBuilder will automatically generate
a simple but working HTML_QuickForm object that you can use to test your
application. It also provides a processing method that will automatically
detect if an insert() or update() command has to be executed after the form
has been submitted. If you have set up DataObject's links.ini file correctly,
it will also automatically detect if a table field is a foreign key and will
populate a selectbox with the linked table's entries. There are many optional
parameters that you can place in your DataObjects.ini or in the properties of
your derived classes, that you can use to fine-tune the form-generation,
gradually turning the prototypes into fully-featured forms, and you can take
control at any stage of the process.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}%{beta}/%{pear_name}.xml
cd %{pear_name}-%{version}%{beta}


%build
cd %{pear_name}-%{version}%{beta}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}%{beta}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/DB/DataObject/FormBuilder*


%changelog
* Sun Oct 29 2006 Christopher Stone  1.0.0-0.1.RC5
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 14:38:41 -0000	1.1
+++ .cvsignore	21 Nov 2006 14:39:00 -0000	1.2
@@ -0,0 +1 @@
+DB_DataObject_FormBuilder-1.0.0RC5.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 14:38:41 -0000	1.1
+++ sources	21 Nov 2006 14:39:00 -0000	1.2
@@ -0,0 +1 @@
+0430207937449d635449389ae345854c  DB_DataObject_FormBuilder-1.0.0RC5.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 14:41:19 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:41:19 -0500
Subject: owners owners.list,1.1980,1.1981
Message-ID: <200611211441.kALEfJF4015795@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15777

Modified Files:
	owners.list 
Log Message:
php-pear-DB-DataObject-FormBuilder


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1980
retrieving revision 1.1981
diff -u -r1.1980 -r1.1981
--- owners.list	21 Nov 2006 14:20:16 -0000	1.1980
+++ owners.list	21 Nov 2006 14:40:48 -0000	1.1981
@@ -1800,6 +1800,7 @@
 Fedora Extras|php-pear-Date-Holidays|Driver based class to calculate holidays|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-DataObject|An SQL Builder, Object Interface to Database Tables|chris.stone at gmail.com|extrasqa at fedoraproject.org|
+Fedora Extras|php-pear-DB-DataObject-FormBuilder|Automatically build HTML_QuickForm objects|chris.stone at gmail.com|extrasqa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-QuickForm|Class for creating, validating, processing HTML forms|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 14:53:38 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 21 Nov 2006 09:53:38 -0500
Subject: rpms/lilypond-doc/FC-6 .cvsignore, 1.5, 1.6 lilypond-doc.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <200611211453.kALErcfP016085@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16033

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Oct 2006 13:31:46 -0000	1.5
+++ .cvsignore	21 Nov 2006 14:53:08 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7-1.documentation.tar.bz2
+lilypond-2.10.0-2.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/lilypond-doc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lilypond-doc.spec	10 Oct 2006 13:31:46 -0000	1.4
+++ lilypond-doc.spec	21 Nov 2006 14:53:08 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           lilypond-doc
-Version:        2.8.7
-Release:	1%{?dist}
+Version:        2.10.0
+Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
 Group:		Applications/Publishing
 License:	GPL
 URL:		http://www.lilypond.org
-Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-1.documentation.tar.bz2
+Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-2.documentation.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Quentin Spencer  2.10.0-1
+- New release.
+
 * Tue Oct 10 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Oct 2006 13:31:46 -0000	1.5
+++ sources	21 Nov 2006 14:53:08 -0000	1.6
@@ -1 +1 @@
-492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2
+b4fae3abd129e0a19ceddb3dae03fb28  lilypond-2.10.0-2.documentation.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 14:53:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 09:53:40 -0500
Subject: rpms/openvrml import.log,1.1,1.2
Message-ID: <200611211453.kALErepF016088@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/openvrml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16034

Modified Files:
	import.log 
Log Message:
auto-import openvrml-0.16.1-4 on branch devel from openvrml-0.16.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/openvrml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 06:32:13 -0000	1.1
+++ import.log	21 Nov 2006 14:53:10 -0000	1.2
@@ -0,0 +1 @@
+openvrml-0_16_1-4:HEAD:openvrml-0.16.1-4.src.rpm:1164120785



From fedora-extras-commits at redhat.com  Tue Nov 21 14:53:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 09:53:40 -0500
Subject: rpms/openvrml/devel openvrml-gtkplug-info.patch, NONE,
	1.1 openvrml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211453.kALEreaD016092@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16034/devel

Modified Files:
	.cvsignore sources 
Added Files:
	openvrml-gtkplug-info.patch openvrml.spec 
Log Message:
auto-import openvrml-0.16.1-4 on branch devel from openvrml-0.16.1-4.src.rpm

openvrml-gtkplug-info.patch:

--- NEW FILE openvrml-gtkplug-info.patch ---
--- openvrml-0.16.1/doc/openvrml-gtkplug.info	2006-11-15 00:17:54.000000000 -0500
+++ openvrml-0.16.1-4/doc/openvrml-gtkplug.info	2006-11-15 00:18:12.000000000 -0500
@@ -15,7 +15,7 @@
 
 INFO-DIR-SECTION Miscellaneous
 START-INFO-DIR-ENTRY
-* openvrml-gtkplug: A VRML/X3D browser component for GTK+ applications.
+* openvrml-gtkplug: (openvrml-gtkplug). A VRML/X3D browser component for GTK+ applications.
 END-INFO-DIR-ENTRY
 
 


--- NEW FILE openvrml.spec ---
# -*- rpm-spec -*-
Name:           openvrml
Version:        0.16.1
Release:        4%{?dist}
Summary:        VRML/X3D runtime library
License:        LGPL
Group:          System Environment/Libraries
Source:         http://prdownloads.sf.net/openvrml/%{name}-%{version}.tar.gz
Patch:          openvrml-gtkplug-info.patch
URL:            http://openvrml.org
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pkgconfig >= 0.12.0
BuildRequires:  boost-devel >= 1.33.1
BuildRequires:  libpng-devel >= 1.0.12
BuildRequires:  libjpeg-devel >= 6b
BuildRequires:  fontconfig-devel >= 2.0
BuildRequires:  freetype-devel >= 2.1.2
BuildRequires:  firefox-devel
BuildRequires:  libGLU-devel
BuildRequires:  libXmu-devel
BuildRequires:  gtk2-devel
Requires:       firefox = 1.5.0.8

%description
OpenVRML is a VRML/X3D support library, including a runtime and facilities
for reading and displaying VRML and X3D models.


%package devel
Summary:        Headers for developing C++ programs with OpenVRML
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       boost-devel >= 1.33.1
Requires:       libpng-devel
Requires:       libjpeg-devel
Requires:       fontconfig-devel
Requires:       freetype-devel
Requires:       firefox-devel = 1.5.0.8
%description devel
Headers that programmers will need to develop C++ programs using
OpenVRML.

%package gl
Summary:        OpenGL renderer for OpenVRML
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
%description gl
OpenGL renderer for OpenVRML.

%package gl-devel
Summary:        OpenVRML OpenGL renderer headers
Group:          Development/Libraries
Requires:       %{name}-gl = %{version}-%{release}
Requires:       %{name}-devel = %{version}-%{release}
Requires:       pkgconfig
Requires:       libGLU-devel
Requires:       libXmu-devel
Requires:       gtk2-devel
%description gl-devel
Headers that programmers will need to develop C++ programs using the
OpenVRML OpenGL renderer.

%package gtkplug
Summary:        VRML browser GtkPlug component for embedding in GTK+ applications
Group:          Applications/Internet
License:        GPL
Requires:       %{name}-gl = %{version}-%{release}
%description gtkplug
VRML browser GtkPlug component for embedding in GTK+ applications.

%package mozilla-plugin
Summary:        VRML browser plug-in for Mozilla-based browsers
Group:          Applications/Internet
License:        GPL
Requires:       %{name}-gtkplug = %{version}-%{release}
%description mozilla-plugin
VRML browser plug-in for Mozilla-based browsers.

%prep
%setup

%patch -p1

%build
%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
%{__make} %{?_smp_mflags}

%install
%{__make} DESTDIR=%{buildroot} install
%{__rm} %{buildroot}%{_libdir}/*.la
%{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
%{__rm} -f %{buildroot}%{_infodir}/dir

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
%{_libdir}/libopenvrml.so.*

%files devel
%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
%doc doc/manual
%{_includedir}/%{name}/openvrml-common.h
%{_includedir}/%{name}/openvrml-config.h
%{_includedir}/%{name}/openvrml/*.h
%{_libdir}/libopenvrml.so
%{_libdir}/pkgconfig/openvrml.pc


%post gl -p /sbin/ldconfig

%postun gl -p /sbin/ldconfig

%files gl
%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
%{_libdir}/libopenvrml-gl.so.*


%files gl-devel
%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
%{_includedir}/%{name}/openvrml-gl-common.h
%{_includedir}/%{name}/openvrml-gl-config.h
%{_includedir}/%{name}/openvrml/gl
%{_libdir}/libopenvrml-gl.so
%{_libdir}/pkgconfig/openvrml-gl.pc


%post gtkplug
/sbin/install-info %{_infodir}/openvrml-gtkplug.info.gz %{_infodir}/dir

%preun gtkplug
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/openvrml-gtkplug.info.gz %{_infodir}/dir
fi

%files gtkplug
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_infodir}/openvrml-gtkplug.info.gz
%{_libexecdir}/openvrml-gtkplug

%files mozilla-plugin
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_libdir}/mozilla/plugins/openvrml.so


%changelog
* Wed Nov 15 2006  Braden McDaniel   - 0.16.1-4
- Patch openvrml-gtkplug.info.

* Tue Nov 14 2006  Braden McDaniel   - 0.16.1-3
- openvrml: Require firefox 1.5.0.8.
- openvrml: Add -fvisibility=hidden to CXXFLAGS.
- openvrml: Use %%{__make} in %%install.
- openvrml: rm %%{buildroot}%%{_infodir}/dir at the end of %%install.
- openvrml-devel: Require pkgconfig, libpng-devel, libjpeg-devel,
  fontconfig-devel, freetype-devel, and firefox-devel = 1.5.0.8.
- openvrml-gl: Removed Requires: mesa-libGLU.
- openvrml-gl-devel: Require pkgconfig, openvrml-devel, libGLU-devel,
  libXmu-devel, and gtk2-devel.

* Mon Oct 30 2006  Braden McDaniel   - 0.16.1-2
- Removed trailing '.' from summaries.
- openvrml-devel: Include %%{version}-%%{release} in dependency on
  openvrml.
- openvrml-devel: Removed mention of static libraries from summary and
  description since they are no longer included.
- openvrml-gl: Run ldconfig in %%post, %%postun.
- openvrml-gl-devel: Include %%{release} in dependency on openvrml.
- openvrml-gl-devel: Removed mention of static libraries from summary and
  description since they are no longer included.
- openvrml-gtkplug: Include %%{release} in dependency on openvrml-gl.
- openvrml-gtkplug: Run install-info in %%post, %%preun.
- openvrml-gtkplug: Removed Requires for gtk2, libXmu.
- openvrml-mozilla-plugin: Include %%{release} in dependency on
  openvrml-gtkplug.
- openvrml-mozilla-plugin: Removed Requires for firefox.

* Sat Oct 28 2006  Braden McDaniel  
- Run ldconfig in %%post and %%postun.
- Updated summary and description.
- Removed BuildRequires for zlib-devel.
- Removed Requires for zlib.
- Removed Requires for libpng.
- Removed Requires for libjpeg.
- Removed Requires for fontconfig.
- Removed Requires for freetype.
- Avoid packaging libtool .la files.
- Do not build static libraries.
- Do not use %%makeinstall.

* Fri Oct 27 2006  Braden McDaniel  
- Removed obsolete references to openvrml.xpt and openvrml.idl by the
  mozilla-plugin package.
- Fixed file name for openvrml-gtkplug texinfo.

* Wed Oct 25 2006  Braden McDaniel  
- Require firefox instead of mozilla.

* Thu Oct 05 2006  Braden McDaniel  
- Added openvrml-gtkplug info.

* Thu Sep 28 2006  Braden McDaniel  
- Added openvrml-gtkplug package.

* Mon Aug 14 2006  Braden McDaniel  
- Added libXmu-devel to BuildRequires.
- Made mozilla-plugin package Require libXmu.

* Thu Aug 10 2006  Braden McDaniel  
- Use %%{__make} instead of make.
- Use %%{__rm} instead of rm.
- Include openvrml-common.h and openvrml-config.h in openvrml-devel.
- Include openvrml-gl-common.h and openvrml-gl-config.h in
  openvrml-gl-devel.

* Wed Jul 26 2006  Braden McDaniel  
- Require boost-devel 1.33.1.
- Added dependency on boost-devel to openvrml-devel.
- Updated Mesa package names for Fedora Core 5.

* Sun Feb 12 2006  Braden McDaniel  
- configure with --disable-exception-specs.

* Tue Apr 20 2005  Braden McDaniel  
- Removed dejagnu build prerequisite.

* Mon Mar 21 2005  Braden McDaniel  
- No longer emit lookat package.
- configure with --disable-examples.

* Wed Jan 26 2005  Braden McDaniel  
- configure with --disable-script-node-java.  The Script node Java binding
  is not currently usable.

* Fri Jan 07 2005  Braden McDaniel  
- Added %%{_libexecdir}/openvrml-player to the openvrml-mozilla-plugin package.

* Fri Dec 29 2004  Braden McDaniel  
- Fixed name of xorg-x11-devel prerequisite for the openvrml-gl-devel package.

* Fri Dec 24 2004  Braden McDaniel  
- Require mozilla >= 1.6.  The plug-in now must link with libxpcom.
- Removed GtkGLExt dependency; added GTK+ 2.x dependency.  GtkGLExt is
  now included in the distribution.

* Thu Dec 03 2004  Braden McDaniel  
- Use %%makeinstall macro.
- Install COPYING (GPL) with lookat documentation rather than COPYING.LESSER
  (LGPL).

* Tue Nov 30 2004  Braden McDaniel  
- Added dejagnu >= 1.4 as a build prerequisite.

* Fri Nov 26 2004  Braden McDaniel  
- Changed Mozilla plug-in RPM name to openvrml-mozilla-plugin.
- Refer to the plug-in in comments as "for Mozilla-based browsers" rather than
  "for Mozilla".

* Sun Nov 21 2004  Braden McDaniel  
- Changed openvrml-gl-devel dependency on XFree86-devel to xorg-X11-devel.
- Removed openvrml-mozilla dependency on mozilla.  Other browsers (e.g.,
  Firefox) could use the plug-in, too.

* Sat May 15 2004  Braden McDaniel  
- Use "License" instead of "Copyright".
- Require xorg-x11 packages instead of XFree86.
- Removed "Prefix" specification.
- Use "%%configure" macro.
- Install script.jar.
- Use %%{_libdir}, etc. macros.
- Install openvrml.idl.

* Sun May 09 2004  Braden McDaniel  
- Corrected description of lookat RPM to reflect the change to using SDL.
- Define NDEBUG when configuring.

* Wed May 05 2004  Braden McDaniel  
- Made Mozilla plug-in scriptable.

* Mon Apr 26 2004  Braden McDaniel  
- Added Mozilla plug-in.

* Thu Nov 20 2003  Braden McDaniel  
- Require SDL for lookat instead of glut.
- Set "DESTDIR" for "make install" rather than "prefix".

* Sun Nov 16 2003  Braden McDaniel  
- Removed unused ARCH_FLAGS variable from "configure" invocation.
- Added _smp_mflags macro to invocation of make.

* Fri Nov 07 2003  Braden McDaniel  
- Added "BuildRequires: libgcj-devel >= 3.3" and analogous Requires. Script
  node Java support is now included in the build, and older versions of libgcj
  have a bug that prevents OpenVRML from compiling.
- Removed glut requirement from opevrml-gl package. (Should have been done
  some time ago.)
- Added glut requirement to lookat package.
- Changed XFree86 requirement of openvrml-gl to XFree86-Mesa-libGLU to
  correspond to Fedora Core package name. Upped required version of XFree86 to
  4.3 to correspond to this.

* Mon Nov 03 2003  Braden McDaniel  
- Removed lookat-bin from lookat package.
- Added mozilla requirement for lookat.  lookat is now built with -rpath for
  the Mozilla library directory; so the binary package requires the same
  Mozilla version it was built against.

* Mon Oct 27 2003  Braden McDaniel  
- Added lookat-bin to lookat package.

* Tue Sep 30 2003  Braden McDaniel  
- Added BuildRequires: boost-devel.

* Sun Sep 28 2003  Braden McDaniel  
- Changed COPYING.LIB to COPYING.LESSER.
- Moved pkg-config metadata files to devel packages.
- Changes for parity with installation directory names.

* Tue Dec 17 2002  Braden McDaniel  
- Removed conformance.html from %%doc.  This doc now incorporated into doxygen
  docs.

* Tue Dec 10 2002  Braden McDaniel  
- Added BuildRequires for pkgconfig, fontconfig-devel, freetype-devel.
- Added Requires for fontconfig, freetype.
- Updated configure arguments.
- Added conformance.html to openvrml's %%doc.
- Added API (doxygen) docs to openvrml-devel's %%doc.
- Removed GL renderer headers in openvrml-devel.
- Added AUTHORS, COPYING.LIB, ChangeLog, NEWS, README, THANKS to %%doc for all
  packages.

* Sun Dec 08 2002  Braden McDaniel  
- Removed COPYING from %%doc.

* Thu Dec 05 2002  Braden McDaniel  
- Added minimum versions to BuildRequires dependencies.
- configure --without-ftflibs.
- Require Mozilla 1.2.1; removed obsolete CPPFLAGS and LDFLAGS when
  configuring.

* Sun Jun 30 2002  Braden McDaniel  
- configure --without-doxygen.
- Removed "doc/conformance.html" from %%doc.

* Sat Jun 15 2002  Braden McDaniel  
- Use CPPFLAGS and LDFLAGS for Mozilla 1.0.0 when running configure.
- Require Mozilla 1.0.0.

* Mon May 20 2002  Braden McDaniel  
- Fixed pkgconfig metafile names.
- Updated dependencies to reflect RPMs shipping with Red Hat 7.3.
- Updated source download URI.
- Removed prefix.
- Added BuildRequires.
- Added Requires for zlib, libpng, libjpeg, mozilla.
- configure --without-jdk.

* Thu Jan 24 2002  Braden McDaniel  
- Added package metafiles for pkgconfig.
- Removed autoconf macros for use by client packages.

* Fri Jun 29 2001  Braden McDaniel  
- Removed MPL-1.1.txt from %%doc. File nolonger distributed.
- Prefer the shorter "sf.net" to "sourceforge.net".

* Wed Jun 6 2001  Braden McDaniel  
- Added COPYING to %%doc.
- Changed URL to 
- Corrected packager e-mail address.

* Thu Jan 25 2001  Braden McDaniel  
- Fixed location of lookat icon in %%files section for lookat
- Added Mesa >= 3.2 as a requirement for openvrml-gl.

* Tue Jan 2 2001  Braden McDaniel  
- Removed obsolete TODO from %%doc.

* Sun Dec 31 2000  Clayton Cottingham 
- Change in install section rm command is now recursive

* Fri Dec 15 2000  Braden McDaniel  
- Added lookat.xpm to files section for lookat.

* Fri Dec 8 2000  Braden McDaniel  
- Changes to reflect library name and header location changes.

* Sun Dec 3 2000  Braden McDaniel  
- Removed README.SOUND from %%doc

* Sun Nov 26 2000  Braden McDaniel  
- Added conformance.html to %%doc.
- Removed obsolete COPYING.ANTLR from %%doc.
- Changed URL to .
- Removed obsolete NODES from %%doc.

* Thu Nov 23 2000  Braden McDaniel  
- Gave much love. Checked into CVS. Still not guaranteed to work, though.

* Tue Oct 24 2000  Braden McDaniel  
- Received initial spec file from Clayton Cottingham .


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 06:32:18 -0000	1.1
+++ .cvsignore	21 Nov 2006 14:53:10 -0000	1.2
@@ -0,0 +1 @@
+openvrml-0.16.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 06:32:18 -0000	1.1
+++ sources	21 Nov 2006 14:53:10 -0000	1.2
@@ -0,0 +1 @@
+6628c0d18078805d2b662b3509f537d3  openvrml-0.16.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 14:57:43 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:57:43 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject - New
	directory
Message-ID: <200611211457.kALEvhhk016257@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253/php-pear-Structures-DataGrid-DataSource-DataObject

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:57:49 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:57:49 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel - New
	directory
Message-ID: <200611211457.kALEvnXb016270@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253/php-pear-Structures-DataGrid-DataSource-DataObject/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:57:59 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:57:59 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject Makefile,
	NONE, 1.1 import.log, NONE, 1.1
Message-ID: <200611211457.kALEvxd0016300@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16294

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Structures-DataGrid-DataSource-DataObject


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Structures-DataGrid-DataSource-DataObject
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  Tue Nov 21 14:58:00 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:58:00 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
	.cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611211458.kALEw08T016316@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16294/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Structures-DataGrid-DataSource-DataObject


--- 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 Nov 21 14:58:01 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 21 Nov 2006 09:58:01 -0500
Subject: rpms/perl-YAML-Parser-Syck/devel perl-YAML-Parser-Syck.spec, 1.3,
	1.4
Message-ID: <200611211458.kALEw1oF016327@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16227

Modified Files:
	perl-YAML-Parser-Syck.spec 
Log Message:
Cleanup to more closely resemble cpanspec output.
Fix find option order.
Use fixperms macro.
Fix directory ownership.  (#216484)



Index: perl-YAML-Parser-Syck.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/devel/perl-YAML-Parser-Syck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-YAML-Parser-Syck.spec	26 Sep 2006 22:09:16 -0000	1.3
+++ perl-YAML-Parser-Syck.spec	21 Nov 2006 14:57:31 -0000	1.4
@@ -1,15 +1,14 @@
-Name:			perl-YAML-Parser-Syck
-Version:		0.01
-Release:		6%{?dist}
-Summary:		Perl Wrapper for the YAML Parser Extension: libsyck
-
-Group:			Development/Libraries
-License:		GPL or Artistic
-URL:			http://search.cpan.org/dist/YAML-Parser-Syck/
-Source0:		http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	syck-devel
-Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:           perl-YAML-Parser-Syck
+Version:        0.01
+Release:        7%{?dist}
+Summary:        Perl Wrapper for the YAML Parser Extension: libsyck
+License:        GPL or Artistic
+Group:          Development/Libraries
+URL:            http://search.cpan.org/dist/YAML-Parser-Syck/
+Source0:        http://www.cpan.org/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  syck-devel
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 libsyck is a *gift* from a gifted Stiff named 'Why'.
@@ -18,34 +17,42 @@
 
 %prep
 %setup -q -n YAML-Parser-Syck-%{version}
-%{_bindir}/perldoc -t perlartistic > Artistic
-%{_bindir}/perldoc -t perlgpl > COPYING
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
-%{__chmod} -R u+w $RPM_BUILD_ROOT/*
+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 f -name '*.bs' -size 0 -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%{__make} test
+make test
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic COPYING Changes
-%{perl_vendorarch}/*
-%{_mandir}/man3/*.3*
+%doc Changes README
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/YAML*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Nov 20 2006 Steven Pritchard  0.01-7
+- Cleanup to more closely resemble cpanspec output.
+- Fix find option order.
+- Use fixperms macro.
+- Fix directory ownership.  (#216484)
+
 * Tue Sep 26 2006 Steven Pritchard  0.01-6
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 21 14:58:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:58:46 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject import.log, 
	1.1, 1.2
Message-ID: <200611211458.kALEwkVX016425@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16359

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1 on branch devel from php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 14:57:59 -0000	1.1
+++ import.log	21 Nov 2006 14:58:16 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Structures-DataGrid-DataSource-DataObject-0_1_0-1:HEAD:php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1.src.rpm:1164121104



From fedora-extras-commits at redhat.com  Tue Nov 21 14:58:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:58:47 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
	php-pear-Structures-DataGrid-DataSource-DataObject.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211458.kALEwlIx016429@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16359/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Structures-DataGrid-DataSource-DataObject.spec 
Log Message:
auto-import php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1 on branch devel from php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1.src.rpm


--- NEW FILE php-pear-Structures-DataGrid-DataSource-DataObject.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Structures_DataGrid_DataSource_DataObject

Name:           php-pear-Structures-DataGrid-DataSource-DataObject
Version:        0.1.0
Release:        1%{?dist}
Summary:        DataSource driver using PEAR::DB_DataObject

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Structures_DataGrid_DataSource_DataObject
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) 
Requires:       php-pear(Structures_DataGrid) php-pear(DB_DataObject)
Requires(hint): php-pear(DB_DataObject_FormBuilder)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is a DataSource driver for Structures_DataGrid using PEAR::DB_DataObject.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Structures/DataGrid/DataSource


%changelog
* Sun Oct 29 2006 Christopher Stone  0.1.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 14:57:59 -0000	1.1
+++ .cvsignore	21 Nov 2006 14:58:17 -0000	1.2
@@ -0,0 +1 @@
+Structures_DataGrid_DataSource_DataObject-0.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 14:57:59 -0000	1.1
+++ sources	21 Nov 2006 14:58:17 -0000	1.2
@@ -0,0 +1 @@
+8779c153f7299f649b39859abbfa646d  Structures_DataGrid_DataSource_DataObject-0.1.0.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 15:01:03 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 10:01:03 -0500
Subject: owners owners.list,1.1981,1.1982
Message-ID: <200611211501.kALF13Sm016532@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16466

Modified Files:
	owners.list 
Log Message:
php-pear-Structures-DataGrid-DataSource-DataObject


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1981
retrieving revision 1.1982
diff -u -r1.1981 -r1.1982
--- owners.list	21 Nov 2006 14:40:48 -0000	1.1981
+++ owners.list	21 Nov 2006 15:00:32 -0000	1.1982
@@ -1828,6 +1828,7 @@
 Fedora Extras|php-pear-Services-Weather|Interface to various online weather-services Description|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-SOAP|Simple Object Access Protocol (SOAP) Client/Server for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Structures-DataGrid-DataSource-DataObject|DataSource driver using PEAR::DB_DataObject|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Smarty|Renderer driver using Smarty|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 15:04:39 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 21 Nov 2006 10:04:39 -0500
Subject: rpms/fontforge/FC-5 fontforge-20060125-glibccrash.patch,1.1,NONE
Message-ID: <200611211504.kALF4duk016618@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/FC-5

Removed Files:
	fontforge-20060125-glibccrash.patch 
Log Message:
Remove unused patch



--- fontforge-20060125-glibccrash.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 15:04:44 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 21 Nov 2006 10:04:44 -0500
Subject: rpms/fontforge/FC-6 fontforge-20060125-glibccrash.patch,1.1,NONE
Message-ID: <200611211504.kALF4iXs016631@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/FC-6

Removed Files:
	fontforge-20060125-glibccrash.patch 
Log Message:
Remove unused patch



--- fontforge-20060125-glibccrash.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 15:04:50 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 21 Nov 2006 10:04:50 -0500
Subject: rpms/fontforge/devel fontforge-20060125-glibccrash.patch,1.1,NONE
Message-ID: <200611211504.kALF4onm016644@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/devel

Removed Files:
	fontforge-20060125-glibccrash.patch 
Log Message:
Remove unused patch



--- fontforge-20060125-glibccrash.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 15:06:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 21 Nov 2006 10:06:19 -0500
Subject: rpms/perl-YAML-Parser-Syck/FC-6 perl-YAML-Parser-Syck.spec,1.3,1.4
Message-ID: <200611211506.kALF6JVQ016683@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16668

Modified Files:
	perl-YAML-Parser-Syck.spec 
Log Message:
Cleanup to more closely resemble cpanspec output.
Fix find option order.
Use fixperms macro.
Fix directory ownership.  (#216484)



Index: perl-YAML-Parser-Syck.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/FC-6/perl-YAML-Parser-Syck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-YAML-Parser-Syck.spec	26 Sep 2006 22:09:16 -0000	1.3
+++ perl-YAML-Parser-Syck.spec	21 Nov 2006 15:05:48 -0000	1.4
@@ -1,15 +1,14 @@
-Name:			perl-YAML-Parser-Syck
-Version:		0.01
-Release:		6%{?dist}
-Summary:		Perl Wrapper for the YAML Parser Extension: libsyck
-
-Group:			Development/Libraries
-License:		GPL or Artistic
-URL:			http://search.cpan.org/dist/YAML-Parser-Syck/
-Source0:		http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	syck-devel
-Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:           perl-YAML-Parser-Syck
+Version:        0.01
+Release:        7%{?dist}
+Summary:        Perl Wrapper for the YAML Parser Extension: libsyck
+License:        GPL or Artistic
+Group:          Development/Libraries
+URL:            http://search.cpan.org/dist/YAML-Parser-Syck/
+Source0:        http://www.cpan.org/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  syck-devel
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 libsyck is a *gift* from a gifted Stiff named 'Why'.
@@ -18,34 +17,42 @@
 
 %prep
 %setup -q -n YAML-Parser-Syck-%{version}
-%{_bindir}/perldoc -t perlartistic > Artistic
-%{_bindir}/perldoc -t perlgpl > COPYING
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
-%{__chmod} -R u+w $RPM_BUILD_ROOT/*
+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 f -name '*.bs' -size 0 -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%{__make} test
+make test
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic COPYING Changes
-%{perl_vendorarch}/*
-%{_mandir}/man3/*.3*
+%doc Changes README
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/YAML*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Nov 20 2006 Steven Pritchard  0.01-7
+- Cleanup to more closely resemble cpanspec output.
+- Fix find option order.
+- Use fixperms macro.
+- Fix directory ownership.  (#216484)
+
 * Tue Sep 26 2006 Steven Pritchard  0.01-6
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:07:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 21 Nov 2006 10:07:39 -0500
Subject: rpms/perl-YAML-Parser-Syck/FC-5 perl-YAML-Parser-Syck.spec,1.2,1.3
Message-ID: <200611211507.kALF7dAQ016763@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16734

Modified Files:
	perl-YAML-Parser-Syck.spec 
Log Message:
Cleanup to more closely resemble cpanspec output.
Fix find option order.
Use fixperms macro.
Fix directory ownership.  (#216484)



Index: perl-YAML-Parser-Syck.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/FC-5/perl-YAML-Parser-Syck.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-YAML-Parser-Syck.spec	9 Mar 2006 15:13:01 -0000	1.2
+++ perl-YAML-Parser-Syck.spec	21 Nov 2006 15:07:09 -0000	1.3
@@ -1,15 +1,14 @@
-Name:			perl-YAML-Parser-Syck
-Version:		0.01
-Release:		5%{?dist}
-Summary:		Perl Wrapper for the YAML Parser Extension: libsyck
-
-Group:			Development/Libraries
-License:		GPL or Artistic
-URL:			http://search.cpan.org/dist/YAML-Parser-Syck/
-Source0:		http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	syck-devel
-Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:           perl-YAML-Parser-Syck
+Version:        0.01
+Release:        7%{?dist}
+Summary:        Perl Wrapper for the YAML Parser Extension: libsyck
+License:        GPL or Artistic
+Group:          Development/Libraries
+URL:            http://search.cpan.org/dist/YAML-Parser-Syck/
+Source0:        http://www.cpan.org/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  syck-devel
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 libsyck is a *gift* from a gifted Stiff named 'Why'.
@@ -18,34 +17,45 @@
 
 %prep
 %setup -q -n YAML-Parser-Syck-%{version}
-%{_bindir}/perldoc -t perlartistic > Artistic
-%{_bindir}/perldoc -t perlgpl > COPYING
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
-%{__chmod} -R u+w $RPM_BUILD_ROOT/*
+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 f -name '*.bs' -size 0 -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%{__make} test
+make test
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic COPYING Changes
-%{perl_vendorarch}/*
-%{_mandir}/man3/*.3*
+%doc Changes README
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/YAML*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Nov 20 2006 Steven Pritchard  0.01-7
+- Cleanup to more closely resemble cpanspec output.
+- Fix find option order.
+- Use fixperms macro.
+- Fix directory ownership.  (#216484)
+
+* Tue Sep 26 2006 Steven Pritchard  0.01-6
+- Rebuild.
+
 * Thu Mar 09 2006 Oliver Falk 			- 0.01-5
 - Add dist-tag
 - Rebuild



From fedora-extras-commits at redhat.com  Tue Nov 21 15:14:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:14:15 -0500
Subject: rpms/xsupplicant/FC-4
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch, NONE,
	1.1 xsupplicant.spec, 1.21, 1.22
Message-ID: <200611211514.kALFEFiq016903@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837/FC-4

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch 
Log Message:

Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work)


xsupplicant-1.2.8-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.8-nocompilerh-systemheaders.patch ---
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
@@ -103,7 +103,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
@@ -174,7 +174,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
@@ -203,7 +203,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "netlink.h"
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
@@ -203,7 +203,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xsupplicant.spec	10 Sep 2006 14:40:40 -0000	1.21
+++ xsupplicant.spec	21 Nov 2006 15:13:45 -0000	1.22
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,8 +11,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.1-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL)  1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway  1.2.7-3
 - fix ducttape patch for FC-4/FC-5
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:14:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:14:16 -0500
Subject: rpms/xsupplicant/FC-5
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch, NONE,
	1.1 xsupplicant.spec, 1.22, 1.23
Message-ID: <200611211514.kALFEGkW016906@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837/FC-5

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch 
Log Message:

Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work)


xsupplicant-1.2.8-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.8-nocompilerh-systemheaders.patch ---
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
@@ -103,7 +103,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
@@ -174,7 +174,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
@@ -203,7 +203,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "netlink.h"
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
@@ -203,7 +203,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/xsupplicant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xsupplicant.spec	10 Sep 2006 14:40:40 -0000	1.22
+++ xsupplicant.spec	21 Nov 2006 15:13:45 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,8 +11,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.2-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL)  1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway  1.2.7-3
 - fix ducttape patch for FC-4/FC-5
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:14:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:14:21 -0500
Subject: rpms/xsupplicant/FC-6
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch, NONE,
	1.1 xsupplicant.spec, 1.22, 1.23
Message-ID: <200611211514.kALFELt7016909@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837/FC-6

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch 
Log Message:

Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work)


xsupplicant-1.2.8-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.8-nocompilerh-systemheaders.patch ---
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
@@ -103,7 +103,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
@@ -174,7 +174,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
@@ -203,7 +203,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "netlink.h"
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
@@ -203,7 +203,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-6/xsupplicant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xsupplicant.spec	10 Sep 2006 14:40:46 -0000	1.22
+++ xsupplicant.spec	21 Nov 2006 15:13:51 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,8 +11,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools-devel
 Patch0:		xsupplicant-1.2.2-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL)  1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway  1.2.7-3
 - fix ducttape patch for FC-4/FC-5
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:14:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:14:21 -0500
Subject: rpms/xsupplicant/devel
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch, NONE,
	1.1 xsupplicant.spec, 1.22, 1.23
Message-ID: <200611211514.kALFEL3p016912@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837/devel

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch 
Log Message:

Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work)


xsupplicant-1.2.8-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.8-nocompilerh-systemheaders.patch ---
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
@@ -103,7 +103,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
@@ -174,7 +174,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
@@ -203,7 +203,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "netlink.h"
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
@@ -203,7 +203,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xsupplicant.spec	10 Sep 2006 14:40:46 -0000	1.22
+++ xsupplicant.spec	21 Nov 2006 15:13:51 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,8 +11,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools-devel
 Patch0:		xsupplicant-1.2.2-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL)  1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway  1.2.7-3
 - fix ducttape patch for FC-4/FC-5
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:32:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:32:10 -0500
Subject: rpms/rocksndiamonds/FC-4 rocksndiamonds-YN.patch, NONE,
	1.1 rocksndiamonds-highscore.patch, NONE,
	1.1 rocksndiamonds.spec, 1.3, 1.4
Message-ID: <200611211532.kALFWA06017307@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/FC-4

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Patch up to fix bz 210767


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-4/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:57 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, xorg-x11-devel, desktop-file-utils
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1
 - bump to 3.2.2
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:32:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:32:10 -0500
Subject: rpms/rocksndiamonds/FC-5 rocksndiamonds-YN.patch, NONE,
	1.1 rocksndiamonds-highscore.patch, NONE,
	1.1 rocksndiamonds.spec, 1.3, 1.4
Message-ID: <200611211532.kALFWAtU017310@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/FC-5

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Patch up to fix bz 210767


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-5/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:57 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1
 - bump to 3.2.2
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:32:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:32:16 -0500
Subject: rpms/rocksndiamonds/devel rocksndiamonds.spec,1.3,1.4
Message-ID: <200611211532.kALFWG3s017319@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/devel

Modified Files:
	rocksndiamonds.spec 
Log Message:

Patch up to fix bz 210767



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:58 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1
 - bump to 3.2.2
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:32:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:32:15 -0500
Subject: rpms/rocksndiamonds/FC-6 rocksndiamonds-YN.patch, NONE,
	1.1 rocksndiamonds-highscore.patch, NONE,
	1.1 rocksndiamonds.spec, 1.3, 1.4
Message-ID: <200611211532.kALFWF2e017314@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/FC-6

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Patch up to fix bz 210767


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-6/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:58 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1
 - bump to 3.2.2
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:35:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:35:41 -0500
Subject: rpms/xsupplicant/FC-5 sources,1.9,1.10 xsupplicant.spec,1.23,1.24
Message-ID: <200611211535.kALFZfBg017427@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358/FC-5

Modified Files:
	sources xsupplicant.spec 
Log Message:

Forgot to commit new source tarball. :P



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 06:13:04 -0000	1.9
+++ sources	21 Nov 2006 15:35:11 -0000	1.10
@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/xsupplicant.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xsupplicant.spec	21 Nov 2006 15:13:45 -0000	1.23
+++ xsupplicant.spec	21 Nov 2006 15:35:11 -0000	1.24
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/



From fedora-extras-commits at redhat.com  Tue Nov 21 15:35:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:35:41 -0500
Subject: rpms/xsupplicant/FC-4 .cvsignore, 1.2, 1.3 sources, 1.9,
	1.10 xsupplicant.spec, 1.22, 1.23
Message-ID: <200611211535.kALFZfia017423@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358/FC-4

Modified Files:
	.cvsignore sources xsupplicant.spec 
Log Message:

Forgot to commit new source tarball. :P



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Aug 2005 18:58:19 -0000	1.2
+++ .cvsignore	21 Nov 2006 15:35:11 -0000	1.3
@@ -1 +1,2 @@
 xsupplicant-1.2.tar.gz
+xsupplicant-1.2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 06:13:03 -0000	1.9
+++ sources	21 Nov 2006 15:35:11 -0000	1.10
@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xsupplicant.spec	21 Nov 2006 15:13:45 -0000	1.22
+++ xsupplicant.spec	21 Nov 2006 15:35:11 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/



From fedora-extras-commits at redhat.com  Tue Nov 21 15:35:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:35:42 -0500
Subject: rpms/xsupplicant/devel sources,1.9,1.10 xsupplicant.spec,1.23,1.24
Message-ID: <200611211535.kALFZgZv017433@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358/devel

Modified Files:
	sources xsupplicant.spec 
Log Message:

Forgot to commit new source tarball. :P



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 06:13:04 -0000	1.9
+++ sources	21 Nov 2006 15:35:12 -0000	1.10
@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xsupplicant.spec	21 Nov 2006 15:13:51 -0000	1.23
+++ xsupplicant.spec	21 Nov 2006 15:35:12 -0000	1.24
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/



From fedora-extras-commits at redhat.com  Tue Nov 21 15:35:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:35:42 -0500
Subject: rpms/xsupplicant/FC-6 sources,1.9,1.10 xsupplicant.spec,1.23,1.24
Message-ID: <200611211535.kALFZgt0017431@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358/FC-6

Modified Files:
	sources xsupplicant.spec 
Log Message:

Forgot to commit new source tarball. :P



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 06:13:04 -0000	1.9
+++ sources	21 Nov 2006 15:35:12 -0000	1.10
@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-6/xsupplicant.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xsupplicant.spec	21 Nov 2006 15:13:51 -0000	1.23
+++ xsupplicant.spec	21 Nov 2006 15:35:12 -0000	1.24
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/



From fedora-extras-commits at redhat.com  Tue Nov 21 15:37:02 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 21 Nov 2006 10:37:02 -0500
Subject: rpms/python-matplotlib/devel matplotlib-0.87.7-matplotlibrc.patch, 
	NONE, 1.1 matplotlib-0.87.7-tkagg-check.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 python-matplotlib.spec, 1.20,
	1.21 sources, 1.13, 1.14 matplotlib-0.87-matplotlibrc.patch, 1.1, NONE
Message-ID: <200611211537.kALFb2xV017611@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17354

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Added Files:
	matplotlib-0.87.7-matplotlibrc.patch 
	matplotlib-0.87.7-tkagg-check.patch 
Removed Files:
	matplotlib-0.87-matplotlibrc.patch 
Log Message:
- Update to 0.87.7 and fix up the defaults to use numpy
- Force build of tkagg backend without X server
- Use src.rpm from Jef Spaleta, closes bug 216578


matplotlib-0.87.7-matplotlibrc.patch:

--- NEW FILE matplotlib-0.87.7-matplotlibrc.patch ---
--- matplotlib-0.87/setup.py.orig	2006-02-14 11:11:32.000000000 -0700
+++ matplotlib-0.87/setup.py	2006-02-27 15:19:28.000000000 -0700
@@ -258,8 +258,8 @@
 
 # packagers: set rc['numerix'] and rc['backend'] here to override the auto
 # defaults, eg
-#rc['numerix'] = numpy
-#rc['backend'] = GTKAgg
+rc['numerix'] = 'numpy'
+rc['backend'] = 'GTKAgg'
 if sys.platform=='win32':
     rc = dict(backend='TkAgg', numerix='Numeric')
 template = file('matplotlibrc.template').read()

matplotlib-0.87.7-tkagg-check.patch:

--- NEW FILE matplotlib-0.87.7-tkagg-check.patch ---
--- matplotlib-0.87.7/setup.py.fix	2006-11-20 19:49:56.000000000 -0900
+++ matplotlib-0.87.7/setup.py	2006-11-20 19:51:03.000000000 -0900
@@ -251,16 +251,9 @@
         print 'Tkinter present but import failed'
         BUILD_TKAGG = 0
     else:
-        try:
-            tk = Tkinter.Tk()
-            tk.withdraw()
-        except Tkinter.TclError:
-            print 'Tkinter present, but window failed to open'
-            BUILD_TKAGG = 0
-        else:
-            BUILD_AGG = 1
-            build_tkagg(ext_modules, packages, NUMERIX)
-            rc['backend'] = 'TkAgg'
+        BUILD_AGG = 1
+        build_tkagg(ext_modules, packages, NUMERIX)
+        rc['backend'] = 'TkAgg'
 
 if BUILD_WXAGG:
     try:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Oct 2006 17:32:24 -0000	1.13
+++ .cvsignore	21 Nov 2006 15:36:32 -0000	1.14
@@ -1 +1 @@
-matplotlib-0.87.6.tar.gz
+matplotlib-0.87.7.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-matplotlib.spec	6 Oct 2006 17:32:24 -0000	1.20
+++ python-matplotlib.spec	21 Nov 2006 15:36:32 -0000	1.21
@@ -1,7 +1,7 @@
 %{!?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.6
+Version:        0.87.7
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -9,7 +9,8 @@
 License:        Python Software Foundation License 
 URL:            http://sourceforge.net/projects/matplotlib
 Source0:        http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
-Patch0:         matplotlib-0.87-matplotlibrc.patch
+Patch0:         matplotlib-0.87.7-matplotlibrc.patch
+Patch1:         matplotlib-0.87.7-tkagg-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
@@ -38,7 +39,8 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
-%patch -p1 -b .matplotlibrc
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b setup.py 
 chmod -x images/*.svg
 
 %build
@@ -71,6 +73,11 @@
 
 
 %changelog
+* Tue Nov  21 2006 Orion Poplawski  0.87.7-1
+- Update to 0.87.7 and fix up the defaults to use numpy
+- Force build of tkagg backend without X server
+- Use src.rpm from Jef Spaleta, closes bug 216578
+
 * Fri Oct  6 2006 Orion Poplawski  0.87.6-1
 - Update to 0.87.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Oct 2006 17:32:24 -0000	1.13
+++ sources	21 Nov 2006 15:36:32 -0000	1.14
@@ -1 +1 @@
-30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz
+cca3d3a644c1a84d6dcf4af8a9856b7b  matplotlib-0.87.7.tar.gz


--- matplotlib-0.87-matplotlibrc.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 15:38:59 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:38:59 -0500
Subject: rpms/beryl-dbus - New directory
Message-ID: <200611211538.kALFcxRD017801@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17796/beryl-dbus

Log Message:
Directory /cvs/extras/rpms/beryl-dbus added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:39:04 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:39:04 -0500
Subject: rpms/beryl-dbus/devel - New directory
Message-ID: <200611211539.kALFd4rs017816@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17796/beryl-dbus/devel

Log Message:
Directory /cvs/extras/rpms/beryl-dbus/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:39:15 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:39:15 -0500
Subject: rpms/beryl-dbus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211539.kALFdFKX017853@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17847

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-dbus


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-dbus
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  Tue Nov 21 15:39:20 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:39:20 -0500
Subject: rpms/beryl-dbus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211539.kALFdKKe017868@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17847/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-dbus


--- 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 Nov 21 15:39:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:39:51 -0500
Subject: rpms/rocksndiamonds/FC-5 rocksndiamonds.spec,1.4,1.5
Message-ID: <200611211539.kALFdpaX017989@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829/FC-5

Modified Files:
	rocksndiamonds.spec 
Log Message:

Somehow, these files didn't get tagged. *shrug*



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-5/rocksndiamonds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rocksndiamonds.spec	21 Nov 2006 15:31:40 -0000	1.4
+++ rocksndiamonds.spec	21 Nov 2006 15:39:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -65,7 +65,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-3
 - add patches from bz 210767
 
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1



From fedora-extras-commits at redhat.com  Tue Nov 21 15:39:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:39:51 -0500
Subject: rpms/rocksndiamonds/devel rocksndiamonds.spec,1.4,1.5
Message-ID: <200611211539.kALFdpQU017993@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829/devel

Modified Files:
	rocksndiamonds.spec 
Log Message:

Somehow, these files didn't get tagged. *shrug*



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rocksndiamonds.spec	21 Nov 2006 15:31:46 -0000	1.4
+++ rocksndiamonds.spec	21 Nov 2006 15:39:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -65,7 +65,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-3
 - add patches from bz 210767
 
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1



From fedora-extras-commits at redhat.com  Tue Nov 21 15:39:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:39:51 -0500
Subject: rpms/rocksndiamonds/FC-6 rocksndiamonds.spec,1.4,1.5
Message-ID: <200611211539.kALFdpst017992@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829/FC-6

Modified Files:
	rocksndiamonds.spec 
Log Message:

Somehow, these files didn't get tagged. *shrug*



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-6/rocksndiamonds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rocksndiamonds.spec	21 Nov 2006 15:31:45 -0000	1.4
+++ rocksndiamonds.spec	21 Nov 2006 15:39:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -65,7 +65,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-3
 - add patches from bz 210767
 
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1



From fedora-extras-commits at redhat.com  Tue Nov 21 15:40:08 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:40:08 -0500
Subject: rpms/beryl-dbus import.log,1.1,1.2
Message-ID: <200611211540.kALFe8hI018038@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17953

Modified Files:
	import.log 
Log Message:
auto-import beryl-dbus-0.1.2-4.fc7 on branch devel from beryl-dbus-0.1.2-4.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-dbus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 15:39:15 -0000	1.1
+++ import.log	21 Nov 2006 15:39:38 -0000	1.2
@@ -0,0 +1 @@
+beryl-dbus-0_1_2-4_fc7:HEAD:beryl-dbus-0.1.2-4.fc7.src.rpm:1164123586



From fedora-extras-commits at redhat.com  Tue Nov 21 15:40:08 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:40:08 -0500
Subject: rpms/beryl-dbus/devel beryl-dbus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611211540.kALFe8vp018042@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17953/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-dbus.spec 
Log Message:
auto-import beryl-dbus-0.1.2-4.fc7 on branch devel from beryl-dbus-0.1.2-4.fc7.src.rpm


--- NEW FILE beryl-dbus.spec ---
Name:           beryl-dbus
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        4%{?dist}

Summary:        Beryl OpenGL window and compositing manager dbus plug-in
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}, dbus-devel


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Beryl has a flexible plug-in system, which the
contents of this package take advantage of.


%prep
%setup -q

%build
%configure
# Parallel builds currently broken
#make %{?_smp_mflags}
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README
%dir %{_libdir}/beryl
%{_libdir}/beryl/libdbus.so
%{_datadir}/dbus-1/services/beryl.service


%changelog
* Fri Nov 17 2006 Jarod Wilson  0.1.2-4
- Remove Req: dbus, rely on auto-gen dbus lib dep

* Thu Nov 16 2006 Jarod Wilson  0.1.2-3
- Minimize BR:

* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarballs, now that they exist

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson  0.1.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-dbus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:39:20 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:39:38 -0000	1.2
@@ -0,0 +1 @@
+beryl-dbus-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-dbus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:39:20 -0000	1.1
+++ sources	21 Nov 2006 15:39:38 -0000	1.2
@@ -0,0 +1 @@
+15e9d90594b8e9ffa59e41f5c766749f  beryl-dbus-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:40:47 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 21 Nov 2006 10:40:47 -0500
Subject: rpms/gossip/FC-6 .cvsignore, 1.16, 1.17 gossip.spec, 1.31,
	1.32 sources, 1.16, 1.17
Message-ID: <200611211540.kALFelXB018300@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18118

Modified Files:
	.cvsignore gossip.spec sources 
Log Message:
* Sun Nov 19 2006 Brian Pepple  - 0.19-1
- Update to 0.19.
- Remove X-Fedora category from desktop file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-6/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Oct 2006 00:31:50 -0000	1.16
+++ .cvsignore	21 Nov 2006 15:40:17 -0000	1.17
@@ -1 +1 @@
-gossip-0.18.tar.bz2
+gossip-0.19.tar.bz2


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-6/gossip.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gossip.spec	17 Oct 2006 00:31:50 -0000	1.31
+++ gossip.spec	21 Nov 2006 15:40:17 -0000	1.32
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           gossip
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        Gnome Jabber Client
 
@@ -67,7 +67,6 @@
 
 desktop-file-install --vendor fedora --delete-original	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -126,6 +125,10 @@
 
 
 %changelog
+* Sun Nov 19 2006 Brian Pepple  - 0.19-1
+- Update to 0.19.
+- Remove X-Fedora category from desktop file.
+
 * Mon Oct 16 2006 Brian Pepple  - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-6/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Oct 2006 00:31:50 -0000	1.16
+++ sources	21 Nov 2006 15:40:17 -0000	1.17
@@ -1 +1 @@
-bb5be4bcb259c36c64e1809b665f7de6  gossip-0.18.tar.bz2
+49c60c4467d17948f7243a169c65775c  gossip-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:41:25 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:41:25 -0500
Subject: rpms/bdock - New directory
Message-ID: <200611211541.kALFfPBd018406@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401/bdock

Log Message:
Directory /cvs/extras/rpms/bdock added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:41:30 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:41:30 -0500
Subject: rpms/bdock/devel - New directory
Message-ID: <200611211541.kALFfUth018456@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401/bdock/devel

Log Message:
Directory /cvs/extras/rpms/bdock/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:41:46 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:41:46 -0500
Subject: rpms/bdock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611211541.kALFfkvd018539@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18515/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bdock


--- 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 Nov 21 15:41:41 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:41:41 -0500
Subject: rpms/bdock Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211541.kALFffoM018521@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18515

Added Files:
	Makefile import.log 
Log Message:
Setup of module bdock


--- NEW FILE Makefile ---
# Top level Makefile for module bdock
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  Tue Nov 21 15:42:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:42:02 -0500
Subject: rpms/rocksndiamonds/devel rocksndiamonds-YN.patch, NONE,
	1.1 rocksndiamonds-highscore.patch, NONE,
	1.1 rocksndiamonds.spec, 1.5, 1.6
Message-ID: <200611211542.kALFg2FY018587@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18375

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Actually cvs add the new patches in the devel branch. Idiot.


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rocksndiamonds.spec	21 Nov 2006 15:39:21 -0000	1.5
+++ rocksndiamonds.spec	21 Nov 2006 15:41:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -65,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-4
+- actually cvs add the devel patches
+
 * Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-3
 - add patches from bz 210767
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:42:33 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:42:33 -0500
Subject: rpms/bdock import.log,1.1,1.2
Message-ID: <200611211542.kALFgXs4018665@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18590

Modified Files:
	import.log 
Log Message:
auto-import bdock-0.1.2-4.fc7 on branch devel from bdock-0.1.2-4.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bdock/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 15:41:41 -0000	1.1
+++ import.log	21 Nov 2006 15:42:03 -0000	1.2
@@ -0,0 +1 @@
+bdock-0_1_2-4_fc7:HEAD:bdock-0.1.2-4.fc7.src.rpm:1164123731



From fedora-extras-commits at redhat.com  Tue Nov 21 15:42:38 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:42:38 -0500
Subject: rpms/bdock/devel bdock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611211542.kALFgcGw018669@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18590/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bdock.spec 
Log Message:
auto-import bdock-0.1.2-4.fc7 on branch devel from bdock-0.1.2-4.fc7.src.rpm


--- NEW FILE bdock.spec ---
Name:           bdock
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        4%{?dist}

Summary:        Beryl project's replacement windowmaker dock
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Source only available via svn right now
# svn://svn.beryl-project.org/beryl/tags/release-%{version}/%{name}
Source0:        %{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}
BuildRequires:  libtool, gettext-devel
BuildRequires:  libwnck-devel, gtk2-devel >= 2.8.0


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Bdock is a replacement for the windowmaker dock.


%prep
%setup -q
# Make pixmaps install where binary expects them
# (fixed in upstream svn).
perl -pi -e 's/pixmaps$/bdock/g' pixmaps/Makefile.am
autoreconf -v --install

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_bindir}/bdock
%dir %{_datadir}/bdock
%{_datadir}/bdock/*

%changelog
* Mon Nov 20 2006 Jarod Wilson  0.1.2-4
- Make pixmaps install where binary expects them

* Thu Nov 14 2006 Jarod Wilson  0.1.2-3
- Trim BR:

* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Remove zero-length doc files (note to self, don't forget
  to re-include them if/when they have content...)

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bdock/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:41:46 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:42:08 -0000	1.2
@@ -0,0 +1 @@
+bdock-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bdock/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:41:46 -0000	1.1
+++ sources	21 Nov 2006 15:42:08 -0000	1.2
@@ -0,0 +1 @@
+104825e8ef5ffa2f5e2ec5d8642d5b68  bdock-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:44:46 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:44:46 -0500
Subject: rpms/heliodor - New directory
Message-ID: <200611211544.kALFik5s018810@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18806/heliodor

Log Message:
Directory /cvs/extras/rpms/heliodor added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:44:51 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:44:51 -0500
Subject: rpms/heliodor/devel - New directory
Message-ID: <200611211544.kALFipOw018835@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18806/heliodor/devel

Log Message:
Directory /cvs/extras/rpms/heliodor/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:45:02 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:45:02 -0500
Subject: rpms/heliodor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211545.kALFj2f7018870@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864

Added Files:
	Makefile import.log 
Log Message:
Setup of module heliodor


--- NEW FILE Makefile ---
# Top level Makefile for module heliodor
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  Tue Nov 21 15:45:07 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:45:07 -0500
Subject: rpms/heliodor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211545.kALFj7Gd018885@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module heliodor


--- 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 Nov 21 15:45:56 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:45:56 -0500
Subject: rpms/heliodor import.log,1.1,1.2
Message-ID: <200611211545.kALFjuHC018962@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18929

Modified Files:
	import.log 
Log Message:
auto-import heliodor-0.1.2-4.fc7 on branch devel from heliodor-0.1.2-4.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/heliodor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 15:45:02 -0000	1.1
+++ import.log	21 Nov 2006 15:45:26 -0000	1.2
@@ -0,0 +1 @@
+heliodor-0_1_2-4_fc7:HEAD:heliodor-0.1.2-4.fc7.src.rpm:1164123934



From fedora-extras-commits at redhat.com  Tue Nov 21 15:45:56 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:45:56 -0500
Subject: rpms/heliodor/devel heliodor-0.1.2-metacity217.patch, NONE,
	1.1 heliodor.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211546.kALFjuWJ018966@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18929/devel

Modified Files:
	.cvsignore sources 
Added Files:
	heliodor-0.1.2-metacity217.patch heliodor.spec 
Log Message:
auto-import heliodor-0.1.2-4.fc7 on branch devel from heliodor-0.1.2-4.fc7.src.rpm

heliodor-0.1.2-metacity217.patch:

--- NEW FILE heliodor-0.1.2-metacity217.patch ---
diff -ur heliodor-0.1.2.orig/src/main.c heliodor-0.1.2/src/main.c
--- heliodor-0.1.2.orig/src/main.c	2006-11-09 11:07:50.000000000 -0500
+++ heliodor-0.1.2/src/main.c	2006-11-17 14:17:15.000000000 -0500
@@ -1383,7 +1383,7 @@
 
     corners_xregion = XCreateRegion ();
 
-    if (fgeom->top_left_corner_rounded)
+    if (fgeom->top_left_corner_rounded_radius)
     {
 	xrect.x = 0;
 	xrect.y = 0;
@@ -1409,7 +1409,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->top_right_corner_rounded)
+    if (fgeom->top_right_corner_rounded_radius)
     {
 	xrect.x = width - 5;
 	xrect.y = 0;
@@ -1438,7 +1438,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->bottom_left_corner_rounded)
+    if (fgeom->bottom_left_corner_rounded_radius)
     {
 	xrect.x = 0;
 	xrect.y = height - 1;
@@ -1464,7 +1464,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->bottom_right_corner_rounded)
+    if (fgeom->bottom_right_corner_rounded_radius)
     {
 	xrect.x = width - 5;
 	xrect.y = height - 1;
@@ -1715,16 +1715,16 @@
 	    static decor_color_t color = { 0.0, 0.0, 0.0 };
 	    int			 corners = 0;
 
-	    if (fgeom.top_left_corner_rounded)
+	    if (fgeom.top_left_corner_rounded_radius)
 		corners |= CORNER_TOPLEFT;
 
-	    if (fgeom.top_right_corner_rounded)
+	    if (fgeom.top_right_corner_rounded_radius)
 		corners |= CORNER_TOPRIGHT;
 
-	    if (fgeom.bottom_left_corner_rounded)
+	    if (fgeom.bottom_left_corner_rounded_radius)
 		corners |= CORNER_BOTTOMLEFT;
 
-	    if (fgeom.bottom_right_corner_rounded)
+	    if (fgeom.bottom_right_corner_rounded_radius)
 		corners |= CORNER_BOTTOMRIGHT;
 
 	    if (d->state & (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
Only in heliodor-0.1.2.orig/src: .main.c.swp


--- NEW FILE heliodor.spec ---
Name:           heliodor
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        4%{?dist}

Summary:        Beryl window decorator with Metacity theme support
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Source only available via svn right now
# svn://svn.beryl-project.org/beryl/tags/release-%{version}/%{name}
Source0:        %{name}-%{version}.tar.bz2
Patch0:         heliodor-0.1.2-metacity217.patch

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}, gnome-desktop-devel
BuildRequires:  metacity, control-center-devel
BuildRequires:  libtool, gettext-devel
BuildRequires:  libwnck-devel


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Heliodor is a gtk-window-decorator for use with beryl
that supports using Metacity themes.


%prep
%setup -q
%if "%{?fedora}" >= "7"
%patch0 -p1 -b .metacity217
%endif
autoreconf -v --install


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/window-manager-settings/libberyl.so
%{_bindir}/heliodor
%{_datadir}/gnome/wm-properties/beryl.desktop


%changelog
* Mon Nov 20 2006 Jarod Wilson  0.1.2-4
- Remove some R:, let auto lib deps pull them in

* Fri Nov 17 2006 Jarod Wilson  0.1.2-3
- Fix for Metacity 2.17+ changes

* Thu Nov 16 2006 Jarod Wilson  0.1.2-2
- Trim BR:

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heliodor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:45:07 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:45:26 -0000	1.2
@@ -0,0 +1 @@
+heliodor-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heliodor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:45:07 -0000	1.1
+++ sources	21 Nov 2006 15:45:26 -0000	1.2
@@ -0,0 +1 @@
+2594e689f6f319f8f42a5ef582aac307  heliodor-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:47:08 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:47:08 -0500
Subject: rpms/aquamarine - New directory
Message-ID: <200611211547.kALFl8SN019043@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19039/aquamarine

Log Message:
Directory /cvs/extras/rpms/aquamarine added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:47:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:47:13 -0500
Subject: rpms/aquamarine/devel - New directory
Message-ID: <200611211547.kALFlD8m019056@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19039/aquamarine/devel

Log Message:
Directory /cvs/extras/rpms/aquamarine/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:47:24 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:47:24 -0500
Subject: rpms/aquamarine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211547.kALFlOBc019086@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19080

Added Files:
	Makefile import.log 
Log Message:
Setup of module aquamarine


--- NEW FILE Makefile ---
# Top level Makefile for module aquamarine
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  Tue Nov 21 15:47:29 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:47:29 -0500
Subject: rpms/aquamarine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211547.kALFlThc019101@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19080/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aquamarine


--- 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 Nov 21 15:48:16 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:48:16 -0500
Subject: rpms/aquamarine import.log,1.1,1.2
Message-ID: <200611211548.kALFmGj2019174@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19144

Modified Files:
	import.log 
Log Message:
auto-import aquamarine-0.1.2-3.fc7 on branch devel from aquamarine-0.1.2-3.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 15:47:24 -0000	1.1
+++ import.log	21 Nov 2006 15:47:46 -0000	1.2
@@ -0,0 +1 @@
+aquamarine-0_1_2-3_fc7:HEAD:aquamarine-0.1.2-3.fc7.src.rpm:1164124074



From fedora-extras-commits at redhat.com  Tue Nov 21 15:48:16 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:48:16 -0500
Subject: rpms/aquamarine/devel aquamarine.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611211548.kALFmGPR019178@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19144/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aquamarine.spec 
Log Message:
auto-import aquamarine-0.1.2-3.fc7 on branch devel from aquamarine-0.1.2-3.fc7.src.rpm


--- NEW FILE aquamarine.spec ---
Name:           aquamarine
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        3%{?dist}

Summary:        Themeable window decorator and compositing manager for Beryl
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Source only available via svn right now
# svn://svn.beryl-project.org/beryl/tags/release-%{version}/%{name}
Source0:        %{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}
BuildRequires:  qt-devel, kdelibs-devel, kdebase-devel
BuildRequires:  libtool


%description
Aquamarine is themeable window decorator and compositing
manager for Beryl. Launch Theme Manager from
beryl-manager to change themes. Aquamarine is intended
for use with KDE.

%prep
%setup -q
make -f admin/Makefile.common svn

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/aquamarine


%changelog
* Fri Nov 17 2006 Jarod Wilson  0.1.2-3
- Remove R: qt, kdelibs, rely on auto-gen lib deps

* Thu Nov 16 2006 Jarod Wilson  0.1.2-2
- Trim BR:

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:47:29 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:47:46 -0000	1.2
@@ -0,0 +1 @@
+aquamarine-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:47:29 -0000	1.1
+++ sources	21 Nov 2006 15:47:46 -0000	1.2
@@ -0,0 +1 @@
+72f02f7d8b0c6fed9ece870266b1fd8f  aquamarine-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:55:57 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 10:55:57 -0500
Subject: rpms/lib3ds/FC-6 lib3ds.spec,1.11,1.12
Message-ID: <200611211555.kALFtvvh019279@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19254

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
- Add Provides: *-static.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-6/lib3ds.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lib3ds.spec	5 Sep 2006 09:09:13 -0000	1.11
+++ lib3ds.spec	21 Nov 2006 15:55:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -42,6 +42,7 @@
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
+Provides:	lib3ds-static = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
@@ -72,6 +73,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
+- Add Provides: *-static.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-9
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:57:33 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 10:57:33 -0500
Subject: rpms/lib3ds/FC-5 lib3ds.spec,1.10,1.11
Message-ID: <200611211557.kALFvXtl019389@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19342

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
- Add Provides: *-static.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-5/lib3ds.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lib3ds.spec	28 Feb 2006 17:53:30 -0000	1.10
+++ lib3ds.spec	21 Nov 2006 15:57:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        7%{?dist}
+Release:        10%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -42,6 +42,7 @@
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
+Provides:	lib3ds-static = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
@@ -72,6 +73,15 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
+- Add Provides: *-static.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-9
+- Mass rebuild.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-8
+- Mass rebuild.
+
 * Thu Feb 28 2006 Ralf Corsepius  - 1.2.0-7
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:57:40 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 21 Nov 2006 10:57:40 -0500
Subject: rpms/lat/devel lat.spec,1.11,1.12
Message-ID: <200611211557.kALFvePi019397@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/lat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19361

Modified Files:
	lat.spec 
Log Message:
Add missing runtime dep, gnome-sharp


Index: lat.spec
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/lat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lat.spec	20 Oct 2006 15:00:39 -0000	1.11
+++ lat.spec	21 Nov 2006 15:57:10 -0000	1.12
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.1.1
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPL
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
@@ -13,7 +13,7 @@
 BuildRequires:      gtk-sharp2 >= 2.8.0
 %else
 BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
-Requires:           scrollkeeper
+Requires:           scrollkeeper, gnome-sharp
 %endif
 Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp
 
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Tue Nov 21 2006 Paul Howarth  1.2.1.1-2
+- Add missing runtime dep, gnome-sharp
+
 * Fri Oct 20 2006 Paul Howarth  1.2.1.1-1
 - Update to 1.2.1.1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:59:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 10:59:11 -0500
Subject: rpms/lib3ds/FC-4 lib3ds.spec,1.8,1.9
Message-ID: <200611211559.kALFxBcW019508@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19455

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
- Add Provides: *-static.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-4/lib3ds.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lib3ds.spec	5 Jan 2006 14:15:31 -0000	1.8
+++ lib3ds.spec	21 Nov 2006 15:58:41 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        6%{?dist}
+Release:        10%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -42,6 +42,7 @@
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
+Provides:	lib3ds-static = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
@@ -72,6 +73,18 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
+- Add Provides: *-static.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-9
+- Mass rebuild.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-8
+- Mass rebuild.
+
+* Thu Feb 28 2006 Ralf Corsepius  - 1.2.0-7
+- Rebuild.
+
 * Thu Jan 05 2006 Ralf Corsepius  - 1.2.0-6
 - PR 176665: Apply upstream patch.
 - Add %%dist.



From fedora-extras-commits at redhat.com  Tue Nov 21 16:00:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 21 Nov 2006 11:00:01 -0500
Subject: rpms/lat/FC-6 lat.spec,1.11,1.12
Message-ID: <200611211600.kALG014X019595@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/lat/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19564

Modified Files:
	lat.spec 
Log Message:
Add missing runtime dep, gnome-sharp


Index: lat.spec
===================================================================
RCS file: /cvs/extras/rpms/lat/FC-6/lat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lat.spec	20 Oct 2006 15:00:39 -0000	1.11
+++ lat.spec	21 Nov 2006 15:59:31 -0000	1.12
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.1.1
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPL
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
@@ -13,7 +13,7 @@
 BuildRequires:      gtk-sharp2 >= 2.8.0
 %else
 BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
-Requires:           scrollkeeper
+Requires:           scrollkeeper, gnome-sharp
 %endif
 Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp
 
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Tue Nov 21 2006 Paul Howarth  1.2.1.1-2
+- Add missing runtime dep, gnome-sharp
+
 * Fri Oct 20 2006 Paul Howarth  1.2.1.1-1
 - Update to 1.2.1.1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 16:03:45 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 11:03:45 -0500
Subject: owners owners.list,1.1982,1.1983
Message-ID: <200611211603.kALG3jhf019940@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19895

Modified Files:
	owners.list 
Log Message:
Add aquamarine, bdock, beryl-dbus and heliodor


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1982
retrieving revision 1.1983
diff -u -r1.1982 -r1.1983
--- owners.list	21 Nov 2006 15:00:32 -0000	1.1982
+++ owners.list	21 Nov 2006 16:03:15 -0000	1.1983
@@ -64,6 +64,7 @@
 Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|aquamarine|Themeable window decorator and compositing manager for Beryl|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|archmage|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|ardour|Multichannel Digital Audio Workstation|green at redhat.com|extras-qa at fedoraproject.org|
@@ -106,9 +107,11 @@
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|bdock|Beryl project's replacement windowmaker dock|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-core|Beryl OpenGL window and compositing manager|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-dbus|Beryl OpenGL window and compositing manager dbus plugin|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-manager|Beryl OpenGL window and compositing manager control application|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-plugins|Beryl OpenGL window and compositing manager plugins|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-settings|Beryl OpenGL window and compositing manager settings utility|jwilson at redhat.com|extras-qa at fedoraproject.org|
@@ -682,6 +685,7 @@
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|heliodor|Beryl window decorator with Metacity theme support|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|HelixPlayer|Open source media player based on the Helix framework|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 16:06:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 11:06:09 -0500
Subject: rpms/jd/devel .cvsignore, 1.19, 1.20 jd.spec, 1.26, 1.27 sources,
	1.19, 1.20
Message-ID: <200611211606.kALG69j0019993@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19974

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 21 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061121
- cvs 061121 (25:00 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	21 Nov 2006 07:41:29 -0000	1.19
+++ .cvsignore	21 Nov 2006 16:05:39 -0000	1.20
@@ -1 +1 @@
-jd-1.8.1-cvs061120.tgz
+jd-1.8.1-cvs061121.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jd.spec	21 Nov 2006 07:41:29 -0000	1.26
+++ jd.spec	21 Nov 2006 16:05:39 -0000	1.27
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061120
+%define         strtag        cvs061121
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Nov 20 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061120
-- cvs 061120 (23:50 JST)
+* Tue Nov 21 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061121
+- cvs 061121 (25:00 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	21 Nov 2006 07:41:29 -0000	1.19
+++ sources	21 Nov 2006 16:05:39 -0000	1.20
@@ -1 +1 @@
-fe1f6b3350d0f59dc0e8c832caed26d8  jd-1.8.1-cvs061120.tgz
+c26742d0e0b634d5a8ad49bc6cb7fd04  jd-1.8.1-cvs061121.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:07:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 21 Nov 2006 11:07:48 -0500
Subject: rpms/prboom/devel .cvsignore, 1.8, 1.9 prboom.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200611211607.kALG7mNv020080@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20021

Modified Files:
	.cvsignore prboom.spec sources 
Log Message:
Update to 2.4.7




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2006 03:01:59 -0000	1.8
+++ .cvsignore	21 Nov 2006 16:07:18 -0000	1.9
@@ -1 +1 @@
-prboom-2.4.6.tar.gz
+prboom-2.4.7.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- prboom.spec	18 Oct 2006 03:01:59 -0000	1.12
+++ prboom.spec	21 Nov 2006 16:07:18 -0000	1.13
@@ -1,14 +1,14 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.4.6
+Version:        2.4.7
 Release:        1%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://prboom.sourceforge.net/
-Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.6.tar.gz
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.7.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -58,6 +58,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Nov 19 2006 Wart  2.4.7-1
+- Update to 2.4.7
+
 * Tue Oct 17 2006 Wart  2.4.6-1
 - Update to 2.4.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2006 03:01:59 -0000	1.8
+++ sources	21 Nov 2006 16:07:18 -0000	1.9
@@ -1 +1 @@
-0f60f3ad6a8dad5b2c6d4360f181ac22  prboom-2.4.6.tar.gz
+9942f521764d7f89df2218a456da4f02  prboom-2.4.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:19:29 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 11:19:29 -0500
Subject: owners owners.list,1.1983,1.1984
Message-ID: <200611211619.kALGJTRr020262@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20205

Modified Files:
	owners.list 
Log Message:
Added openvrml.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1983
retrieving revision 1.1984
diff -u -r1.1983 -r1.1984
--- owners.list	21 Nov 2006 16:03:15 -0000	1.1983
+++ owners.list	21 Nov 2006 16:18:59 -0000	1.1984
@@ -1237,6 +1237,7 @@
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|optipng|A PNG optimizer and converter|opensource at till.name|extras-qa at fedoraproject.org|
+Fedora Extras|openvrml|VRML/X3D runtime library and player|braden at endoframe.com|extras-qa at fedoraproject.org|
 Fedora Extras|orage|Time-managing application for Xfce4|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ORBit|CORBA Object Request Broker library for GNOME-1 compatibility|paul at city-fan.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 16:31:55 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 21 Nov 2006 11:31:55 -0500
Subject: rpms/gnash/devel .cvsignore, 1.2, 1.3 gnash.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <200611211631.kALGVtCt021214@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21192

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Sat Nov  6 2006 Patrice Dumas  0.7.2-1
- update for 0.7.2 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Aug 2006 08:39:02 -0000	1.2
+++ .cvsignore	21 Nov 2006 16:31:25 -0000	1.3
@@ -1 +1 @@
-gnash-0.7.1.tar.bz2
+gnash-0.7.2.tar.bz2


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnash.spec	4 Oct 2006 22:21:54 -0000	1.3
+++ gnash.spec	21 Nov 2006 16:31:25 -0000	1.4
@@ -1,24 +1,27 @@
 Name:           gnash
-Version:        0.7.1
-Release:        9%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
-Source1:        gnash-README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel libjpeg-devel libogg-devel libXmu-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
+BuildRequires:  boost-devel curl-devel 
+# the opengl devel packages are required by gtkglext-devel
+# monolithic Xorg
+#BuildRequires:  xorg-x11-devel
+# modular Xorg 
+#BuildRequires:  libGLU-devel libGL-devel
+BuildRequires:  SDL-devel 
 BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel
-## GStreamer isn't used yet, but will be in the near future.
-#BuildRequires:  gstreamer-devel
 BuildRequires:  docbook2X
+BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  scrollkeeper
-BuildRequires:  automake, libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -26,23 +29,16 @@
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Patch1:         gnash-configure-pkgconfig.patch
-Patch2:		gnash-continue_on_info_install_error.patch
-Patch3:         gnash-plugin-tempfile-dir.patch
 
 %description
 Gnash is a GNU Flash movie player based on GameSWF,
 and supports many SWF v7 features.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %package plugin
-Summary:   Flash movie player plugin for Mozilla Browser
+Summary:   Web-client flash movie player plugin 
 Requires:  %{name} = %{version}-%{release}
 # this doesn't prevent wrong dependencies, in case a package
-# provides %{_libdir}/mozilla/plugins (like kdebase for konqueror)
+# provides %%{_libdir}/mozilla/plugins (like kdebase for konqueror)
 # and another unrelated webbrowser is installed, like w3m-el.
 # Moreover konqueror could provide webclient some day
 Requires:  %{_libdir}/mozilla/plugins webclient
@@ -51,10 +47,6 @@
 %description plugin
 The gnash flash movie player plugin for firefox or mozilla.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %package klash
 Summary:   Konqueror flash movie player plugin
 Requires:  %{name} = %{version}-%{release}
@@ -63,35 +55,32 @@
 %description klash
 The gnash flash movie player plugin for Konqueror.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %prep
 %setup -q
-cp -p %{SOURCE1} README.fedora
-%patch1 -p1 -b .1
-%patch2 -p0 -b .2
-%patch3 -p0 -b .3
-autoreconf
-
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-klash --disable-rpath \
-  --disable-dependency-tracking --with-qtdir=$QTDIR
+  --enable-ghelp --enable-docbook --enable-sound=GST \
+  --disable-dependency-tracking --disable-rpath \
+  --with-qtdir=$QTDIR
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,so}
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,18 +90,15 @@
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 
-
 %preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
-
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
@@ -121,19 +107,16 @@
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
+%{_libdir}/libgnash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/
-%{_libdir}/libgnash*.so.*
-
 
 %files plugin
 %defattr(-,root,root,-)
-%doc README.fedora
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
-
 %files klash
 %defattr(-,root,root,-)
 %{_bindir}/klash
@@ -142,13 +125,15 @@
 %{_datadir}/config/klashrc
 %{_datadir}/services/klash_part.desktop
 
-
 %changelog
+* Sat Nov  6 2006 Patrice Dumas  0.7.2-1
+- update for 0.7.2 release.
+
 * Thu Oct 05 2006 Christian Iseli  0.7.1-9
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Sun Sep 24 2006 Patrice Dumas  0.7.1-8
-- plugin requires %{_libdir}/mozilla/plugins. Fix (incompletly and 
+- plugin requires %%{_libdir}/mozilla/plugins. Fix (incompletly and 
   temporarily, but there is no better solution yet) #207613
 
 * Sun Aug 27 2006 Patrice Dumas  - 0.7.1-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Aug 2006 08:39:02 -0000	1.2
+++ sources	21 Nov 2006 16:31:25 -0000	1.3
@@ -1 +1 @@
-d860981aeaac0fc941a28abc3c24223c  gnash-0.7.1.tar.bz2
+ccef0f45be01a4c2992b46c2363a514f  gnash-0.7.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 16:38:56 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 21 Nov 2006 11:38:56 -0500
Subject: rpms/espeak/devel .cvsignore, 1.2, 1.3 espeak.spec, 1.1,
	1.2 espeak_program_name.patch, 1.1, 1.2 sources, 1.2,
	1.3 compiledict-amd64_sizeof.patch, 1.1,
	NONE makefile_install_target.patch, 1.1, NONE
Message-ID: <200611211638.kALGcu0T021356@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21329

Modified Files:
	.cvsignore espeak.spec espeak_program_name.patch sources 
Removed Files:
	compiledict-amd64_sizeof.patch makefile_install_target.patch 
Log Message:
- Update to version 1.17
- Removed "makefile install target" patch as it has been included upstream
- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
- Minor modification to "espeak program name" patch to allow patching current version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 17:28:19 -0000	1.2
+++ .cvsignore	21 Nov 2006 16:38:26 -0000	1.3
@@ -1 +1 @@
-espeak-1.16-source.zip
+espeak-1.17-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/espeak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak.spec	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak.spec	21 Nov 2006 16:38:26 -0000	1.2
@@ -1,16 +1,14 @@
 Name:           espeak
-Version:        1.16
-Release:        4%{?dist}
+Version:        1.17
+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-1.16-source.zip
+Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
 Patch0:         makefile_lpthread.patch
-Patch1:         makefile_install_target.patch
-Patch2:         compiledict-amd64_sizeof.patch
-Patch3:         espeak_program_name.patch
+Patch1:         espeak_program_name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -43,9 +41,7 @@
 %setup -q -n espeak-%{version}-source
 chmod 0644 src/* 
 %patch0 -p1 -b .pthread
-%patch1 -p1 -b .install_target
-%patch2 -p1 -b .amd64sizeof
-%patch3 -p1 -b .espeak_name
+%patch1 -p1 -b .espeak_name
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
@@ -91,6 +87,12 @@
 
 
 %changelog
+* Mon Nov 20 2006 Francois Aucamp  - 1.17-1
+- Update to version 1.17
+- Removed "makefile install target" patch as it has been included upstream
+- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
+- Minor modification to "espeak program name" patch to allow patching current version
+
 * Tue Nov 07 2006 Francois Aucamp  - 1.16-4
 - Modified patch steps to create backups with different suffixes
 - Renamed patch file extensions to .patch

espeak_program_name.patch:

Index: espeak_program_name.patch
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/espeak_program_name.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak_program_name.patch	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak_program_name.patch	21 Nov 2006 16:38:26 -0000	1.2
@@ -263,7 +263,7 @@
 @@ -6,7 +6,7 @@
  DATADIR=/usr/share/espeak-data
  
- RELEASE = 1.16
+ RELEASE = 1.17
 -BIN_NAME = speak
 +BIN_NAME = espeak
  LIB_NAME = libespeak.so


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 17:28:19 -0000	1.2
+++ sources	21 Nov 2006 16:38:26 -0000	1.3
@@ -1 +1 @@
-c376ea94cddda90b093f231926f7ba44  espeak-1.16-source.zip
+6deb00b3fc73b0ef0cc6687b4cfc7ae2  espeak-1.17-source.zip


--- compiledict-amd64_sizeof.patch DELETED ---


--- makefile_install_target.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 16:43:02 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 11:43:02 -0500
Subject: rpms/php-pear-Services-Weather/devel php-pear-Services-Weather.spec,
	NONE, 1.1 xml2changelog, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611211643.kALGh2Qx021501@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21473

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Services-Weather.spec xml2changelog 
Log Message:
	upload



--- NEW FILE php-pear-Services-Weather.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Services_Weather

Name:           php-pear-Services-Weather
Version:        1.4.0
Release:        2%{?dist}
Summary:        This class acts as an interface to various online weather-services

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Services_Weather
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

Requires:       php-pear(PEAR) php-pear(HTTP_Request) >= 1.2.0
Requires(hint): php-pear(Net_FTP) >= 1.3.1, php-pear(Cache) >= 1.5.3, php-pear(DB) >= 1.4.0
Requires(hint): php-pear(SOAP) >= 0.7.5, php-pear(XML_Serializer) >= 0.8

%description
Services_Weather searches for given locations and retrieves current
weather data and, dependent on the used service, also forecasts.
Up to now, GlobalWeather from CapeScience, Weather XML from EJSE (US
only), a XOAP service from Weather.com and METAR/TAF from NOAA are
supported. Further services will get included, if they become available, 
have a usable API and are properly documented.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir


# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

# Make buildMetarDB.php working
sed -i -e s@/usr/local/bin/php@%{_bindir}/php@ $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/buildMetarDB.php
chmod +x $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/buildMetarDB.php

%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG docdir/*

%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Services
%{pear_datadir}/%{pear_name}


%changelog
* Sat Nov 18 2006 Remi Collet  1.4.0-2
- Unobfuscate sed command

* Sat Nov 04 2006 Remi Collet  1.4.0-1
- initial RPM (generated + cleanup)
- add genarated CHANGELOG
- fix buildMetarDB.php


--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Services-Weather/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 06:39:13 -0000	1.1
+++ .cvsignore	21 Nov 2006 16:42:32 -0000	1.2
@@ -0,0 +1 @@
+Services_Weather-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Services-Weather/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 06:39:13 -0000	1.1
+++ sources	21 Nov 2006 16:42:32 -0000	1.2
@@ -0,0 +1 @@
+a83fbf5e2e7ffd22219c513cfefe6b52  Services_Weather-1.4.0.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:44:22 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 21 Nov 2006 11:44:22 -0500
Subject: rpms/espeak/FC-6 .cvsignore, 1.2, 1.3 espeak.spec, 1.1,
	1.2 espeak_program_name.patch, 1.1, 1.2 sources, 1.2,
	1.3 compiledict-amd64_sizeof.patch, 1.1,
	NONE makefile_install_target.patch, 1.1, NONE
Message-ID: <200611211644.kALGiMMk021581@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21515

Modified Files:
	.cvsignore espeak.spec espeak_program_name.patch sources 
Removed Files:
	compiledict-amd64_sizeof.patch makefile_install_target.patch 
Log Message:
- Update to version 1.17
- Removed "makefile install target" patch as it has been included upstream
- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
- Minor modification to "espeak program name" patch to allow patching current version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 17:28:19 -0000	1.2
+++ .cvsignore	21 Nov 2006 16:43:52 -0000	1.3
@@ -1 +1 @@
-espeak-1.16-source.zip
+espeak-1.17-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/espeak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak.spec	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak.spec	21 Nov 2006 16:43:52 -0000	1.2
@@ -1,16 +1,14 @@
 Name:           espeak
-Version:        1.16
-Release:        4%{?dist}
+Version:        1.17
+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-1.16-source.zip
+Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
 Patch0:         makefile_lpthread.patch
-Patch1:         makefile_install_target.patch
-Patch2:         compiledict-amd64_sizeof.patch
-Patch3:         espeak_program_name.patch
+Patch1:         espeak_program_name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -43,9 +41,7 @@
 %setup -q -n espeak-%{version}-source
 chmod 0644 src/* 
 %patch0 -p1 -b .pthread
-%patch1 -p1 -b .install_target
-%patch2 -p1 -b .amd64sizeof
-%patch3 -p1 -b .espeak_name
+%patch1 -p1 -b .espeak_name
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
@@ -91,6 +87,12 @@
 
 
 %changelog
+* Mon Nov 20 2006 Francois Aucamp  - 1.17-1
+- Update to version 1.17
+- Removed "makefile install target" patch as it has been included upstream
+- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
+- Minor modification to "espeak program name" patch to allow patching current version
+
 * Tue Nov 07 2006 Francois Aucamp  - 1.16-4
 - Modified patch steps to create backups with different suffixes
 - Renamed patch file extensions to .patch

espeak_program_name.patch:

Index: espeak_program_name.patch
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/espeak_program_name.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak_program_name.patch	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak_program_name.patch	21 Nov 2006 16:43:52 -0000	1.2
@@ -263,7 +263,7 @@
 @@ -6,7 +6,7 @@
  DATADIR=/usr/share/espeak-data
  
- RELEASE = 1.16
+ RELEASE = 1.17
 -BIN_NAME = speak
 +BIN_NAME = espeak
  LIB_NAME = libespeak.so


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 17:28:19 -0000	1.2
+++ sources	21 Nov 2006 16:43:52 -0000	1.3
@@ -1 +1 @@
-c376ea94cddda90b093f231926f7ba44  espeak-1.16-source.zip
+6deb00b3fc73b0ef0cc6687b4cfc7ae2  espeak-1.17-source.zip


--- compiledict-amd64_sizeof.patch DELETED ---


--- makefile_install_target.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 16:46:22 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 21 Nov 2006 11:46:22 -0500
Subject: rpms/espeak/FC-5 .cvsignore, 1.2, 1.3 espeak.spec, 1.1,
	1.2 espeak_program_name.patch, 1.1, 1.2 sources, 1.2,
	1.3 compiledict-amd64_sizeof.patch, 1.1,
	NONE makefile_install_target.patch, 1.1, NONE
Message-ID: <200611211646.kALGkMFZ021704@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21662

Modified Files:
	.cvsignore espeak.spec espeak_program_name.patch sources 
Removed Files:
	compiledict-amd64_sizeof.patch makefile_install_target.patch 
Log Message:
- Update to version 1.17
- Removed "makefile install target" patch as it has been included upstream
- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
- Minor modification to "espeak program name" patch to allow patching current version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 17:28:19 -0000	1.2
+++ .cvsignore	21 Nov 2006 16:45:51 -0000	1.3
@@ -1 +1 @@
-espeak-1.16-source.zip
+espeak-1.17-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-5/espeak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak.spec	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak.spec	21 Nov 2006 16:45:51 -0000	1.2
@@ -1,16 +1,14 @@
 Name:           espeak
-Version:        1.16
-Release:        4%{?dist}
+Version:        1.17
+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-1.16-source.zip
+Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
 Patch0:         makefile_lpthread.patch
-Patch1:         makefile_install_target.patch
-Patch2:         compiledict-amd64_sizeof.patch
-Patch3:         espeak_program_name.patch
+Patch1:         espeak_program_name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -43,9 +41,7 @@
 %setup -q -n espeak-%{version}-source
 chmod 0644 src/* 
 %patch0 -p1 -b .pthread
-%patch1 -p1 -b .install_target
-%patch2 -p1 -b .amd64sizeof
-%patch3 -p1 -b .espeak_name
+%patch1 -p1 -b .espeak_name
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
@@ -91,6 +87,12 @@
 
 
 %changelog
+* Mon Nov 20 2006 Francois Aucamp  - 1.17-1
+- Update to version 1.17
+- Removed "makefile install target" patch as it has been included upstream
+- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
+- Minor modification to "espeak program name" patch to allow patching current version
+
 * Tue Nov 07 2006 Francois Aucamp  - 1.16-4
 - Modified patch steps to create backups with different suffixes
 - Renamed patch file extensions to .patch

espeak_program_name.patch:

Index: espeak_program_name.patch
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-5/espeak_program_name.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak_program_name.patch	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak_program_name.patch	21 Nov 2006 16:45:51 -0000	1.2
@@ -263,7 +263,7 @@
 @@ -6,7 +6,7 @@
  DATADIR=/usr/share/espeak-data
  
- RELEASE = 1.16
+ RELEASE = 1.17
 -BIN_NAME = speak
 +BIN_NAME = espeak
  LIB_NAME = libespeak.so


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 17:28:19 -0000	1.2
+++ sources	21 Nov 2006 16:45:51 -0000	1.3
@@ -1 +1 @@
-c376ea94cddda90b093f231926f7ba44  espeak-1.16-source.zip
+6deb00b3fc73b0ef0cc6687b4cfc7ae2  espeak-1.17-source.zip


--- compiledict-amd64_sizeof.patch DELETED ---


--- makefile_install_target.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 16:51:14 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 11:51:14 -0500
Subject: rpms/spandsp/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 spandsp.spec, 1.3, 1.4
Message-ID: <200611211651.kALGpEN5021819@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21800

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 14:38:32 -0000	1.4
+++ .cvsignore	21 Nov 2006 16:50:44 -0000	1.5
@@ -1 +1 @@
-spandsp-0.0.3pre24.tgz
+spandsp-0.0.3pre25.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 14:38:32 -0000	1.4
+++ sources	21 Nov 2006 16:50:44 -0000	1.5
@@ -1 +1 @@
-1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz
+6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spandsp.spec	7 Oct 2006 14:38:32 -0000	1.3
+++ spandsp.spec	21 Nov 2006 16:50:44 -0000	1.4
@@ -1,4 +1,4 @@
-%define pre 24
+%define pre 25
 
 Summary: A DSP library for telephony
 Name: spandsp
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.0.3-1.pre25
+- Update to 0.0.3pre25
+
 * Sat Oct  7 2006 Jeffrey C. Ollie  - 0.0.3-1.pre24
 - Update to 0.0.3pre24
 - Add dist tag.



From fedora-extras-commits at redhat.com  Tue Nov 21 16:54:04 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 11:54:04 -0500
Subject: rpms/numpy/FC-6 numpy-1.0-gfortran.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 numpy.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611211654.kALGs41X021952@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/numpy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21918

Modified Files:
	.cvsignore numpy.spec sources 
Added Files:
	numpy-1.0-gfortran.patch 
Log Message:
Bump to numpy 1.0 release

numpy-1.0-gfortran.patch:

--- NEW FILE numpy-1.0-gfortran.patch ---
diff -ur numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py numpy-1.0/numpy/distutils/fcompiler/gnu.py
--- numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py	2006-10-09 03:46:59.000000000 -0400
+++ numpy-1.0/numpy/distutils/fcompiler/gnu.py	2006-10-25 13:51:18.000000000 -0400
@@ -30,7 +30,7 @@
         'compiler_f77' : [fc_exe, "-g", "-Wall","-fno-second-underscore"],
         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
         'compiler_fix' : None,
-        'linker_so'    : [fc_exe, "-g", "-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-g", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe, "-g", "-Wall"]
@@ -255,7 +255,7 @@
         'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
         'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
         'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
-        'linker_so'    : [fc_exe,"-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe,"-Wall"]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Sep 2006 20:36:23 -0000	1.5
+++ .cvsignore	21 Nov 2006 16:53:34 -0000	1.6
@@ -1,2 +1,3 @@
 numpy-0.9.6.tar.gz
 numpy-0.9.8.tar.gz
+numpy-1.0.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/numpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numpy.spec	5 Sep 2006 20:36:23 -0000	1.6
+++ numpy.spec	21 Nov 2006 16:53:34 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        0.9.8
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -12,8 +12,7 @@
 URL:            http://numeric.scipy.org/
 Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-0.9.4-f2pynumpy.patch
-Patch1:         numpy-0.9.8-gfortran.patch
-Patch2:         numpy-0.9.8-check_types.patch
+Patch1:         numpy-1.0-gfortran.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran
@@ -34,7 +33,6 @@
 %setup -q
 %patch0 -p1 -b .f2pynumpy
 %patch1 -p1 -b .gfortran
-%patch2 -p1 -b .check_types
 
 %build
 ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -43,7 +41,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# skip-build currently broken, this works around it for now
+ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
+    %{__python} setup.py install --root $RPM_BUILD_ROOT
 rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
 rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc .
@@ -68,6 +70,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Oct 25 2006 Jarod Wilson  1.0-1
+- New upstream release
+
 * Tue Sep 06 2006 Jarod Wilson  0.9.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Sep 2006 20:36:23 -0000	1.5
+++ sources	21 Nov 2006 16:53:34 -0000	1.6
@@ -1 +1 @@
-ca528d2b460a6567d70bb6bdf0dc1805  numpy-0.9.8.tar.gz
+47dd0daa82e7b3f0fe74b969b388d7b3  numpy-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:54:50 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 11:54:50 -0500
Subject: rpms/spandsp/FC-6 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 spandsp.spec, 1.3, 1.4
Message-ID: <200611211654.kALGsoVX021992@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21962

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 14:38:32 -0000	1.4
+++ .cvsignore	21 Nov 2006 16:54:20 -0000	1.5
@@ -1 +1 @@
-spandsp-0.0.3pre24.tgz
+spandsp-0.0.3pre25.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 14:38:32 -0000	1.4
+++ sources	21 Nov 2006 16:54:20 -0000	1.5
@@ -1 +1 @@
-1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz
+6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/spandsp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spandsp.spec	7 Oct 2006 14:38:32 -0000	1.3
+++ spandsp.spec	21 Nov 2006 16:54:20 -0000	1.4
@@ -1,4 +1,4 @@
-%define pre 24
+%define pre 25
 
 Summary: A DSP library for telephony
 Name: spandsp
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.0.3-1.pre25
+- Update to 0.0.3pre25
+
 * Sat Oct  7 2006 Jeffrey C. Ollie  - 0.0.3-1.pre24
 - Update to 0.0.3pre24
 - Add dist tag.



From fedora-extras-commits at redhat.com  Tue Nov 21 16:55:21 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 21 Nov 2006 11:55:21 -0500
Subject: rpms/manaworld/devel .cvsignore, 1.4, 1.5 manaworld.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200611211655.kALGtLBQ022051@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21989

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.21.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 03:22:08 -0000	1.4
+++ .cvsignore	21 Nov 2006 16:54:51 -0000	1.5
@@ -1 +1 @@
-tmw-0.0.21.tar.gz
+tmw-0.0.21.1.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/manaworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- manaworld.spec	31 Oct 2006 16:29:27 -0000	1.5
+++ manaworld.spec	21 Nov 2006 16:54:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           manaworld
-Version:        0.0.21
-Release:        2%{?dist}
+Version:        0.0.21.1
+Release:        1%{?dist}
 Summary:        2D MMORPG world
 
 Group:          Amusements/Games
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Wart  0.0.21.1-1
+- Update to 0.0.21.1
+
 * Tue Oct 31 2006 Wart  0.0.21-2
 - Rebuild for curl .so name change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 03:22:08 -0000	1.4
+++ sources	21 Nov 2006 16:54:51 -0000	1.5
@@ -1 +1 @@
-e13a748b8e279fa694db5eb14ac4a8a9  tmw-0.0.21.tar.gz
+d5eacb0f5355ea105771bc5383bd99aa  tmw-0.0.21.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:56:07 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 11:56:07 -0500
Subject: rpms/spandsp/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 spandsp.spec, 1.3, 1.4
Message-ID: <200611211656.kALGu7Q7022131@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22096

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 14:41:22 -0000	1.4
+++ .cvsignore	21 Nov 2006 16:55:37 -0000	1.5
@@ -1 +1 @@
-spandsp-0.0.3pre24.tgz
+spandsp-0.0.3pre25.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 14:41:22 -0000	1.4
+++ sources	21 Nov 2006 16:55:37 -0000	1.5
@@ -1 +1 @@
-1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz
+6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/spandsp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spandsp.spec	7 Oct 2006 14:41:22 -0000	1.3
+++ spandsp.spec	21 Nov 2006 16:55:37 -0000	1.4
@@ -1,4 +1,4 @@
-%define pre 24
+%define pre 25
 
 Summary: A DSP library for telephony
 Name: spandsp
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.0.3-1.pre25
+- Update to 0.0.3pre25
+
 * Sat Oct  7 2006 Jeffrey C. Ollie  - 0.0.3-1.pre24
 - Update to 0.0.3pre24
 - Add dist tag.



From fedora-extras-commits at redhat.com  Tue Nov 21 16:56:54 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 21 Nov 2006 11:56:54 -0500
Subject: rpms/python-basemap/devel .cvsignore, 1.8, 1.9 python-basemap.spec, 
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200611211656.kALGusKN022247@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22188

Modified Files:
	.cvsignore python-basemap.spec sources 
Log Message:
Update to upstream 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2006 16:07:53 -0000	1.8
+++ .cvsignore	21 Nov 2006 16:56:24 -0000	1.9
@@ -1 +1 @@
-basemap-0.9.3.tar.gz
+basemap-0.9.4.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-basemap.spec	18 Oct 2006 16:07:53 -0000	1.10
+++ python-basemap.spec	21 Nov 2006 16:56:24 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-basemap
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Nov 20 2006 Orion Poplawski  0.9.4-1
+- Update to upstream 0.9.4
+
 * Wed Oct 18 2006 Orion Poplawski  0.9.3-1
 - Update to upstream 0.9.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2006 16:07:53 -0000	1.8
+++ sources	21 Nov 2006 16:56:24 -0000	1.9
@@ -1 +1 @@
-1d02d6230286262a3bb6c11aad3f58ce  basemap-0.9.3.tar.gz
+0bbe631db05dbb987bb0bf8e8422039c  basemap-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 17:11:58 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 12:11:58 -0500
Subject: rpms/sysprof-kmod/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof-kmod.spec, 1.9, 1.10
Message-ID: <200611211711.kALHBwXr022579@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-serv22558

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Log Message:
version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Nov 2006 21:55:31 -0000	1.3
+++ .cvsignore	21 Nov 2006 17:11:28 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Nov 2006 21:55:31 -0000	1.3
+++ sources	21 Nov 2006 17:11:28 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sysprof-kmod.spec	11 Nov 2006 21:55:31 -0000	1.9
+++ sysprof-kmod.spec	21 Nov 2006 17:11:28 -0000	1.10
@@ -24,7 +24,7 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.5
+Version:        1.0.7
 Release:        1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Sat Nov 11 2006 Gianluca Sforna  1.0.5-1
 - rebuild for new kernel 2.6.18-1.2239.fc5
 - update to 1.0.5



From fedora-extras-commits at redhat.com  Tue Nov 21 17:52:40 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 12:52:40 -0500
Subject: rpms/sysprof/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof.spec, 1.5, 1.6
Message-ID: <200611211752.kALHqePS023082@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23041

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Nov 2006 22:18:59 -0000	1.3
+++ .cvsignore	21 Nov 2006 17:52:10 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Nov 2006 22:18:59 -0000	1.3
+++ sources	21 Nov 2006 17:52:10 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sysprof.spec	11 Nov 2006 22:18:59 -0000	1.5
+++ sysprof.spec	21 Nov 2006 17:52:10 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           sysprof      
-Version:        1.0.5
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Sat Nov 11 2006 Gianluca Sforna  1.0.5-1
 - version update
 



From fedora-extras-commits at redhat.com  Tue Nov 21 17:53:02 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:53:02 -0500
Subject: rpms/Zim - New directory
Message-ID: <200611211753.kALHr2FE023098@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23094/Zim

Log Message:
Directory /cvs/extras/rpms/Zim added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 17:53:08 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:53:08 -0500
Subject: rpms/Zim/devel - New directory
Message-ID: <200611211753.kALHr8OC023115@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23094/Zim/devel

Log Message:
Directory /cvs/extras/rpms/Zim/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 17:53:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:53:11 -0500
Subject: rpms/Zim Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211753.kALHrBPj023136@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130

Added Files:
	Makefile import.log 
Log Message:
Setup of module Zim


--- NEW FILE Makefile ---
# Top level Makefile for module Zim
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  Tue Nov 21 17:53:16 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:53:16 -0500
Subject: rpms/Zim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611211753.kALHrGhA023151@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Zim


--- 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 Nov 21 17:54:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:54:01 -0500
Subject: rpms/Zim import.log,1.1,1.2
Message-ID: <200611211754.kALHs1VP023205@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23175

Modified Files:
	import.log 
Log Message:
auto-import Zim-0.17-2.fc6 on branch devel from Zim-0.17-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Zim/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 17:53:11 -0000	1.1
+++ import.log	21 Nov 2006 17:53:31 -0000	1.2
@@ -0,0 +1 @@
+Zim-0_17-2_fc6:HEAD:Zim-0.17-2.fc6.src.rpm:1164131622



From fedora-extras-commits at redhat.com  Tue Nov 21 17:54:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:54:01 -0500
Subject: rpms/Zim/devel Zim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200611211754.kALHs1HM023209@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23175/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Zim.spec 
Log Message:
auto-import Zim-0.17-2.fc6 on branch devel from Zim-0.17-2.fc6.src.rpm


--- NEW FILE Zim.spec ---
Name:           Zim
Version:        0.17 
Release:        2%{?dist}
Summary:        Desktop wiki & notekeeper

Group:          Applications/Editors
License:        GPL or Artistic
URL:            http://zoidberg.student.utwente.nl/zim/index.shtml
Source0:        ftp://zoidberg.student.utwente.nl/Zim/Zim-%{version}.tar.gz 
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Gtk2) >= 1.040, perl(Gtk2::TrayIcon), perl(Gtk2::Spell)
BuildRequires:  perl(File::MimeInfo) >= 0.12, perl(File::DesktopEntry)
BuildRequires:  perl(File::BaseDir), desktop-file-utils
BuildRequires:  perl(Module::Build)

# testing
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)

# until perl-File-MimeInfo requires it, BZ#215972
BuildRequires:  shared-mime-info

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
Zim is a WYSIWYG text editor written in Gtk2-Perl which aims to bring the
concept of a wiki to your desktop. Every page is saved as a text file with
wiki markup. Pages can contain links to other pages, and are saved
automatically. Creating a new page is as easy as linking to a non-existing
page. Pages are ordered in a hierarchical structure that gives it the look and
feel of an outliner. This tool is intended to keep track of TODO lists or to
serve as a personal scratch book. 


%prep
%setup -q

# We're not running on Win32.  Really :)
rm ./lib/Zim/Win32.pm


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

desktop-file-install --vendor="fedora" --delete-original    \
    --dir=%{buildroot}%{_datadir}/applications              \
     %{buildroot}%{_datadir}/applications/zim.desktop


%check
./Build test


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes ExamplePlugin.pl
%{perl_vendorlib}/*
%{_mandir}/man[13]/*.[13]*
%{_bindir}/*
%{_datadir}/zim
%{_datadir}/pixmaps/*
%{_datadir}/applications/*


%changelog
* Thu Nov 16 2006 Chris Weyl  0.17-2
- add requires on shared-mime-info

* Wed Nov 15 2006 Chris Weyl  0.17-1
- initial packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 17:53:16 -0000	1.1
+++ .cvsignore	21 Nov 2006 17:53:31 -0000	1.2
@@ -0,0 +1 @@
+Zim-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 17:53:16 -0000	1.1
+++ sources	21 Nov 2006 17:53:31 -0000	1.2
@@ -0,0 +1 @@
+b665ab613fc777073e14b5eee44f37d9  Zim-0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 17:57:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:57:54 -0500
Subject: owners owners.list,1.1984,1.1985
Message-ID: <200611211757.kALHvsQn023324@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23286

Modified Files:
	owners.list 
Log Message:
added Zim


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1984
retrieving revision 1.1985
diff -u -r1.1984 -r1.1985
--- owners.list	21 Nov 2006 16:18:59 -0000	1.1984
+++ owners.list	21 Nov 2006 17:57:23 -0000	1.1985
@@ -1236,8 +1236,8 @@
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
-Fedora Extras|optipng|A PNG optimizer and converter|opensource at till.name|extras-qa at fedoraproject.org|
 Fedora Extras|openvrml|VRML/X3D runtime library and player|braden at endoframe.com|extras-qa at fedoraproject.org|
+Fedora Extras|optipng|A PNG optimizer and converter|opensource at till.name|extras-qa at fedoraproject.org|
 Fedora Extras|orage|Time-managing application for Xfce4|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ORBit|CORBA Object Request Broker library for GNOME-1 compatibility|paul at city-fan.org|extras-qa at fedoraproject.org|
@@ -2553,6 +2553,7 @@
 Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
+Fedora Extras|Zim|Desktop wiki & notekeeper|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|zvbi|Raw VBI, Teletext and Closed Caption decoding library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|zynaddsubfx|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 17:58:12 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:58:12 -0500
Subject: rpms/Zim/devel Zim.spec,1.1,1.2
Message-ID: <200611211758.kALHwCZR023341@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23309

Modified Files:
	Zim.spec 
Log Message:
release bump


Index: Zim.spec
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/Zim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Zim.spec	21 Nov 2006 17:53:31 -0000	1.1
+++ Zim.spec	21 Nov 2006 17:57:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           Zim
 Version:        0.17 
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Desktop wiki & notekeeper
 
 Group:          Applications/Editors
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.17-3
+- bump
+
 * Thu Nov 16 2006 Chris Weyl  0.17-2
 - add requires on shared-mime-info
 



From fedora-extras-commits at redhat.com  Tue Nov 21 17:58:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:58:48 -0500
Subject: rpms/perl-Net-DBus - New directory
Message-ID: <200611211758.kALHwmKh023403@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23399/perl-Net-DBus

Log Message:
Directory /cvs/extras/rpms/perl-Net-DBus added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 17:58:53 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:58:53 -0500
Subject: rpms/perl-Net-DBus/devel - New directory
Message-ID: <200611211758.kALHwr87023416@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23399/perl-Net-DBus/devel

Log Message:
Directory /cvs/extras/rpms/perl-Net-DBus/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 17:59:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:59:01 -0500
Subject: rpms/perl-Net-DBus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211759.kALHx1aZ023437@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23431

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Net-DBus


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Net-DBus
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  Tue Nov 21 17:59:07 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:59:07 -0500
Subject: rpms/perl-Net-DBus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211759.kALHx7Ff023452@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23431/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Net-DBus


--- 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 Nov 21 17:59:44 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:59:44 -0500
Subject: rpms/perl-Net-DBus/devel perl-Net-DBus.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211759.kALHxio4023514@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23476/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-DBus.spec 
Log Message:
auto-import perl-Net-DBus-0.33.4-2.fc6 on branch devel from perl-Net-DBus-0.33.4-2.fc6.src.rpm


--- NEW FILE perl-Net-DBus.spec ---
Name:           perl-Net-DBus
Version:        0.33.4
Release:        2%{?dist}
Summary:        Use and provide DBus services
License:        GPL or Artistic 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Net-DBus/
Source0:        http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(XML::Grove)
BuildRequires:  perl(XML::Parser)
BuildRequires:  perl(XML::Twig)
BuildRequires:  dbus-devel  >= 0.33, pkgconfig

# testing
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Net::DBus provides a Perl API for the DBus message system. The DBus Perl
interface is currently operating against the 0.33 development version of
DBus, but should work with later versions too, providing the API changes
have not been too drastic.

%prep
%setup -q -n Net-DBus-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES COPYING README examples/
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Net*
%{_mandir}/man3/*

%changelog
* Sat Nov 11 2006 Chris Weyl  0.33.4-2
- add additional BR's
- update summary

* Tue Nov 07 2006 Chris Weyl  0.33.4-1
- update to 0.33.4
- nix now-unneeded source regexp/tweak

* Sat Nov 04 2006 Chris Weyl  0.33.3-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-DBus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 17:59:07 -0000	1.1
+++ .cvsignore	21 Nov 2006 17:59:14 -0000	1.2
@@ -0,0 +1 @@
+Net-DBus-0.33.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-DBus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 17:59:07 -0000	1.1
+++ sources	21 Nov 2006 17:59:14 -0000	1.2
@@ -0,0 +1 @@
+7138571b3d8df29faa65d1db509f9d32  Net-DBus-0.33.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 17:59:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:59:43 -0500
Subject: rpms/perl-Net-DBus import.log,1.1,1.2
Message-ID: <200611211759.kALHxhxJ023510@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23476

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-DBus-0.33.4-2.fc6 on branch devel from perl-Net-DBus-0.33.4-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-DBus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 17:59:01 -0000	1.1
+++ import.log	21 Nov 2006 17:59:13 -0000	1.2
@@ -0,0 +1 @@
+perl-Net-DBus-0_33_4-2_fc6:HEAD:perl-Net-DBus-0.33.4-2.fc6.src.rpm:1164131965



From fedora-extras-commits at redhat.com  Tue Nov 21 18:02:18 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 13:02:18 -0500
Subject: owners owners.list,1.1985,1.1986
Message-ID: <200611211802.kALI2I7L023619@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23600

Modified Files:
	owners.list 
Log Message:
add perl-Net-DBus


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1985
retrieving revision 1.1986
diff -u -r1.1985 -r1.1986
--- owners.list	21 Nov 2006 17:57:23 -0000	1.1985
+++ owners.list	21 Nov 2006 18:01:48 -0000	1.1986
@@ -1588,6 +1588,7 @@
 Fedora Extras|perl-Moose-Policy|Police your project/company-wide Moose policies|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MP3-Info|Manipulate / fetch info from MP3 audio files|chris.stone at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-DBus|perl DBus interface|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Jabber|Net::Jabber - Jabber client library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Nov 21 18:22:35 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 21 Nov 2006 13:22:35 -0500
Subject: rpms/python-basemap/FC-6 .cvsignore, 1.8, 1.9 python-basemap.spec, 
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200611211822.kALIMZ0H023697@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23678

Modified Files:
	.cvsignore python-basemap.spec sources 
Log Message:
Update to upstream 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2006 16:07:53 -0000	1.8
+++ .cvsignore	21 Nov 2006 18:22:05 -0000	1.9
@@ -1 +1 @@
-basemap-0.9.3.tar.gz
+basemap-0.9.4.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/FC-6/python-basemap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-basemap.spec	18 Oct 2006 16:07:53 -0000	1.10
+++ python-basemap.spec	21 Nov 2006 18:22:05 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-basemap
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Nov 20 2006 Orion Poplawski  0.9.4-1
+- Update to upstream 0.9.4
+
 * Wed Oct 18 2006 Orion Poplawski  0.9.3-1
 - Update to upstream 0.9.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2006 16:07:53 -0000	1.8
+++ sources	21 Nov 2006 18:22:05 -0000	1.9
@@ -1 +1 @@
-1d02d6230286262a3bb6c11aad3f58ce  basemap-0.9.3.tar.gz
+0bbe631db05dbb987bb0bf8e8422039c  basemap-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 18:33:15 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 21 Nov 2006 13:33:15 -0500
Subject: rpms/dejavu-fonts import.log,1.91,1.92
Message-ID: <200611211833.kALIXFPW023823@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23793

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.12-1.rc1.fc7 on branch devel from dejavu-fonts-2.12-1.rc1.fc7.src.rpm
2.12


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- import.log	16 Nov 2006 21:52:05 -0000	1.91
+++ import.log	21 Nov 2006 18:32:45 -0000	1.92
@@ -88,3 +88,4 @@
 dejavu-fonts-2_11-1_fc5:FC-5:dejavu-fonts-2.11-1.fc5.src.rpm:1161540378
 dejavu-fonts-2_12-0_1_rc1_fc7:HEAD:dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm:1163713579
 dejavu-fonts-2_12-0_2_rc1_fc7:HEAD:dejavu-fonts-2.12-0.2.rc1.fc7.src.rpm:1163713911
+dejavu-fonts-2_12-1_rc1_fc7:HEAD:dejavu-fonts-2.12-1.rc1.fc7.src.rpm:1164133959



From fedora-extras-commits at redhat.com  Tue Nov 21 18:33:15 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 21 Nov 2006 13:33:15 -0500
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.25, 1.26 dejavu-fonts.spec,
	1.49, 1.50 sources, 1.25, 1.26
Message-ID: <200611211833.kALIXFQD023828@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23793/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.12-1.rc1.fc7 on branch devel from dejavu-fonts-2.12-1.rc1.fc7.src.rpm
2.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Nov 2006 21:46:35 -0000	1.25
+++ .cvsignore	21 Nov 2006 18:32:45 -0000	1.26
@@ -1 +1 @@
-dejavu-sfd-20061115-1287.tar.gz
+dejavu-sfd-2.12.tar.bz2


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- dejavu-fonts.spec	16 Nov 2006 21:52:06 -0000	1.49
+++ dejavu-fonts.spec	21 Nov 2006 18:32:45 -0000	1.50
@@ -1,8 +1,9 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define alphatag        .rc1
+#%define alphatag        .rc1
 
-%define archiveversion  20061115-1287
+#%define archiveversion  20061115-1287
+%define archiveversion  %{version}
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 
@@ -12,12 +13,12 @@
 
 Name:      dejavu-fonts
 Version:   2.12
-Release:   0.2%{?alphatag}%{?dist}
+Release:   1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
-Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz
+Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.bz2
 # DejaVu fontconfig setup
 Source1:   %{name}-fontconfig.conf
 # DejaVu fontconfig setup (experimental families)
@@ -154,6 +155,10 @@
 
 
 %changelog
+* Tue Nov 21 2006  Nicolas Mailhot 
+- 2.12
+- only in devel for now
+
 * Thu Nov 16 2006 Nicolas Mailhot 
 - 2.12-0.2.rc1
 - 2.12-rc1 (a.k.a. 20061115svn1287)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	16 Nov 2006 21:46:35 -0000	1.25
+++ sources	21 Nov 2006 18:32:45 -0000	1.26
@@ -1 +1 @@
-2320d60a8bd5d080fa2dfc040f459149  dejavu-sfd-20061115-1287.tar.gz
+9dc019f130d23d54cf01f7936158a482  dejavu-sfd-2.12.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 18:38:33 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 21 Nov 2006 13:38:33 -0500
Subject: rpms/TurboGears/devel TurboGears.spec,1.5,1.6
Message-ID: <200611211838.kALIcXOw023945@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23930

Modified Files:
	TurboGears.spec 
Log Message:
Add python-psycopg to Requires


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurboGears.spec	17 Oct 2006 15:21:43 -0000	1.5
+++ TurboGears.spec	21 Nov 2006 18:38:03 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0b1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -24,7 +24,7 @@
 Requires:       python-turbokid >= 0.9.8 python-tgfastdata
 Requires:       python-simplejson >= 1.3 python-paste-script >= 0.9.7
 Requires:       python-configobj >= 4.3.2 python-ruledispatch
-Requires:       python-nose >= 0.9
+Requires:       python-nose >= 0.9 python-psycopg
 
 %description
 TurboGears brings together four major pieces to create an
@@ -76,6 +76,9 @@
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Fri Nov 21 2006 Luke Macken  1.0b1-2
+- Add python-psycopg to Requires
+
 * Mon Sep 11 2006 Luke Macken  1.0b1-1
 - 1.0b1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 18:53:38 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 13:53:38 -0500
Subject: rpms/perl-Net-DBus/devel perl-Net-DBus.spec,1.1,1.2
Message-ID: <200611211853.kALIrccv024174@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24157

Modified Files:
	perl-Net-DBus.spec 
Log Message:
deal with errant test :)



Index: perl-Net-DBus.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-DBus/devel/perl-Net-DBus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-DBus.spec	21 Nov 2006 17:59:14 -0000	1.1
+++ perl-Net-DBus.spec	21 Nov 2006 18:53:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-DBus
 Version:        0.33.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Use and provide DBus services
 License:        GPL or Artistic 
 Group:          Development/Libraries
@@ -42,6 +42,10 @@
 %{_fixperms} %{buildroot}/*
 
 %check
+# test fails incorrectly on newer versions of dbus.  slated to be corrected:
+# http://rt.cpan.org/Public/Bug/Display.html?id=22850
+rm t/30-server.t
+
 make test
 
 %clean
@@ -55,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.33.4-3
+- nix t/30-server.t until the test is fixed
+
 * Sat Nov 11 2006 Chris Weyl  0.33.4-2
 - add additional BR's
 - update summary



From fedora-extras-commits at redhat.com  Tue Nov 21 18:55:21 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 21 Nov 2006 13:55:21 -0500
Subject: rpms/gnash/FC-6 .cvsignore, 1.2, 1.3 gnash.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200611211855.kALItLH9024239@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24220

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Sat Nov  6 2006 Patrice Dumas  0.7.2-1
- update for 0.7.2 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Aug 2006 08:39:02 -0000	1.2
+++ .cvsignore	21 Nov 2006 18:54:51 -0000	1.3
@@ -1 +1 @@
-gnash-0.7.1.tar.bz2
+gnash-0.7.2.tar.bz2


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/FC-6/gnash.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnash.spec	4 Oct 2006 22:21:54 -0000	1.3
+++ gnash.spec	21 Nov 2006 18:54:51 -0000	1.4
@@ -1,24 +1,27 @@
 Name:           gnash
-Version:        0.7.1
-Release:        9%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
-Source1:        gnash-README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel libjpeg-devel libogg-devel libXmu-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
+BuildRequires:  boost-devel curl-devel 
+# the opengl devel packages are required by gtkglext-devel
+# monolithic Xorg
+#BuildRequires:  xorg-x11-devel
+# modular Xorg 
+#BuildRequires:  libGLU-devel libGL-devel
+BuildRequires:  SDL-devel 
 BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel
-## GStreamer isn't used yet, but will be in the near future.
-#BuildRequires:  gstreamer-devel
 BuildRequires:  docbook2X
+BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  scrollkeeper
-BuildRequires:  automake, libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -26,23 +29,16 @@
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Patch1:         gnash-configure-pkgconfig.patch
-Patch2:		gnash-continue_on_info_install_error.patch
-Patch3:         gnash-plugin-tempfile-dir.patch
 
 %description
 Gnash is a GNU Flash movie player based on GameSWF,
 and supports many SWF v7 features.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %package plugin
-Summary:   Flash movie player plugin for Mozilla Browser
+Summary:   Web-client flash movie player plugin 
 Requires:  %{name} = %{version}-%{release}
 # this doesn't prevent wrong dependencies, in case a package
-# provides %{_libdir}/mozilla/plugins (like kdebase for konqueror)
+# provides %%{_libdir}/mozilla/plugins (like kdebase for konqueror)
 # and another unrelated webbrowser is installed, like w3m-el.
 # Moreover konqueror could provide webclient some day
 Requires:  %{_libdir}/mozilla/plugins webclient
@@ -51,10 +47,6 @@
 %description plugin
 The gnash flash movie player plugin for firefox or mozilla.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %package klash
 Summary:   Konqueror flash movie player plugin
 Requires:  %{name} = %{version}-%{release}
@@ -63,35 +55,32 @@
 %description klash
 The gnash flash movie player plugin for Konqueror.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %prep
 %setup -q
-cp -p %{SOURCE1} README.fedora
-%patch1 -p1 -b .1
-%patch2 -p0 -b .2
-%patch3 -p0 -b .3
-autoreconf
-
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-klash --disable-rpath \
-  --disable-dependency-tracking --with-qtdir=$QTDIR
+  --enable-ghelp --enable-docbook --enable-sound=GST \
+  --disable-dependency-tracking --disable-rpath \
+  --with-qtdir=$QTDIR
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,so}
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,18 +90,15 @@
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 
-
 %preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
-
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
@@ -121,19 +107,16 @@
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
+%{_libdir}/libgnash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/
-%{_libdir}/libgnash*.so.*
-
 
 %files plugin
 %defattr(-,root,root,-)
-%doc README.fedora
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
-
 %files klash
 %defattr(-,root,root,-)
 %{_bindir}/klash
@@ -142,13 +125,15 @@
 %{_datadir}/config/klashrc
 %{_datadir}/services/klash_part.desktop
 
-
 %changelog
+* Sat Nov  6 2006 Patrice Dumas  0.7.2-1
+- update for 0.7.2 release.
+
 * Thu Oct 05 2006 Christian Iseli  0.7.1-9
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Sun Sep 24 2006 Patrice Dumas  0.7.1-8
-- plugin requires %{_libdir}/mozilla/plugins. Fix (incompletly and 
+- plugin requires %%{_libdir}/mozilla/plugins. Fix (incompletly and 
   temporarily, but there is no better solution yet) #207613
 
 * Sun Aug 27 2006 Patrice Dumas  - 0.7.1-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Aug 2006 08:39:02 -0000	1.2
+++ sources	21 Nov 2006 18:54:51 -0000	1.3
@@ -1 +1 @@
-d860981aeaac0fc941a28abc3c24223c  gnash-0.7.1.tar.bz2
+ccef0f45be01a4c2992b46c2363a514f  gnash-0.7.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 19:15:54 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 21 Nov 2006 14:15:54 -0500
Subject: rpms/mail-notification/devel
	mail-notification-mail-reader-launch.patch, NONE,
	1.1 mail-notification.spec, 1.32, 1.33
Message-ID: <200611211915.kALJFsPm024659@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24641

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-mail-reader-launch.patch 
Log Message:
3.0-11 -- add mail-notification-mail-reader-launch.patch (#215119, credits go to John Conroy)

mail-notification-mail-reader-launch.patch:

--- NEW FILE mail-notification-mail-reader-launch.patch ---
--- mail-notification-3.0.org/src/mn-conf.c	2006-05-18 09:23:42.000000000 -0400
+++ mail-notification-3.0/src/mn-conf.c	2006-11-11 07:58:01.000000000 -0500
@@ -1119,14 +1119,15 @@
   if (strip_format)
     {
       GString *stripped;
-      char *start;
-      char *p;
 
       stripped = g_string_new(NULL);
+      g_string_append_len(stripped, command, strstr(command, " ") - command);
 
-      for (start = command; (p = strstr(start, "%s")); start = p + 2)
-	g_string_append_len(stripped, start, p - start);
-      g_string_append(stripped, start);
+      if (!strcmp(stripped->str, "mozilla"))
+        g_string_append(stripped, " -mail");
+
+      if (!strcmp(stripped->str, "evolution"))
+        g_string_append(stripped, " --component=mail");
 
       g_free(command);
       command = g_string_free(stripped, FALSE);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mail-notification.spec	9 Nov 2006 10:53:20 -0000	1.32
+++ mail-notification.spec	21 Nov 2006 19:15:24 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:           mail-notification
 Version:        3.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz
 Source1:        mail-notification-README.FEDORA
 Patch0:         mail-notification-fedora-plugin-hint.patch
+Patch1:         mail-notification-mail-reader-launch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -57,6 +58,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .patch0
+%patch1 -p1 -b .patch1
 cp %{SOURCE1} ./README.FEDORA
 # FIXME -- quick workaround for now
 sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
@@ -133,6 +135,10 @@
 
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Tue Nov 21 19:24:19 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 21 Nov 2006 14:24:19 -0500
Subject: rpms/glipper import.log,1.7,1.8
Message-ID: <200611211924.kALJOJdE025255@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25220

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.95.1-1 on branch devel from glipper-0.95.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	14 Nov 2006 17:35:09 -0000	1.7
+++ import.log	21 Nov 2006 19:23:49 -0000	1.8
@@ -4,3 +4,4 @@
 glipper-0_89-5:HEAD:glipper-0.89-5.src.rpm:1161029170
 glipper-0_95-1:HEAD:glipper-0.95-1.src.rpm:1163448587
 glipper-0_95-2:HEAD:glipper-0.95-2.src.rpm:1163525699
+glipper-0_95_1-1:HEAD:glipper-0.95.1-1.src.rpm:1164137034



From fedora-extras-commits at redhat.com  Tue Nov 21 19:24:19 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 21 Nov 2006 14:24:19 -0500
Subject: rpms/glipper/devel .cvsignore, 1.3, 1.4 glipper.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200611211924.kALJOJKi025260@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25220/devel

Modified Files:
	.cvsignore glipper.spec sources 
Log Message:
auto-import glipper-0.95.1-1 on branch devel from glipper-0.95.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Nov 2006 20:09:49 -0000	1.3
+++ .cvsignore	21 Nov 2006 19:23:49 -0000	1.4
@@ -1 +1 @@
-glipper-0.95.tar.gz
+glipper-0.95.1.tar.gz


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glipper.spec	14 Nov 2006 17:35:10 -0000	1.6
+++ glipper.spec	21 Nov 2006 19:23:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           glipper
-Version:        0.95
-Release:        2%{?dist}
+Version:        0.95.1
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
 
 
 %description
@@ -47,6 +47,12 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 21 2006 Damien Durand  - 0.95.1
+- Upgrade to 0.95.1
+
+* Sun Nov 18 2006 Damien Durand  - 0.95-3
+- Add glade2-devel in BR
+
 * Tue Nov 14 2006 Damien Durand  - 0.95-2
 - Add gnome-doc-utils in BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2006 20:09:49 -0000	1.3
+++ sources	21 Nov 2006 19:23:49 -0000	1.4
@@ -1 +1 @@
-d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz
+aa6524f59342d72fee8bed36e6267746  glipper-0.95.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:30:44 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 21 Nov 2006 14:30:44 -0500
Subject: rpms/codeblocks/devel .cvsignore, 1.6, 1.7 codeblocks.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611211930.kALJUiF7025448@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25422

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3253


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2006 09:31:04 -0000	1.6
+++ .cvsignore	21 Nov 2006 19:30:14 -0000	1.7
@@ -1 +1 @@
-codeblocks-svn3202.tar.bz2
+codeblocks-svn3253.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- codeblocks.spec	11 Nov 2006 09:31:04 -0000	1.5
+++ codeblocks.spec	21 Nov 2006 19:30:14 -0000	1.6
@@ -1,9 +1,9 @@
-%define		rev	3202
-%define		date	20061110
+%define		rev	3253
+%define		date	20061121
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.13.%{date}svn%{rev}%{?dist}
+Release:	0.14.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
+- update to revision 3253
+
 * Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
 - update to revision 3202
 - fixed plugin loading on 64-bit platforms


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Nov 2006 09:31:04 -0000	1.6
+++ sources	21 Nov 2006 19:30:14 -0000	1.7
@@ -1 +1 @@
-ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2
+1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 19:32:56 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 21 Nov 2006 14:32:56 -0500
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.6, 1.7 codeblocks.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611211932.kALJWuVv025528@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25509

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3253


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2006 09:37:05 -0000	1.6
+++ .cvsignore	21 Nov 2006 19:32:26 -0000	1.7
@@ -1 +1 @@
-codeblocks-svn3202.tar.bz2
+codeblocks-svn3253.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- codeblocks.spec	11 Nov 2006 09:37:05 -0000	1.5
+++ codeblocks.spec	21 Nov 2006 19:32:26 -0000	1.6
@@ -1,9 +1,9 @@
-%define		rev	3202
-%define		date	20061110
+%define		rev	3253
+%define		date	20061121
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.13.%{date}svn%{rev}%{?dist}
+Release:	0.14.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
+- update to revision 3253
+
 * Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
 - update to revision 3202
 - fixed plugin loading on 64-bit platforms


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Nov 2006 09:37:05 -0000	1.6
+++ sources	21 Nov 2006 19:32:26 -0000	1.7
@@ -1 +1 @@
-ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2
+1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 19:38:20 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 21 Nov 2006 14:38:20 -0500
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.6, 1.7 codeblocks.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611211938.kALJcKoK025620@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25601

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3253


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2006 09:39:56 -0000	1.6
+++ .cvsignore	21 Nov 2006 19:37:50 -0000	1.7
@@ -1 +1 @@
-codeblocks-svn3202.tar.bz2
+codeblocks-svn3253.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- codeblocks.spec	11 Nov 2006 09:39:56 -0000	1.5
+++ codeblocks.spec	21 Nov 2006 19:37:50 -0000	1.6
@@ -1,9 +1,9 @@
-%define		rev	3202
-%define		date	20061110
+%define		rev	3253
+%define		date	20061121
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.13.%{date}svn%{rev}%{?dist}
+Release:	0.14.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
+- update to revision 3253
+
 * Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
 - update to revision 3202
 - fixed plugin loading on 64-bit platforms


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Nov 2006 09:39:56 -0000	1.6
+++ sources	21 Nov 2006 19:37:50 -0000	1.7
@@ -1 +1 @@
-ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2
+1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 19:44:32 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 14:44:32 -0500
Subject: rpms/perl-WWW-Myspace/FC-5 perl-WWW-Myspace.spec, 1.11, 1.12 sources,
	1.11, 1.12
Message-ID: <200611211944.kALJiWsL025749@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693/FC-5

Modified Files:
	perl-WWW-Myspace.spec sources 
Log Message:
 update to 0.60



Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-5/perl-WWW-Myspace.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-WWW-Myspace.spec	19 Oct 2006 03:27:41 -0000	1.11
+++ perl-WWW-Myspace.spec	21 Nov 2006 19:44:02 -0000	1.12
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.59
+Version:  0.60
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -48,6 +48,9 @@
 %prep
 %setup -q -n WWW-Myspace-%{version}
 
+# nix a bunch of weird files that seem to have creeped in...
+rm `find . -type f -name '.*'`
+
 # exec + doc == bad
 cd sample_scripts
 chmod -x *
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.60-1
+- update to 0.60
+
 * Wed Oct 18 2006 Chris Weyl  0.59-1
 - update to 0.59
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 03:27:41 -0000	1.11
+++ sources	21 Nov 2006 19:44:02 -0000	1.12
@@ -1 +1 @@
-324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz
+ecd95ed4b157a58cb9365061f61570d2  WWW-Myspace-0.60.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:44:32 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 14:44:32 -0500
Subject: rpms/perl-WWW-Myspace/FC-6 perl-WWW-Myspace.spec, 1.13, 1.14 sources,
	1.11, 1.12
Message-ID: <200611211944.kALJiW2p025753@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693/FC-6

Modified Files:
	perl-WWW-Myspace.spec sources 
Log Message:
 update to 0.60



Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-6/perl-WWW-Myspace.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-WWW-Myspace.spec	19 Oct 2006 03:27:42 -0000	1.13
+++ perl-WWW-Myspace.spec	21 Nov 2006 19:44:02 -0000	1.14
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.59
+Version:  0.60
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -48,6 +48,9 @@
 %prep
 %setup -q -n WWW-Myspace-%{version}
 
+# nix a bunch of weird files that seem to have creeped in...
+rm `find . -type f -name '.*'`
+
 # exec + doc == bad
 cd sample_scripts
 chmod -x *
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.60-1
+- update to 0.60
+
 * Wed Oct 18 2006 Chris Weyl  0.59-1
 - update to 0.59
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 03:27:42 -0000	1.11
+++ sources	21 Nov 2006 19:44:02 -0000	1.12
@@ -1 +1 @@
-324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz
+ecd95ed4b157a58cb9365061f61570d2  WWW-Myspace-0.60.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:44:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 14:44:37 -0500
Subject: rpms/perl-WWW-Myspace/devel .cvsignore, 1.11,
	1.12 perl-WWW-Myspace.spec, 1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200611211944.kALJib1l025758@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693/devel

Modified Files:
	.cvsignore perl-WWW-Myspace.spec sources 
Log Message:
 update to 0.60



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Oct 2006 03:27:42 -0000	1.11
+++ .cvsignore	21 Nov 2006 19:44:07 -0000	1.12
@@ -1 +1 @@
-WWW-Myspace-0.59.tar.gz
+WWW-Myspace-0.60.tar.gz


Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/perl-WWW-Myspace.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-WWW-Myspace.spec	19 Oct 2006 03:27:42 -0000	1.13
+++ perl-WWW-Myspace.spec	21 Nov 2006 19:44:07 -0000	1.14
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.59
+Version:  0.60
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -48,6 +48,9 @@
 %prep
 %setup -q -n WWW-Myspace-%{version}
 
+# nix a bunch of weird files that seem to have creeped in...
+rm `find . -type f -name '.*'`
+
 # exec + doc == bad
 cd sample_scripts
 chmod -x *
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.60-1
+- update to 0.60
+
 * Wed Oct 18 2006 Chris Weyl  0.59-1
 - update to 0.59
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 03:27:42 -0000	1.11
+++ sources	21 Nov 2006 19:44:07 -0000	1.12
@@ -1 +1 @@
-324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz
+ecd95ed4b157a58cb9365061f61570d2  WWW-Myspace-0.60.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:50:23 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 14:50:23 -0500
Subject: rpms/numpy/FC-5 numpy-1.0-gfortran.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 numpy.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611211950.kALJoNBL026844@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/numpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26806

Modified Files:
	.cvsignore numpy.spec sources 
Added Files:
	numpy-1.0-gfortran.patch 
Log Message:
Bump to numpy 1.0 release

numpy-1.0-gfortran.patch:

--- NEW FILE numpy-1.0-gfortran.patch ---
diff -ur numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py numpy-1.0/numpy/distutils/fcompiler/gnu.py
--- numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py	2006-10-09 03:46:59.000000000 -0400
+++ numpy-1.0/numpy/distutils/fcompiler/gnu.py	2006-10-25 13:51:18.000000000 -0400
@@ -30,7 +30,7 @@
         'compiler_f77' : [fc_exe, "-g", "-Wall","-fno-second-underscore"],
         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
         'compiler_fix' : None,
-        'linker_so'    : [fc_exe, "-g", "-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-g", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe, "-g", "-Wall"]
@@ -255,7 +255,7 @@
         'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
         'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
         'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
-        'linker_so'    : [fc_exe,"-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe,"-Wall"]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Sep 2006 16:54:50 -0000	1.5
+++ .cvsignore	21 Nov 2006 19:49:53 -0000	1.6
@@ -1,2 +1,3 @@
 numpy-0.9.6.tar.gz
 numpy-0.9.8.tar.gz
+numpy-1.0.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/numpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numpy.spec	25 Sep 2006 16:54:50 -0000	1.6
+++ numpy.spec	21 Nov 2006 19:49:53 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        0.9.8
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -12,8 +12,7 @@
 URL:            http://numeric.scipy.org/
 Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-0.9.4-f2pynumpy.patch
-Patch1:         numpy-0.9.8-gfortran.patch
-Patch2:         numpy-0.9.8-check_types.patch
+Patch1:         numpy-1.0-gfortran.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran
@@ -34,7 +33,6 @@
 %setup -q
 %patch0 -p1 -b .f2pynumpy
 %patch1 -p1 -b .gfortran
-%patch2 -p1 -b .check_types
 
 %build
 ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -43,7 +41,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# skip-build currently broken, this works around it for now
+ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
+    %{__python} setup.py install --root $RPM_BUILD_ROOT
 rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
 rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc .
@@ -68,6 +70,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Oct 25 2006 Jarod Wilson  1.0-1
+- New upstream release
+
 * Tue Sep 06 2006 Jarod Wilson  0.9.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Sep 2006 16:54:50 -0000	1.5
+++ sources	21 Nov 2006 19:49:53 -0000	1.6
@@ -1 +1 @@
-ca528d2b460a6567d70bb6bdf0dc1805  numpy-0.9.8.tar.gz
+47dd0daa82e7b3f0fe74b969b388d7b3  numpy-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:50:28 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Tue, 21 Nov 2006 14:50:28 -0500
Subject: comps comps-fe6.xml.in,1.226,1.227
Message-ID: <200611211950.kALJoSNi026847@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26792/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
Adding clement in the 'servers' entries



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- comps-fe6.xml.in	21 Nov 2006 10:35:31 -0000	1.226
+++ comps-fe6.xml.in	21 Nov 2006 19:49:58 -0000	1.227
@@ -747,6 +747,7 @@
       clamav
       clamav-data
       clamav-milter
+      clement
       crm114
       cyrus-imapd
       enemies-of-carlotta



From fedora-extras-commits at redhat.com  Tue Nov 21 19:56:25 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 21 Nov 2006 14:56:25 -0500
Subject: rpms/TurboGears/FC-6 TurboGears.spec,1.5,1.6
Message-ID: <200611211956.kALJuPJ3026918@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26903

Modified Files:
	TurboGears.spec 
Log Message:
Add python-psycopg to Requires


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/FC-6/TurboGears.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurboGears.spec	17 Oct 2006 15:21:43 -0000	1.5
+++ TurboGears.spec	21 Nov 2006 19:55:55 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0b1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -24,7 +24,7 @@
 Requires:       python-turbokid >= 0.9.8 python-tgfastdata
 Requires:       python-simplejson >= 1.3 python-paste-script >= 0.9.7
 Requires:       python-configobj >= 4.3.2 python-ruledispatch
-Requires:       python-nose >= 0.9
+Requires:       python-nose >= 0.9 python-psycopg
 
 %description
 TurboGears brings together four major pieces to create an
@@ -76,6 +76,9 @@
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Fri Nov 21 2006 Luke Macken  1.0b1-2
+- Add python-psycopg to Requires
+
 * Mon Sep 11 2006 Luke Macken  1.0b1-1
 - 1.0b1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 19:58:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 21 Nov 2006 14:58:39 -0500
Subject: rpms/qtparted/devel qtparted.spec,1.18,1.19
Message-ID: <200611211958.kALJwd76027012@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26988

Modified Files:
	qtparted.spec 
Log Message:
Yet another rebuild.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qtparted.spec	29 Oct 2006 00:48:38 -0000	1.18
+++ qtparted.spec	21 Nov 2006 19:58:09 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Steven Pritchard  - 0.4.5-11
+- Yet another rebuild.
+
 * Fri Oct 27 2006 Steven Pritchard  - 0.4.5-10
 - Enable ntfs support.
 - Make desktop-file-install happy with our categories again.



From fedora-extras-commits at redhat.com  Tue Nov 21 19:59:20 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Tue, 21 Nov 2006 14:59:20 -0500
Subject: comps comps-fe7.xml.in,1.25,1.26
Message-ID: <200611211959.kALJxKki027074@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27006/comps

Modified Files:
	comps-fe7.xml.in 
Log Message:
Adding clement to the 'server' group for fc7



Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- comps-fe7.xml.in	21 Nov 2006 10:35:31 -0000	1.25
+++ comps-fe7.xml.in	21 Nov 2006 19:58:50 -0000	1.26
@@ -747,6 +747,7 @@
       clamav
       clamav-data
       clamav-milter
+      clement
       crm114
       cyrus-imapd
       enemies-of-carlotta



From fedora-extras-commits at redhat.com  Tue Nov 21 20:03:12 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 21 Nov 2006 15:03:12 -0500
Subject: rpms/deskbar-applet/FC-6 .cvsignore, 1.14, 1.15 deskbar-applet.spec,
	1.31, 1.32 sources, 1.14, 1.15
Message-ID: <200611212003.kALK3CMK027190@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27171

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Oct 2006 22:03:15 -0000	1.14
+++ .cvsignore	21 Nov 2006 20:02:42 -0000	1.15
@@ -1 +1 @@
-deskbar-applet-2.16.0.tar.bz2
+deskbar-applet-2.17.2.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-6/deskbar-applet.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- deskbar-applet.spec	1 Oct 2006 22:03:15 -0000	1.31
+++ deskbar-applet.spec	21 Nov 2006 20:02:42 -0000	1.32
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.16.0
+Version:        2.17.2
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -16,7 +16,7 @@
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
 BuildRequires:  libSM-devel gnome-python2-applet desktop-file-utils
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	perl(XML::Parser) gnome-python2
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo
 Requires:       gnome-python2-gconf pygtk2 gnome-python2-libwnck
 Requires(pre):  GConf2
@@ -91,6 +91,16 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Tue Nov 21 2006 Luke Macken  - 2.17.2-1
+- 2.17.2
+
+* Wed Nov  2 2006 Luke Macken  - 2.16.1-2
+- 2.16.1
+- Add gnome-python2 to BuildRequires
+
+* Sat Oct 28 2006 Luke Macken  - 2.16.0-2
+- Rebuild
+
 * Sun Oct  1 2006 Luke Macken  - 2.16.0-1
 - 2.16.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Oct 2006 22:03:15 -0000	1.14
+++ sources	21 Nov 2006 20:02:42 -0000	1.15
@@ -1 +1 @@
-9f14a65f75142cd5b233bf9376a1f946  deskbar-applet-2.16.0.tar.bz2
+825cd32ffff8c3a105cd3f4e04ec646e  deskbar-applet-2.17.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 20:04:43 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 21 Nov 2006 15:04:43 -0500
Subject: rpms/glipper import.log,1.8,1.9
Message-ID: <200611212004.kALK4hTo027292@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27254

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.95.1-2 on branch devel from glipper-0.95.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	21 Nov 2006 19:23:49 -0000	1.8
+++ import.log	21 Nov 2006 20:04:13 -0000	1.9
@@ -5,3 +5,4 @@
 glipper-0_95-1:HEAD:glipper-0.95-1.src.rpm:1163448587
 glipper-0_95-2:HEAD:glipper-0.95-2.src.rpm:1163525699
 glipper-0_95_1-1:HEAD:glipper-0.95.1-1.src.rpm:1164137034
+glipper-0_95_1-2:HEAD:glipper-0.95.1-2.src.rpm:1164139459



From fedora-extras-commits at redhat.com  Tue Nov 21 20:04:43 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 21 Nov 2006 15:04:43 -0500
Subject: rpms/glipper/devel glipper.spec,1.7,1.8
Message-ID: <200611212004.kALK4h5s027295@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27254/devel

Modified Files:
	glipper.spec 
Log Message:
auto-import glipper-0.95.1-2 on branch devel from glipper-0.95.1-2.src.rpm


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glipper.spec	21 Nov 2006 19:23:49 -0000	1.7
+++ glipper.spec	21 Nov 2006 20:04:13 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.95.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils, libgnome-devel
 
 
 %description
@@ -47,7 +47,10 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
-* Tue Nov 21 2006 Damien Durand  - 0.95.1
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-2
+- Add libgnome-devel in BR
+
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-1
 - Upgrade to 0.95.1
 
 * Sun Nov 18 2006 Damien Durand  - 0.95-3



From fedora-extras-commits at redhat.com  Tue Nov 21 20:24:42 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 15:24:42 -0500
Subject: rpms/beryl-core/devel beryl-core.spec,1.3,1.4
Message-ID: <200611212024.kALKOgrU027932@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27912

Modified Files:
	beryl-core.spec 
Log Message:
Disable R: on vidcap pkg until its in FE, fix up some GL library linking, fix R:/BR: on mesa-libGL-devel


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-core.spec	16 Nov 2006 23:22:09 -0000	1.3
+++ beryl-core.spec	21 Nov 2006 20:24:12 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
-BuildRequires:  libXinerama-devel
+BuildRequires:  libXinerama-devel, mesa-libGL-devel >= 6.5-9
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -46,6 +46,7 @@
 Requires: libXdamage-devel, libXcomposite-devel >= 0.3
 Requires: libXext-devel, libXinerama-devel, libXrandr-devel
 Requires: libSM-devel, libpng-devel, startup-notification-devel
+Requires: mesa-libGL-devel >= 6.5-9
 
 %description devel
 The beryl-core-devel package includes the header
@@ -70,7 +71,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
 Requires: beryl-plugins >= %{version}, beryl-dbus >= %{version}
-Requires: beryl-vidcap >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: heliodor >= %{version}
 
@@ -84,7 +85,8 @@
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
-Requires: beryl-plugins >= %{version}, beryl-vidcap >= %{version}
+Requires: beryl-plugins >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: aquamarine >= %{version}
 
@@ -101,7 +103,7 @@
 
 
 %build
-%configure
+%configure --x-includes=%{_includedir}/X11/ --x-libraries=%{_libdir}/X11/
 ln -s %{_includedir}/X11 mesa/include/
 ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
 # Parallel builds currently broken
@@ -152,6 +154,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 21 2006 Jarod Wilson  0.1.2-6
+- Dump R: beryl-vidcap until its into FE
+- Fix up GL library linking to resolve some undefined symbols
+- R: and BR: for mesa-libGL-devel
+
 * Thu Nov 16 2006 Jarod Wilson  0.1.2-5
 - Add BR: libXinerama-devel
 - Fix up R: for beryl-core-devel



From fedora-extras-commits at redhat.com  Tue Nov 21 20:29:22 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 15:29:22 -0500
Subject: rpms/beryl-core/FC-6 beryl-core.spec,1.3,1.4
Message-ID: <200611212029.kALKTMA2028045@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-serv28023

Modified Files:
	beryl-core.spec 
Log Message:
Disable R: on vidcap pkg until its in FE, fix up some GL library linking, fix R:/BR: on mesa-libGL-devel


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-core.spec	16 Nov 2006 23:22:54 -0000	1.3
+++ beryl-core.spec	21 Nov 2006 20:28:51 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
-BuildRequires:  libXinerama-devel
+BuildRequires:  libXinerama-devel, mesa-libGL-devel >= 6.5-9
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -46,6 +46,7 @@
 Requires: libXdamage-devel, libXcomposite-devel >= 0.3
 Requires: libXext-devel, libXinerama-devel, libXrandr-devel
 Requires: libSM-devel, libpng-devel, startup-notification-devel
+Requires: mesa-libGL-devel >= 6.5-9
 
 %description devel
 The beryl-core-devel package includes the header
@@ -70,7 +71,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
 Requires: beryl-plugins >= %{version}, beryl-dbus >= %{version}
-Requires: beryl-vidcap >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: heliodor >= %{version}
 
@@ -84,7 +85,8 @@
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
-Requires: beryl-plugins >= %{version}, beryl-vidcap >= %{version}
+Requires: beryl-plugins >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: aquamarine >= %{version}
 
@@ -101,7 +103,7 @@
 
 
 %build
-%configure
+%configure --x-includes=%{_includedir}/X11/ --x-libraries=%{_libdir}/X11/
 ln -s %{_includedir}/X11 mesa/include/
 ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
 # Parallel builds currently broken
@@ -152,6 +154,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 21 2006 Jarod Wilson  0.1.2-6
+- Dump R: beryl-vidcap until its into FE
+- Fix up GL library linking to resolve some undefined symbols
+- R: and BR: for mesa-libGL-devel
+
 * Thu Nov 16 2006 Jarod Wilson  0.1.2-5
 - Add BR: libXinerama-devel
 - Fix up R: for beryl-core-devel



From fedora-extras-commits at redhat.com  Tue Nov 21 21:00:18 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:00:18 -0500
Subject: rpms/gtkmozembedmm - New directory
Message-ID: <200611212100.kALL0Iti028948@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944/gtkmozembedmm

Log Message:
Directory /cvs/extras/rpms/gtkmozembedmm added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 21:00:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:00:23 -0500
Subject: rpms/gtkmozembedmm/devel - New directory
Message-ID: <200611212100.kALL0NlU028961@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944/gtkmozembedmm/devel

Log Message:
Directory /cvs/extras/rpms/gtkmozembedmm/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 21:00:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:00:48 -0500
Subject: rpms/gtkmozembedmm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611212100.kALL0mwZ028999@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28993

Added Files:
	Makefile import.log 
Log Message:
Setup of module gtkmozembedmm


--- NEW FILE Makefile ---
# Top level Makefile for module gtkmozembedmm
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  Tue Nov 21 21:00:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:00:48 -0500
Subject: rpms/gtkmozembedmm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611212100.kALL0m9I029015@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28993/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtkmozembedmm


--- 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 Nov 21 21:02:37 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:02:37 -0500
Subject: rpms/gtkmozembedmm import.log,1.1,1.2
Message-ID: <200611212102.kALL2b5l029136@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100

Modified Files:
	import.log 
Log Message:
auto-import gtkmozembedmm-1.4.2.cvs20060817-5 on branch devel from gtkmozembedmm-1.4.2.cvs20060817-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 21:00:48 -0000	1.1
+++ import.log	21 Nov 2006 21:02:07 -0000	1.2
@@ -0,0 +1 @@
+gtkmozembedmm-1_4_2_cvs20060817-5:HEAD:gtkmozembedmm-1.4.2.cvs20060817-5.src.rpm:1164142906



From fedora-extras-commits at redhat.com  Tue Nov 21 21:02:37 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:02:37 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm-cvs.sh, NONE,
	1.1 gtkmozembedmm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611212102.kALL2baW029140@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtkmozembedmm-cvs.sh gtkmozembedmm.spec 
Log Message:
auto-import gtkmozembedmm-1.4.2.cvs20060817-5 on branch devel from gtkmozembedmm-1.4.2.cvs20060817-5.src.rpm


--- NEW FILE gtkmozembedmm-cvs.sh ---
#! /bin/bash
# script to fetch a snapshot of gtkmozembedmm from cvs
# and generate a tarball suitable for building a rpm
# by H. Gu??mar v. 0.1 du 12/09/2006


# date format YYYYMMDD
TIME="2006-08-17"
TIME_STAMP="20060817"

if ( (test -d gtkmozembedmm) || (test -d gtkmozembedmm-1.4.2.cvs${TIME_STAMP})); then
    rm -rf ./gtkmozembedmm*/
    echo "@ previous cvs snapshot has been deleted"
fi
echo "***** Please hit Enter when asked to login *****"
cvs -d :pserver:anonymous at anoncvs.gnome.org:/cvs/gnome login
# get CVS snapshot
# use export for not including cvs files
cvs -z3 -d :pserver:anonymous at anoncvs.gnome.org:/cvs/gnome export -D${TIME}  gtkmozembedmm
if [ -d gtkmozembedmm ]; then
    echo "cvs snapshot has been successfully retrieved"
else
    echo "@ ERROR: cvs snapshot has not been retrieved"
    exit 0  
fi

# launch autogen.sh script
echo "***** Generate autotools scripts *****"
cd gtkmozembedmm
# dirty workaround not to launch configure script
sed 's/.*maintainer/# &'/ autogen.sh > autogen.tmp
mv autogen.tmp autogen.sh
chmod +x autogen.sh
sh autogen.sh
cd ..

# Build tarball
if ( test -e gtkmozembedmm-1.4.2.cvs${TIME_STAMP}.tar.bz2); then
    rm gtkmozembedmm-1.4.2.cvs${TIME_STAMP}.tar.bz2
    echo "@ previous tarball has been deleted"
fi
echo "***** tarball build *****"
mv ./gtkmozembedmm/ gtkmozembedmm-1.4.2.cvs${TIME_STAMP}
tar -cjf gtkmozembedmm-1.4.2.cvs${TIME_STAMP}.tar.bz2 ./gtkmozembedmm-1.4.2.cvs${TIME_STAMP}/
if ( test -e gtkmozembedmm-1.4.2.cvs${TIME_STAMP}.tar.bz2); then
    echo "@ Success"
else
    echo "@ ERROR: tarball has not been built"
fi


--- NEW FILE gtkmozembedmm.spec ---
Name:           gtkmozembedmm
Version:        1.4.2.cvs20060817
Release:        5%{?dist}

Summary:        C++ wrapper for GtkMozembed

Group:          System Environment/Libraries
License:        LGPL
URL:            http://gtkmm.sourceforge.net/
Source0:        gtkmozembedmm-%{version}.tar.bz2
# script to generate tarball from cvs
Source1:        gtkmozembedmm-cvs.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  gtkmm24-devel >= 2.4.0
BuildRequires:  gnome-vfsmm26 >= 2.12.0
BuildRequires:  libgnomemm26 >= 2.12.0
BuildRequires:  libgnomeuimm26-devel >= 2.12.0
# Use mozilla-devel up to FC5, and firefox-devel for FC6+
%if %{!?fedora:6}%{?fedora} >= 6
BuildRequires: gecko-devel 
Requires: gecko-libs = 1.5.0.8
%else
BuildRequires: mozilla-devel
%endif
BuildRequires:  automake >= 1.9.6
BuildRequires:  libtool
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig


%description
This package provides a C++/gtkmm wrapper for GtkMozEmbed 
from Mozilla 1.4.x to 1.7.x.
The wrapper provides a convenient interface for C++ programmers 
to use the Gtkmozembed HTML-rendering widget inside their software.

%package devel
Summary:        Headers for developing programs that will use gtkmozembedmm
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtkmm24-devel
%if %{!?fedora:6}%{?fedora} >= 6
BuildRequires: gecko-devel
%else
BuildRequires: mozilla-devel 
%endif

%description devel
This package contains the headers that programmers will need to
develop applications which will use gtkmozembedmm.


%prep
%setup -q -n gtkmozembedmm-%{version}
%if %{!?fedora:6}%{?fedora} >= 6
%{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
%endif
%ifarch x86_64
# correct a path issue that prevent gtkmozembedmm to build on x86_64
%{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure
%{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure.ac
%endif

%build
# enable maintainer specific parts in makefiles
# prevent the build to fail
%configure --disable-static   --enable-maintainer-mode "$@"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so
mkdir $RPM_BUILD_ROOT%{_includedir}/gtkmozembedmm-1.4/proc/
mv $RPM_BUILD_ROOT%{_libdir}/gtkmozembedmm-1.4/include/gtkmozembedmmconfig.h \
   $RPM_BUILD_ROOT%{_includedir}/gtkmozembedmm-1.4/gtkmozembedmmconfig.h
mv $RPM_BUILD_ROOT%{_libdir}/gtkmozembedmm-1.4/proc \
   $RPM_BUILD_ROOT%{_includedir}/gtkmozembedmm-1.4/proc/

%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog TODO NEWS README
%{_libdir}/*.so.*

%files devel
%defattr(-, root, root, -)
%doc
%{_includedir}/gtkmozembedmm-1.4/
%{_libdir}/*.so
%{_libdir}/gtkmozembedmm-1.4/
%{_libdir}/pkgconfig/*.pc


%changelog
* Sun Nov 12 2006 Karl  - 1.4.2.cvs20060817-5
- Fixed x86_64 build issue.

* Tue Sep 12 2006 Karl  - 1.4.2.cvs20060817-4
- fixed shared lib permission, moved m4 macros into /usr/include, 
added libtool as BR, provides a script to generate cvs snapshot.

* Fri Sep 08 2006 Karl  - 1.4.2.cvs20060817-3
- added automake as BR, conditional dependency on firefox-devel for 
FC6+ to build under Mock.

* Thu Aug 17 2006 Karl  - 1.4.2.cvs20060817-2
- updated to cvs20060817

* Sat May 20 2006 Karl  - 1.4.2-1
- First Packaging from cvs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 21:00:48 -0000	1.1
+++ .cvsignore	21 Nov 2006 21:02:07 -0000	1.2
@@ -0,0 +1 @@
+gtkmozembedmm-1.4.2.cvs20060817.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 21:00:48 -0000	1.1
+++ sources	21 Nov 2006 21:02:07 -0000	1.2
@@ -0,0 +1 @@
+2151171fb009ee69dc8e7e3ffec1b578  gtkmozembedmm-1.4.2.cvs20060817.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 21:07:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:07:52 -0500
Subject: owners owners.list,1.1986,1.1987
Message-ID: <200611212107.kALL7qTk029205@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29188

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1986
retrieving revision 1.1987
diff -u -r1.1986 -r1.1987
--- owners.list	21 Nov 2006 18:01:48 -0000	1.1986
+++ owners.list	21 Nov 2006 21:07:22 -0000	1.1987
@@ -656,6 +656,7 @@
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmozembedmm|A C++ wrapper for gtkmozembed widget|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtksharp|gtk 1.2 bindings for mono|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gtksourceview-sharp|C# bindings for gtksourceview|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 21:21:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:21:45 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.1,1.2
Message-ID: <200611212121.kALLLj6r029685@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29649

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkmozembedmm.spec	21 Nov 2006 21:02:07 -0000	1.1
+++ gtkmozembedmm.spec	21 Nov 2006 21:21:15 -0000	1.2
@@ -17,10 +17,10 @@
 BuildRequires:  gnome-vfsmm26 >= 2.12.0
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
-# Use mozilla-devel up to FC5, and firefox-devel for FC6+
+# Use mozilla-devel up to FC5, and gecko-devel for FC6+
 %if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: gecko-devel 
-Requires: gecko-libs = 1.5.0.8
+Requires: gecko-libs = 2.0
 %else
 BuildRequires: mozilla-devel
 %endif



From fedora-extras-commits at redhat.com  Tue Nov 21 21:43:29 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:43:29 -0500
Subject: rpms/moomps/devel .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <200611212143.kALLhTHS030010@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29993

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Oct 2006 18:12:34 -0000	1.9
+++ .cvsignore	21 Nov 2006 21:42:59 -0000	1.10
@@ -1 +1 @@
-moomps-5.7.tar.bz2
+moomps-5.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Oct 2006 18:12:34 -0000	1.9
+++ sources	21 Nov 2006 21:42:59 -0000	1.10
@@ -1 +1 @@
-47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2
+24f49a6df9c0701d23f99d62b030d72b  moomps-5.8.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 21:44:23 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:44:23 -0500
Subject: rpms/moodss/devel .cvsignore,1.11,1.12 sources,1.12,1.13
Message-ID: <200611212144.kALLiNGG030053@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30016

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 19:37:39 -0000	1.11
+++ .cvsignore	21 Nov 2006 21:43:53 -0000	1.12
@@ -1 +0,0 @@
-moodss-21.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2006 19:37:40 -0000	1.12
+++ sources	21 Nov 2006 21:43:53 -0000	1.13
@@ -1 +0,0 @@
-3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 21:44:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 21 Nov 2006 16:44:42 -0500
Subject: rpms/plt-scheme/FC-6 .cvsignore, 1.8, 1.9 plt-scheme.spec, 1.28,
	1.29 sources, 1.9, 1.10
Message-ID: <200611212144.kALLigdP030058@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30035

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 360


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jul 2006 13:00:38 -0000	1.8
+++ .cvsignore	21 Nov 2006 21:44:12 -0000	1.9
@@ -1 +1 @@
-plt-352-src-unix.tgz
+plt-360-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-6/plt-scheme.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plt-scheme.spec	2 Oct 2006 20:08:12 -0000	1.28
+++ plt-scheme.spec	21 Nov 2006 21:44:12 -0000	1.29
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        352
-Release:        3%{?dist}
+Version:        360
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/352/plt/plt-352-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/360/plt/plt-360-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,7 +59,7 @@
 
 
 %prep
-%setup -q -n plt
+%setup -q -n plt-360
 %ifarch x86_64
 %patch0 -p1
 %endif
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gerard Milmeister  - 360-1
+- new version 360
+
 * Mon Oct  2 2006 Gerard Milmeister  - 352-3
 - rename conflicting binary planet to plt-planet
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2006 13:00:38 -0000	1.9
+++ sources	21 Nov 2006 21:44:12 -0000	1.10
@@ -1 +1 @@
-e79fd305fe431e0477f861902f2ef9e1  plt-352-src-unix.tgz
+84bcab3ff30c333ae3c6b732518bdf27  plt-360-src-unix.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 21:47:07 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:47:07 -0500
Subject: rpms/moodss/devel .cvsignore,1.12,1.13 sources,1.13,1.14
Message-ID: <200611212147.kALLl71X030137@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30115

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Nov 2006 21:43:53 -0000	1.12
+++ .cvsignore	21 Nov 2006 21:46:37 -0000	1.13
@@ -0,0 +1 @@
+moodss-21.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Nov 2006 21:43:53 -0000	1.13
+++ sources	21 Nov 2006 21:46:37 -0000	1.14
@@ -0,0 +1 @@
+4d05f8135c05d7f39dd0a8868c899897  moodss-21.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 21:49:01 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:49:01 -0500
Subject: rpms/moodss/devel moodss.spec,1.25,1.26
Message-ID: <200611212149.kALLn1Nv030174@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30149

Modified Files:
	moodss.spec 
Log Message:
21.5 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- moodss.spec	31 Oct 2006 19:44:28 -0000	1.25
+++ moodss.spec	21 Nov 2006 21:48:31 -0000	1.26
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.4
+Version: 21.5
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.5.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  21.5-1
+- 21.5 upstream release
+
 * Mon Oct 25 2006 Jean-Luc Fontaine  21.4-1
 - 21.4 upstream release
 



From fedora-extras-commits at redhat.com  Tue Nov 21 21:51:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 21 Nov 2006 16:51:17 -0500
Subject: rpms/plt-scheme/FC-5 .cvsignore, 1.8, 1.9 plt-scheme.spec, 1.27,
	1.28 sources, 1.9, 1.10
Message-ID: <200611212151.kALLpHwL030263@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30226/FC-5

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 360


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jul 2006 12:57:29 -0000	1.8
+++ .cvsignore	21 Nov 2006 21:50:47 -0000	1.9
@@ -1 +1 @@
-plt-352-src-unix.tgz
+plt-360-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-5/plt-scheme.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- plt-scheme.spec	2 Oct 2006 20:10:46 -0000	1.27
+++ plt-scheme.spec	21 Nov 2006 21:50:47 -0000	1.28
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        352
-Release:        3%{?dist}
+Version:        360
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/352/plt/plt-352-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/360/plt/plt-360-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,7 +59,7 @@
 
 
 %prep
-%setup -q -n plt
+%setup -q -n plt-360
 %ifarch x86_64
 %patch0 -p1
 %endif
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gerard Milmeister  - 360-1
+- new version 360
+
 * Mon Oct  2 2006 Gerard Milmeister  - 352-3
 - rename conflicting binary planet to plt-planet
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2006 12:57:29 -0000	1.9
+++ sources	21 Nov 2006 21:50:47 -0000	1.10
@@ -1 +1 @@
-e79fd305fe431e0477f861902f2ef9e1  plt-352-src-unix.tgz
+84bcab3ff30c333ae3c6b732518bdf27  plt-360-src-unix.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 21:51:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 21 Nov 2006 16:51:17 -0500
Subject: rpms/plt-scheme/devel .cvsignore, 1.8, 1.9 plt-scheme.spec, 1.28,
	1.29 sources, 1.9, 1.10
Message-ID: <200611212151.kALLpH3S030268@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30226/devel

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 360


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jul 2006 13:00:38 -0000	1.8
+++ .cvsignore	21 Nov 2006 21:50:47 -0000	1.9
@@ -1 +1 @@
-plt-352-src-unix.tgz
+plt-360-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plt-scheme.spec	2 Oct 2006 20:08:12 -0000	1.28
+++ plt-scheme.spec	21 Nov 2006 21:50:47 -0000	1.29
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        352
-Release:        3%{?dist}
+Version:        360
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/352/plt/plt-352-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/360/plt/plt-360-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,7 +59,7 @@
 
 
 %prep
-%setup -q -n plt
+%setup -q -n plt-360
 %ifarch x86_64
 %patch0 -p1
 %endif
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gerard Milmeister  - 360-1
+- new version 360
+
 * Mon Oct  2 2006 Gerard Milmeister  - 352-3
 - rename conflicting binary planet to plt-planet
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2006 13:00:38 -0000	1.9
+++ sources	21 Nov 2006 21:50:47 -0000	1.10
@@ -1 +1 @@
-e79fd305fe431e0477f861902f2ef9e1  plt-352-src-unix.tgz
+84bcab3ff30c333ae3c6b732518bdf27  plt-360-src-unix.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 21:51:52 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:51:52 -0500
Subject: rpms/moomps/devel moomps.spec,1.16,1.17
Message-ID: <200611212151.kALLpqsw030295@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30227

Modified Files:
	moomps.spec 
Log Message:
5.8 upstream release, pass library directories to make also at install stage.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- moomps.spec	12 Nov 2006 18:36:48 -0000	1.16
+++ moomps.spec	21 Nov 2006 21:51:22 -0000	1.17
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.7
-Release: 3%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.8.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl >= 8.4.7
@@ -32,7 +32,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOTDIR=$RPM_BUILD_ROOT install
+make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir TCLLIBDIR=%_libdir install
 
 %pre
 # if not present, add moomps user (even when upgrading):
@@ -80,6 +80,10 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  5.8-1
+- 5.8 upstream release
+- pass library directories to make also at install stage
+
 * Tue Nov 7 2006 Jean-Luc Fontaine  5.7-3
 - made package architecture dependant since for example Tcl
   packages are under /usr/lib on i386 and /usr/lib64 on x86_64



From fedora-extras-commits at redhat.com  Tue Nov 21 22:04:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 17:04:29 -0500
Subject: rpms/ortp/FC-6 .cvsignore, 1.5, 1.6 ortp.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200611212204.kALM4TgS030469@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30447

Modified Files:
	.cvsignore ortp.spec sources 
Log Message:
Update to 0.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 13:16:53 -0000	1.5
+++ .cvsignore	21 Nov 2006 22:03:59 -0000	1.6
@@ -1 +1 @@
-ortp-0.11.0.tar.gz
+ortp-0.12.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-6/ortp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ortp.spec	9 Oct 2006 14:33:45 -0000	1.11
+++ ortp.spec	21 Nov 2006 22:03:59 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ortp
-Version:        0.11.0
-Release:        2%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -50,7 +50,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
-* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.12.0-1
+- Update to 0.12.0
+
+* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-2
 - Bring back -Werror patch (needed for building on PPC)
 
 * Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 13:16:53 -0000	1.5
+++ sources	21 Nov 2006 22:03:59 -0000	1.6
@@ -1 +1 @@
-c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz
+c36142acaed25806824dd4fac1d666b3  ortp-0.12.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 22:11:44 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 17:11:44 -0500
Subject: rpms/ortp/devel .cvsignore, 1.5, 1.6 ortp.spec, 1.11, 1.12 sources, 
	1.5, 1.6
Message-ID: <200611212211.kALMBi1L030559@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30540

Modified Files:
	.cvsignore ortp.spec sources 
Log Message:
Update to 0.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 13:16:53 -0000	1.5
+++ .cvsignore	21 Nov 2006 22:11:14 -0000	1.6
@@ -1 +1 @@
-ortp-0.11.0.tar.gz
+ortp-0.12.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ortp.spec	9 Oct 2006 14:33:45 -0000	1.11
+++ ortp.spec	21 Nov 2006 22:11:14 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ortp
-Version:        0.11.0
-Release:        2%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -50,7 +50,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
-* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.12.0-1
+- Update to 0.12.0
+
+* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-2
 - Bring back -Werror patch (needed for building on PPC)
 
 * Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 13:16:53 -0000	1.5
+++ sources	21 Nov 2006 22:11:14 -0000	1.6
@@ -1 +1 @@
-c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz
+c36142acaed25806824dd4fac1d666b3  ortp-0.12.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 22:12:44 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 17:12:44 -0500
Subject: rpms/ortp/FC-5 .cvsignore, 1.5, 1.6 ortp.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <200611212212.kALMCi4f030622@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30603

Modified Files:
	.cvsignore ortp.spec sources 
Log Message:
Update to 0.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 14:07:19 -0000	1.5
+++ .cvsignore	21 Nov 2006 22:12:14 -0000	1.6
@@ -1 +1 @@
-ortp-0.11.0.tar.gz
+ortp-0.12.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/ortp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ortp.spec	9 Oct 2006 14:52:52 -0000	1.10
+++ ortp.spec	21 Nov 2006 22:12:14 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ortp
-Version:        0.11.0
-Release:        2%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -50,7 +50,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
-* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.12.0-1
+- Update to 0.12.0
+
+* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-2
 - Bring back -Werror patch (needed for building on PPC)
 
 * Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 14:07:19 -0000	1.5
+++ sources	21 Nov 2006 22:12:14 -0000	1.6
@@ -1 +1 @@
-c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz
+c36142acaed25806824dd4fac1d666b3  ortp-0.12.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 22:30:48 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 17:30:48 -0500
Subject: rpms/moodss/FC-5 .cvsignore, 1.11, 1.12 moodss.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <200611212230.kALMUmHJ030839@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30818

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.5 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 19:46:33 -0000	1.11
+++ .cvsignore	21 Nov 2006 22:30:18 -0000	1.12
@@ -1 +1 @@
-moodss-21.4.tar.bz2
+moodss-21.5.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/moodss.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- moodss.spec	31 Oct 2006 19:46:33 -0000	1.24
+++ moodss.spec	21 Nov 2006 22:30:18 -0000	1.25
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.4
+Version: 21.5
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.5.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  21.5-1
+- 21.5 upstream release
+
 * Mon Oct 25 2006 Jean-Luc Fontaine  21.4-1
 - 21.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2006 19:46:33 -0000	1.12
+++ sources	21 Nov 2006 22:30:18 -0000	1.13
@@ -1 +1 @@
-3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2
+4d05f8135c05d7f39dd0a8868c899897  moodss-21.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 22:32:12 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 17:32:12 -0500
Subject: rpms/moodss/FC-6 .cvsignore, 1.11, 1.12 moodss.spec, 1.25,
	1.26 sources, 1.12, 1.13
Message-ID: <200611212232.kALMWCuj030904@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30883

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.5 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 19:57:18 -0000	1.11
+++ .cvsignore	21 Nov 2006 22:31:42 -0000	1.12
@@ -1 +1 @@
-moodss-21.4.tar.bz2
+moodss-21.5.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/moodss.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- moodss.spec	31 Oct 2006 19:57:18 -0000	1.25
+++ moodss.spec	21 Nov 2006 22:31:42 -0000	1.26
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.4
+Version: 21.5
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.5.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  21.5-1
+- 21.5 upstream release
+
 * Mon Oct 25 2006 Jean-Luc Fontaine  21.4-1
 - 21.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2006 19:57:18 -0000	1.12
+++ sources	21 Nov 2006 22:31:42 -0000	1.13
@@ -1 +1 @@
-3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2
+4d05f8135c05d7f39dd0a8868c899897  moodss-21.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 22:35:24 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 17:35:24 -0500
Subject: rpms/moomps/FC-5 .cvsignore, 1.9, 1.10 moomps.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <200611212235.kALMZOiA030980@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30961

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.8 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Oct 2006 18:51:57 -0000	1.9
+++ .cvsignore	21 Nov 2006 22:34:54 -0000	1.10
@@ -1 +1 @@
-moomps-5.7.tar.bz2
+moomps-5.8.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- moomps.spec	4 Nov 2006 12:29:30 -0000	1.14
+++ moomps.spec	21 Nov 2006 22:34:54 -0000	1.15
@@ -1,12 +1,11 @@
 Name: moomps
-Version: 5.7
-Release: 2%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.8.tar.bz2
 URL: http://moodss.sourceforge.net/
-BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl >= 8.4.7
 Requires(pre): fedora-usermgmt >= 0.8
@@ -33,7 +32,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOTDIR=$RPM_BUILD_ROOT install
+make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir TCLLIBDIR=%_libdir install
 
 %pre
 # if not present, add moomps user (even when upgrading):
@@ -81,6 +80,14 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  5.8-1
+- 5.8 upstream release
+- pass library directories to make also at install stage
+
+* Tue Nov 7 2006 Jean-Luc Fontaine  5.7-3
+- made package architecture dependant since for example Tcl
+  packages are under /usr/lib on i386 and /usr/lib64 on x86_64
+
 * Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
 - properly support 64 bit architecture by passing library
   directories to make


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Oct 2006 18:51:57 -0000	1.9
+++ sources	21 Nov 2006 22:34:54 -0000	1.10
@@ -1 +1 @@
-47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2
+24f49a6df9c0701d23f99d62b030d72b  moomps-5.8.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 22:36:45 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 17:36:45 -0500
Subject: rpms/moomps/FC-6 .cvsignore, 1.9, 1.10 moomps.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <200611212236.kALMaj88031043@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31024

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.8 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Oct 2006 18:54:15 -0000	1.9
+++ .cvsignore	21 Nov 2006 22:36:15 -0000	1.10
@@ -1 +1 @@
-moomps-5.7.tar.bz2
+moomps-5.8.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/moomps.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- moomps.spec	4 Nov 2006 12:28:04 -0000	1.15
+++ moomps.spec	21 Nov 2006 22:36:15 -0000	1.16
@@ -1,12 +1,11 @@
 Name: moomps
-Version: 5.7
-Release: 2%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.8.tar.bz2
 URL: http://moodss.sourceforge.net/
-BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl >= 8.4.7
 Requires(pre): fedora-usermgmt >= 0.8
@@ -33,7 +32,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOTDIR=$RPM_BUILD_ROOT install
+make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir TCLLIBDIR=%_libdir install
 
 %pre
 # if not present, add moomps user (even when upgrading):
@@ -81,6 +80,14 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  5.8-1
+- 5.8 upstream release
+- pass library directories to make also at install stage
+
+* Tue Nov 7 2006 Jean-Luc Fontaine  5.7-3
+- made package architecture dependant since for example Tcl
+  packages are under /usr/lib on i386 and /usr/lib64 on x86_64
+
 * Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
 - properly support 64 bit architecture by passing library
   directories to make


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Oct 2006 18:54:15 -0000	1.9
+++ sources	21 Nov 2006 22:36:15 -0000	1.10
@@ -1 +1 @@
-47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2
+24f49a6df9c0701d23f99d62b030d72b  moomps-5.8.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 23:57:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 18:57:29 -0500
Subject: rpms/php-pear-MDB2/devel .cvsignore, 1.2, 1.3 php-pear-MDB2.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611212357.kALNvTBv032359@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32340

Modified Files:
	.cvsignore php-pear-MDB2.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 22:02:55 -0000	1.2
+++ .cvsignore	21 Nov 2006 23:56:59 -0000	1.3
@@ -1 +1 @@
-MDB2-2.2.2.tgz
+MDB2-2.3.0.tgz


Index: php-pear-MDB2.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/devel/php-pear-MDB2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-MDB2.spec	7 Sep 2006 01:41:33 -0000	1.2
+++ php-pear-MDB2.spec	21 Nov 2006 23:56:59 -0000	1.3
@@ -2,8 +2,8 @@
 %define ClassName MDB2
 
 Name:           php-pear-MDB2
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -48,6 +48,7 @@
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{ClassName}/LICENSE docdir/%{ClassName}/docs
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,6 +83,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Christopher Stone  2.3.0-1
+- Upstream sync
+- Move LICENSE file from %%{pear_datadir} to %%doc
+
 * Thu Sep 07 2006 Christopher Stone  2.2.2-2
 - Sync up with latest pear template
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 22:02:55 -0000	1.2
+++ sources	21 Nov 2006 23:56:59 -0000	1.3
@@ -1 +1 @@
-aef4a12a1c07b80118545cc43637ab43  MDB2-2.2.2.tgz
+31c7294943b665c293f1453e1c4b20a4  MDB2-2.3.0.tgz



From fedora-extras-commits at redhat.com  Wed Nov 22 00:07:00 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 19:07:00 -0500
Subject: comps comps-fe5.xml.in, 1.202, 1.203 comps-fe6.xml.in, 1.227,
	1.228 comps-fe7.xml.in, 1.26, 1.27
Message-ID: <200611220007.kAM070WU032620@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32598

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Add Zim.



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- comps-fe5.xml.in	21 Nov 2006 10:35:31 -0000	1.202
+++ comps-fe5.xml.in	22 Nov 2006 00:06:30 -0000	1.203
@@ -785,6 +785,7 @@
       tinyerp
       tinyerp-server
       xchm
+      Zim
     
   
   


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- comps-fe6.xml.in	21 Nov 2006 19:49:58 -0000	1.227
+++ comps-fe6.xml.in	22 Nov 2006 00:06:30 -0000	1.228
@@ -837,6 +837,7 @@
       tinyerp
       tinyerp-server
       xchm
+      Zim
     
   
   


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- comps-fe7.xml.in	21 Nov 2006 19:58:50 -0000	1.26
+++ comps-fe7.xml.in	22 Nov 2006 00:06:30 -0000	1.27
@@ -837,6 +837,7 @@
       tinyerp
       tinyerp-server
       xchm
+      Zim
     
   
   



From fedora-extras-commits at redhat.com  Wed Nov 22 00:11:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 19:11:47 -0500
Subject: rpms/php-pear-MDB2/FC-6 .cvsignore, 1.2, 1.3 php-pear-MDB2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611220011.kAM0BlKE032672@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32653

Modified Files:
	.cvsignore php-pear-MDB2.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 22:02:55 -0000	1.2
+++ .cvsignore	22 Nov 2006 00:11:17 -0000	1.3
@@ -1 +1 @@
-MDB2-2.2.2.tgz
+MDB2-2.3.0.tgz


Index: php-pear-MDB2.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-6/php-pear-MDB2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-MDB2.spec	7 Sep 2006 01:41:33 -0000	1.2
+++ php-pear-MDB2.spec	22 Nov 2006 00:11:17 -0000	1.3
@@ -2,8 +2,8 @@
 %define ClassName MDB2
 
 Name:           php-pear-MDB2
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -48,6 +48,7 @@
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{ClassName}/LICENSE docdir/%{ClassName}/docs
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,6 +83,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Christopher Stone  2.3.0-1
+- Upstream sync
+- Move LICENSE file from %%{pear_datadir} to %%doc
+
 * Thu Sep 07 2006 Christopher Stone  2.2.2-2
 - Sync up with latest pear template
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 22:02:55 -0000	1.2
+++ sources	22 Nov 2006 00:11:17 -0000	1.3
@@ -1 +1 @@
-aef4a12a1c07b80118545cc43637ab43  MDB2-2.2.2.tgz
+31c7294943b665c293f1453e1c4b20a4  MDB2-2.3.0.tgz



From fedora-extras-commits at redhat.com  Wed Nov 22 00:13:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 19:13:16 -0500
Subject: rpms/php-pear-MDB2/FC-5 .cvsignore, 1.2, 1.3 php-pear-MDB2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611220013.kAM0DGBP032756@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32737

Modified Files:
	.cvsignore php-pear-MDB2.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 22:02:55 -0000	1.2
+++ .cvsignore	22 Nov 2006 00:12:46 -0000	1.3
@@ -1 +1 @@
-MDB2-2.2.2.tgz
+MDB2-2.3.0.tgz


Index: php-pear-MDB2.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-5/php-pear-MDB2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-MDB2.spec	7 Sep 2006 01:41:33 -0000	1.2
+++ php-pear-MDB2.spec	22 Nov 2006 00:12:46 -0000	1.3
@@ -2,8 +2,8 @@
 %define ClassName MDB2
 
 Name:           php-pear-MDB2
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -48,6 +48,7 @@
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{ClassName}/LICENSE docdir/%{ClassName}/docs
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,6 +83,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Christopher Stone  2.3.0-1
+- Upstream sync
+- Move LICENSE file from %%{pear_datadir} to %%doc
+
 * Thu Sep 07 2006 Christopher Stone  2.2.2-2
 - Sync up with latest pear template
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 22:02:55 -0000	1.2
+++ sources	22 Nov 2006 00:12:46 -0000	1.3
@@ -1 +1 @@
-aef4a12a1c07b80118545cc43637ab43  MDB2-2.2.2.tgz
+31c7294943b665c293f1453e1c4b20a4  MDB2-2.3.0.tgz



From fedora-extras-commits at redhat.com  Wed Nov 22 01:04:42 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 21 Nov 2006 20:04:42 -0500
Subject: rpms/db4o/devel .cvsignore, 1.2, 1.3 db4o.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200611220104.kAM14gxm000716@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/db4o/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv681/devel

Modified Files:
	.cvsignore db4o.spec sources 
Log Message:
auto-import db4o-6.0-3.1 on branch devel from db4o-6.0-3.1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/db4o/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Aug 2006 15:36:27 -0000	1.2
+++ .cvsignore	22 Nov 2006 01:04:12 -0000	1.3
@@ -1 +1 @@
-db4o-5.5-mono.tar.gz
+db4o-6.0-mono.tar.gz


Index: db4o.spec
===================================================================
RCS file: /cvs/extras/rpms/db4o/devel/db4o.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- db4o.spec	31 Aug 2006 22:09:49 -0000	1.4
+++ db4o.spec	22 Nov 2006 01:04:12 -0000	1.5
@@ -2,11 +2,11 @@
 
 Summary: A native OODBMS for Java/.NET/Mono - Mono version
 Name: db4o
-Version: 5.5
-Release: 10%{?dist}
+Version: 6.0
+Release: 3.1%{?dist}
 License: GPL
 Group: Development/Libraries
-Source: http://213.203.204.172/downloads/db4o-5.5-mono.tar.gz
+Source: http://213.203.204.172/downloads/%{name}-%{version}-mono.tar.gz
 URL: http://www.db4o.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: mono-devel
@@ -34,23 +34,32 @@
 
 %prep
 %setup -q 
-sed -i 's/\r//' doc/tutorial/vb/index.html
-sed -i 's/\r//' doc/tutorial/index.html
+#sed -i 's/\r//' doc/tutorial/vb/index.html
+#sed -i 's/\r//' doc/tutorial/index.html
 sed 's!/usr/lib!%{_libdir}!' -i Makefile
 
 %build
 rm -rf %{buildroot}
-make buildtest
+make
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig
 mkdir -p %{buildroot}/%{_libdir}/mono/gac
-gacutil -i dll/db4o.dll -f -package db4o -root %{buildroot}%{_libdir}
+mkdir -p %{buildroot}/%{_bindir}
+gacutil -i bin/Db4objects.Db4o.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i bin/Db4objects.Db4o.Tools.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i bin/Db4oUnit.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i bin/Db4oUnit.Extensions.dll -f -package db4o -root %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_libdir}/mono/db4o
 cp %{buildroot}%{_libdir}/db4o/* %{buildroot}%{_libdir}/mono/db4o
 rm -rf %{buildroot}%{_libdir}/db4o
+cp bin/*.exe %{buildroot}%{_bindir}/
+mv %{buildroot}%{_bindir}/Db4oAdmin.exe %{buildroot}%{_bindir}/Db4oAdmin
+mv %{buildroot}%{_bindir}/Db4objects.Db4o.Tests.exe %{buildroot}%{_bindir}/Db4oTests
+#ln -s %{buildroot}%{_bindir}/Db4oAdmin %{buildroot}/%{_libdir}/mono/db4o/Db4oAdmin.exe
+#ln -s %{buildroot}%{_bindir}/Db4oTests %{buildroot}/%{_libdir}/mono/db4o/Db4objects.Db4o.Tests.exe
 
 cat <%{buildroot}/%{_libdir}/pkgconfig/db4o.pc
 prefix=%{_prefix}
@@ -59,8 +68,8 @@
 
 Name: db4o
 Description: db4o - an object based database system
-Version: 5.5
-Libs: -r:%{_libdir}/mono/db4o/db4o.dll
+Version: 6.0
+Libs: -r:%{_libdir}/mono/db4o/Db4objects.Db4o.dll
 EOF
 
 %clean
@@ -68,9 +77,9 @@
 
 %files
 %defattr(-,root,root)
-%doc README.txt
+%{_bindir}/*
 %{_libdir}/mono/db4o/
-%{_libdir}/mono/gac/db4o/
+%{_libdir}/mono/gac/Db4*
 
 %files doc
 %doc doc/*
@@ -79,6 +88,10 @@
 %{_libdir}/pkgconfig/db4o.pc
 
 %changelog
+* Wed Nov 22 2006 Paul F. Johnson  6.0.3-1
+- bump to new dev version
+- minor spec file fixes
+
 * Wed Aug 24 2006 Paul F. Johnson  5.5-10
 - Removed monodir hack
 - Added makefile patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/db4o/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Aug 2006 15:36:27 -0000	1.2
+++ sources	22 Nov 2006 01:04:12 -0000	1.3
@@ -1 +1 @@
-4aea1da3b96a2b92c9ac69ee2ccb9a63  db4o-5.5-mono.tar.gz
+35ec1e62a326012df46eecbf48d41e2b  db4o-6.0-mono.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 01:04:42 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 21 Nov 2006 20:04:42 -0500
Subject: rpms/db4o import.log,1.4,1.5
Message-ID: <200611220104.kAM14g77000711@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/db4o
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv681

Modified Files:
	import.log 
Log Message:
auto-import db4o-6.0-3.1 on branch devel from db4o-6.0-3.1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/db4o/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	31 Aug 2006 22:09:48 -0000	1.4
+++ import.log	22 Nov 2006 01:04:12 -0000	1.5
@@ -1,3 +1,4 @@
 db4o-5_5-7:HEAD:db4o-5.5-7.src.rpm:1155137782
 db4o-5_5-9:HEAD:db4o-5.5-9.src.rpm:1156458606
 db4o-5_5-10:HEAD:db4o-5.5-10.src.rpm:1157062175
+db4o-6_0-3_1:HEAD:db4o-6.0-3.1.src.rpm:1164157457



From fedora-extras-commits at redhat.com  Wed Nov 22 02:06:27 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:06:27 -0500
Subject: rpms/labyrinth - New directory
Message-ID: <200611220206.kAM26RMv001035@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031/labyrinth

Log Message:
Directory /cvs/extras/rpms/labyrinth added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 02:06:33 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:06:33 -0500
Subject: rpms/labyrinth/devel - New directory
Message-ID: <200611220206.kAM26W6O001048@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031/labyrinth/devel

Log Message:
Directory /cvs/extras/rpms/labyrinth/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 02:06:43 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:06:43 -0500
Subject: rpms/labyrinth Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611220206.kAM26hka001078@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1072

Added Files:
	Makefile import.log 
Log Message:
Setup of module labyrinth


--- NEW FILE Makefile ---
# Top level Makefile for module labyrinth
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  Wed Nov 22 02:06:48 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:06:48 -0500
Subject: rpms/labyrinth/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611220206.kAM26mAx001093@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1072/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module labyrinth


--- 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 Nov 22 02:07:46 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:07:46 -0500
Subject: rpms/labyrinth import.log,1.1,1.2
Message-ID: <200611220207.kAM27kU4001176@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1140

Modified Files:
	import.log 
Log Message:
auto-import labyrinth-0.3-1 on branch devel from labyrinth-0.3-1.src.rpm
Initial import (APPROVED in bug #216363)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/labyrinth/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 02:06:43 -0000	1.1
+++ import.log	22 Nov 2006 02:07:16 -0000	1.2
@@ -0,0 +1 @@
+labyrinth-0_3-1:HEAD:labyrinth-0.3-1.src.rpm:1164161251



From fedora-extras-commits at redhat.com  Wed Nov 22 02:07:46 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:07:46 -0500
Subject: rpms/labyrinth/devel labyrinth-fix-interpreters.patch, NONE,
	1.1 labyrinth.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611220207.kAM27kb0001180@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1140/devel

Modified Files:
	.cvsignore sources 
Added Files:
	labyrinth-fix-interpreters.patch labyrinth.spec 
Log Message:
auto-import labyrinth-0.3-1 on branch devel from labyrinth-0.3-1.src.rpm
Initial import (APPROVED in bug #216363)

labyrinth-fix-interpreters.patch:

--- NEW FILE labyrinth-fix-interpreters.patch ---
--- labyrinth-0.3/src/Links.py.old	2006-11-15 21:56:09.000000000 -0800
+++ labyrinth-0.3/src/Links.py	2006-11-15 21:56:18.000000000 -0800
@@ -1,4 +1,4 @@
-#! /usr/bin env python
+#! /usr/bin/env python
 
 # Link.py
 # This file is part of Labyrinth
--- labyrinth-0.3/src/MainWindow.py.old	2006-11-15 21:56:31.000000000 -0800
+++ labyrinth-0.3/src/MainWindow.py	2006-11-15 21:56:44.000000000 -0800
@@ -1,4 +1,4 @@
-#! /usr/bin env python
+#! /usr/bin/env python
 
 # MainWindow.py
 # This file is part of Labyrinth


--- NEW FILE labyrinth.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define	python_module_name	%{name}

Name:		labyrinth
Version:	0.3
Release:	1%{?dist}
Summary:	A simple yet powerful mind-mapping tool for the GNOME desktop

Group:		Applications/Productivity
License:	GPL
URL:		http://www.gnome.org/~dscorgie/labyrinth.html

Source0:	http://www.gnome.org/~dscorgie/files/%{name}-%{version}.tar.bz2
Patch0:		%{name}-fix-interpreters.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	gettext
BuildRequires:	perl(XML::Parser)
BuildRequires:	pygtk2-devel >= 2.8
BuildRequires:	gnome-python2-devel >= 2.12
BuildRequires:	gnome-desktop-devel >= 2.14
BuildRequires:	desktop-file-utils

Requires:	pygtk2-libglade >= 2.8
Requires:	PyXML

## Taken from the website's "About" page, as well as Wikipedia's explanation
## of a mind-map.
%description
Labyrinth is a lightweight mind-mapping tool, written in Python using Gtk and
Cairo to do the drawing. It is intended to be as light and intuitive as
possible, but still provide a wide range of powerful features.

A mind-map is a diagram used to represent words, ideas, tasks or other items
linked to and arranged radially around a central key word or idea. It is used
to generate, visualize, structure and classify ideas, and as an aid in study,
organization, problem solving, and decision making.


%prep
%setup -q
%patch0 -p1
%configure


%build
make %{?_smp_flags} 


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 
%find_lang %{name} 
desktop-file-install --vendor fedora	\
	--dir %{buildroot}%{_datadir}/applications	\
	--delete-original	\
	--remove-category=Application	\
	%{buildroot}/%{_datadir}/applications/%{name}.desktop
chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/TextThought.py
chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/Links.py
chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/MMapArea.py
chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/MainWindow.py


%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 ||:


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{python_sitelib}/%{python_module_name}/
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Wed Nov 15 2006 Peter Gordon  - 0.3-1
- Initial packaging.
- Add patch to fix interpreters on MainWindow.py and Links.py scripts:
  + fix-interpreters.patch

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/labyrinth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 02:06:48 -0000	1.1
+++ .cvsignore	22 Nov 2006 02:07:16 -0000	1.2
@@ -0,0 +1 @@
+labyrinth-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/labyrinth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 02:06:48 -0000	1.1
+++ sources	22 Nov 2006 02:07:16 -0000	1.2
@@ -0,0 +1 @@
+d06a89239d53ae31846344c18b0df731  labyrinth-0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 02:11:42 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:11:42 -0500
Subject: owners owners.list,1.1987,1.1988
Message-ID: <200611220211.kAM2Bgm2001266@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1251/owners

Modified Files:
	owners.list 
Log Message:
Add entry for labyrinth


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1987
retrieving revision 1.1988
diff -u -r1.1987 -r1.1988
--- owners.list	21 Nov 2006 21:07:22 -0000	1.1987
+++ owners.list	22 Nov 2006 02:11:12 -0000	1.1988
@@ -853,6 +853,7 @@
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|labyrinth|A simple yet powerful mind-mapping tool for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|lacewing|Asteroid like game with many different ships|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lagan|Local, global, and multiple alignment of DNA sequences|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 02:24:33 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 21 Nov 2006 21:24:33 -0500
Subject: rpms/TurboGears/devel TurboGears.spec,1.6,1.7
Message-ID: <200611220224.kAM2OXLY001402@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1387

Modified Files:
	TurboGears.spec 
Log Message:
add python-TestGears back to Requires


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurboGears.spec	21 Nov 2006 18:38:03 -0000	1.6
+++ TurboGears.spec	22 Nov 2006 02:24:03 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0b1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -24,7 +24,7 @@
 Requires:       python-turbokid >= 0.9.8 python-tgfastdata
 Requires:       python-simplejson >= 1.3 python-paste-script >= 0.9.7
 Requires:       python-configobj >= 4.3.2 python-ruledispatch
-Requires:       python-nose >= 0.9 python-psycopg
+Requires:       python-nose >= 0.9 python-psycopg python-TestGears
 
 %description
 TurboGears brings together four major pieces to create an
@@ -76,6 +76,9 @@
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Fri Nov 21 2006 Luke Macken  1.0b1-3
+- Add python-TestGears back to Requires
+
 * Fri Nov 21 2006 Luke Macken  1.0b1-2
 - Add python-psycopg to Requires
 



From fedora-extras-commits at redhat.com  Wed Nov 22 02:41:21 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:41:21 -0500
Subject: comps comps-fe7.xml.in,1.27,1.28
Message-ID: <200611220241.kAM2fLLN001495@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1480/comps

Modified Files:
	comps-fe7.xml.in 
Log Message:
Add entry for labyrinth


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- comps-fe7.xml.in	22 Nov 2006 00:06:30 -0000	1.27
+++ comps-fe7.xml.in	22 Nov 2006 02:40:51 -0000	1.28
@@ -826,6 +826,7 @@
       hnb
       koffice-suite
       krecipes
+      labyrinth
       lyx
       notecase
       pybliographer



From fedora-extras-commits at redhat.com  Wed Nov 22 04:15:38 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 21 Nov 2006 23:15:38 -0500
Subject: rpms/cmake/devel .cvsignore, 1.4, 1.5 cmake-2.4.2-fedora.patch, 1.2,
	1.3 cmake.spec, 1.9, 1.10 sources, 1.4,
	1.5 cmake-2.4.3-soname.patch, 1.1, NONE
Message-ID: <200611220415.kAM4Fc6k002304@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2276

Modified Files:
	.cvsignore cmake-2.4.2-fedora.patch cmake.spec sources 
Removed Files:
	cmake-2.4.3-soname.patch 
Log Message:
Update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 16:46:34 -0000	1.4
+++ .cvsignore	22 Nov 2006 04:15:08 -0000	1.5
@@ -1 +1 @@
-cmake-2.4.3.tar.gz
+cmake-2.4.4.tar.gz

cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/cmake-2.4.2-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.4.2-fedora.patch	31 Oct 2006 23:11:16 -0000	1.2
+++ cmake-2.4.2-fedora.patch	22 Nov 2006 04:15:08 -0000	1.3
@@ -1,29 +1,3 @@
---- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
-+++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
-@@ -9,6 +9,7 @@
- 
- SET(RUBY_POSSIBLE_INCLUDE_PATHS
--  /usr/lib/ruby/1.8/i386-linux
-+  /usr/lib/ruby/*/i386-linux
-+  /usr/lib64/ruby/*/x86_64-linux
-   )
- 
- SET(RUBY_POSSIBLE_LIB_PATHS
-@@ -19,12 +20,12 @@
-   ${RUBY_POSSIBLE_INCLUDE_PATHS})
- 
- FIND_LIBRARY(RUBY_LIBRARY
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-   )
- 
- FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS
-   /usr/bin
-   /usr/local/bin
 --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
 +++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
 @@ -7,13 +7,11 @@


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cmake.spec	31 Oct 2006 23:11:16 -0000	1.9
+++ cmake.spec	22 Nov 2006 04:15:08 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.3
-Release:	4%{?dist}
+Version:	2.4.4
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
 Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.3-soname.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
 
@@ -25,7 +24,6 @@
 %prep
 %setup -q
 %patch -p1 -b .fedora
-%patch1 -p0 -b .soname
 
 
 %build
@@ -62,6 +60,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Orion Poplawski  - 2.4.4-1
+- Update to 2.4.4
+
 * Tue Oct 31 2006 Orion Poplawski  - 2.4.3-4
 - Add /usr/lib/jvm/java to FindJNI search paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 16:46:34 -0000	1.4
+++ sources	22 Nov 2006 04:15:08 -0000	1.5
@@ -1 +1 @@
-c9b50c488a24edd5297ffc3230ecd0f2  cmake-2.4.3.tar.gz
+8c99af9e6e70f154314cf0d160b61e6e  cmake-2.4.4.tar.gz


--- cmake-2.4.3-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 04:20:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:20:55 -0500
Subject: rpms/perl-Algorithm-C3 Makefile,1.1,1.2
Message-ID: <200611220420.kAM4KtJZ002419@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Algorithm-C3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359

Modified Files:
	Makefile 
Log Message:
- update to 0.06



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 04:40:02 -0000	1.1
+++ Makefile	22 Nov 2006 04:20:25 -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  Wed Nov 22 04:21:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:21:01 -0500
Subject: rpms/perl-Algorithm-C3/FC-6 perl-Algorithm-C3.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200611220421.kAM4L1hq002427@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Algorithm-C3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359/FC-6

Modified Files:
	perl-Algorithm-C3.spec sources 
Log Message:
- update to 0.06



Index: perl-Algorithm-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/FC-6/perl-Algorithm-C3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Algorithm-C3.spec	7 Sep 2006 04:41:44 -0000	1.2
+++ perl-Algorithm-C3.spec	22 Nov 2006 04:20:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-C3
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Module for merging hierarchies using the C3 algorithm
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.06-1
+- update to 0.06
+
 * Wed Sep 06 2006 Chris Weyl  0.05-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:40:57 -0000	1.2
+++ sources	22 Nov 2006 04:20:30 -0000	1.3
@@ -1 +1 @@
-d087e68c937e7076bb07396b281685c1  Algorithm-C3-0.05.tar.gz
+4c05e0ebf31ffb2fa556016b97bd6bcb  Algorithm-C3-0.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:20:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:20:55 -0500
Subject: rpms/perl-Algorithm-C3/FC-5 perl-Algorithm-C3.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200611220421.kAM4KtGL002423@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Algorithm-C3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359/FC-5

Modified Files:
	perl-Algorithm-C3.spec sources 
Log Message:
- update to 0.06



Index: perl-Algorithm-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/FC-5/perl-Algorithm-C3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Algorithm-C3.spec	7 Sep 2006 04:41:44 -0000	1.2
+++ perl-Algorithm-C3.spec	22 Nov 2006 04:20:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-C3
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Module for merging hierarchies using the C3 algorithm
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.06-1
+- update to 0.06
+
 * Wed Sep 06 2006 Chris Weyl  0.05-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:40:57 -0000	1.2
+++ sources	22 Nov 2006 04:20:25 -0000	1.3
@@ -1 +1 @@
-d087e68c937e7076bb07396b281685c1  Algorithm-C3-0.05.tar.gz
+4c05e0ebf31ffb2fa556016b97bd6bcb  Algorithm-C3-0.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:21:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:21:01 -0500
Subject: rpms/perl-Algorithm-C3/devel .cvsignore, 1.2,
	1.3 perl-Algorithm-C3.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611220421.kAM4L1t2002432@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Algorithm-C3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359/devel

Modified Files:
	.cvsignore perl-Algorithm-C3.spec sources 
Log Message:
- update to 0.06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 04:40:57 -0000	1.2
+++ .cvsignore	22 Nov 2006 04:20:31 -0000	1.3
@@ -1 +1 @@
-Algorithm-C3-0.05.tar.gz
+Algorithm-C3-0.06.tar.gz


Index: perl-Algorithm-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/devel/perl-Algorithm-C3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Algorithm-C3.spec	7 Sep 2006 04:41:44 -0000	1.2
+++ perl-Algorithm-C3.spec	22 Nov 2006 04:20:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-C3
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Module for merging hierarchies using the C3 algorithm
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.06-1
+- update to 0.06
+
 * Wed Sep 06 2006 Chris Weyl  0.05-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:40:57 -0000	1.2
+++ sources	22 Nov 2006 04:20:31 -0000	1.3
@@ -1 +1 @@
-d087e68c937e7076bb07396b281685c1  Algorithm-C3-0.05.tar.gz
+4c05e0ebf31ffb2fa556016b97bd6bcb  Algorithm-C3-0.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:35:38 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:35:38 -0500
Subject: rpms/hfsplus-tools Makefile,1.1,1.2
Message-ID: <200611220435.kAM4Zcac002632@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/hfsplus-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571

Modified Files:
	Makefile 
Log Message:
include hfsbootdata image



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/hfsplus-tools/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	19 Aug 2006 00:34:23 -0000	1.1
+++ Makefile	22 Nov 2006 04:35:08 -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  Wed Nov 22 04:35:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:35:43 -0500
Subject: rpms/hfsplus-tools/FC-6 hfsplus-tools.spec,1.3,1.4
Message-ID: <200611220435.kAM4Zhbi002638@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/hfsplus-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571/FC-6

Modified Files:
	hfsplus-tools.spec 
Log Message:
include hfsbootdata image



Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/hfsplus-tools/FC-6/hfsplus-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hfsplus-tools.spec	1 Sep 2006 00:22:02 -0000	1.3
+++ hfsplus-tools.spec	22 Nov 2006 04:35:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
@@ -70,6 +70,11 @@
 cp newfs_hfs.tproj/newfs_hfs %{buildroot}/%{_sbindir}/mkfs.hfsplus
 cp fsck_hfs.tproj/fsck_hfs %{buildroot}/%{_sbindir}/fsck.hfsplus
 
+# and install the hfs boot blob...
+mkdir -p %{buildroot}%{_datadir}/misc
+cp newfs_hfs.tproj/hfsbootdata.img %{buildroot}%{_datadir}/misc/hfsbootdata
+chmod 0444 %{buildroot}%{_datadir}/misc/hfsbootdata
+
 # man pages -- a mildly non-invasive name change is in order
 mkdir -p %{buildroot}/%{_mandir}/man8
 cat fsck_hfs.tproj/fsck_hfs.8 | sed -e 's/[F|f]sck_hfs/fsck.hfsplus/g' \
@@ -97,6 +102,7 @@
 %{_sbindir}/mkfs.hfs
 %{_sbindir}/fsck.hfsplus
 %{_sbindir}/fsck.hfs
+%{_datadir}/misc/hfsbootdata
 %{_mandir}/man8/mkfs.hfsplus.8.gz
 %{_mandir}/man8/mkfs.hfs.8.gz
 %{_mandir}/man8/fsck.hfsplus.8.gz
@@ -104,6 +110,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  332.14-4
+- include hfsbootdata (BZ#213365)
+
 * Thu Aug 31 2006 Chris Weyl  332.14-3
 - bump for mass rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 22 04:35:38 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:35:38 -0500
Subject: rpms/hfsplus-tools/FC-5 hfsplus-tools.spec,1.2,1.3
Message-ID: <200611220435.kAM4ZcPk002635@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/hfsplus-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571/FC-5

Modified Files:
	hfsplus-tools.spec 
Log Message:
include hfsbootdata image



Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/hfsplus-tools/FC-5/hfsplus-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hfsplus-tools.spec	19 Aug 2006 00:36:58 -0000	1.2
+++ hfsplus-tools.spec	22 Nov 2006 04:35:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
@@ -70,6 +70,11 @@
 cp newfs_hfs.tproj/newfs_hfs %{buildroot}/%{_sbindir}/mkfs.hfsplus
 cp fsck_hfs.tproj/fsck_hfs %{buildroot}/%{_sbindir}/fsck.hfsplus
 
+# and install the hfs boot blob...
+mkdir -p %{buildroot}%{_datadir}/misc
+cp newfs_hfs.tproj/hfsbootdata.img %{buildroot}%{_datadir}/misc/hfsbootdata
+chmod 0444 %{buildroot}%{_datadir}/misc/hfsbootdata
+
 # man pages -- a mildly non-invasive name change is in order
 mkdir -p %{buildroot}/%{_mandir}/man8
 cat fsck_hfs.tproj/fsck_hfs.8 | sed -e 's/[F|f]sck_hfs/fsck.hfsplus/g' \
@@ -97,6 +102,7 @@
 %{_sbindir}/mkfs.hfs
 %{_sbindir}/fsck.hfsplus
 %{_sbindir}/fsck.hfs
+%{_datadir}/misc/hfsbootdata
 %{_mandir}/man8/mkfs.hfsplus.8.gz
 %{_mandir}/man8/mkfs.hfs.8.gz
 %{_mandir}/man8/fsck.hfsplus.8.gz
@@ -104,6 +110,12 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  332.14-4
+- include hfsbootdata (BZ#213365)
+
+* Thu Aug 31 2006 Chris Weyl  332.14-3
+- bump for mass rebuild
+
 * Fri Aug 18 2006 Chris Weyl  332.14-2
 - bump 
 



From fedora-extras-commits at redhat.com  Wed Nov 22 04:35:44 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:35:44 -0500
Subject: rpms/hfsplus-tools/devel hfsplus-tools.spec,1.3,1.4
Message-ID: <200611220435.kAM4Zik6002641@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/hfsplus-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571/devel

Modified Files:
	hfsplus-tools.spec 
Log Message:
include hfsbootdata image



Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/hfsplus-tools/devel/hfsplus-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hfsplus-tools.spec	1 Sep 2006 00:22:02 -0000	1.3
+++ hfsplus-tools.spec	22 Nov 2006 04:35:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
@@ -70,6 +70,11 @@
 cp newfs_hfs.tproj/newfs_hfs %{buildroot}/%{_sbindir}/mkfs.hfsplus
 cp fsck_hfs.tproj/fsck_hfs %{buildroot}/%{_sbindir}/fsck.hfsplus
 
+# and install the hfs boot blob...
+mkdir -p %{buildroot}%{_datadir}/misc
+cp newfs_hfs.tproj/hfsbootdata.img %{buildroot}%{_datadir}/misc/hfsbootdata
+chmod 0444 %{buildroot}%{_datadir}/misc/hfsbootdata
+
 # man pages -- a mildly non-invasive name change is in order
 mkdir -p %{buildroot}/%{_mandir}/man8
 cat fsck_hfs.tproj/fsck_hfs.8 | sed -e 's/[F|f]sck_hfs/fsck.hfsplus/g' \
@@ -97,6 +102,7 @@
 %{_sbindir}/mkfs.hfs
 %{_sbindir}/fsck.hfsplus
 %{_sbindir}/fsck.hfs
+%{_datadir}/misc/hfsbootdata
 %{_mandir}/man8/mkfs.hfsplus.8.gz
 %{_mandir}/man8/mkfs.hfs.8.gz
 %{_mandir}/man8/fsck.hfsplus.8.gz
@@ -104,6 +110,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  332.14-4
+- include hfsbootdata (BZ#213365)
+
 * Thu Aug 31 2006 Chris Weyl  332.14-3
 - bump for mass rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 22 04:51:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 23:51:26 -0500
Subject: rpms/linphone/devel linphone-1.5.1-osipcompat.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 linphone.spec, 1.24, 1.25 sources, 1.6, 1.7
Message-ID: <200611220451.kAM4pQPV002838@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2812

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.5.1-osipcompat.patch 
Log Message:
Update to 1.5.1

linphone-1.5.1-osipcompat.patch:

--- NEW FILE linphone-1.5.1-osipcompat.patch ---
Index: console/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/console/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- console/Makefile.am	18 Oct 2006 13:41:21 -0000	1.45
+++ console/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -6,7 +6,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/exosip \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: coreapi/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/coreapi/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- coreapi/Makefile.am	21 Jul 2006 14:35:35 -0000	1.38
+++ coreapi/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -10,7 +10,7 @@
 	-I$(top_srcdir)/exosip\
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include/ 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 lib_LTLIBRARIES=liblinphone.la
Index: exosip/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/exosip/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- exosip/Makefile.am	15 Feb 2005 16:12:13 -0000	1.3
+++ exosip/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libeXosip.la
 
 
-AM_CFLAGS = $(EXOSIP_CFLAGS)
+AM_CFLAGS = $(EXOSIP_CFLAGS) $(OSIP_CFLAGS)
 
 libeXosip_la_SOURCES =       eXosip.c  \
 jrequest.c jresponse.c    jcallback.c  jdialog.c   udp.c  \
Index: gnome/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/gnome/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- gnome/Makefile.am	25 Aug 2006 14:15:17 -0000	1.33
+++ gnome/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -20,7 +20,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/coreapi \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: m4/osip.m4
===================================================================
RCS file: /sources/linphone/linphone/m4/osip.m4,v
retrieving revision 1.2
diff -u -r1.2 osip.m4
--- m4/osip.m4	22 Feb 2005 17:31:03 -0000	1.2
+++ m4/osip.m4	22 Nov 2006 04:02:09 -0000
@@ -6,7 +6,7 @@
 AC_SUBST(osip_prefix)
 
 
-OSIP_CFLAGS="-I$osip_prefix/include"
+OSIP_CFLAGS="-I$osip_prefix/include/osip2-2.2.2"
 OSIP_LIBS="-L$osip_prefix/lib"
 
 dnl check osip2 headers
@@ -20,11 +20,11 @@
 LDFLAGS=$OSIP_LIBS
 dnl AC_CHECK_LIB adds osipparser2 to LIBS, I don't want that !
 LIBS_save=$LIBS
-AC_CHECK_LIB(osipparser2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
+AC_CHECK_LIB(osipparser2-2.2.2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
 LDFLAGS=$LDFLAGS_save
 LIBS=$LIBS_save
 
-OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
+OSIP_LIBS="$OSIP_LIBS -losipparser2-2.2.2 -losip2-2.2.2"
 
 AC_SUBST(OSIP_CFLAGS)
 AC_SUBST(OSIP_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Oct 2006 13:46:59 -0000	1.6
+++ .cvsignore	22 Nov 2006 04:50:55 -0000	1.7
@@ -1 +1 @@
-linphone-1.5.0.tar.gz
+linphone-1.5.1.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linphone.spec	26 Oct 2006 13:46:59 -0000	1.24
+++ linphone.spec	22 Nov 2006 04:50:55 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           linphone
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,10 +9,11 @@
 Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
 Patch1:         linphone-1.4.1-libs.patch
+Patch2:		linphone-1.5.1-osipcompat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libosip2-devel
-BuildRequires:  ortp-devel = 0.11.0
+BuildRequires:  compat-libosip2-devel
+BuildRequires:  ortp-devel = 0.12.0
 
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
@@ -59,12 +60,14 @@
 Libraries and headers required to develop software with linphone.
 
 %prep
-%setup -q
-%patch -p 1 -b .old
-%patch1 -p 1 -b .libs
+%setup0 -q
+%patch0 -p1 -b .old
+%patch1 -p1 -b .libs
+%patch2 -p0 -b .osip
 
 rm -r oRTP
 
+%build
 libtoolize --copy --force
 autoheader
 aclocal -I m4
@@ -80,7 +83,6 @@
 autoconf
 popd
 
-%build
 %configure --disable-static --disable-video
 make %{?_smp_mflags}
 
@@ -116,6 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
+%{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -133,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 1.5.1-1
+- Update to 1.5.1
+
 * Thu Oct 26 2006 Jeffrey C. Ollie  - 1.5.0-2
 - Don't forget to add new files and remove old ones!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Oct 2006 13:46:59 -0000	1.6
+++ sources	22 Nov 2006 04:50:55 -0000	1.7
@@ -1 +1 @@
-e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz
+196f817d77aba906e7c1a896f8501a0f  linphone-1.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:52:30 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 23:52:30 -0500
Subject: rpms/linphone/FC-6 linphone-1.5.1-osipcompat.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 linphone.spec, 1.23, 1.24 sources, 1.6, 1.7
Message-ID: <200611220452.kAM4qUWp002904@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2882

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.5.1-osipcompat.patch 
Log Message:
Update to 1.5.1

linphone-1.5.1-osipcompat.patch:

--- NEW FILE linphone-1.5.1-osipcompat.patch ---
Index: console/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/console/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- console/Makefile.am	18 Oct 2006 13:41:21 -0000	1.45
+++ console/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -6,7 +6,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/exosip \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: coreapi/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/coreapi/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- coreapi/Makefile.am	21 Jul 2006 14:35:35 -0000	1.38
+++ coreapi/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -10,7 +10,7 @@
 	-I$(top_srcdir)/exosip\
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include/ 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 lib_LTLIBRARIES=liblinphone.la
Index: exosip/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/exosip/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- exosip/Makefile.am	15 Feb 2005 16:12:13 -0000	1.3
+++ exosip/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libeXosip.la
 
 
-AM_CFLAGS = $(EXOSIP_CFLAGS)
+AM_CFLAGS = $(EXOSIP_CFLAGS) $(OSIP_CFLAGS)
 
 libeXosip_la_SOURCES =       eXosip.c  \
 jrequest.c jresponse.c    jcallback.c  jdialog.c   udp.c  \
Index: gnome/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/gnome/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- gnome/Makefile.am	25 Aug 2006 14:15:17 -0000	1.33
+++ gnome/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -20,7 +20,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/coreapi \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: m4/osip.m4
===================================================================
RCS file: /sources/linphone/linphone/m4/osip.m4,v
retrieving revision 1.2
diff -u -r1.2 osip.m4
--- m4/osip.m4	22 Feb 2005 17:31:03 -0000	1.2
+++ m4/osip.m4	22 Nov 2006 04:02:09 -0000
@@ -6,7 +6,7 @@
 AC_SUBST(osip_prefix)
 
 
-OSIP_CFLAGS="-I$osip_prefix/include"
+OSIP_CFLAGS="-I$osip_prefix/include/osip2-2.2.2"
 OSIP_LIBS="-L$osip_prefix/lib"
 
 dnl check osip2 headers
@@ -20,11 +20,11 @@
 LDFLAGS=$OSIP_LIBS
 dnl AC_CHECK_LIB adds osipparser2 to LIBS, I don't want that !
 LIBS_save=$LIBS
-AC_CHECK_LIB(osipparser2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
+AC_CHECK_LIB(osipparser2-2.2.2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
 LDFLAGS=$LDFLAGS_save
 LIBS=$LIBS_save
 
-OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
+OSIP_LIBS="$OSIP_LIBS -losipparser2-2.2.2 -losip2-2.2.2"
 
 AC_SUBST(OSIP_CFLAGS)
 AC_SUBST(OSIP_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Nov 2006 17:52:58 -0000	1.6
+++ .cvsignore	22 Nov 2006 04:52:00 -0000	1.7
@@ -1 +1 @@
-linphone-1.5.0.tar.gz
+linphone-1.5.1.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/linphone.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linphone.spec	9 Nov 2006 17:52:58 -0000	1.23
+++ linphone.spec	22 Nov 2006 04:52:00 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           linphone
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,10 +9,11 @@
 Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
 Patch1:         linphone-1.4.1-libs.patch
+Patch2:		linphone-1.5.1-osipcompat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libosip2-devel
-BuildRequires:  ortp-devel = 0.11.0
+BuildRequires:  compat-libosip2-devel
+BuildRequires:  ortp-devel = 0.12.0
 
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
@@ -59,12 +60,14 @@
 Libraries and headers required to develop software with linphone.
 
 %prep
-%setup -q
-%patch -p 1 -b .old
-%patch1 -p 1 -b .libs
+%setup0 -q
+%patch0 -p1 -b .old
+%patch1 -p1 -b .libs
+%patch2 -p0 -b .osip
 
 rm -r oRTP
 
+%build
 libtoolize --copy --force
 autoheader
 aclocal -I m4
@@ -80,7 +83,6 @@
 autoconf
 popd
 
-%build
 %configure --disable-static --disable-video
 make %{?_smp_mflags}
 
@@ -116,6 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
+%{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -133,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 1.5.1-1
+- Update to 1.5.1
+
 * Thu Oct 26 2006 Jeffrey C. Ollie  - 1.5.0-2
 - Don't forget to add new files and remove old ones!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Nov 2006 17:52:58 -0000	1.6
+++ sources	22 Nov 2006 04:52:00 -0000	1.7
@@ -1 +1 @@
-e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz
+196f817d77aba906e7c1a896f8501a0f  linphone-1.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:53:11 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Tue, 21 Nov 2006 23:53:11 -0500
Subject: rpms/plone/FC-6 plone.spec,1.20,1.21
Message-ID: <200611220453.kAM4rB0G002972@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2835/plone/FC-6

Modified Files:
	plone.spec 
Log Message:
Updated so plone provides the product 'Five' rather then Zope. Zope needed
to provide Five in Plone 2.5. In Plone 2.5.1, Plone now provides Five. Fun.



Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plone.spec	4 Nov 2006 09:14:19 -0000	1.20
+++ plone.spec	22 Nov 2006 04:52:41 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
@@ -45,8 +45,8 @@
 cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
 #rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
 
-# Included in Zope 2.9
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+# Commented out because Plone, again, provides Five for version 2.5.1
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
 
 # Avoid conflicts, put those in %%doc
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Jonathan Steffan  2.5.1-4
+- Updated so plone now provides the correct version of the Five product
+
 * Sat Nov 04 2006 Aurelien Bompard  2.5.1-3
 - add Plone Hotfix 20061031 (bug 213983)
 



From fedora-extras-commits at redhat.com  Wed Nov 22 04:53:12 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Tue, 21 Nov 2006 23:53:12 -0500
Subject: rpms/zope/FC-6 zope.spec,1.25,1.26
Message-ID: <200611220453.kAM4rCqX002975@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2835/zope/FC-6

Modified Files:
	zope.spec 
Log Message:
Updated so plone provides the product 'Five' rather then Zope. Zope needed
to provide Five in Plone 2.5. In Plone 2.5.1, Plone now provides Five. Fun.



Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- zope.spec	30 Aug 2006 11:58:35 -0000	1.25
+++ zope.spec	22 Nov 2006 04:52:42 -0000	1.26
@@ -13,7 +13,7 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
@@ -120,6 +120,9 @@
 # included in %%doc
 rm -rf $RPM_BUILD_ROOT%{zope_home}/doc
 
+#now included with plone 2.5.1 version 1.3.7
+rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+
 # write version.txt
 echo "Zope %{version}-%{release}" > \
     "$RPM_BUILD_ROOT%{software_home}/version.txt"
@@ -187,6 +190,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Jonathan Steffan  2.9.4-3
+- Removed Five from zope package (plone 2.5.1 now provides the needed
+  version.)
+
 * Wed Aug 30 2006 Aurelien Bompard  2.9.4-2
 - fix path on x86_64
 



From fedora-extras-commits at redhat.com  Wed Nov 22 05:48:27 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Wed, 22 Nov 2006 00:48:27 -0500
Subject: owners owners.list,1.1988,1.1989
Message-ID: <200611220548.kAM5mRGa003254@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3229/owners

Modified Files:
	owners.list 
Log Message:
Added myself as owner of plone and zope.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1988
retrieving revision 1.1989
diff -u -r1.1988 -r1.1989
--- owners.list	22 Nov 2006 02:11:12 -0000	1.1988
+++ owners.list	22 Nov 2006 05:47:57 -0000	1.1989
@@ -1872,7 +1872,7 @@
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|plib|Set of portable libraries especially useful for games|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|matthias at rpmforge.net
 Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
-Fedora Extras|plone|User friendly and powerful open source Content Management System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|plone|User friendly and powerful open source Content Management System|extras-qa at fedoraproject.org|jonathansteffan at gmail.com
 Fedora Extras|plotmm|GTKmm plot widget for scientific applications|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|plotutils|GNU vector and raster graphics utilities and libraries|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -2557,7 +2557,7 @@
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|Zim|Desktop wiki & notekeeper|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
-Fedora Extras|zope|Application server in Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|zope|Application server in Python|extras-qa at fedoraproject.org|jonathansteffan at gmail.com
 Fedora Extras|zvbi|Raw VBI, Teletext and Closed Caption decoding library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|zynaddsubfx|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 07:27:34 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 22 Nov 2006 02:27:34 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.36,1.37
Message-ID: <200611220727.kAM7RYpE003973@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3958

Modified Files:
	deskbar-applet.spec 
Log Message:
Run gtk-update-icon-cache in post and postun scripts (Bug #216827)


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- deskbar-applet.spec	12 Nov 2006 09:10:18 -0000	1.36
+++ deskbar-applet.spec	22 Nov 2006 07:27:04 -0000	1.37
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.17.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -71,6 +71,9 @@
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 killall -HUP gconfd-2 || :
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -79,6 +82,10 @@
     killall -HUP gconfd-2 || :
 fi
 
+%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 README
@@ -91,6 +98,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Nov 22 2006 Luke Macken  - 2.17.2-2
+- Run gtk-update-icon-cache in post and postun scripts (Bug #216827)
+
 * Sun Nov 12 2006 Luke Macken  - 2.17.2-1
 - 2.17.2
 



From fedora-extras-commits at redhat.com  Wed Nov 22 08:03:31 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 22 Nov 2006 03:03:31 -0500
Subject: rpms/gparted/devel gparted.spec,1.15,1.16
Message-ID: <200611220803.kAM83VqS004346@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4326

Modified Files:
	gparted.spec 
Log Message:
* Wed Nov 23 2006 Deji Akingunola  - 0.3.1-3
- Backport a fix from cvs to properly check for libparted version



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gparted.spec	21 Nov 2006 07:40:08 -0000	1.15
+++ gparted.spec	22 Nov 2006 08:03:01 -0000	1.16
@@ -1,11 +1,12 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Patch0: gparted-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) 
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .config
 
 %build
 %configure
@@ -77,6 +79,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Wed Nov 23 2006 Deji Akingunola  - 0.3.1-3
+- Backport a fix from cvs to properly check for libparted version
+
 * Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
 - Rebuild for new parted
 



From fedora-extras-commits at redhat.com  Wed Nov 22 08:04:48 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 22 Nov 2006 03:04:48 -0500
Subject: rpms/gparted/devel gparted-configure.patch,NONE,1.1
Message-ID: <200611220804.kAM84meI004364@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4357

Added Files:
	gparted-configure.patch 
Log Message:
* Wed Nov 23 2006 Deji Akingunola  - 0.3.1-3
- Backport a fix from cvs to properly check for libparted version


gparted-configure.patch:

--- NEW FILE gparted-configure.patch ---
--- configure.keep	2006-09-11 05:39:49.000000000 -0400
+++ configure	2006-11-22 02:46:15.000000000 -0500
@@ -22160,9 +22160,11 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for libparted >= 1.7.1" >&5
-echo $ECHO_N "checking for libparted >= 1.7.1... $ECHO_C" >&6; }
-LDFLAGS=-lparted
+LIBPARTED_VERSION=1.7.1
+{ echo "$as_me:$LINENO: checking for libparted >= $LIBPARTED_VERSION" >&5
+echo $ECHO_N "checking for libparted >= $LIBPARTED_VERSION... $ECHO_C" >&6; }
+LIBS_save="$LIBS"
+LIBS="-lparted"
 if test "$cross_compiling" = yes; then
   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
@@ -22181,14 +22183,26 @@
 
 int main ()
 {
+	int min_major ;
+	int min_minor ;
+	int min_micro ;
 	int major ;
 	int minor ;
 	int micro ;
 
-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
-		printf( "Found libparted %s\t", ped_get_version() ) ;
+	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
+	{
+		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+		{
+			printf( "Found libparted %s\t", ped_get_version() ) ;
+
+			return ! ((major > min_major) ||
+           			 ((major == min_major) && (minor > min_minor)) ||
+           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
+		}
+	}
 
-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
+	return 1 ;
 }
 
 _ACEOF



From fedora-extras-commits at redhat.com  Wed Nov 22 09:14:29 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed, 22 Nov 2006 04:14:29 -0500
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.12,1.13
Message-ID: <200611220914.kAM9ET3C005321@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5290

Modified Files:
	sysprof-kmod.spec 
Log Message:
Really fix EVR problem for upgrading from FC6



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sysprof-kmod.spec	21 Nov 2006 13:07:39 -0000	1.12
+++ sysprof-kmod.spec	22 Nov 2006 09:13:59 -0000	1.13
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.7
-Release:        1.1.%(echo %{kverrel} | tr - _)
+Release:        1.%(echo %{kverrel} | tr - _).1
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel



From fedora-extras-commits at redhat.com  Wed Nov 22 12:34:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 22 Nov 2006 07:34:00 -0500
Subject: rpms/xchm/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xchm.desktop,
	1.3, 1.4 xchm.spec, 1.7, 1.8
Message-ID: <200611221234.kAMCY0ff015297@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/xchm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15276

Modified Files:
	.cvsignore sources xchm.desktop xchm.spec 
Log Message:
* Wed Nov 22 2006 Patrice Dumas  1.10-1
- update to 1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jul 2006 11:18:43 -0000	1.2
+++ .cvsignore	22 Nov 2006 12:33:29 -0000	1.3
@@ -1 +1 @@
-xchm-1.9.tar.gz
+xchm-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jul 2006 11:18:43 -0000	1.2
+++ sources	22 Nov 2006 12:33:29 -0000	1.3
@@ -1 +1 @@
-12e1faf49447c743c5c936636cd8a172  xchm-1.9.tar.gz
+df4d42e3bb11187139f4475b89c4ab96  xchm-1.10.tar.gz


Index: xchm.desktop
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xchm.desktop	24 Sep 2006 09:51:42 -0000	1.3
+++ xchm.desktop	22 Nov 2006 12:33:29 -0000	1.4
@@ -11,4 +11,4 @@
 Terminal=false
 Type=Application
 MimeType=application/x-chm;
-Categories=Application;Utility;
+Categories=Utility;


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchm.spec	4 Oct 2006 22:17:22 -0000	1.7
+++ xchm.spec	22 Nov 2006 12:33:29 -0000	1.8
@@ -1,10 +1,11 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
-Version:        1.9
-Release:        6%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Publishing
-Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://heanet.dl.sourceforge.net/sourceforge/xchm/xchm-%{version}.tar.gz
 Source1:        %{name}.desktop
 URL:            http://xchm.sourceforge.net/
 BuildRequires:  chmlib-devel
@@ -34,7 +35,6 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications/
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE1}
 for resolution in 16 32 48 128; do
   dir=${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${resolution}x${resolution}/
@@ -67,6 +67,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Nov 22 2006 Patrice Dumas  1.10-1
+- update to 1.10
+
 * Thu Oct 05 2006 Christian Iseli  1.9-6
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Wed Nov 22 12:50:53 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 22 Nov 2006 07:50:53 -0500
Subject: rpms/xchm/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xchm.spec, 1.5,
	1.6
Message-ID: <200611221250.kAMCorgk015405@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/xchm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15371/FC-5

Modified Files:
	.cvsignore sources xchm.spec 
Log Message:
* Wed Nov 22 2006 Patrice Dumas  1.10-1
- update to 1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jul 2006 11:18:43 -0000	1.2
+++ .cvsignore	22 Nov 2006 12:50:23 -0000	1.3
@@ -1 +1 @@
-xchm-1.9.tar.gz
+xchm-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jul 2006 11:18:43 -0000	1.2
+++ sources	22 Nov 2006 12:50:23 -0000	1.3
@@ -1 +1 @@
-12e1faf49447c743c5c936636cd8a172  xchm-1.9.tar.gz
+df4d42e3bb11187139f4475b89c4ab96  xchm-1.10.tar.gz


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-5/xchm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchm.spec	25 Sep 2006 20:35:32 -0000	1.5
+++ xchm.spec	22 Nov 2006 12:50:23 -0000	1.6
@@ -1,10 +1,11 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
-Version:        1.9
-Release:        5%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Publishing
-Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://heanet.dl.sourceforge.net/sourceforge/xchm/xchm-%{version}.tar.gz
 Source1:        %{name}.desktop
 URL:            http://xchm.sourceforge.net/
 BuildRequires:  chmlib-devel
@@ -34,7 +35,6 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications/
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE1}
 for resolution in 16 32 48 128; do
   dir=${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${resolution}x${resolution}/
@@ -67,6 +67,12 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Nov 22 2006 Patrice Dumas  1.10-1
+- update to 1.10
+
+* Thu Oct 05 2006 Christian Iseli  1.9-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 Patrice Dumas  1.9-5
 - install the icon for the chm file type
 
@@ -77,6 +83,9 @@
 - install icons in %%{_datadir}/icons/ instead of %%{_datadir}/pixmaps/
   fix #207759
 
+* Tue Sep 12 2006 Patrice Dumas  1.9-2
+- rebuild for FC6
+
 * Fri Jun  2 2006 Patrice Dumas  1.9-1
 - update to 1.9
 



From fedora-extras-commits at redhat.com  Wed Nov 22 12:50:53 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 22 Nov 2006 07:50:53 -0500
Subject: rpms/xchm/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xchm.spec, 1.7,
	1.8
Message-ID: <200611221250.kAMCorRd015410@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/xchm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15371/FC-6

Modified Files:
	.cvsignore sources xchm.spec 
Log Message:
* Wed Nov 22 2006 Patrice Dumas  1.10-1
- update to 1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jul 2006 11:18:43 -0000	1.2
+++ .cvsignore	22 Nov 2006 12:50:23 -0000	1.3
@@ -1 +1 @@
-xchm-1.9.tar.gz
+xchm-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jul 2006 11:18:43 -0000	1.2
+++ sources	22 Nov 2006 12:50:23 -0000	1.3
@@ -1 +1 @@
-12e1faf49447c743c5c936636cd8a172  xchm-1.9.tar.gz
+df4d42e3bb11187139f4475b89c4ab96  xchm-1.10.tar.gz


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-6/xchm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchm.spec	4 Oct 2006 22:17:22 -0000	1.7
+++ xchm.spec	22 Nov 2006 12:50:23 -0000	1.8
@@ -1,10 +1,11 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
-Version:        1.9
-Release:        6%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Publishing
-Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://heanet.dl.sourceforge.net/sourceforge/xchm/xchm-%{version}.tar.gz
 Source1:        %{name}.desktop
 URL:            http://xchm.sourceforge.net/
 BuildRequires:  chmlib-devel
@@ -34,7 +35,6 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications/
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE1}
 for resolution in 16 32 48 128; do
   dir=${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${resolution}x${resolution}/
@@ -67,6 +67,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Nov 22 2006 Patrice Dumas  1.10-1
+- update to 1.10
+
 * Thu Oct 05 2006 Christian Iseli  1.9-6
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Wed Nov 22 13:46:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 08:46:52 -0500
Subject: rpms/eric/devel eric.spec,1.7,1.8
Message-ID: <200611221346.kAMDkqad015762@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15747

Modified Files:
	eric.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter  3.9.2-1
- 3.9.2 
- Provides: eric3 (get ready for PyQt4-based eric4)



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eric.spec	14 Nov 2006 03:21:53 -0000	1.7
+++ eric.spec	22 Nov 2006 13:46:22 -0000	1.8
@@ -23,6 +23,8 @@
 Patch2: gen_python_api-env.patch
 Patch3: gen_sip_api-PyQt4.patch
 
+Provides: eric3 = %{version}-%{release}
+
 BuildRequires: desktop-file-utils
 BuildRequires: PyQt-qscintilla-devel
 # PyQt api's
@@ -38,8 +40,7 @@
 %endif
 
 %description
-eric3 is a full featured Python IDE that is written in PyQt using
-the QScintilla editor widget. 
+eric3 is a full featured Python IDE.
 
 
 %prep
@@ -139,14 +140,15 @@
 
 
 %changelog
-* Mon Nov 13 2006 Rex Dieter  5.9.2-1
-- 5.9.2
+* Wed Nov 22 2006 Rex Dieter  3.9.2-1
+- 3.9.2 
+- Provides: eric3 (get ready for PyQt4-based eric4)
 
-* Mon Nov 06 2006 Rex Dieter  5.9.1-4
+* Mon Nov 06 2006 Rex Dieter  3.9.1-4
 - BR: PyQt-qscintilla-devel
 - (unversioned) Requires: PyQt-qscintilla
 
-* Thu Sep 07 2006 Rex Dieter  5.9.1-3
+* Thu Sep 07 2006 Rex Dieter  3.9.1-3
 - include .py[c,o] files again (with no %%ghost'ing)
 
 * Thu Jul 27 2006 Rex Dieter  3.9.1-2



From fedora-extras-commits at redhat.com  Wed Nov 22 13:49:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 08:49:19 -0500
Subject: rpms/eric/devel eric.spec,1.8,1.9
Message-ID: <200611221349.kAMDnJGu015849@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15834

Modified Files:
	eric.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter  3.9.2-2
- Provides: eric3 (get ready for PyQt4-based eric4)
- fix biffed %version's in %changelog
- simplify %description



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eric.spec	22 Nov 2006 13:46:22 -0000	1.8
+++ eric.spec	22 Nov 2006 13:48:49 -0000	1.9
@@ -5,7 +5,7 @@
 Name:	 eric
 Summary: Python IDE
 Version: 3.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:	 Development/Tools
@@ -140,9 +140,13 @@
 
 
 %changelog
-* Wed Nov 22 2006 Rex Dieter  3.9.2-1
-- 3.9.2 
+* Wed Nov 22 2006 Rex Dieter  3.9.2-2
 - Provides: eric3 (get ready for PyQt4-based eric4)
+- fix biffed %%version's in %%changelog
+- simplify %%description
+
+* Mon Nov 13 2006 Rex Dieter  3.9.2-1
+- 3.9.2 
 
 * Mon Nov 06 2006 Rex Dieter  3.9.1-4
 - BR: PyQt-qscintilla-devel



From fedora-extras-commits at redhat.com  Wed Nov 22 14:01:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:01:47 -0500
Subject: rpms/perl-Email-Address/FC-5 .cvsignore, 1.7,
	1.8 perl-Email-Address.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200611221401.kAME1lno016073@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16015/FC-5

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.882.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 17:55:48 -0000	1.7
+++ .cvsignore	22 Nov 2006 14:01:17 -0000	1.8
@@ -1 +1 @@
-Email-Address-1.880.tar.gz
+Email-Address-1.882.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/perl-Email-Address.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Address.spec	11 Nov 2006 17:55:48 -0000	1.6
+++ perl-Email-Address.spec	22 Nov 2006 14:01:17 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.880
+Version:        1.882
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -49,12 +49,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README bench/
+%doc Changes LICENSE README bench/
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
+- Update to 1.882.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
 - Update to 1.880.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 17:55:48 -0000	1.7
+++ sources	22 Nov 2006 14:01:17 -0000	1.8
@@ -1 +1 @@
-8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz
+1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:01:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:01:52 -0500
Subject: rpms/perl-Email-Address/devel .cvsignore, 1.7,
	1.8 perl-Email-Address.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200611221401.kAME1qRo016083@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16015/devel

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.882.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 17:55:49 -0000	1.7
+++ .cvsignore	22 Nov 2006 14:01:22 -0000	1.8
@@ -1 +1 @@
-Email-Address-1.880.tar.gz
+Email-Address-1.882.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Address.spec	11 Nov 2006 17:55:49 -0000	1.6
+++ perl-Email-Address.spec	22 Nov 2006 14:01:22 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.880
+Version:        1.882
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -49,12 +49,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README bench/
+%doc Changes LICENSE README bench/
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
+- Update to 1.882.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
 - Update to 1.880.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 17:55:49 -0000	1.7
+++ sources	22 Nov 2006 14:01:22 -0000	1.8
@@ -1 +1 @@
-8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz
+1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:01:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:01:47 -0500
Subject: rpms/perl-Email-Address/FC-6 .cvsignore, 1.7,
	1.8 perl-Email-Address.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200611221401.kAME1lSX016078@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16015/FC-6

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.882.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 17:55:49 -0000	1.7
+++ .cvsignore	22 Nov 2006 14:01:17 -0000	1.8
@@ -1 +1 @@
-Email-Address-1.880.tar.gz
+Email-Address-1.882.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/perl-Email-Address.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Address.spec	11 Nov 2006 17:55:49 -0000	1.6
+++ perl-Email-Address.spec	22 Nov 2006 14:01:17 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.880
+Version:        1.882
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -49,12 +49,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README bench/
+%doc Changes LICENSE README bench/
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
+- Update to 1.882.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
 - Update to 1.880.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 17:55:49 -0000	1.7
+++ sources	22 Nov 2006 14:01:17 -0000	1.8
@@ -1 +1 @@
-8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz
+1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:06:00 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 09:06:00 -0500
Subject: rpms/libosip2/devel libosip2.spec,1.10,1.11
Message-ID: <200611221406.kAME60eZ016251@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16230

Modified Files:
	libosip2.spec 
Log Message:
Bump release and rebuild.


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/libosip2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libosip2.spec	14 Nov 2006 21:03:51 -0000	1.10
+++ libosip2.spec	22 Nov 2006 14:05:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 3.0.1-2
+- Bump release and rebuild
+
 * Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
 - Update to 3.0.1 and remove unnecessary patch.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 14:07:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:07:24 -0500
Subject: rpms/perl-PadWalker/FC-5 .cvsignore, 1.2, 1.3 perl-PadWalker.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611221407.kAME7Oic016356@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PadWalker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16306/FC-5

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
Update to 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 May 2006 21:17:41 -0000	1.2
+++ .cvsignore	22 Nov 2006 14:06:54 -0000	1.3
@@ -1 +1 @@
-PadWalker-1.0.tar.gz
+PadWalker-1.2.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-5/perl-PadWalker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PadWalker.spec	20 May 2006 21:17:41 -0000	1.1
+++ perl-PadWalker.spec	22 Nov 2006 14:06:54 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-PadWalker
-Version:        1.0
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Play with other peoples' lexical variables
 
@@ -52,5 +52,14 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.2-1
+- Update to 1.2.
+
+* Mon Oct 23 2006 Jose Pedro Oliveira  - 1.1-1
+- Update to 1.1.
+
+* Sun Sep 10 2006 Jose Pedro Oliveira  - 1.0-2
+- Rebuild for FC6.
+
 * Fri May 19 2006 Jose Pedro Oliveira  - 1.0-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2006 21:17:41 -0000	1.2
+++ sources	22 Nov 2006 14:06:54 -0000	1.3
@@ -1 +1 @@
-05d684ce2f17ef4f058ec2e912b5f95c  PadWalker-1.0.tar.gz
+a33cce19a5be0c83297e7b2ba1878e08  PadWalker-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:07:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:07:25 -0500
Subject: rpms/perl-PadWalker/devel .cvsignore, 1.3, 1.4 perl-PadWalker.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611221407.kAME7PxJ016364@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PadWalker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16306/devel

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
Update to 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Oct 2006 12:27:48 -0000	1.3
+++ .cvsignore	22 Nov 2006 14:06:54 -0000	1.4
@@ -1 +1 @@
-PadWalker-1.1.tar.gz
+PadWalker-1.2.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/perl-PadWalker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-PadWalker.spec	23 Oct 2006 12:27:48 -0000	1.3
+++ perl-PadWalker.spec	22 Nov 2006 14:06:54 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-PadWalker
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Play with other peoples' lexical variables
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.2-1
+- Update to 1.2.
+
 * Mon Oct 23 2006 Jose Pedro Oliveira  - 1.1-1
 - Update to 1.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Oct 2006 12:27:48 -0000	1.3
+++ sources	22 Nov 2006 14:06:54 -0000	1.4
@@ -1 +1 @@
-193821660d7da7a5944776e21fceda7e  PadWalker-1.1.tar.gz
+a33cce19a5be0c83297e7b2ba1878e08  PadWalker-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:07:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:07:24 -0500
Subject: rpms/perl-PadWalker/FC-6 .cvsignore, 1.3, 1.4 perl-PadWalker.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611221407.kAME7Oke016361@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PadWalker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16306/FC-6

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
Update to 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Oct 2006 12:27:48 -0000	1.3
+++ .cvsignore	22 Nov 2006 14:06:54 -0000	1.4
@@ -1 +1 @@
-PadWalker-1.1.tar.gz
+PadWalker-1.2.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-6/perl-PadWalker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-PadWalker.spec	23 Oct 2006 12:27:48 -0000	1.3
+++ perl-PadWalker.spec	22 Nov 2006 14:06:54 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-PadWalker
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Play with other peoples' lexical variables
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.2-1
+- Update to 1.2.
+
 * Mon Oct 23 2006 Jose Pedro Oliveira  - 1.1-1
 - Update to 1.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Oct 2006 12:27:48 -0000	1.3
+++ sources	22 Nov 2006 14:06:54 -0000	1.4
@@ -1 +1 @@
-193821660d7da7a5944776e21fceda7e  PadWalker-1.1.tar.gz
+a33cce19a5be0c83297e7b2ba1878e08  PadWalker-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:08:50 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 09:08:50 -0500
Subject: rpms/libosip2/FC-6 libosip2.spec,1.10,1.11
Message-ID: <200611221408.kAME8oQw016507@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16451

Modified Files:
	libosip2.spec 
Log Message:
Bump release and rebuild.


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-6/libosip2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libosip2.spec	14 Nov 2006 20:51:50 -0000	1.10
+++ libosip2.spec	22 Nov 2006 14:08:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 3.0.1-2
+- Bump release and rebuild
+
 * Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
 - Update to 3.0.1 and remove unnecessary patch.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 14:09:52 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 09:09:52 -0500
Subject: rpms/libosip2/FC-5 libosip2.spec,1.9,1.10
Message-ID: <200611221409.kAME9qNJ016578@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16553

Modified Files:
	libosip2.spec 
Log Message:
Bump release and rebuild.


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-5/libosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libosip2.spec	15 Nov 2006 17:30:51 -0000	1.9
+++ libosip2.spec	22 Nov 2006 14:09:22 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 3.0.1-2
+- Bump release and rebuild
+
 * Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
 - Update to 3.0.1 and remove unnecessary patch.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 14:17:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:17:02 -0500
Subject: rpms/perl-ExtUtils-ParseXS/FC-5 .cvsignore, 1.9,
	1.10 perl-ExtUtils-ParseXS.spec, 1.14, 1.15 sources, 1.9, 1.10
Message-ID: <200611221417.kAMEH21v016776@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16727/FC-5

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Sep 2006 17:02:33 -0000	1.9
+++ .cvsignore	22 Nov 2006 14:16:32 -0000	1.10
@@ -1 +1 @@
-ExtUtils-ParseXS-2.16.tar.gz
+ExtUtils-ParseXS-2.17.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-5/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-ExtUtils-ParseXS.spec	16 Sep 2006 17:02:33 -0000	1.14
+++ perl-ExtUtils-ParseXS.spec	22 Nov 2006 14:16:32 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-ExtUtils-ParseXS
-Version:        2.16
+Version:        2.17
 Release:        1%{?dist}
 Summary:        Module and a script for converting Perl XS code into C code
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 2.17-1
+- Update to 2.17.
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 2.16-1
 - Update to 2.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Sep 2006 17:02:33 -0000	1.9
+++ sources	22 Nov 2006 14:16:32 -0000	1.10
@@ -1 +1 @@
-c64fddf17ee2b27d8a90ceb455c3e570  ExtUtils-ParseXS-2.16.tar.gz
+36553d14f8cc424ed124130f8d8823f3  ExtUtils-ParseXS-2.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:17:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:17:03 -0500
Subject: rpms/perl-ExtUtils-ParseXS/devel .cvsignore, 1.9,
	1.10 perl-ExtUtils-ParseXS.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200611221417.kAMEH32E016786@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16727/devel

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Sep 2006 17:02:34 -0000	1.9
+++ .cvsignore	22 Nov 2006 14:16:33 -0000	1.10
@@ -1 +1 @@
-ExtUtils-ParseXS-2.16.tar.gz
+ExtUtils-ParseXS-2.17.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-ExtUtils-ParseXS.spec	16 Sep 2006 17:02:34 -0000	1.15
+++ perl-ExtUtils-ParseXS.spec	22 Nov 2006 14:16:33 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-ExtUtils-ParseXS
-Version:        2.16
+Version:        2.17
 Release:        1%{?dist}
 Summary:        Module and a script for converting Perl XS code into C code
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 2.17-1
+- Update to 2.17.
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 2.16-1
 - Update to 2.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Sep 2006 17:02:34 -0000	1.9
+++ sources	22 Nov 2006 14:16:33 -0000	1.10
@@ -1 +1 @@
-c64fddf17ee2b27d8a90ceb455c3e570  ExtUtils-ParseXS-2.16.tar.gz
+36553d14f8cc424ed124130f8d8823f3  ExtUtils-ParseXS-2.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:17:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:17:03 -0500
Subject: rpms/perl-ExtUtils-ParseXS/FC-6 .cvsignore, 1.9,
	1.10 perl-ExtUtils-ParseXS.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200611221417.kAMEH3Sm016781@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16727/FC-6

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Sep 2006 17:02:34 -0000	1.9
+++ .cvsignore	22 Nov 2006 14:16:33 -0000	1.10
@@ -1 +1 @@
-ExtUtils-ParseXS-2.16.tar.gz
+ExtUtils-ParseXS-2.17.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-6/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-ExtUtils-ParseXS.spec	16 Sep 2006 17:02:34 -0000	1.15
+++ perl-ExtUtils-ParseXS.spec	22 Nov 2006 14:16:33 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-ExtUtils-ParseXS
-Version:        2.16
+Version:        2.17
 Release:        1%{?dist}
 Summary:        Module and a script for converting Perl XS code into C code
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 2.17-1
+- Update to 2.17.
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 2.16-1
 - Update to 2.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Sep 2006 17:02:34 -0000	1.9
+++ sources	22 Nov 2006 14:16:33 -0000	1.10
@@ -1 +1 @@
-c64fddf17ee2b27d8a90ceb455c3e570  ExtUtils-ParseXS-2.16.tar.gz
+36553d14f8cc424ed124130f8d8823f3  ExtUtils-ParseXS-2.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:19:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:19:46 -0500
Subject: rpms/perl-Wx/devel .cvsignore, 1.5, 1.6 perl-Wx.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611221419.kAMEJkGd016946@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16925

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.63.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Nov 2006 10:56:57 -0000	1.5
+++ .cvsignore	22 Nov 2006 14:19:16 -0000	1.6
@@ -1 +1 @@
-Wx-0.62.tar.gz
+Wx-0.63.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Wx.spec	14 Nov 2006 10:56:57 -0000	1.4
+++ perl-Wx.spec	22 Nov 2006 14:19:16 -0000	1.5
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.62
+Version:        0.63
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.63-1
+- Update to 0.63.
+
 * Tue Nov 14 2006 Jose Pedro Oliveira  - 0.62-1
 - Update to 0.62.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Nov 2006 10:56:57 -0000	1.5
+++ sources	22 Nov 2006 14:19:16 -0000	1.6
@@ -1 +1 @@
-1e1edb47fd78931852268a04f096d47b  Wx-0.62.tar.gz
+214bf025166a603506b160823d5e9013  Wx-0.63.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:35:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:35:24 -0500
Subject: rpms/perl-Glib/devel .cvsignore, 1.12, 1.13 perl-Glib.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <200611221435.kAMEZO1g017121@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17097

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.141.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Sep 2006 14:06:38 -0000	1.12
+++ .cvsignore	22 Nov 2006 14:34:54 -0000	1.13
@@ -1 +1 @@
-Glib-1.140.tar.gz
+Glib-1.141.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Glib.spec	6 Sep 2006 14:06:38 -0000	1.17
+++ perl-Glib.spec	22 Nov 2006 14:34:54 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           perl-Glib
-Version:        1.140
+Version:        1.141
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
@@ -62,10 +62,13 @@
 %doc AUTHORS ChangeLog LICENSE NEWS README TODO
 %{perl_vendorarch}/auto/Glib/
 %{perl_vendorarch}/Glib*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.141-1
+- Update to 1.141.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira  - 1.140-1
 - Update to 1.140.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Sep 2006 14:06:38 -0000	1.12
+++ sources	22 Nov 2006 14:34:54 -0000	1.13
@@ -1 +1 @@
-36a4ba906ae9542b10568501f1f99602  Glib-1.140.tar.gz
+ab90e68a745e771a8b6af8fadcce4c38  Glib-1.141.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:40:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:40:44 -0500
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.15, 1.16 perl-Gtk2.spec, 1.20,
	1.21 sources, 1.15, 1.16
Message-ID: <200611221440.kAMEeiXx017269@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17248

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.141.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Sep 2006 14:21:22 -0000	1.15
+++ .cvsignore	22 Nov 2006 14:40:14 -0000	1.16
@@ -1 +1 @@
-Gtk2-1.140.tar.gz
+Gtk2-1.141.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-Gtk2.spec	6 Sep 2006 14:21:22 -0000	1.20
+++ perl-Gtk2.spec	22 Nov 2006 14:40:14 -0000	1.21
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Gtk2
-Version:        1.140
+Version:        1.141
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -82,10 +82,13 @@
 %doc examples/ gtk-demo/
 %{perl_vendorarch}/auto/Gtk2/
 %{perl_vendorarch}/Gtk2*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.141-1
+- Update to 1.141.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira  - 1.140-1
 - Update to 1.140.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Sep 2006 14:21:22 -0000	1.15
+++ sources	22 Nov 2006 14:40:14 -0000	1.16
@@ -1 +1 @@
-0951835b2d032a3813320de235b96273  Gtk2-1.140.tar.gz
+bc7f61c80bef55ae9e0edd4badedddd3  Gtk2-1.141.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:48:02 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 09:48:02 -0500
Subject: rpms/liferea/devel liferea-1.0.26-fonts.patch, NONE, 1.1 .cvsignore,
	1.37, 1.38 liferea.spec, 1.56, 1.57 sources, 1.38, 1.39
Message-ID: <200611221448.kAMEm2dq017376@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17354

Modified Files:
	.cvsignore liferea.spec sources 
Added Files:
	liferea-1.0.26-fonts.patch 
Log Message:
* Tue Nov 21 2006 Brian Pepple  - 1.0.26-1
- Update to 1.0.26.
- Add patch to use document font name. (#216813)


liferea-1.0.26-fonts.patch:

--- NEW FILE liferea-1.0.26-fonts.patch ---
--- liferea-1.0.26/src/conf.h.fonts	2006-07-22 05:00:54.000000000 -0400
+++ liferea-1.0.26/src/conf.h	2006-11-19 18:47:38.000000000 -0500
@@ -34,7 +34,7 @@
 #define BROWSER_MODULE			"/apps/liferea/browser-module"
 #define GNOME_DEFAULT_BROWSER_COMMAND	"gnome-open '%s'"
 #define DEFAULT_BROWSER_COMMAND		"mozilla '%s'"
-#define DEFAULT_FONT			"/desktop/gnome/interface/font_name"
+#define DEFAULT_FONT			"/desktop/gnome/interface/document_font_name"
 #define USER_FONT			"/apps/liferea/browser-font"
 #define REFOCUS_TIMEOUT			"/apps/liferea/refocus-timeout"
 #define DISABLE_JAVASCRIPT		"/apps/liferea/disable-javascript"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	27 Oct 2006 15:22:54 -0000	1.37
+++ .cvsignore	22 Nov 2006 14:47:32 -0000	1.38
@@ -1 +1 @@
-liferea-1.0.25.tar.gz
+liferea-1.0.26.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- liferea.spec	29 Oct 2006 22:26:18 -0000	1.56
+++ liferea.spec	22 Nov 2006 14:47:32 -0000	1.57
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.25
-Release:        3%{?dist}
+Version:        1.0.26
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-1.0.23-fedorafeed.patch
+Patch1:		%{name}-1.0.26-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml2-devel
@@ -42,6 +43,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
+%patch1 -p1 -b .fonts
 
 
 %build
@@ -108,6 +110,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Brian Pepple  - 1.0.26-1
+- Update to 1.0.26.
+- Add patch to use document font name. (#216813)
+
 * Sun Oct 29 2006 Brian Pepple  - 1.0.25-3
 - Actually use the correct version for firefox.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	27 Oct 2006 15:22:54 -0000	1.38
+++ sources	22 Nov 2006 14:47:32 -0000	1.39
@@ -1 +1 @@
-45d511c9eb829797336a60a4a86b5939  liferea-1.0.25.tar.gz
+8d48a070c9709a986a6f3d7a2ba7ec6c  liferea-1.0.26.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:07:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 10:07:45 -0500
Subject: rpms/python-xmpp/devel .cvsignore, 1.2, 1.3 python-xmpp.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <200611221507.kAMF7jRq017595@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-xmpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17576

Modified Files:
	.cvsignore python-xmpp.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 May 2006 13:24:44 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:07:15 -0000	1.3
@@ -1 +1 @@
-xmpppy-0.3.1.tar.gz
+xmpppy-0.4.0.tar.gz


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/devel/python-xmpp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-xmpp.spec	15 Aug 2006 04:32:25 -0000	1.3
+++ python-xmpp.spec	22 Nov 2006 15:07:15 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -49,7 +49,10 @@
 %{python_sitelib}/xmpp
 
 %changelog
-* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0
+
+* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Remove unneeded python_sitearch macro
 - Remove unneeded python-abi requirement
 - No longer ghost *.pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 May 2006 13:24:44 -0000	1.2
+++ sources	22 Nov 2006 15:07:15 -0000	1.3
@@ -1 +1 @@
-56e8df54288e57bd626cb53b31e2b41c  xmpppy-0.3.1.tar.gz
+bcec3068bc297e672a1d5b258090ee3d  xmpppy-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:11:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 10:11:21 -0500
Subject: rpms/python-xmpp/FC-6 .cvsignore, 1.2, 1.3 python-xmpp.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200611221511.kAMFBLso017670@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-xmpp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17643

Modified Files:
	.cvsignore python-xmpp.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 May 2006 13:24:44 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:10:51 -0000	1.3
@@ -1 +1 @@
-xmpppy-0.3.1.tar.gz
+xmpppy-0.4.0.tar.gz


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-6/python-xmpp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-xmpp.spec	15 Aug 2006 04:32:25 -0000	1.3
+++ python-xmpp.spec	22 Nov 2006 15:10:51 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -49,7 +49,10 @@
 %{python_sitelib}/xmpp
 
 %changelog
-* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0
+
+* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Remove unneeded python_sitearch macro
 - Remove unneeded python-abi requirement
 - No longer ghost *.pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 May 2006 13:24:44 -0000	1.2
+++ sources	22 Nov 2006 15:10:51 -0000	1.3
@@ -1 +1 @@
-56e8df54288e57bd626cb53b31e2b41c  xmpppy-0.3.1.tar.gz
+bcec3068bc297e672a1d5b258090ee3d  xmpppy-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:12:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 10:12:26 -0500
Subject: rpms/python-xmpp/FC-5 .cvsignore, 1.2, 1.3 python-xmpp.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611221512.kAMFCQ41017748@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-xmpp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17724

Modified Files:
	.cvsignore python-xmpp.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 May 2006 13:24:44 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:11:56 -0000	1.3
@@ -1 +1 @@
-xmpppy-0.3.1.tar.gz
+xmpppy-0.4.0.tar.gz


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-5/python-xmpp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-xmpp.spec	15 Aug 2006 04:33:10 -0000	1.2
+++ python-xmpp.spec	22 Nov 2006 15:11:56 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -49,7 +49,10 @@
 %{python_sitelib}/xmpp
 
 %changelog
-* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0
+
+* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Remove unneeded python_sitearch macro
 - Remove unneeded python-abi requirement
 - No longer ghost *.pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 May 2006 13:24:44 -0000	1.2
+++ sources	22 Nov 2006 15:11:56 -0000	1.3
@@ -1 +1 @@
-56e8df54288e57bd626cb53b31e2b41c  xmpppy-0.3.1.tar.gz
+bcec3068bc297e672a1d5b258090ee3d  xmpppy-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:13:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 10:13:21 -0500
Subject: rpms/python-xmpp/FC-4 .cvsignore, 1.2, 1.3 python-xmpp.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611221513.kAMFDLcS017811@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-xmpp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17792

Modified Files:
	.cvsignore python-xmpp.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 May 2006 13:24:44 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:12:51 -0000	1.3
@@ -1 +1 @@
-xmpppy-0.3.1.tar.gz
+xmpppy-0.4.0.tar.gz


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-4/python-xmpp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-xmpp.spec	15 Aug 2006 04:34:08 -0000	1.2
+++ python-xmpp.spec	22 Nov 2006 15:12:51 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -49,7 +49,10 @@
 %{python_sitelib}/xmpp
 
 %changelog
-* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0
+
+* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Remove unneeded python_sitearch macro
 - Remove unneeded python-abi requirement
 - No longer ghost *.pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 May 2006 13:24:44 -0000	1.2
+++ sources	22 Nov 2006 15:12:51 -0000	1.3
@@ -1 +1 @@
-56e8df54288e57bd626cb53b31e2b41c  xmpppy-0.3.1.tar.gz
+bcec3068bc297e672a1d5b258090ee3d  xmpppy-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:16:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 10:16:00 -0500
Subject: rpms/perl-Wx/FC-5 .cvsignore, 1.4, 1.5 perl-Wx.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611221516.kAMFG01D017906@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17865/FC-5

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2006 18:10:07 -0000	1.4
+++ .cvsignore	22 Nov 2006 15:15:30 -0000	1.5
@@ -1 +1 @@
-Wx-0.60.tar.gz
+Wx-0.63.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/perl-Wx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Wx.spec	11 Nov 2006 18:10:07 -0000	1.3
+++ perl-Wx.spec	22 Nov 2006 15:15:30 -0000	1.4
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.60
+Version:        0.63
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.63-1
+- Update to 0.63.
+
+* Tue Nov 14 2006 Jose Pedro Oliveira  - 0.62-1
+- Update to 0.62.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
 - Update to 0.60.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2006 18:10:07 -0000	1.4
+++ sources	22 Nov 2006 15:15:30 -0000	1.5
@@ -1 +1 @@
-be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz
+214bf025166a603506b160823d5e9013  Wx-0.63.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:16:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 10:16:00 -0500
Subject: rpms/perl-Wx/FC-6 .cvsignore, 1.4, 1.5 perl-Wx.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611221516.kAMFG0cK017911@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17865/FC-6

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2006 18:10:08 -0000	1.4
+++ .cvsignore	22 Nov 2006 15:15:30 -0000	1.5
@@ -1 +1 @@
-Wx-0.60.tar.gz
+Wx-0.63.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/perl-Wx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Wx.spec	11 Nov 2006 18:10:08 -0000	1.3
+++ perl-Wx.spec	22 Nov 2006 15:15:30 -0000	1.4
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.60
+Version:        0.63
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.63-1
+- Update to 0.63.
+
+* Tue Nov 14 2006 Jose Pedro Oliveira  - 0.62-1
+- Update to 0.62.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
 - Update to 0.60.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2006 18:10:08 -0000	1.4
+++ sources	22 Nov 2006 15:15:30 -0000	1.5
@@ -1 +1 @@
-be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz
+214bf025166a603506b160823d5e9013  Wx-0.63.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:18:59 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 22 Nov 2006 10:18:59 -0500
Subject: owners owners.list,1.1989,1.1990
Message-ID: <200611221518.kAMFIxep018036@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18021

Modified Files:
	owners.list 
Log Message:
fix plone+zope mess


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1989
retrieving revision 1.1990
diff -u -r1.1989 -r1.1990
--- owners.list	22 Nov 2006 05:47:57 -0000	1.1989
+++ owners.list	22 Nov 2006 15:18:29 -0000	1.1990
@@ -1872,7 +1872,7 @@
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|plib|Set of portable libraries especially useful for games|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|matthias at rpmforge.net
 Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
-Fedora Extras|plone|User friendly and powerful open source Content Management System|extras-qa at fedoraproject.org|jonathansteffan at gmail.com
+Fedora Extras|plone|User friendly and powerful open source Content Management System|jonathansteffan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|plotmm|GTKmm plot widget for scientific applications|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|plotutils|GNU vector and raster graphics utilities and libraries|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -2557,7 +2557,7 @@
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|Zim|Desktop wiki & notekeeper|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
-Fedora Extras|zope|Application server in Python|extras-qa at fedoraproject.org|jonathansteffan at gmail.com
+Fedora Extras|zope|Application server in Python|jonathansteffan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zvbi|Raw VBI, Teletext and Closed Caption decoding library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|zynaddsubfx|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 15:35:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:35:43 -0500
Subject: rpms/dd2 - New directory
Message-ID: <200611221535.kAMFZhcq018202@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18198/dd2

Log Message:
Directory /cvs/extras/rpms/dd2 added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 15:35:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:35:48 -0500
Subject: rpms/dd2/devel - New directory
Message-ID: <200611221535.kAMFZmTY018215@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18198/dd2/devel

Log Message:
Directory /cvs/extras/rpms/dd2/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 15:36:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:36:05 -0500
Subject: rpms/dd2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221536.kAMFa5w7018245@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18239

Added Files:
	Makefile import.log 
Log Message:
Setup of module dd2


--- NEW FILE Makefile ---
# Top level Makefile for module dd2
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  Wed Nov 22 15:36:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:36:10 -0500
Subject: rpms/dd2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611221536.kAMFaAPx018261@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18239/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dd2


--- 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 Nov 22 15:37:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:37:22 -0500
Subject: rpms/dd2 import.log,1.1,1.2
Message-ID: <200611221537.kAMFbMMm018389@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18315

Modified Files:
	import.log 
Log Message:
auto-import dd2-0.2.1-1.fc7 on branch devel from dd2-0.2.1-1.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dd2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 15:36:05 -0000	1.1
+++ import.log	22 Nov 2006 15:36:51 -0000	1.2
@@ -0,0 +1 @@
+dd2-0_2_1-1_fc7:HEAD:dd2-0.2.1-1.fc7.src.rpm:1164209909



From fedora-extras-commits at redhat.com  Wed Nov 22 15:37:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:37:22 -0500
Subject: rpms/dd2/devel dd2-0.2.1-glob-highscore.patch, NONE, 1.1 dd2.desktop,
	NONE, 1.1 dd2.png, NONE, 1.1 dd2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611221537.kAMFbM0T018393@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18315/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dd2-0.2.1-glob-highscore.patch dd2.desktop dd2.png dd2.spec 
Log Message:
auto-import dd2-0.2.1-1.fc7 on branch devel from dd2-0.2.1-1.fc7.src.rpm

dd2-0.2.1-glob-highscore.patch:

--- NEW FILE dd2-0.2.1-glob-highscore.patch ---
--- dd2-0.2.1/src/menu.c.highscore	2004-07-02 17:36:33.000000000 +0200
+++ dd2-0.2.1/src/menu.c	2006-11-18 20:01:04.000000000 +0100
@@ -17,6 +17,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#include
 #include"SDL.h"
 #include"SDL_mixer.h"
 #include"menu.h"
--- dd2-0.2.1/src/main.c.highscore	2004-07-02 17:40:48.000000000 +0200
+++ dd2-0.2.1/src/main.c	2006-11-18 20:01:04.000000000 +0100
@@ -17,6 +17,13 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#ifndef WIN32
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
+#endif
+#include
+#endif
+#include
 #include
 #include
 #include"main.h"
@@ -44,7 +51,7 @@
 Uint32 tick, ntick;
 float scroll=0,scroll2=0;
 
-bool pause;
+bool paused;
 Uint32 pause_tick;
 
 extern bool boss;
@@ -130,7 +137,7 @@
 					{
 						writeCString(gfx, screen, 98, 20, "game paused", 0);
 						SDL_Flip(screen);
-						pause=pause ? false : true;
+						paused=paused ? false : true;
 						pause_tick=SDL_GetTicks()+200;
 						continue;
 					}
@@ -156,7 +163,7 @@
 				control_player(&player[1]);
 		}
 
-		if(pause)
+		if(paused)
 			continue;
 		
 		/* frame rate calculation */
@@ -270,8 +277,19 @@
     char buffer[512];
 	SDL_VideoInfo *vi;
 	unsigned char bpp=8;
+	FILE *scoreFile;
 
 #ifndef WIN32
+	gid_t realgid;
+
+	scoreFile = fopen("/var/games/dd2-hiscore", "r+");
+	realgid = getgid();
+
+        if (setresgid(-1, realgid, realgid) != 0) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
+	
 	if(argc==2)
 		if(argv[1][0]=='-' && argv[1][1]=='v') {
 			printf("%s v%s\nCopyright (c) 2003,2004 Juan J. Martinez \n", PACKAGE, VERSION);
@@ -292,11 +310,12 @@
 	sprintf(buffer,"%s/dd2.cfg",DD2_DATA);
 	if(!loadCFG(buffer,&conf))
 		fprintf(stderr,"unable to read configuration, using defaults\n");
-#endif
-
+		
 	/* read hi-scores */
 	sprintf(buffer,"%s/dd2-hiscore",DD2_DATA);
-	if(!loadScore(buffer,hiscore))
+	scoreFile = fopen(buffer, "r+");
+#endif
+	if(!loadScore(scoreFile,hiscore))
 		fprintf(stderr,"unable to read hi-scores, using defaults\n");
 
 	/* don't init sound if it's not needed */
@@ -393,7 +412,7 @@
 		player[0].joy=(int)conf.control[0]==JOYSTICK;
 		player[1].joy=(int)conf.control[1]==JOYSTICK;
 
-		pause=0;
+		paused=0;
 		pause_tick=0;
 		boss=0;
 		gameLoop();
@@ -462,10 +481,8 @@
 	saveCFG(buffer,&conf);
 
 	/* save hi-scores */
-	sprintf(buffer,"%s/dd2-hiscore",DD2_DATA);
-	if(!saveScore(buffer,hiscore))
-		fprintf(stderr,"unable to save hi-scores\ndo you have permissions to write into %s?\n"
-			,buffer);
-
+	if(!saveScore(scoreFile,hiscore))
+		fprintf(stderr,"unable to save hi-scores\n");
+	
 	return 0;
 }
--- dd2-0.2.1/src/control.c.highscore	2006-11-18 20:04:24.000000000 +0100
+++ dd2-0.2.1/src/control.c	2006-11-18 20:04:32.000000000 +0100
@@ -22,13 +22,13 @@
 #include "control.h"
 #include "SDL_plus.h"
 
-extern bool pause;
+extern bool paused;
 
 void control_player_joy(SDL_Joystick *joy, pDesc *p)
 {
 	int x,y,but;
 	
-	if(pause)
+	if(paused)
 		return;
 
 	SDL_JoystickUpdate();
@@ -68,7 +68,7 @@
 
 	keys=SDL_GetKeyState(NULL);	
 
-	if(pause)
+	if(paused)
 		return;
 	
 	if(keys[p->keys[0]]) {
--- dd2-0.2.1/src/data/Makefile.am.highscore	2004-05-17 16:41:00.000000000 +0200
+++ dd2-0.2.1/src/data/Makefile.am	2006-11-18 20:01:04.000000000 +0100
@@ -3,7 +3,3 @@
 efx6.wav efx7.wav efx8.wav gfx.bmp dd2.cfg game.act dd2-hiscore
 EXTRA_DIST = bgm1.xm bgm2.xm efx1.wav efx2.wav efx3.wav efx4.wav efx5.wav \
 efx6.wav efx7.wav efx8.wav gfx.bmp dd2.cfg game.act dd2-hiscore
-
-install-data-hook:
-	chmod a+rw $(pkgdatadir)/dd2-hiscore
-
--- dd2-0.2.1/src/data/Makefile.in.highscore	2004-07-02 17:43:12.000000000 +0200
+++ dd2-0.2.1/src/data/Makefile.in	2006-11-18 20:01:04.000000000 +0100
@@ -140,7 +140,6 @@
 
 install-data-am: install-pkgdataDATA
 	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-data: install-data-am
 
 install-am: all-am
@@ -190,10 +189,6 @@
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-install-data-hook:
-	chmod a+rw $(pkgdatadir)/dd2-hiscore
-
 # 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.
 .NOEXPORT:
--- dd2-0.2.1/src/cfg.c.highscore	2004-06-10 20:07:23.000000000 +0200
+++ dd2-0.2.1/src/cfg.c	2006-11-18 20:01:04.000000000 +0100
@@ -88,9 +88,8 @@
 }
 
 int
-loadScore(char *path, score *hisc)
+loadScore(FILE *f, score *hisc)
 {
-	FILE *f;
 	int i,j;
 	score swp;
 
@@ -101,19 +100,15 @@
 		hisc[i].score=10000-(i*1000);
 	}
 
-	f=fopen(path,"rt");
 	if(!f)
 		return 0;
 
 	for(i=0;i<10;i++)
 		if(fscanf(f,"%8[^:]:%i:%i\n", hisc[i].name, &hisc[i].stage,
 			&hisc[i].score)!=3) {
-				fclose(f);
 				return 0;
 		}
 
-	fclose(f);
-
 	/* it's needed the score is ordered */
 	for(i=0;i<9;i++)
 		for(j=i;j<10;j++) {
@@ -134,14 +129,14 @@
 }
 
 int
-saveScore(char *path, score *hisc)
+saveScore(FILE *f, score *hisc)
 {
-	FILE *f;
 	int i;
 
-	f=fopen(path,"wt");
 	if(!f)
 		return 0;
+		
+	rewind(f);
 
 	for(i=0;i<10;i++)
 		fprintf(f,"%s:%i:%i\n", hisc[i].name, hisc[i].stage,
--- dd2-0.2.1/src/cfg.h.highscore	2004-05-17 11:02:40.000000000 +0200
+++ dd2-0.2.1/src/cfg.h	2006-11-18 20:01:04.000000000 +0100
@@ -20,6 +20,8 @@
 #ifndef _CFG_H_
 #define _CFG_H_
 
+#include 
+
 #define NO_SOUND	0
 #define SOUND_LOW	1
 #define SOUND_MED	2
@@ -45,7 +47,7 @@
 int loadCFG(char *path, cfg *c);
 int saveCFG(char *path, cfg *c);
 
-int loadScore(char *path, score *hisc);
-int saveScore(char *path, score *hisc);
+int loadScore(FILE *f, score *hisc);
+int saveScore(FILE *f, score *hisc);
 
 #endif


--- NEW FILE dd2.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Dodgin' Diamond 2
Comment=Shoot'em up arcade game
Exec=dd2
Icon=dd2.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE dd2.spec ---
Name:           dd2
Version:        0.2.1
Release:        1%{?dist}
Summary:        Dodgin' Diamond 2 - Shoot'em up arcade game
Group:          Amusements/Games
License:        GPL
URL:            http://www.usebox.net/jjm/dd2/
Source0:        http://www.usebox.net/jjm/dd2/releases/dd2-%{version}.tar.gz
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         dd2-0.2.1-glob-highscore.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_mixer-devel desktop-file-utils

%description
This is a little shoot'em up arcade game for one or two players. It aims to
be an 'old school' arcade game with low resolution graphics, top-down scroll
action, energy based gameplay and different weapons with several levels of
power.


%prep
%setup -q
%patch0 -p1 -z .highscore
#stop autoxxx from rerunning
touch src/data/Makefile.in


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
mkdir -p $RPM_BUILD_ROOT%{_var}/games
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-hiscore \
  $RPM_BUILD_ROOT%{_var}/games

# 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/24x24/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/%{name}.png


%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 ChangeLog COPYING NEWS README TODO
%attr(2755,root,games) %{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
%config(noreplace) %attr (0664,root,games) %{_var}/games/%{name}-hiscore


%changelog
* Sat Nov 18 2006 Hans de Goede  0.2.1-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dd2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 15:36:10 -0000	1.1
+++ .cvsignore	22 Nov 2006 15:36:52 -0000	1.2
@@ -0,0 +1 @@
+dd2-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dd2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 15:36:10 -0000	1.1
+++ sources	22 Nov 2006 15:36:52 -0000	1.2
@@ -0,0 +1 @@
+fe713b8393e05ee6417108db968f34ac  dd2-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:41:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:41:13 -0500
Subject: owners owners.list,1.1990,1.1991
Message-ID: <200611221541.kAMFfDl3018581@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18563

Modified Files:
	owners.list 
Log Message:
added dd2


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1990
retrieving revision 1.1991
diff -u -r1.1990 -r1.1991
--- owners.list	22 Nov 2006 15:18:29 -0000	1.1990
+++ owners.list	22 Nov 2006 15:40:43 -0000	1.1991
@@ -289,6 +289,7 @@
 Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|dbus-qt|Qt-based library for using D-BUS|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dclib|Direct Connect file sharing library|lmacken at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|dd2|Dodgin' Diamond 2 - Shoot'em up arcade game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ddclient|A client to update dynamic DNS host entries|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|thomas at apestaart.org
 Fedora Extras|ddd|GUI for several command-line debuggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 15:41:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:41:54 -0500
Subject: rpms/perl-Gnome2-Print - New directory
Message-ID: <200611221541.kAMFfsPi018630@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18626/perl-Gnome2-Print

Log Message:
Directory /cvs/extras/rpms/perl-Gnome2-Print added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 15:41:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:41:59 -0500
Subject: rpms/perl-Gnome2-Print/devel - New directory
Message-ID: <200611221541.kAMFfxka018643@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18626/perl-Gnome2-Print/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gnome2-Print/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 15:42:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:05 -0500
Subject: owners owners.list,1.1991,1.1992
Message-ID: <200611221542.kAMFg59L018654@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18606

Modified Files:
	owners.list 
Log Message:
added perl-Gnome2-Print


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1991
retrieving revision 1.1992
diff -u -r1.1991 -r1.1992
--- owners.list	22 Nov 2006 15:40:43 -0000	1.1991
+++ owners.list	22 Nov 2006 15:41:34 -0000	1.1992
@@ -1474,6 +1474,7 @@
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gnome2-Canvas|Perl interface to Gnome Canvas|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
 Fedora Extras|perl-Gnome2-GConf|Perl wrappers for the GConf configuration engine|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Gnome2-Print|Perl wrappers for the Gnome Print utilities|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Graphics-ColorNames|Defines RGB values for common color names|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Nov 22 15:42:07 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:07 -0500
Subject: rpms/perl-Gnome2-Print Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221542.kAMFg7l2018667@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18661

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Gnome2-Print


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gnome2-Print
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  Wed Nov 22 15:42:12 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:12 -0500
Subject: rpms/perl-Gnome2-Print/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611221542.kAMFgCTJ018682@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18661/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gnome2-Print


--- 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 Nov 22 15:42:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:54 -0500
Subject: rpms/perl-Gnome2-Print import.log,1.1,1.2
Message-ID: <200611221542.kAMFgsEZ018736@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18706

Modified Files:
	import.log 
Log Message:
auto-import perl-Gnome2-Print-1.000-1.fc6 on branch devel from perl-Gnome2-Print-1.000-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 15:42:07 -0000	1.1
+++ import.log	22 Nov 2006 15:42:24 -0000	1.2
@@ -0,0 +1 @@
+perl-Gnome2-Print-1_000-1_fc6:HEAD:perl-Gnome2-Print-1.000-1.fc6.src.rpm:1164210170



From fedora-extras-commits at redhat.com  Wed Nov 22 15:42:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:54 -0500
Subject: rpms/perl-Gnome2-Print/devel perl-Gnome2-Print.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611221542.kAMFgsCs018740@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18706/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Gnome2-Print.spec 
Log Message:
auto-import perl-Gnome2-Print-1.000-1.fc6 on branch devel from perl-Gnome2-Print-1.000-1.fc6.src.rpm


--- NEW FILE perl-Gnome2-Print.spec ---
Name:           perl-Gnome2-Print
Version:        1.000
Release:        1%{?dist}
Summary:        Perl wrappers for the Gnome Print utilities
License:        LGPL
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Gnome2-Print/
Source0:        http://www.cpan.org/authors/id/E/EB/EBASSI/Gnome2-Print-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(ExtUtils::Depends)   >= 0.1
BuildRequires:  perl(ExtUtils::PkgConfig) >= 1.03
BuildRequires:  perl(Glib)                >= 1.120
BuildRequires:  perl(Gtk2)                >= 1.120
BuildRequires:  libgnomeprintui22-devel   >= 2.2.0.0

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to use the GNOME Print libraries within your
applications written using the gtk2-perl wrapper. The GNOME Print libraries
(also known as libgnomeprint and libgnomeprintui) allow you to create
printable documents (using various frontends) and offer standard widgets in
order to mainatin a UI consistent for all GNOME applications.

%prep
%setup -q -n Gnome2-Print-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog doctypes gnomeprint.typemap maps NEWS README examples/
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Gnome2*
%{_mandir}/man3/*

%changelog
* Tue Nov 21 2006 Chris Weyl  1.000-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 15:42:12 -0000	1.1
+++ .cvsignore	22 Nov 2006 15:42:24 -0000	1.2
@@ -0,0 +1 @@
+Gnome2-Print-1.000.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 15:42:12 -0000	1.1
+++ sources	22 Nov 2006 15:42:24 -0000	1.2
@@ -0,0 +1 @@
+66578c2ffaebbe035a0735e65ad71c3f  Gnome2-Print-1.000.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:44:13 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:44:13 -0500
Subject: rpms/perl-Gnome2-Print/devel perl-Gnome2-Print.spec,1.1,1.2
Message-ID: <200611221544.kAMFiDLY018789@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774

Modified Files:
	perl-Gnome2-Print.spec 
Log Message:
release bump


Index: perl-Gnome2-Print.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/devel/perl-Gnome2-Print.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gnome2-Print.spec	22 Nov 2006 15:42:24 -0000	1.1
+++ perl-Gnome2-Print.spec	22 Nov 2006 15:43:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-Print
 Version:        1.000
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl wrappers for the Gnome Print utilities
 License:        LGPL
 Group:          Development/Libraries
@@ -55,5 +55,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 22 2006 Chris Weyl  1.000-2
+- bump
+
 * Tue Nov 21 2006 Chris Weyl  1.000-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Wed Nov 22 15:46:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 10:46:40 -0500
Subject: rpms/python-eyed3/devel .cvsignore, 1.2, 1.3 python-eyed3.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611221546.kAMFke1m018865@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846

Modified Files:
	.cvsignore python-eyed3.spec sources 
Log Message:
* Wed Nov 22 2006 Brian Pepple  - 0.6.11-1
- Update to 0.6.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 18:03:35 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:46:10 -0000	1.3
@@ -1 +1 @@
-eyeD3-0.6.10.tar.gz
+eyeD3-0.6.11.tar.gz


Index: python-eyed3.spec
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/python-eyed3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-eyed3.spec	7 Oct 2006 18:03:35 -0000	1.1
+++ python-eyed3.spec	22 Nov 2006 15:46:10 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-eyed3
-Version:        0.6.10
-Release:        2%{?dist}
+Version:        0.6.11
+Release:        1%{?dist}
 Summary:        Python module for processing ID3 tags
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@
 
 
 %description
-Aa Python module and program for processing ID3 tags. Information about
+A Python module and program for processing ID3 tags. Information about
 mp3 files(i.e bit rate, sample frequency, play time, etc.) is also
 provided. The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Brian Pepple  - 0.6.11-1
+- Update to 0.6.11.
+
 * Sat Oct  7 2006 Brian Pepple  - 0.6.10-2
 - Change BR to python.
 - Remove unnecessary make in build section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 18:03:35 -0000	1.2
+++ sources	22 Nov 2006 15:46:10 -0000	1.3
@@ -1 +1 @@
-2f7ee6749b993faba3b5d10d9621d314  eyeD3-0.6.10.tar.gz
+e296d7b896a31abf429d542dd26c90a3  eyeD3-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:09:50 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:09:50 -0500
Subject: rpms/openct/FC-6 .cvsignore, 1.10, 1.11 openct.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200611221609.kAMG9o4V019092@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19055/FC-6

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
- 0.6.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 18:18:03 -0000	1.10
+++ .cvsignore	22 Nov 2006 16:09:20 -0000	1.11
@@ -1 +1 @@
-openct-0.6.10.tar.gz
+openct-0.6.11.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/openct.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openct.spec	11 Nov 2006 18:18:03 -0000	1.20
+++ openct.spec	22 Nov 2006 16:09:20 -0000	1.21
@@ -1,7 +1,7 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.10
+Version:        0.6.11
 Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
+- 0.6.11.
+
 * Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
 - 0.6.10, udev rules fixed upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 18:18:03 -0000	1.10
+++ sources	22 Nov 2006 16:09:20 -0000	1.11
@@ -1 +1 @@
-fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz
+1cdd16b2c1443ecb986abf125af50e7f  openct-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:09:50 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:09:50 -0500
Subject: rpms/openct/devel .cvsignore, 1.10, 1.11 openct.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200611221609.kAMG9omx019097@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19055/devel

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
- 0.6.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 18:18:04 -0000	1.10
+++ .cvsignore	22 Nov 2006 16:09:20 -0000	1.11
@@ -1 +1 @@
-openct-0.6.10.tar.gz
+openct-0.6.11.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openct.spec	11 Nov 2006 18:18:04 -0000	1.20
+++ openct.spec	22 Nov 2006 16:09:20 -0000	1.21
@@ -1,7 +1,7 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.10
+Version:        0.6.11
 Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
+- 0.6.11.
+
 * Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
 - 0.6.10, udev rules fixed upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 18:18:04 -0000	1.10
+++ sources	22 Nov 2006 16:09:20 -0000	1.11
@@ -1 +1 @@
-fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz
+1cdd16b2c1443ecb986abf125af50e7f  openct-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:19:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 11:19:51 -0500
Subject: rpms/wxMaxima/devel wxMaxima.spec,1.6,1.7
Message-ID: <200611221619.kAMGJpqZ019260@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19245

Modified Files:
	wxMaxima.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter  0.7.0a-4
- --remove-category=Science;Utility (#215748)



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wxMaxima.spec	9 Oct 2006 14:02:24 -0000	1.6
+++ wxMaxima.spec	22 Nov 2006 16:19:21 -0000	1.7
@@ -5,7 +5,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -31,7 +31,15 @@
 
 %patch1 -p1 -b .mp
 
-sed -i -e "s|^Icon=.*|Icon=wxmaxima|" wxmaxima.desktop
+## wxmaxima.desktop fixups
+# do (some) Categories munging here, some versions of desktop-file-install 
+# (*cough rhel4*) truncate Categories if --remove-category'd items is a
+# substr of another (ie, X-Red-Hat-Base X-Red-Hat-Base-Only)
+sed -i \
+  -e "s|^Categories=.*|Categories=Utility;|" \
+  -e "s|^Icon=.*|Icon=wxmaxima|" \
+  -e "s|^Terminal=0|Terminal=false|" \
+  wxmaxima.desktop
 
 
 %build
@@ -49,12 +57,10 @@
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="" \
-  --add-category="Science" \
+  --vendor="" \
   --add-category="Education" \
   --add-category="Math" \
-  --remove-category="X-Red-Hat-Base" \
-  --remove-category="X-Red-Hat-Base-Only" \
+  --remove-category="Utility" \
   wxmaxima.desktop 
 
 # app icon
@@ -92,6 +98,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Rex Dieter  0.7.0a-4
+- --remove-category=Science;Utility (#215748)
+
 * Mon Oct 09 2006 Rex Dieter  0.7.0a-3
 - (re)fix typo in %%description
 



From fedora-extras-commits at redhat.com  Wed Nov 22 16:29:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 11:29:26 -0500
Subject: rpms/gdl/devel .cvsignore, 1.5, 1.6 gdl.spec, 1.18, 1.19 sources,
	1.5, 1.6 gdl-0.9pre2-specialization.patch, 1.1, NONE
Message-ID: <200611221629.kAMGTQZ3019419@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19393

Modified Files:
	.cvsignore gdl.spec sources 
Removed Files:
	gdl-0.9pre2-specialization.patch 
Log Message:
Update to 0.9pre3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jun 2006 22:22:18 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:28:56 -0000	1.6
@@ -1 +1 @@
-gdl-0.9pre2.tar.gz
+gdl-0.9pre3.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gdl.spec	3 Oct 2006 22:21:24 -0000	1.18
+++ gdl.spec	22 Nov 2006 16:28:56 -0000	1.19
@@ -1,13 +1,12 @@
 Name:           gdl
 Version:        0.9
-Release:        0.pre3.1%{?dist}
+Release:        0.pre3.2%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://dl.sf.net/gnudata/%{name}-%{version}pre2.tar.gz
-Patch0:         gdl-0.9pre2-specialization.patch
+Source0:        http://dl.sf.net/gnudata/%{name}-%{version}pre3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel, ncurses-devel
@@ -24,8 +23,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
-%patch -p1
+%setup -q -n %{name}-%{version}pre3
 
 
 %build
@@ -51,6 +49,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 - Orion Poplawski  - 0.9-0.pre3.2
+- Update to 0.9pre3
+
 * Wed Oct  3 2006 - Orion Poplawski  - 0.9-0.pre3.1
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 22:22:18 -0000	1.5
+++ sources	22 Nov 2006 16:28:56 -0000	1.6
@@ -1 +1 @@
-41a3a2184dad0292affe090e146308ca  gdl-0.9pre2.tar.gz
+0bf35ded3b585507c021f8292ad6f611  gdl-0.9pre3.tar.gz


--- gdl-0.9pre2-specialization.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 16:35:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:35:45 -0500
Subject: rpms/perl-MIME-Types/FC-6 .cvsignore, 1.5, 1.6 perl-MIME-Types.spec,
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611221635.kAMGZj7Z019547@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MIME-Types/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19511/FC-6

Modified Files:
	.cvsignore perl-MIME-Types.spec sources 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 1.18-1
- 1.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Aug 2006 08:43:01 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:35:15 -0000	1.6
@@ -1 +1 @@
-MIME-Types-1.17.tar.gz
+MIME-Types-1.18.tar.gz


Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/FC-6/perl-MIME-Types.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-MIME-Types.spec	15 Sep 2006 16:27:43 -0000	1.10
+++ perl-MIME-Types.spec	22 Nov 2006 16:35:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Types
-Version:        1.17
-Release:        2%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Summary:        MIME types module for Perl
 
 License:        GPL or Artistic
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 1.18-1
+- 1.18.
+
 * Fri Sep 15 2006 Ville Skytt??  - 1.17-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Aug 2006 08:43:01 -0000	1.5
+++ sources	22 Nov 2006 16:35:15 -0000	1.6
@@ -1 +1 @@
-687f985c74d4cdacd2a6ee8a2c51971d  MIME-Types-1.17.tar.gz
+fec1a57dfc4a0d7177b98fd75844685b  MIME-Types-1.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:35:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:35:45 -0500
Subject: rpms/perl-MIME-Types/devel .cvsignore, 1.5, 1.6 perl-MIME-Types.spec,
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611221635.kAMGZjSx019552@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MIME-Types/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19511/devel

Modified Files:
	.cvsignore perl-MIME-Types.spec sources 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 1.18-1
- 1.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Aug 2006 08:43:01 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:35:15 -0000	1.6
@@ -1 +1 @@
-MIME-Types-1.17.tar.gz
+MIME-Types-1.18.tar.gz


Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/perl-MIME-Types.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-MIME-Types.spec	15 Sep 2006 16:27:43 -0000	1.10
+++ perl-MIME-Types.spec	22 Nov 2006 16:35:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Types
-Version:        1.17
-Release:        2%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Summary:        MIME types module for Perl
 
 License:        GPL or Artistic
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 1.18-1
+- 1.18.
+
 * Fri Sep 15 2006 Ville Skytt??  - 1.17-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Aug 2006 08:43:01 -0000	1.5
+++ sources	22 Nov 2006 16:35:15 -0000	1.6
@@ -1 +1 @@
-687f985c74d4cdacd2a6ee8a2c51971d  MIME-Types-1.17.tar.gz
+fec1a57dfc4a0d7177b98fd75844685b  MIME-Types-1.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:46:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:46:32 -0500
Subject: rpms/kid3/FC-6 .cvsignore, 1.5, 1.6 kid3.spec, 1.13, 1.14 sources,
	1.5, 1.6 kid3-0.7-mimetypes.patch, 1.1, NONE
Message-ID: <200611221646.kAMGkWZX019746@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kid3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19703/FC-6

Modified Files:
	.cvsignore kid3.spec sources 
Removed Files:
	kid3-0.7-mimetypes.patch 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.8.1-1
- 0.8.1, desktop entry fixes applied upstream.
- Re-enable musicbrainz support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jun 2006 18:48:38 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-kid3-0.7.tar.gz
+kid3-0.8.1.tar.gz


Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/kid3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kid3.spec	2 Oct 2006 18:37:39 -0000	1.13
+++ kid3.spec	22 Nov 2006 16:46:02 -0000	1.14
@@ -1,24 +1,19 @@
-%bcond_with     tunepimp
-
 Name:           kid3
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://kid3.sourceforge.net/
-Source0:        http://download.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.7-mimetypes.patch
+Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
+BuildRequires:  taglib-devel >= 1.4
 BuildRequires:  flac-devel
-%if %{with tunepimp}
 BuildRequires:  libtunepimp-devel
-%endif
-BuildRequires:  desktop-file-utils
 BuildRequires:  perl(File::Spec)
 
 %description
@@ -30,17 +25,14 @@
 
 %prep
 %setup -q
-%patch0 -p1
 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
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-%configure \
-%if ! %{with tunepimp}
-  --disable-musicbrainz \
-%endif
-  --disable-rpath --disable-dependency-tracking
+%configure --disable-rpath --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -48,13 +40,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 debian/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 644 \
-  --vendor fedora \
-  --add-category X-Fedora \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kid3.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
+# preserve desktop entry location for from < 0.8 upgrades
+mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde/kid3,fedora-kid3}.desktop
+rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde
 %find_lang %{name}
 abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
 for file in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -type l) ; do
@@ -78,17 +66,22 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE README
-%lang(en) %{_docdir}/HTML/en/kid3/
-%lang(de) %{_docdir}/HTML/de/
+%doc AUTHORS ChangeLog COPYING LICENSE README
 %{_bindir}/kid3
 %{_datadir}/applications/*kid3.desktop
 %{_datadir}/apps/kid3/
-%{_datadir}/icons/hicolor/*/apps/kid3.png
+%{_datadir}/icons/hicolor/*x*/apps/kid3.png
+%{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
+%lang(en) %{_docdir}/HTML/en/kid3/
+%lang(de) %{_docdir}/HTML/de/
 %{_mandir}/man1/kid3.1*
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.8.1-1
+- 0.8.1, desktop entry fixes applied upstream.
+- Re-enable musicbrainz support.
+
 * Mon Oct  2 2006 Ville Skytt??  - 0.7-4
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 18:48:38 -0000	1.5
+++ sources	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-e5f8262e3456d9b0bdba4e4b56ca3aee  kid3-0.7.tar.gz
+df03e94061330e3ec088911727f85059  kid3-0.8.1.tar.gz


--- kid3-0.7-mimetypes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 16:46:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:46:32 -0500
Subject: rpms/kid3/devel .cvsignore, 1.5, 1.6 kid3.spec, 1.13, 1.14 sources, 
	1.5, 1.6 kid3-0.7-mimetypes.patch, 1.1, NONE
Message-ID: <200611221646.kAMGkWNC019751@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kid3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19703/devel

Modified Files:
	.cvsignore kid3.spec sources 
Removed Files:
	kid3-0.7-mimetypes.patch 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.8.1-1
- 0.8.1, desktop entry fixes applied upstream.
- Re-enable musicbrainz support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jun 2006 18:48:38 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-kid3-0.7.tar.gz
+kid3-0.8.1.tar.gz


Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kid3.spec	2 Oct 2006 18:37:39 -0000	1.13
+++ kid3.spec	22 Nov 2006 16:46:02 -0000	1.14
@@ -1,24 +1,19 @@
-%bcond_with     tunepimp
-
 Name:           kid3
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://kid3.sourceforge.net/
-Source0:        http://download.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.7-mimetypes.patch
+Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
+BuildRequires:  taglib-devel >= 1.4
 BuildRequires:  flac-devel
-%if %{with tunepimp}
 BuildRequires:  libtunepimp-devel
-%endif
-BuildRequires:  desktop-file-utils
 BuildRequires:  perl(File::Spec)
 
 %description
@@ -30,17 +25,14 @@
 
 %prep
 %setup -q
-%patch0 -p1
 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
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-%configure \
-%if ! %{with tunepimp}
-  --disable-musicbrainz \
-%endif
-  --disable-rpath --disable-dependency-tracking
+%configure --disable-rpath --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -48,13 +40,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 debian/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 644 \
-  --vendor fedora \
-  --add-category X-Fedora \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kid3.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
+# preserve desktop entry location for from < 0.8 upgrades
+mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde/kid3,fedora-kid3}.desktop
+rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde
 %find_lang %{name}
 abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
 for file in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -type l) ; do
@@ -78,17 +66,22 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE README
-%lang(en) %{_docdir}/HTML/en/kid3/
-%lang(de) %{_docdir}/HTML/de/
+%doc AUTHORS ChangeLog COPYING LICENSE README
 %{_bindir}/kid3
 %{_datadir}/applications/*kid3.desktop
 %{_datadir}/apps/kid3/
-%{_datadir}/icons/hicolor/*/apps/kid3.png
+%{_datadir}/icons/hicolor/*x*/apps/kid3.png
+%{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
+%lang(en) %{_docdir}/HTML/en/kid3/
+%lang(de) %{_docdir}/HTML/de/
 %{_mandir}/man1/kid3.1*
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.8.1-1
+- 0.8.1, desktop entry fixes applied upstream.
+- Re-enable musicbrainz support.
+
 * Mon Oct  2 2006 Ville Skytt??  - 0.7-4
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 18:48:38 -0000	1.5
+++ sources	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-e5f8262e3456d9b0bdba4e4b56ca3aee  kid3-0.7.tar.gz
+df03e94061330e3ec088911727f85059  kid3-0.8.1.tar.gz


--- kid3-0.7-mimetypes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 16:48:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 11:48:27 -0500
Subject: rpms/cmucl/devel .cvsignore, 1.3, 1.4 cmucl.spec, 1.7, 1.8 sources, 
	1.3, 1.4
Message-ID: <200611221648.kAMGmRYN019871@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/cmucl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19852

Modified Files:
	.cvsignore cmucl.spec sources 
Log Message:
* Thu Nov 16 2006 Rex Dieter  19d-1
- cmucl-19d



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmucl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2006 20:20:13 -0000	1.3
+++ .cvsignore	22 Nov 2006 16:47:57 -0000	1.4
@@ -2,3 +2,5 @@
 cmucl-src-19c.tar.bz2
 cmucl-19c-x86-linux.tar.bz2.asc
 cmucl-src-19c.tar.bz2.asc
+cmucl-19d-x86-linux.tar.bz2.asc
+cmucl-src-19d.tar.bz2


Index: cmucl.spec
===================================================================
RCS file: /cvs/extras/rpms/cmucl/devel/cmucl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cmucl.spec	7 Sep 2006 20:20:13 -0000	1.7
+++ cmucl.spec	22 Nov 2006 16:47:57 -0000	1.8
@@ -1,29 +1,29 @@
 
 Summary: CMU Common Lisp compiler
 Name: 	 cmucl
-Version: 19c
-Release: 7%{?dist}
+Version: 19d
+Release: 1%{?dist}
 
 License: Public Domain/MIT
 Group: 	 Development/Languages
 URL:	 http://www.cons.org/cmucl/
-Source0: ftp://ftp.common-lisp.net/pub/project/cmucl/release/19c/cmucl-src-19c.tar.bz2
-Source1: ftp://ftp.common-lisp.net/pub/project/cmucl/release/19c/cmucl-src-19c.tar.bz2.asc
+Source0: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2
+#Source1: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2.asc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # bootstrap available for %%ix86 only: http://bugzilla.redhat.com/185085
 ExclusiveArch: %{ix86}
 
 ## ix86 section
 %ifarch %{ix86}
 %define cmucl_arch x86
-%define bootstrap cmucl 
-%define bootstrap_pkg cmucl
+#define bootstrap cmucl 
 %if "%{?bootstrap}" == "%{nil}"
-Source10: ftp://ftp.common-lisp.net/pub/project/cmucl/release/19c/cmucl-19c-x86-linux.tar.bz2
-Source11: ftp://ftp.common-lisp.net/pub/project/cmucl/release/19c/cmucl-19c-x86-linux.tar.bz2.asc
+Source10: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2
+Source11: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2.asc
 %define bootstrap_src -a 10 
 %else
-BuildRequires: %{?bootstrap_pkg}
+BuildRequires: cmucl 
 %endif
 %endif
 
@@ -39,10 +39,15 @@
 Patch1: cmucl-19c-motif-shared.patch
 Patch2: cmucl-19c-optflags.patch
 
-BuildRequires: sed >= 4.0 
-BuildRequires: lesstif-devel
+BuildRequires: sed
 BuildRequires: time
 BuildRequires: bc
+# Until we have a generic BR: motif-devel -- Rex
+%if "%{?fedora}" > "5"
+BuildRequires: lesstif-devel
+%else
+BuildRequires: openmotif-devel
+%endif
 
 %description
 CMUCL is a free, high performance implementation of the Common Lisp
@@ -194,6 +199,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Rex Dieter  19d-1
+- cmucl-19d
+
 * Thu Sep 07 2006 Rex Dieter  19c-7
 - BR: openmotif-devel -> lesstif-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmucl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2006 20:20:13 -0000	1.3
+++ sources	22 Nov 2006 16:47:57 -0000	1.4
@@ -1,4 +1,3 @@
-04bf7da2a49a309080bf504d0b1e8c28  cmucl-19c-x86-linux.tar.bz2
-c791f18c764e3c21970fecbbfb5b4524  cmucl-src-19c.tar.bz2
-1fda1ac8c0c5f9c5d1f9e2d7541a4513  cmucl-19c-x86-linux.tar.bz2.asc
-b123ec0d2583b314648e1c99f7f453dd  cmucl-src-19c.tar.bz2.asc
+806b3c1a9f68caa9106a5d03cf7bebce  cmucl-19d-x86-linux.tar.bz2.asc
+802cd8b05e376ff04c9006dd04f5bc7e  cmucl-19d-x86-linux.tar.bz2
+3a3dba371a7e1db7fa4b8f338acd72a3  cmucl-src-19d.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 16:57:42 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 11:57:42 -0500
Subject: rpms/jd/devel .cvsignore, 1.20, 1.21 jd.spec, 1.27, 1.28 sources,
	1.20, 1.21
Message-ID: <200611221657.kAMGvgqM019960@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19941

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061122
- cvs 061122 (25:50 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	21 Nov 2006 16:05:39 -0000	1.20
+++ .cvsignore	22 Nov 2006 16:57:12 -0000	1.21
@@ -1 +1 @@
-jd-1.8.1-cvs061121.tgz
+jd-1.8.1-cvs061122.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jd.spec	21 Nov 2006 16:05:39 -0000	1.27
+++ jd.spec	22 Nov 2006 16:57:12 -0000	1.28
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061121
+%define         strtag        cvs061122
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Nov 21 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061121
-- cvs 061121 (25:00 JST)
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061122
+- cvs 061122 (25:50 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 Nov 2006 16:05:39 -0000	1.20
+++ sources	22 Nov 2006 16:57:12 -0000	1.21
@@ -1 +1 @@
-c26742d0e0b634d5a8ad49bc6cb7fd04  jd-1.8.1-cvs061121.tgz
+456375f5bb55a1785572d5f6912adb1b  jd-1.8.1-cvs061122.tgz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:06:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:06:05 -0500
Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.10,
	1.11 perl-Module-ScanDeps.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <200611221706.kAMH65G6020148@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-serv20099/FC-5

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 15:20:02 -0000	1.10
+++ .cvsignore	22 Nov 2006 17:05:35 -0000	1.11
@@ -1 +1 @@
-Module-ScanDeps-0.69.tar.gz
+Module-ScanDeps-0.70.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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Module-ScanDeps.spec	11 Nov 2006 15:20:02 -0000	1.10
+++ perl-Module-ScanDeps.spec	22 Nov 2006 17:05:35 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.69
+Version:        0.70
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.70-1
+- Update to 0.70.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
 - Update to 0.69.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 15:20:02 -0000	1.10
+++ sources	22 Nov 2006 17:05:35 -0000	1.11
@@ -1 +1 @@
-c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz
+e43e148b53291191a463d440bc18d2f7  Module-ScanDeps-0.70.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:06:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:06:05 -0500
Subject: rpms/perl-Module-ScanDeps/FC-6 .cvsignore, 1.10,
	1.11 perl-Module-ScanDeps.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <200611221706.kAMH65EA020153@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-serv20099/FC-6

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 15:20:03 -0000	1.10
+++ .cvsignore	22 Nov 2006 17:05:35 -0000	1.11
@@ -1 +1 @@
-Module-ScanDeps-0.69.tar.gz
+Module-ScanDeps-0.70.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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Module-ScanDeps.spec	11 Nov 2006 15:20:03 -0000	1.10
+++ perl-Module-ScanDeps.spec	22 Nov 2006 17:05:35 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.69
+Version:        0.70
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.70-1
+- Update to 0.70.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
 - Update to 0.69.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 15:20:03 -0000	1.10
+++ sources	22 Nov 2006 17:05:35 -0000	1.11
@@ -1 +1 @@
-c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz
+e43e148b53291191a463d440bc18d2f7  Module-ScanDeps-0.70.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:06:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:06:10 -0500
Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.10,
	1.11 perl-Module-ScanDeps.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <200611221706.kAMH6Akk020158@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-serv20099/devel

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 15:20:03 -0000	1.10
+++ .cvsignore	22 Nov 2006 17:05:40 -0000	1.11
@@ -1 +1 @@
-Module-ScanDeps-0.69.tar.gz
+Module-ScanDeps-0.70.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Module-ScanDeps.spec	11 Nov 2006 15:20:04 -0000	1.10
+++ perl-Module-ScanDeps.spec	22 Nov 2006 17:05:40 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.69
+Version:        0.70
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.70-1
+- Update to 0.70.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
 - Update to 0.69.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 15:20:04 -0000	1.10
+++ sources	22 Nov 2006 17:05:40 -0000	1.11
@@ -1 +1 @@
-c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz
+e43e148b53291191a463d440bc18d2f7  Module-ScanDeps-0.70.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:11:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:11:17 -0500
Subject: rpms/perl-HTTP-Server-Simple/FC-6 .cvsignore, 1.8,
	1.9 perl-HTTP-Server-Simple.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200611221711.kAMHBHP3020408@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20354/FC-6

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Oct 2006 12:48:40 -0000	1.8
+++ .cvsignore	22 Nov 2006 17:10:47 -0000	1.9
@@ -1 +1 @@
-HTTP-Server-Simple-0.23.tar.gz
+HTTP-Server-Simple-0.24.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-6/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-HTTP-Server-Simple.spec	23 Oct 2006 12:48:40 -0000	1.9
+++ perl-HTTP-Server-Simple.spec	22 Nov 2006 17:10:47 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.23
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q -n HTTP-Server-Simple-%{version}
-chmod a-x lib/HTTP/Server/*.pm
+chmod -c a-x lib/HTTP/Server/*.pm
 %{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' ex/sample_server
 
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.24-1
+- Update to 0.24.
+
 * Mon Oct 23 2006 Jose Pedro Oliveira  - 0.23-1
 - Update to 0.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Oct 2006 12:48:40 -0000	1.8
+++ sources	22 Nov 2006 17:10:47 -0000	1.9
@@ -1 +1 @@
-5d410b9585c4c09426a6d6d14d0af6b1  HTTP-Server-Simple-0.23.tar.gz
+302f487fc5ae544529cc87784eccd89f  HTTP-Server-Simple-0.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:11:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:11:17 -0500
Subject: rpms/perl-HTTP-Server-Simple/FC-5 .cvsignore, 1.7,
	1.8 perl-HTTP-Server-Simple.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200611221711.kAMHBHmQ020403@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20354/FC-5

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Jun 2006 22:22:40 -0000	1.7
+++ .cvsignore	22 Nov 2006 17:10:47 -0000	1.8
@@ -1 +1 @@
-HTTP-Server-Simple-0.20.tar.gz
+HTTP-Server-Simple-0.24.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-5/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-HTTP-Server-Simple.spec	20 Jun 2006 22:22:40 -0000	1.8
+++ perl-HTTP-Server-Simple.spec	22 Nov 2006 17:10:47 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.20
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(URI::Escape)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -21,7 +22,7 @@
 
 %prep
 %setup -q -n HTTP-Server-Simple-%{version}
-chmod a-x lib/HTTP/Server/*.pm
+chmod -c a-x lib/HTTP/Server/*.pm
 %{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' ex/sample_server
 
 
@@ -54,6 +55,12 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.24-1
+- Update to 0.24.
+
+* Mon Oct 23 2006 Jose Pedro Oliveira  - 0.23-1
+- Update to 0.23.
+
 * Tue Jun 20 2006 Jose Pedro Oliveira  - 0.20-1
 - Update to 0.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Jun 2006 22:22:40 -0000	1.7
+++ sources	22 Nov 2006 17:10:47 -0000	1.8
@@ -1 +1 @@
-31b88af89c4966183bf6e95ca2b40050  HTTP-Server-Simple-0.20.tar.gz
+302f487fc5ae544529cc87784eccd89f  HTTP-Server-Simple-0.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:11:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:11:22 -0500
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.8,
	1.9 perl-HTTP-Server-Simple.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200611221711.kAMHBM9i020413@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20354/devel

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Oct 2006 12:48:40 -0000	1.8
+++ .cvsignore	22 Nov 2006 17:10:52 -0000	1.9
@@ -1 +1 @@
-HTTP-Server-Simple-0.23.tar.gz
+HTTP-Server-Simple-0.24.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-HTTP-Server-Simple.spec	23 Oct 2006 12:48:40 -0000	1.9
+++ perl-HTTP-Server-Simple.spec	22 Nov 2006 17:10:52 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.23
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q -n HTTP-Server-Simple-%{version}
-chmod a-x lib/HTTP/Server/*.pm
+chmod -c a-x lib/HTTP/Server/*.pm
 %{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' ex/sample_server
 
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.24-1
+- Update to 0.24.
+
 * Mon Oct 23 2006 Jose Pedro Oliveira  - 0.23-1
 - Update to 0.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Oct 2006 12:48:40 -0000	1.8
+++ sources	22 Nov 2006 17:10:52 -0000	1.9
@@ -1 +1 @@
-5d410b9585c4c09426a6d6d14d0af6b1  HTTP-Server-Simple-0.23.tar.gz
+302f487fc5ae544529cc87784eccd89f  HTTP-Server-Simple-0.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:13:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 12:13:08 -0500
Subject: rpms/cmucl/devel cmucl.spec,1.8,1.9
Message-ID: <200611221713.kAMHD8RB020579@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/cmucl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20560

Modified Files:
	cmucl.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter  19d-2
- move bootstrap sources outside of %ifarch block



Index: cmucl.spec
===================================================================
RCS file: /cvs/extras/rpms/cmucl/devel/cmucl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cmucl.spec	22 Nov 2006 16:47:57 -0000	1.8
+++ cmucl.spec	22 Nov 2006 17:12:38 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: CMU Common Lisp compiler
 Name: 	 cmucl
 Version: 19d
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: Public Domain/MIT
 Group: 	 Development/Languages
@@ -15,12 +15,12 @@
 ExclusiveArch: %{ix86}
 
 ## ix86 section
+Source10: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2
+Source11: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2.asc
 %ifarch %{ix86}
 %define cmucl_arch x86
 #define bootstrap cmucl 
 %if "%{?bootstrap}" == "%{nil}"
-Source10: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2
-Source11: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2.asc
 %define bootstrap_src -a 10 
 %else
 BuildRequires: cmucl 
@@ -199,6 +199,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Rex Dieter  19d-2
+- move bootstrap sources outside of %%ifarch block
+
 * Thu Nov 16 2006 Rex Dieter  19d-1
 - cmucl-19d
 



From fedora-extras-commits at redhat.com  Wed Nov 22 17:16:19 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:16:19 -0500
Subject: rpms/kleansweep - New directory
Message-ID: <200611221716.kAMHGJnF020666@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20662/kleansweep

Log Message:
Directory /cvs/extras/rpms/kleansweep added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 17:16:24 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:16:24 -0500
Subject: rpms/kleansweep/devel - New directory
Message-ID: <200611221716.kAMHGO9U020679@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20662/kleansweep/devel

Log Message:
Directory /cvs/extras/rpms/kleansweep/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 17:16:48 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:16:48 -0500
Subject: rpms/kleansweep Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221716.kAMHGm1r020709@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20703

Added Files:
	Makefile import.log 
Log Message:
Setup of module kleansweep


--- NEW FILE Makefile ---
# Top level Makefile for module kleansweep
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  Wed Nov 22 17:16:54 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:16:54 -0500
Subject: rpms/kleansweep/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611221716.kAMHGsNO020724@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20703/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kleansweep


--- 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 Nov 22 17:18:38 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:18:38 -0500
Subject: rpms/kleansweep import.log,1.1,1.2
Message-ID: <200611221718.kAMHIcV3020812@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20771

Modified Files:
	import.log 
Log Message:
auto-import kleansweep-0.2.9-3 on branch devel from kleansweep-0.2.9-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kleansweep/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 17:16:48 -0000	1.1
+++ import.log	22 Nov 2006 17:18:08 -0000	1.2
@@ -0,0 +1 @@
+kleansweep-0_2_9-3:HEAD:kleansweep-0.2.9-3.src.rpm:1164216223



From fedora-extras-commits at redhat.com  Wed Nov 22 17:18:38 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:18:38 -0500
Subject: rpms/kleansweep/devel kleansweep.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611221718.kAMHIcmM020818@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20771/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kleansweep.spec 
Log Message:
auto-import kleansweep-0.2.9-3 on branch devel from kleansweep-0.2.9-3.src.rpm


--- NEW FILE kleansweep.spec ---
Name:          kleansweep
Version:       0.2.9
Release:       3%{?dist}
Summary:       Reclaim disk space by finding unneeded files

License:       GPL
Group:         Applications/System
URL:           http://linux.bydg.org/~yogin/

Source:        http://linux.bydg.org/~yogin/kleansweep-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: kdelibs-devel, gettext, scons

%description
KleanSweep allows you to reclaim disk space by finding unneeded files. It
can search for files based on several criteria: you can seek for empty
files, backup files, broken symbolic links, dead menu entries, duplicated
files, orphaned files (files not found in the RPM database), and more.

%prep
%setup -q


%build
# disables rpath
sed -i 's|^env.KDEuse("environ rpath")|env.KDEuse("environ")|g' SConstruct

CFLAGS="$RPM_OPT_FLAGS"
export CFLAGS

scons %{?_smp_mflags}


%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install prefix=$RPM_BUILD_ROOT%{_prefix}

desktop-file-install --vendor ""             \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category "System"                    \
  --delete-original                          \
  $RPM_BUILD_ROOT%{_datadir}/applnk/System/kleansweep.desktop

%find_lang %{name}

%post
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:

%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING README THANKS TODO
%{_datadir}/apps/%{name}/
%{_datadir}/applications/kleansweep.desktop
%{_datadir}/icons/*/*/apps/kleansweep.png
%{_bindir}/kleansweep*


%Changelog
* Sun Nov 19 2006 Chitlesh Goorah  - 0.2.9-3
- using preferred value for the buildroot tag

* Sun Nov 19 2006 Chitlesh Goorah  - 0.2.9-2
- replaced %%{buildroot} by $$RPM_BUILD_ROOT

* Sat Nov 18 2006 Chitlesh Goorah  - 0.2.9-1
- Initial Package.

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kleansweep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 17:16:53 -0000	1.1
+++ .cvsignore	22 Nov 2006 17:18:08 -0000	1.2
@@ -0,0 +1 @@
+kleansweep-0.2.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kleansweep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 17:16:53 -0000	1.1
+++ sources	22 Nov 2006 17:18:08 -0000	1.2
@@ -0,0 +1 @@
+eb4530dc77fbe35ede8267e89275e5e9  kleansweep-0.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 17:26:09 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:26:09 -0500
Subject: owners owners.list,1.1992,1.1993
Message-ID: <200611221726.kAMHQ9JY020900@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20885/owners

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1992
retrieving revision 1.1993
diff -u -r1.1992 -r1.1993
--- owners.list	22 Nov 2006 15:41:34 -0000	1.1992
+++ owners.list	22 Nov 2006 17:25:39 -0000	1.1993
@@ -821,6 +821,7 @@
 Fedora Extras|kismet|WLAN detector, sniffer and IDS|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|kita|2ch client for KDE|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|klamav|Clam Anti-Virus on the KDE Desktop|andy at smile.org.ua|extras-qa at fedoraproject.org|
+Fedora Extras|kleansweep|Reclaim disk space by finding unneeded files|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kmenu-gnome|K Menu with Gnome directory|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kmobiletools|Make your mobile phone communicate with your PC|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kmymoney2|Personal finance|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 17:27:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 12:27:48 -0500
Subject: rpms/perl-Gnome2-Print/devel perl-Gnome2-Print.spec,1.2,1.3
Message-ID: <200611221727.kAMHRmUT020925@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20905

Modified Files:
	perl-Gnome2-Print.spec 
Log Message:
one word spelling fix :)



Index: perl-Gnome2-Print.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/devel/perl-Gnome2-Print.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Gnome2-Print.spec	22 Nov 2006 15:43:43 -0000	1.2
+++ perl-Gnome2-Print.spec	22 Nov 2006 17:27:18 -0000	1.3
@@ -21,7 +21,7 @@
 applications written using the gtk2-perl wrapper. The GNOME Print libraries
 (also known as libgnomeprint and libgnomeprintui) allow you to create
 printable documents (using various frontends) and offer standard widgets in
-order to mainatin a UI consistent for all GNOME applications.
+order to maintain a UI consistent for all GNOME applications.
 
 %prep
 %setup -q -n Gnome2-Print-%{version}



From fedora-extras-commits at redhat.com  Wed Nov 22 17:49:02 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 12:49:02 -0500
Subject: rpms/panelfm/devel .cvsignore, 1.2, 1.3 panelfm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611221749.kAMHn20j024884@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24865

Modified Files:
	.cvsignore panelfm.spec sources 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 14:20:30 -0000	1.2
+++ .cvsignore	22 Nov 2006 17:48:32 -0000	1.3
@@ -1 +1 @@
-panelfm.tar.gz
+panelfm-v1.2.tar.gz


Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/panelfm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- panelfm.spec	11 Nov 2006 14:20:30 -0000	1.1
+++ panelfm.spec	22 Nov 2006 17:48:32 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           panelfm
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
 License:        GPL
 URL:            http://panelfm.sourceforge.net/
-Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}.tar.gz
+Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}-v%{version}.tar.gz
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel
@@ -28,6 +28,9 @@
    -e '/^LDFLAGS/s|^\(.*\)$|\1\n\nCFLAGS += $(OPTFLAGS)|' \
    makefile
 
+# Oh!!
+%{__make} clean
+
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
 
@@ -61,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
+- 1.2
+
 * Fri Nov 10 2006 Mamoru Tasaka  - 1.1-2
 - Change BuildRoot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 14:20:30 -0000	1.2
+++ sources	22 Nov 2006 17:48:32 -0000	1.3
@@ -1 +1 @@
-5a18f0beba718d6efaace22ed13c1b9e  panelfm.tar.gz
+60416a8534fd31403ac85bf69eb4897f  panelfm-v1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:50:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 12:50:41 -0500
Subject: rpms/panelfm/FC-6 .cvsignore, 1.2, 1.3 panelfm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611221750.kAMHof71024922@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24901

Modified Files:
	.cvsignore panelfm.spec sources 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 14:20:30 -0000	1.2
+++ .cvsignore	22 Nov 2006 17:50:11 -0000	1.3
@@ -1 +1 @@
-panelfm.tar.gz
+panelfm-v1.2.tar.gz


Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-6/panelfm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- panelfm.spec	11 Nov 2006 14:20:30 -0000	1.1
+++ panelfm.spec	22 Nov 2006 17:50:11 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           panelfm
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
 License:        GPL
 URL:            http://panelfm.sourceforge.net/
-Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}.tar.gz
+Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}-v%{version}.tar.gz
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel
@@ -28,6 +28,9 @@
    -e '/^LDFLAGS/s|^\(.*\)$|\1\n\nCFLAGS += $(OPTFLAGS)|' \
    makefile
 
+# Oh!!
+%{__make} clean
+
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
 
@@ -61,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
+- 1.2
+
 * Fri Nov 10 2006 Mamoru Tasaka  - 1.1-2
 - Change BuildRoot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 14:20:30 -0000	1.2
+++ sources	22 Nov 2006 17:50:11 -0000	1.3
@@ -1 +1 @@
-5a18f0beba718d6efaace22ed13c1b9e  panelfm.tar.gz
+60416a8534fd31403ac85bf69eb4897f  panelfm-v1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:51:43 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 12:51:43 -0500
Subject: rpms/farsight/devel .cvsignore, 1.2, 1.3 farsight.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611221751.kAMHphBb024990@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/farsight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24944

Modified Files:
	.cvsignore farsight.spec sources 
Log Message:
* Wed Nov 22 2006 Brian Pepple  - 0.1.10-1
- Update to 0.1.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/farsight/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Sep 2006 02:42:08 -0000	1.2
+++ .cvsignore	22 Nov 2006 17:51:13 -0000	1.3
@@ -1 +1 @@
-farsight-0.1.8.tar.gz
+farsight-0.1.10.tar.gz


Index: farsight.spec
===================================================================
RCS file: /cvs/extras/rpms/farsight/devel/farsight.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- farsight.spec	4 Oct 2006 22:22:19 -0000	1.2
+++ farsight.spec	22 Nov 2006 17:51:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		farsight
-Version:	0.1.8
-Release:	3%{?dist}
+Version:	0.1.10
+Release:	1%{?dist}
 Summary:	A audio/video conferencing framework
 
 Group:		System Environment/Libraries
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Brian Pepple  - 0.1.10-1
+- Update to 0.1.10.
+
 * Thu Oct 05 2006 Christian Iseli  0.1.8-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/farsight/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Sep 2006 02:42:08 -0000	1.2
+++ sources	22 Nov 2006 17:51:13 -0000	1.3
@@ -1 +1 @@
-68daa710087201064680fd02c8a4951a  farsight-0.1.8.tar.gz
+e908f1d121cbd55f619241a8f7dee0f7  farsight-0.1.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:51:57 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 12:51:57 -0500
Subject: rpms/panelfm/FC-5 .cvsignore, 1.2, 1.3 panelfm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611221751.kAMHpv0Q024999@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24969

Modified Files:
	.cvsignore panelfm.spec sources 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 14:20:30 -0000	1.2
+++ .cvsignore	22 Nov 2006 17:51:27 -0000	1.3
@@ -1 +1 @@
-panelfm.tar.gz
+panelfm-v1.2.tar.gz


Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-5/panelfm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- panelfm.spec	11 Nov 2006 14:20:30 -0000	1.1
+++ panelfm.spec	22 Nov 2006 17:51:27 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           panelfm
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
 License:        GPL
 URL:            http://panelfm.sourceforge.net/
-Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}.tar.gz
+Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}-v%{version}.tar.gz
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel
@@ -28,6 +28,9 @@
    -e '/^LDFLAGS/s|^\(.*\)$|\1\n\nCFLAGS += $(OPTFLAGS)|' \
    makefile
 
+# Oh!!
+%{__make} clean
+
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
 
@@ -61,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
+- 1.2
+
 * Fri Nov 10 2006 Mamoru Tasaka  - 1.1-2
 - Change BuildRoot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 14:20:30 -0000	1.2
+++ sources	22 Nov 2006 17:51:27 -0000	1.3
@@ -1 +1 @@
-5a18f0beba718d6efaace22ed13c1b9e  panelfm.tar.gz
+60416a8534fd31403ac85bf69eb4897f  panelfm-v1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:59:05 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 12:59:05 -0500
Subject: rpms/telepathy-butterfly/FC-6 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 telepathy-butterfly.spec, 1.3, 1.4
Message-ID: <200611221759.kAMHx5kw025262@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25243

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Wed Nov 22 2006 Brian Pepple  - 0.1.3-1
- Update to 0.1.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Oct 2006 17:07:49 -0000	1.4
+++ .cvsignore	22 Nov 2006 17:58:35 -0000	1.5
@@ -1 +1 @@
-telepathy-butterfly-0.1.2.tar.gz
+telepathy-butterfly-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2006 17:07:49 -0000	1.4
+++ sources	22 Nov 2006 17:58:35 -0000	1.5
@@ -1 +1 @@
-e52f238d9716b45961d28b424a9c0e6e  telepathy-butterfly-0.1.2.tar.gz
+288494daa096eeb685d57bdad8bc5b5f  telepathy-butterfly-0.1.3.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-6/telepathy-butterfly.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-butterfly.spec	8 Oct 2006 17:07:49 -0000	1.3
+++ telepathy-butterfly.spec	22 Nov 2006 17:58:35 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Brian Pepple  - 0.1.3-1
+- Update to 0.1.3.
+
 * Sun Oct  8 2006 Brian Pepple  - 0.1.2-1
 - Update to 0.1.2.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:00:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 13:00:34 -0500
Subject: owners owners.list,1.1993,1.1994
Message-ID: <200611221800.kAMI0YLu025342@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25268

Modified Files:
	owners.list 
Log Message:
koffice: +rdieter CC: 
qscintilla: fix CC typo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1993
retrieving revision 1.1994
diff -u -r1.1993 -r1.1994
--- owners.list	22 Nov 2006 17:25:39 -0000	1.1993
+++ owners.list	22 Nov 2006 18:00:04 -0000	1.1994
@@ -829,7 +829,7 @@
 Fedora Extras|knetstats|Network monitor in KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|knetworkmanager|KDE applet for Network Manager|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|koan|Client side provisioning app for cobbler|mdehaan at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|rdieter at math.unl.edu,extras-qa at fedoraproject.org|
 Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
@@ -2035,7 +2035,7 @@
 Fedora Extras|qjackctl|Qt based JACK control application|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org|icon at fedoraproject.org
+Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org,icon at fedoraproject.org|
 Fedora Extras|qstat|Real-time Game Server Status for FPS game servers|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|qsynth|Qt based Fluidsynth GUI front end|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 18:17:43 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 13:17:43 -0500
Subject: rpms/panelfm/devel panelfm.spec,1.2,1.3
Message-ID: <200611221817.kAMIHh0C028450@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28418

Modified Files:
	panelfm.spec 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
- Bump



Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/panelfm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- panelfm.spec	22 Nov 2006 17:48:32 -0000	1.2
+++ panelfm.spec	22 Nov 2006 18:17:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           panelfm
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
@@ -64,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
+- Bump
+
 * Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
 - 1.2
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:18:46 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 13:18:46 -0500
Subject: rpms/panelfm/FC-6 panelfm.spec,1.2,1.3
Message-ID: <200611221818.kAMIIkjm028532@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28491

Modified Files:
	panelfm.spec 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
- Bump



Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-6/panelfm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- panelfm.spec	22 Nov 2006 17:50:11 -0000	1.2
+++ panelfm.spec	22 Nov 2006 18:18:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           panelfm
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
@@ -64,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
+- Bump
+
 * Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
 - 1.2
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:18:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 13:18:53 -0500
Subject: rpms/openct/devel openct.spec,1.21,1.22
Message-ID: <200611221818.kAMIIr16028544@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28512

Modified Files:
	openct.spec 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-2
- Don't run autotools during build.



Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openct.spec	22 Nov 2006 16:09:20 -0000	1.21
+++ openct.spec	22 Nov 2006 18:18:23 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           openct
 Version:        0.6.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -16,7 +16,6 @@
 BuildRequires:  pcsc-lite-devel >= 1.3.0
 BuildRequires:  libusb-devel
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  libtool
 Requires:       %{_libdir}/ctapi
 # TODO: verify minimum udev version
 Requires:       udev >= 062
@@ -55,7 +54,7 @@
 
 %prep
 %setup -q
-sh bootstrap # avoid standard rpaths on lib64 archs
+sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure # lib64 std rpaths
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
 
 
@@ -159,6 +158,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-2
+- Don't run autotools during build.
+
 * Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
 - 0.6.11.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:18:57 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:18:57 -0500
Subject: rpms/gliv - New directory
Message-ID: <200611221818.kAMIIvfl028555@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28551/gliv

Log Message:
Directory /cvs/extras/rpms/gliv added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 18:19:02 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:19:02 -0500
Subject: rpms/gliv/devel - New directory
Message-ID: <200611221819.kAMIJ2SO028602@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28551/gliv/devel

Log Message:
Directory /cvs/extras/rpms/gliv/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 18:19:28 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:19:28 -0500
Subject: rpms/gliv Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221819.kAMIJSZP028715@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28707

Added Files:
	Makefile import.log 
Log Message:
Setup of module gliv


--- NEW FILE Makefile ---
# Top level Makefile for module gliv
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  Wed Nov 22 18:19:34 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:19:34 -0500
Subject: rpms/gliv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611221819.kAMIJY4m028734@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28707/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gliv


--- 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 Nov 22 18:20:56 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:20:56 -0500
Subject: rpms/gliv import.log,1.1,1.2
Message-ID: <200611221820.kAMIKuMN028828@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28791

Modified Files:
	import.log 
Log Message:
auto-import gliv-1.9.6-2 on branch devel from gliv-1.9.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gliv/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 18:19:28 -0000	1.1
+++ import.log	22 Nov 2006 18:20:26 -0000	1.2
@@ -0,0 +1 @@
+gliv-1_9_6-2:HEAD:gliv-1.9.6-2.src.rpm:1164219639



From fedora-extras-commits at redhat.com  Wed Nov 22 18:20:56 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:20:56 -0500
Subject: rpms/gliv/devel gliv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611221821.kAMIKuaR028832@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28791/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gliv.spec 
Log Message:
auto-import gliv-1.9.6-2 on branch devel from gliv-1.9.6-2.src.rpm


--- NEW FILE gliv.spec ---
# $Id: gliv.spec 3051 2005-03-24 14:59:59Z dag $
# Authority: dag
# Upstream: Guillaume Chazarain 

Summary:	Image viewing utility
Name:		gliv
Version:	1.9.6
Release:	2%{?dist}
License:	GPL
Group:		Applications/Multimedia
URL:		http://guichaz.free.fr/gliv/
Source:		http://guichaz.free.fr/gliv/files/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: gtkglext-devel >= 0.7.0
BuildRequires: desktop-file-utils

%description
GLiv is an OpenGL image viewer. GLiv is very fast and smooth at rotating,
panning and zooming if you have an OpenGL accelerated graphics board.

%prep
%setup -q

%{__cat} <gliv.desktop
[Desktop Entry]
Name=Gliv Image Viewer
Comment=View images fast and smoothly
Exec=gliv
Icon=gliv.png
Terminal=false
Type=Application
MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-bmp;image/png;image/x-tiff;image/x-tga;
Categories=GNOME;Graphics;
EOF

%{__cat} <gliv.applications
gliv
	command=gliv
	name=Gliv Image Viewer
	can_open_multiple_files=true
	expects_uris=no
	requires_terminal=false
	all_gnome_vfs_schemes_supported=yes
	uses_gnomevfs=true
	startup_notify=true
	mime_types=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-bmp;image/png;image/x-tiff;image/x-tga;
EOF


%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install
%find_lang %{name}

%{__install} -Dp -m0644 gliv.applications %{buildroot}%{_datadir}/application-registry/gliv.applications

%{__install} -Dp -m0644 gliv.png %{buildroot}%{_datadir}/pixmaps/gliv.png

%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
desktop-file-install \
	--vendor fedora \
	--dir %{buildroot}%{_datadir}/applications \
	gliv.desktop

%clean
%{__rm} -rf %{buildroot}

%post
update-desktop-database &> /dev/null ||:

%postun
update-desktop-database &> /dev/null ||:

%files -f %{name}.lang
%defattr(-, root, root, -)
%doc COPYING NEWS README THANKS
%{_mandir}/man1/gliv.1*
%{_mandir}/*/man1/gliv.1*
%{_bindir}/gliv
%{_datadir}/applications/*-gliv.desktop
%{_datadir}/application-registry/gliv.applications
%{_datadir}/pixmaps/gliv.png

%changelog

* Wed Nov 22 2006 Peter Lemenkov  1.9.6-2
- Spec cleanup

* Wed Nov 22 2006 Peter Lemenkov  1.9.6-1
- Upgrade to ver. 1.9.6
- Missing BR added

* Tue Nov 21 2006 Peter Lemenkov  1.9.5-2
- Little cleanups in spec file

* Sun May 28 2006 Adrien BUSTANY  - 1.9.5-1
- Updated to release 1.9.5

* Fri May 27 2005 Dag Wieers  - 1.9.3-1 - 3051+/dag
- Updated to release 1.9.3.

* Tue Mar 22 2005 Dag Wieers  - 1.9.2-1
- Updated to release 1.9.2.

* Wed Jan 05 2005 Dag Wieers  - 1.9.1-1
- Updated to release 1.9.1.

* Thu Aug 05 2004 Dag Wieers  - 1.8.4-1
- Updated to release 1.8.4.

* Thu Jun 24 2004 Dag Wieers  - 1.8.3-1
- Updated to release 1.8.3.

* Sat Feb 07 2004 Dag Wieers  - 1.8.1-0
- Updated to release 1.8.1.

* Sat Jan 24 2004 Dag Wieers  - 1.8-0
- Initial package. (using DAR)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gliv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 18:19:34 -0000	1.1
+++ .cvsignore	22 Nov 2006 18:20:26 -0000	1.2
@@ -0,0 +1 @@
+gliv-1.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gliv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 18:19:34 -0000	1.1
+++ sources	22 Nov 2006 18:20:26 -0000	1.2
@@ -0,0 +1 @@
+e51838ed643f3af5143a20a12f432b9d  gliv-1.9.6.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 18:23:02 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Wed, 22 Nov 2006 13:23:02 -0500
Subject: rpms/zope/FC-6 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 zope.spec,
	1.26, 1.27 zope-2.8.3-pythonwarning.patch, 1.1, NONE
Message-ID: <200611221823.kAMIN2Y9028910@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878

Modified Files:
	.cvsignore sources zope.spec 
Removed Files:
	zope-2.8.3-pythonwarning.patch 
Log Message:
Updated to 2.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Aug 2006 11:41:41 -0000	1.13
+++ .cvsignore	22 Nov 2006 18:22:32 -0000	1.14
@@ -1 +1 @@
-Zope-2.9.4-final.tgz
+Zope-2.9.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Aug 2006 11:41:41 -0000	1.13
+++ sources	22 Nov 2006 18:22:32 -0000	1.14
@@ -1 +1 @@
-7d7ffe62eabc84d0c438e450e344c29f  Zope-2.9.4-final.tgz
+17cd06a6974dbdd0e4982a343b79fb00  Zope-2.9.5-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- zope.spec	22 Nov 2006 04:52:42 -0000	1.26
+++ zope.spec	22 Nov 2006 18:22:32 -0000	1.27
@@ -12,13 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.4
-Release: 3%{?dist}
+Version: 2.9.5
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,7 +27,6 @@
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
-Patch1:  zope-2.8.3-pythonwarning.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -46,18 +44,11 @@
 After starting Zope, you can access it by pointing your browser to
 http://localhost:8080
 
-WARNING: this zope package has been built on python 2.4.X, which is not
-supported ! Do not file bugreports or ask for support on zope.org if you
-choose to use this package.
-
-
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
-# Warning on the default index_html about python 2.4 & zope 2.8
-#%patch1 -p1 -b .pythonwarning
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -188,8 +179,10 @@
 %attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
 
 
-
 %changelog
+* Tue Nov 22 2006 Jonathan Steffan  2.9.5-1
+- Updated to 2.9.5 and removed not needed patches
+
 * Tue Nov 21 2006 Jonathan Steffan  2.9.4-3
 - Removed Five from zope package (plone 2.5.1 now provides the needed
   version.)


--- zope-2.8.3-pythonwarning.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 18:26:32 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:26:32 -0500
Subject: owners owners.list,1.1994,1.1995
Message-ID: <200611221826.kAMIQWgk028948@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28932

Modified Files:
	owners.list 
Log Message:
Gliv added


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -r1.1994 -r1.1995
--- owners.list	22 Nov 2006 18:00:04 -0000	1.1994
+++ owners.list	22 Nov 2006 18:26:02 -0000	1.1995
@@ -554,6 +554,7 @@
 Fedora Extras|Glide3-libGL|Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|glipper|Glipper is a simple Clipboardmanager for the GNOME Desktop Environment|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|glitz|OpenGL image compositing library|work.eric at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|gliv|Image viewing utility|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|glom|Database Designer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 18:28:32 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 13:28:32 -0500
Subject: rpms/gdl/devel gdl-0.9pre3-const.patch,NONE,1.1 gdl.spec,1.19,1.20
Message-ID: <200611221828.kAMISWot029022@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29000

Modified Files:
	gdl.spec 
Added Files:
	gdl-0.9pre3-const.patch 
Log Message:
Add patch to fix some typing issues


gdl-0.9pre3-const.patch:

--- NEW FILE gdl-0.9pre3-const.patch ---
--- gdl-0.9pre3/src/ncdf_att_cl.cpp.const	2006-11-22 10:15:39.000000000 -0700
+++ gdl-0.9pre3/src/ncdf_att_cl.cpp	2006-11-22 10:16:59.000000000 -0700
@@ -237,7 +237,7 @@
 	    ncdf_att_handle_error(e,status,"NCDF_ATTGET",ip);
 
 
-	    dimension dim((size_t *) &length, (size_t) 1);
+	    dimension dim((const SizeT *) &length, (SizeT) 1);
 	    DLongGDL* temp=new DLongGDL(dim, BaseGDL::NOZERO);
 	    memcpy(&(*temp)[0],&(*ip),length*sizeof(int));	      
 	    delete ip;
@@ -255,7 +255,7 @@
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",sp);
 	  
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DIntGDL* temp=new DIntGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*sp),length*sizeof(short));	      
@@ -277,7 +277,7 @@
 	    ncdf_att_handle_error(e,status,"NCDF_ATTGET",fp);
 
 
-	    dimension dim((size_t *) &length, (size_t) 1);
+	    dimension dim((const SizeT *) &length, (SizeT) 1);
 	    DFloatGDL* temp=new DFloatGDL(dim, BaseGDL::NOZERO);
 
 	    memcpy(&(*temp)[0],&(*fp),length*sizeof(float));	      
@@ -299,7 +299,7 @@
 	  
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",dp);
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DDoubleGDL* temp=new DDoubleGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*dp),length*sizeof(double));	      	 
@@ -339,7 +339,7 @@
 	  
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",bp);
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DByteGDL* temp=new DByteGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*bp),length*sizeof(unsigned char));	      	 
--- gdl-0.9pre3/src/ncdf_var_cl.cpp.const	2006-11-22 07:34:57.000000000 -0700
+++ gdl-0.9pre3/src/ncdf_var_cl.cpp	2006-11-22 10:46:03.000000000 -0700
@@ -161,7 +161,7 @@
     DStructGDL* inq=new DStructGDL(ncdf_varinq);
     inq->InitTag("NAME",DStringGDL(var_name));
 
-    dimension dim((size_t *) &var_ndims, (size_t) 1);
+    dimension dim((const SizeT *) &var_ndims, (SizeT) 1);
     DULongGDL* dims_res = new DULongGDL(dim, BaseGDL::NOZERO);
     for( size_t i=0; i

Author: orion

Update of /cvs/extras/rpms/gdl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29090

Modified Files:
	.cvsignore gdl.spec sources 
Added Files:
	gdl-0.9pre3-const.patch 
Removed Files:
	gdl-0.9pre2-specialization.patch 
Log Message:
Update to 0.9pre3


gdl-0.9pre3-const.patch:

--- NEW FILE gdl-0.9pre3-const.patch ---
--- gdl-0.9pre3/src/ncdf_att_cl.cpp.const	2006-11-22 10:15:39.000000000 -0700
+++ gdl-0.9pre3/src/ncdf_att_cl.cpp	2006-11-22 10:16:59.000000000 -0700
@@ -237,7 +237,7 @@
 	    ncdf_att_handle_error(e,status,"NCDF_ATTGET",ip);
 
 
-	    dimension dim((size_t *) &length, (size_t) 1);
+	    dimension dim((const SizeT *) &length, (SizeT) 1);
 	    DLongGDL* temp=new DLongGDL(dim, BaseGDL::NOZERO);
 	    memcpy(&(*temp)[0],&(*ip),length*sizeof(int));	      
 	    delete ip;
@@ -255,7 +255,7 @@
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",sp);
 	  
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DIntGDL* temp=new DIntGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*sp),length*sizeof(short));	      
@@ -277,7 +277,7 @@
 	    ncdf_att_handle_error(e,status,"NCDF_ATTGET",fp);
 
 
-	    dimension dim((size_t *) &length, (size_t) 1);
+	    dimension dim((const SizeT *) &length, (SizeT) 1);
 	    DFloatGDL* temp=new DFloatGDL(dim, BaseGDL::NOZERO);
 
 	    memcpy(&(*temp)[0],&(*fp),length*sizeof(float));	      
@@ -299,7 +299,7 @@
 	  
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",dp);
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DDoubleGDL* temp=new DDoubleGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*dp),length*sizeof(double));	      	 
@@ -339,7 +339,7 @@
 	  
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",bp);
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DByteGDL* temp=new DByteGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*bp),length*sizeof(unsigned char));	      	 
--- gdl-0.9pre3/src/ncdf_var_cl.cpp.const	2006-11-22 07:34:57.000000000 -0700
+++ gdl-0.9pre3/src/ncdf_var_cl.cpp	2006-11-22 10:46:03.000000000 -0700
@@ -161,7 +161,7 @@
     DStructGDL* inq=new DStructGDL(ncdf_varinq);
     inq->InitTag("NAME",DStringGDL(var_name));
 
-    dimension dim((size_t *) &var_ndims, (size_t) 1);
+    dimension dim((const SizeT *) &var_ndims, (SizeT) 1);
     DULongGDL* dims_res = new DULongGDL(dim, BaseGDL::NOZERO);
     for( size_t i=0; i - 0.9-0.pre3.2
+- Update to 0.9pre3
+
 * Wed Oct  3 2006 - Orion Poplawski  - 0.9-0.pre3.1
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdl/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 22:22:18 -0000	1.5
+++ sources	22 Nov 2006 18:31:11 -0000	1.6
@@ -1 +1 @@
-41a3a2184dad0292affe090e146308ca  gdl-0.9pre2.tar.gz
+0bf35ded3b585507c021f8292ad6f611  gdl-0.9pre3.tar.gz


--- gdl-0.9pre2-specialization.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 18:37:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 13:37:22 -0500
Subject: rpms/panelfm/FC-5 panelfm-1.2-remove-header.patch, NONE,
	1.1 panelfm.spec, 1.2, 1.3
Message-ID: <200611221837.kAMIbMxq029241@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29223

Modified Files:
	panelfm.spec 
Added Files:
	panelfm-1.2-remove-header.patch 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
- Remove unnecessary header file use.


panelfm-1.2-remove-header.patch:

--- NEW FILE panelfm-1.2-remove-header.patch ---
--- panelfm.c.header	2006-11-15 21:29:26.000000000 +0900
+++ panelfm.c	2006-11-23 03:33:00.000000000 +0900
@@ -38,7 +38,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "panelfm.xpm"
 
 #define     MAX_BUF   1024


Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-5/panelfm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- panelfm.spec	22 Nov 2006 17:51:27 -0000	1.2
+++ panelfm.spec	22 Nov 2006 18:36:51 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           panelfm
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
 License:        GPL
 URL:            http://panelfm.sourceforge.net/
 Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}-v%{version}.tar.gz
+Patch0:		panelfm-1.2-remove-header.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q -n PanelFM
+%patch0 -p0 -b .header
 
 %{__sed} -i.local \
    -e 's|%{_prefix}/local|%{_prefix}|g' \
@@ -64,6 +66,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
+- Remove unnecessary header file use.
+
 * Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
 - 1.2
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:40:59 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Wed, 22 Nov 2006 13:40:59 -0500
Subject: rpms/glipper/FC-5 glipper.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <200611221840.kAMIexlq029312@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29289

Modified Files:
	glipper.spec sources 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/glipper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glipper.spec	14 Nov 2006 17:39:42 -0000	1.5
+++ glipper.spec	22 Nov 2006 18:40:29 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           glipper
-Version:        0.95
+Version:        0.95.1
 Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils, libgnome-devel
 
 
 %description
@@ -47,6 +47,15 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-2
+- Add libgnome-devel in BR
+
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-1
+- Upgrade to 0.95.1
+
+* Sun Nov 18 2006 Damien Durand  - 0.95-3
+- Add glade2-devel in BR
+
 * Tue Nov 14 2006 Damien Durand  - 0.95-2
 - Add gnome-doc-utils in BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2006 20:14:35 -0000	1.3
+++ sources	22 Nov 2006 18:40:29 -0000	1.4
@@ -1 +1 @@
-d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz
+aa6524f59342d72fee8bed36e6267746  glipper-0.95.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 18:42:59 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Wed, 22 Nov 2006 13:42:59 -0500
Subject: rpms/glipper/FC-6 glipper.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200611221842.kAMIgx4U029373@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356

Modified Files:
	glipper.spec sources 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/glipper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glipper.spec	14 Nov 2006 17:38:00 -0000	1.6
+++ glipper.spec	22 Nov 2006 18:42:29 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           glipper
-Version:        0.95
+Version:        0.95.1
 Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils, libgnome-devel
 
 
 %description
@@ -47,6 +47,15 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-2
+- Add libgnome-devel in BR
+
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-1
+- Upgrade to 0.95.1
+
+* Sun Nov 18 2006 Damien Durand  - 0.95-3
+- Add glade2-devel in BR
+
 * Tue Nov 14 2006 Damien Durand  - 0.95-2
 - Add gnome-doc-utils in BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2006 20:13:07 -0000	1.3
+++ sources	22 Nov 2006 18:42:29 -0000	1.4
@@ -1 +1 @@
-d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz
+aa6524f59342d72fee8bed36e6267746  glipper-0.95.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:11:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 22 Nov 2006 14:11:48 -0500
Subject: rpms/bsd-games/devel bsd-games.spec,1.8,1.9 config.params,1.3,1.4
Message-ID: <200611221911.kAMJBmIO032546@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32529

Modified Files:
	bsd-games.spec config.params 
Log Message:
Drop the useless 'wargames' non-game.




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bsd-games.spec	15 Oct 2006 05:17:22 -0000	1.8
+++ bsd-games.spec	22 Nov 2006 19:11:18 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -30,7 +30,7 @@
 bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku,
 hunt, mille, mpoly, morse, number, phantasia, pig, pom, ppt, primes,
 quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon,
-tetris-bsd, trek, wargames, worm, worms and wump.
+tetris-bsd, trek, worm, worms and wump.
 
 %prep
 %setup -q
@@ -134,7 +134,6 @@
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
 %{_bindir}/vert-banner
-%{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
 %{_bindir}/wtf
@@ -161,6 +160,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Nov 18 2006 Wart  2.17-16
+- Drop the useless game 'wargames'
+
 * Sat Oct 14 2006 Wart  2.17-15
 - Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
 


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/config.params,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.params	15 Oct 2006 05:17:22 -0000	1.3
+++ config.params	22 Nov 2006 19:11:18 -0000	1.4
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune wargames"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@



From fedora-extras-commits at redhat.com  Wed Nov 22 19:12:47 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 22 Nov 2006 14:12:47 -0500
Subject: owners owners.list,1.1995,1.1996
Message-ID: <200611221912.kAMJCl3o032610@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32552

Modified Files:
	owners.list 
Log Message:
Grrr, Rex! ;-)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1995
retrieving revision 1.1996
diff -u -r1.1995 -r1.1996
--- owners.list	22 Nov 2006 18:26:02 -0000	1.1995
+++ owners.list	22 Nov 2006 19:12:17 -0000	1.1996
@@ -830,7 +830,7 @@
 Fedora Extras|knetstats|Network monitor in KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|knetworkmanager|KDE applet for Network Manager|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|koan|Client side provisioning app for cobbler|mdehaan at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|rdieter at math.unl.edu,extras-qa at fedoraproject.org|
+Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|rdieter at math.unl.edu
 Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
@@ -2036,7 +2036,7 @@
 Fedora Extras|qjackctl|Qt based JACK control application|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org,icon at fedoraproject.org|
+Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org|icon at fedoraproject.org
 Fedora Extras|qstat|Real-time Game Server Status for FPS game servers|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|qsynth|Qt based Fluidsynth GUI front end|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 19:30:09 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:30:09 -0500
Subject: rpms/fuse import.log,1.9,1.10
Message-ID: <200611221930.kAMJU9BC000306@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-6 from fuse-2.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	11 Nov 2006 06:14:35 -0000	1.9
+++ import.log	22 Nov 2006 19:29:39 -0000	1.10
@@ -6,3 +6,4 @@
 fuse-2_5_3-1:FC-4:fuse-2.5.3-1.src.rpm:1146646544
 fuse-2_5_3-1:FC-5:fuse-2.5.3-1.src.rpm:1146646666
 fuse-2_6_0-1:HEAD:fuse-2.6.0-1.src.rpm:1163225659
+fuse-2_6_0-1:FC-6:fuse-2.6.0-1.src.rpm:1164223780



From fedora-extras-commits at redhat.com  Wed Nov 22 19:30:09 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:30:09 -0500
Subject: rpms/fuse/FC-6 .cvsignore, 1.6, 1.7 fuse-udev_rules.patch, 1.6,
	1.7 fuse.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200611221930.kAMJU9ft000315@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/FC-6

Modified Files:
	.cvsignore fuse-udev_rules.patch fuse.spec sources 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-6 from fuse-2.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 May 2006 08:54:29 -0000	1.6
+++ .cvsignore	22 Nov 2006 19:29:39 -0000	1.7
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse-udev_rules.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse-udev_rules.patch	29 Oct 2006 19:30:31 -0000	1.6
+++ fuse-udev_rules.patch	22 Nov 2006 19:29:39 -0000	1.7
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fuse.spec	29 Oct 2006 19:30:31 -0000	1.13
+++ fuse.spec	22 Nov 2006 19:29:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov  2.5.3-5
 - Fixed udev-rule again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 May 2006 08:54:29 -0000	1.6
+++ sources	22 Nov 2006 19:29:39 -0000	1.7
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:35:10 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:35:10 -0500
Subject: rpms/beryl-manager/devel beryl-manager.desktop, NONE,
	1.1 beryl-manager.svg, NONE, 1.1 beryl-manager.spec, 1.1, 1.2
Message-ID: <200611221935.kAMJZAks000478@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv421

Modified Files:
	beryl-manager.spec 
Added Files:
	beryl-manager.desktop beryl-manager.svg 
Log Message:
trimmed BR: and added desktop file


--- NEW FILE beryl-manager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beryl Manager
Comment=Manage Beryl
Icon=/usr/share/pixmaps/beryl-manager.svg
Exec=beryl-manager
Terminal=false
Type=Application
Categories=Settings;
MimeType=application/x-beryl-manager;



--- NEW FILE beryl-manager.svg ---



  
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
      
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
  
  
    
      
        image/svg+xml
        
      
    
  
  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-manager.spec	15 Nov 2006 21:11:15 -0000	1.1
+++ beryl-manager.spec	22 Nov 2006 19:34:40 -0000	1.2
@@ -3,11 +3,13 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        2%{?dist}
+Release:        3%{?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.svg
+Source2:        beryl-manager.desktop
 Patch0:         beryl-manager-0.1.1-pidof.patch
 
 # libdrm is not available on these arches
@@ -16,8 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  libtool, gettext-devel
-BuildRequires:  dbus-glib, dbus-devel, intltool, perl-XML-Parser
+BuildRequires:  perl-XML-Parser, gettext-devel
 
 
 %description
@@ -36,9 +37,6 @@
 %setup -q
 # Use absolute path to pidof, not in most users' $PATH
 %patch0 -p1 -b .pidof
-#autoreconf -v --install
-#glib-gettextize --copy --force
-#intltoolize --automake --copy --force
 
 
 %build
@@ -49,6 +47,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+desktop-file-install --vendor fedora \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category X-Fedora %{SOURCE2}
 %find_lang %{name}
 
 
@@ -56,15 +58,31 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/beryl-manager
 %{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*.svg
+%{_datadir}/applications/*.desktop
 %{_mandir}/man1/beryl-manager.1.gz
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-4
+- Add desktop file
+- Trim BR:
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-2
 - Use upstream tarball, now that there is one
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:35:24 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:35:24 -0500
Subject: rpms/fuse import.log,1.10,1.11
Message-ID: <200611221935.kAMJZOaX000484@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv447

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-5 from fuse-2.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	22 Nov 2006 19:29:39 -0000	1.10
+++ import.log	22 Nov 2006 19:34:54 -0000	1.11
@@ -7,3 +7,4 @@
 fuse-2_5_3-1:FC-5:fuse-2.5.3-1.src.rpm:1146646666
 fuse-2_6_0-1:HEAD:fuse-2.6.0-1.src.rpm:1163225659
 fuse-2_6_0-1:FC-6:fuse-2.6.0-1.src.rpm:1164223780
+fuse-2_6_0-1:FC-5:fuse-2.6.0-1.src.rpm:1164224103



From fedora-extras-commits at redhat.com  Wed Nov 22 19:35:25 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:35:25 -0500
Subject: rpms/fuse/FC-5 .cvsignore, 1.6, 1.7 fuse-udev_rules.patch, 1.6,
	1.7 fuse.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200611221935.kAMJZPDo000493@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv447/FC-5

Modified Files:
	.cvsignore fuse-udev_rules.patch fuse.spec sources 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-5 from fuse-2.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 May 2006 08:58:07 -0000	1.6
+++ .cvsignore	22 Nov 2006 19:34:55 -0000	1.7
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse-udev_rules.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse-udev_rules.patch	29 Oct 2006 19:30:30 -0000	1.6
+++ fuse-udev_rules.patch	22 Nov 2006 19:34:55 -0000	1.7
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse.spec	29 Oct 2006 19:30:30 -0000	1.12
+++ fuse.spec	22 Nov 2006 19:34:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov  2.5.3-5
 - Fixed udev-rule again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 May 2006 08:58:07 -0000	1.6
+++ sources	22 Nov 2006 19:34:55 -0000	1.7
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:28 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:37:28 -0500
Subject: rpms/fuse import.log,1.11,1.12
Message-ID: <200611221937.kAMJbSHu000723@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-4 from fuse-2.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	22 Nov 2006 19:34:54 -0000	1.11
+++ import.log	22 Nov 2006 19:36:58 -0000	1.12
@@ -8,3 +8,4 @@
 fuse-2_6_0-1:HEAD:fuse-2.6.0-1.src.rpm:1163225659
 fuse-2_6_0-1:FC-6:fuse-2.6.0-1.src.rpm:1164223780
 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



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:33 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 14:37:33 -0500
Subject: rpms/ktechlab/FC-5 ktechlab.spec,1.2,1.3
Message-ID: <200611221937.kAMJbXw2000736@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv658/FC-5

Modified Files:
	ktechlab.spec 
Log Message:
auto-import ktechlab-0.3-6 on branch FC-5 from ktechlab-0.3-6.src.rpm


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/FC-5/ktechlab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ktechlab.spec	13 Oct 2006 15:42:05 -0000	1.2
+++ ktechlab.spec	22 Nov 2006 19:37:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -97,6 +97,9 @@
 
 
 %Changelog
+* Wed Nov 22 2006 Chitlesh Goorah  - 0.3-6
+- Rebuilt due to new gpsim-devel release
+
 * Fri Oct 13 2006 Mamoru Tasaka  - 0.3-5
 - Try to fix compilation on ppc.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:32 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 14:37:32 -0500
Subject: rpms/ktechlab import.log,1.2,1.3
Message-ID: <200611221937.kAMJbW61000733@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv658

Modified Files:
	import.log 
Log Message:
auto-import ktechlab-0.3-6 on branch FC-5 from ktechlab-0.3-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Sep 2006 17:22:50 -0000	1.2
+++ import.log	22 Nov 2006 19:37:02 -0000	1.3
@@ -1 +1,2 @@
 ktechlab-0_3-3:HEAD:ktechlab-0.3-3.src.rpm:1159378075
+ktechlab-0_3-6:FC-5:ktechlab-0.3-6.src.rpm:1164224558



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:29 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:37:29 -0500
Subject: rpms/fuse/FC-4 .cvsignore, 1.4, 1.5 fuse-udev_rules.patch, 1.4,
	1.5 fuse.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200611221937.kAMJbTId000732@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622/FC-4

Modified Files:
	.cvsignore fuse-udev_rules.patch fuse.spec sources 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-4 from fuse-2.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 May 2006 08:56:04 -0000	1.4
+++ .cvsignore	22 Nov 2006 19:36:58 -0000	1.5
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse-udev_rules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-udev_rules.patch	29 Oct 2006 19:30:29 -0000	1.4
+++ fuse-udev_rules.patch	22 Nov 2006 19:36:58 -0000	1.5
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fuse.spec	29 Oct 2006 19:30:30 -0000	1.8
+++ fuse.spec	22 Nov 2006 19:36:58 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov  2.5.3-5
 - Fixed udev-rule again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 May 2006 08:56:04 -0000	1.4
+++ sources	22 Nov 2006 19:36:58 -0000	1.5
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:47 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:37:47 -0500
Subject: rpms/beryl-manager/devel beryl-manager.spec,1.2,1.3
Message-ID: <200611221937.kAMJblph000801@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv703

Modified Files:
	beryl-manager.spec 
Log Message:
Fix release number in changelog


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beryl-manager.spec	22 Nov 2006 19:34:40 -0000	1.2
+++ beryl-manager.spec	22 Nov 2006 19:37:17 -0000	1.3
@@ -79,7 +79,7 @@
 
 
 %changelog
-* Wed Nov 22 2006 Jarod Wilson  0.1.2-4
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-3
 - Add desktop file
 - Trim BR:
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:39:20 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:39:20 -0500
Subject: rpms/beryl-manager/FC-6 beryl-manager.desktop, NONE,
	1.1 beryl-manager.svg, NONE, 1.1 beryl-manager.spec, 1.1, 1.2
Message-ID: <200611221939.kAMJdK2r000912@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-serv856

Modified Files:
	beryl-manager.spec 
Added Files:
	beryl-manager.desktop beryl-manager.svg 
Log Message:
trimmed BR: and added desktop file


--- NEW FILE beryl-manager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beryl Manager
Comment=Manage Beryl
Icon=/usr/share/pixmaps/beryl-manager.svg
Exec=beryl-manager
Terminal=false
Type=Application
Categories=Settings;
MimeType=application/x-beryl-manager;



--- NEW FILE beryl-manager.svg ---



  
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
      
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
  
  
    
      
        image/svg+xml
        
      
    
  
  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-manager.spec	15 Nov 2006 21:11:15 -0000	1.1
+++ beryl-manager.spec	22 Nov 2006 19:38:49 -0000	1.2
@@ -3,11 +3,13 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        2%{?dist}
+Release:        3%{?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.svg
+Source2:        beryl-manager.desktop
 Patch0:         beryl-manager-0.1.1-pidof.patch
 
 # libdrm is not available on these arches
@@ -16,8 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  libtool, gettext-devel
-BuildRequires:  dbus-glib, dbus-devel, intltool, perl-XML-Parser
+BuildRequires:  perl-XML-Parser, gettext-devel
 
 
 %description
@@ -36,9 +37,6 @@
 %setup -q
 # Use absolute path to pidof, not in most users' $PATH
 %patch0 -p1 -b .pidof
-#autoreconf -v --install
-#glib-gettextize --copy --force
-#intltoolize --automake --copy --force
 
 
 %build
@@ -49,6 +47,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+desktop-file-install --vendor fedora \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category X-Fedora %{SOURCE2}
 %find_lang %{name}
 
 
@@ -56,15 +58,31 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/beryl-manager
 %{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*.svg
+%{_datadir}/applications/*.desktop
 %{_mandir}/man1/beryl-manager.1.gz
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-3
+- Add desktop file
+- Trim BR:
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-2
 - Use upstream tarball, now that there is one
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:41:10 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 22 Nov 2006 14:41:10 -0500
Subject: rpms/manaworld/FC-6 .cvsignore, 1.4, 1.5 manaworld.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200611221941.kAMJfAxv001033@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1014

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.21.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 03:22:08 -0000	1.4
+++ .cvsignore	22 Nov 2006 19:40:40 -0000	1.5
@@ -1 +1 @@
-tmw-0.0.21.tar.gz
+tmw-0.0.21.1.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-6/manaworld.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- manaworld.spec	15 Oct 2006 03:22:08 -0000	1.4
+++ manaworld.spec	22 Nov 2006 19:40:40 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           manaworld
-Version:        0.0.21
+Version:        0.0.21.1
 Release:        1%{?dist}
 Summary:        2D MMORPG world
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Wart  0.0.21.1-1
+- Update to 0.0.21.1
+
 * Sat Oct 14 2006 Wart  0.0.21
 - Update to 0.0.21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 03:22:08 -0000	1.4
+++ sources	22 Nov 2006 19:40:40 -0000	1.5
@@ -1 +1 @@
-e13a748b8e279fa694db5eb14ac4a8a9  tmw-0.0.21.tar.gz
+d5eacb0f5355ea105771bc5383bd99aa  tmw-0.0.21.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:45:58 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:45:58 -0500
Subject: rpms/njb-sharp - New directory
Message-ID: <200611221945.kAMJjwFo001158@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1154/njb-sharp

Log Message:
Directory /cvs/extras/rpms/njb-sharp added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 19:46:03 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:46:03 -0500
Subject: rpms/njb-sharp/devel - New directory
Message-ID: <200611221946.kAMJk3ti001177@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1154/njb-sharp/devel

Log Message:
Directory /cvs/extras/rpms/njb-sharp/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 19:46:24 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:46:24 -0500
Subject: rpms/njb-sharp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221946.kAMJkOtQ001248@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1241

Added Files:
	Makefile import.log 
Log Message:
Setup of module njb-sharp


--- NEW FILE Makefile ---
# Top level Makefile for module njb-sharp
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  Wed Nov 22 19:46:29 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:46:29 -0500
Subject: rpms/njb-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611221946.kAMJkTAp001269@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1241/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module njb-sharp


--- 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 Nov 22 19:47:16 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 14:47:16 -0500
Subject: rpms/ktechlab import.log,1.3,1.4
Message-ID: <200611221947.kAMJlGbS001400@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1309

Modified Files:
	import.log 
Log Message:
auto-import ktechlab-0.3-6 on branch FC-6 from ktechlab-0.3-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	22 Nov 2006 19:37:02 -0000	1.3
+++ import.log	22 Nov 2006 19:46:46 -0000	1.4
@@ -1,2 +1,3 @@
 ktechlab-0_3-3:HEAD:ktechlab-0.3-3.src.rpm:1159378075
 ktechlab-0_3-6:FC-5:ktechlab-0.3-6.src.rpm:1164224558
+ktechlab-0_3-6:FC-6:ktechlab-0.3-6.src.rpm:1164225141



From fedora-extras-commits at redhat.com  Wed Nov 22 19:47:25 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 22 Nov 2006 14:47:25 -0500
Subject: rpms/prboom/FC-6 .cvsignore, 1.8, 1.9 prboom.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200611221947.kAMJlP41001412@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1365

Modified Files:
	.cvsignore prboom.spec sources 
Log Message:
Update to 2.4.7




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2006 03:01:59 -0000	1.8
+++ .cvsignore	22 Nov 2006 19:46:55 -0000	1.9
@@ -1 +1 @@
-prboom-2.4.6.tar.gz
+prboom-2.4.7.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-6/prboom.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- prboom.spec	18 Oct 2006 03:01:59 -0000	1.12
+++ prboom.spec	22 Nov 2006 19:46:55 -0000	1.13
@@ -1,14 +1,14 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.4.6
+Version:        2.4.7
 Release:        1%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://prboom.sourceforge.net/
-Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.6.tar.gz
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.7.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -58,6 +58,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Wed Nov 22 2006 Wart  2.4.7-1
+- Update to 2.4.7
+
 * Tue Oct 17 2006 Wart  2.4.6-1
 - Update to 2.4.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2006 03:01:59 -0000	1.8
+++ sources	22 Nov 2006 19:46:55 -0000	1.9
@@ -1 +1 @@
-0f60f3ad6a8dad5b2c6d4360f181ac22  prboom-2.4.6.tar.gz
+9942f521764d7f89df2218a456da4f02  prboom-2.4.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:47:16 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 14:47:16 -0500
Subject: rpms/ktechlab/FC-6 ktechlab.spec,1.4,1.5
Message-ID: <200611221947.kAMJlGRq001404@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1309/FC-6

Modified Files:
	ktechlab.spec 
Log Message:
auto-import ktechlab-0.3-6 on branch FC-6 from ktechlab-0.3-6.src.rpm


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/FC-6/ktechlab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ktechlab.spec	13 Oct 2006 15:29:20 -0000	1.4
+++ ktechlab.spec	22 Nov 2006 19:46:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -97,6 +97,9 @@
 
 
 %Changelog
+* Wed Nov 22 2006 Chitlesh Goorah  - 0.3-6
+- Rebuilt due to new gpsim-devel release
+
 * Fri Oct 13 2006 Mamoru Tasaka  - 0.3-5
 - Try to fix compilation on ppc.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:48:31 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:48:31 -0500
Subject: rpms/njb-sharp/devel njb-sharp.patch, NONE, 1.1 njb-sharp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611221948.kAMJmVsw001557@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1510/devel

Modified Files:
	.cvsignore sources 
Added Files:
	njb-sharp.patch njb-sharp.spec 
Log Message:
auto-import njb-sharp-0.3.0-5 on branch devel from njb-sharp-0.3.0-5.src.rpm

njb-sharp.patch:

--- NEW FILE njb-sharp.patch ---
--- njb-sharp-0.3.0/njb-sharp.pc.in	2006-03-30 05:10:52.000000000 +0100
+++ njb-sharp-0.3.0/njb-sharp-new.pc.in	2006-10-07 21:55:22.000000000 +0100
@@ -2,8 +2,8 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Libraries=@prefix@/lib/njb-sharp/njb-sharp.dll
-LibraryBase=@prefix@/lib/njb-sharp/
+Libraries=@libdir@/njb-sharp/njb-sharp.dll
+LibraryBase=@libdir@/njb-sharp/
 
 Name: njb-sharp
 Description: njb-sharp - Mono/C# Bindings to libnjb


--- NEW FILE njb-sharp.spec ---
# This is only a temporary fix until FC5 is brought in
# line with FC6.
%if "%{?fedora}" == "5"
%define monodir %{_prefix}/lib
%else
%define monodir %{_libdir}
%endif

Name: 		njb-sharp
Version:	0.3.0
Release:	5%{?dist}
URL:		http://banshee-project.org/Subprojects/Njb-sharp
Summary:	C sharp library to control the Nomad jukebox database
Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
Patch0:		%{name}.patch
License:	BSD
Group:		System Environment/Libraries
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	mono-devel
BuildRequires:	monodoc-devel
BuildRequires:	libnjb-devel >= 2.2.4
Requires(post): monodoc
Requires(postun): monodoc

%description
njb-sharp: Mono/C# Bindings to libnjb

%package devel
Summary: Package config for njb-sharp
Group: Documentation
Requires: %{name} = %{version}-%{release} pkgconfig

%description devel
Package configuration file for njb-sharp

%prep
%setup -q
%if "%{?fedora}" > "5"
%patch0 -p1
%endif

%build
%configure
# G??tz Waschk claim parallel makeing is broken in this package
# Paul F. Johnson verified it to be broken on x86 Fedora.
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
rm -f %{buildroot}%{monodir}/%{name}/*.a
cat > %{buildroot}%{monodir}/%{name}/%{name}.dll.config << EOF

  
  

EOF

%clean
rm -rf %{buildroot}

%post
%{_bindir}/monodoc --make-index > /dev/null

%postun
if [ "$1" = "0" -a -x %{_bindir}/monodoc ]; then %{_bindir}/monodoc --make-index > /dev/null
fi

%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING NEWS README
%{monodir}/%{name}
%{monodir}/monodoc/sources/*

%files devel
%defattr(-,root,root)
%{monodir}/pkgconfig/*

%changelog
* Sat Oct 21 2006 Linus Walleij  0.3.0-5
- More picking around in the spec...

* Tue Oct 17 2006 Linus Walleij  0.3.0-4
- Consistent macro naming
- Switched parallel make back on

* Sun Oct 8 2006 Linus Walleij  0.3.0-3
- Minor tweaks, comments etc.

* Sat Oct 07 2006 Paul F. Johnson  0.3.0-2
- added devel package
- added FC5 mono hackery for x86_64
- added new patch files for x86_64 stuff
- re-enabled the use of monodoc
- fixed group

* Wed Aug 30 2006 Linus Walleij  0.3.0-1
- Stole Mandriva package and used as base for the Fedora Extras.
- Also proudly stole some stuff out of the SuSE equivalent by jpr at suse.de.

* Fri Aug 25 2006 G??tz Waschk  0.3.0-4mdv2007.0
- add libnjbglue path to dll map

* Sun Jul 23 2006 G??tz Waschk  0.3.0-3mdv2007.0
- rebuild for new mono

* Tue Jul 18 2006 G??tz Waschk  0.3.0-2mdv2007.0
- fix postun script

* Tue May 02 2006 G??tz Waschk  0.3.0-1mdk
- New release 0.3.0

* Mon Jan 16 2006 G??tz Waschk  0.2.2-3mdk
- lib64 fix

* Fri Jan 13 2006 G??tz Waschk  0.2.2-2mdk
- 

* Fri Jan  6 2006 G??tz Waschk  0.2.2-1mdk
- fix URL
- New release 0.2.2

* Thu Dec 22 2005 G??tz Waschk  0.2.1-1mdk
- new version

* Wed Dec  7 2005 G??tz Waschk  0.2.0-0.54024.1mdk
- add dll map
- new version

* Wed Dec  7 2005 G??tz Waschk  0.2.0-0.54023.1mdk
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 19:46:29 -0000	1.1
+++ .cvsignore	22 Nov 2006 19:48:01 -0000	1.2
@@ -0,0 +1 @@
+njb-sharp-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 19:46:29 -0000	1.1
+++ sources	22 Nov 2006 19:48:01 -0000	1.2
@@ -0,0 +1 @@
+bb46c6e500ce92ca5e272f3fd58ee83e  njb-sharp-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 19:48:31 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:48:31 -0500
Subject: rpms/njb-sharp import.log,1.1,1.2
Message-ID: <200611221948.kAMJmVjV001553@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1510

Modified Files:
	import.log 
Log Message:
auto-import njb-sharp-0.3.0-5 on branch devel from njb-sharp-0.3.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 19:46:24 -0000	1.1
+++ import.log	22 Nov 2006 19:48:01 -0000	1.2
@@ -0,0 +1 @@
+njb-sharp-0_3_0-5:HEAD:njb-sharp-0.3.0-5.src.rpm:1164224902



From fedora-extras-commits at redhat.com  Wed Nov 22 19:50:50 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:50:50 -0500
Subject: rpms/beryl-manager/FC-6 beryl-manager.spec,1.2,1.3
Message-ID: <200611221950.kAMJooUD001680@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-serv1600

Modified Files:
	beryl-manager.spec 
Log Message:
D'oh, need to BR: desktop-file-utils now...


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beryl-manager.spec	22 Nov 2006 19:38:49 -0000	1.2
+++ beryl-manager.spec	22 Nov 2006 19:50:20 -0000	1.3
@@ -18,7 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  perl-XML-Parser, gettext-devel
+BuildRequires:  perl-XML-Parser, gettext-devel, desktop-file-utils
 
 
 %description
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-4
+- Add new missing BR: desktop-file-utils
+
 * Wed Nov 22 2006 Jarod Wilson  0.1.2-3
 - Add desktop file
 - Trim BR:



From fedora-extras-commits at redhat.com  Wed Nov 22 19:52:30 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:52:30 -0500
Subject: rpms/beryl-manager/FC-6 beryl-manager.spec,1.3,1.4
Message-ID: <200611221952.kAMJqUFZ001800@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-serv1747

Modified Files:
	beryl-manager.spec 
Log Message:
Not my day... (bump rev)


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-manager.spec	22 Nov 2006 19:50:20 -0000	1.3
+++ beryl-manager.spec	22 Nov 2006 19:52:00 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Beryl window decorator and theme management utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Nov 22 19:54:51 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:54:51 -0500
Subject: rpms/beryl-manager/devel beryl-manager.spec,1.3,1.4
Message-ID: <200611221954.kAMJspXh001934@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1883

Modified Files:
	beryl-manager.spec 
Log Message:
D'oh, need to BR: desktop-file-utils now...


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-manager.spec	22 Nov 2006 19:37:17 -0000	1.3
+++ beryl-manager.spec	22 Nov 2006 19:54:21 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Beryl window decorator and theme management utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  perl-XML-Parser, gettext-devel
+BuildRequires:  perl-XML-Parser, gettext-devel, desktop-file-utils
 
 
 %description
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-4
+- Add new missing BR: desktop-file-utils
+
 * Wed Nov 22 2006 Jarod Wilson  0.1.2-3
 - Add desktop file
 - Trim BR:



From fedora-extras-commits at redhat.com  Wed Nov 22 19:57:32 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Wed, 22 Nov 2006 14:57:32 -0500
Subject: rpms/zope/FC-6 zope.configure-2.9.5.patch,NONE,1.1
Message-ID: <200611221957.kAMJvW7s002008@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1999

Added Files:
	zope.configure-2.9.5.patch 
Log Message:
Added configure script patch for python 2.4.4


zope.configure-2.9.5.patch:

--- NEW FILE zope.configure-2.9.5.patch ---
*** configure   2006-11-22 12:54:48.000000000 -0700
--- configure.orig      2006-11-22 12:52:19.000000000 -0700
*************** TARGET="2.4.3"
*** 18,24 ****
  # sys.version) below in "best" to "worst" order, not including the
  # target version.  Up to six acceptable python versions are allowed.
  # Do not include the target version number in this list!
! ACCEPTABLE="2.4.2 2.4.4"
  
  # provide the executable names for all the acceptable versions
  # (and the target version) below
--- 18,24 ----
  # sys.version) below in "best" to "worst" order, not including the
  # target version.  Up to six acceptable python versions are allowed.
  # Do not include the target version number in this list!
! ACCEPTABLE="2.4.2"
  
  # provide the executable names for all the acceptable versions
  # (and the target version) below



From fedora-extras-commits at redhat.com  Wed Nov 22 20:05:35 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 15:05:35 -0500
Subject: owners owners.list,1.1996,1.1997
Message-ID: <200611222005.kAMK5ZcM005249@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5217

Modified Files:
	owners.list 
Log Message:
Adding njb-sharp



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1996
retrieving revision 1.1997
diff -u -r1.1996 -r1.1997
--- owners.list	22 Nov 2006 19:12:17 -0000	1.1996
+++ owners.list	22 Nov 2006 20:05:05 -0000	1.1997
@@ -1192,6 +1192,7 @@
 Fedora Extras|ninja|A text based Internet Relay Chat (IRC) client|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nip2|Interactive image processing system|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|njam|Maze-game, eat all the cookies while avoiding the badguys|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|njb-sharp|C-sharp bindings to libnjb|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|nmh|A mail handling system with a command line interface|bressers at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nomadsync|Synchronization agent for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|nomarch|GPLed Arc de-archiver|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 20:39:51 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 22 Nov 2006 15:39:51 -0500
Subject: rpms/celestia/devel celestia-1.4.1-strictalias.patch, NONE,
	1.1 celestia.spec, 1.20, 1.21
Message-ID: <200611222039.kAMKdpln005877@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859

Modified Files:
	celestia.spec 
Added Files:
	celestia-1.4.1-strictalias.patch 
Log Message:
Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
Hopefully really handle the gconf schema properly.


celestia-1.4.1-strictalias.patch:

--- NEW FILE celestia-1.4.1-strictalias.patch ---
--- celestia-1.4.1/src/celengine/modelfile.cpp.strictalias	2006-11-22 14:04:15.000000000 +0100
+++ celestia-1.4.1/src/celengine/modelfile.cpp	2006-11-22 14:01:27.000000000 +0100
@@ -1080,7 +1080,9 @@
 static float readFloat(istream& in)
 {
     int i = readUint(in);
-    return *((float*) &i);
+    float f;
+    memcpy(&f, &i, sizeof(float));
+    return f;
 }
 
 


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- celestia.spec	28 Aug 2006 23:50:49 -0000	1.20
+++ celestia.spec	22 Nov 2006 20:39:21 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           celestia
 Version:        1.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OpenGL real-time visual space simulation
 Group:          Amusements/Graphics
 License:        GPL
@@ -9,6 +9,7 @@
 Patch0:         celestia-1.4.0-compile.patch
 Patch1:         celestia-1.4.1-lua51.patch
 Patch2:         celestia-1.4.1-lua51-resume.patch
+Patch3:         celestia-1.4.1-strictalias.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,8 +23,8 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  lua-devel
-BuildRequires:  automake17
 BuildRequires:  gettext-devel
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -46,21 +47,28 @@
 %patch0 -p0
 %patch1 -p1 -b .lua51
 %patch2 -p1 -b .lua51-resume
+%patch3 -p1 -b .strictalias
+
+# Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede).
+sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure
+sed -i 's/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS \$CELESTIA_CXXFLAGS"/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS"/' configure
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
+
 
 %build
 export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
-# http://www.shatters.net/forum/viewtopic.php?t=9605
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-%configure --with-gnome --with-lua --disable-schemas-install
+%configure --with-gnome --with-lua
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
@@ -86,15 +94,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 || :
+fi
 
 %post
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
 %preun
-if [ "$1" = "0" ] ; then
-  GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+if [ "$1" -eq "0" ] ; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 || :
 fi
 
 
@@ -105,12 +123,17 @@
 # Seem to have gone away in post-1.4.0 CVS...
 #%doc manual/*.html manual/*.css
 %{_bindir}/*
+%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.png
 
 
 %changelog
+* Wed Nov 22 2006 Steven Pritchard  1.4.1-7
+- Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
+- Hopefully really handle the gconf schema properly.
+
 * Mon Aug 28 2006 Steven Pritchard  1.4.1-6
 - Add --disable-schemas-install to configure.
 
@@ -218,4 +241,3 @@
 
 * Tue May 14 2002 Julien MOUTTE 
 - Initial RPM release.
-



From fedora-extras-commits at redhat.com  Wed Nov 22 20:54:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 22 Nov 2006 15:54:19 -0500
Subject: rpms/celestia/devel celestia.spec,1.21,1.22
Message-ID: <200611222054.kAMKsJnA006156@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6141

Modified Files:
	celestia.spec 
Log Message:
Quiet killall.


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- celestia.spec	22 Nov 2006 20:39:21 -0000	1.21
+++ celestia.spec	22 Nov 2006 20:53:49 -0000	1.22
@@ -99,7 +99,7 @@
     GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
         gconftool-2 --makefile-uninstall-rule \
             %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &>/dev/null || :
 fi
 
 %post
@@ -112,7 +112,7 @@
     GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
         gconftool-2 --makefile-uninstall-rule \
             %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &>/dev/null || :
 fi
 
 



From fedora-extras-commits at redhat.com  Wed Nov 22 21:36:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 16:36:53 -0500
Subject: rpms/id3lib/devel id3lib.spec,1.12,1.13
Message-ID: <200611222136.kAMLarVW009604@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/id3lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9583

Modified Files:
	id3lib.spec 
Log Message:
* Wed Nov 22 2006 Hans de Goede  3.8.3-15
- Link libid3-3.8.so.3 with -lz (bug #216783)



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/devel/id3lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- id3lib.spec	28 Aug 2006 11:37:56 -0000	1.12
+++ id3lib.spec	22 Nov 2006 21:36:23 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Library for manipulating ID3v1 and ID3v2 tags
 Name:		id3lib
 Version:	3.8.3
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://id3lib.sourceforge.net/
@@ -45,7 +45,7 @@
 
 %build
 %configure --disable-dependency-tracking --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} libid3_la_LIBADD=-lz
 
 
 %install
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Hans de Goede  3.8.3-15
+- Link libid3-3.8.so.3 with -lz (bug #216783)
+
 * Mon Aug 28 2006 Hans de Goede  3.8.3-14
 - Taking over as maintainer since Anvil has other priorities
 - FE6 Rebuild



From fedora-extras-commits at redhat.com  Wed Nov 22 21:38:08 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 16:38:08 -0500
Subject: rpms/id3lib/FC-6 id3lib.spec,1.12,1.13
Message-ID: <200611222138.kAMLc8hD009668@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/id3lib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9653

Modified Files:
	id3lib.spec 
Log Message:
* Wed Nov 22 2006 Hans de Goede  3.8.3-15
- Link libid3-3.8.so.3 with -lz (bug #216783)



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/FC-6/id3lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- id3lib.spec	28 Aug 2006 11:37:56 -0000	1.12
+++ id3lib.spec	22 Nov 2006 21:37:38 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Library for manipulating ID3v1 and ID3v2 tags
 Name:		id3lib
 Version:	3.8.3
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://id3lib.sourceforge.net/
@@ -45,7 +45,7 @@
 
 %build
 %configure --disable-dependency-tracking --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} libid3_la_LIBADD=-lz
 
 
 %install
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Hans de Goede  3.8.3-15
+- Link libid3-3.8.so.3 with -lz (bug #216783)
+
 * Mon Aug 28 2006 Hans de Goede  3.8.3-14
 - Taking over as maintainer since Anvil has other priorities
 - FE6 Rebuild



From fedora-extras-commits at redhat.com  Wed Nov 22 21:40:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 16:40:07 -0500
Subject: rpms/id3lib/FC-5 id3lib.spec,1.11,1.12
Message-ID: <200611222140.kAMLe7kU009739@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/id3lib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717

Modified Files:
	id3lib.spec 
Log Message:
* Wed Nov 22 2006 Hans de Goede  3.8.3-15
- Link libid3-3.8.so.3 with -lz (bug #216783)



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/FC-5/id3lib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- id3lib.spec	18 Feb 2006 13:02:49 -0000	1.11
+++ id3lib.spec	22 Nov 2006 21:39:37 -0000	1.12
@@ -1,24 +1,17 @@
 Summary:	Library for manipulating ID3v1 and ID3v2 tags
 Name:		id3lib
 Version:	3.8.3
-Release:	13%{?dist}
+Release:	15%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://id3lib.sourceforge.net/
-Source0:	http://download.sf.net/id3lib/%{name}-%{version}.tar.gz
+Source0:	http://dl.sf.net/sourceforge/id3lib/%{name}-%{version}.tar.gz
 Patch0:		id3lib-dox.patch
 Patch1:		id3lib-3.8.3-libtool-autofoo.patch.bz2
 Patch2:		id3lib-3.8.3-io_helpers-163101.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	zlib-devel doxygen
 
-%package devel
-Summary:	Development tools for the id3lib library
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	zlib-devel
-
-
 %description
 This package provides a software library for manipulating ID3v1 and
 ID3v2 tags. It provides a convenient interface for software developers
@@ -28,6 +21,13 @@
 (de)compression, and optional padding facilities. Additionally, it can
 tell mp3 header info, like bitrate etc.
 
+
+%package devel
+Summary:	Development tools for the id3lib library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	zlib-devel
+
 %description devel
 This package provides files needed to develop with the id3lib.
 
@@ -45,7 +45,7 @@
 
 %build
 %configure --disable-dependency-tracking --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} libid3_la_LIBADD=-lz
 
 
 %install
@@ -83,6 +83,13 @@
 
 
 %changelog
+* Wed Nov 22 2006 Hans de Goede  3.8.3-15
+- Link libid3-3.8.so.3 with -lz (bug #216783)
+
+* Mon Aug 28 2006 Hans de Goede  3.8.3-14
+- Taking over as maintainer since Anvil has other priorities
+- FE6 Rebuild
+
 * Sat Feb 18 2006 Ville Skytt??  - 3.8.3-13
 - Don't ship static libs.
 - Build with dependency tracking disabled.



From fedora-extras-commits at redhat.com  Wed Nov 22 21:43:39 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 16:43:39 -0500
Subject: rpms/ppracer/devel tree.png,NONE,1.1
Message-ID: <200611222143.kAMLhd6J009829@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9824

Added Files:
	tree.png 
Log Message:
fixed version of tree as requested (bz 199011)



From fedora-extras-commits at redhat.com  Wed Nov 22 21:55:31 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Wed, 22 Nov 2006 16:55:31 -0500
Subject: rpms/zope/FC-6 zope.configure-2.9.5.patch, 1.1, 1.2 zope.spec, 1.27,
	1.28
Message-ID: <200611222155.kAMLtVtJ009904@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9874

Modified Files:
	zope.configure-2.9.5.patch zope.spec 
Log Message:
Added patch to enable support for python 2.4.4


zope.configure-2.9.5.patch:

Index: zope.configure-2.9.5.patch
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.configure-2.9.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.configure-2.9.5.patch	22 Nov 2006 19:57:32 -0000	1.1
+++ zope.configure-2.9.5.patch	22 Nov 2006 21:55:01 -0000	1.2
@@ -1,19 +1,11 @@
-*** configure   2006-11-22 12:54:48.000000000 -0700
---- configure.orig      2006-11-22 12:52:19.000000000 -0700
-*************** TARGET="2.4.3"
-*** 18,24 ****
-  # sys.version) below in "best" to "worst" order, not including the
-  # target version.  Up to six acceptable python versions are allowed.
-  # Do not include the target version number in this list!
-! ACCEPTABLE="2.4.2 2.4.4"
-  
-  # provide the executable names for all the acceptable versions
-  # (and the target version) below
---- 18,24 ----
-  # sys.version) below in "best" to "worst" order, not including the
-  # target version.  Up to six acceptable python versions are allowed.
-  # Do not include the target version number in this list!
-! ACCEPTABLE="2.4.2"
-  
-  # provide the executable names for all the acceptable versions
-  # (and the target version) below
+--- Zope-2.9.5-final.orig/configure     2006-10-02 09:53:36.000000000 -0600
++++ Zope-2.9.5-final/configure  2006-11-22 14:28:48.000000000 -0700
+@@ -18,7 +18,7 @@
+ # sys.version) below in "best" to "worst" order, not including the
+ # target version.  Up to six acceptable python versions are allowed.
+ # Do not include the target version number in this list!
+-ACCEPTABLE="2.4.2"
++ACCEPTABLE="2.4.2 2.4.4"
+ 
+ # provide the executable names for all the acceptable versions
+ # (and the target version) below


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- zope.spec	22 Nov 2006 18:22:32 -0000	1.27
+++ zope.spec	22 Nov 2006 21:55:01 -0000	1.28
@@ -27,6 +27,7 @@
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
+Patch1:  zope.configure-2.9.5.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -47,6 +48,7 @@
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
+%patch1 -p1
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
 



From fedora-extras-commits at redhat.com  Wed Nov 22 22:14:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 17:14:44 -0500
Subject: rpms/scorched3d/devel .cvsignore, 1.5, 1.6 scorched3d.spec, 1.19,
	1.20 sources, 1.5, 1.6
Message-ID: <200611222214.kAMMEinX013058@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13037

Modified Files:
	.cvsignore scorched3d.spec sources 
Log Message:
* Sat Nov 18 2006 Hans de Goede  40.1d-1
- New upstream release 40.1d



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Nov 2006 20:45:26 -0000	1.5
+++ .cvsignore	22 Nov 2006 22:14:14 -0000	1.6
@@ -1 +1 @@
-Scorched3D-40.1c-src.tar.gz
+Scorched3D-40.1d-src.tar.gz


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scorched3d.spec	3 Nov 2006 05:47:50 -0000	1.19
+++ scorched3d.spec	22 Nov 2006 22:14:14 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           scorched3d
-Version:        40.1c
-Release:        2%{?dist}
+Version:        40.1d
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Hans de Goede  40.1d-1
+- New upstream release 40.1d
+
 * Fri Nov  3 2006 Hans de Goede  40.1c-2
 - Add libvorbis-devel BR so that ogg/vorbis support gets build in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Nov 2006 20:45:26 -0000	1.5
+++ sources	22 Nov 2006 22:14:14 -0000	1.6
@@ -1 +1 @@
-a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz
+263d2c1be168860d783426c4d6c7060c  Scorched3D-40.1d-src.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 22:16:00 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 17:16:00 -0500
Subject: rpms/scorched3d/FC-6 .cvsignore, 1.5, 1.6 scorched3d.spec, 1.19,
	1.20 sources, 1.5, 1.6
Message-ID: <200611222216.kAMMG0D5013121@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13102

Modified Files:
	.cvsignore scorched3d.spec sources 
Log Message:
* Sat Nov 18 2006 Hans de Goede  40.1d-1
- New upstream release 40.1d



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Nov 2006 20:48:36 -0000	1.5
+++ .cvsignore	22 Nov 2006 22:15:30 -0000	1.6
@@ -1 +1 @@
-Scorched3D-40.1c-src.tar.gz
+Scorched3D-40.1d-src.tar.gz


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scorched3d.spec	3 Nov 2006 11:21:09 -0000	1.19
+++ scorched3d.spec	22 Nov 2006 22:15:30 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           scorched3d
-Version:        40.1c
-Release:        2%{?dist}
+Version:        40.1d
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Hans de Goede  40.1d-1
+- New upstream release 40.1d
+
 * Fri Nov  3 2006 Hans de Goede  40.1c-2
 - Add libvorbis-devel BR so that ogg/vorbis support gets build in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Nov 2006 20:48:36 -0000	1.5
+++ sources	22 Nov 2006 22:15:30 -0000	1.6
@@ -1 +1 @@
-a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz
+263d2c1be168860d783426c4d6c7060c  Scorched3D-40.1d-src.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 22:18:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 17:18:17 -0500
Subject: rpms/scorched3d/FC-5 .cvsignore, 1.5, 1.6 scorched3d.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <200611222218.kAMMIHMo013198@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13170

Modified Files:
	.cvsignore scorched3d.spec sources 
Log Message:
* Sat Nov 18 2006 Hans de Goede  40.1d-1
- New upstream release 40.1d



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 11:23:38 -0000	1.5
+++ .cvsignore	22 Nov 2006 22:17:47 -0000	1.6
@@ -1 +1 @@
-Scorched3D-40.1c-src.tar.gz
+Scorched3D-40.1d-src.tar.gz


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scorched3d.spec	3 Nov 2006 11:23:38 -0000	1.17
+++ scorched3d.spec	22 Nov 2006 22:17:47 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           scorched3d
-Version:        40.1c
-Release:        2%{?dist}
+Version:        40.1d
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Hans de Goede  40.1d-1
+- New upstream release 40.1d
+
 * Fri Nov  3 2006 Hans de Goede  40.1c-2
 - Add libvorbis-devel BR so that ogg/vorbis support gets build in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 11:23:38 -0000	1.5
+++ sources	22 Nov 2006 22:17:47 -0000	1.6
@@ -1 +1 @@
-a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz
+263d2c1be168860d783426c4d6c7060c  Scorched3D-40.1d-src.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 22:22:25 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:22:25 -0500
Subject: rpms/netcdf-perl - New directory
Message-ID: <200611222222.kAMMMPPl013383@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13379/netcdf-perl

Log Message:
Directory /cvs/extras/rpms/netcdf-perl added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 22:22:31 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:22:31 -0500
Subject: rpms/netcdf-perl/devel - New directory
Message-ID: <200611222222.kAMMMVff013400@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13379/netcdf-perl/devel

Log Message:
Directory /cvs/extras/rpms/netcdf-perl/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 22:22:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 17:22:49 -0500
Subject: rpms/libtelepathy/devel .cvsignore, 1.3, 1.4 libtelepathy.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611222222.kAMMMnRD013444@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libtelepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13359

Modified Files:
	.cvsignore libtelepathy.spec sources 
Log Message:
* Wed Nov 22 2006 Brian Pepple  - 0.0.39-1
- Update to 0.0.39.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2006 16:43:00 -0000	1.3
+++ .cvsignore	22 Nov 2006 22:22:19 -0000	1.4
@@ -1 +1 @@
-libtelepathy-0.0.38.tar.gz
+libtelepathy-0.0.39.tar.gz


Index: libtelepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/libtelepathy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtelepathy.spec	12 Oct 2006 16:43:00 -0000	1.2
+++ libtelepathy.spec	22 Nov 2006 22:22:19 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           libtelepathy
-Version:        0.0.38
+Version:        0.0.39
 Release:        1%{?dist}
 Summary:        A GLib library to ease writing telepathy clients
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Brian Pepple  - 0.0.39-1
+- Update to 0.0.39.
+
 * Thu Oct 12 2006 Brian Pepple  - 0.0.38-1
 - Update to 0.0.38.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2006 16:43:00 -0000	1.3
+++ sources	22 Nov 2006 22:22:19 -0000	1.4
@@ -1 +1 @@
-145358f6275acf1ce3d7633f7865b7b9  libtelepathy-0.0.38.tar.gz
+4935790c13b3e412572598fead8ce159  libtelepathy-0.0.39.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 22:22:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:22:52 -0500
Subject: rpms/netcdf-perl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611222222.kAMMMqvo013454@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13448

Added Files:
	Makefile import.log 
Log Message:
Setup of module netcdf-perl


--- NEW FILE Makefile ---
# Top level Makefile for module netcdf-perl
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  Wed Nov 22 22:22:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:22:57 -0500
Subject: rpms/netcdf-perl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611222222.kAMMMvrv013469@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13448/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netcdf-perl


--- 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 Nov 22 22:23:14 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:23:14 -0500
Subject: owners owners.list,1.1997,1.1998
Message-ID: <200611222223.kAMMNEpd013527@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13415

Modified Files:
	owners.list 
Log Message:
Add netcdf-perl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1997
retrieving revision 1.1998
diff -u -r1.1997 -r1.1998
--- owners.list	22 Nov 2006 20:05:05 -0000	1.1997
+++ owners.list	22 Nov 2006 22:22:44 -0000	1.1998
@@ -1167,6 +1167,7 @@
 Fedora Extras|nessus-libraries|Support libraries for nessus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|net6|A TCP protocol abstraction for library C++|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|netcdf-perl|Perl extension module for scientific data access via the netCDF API|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|netgo|Networking profile manager|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 22:24:09 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:24:09 -0500
Subject: rpms/netcdf-perl import.log,1.1,1.2
Message-ID: <200611222224.kAMMO9sr013589@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13558

Modified Files:
	import.log 
Log Message:
auto-import netcdf-perl-1.2.3-2.fc6 on branch devel from netcdf-perl-1.2.3-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/netcdf-perl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 22:22:52 -0000	1.1
+++ import.log	22 Nov 2006 22:23:39 -0000	1.2
@@ -0,0 +1 @@
+netcdf-perl-1_2_3-2_fc6:HEAD:netcdf-perl-1.2.3-2.fc6.src.rpm:1164234240



From fedora-extras-commits at redhat.com  Wed Nov 22 22:24:09 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:24:09 -0500
Subject: rpms/netcdf-perl/devel netcdf-2.3, NONE, 1.1 netcdf-perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611222224.kAMMO9uE013593@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13558/devel

Modified Files:
	.cvsignore sources 
Added Files:
	netcdf-2.3 netcdf-perl.spec 
Log Message:
auto-import netcdf-perl-1.2.3-2.fc6 on branch devel from netcdf-perl-1.2.3-2.fc6.src.rpm


--- NEW FILE netcdf-2.3 ---
.TH NETCDF 3 "26 February 1993" "Printed: \n(yr.\n(mo.\n(dy" "UNIDATA LIBRARY FUNCTIONS"
.SH NAME
netcdf \- Unidata Network Common Data Form (netCDF-2) library
.SH WARNING
The interface described here is obsolete, but included because the perl
module still use it.
.SH SYNOPSIS
.ft B
.na
.nh
.HP
#include 
.HP 6
int nccreate(const char* path, int cmode)
.HP
int ncopen(const char* path, int mode)
.HP
int ncredef(int ncid)
.HP
int ncsetfill(int ncid, int fillmode)
.HP
int ncendef(int ncid)
.HP
int ncclose(int ncid)
.HP
int ncinquire(int ncid, int* ndims, int* nvars, int*\ natts, int*\ recdim)
.HP
int ncsync(int ncid)
.HP
int ncabort(int ncid)
.HP
int ncdimdef(int ncid, const char* name, long length)
.HP
int ncdimid(int ncid, const char* name)
.HP
int ncdiminq(int ncid, int dimid, char* name, long*\ length)
.HP
int ncdimrename(int ncid, int dimid, const char* name)
.HP
int ncvardef(int ncid, const char* name, nc_type datatype, int\ ndims,
const int\ dimids[])
.HP
int ncvarid(int ncid, const char* name)
.HP
int ncvarinq(int ncid, int varid, char* name, nc_type*\ datatype, int*\ ndims,
int\ dimids[], int*\ natts)
.HP
int ncvarput1(int ncid, int varid, const long coords[], const void*\ value)
.HP
int ncvarget1(int ncid, int varid, const long coords[], void*\ value)
.HP
int ncvarput(int ncid, int varid, const long start[], const long\ count[],
const void*\ value)
.HP
int ncvarget(int ncid, int varid, const long start[], const long\ count[],
void*\ value)
.HP
int ncvarputg(int ncid, int varid, const long start[], const long\ count[],
const long\ stride[], const long\ imap[], const void*\ value)
.HP
int ncvargetg(int ncid, int varid, const long start[], const long\ count[],
const long\ stride[], const long\ imap[], void*\ value)
.HP
int ncrecput(int ncid, long\ recnum, void*\ const\ valuep[])
.HP
int ncrecget(int ncid, long\ recnum, void*\ valuep[])
.HP
int ncrecinq(int ncid, int*\ nrvars, int\ rvarids[], long\ rsizes[])
.HP
int ncvarrename(int ncid, int varid, const char* name)
.HP
int ncattput(int ncid, int varid, const char* name, nc_type\ datatype,
int\ len, const void*\ value)
.HP
int ncattinq(int ncid, int varid, const char* name, nc_type*\ datatype,
int*\ len)
.HP
int ncattget(int ncid, int varid, const char* name, void*\ value)
.HP
int ncattcopy(int inncid, int invar, const char* name, int\ outncid, 
int\ outvar)
.HP
int ncattname(int ncid, int varid, int attnum, char*\ name)
.HP
int ncattrename(int ncid, int varid, const char* name, const char*\ newname)
.HP
int ncattdel(int ncid, int varid, const char* name)
.HP
int nctypelen(nc_type datatype)
.ad
.hy
.SH "FUNCTION DESCRIPTIONS"
.LP
These routines implement the Unidata netCDF data-access interface for
the C programming language.
Only those arguments which are unique to the function being described are 
documented in this section.  See the section "COMMON ARGUMENT DESCRIPTIONS"
for descriptions of the other arguments.
.HP 4
\fBint nccreate(const char* \fIpath\fB, int \fIcmode\fB)\fR
.sp
Creates the new netCDF file, returning a netCDF ID that 
can subsequently be used to refer to the netCDF file.
The new netCDF file is placed in define mode.
The mode parameter, \fIcmode\fP,
should be either \fBNC_CLOBBER\fP or \fBNC_NOCLOBBER\fP.
\fBNC_CLOBBER\fP means that even if the file already exists, you want to
create a new file with the same name, erasing the old file's contents.
\fBNC_NOCLOBBER\fP means you want to create a new netCDF file only if the
given file name does not refer to a file that already exists.
If an error occurs, this function returns -1.
.HP
\fBint ncopen(const char* \fIpath\fB, int \fImode\fB)\fR
.sp
Opens the existing netCDF file for access.
The mode parameter, \fImode\fP, should be either
\fBNC_WRITE\fP, to open the file for writing, or \fBNC_NOWRITE\fP, to
open the file read-only.  "Writing" means any kind of change to the
file, including appending or changing data, adding or renaming dimensions,
variables, or attributes, or deleting attributes.
If an error occurs, this function returns -1.
.HP
\fBint ncredef(int \fIncid\fB)\fR
.sp
Puts an open netCDF file into define mode, 
so dimensions, variables, and attributes can be added or renamed and 
attributes can be deleted.
If an error occurs, this function returns -1.
.HP
\fBint ncsetfill(int \fIncid\fB, int \fIfillmode\fB)\fR
.sp
Determines whether or not variable prefilling will be done (see 
\fBVARIABLE PREFILLING\fP below).
The netCDF file shall be writable.
\fIfillmode\fP is either \fBNC_FILL\fP to enable prefilling (the
default) or \fBNC_NOFILL\fP to disable prefilling.
This function returns the previous setting or -1 if an error occurs.
.HP
\fBint ncendef(int \fIncid\fB)\fR
.sp
Takes an open netCDF file out of define mode.
The changes made to the netCDF file
while it was in define mode are checked and committed to disk if no
problems occurred.  
In particular, non-record variables are filled with their fill-values 
unless \fBncsetfill(\|)\fP has been called with the argument 
\fBNC_NOFILL\fP.
The netCDF file is then placed in data mode, so that
variable data can be read or written.
If an error occurs, this function returns -1.
.HP
\fBint ncclose(int \fIncid\fB)\fR
.sp
Closes an open netCDF file.
If the file is in define mode, \fBncendef(\|)\fP
will be called before closing.
(In this case, if
\fBncendef(\|)\fP returns an error, \fBncabort(\|)\fP
will automatically be called to restore the file to the
consistent state before define mode was last entered.)  
After an open netCDF file is closed, its netCDF ID will be reassigned to 
the next netCDF file that is opened or created.
If an error occurs, this function returns -1.
.HP
\fBint ncinquire(int \fIncid\fB, int* \fIndims\fB, int* \fInvars\fB, int* \fInatts\fB, int* \fIrecdim)\fR
.sp
Returns information about an open netCDF file.
Upon successful return,
\fIndims\fP will contain the
number of dimensions defined for this netCDF file,
\fInvars\fP will contain the
number of variables,
\fInatts\fP will contain the
number of attributes, and
\fIrecdim\fP will contain the
ID of the unlimited dimension if one exists, or -1 otherwise.
If any of the
return parameters is a \fBNULL\fP pointer, then the corresponding information
will not be returned; hence, no space need be allocated for it.
If an error occurs, this function returns -1.
.HP
\fBint ncsync(int \fIncid\fB)\fR
.sp
Updates a writable netCDF file.
The netCDF file must be in data mode.
A netCDF file in define mode is synchronized
to disk only when \fBncendef(\|)\fP is called.
It can be expensive in computer resources to always synchronize to disk after
every write of variable data or change of an attribute value.  There are two
reasons you might want to synchronize after writes: 1) to minimize data 
loss in case of abnormal termination; and 2) to make data available to other
processes for reading immediately after it is written.
Data is automatically synchronized to disk when a netCDF file is closed,
or whenever you leave define mode.
If an error occurs, this function returns -1.
.HP
\fBint ncabort(int \fIncid\fB)\fR
.sp
Closes or deletes a netCDF file.
If the netCDF file isn't in define mode, then the file is closed.
If the file is being created and is still in define mode, the file is deleted.
If define mode was entered by a call to \fBncredef(\|)\fP,
the netCDF file is restored to its state before definition mode was entered 
and the file is closed.
The main reason for calling \fBncabort(\|)\fP
is to restore the netCDF to a known consistent state in
case anything goes wrong during the definition of new dimensions,
variables, or attributes.
This function is called automatically if \fBncclose(\|)\fP
is called from define mode and the call to leave define
mode before closing fails.
If an error occurs, this function returns -1.
.HP
\fBint ncdimdef(int \fIncid\fB, const char* \fIname\fB, long \fIlength\fB)\fR
.sp
Adds a new dimension to an open netCDF file, which must be 
in define mode.
\fIname\fP is the dimension name.
If an error occurs, this function returns -1.
.HP
\fBint ncdimid(int \fIncid\fB, const char* \fIname\fB)\fR
.sp
Returns the ID of a netCDF dimension, given the name of the dimension.
If an error occurs, this function returns -1.
.HP
\fBint ncdiminq(int \fIncid\fB, int \fIdimid\fB, char* \fIname\fB, long*\ \fIsize\fB)\fR
.sp
Returns the name and size of a dimension, given its ID.  If either the
\fIname\fP parameter or \fIsize\fP parameter is a \fBNULL\fP pointer, the
associated information will not be returned, so no space needs to be
allocated.  For the unlimited dimension, the returned size is the current
maximum value used for writing any record variables, (i.e. the maximum
record number).  If an error occurs, this function returns -1.
.HP
\fBint ncdimrename(int \fIncid\fB, int \fIdimid\fB, const char* \fIname\fB)\fR
.sp
Renames an existing dimension in an open netCDF file.
If the new name is longer than the old name, the netCDF must be in 
define mode.
You cannot rename a dimension to have the same name as another dimension.
If an error occurs, this function returns -1.
.HP
\fBint ncvardef(int \fIncid\fB, const char* \fIname\fB, nc_type \fIdatatype\fB,
int \fIndims\fB, const int \fIdimids[]\fB)\fR
.sp
Adds a new variable to an open netCDF file in define mode.
It returns a netCDF variable ID.
If an error occurs, this function returns -1.
.HP
\fBint ncvarid(int \fIncid\fB, const char* \fIname\fB)\fR
.sp
Returns the ID of a netCDF variable, given its name.
If an error occurs, this function returns -1.
.HP
\fBint ncvarinq(int \fIncid\fB, int \fIvarid\fB, char* \fIname\fB, 
nc_type* \fIdatatype\fB, int* \fIndims\fB, int \fIdimids[]\fB, int* \fInatts)\fR
.sp
Returns information about a netCDF variable, given its ID.  If any of the
return parameters (\fIname\fP, \fIdatatype\fP, \fIndims\fI, \fIdimids\fI, or
\fInatts\fP) is a \fBNULL\fP pointer, then the corresponding information
will not be returned; hence, no space need be allocated for it.  If an error
occurs, this function returns -1.
.HP
\fBint ncvarput1(int \fIncid\fB, int \fIvarid\fB, const long \fIcoords[]\fB, 
const void* \fIvalue\fB)\fR
.sp
Puts a single data value into a variable of an open netCDF file
that is in data mode.
If an error occurs, this function returns -1.
.HP
\fBint ncvarget1(int \fIncid\fB, int \fIvarid\fB, const long \fIcoords[]\fB, 
void* \fIvalue\fB)\fR
.sp
Gets a single data value from a variable of an open netCDF file
that is in data mode.
If an error occurs, this function returns -1.
.HP
\fBint ncvarput(int \fIncid\fB, int \fIvarid\fB, const long \fIstart[]\fB, 
const long \fIcount[]\fB, const void* \fIvalue\fB)\fR
.sp
Writes a hyperslab of values into a netCDF variable of an open
netCDF file, which must be in data mode.
If an error occurs, this function returns -1.
.HP
\fBint ncvarget(int \fIncid\fB, int \fIvarid\fB, const long \fIstart[]\fB, 
const long \fIcount[]\fB, void* \fIvalue\fB)\fR
.sp
Reads a hyperslab of values from a netCDF variable of an open
netCDF file, which must be in data mode.
If an error occurs, this function returns -1.
.HP
\fBint ncvarputg(int \fIncid\fB, int \fIvarid\fB, const long \fIstart[]\fB, 
const long \fIcount[]\fB, const long \fIstride[]\fB, const long \fIimap[]\fB, 
const void* \fIvalue\fB)\fR
.sp
Writes a general hyperslab of values into a netCDF variable 
of an open netCDF file, which must be in data mode.
The locations of the memory-resident data values may be arbitrary, though
they are constrained to have a regular structure.
In addition, the values of the netCDF variable may be accessed using
non-unity strides.
If an error occurs, this function returns -1.
.HP
\fBint ncvargetg(int \fIncid\fB, int \fIvarid\fB, const long \fIstart[]\fB,
const long \fIcount[]\fB, const long \fIstride[]\fB, const long \fIimap[]\fB,
void* \fIvalue\fB)\fR
.sp
Reads a general hyperslab of values from a netCDF variable 
of an open netCDF file, which must be in data mode.
The locations of the memory-resident data values may be arbitrary, though
they are constrained to have a regular structure.
In addition, the values of the netCDF variable may be accessed using
non-unity strides.
If an error occurs, this function returns -1.
.HP
\fBint ncrecput(int\ \fIncid\fP, long\ \fIrecnum\fP, const void*\ \fIvaluep[]\fP)\fR
.sp
Writes a record (or a subset of a record) of values into the record
variables of an open netCDF file, which must be in data mode.  The record
number, \fIrecnum\fP, must be a nonnegative number that specifies which
record (which value of the unlimited or record dimension) to write.  The
array of pointers to blocks of data to be written, \fIvaluep\fP, should have
one pointer for each record variable.  The pointer to the data to be written
to the \fIn\fP-th record variable, \fIvaluep[n]\fP, points to one record's
worth of data of the appropriate type to be written into the \fIrecnum\fP-th
record of that netCDF variable.  If the pointer for any record variable is
the \fBNULL\fP pointer, no data is written for that variable.  Hence any
subset of record variables may be written by specifying non-\fBNULL\fP
pointers for the desired record variables.  Invoking this function is
equivalent to a sequence of invocations of ncvarput() for all record
variables for which a non-\fBNULL\fP pointer is specified.  If an error
occurs, this function returns -1.
.HP
\fBint ncrecget(int\ \fIncid\fP, long\ \fIrecnum\fP, void*\ \fIvaluep[]\fP)\fR
.sp
Reads a record (or a subset of a record) of values from the record variables
of an open netCDF file, which must be in data mode.  The record number,
\fIrecnum\fP, must be a nonnegative number that specifies which record to
read.  The array of pointers to blocks of data to be read, \fIvaluep\fP,
should have one pointer for each record variable.  The pointer to the data
to be read for the \fIn\fP-th record variable, \fIvaluep[n]\fP, shall point
to enough space to hold one record's worth of data of the appropriate type
for that netCDF record variable.  If the pointer for any record variable is
the \fBNULL\fP pointer, no data is read from that variable.  Hence any
subset of record variables may be read by specifying non-\fBNULL\fP pointers
for only the desired record variables.  Invoking this function is equivalent
to a sequence of invocations of ncvarget() for all record variables for
which a non-\fBNULL\fP pointer is specified.  If an error occurs, this
function returns -1.
.HP
\fBint ncrecinq(int \fIncid\fP, int*\ \fInrvars\fP, int\ \fIrvarids[]\fP, long\ \fIrsizes[]\fP)\fR
.sp 
Returns information about the record variables (variables that use the
unlimited dimension) of an open netCDF file.  Upon successful return,
\fInrvars\fP will contain the number of record variables, \fIrvarids\fP will
contain the variable IDs of those record variables, and \fIrsizes\fP will
contain the size in bytes for a record's worth of data for each record
variable.  If any of the return parameters (\fInrvars\fP, \fIrvarids\fP, or
\fIrsizes\fP) is a \fBNULL\fP pointer, the specified information will not be
returned; hence no space needs to be allocated for it.  If an error occurs,
this function returns -1.
.HP
\fBint ncvarrename(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB)\fR
.sp
Changes the name of a netCDF variable in an open netCDF.
If the new name is longer than the old name, the netCDF must be in define mode.
You cannot rename a variable to have the name of any existing variable.
If an error occurs, this function returns -1.
.HP
\fBint ncattput(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB, 
nc_type \fIdatatype\fB, int \fIlen\fB, const void* \fIvalue\fB)\fR
.sp
Adds or changes a variable attribute or global attribute of an
open netCDF file.  If this attribute is new, or if the space required to
store the attribute is greater than before, the netCDF file must be in
define mode.
If an error occurs, this function returns -1.
.HP
\fBint ncattinq(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB, 
nc_type* \fIdatatype\fB, int* \fIlen\fB)\fR
.sp
Returns information about a netCDF attribute, given its variable ID and
name.  The information returned is the type and length of the attribute.  If
either of the return parameters is a \fBNULL\fP pointer, the specified
information will not be returned; hence no space needs to be allocated for
it.  If an error occurs, this function returns -1.
.HP
\fBint ncattget(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB,
void* \fIvalue\fB)\fR
.sp
Gets the value(s) of a netCDF attribute, given its
variable ID and name.
All elements of the vector of attribute
values are returned, so you must allocate enough space to hold
them.  If you don't know how much space to reserve, call \fBncattinq(\|)\fP
first to find out the length of the attribute.
If an error occurs, this function returns -1.
.HP
\fBint ncattcopy(int \fIinncid\fB, int \fIinvar\fB, const char* \fIname\fB,
int \fIoutncid\fB, int \fIoutvar\fB)\fR
.sp
Copies an
attribute from one open netCDF file to another.  It can also be used to
copy an attribute from one variable to another within the same netCDF.
\fIinncid\fP is the netCDF ID of an input netCDF file from which the
attribute will be copied.
\fIinvar\fP
is the ID of the variable in the input netCDF file from which the
attribute will be copied, or \fBNC_GLOBAL\fP for a global attribute.
\fIname\fP
is the name of the attribute in the input netCDF file to be copied.
\fIoutncid\fP
is the netCDF ID of the output netCDF file to which the attribute will be 
copied.
It is permissible for the input and output netCDF IDs to be the same.  The
output netCDF file should be in define mode if the attribute to be
copied does not already exist for the target variable, or if it would
cause an existing target attribute to grow.
\fIoutvar\fP
is the ID of the variable in the output netCDF file to which the attribute will
be copied, or \fBNC_GLOBAL\fP to copy to a global attribute.
If an error occurs, this function returns -1.
.HP
\fBint ncattname(int \fIncid\fB, int \fIvarid\fB, int \fIattnum\fB, 
char* \fIname\fB)\fR
.sp
Gets the
name of an attribute, given its variable ID and number as an attribute
of that variable.  This function is useful in generic applications that
need to get the names of all the attributes associated with a variable,
since attributes are accessed by name rather than number in all other
attribute functions.  The number of an attribute is more volatile than
the name, since it can change when other attributes of the same variable
are deleted.  This is why an attribute number is not called an attribute
ID.
\fIattnum\fP
is the number of the attribute.  The attributes for each variable are numbered
from 0 (the first attribute) to \fInvatts\fP-1, where \fInvatts\fP is
the number of attributes for the variable, as returned from a call to
\fBncvarinq(\|)\fP.
If the \fIname\fP parameter is a \fBNULL\fP pointer, no name will be
returned and no space need be allocated.
If an error occurs, this function returns -1.
.HP
\fBint ncattrename(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB,
const char* \fInewname\fB)\fR
.sp
Changes the
name of an attribute.  If the new name is longer than the original name,
the netCDF must be in define mode.  You cannot rename an attribute to
have the same name as another attribute of the same variable.
\fIname\fP
is the original attribute name.
\fInewname\fP
is the new name to be assigned to the specified attribute.  If the new name
is longer than the old name, the netCDF file must be in define mode.
If an error occurs, this function returns -1.
.HP
\fBint ncattdel(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB)\fR
.sp
Deletes a
netCDF attribute from an open netCDF file.  The netCDF file must be in
define mode.
If an error occurs, this function returns -1.
.HP
\fBint nctypelen(nc_type \fIdatatype\fB)\fR
.sp
Returns the number of bytes in a netCDF data type.
If an error occurs, this function returns -1.
.SH "COMMON ARGUMENT DESCRIPTIONS"
.TP 4
.BI "char* " name
is the name of a dimension, variable, or attribute.
It shall begin with an alphabetic character, followed by
zero or more alphanumeric characters including the underscore
(`_').  Case is significant.
As an input argument, 
it shall be a pointer to a 0-terminated string; as an output argument, it 
shall be the address of a buffer in which to hold such a string.
The maximum allowable number of characters (excluding the terminating 0) is
MAX_NC_NAME.
Attribute names that begin with an underscore (`_') are reserved for use
by the netCDF interface.
.TP
.BI "char* " path
is the pathname of a netCDF file.  It may be absolute or relative.
.TP
.BI "int " ncid
is the netCDF ID returned from a previous, successful call to
\fBncopen(\|)\fP or \fBnccreate(\|)\fP.
.TP
.BI "int " dimids []
is a vector of dimension ID's and defines the shape of a netCDF variable.
The size of the vector shall be greater than or equal to the
rank (i.e. the number of dimensions) of the variable (\fIndims\fP).
The vector shall be ordered by the speed with which a dimension varies:
\fIdimids\fP[\fIndims\fP-1] shall be the dimension ID of the most rapidly
varying dimension and
\fIdimids\fP[0] shall be the dimension ID of the most slowly
varying dimension.
Consequently, if a variable is a record variable, then \fIdimids\fP[0] 
shall be the dimension ID of the record dimension.
The maximum possible number of
dimensions for a variable is given by the symbolic constant
\fBMAX_VAR_DIMS\fP.
.TP
.BI "int " dimid
is the ID of a netCDF dimension.
netCDF dimension ID's are allocated sequentially from the non-negative 
integers beginning with 0.
.TP
.BI "int " len
is the number of values associated with an attribute.
If the attribute is of type \fBNC_CHAR\fP, then this is one more than 
the string length (since the terminating 0 is stored).
.TP
.BI "int " ndims
is either the total number of dimensions in a netCDF dataset or the rank
(i.e. the number of dimensions) of a netCDF variable.
The value shall not be negative or greater than the symbolic constant 
\fBMAX_VAR_DIMS\fP.
.TP
.BI "int " varid
is the ID of a netCDF variable or (for the attribute-access functions) 
the symbolic constant \fBNC_GLOBAL\fP,
which is used to reference global attributes.
netCDF variable ID's are allocated sequentially from the non-negative 
integers beginning with 0.
.TP
.BI "int " natts
is the number of global attributes in a netCDF dataset  for the
\fBncinquire(\|)\fP function or the number
of attributes associated with a netCDF variable for the \fBncvarinq(\|)\fP
function.
.TP
.BI "long " imap []
is the index mapping vector that specifies how data values associated with a 
netCDF variable are arranged in memory.
The offset, in bytes, from the memory location pointed to by the \fIvalue\fP
argument to a particular datum is given by the
inner (dot) product of the index mapping vector with the coordinates of 
the datum.
For example,
on a machine where `\fBsizeof(float) == 4\fP',
the index mapping vector for the array `\fBfloat u[3][5];\fP' is 
`\fBlong imap[2] = {20,4}\fP'.
Note that the index mapping vector can be
used to access memory-resident data values in a manner that differs 
radically from the nominal structure of the associated netCDF variable.
For example, the following definitions
.sp
.RS +8
.nf
struct vel {
    int flags;
    float u;
    float v;
} vel[NX][NY];
long imap[2] = {
    sizeof(struct vel),
    sizeof(struct vel)*NY};
.fi
.RE
.sp
.TP
\&
can be used to access the memory-resident values of the netCDF variable,
`\fBu[NY][NX]\fP', even
though the dimensions are transposed and the data is contained in a 2-D array
of structures rather than a 2-D array of floating-point values.
The index mapping vector may contain negative values if the
\fIvalue\fP argument is appropriately set.
A \fBNULL\fP index mapping vector argument obtains the default behavior in
which the memory-resident values are assumed to have the same structure as the 
associated netCDF variable.
.TP
.BI "long " coords []
specifies the indicial coordinates of the netCDF data value to be accessed.
The indices are relative to 0; thus, for example, the first data value of a
two-dimensional variable is \fB(0,0)\fP.
The size of the vector shall be at least the rank of the associated
netCDF variable and its elements shall correspond, in order, to the
variable's dimensions.
Consequently, if the variable is a record variable, then the first 
index is the record number.
.TP
.BI "long " count []
specifies the number of data values to be accessed in terms of the 
lengths of the sides of the hyperslab.
Thus, to access a single value, for example, specify \fIcount\fP as
\fB(1, 1, ..., 1)\fP.
Note that, for generalized hyperslab I/O, this argument must be adjusted
to be compatible with the \fIstride\fP and \fIstart\fP arguments so that 
the interaction of the
three does not attempt to access an invalid data co-ordinate.
For example, to
access every \fIstride\fB(\fIi\fB)\fR'th datum along dimension \fIi\fP
beginning with point \fIstart\fB(\fIi\fB), 
\fIcounts\fB(\fIi\fB)\fR should be 
\fB1+(\fInpts\fB(\fIi\fB)-1-\fIstart\fB(\fIi\fB))/\fIstride\fB(\fIi\fB)\fR:
where \fInpts\fB(\fIi\fB)\fR is the size of dimension \fIi\fR.
The size of the \fIcount\fP vector shall be at least the rank of the associated
netCDF variable and its elements shall correspond, in order, to the
variable's dimensions.
Consequently, if the variable is a record variable, then the first 
element of \fIcount\fP is the number of records to access.
.TP
.BI "long " length
is the size of a netCDF dimension.
As an input argument, it shall be a positive integer or the symbolic constant
\fBNC_UNLIMITED\fP.
At most one such unlimited size dimension, called the record dimension,
shall be defined in a netCDF dataset.
As an output argument, it shall be a positive integer.
.TP
.BI "long " start []
specifies 
the starting point
for accessing a netCDF variable's data values
in terms of the indicial coordinates of 
the corner of the hyperslab.
The indices are relative to 0; thus, the first data
value of a variable is \fB(0, 0, ..., 0)\fP.
The size of the vector shall be at least the rank of the associated
netCDF variable and its elements shall correspond, in order, to the
variable's dimensions.
Consequently, if the variable is a record variable, then the first index 
is the starting record number for accessing the netCDF variable's data values.
.TP
.BI "long " stride []
specifies,
for each dimension,
the interval between the accessed values of a netCDF variable.
The size of the vector shall be at least the rank of the associated
netCDF variable and its elements shall correspond, in order, to the
variable's dimensions.
A value of 1 accesses adjacent values of the netCDF variable 
in the corresponding dimension;
a value of 2 accesses every other value of the netCDF variable in the
corresponding dimension; and so on.
Attempting to access a data value that lies outside the defined data space
of a variable is an error.
A \fBNULL\fP stride argument obtains the default behavior in which
adjacent values are accessed along each dimension.
.TP
.BI "nc_type " datatype
specifies the data type of a netCDF variable and is one of the following:
\fBNC_BYTE\fP, \fBNC_CHAR\fP, \fBNC_SHORT\fP, \fBNC_LONG\fP, 
\fBNC_FLOAT\fP, or \fBNC_DOUBLE\fP.
.TP
.BI "void* " value
points to the start of the memory-resident data values to be accessed.
The pointer is declared to be
of type \fBvoid*\fP because it can point to data of any of the basic
netCDF types.
The data should be of the appropriate type for the netCDF
variable:
.sp
.RS +8
.TS
tab(|);
c c
l l.
\fBnetCDF Type|C Type\fP

NC_BYTE|unsigned char
NC_CHAR|char
NC_SHORT|short
NC_LONG|\fBnclong\fP
NC_FLOAT|float
NC_DOUBLE|double
.TE
.RE
.IP
NOTE: The C type corresponding to the netCDF type \fBNC_LONG\fP is
\fBnclong\fP.  
This type is defined in the netCDF header file and
is guaranteed to hold at least 32 bits.
It is defined as either a C `\fBint\fP' or a C `\fBlong\fP' -- depending on the
platform.
.IP
\fBWarning: neither the compiler nor the netCDF software
can detect if the wrong type of data is used.\fP
.SH "VARIABLE PREFILLING"
.LP
By default, the netCDF interface sets the values of
all newly-defined variables of finite length (i.e. not having an unlimited, 
record dimension) to the type-dependent fill-value associated with each 
variable.  This is done when `\fBncendef()\fP' is called.  The
fill-value for a variable may be changed from the default value by
defining the attribute `\fB_FillValue\fP' for the variable.  This
attribute must have the same type as the variable and be of length one.
.LP
Variables with an unlimited record dimension are also prefilled, but on
an `as needed' basis.  For example, if the first write of a record
variable is to position 5, then positions 0 through 4 (and no others)
would be set to the fill-value at the same time.
.LP
This default prefilling of data values may be disabled by calling the
function \fBncsetfill(\|)\fP with the argument \fBNC_NOFILL\fP.  Note
that, for non-record variables, this call must be made before
\fBncendef()\fP; whereas, for record-variables, this call may be made at
any time.
.LP
One can obtain increased performance of the netCDF interface by using 
this feature, but only at the expense of requiring the application to set
every single data value.
.SH "GLOBAL OPTIONS"
.LP
The global variable `\fBncopts\fP', which is defined in
`\fBnetcdf.h\fP', affects the actions of the netCDF interface. It may
be set by the user to the bitwise OR of any of the following, non-zero,
symbolic bit-values:
.TP 14
.B NC_VERBOSE
Print error-messages on standard error.
.TP
.B NC_FATAL
Abort.  Call `\fBexit()\fP' with an error-condition if an error
occurs.
.LP
By default, `\fBncopts\fP' is `\fBNC_VERBOSE | NC_FATAL\fP'.
.SH "ENVIRONMENT VARIABLES"
.TP 4
.B NETCDF_FFIOSPEC
Specifies the Flexible File I/O buffers for netCDF I/O when executing
under the UNICOS operating system (the variable is ignored on other
operating systems).
An appropriate specification can greatly increase the efficiency of 
netCDF I/O -- to the extent that it can actually surpass FORTRAN binary 
I/O.
The default specification is \fBbufa:336:2\fP.
See UNICOS Flexible File I/O for more information.
.SH "MAILING-LISTS"
.LP
Both a mailing list and a digest are available for
discussion of the netCDF interface and announcements about netCDF bugs,
fixes, and enhancements.
To begin or change your subscription to either the mailing-list or the
digest, send one of the following in the body (not
the subject line) of an email message to "Majordomo at unidata.ucar.edu".
Use your email address in place of \fIjdoe at host.inst.domain\fP.
.sp
To subscribe to the netCDF mailing list:
.RS
\fBsubscribe netcdfgroup \fIjdoe at host.inst.domain\fR
.RE
To unsubscribe from the netCDF mailing list:
.RS
\fBunsubscribe netcdfgroup \fIjdoe at host.inst.domain\fR
.RE
To subscribe to the netCDF digest:
.RS
\fBsubscribe netcdfdigest \fIjdoe at host.inst.domain\fR
.RE
To unsubscribe from the netCDF digest:
.RS
\fBunsubscribe netcdfdigest \fIjdoe at host.inst.domain\fR
.RE
To retrieve the general introductory information for the mailing list:
.RS
\fBinfo netcdfgroup\fR
.RE
To get a synopsis of other majordomo commands:
.RS
\fBhelp\fR
.RE
.SH "SEE ALSO"
.BR ncdump (1),
.BR ncgen (1),
.BR netcdf (3f).
.LP
\fInetCDF User's Guide\fP, published
by the Unidata Program Center, University Corporation for Atmospheric
Research, located in Boulder, Colorado.


--- NEW FILE netcdf-perl.spec ---
Name:           netcdf-perl
Version:        1.2.3
Release:        2%{?dist}
Summary:        Perl extension module for scientific data access via the netCDF API

Group:          Development/Libraries
License:        NetCDF
URL:            http://www.unidata.ucar.edu/software/netcdf-perl/
Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf-perl/netcdf-perl-%{version}.tar.Z
Source1:        netcdf-2.3
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl, netcdf-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:  perl-NetCDF = %{version}-%{release}


%description
The netCDF Perl package is a perl extension module for scientific data access
via the netCDF API.


%prep
%setup -q
sed -i -e '1s,/usr/local/bin/perl,%{_bindir}/perl,' src/perl/test.pl


%build
cd src
export PERL_MANDIR=%{_mandir}
export CPP_NETCDF=-I%{_includedir}/netcdf-3
export LD_NETCDF="-L%{_libdir}/netcdf-3 -lnetcdf"
%configure
cd perl
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
cd src
# use the top-level Makefile only for manpage installation
make installed_manuals MANDIR=$RPM_BUILD_ROOT%{_mandir}
cd perl
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' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

# install netcdf-2 man page
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man3
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man3


%check
cd src
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc src/COPYRIGHT src/HISTORY src/README src/perl/test.pl
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/NetCDF.pm
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*


%changelog
* Tue Nov 14 2006 - Orion Poplawski  - 1.2.3-2
- Changed license to NetCDF, will be changed upstream next release
- Add src/perl/test.pl to %%doc
- Added netcdf-2 man page
- Only use top level Makefile for installing man pages

* Mon Nov 13 2006 - Orion Poplawski  - 1.2.3-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf-perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 22:22:57 -0000	1.1
+++ .cvsignore	22 Nov 2006 22:23:39 -0000	1.2
@@ -0,0 +1 @@
+netcdf-perl-1.2.3.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf-perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 22:22:57 -0000	1.1
+++ sources	22 Nov 2006 22:23:39 -0000	1.2
@@ -0,0 +1 @@
+936c91794d82ff8cfe2a955d4cad4c27  netcdf-perl-1.2.3.tar.Z



From fedora-extras-commits at redhat.com  Wed Nov 22 22:48:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 22 Nov 2006 17:48:32 -0500
Subject: rpms/celestia/FC-6 celestia-1.4.1-strictalias.patch, NONE,
	1.1 celestia.spec, 1.20, 1.21
Message-ID: <200611222248.kAMMmW34013835@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13817

Modified Files:
	celestia.spec 
Added Files:
	celestia-1.4.1-strictalias.patch 
Log Message:
Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
Hopefully really handle the gconf schema properly.


celestia-1.4.1-strictalias.patch:

--- NEW FILE celestia-1.4.1-strictalias.patch ---
--- celestia-1.4.1/src/celengine/modelfile.cpp.strictalias	2006-11-22 14:04:15.000000000 +0100
+++ celestia-1.4.1/src/celengine/modelfile.cpp	2006-11-22 14:01:27.000000000 +0100
@@ -1080,7 +1080,9 @@
 static float readFloat(istream& in)
 {
     int i = readUint(in);
-    return *((float*) &i);
+    float f;
+    memcpy(&f, &i, sizeof(float));
+    return f;
 }
 
 


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-6/celestia.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- celestia.spec	28 Aug 2006 23:50:49 -0000	1.20
+++ celestia.spec	22 Nov 2006 22:48:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           celestia
 Version:        1.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OpenGL real-time visual space simulation
 Group:          Amusements/Graphics
 License:        GPL
@@ -9,6 +9,7 @@
 Patch0:         celestia-1.4.0-compile.patch
 Patch1:         celestia-1.4.1-lua51.patch
 Patch2:         celestia-1.4.1-lua51-resume.patch
+Patch3:         celestia-1.4.1-strictalias.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,8 +23,8 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  lua-devel
-BuildRequires:  automake17
 BuildRequires:  gettext-devel
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -46,21 +47,28 @@
 %patch0 -p0
 %patch1 -p1 -b .lua51
 %patch2 -p1 -b .lua51-resume
+%patch3 -p1 -b .strictalias
+
+# Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede).
+sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure
+sed -i 's/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS \$CELESTIA_CXXFLAGS"/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS"/' configure
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
+
 
 %build
 export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
-# http://www.shatters.net/forum/viewtopic.php?t=9605
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-%configure --with-gnome --with-lua --disable-schemas-install
+%configure --with-gnome --with-lua
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
@@ -86,15 +94,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 &>/dev/null || :
+fi
 
 %post
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
 %preun
-if [ "$1" = "0" ] ; then
-  GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+if [ "$1" -eq "0" ] ; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 &>/dev/null || :
 fi
 
 
@@ -105,12 +123,17 @@
 # Seem to have gone away in post-1.4.0 CVS...
 #%doc manual/*.html manual/*.css
 %{_bindir}/*
+%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.png
 
 
 %changelog
+* Wed Nov 22 2006 Steven Pritchard  1.4.1-7
+- Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
+- Hopefully really handle the gconf schema properly.
+
 * Mon Aug 28 2006 Steven Pritchard  1.4.1-6
 - Add --disable-schemas-install to configure.
 
@@ -218,4 +241,3 @@
 
 * Tue May 14 2002 Julien MOUTTE 
 - Initial RPM release.
-



From fedora-extras-commits at redhat.com  Wed Nov 22 22:50:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 22 Nov 2006 17:50:40 -0500
Subject: rpms/celestia/FC-5 celestia-1.4.1-strictalias.patch, NONE,
	1.1 celestia.spec, 1.18, 1.19
Message-ID: <200611222250.kAMMoeTR013905@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13884

Modified Files:
	celestia.spec 
Added Files:
	celestia-1.4.1-strictalias.patch 
Log Message:
Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
Hopefully really handle the gconf schema properly.


celestia-1.4.1-strictalias.patch:

--- NEW FILE celestia-1.4.1-strictalias.patch ---
--- celestia-1.4.1/src/celengine/modelfile.cpp.strictalias	2006-11-22 14:04:15.000000000 +0100
+++ celestia-1.4.1/src/celengine/modelfile.cpp	2006-11-22 14:01:27.000000000 +0100
@@ -1080,7 +1080,9 @@
 static float readFloat(istream& in)
 {
     int i = readUint(in);
-    return *((float*) &i);
+    float f;
+    memcpy(&f, &i, sizeof(float));
+    return f;
 }
 
 


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-5/celestia.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- celestia.spec	22 Aug 2006 16:48:27 -0000	1.18
+++ celestia.spec	22 Nov 2006 22:50:10 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           celestia
 Version:        1.4.1
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        OpenGL real-time visual space simulation
 Group:          Amusements/Graphics
 License:        GPL
@@ -9,6 +9,7 @@
 Patch0:         celestia-1.4.0-compile.patch
 Patch1:         celestia-1.4.1-lua51.patch
 Patch2:         celestia-1.4.1-lua51-resume.patch
+Patch3:         celestia-1.4.1-strictalias.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,8 +23,8 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  lua-devel
-BuildRequires:  automake17
 BuildRequires:  gettext-devel
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -46,11 +47,20 @@
 %patch0 -p0
 %patch1 -p1 -b .lua51
 %patch2 -p1 -b .lua51-resume
+%patch3 -p1 -b .strictalias
+
+# Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede).
+sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure
+sed -i 's/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS \$CELESTIA_CXXFLAGS"/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS"/' configure
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
+
 
 %build
 export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
-# http://www.shatters.net/forum/viewtopic.php?t=9605
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 %configure --with-gnome --with-lua
 make %{?_smp_mflags}
 
@@ -58,9 +68,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
@@ -86,15 +94,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 &>/dev/null || :
+fi
 
 %post
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
 %preun
-if [ "$1" = "0" ] ; then
-  GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+if [ "$1" -eq "0" ] ; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 &>/dev/null || :
 fi
 
 
@@ -112,6 +130,13 @@
 
 
 %changelog
+* Wed Nov 22 2006 Steven Pritchard  1.4.1-7
+- Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
+- Hopefully really handle the gconf schema properly.
+
+* Mon Aug 28 2006 Steven Pritchard  1.4.1-6
+- Add --disable-schemas-install to configure.
+
 * Tue Aug 22 2006 Steven Pritchard  1.4.1-5
 - Turn on -fno-strict-aliasing to work around bug #203525.
 
@@ -216,4 +241,3 @@
 
 * Tue May 14 2002 Julien MOUTTE 
 - Initial RPM release.
-



From fedora-extras-commits at redhat.com  Wed Nov 22 23:16:29 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 22 Nov 2006 18:16:29 -0500
Subject: rpms/mhonarc/FC-6 mhonarc.spec,1.15,1.16
Message-ID: <200611222316.kAMNGTBD017226@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/mhonarc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182/FC-6

Modified Files:
	mhonarc.spec 
Log Message:
build on x86_64 now that perl-Unicode-Map8 builds there too


Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/FC-6/mhonarc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mhonarc.spec	30 Aug 2006 15:52:44 -0000	1.15
+++ mhonarc.spec	22 Nov 2006 23:15:59 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mhonarc
 Version:        2.6.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
@@ -12,9 +12,6 @@
 BuildArch:      noarch
 Provides:       MHonArc = %{version}-%{release}
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch:    x86_64
-
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail
@@ -54,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Aurelien Bompard  2.6.16-3
+- rebuild, perl-Unicode-Map8 now builds on x86_64
+
 * Wed Aug 30 2006 Aurelien Bompard  2.6.16-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 22 23:16:29 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 22 Nov 2006 18:16:29 -0500
Subject: rpms/mhonarc/FC-5 mhonarc.spec,1.14,1.15
Message-ID: <200611222316.kAMNGTM5017223@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/mhonarc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182/FC-5

Modified Files:
	mhonarc.spec 
Log Message:
build on x86_64 now that perl-Unicode-Map8 builds there too


Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/FC-5/mhonarc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mhonarc.spec	15 Jun 2006 18:56:39 -0000	1.14
+++ mhonarc.spec	22 Nov 2006 23:15:59 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mhonarc
 Version:        2.6.16
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
@@ -12,9 +12,6 @@
 BuildArch:      noarch
 Provides:       MHonArc = %{version}-%{release}
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch: x86_64
-
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail
@@ -54,6 +51,12 @@
 
 
 %changelog
+* Sat Nov 18 2006 Aurelien Bompard  2.6.16-3
+- rebuild, perl-Unicode-Map8 now builds on x86_64
+
+* Wed Aug 30 2006 Aurelien Bompard  2.6.16-2
+- rebuild
+
 * Thu Jun 15 2006 Aurelien Bompard  2.6.16-1
 - version 2.6.16
 



From fedora-extras-commits at redhat.com  Wed Nov 22 23:16:35 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 22 Nov 2006 18:16:35 -0500
Subject: rpms/mhonarc/devel mhonarc.spec,1.15,1.16
Message-ID: <200611222316.kAMNGZ8w017229@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/mhonarc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182/devel

Modified Files:
	mhonarc.spec 
Log Message:
build on x86_64 now that perl-Unicode-Map8 builds there too


Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mhonarc.spec	30 Aug 2006 15:52:44 -0000	1.15
+++ mhonarc.spec	22 Nov 2006 23:16:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mhonarc
 Version:        2.6.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
@@ -12,9 +12,6 @@
 BuildArch:      noarch
 Provides:       MHonArc = %{version}-%{release}
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch:    x86_64
-
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail
@@ -54,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Aurelien Bompard  2.6.16-3
+- rebuild, perl-Unicode-Map8 now builds on x86_64
+
 * Wed Aug 30 2006 Aurelien Bompard  2.6.16-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 00:04:31 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 22 Nov 2006 19:04:31 -0500
Subject: owners owners.list,1.1998,1.1999
Message-ID: <200611230004.kAN04VM4020580@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20565

Modified Files:
	owners.list 
Log Message:
fix dd2 entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1998
retrieving revision 1.1999
diff -u -r1.1998 -r1.1999
--- owners.list	22 Nov 2006 22:22:44 -0000	1.1998
+++ owners.list	23 Nov 2006 00:04:00 -0000	1.1999
@@ -289,7 +289,7 @@
 Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|dbus-qt|Qt-based library for using D-BUS|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dclib|Direct Connect file sharing library|lmacken at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|dd2|Dodgin' Diamond 2 - Shoot'em up arcade game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|dd2|Dodgin' Diamond 2 - Shoot'em up arcade game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ddclient|A client to update dynamic DNS host entries|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|thomas at apestaart.org
 Fedora Extras|ddd|GUI for several command-line debuggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 23 00:09:03 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:09:03 -0500
Subject: rpms/VLGothic-fonts - New directory
Message-ID: <200611230009.kAN093U7020636@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632/VLGothic-fonts

Log Message:
Directory /cvs/extras/rpms/VLGothic-fonts added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 00:09:09 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:09:09 -0500
Subject: rpms/VLGothic-fonts/devel - New directory
Message-ID: <200611230009.kAN099Lk020649@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632/VLGothic-fonts/devel

Log Message:
Directory /cvs/extras/rpms/VLGothic-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 00:09:26 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:09:26 -0500
Subject: rpms/VLGothic-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611230009.kAN09QPG020684@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20678

Added Files:
	Makefile import.log 
Log Message:
Setup of module VLGothic-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module VLGothic-fonts
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 Nov 23 00:09:32 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:09:32 -0500
Subject: rpms/VLGothic-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611230009.kAN09WLV020702@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20678/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module VLGothic-fonts


--- 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 Nov 23 00:10:29 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 22 Nov 2006 19:10:29 -0500
Subject: rpms/bsd-games/FC-6 bsd-games.spec,1.8,1.9 config.params,1.3,1.4
Message-ID: <200611230010.kAN0ATOu020817@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20742

Modified Files:
	bsd-games.spec config.params 
Log Message:
Drop 'wargames' non-game from the package




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-6/bsd-games.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bsd-games.spec	15 Oct 2006 05:17:22 -0000	1.8
+++ bsd-games.spec	23 Nov 2006 00:09:59 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -21,7 +21,7 @@
 # Add patches for man page renames
 Patch8: bsd-games-2.17-monop-rename.patch
 Patch9: bsd-games-2.17-banner-rename.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libtermcap-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
 
@@ -30,7 +30,7 @@
 bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku,
 hunt, mille, mpoly, morse, number, phantasia, pig, pom, ppt, primes,
 quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon,
-tetris-bsd, trek, wargames, worm, worms and wump.
+tetris-bsd, trek, worm, worms and wump.
 
 %prep
 %setup -q
@@ -134,7 +134,6 @@
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
 %{_bindir}/vert-banner
-%{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
 %{_bindir}/wtf
@@ -161,6 +160,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Wed Nov 22 2006 Wart  2.17-16
+- Drop the useless game 'wargames'
+
 * Sat Oct 14 2006 Wart  2.17-15
 - Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
 
@@ -241,7 +243,7 @@
 - kill countmail, no longer require frm from elm
 
 * Mon Jun 5 2000 Tim Powers 
-- fixed man page location to be in %{_mandir}
+- fixed man page location to be in %%{_mandir}
 - fixed so that regular users can build
 
 * Fri May 5 2000 Tim Powers 
@@ -258,7 +260,7 @@
 - updated source to 2.8
 - fixed problem with ospeed being defined in the source instead of including
 	termcap.h (new ospeed patch)
-- using files list in %files section instead of entering
+- using files list in %%files section instead of entering
 	_every_single_filename_.
 
 * Sat Aug 21 1999 Bill Nottingham 


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-6/config.params,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.params	15 Oct 2006 05:17:22 -0000	1.3
+++ config.params	23 Nov 2006 00:09:59 -0000	1.4
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune wargames"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@



From fedora-extras-commits at redhat.com  Thu Nov 23 00:10:53 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:10:53 -0500
Subject: rpms/VLGothic-fonts import.log,1.1,1.2
Message-ID: <200611230010.kAN0ArEA020863@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20789

Modified Files:
	import.log 
Log Message:
auto-import VLGothic-fonts-20061026-3 on branch devel from VLGothic-fonts-20061026-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Nov 2006 00:09:26 -0000	1.1
+++ import.log	23 Nov 2006 00:10:23 -0000	1.2
@@ -0,0 +1 @@
+VLGothic-fonts-20061026-3:HEAD:VLGothic-fonts-20061026-3.src.rpm:1164240642



From fedora-extras-commits at redhat.com  Thu Nov 23 00:10:53 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:10:53 -0500
Subject: rpms/VLGothic-fonts/devel 30-VLGothic.conf, NONE,
	1.1 VLGothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611230010.kAN0ArSG020865@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20789/devel

Modified Files:
	.cvsignore sources 
Added Files:
	30-VLGothic.conf VLGothic-fonts.spec 
Log Message:
auto-import VLGothic-fonts-20061026-3 on branch devel from VLGothic-fonts-20061026-3.src.rpm


--- NEW FILE 30-VLGothic.conf ---



    
        
            VL Gothic
        
        
            false
        
    
    
    
        
            VL PGothic
        
        
            false
        
    
    
    
        
            ja
            en
        
        
            en
        
    
    
    
        monospace
        
            VL Gothic
        
    

    
        sans-serif
        
            VL PGothic
        
    



--- NEW FILE VLGothic-fonts.spec ---
Name: VLGothic-fonts
Version: 20061026
Release: 3%{?_dist}
Summary: VLGothic the Japanese TrueType font

License: Distributable
Group: User Interface/X
URL: http://dicey.org/vlgothic
Source0: http://vinelinux.org/~daisuke/vlgothic/VLGothic-%{version}.tar.bz2
Source1: 30-VLGothic.conf
BuildRoot: %{_tmppath}/VLGothic-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: fontconfig
Obsoletes: VLGothic <= %{version}-%{release}
Provides:  VLGothic = %{version}-%{release}

%description
VLGothic is a Japanese TrueType font maden by Vine Linux project.
The most of grphys are imported from M+ fonts and sazanami mincho, 
and later patched by them.

%prep
%setup -q -n VLGothic


%build


%install
rm -rf ${RPM_BUILD_ROOT}

mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
install -p -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d

mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/fonts/japanese/TrueType
mv *.ttf ${RPM_BUILD_ROOT}/%{_datadir}/fonts/japanese/TrueType


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc README* LICENSE*
%dir %{_datadir}/fonts/japanese/
%dir %{_datadir}/fonts/japanese/TrueType
%config(noreplace) %{_sysconfdir}/fonts/conf.d/30-VLGothic.conf
%{_datadir}/fonts/japanese/TrueType/*.ttf


%changelog
* Sat Nov 18 2006 Ryo Dairiki  - 20061026-3
- Modify the specfile along with the Fedora Extras packaging policy.

* Sun Nov 12 2006 Ryo Dairiki  - 20061026-2
- Modify the specfile.

* Sun Nov 12 2006 Ryo Dairiki  - 20061026-1
- Preparing for Fedora Extras.

* Sat Oct 28 2006 Ryo Dairiki  - 20061021-2
- Update to 20061021.

* Tue Sep 19 2006 Ryo Dairiki  - 20060913-2
- Update to 20060913.

* Thu Aug 31 2006 Ryo Dairiki  - 20060831-1
- Initial packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Nov 2006 00:09:32 -0000	1.1
+++ .cvsignore	23 Nov 2006 00:10:23 -0000	1.2
@@ -0,0 +1 @@
+VLGothic-20061026.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Nov 2006 00:09:32 -0000	1.1
+++ sources	23 Nov 2006 00:10:23 -0000	1.2
@@ -0,0 +1 @@
+b827b4a513f044edef080f1d65e0f861  VLGothic-20061026.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 01:33:24 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 20:33:24 -0500
Subject: owners owners.list,1.1999,1.2000
Message-ID: <200611230133.kAN1XOdT024117@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24090

Modified Files:
	owners.list 
Log Message:
Add "VLGothic-fonts"



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1999
retrieving revision 1.2000
diff -u -r1.1999 -r1.2000
--- owners.list	23 Nov 2006 00:04:00 -0000	1.1999
+++ owners.list	23 Nov 2006 01:32:54 -0000	1.2000
@@ -2390,6 +2390,7 @@
 Fedora Extras|vips|Library for processing large images|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|vkeybd|Virtual MIDI keyboard|green at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|VLGothic-fonts|VLGothic the Japanese TrueType font|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|vnc-reflector|A specialized, multiplexing vnc proxy server|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 23 04:10:16 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 22 Nov 2006 23:10:16 -0500
Subject: rpms/labyrinth/FC-5 labyrinth.spec,1.1,1.2
Message-ID: <200611230410.kAN4AGgc001420@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1401

Modified Files:
	labyrinth.spec 
Log Message:
FC5 doesn't have the -devel package split from the gnome-python2 main package, so update the BR to reflect that.


Index: labyrinth.spec
===================================================================
RCS file: /cvs/extras/rpms/labyrinth/FC-5/labyrinth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- labyrinth.spec	22 Nov 2006 02:07:16 -0000	1.1
+++ labyrinth.spec	23 Nov 2006 04:09:46 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		labyrinth
 Version:	0.3
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	A simple yet powerful mind-mapping tool for the GNOME desktop
 
 Group:		Applications/Productivity
@@ -18,7 +18,7 @@
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	pygtk2-devel >= 2.8
-BuildRequires:	gnome-python2-devel >= 2.12
+BuildRequires:	gnome-python2 >= 2.12
 BuildRequires:	gnome-desktop-devel >= 2.14
 BuildRequires:	desktop-file-utils
 
@@ -88,7 +88,11 @@
 
 
 %changelog
+* Wed Nov 22 2006 Peter Gordon  - 0.3-1.1
+- Update BR (FC5 doesn't have the -devel package split out):
+  from gnome-python2-devel to gnome-python2
+
 * Wed Nov 15 2006 Peter Gordon  - 0.3-1
 - Initial packaging.
 - Add patch to fix interpreters on MainWindow.py and Links.py scripts:
-  + fix-interpreters.patch
\ No newline at end of file
+  + fix-interpreters.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 04:13:17 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 23:13:17 -0500
Subject: rpms/linphone/devel linphone.spec,1.25,1.26
Message-ID: <200611230413.kAN4DHrk001479@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1464

Modified Files:
	linphone.spec 
Log Message:
Mark translated man pages with lang macro


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- linphone.spec	22 Nov 2006 04:50:55 -0000	1.25
+++ linphone.spec	23 Nov 2006 04:12:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -118,7 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
-%{_mandir}/cs/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -136,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 1.5.1-2
+- Mark translated man pages with lang macro
+
 * Tue Nov 21 2006 Jeffrey C. Ollie  - 1.5.1-1
 - Update to 1.5.1
 



From fedora-extras-commits at redhat.com  Thu Nov 23 04:15:00 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 23:15:00 -0500
Subject: rpms/linphone/FC-6 linphone.spec,1.24,1.25
Message-ID: <200611230415.kAN4F0FH001540@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1525

Modified Files:
	linphone.spec 
Log Message:
Mark translated man pages with lang macro


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/linphone.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linphone.spec	22 Nov 2006 04:52:00 -0000	1.24
+++ linphone.spec	23 Nov 2006 04:14:30 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -118,7 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
-%{_mandir}/cs/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -136,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 1.5.1-2
+- Mark translated man pages with lang macro
+
 * Tue Nov 21 2006 Jeffrey C. Ollie  - 1.5.1-1
 - Update to 1.5.1
 



From fedora-extras-commits at redhat.com  Thu Nov 23 04:23:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 23:23:58 -0500
Subject: rpms/perl-Sub-Install Makefile,1.1,1.2
Message-ID: <200611230423.kAN4NwmC001821@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1763

Modified Files:
	Makefile 
Log Message:
update to 0.924



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 04:52:43 -0000	1.1
+++ Makefile	23 Nov 2006 04:23:28 -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  Thu Nov 23 04:23:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 23:23:59 -0500
Subject: rpms/perl-Sub-Install/FC-5 perl-Sub-Install.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <200611230424.kAN4NxlK001825@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Install/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1763/FC-5

Modified Files:
	perl-Sub-Install.spec sources 
Log Message:
update to 0.924



Index: perl-Sub-Install.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/FC-5/perl-Sub-Install.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Sub-Install.spec	7 Sep 2006 05:05:09 -0000	1.2
+++ perl-Sub-Install.spec	23 Nov 2006 04:23:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Install
-Version:        0.922
-Release:        2%{?dist}
+Version:        0.924
+Release:        1%{?dist}
 Summary:        Install subroutines into packages easily
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# testing
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Perl::Critic)
 
 %description
 This module makes it easy to install subroutines into packages without the
@@ -50,6 +52,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 22 2006 Chris Weyl  0.924-1
+- update to 0.924
+- add perl(Test::Perl::Critic) to BR's
+
 * Wed Sep 06 2006 Chris Weyl  0.922-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:53:21 -0000	1.2
+++ sources	23 Nov 2006 04:23:29 -0000	1.3
@@ -1 +1 @@
-48e8e9f72cdd5b3f5f7115b8b7de3ddf  Sub-Install-0.922.tar.gz
+eae66cb5cbd2064ae02b3aeacf6338e4  Sub-Install-0.924.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 04:24:04 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 23:24:04 -0500
Subject: rpms/perl-Sub-Install/devel .cvsignore, 1.2,
	1.3 perl-Sub-Install.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611230424.kAN4O4Cx001834@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Install/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1763/devel

Modified Files:
	.cvsignore perl-Sub-Install.spec sources 
Log Message:
update to 0.924



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 04:53:21 -0000	1.2
+++ .cvsignore	23 Nov 2006 04:23:34 -0000	1.3
@@ -1 +1 @@
-Sub-Install-0.922.tar.gz
+Sub-Install-0.924.tar.gz


Index: perl-Sub-Install.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/devel/perl-Sub-Install.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Sub-Install.spec	7 Sep 2006 04:54:30 -0000	1.2
+++ perl-Sub-Install.spec	23 Nov 2006 04:23:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Install
-Version:        0.922
-Release:        2%{?dist}
+Version:        0.924
+Release:        1%{?dist}
 Summary:        Install subroutines into packages easily
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# testing
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Perl::Critic)
 
 %description
 This module makes it easy to install subroutines into packages without the
@@ -50,6 +52,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 22 2006 Chris Weyl  0.924-1
+- update to 0.924
+- add perl(Test::Perl::Critic) to BR's
+
 * Wed Sep 06 2006 Chris Weyl  0.922-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:53:21 -0000	1.2
+++ sources	23 Nov 2006 04:23:34 -0000	1.3
@@ -1 +1 @@
-48e8e9f72cdd5b3f5f7115b8b7de3ddf  Sub-Install-0.922.tar.gz
+eae66cb5cbd2064ae02b3aeacf6338e4  Sub-Install-0.924.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 04:24:04 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 23:24:04 -0500
Subject: rpms/perl-Sub-Install/FC-6 perl-Sub-Install.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <200611230424.kAN4O4C1001829@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Install/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1763/FC-6

Modified Files:
	perl-Sub-Install.spec sources 
Log Message:
update to 0.924



Index: perl-Sub-Install.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/FC-6/perl-Sub-Install.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Sub-Install.spec	7 Sep 2006 04:54:30 -0000	1.2
+++ perl-Sub-Install.spec	23 Nov 2006 04:23:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Install
-Version:        0.922
-Release:        2%{?dist}
+Version:        0.924
+Release:        1%{?dist}
 Summary:        Install subroutines into packages easily
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# testing
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Perl::Critic)
 
 %description
 This module makes it easy to install subroutines into packages without the
@@ -50,6 +52,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 22 2006 Chris Weyl  0.924-1
+- update to 0.924
+- add perl(Test::Perl::Critic) to BR's
+
 * Wed Sep 06 2006 Chris Weyl  0.922-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:53:21 -0000	1.2
+++ sources	23 Nov 2006 04:23:34 -0000	1.3
@@ -1 +1 @@
-48e8e9f72cdd5b3f5f7115b8b7de3ddf  Sub-Install-0.922.tar.gz
+eae66cb5cbd2064ae02b3aeacf6338e4  Sub-Install-0.924.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 04:33:52 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 22 Nov 2006 23:33:52 -0500
Subject: rpms/labyrinth/FC-5 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch,
	1.1, NONE labyrinth-fix-interpreters.patch, 1.1,
	NONE labyrinth.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200611230433.kAN4Xq9S001982@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1977/FC-5

Removed Files:
	.cvsignore Makefile branch labyrinth-fix-interpreters.patch 
	labyrinth.spec sources 
Log Message:
FC-5 doesn't meet the minimum build requirements for Labyrinth (pygobject2 >= 2.10), unfortunately. Apologies that I didn't catch that before requesting the branch.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- labyrinth-fix-interpreters.patch DELETED ---


--- labyrinth.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 23 05:58:07 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 23 Nov 2006 00:58:07 -0500
Subject: rpms/flow-tools/FC-5 flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.7, 1.8
Message-ID: <200611230558.kAN5w7bm005425@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353/FC-5

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz#212928


flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/FC-5/flow-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- flow-tools.spec	18 Jun 2006 16:12:28 -0000	1.7
+++ flow-tools.spec	23 Nov 2006 05:57:37 -0000	1.8
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 8%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,9 +14,10 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel
+BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,18 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
+* Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
+- rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-10
+- Rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-9
+- Fix build in mock with minimal build environment #197706
+
 * Sat Jun 10 2006 Paul P Komkoff Jr  0.68-8
 - Split patches in more convenient way (and bug upstream)
 - Fix 2 unitialized variable bugs



From fedora-extras-commits at redhat.com  Thu Nov 23 05:58:06 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 23 Nov 2006 00:58:06 -0500
Subject: rpms/flow-tools/FC-3 flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.4, 1.5
Message-ID: <200611230558.kAN5w6N6005421@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353/FC-3

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz#212928


flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/FC-3/flow-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flow-tools.spec	18 Jun 2006 16:12:22 -0000	1.4
+++ flow-tools.spec	23 Nov 2006 05:57:36 -0000	1.5
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 8%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,9 +14,10 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel
+BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,18 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
+* Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
+- rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-10
+- Rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-9
+- Fix build in mock with minimal build environment #197706
+
 * Sat Jun 10 2006 Paul P Komkoff Jr  0.68-8
 - Split patches in more convenient way (and bug upstream)
 - Fix 2 unitialized variable bugs



From fedora-extras-commits at redhat.com  Thu Nov 23 05:58:12 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 23 Nov 2006 00:58:12 -0500
Subject: rpms/flow-tools/FC-6 flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.10, 1.11
Message-ID: <200611230558.kAN5wCH1005430@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353/FC-6

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz#212928


flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/FC-6/flow-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flow-tools.spec	10 Sep 2006 09:22:53 -0000	1.10
+++ flow-tools.spec	23 Nov 2006 05:57:42 -0000	1.11
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,6 +14,7 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
 * Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 05:58:07 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 23 Nov 2006 00:58:07 -0500
Subject: rpms/flow-tools/FC-4 flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.4, 1.5
Message-ID: <200611230558.kAN5w7IH005424@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353/FC-4

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz#212928


flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/FC-4/flow-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flow-tools.spec	18 Jun 2006 16:12:22 -0000	1.4
+++ flow-tools.spec	23 Nov 2006 05:57:36 -0000	1.5
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 8%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,9 +14,10 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel
+BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,18 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
+* Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
+- rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-10
+- Rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-9
+- Fix build in mock with minimal build environment #197706
+
 * Sat Jun 10 2006 Paul P Komkoff Jr  0.68-8
 - Split patches in more convenient way (and bug upstream)
 - Fix 2 unitialized variable bugs



From fedora-extras-commits at redhat.com  Thu Nov 23 06:14:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 01:14:52 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.2,1.3
Message-ID: <200611230614.kAN6Eqxv008699@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8682

Modified Files:
	gtkmozembedmm.spec 
Log Message:

Fixed dependency issue in rawhide



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkmozembedmm.spec	21 Nov 2006 21:21:15 -0000	1.2
+++ gtkmozembedmm.spec	23 Nov 2006 06:14:22 -0000	1.3
@@ -1,6 +1,7 @@
+%define gecko_version 1.8.1
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -19,8 +20,8 @@
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
 %if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel 
-Requires: gecko-libs = 2.0
+BuildRequires: gecko-devel = %{gecko_version}
+Requires: gecko-libs = %{gecko_version}
 %else
 BuildRequires: mozilla-devel
 %endif
@@ -42,7 +43,7 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
 %if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel
+BuildRequires: gecko-devel = %{gecko_version}
 %else
 BuildRequires: mozilla-devel 
 %endif
@@ -105,6 +106,9 @@
 
 
 %changelog
+* Thur Nov 23 2006 Karl  - 1.4.2.cvs20060817-6
+- Fixed build issue in rawhide
+
 * Sun Nov 12 2006 Karl  - 1.4.2.cvs20060817-5
 - Fixed x86_64 build issue.
 



From fedora-extras-commits at redhat.com  Thu Nov 23 06:16:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 01:16:30 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.3,1.4
Message-ID: <200611230616.kAN6GUYj008740@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8725

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkmozembedmm.spec	23 Nov 2006 06:14:22 -0000	1.3
+++ gtkmozembedmm.spec	23 Nov 2006 06:16:00 -0000	1.4
@@ -106,7 +106,7 @@
 
 
 %changelog
-* Thur Nov 23 2006 Karl  - 1.4.2.cvs20060817-6
+* Thu Nov 23 2006 Karl  - 1.4.2.cvs20060817-6
 - Fixed build issue in rawhide
 
 * Sun Nov 12 2006 Karl  - 1.4.2.cvs20060817-5



From fedora-extras-commits at redhat.com  Thu Nov 23 08:29:16 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 23 Nov 2006 03:29:16 -0500
Subject: comps comps-fe6.xml.in,1.228,1.229
Message-ID: <200611230829.kAN8TGC4015566@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15551/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add entry for labyrinth


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- comps-fe6.xml.in	22 Nov 2006 00:06:30 -0000	1.228
+++ comps-fe6.xml.in	23 Nov 2006 08:28:46 -0000	1.229
@@ -826,6 +826,7 @@
       hnb
       koffice-suite
       krecipes
+      labyrinth
       lyx
       notecase
       pybliographer



From fedora-extras-commits at redhat.com  Thu Nov 23 08:56:28 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 03:56:28 -0500
Subject: rpms/streamtuner/devel streamtuner-0.99.99-defaultconfig.patch, 1.1,
	1.2
Message-ID: <200611230856.kAN8uStn015652@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15634

Modified Files:
	streamtuner-0.99.99-defaultconfig.patch 
Log Message:
FC6 uses audacious instead beep-media-player - dependency changed

streamtuner-0.99.99-defaultconfig.patch:

Index: streamtuner-0.99.99-defaultconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner-0.99.99-defaultconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner-0.99.99-defaultconfig.patch	6 Jan 2006 13:37:47 -0000	1.1
+++ streamtuner-0.99.99-defaultconfig.patch	23 Nov 2006 08:55:58 -0000	1.2
@@ -1,5 +1,5 @@
 --- src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
-+++ src/plugins/live365/live365.c	2005-12-29 12:49:29.000000000 +0100
++++ src/plugins/live365/live365.c	2006-11-23 10:10:11.000000000 +0100
 @@ -1410,8 +1410,8 @@
    init_handler();
  
@@ -7,33 +7,33 @@
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
  
    return TRUE;
  }
 
 --- src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
-+++ src/plugins/local/local.c	2005-12-29 12:50:21.000000000 +0100
++++ src/plugins/local/local.c	2006-11-23 10:10:11.000000000 +0100
 @@ -1057,8 +1057,8 @@
  
    init_handler();
  
 -  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
  
    return TRUE;
  }
 
 --- src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
-+++ src/plugins/shoutcast/shoutcast.c	2005-12-29 12:48:50.000000000 +0100
++++ src/plugins/shoutcast/shoutcast.c	2006-11-23 10:10:11.000000000 +0100
 @@ -959,9 +959,9 @@
  
    init_handler();
    
 -  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
@@ -42,19 +42,19 @@
  }
 
 --- src/plugins/xiph/xiph.c	2004-12-13 10:57:33.000000000 +0100
-+++ src/plugins/xiph/xiph.c	2005-12-29 12:50:54.000000000 +0100
++++ src/plugins/xiph/xiph.c	2006-11-23 10:10:11.000000000 +0100
 @@ -957,7 +957,7 @@
    init_handler();
  
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
  
    return TRUE;
  }
 
 --- src/streamtuner/st-action.c	2004-12-18 10:56:42.000000000 +0100
-+++ src/streamtuner/st-action.c	2005-12-29 12:41:20.000000000 +0100
++++ src/streamtuner/st-action.c	2006-11-23 10:10:11.000000000 +0100
 @@ -123,7 +123,7 @@
  {
    actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
@@ -66,13 +66,13 @@
  
 
 --- src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
-+++ src/streamtuner/st-preselections.c	2005-12-29 12:04:04.000000000 +0100
++++ src/streamtuner/st-preselections.c	2006-11-23 10:10:11.000000000 +0100
 @@ -390,9 +390,9 @@
  {
    st_preselections_init_handler();
    
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");



From fedora-extras-commits at redhat.com  Thu Nov 23 09:04:35 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 04:04:35 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.8,1.9
Message-ID: <200611230904.kAN94Zrh018861@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18842

Modified Files:
	streamtuner.spec 
Log Message:
FC6 uses audacious instead beep-media-player - dependency changed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- streamtuner.spec	6 Nov 2006 13:19:53 -0000	1.8
+++ streamtuner.spec	23 Nov 2006 09:04:05 -0000	1.9
@@ -11,7 +11,7 @@
 Patch3: %{name}-%{version}-pkgconfig.patch
 License: BSD
 Group: Applications/Internet
-Requires: python, pygtk2, htmlview, bmp, xterm
+Requires: python, pygtk2, htmlview, audacious, xterm
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
@@ -116,8 +116,10 @@
 
 
 %changelog
-* Mon Nov 06 2006 Jindrich Novy  - 0.99.99-14
-- rebuild against new curl
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-14
+- FC6 uses audacious instead beep-media-player
+- defaultconfig.patch changed
+- dependency changed
 
 * Fri Sep 15 2006 Matthias Haase  - 0.99.99-13
 - Rebuild for Fedora Extras 6



From fedora-extras-commits at redhat.com  Thu Nov 23 09:39:31 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 23 Nov 2006 04:39:31 -0500
Subject: rpms/k3d/devel .cvsignore, 1.7, 1.8 k3d.spec, 1.9, 1.10 sources, 1.7,
	1.8
Message-ID: <200611230939.kAN9dV7j019645@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19626

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Oct 2006 09:11:12 -0000	1.7
+++ .cvsignore	23 Nov 2006 09:39:00 -0000	1.8
@@ -1 +1 @@
-k3d-0.6.3.1-src.tar.bz2
+k3d-0.6.4.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- k3d.spec	10 Oct 2006 09:11:12 -0000	1.9
+++ k3d.spec	23 Nov 2006 09:39:00 -0000	1.10
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.3.1
+Version:        0.6.4.0
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Denis Leroy  - 0.6.4.0
+- Update to 0.6.4.0
+
 * Tue Oct 10 2006 Denis Leroy  - 0.6.3.1
 - Update to 0.6.3.1
 
@@ -198,4 +201,3 @@
 
 * Tue Mar  7 2006 Denis Leroy  - 0.5.0.39-1
 - First version
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Oct 2006 09:11:12 -0000	1.7
+++ sources	23 Nov 2006 09:39:00 -0000	1.8
@@ -1 +1 @@
-7f5b53711a02779e3f9c036bcc21483a  k3d-0.6.3.1-src.tar.bz2
+3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 09:47:53 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 23 Nov 2006 04:47:53 -0500
Subject: rpms/pstoedit/devel pstoedit.spec,1.3,1.4
Message-ID: <200611230947.kAN9lraB019714@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/pstoedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19699

Modified Files:
	pstoedit.spec 
Log Message:
Added EMF support


Index: pstoedit.spec
===================================================================
RCS file: /cvs/extras/rpms/pstoedit/devel/pstoedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pstoedit.spec	28 Aug 2006 11:37:46 -0000	1.3
+++ pstoedit.spec	23 Nov 2006 09:47:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pstoedit
 Version:        3.44
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -16,6 +16,7 @@
 BuildRequires:	dos2unix
 BuildRequires:	ghostscript
 BuildRequires:	plotutils-devel
+BuildRequires:	libEMF-devel
 
 %description
 Pstoedit converts PostScript and PDF files to various vector graphic
@@ -42,7 +43,7 @@
 dos2unix doc/*.htm doc/readme.txt
 
 %build
-%configure --disable-static --without-emf --without-swf
+%configure --disable-static --with-emf --without-swf
 make
 
 
@@ -83,6 +84,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Nov 22 2006 Denis Leroy  - 3.44-5
+- Added libEMF support
+
 * Mon Aug 28 2006 Denis Leroy  - 3.44-4
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 09:50:13 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 23 Nov 2006 04:50:13 -0500
Subject: rpms/pstoedit/FC-6 pstoedit.spec,1.3,1.4
Message-ID: <200611230950.kAN9oDDd019780@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/pstoedit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19763

Modified Files:
	pstoedit.spec 
Log Message:
Added libEMF support


Index: pstoedit.spec
===================================================================
RCS file: /cvs/extras/rpms/pstoedit/FC-6/pstoedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pstoedit.spec	28 Aug 2006 11:37:46 -0000	1.3
+++ pstoedit.spec	23 Nov 2006 09:49:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pstoedit
 Version:        3.44
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -42,7 +42,7 @@
 dos2unix doc/*.htm doc/readme.txt
 
 %build
-%configure --disable-static --without-emf --without-swf
+%configure --disable-static --with-emf --without-swf
 make
 
 
@@ -83,6 +83,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Nov 23 2006 Denis Leroy  - 3.44-5
+- Added libEMF support
+
 * Mon Aug 28 2006 Denis Leroy  - 3.44-4
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 09:51:36 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 23 Nov 2006 04:51:36 -0500
Subject: rpms/pstoedit/FC-5 pstoedit.spec,1.2,1.3
Message-ID: <200611230951.kAN9paMc019850@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/pstoedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19831

Modified Files:
	pstoedit.spec 
Log Message:
Added libEMF support


Index: pstoedit.spec
===================================================================
RCS file: /cvs/extras/rpms/pstoedit/FC-5/pstoedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pstoedit.spec	18 Aug 2006 22:07:22 -0000	1.2
+++ pstoedit.spec	23 Nov 2006 09:51:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pstoedit
 Version:        3.44
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -13,6 +13,7 @@
 BuildRequires:	gd-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:	libpng-devel
+BuildRequires:  libEMF-devel
 BuildRequires:	dos2unix
 BuildRequires:	ghostscript
 BuildRequires:	plotutils-devel
@@ -42,7 +43,7 @@
 dos2unix doc/*.htm doc/readme.txt
 
 %build
-%configure --disable-static --without-emf --without-swf
+%configure --disable-static --with-emf --without-swf
 make
 
 
@@ -83,6 +84,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Nov 23 2006 Denis Leroy  - 3.44-4
+- Add support for libEMF
+
 * Fri Aug 18 2006 Denis Leroy  - 3.44-3
 - Added svg/libplot support
 



From fedora-extras-commits at redhat.com  Thu Nov 23 12:09:41 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 07:09:41 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.4,1.5
Message-ID: <200611231209.kANC9fdd029302@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29281

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkmozembedmm.spec	23 Nov 2006 06:16:00 -0000	1.4
+++ gtkmozembedmm.spec	23 Nov 2006 12:09:11 -0000	1.5
@@ -42,7 +42,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-%if %{!?fedora:6}%{?fedora} >= 6
+%if %{!?fedora} >= 6
 BuildRequires: gecko-devel = %{gecko_version}
 %else
 BuildRequires: mozilla-devel 
@@ -55,7 +55,7 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
-%if %{!?fedora:6}%{?fedora} >= 6
+%if %{!?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
 %endif
 %ifarch x86_64



From fedora-extras-commits at redhat.com  Thu Nov 23 12:12:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 07:12:43 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.5,1.6
Message-ID: <200611231212.kANCChPS029367@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29349

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtkmozembedmm.spec	23 Nov 2006 12:09:11 -0000	1.5
+++ gtkmozembedmm.spec	23 Nov 2006 12:12:13 -0000	1.6
@@ -19,12 +19,8 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-%if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: gecko-devel = %{gecko_version}
 Requires: gecko-libs = %{gecko_version}
-%else
-BuildRequires: mozilla-devel
-%endif
 BuildRequires:  automake >= 1.9.6
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -42,11 +38,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-%if %{!?fedora} >= 6
 BuildRequires: gecko-devel = %{gecko_version}
-%else
-BuildRequires: mozilla-devel 
-%endif
 
 %description devel
 This package contains the headers that programmers will need to
@@ -55,9 +47,7 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
-%if %{!?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
-%endif
 %ifarch x86_64
 # correct a path issue that prevent gtkmozembedmm to build on x86_64
 %{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure



From fedora-extras-commits at redhat.com  Thu Nov 23 12:13:27 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:13:27 -0500
Subject: rpms/streamtuner/FC-6 streamtuner.spec,1.7,1.8
Message-ID: <200611231213.kANCDR0D029418@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29373

Modified Files:
	streamtuner.spec 
Log Message:
FC6 uses audacious instead beep-media-player - dependency changed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- streamtuner.spec	15 Sep 2006 08:34:08 -0000	1.7
+++ streamtuner.spec	23 Nov 2006 12:12:57 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -11,7 +11,7 @@
 Patch3: %{name}-%{version}-pkgconfig.patch
 License: BSD
 Group: Applications/Internet
-Requires: python, pygtk2, htmlview, bmp, xterm
+Requires: python, pygtk2, htmlview, audacious, xterm
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
@@ -116,6 +116,11 @@
 
 
 %changelog
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-14
+- FC6 uses audacious instead beep-media-player
+- defaultconfig.patch changed
+- dependency changed
+
 * Fri Sep 15 2006 Matthias Haase  - 0.99.99-13
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Thu Nov 23 12:15:43 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:15:43 -0500
Subject: rpms/streamtuner/FC-6 streamtuner-0.99.99-defaultconfig.patch, 1.1, 
	1.2
Message-ID: <200611231215.kANCFhCH029492@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29474

Modified Files:
	streamtuner-0.99.99-defaultconfig.patch 
Log Message:
FC6 uses audacious instead beep-media-player - defaultconfig.patch changed

streamtuner-0.99.99-defaultconfig.patch:

Index: streamtuner-0.99.99-defaultconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner-0.99.99-defaultconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner-0.99.99-defaultconfig.patch	6 Jan 2006 13:37:47 -0000	1.1
+++ streamtuner-0.99.99-defaultconfig.patch	23 Nov 2006 12:15:13 -0000	1.2
@@ -1,5 +1,5 @@
 --- src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
-+++ src/plugins/live365/live365.c	2005-12-29 12:49:29.000000000 +0100
++++ src/plugins/live365/live365.c	2006-11-23 10:10:11.000000000 +0100
 @@ -1410,8 +1410,8 @@
    init_handler();
  
@@ -7,33 +7,33 @@
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
  
    return TRUE;
  }
 
 --- src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
-+++ src/plugins/local/local.c	2005-12-29 12:50:21.000000000 +0100
++++ src/plugins/local/local.c	2006-11-23 10:10:11.000000000 +0100
 @@ -1057,8 +1057,8 @@
  
    init_handler();
  
 -  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
  
    return TRUE;
  }
 
 --- src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
-+++ src/plugins/shoutcast/shoutcast.c	2005-12-29 12:48:50.000000000 +0100
++++ src/plugins/shoutcast/shoutcast.c	2006-11-23 10:10:11.000000000 +0100
 @@ -959,9 +959,9 @@
  
    init_handler();
    
 -  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
@@ -42,19 +42,19 @@
  }
 
 --- src/plugins/xiph/xiph.c	2004-12-13 10:57:33.000000000 +0100
-+++ src/plugins/xiph/xiph.c	2005-12-29 12:50:54.000000000 +0100
++++ src/plugins/xiph/xiph.c	2006-11-23 10:10:11.000000000 +0100
 @@ -957,7 +957,7 @@
    init_handler();
  
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
  
    return TRUE;
  }
 
 --- src/streamtuner/st-action.c	2004-12-18 10:56:42.000000000 +0100
-+++ src/streamtuner/st-action.c	2005-12-29 12:41:20.000000000 +0100
++++ src/streamtuner/st-action.c	2006-11-23 10:10:11.000000000 +0100
 @@ -123,7 +123,7 @@
  {
    actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
@@ -66,13 +66,13 @@
  
 
 --- src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
-+++ src/streamtuner/st-preselections.c	2005-12-29 12:04:04.000000000 +0100
++++ src/streamtuner/st-preselections.c	2006-11-23 10:10:11.000000000 +0100
 @@ -390,9 +390,9 @@
  {
    st_preselections_init_handler();
    
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");



From fedora-extras-commits at redhat.com  Thu Nov 23 12:20:43 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:20:43 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.9,1.10
Message-ID: <200611231220.kANCKhrx029561@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29544

Modified Files:
	streamtuner.spec 
Log Message:
bump up release


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- streamtuner.spec	23 Nov 2006 09:04:05 -0000	1.9
+++ streamtuner.spec	23 Nov 2006 12:20:13 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 14%{?dist}
+Release: 15%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-15
+- bump up release 
+
 * Thu Nov 23 2006 Matthias Haase  - 0.99.99-14
 - FC6 uses audacious instead beep-media-player
 - defaultconfig.patch changed



From fedora-extras-commits at redhat.com  Thu Nov 23 12:32:11 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:32:11 -0500
Subject: rpms/streamtuner/FC-6 streamtuner.spec,1.8,1.9
Message-ID: <200611231232.kANCWBlg029718@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29700

Modified Files:
	streamtuner.spec 
Log Message:
bump up release


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- streamtuner.spec	23 Nov 2006 12:12:57 -0000	1.8
+++ streamtuner.spec	23 Nov 2006 12:31:41 -0000	1.9
@@ -120,6 +120,7 @@
 - FC6 uses audacious instead beep-media-player
 - defaultconfig.patch changed
 - dependency changed
+- bump up release
 
 * Fri Sep 15 2006 Matthias Haase  - 0.99.99-13
 - Rebuild for Fedora Extras 6



From fedora-extras-commits at redhat.com  Thu Nov 23 12:46:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 07:46:34 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.6,1.7
Message-ID: <200611231246.kANCkYca029890@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29857

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkmozembedmm.spec	23 Nov 2006 12:12:13 -0000	1.6
+++ gtkmozembedmm.spec	23 Nov 2006 12:46:04 -0000	1.7
@@ -1,7 +1,6 @@
-%define gecko_version 1.8.1
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        6%{?dist}
+Release:        5%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -19,8 +18,12 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-BuildRequires: gecko-devel = %{gecko_version}
-Requires: gecko-libs = %{gecko_version}
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: gecko-devel 
+Requires: gecko-libs = 2.0
+%else
+BuildRequires: mozilla-devel
+%endif
 BuildRequires:  automake >= 1.9.6
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -38,7 +41,11 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-BuildRequires: gecko-devel = %{gecko_version}
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: gecko-devel
+%else
+BuildRequires: mozilla-devel 
+%endif
 
 %description devel
 This package contains the headers that programmers will need to
@@ -47,7 +54,9 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
+%if %{!?fedora:6}%{?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
+%endif
 %ifarch x86_64
 # correct a path issue that prevent gtkmozembedmm to build on x86_64
 %{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure
@@ -96,9 +105,6 @@
 
 
 %changelog
-* Thu Nov 23 2006 Karl  - 1.4.2.cvs20060817-6
-- Fixed build issue in rawhide
-
 * Sun Nov 12 2006 Karl  - 1.4.2.cvs20060817-5
 - Fixed x86_64 build issue.
 



From fedora-extras-commits at redhat.com  Thu Nov 23 12:46:52 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:46:52 -0500
Subject: rpms/streamtuner/FC-6 streamtuner.spec,1.9,1.10
Message-ID: <200611231246.kANCkqds029893@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29875

Modified Files:
	streamtuner.spec 
Log Message:
bump up release again


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- streamtuner.spec	23 Nov 2006 12:31:41 -0000	1.9
+++ streamtuner.spec	23 Nov 2006 12:46:22 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 14%{?dist}
+Release: 14%{?dist}.1
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-14.1
+- bump up release again
+
 * Thu Nov 23 2006 Matthias Haase  - 0.99.99-14
 - FC6 uses audacious instead beep-media-player
 - defaultconfig.patch changed



From fedora-extras-commits at redhat.com  Thu Nov 23 13:07:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 08:07:39 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.7,1.8
Message-ID: <200611231307.kAND7dKl000593@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv578

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkmozembedmm.spec	23 Nov 2006 12:46:04 -0000	1.7
+++ gtkmozembedmm.spec	23 Nov 2006 13:07:08 -0000	1.8
@@ -1,6 +1,7 @@
+%define gecko_ver 1.8.1
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -18,12 +19,8 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-%if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel 
-Requires: gecko-libs = 2.0
-%else
-BuildRequires: mozilla-devel
-%endif
+BuildRequires: gecko-devel = %{gecko_ver}
+Requires: gecko-libs = %{gecko_ver}
 BuildRequires:  automake >= 1.9.6
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -41,11 +38,8 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-%if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel
-%else
-BuildRequires: mozilla-devel 
-%endif
+BuildRequires: gecko-devel = %{gecko_ver}
+
 
 %description devel
 This package contains the headers that programmers will need to
@@ -54,9 +48,7 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
-%if %{!?fedora:6}%{?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
-%endif
 %ifarch x86_64
 # correct a path issue that prevent gtkmozembedmm to build on x86_64
 %{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure



From fedora-extras-commits at redhat.com  Thu Nov 23 13:18:40 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 08:18:40 -0500
Subject: rpms/streamtuner/FC-6 streamtuner.spec,1.10,1.11
Message-ID: <200611231318.kANDIeAu000697@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv676

Modified Files:
	streamtuner.spec 
Log Message:
bump up release once again proper formated


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- streamtuner.spec	23 Nov 2006 12:46:22 -0000	1.10
+++ streamtuner.spec	23 Nov 2006 13:18:10 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 14%{?dist}.1
+Release: 14.2%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-14.2
+- bum up release once again proper formated
+
 * Thu Nov 23 2006 Matthias Haase  - 0.99.99-14.1
 - bump up release again
 



From fedora-extras-commits at redhat.com  Thu Nov 23 13:29:15 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:29:15 -0500
Subject: rpms/gcin/devel gcin_update.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec, 1.14, 1.15 im-client.patch,
	1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231329.kANDTFOj000824@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv795

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Added Files:
	gcin_update.patch 
Log Message:
update to 1.3.0.1

gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i scripts/noseeing-inst.tmp
@@ -109,6 +109,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
 * Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-3
 - add gcin129update.patch
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 06:49:04 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:28:44 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 06:49:04 -0000	1.9
+++ sources	23 Nov 2006 13:28:44 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 13:36:46 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 23 Nov 2006 08:36:46 -0500
Subject: rpms/d4x/devel d4x.spec,1.14,1.15
Message-ID: <200611231336.kANDakMA000932@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv911

Modified Files:
	d4x.spec 
Log Message:
Change man page rename to work when compression is set in /etc/man.config.



Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- d4x.spec	28 Aug 2006 09:21:09 -0000	1.14
+++ d4x.spec	23 Nov 2006 13:36:16 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
 Version: 2.5.7.1
-Release: 2%{?pre:.%{pre}}%{?dist}
+Release: 3%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
@@ -49,8 +49,7 @@
   share/nt.desktop
 
 # Rename the man page to match the binary name
-%{__mv} %{buildroot}%{_mandir}/man1/nt.1 \
-        %{buildroot}%{_mandir}/man1/d4x.1
+rename nt.1 d4x.1 %{buildroot}%{_mandir}/man1/nt.1*
 
 
 %clean
@@ -70,6 +69,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 V??ctor Daniel  2.5.7.1-3
+- Change man page rename to work when compression is set in /etc/man.config.
+
 * Mon Aug 28 2006 Matthias Saou  2.5.7.1-2
 - FC6 rebuild.
 - Remove gcc-c++ build requirement, it's a default.



From fedora-extras-commits at redhat.com  Thu Nov 23 13:37:24 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:37:24 -0500
Subject: rpms/gcin/FC-6 .cvsignore, 1.9, 1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec,
	1.13, 1.14 im-client.patch, 1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231337.kANDbOPm000960@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv929

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Log Message:
update to 1.3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Nov 2006 06:58:05 -0000	1.9
+++ .cvsignore	23 Nov 2006 13:36:53 -0000	1.10
@@ -1 +1 @@
-gcin-1.2.9.tar.bz2
+gcin-1.3.0.1.tar.bz2


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 NewCJ3.cin
Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/NewCJ3.cin,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewCJ3.cin	17 Nov 2006 00:29:32 -0000	1.2
+++ NewCJ3.cin	23 Nov 2006 13:36:53 -0000	1.3
@@ -40,6 +40,32 @@
 ` ???	???????????????????????? gcin ????????? ` ????????????????????????
 , ???
 ,, ???
+,a ???????????????????????????
+,b ?????????????????????
+,c ?????????????????????
+,d ?????????????????????
+,e ???????????????????????????
+,f ????????????
+,g ????????????
+,h ????????????????????????
+,i ??????????????????
+,j ??????????????????
+,k ?????????????????????
+,l ?????????????????????
+,m ?????????????????????
+,n ?????????????????????
+,o ?????????????????????
+,p ?????????????????????
+,q ?????????????????????
+,r ?????????????????????
+,s ?????????????????????
+,t ?????????????????????
+,u ??????????????????
+,v ???????????????????????????
+,w ?????????????????????
+,x ???????????????????????????
+,y ???????????????????????????
+,z ??????
 . ???
 .. ???
 .. ???
@@ -168,39 +194,549 @@
 ]]] ???
 ]]] ???
 ;a ???
-;b ???
+;b ???
+;bb ???
 ;c ???
+;cu ???
 ;d ???
 ;e ???
 ;f ???
+;fh ???
 ;g ???
 ;h ???
 ;i ???
-;ii ??????
 ;i; ???
+;ia ??????
+;iai ?????????
+;iao ?????????
+;iau ?????????
+;ib ??????
+;ibi ?????????
+;ibo ?????????
+;ibu ?????????
+;id ??????
+;idi ?????????
+;idm ?????????
+;ido ?????????
+;idu ?????????
+;if ??????
+;ify ?????????
+;ig ??????
+;ih ??????
+;ihb ?????????
+;ihbp ????????????
+;ihp ?????????
+;ii ??????
+;iii ?????????
+;iio ?????????
+;iip ??????
+;iiu ?????????
+;ik ??????
+;il ??????
+;ili ?????????
+;ilo ?????????
+;ilu ?????????
+;im ??????
+;imb ??????
+;imd ?????????
+;imf ??????
+;imi ?????????
+;imm ?????????
+;imo ?????????
+;imu ?????????
+;imv ?????????
+;imz ?????????
+;io ??????
+;ip ??????
+;ipi ?????????
+;ipo ?????????
+;ipu ?????????
+;ir ??????
+;iri ?????????
+;irih ????????????
+;iro ?????????
+;iroh ????????????
+;iru ?????????
+;iruh ????????????
+;is ??????
+;isv ?????????
+;iu ??????
+;iv ??????
+;ivi ?????????
+;ivo ?????????
+;ivu ?????????
+;iy ??????
+;iz ??????
+;izi ?????????
+;izo ?????????
+;izu ?????????
+;izv ??????
 ;j ???
 ;k ???
 ;l ???
 ;l ???
-;l; ???
 ;m ???
 ;n ???
-;o ???
+;o ???
+;oa ??????
+;oai ?????????
+;oao ?????????
+;oau ?????????
+;ob ??????
+;obi ?????????
+;obo ?????????
+;obu ?????????
+;od ??????
+;odi ?????????
+;odm ?????????
+;odo ?????????
+;odu ?????????
+;of ??????
+;ofy ?????????
+;og ??????
+;oh ??????
+;ohb ?????????
+;ohbp ????????????
+;ohp ?????????
+;oi ??????
+;oii ?????????
+;oio ?????????
+;oip ??????
+;oiu ?????????
+;ok ??????
+;ol ??????
+;oli ?????????
+;olo ?????????
+;olu ?????????
+;om ??????
+;omb ??????
+;omd ?????????
+;omf ??????
+;omi ?????????
+;omm ?????????
+;omo ?????????
+;omu ?????????
+;omv ?????????
+;omz ?????????
+;oo ??????
+;op ??????
+;opi ?????????
+;opo ?????????
+;opu ?????????
+;or ??????
+;ori ?????????
+;orih ????????????
+;oro ?????????
+;oroh ????????????
+;oru ?????????
+;oruh ????????????
+;os ??????
+;osv ?????????
+;ou ??????
+;ov ??????
+;ovi ?????????
+;ovo ?????????
+;ovu ?????????
+;oy ??????
+;oz ??????
+;ozi ?????????
+;ozo ?????????
+;ozu ?????????
+;ozv ??????
 ;p ???
+;pu ???
[...20673 lines suppressed...]
+;ytje ????????????
+;ytjy ????????????
+;ytko ????????????
+;ytky ??????????????????
+;ytlj ????????????
+;ytmf ????????????
+;ytmg ????????????
+;ytml ????????????
+;ytmn ?????????????????????
+;ytmo ????????????
+;ytmw ????????????
+;ytnr ????????????
+;ytod ????????????
+;ytoh ????????????
+;ytoj ????????????
+;ytoo ????????????
+;ytqo ????????????
+;ytsy ????????????
+;ytth ????????????
+;ytto ????????????
+;ytty ????????????
+;ytve ????????????
+;ytwe ????????????
+;ytyq ????????????
+;ytyt ????????????
+;ytyy ????????????
+;yuah ????????????
+;yuar ????????????
+;yuee ????????????
+;yuee ????????????
+;yume ????????????
+;yuog ????????????
+;yuph ????????????
+;yuyh ????????????
+;yuyo ????????????
+;yvfy ????????????
+;yvfy ????????????
+;yvhw ????????????
+;yvid ????????????
+;yvjy ????????????
+;yvkq ????????????
+;yvlh ????????????
+;yvlt ????????????
+;yvmt ????????????
+;yvmv ????????????
+;yvmv ????????????
+;yvmv ????????????
+;yvol ????????????
+;yvot ????????????
+;yvoy ????????????
+;yvpp ????????????
+;yvqr ????????????
+;yvtm ????????????
+;yvva ????????????
+;yvvw ????????????
+;yvvy ????????????
+;yvya ????????????
+;yvyf ????????????
+;yvyg ????????????
+;yvym ????????????
+;yvyt ????????????
+;yvyv ???????????????
+;yvyw ????????????
+;ywhe ????????????
+;ywiy ????????????
+;ywkh ????????????
+;ywki ????????????
+;ywlo ????????????
+;ywmm ???????????????
+;ywmy ???????????????
+;ywnt ????????????
+;ywny ????????????
+;ywsj ????????????
+;ywyt ????????????
+;yyay ????????????
+;yybf ????????????
+;yycr ????????????
+;yycr ????????????
+;yydc ???????????????
+;yydd ????????????
+;yyde ????????????
+;yydt ????????????
+;yyei ????????????
+;yyen ????????????
+;yyeu ????????????
+;yyff ????????????
+;yygg ????????????
+;yygg ????????????
+;yyha ????????????
+;yyhh ????????????
+;yyhh ????????????
+;yyhj ????????????
+;yyhk ????????????
+;yyhl ????????????
+;yyhq ????????????
+;yyht ????????????
+;yyhu ????????????
+;yyhv ????????????
+;yyhw ????????????
+;yyhy ????????????
+;yyhy ????????????
+;yyia ????????????
+;yyif ????????????
+;yyiw ????????????
+;yyiw ????????????
+;yyjj ????????????
+;yyjj ????????????
+;yyjm ????????????
+;yyjo ????????????
+;yyjs ????????????
+;yyjy ????????????
+;yyjy ????????????
+;yyjy ????????????
+;yykh ????????????
+;yykl ????????????
+;yykp ????????????
+;yyky ????????????
+;yyky ????????????
+;yyky ????????????
+;yylb ????????????
+;yyma ????????????
+;yymb ????????????
+;yymb ??????????????????
+;yymb ???????????????
+;yymb ????????????
+;yymg ????????????
+;yymh ????????????
+;yymi ????????????
+;yymm ????????????
+;yymm ????????????
+;yymo ????????????
+;yymt ????????????
+;yymt ????????????
+;yymv ??????????????????
+;yymw ????????????
+;yymy ????????????
+;yymy ????????????
+;yynh ????????????
+;yynj ????????????
+;yynn ????????????
+;yynv ????????????
+;yynv ????????????
+;yyny ????????????
+;yyoa ????????????
+;yyoh ????????????
+;yyoh ????????????
+;yyoh ????????????
+;yyoj ????????????
+;yyol ????????????
+;yyoo ????????????
+;yyop ????????????
+;yyor ????????????
+;yyos ????????????
+;yyos ????????????
+;yyot ????????????
+;yyov ????????????
+;yyoy ????????????
+;yyoy ???????????????
+;yypb ????????????
+;yypd ????????????
+;yyph ????????????
+;yyqb ????????????
+;yyqb ????????????
+;yyqo ????????????
+;yyqq ????????????
+;yyrm ????????????
+;yyru ????????????
+;yysn ????????????
+;yysn ????????????
+;yysq ????????????
+;yytb ????????????
+;yytj ????????????
+;yytj ????????????
+;yytj ????????????
+;yytm ????????????
+;yyto ????????????
+;yytq ????????????
+;yytt ????????????
+;yyty ????????????
+;yyvc ????????????
+;yyvv ????????????
+;yyvv ????????????
+;yyvy ????????????
+;yywg ????????????
+;yyyc ????????????
+;yyyg ????????????
+;yyyj ????????????
+;yyyl ????????????
+;yyym ????????????
+;yyym ????????????
+;yyyn ????????????
+;yyyt ????????????
+;yyyt ????????????
+;yyyu ????????????
+;yyyv ????????????
+;yyyy ????????????
+;yyyy ??????????????????
+;yyyy ????????????
+zhaou ????????????????????????????????????????????????????????????????????????
 %chardef end


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec	17 Nov 2006 00:29:32 -0000	1.13
+++ gcin.spec	23 Nov 2006 13:36:53 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcin
-Version:        1.2.9
-Release:        2%{?dist}
+Version:        1.3.0.1
+Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
-Patch5:         gcin129update.patch
+Patch5:         gcin_update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,14 +29,14 @@
 Gcin is an input method for Traditional Chinese with a GTK user interface.
 
 %prep
-%setup -q -a 2
+%setup -q
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
 %patch5 -p1 -b .up
-cp -f gcinicon/gtab.list data/
-cp -f gcinicon/*.png icons/
+#cp -f gcinicon/gtab.list data/
+#cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
@@ -109,8 +109,13 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
-* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-3
 - add gcin129update.patch
+
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
 - update NewCJ3.cin
 
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 06:58:05 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:36:53 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 06:58:05 -0000	1.9
+++ sources	23 Nov 2006 13:36:53 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 13:40:15 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:40:15 -0500
Subject: rpms/gcin/FC-5 .cvsignore, 1.9, 1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec,
	1.13, 1.14 im-client.patch, 1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231340.kANDeFKs001044@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1010

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Log Message:
update to 1.3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Nov 2006 07:07:12 -0000	1.9
+++ .cvsignore	23 Nov 2006 13:39:44 -0000	1.10
@@ -1 +1 @@
-gcin-1.2.9.tar.bz2
+gcin-1.3.0.1.tar.bz2


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 NewCJ3.cin
Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/NewCJ3.cin,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewCJ3.cin	17 Nov 2006 00:32:51 -0000	1.2
+++ NewCJ3.cin	23 Nov 2006 13:39:44 -0000	1.3
@@ -40,6 +40,32 @@
 ` ???	???????????????????????? gcin ????????? ` ????????????????????????
 , ???
 ,, ???
+,a ???????????????????????????
+,b ?????????????????????
+,c ?????????????????????
+,d ?????????????????????
+,e ???????????????????????????
+,f ????????????
+,g ????????????
+,h ????????????????????????
+,i ??????????????????
+,j ??????????????????
+,k ?????????????????????
+,l ?????????????????????
+,m ?????????????????????
+,n ?????????????????????
+,o ?????????????????????
+,p ?????????????????????
+,q ?????????????????????
+,r ?????????????????????
+,s ?????????????????????
+,t ?????????????????????
+,u ??????????????????
+,v ???????????????????????????
+,w ?????????????????????
+,x ???????????????????????????
+,y ???????????????????????????
+,z ??????
 . ???
 .. ???
 .. ???
@@ -168,39 +194,549 @@
 ]]] ???
 ]]] ???
 ;a ???
-;b ???
+;b ???
+;bb ???
 ;c ???
+;cu ???
 ;d ???
 ;e ???
 ;f ???
+;fh ???
 ;g ???
 ;h ???
 ;i ???
-;ii ??????
 ;i; ???
+;ia ??????
+;iai ?????????
+;iao ?????????
+;iau ?????????
+;ib ??????
+;ibi ?????????
+;ibo ?????????
+;ibu ?????????
+;id ??????
+;idi ?????????
+;idm ?????????
+;ido ?????????
+;idu ?????????
+;if ??????
+;ify ?????????
+;ig ??????
+;ih ??????
+;ihb ?????????
+;ihbp ????????????
+;ihp ?????????
+;ii ??????
+;iii ?????????
+;iio ?????????
+;iip ??????
+;iiu ?????????
+;ik ??????
+;il ??????
+;ili ?????????
+;ilo ?????????
+;ilu ?????????
+;im ??????
+;imb ??????
+;imd ?????????
+;imf ??????
+;imi ?????????
+;imm ?????????
+;imo ?????????
+;imu ?????????
+;imv ?????????
+;imz ?????????
+;io ??????
+;ip ??????
+;ipi ?????????
+;ipo ?????????
+;ipu ?????????
+;ir ??????
+;iri ?????????
+;irih ????????????
+;iro ?????????
+;iroh ????????????
+;iru ?????????
+;iruh ????????????
+;is ??????
+;isv ?????????
+;iu ??????
+;iv ??????
+;ivi ?????????
+;ivo ?????????
+;ivu ?????????
+;iy ??????
+;iz ??????
+;izi ?????????
+;izo ?????????
+;izu ?????????
+;izv ??????
 ;j ???
 ;k ???
 ;l ???
 ;l ???
-;l; ???
 ;m ???
 ;n ???
-;o ???
+;o ???
+;oa ??????
+;oai ?????????
+;oao ?????????
+;oau ?????????
+;ob ??????
+;obi ?????????
+;obo ?????????
+;obu ?????????
+;od ??????
+;odi ?????????
+;odm ?????????
+;odo ?????????
+;odu ?????????
+;of ??????
+;ofy ?????????
+;og ??????
+;oh ??????
+;ohb ?????????
+;ohbp ????????????
+;ohp ?????????
+;oi ??????
+;oii ?????????
+;oio ?????????
+;oip ??????
+;oiu ?????????
+;ok ??????
+;ol ??????
+;oli ?????????
+;olo ?????????
+;olu ?????????
+;om ??????
+;omb ??????
+;omd ?????????
+;omf ??????
+;omi ?????????
+;omm ?????????
+;omo ?????????
+;omu ?????????
+;omv ?????????
+;omz ?????????
+;oo ??????
+;op ??????
+;opi ?????????
+;opo ?????????
+;opu ?????????
+;or ??????
+;ori ?????????
+;orih ????????????
+;oro ?????????
+;oroh ????????????
+;oru ?????????
+;oruh ????????????
+;os ??????
+;osv ?????????
+;ou ??????
+;ov ??????
+;ovi ?????????
+;ovo ?????????
+;ovu ?????????
+;oy ??????
+;oz ??????
+;ozi ?????????
+;ozo ?????????
+;ozu ?????????
+;ozv ??????
 ;p ???
+;pu ???
[...20673 lines suppressed...]
+;ytje ????????????
+;ytjy ????????????
+;ytko ????????????
+;ytky ??????????????????
+;ytlj ????????????
+;ytmf ????????????
+;ytmg ????????????
+;ytml ????????????
+;ytmn ?????????????????????
+;ytmo ????????????
+;ytmw ????????????
+;ytnr ????????????
+;ytod ????????????
+;ytoh ????????????
+;ytoj ????????????
+;ytoo ????????????
+;ytqo ????????????
+;ytsy ????????????
+;ytth ????????????
+;ytto ????????????
+;ytty ????????????
+;ytve ????????????
+;ytwe ????????????
+;ytyq ????????????
+;ytyt ????????????
+;ytyy ????????????
+;yuah ????????????
+;yuar ????????????
+;yuee ????????????
+;yuee ????????????
+;yume ????????????
+;yuog ????????????
+;yuph ????????????
+;yuyh ????????????
+;yuyo ????????????
+;yvfy ????????????
+;yvfy ????????????
+;yvhw ????????????
+;yvid ????????????
+;yvjy ????????????
+;yvkq ????????????
+;yvlh ????????????
+;yvlt ????????????
+;yvmt ????????????
+;yvmv ????????????
+;yvmv ????????????
+;yvmv ????????????
+;yvol ????????????
+;yvot ????????????
+;yvoy ????????????
+;yvpp ????????????
+;yvqr ????????????
+;yvtm ????????????
+;yvva ????????????
+;yvvw ????????????
+;yvvy ????????????
+;yvya ????????????
+;yvyf ????????????
+;yvyg ????????????
+;yvym ????????????
+;yvyt ????????????
+;yvyv ???????????????
+;yvyw ????????????
+;ywhe ????????????
+;ywiy ????????????
+;ywkh ????????????
+;ywki ????????????
+;ywlo ????????????
+;ywmm ???????????????
+;ywmy ???????????????
+;ywnt ????????????
+;ywny ????????????
+;ywsj ????????????
+;ywyt ????????????
+;yyay ????????????
+;yybf ????????????
+;yycr ????????????
+;yycr ????????????
+;yydc ???????????????
+;yydd ????????????
+;yyde ????????????
+;yydt ????????????
+;yyei ????????????
+;yyen ????????????
+;yyeu ????????????
+;yyff ????????????
+;yygg ????????????
+;yygg ????????????
+;yyha ????????????
+;yyhh ????????????
+;yyhh ????????????
+;yyhj ????????????
+;yyhk ????????????
+;yyhl ????????????
+;yyhq ????????????
+;yyht ????????????
+;yyhu ????????????
+;yyhv ????????????
+;yyhw ????????????
+;yyhy ????????????
+;yyhy ????????????
+;yyia ????????????
+;yyif ????????????
+;yyiw ????????????
+;yyiw ????????????
+;yyjj ????????????
+;yyjj ????????????
+;yyjm ????????????
+;yyjo ????????????
+;yyjs ????????????
+;yyjy ????????????
+;yyjy ????????????
+;yyjy ????????????
+;yykh ????????????
+;yykl ????????????
+;yykp ????????????
+;yyky ????????????
+;yyky ????????????
+;yyky ????????????
+;yylb ????????????
+;yyma ????????????
+;yymb ????????????
+;yymb ??????????????????
+;yymb ???????????????
+;yymb ????????????
+;yymg ????????????
+;yymh ????????????
+;yymi ????????????
+;yymm ????????????
+;yymm ????????????
+;yymo ????????????
+;yymt ????????????
+;yymt ????????????
+;yymv ??????????????????
+;yymw ????????????
+;yymy ????????????
+;yymy ????????????
+;yynh ????????????
+;yynj ????????????
+;yynn ????????????
+;yynv ????????????
+;yynv ????????????
+;yyny ????????????
+;yyoa ????????????
+;yyoh ????????????
+;yyoh ????????????
+;yyoh ????????????
+;yyoj ????????????
+;yyol ????????????
+;yyoo ????????????
+;yyop ????????????
+;yyor ????????????
+;yyos ????????????
+;yyos ????????????
+;yyot ????????????
+;yyov ????????????
+;yyoy ????????????
+;yyoy ???????????????
+;yypb ????????????
+;yypd ????????????
+;yyph ????????????
+;yyqb ????????????
+;yyqb ????????????
+;yyqo ????????????
+;yyqq ????????????
+;yyrm ????????????
+;yyru ????????????
+;yysn ????????????
+;yysn ????????????
+;yysq ????????????
+;yytb ????????????
+;yytj ????????????
+;yytj ????????????
+;yytj ????????????
+;yytm ????????????
+;yyto ????????????
+;yytq ????????????
+;yytt ????????????
+;yyty ????????????
+;yyvc ????????????
+;yyvv ????????????
+;yyvv ????????????
+;yyvy ????????????
+;yywg ????????????
+;yyyc ????????????
+;yyyg ????????????
+;yyyj ????????????
+;yyyl ????????????
+;yyym ????????????
+;yyym ????????????
+;yyyn ????????????
+;yyyt ????????????
+;yyyt ????????????
+;yyyu ????????????
+;yyyv ????????????
+;yyyy ????????????
+;yyyy ??????????????????
+;yyyy ????????????
+zhaou ????????????????????????????????????????????????????????????????????????
 %chardef end


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec	17 Nov 2006 00:32:51 -0000	1.13
+++ gcin.spec	23 Nov 2006 13:39:45 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcin
-Version:        1.2.9
-Release:        2%{?dist}
+Version:        1.3.0.1
+Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
-Patch5:         gcin129update.patch
+Patch5:         gcin_update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,14 +29,14 @@
 Gcin is an input method for Traditional Chinese with a GTK user interface.
 
 %prep
-%setup -q -a 2
+%setup -q
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
 %patch5 -p1 -b .up
-cp -f gcinicon/gtab.list data/
-cp -f gcinicon/*.png icons/
+#cp -f gcinicon/gtab.list data/
+#cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
@@ -109,6 +109,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
 * Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
 - add gcin129update.patch
 - update NewCJ3.cin

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 07:07:12 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:39:45 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 07:07:12 -0000	1.9
+++ sources	23 Nov 2006 13:39:45 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 13:43:23 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:43:23 -0500
Subject: rpms/gcin/FC-6 gcin_update.patch,NONE,1.1 gcin.spec,1.14,1.15
Message-ID: <200611231343.kANDhNsj001125@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1106

Modified Files:
	gcin.spec 
Added Files:
	gcin_update.patch 
Log Message:
update to 1.3.0.1

gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i - 1.3.0.1-2
+- rebuild
+
 * Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
 - update to 1.3.0.1
 



From fedora-extras-commits at redhat.com  Thu Nov 23 13:44:33 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:44:33 -0500
Subject: rpms/gcin/FC-5 gcin_update.patch,NONE,1.1
Message-ID: <200611231344.kANDiXMd001185@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1178

Added Files:
	gcin_update.patch 
Log Message:
add gcin_update.patch


gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1249

Modified Files:
	gcin.spec 
Log Message:
update to 1.3.0.1


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcin.spec	23 Nov 2006 13:28:44 -0000	1.15
+++ gcin.spec	23 Nov 2006 13:46:07 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -109,6 +109,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-2
+- rebuild
+
 * Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
 - update to 1.3.0.1
 



From fedora-extras-commits at redhat.com  Thu Nov 23 13:50:25 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:50:25 -0500
Subject: rpms/gcin/FC-4 gcin_update.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec, 1.14, 1.15 im-client.patch,
	1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231350.kANDoPQP001349@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1318

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Added Files:
	gcin_update.patch 
Log Message:
update to 1.3.0.1

gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i scripts/noseeing-inst.tmp
@@ -107,6 +107,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
 * Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
 - add gcin129update.patch
 - update NewCJ3.cin

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 07:14:44 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:49:54 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 07:14:44 -0000	1.9
+++ sources	23 Nov 2006 13:49:54 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 13:55:44 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:55:44 -0500
Subject: rpms/gcin/FC-3 gcin_update.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 NewCJ3.cin, 1.1, 1.2 gcin.spec, 1.13, 1.14 im-client.patch,
	1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231355.kANDtip9001442@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Added Files:
	gcin_update.patch 
Log Message:
update to 1.3.0.1

gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i scripts/noseeing-inst.tmp
@@ -107,6 +109,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-2
 - add tray.patch
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 07:21:32 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:55:13 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 07:21:32 -0000	1.9
+++ sources	23 Nov 2006 13:55:13 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 15:11:24 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 23 Nov 2006 10:11:24 -0500
Subject: rpms/jd/devel .cvsignore, 1.21, 1.22 jd.spec, 1.28, 1.29 sources,
	1.21, 1.22
Message-ID: <200611231511.kANFBOpn007780@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7761

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Nov 23 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061123
- cvs 061123 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	22 Nov 2006 16:57:12 -0000	1.21
+++ .cvsignore	23 Nov 2006 15:10:54 -0000	1.22
@@ -1 +1 @@
-jd-1.8.1-cvs061122.tgz
+jd-1.8.1-cvs061123.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jd.spec	22 Nov 2006 16:57:12 -0000	1.28
+++ jd.spec	23 Nov 2006 15:10:54 -0000	1.29
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061122
+%define         strtag        cvs061123
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Nov 22 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061122
-- cvs 061122 (25:50 JST)
+* Thu Nov 23 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061123
+- cvs 061123 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Nov 2006 16:57:12 -0000	1.21
+++ sources	23 Nov 2006 15:10:54 -0000	1.22
@@ -1 +1 @@
-456375f5bb55a1785572d5f6912adb1b  jd-1.8.1-cvs061122.tgz
+8fedda8b763698253b919393eff9fef4  jd-1.8.1-cvs061123.tgz



From fedora-extras-commits at redhat.com  Thu Nov 23 16:31:01 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:31:01 -0500
Subject: rpms/mediawiki/FC-6 mediawiki.spec,1.9,1.10
Message-ID: <200611231631.kANGV10J011223@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11195/FC-6

Modified Files:
	mediawiki.spec 
Log Message:
Try to fix 212600, 213997, 214758, 215968.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-6/mediawiki.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mediawiki.spec	2 Nov 2006 13:56:14 -0000	1.9
+++ mediawiki.spec	23 Nov 2006 16:30:31 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name: mediawiki
 Version: 1.8.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A wiki engine
 
 Group: Applications/Internet
@@ -28,7 +28,6 @@
 
 Mathematics support is included in the package mediawiki-math.
 
-
 %package math
 Summary: Mathematical formula support for MediaWiki
 Group: Applications/Internet
@@ -40,28 +39,31 @@
 %description math
 This package includes the support for mathematical formulas in MediaWiki.
 
-
 %prep
 %setup -q
 install -D -m 644 %{SOURCE2} ./INSTALL.fedora
 rm -rf tests includes/zhtable skins/disabled
 rm -f `find -name ".[ch]*"`
 
-
 %build
 cd math
 make
 
-
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}%{wikidir}
-cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+#cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
+#cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+cp -a * %{buildroot}%{wikidir}/
+find %{buildroot} -name .svnignore | xargs rm
+find %{buildroot} -name \*.cmi | xargs rm
+find %{buildroot} -name \*.c | xargs rm
+find %{buildroot} -name Makefile | xargs rm
 %{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
 
-install -d %{buildroot}%{wikidir}/math
-install math/texvc %{buildroot}%{wikidir}/math
+#install -d %{buildroot}%{wikidir}/math
+#install math/texvc %{buildroot}%{wikidir}/math
+
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
@@ -90,6 +92,9 @@
 
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Thu Nov 23 16:31:01 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:31:01 -0500
Subject: rpms/mediawiki/devel mediawiki.spec,1.9,1.10
Message-ID: <200611231631.kANGV1lo011226@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11195/devel

Modified Files:
	mediawiki.spec 
Log Message:
Try to fix 212600, 213997, 214758, 215968.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mediawiki.spec	5 Nov 2006 22:09:03 -0000	1.9
+++ mediawiki.spec	23 Nov 2006 16:30:31 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name: mediawiki
 Version: 1.8.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A wiki engine
 
 Group: Applications/Internet
@@ -28,7 +28,6 @@
 
 Mathematics support is included in the package mediawiki-math.
 
-
 %package math
 Summary: Mathematical formula support for MediaWiki
 Group: Applications/Internet
@@ -40,28 +39,31 @@
 %description math
 This package includes the support for mathematical formulas in MediaWiki.
 
-
 %prep
 %setup -q
 install -D -m 644 %{SOURCE2} ./INSTALL.fedora
 rm -rf tests includes/zhtable skins/disabled
 rm -f `find -name ".[ch]*"`
 
-
 %build
 cd math
 make
 
-
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}%{wikidir}
-cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+#cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
+#cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+cp -a * %{buildroot}%{wikidir}/
+find %{buildroot} -name .svnignore | xargs rm
+find %{buildroot} -name \*.cmi | xargs rm
+find %{buildroot} -name \*.c | xargs rm
+find %{buildroot} -name Makefile | xargs rm
 %{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
 
-install -d %{buildroot}%{wikidir}/math
-install math/texvc %{buildroot}%{wikidir}/math
+#install -d %{buildroot}%{wikidir}/math
+#install math/texvc %{buildroot}%{wikidir}/math
+
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
@@ -90,6 +92,9 @@
 
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Thu Nov 23 16:46:18 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:46:18 -0500
Subject: rpms/apt/FC-4 apt.spec,1.22,1.23 sources,1.6,1.7
Message-ID: <200611231646.kANGkIFI011426@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/FC-4

Modified Files:
	apt.spec sources 
Log Message:
Try to fix #210833, some anti-aging make-up.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-4/apt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apt.spec	16 Sep 2006 09:45:07 -0000	1.22
+++ apt.spec	23 Nov 2006 16:45:48 -0000	1.23
@@ -3,99 +3,102 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-Summary:        Debian's Advanced Packaging Tool with RPM support
-Name:           apt
-Version:        0.5.15lorg3.2
-Release:        7%{?dist}
-Group:          System Environment/Base
-URL:            http://apt-rpm.org/
-License:        GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
 
-#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0:	http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
-Source1:        apt.conf
-Source2:        sources.list
-Source3:        vendors.list
-Source4:        apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5:        rpmpriorities
-Source19:       comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
 
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source51:       upgradevirt.lua
+Source51: upgradevirt.lua
 
 # 150-199 for apt.conf.d
 # "factory defaults"
-Source150:      default.conf
+Source150: default.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  libxml2-devel
-BuildRequires:  rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  gettext
-BuildRequires:  docbook-utils
-BuildRequires:  perl
-BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 %if %{generate_rpmpriorities}
-BuildRequires:  %{_bindir}/xsltproc
-BuildRequires:  %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
-BuildRequires:  pkgconfig
-Requires:       gnupg
-Requires:       bzip2
-Requires:       fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
-Obsoletes:      %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
 %endif
-Requires:	apt-config
+Requires: apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
 It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages.  APT features complete installation
+install and upgrade packages. APT features complete installation
 ordering, multiple source capability and several other useful
 features.
 
-%package        devel
-Summary:        Development files and documentation for APT's libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
 
-%description    devel
+%description devel
 This package contains development files for developing with APT's
 libapt-pkg package manipulation library, modified for RPM.
 
-%package        python
-Summary:        Python bindings for libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
-%description    python
+%description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
-%package        groupinstall
-Summary:        Additional commands to install and remove package groups
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl
-Requires:       comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
 
-%description    groupinstall
+%description groupinstall
 This package adds four new commands to apt for installing, removing
 and viewing groups of packages:
 apt-cache groupnames
@@ -110,19 +113,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc
 
 # fix docs to reference correct paths
 perl -pi -e \
-  's|\bconfigure-index\.gz\b|configure-index| ;
-   s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+  s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f | xargs chmod 0644
 
-
 %build
 %configure --disable-dependency-tracking --disable-static
 
@@ -130,81 +133,81 @@
 make %{?_smp_mflags}
 
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
 
 cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
 %endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
 %find_lang %{name}
 
 # The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
 
 # install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
 # GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
 for script in %{SOURCE51} ; do
-  install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
 done
 
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
 
 # apt-groupinstall from contrib
 %if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
 install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
-  $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
 %endif
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -212,8 +215,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/apt stop &>/dev/null || :
-  /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
 fi
 
 %postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.5.15lorg3.2-7
 - Un%%ghost pyo files.
 
@@ -301,7 +308,7 @@
 * Thu May 11 2006 Axel Thimm  - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
-* Mon May  8 2006 Axel Thimm  - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm  - 0.5.15lorg3-2
 - Split off configuration files from apt.
 
 * Tue Apr 25 2006 Axel Thimm  - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
 * Mon Apr 10 2006 Ville Skytt?? 
 - Remove mirror select remainders (thanks to Panu).
 
-* Sun Apr  9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.
 
@@ -322,7 +329,7 @@
 - use /var/lib/apt instead of obsolete /var/state/apt
 - support FC4 as well
 
-* Fri Apr  7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
 * Fri Mar 24 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
 - 0.5.15lorg3-pre2
 - set distroverpkg to fedora-release
 - add distro version and arch independent default source list entries for 
-  fedora core, extras + updates
+ fedora core, extras + updates
 - remove old nasty fedora.us-time hacks from post scriptlets
 
 * Sun Mar 19 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
 * Tue Apr 19 2005 Seth Vidal 
 - tobuild test
 
-* Fri Apr  1 2005 Michael Schwendt  - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt  - 0.5.15cnc7-3
 - Include apt-pkg includedir in -devel package
 
 * Sat Mar 26 2005 Ville Skytt??  - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
 - Drop not-installed Fedora Legacy key from SRPM.
 - Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
-  packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
 
 * Sat Jan 29 2005 Warren Togami  - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 
 * Fri Jan 28 2005 Ville Skytt??  - 0:0.5.15cnc6-14.r362
 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
-  apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
 
 * Sun Jan 23 2005 Ville Skytt??  - 0:0.5.15cnc6-13.r362
 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Jun 2006 09:53:03 -0000	1.6
+++ sources	23 Nov 2006 16:45:48 -0000	1.7
@@ -1 +1,2 @@
 ce05fcc7e0e614fa6e2175008945bb59  apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 16:46:18 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:46:18 -0500
Subject: rpms/apt/FC-6 apt.spec,1.34,1.35 sources,1.13,1.14
Message-ID: <200611231646.kANGkItu011432@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/FC-6

Modified Files:
	apt.spec sources 
Log Message:
Try to fix #210833, some anti-aging make-up.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-6/apt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apt.spec	16 Sep 2006 09:45:13 -0000	1.34
+++ apt.spec	23 Nov 2006 16:45:48 -0000	1.35
@@ -3,99 +3,102 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-Summary:        Debian's Advanced Packaging Tool with RPM support
-Name:           apt
-Version:        0.5.15lorg3.2
-Release:        7%{?dist}
-Group:          System Environment/Base
-URL:            http://apt-rpm.org/
-License:        GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
 
-#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0:	http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
-Source1:        apt.conf
-Source2:        sources.list
-Source3:        vendors.list
-Source4:        apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5:        rpmpriorities
-Source19:       comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
 
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source51:       upgradevirt.lua
+Source51: upgradevirt.lua
 
 # 150-199 for apt.conf.d
 # "factory defaults"
-Source150:      default.conf
+Source150: default.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  libxml2-devel
-BuildRequires:  rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  gettext
-BuildRequires:  docbook-utils
-BuildRequires:  perl
-BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 %if %{generate_rpmpriorities}
-BuildRequires:  %{_bindir}/xsltproc
-BuildRequires:  %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
-BuildRequires:  pkgconfig
-Requires:       gnupg
-Requires:       bzip2
-Requires:       fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
-Obsoletes:      %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
 %endif
-Requires:	apt-config
+Requires: apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
 It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages.  APT features complete installation
+install and upgrade packages. APT features complete installation
 ordering, multiple source capability and several other useful
 features.
 
-%package        devel
-Summary:        Development files and documentation for APT's libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
 
-%description    devel
+%description devel
 This package contains development files for developing with APT's
 libapt-pkg package manipulation library, modified for RPM.
 
-%package        python
-Summary:        Python bindings for libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
-%description    python
+%description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
-%package        groupinstall
-Summary:        Additional commands to install and remove package groups
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl
-Requires:       comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
 
-%description    groupinstall
+%description groupinstall
 This package adds four new commands to apt for installing, removing
 and viewing groups of packages:
 apt-cache groupnames
@@ -110,19 +113,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc
 
 # fix docs to reference correct paths
 perl -pi -e \
-  's|\bconfigure-index\.gz\b|configure-index| ;
-   s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+  s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f | xargs chmod 0644
 
-
 %build
 %configure --disable-dependency-tracking --disable-static
 
@@ -130,81 +133,81 @@
 make %{?_smp_mflags}
 
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
 
 cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
 %endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
 %find_lang %{name}
 
 # The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
 
 # install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
 # GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
 for script in %{SOURCE51} ; do
-  install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
 done
 
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
 
 # apt-groupinstall from contrib
 %if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
 install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
-  $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
 %endif
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -212,8 +215,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/apt stop &>/dev/null || :
-  /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
 fi
 
 %postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.5.15lorg3.2-7
 - Un%%ghost pyo files.
 
@@ -301,7 +308,7 @@
 * Thu May 11 2006 Axel Thimm  - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
-* Mon May  8 2006 Axel Thimm  - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm  - 0.5.15lorg3-2
 - Split off configuration files from apt.
 
 * Tue Apr 25 2006 Axel Thimm  - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
 * Mon Apr 10 2006 Ville Skytt?? 
 - Remove mirror select remainders (thanks to Panu).
 
-* Sun Apr  9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.
 
@@ -322,7 +329,7 @@
 - use /var/lib/apt instead of obsolete /var/state/apt
 - support FC4 as well
 
-* Fri Apr  7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
 * Fri Mar 24 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
 - 0.5.15lorg3-pre2
 - set distroverpkg to fedora-release
 - add distro version and arch independent default source list entries for 
-  fedora core, extras + updates
+ fedora core, extras + updates
 - remove old nasty fedora.us-time hacks from post scriptlets
 
 * Sun Mar 19 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
 * Tue Apr 19 2005 Seth Vidal 
 - tobuild test
 
-* Fri Apr  1 2005 Michael Schwendt  - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt  - 0.5.15cnc7-3
 - Include apt-pkg includedir in -devel package
 
 * Sat Mar 26 2005 Ville Skytt??  - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
 - Drop not-installed Fedora Legacy key from SRPM.
 - Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
-  packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
 
 * Sat Jan 29 2005 Warren Togami  - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 
 * Fri Jan 28 2005 Ville Skytt??  - 0:0.5.15cnc6-14.r362
 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
-  apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
 
 * Sun Jan 23 2005 Ville Skytt??  - 0:0.5.15cnc6-13.r362
 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Jun 2006 09:53:10 -0000	1.13
+++ sources	23 Nov 2006 16:45:48 -0000	1.14
@@ -1 +1,2 @@
 ce05fcc7e0e614fa6e2175008945bb59  apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 16:46:18 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:46:18 -0500
Subject: rpms/apt/FC-5 apt.spec,1.22,1.23 sources,1.6,1.7
Message-ID: <200611231646.kANGkIiM011430@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/FC-5

Modified Files:
	apt.spec sources 
Log Message:
Try to fix #210833, some anti-aging make-up.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-5/apt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apt.spec	16 Sep 2006 09:45:13 -0000	1.22
+++ apt.spec	23 Nov 2006 16:45:48 -0000	1.23
@@ -3,99 +3,102 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-Summary:        Debian's Advanced Packaging Tool with RPM support
-Name:           apt
-Version:        0.5.15lorg3.2
-Release:        7%{?dist}
-Group:          System Environment/Base
-URL:            http://apt-rpm.org/
-License:        GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
 
-#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0:	http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
-Source1:        apt.conf
-Source2:        sources.list
-Source3:        vendors.list
-Source4:        apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5:        rpmpriorities
-Source19:       comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
 
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source51:       upgradevirt.lua
+Source51: upgradevirt.lua
 
 # 150-199 for apt.conf.d
 # "factory defaults"
-Source150:      default.conf
+Source150: default.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  libxml2-devel
-BuildRequires:  rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  gettext
-BuildRequires:  docbook-utils
-BuildRequires:  perl
-BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 %if %{generate_rpmpriorities}
-BuildRequires:  %{_bindir}/xsltproc
-BuildRequires:  %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
-BuildRequires:  pkgconfig
-Requires:       gnupg
-Requires:       bzip2
-Requires:       fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
-Obsoletes:      %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
 %endif
-Requires:	apt-config
+Requires: apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
 It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages.  APT features complete installation
+install and upgrade packages. APT features complete installation
 ordering, multiple source capability and several other useful
 features.
 
-%package        devel
-Summary:        Development files and documentation for APT's libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
 
-%description    devel
+%description devel
 This package contains development files for developing with APT's
 libapt-pkg package manipulation library, modified for RPM.
 
-%package        python
-Summary:        Python bindings for libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
-%description    python
+%description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
-%package        groupinstall
-Summary:        Additional commands to install and remove package groups
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl
-Requires:       comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
 
-%description    groupinstall
+%description groupinstall
 This package adds four new commands to apt for installing, removing
 and viewing groups of packages:
 apt-cache groupnames
@@ -110,19 +113,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc
 
 # fix docs to reference correct paths
 perl -pi -e \
-  's|\bconfigure-index\.gz\b|configure-index| ;
-   s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+  s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f | xargs chmod 0644
 
-
 %build
 %configure --disable-dependency-tracking --disable-static
 
@@ -130,81 +133,81 @@
 make %{?_smp_mflags}
 
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
 
 cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
 %endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
 %find_lang %{name}
 
 # The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
 
 # install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
 # GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
 for script in %{SOURCE51} ; do
-  install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
 done
 
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
 
 # apt-groupinstall from contrib
 %if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
 install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
-  $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
 %endif
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -212,8 +215,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/apt stop &>/dev/null || :
-  /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
 fi
 
 %postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.5.15lorg3.2-7
 - Un%%ghost pyo files.
 
@@ -301,7 +308,7 @@
 * Thu May 11 2006 Axel Thimm  - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
-* Mon May  8 2006 Axel Thimm  - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm  - 0.5.15lorg3-2
 - Split off configuration files from apt.
 
 * Tue Apr 25 2006 Axel Thimm  - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
 * Mon Apr 10 2006 Ville Skytt?? 
 - Remove mirror select remainders (thanks to Panu).
 
-* Sun Apr  9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.
 
@@ -322,7 +329,7 @@
 - use /var/lib/apt instead of obsolete /var/state/apt
 - support FC4 as well
 
-* Fri Apr  7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
 * Fri Mar 24 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
 - 0.5.15lorg3-pre2
 - set distroverpkg to fedora-release
 - add distro version and arch independent default source list entries for 
-  fedora core, extras + updates
+ fedora core, extras + updates
 - remove old nasty fedora.us-time hacks from post scriptlets
 
 * Sun Mar 19 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
 * Tue Apr 19 2005 Seth Vidal 
 - tobuild test
 
-* Fri Apr  1 2005 Michael Schwendt  - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt  - 0.5.15cnc7-3
 - Include apt-pkg includedir in -devel package
 
 * Sat Mar 26 2005 Ville Skytt??  - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
 - Drop not-installed Fedora Legacy key from SRPM.
 - Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
-  packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
 
 * Sat Jan 29 2005 Warren Togami  - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 
 * Fri Jan 28 2005 Ville Skytt??  - 0:0.5.15cnc6-14.r362
 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
-  apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
 
 * Sun Jan 23 2005 Ville Skytt??  - 0:0.5.15cnc6-13.r362
 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Jun 2006 09:53:04 -0000	1.6
+++ sources	23 Nov 2006 16:45:48 -0000	1.7
@@ -1 +1,2 @@
 ce05fcc7e0e614fa6e2175008945bb59  apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 16:46:19 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:46:19 -0500
Subject: rpms/apt/devel .cvsignore, 1.13, 1.14 apt.spec, 1.34, 1.35 sources, 
	1.13, 1.14
Message-ID: <200611231646.kANGkJsA011437@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/devel

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
Try to fix #210833, some anti-aging make-up.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Jun 2006 09:53:10 -0000	1.13
+++ .cvsignore	23 Nov 2006 16:45:49 -0000	1.14
@@ -1 +1,2 @@
 apt-0.5.15lorg3.2.tar.bz2
+apt-0.5.15lorg3.2-ppc.patch


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apt.spec	16 Sep 2006 09:45:13 -0000	1.34
+++ apt.spec	23 Nov 2006 16:45:49 -0000	1.35
@@ -3,99 +3,102 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-Summary:        Debian's Advanced Packaging Tool with RPM support
-Name:           apt
-Version:        0.5.15lorg3.2
-Release:        7%{?dist}
-Group:          System Environment/Base
-URL:            http://apt-rpm.org/
-License:        GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
 
-#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0:	http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
-Source1:        apt.conf
-Source2:        sources.list
-Source3:        vendors.list
-Source4:        apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5:        rpmpriorities
-Source19:       comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
 
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source51:       upgradevirt.lua
+Source51: upgradevirt.lua
 
 # 150-199 for apt.conf.d
 # "factory defaults"
-Source150:      default.conf
+Source150: default.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  libxml2-devel
-BuildRequires:  rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  gettext
-BuildRequires:  docbook-utils
-BuildRequires:  perl
-BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 %if %{generate_rpmpriorities}
-BuildRequires:  %{_bindir}/xsltproc
-BuildRequires:  %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
-BuildRequires:  pkgconfig
-Requires:       gnupg
-Requires:       bzip2
-Requires:       fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
-Obsoletes:      %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
 %endif
-Requires:	apt-config
+Requires: apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
 It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages.  APT features complete installation
+install and upgrade packages. APT features complete installation
 ordering, multiple source capability and several other useful
 features.
 
-%package        devel
-Summary:        Development files and documentation for APT's libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
 
-%description    devel
+%description devel
 This package contains development files for developing with APT's
 libapt-pkg package manipulation library, modified for RPM.
 
-%package        python
-Summary:        Python bindings for libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
-%description    python
+%description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
-%package        groupinstall
-Summary:        Additional commands to install and remove package groups
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl
-Requires:       comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
 
-%description    groupinstall
+%description groupinstall
 This package adds four new commands to apt for installing, removing
 and viewing groups of packages:
 apt-cache groupnames
@@ -110,19 +113,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc
 
 # fix docs to reference correct paths
 perl -pi -e \
-  's|\bconfigure-index\.gz\b|configure-index| ;
-   s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+  s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f | xargs chmod 0644
 
-
 %build
 %configure --disable-dependency-tracking --disable-static
 
@@ -130,81 +133,81 @@
 make %{?_smp_mflags}
 
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
 
 cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
 %endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
 %find_lang %{name}
 
 # The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
 
 # install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
 # GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
 for script in %{SOURCE51} ; do
-  install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
 done
 
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
 
 # apt-groupinstall from contrib
 %if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
 install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
-  $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
 %endif
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -212,8 +215,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/apt stop &>/dev/null || :
-  /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
 fi
 
 %postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.5.15lorg3.2-7
 - Un%%ghost pyo files.
 
@@ -301,7 +308,7 @@
 * Thu May 11 2006 Axel Thimm  - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
-* Mon May  8 2006 Axel Thimm  - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm  - 0.5.15lorg3-2
 - Split off configuration files from apt.
 
 * Tue Apr 25 2006 Axel Thimm  - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
 * Mon Apr 10 2006 Ville Skytt?? 
 - Remove mirror select remainders (thanks to Panu).
 
-* Sun Apr  9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.
 
@@ -322,7 +329,7 @@
 - use /var/lib/apt instead of obsolete /var/state/apt
 - support FC4 as well
 
-* Fri Apr  7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
 * Fri Mar 24 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
 - 0.5.15lorg3-pre2
 - set distroverpkg to fedora-release
 - add distro version and arch independent default source list entries for 
-  fedora core, extras + updates
+ fedora core, extras + updates
 - remove old nasty fedora.us-time hacks from post scriptlets
 
 * Sun Mar 19 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
 * Tue Apr 19 2005 Seth Vidal 
 - tobuild test
 
-* Fri Apr  1 2005 Michael Schwendt  - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt  - 0.5.15cnc7-3
 - Include apt-pkg includedir in -devel package
 
 * Sat Mar 26 2005 Ville Skytt??  - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
 - Drop not-installed Fedora Legacy key from SRPM.
 - Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
-  packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
 
 * Sat Jan 29 2005 Warren Togami  - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 
 * Fri Jan 28 2005 Ville Skytt??  - 0:0.5.15cnc6-14.r362
 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
-  apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
 
 * Sun Jan 23 2005 Ville Skytt??  - 0:0.5.15cnc6-13.r362
 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Jun 2006 09:53:10 -0000	1.13
+++ sources	23 Nov 2006 16:45:49 -0000	1.14
@@ -1 +1,2 @@
 ce05fcc7e0e614fa6e2175008945bb59  apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 16:52:02 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:52:02 -0500
Subject: rpms/mediawiki/devel mediawiki.spec,1.10,1.11
Message-ID: <200611231652.kANGq2q7011614@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11599

Modified Files:
	mediawiki.spec 
Log Message:
Add -r to xargs in case of an empty set.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mediawiki.spec	23 Nov 2006 16:30:31 -0000	1.10
+++ mediawiki.spec	23 Nov 2006 16:51:32 -0000	1.11
@@ -55,10 +55,10 @@
 #cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
 #cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
 cp -a * %{buildroot}%{wikidir}/
-find %{buildroot} -name .svnignore | xargs rm
-find %{buildroot} -name \*.cmi | xargs rm
-find %{buildroot} -name \*.c | xargs rm
-find %{buildroot} -name Makefile | xargs rm
+find %{buildroot} -name .svnignore | xargs -r rm
+find %{buildroot} -name \*.cmi | xargs -r rm
+find %{buildroot} -name \*.c | xargs -r rm
+find %{buildroot} -name Makefile | xargs -r rm
 %{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
 
 #install -d %{buildroot}%{wikidir}/math



From fedora-extras-commits at redhat.com  Thu Nov 23 17:06:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 23 Nov 2006 12:06:19 -0500
Subject: owners owners.list,1.2000,1.2001
Message-ID: <200611231706.kANH6JV1014703@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14688

Modified Files:
	owners.list 
Log Message:
Orphan gdome2, perl-String-Ediff, python-htmltmpl, python-id3.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2000
retrieving revision 1.2001
diff -u -r1.2000 -r1.2001
--- owners.list	23 Nov 2006 01:32:54 -0000	1.2000
+++ owners.list	23 Nov 2006 17:05:49 -0000	1.2001
@@ -505,7 +505,7 @@
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdmap|A tool which allows to visualize disk space|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gdome2|DOM level 2 library for accessing XML files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|geda-docs|Documentation for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-examples|Circuit examples for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-gattrib|Attribute editor for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
@@ -709,7 +709,7 @@
 Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htmldoc|A tool for converting HTML source files into HTML, PostScript, or PDF|adam at spicenitz.org|extras-qa at fedoraproject.org|
-Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|htop|Interactive process viewer|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hugs98|Haskell Interpreter|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -723,7 +723,7 @@
 Fedora Extras|ices|Source streaming for Icecast|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|id3-py|Python ID3 tag library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ifm|Interactive Fiction Mapper|chris at chrisgrau.com|extras-qa at fedoraproject.org|
@@ -1692,7 +1692,7 @@
 Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Statistics-Descriptive|Perl module of basic descriptive statistical functions|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Format|Sprintf-like string formatting capabilities with arbitrary format definitions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Exporter|Sophisticated exporter for custom-built routines|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1958,8 +1958,8 @@
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|jamatos at fc.up.pt|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
-Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|python-id3|ID3 tag library for Python|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-id3|ID3 tag library for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-imaging|Python's own image processing library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-json|A JSON reader and writer for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 23 17:17:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:17:33 -0500
Subject: rpms/mediawiki/devel mediawiki.spec,1.11,1.12
Message-ID: <200611231717.kANHHXCu014748@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14731

Modified Files:
	mediawiki.spec 
Log Message:
Reduce set of installed files some more.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mediawiki.spec	23 Nov 2006 16:51:32 -0000	1.11
+++ mediawiki.spec	23 Nov 2006 17:17:03 -0000	1.12
@@ -55,16 +55,15 @@
 #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
-find %{buildroot} -name \*.cmi | xargs -r rm
-find %{buildroot} -name \*.c | xargs -r rm
-find %{buildroot} -name Makefile | xargs -r rm
 %{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
 
-#install -d %{buildroot}%{wikidir}/math
-#install math/texvc %{buildroot}%{wikidir}/math
+install -d %{buildroot}%{wikidir}/math
+install math/texvc %{buildroot}%{wikidir}/math
 
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+install -D -m 644 %{SOURCE1} \
+  %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Thu Nov 23 17:28:46 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:28:46 -0500
Subject: rpms/fedora-package-config-apt/FC-6 fedora-package-config-apt.spec, 
	1.3, 1.4 fedora.conf, 1.2, 1.3
Message-ID: <200611231728.kANHSk90014848@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14817/FC-6

Modified Files:
	fedora-package-config-apt.spec fedora.conf 
Log Message:
Try to fix #215260.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/FC-6/fedora-package-config-apt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-package-config-apt.spec	30 Aug 2006 00:27:39 -0000	1.3
+++ fedora-package-config-apt.spec	23 Nov 2006 17:28:16 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
-Version: 5.92
-Release: 4
+Version: 6
+Release: 5
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 6-5
+- Add xen and PAE to possible kernel flavours.
+
 * Sat May 20 2006 Axel Thimm 
 - Move some FC specific config bits from apt.
 


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/FC-6/fedora.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora.conf	20 May 2006 16:55:18 -0000	1.2
+++ fedora.conf	23 Nov 2006 17:28:16 -0000	1.3
@@ -20,14 +20,14 @@
   Order "true";
   // Allow multiple kernel and kernel-related packages to be installed
   Allow-Duplicated {
-    "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+    "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
     "^kmod-.+$";
   };
   // XXX: not used currently
   //Allow-Duplicated-Upgrade {
-  //  "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+  //  "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
   //  "^kmod-.+$";
   //  "^gpg-pubkey$";
   //};



From fedora-extras-commits at redhat.com  Thu Nov 23 17:28:46 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:28:46 -0500
Subject: rpms/fedora-package-config-apt/devel fedora-package-config-apt.spec,
	1.3, 1.4 fedora.conf, 1.2, 1.3
Message-ID: <200611231728.kANHSk71014852@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14817/devel

Modified Files:
	fedora-package-config-apt.spec fedora.conf 
Log Message:
Try to fix #215260.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora-package-config-apt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-package-config-apt.spec	30 Aug 2006 00:27:39 -0000	1.3
+++ fedora-package-config-apt.spec	23 Nov 2006 17:28:16 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
-Version: 5.92
-Release: 4
+Version: 6.89
+Release: 6
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 6.89-6
+- Add xen and PAE to possible kernel flavours.
+
 * Sat May 20 2006 Axel Thimm 
 - Move some FC specific config bits from apt.
 


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora.conf	20 May 2006 16:55:18 -0000	1.2
+++ fedora.conf	23 Nov 2006 17:28:16 -0000	1.3
@@ -20,14 +20,14 @@
   Order "true";
   // Allow multiple kernel and kernel-related packages to be installed
   Allow-Duplicated {
-    "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+    "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
     "^kmod-.+$";
   };
   // XXX: not used currently
   //Allow-Duplicated-Upgrade {
-  //  "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+  //  "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
   //  "^kmod-.+$";
   //  "^gpg-pubkey$";
   //};



From fedora-extras-commits at redhat.com  Thu Nov 23 17:30:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:30:33 -0500
Subject: rpms/mediawiki/FC-5 mediawiki.spec,1.5,1.6
Message-ID: <200611231730.kANHUX7L014879@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14864

Modified Files:
	mediawiki.spec 
Log Message:
Backport FC7 fixes.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-5/mediawiki.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mediawiki.spec	3 Apr 2006 13:44:34 -0000	1.5
+++ mediawiki.spec	23 Nov 2006 17:30:03 -0000	1.6
@@ -1,23 +1,24 @@
 %define wikidir %{_var}/www/mediawiki
 
-Name:           mediawiki
-Version:        1.5.8
-Release:        1%{?dist}
-Summary:        The PHP-based wiki software behind Wikipedia
-
-Group:          Applications/Internet
-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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:       httpd
-Requires:       php >= 4.1.2
-Requires:	php-mysql
+Name: mediawiki
+Version: 1.8.2
+Release: 6%{?dist}
+Summary: A wiki engine
+
+Group: Applications/Internet
+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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Requires: httpd
+Requires: php >= 5
+Requires: php-mysql
+Requires: php-gd, diffutils, ImageMagick
 # to make sure the "apache" group is created before mediawiki is installed
-Requires(pre):  httpd
+Requires(pre): httpd
 
 %description
 MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and
@@ -27,44 +28,45 @@
 
 Mathematics support is included in the package mediawiki-math.
 
-
 %package math
-Summary:        Mathematical formula support for MediaWiki
-Group:          Applications/Internet
+Summary: Mathematical formula support for MediaWiki
+Group: Applications/Internet
 
-BuildRequires:  ocaml
-Requires:	mediawiki = %{version}-%{release}
-Requires:       ImageMagick tetex-latex tetex-dvips
+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.
 
-
 %prep
 %setup -q
 install -D -m 644 %{SOURCE2} ./INSTALL.fedora
 rm -rf tests includes/zhtable skins/disabled
 rm -f `find -name ".[ch]*"`
 
-
 %build
 cd math
-make %{?_smp_mflags}
-
+make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{wikidir}
-cp -pr config extensions images includes languages $RPM_BUILD_ROOT%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.*  $RPM_BUILD_ROOT%{wikidir}
-%{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl
-
-install -d $RPM_BUILD_ROOT%{wikidir}/math
-install math/texvc $RPM_BUILD_ROOT%{wikidir}/math
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+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
+
+install -D -m 644 %{SOURCE1} \
+  %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -89,6 +91,24 @@
 
 
 %changelog
+* 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.
+
+* Sat Oct 14 2006 Axel Thimm  - 1.8.2-4
+- Update to 1.8.2.
+
+* Wed Oct 11 2006 Axel Thimm  - 1.8.1-3
+- Update to 1.8.1.
+
+* Wed Oct 11 2006 Axel Thimm  - 1.8.0-2
+- Update to 1.8.0.
+- And php-gd, diffutils, ImageMagick as dependencies
+
 * Mon Apr 03 2006 Roozbeh Pournader  - 1.5.8-1
 - Update to upstream 1.5.8 (contains security fixes)
 
@@ -100,7 +120,7 @@
 
 * Mon Feb 06 2006 Roozbeh Pournader  - 1.5.6-5
 - Put internal doc files in the right directory, renaming it
-  back to docs (#180177)
+ back to docs (#180177)
 
 * Sat Feb 04 2006 Roozbeh Pournader  - 1.5.6-4
 - Use Requires(pre) instead of PreReq (Mike McGrath)



From fedora-extras-commits at redhat.com  Thu Nov 23 17:43:24 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:43:24 -0500
Subject: rpms/mediawiki/FC-6 mediawiki.spec,1.10,1.11
Message-ID: <200611231743.kANHhO9g015005@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14990

Modified Files:
	mediawiki.spec 
Log Message:
Backport FC7 fixes.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-6/mediawiki.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mediawiki.spec	23 Nov 2006 16:30:31 -0000	1.10
+++ mediawiki.spec	23 Nov 2006 17:42:54 -0000	1.11
@@ -55,16 +55,15 @@
 #cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
 #cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
 cp -a * %{buildroot}%{wikidir}/
-find %{buildroot} -name .svnignore | xargs rm
-find %{buildroot} -name \*.cmi | xargs rm
-find %{buildroot} -name \*.c | xargs rm
-find %{buildroot} -name Makefile | xargs rm
+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
+install -d %{buildroot}%{wikidir}/math
+install math/texvc %{buildroot}%{wikidir}/math
 
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+install -D -m 644 %{SOURCE1} \
+  %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Thu Nov 23 18:44:02 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 23 Nov 2006 13:44:02 -0500
Subject: rpms/sword/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sword.spec, 
	1.11, 1.12
Message-ID: <200611231844.kANIi2gY018358@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18339

Modified Files:
	.cvsignore sources sword.spec 
Log Message:
* Thu Nov 23 2006 Deji Akingunola  - 1.5.9-1
- New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 18:57:47 -0000	1.3
+++ .cvsignore	23 Nov 2006 18:43:32 -0000	1.4
@@ -1 +1 @@
-sword-1.5.9-1.src.rpm
+sword-1.5.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 18:57:47 -0000	1.3
+++ sources	23 Nov 2006 18:43:32 -0000	1.4
@@ -1 +1 @@
-2718a640384bf378fc8d229514f8abbd  sword-1.5.9-1.src.rpm
+e1f1af8c2add8310d0bbcddc9af523b8  sword-1.5.9.tar.gz


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-6/sword.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sword.spec	4 Oct 2006 22:36:34 -0000	1.11
+++ sword.spec	23 Nov 2006 18:43:32 -0000	1.12
@@ -1,21 +1,19 @@
 Name:           sword           
-Version:        1.5.8
-Release:        10%{?dist}
+Version:        1.5.9
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
-Source1:        ar_EG-cp1256.conf
-Source2:        ar_EG-utf8.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sed >= 3.95
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libicu-devel icu
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -40,13 +38,9 @@
 
 %prep
 %setup -q
-%{__sed} -i 's?\r??' include/ftptrans.h
-%{__sed} -i 's?\r??' include/ftplibftpt.h
-%{__sed} -i 's?\r??' include/curlftpt.h
-
 
 %build
-%configure --disable-static
+%configure --disable-static --with-icu
 make 
 #%%{?_smp_mflags} sometimes causes build failure
 
@@ -55,8 +49,6 @@
 rm -rf %buildroot
 make install DESTDIR=%buildroot
 %__mkdir_p %buildroot%_datadir/sword/modules
-install -p -m644 %{SOURCE1} %buildroot%_datadir/sword/locales.d/
-install -p -m644 %{SOURCE2} %buildroot%_datadir/sword/locales.d/
 
 find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';'
 
@@ -75,7 +67,7 @@
 %doc samples doc
 %config(noreplace) %_sysconfdir/sword.conf
 %_bindir/*
-%dir %_libdir/sword
+%_libdir/sword/
 %_libdir/libsword-%{version}.so
 %_datadir/sword
 
@@ -88,6 +80,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Deji Akingunola  - 1.5.9-1
+- New release
+
 * Thu Oct 05 2006 Christian Iseli  1.5.8-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Nov 23 18:45:38 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 23 Nov 2006 13:45:38 -0500
Subject: rpms/sword/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sword.spec,
	1.8, 1.9
Message-ID: <200611231845.kANIjcFo018468@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18433

Modified Files:
	.cvsignore sources sword.spec 
Log Message:
* Thu Nov 23 2006 Deji Akingunola  - 1.5.9-1
- New release
 
* Fri Feb 17 2006 Michael A. Peters  - 1.5.8-7
- Rebuild in devel branch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2005 11:54:45 -0000	1.2
+++ .cvsignore	23 Nov 2006 18:45:08 -0000	1.3
@@ -1 +1 @@
-sword-1.5.8.tar.gz
+sword-1.5.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 11:54:45 -0000	1.2
+++ sources	23 Nov 2006 18:45:08 -0000	1.3
@@ -1 +1 @@
-c36398c84bfb044c0c66ef3ffcf29400  sword-1.5.8.tar.gz
+e1f1af8c2add8310d0bbcddc9af523b8  sword-1.5.9.tar.gz


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-5/sword.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sword.spec	17 Feb 2006 12:11:01 -0000	1.8
+++ sword.spec	23 Nov 2006 18:45:08 -0000	1.9
@@ -1,21 +1,19 @@
 Name:           sword           
-Version:        1.5.8
-Release:        7%{?dist}
+Version:        1.5.9
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
-Source1:        ar_EG-cp1256.conf
-Source2:        ar_EG-utf8.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sed >= 3.95
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libicu-devel icu
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -30,6 +28,7 @@
 Summary:  Development files for the sword project
 Group:    Development/Libraries
 Requires: %{name} = %{version}
+Requires: pkgconfig
 
 %description devel
 This package contains the development headers and libraries for the
@@ -39,13 +38,9 @@
 
 %prep
 %setup -q
-%{__sed} -i 's?\r??' include/ftptrans.h
-%{__sed} -i 's?\r??' include/ftplibftpt.h
-%{__sed} -i 's?\r??' include/curlftpt.h
-
 
 %build
-%configure --disable-static
+%configure --disable-static --with-icu
 make 
 #%%{?_smp_mflags} sometimes causes build failure
 
@@ -54,8 +49,6 @@
 rm -rf %buildroot
 make install DESTDIR=%buildroot
 %__mkdir_p %buildroot%_datadir/sword/modules
-install -p -m644 %{SOURCE1} %buildroot%_datadir/sword/locales.d/
-install -p -m644 %{SOURCE2} %buildroot%_datadir/sword/locales.d/
 
 find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';'
 
@@ -74,7 +67,7 @@
 %doc samples doc
 %config(noreplace) %_sysconfdir/sword.conf
 %_bindir/*
-%dir %_libdir/sword
+%_libdir/sword/
 %_libdir/libsword-%{version}.so
 %_datadir/sword
 
@@ -87,6 +80,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Deji Akingunola  - 1.5.9-1
+- New release
+ 
 * Fri Feb 17 2006 Michael A. Peters  - 1.5.8-7
 - Rebuild in devel branch
 



From fedora-extras-commits at redhat.com  Thu Nov 23 18:58:07 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 23 Nov 2006 13:58:07 -0500
Subject: rpms/openbox/devel openbox.spec,1.19,1.20
Message-ID: <200611231858.kANIw7vc018617@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/openbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18602

Modified Files:
	openbox.spec 
Log Message:
Do not own the %{_datadir}/gnome/wm-properties directory. That's now part of gnome-session in Rawhide.


Index: openbox.spec
===================================================================
RCS file: /cvs/extras/rpms/openbox/devel/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	23 Nov 2006 18:57:37 -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
@@ -12,6 +12,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{_datadir}/themes
+Requires:	%{_datadir}/gnome/wm-properties
 
 BuildRequires:	gettext
 BuildRequires:	pango-devel
@@ -84,7 +85,6 @@
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/%{name}/
-%dir %{_datadir}/gnome/wm-properties
 %{_datadir}/gnome/wm-properties/%{name}.desktop
 %{_datadir}/xsessions/%{name}.desktop
 %{_libdir}/libobrender.so.*
@@ -107,6 +107,11 @@
 
 
 %changelog
+* 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
+  Core packages.
+
 * 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  Thu Nov 23 19:10:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 14:10:17 -0500
Subject: comps comps-fe5.xml.in, 1.203, 1.204 comps-fe6.xml.in, 1.229,
	1.230 comps-fe7.xml.in, 1.28, 1.29
Message-ID: <200611231910.kANJAHnm021748@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21727/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add scummvm, dd2


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- comps-fe5.xml.in	22 Nov 2006 00:06:30 -0000	1.203
+++ comps-fe5.xml.in	23 Nov 2006 19:09:47 -0000	1.204
@@ -379,6 +379,7 @@
       rocksndiamonds
       rogue
       scorched3d
+      scummvm
       shippy
       sirius
       sopwith


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- comps-fe6.xml.in	23 Nov 2006 08:28:46 -0000	1.229
+++ comps-fe6.xml.in	23 Nov 2006 19:09:47 -0000	1.230
@@ -431,6 +431,7 @@
       rocksndiamonds
       rogue
       scorched3d
+      scummvm
       shippy
       sopwith
       starfighter


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- comps-fe7.xml.in	22 Nov 2006 02:40:51 -0000	1.28
+++ comps-fe7.xml.in	23 Nov 2006 19:09:47 -0000	1.29
@@ -376,6 +376,7 @@
       crystal-stacker-themes
       csmash
       cyphesis
+      dd2
       enigma
       fbg
       fillets-ng
@@ -431,6 +432,7 @@
       rocksndiamonds
       rogue
       scorched3d
+      scummvm
       shippy
       sopwith
       starfighter



From fedora-extras-commits at redhat.com  Thu Nov 23 19:27:23 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 23 Nov 2006 14:27:23 -0500
Subject: rpms/gnomesword/FC-6 .cvsignore, 1.4, 1.5 gnomesword.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200611231927.kANJRNEY021854@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21835

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Thu Nov 23 2006 Deji Akingunola  - 2.1.9-1
- New release (2.1.9)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Apr 2006 07:41:35 -0000	1.4
+++ .cvsignore	23 Nov 2006 19:26:53 -0000	1.5
@@ -1,3 +1 @@
-gnomesword-2.1.2.tar.gz
-gnomesword-2.1.3.tar.gz
-gnomesword-2.1.6.tar.gz
+gnomesword-2.1.9.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-6/gnomesword.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnomesword.spec	4 Oct 2006 22:36:09 -0000	1.13
+++ gnomesword.spec	23 Nov 2006 19:26:53 -0000	1.14
@@ -1,17 +1,16 @@
 Name:           gnomesword           
-Version:        2.1.6
-Release:        5%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.6-svn1213-kjvot.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
-BuildRequires:  sword-devel >= 1.5.8
+BuildRequires:  sword-devel >= 1.5.9
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
@@ -20,6 +19,7 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  perl(XML::Parser)
+BuildRequires:  libicu-devel icu
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -34,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
@@ -42,8 +41,8 @@
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
-make %{?_smp_mflags}
-
+#make %{?_smp_mflags} //fail to build with this
+make
 
 %install
 rm -rf %buildroot
@@ -83,6 +82,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Deji Akingunola  - 2.1.9-1
+- New release (2.1.9)
+
 * Thu Oct 05 2006 Christian Iseli  2.1.6-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2006 07:41:35 -0000	1.5
+++ sources	23 Nov 2006 19:26:53 -0000	1.6
@@ -1,2 +1 @@
-61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
-7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz
+f6c5ebd5a7ee6d248682289e809f36bf  gnomesword-2.1.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 19:39:12 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 23 Nov 2006 14:39:12 -0500
Subject: rpms/gnomesword/FC-5 .cvsignore, 1.3, 1.4 gnomesword.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200611231939.kANJdC3Z021966@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21947

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Thu Nov 23 2006 Deji Akingunola  - 2.1.9-1
- New release (2.1.9)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2005 21:18:31 -0000	1.3
+++ .cvsignore	23 Nov 2006 19:38:42 -0000	1.4
@@ -1,2 +1 @@
-gnomesword-2.1.2.tar.gz
-gnomesword-2.1.3.tar.gz
+gnomesword-2.1.9.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/gnomesword.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnomesword.spec	2 May 2006 15:50:24 -0000	1.11
+++ gnomesword.spec	23 Nov 2006 19:38:42 -0000	1.12
@@ -1,17 +1,16 @@
 Name:           gnomesword           
-Version:        2.1.6
-Release:        2%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.6-svn1213-kjvot.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
-BuildRequires:  sword-devel >= 1.5.8
+BuildRequires:  sword-devel >= 1.5.9
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
@@ -19,6 +18,8 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  libicu-devel icu
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -33,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
@@ -41,8 +41,8 @@
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
-make %{?_smp_mflags}
-
+#make %{?_smp_mflags} //fail to build with this
+make
 
 %install
 rm -rf %buildroot
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Deji Akingunola  - 2.1.9-1
+- New release (2.1.9)
+
 * Tue May 02 2006 Michael A. Peters  - 2.1.6-2
 - Fixed crash when viewing OT using KJV module (Patch0)
 - Closes bug 190413


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2006 07:43:47 -0000	1.5
+++ sources	23 Nov 2006 19:38:42 -0000	1.6
@@ -1,2 +1 @@
-61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
-7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz
+f6c5ebd5a7ee6d248682289e809f36bf  gnomesword-2.1.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 20:10:24 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 23 Nov 2006 15:10:24 -0500
Subject: rpms/zope/FC-4 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 zope.spec,
	1.19, 1.20
Message-ID: <200611232010.kANKAOhK025891@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25838

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
added hotfix



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Oct 2005 14:01:46 -0000	1.10
+++ .cvsignore	23 Nov 2006 20:09:54 -0000	1.11
@@ -1 +1,3 @@
 Zope-2.8.3-final.tgz
+Hotfix_20060821.tar.gz
+Hotfix_20060705.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Jul 2006 13:02:51 -0000	1.11
+++ sources	23 Nov 2006 20:09:54 -0000	1.12
@@ -1,2 +1,3 @@
 49fd128fde4f3201d12821782bcfc211  Zope-2.8.3-final.tgz
+5cb921d15ff6d290bfc73bdc20ff67c1  Hotfix_20060821.tar.gz
 6dec58130117fd860adc7fd58f8062e7  Hotfix_20060705.tar.gz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- zope.spec	2 Aug 2006 18:46:08 -0000	1.19
+++ zope.spec	23 Nov 2006 20:09:54 -0000	1.20
@@ -13,12 +13,13 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.8.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
 Source0: http://zope.org/Products/Zope/2.8.3/Zope-2.8.3-final.tgz
 Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source20: http://www.zope.org/Products/Zope/Hotfix-2006-08-21/Hotfix-20060821/Hotfix_20060821.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -112,8 +113,9 @@
 # Actually copy all the other files over
 make install
 
-# Hotfix
+# Hotfix(s)
 tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
+tar -xzf %{SOURCE20} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
 
 chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
@@ -188,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Jonathan Steffan  2.8.3-6
+- Added Hotfix_20060821 (#198106#c2)
+
 * Wed Aug  2 2006 Ville Skytt??  - 2.8.3-5
 - Security: fix world-writable permissions on logrotate config files
   and README.Fedora (#200794).



From fedora-extras-commits at redhat.com  Thu Nov 23 20:16:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:16:01 -0500
Subject: rpms/liquidwar - New directory
Message-ID: <200611232016.kANKG1TT026033@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26029/liquidwar

Log Message:
Directory /cvs/extras/rpms/liquidwar added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 20:16:06 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:16:06 -0500
Subject: rpms/liquidwar/devel - New directory
Message-ID: <200611232016.kANKG6oO026046@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26029/liquidwar/devel

Log Message:
Directory /cvs/extras/rpms/liquidwar/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 20:16:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:16:24 -0500
Subject: rpms/liquidwar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611232016.kANKGOPr026076@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26070

Added Files:
	Makefile import.log 
Log Message:
Setup of module liquidwar


--- NEW FILE Makefile ---
# Top level Makefile for module liquidwar
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 Nov 23 20:16:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:16:29 -0500
Subject: rpms/liquidwar/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611232016.kANKGTp0026091@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26070/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module liquidwar


--- 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 Nov 23 20:18:25 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 23 Nov 2006 15:18:25 -0500
Subject: rpms/zope/FC-4 zope.spec,1.20,1.21
Message-ID: <200611232018.kANKIPRo026149@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26127

Modified Files:
	zope.spec 
Log Message:
oops




Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- zope.spec	23 Nov 2006 20:09:54 -0000	1.20
+++ zope.spec	23 Nov 2006 20:17:55 -0000	1.21
@@ -13,7 +13,7 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.8.3
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/



From fedora-extras-commits at redhat.com  Thu Nov 23 20:19:19 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:19:19 -0500
Subject: rpms/liquidwar import.log,1.1,1.2
Message-ID: <200611232019.kANKJJvS026202@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26165

Modified Files:
	import.log 
Log Message:
auto-import liquidwar-5.6.3-1.fc7 on branch devel from liquidwar-5.6.3-1.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Nov 2006 20:16:24 -0000	1.1
+++ import.log	23 Nov 2006 20:18:49 -0000	1.2
@@ -0,0 +1 @@
+liquidwar-5_6_3-1_fc7:HEAD:liquidwar-5.6.3-1.fc7.src.rpm:1164313931



From fedora-extras-commits at redhat.com  Thu Nov 23 20:19:19 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:19:19 -0500
Subject: rpms/liquidwar/devel liquidwar.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611232019.kANKJJHY026206@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26165/devel

Modified Files:
	.cvsignore sources 
Added Files:
	liquidwar.spec 
Log Message:
auto-import liquidwar-5.6.3-1.fc7 on branch devel from liquidwar-5.6.3-1.fc7.src.rpm


--- NEW FILE liquidwar.spec ---
Name:           liquidwar
Version:        5.6.3
Release:        1%{?dist}
Summary:        Multiplayer wargame with liquid armies
Group:          Amusements/Games
License:        GPL
URL:            http://www.ufoot.org/liquidwar/v5
Source:         http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel allegro-tools tetex-latex python texinfo
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
Liquid War is a unique multiplayer wargame. You control an army of liquid
and have to try and eat your opponents. A single player mode is available,
but the game is definitely designed to be multiplayer, and has network
support. 


%package doc
Summary:        Documentation for the LiquidWar game in additional formats
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description doc
This package contains the documentation of LiquidWar in html, pdf, ps and txt
format.


%prep
%setup -q
# don't strip the binaries please 
sed -i 's/install -s/install/g' Makefile.in
# fix manpage doc reference
sed -i \
  -e 's:^\.B /usr/share/doc/liquidwar $:\.B %{_docdir}/%{name}-doc-%{version}:' \
  -e 's:^or $:directory (from :' \
  -e 's:^\.B /usr/local/share/doc/liquidwar$:the %{name}-doc :' \
  -e 's:^directories, :package), :' \
  doc/man/begin.man.in
# fix metaserer url
sed -i 's#http://www.ufoot.org/liquidwar/metaserver.php3#http://www.ufoot.org/liquidwar/v5/metaserver#g' \
  doc/xml/*.xml


%build
%configure \
%ifnarch %{ix86}
  --disable-asm
%endif

make %{?_smp_mflags} GAMEDIR=%{_bindir} DATADIR=%{_datadir}/%{name}

# make docs utf-8
iconv -f ISO-8859-1 -t UTF8 doc/man/%{name}.6 | gzip > doc/man/%{name}.6.gz
gzip -cd doc/info/%{name}.info.gz | \
  iconv -f ISO-8859-1 -t UTF8 > doc/info/%{name}.info
gzip -f doc/info/%{name}.info


%install
rm -rf $RPM_BUILD_ROOT
make install_nolink DESTDIR=$RPM_BUILD_ROOT GAMEDIR=%{_bindir} \
  DATADIR=%{_datadir}/%{name} 
mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} liquidwardocs
rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm

# below is the desktop file and icon stuff.
desktop-file-install --delete-original --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{32x32,48x48}/apps
install -p -m 644 misc/%{name}_32x32.xpm \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
install -p -m 644 misc/%{name}.xpm \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%preun
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
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 COPYING README
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_infodir}/%{name}.*
%{_mandir}/man6/%{name}*.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.xpm

%files doc
%defattr(-,root,root,-)
%doc liquidwardocs/*


%changelog
* Sun Nov 19 2006 Hans de Goede  5.6.3-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Nov 2006 20:16:29 -0000	1.1
+++ .cvsignore	23 Nov 2006 20:18:49 -0000	1.2
@@ -0,0 +1 @@
+liquidwar-5.6.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Nov 2006 20:16:29 -0000	1.1
+++ sources	23 Nov 2006 20:18:49 -0000	1.2
@@ -0,0 +1 @@
+a41473c281f214c1ac96ab50f98537c9  liquidwar-5.6.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 20:21:36 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 23 Nov 2006 15:21:36 -0500
Subject: rpms/zope/FC-4 zope.spec,1.21,1.22
Message-ID: <200611232021.kANKLa3n026261@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26244

Modified Files:
	zope.spec 
Log Message:
updated changelog



Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- zope.spec	23 Nov 2006 20:17:55 -0000	1.21
+++ zope.spec	23 Nov 2006 20:21:06 -0000	1.22
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Jonathan Steffan  2.8.3-6.fc4.1
+- Retag
+
 * Thu Nov 23 2006 Jonathan Steffan  2.8.3-6
 - Added Hotfix_20060821 (#198106#c2)
 



From fedora-extras-commits at redhat.com  Thu Nov 23 20:24:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:24:13 -0500
Subject: owners owners.list,1.2001,1.2002
Message-ID: <200611232024.kANKODjh026380@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26341

Modified Files:
	owners.list 
Log Message:
added liquidwar


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2001
retrieving revision 1.2002
diff -u -r1.2001 -r1.2002
--- owners.list	23 Nov 2006 17:05:49 -0000	1.2001
+++ owners.list	23 Nov 2006 20:23:43 -0000	1.2002
@@ -1030,6 +1030,7 @@
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|liquidwar|Multiplayer wargame with liquid armies|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi



From fedora-extras-commits at redhat.com  Thu Nov 23 20:25:09 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 23 Nov 2006 15:25:09 -0500
Subject: comps Makefile,1.3,1.4
Message-ID: <200611232025.kANKP9FD026403@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26388

Modified Files:
	Makefile 
Log Message:
explicitly specify Makefile


Index: Makefile
===================================================================
RCS file: /cvs/extras/comps/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	29 Oct 2006 11:55:48 -0000	1.3
+++ Makefile	23 Nov 2006 20:24:39 -0000	1.4
@@ -4,7 +4,7 @@
 all: po $(XMLFILES)
 
 po: $(XMLINFILES)
-	make -C po || exit 1
+	make -C po -f Makefile || exit 1
 
 clean:
 	@rm -fv *~



From fedora-extras-commits at redhat.com  Thu Nov 23 20:26:35 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 23 Nov 2006 15:26:35 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.16,1.17
Message-ID: <200611232026.kANKQZpT026432@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415

Modified Files:
	ppracer.spec 
Log Message:
install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede)
add dist tag



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ppracer.spec	28 Aug 2006 13:50:10 -0000	1.16
+++ ppracer.spec	23 Nov 2006 20:26:05 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 7
+Release: 8%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,9 @@
 Source1: ppracer.png
 Source2: ppracer.desktop
 
+# temporary workaround for libGLU deficiencies
+Source3: tree.png
+
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
 Patch2: ppracer-0.3.1-c++.patch
@@ -57,6 +60,12 @@
 %patch1 -p1 -b .lib64
 %patch2 -p1 -b .c++
 
+# temporary workaround for libGLU deficiencies
+if [ ! -f data/courses/themes/models/common/tree.png.brokenlibGLU ]; then
+    mv data/courses/themes/models/common/tree.png data/courses/themes/models/common/tree.png.brokenlibGLU
+    cp %{SOURCE3} data/courses/themes/models/common/tree.png
+fi
+
 %build
 autoconf
 %configure --with-data-dir=%{_datadir}/ppracer
@@ -85,6 +94,11 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* 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)
+- add dist tag
+
 * Mon Aug 28 2006 Nils Philippsen  0.3.1-7
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 20:39:13 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 23 Nov 2006 15:39:13 -0500
Subject: rpms/zope/FC-3 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 zope.spec,
	1.10, 1.11
Message-ID: <200611232039.kANKdDeZ026661@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26642

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
added hotfix



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2005 20:50:46 -0000	1.7
+++ .cvsignore	23 Nov 2006 20:38:43 -0000	1.8
@@ -1 +1,2 @@
 Zope-2.8.0-final.tar.gz
+Hotfix_20060821.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jul 2006 13:02:44 -0000	1.8
+++ sources	23 Nov 2006 20:38:43 -0000	1.9
@@ -1,2 +1,3 @@
 f734fa4c55f36b5038f36be9a6d4e61e  Zope-2.8.0-final.tar.gz
 6dec58130117fd860adc7fd58f8062e7  Hotfix_20060705.tar.gz
+5cb921d15ff6d290bfc73bdc20ff67c1  Hotfix_20060821.tar.gz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/zope.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zope.spec	2 Aug 2006 18:46:07 -0000	1.10
+++ zope.spec	23 Nov 2006 20:38:43 -0000	1.11
@@ -13,12 +13,13 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
 Source0: http://zope.org/Products/Zope/2.8.0/Zope-2.8.0-final.tar.gz
 Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source20: http://www.zope.org/Products/Zope/Hotfix-2006-08-21/Hotfix-20060821/Hotfix_20060821.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -103,6 +104,7 @@
 
 # Hotfix
 tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
+tar -xzf %{SOURCE20} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
 
 chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
@@ -177,6 +179,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Jonathan Steffan  2.8.0-5
+- Added Hotfix_20060821 (#198106#c2)
+
 * Wed Aug  2 2006 Ville Skytt??  - 2.8.0-4
 - Security: fix world-writable permissions on logrotate config files
   and README.Fedora (#200794).



From fedora-extras-commits at redhat.com  Thu Nov 23 20:57:13 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 23 Nov 2006 15:57:13 -0500
Subject: rpms/ppracer/FC-6 ppracer.spec,1.16,1.17
Message-ID: <200611232057.kANKvDpf026828@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26448

Modified Files:
	ppracer.spec 
Log Message:
install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede)
add dist tag



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/FC-6/ppracer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ppracer.spec	28 Aug 2006 13:50:10 -0000	1.16
+++ ppracer.spec	23 Nov 2006 20:56:43 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 7
+Release: 8%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,9 @@
 Source1: ppracer.png
 Source2: ppracer.desktop
 
+# temporary workaround for libGLU deficiencies
+Source3: tree.png
+
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
 Patch2: ppracer-0.3.1-c++.patch
@@ -57,6 +60,12 @@
 %patch1 -p1 -b .lib64
 %patch2 -p1 -b .c++
 
+# temporary workaround for libGLU deficiencies
+if [ ! -f data/courses/themes/models/common/tree.png.brokenlibGLU ]; then
+    mv data/courses/themes/models/common/tree.png data/courses/themes/models/common/tree.png.brokenlibGLU
+    cp %{SOURCE3} data/courses/themes/models/common/tree.png
+fi
+
 %build
 autoconf
 %configure --with-data-dir=%{_datadir}/ppracer
@@ -85,6 +94,11 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* 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)
+- add dist tag
+
 * Mon Aug 28 2006 Nils Philippsen  0.3.1-7
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 20:58:37 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 23 Nov 2006 15:58:37 -0500
Subject: rpms/ppracer/FC-6 tree.png,NONE,1.1
Message-ID: <200611232058.kANKwbGA026881@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26876

Added Files:
	tree.png 
Log Message:
install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede)
add dist tag




From fedora-extras-commits at redhat.com  Thu Nov 23 21:31:03 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 23 Nov 2006 16:31:03 -0500
Subject: rpms/libsexy/devel libsexy.spec,1.11,1.12
Message-ID: <200611232131.kANLV3D4030155@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libsexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30138

Modified Files:
	libsexy.spec 
Log Message:
* Thu Nov 23 2006 Brian Pepple  - 0.1.10-2
- Update URL (#217073).



Index: libsexy.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexy/devel/libsexy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsexy.spec	5 Sep 2006 13:35:30 -0000	1.11
+++ libsexy.spec	23 Nov 2006 21:30:33 -0000	1.12
@@ -1,11 +1,11 @@
 Name:           libsexy
 Version:        0.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://wiki.chipx86.com/wiki/Libsexy
+URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/%{name}/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Brian Pepple  - 0.1.10-2
+- Update URL (#217073).
+
 * Tue Sep  5 2006 Brian Pepple  - 0.1.10-1
 - Update to 0.1.10.
 



From fedora-extras-commits at redhat.com  Thu Nov 23 21:32:26 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 23 Nov 2006 16:32:26 -0500
Subject: rpms/libsexy/FC-6 libsexy.spec,1.11,1.12
Message-ID: <200611232132.kANLWQkN030192@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libsexy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30177

Modified Files:
	libsexy.spec 
Log Message:
* Thu Nov 23 2006 Brian Pepple  - 0.1.10-2
- Update URL (#217073).



Index: libsexy.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexy/FC-6/libsexy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsexy.spec	5 Sep 2006 13:35:30 -0000	1.11
+++ libsexy.spec	23 Nov 2006 21:31:55 -0000	1.12
@@ -1,11 +1,11 @@
 Name:           libsexy
 Version:        0.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://wiki.chipx86.com/wiki/Libsexy
+URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/%{name}/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Brian Pepple  - 0.1.10-2
+- Update URL (#217073).
+
 * Tue Sep  5 2006 Brian Pepple  - 0.1.10-1
 - Update to 0.1.10.
 



From fedora-extras-commits at redhat.com  Thu Nov 23 23:16:32 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:16:32 -0500
Subject: rpms/php-pear-Date/FC-6 .cvsignore, 1.2, 1.3 php-pear-Date.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611232316.kANNGWGr004098@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4041/FC-6

Modified Files:
	.cvsignore php-pear-Date.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 21:07:53 -0000	1.2
+++ .cvsignore	23 Nov 2006 23:16:02 -0000	1.3
@@ -1 +1 @@
-Date-1.4.6.tgz
+Date-1.4.7.tgz


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/php-pear-Date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Date.spec	7 Sep 2006 21:07:53 -0000	1.1
+++ php-pear-Date.spec	23 Nov 2006 23:16:02 -0000	1.2
@@ -2,7 +2,7 @@
 %define ClassName Date
 
 Name:           php-pear-Date
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Date and Time Zone Classes
 
@@ -83,5 +83,8 @@
 
 
 %changelog
+* Thu Nov 23 2006 Christopher Stone  1.4.7-1
+- Upstream Sync
+
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 21:07:53 -0000	1.2
+++ sources	23 Nov 2006 23:16:02 -0000	1.3
@@ -1 +1 @@
-9acd7e19d094877c6d26be1fbabe79cb  Date-1.4.6.tgz
+6d34306e484d46c205002f8900ce6da3  Date-1.4.7.tgz



From fedora-extras-commits at redhat.com  Thu Nov 23 23:16:32 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:16:32 -0500
Subject: rpms/php-pear-Date/FC-5 .cvsignore, 1.2, 1.3 php-pear-Date.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611232316.kANNGWiA004093@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4041/FC-5

Modified Files:
	.cvsignore php-pear-Date.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 21:07:53 -0000	1.2
+++ .cvsignore	23 Nov 2006 23:16:02 -0000	1.3
@@ -1 +1 @@
-Date-1.4.6.tgz
+Date-1.4.7.tgz


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-5/php-pear-Date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Date.spec	7 Sep 2006 21:07:53 -0000	1.1
+++ php-pear-Date.spec	23 Nov 2006 23:16:02 -0000	1.2
@@ -2,7 +2,7 @@
 %define ClassName Date
 
 Name:           php-pear-Date
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Date and Time Zone Classes
 
@@ -83,5 +83,8 @@
 
 
 %changelog
+* Thu Nov 23 2006 Christopher Stone  1.4.7-1
+- Upstream Sync
+
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 21:07:53 -0000	1.2
+++ sources	23 Nov 2006 23:16:02 -0000	1.3
@@ -1 +1 @@
-9acd7e19d094877c6d26be1fbabe79cb  Date-1.4.6.tgz
+6d34306e484d46c205002f8900ce6da3  Date-1.4.7.tgz



From fedora-extras-commits at redhat.com  Thu Nov 23 23:16:38 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:16:38 -0500
Subject: rpms/php-pear-Date/devel .cvsignore, 1.2, 1.3 php-pear-Date.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611232316.kANNGcoE004103@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4041/devel

Modified Files:
	.cvsignore php-pear-Date.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 21:07:53 -0000	1.2
+++ .cvsignore	23 Nov 2006 23:16:08 -0000	1.3
@@ -1 +1 @@
-Date-1.4.6.tgz
+Date-1.4.7.tgz


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/php-pear-Date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Date.spec	7 Sep 2006 21:07:53 -0000	1.1
+++ php-pear-Date.spec	23 Nov 2006 23:16:08 -0000	1.2
@@ -2,7 +2,7 @@
 %define ClassName Date
 
 Name:           php-pear-Date
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Date and Time Zone Classes
 
@@ -83,5 +83,8 @@
 
 
 %changelog
+* Thu Nov 23 2006 Christopher Stone  1.4.7-1
+- Upstream Sync
+
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 21:07:53 -0000	1.2
+++ sources	23 Nov 2006 23:16:08 -0000	1.3
@@ -1 +1 @@
-9acd7e19d094877c6d26be1fbabe79cb  Date-1.4.6.tgz
+6d34306e484d46c205002f8900ce6da3  Date-1.4.7.tgz



From fedora-extras-commits at redhat.com  Thu Nov 23 23:27:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:27:02 -0500
Subject: rpms/php-pear-Date/FC-5 php-pear-Date.spec,1.2,1.3
Message-ID: <200611232327.kANNR2RW004208@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/FC-5

Modified Files:
	php-pear-Date.spec 
Log Message:
Some fixes for new release


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-5/php-pear-Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Date.spec	23 Nov 2006 23:16:02 -0000	1.2
+++ php-pear-Date.spec	23 Nov 2006 23:26:32 -0000	1.3
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -57,6 +57,9 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# Fix end of line encoding
+dos2unix docdir/%{ClassName}/docs/TODO
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
+%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
 %{pear_xmldir}/%{ClassName}.xml
 %{pear_testdir}/%{ClassName}
 %{pear_phpdir}/%{ClassName}
@@ -85,6 +88,8 @@
 %changelog
 * Thu Nov 23 2006 Christopher Stone  1.4.7-1
 - Upstream Sync
+- Fix end-of-line encoding for TODO
+- Remove docs dir from %doc
 
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Nov 23 23:27:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:27:02 -0500
Subject: rpms/php-pear-Date/FC-6 php-pear-Date.spec,1.2,1.3
Message-ID: <200611232327.kANNR28B004211@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/FC-6

Modified Files:
	php-pear-Date.spec 
Log Message:
Some fixes for new release


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/php-pear-Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Date.spec	23 Nov 2006 23:16:02 -0000	1.2
+++ php-pear-Date.spec	23 Nov 2006 23:26:32 -0000	1.3
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -57,6 +57,9 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# Fix end of line encoding
+dos2unix docdir/%{ClassName}/docs/TODO
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
+%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
 %{pear_xmldir}/%{ClassName}.xml
 %{pear_testdir}/%{ClassName}
 %{pear_phpdir}/%{ClassName}
@@ -85,6 +88,8 @@
 %changelog
 * Thu Nov 23 2006 Christopher Stone  1.4.7-1
 - Upstream Sync
+- Fix end-of-line encoding for TODO
+- Remove docs dir from %doc
 
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Nov 23 23:27:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:27:02 -0500
Subject: rpms/php-pear-Date/devel php-pear-Date.spec,1.2,1.3
Message-ID: <200611232327.kANNR2w8004214@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/devel

Modified Files:
	php-pear-Date.spec 
Log Message:
Some fixes for new release


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/php-pear-Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Date.spec	23 Nov 2006 23:16:08 -0000	1.2
+++ php-pear-Date.spec	23 Nov 2006 23:26:32 -0000	1.3
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -57,6 +57,9 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# Fix end of line encoding
+dos2unix docdir/%{ClassName}/docs/TODO
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
+%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
 %{pear_xmldir}/%{ClassName}.xml
 %{pear_testdir}/%{ClassName}
 %{pear_phpdir}/%{ClassName}
@@ -85,6 +88,8 @@
 %changelog
 * Thu Nov 23 2006 Christopher Stone  1.4.7-1
 - Upstream Sync
+- Fix end-of-line encoding for TODO
+- Remove docs dir from %doc
 
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Nov 23 23:42:12 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:42:12 -0500
Subject: rpms/xdms - New directory
Message-ID: <200611232342.kANNgCgi004414@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4410/xdms

Log Message:
Directory /cvs/extras/rpms/xdms added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 23:42:18 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:42:18 -0500
Subject: rpms/xdms/devel - New directory
Message-ID: <200611232342.kANNgIHC004428@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4410/xdms/devel

Log Message:
Directory /cvs/extras/rpms/xdms/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 23:42:36 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:42:36 -0500
Subject: rpms/xdms Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611232342.kANNgaPt004457@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4451

Added Files:
	Makefile import.log 
Log Message:
Setup of module xdms


--- NEW FILE Makefile ---
# Top level Makefile for module xdms
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 Nov 23 23:42:41 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:42:41 -0500
Subject: rpms/xdms/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611232342.kANNgf6D004472@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4451/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xdms


--- 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 Nov 23 23:43:45 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:43:45 -0500
Subject: rpms/xdms import.log,1.1,1.2
Message-ID: <200611232343.kANNhjE9004541@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4511

Modified Files:
	import.log 
Log Message:
auto-import xdms-1.3.2-3 on branch devel from xdms-1.3.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xdms/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Nov 2006 23:42:36 -0000	1.1
+++ import.log	23 Nov 2006 23:43:15 -0000	1.2
@@ -0,0 +1 @@
+xdms-1_3_2-3:HEAD:xdms-1.3.2-3.src.rpm:1164329521



From fedora-extras-commits at redhat.com  Thu Nov 23 23:43:45 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:43:45 -0500
Subject: rpms/xdms/devel xdms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611232343.kANNhjTE004545@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4511/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xdms.spec 
Log Message:
auto-import xdms-1.3.2-3 on branch devel from xdms-1.3.2-3.src.rpm


--- NEW FILE xdms.spec ---
Name:           xdms
Version:        1.3.2
Release:        3%{?dist}
Summary:        Extracts Amiga DMS archives

Group:          Applications/Archiving
License:        Public Domain
URL:            http://zakalwe.fi/~shd/foss/%{name}
Source0:        http://zakalwe.fi/~shd/foss/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Extracts Amiga DMS (Disk Masher) archives which are compressed Amiga disk
images. Xdms is particularly useful with Amiga emulators.


%prep
%setup -q


%build
# Non standard configure script that does not support libdir for example.
CFLAGS="%{optflags}" ./configure --prefix=%{_usr}
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
install -p -m0644 xdms.1 %{buildroot}%{_mandir}/man1
install -p -m0755 src/xdms %{buildroot}%{_bindir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/xdms
%{_mandir}/man1/xdms.1.*
%doc ChangeLog.txt %{name}.txt


%changelog
* Sat Nov 18 2006 Ian Chapman  1.3.2-3
- Minor spec cleanups

* Mon Nov 06 2006 Ian Chapman  1.3.2-2
- Possible migration to FE

* Mon Oct 23 2006 Ian Chapman  1.3.2-1
- Upgrade to 1.3.2

* Mon May 29 2006 Ian Chapman  1.3.1-3
- Replace %%{__rm} in clean section with rm
- Use rpmoptflags

* Mon May 01 2006 Ian Chapman  1.3.1-2.iss
- Altered spec file to follow Fedora style more closely
- Removed readdisk as this was actually an Amiga binary

* Sun Dec 18 2005 Ian Chapman  1.3.1-1.iss
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdms/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Nov 2006 23:42:41 -0000	1.1
+++ .cvsignore	23 Nov 2006 23:43:15 -0000	1.2
@@ -0,0 +1 @@
+xdms-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdms/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Nov 2006 23:42:41 -0000	1.1
+++ sources	23 Nov 2006 23:43:15 -0000	1.2
@@ -0,0 +1 @@
+f687a5beba88964ef0afd478efe99849  xdms-1.3.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 23:46:24 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:46:24 -0500
Subject: owners owners.list,1.2002,1.2003
Message-ID: <200611232346.kANNkOMA004601@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4580

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2002
retrieving revision 1.2003
diff -u -r1.2002 -r1.2003
--- owners.list	23 Nov 2006 20:23:43 -0000	1.2002
+++ owners.list	23 Nov 2006 23:45:54 -0000	1.2003
@@ -2455,6 +2455,7 @@
 Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xdg-utils|Basic desktop integration functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|xdms|Extracts Amiga DMS archives|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|xdrawchem|2D chemical structures drawing tool|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 24 03:47:12 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 23 Nov 2006 22:47:12 -0500
Subject: rpms/snort/devel .cvsignore, 1.6, 1.7 snort.spec, 1.18, 1.19 sources,
	1.6, 1.7
Message-ID: <200611240347.kAO3lC8m017342@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17323

Modified Files:
	.cvsignore snort.spec sources 
Log Message:
update to 2.6.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Oct 2006 17:38:28 -0000	1.6
+++ .cvsignore	24 Nov 2006 03:46:42 -0000	1.7
@@ -1 +1 @@
-snort-2.6.0.2.tar.gz
+snort-2.6.1.1.tar.gz


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- snort.spec	9 Oct 2006 18:59:52 -0000	1.18
+++ snort.spec	24 Nov 2006 03:46:42 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.6.0.2
-Release:        2%{?dist}
+Version:        2.6.1.1
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -24,7 +24,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 
 %package        mysql
@@ -37,7 +36,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 BuildRequires:  mysql-devel
 
@@ -51,7 +49,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 BuildRequires:  postgresql-devel
 
@@ -66,7 +63,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
@@ -75,7 +71,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 BuildRequires:  net-snmp-devel
 BuildRequires:  postgresql-devel
@@ -425,6 +420,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Dennis Gilmore  - 2.6.1.1-1
+-upgrade to 2.6.1.1
+
 * Mon Oct 09 2006 Dennis Gilmore  - 2.6.0.2-2
 - disable smp  as it breaks build on the buildsys
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Oct 2006 17:38:28 -0000	1.6
+++ sources	24 Nov 2006 03:46:42 -0000	1.7
@@ -1 +1 @@
-5c094ff6d82db845a5f023e4a492103e  snort-2.6.0.2.tar.gz
+a7313ff4346317c301af361e211a7cd4  snort-2.6.1.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 06:52:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 24 Nov 2006 01:52:30 -0500
Subject: rpms/liquidwar/devel liquidwar.init, NONE, 1.1 liquidwar.logrotate, 
	NONE, 1.1 liquidwar.sysconfig, NONE, 1.1 liquidwar.spec, 1.1, 1.2
Message-ID: <200611240652.kAO6qUH0026953@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26933

Modified Files:
	liquidwar.spec 
Added Files:
	liquidwar.init liquidwar.logrotate liquidwar.sysconfig 
Log Message:
Added support for running liquidwar as a daemon




--- NEW FILE liquidwar.init ---
#!/bin/sh
#
# liquidwar    This shell script takes care of starting and stopping
#              the liquidwar game server.
#
# chkconfig:   - 15 85
# description: The liquidwar server supports playing networked \
#              multi-player games.
# processname: liquidwar-server
# config:      /etc/sysconfig/liquidwar
# pidfile:     /var/run/liquidwar-server.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0

exec="/usr/bin/liquidwar-server"
prog=$(basename $exec)
name=liquidwar
pidfile=/var/run/$prog.pid

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting liquidwar game server: "
    if [ -n "`/sbin/pidof $prog`" ]; then
        echo -n $"$prog already running"
        failure
        echo
        return 1
    fi

    # This doesn't properly detect startup failures
    daemon --user liquidwar $exec $LIQUIDWAR_OPTIONS >>/var/log/${prog}.log 2>&1 &
    retval=$?
    if [ $retval -eq 0 ]; then
        success
        touch $lockfile
    else
        failure
    fi
    echo
    return $retval
}

stop() {
    echo -n $"Stopping liquidwar game server: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
        [ ! -f $lockfile ] || restart
    ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE liquidwar.logrotate ---
/var/log/liquidwar-server.log {
    copytruncate
    notifempty
    missingok
}


--- NEW FILE liquidwar.sysconfig ---
#
# liquidwar-server(6) options. Pick a custom port here if needed, for example.
#

# The default options call for a 2 player game that is not advertised to
# the public metaserver.  The default port that the game uses is tcp/8035.  Be
# sure to open up this port in your firewall, or change the port in the
# options below.
LIQUIDWAR_OPTIONS="-2 -private"


Index: liquidwar.spec
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/liquidwar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liquidwar.spec	23 Nov 2006 20:18:49 -0000	1.1
+++ liquidwar.spec	24 Nov 2006 06:52:00 -0000	1.2
@@ -1,15 +1,23 @@
 Name:           liquidwar
 Version:        5.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiplayer wargame with liquid armies
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.ufoot.org/liquidwar/v5
-Source:         http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source1:        liquidwar.init 
+Source2:        liquidwar.sysconfig 
+Source3:        liquidwar.logrotate 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel allegro-tools tetex-latex python texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
 
 %description
 Liquid War is a unique multiplayer wargame. You control an army of liquid
@@ -27,6 +35,13 @@
 This package contains the documentation of LiquidWar in html, pdf, ps and txt
 format.
 
+%package server
+Summary:        Network game server for the LiquidWar game
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description server
+This package contains the server for hosting network LiquidWar games.
+
 
 %prep
 %setup -q
@@ -76,6 +91,12 @@
 install -p -m 644 misc/%{name}.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
 
+install -p -D -m 755 %{SOURCE1} \
+        $RPM_BUILD_ROOT/%{_initrddir}/%{name}-server
+install -p -D -m 644 %{SOURCE2} \
+        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server
+install -p -D -m 644 %{SOURCE3} \
+        $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,14 +120,38 @@
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+%pre server
+user_uid=`id -u %{name} 2>/dev/null`
+if [ x"$user_uid" = x ] ; then
+    useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
+            -c 'LiquidWar Server' \
+            %{name} >/dev/null || :
+fi
+
+%post server
+/sbin/chkconfig --add %{name}-server
+
+%preun server
+if [ "$1" -le "0" ]; then
+    /sbin/service %{name}-server stop > /dev/null 2>&1
+    /sbin/chkconfig --del %{name}-server
+fi
+
+%postun server
+if [ "$1" -ge "1" ]; then
+    /sbin/service %{name}-server condrestart > /dev/null 2>&1
+fi
+
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_bindir}/%{name}*
+%{_bindir}/%{name}
+%{_bindir}/%{name}-mapgen
 %{_datadir}/%{name}
 %{_infodir}/%{name}.*
-%{_mandir}/man6/%{name}*.6.gz
+%{_mandir}/man6/%{name}.6.gz
+%{_mandir}/man6/%{name}-mapgen.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.xpm
 
@@ -114,7 +159,17 @@
 %defattr(-,root,root,-)
 %doc liquidwardocs/*
 
+%files server
+%{_bindir}/%{name}-server
+%{_mandir}/man6/%{name}-server.6.gz
+%{_initrddir}/%{name}-server
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server
+
 
 %changelog
+* Thu Nov 23 2006 Wart  5.6.3-2
+- Added init.d startup script for the game server
+
 * Sun Nov 19 2006 Hans de Goede  5.6.3-1
 - Initial Fedora Extras package



From fedora-extras-commits at redhat.com  Fri Nov 24 07:43:58 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Fri, 24 Nov 2006 02:43:58 -0500
Subject: rpms/python-nose/devel .cvsignore, 1.3, 1.4 python-nose.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <200611240743.kAO7hw2i030242@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30223

Modified Files:
	.cvsignore python-nose.spec sources 
Log Message:
0.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Sep 2006 07:03:54 -0000	1.3
+++ .cvsignore	24 Nov 2006 07:43:28 -0000	1.4
@@ -1 +1 @@
-nose-0.9.0.tar.gz
+nose-0.9.1.tar.gz


Index: python-nose.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/python-nose.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nose.spec	8 Sep 2006 07:03:54 -0000	1.2
+++ python-nose.spec	24 Nov 2006 07:43:28 -0000	1.3
@@ -3,7 +3,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-nose
-Version:        0.9.0
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        A discovery-based unittest extension for Python
 
@@ -14,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools >= 0.6a9
+BuildRequires:  python-devel python-setuptools
 
 %description
 nose: a discovery-based unittest extension.
@@ -44,6 +44,9 @@
 %{python_sitelib}/nose
 
 %changelog
+* Fri Nov 24 2006 Luke Macken  0.9.1-1
+- 0.9.1
+
 * Fri Sep  8 2006 Luke Macken  0.9.0-1
 - 0.9.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 07:03:54 -0000	1.3
+++ sources	24 Nov 2006 07:43:28 -0000	1.4
@@ -1 +1 @@
-1901f18ae082a711773d6f77cc312db2  nose-0.9.0.tar.gz
+97771e186ff3680e1abe5566a939966c  nose-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 07:48:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Fri, 24 Nov 2006 02:48:06 -0500
Subject: rpms/python-simplejson/devel .cvsignore, 1.2,
	1.3 python-simplejson.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611240748.kAO7m6Bq030338@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-simplejson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30319

Modified Files:
	.cvsignore python-simplejson.spec sources 
Log Message:
1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simplejson/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2006 19:47:10 -0000	1.2
+++ .cvsignore	24 Nov 2006 07:47:36 -0000	1.3
@@ -1 +1 @@
-simplejson-1.3.tar.gz
+simplejson-1.4.tar.gz


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simplejson/devel/python-simplejson.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-simplejson.spec	4 Sep 2006 00:52:09 -0000	1.2
+++ python-simplejson.spec	24 Nov 2006 07:47:36 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-simplejson
-Version:        1.3
-Release:        4%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Luke Macken  - 1.4-1
+- 1.4
+
 * Sun Sep  3 2006 Luke Macken  - 1.3-4
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simplejson/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2006 19:47:10 -0000	1.2
+++ sources	24 Nov 2006 07:47:36 -0000	1.3
@@ -1 +1 @@
-fbe039b9b863572651a0f665acea34c9  simplejson-1.3.tar.gz
+5fbad786a4b151d44a9b1e1e157e5510  simplejson-1.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 09:56:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 04:56:45 -0500
Subject: rpms/liquidwar/devel liquidwar.spec,1.2,1.3
Message-ID: <200611240956.kAO9ujqg005025@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5010

Modified Files:
	liquidwar.spec 
Log Message:
* Thu Nov 23 2006 Wart  5.6.3-2
- Added init.d startup and logrotate scripts for the game server
- Put the game server in its own subpackage



Index: liquidwar.spec
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/liquidwar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- liquidwar.spec	24 Nov 2006 06:52:00 -0000	1.2
+++ liquidwar.spec	24 Nov 2006 09:56:15 -0000	1.3
@@ -13,11 +13,6 @@
 BuildRequires:  allegro-devel allegro-tools tetex-latex python texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Requires(post): /sbin/chkconfig
-Requires(post): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
 
 %description
 Liquid War is a unique multiplayer wargame. You control an army of liquid
@@ -35,10 +30,16 @@
 This package contains the documentation of LiquidWar in html, pdf, ps and txt
 format.
 
+
 %package server
 Summary:        Network game server for the LiquidWar game
 Group:          Amusements/Games
 Requires:       %{name} = %{version}-%{release}
+Requires(pre):  /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig /sbin/service
+Requires(postun): /sbin/service
+
 %description server
 This package contains the server for hosting network LiquidWar games.
 
@@ -98,6 +99,7 @@
 install -p -D -m 644 %{SOURCE3} \
         $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -120,10 +122,11 @@
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %pre server
 user_uid=`id -u %{name} 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
+    /usr/sbin/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
             -c 'LiquidWar Server' \
             %{name} >/dev/null || :
 fi
@@ -169,7 +172,8 @@
 
 %changelog
 * Thu Nov 23 2006 Wart  5.6.3-2
-- Added init.d startup script for the game server
+- Added init.d startup and logrotate scripts for the game server
+- Put the game server in its own subpackage
 
 * Sun Nov 19 2006 Hans de Goede  5.6.3-1
 - Initial Fedora Extras package



From fedora-extras-commits at redhat.com  Fri Nov 24 10:16:53 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 24 Nov 2006 05:16:53 -0500
Subject: rpms/ppracer/FC-5 tree.png,NONE,1.1 ppracer.spec,1.15,1.16
Message-ID: <200611241016.kAOAGrqh008183@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8158

Modified Files:
	ppracer.spec 
Added Files:
	tree.png 
Log Message:
install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede)
add dist tag



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/FC-5/ppracer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ppracer.spec	17 Feb 2006 15:13:51 -0000	1.15
+++ ppracer.spec	24 Nov 2006 10:16:23 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 6
+Release: 8%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,9 @@
 Source1: ppracer.png
 Source2: ppracer.desktop
 
+# temporary workaround for libGLU deficiencies
+Source3: tree.png
+
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
 Patch2: ppracer-0.3.1-c++.patch
@@ -57,6 +60,12 @@
 %patch1 -p1 -b .lib64
 %patch2 -p1 -b .c++
 
+# temporary workaround for libGLU deficiencies
+if [ ! -f data/courses/themes/models/common/tree.png.brokenlibGLU ]; then
+    mv data/courses/themes/models/common/tree.png data/courses/themes/models/common/tree.png.brokenlibGLU
+    cp %{SOURCE3} data/courses/themes/models/common/tree.png
+fi
+
 %build
 autoconf
 %configure --with-data-dir=%{_datadir}/ppracer
@@ -85,6 +94,14 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* 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)
+- add dist tag
+
+* Mon Aug 28 2006 Nils Philippsen  0.3.1-7
+- FC6 mass rebuild
+
 * Fri Feb 17 2006 Nils Philippsen 
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Nov 24 11:04:16 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 24 Nov 2006 06:04:16 -0500
Subject: rpms/synaptic/FC-6 synaptic.spec,1.20,1.21
Message-ID: <200611241104.kAOB4G9Y011473@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/synaptic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445/FC-6

Modified Files:
	synaptic.spec 
Log Message:
Rebuild for new apt.


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/FC-6/synaptic.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- synaptic.spec	30 Aug 2006 00:27:40 -0000	1.20
+++ synaptic.spec	24 Nov 2006 11:03:46 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 5.1%{?dist}
+Release: 5.2%{?dist}
 
 License: GPL
 Group: Applications/System



From fedora-extras-commits at redhat.com  Fri Nov 24 11:04:16 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 24 Nov 2006 06:04:16 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.20,1.21
Message-ID: <200611241104.kAOB4GGL011476@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/synaptic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445/devel

Modified Files:
	synaptic.spec 
Log Message:
Rebuild for new apt.


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- synaptic.spec	30 Aug 2006 00:27:40 -0000	1.20
+++ synaptic.spec	24 Nov 2006 11:03:46 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 5.1%{?dist}
+Release: 5.2%{?dist}
 
 License: GPL
 Group: Applications/System



From fedora-extras-commits at redhat.com  Fri Nov 24 15:09:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 24 Nov 2006 10:09:38 -0500
Subject: rpms/jd/devel .cvsignore, 1.22, 1.23 jd.spec, 1.29, 1.30 sources,
	1.22, 1.23
Message-ID: <200611241509.kAOF9ccm027635@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27523

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Nov 24 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061124
- cvs 061124 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Nov 2006 15:10:54 -0000	1.22
+++ .cvsignore	24 Nov 2006 15:09:08 -0000	1.23
@@ -1 +1 @@
-jd-1.8.1-cvs061123.tgz
+jd-1.8.1-cvs061124.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jd.spec	23 Nov 2006 15:10:54 -0000	1.29
+++ jd.spec	24 Nov 2006 15:09:08 -0000	1.30
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061123
+%define         strtag        cvs061124
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Nov 23 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061123
-- cvs 061123 (23:59 JST)
+* Fri Nov 24 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061124
+- cvs 061124 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Nov 2006 15:10:54 -0000	1.22
+++ sources	24 Nov 2006 15:09:08 -0000	1.23
@@ -1 +1 @@
-8fedda8b763698253b919393eff9fef4  jd-1.8.1-cvs061123.tgz
+74ebe9ef9e826e2134fe7bcdf43b0797  jd-1.8.1-cvs061124.tgz



From fedora-extras-commits at redhat.com  Fri Nov 24 15:13:26 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 24 Nov 2006 10:13:26 -0500
Subject: rpms/python-telepathy/devel .cvsignore, 1.3,
	1.4 python-telepathy.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611241513.kAOFDQwq027996@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27974

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Fri Nov 24 2006 Brian Pepple  - 0.13.7-1
- Update to 0.13.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 15:54:32 -0000	1.3
+++ .cvsignore	24 Nov 2006 15:12:56 -0000	1.4
@@ -1 +1 @@
-telepathy-python-0.13.3.tar.gz
+telepathy-python-0.13.7.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-telepathy.spec	10 Oct 2006 15:54:32 -0000	1.4
+++ python-telepathy.spec	24 Nov 2006 15:12:56 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.13.3
+Version:        0.13.7
 Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Brian Pepple  - 0.13.7-1
+- Update to 0.13.7.
+
 * Tue Oct 10 2006 Brian Pepple  - 0.13.3-1
 - Update to 0.13.3.
 - Drop connection-manager patch, fixed upstream.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Oct 2006 15:54:32 -0000	1.3
+++ sources	24 Nov 2006 15:12:56 -0000	1.4
@@ -1 +1 @@
-1ca0c6670d0feb827b45ecbfe46f1e8d  telepathy-python-0.13.3.tar.gz
+2c565587e49e36a1c0cfb519d8888b53  telepathy-python-0.13.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 16:00:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 11:00:58 -0500
Subject: rpms/magicor/devel magicor.desktop, 1.1, 1.2 magicor.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611241600.kAOG0wXN028290@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28269

Modified Files:
	magicor.desktop magicor.spec sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: magicor.desktop
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/magicor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.desktop	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.desktop	24 Nov 2006 16:00:28 -0000	1.2
@@ -7,4 +7,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;LogicGame;
+Categories=Game;LogicGame;


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/magicor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magicor.spec	2 Nov 2006 19:50:36 -0000	1.2
+++ magicor.spec	24 Nov 2006 16:00:28 -0000	1.3
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define pre_version rc1
+%define pre_version rc2
 
 Name:           magicor
 Version:        1.0
-Release:        0.1.%{pre_version}%{?dist}
+Release:        0.2.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz
 Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
@@ -27,13 +27,11 @@
 
 %prep
 %setup -q -b 1 -n %{name}-%{version}-%{pre_version}
-sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
-sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
-  scripts/Magicor-LevelEditor.py
-sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf
+sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
+sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
 
-# %build
+%build
 # nothing to build, python code + data only
 
 
@@ -44,10 +42,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
-install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
+install -m 644 etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 755 Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
+install -m 755 Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
 cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -55,7 +52,6 @@
 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/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -81,8 +77,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc LICENSE README
+%config(noreplace) %{_sysconfdir}/%{name}*.conf
 %{_bindir}/%{name}*
 %{python_sitelib}/%{name}
 %{_datadir}/%{name}
@@ -91,6 +87,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
+- New upstream release 1.0-rc2
+
 * Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
 - New upstream release 1.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 19:50:36 -0000	1.3
+++ sources	24 Nov 2006 16:00:28 -0000	1.4
@@ -1,2 +1,2 @@
-ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
-9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 16:01:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 11:01:55 -0500
Subject: rpms/magicor/devel .cvsignore,1.3,1.4 sources,1.4,1.5
Message-ID: <200611241601.kAOG1tdF031370@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31342

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 19:50:36 -0000	1.3
+++ .cvsignore	24 Nov 2006 16:01:25 -0000	1.4
@@ -1,2 +0,0 @@
-magicor-1.0-rc1.tar.gz
-magicor-data-1.0-rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Nov 2006 16:00:28 -0000	1.4
+++ sources	24 Nov 2006 16:01:25 -0000	1.5
@@ -1,2 +0,0 @@
-bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
-8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 16:03:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 11:03:05 -0500
Subject: rpms/magicor/devel .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200611241603.kAOG35us031452@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31433

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Nov 2006 16:01:25 -0000	1.4
+++ .cvsignore	24 Nov 2006 16:02:35 -0000	1.5
@@ -0,0 +1,2 @@
+magicor-data-1.0-rc2.tar.gz
+magicor-source-1.0-rc2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Nov 2006 16:01:25 -0000	1.5
+++ sources	24 Nov 2006 16:02:35 -0000	1.6
@@ -0,0 +1,2 @@
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 16:32:21 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 24 Nov 2006 11:32:21 -0500
Subject: rpms/python-telepathy/devel python-telepathy.spec,1.5,1.6
Message-ID: <200611241632.kAOGWL6c031587@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31570

Modified Files:
	python-telepathy.spec 
Log Message:
* Fri Nov 24 2006 Brian Pepple  - 0.13.7-2
- Add BR & Requires on dbus-python.



Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-telepathy.spec	24 Nov 2006 15:12:56 -0000	1.5
+++ python-telepathy.spec	24 Nov 2006 16:31:51 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-telepathy
 Version:        0.13.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
@@ -13,6 +13,9 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+BuildRequires:	dbus-python
+
+Requires:	dbus-python
 
 
 %description
@@ -43,6 +46,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Brian Pepple  - 0.13.7-2
+- Add BR & Requires on dbus-python.
+
 * Fri Nov 24 2006 Brian Pepple  - 0.13.7-1
 - Update to 0.13.7.
 



From fedora-extras-commits at redhat.com  Fri Nov 24 18:37:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:37:36 -0500
Subject: rpms/sdparm - New directory
Message-ID: <200611241837.kAOIbapt005803@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5798/sdparm

Log Message:
Directory /cvs/extras/rpms/sdparm added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 18:37:41 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:37:41 -0500
Subject: rpms/sdparm/devel - New directory
Message-ID: <200611241837.kAOIbfUU005817@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5798/sdparm/devel

Log Message:
Directory /cvs/extras/rpms/sdparm/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 18:37:59 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:37:59 -0500
Subject: rpms/sdparm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611241837.kAOIbxe1005862@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5841/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sdparm


--- 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  Fri Nov 24 18:37:59 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:37:59 -0500
Subject: rpms/sdparm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611241837.kAOIbxbm005847@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5841

Added Files:
	Makefile import.log 
Log Message:
Setup of module sdparm


--- NEW FILE Makefile ---
# Top level Makefile for module sdparm
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  Fri Nov 24 18:39:02 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:39:02 -0500
Subject: rpms/sdparm import.log,1.1,1.2
Message-ID: <200611241839.kAOId2n3005931@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5901

Modified Files:
	import.log 
Log Message:
auto-import sdparm-1.00-4 on branch devel from sdparm-1.00-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sdparm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Nov 2006 18:37:59 -0000	1.1
+++ import.log	24 Nov 2006 18:38:32 -0000	1.2
@@ -0,0 +1 @@
+sdparm-1_00-4:HEAD:sdparm-1.00-4.src.rpm:1164393565



From fedora-extras-commits at redhat.com  Fri Nov 24 18:39:03 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:39:03 -0500
Subject: rpms/sdparm/devel sdparm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611241839.kAOId3AG005935@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5901/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sdparm.spec 
Log Message:
auto-import sdparm-1.00-4 on branch devel from sdparm-1.00-4.src.rpm


--- NEW FILE sdparm.spec ---
Summary: List or change SCSI/SATA disk parameters
Name: sdparm
Version: 1.00
Release: 4%{?dist}
License: BSD
Group: Applications/System
URL: http://www.torque.net/sg/sdparm.html
Source0: http://www.torque.net/sg/p/%{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description 
SCSI disk parameters are held in mode pages. This utility lists or
changes those parameters. Other SCSI devices (or devices that use the
SCSI command set e.g. some SATA devices) such as CD/DVD and tape
drives may also find parts of sdparm useful. Requires the linux kernel
2.4 series or later. In the 2.6 series any device node the understands
a SCSI command set may be used (e.g. /dev/sda). In the 2.4 series SCSI
device node may be used.

Fetches Vital Product Data pages. Can send commands to start or stop
the media and load or unload removable media.

Warning: It is possible (but unlikely) to change SCSI disk settings
such that the disk stops operating or is slowed down. Use with care.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README CREDITS AUTHORS COPYING notes.txt
%{_bindir}/%{name}
%{_mandir}/man8/%{name}*

%changelog
* Mon Nov 20 2006 Terje Rosten  - 1.00-4
- Fix changelog
- Don't install INSTALL

* Mon Nov 20 2006 Terje Rosten  - 1.00-3
- Maybe we should build in %%build :-)
- Remove check in %%clean/%%install

* Mon Nov 20 2006 Terje Rosten  - 1.00-2
- fix license, buildroot and group
- remove hardcoded packager tag
- use %%configure macro
- dist tag
- make install on single line
- fix files section
- remove strange use of macros (name, version and release)
- untabify

* Mon Oct 16 2006 Douglas Gilbert  - 1.00
- update Background control mode subpage, vendor specific mode pages
- sdparm-1.00

* Sat Jul 08 2006 Douglas Gilbert  - 0.99
- add old power condition page for disks
- sdparm-0.99

* Thu May 18 2006 Douglas Gilbert  - 0.98
- add medium configuration mode page
- sdparm-0.98

* Wed Jan 25 2006 Douglas Gilbert  - 0.97 
- add SAT pATA control and medium partition mode (sub)pages
- sdparm-0.97

* Fri Nov 18 2005 Douglas Gilbert  - 0.96
- add capacity, ready and sync commands
- sdparm-0.96

* Tue Sep 20 2005 Douglas Gilbert  - 0.95
- add debian build directory, decode more VPD pages
- sdparm-0.95

* Thu Jul 28 2005 Douglas Gilbert  - 0.94
- add '--command=' option
- sdparm-0.94

* Thu Jun 02 2005 Douglas Gilbert  - 0.93
- add '--transport=' and '--dbd' options
- sdparm-0.93

* Fri May 20 2005 Douglas Gilbert  - 0.92
- add some tape, cd/dvd, disk, ses and rbc mode pages
- sdparm-0.92

* Fri May 06 2005 Douglas Gilbert  - 0.91
- if lk 2.4 detected, map non-sg SCSI device node to sg equivalent
- sdparm-0.91

* Mon Apr 18 2005 Douglas Gilbert  - 0.90
- initial version
- sdparm-0.90


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sdparm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Nov 2006 18:37:59 -0000	1.1
+++ .cvsignore	24 Nov 2006 18:38:33 -0000	1.2
@@ -0,0 +1 @@
+sdparm-1.00.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sdparm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Nov 2006 18:37:59 -0000	1.1
+++ sources	24 Nov 2006 18:38:33 -0000	1.2
@@ -0,0 +1 @@
+1d46f85ed07e697f64fc40ddad31ddb5  sdparm-1.00.tgz



From fedora-extras-commits at redhat.com  Fri Nov 24 18:44:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:44:36 -0500
Subject: owners owners.list,1.2003,1.2004
Message-ID: <200611241844.kAOIiaWq006014@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5994

Modified Files:
	owners.list 
Log Message:
New package: sdparm.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2003
retrieving revision 1.2004
diff -u -r1.2003 -r1.2004
--- owners.list	23 Nov 2006 23:45:54 -0000	1.2003
+++ owners.list	24 Nov 2006 18:44:06 -0000	1.2004
@@ -2156,6 +2156,7 @@
 Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_pango|Rendering of internationalized text for SDL|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|sdparm|List or change SCSI/SATA disk parameters|terjeros at phys.ntnu.no|extras-qa at fedoraproject.org|
 Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|seamonkey|Web browser, e-mail, news, IRC client, HTML editor|kengert at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sec|Simple Event Correlator|lists at forevermore.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 24 18:58:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:58:42 -0500
Subject: rpms/gq - New directory
Message-ID: <200611241858.kAOIwgwx006133@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129/gq

Log Message:
Directory /cvs/extras/rpms/gq added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 18:58:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:58:47 -0500
Subject: rpms/gq/devel - New directory
Message-ID: <200611241858.kAOIwl5b006146@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129/gq/devel

Log Message:
Directory /cvs/extras/rpms/gq/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 18:59:04 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:59:04 -0500
Subject: rpms/gq Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611241859.kAOIx49a006176@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6170

Added Files:
	Makefile import.log 
Log Message:
Setup of module gq


--- NEW FILE Makefile ---
# Top level Makefile for module gq
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  Fri Nov 24 18:59:10 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:59:10 -0500
Subject: rpms/gq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611241859.kAOIxAjU006191@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6170/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gq


--- 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  Fri Nov 24 19:00:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:00:23 -0500
Subject: rpms/gq/devel gq-1.2.1-desktop.patch, NONE, 1.1 gq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611241900.kAOJ0Ne3006286@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6243/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gq-1.2.1-desktop.patch gq.spec 
Log Message:
auto-import gq-1.2.2-2 on branch devel from gq-1.2.2-2.src.rpm

gq-1.2.1-desktop.patch:

--- NEW FILE gq-1.2.1-desktop.patch ---
--- gq-1.2.1.old/data/gq.desktop.in	2006-10-04 16:50:43.000000000 +0200
+++ gq-1.2.1/data/gq.desktop.in	2006-11-19 20:24:08.000000000 +0100
@@ -8,6 +8,6 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=gq
-Categories=Application;Network;GNOME;GTK;LDAP;
+Icon=redhat-system_tools
+Categories=Application;Network;System;GTK;LDAP;
 #MimeType=text/x-ldif


--- NEW FILE gq.spec ---
%define langver 1.2.1

Summary: Graphical LDAP directory browser and editor
Name: gq
Version: 1.2.2
Release: 2%{?dist}
License: GPL
Group: Applications/Internet
URL: http://www.gq-project.org/
Source0: http://dl.sf.net/sourceforge/gqclient/%{name}-%{version}.tar.gz
Source1: http://dl.sf.net/sourceforge/gqclient/%{name}-%{langver}-langpack-1.tar.gz
Patch0: gq-1.2.1-desktop.patch
BuildRequires: libgcrypt-devel libglade2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext gnome-keyring-devel
BuildRequires: openldap-devel openssl-devel
BuildRequires: perl(XML::Parser)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GQ is a graphical browser for LDAP directories and schemas.  Using GQ,
an administrator can search through a directory and modify objects
stored in that directory.

%prep
%setup -q
%patch -p1
%setup -q -T -D -a 1

%build

# Set up langpack
%{name}-%{langver}-langpack-1/langpack .
cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/

%configure --with-included-gettext --disable-update-mimedb
# --enable-cache --enable-browser-dnd

make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

desktop-file-install --vendor fedora --delete-original      \
        --dir %{buildroot}%{_datadir}/applications          \
        %{buildroot}%{_datadir}/applications/%{name}.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
update-mime-database %{_datadir}/mime &> /dev/null || :

%files -f %{name}.lang
%defattr(-, root, root,-)

%doc AUTHORS ChangeLog COPYING NEWS README* TODO
%{_bindir}/%{name}
%{_datadir}/%{name}/%{name}.glade
%{_datadir}/pixmaps/%{name}/*.xpm
%{_datadir}/pixmaps/%{name}/*.png
%{_datadir}/mime/packages/%{name}-ldif.xml
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/pixmaps/%{name}
%dir %{_datadir}/%{name}

%changelog
* Mon Nov 20 2006 Terje R??sten  - 1.2.2-2
- Fix patch/source naming
- Add gettext to BuildReq
- Move %%post/%%postun
- Remove cp macro
- Add libgcrypt-devel to BuildReq

* Sun Nov 19 2006 Terje R??sten  - 1.2.2-1
- 1.2.2

* Sun Nov 19 2006 Terje R??sten  - 1.2.1-3
- Fix defattr
- Remove X-Fedora as category in desktop file
- libglade2-devel pulls in gtk2-devel and libxml2-devel in BuildReq
- Use perl modules, not perl package name in BuildReq
- Remove ldconfig from %%post
- Fix install of translations
- Remove some macros (rm, make and install)
- Fix mime: script and remove shared-mime-info from BuildReq
- Patch, not replace desktop file
- Switch icon to redhat-system_tools

* Sun Nov 12 2006 Terje R??sten  - 1.2.1-2
- Don't use %%makeinstall
- Some more buildreq: gnome-keyring-devel, libglade2-devel
- Add --disable-update-mimedb to configure

* Sat Oct 15 2006 Terje R??sten  - 1.2.1-1
- 1.2.1
- Add perl-XML-Parser to buildreq
- Translations broken, skip
- Fix mime stuff (stolen from planner.spec)

* Fri Sep 06 2006 Terje R??sten  - 1.2.0-1
- 1.2.0

* Sat Aug 06 2006 Terje R??sten  - 1.0.1-1
- 1.0.1

* Tue May 02 2006 Terje R??sten  - 1.0.0-4
- Fix source urls

* Tue May 02 2006 Terje R??sten  - 1.0.0-3
- More desktop file work

* Mon May 01 2006 Terje R??sten  - 1.0.0-2
- Proper desktop file handling
- Drop krb5-devel in buildrequires
- Add langpack

* Fri Apr 28 2006 Terje R??sten  - 1.0.0-1
- 1.0.0

* Mon Apr 10 2006 Terje R??sten  - 1.0-0.5.rc1
- 1.0-rc1

* Thu Apr 06 2006 Terje R??sten  - 1.0-0.4.beta2
- 1.0-beta2
- Remove patches now upstream
- Add libxml2-devel to build requires
- Include pix

* Mon Jun 20 2005 Terje R??sten  - 1.0-0.3.beta1
- Fix some rpmlint warnings

* Thu Jun 16 2005 Terje R??sten  - 1.0-beta1.0.2
- Build on fc4
- Add gcc4 patch
   

* Wed Mar 29 2005 Terje R??sten  - 1.0-beta1.0.1
- OpenLDAP 2.2 patch 
  
- build with: setarch i686 rpmbuild -ba --target=x86-64 ...

* Wed Jun 09 2004 Dag Wieers  - 0.6.0-4
- Merged SPEC file with my version
- Changes to build on older releases
- Added improved desktop file

* Wed May 19 2004 Matthias Saou  1.0-0.beta1.1
- Update to 1.0beta1.
- Rebuild for Fedora Core 2

* Thu Nov 13 2003 Matthias Saou  0.6.0-3
- Rebuild for Fedora Core 1

* Mon Mar 31 2003 Matthias Saou 
- Rebuilt for Red Hat Linux 9
- Added new desktop entry
- Added find_lang usage

* Wed Jan 29 2003 Matthias Saou 
- Update to 0.6.0

* Tue May 21 2002 Matthias Saou 
- Update to 0.5.0

* Fri Feb 22 2002 Nalin Dahyabhai  0.4.0-5
- rebuild

* Wed Jan 09 2002 Tim Powers 
- automated rebuild

* Tue Jun 19 2001 Nalin Dahyabhai 
- rebuild in new environment

* Fri Mar  2 2001 Nalin Dahyabhai 
- rebuild in new environment

* Tue Feb 20 2001 Nalin Dahyabhai 
- update to 0.4.0, fixes bugs #24160, #24161

* Wed Dec 27 2000 Nalin Dahyabhai 
- update to 0.3.1

* Fri Dec  1 2000 Nalin Dahyabhai 
- rebuild in new environment

* Fri Nov 10 2000 Nalin Dahyabhai 
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Nov 2006 18:59:10 -0000	1.1
+++ .cvsignore	24 Nov 2006 18:59:53 -0000	1.2
@@ -0,0 +1,2 @@
+gq-1.2.1-langpack-1.tar.gz
+gq-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Nov 2006 18:59:10 -0000	1.1
+++ sources	24 Nov 2006 18:59:53 -0000	1.2
@@ -0,0 +1,2 @@
+9429d161c91e12d000c8b0c2f6e21d63  gq-1.2.1-langpack-1.tar.gz
+107d8a971c14b52b2bedbf3944840bea  gq-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 19:00:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:00:23 -0500
Subject: rpms/gq import.log,1.1,1.2
Message-ID: <200611241900.kAOJ0NBb006282@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6243

Modified Files:
	import.log 
Log Message:
auto-import gq-1.2.2-2 on branch devel from gq-1.2.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gq/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Nov 2006 18:59:04 -0000	1.1
+++ import.log	24 Nov 2006 18:59:53 -0000	1.2
@@ -0,0 +1 @@
+gq-1_2_2-2:HEAD:gq-1.2.2-2.src.rpm:1164394846



From fedora-extras-commits at redhat.com  Fri Nov 24 19:03:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:03:52 -0500
Subject: owners owners.list,1.2004,1.2005
Message-ID: <200611241903.kAOJ3qSB009341@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9326

Modified Files:
	owners.list 
Log Message:
New package: gq.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2004
retrieving revision 1.2005
diff -u -r1.2004 -r1.2005
--- owners.list	24 Nov 2006 18:44:06 -0000	1.2004
+++ owners.list	24 Nov 2006 19:03:22 -0000	1.2005
@@ -622,6 +622,7 @@
 Fedora Extras|gpsd|Service daemon for mediating access to a GPS|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
+Fedora Extras|gq|Graphical LDAP directory browser and editor|terjeros at phys.ntnu.no|extras-qa at fedoraproject.org|
 Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|grace|Numerical Data Processing and Visualization Tool|jamatos at fc.up.pt|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 24 19:12:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:12:30 -0500
Subject: rpms/libast - New directory
Message-ID: <200611241912.kAOJCUC9009469@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9465/libast

Log Message:
Directory /cvs/extras/rpms/libast added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 19:12:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:12:36 -0500
Subject: rpms/libast/devel - New directory
Message-ID: <200611241912.kAOJCaUr009483@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9465/libast/devel

Log Message:
Directory /cvs/extras/rpms/libast/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 19:12:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:12:54 -0500
Subject: rpms/libast Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611241912.kAOJCsSh009512@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9506

Added Files:
	Makefile import.log 
Log Message:
Setup of module libast


--- NEW FILE Makefile ---
# Top level Makefile for module libast
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  Fri Nov 24 19:12:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:12:54 -0500
Subject: rpms/libast/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611241912.kAOJCsdd009527@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9506/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libast


--- 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  Fri Nov 24 19:13:53 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:13:53 -0500
Subject: rpms/libast import.log,1.1,1.2
Message-ID: <200611241913.kAOJDr25009601@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9566

Modified Files:
	import.log 
Log Message:
auto-import libast-0.7.1-0.1.20060818cvs on branch devel from libast-0.7.1-0.1.20060818cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libast/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Nov 2006 19:12:54 -0000	1.1
+++ import.log	24 Nov 2006 19:13:23 -0000	1.2
@@ -0,0 +1 @@
+libast-0_7_1-0_1_20060818cvs:HEAD:libast-0.7.1-0.1.20060818cvs.src.rpm:1164395657



From fedora-extras-commits at redhat.com  Fri Nov 24 19:13:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:13:54 -0500
Subject: rpms/libast/devel libast.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611241913.kAOJDsVu009605@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9566/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libast.spec 
Log Message:
auto-import libast-0.7.1-0.1.20060818cvs on branch devel from libast-0.7.1-0.1.20060818cvs.src.rpm


--- NEW FILE libast.spec ---
Summary: Library of Assorted Spiffy Things
Name: libast
Version: 0.7.1
Release: 0.1.20060818cvs%{?dist}
Group: System Environment/Libraries
License: BSD
URL: http://www.eterm.org/
Source: http://www.eterm.org/download/%{name}-%{version}.tar.gz
BuildRequires: imlib2-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
LibAST is the Library of Assorted Spiffy Things.  It contains various
handy routines and drop-in substitutes for some good-but-non-portable
functions.  It currently has a built-in memory tracking subsystem as
well as some debugging aids and other similar tools.

It's not documented yet, mostly because it's not finished.  Hence the
version number that begins with 0.

%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

%build
%configure
%{__make} %{?_smp_mflags}

%install
rm -rf "$RPM_BUILD_ROOT"
%makeinstall

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%clean
rm -rf "$RPM_BUILD_ROOT"

%files
%defattr(-, root, root, 0755)
%doc ChangeLog DESIGN README LICENSE
%{_libdir}/libast.so.*

%files devel
%defattr(-, root, root, 0755)
%dir %{_includedir}/libast
%{_bindir}/libast-config
%{_libdir}/libast.so
%{_includedir}/libast.h
%{_includedir}/libast/*.h
%{_datadir}/aclocal/libast.m4
%exclude %{_libdir}/*.la
%exclude %{_libdir}/*.a

%changelog
* Sat Sep  2 2006 Terje R??sten  - 0.7.1-0.1.20060818cvs
- 0.7.1 (from CVS)
- LICENCE now included in upstrean package

* Sun Feb 26 2006 Terje R??sten  - 0.7-3
- Add LICENSE

* Tue Feb 21 2006 Terje R??sten  - 0.7-2
- Fix buildroot var
- Clean buildroot before install
- Remove static libs
- Add imlib2 to buildrequires

* Sun Feb 19 2006 Terje R??sten  - 0.7-1
- Initial packaging based on upstream spec file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libast/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Nov 2006 19:12:54 -0000	1.1
+++ .cvsignore	24 Nov 2006 19:13:24 -0000	1.2
@@ -0,0 +1 @@
+libast-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libast/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Nov 2006 19:12:54 -0000	1.1
+++ sources	24 Nov 2006 19:13:24 -0000	1.2
@@ -0,0 +1 @@
+f005abce4638da890e1757e8e0d97bcf  libast-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 19:17:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:17:26 -0500
Subject: owners owners.list,1.2005,1.2006
Message-ID: <200611241917.kAOJHQ3X009666@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9649

Modified Files:
	owners.list 
Log Message:
New package: libast.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2005
retrieving revision 1.2006
diff -u -r1.2005 -r1.2006
--- owners.list	24 Nov 2006 19:03:22 -0000	1.2005
+++ owners.list	24 Nov 2006 19:16:56 -0000	1.2006
@@ -881,6 +881,7 @@
 Fedora Extras|libassa|C++ network-oriented application framework|3rdshift at comcast.net|extras-qa at fedoraproject.org|
 Fedora Extras|libassetml|XML resource database library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|libast|Library of Assorted Spiffy Things|terjeros at phys.ntnu.no|extras-qa at fedoraproject.org|
 Fedora Extras|libatomic_ops|Atomic memory update operations|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|libbinio|A binary stream interface class library for C++|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libburn|Library for reading, mastering and writing optical discs|jkeating at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 24 19:21:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 14:21:17 -0500
Subject: rpms/magicor/FC-6 .cvsignore, 1.3, 1.4 magicor.desktop, 1.1,
	1.2 magicor.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611241921.kAOJLHFA009742@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9721

Modified Files:
	.cvsignore magicor.desktop magicor.spec sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 19:51:48 -0000	1.3
+++ .cvsignore	24 Nov 2006 19:20:47 -0000	1.4
@@ -1,2 +1,2 @@
-magicor-1.0-rc1.tar.gz
-magicor-data-1.0-rc1.tar.gz
+magicor-data-1.0-rc2.tar.gz
+magicor-source-1.0-rc2.tar.gz


Index: magicor.desktop
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/magicor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.desktop	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.desktop	24 Nov 2006 19:20:47 -0000	1.2
@@ -7,4 +7,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;LogicGame;
+Categories=Game;LogicGame;


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/magicor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magicor.spec	2 Nov 2006 19:51:48 -0000	1.2
+++ magicor.spec	24 Nov 2006 19:20:47 -0000	1.3
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define pre_version rc1
+%define pre_version rc2
 
 Name:           magicor
 Version:        1.0
-Release:        0.1.%{pre_version}%{?dist}
+Release:        0.2.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz
 Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
@@ -27,13 +27,11 @@
 
 %prep
 %setup -q -b 1 -n %{name}-%{version}-%{pre_version}
-sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
-sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
-  scripts/Magicor-LevelEditor.py
-sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf
+sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
+sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
 
-# %build
+%build
 # nothing to build, python code + data only
 
 
@@ -44,10 +42,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
-install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
+install -m 644 etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 755 Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
+install -m 755 Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
 cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -55,7 +52,6 @@
 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/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -81,8 +77,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc LICENSE README
+%config(noreplace) %{_sysconfdir}/%{name}*.conf
 %{_bindir}/%{name}*
 %{python_sitelib}/%{name}
 %{_datadir}/%{name}
@@ -91,6 +87,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
+- New upstream release 1.0-rc2
+
 * Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
 - New upstream release 1.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 19:51:48 -0000	1.3
+++ sources	24 Nov 2006 19:20:47 -0000	1.4
@@ -1,2 +1,2 @@
-ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
-9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 19:22:19 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 14:22:19 -0500
Subject: rpms/magicor/FC-5 .cvsignore, 1.3, 1.4 magicor.desktop, 1.1,
	1.2 magicor.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611241922.kAOJMJVT009807@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9786

Modified Files:
	.cvsignore magicor.desktop magicor.spec sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 19:52:41 -0000	1.3
+++ .cvsignore	24 Nov 2006 19:21:49 -0000	1.4
@@ -1,2 +1,2 @@
-magicor-1.0-rc1.tar.gz
-magicor-data-1.0-rc1.tar.gz
+magicor-data-1.0-rc2.tar.gz
+magicor-source-1.0-rc2.tar.gz


Index: magicor.desktop
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/magicor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.desktop	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.desktop	24 Nov 2006 19:21:49 -0000	1.2
@@ -7,4 +7,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;LogicGame;
+Categories=Game;LogicGame;


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/magicor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magicor.spec	2 Nov 2006 19:52:41 -0000	1.2
+++ magicor.spec	24 Nov 2006 19:21:49 -0000	1.3
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define pre_version rc1
+%define pre_version rc2
 
 Name:           magicor
 Version:        1.0
-Release:        0.1.%{pre_version}%{?dist}
+Release:        0.2.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz
 Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
@@ -27,13 +27,11 @@
 
 %prep
 %setup -q -b 1 -n %{name}-%{version}-%{pre_version}
-sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
-sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
-  scripts/Magicor-LevelEditor.py
-sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf
+sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
+sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
 
-# %build
+%build
 # nothing to build, python code + data only
 
 
@@ -44,10 +42,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
-install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
+install -m 644 etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 755 Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
+install -m 755 Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
 cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -55,7 +52,6 @@
 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/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -81,8 +77,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc LICENSE README
+%config(noreplace) %{_sysconfdir}/%{name}*.conf
 %{_bindir}/%{name}*
 %{python_sitelib}/%{name}
 %{_datadir}/%{name}
@@ -91,6 +87,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
+- New upstream release 1.0-rc2
+
 * Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
 - New upstream release 1.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 19:52:41 -0000	1.3
+++ sources	24 Nov 2006 19:21:49 -0000	1.4
@@ -1,2 +1,2 @@
-ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
-9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 19:37:36 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 24 Nov 2006 14:37:36 -0500
Subject: rpms/php-idn/devel .cvsignore, 1.2, 1.3 php-idn.spec, 1.2,
	1.3 sources, 1.2, 1.3 php-idn-1.1-gcc41.patch, 1.1, NONE
Message-ID: <200611241937.kAOJbabE009990@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/php-idn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9971

Modified Files:
	.cvsignore php-idn.spec sources 
Removed Files:
	php-idn-1.1-gcc41.patch 
Log Message:
Upgrade to 1.2b (includes a minor fix for the 1.2 release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jun 2006 20:33:05 -0000	1.2
+++ .cvsignore	24 Nov 2006 19:37:06 -0000	1.3
@@ -1 +1 @@
-idn_1.1.tar.gz
+idn_1.2b.tar.gz


Index: php-idn.spec
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/php-idn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-idn.spec	3 Sep 2006 20:58:51 -0000	1.2
+++ php-idn.spec	24 Nov 2006 19:37:06 -0000	1.3
@@ -2,13 +2,12 @@
 
 Summary:	PHP API for GNU LibIDN
 Name:		php-idn
-Version:	1.1
-Release:	7%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/Languages
-Source0:	http://php-idn.bayour.com/idn_%{version}.tar.gz
+Source0:	http://php-idn.bayour.com/idn_%{version}b.tar.gz
 Source1:	idn.ini
-Patch0:		php-idn-1.1-gcc41.patch
 URL:		http://php-idn.bayour.com/
 BuildRequires:	php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake
 Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -20,8 +19,7 @@
 have international characters in the DNS system.
 
 %prep
-%setup -q -n idn-%{version}
-%patch0 -p1 -b .gcc41
+%setup -q -n idn-%{version}b
 export PHP_RPATH=no
 phpize
 %configure
@@ -44,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/idn.ini
 
 %changelog
+* Fri Nov 24 2006 Robert Scheck  1.2-1
+- Upgrade to 1.2b (includes a minor fix for the 1.2 release)
+
 * Sun Sep 03 2006 Robert Scheck  1.1-7
 - Rebuild for Fedora Core 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2006 20:33:05 -0000	1.2
+++ sources	24 Nov 2006 19:37:06 -0000	1.3
@@ -1 +1 @@
-5767e959d9a2ec22880f46eb344d6836  idn_1.1.tar.gz
+518ed0ee59c901987096599af58f4530  idn_1.2b.tar.gz


--- php-idn-1.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 24 19:38:50 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 24 Nov 2006 14:38:50 -0500
Subject: rpms/php-idn/FC-6 .cvsignore, 1.2, 1.3 php-idn.spec, 1.2,
	1.3 sources, 1.2, 1.3 php-idn-1.1-gcc41.patch, 1.1, NONE
Message-ID: <200611241938.kAOJco5l010023@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/php-idn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10001

Modified Files:
	.cvsignore php-idn.spec sources 
Removed Files:
	php-idn-1.1-gcc41.patch 
Log Message:
Upgrade to 1.2b (includes a minor fix for the 1.2 release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jun 2006 20:33:05 -0000	1.2
+++ .cvsignore	24 Nov 2006 19:38:20 -0000	1.3
@@ -1 +1 @@
-idn_1.1.tar.gz
+idn_1.2b.tar.gz


Index: php-idn.spec
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-6/php-idn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-idn.spec	3 Sep 2006 20:58:51 -0000	1.2
+++ php-idn.spec	24 Nov 2006 19:38:20 -0000	1.3
@@ -2,13 +2,12 @@
 
 Summary:	PHP API for GNU LibIDN
 Name:		php-idn
-Version:	1.1
-Release:	7%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/Languages
-Source0:	http://php-idn.bayour.com/idn_%{version}.tar.gz
+Source0:	http://php-idn.bayour.com/idn_%{version}b.tar.gz
 Source1:	idn.ini
-Patch0:		php-idn-1.1-gcc41.patch
 URL:		http://php-idn.bayour.com/
 BuildRequires:	php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake
 Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -20,8 +19,7 @@
 have international characters in the DNS system.
 
 %prep
-%setup -q -n idn-%{version}
-%patch0 -p1 -b .gcc41
+%setup -q -n idn-%{version}b
 export PHP_RPATH=no
 phpize
 %configure
@@ -44,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/idn.ini
 
 %changelog
+* Fri Nov 24 2006 Robert Scheck  1.2-1
+- Upgrade to 1.2b (includes a minor fix for the 1.2 release)
+
 * Sun Sep 03 2006 Robert Scheck  1.1-7
 - Rebuild for Fedora Core 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2006 20:33:05 -0000	1.2
+++ sources	24 Nov 2006 19:38:20 -0000	1.3
@@ -1 +1 @@
-5767e959d9a2ec22880f46eb344d6836  idn_1.1.tar.gz
+518ed0ee59c901987096599af58f4530  idn_1.2b.tar.gz


--- php-idn-1.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 24 19:40:11 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 24 Nov 2006 14:40:11 -0500
Subject: rpms/php-idn/FC-5 .cvsignore, 1.2, 1.3 php-idn.spec, 1.2,
	1.3 sources, 1.2, 1.3 php-idn-1.1-gcc41.patch, 1.1, NONE
Message-ID: <200611241940.kAOJeBaP010059@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/php-idn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10038

Modified Files:
	.cvsignore php-idn.spec sources 
Removed Files:
	php-idn-1.1-gcc41.patch 
Log Message:
Upgrade to 1.2b (includes a minor fix for the 1.2 release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jun 2006 20:33:05 -0000	1.2
+++ .cvsignore	24 Nov 2006 19:39:41 -0000	1.3
@@ -1 +1 @@
-idn_1.1.tar.gz
+idn_1.2b.tar.gz


Index: php-idn.spec
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-5/php-idn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-idn.spec	3 Sep 2006 20:59:34 -0000	1.2
+++ php-idn.spec	24 Nov 2006 19:39:41 -0000	1.3
@@ -2,13 +2,12 @@
 
 Summary:	PHP API for GNU LibIDN
 Name:		php-idn
-Version:	1.1
-Release:	7%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/Languages
-Source0:	http://php-idn.bayour.com/idn_%{version}.tar.gz
+Source0:	http://php-idn.bayour.com/idn_%{version}b.tar.gz
 Source1:	idn.ini
-Patch0:		php-idn-1.1-gcc41.patch
 URL:		http://php-idn.bayour.com/
 BuildRequires:	php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake
 Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -20,8 +19,7 @@
 have international characters in the DNS system.
 
 %prep
-%setup -q -n idn-%{version}
-%patch0 -p1 -b .gcc41
+%setup -q -n idn-%{version}b
 export PHP_RPATH=no
 phpize
 %configure
@@ -44,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/idn.ini
 
 %changelog
+* Fri Nov 24 2006 Robert Scheck  1.2-1
+- Upgrade to 1.2b (includes a minor fix for the 1.2 release)
+
 * Sun Sep 03 2006 Robert Scheck  1.1-7
 - Rebuild for Fedora Core 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2006 20:33:05 -0000	1.2
+++ sources	24 Nov 2006 19:39:41 -0000	1.3
@@ -1 +1 @@
-5767e959d9a2ec22880f46eb344d6836  idn_1.1.tar.gz
+518ed0ee59c901987096599af58f4530  idn_1.2b.tar.gz


--- php-idn-1.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 24 19:48:26 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:48:26 -0500
Subject: rpms/Django - New directory
Message-ID: <200611241948.kAOJmQJG010237@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10233/Django

Log Message:
Directory /cvs/extras/rpms/Django added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 19:48:31 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:48:31 -0500
Subject: rpms/Django/devel - New directory
Message-ID: <200611241948.kAOJmVpg010250@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10233/Django/devel

Log Message:
Directory /cvs/extras/rpms/Django/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 19:48:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:48:43 -0500
Subject: rpms/Django Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611241948.kAOJmh1Y010280@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10274

Added Files:
	Makefile import.log 
Log Message:
Setup of module Django


--- NEW FILE Makefile ---
# Top level Makefile for module Django
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  Fri Nov 24 19:48:48 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:48:48 -0500
Subject: rpms/Django/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611241948.kAOJmmJM010295@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10274/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Django


--- 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  Fri Nov 24 19:50:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:50:18 -0500
Subject: rpms/Django import.log,1.1,1.2
Message-ID: <200611241950.kAOJoIp5010366@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10336

Modified Files:
	import.log 
Log Message:
auto-import Django-0.95-1 on branch devel from Django-0.95-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Django/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Nov 2006 19:48:43 -0000	1.1
+++ import.log	24 Nov 2006 19:49:48 -0000	1.2
@@ -0,0 +1 @@
+Django-0_95-1:HEAD:Django-0.95-1.src.rpm:1164397853



From fedora-extras-commits at redhat.com  Fri Nov 24 19:50:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:50:18 -0500
Subject: rpms/Django/devel Django.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611241950.kAOJoIDc010370@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10336/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Django.spec 
Log Message:
auto-import Django-0.95-1 on branch devel from Django-0.95-1.src.rpm


--- NEW FILE Django.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           Django
Version:        0.95
Release:        1%{?dist}
Summary:        A high-level Python Web framework

Group:          Development/Languages
License:        BSD
URL:            http://www.djangoproject.com/
Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Note: No longer required in development version > 0.95
BuildRequires:  python-setuptools
#Requires:       

%description
Django is a high-level Python Web framework that encourages rapid
development and a clean, pragmatic design. It focuses on automating as
much as possible and adhering to the DRY (Don't Repeat Yourself)
principle.


%package docs
Summary:  Documentation for Django
Group:    Documentation
Requires: %{name} = %{version}-%{release}

%description docs
This package contains the documentation for the Django high-level
Python Web framework.


%prep
%setup -q


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

# Documentation
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
chmod +x examples/manage.py
mv examples $RPM_BUILD_ROOT%{_datadir}/%{name}/

# Permission fixes
pushd $RPM_BUILD_ROOT%{python_sitelib}/django
chmod +x conf/project_template/manage.py
cd bin
chmod +x {{compile,unique,make}-messages,django-admin}.py
popd

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
%{_bindir}/django-admin.py
%exclude %{_bindir}/django-admin.py?
%{python_sitelib}/django
%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info

%files docs
%defattr(-,root,root,-)
%doc docs/*
%{_datadir}/%{name}

%changelog
* Sun Nov 12 2006 Michel Salim  - 0.95-1
- Initial package

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Django/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Nov 2006 19:48:48 -0000	1.1
+++ .cvsignore	24 Nov 2006 19:49:48 -0000	1.2
@@ -0,0 +1 @@
+Django-0.95.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Django/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Nov 2006 19:48:48 -0000	1.1
+++ sources	24 Nov 2006 19:49:48 -0000	1.2
@@ -0,0 +1 @@
+9ed7d6a0daa147c012e31d0894802951  Django-0.95.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 21:56:56 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 24 Nov 2006 16:56:56 -0500
Subject: check-mirrors samplelist,1.1,1.2
Message-ID: <200611242157.kAOLuuH1016974@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16959

Modified Files:
	samplelist 
Log Message:
Added return for mailsync test


Index: samplelist
===================================================================
RCS file: /cvs/fedora/check-mirrors/samplelist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samplelist	9 Jul 2006 23:47:47 -0000	1.1
+++ samplelist	24 Nov 2006 21:56:56 -0000	1.2
@@ -45,3 +45,4 @@
 ftp://fedora.bu.edu/fedora/core/5/$ARCH/os/
 http://mirror.pacific.net.au/linux/fedora/linux/core/5/$ARCH/os/
 
+



From fedora-extras-commits at redhat.com  Fri Nov 24 22:22:25 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 24 Nov 2006 17:22:25 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.16,1.17
Message-ID: <200611242222.kAOMMPV9020053@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20038

Modified Files:
	Push.py 
Log Message:
test for commit mail


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Push.py	24 Nov 2006 21:21:04 -0000	1.16
+++ Push.py	24 Nov 2006 22:22:25 -0000	1.17
@@ -15,6 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+
 import errno
 import fcntl, fnmatch
 import os, sys



From fedora-extras-commits at redhat.com  Fri Nov 24 22:22:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 24 Nov 2006 17:22:46 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.17,1.18
Message-ID: <200611242222.kAOMMk3U020074@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20059

Modified Files:
	Push.py 
Log Message:
test for commit mail


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Push.py	24 Nov 2006 22:22:25 -0000	1.17
+++ Push.py	24 Nov 2006 22:22:46 -0000	1.18
@@ -15,7 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
 import errno
 import fcntl, fnmatch
 import os, sys



From fedora-extras-commits at redhat.com  Fri Nov 24 23:00:39 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 24 Nov 2006 18:00:39 -0500
Subject: rpms/pth/devel .cvsignore, 1.6, 1.7 pth.spec, 1.15, 1.16 sources,
	1.6, 1.7
Message-ID: <200611242300.kAON0dMk025559@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25540

Modified Files:
	.cvsignore pth.spec sources 
Log Message:
* Sat Nov 25 2006 Michael Schwendt  - 2.0.7-1
- Update to 2.0.7 (very minor maintenance updates only).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pth/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 01:12:42 -0000	1.6
+++ .cvsignore	24 Nov 2006 23:00:09 -0000	1.7
@@ -1,2 +1,2 @@
-pth-2.0.6.tar.gz.sig
-pth-2.0.6.tar.gz
+pth-2.0.7.tar.gz
+pth-2.0.7.tar.gz.sig


Index: pth.spec
===================================================================
RCS file: /cvs/extras/rpms/pth/devel/pth.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pth.spec	28 Aug 2006 00:13:38 -0000	1.15
+++ pth.spec	24 Nov 2006 23:00:09 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:        The GNU Portable Threads library
 Name:           pth
-Version:        2.0.6
-Release: 3%{?dist}
+Version:        2.0.7
+Release:        1%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://www.gnu.org/software/pth/
@@ -44,7 +44,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=${RPM_BUILD_ROOT} install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
@@ -74,7 +74,10 @@
 
 
 %changelog
-* Mon Aug 28 2006 Michael Schwendt 
+* Sat Nov 25 2006 Michael Schwendt  - 2.0.7-1
+- Update to 2.0.7 (very minor maintenance updates only).
+
+* Mon Aug 28 2006 Michael Schwendt  - 2.0.6-3
 - rebuilt
 
 * Mon May 22 2006 Michael Schwendt  - 2.0.6-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pth/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 01:12:42 -0000	1.6
+++ sources	24 Nov 2006 23:00:09 -0000	1.7
@@ -1,2 +1,2 @@
-42c9fc92e73a3e6eb8dd9cb0d7bad65a  pth-2.0.6.tar.gz.sig
-bdee96babed9b177484ed2dbfd5b127b  pth-2.0.6.tar.gz
+9cb4a25331a4c4db866a31cbe507c793  pth-2.0.7.tar.gz
+2371608ef1866b310393ef262800609c  pth-2.0.7.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Nov 25 01:10:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 24 Nov 2006 20:10:04 -0500
Subject: rpms/perl-IPC-Cmd/devel .cvsignore, 1.5, 1.6 perl-IPC-Cmd.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611250110.kAP1A40K002805@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2778

Modified Files:
	.cvsignore perl-IPC-Cmd.spec sources 
Log Message:
Update to 0.36.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 22:36:49 -0000	1.5
+++ .cvsignore	25 Nov 2006 01:09:34 -0000	1.6
@@ -1 +1 @@
-IPC-Cmd-0.34.tar.gz
+IPC-Cmd-0.36.tar.gz


Index: perl-IPC-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/perl-IPC-Cmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IPC-Cmd.spec	3 Nov 2006 22:36:49 -0000	1.4
+++ perl-IPC-Cmd.spec	25 Nov 2006 01:09:34 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-IPC-Cmd
-Version:        0.34
+Version:        0.36
 Release:        1%{?dist}
 Summary:        Finding and running system commands made easy
 License:        GPL or Artistic
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 24 2006 Steven Pritchard  0.36-1
+- Update to 0.36.
+
 * Fri Nov 03 2006 Steven Pritchard  0.34-1
 - Update to 0.34.
 - Explicitly BR Params::Check >= 0.20.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 22:36:49 -0000	1.5
+++ sources	25 Nov 2006 01:09:34 -0000	1.6
@@ -1 +1 @@
-cfd848ecb76e2a71757f74501396dd48  IPC-Cmd-0.34.tar.gz
+56c6a27022ba5ebc2701364313f751b9  IPC-Cmd-0.36.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 02:02:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 24 Nov 2006 21:02:08 -0500
Subject: rpms/xfce4-diskperf-plugin/devel
	xfce4-diskperf-plugin-01_random_fixes.patch, NONE,
	1.1 xfce4-diskperf-plugin.spec, 1.6, 1.7
Message-ID: <200611250202.kAP2286w006172@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6147

Modified Files:
	xfce4-diskperf-plugin.spec 
Added Files:
	xfce4-diskperf-plugin-01_random_fixes.patch 
Log Message:
fix for #215863

xfce4-diskperf-plugin-01_random_fixes.patch:

--- NEW FILE xfce4-diskperf-plugin-01_random_fixes.patch ---
diff -Nur xfce4-diskperf-plugin-2.0/panel-plugin/main.c xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c
--- xfce4-diskperf-plugin-2.0/panel-plugin/main.c	2005-10-11 22:18:15.000000000 +0300
+++ xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c	2006-10-07 10:15:34.000000000 +0300
@@ -141,6 +141,8 @@
 
 	/**************************************************************/
 
+static int timerNeedsUpdate = 0;
+
 static int DisplayPerf (struct diskperf_t *p_poPlugin)
  /* Get the last disk perfomance data, compute the statistics and update
     the panel-docked monitor bars */
@@ -273,6 +275,12 @@
 
     DisplayPerf (poPlugin);
 
+    if (timerNeedsUpdate) {
+        g_source_remove (poPlugin->iTimerId);
+        poPlugin->iTimerId = 0;
+        timerNeedsUpdate = 0;
+    }
+
     if (!poPlugin->iTimerId)
         poPlugin->iTimerId = g_timeout_add (poConf->iPeriod_ms,
 					    (GSourceFunc) SetTimer, poPlugin);
@@ -773,6 +781,7 @@
     struct param_t *poConf = &(poPlugin->oConf.oParam);
     float           r;
 
+    timerNeedsUpdate = 1;
     TRACE ("SetPeriod()\n");
     r = gtk_spin_button_get_value (GTK_SPIN_BUTTON (p_wSc));
     poConf->iPeriod_ms = (r * 1000) + 0.5;	/* rounded */
@@ -1096,8 +1105,6 @@
 {
     diskperf_t *diskperf = diskperf_create_control (plugin);
 
-    diskperf_read_config (plugin, diskperf);
-
     g_signal_connect (plugin, "free-data", G_CALLBACK (diskperf_free), 
                       diskperf);
 
@@ -1120,7 +1127,9 @@
     gtk_container_add (GTK_CONTAINER (plugin), diskperf->oMonitor.wEventBox);
 
     CreateMonitorBars (diskperf, xfce_panel_plugin_get_orientation (plugin));
-    
+
+    diskperf_read_config (plugin, diskperf);
+    DevPerfInit();
     SetTimer (diskperf);
 }
 


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-diskperf-plugin.spec	5 Oct 2006 12:13:39 -0000	1.6
+++ xfce4-diskperf-plugin.spec	25 Nov 2006 02:01:38 -0000	1.7
@@ -1,12 +1,13 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-01_random_fixes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .random_fixes
 
 %build
 %configure --disable-static
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 25 2006 Christoph Wickert  - 2.0-4
+- Add patch to fix bug bugzilla.xfce.org #1842 (#215863)
+
 * Thu Oct 05 2006 Christoph Wickert  - 2.0-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 02:13:43 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 24 Nov 2006 21:13:43 -0500
Subject: rpms/xfce4-diskperf-plugin/FC-6
	xfce4-diskperf-plugin-01_random_fixes.patch, NONE,
	1.1 xfce4-diskperf-plugin.spec, 1.6, 1.7
Message-ID: <200611250213.kAP2Dh2N006274@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6256

Modified Files:
	xfce4-diskperf-plugin.spec 
Added Files:
	xfce4-diskperf-plugin-01_random_fixes.patch 
Log Message:
fix for #215863

xfce4-diskperf-plugin-01_random_fixes.patch:

--- NEW FILE xfce4-diskperf-plugin-01_random_fixes.patch ---
diff -Nur xfce4-diskperf-plugin-2.0/panel-plugin/main.c xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c
--- xfce4-diskperf-plugin-2.0/panel-plugin/main.c	2005-10-11 22:18:15.000000000 +0300
+++ xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c	2006-10-07 10:15:34.000000000 +0300
@@ -141,6 +141,8 @@
 
 	/**************************************************************/
 
+static int timerNeedsUpdate = 0;
+
 static int DisplayPerf (struct diskperf_t *p_poPlugin)
  /* Get the last disk perfomance data, compute the statistics and update
     the panel-docked monitor bars */
@@ -273,6 +275,12 @@
 
     DisplayPerf (poPlugin);
 
+    if (timerNeedsUpdate) {
+        g_source_remove (poPlugin->iTimerId);
+        poPlugin->iTimerId = 0;
+        timerNeedsUpdate = 0;
+    }
+
     if (!poPlugin->iTimerId)
         poPlugin->iTimerId = g_timeout_add (poConf->iPeriod_ms,
 					    (GSourceFunc) SetTimer, poPlugin);
@@ -773,6 +781,7 @@
     struct param_t *poConf = &(poPlugin->oConf.oParam);
     float           r;
 
+    timerNeedsUpdate = 1;
     TRACE ("SetPeriod()\n");
     r = gtk_spin_button_get_value (GTK_SPIN_BUTTON (p_wSc));
     poConf->iPeriod_ms = (r * 1000) + 0.5;	/* rounded */
@@ -1096,8 +1105,6 @@
 {
     diskperf_t *diskperf = diskperf_create_control (plugin);
 
-    diskperf_read_config (plugin, diskperf);
-
     g_signal_connect (plugin, "free-data", G_CALLBACK (diskperf_free), 
                       diskperf);
 
@@ -1120,7 +1127,9 @@
     gtk_container_add (GTK_CONTAINER (plugin), diskperf->oMonitor.wEventBox);
 
     CreateMonitorBars (diskperf, xfce_panel_plugin_get_orientation (plugin));
-    
+
+    diskperf_read_config (plugin, diskperf);
+    DevPerfInit();
     SetTimer (diskperf);
 }
 


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/FC-6/xfce4-diskperf-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-diskperf-plugin.spec	5 Oct 2006 12:13:39 -0000	1.6
+++ xfce4-diskperf-plugin.spec	25 Nov 2006 02:13:13 -0000	1.7
@@ -1,12 +1,13 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-01_random_fixes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .random_fixes
 
 %build
 %configure --disable-static
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 25 2006 Christoph Wickert  - 2.0-4
+- Add patch to fix bug bugzilla.xfce.org #1842 (#215863)
+
 * Thu Oct 05 2006 Christoph Wickert  - 2.0-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 04:08:17 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Fri, 24 Nov 2006 23:08:17 -0500
Subject: rpms/mlton/devel mlton-20051202-pdf-docs.patch, NONE,
	1.1 mlton-20061107-debuginfo.patch, NONE,
	1.1 mlton-20061107-optflags.patch, NONE, 1.1 mlton.spec, 1.5,
	1.6 mlton-debuginfo.patch, 1.2, NONE mlton-pdf-docs.patch, 1.1, NONE
Message-ID: <200611250408.kAP48HPR012695@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667

Modified Files:
	mlton.spec 
Added Files:
	mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch 
	mlton-20061107-optflags.patch 
Removed Files:
	mlton-debuginfo.patch mlton-pdf-docs.patch 
Log Message:
fixes

mlton-20051202-pdf-docs.patch:

--- NEW FILE mlton-20051202-pdf-docs.patch ---
diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
--- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
+++ mlton-20051202/Makefile	2006-06-19 23:26:55.000000000 -0400
@@ -431,8 +431,8 @@
 		; do 							\
 		$(CP) $(SRC)/regression/$$f.sml $(TEXM)/; 		\
 	done
-	$(GZIP) -c $(LEX)/$(LEX).ps >$(TDOC)/$(LEX).ps.gz
-	$(GZIP) -c $(YACC)/$(YACC).ps >$(TDOC)/$(YACC).ps.gz
+	$(CP) $(LEX)/$(LEX).pdf $(TDOC)
+	$(CP) $(YACC)/$(YACC).pdf $(TDOC)
 	find $(TDOC)/ -name .svn -type d | xargs rm -rf
 	find $(TDOC)/ -name .ignore -type f | xargs rm -rf
 	find $(TEXM)/ -name .svn -type d | xargs rm -rf
diff -ur mlton-20051202~/mllex/Makefile mlton-20051202/mllex/Makefile
--- mlton-20051202~/mllex/Makefile	2005-10-11 16:47:54.000000000 -0400
+++ mlton-20051202/mllex/Makefile	2006-06-19 22:39:39.000000000 -0400
@@ -47,7 +47,7 @@
 	../bin/clean
 
 .PHONY: docs
-docs: mllex.ps
+docs: mllex.pdf
 
 .PHONY: test
 test: $(NAME)
diff -ur mlton-20051202~/mlyacc/doc/Makefile mlton-20051202/mlyacc/doc/Makefile
--- mlton-20051202~/mlyacc/doc/Makefile	2005-11-06 15:04:36.000000000 -0500
+++ mlton-20051202/mlyacc/doc/Makefile	2006-06-19 22:47:41.000000000 -0400
@@ -6,7 +6,7 @@
  # See the file MLton-LICENSE for details.
  ##
 
-all: mlyacc.ps
+all: mlyacc.pdf
 
 html/index.html: $(TEX_FILES)
 	mkdir -p html
diff -ur mlton-20051202~/mlyacc/Makefile mlton-20051202/mlyacc/Makefile
--- mlton-20051202~/mlyacc/Makefile	2005-10-11 16:48:34.000000000 -0400
+++ mlton-20051202/mlyacc/Makefile	2006-06-19 22:48:23.000000000 -0400
@@ -38,15 +38,21 @@
 doc/mlyacc.ps:
 	$(MAKE) -C doc mlyacc.ps
 
+doc/mlyacc.pdf:
+	$(MAKE) -C doc mlyacc.pdf
+
 mlyacc.ps: doc/mlyacc.ps
 	cp doc/mlyacc.ps .
 
+mlyacc.pdf: doc/mlyacc.pdf
+	cp doc/mlyacc.pdf .
+
 .PHONY: clean
 clean:
 	../bin/clean
 
 .PHONY: docs
-docs: mlyacc.ps
+docs: mlyacc.pdf
 
 .PHONY: test
 test: $(NAME)

mlton-20061107-debuginfo.patch:

--- NEW FILE mlton-20061107-debuginfo.patch ---
--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
+++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
@@ -411,18 +411,7 @@
 	if $(GZIP_MAN); then						\
 		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
 	fi
-	case "$(TARGET_OS)" in						\
-	aix|cygwin|darwin|solaris)					\
-	;;								\
-	*)								\
-		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
-			$(TBIN)/$(NLFFIGEN)$(EXE) $(TBIN)/$(PROF)$(EXE)	\
-			$(TBIN)/$(YACC)$(EXE); do			\
-			strip --remove-section=.comment			\
-				--remove-section=.note $$f; 		\
-		done							\
-	esac
 
 .PHONY: install-docs
 install-docs:

mlton-20061107-optflags.patch:

--- NEW FILE mlton-20061107-optflags.patch ---
diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/bytecode/Makefile	2006-11-18 12:27:39.000000000 -0500
@@ -10,8 +10,9 @@
 all: interpret.o interpret-gdb.o print-opcodes
 
 CC = gcc -std=gnu99
-CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
-DEBUGFLAGS = $(CFLAGS)
+OPTFLAGS = -fomit-frame-pointer
+DEBUGFLAGS = -fomit-frame-pointer
+CFLAGS = -I../runtime -I../include -Wall
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)
 DEBUGFLAGS += -gstabs+
@@ -20,21 +21,23 @@
 DEBUGFLAGS += -g2
 
 ifeq ($(TARGET_ARCH), amd64)
-CFLAGS += -mtune=opteron -m32 
-endif 
+OPTFLAGS += -mtune=opteron
+CFLAGS += -m32
+endif
 
 ifeq ($(TARGET_OS), freebsd)
 CFLAGS += -I/usr/local/include
 endif
 
 interpret.o: interpret.c interpret.h opcode.h
-	$(CC) $(CFLAGS) -c -O2 interpret.c
+	$(CC) $(CFLAGS) -c -O2 $(OPTFLAGS) interpret.c
 
 interpret-gdb.o: interpret.c interpret.h
-	$(CC) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
+	$(CC) $(CFLAGS) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
 
 print-opcodes: print-opcodes.c opcode.h
-	$(CC) $(CFLAGS) -o print-opcodes -I../runtime -L../runtime	\
+	$(CC) $(CFLAGS) $(OPTFLAGS) -o print-opcodes \
+		-I../runtime -L../runtime	\
 		print-opcodes.c -lmlton
 
 .PHONY: clean
diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/runtime/Makefile	2006-11-18 12:29:40.000000000 -0500
@@ -13,22 +13,25 @@
 TARGET_OS = $(shell ../bin/host-os)
 GCC_VERSION = $(shell gcc -v 2>&1 | grep 'gcc version' | sed 's/.*gcc version \(.\).*/\1/')
 
-FLAGS = -fomit-frame-pointer
+OPTFLAGS = -fomit-frame-pointer
+FLAGS =
 
 ifeq ($(TARGET_ARCH), x86)
 ifneq ($(findstring $(GCC_VERSION), 3 4),)
-FLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
+OPTFLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
 else
-FLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
+OPTFLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
 endif
 endif
 
 ifeq ($(TARGET_ARCH), amd64)
-FLAGS += -mtune=opteron -m32
+OPTFLAGS += -mtune=opteron
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_ARCH), sparc)
-FLAGS += -mcpu=v8 -m32
+OPTFLAGS += -mcpu=v8
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_OS), freebsd)
@@ -36,7 +39,7 @@
 endif
 
 ifeq ($(TARGET_OS), solaris)
-FLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
+OPTFLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
 endif
 
 ifeq ($(TARGET), self)
@@ -49,7 +52,7 @@
 endif
 
 CC = gcc -std=gnu99
-CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
+CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS) $(OPTFLAGS)
 DEBUGFLAGS = $(CFLAGS)
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mlton.spec	16 Nov 2006 04:07:29 -0000	1.5
+++ mlton.spec	25 Nov 2006 04:07:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		mlton
 Version:	20061107
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -15,8 +15,9 @@
 Source2:	mlton-bootstrap.ppc.tar.bz2
 %endif
 
-Patch0:		mlton-pdf-docs.patch
-Patch1:		mlton-debuginfo.patch
+Patch0:		mlton-20051202-pdf-docs.patch
+Patch1:		mlton-20061107-debuginfo.patch
+Patch2:		mlton-20061107-optflags.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +46,14 @@
 %setup -q
 
 # instantiate version numbers
-make version
+make version VERSION=%{version}
 
 # build documentation as PDF
-%patch -P 0 -p1
-# enable -g and disable strip so debuginfo packages work
-%patch -P 1 -p1
+%patch -P 0 -p1 -b .pdf-docs
+# disable strip so debuginfo packages work
+%patch -P 1 -p1 -b .debuginfo
+# enable RPM_OPT_FLAGS
+%patch -P 2 -p1 -b .optflags
 
 # set correct version of PDF guide until this is fixed upstream
 sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
@@ -73,7 +76,7 @@
 export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
 %endif
 
-make
+make OPTFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -102,7 +105,13 @@
 %{_libdir}/mlton
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Nov 24 2006 Adam Goode  - 20061107-2
+- Use RPM_OPT_FLAGS
+- Correctly instantiate version
+- Adjust patches
+
 * Sun Nov 12 2006 Adam Goode  - 20061107-1
 - New release, taken from svn://mlton.org/mlton/tags/on-20061107
 


--- mlton-debuginfo.patch DELETED ---


--- mlton-pdf-docs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 10:43:46 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 05:43:46 -0500
Subject: rpms/fuse/FC-4 fuse.spec,1.9,1.10
Message-ID: <200611251043.kAPAhko0032660@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606/FC-4

Modified Files:
	fuse.spec 
Log Message:
fixed nasty typo (see bug #217075)


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fuse.spec	22 Nov 2006 19:36:58 -0000	1.9
+++ fuse.spec	25 Nov 2006 10:43:15 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -100,8 +100,7 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) 
-%{_bindir}/fusermount
+%attr(4754,root,fuse) %{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
@@ -124,6 +123,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.6.0-2
+- fixed nasty typo (see bug #217075)
+
 * Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
 - Ver. 2.6.0
 



From fedora-extras-commits at redhat.com  Sat Nov 25 10:43:51 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 05:43:51 -0500
Subject: rpms/fuse/FC-6 fuse.spec,1.14,1.15
Message-ID: <200611251043.kAPAhp6U032666@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606/FC-6

Modified Files:
	fuse.spec 
Log Message:
fixed nasty typo (see bug #217075)


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fuse.spec	22 Nov 2006 19:29:39 -0000	1.14
+++ fuse.spec	25 Nov 2006 10:43:21 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -100,8 +100,7 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) 
-%{_bindir}/fusermount
+%attr(4754,root,fuse) %{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
@@ -124,6 +123,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.6.0-2
+- fixed nasty typo (see bug #217075)
+
 * Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
 - Ver. 2.6.0
 



From fedora-extras-commits at redhat.com  Sat Nov 25 10:43:46 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 05:43:46 -0500
Subject: rpms/fuse/FC-5 fuse.spec,1.13,1.14
Message-ID: <200611251043.kAPAhk5w032663@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606/FC-5

Modified Files:
	fuse.spec 
Log Message:
fixed nasty typo (see bug #217075)


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fuse.spec	22 Nov 2006 19:34:55 -0000	1.13
+++ fuse.spec	25 Nov 2006 10:43:16 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -100,8 +100,7 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) 
-%{_bindir}/fusermount
+%attr(4754,root,fuse) %{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
@@ -124,6 +123,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.6.0-2
+- fixed nasty typo (see bug #217075)
+
 * Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
 - Ver. 2.6.0
 



From fedora-extras-commits at redhat.com  Sat Nov 25 10:43:51 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 05:43:51 -0500
Subject: rpms/fuse/devel fuse.spec,1.14,1.15
Message-ID: <200611251043.kAPAhpad032671@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606/devel

Modified Files:
	fuse.spec 
Log Message:
fixed nasty typo (see bug #217075)


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fuse.spec	11 Nov 2006 06:14:37 -0000	1.14
+++ fuse.spec	25 Nov 2006 10:43:21 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -100,8 +100,7 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) 
-%{_bindir}/fusermount
+%attr(4754,root,fuse) %{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
@@ -124,6 +123,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.6.0-2
+- fixed nasty typo (see bug #217075)
+
 * Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
 - Ver. 2.6.0
 



From fedora-extras-commits at redhat.com  Sat Nov 25 10:55:09 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 05:55:09 -0500
Subject: rpms/fontforge/devel fontforge-20061025-usFirstCharIndex.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 fontforge.spec, 1.21, 1.22 sources,
	1.10, 1.11
Message-ID: <200611251055.kAPAt9FC000417@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv394

Modified Files:
	.cvsignore fontforge.spec sources 
Added Files:
	fontforge-20061025-usFirstCharIndex.patch 
Log Message:
* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
- Update to 20061025
- Patch to correct usFirstCharIndex (George Williams)


fontforge-20061025-usFirstCharIndex.patch:

--- NEW FILE fontforge-20061025-usFirstCharIndex.patch ---
--- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
+++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
@@ -3187,7 +3187,6 @@
 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
 	os2->lastcharindex  = 0xf000 + last;
     } else {
-	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
 	os2->firstcharindex = first;
 	os2->lastcharindex = last;
 	OS2FigureCodePages(sf, os2->ulCodePage);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	20 Oct 2006 18:40:41 -0000	1.10
+++ .cvsignore	25 Nov 2006 10:54:38 -0000	1.11
@@ -1,2 +1,2 @@
-fontforge_full-20061019.tar.bz2
 fontforge_htdocs-20061014.tar.bz2
+fontforge_full-20061025.tar.bz2


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fontforge.spec	20 Oct 2006 18:40:41 -0000	1.21
+++ fontforge.spec	25 Nov 2006 10:54:38 -0000	1.22
@@ -2,7 +2,7 @@
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061019
+Version:        20061025
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -12,6 +12,7 @@
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+Patch1:         fontforge-20061025-usFirstCharIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .usFirstCharIndex
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -112,6 +114,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
+- Update to 20061025
+- Patch to correct usFirstCharIndex (George Williams)
+
 * Fri Oct 20 2006 Kevin Fenzi  - 20061019-1
 - Update to 20061019
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Oct 2006 18:40:41 -0000	1.10
+++ sources	25 Nov 2006 10:54:38 -0000	1.11
@@ -1,2 +1,2 @@
-17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
 c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2
+5fcfa3497d237bf68d1d388254f78448  fontforge_full-20061025.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 11:20:06 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 06:20:06 -0500
Subject: rpms/fontforge/FC-6 fontforge-20061025-usFirstCharIndex.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 fontforge.spec, 1.21, 1.22
Message-ID: <200611251120.kAPBK66k003564@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3541

Modified Files:
	.cvsignore fontforge.spec 
Added Files:
	fontforge-20061025-usFirstCharIndex.patch 
Log Message:
* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
- Update to 20061025
- Patch to correct usFirstCharIndex (George Williams)


fontforge-20061025-usFirstCharIndex.patch:

--- NEW FILE fontforge-20061025-usFirstCharIndex.patch ---
--- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
+++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
@@ -3187,7 +3187,6 @@
 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
 	os2->lastcharindex  = 0xf000 + last;
     } else {
-	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
 	os2->firstcharindex = first;
 	os2->lastcharindex = last;
 	OS2FigureCodePages(sf, os2->ulCodePage);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	20 Oct 2006 18:40:41 -0000	1.10
+++ .cvsignore	25 Nov 2006 11:19:36 -0000	1.11
@@ -1,2 +1,2 @@
-fontforge_full-20061019.tar.bz2
 fontforge_htdocs-20061014.tar.bz2
+fontforge_full-20061025.tar.bz2


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-6/fontforge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fontforge.spec	20 Oct 2006 18:40:41 -0000	1.21
+++ fontforge.spec	25 Nov 2006 11:19:36 -0000	1.22
@@ -2,7 +2,7 @@
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061019
+Version:        20061025
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -12,6 +12,7 @@
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+Patch1:         fontforge-20061025-usFirstCharIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .usFirstCharIndex
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -112,6 +114,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
+- Update to 20061025
+- Patch to correct usFirstCharIndex (George Williams)
+
 * Fri Oct 20 2006 Kevin Fenzi  - 20061019-1
 - Update to 20061019
 



From fedora-extras-commits at redhat.com  Sat Nov 25 11:24:46 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 06:24:46 -0500
Subject: rpms/fontforge/FC-5 fontforge-20061025-usFirstCharIndex.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 fontforge.spec, 1.18, 1.19
Message-ID: <200611251124.kAPBOkRt003682@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3647

Modified Files:
	.cvsignore fontforge.spec 
Added Files:
	fontforge-20061025-usFirstCharIndex.patch 
Log Message:
* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
- Update to 20061025
- Patch to correct usFirstCharIndex (George Williams)


fontforge-20061025-usFirstCharIndex.patch:

--- NEW FILE fontforge-20061025-usFirstCharIndex.patch ---
--- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
+++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
@@ -3187,7 +3187,6 @@
 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
 	os2->lastcharindex  = 0xf000 + last;
     } else {
-	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
 	os2->firstcharindex = first;
 	os2->lastcharindex = last;
 	OS2FigureCodePages(sf, os2->ulCodePage);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Oct 2006 19:00:02 -0000	1.9
+++ .cvsignore	25 Nov 2006 11:24:16 -0000	1.10
@@ -1,2 +1,2 @@
-fontforge_full-20061019.tar.bz2
 fontforge_htdocs-20061014.tar.bz2
+fontforge_full-20061025.tar.bz2


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/fontforge.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fontforge.spec	20 Oct 2006 19:00:02 -0000	1.18
+++ fontforge.spec	25 Nov 2006 11:24:16 -0000	1.19
@@ -2,7 +2,7 @@
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061019
+Version:        20061025
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -12,6 +12,7 @@
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+Patch1:         fontforge-20061025-usFirstCharIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .usFirstCharIndex
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -112,6 +114,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
+- Update to 20061025
+- Patch to correct usFirstCharIndex (George Williams)
+
 * Fri Oct 20 2006 Kevin Fenzi  - 20061019-1
 - Update to 20061019
 



From fedora-extras-commits at redhat.com  Sat Nov 25 11:30:14 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 06:30:14 -0500
Subject: rpms/fontforge/FC-6 sources,1.10,1.11
Message-ID: <200611251130.kAPBUEKj003775@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3753

Modified Files:
	sources 
Log Message:
Forgot to commit sources with last commit



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Oct 2006 18:40:41 -0000	1.10
+++ sources	25 Nov 2006 11:29:44 -0000	1.11
@@ -1,2 +1,2 @@
-17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
 c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2
+5fcfa3497d237bf68d1d388254f78448  fontforge_full-20061025.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 11:31:19 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 06:31:19 -0500
Subject: rpms/fontforge/FC-5 sources,1.9,1.10
Message-ID: <200611251131.kAPBVJN8003804@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3781

Modified Files:
	sources 
Log Message:
Forgot to commit 'sources' with last commit



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Oct 2006 19:00:02 -0000	1.9
+++ sources	25 Nov 2006 11:30:49 -0000	1.10
@@ -1,2 +1,2 @@
-17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
 c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2
+5fcfa3497d237bf68d1d388254f78448  fontforge_full-20061025.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 12:42:06 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 25 Nov 2006 07:42:06 -0500
Subject: rpms/mhash/devel .cvsignore, 1.4, 1.5 mhash.spec, 1.12, 1.13 sources,
	1.4, 1.5
Message-ID: <200611251242.kAPCg6YR007189@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mhash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7170

Modified Files:
	.cvsignore mhash.spec sources 
Log Message:
* Sat Nov 25 2006 Michael Schwendt  - 0.9.7.1-1
- Update to 0.9.7.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2005 16:15:06 -0000	1.4
+++ .cvsignore	25 Nov 2006 12:41:36 -0000	1.5
@@ -1 +1 @@
-mhash-*.tar*
+mhash-0.9.7.1.tar.bz2


Index: mhash.spec
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mhash.spec	28 Aug 2006 10:34:30 -0000	1.12
+++ mhash.spec	25 Nov 2006 12:41:36 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Thread-safe hash algorithms library
 Name: mhash
-Version: 0.9.2
-Release: 5
+Version: 0.9.7.1
+Release: 1
 URL: http://mhash.sourceforge.net/
 License: LGPL
 Group: System Environment/Libraries
@@ -17,9 +17,9 @@
 and other signatures. The HMAC support implements the basics for
 message authentication, following RFC 2104. In the later versions
 some key generation algorithms, which use hash algorithms, have been
-added. Currently, the library supports the algorithms: SHA1, GOST,
+added. Currently, the library supports the algorithms: ADLER32, GOST,
 HAVAL256, HAVAL224, HAVAL192, HAVAL160, HAVAL128, MD5, MD4, MD2,
-RIPEMD128/160/256/320, TIGER, TIGER160, TIGER128, SHA224/384/512,
+RIPEMD128/160/256/320, TIGER, TIGER160, TIGER128, SHA1/224/256/384/512,
 Whirlpool, SNEFRU128/256, CRC32B and CRC32 checksums.
 
 
@@ -45,7 +45,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=${RPM_BUILD_ROOT} install
+
+# Eliminate some autoheader definitions which should not enter a public API.
+# There are more which wait for a fix upstream.
+sed -i 's!\(#define \(PACKAGE\|VERSION \).*\)!/* \1 */!g' ${RPM_BUILD_ROOT}%{_includedir}/mutils/mhash_config.h
 
 
 %post -n %{name} -p /sbin/ldconfig
@@ -68,6 +72,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog ./doc/*.txt ./doc/*.c ./doc/skid2-authentication
 %{_includedir}/*.h
+%{_includedir}/mutils/
 %{?_with_static: %{_libdir}/*.a}
 %{_libdir}/*.so
 %exclude %{_libdir}/*.la
@@ -75,7 +80,10 @@
 
 
 %changelog
-* Mon Aug 28 2006 Michael Schwendt 
+* Sat Nov 25 2006 Michael Schwendt  - 0.9.7.1-1
+- Update to 0.9.7.1.
+
+* Mon Aug 28 2006 Michael Schwendt  - 0.9.2-5
 - rebuilt
 
 * Wed Feb 22 2006 Michael Schwendt  - 0.9.2-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Feb 2005 03:27:13 -0000	1.4
+++ sources	25 Nov 2006 12:41:36 -0000	1.5
@@ -1 +1 @@
-507e0034985eee6364d404bfc761ee02  mhash-0.9.2.tar.bz2
+e2a7f6594d468c5d0edbfa788dbdca0f  mhash-0.9.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 12:55:23 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:55:23 -0500
Subject: rpms/perl-Apache-DBI - New directory
Message-ID: <200611251255.kAPCtNwi007365@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7361/perl-Apache-DBI

Log Message:
Directory /cvs/extras/rpms/perl-Apache-DBI added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 12:55:29 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:55:29 -0500
Subject: rpms/perl-Apache-DBI/devel - New directory
Message-ID: <200611251255.kAPCtTcV007378@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7361/perl-Apache-DBI/devel

Log Message:
Directory /cvs/extras/rpms/perl-Apache-DBI/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 12:55:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:55:48 -0500
Subject: rpms/perl-Apache-DBI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611251255.kAPCtmEO007408@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7402

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Apache-DBI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Apache-DBI
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  Sat Nov 25 12:55:53 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:55:53 -0500
Subject: rpms/perl-Apache-DBI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611251255.kAPCtrat007423@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7402/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Apache-DBI


--- 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  Sat Nov 25 12:56:57 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:56:57 -0500
Subject: rpms/perl-Apache-DBI import.log,1.1,1.2
Message-ID: <200611251256.kAPCuvbm007492@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7462

Modified Files:
	import.log 
Log Message:
auto-import perl-Apache-DBI-1.05-2.fc7 on branch devel from perl-Apache-DBI-1.05-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-DBI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 12:55:48 -0000	1.1
+++ import.log	25 Nov 2006 12:56:27 -0000	1.2
@@ -0,0 +1 @@
+perl-Apache-DBI-1_05-2_fc7:HEAD:perl-Apache-DBI-1.05-2.fc7.src.rpm:1164459451



From fedora-extras-commits at redhat.com  Sat Nov 25 12:56:58 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:56:58 -0500
Subject: rpms/perl-Apache-DBI/devel perl-Apache-DBI.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611251257.kAPCuwgE007496@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7462/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Apache-DBI.spec 
Log Message:
auto-import perl-Apache-DBI-1.05-2.fc7 on branch devel from perl-Apache-DBI-1.05-2.fc7.src.rpm


--- NEW FILE perl-Apache-DBI.spec ---
%define perlname Apache-DBI

Name:      perl-Apache-DBI
Version:   1.05
Release:   2%{?dist}
Summary:   Persistent database connections with Apache/mod_perl

Group:     Development/Libraries
License:   GPL or Artistic
URL:       http://search.cpan.org/dist/Apache-DBI/
Source:    http://search.cpan.org/CPAN/authors/id/P/PG/PGOLLUCCI/%{perlname}-%{version}.tar.gz

BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(DBD::mysql)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is version %{version} of Apache::AuthDBI and Apache::DBI.

These modules are supposed to be used with the Apache server together with 
an embedded perl interpreter like mod_perl. They provide support for basic 
authentication and authorization as well as support for persistent database 
connections via Perl's Database Independent Interface (DBI). 

o DBI.pm provides persistent database connections: 
  - connections can be established during server-startup 
  - configurable rollback to ensure data integrity 
  - configurable verification of the connections to avoid time-outs. 

o AuthDBI.pm provides authentication and authorization: 
  - optional shared cache for passwords to minimize database load 
  - configurable cleanup-handler deletes outdated entries from the cache 

Apache::DBI has been in widespread deployment on many platforms for
years.  Apache::DBI is one of the most widely used mod_perl related
modules.  It can be considered stable.

%prep
%setup -q -n %{perlname}-%{version}
%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' eg/startup.pl
chmod 644 eg/startup.pl


%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 TODO traces.txt eg/
%{_mandir}/man3/Apache*
%{perl_vendorlib}/Apache

%changelog
* Sat Nov 25 2006 Remi Collet  1.05-2
- change from review (-perldoc +traces +eg)

* Sat Nov 25 2006 Remi Collet  1.05-1
- initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-DBI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 12:55:53 -0000	1.1
+++ .cvsignore	25 Nov 2006 12:56:28 -0000	1.2
@@ -0,0 +1 @@
+Apache-DBI-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-DBI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 12:55:53 -0000	1.1
+++ sources	25 Nov 2006 12:56:28 -0000	1.2
@@ -0,0 +1 @@
+ba0b6e345870c052e8ce6d6d73b4bfe4  Apache-DBI-1.05.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 13:02:17 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 08:02:17 -0500
Subject: owners owners.list,1.2006,1.2007
Message-ID: <200611251302.kAPD2HSx010575@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558

Modified Files:
	owners.list 
Log Message:
	perl-Apache-DBI



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2006
retrieving revision 1.2007
diff -u -r1.2006 -r1.2007
--- owners.list	24 Nov 2006 19:16:56 -0000	1.2006
+++ owners.list	25 Nov 2006 13:01:47 -0000	1.2007
@@ -1301,6 +1301,7 @@
 Fedora Extras|perl-aliased|Use shorter versions of class names|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Alien-wxWidgets|Building, finding and using wxWidgets binaries|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AnyData|Easy access to data in many formats|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Apache-DBI|Persistent database connections with Apache/mod_perl|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
 Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Nov 25 13:45:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 08:45:56 -0500
Subject: rpms/libassuan/devel .cvsignore, 1.8, 1.9 libassuan.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <200611251345.kAPDjuER010890@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10871

Modified Files:
	.cvsignore libassuan.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  - 1.0.1-1
- libassuan-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Nov 2006 21:25:32 -0000	1.8
+++ .cvsignore	25 Nov 2006 13:45:26 -0000	1.9
@@ -1,4 +1,4 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-1.0.0.tar.bz2
-libassuan-1.0.0.tar.bz2.sig
+libassuan-1.0.1.tar.bz2.sig
+libassuan-1.0.1.tar.bz2


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libassuan.spec	13 Nov 2006 21:25:32 -0000	1.21
+++ libassuan.spec	25 Nov 2006 13:45:26 -0000	1.22
@@ -1,7 +1,7 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 1.0.0 
+Version: 1.0.1
 Release: 1%{?dist}
 
 License: LGPL
@@ -82,8 +82,11 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  - 1.0.1-1
+- libassuan-1.0.1
+
 * Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
-- 1.0.0
+- libassuan-1.0.0
 - rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
 
 * Wed Oct 18 2006 Rex Dieter  - 0.9.3-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Nov 2006 21:25:32 -0000	1.8
+++ sources	25 Nov 2006 13:45:26 -0000	1.9
@@ -1,2 +1,2 @@
-f1580ef149e629629a9639a5afdb5908  libassuan-1.0.0.tar.bz2
-c00497327001dcccf7d3a952f56030e4  libassuan-1.0.0.tar.bz2.sig
+003d24e08f2eeee14b5afcc1a1998f40  libassuan-1.0.1.tar.bz2.sig
+6109ea5c8c34ee5591afbd4618dd5ab4  libassuan-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 14:03:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 09:03:17 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.61,1.62
Message-ID: <200611251403.kAPE3HFJ013978@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13963

Modified Files:
	gnupg2.spec 
Log Message:
* Sat Nov 25 2006 Rex Dieter  2.0.1-0.1.rc1
- gnupg-2.0.1rc1 



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnupg2.spec	16 Nov 2006 20:57:49 -0000	1.61
+++ gnupg2.spec	25 Nov 2006 14:02:47 -0000	1.62
@@ -7,15 +7,17 @@
 %define kde_scriptdir %{_prefix}
 %endif
 
+%define beta rc1
+
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.0
-Release: 4%{?dist}
+Version: 2.0.1
+Release: 0.1.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,7 +32,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-static >= 1.0.0 
+BuildRequires: libassuan-static >= 1.0.1 
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -78,7 +80,7 @@
 
 
 %prep
-%setup -q -n gnupg-%{version}
+%setup -q -n gnupg-%{version}%{?beta}
 
 #patch1 -p1 -b .testverbose
 
@@ -178,6 +180,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  2.0.1-0.1.rc1
+- gnupg-2.0.1rc1 
+
 * Thu Nov 16 2006 Rex Dieter  2.0.0-4
 - update %%description
 - drop dearmor patch
@@ -186,7 +191,7 @@
 - BR: libassuan-static >= 1.0.0
 
 * Mon Nov 13 2006 Rex Dieter  2.0.0-2
-- 2.0.0
+- gnupg-2.0.0
 
 * Fri Nov 10 2006 Rex Dieter  1.9.95-3
 - upstream 64bit patch



From fedora-extras-commits at redhat.com  Sat Nov 25 14:08:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 09:08:11 -0500
Subject: rpms/gnupg2/devel .cvsignore, 1.17, 1.18 gnupg2.spec, 1.62,
	1.63 sources, 1.19, 1.20
Message-ID: <200611251408.kAPE8B8V014059@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14040

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
fix sources, Release++



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Nov 2006 20:36:26 -0000	1.17
+++ .cvsignore	25 Nov 2006 14:07:41 -0000	1.18
@@ -1,4 +1,4 @@
-gnupg-1.9.95.tar.bz2
-gnupg-1.9.95.tar.bz2.sig
 gnupg-2.0.0.tar.bz2
 gnupg-2.0.0.tar.bz2.sig
+gnupg-2.0.1rc1.tar.bz2
+gnupg-2.0.1rc1.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnupg2.spec	25 Nov 2006 14:02:47 -0000	1.62
+++ gnupg2.spec	25 Nov 2006 14:07:41 -0000	1.63
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.1
-Release: 0.1.%{beta}%{?dist}
+Release: 0.2.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -180,7 +180,7 @@
 
 
 %changelog
-* Sat Nov 25 2006 Rex Dieter  2.0.1-0.1.rc1
+* Sat Nov 25 2006 Rex Dieter  2.0.1-0.2.rc1
 - gnupg-2.0.1rc1 
 
 * Thu Nov 16 2006 Rex Dieter  2.0.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Nov 2006 20:36:26 -0000	1.19
+++ sources	25 Nov 2006 14:07:41 -0000	1.20
@@ -1,2 +1,2 @@
-65dc5da3bd4ec127f81c584c8200d813  gnupg-2.0.0.tar.bz2.sig
-13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2
+e782017943dcf59e3f5b71556e921be4  gnupg-2.0.1rc1.tar.bz2
+2dee9b82c53b42c13267b794aa3fae00  gnupg-2.0.1rc1.tar.bz2.sig



From fedora-extras-commits at redhat.com  Sat Nov 25 14:39:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 09:39:17 -0500
Subject: rpms/perl-Log-Dispatch/devel .cvsignore, 1.4,
	1.5 perl-Log-Dispatch.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611251439.kAPEdHlk014277@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14254

Modified Files:
	.cvsignore perl-Log-Dispatch.spec sources 
Log Message:
Update to 2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2006 20:46:03 -0000	1.4
+++ .cvsignore	25 Nov 2006 14:38:47 -0000	1.5
@@ -1 +1 @@
-Log-Dispatch-2.13.tar.gz
+Log-Dispatch-2.14.tar.gz


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Log-Dispatch.spec	26 Sep 2006 20:46:03 -0000	1.6
+++ perl-Log-Dispatch.spec	25 Nov 2006 14:38:47 -0000	1.7
@@ -7,7 +7,7 @@
 
 
 Name:           perl-Log-Dispatch
-Version:        2.13
+Version:        2.14
 Release:        1%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 2.14-1
+- Update to 2.14.
+
 * Tue Sep 26 2006 Jose Pedro Oliveira  - 2.13-1
 - Update to 2.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2006 20:46:03 -0000	1.4
+++ sources	25 Nov 2006 14:38:47 -0000	1.5
@@ -1 +1 @@
-88349394af92f521e1ccc845d64fb9f2  Log-Dispatch-2.13.tar.gz
+163825c45fcb359faf9803e10f7f9c58  Log-Dispatch-2.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 15:04:10 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 25 Nov 2006 10:04:10 -0500
Subject: rpms/jd/devel .cvsignore, 1.23, 1.24 jd.spec, 1.30, 1.31 sources,
	1.23, 1.24
Message-ID: <200611251504.kAPF4A1n017498@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17470

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Nov 25 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061125
- cvs 061125 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	24 Nov 2006 15:09:08 -0000	1.23
+++ .cvsignore	25 Nov 2006 15:03:40 -0000	1.24
@@ -1 +1 @@
-jd-1.8.1-cvs061124.tgz
+jd-1.8.1-cvs061125.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jd.spec	24 Nov 2006 15:09:08 -0000	1.30
+++ jd.spec	25 Nov 2006 15:03:40 -0000	1.31
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061124
+%define         strtag        cvs061125
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Nov 24 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061124
-- cvs 061124 (23:59 JST)
+* Sat Nov 25 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061125
+- cvs 061125 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	24 Nov 2006 15:09:08 -0000	1.23
+++ sources	25 Nov 2006 15:03:40 -0000	1.24
@@ -1 +1 @@
-74ebe9ef9e826e2134fe7bcdf43b0797  jd-1.8.1-cvs061124.tgz
+1bcf2b13a48d65cabe60a30034b603d0  jd-1.8.1-cvs061125.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 15:12:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 25 Nov 2006 10:12:41 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.8, 1.9 ochusha.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200611251512.kAPFCf7h017596@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17577

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Sat Nov 25 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
- 0.5.99.63.6 cvs 061125 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Nov 2006 07:43:13 -0000	1.8
+++ .cvsignore	25 Nov 2006 15:12:11 -0000	1.9
@@ -1 +1 @@
-ochusha-0.5.99.63.5-cvs061120.tar.bz2
+ochusha-0.5.99.63.6-cvs061125.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ochusha.spec	21 Nov 2006 07:43:13 -0000	1.8
+++ ochusha.spec	25 Nov 2006 15:12:11 -0000	1.9
@@ -1,8 +1,8 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.5
-%define              strtag          cvs061120
+%define              main_ver        0.5.99.63.6
+%define              strtag          cvs061125
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -56,6 +56,9 @@
 # change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
+# set htmlview as a default browser
+%{__sed} -i -e 's|firefox|htmlview|' ochusha/preferences.cc
+
 %build
 sh autogen.sh
 
@@ -152,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Mon Nov 20 2006 Mamoru Tasaka  0.5.99.63.5-0.1.cvs061120
-- 0.5.99.63.5 cvs 061120 (20:00 JST)
+* Sat Nov 25 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
+- 0.5.99.63.6 cvs 061125 (23:59 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Nov 2006 07:43:13 -0000	1.8
+++ sources	25 Nov 2006 15:12:11 -0000	1.9
@@ -1 +1 @@
-d3ce8f7cfe119ab7490cb4043d8357bb  ochusha-0.5.99.63.5-cvs061120.tar.bz2
+51ba6482844fb7c9c1d5fa3a666027f3  ochusha-0.5.99.63.6-cvs061125.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 15:31:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 25 Nov 2006 10:31:44 -0500
Subject: fedora-security/audit fe3, 1.32, 1.33 fe4, 1.99, 1.100 fe5, 1.107, 
	1.108 fe6, 1.23, 1.24
Message-ID: <200611251531.kAPFVi8v017757@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17736

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fe3	23 Nov 2006 21:34:37 -0000	1.32
+++ fe3	25 Nov 2006 15:31:44 -0000	1.33
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5602 VULNERABLE (xsupplicant) #212699


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fe4	23 Nov 2006 21:34:37 -0000	1.99
+++ fe4	25 Nov 2006 15:31:44 -0000	1.100
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fe5	23 Nov 2006 21:34:37 -0000	1.107
+++ fe5	25 Nov 2006 15:31:44 -0000	1.108
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fe6	23 Nov 2006 21:34:37 -0000	1.23
+++ fe6	25 Nov 2006 15:31:44 -0000	1.24
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077



From fedora-extras-commits at redhat.com  Sat Nov 25 15:55:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 10:55:37 -0500
Subject: rpms/kile/devel .cvsignore, 1.7, 1.8 kile.spec, 1.30, 1.31 sources, 
	1.7, 1.8
Message-ID: <200611251555.kAPFtbSI017828@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17809

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Aug 2006 15:39:34 -0000	1.7
+++ .cvsignore	25 Nov 2006 15:55:07 -0000	1.8
@@ -1 +1,2 @@
 kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kile.spec	29 Aug 2006 15:37:07 -0000	1.30
+++ kile.spec	25 Nov 2006 15:55:07 -0000	1.31
@@ -1,8 +1,8 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.2
-Release: 4%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
 * Tue Aug 29 2006 Rex Dieter  1.9.2-4
 - revert to saner/simpler symlink handling
 
@@ -127,10 +130,10 @@
 - fc6 respin
 
 * Sun Aug 27 2006 Rex Dieter  1.9.2-1
-- 1.9.2
+- kile-1.9.2
 
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Aug 2006 15:39:34 -0000	1.7
+++ sources	25 Nov 2006 15:55:07 -0000	1.8
@@ -1 +1 @@
-2f4fa752595c9011fd9292d7ff99d124  kile-1.9.2.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 15:57:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 10:57:26 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.63,1.64
Message-ID: <200611251557.kAPFvQ66017917@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17902

Modified Files:
	gnupg2.spec 
Log Message:
fix %files



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnupg2.spec	25 Nov 2006 14:07:41 -0000	1.63
+++ gnupg2.spec	25 Nov 2006 15:56:56 -0000	1.64
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.1
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -167,7 +167,6 @@
 %{_bindir}/watchgnupg
 %{_sbindir}/*
 %{_datadir}/gnupg/
-%{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
 %{_mandir}/man?/*
@@ -180,7 +179,7 @@
 
 
 %changelog
-* Sat Nov 25 2006 Rex Dieter  2.0.1-0.2.rc1
+* Sat Nov 25 2006 Rex Dieter  2.0.1-0.3.rc1
 - gnupg-2.0.1rc1 
 
 * Thu Nov 16 2006 Rex Dieter  2.0.0-4



From fedora-extras-commits at redhat.com  Sat Nov 25 16:14:28 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:14:28 -0500
Subject: rpms/xerces-c - New directory
Message-ID: <200611251614.kAPGESw0021062@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21058/xerces-c

Log Message:
Directory /cvs/extras/rpms/xerces-c added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 16:14:33 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:14:33 -0500
Subject: rpms/xerces-c/devel - New directory
Message-ID: <200611251614.kAPGEXwK021075@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21058/xerces-c/devel

Log Message:
Directory /cvs/extras/rpms/xerces-c/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 16:15:12 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:15:12 -0500
Subject: rpms/xerces-c Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611251615.kAPGFCxV021105@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21099

Added Files:
	Makefile import.log 
Log Message:
Setup of module xerces-c


--- NEW FILE Makefile ---
# Top level Makefile for module xerces-c
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  Sat Nov 25 16:15:18 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:15:18 -0500
Subject: rpms/xerces-c/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611251615.kAPGFI82021121@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21099/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xerces-c


--- 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  Sat Nov 25 16:19:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:19:08 -0500
Subject: rpms/kile/FC-6 .cvsignore, 1.7, 1.8 kile.spec, 1.30, 1.31 sources,
	1.7, 1.8
Message-ID: <200611251619.kAPGJ834021174@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21151

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Aug 2006 15:39:34 -0000	1.7
+++ .cvsignore	25 Nov 2006 16:18:38 -0000	1.8
@@ -1 +1,2 @@
 kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-6/kile.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kile.spec	29 Aug 2006 15:37:07 -0000	1.30
+++ kile.spec	25 Nov 2006 16:18:38 -0000	1.31
@@ -1,8 +1,8 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.2
-Release: 4%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
 * Tue Aug 29 2006 Rex Dieter  1.9.2-4
 - revert to saner/simpler symlink handling
 
@@ -127,10 +130,10 @@
 - fc6 respin
 
 * Sun Aug 27 2006 Rex Dieter  1.9.2-1
-- 1.9.2
+- kile-1.9.2
 
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Aug 2006 15:39:34 -0000	1.7
+++ sources	25 Nov 2006 16:18:38 -0000	1.8
@@ -1 +1 @@
-2f4fa752595c9011fd9292d7ff99d124  kile-1.9.2.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 16:21:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:21:17 -0500
Subject: rpms/kile/FC-6 kile.spec,1.31,1.32
Message-ID: <200611251621.kAPGLHio021249@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21227

Modified Files:
	kile.spec 
Log Message:
micro increment Release, dup'd tag



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-6/kile.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kile.spec	25 Nov 2006 16:18:38 -0000	1.31
+++ kile.spec	25 Nov 2006 16:20:47 -0000	1.32
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.3
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 Group: 	 Applications/Publishing



From fedora-extras-commits at redhat.com  Sat Nov 25 16:21:58 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:21:58 -0500
Subject: rpms/xerces-c import.log,1.1,1.2
Message-ID: <200611251621.kAPGLwLv021329@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21259

Modified Files:
	import.log 
Log Message:
auto-import xerces-c-2.7.0-5 on branch devel from xerces-c-2.7.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xerces-c/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 16:15:12 -0000	1.1
+++ import.log	25 Nov 2006 16:21:28 -0000	1.2
@@ -0,0 +1 @@
+xerces-c-2_7_0-5:HEAD:xerces-c-2.7.0-5.src.rpm:1164471744



From fedora-extras-commits at redhat.com  Sat Nov 25 16:21:59 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:21:59 -0500
Subject: rpms/xerces-c/devel xerces-c.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611251622.kAPGLx0C021333@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21259/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xerces-c.spec 
Log Message:
auto-import xerces-c-2.7.0-5 on branch devel from xerces-c-2.7.0-5.src.rpm


--- NEW FILE xerces-c.spec ---
Summary:	Validating XML Parser
Name: 		xerces-c
Version: 	2.7.0
Release:	5%{?dist}
License:	Apache Software License
Group:		System Environment/Libraries
URL: 		http://xml.apache.org/xerces-c/
Source: 	http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Xerces-C is a validating XML parser written in a portable subset of
C++. Xerces-C makes it easy to give your application the ability to
read and write XML data. A shared library is provided for parsing,
generating, manipulating, and validating XML documents. Xerces-C is
faithful to the XML 1.0 recommendation and associated standards ( DOM
1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).

%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.

%package doc
Group:		Documentation
Summary:	Documentation for Xerces-C++ validating XML parser

%description doc
Documentation for Xerces-C++.

Xerces-C++ is a validating XML parser written in a portable subset of C++.
Xerces-C++ makes it easy to give your application the ability to read and
write XML data. A shared library is provided for parsing, generating,
manipulating, and validating XML documents.

#%package	samples
#Summary:	Sample applications using Xerces-C++
#Group:		Applications/Text
#Requires:	%{name} = %{version}-devel-%{release}

#%description	samples
#Sample applications using Xerces-C++.


%prep
%setup -q -n xerces-c-src_2_7_0
rm -rf doc/html/resources/.svn
find ./doc -type f -perm 755 -exec chmod 644 {} \;
find ./samples -type f -perm 755 -exec chmod 644 {} \;
%{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.inw

%build
export XERCESCROOT="$PWD"

# Let Makefiles be verbose
find -name 'Makefile.*' | while read f; do
	sed -i -e 's/$Q//g' \
	-e 's/{MAKE} -s/(MAKE)/g' \
	-e '/echo \"  (/d' \
	$f
done

# Remove conflicting flags from runConfigure
find -name runConfigure | while read f; do
	sed -i -e 's/-w -O -DNDEBUG/-DNDEBUG/g' $f
done

cd $XERCESCROOT/src/xercesc
%ifarch alpha ppc64 s390x sparc64 x86_64
CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b64 -P %{_prefix} -C --libdir="%{_libdir}"
%else
CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b32 -P %{_prefix} -C --libdir="%{_libdir}"
%endif
# not smp safe
%{__make}
#cd $XERCESCROOT/samples
#CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++
#%{__make}

%install
%{__rm} -rf $RPM_BUILD_ROOT
export XERCESCROOT="$PWD"
%{__make} install -C src/xercesc DESTDIR="$RPM_BUILD_ROOT"
#mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
#rm -rf $XERCESCROOT/samples/Projects
#cp -a $XERCESCROOT/samples $RPM_BUILD_ROOT%{_datadir}/%{name}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_libdir}/libxerces*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libxerces*.so
%{_includedir}/xercesc/

%files doc
%defattr(-,root,root,-)
%doc Readme.html LICENSE NOTICE STATUS credits.txt doc samples

#%files samples
#%defattr(-,root,root,-)
#%{_datadir}/%{name}/samples

%changelog

* Sat Nov 25 2006 Peter Lemenkov  2.7.0-5
- fixed some rpmlint warnings

* Fri Nov 24 2006 Peter Lemenkov  2.7.0-4
- Added samples to docs-package

* Sat Nov 18 2006 Peter Lemenkov  2.7.0-3
- improvements suggested by Aurelien Bompard

* Sat Oct 14 2006 Peter Lemenkov  2.7.0-2
- Disabled package 'samples'

* Fri Oct 13 2006 Peter Lemenkov  2.7.0-1
- initial build for FE

* Fri Jan 06 2006 Dag Wieers  - 2.7.0-1 - 3891/dag
- Cleaned SPEC file.

* Tue Jan 03 2006 Dries Verachtert  - 2.7.0-1
- Updated to release 2.7.0.

* Thu Sep 22 2005 C.Lee Taylor  2.6.1-1
- Update to 2.6.1
- Build for FC4 32/64bit

* Sat Aug 20 2005 Che
- initial rpm release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xerces-c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 16:15:18 -0000	1.1
+++ .cvsignore	25 Nov 2006 16:21:29 -0000	1.2
@@ -0,0 +1 @@
+xerces-c-src_2_7_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xerces-c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 16:15:18 -0000	1.1
+++ sources	25 Nov 2006 16:21:29 -0000	1.2
@@ -0,0 +1 @@
+04169609449a8846bc1e6891c04cadf4  xerces-c-src_2_7_0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 16:22:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:22:33 -0500
Subject: rpms/kile/FC-5 .cvsignore, 1.7, 1.8 kile.spec, 1.27, 1.28 sources,
	1.7, 1.8
Message-ID: <200611251622.kAPGMXfc021384@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21337

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Aug 2006 15:40:09 -0000	1.7
+++ .cvsignore	25 Nov 2006 16:22:03 -0000	1.8
@@ -1 +1,2 @@
 kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/kile.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kile.spec	27 Aug 2006 15:40:09 -0000	1.27
+++ kile.spec	25 Nov 2006 16:22:03 -0000	1.28
@@ -1,7 +1,7 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.2
+Version: 1.9.3
 Release: 1%{?dist}
 
 License: GPL
@@ -47,7 +47,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -62,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --add-category="X-Fedora" --vendor="" \
@@ -72,29 +71,18 @@
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML (1.1)
+# HTML (1.0)
 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
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    ## NEW: automated abs symlink -> rel symlink conversion -- Rex
-    ## not sure if this is worth the extra effort, but here it is...
+    # replace absolute symlinks with relative ones
     pushd $lang_dir
-    ROOT=$(echo $(pwd) | sed -e "s|$RPM_BUILD_ROOT||")
-    LINKS=$(find . -type l )
-    for LINK in $LINKS ; do
-    DST=$(echo $LINK | sed -e "s|./||" )
-    PRE=$(echo $DST | tr -c -d '/' | sed -e 's|/|../|g')
-    # skip if $SRC not inside $ROOT
-    test -z "$PRE" && continue
-    POST=$(readlink $LINK | sed -e "s|$ROOT||" )
-    # skip if not abs symlink
-    test -z "$(echo $POST | grep '^/')" && continue
-    SRC=$(echo $PRE$POST | sed -e 's|//|/|g')
-    rm -f $DST && ln -s $SRC $DST
-    done
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
     popd
   fi
 done
@@ -132,11 +120,20 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
+* Tue Aug 29 2006 Rex Dieter  1.9.2-4
+- revert to saner/simpler symlink handling
+
+* Mon Aug 28 2006 Rex Dieter  1.9.2-3
+- fc6 respin
+
 * Sun Aug 27 2006 Rex Dieter  1.9.2-1
-- 1.9.2
+- kile-1.9.2
 
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Aug 2006 15:40:09 -0000	1.7
+++ sources	25 Nov 2006 16:22:03 -0000	1.8
@@ -1 +1 @@
-2f4fa752595c9011fd9292d7ff99d124  kile-1.9.2.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 16:25:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:25:35 -0500
Subject: rpms/kile/FC-4 .cvsignore, 1.5, 1.6 kile.spec, 1.21, 1.22 sources,
	1.6, 1.7
Message-ID: <200611251625.kAPGPZLa021476@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21452

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Jun 2006 17:22:27 -0000	1.5
+++ .cvsignore	25 Nov 2006 16:25:05 -0000	1.6
@@ -1 +1,2 @@
-kile-1.9.1.tar.bz2
+kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kile.spec	24 Jun 2006 17:22:27 -0000	1.21
+++ kile.spec	25 Nov 2006 16:25:05 -0000	1.22
@@ -1,7 +1,7 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.1
+Version: 1.9.3
 Release: 1%{?dist}
 
 License: GPL
@@ -20,8 +20,8 @@
 #Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
-Obsoletes: kile-i18n < %{version}
-#Provides: kile-i18n = %{version}
+Obsoletes: kile-i18n < %{version}=%{release}
+#Provides: kile-i18n = %{version}-%{release}
 
 %description
 Kile is a user friendly (La)TeX editor.  The main features are:
@@ -47,7 +47,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -62,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --add-category="X-Fedora" --vendor="" \
@@ -72,29 +71,18 @@
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML (1.1)
+# HTML (1.0)
 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
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    ## NEW: automated abs symlink -> rel symlink conversion -- Rex
-    ## not sure if this is worth the extra effort, but here it is...
+    # replace absolute symlinks with relative ones
     pushd $lang_dir
-    ROOT=$(echo $(pwd) | sed -e "s|$RPM_BUILD_ROOT||")
-    LINKS=$(find . -type l )
-    for LINK in $LINKS ; do
-    DST=$(echo $LINK | sed -e "s|./||" )
-    PRE=$(echo $DST | tr -c -d '/' | sed -e 's|/|../|g')
-    # skip if $SRC not inside $ROOT
-    test -z "$PRE" && continue
-    POST=$(readlink $LINK | sed -e "s|$ROOT||" )
-    # skip if not abs symlink
-    test -z "$(echo $POST | grep '^/')" && continue
-    SRC=$(echo $PRE$POST | sed -e 's|//|/|g')
-    rm -f $DST && ln -s $SRC $DST
-    done
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
     popd
   fi
 done
@@ -132,8 +120,20 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
+* Tue Aug 29 2006 Rex Dieter  1.9.2-4
+- revert to saner/simpler symlink handling
+
+* Mon Aug 28 2006 Rex Dieter  1.9.2-3
+- fc6 respin
+
+* Sun Aug 27 2006 Rex Dieter  1.9.2-1
+- kile-1.9.2
+
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Jun 2006 17:22:27 -0000	1.6
+++ sources	25 Nov 2006 16:25:05 -0000	1.7
@@ -1 +1 @@
-8add30e9d9667f7b31c2fc1e752d70ab  kile-1.9.1.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 16:26:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:26:32 -0500
Subject: rpms/kile/FC-3 .cvsignore, 1.5, 1.6 kile.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200611251626.kAPGQWZ0021575@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21522

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jun 2006 23:26:39 -0000	1.5
+++ .cvsignore	25 Nov 2006 16:26:02 -0000	1.6
@@ -1 +1,2 @@
-kile-1.9.1.tar.bz2
+kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kile.spec	25 Jun 2006 23:26:39 -0000	1.17
+++ kile.spec	25 Nov 2006 16:26:02 -0000	1.18
@@ -1,7 +1,7 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.1
+Version: 1.9.3
 Release: 1%{?dist}
 
 License: GPL
@@ -20,8 +20,8 @@
 #Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
-Obsoletes: kile-i18n < %{version}
-#Provides: kile-i18n = %{version}
+Obsoletes: kile-i18n < %{version}=%{release}
+#Provides: kile-i18n = %{version}-%{release}
 
 %description
 Kile is a user friendly (La)TeX editor.  The main features are:
@@ -47,7 +47,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -62,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --add-category="X-Fedora" --vendor="" \
@@ -72,29 +71,18 @@
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML (1.1)
+# HTML (1.0)
 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
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    ## NEW: automated abs symlink -> rel symlink conversion -- Rex
-    ## not sure if this is worth the extra effort, but here it is...
+    # replace absolute symlinks with relative ones
     pushd $lang_dir
-    ROOT=$(echo $(pwd) | sed -e "s|$RPM_BUILD_ROOT||")
-    LINKS=$(find . -type l )
-    for LINK in $LINKS ; do
-    DST=$(echo $LINK | sed -e "s|./||" )
-    PRE=$(echo $DST | tr -c -d '/' | sed -e 's|/|../|g')
-    # skip if $SRC not inside $ROOT
-    test -z "$PRE" && continue
-    POST=$(readlink $LINK | sed -e "s|$ROOT||" )
-    # skip if not abs symlink
-    test -z "$(echo $POST | grep '^/')" && continue
-    SRC=$(echo $PRE$POST | sed -e 's|//|/|g')
-    rm -f $DST && ln -s $SRC $DST
-    done
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
     popd
   fi
 done
@@ -132,8 +120,20 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
+* Tue Aug 29 2006 Rex Dieter  1.9.2-4
+- revert to saner/simpler symlink handling
+
+* Mon Aug 28 2006 Rex Dieter  1.9.2-3
+- fc6 respin
+
+* Sun Aug 27 2006 Rex Dieter  1.9.2-1
+- kile-1.9.2
+
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Jun 2006 23:26:39 -0000	1.6
+++ sources	25 Nov 2006 16:26:02 -0000	1.7
@@ -1 +1 @@
-8add30e9d9667f7b31c2fc1e752d70ab  kile-1.9.1.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 16:31:00 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 25 Nov 2006 11:31:00 -0500
Subject: rpms/smart/FC-4 distro.py, 1.1, 1.2 smart.desktop, 1.1,
	1.2 smart.spec, 1.10, 1.11
Message-ID: <200611251631.kAPGV0G6021703@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/FC-4

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:30 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:30 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smart.spec	16 Sep 2006 09:45:00 -0000	1.10
+++ smart.spec	25 Nov 2006 16:30:30 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 38%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
+
 BuildRequires: autoconf, automake, gettext, gcc-c++
 BuildRequires: xorg-x11-devel
 BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,21 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm  - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skytt?? 
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
+* Sat Sep 30 2006 Axel Thimm  - 0.42-39
+- Fix the autofs5 patch.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.42-38
 - Un%%ghost pyo files.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 16:31:00 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 25 Nov 2006 11:31:00 -0500
Subject: rpms/smart/FC-5 distro.py, 1.1, 1.2 smart.desktop, 1.1,
	1.2 smart.spec, 1.9, 1.10
Message-ID: <200611251631.kAPGV06j021708@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/FC-5

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:30 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:30 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smart.spec	16 Sep 2006 09:45:01 -0000	1.9
+++ smart.spec	25 Nov 2006 16:30:30 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 38%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 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
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,21 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm  - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skytt?? 
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
+* Sat Sep 30 2006 Axel Thimm  - 0.42-39
+- Fix the autofs5 patch.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.42-38
 - Un%%ghost pyo files.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 16:31:05 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 25 Nov 2006 11:31:05 -0500
Subject: rpms/smart/FC-6 distro.py, 1.1, 1.2 smart.desktop, 1.1,
	1.2 smart.spec, 1.10, 1.11
Message-ID: <200611251631.kAPGV59C021713@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/FC-6

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-6/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:35 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-6/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:35 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-6/smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smart.spec	30 Sep 2006 09:29:31 -0000	1.10
+++ smart.spec	25 Nov 2006 16:30:35 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 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
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,18 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm  - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skytt?? 
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
 * Sat Sep 30 2006 Axel Thimm  - 0.42-39
 - Fix the autofs5 patch.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 16:31:05 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 25 Nov 2006 11:31:05 -0500
Subject: rpms/smart/devel distro.py, 1.1, 1.2 smart.desktop, 1.1,
	1.2 smart.spec, 1.10, 1.11
Message-ID: <200611251631.kAPGV5ZL021718@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/devel

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:35 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:35 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smart.spec	30 Sep 2006 09:29:31 -0000	1.10
+++ smart.spec	25 Nov 2006 16:30:35 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 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
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,18 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm  - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skytt?? 
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
 * Sat Sep 30 2006 Axel Thimm  - 0.42-39
 - Fix the autofs5 patch.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 16:32:23 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:32:23 -0500
Subject: owners owners.list,1.2007,1.2008
Message-ID: <200611251632.kAPGWN0P021744@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21727

Modified Files:
	owners.list 
Log Message:
Added xerces-c


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2007
retrieving revision 1.2008
diff -u -r1.2007 -r1.2008
--- owners.list	25 Nov 2006 13:01:47 -0000	1.2007
+++ owners.list	25 Nov 2006 16:31:53 -0000	1.2008
@@ -2465,6 +2465,7 @@
 Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xerces-c|Validating XML Parser|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xeuphoric|An oric emulator capable of emulating the full family|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 17:01:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 12:01:18 -0500
Subject: rpms/kile/FC-3 kile.spec,1.18,1.19
Message-ID: <200611251701.kAPH1IdE024975@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21964

Modified Files:
	kile.spec 
Log Message:
+QTLIB workaround for older qt



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kile.spec	25 Nov 2006 16:26:02 -0000	1.18
+++ kile.spec	25 Nov 2006 17:00:47 -0000	1.19
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.3
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -47,6 +47,7 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \



From fedora-extras-commits at redhat.com  Sat Nov 25 17:09:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:09:49 -0500
Subject: rpms/xsp import.log,1.20,1.21
Message-ID: <200611251709.kAPH9nJR025116@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25082

Modified Files:
	import.log 
Log Message:
auto-import xsp-1.2.1-1 on branch devel from xsp-1.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xsp/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import.log	14 Oct 2006 21:43:48 -0000	1.20
+++ import.log	25 Nov 2006 17:09:19 -0000	1.21
@@ -17,3 +17,4 @@
 xsp-1_1_17-1:HEAD:xsp-1.1.17-1.src.rpm:1157061679
 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



From fedora-extras-commits at redhat.com  Sat Nov 25 17:09:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:09:49 -0500
Subject: rpms/xsp/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xsp.spec, 1.12,
	1.13
Message-ID: <200611251709.kAPH9nff025121@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25082/devel

Modified Files:
	.cvsignore sources xsp.spec 
Log Message:
auto-import xsp-1.2.1-1 on branch devel from xsp-1.2.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/.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	25 Nov 2006 17:09:19 -0000	1.8
@@ -1 +1 @@
-xsp-1.1.18.tar.gz
+xsp-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/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	25 Nov 2006 17:09:19 -0000	1.8
@@ -1 +1 @@
-6c39f7cbdc2f7c59f25bedaf5495721a  xsp-1.1.18.tar.gz
+37333caaf4c4570ec76cf0ef9218b402  xsp-1.2.1.tar.gz


Index: xsp.spec
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/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	25 Nov 2006 17:09:19 -0000	1.13
@@ -1,5 +1,5 @@
 Name:     	xsp
-Version: 	1.1.18
+Version: 	1.2.1
 Release:	1%{?dist}
 License:	BSD
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/xsp*
 
 %changelog
+* 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  Sat Nov 25 17:13:52 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 12:13:52 -0500
Subject: rpms/xerces-c/devel xerces-c.spec,1.1,1.2
Message-ID: <200611251713.kAPHDqJR025200@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25183

Modified Files:
	xerces-c.spec 
Log Message:
Typo fix


Index: xerces-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xerces-c/devel/xerces-c.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces-c.spec	25 Nov 2006 16:21:29 -0000	1.1
+++ xerces-c.spec	25 Nov 2006 17:13:22 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Validating XML Parser
 Name: 		xerces-c
 Version: 	2.7.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	Apache Software License
 Group:		System Environment/Libraries
 URL: 		http://xml.apache.org/xerces-c/
@@ -52,7 +52,7 @@
 rm -rf doc/html/resources/.svn
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 find ./samples -type f -perm 755 -exec chmod 644 {} \;
-%{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.inw
+%{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
 
 %build
 export XERCESCROOT="$PWD"
@@ -116,6 +116,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.7.0-6
+- typo fix
+
 * Sat Nov 25 2006 Peter Lemenkov  2.7.0-5
 - fixed some rpmlint warnings
 



From fedora-extras-commits at redhat.com  Sat Nov 25 17:19:25 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 12:19:25 -0500
Subject: owners owners.list,1.2008,1.2009
Message-ID: <200611251719.kAPHJPf6025270@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25251

Modified Files:
	owners.list 
Log Message:
Adding Django



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2008
retrieving revision 1.2009
diff -u -r1.2008 -r1.2009
--- owners.list	25 Nov 2006 16:31:53 -0000	1.2008
+++ owners.list	25 Nov 2006 17:18:55 -0000	1.2009
@@ -316,6 +316,7 @@
 Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dirmngr|Client for Managing/Downloading CRLs|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dirvish|Fast, disk based, rotating network backup system|robert at marcanoonline.com|extras-qa at fedoraproject.org|
+Fedora Extras|Django|A high-level Python Web framework|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com
 Fedora Extras|dnsmasq|A lightweight DHCP/caching DNS server|jima at beer.tclug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 17:22:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:22:16 -0500
Subject: rpms/monodoc import.log,1.25,1.26
Message-ID: <200611251722.kAPHMGMA025320@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25290

Modified Files:
	import.log 
Log Message:
auto-import monodoc-1.2.1-1 on branch devel from monodoc-1.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/monodoc/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- import.log	14 Oct 2006 21:32:39 -0000	1.25
+++ import.log	25 Nov 2006 17:21:45 -0000	1.26
@@ -22,3 +22,4 @@
 monodoc-1_1_17-3:FC-5:monodoc-1.1.17-3.src.rpm:1157584285
 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



From fedora-extras-commits at redhat.com  Sat Nov 25 17:22:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:22:16 -0500
Subject: rpms/monodoc/devel .cvsignore, 1.5, 1.6 monodoc.spec, 1.18,
	1.19 sources, 1.5, 1.6
Message-ID: <200611251722.kAPHMG6R025325@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25290/devel

Modified Files:
	.cvsignore monodoc.spec sources 
Log Message:
auto-import monodoc-1.2.1-1 on branch devel from monodoc-1.2.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2006 21:32:40 -0000	1.5
+++ .cvsignore	25 Nov 2006 17:21:46 -0000	1.6
@@ -1 +1 @@
-monodoc-1.1.18.zip
+monodoc-1.2.1.zip


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- monodoc.spec	14 Oct 2006 22:16:45 -0000	1.18
+++ monodoc.spec	25 Nov 2006 17:21:46 -0000	1.19
@@ -8,8 +8,8 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.1.18
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -61,12 +61,18 @@
 %{monodir}/%{name}/
 %{_bindir}/md*
 %{_bindir}/mo*
+%{_mandir}/man1/md*
+%{_mandir}/man1/monodoc*
 
 %files devel
 %defattr (-, root, root)
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sat Nov 25 2006 Paul F. Johnson  1.2.1-1
+- bump
+- added new manuals
+
 * Sat Oct 14 2006 Paul F. Johnson  1.1.18-2
 - fc5 fix for pkgconfig
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2006 21:32:40 -0000	1.5
+++ sources	25 Nov 2006 17:21:46 -0000	1.6
@@ -1 +1 @@
-71981a3ed2c1eadd9ec0493c4b9f1bf1  monodoc-1.1.18.zip
+19437a8652ee009364abb04b767b65ba  monodoc-1.2.1.zip



From fedora-extras-commits at redhat.com  Sat Nov 25 17:24:43 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:24:43 -0500
Subject: rpms/mod_mono import.log,1.5,1.6
Message-ID: <200611251724.kAPHOhVh025421@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25391

Modified Files:
	import.log 
Log Message:
auto-import mod_mono-1.2.1-1 on branch devel 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	14 Oct 2006 21:36:07 -0000	1.5
+++ import.log	25 Nov 2006 17:24:13 -0000	1.6
@@ -2,3 +2,4 @@
 mod_mono-1_1_17-3:FC-5:mod_mono-1.1.17-3.src.rpm:1157924766
 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



From fedora-extras-commits at redhat.com  Sat Nov 25 17:24:43 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:24:43 -0500
Subject: rpms/mod_mono/devel .cvsignore, 1.3, 1.4 mod_mono.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611251724.kAPHOhT3025426@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25391/devel

Modified Files:
	.cvsignore mod_mono.spec sources 
Log Message:
auto-import mod_mono-1.2.1-1 on branch devel from mod_mono-1.2.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/devel/.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	25 Nov 2006 17:24:13 -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/devel/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	25 Nov 2006 17:24:13 -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/devel/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	25 Nov 2006 17:24:13 -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  Sat Nov 25 18:13:11 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sat, 25 Nov 2006 13:13:11 -0500
Subject: rpms/mlton/FC-6 mlton-20051202-pdf-docs.patch, NONE,
	1.1 mlton-20061107-debuginfo.patch, NONE,
	1.1 mlton-20061107-optflags.patch, NONE, 1.1 mlton.spec, 1.4,
	1.5 mlton-debuginfo.patch, 1.2, NONE mlton-pdf-docs.patch, 1.1, NONE
Message-ID: <200611251813.kAPIDB7b028713@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28689

Modified Files:
	mlton.spec 
Added Files:
	mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch 
	mlton-20061107-optflags.patch 
Removed Files:
	mlton-debuginfo.patch mlton-pdf-docs.patch 
Log Message:
fixes

mlton-20051202-pdf-docs.patch:

--- NEW FILE mlton-20051202-pdf-docs.patch ---
diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
--- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
+++ mlton-20051202/Makefile	2006-06-19 23:26:55.000000000 -0400
@@ -431,8 +431,8 @@
 		; do 							\
 		$(CP) $(SRC)/regression/$$f.sml $(TEXM)/; 		\
 	done
-	$(GZIP) -c $(LEX)/$(LEX).ps >$(TDOC)/$(LEX).ps.gz
-	$(GZIP) -c $(YACC)/$(YACC).ps >$(TDOC)/$(YACC).ps.gz
+	$(CP) $(LEX)/$(LEX).pdf $(TDOC)
+	$(CP) $(YACC)/$(YACC).pdf $(TDOC)
 	find $(TDOC)/ -name .svn -type d | xargs rm -rf
 	find $(TDOC)/ -name .ignore -type f | xargs rm -rf
 	find $(TEXM)/ -name .svn -type d | xargs rm -rf
diff -ur mlton-20051202~/mllex/Makefile mlton-20051202/mllex/Makefile
--- mlton-20051202~/mllex/Makefile	2005-10-11 16:47:54.000000000 -0400
+++ mlton-20051202/mllex/Makefile	2006-06-19 22:39:39.000000000 -0400
@@ -47,7 +47,7 @@
 	../bin/clean
 
 .PHONY: docs
-docs: mllex.ps
+docs: mllex.pdf
 
 .PHONY: test
 test: $(NAME)
diff -ur mlton-20051202~/mlyacc/doc/Makefile mlton-20051202/mlyacc/doc/Makefile
--- mlton-20051202~/mlyacc/doc/Makefile	2005-11-06 15:04:36.000000000 -0500
+++ mlton-20051202/mlyacc/doc/Makefile	2006-06-19 22:47:41.000000000 -0400
@@ -6,7 +6,7 @@
  # See the file MLton-LICENSE for details.
  ##
 
-all: mlyacc.ps
+all: mlyacc.pdf
 
 html/index.html: $(TEX_FILES)
 	mkdir -p html
diff -ur mlton-20051202~/mlyacc/Makefile mlton-20051202/mlyacc/Makefile
--- mlton-20051202~/mlyacc/Makefile	2005-10-11 16:48:34.000000000 -0400
+++ mlton-20051202/mlyacc/Makefile	2006-06-19 22:48:23.000000000 -0400
@@ -38,15 +38,21 @@
 doc/mlyacc.ps:
 	$(MAKE) -C doc mlyacc.ps
 
+doc/mlyacc.pdf:
+	$(MAKE) -C doc mlyacc.pdf
+
 mlyacc.ps: doc/mlyacc.ps
 	cp doc/mlyacc.ps .
 
+mlyacc.pdf: doc/mlyacc.pdf
+	cp doc/mlyacc.pdf .
+
 .PHONY: clean
 clean:
 	../bin/clean
 
 .PHONY: docs
-docs: mlyacc.ps
+docs: mlyacc.pdf
 
 .PHONY: test
 test: $(NAME)

mlton-20061107-debuginfo.patch:

--- NEW FILE mlton-20061107-debuginfo.patch ---
--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
+++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
@@ -411,18 +411,7 @@
 	if $(GZIP_MAN); then						\
 		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
 	fi
-	case "$(TARGET_OS)" in						\
-	aix|cygwin|darwin|solaris)					\
-	;;								\
-	*)								\
-		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
-			$(TBIN)/$(NLFFIGEN)$(EXE) $(TBIN)/$(PROF)$(EXE)	\
-			$(TBIN)/$(YACC)$(EXE); do			\
-			strip --remove-section=.comment			\
-				--remove-section=.note $$f; 		\
-		done							\
-	esac
 
 .PHONY: install-docs
 install-docs:

mlton-20061107-optflags.patch:

--- NEW FILE mlton-20061107-optflags.patch ---
diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/bytecode/Makefile	2006-11-18 12:27:39.000000000 -0500
@@ -10,8 +10,9 @@
 all: interpret.o interpret-gdb.o print-opcodes
 
 CC = gcc -std=gnu99
-CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
-DEBUGFLAGS = $(CFLAGS)
+OPTFLAGS = -fomit-frame-pointer
+DEBUGFLAGS = -fomit-frame-pointer
+CFLAGS = -I../runtime -I../include -Wall
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)
 DEBUGFLAGS += -gstabs+
@@ -20,21 +21,23 @@
 DEBUGFLAGS += -g2
 
 ifeq ($(TARGET_ARCH), amd64)
-CFLAGS += -mtune=opteron -m32 
-endif 
+OPTFLAGS += -mtune=opteron
+CFLAGS += -m32
+endif
 
 ifeq ($(TARGET_OS), freebsd)
 CFLAGS += -I/usr/local/include
 endif
 
 interpret.o: interpret.c interpret.h opcode.h
-	$(CC) $(CFLAGS) -c -O2 interpret.c
+	$(CC) $(CFLAGS) -c -O2 $(OPTFLAGS) interpret.c
 
 interpret-gdb.o: interpret.c interpret.h
-	$(CC) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
+	$(CC) $(CFLAGS) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
 
 print-opcodes: print-opcodes.c opcode.h
-	$(CC) $(CFLAGS) -o print-opcodes -I../runtime -L../runtime	\
+	$(CC) $(CFLAGS) $(OPTFLAGS) -o print-opcodes \
+		-I../runtime -L../runtime	\
 		print-opcodes.c -lmlton
 
 .PHONY: clean
diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/runtime/Makefile	2006-11-18 12:29:40.000000000 -0500
@@ -13,22 +13,25 @@
 TARGET_OS = $(shell ../bin/host-os)
 GCC_VERSION = $(shell gcc -v 2>&1 | grep 'gcc version' | sed 's/.*gcc version \(.\).*/\1/')
 
-FLAGS = -fomit-frame-pointer
+OPTFLAGS = -fomit-frame-pointer
+FLAGS =
 
 ifeq ($(TARGET_ARCH), x86)
 ifneq ($(findstring $(GCC_VERSION), 3 4),)
-FLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
+OPTFLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
 else
-FLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
+OPTFLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
 endif
 endif
 
 ifeq ($(TARGET_ARCH), amd64)
-FLAGS += -mtune=opteron -m32
+OPTFLAGS += -mtune=opteron
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_ARCH), sparc)
-FLAGS += -mcpu=v8 -m32
+OPTFLAGS += -mcpu=v8
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_OS), freebsd)
@@ -36,7 +39,7 @@
 endif
 
 ifeq ($(TARGET_OS), solaris)
-FLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
+OPTFLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
 endif
 
 ifeq ($(TARGET), self)
@@ -49,7 +52,7 @@
 endif
 
 CC = gcc -std=gnu99
-CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
+CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS) $(OPTFLAGS)
 DEBUGFLAGS = $(CFLAGS)
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/mlton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mlton.spec	16 Nov 2006 06:26:14 -0000	1.4
+++ mlton.spec	25 Nov 2006 18:12:41 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		mlton
 Version:	20061107
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -15,8 +15,9 @@
 Source2:	mlton-bootstrap.ppc.tar.bz2
 %endif
 
-Patch0:		mlton-pdf-docs.patch
-Patch1:		mlton-debuginfo.patch
+Patch0:		mlton-20051202-pdf-docs.patch
+Patch1:		mlton-20061107-debuginfo.patch
+Patch2:		mlton-20061107-optflags.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +46,14 @@
 %setup -q
 
 # instantiate version numbers
-make version
+make version VERSION=%{version}
 
 # build documentation as PDF
-%patch -P 0 -p1
-# enable -g and disable strip so debuginfo packages work
-%patch -P 1 -p1
+%patch -P 0 -p1 -b .pdf-docs
+# disable strip so debuginfo packages work
+%patch -P 1 -p1 -b .debuginfo
+# enable RPM_OPT_FLAGS
+%patch -P 2 -p1 -b .optflags
 
 # set correct version of PDF guide until this is fixed upstream
 sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
@@ -73,7 +76,7 @@
 export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
 %endif
 
-make
+make OPTFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -102,7 +105,13 @@
 %{_libdir}/mlton
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Nov 24 2006 Adam Goode  - 20061107-2
+- Use RPM_OPT_FLAGS
+- Correctly instantiate version
+- Adjust patches
+
 * Sun Nov 12 2006 Adam Goode  - 20061107-1
 - New release, taken from svn://mlton.org/mlton/tags/on-20061107
 


--- mlton-debuginfo.patch DELETED ---


--- mlton-pdf-docs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 19:12:33 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sat, 25 Nov 2006 14:12:33 -0500
Subject: rpms/mlton/FC-5 mlton-20051202-pdf-docs.patch, NONE,
	1.1 mlton-20061107-debuginfo.patch, NONE,
	1.1 mlton-20061107-optflags.patch, NONE, 1.1 mlton.spec, 1.3,
	1.4 mlton-debuginfo.patch, 1.2, NONE mlton-pdf-docs.patch, 1.1, NONE
Message-ID: <200611251912.kAPJCXsx032016@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31992

Modified Files:
	mlton.spec 
Added Files:
	mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch 
	mlton-20061107-optflags.patch 
Removed Files:
	mlton-debuginfo.patch mlton-pdf-docs.patch 
Log Message:
fixes

mlton-20051202-pdf-docs.patch:

--- NEW FILE mlton-20051202-pdf-docs.patch ---
diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
--- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
+++ mlton-20051202/Makefile	2006-06-19 23:26:55.000000000 -0400
@@ -431,8 +431,8 @@
 		; do 							\
 		$(CP) $(SRC)/regression/$$f.sml $(TEXM)/; 		\
 	done
-	$(GZIP) -c $(LEX)/$(LEX).ps >$(TDOC)/$(LEX).ps.gz
-	$(GZIP) -c $(YACC)/$(YACC).ps >$(TDOC)/$(YACC).ps.gz
+	$(CP) $(LEX)/$(LEX).pdf $(TDOC)
+	$(CP) $(YACC)/$(YACC).pdf $(TDOC)
 	find $(TDOC)/ -name .svn -type d | xargs rm -rf
 	find $(TDOC)/ -name .ignore -type f | xargs rm -rf
 	find $(TEXM)/ -name .svn -type d | xargs rm -rf
diff -ur mlton-20051202~/mllex/Makefile mlton-20051202/mllex/Makefile
--- mlton-20051202~/mllex/Makefile	2005-10-11 16:47:54.000000000 -0400
+++ mlton-20051202/mllex/Makefile	2006-06-19 22:39:39.000000000 -0400
@@ -47,7 +47,7 @@
 	../bin/clean
 
 .PHONY: docs
-docs: mllex.ps
+docs: mllex.pdf
 
 .PHONY: test
 test: $(NAME)
diff -ur mlton-20051202~/mlyacc/doc/Makefile mlton-20051202/mlyacc/doc/Makefile
--- mlton-20051202~/mlyacc/doc/Makefile	2005-11-06 15:04:36.000000000 -0500
+++ mlton-20051202/mlyacc/doc/Makefile	2006-06-19 22:47:41.000000000 -0400
@@ -6,7 +6,7 @@
  # See the file MLton-LICENSE for details.
  ##
 
-all: mlyacc.ps
+all: mlyacc.pdf
 
 html/index.html: $(TEX_FILES)
 	mkdir -p html
diff -ur mlton-20051202~/mlyacc/Makefile mlton-20051202/mlyacc/Makefile
--- mlton-20051202~/mlyacc/Makefile	2005-10-11 16:48:34.000000000 -0400
+++ mlton-20051202/mlyacc/Makefile	2006-06-19 22:48:23.000000000 -0400
@@ -38,15 +38,21 @@
 doc/mlyacc.ps:
 	$(MAKE) -C doc mlyacc.ps
 
+doc/mlyacc.pdf:
+	$(MAKE) -C doc mlyacc.pdf
+
 mlyacc.ps: doc/mlyacc.ps
 	cp doc/mlyacc.ps .
 
+mlyacc.pdf: doc/mlyacc.pdf
+	cp doc/mlyacc.pdf .
+
 .PHONY: clean
 clean:
 	../bin/clean
 
 .PHONY: docs
-docs: mlyacc.ps
+docs: mlyacc.pdf
 
 .PHONY: test
 test: $(NAME)

mlton-20061107-debuginfo.patch:

--- NEW FILE mlton-20061107-debuginfo.patch ---
--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
+++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
@@ -411,18 +411,7 @@
 	if $(GZIP_MAN); then						\
 		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
 	fi
-	case "$(TARGET_OS)" in						\
-	aix|cygwin|darwin|solaris)					\
-	;;								\
-	*)								\
-		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
-			$(TBIN)/$(NLFFIGEN)$(EXE) $(TBIN)/$(PROF)$(EXE)	\
-			$(TBIN)/$(YACC)$(EXE); do			\
-			strip --remove-section=.comment			\
-				--remove-section=.note $$f; 		\
-		done							\
-	esac
 
 .PHONY: install-docs
 install-docs:

mlton-20061107-optflags.patch:

--- NEW FILE mlton-20061107-optflags.patch ---
diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/bytecode/Makefile	2006-11-18 12:27:39.000000000 -0500
@@ -10,8 +10,9 @@
 all: interpret.o interpret-gdb.o print-opcodes
 
 CC = gcc -std=gnu99
-CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
-DEBUGFLAGS = $(CFLAGS)
+OPTFLAGS = -fomit-frame-pointer
+DEBUGFLAGS = -fomit-frame-pointer
+CFLAGS = -I../runtime -I../include -Wall
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)
 DEBUGFLAGS += -gstabs+
@@ -20,21 +21,23 @@
 DEBUGFLAGS += -g2
 
 ifeq ($(TARGET_ARCH), amd64)
-CFLAGS += -mtune=opteron -m32 
-endif 
+OPTFLAGS += -mtune=opteron
+CFLAGS += -m32
+endif
 
 ifeq ($(TARGET_OS), freebsd)
 CFLAGS += -I/usr/local/include
 endif
 
 interpret.o: interpret.c interpret.h opcode.h
-	$(CC) $(CFLAGS) -c -O2 interpret.c
+	$(CC) $(CFLAGS) -c -O2 $(OPTFLAGS) interpret.c
 
 interpret-gdb.o: interpret.c interpret.h
-	$(CC) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
+	$(CC) $(CFLAGS) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
 
 print-opcodes: print-opcodes.c opcode.h
-	$(CC) $(CFLAGS) -o print-opcodes -I../runtime -L../runtime	\
+	$(CC) $(CFLAGS) $(OPTFLAGS) -o print-opcodes \
+		-I../runtime -L../runtime	\
 		print-opcodes.c -lmlton
 
 .PHONY: clean
diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/runtime/Makefile	2006-11-18 12:29:40.000000000 -0500
@@ -13,22 +13,25 @@
 TARGET_OS = $(shell ../bin/host-os)
 GCC_VERSION = $(shell gcc -v 2>&1 | grep 'gcc version' | sed 's/.*gcc version \(.\).*/\1/')
 
-FLAGS = -fomit-frame-pointer
+OPTFLAGS = -fomit-frame-pointer
+FLAGS =
 
 ifeq ($(TARGET_ARCH), x86)
 ifneq ($(findstring $(GCC_VERSION), 3 4),)
-FLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
+OPTFLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
 else
-FLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
+OPTFLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
 endif
 endif
 
 ifeq ($(TARGET_ARCH), amd64)
-FLAGS += -mtune=opteron -m32
+OPTFLAGS += -mtune=opteron
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_ARCH), sparc)
-FLAGS += -mcpu=v8 -m32
+OPTFLAGS += -mcpu=v8
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_OS), freebsd)
@@ -36,7 +39,7 @@
 endif
 
 ifeq ($(TARGET_OS), solaris)
-FLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
+OPTFLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
 endif
 
 ifeq ($(TARGET), self)
@@ -49,7 +52,7 @@
 endif
 
 CC = gcc -std=gnu99
-CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
+CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS) $(OPTFLAGS)
 DEBUGFLAGS = $(CFLAGS)
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/mlton.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlton.spec	17 Nov 2006 00:27:22 -0000	1.3
+++ mlton.spec	25 Nov 2006 19:12:03 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		mlton
 Version:	20061107
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -15,8 +15,9 @@
 Source2:	mlton-bootstrap.ppc.tar.bz2
 %endif
 
-Patch0:		mlton-pdf-docs.patch
-Patch1:		mlton-debuginfo.patch
+Patch0:		mlton-20051202-pdf-docs.patch
+Patch1:		mlton-20061107-debuginfo.patch
+Patch2:		mlton-20061107-optflags.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +46,14 @@
 %setup -q
 
 # instantiate version numbers
-make version
+make version VERSION=%{version}
 
 # build documentation as PDF
-%patch -P 0 -p1
-# enable -g and disable strip so debuginfo packages work
-%patch -P 1 -p1
+%patch -P 0 -p1 -b .pdf-docs
+# disable strip so debuginfo packages work
+%patch -P 1 -p1 -b .debuginfo
+# enable RPM_OPT_FLAGS
+%patch -P 2 -p1 -b .optflags
 
 # set correct version of PDF guide until this is fixed upstream
 sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
@@ -73,7 +76,7 @@
 export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
 %endif
 
-make
+make OPTFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -102,7 +105,13 @@
 %{_libdir}/mlton
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Nov 24 2006 Adam Goode  - 20061107-2
+- Use RPM_OPT_FLAGS
+- Correctly instantiate version
+- Adjust patches
+
 * Sun Nov 12 2006 Adam Goode  - 20061107-1
 - New release, taken from svn://mlton.org/mlton/tags/on-20061107
 


--- mlton-debuginfo.patch DELETED ---


--- mlton-pdf-docs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 19:41:11 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:41:11 -0500
Subject: rpms/python-alsaaudio - New directory
Message-ID: <200611251941.kAPJfBXk032303@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/python-alsaaudio

Log Message:
Directory /cvs/extras/rpms/python-alsaaudio added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 19:41:17 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:41:17 -0500
Subject: rpms/python-alsaaudio/devel - New directory
Message-ID: <200611251941.kAPJfHFR032319@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/python-alsaaudio/devel

Log Message:
Directory /cvs/extras/rpms/python-alsaaudio/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 19:41:28 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:41:28 -0500
Subject: rpms/python-alsaaudio Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611251941.kAPJfSKl032349@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32343

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-alsaaudio


--- NEW FILE Makefile ---
# Top level Makefile for module python-alsaaudio
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  Sat Nov 25 19:41:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:41:34 -0500
Subject: rpms/python-alsaaudio/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611251941.kAPJfYlj032367@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32343/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-alsaaudio


--- 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  Sat Nov 25 19:42:25 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:42:25 -0500
Subject: rpms/python-alsaaudio import.log,1.1,1.2
Message-ID: <200611251942.kAPJgPxj032445@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32409

Modified Files:
	import.log 
Log Message:
auto-import python-alsaaudio-0.2-1 on branch devel from python-alsaaudio-0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-alsaaudio/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 19:41:28 -0000	1.1
+++ import.log	25 Nov 2006 19:41:55 -0000	1.2
@@ -0,0 +1 @@
+python-alsaaudio-0_2-1:HEAD:python-alsaaudio-0.2-1.src.rpm:1164483788



From fedora-extras-commits at redhat.com  Sat Nov 25 19:42:25 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:42:25 -0500
Subject: rpms/python-alsaaudio/devel python-alsaaudio.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611251942.kAPJgPa4032449@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32409/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-alsaaudio.spec 
Log Message:
auto-import python-alsaaudio-0.2-1 on branch devel from python-alsaaudio-0.2-1.src.rpm


--- NEW FILE python-alsaaudio.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		python-alsaaudio
Version:	0.2
Release:	1%{?dist}
Summary:	Python Alsa Bindings

Group:		Development/Languages
License:	PSF - see LICENSE
URL:		http://sourceforge.net/projects/pyalsaaudio
Source0:	http://download.sourceforge.net/pyalsaaudio/pyalsaaudio-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python-devel
BuildRequires:	alsa-lib-devel


%description
The Python-AlsaAudio package contains bindings for the ALSA sound API.


%prep
%setup -q -n pyalsaaudio-%{version}


%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

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE 
%{python_sitearch}/*


%changelog
* Thu Nov  2 2006 Brian Pepple  - 0.2-1
- Initial FE spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-alsaaudio/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 19:41:34 -0000	1.1
+++ .cvsignore	25 Nov 2006 19:41:55 -0000	1.2
@@ -0,0 +1 @@
+pyalsaaudio-0.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-alsaaudio/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 19:41:34 -0000	1.1
+++ sources	25 Nov 2006 19:41:55 -0000	1.2
@@ -0,0 +1 @@
+23163f572f8f3a0b295f48f90165e767  pyalsaaudio-0.2.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 19:45:29 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:45:29 -0500
Subject: owners owners.list,1.2009,1.2010
Message-ID: <200611251945.kAPJjTrd032529@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32514

Modified Files:
	owners.list 
Log Message:
add python-alsaaudio


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2009
retrieving revision 1.2010
diff -u -r1.2009 -r1.2010
--- owners.list	25 Nov 2006 17:18:55 -0000	1.2009
+++ owners.list	25 Nov 2006 19:44:59 -0000	1.2010
@@ -1935,6 +1935,7 @@
 Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|rvokal at redhat.com|extras-qa at fedoraproject.org|byte at fedoraproject.org
+Fedora Extras|python-alsaaudio|Python Alsa Bindings|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|jamatos at fc.up.pt|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|python-basemap|Plots data on map projections (with continental and political boundaries)|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-basemap-data|Data for python-basemap|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 20:35:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 15:35:11 -0500
Subject: rpms/kile/FC-3 kile.spec,1.19,1.20
Message-ID: <200611252035.kAPKZBL3003298@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3278

Modified Files:
	kile.spec 
Log Message:
respin for previous seemingly borked build



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kile.spec	25 Nov 2006 17:00:47 -0000	1.19
+++ kile.spec	25 Nov 2006 20:34:41 -0000	1.20
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.3
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 
 License: GPL
 Group: 	 Applications/Publishing



From fedora-extras-commits at redhat.com  Sat Nov 25 20:51:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 15:51:43 -0500
Subject: rpms/quarry/devel .cvsignore, 1.4, 1.5 quarry.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200611252051.kAPKphEp003429@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3409

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
Update -devel to 0.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Nov 2006 02:36:37 -0000	1.4
+++ .cvsignore	25 Nov 2006 20:51:13 -0000	1.5
@@ -1 +1 @@
-quarry-0.1.20.tar.gz
+quarry-0.2.0.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quarry.spec	1 Nov 2006 02:36:37 -0000	1.5
+++ quarry.spec	25 Nov 2006 20:51:13 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           quarry
-Version:        0.1.20
+Version:        0.2.0
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
@@ -38,7 +38,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
@@ -64,12 +63,14 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime/packages/quarry.xml
 %{_datadir}/pixmaps/quarry.png
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Nov 19 2006 Michel Salim  - 0.2.0-1
+- Update to 0.2.0, first stable version
+
 * Tue Oct 31 2006 Michel Salim  - 0.1.20-1
 - Update to 0.1.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Nov 2006 02:36:37 -0000	1.4
+++ sources	25 Nov 2006 20:51:13 -0000	1.5
@@ -1 +1 @@
-c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz
+388b47fbf8fcfcca6e1ad6dd821bfcee  quarry-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 20:58:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:58:13 -0500
Subject: rpms/arrows - New directory
Message-ID: <200611252058.kAPKwDIe003520@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3515/arrows

Log Message:
Directory /cvs/extras/rpms/arrows added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 20:58:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:58:18 -0500
Subject: rpms/arrows/devel - New directory
Message-ID: <200611252058.kAPKwIcD003535@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3515/arrows/devel

Log Message:
Directory /cvs/extras/rpms/arrows/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 20:58:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:58:35 -0500
Subject: rpms/arrows Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252058.kAPKwZ9O003566@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3560

Added Files:
	Makefile import.log 
Log Message:
Setup of module arrows


--- NEW FILE Makefile ---
# Top level Makefile for module arrows
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  Sat Nov 25 20:58:40 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:58:40 -0500
Subject: rpms/arrows/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611252058.kAPKweKM003582@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3560/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module arrows


--- 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  Sat Nov 25 20:59:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:59:50 -0500
Subject: rpms/arrows import.log,1.1,1.2
Message-ID: <200611252059.kAPKxogq003678@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3637

Modified Files:
	import.log 
Log Message:
auto-import arrows-0.6-2.fc7 on branch devel from arrows-0.6-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/arrows/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 20:58:35 -0000	1.1
+++ import.log	25 Nov 2006 20:59:20 -0000	1.2
@@ -0,0 +1 @@
+arrows-0_6-2_fc7:HEAD:arrows-0.6-2.fc7.src.rpm:1164489205



From fedora-extras-commits at redhat.com  Sat Nov 25 20:59:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:59:51 -0500
Subject: rpms/arrows/devel arrows.desktop, NONE, 1.1 arrows.png, NONE,
	1.1 arrows.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252059.kAPKxpQu003683@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3637/devel

Modified Files:
	.cvsignore sources 
Added Files:
	arrows.desktop arrows.png arrows.spec 
Log Message:
auto-import arrows-0.6-2.fc7 on branch devel from arrows-0.6-2.fc7.src.rpm


--- NEW FILE arrows.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Arrows
Comment=Follow the arrows to reach the exit
Exec=arrows
Icon=arrows.png
Terminal=false
Type=Application
Categories=Game;LogicGame;


--- NEW FILE arrows.spec ---
Name:           arrows
Version:        0.6
Release:        2%{?dist}
Summary:        Neat little maze game
Group:          Amusements/Games
License:        GPL
URL:            http://noreason.ca/?file=software
Source0:        http://noreason.ca/data/arrows-%{version}.tar.gz
Source1:        arrows.desktop
Source2:        arrows.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel desktop-file-utils
Requires:       hicolor-icon-theme

%description
It's a maze game of sorts. Guide the spinning blue thing through
the maze of arrows, creating and destroying arrows as necessary
to collect the green things.


%prep
%setup -q
make clean


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}

# 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/24x24/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/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 LICENSE README
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png


%changelog
* Sat Nov 25 2006 Hans de Goede  0.6-2
- Add Requires hicolor-icon-theme, drop GNOME from desktop catagories
  (bz 217239)

* Sat Nov 25 2006 Hans de Goede  0.6-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/arrows/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 20:58:40 -0000	1.1
+++ .cvsignore	25 Nov 2006 20:59:20 -0000	1.2
@@ -0,0 +1 @@
+arrows-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/arrows/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 20:58:40 -0000	1.1
+++ sources	25 Nov 2006 20:59:20 -0000	1.2
@@ -0,0 +1 @@
+d6cf52ff319c295b9fb6982c023ec7f0  arrows-0.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:02:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 16:02:01 -0500
Subject: owners owners.list,1.2010,1.2011
Message-ID: <200611252102.kAPL21Qd006780@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6763

Modified Files:
	owners.list 
Log Message:
added arrows


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2010
retrieving revision 1.2011
diff -u -r1.2010 -r1.2011
--- owners.list	25 Nov 2006 19:44:59 -0000	1.2010
+++ owners.list	25 Nov 2006 21:01:31 -0000	1.2011
@@ -70,6 +70,7 @@
 Fedora Extras|ardour|Multichannel Digital Audio Workstation|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|arj|Archiver for .arj files|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|arrows|Neat little maze game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|tcallawa at redhat.com|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 21:07:43 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 25 Nov 2006 16:07:43 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.18,1.19
Message-ID: <200611252107.kAPL7h1e006822@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6807

Modified Files:
	Push.py 
Log Message:
skip bad rpms and improve status output in such an error condition


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Push.py	24 Nov 2006 22:22:46 -0000	1.18
+++ Push.py	25 Nov 2006 21:07:43 -0000	1.19
@@ -234,7 +234,11 @@
 def naevr(pkg):
     """return nevra from the package srpm"""
 
-    hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg)
+    try:
+        hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg)
+    except rpmUtils.RpmUtilsError:
+        print 'WARNING: %s is BAD' % pkg
+        raise
     name = hdr['name']
     ver = hdr['version']
     rel = hdr['release']
@@ -506,8 +510,11 @@
                     targetroot = destroot
                 try:
                     push(dist,needsignroot,targetroot,name,pkgrelroot,buildreport)
+                # TODO: report these via mail (or so)
                 except PushWarning, e:
                     print e
+                except rpmUtils.RpmUtilsError, e:
+                    print e
     except:
         shutil.rmtree(signtmpdir)
         raise



From fedora-extras-commits at redhat.com  Sat Nov 25 21:12:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 16:12:32 -0500
Subject: comps comps-fe7.xml.in,1.29,1.30
Message-ID: <200611252112.kAPLCWiA006893@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6868

Modified Files:
	comps-fe7.xml.in 
Log Message:
add arrows


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- comps-fe7.xml.in	23 Nov 2006 19:09:47 -0000	1.29
+++ comps-fe7.xml.in	25 Nov 2006 21:12:02 -0000	1.30
@@ -356,6 +356,7 @@
       abe
       abuse
       alex4
+      arrows
       atomix
       auriferous
       ballbuster



From fedora-extras-commits at redhat.com  Sat Nov 25 21:14:36 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:14:36 -0500
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-4 .cvsignore, 1.3,
	1.4 perl-Log-Dispatch-FileRotate.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252114.kAPLEa32006991@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/FC-4

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 23:32:45 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:14:06 -0000	1.4
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.15.tar.gz
+Log-Dispatch-FileRotate-1.16.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:32:45 -0000	1.2
+++ perl-Log-Dispatch-FileRotate.spec	25 Nov 2006 21:14:06 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.16-1
+- Update to 1.16.
+
 * Wed Apr 26 2006 Jose Pedro Oliveira  - 1.15-1
 - Update to 1.15.
 - The author corrected the licensing terms (License: GPL or Artistic).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 23:32:45 -0000	1.3
+++ sources	25 Nov 2006 21:14:06 -0000	1.4
@@ -1 +1 @@
-96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz
+3cd1d75510a6297df487ca016763bdbe  Log-Dispatch-FileRotate-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:14:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:14:37 -0500
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-5 .cvsignore, 1.3,
	1.4 perl-Log-Dispatch-FileRotate.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252114.kAPLEbM0006996@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/FC-5

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 23:33:10 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:14:07 -0000	1.4
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.15.tar.gz
+Log-Dispatch-FileRotate-1.16.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:10 -0000	1.2
+++ perl-Log-Dispatch-FileRotate.spec	25 Nov 2006 21:14:07 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.16-1
+- Update to 1.16.
+
 * Wed Apr 26 2006 Jose Pedro Oliveira  - 1.15-1
 - Update to 1.15.
 - The author corrected the licensing terms (License: GPL or Artistic).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 23:33:10 -0000	1.3
+++ sources	25 Nov 2006 21:14:07 -0000	1.4
@@ -1 +1 @@
-96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz
+3cd1d75510a6297df487ca016763bdbe  Log-Dispatch-FileRotate-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:14:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:14:42 -0500
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-6 .cvsignore, 1.3,
	1.4 perl-Log-Dispatch-FileRotate.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252114.kAPLEgY9007001@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/FC-6

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 23:33:11 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:14:12 -0000	1.4
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.15.tar.gz
+Log-Dispatch-FileRotate-1.16.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-6/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:11 -0000	1.2
+++ perl-Log-Dispatch-FileRotate.spec	25 Nov 2006 21:14:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.16-1
+- Update to 1.16.
+
 * Wed Apr 26 2006 Jose Pedro Oliveira  - 1.15-1
 - Update to 1.15.
 - The author corrected the licensing terms (License: GPL or Artistic).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 23:33:11 -0000	1.3
+++ sources	25 Nov 2006 21:14:12 -0000	1.4
@@ -1 +1 @@
-96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz
+3cd1d75510a6297df487ca016763bdbe  Log-Dispatch-FileRotate-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:14:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:14:42 -0500
Subject: rpms/perl-Log-Dispatch-FileRotate/devel .cvsignore, 1.3,
	1.4 perl-Log-Dispatch-FileRotate.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252114.kAPLEggF007006@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/devel

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 23:33:11 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:14:12 -0000	1.4
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.15.tar.gz
+Log-Dispatch-FileRotate-1.16.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:11 -0000	1.2
+++ perl-Log-Dispatch-FileRotate.spec	25 Nov 2006 21:14:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.16-1
+- Update to 1.16.
+
 * Wed Apr 26 2006 Jose Pedro Oliveira  - 1.15-1
 - Update to 1.15.
 - The author corrected the licensing terms (License: GPL or Artistic).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 23:33:11 -0000	1.3
+++ sources	25 Nov 2006 21:14:12 -0000	1.4
@@ -1 +1 @@
-96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz
+3cd1d75510a6297df487ca016763bdbe  Log-Dispatch-FileRotate-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:24:30 -0500
Subject: rpms/perl-Log-Log4perl/FC-4 .cvsignore, 1.5,
	1.6 perl-Log-Log4perl.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611252124.kAPLOUgo007316@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7219/FC-4

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jul 2006 15:53:56 -0000	1.5
+++ .cvsignore	25 Nov 2006 21:24:00 -0000	1.6
@@ -1 +1 @@
-Log-Log4perl-1.06.tar.gz
+Log-Log4perl-1.08.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/perl-Log-Log4perl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Log-Log4perl.spec	21 Jul 2006 15:53:56 -0000	1.6
+++ perl-Log-Log4perl.spec	25 Nov 2006 21:24:00 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.06
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -33,9 +33,9 @@
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
 %patch1 -p1
-find lib -name "*.pm" -exec chmod a-x {} ';'
+find lib -name "*.pm" -exec chmod -c a-x {} ';'
 %{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod a-x eg/* 
+chmod -c a-x eg/* 
 
 
 %build
@@ -67,6 +67,12 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
+* Sat Oct 21 2006 Jose Pedro Oliveira  - 1.07-1
+- Update to 1.07.
+
 * Fri Jul 21 2006 Jose Pedro Oliveira  - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jul 2006 15:53:56 -0000	1.5
+++ sources	25 Nov 2006 21:24:00 -0000	1.6
@@ -1 +1 @@
-a7bda690ec0ad0bed457fa525e28034a  Log-Log4perl-1.06.tar.gz
+54fa5628deac4130f34208e4cb18328b  Log-Log4perl-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 16:24:34 -0500
Subject: rpms/quarry/FC-5 .cvsignore, 1.4, 1.5 quarry.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200611252124.kAPLOYbX007326@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7210/FC-5

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
0.2.0 update for FC-5 and -6 as well



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Nov 2006 02:36:31 -0000	1.4
+++ .cvsignore	25 Nov 2006 21:24:03 -0000	1.5
@@ -1 +1 @@
-quarry-0.1.20.tar.gz
+quarry-0.2.0.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/quarry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quarry.spec	1 Nov 2006 02:36:31 -0000	1.5
+++ quarry.spec	25 Nov 2006 21:24:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           quarry
-Version:        0.1.20
+Version:        0.2.0
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
@@ -38,7 +38,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
@@ -64,12 +63,14 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime/packages/quarry.xml
 %{_datadir}/pixmaps/quarry.png
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Nov 19 2006 Michel Salim  - 0.2.0-1
+- Update to 0.2.0, first stable version
+
 * Tue Oct 31 2006 Michel Salim  - 0.1.20-1
 - Update to 0.1.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Nov 2006 02:36:31 -0000	1.4
+++ sources	25 Nov 2006 21:24:03 -0000	1.5
@@ -1 +1 @@
-c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz
+388b47fbf8fcfcca6e1ad6dd821bfcee  quarry-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:24:35 -0500
Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.6,
	1.7 perl-Log-Log4perl.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200611252124.kAPLOZ0x007339@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-serv7219/devel

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
+++ .cvsignore	25 Nov 2006 21:24:05 -0000	1.7
@@ -1 +1 @@
-Log-Log4perl-1.07.tar.gz
+Log-Log4perl-1.08.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
+++ perl-Log-Log4perl.spec	25 Nov 2006 21:24:05 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 1.07-1
 - Update to 1.07.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2006 14:30:38 -0000	1.6
+++ sources	25 Nov 2006 21:24:05 -0000	1.7
@@ -1 +1 @@
-dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz
+54fa5628deac4130f34208e4cb18328b  Log-Log4perl-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 16:24:34 -0500
Subject: rpms/quarry/FC-6 .cvsignore, 1.4, 1.5 quarry.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200611252124.kAPLOYUN007331@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7210/FC-6

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
0.2.0 update for FC-5 and -6 as well



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Nov 2006 02:36:31 -0000	1.4
+++ .cvsignore	25 Nov 2006 21:24:04 -0000	1.5
@@ -1 +1 @@
-quarry-0.1.20.tar.gz
+quarry-0.2.0.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/quarry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quarry.spec	1 Nov 2006 02:36:31 -0000	1.5
+++ quarry.spec	25 Nov 2006 21:24:04 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           quarry
-Version:        0.1.20
+Version:        0.2.0
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
@@ -38,7 +38,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
@@ -64,12 +63,14 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime/packages/quarry.xml
 %{_datadir}/pixmaps/quarry.png
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Nov 19 2006 Michel Salim  - 0.2.0-1
+- Update to 0.2.0, first stable version
+
 * Tue Oct 31 2006 Michel Salim  - 0.1.20-1
 - Update to 0.1.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Nov 2006 02:36:31 -0000	1.4
+++ sources	25 Nov 2006 21:24:04 -0000	1.5
@@ -1 +1 @@
-c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz
+388b47fbf8fcfcca6e1ad6dd821bfcee  quarry-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:24:30 -0500
Subject: rpms/perl-Log-Log4perl/FC-5 .cvsignore, 1.6,
	1.7 perl-Log-Log4perl.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200611252124.kAPLOUnX007321@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-serv7219/FC-5

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
+++ .cvsignore	25 Nov 2006 21:24:00 -0000	1.7
@@ -1 +1 @@
-Log-Log4perl-1.07.tar.gz
+Log-Log4perl-1.08.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
+++ perl-Log-Log4perl.spec	25 Nov 2006 21:24:00 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 1.07-1
 - Update to 1.07.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2006 14:30:38 -0000	1.6
+++ sources	25 Nov 2006 21:24:00 -0000	1.7
@@ -1 +1 @@
-dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz
+54fa5628deac4130f34208e4cb18328b  Log-Log4perl-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:24:35 -0500
Subject: rpms/perl-Log-Log4perl/FC-6 .cvsignore, 1.6,
	1.7 perl-Log-Log4perl.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200611252124.kAPLOZo6007334@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-serv7219/FC-6

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
+++ .cvsignore	25 Nov 2006 21:24:05 -0000	1.7
@@ -1 +1 @@
-Log-Log4perl-1.07.tar.gz
+Log-Log4perl-1.08.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
+++ perl-Log-Log4perl.spec	25 Nov 2006 21:24:05 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 1.07-1
 - Update to 1.07.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2006 14:30:38 -0000	1.6
+++ sources	25 Nov 2006 21:24:05 -0000	1.7
@@ -1 +1 @@
-dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz
+54fa5628deac4130f34208e4cb18328b  Log-Log4perl-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:37:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:37:37 -0500
Subject: rpms/perl-Email-Address/FC-5 .cvsignore, 1.8,
	1.9 perl-Email-Address.spec, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <200611252137.kAPLbbCV007698@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7644/FC-5

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.883.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Nov 2006 14:01:17 -0000	1.8
+++ .cvsignore	25 Nov 2006 21:37:07 -0000	1.9
@@ -1 +1 @@
-Email-Address-1.882.tar.gz
+Email-Address-1.883.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/perl-Email-Address.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Email-Address.spec	22 Nov 2006 14:01:17 -0000	1.7
+++ perl-Email-Address.spec	25 Nov 2006 21:37:07 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.882
+Version:        1.883
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.883-1
+- Update to 1.883.
+
 * Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
 - Update to 1.882.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Nov 2006 14:01:17 -0000	1.8
+++ sources	25 Nov 2006 21:37:07 -0000	1.9
@@ -1 +1 @@
-1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz
+7de141ff7c159851e60776e2dcc43e99  Email-Address-1.883.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:37:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:37:43 -0500
Subject: rpms/perl-Email-Address/devel .cvsignore, 1.8,
	1.9 perl-Email-Address.spec, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <200611252137.kAPLbhMV007708@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7644/devel

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.883.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Nov 2006 14:01:22 -0000	1.8
+++ .cvsignore	25 Nov 2006 21:37:13 -0000	1.9
@@ -1 +1 @@
-Email-Address-1.882.tar.gz
+Email-Address-1.883.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Email-Address.spec	22 Nov 2006 14:01:22 -0000	1.7
+++ perl-Email-Address.spec	25 Nov 2006 21:37:13 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.882
+Version:        1.883
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.883-1
+- Update to 1.883.
+
 * Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
 - Update to 1.882.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Nov 2006 14:01:22 -0000	1.8
+++ sources	25 Nov 2006 21:37:13 -0000	1.9
@@ -1 +1 @@
-1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz
+7de141ff7c159851e60776e2dcc43e99  Email-Address-1.883.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:37:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:37:37 -0500
Subject: rpms/perl-Email-Address/FC-6 .cvsignore, 1.8,
	1.9 perl-Email-Address.spec, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <200611252137.kAPLbbhP007703@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7644/FC-6

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.883.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Nov 2006 14:01:17 -0000	1.8
+++ .cvsignore	25 Nov 2006 21:37:07 -0000	1.9
@@ -1 +1 @@
-Email-Address-1.882.tar.gz
+Email-Address-1.883.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/perl-Email-Address.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Email-Address.spec	22 Nov 2006 14:01:17 -0000	1.7
+++ perl-Email-Address.spec	25 Nov 2006 21:37:07 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.882
+Version:        1.883
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.883-1
+- Update to 1.883.
+
 * Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
 - Update to 1.882.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Nov 2006 14:01:17 -0000	1.8
+++ sources	25 Nov 2006 21:37:07 -0000	1.9
@@ -1 +1 @@
-1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz
+7de141ff7c159851e60776e2dcc43e99  Email-Address-1.883.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:42:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:42:45 -0500
Subject: rpms/eterm - New directory
Message-ID: <200611252142.kAPLgjvn007896@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7892/eterm

Log Message:
Directory /cvs/extras/rpms/eterm added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 21:42:50 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:42:50 -0500
Subject: rpms/eterm/devel - New directory
Message-ID: <200611252142.kAPLgo73007909@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7892/eterm/devel

Log Message:
Directory /cvs/extras/rpms/eterm/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 21:43:08 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:43:08 -0500
Subject: rpms/eterm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252143.kAPLh83p007939@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7933

Added Files:
	Makefile import.log 
Log Message:
Setup of module eterm


--- NEW FILE Makefile ---
# Top level Makefile for module eterm
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  Sat Nov 25 21:43:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:43:13 -0500
Subject: rpms/eterm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611252143.kAPLhDhU007955@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7933/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eterm


--- 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  Sat Nov 25 21:44:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:44:36 -0500
Subject: rpms/eterm import.log,1.1,1.2
Message-ID: <200611252144.kAPLia0N008049@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013

Modified Files:
	import.log 
Log Message:
auto-import eterm-0.9.4-2.fc6 on branch devel from eterm-0.9.4-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/eterm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 21:43:08 -0000	1.1
+++ import.log	25 Nov 2006 21:44:06 -0000	1.2
@@ -0,0 +1 @@
+eterm-0_9_4-2_fc6:HEAD:eterm-0.9.4-2.fc6.src.rpm:1164491117



From fedora-extras-commits at redhat.com  Sat Nov 25 21:44:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:44:36 -0500
Subject: rpms/eterm/devel Eterm-0.9.4-no-rpath.patch, NONE, 1.1 eterm.png,
	NONE, 
	1.1 eterm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252144.kAPLia1m008053@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Eterm-0.9.4-no-rpath.patch eterm.png eterm.spec 
Log Message:
auto-import eterm-0.9.4-2.fc6 on branch devel from eterm-0.9.4-2.fc6.src.rpm

Eterm-0.9.4-no-rpath.patch:

--- NEW FILE Eterm-0.9.4-no-rpath.patch ---
diff -uNr Eterm-0.9.4.orig/src/Makefile.am Eterm-0.9.4/src/Makefile.am
--- Eterm-0.9.4.orig/src/Makefile.am	2006-08-22 20:23:11.000000000 +0200
+++ Eterm-0.9.4/src/Makefile.am	2006-09-02 18:27:49.000000000 +0200
@@ -36,7 +36,6 @@
 
 Eterm_SOURCES = main.c
 Eterm_DEPENDENCIES = libEterm.la
-Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 Eterm_LDADD = libEterm.la 
 
 EXTRA_DIST = gdb.scr mmx_cmod.S sse2_cmod.c
diff -uNr Eterm-0.9.4.orig/utils/Makefile.am Eterm-0.9.4/utils/Makefile.am
--- Eterm-0.9.4.orig/utils/Makefile.am	2005-04-26 15:42:09.000000000 +0200
+++ Eterm-0.9.4/utils/Makefile.am	2006-09-02 18:28:01.000000000 +0200
@@ -4,7 +4,6 @@
 bin_SCRIPTS = Etcolors Etsearch kEsetroot Etbg_update_list
 
 Esetroot_SOURCES = Esetroot.c
-Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 Etbg_SOURCES = Etbg.c
 Ettable_SOURCES = Ettable.c


--- NEW FILE eterm.spec ---
Summary: Enlightened terminal emulator
Name: eterm
Version: 0.9.4
Release: 2%{?dist}
License: BSD
Group: User Interface/Desktops
Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
Source1: http://www.eterm.org/download/Eterm-bg-0.9.4.tar.gz
Source2: %{name}.png
Patch: Eterm-0.9.4-no-rpath.patch
URL: http://www.eterm.org/
Requires: imlib2
BuildRequires: imlib2-devel libast-devel libXmu-devel 
BuildRequires: pcre-devel desktop-file-utils
BuildRequires: autoconf automake libtool
Provides: Eterm = %{version}-%{release}
Obsoletes: Eterm <= 0.9.2
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Eterm is a color vt102 terminal emulator with enhanced graphical
capabilities.  Eterm is intended to be a replacement for xterm for
Enlightenment window manager users, but it can also be used as a
replacement for xterm by users without Enlightenment.  Eterm supports
various themes and is very configurable, in keeping with the
philosophy of Enlightenment.

%prep
%setup -a 1 -q -n Eterm-%{version}
%patch -p1

%build
# Touching Makefile.am
./autogen.sh
%configure --enable-multi-charset \
           --enable-escreen       \
           --enable-auto-encoding \
           --enable-trans         \
           --disable-etwin        \
           --disable-mmx

%{__make}

%install
rm -rf %{buildroot}

%makeinstall

echo -e "[Desktop Entry]
Encoding=UTF-8
Name=Eterm	
Comment=Eterm
TryExec=Eterm
Exec=Eterm
Icon=eterm.png
Type=Application
Categories=Application;Utility;TerminalEmulator;" > %{name}.desktop

install -d %{buildroot}%{_datadir}/applications
install -m 0644 %{name}.desktop %{buildroot}%{_datadir}/applications

desktop-file-install --vendor fedora --delete-original           \
  --dir %{buildroot}%{_datadir}/applications  \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

install -d %{buildroot}%{_datadir}/pixmaps
install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root, 0755)
%doc doc/Eterm_reference.html doc/Eterm.1.html doc/Eterm.tcap 
%doc doc/Eterm.ti doc/README.Escreen LICENSE
%doc README ReleaseNotes ReleaseNotes.1 ChangeLog
%dir %{_datadir}/Eterm
%{_bindir}/Esetroot
%{_bindir}/Etbg
%{_bindir}/Etbg_update_list
%{_bindir}/Etcolors
%{_bindir}/Eterm
%{_bindir}/Etsearch
%{_bindir}/Ettable
%{_bindir}/kEsetroot
%{_libdir}/libEterm-%{version}.so
%exclude %{_libdir}/libEterm.a
%exclude %{_libdir}/libEterm.la
%exclude %{_libdir}/libEterm.so
%{_mandir}/man1/Eterm.1*
%{_datadir}/Eterm/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png

%changelog
* Fri Nov 24 2006 Terje R??sten  - 0.9.4-2
- Add libXmu-devel and pcre-devel to BuildReq
- Simplify desktop file handling
- Add --disable-etwin to configure

* Sat Sep  2 2006 Terje R??sten  - 0.9.4-1
- 0.9.4
- LICENSE now included in upstream package
- Add rpath patch
- Touching Makefile.am, add auto* tools buildreq.

* Sun Feb 19 2006 Terje R??sten  - 0.9.3-2
- Add LICENSE
- UTF-8 specfile
- Fix buildroot var
- Not explicit depend on libast

* Sun Feb 19 2006 Terje R??sten  - 0.9.3-1
- 0.9.3

* Wed Nov 13 2002 Che
- initial rpm release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 21:43:13 -0000	1.1
+++ .cvsignore	25 Nov 2006 21:44:06 -0000	1.2
@@ -0,0 +1,2 @@
+Eterm-0.9.4.tar.gz
+Eterm-bg-0.9.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 21:43:13 -0000	1.1
+++ sources	25 Nov 2006 21:44:06 -0000	1.2
@@ -0,0 +1,2 @@
+b8869ee9c9b9516231af9eefa595cee3  Eterm-0.9.4.tar.gz
+e8c6567b13d7fb760bded56c1d1a181d  Eterm-bg-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:45:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:45:18 -0500
Subject: rpms/perl-Email-MIME-ContentType/FC-5 .cvsignore, 1.3,
	1.4 perl-Email-MIME-ContentType.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252145.kAPLjIhu008137@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088/FC-5

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.012.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 19:52:32 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:44:48 -0000	1.4
@@ -1 +1 @@
-Email-MIME-ContentType-1.011.tar.gz
+Email-MIME-ContentType-1.012.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:32 -0000	1.2
+++ perl-Email-MIME-ContentType.spec	25 Nov 2006 21:44:48 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.011
+Version:        1.012
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Email-MIME-ContentType/
-Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-ContentType-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Email-MIME-ContentType-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes LICENSE README
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.012-1
+- Update to 1.012.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.011-1
 - Update to 1.011.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 19:52:32 -0000	1.3
+++ sources	25 Nov 2006 21:44:48 -0000	1.4
@@ -1 +1 @@
-b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz
+d114672c67aff4a60ae7cc8c7ab73f24  Email-MIME-ContentType-1.012.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:45:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:45:19 -0500
Subject: rpms/perl-Email-MIME-ContentType/FC-6 .cvsignore, 1.3,
	1.4 perl-Email-MIME-ContentType.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252145.kAPLjJR6008142@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088/FC-6

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.012.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 19:52:33 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:44:48 -0000	1.4
@@ -1 +1 @@
-Email-MIME-ContentType-1.011.tar.gz
+Email-MIME-ContentType-1.012.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-6/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:33 -0000	1.2
+++ perl-Email-MIME-ContentType.spec	25 Nov 2006 21:44:48 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.011
+Version:        1.012
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Email-MIME-ContentType/
-Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-ContentType-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Email-MIME-ContentType-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes LICENSE README
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.012-1
+- Update to 1.012.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.011-1
 - Update to 1.011.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 19:52:33 -0000	1.3
+++ sources	25 Nov 2006 21:44:48 -0000	1.4
@@ -1 +1 @@
-b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz
+d114672c67aff4a60ae7cc8c7ab73f24  Email-MIME-ContentType-1.012.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:45:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:45:24 -0500
Subject: rpms/perl-Email-MIME-ContentType/devel .cvsignore, 1.3,
	1.4 perl-Email-MIME-ContentType.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252145.kAPLjOLs008147@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088/devel

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.012.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 19:52:33 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:44:54 -0000	1.4
@@ -1 +1 @@
-Email-MIME-ContentType-1.011.tar.gz
+Email-MIME-ContentType-1.012.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:33 -0000	1.2
+++ perl-Email-MIME-ContentType.spec	25 Nov 2006 21:44:54 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.011
+Version:        1.012
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Email-MIME-ContentType/
-Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-ContentType-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Email-MIME-ContentType-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes LICENSE README
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.012-1
+- Update to 1.012.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.011-1
 - Update to 1.011.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 19:52:33 -0000	1.3
+++ sources	25 Nov 2006 21:44:54 -0000	1.4
@@ -1 +1 @@
-b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz
+d114672c67aff4a60ae7cc8c7ab73f24  Email-MIME-ContentType-1.012.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:49:01 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:49:01 -0500
Subject: owners owners.list,1.2011,1.2012
Message-ID: <200611252149.kAPLn1RK008293@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8278

Modified Files:
	owners.list 
Log Message:
New package: eterm.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2011
retrieving revision 1.2012
diff -u -r1.2011 -r1.2012
--- owners.list	25 Nov 2006 21:01:31 -0000	1.2011
+++ owners.list	25 Nov 2006 21:48:31 -0000	1.2012
@@ -383,6 +383,7 @@
 Fedora Extras|erlang-esdl|Erlang OpenGL/SDL api and utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|espeak|Software speech synthesizer (text-to-speech)|faucamp at csir.co.za|extras-qa at fedoraproject.org|
+Fedora Extras|eterm|Enlightened terminal emulator|terjeros at phys.ntnu.no|extras-qa at fedoraproject.org|
 Fedora Extras|evas|A hardware-accelerated canvas API|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|eventlog|Syslog-ng v2 support library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|evolution-bogofilter|A plugin for bogofilter support in evolution|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 22:02:03 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:02:03 -0500
Subject: rpms/libmpd - New directory
Message-ID: <200611252202.kAPM23Q3011455@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11451/libmpd

Log Message:
Directory /cvs/extras/rpms/libmpd added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 22:02:08 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:02:08 -0500
Subject: rpms/libmpd/devel - New directory
Message-ID: <200611252202.kAPM28ce011473@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11451/libmpd/devel

Log Message:
Directory /cvs/extras/rpms/libmpd/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 22:03:16 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:03:16 -0500
Subject: rpms/libmpd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252203.kAPM3GvU011529@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11523

Added Files:
	Makefile import.log 
Log Message:
Setup of module libmpd


--- NEW FILE Makefile ---
# Top level Makefile for module libmpd
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  Sat Nov 25 22:03:21 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:03:21 -0500
Subject: rpms/libmpd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611252203.kAPM3LRU011544@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11523/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libmpd


--- 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  Sat Nov 25 22:03:24 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 17:03:24 -0500
Subject: rpms/grhino/devel .cvsignore, 1.7, 1.8 grhino.spec, 1.9,
	1.10 sources, 1.7, 1.8 grhino-configure-gettext.patch, 1.1,
	NONE grhino-icon.patch, 1.1, NONE grhino-omf.patch, 1.1,
	NONE grhino-scrollkeeper.patch, 1.1, NONE grhino.desktop, 1.3, NONE
Message-ID: <200611252203.kAPM3ODj011556@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11501

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-configure-gettext.patch grhino-icon.patch 
	grhino-omf.patch grhino-scrollkeeper.patch grhino.desktop 
Log Message:
Update -devel to 0.16.0. All patches are upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Nov 2006 21:28:51 -0000	1.7
+++ .cvsignore	25 Nov 2006 22:02:54 -0000	1.8
@@ -1,2 +1 @@
-grhino.png
-grhino-0.15.2.tar.gz
+grhino-0.16.0.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grhino.spec	10 Nov 2006 21:28:51 -0000	1.9
+++ grhino.spec	25 Nov 2006 22:02:54 -0000	1.10
@@ -1,27 +1,21 @@
 Name:           grhino
-Version:        0.15.2
-Release:        4.1%{?dist}
+Version:        0.16.0
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:        %{name}.desktop
-Source2:        %{name}.png
-Patch0:         grhino-scrollkeeper.patch
-Patch1:         grhino-configure-gettext.patch
-Patch2:         grhino-omf.patch
-Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:  scrollkeeper
+BuildRequires:	scrollkeeper
 #Requires:       
-Requires(post):         scrollkeeper
-Requires(postun):       scrollkeeper
+Requires(post):		scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -40,10 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -b .scrollkeeper
-%patch1 -p1 -b .gettext
-%patch2 -b .omf
-%patch3 -p1 -b .icon
 
 
 %build
@@ -54,20 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# move omf files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
-mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/grhino/*/grhino-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category X-Fedora \
-        %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	desktop/%{name}.desktop
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
 %find_lang %{name}
 
@@ -94,8 +79,9 @@
 
 
 %changelog
-* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
-- Push both source files to build server
+* Sat Nov 25 2006 Michel Salim  - 0.16.0-1
+- Update to 0.16.0
+- Remove unneeded patches
 
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Nov 2006 21:28:51 -0000	1.7
+++ sources	25 Nov 2006 22:02:54 -0000	1.8
@@ -1,2 +1 @@
-b98f0e178f6291232babfcb1c4925ea0  grhino.png
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+51d975cc1645112d12bb5fd030db1f7f  grhino-0.16.0.tar.gz


--- grhino-configure-gettext.patch DELETED ---


--- grhino-icon.patch DELETED ---


--- grhino-omf.patch DELETED ---


--- grhino-scrollkeeper.patch DELETED ---


--- grhino.desktop DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 22:06:13 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:06:13 -0500
Subject: rpms/libmpd import.log,1.1,1.2
Message-ID: <200611252206.kAPM6DXY011656@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626

Modified Files:
	import.log 
Log Message:
auto-import libmpd-0.12.0-2 on branch devel from libmpd-0.12.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmpd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 22:03:16 -0000	1.1
+++ import.log	25 Nov 2006 22:05:42 -0000	1.2
@@ -0,0 +1 @@
+libmpd-0_12_0-2:HEAD:libmpd-0.12.0-2.src.rpm:1164492358



From fedora-extras-commits at redhat.com  Sat Nov 25 22:06:13 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:06:13 -0500
Subject: rpms/libmpd/devel libmpd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611252206.kAPM6DF0011660@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libmpd.spec 
Log Message:
auto-import libmpd-0.12.0-2 on branch devel from libmpd-0.12.0-2.src.rpm


--- NEW FILE libmpd.spec ---
Summary: Music Player Daemon Library
Name: libmpd
Version: 0.12.0
Release: 2%{?dist}
License: GPL
Url: http://cms.qballcow.nl/index.php?page=libmpd
Group: Applications/Multimedia
Source: http://download.qballcow.nl/programs/gmpc-0.13/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%package devel
Summary: Header files for developing programs with libmpd
Requires: %{name} = %{version}
Group: Development/Libraries

%description
libmpd is an abstraction around libmpdclient. It provides an easy and
reliable callback based interface to mpd.

%description devel
libmpd-devel is a sub-package which contains header files and static libraries
for developing program with libmpd.

%prep
%setup -q

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} DESTDIR="$RPM_BUILD_ROOT" install
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr (-,root,root)
%doc ChangeLog COPYING README
%{_libdir}/libmpd.so.0*

%files devel
%defattr (-,root,root)
%{_libdir}/libmpd.so
%{_libdir}/pkgconfig/libmpd.pc
%{_prefix}/include/libmpd

%changelog
* Sat Nov 25 2006 Adrian Reber  - 0.12.0-2
- small changes for FE submission

* Mon Mar 27 2006 Jan "Yenya" Kasprzak  0.12.0-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 22:03:21 -0000	1.1
+++ .cvsignore	25 Nov 2006 22:05:43 -0000	1.2
@@ -0,0 +1 @@
+libmpd-0.12.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 22:03:21 -0000	1.1
+++ sources	25 Nov 2006 22:05:43 -0000	1.2
@@ -0,0 +1 @@
+bbfe28a5c3d7ef72b042030e3af52208  libmpd-0.12.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 22:19:22 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 17:19:22 -0500
Subject: rpms/eterm/devel eterm.spec,1.1,1.2
Message-ID: <200611252219.kAPMJMg7011766@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11747

Modified Files:
	eterm.spec 
Log Message:
Must have automake-1.9.




Index: eterm.spec
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/eterm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eterm.spec	25 Nov 2006 21:44:06 -0000	1.1
+++ eterm.spec	25 Nov 2006 22:18:52 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Enlightened terminal emulator
 Name: eterm
 Version: 0.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: User Interface/Desktops
 Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
@@ -12,7 +12,7 @@
 Requires: imlib2
 BuildRequires: imlib2-devel libast-devel libXmu-devel 
 BuildRequires: pcre-devel desktop-file-utils
-BuildRequires: autoconf automake libtool
+BuildRequires: /usr/bin/automake-1.9 autoconf libtool
 Provides: Eterm = %{version}-%{release}
 Obsoletes: Eterm <= 0.9.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,8 @@
 
 %build
 # Touching Makefile.am
+# Need automake 1.9
+export AUTOMAKE=/usr/bin/automake-1.9
 ./autogen.sh
 %configure --enable-multi-charset \
            --enable-escreen       \
@@ -96,6 +98,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Nov 25 2006 Terje R??sten  - 0.9.4-3
+- Use automake-1.9
+
 * Fri Nov 24 2006 Terje R??sten  - 0.9.4-2
 - Add libXmu-devel and pcre-devel to BuildReq
 - Simplify desktop file handling



From fedora-extras-commits at redhat.com  Sat Nov 25 22:25:46 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:25:46 -0500
Subject: owners owners.list,1.2012,1.2013
Message-ID: <200611252225.kAPMPkAd011836@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11820

Modified Files:
	owners.list 
Log Message:
added libmpd



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2012
retrieving revision 1.2013
diff -u -r1.2012 -r1.2013
--- owners.list	25 Nov 2006 21:48:31 -0000	1.2012
+++ owners.list	25 Nov 2006 22:25:16 -0000	1.2013
@@ -946,6 +946,7 @@
 Fedora Extras|libmodelfile|Library for accessing various model file formats|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|libmpd|Music Player Daemon Library|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmtp|MTP client library|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libnasl|Nessus Attack Scripting Language|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 22:34:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 17:34:55 -0500
Subject: rpms/grhino/FC-6 .cvsignore, 1.7, 1.8 grhino.spec, 1.10,
	1.11 sources, 1.9, 1.10 grhino-configure-gettext.patch, 1.1,
	NONE grhino-icon.patch, 1.1, NONE grhino-omf.patch, 1.1,
	NONE grhino-scrollkeeper.patch, 1.1, NONE grhino.desktop, 1.3, NONE
Message-ID: <200611252234.kAPMYtuJ011981@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942/FC-6

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-configure-gettext.patch grhino-icon.patch 
	grhino-omf.patch grhino-scrollkeeper.patch grhino.desktop 
Log Message:
Update FC-5 and -6 to 0.16.0 too



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Nov 2006 21:28:50 -0000	1.7
+++ .cvsignore	25 Nov 2006 22:34:25 -0000	1.8
@@ -1,2 +1 @@
-grhino.png
-grhino-0.15.2.tar.gz
+grhino-0.16.0.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grhino.spec	10 Nov 2006 21:28:50 -0000	1.10
+++ grhino.spec	25 Nov 2006 22:34:25 -0000	1.11
@@ -1,27 +1,21 @@
 Name:           grhino
-Version:        0.15.2
-Release:        4.1%{?dist}
+Version:        0.16.0
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:        %{name}.desktop
-Source2:        %{name}.png
-Patch0:         grhino-scrollkeeper.patch
-Patch1:         grhino-configure-gettext.patch
-Patch2:         grhino-omf.patch
-Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:  scrollkeeper
+BuildRequires:	scrollkeeper
 #Requires:       
-Requires(post):         scrollkeeper
-Requires(postun):       scrollkeeper
+Requires(post):		scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -40,10 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -b .scrollkeeper
-%patch1 -p1 -b .gettext
-%patch2 -b .omf
-%patch3 -p1 -b .icon
 
 
 %build
@@ -54,20 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# move omf files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
-mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/grhino/*/grhino-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category X-Fedora \
-        %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	desktop/%{name}.desktop
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
 %find_lang %{name}
 
@@ -94,8 +79,9 @@
 
 
 %changelog
-* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
-- Push both source files to build server
+* Sat Nov 25 2006 Michel Salim  - 0.16.0-1
+- Update to 0.16.0
+- Remove unneeded patches
 
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Nov 2006 21:28:50 -0000	1.9
+++ sources	25 Nov 2006 22:34:25 -0000	1.10
@@ -1,2 +1 @@
-b98f0e178f6291232babfcb1c4925ea0  grhino.png
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+51d975cc1645112d12bb5fd030db1f7f  grhino-0.16.0.tar.gz


--- grhino-configure-gettext.patch DELETED ---


--- grhino-icon.patch DELETED ---


--- grhino-omf.patch DELETED ---


--- grhino-scrollkeeper.patch DELETED ---


--- grhino.desktop DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 22:34:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 17:34:55 -0500
Subject: rpms/grhino/FC-5 .cvsignore, 1.7, 1.8 grhino.spec, 1.8, 1.9 sources,
	1.7, 1.8 grhino-configure-gettext.patch, 1.1,
	NONE grhino-icon.patch, 1.1, NONE grhino-omf.patch, 1.1,
	NONE grhino-scrollkeeper.patch, 1.1, NONE grhino.desktop, 1.3, NONE
Message-ID: <200611252234.kAPMYtAj011976@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942/FC-5

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-configure-gettext.patch grhino-icon.patch 
	grhino-omf.patch grhino-scrollkeeper.patch grhino.desktop 
Log Message:
Update FC-5 and -6 to 0.16.0 too



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Nov 2006 21:28:49 -0000	1.7
+++ .cvsignore	25 Nov 2006 22:34:25 -0000	1.8
@@ -1,2 +1 @@
-grhino.png
-grhino-0.15.2.tar.gz
+grhino-0.16.0.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grhino.spec	10 Nov 2006 21:28:49 -0000	1.8
+++ grhino.spec	25 Nov 2006 22:34:25 -0000	1.9
@@ -1,27 +1,21 @@
 Name:           grhino
-Version:        0.15.2
-Release:        4.1%{?dist}
+Version:        0.16.0
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:        %{name}.desktop
-Source2:        %{name}.png
-Patch0:         grhino-scrollkeeper.patch
-Patch1:         grhino-configure-gettext.patch
-Patch2:         grhino-omf.patch
-Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:  scrollkeeper
+BuildRequires:	scrollkeeper
 #Requires:       
-Requires(post):         scrollkeeper
-Requires(postun):       scrollkeeper
+Requires(post):		scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -40,10 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -b .scrollkeeper
-%patch1 -p1 -b .gettext
-%patch2 -b .omf
-%patch3 -p1 -b .icon
 
 
 %build
@@ -54,20 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# move omf files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
-mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/grhino/*/grhino-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category X-Fedora \
-        %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	desktop/%{name}.desktop
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
 %find_lang %{name}
 
@@ -94,8 +79,9 @@
 
 
 %changelog
-* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
-- Push both source files to build server
+* Sat Nov 25 2006 Michel Salim  - 0.16.0-1
+- Update to 0.16.0
+- Remove unneeded patches
 
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Nov 2006 21:28:49 -0000	1.7
+++ sources	25 Nov 2006 22:34:25 -0000	1.8
@@ -1,2 +1 @@
-b98f0e178f6291232babfcb1c4925ea0  grhino.png
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+51d975cc1645112d12bb5fd030db1f7f  grhino-0.16.0.tar.gz


--- grhino-configure-gettext.patch DELETED ---


--- grhino-icon.patch DELETED ---


--- grhino-omf.patch DELETED ---


--- grhino-scrollkeeper.patch DELETED ---


--- grhino.desktop DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 22:36:53 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:36:53 -0500
Subject: rpms/libmpd/devel libmpd.spec,1.1,1.2
Message-ID: <200611252236.kAPMar5J012088@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12073

Modified Files:
	libmpd.spec 
Log Message:
* Sat Nov 25 2006 Adrian Reber  - 0.12.0-3
- added requires pkgconfig to -devel package



Index: libmpd.spec
===================================================================
RCS file: /cvs/extras/rpms/libmpd/devel/libmpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmpd.spec	25 Nov 2006 22:05:43 -0000	1.1
+++ libmpd.spec	25 Nov 2006 22:36:23 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Music Player Daemon Library
 Name: libmpd
 Version: 0.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Url: http://cms.qballcow.nl/index.php?page=libmpd
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@
 Summary: Header files for developing programs with libmpd
 Requires: %{name} = %{version}
 Group: Development/Libraries
+Requires: pkgconfig
 
 %description
 libmpd is an abstraction around libmpdclient. It provides an easy and
@@ -52,6 +53,9 @@
 %{_prefix}/include/libmpd
 
 %changelog
+* Sat Nov 25 2006 Adrian Reber  - 0.12.0-3
+- added requires pkgconfig to -devel package
+
 * Sat Nov 25 2006 Adrian Reber  - 0.12.0-2
 - small changes for FE submission
 



From fedora-extras-commits at redhat.com  Sat Nov 25 22:51:45 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 17:51:45 -0500
Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec, 1.7,
	1.8 Log-Dispatch-2.11-mod_perl2.patch, 1.1, NONE
Message-ID: <200611252251.kAPMpjvo012170@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12155

Modified Files:
	perl-Log-Dispatch.spec 
Removed Files:
	Log-Dispatch-2.11-mod_perl2.patch 
Log Message:
Log-Dispatch-2.11-mod_perl2.patch no longer needed.


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Log-Dispatch.spec	25 Nov 2006 14:38:47 -0000	1.7
+++ perl-Log-Dispatch.spec	25 Nov 2006 22:51:15 -0000	1.8
@@ -8,15 +8,14 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Log-Dispatch/
 Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/Log-Dispatch-%{version}.tar.gz
-Patch0:         Log-Dispatch-2.11-mod_perl2.patch
-Patch1:         Log-Dispatch-2.11-enable-mail-tests.patch
+Patch0:         Log-Dispatch-2.11-enable-mail-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,11 +38,8 @@
 
 %prep
 %setup -q -n Log-Dispatch-%{version}
-if %{__perl} -e 'use Apache2::Log' ; then
-%patch0 -p1
-fi
 %if %{mailtests}
-%patch1 -p1
+%patch0 -p1
 %endif
 
 # Requirements list: exclude mod_perl
@@ -83,6 +79,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 2.14-2
+- Log-Dispatch-2.11-mod_perl2.patch no longer needed.
+
 * Sat Nov 25 2006 Jose Pedro Oliveira  - 2.14-1
 - Update to 2.14.
 


--- Log-Dispatch-2.11-mod_perl2.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 23:19:49 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:19:49 -0500
Subject: rpms/tclparser - New directory
Message-ID: <200611252319.kAPNJn6e015628@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624/tclparser

Log Message:
Directory /cvs/extras/rpms/tclparser added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:19:54 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:19:54 -0500
Subject: rpms/tclparser/devel - New directory
Message-ID: <200611252319.kAPNJs6H015669@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624/tclparser/devel

Log Message:
Directory /cvs/extras/rpms/tclparser/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:20:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:20:06 -0500
Subject: rpms/tclparser Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252320.kAPNK66h015698@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15692

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclparser


--- NEW FILE Makefile ---
# Top level Makefile for module tclparser
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  Sat Nov 25 23:20:11 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:20:11 -0500
Subject: rpms/tclparser/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611252320.kAPNKBLh015714@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15692/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclparser


--- 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  Sat Nov 25 23:21:08 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:21:08 -0500
Subject: rpms/tclparser import.log,1.1,1.2
Message-ID: <200611252321.kAPNL8Y6015793@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15757

Modified Files:
	import.log 
Log Message:
auto-import tclparser-1.4-1.20061030cvs on branch devel from tclparser-1.4-1.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclparser/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 23:20:06 -0000	1.1
+++ import.log	25 Nov 2006 23:20:38 -0000	1.2
@@ -0,0 +1 @@
+tclparser-1_4-1_20061030cvs:HEAD:tclparser-1.4-1.20061030cvs.src.rpm:1164496913



From fedora-extras-commits at redhat.com  Sat Nov 25 23:21:08 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:21:08 -0500
Subject: rpms/tclparser/devel tclparser-1.4-configure.patch, NONE,
	1.1 tclparser.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252321.kAPNL83x015797@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15757/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tclparser-1.4-configure.patch tclparser.spec 
Log Message:
auto-import tclparser-1.4-1.20061030cvs on branch devel from tclparser-1.4-1.20061030cvs.src.rpm

tclparser-1.4-configure.patch:

--- NEW FILE tclparser-1.4-configure.patch ---
--- configure.orig	2006-11-01 08:25:07.000000000 -0800
+++ configure	2006-11-01 08:25:37.000000000 -0800
@@ -1500,10 +1500,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -7046,7 +7048,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


--- NEW FILE tclparser.spec ---
%define cvsdate 20061030

Summary: Tcl syntax parser
Name: tclparser
Version: 1.4
Release: 1.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclparser-20061030cvs tclparser
# tar czf tclparser-20061030cvs.tgz ./tclparser-20061030cvs
Source0: tclparser-%{cvsdate}cvs.tgz
Patch0:  tclparser-1.4-configure.patch
URL: http://tclpro.sourceforge.net/
Requires: tcl
BuildRequires: tcl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A parser for the Tcl scripting language.  It is used by the Tcl syntax checker
to parse a Tcl script into commands, words and tokens.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch -p0

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog license.terms
%defattr(-,root,root)
%{_libdir}/%{name}%{version}

%changelog
* Tue Oct 31 2006 Wart  1.4-1.20061030cvs
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclparser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:20:11 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:20:38 -0000	1.2
@@ -0,0 +1 @@
+tclparser-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclparser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:20:11 -0000	1.1
+++ sources	25 Nov 2006 23:20:38 -0000	1.2
@@ -0,0 +1 @@
+2efb266a55faff5a9b2c5e53f9edc50f  tclparser-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 23:29:36 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:29:36 -0500
Subject: rpms/tclchecker - New directory
Message-ID: <200611252329.kAPNTaJY015938@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15934/tclchecker

Log Message:
Directory /cvs/extras/rpms/tclchecker added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:29:42 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:29:42 -0500
Subject: rpms/tclchecker/devel - New directory
Message-ID: <200611252329.kAPNTgOs015951@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15934/tclchecker/devel

Log Message:
Directory /cvs/extras/rpms/tclchecker/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:29:53 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:29:53 -0500
Subject: rpms/tclchecker Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252329.kAPNTrMi015981@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15975

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclchecker


--- NEW FILE Makefile ---
# Top level Makefile for module tclchecker
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  Sat Nov 25 23:29:58 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:29:58 -0500
Subject: rpms/tclchecker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611252329.kAPNTw62015996@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15975/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclchecker


--- 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  Sat Nov 25 23:31:02 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:31:02 -0500
Subject: rpms/tclchecker import.log,1.1,1.2
Message-ID: <200611252331.kAPNV2Gi016084@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16047

Modified Files:
	import.log 
Log Message:
auto-import tclchecker-1.4-1.20061030cvs on branch devel from tclchecker-1.4-1.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclchecker/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 23:29:53 -0000	1.1
+++ import.log	25 Nov 2006 23:30:32 -0000	1.2
@@ -0,0 +1 @@
+tclchecker-1_4-1_20061030cvs:HEAD:tclchecker-1.4-1.20061030cvs.src.rpm:1164497508



From fedora-extras-commits at redhat.com  Sat Nov 25 23:31:02 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:31:02 -0500
Subject: rpms/tclchecker/devel tclchecker-1.4-destdir.patch, NONE,
	1.1 tclchecker-1.4-tclm4.patch, NONE, 1.1 tclchecker.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252331.kAPNV2ML016089@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16047/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tclchecker-1.4-destdir.patch tclchecker-1.4-tclm4.patch 
	tclchecker.spec 
Log Message:
auto-import tclchecker-1.4-1.20061030cvs on branch devel from tclchecker-1.4-1.20061030cvs.src.rpm

tclchecker-1.4-destdir.patch:

--- NEW FILE tclchecker-1.4-destdir.patch ---
--- Makefile.in.orig	2006-11-01 09:46:23.000000000 -0800
+++ Makefile.in	2006-11-01 16:33:04.000000000 -0800
@@ -144,11 +144,13 @@
 infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
+datadir = @datadir@
 oldincludedir = /usr/include
 
 DESTDIR =
 
 pkglibdir = $(prefix)/lib/@PACKAGE@@VERSION@
+pkgdatadir = $(datadir)/tclchecker at VERSION@
 
 top_builddir = .
 
@@ -268,15 +270,15 @@
 #========================================================================
 
 install-libraries: libraries installdirs
-	@echo "Installing Tcl files in $(pkglibdir)"
+	@echo "Installing Tcl files in $(DESTDIR)$(pkgdatadir)"
 	@for i in $(LIB_FILES) ; do \
-	    $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkgdatadir) ; \
 	done;
 	@for i in $(PCX_FILES) ; do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkgdatadir) ; \
 	done;
-	$(INSTALL_SCRIPT) pkgIndex.tcl $(pkglibdir) ; \
+	$(INSTALL_SCRIPT) pkgIndex.tcl $(DESTDIR)$(pkgdatadir) ; \
 
 #========================================================================
 # Install documentation.  Unix manpages should go in the $(mandir)
@@ -472,7 +474,7 @@
 
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(libdir)
-	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
+	$(mkinstalldirs)  $(DESTDIR)$(pkgdatadir)
 
 .PHONY: all binaries clean depend distclean doc install installdirs \
 libraries test

tclchecker-1.4-tclm4.patch:

--- NEW FILE tclchecker-1.4-tclm4.patch ---
--- config/tcl.m4.orig	2006-11-01 09:33:41.000000000 -0800
+++ config/tcl.m4	2006-11-01 09:33:20.000000000 -0800
@@ -68,7 +68,10 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -588,7 +591,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


--- NEW FILE tclchecker.spec ---
%define cvsdate 20061030

Summary: Tcl syntax checker
Name: tclchecker
Version: 1.4
Release: 1.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclchecker-20061030cvs tclchecker
# tar czf tclchecker-20061030cvs.tgz ./tclchecker-20061030cvs
Source0: tclchecker-%{cvsdate}cvs.tgz
Patch0:  tclchecker-1.4-tclm4.patch
Patch1:  tclchecker-1.4-destdir.patch
URL: http://tclpro.sourceforge.net/
Requires: tcl tbcload tclparser
BuildRequires: tcl-devel autoconf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%description
A syntax checker for the Tcl scripting language.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch0 -p0
%patch1 -p0
autoconf

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.tcl
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.pcx

%check
# Disabling unit tests as they require tools that haven't been built yet.
#make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog license.terms doc/messageIDs.txt
%defattr(-,root,root)
%{_datadir}/%{name}%{version}

%changelog
* Tue Oct 31 2006 Wart  1.4-1.20061030cvs
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclchecker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:29:58 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:30:32 -0000	1.2
@@ -0,0 +1 @@
+tclchecker-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclchecker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:29:58 -0000	1.1
+++ sources	25 Nov 2006 23:30:32 -0000	1.2
@@ -0,0 +1 @@
+1c76f983b7ccb0d9ca0ee2c3348b18e1  tclchecker-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 23:34:49 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:34:49 -0500
Subject: rpms/tcldebugger - New directory
Message-ID: <200611252334.kAPNYnga016171@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16167/tcldebugger

Log Message:
Directory /cvs/extras/rpms/tcldebugger added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:34:55 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:34:55 -0500
Subject: rpms/tcldebugger/devel - New directory
Message-ID: <200611252334.kAPNYtlj016184@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16167/tcldebugger/devel

Log Message:
Directory /cvs/extras/rpms/tcldebugger/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:35:07 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:35:07 -0500
Subject: rpms/tcldebugger Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252335.kAPNZ7bb016218@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212

Added Files:
	Makefile import.log 
Log Message:
Setup of module tcldebugger


--- NEW FILE Makefile ---
# Top level Makefile for module tcldebugger
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  Sat Nov 25 23:35:12 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:35:12 -0500
Subject: rpms/tcldebugger/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611252335.kAPNZCO5016235@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcldebugger


--- 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  Sat Nov 25 23:36:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:36:30 -0500
Subject: rpms/tcldebugger/devel tcldebugger-1.4-destdir.patch, NONE,
	1.1 tcldebugger-1.4-shebang.patch, NONE,
	1.1 tcldebugger-1.4-shortsplash.patch, NONE,
	1.1 tcldebugger-1.4-tclm4.patch, NONE,
	1.1 tcldebugger-1.4-tkupdate.patch, NONE, 1.1 tcldebugger.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252336.kAPNaUfR016356@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tcldebugger-1.4-destdir.patch tcldebugger-1.4-shebang.patch 
	tcldebugger-1.4-shortsplash.patch tcldebugger-1.4-tclm4.patch 
	tcldebugger-1.4-tkupdate.patch tcldebugger.spec 
Log Message:
auto-import tcldebugger-1.4-1.20061030cvs on branch devel from tcldebugger-1.4-1.20061030cvs.src.rpm

tcldebugger-1.4-destdir.patch:

--- NEW FILE tcldebugger-1.4-destdir.patch ---
--- Makefile.in.orig	2006-11-01 10:59:45.000000000 -0800
+++ Makefile.in	2006-11-01 11:39:49.000000000 -0800
@@ -184,12 +184,13 @@
 infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
+datadir = @datadir@
 oldincludedir = /usr/include
 
 DESTDIR =
 
 pkgdatadir = $(exec_prefix)/bin/
-pkglibdir = $(prefix)/lib/@PACKAGE@@VERSION@
+pkglibdir = $(datadir)/tcldebugger at VERSION@
 imagelibdir = $(pkglibdir)/images
 
 top_builddir = .
@@ -309,23 +310,23 @@
 #========================================================================
 
 install-libraries: libraries installdirs
-	@echo "Installing Tcl files in $(pkglibdir)"
+	@echo "Installing Tcl files in $(DESTDIR)$(pkglibdir)"
 	@for i in $(LIB_FILES) ; do \
-	    $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibdir) ; \
 	done;
-	@$(INSTALL_SCRIPT) $(DEBUG_NUB_SCRIPT) $(pkglibdir)
-	@$(INSTALL_SCRIPT) pkgIndex.tcl $(pkglibdir) 
-	@echo "Installing PDX files in $(pkglibdir)"
+	@$(INSTALL_SCRIPT) $(DEBUG_NUB_SCRIPT) $(DESTDIR)$(pkglibdir)
+	@$(INSTALL_SCRIPT) pkgIndex.tcl $(DESTDIR)$(pkglibdir) 
+	@echo "Installing PDX files in $(DESTDIR)$(pkglibdir)"
 	@for i in $(DEBUG_PDX_FILES) ; do \
-	    $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibdir) ; \
 	done;
-	@echo "Installing Image files in $(imagelibdir)"
+	@echo "Installing Image files in $(DESTDIR)$(imagelibdir)"
 	@for i in $(srcdir)/images/*.gif ; do \
-	    $(INSTALL_DATA) $$i $(imagelibdir) ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(imagelibdir) ; \
 	done;
-	@echo "Installing support scripts in $(bindir)"
-	@$(INSTALL_SCRIPT) $(DEBUG_LAUNCH_SCRIPT) $(bindir)
-	@$(INSTALL_SCRIPT) $(DEBUG_INIT_SCRIPT) $(bindir)
+	@echo "Installing support scripts in $(DESTDIR)$(bindir)"
+	@$(INSTALL_SCRIPT) $(DEBUG_LAUNCH_SCRIPT) $(DESTDIR)$(bindir)
+	@$(INSTALL_SCRIPT) $(DEBUG_INIT_SCRIPT) $(DESTDIR)$(bindir)
 
 #========================================================================
 # Install documentation.  Unix manpages should go in the $(mandir)
@@ -333,7 +334,7 @@
 #========================================================================
 
 install-doc: doc installdirs
-	$(INSTALL_DATA) $(srcdir)/docs/initdebug.n $(mandir)/mann
+	$(INSTALL_DATA) $(srcdir)/docs/initdebug.n $(DESTDIR)$(mandir)/mann
 
 test: $(TCLSH_PROG)
 	TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
@@ -611,6 +612,7 @@
 	done
 
 installdirs:
+	@$(mkinstalldirs)  $(DESTDIR)$(bindir)
 	@$(mkinstalldirs)  $(DESTDIR)$(libdir)
 	@$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
 	@$(mkinstalldirs)  $(DESTDIR)$(imagelibdir)

tcldebugger-1.4-shebang.patch:

--- NEW FILE tcldebugger-1.4-shebang.patch ---
--- appLaunch.tcl.orig	2006-11-01 21:45:06.000000000 -0800
+++ appLaunch.tcl	2006-11-01 21:45:48.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec tclsh "$0" ${1+"$@"}
+
 # appLaunch.tcl --
 #
 #	This script takes care of initializing the nub and invoking the
--- initdebug.tcl.orig	2006-11-01 21:45:11.000000000 -0800
+++ initdebug.tcl	2006-11-01 21:45:50.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec tclsh "$0" ${1+"$@"}
+
 # initdebug.tcl --
 #
 #	This file contains the public routines used to start debugging user

tcldebugger-1.4-shortsplash.patch:

--- NEW FILE tcldebugger-1.4-shortsplash.patch ---
--- debugger.tcl.in.orig	2006-11-01 16:03:09.000000000 -0800
+++ debugger.tcl.in	2006-11-01 16:03:18.000000000 -0800
@@ -240,7 +240,7 @@
     # Display the splash screen and set a timer to remove it.
 
     set about [gui::showAboutWindow]
-    after 2500 [list destroy $about]
+    after 500 [list destroy $about]
 
     # Remove the send command.  This will keep other applications
     # from being able to poke into our interp via the send command.

tcldebugger-1.4-tclm4.patch:

--- NEW FILE tcldebugger-1.4-tclm4.patch ---
--- config/tcl.m4.orig	2006-11-01 10:45:21.000000000 -0800
+++ config/tcl.m4	2006-11-01 10:45:06.000000000 -0800
@@ -68,7 +68,10 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -161,7 +164,10 @@
 	    fi
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tkConfig.sh" ; then
@@ -588,7 +594,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -1580,7 +1586,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`

tcldebugger-1.4-tkupdate.patch:

--- NEW FILE tcldebugger-1.4-tkupdate.patch ---
Index: bindings.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/bindings.tcl,v
retrieving revision 1.5
diff -u -r1.5 bindings.tcl
--- bindings.tcl	31 Oct 2000 23:30:57 -0000	1.5
+++ bindings.tcl	1 Nov 2006 22:41:29 -0000
@@ -157,124 +157,124 @@
     }
 
     bind noEdit  {
-	set tkPriv(x) %x
-	set tkPriv(y) %y
+	set tk::Priv(x) %x
+	set tk::Priv(y) %y
 	code::tkTextAutoScan $code::codeWin
 	break;
     }
     bind noEdit  {
-	tkCancelRepeat
+	tk::CancelRepeat
 	break
     }
     bind noEdit  {
-	tkCancelRepeat
+	tk::CancelRepeat
 	break
     }
     bind noEdit <1> {
-	tkTextButton1 %W %x %y
+	tk::TextButton1 %W %x %y
 	%W tag remove sel 0.0 end
     }
     bind noEdit  {
-	set tkPriv(x) %x
-	set tkPriv(y) %y
-	tkTextSelectTo %W %x %y
+	set tk::Priv(x) %x
+	set tk::Priv(y) %y
+	tk::TextSelectTo %W %x %y
     }
     bind noEdit  {
-	set tkPriv(selectMode) word
-	tkTextSelectTo %W %x %y
+	set tk::Priv(selectMode) word
+	tk::TextSelectTo %W %x %y
 	catch {%W mark set insert sel.first}
     }
     bind noEdit  {
-	set tkPriv(selectMode) line
-	tkTextSelectTo %W %x %y
+	set tk::Priv(selectMode) line
+	tk::TextSelectTo %W %x %y
 	catch {%W mark set insert sel.first}
     }
     bind noEdit  {
-	tkTextResetAnchor %W @%x,%y
-	set tkPriv(selectMode) char
-	tkTextSelectTo %W %x %y
+	tk::TextResetAnchor %W @%x,%y
+	set tk::Priv(selectMode) char
+	tk::TextSelectTo %W %x %y
     }
     bind noEdit 	{
-	set tkPriv(selectMode) word
-	tkTextSelectTo %W %x %y
+	set tk::Priv(selectMode) word
+	tk::TextSelectTo %W %x %y
     }
     bind noEdit 	{
-	set tkPriv(selectMode) line
-	tkTextSelectTo %W %x %y
+	set tk::Priv(selectMode) line
+	tk::TextSelectTo %W %x %y
     }
     bind noEdit  {
-	set tkPriv(x) %x
-	set tkPriv(y) %y
-	tkTextAutoScan %W
+	set tk::Priv(x) %x
+	set tk::Priv(y) %y
+	tk::TextAutoScan %W
     }
     bind noEdit  {
-	tkCancelRepeat
+	tk::CancelRepeat
     }
     bind noEdit  {
-	tkCancelRepeat
+	tk::CancelRepeat
     }
     bind noEdit  {
 	%W mark set insert @%x,%y
     }
     bind noEdit  {
-	tkTextSetCursor %W insert-1c
+	tk::TextSetCursor %W insert-1c
     }
     bind noEdit  {
-	tkTextSetCursor %W insert+1c
+	tk::TextSetCursor %W insert+1c
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextUpDownLine %W -1]
+	tk::TextSetCursor %W [tk::TextUpDownLine %W -1]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextUpDownLine %W 1]
+	tk::TextSetCursor %W [tk::TextUpDownLine %W 1]
     }
     bind noEdit  {
-	tkTextKeySelect %W [%W index {insert - 1c}]
+	tk::TextKeySelect %W [%W index {insert - 1c}]
     }
     bind noEdit  {
-	tkTextKeySelect %W [%W index {insert + 1c}]
+	tk::TextKeySelect %W [%W index {insert + 1c}]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextUpDownLine %W -1]
+	tk::TextKeySelect %W [tk::TextUpDownLine %W -1]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextUpDownLine %W 1]
+	tk::TextKeySelect %W [tk::TextUpDownLine %W 1]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
+	tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextNextWord %W insert]
+	tk::TextSetCursor %W [tk::TextNextWord %W insert]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextPrevPara %W insert]
+	tk::TextSetCursor %W [tk::TextPrevPara %W insert]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextNextPara %W insert]
+	tk::TextSetCursor %W [tkTextNextPara %W insert]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
+	tk::TextKeySelect %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextNextWord %W insert]
+	tk::TextKeySelect %W [tk::TextNextWord %W insert]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextPrevPara %W insert]
+	tk::TextKeySelect %W [tk::TextPrevPara %W insert]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextNextPara %W insert]
+	tk::TextKeySelect %W [tkTextNextPara %W insert]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextScrollPages %W -1]
+	tk::TextSetCursor %W [tk::TextScrollPages %W -1]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextScrollPages %W -1]
+	tk::TextKeySelect %W [tk::TextScrollPages %W -1]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextScrollPages %W 1]
+	tk::TextSetCursor %W [tk::TextScrollPages %W 1]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextScrollPages %W 1]
+	tk::TextKeySelect %W [tk::TextScrollPages %W 1]
     }
     bind noEdit  {
 	%W xview scroll -1 page
@@ -283,28 +283,28 @@
 	%W xview scroll 1 page
     }
     bind noEdit  {
-	tkTextSetCursor %W {insert linestart}
+	tk::TextSetCursor %W {insert linestart}
     }
     bind noEdit  {
-	tkTextKeySelect %W {insert linestart}
+	tk::TextKeySelect %W {insert linestart}
     }
     bind noEdit  {
-	tkTextSetCursor %W {insert lineend}
+	tk::TextSetCursor %W {insert lineend}
     }
     bind noEdit  {
-	tkTextKeySelect %W {insert lineend}
+	tk::TextKeySelect %W {insert lineend}
     }
     bind noEdit  {
-	tkTextSetCursor %W 1.0
+	tk::TextSetCursor %W 1.0
     }
     bind noEdit  {
-	tkTextKeySelect %W 1.0
+	tk::TextKeySelect %W 1.0
     }
     bind noEdit  {
-	tkTextSetCursor %W {end - 1 char}
+	tk::TextSetCursor %W {end - 1 char}
     }
     bind noEdit  {
-	tkTextKeySelect %W {end - 1 char}
+	tk::TextKeySelect %W {end - 1 char}
     }
     bind noEdit  {
 	%W mark set anchor insert
@@ -313,12 +313,12 @@
 	%W mark set anchor insert
     }
     bind noEdit  {
-	set tkPriv(selectMode) char
-	tkTextKeyExtend %W insert
+	set tk::Priv(selectMode) char
+	tk::TextKeyExtend %W insert
     }
     bind noEdit  {
-	set tkPriv(selectMode) char
-	tkTextKeyExtend %W insert
+	set tk::Priv(selectMode) char
+	tk::TextKeyExtend %W insert
     }
     bind noEdit  {
 	%W tag add sel 1.0 end
Index: breakWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/breakWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 breakWin.tcl
--- breakWin.tcl	31 Oct 2000 23:30:57 -0000	1.3
+++ breakWin.tcl	1 Nov 2006 22:41:30 -0000
@@ -109,9 +109,9 @@
 	    -command {destroy $gui::gui(breakDbgWin)}]
     pack $showBut $remBut $allBut $closeBut -fill x -padx $pad -pady 3
 
-    grid $breakLbl -row 0 -col 0 -sticky nwe -columnspan 2 -padx 4
-    grid $breakSubFrm -row 1 -col 0 -sticky nswe -padx $pad -pady $pad
-    grid $butFrm  -row 1 -col 1 -sticky ns
+    grid $breakLbl -row 0 -column 0 -sticky nwe -columnspan 2 -padx 4
+    grid $breakSubFrm -row 1 -column 0 -sticky nswe -padx $pad -pady $pad
+    grid $butFrm  -row 1 -column 1 -sticky ns
     grid columnconfigure $breakFrm 0 -weight 1
     grid rowconfigure $breakFrm 1 -weight 1
 
Index: codeWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/codeWin.tcl,v
retrieving revision 1.8
diff -u -r1.8 codeWin.tcl
--- codeWin.tcl	17 Oct 2001 18:08:33 -0000	1.8
+++ codeWin.tcl	1 Nov 2006 22:41:31 -0000
@@ -569,24 +569,24 @@
 #	None.
 
 proc code::tkTextAutoScan {w} {
-    global tkPriv
+    global tk::Priv
     if {![winfo exists $w]} return
-    if {$tkPriv(y) >= [winfo height $w]} {
+    if {$tk::Priv(y) >= [winfo height $w]} {
 	$code::codeBar yview scroll 2 units
 	$code::lineBar yview scroll 2 units
 	$code::codeWin yview scroll 2 units
-    } elseif {$tkPriv(y) < 0} {
+    } elseif {$tk::Priv(y) < 0} {
 	$code::codeBar yview scroll -2 units
 	$code::lineBar yview scroll -2 units
 	$code::codeWin yview scroll -2 units
-    } elseif {$tkPriv(x) >= [winfo width $w]} {
+    } elseif {$tk::Priv(x) >= [winfo width $w]} {
 	$code::codeWin xview scroll 2 units
-    } elseif {$tkPriv(x) < 0} {
+    } elseif {$tk::Priv(x) < 0} {
 	$code::codeWin xview scroll -2 units
     } else {
 	return
     }
-    set tkPriv(afterId) [after 50 code::tkTextAutoScan $w]
+    set tk::Priv(afterId) [after 50 code::tkTextAutoScan $w]
 }
 
 # code::toggleLBP --
Index: coverage.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/coverage.tcl,v
retrieving revision 1.6
diff -u -r1.6 coverage.tcl
--- coverage.tcl	31 Oct 2000 23:30:57 -0000	1.6
+++ coverage.tcl	1 Nov 2006 22:41:33 -0000
@@ -246,11 +246,11 @@
     pack $clearAllBut -fill x
     pack $closeBut -fill x -anchor s
 
-    grid $radio(uncvr) -row 1 -col 0 -sticky nw -columnspan 3
-    grid $radio(cvr) -row 2 -col 0 -sticky nw -columnspan 3
-    grid $coverText -row 3 -col 0 -sticky nswe -padx $pad -pady $pad \
+    grid $radio(uncvr) -row 1 -column 0 -sticky nw -columnspan 3
+    grid $radio(cvr) -row 2 -column 0 -sticky nw -columnspan 3
+    grid $coverText -row 3 -column 0 -sticky nswe -padx $pad -pady $pad \
 	    -columnspan 2
-    grid $butFrm  -row 3 -col 2 -sticky nwe -padx $pad -pady $pad
+    grid $butFrm  -row 3 -column 2 -sticky nwe -padx $pad -pady $pad
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 3 -weight 1
 
Index: find.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/find.tcl,v
retrieving revision 1.3
diff -u -r1.3 find.tcl
--- find.tcl	31 Oct 2000 23:30:58 -0000	1.3
+++ find.tcl	1 Nov 2006 22:41:33 -0000
@@ -160,11 +160,11 @@
     set closeBut [button $mainFrm.closeBut -text "Close" -default normal \
 	    -command {destroy $gui::gui(findDbgWin)}]
 
-    grid $findFrm  -row 0 -col 0 -sticky nwe -columnspan 2 -padx $pad
-    grid $findBut  -row 0 -col 2 -sticky nwe -padx $pad -pady $pad
-    grid $closeBut  -row 1 -col 2 -sticky nwe -padx $pad -pady $pad
-    grid $checkFrm -row 1 -col 0 -sticky nsw
-    grid $dirFrm   -row 1 -col 1 -sticky nswe -padx $pad -pady $pad
+    grid $findFrm  -row 0 -column 0 -sticky nwe -columnspan 2 -padx $pad
+    grid $findBut  -row 0 -column 2 -sticky nwe -padx $pad -pady $pad
+    grid $closeBut  -row 1 -column 2 -sticky nwe -padx $pad -pady $pad
+    grid $checkFrm -row 1 -column 0 -sticky nsw
+    grid $dirFrm   -row 1 -column 1 -sticky nswe -padx $pad -pady $pad
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 2 -weight 1
     pack $mainFrm -fill both -expand true -padx $pad -pady $pad
@@ -594,15 +594,15 @@
     set closeBut [button $placeFrm.closeBut -text Close -default normal\
 	    -command {destroy $gui::gui(gotoDbgWin)} -width 10]
 
-    grid $gotoBut   -row 0 -col 0 -sticky w -padx $pad
-    grid $closeBut  -row 0 -col 1 -sticky w -padx $pad
+    grid $gotoBut   -row 0 -column 0 -sticky w -padx $pad
+    grid $closeBut  -row 0 -column 1 -sticky w -padx $pad
     grid rowconfigure $placeFrm 0 -weight 1
 
-    grid $choiceLbl -row 0 -col 0 -sticky nw -padx $pad -pady $pad
-    grid $lineLbl   -row 0 -col 1 -sticky nw -pady $pad
-    grid $choiceBox -row 1 -col 0 -sticky w -padx $pad 
-    grid $lineEnt   -row 1 -col 1 -sticky we
-    grid $placeFrm  -row 2 -col 0 -columnspan 2 -padx $pad -pady $pad
+    grid $choiceLbl -row 0 -column 0 -sticky nw -padx $pad -pady $pad
+    grid $lineLbl   -row 0 -column 1 -sticky nw -pady $pad
+    grid $choiceBox -row 1 -column 0 -sticky w -padx $pad 
+    grid $lineEnt   -row 1 -column 1 -sticky we
+    grid $placeFrm  -row 2 -column 0 -columnspan 2 -padx $pad -pady $pad
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 2 -weight 1
     pack $mainFrm -fill both -expand true -padx $pad -pady $pad 
Index: gui.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/gui.tcl,v
retrieving revision 1.15
diff -u -r1.15 gui.tcl
--- gui.tcl	17 Oct 2001 18:08:33 -0000	1.15
+++ gui.tcl	1 Nov 2006 22:41:33 -0000
@@ -1875,8 +1875,8 @@
 
     pack $infoText -side left -fill x -expand 1
     pack $fillFrm  -side left -fill x
-    grid $instLbl  -row 0 -col 0 -sticky we
-    grid $fileText -row 0 -col 1 -sticky we -padx 2
+    grid $instLbl  -row 0 -column 0 -sticky we
+    grid $fileText -row 0 -column 1 -sticky we -padx 2
     grid columnconfigure $fileFrm 1 -weight 1
     grid columnconfigure $fileFrm 0 -minsize $width
 
@@ -2595,16 +2595,16 @@
 
 	grid $m.title -columnspan 2 -pady 10
 	#grid $m.t -columnspan 2
-	grid $m.l1 -row 1 -col 0 -sticky e
-	grid $m.r1 -row 1 -col 1 -sticky w
-	grid $m.l2 -row 2 -col 0 -sticky e
-	grid $m.r2 -row 2 -col 1 -sticky w
-	grid $m.l3 -row 3 -col 0 -sticky e
-	grid $m.r3 -row 3 -col 1 -sticky w
-	grid $m.l4 -row 4 -col 0 -sticky e
-	grid $m.r4 -row 4 -col 1 -sticky w
-	grid $m.l5 -row 5 -col 0 -sticky e
-	grid $m.r5 -row 5 -col 1 -sticky w
+	grid $m.l1 -row 1 -column 0 -sticky e
+	grid $m.r1 -row 1 -column 1 -sticky w
+	grid $m.l2 -row 2 -column 0 -sticky e
+	grid $m.r2 -row 2 -column 1 -sticky w
+	grid $m.l3 -row 3 -column 0 -sticky e
+	grid $m.r3 -row 3 -column 1 -sticky w
+	grid $m.l4 -row 4 -column 0 -sticky e
+	grid $m.r4 -row 4 -column 1 -sticky w
+	grid $m.l5 -row 5 -column 0 -sticky e
+	grid $m.r5 -row 5 -column 1 -sticky w
 	grid $m.b -columnspan 2 -pady 10
     }
 
Index: inspectorWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/inspectorWin.tcl,v
retrieving revision 1.4
diff -u -r1.4 inspectorWin.tcl
--- inspectorWin.tcl	31 Oct 2000 23:30:58 -0000	1.4
+++ inspectorWin.tcl	1 Nov 2006 22:41:34 -0000
@@ -226,9 +226,9 @@
     set yscroll [scrollbar $varFrm.yscroll -command [list $varText yview]]
     set xscroll [scrollbar $varFrm.xscroll -command [list $varText xview] \
 	    -orient horizontal]
-    grid $varText -row 0 -col 0 -sticky nswe
-    grid $yscroll -row 0 -col 1 -sticky ns
-    grid $xscroll -row 1 -col 0 -sticky we
+    grid $varText -row 0 -column 0 -sticky nswe
+    grid $yscroll -row 0 -column 1 -sticky ns
+    grid $xscroll -row 1 -column 0 -sticky we
     grid columnconfigure $varFrm 0 -weight 1
     grid rowconfigure $varFrm 0 -weight 1
 
Index: menu.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/menu.tcl,v
retrieving revision 1.15
diff -u -r1.15 menu.tcl
--- menu.tcl	31 Oct 2000 23:30:59 -0000	1.15
+++ menu.tcl	1 Nov 2006 22:41:34 -0000
@@ -929,11 +929,11 @@
     pack $selectText -side left -fill both -expand true
     pack $showBut $canBut -fill x
     pack $canBut -pady $pad -fill x
-    grid $selectLbl -row 0 -col 0 -padx $pad -sticky nw
-    grid $selectFrm -row 1 -col 0 -padx $pad -pady $pad -sticky nswe \
+    grid $selectLbl -row 0 -column 0 -padx $pad -sticky nw
+    grid $selectFrm -row 1 -column 0 -padx $pad -pady $pad -sticky nswe \
 	    -rowspan 2
-    grid $butFrm  -row 1 -col 1 -padx $pad -pady $pad -sticky nwe
-    grid $instLbl -row 3 -col 0 -padx $pad -sticky nw -columnspan 2
+    grid $butFrm  -row 1 -column 1 -padx $pad -pady $pad -sticky nwe
+    grid $instLbl -row 3 -column 0 -padx $pad -sticky nw -columnspan 2
     grid columnconfigure $mainFrm 0 -weight 1
     grid rowconfigure $mainFrm 1 -weight 1
     pack $mainFrm -fill both -expand true -padx $pad -pady $pad
Index: portWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/portWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 portWin.tcl
--- portWin.tcl	31 Oct 2000 23:31:00 -0000	1.5
+++ portWin.tcl	1 Nov 2006 22:41:34 -0000
@@ -97,9 +97,9 @@
     pack $portEnt  -side right
     pack $portLabel -side right
 
-    grid $imageLbl  -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $msgLbl    -row 0 -col 1 -sticky w -padx $pad -pady $pad
-    grid $portFrm   -row 2 -col 1 -sticky w -padx $pad -pady $pad
+    grid $imageLbl  -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $msgLbl    -row 0 -column 1 -sticky w -padx $pad -pady $pad
+    grid $portFrm   -row 2 -column 1 -sticky w -padx $pad -pady $pad
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 1 -weight 1
 
Index: prefWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/prefWin.tcl,v
retrieving revision 1.4
diff -u -r1.4 prefWin.tcl
--- prefWin.tcl	31 Oct 2000 23:31:00 -0000	1.4
+++ prefWin.tcl	1 Nov 2006 22:41:35 -0000
@@ -321,10 +321,10 @@
 		     -listwidth 6 -listheight 1 \
 		     -textvariable [pref::prefVar fontSize TempPref]]
 
-    grid $typeLbl -row 0 -col 0 -sticky w  -padx $pad -pady $pad
-    grid $typeBox -row 0 -col 1 -sticky we -pady $pad
-    grid $sizeLbl -row 0 -col 3 -sticky w  -padx $pad -pady $pad
-    grid $sizeBox -row 0 -col 4 -sticky we -pady $pad
+    grid $typeLbl -row 0 -column 0 -sticky w  -padx $pad -pady $pad
+    grid $typeBox -row 0 -column 1 -sticky we -pady $pad
+    grid $sizeLbl -row 0 -column 3 -sticky w  -padx $pad -pady $pad
+    grid $sizeBox -row 0 -column 4 -sticky we -pady $pad
     grid columnconfigure $subFrm 1 -weight 1
     grid columnconfigure $subFrm 2 -minsize 20
     grid columnconfigure $subFrm 5 -weight 1
@@ -385,12 +385,12 @@
     pack propagate $cmdresultFrm 0
     pack $cmdresultBut -fill both
 
-    grid $highLbl  -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $highFrm  -row 0 -col 1 -sticky w -pady $pad 
-    grid $errorLbl -row 0 -col 3 -sticky w -padx $pad -pady $pad
-    grid $errorFrm -row 0 -col 4 -sticky w -pady $pad
-    grid $cmdresultLbl -row 0 -col 6 -sticky w -padx $pad -pady $pad
-    grid $cmdresultFrm -row 0 -col 7 -sticky w -pady $pad
+    grid $highLbl  -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $highFrm  -row 0 -column 1 -sticky w -pady $pad 
+    grid $errorLbl -row 0 -column 3 -sticky w -padx $pad -pady $pad
+    grid $errorFrm -row 0 -column 4 -sticky w -pady $pad
+    grid $cmdresultLbl -row 0 -column 6 -sticky w -padx $pad -pady $pad
+    grid $cmdresultFrm -row 0 -column 7 -sticky w -pady $pad
     grid columnconfigure $subFrm 2 -minsize 20
     grid columnconfigure $subFrm 5 -minsize 20
     grid columnconfigure $subFrm 8 -weight 1
@@ -456,10 +456,10 @@
     set histryEnt [entry $subFrm.histryEnt -justify right -width 6 \
 		       -textvariable [pref::prefVar historySize TempPref]]
 
-    grid $screenLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $screenEnt -row 0 -col 1 -sticky w -pady $pad
-    grid $histryLbl -row 0 -col 3 -sticky w -padx $pad -pady $pad
-    grid $histryEnt -row 0 -col 4 -sticky w -pady $pad
+    grid $screenLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $screenEnt -row 0 -column 1 -sticky w -pady $pad
+    grid $histryLbl -row 0 -column 3 -sticky w -padx $pad -pady $pad
+    grid $histryEnt -row 0 -column 4 -sticky w -pady $pad
     grid columnconfigure $subFrm 2 -minsize 20
     grid columnconfigure $subFrm 5 -weight 1
 
@@ -490,8 +490,8 @@
     set tabEnt [entry $subFrm.screenEnt -justify right -width 6 \
 		    -textvariable [pref::prefVar tabSize TempPref]]
 
-    grid $tabLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $tabEnt -row 0 -col 1 -sticky w -pady $pad
+    grid $tabLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $tabEnt -row 0 -column 1 -sticky w -pady $pad
     grid columnconfigure $subFrm 3 -weight 1
 
     pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -510,7 +510,7 @@
     set reloadChk [checkbutton $subFrm.reloadChk \
 		     -text "Reload the previous project on startup." \
 		     -variable [pref::prefVar projectReload TempPref]]
-    grid $reloadChk -row 0 -col 0 -sticky w -padx $pad
+    grid $reloadChk -row 0 -column 0 -sticky w -padx $pad
     grid columnconfigure $subFrm 1 -weight 1
 
     pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -542,10 +542,10 @@
 		     -text "Warn before killing the application." \
 		     -variable [pref::prefVar warnOnKill TempPref]]
     
-    grid $askRad  -row 0 -col 0 -sticky w -padx $pad
-    grid $killRad -row 1 -col 0 -sticky w -padx $pad
-    grid $runRad  -row 2 -col 0 -sticky w -padx $pad
-    grid $warnChk -row 0 -col 2 -sticky w -padx $pad
+    grid $askRad  -row 0 -column 0 -sticky w -padx $pad
+    grid $killRad -row 1 -column 0 -sticky w -padx $pad
+    grid $runRad  -row 2 -column 0 -sticky w -padx $pad
+    grid $warnChk -row 0 -column 2 -sticky w -padx $pad
     grid columnconfigure $subFrm 1 -minsize 20
     grid columnconfigure $subFrm 3 -weight 1
 
@@ -579,7 +579,7 @@
     set mvBpChk [checkbutton $subFrm.mvBpChk \
 		     -text "Warn when moving invalid breakpoints." \
 		     -variable [pref::prefVar warnInvalidBp TempPref]]
-    grid $mvBpChk -row 0 -col 0 -sticky w -padx $pad
+    grid $mvBpChk -row 0 -column 0 -sticky w -padx $pad
     grid columnconfigure $subFrm 1 -weight 1
 
     pack $subFrm -fill both -expand true -padx $pad -pady $pad2
Index: procWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/procWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 procWin.tcl
--- procWin.tcl	31 Oct 2000 23:31:00 -0000	1.5
+++ procWin.tcl	1 Nov 2006 22:41:35 -0000
@@ -131,15 +131,15 @@
 	    -command {destroy $gui::gui(procDbgWin)}]
     pack $showBut $instruBut $uninstruBut $closeBut -fill x -pady 3
 
-    grid $patLbl -row 0 -col 0 -sticky we -pady $pad
-    grid $patEnt -row 0 -col 1 -sticky we -padx $pad -pady $pad
-    grid $patBut -row 0 -col 2 -sticky we -padx $pad -pady $pad
-    grid $sepFrm -row 1 -col 0 -sticky we -padx $pad -pady 3 -columnspan 3
-    grid $showChk -row 2 -col 0 -sticky nw -columnspan 3
-    grid $procText -row 3 -col 0 -sticky nswe -padx $pad -pady $pad \
+    grid $patLbl -row 0 -column 0 -sticky we -pady $pad
+    grid $patEnt -row 0 -column 1 -sticky we -padx $pad -pady $pad
+    grid $patBut -row 0 -column 2 -sticky we -padx $pad -pady $pad
+    grid $sepFrm -row 1 -column 0 -sticky we -padx $pad -pady 3 -columnspan 3
+    grid $showChk -row 2 -column 0 -sticky nw -columnspan 3
+    grid $procText -row 3 -column 0 -sticky nswe -padx $pad -pady $pad \
 	    -columnspan 2
-    grid $butFrm  -row 3 -col 2 -sticky nwe -padx $pad -pady $pad
-    grid $instLbl -row 4 -col 0 -sticky nw -padx $pad -columnspan 3
+    grid $butFrm  -row 3 -column 2 -sticky nwe -padx $pad -pady $pad
+    grid $instLbl -row 4 -column 0 -sticky nw -padx $pad -columnspan 3
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 3 -weight 1
 
Index: projWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/projWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 projWin.tcl
--- projWin.tcl	31 Oct 2000 23:31:00 -0000	1.5
+++ projWin.tcl	1 Nov 2006 22:41:36 -0000
@@ -562,8 +562,8 @@
     set portEnt [entry $remoteFrm.screenEnt -justify right -width 6 \
 	    -textvariable [pref::prefVar portRemote TempProj]]
 
-    grid $localRad  -row 0 -col 0 -sticky w -padx $pad
-    grid $remoteRad -row 0 -col 1 -sticky w -padx $pad
+    grid $localRad  -row 0 -column 0 -sticky w -padx $pad
+    grid $remoteRad -row 0 -column 1 -sticky w -padx $pad
     grid columnconfigure $appFrm 1 -weight 1 -minsize 20
     grid columnconfigure $appFrm 2 -weight 1 -minsize 20
 
@@ -585,8 +585,8 @@
     grid configure $interpCombo -sticky nwe
     grid columnconfigure $localFrm 0 -weight 1
 
-    grid $portLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $portEnt -row 0 -col 1 -sticky w -pady $pad
+    grid $portLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $portEnt -row 0 -column 1 -sticky w -pady $pad
     grid columnconfigure $remoteFrm 3 -weight 1
 
     pack $appFrm -fill x -expand true -padx $pad -pady $pad2
@@ -688,9 +688,9 @@
 	    -variable [pref::prefVar errorAction TempProj] \
 	    -value 0]
     
-    grid $errRad1 -row 0 -col 0 -sticky w -padx $pad
-    grid $errRad2   -row 1 -col 0 -sticky w -padx $pad
-    grid $errRad3   -row 2 -col 0 -sticky w -padx $pad
+    grid $errRad1 -row 0 -column 0 -sticky w -padx $pad
+    grid $errRad2   -row 1 -column 0 -sticky w -padx $pad
+    grid $errRad3   -row 2 -column 0 -sticky w -padx $pad
     grid columnconfigure $subFrm 0 -weight 1
 
     pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -761,17 +761,17 @@
 
     pack $instLbl -side left -anchor nw
     pack $instEnt -side left -anchor ne -fill x -expand true
-    grid $entFrm -row 0 -col 0 -columnspan 3 -sticky new -padx $pad -pady $pad
+    grid $entFrm -row 0 -column 0 -columnspan 3 -sticky new -padx $pad -pady $pad
 
-    grid $instDoLbl  -row 1 -col 0 -columnspan 3 -sticky nsw -padx $pad 
-    grid $doInstText -row 2 -col 0 -sticky nswe
-    grid $sbDoInst   -row 2 -col 1 -sticky nsw
-    grid $doButFrm   -row 2 -col 2 -sticky new -padx $pad
+    grid $instDoLbl  -row 1 -column 0 -columnspan 3 -sticky nsw -padx $pad 
+    grid $doInstText -row 2 -column 0 -sticky nswe
+    grid $sbDoInst   -row 2 -column 1 -sticky nsw
+    grid $doButFrm   -row 2 -column 2 -sticky new -padx $pad
     
-    grid $instNoLbl  -row 3 -col 0 -columnspan 3 -sticky nsw -padx $pad 
-    grid $noInstText -row 4 -col 0 -sticky nswe
-    grid $sbNoInst   -row 4 -col 1 -sticky nsw
-    grid $noButFrm   -row 4 -col 2 -sticky new -padx $pad
+    grid $instNoLbl  -row 3 -column 0 -columnspan 3 -sticky nsw -padx $pad 
+    grid $noInstText -row 4 -column 0 -sticky nswe
+    grid $sbNoInst   -row 4 -column 1 -sticky nsw
+    grid $noButFrm   -row 4 -column 2 -sticky new -padx $pad
 
     grid columnconfigure $subFrm 0 -weight 1 -minsize $pad
     grid rowconfigure $subFrm [list 2 4] -weight 1 -minsize $pad
@@ -872,11 +872,11 @@
 	    -text "Instrument Expect." \
 	    -variable [pref::prefVar instrumentExpect]]
 
-    grid $dynChk  -row 0 -col 0 -sticky w -padx $pad
-    grid $autoChk -row 1 -col 0 -sticky w -padx $pad
-    grid $incrChk  -row 0 -col 1 -sticky w -padx $pad
-    grid $tclxChk  -row 1 -col 1 -sticky w -padx $pad
-    grid $expectChk  -row 2 -col 1 -sticky w -padx $pad
+    grid $dynChk  -row 0 -column 0 -sticky w -padx $pad
+    grid $autoChk -row 1 -column 0 -sticky w -padx $pad
+    grid $incrChk  -row 0 -column 1 -sticky w -padx $pad
+    grid $tclxChk  -row 1 -column 1 -sticky w -padx $pad
+    grid $expectChk  -row 2 -column 1 -sticky w -padx $pad
     grid columnconfigure $subFrm 1 -minsize 20
     grid columnconfigure $subFrm 3 -weight 1
 
Index: selection.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/selection.tcl,v
retrieving revision 1.3
diff -u -r1.3 selection.tcl
--- selection.tcl	31 Oct 2000 23:31:01 -0000	1.3
+++ selection.tcl	1 Nov 2006 22:41:37 -0000
@@ -91,15 +91,15 @@
     # 	or re-enters the text widget.
 
     bind scrollText  {
-	set tkPriv(x) %x
-	set tkPriv(y) %y
+	set tk::Priv(x) %x
+	set tk::Priv(y) %y
 	sel::tkTextAutoScan %W
     }
     bind scrollText  {
-	tkCancelRepeat
+	tk::CancelRepeat
     }
     bind scrollText  {
-	tkCancelRepeat
+	tk::CancelRepeat
     }
 
     # selectFocus --
@@ -1052,7 +1052,7 @@
 #	This procedure is invoked when the mouse leaves a text window
 # 	with button 1 down.  It scrolls the window up, down, left, or right,
 # 	depending on where the mouse is (this information was saved in
-# 	tkPriv(x) and tkPriv(y)), and reschedules itself as an "after"
+# 	tk::Priv(x) and tk::Priv(y)), and reschedules itself as an "after"
 # 	command so that the window continues to scroll until the mouse
 # 	moves back into the window or the mouse button is released.
 #
@@ -1063,19 +1063,19 @@
 #	None.
 
 proc sel::tkTextAutoScan {w} {
-    global tkPriv
+    global tk::Priv
     if {![winfo exists $w]} return
-    if {$tkPriv(y) >= [winfo height $w]} {
+    if {$tk::Priv(y) >= [winfo height $w]} {
 	$w yview scroll 2 units
-    } elseif {$tkPriv(y) < 0} {
+    } elseif {$tk::Priv(y) < 0} {
 	$w yview scroll -2 units
-    } elseif {$tkPriv(x) >= [winfo width $w]} {
+    } elseif {$tk::Priv(x) >= [winfo width $w]} {
 	$w xview scroll 2 units
-    } elseif {$tkPriv(x) < 0} {
+    } elseif {$tk::Priv(x) < 0} {
 	$w xview scroll -2 units
     } else {
 	return
     }
-    set tkPriv(afterId) [after 50 sel::tkTextAutoScan $w]
+    set tk::Priv(afterId) [after 50 sel::tkTextAutoScan $w]
 }
 
Index: system.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/system.tcl,v
retrieving revision 1.22
diff -u -r1.22 system.tcl
--- system.tcl	31 Oct 2000 23:31:01 -0000	1.22
+++ system.tcl	1 Nov 2006 22:41:37 -0000
@@ -1053,10 +1053,10 @@
 		-variable [pref::prefVar browserDefault] \
 		-command "system::checkBrowserWindowState $otherLbl $otherEnt"]
 	
-	grid $defaultRad -row 0 -col 0 -sticky w  -padx $pad -columnspan 2
-	grid $otherRad   -row 1 -col 0 -sticky w  -padx $pad -columnspan 2
-	grid $otherLbl   -row 2 -col 1 -sticky w  -padx $pad  
-	grid $otherEnt   -row 3 -col 1 -sticky we -padx $pad 
+	grid $defaultRad -row 0 -column 0 -sticky w  -padx $pad -columnspan 2
+	grid $otherRad   -row 1 -column 0 -sticky w  -padx $pad -columnspan 2
+	grid $otherLbl   -row 2 -column 1 -sticky w  -padx $pad  
+	grid $otherEnt   -row 3 -column 1 -sticky we -padx $pad 
 	grid columnconfigure $subFrm 0 -minsize 40
 	grid columnconfigure $subFrm 1 -weight 1
 	pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -1072,8 +1072,8 @@
 	set browserBox [guiUtil::ComboBox $subFrm.browserBox \
 			    -textvariable [pref::prefVar browserCmd TempPref]]
 
-	grid $browserLbl -row 0 -col 0 -sticky w  -padx $pad
-	grid $browserBox -row 1 -col 0 -sticky we -padx $pad
+	grid $browserLbl -row 0 -column 0 -sticky w  -padx $pad
+	grid $browserBox -row 1 -column 0 -sticky we -padx $pad
 	grid columnconfigure $subFrm 0 -weight 1
 	pack $subFrm -fill both -expand true -padx $pad -pady $pad2
 
Index: tkcon.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/tkcon.tcl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tkcon.tcl
--- tkcon.tcl	18 Sep 1999 01:13:34 -0000	1.1.1.1
+++ tkcon.tcl	1 Nov 2006 22:41:38 -0000
@@ -466,7 +466,7 @@
     global tcl_platform tk_version
 
     #-----------------------------------------------------------------------
-    # Elements of tkPriv that are used in this file:
+    # Elements of tk::Priv that are used in this file:
     #
     # char -		Character position on the line;  kept in order
     #			to allow moving up or down past short lines while
@@ -572,9 +572,9 @@
     }
     bind TkConsole  {
 	if {[%W compare {limit linestart} == {insert linestart}]} {
-	    tkTextSetCursor %W limit
+	    tk::TextSetCursor %W limit
 	} else {
-	    tkTextSetCursor %W {insert linestart}
+	    tk::TextSetCursor %W {insert linestart}
 	}
     }
     bind TkConsole  {
@@ -597,14 +597,14 @@
     }
     bind TkConsole <> {
 	if {[%W compare {insert linestart} != {limit linestart}]} {
-	    tkTextSetCursor %W [tkTextUpDownLine %W -1]
+	    tk::TextSetCursor %W [tk::TextUpDownLine %W -1]
 	} else {
 	    tkCon::Event -1
 	}
     }
     bind TkConsole <> {
 	if {[%W compare {insert linestart} != {end-1c linestart}]} {
-	    tkTextSetCursor %W [tkTextUpDownLine %W 1]
+	    tk::TextSetCursor %W [tk::TextUpDownLine %W 1]
 	} else {
 	    tkCon::Event 1
 	}
@@ -623,7 +623,7 @@
     }
     bind TkConsole <>	{
 	## Transpose current and previous chars
-	if {[%W compare insert > "limit+1c"]} { tkTextTranspose %W }
+	if {[%W compare insert > "limit+1c"]} { tk::TextTranspose %W }
     }
     bind TkConsole <> {
 	## Clear command line (Unix shell staple)
@@ -641,10 +641,10 @@
 	tkCon::Insert %W $tkCon::TKCON(tmp)
 	%W see end
     }
-    catch {bind TkConsole    { tkTextScrollPages %W -1 }}
-    catch {bind TkConsole      { tkTextScrollPages %W -1 }}
-    catch {bind TkConsole  { tkTextScrollPages %W 1 }}
-    catch {bind TkConsole       { tkTextScrollPages %W 1 }}
+    catch {bind TkConsole    { tk::TextScrollPages %W -1 }}
+    catch {bind TkConsole      { tk::TextScrollPages %W -1 }}
+    catch {bind TkConsole  { tk::TextScrollPages %W 1 }}
+    catch {bind TkConsole       { tk::TextScrollPages %W 1 }}
     bind TkConsole <$TKCON(meta)-d> {
 	if {[%W compare insert >= limit]} {
 	    %W delete insert {insert wordend}
@@ -662,7 +662,7 @@
     }
     bind TkConsole  {
 	if {
-	    (!$tkPriv(mouseMoved) || $tk_strictMotif) && \
+	    (!$tk::Priv(mouseMoved) || $tk_strictMotif) && \
 	    (![catch {selection get -displayof %W} tkCon::TKCON(tmp)] || \
 	    ![catch {selection get -displayof %W -type TEXT} tkCon::TKCON(tmp)]\
 	    || ![catch {selection get -displayof %W \
Index: varWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/varWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 varWin.tcl
--- varWin.tcl	31 Oct 2000 23:31:01 -0000	1.3
+++ varWin.tcl	1 Nov 2006 22:41:38 -0000
@@ -51,7 +51,7 @@
     pack $vbpFrm   -side left -fill y
     pack $vbpText  -side left -fill both -expand true
     pack $nameText -side left -fill both -expand true
-    grid $valuText -sticky wnse -row 0 -col 0
+    grid $valuText -sticky wnse -row 0 -column 0
     grid columnconfigure $valuFrm 0 -weight 1
     grid rowconfigure $valuFrm 0 -weight 1
     guiUtil::tableCreate $varFrm $nameFrm $valuFrm \
Index: watchWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/watchWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 watchWin.tcl
--- watchWin.tcl	31 Oct 2000 23:31:01 -0000	1.3
+++ watchWin.tcl	1 Nov 2006 22:41:39 -0000
@@ -153,7 +153,7 @@
     pack $vbpFrm   -side left -fill y
     pack $vbpText  -side left -fill both -expand true
     pack $nameText -side left -fill both -expand true
-    grid $valuText -sticky wnse -row 0 -col 0
+    grid $valuText -sticky wnse -row 0 -column 0
     grid columnconfigure $valuFrm 0 -weight 1
     grid rowconfigure $valuFrm 0 -weight 1
     guiUtil::tableCreate $varFrm $nameFrm $valuFrm \
@@ -173,11 +173,11 @@
 	    -command {destroy $gui::gui(watchDbgWin)}] 
     pack $inspectBut $remBut $allBut $closeBut -fill x -pady 3
 
-    grid $addFrm -row 0 -col 0 -sticky we -padx $pad -pady $pad
-    grid $addBut -row 0 -col 1 -sticky we -padx $pad -pady $pad2
-    grid $sepFrm -row 1 -col 0 -columnspan 2 -sticky we -padx $pad
-    grid $varFrm -row 2 -col 0 -sticky nswe -padx $pad -pady $pad2
-    grid $butFrm -row 2 -col 1 -sticky nwe -padx $pad -pady [expr {$pad2 - 3}]
+    grid $addFrm -row 0 -column 0 -sticky we -padx $pad -pady $pad
+    grid $addBut -row 0 -column 1 -sticky we -padx $pad -pady $pad2
+    grid $sepFrm -row 1 -column 0 -columnspan 2 -sticky we -padx $pad
+    grid $varFrm -row 2 -column 0 -sticky nswe -padx $pad -pady $pad2
+    grid $butFrm -row 2 -column 1 -sticky nwe -padx $pad -pady [expr {$pad2 - 3}]
     grid columnconfigure $mainFrm 0 -weight 1
     grid rowconfigure $mainFrm 2 -weight 1
     pack $mainFrm -fill both -expand true -padx $pad -pady $pad
@@ -558,7 +558,7 @@
     $vbpText  configure -padx 2
 
     $valuText configure -yscroll [list gui::scrollDbgText $valuText $sb \
-	    [list grid $sb -sticky nse -row 0 -col 1]]
+	    [list grid $sb -sticky nse -row 0 -column 1]]
     
     # Special bindings on the nameText widget; toggling
     # VBPs on/off/enabled/disabled.


--- NEW FILE tcldebugger.spec ---
%define cvsdate 20061030

Summary: Tcl debugging library
Name: tcldebugger
Version: 1.4
Release: 1.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tcldebugger-20061030cvs tcldebugger
# tar czf tcldebugger-20061030cvs.tgz ./tcldebugger-20061030cvs
Source0: tcldebugger-%{cvsdate}cvs.tgz
Patch0:  tcldebugger-1.4-tclm4.patch
Patch1:  tcldebugger-1.4-destdir.patch
Patch2:  tcldebugger-1.4-tkupdate.patch
Patch3:  tcldebugger-1.4-shortsplash.patch
Patch4:  tcldebugger-1.4-shebang.patch
URL: http://tclpro.sourceforge.net/
BuildRequires: tcl-devel autoconf
Requires: tk tclparser tcllib tbcload
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%description
A debugging library for Tcl.  This is used by the graphical TclPro debugger.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
autoconf

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Fix a few file permissions for rpmlint
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.tcl
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.pdx

%check
# Disabling unit tests as they require tools that haven't been built yet.
#make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog license.terms
%defattr(-,root,root)
%{_bindir}/initdebug.tcl
%{_bindir}/appLaunch.tcl
%{_datadir}/%{name}%{version}
%{_mandir}/mann/*.gz

%changelog
* Tue Oct 31 2006 Wart  1.4-1.20061030cvs
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcldebugger/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:35:12 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:36:00 -0000	1.2
@@ -0,0 +1 @@
+tcldebugger-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcldebugger/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:35:12 -0000	1.1
+++ sources	25 Nov 2006 23:36:00 -0000	1.2
@@ -0,0 +1 @@
+2e58832337b39db415a39b121de89707  tcldebugger-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 23:36:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:36:30 -0500
Subject: rpms/tcldebugger import.log,1.1,1.2
Message-ID: <200611252336.kAPNaUUj016352@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307

Modified Files:
	import.log 
Log Message:
auto-import tcldebugger-1.4-1.20061030cvs on branch devel from tcldebugger-1.4-1.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tcldebugger/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 23:35:07 -0000	1.1
+++ import.log	25 Nov 2006 23:36:00 -0000	1.2
@@ -0,0 +1 @@
+tcldebugger-1_4-1_20061030cvs:HEAD:tcldebugger-1.4-1.20061030cvs.src.rpm:1164497833



From fedora-extras-commits at redhat.com  Sat Nov 25 23:38:34 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:38:34 -0500
Subject: owners owners.list,1.2013,1.2014
Message-ID: <200611252338.kAPNcYxJ016409@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16394

Modified Files:
	owners.list 
Log Message:
Added tclchecker, tcldebugger, and tclparser




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2013
retrieving revision 1.2014
diff -u -r1.2013 -r1.2014
--- owners.list	25 Nov 2006 22:25:16 -0000	1.2013
+++ owners.list	25 Nov 2006 23:38:04 -0000	1.2014
@@ -2266,10 +2266,13 @@
 Fedora Extras|tbcload|Tcl bytecode loader|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|tclchecker|Tcl syntax checker|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclcompiler|Tcl bytecode compiler|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tcldebugger|Tcl debugging library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tclparser|Tcl syntax parser|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclsoap|Tcl commands for SOAP remote procedure calls|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcltls|OpenSSL extension for Tcl|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 23:48:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:48:51 -0500
Subject: rpms/tclpro - New directory
Message-ID: <200611252348.kAPNmpW3016496@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16492/tclpro

Log Message:
Directory /cvs/extras/rpms/tclpro added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:48:57 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:48:57 -0500
Subject: rpms/tclpro/devel - New directory
Message-ID: <200611252348.kAPNmvsO016509@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16492/tclpro/devel

Log Message:
Directory /cvs/extras/rpms/tclpro/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:49:09 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:49:09 -0500
Subject: rpms/tclpro Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252349.kAPNn9Ws016539@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16533

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclpro


--- NEW FILE Makefile ---
# Top level Makefile for module tclpro
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  Sat Nov 25 23:49:14 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:49:14 -0500
Subject: rpms/tclpro/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611252349.kAPNnEFl016554@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16533/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclpro


--- 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  Sat Nov 25 23:50:53 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:50:53 -0500
Subject: rpms/tclpro import.log,1.1,1.2
Message-ID: <200611252350.kAPNor0C016708@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16654

Modified Files:
	import.log 
Log Message:
auto-import tclpro-1.5.0-6.20061030cvs on branch devel from tclpro-1.5.0-6.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclpro/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 23:49:09 -0000	1.1
+++ import.log	25 Nov 2006 23:50:23 -0000	1.2
@@ -0,0 +1 @@
+tclpro-1_5_0-6_20061030cvs:HEAD:tclpro-1.5.0-6.20061030cvs.src.rpm:1164498698



From fedora-extras-commits at redhat.com  Sat Nov 25 23:50:54 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:50:54 -0500
Subject: rpms/tclpro/devel procomp_pkgIndex.tcl, NONE, 1.1 prodebug.png, NONE,
	1.1 tclpro-1.5.0-about.patch, NONE,
	1.1 tclpro-1.5.0-helpurl.patch, NONE,
	1.1 tclpro-1.5.0-tclm4cvs.patch, NONE,
	1.1 tclpro-checker-startup.patch, NONE,
	1.1 tclpro-compiler-package.patch, NONE,
	1.1 tclpro-compiler-startup.patch, NONE,
	1.1 tclpro-projectInfo.patch, NONE, 1.1 tclpro.desktop, NONE,
	1.1 tclpro.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252350.kAPNosdd016712@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16654/devel

Modified Files:
	.cvsignore sources 
Added Files:
	procomp_pkgIndex.tcl prodebug.png tclpro-1.5.0-about.patch 
	tclpro-1.5.0-helpurl.patch tclpro-1.5.0-tclm4cvs.patch 
	tclpro-checker-startup.patch tclpro-compiler-package.patch 
	tclpro-compiler-startup.patch tclpro-projectInfo.patch 
	tclpro.desktop tclpro.spec 
Log Message:
auto-import tclpro-1.5.0-6.20061030cvs on branch devel from tclpro-1.5.0-6.20061030cvs.src.rpm


--- NEW FILE procomp_pkgIndex.tcl ---
package ifneeded procomp 1.0 [list source [file join $dir procomp.tcl]]

tclpro-1.5.0-about.patch:

--- NEW FILE tclpro-1.5.0-about.patch ---
--- modules/debugger/src/startup.tcl.orig	2006-11-01 15:41:10.000000000 -0800
+++ modules/debugger/src/startup.tcl	2006-11-01 21:38:34.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #	This file is the primary entry point for the 
@@ -11,11 +15,13 @@
 # Initialize the debugger library
 
 package require projectInfo
+  
+set imageDir @imagedir@
 
 # Specify the additional debugger parameters.
 
 set parameters [list \
-	aboutCmd {::TclProAboutBox images/about.gif images/logo.gif} \
+	aboutCmd "::TclProAboutBox $imageDir/images/about.gif $imageDir/images/logo.gif" \
 	aboutCopyright "$::projectInfo::copyright\nVersion $::projectInfo::patchLevel" \
 	appType local \
 	]
@@ -24,7 +30,7 @@
     package require Winico
     lappend parameters iconImage [winico load dbg scicons.dll]
 } else {
-    lappend parameters iconImage images/debugUnixIcon.gif
+    lappend parameters iconImage $imageDir/images/debugUnixIcon.gif
 }
 
 # ::TclProAboutBox --
@@ -73,23 +79,17 @@
     set f2 [frame $f1.f2 -bg white -bd 0]
     pack $f2 -padx 6 -pady 6 -side bottom -fill both -expand 1
 
-    label $f2.logo -bd 0 -bg white -padx 0 -pady 0 -highlightthickness 0 \
-	    -image logo
-    pack $f2.logo -side left -anchor nw -padx 0 -pady 0
-
-if {0} {
-    # No room for this
     set okBut [button $f2.ok -text "OK" -width 6 -default active \
 	    -command {destroy .about}]
-    pack $okBut -side right -anchor se -padx 0 -pady 0
-}
+    pack $okBut -side left -anchor nw -padx 0 -pady 0
 
     label $f2.version -bd 0 -bg white -padx 10 -pady 0 -highlightthickness 0 \
-	    -text $::debugger::parameters(aboutCopyright) -justify left
+	    -text $::debugger::parameters(aboutCopyright) -justify left \
+            -wraplength 400
     pack $f2.version -side top -anchor nw
 
     label $f2.url -bd 0 -bg white -padx 10 -pady 0 -highlightthickness 0 \
-	    -text "http://www.ajubasolutions.com" -fg blue \
+	    -text "http://tclpro.sourceforge.net" -fg blue \
 	    -cursor hand2
     pack $f2.url -side top -anchor nw
 

tclpro-1.5.0-helpurl.patch:

--- NEW FILE tclpro-1.5.0-helpurl.patch ---
--- modules/projectInfo/projectInfo.tcl.orig	2006-11-01 16:10:57.000000000 -0800
+++ modules/projectInfo/projectInfo.tcl	2006-11-01 16:11:05.000000000 -0800
@@ -215,7 +215,7 @@
 	set helpFile(thisProduct) $tmp
     } else {
 	set helpFile(thisProduct) \
-		http://www.ajubasolutions.com/products/tclpro/doc/
+		http://tclpro.sourceforge.net
     }
 
     # By defining these variables the startup sequence will check licenses

tclpro-1.5.0-tclm4cvs.patch:

--- NEW FILE tclpro-1.5.0-tclm4cvs.patch ---
--- config/tcl.m4.orig	2006-11-01 12:17:21.000000000 -0800
+++ config/tcl.m4	2006-11-01 12:18:23.000000000 -0800
@@ -68,7 +68,10 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -161,7 +164,10 @@
 	    fi
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tkConfig.sh" ; then
@@ -588,7 +594,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -1580,7 +1586,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`

tclpro-checker-startup.patch:

--- NEW FILE tclpro-checker-startup.patch ---
--- modules/checker/src/startup.tcl.orig	2006-11-01 21:37:22.000000000 -0800
+++ modules/checker/src/startup.tcl	2006-11-01 21:38:46.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #	This file is the primary entry point for the 

tclpro-compiler-package.patch:

--- NEW FILE tclpro-compiler-package.patch ---
Index: modules/compiler/src/procomp.tcl
===================================================================
RCS file: /cvsroot/tclpro/tclpro/modules/compiler/src/procomp.tcl,v
retrieving revision 1.4
diff -c -r1.4 procomp.tcl
*** modules/compiler/src/procomp.tcl	8 Feb 2001 21:40:55 -0000	1.4
--- modules/compiler/src/procomp.tcl	29 Nov 2005 19:41:41 -0000
***************
*** 20,25 ****
--- 20,26 ----
  
  package require Tcl 8.0
  package require compiler 1.0
+ package require cmdline
  
  package provide procomp 1.0
  

tclpro-compiler-startup.patch:

--- NEW FILE tclpro-compiler-startup.patch ---
--- modules/compiler/src/startup.tcl.orig	2006-11-01 21:39:11.000000000 -0800
+++ modules/compiler/src/startup.tcl	2006-11-01 21:39:38.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #  Startup script for the TclPro bytecode compiler.

tclpro-projectInfo.patch:

--- NEW FILE tclpro-projectInfo.patch ---
Index: modules/projectInfo/Makefile.in
===================================================================
RCS file: /cvsroot/tclpro/tclpro/modules/projectInfo/Makefile.in,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile.in
*** modules/projectInfo/Makefile.in	23 Nov 1999 22:04:18 -0000	1.1.1.1
--- modules/projectInfo/Makefile.in	29 Nov 2005 01:13:02 -0000
***************
*** 29,35 ****
  exec_prefix = @exec_prefix@
  bindir = @bindir@
  
! pkglibdir = ${prefix}/lib/@PACKAGE@@VERSION@
  
  top_builddir = .
  
--- 29,35 ----
  exec_prefix = @exec_prefix@
  bindir = @bindir@
  
! pkgdatadir = @datadir@/@PACKAGE@@VERSION@
  
  top_builddir = .
  
***************
*** 70,85 ****
  install-binaries:
  
  install-libraries: installdirs
! 	@echo "Installing script files in $(pkglibdir)"
  	@for i in $(PROJECTINFO_SOURCES) ; do \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$i $(pkglibdir) ; \
  	done;
! 	$(INSTALL_SCRIPT) $(PKGINDEX_TCL) $(pkglibdir)
  
  install-doc:
  
  installdirs:
! 	$(mkinstalldirs) $(pkglibdir)
  
  clean:  
  	-test -z "$(BINARIES)" || rm -f $(BINARIES)
--- 70,85 ----
  install-binaries:
  
  install-libraries: installdirs
! 	@echo "Installing script files in $(DESTDIR)$(pkgdatadir)"
  	@for i in $(PROJECTINFO_SOURCES) ; do \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir) ; \
  	done;
! 	$(INSTALL_SCRIPT) $(PKGINDEX_TCL) $(DESTDIR)$(pkgdatadir)
  
  install-doc:
  
  installdirs:
! 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
  
  clean:  
  	-test -z "$(BINARIES)" || rm -f $(BINARIES)


--- NEW FILE tclpro.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=TclPro Debugger
GenericName=TclPro Debugger
Comment=Graphical debugger for Tcl applications
Exec=prodebug
Icon=prodebug.png
Terminal=false
Type=Application
Categories=Application;Programming;Development;
Version=1.5.0


--- NEW FILE tclpro.spec ---
%define cvsdate 20061030

Summary: Development and debugging tools for Tcl applications
Name: tclpro
Version: 1.5.0
Release: 6.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Tools
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclpro-20061030cvs tbcload
# tar czf tclpro-20061030cvs.tgz ./tclpro-20061030cvs
Source0: tclpro-%{cvsdate}cvs.tgz
Source1: tclpro.desktop
Source2: prodebug.png
Source3: procomp_pkgIndex.tcl
Patch0: tclpro-projectInfo.patch
Patch1: tclpro-checker-startup.patch
Patch2: tclpro-compiler-startup.patch
Patch3: tclpro-compiler-package.patch
Patch4: tclpro-1.5.0-tclm4cvs.patch
Patch5: tclpro-1.5.0-about.patch
Patch6: tclpro-1.5.0-helpurl.patch
URL: http://tclpro.sourceforge.net/
Requires: tk >= 0:8.3.2 tcllib tclcompiler tcldebugger tclchecker
BuildRequires: tcl-devel autoconf
BuildRequires: desktop-file-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%description
The TclPro tool set includes a graphical debugger, a static code checker,
a compiler that writes out Tcl byte codes, and a loader that reads
byte codes.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6

for i in debugger checker projectInfo compiler ; do 
    pushd modules/$i
    autoconf
    popd
done

%build
pushd modules/projectInfo
%configure
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd modules/projectInfo
make install DESTDIR=$RPM_BUILD_ROOT
popd
mkdir -p $RPM_BUILD_ROOT%{_bindir}
sed -e 's#@imagedir@#%{_datadir}/tcldebugger1.4#' < modules/debugger/src/startup.tcl > $RPM_BUILD_ROOT/%{_bindir}/prodebug
chmod 755 $RPM_BUILD_ROOT/%{_bindir}/prodebug
install -m 755 modules/checker/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procheck
install -m 755 modules/compiler/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procompile

# The Tcl compiler application needs an extra file/package to run.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/procomp1.5
install -m 644 %{SOURCE3} modules/compiler/src/procomp.tcl $RPM_BUILD_ROOT/%{_datadir}/procomp1.5/

# Fix a few file permissions for rpmlint
chmod a-x $RPM_BUILD_ROOT%{_datadir}/projectInfo1.4/*.tcl


desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog
%defattr(-,root,root)
%{_bindir}/procheck
%{_bindir}/prodebug
%{_bindir}/procompile
%{_datadir}/procomp1.5
%{_datadir}/projectInfo1.4
%{_datadir}/applications/fedora-tclpro.desktop
%{_datadir}/pixmaps/prodebug.png

%changelog
* Tue Oct 31 2006 Wart  1.5.0-6.20061030cvs
- Initial package for Fedora

* Mon Jul 10 2006 Wart  1.5.0-5.1
- Clean up a few rpmlint warnings

* Tue Mar 28 2006 Wart  1.5.0-5
- Update tcl.m4 to fix quoting bug exposed in Fedora Core 5

* Mon Dec 5 2005 Wart  1.5.0-3
- Replace older tk* commands with proper tk::* namespaced commands.

* Mon Nov 28 2005 Wart  1.5.0-2
- Added the TclPro compiler.

* Sun Nov 27 2005 Wart  1.5.0-1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclpro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:49:14 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:50:24 -0000	1.2
@@ -0,0 +1 @@
+tclpro-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclpro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:49:14 -0000	1.1
+++ sources	25 Nov 2006 23:50:24 -0000	1.2
@@ -0,0 +1 @@
+16eae8daa867effb355a6daaf7f2d2c6  tclpro-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 01:24:28 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 20:24:28 -0500
Subject: owners owners.list,1.2014,1.2015
Message-ID: <200611260124.kAQ1OSld023022@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23005

Modified Files:
	owners.list 
Log Message:
Added tclpro




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2014
retrieving revision 1.2015
diff -u -r1.2014 -r1.2015
--- owners.list	25 Nov 2006 23:38:04 -0000	1.2014
+++ owners.list	26 Nov 2006 01:23:58 -0000	1.2015
@@ -2273,6 +2273,7 @@
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclparser|Tcl syntax parser|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tclpro|Development and debugging tools for Tcl applications|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclsoap|Tcl commands for SOAP remote procedure calls|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcltls|OpenSSL extension for Tcl|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 04:56:36 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:56:36 -0500
Subject: rpms/clipsmm - New directory
Message-ID: <200611260456.kAQ4uavT000432@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv428/clipsmm

Log Message:
Directory /cvs/extras/rpms/clipsmm added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 04:56:42 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:56:42 -0500
Subject: rpms/clipsmm/devel - New directory
Message-ID: <200611260456.kAQ4ugum000445@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv428/clipsmm/devel

Log Message:
Directory /cvs/extras/rpms/clipsmm/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 04:56:51 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:56:51 -0500
Subject: rpms/clipsmm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611260456.kAQ4up69000475@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv469

Added Files:
	Makefile import.log 
Log Message:
Setup of module clipsmm


--- NEW FILE Makefile ---
# Top level Makefile for module clipsmm
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 Nov 26 04:56:56 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:56:56 -0500
Subject: rpms/clipsmm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611260456.kAQ4uukN000490@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv469/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clipsmm


--- 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 Nov 26 04:57:50 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:57:50 -0500
Subject: rpms/clipsmm import.log,1.1,1.2
Message-ID: <200611260457.kAQ4voqe000559@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv529

Modified Files:
	import.log 
Log Message:
auto-import clipsmm-0.0.7-1 on branch devel from clipsmm-0.0.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clipsmm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 04:56:50 -0000	1.1
+++ import.log	26 Nov 2006 04:57:20 -0000	1.2
@@ -0,0 +1 @@
+clipsmm-0_0_7-1:HEAD:clipsmm-0.0.7-1.src.rpm:1164517121



From fedora-extras-commits at redhat.com  Sun Nov 26 04:57:50 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:57:50 -0500
Subject: rpms/clipsmm/devel clipsmm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611260457.kAQ4vofK000563@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv529/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clipsmm.spec 
Log Message:
auto-import clipsmm-0.0.7-1 on branch devel from clipsmm-0.0.7-1.src.rpm


--- NEW FILE clipsmm.spec ---

Summary:          Clipsmm is a C++ wrapper for the CLIPS C library
Name:             clipsmm
Version:          0.0.7
Release:          1%{?dist}
License:          GPL
URL:              http://clipsmm.sourceforge.net
Group:            System Environment/Libraries
Source:           http://download.sourceforge.net/clipsmm/clipsmm-0.0.7.tar.bz2
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    clips-devel >= 6.24 glibmm24-devel >= 2.6.0 cppunit-devel >= 1.11 pkgconfig m4

%description
The clipsmm library provides a C++ interface to the CLIPS C library.

%package          devel
Summary:          Headers for developing programs that will use clipsmm
Group:            Development/Libraries
Requires:         clipsmm = %{version}-%{release}
Requires:         clips-devel >= 6.24 glibmm24-devel >= 2.6.0 pkgconfig

%description    devel
This package contains the libraries and header files needed for
developing clipsmm applications.

%prep
%setup -q

%build
%configure --enable-static=no
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}

%{__make} DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
# Copy the docs into a different place in the dist hierarchy so they
# install as /usr/share/doc/package-x.x.x-devel/reference
%{__cp} -ar docs/reference .

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
%doc AUTHORS COPYING

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_libdir}/pkgconfig/clipsmm*.pc
%{_includedir}/clipsmm-0.0/
%doc ChangeLog reference


%changelog
* Sun Nov 12 2006 Rick L Vinyard Jr  - 0.0.7-1
- New release

* Sun Aug  6 2006 Rick L Vinyard Jr  - 0.0.6-1
- New release
- Added m4 to BuildRequires

* Mon Jul 31 2006 Rick L Vinyard Jr  - 0.0.5-1
- New release fixes autoconf generated headers
- Removed pkgconfig from BuildRequires
- Added pkgconfig to -devel Requires

* Sun Jul 30 2006 Rick L Vinyard Jr  - 0.0.4-2
- Changed make to %%{__make}
- Changed %%{name} to autoconf subst that puts specific name in devel requires
- Added comment regarding why cp occurs for docs
- Added package name to globs in so libs, .pc and demos
- Changed clips-libs BuildRequires to clips-devel
- Added cppunit-devel BuildRequires

* Sat Jul 29 2006 Rick L Vinyard Jr  - 0.0.4-1
- New release

* Sat Jul 21 2006 Rick L Vinyard Jr  - 0.0.3-1
- New release

* Sat Jul 20 2006 Rick L Vinyard Jr  - 0.0.2-1
- New release

* Sun Jun 25 2006 Rick L Vinyard Jr  - 0.0.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clipsmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 04:56:56 -0000	1.1
+++ .cvsignore	26 Nov 2006 04:57:20 -0000	1.2
@@ -0,0 +1 @@
+clipsmm-0.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clipsmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 04:56:56 -0000	1.1
+++ sources	26 Nov 2006 04:57:20 -0000	1.2
@@ -0,0 +1 @@
+462cad31023799926ab67f78b628e719  clipsmm-0.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 05:00:32 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sun, 26 Nov 2006 00:00:32 -0500
Subject: owners owners.list,1.2015,1.2016
Message-ID: <200611260500.kAQ50WHR000637@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv613

Modified Files:
	owners.list 
Log Message:
Added clipsmm




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2015
retrieving revision 1.2016
diff -u -r1.2015 -r1.2016
--- owners.list	26 Nov 2006 01:23:58 -0000	1.2015
+++ owners.list	26 Nov 2006 05:00:02 -0000	1.2016
@@ -207,6 +207,7 @@
 Fedora Extras|clearsilver|HTML template system|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|clement|An application to filter and manage E-mail traffic|jmp at safe.ca|extras-qa at fedoraproject.org|
 Fedora Extras|clips|CLIPS language for expert systems|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
+Fedora Extras|clipsmm|Clipsmm is a C++ wrapper for the CLIPS C library|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|clusterssh|Secure concurrent multi-server terminal control|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 06:52:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 26 Nov 2006 01:52:47 -0500
Subject: fedora-security/audit fe3, 1.33, 1.34 fe4, 1.100, 1.101 fe5, 1.108, 
	1.109 fe6, 1.24, 1.25
Message-ID: <200611260652.kAQ6ql3W006949@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6928

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
kile was fixed


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fe3	25 Nov 2006 15:31:44 -0000	1.33
+++ fe3	26 Nov 2006 06:52:47 -0000	1.34
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
+CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5602 VULNERABLE (xsupplicant) #212699


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fe4	25 Nov 2006 15:31:44 -0000	1.100
+++ fe4	26 Nov 2006 06:52:47 -0000	1.101
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
+CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fe5	25 Nov 2006 15:31:44 -0000	1.108
+++ fe5	26 Nov 2006 06:52:47 -0000	1.109
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
+CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fe6	25 Nov 2006 15:31:44 -0000	1.24
+++ fe6	26 Nov 2006 06:52:47 -0000	1.25
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
+CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077



From fedora-extras-commits at redhat.com  Sun Nov 26 09:59:29 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 04:59:29 -0500
Subject: rpms/mlmmj/devel .cvsignore, 1.9, 1.10 mlmmj.spec, 1.24,
	1.25 sources, 1.9, 1.10
Message-ID: <200611260959.kAQ9xT9q004577@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4556

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  1.2.12-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Jan 2006 22:42:20 -0000	1.9
+++ .cvsignore	26 Nov 2006 09:58:59 -0000	1.10
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mlmmj.spec	3 Sep 2006 06:24:32 -0000	1.24
+++ mlmmj.spec	26 Nov 2006 09:58:59 -0000	1.25
@@ -2,8 +2,8 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
-Release: 5%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  1.2.12-1
+- New upstream release
+
 * Sun Sep 3 2006 Michael Fleming  1.2.11-5
 - Rebuild 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jan 2006 22:42:20 -0000	1.9
+++ sources	26 Nov 2006 09:58:59 -0000	1.10
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 10:02:39 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:02:39 -0500
Subject: rpms/mlmmj/FC-6 .cvsignore, 1.9, 1.10 mlmmj.spec, 1.24, 1.25 sources,
	1.9, 1.10
Message-ID: <200611261002.kAQA2dE8007670@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7647

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  1.2.12-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Jan 2006 22:42:20 -0000	1.9
+++ .cvsignore	26 Nov 2006 10:02:09 -0000	1.10
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-6/mlmmj.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mlmmj.spec	3 Sep 2006 06:24:32 -0000	1.24
+++ mlmmj.spec	26 Nov 2006 10:02:09 -0000	1.25
@@ -2,8 +2,8 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
-Release: 5%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  1.2.12-1
+- New upstream release
+
 * Sun Sep 3 2006 Michael Fleming  1.2.11-5
 - Rebuild 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jan 2006 22:42:20 -0000	1.9
+++ sources	26 Nov 2006 10:02:09 -0000	1.10
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 10:05:17 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:05:17 -0500
Subject: rpms/mlmmj/FC-5 .cvsignore, 1.9, 1.10 mlmmj.spec, 1.22, 1.23 sources,
	1.9, 1.10
Message-ID: <200611261005.kAQA5HtC007739@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7720

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  1.2.12-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Jan 2006 22:42:20 -0000	1.9
+++ .cvsignore	26 Nov 2006 10:04:47 -0000	1.10
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-5/mlmmj.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mlmmj.spec	17 Mar 2006 23:33:43 -0000	1.22
+++ mlmmj.spec	26 Nov 2006 10:04:47 -0000	1.23
@@ -2,8 +2,8 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
-Release: 4%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  1.2.12-1
+- New upstream release.
+
 * Sat Mar 18 2006 Michael Fleming  1.2.11-4
 - Bump for FC5 final. Really
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jan 2006 22:42:20 -0000	1.9
+++ sources	26 Nov 2006 10:04:47 -0000	1.10
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 10:14:36 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:14:36 -0500
Subject: rpms/mod_cband/devel .cvsignore, 1.4, 1.5 mod_cband.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611261014.kAQAEaZs007859@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_cband/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7840

Modified Files:
	.cvsignore mod_cband.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 May 2006 09:02:51 -0000	1.4
+++ .cvsignore	26 Nov 2006 10:14:06 -0000	1.5
@@ -1 +1 @@
-mod-cband-0.9.7.4.tgz
+mod-cband-0.9.7.5.tgz


Index: mod_cband.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/devel/mod_cband.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_cband.spec	3 Sep 2006 06:29:42 -0000	1.5
+++ mod_cband.spec	26 Nov 2006 10:14:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           mod_cband
-Version:        0.9.7.4
-Release:        2%{?dist}
+Version:        0.9.7.5
+Release:        1%{?dist}
 Summary:        Bandwidth limiting for virtual hosts
 Group:          System Environment/Daemons
 License:        GPL
@@ -42,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
+- New upstream release.
+
 * Sun Sep 3 2006 Michael Fleming  0.9.7.4-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 09:02:51 -0000	1.5
+++ sources	26 Nov 2006 10:14:06 -0000	1.6
@@ -1 +1 @@
-ff635d7b55bf7ca648d319247dfb45e3  mod-cband-0.9.7.4.tgz
+5c5d65dc9abe6cdc6931b6dd33be5018  mod-cband-0.9.7.5.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 10:16:40 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:16:40 -0500
Subject: rpms/mod_cband/FC-6 .cvsignore, 1.4, 1.5 mod_cband.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611261016.kAQAGeBZ007941@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_cband/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7916

Modified Files:
	.cvsignore mod_cband.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 May 2006 09:02:51 -0000	1.4
+++ .cvsignore	26 Nov 2006 10:16:10 -0000	1.5
@@ -1 +1 @@
-mod-cband-0.9.7.4.tgz
+mod-cband-0.9.7.5.tgz


Index: mod_cband.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-6/mod_cband.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_cband.spec	3 Sep 2006 06:29:42 -0000	1.5
+++ mod_cband.spec	26 Nov 2006 10:16:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           mod_cband
-Version:        0.9.7.4
-Release:        2%{?dist}
+Version:        0.9.7.5
+Release:        1%{?dist}
 Summary:        Bandwidth limiting for virtual hosts
 Group:          System Environment/Daemons
 License:        GPL
@@ -42,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
+- New upstream release.
+
 * Sun Sep 3 2006 Michael Fleming  0.9.7.4-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 09:02:51 -0000	1.5
+++ sources	26 Nov 2006 10:16:10 -0000	1.6
@@ -1 +1 @@
-ff635d7b55bf7ca648d319247dfb45e3  mod-cband-0.9.7.4.tgz
+5c5d65dc9abe6cdc6931b6dd33be5018  mod-cband-0.9.7.5.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 10:17:42 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 26 Nov 2006 05:17:42 -0500
Subject: rpms/testdisk/devel testdisk.spec,1.8,1.9
Message-ID: <200611261017.kAQAHgTX007996@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7938

Modified Files:
	testdisk.spec 
Log Message:
Updated spec file to build TestDisk against ntfsprogs (BUG 217261)



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testdisk.spec	24 Oct 2006 06:27:17 -0000	1.8
+++ testdisk.spec	26 Nov 2006 10:17:12 -0000	1.9
@@ -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(pl):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
+Summary(fr):	Outil pour v??rifier et restorer des partitions
+Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:  ntfsprogs-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,18 +22,18 @@
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l pl
-Narz?dzie sprawdzaj?ce i odzyskujace partycje. Pracuje z partycjami:
+Narz??dzie sprawdzaj??ce i odzyskujace partycje. Pracuje z partycjami:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr
-Outil pour v?rifier et restorer des partitions. Fonctionne avec
+Outil pour v??rifier et restorer des partitions. Fonctionne avec
 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
-????????? ??? ???????? ? ?????????????? ???????? ?????.
-???????????? ????????? ???? ????????:
+?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
+???????????????????????? ?????????????????? ???????? ????????????????:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
@@ -57,6 +58,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Nov 26 2006 Christophe Grenier  6.5-2
+- Use ntfsprogs to provide NTFS listing capabilities to TestDisk
+
 * Tue Oct 24 2006 Christophe Grenier  6.5-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Sun Nov 26 10:20:16 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:20:16 -0500
Subject: rpms/mod_cband/FC-5 .cvsignore, 1.4, 1.5 mod_cband.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611261020.kAQAKGCO008071@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_cband/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8052

Modified Files:
	.cvsignore mod_cband.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2006 12:19:54 -0000	1.4
+++ .cvsignore	26 Nov 2006 10:19:46 -0000	1.5
@@ -1 +1 @@
-mod-cband-0.9.7.4.tgz
+mod-cband-0.9.7.5.tgz


Index: mod_cband.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-5/mod_cband.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_cband.spec	31 May 2006 12:19:54 -0000	1.4
+++ mod_cband.spec	26 Nov 2006 10:19:46 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           mod_cband
-Version:        0.9.7.4
+Version:        0.9.7.5
 Release:        1%{?dist}
 Summary:        Bandwidth limiting for virtual hosts
 Group:          System Environment/Daemons
@@ -42,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
+- New upstream release
+
 * Mon May 29 2006 Michael Fleming  0.9.7.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 May 2006 12:19:54 -0000	1.5
+++ sources	26 Nov 2006 10:19:46 -0000	1.6
@@ -1 +1 @@
-ff635d7b55bf7ca648d319247dfb45e3  mod-cband-0.9.7.4.tgz
+5c5d65dc9abe6cdc6931b6dd33be5018  mod-cband-0.9.7.5.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 10:26:16 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:26:16 -0500
Subject: rpms/mod_cband/FC-4 .cvsignore, 1.4, 1.5 mod_cband.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611261026.kAQAQGda008145@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_cband/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8126

Modified Files:
	.cvsignore mod_cband.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2006 12:27:49 -0000	1.4
+++ .cvsignore	26 Nov 2006 10:25:46 -0000	1.5
@@ -1 +1 @@
-mod-cband-0.9.7.4.tgz
+mod-cband-0.9.7.5.tgz


Index: mod_cband.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-4/mod_cband.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_cband.spec	31 May 2006 12:27:49 -0000	1.4
+++ mod_cband.spec	26 Nov 2006 10:25:46 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           mod_cband
-Version:        0.9.7.4
+Version:        0.9.7.5
 Release:        1%{?dist}
 Summary:        Bandwidth limiting for virtual hosts
 Group:          System Environment/Daemons
@@ -42,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
+- New upstream release
+
 * Mon May 29 2006 Michael Fleming  0.9.7.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 May 2006 12:27:49 -0000	1.5
+++ sources	26 Nov 2006 10:25:46 -0000	1.6
@@ -1 +1 @@
-ff635d7b55bf7ca648d319247dfb45e3  mod-cband-0.9.7.4.tgz
+5c5d65dc9abe6cdc6931b6dd33be5018  mod-cband-0.9.7.5.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 10:51:41 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 26 Nov 2006 05:51:41 -0500
Subject: rpms/testdisk/FC-5 testdisk.spec,1.8,1.9
Message-ID: <200611261051.kAQApfIT008268@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8233/FC-5

Modified Files:
	testdisk.spec 
Log Message:
Rebuild TestDisk with ntfsprogs to be able to list files from NTFS filesystem.



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-5/testdisk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testdisk.spec	24 Oct 2006 06:36:29 -0000	1.8
+++ testdisk.spec	26 Nov 2006 10:51:11 -0000	1.9
@@ -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(pl):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
+Summary(fr):	Outil pour v??rifier et restorer des partitions
+Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:  ntfsprogs-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,18 +22,18 @@
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l pl
-Narz?dzie sprawdzaj?ce i odzyskujace partycje. Pracuje z partycjami:
+Narz??dzie sprawdzaj??ce i odzyskujace partycje. Pracuje z partycjami:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr
-Outil pour v?rifier et restorer des partitions. Fonctionne avec
+Outil pour v??rifier et restorer des partitions. Fonctionne avec
 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
-????????? ??? ???????? ? ?????????????? ???????? ?????.
-???????????? ????????? ???? ????????:
+?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
+???????????????????????? ?????????????????? ???????? ????????????????:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
@@ -57,6 +58,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Nov 26 2006 Christophe Grenier  6.5-2
+- Use ntfsprogs to provide NTFS listing capabilities to TestDisk
+
 * Tue Oct 24 2006 Christophe Grenier  6.5-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Sun Nov 26 10:51:41 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 26 Nov 2006 05:51:41 -0500
Subject: rpms/testdisk/FC-6 testdisk.spec,1.8,1.9
Message-ID: <200611261051.kAQApf0a008271@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8233/FC-6

Modified Files:
	testdisk.spec 
Log Message:
Rebuild TestDisk with ntfsprogs to be able to list files from NTFS filesystem.



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-6/testdisk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testdisk.spec	24 Oct 2006 16:17:38 -0000	1.8
+++ testdisk.spec	26 Nov 2006 10:51:11 -0000	1.9
@@ -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(pl):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
+Summary(fr):	Outil pour v??rifier et restorer des partitions
+Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:  ntfsprogs-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,18 +22,18 @@
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l pl
-Narz?dzie sprawdzaj?ce i odzyskujace partycje. Pracuje z partycjami:
+Narz??dzie sprawdzaj??ce i odzyskujace partycje. Pracuje z partycjami:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr
-Outil pour v?rifier et restorer des partitions. Fonctionne avec
+Outil pour v??rifier et restorer des partitions. Fonctionne avec
 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
-????????? ??? ???????? ? ?????????????? ???????? ?????.
-???????????? ????????? ???? ????????:
+?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
+???????????????????????? ?????????????????? ???????? ????????????????:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
@@ -57,6 +58,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Nov 26 2006 Christophe Grenier  6.5-2
+- Use ntfsprogs to provide NTFS listing capabilities to TestDisk
+
 * Tue Oct 24 2006 Christophe Grenier  6.5-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Sun Nov 26 11:40:05 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:40:05 -0500
Subject: rpms/libtorrent/devel .cvsignore, 1.5, 1.6 libtorrent.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200611261140.kAQBe5oC011708@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11689

Modified Files:
	.cvsignore libtorrent.spec sources 
Log Message:
Upgrade to new version and work around compiler triggered bug


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Sep 2006 09:55:14 -0000	1.5
+++ .cvsignore	26 Nov 2006 11:39:35 -0000	1.6
@@ -1 +1 @@
-libtorrent-0.10.2.tar.gz
+libtorrent-0.10.4.tar.gz


Index: libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libtorrent.spec	2 Oct 2006 21:18:48 -0000	1.12
+++ libtorrent.spec	26 Nov 2006 11:39:35 -0000	1.13
@@ -1,8 +1,8 @@
 Name:          libtorrent
 License:       GPL
 Group:         System Environment/Libraries
-Version:       0.10.2
-Release:       3%{?dist}
+Version:       0.10.4
+Release:       1%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -29,6 +29,12 @@
 %setup -q
 
 %build
+
+# work around a bug thats triggered by gcc 4.1
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export CFLAGS=$RPM_OPT_FLAGS
+export CXXFLAGS=$RPM_OPT_FLAGS
+
 %configure
 make %{?_smp_mflags}
 
@@ -46,7 +52,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README NEWS TODO
+%doc AUTHORS COPYING INSTALL README NEWS
 %{_libdir}/libtorrent.so.*
 
 %files devel
@@ -56,6 +62,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Nov 26 2006 Chris Chabot  - 0.10.4-1
+- New upstream version
+- Compile with -Os to work around a gcc 4.1 incompatibility
+
 * Mon Oct 02 2006 Chris Chabot  - 0.10.2-3
 - Bump EVR to fix broken upgrade path (BZ #208985)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2006 09:55:14 -0000	1.6
+++ sources	26 Nov 2006 11:39:35 -0000	1.7
@@ -1 +1 @@
-99f1daa0f6ce0aa8d53745c494df9b36  libtorrent-0.10.2.tar.gz
+3154a686d9616f04012596b8daa2ff52  libtorrent-0.10.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 11:41:16 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:41:16 -0500
Subject: rpms/libtorrent/FC-6 libtorrent.spec,1.12,1.13 sources,1.6,1.7
Message-ID: <200611261141.kAQBfGu4011731@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11714

Modified Files:
	libtorrent.spec sources 
Log Message:
Upgrade to new version and work around compiler triggered bug


Index: libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/FC-6/libtorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libtorrent.spec	2 Oct 2006 21:18:48 -0000	1.12
+++ libtorrent.spec	26 Nov 2006 11:40:46 -0000	1.13
@@ -1,8 +1,8 @@
 Name:          libtorrent
 License:       GPL
 Group:         System Environment/Libraries
-Version:       0.10.2
-Release:       3%{?dist}
+Version:       0.10.4
+Release:       1%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -29,6 +29,12 @@
 %setup -q
 
 %build
+
+# work around a bug thats triggered by gcc 4.1
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export CFLAGS=$RPM_OPT_FLAGS
+export CXXFLAGS=$RPM_OPT_FLAGS
+
 %configure
 make %{?_smp_mflags}
 
@@ -46,7 +52,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README NEWS TODO
+%doc AUTHORS COPYING INSTALL README NEWS
 %{_libdir}/libtorrent.so.*
 
 %files devel
@@ -56,6 +62,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Nov 26 2006 Chris Chabot  - 0.10.4-1
+- New upstream version
+- Compile with -Os to work around a gcc 4.1 incompatibility
+
 * Mon Oct 02 2006 Chris Chabot  - 0.10.2-3
 - Bump EVR to fix broken upgrade path (BZ #208985)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2006 09:55:14 -0000	1.6
+++ sources	26 Nov 2006 11:40:46 -0000	1.7
@@ -1 +1 @@
-99f1daa0f6ce0aa8d53745c494df9b36  libtorrent-0.10.2.tar.gz
+3154a686d9616f04012596b8daa2ff52  libtorrent-0.10.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 11:47:13 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:47:13 -0500
Subject: rpms/rtorrent/devel .cvsignore, 1.6, 1.7 rtorrent.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200611261147.kAQBlDaT011847@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11828

Modified Files:
	.cvsignore rtorrent.spec sources 
Log Message:
New upstream version and work around a compiler bug


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Sep 2006 09:52:34 -0000	1.6
+++ .cvsignore	26 Nov 2006 11:46:43 -0000	1.7
@@ -1 +1,2 @@
-rtorrent-0.6.2.tar.gz
+rtorrent-0.6.4.tar.gz
+rtorrent.rc.example


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rtorrent.spec	6 Nov 2006 12:57:33 -0000	1.13
+++ rtorrent.spec	26 Nov 2006 11:46:43 -0000	1.14
@@ -1,15 +1,15 @@
 Name:          rtorrent
 License:       GPL
 Group:         Applications/Internet
-Version:       0.6.2
-Release:       5%{?dist}
+Version:       0.6.4
+Release:       1%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.0, curl-devel, ncurses-devel
-Requires:      libtorrent >= 0.10.0
+BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
+Requires:      libtorrent >= 0.10.4
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -22,6 +22,10 @@
 %setup -q
 
 %build
+# work around a bug thats triggered by gcc 4.1                                                           
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export CFLAGS=$RPM_OPT_FLAGS
+export CXXFLAGS=$RPM_OPT_FLAGS
 install -m 644 %{SOURCE1} .
 %configure
 make %{?_smp_mflags}
@@ -40,6 +44,10 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Sun Nov 26 2006 Chris Chabot  - 0.6.4-1
+- New upstream version
+- Compile with -Os to work around a gcc 4.1 incompatibility
+
 * Mon Nov 06 2006 Jindrich Novy  - 0.6.2-5
 - rebuild against new curl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2006 09:52:34 -0000	1.6
+++ sources	26 Nov 2006 11:46:43 -0000	1.7
@@ -1 +1,2 @@
-b199ca24ba4a5c0f59b587cd4fa11670  rtorrent-0.6.2.tar.gz
+9077817e5a0f505e0b71add9c57b89f7  rtorrent-0.6.4.tar.gz
+e362ef8649f0c015f894c29cb6c932be  rtorrent.rc.example



From fedora-extras-commits at redhat.com  Sun Nov 26 11:48:39 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:48:39 -0500
Subject: rpms/rtorrent/FC-6 rtorrent.spec,1.12,1.13 sources,1.6,1.7
Message-ID: <200611261148.kAQBmdao011906@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11889

Modified Files:
	rtorrent.spec sources 
Log Message:
New upstream version and work around a compiler bug


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/FC-6/rtorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rtorrent.spec	29 Sep 2006 10:06:28 -0000	1.12
+++ rtorrent.spec	26 Nov 2006 11:48:09 -0000	1.13
@@ -1,15 +1,15 @@
 Name:          rtorrent
 License:       GPL
 Group:         Applications/Internet
-Version:       0.6.2
-Release:       4%{?dist}
+Version:       0.6.4
+Release:       1%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.0, curl-devel, ncurses-devel
-Requires:      libtorrent >= 0.10.0
+BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
+Requires:      libtorrent >= 0.10.4
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -22,6 +22,10 @@
 %setup -q
 
 %build
+# work around a bug thats triggered by gcc 4.1                                                           
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export CFLAGS=$RPM_OPT_FLAGS
+export CXXFLAGS=$RPM_OPT_FLAGS
 install -m 644 %{SOURCE1} .
 %configure
 make %{?_smp_mflags}
@@ -40,6 +44,13 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Sun Nov 26 2006 Chris Chabot  - 0.6.4-1
+- New upstream version
+- Compile with -Os to work around a gcc 4.1 incompatibility
+
+* Mon Nov 06 2006 Jindrich Novy  - 0.6.2-5
+- rebuild against new curl
+
 * Fri Sep 29 2006 Chris Chabot  - 0.6.2-4
 - re-tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2006 09:52:34 -0000	1.6
+++ sources	26 Nov 2006 11:48:09 -0000	1.7
@@ -1 +1,2 @@
-b199ca24ba4a5c0f59b587cd4fa11670  rtorrent-0.6.2.tar.gz
+9077817e5a0f505e0b71add9c57b89f7  rtorrent-0.6.4.tar.gz
+e362ef8649f0c015f894c29cb6c932be  rtorrent.rc.example



From fedora-extras-commits at redhat.com  Sun Nov 26 11:49:43 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:49:43 -0500
Subject: rpms/buoh/devel .cvsignore, 1.2, 1.3 buoh.spec, 1.18, 1.19 sources, 
	1.2, 1.3
Message-ID: <200611261149.kAQBnhF2011973@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11952

Modified Files:
	.cvsignore buoh.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Dec 2005 22:14:29 -0000	1.2
+++ .cvsignore	26 Nov 2006 11:49:13 -0000	1.3
@@ -1 +1 @@
-buoh-0.8.1.tar.gz
+buoh-0.8.2.tar.bz2


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- buoh.spec	21 Nov 2006 07:56:13 -0000	1.18
+++ buoh.spec	26 Nov 2006 11:49:13 -0000	1.19
@@ -76,7 +76,7 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
-* Tue Nov 21 2006 Chris Chabot  - 0.8.2-1
+* Tue Nov 26 2006 Chris Chabot  - 0.8.2-1
 - New upstream version
 
 * Mon Sep 11 2006 Chris Chabot  - 0.8.1-13


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2005 22:14:29 -0000	1.2
+++ sources	26 Nov 2006 11:49:13 -0000	1.3
@@ -1 +1 @@
-5d05a51d7c6616d93e93df3465b49fe7  buoh-0.8.1.tar.gz
+50474a8712ad20ab36d8f8058a4647fb  buoh-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:01:15 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 26 Nov 2006 07:01:15 -0500
Subject: rpms/codeblocks/devel .cvsignore, 1.7, 1.8 codeblocks.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200611261201.kAQC1FPT015022@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11998

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3268
 - fixes #217081



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Nov 2006 19:30:14 -0000	1.7
+++ .cvsignore	26 Nov 2006 12:00:45 -0000	1.8
@@ -1 +1 @@
-codeblocks-svn3253.tar.bz2
+codeblocks-svn3268.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- codeblocks.spec	21 Nov 2006 19:30:14 -0000	1.6
+++ codeblocks.spec	26 Nov 2006 12:00:45 -0000	1.7
@@ -1,9 +1,9 @@
-%define		rev	3253
-%define		date	20061121
+%define		rev	3268
+%define		date	20061125
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.14.%{date}svn%{rev}%{?dist}
+Release:	0.15.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
+- update to revision 3268
+- fixes #217081
+
 * Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
 - update to revision 3253
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2006 19:30:14 -0000	1.7
+++ sources	26 Nov 2006 12:00:45 -0000	1.8
@@ -1 +1 @@
-1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2
+a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:02:53 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:02:53 -0500
Subject: rpms/buoh/devel buoh.spec,1.19,1.20
Message-ID: <200611261202.kAQC2rQv015068@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15041

Modified Files:
	buoh.spec 
Log Message:
Spec file fixups


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- buoh.spec	26 Nov 2006 11:49:13 -0000	1.19
+++ buoh.spec	26 Nov 2006 12:02:23 -0000	1.20
@@ -2,10 +2,10 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.2
-Release:          1
+Release:          2
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
-Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.bz2
+Source:           http://buoh.steve-o.org/downloads/buoh-%{version}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
 Requires(post):   GConf2
@@ -29,9 +29,6 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-/usr/bin/install -m 644 $RPM_BUILD_ROOT%{_datadir}/buoh/pixmaps/buoh*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-
 perl -pi -e "s,Terminal=0,Terminal=false,g" $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
 desktop-file-install --delete-original			\
   --vendor=fedora								\
@@ -46,6 +43,10 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/buoh.schemas > /dev/null  || :
 killall -HUP gconfd-2 &>/dev/null || :
+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
 if [ "$1" -gt 1 ]; then
@@ -53,6 +54,10 @@
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/buoh.schemas >/dev/null || :
   killall -HUP gconfd-2 &>/dev/null || :
 fi
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -72,10 +77,13 @@
 %{_datadir}/applications/fedora-buoh.desktop
 %{_datadir}/buoh/comics/comics.xml
 %{_datadir}/buoh/ui/buoh-ui.xml
-%{_datadir}/buoh/pixmaps/buoh*.png
-%{_datadir}/pixmaps/buoh*.png
+%{_datadir}/icons/hicolor/64x64/apps/buoh.png
+%{_datadir}/icons/hicolor/16x16/apps/buoh.png
 
 %changelog
+* Tue Nov 26 2006 Chris Chabot  - 0.8.2-2
+- fixed spec file glitch
+
 * Tue Nov 26 2006 Chris Chabot  - 0.8.2-1
 - New upstream version
 



From fedora-extras-commits at redhat.com  Sun Nov 26 12:04:04 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:04:04 -0500
Subject: rpms/buoh/FC-6 buoh.spec,1.18,1.19 sources,1.3,1.4
Message-ID: <200611261204.kAQC446v015185@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15148

Modified Files:
	buoh.spec sources 
Log Message:
new upstream version


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/buoh.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- buoh.spec	21 Nov 2006 07:54:16 -0000	1.18
+++ buoh.spec	26 Nov 2006 12:03:34 -0000	1.19
@@ -2,10 +2,10 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.2
-Release:          1
+Release:          2
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
-Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.bz2
+Source:           http://buoh.steve-o.org/downloads/buoh-%{version}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
 Requires(post):   GConf2
@@ -29,9 +29,6 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-/usr/bin/install -m 644 $RPM_BUILD_ROOT%{_datadir}/buoh/pixmaps/buoh*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-
 perl -pi -e "s,Terminal=0,Terminal=false,g" $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
 desktop-file-install --delete-original			\
   --vendor=fedora								\
@@ -46,6 +43,10 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/buoh.schemas > /dev/null  || :
 killall -HUP gconfd-2 &>/dev/null || :
+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
 if [ "$1" -gt 1 ]; then
@@ -53,6 +54,10 @@
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/buoh.schemas >/dev/null || :
   killall -HUP gconfd-2 &>/dev/null || :
 fi
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -72,11 +77,14 @@
 %{_datadir}/applications/fedora-buoh.desktop
 %{_datadir}/buoh/comics/comics.xml
 %{_datadir}/buoh/ui/buoh-ui.xml
-%{_datadir}/buoh/pixmaps/buoh*.png
-%{_datadir}/pixmaps/buoh*.png
+%{_datadir}/icons/hicolor/64x64/apps/buoh.png
+%{_datadir}/icons/hicolor/16x16/apps/buoh.png
 
 %changelog
-* Tue Nov 21 2006 Chris Chabot  - 0.8.2-1
+* Tue Nov 26 2006 Chris Chabot  - 0.8.2-2
+- fixed spec file glitch
+
+* Tue Nov 26 2006 Chris Chabot  - 0.8.2-1
 - New upstream version
 
 * Mon Sep 11 2006 Chris Chabot  - 0.8.1-13


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2006 07:54:16 -0000	1.3
+++ sources	26 Nov 2006 12:03:34 -0000	1.4
@@ -0,0 +1 @@
+50474a8712ad20ab36d8f8058a4647fb  buoh-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:05:36 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 26 Nov 2006 07:05:36 -0500
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.7, 1.8 codeblocks.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200611261205.kAQC5aiA015253@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15226

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3268
 - fixes #217081



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Nov 2006 19:32:26 -0000	1.7
+++ .cvsignore	26 Nov 2006 12:05:06 -0000	1.8
@@ -1 +1 @@
-codeblocks-svn3253.tar.bz2
+codeblocks-svn3268.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- codeblocks.spec	21 Nov 2006 19:32:26 -0000	1.6
+++ codeblocks.spec	26 Nov 2006 12:05:06 -0000	1.7
@@ -1,9 +1,9 @@
-%define		rev	3253
-%define		date	20061121
+%define		rev	3268
+%define		date	20061125
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.14.%{date}svn%{rev}%{?dist}
+Release:	0.15.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
+- update to revision 3268
+- fixes #217081
+
 * Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
 - update to revision 3253
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2006 19:32:26 -0000	1.7
+++ sources	26 Nov 2006 12:05:06 -0000	1.8
@@ -1 +1 @@
-1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2
+a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:06:07 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:06:07 -0500
Subject: rpms/buoh/FC-6 buoh.spec,1.19,1.20
Message-ID: <200611261206.kAQC672d015278@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15250

Modified Files:
	buoh.spec 
Log Message:
fix specfile glitch


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/buoh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- buoh.spec	26 Nov 2006 12:03:34 -0000	1.19
+++ buoh.spec	26 Nov 2006 12:05:37 -0000	1.20
@@ -2,7 +2,7 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.2
-Release:          2
+Release:          2%{?dist}
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
 Source:           http://buoh.steve-o.org/downloads/buoh-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:09:47 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 26 Nov 2006 07:09:47 -0500
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.7, 1.8 codeblocks.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200611261209.kAQC9lmC015406@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15342

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3268
 - fixes #217081



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Nov 2006 19:37:50 -0000	1.7
+++ .cvsignore	26 Nov 2006 12:09:17 -0000	1.8
@@ -1 +1 @@
-codeblocks-svn3253.tar.bz2
+codeblocks-svn3268.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- codeblocks.spec	21 Nov 2006 19:37:50 -0000	1.6
+++ codeblocks.spec	26 Nov 2006 12:09:17 -0000	1.7
@@ -1,9 +1,9 @@
-%define		rev	3253
-%define		date	20061121
+%define		rev	3268
+%define		date	20061125
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.14.%{date}svn%{rev}%{?dist}
+Release:	0.15.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
+- update to revision 3268
+- fixes #217081
+
 * Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
 - update to revision 3253
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2006 19:37:50 -0000	1.7
+++ sources	26 Nov 2006 12:09:17 -0000	1.8
@@ -1 +1 @@
-1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2
+a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:18:37 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:18:37 -0500
Subject: rpms/rtorrent/devel rtorrent.spec,1.14,1.15
Message-ID: <200611261218.kAQCIbj5015557@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15542

Modified Files:
	rtorrent.spec 
Log Message:
Added libstdc++ BR


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rtorrent.spec	26 Nov 2006 11:46:43 -0000	1.14
+++ rtorrent.spec	26 Nov 2006 12:18:07 -0000	1.15
@@ -2,13 +2,13 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.6.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
+BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
 Requires:      libtorrent >= 0.10.4
 
 %description



From fedora-extras-commits at redhat.com  Sun Nov 26 12:21:04 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:21:04 -0500
Subject: rpms/rtorrent/FC-6 rtorrent.spec,1.13,1.14
Message-ID: <200611261221.kAQCL4MV015623@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15608

Modified Files:
	rtorrent.spec 
Log Message:
Added libstdc++ BR


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/FC-6/rtorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rtorrent.spec	26 Nov 2006 11:48:09 -0000	1.13
+++ rtorrent.spec	26 Nov 2006 12:20:34 -0000	1.14
@@ -2,13 +2,13 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.6.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
+BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
 Requires:      libtorrent >= 0.10.4
 
 %description



From fedora-extras-commits at redhat.com  Sun Nov 26 12:57:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 07:57:00 -0500
Subject: rpms/libpqxx/FC-4 libpqxx.spec,1.7,1.8
Message-ID: <200611261257.kAQCv0rE015864@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15810/FC-4

Modified Files:
	libpqxx.spec 
Log Message:
add missing %defattr in %files devel section



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libpqxx.spec	21 Oct 2006 07:08:47 -0000	1.7
+++ libpqxx.spec	26 Nov 2006 12:56:29 -0000	1.8
@@ -58,6 +58,7 @@
 %{_libdir}/libpqxx-*.so
 
 %files devel
+%defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
 %{_libdir}/libpqxx.so



From fedora-extras-commits at redhat.com  Sun Nov 26 12:57:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 07:57:05 -0500
Subject: rpms/libpqxx/FC-6 libpqxx.spec,1.12,1.13
Message-ID: <200611261257.kAQCv5sU015872@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15810/FC-6

Modified Files:
	libpqxx.spec 
Log Message:
add missing %defattr in %files devel section



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-6/libpqxx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libpqxx.spec	4 Oct 2006 19:37:03 -0000	1.12
+++ libpqxx.spec	26 Nov 2006 12:56:35 -0000	1.13
@@ -71,6 +71,7 @@
 %{_libdir}/libpqxx-*.so
 
 %files devel
+%defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
 %{_libdir}/libpqxx.so



From fedora-extras-commits at redhat.com  Sun Nov 26 12:57:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 07:57:00 -0500
Subject: rpms/libpqxx/FC-5 libpqxx.spec,1.9,1.10
Message-ID: <200611261257.kAQCv0NS015867@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15810/FC-5

Modified Files:
	libpqxx.spec 
Log Message:
add missing %defattr in %files devel section



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-5/libpqxx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libpqxx.spec	21 Oct 2006 07:08:48 -0000	1.9
+++ libpqxx.spec	26 Nov 2006 12:56:30 -0000	1.10
@@ -58,6 +58,7 @@
 %{_libdir}/libpqxx-*.so
 
 %files devel
+%defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
 %{_libdir}/libpqxx.so



From fedora-extras-commits at redhat.com  Sun Nov 26 12:57:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 07:57:05 -0500
Subject: rpms/libpqxx/devel libpqxx.spec,1.12,1.13
Message-ID: <200611261257.kAQCv5HW015875@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15810/devel

Modified Files:
	libpqxx.spec 
Log Message:
add missing %defattr in %files devel section



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libpqxx.spec	4 Oct 2006 19:37:03 -0000	1.12
+++ libpqxx.spec	26 Nov 2006 12:56:35 -0000	1.13
@@ -71,6 +71,7 @@
 %{_libdir}/libpqxx-*.so
 
 %files devel
+%defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
 %{_libdir}/libpqxx.so



From fedora-extras-commits at redhat.com  Sun Nov 26 13:33:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:33:38 -0500
Subject: rpms/libtcd/devel - New directory
Message-ID: <200611261333.kAQDXcDH019054@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19037/libtcd/devel

Log Message:
Directory /cvs/extras/rpms/libtcd/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 13:33:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:33:38 -0500
Subject: rpms/libtcd - New directory
Message-ID: <200611261333.kAQDXcT7019041@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19037/libtcd

Log Message:
Directory /cvs/extras/rpms/libtcd added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 13:34:16 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:34:16 -0500
Subject: rpms/libtcd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611261334.kAQDYG1m019087@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081

Added Files:
	Makefile import.log 
Log Message:
Setup of module libtcd


--- NEW FILE Makefile ---
# Top level Makefile for module libtcd
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 Nov 26 13:34:21 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:34:21 -0500
Subject: rpms/libtcd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611261334.kAQDYLo0019102@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libtcd


--- 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 Nov 26 13:35:20 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:35:20 -0500
Subject: rpms/libtcd import.log,1.1,1.2
Message-ID: <200611261335.kAQDZK4S019181@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142

Modified Files:
	import.log 
Log Message:
auto-import libtcd-2.2-1 on branch devel from libtcd-2.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libtcd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 13:34:16 -0000	1.1
+++ import.log	26 Nov 2006 13:34:50 -0000	1.2
@@ -0,0 +1 @@
+libtcd-2_2-1:HEAD:libtcd-2.2-1.src.rpm:1164548172



From fedora-extras-commits at redhat.com  Sun Nov 26 13:35:20 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:35:20 -0500
Subject: rpms/libtcd/devel libtcd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611261335.kAQDZKKI019185@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libtcd.spec 
Log Message:
auto-import libtcd-2.2-1 on branch devel from libtcd-2.2-1.src.rpm


--- NEW FILE libtcd.spec ---
Name:		libtcd
Version:	2.2
Release:	1%{?dist}
Summary:	Tide Constituent Database Library

Group:		System Environment/Libraries
License:	Public Domain
URL:		http://www.flaterco.com/xtide/
Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
libtcd provides a software API for reading and writing Tide
Constituent Database (TCD) files.

%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT

%{__make} DESTDIR=$RPM_BUILD_ROOT install

# remove unneeded files
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc *.html

%{_includedir}/*.h
%{_libdir}/*.so

%changelog
* Thu Nov 23 2006 Mamoru Tasaka  - 2.2-1
- Formal 2.2 release.

* Mon Nov 21 2006 Mamoru Tasaka  - 2.2-0.1.dev1
- Re-split from xtide, import to Fedora Extras (see bug 211626)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 13:34:21 -0000	1.1
+++ .cvsignore	26 Nov 2006 13:34:50 -0000	1.2
@@ -0,0 +1 @@
+libtcd-2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 13:34:21 -0000	1.1
+++ sources	26 Nov 2006 13:34:50 -0000	1.2
@@ -0,0 +1 @@
+d6cfa1b0d808d5772c9b2798b8a90df0  libtcd-2.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 13:36:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:36:47 -0500
Subject: rpms/tcd-utils - New directory
Message-ID: <200611261336.kAQDalE5019306@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19302/tcd-utils

Log Message:
Directory /cvs/extras/rpms/tcd-utils added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 13:36:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:36:47 -0500
Subject: rpms/tcd-utils/devel - New directory
Message-ID: <200611261336.kAQDal7J019319@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19302/tcd-utils/devel

Log Message:
Directory /cvs/extras/rpms/tcd-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 13:37:04 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:37:04 -0500
Subject: rpms/tcd-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611261337.kAQDb4Ah019354@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19348

Added Files:
	Makefile import.log 
Log Message:
Setup of module tcd-utils


--- NEW FILE Makefile ---
# Top level Makefile for module tcd-utils
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 Nov 26 13:37:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:37:09 -0500
Subject: rpms/tcd-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611261337.kAQDb9CG019369@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19348/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcd-utils


--- 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 Nov 26 13:38:07 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:38:07 -0500
Subject: rpms/tcd-utils import.log,1.1,1.2
Message-ID: <200611261338.kAQDc7kx019439@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408

Modified Files:
	import.log 
Log Message:
auto-import tcd-utils-20061120-1.fc7 on branch devel from tcd-utils-20061120-1.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 13:37:04 -0000	1.1
+++ import.log	26 Nov 2006 13:37:37 -0000	1.2
@@ -0,0 +1 @@
+tcd-utils-20061120-1_fc7:HEAD:tcd-utils-20061120-1.fc7.src.rpm:1164548340



From fedora-extras-commits at redhat.com  Sun Nov 26 13:38:08 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:38:08 -0500
Subject: rpms/tcd-utils/devel tcd-utils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611261338.kAQDc8jl019443@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tcd-utils.spec 
Log Message:
auto-import tcd-utils-20061120-1.fc7 on branch devel from tcd-utils-20061120-1.fc7.src.rpm


--- NEW FILE tcd-utils.spec ---
Name:		tcd-utils
Version:	20061120
Release:	1%{?dist}
Summary:	TCD (Tide Constituent Database) Utils

Group:		Applications/Engineering
License:	Public Domain
URL:		http://www.flaterco.com/xtide/
Source0:	ftp://ftp.flaterco.com/xtide/tcd-utils-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtcd-devel

%description
TCD Utils includes:
* build_tide_db to convert harmonics.txt, offsets.xml, and NAVO
  formats to harmonics.tcd;
* restore_tide_db to generate harmonics.txt and offsets.xml from
  harmonics.tcd

%prep
%setup -q -n %{name}

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT
%{__make} DESTDIR=$RPM_BUILD_ROOT install
 
%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_bindir}/*

%changelog
* Thu Nov 23 2006 Mamoru Tasaka  - 20061120-1
- Formal 20061120 released
- Versioning change

* Mon Nov 20 2006 Mamoru Tasaka 
- Split from xtide, repackaging (see bug 211626)
- Remove tideEditor, which was split into different package.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 13:37:09 -0000	1.1
+++ .cvsignore	26 Nov 2006 13:37:37 -0000	1.2
@@ -0,0 +1 @@
+tcd-utils-20061120.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 13:37:09 -0000	1.1
+++ sources	26 Nov 2006 13:37:37 -0000	1.2
@@ -0,0 +1 @@
+f0d58145520be7eeaf5d78229dae4aa7  tcd-utils-20061120.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 13:40:42 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:40:42 -0500
Subject: owners owners.list,1.2016,1.2017
Message-ID: <200611261340.kAQDegkD019507@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19492

Modified Files:
	owners.list 
Log Message:
add libtcd. tcd-utils


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2016
retrieving revision 1.2017
diff -u -r1.2016 -r1.2017
--- owners.list	26 Nov 2006 05:00:02 -0000	1.2016
+++ owners.list	26 Nov 2006 13:40:12 -0000	1.2017
@@ -1004,6 +1004,7 @@
 Fedora Extras|libsynaptics|Synaptics touchpad driver library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|libtcd|Tide Constituent Database Library|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|libtelepathy|GLib library to ease writing telepathy clients|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|libtlen|Tlen.pl client library|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libtomoe-gtk|Gtk library for tomoe Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
@@ -2265,6 +2266,7 @@
 Fedora Extras|tango-icon-theme|Icons from Tango Project|raven at pmail.pl|extras-qa at fedoraproject.org|
 Fedora Extras|taskjuggler|Project management tool|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tbcload|Tcl bytecode loader|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tcd-utils|TCD (Tide Constituent Database) Utils|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tclchecker|Tcl syntax checker|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 13:47:52 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:47:52 -0500
Subject: rpms/xtide/devel sources, 1.4, 1.5 xtide-2.9dev-rcinit.diff, NONE, 
	1.1 xtide-README.fedora, NONE, 1.1 xtide-get_harmonics-data.sh,
	NONE, 1.1 xtide.desktop, 1.2, 1.3 xtide.spec, 1.11,
	1.12 xttpd-wrapper.sh, NONE, 1.1 xttpd.conf, NONE,
	1.1 dead.package, 1.1, NONE
Message-ID: <200611261347.kAQDlqGH019633@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19607

Added Files:
	sources xtide-2.9dev-rcinit.diff xtide-README.fedora 
	xtide-get_harmonics-data.sh xtide.desktop xtide.spec 
	xttpd-wrapper.sh xttpd.conf 
Removed Files:
	dead.package 
Log Message:
unorphan xtide (bug 211626)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	26 Nov 2006 13:47:22 -0000	1.5
@@ -0,0 +1 @@
+efc6b3eb603e5b51c13c5dbb7bd29548  xtide-2.9dev-20061122.tar.bz2

xtide-2.9dev-rcinit.diff:

--- NEW FILE xtide-2.9dev-rcinit.diff ---
--- rc.xttpd.fedora	2006-11-23 07:22:31.000000000 +0900
+++ rc.xttpd	2006-11-23 20:33:49.000000000 +0900
@@ -26,22 +26,15 @@
 start(){
     echo -n $"Starting $PROG: "
     if ! test -f "$DAEMON" ; then 
-	echo $"$DAEMON is not set." >&2
-	echo_failure
+	echo -n $"$DAEMON is not set."
+	failure
 	echo
 	RETVAL=1
 	return $RETVAL
     fi
     if test -z "$PORT" ; then
-	echo $"PORT environment is not set." >&2
-	echo_failure
-	echo
-	RETVAL=1
-	return $RETVAL
-    fi
-    if test -z "$HOME" ; then
-	echo $"HOME environment is not set." >&2
-	echo_failure
+	echo -n $"PORT environment is not set."
+	failure
 	echo
 	RETVAL=1
 	return $RETVAL
@@ -100,3 +93,4 @@
 esac
 
 exit $?
+


--- NEW FILE xtide-README.fedora ---
================================================
# xtide-README.fedora
# Written by Patrice Dumas and Mamoru Tasaka

# If you have some questions, please report it
# with redhat bugzilla:
# https://bugzilla.redhat.com/bugzilla/index.cgi
================================================

Availability and installation of harmonics files
================================================

To use xtide and related utilities (like xttpd, 
tideEditor), you need an harmonics file.
However, existing files cannot be distributed as part of Fedora, 
because their license restricts commercial redistribution and selling,
which is too restrictive for Fedora. These files should therefore 
be installed after the package installation by yourself.

Such files are available at:
http://www.flaterco.com/xtide/files.html
As the time of writing, the latest harmonics file is:
ftp://ftp.flaterco.com/xtide/harmonics-dwf-20060708.tcd.bz2
The utilities can only use uncompressed harmonics files.

There are 2 possibilities to have the utilities become aware of
the harmonics file location:

1) by editing /etc/xtide.conf, and setting the first line of the file
  to the path of the directory containing the harmonics files, or  
  to the harmonics file location (the utilities will also accept a colon `:' 
  delimited list of paths). 
  The second line of /etc/xtide.conf sets the directory which 
  contains world vector shoreline data. The second line can accept only
  one directory and cannot be colon-delimited.
  
  The default content of /etc/xtide.conf used by fedora is:

  /usr/share/xtide-harmonics/
  /usr/share/wvs-data/

  which means that all the files in /usr/share/xtide-harmonics
  are considered to be harmonics files and all under /usr/share/wvs-data
  are considered to be WVS data.

2) by setting the environment variable HFILE_PATH. You can also
   set WVS_PATH to specify the directory under which WVS data are
   stored.

You can run the provided script xtide-get_harmonics-data.sh
under /usr/sbin to install harmonics files to 
/usr/share/xtide-harmonics. This script requires 
administrator previledges.


--- NEW FILE xtide-get_harmonics-data.sh ---
#!/bin/sh

DATE=${DATE:-20060708}
INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}

FILE=harmonics-dwf-${DATE}.tcd.bz2

if [ "`id -u -n`" != "root" ] ; then
    echo "You must do this by root"
    exit 1
fi

wget -N ftp://ftp.flaterco.com/xtide/$FILE || \
    ( echo ; echo "Downloading failed." ; exit 1 )

bzip2 -d $FILE
mkdir -p $INSTALL_DIR
install -m 644 harmonics-dwf-${DATE}.tcd $INSTALL_DIR
rm -f ${FILE%.bz2}


Index: xtide.desktop
===================================================================
RCS file: xtide.desktop
diff -N xtide.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xtide.desktop	26 Nov 2006 13:47:22 -0000	1.3
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=XTide
+Comment=Predict tides
+Exec=xtide
+Icon=xtide
+Terminal=false
+Type=Application
+Categories=Application;Science;Education;
+


Index: xtide.spec
===================================================================
RCS file: xtide.spec
diff -N xtide.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xtide.spec	26 Nov 2006 13:47:22 -0000	1.12
@@ -0,0 +1,382 @@
+%{!?with_harmonics: %define   with_harmonics 0}
+%define          src_date   20061122    
+
+Summary:         Calculate tide all over the world
+Name:            xtide
+Version:         2.9
+Release:         0.2.date%{src_date}%{?dist}
+
+URL:             http://www.flaterco.com/xtide/
+Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2
+%if %{with_harmonics}
+Source1:         http://harmonics.unh.edu/xtide/harmonics.txt.gz
+%endif
+
+Patch18:         xtide-2.9dev-rcinit.diff
+
+Source11:        xttpd.conf
+Source14:        xtide-get_harmonics-data.sh
+Source15:        xttpd-wrapper.sh
+Source20:        %{name}.desktop
+Source30:        xtide-README.fedora
+
+License:         GPL
+Group:           Applications/Engineering
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:   autoconf
+
+BuildRequires:   libXaw-devel
+BuildRequires:   libXext-devel
+BuildRequires:   libpng-devel
+BuildRequires:   zlib-devel
+Buildrequires:   desktop-file-utils
+BuildRequires:   libtcd-devel
+%if %{with_harmonics}
+BuildRequires:   tcd-utils
+%endif
+Requires:        wvs-data
+Requires:        xtide-common
+
+Requires(pre):      %{_sbindir}/useradd
+Requires(preun):    /sbin/service
+Requires(preun):    /sbin/chkconfig
+Requires(postun):   /sbin/service
+Requires(post):     /sbin/chkconfig
+
+%package         common
+Summary:         Xtide common files
+Group:           Applications/Engineering
+License:         Public Domain
+Requires:        bzip2
+Requires:        wget
+
+%description
+XTide is a package that provides tide and current
+predictions in a wide variety of formats.  Graphs, text listings, and
+calendars can be generated, or a tide clock can be provided on your
+desktop.
+
+XTide can work with X-windows, plain text terminals, or the web. This
+is accomplished with three separate programs: the interactive
+interface (xtide), the non-interactive or command line interface
+(tide), and the web interface.
+
+The algorithm that XTide uses to predict tides is the one used by the
+National Ocean Service in the U.S.  It is significantly more accurate
+than the simple tide clocks that can be bought in novelty stores.
+However, it takes more to predict tides accurately than just a spiffy
+algorithm -- you also need some special data for each and every
+location for which you want to predict tides.  XTide reads this data
+from harmonics files.  See http://www.flaterco.com/xtide/files.html
+for details on where to get these (note: please also see README.fedora
+in common package for Fedora specific issue.).
+
+Ultimately, XTide's predictions can only be as good as the available
+harmonics data.  Due to issues of data availability and of
+compatibility with non-U.S. tide systems, the predictions for
+U.S. locations tend to be a lot better on average than those for
+locations outside of the U.S.  It is up to you to verify that the
+predictions for your locale match up acceptably well with the
+officially sanctioned ones.
+
+    * Deviations of 1 minute from official predictions are typical for
+      U.S. locations having the latest data.
+    * Deviations of 20 minutes are typical for non-U.S. locations or
+      U.S. locations that are using obsolete data.
+    * Much longer deviations indicate a problem.
+
+%description common
+This package contains common files needed by xtide, xttpd and
+tideEditor.
+Please read README.fedora for Fedora specific issue.
+
+%prep
+%setup -q -n %{name}-2.9dev
+
+pushd scripts/Fedora
+%patch18 -p0 -b .fedora
+popd
+
+%build
+export xttpd_user=xttpd
+export xttpd_group=xttpd
+%configure
+
+%{__make} %{?_smp_mflags}
+
+# harmonics file
+%if %{with_harmonics}
+%{__install} -c -p -m 644 %{SOURCE1} .
+%{__gzip} -d harmoni*
+
+for f in harmonics*.txt ; do
+   TCD=${f%.txt}.tcd
+done
+
+build_tide_db $TCD harmonics-*.txt &> harmonics.out
+%endif
+
+echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
+echo "%{_datadir}/wvs-data/" >> %{name}.conf
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__mkdir_p} $RPM_BUILD_ROOT
+ 
+# 1. install xtide
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
+
+# xttpd treatment
+# xttpd is wrapped
+%{__install} -c -p -m 755 %{SOURCE14} \
+   $RPM_BUILD_ROOT%{_sbindir}
+%{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir}
+%{__install} -c -p -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_sbindir}/xttpd
+# ensure xttpd binary installation directory (original
+# wrapper script is hardcorded
+%{__sed} -i -e 's|/usr/libexec|%{_libexecdir}|' \
+   $RPM_BUILD_ROOT%{_sbindir}/xttpd
+
+
+# 1A Install harmonics file
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics
+%if %{with_harmonics}
+%{__install} -c -p -m 644 harmonics*.tcd \
+   ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics/
+%endif
+
+# 1B Add configuration file
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}
+%{__install} -c -p -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/
+
+# 1C Add desktop entry (xtide)
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install \
+   --vendor fedora \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   --remove-category Application \
+   %{SOURCE20}
+
+# 1D Install icon
+for f in iconsrc/icon_*_orig.png ; do
+   %{__install} -c -p -m 644 $f $RPM_BUILD_ROOT%{_datadir}/%{name}/
+done
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+%{__ln_s} -f ../../../../%{name}/icon_16x16_orig.png \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{__ln_s} -f ../../../../%{name}/icon_48x48_orig.png \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+# 1E install xttpd conf file
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xtide
+%{__install} -c -p -m 755 scripts/Fedora/rc.xttpd \
+   $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xttpd
+%{__install} -c -p -m 644 %{SOURCE11} \
+   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd
+
+# 1F and others
+%{__install} -c -p -m 644 %{SOURCE30} README.fedora
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+/sbin/chkconfig --add xttpd
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+if [ $1 -ge 1 ] ; then
+   /sbin/service xttpd condrestart &>/dev/null || :
+fi
+
+%pre 
+%{_sbindir}/useradd \
+   -c "XTide web server" \
+   -d %{_sysconfdir}/%{name} \
+   -r \
+   -s /sbin/nologin \
+   xttpd 2>/dev/null || :
+
+%preun
+if [ $1 = 0 ] ; then
+   /sbin/service xttpd stop &>/dev/null
+   /sbin/chkconfig --del xttpd
+fi
+
+%files common
+%doc README.fedora
+%config(noreplace) %{_sysconfdir}/%{name}.conf
+
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}-harmonics
+%dir %{_sysconfdir}/%{name}
+%if %{with_harmonics}
+%{_datadir}/%{name}-harmonics/harmonics*.tcd
+%endif
+
+%{_sbindir}/xtide-get*.sh
+
+%files
+%defattr(-,root,root,-)
+
+%doc AUTHORS COPYING README README-QUICK
+# xtide
+%{_mandir}/man1/*tide.1*
+
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/%{name}/icon_*_orig.png
+
+%{_bindir}/*tide
+
+# xttpd
+%config(noreplace) %{_sysconfdir}/sysconfig/xttpd
+%{_sysconfdir}/rc.d/init.d/xttpd
+
+%{_sbindir}/xttpd
+%{_libexecdir}/xttpd
+%{_datadir}/man/man8/xttpd.8*
+
+%changelog
+* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122
+- Ensure the hardcorded directories in some scripts can be 
+  appropriately changed.
+- Fix some typo in README.fedora
+
+* Thu Nov 23 2006 Mamoru Tasaka  - 2.9-0.1.date20061122
+- 2.9 dev 20061122 release
+
+* Mon Nov 20 2006 Mamoru Tasaka  - 2.9-0.1.dev1
+- Version down temporarily
+- re-split libtcd, tcd-utils (see bug 211626)
+- again include xttpd
+
+* Sun Oct 29 2006 Mamoru Tasaka  - 2.9-0.14.dev20061027
+- xtide-2.9dev20061029, tcd-utils-1.3.11(2005-08-11),
+  update patches.
+- Remove -DCOMPAT114 as required by newer tcd-utils
+- Bump somajor of tcd-utils for API change.
+
+* Fri Oct 27 2006 Mamoru Tasaka  - 2.9-0.13.dev20061015
+- Fix some change in xtide-2.9dev-change-uidgid.patch
+
+* Fri Oct 27 2006 Mamoru Tasaka  - 2.9-0.12.dev20061015
+- More restrictive uid/gid mode for xttpd
+- Another fix for xttpd.init
+
+* Thu Oct 26 2006 Mamoru Tasaka  - 2.9-0.11.dev20061015
+- Other fixes for xttpd.init, xttpd.conf
+- Create "xttpd" user and use xttpd user for daemon.
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.10.dev20061015
+- xtide doesn't need wrapperd, however, xttpd does.
+- Fix xttpd init script
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.9.dev20061015
+- Adjustment for WVS data directory change.
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.8.dev20061015
+- Split WVS data.
+- desktop-file-utils 0.11 change: X-Fedora, Application is no longer
+  accepted (will be fixed in rawhide).
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.7.dev20061015
+- Drop harmonics data for now.
+- Define WVS_DIR, then rewrite tideEditor-wrapper.sh and wrap xtide
+- Add fedora-specific document
+- Include WVS data
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.6.dev20061015
+- Install 48x48 icon as well.
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.5.dev20061015
+- Use icon in xtide source
+- Fix Group entry
+- Re-source profile shell script for easier rebuilding
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.4.dev20061015
+- Introduce common files package.
+- CFLAGS treatment change.
+- Treak configuration files and their locations.
+
+* Sat Oct 21 2006 Mamoru Tasaka  - 2.9-0.3.dev20061015
+- Various changes about compilation optflags.
+- Change libtcd soname numbering
+- Sprit xttpd, include scripts
+- tideEditor wrapper script included and desktop files added.
+- use "/sbin/ldconfig -n"
+- Lots of help from Michael Schwendt and Patrice Dumas, thanks!!
+
+* Sat Oct 21 2006 Mamoru Tasaka  - 2.9-0.2.dev20061015
+- Re-unify libtcd and xtide, and include tcd-utils, 
+  build all at once.
+
+* Fri Oct 20 2006 Mamoru Tasaka  - 2.9-0.1.dev20061015
+- Resubmit to Fedora Extras (bug #211626)
+- Split libtcd to another package, require tcd-utils to
+  rebuild tcd data.
+
+* Sun May 22 2005 Jeremy Katz  - 2.8-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
+* Fri Dec 17 2004 David M. Kaplan  0:2.8-2
+- Made a small hack that should make it compile on x86_64 systems.
+
+* Wed Dec 15 2004 David M. Kaplan  0:2.8-1
+- Updated to version 2.8
+- Cleaned up spec file because much of the tricks to get it to work
+  are no longer necessary.
+
+* Mon Dec  8 2003 David M. Kaplan  0:2.6.4-0.fdr.4
+- Removed 644 permissions.
+
+* Tue Dec  2 2003 David M. Kaplan  0:2.6.4-0.fdr.3
+- Fixed problem with debuginfo rpm and lex.xml.c.
+- Changed attributes to 644/755 to agree with Fedora specification.
+
+* Mon Nov 17 2003 David M. Kaplan  0:2.6.4-0.fdr.1
+- Updated to 2.6.4 version of xtide
+
+* Mon Oct 20 2003 David M. Kaplan  0:2.6.3-0.fdr.2
+- Made changes to spec and patch as per Michael Schwendt's suggestions
+
+* Fri Oct 17 2003 David M. Kaplan  0:2.6.3-0.fdr.1
+- Modified spec file to meet requirements for fedora
+
+* Tue Oct 14 2003 David M. Kaplan  2.6.3-0.fdr.0
+- Modify for Fedora submission
+
+* Tue Oct 14 2003 David M. Kaplan  2.6.3-0
+- Update to XTide 2.6.3
+
+* Fri Sep 05 2003 David M. Kaplan 
+- Updated to XTide 2.6.2
+
+* Thu Feb 17 2003 David M. Kaplan 
+- Updated to XTide 2.6 FINAL (2003-02-12)
+
+* Thu Feb 17 2003 David M. Kaplan 
+- Updated to XTide 2.6 DEVELOPMENT (2003-02-12)
+
+* Thu Jan 23 2003 David M. Kaplan 
+- Updated to XTide 2.6 DEVELOPMENT (2003-01-17)
+
+* Sat Dec 28 2002 David M. Kaplan 
+- First RPM build.
+


--- NEW FILE xttpd-wrapper.sh ---
#!/bin/sh

unset XTTPD_ARG
for ARG in $* ; do
   case $ARG in
      *=* )
	eval export $ARG
        ;;
      * )
        XTTPD_ARG="$XTTPD_ARG $ARG"
	;;
   esac
done
			
exec /usr/libexec/xttpd $XTTPD_ARG

--- NEW FILE xttpd.conf ---
# Originally from debian.
# The following is from debian's comment.
#---------------------------------------------------------
#
# skeleton	example file to build /etc/init.d/ scripts.
#		This file should be used to construct scripts for /etc/init.d.
#
#		Written by Miquel van Smoorenburg .
#		Modified for Debian GNU/Linux
#		by Ian Murdock .
#
# Version:	@(#)skeleton  1.6  11-Nov-1996  miquels at cistron.nl
#
# This file by Peter S Galbraith  for the xtide package.

#---------------------------------------
# Configuration:  
#  
#  Uncommenting the PORT line below enables this daemon at bootup.
#  To start the server after uncommenting the line, there is no need 
#  to reboot, simply invoke:
#                            # /etc/init.d/xttpd start
#
#  PORT: Port number used by xttpd
#   - If you use 80, xttpd will be your standard web server and will be 
#     visible as http://localhost  (Make sure no other web server is installed)
#   - Alternatively, use a higher unprivileged port number (e.g. 8080) to have
#     xttpd running in addition to a standard web server.  xttpd would then 
#     be visble as http://localhost:8080/
#  XTTPD_FEEDBACK:
#   - Set the environment variable XTTPD_FEEDBACK to change the feedback 
#     address email address.
#PORT=8080
#XTTPD_FEEDBACK=user at your.site
#-Edit-lines-above-and-uncomment--------


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 26 13:52:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:52:28 -0500
Subject: rpms/xtide/devel Makefile,1.3,1.4
Message-ID: <200611261352.kAQDqS6b019672@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19657

Added Files:
	Makefile 
Log Message:
add makefile


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	26 Nov 2006 13:51:58 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: xtide
+# $Id$
+NAME := xtide
+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)



From fedora-extras-commits at redhat.com  Sun Nov 26 13:57:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:57:50 -0500
Subject: owners owners.list,1.2017,1.2018
Message-ID: <200611261357.kAQDvodt019805@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19784

Modified Files:
	owners.list 
Log Message:
un-orphan xtide (bug 211626)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2017
retrieving revision 1.2018
diff -u -r1.2017 -r1.2018
--- owners.list	26 Nov 2006 13:40:12 -0000	1.2017
+++ owners.list	26 Nov 2006 13:57:20 -0000	1.2018
@@ -2563,7 +2563,7 @@
 Fedora Extras|xscreensaver|X screen saver and locker|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|jwz at jwz.org
 Fedora Extras|xsp|ASP.NET page server|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xtide|Calculate tide all over the world|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xwrits|A program to remind you to take wrist breaks|jlayton at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|yadex|A DOOM level editor|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 15:00:18 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 26 Nov 2006 10:00:18 -0500
Subject: rpms/SDL_image/devel SDL_image-1.2.5-IMG_xpm.patch, NONE,
	1.1 SDL_image.spec, 1.9, 1.10
Message-ID: <200611261500.kAQF0IPK023097@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_image/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23069

Modified Files:
	SDL_image.spec 
Added Files:
	SDL_image-1.2.5-IMG_xpm.patch 
Log Message:
* Tue Oct 31 2006 Brian Pepple  - 1.2.5-3
- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)


SDL_image-1.2.5-IMG_xpm.patch:

--- NEW FILE SDL_image-1.2.5-IMG_xpm.patch ---
--- IMG_xpm.c~	2006-05-12 05:02:44.000000000 +0200
+++ IMG_xpm.c	2006-10-31 19:03:25.000000000 +0100
@@ -326,7 +326,8 @@
 	linebuf = NULL;
 	buflen = 0;
 
-	start = SDL_RWtell(src);
+    if(src)
+        start = SDL_RWtell(src);
 
 	if(xpm)
 		xpmlines = &xpm;
@@ -453,7 +454,8 @@
 
 done:
 	if(error) {
-		SDL_RWseek(src, start, SEEK_SET);
+        if (src)
+            SDL_RWseek(src, start, SEEK_SET);
 		if ( image ) {
 			SDL_FreeSurface(image);
 			image = NULL;


Index: SDL_image.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/devel/SDL_image.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SDL_image.spec	31 Aug 2006 21:47:34 -0000	1.9
+++ SDL_image.spec	26 Nov 2006 14:59:48 -0000	1.10
@@ -1,12 +1,13 @@
 Name:		SDL_image
 Version:	1.2.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Image loading library for SDL
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_image/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch0:		%{name}-1.2.5-IMG_xpm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	SDL-devel >= 1.2.10
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .imgxpm
 
 
 %build
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Brian Pepple  - 1.2.5-3
+- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)
+
 * Thu Aug 31 2006 Brian Pepple  - 1.2.5-2
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Sun Nov 26 15:15:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 26 Nov 2006 10:15:00 -0500
Subject: rpms/SDL_image/FC-6 SDL_image-1.2.5-IMG_xpm.patch, NONE,
	1.1 SDL_image.spec, 1.9, 1.10
Message-ID: <200611261515.kAQFF0K5026255@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_image/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26237

Modified Files:
	SDL_image.spec 
Added Files:
	SDL_image-1.2.5-IMG_xpm.patch 
Log Message:
* Sun Nov 26 2006 Brian Pepple  - 1.2.5-3
- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)


SDL_image-1.2.5-IMG_xpm.patch:

--- NEW FILE SDL_image-1.2.5-IMG_xpm.patch ---
--- IMG_xpm.c~	2006-05-12 05:02:44.000000000 +0200
+++ IMG_xpm.c	2006-10-31 19:03:25.000000000 +0100
@@ -326,7 +326,8 @@
 	linebuf = NULL;
 	buflen = 0;
 
-	start = SDL_RWtell(src);
+    if(src)
+        start = SDL_RWtell(src);
 
 	if(xpm)
 		xpmlines = &xpm;
@@ -453,7 +454,8 @@
 
 done:
 	if(error) {
-		SDL_RWseek(src, start, SEEK_SET);
+        if (src)
+            SDL_RWseek(src, start, SEEK_SET);
 		if ( image ) {
 			SDL_FreeSurface(image);
 			image = NULL;


Index: SDL_image.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/FC-6/SDL_image.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SDL_image.spec	31 Aug 2006 21:47:34 -0000	1.9
+++ SDL_image.spec	26 Nov 2006 15:14:30 -0000	1.10
@@ -1,12 +1,13 @@
 Name:		SDL_image
 Version:	1.2.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Image loading library for SDL
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_image/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch0:		%{name}-1.2.5-IMG_xpm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	SDL-devel >= 1.2.10
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .imgxpm
 
 
 %build
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Brian Pepple  - 1.2.5-3
+- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)
+
 * Thu Aug 31 2006 Brian Pepple  - 1.2.5-2
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Sun Nov 26 15:17:01 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 10:17:01 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.9, 1.10 ochusha.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200611261517.kAQFH1b0026352@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26328

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Sun Nov 26 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
- 0.5.99.63.6 cvs 061126 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	25 Nov 2006 15:12:11 -0000	1.9
+++ .cvsignore	26 Nov 2006 15:16:30 -0000	1.10
@@ -1 +1 @@
-ochusha-0.5.99.63.6-cvs061125.tar.bz2
+ochusha-0.5.99.63.6-cvs061126.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ochusha.spec	25 Nov 2006 15:12:11 -0000	1.9
+++ ochusha.spec	26 Nov 2006 15:16:30 -0000	1.10
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.6
-%define              strtag          cvs061125
+%define              strtag          cvs061126
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -155,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Sat Nov 25 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
-- 0.5.99.63.6 cvs 061125 (23:59 JST)
+* Sun Nov 26 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
+- 0.5.99.63.6 cvs 061126 (23:59 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Nov 2006 15:12:11 -0000	1.9
+++ sources	26 Nov 2006 15:16:30 -0000	1.10
@@ -1 +1 @@
-51ba6482844fb7c9c1d5fa3a666027f3  ochusha-0.5.99.63.6-cvs061125.tar.bz2
+87fee38e3cf73238a9bffdce22fde293  ochusha-0.5.99.63.6-cvs061126.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 15:22:54 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 10:22:54 -0500
Subject: rpms/jd/devel .cvsignore, 1.24, 1.25 jd.spec, 1.31, 1.32 sources,
	1.24, 1.25
Message-ID: <200611261522.kAQFMsN2026509@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26461

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Nov 26 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061126
- cvs 061126 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	25 Nov 2006 15:03:40 -0000	1.24
+++ .cvsignore	26 Nov 2006 15:22:24 -0000	1.25
@@ -1 +1 @@
-jd-1.8.1-cvs061125.tgz
+jd-1.8.1-cvs061126.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jd.spec	25 Nov 2006 15:03:40 -0000	1.31
+++ jd.spec	26 Nov 2006 15:22:24 -0000	1.32
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061125
+%define         strtag        cvs061126
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Nov 25 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061125
-- cvs 061125 (23:59 JST)
+* Sun Nov 26 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061126
+- cvs 061126 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	25 Nov 2006 15:03:40 -0000	1.24
+++ sources	26 Nov 2006 15:22:24 -0000	1.25
@@ -1 +1 @@
-1bcf2b13a48d65cabe60a30034b603d0  jd-1.8.1-cvs061125.tgz
+22545b686df97a6578add31e6567978c  jd-1.8.1-cvs061126.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 15:31:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sun, 26 Nov 2006 10:31:45 -0500
Subject: rpms/eterm/devel Eterm-0.9.4-automake-1.10.patch, NONE,
	1.1 eterm.spec, 1.2, 1.3
Message-ID: <200611261531.kAQFVjML026602@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26581

Modified Files:
	eterm.spec 
Added Files:
	Eterm-0.9.4-automake-1.10.patch 
Log Message:
Add patch to build with autmake-1.10.



Eterm-0.9.4-automake-1.10.patch:

--- NEW FILE Eterm-0.9.4-automake-1.10.patch ---
diff -uNr -x '*~' Eterm-0.9.4.orig/configure.in Eterm-0.9.4/configure.in
--- Eterm-0.9.4.orig/configure.in	2006-01-04 09:44:14.000000000 +0100
+++ Eterm-0.9.4/configure.in	2006-11-26 16:06:19.000000000 +0100
@@ -91,6 +91,9 @@
     CFLAGS="$CCOPTS"
 fi
 
+dnl# required from automake-1.10 
+AM_PROG_AS
+
 AC_ARG_WITH(cc, [  --with-cc=compiler      force Eterm to build with a particular compiler (like pgcc, egcs, etc.)], [
             CC=$withval, 
   if test -z "$CC"; then


Index: eterm.spec
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/eterm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eterm.spec	25 Nov 2006 22:18:52 -0000	1.2
+++ eterm.spec	26 Nov 2006 15:31:15 -0000	1.3
@@ -1,18 +1,19 @@
 Summary: Enlightened terminal emulator
 Name: eterm
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: User Interface/Desktops
 Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
 Source1: http://www.eterm.org/download/Eterm-bg-0.9.4.tar.gz
 Source2: %{name}.png
-Patch: Eterm-0.9.4-no-rpath.patch
+Patch1: Eterm-0.9.4-no-rpath.patch
+Patch2: Eterm-0.9.4-automake-1.10.patch
 URL: http://www.eterm.org/
 Requires: imlib2
 BuildRequires: imlib2-devel libast-devel libXmu-devel 
 BuildRequires: pcre-devel desktop-file-utils
-BuildRequires: /usr/bin/automake-1.9 autoconf libtool
+BuildRequires: autoconf automake libtool
 Provides: Eterm = %{version}-%{release}
 Obsoletes: Eterm <= 0.9.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,12 +28,11 @@
 
 %prep
 %setup -a 1 -q -n Eterm-%{version}
-%patch -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 # Touching Makefile.am
-# Need automake 1.9
-export AUTOMAKE=/usr/bin/automake-1.9
 ./autogen.sh
 %configure --enable-multi-charset \
            --enable-escreen       \
@@ -41,7 +41,7 @@
            --disable-etwin        \
            --disable-mmx
 
-%{__make}
+%{__make} %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -98,6 +98,10 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Nov 26 2006 Terje R??sten  - 0.9.4-4
+- Add patch to build with automake-1.10
+- Add smp flags to make
+
 * Sat Nov 25 2006 Terje R??sten  - 0.9.4-3
 - Use automake-1.9
 



From fedora-extras-commits at redhat.com  Sun Nov 26 16:38:32 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 26 Nov 2006 11:38:32 -0500
Subject: rpms/gaim-meanwhile/FC-6
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-04_blist-memleak.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch,
	NONE, 1.1 gaim-2.0.0beta5-silc-edit-account-crash.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 gaim-meanwhile.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200611261638.kAQGcWtD029951@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29905

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Added Files:
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch 
	gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch 
	gaim-2.0.0beta5-debian-04_blist-memleak.patch 
	gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch 
	gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch 
	gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch 
	gaim-2.0.0beta5-silc-edit-account-crash.patch 
Log Message:
Update to latest beta release.  Fixes bug 217040


gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch:

--- NEW FILE gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch ---
--- console/plugins/gnthistory.orig	2006-10-18 20:54:41.000000000 -0400
+++ console/plugins/gnthistory.c	2006-10-18 20:54:45.000000000 -0400
@@ -173,7 +173,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	NULL,
+	GAIM_GNT_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,

gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch:

--- NEW FILE gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch ---
diff -Nur gaim-2.0.0+beta5/gtk/gtksound.c gaim-2.0.0+beta5.new/gtk/gtksound.c
--- gaim-2.0.0+beta5/gtk/gtksound.c	2006-11-10 02:23:00.000000000 -0500
+++ gaim-2.0.0+beta5.new/gtk/gtksound.c	2006-11-11 15:44:05.000000000 -0500
@@ -448,9 +448,7 @@
 		return;
 	volume = (float)(CLAMP(gaim_prefs_get_int("/gaim/gtk/sound/volume"),0,100)) / 50;
 	if (!strcmp(method, "automatic")) {
-		if (gaim_running_gnome()) {
-			sink = gst_element_factory_make("gconfaudiosink", "sink");
-		}
+		sink = gst_element_factory_make("gconfaudiosink", "sink");
 		if (!sink)
 			sink = gst_element_factory_make("autoaudiosink", "sink");
 	} else if (!strcmp(method, "esd")) {

gaim-2.0.0beta5-debian-04_blist-memleak.patch:

--- NEW FILE gaim-2.0.0beta5-debian-04_blist-memleak.patch ---
--- trunk/gtk/gtkblist.c	(revision 17621)
+++ trunk/gtk/gtkblist.c	(revision 17774)
@@ -560,7 +560,7 @@
 rebuild_joinchat_entries(GaimGtkJoinChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -569,11 +569,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 	data->entries = NULL;
@@ -5111,7 +5108,7 @@
 rebuild_addchat_entries(GaimGtkAddChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -5120,11 +5117,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 
@@ -5965,8 +5959,7 @@
 		menuitem = l->data;
 
 		if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Add\\/Edit")))
-			gtk_container_remove(GTK_CONTAINER(accountmenu),
-			                     menuitem);
+			gtk_widget_destroy(menuitem);
 	}
 
 	for (accounts = gaim_accounts_get_all(); accounts; accounts = accounts->next) {
@@ -6122,23 +6115,7 @@
 
 	/* Remove old plugin action submenus from the Tools menu */
 	for (l = plugin_submenus; l; l = l->next)
-	{
-		GList *menuitems;
-
-		submenu = l->data;
-
-		menuitems = gtk_container_get_children(GTK_CONTAINER(submenu));
-		while (menuitems != NULL)
-		{
-			GaimPluginAction *action;
-			menuitem = menuitems->data;
-			action = g_object_get_data(G_OBJECT(menuitem), "plugin_action");
-			g_free(action);
-			menuitems = g_list_delete_link(menuitems, menuitems);
-		}
-
-		gtk_container_remove(GTK_CONTAINER(pluginmenu), GTK_WIDGET(submenu));
-	}
+		gtk_widget_destroy(GTK_WIDGET(l->data));
 	g_list_free(plugin_submenus);
 	plugin_submenus = NULL;
 

gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch:

--- NEW FILE gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch ---
--- trunk/libgaim/gaim-url-handler	2006/09/12 09:04:04	17260
+++ trunk/libgaim/gaim-url-handler	2006/11/18 05:25:31	17773
@@ -189,15 +189,26 @@
 
 def xmpp(uri):
     protocol = "prpl-jabber"
-    match = re.match(r"^xmpp:(//([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
+    match = re.match(r"^xmpp:((//)?([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
     if not match:
         print "Invalid xmpp URI: %s" % uri
         return
 
-    accountname = urllib.unquote_plus(match.group(2)) or ""
-    screenname = urllib.unquote_plus(match.group(4))
-    command = urllib.unquote_plus(match.group(6))
-    paramstring = match.group(8)
+    tmp = match.group(3)
+    if (tmp):
+        accountname = urllib.unquote_plus(tmp)
+    else:
+        accountname = ""
+
+    screenname = urllib.unquote_plus(match.group(5))
+
+    tmp = match.group(7)
+    if (tmp):
+        command = urllib.unquote_plus(tmp)
+    else:
+        command = ""
+
+    paramstring = match.group(9)
     params = {}
     if paramstring:
         for param in paramstring.split(";"):

gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch:

--- NEW FILE gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch ---
Index: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c	(revision 17787)
+++ trunk/libgaim/protocols/jabber/jabber.c	(revision 17788)
@@ -926,10 +926,17 @@
 	}
 
 	if(!js->gsc) {
-		if (gaim_proxy_connect(gc, account, server,
-				gaim_account_get_int(account, "port", 5222),
-				jabber_login_callback, gc) == NULL)
-			gaim_connection_error(gc, _("Unable to create socket"));
+		if (connect_server[0]) {
+			jabber_login_connect(js, server,
+			                     gaim_account_get_int(account,
+			                                          "port", 5222));
+		} else {
+			js->srv_query_data = gaim_srv_resolve("xmpp-client",
+			                                      "tcp",
+			                                      js->user->domain,
+			                                      srv_resolved_cb,
+			                                      js);
+		}
 	}
 }
 

gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch:

--- NEW FILE gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch ---
Index: trunk/libgaim/protocols/msn/object.c
===================================================================
--- trunk/libgaim/protocols/msn/object.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/object.c	(revision 17766)
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "object.h"
+#include "debug.h"
 
 #define GET_STRING_TAG(field, id) \
 	if ((tag = strstr(str, id "=\"")) != NULL) \
@@ -94,6 +95,7 @@
 	if (obj->creator == NULL || obj->size == 0 || obj->type == 0
 			|| obj->location == NULL || obj->friendly == NULL
 			|| obj->sha1d == NULL || obj->sha1c == NULL) {
+		gaim_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
 		msn_object_destroy(obj);
 		obj = NULL;
 	}
@@ -106,24 +108,13 @@
 {
 	g_return_if_fail(obj != NULL);
 
-	if (obj->creator != NULL)
-		g_free(obj->creator);
+	g_free(obj->creator);
+	g_free(obj->location);
+	g_free(obj->real_location);
+	g_free(obj->friendly);
+	g_free(obj->sha1d);
+	g_free(obj->sha1c);
 
-	if (obj->location != NULL)
-		g_free(obj->location);
-
-	if (obj->real_location != NULL)
-		g_free(obj->real_location);
-
-	if (obj->friendly != NULL)
-		g_free(obj->friendly);
-
-	if (obj->sha1d != NULL)
-		g_free(obj->sha1d);
-
-	if (obj->sha1c != NULL)
-		g_free(obj->sha1c);
-
 	if (obj->local)
 		local_objs = g_list_remove(local_objs, obj);
 
Index: trunk/libgaim/protocols/msn/slplink.c
===================================================================
--- trunk/libgaim/protocols/msn/slplink.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/slplink.c	(revision 17766)
@@ -147,6 +147,9 @@
 {
 	MsnSlpLink *slplink;
 
+	g_return_val_if_fail(session != NULL, NULL);
+	g_return_val_if_fail(username != NULL, NULL);
+
 	slplink = msn_session_find_slplink(session, username);
 
 	if (slplink == NULL)
Index: trunk/libgaim/protocols/msn/slp.c
===================================================================
--- trunk/libgaim/protocols/msn/slp.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/slp.c	(revision 17766)
@@ -819,6 +819,9 @@
 		smile = tokens[tok];
 		obj = msn_object_new_from_string(gaim_url_decode(tokens[tok + 1]));
 
+		if (obj == NULL)
+			break;
+
 		who = msn_object_get_creator(obj);
 		sha1c = msn_object_get_sha1c(obj);
 

gaim-2.0.0beta5-silc-edit-account-crash.patch:

--- NEW FILE gaim-2.0.0beta5-silc-edit-account-crash.patch ---
http://gaim.svn.sourceforge.net/viewvc/gaim/trunk/gtk/gtkaccount.c?r1=17800&r2=17799&view=patch&pathrev=17800
We shouldn't be freeing kvp->value, which is put in the list store as G_TYPE_POINTER.
This was causing crashes for people editing SILC accounts (nothing else uses GAIM_PREF_STRING_LIST).

--- trunk/gtk/gtkaccount.c	2006/11/21 04:34:38	17799
+++ trunk/gtk/gtkaccount.c	2006/11/21 05:32:55	17800
@@ -810,7 +810,7 @@
 					if (node->data != NULL) {
 						kvp = (GaimKeyValuePair *) node->data;
 						if ((kvp->value != NULL) && (str_value != NULL) &&
-							!g_utf8_collate(kvp->value, str_value))
+						    !g_utf8_collate(kvp->value, str_value))
 							idx = i;
 
 						gtk_list_store_append(model, &iter);
@@ -1247,7 +1247,6 @@
 					gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter);
 					gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1);
 					gaim_account_set_string(account, setting, value2);
-					g_free(value2);
 					break;
 
 				default:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Oct 2006 15:39:13 -0000	1.10
+++ .cvsignore	26 Nov 2006 16:38:02 -0000	1.11
@@ -1 +1 @@
-gaim-2.0.0beta4.tar.bz2
+gaim-2.0.0beta5.tar.bz2


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/gaim-meanwhile.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gaim-meanwhile.spec	30 Oct 2006 15:39:13 -0000	1.16
+++ gaim-meanwhile.spec	26 Nov 2006 16:38:02 -0000	1.17
@@ -23,7 +23,7 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta4
+%define betaver	beta5
 
 Name:		gaim-meanwhile
 Version:	2.0.0
@@ -52,6 +52,16 @@
 # to be replaced by upstream fix
 Patch5:		gaim2-PIE.patch
 
+## Patches 100+: To be Included in Future Upstream
+Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
+Patch103: gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch
+Patch104: gaim-2.0.0beta5-debian-04_blist-memleak.patch
+Patch105: gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch
+Patch106: gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch
+Patch107: gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch
+
+Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
 
@@ -122,6 +132,15 @@
 %prep
 %setup -q -n gaim-%{version}%{betaver}
 #%patch5 -p1
+## Patches 100+: To be Included in Future Upstream
+%patch102 -p0
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+
+%patch150 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Oct 2006 15:39:13 -0000	1.10
+++ sources	26 Nov 2006 16:38:02 -0000	1.11
@@ -1 +1 @@
-ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2
+84099216123de25402fa7e904ceca437  gaim-2.0.0beta5.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 16:39:47 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 26 Nov 2006 11:39:47 -0500
Subject: rpms/liferea/FC-6 liferea-1.0.26-fonts.patch, NONE, 1.1 .cvsignore, 
	1.37, 1.38 liferea.spec, 1.55, 1.56 sources, 1.38, 1.39
Message-ID: <200611261639.kAQGdl3v030039@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30017

Modified Files:
	.cvsignore liferea.spec sources 
Added Files:
	liferea-1.0.26-fonts.patch 
Log Message:
* Thu Nov 23 2006 Brian Pepple  - 1.0.26-1
- Update to 1.0.26.
- Add patch to use document font name. (#216813)


liferea-1.0.26-fonts.patch:

--- NEW FILE liferea-1.0.26-fonts.patch ---
--- liferea-1.0.26/src/conf.h.fonts	2006-07-22 05:00:54.000000000 -0400
+++ liferea-1.0.26/src/conf.h	2006-11-19 18:47:38.000000000 -0500
@@ -34,7 +34,7 @@
 #define BROWSER_MODULE			"/apps/liferea/browser-module"
 #define GNOME_DEFAULT_BROWSER_COMMAND	"gnome-open '%s'"
 #define DEFAULT_BROWSER_COMMAND		"mozilla '%s'"
-#define DEFAULT_FONT			"/desktop/gnome/interface/font_name"
+#define DEFAULT_FONT			"/desktop/gnome/interface/document_font_name"
 #define USER_FONT			"/apps/liferea/browser-font"
 #define REFOCUS_TIMEOUT			"/apps/liferea/refocus-timeout"
 #define DISABLE_JAVASCRIPT		"/apps/liferea/disable-javascript"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	27 Oct 2006 16:04:43 -0000	1.37
+++ .cvsignore	26 Nov 2006 16:39:17 -0000	1.38
@@ -1 +1 @@
-liferea-1.0.25.tar.gz
+liferea-1.0.26.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/liferea.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- liferea.spec	10 Nov 2006 09:47:59 -0000	1.55
+++ liferea.spec	26 Nov 2006 16:39:17 -0000	1.56
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.25
-Release:        2%{?dist}
+Version:        1.0.26
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-1.0.23-fedorafeed.patch
+Patch1:		%{name}-1.0.26-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml2-devel
@@ -43,6 +44,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
+%patch1 -p1 -b .fonts
 
 
 %build
@@ -109,6 +111,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Brian Pepple  - 1.0.26-1
+- Update to 1.0.26.
+- Add patch to use document font name. (#216813)
+
 * Fri Nov 10 2006 Michael Schwendt  - 1.0.25-2
 - Rebuild for new Firefox version (and update the Firefox "Requires").
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	27 Oct 2006 16:04:43 -0000	1.38
+++ sources	26 Nov 2006 16:39:17 -0000	1.39
@@ -1 +1 @@
-45d511c9eb829797336a60a4a86b5939  liferea-1.0.25.tar.gz
+8d48a070c9709a986a6f3d7a2ba7ec6c  liferea-1.0.26.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 18:23:26 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:23:26 -0500
Subject: rpms/audacious-plugins - New directory
Message-ID: <200611261823.kAQINQnZ003995@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3991/audacious-plugins

Log Message:
Directory /cvs/extras/rpms/audacious-plugins added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 18:23:32 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:23:32 -0500
Subject: rpms/audacious-plugins/devel - New directory
Message-ID: <200611261823.kAQINWg5004008@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3991/audacious-plugins/devel

Log Message:
Directory /cvs/extras/rpms/audacious-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 18:23:59 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:23:59 -0500
Subject: rpms/audacious-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611261823.kAQINxlK004056@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4034/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module audacious-plugins


--- 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 Nov 26 18:23:54 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:23:54 -0500
Subject: rpms/audacious-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611261823.kAQINsM0004040@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4034

Added Files:
	Makefile import.log 
Log Message:
Setup of module audacious-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module audacious-plugins
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 Nov 26 18:26:17 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:26:17 -0500
Subject: rpms/audacious-plugins/devel
	audacious-plugins-1.2.2-cddb-buffer.patch, NONE,
	1.1 audacious-plugins.desktop, NONE, 1.1 audacious-plugins.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611261826.kAQIQHI8004142@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104/devel

Modified Files:
	.cvsignore sources 
Added Files:
	audacious-plugins-1.2.2-cddb-buffer.patch 
	audacious-plugins.desktop audacious-plugins.spec 
Log Message:
auto-import audacious-plugins-1.2.2-0.8.sky on branch devel from audacious-plugins-1.2.2-0.8.sky.src.rpm

audacious-plugins-1.2.2-cddb-buffer.patch:

--- NEW FILE audacious-plugins-1.2.2-cddb-buffer.patch ---
diff -uNr audacious-plugins-fedora-1.2.2-orig/src/cdaudio/cddb.c audacious-plugins-fedora-1.2.2/src/cdaudio/cddb.c
--- audacious-plugins-fedora-1.2.2-orig/src/cdaudio/cddb.c	2006-11-21 09:59:31.000000000 +0100
+++ audacious-plugins-fedora-1.2.2/src/cdaudio/cddb.c	2006-11-21 10:02:48.000000000 +0100
@@ -109,14 +109,17 @@
 cddb_generate_offset_string(cdda_disc_toc_t * info)
 {
     gchar *buffer;
+    gchar number[20];
     int i;
 
     buffer = g_malloc(info->last_track * 7 + 1);
 
     sprintf(buffer, "%d", LBA(info->track[info->first_track]));
 
-    for (i = info->first_track + 1; i <= info->last_track; i++)
-        sprintf(buffer, "%s+%d", buffer, LBA(info->track[i]));
+    for (i = info->first_track + 1; i <= info->last_track; i++) {
+        sprintf(number, "+%d", LBA(info->track[i]));
+        strcat(buffer, number);
+    }
 
     return buffer;
 }


--- NEW FILE audacious-plugins.desktop ---
[Desktop Entry]
Name=Audacious
Comment=Play music
Comment[hu]=Zene lej??tsz??sa
Exec=audacious
Icon=audacious.png
MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/x-wav;application/x-ogg;
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
Encoding=UTF-8
X-Desktop-File-Install-Version=0.10
NoDisplay=true


--- NEW FILE audacious-plugins.spec ---
Name:           audacious-plugins
Version:        1.2.2
Release:        0.8%{?dist}
Summary:        Plugins for the Audacious media player

Group:          Applications/Multimedia
License:        GPL
URL:            http://audacious-media-player.org/
# The original source files contain various codecs which clash
# with the FE license guidelines. They are removed in the -fedora-
# file.
# Source0:        http://audacious-media-player.org/beta/audacious-plugins-1.2.2.tgz
Source0:        audacious-plugins-fedora-%{version}.tar.gz
Source1:        audacious-plugins.desktop
Patch0:         audacious-plugins-1.2.2-cddb-buffer.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  audacious-devel >= 1.2.1-0.7%{dist}, esound-devel >= 0.2, libvorbis-devel >= 1.0
BuildRequires:  zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel
BuildRequires:  libsidplay-devel, libnotify-devel
BuildRequires:  libmpcdec-devel, libmusicbrainz-devel
BuildRequires:  taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2
BuildRequires:  libvisual-devel >= 0.2, SDL-devel >= 1.2.9
BuildRequires:  gettext, libsndfile-devel, curl-devel, libbinio-devel
BuildRequires:  arts-devel, libmodplug-devel, lirc-devel
BuildRequires:  jack-audio-connection-kit-devel, libsamplerate-devel
BuildRequires:  pulseaudio-devel, fluidsynth-devel

Requires:       audacious >= 1.2.0

Requires(post):   desktop-file-utils >= 0.9, /sbin/ldconfig
Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig

%description
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
BMP.
This package provides essential plugins for audio input, audio output
and visualization.


%package        jack
Summary:        Audacious output plugin for JACK sound service
Group:          Applications/Multimedia
Obsoletes:      audacious-jack <= 1.1.2

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    jack
This package provides an Audacious output plugin that uses the
JACK sound service.


%package        esd
Summary:        Audacious output plugin for esd sound service
Group:          Applications/Multimedia
Obsoletes:      audacious-esd <= 1.1.2

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    esd
This package provides an Audacious output plugin that uses the
ESD sound server.


%package        arts
Summary:        Audacious output plugin for KDE arts sound service
Group:          Applications/Multimedia
Obsoletes:      audacious-arts <= 1.1.2

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    arts
This package provides an Audacious output plugin that uses the
KDE arts sound server.


%package        pulseaudio
Summary:        Audacious output plugin for PulseAudio
Group:          Applications/Multimedia

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    pulseaudio
This package provides an Audacious output plugin that uses the
PulseAudio sound server.



%package        amidi
Summary:        Audacious imput plugin for amidi
Group:          Applications/Multimedia

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    amidi
This package provides an Audacious input plugin that uses the
amidi sound service.



%prep
%setup -q -n audacious-plugins-fedora-%{version}

# Fix incorrect use of sprintf in the cdaudio plugin
%patch0 -p1 -b .cddb-buffer

%build
%configure \
    --disable-rpath \
    --enable-gconf \
    --disable-gnome-vfs \
    --enable-chardet \
    --disable-dependency-tracking \
    --enable-amidiplug \
    --disable-amidiplug-dummy

make V=1 %{?_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   \
    %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications


%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/applications


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS
%{_libdir}/audacious
%exclude %{_libdir}/audacious/Input/libamidi-plug.so
%exclude %{_libdir}/audacious/Output/libjackout.so
%exclude %{_libdir}/audacious/Output/libarts.so
%exclude %{_libdir}/audacious/Output/libESD.so
%exclude %{_libdir}/audacious/Output/libpulse_audio.so
%{_datadir}/applications/fedora-audacious-plugins.desktop
%{_datadir}/audacious/images/audioscrobbler.png
%{_datadir}/audacious/images/audioscrobbler_badge.png

%files jack
%defattr(-,root,root,-)
%{_libdir}/audacious/Output/libjackout.so

%files arts
%defattr(-,root,root,-)
%{_bindir}/audacious-arts-helper
%{_libdir}/audacious/Output/libarts.so

%files esd
%defattr(-,root,root,-)
%{_libdir}/audacious/Output/libESD.so

%files pulseaudio
%defattr(-,root,root,-)
%{_libdir}/audacious/Output/libpulse_audio.so

%files amidi
%defattr(-,root,root,-)
%{_libdir}/audacious/Input/libamidi-plug.so
%{_libdir}/amidi-plug


%changelog
* Wed Nov 8 2006 Ralf Ertzinger  1.2.2-0.8.fc7
- Initial RPM build for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 18:23:59 -0000	1.1
+++ .cvsignore	26 Nov 2006 18:25:47 -0000	1.2
@@ -0,0 +1 @@
+audacious-plugins-fedora-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 18:23:59 -0000	1.1
+++ sources	26 Nov 2006 18:25:47 -0000	1.2
@@ -0,0 +1 @@
+8ac7f73da7432e1ffed6c2b9b0fced8c  audacious-plugins-fedora-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 18:26:17 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:26:17 -0500
Subject: rpms/audacious-plugins import.log,1.1,1.2
Message-ID: <200611261826.kAQIQHpA004138@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104

Modified Files:
	import.log 
Log Message:
auto-import audacious-plugins-1.2.2-0.8.sky on branch devel from audacious-plugins-1.2.2-0.8.sky.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 18:23:54 -0000	1.1
+++ import.log	26 Nov 2006 18:25:47 -0000	1.2
@@ -0,0 +1 @@
+audacious-plugins-1_2_2-0_8_sky:HEAD:audacious-plugins-1.2.2-0.8.sky.src.rpm:1164565629



From fedora-extras-commits at redhat.com  Sun Nov 26 18:34:19 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:34:19 -0500
Subject: rpms/audacious/devel audacious-1.2.1-relative-links.patch, NONE,
	1.1 audacious-1.2.1-shaded-skin.patch, NONE, 1.1 audacious.spec,
	1.16, 1.17 audacious-1.1.0-relative-links.patch, 1.2,
	NONE audacious-1.1.1-shaded-skin.patch, 1.1, NONE
Message-ID: <200611261834.kAQIYJe7004253@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4231

Modified Files:
	audacious.spec 
Added Files:
	audacious-1.2.1-relative-links.patch 
	audacious-1.2.1-shaded-skin.patch 
Removed Files:
	audacious-1.1.0-relative-links.patch 
	audacious-1.1.1-shaded-skin.patch 
Log Message:

- Update to 1.2.1
- Split off libaudacious into a separate package to handle the
  (now externally provided and built) plugins better


audacious-1.2.1-relative-links.patch:

--- NEW FILE audacious-1.2.1-relative-links.patch ---
diff -uNr audacious-1.2.1-orig/libaudacious/Makefile audacious-1.2.1/libaudacious/Makefile
--- audacious-1.2.1-orig/libaudacious/Makefile	2006-10-29 11:35:12.000000000 +0100
+++ audacious-1.2.1/libaudacious/Makefile	2006-10-29 11:35:50.000000000 +0100
@@ -47,7 +47,7 @@
 
 install-posthook:
 	@mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0
-	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0 \
+	@ln -sf libaudacious$(SHARED_SUFFIX).4.0.0 \
 		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4
-	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4 \
+	@ln -sf libaudacious$(SHARED_SUFFIX).4 \
 		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)

audacious-1.2.1-shaded-skin.patch:

--- NEW FILE audacious-1.2.1-shaded-skin.patch ---
diff -uNr audacious-1.2.1-orig/audacious/widgets/skin.c audacious-1.2.1/audacious/widgets/skin.c
--- audacious-1.2.1-orig/audacious/widgets/skin.c	2006-10-29 11:35:14.000000000 +0100
+++ audacious-1.2.1/audacious/widgets/skin.c	2006-10-29 12:40:56.000000000 +0100
@@ -1795,7 +1795,7 @@
                          (i * 25) + 25, 0, 25, 14);
 
     /* right corner */
-    skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 57 : 42,
+    skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 42 : 57,
                      width - 50, 0, 50, 14);
 }
 


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacious.spec	9 Nov 2006 14:13:19 -0000	1.16
+++ audacious.spec	26 Nov 2006 18:33:48 -0000	1.17
@@ -1,55 +1,62 @@
 Name:           audacious
-Version:        1.1.2
-Release:        8%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://audacious-media-player.org/
-# The original source files contain various codecs which clash
-# with the FE license guidelines. They are removed in the -fedora-
-# file.
-# Source0:        http://audacious-media-player.org/beta/audacious-1.1.0-dr2.tgz
-Source0:        audacious-fedora-%{version}.tar.gz
+
+Source0:        audacious-%{version}.tgz
 Patch0:         audacious-1.1.0-xmms-skins.patch
 Patch1:         audacious-1.1.0-default-skin.patch
-Patch2:         audacious-1.1.0-no-rpath.patch
-Patch3:         audacious-1.1.0-relative-links.patch
+# Patch2:         audacious-1.1.0-no-rpath.patch
+Patch3:         audacious-1.2.1-relative-links.patch
 Patch4:         audacious-1.1.0-quoting.patch
-Patch5:         audacious-1.1.0-amidi-backend.patch
-Patch6:         audacious-1.1.1-shaded-skin.patch
+# Patch5:         audacious-1.1.0-amidi-backend.patch
+Patch6:         audacious-1.2.1-shaded-skin.patch
 Patch7:         audacious-1.1.1-controlsocket-name.patch
-Patch8:         audacious-1.1.1-playlist-twenty.patch
+# Patch8:         audacious-1.1.1-playlist-twenty.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
-BuildRequires:  zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel
-BuildRequires:  gnome-vfs2-devel, libglade2-devel >= 2.4, libsidplay-devel
-BuildRequires:  libmpcdec-devel, libmusicbrainz-devel, GConf2-devel
-BuildRequires:  taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2
-BuildRequires:  libvisual-devel >= 0.2, SDL-devel >= 1.2.9
-BuildRequires:  gettext, libsndfile-devel, curl-devel, libbinio-devel
-BuildRequires:  arts-devel, libmodplug-devel, lirc-devel
-BuildRequires:  jack-audio-connection-kit-devel, libsamplerate-devel
+BuildRequires:  gtk2-devel >= 2.6
+BuildRequires:  zlib-devel, desktop-file-utils >= 0.9
+BuildRequires:  libglade2-devel >= 2.4
+BuildRequires:  GConf2-devel
+BuildRequires:  gettext
+
+Requires:       audacious-plugins >= 1.2.0
 
-Requires(post):  desktop-file-utils >= 0.9, /sbin/ldconfig
-Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
+Requires(post):   desktop-file-utils >= 0.9
+Requires(postun): desktop-file-utils >= 0.9
 
-Obsoletes:      bmp <= 0.9.7.1, bmp-flac2 <= 009
-Provides:       bmp = 0.9.7.1, bmp-flac2 = 009
+Obsoletes:      bmp <= 0.9.7.1
+Provides:       bmp = 0.9.7.1
 
 %description
 Audacious is a media player that currently uses a skinned
 user interface based on Winamp 2.x skins. It is based on ("forked off")
 BMP.
 
+
+%package        libs
+Summary:        Library files for Audacious
+Group:          System Environment/Libraries
+
+%description    libs
+Library files for Audacious
+
+
 %package        devel
 Summary:        Development files for Audacious
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       glib2-devel gtk2-devel gnome-vfs2-devel GConf2-devel
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       glib2-devel, gtk2-devel >= 2.6, GConf2-devel, libglade2-devel >= 2.4
 Requires:       pkgconfig
 
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Obsoletes:      bmp-devel <= 0.9.7.1
 Provides:       bmp-devel = 0.9.7.1
 
@@ -57,38 +64,8 @@
 Development files for Audacious
 
 
-%package        jack
-Summary:        Audacious output plugin for JACK sound service
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
-
-%description    jack
-This package provides an Audacious output plugin that uses the
-JACK sound service.
-
-
-%package        esd
-Summary:        Audacious output plugin for esd sound service
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
-
-%description    esd
-This package provides an Audacious output plugin that uses the
-ESD sound server.
-
-
-%package        arts
-Summary:        Audacious output plugin for KDE arts sound service
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
-
-%description    arts
-This package provides an Audacious output plugin that uses the
-KDE arts sound server.
-
-
 %prep
-%setup -q -n %{name}-fedora-%{version}
+%setup -q
 
 # Read xmms skins directory
 %patch0 -p1 -b .xmms-skins
@@ -97,7 +74,7 @@
 %patch1 -p1 -b .default-skin
 
 # No rpath in binaries
-%patch2 -p1 -b .no-rpath
+# %patch2 -p1 -b .no-rpath
 
 # Relative symlink paths
 %patch3 -p1 -b .relative-links
@@ -115,17 +92,15 @@
 %patch7 -p1 -b controlsocket-name
 
 # Fix "%20" in playlist entries
-%patch8 -p1 -b playlist-twenty
+# %patch8 -p1 -b playlist-twenty
 
 %build
 %configure \
-	--disable-rpath \
-	--enable-gconf \
-	--disable-gnome-vfs \
-	--enable-amidiplug \
-	--disable-amidiplug-dummy \
-	--enable-chardet \
-	--disable-dependency-tracking
+    --disable-rpath \
+    --enable-gconf \
+    --disable-gnome-vfs \
+    --enable-chardet \
+    --disable-dependency-tracking
 make V=1 %{?_smp_mflags}
 
 
@@ -136,13 +111,17 @@
 
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-    --add-category X-Fedora  \
-    --add-category Application  \
+    --delete-original \
+    --remove-mime-type audio/x-scpls \
+    --remove-mime-type audio/x-mpegurl \
+    --remove-mime-type audio/mpegurl \
     --remove-mime-type audio/mp3 \
     --remove-mime-type audio/x-mp3 \
     --remove-mime-type audio/mpeg \
     --remove-mime-type audio/x-mpeg \
-    --delete-original \
+    --remove-mime-type audio/x-wav \
+    --remove-mime-type application/x-ogg \
+    --remove-category Application \
     $RPM_BUILD_ROOT%{_datadir}/applications/audacious.desktop
 
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
@@ -155,7 +134,6 @@
 
 
 %post
-/sbin/ldconfig
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -164,64 +142,43 @@
 
 
 %postun
-/sbin/ldconfig
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/audacious
 %{_bindir}/audtool
-%{_libdir}/*.so.*
-%{_libdir}/audacious
-%{_libdir}/amidi-plug
 %{_datadir}/audacious
-%exclude %{_libdir}/audacious/Output/libjackout.so
-%exclude %{_libdir}/audacious/Output/libarts.so
-%exclude %{_libdir}/audacious/Output/libESD.so
 %{_mandir}/man[^3]/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/48x48/apps/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/audacious
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
-%files jack
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Output/libjackout.so
-
-%files arts
-%defattr(-,root,root,-)
-%{_bindir}/audacious-arts-helper
-%{_libdir}/audacious/Output/libarts.so
-
-%files esd
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Output/libESD.so
-
 
 %changelog
-* Thu Nov 9 2006 Ralf Ertzinger  1.1.2-8.fc7
-- Drop the main window update patch
-
-* Tue Nov 7 2006 Ralf Ertzinger  1.1.2-7.fc7
-- Disable gnome-vfs, it causes too much trouble
-- Add --enable-chardet
- 
-* Mon Nov 06 2006 Ralf Ertzinger  1.1.2-4.fc7
-- Decrease main window update frequency somewhat
-
-* Mon Nov 06 2006 Jindrich Novy  1.1.2-3.fc6
-- Rebuild because of the new curl
-- Don't BuildRequire desktop-file-utils twice
+* Sun Nov 26 2006 Ralf Ertzinger  1.2.1-1.fc7
+- Update to 1.2.1
+- Split off libaudacious into a separate package to handle the
+  (now externally provided and built) plugins better
 
 * Wed Oct 18 2006 Ralf Ertzinger  1.1.2-2.fc6
 - Add Obsoletes/Provides for BMP
@@ -230,10 +187,10 @@
 - Update to 1.1.2
 
 * Thu Aug 17 2006 Ralf Ertzinger  1.1.1-6.fc6
-- Another go at the %20 problem
+- Another go at the %%20 problem
 
 * Mon Aug 14 2006 Ralf Ertzinger  1.1.1-4.fc6
-- Fix %20 in playlist entries
+- Fix %%20 in playlist entries
 
 * Sun Jul 30 2006 Ralf Ertzinger  1.1.1-3.fc6
 - Bump for rebuild


--- audacious-1.1.0-relative-links.patch DELETED ---


--- audacious-1.1.1-shaded-skin.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 26 18:38:23 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:38:23 -0500
Subject: rpms/audacious/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200611261838.kAQIcNjh004300@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4283

Modified Files:
	.cvsignore sources 
Log Message:
new source files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2006 20:17:34 -0000	1.5
+++ .cvsignore	26 Nov 2006 18:37:53 -0000	1.6
@@ -1 +1 @@
-audacious-fedora-1.1.2.tar.gz
+audacious-1.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2006 20:17:34 -0000	1.5
+++ sources	26 Nov 2006 18:37:53 -0000	1.6
@@ -1 +1 @@
-066a2d88a4e2115a43b0c3c8e9008bf5  audacious-fedora-1.1.2.tar.gz
+f718f66ec0cab46bf6210d2243d12be1  audacious-1.2.1.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 18:40:21 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:40:21 -0500
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.1,1.2
Message-ID: <200611261840.kAQIeLEC004370@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4355

Modified Files:
	audacious-plugins.spec 
Log Message:
- Initial RPM build for FE


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-plugins.spec	26 Nov 2006 18:25:47 -0000	1.1
+++ audacious-plugins.spec	26 Nov 2006 18:39:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           audacious-plugins
 Version:        1.2.2
-Release:        0.8%{?dist}
+Release:        1%{?dist}
 Summary:        Plugins for the Audacious media player
 
 Group:          Applications/Multimedia
@@ -177,5 +177,5 @@
 
 
 %changelog
-* Wed Nov 8 2006 Ralf Ertzinger  1.2.2-0.8.fc7
+* Sun Nov 26 2006 Ralf Ertzinger  1.2.2-1.fc7
 - Initial RPM build for FE



From fedora-extras-commits at redhat.com  Sun Nov 26 18:42:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:42:44 -0500
Subject: rpms/atomorun - New directory
Message-ID: <200611261842.kAQIgiKE004454@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4450/atomorun

Log Message:
Directory /cvs/extras/rpms/atomorun added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 18:42:49 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:42:49 -0500
Subject: rpms/atomorun/devel - New directory
Message-ID: <200611261842.kAQIgnLB004467@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4450/atomorun/devel

Log Message:
Directory /cvs/extras/rpms/atomorun/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 18:43:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:43:07 -0500
Subject: rpms/atomorun Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611261843.kAQIh7Rq004497@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4491

Added Files:
	Makefile import.log 
Log Message:
Setup of module atomorun


--- NEW FILE Makefile ---
# Top level Makefile for module atomorun
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 Nov 26 18:43:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:43:07 -0500
Subject: rpms/atomorun/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611261843.kAQIh7aj004512@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4491/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module atomorun


--- 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 Nov 26 18:45:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:45:14 -0500
Subject: rpms/atomorun import.log,1.1,1.2
Message-ID: <200611261845.kAQIjE3H004590@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4558

Modified Files:
	import.log 
Log Message:
auto-import atomorun-1.1-0.2.pre2.fc7 on branch devel from atomorun-1.1-0.2.pre2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/atomorun/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 18:43:07 -0000	1.1
+++ import.log	26 Nov 2006 18:44:44 -0000	1.2
@@ -0,0 +1 @@
+atomorun-1_1-0_2_pre2_fc7:HEAD:atomorun-1.1-0.2.pre2.fc7.src.rpm:1164567547



From fedora-extras-commits at redhat.com  Sun Nov 26 18:45:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:45:14 -0500
Subject: rpms/atomorun/devel atomorun.desktop, NONE, 1.1 atomorun.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611261845.kAQIjEKV004594@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4558/devel

Modified Files:
	.cvsignore sources 
Added Files:
	atomorun.desktop atomorun.spec 
Log Message:
auto-import atomorun-1.1-0.2.pre2.fc7 on branch devel from atomorun-1.1-0.2.pre2.fc7.src.rpm


--- NEW FILE atomorun.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Atomorun
Comment=Jump&Run game where you have to flee an exploding nuclear bomb
Exec=atomorun
Icon=atomorun.png
Terminal=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE atomorun.spec ---
%define prever pre2

Name:           atomorun
Version:        1.1
Release:        0.2.%{prever}%{?dist}
Summary:        Jump&Run game where you have to flee an exploding nuclear bomb
Group:          Amusements/Games
License:        GPL
URL:            http://atomorun.whosme.de/index.php
Source0:        http://atomorun.whosme.de/downloads/%{name}-%{version}_%{prever}.tar.gz
Source1:        atomorun.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_mixer-devel SDL_image-devel libtiff-devel libvorbis-devel
BuildRequires:  alsa-lib-devel desktop-file-utils ImageMagick
Requires:       hicolor-icon-theme

%description
Atomorun is a OpenGL Jump&Run game where you have to flee an exploding
nuclear bomb.


%prep
%setup -q -n %{name}-%{version}_%{prever}


%build
%configure
make %{?_smp_mflags}
convert pixmaps/atomorun_winicon.ico %{name}.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/pixmaps/atomorun_winicon.ico
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc/%{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
install -p -m 644 %{name}.png \
  $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 ChangeLog COPYING README TODO
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sun Nov 26 2006 Hans de Goede  1.1-0.2.pre2
- Add Requires hicolor-icon-theme (bz 217249)

* Sat Nov 25 2006 Hans de Goede  1.1-0.1.pre2
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/atomorun/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 18:43:07 -0000	1.1
+++ .cvsignore	26 Nov 2006 18:44:44 -0000	1.2
@@ -0,0 +1 @@
+atomorun-1.1_pre2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/atomorun/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 18:43:07 -0000	1.1
+++ sources	26 Nov 2006 18:44:44 -0000	1.2
@@ -0,0 +1 @@
+41522a330c0da7c6e79c46baa2c1d8c3  atomorun-1.1_pre2.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 18:49:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:49:52 -0500
Subject: owners owners.list,1.2018,1.2019
Message-ID: <200611261849.kAQInqPl004670@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4655

Modified Files:
	owners.list 
Log Message:
added atomorun


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2018
retrieving revision 1.2019
diff -u -r1.2018 -r1.2019
--- owners.list	26 Nov 2006 13:57:20 -0000	1.2018
+++ owners.list	26 Nov 2006 18:49:22 -0000	1.2019
@@ -84,6 +84,7 @@
 Fedora Extras|atlas|Automatically Tuned Linear Algebra Software|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|atlascpp|WorldForge message protocol library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|atomix|Little mind game where you have to build molecules out of atoms lying around|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|atomorun|Jump&Run game where you have to flee an exploding nuclear bomb|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|audacious|A GTK2 based media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|aumix|Audio mixer based on ncurses|somlo at cmu.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 18:52:20 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:52:20 -0500
Subject: comps comps-fe7.xml.in,1.30,1.31
Message-ID: <200611261852.kAQIqKkU004701@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4684

Modified Files:
	comps-fe7.xml.in 
Log Message:
add liquidwar, atomorun


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- comps-fe7.xml.in	25 Nov 2006 21:12:02 -0000	1.30
+++ comps-fe7.xml.in	26 Nov 2006 18:51:50 -0000	1.31
@@ -358,6 +358,7 @@
       alex4
       arrows
       atomix
+      atomorun
       auriferous
       ballbuster
       beneath-a-steel-sky
@@ -401,6 +402,7 @@
       gweled
       lacewing
       lincity-ng
+      liquidwar
       lmarbles
       lucidlife
       Maelstrom



From fedora-extras-commits at redhat.com  Sun Nov 26 19:54:05 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 26 Nov 2006 14:54:05 -0500
Subject: rpms/gaim-meanwhile/devel
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-04_blist-memleak.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch,
	NONE, 1.1 gaim-2.0.0beta5-silc-edit-account-crash.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 gaim-meanwhile.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200611261954.kAQJs58P008226@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8128

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Added Files:
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch 
	gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch 
	gaim-2.0.0beta5-debian-04_blist-memleak.patch 
	gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch 
	gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch 
	gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch 
	gaim-2.0.0beta5-silc-edit-account-crash.patch 
Log Message:
Update to latest beta code


gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch:

--- NEW FILE gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch ---
--- console/plugins/gnthistory.orig	2006-10-18 20:54:41.000000000 -0400
+++ console/plugins/gnthistory.c	2006-10-18 20:54:45.000000000 -0400
@@ -173,7 +173,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	NULL,
+	GAIM_GNT_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,

gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch:

--- NEW FILE gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch ---
diff -Nur gaim-2.0.0+beta5/gtk/gtksound.c gaim-2.0.0+beta5.new/gtk/gtksound.c
--- gaim-2.0.0+beta5/gtk/gtksound.c	2006-11-10 02:23:00.000000000 -0500
+++ gaim-2.0.0+beta5.new/gtk/gtksound.c	2006-11-11 15:44:05.000000000 -0500
@@ -448,9 +448,7 @@
 		return;
 	volume = (float)(CLAMP(gaim_prefs_get_int("/gaim/gtk/sound/volume"),0,100)) / 50;
 	if (!strcmp(method, "automatic")) {
-		if (gaim_running_gnome()) {
-			sink = gst_element_factory_make("gconfaudiosink", "sink");
-		}
+		sink = gst_element_factory_make("gconfaudiosink", "sink");
 		if (!sink)
 			sink = gst_element_factory_make("autoaudiosink", "sink");
 	} else if (!strcmp(method, "esd")) {

gaim-2.0.0beta5-debian-04_blist-memleak.patch:

--- NEW FILE gaim-2.0.0beta5-debian-04_blist-memleak.patch ---
--- trunk/gtk/gtkblist.c	(revision 17621)
+++ trunk/gtk/gtkblist.c	(revision 17774)
@@ -560,7 +560,7 @@
 rebuild_joinchat_entries(GaimGtkJoinChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -569,11 +569,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 	data->entries = NULL;
@@ -5111,7 +5108,7 @@
 rebuild_addchat_entries(GaimGtkAddChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -5120,11 +5117,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 
@@ -5965,8 +5959,7 @@
 		menuitem = l->data;
 
 		if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Add\\/Edit")))
-			gtk_container_remove(GTK_CONTAINER(accountmenu),
-			                     menuitem);
+			gtk_widget_destroy(menuitem);
 	}
 
 	for (accounts = gaim_accounts_get_all(); accounts; accounts = accounts->next) {
@@ -6122,23 +6115,7 @@
 
 	/* Remove old plugin action submenus from the Tools menu */
 	for (l = plugin_submenus; l; l = l->next)
-	{
-		GList *menuitems;
-
-		submenu = l->data;
-
-		menuitems = gtk_container_get_children(GTK_CONTAINER(submenu));
-		while (menuitems != NULL)
-		{
-			GaimPluginAction *action;
-			menuitem = menuitems->data;
-			action = g_object_get_data(G_OBJECT(menuitem), "plugin_action");
-			g_free(action);
-			menuitems = g_list_delete_link(menuitems, menuitems);
-		}
-
-		gtk_container_remove(GTK_CONTAINER(pluginmenu), GTK_WIDGET(submenu));
-	}
+		gtk_widget_destroy(GTK_WIDGET(l->data));
 	g_list_free(plugin_submenus);
 	plugin_submenus = NULL;
 

gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch:

--- NEW FILE gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch ---
--- trunk/libgaim/gaim-url-handler	2006/09/12 09:04:04	17260
+++ trunk/libgaim/gaim-url-handler	2006/11/18 05:25:31	17773
@@ -189,15 +189,26 @@
 
 def xmpp(uri):
     protocol = "prpl-jabber"
-    match = re.match(r"^xmpp:(//([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
+    match = re.match(r"^xmpp:((//)?([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
     if not match:
         print "Invalid xmpp URI: %s" % uri
         return
 
-    accountname = urllib.unquote_plus(match.group(2)) or ""
-    screenname = urllib.unquote_plus(match.group(4))
-    command = urllib.unquote_plus(match.group(6))
-    paramstring = match.group(8)
+    tmp = match.group(3)
+    if (tmp):
+        accountname = urllib.unquote_plus(tmp)
+    else:
+        accountname = ""
+
+    screenname = urllib.unquote_plus(match.group(5))
+
+    tmp = match.group(7)
+    if (tmp):
+        command = urllib.unquote_plus(tmp)
+    else:
+        command = ""
+
+    paramstring = match.group(9)
     params = {}
     if paramstring:
         for param in paramstring.split(";"):

gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch:

--- NEW FILE gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch ---
Index: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c	(revision 17787)
+++ trunk/libgaim/protocols/jabber/jabber.c	(revision 17788)
@@ -926,10 +926,17 @@
 	}
 
 	if(!js->gsc) {
-		if (gaim_proxy_connect(gc, account, server,
-				gaim_account_get_int(account, "port", 5222),
-				jabber_login_callback, gc) == NULL)
-			gaim_connection_error(gc, _("Unable to create socket"));
+		if (connect_server[0]) {
+			jabber_login_connect(js, server,
+			                     gaim_account_get_int(account,
+			                                          "port", 5222));
+		} else {
+			js->srv_query_data = gaim_srv_resolve("xmpp-client",
+			                                      "tcp",
+			                                      js->user->domain,
+			                                      srv_resolved_cb,
+			                                      js);
+		}
 	}
 }
 

gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch:

--- NEW FILE gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch ---
Index: trunk/libgaim/protocols/msn/object.c
===================================================================
--- trunk/libgaim/protocols/msn/object.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/object.c	(revision 17766)
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "object.h"
+#include "debug.h"
 
 #define GET_STRING_TAG(field, id) \
 	if ((tag = strstr(str, id "=\"")) != NULL) \
@@ -94,6 +95,7 @@
 	if (obj->creator == NULL || obj->size == 0 || obj->type == 0
 			|| obj->location == NULL || obj->friendly == NULL
 			|| obj->sha1d == NULL || obj->sha1c == NULL) {
+		gaim_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
 		msn_object_destroy(obj);
 		obj = NULL;
 	}
@@ -106,24 +108,13 @@
 {
 	g_return_if_fail(obj != NULL);
 
-	if (obj->creator != NULL)
-		g_free(obj->creator);
+	g_free(obj->creator);
+	g_free(obj->location);
+	g_free(obj->real_location);
+	g_free(obj->friendly);
+	g_free(obj->sha1d);
+	g_free(obj->sha1c);
 
-	if (obj->location != NULL)
-		g_free(obj->location);
-
-	if (obj->real_location != NULL)
-		g_free(obj->real_location);
-
-	if (obj->friendly != NULL)
-		g_free(obj->friendly);
-
-	if (obj->sha1d != NULL)
-		g_free(obj->sha1d);
-
-	if (obj->sha1c != NULL)
-		g_free(obj->sha1c);
-
 	if (obj->local)
 		local_objs = g_list_remove(local_objs, obj);
 
Index: trunk/libgaim/protocols/msn/slplink.c
===================================================================
--- trunk/libgaim/protocols/msn/slplink.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/slplink.c	(revision 17766)
@@ -147,6 +147,9 @@
 {
 	MsnSlpLink *slplink;
 
+	g_return_val_if_fail(session != NULL, NULL);
+	g_return_val_if_fail(username != NULL, NULL);
+
 	slplink = msn_session_find_slplink(session, username);
 
 	if (slplink == NULL)
Index: trunk/libgaim/protocols/msn/slp.c
===================================================================
--- trunk/libgaim/protocols/msn/slp.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/slp.c	(revision 17766)
@@ -819,6 +819,9 @@
 		smile = tokens[tok];
 		obj = msn_object_new_from_string(gaim_url_decode(tokens[tok + 1]));
 
+		if (obj == NULL)
+			break;
+
 		who = msn_object_get_creator(obj);
 		sha1c = msn_object_get_sha1c(obj);
 

gaim-2.0.0beta5-silc-edit-account-crash.patch:

--- NEW FILE gaim-2.0.0beta5-silc-edit-account-crash.patch ---
http://gaim.svn.sourceforge.net/viewvc/gaim/trunk/gtk/gtkaccount.c?r1=17800&r2=17799&view=patch&pathrev=17800
We shouldn't be freeing kvp->value, which is put in the list store as G_TYPE_POINTER.
This was causing crashes for people editing SILC accounts (nothing else uses GAIM_PREF_STRING_LIST).

--- trunk/gtk/gtkaccount.c	2006/11/21 04:34:38	17799
+++ trunk/gtk/gtkaccount.c	2006/11/21 05:32:55	17800
@@ -810,7 +810,7 @@
 					if (node->data != NULL) {
 						kvp = (GaimKeyValuePair *) node->data;
 						if ((kvp->value != NULL) && (str_value != NULL) &&
-							!g_utf8_collate(kvp->value, str_value))
+						    !g_utf8_collate(kvp->value, str_value))
 							idx = i;
 
 						gtk_list_store_append(model, &iter);
@@ -1247,7 +1247,6 @@
 					gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter);
 					gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1);
 					gaim_account_set_string(account, setting, value2);
-					g_free(value2);
 					break;
 
 				default:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	31 Oct 2006 01:31:13 -0000	1.10
+++ .cvsignore	26 Nov 2006 19:53:35 -0000	1.11
@@ -1 +1 @@
-gaim-2.0.0beta4.tar.bz2
+gaim-2.0.0beta5.tar.bz2


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gaim-meanwhile.spec	31 Oct 2006 01:31:13 -0000	1.16
+++ gaim-meanwhile.spec	26 Nov 2006 19:53:35 -0000	1.17
@@ -23,7 +23,7 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta4
+%define betaver	beta5
 
 Name:		gaim-meanwhile
 Version:	2.0.0
@@ -52,6 +52,16 @@
 # to be replaced by upstream fix
 Patch5:		gaim2-PIE.patch
 
+## Patches 100+: To be Included in Future Upstream
+Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
+Patch103: gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch
+Patch104: gaim-2.0.0beta5-debian-04_blist-memleak.patch
+Patch105: gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch
+Patch106: gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch
+Patch107: gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch
+
+Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
 
@@ -88,7 +98,7 @@
 %endif
 # Evolution integration (FC3+)
 %if %{evolution_integration}
-BuildRequires:	evolution-data-server-devel >= 1.9.1
+BuildRequires:	evolution-data-server-devel
 %endif
 # SILC integration (FC3+)
 %if %{silc_integration}
@@ -121,8 +131,16 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
-#PIE patch is broken
 #%patch5 -p1
+## Patches 100+: To be Included in Future Upstream
+%patch102 -p0
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+
+%patch150 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Oct 2006 01:31:13 -0000	1.10
+++ sources	26 Nov 2006 19:53:35 -0000	1.11
@@ -1 +1 @@
-ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2
+84099216123de25402fa7e904ceca437  gaim-2.0.0beta5.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 20:10:09 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 15:10:09 -0500
Subject: owners owners.list,1.2019,1.2020
Message-ID: <200611262010.kAQKA93d011372@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11353

Modified Files:
	owners.list 
Log Message:
Add audacious-plugins


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2019
retrieving revision 1.2020
diff -u -r1.2019 -r1.2020
--- owners.list	26 Nov 2006 18:49:22 -0000	1.2019
+++ owners.list	26 Nov 2006 20:09:39 -0000	1.2020
@@ -86,6 +86,7 @@
 Fedora Extras|atomix|Little mind game where you have to build molecules out of atoms lying around|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|atomorun|Jump&Run game where you have to flee an exploding nuclear bomb|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|audacious|A GTK2 based media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
+Fedora Extras|audacious-plugins|Plugins for the Audacious media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|aumix|Audio mixer based on ncurses|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|auriferous|Game inspired by the classic Loderunner|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 20:17:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 26 Nov 2006 15:17:04 -0500
Subject: rpms/pcsc-tools/FC-6 .cvsignore, 1.8, 1.9 pcsc-tools.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200611262017.kAQKH4wD011444@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11410/FC-6

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Log Message:
* Sun Nov 26 2006 Ville Skytt??  - 1.4.8-1
- 1.4.8.
- Drop X-Fedora desktop entry category.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Oct 2006 16:27:18 -0000	1.8
+++ .cvsignore	26 Nov 2006 20:16:34 -0000	1.9
@@ -1,2 +1 @@
-pcsc-tools-1.4.7.tar.gz
-smartcard_list.txt
+pcsc-tools-1.4.8.tar.gz


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-6/pcsc-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pcsc-tools.spec	8 Oct 2006 16:27:18 -0000	1.9
+++ pcsc-tools.spec	26 Nov 2006 20:16:34 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           pcsc-tools
-Version:        1.4.7
+Version:        1.4.8
 Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
@@ -7,7 +7,7 @@
 License:        GPL
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
-Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
+#Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,7 +25,7 @@
 %prep
 %setup -q
 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
-cp %{SOURCE1} .
+#cp %{SOURCE1} .
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
@@ -36,12 +36,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT%{_prefix}
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode=644 \
-  --add-category=X-Fedora \
-  gscriptor.desktop
+desktop-file-install --vendor=fedora --mode=644 \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications gscriptor.desktop
 # TODO: icon
 
 
@@ -52,13 +48,23 @@
 %files
 %defattr(-,root,root,-)
 %doc Changelog LICENCE README TODO
-%{_bindir}/*
+%{_bindir}/ATR_analysis
+%{_bindir}/gscriptor
+%{_bindir}/pcsc_scan
+%{_bindir}/scriptor
 %{_datadir}/applications/*gscriptor.desktop
 %{_datadir}/pcsc/
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/ATR_analysis.1*
+%{_mandir}/man1/gscriptor.1*
+%{_mandir}/man1/pcsc_scan.1*
+%{_mandir}/man1/scriptor.1*
 
 
 %changelog
+* Sun Nov 26 2006 Ville Skytt??  - 1.4.8-1
+- 1.4.8.
+- Drop X-Fedora desktop entry category.
+
 * Sun Oct  8 2006 Ville Skytt??  - 1.4.7-1
 - 1.4.7, Oct 8 smartcard_list.txt.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Oct 2006 16:27:18 -0000	1.8
+++ sources	26 Nov 2006 20:16:34 -0000	1.9
@@ -1,2 +1 @@
-fb4129779df83a0eb57e8bdf7fec1535  pcsc-tools-1.4.7.tar.gz
-371764708e8690d67f23af02c44320bb  smartcard_list.txt
+f0086eab17b61aba496cd88af8b80332  pcsc-tools-1.4.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 20:17:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 26 Nov 2006 15:17:04 -0500
Subject: rpms/pcsc-tools/devel .cvsignore, 1.8, 1.9 pcsc-tools.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200611262017.kAQKH4l6011449@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11410/devel

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Log Message:
* Sun Nov 26 2006 Ville Skytt??  - 1.4.8-1
- 1.4.8.
- Drop X-Fedora desktop entry category.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Oct 2006 16:27:18 -0000	1.8
+++ .cvsignore	26 Nov 2006 20:16:34 -0000	1.9
@@ -1,2 +1 @@
-pcsc-tools-1.4.7.tar.gz
-smartcard_list.txt
+pcsc-tools-1.4.8.tar.gz


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pcsc-tools.spec	8 Oct 2006 16:27:18 -0000	1.9
+++ pcsc-tools.spec	26 Nov 2006 20:16:34 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           pcsc-tools
-Version:        1.4.7
+Version:        1.4.8
 Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
@@ -7,7 +7,7 @@
 License:        GPL
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
-Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
+#Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,7 +25,7 @@
 %prep
 %setup -q
 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
-cp %{SOURCE1} .
+#cp %{SOURCE1} .
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
@@ -36,12 +36,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT%{_prefix}
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode=644 \
-  --add-category=X-Fedora \
-  gscriptor.desktop
+desktop-file-install --vendor=fedora --mode=644 \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications gscriptor.desktop
 # TODO: icon
 
 
@@ -52,13 +48,23 @@
 %files
 %defattr(-,root,root,-)
 %doc Changelog LICENCE README TODO
-%{_bindir}/*
+%{_bindir}/ATR_analysis
+%{_bindir}/gscriptor
+%{_bindir}/pcsc_scan
+%{_bindir}/scriptor
 %{_datadir}/applications/*gscriptor.desktop
 %{_datadir}/pcsc/
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/ATR_analysis.1*
+%{_mandir}/man1/gscriptor.1*
+%{_mandir}/man1/pcsc_scan.1*
+%{_mandir}/man1/scriptor.1*
 
 
 %changelog
+* Sun Nov 26 2006 Ville Skytt??  - 1.4.8-1
+- 1.4.8.
+- Drop X-Fedora desktop entry category.
+
 * Sun Oct  8 2006 Ville Skytt??  - 1.4.7-1
 - 1.4.7, Oct 8 smartcard_list.txt.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Oct 2006 16:27:18 -0000	1.8
+++ sources	26 Nov 2006 20:16:34 -0000	1.9
@@ -1,2 +1 @@
-fb4129779df83a0eb57e8bdf7fec1535  pcsc-tools-1.4.7.tar.gz
-371764708e8690d67f23af02c44320bb  smartcard_list.txt
+f0086eab17b61aba496cd88af8b80332  pcsc-tools-1.4.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 21:47:21 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 26 Nov 2006 16:47:21 -0500
Subject: rpms/xfce4-notes-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-notes-plugin.spec, 1.5, 1.6
Message-ID: <200611262147.kAQLlLLq015008@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14987

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
update to 1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 12:43:10 -0000	1.3
+++ .cvsignore	26 Nov 2006 21:46:51 -0000	1.4
@@ -1 +1 @@
-xfce4-notes-plugin-1.3.99.1.tar.bz2
+xfce4-notes-plugin-1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 12:43:10 -0000	1.3
+++ sources	26 Nov 2006 21:46:51 -0000	1.4
@@ -1 +1 @@
-e77f1150459d8ab6a1ae0d86af09f44c  xfce4-notes-plugin-1.3.99.1.tar.bz2
+5f466f0ccb68b1f14ded77571baa1145  xfce4-notes-plugin-1.4.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-notes-plugin.spec	5 Oct 2006 12:43:10 -0000	1.5
+++ xfce4-notes-plugin.spec	26 Nov 2006 21:46:51 -0000	1.6
@@ -1,11 +1,11 @@
 Name:		xfce4-notes-plugin
-Version:	1.3.99.1
-Release:	3%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://goodies.xfce.org/
+URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +42,9 @@
 %{_bindir}/xfce4-popup-notes
 
 %changelog
+* Sun Nov 26 2006 Christoph Wickert  - 1.4-1
+- Update to 1.4.
+
 * Thu Oct 05 2006 Christoph Wickert  - 1.3.99.1-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sun Nov 26 21:50:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 26 Nov 2006 16:50:23 -0500
Subject: rpms/xfce4-notes-plugin/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-notes-plugin.spec, 1.5, 1.6
Message-ID: <200611262150.kAQLoNTo015090@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15071

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
update to 1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 12:43:10 -0000	1.3
+++ .cvsignore	26 Nov 2006 21:49:53 -0000	1.4
@@ -1 +1 @@
-xfce4-notes-plugin-1.3.99.1.tar.bz2
+xfce4-notes-plugin-1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 12:43:10 -0000	1.3
+++ sources	26 Nov 2006 21:49:53 -0000	1.4
@@ -1 +1 @@
-e77f1150459d8ab6a1ae0d86af09f44c  xfce4-notes-plugin-1.3.99.1.tar.bz2
+5f466f0ccb68b1f14ded77571baa1145  xfce4-notes-plugin-1.4.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-6/xfce4-notes-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-notes-plugin.spec	5 Oct 2006 12:43:10 -0000	1.5
+++ xfce4-notes-plugin.spec	26 Nov 2006 21:49:53 -0000	1.6
@@ -1,11 +1,11 @@
 Name:		xfce4-notes-plugin
-Version:	1.3.99.1
-Release:	3%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://goodies.xfce.org/
+URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +42,9 @@
 %{_bindir}/xfce4-popup-notes
 
 %changelog
+* Sun Nov 26 2006 Christoph Wickert  - 1.4-1
+- Update to 1.4.
+
 * Thu Oct 05 2006 Christoph Wickert  - 1.3.99.1-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sun Nov 26 22:36:20 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sun, 26 Nov 2006 17:36:20 -0500
Subject: rpms/python-vobject/FC-6 .cvsignore, 1.4, 1.5 python-vobject.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611262236.kAQMaKGv018315@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18296

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
0.4.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 19:24:14 -0000	1.4
+++ .cvsignore	26 Nov 2006 22:35:50 -0000	1.5
@@ -1 +1 @@
-vobject-0.4.3.tar.gz
+vobject-0.4.4.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-6/python-vobject.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-vobject.spec	7 Oct 2006 19:24:14 -0000	1.4
+++ python-vobject.spec	26 Nov 2006 22:35:50 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.4.3 
+Version:        0.4.4 
 Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
@@ -73,6 +73,9 @@
 %{python_sitelib}/vobject*egg-info
 
 %changelog
+* Sun Nov 26 2006 James Bowes  - 0.4.4-1
+- New version released.
+
 * Sat Oct 07 2006 James Bowes  - 0.4.3-1
 - New version released.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 19:24:14 -0000	1.4
+++ sources	26 Nov 2006 22:35:50 -0000	1.5
@@ -1 +1 @@
-f6405e4620dfcc403f53b825d2eee529  vobject-0.4.3.tar.gz
+d0ee0a3f6a78212cf49c7f1c2de2d9c0  vobject-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 22:42:08 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sun, 26 Nov 2006 17:42:08 -0500
Subject: rpms/python-vobject/devel .cvsignore, 1.4, 1.5 python-vobject.spec, 
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611262242.kAQMg867018426@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18407

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
0.4.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 19:24:14 -0000	1.4
+++ .cvsignore	26 Nov 2006 22:41:38 -0000	1.5
@@ -1 +1 @@
-vobject-0.4.3.tar.gz
+vobject-0.4.4.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/python-vobject.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-vobject.spec	7 Oct 2006 19:24:14 -0000	1.4
+++ python-vobject.spec	26 Nov 2006 22:41:38 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.4.3 
+Version:        0.4.4 
 Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
@@ -73,6 +73,9 @@
 %{python_sitelib}/vobject*egg-info
 
 %changelog
+* Sun Nov 26 2006 James Bowes  - 0.4.4-1
+- New version released.
+
 * Sat Oct 07 2006 James Bowes  - 0.4.3-1
 - New version released.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 19:24:14 -0000	1.4
+++ sources	26 Nov 2006 22:41:38 -0000	1.5
@@ -1 +1 @@
-f6405e4620dfcc403f53b825d2eee529  vobject-0.4.3.tar.gz
+d0ee0a3f6a78212cf49c7f1c2de2d9c0  vobject-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 23:02:29 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:02:29 -0500
Subject: rpms/firefox-32 - New directory
Message-ID: <200611262302.kAQN2Tv3021644@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/firefox-32

Log Message:
Directory /cvs/extras/rpms/firefox-32 added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 23:02:35 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:02:35 -0500
Subject: rpms/firefox-32/devel - New directory
Message-ID: <200611262302.kAQN2ZhX021657@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/firefox-32/devel

Log Message:
Directory /cvs/extras/rpms/firefox-32/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 23:02:46 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:02:46 -0500
Subject: rpms/firefox-32 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611262302.kAQN2kpw021687@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21681

Added Files:
	Makefile import.log 
Log Message:
Setup of module firefox-32


--- NEW FILE Makefile ---
# Top level Makefile for module firefox-32
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 Nov 26 23:02:51 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:02:51 -0500
Subject: rpms/firefox-32/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611262302.kAQN2pfT021702@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21681/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module firefox-32


--- 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 Nov 26 23:03:06 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:03:06 -0500
Subject: rpms/firefox-32/devel firefox-32.desktop, NONE, 1.1 firefox-32.spec,
	NONE, 1.1 setup-firefox-32.sh, NONE, 1.1
Message-ID: <200611262303.kAQN36sr021762@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21744/devel

Added Files:
	firefox-32.desktop firefox-32.spec setup-firefox-32.sh 
Log Message:
auto-import firefox-32-0.0.1-4 on branch devel from firefox-32-0.0.1-4.src.rpm


--- NEW FILE firefox-32.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Firefox Web Browser (32 bit)
GenericName=Web Browser
Comment=Browse the Web
Exec=firefox-32 %u
Icon=redhat-web-browser.png
Terminal=false
Type=Application
NoDisplay=false
Categories=Network;Application;X-Fedora;
StartupNotify=true


--- NEW FILE firefox-32.spec ---
Name:           firefox-32
Version:        0.0.1
Release:        4%{?dist}
Summary:        Alternate Launcher for 32bit Firefox

Group:          Applications/Internet
License:        Public Domain
URL:            http://people.redhat.com/wtogami/firefox-32
# This is a shell script maintained in the package SCM, so there is no upstream.
Source0:        setup-firefox-32.sh
Source1:        firefox-32.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# This is actually noarch (shell script) , but it only makes sense to install on these archs
ExclusiveArch:  x86_64 ppc64 s390x
BuildArch:      noarch
BuildRequires:  desktop-file-utils
# Unfortunately, we cannot have a Requires line that explicitly means /usr/lib/ 32bit firefox.
Requires:       firefox

%description
Alternate Launcher for 32bit Firefox on Multilib Systems
If you have both 32bit and 64bit Firefox installed, the standard 
/usr/bin/firefox launcher will run only the 64bit version.  This 
launcher allows you to choose to run the 32bit browser by running 
/usr/bin/firefox-32.  Please be sure  that all Firefox instances 
are closed before running this launcher.

# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214100
# This package exists because a few simple lines of logic were rejected
# from the main Fedora firefox package that would have provided the 
# ability to easily choose your runtime arch on a multilib system.
# For the long-term, Fedora hopes to obviate the need to run a 32bit
# browser entirely by getting nspluginwrapper to work fully instead.

%prep
echo "Nothing to prep!"

%build
echo "Nothing to build!"

%install
rm -rf $RPM_BUILD_ROOT
install -D -m 0755 %SOURCE0 $RPM_BUILD_ROOT%{_libdir}/firefox-32/setup-firefox-32.sh
mkdir -p   $RPM_BUILD_ROOT%{_bindir}
touch      $RPM_BUILD_ROOT%{_bindir}/firefox-32
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/firefox-32

desktop-file-install --vendor="fedora"                     \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications    \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

# Upon install, generate /usr/bin/firefox-32 based upon the contents of /usr/bin/firefox
%post
%{_libdir}/firefox-32/setup-firefox-32.sh

# Whenever firefox is upgraded, regenerate /usr/bin/firefox-32
%triggerin -- firefox
%{_libdir}/firefox-32/setup-firefox-32.sh

%files
%defattr(-,root,root,-)
# libdir instead of /usr/share because it is meant to be executable
# only on 64bit multilib systems
%{_libdir}/firefox-32/setup-firefox-32.sh
%dir %{_libdir}/firefox-32/
%{_datadir}/applications/fedora-firefox-32.desktop
%ghost %{_bindir}/firefox-32

%changelog
* Sun Nov 26 2006 Christopher Stone  - 0.0.1-4
- Add desktop-file-install command to install .desktop entry
- Modify .desktop entry to more closely match firefox
- Add BuildArch: noarch

* Sun Nov 26 2006 Warren Togami  - 0.0.1-3
- change license to Public Domain
- own firefox-32 directory
- fix .desktop file s/True/true/

* Wed Nov 22 2006 Warren Togami  - 0.0.1-2
- use Source instead of Patch for source files (#215256)

* Sun Nov 12 2006 Warren Togami  - 0.0.1-1
- initial version


--- NEW FILE setup-firefox-32.sh ---
#!/bin/bash
FIREFOX32=/usr/bin/firefox-32
cp /usr/bin/firefox $FIREFOX32
sed -i "s/lib64/lib/g" $FIREFOX32



From fedora-extras-commits at redhat.com  Sun Nov 26 23:03:36 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:03:36 -0500
Subject: rpms/firefox-32 import.log,1.1,1.2
Message-ID: <200611262303.kAQN3a6o021776@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21744

Modified Files:
	import.log 
Log Message:
auto-import firefox-32-0.0.1-4 on branch devel from firefox-32-0.0.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/firefox-32/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 23:02:46 -0000	1.1
+++ import.log	26 Nov 2006 23:03:06 -0000	1.2
@@ -0,0 +1 @@
+firefox-32-0_0_1-4:HEAD:firefox-32-0.0.1-4.src.rpm:1164582290



From fedora-extras-commits at redhat.com  Sun Nov 26 23:06:54 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:06:54 -0500
Subject: rpms/firefox-32/devel firefox-32.spec,1.1,1.2
Message-ID: <200611262306.kAQN6stW021833@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21818

Modified Files:
	firefox-32.spec 
Log Message:
remove erroneous buildarch



Index: firefox-32.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox-32/devel/firefox-32.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-32.spec	26 Nov 2006 23:03:06 -0000	1.1
+++ firefox-32.spec	26 Nov 2006 23:06:24 -0000	1.2
@@ -13,7 +13,6 @@
 
 # This is actually noarch (shell script) , but it only makes sense to install on these archs
 ExclusiveArch:  x86_64 ppc64 s390x
-BuildArch:      noarch
 BuildRequires:  desktop-file-utils
 # Unfortunately, we cannot have a Requires line that explicitly means /usr/lib/ 32bit firefox.
 Requires:       firefox



From fedora-extras-commits at redhat.com  Sun Nov 26 23:08:39 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:08:39 -0500
Subject: rpms/firefox-32/devel firefox-32.spec,1.2,1.3
Message-ID: <200611262308.kAQN8dSi021858@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21839

Modified Files:
	firefox-32.spec 
Log Message:
bump



Index: firefox-32.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox-32/devel/firefox-32.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- firefox-32.spec	26 Nov 2006 23:06:24 -0000	1.2
+++ firefox-32.spec	26 Nov 2006 23:08:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           firefox-32
 Version:        0.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Alternate Launcher for 32bit Firefox
 
 Group:          Applications/Internet
@@ -70,6 +70,9 @@
 %ghost %{_bindir}/firefox-32
 
 %changelog
+* Sun Nov 26 2006 Warren Togami  - 0.0.1-5
+- remove buildarch: noarch
+
 * Sun Nov 26 2006 Christopher Stone  - 0.0.1-4
 - Add desktop-file-install command to install .desktop entry
 - Modify .desktop entry to more closely match firefox



From fedora-extras-commits at redhat.com  Sun Nov 26 23:32:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 26 Nov 2006 18:32:12 -0500
Subject: comps comps-fe6.xml.in,1.230,1.231 comps-fe7.xml.in,1.31,1.32
Message-ID: <200611262332.kAQNWCgh022043@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22023

Modified Files:
	comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add xfce4-dict-plugin xfce4-eyes-plugin and xfce4-dev-tools


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- comps-fe6.xml.in	23 Nov 2006 19:09:47 -0000	1.230
+++ comps-fe6.xml.in	26 Nov 2006 23:31:42 -0000	1.231
@@ -1152,7 +1152,9 @@
       xfce4-clipman-plugin
       xfce4-cpugraph-plugin
       xfce4-datetime-plugin
+      xfce4-dict-plugin
       xfce4-diskperf-plugin
+      xfce4-eyes-plugin
       xfce4-fsguard-plugin
       xfce4-genmon-plugin
       xfce4-minicmd-plugin
@@ -1188,6 +1190,7 @@
       xfce-mcs-manager-devel
       xfce4-panel-devel
       xfce4-session-devel
+      xfce4-dev-tools
     
   
   


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- comps-fe7.xml.in	26 Nov 2006 18:51:50 -0000	1.31
+++ comps-fe7.xml.in	26 Nov 2006 23:31:42 -0000	1.32
@@ -1157,7 +1157,9 @@
       xfce4-clipman-plugin
       xfce4-cpugraph-plugin
       xfce4-datetime-plugin
+      xfce4-dict-plugin
       xfce4-diskperf-plugin
+      xfce4-eyes-plugin
       xfce4-fsguard-plugin
       xfce4-genmon-plugin
       xfce4-minicmd-plugin
@@ -1193,6 +1195,7 @@
       xfce-mcs-manager-devel
       xfce4-panel-devel
       xfce4-session-devel
+      xfce4-dev-tools
     
   
   



From fedora-extras-commits at redhat.com  Sun Nov 26 23:58:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 18:58:04 -0500
Subject: rpms/kaffeine/devel .cvsignore, 1.2, 1.3 kaffeine.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611262358.kAQNw4DC022146@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22127

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Sun Nov 26 2006 Rex Dieter  0.8.3-1
- 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
+++ .cvsignore	26 Nov 2006 23:57:34 -0000	1.3
@@ -1 +1,2 @@
 kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kaffeine.spec	14 Nov 2006 04:11:06 -0000	1.1
+++ kaffeine.spec	26 Nov 2006 23:57:34 -0000	1.2
@@ -11,29 +11,26 @@
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?dist}
 
+%if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
-
 %define  _with_lame --with-lame
 Requires: kaffeine = %{version}
 Patch1: kaffeine-0.8.2-codecs.patch
 # split occurred here
 Conflicts: kaffeine < 0.8.2-2
-
 %else
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %endif
 
-Version: 0.8.2
-Release: 5%{?dist}
-
 License: GPL
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -108,7 +105,7 @@
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
@@ -205,6 +202,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Rex Dieter  0.8.3-1
+- 0.8.3
+
 * Sat Nov 04 2006 Rex Dieter  0.8.2-6
 - %%doc README
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2006 04:11:06 -0000	1.2
+++ sources	26 Nov 2006 23:57:34 -0000	1.3
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 01:58:07 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 26 Nov 2006 20:58:07 -0500
Subject: comps comps-fe7.xml.in,1.32,1.33
Message-ID: <200611270158.kAR1w71u032536@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32521

Modified Files:
	comps-fe7.xml.in 
Log Message:
Added tclpro




Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- comps-fe7.xml.in	26 Nov 2006 23:31:42 -0000	1.32
+++ comps-fe7.xml.in	27 Nov 2006 01:57:37 -0000	1.33
@@ -197,6 +197,7 @@
       svnmailer
       sysconftool
       sysprof
+      tclpro
       tkcvs
       tla
       tolua++



From fedora-extras-commits at redhat.com  Mon Nov 27 03:30:06 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 26 Nov 2006 22:30:06 -0500
Subject: rpms/ddclient/FC-6 .cvsignore, 1.3, 1.4 ddclient.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200611270330.kAR3U6bw006611@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/ddclient/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6592

Modified Files:
	.cvsignore ddclient.spec sources 
Log Message:
Update to latest 3.6 release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ddclient/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2005 07:13:12 -0000	1.3
+++ .cvsignore	27 Nov 2006 03:29:36 -0000	1.4
@@ -1 +1 @@
-ddclient-3.6.6.tar.bz2
+ddclient-3.6.7.tar.bz2


Index: ddclient.spec
===================================================================
RCS file: /cvs/extras/rpms/ddclient/FC-6/ddclient.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ddclient.spec	20 Sep 2006 18:51:13 -0000	1.7
+++ ddclient.spec	27 Nov 2006 03:29:36 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           ddclient
-Version:        3.6.6
+Version:        3.6.7
 Release:        2%{?dist}
 Summary:        Client to update dynamic DNS host entries
 
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Josh Boyer  - 3.6.7-1
+- Update to latest 3.6 release
+
 * Sat Jul 30 2005 Ville Skytt??  - 3.6.6-1
 - 3.6.6, update URLs (#165272).
 - Restart service on future package upgrades (still manually needed this time).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ddclient/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2005 07:13:12 -0000	1.3
+++ sources	27 Nov 2006 03:29:36 -0000	1.4
@@ -1 +1 @@
-5fd0f82446fbed857c841a4deb83cdb9  ddclient-3.6.6.tar.bz2
+b07a29a891dcf40b941b9bc5ef3ce598  ddclient-3.6.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 04:19:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 26 Nov 2006 23:19:28 -0500
Subject: rpms/perl-Cache-Simple-TimedExpiry/devel .cvsignore, 1.3,
	1.4 perl-Cache-Simple-TimedExpiry.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611270419.kAR4JS9m010017@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996

Modified Files:
	.cvsignore perl-Cache-Simple-TimedExpiry.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2006 11:48:21 -0000	1.3
+++ .cvsignore	27 Nov 2006 04:18:58 -0000	1.4
@@ -1 +1 @@
-Cache-Simple-TimedExpiry-0.26.tar.gz
+Cache-Simple-TimedExpiry-0.27.tar.gz


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/devel/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Cache-Simple-TimedExpiry.spec	5 Sep 2006 11:48:21 -0000	1.4
+++ perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:18:58 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Cache-Simple-TimedExpiry
-Version: 	0.26
+Version: 	0.27
 Release: 	1%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL or Artistic
@@ -41,6 +41,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 0.26-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2006 11:48:21 -0000	1.3
+++ sources	27 Nov 2006 04:18:58 -0000	1.4
@@ -1 +1 @@
-f44e43af0a29ac4effb702e016650512  Cache-Simple-TimedExpiry-0.26.tar.gz
+4ef124ab7776f3c257b9ffbed917e67a  Cache-Simple-TimedExpiry-0.27.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 04:21:19 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 26 Nov 2006 23:21:19 -0500
Subject: rpms/perl-Cache-Simple-TimedExpiry/FC-6 .cvsignore, 1.3,
	1.4 perl-Cache-Simple-TimedExpiry.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611270421.kAR4LJwP010080@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10061

Modified Files:
	.cvsignore perl-Cache-Simple-TimedExpiry.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2006 11:48:21 -0000	1.3
+++ .cvsignore	27 Nov 2006 04:20:49 -0000	1.4
@@ -1 +1 @@
-Cache-Simple-TimedExpiry-0.26.tar.gz
+Cache-Simple-TimedExpiry-0.27.tar.gz


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-6/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Cache-Simple-TimedExpiry.spec	5 Sep 2006 11:48:21 -0000	1.4
+++ perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:20:49 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Cache-Simple-TimedExpiry
-Version: 	0.26
+Version: 	0.27
 Release: 	1%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL or Artistic
@@ -41,6 +41,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 0.26-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2006 11:48:21 -0000	1.3
+++ sources	27 Nov 2006 04:20:49 -0000	1.4
@@ -1 +1 @@
-f44e43af0a29ac4effb702e016650512  Cache-Simple-TimedExpiry-0.26.tar.gz
+4ef124ab7776f3c257b9ffbed917e67a  Cache-Simple-TimedExpiry-0.27.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 04:48:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 26 Nov 2006 23:48:13 -0500
Subject: rpms/perl-Cache-Simple-TimedExpiry/FC-5 .cvsignore, 1.2,
	1.3 perl-Cache-Simple-TimedExpiry.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611270448.kAR4mDKL010149@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10130

Modified Files:
	.cvsignore perl-Cache-Simple-TimedExpiry.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2005 15:14:16 -0000	1.2
+++ .cvsignore	27 Nov 2006 04:47:43 -0000	1.3
@@ -1 +1 @@
-Cache-Simple-TimedExpiry-0.23.tar.gz
+Cache-Simple-TimedExpiry-0.27.tar.gz


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-5/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Cache-Simple-TimedExpiry.spec	24 Feb 2006 04:39:58 -0000	1.2
+++ perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:47:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
-Version: 	0.23
-Release: 	3%{?dist}
+Version: 	0.27
+Release: 	1%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -41,6 +41,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.26-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.23-4
+- Mass rebuild.
+
 * Fri Feb 24 2006 Ralf Cors??pius  - 0.23-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2005 15:14:16 -0000	1.2
+++ sources	27 Nov 2006 04:47:43 -0000	1.3
@@ -1 +1 @@
-35cb46fc96272591db75491c9250a48d  Cache-Simple-TimedExpiry-0.23.tar.gz
+4ef124ab7776f3c257b9ffbed917e67a  Cache-Simple-TimedExpiry-0.27.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 05:50:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 00:50:39 -0500
Subject: rpms/perl-Cache-Simple-TimedExpiry/FC-4 .cvsignore, 1.2,
	1.3 perl-Cache-Simple-TimedExpiry.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611270550.kAR5odIT013934@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13911

Modified Files:
	.cvsignore perl-Cache-Simple-TimedExpiry.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2005 15:14:16 -0000	1.2
+++ .cvsignore	27 Nov 2006 05:50:09 -0000	1.3
@@ -1 +1 @@
-Cache-Simple-TimedExpiry-0.23.tar.gz
+Cache-Simple-TimedExpiry-0.27.tar.gz


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-4/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Cache-Simple-TimedExpiry.spec	26 Aug 2005 15:14:16 -0000	1.1
+++ perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 05:50:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
-Version: 	0.23
-Release: 	2%{?dist}
+Version: 	0.27
+Release: 	1%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -41,6 +41,18 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.26-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.23-4
+- Mass rebuild.
+
+* Fri Feb 24 2006 Ralf Cors??pius  - 0.23-3
+- Rebuild for perl-5.8.8.
+
 * Fri Aug 26 2005 Ralf Corsepius  - 0.23-2
 - Spec cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2005 15:14:16 -0000	1.2
+++ sources	27 Nov 2006 05:50:09 -0000	1.3
@@ -1 +1 @@
-35cb46fc96272591db75491c9250a48d  Cache-Simple-TimedExpiry-0.23.tar.gz
+4ef124ab7776f3c257b9ffbed917e67a  Cache-Simple-TimedExpiry-0.27.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 06:16:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 01:16:47 -0500
Subject: rpms/perl-File-Remove/devel .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611270616.kAR6GlKl017165@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17146

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.
- Fix URL in Source0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:43:18 -0000	1.4
+++ .cvsignore	27 Nov 2006 06:16:17 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Remove.spec	3 Nov 2006 05:43:18 -0000	1.6
+++ perl-File-Remove.spec	27 Nov 2006 06:16:17 -0000	1.7
@@ -1,11 +1,11 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
-Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -46,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+- Fix URL in Source0.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:43:18 -0000	1.4
+++ sources	27 Nov 2006 06:16:17 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 06:19:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 01:19:48 -0500
Subject: rpms/perl-File-Remove/FC-6 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611270619.kAR6JmBv017242@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17223

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.
- Fix URL in Source0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:43:58 -0000	1.4
+++ .cvsignore	27 Nov 2006 06:19:18 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/perl-File-Remove.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Remove.spec	3 Nov 2006 05:43:58 -0000	1.6
+++ perl-File-Remove.spec	27 Nov 2006 06:19:18 -0000	1.7
@@ -1,11 +1,11 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
-Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -46,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+- Fix URL in Source0.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:43:58 -0000	1.4
+++ sources	27 Nov 2006 06:19:18 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 06:21:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 01:21:47 -0500
Subject: rpms/perl-File-Remove/FC-5 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200611270621.kAR6LlV6017305@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17286

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.
- Fix URL in Source0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:44:38 -0000	1.4
+++ .cvsignore	27 Nov 2006 06:21:17 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/perl-File-Remove.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-File-Remove.spec	3 Nov 2006 05:44:38 -0000	1.5
+++ perl-File-Remove.spec	27 Nov 2006 06:21:17 -0000	1.6
@@ -1,11 +1,11 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
-Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -46,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+- Fix URL in Source0.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:44:38 -0000	1.4
+++ sources	27 Nov 2006 06:21:17 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 06:29:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 27 Nov 2006 01:29:37 -0500
Subject: rpms/spandsp/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 spandsp.spec, 1.4, 1.5
Message-ID: <200611270629.kAR6Tbhj017391@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17372

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Nov 2006 16:50:44 -0000	1.5
+++ .cvsignore	27 Nov 2006 06:29:07 -0000	1.6
@@ -1 +1 @@
-spandsp-0.0.3pre25.tgz
+spandsp-0.0.3pre26.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Nov 2006 16:50:44 -0000	1.5
+++ sources	27 Nov 2006 06:29:07 -0000	1.6
@@ -1 +1 @@
-6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz
+304f24f67b55c4ac3e3e7a6df5aaa4a2  spandsp-0.0.3pre26.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spandsp.spec	21 Nov 2006 16:50:44 -0000	1.4
+++ spandsp.spec	27 Nov 2006 06:29:07 -0000	1.5
@@ -1,4 +1,4 @@
-%define pre 25
+%define pre 26
 
 Summary: A DSP library for telephony
 Name: spandsp



From fedora-extras-commits at redhat.com  Mon Nov 27 06:31:08 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 27 Nov 2006 01:31:08 -0500
Subject: rpms/spandsp/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 spandsp.spec, 1.4, 1.5
Message-ID: <200611270631.kAR6V8db017460@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17435

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Nov 2006 16:54:20 -0000	1.5
+++ .cvsignore	27 Nov 2006 06:30:38 -0000	1.6
@@ -1 +1 @@
-spandsp-0.0.3pre25.tgz
+spandsp-0.0.3pre26.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Nov 2006 16:54:20 -0000	1.5
+++ sources	27 Nov 2006 06:30:38 -0000	1.6
@@ -1 +1 @@
-6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz
+304f24f67b55c4ac3e3e7a6df5aaa4a2  spandsp-0.0.3pre26.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/spandsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spandsp.spec	21 Nov 2006 16:54:20 -0000	1.4
+++ spandsp.spec	27 Nov 2006 06:30:38 -0000	1.5
@@ -1,4 +1,4 @@
-%define pre 25
+%define pre 26
 
 Summary: A DSP library for telephony
 Name: spandsp



From fedora-extras-commits at redhat.com  Mon Nov 27 06:32:51 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 27 Nov 2006 01:32:51 -0500
Subject: rpms/spandsp/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 spandsp.spec, 1.4, 1.5
Message-ID: <200611270632.kAR6WpT1017523@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17504

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Nov 2006 16:55:37 -0000	1.5
+++ .cvsignore	27 Nov 2006 06:32:21 -0000	1.6
@@ -1 +1 @@
-spandsp-0.0.3pre25.tgz
+spandsp-0.0.3pre26.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Nov 2006 16:55:37 -0000	1.5
+++ sources	27 Nov 2006 06:32:21 -0000	1.6
@@ -1 +1 @@
-6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz
+304f24f67b55c4ac3e3e7a6df5aaa4a2  spandsp-0.0.3pre26.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/spandsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spandsp.spec	21 Nov 2006 16:55:37 -0000	1.4
+++ spandsp.spec	27 Nov 2006 06:32:21 -0000	1.5
@@ -1,4 +1,4 @@
-%define pre 25
+%define pre 26
 
 Summary: A DSP library for telephony
 Name: spandsp



From fedora-extras-commits at redhat.com  Mon Nov 27 06:39:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 01:39:26 -0500
Subject: rpms/perl-File-Remove/FC-4 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611270639.kAR6dQAo017608@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17587

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.
- Fix URL in Source0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:45:19 -0000	1.4
+++ .cvsignore	27 Nov 2006 06:38:56 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/perl-File-Remove.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-Remove.spec	3 Nov 2006 05:45:19 -0000	1.4
+++ perl-File-Remove.spec	27 Nov 2006 06:38:56 -0000	1.5
@@ -1,11 +1,11 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
-Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -46,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+- Fix URL in Source0.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:45:19 -0000	1.4
+++ sources	27 Nov 2006 06:38:56 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 08:27:46 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 03:27:46 -0500
Subject: rpms/tcd-utils/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tcd-utils.spec, 1.1, 1.2
Message-ID: <200611270827.kAR8RkcQ024067@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24043

Modified Files:
	.cvsignore sources tcd-utils.spec 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
- Update to 20061127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:37:37 -0000	1.2
+++ .cvsignore	27 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-tcd-utils-20061120.tar.bz2
+tcd-utils-20061127.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:37:37 -0000	1.2
+++ sources	27 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-f0d58145520be7eeaf5d78229dae4aa7  tcd-utils-20061120.tar.bz2
+c1ad8793179a505b705729f51b9f5d90  tcd-utils-20061127.tar.bz2


Index: tcd-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/tcd-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcd-utils.spec	26 Nov 2006 13:37:37 -0000	1.1
+++ tcd-utils.spec	27 Nov 2006 08:27:16 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		tcd-utils
-Version:	20061120
+Version:	20061127
 Release:	1%{?dist}
 Summary:	TCD (Tide Constituent Database) Utils
 
@@ -27,8 +27,6 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir_p} $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
  
 %clean
@@ -40,6 +38,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
+- Update to 20061127
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 20061120-1
 - Formal 20061120 released
 - Versioning change



From fedora-extras-commits at redhat.com  Mon Nov 27 08:29:14 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 03:29:14 -0500
Subject: rpms/tcd-utils/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tcd-utils.spec, 1.1, 1.2
Message-ID: <200611270829.kAR8TEcR024108@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24087

Modified Files:
	.cvsignore sources tcd-utils.spec 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
- Update to 20061127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:37:37 -0000	1.2
+++ .cvsignore	27 Nov 2006 08:28:44 -0000	1.3
@@ -1 +1 @@
-tcd-utils-20061120.tar.bz2
+tcd-utils-20061127.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:37:37 -0000	1.2
+++ sources	27 Nov 2006 08:28:44 -0000	1.3
@@ -1 +1 @@
-f0d58145520be7eeaf5d78229dae4aa7  tcd-utils-20061120.tar.bz2
+c1ad8793179a505b705729f51b9f5d90  tcd-utils-20061127.tar.bz2


Index: tcd-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-5/tcd-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcd-utils.spec	26 Nov 2006 13:37:37 -0000	1.1
+++ tcd-utils.spec	27 Nov 2006 08:28:44 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		tcd-utils
-Version:	20061120
+Version:	20061127
 Release:	1%{?dist}
 Summary:	TCD (Tide Constituent Database) Utils
 
@@ -27,8 +27,6 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir_p} $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
  
 %clean
@@ -40,6 +38,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
+- Update to 20061127
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 20061120-1
 - Formal 20061120 released
 - Versioning change



From fedora-extras-commits at redhat.com  Mon Nov 27 08:33:02 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 03:33:02 -0500
Subject: rpms/tcd-utils/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tcd-utils.spec, 1.1, 1.2
Message-ID: <200611270833.kAR8X2c9024223@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24204

Modified Files:
	.cvsignore sources tcd-utils.spec 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
- Update to 20061127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:37:37 -0000	1.2
+++ .cvsignore	27 Nov 2006 08:32:32 -0000	1.3
@@ -1 +1 @@
-tcd-utils-20061120.tar.bz2
+tcd-utils-20061127.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:37:37 -0000	1.2
+++ sources	27 Nov 2006 08:32:32 -0000	1.3
@@ -1 +1 @@
-f0d58145520be7eeaf5d78229dae4aa7  tcd-utils-20061120.tar.bz2
+c1ad8793179a505b705729f51b9f5d90  tcd-utils-20061127.tar.bz2


Index: tcd-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-6/tcd-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcd-utils.spec	26 Nov 2006 13:37:37 -0000	1.1
+++ tcd-utils.spec	27 Nov 2006 08:32:32 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		tcd-utils
-Version:	20061120
+Version:	20061127
 Release:	1%{?dist}
 Summary:	TCD (Tide Constituent Database) Utils
 
@@ -27,8 +27,6 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir_p} $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
  
 %clean
@@ -40,6 +38,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
+- Update to 20061127
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 20061120-1
 - Formal 20061120 released
 - Versioning change



From fedora-extras-commits at redhat.com  Mon Nov 27 09:00:17 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:00:17 -0500
Subject: rpms/mlmmj/FC-3 .cvsignore, 1.8, 1.9 mlmmj.spec, 1.15, 1.16 sources,
	1.8, 1.9
Message-ID: <200611270900.kAR90HoT024489@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24458

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.2.12-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Jan 2006 02:19:07 -0000	1.8
+++ .cvsignore	27 Nov 2006 08:59:47 -0000	1.9
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/mlmmj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mlmmj.spec	24 Jan 2006 02:19:07 -0000	1.15
+++ mlmmj.spec	27 Nov 2006 08:59:47 -0000	1.16
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
+Version: 1.2.12
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Mon Nov 27 2006 Michael Fleming  1.2.12-1
+- New upstream release
+
 * Tue Jan 24 2006 Michael Fleming  1.2.11-1
 - New upstream release (Fixes for address handling).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Jan 2006 02:19:07 -0000	1.8
+++ sources	27 Nov 2006 08:59:47 -0000	1.9
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 09:03:12 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:03:12 -0500
Subject: rpms/mlmmj/FC-4 .cvsignore, 1.8, 1.9 mlmmj.spec, 1.15, 1.16 sources,
	1.8, 1.9
Message-ID: <200611270903.kAR93Ckq027734@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27713

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.2.12-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Jan 2006 22:44:39 -0000	1.8
+++ .cvsignore	27 Nov 2006 09:02:42 -0000	1.9
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/mlmmj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mlmmj.spec	23 Jan 2006 22:44:39 -0000	1.15
+++ mlmmj.spec	27 Nov 2006 09:02:42 -0000	1.16
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
+Version: 1.2.12
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Mon Nov 27 2006 Michael Fleming  1.2.12-1
+- New upstream release.
+
 * Tue Jan 24 2006 Michael Fleming  1.2.11-1
 - New upstream release (fixes to address handling/parsing).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Jan 2006 22:44:39 -0000	1.8
+++ sources	27 Nov 2006 09:02:42 -0000	1.9
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 09:31:15 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:31:15 -0500
Subject: rpms/GeoIP/FC-6 GeoIP.spec,1.6,1.7
Message-ID: <200611270931.kAR9VF9g028198@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28182

Modified Files:
	GeoIP.spec 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.4.0-4
- Fix %install scripts to satisfy newer mock builds



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-6/GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GeoIP.spec	3 Sep 2006 08:28:22 -0000	1.6
+++ GeoIP.spec	27 Nov 2006 09:30:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -73,6 +73,9 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Mon Nov 27 2006 Michael Fleming  1.4.0-4
+- Fix %%install scripts to satisfy newer mock builds
+
 * Sun Sep 3 2006 Michael Fleming  1.4.0-3
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license



From fedora-extras-commits at redhat.com  Mon Nov 27 09:33:00 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:33:00 -0500
Subject: rpms/GeoIP/devel GeoIP.spec,1.6,1.7
Message-ID: <200611270933.kAR9X0dJ028260@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28242

Modified Files:
	GeoIP.spec 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.4.0-4
- Fix %install scripts to satisfy newer mock builds



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GeoIP.spec	3 Sep 2006 08:28:22 -0000	1.6
+++ GeoIP.spec	27 Nov 2006 09:32:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -73,6 +73,9 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Mon Nov 27 2006 Michael Fleming  1.4.0-4
+- Fix %%install scripts to satisfy newer mock builds
+
 * Sun Sep 3 2006 Michael Fleming  1.4.0-3
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license



From fedora-extras-commits at redhat.com  Mon Nov 27 09:37:03 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:37:03 -0500
Subject: rpms/GeoIP/FC-5 GeoIP.spec,1.6,1.7
Message-ID: <200611270937.kAR9b34n028340@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28325

Modified Files:
	GeoIP.spec 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.4.0-1
- Upstream upgrade
- Added LICENSE.txt file to %doc, covering GeoIP country/city data license
  (bz #198137)
- Fix %install section to satisfy newer mock builders



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GeoIP.spec	14 Nov 2006 11:40:54 -0000	1.6
+++ GeoIP.spec	27 Nov 2006 09:36:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -73,10 +73,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
-* Tue Nov 14 2006 Michael Fleming  1.4.0-3
+* Mon Nov 27 2006 Michael Fleming  1.4.0-1
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
   (bz #198137)
+- Fix %%install section to satisfy newer mock builders
 
 * Mon May 15 2006 Michael Fleming  1.3.17-1
 - New upstream release (minor fixes)



From fedora-extras-commits at redhat.com  Mon Nov 27 09:40:08 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:40:08 -0500
Subject: rpms/GeoIP/FC-4 GeoIP.spec,1.4,1.5
Message-ID: <200611270940.kAR9e8Xo028405@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28390

Modified Files:
	GeoIP.spec 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.4.0-1
- Upstream upgrade
- Added LICENSE.txt file to %doc, covering GeoIP country/city data license
  (bz #198137)
- Fix %install section to satisfy newer mock builders



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-4/GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GeoIP.spec	12 Nov 2006 10:52:48 -0000	1.4
+++ GeoIP.spec	27 Nov 2006 09:39:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -73,10 +73,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
-* Sun Sep 3 2006 Michael Fleming  1.4.0-3
+* Mon Nov 27 2006 Michael Fleming  1.4.0-1
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
   (bz #198137)
+- Fix %%install section to satisfy newer mock builders
 
 * Mon May 15 2006 Michael Fleming  1.3.17-1
 - New upstream release (minor fixes)



From fedora-extras-commits at redhat.com  Mon Nov 27 10:52:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 27 Nov 2006 05:52:55 -0500
Subject: rpms/atomorun/FC-5 atomorun.spec,1.1,1.2
Message-ID: <200611271052.kARAqtie032027@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32010

Modified Files:
	atomorun.spec 
Log Message:
Add libGLU-devel as BR since SDL-devel doesn't drag it in on FC-5


Index: atomorun.spec
===================================================================
RCS file: /cvs/extras/rpms/atomorun/FC-5/atomorun.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- atomorun.spec	26 Nov 2006 18:44:44 -0000	1.1
+++ atomorun.spec	27 Nov 2006 10:52:25 -0000	1.2
@@ -11,7 +11,7 @@
 Source1:        atomorun.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel libtiff-devel libvorbis-devel
-BuildRequires:  alsa-lib-devel desktop-file-utils ImageMagick
+BuildRequires:  alsa-lib-devel desktop-file-utils ImageMagick libGLU-devel
 Requires:       hicolor-icon-theme
 
 %description



From fedora-extras-commits at redhat.com  Mon Nov 27 12:18:52 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:18:52 -0500
Subject: rpms/tideEditor - New directory
Message-ID: <200611271218.kARCIqmq006078@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6074/tideEditor

Log Message:
Directory /cvs/extras/rpms/tideEditor added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 12:18:57 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:18:57 -0500
Subject: rpms/tideEditor/devel - New directory
Message-ID: <200611271218.kARCIvoM006091@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6074/tideEditor/devel

Log Message:
Directory /cvs/extras/rpms/tideEditor/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 12:19:14 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:19:14 -0500
Subject: rpms/tideEditor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611271219.kARCJEAM006123@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117

Added Files:
	Makefile import.log 
Log Message:
Setup of module tideEditor


--- NEW FILE Makefile ---
# Top level Makefile for module tideEditor
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  Mon Nov 27 12:19:19 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:19:19 -0500
Subject: rpms/tideEditor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611271219.kARCJJb1006139@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tideEditor


--- 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 Nov 27 12:20:21 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:20:21 -0500
Subject: rpms/tideEditor import.log,1.1,1.2
Message-ID: <200611271220.kARCKLdI006209@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6177

Modified Files:
	import.log 
Log Message:
auto-import tideEditor-1.3.12-3 on branch devel from tideEditor-1.3.12-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 12:19:14 -0000	1.1
+++ import.log	27 Nov 2006 12:19:51 -0000	1.2
@@ -0,0 +1 @@
+tideEditor-1_3_12-3:HEAD:tideEditor-1.3.12-3.src.rpm:1164630088



From fedora-extras-commits at redhat.com  Mon Nov 27 12:20:21 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:20:21 -0500
Subject: rpms/tideEditor/devel tideEditor.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611271220.kARCKLDM006213@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6177/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tideEditor.spec 
Log Message:
auto-import tideEditor-1.3.12-3 on branch devel from tideEditor-1.3.12-3.src.rpm


--- NEW FILE tideEditor.spec ---
Name:		tideEditor
Version:	1.3.12
Release:	3%{?dist}
Summary:	Editor for Tide Constituent Database (TCD) files

Group:		Applications/Engineering
License:	GPL
URL:		http://www.flaterco.com/xtide/
Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	qt-devel
BuildRequires:	libtcd-devel
Requires:	xtide-common

%description
tideEditor is an editor for Tide Constituent Database (TCD) files.  It
was written by Jan C. Depner but is now jointly maintained by David
Flater and Jan Depner.

%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,-)
%doc COPYING ChangeLog README
%{_bindir}/tideEditor

%changelog
* Mon Nov 27 2006 Mamoru Tasaka  - 1.3.12-3
- Remove unneeded BR

* Sun Nov 26 2006 Mamoru Tasaka  - 1.3.12-2
- Drop desktop file after discuss with David Flater (upstream) and
  Patrice Dumas (reviewer)

* Thu Nov 23 2006 Mamoru Tasaka  - 1.3.12-1
- 1.3.12 release
- Introduce a shell script for GNOME desktop usage.

* Mon Nov 20 2006 Mamoru Tasaka  - 1.3.12-0.1.dev1
- Split from xtide, repackaging (see bug 211626)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 12:19:19 -0000	1.1
+++ .cvsignore	27 Nov 2006 12:19:51 -0000	1.2
@@ -0,0 +1 @@
+tideEditor-1.3.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 12:19:19 -0000	1.1
+++ sources	27 Nov 2006 12:19:51 -0000	1.2
@@ -0,0 +1 @@
+f833a2b7ccd4721c719642845ec2da47  tideEditor-1.3.12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 12:44:24 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:44:24 -0500
Subject: owners owners.list,1.2020,1.2021
Message-ID: <200611271244.kARCiOVd006439@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6424

Modified Files:
	owners.list 
Log Message:
add tideEditor


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2020
retrieving revision 1.2021
diff -u -r1.2020 -r1.2021
--- owners.list	26 Nov 2006 20:09:39 -0000	1.2020
+++ owners.list	27 Nov 2006 12:43:54 -0000	1.2021
@@ -2323,6 +2323,7 @@
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|Thunar|Thunar File Manager|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|tideEditor|Editor for Tide Constituent Database (TCD) files|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|tiger|Security auditing tool for UNIX systems|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tile|Modernized widgets for Tk|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 27 13:35:53 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:35:53 -0500
Subject: rpms/GraphicsMagick - New directory
Message-ID: <200611271335.kARDZrF1009785@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9781/GraphicsMagick

Log Message:
Directory /cvs/extras/rpms/GraphicsMagick added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 13:35:58 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:35:58 -0500
Subject: rpms/GraphicsMagick/devel - New directory
Message-ID: <200611271335.kARDZwxg009798@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9781/GraphicsMagick/devel

Log Message:
Directory /cvs/extras/rpms/GraphicsMagick/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 13:36:25 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:36:25 -0500
Subject: rpms/GraphicsMagick Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611271336.kARDaP8e009828@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9822

Added Files:
	Makefile import.log 
Log Message:
Setup of module GraphicsMagick


--- NEW FILE Makefile ---
# Top level Makefile for module GraphicsMagick
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  Mon Nov 27 13:36:30 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:36:30 -0500
Subject: rpms/GraphicsMagick/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611271336.kARDaUu6009843@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9822/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module GraphicsMagick


--- 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 Nov 27 13:38:11 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:38:11 -0500
Subject: rpms/GraphicsMagick import.log,1.1,1.2
Message-ID: <200611271338.kARDcBO7009920@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887

Modified Files:
	import.log 
Log Message:
auto-import GraphicsMagick-1.1.7-2 on branch devel from GraphicsMagick-1.1.7-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 13:36:25 -0000	1.1
+++ import.log	27 Nov 2006 13:37:41 -0000	1.2
@@ -0,0 +1 @@
+GraphicsMagick-1_1_7-2:HEAD:GraphicsMagick-1.1.7-2.src.rpm:1164634754



From fedora-extras-commits at redhat.com  Mon Nov 27 13:38:11 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:38:11 -0500
Subject: rpms/GraphicsMagick/devel GraphicsMagick-gslib.patch, NONE,
	1.1 GraphicsMagick.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611271338.kARDcB8x009924@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/devel

Modified Files:
	.cvsignore sources 
Added Files:
	GraphicsMagick-gslib.patch GraphicsMagick.spec 
Log Message:
auto-import GraphicsMagick-1.1.7-2 on branch devel from GraphicsMagick-1.1.7-2.src.rpm

GraphicsMagick-gslib.patch:

--- NEW FILE GraphicsMagick-gslib.patch ---
--- GraphicsMagick-1.1.7/configure.ac.orig	2006-07-31 00:24:43.000000000 +0200
+++ GraphicsMagick-1.1.7/configure.ac	2006-07-31 00:25:02.000000000 +0200
@@ -1684,8 +1684,8 @@
     AC_MSG_RESULT()
     failed=0;
     passed=0;
-    AC_CHECK_HEADER(ps/iapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-    AC_CHECK_HEADER(ps/errors.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_HEADER(ghostscript/iapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_HEADER(ghostscript/errors.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_CHECK_LIB(gs,gsapi_new_instance,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_MSG_CHECKING(if Ghostscript library package is complete)
     if test $passed -gt 0
--- GraphicsMagick-1.1.7/magick/delegate.h.orig	2006-07-31 00:25:33.000000000 +0200
+++ GraphicsMagick-1.1.7/magick/delegate.h	2006-07-31 00:25:51.000000000 +0200
@@ -46,8 +46,8 @@
 #if defined(MAGICK_IMPLEMENTATION)
 
 #if defined(HasGS)
-#include "ps/iapi.h"
-#include "ps/errors.h"
+#include "ghostscript/iapi.h"
+#include "ghostscript/errors.h"
 #endif
 
 #ifndef gs_main_instance_DEFINED


--- NEW FILE GraphicsMagick.spec ---
Summary: An GraphicsMagick fork, offering faster image generation and better quality
Name: GraphicsMagick
Version: 1.1.7
Release: 2%{?dist}
License: MIT
Group: Applications/Multimedia
Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
Patch0: GraphicsMagick-gslib.patch

Url: http://www.graphicsmagick.org/
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl
BuildRequires: freetype-devel >= 2.0.1
BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
BuildRequires: ghostscript-devel
BuildRequires: libwmf-devel
BuildRequires: libX11-devel, libXext-devel, libXt-devel
BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel

%description
GraphicsMagick is a comprehensive image processing package which is initially
based on ImageMagick 5.5.2, but which has undergone significant re-work by
the GraphicsMagick Group to significantly improve the quality and performance
of the software.

%package devel
Summary: Static libraries and header files for GraphicsMagick app development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libX11-devel, libXext-devel, libXt-devel
Requires: ghostscript-devel
Requires: bzip2-devel
Requires: libtiff-devel
Requires: libjpeg-devel
Requires: lcms-devel
Requires: pkgconfig

%description devel
GraphicsMagick-devel contains the static libraries and header files you'll
need to develop GraphicsMagick applications. GraphicsMagick is an image
manipulation program.

If you want to create applications that will use GraphicsMagick code or
APIs, you need to install GraphicsMagick-devel as well as GraphicsMagick.
You do not need to install it if you just want to use GraphicsMagick,
however.

%package perl
Summary: GraphicsMagick perl bindings
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: perl >= 5.6.0
%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}')
BuildRequires: %{perl_vendorarch}

%description perl
Perl bindings to GraphicsMagick.

Install GraphicsMagick-perl if you want to use any perl scripts that use
GraphicsMagick.

%package c++
Summary: GraphicsMagick Magick++ library (C++ bindings)
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description c++
This package contains the GraphicsMagick++ library, a C++ binding to the 
GraphicsMagick graphics manipulation library.

Install GraphicsMagick-c++ if you want to use any applications that use 
GraphicsMagick++.

%package c++-devel
Summary: C++ bindings for the GraphicsMagick library
Group: Development/Libraries
Requires: %{name}-c++ = %{version}-%{release}
Requires: %{name}-devel = %{version}%{release}

%description c++-devel
GraphicsMagick-devel contains the static libraries and header files you'll
need to develop GraphicsMagick applications using the Magick++ C++ bindings.
GraphicsMagick is an image manipulation program.

If you want to create applications that will use Magick++ code
or APIs, you'll need to install GraphicsMagick-c++-devel, ImageMagick-devel and
GraphicsMagick.
You don't need to install it if you just want to use GraphicsMagick, or if you
want to develop/compile applications using the GraphicsMagick C interface,
however.

%prep
%setup -q
%patch0 -p 1 -b .gslib 
# Regenerating configure script
autoconf

%build
%configure --enable-shared \
           --with-modules \
           --with-perl \
           --with-x \
           --with-threads \
           --with-magick_plus_plus \
           --with-gslib \
           --with-wmf \
           --with-lzw \
           --with-lcms \
           --with-rsvg \
           --with-xml \
           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
           --without-dps

make

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

# perlmagick: fix perl path of demo files
%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl

find %{buildroot} -name "*.bs" |xargs rm -f
find %{buildroot} -name ".packlist" |xargs rm -f
find %{buildroot} -name "perllocal.pod" |xargs rm -f

chmod 755 %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so

# perlmagick: build files list
echo "%defattr(-,root,root)" > perl-pkg-files
find %{buildroot}/%{_libdir}/perl* -type f -print \
    | sed "s@^%{buildroot}@@g" > perl-pkg-files 
find %{buildroot}%{perl_vendorarch} -type d -print \
    | sed "s@^%{buildroot}@%dir @g" \
    | grep -v '^%dir %{perl_vendorarch}$' \
    | grep -v '/auto$' >> perl-pkg-files 
if [ -z perl-pkg-files ] ; then
    echo "ERROR: EMPTY FILE LIST"
    exit -1
fi

rm -rf %{buildroot}%{_datadir}/GraphicsMagick
# Keep config
rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
rm -rf %{buildroot}%{_libdir}/libltdl.*
rm -f  %{buildroot}%{_libdir}/GraphicsMagick-*/modules*/*/*.a
rm -f  %{buildroot}%{_libdir}/*.{a,la}

# fix multilib issues
%ifarch x86_64 s390x ia64 ppc64
%define wordsize 64
%else
%define wordsize 32
%endif

mv %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config.h \
   %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config-%{wordsize}.h

cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config.h <

#if __WORDSIZE == 32
# include "magick_config-32.h"
#elif __WORDSIZE == 64
# include "magick-config_64.h"
#else
# error "unexpected value for __WORDSIZE macro"
#endif

#endif
EOF


%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%post c++ -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%postun c++ -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc ChangeLog Copyright.txt
%doc index.html www/ images/
%doc README.txt AUTHORS NEWS 
%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
%{_bindir}/[a-z]*
%{_libdir}/GraphicsMagick*
%{_datadir}/GraphicsMagick*
%{_mandir}/man[145]/[a-z]*

%files devel
%defattr(-,root,root,-)
%{_bindir}/GraphicsMagick-config
%{_bindir}/GraphicsMagickWand-config
%{_libdir}/libGraphicsMagick.so
%{_libdir}/libGraphicsMagickWand.so
%{_libdir}/pkgconfig/GraphicsMagick.pc
%{_libdir}/pkgconfig/GraphicsMagickWand.pc
%{_includedir}/GraphicsMagick/
%{_mandir}/man1/GraphicsMagick-config.*
%{_mandir}/man1/GraphicsMagickWand-config.*

%files c++
%defattr(-,root,root,-)
%{_libdir}/libGraphicsMagick++.so.*

%files c++-devel
%defattr(-,root,root,-)
%{_bindir}/GraphicsMagick++-config
%{_includedir}/GraphicsMagick/Magick++
%{_includedir}/GraphicsMagick/Magick++.h
%{_libdir}/libGraphicsMagick++.so
%{_libdir}/pkgconfig/GraphicsMagick++.pc
%{_mandir}/man1/GraphicsMagick++-config.*

%files perl -f perl-pkg-files
%defattr(-,root,root,-)
%{_mandir}/man3/*
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt

%changelog
* Sun Nov 26 2006 Andreas Thienemann  - 1.1.7-2
- Fixed various stuff


* Mon Jul 24 2006 Andreas Thienemann  - 1.1.7-1
- Initial Package for FE based on ImageMagick.spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 13:36:30 -0000	1.1
+++ .cvsignore	27 Nov 2006 13:37:41 -0000	1.2
@@ -0,0 +1 @@
+GraphicsMagick-1.1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 13:36:30 -0000	1.1
+++ sources	27 Nov 2006 13:37:41 -0000	1.2
@@ -0,0 +1 @@
+f75d830ca623bf10385b3ad62c48437a  GraphicsMagick-1.1.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 14:41:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 27 Nov 2006 09:41:17 -0500
Subject: comps comps-fe5.xml.in,1.204,1.205 comps-fe6.xml.in,1.231,1.232
Message-ID: <200611271441.kAREfHbE013740@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13723

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add arrows atomix dd2 liquidwar


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- comps-fe5.xml.in	23 Nov 2006 19:09:47 -0000	1.204
+++ comps-fe5.xml.in	27 Nov 2006 14:40:47 -0000	1.205
@@ -305,7 +305,9 @@
       abe
       abuse
       alex4
+      arrows
       atomix
+      atomorun
       auriferous
       ballbuster
       beneath-a-steel-sky
@@ -324,6 +326,7 @@
       crystal-stacker
       crystal-stacker-themes
       csmash
+      dd2
       enigma
       fbg
       fillets-ng
@@ -346,6 +349,7 @@
       gweled
       lacewing
       lincity-ng
+      liquidwar
       lmarbles
       lucidlife
       Maelstrom


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- comps-fe6.xml.in	26 Nov 2006 23:31:42 -0000	1.231
+++ comps-fe6.xml.in	27 Nov 2006 14:40:47 -0000	1.232
@@ -356,7 +356,9 @@
       abe
       abuse
       alex4
+      arrows
       atomix
+      atomorun
       auriferous
       ballbuster
       beneath-a-steel-sky
@@ -376,6 +378,7 @@
       crystal-stacker-themes
       csmash
       cyphesis
+      dd2
       enigma
       fbg
       fillets-ng
@@ -399,6 +402,7 @@
       gweled
       lacewing
       lincity-ng
+      liquidwar
       lmarbles
       lucidlife
       Maelstrom



From fedora-extras-commits at redhat.com  Mon Nov 27 15:21:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 10:21:22 -0500
Subject: rpms/jd/devel .cvsignore, 1.25, 1.26 jd.spec, 1.32, 1.33 sources,
	1.25, 1.26
Message-ID: <200611271521.kARFLM2O017033@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17014

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061127
- cvs 061127 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	26 Nov 2006 15:22:24 -0000	1.25
+++ .cvsignore	27 Nov 2006 15:20:52 -0000	1.26
@@ -1 +1 @@
-jd-1.8.1-cvs061126.tgz
+jd-1.8.1-cvs061127.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jd.spec	26 Nov 2006 15:22:24 -0000	1.32
+++ jd.spec	27 Nov 2006 15:20:52 -0000	1.33
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061126
+%define         strtag        cvs061127
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Nov 26 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061126
-- cvs 061126 (23:59 JST)
+* Mon Nov 27 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061127
+- cvs 061127 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	26 Nov 2006 15:22:24 -0000	1.25
+++ sources	27 Nov 2006 15:20:52 -0000	1.26
@@ -1 +1 @@
-22545b686df97a6578add31e6567978c  jd-1.8.1-cvs061126.tgz
+9804dd8951bc1bbf9dc0be8d89b19f60  jd-1.8.1-cvs061127.tgz



From fedora-extras-commits at redhat.com  Mon Nov 27 15:24:11 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 10:24:11 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.10, 1.11 ochusha.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200611271524.kARFOBE3017135@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17116

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061127
- 0.5.99.63.6 cvs 061127 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Nov 2006 15:16:30 -0000	1.10
+++ .cvsignore	27 Nov 2006 15:23:41 -0000	1.11
@@ -1 +1 @@
-ochusha-0.5.99.63.6-cvs061126.tar.bz2
+ochusha-0.5.99.63.6-cvs061127.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ochusha.spec	26 Nov 2006 15:16:30 -0000	1.10
+++ ochusha.spec	27 Nov 2006 15:23:41 -0000	1.11
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.6
-%define              strtag          cvs061126
+%define              strtag          cvs061127
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -155,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Sun Nov 26 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
-- 0.5.99.63.6 cvs 061126 (23:59 JST)
+* Mon Nov 27 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061127
+- 0.5.99.63.6 cvs 061127 (23:59 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Nov 2006 15:16:30 -0000	1.10
+++ sources	27 Nov 2006 15:23:41 -0000	1.11
@@ -1 +1 @@
-87fee38e3cf73238a9bffdce22fde293  ochusha-0.5.99.63.6-cvs061126.tar.bz2
+bcf4e008319305ba074c9509a55fcf2f  ochusha-0.5.99.63.6-cvs061127.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 15:53:24 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Mon, 27 Nov 2006 10:53:24 -0500
Subject: rpms/clement import.log,1.4,1.5
Message-ID: <200611271553.kARFrOf6017551@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/rpms/clement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17521

Modified Files:
	import.log 
Log Message:
auto-import clement-2.1-241 on branch devel from clement-2.1-241.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clement/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	4 Sep 2006 16:58:13 -0000	1.4
+++ import.log	27 Nov 2006 15:52:54 -0000	1.5
@@ -1,3 +1,4 @@
 clement-2_1-197:HEAD:clement-2.1-197.src.rpm:1156124434
 clement-2_1-202:HEAD:clement-2.1-202.src.rpm:1156246052
 clement-2_1-209:HEAD:clement-2.1-209.src.rpm:1157389089
+clement-2_1-241:HEAD:clement-2.1-241.src.rpm:1164642869



From fedora-extras-commits at redhat.com  Mon Nov 27 15:53:25 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Mon, 27 Nov 2006 10:53:25 -0500
Subject: rpms/clement/devel .cvsignore, 1.4, 1.5 clement.spec, 1.20,
	1.21 sources, 1.4, 1.5
Message-ID: <200611271553.kARFrPB0017556@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/rpms/clement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17521/devel

Modified Files:
	.cvsignore clement.spec sources 
Log Message:
auto-import clement-2.1-241 on branch devel from clement-2.1-241.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clement/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Sep 2006 16:58:13 -0000	1.4
+++ .cvsignore	27 Nov 2006 15:52:55 -0000	1.5
@@ -1 +1 @@
-clement-2.1-209.tar.gz
+clement-2.1-241.tar.gz


Index: clement.spec
===================================================================
RCS file: /cvs/extras/rpms/clement/devel/clement.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- clement.spec	19 Oct 2006 17:52:23 -0000	1.20
+++ clement.spec	27 Nov 2006 15:52:55 -0000	1.21
@@ -1,11 +1,11 @@
 Name: clement
 Version: 2.1
-Release: 210%{?dist}
+Release: 241%{?dist}
 URL: http://www.clement.safe.ca
 License: GPL
 Summary: An application to filter and manage E-mail traffic
 Group: System Environment/Daemons
-Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-209.tar.gz
+Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz
 buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: byacc
@@ -38,10 +38,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# This package attempts to install a yum repository, which is terrible idea.
-# Remove it here.
-%{__rm} -rf %{buildroot}/%{_sysconfdir}/yum.repos.d
-
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -104,14 +100,30 @@
 
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
+%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
 
 
 %changelog
-* Thu Oct 19 2006 Jason L Tibbitts III  - 2.1-210
-- Remove errant repository.
+* Mon Nov 27 2006 Jean-Marc Pigeon  2.1-241
+- Marker:
+    * Release
+- Bug-Fix:
+    * Fixed loop between collectdata and getstream when
+      E-mail data-part end abnormalie (not detecting
+      stream contents empty).
+    * Fixed Email header mist-match when there is no
+      '\n' within the received data line, this bug was
+      a side effect of 2.1.0.216 bug-fix.
+    * Fixed case where header line was longer than
+      512 characteres (line is not splitted anymore)
+-Improvement:
+    * Web log show up difference between delayed E-mail
+      and Rejected E-mail.
+    * ipc_getpost routine, return the message stamping
+       date up to the millisec.
 
 * Mon Sep  3 2006 Jean-Marc Pigeon  2.1-209
 - Bug-Fix:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clement/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Sep 2006 16:58:13 -0000	1.4
+++ sources	27 Nov 2006 15:52:55 -0000	1.5
@@ -1 +1 @@
-8f4fe15216bea2e6c3320bfce330bfe7  clement-2.1-209.tar.gz
+277b1e13bf16fa3cfc0ffa7870f751cc  clement-2.1-241.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 16:59:52 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 27 Nov 2006 11:59:52 -0500
Subject: rpms/gramps/devel .cvsignore, 1.15, 1.16 gramps.spec, 1.23,
	1.24 sources, 1.15, 1.16
Message-ID: <200611271659.kARGxq8t021546@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21523

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Mon Nov 27 2006 Brian Pepple  - 2.2.3-1
- Update to 2.2.3.
- Add scalable mimetype icons to files section.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Nov 2006 16:51:59 -0000	1.15
+++ .cvsignore	27 Nov 2006 16:59:22 -0000	1.16
@@ -1 +1 @@
-gramps-2.2.2.tar.gz
+gramps-2.2.3.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gramps.spec	4 Nov 2006 16:51:59 -0000	1.23
+++ gramps.spec	27 Nov 2006 16:59:22 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           gramps
-Version:        2.2.2
+Version:        2.2.3
 Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
@@ -123,12 +123,17 @@
 %{_datadir}/mime-info/*
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
+%{_datadir}/icons/gnome/scalable/mimetypes/*.svg
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/gnome/help/%{name}/
 
 
 %changelog
+* Mon Nov 27 2006 Brian Pepple  - 2.2.3-1
+- Update to 2.2.3.
+- Add scalable mimetype icons to files section.
+
 * Sat Nov  4 2006 Brian Pepple  - 2.2.2-1
 - Update to 2.2.2.
 - Add scriptlet for gtk+ icon cache.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Nov 2006 16:51:59 -0000	1.15
+++ sources	27 Nov 2006 16:59:22 -0000	1.16
@@ -1 +1 @@
-c640782457bccc7324d17c1baf21701c  gramps-2.2.2.tar.gz
+7107d1ad5555aecb812e4c370a74f0bf  gramps-2.2.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 17:27:26 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Mon, 27 Nov 2006 12:27:26 -0500
Subject: rpms/clement import.log,1.5,1.6
Message-ID: <200611271727.kARHRQVZ024966@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/rpms/clement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24936

Modified Files:
	import.log 
Log Message:
auto-import clement-2.1-241 on branch FC-6 from clement-2.1-241.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clement/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	27 Nov 2006 15:52:54 -0000	1.5
+++ import.log	27 Nov 2006 17:26:56 -0000	1.6
@@ -2,3 +2,4 @@
 clement-2_1-202:HEAD:clement-2.1-202.src.rpm:1156246052
 clement-2_1-209:HEAD:clement-2.1-209.src.rpm:1157389089
 clement-2_1-241:HEAD:clement-2.1-241.src.rpm:1164642869
+clement-2_1-241:FC-6:clement-2.1-241.src.rpm:1164648516



From fedora-extras-commits at redhat.com  Mon Nov 27 17:27:27 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Mon, 27 Nov 2006 12:27:27 -0500
Subject: rpms/clement/FC-6 .cvsignore, 1.4, 1.5 clement.spec, 1.20,
	1.21 sources, 1.4, 1.5
Message-ID: <200611271727.kARHRRG3024971@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/rpms/clement/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24936/FC-6

Modified Files:
	.cvsignore clement.spec sources 
Log Message:
auto-import clement-2.1-241 on branch FC-6 from clement-2.1-241.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clement/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Sep 2006 16:58:13 -0000	1.4
+++ .cvsignore	27 Nov 2006 17:26:57 -0000	1.5
@@ -1 +1 @@
-clement-2.1-209.tar.gz
+clement-2.1-241.tar.gz


Index: clement.spec
===================================================================
RCS file: /cvs/extras/rpms/clement/FC-6/clement.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- clement.spec	19 Oct 2006 17:52:23 -0000	1.20
+++ clement.spec	27 Nov 2006 17:26:57 -0000	1.21
@@ -1,11 +1,11 @@
 Name: clement
 Version: 2.1
-Release: 210%{?dist}
+Release: 241%{?dist}
 URL: http://www.clement.safe.ca
 License: GPL
 Summary: An application to filter and manage E-mail traffic
 Group: System Environment/Daemons
-Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-209.tar.gz
+Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz
 buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: byacc
@@ -38,10 +38,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# This package attempts to install a yum repository, which is terrible idea.
-# Remove it here.
-%{__rm} -rf %{buildroot}/%{_sysconfdir}/yum.repos.d
-
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -104,14 +100,30 @@
 
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
+%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
 
 
 %changelog
-* Thu Oct 19 2006 Jason L Tibbitts III  - 2.1-210
-- Remove errant repository.
+* Mon Nov 27 2006 Jean-Marc Pigeon  2.1-241
+- Marker:
+    * Release
+- Bug-Fix:
+    * Fixed loop between collectdata and getstream when
+      E-mail data-part end abnormalie (not detecting
+      stream contents empty).
+    * Fixed Email header mist-match when there is no
+      '\n' within the received data line, this bug was
+      a side effect of 2.1.0.216 bug-fix.
+    * Fixed case where header line was longer than
+      512 characteres (line is not splitted anymore)
+-Improvement:
+    * Web log show up difference between delayed E-mail
+      and Rejected E-mail.
+    * ipc_getpost routine, return the message stamping
+       date up to the millisec.
 
 * Mon Sep  3 2006 Jean-Marc Pigeon  2.1-209
 - Bug-Fix:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clement/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Sep 2006 16:58:13 -0000	1.4
+++ sources	27 Nov 2006 17:26:57 -0000	1.5
@@ -1 +1 @@
-8f4fe15216bea2e6c3320bfce330bfe7  clement-2.1-209.tar.gz
+277b1e13bf16fa3cfc0ffa7870f751cc  clement-2.1-241.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 17:44:09 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 27 Nov 2006 12:44:09 -0500
Subject: rpms/nsd/devel .cvsignore, 1.5, 1.6 nsd.init, 1.4, 1.5 nsd.spec,
	1.15, 1.16 sources, 1.5, 1.6
Message-ID: <200611271744.kARHi9Po025240@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25202

Modified Files:
	.cvsignore nsd.init nsd.spec sources 
Log Message:
* Mon Nov 27 2006 Paul Wouters  3.0.2-1
- Upgraded to 3.0.2.
- Use new configuration file nsd.conf. Still needs migration script.
  patch from Farkas Levente 

Postponing release to FC-x until we have a migration script.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2006 19:43:29 -0000	1.5
+++ .cvsignore	27 Nov 2006 17:43:39 -0000	1.6
@@ -1,2 +1,4 @@
 nsd-2.3.5.tar.gz
 nsd-2.3.6.tar.gz
+nsd.init
+nsd-3.0.2.tar.gz


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.init	12 Oct 2006 19:43:29 -0000	1.4
+++ nsd.init	27 Nov 2006 17:43:39 -0000	1.5
@@ -6,7 +6,7 @@
 # description:  NSD is a complete implementation of an authoritative \
 #               DNS name server. 
 # processname: /usr/sbin/nsd
-# config: /etc/nsd/nsdc.config
+# config: /etc/nsd/nsd.conf
 #
 ### BEGIN INIT INFO
 # Provides: nsd
@@ -18,21 +18,13 @@
 ### END INIT INFO
 
 # Sanity checks.
-[ -f /etc/nsd/nsdc.conf ] || exit 0
-[ -f /etc/nsd/nsd.zones ] || exit 0
+[ -f /etc/nsd/nsd.conf ] || exit 0
 [ -x /usr/sbin/nsd ] || exit 0
 
 #extra verbosity
 #ZONEC_VERBOSE=-v
 OTHER_NSD_OPTS=""
 
-#fixed in 2.3.6
-#work around for bug in nsd-2.3.x when no ipv6 is available
-#if [ ! -d /proc/sys/net/ipv6/ ]
-#then
-#        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
-#fi
-
 # Source function library.
 . /etc/init.d/functions
 


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsd.spec	16 Oct 2006 13:52:51 -0000	1.15
+++ nsd.spec	27 Nov 2006 17:43:39 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.6
-Release: 2%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -34,20 +34,20 @@
 install -d 0700 %{buildroot}%{_localstatedir}/run/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsdc.conf
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.zones
+mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
+   %{buildroot}%{_sysconfdir}/nsd/nsd.conf
+#mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \
+#   %{buildroot}%{_sysconfdir}/nsd/nsd.zones
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
 %defattr(-,root,root,-)
-%doc README LICENSE NSD-DATABASE DIFFERENCES TODO RELNOTES REQUIREMENTS
+%doc doc/*
 %dir %{_sysconfdir}/nsd/
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
+#%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
@@ -73,6 +73,11 @@
 fi
 
 %changelog
+* Mon Nov 27 2006 Paul Wouters  3.0.2-1
+- Upgraded to 3.0.2.
+- Use new configuration file nsd.conf. Still needs migration script.
+  patch from Farkas Levente 
+
 * Mon Oct 16 2006  Paul Wouters  2.3.6-2
 - Bump version for upgrade path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2006 19:43:29 -0000	1.5
+++ sources	27 Nov 2006 17:43:39 -0000	1.6
@@ -1,2 +1,4 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
+e64633bb4e6eb46e8e16049e87333cb9  nsd.init
+a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 17:53:37 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 27 Nov 2006 12:53:37 -0500
Subject: rpms/proftpd/devel .cvsignore, 1.8, 1.9 proftpd.spec, 1.24,
	1.25 sources, 1.8, 1.9
Message-ID: <200611271753.kARHrbKf025419@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25376

Modified Files:
	.cvsignore proftpd.spec sources 
Log Message:
Update to 1.3.0a which fixes CVE-2006-5815.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Apr 2006 17:05:11 -0000	1.8
+++ .cvsignore	27 Nov 2006 17:53:07 -0000	1.9
@@ -1 +1 @@
-proftpd-1.3.0.tar.bz2
+proftpd-1.3.0a.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- proftpd.spec	21 Nov 2006 13:18:24 -0000	1.24
+++ proftpd.spec	27 Nov 2006 17:53:07 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.0
-Release: 10%{?dist}
+Version: 1.3.0a
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Matthias Saou  1.3.0a-1
+- Update to 1.3.0a, which actually fixes CVE-2006-5815... yes, #214820!).
+
 * Thu Nov 16 2006 Matthias Saou  1.3.0-10
 - Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Apr 2006 17:05:11 -0000	1.8
+++ sources	27 Nov 2006 17:53:07 -0000	1.9
@@ -1 +1 @@
-fae47d01b52e035eb6b7190e74c17722  proftpd-1.3.0.tar.bz2
+cc2e99f38a810982f91d5cbe1f4091f0  proftpd-1.3.0a.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 18:36:32 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 27 Nov 2006 13:36:32 -0500
Subject: rpms/seahorse/FC-6 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200611271836.kARIaWhl028888@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/seahorse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28871

Modified Files:
	.cvsignore sources 
Log Message:

source checkin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Aug 2006 04:32:01 -0000	1.7
+++ .cvsignore	27 Nov 2006 18:36:02 -0000	1.8
@@ -1 +1 @@
-seahorse-0.8.1.tar.gz
+seahorse-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Aug 2006 04:32:01 -0000	1.7
+++ sources	27 Nov 2006 18:36:02 -0000	1.8
@@ -1 +1 @@
-1f16678e465f20758aff293676e7e291  seahorse-0.8.1.tar.gz
+ee7de41490edd7123de6e99880c34efd  seahorse-0.8.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 18:39:06 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 27 Nov 2006 13:39:06 -0500
Subject: rpms/seahorse/FC-6 seahorse.spec,1.21,1.22
Message-ID: <200611271839.kARId6kC028915@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/seahorse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28894

Modified Files:
	seahorse.spec 
Log Message:

check in new spec for 0.8.2 - thanks to bpepple for this patch and the
changes



Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/FC-6/seahorse.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- seahorse.spec	29 Aug 2006 03:14:09 -0000	1.21
+++ seahorse.spec	27 Nov 2006 18:38:36 -0000	1.22
@@ -1,11 +1,11 @@
 Name: 		seahorse
-Version: 	0.8.1
-Release:    2%{?dist}
-Summary:	GNOME2 interface for gnupg
+Version: 	0.8.2
+Release:    	1%{?dist}
+Summary:	GNOME interface for gnupg
 Group: 		User Interface/Desktops
 License: 	GPL
-URL:        http://seahorse.sourceforge.net/
-Source:     http://ftp.gnome.org/pub/GNOME/sources/seahorse/%{version}/%{name}-%{version}.tar.gz
+URL:        	http://seahorse.sourceforge.net/
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -13,104 +13,115 @@
 BuildRequires:  gedit-devel
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
-BuildRequires:  libgnomeui-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  scrollkeeper
 BuildRequires:  nautilus-devel
 BuildRequires:  libsoup-devel
-BuildRequires: openldap-devel
-Requires(post): desktop-file-utils
+BuildRequires: 	openldap-devel
+
+Requires(pre): GConf2
 Requires(post): GConf2
+Requires(preun): GConf2
 Requires(post): scrollkeeper
-Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
 Requires(postun): scrollkeeper
-Requires(postun): shared-mime-info
+
 
 %description
-Seahorse is a gnome2 interface for gnupg.
-It uses gpgme as the backend.
+Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend.
 
 
 %prep
 %setup -q
-sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.in
-sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.am
+
 
 %build
-%configure --disable-schemas-install
+%configure --disable-schemas-install --disable-static --disable-update-mime-database
 make %{?_smp_mflags}
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang seahorse
+make install DESTDIR=${RPM_BUILD_ROOT}
+%find_lang %{name}
 
 rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-encrypted.desktop
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
-  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-signature.desktop
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category GNOME                                  \
   --add-category Utility                                \
-  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop
 
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
+%pre
+if [ "$1" -gt 1 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
+	for i in $SCHEMAS; do
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
+	done
+fi
+
+
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 \
-     --makefile-install-rule \
-     %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-scrollkeeper-update -q ||:
-update-mime-database %{_datadir}/mime/ > /dev/null
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
+for i in $SCHEMAS; do
+	gconftool-2 --makefile-install-rule \
+		%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
+done
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
+	for i in $SCHEMAS; do
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
+	done   
+fi
 
 
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q ||:
-update-mime-database %{_datadir}/mime/ > /dev/null
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
 %{_datadir}/control-center-2.0/capplets/*.desktop
-%dir %{_datadir}/gnome/help/%{name}
-%{_datadir}/gnome/help/%{name}/*
+%{_datadir}/gnome/help/%{name}/
 %{_datadir}/mime-info/seahorse.keys
 %{_datadir}/mime-info/seahorse.mime
 %{_datadir}/mime/packages/*
-%dir %{_datadir}/omf/%{name}
-%{_datadir}/omf/%{name}/*
+%{_datadir}/omf/%{name}/
 %{_datadir}/pixmaps/*
 %{_libdir}/libseahorse-internal*
 %{_libdir}/gedit-2/plugins/*
@@ -119,6 +130,16 @@
 
 
 %changelog
+* Tue Nov 21 2006 Brian Pepple  - 0.8.2-1
+- Update to 0.8.2.
+- Minor tweak to summary & description.
+- Drop BR on libgnomeui-devel, since eel2-devel pulls this in.
+- Use -disable-update-mime-database instead of editing makefiles.
+- Update scriptlets, and adjust Requires to follow wiki guidelines.
+- Remove X-Fedora category from desktop files.
+- Don't bother building static libs.
+- Remove unnecessary disabling of schemas in install section.
+
 * Mon Aug 28 2006 Seth Vidal 
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Nov 27 18:45:53 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:45:53 -0500
Subject: rpms/perl-Gtk2-Notify - New directory
Message-ID: <200611271845.kARIjrrD029013@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29009/perl-Gtk2-Notify

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Notify added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 18:45:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:45:58 -0500
Subject: rpms/perl-Gtk2-Notify/devel - New directory
Message-ID: <200611271845.kARIjw4D029026@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29009/perl-Gtk2-Notify/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Notify/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 18:46:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:05 -0500
Subject: rpms/perl-Gtk2-Notify Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611271846.kARIk5Ch029047@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29041

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Gtk2-Notify


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gtk2-Notify
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  Mon Nov 27 18:46:06 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:06 -0500
Subject: owners owners.list,1.2021,1.2022
Message-ID: <200611271846.kARIk6dA029072@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989

Modified Files:
	owners.list 
Log Message:
added perl-Gtk2-Notify


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2021
retrieving revision 1.2022
diff -u -r1.2021 -r1.2022
--- owners.list	27 Nov 2006 12:43:54 -0000	1.2021
+++ owners.list	27 Nov 2006 18:45:36 -0000	1.2022
@@ -1497,6 +1497,7 @@
 Fedora Extras|perl-GStreamer|GStreamer Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
+Fedora Extras|perl-Gtk2-Notify|Gtk2::Notify Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-Sexy|Perl interface to the sexy widget collection|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-Spell|Perl interface to gtkspell|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-TrayIcon|Perl interface to the EggTrayIcon library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Nov 27 18:46:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:05 -0500
Subject: rpms/perl-Gtk2-Notify/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611271846.kARIk57Z029062@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29041/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gtk2-Notify


--- 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 Nov 27 18:46:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:45 -0500
Subject: rpms/perl-Gtk2-Notify/devel perl-Gtk2-Notify.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611271846.kARIkjwG029127@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29089/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Gtk2-Notify.spec 
Log Message:
auto-import perl-Gtk2-Notify-0.02-3.fc6 on branch devel from perl-Gtk2-Notify-0.02-3.fc6.src.rpm


--- NEW FILE perl-Gtk2-Notify.spec ---
Name:           perl-Gtk2-Notify
Version:        0.02
Release:        3%{?dist}
Summary:        Gtk2::Notify Perl module
License:        LGPL
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Gtk2-Notify/

#Source0:        http://www.cpan.org/modules/by-module/Gtk2/Gtk2-Notify-%{version}.tar.gz
Source0: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Gtk2-Notify-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(Glib) >= 1.093, perl(Gtk2)
BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
BuildRequires:  perl(ExtUtils::MakeMaker), libnotify-devel

# for tests...
%{?_with_display_tests:BuildRequires:  perl(Test::Pod::Coverage) >= 1.04, perl(Test::Pod) >= 1.14}

# libnotify-devel seems to be missing this.  see BZ#216946
BuildRequires:  gtk2-devel

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl bindings to libnotify.  This module will allow one to use the notify
functionality from within a perl application.

%prep
%setup -q -n Gtk2-Notify-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
# tests all bomb under mock, unfortunately
%{?_with_display_tests: make test}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes maps README examples/
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Gtk2*
%{_mandir}/man3/*

%changelog
* Mon Nov 27 2006 Chris Weyl 
- change source0 to pull from an alternate CPAN location

* Wed Nov 22 2006 Chris Weyl  0.02-2
- conditionalize tests as they tend to die horribly under mock

* Wed Nov 22 2006 Chris Weyl  0.02-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 18:46:05 -0000	1.1
+++ .cvsignore	27 Nov 2006 18:46:15 -0000	1.2
@@ -0,0 +1 @@
+Gtk2-Notify-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 18:46:05 -0000	1.1
+++ sources	27 Nov 2006 18:46:15 -0000	1.2
@@ -0,0 +1 @@
+77a64c944cf1516bcc514456de22a82b  Gtk2-Notify-0.02.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 18:46:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:45 -0500
Subject: rpms/perl-Gtk2-Notify import.log,1.1,1.2
Message-ID: <200611271846.kARIkjA1029123@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29089

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-Notify-0.02-3.fc6 on branch devel from perl-Gtk2-Notify-0.02-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 18:46:05 -0000	1.1
+++ import.log	27 Nov 2006 18:46:15 -0000	1.2
@@ -0,0 +1 @@
+perl-Gtk2-Notify-0_02-3_fc6:HEAD:perl-Gtk2-Notify-0.02-3.fc6.src.rpm:1164653281



From fedora-extras-commits at redhat.com  Mon Nov 27 18:47:30 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:47:30 -0500
Subject: rpms/perl-Gtk2-Notify/devel perl-Gtk2-Notify.spec,1.1,1.2
Message-ID: <200611271847.kARIlUOH029183@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29168

Modified Files:
	perl-Gtk2-Notify.spec 
Log Message:
release bump


Index: perl-Gtk2-Notify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/perl-Gtk2-Notify.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gtk2-Notify.spec	27 Nov 2006 18:46:15 -0000	1.1
+++ perl-Gtk2-Notify.spec	27 Nov 2006 18:47:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Notify
 Version:        0.02
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gtk2::Notify Perl module
 License:        LGPL
 Group:          Development/Libraries
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Chris Weyl  0.02-4
+- bump
+
 * Mon Nov 27 2006 Chris Weyl 
 - change source0 to pull from an alternate CPAN location
 



From fedora-extras-commits at redhat.com  Mon Nov 27 19:30:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:30:09 -0500
Subject: rpms/gwenview/FC-6 .cvsignore, 1.6, 1.7 gwenview.spec, 1.19,
	1.20 sources, 1.6, 1.7
Message-ID: <200611271930.kARJU9Ue032504@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32470/FC-6

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
version 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Oct 2006 08:47:17 -0000	1.6
+++ .cvsignore	27 Nov 2006 19:29:39 -0000	1.7
@@ -1,2 +1,2 @@
-gwenview-1.4.0.tar.bz2
-gwenview-i18n-1.4.0.tar.bz2
+gwenview-1.4.1.tar.bz2
+gwenview-i18n-1.4.1.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/gwenview.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gwenview.spec	3 Oct 2006 15:25:01 -0000	1.19
+++ gwenview.spec	27 Nov 2006 19:29:39 -0000	1.20
@@ -1,13 +1,13 @@
 Name:           gwenview
-Version:        1.4.0
-Release:        3%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
-Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-%{version}.tar.bz2
+Source1:        http://dl.sf.net/gwenview/gwenview-i18n-%{version}.tar.bz2
 # Patch for libexif >= 0.6.13
 Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +17,7 @@
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
 BuildRequires:  libexif-devel
+BuildRequires:  exiv2-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  1.4.1-1
+- version 1.4.1
+
 * Tue Oct 03 2006 Aurelien Bompard  1.4.0-3
 - patch for latest libexif-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Oct 2006 08:47:17 -0000	1.6
+++ sources	27 Nov 2006 19:29:39 -0000	1.7
@@ -1,2 +1,2 @@
-82f15fca494ffd2aabad9828c5c66d94  gwenview-1.4.0.tar.bz2
-2b978ab4b76cbd4fb857d63100f0d5da  gwenview-i18n-1.4.0.tar.bz2
+df5df7ace3e7bec73f96bf1646ab27b0  gwenview-1.4.1.tar.bz2
+9a38efa209d7357b3baec1189d366928  gwenview-i18n-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 19:30:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:30:09 -0500
Subject: rpms/gwenview/devel .cvsignore, 1.6, 1.7 gwenview.spec, 1.19,
	1.20 sources, 1.6, 1.7
Message-ID: <200611271930.kARJU9Pl032509@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32470/devel

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
version 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Oct 2006 08:47:17 -0000	1.6
+++ .cvsignore	27 Nov 2006 19:29:39 -0000	1.7
@@ -1,2 +1,2 @@
-gwenview-1.4.0.tar.bz2
-gwenview-i18n-1.4.0.tar.bz2
+gwenview-1.4.1.tar.bz2
+gwenview-i18n-1.4.1.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gwenview.spec	3 Oct 2006 15:25:01 -0000	1.19
+++ gwenview.spec	27 Nov 2006 19:29:39 -0000	1.20
@@ -1,13 +1,13 @@
 Name:           gwenview
-Version:        1.4.0
-Release:        3%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
-Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-%{version}.tar.bz2
+Source1:        http://dl.sf.net/gwenview/gwenview-i18n-%{version}.tar.bz2
 # Patch for libexif >= 0.6.13
 Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +17,7 @@
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
 BuildRequires:  libexif-devel
+BuildRequires:  exiv2-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  1.4.1-1
+- version 1.4.1
+
 * Tue Oct 03 2006 Aurelien Bompard  1.4.0-3
 - patch for latest libexif-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Oct 2006 08:47:17 -0000	1.6
+++ sources	27 Nov 2006 19:29:39 -0000	1.7
@@ -1,2 +1,2 @@
-82f15fca494ffd2aabad9828c5c66d94  gwenview-1.4.0.tar.bz2
-2b978ab4b76cbd4fb857d63100f0d5da  gwenview-i18n-1.4.0.tar.bz2
+df5df7ace3e7bec73f96bf1646ab27b0  gwenview-1.4.1.tar.bz2
+9a38efa209d7357b3baec1189d366928  gwenview-i18n-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 19:33:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:33:44 -0500
Subject: rpms/glest-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611271933.kARJXiH3000321@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv315

Added Files:
	Makefile import.log 
Log Message:
Setup of module glest-data


--- NEW FILE Makefile ---
# Top level Makefile for module glest-data
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  Mon Nov 27 19:33:49 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:33:49 -0500
Subject: rpms/glest-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611271933.kARJXnVG000343@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv315/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module glest-data


--- 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 Nov 27 20:06:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:06:17 -0500
Subject: rpms/glest import.log,1.1,1.2
Message-ID: <200611272006.kARK6HGI005979@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942

Modified Files:
	import.log 
Log Message:
auto-import glest-2.0.0-1 on branch devel from glest-2.0.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glest/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 20:04:39 -0000	1.1
+++ import.log	27 Nov 2006 20:05:47 -0000	1.2
@@ -0,0 +1 @@
+glest-2_0_0-1:HEAD:glest-2.0.0-1.src.rpm:1164658046



From fedora-extras-commits at redhat.com  Mon Nov 27 20:06:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:06:17 -0500
Subject: rpms/glest/devel glest-2.0.0-gcc41.patch, NONE,
	1.1 glest-2.0.0-unicode.patch, NONE, 1.1 glest.sh, NONE,
	1.1 glest.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611272006.kARK6Hed005983@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glest-2.0.0-gcc41.patch glest-2.0.0-unicode.patch glest.sh 
	glest.spec 
Log Message:
auto-import glest-2.0.0-1 on branch devel from glest-2.0.0-1.src.rpm

glest-2.0.0-gcc41.patch:

--- NEW FILE glest-2.0.0-gcc41.patch ---
--- ./source/shared_lib/include/graphics/particle.h.gcc41	2006-11-05 23:01:03.000000000 +0100
+++ ./source/shared_lib/include/graphics/particle.h	2006-11-05 23:01:22.000000000 +0100
@@ -310,7 +310,7 @@
 	void setTrajectoryFrequency(float trajectoryFrequency)	{this->trajectoryFrequency= trajectoryFrequency;}
 	void setPath(Vec3f startPos, Vec3f endPos);
 
-	static Trajectory ProjectileParticleSystem::strToTrajectory(const string &str);
+	static Trajectory strToTrajectory(const string &str);
 };
 
 // =====================================================

glest-2.0.0-unicode.patch:

--- NEW FILE glest-2.0.0-unicode.patch ---
--- ./mk/linux/configure.ac.unicode	2006-11-05 22:54:30.000000000 +0100
+++ ./mk/linux/configure.ac	2006-11-05 22:54:44.000000000 +0100
@@ -134,7 +134,7 @@
 XIPH_PATH_OGG(, [AC_MSG_ERROR([Please install ogg/vorbis])])
 
 AM_OPTIONS_WXCONFIG
-AM_PATH_WXCONFIG([2.6.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl], [--unicode=no])
+AM_PATH_WXCONFIG([2.6.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl])
 AC_SUBST([WX_AVAILABLE])
 
 AC_INIT_JAM


--- NEW FILE glest.sh ---
#!/bin/sh

GLEST_LOCAL_DIR=$HOME/.glest
GLEST_DATA_DIR=/usr/share/glest
GLEST_EXECUTABLE=/usr/libexec/glest/glest

tmplang="$LANG"
test "$LC_MESSAGES" != "" && tmplang="$LC_MESSAGES"
test "$LC_ALL"      != "" && tmplang="$LC_ALL"
test "$LANGUAGE"    != "" && tmplang="$LANGUAGE"

lang=`echo $tmplang|cut -d "_" -f 1`

case $lang in
  da)
    lang=dansk.lng
  ;;
  de)
    lang=german.lng
  ;;
  eu)
    lang=euskara.lng
  ;;
  es)
    lang=$(echo espa??ol.lng | iconv -f UTF-8 -t ISO-8859-1)
  ;;
  fr)
    lang=francais.lng
  ;;
  gl)
    lang=galego.lng
  ;;
  hu)
    lang=magyar.lng
  ;;
  it)
    lang=italiano.lng
  ;;
  nb|nn)
    lang=norsk.lng
  ;;
  pt)
    lang=portugues.lng
  ;;
  tr)
    lang=turkish.lng
  ;;
  *)
    lang=english.lng
  ;;
esac

mkdir -p $GLEST_LOCAL_DIR
cd $GLEST_LOCAL_DIR
for dir in techs data maps tilesets; do
    ln -snf $GLEST_DATA_DIR/$dir $dir
done
test -L screens && rm screens

# glest.ini
if [ ! -e glest.ini ]; then
  X=$(xdpyinfo|grep "dimensions:"|awk '{print $2}'|cut -d "x" -f 1)
  Y=$(xdpyinfo|grep "dimensions:"|awk '{print $2}'|cut -d "x" -f 2)
  sed -e s/ScreenWidth=.*/ScreenWidth=$X/g \
      -e s/ScreenHeight=.*/ScreenHeight=$Y/g \
      $GLEST_DATA_DIR/glest.ini > glest.ini
  if [ -f $GLEST_DATA_DIR/data/lang/$lang ]; then
    sed -i -e s/Lang=.*/Lang=$lang/g glest.ini
  fi
else
  # convert configuration from glest 1.1 to glest 1.2
  grep -q -e ChangeDisplay -e PathFindLevelsMax glest.ini
  if [ $? -eq 0 ]; then
    sed -e s/ChangeDisplay=1/Windowed=0/g \
        -e s/ChangeDisplay=0/Windowed=1/g \
        -e s/PathFindLevelsMax/PathFindNodesMax/g \
        -i glest.ini
  fi
fi
exec $GLEST_EXECUTABLE "$@"


--- NEW FILE glest.spec ---
Name:           glest
Version:        2.0.0
Release:        1%{?dist}
Summary:        3D real time strategy game

Group:          Amusements/Games
License:        GPL
URL:            http://glest.org
Source0:        http://dl.sf.net/glest/glest_source_2.0.0.zip
Source1:        glest.sh
Patch0:         glest-2.0.0-unicode.patch
Patch1:         glest-2.0.0-gcc41.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
BuildRequires:  libogg-devel, libvorbis-devel, autoconf, automake
BuildRequires:  desktop-file-utils

Requires:       glest-data = %{version}

%description
Glest  is a free 3D real time strategy game, that can be modified
using XML and a set of tools

%prep
%setup -q -n %{name}_source_%{version}
%patch0 -p1 -b .unicode
%patch1 -p1 -b .gcc41
find . -type f | xargs sed -i -e "s/\r//g" 
#find . -type f | while read file; do
#  grep -qs "\r\n" $file && dos2unix $file
#done


%build
cd mk/linux
#sed -i -e "s/\r//g" autogen.sh configure.ac glest.ini Jamfile Jamrules mk/jam/* mk/autoconf/*
chmod +x autogen.sh
./autogen.sh
%configure
#jam %{?_smp_mflags}
jam


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/glest
mkdir -p $RPM_BUILD_ROOT%{_datadir}/glest
install -p -m 755 mk/linux/glest $RPM_BUILD_ROOT%{_libexecdir}/glest/
install -p -m 644 mk/linux/glest.ini $RPM_BUILD_ROOT%{_datadir}/glest/

# Wrapper
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/glest

# Desktop file
cat > glest.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=Glest
Comment=Real Time Strategy game
Exec=glest
Icon=%{_datadir}/glest/glest-0.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Application;Game;StrategyGame;
EOF
desktop-file-install  --vendor fedora \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        glest.desktop



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/README.linux docs/license.txt
%{_bindir}/glest
%{_datadir}/applications/*.desktop
%{_libexecdir}/glest
%{_datadir}/glest


%changelog
* Wed Jul 19 2006 Aurelien Bompard  2.0.0-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 20:04:44 -0000	1.1
+++ .cvsignore	27 Nov 2006 20:05:47 -0000	1.2
@@ -0,0 +1 @@
+glest_source_2.0.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 20:04:44 -0000	1.1
+++ sources	27 Nov 2006 20:05:47 -0000	1.2
@@ -0,0 +1 @@
+f7716da7a044dbe108c619b0f52621bb  glest_source_2.0.0.zip



From fedora-extras-commits at redhat.com  Mon Nov 27 20:04:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:04:18 -0500
Subject: rpms/glest - New directory
Message-ID: <200611272004.kARK4Ixg005830@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5825/glest

Log Message:
Directory /cvs/extras/rpms/glest added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 19:33:15 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:33:15 -0500
Subject: rpms/glest-data - New directory
Message-ID: <200611271933.kARJXFCi032709@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32704/glest-data

Log Message:
Directory /cvs/extras/rpms/glest-data added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 20:04:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:04:18 -0500
Subject: rpms/glest/devel - New directory
Message-ID: <200611272004.kARK4I4o005843@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5825/glest/devel

Log Message:
Directory /cvs/extras/rpms/glest/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 19:33:20 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:33:20 -0500
Subject: rpms/glest-data/devel - New directory
Message-ID: <200611271933.kARJXKK9032729@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32704/glest-data/devel

Log Message:
Directory /cvs/extras/rpms/glest-data/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 20:04:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:04:44 -0500
Subject: rpms/glest/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611272004.kARK4iUa005888@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5867/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module glest


--- 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 Nov 27 20:04:39 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:04:39 -0500
Subject: rpms/glest Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611272004.kARK4dUb005873@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5867

Added Files:
	Makefile import.log 
Log Message:
Setup of module glest


--- NEW FILE Makefile ---
# Top level Makefile for module glest
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  Mon Nov 27 19:55:00 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:55:00 -0500
Subject: rpms/glest-data import.log,1.1,1.2
Message-ID: <200611271955.kARJt0D4001994@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1925

Modified Files:
	import.log 
Log Message:
auto-import glest-data-2.0.0-2 on branch devel from glest-data-2.0.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glest-data/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 19:33:44 -0000	1.1
+++ import.log	27 Nov 2006 19:54:30 -0000	1.2
@@ -0,0 +1 @@
+glest-data-2_0_0-2:HEAD:glest-data-2.0.0-2.src.rpm:1164657369



From fedora-extras-commits at redhat.com  Mon Nov 27 19:55:00 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:55:00 -0500
Subject: rpms/glest-data/devel glest-data.spec, NONE,
	1.1 glest-get-translations.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611271955.kARJt0fJ001999@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1925/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glest-data.spec glest-get-translations.sh 
Log Message:
auto-import glest-data-2.0.0-2 on branch devel from glest-data-2.0.0-2.src.rpm


--- NEW FILE glest-data.spec ---
Name:           glest-data
Version:        2.0.0
Release:        2%{?dist}
Summary:        Data files for the game Glest

Group:          Amusements/Games
License:        Distributable
URL:            http://www.glest.org
Source0:        http://dl.sf.net/glest/glest_data_%{version}.zip
# Script used to create SOURCE2
Source1:        glest-get-translations.sh
Source2:        glest-translations-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  ImageMagick
Requires:       glest = %{version}

%description
Glest  is a free 3D real time strategy game, that can be modified
using XML and a set of tools.
This package contains the data files for the game.

%prep
%setup -q -n glest_game
# dos2unix some docs files
find docs -type f | xargs sed -i -e "s/\r//g"


%build
# Only data files, no build.

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/glest/
cp -a * $RPM_BUILD_ROOT%{_datadir}/glest/
# provided by the binary package
rm -f $RPM_BUILD_ROOT%{_datadir}/glest/glest.ini
# Needs to be writeable (in the user's homedir)
rm -f $RPM_BUILD_ROOT%{_datadir}/glest/glest.log
# Icon
convert $RPM_BUILD_ROOT%{_datadir}/glest/glest.ico \
        $RPM_BUILD_ROOT%{_datadir}/glest/glest.png
rm -f $RPM_BUILD_ROOT%{_datadir}/glest/glest.ico
# Translations
tar -xf %{SOURCE2} -C $RPM_BUILD_ROOT%{_datadir}/glest/data/lang/
pushd $RPM_BUILD_ROOT%{_datadir}/glest/data/lang/
for langfile in translations/*.zip; do
    unzip $langfile
done
rm -rf translations
chmod 644 *.lng
popd
# Documentation: put everything in the glest docdir (more logical)
mkdir -p $RPM_BUILD_ROOT%{_docdir}/glest-%{version}/
mv $RPM_BUILD_ROOT%{_datadir}/glest/docs/* $RPM_BUILD_ROOT%{_docdir}/glest-%{version}/
rmdir $RPM_BUILD_ROOT%{_datadir}/glest/docs
# Conflics with the glest package
mv $RPM_BUILD_ROOT%{_docdir}/glest-%{version}/license{.txt,-data.txt}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc %{_docdir}/glest-%{version}/*
%{_datadir}/glest/*



%changelog
* Sun Nov 26 2006 Aurelien Bompard  2.0.0-2
- fix Licence tag

* Thu Nov 09 2006 Aurelien Bompard  2.0.0-1
- initial package


--- NEW FILE glest-get-translations.sh ---
#!/bin/sh

version=$1

if [ -z "$version" ]; then
    echo "Usage: $0 "
    exit 2
fi

rm -rf translations
mkdir translations
cd translations
wget -r -N -l 1 -np -nd -A "*_$version.zip" http://www.glest.org/files/contrib/translations/
rm -f robots.txt
cd ..
tar -czf glest-translations-$version.tar.gz translations
rm -rf translations


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glest-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 19:33:49 -0000	1.1
+++ .cvsignore	27 Nov 2006 19:54:30 -0000	1.2
@@ -0,0 +1,2 @@
+glest-translations-2.0.0.tar.gz
+glest_data_2.0.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glest-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 19:33:49 -0000	1.1
+++ sources	27 Nov 2006 19:54:30 -0000	1.2
@@ -0,0 +1,2 @@
+aa9652c67a7dfcca11fe1f9e41cb1cd8  glest-translations-2.0.0.tar.gz
+8b6902e82874011e768c64e20fbeead5  glest_data_2.0.0.zip



From fedora-extras-commits at redhat.com  Mon Nov 27 20:10:27 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:10:27 -0500
Subject: owners owners.list,1.2022,1.2023
Message-ID: <200611272010.kARKARBh006042@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6027

Modified Files:
	owners.list 
Log Message:
add glest and glest-data


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2022
retrieving revision 1.2023
diff -u -r1.2022 -r1.2023
--- owners.list	27 Nov 2006 18:45:36 -0000	1.2022
+++ owners.list	27 Nov 2006 20:09:57 -0000	1.2023
@@ -554,6 +554,8 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|peter at thecodergeek.com|extras-qa at fedoraproject.org|jspaleta at gmail.com
+Fedora Extras|glest|3D real time strategy game|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|glest-data|Data files for the game Glest|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|glib|A library of handy utility functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 library for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 27 20:18:24 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:18:24 -0500
Subject: rpms/gwenview/FC-6 gwenview.spec,1.20,1.21
Message-ID: <200611272018.kARKIOIM006125@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6097/FC-6

Modified Files:
	gwenview.spec 
Log Message:
remove patch


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/gwenview.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gwenview.spec	27 Nov 2006 19:29:39 -0000	1.20
+++ gwenview.spec	27 Nov 2006 20:17:54 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,15 +8,12 @@
 URL:            http://gwenview.sf.net
 Source0:        http://dl.sf.net/gwenview/gwenview-%{version}.tar.bz2
 Source1:        http://dl.sf.net/gwenview/gwenview-i18n-%{version}.tar.bz2
-# Patch for libexif >= 0.6.13
-Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
-BuildRequires:  libexif-devel
 BuildRequires:  exiv2-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
@@ -36,9 +33,6 @@
 
 %prep
 %setup -q -a 1
-%if "%{fedora}" >= "6"
-%patch0 -p0
-%endif
 
 
 %build
@@ -117,6 +111,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  1.4.1-2
+- remove patch (gwenview now uses exiv2 instead of libexif)
+
 * Mon Nov 27 2006 Aurelien Bompard  1.4.1-1
 - version 1.4.1
 



From fedora-extras-commits at redhat.com  Mon Nov 27 20:18:25 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:18:25 -0500
Subject: rpms/gwenview/devel gwenview.spec,1.20,1.21
Message-ID: <200611272018.kARKIPPQ006128@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6097/devel

Modified Files:
	gwenview.spec 
Log Message:
remove patch


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gwenview.spec	27 Nov 2006 19:29:39 -0000	1.20
+++ gwenview.spec	27 Nov 2006 20:17:55 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,15 +8,12 @@
 URL:            http://gwenview.sf.net
 Source0:        http://dl.sf.net/gwenview/gwenview-%{version}.tar.bz2
 Source1:        http://dl.sf.net/gwenview/gwenview-i18n-%{version}.tar.bz2
-# Patch for libexif >= 0.6.13
-Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
-BuildRequires:  libexif-devel
 BuildRequires:  exiv2-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
@@ -36,9 +33,6 @@
 
 %prep
 %setup -q -a 1
-%if "%{fedora}" >= "6"
-%patch0 -p0
-%endif
 
 
 %build
@@ -117,6 +111,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  1.4.1-2
+- remove patch (gwenview now uses exiv2 instead of libexif)
+
 * Mon Nov 27 2006 Aurelien Bompard  1.4.1-1
 - version 1.4.1
 



From fedora-extras-commits at redhat.com  Mon Nov 27 20:49:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 27 Nov 2006 15:49:18 -0500
Subject: fedora-security/audit fe3, 1.34, 1.35 fe4, 1.101, 1.102 fe5, 1.109, 
	1.110 fe6, 1.25, 1.26
Message-ID: <200611272049.kARKnIYV006376@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
Note CVE-2006-0804, CVE-2006-6122 (tin)


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fe3	26 Nov 2006 06:52:47 -0000	1.34
+++ fe3	27 Nov 2006 20:49:17 -0000	1.35
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
@@ -59,6 +60,7 @@
 CVE-2006-0840 VULNERABLE (mantis) bz#191089
 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297
 CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
+CVE-2006-0804 VULNERABLE (tin, fixed 1.8.1) #217422
 CVE-2006-0760 ** version (lighttpd, fixed 1.4.10))
 CVE-2006-0665 VULNERABLE (mantis) bz#191089
 CVE-2006-0664 VULNERABLE (mantis) bz#191089


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fe4	26 Nov 2006 06:52:47 -0000	1.101
+++ fe4	27 Nov 2006 20:49:17 -0000	1.102
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
@@ -159,6 +160,7 @@
 CVE-2006-0162 version (clamav, fixed 0.88)
 CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
 CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0804 ignore (tin, <= 1.8.0 not shipped)
 CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507
 CVE-2006-0042 version (libapreq2, fixed 2.0.7)


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fe5	26 Nov 2006 06:52:47 -0000	1.109
+++ fe5	27 Nov 2006 20:49:17 -0000	1.110
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
@@ -165,6 +166,7 @@
 CVE-2006-0162 version (clamav, fixed 0.88)
 CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
 CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0804 ignore (tin, <= 1.8.0 not shipped)
 CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507
 CVE-2006-0042 version (libapreq2, fixed 2.0.7)


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fe6	26 Nov 2006 06:52:47 -0000	1.25
+++ fe6	27 Nov 2006 20:49:17 -0000	1.26
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6122 ignore (tin, <= 1.8.1 not shipped)
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263
 CVE-2006-5864 VULNERABLE (gv) #215136
@@ -166,6 +167,7 @@
 CVE-2006-0162 version (clamav, fixed 0.88)
 CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
 CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0804 ignore (tin, <= 1.8.0 not shipped)
 CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507
 CVE-2006-0042 version (libapreq2, fixed 2.0.7)



From fedora-extras-commits at redhat.com  Mon Nov 27 21:00:30 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 27 Nov 2006 16:00:30 -0500
Subject: rpms/tin/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tin.spec, 1.11,
	1.12
Message-ID: <200611272100.kARL0UAf006442@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/tin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6423

Modified Files:
	.cvsignore sources tin.spec 
Log Message:
* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
- updated to 1.8.2
- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
- fix for #217420



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Mar 2006 03:37:49 -0000	1.5
+++ .cvsignore	27 Nov 2006 20:59:59 -0000	1.6
@@ -1,2 +1,3 @@
 tin-1.8.1.tar.bz2
 tin-1.8.1.tar.bz2.sign
+tin-1.8.2.tar.bz2.sign


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Mar 2006 03:37:49 -0000	1.5
+++ sources	27 Nov 2006 20:59:59 -0000	1.6
@@ -1,2 +1,4 @@
 efeecdf72683213d9e705c28de87ea2e  tin-1.8.1.tar.bz2
 4f7dd48ddd79d79203dc0094f692999f  tin-1.8.1.tar.bz2.sign
+8ee7304568012d05c68123e656654c4d  tin-1.8.2.tar.bz2.sign
+b6726c7f3e01b821b3b20d446ac2da9b  tin-1.8.2.tar.bz2


Index: tin.spec
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-5/tin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tin.spec	13 Mar 2006 03:37:49 -0000	1.11
+++ tin.spec	27 Nov 2006 20:59:59 -0000	1.12
@@ -1,12 +1,12 @@
 Name: tin
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{?dist}
 Summary: Basic Internet news reader
 Group: Applications/Internet
 License: Distributable
 URL: http://www.tin.org/
-Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2
-Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2.sign
+Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2
+Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2.sign
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel
 
@@ -86,6 +86,11 @@
 
 
 %changelog
+* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
+- updated to 1.8.2
+- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
+- fix for #217420
+
 * Sun Mar 13 2006 Adrian Reber  - 1.8.1-1
 - updated to 1.8.1
 



From fedora-extras-commits at redhat.com  Mon Nov 27 21:04:12 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 27 Nov 2006 16:04:12 -0500
Subject: rpms/tin/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tin.spec, 1.11,
	1.12
Message-ID: <200611272104.kARL4C54009541@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/tin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9522

Modified Files:
	.cvsignore sources tin.spec 
Log Message:
* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
- updated to 1.8.2
- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
- fix for #217420



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 May 2006 12:48:52 -0000	1.5
+++ .cvsignore	27 Nov 2006 21:03:42 -0000	1.6
@@ -1,2 +1,3 @@
 tin-1.8.1.tar.bz2
 tin-1.8.1.tar.bz2.sign
+tin-1.8.2.tar.bz2.sign


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 May 2006 12:48:52 -0000	1.5
+++ sources	27 Nov 2006 21:03:42 -0000	1.6
@@ -1,2 +1,4 @@
 efeecdf72683213d9e705c28de87ea2e  tin-1.8.1.tar.bz2
 4f7dd48ddd79d79203dc0094f692999f  tin-1.8.1.tar.bz2.sign
+8ee7304568012d05c68123e656654c4d  tin-1.8.2.tar.bz2.sign
+b6726c7f3e01b821b3b20d446ac2da9b  tin-1.8.2.tar.bz2


Index: tin.spec
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-4/tin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tin.spec	18 May 2006 12:48:52 -0000	1.11
+++ tin.spec	27 Nov 2006 21:03:42 -0000	1.12
@@ -1,12 +1,12 @@
 Name: tin
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{?dist}
 Summary: Basic Internet news reader
 Group: Applications/Internet
 License: Distributable
 URL: http://www.tin.org/
-Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2
-Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2.sign
+Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2
+Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2.sign
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel
 
@@ -86,6 +86,11 @@
 
 
 %changelog
+* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
+- updated to 1.8.2
+- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
+- fix for #217420
+
 * Sun Mar 13 2006 Adrian Reber  - 1.8.1-1
 - updated to 1.8.1
 



From fedora-extras-commits at redhat.com  Mon Nov 27 21:06:34 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 27 Nov 2006 16:06:34 -0500
Subject: rpms/libfwbuilder/devel .cvsignore, 1.7, 1.8 libfwbuilder.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200611272106.kARL6YjY009627@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9603

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Log Message:
- Update to 2.1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2006 12:52:05 -0000	1.7
+++ .cvsignore	27 Nov 2006 21:06:04 -0000	1.8
@@ -1 +1 @@
-libfwbuilder-2.1.6.tar.gz
+libfwbuilder-2.1.7.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libfwbuilder.spec	24 Oct 2006 12:52:05 -0000	1.14
+++ libfwbuilder.spec	27 Nov 2006 21:06:04 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        2.1.6
-Release:        0.0.beta%{?dist}
+Version:        2.1.7
+Release:        0.1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Tue Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
+- Update to 2.1.7
+
 * Tue Oct 24 2006 Ralf Ertzinger  2.1.6-0.0.beta.fc7
 - Update to the 2.1.6 beta
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Oct 2006 12:52:05 -0000	1.7
+++ sources	27 Nov 2006 21:06:04 -0000	1.8
@@ -1 +1 @@
-34a5f0c2ae1c5cc45287e4b53ba23816  libfwbuilder-2.1.6.tar.gz
+fde9444d2f48e8b643de1a90c812951f  libfwbuilder-2.1.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 21:08:45 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 27 Nov 2006 16:08:45 -0500
Subject: rpms/tin/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5 tin.spec,1.7,1.8
Message-ID: <200611272108.kARL8jOf009674@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/tin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9649

Modified Files:
	.cvsignore sources tin.spec 
Log Message:
* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
- updated to 1.8.2
- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
- fix for #217420
- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-0804
- fix for #217422



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 05:27:38 -0000	1.4
+++ .cvsignore	27 Nov 2006 21:08:15 -0000	1.5
@@ -1 +1,3 @@
-tin-1.6.2.tar.bz2
+tin-1.8.1.tar.bz2
+tin-1.8.1.tar.bz2.sign
+tin-1.8.2.tar.bz2.sign


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 05:27:38 -0000	1.4
+++ sources	27 Nov 2006 21:08:15 -0000	1.5
@@ -1 +1,4 @@
-3ab61ba7c7d3b7a3596ba199c570c4e4  tin-1.6.2.tar.bz2
+efeecdf72683213d9e705c28de87ea2e  tin-1.8.1.tar.bz2
+4f7dd48ddd79d79203dc0094f692999f  tin-1.8.1.tar.bz2.sign
+8ee7304568012d05c68123e656654c4d  tin-1.8.2.tar.bz2.sign
+b6726c7f3e01b821b3b20d446ac2da9b  tin-1.8.2.tar.bz2


Index: tin.spec
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-3/tin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tin.spec	10 Dec 2004 22:03:12 -0000	1.7
+++ tin.spec	27 Nov 2006 21:08:15 -0000	1.8
@@ -1,16 +1,15 @@
 Name: tin
-Version: 1.6.2
-Release: 2
-Epoch: 0
-Summary: A basic Internet news reader.
+Version: 1.8.2
+Release: 1%{?dist}
+Summary: Basic Internet news reader
 Group: Applications/Internet
 License: Distributable
 URL: http://www.tin.org/
-Source:  ftp://ftp.tin.org/pub/news/clients/tin/v1.6/tin-1.6.2.tar.bz2
+Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2
+Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2.sign
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel
 
-#---------------------------------------------------------------------
 
 %description
 Tin is a basic, easy to use Internet news reader.  Tin can read news
@@ -19,12 +18,10 @@
 
 Install tin if you need a basic news reader.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 
-#---------------------------------------------------------------------
 
 %build
 %configure \
@@ -44,7 +41,6 @@
 %{__make} clean %{?_smp_mflags}
 %{__make} build %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/pcre"
 
-#---------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -69,12 +65,10 @@
 # url_handler.sh conflicts with mutt
 %{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/url_handler.sh
 
-#---------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -84,14 +78,30 @@
 %{_bindir}/metamutt
 %{_bindir}/opt-case.pl
 %{_bindir}/w2r.pl
+%{_bindir}/tinews.pl
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 /usr/share/locale/*/*/*
 %{_datadir}/applications/*%{name}.desktop
 
-#---------------------------------------------------------------------
 
 %changelog
+* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
+- updated to 1.8.2
+- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
+- fix for #217420
+- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-0804
+- fix for #217422
+
+* Sun Mar 13 2006 Adrian Reber  - 1.8.1-1
+- updated to 1.8.1
+
+* Sun May 22 2005 Jeremy Katz  - 1.6.2-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Thu Jun 24 2004 Adrian Reber  - 0:1.6.2-0.fdr.2
 - changed BuildRequires from bison to byacc
 - added pcre-devel as BuildRequires
@@ -150,7 +160,7 @@
 - fix libdir=/var/lib/news (#7).
 - fix spooldir=/var/spool/news.
 
-* Sun Mar 21 1999 Cristian Gafton  
+* Sun Mar 21 1999 Cristian Gafton 
 - auto rebuild in the new build environment (release 3)
 
 * Tue Mar 09 1999 Preston Brown 



From fedora-extras-commits at redhat.com  Mon Nov 27 21:12:07 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 27 Nov 2006 16:12:07 -0500
Subject: rpms/fwbuilder/devel .cvsignore, 1.8, 1.9 fwbuilder.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <200611272112.kARLC7c4009780@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9755

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
- Update to 2.1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Oct 2006 12:58:12 -0000	1.8
+++ .cvsignore	27 Nov 2006 21:11:37 -0000	1.9
@@ -1 +1 @@
-fwbuilder-2.1.6.tar.gz
+fwbuilder-2.1.7.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fwbuilder.spec	24 Oct 2006 12:58:12 -0000	1.15
+++ fwbuilder.spec	27 Nov 2006 21:11:37 -0000	1.16
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.1.6
-Release:        0.0.beta%{?dist}
+Version:        2.1.7
+Release:        0.1%{?dist}
 
 License:        GPL
 Group:          Applications/System
@@ -36,17 +36,17 @@
 # The beta releases are meant to be installed in parallel, we do
 # not want that. So we have to mangle some filenames
 #
-perl -pi -e 's,(fwb(?:edit|lookup|uilder|_ipf|_ipfw|_ipt|_pf))21,$1,' \
-    doc/doc.pro \
-    src/ipf/ipf.pro \
-    src/fwbedit/fwbedit.pro \
-    src/gui/gui.pro \
-    src/pf/pf.pro \
-    src/fwblookup/fwblookup.pro \
-    src/ipt/ipt.pro \
-    src/ipfw/ipfw.pro
-
-/usr/bin/rename 21.1 .1 doc/*21.1
+# perl -pi -e 's,(fwb(?:edit|lookup|uilder|_ipf|_ipfw|_ipt|_pf))21,$1,' \
+#     doc/doc.pro \
+#     src/ipf/ipf.pro \
+#     src/fwbedit/fwbedit.pro \
+#     src/gui/gui.pro \
+#     src/pf/pf.pro \
+#     src/fwblookup/fwblookup.pro \
+#     src/ipt/ipt.pro \
+#     src/ipfw/ipfw.pro
+# 
+# /usr/bin/rename 21.1 .1 doc/*21.1
 
 %configure \
     --with-templatedir=%{_datadir}/fwbuilder \
@@ -83,9 +83,9 @@
 %{_datadir}/fwbuilder
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/fwbuilder.png
-%{_bindir}/fwbuilder
-%{_bindir}/fwblookup
-%{_bindir}/fwbedit
+%{_bindir}/fwbuilder21
+%{_bindir}/fwblookup21
+%{_bindir}/fwbedit21
 %doc doc/AUTHORS
 %doc doc/COPYING
 %doc doc/Credits
@@ -94,9 +94,9 @@
 %doc doc/README.floppyfw
 %doc doc/ReleaseNotes_*.txt
 %doc doc/ReleaseNotes_*.html
-%{_mandir}/man1/fwbuilder.1*
-%{_mandir}/man1/fwblookup.1*
-%{_mandir}/man1/fwbedit.1*
+%{_mandir}/man1/fwbuilder21.1*
+%{_mandir}/man1/fwblookup21.1*
+%{_mandir}/man1/fwbedit21.1*
 
 
 %package pf
@@ -159,6 +159,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Tue Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
+- Update to 2.1.7
+
 * Tue Oct 24 2006 Ralf Ertzinger  2.1.6-0.0.beta.fc7
 - Update to beta release 2.1.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 12:58:12 -0000	1.8
+++ sources	27 Nov 2006 21:11:37 -0000	1.9
@@ -1 +1 @@
-12638ce0987c87dd81cc54a8c5b906bb  fwbuilder-2.1.6.tar.gz
+229b23b37e20f8184b189ab76a98ba22  fwbuilder-2.1.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 21:15:21 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 27 Nov 2006 16:15:21 -0500
Subject: rpms/openpbx/devel .cvsignore, 1.3, 1.4 openpbx.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200611272115.kARLFLeF010211@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10192

Modified Files:
	.cvsignore openpbx.spec sources 
Log Message:
RC2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2006 16:17:46 -0000	1.3
+++ .cvsignore	27 Nov 2006 21:14:51 -0000	1.4
@@ -1 +1,2 @@
 openpbx-r1984.tar.gz
+openpbx-r2135.tar.gz


Index: openpbx.spec
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/openpbx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openpbx.spec	18 Oct 2006 16:17:46 -0000	1.3
+++ openpbx.spec	27 Nov 2006 21:14:51 -0000	1.4
@@ -1,4 +1,4 @@
-%define snap 1984
+%define snap 2135
 
 %bcond_without misdn
 %bcond_without zaptel
@@ -7,7 +7,7 @@
 
 Name:		openpbx
 Version:	1.2
-Release:	2.rc1.svn%{snap}%{?dist}
+Release:	3.rc2.svn%{snap}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -353,6 +353,9 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Mon Nov 27 2006 David Woodhouse  1.2-3.rc2.svn2135
+- Update to RC2
+
 * Wed Oct 18 2006 David Woodhouse  1.2-2.rc1.svn1984
 - Build with mISDN and MySQL support
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Oct 2006 16:17:46 -0000	1.3
+++ sources	27 Nov 2006 21:14:51 -0000	1.4
@@ -1 +1,2 @@
 8aed2d6afedbd13082d8ce4318b8f163  openpbx-r1984.tar.gz
+6f26c9fadd92caf464aa064e2801385c  openpbx-r2135.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 21:21:52 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 16:21:52 -0500
Subject: rpms/glest/devel glest.spec,1.1,1.2
Message-ID: <200611272121.kARLLqDg010278@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10260

Modified Files:
	glest.spec 
Log Message:
fix description


Index: glest.spec
===================================================================
RCS file: /cvs/extras/rpms/glest/devel/glest.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glest.spec	27 Nov 2006 20:05:47 -0000	1.1
+++ glest.spec	27 Nov 2006 21:21:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           glest
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -19,8 +19,13 @@
 Requires:       glest-data = %{version}
 
 %description
-Glest  is a free 3D real time strategy game, that can be modified
-using XML and a set of tools
+Glest is a free 3D real time strategy game, that can be modified
+using XML and a set of tools.
+
+Glest takes place in a context which could be compared to that of
+the pre-renaissance Europe, with the licence that magic forces
+exist in the environment and can be controlled.
+
 
 %prep
 %setup -q -n %{name}_source_%{version}
@@ -86,5 +91,8 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  2.0.0-2
+- fix description
+
 * Wed Jul 19 2006 Aurelien Bompard  2.0.0-1
 - initial package



From fedora-extras-commits at redhat.com  Mon Nov 27 22:04:18 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:04:18 -0500
Subject: rpms/cmake/FC-6 .cvsignore, 1.4, 1.5 cmake.spec, 1.9, 1.10 sources, 
	1.4, 1.5 cmake-2.4.3-soname.patch, 1.1, NONE
Message-ID: <200611272204.kARM4IDu014330@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14309

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.4.3-soname.patch 
Log Message:
Update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 16:46:34 -0000	1.4
+++ .cvsignore	27 Nov 2006 22:03:48 -0000	1.5
@@ -1 +1 @@
-cmake-2.4.3.tar.gz
+cmake-2.4.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/cmake.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cmake.spec	31 Oct 2006 23:13:40 -0000	1.9
+++ cmake.spec	27 Nov 2006 22:03:48 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.3
-Release:	4%{?dist}
+Version:	2.4.4
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
 Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.3-soname.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
 
@@ -25,7 +24,6 @@
 %prep
 %setup -q
 %patch -p1 -b .fedora
-%patch1 -p0 -b .soname
 
 
 %build
@@ -62,6 +60,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Orion Poplawski  - 2.4.4-1
+- Update to 2.4.4
+
 * Tue Oct 31 2006 Orion Poplawski  - 2.4.3-4
 - Add /usr/lib/jvm/java to FindJNI search paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 16:46:34 -0000	1.4
+++ sources	27 Nov 2006 22:03:48 -0000	1.5
@@ -1 +1 @@
-c9b50c488a24edd5297ffc3230ecd0f2  cmake-2.4.3.tar.gz
+8c99af9e6e70f154314cf0d160b61e6e  cmake-2.4.4.tar.gz


--- cmake-2.4.3-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 27 22:07:53 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:07:53 -0500
Subject: rpms/cmake/FC-5 .cvsignore, 1.4, 1.5 cmake.spec, 1.5, 1.6 sources,
	1.4, 1.5 cmake-2.4.3-soname.patch, 1.1, NONE
Message-ID: <200611272207.kARM7rs3014409@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14390

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.4.3-soname.patch 
Log Message:
Update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 17:18:17 -0000	1.4
+++ .cvsignore	27 Nov 2006 22:07:23 -0000	1.5
@@ -1 +1 @@
-cmake-2.4.3.tar.gz
+cmake-2.4.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cmake.spec	31 Oct 2006 23:13:39 -0000	1.5
+++ cmake.spec	27 Nov 2006 22:07:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.3
-Release:	3%{?dist}
+Version:	2.4.4
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
 Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.3-soname.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
 
@@ -25,7 +24,6 @@
 %prep
 %setup -q
 %patch -p1 -b .fedora
-%patch1 -p0 -b .soname
 
 
 %build
@@ -62,6 +60,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Orion Poplawski  - 2.4.4-1
+- Update to 2.4.4
+
 * Tue Oct 31 2006 Orion Poplawski  - 2.4.3-3
 - Add /usr/lib/jvm/java to FindJNI search paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 17:18:17 -0000	1.4
+++ sources	27 Nov 2006 22:07:23 -0000	1.5
@@ -1 +1 @@
-c9b50c488a24edd5297ffc3230ecd0f2  cmake-2.4.3.tar.gz
+8c99af9e6e70f154314cf0d160b61e6e  cmake-2.4.4.tar.gz


--- cmake-2.4.3-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 27 22:10:15 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:10:15 -0500
Subject: rpms/cmake/FC-4 .cvsignore, 1.4, 1.5 cmake.spec, 1.7, 1.8 sources,
	1.4, 1.5 cmake-2.4.3-soname.patch, 1.1, NONE
Message-ID: <200611272210.kARMAFjY014486@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14467

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.4.3-soname.patch 
Log Message:
Update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 17:18:16 -0000	1.4
+++ .cvsignore	27 Nov 2006 22:09:45 -0000	1.5
@@ -1 +1 @@
-cmake-2.4.3.tar.gz
+cmake-2.4.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/cmake.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cmake.spec	31 Oct 2006 23:15:32 -0000	1.7
+++ cmake.spec	27 Nov 2006 22:09:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.3
-Release:	3%{?dist}
+Version:	2.4.4
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
 Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.3-soname.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, xorg-x11-devel
 
@@ -25,7 +24,6 @@
 %prep
 %setup -q
 %patch -p1 -b .fedora
-%patch1 -p0 -b .soname
 
 
 %build
@@ -67,6 +65,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Orion Poplawski  - 2.4.4-1
+- Update to 2.4.4
+
 * Tue Oct 31 2006 Orion Poplawski  - 2.4.3-3
 - Add /usr/lib/jvm/java to FindJNI search paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 17:18:16 -0000	1.4
+++ sources	27 Nov 2006 22:09:45 -0000	1.5
@@ -1 +1 @@
-c9b50c488a24edd5297ffc3230ecd0f2  cmake-2.4.3.tar.gz
+8c99af9e6e70f154314cf0d160b61e6e  cmake-2.4.4.tar.gz


--- cmake-2.4.3-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 27 22:16:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:16:57 -0500
Subject: rpms/cmake/FC-6 cmake-2.4.2-fedora.patch,1.2,1.3
Message-ID: <200611272216.kARMGvlA014610@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573

Modified Files:
	cmake-2.4.2-fedora.patch 
Log Message:
Update patch for 2.4.4


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/cmake-2.4.2-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:40 -0000	1.2
+++ cmake-2.4.2-fedora.patch	27 Nov 2006 22:16:27 -0000	1.3
@@ -1,29 +1,3 @@
---- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
-+++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
-@@ -9,6 +9,7 @@
- 
- SET(RUBY_POSSIBLE_INCLUDE_PATHS
--  /usr/lib/ruby/1.8/i386-linux
-+  /usr/lib/ruby/*/i386-linux
-+  /usr/lib64/ruby/*/x86_64-linux
-   )
- 
- SET(RUBY_POSSIBLE_LIB_PATHS
-@@ -19,12 +20,12 @@
-   ${RUBY_POSSIBLE_INCLUDE_PATHS})
- 
- FIND_LIBRARY(RUBY_LIBRARY
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-   )
- 
- FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS
-   /usr/bin
-   /usr/local/bin
 --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
 +++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
 @@ -7,13 +7,11 @@



From fedora-extras-commits at redhat.com  Mon Nov 27 22:17:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:17:52 -0500
Subject: rpms/cmake/FC-4 cmake-2.4.2-fedora.patch,1.2,1.3
Message-ID: <200611272217.kARMHqiZ014712@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14657/FC-4

Modified Files:
	cmake-2.4.2-fedora.patch 
Log Message:
Update patch for 2.4.4


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/cmake-2.4.2-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.4.2-fedora.patch	31 Oct 2006 23:15:32 -0000	1.2
+++ cmake-2.4.2-fedora.patch	27 Nov 2006 22:17:22 -0000	1.3
@@ -1,29 +1,3 @@
---- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
-+++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
-@@ -9,6 +9,7 @@
- 
- SET(RUBY_POSSIBLE_INCLUDE_PATHS
--  /usr/lib/ruby/1.8/i386-linux
-+  /usr/lib/ruby/*/i386-linux
-+  /usr/lib64/ruby/*/x86_64-linux
-   )
- 
- SET(RUBY_POSSIBLE_LIB_PATHS
-@@ -19,12 +20,12 @@
-   ${RUBY_POSSIBLE_INCLUDE_PATHS})
- 
- FIND_LIBRARY(RUBY_LIBRARY
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-   )
- 
- FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS
-   /usr/bin
-   /usr/local/bin
 --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
 +++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
 @@ -7,13 +7,11 @@



From fedora-extras-commits at redhat.com  Mon Nov 27 22:17:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:17:52 -0500
Subject: rpms/cmake/FC-5 cmake-2.4.2-fedora.patch,1.2,1.3
Message-ID: <200611272217.kARMHqr5014715@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14657/FC-5

Modified Files:
	cmake-2.4.2-fedora.patch 
Log Message:
Update patch for 2.4.4


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake-2.4.2-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:39 -0000	1.2
+++ cmake-2.4.2-fedora.patch	27 Nov 2006 22:17:22 -0000	1.3
@@ -1,29 +1,3 @@
---- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
-+++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
-@@ -9,6 +9,7 @@
- 
- SET(RUBY_POSSIBLE_INCLUDE_PATHS
--  /usr/lib/ruby/1.8/i386-linux
-+  /usr/lib/ruby/*/i386-linux
-+  /usr/lib64/ruby/*/x86_64-linux
-   )
- 
- SET(RUBY_POSSIBLE_LIB_PATHS
-@@ -19,12 +20,12 @@
-   ${RUBY_POSSIBLE_INCLUDE_PATHS})
- 
- FIND_LIBRARY(RUBY_LIBRARY
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-   )
- 
- FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS
-   /usr/bin
-   /usr/local/bin
 --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
 +++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
 @@ -7,13 +7,11 @@



From fedora-extras-commits at redhat.com  Mon Nov 27 22:18:18 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:18:18 -0500
Subject: rpms/libdvdread - New directory
Message-ID: <200611272218.kARMII2V014787@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14783/libdvdread

Log Message:
Directory /cvs/extras/rpms/libdvdread added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 22:18:23 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:18:23 -0500
Subject: rpms/libdvdread/devel - New directory
Message-ID: <200611272218.kARMINEh014802@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14783/libdvdread/devel

Log Message:
Directory /cvs/extras/rpms/libdvdread/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 22:18:41 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:18:41 -0500
Subject: rpms/libdvdread Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611272218.kARMIfBv014845@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14839

Added Files:
	Makefile import.log 
Log Message:
Setup of module libdvdread


--- NEW FILE Makefile ---
# Top level Makefile for module libdvdread
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  Mon Nov 27 22:18:46 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:18:46 -0500
Subject: rpms/libdvdread/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611272218.kARMIkR5014864@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14839/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libdvdread


--- 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 Nov 27 22:22:57 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:22:57 -0500
Subject: rpms/libdvdread import.log,1.1,1.2
Message-ID: <200611272222.kARMMv1k014980@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14941

Modified Files:
	import.log 
Log Message:
auto-import libdvdread-0.9.7-1 on branch devel from libdvdread-0.9.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 22:18:41 -0000	1.1
+++ import.log	27 Nov 2006 22:22:27 -0000	1.2
@@ -0,0 +1 @@
+libdvdread-0_9_7-1:HEAD:libdvdread-0.9.7-1.src.rpm:1164666338



From fedora-extras-commits at redhat.com  Mon Nov 27 22:22:58 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:22:58 -0500
Subject: rpms/libdvdread/devel libdvdread.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611272223.kARMMwcJ014984@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14941/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libdvdread.spec 
Log Message:
auto-import libdvdread-0.9.7-1 on branch devel from libdvdread-0.9.7-1.src.rpm


--- NEW FILE libdvdread.spec ---
Name:           libdvdread
Version:        0.9.7
Release:        1%{?dist}
Summary:        Simple foundation for reading DVD video disks

Group:          System Environment/Libraries
License:        GPL
URL:            http://www.dtek.chalmers.se/groups/dvd/
Source0:        http://www.dtek.chalmers.se/groups/dvd/dist/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
libdvdread provides a simple foundation for reading DVD video disks.
It provides the functionality that is required to access many DVDs.

%package        devel
Summary:        Development files for libdvdread
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
libdvdread provides a simple foundation for reading DVD video disks.
It provides the functionality that is required to access many DVDs.

This package contains development files for libdvdread.


%prep
%setup -q
for f in AUTHORS NEWS ; do
    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
done


%build
%configure --disable-dependency-tracking --disable-static --without-libdvdcss
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
%{_libdir}/libdvdread.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/dvdread
%{_libdir}/libdvdread.so


%changelog
* Fri Oct  6 2006 Dams  - 0.9.7-1
- Updated to 0.9.7

* Wed Sep 20 2006 Ville Skytt??  - 0.9.6-2
- Rebuild.

* Sun Jul 23 2006 Ville Skytt??  - 0.9.6-1
- 0.9.6.
- Specfile cleanup.

* Thu Mar 16 2006 Ville Skytt??  - 0.9.4-4
- Fix linking with libdl on x86_64.
- Don't ship static libs.
- Build with dependency tracking disabled.
- Convert specfile and docs to UTF-8.
- Improve package descriptions.

* Thu Mar 16 2006 Dams  - 0.9.4-3
- We BuildConflicting libdvdcss-devel at build time

* Mon Mar 13 2006 Thorsten Leemhuis  0.9.4-2 
- Drop Epoch completely

* Thu Mar 09 2006 Andreas Bierfert 
- switch to new release field
- drop Epoch

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Thu Apr  3 2003 Marius Johndal  0:0.9.4-0.fdr.1
- Initial Fedora RPM release.

* Mon Mar 31 2003 Matthias Saou 
- Rebuilt for Red Hat Linux 9.
- Exclude .la file.

* Sun Feb 16 2003 Matthias Saou 
- Update to 0.9.4.

* Thu Sep 26 2002 Matthias Saou 
- Updated to the latest cvs release.
- Rebuilt for Red Hat Linux 8.0.
- Updated URLs.

* Mon May 27 2002 Matthias Saou 
- Update to 0.9.3.

* Wed May 15 2002 Matthias Saou 
- Fixed the libdvdcss.so.0/1/2 problem again.

* Thu May  2 2002 Matthias Saou 
- Back to using libdvdcss 1.1.1, now it's all merged and fine.
- Rebuilt against Red Hat Linux 7.3.
- Added the %{?_smp_mflags} expansion.

* Sat Jan 12 2002 Matthias Saou 
- Reverted back to using libdvdcss 0.0.3.ogle3 since it works MUCH better
  than 1.0.x. Doh!

* Tue Nov 13 2001 Matthias Saou 
- Rebuilt against libdvdcss 1.0.0 (added a patch).

* Mon Oct 29 2001 Matthias Saou 
- Spec file cleanup and fixes.

* Thu Oct 11 2001 Martin Norb??ck 
- Updated to version 0.9.2

* Tue Sep 25 2001 Martin Norb??ck 
- Added small patch to fix the ldopen of libdvdcss

* Tue Sep 18 2001 Martin Norb??ck 
- Updated to version 0.9.1

* Fri Sep 14 2001 Martin Norb??ck 
- Split into normal and devel package

* Thu Sep 6 2001 Martin Norb??ck 
- Updated to version 0.9.0

* Tue Jul 03 2001 Martin Norb??ck 
- initial version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 22:18:46 -0000	1.1
+++ .cvsignore	27 Nov 2006 22:22:27 -0000	1.2
@@ -0,0 +1 @@
+libdvdread-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 22:18:46 -0000	1.1
+++ sources	27 Nov 2006 22:22:27 -0000	1.2
@@ -0,0 +1 @@
+078788c9241ae16763529e1235502337  libdvdread-0.9.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 22:29:23 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:29:23 -0500
Subject: owners owners.list,1.2023,1.2024
Message-ID: <200611272229.kARMTNG5015161@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15133

Modified Files:
	owners.list 
Log Message:
Add myself as libdvdread maintainer


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2023
retrieving revision 1.2024
diff -u -r1.2023 -r1.2024
--- owners.list	27 Nov 2006 20:09:57 -0000	1.2023
+++ owners.list	27 Nov 2006 22:28:53 -0000	1.2024
@@ -904,6 +904,7 @@
 Fedora Extras|libdap|The C++ DAP2 library from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|libdvdread|Simple foundation for reading DVD video disks|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libebml|The Extensible Binary Meta Language library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libedit|The NetBSD Editline library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libEMF|A library for generating Enhanced Metafiles|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 27 23:20:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 18:20:29 -0500
Subject: rpms/tracker/devel tracker-desktop.patch, 1.1, 1.2 tracker.spec, 1.3,
	1.4
Message-ID: <200611272320.kARNKTD3018661@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18641

Modified Files:
	tracker-desktop.patch tracker.spec 
Log Message:
* Mon Nov 27 2006 Deji Akingunola  - 0.5.2-2
- Apply patch on Makefile.am instead of Makefile.in


tracker-desktop.patch:

Index: tracker-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracker-desktop.patch	21 Nov 2006 07:43:59 -0000	1.1
+++ tracker-desktop.patch	27 Nov 2006 23:19:59 -0000	1.2
@@ -1,27 +1,16 @@
---- Makefile.in	2006-11-20 13:34:48.000000000 -0500
-+++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
-@@ -66,8 +66,9 @@
-     *) f=$$p;; \
-   esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
- pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-+xdgconfigDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(pkgconfig_DATA)
- ETAGS = etags
- CTAGS = ctags
-@@ -299,7 +300,9 @@
- target_alias = @target_alias@
+--- Makefile.am	2006-11-20 23:57:45.000000000 -0500
++++ Makefile.am.new	2006-11-20 23:58:00.000000000 -0500
+@@ -1,7 +1,9 @@
  SUBDIRS = data src filters thumbnailers docs po
+ 
  pkgconfigdir = $(libdir)/pkgconfig
 +xdgconfigdir = $(sysconfdir)/xdg/autostart
  pkgconfig_DATA = tracker.pc
-+xdgconfig_DATA= trackerd.desktop
++xdgconfig_DATA = trackerd.desktop
+ 
  debian_files = \
  	debian/changelog \
- 	debian/compat \
-@@ -331,12 +334,11 @@
+@@ -34,12 +36,11 @@
  
  EXTRA_DIST = \
  	$(pkgconfig_DATA) \
@@ -35,54 +24,6 @@
  	intltool-extract.in \
  	intltool-merge.in \
  	intltool-update.in \
-@@ -422,6 +424,15 @@
- 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- 	done
-+install-xdgconfigDATA: $(xdgconfig_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
-+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
-+	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
-+	done
- 
- uninstall-pkgconfigDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -430,6 +441,13 @@
- 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- 	done
-+uninstall-xdgconfigDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
-+	done
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -710,7 +728,7 @@
- all-am: Makefile $(DATA) config.h
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-+	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-recursive
-@@ -758,7 +776,7 @@
- 
- info-am:
- 
--install-data-am: install-pkgconfigDATA
-+install-data-am: install-pkgconfigDATA install-xdgconfigDATA
- 
- install-exec-am:
- 
 --- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
 +++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
 @@ -8,5 +8,8 @@


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tracker.spec	21 Nov 2006 07:43:59 -0000	1.3
+++ tracker.spec	27 Nov 2006 23:19:59 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
@@ -17,6 +17,8 @@
 %else
 BuildRequires: dbus-devel, dbus-glib
 %endif
+#Temporarily
+BuildRequires: automake autoconf
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -48,6 +50,9 @@
 %patch -p0 -b .desktop
 
 %build
+aclocal
+automake
+autoconf
 %if "%fedora" >= "6"
 %configure --disable-static --enable-external-sqlite
 %else
@@ -103,6 +108,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 27 2006 Deji Akingunola  - 0.5.2-2
+- Apply patch on Makefile.am instead of Makefile.in
+
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
 - Update to 0.5.2
 



From fedora-extras-commits at redhat.com  Mon Nov 27 23:23:45 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 18:23:45 -0500
Subject: rpms/gparted/devel gparted-parted-check.patch, NONE,
	1.1 gparted.spec, 1.16, 1.17
Message-ID: <200611272323.kARNNjRJ018786@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18734

Modified Files:
	gparted.spec 
Added Files:
	gparted-parted-check.patch 
Log Message:
* Mon Nov 27 2006 Deji Akingunola  - 0.3.1-4
- Complete fix for parted check and apply patch on configure.in


gparted-parted-check.patch:

--- NEW FILE gparted-parted-check.patch ---
--- configure.in	2006/09/11 09:46:42	1.62
+++ configure.in	2006/09/14 20:34:49	1.63
@@ -33,7 +33,8 @@
 AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
 
 dnl libparted
-AC_MSG_CHECKING(for libparted >= 1.7.1)
+LIBPARTED_VERSION=1.7.1
+AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
 LDFLAGS=-lparted
 AC_TRY_RUN(
 #include 
@@ -41,16 +42,28 @@
 
 int main ()
 {
+	int min_major ;
+	int min_minor ;
+	int min_micro ;
 	int major ;
 	int minor ;
 	int micro ;
 
-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
-		printf( "Found libparted %s\t", ped_get_version() ) ;
+	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
+	{
+		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+		{
+			printf( "Found libparted %s\t", ped_get_version() ) ;
+
+			return ! ((major > min_major) ||
+           			 ((major == min_major) && (minor > min_minor)) ||
+           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
+		}
+	}
 
-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
+	return 1 ;
 }
-,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= 1.7.1) )
+,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= $LIBPARTED_VERSION) )
 
 
 dnl GTKMM


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gparted.spec	22 Nov 2006 08:03:01 -0000	1.16
+++ gparted.spec	27 Nov 2006 23:23:15 -0000	1.17
@@ -1,16 +1,18 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gparted-configure.patch
+Patch0: gparted-parted-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires: desktop-file-utils
+#Temporarily
+BuildRequires: automake autoconf
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -21,9 +23,12 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .config
+%patch0 -p0 -b .parted
 
 %build
+aclocal
+automake
+autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -79,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 27 2006 Deji Akingunola  - 0.3.1-4
+- Complete fix for parted check and apply patch on configure.in
+
 * Wed Nov 23 2006 Deji Akingunola  - 0.3.1-3
 - Backport a fix from cvs to properly check for libparted version
 



From fedora-extras-commits at redhat.com  Mon Nov 27 23:26:21 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 27 Nov 2006 18:26:21 -0500
Subject: rpms/smb4k/FC-5 .cvsignore, 1.11, 1.12 smb4k.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <200611272326.kARNQLKP018871@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Nov 2006 21:59:36 -0000	1.11
+++ .cvsignore	27 Nov 2006 23:25:51 -0000	1.12
@@ -1 +1 @@
-smb4k-0.7.4.tar.bz2
+smb4k-0.7.5.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smb4k.spec	14 Nov 2006 21:59:36 -0000	1.14
+++ smb4k.spec	27 Nov 2006 23:25:51 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.4
+Version:	0.7.5
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.7.5-1
+- Updated to version 0.7.5
+
 * Tue Nov 14 2006 Marcin Garski  0.7.4-1
 - Updated to version 0.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Nov 2006 21:59:36 -0000	1.11
+++ sources	27 Nov 2006 23:25:51 -0000	1.12
@@ -1 +1 @@
-69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2
+020d1d034e1647df90c2ab9b81b18f5a  smb4k-0.7.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 23:28:14 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 27 Nov 2006 18:28:14 -0500
Subject: rpms/smb4k/FC-6 .cvsignore, 1.11, 1.12 smb4k.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <200611272328.kARNSEbR018948@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18925

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Nov 2006 21:32:02 -0000	1.11
+++ .cvsignore	27 Nov 2006 23:27:44 -0000	1.12
@@ -1 +1 @@
-smb4k-0.7.4.tar.bz2
+smb4k-0.7.5.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/smb4k.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smb4k.spec	14 Nov 2006 21:32:02 -0000	1.15
+++ smb4k.spec	27 Nov 2006 23:27:44 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.4
+Version:	0.7.5
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.7.5-1
+- Updated to version 0.7.5
+
 * Tue Nov 14 2006 Marcin Garski  0.7.4-1
 - Updated to version 0.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Nov 2006 21:32:02 -0000	1.11
+++ sources	27 Nov 2006 23:27:44 -0000	1.12
@@ -1 +1 @@
-69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2
+020d1d034e1647df90c2ab9b81b18f5a  smb4k-0.7.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 23:29:26 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 27 Nov 2006 18:29:26 -0500
Subject: rpms/smb4k/devel .cvsignore, 1.11, 1.12 smb4k.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <200611272329.kARNTQYi019023@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19002

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Nov 2006 22:00:45 -0000	1.11
+++ .cvsignore	27 Nov 2006 23:28:56 -0000	1.12
@@ -1 +1 @@
-smb4k-0.7.4.tar.bz2
+smb4k-0.7.5.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smb4k.spec	14 Nov 2006 22:00:45 -0000	1.15
+++ smb4k.spec	27 Nov 2006 23:28:56 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.4
+Version:	0.7.5
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.7.5-1
+- Updated to version 0.7.5
+
 * Tue Nov 14 2006 Marcin Garski  0.7.4-1
 - Updated to version 0.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Nov 2006 22:00:45 -0000	1.11
+++ sources	27 Nov 2006 23:28:56 -0000	1.12
@@ -1 +1 @@
-69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2
+020d1d034e1647df90c2ab9b81b18f5a  smb4k-0.7.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 23:46:21 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 18:46:21 -0500
Subject: rpms/gparted/devel gparted.spec,1.17,1.18
Message-ID: <200611272346.kARNkLjh019174@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19159

Modified Files:
	gparted.spec 
Log Message:
* Mon Nov 27 2006 Deji Akingunola  - 0.3.1-5
- Add more BRs



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gparted.spec	27 Nov 2006 23:23:15 -0000	1.17
+++ gparted.spec	27 Nov 2006 23:45:51 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
@@ -12,7 +12,7 @@
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires: desktop-file-utils
 #Temporarily
-BuildRequires: automake autoconf
+BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -84,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 27 2006 Deji Akingunola  - 0.3.1-5
+- Add more BRs
+
 * Mon Nov 27 2006 Deji Akingunola  - 0.3.1-4
 - Complete fix for parted check and apply patch on configure.in
 



From fedora-extras-commits at redhat.com  Mon Nov 27 23:52:20 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 18:52:20 -0500
Subject: extras-repoclosure rc-report.py,1.25,1.26
Message-ID: <200611272352.kARNqK8M019258@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243

Modified Files:
	rc-report.py 
Log Message:
hack: reformat and mail less often


Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rc-report.py	30 Sep 2006 19:24:11 -0000	1.25
+++ rc-report.py	27 Nov 2006 23:52:20 -0000	1.26
@@ -3,21 +3,18 @@
 
 import commands
 import datetime, time
-import os, sys
+import os, sys, stat, shutil
 import pickle
 import re
 import smtplib
 
-import sys
-sys.path.append('/srv/extras-push/work/extras-repoclosure')
 from PackageOwners import PackageOwners
+
 sys.path.append('/srv/extras-push/work/buildsys-utils/pushscript')
 import Utils, RepoSupport
-
 cfg = Utils.load_config_module('Extras')
 
 domail = True
-mailsummary = True
 combinedreport = False
 
 maxmailsize = 39*1024
@@ -108,7 +105,8 @@
         if d.days >= 2:
             return '(%s days)' % d.days
         return ''
-    
+
+
 def mail(smtp, fromaddr, toaddrs, replytoaddr, subject, body):
     from email.Header import Header
     from email.MIMEText import MIMEText
@@ -184,6 +182,7 @@
 #owners.FromCVS(workdir=ownersworkdir)
 if not owners.FromURL():
     sys.exit(1)
+reportssummary = ''
 summail = ''
 pkgbyowner = {}  # map, pkgbyowner[email], list of pkgids for all owner's broken packages
 summary = {}  # map of maps, summary[repoid][pkgid], unresolved deps line by line
@@ -207,7 +206,6 @@
 
     if not combinedreport:
         mailsubject = subject + ' ' + release + ' - ' + datestring
-        summail = ''
         pkgbyowner = {}
         summary = {}
         report = {}
@@ -255,7 +253,7 @@
             if ownedby == '':
                 ownedby = 'UNKNOWN OWNER'
                 x = 'ERROR: %s not in owners.list\nERROR: source rpm is %s' % ( name, srcrpm )
-                summail += x + '\n\n'
+                reportssummary += x + '\n\n'
             # name-EVR.arch
             pkgid = w[1]+'-'+w[3]
             pkgid2 = w[1]+' - '+w[3]
@@ -285,11 +283,18 @@
     history.Save()
 
 
-# Add list of broken packages sorted by owner to beginning of summary mail.
+# Create summary mail text.
+sep = '='*70+'\n'
+for toaddr,body in report.iteritems():
+    reportssummary += 'New report for: %s\n\n%s\n' % ( toaddr.replace('@',' AT '), body)
+    reportssummary += sep
+summail += reportssummary
+
+# Add list of broken packages sorted by owner.
 ownerlist = pkgbyowner.keys()
 ownerlist.sort()
 if len(ownerlist):
-    summail += ('Summary of broken packages (by owner):\n') + '-'*70+'\n'
+    summail += ('Summary of broken packages (by owner):\n') + '\n'
 for owner in ownerlist:
     summail += '    '+owner.replace('@',' AT ')+'\n'
     pkgs = pkgbyowner[owner]
@@ -306,19 +311,19 @@
 allrepoids = []
 for release in rs.AllReleases():
     allrepoids += rs.GenerateRepoIds(release)
-
 # Add details about broken packages, sorted by repository id.
 repoids = summary.keys()
 for repoid in allrepoids:
     if repoid not in repoids:
         continue
-    summail += ('Broken packages in %s:\n' % repoid) + '-'*70+'\n'
+    summail += sep+('Broken packages in %s:\n\n' % repoid)
     pkgs = summary[repoid].keys()
     pkgs.sort()
     for pkg in pkgs:
         for dep in summary[repoid][pkg]:
             summail += ( '    %s  requires  %s\n' % (pkg,dep) )
-    summail += '\n'
+    summail += '\n\n'
+
 
 # Mail init.
 if domail:
@@ -333,19 +338,32 @@
 
 # Send mail to every package owner with broken package dependencies.
 for toaddr,body in report.iteritems():
-    x = '='*70
-    summail += x+'\n'
-    x = 'New report for: %s\n\n%s' % ( toaddr.replace('@',' AT '), body)
-    summail += x
-
     mailtext = 'This is an automated mail created by an experimental script.\nYour following packages in the repository contain broken dependencies:\n\n'
     mailtext += body
     if domail and toaddr != 'UNKNOWN OWNER':
         mailsplit( srv, fromaddr, toaddr, replytoaddr, mailsubject, mailtext )
 
+
+# Decrease the "spam" a bit. Mail a summary (even if there are no new
+# reports) every 7 days.
+timestampfile = os.path.join(ownersworkdir,'lastsummary.timestamp')
+try:
+    timestamp = os.stat(timestampfile).st_mtime
+except OSError:
+    timestamp = 0
+    shutil.copy('/dev/null',timestampfile)
+if len(reportssummary) or (datetime.date.fromtimestamp(timestamp)+datetime.timedelta(days=7) < today):
+    shutil.copy('/dev/null',timestampfile)
+    mailsummary = True
+else:
+    mailsummary = False
+
+# Send summary to mailing-list
+# if there are new reports.
+# TODO: weekly summary?
 if domail and mailsummary and (len(summail) or mailsubject.find('development') >= 0):  # avoid sending empty reports for stable/old branches
     if not len(summail):
-        summail = 'no broken packages'
+        summail = 'no broken dependencies'
     toaddr = replytoaddr  # mail summary to list
     mailsplit( srv, fromaddr, toaddr, '', sumsubject, summail )
 



From fedora-extras-commits at redhat.com  Mon Nov 27 23:55:59 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 18:55:59 -0500
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.16,1.17
Message-ID: <200611272356.kARNtxWl019279@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19264

Modified Files:
	Config_Extras.py 
Log Message:
move repoclosure out of path


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Config_Extras.py	23 Nov 2006 20:24:03 -0000	1.16
+++ Config_Extras.py	27 Nov 2006 23:55:59 -0000	1.17
@@ -139,7 +139,7 @@
 
 #post_cmds = []
 post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
-             'nohup rc-run-all.py &'
+             'nohup /srv/rpmbuild/extras-repoclosure/rc-run-all.py &'
              ]
 
 # Build report.



From fedora-extras-commits at redhat.com  Tue Nov 28 00:01:27 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:01:27 -0500
Subject: extras-repoclosure rc-run.py,1.18,1.19
Message-ID: <200611280001.kAS01RKP022367@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22352

Modified Files:
	rc-run.py 
Log Message:
move repoclosure out of path


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rc-run.py	29 Sep 2006 21:02:10 -0000	1.18
+++ rc-run.py	28 Nov 2006 00:01:26 -0000	1.19
@@ -33,7 +33,7 @@
         # -n, --newest : yum-utils 0.5
         # -d : modified version only
         Utils.fix_mdcache_access(workdir,cachedir)
-        rc = os.system('rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
+        rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
         Utils.fix_mdcache_access(workdir,cachedir)
         if rc:
             return False
@@ -89,8 +89,7 @@
         sys.exit(22)
     releases = [release]
 
-conffile = rs.GenerateConfig(rs.AllReleases(),
-                             cachedir='/srv/rpmbuild/extras-repoclosure/mdcache')
+conffile = rs.GenerateConfig(rs.AllReleases(),cachedir)
 
 goodlogs = []
 badlogs = []
@@ -113,10 +112,10 @@
     args = ''
     for (release,logfilename) in goodlogs:
         args += ('%s %s ' % (release,logfilename))
-    rc = os.system('rc-report.py %s' % args)
+    rc = os.system('./rc-report.py %s' % args)
 else:
     for (release,logfilename) in goodlogs:
-        rc = os.system('rc-report.py %s %s' % (release,logfilename))
+        rc = os.system('./rc-report.py %s %s' % (release,logfilename))
 
 fcntl.flock(f, fcntl.LOCK_UN)
 f.close()



From fedora-extras-commits at redhat.com  Tue Nov 28 00:07:19 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 19:07:19 -0500
Subject: rpms/tracker/devel tracker.spec,1.4,1.5
Message-ID: <200611280007.kAS07JcJ022436@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22421

Modified Files:
	tracker.spec 
Log Message:
Add libtool to BR



Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tracker.spec	27 Nov 2006 23:19:59 -0000	1.4
+++ tracker.spec	28 Nov 2006 00:06:49 -0000	1.5
@@ -18,7 +18,7 @@
 BuildRequires: dbus-devel, dbus-glib
 %endif
 #Temporarily
-BuildRequires: automake autoconf
+BuildRequires: automake autoconf libtool
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -110,6 +110,7 @@
 %changelog
 * Mon Nov 27 2006 Deji Akingunola  - 0.5.2-2
 - Apply patch on Makefile.am instead of Makefile.in
+- Add libtool to BR
 
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
 - Update to 0.5.2



From fedora-extras-commits at redhat.com  Tue Nov 28 00:07:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:07:46 -0500
Subject: extras-repoclosure rc-run.py,1.19,1.20
Message-ID: <200611280007.kAS07kfl022490@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22475

Modified Files:
	rc-run.py 
Log Message:
move repoclosure out of path


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rc-run.py	28 Nov 2006 00:01:26 -0000	1.19
+++ rc-run.py	28 Nov 2006 00:07:46 -0000	1.20
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 # -*- mode: Python; indent-tabs-mode: nil; -*-
 
+# Fedora Extras repoclosure
 # If executed as "rc-run-all.py" it processes all releases.
 
 import fcntl, os, sys
@@ -11,12 +12,8 @@
 workdir = '/srv/rpmbuild/extras-repoclosure'
 cachedir = '/srv/rpmbuild/extras-repoclosure/mdcache'
 
-import sys
-sys.path.append('/srv/extras-push/work/extras-repoclosure')
-from RepoSupport import RepoSupport
-
 sys.path.append('/srv/extras-push/work/buildsys-utils/pushscript')
-import Utils
+import Utils, RepoSupport
 
 
 def makereport():
@@ -27,8 +24,8 @@
     for arch in rs.ReleaseArchsDict()[release]:
         print '%s (%s)' % (release,arch)
         rcargs = ('-a %s ' % rs.targetarchs[arch])
-        for r in rs.ReleaseRepoDict()[release]:
-            repoid = '%s-%s-%s' % (r,release,arch)
+        for r in rs.ReleaseRepoList(release):
+            repoid = rs.RepoId(r,release,arch)
             rcargs += ('-r %s ' % repoid)
         # -n, --newest : yum-utils 0.5
         # -d : modified version only
@@ -71,7 +68,7 @@
     print 'ERROR: %s: %s' % (strerr,lockfilename)
     sys.exit(11)
 
-rs = RepoSupport()
+rs = RepoSupport.RepoSupport(cfg)
 releases = []
 combinedreport = False
 
@@ -117,6 +114,7 @@
     for (release,logfilename) in goodlogs:
         rc = os.system('./rc-report.py %s %s' % (release,logfilename))
 
+os.remove(conffile)
 fcntl.flock(f, fcntl.LOCK_UN)
 f.close()
 os.chdir(cwd)



From fedora-extras-commits at redhat.com  Tue Nov 28 00:08:22 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:08:22 -0500
Subject: extras-buildsys/utils rc-run.py,1.2,NONE
Message-ID: <200611280008.kAS08MxA022518@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22505

Removed Files:
	rc-run.py 
Log Message:
move repoclosure out of path


--- rc-run.py DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 00:09:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 19:09:26 -0500
Subject: rpms/tracker/devel tracker.spec,1.5,1.6
Message-ID: <200611280009.kAS09Q18022555@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22528

Modified Files:
	tracker.spec 
Log Message:
Bump



Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tracker.spec	28 Nov 2006 00:06:49 -0000	1.5
+++ tracker.spec	28 Nov 2006 00:08:56 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
 Version: 0.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/



From fedora-extras-commits at redhat.com  Tue Nov 28 00:11:38 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:11:38 -0500
Subject: extras-repoclosure rc-run.py,1.20,1.21
Message-ID: <200611280011.kAS0BcpU022614@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22601

Modified Files:
	rc-run.py 
Log Message:
this is the right work dir


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rc-run.py	28 Nov 2006 00:07:46 -0000	1.20
+++ rc-run.py	28 Nov 2006 00:11:37 -0000	1.21
@@ -9,8 +9,8 @@
 import datetime, time
 import tempfile
 
-workdir = '/srv/rpmbuild/extras-repoclosure'
-cachedir = '/srv/rpmbuild/extras-repoclosure/mdcache'
+workdir = '/srv/extras-push/work/extras-repoclosure'
+cachedir = '/srv/extras-push/work/extras-repoclosure/mdcache'
 
 sys.path.append('/srv/extras-push/work/buildsys-utils/pushscript')
 import Utils, RepoSupport



From fedora-extras-commits at redhat.com  Tue Nov 28 00:15:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:15:12 -0500
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.17,1.18
Message-ID: <200611280015.kAS0FCgR022652@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22637

Modified Files:
	Config_Extras.py 
Log Message:
this is the right work dir


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Config_Extras.py	27 Nov 2006 23:55:59 -0000	1.17
+++ Config_Extras.py	28 Nov 2006 00:15:12 -0000	1.18
@@ -139,7 +139,7 @@
 
 #post_cmds = []
 post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
-             'nohup /srv/rpmbuild/extras-repoclosure/rc-run-all.py &'
+             'nohup /srv/extras-push/work/extras-repoclosure/rc-run-all.py &'
              ]
 
 # Build report.



From fedora-extras-commits at redhat.com  Tue Nov 28 00:19:02 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:19:02 -0500
Subject: extras-buildsys/utils/pushscript README,1.8,1.9
Message-ID: <200611280019.kAS0J2jL022699@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22684

Modified Files:
	README 
Log Message:
move repoclosure out of path


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- README	9 Nov 2006 10:33:47 -0000	1.8
+++ README	28 Nov 2006 00:19:01 -0000	1.9
@@ -21,11 +21,6 @@
   extras-push          -> pushscript/extras-push
   extras-sync          -> pushscript/extras-sync
 
-  rc-modified          -> extras-repoclosure/rc-modified
-  rc-report.py         -> extras-repoclosure/rc-report.py
-  rc-run.py            -> extras-buildsys/utils/rc-run.py
-  rc-run-all.py        -> rc-run.py
-
   upgradecheck.py
 
 Optional:



From fedora-extras-commits at redhat.com  Tue Nov 28 03:19:54 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 27 Nov 2006 22:19:54 -0500
Subject: rpms/ssmtp/devel ssmtp-defaultvalues.patch, NONE, 1.1 ssmtp.spec,
	1.1, 1.2
Message-ID: <200611280319.kAS3Js1C032663@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32615

Modified Files:
	ssmtp.spec 
Added Files:
	ssmtp-defaultvalues.patch 
Log Message:


ssmtp-defaultvalues.patch:

--- NEW FILE ssmtp-defaultvalues.patch ---
--- ssmtp-2.61/ssmtp.conf~	2006-11-26 11:44:21.000000000 +0200
+++ ssmtp-2.61/ssmtp.conf	2006-11-26 11:46:39.000000000 +0200
@@ -1,6 +1,9 @@
 #
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #
+# See the ssmtp.conf(5) man page for a more verbose explanation of the
+# available options.
+#
 
 # The person who gets all mail for userids < 500
 # Make this empty to disable rewriting.
@@ -19,10 +22,10 @@
 # mailhub=mail.your.domain:465
 
 # Where will the mail seem to come from?
-rewriteDomain=
+#RewriteDomain=
 
 # The full hostname
-hostname=_HOSTNAME_
+#Hostname=
 
 # Set this to never rewrite the "From:" line (unless not given) and to
 # use that address in the "from line" of the envelope.


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp.spec	12 Nov 2006 23:11:51 -0000	1.1
+++ ssmtp.spec	28 Nov 2006 03:19:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPL
@@ -9,6 +9,7 @@
 #Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
 Patch0:		%{name}-%{version}.6.patch
 Patch1:		%{name}-2.50.3-maxsysuid.patch
+Patch2:		%{name}-defaultvalues.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
@@ -30,6 +31,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -103,6 +105,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 lonely wolf  2.61-9
+- included Ville Skytta's patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
+
 * Mon Oct 10 2006 lonely wolf  2.61-8
 - enabled IPv6 (just added this option to %%configure, the capability was already there)
 - removed yet another man page from %%Provides



From fedora-extras-commits at redhat.com  Tue Nov 28 03:37:19 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 27 Nov 2006 22:37:19 -0500
Subject: rpms/ssmtp/devel ssmtp.spec,1.2,1.3
Message-ID: <200611280337.kAS3bJTm000386@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv367

Modified Files:
	ssmtp.spec 
Log Message:
includes patch for Bugzilla Bug 217270


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ssmtp.spec	28 Nov 2006 03:19:23 -0000	1.2
+++ ssmtp.spec	28 Nov 2006 03:36:49 -0000	1.3
@@ -106,7 +106,7 @@
 
 %changelog
 * Tue Nov 28 2006 lonely wolf  2.61-9
-- included Ville Skytta's patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
+- included Ville Skytt??'s patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
 
 * Mon Oct 10 2006 lonely wolf  2.61-8
 - enabled IPv6 (just added this option to %%configure, the capability was already there)



From fedora-extras-commits at redhat.com  Tue Nov 28 03:45:10 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 27 Nov 2006 22:45:10 -0500
Subject: rpms/ssmtp/devel ssmtp.spec,1.3,1.4
Message-ID: <200611280345.kAS3jAJK000474@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458

Modified Files:
	ssmtp.spec 
Log Message:
typo fix


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ssmtp.spec	28 Nov 2006 03:36:49 -0000	1.3
+++ ssmtp.spec	28 Nov 2006 03:44:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPL
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 lonely wolf  2.61-10
+- fix silly typo in changelog
+
 * Tue Nov 28 2006 lonely wolf  2.61-9
 - included Ville Skytt??'s patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 04:35:19 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:35:19 -0500
Subject: rpms/openvrml/FC-6 openvrml.spec,1.1,1.2
Message-ID: <200611280435.kAS4ZJMZ003902@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868/FC-6

Modified Files:
	openvrml.spec 
Log Message:
Removed -fvisibility=hidden from CXXFLAGS.  Mozilla development headers are not wise to gcc symbol visibility mojo and as a result NPAPI entry points wound up not visible.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/openvrml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvrml.spec	21 Nov 2006 14:53:10 -0000	1.1
+++ openvrml.spec	28 Nov 2006 04:34:49 -0000	1.2
@@ -83,7 +83,7 @@
 %patch -p1
 
 %build
-%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -150,6 +150,11 @@
 
 
 %changelog
+* Mon Nov 27 2006  Braden McDaniel   - 0.16.1-5
+- openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
+  development headers are not wise to gcc symbol visibility mojo and as
+  a result NPAPI entry points wound up not visible.
+
 * Wed Nov 15 2006  Braden McDaniel   - 0.16.1-4
 - Patch openvrml-gtkplug.info.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 04:35:20 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:35:20 -0500
Subject: rpms/openvrml/devel openvrml.spec,1.1,1.2
Message-ID: <200611280435.kAS4ZKam003905@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868/devel

Modified Files:
	openvrml.spec 
Log Message:
Removed -fvisibility=hidden from CXXFLAGS.  Mozilla development headers are not wise to gcc symbol visibility mojo and as a result NPAPI entry points wound up not visible.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvrml.spec	21 Nov 2006 14:53:10 -0000	1.1
+++ openvrml.spec	28 Nov 2006 04:34:50 -0000	1.2
@@ -83,7 +83,7 @@
 %patch -p1
 
 %build
-%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -150,6 +150,11 @@
 
 
 %changelog
+* Mon Nov 27 2006  Braden McDaniel   - 0.16.1-5
+- openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
+  development headers are not wise to gcc symbol visibility mojo and as
+  a result NPAPI entry points wound up not visible.
+
 * Wed Nov 15 2006  Braden McDaniel   - 0.16.1-4
 - Patch openvrml-gtkplug.info.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 04:39:16 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:39:16 -0500
Subject: rpms/openvrml/FC-6 openvrml.spec,1.2,1.3
Message-ID: <200611280439.kAS4dGuE003975@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3945/FC-6

Modified Files:
	openvrml.spec 
Log Message:
Incremented release number.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/openvrml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openvrml.spec	28 Nov 2006 04:34:49 -0000	1.2
+++ openvrml.spec	28 Nov 2006 04:38:46 -0000	1.3
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.16.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPL
 Group:          System Environment/Libraries



From fedora-extras-commits at redhat.com  Tue Nov 28 04:39:16 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:39:16 -0500
Subject: rpms/openvrml/devel openvrml.spec,1.2,1.3
Message-ID: <200611280439.kAS4dGqN003978@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3945/devel

Modified Files:
	openvrml.spec 
Log Message:
Incremented release number.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openvrml.spec	28 Nov 2006 04:34:50 -0000	1.2
+++ openvrml.spec	28 Nov 2006 04:38:46 -0000	1.3
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.16.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPL
 Group:          System Environment/Libraries



From fedora-extras-commits at redhat.com  Tue Nov 28 04:44:09 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:44:09 -0500
Subject: rpms/openvrml/devel openvrml.spec,1.3,1.4
Message-ID: <200611280444.kAS4i9ZF004049@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4034

Modified Files:
	openvrml.spec 
Log Message:
Require firefox 2.0.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openvrml.spec	28 Nov 2006 04:38:46 -0000	1.3
+++ openvrml.spec	28 Nov 2006 04:43:39 -0000	1.4
@@ -19,7 +19,7 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  gtk2-devel
-Requires:       firefox = 1.5.0.8
+Requires:       firefox = 2.0
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -36,7 +36,7 @@
 Requires:       libjpeg-devel
 Requires:       fontconfig-devel
 Requires:       freetype-devel
-Requires:       firefox-devel = 1.5.0.8
+Requires:       firefox-devel = 2.0
 %description devel
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
@@ -154,6 +154,8 @@
 - openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
   development headers are not wise to gcc symbol visibility mojo and as
   a result NPAPI entry points wound up not visible.
+- openvrml: Require firefox 2.0.
+- openvrml-devel: Require firefox-devel 2.0.
 
 * Wed Nov 15 2006  Braden McDaniel   - 0.16.1-4
 - Patch openvrml-gtkplug.info.



From fedora-extras-commits at redhat.com  Tue Nov 28 05:25:55 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 28 Nov 2006 00:25:55 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.13,1.14
Message-ID: <200611280525.kAS5PtnQ007330@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7315

Modified Files:
	xfce4-session.spec 
Log Message:
Add dbus-devel and GConf2-devel to BuildRequires, fixes bug #217082



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-session.spec	11 Nov 2006 07:50:49 -0000	1.13
+++ xfce4-session.spec	28 Nov 2006 05:25:25 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.3.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-session-4.3.99.2.tar.bz2
@@ -19,6 +19,7 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
+BuildRequires: dbus-devel GConf2-devel
 Requires: fortune-mod
 
 %description
@@ -44,7 +45,7 @@
 %setup -q
 
 %build
-%configure
+%configure --enable-gnome --enable-final
 
 make %{?_smp_mflags}
 
@@ -113,6 +114,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Mon Nov 27 2006 Kevin Fenzi  - 4.3.99.2-2
+- Add dbus-devel and GConf2-devel to BuildRequires, fixes bug #217082
+
 * Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
 - Update to 4.3.99.2
 



From fedora-extras-commits at redhat.com  Tue Nov 28 05:45:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 28 Nov 2006 00:45:34 -0500
Subject: rpms/xfce4-session/FC-6 xfce4-session.spec,1.13,1.14
Message-ID: <200611280545.kAS5jYWl007450@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7435

Modified Files:
	xfce4-session.spec 
Log Message:
Add dbus-devel and GConf2-devel to BuildRequires, fixes bug #217082



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-6/xfce4-session.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-session.spec	11 Nov 2006 19:35:04 -0000	1.13
+++ xfce4-session.spec	28 Nov 2006 05:45:04 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.3.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-session-4.3.99.2.tar.bz2
@@ -19,6 +19,7 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
+BuildRequires: dbus-devel GConf2-devel
 Requires: fortune-mod
 
 %description
@@ -44,7 +45,7 @@
 %setup -q
 
 %build
-%configure
+%configure --enable-gnome --enable-final
 
 make %{?_smp_mflags}
 
@@ -113,6 +114,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Mon Nov 27 2006 Kevin Fenzi  - 4.3.99.2-2
+- Add dbus-devel and GConf2-devel to BuildRequires, fixes bug #217082
+
 * Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
 - Update to 4.3.99.2
 



From fedora-extras-commits at redhat.com  Tue Nov 28 05:50:28 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Tue, 28 Nov 2006 00:50:28 -0500
Subject: rpms/zope/FC-5 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 zope.spec,
	1.24, 1.25
Message-ID: <200611280550.kAS5oSvv007602@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7545

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
updated to 2.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Aug 2006 11:41:40 -0000	1.13
+++ .cvsignore	28 Nov 2006 05:49:58 -0000	1.14
@@ -1 +1 @@
-Zope-2.9.4-final.tgz
+Zope-2.9.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Aug 2006 11:41:40 -0000	1.13
+++ sources	28 Nov 2006 05:49:58 -0000	1.14
@@ -1 +1 @@
-7d7ffe62eabc84d0c438e450e344c29f  Zope-2.9.4-final.tgz
+17cd06a6974dbdd0e4982a343b79fb00  Zope-2.9.5-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-5/zope.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- zope.spec	30 Aug 2006 11:58:35 -0000	1.24
+++ zope.spec	28 Nov 2006 05:49:58 -0000	1.25
@@ -12,13 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.4
-Release: 2%{?dist}
+Version: 2.9.5
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,7 +27,6 @@
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
-Patch1:  zope-2.8.3-pythonwarning.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -46,18 +44,12 @@
 After starting Zope, you can access it by pointing your browser to
 http://localhost:8080
 
-WARNING: this zope package has been built on python 2.4.X, which is not
-supported ! Do not file bugreports or ask for support on zope.org if you
-choose to use this package.
-
 
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
-# Warning on the default index_html about python 2.4 & zope 2.8
-#%patch1 -p1 -b .pythonwarning
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -120,6 +112,9 @@
 # included in %%doc
 rm -rf $RPM_BUILD_ROOT%{zope_home}/doc
 
+#now included with plone 2.5.1 version 1.3.7
+rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+
 # write version.txt
 echo "Zope %{version}-%{release}" > \
     "$RPM_BUILD_ROOT%{software_home}/version.txt"
@@ -187,6 +182,11 @@
 
 
 %changelog
+* Mon Nov 27 2006 Jonathan Steffan  2.9.5-1
+- Updated to 2.9.5
+- Removed Five from zope package (plone 2.5.1 now provides the needed
+  version.)
+
 * Wed Aug 30 2006 Aurelien Bompard  2.9.4-2
 - fix path on x86_64
 



From fedora-extras-commits at redhat.com  Tue Nov 28 06:08:52 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Tue, 28 Nov 2006 01:08:52 -0500
Subject: rpms/plone/FC-5 plone.spec, 1.20, 1.21 Plone-2.5-atxmlperms.patch,
	1.1, NONE
Message-ID: <200611280608.kAS68qR4010796@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10777

Modified Files:
	plone.spec 
Removed Files:
	Plone-2.5-atxmlperms.patch 
Log Message:
Updated so plone now provides Five



Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plone.spec	4 Nov 2006 09:14:18 -0000	1.20
+++ plone.spec	28 Nov 2006 06:08:22 -0000	1.21
@@ -6,15 +6,13 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
-#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 Source10:       http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz
-#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,18 +43,13 @@
 cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
 #rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
 
-# Included in Zope 2.9
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+# Plone now provides Five
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
 
 # Avoid conflicts, put those in %%doc
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
-# Fixed version of PasswordResetTool
-#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,6 +66,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Jonathan Steffan  2.5.1-4
+- Updated so plone now provides the correct version of the Five product
+
 * Sat Nov 04 2006 Aurelien Bompard  2.5.1-3
 - add Plone Hotfix 20061031 (bug 213983)
 


--- Plone-2.5-atxmlperms.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 06:57:27 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 28 Nov 2006 01:57:27 -0500
Subject: rpms/mail-notification/devel .cvsignore, 1.7,
	1.8 mail-notification.spec, 1.33, 1.34 sources, 1.7,
	1.8 mail-notification-README.FEDORA, 1.1,
	NONE mail-notification-mail-reader-launch.patch, 1.1, NONE
Message-ID: <200611280657.kAS6vRvE011078@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11059

Modified Files:
	.cvsignore mail-notification.spec sources 
Removed Files:
	mail-notification-README.FEDORA 
	mail-notification-mail-reader-launch.patch 
Log Message:
4.0-0.1.rc1 -- Update to 4.0rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/.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	28 Nov 2006 06:56:57 -0000	1.8
@@ -1 +1 @@
-mail-notification-3.0.tar.gz
+mail-notification-4.0-rc1.tar.gz


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mail-notification.spec	21 Nov 2006 19:15:24 -0000	1.33
+++ mail-notification.spec	28 Nov 2006 06:56:57 -0000	1.34
@@ -1,17 +1,13 @@
-# FIXME -- remove evo 2.10 workaround
-
 Name:           mail-notification
-Version:        3.0
-Release:        11%{?dist}
+Version:        4.0
+Release:        0.1%{?dist}.rc1
 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://savannah.nongnu.org/download/mailnotify/mail-notification-4.0-rc1.tar.gz
 Patch0:         mail-notification-fedora-plugin-hint.patch
-Patch1:         mail-notification-mail-reader-launch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -29,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
@@ -56,12 +53,8 @@
 Evolution support for Mail Notification.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-rc1
 %patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
-cp %{SOURCE1} ./README.FEDORA
-# FIXME -- quick workaround for now
-sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
 
 %build
 %configure --disable-schemas-install  --enable-evolution
@@ -101,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
@@ -111,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
@@ -125,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,-)
@@ -135,6 +131,11 @@
 
 
 %changelog
+* 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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/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	28 Nov 2006 06:56:57 -0000	1.8
@@ -1 +1 @@
-d19fb5c96a0f54d1b1541fbddf73488e  mail-notification-3.0.tar.gz
+91c09b72a59d161564b47fff033be37e  mail-notification-4.0-rc1.tar.gz


--- mail-notification-README.FEDORA DELETED ---


--- mail-notification-mail-reader-launch.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 08:28:32 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Tue, 28 Nov 2006 03:28:32 -0500
Subject: owners owners.list,1.2024,1.2025
Message-ID: <200611280828.kAS8SWqc017509@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17491

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2024
retrieving revision 1.2025
diff -u -r1.2024 -r1.2025
--- owners.list	27 Nov 2006 22:28:53 -0000	1.2024
+++ owners.list	28 Nov 2006 08:28:01 -0000	1.2025
@@ -1986,7 +1986,7 @@
 Fedora Extras|python-logilab-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-lxml|ElementTree-like Python bindings for libxml2 and libxslt|shahms at shahms.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|jspaleta at gmail.com|
 Fedora Extras|python-mechanize|Stateful programmatic web browsing|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-musicbrainz2|Library which provides access to the MusicBrainz Database|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-mutagen|Python module to handle audio metadata|mr.ecik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 08:59:27 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 28 Nov 2006 03:59:27 -0500
Subject: rpms/k3d/devel k3d.spec,1.10,1.11
Message-ID: <200611280859.kAS8xRFD017676@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17655

Modified Files:
	k3d.spec 
Log Message:
release tag fixed


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- k3d.spec	23 Nov 2006 09:39:00 -0000	1.10
+++ k3d.spec	28 Nov 2006 08:58:57 -0000	1.11
@@ -152,10 +152,10 @@
 
 
 %changelog
-* Thu Nov 23 2006 Denis Leroy  - 0.6.4.0
+* Thu Nov 23 2006 Denis Leroy  - 0.6.4.0-1
 - Update to 0.6.4.0
 
-* Tue Oct 10 2006 Denis Leroy  - 0.6.3.1
+* Tue Oct 10 2006 Denis Leroy  - 0.6.3.1-1
 - Update to 0.6.3.1
 
 * Mon Oct  9 2006 Denis Leroy  - 0.6.3.0-1



From fedora-extras-commits at redhat.com  Tue Nov 28 10:48:24 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 28 Nov 2006 05:48:24 -0500
Subject: rpms/gtkwave/devel gtkwave.spec, 1.28, 1.29 sources, 1.26,
	1.27 .cvsignore, 1.26, 1.27
Message-ID: <200611281048.kASAmOrC024865@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24846

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 3.0.17


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gtkwave.spec	14 Nov 2006 10:28:13 -0000	1.28
+++ gtkwave.spec	28 Nov 2006 10:47:54 -0000	1.29
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.16
+Version:		3.0.17
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 28 2006 Paul Howarth  3.0.17-1
+- update to 3.0.17
+
 * Tue Nov 14 2006 Paul Howarth  3.0.16-1
 - update to 3.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Nov 2006 10:28:13 -0000	1.26
+++ sources	28 Nov 2006 10:47:54 -0000	1.27
@@ -1 +1 @@
-d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz
+78b65baccb8ecdc7d1e1dcb2b32a161d  gtkwave-3.0.17.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2006 10:28:13 -0000	1.26
+++ .cvsignore	28 Nov 2006 10:47:54 -0000	1.27
@@ -1 +1 @@
-gtkwave-3.0.16.tar.gz
+gtkwave-3.0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 11:18:15 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 28 Nov 2006 06:18:15 -0500
Subject: rpms/gtkwave/FC-6 gtkwave.spec, 1.28, 1.29 sources, 1.26,
	1.27 .cvsignore, 1.26, 1.27
Message-ID: <200611281118.kASBIFjZ028038@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28019

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 3.0.17


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/gtkwave.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gtkwave.spec	14 Nov 2006 11:59:18 -0000	1.28
+++ gtkwave.spec	28 Nov 2006 11:17:45 -0000	1.29
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.16
+Version:		3.0.17
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 28 2006 Paul Howarth  3.0.17-1
+- update to 3.0.17
+
 * Tue Nov 14 2006 Paul Howarth  3.0.16-1
 - update to 3.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Nov 2006 11:59:18 -0000	1.26
+++ sources	28 Nov 2006 11:17:45 -0000	1.27
@@ -1 +1 @@
-d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz
+78b65baccb8ecdc7d1e1dcb2b32a161d  gtkwave-3.0.17.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2006 11:59:17 -0000	1.26
+++ .cvsignore	28 Nov 2006 11:17:45 -0000	1.27
@@ -1 +1 @@
-gtkwave-3.0.16.tar.gz
+gtkwave-3.0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 11:20:13 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 28 Nov 2006 06:20:13 -0500
Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.26, 1.27 sources, 1.26,
	1.27 .cvsignore, 1.26, 1.27
Message-ID: <200611281120.kASBKD6h028107@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28088

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 3.0.17


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkwave.spec	14 Nov 2006 12:00:31 -0000	1.26
+++ gtkwave.spec	28 Nov 2006 11:19:43 -0000	1.27
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.16
+Version:		3.0.17
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 28 2006 Paul Howarth  3.0.17-1
+- update to 3.0.17
+
 * Tue Nov 14 2006 Paul Howarth  3.0.16-1
 - update to 3.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Nov 2006 12:00:31 -0000	1.26
+++ sources	28 Nov 2006 11:19:43 -0000	1.27
@@ -1 +1 @@
-d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz
+78b65baccb8ecdc7d1e1dcb2b32a161d  gtkwave-3.0.17.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2006 12:00:31 -0000	1.26
+++ .cvsignore	28 Nov 2006 11:19:43 -0000	1.27
@@ -1 +1 @@
-gtkwave-3.0.16.tar.gz
+gtkwave-3.0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 11:22:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 28 Nov 2006 06:22:10 -0500
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.25, 1.26 sources, 1.26,
	1.27 .cvsignore, 1.26, 1.27
Message-ID: <200611281122.kASBMAg1028173@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28154

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 3.0.17


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtkwave.spec	14 Nov 2006 12:01:56 -0000	1.25
+++ gtkwave.spec	28 Nov 2006 11:21:40 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.16
+Version:		3.0.17
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 28 2006 Paul Howarth  3.0.17-1
+- update to 3.0.17
+
 * Tue Nov 14 2006 Paul Howarth  3.0.16-1
 - update to 3.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Nov 2006 12:01:56 -0000	1.26
+++ sources	28 Nov 2006 11:21:40 -0000	1.27
@@ -1 +1 @@
-d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz
+78b65baccb8ecdc7d1e1dcb2b32a161d  gtkwave-3.0.17.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2006 12:01:56 -0000	1.26
+++ .cvsignore	28 Nov 2006 11:21:40 -0000	1.27
@@ -1 +1 @@
-gtkwave-3.0.16.tar.gz
+gtkwave-3.0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 11:32:06 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 28 Nov 2006 06:32:06 -0500
Subject: rpms/allegro/devel allegro.spec, 1.37,
	1.38 allegro-4.2.0-64bit.patch, 
	1.1, NONE allegro-4.2.0-alsa-big-endian.patch, 1.1,
	NONE allegro-4.2.0-digmid.patch, 1.1,
	NONE allegro-4.2.0-fullscreen.patch, 1.1,
	NONE allegro-4.2.0-fullscreen2.patch, 1.1,
	NONE allegro-4.2.0-mprotect.patch, 1.2,
	NONE allegro-4.2.0-nicevsync.patch, 1.1,
	NONE allegro-4.2.0-no-execheap.patch, 1.1, NONE
Message-ID: <200611281132.kASBW60e028303@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28288

Modified Files:
	allegro.spec 
Removed Files:
	allegro-4.2.0-64bit.patch allegro-4.2.0-alsa-big-endian.patch 
	allegro-4.2.0-digmid.patch allegro-4.2.0-fullscreen.patch 
	allegro-4.2.0-fullscreen2.patch allegro-4.2.0-mprotect.patch 
	allegro-4.2.0-nicevsync.patch allegro-4.2.0-no-execheap.patch 
Log Message:
update to 4.2.1


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- allegro.spec	15 Oct 2006 17:13:04 -0000	1.37
+++ allegro.spec	28 Nov 2006 11:31:36 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           allegro
-Version:        4.2.0
-Release:        18%{?dist}
+Version:        4.2.1
+Release:        1%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -15,15 +15,6 @@
 Patch1:         allegro-4.0.3-libdir.patch
 Patch2:         allegro-4.0.3-cfg.patch
 Patch3:         allegro-4.2.0-nostrip.patch
-Patch4:         allegro-4.2.0-digmid.patch
-Patch5:         allegro-4.2.0-alsa-big-endian.patch
-Patch6:         allegro-4.2.0-64bit.patch
-Patch7:         allegro-4.2.0-fullscreen2.patch
-Patch8:         allegro-4.2.0-mprotect.patch
-Patch9:         allegro-4.2.0-no-execheap.patch
-Patch10:        allegro-4.2.0-nicevsync.patch
-Patch11:        allegro-4.2.0-noexecstack.patch
-Patch12:        allegro-4.2.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -131,15 +122,6 @@
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
-%patch4 -p1 -z .digmid
-%patch5 -p1 -z .alsa-big-endian
-%patch6 -p1 -z .64bit
-%patch7 -p1 -z .fullscreen
-%patch8 -p1 -z .mprotect
-%patch9 -p1 -z .execheap
-%patch10 -p1 -z .nicevsync
-%patch11 -p1 -z .noexecstack
-%patch12 -p1 -z .multilib
 
 
 %build
@@ -155,8 +137,6 @@
 %else
 make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
 %endif
-MKDATA_PRELOAD=../../lib/unix/liballeg-%{version}.so \
-  DAT=../../tools/dat sh misc/mkdata.sh
 
 
 %install
@@ -230,6 +210,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Jindrich Novy  4.2.1-1
+- update to 4.2.1
+
 * Sun Oct 15 2006 Hans de Goede  4.2.0-18
 - Multilib devel goodness (make allegro-devel i386 and x86_64 parallel
   installable)


--- allegro-4.2.0-64bit.patch DELETED ---


--- allegro-4.2.0-alsa-big-endian.patch DELETED ---


--- allegro-4.2.0-digmid.patch DELETED ---


--- allegro-4.2.0-fullscreen.patch DELETED ---


--- allegro-4.2.0-fullscreen2.patch DELETED ---


--- allegro-4.2.0-mprotect.patch DELETED ---


--- allegro-4.2.0-nicevsync.patch DELETED ---


--- allegro-4.2.0-no-execheap.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 12:03:35 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 28 Nov 2006 07:03:35 -0500
Subject: rpms/allegro/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200611281203.kASC3Zwc031506@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31487

Modified Files:
	.cvsignore sources 
Log Message:
new source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Nov 2005 20:53:44 -0000	1.3
+++ .cvsignore	28 Nov 2006 12:03:05 -0000	1.4
@@ -1 +1,2 @@
 allegro-4.2.0.tar.gz
+allegro-4.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Nov 2005 20:53:44 -0000	1.3
+++ sources	28 Nov 2006 12:03:05 -0000	1.4
@@ -1 +1 @@
-a8b2c85c58b16345fe735f72763f3a6e  allegro-4.2.0.tar.gz
+0a09d0144ee8652fb8fa00f6cbb324fe  allegro-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 13:01:57 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 08:01:57 -0500
Subject: owners owners.list,1.2025,1.2026
Message-ID: <200611281301.kASD1vBY002391@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2372

Modified Files:
	owners.list 
Log Message:
Unorphan wbxml2.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2025
retrieving revision 1.2026
diff -u -r1.2025 -r1.2026
--- owners.list	28 Nov 2006 08:28:01 -0000	1.2025
+++ owners.list	28 Nov 2006 13:01:27 -0000	1.2026
@@ -2426,7 +2426,7 @@
 Fedora Extras|wallpapoz|Gnome Multi Backgrounds and Wallpapers Configuration Tool|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wavpack|A completely open audiocodec|lemenkov at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|
 Fedora Extras|wcstools|Software utilities to display and manipulate the WCS of a FITS image|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|wfmath|WorldForge client math library|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 13:10:06 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 08:10:06 -0500
Subject: rpms/wbxml2/devel .cvsignore, 1.3, 1.4 Makefile, 1.3, 1.4 sources,
	1.3, 1.4 wbxml2-0.9.2-autoreconf.patch, NONE,
	1.1 wbxml2-0.9.2-cflags.patch, NONE,
	1.1 wbxml2-0.9.2-no-doc.patch, NONE, 1.1 wbxml2.spec, 1.8, 1.9
Message-ID: <200611281310.kASDA68n002466@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2434

Added Files:
	.cvsignore Makefile sources wbxml2-0.9.2-autoreconf.patch 
	wbxml2-0.9.2-cflags.patch wbxml2-0.9.2-no-doc.patch 
	wbxml2.spec 
Log Message:
unorphan wbxml2, review request #217180


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	28 Nov 2006 13:09:36 -0000	1.4
@@ -0,0 +1 @@
+wbxml2-0.9.2.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	28 Nov 2006 13:09:36 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wbxml2
+# $Id$
+NAME := wbxml2
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	28 Nov 2006 13:09:36 -0000	1.4
@@ -0,0 +1 @@
+67a48fd9b69db8818a4dca5375c7993a  wbxml2-0.9.2.tar.gz

wbxml2-0.9.2-autoreconf.patch:

--- NEW FILE wbxml2-0.9.2-autoreconf.patch ---
diff -N -r -u wbxml2-0.9.2-orig/aclocal.m4 wbxml2-0.9.2/aclocal.m4
--- wbxml2-0.9.2-orig/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ wbxml2-0.9.2/aclocal.m4	2006-11-24 18:35:59.000000000 +0100
@@ -0,0 +1,7256 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 48 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
[...93844 lines suppressed...]
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# 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.
+.NOEXPORT:

wbxml2-0.9.2-cflags.patch:

--- NEW FILE wbxml2-0.9.2-cflags.patch ---
--- wbxml2-0.9.2/tools/Makefile.am.cflags	2006-11-24 17:51:58.000000000 +0100
+++ wbxml2-0.9.2/tools/Makefile.am	2006-11-24 17:52:09.000000000 +0100
@@ -3,7 +3,7 @@
 INCLUDES =\
 	 -I. -I../src -I/usr/include
 
-CFLAGS =\
+AM_CFLAGS =\
 	 -DHAVE_CONFIG_H\
 	 -DHAVE_EXPAT\
 	 -D_REENTRANT\
--- wbxml2-0.9.2/src/Makefile.am.cflags	2006-11-24 17:51:51.000000000 +0100
+++ wbxml2-0.9.2/src/Makefile.am	2006-11-24 17:52:12.000000000 +0100
@@ -3,7 +3,7 @@
 INCLUDES =\
 	 -I. -I/usr/include
 
-CFLAGS =\
+AM_CFLAGS =\
 	 -DHAVE_CONFIG_H\
 	 -DHAVE_EXPAT\
 	 -D_REENTRANT\

wbxml2-0.9.2-no-doc.patch:

--- NEW FILE wbxml2-0.9.2-no-doc.patch ---
--- wbxml2-0.9.2/Makefile.am.no-doc	2006-07-11 13:47:43.000000000 +0200
+++ wbxml2-0.9.2/Makefile.am	2006-11-24 17:35:47.000000000 +0100
@@ -8,26 +8,6 @@
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = libwbxml2.pc
 
-wbxmldocdir = ${prefix}/share/doc/wbxml2-${VERSION}
-wbxmldoc_DATA = \
-	AUTHORS\
-	bootstrap\
-	BUGS\
-	ChangeLog\
-	COPYING\
-	GNU-LGPL\
-	INSTALL\
-	NEWS\
-	README\
-	References\
-	THANKS\
-	TODO\
-	doxygen.h
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
-	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
-
 dist-bz2: distdir
 	sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
 	mv $(distdir)/wbxml2.spec.aux $(distdir)/wbxml2.spec


Index: wbxml2.spec
===================================================================
RCS file: wbxml2.spec
diff -N wbxml2.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wbxml2.spec	28 Nov 2006 13:09:36 -0000	1.9
@@ -0,0 +1,114 @@
+Name:           wbxml2
+Version:        0.9.2
+Release:        4%{?dist}
+Summary:        WBXML parser and compiler library
+
+Group:          System Environment/Libraries
+License:        LGPL
+URL:            http://libwbxml.aymerick.com:8080/
+Source0:        http://dl.sourceforge.net/wbxmllib/%{name}-%{version}.tar.gz
+
+# Do not install doc files
+Patch0:         wbxml2-0.9.2-no-doc.patch
+# Fix CFLAGS
+Patch1:         wbxml2-0.9.2-cflags.patch
+# libtool, automake and autoconf stuffs, done by autoreconf
+Patch2:         wbxml2-0.9.2-autoreconf.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  expat-devel zlib-devel popt 
+BuildRequires:  recode
+
+%description
+The WBXML Library (libwbxml) contains a library and its associated tools to
+parse, encode and handle WBXML documents. The WBXML format is a binary
+representation of XML, defined by the Wap Forum, and used to reduce
+bandwidth in mobile communications.
+
+%package devel
+Group:         Development/Libraries
+Summary:       Development files of WBXML
+Requires:      %{name} = %{version}-%{release}
+%description devel
+%{summary}.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+chmod a+x configure
+
+# Recode to UTF-8 several doc files
+for file in ChangeLog README NEWS References; do
+  recode l1..utf8 $file
+done
+
+# no line terminator, add one
+echo >> THANKS
+
+%build
+%configure --disable-rpath --disable-static
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS BUGS ChangeLog COPYING GNU-LGPL NEWS README References THANKS TODO
+%{_bindir}/wbxml2xml
+%{_bindir}/xml2wbxml
+%{_libdir}/libwbxml2.so.0*
+%exclude %{_libdir}/libwbxml2.la
+
+%files devel
+%defattr(-,root,root,-)
+%doc AUTHORS BUGS ChangeLog COPYING GNU-LGPL NEWS README References THANKS TODO
+%{_includedir}/wbxml*.h
+%{_libdir}/libwbxml2.so
+%{_libdir}/pkgconfig/libwbxml2.pc
+
+
+
+
+%changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
+- Added BR: popt zlib-devel
+- Improved changelog.
+
+* Fri Nov 24 2006 Laurent Rineau  - 0.9.2-3
+- Recode some %%doc files.
+
+* Fri Nov 24 2006 Laurent Rineau  - 0.9.2-1
+- New upstream release 0.9.2.
+- Unorphaned for FE-6 and rawhide. New maintainer. Review request #217180
+- New spec file.
+- Header are know in %%{_includedir} instead of %%{_includedir}/wbxml2
+- New licence.
+
+* Sun May 22 2005 Jeremy Katz  - 0.9.0-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
+* Wed Jun 30 2004 Michael Schwendt  0:0.9.0-0.fdr.2
+- Set group, own include dir, fix devel description,
+  make %%doc files chmod -x.
+
+* Wed Jun 30 2004 Panu Matilainen  0:0.9.0-0.fdr.1
+- Initial RPM release.



From fedora-extras-commits at redhat.com  Tue Nov 28 13:43:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 08:43:47 -0500
Subject: rpms/exiv2/devel .cvsignore, 1.4, 1.5 exiv2.spec, 1.7, 1.8 sources, 
	1.4, 1.5 exiv2-0.11-pkgconfig.patch, 1.2, NONE
Message-ID: <200611281343.kASDhl1R002690@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/exiv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2671

Modified Files:
	.cvsignore exiv2.spec sources 
Removed Files:
	exiv2-0.11-pkgconfig.patch 
Log Message:
* Tue Nov 28 2006 Rex Dieter  0.12-1
- exiv2-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2006 19:06:40 -0000	1.4
+++ .cvsignore	28 Nov 2006 13:43:17 -0000	1.5
@@ -1,2 +1,3 @@
 exiv2-0.10.tar.gz
 exiv2-0.11.tar.gz
+exiv2-0.12.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- exiv2.spec	4 Oct 2006 19:19:25 -0000	1.7
+++ exiv2.spec	28 Nov 2006 13:43:17 -0000	1.8
@@ -1,8 +1,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.11
-Release: 3%{?dist} 
+Version: 0.12
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -14,8 +14,6 @@
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
-# http://dev.robotbattle.com/bugs/view.php?id=489
-Patch3: exiv2-0.11-pkgconfig.patch
 
 
 %description
@@ -48,7 +46,6 @@
 
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .deps
-%patch3 -p1 -b .pkgconfig
 
 
 %build
@@ -97,6 +94,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  0.12-1
+- exiv2-0.12
+
 * Wed Oct 04 2006 Rex Dieter  0.11-3
 - respin
 
@@ -104,7 +104,7 @@
 - BR: zlib-devel
 
 * Tue Sep 19 2006 Rex Dieter  0.11-1
-- 0.11
+- exiv2-0.11
 
 * Tue Aug 29 2006 Rex Dieter  0.10-2
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2006 19:06:40 -0000	1.4
+++ sources	28 Nov 2006 13:43:17 -0000	1.5
@@ -1 +1 @@
-269ce822946c56549d086f0c08dffc79  exiv2-0.11.tar.gz
+a97a4e489df7ec99458e3e33b506c3e6  exiv2-0.12.tar.gz


--- exiv2-0.11-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 13:57:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 08:57:31 -0500
Subject: rpms/kphotoalbum/devel .cvsignore,1.2,1.3 kphotoalbum.spec,1.6,1.7
Message-ID: <200611281357.kASDvV2X002772@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kphotoalbum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2755

Modified Files:
	.cvsignore kphotoalbum.spec 
Log Message:
* Tue Nov 28 2006 Rex Dieter  2.2-7
- BR: exiv2-devel >= 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:45:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 13:57:01 -0000	1.3
@@ -1 +1,2 @@
+clog
 kphotoalbum-2.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kphotoalbum.spec	4 Oct 2006 19:23:38 -0000	1.6
+++ kphotoalbum.spec	28 Nov 2006 13:57:01 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -13,14 +13,13 @@
 Obsoletes: kimdaba < %{version}
 #Provides:  kimdaba = %{version}
 
-BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libkipi-devel 
 BuildRequires: qt-devel
 BuildRequires: kdelibs-devel
 # versioning isn't strictly required, just need to be sure we're 
 # building against the latest exiv2 -- Rex
-BuildRequires: exiv2-devel >= 0.11
+BuildRequires: exiv2-devel >= 0.12
 
 ## Optional, not strictly required.
 #Requires(hint): kipi-plugins
@@ -56,11 +55,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category "X-Fedora" --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -109,6 +103,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  2.2-7
+- BR: exiv2-devel >= 0.12
+
 * Wed Oct 04 2006 Rex Dieter  2.2-6
 - respin
 - drop deprecated Provides: kimdaba



From fedora-extras-commits at redhat.com  Tue Nov 28 15:05:05 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 10:05:05 -0500
Subject: rpms/wbxml2/devel dead.package,1.1,NONE
Message-ID: <200611281505.kASF556R009702@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9697

Removed Files:
	dead.package 
Log Message:
well, wbxml2 is no longer a dead package.


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 15:10:40 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 10:10:40 -0500
Subject: rpms/wbxml2/FC-5 wbxml2-0.9.2-autoreconf.patch, NONE,
	1.1 wbxml2-0.9.2-cflags.patch, NONE,
	1.1 wbxml2-0.9.2-no-doc.patch, NONE, 1.1 sources, 1.2,
	1.3 wbxml2.spec, 1.7, 1.8 wbxml2-0.9.0-am_cflags.patch, 1.1, NONE
Message-ID: <200611281510.kASFAeAk009778@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9752

Modified Files:
	sources wbxml2.spec 
Added Files:
	wbxml2-0.9.2-autoreconf.patch wbxml2-0.9.2-cflags.patch 
	wbxml2-0.9.2-no-doc.patch 
Removed Files:
	wbxml2-0.9.0-am_cflags.patch 
Log Message:
wbxml2 is unorphan. Update the FC-5 branch too. Tag/build will follow.

wbxml2-0.9.2-autoreconf.patch:

--- NEW FILE wbxml2-0.9.2-autoreconf.patch ---
diff -N -r -u wbxml2-0.9.2-orig/aclocal.m4 wbxml2-0.9.2/aclocal.m4
--- wbxml2-0.9.2-orig/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ wbxml2-0.9.2/aclocal.m4	2006-11-24 18:35:59.000000000 +0100
@@ -0,0 +1,7256 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 48 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
[...93844 lines suppressed...]
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# 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.
+.NOEXPORT:

wbxml2-0.9.2-cflags.patch:

--- NEW FILE wbxml2-0.9.2-cflags.patch ---
--- wbxml2-0.9.2/tools/Makefile.am.cflags	2006-11-24 17:51:58.000000000 +0100
+++ wbxml2-0.9.2/tools/Makefile.am	2006-11-24 17:52:09.000000000 +0100
@@ -3,7 +3,7 @@
 INCLUDES =\
 	 -I. -I../src -I/usr/include
 
-CFLAGS =\
+AM_CFLAGS =\
 	 -DHAVE_CONFIG_H\
 	 -DHAVE_EXPAT\
 	 -D_REENTRANT\
--- wbxml2-0.9.2/src/Makefile.am.cflags	2006-11-24 17:51:51.000000000 +0100
+++ wbxml2-0.9.2/src/Makefile.am	2006-11-24 17:52:12.000000000 +0100
@@ -3,7 +3,7 @@
 INCLUDES =\
 	 -I. -I/usr/include
 
-CFLAGS =\
+AM_CFLAGS =\
 	 -DHAVE_CONFIG_H\
 	 -DHAVE_EXPAT\
 	 -D_REENTRANT\

wbxml2-0.9.2-no-doc.patch:

--- NEW FILE wbxml2-0.9.2-no-doc.patch ---
--- wbxml2-0.9.2/Makefile.am.no-doc	2006-07-11 13:47:43.000000000 +0200
+++ wbxml2-0.9.2/Makefile.am	2006-11-24 17:35:47.000000000 +0100
@@ -8,26 +8,6 @@
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = libwbxml2.pc
 
-wbxmldocdir = ${prefix}/share/doc/wbxml2-${VERSION}
-wbxmldoc_DATA = \
-	AUTHORS\
-	bootstrap\
-	BUGS\
-	ChangeLog\
-	COPYING\
-	GNU-LGPL\
-	INSTALL\
-	NEWS\
-	README\
-	References\
-	THANKS\
-	TODO\
-	doxygen.h
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
-	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
-
 dist-bz2: distdir
 	sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
 	mv $(distdir)/wbxml2.spec.aux $(distdir)/wbxml2.spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:31:34 -0000	1.2
+++ sources	28 Nov 2006 15:10:10 -0000	1.3
@@ -1 +1 @@
-3f9b5bf104ec523b8eebe69f93919ded  wbxml2-0.9.0-src.tar.gz
+67a48fd9b69db8818a4dca5375c7993a  wbxml2-0.9.2.tar.gz


Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-5/wbxml2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wbxml2.spec	4 Mar 2006 13:26:54 -0000	1.7
+++ wbxml2.spec	28 Nov 2006 15:10:10 -0000	1.8
@@ -1,60 +1,55 @@
 Name:           wbxml2
-Version:        0.9.0
-Release: 4
-
-Summary:        Library and tools to parse, encode and handle WBXML documents
+Version:        0.9.2
+Release:        4%{?dist}
+Summary:        WBXML parser and compiler library
 
 Group:          System Environment/Libraries
-License:        GPL
-URL:            http://libwbxml.aymerick.com/
-Source0:        http://dl.sf.net/sourceforge/wbxmllib/wbxml2-0.9.0-src.tar.gz
-Patch0:         wbxml2-0.9.0-am_cflags.patch
+License:        LGPL
+URL:            http://libwbxml.aymerick.com:8080/
+Source0:        http://dl.sourceforge.net/wbxmllib/%{name}-%{version}.tar.gz
+
+# Do not install doc files
+Patch0:         wbxml2-0.9.2-no-doc.patch
+# Fix CFLAGS
+Patch1:         wbxml2-0.9.2-cflags.patch
+# libtool, automake and autoconf stuffs, done by autoreconf
+Patch2:         wbxml2-0.9.2-autoreconf.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  popt, expat-devel, zlib-devel
-BuildRequires:  libtool, automake, autoconf
+BuildRequires:  expat-devel zlib-devel popt 
+BuildRequires:  recode
 
 %description
-The WBXML Library (aka libwbxml) contains a library and its associated tools
-to Parse, Encode and Handle WBXML documents.
-
-The WBXML format is a binary representation of XML, defined by the Wap Forum,
-and used to reduce bandwidth in mobile communications.
-
-
-
-%package        devel
-Summary:        %{summary}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-This package contains the libraries, include files and documentation
-to develop WBXML applications.
-
-The WBXML format is a binary representation of XML, defined by the Wap Forum,
-and used to reduce bandwidth in mobile communications.
-
+The WBXML Library (libwbxml) contains a library and its associated tools to
+parse, encode and handle WBXML documents. The WBXML format is a binary
+representation of XML, defined by the Wap Forum, and used to reduce
+bandwidth in mobile communications.
+
+%package devel
+Group:         Development/Libraries
+Summary:       Development files of WBXML
+Requires:      %{name} = %{version}-%{release}
+%description devel
+%{summary}.
 
 %prep
-cat<> THANKS
 
 %build
-libtoolize
-aclocal
-autoheader
-automake --add-missing
-autoconf
-%configure --includedir=%{_includedir}/%{name}
+%configure --disable-rpath --disable-static
 make %{?_smp_mflags}
 
 
@@ -62,8 +57,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,22 +69,37 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_libdir}/*.so.*
-%defattr(0644,root,root,0755)
-%doc AUTHORS THANKS COPYING ChangeLog NEWS README TODO GNU-GPL References BUGS
+%doc AUTHORS BUGS ChangeLog COPYING GNU-LGPL NEWS README References THANKS TODO
+%{_bindir}/wbxml2xml
+%{_bindir}/xml2wbxml
+%{_libdir}/libwbxml2.so.0*
+%exclude %{_libdir}/libwbxml2.la
 
 %files devel
 %defattr(-,root,root,-)
-# the README says this documentation is obsolete since 0.7.2 so not included
-#%doc doc/*
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/wbxml*.h
-%{_libdir}/*.a
-%{_libdir}/*.so
+%doc AUTHORS BUGS ChangeLog COPYING GNU-LGPL NEWS README References THANKS TODO
+%{_includedir}/wbxml*.h
+%{_libdir}/libwbxml2.so
+%{_libdir}/pkgconfig/libwbxml2.pc
+
+
 
 
 %changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
+- Added BR: popt zlib-devel
+- Improved changelog.
+
+* Fri Nov 24 2006 Laurent Rineau  - 0.9.2-3
+- Recode some %%doc files.
+
+* Fri Nov 24 2006 Laurent Rineau  - 0.9.2-1
+- New upstream release 0.9.2.
+- Unorphaned for FE-6 and rawhide. New maintainer. Review request #217180
+- New spec file.
+- Header are know in %%{_includedir} instead of %%{_includedir}/wbxml2
+- New licence.
+
 * Sun May 22 2005 Jeremy Katz  - 0.9.0-4
 - rebuild on all arches
 


--- wbxml2-0.9.0-am_cflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 15:12:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:12:59 -0500
Subject: rpms/kaffeine/FC-6 .cvsignore, 1.2, 1.3 kaffeine.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611281512.kASFCx1r009851@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9830

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Sun Nov 26 2006 Rex Dieter  0.8.3-1
- 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:12:29 -0000	1.3
@@ -1 +1,2 @@
 kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/kaffeine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kaffeine.spec	14 Nov 2006 04:11:06 -0000	1.1
+++ kaffeine.spec	28 Nov 2006 15:12:29 -0000	1.2
@@ -11,33 +11,29 @@
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?dist}
 
+%if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
-
 %define  _with_lame --with-lame
 Requires: kaffeine = %{version}
 Patch1: kaffeine-0.8.2-codecs.patch
 # split occurred here
 Conflicts: kaffeine < 0.8.2-2
-
 %else
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %endif
 
-Version: 0.8.2
-Release: 5%{?dist}
-
 License: GPL
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
@@ -108,7 +104,7 @@
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
@@ -128,11 +124,6 @@
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --vendor="" \
-  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} 
@@ -205,6 +196,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Rex Dieter  0.8.3-1
+- 0.8.3
+
 * Sat Nov 04 2006 Rex Dieter  0.8.2-6
 - %%doc README
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2006 04:11:06 -0000	1.2
+++ sources	28 Nov 2006 15:12:29 -0000	1.3
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:21:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:21:04 -0500
Subject: rpms/kaffeine/FC-5 .cvsignore, 1.2, 1.3 kaffeine.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611281521.kASFL4o0009998@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9979

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Sun Nov 26 2006 Rex Dieter  0.8.3-1
- 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:20:34 -0000	1.3
@@ -1 +1,2 @@
 kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-5/kaffeine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kaffeine.spec	14 Nov 2006 04:11:06 -0000	1.1
+++ kaffeine.spec	28 Nov 2006 15:20:34 -0000	1.2
@@ -11,33 +11,29 @@
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?dist}
 
+%if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
-
 %define  _with_lame --with-lame
 Requires: kaffeine = %{version}
 Patch1: kaffeine-0.8.2-codecs.patch
 # split occurred here
 Conflicts: kaffeine < 0.8.2-2
-
 %else
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %endif
 
-Version: 0.8.2
-Release: 5%{?dist}
-
 License: GPL
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
@@ -108,7 +104,7 @@
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
@@ -128,11 +124,6 @@
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --vendor="" \
-  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} 
@@ -205,6 +196,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Rex Dieter  0.8.3-1
+- 0.8.3
+
 * Sat Nov 04 2006 Rex Dieter  0.8.2-6
 - %%doc README
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2006 04:11:06 -0000	1.2
+++ sources	28 Nov 2006 15:20:34 -0000	1.3
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:34:13 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:34:13 -0500
Subject: rpms/libtcd/devel .cvsignore, 1.2, 1.3 libtcd.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200611281534.kASFYD6K010214@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10184

Modified Files:
	.cvsignore libtcd.spec sources 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
- 2.2-r2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:34:50 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:33:43 -0000	1.3
@@ -1 +1 @@
-libtcd-2.2.tar.bz2
+libtcd-2.2-r2.tar.bz2


Index: libtcd.spec
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/libtcd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtcd.spec	26 Nov 2006 13:34:50 -0000	1.1
+++ libtcd.spec	28 Nov 2006 15:33:43 -0000	1.2
@@ -1,12 +1,15 @@
+%define		src_ver		2.2-r2
+%define		dir_ver		2.2
+
 Name:		libtcd
-Version:	2.2
+Version:	2.2.0.2
 Release:	1%{?dist}
 Summary:	Tide Constituent Database Library
 
 Group:		System Environment/Libraries
 License:	Public Domain
 URL:		http://www.flaterco.com/xtide/
-Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{src_ver}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,7 +28,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dir_ver}
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
+- 2.2-r2.
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 2.2-1
 - Formal 2.2 release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:34:50 -0000	1.2
+++ sources	28 Nov 2006 15:33:43 -0000	1.3
@@ -1 +1 @@
-d6cfa1b0d808d5772c9b2798b8a90df0  libtcd-2.2.tar.bz2
+f2381e7dc9ddbe4319bfde3c72e7ba6a  libtcd-2.2-r2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:35:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:35:25 -0500
Subject: rpms/tideEditor/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tideEditor.spec, 1.1, 1.2
Message-ID: <200611281535.kASFZPlf010310@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10261

Modified Files:
	.cvsignore sources tideEditor.spec 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 1.3.12.0.2-1
- 1.3.12-r2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 12:19:51 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:34:55 -0000	1.3
@@ -1 +1 @@
-tideEditor-1.3.12.tar.bz2
+tideEditor-1.3.12-r2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 12:19:51 -0000	1.2
+++ sources	28 Nov 2006 15:34:55 -0000	1.3
@@ -1 +1 @@
-f833a2b7ccd4721c719642845ec2da47  tideEditor-1.3.12.tar.bz2
+2f3681d4bf52427e8dbebe0408b2fa9d  tideEditor-1.3.12-r2.tar.bz2


Index: tideEditor.spec
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/tideEditor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tideEditor.spec	27 Nov 2006 12:19:51 -0000	1.1
+++ tideEditor.spec	28 Nov 2006 15:34:55 -0000	1.2
@@ -1,12 +1,15 @@
+%define		src_ver		1.3.12-r2
+%define		dir_ver		1.3.12
+
 Name:		tideEditor
-Version:	1.3.12
-Release:	3%{?dist}
+Version:	1.3.12.0.2
+Release:	1%{?dist}
 Summary:	Editor for Tide Constituent Database (TCD) files
 
 Group:		Applications/Engineering
 License:	GPL
 URL:		http://www.flaterco.com/xtide/
-Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{src_ver}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel
@@ -19,7 +22,7 @@
 Flater and Jan Depner.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dir_ver}
 
 %build
 %configure
@@ -38,6 +41,9 @@
 %{_bindir}/tideEditor
 
 %changelog
+* Tue Nov 28 2006 Mamoru Tasaka  - 1.3.12.0.2-1
+- 1.3.12-r2.
+
 * Mon Nov 27 2006 Mamoru Tasaka  - 1.3.12-3
 - Remove unneeded BR
 



From fedora-extras-commits at redhat.com  Tue Nov 28 15:35:39 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:35:39 -0500
Subject: rpms/libtcd/FC-6 .cvsignore, 1.2, 1.3 libtcd.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200611281535.kASFZdMw010324@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10286

Modified Files:
	.cvsignore libtcd.spec sources 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
- 2.2-r2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:34:50 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:35:09 -0000	1.3
@@ -1 +1 @@
-libtcd-2.2.tar.bz2
+libtcd-2.2-r2.tar.bz2


Index: libtcd.spec
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-6/libtcd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtcd.spec	26 Nov 2006 13:34:50 -0000	1.1
+++ libtcd.spec	28 Nov 2006 15:35:09 -0000	1.2
@@ -1,12 +1,15 @@
+%define		src_ver		2.2-r2
+%define		dir_ver		2.2
+
 Name:		libtcd
-Version:	2.2
+Version:	2.2.0.2
 Release:	1%{?dist}
 Summary:	Tide Constituent Database Library
 
 Group:		System Environment/Libraries
 License:	Public Domain
 URL:		http://www.flaterco.com/xtide/
-Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{src_ver}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,7 +28,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dir_ver}
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
+- 2.2-r2.
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 2.2-1
 - Formal 2.2 release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:34:50 -0000	1.2
+++ sources	28 Nov 2006 15:35:09 -0000	1.3
@@ -1 +1 @@
-d6cfa1b0d808d5772c9b2798b8a90df0  libtcd-2.2.tar.bz2
+f2381e7dc9ddbe4319bfde3c72e7ba6a  libtcd-2.2-r2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:37:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:37:41 -0500
Subject: rpms/libtcd/FC-5 .cvsignore, 1.2, 1.3 libtcd.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200611281537.kASFbfCN010394@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10364

Modified Files:
	.cvsignore libtcd.spec sources 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
- 2.2-r2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:34:50 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:37:11 -0000	1.3
@@ -1 +1 @@
-libtcd-2.2.tar.bz2
+libtcd-2.2-r2.tar.bz2


Index: libtcd.spec
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-5/libtcd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtcd.spec	26 Nov 2006 13:34:50 -0000	1.1
+++ libtcd.spec	28 Nov 2006 15:37:11 -0000	1.2
@@ -1,12 +1,15 @@
+%define		src_ver		2.2-r2
+%define		dir_ver		2.2
+
 Name:		libtcd
-Version:	2.2
+Version:	2.2.0.2
 Release:	1%{?dist}
 Summary:	Tide Constituent Database Library
 
 Group:		System Environment/Libraries
 License:	Public Domain
 URL:		http://www.flaterco.com/xtide/
-Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{src_ver}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,7 +28,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dir_ver}
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
+- 2.2-r2.
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 2.2-1
 - Formal 2.2 release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:34:50 -0000	1.2
+++ sources	28 Nov 2006 15:37:11 -0000	1.3
@@ -1 +1 @@
-d6cfa1b0d808d5772c9b2798b8a90df0  libtcd-2.2.tar.bz2
+f2381e7dc9ddbe4319bfde3c72e7ba6a  libtcd-2.2-r2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:38:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:38:38 -0500
Subject: rpms/jd/devel .cvsignore, 1.26, 1.27 jd.spec, 1.33, 1.34 sources,
	1.26, 1.27
Message-ID: <200611281538.kASFcc7R010441@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10415

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061128
- cvs 061128 (24:15 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	27 Nov 2006 15:20:52 -0000	1.26
+++ .cvsignore	28 Nov 2006 15:38:07 -0000	1.27
@@ -1 +1 @@
-jd-1.8.1-cvs061127.tgz
+jd-1.8.1-cvs061128.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jd.spec	27 Nov 2006 15:20:52 -0000	1.33
+++ jd.spec	28 Nov 2006 15:38:07 -0000	1.34
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061127
+%define         strtag        cvs061128
 %define         repoid        22722
 
 
@@ -65,6 +65,9 @@
 %build
 sh autogen.sh
 
+# set TZ for __TIME__
+export TZ='Asia/Tokyo'
+
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -103,8 +106,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Nov 27 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061127
-- cvs 061127 (23:59 JST)
+* Tue Nov 28 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061128
+- cvs 061128 (24:15 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Nov 2006 15:20:52 -0000	1.26
+++ sources	28 Nov 2006 15:38:07 -0000	1.27
@@ -1 +1 @@
-9804dd8951bc1bbf9dc0be8d89b19f60  jd-1.8.1-cvs061127.tgz
+bd4e2e11e608980dcd35d28ef8ab4e1f  jd-1.8.1-cvs061128.tgz



From fedora-extras-commits at redhat.com  Tue Nov 28 15:40:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:40:26 -0500
Subject: rpms/exiv2/FC-6 .cvsignore, 1.4, 1.5 exiv2.spec, 1.7, 1.8 sources,
	1.4, 1.5 exiv2-0.11-pkgconfig.patch, 1.2, NONE
Message-ID: <200611281540.kASFeQx7010518@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/exiv2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10459

Modified Files:
	.cvsignore exiv2.spec sources 
Removed Files:
	exiv2-0.11-pkgconfig.patch 
Log Message:
* Tue Nov 28 2006 Rex Dieter  0.12-1
- exiv2-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2006 19:06:40 -0000	1.4
+++ .cvsignore	28 Nov 2006 15:39:56 -0000	1.5
@@ -1,2 +1,3 @@
 exiv2-0.10.tar.gz
 exiv2-0.11.tar.gz
+exiv2-0.12.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-6/exiv2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- exiv2.spec	4 Oct 2006 19:19:25 -0000	1.7
+++ exiv2.spec	28 Nov 2006 15:39:56 -0000	1.8
@@ -1,8 +1,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.11
-Release: 3%{?dist} 
+Version: 0.12
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -14,8 +14,6 @@
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
-# http://dev.robotbattle.com/bugs/view.php?id=489
-Patch3: exiv2-0.11-pkgconfig.patch
 
 
 %description
@@ -48,7 +46,6 @@
 
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .deps
-%patch3 -p1 -b .pkgconfig
 
 
 %build
@@ -97,6 +94,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  0.12-1
+- exiv2-0.12
+
 * Wed Oct 04 2006 Rex Dieter  0.11-3
 - respin
 
@@ -104,7 +104,7 @@
 - BR: zlib-devel
 
 * Tue Sep 19 2006 Rex Dieter  0.11-1
-- 0.11
+- exiv2-0.11
 
 * Tue Aug 29 2006 Rex Dieter  0.10-2
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2006 19:06:40 -0000	1.4
+++ sources	28 Nov 2006 15:39:56 -0000	1.5
@@ -1 +1 @@
-269ce822946c56549d086f0c08dffc79  exiv2-0.11.tar.gz
+a97a4e489df7ec99458e3e33b506c3e6  exiv2-0.12.tar.gz


--- exiv2-0.11-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 15:41:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:41:26 -0500
Subject: rpms/exiv2/FC-5 .cvsignore, 1.4, 1.5 exiv2.spec, 1.4, 1.5 sources,
	1.4, 1.5 exiv2-0.11-pkgconfig.patch, 1.1, NONE
Message-ID: <200611281541.kASFfQTq010771@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/exiv2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10638

Modified Files:
	.cvsignore exiv2.spec sources 
Removed Files:
	exiv2-0.11-pkgconfig.patch 
Log Message:
* Tue Nov 28 2006 Rex Dieter  0.12-1
- exiv2-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2006 19:29:50 -0000	1.4
+++ .cvsignore	28 Nov 2006 15:40:55 -0000	1.5
@@ -1,2 +1,3 @@
 exiv2-0.10.tar.gz
 exiv2-0.11.tar.gz
+exiv2-0.12.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-5/exiv2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- exiv2.spec	19 Sep 2006 19:29:50 -0000	1.4
+++ exiv2.spec	28 Nov 2006 15:40:55 -0000	1.5
@@ -1,8 +1,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.11
-Release: 2%{?dist} 
+Version: 0.12
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -14,7 +14,6 @@
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
-Patch3: exiv2-0.11-pkgconfig.patch
 
 
 %description
@@ -47,7 +46,6 @@
 
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .deps
-%patch3 -p1 -b .pkgconfig
 
 
 %build
@@ -96,11 +94,17 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  0.12-1
+- exiv2-0.12
+
+* Wed Oct 04 2006 Rex Dieter  0.11-3
+- respin
+
 * Tue Sep 19 2006 Rex Dieter  0.11-2
 - BR: zlib-devel
 
 * Tue Sep 19 2006 Rex Dieter  0.11-1
-- 0.11
+- exiv2-0.11
 
 * Tue Aug 29 2006 Rex Dieter  0.10-2
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2006 19:29:50 -0000	1.4
+++ sources	28 Nov 2006 15:40:55 -0000	1.5
@@ -1 +1 @@
-269ce822946c56549d086f0c08dffc79  exiv2-0.11.tar.gz
+a97a4e489df7ec99458e3e33b506c3e6  exiv2-0.12.tar.gz


--- exiv2-0.11-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 15:43:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:43:33 -0500
Subject: rpms/kile/devel kile.spec,1.31,1.32
Message-ID: <200611281543.kASFhXkC010805@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10790

Modified Files:
	kile.spec 
Log Message:
* Tue Nov 28 2006 Rex Dieter  1.9.3-2
- drop desktop-file-utils usage



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kile.spec	25 Nov 2006 15:55:07 -0000	1.31
+++ kile.spec	28 Nov 2006 15:43:03 -0000	1.32
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -11,7 +11,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
@@ -63,11 +62,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --add-category="X-Fedora" --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-  
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -120,6 +114,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  1.9.3-2
+- drop desktop-file-utils usage
+
 * Sat Nov 25 2006 Rex Dieter  1.9.3-1
 - kile-1.9.3, CVE-2006-6085 (#217238)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 16:02:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 11:02:11 -0500
Subject: rpms/kphotoalbum/FC-6 .cvsignore,1.2,1.3 kphotoalbum.spec,1.6,1.7
Message-ID: <200611281602.kASG2Bt7013928@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kphotoalbum/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13911

Modified Files:
	.cvsignore kphotoalbum.spec 
Log Message:
* Tue Nov 28 2006 Rex Dieter  2.2-7
- BR: exiv2-devel >= 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:45:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 16:01:40 -0000	1.3
@@ -1 +1,2 @@
+clog
 kphotoalbum-2.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/FC-6/kphotoalbum.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kphotoalbum.spec	4 Oct 2006 19:23:38 -0000	1.6
+++ kphotoalbum.spec	28 Nov 2006 16:01:40 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -13,14 +13,13 @@
 Obsoletes: kimdaba < %{version}
 #Provides:  kimdaba = %{version}
 
-BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libkipi-devel 
 BuildRequires: qt-devel
 BuildRequires: kdelibs-devel
 # versioning isn't strictly required, just need to be sure we're 
 # building against the latest exiv2 -- Rex
-BuildRequires: exiv2-devel >= 0.11
+BuildRequires: exiv2-devel >= 0.12
 
 ## Optional, not strictly required.
 #Requires(hint): kipi-plugins
@@ -56,11 +55,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category "X-Fedora" --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -109,6 +103,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  2.2-7
+- BR: exiv2-devel >= 0.12
+
 * Wed Oct 04 2006 Rex Dieter  2.2-6
 - respin
 - drop deprecated Provides: kimdaba



From fedora-extras-commits at redhat.com  Tue Nov 28 16:11:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 11:11:43 -0500
Subject: rpms/kphotoalbum/FC-5 .cvsignore,1.2,1.3 kphotoalbum.spec,1.4,1.5
Message-ID: <200611281611.kASGBhVt014008@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kphotoalbum/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13991

Modified Files:
	.cvsignore kphotoalbum.spec 
Log Message:
* Tue Nov 28 2006 Rex Dieter  2.2-7
- BR: exiv2-devel >= 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:45:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 16:11:13 -0000	1.3
@@ -1 +1,2 @@
+clog
 kphotoalbum-2.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/FC-5/kphotoalbum.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kphotoalbum.spec	19 Sep 2006 19:40:40 -0000	1.4
+++ kphotoalbum.spec	28 Nov 2006 16:11:13 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 2.2
-Release: 5%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -11,16 +11,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kimdaba < %{version}
-Provides:  kimdaba = %{version}
+#Provides:  kimdaba = %{version}
 
-BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libkipi-devel 
 BuildRequires: qt-devel
 BuildRequires: kdelibs-devel
 # versioning isn't strictly required, just need to be sure we're 
 # building against the latest exiv2 -- Rex
-BuildRequires: exiv2-devel >= 0.11
+BuildRequires: exiv2-devel >= 0.12
 
 ## Optional, not strictly required.
 #Requires(hint): kipi-plugins
@@ -56,11 +55,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category "X-Fedora" --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -109,6 +103,13 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  2.2-7
+- BR: exiv2-devel >= 0.12
+
+* Wed Oct 04 2006 Rex Dieter  2.2-6
+- respin
+- drop deprecated Provides: kimdaba
+
 * Tue Sep 19 2006 Rex Dieter  2.2-5
 - BR: exiv2-devel >= 0.11
 



From fedora-extras-commits at redhat.com  Tue Nov 28 16:56:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 11:56:17 -0500
Subject: rpms/libassuan/FC-6 .cvsignore, 1.8, 1.9 libassuan.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <200611281656.kASGuHNV014299@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14279

Modified Files:
	.cvsignore libassuan.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  - 1.0.1-1
- libassuan-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Nov 2006 03:05:29 -0000	1.8
+++ .cvsignore	28 Nov 2006 16:55:47 -0000	1.9
@@ -1,4 +1,4 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-1.0.0.tar.bz2
-libassuan-1.0.0.tar.bz2.sig
+libassuan-1.0.1.tar.bz2.sig
+libassuan-1.0.1.tar.bz2


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/libassuan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libassuan.spec	14 Nov 2006 03:05:29 -0000	1.21
+++ libassuan.spec	28 Nov 2006 16:55:47 -0000	1.22
@@ -1,7 +1,7 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 1.0.0 
+Version: 1.0.1
 Release: 1%{?dist}
 
 License: LGPL
@@ -82,8 +82,11 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  - 1.0.1-1
+- libassuan-1.0.1
+
 * Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
-- 1.0.0
+- libassuan-1.0.0
 - rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
 
 * Wed Oct 18 2006 Rex Dieter  - 0.9.3-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Nov 2006 03:05:29 -0000	1.8
+++ sources	28 Nov 2006 16:55:47 -0000	1.9
@@ -1,2 +1,2 @@
-f1580ef149e629629a9639a5afdb5908  libassuan-1.0.0.tar.bz2
-c00497327001dcccf7d3a952f56030e4  libassuan-1.0.0.tar.bz2.sig
+003d24e08f2eeee14b5afcc1a1998f40  libassuan-1.0.1.tar.bz2.sig
+6109ea5c8c34ee5591afbd4618dd5ab4  libassuan-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 17:06:33 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:06:33 -0500
Subject: rpms/heartbeat/devel heartbeat.spec,1.10,1.11
Message-ID: <200611281706.kASH6XjU017461@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17444

Modified Files:
	heartbeat.spec 
Log Message:
* Tue Nov 28 2006 Joost Soeterbroek  - 2.0.7-4
- rebuild for updated net-snmp, soname change



Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- heartbeat.spec	29 Oct 2006 11:08:28 -0000	1.10
+++ heartbeat.spec	28 Nov 2006 17:06:03 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -301,6 +301,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 2.0.7-4
+- rebuild for updated net-snmp, soname change
+
 * Sun Oct 29 2006 Joost Soeterbroek  - 2.0.7-3
 - fix preun, postun to check for upgrade (#212133)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:07:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 12:07:04 -0500
Subject: rpms/gnupg2/FC-6 .cvsignore, 1.15, 1.16 gnupg2.spec, 1.54,
	1.55 sources, 1.17, 1.18
Message-ID: <200611281707.kASH74J3017485@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17465

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  2.0.1-0.3.rc1
- gnupg-2.0.1rc1 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Nov 2006 20:59:45 -0000	1.15
+++ .cvsignore	28 Nov 2006 17:06:34 -0000	1.16
@@ -1,4 +1,5 @@
-gnupg-1.9.95.tar.bz2
-gnupg-1.9.95.tar.bz2.sig
+clog
 gnupg-2.0.0.tar.bz2
 gnupg-2.0.0.tar.bz2.sig
+gnupg-2.0.1rc1.tar.bz2
+gnupg-2.0.1rc1.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/gnupg2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnupg2.spec	16 Nov 2006 20:59:45 -0000	1.54
+++ gnupg2.spec	28 Nov 2006 17:06:34 -0000	1.55
@@ -7,15 +7,17 @@
 %define kde_scriptdir %{_prefix}
 %endif
 
+%define beta rc1
+
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.0
-Release: 4%{?dist}
+Version: 2.0.1
+Release: 0.3.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,7 +32,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-static >= 1.0.0 
+BuildRequires: libassuan-static >= 1.0.1 
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -78,7 +80,7 @@
 
 
 %prep
-%setup -q -n gnupg-%{version}
+%setup -q -n gnupg-%{version}%{?beta}
 
 #patch1 -p1 -b .testverbose
 
@@ -165,7 +167,6 @@
 %{_bindir}/watchgnupg
 %{_sbindir}/*
 %{_datadir}/gnupg/
-%{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
 %{_mandir}/man?/*
@@ -178,6 +179,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  2.0.1-0.3.rc1
+- gnupg-2.0.1rc1 
+
 * Thu Nov 16 2006 Rex Dieter  2.0.0-4
 - update %%description
 - drop dearmor patch
@@ -186,7 +190,7 @@
 - BR: libassuan-static >= 1.0.0
 
 * Mon Nov 13 2006 Rex Dieter  2.0.0-2
-- 2.0.0
+- gnupg-2.0.0
 
 * Fri Nov 10 2006 Rex Dieter  1.9.95-3
 - upstream 64bit patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	16 Nov 2006 20:59:46 -0000	1.17
+++ sources	28 Nov 2006 17:06:34 -0000	1.18
@@ -1,2 +1,2 @@
-65dc5da3bd4ec127f81c584c8200d813  gnupg-2.0.0.tar.bz2.sig
-13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2
+e782017943dcf59e3f5b71556e921be4  gnupg-2.0.1rc1.tar.bz2
+2dee9b82c53b42c13267b794aa3fae00  gnupg-2.0.1rc1.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Nov 28 17:11:51 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:11:51 -0500
Subject: rpms/trac/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 trac.spec,
	1.11, 1.12
Message-ID: <200611281711.kASHBp1P017611@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17592

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
- upstream release 0.10.2 (#217539)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 11:50:06 -0000	1.7
+++ .cvsignore	28 Nov 2006 17:11:21 -0000	1.8
@@ -1 +1 @@
-trac-0.10.1.tar.gz
+trac-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 11:50:06 -0000	1.7
+++ sources	28 Nov 2006 17:11:21 -0000	1.8
@@ -1 +1 @@
-55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz
+18df3bb6c9699297c6f41a5a1a448ff9  trac-0.10.2.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- trac.spec	11 Nov 2006 11:50:06 -0000	1.11
+++ trac.spec	28 Nov 2006 17:11:21 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
+- upstream release 0.10.2 (#217539)
+
 * Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
 - upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:21:56 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:21:56 -0500
Subject: rpms/trac/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 trac.spec,
	1.10, 1.11
Message-ID: <200611281721.kASHLuaY017849@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17790/FC-5

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.2 (#217539)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 14:30:19 -0000	1.7
+++ .cvsignore	28 Nov 2006 17:21:26 -0000	1.8
@@ -1 +1 @@
-trac-0.10.1.tar.gz
+trac-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 14:30:19 -0000	1.7
+++ sources	28 Nov 2006 17:21:26 -0000	1.8
@@ -1 +1 @@
-55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz
+18df3bb6c9699297c6f41a5a1a448ff9  trac-0.10.2.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/trac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trac.spec	11 Nov 2006 14:30:19 -0000	1.10
+++ trac.spec	28 Nov 2006 17:21:26 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
+- upstream release 0.10.2 (#217539)
+
 * Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
 - upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:21:55 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:21:55 -0500
Subject: rpms/trac/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 trac.spec,
	1.10, 1.11
Message-ID: <200611281721.kASHLtg3017844@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17790/FC-4

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.2 (#217539)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 14:30:18 -0000	1.7
+++ .cvsignore	28 Nov 2006 17:21:25 -0000	1.8
@@ -1 +1 @@
-trac-0.10.1.tar.gz
+trac-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 14:30:18 -0000	1.7
+++ sources	28 Nov 2006 17:21:25 -0000	1.8
@@ -1 +1 @@
-55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz
+18df3bb6c9699297c6f41a5a1a448ff9  trac-0.10.2.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trac.spec	11 Nov 2006 14:30:18 -0000	1.10
+++ trac.spec	28 Nov 2006 17:21:25 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
+- upstream release 0.10.2 (#217539)
+
 * Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
 - upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:22:01 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:22:01 -0500
Subject: rpms/trac/FC-6 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 trac.spec,
	1.11, 1.12
Message-ID: <200611281722.kASHM14Z017854@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17790/FC-6

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.2 (#217539)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 14:30:24 -0000	1.7
+++ .cvsignore	28 Nov 2006 17:21:31 -0000	1.8
@@ -1 +1 @@
-trac-0.10.1.tar.gz
+trac-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 14:30:24 -0000	1.7
+++ sources	28 Nov 2006 17:21:31 -0000	1.8
@@ -1 +1 @@
-55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz
+18df3bb6c9699297c6f41a5a1a448ff9  trac-0.10.2.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/trac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- trac.spec	11 Nov 2006 14:30:24 -0000	1.11
+++ trac.spec	28 Nov 2006 17:21:31 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
+- upstream release 0.10.2 (#217539)
+
 * Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
 - upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:27:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 28 Nov 2006 12:27:20 -0500
Subject: rpms/gnonlin/devel .cvsignore, 1.5, 1.6 gnonlin.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200611281727.kASHRKZY018024@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnonlin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18005

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Tue Nov 28 2006 Brian Pepple  - 0.10.6-1
- Add dist tag.
- Update to 0.10.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Jul 2006 04:14:58 -0000	1.5
+++ .cvsignore	28 Nov 2006 17:26:50 -0000	1.6
@@ -1 +1 @@
-gnonlin-0.10.5.tar.gz
+gnonlin-0.10.6.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnonlin.spec	16 Oct 2006 16:19:41 -0000	1.10
+++ gnonlin.spec	28 Nov 2006 17:26:50 -0000	1.11
@@ -2,14 +2,14 @@
 %define		gst_plugins_base_req	0.10.4
 
 Name: 		gnonlin
-Version: 	0.10.5
-Release:	3
+Version: 	0.10.6
+Release:	1%{?dist}
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
 License: 	LGPL
 URL:		http://gnonlin.sourceforge.net/
-Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	gstreamer-devel >= %{gst_req}
@@ -30,7 +30,7 @@
 
 
 %build
-%configure --enable-static=no
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -51,6 +51,10 @@
 
 
 %changelog
+* Tue Nov 28 2006 Brian Pepple  - 0.10.6-1
+- Add dist tag.
+- Update to 0.10.6.
+
 * Mon Oct 16 2006 Brian Pepple  - 0.10.5-3
 - Unorphan & rebuild.
 - Require gstreamer-plugins-base.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Jul 2006 04:14:58 -0000	1.5
+++ sources	28 Nov 2006 17:26:50 -0000	1.6
@@ -1 +1 @@
-9c3ecac08be2f9786edf65c623f69014  gnonlin-0.10.5.tar.gz
+9ea0467c03113b927e6953709e823dba  gnonlin-0.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 17:31:51 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:31:51 -0500
Subject: rpms/libsyncml - New directory
Message-ID: <200611281731.kASHVpOM018140@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18136/libsyncml

Log Message:
Directory /cvs/extras/rpms/libsyncml added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 28 17:31:56 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:31:56 -0500
Subject: rpms/libsyncml/devel - New directory
Message-ID: <200611281731.kASHVuwQ018153@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18136/libsyncml/devel

Log Message:
Directory /cvs/extras/rpms/libsyncml/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 28 17:32:13 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:32:13 -0500
Subject: rpms/libsyncml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611281732.kASHWDFQ018187@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18181

Added Files:
	Makefile import.log 
Log Message:
Setup of module libsyncml


--- NEW FILE Makefile ---
# Top level Makefile for module libsyncml
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  Tue Nov 28 17:32:18 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:32:18 -0500
Subject: rpms/libsyncml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611281732.kASHWIvI018202@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18181/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libsyncml


--- 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 Nov 28 17:32:49 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:32:49 -0500
Subject: owners owners.list,1.2026,1.2027
Message-ID: <200611281732.kASHWnUh018247@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18169

Modified Files:
	owners.list 
Log Message:
Add libsyncml. Review request #217524 accepted.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -r1.2026 -r1.2027
--- owners.list	28 Nov 2006 13:01:27 -0000	1.2026
+++ owners.list	28 Nov 2006 17:32:19 -0000	1.2027
@@ -1007,6 +1007,7 @@
 Fedora Extras|libsvg-cairo|Renders SVG content using cairo|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsx|Simple X library|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libsynaptics|Synaptics touchpad driver library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsyncml|SyncML protocol library|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|libtcd|Tide Constituent Database Library|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 17:33:38 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:33:38 -0500
Subject: rpms/libsyncml import.log,1.1,1.2
Message-ID: <200611281733.kASHXcvD018296@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263

Modified Files:
	import.log 
Log Message:
auto-import libsyncml-0.4.2-1 on branch devel from libsyncml-0.4.2-1.src.rpm
Initial import of libsyncml into FE. Review request #217524 accepted.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsyncml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Nov 2006 17:32:13 -0000	1.1
+++ import.log	28 Nov 2006 17:33:08 -0000	1.2
@@ -0,0 +1 @@
+libsyncml-0_4_2-1:HEAD:libsyncml-0.4.2-1.src.rpm:1164735304



From fedora-extras-commits at redhat.com  Tue Nov 28 17:33:38 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:33:38 -0500
Subject: rpms/libsyncml/devel libsyncml-0.4.2.doctype.patch, NONE,
	1.1 libsyncml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611281733.kASHXcj1018300@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libsyncml-0.4.2.doctype.patch libsyncml.spec 
Log Message:
auto-import libsyncml-0.4.2-1 on branch devel from libsyncml-0.4.2-1.src.rpm
Initial import of libsyncml into FE. Review request #217524 accepted.

libsyncml-0.4.2.doctype.patch:

--- NEW FILE libsyncml-0.4.2.doctype.patch ---
Index: trunk/libsyncml/parser/sml_xml_assm.c
===================================================================
--- trunk/libsyncml/parser/sml_xml_assm.c (revision 193)
+++ trunk/libsyncml/parser/sml_xml_assm.c (revision 212)
@@ -1442,12 +1442,15 @@
 	switch (assm->session->version) {
 		case SML_VERSION_10:
+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"");
 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML10, error))
 				goto error_free_writer;
 			break;
 		case SML_VERSION_11:
+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"");
 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML11, error))
 				goto error_free_writer;
 			break;
 		case SML_VERSION_12:
+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"");
 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML12, error))
 				goto error_free_writer;


--- NEW FILE libsyncml.spec ---
Name:		libsyncml
Version:	0.4.2
Release:	1%{?dist}
Summary:	SyncML protocol library

Group:		System Environment/Libraries
License:	LGPL
URL:		http://libsyncml.opensync.org/
# Get the tarball from http://libsyncml.opensync.org/attachment/wiki/download/%{name}-%{version}.tar.gz?rev=&format=raw
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:	openobex-devel bluez-libs-devel

%description
%{summary}.

%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1

# Fix some permissions
chmod a-x libsyncml/syncml.h

%build
%configure --disable-static --disable-unit-tests

# Disable rpath.
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/syncml-http-server
%{_bindir}/syncml-obex-client
%{_libdir}/libsyncml.so.0*
%{_mandir}/man1/syncml-http-server.1.gz
%{_mandir}/man1/syncml-obex-client.1.gz

%files devel
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_includedir}/libsyncml-1.0/
%{_libdir}/libsyncml.so
%exclude %{_libdir}/libsyncml.la
%{_libdir}/pkgconfig/libsyncml-1.0.pc


%changelog
* Mon Nov 27 2006 Laurent Rineau  - 0.4.2-1
- Initial release for Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsyncml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Nov 2006 17:32:18 -0000	1.1
+++ .cvsignore	28 Nov 2006 17:33:08 -0000	1.2
@@ -0,0 +1 @@
+libsyncml-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsyncml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Nov 2006 17:32:18 -0000	1.1
+++ sources	28 Nov 2006 17:33:08 -0000	1.2
@@ -0,0 +1 @@
+66fad49f54e78ce34c1453c62958e037  libsyncml-0.4.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 18:53:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 13:53:36 -0500
Subject: owners owners.list,1.2027,1.2028
Message-ID: <200611281853.kASIra9S021986@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21957

Modified Files:
	owners.list 
Log Message:
Fix OpenEXR entry for co-maintainership, (again? Could have sworn I fixed it before recently)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2027
retrieving revision 1.2028
diff -u -r1.2027 -r1.2028
--- owners.list	28 Nov 2006 17:32:19 -0000	1.2027
+++ owners.list	28 Nov 2006 18:53:06 -0000	1.2028
@@ -1249,7 +1249,7 @@
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|rc040203 at freenet.de|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
+Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org,ivazquez at ivazquez.net|
 Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 18:54:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 13:54:59 -0500
Subject: owners owners.list,1.2028,1.2029
Message-ID: <200611281854.kASIsxnc022036@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21997

Modified Files:
	owners.list 
Log Message:
OK, re-reading header/comments shows I was wrong, unfixing.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2028
retrieving revision 1.2029
diff -u -r1.2028 -r1.2029
--- owners.list	28 Nov 2006 18:53:06 -0000	1.2028
+++ owners.list	28 Nov 2006 18:54:28 -0000	1.2029
@@ -1249,7 +1249,7 @@
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|rc040203 at freenet.de|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org,ivazquez at ivazquez.net|
+Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 18:56:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 13:56:31 -0500
Subject: owners owners.list,1.2029,1.2030
Message-ID: <200611281856.kASIuVcV022063@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22046

Modified Files:
	owners.list 
Log Message:
libpqxx: +cc: rdieter



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2029
retrieving revision 1.2030
diff -u -r1.2029 -r1.2030
--- owners.list	28 Nov 2006 18:54:28 -0000	1.2029
+++ owners.list	28 Nov 2006 18:56:01 -0000	1.2030
@@ -982,7 +982,7 @@
 Fedora Extras|libpaper|Library and tools for handling papersize|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libpng10|Old version of libpng, needed to run old binaries|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|libpolyxmass|Polymer chemistry-related functionalities|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|rdieter at math.unl.edu
 Fedora Extras|libpri|An implementation of Primary Rate ISDN|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|libqalculate|Multi-purpose calculator library|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libreadline-java|A Java wrapper around EditLine|ifoox at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 19:33:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 14:33:59 -0500
Subject: rpms/PyQt-qscintilla/FC-6 PyQt-qscintilla.spec,1.6,1.7
Message-ID: <200611281933.kASJXxoC025638@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25618

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
BR: python-devel



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-6/PyQt-qscintilla.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PyQt-qscintilla.spec	6 Nov 2006 15:20:21 -0000	1.6
+++ PyQt-qscintilla.spec	28 Nov 2006 19:33:29 -0000	1.7
@@ -13,9 +13,12 @@
 BuildRequires: qt-devel
 BuildRequires: qscintilla-devel
 BuildRequires: sip-devel
+BuildRequires: python-devel
 %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"
 Requires: python-abi = %{python_ver}
+%endif
 Requires: PyQt = %{version}
 
 %description



From fedora-extras-commits at redhat.com  Tue Nov 28 20:27:27 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 28 Nov 2006 15:27:27 -0500
Subject: rpms/codeblocks/devel .cvsignore, 1.8, 1.9 codeblocks.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200611282027.kASKRRsr029836@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29817

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3295


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Nov 2006 12:00:45 -0000	1.8
+++ .cvsignore	28 Nov 2006 20:26:57 -0000	1.9
@@ -1 +1 @@
-codeblocks-svn3268.tar.bz2
+codeblocks-svn3295.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- codeblocks.spec	26 Nov 2006 12:00:45 -0000	1.7
+++ codeblocks.spec	28 Nov 2006 20:26:57 -0000	1.8
@@ -1,9 +1,9 @@
-%define		rev	3268
-%define		date	20061125
+%define		rev	3295
+%define		date	20061128
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.15.%{date}svn%{rev}%{?dist}
+Release:	0.16.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
+- update to revision 3295
+
 * Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
 - update to revision 3268
 - fixes #217081


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Nov 2006 12:00:45 -0000	1.8
+++ sources	28 Nov 2006 20:26:57 -0000	1.9
@@ -1 +1 @@
-a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2
+74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 20:34:19 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 28 Nov 2006 15:34:19 -0500
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.8, 1.9 codeblocks.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200611282034.kASKYJP0029952@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29929

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3295


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Nov 2006 12:05:06 -0000	1.8
+++ .cvsignore	28 Nov 2006 20:33:49 -0000	1.9
@@ -1 +1 @@
-codeblocks-svn3268.tar.bz2
+codeblocks-svn3295.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- codeblocks.spec	26 Nov 2006 12:05:06 -0000	1.7
+++ codeblocks.spec	28 Nov 2006 20:33:49 -0000	1.8
@@ -1,9 +1,9 @@
-%define		rev	3268
-%define		date	20061125
+%define		rev	3295
+%define		date	20061128
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.15.%{date}svn%{rev}%{?dist}
+Release:	0.16.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
+- update to revision 3295
+
 * Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
 - update to revision 3268
 - fixes #217081


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Nov 2006 12:05:06 -0000	1.8
+++ sources	28 Nov 2006 20:33:49 -0000	1.9
@@ -1 +1 @@
-a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2
+74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 20:36:47 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 28 Nov 2006 15:36:47 -0500
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.8, 1.9 codeblocks.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200611282036.kASKalXQ030034@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3295


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Nov 2006 12:09:17 -0000	1.8
+++ .cvsignore	28 Nov 2006 20:36:17 -0000	1.9
@@ -1 +1 @@
-codeblocks-svn3268.tar.bz2
+codeblocks-svn3295.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- codeblocks.spec	26 Nov 2006 12:09:17 -0000	1.7
+++ codeblocks.spec	28 Nov 2006 20:36:17 -0000	1.8
@@ -1,9 +1,9 @@
-%define		rev	3268
-%define		date	20061125
+%define		rev	3295
+%define		date	20061128
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.15.%{date}svn%{rev}%{?dist}
+Release:	0.16.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
+- update to revision 3295
+
 * Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
 - update to revision 3268
 - fixes #217081


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Nov 2006 12:09:17 -0000	1.8
+++ sources	28 Nov 2006 20:36:17 -0000	1.9
@@ -1 +1 @@
-a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2
+74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 21:11:11 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 28 Nov 2006 16:11:11 -0500
Subject: rpms/digikam/devel .cvsignore, 1.6, 1.7 digikam.spec, 1.26,
	1.27 sources, 1.6, 1.7
Message-ID: <200611282111.kASLBBDv000874@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv835

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Update to version 0.9.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Aug 2006 20:13:53 -0000	1.6
+++ .cvsignore	28 Nov 2006 21:10:41 -0000	1.7
@@ -1 +1 @@
-digikam-0.8.2.tar.bz2
+digikam-0.9.0-rc1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- digikam.spec	31 Aug 2006 22:59:24 -0000	1.26
+++ digikam.spec	28 Nov 2006 21:10:41 -0000	1.27
@@ -1,17 +1,19 @@
+%define prever rc1
+
 Name:		digikam
-Version:	0.8.2
-Release:	3%{?dist}
+Version:	0.9.0
+Release:	0.1.%{alphatag}%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}%{?prever:-%{prever}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
-BuildRequires:	imlib2-devel libkexif-devel >= 0.2.4 libkipi-devel >= 0.1
-BuildRequires:	libtiff-devel libpng-devel sqlite-devel >= 3.0.0 gettext
+BuildRequires:	libkipi-devel >= 0.1 lcms-devel exiv2-devel libtiff-devel
+BuildRequires:	libpng-devel >= 1.2.7 sqlite-devel >= 3.0.0 gettext
 BuildRequires:	pkgconfig desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -37,7 +39,7 @@
 needed to develop applications using %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?prever:-%{prever}}
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -46,8 +48,9 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
+# Broken on 0.9.0-rc1
+#	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -97,7 +100,7 @@
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING README TODO
+%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/libdigikam.so.*
 %{_libdir}/kde3/digikamimageplugin_core.la
@@ -106,8 +109,10 @@
 %{_libdir}/kde3/kio_digikam*.so
 %{_datadir}/applications/*.desktop
 %{_datadir}/apps/digikam/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*/apps/*.png
+%{_mandir}/man1/*.1*
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -118,6 +123,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.9.0-0.1.rc1
+- Update to version 0.9.0-rc1
+
 * Fri Sep 01 2006 Marcin Garski  0.8.2-3
 - Rebuild for Fedora Core 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Aug 2006 20:13:53 -0000	1.6
+++ sources	28 Nov 2006 21:10:41 -0000	1.7
@@ -1 +1 @@
-fd57b7bfe4577dc2e2efd6d33122a46b  digikam-0.8.2.tar.bz2
+a28353bb20b3ab284965ff07054699e6  digikam-0.9.0-rc1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 21:11:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 16:11:37 -0500
Subject: rpms/qscintilla/FC-6 .cvsignore, 1.2, 1.3 qscintilla.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200611282111.kASLBbDc000879@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qscintilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv855

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Thu Nov 09 2006 Rex Dieter  - 1.7-1
- QScintilla1-1.71-gpl-1.7 (#214192)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 21:11:07 -0000	1.3
@@ -1 +1,2 @@
 qscintilla-1.65-gpl-1.6.tar.gz
+QScintilla1-1.71-gpl-1.7.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-6/qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qscintilla.spec	3 Sep 2006 19:10:45 -0000	1.4
+++ qscintilla.spec	28 Nov 2006 21:11:07 -0000	1.5
@@ -1,24 +1,28 @@
-%define         scintilla_ver   1.65
-%define         qtdir           %{_libdir}/qt-3.3
+
+%define         scintilla_ver   1.71
 
 Name:	        qscintilla 
-Version:        1.6
-Release:        3.3%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPL
 Group:          Development/Tools
 Url:            http://www.riverbankcomputing.co.uk/qscintilla/
-Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
-Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
+Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla1-%{scintilla_ver}-gpl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4
+Patch1: 	qscintilla-1.61-gpl-1.4-designer-incpath.patch
+
+BuildRequires:  qt-devel
+
+%global qtdir	%(qmake -query QT_INSTALL_PREFIX)
+%global qtdata	%(qmake -query QT_INSTALL_DATA)
+%global qtinc	%{qtdir}/include 
+%global qtlib	%{qtdir}/lib 
 
 %description
-QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
-and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
-MacOS/X).  Qt v3 or later is required.
+QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
 This version of QScintilla is based on Scintilla v%{scintilla_ver}.
 
@@ -27,28 +31,27 @@
 Summary:        QScintilla designer plugin 
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4
-
+Requires:       qt-designer
 %description designer
-QScintillla designer plugin.
-
+%{summary}.
 
 %package devel
 Summary:        QScintilla Development Files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4
-
+Requires:       qt-devel 
 %description devel
-These are the development files for QScintilla, needed to build against
-QScintilla.
+%{summary}.
 
 
 %prep
-%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
+%setup -q -n QScintilla1-%{scintilla_ver}-gpl-%{version}
+
 %patch1 -p1 -b .designer-incpath
+
 # fixups to support RPM_BUILD_ROOT/DESTDIR
 sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
+
 # fix permissions on doc files
 find doc example -type f -exec chmod 0644 {} ';'
 
@@ -84,29 +87,31 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
-%{qtdir}/lib/*.so.*
-%{qtdir}/translations/*
-
+%{qtlib}/lib*.so.*
+%{qtdata}/translations/*
 
 %files designer
 %defattr(-,root,root,-)
 %{qtdir}/plugins/designer/*
 
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html doc/Scintilla example
-%{qtdir}/lib/*.so
-%{qtdir}/include/*
+%{qtlib}/lib*.so
+%{qtinc}/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  - 1.7-1
+- QScintilla1-1.71-gpl-1.7 (#214192)
+
 * Sun Sep 03 2006 Konstantin Ryabitsev  - 1.6-3.3
 - FC6 rebuild.
 - Export flags.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 15:10:44 -0000	1.2
+++ sources	28 Nov 2006 21:11:07 -0000	1.3
@@ -1 +1 @@
-8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz
+145321e9e3ae7d4edc7f2bf6954b6763  QScintilla1-1.71-gpl-1.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 21:13:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 16:13:48 -0500
Subject: rpms/qscintilla/FC-5 .cvsignore, 1.2, 1.3 qscintilla.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200611282113.kASLDmBj000969@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qscintilla/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv934

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Thu Nov 09 2006 Rex Dieter  - 1.7-1
- QScintilla1-1.71-gpl-1.7 (#214192)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 21:13:18 -0000	1.3
@@ -1 +1,2 @@
 qscintilla-1.65-gpl-1.6.tar.gz
+QScintilla1-1.71-gpl-1.7.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qscintilla.spec	3 Sep 2006 19:10:45 -0000	1.4
+++ qscintilla.spec	28 Nov 2006 21:13:18 -0000	1.5
@@ -1,24 +1,28 @@
-%define         scintilla_ver   1.65
-%define         qtdir           %{_libdir}/qt-3.3
+
+%define         scintilla_ver   1.71
 
 Name:	        qscintilla 
-Version:        1.6
-Release:        3.3%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPL
 Group:          Development/Tools
 Url:            http://www.riverbankcomputing.co.uk/qscintilla/
-Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
-Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
+Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla1-%{scintilla_ver}-gpl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4
+Patch1: 	qscintilla-1.61-gpl-1.4-designer-incpath.patch
+
+BuildRequires:  qt-devel
+
+%global qtdir	%(qmake -query QT_INSTALL_PREFIX)
+%global qtdata	%(qmake -query QT_INSTALL_DATA)
+%global qtinc	%{qtdir}/include 
+%global qtlib	%{qtdir}/lib 
 
 %description
-QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
-and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
-MacOS/X).  Qt v3 or later is required.
+QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
 This version of QScintilla is based on Scintilla v%{scintilla_ver}.
 
@@ -27,28 +31,27 @@
 Summary:        QScintilla designer plugin 
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4
-
+Requires:       qt-designer
 %description designer
-QScintillla designer plugin.
-
+%{summary}.
 
 %package devel
 Summary:        QScintilla Development Files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4
-
+Requires:       qt-devel 
 %description devel
-These are the development files for QScintilla, needed to build against
-QScintilla.
+%{summary}.
 
 
 %prep
-%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
+%setup -q -n QScintilla1-%{scintilla_ver}-gpl-%{version}
+
 %patch1 -p1 -b .designer-incpath
+
 # fixups to support RPM_BUILD_ROOT/DESTDIR
 sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
+
 # fix permissions on doc files
 find doc example -type f -exec chmod 0644 {} ';'
 
@@ -84,29 +87,31 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
-%{qtdir}/lib/*.so.*
-%{qtdir}/translations/*
-
+%{qtlib}/lib*.so.*
+%{qtdata}/translations/*
 
 %files designer
 %defattr(-,root,root,-)
 %{qtdir}/plugins/designer/*
 
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html doc/Scintilla example
-%{qtdir}/lib/*.so
-%{qtdir}/include/*
+%{qtlib}/lib*.so
+%{qtinc}/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  - 1.7-1
+- QScintilla1-1.71-gpl-1.7 (#214192)
+
 * Sun Sep 03 2006 Konstantin Ryabitsev  - 1.6-3.3
 - FC6 rebuild.
 - Export flags.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 15:10:44 -0000	1.2
+++ sources	28 Nov 2006 21:13:18 -0000	1.3
@@ -1 +1 @@
-8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz
+145321e9e3ae7d4edc7f2bf6954b6763  QScintilla1-1.71-gpl-1.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 21:13:55 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 28 Nov 2006 16:13:55 -0500
Subject: rpms/digikam/devel digikam.spec,1.27,1.28
Message-ID: <200611282113.kASLDtrM001010@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930

Modified Files:
	digikam.spec 
Log Message:
- Typo



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- digikam.spec	28 Nov 2006 21:10:41 -0000	1.27
+++ digikam.spec	28 Nov 2006 21:13:25 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:		digikam
 Version:	0.9.0
-Release:	0.1.%{alphatag}%{?dist}
+Release:	0.1%{?prever:.%{prever}}%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia



From fedora-extras-commits at redhat.com  Tue Nov 28 21:21:27 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 28 Nov 2006 16:21:27 -0500
Subject: rpms/digikam/devel digikam.spec,1.28,1.29
Message-ID: <200611282121.kASLLRBb001177@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1155

Modified Files:
	digikam.spec 
Log Message:
- Rebuild



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- digikam.spec	28 Nov 2006 21:13:25 -0000	1.28
+++ digikam.spec	28 Nov 2006 21:20:56 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:		digikam
 Version:	0.9.0
-Release:	0.1%{?prever:.%{prever}}%{?dist}
+Release:	0.2%{?prever:.%{prever}}%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -123,6 +123,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.9.0-0.2.rc1
+- Rebuild
+
 * Tue Nov 28 2006 Marcin Garski  0.9.0-0.1.rc1
 - Update to version 0.9.0-rc1
 



From fedora-extras-commits at redhat.com  Tue Nov 28 22:18:36 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 28 Nov 2006 17:18:36 -0500
Subject: rpms/python-eyed3/FC-6 .cvsignore, 1.2, 1.3 python-eyed3.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200611282218.kASMIagD004580@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557

Modified Files:
	.cvsignore python-eyed3.spec sources 
Log Message:
* Tue Nov 28 2006 Brian Pepple  - 0.6.11-1
- Update to 0.6.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 18:03:35 -0000	1.2
+++ .cvsignore	28 Nov 2006 22:18:06 -0000	1.3
@@ -1 +1 @@
-eyeD3-0.6.10.tar.gz
+eyeD3-0.6.11.tar.gz


Index: python-eyed3.spec
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/FC-6/python-eyed3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-eyed3.spec	7 Oct 2006 18:03:35 -0000	1.1
+++ python-eyed3.spec	28 Nov 2006 22:18:06 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-eyed3
-Version:        0.6.10
-Release:        2%{?dist}
+Version:        0.6.11
+Release:        1%{?dist}
 Summary:        Python module for processing ID3 tags
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@
 
 
 %description
-Aa Python module and program for processing ID3 tags. Information about
+A Python module and program for processing ID3 tags. Information about
 mp3 files(i.e bit rate, sample frequency, play time, etc.) is also
 provided. The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Brian Pepple  - 0.6.11-1
+- Update to 0.6.11.
+
 * Sat Oct  7 2006 Brian Pepple  - 0.6.10-2
 - Change BR to python.
 - Remove unnecessary make in build section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 18:03:35 -0000	1.2
+++ sources	28 Nov 2006 22:18:06 -0000	1.3
@@ -1 +1 @@
-2f7ee6749b993faba3b5d10d9621d314  eyeD3-0.6.10.tar.gz
+e296d7b896a31abf429d542dd26c90a3  eyeD3-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 22:46:25 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue, 28 Nov 2006 17:46:25 -0500
Subject: rpms/njb-sharp/FC-5 njb-sharp.spec,1.1,1.2
Message-ID: <200611282246.kASMkPtg004753@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4738

Modified Files:
	njb-sharp.spec 
Log Message:
Iterative build tries.



Index: njb-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/FC-5/njb-sharp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- njb-sharp.spec	22 Nov 2006 19:48:01 -0000	1.1
+++ njb-sharp.spec	28 Nov 2006 22:45:55 -0000	1.2
@@ -1,14 +1,14 @@
 # This is only a temporary fix until FC5 is brought in
 # line with FC6.
-%if "%{?fedora}" == "5"
-%define monodir %{_prefix}/lib
-%else
+#%if "%{?fedora}" == "5"
+#%define monodir %{_prefix}/lib
+#%else
 %define monodir %{_libdir}
-%endif
+#%endif
 
 Name: 		njb-sharp
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://banshee-project.org/Subprojects/Njb-sharp
 Summary:	C sharp library to control the Nomad jukebox database
 Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
@@ -35,9 +35,9 @@
 
 %prep
 %setup -q
-%if "%{?fedora}" > "5"
-%patch0 -p1
-%endif
+#%if "%{?fedora}" > "5"
+#%patch0 -p1
+#%endif
 
 %build
 %configure
@@ -77,6 +77,9 @@
 %{monodir}/pkgconfig/*
 
 %changelog
+* Tue Nov 28 2006 Linus Walleij  0.3.0-6
+- See if FC5 happen to be aligned with FC6 now.
+
 * Sat Oct 21 2006 Linus Walleij  0.3.0-5
 - More picking around in the spec...
 



From fedora-extras-commits at redhat.com  Tue Nov 28 22:59:20 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Tue, 28 Nov 2006 17:59:20 -0500
Subject: rpms/VLGothic-fonts/FC-6 VLGothic-fonts.spec,1.1,1.2
Message-ID: <200611282259.kASMxKjB004902@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4875

Modified Files:
	VLGothic-fonts.spec 
Log Message:
Fix the misstyped dist tag.



Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/FC-6/VLGothic-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VLGothic-fonts.spec	23 Nov 2006 00:10:23 -0000	1.1
+++ VLGothic-fonts.spec	28 Nov 2006 22:58:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20061026
-Release: 3%{?_dist}
+Release: 3%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: Distributable
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Ryo Dairiki  - 20061026-4
+- Fix the misstyped dist tag.
+
 * Sat Nov 18 2006 Ryo Dairiki  - 20061026-3
 - Modify the specfile along with the Fedora Extras packaging policy.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 23:00:56 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Tue, 28 Nov 2006 18:00:56 -0500
Subject: rpms/VLGothic-fonts/FC-6 VLGothic-fonts.spec,1.2,1.3
Message-ID: <200611282300.kASN0u1e004974@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4947

Modified Files:
	VLGothic-fonts.spec 
Log Message:



Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/FC-6/VLGothic-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VLGothic-fonts.spec	28 Nov 2006 22:58:50 -0000	1.2
+++ VLGothic-fonts.spec	28 Nov 2006 23:00:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20061026
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: Distributable



From fedora-extras-commits at redhat.com  Tue Nov 28 23:02:31 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Tue, 28 Nov 2006 18:02:31 -0500
Subject: rpms/VLGothic-fonts/FC-5 VLGothic-fonts.spec,1.1,1.2
Message-ID: <200611282302.kASN2Vud008079@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8054

Modified Files:
	VLGothic-fonts.spec 
Log Message:
Fix the misstyped dist tag.



Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/FC-5/VLGothic-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VLGothic-fonts.spec	23 Nov 2006 00:10:23 -0000	1.1
+++ VLGothic-fonts.spec	28 Nov 2006 23:02:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20061026
-Release: 3%{?_dist}
+Release: 4%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: Distributable
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Ryo Dairiki  - 20061026-4
+- Fix the misstyped dist tag.
+
 * Sat Nov 18 2006 Ryo Dairiki  - 20061026-3
 - Modify the specfile along with the Fedora Extras packaging policy.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 23:04:00 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Tue, 28 Nov 2006 18:04:00 -0500
Subject: rpms/VLGothic-fonts/devel VLGothic-fonts.spec,1.1,1.2
Message-ID: <200611282304.kASN40fT008188@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8169

Modified Files:
	VLGothic-fonts.spec 
Log Message:
Fix the misstyped dist tag.


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/devel/VLGothic-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VLGothic-fonts.spec	23 Nov 2006 00:10:23 -0000	1.1
+++ VLGothic-fonts.spec	28 Nov 2006 23:03:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20061026
-Release: 3%{?_dist}
+Release: 4%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: Distributable
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Ryo Dairiki  - 20061026-4
+- Fix the misstyped dist tag.
+
 * Sat Nov 18 2006 Ryo Dairiki  - 20061026-3
 - Modify the specfile along with the Fedora Extras packaging policy.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 23:05:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 18:05:41 -0500
Subject: rpms/xtide/devel .cvsignore,1.4,1.5
Message-ID: <200611282305.kASN5ffJ008280@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8265

Added Files:
	.cvsignore 
Log Message:
add missing .cvsignore


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	28 Nov 2006 23:05:11 -0000	1.5
@@ -0,0 +1 @@
+xtide-2.9dev-20061122.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 23:35:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 18:35:28 -0500
Subject: rpms/xtide/FC-6 .cvsignore,1.4,1.5
Message-ID: <200611282335.kASNZSq6008415@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400

Added Files:
	.cvsignore 
Log Message:
add missing .cvsignore


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	28 Nov 2006 23:34:58 -0000	1.5
@@ -0,0 +1 @@
+xtide-2.9dev-20061122.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 23:59:08 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 18:59:08 -0500
Subject: rpms/xtide/FC-5 xtide-2.9dev-rcinit.diff, NONE,
	1.1 xtide-README.fedora, NONE, 1.1 xtide-get_harmonics-data.sh,
	NONE, 1.1 xttpd-wrapper.sh, NONE, 1.1 xttpd.conf, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xtide.spec, 1.10,
	1.11 xtide-2.8.for_x86_64.patch, 1.1, NONE xtide.desktop, 1.1, NONE
Message-ID: <200611282359.kASNx83p008648@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8614

Modified Files:
	.cvsignore sources xtide.spec 
Added Files:
	xtide-2.9dev-rcinit.diff xtide-README.fedora 
	xtide-get_harmonics-data.sh xttpd-wrapper.sh xttpd.conf 
Removed Files:
	xtide-2.8.for_x86_64.patch xtide.desktop 
Log Message:
* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122
- Ensure the hardcorded directories in some scripts can be 
  appropriately changed.
- Fix some typo in README.fedora


xtide-2.9dev-rcinit.diff:

--- NEW FILE xtide-2.9dev-rcinit.diff ---
--- rc.xttpd.fedora	2006-11-23 07:22:31.000000000 +0900
+++ rc.xttpd	2006-11-23 20:33:49.000000000 +0900
@@ -26,22 +26,15 @@
 start(){
     echo -n $"Starting $PROG: "
     if ! test -f "$DAEMON" ; then 
-	echo $"$DAEMON is not set." >&2
-	echo_failure
+	echo -n $"$DAEMON is not set."
+	failure
 	echo
 	RETVAL=1
 	return $RETVAL
     fi
     if test -z "$PORT" ; then
-	echo $"PORT environment is not set." >&2
-	echo_failure
-	echo
-	RETVAL=1
-	return $RETVAL
-    fi
-    if test -z "$HOME" ; then
-	echo $"HOME environment is not set." >&2
-	echo_failure
+	echo -n $"PORT environment is not set."
+	failure
 	echo
 	RETVAL=1
 	return $RETVAL
@@ -100,3 +93,4 @@
 esac
 
 exit $?
+


--- NEW FILE xtide-README.fedora ---
================================================
# xtide-README.fedora
# Written by Patrice Dumas and Mamoru Tasaka

# If you have some questions, please report it
# with redhat bugzilla:
# https://bugzilla.redhat.com/bugzilla/index.cgi
================================================

Availability and installation of harmonics files
================================================

To use xtide and related utilities (like xttpd, 
tideEditor), you need an harmonics file.
However, existing files cannot be distributed as part of Fedora, 
because their license restricts commercial redistribution and selling,
which is too restrictive for Fedora. These files should therefore 
be installed after the package installation by yourself.

Such files are available at:
http://www.flaterco.com/xtide/files.html
As the time of writing, the latest harmonics file is:
ftp://ftp.flaterco.com/xtide/harmonics-dwf-20060708.tcd.bz2
The utilities can only use uncompressed harmonics files.

There are 2 possibilities to have the utilities become aware of
the harmonics file location:

1) by editing /etc/xtide.conf, and setting the first line of the file
  to the path of the directory containing the harmonics files, or  
  to the harmonics file location (the utilities will also accept a colon `:' 
  delimited list of paths). 
  The second line of /etc/xtide.conf sets the directory which 
  contains world vector shoreline data. The second line can accept only
  one directory and cannot be colon-delimited.
  
  The default content of /etc/xtide.conf used by fedora is:

  /usr/share/xtide-harmonics/
  /usr/share/wvs-data/

  which means that all the files in /usr/share/xtide-harmonics
  are considered to be harmonics files and all under /usr/share/wvs-data
  are considered to be WVS data.

2) by setting the environment variable HFILE_PATH. You can also
   set WVS_PATH to specify the directory under which WVS data are
   stored.

You can run the provided script xtide-get_harmonics-data.sh
under /usr/sbin to install harmonics files to 
/usr/share/xtide-harmonics. This script requires 
administrator previledges.


--- NEW FILE xtide-get_harmonics-data.sh ---
#!/bin/sh

DATE=${DATE:-20060708}
INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}

FILE=harmonics-dwf-${DATE}.tcd.bz2

if [ "`id -u -n`" != "root" ] ; then
    echo "You must do this by root"
    exit 1
fi

wget -N ftp://ftp.flaterco.com/xtide/$FILE || \
    ( echo ; echo "Downloading failed." ; exit 1 )

bzip2 -d $FILE
mkdir -p $INSTALL_DIR
install -m 644 harmonics-dwf-${DATE}.tcd $INSTALL_DIR
rm -f ${FILE%.bz2}


--- NEW FILE xttpd-wrapper.sh ---
#!/bin/sh

unset XTTPD_ARG
for ARG in $* ; do
   case $ARG in
      *=* )
	eval export $ARG
        ;;
      * )
        XTTPD_ARG="$XTTPD_ARG $ARG"
	;;
   esac
done
			
exec /usr/libexec/xttpd $XTTPD_ARG

--- NEW FILE xttpd.conf ---
# Originally from debian.
# The following is from debian's comment.
#---------------------------------------------------------
#
# skeleton	example file to build /etc/init.d/ scripts.
#		This file should be used to construct scripts for /etc/init.d.
#
#		Written by Miquel van Smoorenburg .
#		Modified for Debian GNU/Linux
#		by Ian Murdock .
#
# Version:	@(#)skeleton  1.6  11-Nov-1996  miquels at cistron.nl
#
# This file by Peter S Galbraith  for the xtide package.

#---------------------------------------
# Configuration:  
#  
#  Uncommenting the PORT line below enables this daemon at bootup.
#  To start the server after uncommenting the line, there is no need 
#  to reboot, simply invoke:
#                            # /etc/init.d/xttpd start
#
#  PORT: Port number used by xttpd
#   - If you use 80, xttpd will be your standard web server and will be 
#     visible as http://localhost  (Make sure no other web server is installed)
#   - Alternatively, use a higher unprivileged port number (e.g. 8080) to have
#     xttpd running in addition to a standard web server.  xttpd would then 
#     be visble as http://localhost:8080/
#  XTTPD_FEEDBACK:
#   - Set the environment variable XTTPD_FEEDBACK to change the feedback 
#     address email address.
#PORT=8080
#XTTPD_FEEDBACK=user at your.site
#-Edit-lines-above-and-uncomment--------


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jan 2005 06:27:05 -0000	1.3
+++ .cvsignore	28 Nov 2006 23:58:38 -0000	1.4
@@ -1,2 +1 @@
-harmonics-dwf-2004-12-10-v2.tcd.gz
-xtide-2.8.tar.gz
+xtide-2.9-0.2.date20061122.fc6.src.rpm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jan 2005 06:27:05 -0000	1.3
+++ sources	28 Nov 2006 23:58:38 -0000	1.4
@@ -1,2 +1 @@
-cc55cdf906c9cb5e7938731391f486e0  harmonics-dwf-2004-12-10-v2.tcd.gz
-17e34e7d7fc1dcf7b564b2970f821d0e  xtide-2.8.tar.gz
+aaf397a58557feb1fdf3096900edd155  xtide-2.9-0.2.date20061122.fc6.src.rpm


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xtide.spec	26 Feb 2006 07:51:41 -0000	1.10
+++ xtide.spec	28 Nov 2006 23:58:38 -0000	1.11
@@ -1,23 +1,55 @@
-Summary: Calculate tide all over the world
-Name: xtide
-Version: 2.8
-Release: 4
-
-URL: http://www.flaterco.com/xtide/
-Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz
-Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz
-Source2: %{name}.desktop
-Patch0: %{name}-%{version}.for_x86_64.patch
-License: GPL
-Group: Applications/Engineering
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libpng-devel
-BuildRequires: XFree86-devel
-BuildRequires: zlib-devel
-Buildrequires: desktop-file-utils
-Buildrequires: flex
-Buildrequires: bison
-Provides: xttpd = %{version}-%{release}
+%{!?with_harmonics: %define   with_harmonics 0}
+%define          src_date   20061122    
+
+Summary:         Calculate tide all over the world
+Name:            xtide
+Version:         2.9
+Release:         0.2.date%{src_date}%{?dist}
+
+URL:             http://www.flaterco.com/xtide/
+Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2
+%if %{with_harmonics}
+Source1:         http://harmonics.unh.edu/xtide/harmonics.txt.gz
+%endif
+
+Patch18:         xtide-2.9dev-rcinit.diff
+
+Source11:        xttpd.conf
+Source14:        xtide-get_harmonics-data.sh
+Source15:        xttpd-wrapper.sh
+Source20:        %{name}.desktop
+Source30:        xtide-README.fedora
+
+License:         GPL
+Group:           Applications/Engineering
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:   autoconf
+
+BuildRequires:   libXaw-devel
+BuildRequires:   libXext-devel
+BuildRequires:   libpng-devel
+BuildRequires:   zlib-devel
+Buildrequires:   desktop-file-utils
+BuildRequires:   libtcd-devel
+%if %{with_harmonics}
+BuildRequires:   tcd-utils
+%endif
+Requires:        wvs-data
+Requires:        xtide-common
+
+Requires(pre):      %{_sbindir}/useradd
+Requires(preun):    /sbin/service
+Requires(preun):    /sbin/chkconfig
+Requires(postun):   /sbin/service
+Requires(post):     /sbin/chkconfig
+
+%package         common
+Summary:         Xtide common files
+Group:           Applications/Engineering
+License:         Public Domain
+Requires:        bzip2
+Requires:        wget
 
 %description
 XTide is a package that provides tide and current
@@ -25,10 +57,10 @@
 calendars can be generated, or a tide clock can be provided on your
 desktop.
 
-XTide can work with X-windows, plain text terminals, or the web.  This
+XTide can work with X-windows, plain text terminals, or the web. This
 is accomplished with three separate programs: the interactive
 interface (xtide), the non-interactive or command line interface
-(tide), and the web interface (xttpd).
+(tide), and the web interface.
 
 The algorithm that XTide uses to predict tides is the one used by the
 National Ocean Service in the U.S.  It is significantly more accurate
@@ -37,7 +69,8 @@
 algorithm -- you also need some special data for each and every
 location for which you want to predict tides.  XTide reads this data
 from harmonics files.  See http://www.flaterco.com/xtide/files.html
-for details on where to get these.
+for details on where to get these (note: please also see README.fedora
+in common package for Fedora specific issue.).
 
 Ultimately, XTide's predictions can only be as good as the available
 harmonics data.  Due to issues of data availability and of
@@ -49,88 +82,253 @@
 
     * Deviations of 1 minute from official predictions are typical for
       U.S. locations having the latest data.
-
     * Deviations of 20 minutes are typical for non-U.S. locations or
       U.S. locations that are using obsolete data.
-
     * Much longer deviations indicate a problem.
 
-%prep
-cat< harmonics.out
+%endif
 
-echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf
+echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
+echo "%{_datadir}/wvs-data/" >> %{name}.conf
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__mkdir_p} $RPM_BUILD_ROOT
+ 
+# 1. install xtide
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
+
+# xttpd treatment
+# xttpd is wrapped
+%{__install} -c -p -m 755 %{SOURCE14} \
+   $RPM_BUILD_ROOT%{_sbindir}
+%{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir}
+%{__install} -c -p -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_sbindir}/xttpd
+# ensure xttpd binary installation directory (original
+# wrapper script is hardcorded
+%{__sed} -i -e 's|/usr/libexec|%{_libexecdir}|' \
+   $RPM_BUILD_ROOT%{_sbindir}/xttpd
+
+
+# 1A Install harmonics file
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics
+%if %{with_harmonics}
+%{__install} -c -p -m 644 harmonics*.tcd \
+   ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics/
+%endif
 
-%makeinstall
+# 1B Add configuration file
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}
+%{__install} -c -p -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/
+
+# 1C Add desktop entry (xtide)
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install \
+   --vendor fedora \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   --remove-category Application \
+   %{SOURCE20}
+
+# 1D Install icon
+for f in iconsrc/icon_*_orig.png ; do
+   %{__install} -c -p -m 644 $f $RPM_BUILD_ROOT%{_datadir}/%{name}/
+done
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+%{__ln_s} -f ../../../../%{name}/icon_16x16_orig.png \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{__ln_s} -f ../../../../%{name}/icon_48x48_orig.png \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+# 1E install xttpd conf file
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xtide
+%{__install} -c -p -m 755 scripts/Fedora/rc.xttpd \
+   $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xttpd
+%{__install} -c -p -m 644 %{SOURCE11} \
+   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd
 
-# Install harmonics file.
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}
-install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/
-
-# Add configuration file
-mkdir ${RPM_BUILD_ROOT}%{_sysconfdir}
-install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
-
-# Add desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Fedora                            \
-  %{name}.desktop
+# 1F and others
+%{__install} -c -p -m 644 %{SOURCE30} README.fedora
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
-%files
-
-%defattr(-,root,root,-)
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+/sbin/chkconfig --add xttpd
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+if [ $1 -ge 1 ] ; then
+   /sbin/service xttpd condrestart &>/dev/null || :
+fi
+
+%pre 
+%{_sbindir}/useradd \
+   -c "XTide web server" \
+   -d %{_sysconfdir}/%{name} \
+   -r \
+   -s /sbin/nologin \
+   xttpd 2>/dev/null || :
+
+%preun
+if [ $1 = 0 ] ; then
+   /sbin/service xttpd stop &>/dev/null
+   /sbin/chkconfig --del xttpd
+fi
+
+%files common
+%doc README.fedora
+%config(noreplace) %{_sysconfdir}/%{name}.conf
 
-# Documentation
-%doc DOCUMENTATION/{GPL,qui,ver}*
-%{_mandir}/man1/*
-%{_mandir}/man8/*
-
-# Harmonics dir
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}-harmonics
+%dir %{_sysconfdir}/%{name}
+%if %{with_harmonics}
+%{_datadir}/%{name}-harmonics/harmonics*.tcd
+%endif
 
-# TCD file
-%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd
-
-# Config file
-%config(noreplace) %{_sysconfdir}/*
+%{_sbindir}/xtide-get*.sh
 
-# Desktop entry
-%{_datadir}/applications/*
+%files
+%defattr(-,root,root,-)
 
-# Executables
-%{_bindir}/*
-%{_sbindir}/*
+%doc AUTHORS COPYING README README-QUICK
+# xtide
+%{_mandir}/man1/*tide.1*
+
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/%{name}/icon_*_orig.png
+
+%{_bindir}/*tide
+
+# xttpd
+%config(noreplace) %{_sysconfdir}/sysconfig/xttpd
+%{_sysconfdir}/rc.d/init.d/xttpd
+
+%{_sbindir}/xttpd
+%{_libexecdir}/xttpd
+%{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122
+- Ensure the hardcorded directories in some scripts can be 
+  appropriately changed.
+- Fix some typo in README.fedora
+
+* Thu Nov 23 2006 Mamoru Tasaka  - 2.9-0.1.date20061122
+- 2.9 dev 20061122 release
+
+* Mon Nov 20 2006 Mamoru Tasaka  - 2.9-0.1.dev1
+- Version down temporarily
+- re-split libtcd, tcd-utils (see bug 211626)
+- again include xttpd
+
+* Sun Oct 29 2006 Mamoru Tasaka  - 2.9-0.14.dev20061027
+- xtide-2.9dev20061029, tcd-utils-1.3.11(2005-08-11),
+  update patches.
+- Remove -DCOMPAT114 as required by newer tcd-utils
+- Bump somajor of tcd-utils for API change.
+
+* Fri Oct 27 2006 Mamoru Tasaka  - 2.9-0.13.dev20061015
+- Fix some change in xtide-2.9dev-change-uidgid.patch
+
+* Fri Oct 27 2006 Mamoru Tasaka  - 2.9-0.12.dev20061015
+- More restrictive uid/gid mode for xttpd
+- Another fix for xttpd.init
+
+* Thu Oct 26 2006 Mamoru Tasaka  - 2.9-0.11.dev20061015
+- Other fixes for xttpd.init, xttpd.conf
+- Create "xttpd" user and use xttpd user for daemon.
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.10.dev20061015
+- xtide doesn't need wrapperd, however, xttpd does.
+- Fix xttpd init script
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.9.dev20061015
+- Adjustment for WVS data directory change.
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.8.dev20061015
+- Split WVS data.
+- desktop-file-utils 0.11 change: X-Fedora, Application is no longer
+  accepted (will be fixed in rawhide).
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.7.dev20061015
+- Drop harmonics data for now.
+- Define WVS_DIR, then rewrite tideEditor-wrapper.sh and wrap xtide
+- Add fedora-specific document
+- Include WVS data
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.6.dev20061015
+- Install 48x48 icon as well.
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.5.dev20061015
+- Use icon in xtide source
+- Fix Group entry
+- Re-source profile shell script for easier rebuilding
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.4.dev20061015
+- Introduce common files package.
+- CFLAGS treatment change.
+- Treak configuration files and their locations.
+
+* Sat Oct 21 2006 Mamoru Tasaka  - 2.9-0.3.dev20061015
+- Various changes about compilation optflags.
+- Change libtcd soname numbering
+- Sprit xttpd, include scripts
+- tideEditor wrapper script included and desktop files added.
+- use "/sbin/ldconfig -n"
+- Lots of help from Michael Schwendt and Patrice Dumas, thanks!!
+
+* Sat Oct 21 2006 Mamoru Tasaka  - 2.9-0.2.dev20061015
+- Re-unify libtcd and xtide, and include tcd-utils, 
+  build all at once.
+
+* Fri Oct 20 2006 Mamoru Tasaka  - 2.9-0.1.dev20061015
+- Resubmit to Fedora Extras (bug #211626)
+- Split libtcd to another package, require tcd-utils to
+  rebuild tcd data.
+
 * Sun May 22 2005 Jeremy Katz  - 2.8-4
 - rebuild on all arches
 


--- xtide-2.8.for_x86_64.patch DELETED ---


--- xtide.desktop DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 00:00:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 19:00:22 -0500
Subject: rpms/xtide/FC-5 xtide.desktop,1.2,1.3
Message-ID: <200611290000.kAT00M2f008683@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8664

Added Files:
	xtide.desktop 
Log Message:
readd xtide.desktop


Index: xtide.desktop
===================================================================
RCS file: xtide.desktop
diff -N xtide.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xtide.desktop	28 Nov 2006 23:59:52 -0000	1.3
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=XTide
+Comment=Predict tides
+Exec=xtide
+Icon=xtide
+Terminal=false
+Type=Application
+Categories=Application;Science;Education;
+



From fedora-extras-commits at redhat.com  Wed Nov 29 00:04:44 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 19:04:44 -0500
Subject: rpms/xtide/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200611290004.kAT04iX9011757@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11738

Modified Files:
	.cvsignore sources 
Log Message:
Oops.. fixing tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2006 23:58:38 -0000	1.4
+++ .cvsignore	29 Nov 2006 00:04:13 -0000	1.5
@@ -1 +1 @@
-xtide-2.9-0.2.date20061122.fc6.src.rpm
+xtide-2.9dev-20061122.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2006 23:58:38 -0000	1.4
+++ sources	29 Nov 2006 00:04:13 -0000	1.5
@@ -1 +1 @@
-aaf397a58557feb1fdf3096900edd155  xtide-2.9-0.2.date20061122.fc6.src.rpm
+efc6b3eb603e5b51c13c5dbb7bd29548  xtide-2.9dev-20061122.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 00:32:44 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:32:44 -0500
Subject: rpms/rlwrap - New directory
Message-ID: <200611290032.kAT0WiV1011974@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11970/rlwrap

Log Message:
Directory /cvs/extras/rpms/rlwrap added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 00:32:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:32:49 -0500
Subject: rpms/rlwrap/devel - New directory
Message-ID: <200611290032.kAT0Wnmj011987@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11970/rlwrap/devel

Log Message:
Directory /cvs/extras/rpms/rlwrap/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 00:33:02 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:33:02 -0500
Subject: rpms/rlwrap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611290033.kAT0X2Wi012017@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011

Added Files:
	Makefile import.log 
Log Message:
Setup of module rlwrap


--- NEW FILE Makefile ---
# Top level Makefile for module rlwrap
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  Wed Nov 29 00:33:07 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:33:07 -0500
Subject: rpms/rlwrap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611290033.kAT0X7Ed012032@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rlwrap


--- 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 Nov 29 00:34:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:34:18 -0500
Subject: rpms/rlwrap import.log,1.1,1.2
Message-ID: <200611290034.kAT0YIFr012105@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12071

Modified Files:
	import.log 
Log Message:
auto-import rlwrap-0.28-1 on branch devel from rlwrap-0.28-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rlwrap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Nov 2006 00:33:02 -0000	1.1
+++ import.log	29 Nov 2006 00:33:48 -0000	1.2
@@ -0,0 +1 @@
+rlwrap-0_28-1:HEAD:rlwrap-0.28-1.src.rpm:1164760558



From fedora-extras-commits at redhat.com  Wed Nov 29 00:34:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:34:18 -0500
Subject: rpms/rlwrap/devel rlwrap.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611290034.kAT0YIH5012109@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12071/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rlwrap.spec 
Log Message:
auto-import rlwrap-0.28-1 on branch devel from rlwrap-0.28-1.src.rpm


--- NEW FILE rlwrap.spec ---
Name:           rlwrap
Version:        0.28
Release:        1%{?dist}
Summary:        Wrapper for GNU readline

Group:          Applications/Text
License:        GPL
URL:            http://utopia.knoware.nl/~hlub/rlwrap/
Source0:        http://utopia.knoware.nl/~hlub/rlwrap/rlwrap-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  readline-devel
#Requires:       

%description
rlwrap is a 'readline wrapper' that uses the GNU readline library to
allow the editing of keyboard input for any other command. Input
history is remembered across invocations, separately for each command;
history completion and search work as in bash and completion word
lists can be specified on the command line.


%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,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/rlwrap
%{_mandir}/*/rlwrap.*
%{_datadir}/rlwrap



%changelog
* Tue Nov 28 2006 Michel Salim  0.28-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rlwrap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Nov 2006 00:33:07 -0000	1.1
+++ .cvsignore	29 Nov 2006 00:33:48 -0000	1.2
@@ -0,0 +1 @@
+rlwrap-0.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rlwrap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Nov 2006 00:33:07 -0000	1.1
+++ sources	29 Nov 2006 00:33:48 -0000	1.2
@@ -0,0 +1 @@
+057871cb04d9dec237ac565aff5a93d7  rlwrap-0.28.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 01:01:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:01:06 -0500
Subject: rpms/memchan - New directory
Message-ID: <200611290101.kAT116ST015266@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15256/memchan

Log Message:
Directory /cvs/extras/rpms/memchan added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 01:01:11 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:01:11 -0500
Subject: rpms/memchan/devel - New directory
Message-ID: <200611290101.kAT11B1C015284@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15256/memchan/devel

Log Message:
Directory /cvs/extras/rpms/memchan/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 01:01:22 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:01:22 -0500
Subject: rpms/memchan Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611290101.kAT11Mw4015314@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308

Added Files:
	Makefile import.log 
Log Message:
Setup of module memchan


--- NEW FILE Makefile ---
# Top level Makefile for module memchan
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  Wed Nov 29 01:01:27 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:01:27 -0500
Subject: rpms/memchan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611290101.kAT11RWB015329@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module memchan


--- 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 Nov 29 01:02:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:02:46 -0500
Subject: rpms/memchan/devel memchan-2.2.1-configure.patch, NONE,
	1.1 memchan-2.2.1-vpath.patch, NONE, 1.1 memchan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611290102.kAT12kMa015424@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15380/devel

Modified Files:
	.cvsignore sources 
Added Files:
	memchan-2.2.1-configure.patch memchan-2.2.1-vpath.patch 
	memchan.spec 
Log Message:
auto-import memchan-2.2.1-1 on branch devel from memchan-2.2.1-1.src.rpm

memchan-2.2.1-configure.patch:

--- NEW FILE memchan-2.2.1-configure.patch ---
--- configure.orig	2006-11-27 22:25:20.000000000 -0800
+++ configure	2006-11-27 22:26:08.000000000 -0800
@@ -1507,10 +1507,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -6373,7 +6375,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`

memchan-2.2.1-vpath.patch:

--- NEW FILE memchan-2.2.1-vpath.patch ---
--- Makefile.in.orig	2006-11-27 22:28:08.000000000 -0800
+++ Makefile.in	2006-11-27 22:32:28.000000000 -0800
@@ -29,37 +29,37 @@
 #========================================================================
 
 Memchan_SOURCES	=		\
-		memchan.c	\
-		init.c		\
-		counter.c	\
-		fifo.c		\
-		fifo2.c		\
-		null.c		\
-		zero.c		\
-		random.c	\
-		buf.c		\
-		bufFix.c	\
-		bufExt.c	\
-		bufRange.c	\
-		bufQueue.c	\
-		bufStubInit.c	\
-		bufStubLib.c	\
-		memchanStubInit.c	\
-		memchanStubLib.c	\
-		randport.c      \
+		generic/memchan.c	\
+		generic/init.c		\
+		generic/counter.c	\
+		generic/fifo.c		\
+		generic/fifo2.c		\
+		generic/null.c		\
+		generic/zero.c		\
+		generic/random.c	\
+		generic/buf.c		\
+		generic/bufFix.c	\
+		generic/bufExt.c	\
+		generic/bufRange.c	\
+		generic/bufQueue.c	\
+		generic/bufStubInit.c	\
+		generic/bufStubLib.c	\
+		generic/memchanStubInit.c	\
+		generic/memchanStubLib.c	\
+		isaac/randport.c      \
 		@EXTRA_SOURCES@
 
 WIN_SOURCES	= 
 UNIX_SOURCES	= 
 
 DOC_SOURCES = \
-	memchan.man \
-	memchanapi.man \
-	fifo.man \
-	fifo2.man \
-	null.man \
-	zero.man \
-	random.man
+	doc/memchan.man \
+	doc/memchanapi.man \
+	doc/fifo.man \
+	doc/fifo2.man \
+	doc/null.man \
+	doc/zero.man \
+	doc/random.man
 
 #========================================================================
 # Identify the object files.  This replaces .c with .$(OBJEXT) for all
@@ -76,10 +76,10 @@
 Memchan_OBJECTS	= $(Memchan_SOURCES:.c=. at OBJEXT@)
 Memchan_LIB_FILE= @Memchan_LIB_FILE@
 
-Memchanstub_OBJECTS=	bufStubLib.$(OBJEXT) memchanStubLib.$(OBJEXT)
+Memchanstub_OBJECTS=	generic/bufStubLib.$(OBJEXT) generic/memchanStubLib.$(OBJEXT)
 Memchanstub_LIB_FILE= @Memchanstub_LIB_FILE@
 
-CHANTEST_OBJECTS=chantest.$(OBJEXT)
+CHANTEST_OBJECTS=generic/chantest.$(OBJEXT)
 CHANTEST_LIB_FILE=libChantest0.1.so
 
 DOC_NROFF = $(DOC_SOURCES:.man=.n)


--- NEW FILE memchan.spec ---
Name:           memchan
Version:        2.2.1
Release:        1%{?dist}
Summary:        In-memory channels for Tcl

Group:          Development/Libraries
License:        BSD
URL:            http://memchan.sourceforge.net/
Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Patch0:         memchan-2.2.1-configure.patch
Patch1:         memchan-2.2.1-vpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tcl-devel
#Requires:       

%description
Memchan is an extension library to the script language Tcl, as created by John
Ousterhout. It provides several new channel types for in-memory channels and
the appropriate commands for their creation.

%package devel
Summary: Development files for compiling against the Tcl memchan extension
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
Development files for compiling against the Tcl memchan extension

%prep
%setup -q
%patch0
%patch1


%build
%configure --enable-threads
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/license.terms doc/*.html ChangeLog
%{_mandir}/mann/*.gz
%{_libdir}/Memchan%{version}/*.so
%{_libdir}/Memchan%{version}/*.tcl

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/Memchan%{version}/*.a



%changelog
* Mon Nov 27 2006 Wart  - 2.2.1-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/memchan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Nov 2006 01:01:27 -0000	1.1
+++ .cvsignore	29 Nov 2006 01:02:16 -0000	1.2
@@ -0,0 +1 @@
+memchan-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/memchan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Nov 2006 01:01:27 -0000	1.1
+++ sources	29 Nov 2006 01:02:16 -0000	1.2
@@ -0,0 +1 @@
+07ef0aabff7a980959aa1a07bc73a520  memchan-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 01:02:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:02:46 -0500
Subject: rpms/memchan import.log,1.1,1.2
Message-ID: <200611290102.kAT12k9B015420@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15380

Modified Files:
	import.log 
Log Message:
auto-import memchan-2.2.1-1 on branch devel from memchan-2.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/memchan/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Nov 2006 01:01:22 -0000	1.1
+++ import.log	29 Nov 2006 01:02:16 -0000	1.2
@@ -0,0 +1 @@
+memchan-2_2_1-1:HEAD:memchan-2.2.1-1.src.rpm:1164762261



From fedora-extras-commits at redhat.com  Wed Nov 29 01:05:01 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:05:01 -0500
Subject: owners owners.list,1.2030,1.2031
Message-ID: <200611290105.kAT151JC015485@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15468

Modified Files:
	owners.list 
Log Message:
Added memchan





Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2030
retrieving revision 1.2031
diff -u -r1.2030 -r1.2031
--- owners.list	28 Nov 2006 18:56:01 -0000	1.2030
+++ owners.list	29 Nov 2006 01:04:31 -0000	1.2031
@@ -1090,6 +1090,7 @@
 Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org,roozbeh at farsiweb.info
 Fedora Extras|MegaMek|A portable, network-enabled BattleTech engine|fitzsim at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|memchan|Memory-based channels for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercator|Terrain library for WorldForge client/server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mesa-libGLw|Xt and Motif widgets for OpenGL|ajackson at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 01:30:24 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 20:30:24 -0500
Subject: owners owners.list,1.2031,1.2032
Message-ID: <200611290130.kAT1UOgx015661@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15644

Modified Files:
	owners.list 
Log Message:
Adding rlwrap to repository


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2031
retrieving revision 1.2032
diff -u -r1.2031 -r1.2032
--- owners.list	29 Nov 2006 01:04:31 -0000	1.2031
+++ owners.list	29 Nov 2006 01:29:54 -0000	1.2032
@@ -2100,6 +2100,7 @@
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|tamaster at pobox.com
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|rlwrap|Wrapper for GNU readline|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|rman|Converts man pages to various other formats|mpeters at mac.com|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rogue|The original roguelike game|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 01:33:12 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 28 Nov 2006 20:33:12 -0500
Subject: owners owners.list,1.2032,1.2033
Message-ID: <200611290133.kAT1XCwq015692@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15677

Modified Files:
	owners.list 
Log Message:
Added GraphicsMagick


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2032
retrieving revision 1.2033
diff -u -r1.2032 -r1.2033
--- owners.list	29 Nov 2006 01:29:54 -0000	1.2032
+++ owners.list	29 Nov 2006 01:32:42 -0000	1.2033
@@ -472,6 +472,7 @@
 Fedora Extras|fwfstab|A graphical file system table editor|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|GraphicsMagick|An ImageMagick fork, offering faster image generation and better quality|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 01:35:44 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 28 Nov 2006 20:35:44 -0500
Subject: rpms/GraphicsMagick/FC-5 GraphicsMagick.spec,1.1,1.2
Message-ID: <200611290135.kAT1Zi78015763@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15722/FC-5

Modified Files:
	GraphicsMagick.spec 
Log Message:
TypoFix


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-5/GraphicsMagick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick.spec	27 Nov 2006 13:37:41 -0000	1.1
+++ GraphicsMagick.spec	29 Nov 2006 01:35:14 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: An GraphicsMagick fork, offering faster image generation and better quality
+Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
 Release: 2%{?dist}



From fedora-extras-commits at redhat.com  Wed Nov 29 01:35:44 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 28 Nov 2006 20:35:44 -0500
Subject: rpms/GraphicsMagick/FC-6 GraphicsMagick.spec,1.1,1.2
Message-ID: <200611290135.kAT1ZiRU015766@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15722/FC-6

Modified Files:
	GraphicsMagick.spec 
Log Message:
TypoFix


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-6/GraphicsMagick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick.spec	27 Nov 2006 13:37:41 -0000	1.1
+++ GraphicsMagick.spec	29 Nov 2006 01:35:14 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: An GraphicsMagick fork, offering faster image generation and better quality
+Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
 Release: 2%{?dist}



From fedora-extras-commits at redhat.com  Wed Nov 29 01:35:49 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 28 Nov 2006 20:35:49 -0500
Subject: rpms/GraphicsMagick/devel GraphicsMagick.spec,1.1,1.2
Message-ID: <200611290135.kAT1Zne3015769@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15722/devel

Modified Files:
	GraphicsMagick.spec 
Log Message:
TypoFix


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick.spec	27 Nov 2006 13:37:41 -0000	1.1
+++ GraphicsMagick.spec	29 Nov 2006 01:35:19 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: An GraphicsMagick fork, offering faster image generation and better quality
+Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
 Release: 2%{?dist}



From fedora-extras-commits at redhat.com  Wed Nov 29 06:15:58 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 29 Nov 2006 01:15:58 -0500
Subject: rpms/ruby-bdb/devel .cvsignore, 1.2, 1.3 ruby-bdb.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611290615.kAT6FwAp000735@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv708

Modified Files:
	.cvsignore ruby-bdb.spec sources 
Log Message:
Update package to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2006 22:34:53 -0000	1.2
+++ .cvsignore	29 Nov 2006 06:15:28 -0000	1.3
@@ -1 +1 @@
-bdb-0.5.9.tar.gz
+bdb-0.6.0.tar.gz


Index: ruby-bdb.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/ruby-bdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-bdb.spec	1 Nov 2006 22:34:53 -0000	1.1
+++ ruby-bdb.spec	29 Nov 2006 06:15:28 -0000	1.2
@@ -3,8 +3,8 @@
 %define        tarname bdb
 Summary:       Sleepycat Berkeley DB and DB XML
 Name:          ruby-bdb
-Version:       0.5.9
-Release:       6%{?dist}
+Version:       0.6.0
+Release:       1%{?dist}
 License:       Ruby License 
 Group:         Development/Libraries
 Source:        ftp://moulon.inra.fr/pub/ruby/%{tarname}-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %{ruby_sitearch}/bdb.so
 
 %changelog
+* Wed Nov 29 2006 Michael Rice  - 0.6.0-1
+- version update to 0.6.0
+
 * Fri Oct 20 2006 Michael Rice  - 0.5.9-6
 - Adjust to make 'test'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2006 22:34:53 -0000	1.2
+++ sources	29 Nov 2006 06:15:28 -0000	1.3
@@ -1 +1 @@
-b4bb9f2811e395f9c7e49c7fd9a977b0  bdb-0.5.9.tar.gz
+75ed9523bc695beb2bf2c9bea2676b87  bdb-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 06:25:56 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 29 Nov 2006 01:25:56 -0500
Subject: rpms/ruby-bdb/FC-5 .cvsignore, 1.2, 1.3 ruby-bdb.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611290625.kAT6PuwX000869@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv848

Modified Files:
	.cvsignore ruby-bdb.spec sources 
Log Message:
Update package to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2006 22:34:53 -0000	1.2
+++ .cvsignore	29 Nov 2006 06:25:26 -0000	1.3
@@ -1 +1 @@
-bdb-0.5.9.tar.gz
+bdb-0.6.0.tar.gz


Index: ruby-bdb.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-5/ruby-bdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-bdb.spec	1 Nov 2006 22:34:53 -0000	1.1
+++ ruby-bdb.spec	29 Nov 2006 06:25:26 -0000	1.2
@@ -3,8 +3,8 @@
 %define        tarname bdb
 Summary:       Sleepycat Berkeley DB and DB XML
 Name:          ruby-bdb
-Version:       0.5.9
-Release:       6%{?dist}
+Version:       0.6.0
+Release:       1%{?dist}
 License:       Ruby License 
 Group:         Development/Libraries
 Source:        ftp://moulon.inra.fr/pub/ruby/%{tarname}-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %{ruby_sitearch}/bdb.so
 
 %changelog
+* Wed Nov 29 2006 Michael Rice  - 0.6.0-1
+- version update to 0.6.0
+
 * Fri Oct 20 2006 Michael Rice  - 0.5.9-6
 - Adjust to make 'test'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2006 22:34:53 -0000	1.2
+++ sources	29 Nov 2006 06:25:26 -0000	1.3
@@ -1 +1 @@
-b4bb9f2811e395f9c7e49c7fd9a977b0  bdb-0.5.9.tar.gz
+75ed9523bc695beb2bf2c9bea2676b87  bdb-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 06:28:54 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 29 Nov 2006 01:28:54 -0500
Subject: rpms/ruby-bdb/FC-6 .cvsignore, 1.2, 1.3 ruby-bdb.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611290628.kAT6SsYx000944@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv923

Modified Files:
	.cvsignore ruby-bdb.spec sources 
Log Message:
Update package to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2006 22:34:53 -0000	1.2
+++ .cvsignore	29 Nov 2006 06:28:24 -0000	1.3
@@ -1 +1 @@
-bdb-0.5.9.tar.gz
+bdb-0.6.0.tar.gz


Index: ruby-bdb.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-6/ruby-bdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-bdb.spec	1 Nov 2006 22:34:53 -0000	1.1
+++ ruby-bdb.spec	29 Nov 2006 06:28:24 -0000	1.2
@@ -3,8 +3,8 @@
 %define        tarname bdb
 Summary:       Sleepycat Berkeley DB and DB XML
 Name:          ruby-bdb
-Version:       0.5.9
-Release:       6%{?dist}
+Version:       0.6.0
+Release:       1%{?dist}
 License:       Ruby License 
 Group:         Development/Libraries
 Source:        ftp://moulon.inra.fr/pub/ruby/%{tarname}-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %{ruby_sitearch}/bdb.so
 
 %changelog
+* Wed Nov 29 2006 Michael Rice  - 0.6.0-1
+- version update to 0.6.0
+
 * Fri Oct 20 2006 Michael Rice  - 0.5.9-6
 - Adjust to make 'test'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2006 22:34:53 -0000	1.2
+++ sources	29 Nov 2006 06:28:24 -0000	1.3
@@ -1 +1 @@
-b4bb9f2811e395f9c7e49c7fd9a977b0  bdb-0.5.9.tar.gz
+75ed9523bc695beb2bf2c9bea2676b87  bdb-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 06:33:35 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Wed, 29 Nov 2006 01:33:35 -0500
Subject: rpms/python-matplotlib/FC-6 matplotlib-0.87.7-matplotlibrc.patch,
	NONE, 
	1.1 matplotlib-0.87.7-tkagg-check.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 python-matplotlib.spec, 1.20, 1.21 sources, 1.13,
	1.14 matplotlib-0.87-matplotlibrc.patch, 1.1, NONE
Message-ID: <200611290633.kAT6XZdj001093@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/python-matplotlib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1047/FC-6

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Added Files:
	matplotlib-0.87.7-matplotlibrc.patch 
	matplotlib-0.87.7-tkagg-check.patch 
Removed Files:
	matplotlib-0.87-matplotlibrc.patch 
Log Message:
auto-import python-matplotlib-0.87.7-1.fc6 on branch FC-6 from python-matplotlib-0.87.7-1.fc6.src.rpm
update to 0.87.7 now that numpy has been updated

matplotlib-0.87.7-matplotlibrc.patch:

--- NEW FILE matplotlib-0.87.7-matplotlibrc.patch ---
--- matplotlib-0.87/setup.py.orig	2006-02-14 11:11:32.000000000 -0700
+++ matplotlib-0.87/setup.py	2006-02-27 15:19:28.000000000 -0700
@@ -258,8 +258,8 @@
 
 # packagers: set rc['numerix'] and rc['backend'] here to override the auto
 # defaults, eg
-#rc['numerix'] = numpy
-#rc['backend'] = GTKAgg
+rc['numerix'] = 'numpy'
+rc['backend'] = 'GTKAgg'
 if sys.platform=='win32':
     rc = dict(backend='TkAgg', numerix='Numeric')
 template = file('matplotlibrc.template').read()

matplotlib-0.87.7-tkagg-check.patch:

--- NEW FILE matplotlib-0.87.7-tkagg-check.patch ---
--- matplotlib-0.87.7/setup.py.fix	2006-11-20 19:49:56.000000000 -0900
+++ matplotlib-0.87.7/setup.py	2006-11-20 19:51:03.000000000 -0900
@@ -251,16 +251,9 @@
         print 'Tkinter present but import failed'
         BUILD_TKAGG = 0
     else:
-        try:
-            tk = Tkinter.Tk()
-            tk.withdraw()
-        except Tkinter.TclError:
-            print 'Tkinter present, but window failed to open'
-            BUILD_TKAGG = 0
-        else:
-            BUILD_AGG = 1
-            build_tkagg(ext_modules, packages, NUMERIX)
-            rc['backend'] = 'TkAgg'
+        BUILD_AGG = 1
+        build_tkagg(ext_modules, packages, NUMERIX)
+        rc['backend'] = 'TkAgg'
 
 if BUILD_WXAGG:
     try:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Oct 2006 17:32:24 -0000	1.13
+++ .cvsignore	29 Nov 2006 06:33:05 -0000	1.14
@@ -1 +1 @@
-matplotlib-0.87.6.tar.gz
+matplotlib-0.87.7.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-6/python-matplotlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-matplotlib.spec	6 Oct 2006 17:32:24 -0000	1.20
+++ python-matplotlib.spec	29 Nov 2006 06:33:05 -0000	1.21
@@ -1,7 +1,7 @@
 %{!?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.6
+Version:        0.87.7
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -9,7 +9,8 @@
 License:        Python Software Foundation License 
 URL:            http://sourceforge.net/projects/matplotlib
 Source0:        http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
-Patch0:         matplotlib-0.87-matplotlibrc.patch
+Patch0:         matplotlib-0.87.7-matplotlibrc.patch
+Patch1:         matplotlib-0.87.7-tkagg-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
@@ -38,7 +39,8 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
-%patch -p1 -b .matplotlibrc
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b setup.py 
 chmod -x images/*.svg
 
 %build
@@ -71,6 +73,11 @@
 
 
 %changelog
+* Tue Nov  21 2006 Orion Poplawski  0.87.7-1
+- Update to 0.87.7 and fix up the defaults to use numpy
+- Force build of tkagg backend without X server
+- Use src.rpm from Jef Spaleta, closes bug 216578
+
 * Fri Oct  6 2006 Orion Poplawski  0.87.6-1
 - Update to 0.87.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Oct 2006 17:32:24 -0000	1.13
+++ sources	29 Nov 2006 06:33:05 -0000	1.14
@@ -1 +1 @@
-30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz
+cca3d3a644c1a84d6dcf4af8a9856b7b  matplotlib-0.87.7.tar.gz


--- matplotlib-0.87-matplotlibrc.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 06:33:34 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Wed, 29 Nov 2006 01:33:34 -0500
Subject: rpms/python-matplotlib import.log,1.2,1.3
Message-ID: <200611290633.kAT6XYJm001088@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/python-matplotlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1047

Modified Files:
	import.log 
Log Message:
auto-import python-matplotlib-0.87.7-1.fc6 on branch FC-6 from python-matplotlib-0.87.7-1.fc6.src.rpm
update to 0.87.7 now that numpy has been updated


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Jun 2005 21:40:06 -0000	1.2
+++ import.log	29 Nov 2006 06:33:04 -0000	1.3
@@ -1 +1,2 @@
 python-matplotlib-0_82-2:HEAD:python-matplotlib-0.82-2.src.rpm:1120167602
+python-matplotlib-0_87_7-1_fc6:FC-6:python-matplotlib-0.87.7-1.fc6.src.rpm:1164782110



From fedora-extras-commits at redhat.com  Wed Nov 29 08:16:26 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:16:26 -0500
Subject: fedora-security/audit fc5,1.398,1.399 fc6,1.150,1.151
Message-ID: <200611290816.kAT8GQUm007767@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7750/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6060



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- fc5	24 Nov 2006 09:36:42 -0000	1.398
+++ fc5	29 Nov 2006 08:16:26 -0000	1.399
@@ -3,7 +3,7 @@
 
 ** are items that need attention
 
-CVE-2006-6060 ** kernel
+CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
 CVE-2006-6058 ** kernel
 CVE-2006-6057 ** kernel
 CVE-2006-6056 ** kernel


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- fc6	24 Nov 2006 09:36:42 -0000	1.150
+++ fc6	29 Nov 2006 08:16:26 -0000	1.151
@@ -3,7 +3,7 @@
 
 ** are items that need attention
 
-CVE-2006-6060 ** kernel
+CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
 CVE-2006-6058 ** kernel
 CVE-2006-6057 ** kernel
 CVE-2006-6056 ** kernel



From fedora-extras-commits at redhat.com  Wed Nov 29 08:19:47 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:19:47 -0500
Subject: fedora-security/audit fc5,1.399,1.400 fc6,1.151,1.152
Message-ID: <200611290819.kAT8JlLF007849@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7832/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6058



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- fc5	29 Nov 2006 08:16:26 -0000	1.399
+++ fc5	29 Nov 2006 08:19:47 -0000	1.400
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
-CVE-2006-6058 ** kernel
+CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 ** kernel
 CVE-2006-6056 ** kernel
 CVE-2006-6054 ** kernel


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- fc6	29 Nov 2006 08:16:26 -0000	1.151
+++ fc6	29 Nov 2006 08:19:47 -0000	1.152
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
-CVE-2006-6058 ** kernel
+CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 ** kernel
 CVE-2006-6056 ** kernel
 CVE-2006-6054 ** kernel



From fedora-extras-commits at redhat.com  Wed Nov 29 08:38:39 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:38:39 -0500
Subject: fedora-security/audit fc5,1.400,1.401 fc6,1.152,1.153
Message-ID: <200611290838.kAT8cdJ4007910@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7891/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6057



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- fc5	29 Nov 2006 08:19:47 -0000	1.400
+++ fc5	29 Nov 2006 08:38:39 -0000	1.401
@@ -5,7 +5,7 @@
 
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
 CVE-2006-6058 VULNERABLE (kernel, fixed **)
-CVE-2006-6057 ** kernel
+CVE-2006-6057 ignore (kernel, fixed **) separate modules
 CVE-2006-6056 ** kernel
 CVE-2006-6054 ** kernel
 CVE-2006-6053 ** kernel





From fedora-extras-commits at redhat.com  Wed Nov 29 08:42:31 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 29 Nov 2006 03:42:31 -0500
Subject: fedora-security/audit fc5,1.401,1.402
Message-ID: <200611290842.kAT8gVVE007953@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7938

Modified Files:
	fc5 
Log Message:
test commit



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- fc5	29 Nov 2006 08:38:39 -0000	1.401
+++ fc5	29 Nov 2006 08:42:30 -0000	1.402
@@ -1,6 +1,7 @@
 Up to date CVE as of CVE email 20061123
 Up to date FC5 as of 20061123
 
+
 ** are items that need attention
 
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support



From fedora-extras-commits at redhat.com  Wed Nov 29 08:56:42 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:56:42 -0500
Subject: fedora-security/audit fc5,1.402,1.403 fc6,1.153,1.154
Message-ID: <200611290856.kAT8ugia008007@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7990/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6054



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- fc5	29 Nov 2006 08:42:30 -0000	1.402
+++ fc5	29 Nov 2006 08:56:42 -0000	1.403
@@ -8,7 +8,7 @@
 CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 ignore (kernel, fixed **) separate modules
 CVE-2006-6056 ** kernel
-CVE-2006-6054 ** kernel
+CVE-2006-6054 VULNERABLE (kernel, fixed **)
 CVE-2006-6053 ** kernel
 CVE-2006-5989 ** mod_auth_kerb
 CVE-2006-5973 ** dovecot


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- fc6	29 Nov 2006 08:38:39 -0000	1.153
+++ fc6	29 Nov 2006 08:56:42 -0000	1.154
@@ -7,7 +7,7 @@
 CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 VULNERABLE (kernel, fixed **)
 CVE-2006-6056 ** kernel
-CVE-2006-6054 ** kernel
+CVE-2006-6054 VULNERABLE (kernel, fixed **)
 CVE-2006-6053 ** kernel
 CVE-2006-5989 ** mod_auth_kerb
 CVE-2006-5973 ** dovecot



From fedora-extras-commits at redhat.com  Wed Nov 29 08:58:59 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:58:59 -0500
Subject: fedora-security/audit fc5,1.403,1.404 fc6,1.154,1.155
Message-ID: <200611290859.kAT8wxu3008047@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8030/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6053



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- fc5	29 Nov 2006 08:56:42 -0000	1.403
+++ fc5	29 Nov 2006 08:58:59 -0000	1.404
@@ -9,7 +9,7 @@
 CVE-2006-6057 ignore (kernel, fixed **) separate modules
 CVE-2006-6056 ** kernel
 CVE-2006-6054 VULNERABLE (kernel, fixed **)
-CVE-2006-6053 ** kernel
+CVE-2006-6053 backport (kernel) [since FEDORA-2006-1221]
 CVE-2006-5989 ** mod_auth_kerb
 CVE-2006-5973 ** dovecot
 CVE-2006-5925 backport (elinks) #215734 [since FEDORA-2006-1277]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- fc6	29 Nov 2006 08:56:42 -0000	1.154
+++ fc6	29 Nov 2006 08:58:59 -0000	1.155
@@ -8,7 +8,7 @@
 CVE-2006-6057 VULNERABLE (kernel, fixed **)
 CVE-2006-6056 ** kernel
 CVE-2006-6054 VULNERABLE (kernel, fixed **)
-CVE-2006-6053 ** kernel
+CVE-2006-6053 backport (kernel) [since FEDORA-2006-1223]
 CVE-2006-5989 ** mod_auth_kerb
 CVE-2006-5973 ** dovecot
 CVE-2006-5925 backport (elinks) [since FEDORA-2006-1278] but was never vulneable as didn't have smbclient support



From fedora-extras-commits at redhat.com  Wed Nov 29 09:21:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:21:15 -0500
Subject: rpms/OpenSceneGraph/FC-5 OpenSceneGraph-1.2.diff,NONE,1.1
Message-ID: <200611290921.kAT9LFdg011649@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11641

Added Files:
	OpenSceneGraph-1.2.diff 
Log Message:
New (from devel)

OpenSceneGraph-1.2.diff:

--- NEW FILE OpenSceneGraph-1.2.diff ---
? diff
Index: OpenSceneGraph/Make/instexamplesrc
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/instexamplesrc,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/Make/instexamplesrc	4 Oct 2006 08:01:33 -0000	1.1.1.1
+++ OpenSceneGraph/Make/instexamplesrc	4 Oct 2006 10:49:35 -0000	1.1.1.1.2.1
@@ -32,7 +32,7 @@
             cd $TOPDIR/examples/$d
             [ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
             echo "         installing $d"
-            for f in `$MAKE __instfiles | grep -v $MAKE`
+            for f in `$MAKE __instfiles | grep -v $MAKE | grep -v Entering | grep -v Leaving`
            do
                 src=`echo $f | cut -f1 -d"="`
                 dst=`echo $f | cut -f2 -d"="`
Index: OpenSceneGraph/Make/libdefs
===================================================================
RCS file: OpenSceneGraph/Make/libdefs
diff -N OpenSceneGraph/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ OpenSceneGraph/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(VERSION_MAJOR)
+endif
+
Index: OpenSceneGraph/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- OpenSceneGraph/Make/makedefs	4 Oct 2006 10:12:01 -0000	1.1.1.3
+++ OpenSceneGraph/Make/makedefs	4 Oct 2006 11:02:09 -0000	1.1.1.2.2.2
@@ -354,14 +354,6 @@
       ARCHINST        = 
     endif
   else
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.0
-endif
-
-#    LDFLAGS         += `getconf LFS_LDFLAGS`
-#    DEF             += `getconf LFS_CFLAGS`
-
     LIBS            = -lstdc++
 #    DEF             += -W -Wall -fPIC -pipe -Woverloaded-virtual
     DEF             += -W -Wall -fPIC -pipe
Index: OpenSceneGraph/include/osg/Shader
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/include/osg/Shader,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -u -r1.1.1.2 -r1.1.1.2.2.1
--- OpenSceneGraph/include/osg/Shader	4 Oct 2006 08:07:18 -0000	1.1.1.2
+++ OpenSceneGraph/include/osg/Shader	4 Oct 2006 10:49:36 -0000	1.1.1.2.2.1
@@ -39,6 +39,8 @@
   * configuration.
   */
 
+class Program;
+
 class OSG_EXPORT Shader : public osg::Object
 {
     public:
Index: OpenSceneGraph/src/osgPlugins/gif/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	4 Oct 2006 08:01:33 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -5,15 +5,7 @@
 	ReaderWriterGIF.cpp\
 
 
-ifeq ($(OS),HP-UX)
 INC   += $(GIF_INCLUDE)
-else
-INC   += -I/usr/local/include\
-	 -I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-endif
-
 
 LIBS  += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS)
 
Index: OpenSceneGraph/src/osgPlugins/png/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/png/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/png/GNUmakefile	4 Oct 2006 08:01:34 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/png/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -5,14 +5,7 @@
         ReaderWriterPNG.cpp\
 
 LIBS  += $(OSG_LIBS) $(PNG_LIBS) $(OTHER_LIBS)
-ifneq ($(OS),HP-UX)
-INC  += -I/usr/local/include\
-	-I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-else
 INC += $(PNG_INCLUDE)
-endif
 
 TARGET_BASENAME = png
 include $(TOPDIR)/Make/cygwin_plugin_def
Index: OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	4 Oct 2006 08:01:34 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -6,12 +6,7 @@
 
 LIBS  += $(OSG_LIBS) $(TIFF_LIB) $(OTHER_LIBS)
 
-ifeq ($(OS),HP-UX)
 INC     += $(TIFF_INCLUDE)
-else
-INC     += -I/usr/local/include
-LDFLAGS += -L/usr/local/lib
-endif
 
 TARGET_BASENAME = tiff
 include $(TOPDIR)/Make/cygwin_plugin_def
Index: OpenThreads/Make/libdefs
===================================================================
RCS file: OpenThreads/Make/libdefs
diff -N OpenThreads/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ OpenThreads/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,3 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
Index: OpenThreads/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- OpenThreads/Make/makedefs	4 Oct 2006 10:12:04 -0000	1.1.1.3
+++ OpenThreads/Make/makedefs	4 Oct 2006 11:03:13 -0000	1.1.1.2.2.2
@@ -227,12 +227,6 @@
     ifeq (x$(CXX),x)
       CXX               = g++
     endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
-    ###DEF               += -fPIC
     OPTF              = -O2
     DBGF              = -ggdb -gstabs
     ifeq ($(SYSARCH),x86_64)
Index: OpenThreads/pthread_src/PThread.c++
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/pthread_src/PThread.c++,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.2 -r1.1.1.1.2.2
--- OpenThreads/pthread_src/PThread.c++	4 Oct 2006 10:12:04 -0000	1.1.1.2
+++ OpenThreads/pthread_src/PThread.c++	4 Oct 2006 11:03:13 -0000	1.1.1.1.2.2
@@ -572,27 +572,18 @@
 
     PThreadPrivateData *pd = static_cast (_prvData);
 
-    size_t defaultStackSize;
+    size_t defaultStackSize = 0;
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     if(defaultStackSize < pd->stackSize) {
 
 	pthread_attr_setstacksize( &thread_attr, pd->stackSize);
-	if(status != 0) {
-	    return status;
-	}
     }
 
     //-------------------------------------------------------------------------
     // Now get what we actually have...
     //
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     pd->stackSize = defaultStackSize;
 
Index: OpenThreads/pthread_src/PThreadPrivateData.h
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/pthread_src/PThreadPrivateData.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.2 -r1.1.1.1.2.2
--- OpenThreads/pthread_src/PThreadPrivateData.h	4 Oct 2006 10:12:04 -0000	1.1.1.2
+++ OpenThreads/pthread_src/PThreadPrivateData.h	4 Oct 2006 11:03:14 -0000	1.1.1.1.2.2
@@ -43,7 +43,7 @@
 
 private:
 
-    PThreadPrivateData() {};
+    PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {};
 
     virtual ~PThreadPrivateData() {};
 
Index: Producer/Make/libdefs
===================================================================
RCS file: Producer/Make/libdefs
diff -N Producer/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Producer/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
+
Index: Producer/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/Producer/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- Producer/Make/makedefs	4 Oct 2006 10:12:05 -0000	1.1.1.3
+++ Producer/Make/makedefs	4 Oct 2006 11:03:14 -0000	1.1.1.2.2.2
@@ -248,11 +248,6 @@
     ifeq (x$(CXX),x)
       CXX               = g++
     endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
     DEF               += -fPIC -pthread
     OPTF              = -O2
     DBGF              = -ggdb -gstabs
Index: Producer/include/Producer/Keyboard
===================================================================
RCS file: /var/cvs/local/OSG/Producer/include/Producer/Keyboard,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Producer/include/Producer/Keyboard	4 Oct 2006 08:01:36 -0000	1.1.1.1
+++ Producer/include/Producer/Keyboard	4 Oct 2006 10:49:37 -0000	1.1.1.1.2.1
@@ -539,6 +539,7 @@
         KeyboardKey    _key;
 };
 
+class KeyboardMouseImplementation;
 
 class PR_EXPORT Keyboard : public Producer::Referenced
 {
Index: debian/Doxyfile-openscenegraph
===================================================================
RCS file: debian/Doxyfile-openscenegraph
diff -N debian/Doxyfile-openscenegraph
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-openscenegraph	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = OpenSceneGraph
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = OpenSceneGraph/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = OpenSceneGraph/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/Doxyfile-openthreads
===================================================================
RCS file: debian/Doxyfile-openthreads
diff -N debian/Doxyfile-openthreads
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-openthreads	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = OpenThreads
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = OpenThreads/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = OpenThreads/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/Doxyfile-producer
===================================================================
RCS file: debian/Doxyfile-producer
diff -N debian/Doxyfile-producer
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-producer	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = Producer
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = Producer/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = Producer/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/osgexamples.1
===================================================================
RCS file: debian/osgexamples.1
diff -N debian/osgexamples.1
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/osgexamples.1	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,28 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH OpenSceneGraph 1 "2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp     insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+OpenSceneGraph examples \- set of examples program
+.SH SYNOPSIS
+.B program
+.RI --help
+.SH DESCRIPTION
+Use --help to figure out what the example does.
+See http://www.openscenegraph.org/ for more information.
+.SH AUTHOR
+This manual page was written by Loic Dachary 
+for the Debian project (but may be used by others).



From fedora-extras-commits at redhat.com  Wed Nov 29 09:22:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:22:11 -0500
Subject: rpms/OpenSceneGraph/FC-6 OpenSceneGraph-1.1.diff,1.1,NONE
Message-ID: <200611290922.kAT9MBXN011673@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11668

Removed Files:
	OpenSceneGraph-1.1.diff 
Log Message:
Remove (unused).


--- OpenSceneGraph-1.1.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 09:22:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:22:47 -0500
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-1.1.diff,1.1,NONE
Message-ID: <200611290922.kAT9MlYY011699@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11694

Removed Files:
	OpenSceneGraph-1.1.diff 
Log Message:
Remove (unused).


--- OpenSceneGraph-1.1.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 09:24:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:24:45 -0500
Subject: rpms/OpenSceneGraph/FC-5 .cvsignore, 1.5, 1.6 OpenSceneGraph.spec, 
	1.13, 1.14 sources, 1.5, 1.6
Message-ID: <200611290924.kAT9OjbP011739@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11720

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Log Message:
Sync with devel (PR 197941).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2006 05:57:55 -0000	1.5
+++ .cvsignore	29 Nov 2006 09:24:15 -0000	1.6
@@ -1 +1 @@
-OSG_OP_OT-1.1.zip
+OSG_OP_OT-1.2.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/OpenSceneGraph.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- OpenSceneGraph.spec	27 Aug 2006 05:57:55 -0000	1.13
+++ OpenSceneGraph.spec	29 Nov 2006 09:24:15 -0000	1.14
@@ -5,7 +5,7 @@
 #
 
 %define apivers 1.0
-%define srcvers 1.1
+%define srcvers 1.2
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
@@ -21,7 +21,6 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	flex bison
 BuildRequires:  libGL-devel
 BuildRequires: 	libGLU-devel
 BuildRequires:	libXmu-devel
@@ -48,7 +47,7 @@
 
 %prep
 %setup -q -n OSG_OP_OT-%{srcvers}
-%patch0 -p1
+%patch0 -p0
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -237,7 +236,9 @@
 %{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
+%if "%{version}" < "1.2"
 %{_bindir}/osgfbo
+%endif
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
 %{_bindir}/osggeodemo
@@ -261,7 +262,9 @@
 %{_bindir}/osgparametric
 %{_bindir}/osgparticle
 %{_bindir}/osgparticleeffects
+%if "%{version}" < "1.2"
 %{_bindir}/osgpbuffer
+%endif
 %{_bindir}/osgpick
 %{_bindir}/osgplanets
 %{_bindir}/osgpoints
@@ -392,9 +395,20 @@
 %{_includedir}/Producer
 
 %changelog
+* Wed Oct 05 2006 Ralf Cors??pius  - 1.2-1
+- Upstream update.
+- Remove BR: flex bison.
+- Drop osgfbo and osgpbuffer.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.1-2
+- Mass rebuild.
+
 * Thu Aug 24 2006 Ralf Cors??pius  - 1.1-1
 - Upstream update.
 
+* Sat Jul 08 2006 Ralf Cors??pius  - 1.0-5
+- Rebuilt to with gcc-4.1.1-6.
+
 * Tue Jun 07 2006 Ralf Cors??pius  - 1.0-4
 - Try to avoid adding SONAMEs on plugins and applications.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2006 05:57:55 -0000	1.5
+++ sources	29 Nov 2006 09:24:15 -0000	1.6
@@ -1 +1 @@
-c140e0f53f577af6e807108dd1a8f65f  OSG_OP_OT-1.1.zip
+e08e0ef1f250dfc17122926ef00b1559  OSG_OP_OT-1.2.zip



From fedora-extras-commits at redhat.com  Wed Nov 29 09:25:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:25:45 -0500
Subject: rpms/OpenSceneGraph/FC-5 OpenSceneGraph-1.1.diff,1.1,NONE
Message-ID: <200611290925.kAT9Pjwv011794@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11789

Removed Files:
	OpenSceneGraph-1.1.diff 
Log Message:
Remove (unused).


--- OpenSceneGraph-1.1.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 09:53:48 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:53:48 -0500
Subject: rpms/urlgfe - New directory
Message-ID: <200611290953.kAT9rmd9011938@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11934/urlgfe

Log Message:
Directory /cvs/extras/rpms/urlgfe added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 09:53:53 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:53:53 -0500
Subject: rpms/urlgfe/devel - New directory
Message-ID: <200611290953.kAT9rreD011951@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11934/urlgfe/devel

Log Message:
Directory /cvs/extras/rpms/urlgfe/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 09:54:14 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:54:14 -0500
Subject: rpms/urlgfe/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611290954.kAT9sEbH011996@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11975/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module urlgfe


--- 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 Nov 29 09:54:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:54:09 -0500
Subject: rpms/urlgfe Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611290954.kAT9s9Pl011981@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11975

Added Files:
	Makefile import.log 
Log Message:
Setup of module urlgfe


--- NEW FILE Makefile ---
# Top level Makefile for module urlgfe
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  Wed Nov 29 09:55:15 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:55:15 -0500
Subject: rpms/urlgfe import.log,1.1,1.2
Message-ID: <200611290955.kAT9tFag012065@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12035

Modified Files:
	import.log 
Log Message:
auto-import urlgfe-1.0-1 on branch devel from urlgfe-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/urlgfe/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Nov 2006 09:54:09 -0000	1.1
+++ import.log	29 Nov 2006 09:54:45 -0000	1.2
@@ -0,0 +1 @@
+urlgfe-1_0-1:HEAD:urlgfe-1.0-1.src.rpm:1164794213



From fedora-extras-commits at redhat.com  Wed Nov 29 09:55:15 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:55:15 -0500
Subject: rpms/urlgfe/devel urlgfe.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611290955.kAT9tF30012069@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12035/devel

Modified Files:
	.cvsignore sources 
Added Files:
	urlgfe.spec 
Log Message:
auto-import urlgfe-1.0-1 on branch devel from urlgfe-1.0-1.src.rpm


--- NEW FILE urlgfe.spec ---
Name:		urlgfe
Version:	1.0
Release:	1%{?dist}
Summary:	Urlgfe download manager

Group:		Applications/Internet
License:	LGPL
URL:		http://urlget.sourceforge.net/
Source0:	http://superb-west.dl.sourceforge.net/sourceforge/urlget/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	curl-devel
BuildRequires:	expat-devel
BuildRequires:	gtk2-devel
BuildRequires:	krb5-devel
BuildRequires:	pcre-devel
BuildRequires:	desktop-file-utils

%description
Urlgfe is a download manager that uses GTK+2 ,libcurl, and pcre.

It allows you to classify URLs before downloading them, and 
allows you to import URLs from HTML files. Every category has 
an independent configuration that can be inherited by 
each download in that category.

%prep
%setup -q

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"

desktop-file-install \
	--delete-original \
	--vendor fedora \
	--remove-category Application \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

for f in [A-Z]* ; do \
	%{__sed} -i.encoding -e 's|\r||g' $f
done
	
%{find_lang} %{name}

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS
%doc README

%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}*.png
%{_datadir}/applications/fedora-%{name}.desktop

%changelog
* Wed Nov 29 2006 Mamoru Tasaka  - 1.0-1
- Initial packaging to import to Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/urlgfe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Nov 2006 09:54:14 -0000	1.1
+++ .cvsignore	29 Nov 2006 09:54:45 -0000	1.2
@@ -0,0 +1 @@
+urlgfe-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/urlgfe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Nov 2006 09:54:14 -0000	1.1
+++ sources	29 Nov 2006 09:54:45 -0000	1.2
@@ -0,0 +1 @@
+9a5284665e09cac3397c3ea5d7baf6d8  urlgfe-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 10:09:24 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 05:09:24 -0500
Subject: owners owners.list,1.2033,1.2034
Message-ID: <200611291009.kATA9OQK015314@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15299

Modified Files:
	owners.list 
Log Message:
add urlgfe


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2033
retrieving revision 1.2034
diff -u -r1.2033 -r1.2034
--- owners.list	29 Nov 2006 01:32:42 -0000	1.2033
+++ owners.list	29 Nov 2006 10:08:54 -0000	1.2034
@@ -2396,6 +2396,7 @@
 Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|urlgfe|Urlgfe download manager|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|ushare|UPnP (TM) A/V Media Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 10:16:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 29 Nov 2006 05:16:10 -0500
Subject: rpms/k3d/FC-6 .cvsignore,1.7,1.8 k3d.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <200611291016.kATAGAtL015387@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15363

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Oct 2006 09:11:12 -0000	1.7
+++ .cvsignore	29 Nov 2006 10:15:40 -0000	1.8
@@ -1 +1 @@
-k3d-0.6.3.1-src.tar.bz2
+k3d-0.6.4.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-6/k3d.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- k3d.spec	10 Oct 2006 09:11:12 -0000	1.9
+++ k3d.spec	29 Nov 2006 10:15:40 -0000	1.10
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.3.1
+Version:        0.6.4.0
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -152,7 +152,10 @@
 
 
 %changelog
-* Tue Oct 10 2006 Denis Leroy  - 0.6.3.1
+* Tue Nov 28 2006 Denis Leroy  - 0.6.4.0-1
+- Update to 0.6.4.0
+
+* Tue Oct 10 2006 Denis Leroy  - 0.6.3.1-1
 - Update to 0.6.3.1
 
 * Mon Oct  9 2006 Denis Leroy  - 0.6.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Oct 2006 09:11:12 -0000	1.7
+++ sources	29 Nov 2006 10:15:40 -0000	1.8
@@ -1 +1 @@
-7f5b53711a02779e3f9c036bcc21483a  k3d-0.6.3.1-src.tar.bz2
+3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 10:19:26 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Wed, 29 Nov 2006 05:19:26 -0500
Subject: rpms/wbxml2/FC-5 wbxml2.spec,1.8,1.9
Message-ID: <200611291019.kATAJQoG015594@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15524/FC-5

Modified Files:
	wbxml2.spec 
Log Message:
wbxml-0.9.2-5: Changed the Summarys and descriptions.


Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-5/wbxml2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wbxml2.spec	28 Nov 2006 15:10:10 -0000	1.8
+++ wbxml2.spec	29 Nov 2006 10:18:56 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        4%{?dist}
-Summary:        WBXML parser and compiler library
+Release:        5%{?dist}
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -28,10 +28,11 @@
 
 %package devel
 Group:         Development/Libraries
-Summary:       Development files of WBXML
+Summary:       Development files of %{name}
 Requires:      %{name} = %{version}-%{release}
 %description devel
-%{summary}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
+- Changed the Summarys and descriptions.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
 - Added BR: popt zlib-devel
 - Improved changelog.



From fedora-extras-commits at redhat.com  Wed Nov 29 10:19:26 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Wed, 29 Nov 2006 05:19:26 -0500
Subject: rpms/wbxml2/FC-6 wbxml2.spec,1.9,1.10
Message-ID: <200611291019.kATAJQlr015597@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15524/FC-6

Modified Files:
	wbxml2.spec 
Log Message:
wbxml-0.9.2-5: Changed the Summarys and descriptions.


Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-6/wbxml2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wbxml2.spec	28 Nov 2006 13:09:36 -0000	1.9
+++ wbxml2.spec	29 Nov 2006 10:18:56 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        4%{?dist}
-Summary:        WBXML parser and compiler library
+Release:        5%{?dist}
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -28,10 +28,11 @@
 
 %package devel
 Group:         Development/Libraries
-Summary:       Development files of WBXML
+Summary:       Development files of %{name}
 Requires:      %{name} = %{version}-%{release}
 %description devel
-%{summary}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
+- Changed the Summarys and descriptions.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
 - Added BR: popt zlib-devel
 - Improved changelog.



From fedora-extras-commits at redhat.com  Wed Nov 29 10:19:31 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Wed, 29 Nov 2006 05:19:31 -0500
Subject: rpms/wbxml2/devel wbxml2.spec,1.9,1.10
Message-ID: <200611291019.kATAJVYm015603@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15524/devel

Modified Files:
	wbxml2.spec 
Log Message:
wbxml-0.9.2-5: Changed the Summarys and descriptions.


Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/devel/wbxml2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wbxml2.spec	28 Nov 2006 13:09:36 -0000	1.9
+++ wbxml2.spec	29 Nov 2006 10:19:01 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        4%{?dist}
-Summary:        WBXML parser and compiler library
+Release:        5%{?dist}
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -28,10 +28,11 @@
 
 %package devel
 Group:         Development/Libraries
-Summary:       Development files of WBXML
+Summary:       Development files of %{name}
 Requires:      %{name} = %{version}-%{release}
 %description devel
-%{summary}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
+- Changed the Summarys and descriptions.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
 - Added BR: popt zlib-devel
 - Improved changelog.



From fedora-extras-commits at redhat.com  Wed Nov 29 10:25:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 05:25:41 -0500
Subject: rpms/frozen-bubble/FC-5 .cvsignore, 1.3, 1.4 frozen-bubble.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200611291025.kATAPfqI015765@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711/FC-5

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
+++ .cvsignore	29 Nov 2006 10:25:11 -0000	1.4
@@ -1 +1 @@
-frozen-bubble-2.0.0.tar.bz2
+frozen-bubble-2.1.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/frozen-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frozen-bubble.spec	14 Nov 2006 12:18:36 -0000	1.3
+++ frozen-bubble.spec	29 Nov 2006 10:25:11 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  2.1.0-1
+- Update to 2.1.0 (fixes #216248).
+
 * Fri Oct 27 2006 Matthias Saou  2.0.0-1
 - Update to 2.0.0.
 - Add new SDL_Pango dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:18:36 -0000	1.3
+++ sources	29 Nov 2006 10:25:11 -0000	1.4
@@ -1 +1 @@
-9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2
+f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 10:25:46 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 05:25:46 -0500
Subject: rpms/frozen-bubble/devel .cvsignore, 1.3, 1.4 frozen-bubble.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611291025.kATAPkaY015775@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711/devel

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 11:42:43 -0000	1.3
+++ .cvsignore	29 Nov 2006 10:25:16 -0000	1.4
@@ -1 +1 @@
-frozen-bubble-2.0.0.tar.bz2
+frozen-bubble-2.1.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frozen-bubble.spec	14 Nov 2006 11:42:43 -0000	1.3
+++ frozen-bubble.spec	29 Nov 2006 10:25:16 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  2.1.0-1
+- Update to 2.1.0 (fixes #216248).
+
 * Fri Oct 27 2006 Matthias Saou  2.0.0-1
 - Update to 2.0.0.
 - Add new SDL_Pango dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 11:42:43 -0000	1.3
+++ sources	29 Nov 2006 10:25:16 -0000	1.4
@@ -1 +1 @@
-9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2
+f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 10:25:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 05:25:41 -0500
Subject: rpms/frozen-bubble/FC-6 .cvsignore, 1.3, 1.4 frozen-bubble.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200611291025.kATAPfml015770@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711/FC-6

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
+++ .cvsignore	29 Nov 2006 10:25:11 -0000	1.4
@@ -1 +1 @@
-frozen-bubble-2.0.0.tar.bz2
+frozen-bubble-2.1.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/frozen-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frozen-bubble.spec	14 Nov 2006 12:18:37 -0000	1.3
+++ frozen-bubble.spec	29 Nov 2006 10:25:11 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  2.1.0-1
+- Update to 2.1.0 (fixes #216248).
+
 * Fri Oct 27 2006 Matthias Saou  2.0.0-1
 - Update to 2.0.0.
 - Add new SDL_Pango dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:18:37 -0000	1.3
+++ sources	29 Nov 2006 10:25:11 -0000	1.4
@@ -1 +1 @@
-9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2
+f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 10:54:28 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 29 Nov 2006 05:54:28 -0500
Subject: owners owners.list,1.2034,1.2035
Message-ID: <200611291054.kATAsSdr016211@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16185

Modified Files:
	owners.list 
Log Message:
fix python-matplotlib entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2034
retrieving revision 1.2035
diff -u -r1.2034 -r1.2035
--- owners.list	29 Nov 2006 10:08:54 -0000	1.2034
+++ owners.list	29 Nov 2006 10:53:58 -0000	1.2035
@@ -1989,7 +1989,7 @@
 Fedora Extras|python-logilab-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-lxml|ElementTree-like Python bindings for libxml2 and libxslt|shahms at shahms.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|jspaleta at gmail.com|
+Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|jspaleta at gmail.com
 Fedora Extras|python-mechanize|Stateful programmatic web browsing|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-musicbrainz2|Library which provides access to the MusicBrainz Database|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-mutagen|Python module to handle audio metadata|mr.ecik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 11:59:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 06:59:57 -0500
Subject: rpms/GraphicsMagick/FC-6 GraphicsMagick.spec,1.2,1.3
Message-ID: <200611291159.kATBxvrK019960@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19906/FC-6

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-6/GraphicsMagick.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsMagick.spec	29 Nov 2006 01:35:14 -0000	1.2
+++ GraphicsMagick.spec	29 Nov 2006 11:59:27 -0000	1.3
@@ -76,7 +76,7 @@
 Summary: C++ bindings for the GraphicsMagick library
 Group: Development/Libraries
 Requires: %{name}-c++ = %{version}-%{release}
-Requires: %{name}-devel = %{version}%{release}
+Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
 GraphicsMagick-devel contains the static libraries and header files you'll
@@ -231,9 +231,11 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
+- Fixed devel requirement.
+
 * Sun Nov 26 2006 Andreas Thienemann  - 1.1.7-2
 - Fixed various stuff
 
-
 * Mon Jul 24 2006 Andreas Thienemann  - 1.1.7-1
 - Initial Package for FE based on ImageMagick.spec



From fedora-extras-commits at redhat.com  Wed Nov 29 11:59:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 06:59:57 -0500
Subject: rpms/GraphicsMagick/FC-5 GraphicsMagick.spec,1.2,1.3
Message-ID: <200611291159.kATBxvt1019957@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19906/FC-5

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-5/GraphicsMagick.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsMagick.spec	29 Nov 2006 01:35:14 -0000	1.2
+++ GraphicsMagick.spec	29 Nov 2006 11:59:27 -0000	1.3
@@ -76,7 +76,7 @@
 Summary: C++ bindings for the GraphicsMagick library
 Group: Development/Libraries
 Requires: %{name}-c++ = %{version}-%{release}
-Requires: %{name}-devel = %{version}%{release}
+Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
 GraphicsMagick-devel contains the static libraries and header files you'll
@@ -231,9 +231,11 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
+- Fixed devel requirement.
+
 * Sun Nov 26 2006 Andreas Thienemann  - 1.1.7-2
 - Fixed various stuff
 
-
 * Mon Jul 24 2006 Andreas Thienemann  - 1.1.7-1
 - Initial Package for FE based on ImageMagick.spec



From fedora-extras-commits at redhat.com  Wed Nov 29 12:00:03 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 07:00:03 -0500
Subject: rpms/GraphicsMagick/devel GraphicsMagick.spec,1.2,1.3
Message-ID: <200611291200.kATC03Qo019965@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19906/devel

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsMagick.spec	29 Nov 2006 01:35:19 -0000	1.2
+++ GraphicsMagick.spec	29 Nov 2006 11:59:33 -0000	1.3
@@ -76,7 +76,7 @@
 Summary: C++ bindings for the GraphicsMagick library
 Group: Development/Libraries
 Requires: %{name}-c++ = %{version}-%{release}
-Requires: %{name}-devel = %{version}%{release}
+Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
 GraphicsMagick-devel contains the static libraries and header files you'll
@@ -231,9 +231,11 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
+- Fixed devel requirement.
+
 * Sun Nov 26 2006 Andreas Thienemann  - 1.1.7-2
 - Fixed various stuff
 
-
 * Mon Jul 24 2006 Andreas Thienemann  - 1.1.7-1
 - Initial Package for FE based on ImageMagick.spec



From fedora-extras-commits at redhat.com  Wed Nov 29 12:00:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 07:00:41 -0500
Subject: rpms/ucarp/devel vip-001.list.example, NONE, 1.1 vip-down, NONE,
	1.1 vip-helper.sh, NONE, 1.1 vip-up, NONE, 1.1 carp.init, 1.3,
	1.4 ucarp.spec, 1.11, 1.12 vip-001.conf.example, 1.2, 1.3
Message-ID: <200611291200.kATC0fcs019996@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ucarp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19956

Modified Files:
	carp.init ucarp.spec vip-001.conf.example 
Added Files:
	vip-001.list.example vip-down vip-helper.sh vip-up 
Log Message:
Improvements from Denis Ovsienko (#200395) and rebuild against new libpcap.



--- NEW FILE vip-001.list.example ---
# Comments are filtered out atomatically...
10.0.0.254/24 dev eth0

# ... and empty lines too.
192.168.1.254/24 dev eth1

# You can assign as many VIPs to a single virtual router, as you need.
172.16.2.32/24 dev eth2
172.16.3.67/24 dev eth2
172.16.4.88/24 dev eth2


--- NEW FILE vip-down ---
#!/bin/sh

usage()
{
	echo "This script is intended to be run by 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
		;;
esac



--- NEW FILE vip-helper.sh ---
#!/bin/sh

usage()
{
	echo "This script is intended to be invoked by vip-up.sh or vip-down.sh"
	exit 1
}

[ $# -eq 2 ] || usage

VRID=$1
OP=$2
MYDIR=`dirname $0`

if [ "$VRID" -lt "1" -o "$VRID" -gt 255 ]; then
	echo "VRID must be in 1..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
fi

egrep ^[^#] $LISTFILE | sed -e 's/^ *\(.*\) *$/\1/' \
	| xargs --max-lines=1 ip address $OP &>/dev/null



--- NEW FILE vip-up ---
#!/bin/sh

usage()
{
	echo "This script is intended to be run by 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
		;;
esac



Index: carp.init
===================================================================
RCS file: /cvs/extras/rpms/ucarp/devel/carp.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- carp.init	22 Aug 2006 13:08:17 -0000	1.3
+++ carp.init	29 Nov 2006 12:00:11 -0000	1.4
@@ -2,8 +2,7 @@
 # $Id$
 #
 # chkconfig: - 91 09
-# description: Starts and stops ucarp. \
-#	       used to provide common address redundancy.
+# description: Starts and stops the common address redundancy protocol daemon
 
 # Source function library.
 . /etc/init.d/functions
@@ -15,129 +14,136 @@
 [ ${NETWORKING} = "no" ] && exit 0
 
 get_files() {
-    FILES=`find /etc/sysconfig/carp -maxdepth 1 -type f -name 'vip-*.conf' \
-           -printf "%f\n" | LC_COLLATE="C" sort`
+    FILES=`find $CONFDIR -maxdepth 1 -type f -name 'vip-*.conf' \
+        -printf "%f\n" | egrep '^vip-[[:digit:]]+\.conf$' | LC_COLLATE="C" sort`
 }
 
 prog=$"common address redundancy protocol daemon"
-RETVAL=0
+OUR_INITLOG_ARGS="-n carp -e 2 -s"
+OUR_INITLOG="initlog ${OUR_INITLOG_ARGS}"
+CONFDIR=/etc/sysconfig/carp
+UPSCRIPT=$CONFDIR/vip-up
+DOWNSCRIPT=$CONFDIR/vip-down
 
 start() {
+    RETVAL=-1
+    VIP_RETVAL=0
+
     echo -n $"Starting ${prog}: "
 
     get_files
 
     if [ -z "${FILES}" ]; then
-        failure $"no virtual addresses are configured in /etc/sysconfig/carp/"
+        failure $"no virtual addresses are configured in $CONFDIR:"
         RETVAL=1
     else
         for FILE in ${FILES}; do
             # Check that the file name gives us an ID between 1 and 255
             ID=`echo ${FILE}| sed 's/^vip-\(.*\).conf/\1/'`
             if [ ${ID} -lt 1 -o ${ID} -gt 255 ]; then
-                initlog $INITLOG_ARGS -n carp -s "configuration file name ${FILE} gave us a bad ID of ${ID}:" -e 2
-                RETVAL=1
-                break
+                ${OUR_INITLOG} $"ID out of range (1-255) for ${FILE}, skipped VIP ID ${ID}:"
+                continue
             fi
 
+            unset PASSWORD BIND_INTERFACE BIND_ADDRESS VIP OPTIONS
             # Source ucarp settings
-            . /etc/sysconfig/carp/${FILE}
+            . $CONFDIR/${FILE}
+            TMP_RETVAL=0
 
-            # Check that we have the ifcfg- file for the main interface
-            if [ -f /etc/sysconfig/network-scripts/ifcfg-${BIND_INTERFACE} ]; then
-                . /etc/sysconfig/network-scripts/ifcfg-${BIND_INTERFACE}
-            else
-                initlog $INITLOG_ARGS -n carp -s $"no ifcfg-${BIND_INTERFACE} file found for carp ${FILE} configuration:" -e 2
-                RETVAL=1
-                break
+            if [ -z "${PASSWORD}" ]; then
+                ${OUR_INITLOG} $"no PASSWORD found in ${FILE}, skipped VIP ID ${ID}:"
+                TMP_RETVAL=1
             fi
-            # Check that the ifcfg- file does have an IPADDR
-            BIND_ADDRESS=${IPADDR}
             if [ -z "${BIND_ADDRESS}" ]; then
-                initlog $INITLOG_ARGS -n carp -s $"no IPADDR found in interface file ifcfg-${BIND_INTERFACE}:" -e 2
-                RETVAL=1
-                break
-            fi
-
-            # Check that we have the ifcfg- file for the virtual interface
-            if [ -f /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE} ]; then
-                . /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE}
-            else
-                initlog $INITLOG_ARGS -n carp -s $"no ifcfg-${VIP_INTERFACE} file found for carp ${FILE} configuration:" -e 2
-                RETVAL=1
-                break
+                ${OUR_INITLOG} $"no BIND_ADDRESS found in ${FILE}, skipped VIP ID ${ID}:"
+                TMP_RETVAL=1
             fi
-            # Check that the ifcfg- file does have an IPADDR
-            VIP_ADDRESS=${IPADDR}
             if [ -z "${VIP_ADDRESS}" ]; then
-                initlog $INITLOG_ARGS -n carp -s "no IPADDR found in interface file ifcfg-${VIP_INTERFACE}:" -e 2
-                RETVAL=1
-                break
+                ${OUR_INITLOG} $"no VIP_ADDRESS found in ${FILE}, skipped VIP ID ${ID}:"
+                TMP_RETVAL=1
+            fi
+
+            # If one of more of the above failed, skip the daemon launch
+            if [ ${TMP_RETVAL} -ne 0 ]; then
+                VIP_RETVAL=1
+                continue
             fi
 
-            daemon /usr/sbin/ucarp -v ${ID} -p ${PASSWORD} -s ${BIND_ADDRESS} -a ${VIP_ADDRESS} -i ${VIP_INTERFACE} ${OPTIONS} -B --upscript=/etc/sysconfig/carp/vip-up --downscript=/etc/sysconfig/carp/vip-down
+            [ ${RETVAL} -eq -1 ] && RETVAL=0
+            daemon /usr/sbin/ucarp -v ${ID} -m ${ID} -p ${PASSWORD} -s ${BIND_ADDRESS} -a ${VIP_ADDRESS} -i ${BIND_INTERFACE} ${OPTIONS} -B --upscript=$UPSCRIPT --downscript=$DOWNSCRIPT >/dev/null
             LAUNCH_RETVAL=$?
             [ ${LAUNCH_RETVAL} -ne 0 ] && RETVAL=1
         done
-        [ "${RETVAL}" -ne 0 ] && failure $"error in one or more of the carp configurations, see above:"
+
+        # failure/success or warning if launch worked with some vip errors
+        if [ ${RETVAL} -eq 0 -a ${VIP_RETVAL} -eq 0 ]; then
+            success $"all carp configurations were applied successfully:"
+            touch /var/lock/subsys/carp
+        elif [ ${RETVAL} -eq 0 -a ${VIP_RETVAL} -eq 1 ]; then
+            warning $"error in one or more of the carp configurations:"
+        else
+            failure $"error running one or more of the ucarp daemon instances:"
+        fi
     fi
     echo
-    [ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/carp
 }
 
 stop() {
-    echo -n $"Shutting down $prog: "
-    killproc /usr/sbin/ucarp
+    echo -n $"Stopping $prog: "
+    killproc /usr/sbin/ucarp >/dev/null
     RETVAL=$?
 
-    # We put all interfaces managed by ucarp down when stopping the service
-    # to avoid conflicting "leftovers"
+    # We unassign all UCARP-managed VIPs when stopping the service
+    # to avoid conflicting "leftovers".
 
     get_files
 
     [ ! -z "${FILES}" ] && \
     for FILE in ${FILES}; do
-
+        ID=`echo ${FILE}| sed 's/^vip-\(.*\).conf/\1/'`
+        unset PASSWORD BIND_INTERFACE BIND_ADDRESS VIP OPTIONS
         # Source ucarp settings
-        . /etc/sysconfig/carp/${FILE}
-
-        # Check that we have the ifcfg- file for the virtual interface
-        if [ -f /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE} ]; then
-            if /sbin/ifconfig ${VIP_INTERFACE} down >/dev/null 2>&1; then
-                initlog $INITLOG_ARGS -n carp -s $"bringing down carp managed interface ${VIP_INTERFACE}:" -e 1
-            else
-                initlog $INITLOG_ARGS -n carp -s $"bringing down carp managed interface ${VIP_INTERFACE}:" -e 2
-            fi
-        fi
+        . $CONFDIR/${FILE}
+        $DOWNSCRIPT $BIND_INTERFACE $VIP_ADDRESS ${ID} &>/dev/null
+        #TMP_RETVAL=$?
+        #[ ${TMP_RETVAL} -ne 0 ] && VIP_RETVAL=1
     done
+
+    # failure/success (no warning, too complicated to handle properly)
+    if [ ${RETVAL} -eq 1 ]; then
+        failure $"it seems like no ucarp daemon were running:"
+    else
+        success $"all ucarp daemons stopped and IP addresses unassigned:"
+        rm -f /var/lock/subsys/carp
+    fi
     echo
-    [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/carp
 }
 
 # See how we were called.
 case "$1" in
   start)
-	start
-	;;
+    start
+    ;;
   stop)
-	stop
-	;;
-  restart|reload)
-	stop
-	start
-	;;
+    stop
+    ;;
+  restart)
+    stop
+    start
+    ;;
   condrestart)
-	if [ -f /var/lock/subsys/carp ]; then
-	    stop
-	    start
-	fi
-	;;
+    if [ -f /var/lock/subsys/carp ]; then
+      stop
+      start
+    fi
+    ;;
   status)
-	status /usr/sbin/ucarp
-	;;
+    status /usr/sbin/ucarp
+    ;;
   *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
+    echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+    exit 1
 esac
 
 exit $RETVAL
+


Index: ucarp.spec
===================================================================
RCS file: /cvs/extras/rpms/ucarp/devel/ucarp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ucarp.spec	28 Aug 2006 16:40:12 -0000	1.11
+++ ucarp.spec	29 Nov 2006 12:00:11 -0000	1.12
@@ -1,13 +1,17 @@
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
 Version: 1.2
-Release: 4%{?dist}
+Release: 6%{?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
 Source2: vip-001.conf.example
+Source3: vip-001.list.example
+Source4: vip-up
+Source5: vip-down
+Source6: vip-helper.sh
 Patch0: ucarp-1.3-pre.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
@@ -45,32 +49,22 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 # Install the init script
-%{__install} -D -m 0755 %{SOURCE1} \
+%{__install} -D -p -m 0755 %{SOURCE1} \
     %{buildroot}/etc/rc.d/init.d/carp
 
-# Install the example config file
-%{__install} -D -m 0600 %{SOURCE2} \
-    %{buildroot}/etc/sysconfig/carp/vip-001.conf.example
-
-# Install trivial interface up/down scripts
-%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-up
-#!/bin/sh
-# We could use ifup directly, but it complains if the address is already used
-#/sbin/ifup $1
-. /etc/sysconfig/network-scripts/ifcfg-$1
-#exec /sbin/ip addr add ${IPADDR}/${NETMASK} dev "$1"
-exec /sbin/ifconfig $1 ${IPADDR} netmask ${NETMASK} up
-EOF
-%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-down
-#!/bin/sh
-#. /etc/sysconfig/network-scripts/ifcfg-$1
-#exec /sbin/ip addr del ${IPADDR}/${NETMASK} dev "$1"
-exec /sbin/ifconfig $1 down
-EOF
+%{__mkdir_p} %{buildroot}/etc/sysconfig/carp
+
+# Install the example config files
+%{__install} -D -p -m 0600 %{SOURCE2} %{SOURCE3} \
+    %{buildroot}/etc/sysconfig/carp/
+
+# Install helper scripts
+%{__install} -D -p -m 0700 %{SOURCE4} %{SOURCE5} %{SOURCE6} \
+    %{buildroot}/etc/sysconfig/carp/
 
 
 %clean
@@ -84,28 +78,36 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service carp stop >/dev/null 2>&1 || :
+    /sbin/service carp stop &>/dev/null || :
     /sbin/chkconfig --del carp
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-    /sbin/service carp condrestart >/dev/null 2>&1 || :
+    /sbin/service carp condrestart &>/dev/null || :
 fi
 
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README examples/linux/*.sh
+%doc AUTHORS COPYING ChangeLog NEWS README
 /etc/rc.d/init.d/carp
 %dir /etc/sysconfig/carp/
 /etc/sysconfig/carp/vip-001.conf.example
-%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-up
-%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-down
+/etc/sysconfig/carp/vip-001.list.example
+/etc/sysconfig/carp/vip-up
+/etc/sysconfig/carp/vip-down
+/etc/sysconfig/carp/vip-helper.sh
 %{_sbindir}/ucarp
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  1.2-6
+- Rebuild against new libpcap.
+
+* Mon Nov 13 2006 Matthias Saou  1.2-5
+- Include all improvements from Denis Ovsienko (#200395).
+
 * Mon Aug 28 2006 Matthias Saou  1.2-4
 - FC6 rebuild.
 


Index: vip-001.conf.example
===================================================================
RCS file: /cvs/extras/rpms/ucarp/devel/vip-001.conf.example,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vip-001.conf.example	22 Jun 2006 10:05:17 -0000	1.2
+++ vip-001.conf.example	29 Nov 2006 12:00:11 -0000	1.3
@@ -2,19 +2,46 @@
 # The number (from 001 to 255) in the name of the file is the identifier
 # $Id$
 
-# Set the same password on all mamchines sharing the same virtual IP
+# Set the same password on all machines sharing the same virtual router ID.
 PASSWORD="love"
 
-# You are required to have an IPADDR= line in the configuration file for
-# this interface (so no DHCP allowed)
+# UCARP daemon by default uses the first PCAP-capable interface as returned by
+# pcap_lookupdev(), this is often "eth0". This option allows you to change
+# this behaviour.
 BIND_INTERFACE="eth0"
 
-# Do *NOT* use a main interface for the virtual IP, use an ethX:Y alias
-# with the corresponding /etc/sysconfig/network-scripts/ifcfg-ethX:Y file
-# already configured and ith ONBOOT=no
-VIP_INTERFACE="eth0:0"
+# This is a mandatory option. UCARP daemon will use this IP address for its
+# announces regardless of the addresses actually assigned to the interface.
+#BIND_ADDRESS="10.0.0.2"
+
+# There is a simple and an advanced way to configure UCARP. In both ways you
+# have two physical routers with distinct IP addresses on the same IP network.
+
+# In the simple scenario, you want a single virtual IP address from the _same_
+# network to be taken over by one of the routers. You configure this VIP right
+# here then:
+#VIP_ADDRESS="10.10.10.10"
+
+# In the complex scenario, your virtual router consists of more than one IP
+# address. For example, you might want to assign to the virtual router not only
+# the address which is used as the default gateway on the LAN, but also the only
+# real IP address, which you got from your ISP. Your configuration would have
+# two steps then:
+# 1. Configure the VIP_ADDRESS to "255.255.255.255"
+# 2. Create a file in the same directory which holds vip-XXX.conf, with a name
+# vip-XXX.list. For example, if the .conf file is named vip-001.conf, the .list
+# file would be vip-001.list. Each meaningful line of this file will be used as
+# an argument for "ip address add" and "ip address del" commands. This way you
+# can control, which IP addresses will be assigned to which interfaces.
+#VIP_ADDRESS="255.255.255.255"
 
 # If you have extra options to add, see "ucarp --help" output
 # (the lower the "-k " the higher priority and "-P" to become master ASAP)
-OPTIONS="-k 128 -P"
+# Please note you can use only the following options here:
+# --preempt (-P): becomes a master as soon as possible
+# --neutral (-n): don't run downscript at start if backup
+# --advbase= (-b ): advertisement frequency
+# --advskew= (-k ): advertisement skew (0-255)
+# The rest of options list is built up by the UCARP initscript.
 
+OPTIONS="-k 128 -P"



From fedora-extras-commits at redhat.com  Wed Nov 29 12:01:47 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 07:01:47 -0500
Subject: rpms/GraphicsMagick/devel GraphicsMagick.spec,1.3,1.4
Message-ID: <200611291201.kATC1llc023087@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23068/devel

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphicsMagick.spec	29 Nov 2006 11:59:33 -0000	1.3
+++ GraphicsMagick.spec	29 Nov 2006 12:01:17 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 12:04:23 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 07:04:23 -0500
Subject: rpms/GraphicsMagick/FC-5 GraphicsMagick.spec,1.3,1.4
Message-ID: <200611291204.kATC4NRV023290@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251/FC-5

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-5/GraphicsMagick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphicsMagick.spec	29 Nov 2006 11:59:27 -0000	1.3
+++ GraphicsMagick.spec	29 Nov 2006 12:03:53 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 12:04:23 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 07:04:23 -0500
Subject: rpms/GraphicsMagick/FC-6 GraphicsMagick.spec,1.3,1.4
Message-ID: <200611291204.kATC4NZN023293@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251/FC-6

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-6/GraphicsMagick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphicsMagick.spec	29 Nov 2006 11:59:27 -0000	1.3
+++ GraphicsMagick.spec	29 Nov 2006 12:03:53 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 12:05:02 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 07:05:02 -0500
Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.24,1.25
Message-ID: <200611291205.kATC5211023416@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297

Modified Files:
	php-eaccelerator.spec 
Log Message:
Rebuild against PHP 5.2.0.



Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- php-eaccelerator.spec	8 Nov 2006 12:10:55 -0000	1.24
+++ php-eaccelerator.spec	29 Nov 2006 12:04:32 -0000	1.25
@@ -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.1.6
+%define default_version 5.2.0
 
 %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/
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  5.2.0_0.9.5-1
+- Rebuild against PHP 5.2.0.
+
 * Wed Nov  8 2006 Matthias Saou  5.1.6_0.9.5-2
 - Change to require php-common instead of php, for fastcgi without apache.
 



From fedora-extras-commits at redhat.com  Wed Nov 29 12:29:33 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 29 Nov 2006 07:29:33 -0500
Subject: rpms/optipng/FC-6 optipng-0.5.4-makefile-destdir.patch, NONE,
	1.1 optipng-0.5.4-makefile-externlibs.patch, NONE,
	1.1 optipngr.txt, NONE, 1.1 optipng.spec, 1.3,
	1.4 optipng-0.5.4-makefile.patch, 1.1, NONE
Message-ID: <200611291229.kATCTXI4023679@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632/FC-6

Modified Files:
	optipng.spec 
Added Files:
	optipng-0.5.4-makefile-destdir.patch 
	optipng-0.5.4-makefile-externlibs.patch optipngr.txt 
Removed Files:
	optipng-0.5.4-makefile.patch 
Log Message:
- splitting makefile patches
- make LDFLAGS=$RPM_OPT_FLAGS
- Use own makefile define
- Fixing 216784 with upstream patch


optipng-0.5.4-makefile-destdir.patch:

--- NEW FILE optipng-0.5.4-makefile-destdir.patch ---
diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
--- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 11:55:25.000000000 +0100
+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 11:56:28.000000000 +0100
@@ -64,17 +64,17 @@
 
 
 install: $(OPTIPNG)
-	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
-	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
-	- at rm -f ${bindir}/$(OPTIPNG)
-	- at rm -f ${man1dir}/optipng.1
-	cp -p $(OPTIPNG) ${bindir}
-	cp -p ../man/optipng.1 ${man1dir}
+	- at if [ ! -d ${DESTDIR}/${bindir} ]; then mkdir -p ${DESTDIR}/${bindir}; fi
+	- at if [ ! -d ${DESTDIR}/${man1dir} ]; then mkdir -p ${DESTDIR}/${man1dir}; fi
+	- at rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	- at rm -f ${DESTDIR}/${man1dir}/optipng.1
+	cp -p $(OPTIPNG) ${DESTDIR}/${bindir}
+	cp -p ../man/optipng.1 ${DESTDIR}/${man1dir}
 
 
 uninstall:
-	rm -f ${bindir}/$(OPTIPNG)
-	rm -f ${man1dir}/optipng.1
+	rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	rm -f ${DESTDIR}/${man1dir}/optipng.1
 
 
 clean:

optipng-0.5.4-makefile-externlibs.patch:

--- NEW FILE optipng-0.5.4-makefile-externlibs.patch ---
diff -ru optipng-0.5.4/lib/pngxtern/scripts/gcc.mak optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak
--- optipng-0.5.4/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:53.000000000 +0100
+++ optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:55.000000000 +0100
@@ -39,7 +39,7 @@
 all: pngxtern$(A)
 
 .c$(O):
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) $<
+	$(CC) -c $(CFLAGS)  $<
 
 pngxtern$(A): $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
--- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 12:05:22.000000000 +0100
+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 12:05:21.000000000 +0100
@@ -19,24 +19,20 @@
 ZLIB     = libz.a
 PNGLIB   = libpng.a
 PNGXLIB  = pngxtern.a
-ZMAK     = Makefile
-PNGMAK   = scripts/makefile.gcc
 PNGXMAK  = scripts/gcc.mak
-ZDIR     = ../lib/zlib
-PNGDIR   = ../lib/libpng
 PNGXDIR  = ../lib/pngxtern
 BACKHERE = ../../src
 
 OBJS = optipng.o opngio.o opngreduc.o cbitset.o osys.o strutil.o
-LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
+LIBS = $(PNGXDIR)/$(PNGXLIB)
 
 
 $(OPTIPNG): $(OBJS) $(LIBS)
-	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) $*.c
+	$(CC) -c $(CFLAGS) -I$(PNGXDIR) $*.c
 
 optipng.o  : optipng.c proginfo.h opng.h cexcept.h cbitset.h osys.h strutil.h
 opngio.o   : opngio.c opng.h
@@ -46,23 +42,11 @@
 strutil.o  : strutil.c strutil.h
 
 
-$(PNGXDIR)/$(PNGXLIB): $(ZDIR)/$(ZLIB) $(PNGDIR)/$(PNGLIB)
+$(PNGXDIR)/$(PNGXLIB):
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) $(PNGXLIB); \
 	cd $(BACKHERE)
 
-$(PNGDIR)/$(PNGLIB): $(ZDIR)/$(ZLIB)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) $(PNGLIB); \
-	cd $(BACKHERE)
-
-$(ZDIR)/$(ZLIB):
-	cd $(ZDIR); \
-	./configure; \
-	$(MAKE) -f $(ZMAK) $(ZLIB); \
-	cd $(BACKHERE)
-
-
 install: $(OPTIPNG)
 	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
 	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
@@ -82,9 +66,3 @@
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) clean; \
 	cd $(BACKHERE)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) clean; \
-	cd $(BACKHERE)
-	cd $(ZDIR); \
-	$(MAKE) -f $(ZMAK) clean; \
-	cd $(BACKHERE)


--- NEW FILE optipngr.txt ---
diff -urN optipng-0.5.4.orig/src/opngreduc.c optipng-0.5.4/src/opngreduc.c
--- optipng-0.5.4.orig/src/opngreduc.c	2006-11-28 01:55:45.000000000 -0200
+++ optipng-0.5.4/src/opngreduc.c	2006-11-28 01:56:54.000000000 -0200
@@ -80,10 +80,6 @@
    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
       if (sig_bit != &info_ptr->sig_bit)
          goto error;
-   if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values))
-      if (trans != info_ptr->trans || num_trans != info_ptr->num_trans ||
-          trans_values != &info_ptr->trans_values)
-         goto error;
 
    /* Also check png_ptr.  (It's not much, but we're doing what we can.) */
    if (png_get_compression_buffer_size(png_ptr) != png_ptr->zbuf_size)


Index: optipng.spec
===================================================================
RCS file: /cvs/extras/rpms/optipng/FC-6/optipng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- optipng.spec	11 Oct 2006 20:38:24 -0000	1.3
+++ optipng.spec	29 Nov 2006 12:29:03 -0000	1.4
@@ -1,13 +1,15 @@
 Name:           optipng
 Version:        0.5.4
-Release:        3%{?dist}
+Release:        4%{?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.patch
+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
@@ -22,18 +24,23 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%define makefile gcc.mak
 
 %build
 cd src/
-make -f scripts/gcc.mak %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make -f scripts/%{makefile} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"\
+                                            LDFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 cd src/
-make -f scripts/gcc.mak install DESTDIR="$RPM_BUILD_ROOT"\
-                                prefix="%{_prefix}" \
-                                man1dir="%{_mandir}/man1"
+make -f scripts/%{makefile} install DESTDIR="$RPM_BUILD_ROOT"\
+                                    prefix="%{_prefix}" \
+                                    man1dir="%{_mandir}/man1"
 
 
 %clean
@@ -48,20 +55,31 @@
 
 
 %changelog
+* 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
 - bumping release because of errors while importing to extras
+
 * Tue Oct 10 2006 Till Maas  - 0.5.4-2
 - shortening Summary
+
 * 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
 - 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
 - Changed license tag from zlib/libpng to zlib
+
 * Tue Jul 04 2006 Till Maas  - 0.5.2-1
 - Created from scratch for fedora extras


--- optipng-0.5.4-makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 12:29:34 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 29 Nov 2006 07:29:34 -0500
Subject: rpms/optipng/devel optipng-0.5.4-makefile-destdir.patch, NONE,
	1.1 optipng-0.5.4-makefile-externlibs.patch, NONE,
	1.1 optipngr.txt, NONE, 1.1 optipng.spec, 1.3,
	1.4 optipng-0.5.4-makefile.patch, 1.1, NONE
Message-ID: <200611291229.kATCTYto023682@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632/devel

Modified Files:
	optipng.spec 
Added Files:
	optipng-0.5.4-makefile-destdir.patch 
	optipng-0.5.4-makefile-externlibs.patch optipngr.txt 
Removed Files:
	optipng-0.5.4-makefile.patch 
Log Message:
- splitting makefile patches
- make LDFLAGS=$RPM_OPT_FLAGS
- Use own makefile define
- Fixing 216784 with upstream patch


optipng-0.5.4-makefile-destdir.patch:

--- NEW FILE optipng-0.5.4-makefile-destdir.patch ---
diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
--- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 11:55:25.000000000 +0100
+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 11:56:28.000000000 +0100
@@ -64,17 +64,17 @@
 
 
 install: $(OPTIPNG)
-	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
-	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
-	- at rm -f ${bindir}/$(OPTIPNG)
-	- at rm -f ${man1dir}/optipng.1
-	cp -p $(OPTIPNG) ${bindir}
-	cp -p ../man/optipng.1 ${man1dir}
+	- at if [ ! -d ${DESTDIR}/${bindir} ]; then mkdir -p ${DESTDIR}/${bindir}; fi
+	- at if [ ! -d ${DESTDIR}/${man1dir} ]; then mkdir -p ${DESTDIR}/${man1dir}; fi
+	- at rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	- at rm -f ${DESTDIR}/${man1dir}/optipng.1
+	cp -p $(OPTIPNG) ${DESTDIR}/${bindir}
+	cp -p ../man/optipng.1 ${DESTDIR}/${man1dir}
 
 
 uninstall:
-	rm -f ${bindir}/$(OPTIPNG)
-	rm -f ${man1dir}/optipng.1
+	rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	rm -f ${DESTDIR}/${man1dir}/optipng.1
 
 
 clean:

optipng-0.5.4-makefile-externlibs.patch:

--- NEW FILE optipng-0.5.4-makefile-externlibs.patch ---
diff -ru optipng-0.5.4/lib/pngxtern/scripts/gcc.mak optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak
--- optipng-0.5.4/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:53.000000000 +0100
+++ optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:55.000000000 +0100
@@ -39,7 +39,7 @@
 all: pngxtern$(A)
 
 .c$(O):
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) $<
+	$(CC) -c $(CFLAGS)  $<
 
 pngxtern$(A): $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
--- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 12:05:22.000000000 +0100
+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 12:05:21.000000000 +0100
@@ -19,24 +19,20 @@
 ZLIB     = libz.a
 PNGLIB   = libpng.a
 PNGXLIB  = pngxtern.a
-ZMAK     = Makefile
-PNGMAK   = scripts/makefile.gcc
 PNGXMAK  = scripts/gcc.mak
-ZDIR     = ../lib/zlib
-PNGDIR   = ../lib/libpng
 PNGXDIR  = ../lib/pngxtern
 BACKHERE = ../../src
 
 OBJS = optipng.o opngio.o opngreduc.o cbitset.o osys.o strutil.o
-LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
+LIBS = $(PNGXDIR)/$(PNGXLIB)
 
 
 $(OPTIPNG): $(OBJS) $(LIBS)
-	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) $*.c
+	$(CC) -c $(CFLAGS) -I$(PNGXDIR) $*.c
 
 optipng.o  : optipng.c proginfo.h opng.h cexcept.h cbitset.h osys.h strutil.h
 opngio.o   : opngio.c opng.h
@@ -46,23 +42,11 @@
 strutil.o  : strutil.c strutil.h
 
 
-$(PNGXDIR)/$(PNGXLIB): $(ZDIR)/$(ZLIB) $(PNGDIR)/$(PNGLIB)
+$(PNGXDIR)/$(PNGXLIB):
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) $(PNGXLIB); \
 	cd $(BACKHERE)
 
-$(PNGDIR)/$(PNGLIB): $(ZDIR)/$(ZLIB)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) $(PNGLIB); \
-	cd $(BACKHERE)
-
-$(ZDIR)/$(ZLIB):
-	cd $(ZDIR); \
-	./configure; \
-	$(MAKE) -f $(ZMAK) $(ZLIB); \
-	cd $(BACKHERE)
-
-
 install: $(OPTIPNG)
 	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
 	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
@@ -82,9 +66,3 @@
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) clean; \
 	cd $(BACKHERE)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) clean; \
-	cd $(BACKHERE)
-	cd $(ZDIR); \
-	$(MAKE) -f $(ZMAK) clean; \
-	cd $(BACKHERE)


--- NEW FILE optipngr.txt ---
diff -urN optipng-0.5.4.orig/src/opngreduc.c optipng-0.5.4/src/opngreduc.c
--- optipng-0.5.4.orig/src/opngreduc.c	2006-11-28 01:55:45.000000000 -0200
+++ optipng-0.5.4/src/opngreduc.c	2006-11-28 01:56:54.000000000 -0200
@@ -80,10 +80,6 @@
    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
       if (sig_bit != &info_ptr->sig_bit)
          goto error;
-   if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values))
-      if (trans != info_ptr->trans || num_trans != info_ptr->num_trans ||
-          trans_values != &info_ptr->trans_values)
-         goto error;
 
    /* Also check png_ptr.  (It's not much, but we're doing what we can.) */
    if (png_get_compression_buffer_size(png_ptr) != png_ptr->zbuf_size)


Index: optipng.spec
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/optipng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- optipng.spec	11 Oct 2006 20:38:24 -0000	1.3
+++ optipng.spec	29 Nov 2006 12:29:04 -0000	1.4
@@ -1,13 +1,15 @@
 Name:           optipng
 Version:        0.5.4
-Release:        3%{?dist}
+Release:        4%{?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.patch
+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
@@ -22,18 +24,23 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%define makefile gcc.mak
 
 %build
 cd src/
-make -f scripts/gcc.mak %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make -f scripts/%{makefile} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"\
+                                            LDFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 cd src/
-make -f scripts/gcc.mak install DESTDIR="$RPM_BUILD_ROOT"\
-                                prefix="%{_prefix}" \
-                                man1dir="%{_mandir}/man1"
+make -f scripts/%{makefile} install DESTDIR="$RPM_BUILD_ROOT"\
+                                    prefix="%{_prefix}" \
+                                    man1dir="%{_mandir}/man1"
 
 
 %clean
@@ -48,20 +55,31 @@
 
 
 %changelog
+* 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
 - bumping release because of errors while importing to extras
+
 * Tue Oct 10 2006 Till Maas  - 0.5.4-2
 - shortening Summary
+
 * 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
 - 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
 - Changed license tag from zlib/libpng to zlib
+
 * Tue Jul 04 2006 Till Maas  - 0.5.2-1
 - Created from scratch for fedora extras


--- optipng-0.5.4-makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 12:30:47 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Wed, 29 Nov 2006 07:30:47 -0500
Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.15,1.16
Message-ID: <200611291230.kATCUls8023795@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23731

Modified Files:
	libfwbuilder.spec 
Log Message:
- Update release for build


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libfwbuilder.spec	27 Nov 2006 21:06:04 -0000	1.15
+++ libfwbuilder.spec	29 Nov 2006 12:30:17 -0000	1.16
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
 Version:        2.1.7
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -77,7 +77,10 @@
 
 
 %changelog
-* Tue Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
+* Wed Nov 29 2006 Ralf Ertzinger  2.1.7-1.fc7
+- Update release for build
+
+* Mon Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
 - Update to 2.1.7
 
 * Tue Oct 24 2006 Ralf Ertzinger  2.1.6-0.0.beta.fc7



From fedora-extras-commits at redhat.com  Wed Nov 29 12:35:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 07:35:36 -0500
Subject: rpms/libmal/devel libmal.spec,1.5,1.6
Message-ID: <200611291235.kATCZai3023872@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23857

Modified Files:
	libmal.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.31-5
- respin against new pilot-link



Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/devel/libmal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmal.spec	29 Aug 2006 18:09:37 -0000	1.5
+++ libmal.spec	29 Nov 2006 12:35:06 -0000	1.6
@@ -2,13 +2,13 @@
 Summary: A convenience library for malsync
 Name:    libmal
 # NOTE: this isn't the latest version, but is the last version known to 
-# work with kdepim
+# work with kdepim-3.5.x
 Version: 0.31 
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: MPL	
 Url: 	 http://jasonday.home.att.net/code/libmal/ 
-Source:  http://jasonday.home.att.net/code/libmal/libmal-0.31.tar.gz 
+Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz 
 Group:   System Environment/Libraries	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.31-5
+- respin against new pilot-link
+
 * Tue Aug 29 2006 Rex Dieter  0.31-4
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Wed Nov 29 12:45:18 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 07:45:18 -0500
Subject: rpms/proftpd/FC-5 proftpd-1.3.0-cmdbufsize.patch, NONE,
	1.1 proftpd-1.3.0-mod_tls.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 proftpd.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200611291245.kATCjIvo023996@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23950/FC-5

Modified Files:
	.cvsignore proftpd.spec sources 
Added Files:
	proftpd-1.3.0-cmdbufsize.patch proftpd-1.3.0-mod_tls.patch 
Log Message:
Backport 1.3.0a update and patches to FC-5 and FC-6 branches.


proftpd-1.3.0-cmdbufsize.patch:

--- NEW FILE proftpd-1.3.0-cmdbufsize.patch ---
--- proftpd-1.3.0/src/main.c.cmdbufsize	2006-03-15 19:41:01.000000000 +0000
+++ proftpd-1.3.0/src/main.c	2006-11-17 16:53:35.000000000 +0000
@@ -116,6 +116,8 @@
 
 static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
 
+#define PR_DEFAULT_CMD_BUFSZ 512
+
 static char **Argv = NULL;
 static char *LastArgv = NULL;
 static const char *PidPath = PR_PID_FILE_PATH;
@@ -823,13 +825,26 @@
       long *buf_size = get_param_ptr(main_server->conf,
         "CommandBufferSize", FALSE);
 
-      if (buf_size == NULL || *buf_size <= 0)
-        cmd_buf_size = 512;
+      if (buf_size == NULL) {
+        pr_log_debug(DEBUG1, "no CommandBufferSize size given, "
+          "using default buffer size (%u)", (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*buf_size <= 0) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
+          "given, resetting to default buffer size (%u)",
+          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*buf_size + 1 > sizeof(buf)) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
+          "given, resetting to default buffer size (%u)",
+          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 
-      else if (*buf_size + 1 > sizeof(buf)) {
-	pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
-          "Resetting to 512.");
-	cmd_buf_size = 512;
+      } else {
+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %ld", *buf_size);
+        cmd_buf_size = (long) *buf_size;
       }
     }
 

proftpd-1.3.0-mod_tls.patch:

--- NEW FILE proftpd-1.3.0-mod_tls.patch ---
This is a possible fix Ralf S. Engelschall 
has made myself for the X.509 issue of mod_tls.c

Index: contrib/mod_tls.c
--- contrib/mod_tls.c.orig      2005-11-08 18:59:49 +0100
+++ contrib/mod_tls.c   2006-11-15 17:54:43 +0100
@@ -2421,6 +2421,8 @@
      datalen = BIO_get_mem_data(mem, &data);

   if (data) {
+    if (datalen > sizeof(buf)-1)
+        datalen = sizeof(buf)-1;
     memset(&buf, '\0', sizeof(buf));
     memcpy(buf, data, datalen);
     buf[datalen] = '\0';


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 May 2006 15:47:53 -0000	1.8
+++ .cvsignore	29 Nov 2006 12:44:48 -0000	1.9
@@ -1 +1 @@
-proftpd-1.3.0.tar.bz2
+proftpd-1.3.0a.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- proftpd.spec	23 Aug 2006 14:45:53 -0000	1.17
+++ proftpd.spec	29 Nov 2006 12:44:48 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.0
-Release: 6%{?dist}
+Version: 1.3.0a
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -14,6 +14,8 @@
 Source6: proftpd.pam
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
+Patch2: proftpd-1.3.0-cmdbufsize.patch
+Patch3: proftpd-1.3.0-mod_tls.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +68,8 @@
 %setup
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
+%patch2 -p1 -b .cmdbufsize
+%patch3 -p0 -b .mod_tls
 
 
 %build
@@ -186,7 +190,22 @@
 
 
 %changelog
-* Mon Aug 23 2006 Matthias Saou  1.3.0-6
+* Mon Nov 27 2006 Matthias Saou  1.3.0a-1
+- Update to 1.3.0a, which actually fixes CVE-2006-5815... yes, #214820!).
+
+* Thu Nov 16 2006 Matthias Saou  1.3.0-10
+- Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
+
+* Thu Nov 16 2006 Matthias Saou  1.3.0-9
+- Include mod_tls patch (#214820 too).
+
+* Mon Nov 13 2006 Matthias Saou  1.3.0-8
+- Include cmdbufsize patch (#214820).
+
+* Mon Aug 28 2006 Matthias Saou  1.3.0-7
+- FC6 rebuild.
+
+* Mon Aug 21 2006 Matthias Saou  1.3.0-6
 - Add mod_quotatab, _file, _ldap and _sql (#134291).
 
 * Mon Jul  3 2006 Matthias Saou  1.3.0-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 May 2006 15:47:53 -0000	1.8
+++ sources	29 Nov 2006 12:44:48 -0000	1.9
@@ -1 +1 @@
-fae47d01b52e035eb6b7190e74c17722  proftpd-1.3.0.tar.bz2
+cc2e99f38a810982f91d5cbe1f4091f0  proftpd-1.3.0a.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 12:45:19 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 07:45:19 -0500
Subject: rpms/proftpd/FC-6 proftpd-1.3.0-cmdbufsize.patch, NONE,
	1.1 proftpd-1.3.0-mod_tls.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 proftpd.spec, 1.20, 1.21 sources, 1.8, 1.9
Message-ID: <200611291245.kATCjJvQ024001@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23950/FC-6

Modified Files:
	.cvsignore proftpd.spec sources 
Added Files:
	proftpd-1.3.0-cmdbufsize.patch proftpd-1.3.0-mod_tls.patch 
Log Message:
Backport 1.3.0a update and patches to FC-5 and FC-6 branches.


proftpd-1.3.0-cmdbufsize.patch:

--- NEW FILE proftpd-1.3.0-cmdbufsize.patch ---
--- proftpd-1.3.0/src/main.c.cmdbufsize	2006-03-15 19:41:01.000000000 +0000
+++ proftpd-1.3.0/src/main.c	2006-11-17 16:53:35.000000000 +0000
@@ -116,6 +116,8 @@
 
 static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
 
+#define PR_DEFAULT_CMD_BUFSZ 512
+
 static char **Argv = NULL;
 static char *LastArgv = NULL;
 static const char *PidPath = PR_PID_FILE_PATH;
@@ -823,13 +825,26 @@
       long *buf_size = get_param_ptr(main_server->conf,
         "CommandBufferSize", FALSE);
 
-      if (buf_size == NULL || *buf_size <= 0)
-        cmd_buf_size = 512;
+      if (buf_size == NULL) {
+        pr_log_debug(DEBUG1, "no CommandBufferSize size given, "
+          "using default buffer size (%u)", (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*buf_size <= 0) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
+          "given, resetting to default buffer size (%u)",
+          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*buf_size + 1 > sizeof(buf)) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
+          "given, resetting to default buffer size (%u)",
+          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 
-      else if (*buf_size + 1 > sizeof(buf)) {
-	pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
-          "Resetting to 512.");
-	cmd_buf_size = 512;
+      } else {
+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %ld", *buf_size);
+        cmd_buf_size = (long) *buf_size;
       }
     }
 

proftpd-1.3.0-mod_tls.patch:

--- NEW FILE proftpd-1.3.0-mod_tls.patch ---
This is a possible fix Ralf S. Engelschall 
has made myself for the X.509 issue of mod_tls.c

Index: contrib/mod_tls.c
--- contrib/mod_tls.c.orig      2005-11-08 18:59:49 +0100
+++ contrib/mod_tls.c   2006-11-15 17:54:43 +0100
@@ -2421,6 +2421,8 @@
      datalen = BIO_get_mem_data(mem, &data);

   if (data) {
+    if (datalen > sizeof(buf)-1)
+        datalen = sizeof(buf)-1;
     memset(&buf, '\0', sizeof(buf));
     memcpy(buf, data, datalen);
     buf[datalen] = '\0';


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Apr 2006 17:05:11 -0000	1.8
+++ .cvsignore	29 Nov 2006 12:44:49 -0000	1.9
@@ -1 +1 @@
-proftpd-1.3.0.tar.bz2
+proftpd-1.3.0a.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-6/proftpd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- proftpd.spec	28 Aug 2006 12:28:49 -0000	1.20
+++ proftpd.spec	29 Nov 2006 12:44:49 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.0
-Release: 7%{?dist}
+Version: 1.3.0a
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -14,6 +14,8 @@
 Source6: proftpd.pam
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
+Patch2: proftpd-1.3.0-cmdbufsize.patch
+Patch3: proftpd-1.3.0-mod_tls.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +68,8 @@
 %setup
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
+%patch2 -p1 -b .cmdbufsize
+%patch3 -p0 -b .mod_tls
 
 
 %build
@@ -186,6 +190,18 @@
 
 
 %changelog
+* Mon Nov 27 2006 Matthias Saou  1.3.0a-1
+- Update to 1.3.0a, which actually fixes CVE-2006-5815... yes, #214820!).
+
+* Thu Nov 16 2006 Matthias Saou  1.3.0-10
+- Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
+
+* Thu Nov 16 2006 Matthias Saou  1.3.0-9
+- Include mod_tls patch (#214820 too).
+
+* Mon Nov 13 2006 Matthias Saou  1.3.0-8
+- Include cmdbufsize patch (#214820).
+
 * Mon Aug 28 2006 Matthias Saou  1.3.0-7
 - FC6 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Apr 2006 17:05:11 -0000	1.8
+++ sources	29 Nov 2006 12:44:49 -0000	1.9
@@ -1 +1 @@
-fae47d01b52e035eb6b7190e74c17722  proftpd-1.3.0.tar.bz2
+cc2e99f38a810982f91d5cbe1f4091f0  proftpd-1.3.0a.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 13:06:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 08:06:36 -0500
Subject: rpms/libtunepimp/devel .cvsignore, 1.7, 1.8 libtunepimp.spec, 1.23, 
	1.24 sources, 1.6, 1.7
Message-ID: <200611291306.kATD6aO9027263@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27244

Modified Files:
	.cvsignore libtunepimp.spec sources 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.5.3-1
- libtunepimp-0.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Oct 2006 21:02:35 -0000	1.7
+++ .cvsignore	29 Nov 2006 13:06:05 -0000	1.8
@@ -1,2 +1,3 @@
 clog
 libtunepimp-0.5.2.tar.gz
+libtunepimp-0.5.3.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libtunepimp.spec	31 Oct 2006 15:08:29 -0000	1.23
+++ libtunepimp.spec	29 Nov 2006 13:06:05 -0000	1.24
@@ -1,13 +1,14 @@
 
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
-Version: 0.5.2
-Release: 4%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
 URL:	 http://www.musicbrainz.org/products/tunepimp/
-Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
+# see http://musicbrainz.org/doc/libtunepimpDownload
+Source0: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define pkglibdir %{_libdir}/tunepimp
@@ -133,6 +134,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.5.3-1
+- libtunepimp-0.5.3
+
 * Tue Oct 31 2006 Rex Dieter  0.5.2-4
 - respin for curl update (fc7)
 
@@ -144,7 +148,7 @@
 - build python-libtunepimp subpackage (#209961)
 
 * Mon Oct 02 2006 Rex Dieter  0.5.2-1
-- 0.5.2
+- libtunepimp-0.5.2
 
 * Tue Sep 26 2006 Rex Dieter  0.5.1-2
 - drop -tools subpkg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Oct 2006 16:29:30 -0000	1.6
+++ sources	29 Nov 2006 13:06:05 -0000	1.7
@@ -1 +1 @@
-655b254539013f5e7fe50ac035c26dcb  libtunepimp-0.5.2.tar.gz
+09649f983acef679a548344ba7a9bb2f  libtunepimp-0.5.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 13:59:33 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Wed, 29 Nov 2006 08:59:33 -0500
Subject: rpms/argus/devel argus.spec,1.6,1.7
Message-ID: <200611291359.kATDxXf7027797@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27782

Modified Files:
	argus.spec 
Log Message:
rebuilt for libpcap 0.9.5



Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- argus.spec	8 Sep 2006 13:57:21 -0000	1.6
+++ argus.spec	29 Nov 2006 13:59:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Wed Nov 29 2006 Gabriel Somlo  2.0.6.fixes.1-13
+- rebuilt against libpcap 0.9.5
+
 * Fri Sep 08 2006 Gabriel Somlo  2.0.6.fixes.1-12
 - rebuilt for FC6MassRebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 29 14:39:55 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 09:39:55 -0500
Subject: rpms/xtide/FC-5 xtide.spec,1.11,1.12
Message-ID: <200611291439.kATEdtsU031104@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31086

Modified Files:
	xtide.spec 
Log Message:
* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122.fc5.1
- Add more BuildRequires only for FC-5.



Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xtide.spec	28 Nov 2006 23:58:38 -0000	1.11
+++ xtide.spec	29 Nov 2006 14:39:25 -0000	1.12
@@ -4,7 +4,7 @@
 Summary:         Calculate tide all over the world
 Name:            xtide
 Version:         2.9
-Release:         0.2.date%{src_date}%{?dist}
+Release:         0.2.date%{src_date}%{?dist}.1
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2
@@ -26,6 +26,10 @@
 
 BuildRequires:   autoconf
 
+%if 0%{?fedora} == 5
+BuildRequires:   libXpm-devel
+BuildRequires:   libXt-devel
+%endif
 BuildRequires:   libXaw-devel
 BuildRequires:   libXext-devel
 BuildRequires:   libpng-devel
@@ -251,6 +255,9 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122.fc5.1
+- Add more BuildRequires only for FC-5.
+
 * Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122
 - Ensure the hardcorded directories in some scripts can be 
   appropriately changed.



From fedora-extras-commits at redhat.com  Wed Nov 29 14:41:07 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 09:41:07 -0500
Subject: rpms/xtide/FC-5 xtide.spec,1.12,1.13
Message-ID: <200611291441.kATEf7O4031137@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31122

Modified Files:
	xtide.spec 
Log Message:
Fix changelog date...


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xtide.spec	29 Nov 2006 14:39:25 -0000	1.12
+++ xtide.spec	29 Nov 2006 14:40:37 -0000	1.13
@@ -255,7 +255,7 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
-* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122.fc5.1
+* Wed Nov 29 2006 Mamoru Tasaka  - 2.9-0.2.date20061122.fc5.1
 - Add more BuildRequires only for FC-5.
 
 * Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122



From fedora-extras-commits at redhat.com  Wed Nov 29 15:11:03 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 10:11:03 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.11, 1.12 ochusha.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200611291511.kATFB3Vm001904@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1885

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061129
- 0.5.99.63.7 cvs 061129 (23:00 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	27 Nov 2006 15:23:41 -0000	1.11
+++ .cvsignore	29 Nov 2006 15:10:33 -0000	1.12
@@ -1 +1 @@
-ochusha-0.5.99.63.6-cvs061127.tar.bz2
+ochusha-0.5.99.63.7-cvs061129.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ochusha.spec	27 Nov 2006 15:23:41 -0000	1.11
+++ ochusha.spec	29 Nov 2006 15:10:33 -0000	1.12
@@ -1,8 +1,8 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.6
-%define              strtag          cvs061127
+%define              main_ver        0.5.99.63.7
+%define              strtag          cvs061129
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -122,7 +122,7 @@
 }
 
 change_encoding EUCJP \
-   BUGS ChangeLog INSTALL.jp NEWS README TODO \
+   BUGS ChangeLog NEWS README TODO \
    ochusha/ochusha-gtkrc.gray
 
 %clean
@@ -155,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Mon Nov 27 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061127
-- 0.5.99.63.6 cvs 061127 (23:59 JST)
+* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061129
+- 0.5.99.63.7 cvs 061129 (23:00 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	27 Nov 2006 15:23:41 -0000	1.11
+++ sources	29 Nov 2006 15:10:33 -0000	1.12
@@ -1 +1 @@
-bcf4e008319305ba074c9509a55fcf2f  ochusha-0.5.99.63.6-cvs061127.tar.bz2
+691eaa88b5c402f929bcac37734625e2  ochusha-0.5.99.63.7-cvs061129.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 15:12:02 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 10:12:02 -0500
Subject: rpms/ochusha/devel ochusha.spec,1.12,1.13
Message-ID: <200611291512.kATFC2Zj001936@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1915

Modified Files:
	ochusha.spec 
Log Message:
fix changelog version...


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ochusha.spec	29 Nov 2006 15:10:33 -0000	1.12
+++ ochusha.spec	29 Nov 2006 15:11:32 -0000	1.13
@@ -155,7 +155,7 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061129
+* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.7-0.1.cvs061129
 - 0.5.99.63.7 cvs 061129 (23:00 JST)
 
 * Sat Nov 18 2006 



From fedora-extras-commits at redhat.com  Wed Nov 29 15:12:44 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Wed, 29 Nov 2006 10:12:44 -0500
Subject: rpms/fwbuilder/devel fwbuilder.spec,1.16,1.17
Message-ID: <200611291512.kATFCi5M001999@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1973

Modified Files:
	fwbuilder.spec 
Log Message:

- Bump release for build
- Add fwbuilder symlink



Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fwbuilder.spec	27 Nov 2006 21:11:37 -0000	1.16
+++ fwbuilder.spec	29 Nov 2006 15:12:14 -0000	1.17
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
 Version:        2.1.7
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 
 License:        GPL
 Group:          Applications/System
@@ -13,7 +13,6 @@
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  libfwbuilder-devel = %{version}
-BuildRequires:  /usr/bin/rename
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for
@@ -68,6 +67,8 @@
   --add-category X-Fedora                          \
   %{SOURCE1}
 
+%{__ln_s} fwbuilder21 $RPM_BUILD_ROOT%{_bindir}/fwbuilder
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,6 +84,7 @@
 %{_datadir}/fwbuilder
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/fwbuilder.png
+%{_bindir}/fwbuilder
 %{_bindir}/fwbuilder21
 %{_bindir}/fwblookup21
 %{_bindir}/fwbedit21
@@ -109,9 +111,9 @@
 
 %files pf
 %defattr(-,root,root)
-%{_bindir}/fwb_pf
+%{_bindir}/fwb_pf21
 %doc doc/README.pf
-%{_mandir}/man1/fwb_pf.1*
+%{_mandir}/man1/fwb_pf21.1*
 
 
 %package ipf
@@ -124,9 +126,9 @@
 
 %files ipf
 %defattr(-,root,root)
-%{_bindir}/fwb_ipf
+%{_bindir}/fwb_ipf21
 %doc doc/README.ipf
-%{_mandir}/man1/fwb_ipf.1*
+%{_mandir}/man1/fwb_ipf21.1*
 
 
 %package ipfw
@@ -139,9 +141,9 @@
 
 %files ipfw
 %defattr(-,root,root)
-%{_bindir}/fwb_ipfw
+%{_bindir}/fwb_ipfw21
 %doc doc/README.ipfw
-%{_mandir}/man1/fwb_ipfw.1*
+%{_mandir}/man1/fwb_ipfw21.1*
 
 
 %package ipt
@@ -154,12 +156,16 @@
 
 %files ipt
 %defattr(-,root,root)
-%{_bindir}/fwb_ipt
+%{_bindir}/fwb_ipt21
 %doc doc/README.ipt
-%{_mandir}/man1/fwb_ipt.1*
+%{_mandir}/man1/fwb_ipt21.1*
 
 %changelog
-* Tue Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
+* Wed Nov 29 2006 Ralf Ertzinger  2.1.7-1.fc7
+- Bump release for build
+- Add fwbuilder symlink
+
+* Mon Nov 27 2006 Ralf Ertzinger  2.1.7-0.2.fc7
 - Update to 2.1.7
 
 * Tue Oct 24 2006 Ralf Ertzinger  2.1.6-0.0.beta.fc7



From fedora-extras-commits at redhat.com  Wed Nov 29 15:21:04 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 29 Nov 2006 10:21:04 -0500
Subject: rpms/ip6sic/FC-6 ip6sic.spec,1.3,1.4
Message-ID: <200611291521.kATFL4Vv002102@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ip6sic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2087

Modified Files:
	ip6sic.spec 
Log Message:
Bump and rebuild for new libpcap


Index: ip6sic.spec
===================================================================
RCS file: /cvs/extras/rpms/ip6sic/FC-6/ip6sic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ip6sic.spec	5 Sep 2006 14:07:36 -0000	1.3
+++ ip6sic.spec	29 Nov 2006 15:20:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ip6sic
 Version:        0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        IPv6 Stack Integrity Checker
 
 Group:          Applications/Internet
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jarod Wilson  0.1-5
+- Rebuild against new libpcap
+
 * Tue Sep 05 2006 Jarod Wilson  0.1-4
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Wed Nov 29 15:34:24 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 29 Nov 2006 10:34:24 -0500
Subject: rpms/zabbix/devel zabbix.spec,1.1,1.2
Message-ID: <200611291534.kATFYOPH002253@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2230

Modified Files:
	zabbix.spec 
Log Message:
Bump and rebuild for new libnetsnmp


Index: zabbix.spec
===================================================================
RCS file: /cvs/extras/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix.spec	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix.spec	29 Nov 2006 15:33:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -213,6 +213,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Nov 29 2006 Jarod Wilson  1.1.4-3
+- Rebuild for updated libnetsnmp
+
 * Thu Nov 16 2006 Jarod Wilson  1.1.4-2
 - Fix up pt_br
 - Add Req-pre on useradd



From fedora-extras-commits at redhat.com  Wed Nov 29 15:37:58 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 29 Nov 2006 10:37:58 -0500
Subject: rpms/ip6sic/devel ip6sic.spec,1.3,1.4
Message-ID: <200611291537.kATFbwN7002326@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ip6sic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2307

Modified Files:
	ip6sic.spec 
Log Message:
Bump for new libpcap


Index: ip6sic.spec
===================================================================
RCS file: /cvs/extras/rpms/ip6sic/devel/ip6sic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ip6sic.spec	5 Sep 2006 14:07:36 -0000	1.3
+++ ip6sic.spec	29 Nov 2006 15:37:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ip6sic
 Version:        0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        IPv6 Stack Integrity Checker
 
 Group:          Applications/Internet
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jarod Wilson  0.1-5
+- Rebuild against new libpcap
+
 * Tue Sep 05 2006 Jarod Wilson  0.1-4
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Wed Nov 29 15:51:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 10:51:46 -0500
Subject: rpms/gnupg2/devel .cvsignore, 1.18, 1.19 gnupg2.spec, 1.64,
	1.65 sources, 1.20, 1.21
Message-ID: <200611291551.kATFpkkG002430@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2409

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Wed Nov 29 2006 Rex Dieter  2.0.1-1
- gnupg-2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	25 Nov 2006 14:07:41 -0000	1.18
+++ .cvsignore	29 Nov 2006 15:51:16 -0000	1.19
@@ -1,4 +1,3 @@
-gnupg-2.0.0.tar.bz2
-gnupg-2.0.0.tar.bz2.sig
-gnupg-2.0.1rc1.tar.bz2
-gnupg-2.0.1rc1.tar.bz2.sig
+clog
+gnupg-2.0.1.tar.bz2
+gnupg-2.0.1.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnupg2.spec	25 Nov 2006 15:56:56 -0000	1.64
+++ gnupg2.spec	29 Nov 2006 15:51:16 -0000	1.65
@@ -7,17 +7,15 @@
 %define kde_scriptdir %{_prefix}
 %endif
 
-%define beta rc1
-
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.1
-Release: 0.3.%{beta}%{?dist}
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -179,6 +177,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  2.0.1-1
+- gnupg-2.0.1
+
 * 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	25 Nov 2006 14:07:41 -0000	1.20
+++ sources	29 Nov 2006 15:51:16 -0000	1.21
@@ -1,2 +1,2 @@
-e782017943dcf59e3f5b71556e921be4  gnupg-2.0.1rc1.tar.bz2
-2dee9b82c53b42c13267b794aa3fae00  gnupg-2.0.1rc1.tar.bz2.sig
+eb24e258db73f4cb53a3ce18375efa21  gnupg-2.0.1.tar.bz2
+58b1bbc2f34c0882ab1a49542a8ffd45  gnupg-2.0.1.tar.bz2.sig



From fedora-extras-commits at redhat.com  Wed Nov 29 16:34:23 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 11:34:23 -0500
Subject: rpms/lightning/devel .cvsignore, 1.2, 1.3 lightning.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611291634.kATGYNX5005803@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lightning/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5767

Modified Files:
	.cvsignore lightning.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 May 2006 16:55:31 -0000	1.2
+++ .cvsignore	29 Nov 2006 16:33:52 -0000	1.3
@@ -1 +1 @@
-lightning-1.2.tar.gz
+lightning-1.2a.tar.gz


Index: lightning.spec
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/lightning.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lightning.spec	3 Sep 2006 19:36:26 -0000	1.2
+++ lightning.spec	29 Nov 2006 16:33:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lightning
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.2a
+Release:        1%{?dist}
 Summary:        GNU Lightning
 
 Group:          Development/Libraries
@@ -19,12 +19,14 @@
 that compiles assembly code at run time.
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.2
 
 %build
 %configure
 make %{?_smp_mflags}
 
+%check
+make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  1.2a-1
+- New upstream version
+
 * Sun Sep  3 2006 Jochen Schmitt  1.2-4
 - Rebuild for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 May 2006 16:55:31 -0000	1.2
+++ sources	29 Nov 2006 16:33:52 -0000	1.3
@@ -1 +1 @@
-dcd2c46ee4dd5d99edd9930022ad2153  lightning-1.2.tar.gz
+993ee16b006198b40cf9fe243c9514ec  lightning-1.2a.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 16:46:04 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 29 Nov 2006 11:46:04 -0500
Subject: rpms/ngrep/devel ngrep-system-pcre.patch, 1.1, 1.2 ngrep.spec, 1.5, 
	1.6 sources, 1.2, 1.3
Message-ID: <200611291646.kATGk44G005937@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/ngrep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5901

Modified Files:
	ngrep-system-pcre.patch ngrep.spec sources 
Log Message:

* Wed Nov 29 2006 Patrick "Jima" Laughton  1.45-1
- Upgrade to 1.45
- Enable IPv6 support
- Rebuild due to libpcap upgrade


ngrep-system-pcre.patch:

Index: ngrep-system-pcre.patch
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/ngrep-system-pcre.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ngrep-system-pcre.patch	25 Aug 2005 08:11:02 -0000	1.1
+++ ngrep-system-pcre.patch	29 Nov 2006 16:45:34 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naru ngrep-1.43.orig/configure.in ngrep-1.43/configure.in
---- ngrep-1.43.orig/configure.in	2005-02-24 06:25:20.000000000 +0200
-+++ ngrep-1.43/configure.in	2005-02-24 20:48:38.486652640 +0200
+diff -urN ngrep-1.45/configure.in ngrep-1.45-patched/configure.in
+--- ngrep-1.45/configure.in	2006-11-14 21:43:56.000000000 -0600
++++ ngrep-1.45-patched/configure.in	2006-11-29 10:34:48.000000000 -0600
 @@ -28,8 +28,8 @@
  dnl
  
@@ -12,33 +12,42 @@
  
  
  dnl
-@@ -114,7 +114,7 @@
+@@ -130,8 +130,8 @@
    echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
    echo 
  
--  ( cd pcre-5.0; ./configure && make libtool chartables.c )
-+  dnl ( cd pcre-5.0; ./configure && make libtool chartables.c )
- 
-   REGEX_TARGET='pcre'
-   REGEX_OBJS='pcre.o study.o'
-diff -Naru ngrep-1.43.orig/Makefile.in ngrep-1.43/Makefile.in
---- ngrep-1.43.orig/Makefile.in	2005-02-24 01:15:12.000000000 +0200
-+++ ngrep-1.43/Makefile.in	2005-02-24 20:46:56.868138920 +0200
-@@ -38,8 +38,8 @@
+-  REGEX_DIR='pcre-5.0'
+-  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
++#  REGEX_DIR='pcre-5.0'
++#  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
+   USE_PCRE="1"
+ 
+ else
+@@ -146,7 +146,7 @@
+ 
+ fi
+ 
+-( cd $REGEX_DIR && ./configure )
++#( cd $REGEX_DIR && ./configure )
+ 
+ AC_SUBST(REGEX_DIR)
+ AC_SUBST(REGEX_OBJS)
+diff -urN ngrep-1.45/Makefile.in ngrep-1.45-patched/Makefile.in
+--- ngrep-1.45/Makefile.in	2006-11-28 07:35:37.000000000 -0600
++++ ngrep-1.45-patched/Makefile.in	2006-11-29 08:20:32.000000000 -0600
+@@ -38,7 +38,7 @@
  
  all: $(TARGET) 
  
--$(TARGET): $(REGEX_TARGET) $(OBJS) 
--	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
+-$(TARGET): $(REGEX_OBJS) $(OBJS) 
 +$(TARGET): $(OBJS) 
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(LIBS) 
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
  
- debug: $(REGEX_TARGET) $(OBJS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-diff -Naru ngrep-1.43.orig/ngrep.c ngrep-1.43/ngrep.c
---- ngrep-1.43.orig/ngrep.c	2005-02-20 07:52:42.000000000 +0200
-+++ ngrep-1.43/ngrep.c	2005-02-24 20:47:17.740672140 +0200
-@@ -79,7 +79,7 @@
+ debug: $(REGEX_OBJS) $(OBJS)
+diff -urN ngrep-1.45/ngrep.c ngrep-1.45-patched/ngrep.c
+--- ngrep-1.45/ngrep.c	2006-11-28 07:38:43.000000000 -0600
++++ ngrep-1.45-patched/ngrep.c	2006-11-29 08:10:48.000000000 -0600
+@@ -92,7 +92,7 @@
  #endif
  
  #if USE_PCRE


Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/ngrep.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ngrep.spec	4 Oct 2006 19:53:01 -0000	1.5
+++ ngrep.spec	29 Nov 2006 16:45:34 -0000	1.6
@@ -4,14 +4,14 @@
 Name:				ngrep
 Summary:			Network layer grep tool
 
-Version:			1.44
-Release:			7%{?dist}
+Version:			1.45
+Release:			1%{?dist}
 
 Group:				Applications/Internet
 License:			BSD-like
 URL:				http://ngrep.sourceforge.net/
 
-Source0:			http://download.sourceforge.net/ngrep/%{name}-%{version}-1.tar.bz2
+Source0:			http://download.sourceforge.net/ngrep/%{name}-%{version}.tar.bz2
 Source1:			%{name}-README.fedora
 Patch0:				%{name}-system-pcre.patch
 
@@ -39,7 +39,7 @@
 %build
 export EXTRA_INCLUDES=$(pcre-config --cflags)
 export EXTRA_LIBS=$(pcre-config --libs)
-%configure --enable-pcre
+%configure --enable-pcre --enable-ipv6
 make %{?_smp_mflags} STRIPFLAG=
 
 %install
@@ -56,6 +56,11 @@
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Wed Nov 29 2006 Patrick "Jima" Laughton  1.45-1
+- Upgrade to 1.45
+- Enable IPv6 support
+- Rebuild due to libpcap upgrade
+
 * Wed Oct 04 2006 Patrick "Jima" Laughton  1.44-7
 - Bump-n-build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 08:11:02 -0000	1.2
+++ sources	29 Nov 2006 16:45:34 -0000	1.3
@@ -1 +1 @@
-c8aed4d0fac077cc09524b3c7d623974  ngrep-1.44-1.tar.bz2
+bc8150331601f3b869549c94866b4f1c  ngrep-1.45.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 16:47:25 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 29 Nov 2006 11:47:25 -0500
Subject: rpms/memchan/devel memchan.spec,1.1,1.2
Message-ID: <200611291647.kATGlPFs006031@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6016

Modified Files:
	memchan.spec 
Log Message:
Fix unowned directory




Index: memchan.spec
===================================================================
RCS file: /cvs/extras/rpms/memchan/devel/memchan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memchan.spec	29 Nov 2006 01:02:16 -0000	1.1
+++ memchan.spec	29 Nov 2006 16:46:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           memchan
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        In-memory channels for Tcl
 
 Group:          Development/Libraries
@@ -53,6 +53,7 @@
 %defattr(-,root,root,-)
 %doc doc/license.terms doc/*.html ChangeLog
 %{_mandir}/mann/*.gz
+%dir %{_libdir}/Memchan%{version}
 %{_libdir}/Memchan%{version}/*.so
 %{_libdir}/Memchan%{version}/*.tcl
 
@@ -64,5 +65,8 @@
 
 
 %changelog
+* Wed Nov 29 2006 Wart  - 2.2.1-2
+- Fix unowned directory
+
 * Mon Nov 27 2006 Wart  - 2.2.1-1
 - Initial package for Fedora



From fedora-extras-commits at redhat.com  Wed Nov 29 17:02:09 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 29 Nov 2006 12:02:09 -0500
Subject: rpms/scanssh/devel scanssh.spec,1.5,1.6
Message-ID: <200611291702.kATH29cW009224@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/scanssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9181

Modified Files:
	scanssh.spec 
Log Message:

* Wed Nov 29 2006 Patrick "Jima" Laughton  2.1-10
- Rebuild due to libpcap upgrade



Index: scanssh.spec
===================================================================
RCS file: /cvs/extras/rpms/scanssh/devel/scanssh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scanssh.spec	4 Oct 2006 20:00:19 -0000	1.5
+++ scanssh.spec	29 Nov 2006 17:01:39 -0000	1.6
@@ -2,7 +2,7 @@
 Summary:		Fast SSH server and open proxy scanner
 
 Version:		2.1
-Release:		9%{?dist}
+Release:		10%{?dist}
 
 Group:			Applications/Internet
 License:		BSD
@@ -45,6 +45,9 @@
 %{_mandir}/man1/scanssh*
 
 %changelog
+* Wed Nov 29 2006 Patrick "Jima" Laughton  2.1-10
+- Rebuild due to libpcap upgrade
+
 * Wed Oct 04 2006 Patrick "Jima" Laughton  2.1-9
 - Bump-n-build
 



From fedora-extras-commits at redhat.com  Wed Nov 29 17:02:36 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Wed, 29 Nov 2006 12:02:36 -0500
Subject: rpms/lft/devel lft.spec,1.22,1.23
Message-ID: <200611291702.kATH2aVB009235@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9209

Modified Files:
	lft.spec 
Log Message:
* Wed Nov 29 2006 Jason L Tibbitts III  - 1:2.5-7
- Rebuild with new libpcap.



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lft.spec	2 Oct 2006 02:25:50 -0000	1.22
+++ lft.spec	29 Nov 2006 17:02:06 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        Alternate traceroute tool
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Jason L Tibbitts III  - 1:2.5-7
+- Rebuild with new libpcap.
+
 * Sun Oct 01 2006 Jason L Tibbitts III  - 1:2.5-6
 - Rebuild due to gcc bug.
 



From fedora-extras-commits at redhat.com  Wed Nov 29 17:21:27 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Wed, 29 Nov 2006 12:21:27 -0500
Subject: rpms/ssmtp/FC-5 ssmtp-defaultvalues.patch, NONE, 1.1 ssmtp.spec, 1.1,
	1.2
Message-ID: <200611291721.kATHLRb8009440@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9417

Modified Files:
	ssmtp.spec 
Added Files:
	ssmtp-defaultvalues.patch 
Log Message:
improved default values in ssmtp.conf

ssmtp-defaultvalues.patch:

--- NEW FILE ssmtp-defaultvalues.patch ---
--- ssmtp-2.61/ssmtp.conf~	2006-11-26 11:44:21.000000000 +0200
+++ ssmtp-2.61/ssmtp.conf	2006-11-26 11:46:39.000000000 +0200
@@ -1,6 +1,9 @@
 #
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #
+# See the ssmtp.conf(5) man page for a more verbose explanation of the
+# available options.
+#
 
 # The person who gets all mail for userids < 500
 # Make this empty to disable rewriting.
@@ -19,10 +22,10 @@
 # mailhub=mail.your.domain:465
 
 # Where will the mail seem to come from?
-rewriteDomain=
+#RewriteDomain=
 
 # The full hostname
-hostname=_HOSTNAME_
+#Hostname=
 
 # Set this to never rewrite the "From:" line (unless not given) and to
 # use that address in the "from line" of the envelope.


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/FC-5/ssmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp.spec	12 Nov 2006 23:11:51 -0000	1.1
+++ ssmtp.spec	29 Nov 2006 17:20:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	8%{?dist}
+Release:	10%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPL
@@ -9,6 +9,7 @@
 #Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
 Patch0:		%{name}-%{version}.6.patch
 Patch1:		%{name}-2.50.3-maxsysuid.patch
+Patch2:		%{name}-defaultvalues.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
@@ -30,6 +31,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -103,6 +105,12 @@
 
 
 %changelog
+* Tue Nov 28 2006 lonely wolf  2.61-10
+- fix silly typo in changelog
+
+* Tue Nov 28 2006 lonely wolf  2.61-9
+- included Ville Skytt??'s patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
+
 * Mon Oct 10 2006 lonely wolf  2.61-8
 - enabled IPv6 (just added this option to %%configure, the capability was already there)
 - removed yet another man page from %%Provides



From fedora-extras-commits at redhat.com  Wed Nov 29 17:23:50 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Wed, 29 Nov 2006 12:23:50 -0500
Subject: rpms/ssmtp/FC-6 ssmtp-defaultvalues.patch, NONE, 1.1 ssmtp.spec, 1.1,
	1.2
Message-ID: <200611291723.kATHNoRA009515@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9496

Modified Files:
	ssmtp.spec 
Added Files:
	ssmtp-defaultvalues.patch 
Log Message:
improved default values in ssmtp.conf

ssmtp-defaultvalues.patch:

--- NEW FILE ssmtp-defaultvalues.patch ---
--- ssmtp-2.61/ssmtp.conf~	2006-11-26 11:44:21.000000000 +0200
+++ ssmtp-2.61/ssmtp.conf	2006-11-26 11:46:39.000000000 +0200
@@ -1,6 +1,9 @@
 #
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #
+# See the ssmtp.conf(5) man page for a more verbose explanation of the
+# available options.
+#
 
 # The person who gets all mail for userids < 500
 # Make this empty to disable rewriting.
@@ -19,10 +22,10 @@
 # mailhub=mail.your.domain:465
 
 # Where will the mail seem to come from?
-rewriteDomain=
+#RewriteDomain=
 
 # The full hostname
-hostname=_HOSTNAME_
+#Hostname=
 
 # Set this to never rewrite the "From:" line (unless not given) and to
 # use that address in the "from line" of the envelope.


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/FC-6/ssmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp.spec	12 Nov 2006 23:11:51 -0000	1.1
+++ ssmtp.spec	29 Nov 2006 17:23:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	8%{?dist}
+Release:	10%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPL
@@ -9,6 +9,7 @@
 #Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
 Patch0:		%{name}-%{version}.6.patch
 Patch1:		%{name}-2.50.3-maxsysuid.patch
+Patch2:		%{name}-defaultvalues.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
@@ -30,6 +31,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -103,6 +105,12 @@
 
 
 %changelog
+* Tue Nov 28 2006 lonely wolf  2.61-10
+- fix silly typo in changelog
+
+* Tue Nov 28 2006 lonely wolf  2.61-9
+- included Ville Skytt??'s patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
+
 * Mon Oct 10 2006 lonely wolf  2.61-8
 - enabled IPv6 (just added this option to %%configure, the capability was already there)
 - removed yet another man page from %%Provides



From fedora-extras-commits at redhat.com  Wed Nov 29 17:26:14 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 29 Nov 2006 12:26:14 -0500
Subject: rpms/p0f/devel p0f.spec,1.12,1.13
Message-ID: <200611291726.kATHQEWa009579@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/p0f/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9564

Modified Files:
	p0f.spec 
Log Message:
Rebuild for new libpcap



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- p0f.spec	11 Nov 2006 08:57:04 -0000	1.12
+++ p0f.spec	29 Nov 2006 17:25:44 -0000	1.13
@@ -1,6 +1,6 @@
 Name: p0f
 Version: 2.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: Versatile passive OS fingerprinting tool
 Group: Applications/Internet
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Kevin Fenzi  - 2.0.8-2
+- Rebuild for new libpcap
+
 * Sat Nov 11 2006 Kevin Fenzi  - 2.0.8-1
 - Update to 2.0.8
 



From fedora-extras-commits at redhat.com  Wed Nov 29 17:53:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 12:53:26 -0500
Subject: rpms/dirmngr/devel .cvsignore, 1.4, 1.5 dirmngr.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200611291753.kATHrQYP009717@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dirmngr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9698

Modified Files:
	.cvsignore dirmngr.spec sources 
Log Message:
* Wed Nov 29 2006 Rex Dieter  1.0.0-1
- dirmngr-1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 20:04:03 -0000	1.4
+++ .cvsignore	29 Nov 2006 17:52:56 -0000	1.5
@@ -2,3 +2,4 @@
 dirmngr-0.9.4.tar.bz2.sig
 dirmngr-0.9.6.tar.bz2
 dirmngr-0.9.6.tar.bz2.sig
+dirmngr-1.0.0.tar.bz2.sig


Index: dirmngr.spec
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dirmngr.spec	13 Nov 2006 22:14:31 -0000	1.5
+++ dirmngr.spec	29 Nov 2006 17:52:56 -0000	1.6
@@ -4,14 +4,14 @@
 
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
-Version: 0.9.6
-Release: 2%{?dist} 
+Version: 1.0.0
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 System Environment/Libraries
 URL:	 http://www.gnupg.org/
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/dirmngr-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/dirmngr-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source10: dirmngr.conf
@@ -118,11 +118,14 @@
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  1.0.0-1
+- dirmngr-1.0.0
+
 * Mon Nov 13 2006 Rex Dieter  0.9.6-2
 - BR: libassuan-static
 
 * Tue Sep 05 2006 Rex Dieter  0.9.6-1
-- 0.9.6
+- dirmngr-0.9.6
 
 * Tue Aug 29 2006 Rex Dieter  0.9.4-5
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 20:04:03 -0000	1.4
+++ sources	29 Nov 2006 17:52:56 -0000	1.5
@@ -1,2 +1,2 @@
-6663cde008cf82fdaa9d0e44e15d5c58  dirmngr-0.9.6.tar.bz2
-4a57064bb86ee9ec54eb2c3c6183171e  dirmngr-0.9.6.tar.bz2.sig
+ee36129c1ff0a8d09056fc67df95b112  dirmngr-1.0.0.tar.bz2.sig
+59b263b33a59bfdb954d4a5cb001e5cc  dirmngr-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 18:01:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 13:01:13 -0500
Subject: rpms/dirmngr/devel dirmngr.spec,1.6,1.7
Message-ID: <200611291801.kATI1DT7012833@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dirmngr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9787

Modified Files:
	dirmngr.spec 
Log Message:
fix %files



Index: dirmngr.spec
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dirmngr.spec	29 Nov 2006 17:52:56 -0000	1.6
+++ dirmngr.spec	29 Nov 2006 18:00:43 -0000	1.7
@@ -5,7 +5,7 @@
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
 Version: 1.0.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 
 License: GPL
 Group:	 System Environment/Libraries
@@ -98,7 +98,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING README README-alpha ChangeLog NEWS
+%doc COPYING README ChangeLog NEWS
 %{_bindir}/dirmngr*
 %{_libexecdir}/dirmngr_ldap
 %{_infodir}/dirmngr.info*
@@ -118,7 +118,7 @@
 
 
 %changelog
-* Wed Nov 29 2006 Rex Dieter  1.0.0-1
+* Wed Nov 29 2006 Rex Dieter  1.0.0-2
 - dirmngr-1.0.0
 
 * Mon Nov 13 2006 Rex Dieter  0.9.6-2



From fedora-extras-commits at redhat.com  Wed Nov 29 18:04:06 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 29 Nov 2006 13:04:06 -0500
Subject: rpms/rssowl/devel .cvsignore, 1.4, 1.5 rssowl-build1.patch, 1.2,
	1.3 rssowl.script, 1.9, 1.10 rssowl.spec, 1.18, 1.19 sources, 1.4, 1.5
Message-ID: <200611291804.kATI46IS012920@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12889

Modified Files:
	.cvsignore rssowl-build1.patch rssowl.script rssowl.spec 
	sources 
Log Message:
* Wed Nov 29 2006 Andrew Overholt  1.2.3-1
- 1.2.3.
- Guard against rebuild-gcj-db presence and installation ordering.
- Symlink to swt in %%{_libdir} where it now resides.
- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
- Remove symlink to org.eclipse.ui.forms - no longer needed.
- Remove requirement on eclipse-platform - no longer needed.
- Add xerces-j2 requirement.
- Update build1 patch.
- Remove ui.forms from rssowl.script.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2006 01:51:18 -0000	1.4
+++ .cvsignore	29 Nov 2006 18:03:36 -0000	1.5
@@ -1 +1 @@
-rssowl_1_2_2_src-CLEAN.tar.gz
+rssowl_1_2_3_src-CLEAN.tar.gz

rssowl-build1.patch:

Index: rssowl-build1.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl-build1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl-build1.patch	31 Jul 2006 18:29:57 -0000	1.2
+++ rssowl-build1.patch	29 Nov 2006 18:03:36 -0000	1.3
@@ -1,6 +1,6 @@
---- src/build.xml.orig	2006-05-06 09:45:03.000000000 -0700
-+++ src/build.xml	2006-05-06 09:46:34.000000000 -0700
-@@ -182,18 +182,7 @@
+--- src/build.xml.orig	2006-11-26 09:22:39.000000000 -0500
++++ src/build.xml	2006-11-29 11:27:18.000000000 -0500
+@@ -184,17 +189,6 @@
  		Pack compiled RSSOwl into executable JAR file.
      -->
  	
@@ -8,10 +8,9 @@
 -		
 -		
 -		
--		
 -		
 -		
- 		
+-		
 -		
 -		
 -		


Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rssowl.script	6 Nov 2006 19:39:49 -0000	1.9
+++ rssowl.script	29 Nov 2006 18:03:36 -0000	1.10
@@ -10,7 +10,7 @@
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
 
 
 


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rssowl.spec	6 Nov 2006 19:43:29 -0000	1.18
+++ rssowl.spec	29 Nov 2006 18:03:36 -0000	1.19
@@ -1,6 +1,6 @@
 %define name    rssowl
-%define version 1.2.2
-%define release 7%{?dist}
+%define version 1.2.3
+%define release 1%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -11,7 +11,7 @@
 URL:            http://www.rssowl.org
 # This is identical to the upstream tar ball, except that all binary
 # code jar files have been removed.
-Source0:        rssowl_1_2_2_src-CLEAN.tar.gz
+Source0:        rssowl_1_2_3_src-CLEAN.tar.gz
 Source1:        %{name}.script
 Source2:        %{name}.desktop
 Patch0:         %{name}-use-jce.patch
@@ -23,15 +23,15 @@
 Requires:       jre >= 1.4.2-
 BuildRequires:  java-sdk >= 1.4.2
 BuildRequires:  ImageMagick
-BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
+BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
 BuildRequires:  libgconf-java
-BuildRequires:  ant, jpackage-utils >= 1.5
+BuildRequires:  xerces-j2, jpackage-utils >= 1.5
 BuildRequires:	dos2unix
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
-Requires:       libgconf-java
+Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
+Requires:       xerces-j2, libgconf-java
 Requires:       firefox
 BuildRequires:    desktop-file-utils
 Requires(post):   desktop-file-utils
@@ -50,7 +50,7 @@
 integrierte Browser.
 
 %prep
-%setup -q -n rssowl_1_2_2_src
+%setup -q -n rssowl_1_2_3_src
 %patch0 -p0
 %patch1 -p0
 %patch3 -p0
@@ -59,9 +59,8 @@
 rm doc/mpl-v11.txt
 
 %build
-build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
-ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
-ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
+build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 xerces-j2
+ln -s %{_datadir}/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
 ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar lib
 cd src
 ant deploy_linux
@@ -106,7 +105,10 @@
 aot-compile-rpm
 
 %post 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -115,7 +117,10 @@
 fi
 
 %postun 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -137,6 +142,17 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Nov 29 2006 Andrew Overholt  1.2.3-1
+- 1.2.3.
+- Guard against rebuild-gcj-db presence and installation ordering.
+- Symlink to swt in %%{_libdir} where it now resides.
+- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
+- Remove symlink to org.eclipse.ui.forms - no longer needed.
+- Remove requirement on eclipse-platform - no longer needed.
+- Add xerces-j2 requirement.
+- Update build1 patch.
+- Remove ui.forms from rssowl.script.
+
 * Mon Nov 06 2006 Andrew Overholt  1.2.2-7
 - Use SWT in new %%{_libdir} location.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2006 01:51:18 -0000	1.4
+++ sources	29 Nov 2006 18:03:36 -0000	1.5
@@ -1 +1 @@
-63caafbb8d07fc131b994729e744a2b9  rssowl_1_2_2_src-CLEAN.tar.gz
+ae4e26a3665c84af24589aa9877d20be  rssowl_1_2_3_src-CLEAN.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 18:04:51 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 29 Nov 2006 13:04:51 -0500
Subject: rpms/rssowl/FC-6 .cvsignore, 1.4, 1.5 rssowl-build1.patch, 1.2,
	1.3 rssowl.script, 1.8, 1.9 rssowl.spec, 1.16, 1.17 sources, 1.4, 1.5
Message-ID: <200611291804.kATI4p9j012952@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/rssowl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12926

Modified Files:
	.cvsignore rssowl-build1.patch rssowl.script rssowl.spec 
	sources 
Log Message:
* Wed Nov 29 2006 Andrew Overholt  1.2.3-1
- 1.2.3.
- Guard against rebuild-gcj-db presence and installation ordering.
- Symlink to swt in %%{_libdir} where it now resides.
- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
- Remove symlink to org.eclipse.ui.forms - no longer needed.
- Remove requirement on eclipse-platform - no longer needed.
- Add xerces-j2 requirement.
- Update build1 patch.
- Remove ui.forms from rssowl.script.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2006 01:51:18 -0000	1.4
+++ .cvsignore	29 Nov 2006 18:04:21 -0000	1.5
@@ -1 +1 @@
-rssowl_1_2_2_src-CLEAN.tar.gz
+rssowl_1_2_3_src-CLEAN.tar.gz

rssowl-build1.patch:

Index: rssowl-build1.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/rssowl-build1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl-build1.patch	31 Jul 2006 18:29:57 -0000	1.2
+++ rssowl-build1.patch	29 Nov 2006 18:04:21 -0000	1.3
@@ -1,6 +1,6 @@
---- src/build.xml.orig	2006-05-06 09:45:03.000000000 -0700
-+++ src/build.xml	2006-05-06 09:46:34.000000000 -0700
-@@ -182,18 +182,7 @@
+--- src/build.xml.orig	2006-11-26 09:22:39.000000000 -0500
++++ src/build.xml	2006-11-29 11:27:18.000000000 -0500
+@@ -184,17 +189,6 @@
  		Pack compiled RSSOwl into executable JAR file.
      -->
  	
@@ -8,10 +8,9 @@
 -		
 -		
 -		
--		
 -		
 -		
- 		
+-		
 -		
 -		
 -		


Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/rssowl.script,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rssowl.script	4 Oct 2006 14:00:51 -0000	1.8
+++ rssowl.script	29 Nov 2006 18:04:21 -0000	1.9
@@ -10,7 +10,7 @@
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
 
 
 


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/rssowl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rssowl.spec	4 Oct 2006 15:04:50 -0000	1.16
+++ rssowl.spec	29 Nov 2006 18:04:21 -0000	1.17
@@ -1,6 +1,6 @@
 %define name    rssowl
-%define version 1.2.2
-%define release 6%{?dist}
+%define version 1.2.3
+%define release 1%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -11,7 +11,7 @@
 URL:            http://www.rssowl.org
 # This is identical to the upstream tar ball, except that all binary
 # code jar files have been removed.
-Source0:        rssowl_1_2_2_src-CLEAN.tar.gz
+Source0:        rssowl_1_2_3_src-CLEAN.tar.gz
 Source1:        %{name}.script
 Source2:        %{name}.desktop
 Patch0:         %{name}-use-jce.patch
@@ -23,15 +23,15 @@
 Requires:       jre >= 1.4.2-
 BuildRequires:  java-sdk >= 1.4.2
 BuildRequires:  ImageMagick
-BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
+BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
 BuildRequires:  libgconf-java
-BuildRequires:  ant, jpackage-utils >= 1.5
+BuildRequires:  xerces-j2, jpackage-utils >= 1.5
 BuildRequires:	dos2unix
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
-Requires:       libgconf-java
+Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
+Requires:       xerces-j2, libgconf-java
 Requires:       firefox
 BuildRequires:    desktop-file-utils
 Requires(post):   desktop-file-utils
@@ -50,7 +50,7 @@
 integrierte Browser.
 
 %prep
-%setup -q -n rssowl_1_2_2_src
+%setup -q -n rssowl_1_2_3_src
 %patch0 -p0
 %patch1 -p0
 %patch3 -p0
@@ -59,9 +59,9 @@
 rm doc/mpl-v11.txt
 
 %build
-build-jar-repository -p lib swt-gtk-3.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
-ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
-ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
+build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 xerces-j2
+ln -s %{_datadir}/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
+ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar lib
 cd src
 ant deploy_linux
 
@@ -105,7 +105,10 @@
 aot-compile-rpm
 
 %post 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -114,7 +117,10 @@
 fi
 
 %postun 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -136,6 +142,20 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Nov 29 2006 Andrew Overholt  1.2.3-1
+- 1.2.3.
+- Guard against rebuild-gcj-db presence and installation ordering.
+- Symlink to swt in %%{_libdir} where it now resides.
+- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
+- Remove symlink to org.eclipse.ui.forms - no longer needed.
+- Remove requirement on eclipse-platform - no longer needed.
+- Add xerces-j2 requirement.
+- Update build1 patch.
+- Remove ui.forms from rssowl.script.
+
+* Mon Nov 06 2006 Andrew Overholt  1.2.2-7
+- Use SWT in new %%{_libdir} location.
+
 * Wed Oct  4 2006 Anthony Green  - 1.2.2-6
 - Fix build classpath.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2006 01:51:18 -0000	1.4
+++ sources	29 Nov 2006 18:04:21 -0000	1.5
@@ -1 +1 @@
-63caafbb8d07fc131b994729e744a2b9  rssowl_1_2_2_src-CLEAN.tar.gz
+ae4e26a3665c84af24589aa9877d20be  rssowl_1_2_3_src-CLEAN.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 18:13:05 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 29 Nov 2006 13:13:05 -0500
Subject: rpms/azureus/FC-6 azureus.script,1.10,1.11 azureus.spec,1.38,1.39
Message-ID: <200611291813.kATID5cL013048@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/azureus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029

Modified Files:
	azureus.script azureus.spec 
Log Message:
* Mon Nov 29 2006 Andrew Overholt  2.5.0.0-9
- Use new swt jar location.
- Need to wait to build until forthcoming eclipse update (currently in
  fc6-updates-testing).



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.script,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- azureus.script	28 Oct 2006 14:14:28 -0000	1.10
+++ azureus.script	29 Nov 2006 18:12:35 -0000	1.11
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:`build-classpath jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- azureus.spec	28 Oct 2006 14:14:28 -0000	1.38
+++ azureus.spec	29 Nov 2006 18:12:35 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -101,8 +101,9 @@
 
 %build
 mkdir -p build/libs
-build-jar-repository -p build/libs jakarta-commons-cli swt-gtk-3.2 log4j gnu-crypto gtk2.8 glib0.2
+build-jar-repository -p build/libs jakarta-commons-cli log4j gnu-crypto gtk2.8 glib0.2
 ln -s /usr/share/java/gcj-endorsed/bcprov-1.33.jar build/libs
+ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar build/libs
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -115,7 +116,7 @@
 cd plugins/azplugins
 unzip -q %{SOURCE5}
 rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:.
 find ./ -name \*java | xargs rm
 jar cvf azplugins_1.9.jar .
 cd ../..
@@ -124,7 +125,7 @@
 cd plugins/bdcc
 unzip *.jar
 rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:.
 find ./ -name \*java | xargs rm
 jar cvf bdcc_2.2.2.jar .
 cd ../..
@@ -206,6 +207,11 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Nov 29 2006 Andrew Overholt  2.5.0.0-9
+- Use new swt jar location.
+- Need to wait to build until forthcoming eclipse update (currently in
+  fc6-updates-testing).
+
 * Sat Oct 28 2006 Anthony Green  2.5.0.0-8
 - Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it
   will run on non-gcj java alternatives.



From fedora-extras-commits at redhat.com  Wed Nov 29 18:15:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 13:15:25 -0500
Subject: rpms/kaffeine/devel kaffeine.spec,1.2,1.3
Message-ID: <200611291815.kATIFPH0013079@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13058

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.8.3-2
- include libkaffeinepart.so in main pkg (not -devel)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kaffeine.spec	26 Nov 2006 23:57:34 -0000	1.2
+++ kaffeine.spec	29 Nov 2006 18:14:55 -0000	1.3
@@ -12,7 +12,7 @@
 #define nonfree 1
 
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
@@ -34,7 +34,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
@@ -125,11 +124,6 @@
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --vendor="" \
-  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} 
@@ -184,6 +178,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
 %{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
 %{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -198,10 +193,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
 %endif
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
 * Sun Nov 26 2006 Rex Dieter  0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:34:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 29 Nov 2006 13:34:47 -0500
Subject: rpms/gwenview/FC-6 gwenview.spec,1.21,1.22
Message-ID: <200611291834.kATIYlpC013341@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13312/FC-6

Modified Files:
	gwenview.spec 
Log Message:
rebuild


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/gwenview.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gwenview.spec	27 Nov 2006 20:17:54 -0000	1.21
+++ gwenview.spec	29 Nov 2006 18:34:17 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Aurelien Bompard  1.4.1-3
+- rebuild
+
 * Mon Nov 27 2006 Aurelien Bompard  1.4.1-2
 - remove patch (gwenview now uses exiv2 instead of libexif)
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:34:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 29 Nov 2006 13:34:47 -0500
Subject: rpms/gwenview/devel gwenview.spec,1.21,1.22
Message-ID: <200611291834.kATIYllP013344@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13312/devel

Modified Files:
	gwenview.spec 
Log Message:
rebuild


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gwenview.spec	27 Nov 2006 20:17:55 -0000	1.21
+++ gwenview.spec	29 Nov 2006 18:34:17 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Aurelien Bompard  1.4.1-3
+- rebuild
+
 * Mon Nov 27 2006 Aurelien Bompard  1.4.1-2
 - remove patch (gwenview now uses exiv2 instead of libexif)
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:39:51 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 29 Nov 2006 13:39:51 -0500
Subject: rpms/iftop/devel iftop.spec,1.13,1.14
Message-ID: <200611291839.kATIdpT8013457@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/iftop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13432

Modified Files:
	iftop.spec 
Log Message:
rebuild


Index: iftop.spec
===================================================================
RCS file: /cvs/extras/rpms/iftop/devel/iftop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iftop.spec	30 Aug 2006 15:15:51 -0000	1.13
+++ iftop.spec	29 Nov 2006 18:39:21 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           iftop
 Version:        0.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Command line tool that displays bandwidth usage on an interface
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Aurelien Bompard  0.17-4
+- rebuild
+
 * Wed Aug 30 2006 Aurelien Bompard  0.17-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:40:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 13:40:44 -0500
Subject: rpms/kaffeine/FC-6 kaffeine.spec,1.2,1.3
Message-ID: <200611291840.kATIei2M013516@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13497

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.8.3-2
- include libkaffeinepart.so in main pkg (not -devel)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/kaffeine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kaffeine.spec	28 Nov 2006 15:12:29 -0000	1.2
+++ kaffeine.spec	29 Nov 2006 18:40:14 -0000	1.3
@@ -12,7 +12,7 @@
 #define nonfree 1
 
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
@@ -178,6 +178,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
 %{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
 %{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -192,10 +193,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
 %endif
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
 * Sun Nov 26 2006 Rex Dieter  0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:41:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 13:41:58 -0500
Subject: rpms/kaffeine/FC-5 kaffeine.spec,1.2,1.3
Message-ID: <200611291841.kATIfw4U013585@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13570

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.8.3-2
- include libkaffeinepart.so in main pkg (not -devel)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-5/kaffeine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kaffeine.spec	28 Nov 2006 15:20:34 -0000	1.2
+++ kaffeine.spec	29 Nov 2006 18:41:28 -0000	1.3
@@ -12,7 +12,7 @@
 #define nonfree 1
 
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
@@ -178,6 +178,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
 %{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
 %{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -192,10 +193,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
 %endif
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
 * Sun Nov 26 2006 Rex Dieter  0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:31:08 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 29 Nov 2006 16:31:08 -0500
Subject: rpms/libdvdread/devel libdvdread.spec,1.1,1.2
Message-ID: <200611292131.kATLV8Wx023330@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23315

Modified Files:
	libdvdread.spec 
Log Message:
- Rebuild.


Index: libdvdread.spec
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/devel/libdvdread.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdvdread.spec	27 Nov 2006 22:22:27 -0000	1.1
+++ libdvdread.spec	29 Nov 2006 21:30:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libdvdread
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple foundation for reading DVD video disks
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Nov 26 2006 Dominik Mierzejewski  0.9.7-2
+- Rebuild.
+
 * Fri Oct  6 2006 Dams  - 0.9.7-1
 - Updated to 0.9.7
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:33:47 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 29 Nov 2006 16:33:47 -0500
Subject: rpms/libdvdread/FC-6 libdvdread.spec,1.1,1.2
Message-ID: <200611292133.kATLXlbn023442@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23427

Modified Files:
	libdvdread.spec 
Log Message:
- Rebuild


Index: libdvdread.spec
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/FC-6/libdvdread.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdvdread.spec	27 Nov 2006 22:22:27 -0000	1.1
+++ libdvdread.spec	29 Nov 2006 21:33:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libdvdread
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple foundation for reading DVD video disks
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Nov 26 2006 Dominik Mierzejewski  0.9.7-2
+- Rebuild.
+
 * Fri Oct  6 2006 Dams  - 0.9.7-1
 - Updated to 0.9.7
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:37:00 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 29 Nov 2006 16:37:00 -0500
Subject: rpms/libdvdread/FC-5 libdvdread.spec,1.1,1.2
Message-ID: <200611292137.kATLb008023617@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23601

Modified Files:
	libdvdread.spec 
Log Message:
- Rebuild


Index: libdvdread.spec
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/FC-5/libdvdread.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdvdread.spec	27 Nov 2006 22:22:27 -0000	1.1
+++ libdvdread.spec	29 Nov 2006 21:36:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libdvdread
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple foundation for reading DVD video disks
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Nov 26 2006 Dominik Mierzejewski  0.9.7-2
+- Rebuild.
+
 * Fri Oct  6 2006 Dams  - 0.9.7-1
 - Updated to 0.9.7
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:40:00 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:40:00 -0500
Subject: rpms/pdftk/devel .cvsignore, 1.2, 1.3 pdftk.spec, 1.6, 1.7 sources, 
	1.2, 1.3
Message-ID: <200611292140.kATLe0YQ023688@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23669

Modified Files:
	.cvsignore pdftk.spec sources 
Log Message:
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2005 17:51:01 -0000	1.2
+++ .cvsignore	29 Nov 2006 21:39:30 -0000	1.3
@@ -1 +1 @@
-pdftk-1.12.tar.bz2
+pdftk-1.41.tar.bz2


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pdftk.spec	3 Sep 2006 19:38:58 -0000	1.6
+++ pdftk.spec	29 Nov 2006 21:39:30 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
-Version: 	1.12
-Release: 	8%{?dist}
+Version: 	1.41
+Release: 	1%{?dist}
 License:	GPL
-URL: 		http://www.accesspdf.com/pdftk/
+URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
-Patch1:         pdftk-1.12-rmsid.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -56,6 +54,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  1.41-1
+- New upstream release
+
 * Sun Sep  3 2006 Jochen Schmitt  1.12-8
 - Rebuild for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2005 17:51:01 -0000	1.2
+++ sources	29 Nov 2006 21:39:30 -0000	1.3
@@ -1 +1 @@
-ec1b6d9e06109c6f05e19033f1d91d8a  pdftk-1.12.tar.bz2
+7214230b937dc996d209c05b7b7b3518  pdftk-1.41.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 21:41:30 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:41:30 -0500
Subject: rpms/pdftk/devel pdftk-1.12-rmsid.patch,1.1,NONE
Message-ID: <200611292141.kATLfUOJ023771@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23766

Removed Files:
	pdftk-1.12-rmsid.patch 
Log Message:
Remove unnecessary patch


--- pdftk-1.12-rmsid.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 21:43:04 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 29 Nov 2006 16:43:04 -0500
Subject: rpms/intuitively/devel intuitively.spec,1.6,1.7
Message-ID: <200611292143.kATLh4Bh023890@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23850

Modified Files:
	intuitively.spec 
Log Message:
* Wed Nov 29 2006 Patrice Dumas  0.7-11
- Rebuild for libcap soname change (0.9.5)



Index: intuitively.spec
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/intuitively.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- intuitively.spec	29 Aug 2006 17:58:17 -0000	1.6
+++ intuitively.spec	29 Nov 2006 21:42:34 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:      Automatic IP detection utility
 Name:         intuitively
 Version:      0.7
-Release:      10%{?dist}
+Release:      11%{?dist}
 URL:          http://home.samfundet.no/~tfheen/intuitively.html
 Source0:      http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz
 License:      GPL
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Patrice Dumas  0.7-11
+- Rebuild for libcap soname change (0.9.5)
+
 * Tue Aug 29 2006 Patrice Dumas  0.7-10
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:43:11 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:43:11 -0500
Subject: rpms/pdftk/devel pdftk.spec,1.7,1.8
Message-ID: <200611292143.kATLhBha023893@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23870

Modified Files:
	pdftk.spec 
Log Message:
Bunp Release


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pdftk.spec	29 Nov 2006 21:39:30 -0000	1.7
+++ pdftk.spec	29 Nov 2006 21:42:41 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
 Version: 	1.41
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	GPL
 URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
@@ -54,7 +54,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Wed Nov 29 2006 Jochen Schmitt  1.41-1
+* Wed Nov 29 2006 Jochen Schmitt  1.41-2
 - New upstream release
 
 * Sun Sep  3 2006 Jochen Schmitt  1.12-8



From fedora-extras-commits at redhat.com  Wed Nov 29 21:45:09 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 29 Nov 2006 16:45:09 -0500
Subject: rpms/intuitively/devel intuitively.spec,1.7,1.8
Message-ID: <200611292145.kATLj9IQ024008@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23973

Modified Files:
	intuitively.spec 
Log Message:
bump


Index: intuitively.spec
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/intuitively.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- intuitively.spec	29 Nov 2006 21:42:34 -0000	1.7
+++ intuitively.spec	29 Nov 2006 21:44:39 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:      Automatic IP detection utility
 Name:         intuitively
 Version:      0.7
-Release:      11%{?dist}
+Release:      12%{?dist}
 URL:          http://home.samfundet.no/~tfheen/intuitively.html
 Source0:      http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz
 License:      GPL
@@ -56,7 +56,7 @@
 
 
 %changelog
-* Wed Nov 29 2006 Patrice Dumas  0.7-11
+* Wed Nov 29 2006 Patrice Dumas  0.7-12
 - Rebuild for libcap soname change (0.9.5)
 
 * Tue Aug 29 2006 Patrice Dumas  0.7-10



From fedora-extras-commits at redhat.com  Wed Nov 29 21:45:11 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:45:11 -0500
Subject: rpms/pdftk/FC-6 pdftk.spec, 1.6, 1.7 sources, 1.2,
	1.3 pdftk-1.12-rmsid.patch, 1.1, NONE
Message-ID: <200611292145.kATLjB3c024012@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990

Modified Files:
	pdftk.spec sources 
Removed Files:
	pdftk-1.12-rmsid.patch 
Log Message:
New upstream version


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/FC-6/pdftk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pdftk.spec	3 Sep 2006 19:38:58 -0000	1.6
+++ pdftk.spec	29 Nov 2006 21:44:41 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
-Version: 	1.12
-Release: 	8%{?dist}
+Version: 	1.41
+Release: 	2%{?dist}
 License:	GPL
-URL: 		http://www.accesspdf.com/pdftk/
+URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
-Patch1:         pdftk-1.12-rmsid.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -56,6 +54,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  1.41-2
+- New upstream release
+
 * Sun Sep  3 2006 Jochen Schmitt  1.12-8
 - Rebuild for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdftk/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2005 17:51:01 -0000	1.2
+++ sources	29 Nov 2006 21:44:41 -0000	1.3
@@ -1 +1 @@
-ec1b6d9e06109c6f05e19033f1d91d8a  pdftk-1.12.tar.bz2
+7214230b937dc996d209c05b7b7b3518  pdftk-1.41.tar.bz2


--- pdftk-1.12-rmsid.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 21:46:52 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:46:52 -0500
Subject: rpms/pdftk/FC-5 pdftk.spec, 1.5, 1.6 sources, 1.2,
	1.3 pdftk-1.12-rmsid.patch, 1.1, NONE
Message-ID: <200611292146.kATLkqFY024153@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24123

Modified Files:
	pdftk.spec sources 
Removed Files:
	pdftk-1.12-rmsid.patch 
Log Message:
New upstream release


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/FC-5/pdftk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pdftk.spec	31 Jul 2006 17:46:54 -0000	1.5
+++ pdftk.spec	29 Nov 2006 21:46:22 -0000	1.6
@@ -1,12 +1,11 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
-Version: 	1.12
-Release: 	7%{?dist}
+Version: 	1.41
+Release: 	2%{?dist}
 License:	GPL
-URL: 		http://www.accesspdf.com/pdftk/
+URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
-Patch1:         pdftk-1.12-rmsid.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -56,6 +54,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  1.41-2
+- New upstream release
+
+* Sun Sep  3 2006 Jochen Schmitt  1.12-8
+- Rebuild for FC-6
+
 * Mon Jul 31 2006 Jochen Schmitt  1.12-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdftk/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2005 17:51:01 -0000	1.2
+++ sources	29 Nov 2006 21:46:22 -0000	1.3
@@ -1 +1 @@
-ec1b6d9e06109c6f05e19033f1d91d8a  pdftk-1.12.tar.bz2
+7214230b937dc996d209c05b7b7b3518  pdftk-1.41.tar.bz2


--- pdftk-1.12-rmsid.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 21:48:12 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 29 Nov 2006 16:48:12 -0500
Subject: rpms/hping3/devel hping3.spec,1.3,1.4
Message-ID: <200611292148.kATLmCeJ024256@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/hping3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24165

Modified Files:
	hping3.spec 
Log Message:
Fix changelog.



Index: hping3.spec
===================================================================
RCS file: /cvs/extras/rpms/hping3/devel/hping3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hping3.spec	7 Sep 2006 19:52:09 -0000	1.3
+++ hping3.spec	29 Nov 2006 21:47:42 -0000	1.4
@@ -1,7 +1,7 @@
 %define	cvs	20051105
 Name:    hping3
 Version: 0.0.%{cvs}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: TCP/IP stack auditing and much more
 
 Group: Applications/Internet
@@ -59,6 +59,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Nov 29 2006 Paul Wouters  0.0.20051105-5
+* 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  Wed Nov 29 21:49:11 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Wed, 29 Nov 2006 16:49:11 -0500
Subject: rpms/alsa-tools/devel Makefile, 1.3, 1.4 alsa-tools.spec, 1.11,
	1.12 sources, 1.7, 1.8 dead.package, 1.1, NONE
Message-ID: <200611292149.kATLnBZr024291@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24264

Added Files:
	Makefile alsa-tools.spec sources 
Removed Files:
	dead.package 
Log Message:
Unorphan alsa-tools (#217256)


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	29 Nov 2006 21:48:41 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: alsa-tools
+# $Id$
+NAME := alsa-tools
+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)


Index: alsa-tools.spec
===================================================================
RCS file: alsa-tools.spec
diff -N alsa-tools.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ alsa-tools.spec	29 Nov 2006 21:48:41 -0000	1.12
@@ -0,0 +1,228 @@
+%{?!_without_tools:     %define builddirstools as10k1 envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
+%{?_without_tools:      %{!?_with_firmware: %define _with_firmware 1}}
+%{?_with_firmware:      %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
+
+# The source tarball has been pruned to remove the "ac3dec" directory, due
+# to legal concerns that the contents might be subject to patent claims
+
+Summary:        Specialist tools for ALSA
+Name:           alsa-tools
+Version:        1.0.12
+Release:        3%{?dist}
+License:        GPL
+Group:          Applications/Multimedia
+URL:            http://www.alsa-project.org/
+Source0:        %{name}-%{version}-pruned.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  alsa-lib-devel >= %{version}
+%if 0%{!?_without_tools:1}
+BuildRequires:  gtk+-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  fltk-devel
+Buildrequires:  desktop-file-utils
+%endif
+
+%description
+This package contains several specialist tools for use with ALSA, including
+a number of programs that provide access to special hardware facilities on
+certain sound cards.
+
+* as10k1 - AS10k1 Assembler
+* cspctl - Sound Blaster 16 ASP/CSP control program
+* envy24control - Control tool for Envy24 (ice1712) based soundcards
+* hdspmixer - Mixer for the RME Hammerfall DSP cards
+* rmedigicontrol - Control panel for RME Hammerfall cards
+* sbiload - An OPL2/3 FM instrument loader for ALSA sequencer
+* sscape_ctl - ALSA SoundScape control utility
+* us428control - Control tool for Tascam 428
+
+
+%package firmware
+Summary:        ALSA tools for uploading firmware to some soundcards
+Group:          Applications/System
+Requires:       udev alsa-firmware
+
+
+%description firmware
+This package contains tools for flashing firmware into certain sound cards.
+The following tools are available:
+
+* hdsploader   - for RME Hammerfall DSP cards
+* mixartloader - for Digigram miXart soundcards
+* vxloader     - for Digigram VX soundcards
+* usx2yloader  - second phase firmware loader for Tascam USX2Y USB soundcards
+
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+mv seq/sbiload . ; rmdir seq
+for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
+do
+  cd $i ; %configure
+  %{__make} %{?_smp_mflags} || exit 1
+  cd ..
+done
+
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+
+for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
+do 
+  case $i in
+    hdspconf)
+      (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+      ;;
+    hdspmixer)
+      (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+      ;;
+    usx2yloader)
+      (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
+      ;;
+    *) (cd $i ; %makeinstall) || exit 1
+   esac
+   if [[ -s "${i}"/README ]] 
+   then
+      if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
+      then
+         mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+      fi
+      cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+   fi
+   if [[ -s "${i}"/COPYING ]] 
+   then
+      if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
+      then
+         mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+      fi
+      cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+   fi 
+   if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then
+      desktop-file-install --vendor fedora \
+        --add-category "X-Fedora" \
+        --delete-original \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop
+   fi
+done
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%if 0%{!?_without_tools:1}
+%files
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/as10k1
+%doc %{_docdir}/%{name}-%{version}/envy24control
+%doc %{_docdir}/%{name}-%{version}/hdspconf
+%doc %{_docdir}/%{name}-%{version}/hdspmixer
+%doc %{_docdir}/%{name}-%{version}/rmedigicontrol
+%doc %{_docdir}/%{name}-%{version}/sbiload
+%doc %{_docdir}/%{name}-%{version}/sb16_csp
+%{_bindir}/as10k1
+%{_bindir}/cspctl
+%{_bindir}/envy24control
+%{_bindir}/hdspconf
+%{_bindir}/hdspmixer
+%{_bindir}/rmedigicontrol
+%{_bindir}/sbiload
+%{_bindir}/sscape_ctl
+%{_bindir}/us428control
+%{_datadir}/applications/fedora-hdspconf.desktop
+%{_datadir}/applications/fedora-hdspmixer.desktop
+%{_datadir}/man/man1/cspctl.1.gz
+%{_datadir}/man/man1/envy24control.1.gz
+%{_datadir}/pixmaps/hdspconf.png
+%{_datadir}/pixmaps/hdspmixer.png
+%{_datadir}/sounds/
+%endif # ?!_without_tools
+
+%if 0%{?_with_firmware:1}
+%files firmware
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/hdsploader
+%doc %{_docdir}/%{name}-%{version}/mixartloader
+%doc %{_docdir}/%{name}-%{version}/usx2yloader
+%doc %{_docdir}/%{name}-%{version}/vxloader
+%{_sysconfdir}/hotplug/usb/tascam_fpga
+%{_sysconfdir}/hotplug/usb/tascam_fw
+%{_sysconfdir}/hotplug/usb/tascam_fw.usermap
+%{_bindir}/hdsploader
+%{_bindir}/mixartloader
+%{_bindir}/usx2yloader
+%{_bindir}/vxloader
+%endif # ?_with_firmware
+
+%changelog
+* Sun Nov 26 2006 Tim Jackson  - 1.0.12-3
+- Add gtk2-devel BR
+
+* Sun Nov 26 2006 Tim Jackson  - 1.0.12-2
+- Own our docdir explicitly
+
+* Sat Nov 25 2006 Tim Jackson  - 1.0.12-1
+- Update to 1.0.12
+- Resubmit to Fedora Extras 6
+- Replace hotplug requirement with udev
+
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
+* Tue Dec 06 2005 Thorsten Leemhuis  - 1.0.10-1
+- Update to 1.0.10
+
+* Fri May 06 2005 Thorsten Leemhuis  - 1.0.9-1
+- Update to 1.0.9
+- Use disttag
+- Remove gcc4 patch
+
+* Fri May 06 2005 Thorsten Leemhuis  - 1.0.8-3
+- prune ac3dec from sources
+
+* Thu May 05 2005 Thorsten Leemhuis  - 1.0.8-2
+- don't build ac3dec -- use a52dec instead
+
+* Wed Apr 06 2005 Thorsten Leemhuis  - 1.0.8-1
+- Update to 1.0.8
+
+* Sun Mar 29 2005 Thorsten Leemhuis  - 0:1.0.6-2
+- Add "--without tools" and "--with firmware" options
+- Drop unneeded BR: automake
+
+* Sun Jan 02 2005 Thorsten Leemhuis  - 0:1.0.6-0.fdr.1
+- Update to 1.0.6 for FC3
+- add new files in {_datadir}/sounds/
+- add patch0 for as10k1 
+
+* Sat Apr 03 2004 Thorsten Leemhuis  - 0:1.0.4-0.fdr.1
+- Update to 1.0.4
+
+* Fri Jan 16 2004 Thorsten Leemhuis  - 0:1.0.1-0.fdr.2
+- Integrate Michaels patch that fixes:
+- fix desktop files for fedora.us, adds buildreq desktop-file-utils
+- fix %%install section for short-circuit installs
+
+* Fri Jan 09 2004 Thorsten Leemhuis  - 0:1.0.1-0.fdr.1
+- Update to 1.0.1
+
+* Sun Dec 14 2003 Thorsten Leemhuis  1.0.0-0.fdr.0.3.rc2
+- exit if error during build or install
+- fix install errors hdspconf, hdspmixer, usx2yloader
+- Split package in alsa-tools and alsa-tools-firmware
+- Integrate more docs
+
+* Fri Dec 06 2003 Thorsten Leemhuis  1.0.0-0.fdr.0.2.rc2
+- Update to 1.0.0rc2
+- some minor corrections in style
+
+* Thu Dec 04 2003 Thorsten Leemhuis  1.0.0-0.fdr.0.1.rc1
+- Update to 1.0.0rc1
+- Remove firmware files -- extra package now.
+- Add description
+
+* Wed Aug 13 2003 Dams  0:tools-0.fdr.1
+- Initial build.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	29 Nov 2006 21:48:41 -0000	1.8
@@ -0,0 +1 @@
+7342056614623273abccb1cd38a674d8  alsa-tools-1.0.12-pruned.tar.bz2


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 21:51:46 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 29 Nov 2006 16:51:46 -0500
Subject: rpms/hping3/FC-6 hping3.spec,1.3,1.4
Message-ID: <200611292151.kATLpkLF024394@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/hping3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24379

Modified Files:
	hping3.spec 
Log Message:
* Wed Nov 29 2006 Paul Wouters  0.0.20051105-5
- Rebuild for new libpcap dependancy



Index: hping3.spec
===================================================================
RCS file: /cvs/extras/rpms/hping3/FC-6/hping3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hping3.spec	7 Sep 2006 19:52:09 -0000	1.3
+++ hping3.spec	29 Nov 2006 21:51:16 -0000	1.4
@@ -1,7 +1,7 @@
 %define	cvs	20051105
 Name:    hping3
 Version: 0.0.%{cvs}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: TCP/IP stack auditing and much more
 
 Group: Applications/Internet
@@ -59,6 +59,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Nov 29 2006 Paul Wouters  0.0.20051105-5
+- 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  Wed Nov 29 22:08:28 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 17:08:28 -0500
Subject: rpms/blender/devel blender.spec,1.33,1.34
Message-ID: <200611292208.kATM8SEl027537@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27520

Modified Files:
	blender.spec 
Log Message:
Rebuilt to solve broken deps


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- blender.spec	31 Oct 2006 17:31:11 -0000	1.33
+++ blender.spec	29 Nov 2006 22:07:58 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -160,6 +160,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  2.42a-6
+- Rebuild to solve broken deps
+
 * Tue Oct 31 2006 Jochen Schmitt  2.42a-5
 - Rebuilt to fix broken deps
 



From fedora-extras-commits at redhat.com  Wed Nov 29 23:22:31 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 29 Nov 2006 18:22:31 -0500
Subject: rpms/python-matplotlib/FC-6 python-matplotlib.spec,1.21,1.22
Message-ID: <200611292322.kATNMVgt031515@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31455/FC-6

Modified Files:
	python-matplotlib.spec 
Log Message:
Fix pycairo requirement



Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-6/python-matplotlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-matplotlib.spec	29 Nov 2006 06:33:05 -0000	1.21
+++ python-matplotlib.spec	29 Nov 2006 23:22:01 -0000	1.22
@@ -17,7 +17,7 @@
 BuildRequires:  pygtk2-devel, gtk2-devel, tkinter, tk-devel
 BuildRequires:  python-numeric, pytz, python-dateutil, numpy, python-numarray
 Requires:       python-numeric, pytz, python-dateutil
-Requires:       pycairo >= 1.0.2
+Requires:       pycairo >= 1.2.0
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Nov 29 23:22:31 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 29 Nov 2006 18:22:31 -0500
Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.21,1.22
Message-ID: <200611292322.kATNMVsO031518@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31455/devel

Modified Files:
	python-matplotlib.spec 
Log Message:
Fix pycairo requirement



Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-matplotlib.spec	21 Nov 2006 15:36:32 -0000	1.21
+++ python-matplotlib.spec	29 Nov 2006 23:22:01 -0000	1.22
@@ -17,7 +17,7 @@
 BuildRequires:  pygtk2-devel, gtk2-devel, tkinter, tk-devel
 BuildRequires:  python-numeric, pytz, python-dateutil, numpy, python-numarray
 Requires:       python-numeric, pytz, python-dateutil
-Requires:       pycairo >= 1.0.2
+Requires:       pycairo >= 1.2.0
 
 
 %description



From fedora-extras-commits at redhat.com  Thu Nov 30 02:57:20 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Wed, 29 Nov 2006 21:57:20 -0500
Subject: accounts2 fedoraGroup.schema, 1.2, 1.3 fedoraPerson.schema, 1.4,
	1.5 fedoraMembership.schema, 1.2, NONE
Message-ID: <200611300257.kAU2vKG9009102@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9085

Modified Files:
	fedoraGroup.schema fedoraPerson.schema 
Removed Files:
	fedoraMembership.schema 
Log Message:
added fedora to the begining of attributes



Index: fedoraGroup.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraGroup.schema,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedoraGroup.schema	12 Oct 2006 00:18:37 -0000	1.2
+++ fedoraGroup.schema	30 Nov 2006 02:57:19 -0000	1.3
@@ -3,34 +3,35 @@
 #owner (the owner's DN) 
 #group_type 
 #needs_sponsor 
-#user_can_remove (will be handled by ACLs, but we need to clue the interface about it) #prerequisite_id (no idea what that is, so maybe not)  -- not included yet
+#user_can_remove (will be handled by ACLs, but we need to clue the interface about it) 
+#prerequisite_id (no idea what that is, so maybe not)  -- not included yet
 #joinmsg 
 
 
-attributeType ( 2.5.444.10 NAME 'groupowner'
+attributeType ( 2.5.444.10 NAME 'fedoraGroupOwner'
                 DESC 'group owner'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
 
-attributeType ( 2.5.444.11 NAME 'grouptype'
+attributeType ( 2.5.444.11 NAME 'fedoraGroupType'
                 DESC 'the type of group'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.444.12 NAME 'needssponsor'
+attributeType ( 2.5.444.12 NAME 'fedoraGroupNeedsSponsor'
                 DESC 'boolean indicating whether or not the group needs a sponsor'
                 EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.444.13 NAME 'usercanremove'
+attributeType ( 2.5.444.13 NAME 'fedoraGroupUserCanRemove'
                 DESC 'boolean indicating whether or not the user can remove the group'
                 EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.444.14 NAME 'joinmsg'
+attributeType ( 2.5.444.14 NAME 'fedoraGroupJoinMsg'
                 DESC 'message received upon joining the group'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
 
@@ -38,10 +39,7 @@
 objectclass	( 2.5.555.3
     NAME 'fedoraGroup'
 	DESC 'A object describing a group entry'
-    STRUCTURAL
-	MAY (
-		joinmsg $ usercanremove $ grouptype $ needssponsor $ 
-		usercanremove )
-	)
-	MUST ( 
-		cn $ groupowner )
+   STRUCTURAL
+	MAY (  fedoraGroupJoinMsg $ fedoraGroupUsercanRemove $ fedoraGroupType $ fedoraGroupNeedsSponsor $ fedoraGroupUserCanRemove )
+	MUST ( 	cn $ fedoraGroupOwner )
+ )


Index: fedoraPerson.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraPerson.schema,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedoraPerson.schema	22 Nov 2006 00:25:45 -0000	1.4
+++ fedoraPerson.schema	30 Nov 2006 02:57:19 -0000	1.5
@@ -3,33 +3,33 @@
 #attribues added onto it for use by the Account system
 #for now this is the contents
 #sshkey bugzillaemail ircNick approvalStatus creationDate
-attributeType ( 2.5.444.8 NAME 'sshKey'
+attributeType ( 2.5.444.8 NAME 'fedoraPersonSshKey'
                 DESC 'ssh key for this member'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} 
 	    SINGLE-VALUE)
 
-attributeType ( 2.5.444.9 NAME 'bugzillaMail'
+attributeType ( 2.5.444.9 NAME 'fedoraPersonBugzillaMail'
         DESC 'members preferred bugzilla email address'
 	EQUALITY caseIgnoreIA5Match
 	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-attributeType ( 2.5.444.16 NAME 'ircNick'
+attributeType ( 2.5.444.16 NAME 'fedoraPersonIrcNick'
                 DESC 'irc nick of the user on freenode'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{100} )
 
-attributetype ( 2.5.444.17 NAME 'personCreationDate'
+attributetype ( 2.5.444.17 NAME 'fedoraPersonCreationDate'
  	DESC 'date entry was created'
  	EQUALITY caseIgnoreIA5Match
  	SUBSTR caseIgnoreIA5SubstringsMatch
  	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
  	SINGLE-VALUE )
 
-attributeType ( 2.5.444.18 NAME 'approvalStatus'
+attributeType ( 2.5.444.18 NAME 'fedoraPersonApprovalStatus'
                DESC 'users approval status'
                EQUALITY caseIgnoreMatch
                SUBSTR caseIgnoreSubstringsMatch
@@ -44,6 +44,6 @@
     DESC 'A member of the fedoraproject group'
     SUP inetOrgPerson
     STRUCTURAL
-	MUST ( sshKey $ mail $ personCreationDate )
-	MAY  (ircNick $ approvalStatus $ bugzillaMail )
+	MUST ( fedoraPersonSshKey $ mail $ fedoraPersonCreationDate )
+	MAY  (fedoraPersonIrcNick $ fedoraPersonApprovalStatus $ fedoraPersonBugzillaMail )
    )


--- fedoraMembership.schema DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 30 03:02:01 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Wed, 29 Nov 2006 22:02:01 -0500
Subject: accounts2 PgToLDAP.py,1.1,1.2
Message-ID: <200611300302.kAU321bO012238@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12219

Modified Files:
	PgToLDAP.py 
Log Message:
Mathes new schema now



Index: PgToLDAP.py
===================================================================
RCS file: /cvs/fedora/accounts2/PgToLDAP.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PgToLDAP.py	22 Nov 2006 00:25:45 -0000	1.1
+++ PgToLDAP.py	30 Nov 2006 03:02:00 -0000	1.2
@@ -22,7 +22,7 @@
 import ldap, ldif, pgdb, ldap.modlist
 from optparse import OptionParser
 
-version = "0.11"
+version = "0.111"
 
 def parseArgs():
     parser = OptionParser(version="%prog " + version)
@@ -189,13 +189,15 @@
         ldifWriter = openLdifFile(options.outFile)
 
     # Copy all users from db to ldap/ldif
+    # this will to queries and mappings
+    
     try:
         if verbose:
             print "Selecting all users from Postgres Database"
         userCursor = dbConn.cursor()
         userCursor.execute ("SELECT * FROM person")
 
-	#id, username, email, human_name, gpg_keyid, ssh_key, password, comments, postal_address, telephone, facsimile, affiliation, creation, approval_status, internal_comments, wiki_prefs, ircnick
+	#id, username, email 2, human_name 3, gpg_keyid 4, ssh_key 5, password 6, comments 7,  postal_address 8, telephone 9, facsimile 10, affiliation 11, creation 12, approval_status 13, internal_comments 14, wiki_prefs 15, ircnick 16
     except:
         print "Error selecting users from db"
         raise
@@ -211,10 +213,9 @@
         else:
             print "Adding ldif info for " + user[3] + "."
 
-	    #userLdif = {"objectClass" : ["fedoraPerson"] , "displayName":  [user[1],"Tom"] , "mail": [user[2]] , "givenName" : [user[3]] , "userCertificate" : [user[4]] , "userPassword" : [user[6]] , "o":["fedoraproject"] , "postalAddress" : [user[8]] , "telephoneNumber" : [user[9]] , "fax" : [user [10]]}
-	    userLdif = [["objectClass",["fedoraPerson"]] , [ "displayName",[ user[1] ] ]] 
+	    userLdif = [["objectClass",["fedoraPerson","organizationalUnit"]] , [ "displayName",[ user[1] ] ] ] 
 	    userLdif.append(["mail",[str(user[2])]])
-	    userLdif.append(["bugzillaMail",[str(user[2])]])
+	    userLdif.append(["fedoraPersonBugzillaMail",[str(user[2])]])
 	    userLdif.append(["cn",[str(user[3])]])
 	    userLdif.append(["givenName",[str(user[3])]])
 	    userLdif.append(["userCertificate",[str(user[4])]])
@@ -223,11 +224,12 @@
 	    userLdif.append(["postalAddress",[str(user[8])]])
 	    userLdif.append(["telephoneNumber",[str(user[9])]])
 	    userLdif.append(["fax",[str(user[10])]])
-	    userLdif.append(["o",[str(user[11])]]) # affiliation is set to the o
-	    userLdif.append(["personCreationDate",[str(user[12])]])
-	    userLdif.append(["approvalStatus",[str(user[13])]])
+	    userLdif.append(["o",[str(user[11])]]) # affiliation is set to the o -- another stretch ??
+	    userLdif.append(["fedoraPersonCreationDate",[str(user[12])]])
+	    userLdif.append(["fedoraPersonApprovalStatus",[str(user[13])]])
 	    userLdif.append(["description",[str(user[14])]]) #this one may be a streach -- original field was internal comments
-	    userLdif.append(["ircNick",[str(user[16])]])
+	    userLdif.append(["fedoraPersonIrcNick",[str(user[16])]])
+	    userLdif.append(["ou",["roles"]])
 	   
 	    print userLdif
 	    #for userKey in userLdif.keys():
@@ -241,20 +243,23 @@
 	    ldifWriter.unparse("cn=" + str(user[3]) +",ou=People,dc=fedoraproject,dc=org" , userLdif )
 	    #ldifWriter.unparse("dc=fedoraproject,dc=org, cn=" + user[3] , [ ['ano',['domini']],['uances',['od']] ])
 
-	    time.sleep (2)
+	    #time.sleep (2)
 	
         		
             #ldapConn.add_s(dn, entry)
 
     userCursor.close()
-
+    
     # Select all groups from the DB
+    
     try:
         if verbose:
             print "Selecting all groups from Postgres Database"
         groupCursor = dbConn.cursor()
         groupCursor.execute ("SELECT * FROM project_group")
-	#id, name, owner_id, group_type, needs_sponsor, user_can_remove, prerequisite_id, joinmsg
+
+
+
     except:
         print "Error selecting groups from db"
         raise
@@ -271,11 +276,38 @@
             #ldapConn.add_s(dn, entry)
 	    
             print "Adding group info for " + group[1] + "."
+            #id0, name1, owner_id2, group_type3, needs_sponsor4, user_can_remove5, prerequisite_id6, joinmsg7
 
+            uidLookupCursor = dbConn.cursor()
+            uidLookupCursor.execute ("SELECT username FROM person where id =" + str(group[2]) )
+            owner = uidLookupCursor.fetchone()
+            if str(group[6]) != "None" :
+                uidLookupCursor.execute ("SELECT name FROM project_group where id =" + str(group[6]) )
+	        prereq = uidLookupCursor.fetchone()
+                print prereq
+	    else:
+		prereq=["None"]
+	    print owner
+
+
+            #id0, name1, owner_id2, group_type3, needs_sponsor4, user_can_remove5, prerequisite_id6, joinmsg7
+	    userLdif = [["objectClass",["fedoraGroup"]] ] 
+	    userLdif.append(["cn",[str(group[1])]])
+	    userLdif.append(["fedoraGroupOwner",owner]) # need to get a cn for this not just the id
+	    #userLdif.append(["groupOwner",[str(group[2])]]) # need to get a cn for this not just the id
+	    userLdif.append(["fedoraGroupType",[str(group[3])]])
+	    userLdif.append(["fedoraGroupNeedsSponsor",[str(group[4])]]) #need to convert to bool
+	    userLdif.append(["fedoraGroupUserCanRemove",[str(group[5])]])
+	    #userLdif.append(["groupPrerequisite",[str(group[6])]])
+	    #userLdif.append(["groupPrerequisite",prereq]) not currently in the schema
+	    userLdif.append(["fedoraGroupJoinMsg",[str(group[7])]])
+	    ldifWriter.unparse("cn=" + str(group[1]) +",ou=fedoraGroups,dc=fedoraproject,dc=org" , userLdif )
 
 
-    userCursor.close()        
+    groupCursor.close()        
+    
     # Select all roles from the DB
+    
     try:
         if verbose:
             print "Selecting all roles from Postgres Database"
@@ -296,8 +328,44 @@
             ldifWriter.unparse(dn, entry)
         else:
             #ldapConn.add_s(dn, entry)
-            print "Adding role info for " + role[4] + "for user" + str(role[1]) + "." 
-    userCursor.close()
+            #person_id0, group_project_id1, role_type2, role_domain3, role_status4, internal_comments5, sponsor_id6, creation7, approval8
+
+
+	    uidRoleCursor = dbConn.cursor()
+            uidRoleCursor.execute ("SELECT username FROM person where id =" + str(role[0]) )
+            username = uidRoleCursor.fetchone()
+            uidRoleCursor.execute ("SELECT name FROM project_group where id =" + str(role[1]) )
+            group = uidRoleCursor.fetchone()
+            if str(role[6]) != "None" :
+                uidRoleCursor.execute ("SELECT username FROM person where id =" + str(role[6]) )
+                sponsor = uidRoleCursor.fetchone()
+	    else:
+		sponsor = ["None"]
+
+            print "Adding " + str(role[4]) + " role info for " + group[0] + " for user " + username[0] + "."
+            #if str(group[6]) != "None" :
+            #    uidLookupCursor.execute ("SELECT name FROM project_group where id =" + str(group[6]) )
+	    #    prereq = uidLookupCursor.fetchone()
+            #    print prereq
+	    #else:
+	    #	prereq=["None"]
+	    #print owner 
+
+  #person_id0, group_project_id1, role_type2, role_domain3, role_status4, internal_comments5, sponsor_id6, creation7, approval8
+
+            roleLdif = [["objectClass",["fedoraRole"]] ] 
+	    #roleLdif.append(["cn",[str(role[1]),str(role[2])]]) #Fix me
+	    roleLdif.append(["fedoraRoleType",[str(role[2])]])
+	    roleLdif.append(["fedoraRoleDomain",[str(role[3])]])
+	    roleLdif.append(["fedoraRoleStatus",[str(role[4])]])
+	    roleLdif.append(["fedoraRoleSponsor",sponsor])
+	    roleLdif.append(["fedoraRoleCreationDate",[str(role[7])]])
+	    roleLdif.append(["fedoraRoleApprovalDate",[str(role[8])]])
+
+	    ldifWriter.unparse("cn=" + group[0] + ",cn=" + str(role[2]) +",cn=" + username[0] + " ou=Roles, ou=fedoraGroups,dc=fedoraproject,dc=org" , roleLdif )
+
+    roleCursor.close()
+      
     sys.exit(1)    
 if __name__ == "__main__":
     main()



From fedora-extras-commits at redhat.com  Thu Nov 30 04:05:26 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:05:26 -0500
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200611300405.kAU45QrT015579@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15547/FC-6

Modified Files:
	gaim-gaym.spec sources 
Log Message:
update to svn rel 293



Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gaim-gaym.spec	11 Nov 2006 22:31:58 -0000	1.4
+++ gaim-gaym.spec	30 Nov 2006 04:04:56 -0000	1.5
@@ -6,12 +6,17 @@
 
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
-#   svn release: 290
-%define alphatag 291svn
+#   svn release: 293
+#
+# Check out latest with:
+#   svn checkout \
+#       http://svn.berlios.de/svnroot/repos/qrc/qrc/branches/fork-for-gaim-2
+#
+%define alphatag 293svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.5.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.6.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -75,6 +80,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.96-3.6.293svn
+- update to svn rel 293, tag fork-for-gaim-2
+
 * Sat Nov 11 2006 Chris Weyl  0.96-3.5.291svn
 - update to svn rel 291, tag fork-for-gaim-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Nov 2006 22:31:58 -0000	1.5
+++ sources	30 Nov 2006 04:04:56 -0000	1.6
@@ -1,2 +1 @@
-9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz
-a54d56efc5021c996dacf2d100f5da51  qrc-0.96-291svn.tar.gz
+3bf6718fc366db509a783c0329169103  qrc-0.96-293svn.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 04:05:26 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:05:26 -0500
Subject: rpms/gaim-gaym/devel .cvsignore, 1.6, 1.7 gaim-gaym.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611300405.kAU45QS5015584@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15547/devel

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
update to svn rel 293



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2006 22:31:59 -0000	1.6
+++ .cvsignore	30 Nov 2006 04:04:56 -0000	1.7
@@ -1,3 +1 @@
-qrc-0.96-290svn.tar.gz
-gaim-2.0.0beta4.tar.gz
-qrc-0.96-291svn.tar.gz
+qrc-0.96-293svn.tar.gz


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gaim-gaym.spec	11 Nov 2006 22:31:59 -0000	1.5
+++ gaim-gaym.spec	30 Nov 2006 04:04:56 -0000	1.6
@@ -6,12 +6,17 @@
 
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
-#   svn release: 290
-%define alphatag 291svn
+#   svn release: 293
+#
+# Check out latest with:
+#   svn checkout \
+#       http://svn.berlios.de/svnroot/repos/qrc/qrc/branches/fork-for-gaim-2
+#
+%define alphatag 293svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.5.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.6.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -75,6 +80,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.96-3.6.293svn
+- update to svn rel 293, tag fork-for-gaim-2
+
 * Sat Nov 11 2006 Chris Weyl  0.96-3.5.291svn
 - update to svn rel 291, tag fork-for-gaim-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Nov 2006 22:31:59 -0000	1.6
+++ sources	30 Nov 2006 04:04:56 -0000	1.7
@@ -1,2 +1 @@
-9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz
-a54d56efc5021c996dacf2d100f5da51  qrc-0.96-291svn.tar.gz
+3bf6718fc366db509a783c0329169103  qrc-0.96-293svn.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 04:17:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:17:36 -0500
Subject: rpms/gaim-gaym/devel sources,1.7,1.8
Message-ID: <200611300417.kAU4HaZb015761@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15730/devel

Modified Files:
	sources 
Log Message:
Always something...



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2006 04:04:56 -0000	1.7
+++ sources	30 Nov 2006 04:17:06 -0000	1.8
@@ -1 +1,2 @@
 3bf6718fc366db509a783c0329169103  qrc-0.96-293svn.tar.gz
+9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 04:17:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:17:35 -0500
Subject: rpms/gaim-gaym/FC-6 sources,1.6,1.7
Message-ID: <200611300417.kAU4HZTv015758@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15730/FC-6

Modified Files:
	sources 
Log Message:
Always something...



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Nov 2006 04:04:56 -0000	1.6
+++ sources	30 Nov 2006 04:17:05 -0000	1.7
@@ -1 +1,2 @@
 3bf6718fc366db509a783c0329169103  qrc-0.96-293svn.tar.gz
+9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 04:19:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:19:43 -0500
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.5,1.6
Message-ID: <200611300419.kAU4JhLa015896@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15868/FC-6

Modified Files:
	gaim-gaym.spec 
Log Message:
bump


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gaim-gaym.spec	30 Nov 2006 04:04:56 -0000	1.5
+++ gaim-gaym.spec	30 Nov 2006 04:19:13 -0000	1.6
@@ -16,7 +16,7 @@
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.6.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.7.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.96-3.7.293svn
+- bump
+
 * Wed Nov 29 2006 Chris Weyl  0.96-3.6.293svn
 - update to svn rel 293, tag fork-for-gaim-2
 



From fedora-extras-commits at redhat.com  Thu Nov 30 04:19:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:19:43 -0500
Subject: rpms/gaim-gaym/devel gaim-gaym.spec,1.6,1.7
Message-ID: <200611300419.kAU4Jhm1015899@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15868/devel

Modified Files:
	gaim-gaym.spec 
Log Message:
bump


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-gaym.spec	30 Nov 2006 04:04:56 -0000	1.6
+++ gaim-gaym.spec	30 Nov 2006 04:19:13 -0000	1.7
@@ -16,7 +16,7 @@
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.6.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.7.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.96-3.7.293svn
+- bump
+
 * Wed Nov 29 2006 Chris Weyl  0.96-3.6.293svn
 - update to svn rel 293, tag fork-for-gaim-2
 



From fedora-extras-commits at redhat.com  Thu Nov 30 06:03:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:03:04 -0500
Subject: rpms/ocsinventory-client - New directory
Message-ID: <200611300603.kAU634n7022325@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22321/ocsinventory-client

Log Message:
Directory /cvs/extras/rpms/ocsinventory-client added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:03:09 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:03:09 -0500
Subject: rpms/ocsinventory-client/devel - New directory
Message-ID: <200611300603.kAU639hV022338@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22321/ocsinventory-client/devel

Log Message:
Directory /cvs/extras/rpms/ocsinventory-client/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:03:25 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:03:25 -0500
Subject: rpms/ocsinventory-client Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611300603.kAU63Pxe022368@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22362

Added Files:
	Makefile import.log 
Log Message:
Setup of module ocsinventory-client


--- NEW FILE Makefile ---
# Top level Makefile for module ocsinventory-client
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 Nov 30 06:03:30 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:03:30 -0500
Subject: rpms/ocsinventory-client/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611300603.kAU63UMv022383@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22362/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ocsinventory-client


--- 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 Nov 30 06:04:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:04:55 -0500
Subject: rpms/ocsinventory-client import.log,1.1,1.2
Message-ID: <200611300604.kAU64teB022472@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22437

Modified Files:
	import.log 
Log Message:
auto-import ocsinventory-client-1.0-0.5.RC3.fc7 on branch devel from ocsinventory-client-1.0-0.5.RC3.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 06:03:25 -0000	1.1
+++ import.log	30 Nov 2006 06:04:24 -0000	1.2
@@ -0,0 +1 @@
+ocsinventory-client-1_0-0_5_RC3_fc7:HEAD:ocsinventory-client-1.0-0.5.RC3.fc7.src.rpm:1164866802



From fedora-extras-commits at redhat.com  Thu Nov 30 06:04:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:04:55 -0500
Subject: rpms/ocsinventory-client/devel ocsinventory-client.README, NONE,
	1.1 ocsinventory-client.README.fr, NONE,
	1.1 ocsinventory-client.patch, NONE,
	1.1 ocsinventory-client.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611300605.kAU64tRb022476@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22437/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ocsinventory-client.README ocsinventory-client.README.fr 
	ocsinventory-client.patch ocsinventory-client.spec 
Log Message:
auto-import ocsinventory-client-1.0-0.5.RC3.fc7 on branch devel from ocsinventory-client-1.0-0.5.RC3.fc7.src.rpm


--- NEW FILE ocsinventory-client.README ---
Thie RPM install the OCS Inventory NG client
It is configure to generate a local report:

	/var/log/ocsinventory-client/.ocs

If you want it to automaticaly transfer the result
to your organization communication server, 
edit the configuration file:

	/etc/ocsinventory-client/ocsinv.conf

Change the line
	local
To
	ocsserver.domain.tld:port

If you want to use the ocs TAG,
edit the administrative file:

	/etc/ocsinventory-client/ocsinv.adm

Change the lines
	TAG
	
To
	TAG
	tagvalue

If you want to deploy this client on a important number of
computer, you can generate a already configured RPM with

rpmbuild -bb \
	--define "ocstag    tagvalue" \
	--define "ocsserver ocsserver.domain.tld:port" \
	ocsinventory-client-.src.rpm

Result will be : ocsinventory-client-...rpm



--- NEW FILE ocsinventory-client.README.fr ---
Ce RPM installe le client d"OCS Inventory NG"
Il est configur?? pour g??n??rer un rapport local :

	/var/log/ocsinventory-client/.ocs

Si vous souhaitez transmettre ce rapport au serveur
de communication de votre organisation, ??ditez le
fichier de configuration :

	/etc/ocsinventory-client/ocsinv.conf

Modifiez la ligne
	local
en
	ocsserver.domain.tld:port

Si vous souhaitez utilise le TAG ocs,
??ditez le fichier admistratif :

	/etc/ocsinventory-client/ocsinv.adm

Modifiez les lignes
	TAG
	
en
	TAG
	tagvalue

Si vous d??sirez d??ployer ce client sur un parc important, vous
pouvez g??n??rer un RPM pr??configur?? ?? l'aide de la commande

rpmbuild -bb \
	--define "ocstag    tagvalue" \
	--define "ocsserver ocsserver.domain.tld:port" \
	ocsinventory-client-.src.rpm

Le r??sultat sera : ocsinventory-client-...rpm


ocsinventory-client.patch:

--- NEW FILE ocsinventory-client.patch ---
--- Ocsinventory/ocsinventory-client.pl.fedora	2006-07-03 22:27:03.000000000 +0200
+++ Ocsinventory/ocsinventory-client.pl	2006-11-28 19:04:59.000000000 +0100
@@ -35,7 +35,8 @@
 #
 use constant VERSION =>13;
 #
-my $log_path		= "/var/log/ocsinventory-client/ocsinv.log";
+my $log_folder		= "/var/log/ocsinventory-client";
+my $log_path		= $log_folder. "/ocsinv.log";
 my $default_server	= "ocsinventory-ng";
 my $install_path	= "/etc/ocsinventory-client";
 my $exe_path		= "/usr/sbin";
@@ -263,9 +264,6 @@
 	}elsif(-e "/etc/mandrake-release"){
 		$distro = 'Mandrake';
 		$distro_file = "/etc/mandrake-release";
-	}elsif(-e "/etc/redhat-release"){
-		$distro = 'Redhat';
-		$distro_file = "/etc/redhat-release";
 	}elsif(-e "/etc/SuSE-release"){
 		$distro = 'SuSe';
 		$distro_file = "/etc/SuSE-release";
@@ -276,11 +274,14 @@
 		$distro = 'Knoppix'; 
 		$distro_file = "/etc/knoppix_version";
 	}elsif(-e "/etc/fedora-release"){
-	   	$distro = 'Fedora Core';
+	   	$distro = 'Fedora';
 		$distro_file = "/etc/fedora-release";
 	}elsif(-e "/etc/trustix-release"){
 	   	$distro = 'Trustix';
 		$distro_file = "/etc/trustix-release";
+	}elsif(-e "/etc/redhat-release"){
+		$distro = 'Redhat';
+		$distro_file = "/etc/redhat-release";
 	}
 	
 	open DISTRO, $distro_file;
@@ -713,6 +714,7 @@
 
 sub _monitors{
 	# Looking for XFConfig
+	-e "/etc/X11/xorg.conf" and $xfree = "/etc/X11/xorg.conf";
 	-e "/etc/X11/XF86Config" and $xfree = "/etc/X11/XF86Config";
 	-e "/etc/X11/XF86Config-4" and $xfree = "/etc/X11/XF86Config-4";
 	-e "/etc/XF86Config" and $xfree = "/etc/XF86Config";
@@ -846,7 +848,7 @@
 		my $dpkg_path = &_get_path('dpkg');
 		@liste = `$dpkg_path -l`;
 		$dpkg = 1;
-	}elsif($distro=~/mandrake|redhat|suse/i){
+	}elsif($distro=~/mandrake|redhat|fedora|suse/i){
 		my $rpm_path = &_get_path('rpm');
 		my $buff;
 		foreach(`rpm -qa --queryformat "%{NAME} %{VERSION}-%{RELEASE} %{SUMMARY}\n--\n"`) {
@@ -894,23 +896,16 @@
 
 	# If $ServerName is local, we know that the inventory is generated on the local machine
 	if(($ServerName eq 'local') or $xml){
-		$err=1;
 
-		while($err){
-			print "\n\n\tChoose your target directory ? :  ";
-
-			chomp($ptmontage=);
+			$ptmontage=$log_folder;
 
 			# Checking existence and permissions of the destination directory
 			if(!(-e $ptmontage)){
-				print "The directory do not exist .\n";
-				$err++;
+				die("The directory do not exist .\n");
 			}elsif(!(-w $ptmontage)){
-				print "The mount point is not writeable.\n";
-				$err++;
+				die("The mount point is not writeable.\n");
 			# Generate...
 			}else{
-				$err = 0;
 				open XML, ">$ptmontage/$DeviceID.ocs" or die localtime()." => Cannot create file : $!\n";
 
 				if($xml){
@@ -924,8 +919,6 @@
 				close XML;
 			}
 
-			die("Abort.\n") if $err>3;
-		}
 		print localtime()." => Inventory generated...\n";
 	}else{
 		# Sending inventory to web server


--- NEW FILE ocsinventory-client.spec ---
%define tarname OCSNG_LINUX_AGENT_1.0RC3

# Can, optionaly, be define at build time (see README.fedora)
# - ocstag    : administrative tag
# - ocsserver : OCS Inventory NG communication serveur

Name:      ocsinventory-client
Version:   1.0
Release:   0.5.RC3%{?dist}%{?ocstag:.}%{?ocstag}
Summary:   Open Computer and Software Inventory Next Generation client

Group:     Development/Libraries
License:   GPL
URL:       http://ocsinventory.sourceforge.net/
Source0:   http://heanet.dl.sourceforge.net/sourceforge/ocsinventory/%{tarname}.tar.gz
Source1:   ocsinventory-client.README
Source2:   ocsinventory-client.README.fr
Patch0:    ocsinventory-client.patch

# Not noarch because of ipdiscover.c - BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: %{_sbindir}/dmidecode, perl
%if %{?fedora}0
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
%define perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
%endif
Requires:  perl(HTTP::Request)
Requires:  %{_sbindir}/dmidecode, coreutils, net-tools, pciutils
Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.daily

%description
Open Computer and Software Inventory Next Generation is an application
designed to help a network or system administrator keep track of computer
configuration and software installed on the network. 

It also allows deploying softwares, commands or files on Windows and 
Linux client computers.

%{name} provide the client agent for Linux.

%description -l fr
Open Computer and Software Inventory Next Generation est une application
destin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil sur
la configuration des machines du r??seau et sur les logiciels qui y sont
install??s. 

Elle autorise aussi la t??l??diffusion (ou d??ploiement) de logiciels, 
de commandes ou de fichiers sur les clients Windows ou Linux.

%{name} fournit l'agent client pour Linux.

%prep
%setup -q -n %{tarname}
%patch0 -p0 -b .fedora
%{__sed} -i -e 's/\r//' changelogs

cat <ocsinv.conf

  OCS_AGENT_DEVICE_ID
  $(%{_sbindir}/dmidecode --version)
  3
  %{?ocsserver}%{!?ocsserver:local}
  0

EOF

cat <ocsinv.adm

  
    TAG
    %{?ocstag}
  

EOF

cat <cron
#!/bin/sh
%{_sbindir}/ocsinventory-client.pl &>/dev/null
EOF

%{__sed} -i -e 's|PATH_TO_LOG_DIRECTORY|%{_localstatedir}/log/%{name}|' logrotate.ocsinventory-client

cp %{SOURCE1} README.fedora
cp %{SOURCE2} README.fedora.fr

%build
pushd Ocsinventory
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
popd
%{__cc} %{optflags} -o ipdiscover ipdiscover.c

%install
rm -rf %{buildroot}

pushd Ocsinventory
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+rwX,go+rX,go-w %{buildroot}/*
rm %{buildroot}%{perl_vendorlib}/Ocsinventory/ocsinventory-client.pl
popd

%{__install} -m 755 ipdiscover %{buildroot}%{_sbindir}

%{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}

%{__mkdir_p} %{buildroot}%{_sysconfdir}/%{name}
%{__install} -m 644 ocsinv.conf ocsinv.adm %{buildroot}%{_sysconfdir}/%{name}

%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d
%{__install} -m 644 logrotate.ocsinventory-client %{buildroot}%{_sysconfdir}/logrotate.d/%{name}

%{__mkdir_p} %{buildroot}%{_sysconfdir}/cron.daily
%{__install} -m 755 cron %{buildroot}%{_sysconfdir}/cron.daily/%{name}

%clean
rm -rf %{buildroot}

%post
# First install : generate DEVICE_ID
if [ "$1" -eq "1" ]
then   
    OCS_AGENT_DEVICE_ID=$(hostname)-$(date +%%Y-%%m-%%d-%%H-%%M-%%S)
    %{__sed} -i -e "s/OCS_AGENT_DEVICE_ID/$OCS_AGENT_DEVICE_ID/" %{_sysconfdir}/%{name}/ocsinv.conf
fi

%files
%defattr(-, root, root, -)
%doc changelogs README README.fedora
%lang(fr) %doc README.fedora.fr
%{perl_vendorlib}/Ocsinventory
%{_sbindir}/ocsinventory-client.pl
%{_sbindir}/ipdiscover
%dir %{_localstatedir}/log/%{name}
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/ocsinv.*
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%{_sysconfdir}/cron.daily/%{name}


%changelog
* Wed Nov 29 2006 Remi Collet  1.0-0.5.RC3
- Requires %%{_sysconfdir}/logrotate.d and %%{_sysconfdir}/cron.daily
- define perl_vendorlib on non-fedora (for RHEL3)

* Tue Nov 28 2006 Remi Collet  1.0-0.4.RC3
- requires %%{_sbindir}/dmidecode (kernel-utils in FC3) rather than dmidecode 
- requires perl(:MODULE_COMPAT) only on Fedora (not provided on RHEL3)
- patch improved (Fedora is RPM based)

* Mon Nov 27 2006 Remi Collet  1.0-0.3.RC3
- $RPM_OPT_FLAGS changed to %%{optflags}. 
- add not detected Requires perl(HTTP::Request)

* Sun Nov 26 2006 Remi Collet  1.0-0.2.RC3
- replace perl and dos2unix by sed
- split README.fedora

* Sun Nov 26 2006 Remi Collet  1.0-0.1.RC3
- initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 06:03:30 -0000	1.1
+++ .cvsignore	30 Nov 2006 06:04:25 -0000	1.2
@@ -0,0 +1 @@
+OCSNG_LINUX_AGENT_1.0RC3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 06:03:30 -0000	1.1
+++ sources	30 Nov 2006 06:04:25 -0000	1.2
@@ -0,0 +1 @@
+34edd057f1937245d06c3515c0ff50ad  OCSNG_LINUX_AGENT_1.0RC3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 06:07:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:07:51 -0500
Subject: owners owners.list,1.2035,1.2036
Message-ID: <200611300607.kAU67pvY022533@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22518

Modified Files:
	owners.list 
Log Message:
	ocsinventory-client



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2035
retrieving revision 1.2036
diff -u -r1.2035 -r1.2036
--- owners.list	29 Nov 2006 10:53:58 -0000	1.2035
+++ owners.list	30 Nov 2006 06:07:21 -0000	1.2036
@@ -1232,6 +1232,7 @@
 Fedora Extras|obmenu|A graphical menu editor for the Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|ocaml|The Objective Caml compiler and programming environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ochusha|A GTK+ 2ch.net BBS Browser|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
+Fedora Extras|ocsinventory-client|Open Computer and Software Inventory Next Generation client|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oddjob|A D-BUS service which runs odd jobs on behalf of client applications|nalin at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 06:33:52 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:33:52 -0500
Subject: rpms/ocsinventory-client/devel ocsinventory-client.spec,1.1,1.2
Message-ID: <200611300633.kAU6XqAj022651@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22633

Modified Files:
	ocsinventory-client.spec 
Log Message:
	ExclusiveArch: i386 x86_64



Index: ocsinventory-client.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/devel/ocsinventory-client.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-client.spec	30 Nov 2006 06:04:25 -0000	1.1
+++ ocsinventory-client.spec	30 Nov 2006 06:33:22 -0000	1.2
@@ -4,9 +4,11 @@
 # - ocstag    : administrative tag
 # - ocsserver : OCS Inventory NG communication serveur
 
+ExclusiveArch: i386 x86_64
+
 Name:      ocsinventory-client
 Version:   1.0
-Release:   0.5.RC3%{?dist}%{?ocstag:.}%{?ocstag}
+Release:   0.6.RC3%{?dist}%{?ocstag:.}%{?ocstag}
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Group:     Development/Libraries
@@ -142,6 +144,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Remi Collet  1.0-0.6.RC3
+- ExclusiveArch: i386 x86_64 (no dmidecode on other arch)
+
 * Wed Nov 29 2006 Remi Collet  1.0-0.5.RC3
 - Requires %%{_sysconfdir}/logrotate.d and %%{_sysconfdir}/cron.daily
 - define perl_vendorlib on non-fedora (for RHEL3)



From fedora-extras-commits at redhat.com  Thu Nov 30 06:40:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:01 -0500
Subject: rpms/perl-Gtk2-Ex-Utils/devel - New directory
Message-ID: <200611300640.kAU6e1F3022774@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22757/perl-Gtk2-Ex-Utils/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:39:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:39:55 -0500
Subject: rpms/perl-Gtk2-Ex-Utils - New directory
Message-ID: <200611300639.kAU6dt1s022761@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22757/perl-Gtk2-Ex-Utils

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Ex-Utils added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:40:09 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:09 -0500
Subject: rpms/perl-Gtk2-Ex-Utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611300640.kAU6e9gp022804@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22798

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Gtk2-Ex-Utils


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gtk2-Ex-Utils
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 Nov 30 06:40:14 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:14 -0500
Subject: rpms/perl-Gtk2-Ex-Utils/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611300640.kAU6eEF0022819@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22798/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gtk2-Ex-Utils


--- 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 Nov 30 06:40:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:58 -0500
Subject: rpms/perl-Gtk2-Ex-Utils import.log,1.1,1.2
Message-ID: <200611300640.kAU6ewLs022907@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22862

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-Ex-Utils-0.09-1.fc6 on branch devel from perl-Gtk2-Ex-Utils-0.09-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 06:40:09 -0000	1.1
+++ import.log	30 Nov 2006 06:40:28 -0000	1.2
@@ -0,0 +1 @@
+perl-Gtk2-Ex-Utils-0_09-1_fc6:HEAD:perl-Gtk2-Ex-Utils-0.09-1.fc6.src.rpm:1164868972



From fedora-extras-commits at redhat.com  Thu Nov 30 06:40:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:58 -0500
Subject: rpms/perl-Gtk2-Ex-Utils/devel perl-Gtk2-Ex-Utils.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611300641.kAU6ewbL022911@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22862/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Gtk2-Ex-Utils.spec 
Log Message:
auto-import perl-Gtk2-Ex-Utils-0.09-1.fc6 on branch devel from perl-Gtk2-Ex-Utils-0.09-1.fc6.src.rpm


--- NEW FILE perl-Gtk2-Ex-Utils.spec ---
Name:           perl-Gtk2-Ex-Utils
Version:        0.09
Release:        1%{?dist}
Summary:        Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl
License:        LGPL 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Gtk2-Ex-Utils/
Source0:        http://www.cpan.org/authors/id/K/KC/KCK/Gtk2-Ex-Utils-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Gtk2) >= 1.04

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides simple utility functions useful for Gnome2/Gtk2 Perl
programming.

%prep
%setup -q -n Gtk2-Ex-Utils-%{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 {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes COPYRIGHT README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Nov 29 2006 Chris Weyl  0.09-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 06:40:14 -0000	1.1
+++ .cvsignore	30 Nov 2006 06:40:28 -0000	1.2
@@ -0,0 +1 @@
+Gtk2-Ex-Utils-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 06:40:14 -0000	1.1
+++ sources	30 Nov 2006 06:40:28 -0000	1.2
@@ -0,0 +1 @@
+076bb6914470fb077f7028fef0a795f8  Gtk2-Ex-Utils-0.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 06:41:02 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:41:02 -0500
Subject: owners owners.list,1.2036,1.2037
Message-ID: <200611300641.kAU6f2XP022912@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22888

Modified Files:
	owners.list 
Log Message:
added perl-Gtk2-Ex-Utils


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -r1.2036 -r1.2037
--- owners.list	30 Nov 2006 06:07:21 -0000	1.2036
+++ owners.list	30 Nov 2006 06:40:32 -0000	1.2037
@@ -472,7 +472,6 @@
 Fedora Extras|fwfstab|A graphical file system table editor|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|GraphicsMagick|An ImageMagick fork, offering faster image generation and better quality|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
@@ -638,6 +637,7 @@
 Fedora Extras|grads|Tool for easy acces, manipulation, and visualization of data|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|granule|Flashcards program based on Leitner methodology|3rdshift at comcast.net|extras-qa at fedoraproject.org|
+Fedora Extras|GraphicsMagick|An ImageMagick fork, offering faster image generation and better quality|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|graphviz|Graph Visualization Tools|jima at beer.tclug.org|extras-qa at fedoraproject.org|ellson at research.att.com
 Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|grepmail|Search mailboxes for a particular email|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1503,6 +1503,7 @@
 Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GStreamer|GStreamer Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Gtk2-Ex-Utils|Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
 Fedora Extras|perl-Gtk2-Notify|Gtk2::Notify Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-Sexy|Perl interface to the sexy widget collection|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Nov 30 06:45:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:45:57 -0500
Subject: rpms/perl-Gtk2-Ex-Utils/devel perl-Gtk2-Ex-Utils.spec,1.1,1.2
Message-ID: <200611300645.kAU6jvxO023000@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22985

Modified Files:
	perl-Gtk2-Ex-Utils.spec 
Log Message:
release bump


Index: perl-Gtk2-Ex-Utils.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel/perl-Gtk2-Ex-Utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gtk2-Ex-Utils.spec	30 Nov 2006 06:40:28 -0000	1.1
+++ perl-Gtk2-Ex-Utils.spec	30 Nov 2006 06:45:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-Utils
 Version:        0.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl
 License:        LGPL 
 Group:          Development/Libraries
@@ -47,5 +47,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.09-2
+- bump
+
 * Wed Nov 29 2006 Chris Weyl  0.09-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Thu Nov 30 06:53:40 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:40 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs - New directory
Message-ID: <200611300653.kAU6relm023115@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23111/perl-Gtk2-Ex-Dialogs

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:53:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:37 -0500
Subject: owners owners.list,1.2037,1.2038
Message-ID: <200611300653.kAU6rbeT023100@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23082

Modified Files:
	owners.list 
Log Message:
added perl-Gtk2-Ex-Dialogs


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2037
retrieving revision 1.2038
diff -u -r1.2037 -r1.2038
--- owners.list	30 Nov 2006 06:40:32 -0000	1.2037
+++ owners.list	30 Nov 2006 06:53:07 -0000	1.2038
@@ -1503,6 +1503,7 @@
 Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GStreamer|GStreamer Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Gtk2-Ex-Dialogs|Useful tools for Gnome2/Gtk2 Perl GUI design|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-Ex-Utils|Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
 Fedora Extras|perl-Gtk2-Notify|Gtk2::Notify Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Nov 30 06:53:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:45 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel - New directory
Message-ID: <200611300653.kAU6rjqv023128@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23111/perl-Gtk2-Ex-Dialogs/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:53:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:54 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611300653.kAU6rsgL023158@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23152

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Gtk2-Ex-Dialogs


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gtk2-Ex-Dialogs
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 Nov 30 06:53:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:59 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611300653.kAU6rxoA023174@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23152/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gtk2-Ex-Dialogs


--- 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 Nov 30 06:54:42 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:54:42 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs import.log,1.1,1.2
Message-ID: <200611300654.kAU6sg4u023243@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23212

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-Ex-Dialogs-0.11-1.fc6 on branch devel from perl-Gtk2-Ex-Dialogs-0.11-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 06:53:54 -0000	1.1
+++ import.log	30 Nov 2006 06:54:12 -0000	1.2
@@ -0,0 +1 @@
+perl-Gtk2-Ex-Dialogs-0_11-1_fc6:HEAD:perl-Gtk2-Ex-Dialogs-0.11-1.fc6.src.rpm:1164869797



From fedora-extras-commits at redhat.com  Thu Nov 30 06:54:42 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:54:42 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel perl-Gtk2-Ex-Dialogs.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611300654.kAU6sgmm023247@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23212/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Gtk2-Ex-Dialogs.spec 
Log Message:
auto-import perl-Gtk2-Ex-Dialogs-0.11-1.fc6 on branch devel from perl-Gtk2-Ex-Dialogs-0.11-1.fc6.src.rpm


--- NEW FILE perl-Gtk2-Ex-Dialogs.spec ---
Name:           perl-Gtk2-Ex-Dialogs
Version:        0.11
Release:        1%{?dist}
Summary:        Useful tools for Gnome2/Gtk2 Perl GUI design
License:        LGPL 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Gtk2-Ex-Dialogs/
Source0:        http://www.cpan.org/authors/id/K/KC/KCK/Gtk2-Ex-Dialogs-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::Type) >= 0.22
BuildRequires:  perl(Gtk2) >= 1.04
BuildRequires:  perl(Gtk2::Ex::Utils) >= 0.08
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides a clean, simple, quick api to generate and use common
Gtk2 dialogs, either from within a full-blown Gtk2 app or as a one-off deal
inside a non-Gtk2 perl application.

%prep
%setup -q -n Gtk2-Ex-Dialogs-%{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 {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes COPYRIGHT README TODO examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Nov 29 2006 Chris Weyl  0.11-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 06:53:59 -0000	1.1
+++ .cvsignore	30 Nov 2006 06:54:12 -0000	1.2
@@ -0,0 +1 @@
+Gtk2-Ex-Dialogs-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 06:53:59 -0000	1.1
+++ sources	30 Nov 2006 06:54:12 -0000	1.2
@@ -0,0 +1 @@
+1ad86e1b3088971835a9393c710dbbfc  Gtk2-Ex-Dialogs-0.11.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 06:55:34 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:55:34 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel perl-Gtk2-Ex-Dialogs.spec,1.1,1.2
Message-ID: <200611300655.kAU6tYC1023317@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23299

Modified Files:
	perl-Gtk2-Ex-Dialogs.spec 
Log Message:
release bump


Index: perl-Gtk2-Ex-Dialogs.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel/perl-Gtk2-Ex-Dialogs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gtk2-Ex-Dialogs.spec	30 Nov 2006 06:54:12 -0000	1.1
+++ perl-Gtk2-Ex-Dialogs.spec	30 Nov 2006 06:55:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-Dialogs
 Version:        0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Useful tools for Gnome2/Gtk2 Perl GUI design
 License:        LGPL 
 Group:          Development/Libraries
@@ -48,5 +48,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.11-2
+- bump
+
 * Wed Nov 29 2006 Chris Weyl  0.11-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Thu Nov 30 07:06:00 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Thu, 30 Nov 2006 02:06:00 -0500
Subject: rpms/openvrml/FC-6 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611300706.kAU760kD026483@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26466

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded openvrml-0.16.2.tar.gz.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Nov 2006 14:53:10 -0000	1.2
+++ .cvsignore	30 Nov 2006 07:05:30 -0000	1.3
@@ -1 +1 @@
-openvrml-0.16.1.tar.gz
+openvrml-0.16.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Nov 2006 14:53:10 -0000	1.2
+++ sources	30 Nov 2006 07:05:30 -0000	1.3
@@ -1 +1 @@
-6628c0d18078805d2b662b3509f537d3  openvrml-0.16.1.tar.gz
+8f93af7603ac8ddb22897658ccedc754  openvrml-0.16.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 07:31:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 30 Nov 2006 02:31:22 -0500
Subject: comps comps-fe5.xml.in, 1.205, 1.206 comps-fe6.xml.in, 1.232,
	1.233 comps-fe7.xml.in, 1.33, 1.34
Message-ID: <200611300731.kAU7VMci026770@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26746

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add xtide related and urlgfe


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- comps-fe5.xml.in	27 Nov 2006 14:40:47 -0000	1.205
+++ comps-fe5.xml.in	30 Nov 2006 07:30:52 -0000	1.206
@@ -255,6 +255,7 @@
       lapack
       libctl
       libmatheval
+      libtcd
       ncarg
       nco
       ncview
@@ -278,10 +279,13 @@
       scrip
       sextractor
       SIBsim4
+      tcd-utils
+      tideEditor
       toped
       wcstools
       wvs-data
       xdrawchem
+      xtide
     
   
   
@@ -548,6 +552,7 @@
       sylpheed
       sylpheed-claws
       transmission
+      urlgfe
       valknut
       x3270-x11
       xchat-gnome


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- comps-fe6.xml.in	27 Nov 2006 14:40:47 -0000	1.232
+++ comps-fe6.xml.in	30 Nov 2006 07:30:52 -0000	1.233
@@ -302,6 +302,7 @@
       lapack
       libctl
       libmatheval
+      libtcd
       ncarg
       nco
       ncview
@@ -327,12 +328,15 @@
       scrip
       sextractor
       SIBsim4
+      tcd-utils
+      tideEditor
       toped
       veusz
       wcstools
       wvs-data
       xcircuit
       xdrawchem
+      xtide
     
   
   
@@ -600,6 +604,7 @@
       sylpheed-claws
       transmission
       twinkle
+      urlgfe
       valknut
       x3270-x11
       xchat-gnome


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- comps-fe7.xml.in	27 Nov 2006 01:57:37 -0000	1.33
+++ comps-fe7.xml.in	30 Nov 2006 07:30:52 -0000	1.34
@@ -303,6 +303,7 @@
       lapack
       libctl
       libmatheval
+      libtcd
       ncarg
       nco
       ncview
@@ -328,12 +329,15 @@
       scrip
       sextractor
       SIBsim4
+      tcd-utils
+      tideEditor
       toped
       veusz
       wcstools
       wvs-data
       xcircuit
       xdrawchem
+      xtide
     
   
   
@@ -601,6 +605,7 @@
       sylpheed-claws
       transmission
       twinkle
+      urlgfe
       valknut
       x3270-x11
       xchat-gnome



From fedora-extras-commits at redhat.com  Thu Nov 30 07:34:09 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Thu, 30 Nov 2006 02:34:09 -0500
Subject: rpms/openvrml/FC-6 openvrml.spec, 1.3,
	1.4 openvrml-gtkplug-info.patch, 1.1, NONE
Message-ID: <200611300734.kAU7Y9cP026840@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26783/FC-6

Modified Files:
	openvrml.spec 
Removed Files:
	openvrml-gtkplug-info.patch 
Log Message:
Updated to openvrml-0.16.2.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/openvrml.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openvrml.spec	28 Nov 2006 04:38:46 -0000	1.3
+++ openvrml.spec	30 Nov 2006 07:33:39 -0000	1.4
@@ -1,12 +1,11 @@
 # -*- rpm-spec -*-
 Name:           openvrml
-Version:        0.16.1
-Release:        5%{?dist}
+Version:        0.16.2
+Release:        1%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPL
 Group:          System Environment/Libraries
-Source:         http://prdownloads.sf.net/openvrml/%{name}-%{version}.tar.gz
-Patch:          openvrml-gtkplug-info.patch
+Source:         http://downloads.sf.net/openvrml/%{name}-%{version}.tar.gz
 URL:            http://openvrml.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig >= 0.12.0
@@ -80,8 +79,6 @@
 %prep
 %setup
 
-%patch -p1
-
 %build
 %configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG"
 %{__make} %{?_smp_mflags}
@@ -150,6 +147,10 @@
 
 
 %changelog
+* Thu Nov 30 2006  Braden McDaniel   - 0.16.2-1
+- Updated to 0.16.2; openvrml-gtkplug-info.patch is no longer
+  necessary.
+
 * Mon Nov 27 2006  Braden McDaniel   - 0.16.1-5
 - openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
   development headers are not wise to gcc symbol visibility mojo and as


--- openvrml-gtkplug-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 30 07:34:10 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Thu, 30 Nov 2006 02:34:10 -0500
Subject: rpms/openvrml/devel .cvsignore, 1.2, 1.3 openvrml.spec, 1.4,
	1.5 sources, 1.2, 1.3 openvrml-gtkplug-info.patch, 1.1, NONE
Message-ID: <200611300734.kAU7YALg026845@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26783/devel

Modified Files:
	.cvsignore openvrml.spec sources 
Removed Files:
	openvrml-gtkplug-info.patch 
Log Message:
Updated to openvrml-0.16.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Nov 2006 14:53:10 -0000	1.2
+++ .cvsignore	30 Nov 2006 07:33:40 -0000	1.3
@@ -1 +1 @@
-openvrml-0.16.1.tar.gz
+openvrml-0.16.2.tar.gz


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openvrml.spec	28 Nov 2006 04:43:39 -0000	1.4
+++ openvrml.spec	30 Nov 2006 07:33:40 -0000	1.5
@@ -1,12 +1,11 @@
 # -*- rpm-spec -*-
 Name:           openvrml
-Version:        0.16.1
-Release:        5%{?dist}
+Version:        0.16.2
+Release:        1%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPL
 Group:          System Environment/Libraries
-Source:         http://prdownloads.sf.net/openvrml/%{name}-%{version}.tar.gz
-Patch:          openvrml-gtkplug-info.patch
+Source:         http://downloads.sf.net/openvrml/%{name}-%{version}.tar.gz
 URL:            http://openvrml.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig >= 0.12.0
@@ -80,8 +79,6 @@
 %prep
 %setup
 
-%patch -p1
-
 %build
 %configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG"
 %{__make} %{?_smp_mflags}
@@ -150,6 +147,10 @@
 
 
 %changelog
+* Thu Nov 30 2006  Braden McDaniel   - 0.16.2-1
+- Updated to 0.16.2; openvrml-gtkplug-info.patch is no longer
+  necessary.
+
 * Mon Nov 27 2006  Braden McDaniel   - 0.16.1-5
 - openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
   development headers are not wise to gcc symbol visibility mojo and as


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Nov 2006 14:53:10 -0000	1.2
+++ sources	30 Nov 2006 07:33:40 -0000	1.3
@@ -1 +1 @@
-6628c0d18078805d2b662b3509f537d3  openvrml-0.16.1.tar.gz
+8f93af7603ac8ddb22897658ccedc754  openvrml-0.16.2.tar.gz


--- openvrml-gtkplug-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 30 09:37:07 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 30 Nov 2006 04:37:07 -0500
Subject: rpms/audacious/devel .cvsignore, 1.6, 1.7 audacious.spec, 1.17,
	1.18 sources, 1.6, 1.7
Message-ID: <200611300937.kAU9b7en001435@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1416

Modified Files:
	.cvsignore audacious.spec sources 
Log Message:

- Update to 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Nov 2006 18:37:53 -0000	1.6
+++ .cvsignore	30 Nov 2006 09:36:37 -0000	1.7
@@ -1 +1 @@
-audacious-1.2.1.tgz
+audacious-1.2.2.tgz


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audacious.spec	26 Nov 2006 18:33:48 -0000	1.17
+++ audacious.spec	30 Nov 2006 09:36:37 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           audacious
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
@@ -12,7 +12,7 @@
 Patch1:         audacious-1.1.0-default-skin.patch
 # Patch2:         audacious-1.1.0-no-rpath.patch
 Patch3:         audacious-1.2.1-relative-links.patch
-Patch4:         audacious-1.1.0-quoting.patch
+# Patch4:         audacious-1.1.0-quoting.patch
 # Patch5:         audacious-1.1.0-amidi-backend.patch
 Patch6:         audacious-1.2.1-shaded-skin.patch
 Patch7:         audacious-1.1.1-controlsocket-name.patch
@@ -80,7 +80,7 @@
 %patch3 -p1 -b .relative-links
 
 # Filename quoting
-%patch4 -p1 -b .quoting
+# %patch4 -p1 -b .quoting
 
 # Amidi backends path
 # %patch5 -p1 -b .amidi-backend
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Sun Nov 30 2006 Ralf Ertzinger  1.2.2-1.fc7
+- Update to 1.2.2
+
 * Sun Nov 26 2006 Ralf Ertzinger  1.2.1-1.fc7
 - Update to 1.2.1
 - Split off libaudacious into a separate package to handle the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Nov 2006 18:37:53 -0000	1.6
+++ sources	30 Nov 2006 09:36:37 -0000	1.7
@@ -1 +1 @@
-f718f66ec0cab46bf6210d2243d12be1  audacious-1.2.1.tgz
+e774afbda04220e6e1b0a9bff350522e  audacious-1.2.2.tgz



From fedora-extras-commits at redhat.com  Thu Nov 30 09:46:14 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 30 Nov 2006 04:46:14 -0500
Subject: rpms/audacious-plugins/devel .cvsignore, 1.2,
	1.3 audacious-plugins.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611300946.kAU9kEan001635@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1616

Modified Files:
	.cvsignore audacious-plugins.spec sources 
Log Message:

- Update to 1.2.5
- Add audacious-plugins-wavpack for WavPack input plugin
- Drop cddb patch, included upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 18:25:47 -0000	1.2
+++ .cvsignore	30 Nov 2006 09:45:44 -0000	1.3
@@ -1 +1 @@
-audacious-plugins-fedora-1.2.2.tar.gz
+audacious-plugins-fedora-1.2.5.tar.gz


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audacious-plugins.spec	26 Nov 2006 18:39:51 -0000	1.2
+++ audacious-plugins.spec	30 Nov 2006 09:45:44 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           audacious-plugins
-Version:        1.2.2
+Version:        1.2.5
 Release:        1%{?dist}
 Summary:        Plugins for the Audacious media player
 
@@ -25,6 +25,7 @@
 BuildRequires:  arts-devel, libmodplug-devel, lirc-devel
 BuildRequires:  jack-audio-connection-kit-devel, libsamplerate-devel
 BuildRequires:  pulseaudio-devel, fluidsynth-devel
+BuildRequires:  wavpack-devel >= 4.31
 
 Requires:       audacious >= 1.2.0
 
@@ -99,11 +100,23 @@
 
 
 
+%package        wavpack
+Summary:        Audacious imput plugin for wavpack
+Group:          Applications/Multimedia
+
+Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0
+
+%description    wavpack
+This package provides an Audacious input plugin that reads WavPack
+compressed files.
+
+
+
 %prep
 %setup -q -n audacious-plugins-fedora-%{version}
 
 # Fix incorrect use of sprintf in the cdaudio plugin
-%patch0 -p1 -b .cddb-buffer
+# %patch0 -p1 -b .cddb-buffer
 
 %build
 %configure \
@@ -145,6 +158,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_libdir}/audacious
 %exclude %{_libdir}/audacious/Input/libamidi-plug.so
+%exclude %{_libdir}/audacious/Input/libwavpack.so
 %exclude %{_libdir}/audacious/Output/libjackout.so
 %exclude %{_libdir}/audacious/Output/libarts.so
 %exclude %{_libdir}/audacious/Output/libESD.so
@@ -152,6 +166,7 @@
 %{_datadir}/applications/fedora-audacious-plugins.desktop
 %{_datadir}/audacious/images/audioscrobbler.png
 %{_datadir}/audacious/images/audioscrobbler_badge.png
+%{_datadir}/audacious-plugins/paranormal
 
 %files jack
 %defattr(-,root,root,-)
@@ -175,7 +190,16 @@
 %{_libdir}/audacious/Input/libamidi-plug.so
 %{_libdir}/amidi-plug
 
+%files wavpack
+%defattr(-,root,root,-)
+%{_libdir}/audacious/Input/libwavpack.so
+
 
 %changelog
+* Thu Nov 30 2006 Ralf Ertzinger  1.2.5-1.fc7
+- Update to 1.2.5
+- Add audacious-plugins-wavpack for WavPack input plugin
+- Drop cddb patch, included upstream
+
 * Sun Nov 26 2006 Ralf Ertzinger  1.2.2-1.fc7
 - Initial RPM build for FE


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 18:25:47 -0000	1.2
+++ sources	30 Nov 2006 09:45:44 -0000	1.3
@@ -1 +1 @@
-8ac7f73da7432e1ffed6c2b9b0fced8c  audacious-plugins-fedora-1.2.2.tar.gz
+85311ebd8580d372fb3f7e0733185514  audacious-plugins-fedora-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 10:53:55 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 30 Nov 2006 05:53:55 -0500
Subject: extras-buildsys/utils/pushscript WhatsNew.py,NONE,1.1
Message-ID: <200611301054.kAUArtxT004968@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4954

Added Files:
	WhatsNew.py 
Log Message:
trying something


--- NEW FILE WhatsNew.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 errno, os, sys
import fnmatch
import pickle
import rpmUtils.transaction, rpmUtils.miscutils

import Utils

names = {}

def rebuild(dist,srcdir):
    ts = rpmUtils.transaction.initReadOnlyTransaction()

    # Create map of maps: dist -> src.rpm %name -> True
    names.setdefault(dist,{})
   
    for root, dirs, files in os.walk(srcdir):
            for f in fnmatch.filter(files,'*.src.rpm'):
                srcfile = os.path.join(root,f)
                hdr = rpmUtils.miscutils.hdrFromPackage(ts,srcfile)
                set(dist,hdr['name'])


def set(dist,name):
    names[dist].setdefault(name,True)


def get(dist,name):
    return names[dist].has_key(name)


def save(workdir):
    f = file(os.path.join(workdir,'pkgnamesdict.pickle'),'w')
    pickle.dump(names,f)
    f.close()


def load(workdir):
    global names
    names = {}
    try:
        f = file(os.path.join(workdir,'pkgnamesdict.pickle'),'r')
    except:
        return
    names = pickle.load(f)
    f.close()


def main(cfg):
    global names
    names = {}
    for dist in cfg.alldists:
        srcdir = os.path.join(cfg.treedir,dist,'SRPMS')
        rebuild(dist,srcdir)
    save(cfg.rundir)


if __name__ == '__main__':
    if len(sys.argv) < 2:
        print 'Usage: %s \n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)

    cfg = Utils.load_config_module(sys.argv[1])

    Utils.signer_gid_check(cfg.signersgid)
    os.umask(cfg.signersumask)
    
    main(cfg)
    sys.exit(0)



From fedora-extras-commits at redhat.com  Thu Nov 30 10:56:49 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 30 Nov 2006 05:56:49 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.19,1.20
Message-ID: <200611301056.kAUAunBl005002@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4987

Modified Files:
	Push.py 
Log Message:
trying something


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Push.py	25 Nov 2006 21:07:43 -0000	1.19
+++ Push.py	30 Nov 2006 10:56:49 -0000	1.20
@@ -24,7 +24,7 @@
 import tempfile
 import time
 
-import Utils, MultiLib, Comps
+import Utils, MultiLib, Comps, WhatsNew
 import RepoBuild, RepoPrune, RepoView
 
 DEBUG = False
@@ -365,7 +365,17 @@
     if not os.path.exists(destloc):
         rollback.append(destloc)
         Utils.install_move(package,destloc)
-        buildreportinfo = '%s-%s-%s\n' % (n,v,r)
+        if WhatsNew.get(dist,name):
+            buildreportinfo = '%s-%s-%s\n' % (n,v,r)
+        else:
+            tmp1 = '%s-%s-%s' % (n,v,r)
+            tmp1len = len(tmp1)
+            linelen = 66
+            if tmp1len < linelen:
+                buildreportinfo = tmp1+' '*(linelen-tmp1len)
+            else:
+                buildreportinfo = tmp1+'    '
+            buildreportinfo += 'NEW\n'
     else:  # src.rpm published before, exclude entire build job
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
         buildreportinfo = 'Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
@@ -487,6 +497,8 @@
     repolock.unlock()
 
     try:
+        WhatsNew.load(cfg.rundir)
+        
         print "Signing Packages:"
         rv = sign_pkgs( find_files(signtmpdir,'*.rpm') )
         if rv:
@@ -515,6 +527,9 @@
                     print e
                 except rpmUtils.RpmUtilsError, e:
                     print e
+            WhatsNew.set(dist,name)
+        
+        WhatsNew.save(cfg.rundir)
     except:
         shutil.rmtree(signtmpdir)
         raise



From fedora-extras-commits at redhat.com  Thu Nov 30 11:33:18 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:33:18 -0500
Subject: rpms/tachyon - New directory
Message-ID: <200611301133.kAUBXIjY008233@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8229/tachyon

Log Message:
Directory /cvs/extras/rpms/tachyon added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 11:33:23 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:33:23 -0500
Subject: rpms/tachyon/devel - New directory
Message-ID: <200611301133.kAUBXN3s008246@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8229/tachyon/devel

Log Message:
Directory /cvs/extras/rpms/tachyon/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 11:33:41 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:33:41 -0500
Subject: rpms/tachyon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611301133.kAUBXfI7008291@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8270/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tachyon


--- 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 Nov 30 11:33:41 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:33:41 -0500
Subject: rpms/tachyon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611301133.kAUBXfLc008276@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8270

Added Files:
	Makefile import.log 
Log Message:
Setup of module tachyon


--- NEW FILE Makefile ---
# Top level Makefile for module tachyon
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 Nov 30 11:53:21 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:53:21 -0500
Subject: rpms/tachyon import.log,1.1,1.2
Message-ID: <200611301153.kAUBrLZl008432@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8396

Modified Files:
	import.log 
Log Message:
auto-import tachyon-0.97-2 on branch devel from tachyon-0.97-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tachyon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 11:33:41 -0000	1.1
+++ import.log	30 Nov 2006 11:52:51 -0000	1.2
@@ -0,0 +1 @@
+tachyon-0_97-2:HEAD:tachyon-0.97-2.src.rpm:1164887822



From fedora-extras-commits at redhat.com  Thu Nov 30 11:53:22 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:53:22 -0500
Subject: rpms/tachyon/devel tachyon-rpm.patch, NONE, 1.1 tachyon.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611301153.kAUBrM1D008436@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tachyon-rpm.patch tachyon.spec 
Log Message:
auto-import tachyon-0.97-2 on branch devel from tachyon-0.97-2.src.rpm

tachyon-rpm.patch:

--- NEW FILE tachyon-rpm.patch ---
--- tachyon/unix/Make-arch.r	2005-03-18 16:28:05.000000000 +0100
+++ tachyon/unix/Make-arch	2006-11-29 19:54:45.000000000 +0100
@@ -15,7 +15,7 @@
 
 MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
 MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC)
-MISCFLAGS=$(MISCDEFS) $(MISCINC)
+MISCFLAGS=$(MISCDEFS) $(MISCINC) $(OPTFLAGS)
 MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
 
 default:
@@ -915,7 +915,7 @@
 	"CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
 
@@ -927,7 +927,7 @@
 	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
 
@@ -936,10 +936,10 @@
 	$(MAKE) all \
 	"ARCH = linux-64-thr" \
 	"CC = gcc" \
-	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
+	"CFLAGS = -m64 -Wall -O2 -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
 
@@ -1035,10 +1035,10 @@
 	$(MAKE) all \
 	"ARCH = linux-thr" \
 	"CC = gcc" \
-	"CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
 
@@ -1047,7 +1047,7 @@
 	$(MAKE) all \
 	"ARCH = linux-thr-ogl" \
 	"CC = cc" \
-	"CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
 	"STRIP = touch" \
@@ -1081,37 +1081,61 @@
 linux-lam:
 	$(MAKE) all \
 	"ARCH = linux-lam" \
-	"CC = hcc" \
-	"CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+	"CC = mpicc" \
+	"CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
+
+# Linux x86 using LAM MPI, with OpenGL display
+linux-lam-ogl:
+	$(MAKE) all \
+	"ARCH = linux-lam-ogl" \
+	"CC = mpicc" \
+	"CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
-	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
 
 # Linux AMD64/EM64T using LAM MPI
-linux-lam-64:
+linux-64-lam:
 	$(MAKE) all \
-	"ARCH = linux-lam-64" \
-	"CC = hcc" \
-	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
+	"ARCH = linux-64-lam" \
+	"CC = mpicc" \
+	"CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
-	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
 
 # Linux AMD64/EM64T using LAM MPI, with OpenGL display
-linux-lam-64-ogl:
+linux-64-lam-ogl:
 	$(MAKE) all \
-	"ARCH = linux-lam-64-ogl" \
-	"CC = hcc" \
-	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"ARCH = linux-64-lam-ogl" \
+	"CC = mpicc" \
+	"CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using threads with OpenGL display
+linux-64-thr-ogl:
+	$(MAKE) all \
+	"ARCH = linux-64-thr-ogl" \
+	"CC = gcc" \
+	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
-	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
 
 # Linux x86 using LAM MPI and threads
 linux-lam-thr:
@@ -1149,6 +1173,54 @@
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
 
+# Linux PPC using gcc and threads
+linux-ppc-thr:
+	$(MAKE) all \
+	"ARCH = linux-ppc-thr" \
+	"CC = gcc" \
+	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
+
+# Linux PPC using threads with OpenGL display
+linux-ppc-thr-ogl:
+	$(MAKE) all \
+	"ARCH = linux-ppc-thr-ogl" \
+	"CC = gcc" \
+	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
+
+# Linux AMD64/EM64T using LAM MPI
+linux-ppc-lam:
+	$(MAKE) all \
+	"ARCH = linux-ppc-lam" \
+	"CC = mpicc" \
+	"CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using LAM MPI, with OpenGL display
+linux-ppc-lam-ogl:
+	$(MAKE) all \
+	"ARCH = linux-ppc-lam-ogl" \
+	"CC = mpicc" \
+	"CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
 # Linux PPC using gcc 
 linux-ps2:
 	$(MAKE) all \
--- tachyon/unix/Make-config.r	2004-03-05 20:41:03.000000000 +0100
+++ tachyon/unix/Make-config	2006-11-29 19:51:01.000000000 +0100
@@ -57,7 +57,7 @@
 ##########################################################################
 
 # Standard MPICH installation location
-MPIDIR=/usr/local/mpi
+MPIDIR=/usr
 
 # UMR CS Dept
 #MPIDIR=/software/all/mpi
@@ -108,14 +108,14 @@
 #   http://www.ijg.org/files/
 ##########################################################################
 # Uncomment the following lines to disable JPEG support
-USEJPEG=
-JPEGINC=
-JPEGLIB=
+#USEJPEG=
+#JPEGINC=
+#JPEGLIB=
 
 # Uncomment the following lines to enable JPEG support
-#USEJPEG= -DUSEJPEG
-#JPEGINC= -I/usr/local/include
-#JPEGLIB= -L/usr/local/lib -ljpeg
+USEJPEG= -DUSEJPEG
+JPEGINC= 
+JPEGLIB= -ljpeg
 
 
 ##########################################################################
@@ -128,14 +128,14 @@
 #   http://www.libpng.org/
 ##########################################################################
 # Uncomment the following lines to disable PNG support
-USEPNG=
-PNGINC=
-PNGLIB=
+#USEPNG=
+#PNGINC=
+#PNGLIB=
 
 # Uncomment the following lines to enable PNG support
-#USEPNG= -DUSEPNG
-#PNGINC= -I/usr/local/include
-#PNGLIB= -L/usr/local/lib -lpng -lz
+USEPNG= -DUSEPNG
+PNGINC= `pkg-config --cflags libpng`
+PNGLIB= `pkg-config --libs libpng`
 
 
 ##########################################################################
--- tachyon/unix/Make-opengl.r	2004-02-04 07:36:06.000000000 +0100
+++ tachyon/unix/Make-opengl	2006-11-29 19:51:01.000000000 +0100
@@ -9,8 +9,8 @@
 #
 # Generic Mesa OpenGL / GLX include and link specs, for most platforms
 #
-MESA_GLX_INCS = -I/usr/local/include
-MESA_GLX_LIBS = -L/usr/local/lib -lMesaGL -lMesaGLU
+MESA_GLX_INCS = 
+MESA_GLX_LIBS = -lGL -lGLU -lX11
 
 
 #
@@ -37,8 +37,8 @@
 #
 # Linux OpenGL / GLX include and link specs
 #
-LINUX_GLX_INCS = -I/usr/X11R6/include
-LINUX_GLX_LIBS = -L/usr/X11R6/lib -lGL -lGLU -lX11
+LINUX_GLX_INCS = 
+LINUX_GLX_LIBS = -lGL -lGLU -lX11
 
 
 #


--- NEW FILE tachyon.spec ---
%ifarch %{ix86}
%define target linux
%endif
%ifarch x86_64
%define target linux-64
%endif
%ifarch ppc
%define target linux-ppc
%endif

Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
Version: 0.97
Release: 2%{?dist}
URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
Group: Applications/Engineering
Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz
Patch0: %{name}-rpm.patch
License: BSD
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: mesa-libGLU-devel
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: lam-devel

%description
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations.  Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application.  The distribution also includes a simple scene
file parser front-end which reads a few different formats.

This package contains pthread build.

%package gl
Summary: Parallel / Multiprocessor Ray Tracing System
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}

%description gl
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations.  Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application.  The distribution also includes a simple scene
file parser front-end which reads a few different formats.

This package contains pthread build with OpenGL display.

%package lam
Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}

%description lam
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations.  Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application.  The distribution also includes a simple scene
file parser front-end which reads a few different formats.

This package contains LAM build.

%package lam-gl
Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}

%description lam-gl
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations.  Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application.  The distribution also includes a simple scene
file parser front-end which reads a few different formats.

This package contains LAM build with OpenGL display.

%package docs
Summary: Documentation and example scenes for tachyon
Group: Documentation
Requires: %{name} = %{version}-%{release}

%description docs
This package contains documentation and example scenes for rendering
with tachyon.

%prep
%setup -q -n %{name}
%patch0 -p1 -b .r
find . -name CVS | xargs %{__rm} -rf
chmod 644 src/hash.*
chmod 644 demosrc/trackball.c
chmod 644 scenes/imaps/*

%build
pushd unix
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr-ogl
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam-ogl
popd

%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon}
for variant in -thr -thr-ogl -lam -lam-ogl ; do
  install -pm755 compile/%{target}$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon$variant
done
rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
%{__rm} docs/tachyon/images.idx
%{__mv} docs/tachyon docs/html
%{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}

%files gl
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-ogl

%files lam
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-lam

%files lam-gl
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-lam-ogl

%files docs
%defattr(644,root,root,755)
%doc docs/tachyon.pdf docs/tachyon.ps docs/html
%{_datadir}/tachyon

%changelog
* Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski  0.97-2
- use only kosher CFLAGS
- fix target setting

* Tue Nov 28 2006 Dominik 'Rathann' Mierzejewski  0.97-1
- initial build
- patch to add necessary build targets


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tachyon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 11:33:41 -0000	1.1
+++ .cvsignore	30 Nov 2006 11:52:52 -0000	1.2
@@ -0,0 +1 @@
+tachyon-0.97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tachyon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 11:33:41 -0000	1.1
+++ sources	30 Nov 2006 11:52:52 -0000	1.2
@@ -0,0 +1 @@
+198953aea283a7158eef2ee079e909f6  tachyon-0.97.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 12:09:39 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 07:09:39 -0500
Subject: owners owners.list,1.2038,1.2039
Message-ID: <200611301209.kAUC9dqT011601@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11586

Modified Files:
	owners.list 
Log Message:
Add myself as the maintainer of tachyon


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2038
retrieving revision 1.2039
diff -u -r1.2038 -r1.2039
--- owners.list	30 Nov 2006 06:53:07 -0000	1.2038
+++ owners.list	30 Nov 2006 12:09:08 -0000	1.2039
@@ -2274,6 +2274,7 @@
 Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|jamatos at fc.up.pt,roozbeh at farsiweb.info
 Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|jamatos at fc.up.pt,roozbeh at farsiweb.info
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
+Fedora Extras|tachyon|Parallel / Multiprocessor Ray Tracing System|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tango-icon-theme|Icons from Tango Project|raven at pmail.pl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 13:29:59 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 30 Nov 2006 08:29:59 -0500
Subject: rpms/k3d/FC-5 .cvsignore,1.4,1.5 k3d.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200611301329.kAUDTxWO015568@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15547

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Aug 2006 11:38:10 -0000	1.4
+++ .cvsignore	30 Nov 2006 13:29:29 -0000	1.5
@@ -1 +1 @@
-k3d-0.6.0.0-src.tar.bz2
+k3d-0.6.4.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-5/k3d.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- k3d.spec	22 Aug 2006 11:41:41 -0000	1.3
+++ k3d.spec	30 Nov 2006 13:29:29 -0000	1.4
@@ -1,7 +1,7 @@
 
 Name:           k3d
-Version:        0.6.0.0
-Release:        1%{?dist}.1
+Version:        0.6.4.0
+Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Denis Leroy  - 0.6.4.0-1
+- Update to 0.6.4.0
+
 * Tue Aug 22 2006 Denis Leroy  - 0.6.0.0-1.1
 - Updated sources
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Aug 2006 11:38:10 -0000	1.4
+++ sources	30 Nov 2006 13:29:29 -0000	1.5
@@ -1 +1 @@
-c9642b1483ddd3e1adc6d4118ba677e4  k3d-0.6.0.0-src.tar.bz2
+3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 13:47:57 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 30 Nov 2006 08:47:57 -0500
Subject: rpms/wbxml2/FC-5 wbxml2.spec,1.9,1.10
Message-ID: <200611301347.kAUDlvwN015693@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15631/FC-5

Modified Files:
	wbxml2.spec 
Log Message:
- Use iconv instead of mock. Bug #217848.



Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-5/wbxml2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wbxml2.spec	29 Nov 2006 10:18:56 -0000	1.9
+++ wbxml2.spec	30 Nov 2006 13:47:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel zlib-devel popt 
-BuildRequires:  recode
 
 %description
 The WBXML Library (libwbxml) contains a library and its associated tools to
@@ -43,7 +42,7 @@
 
 # Recode to UTF-8 several doc files
 for file in ChangeLog README NEWS References; do
-  recode l1..utf8 $file
+  /usr/bin/iconv -f iso8859-1 -t utf-8 $file
 done
 
 # no line terminator, add one
@@ -87,6 +86,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Laurent Rineau  - 0.9.2-6
+- Use iconv instead of mock. Bug #217848.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
 - Changed the Summarys and descriptions.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 13:47:58 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 30 Nov 2006 08:47:58 -0500
Subject: rpms/wbxml2/FC-6 wbxml2.spec,1.10,1.11
Message-ID: <200611301348.kAUDlwII015696@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15631/FC-6

Modified Files:
	wbxml2.spec 
Log Message:
- Use iconv instead of mock. Bug #217848.



Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-6/wbxml2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wbxml2.spec	29 Nov 2006 10:18:56 -0000	1.10
+++ wbxml2.spec	30 Nov 2006 13:47:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel zlib-devel popt 
-BuildRequires:  recode
 
 %description
 The WBXML Library (libwbxml) contains a library and its associated tools to
@@ -43,7 +42,7 @@
 
 # Recode to UTF-8 several doc files
 for file in ChangeLog README NEWS References; do
-  recode l1..utf8 $file
+  /usr/bin/iconv -f iso8859-1 -t utf-8 $file
 done
 
 # no line terminator, add one
@@ -87,6 +86,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Laurent Rineau  - 0.9.2-6
+- Use iconv instead of mock. Bug #217848.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
 - Changed the Summarys and descriptions.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 13:48:02 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 30 Nov 2006 08:48:02 -0500
Subject: rpms/gparted/FC-6 gparted-parted-check.patch, NONE, 1.1 gparted.spec,
	1.14, 1.15
Message-ID: <200611301348.kAUDm2Hd015697@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15659

Modified Files:
	gparted.spec 
Added Files:
	gparted-parted-check.patch 
Log Message:
* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
- Rebuild for new parted


gparted-parted-check.patch:

--- NEW FILE gparted-parted-check.patch ---
--- configure.in	2006/09/11 09:46:42	1.62
+++ configure.in	2006/09/14 20:34:49	1.63
@@ -33,7 +33,8 @@
 AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
 
 dnl libparted
-AC_MSG_CHECKING(for libparted >= 1.7.1)
+LIBPARTED_VERSION=1.7.1
+AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
 LDFLAGS=-lparted
 AC_TRY_RUN(
 #include 
@@ -41,16 +42,28 @@
 
 int main ()
 {
+	int min_major ;
+	int min_minor ;
+	int min_micro ;
 	int major ;
 	int minor ;
 	int micro ;
 
-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
-		printf( "Found libparted %s\t", ped_get_version() ) ;
+	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
+	{
+		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+		{
+			printf( "Found libparted %s\t", ped_get_version() ) ;
+
+			return ! ((major > min_major) ||
+           			 ((major == min_major) && (minor > min_minor)) ||
+           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
+		}
+	}
 
-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
+	return 1 ;
 }
-,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= 1.7.1) )
+,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= $LIBPARTED_VERSION) )
 
 
 dnl GTKMM


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-6/gparted.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gparted.spec	13 Sep 2006 22:36:12 -0000	1.14
+++ gparted.spec	30 Nov 2006 13:47:32 -0000	1.15
@@ -1,15 +1,18 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Patch0: gparted-parted-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires: desktop-file-utils
+#Temporarily
+BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -20,8 +23,12 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .parted
 
 %build
+aclocal
+automake
+autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -77,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
+- Rebuild for new parted
+
 * Wed Sep 13 2006 Deji Akingunola  - 0.3.1-1
 - New version 0.3.1
 



From fedora-extras-commits at redhat.com  Thu Nov 30 13:48:03 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 30 Nov 2006 08:48:03 -0500
Subject: rpms/wbxml2/devel wbxml2.spec,1.10,1.11
Message-ID: <200611301348.kAUDm3aj015700@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15631/devel

Modified Files:
	wbxml2.spec 
Log Message:
- Use iconv instead of mock. Bug #217848.



Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/devel/wbxml2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wbxml2.spec	29 Nov 2006 10:19:01 -0000	1.10
+++ wbxml2.spec	30 Nov 2006 13:47:33 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel zlib-devel popt 
-BuildRequires:  recode
 
 %description
 The WBXML Library (libwbxml) contains a library and its associated tools to
@@ -43,7 +42,7 @@
 
 # Recode to UTF-8 several doc files
 for file in ChangeLog README NEWS References; do
-  recode l1..utf8 $file
+  /usr/bin/iconv -f iso8859-1 -t utf-8 $file
 done
 
 # no line terminator, add one
@@ -87,6 +86,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Laurent Rineau  - 0.9.2-6
+- Use iconv instead of mock. Bug #217848.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
 - Changed the Summarys and descriptions.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 13:49:47 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 30 Nov 2006 08:49:47 -0500
Subject: rpms/gparted/FC-5 gparted-parted-check.patch, NONE, 1.1 gparted.spec,
	1.12, 1.13
Message-ID: <200611301349.kAUDnlDR015796@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15767

Modified Files:
	gparted.spec 
Added Files:
	gparted-parted-check.patch 
Log Message:
* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
- Rebuild for new parted


gparted-parted-check.patch:

--- NEW FILE gparted-parted-check.patch ---
--- configure.in	2006/09/11 09:46:42	1.62
+++ configure.in	2006/09/14 20:34:49	1.63
@@ -33,7 +33,8 @@
 AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
 
 dnl libparted
-AC_MSG_CHECKING(for libparted >= 1.7.1)
+LIBPARTED_VERSION=1.7.1
+AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
 LDFLAGS=-lparted
 AC_TRY_RUN(
 #include 
@@ -41,16 +42,28 @@
 
 int main ()
 {
+	int min_major ;
+	int min_minor ;
+	int min_micro ;
 	int major ;
 	int minor ;
 	int micro ;
 
-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
-		printf( "Found libparted %s\t", ped_get_version() ) ;
+	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
+	{
+		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+		{
+			printf( "Found libparted %s\t", ped_get_version() ) ;
+
+			return ! ((major > min_major) ||
+           			 ((major == min_major) && (minor > min_minor)) ||
+           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
+		}
+	}
 
-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
+	return 1 ;
 }
-,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= 1.7.1) )
+,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= $LIBPARTED_VERSION) )
 
 
 dnl GTKMM


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gparted.spec	13 Sep 2006 22:36:51 -0000	1.12
+++ gparted.spec	30 Nov 2006 13:49:17 -0000	1.13
@@ -1,15 +1,18 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Patch0: gparted-parted-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
-BuildRequires: e2fsprogs-devel gettext
+BuildRequires: e2fsprogs-devel gettext perl(XML::Parser)
 BuildRequires: desktop-file-utils
+#Temporarily
+BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -20,8 +23,12 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .parted
 
 %build
+aclocal
+automake
+autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -77,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
+- Rebuild for new parted
+
 * Wed Sep 13 2006 Deji Akingunola  - 0.3.1-1
 - New version 0.3.1
 



From fedora-extras-commits at redhat.com  Thu Nov 30 15:03:10 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 30 Nov 2006 10:03:10 -0500
Subject: rpms/gparted/FC-5 gparted-parted-check.patch, 1.1, 1.2 gparted.spec,
	1.13, 1.14
Message-ID: <200611301503.kAUF3Al4022525@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22498

Modified Files:
	gparted-parted-check.patch gparted.spec 
Log Message:
* Thu Nov 30 2006 Deji Akingunola  - 0.3.1-2
- Patch the generated configure to allow rebuild


gparted-parted-check.patch:

Index: gparted-parted-check.patch
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted-parted-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gparted-parted-check.patch	30 Nov 2006 13:49:17 -0000	1.1
+++ gparted-parted-check.patch	30 Nov 2006 15:02:40 -0000	1.2
@@ -43,3 +43,50 @@
  
  
  dnl GTKMM
+--- configure.keep	2006-09-11 05:39:49.000000000 -0400
++++ configure	2006-11-22 02:46:15.000000000 -0500
+@@ -22160,9 +22160,11 @@
+ fi
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for libparted >= 1.7.1" >&5
+-echo $ECHO_N "checking for libparted >= 1.7.1... $ECHO_C" >&6; }
+-LDFLAGS=-lparted
++LIBPARTED_VERSION=1.7.1
++{ echo "$as_me:$LINENO: checking for libparted >= $LIBPARTED_VERSION" >&5
++echo $ECHO_N "checking for libparted >= $LIBPARTED_VERSION... $ECHO_C" >&6; }
++LIBS_save="$LIBS"
++LIBS="-lparted"
+ if test "$cross_compiling" = yes; then
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+@@ -22181,14 +22183,26 @@
+ 
+ int main ()
+ {
++	int min_major ;
++	int min_minor ;
++	int min_micro ;
+ 	int major ;
+ 	int minor ;
+ 	int micro ;
+ 
+-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+-		printf( "Found libparted %s\t", ped_get_version() ) ;
++	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
++	{
++		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
++		{
++			printf( "Found libparted %s\t", ped_get_version() ) ;
++
++			return ! ((major > min_major) ||
++           			 ((major == min_major) && (minor > min_minor)) ||
++           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
++		}
++	}
+ 
+-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
++	return 1 ;
+ }
+ 
+ _ACEOF


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gparted.spec	30 Nov 2006 13:49:17 -0000	1.13
+++ gparted.spec	30 Nov 2006 15:02:40 -0000	1.14
@@ -1,18 +1,16 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gparted-parted-check.patch
+Patch0: gparted-parted-check2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser)
 BuildRequires: desktop-file-utils
-#Temporarily
-BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -26,9 +24,6 @@
 %patch0 -p0 -b .parted
 
 %build
-aclocal
-automake
-autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -84,6 +79,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Thu Nov 30 2006 Deji Akingunola  - 0.3.1-2
+- Patch the generated configure to allow rebuild
+
 * Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
 - Rebuild for new parted
 



From fedora-extras-commits at redhat.com  Thu Nov 30 15:08:31 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 30 Nov 2006 10:08:31 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.12, 1.13 ochusha.spec, 1.13,
	1.14 sources, 1.12, 1.13
Message-ID: <200611301508.kAUF8VWN022684@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22643

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Thu Nov 30 2006 Mamoru Tasaka  0.5.99.63.8-0.1.cvs061130
- 0.5.99.63.8 cvs 061130 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Nov 2006 15:10:33 -0000	1.12
+++ .cvsignore	30 Nov 2006 15:08:01 -0000	1.13
@@ -1 +1 @@
-ochusha-0.5.99.63.7-cvs061129.tar.bz2
+ochusha-0.5.99.63.8-cvs061130.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ochusha.spec	29 Nov 2006 15:11:32 -0000	1.13
+++ ochusha.spec	30 Nov 2006 15:08:01 -0000	1.14
@@ -1,8 +1,8 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.7
-%define              strtag          cvs061129
+%define              main_ver        0.5.99.63.8
+%define              strtag          cvs061130
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -155,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.7-0.1.cvs061129
-- 0.5.99.63.7 cvs 061129 (23:00 JST)
+* Thu Nov 30 2006 Mamoru Tasaka  0.5.99.63.8-0.1.cvs061130
+- 0.5.99.63.8 cvs 061130 (23:59 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Nov 2006 15:10:33 -0000	1.12
+++ sources	30 Nov 2006 15:08:01 -0000	1.13
@@ -1 +1 @@
-691eaa88b5c402f929bcac37734625e2  ochusha-0.5.99.63.7-cvs061129.tar.bz2
+7a3557076d5e673361a5a73c756befbe  ochusha-0.5.99.63.8-cvs061130.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 15:08:42 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 30 Nov 2006 10:08:42 -0500
Subject: rpms/jd/devel .cvsignore, 1.27, 1.28 jd.spec, 1.34, 1.35 sources,
	1.27, 1.28
Message-ID: <200611301508.kAUF8gGO022720@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22663

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Nov 30 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061130
- cvs 061130 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	28 Nov 2006 15:38:07 -0000	1.27
+++ .cvsignore	30 Nov 2006 15:08:12 -0000	1.28
@@ -1 +1 @@
-jd-1.8.1-cvs061128.tgz
+jd-1.8.1-cvs061130.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jd.spec	28 Nov 2006 15:38:07 -0000	1.34
+++ jd.spec	30 Nov 2006 15:08:12 -0000	1.35
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061128
+%define         strtag        cvs061130
 %define         repoid        22722
 
 
@@ -106,8 +106,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Nov 28 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061128
-- cvs 061128 (24:15 JST)
+* Thu Nov 30 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061130
+- cvs 061130 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	28 Nov 2006 15:38:07 -0000	1.27
+++ sources	30 Nov 2006 15:08:12 -0000	1.28
@@ -1 +1 @@
-bd4e2e11e608980dcd35d28ef8ab4e1f  jd-1.8.1-cvs061128.tgz
+d02411e2afcf06df689001133cd8ce54  jd-1.8.1-cvs061130.tgz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:10:50 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 30 Nov 2006 10:10:50 -0500
Subject: rpms/gparted/FC-5 gparted.spec,1.14,1.15
Message-ID: <200611301510.kAUFAoKh022803@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22771

Modified Files:
	gparted.spec 
Log Message:
Fix typo



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gparted.spec	30 Nov 2006 15:02:40 -0000	1.14
+++ gparted.spec	30 Nov 2006 15:10:20 -0000	1.15
@@ -1,12 +1,12 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 2%{?dist}.1
+Release: 2%{?dist}.2
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gparted-parted-check2.patch
+Patch0: gparted-parted-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser)



From fedora-extras-commits at redhat.com  Thu Nov 30 15:16:33 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:16:33 -0500
Subject: rpms/libnl - New directory
Message-ID: <200611301516.kAUFGXCf022958@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22954/libnl

Log Message:
Directory /cvs/extras/rpms/libnl added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 15:16:38 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:16:38 -0500
Subject: rpms/libnl/devel - New directory
Message-ID: <200611301516.kAUFGc9p022971@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22954/libnl/devel

Log Message:
Directory /cvs/extras/rpms/libnl/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 15:16:54 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:16:54 -0500
Subject: rpms/libnl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611301516.kAUFGs8E023001@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22995

Added Files:
	Makefile import.log 
Log Message:
Setup of module libnl


--- NEW FILE Makefile ---
# Top level Makefile for module libnl
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 Nov 30 15:17:00 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:17:00 -0500
Subject: rpms/libnl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611301517.kAUFH0ix023016@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22995/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libnl


--- 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 Nov 30 15:18:04 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:18:04 -0500
Subject: rpms/libnl/devel libnl-1.0-debuginfo.patch, NONE,
	1.1 libnl-Doxyfile-versionfix.patch, NONE, 1.1 libnl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611301518.kAUFI4CM023195@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23073/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libnl-1.0-debuginfo.patch libnl-Doxyfile-versionfix.patch 
	libnl.spec 
Log Message:
auto-import libnl-1.0-0.4.pre6 on branch devel from libnl-1.0-0.4.pre6.src.rpm

libnl-1.0-debuginfo.patch:

--- NEW FILE libnl-1.0-debuginfo.patch ---
--- libnl-1.0-pre6/lib/Makefile.orig	2006-11-28 16:03:08.442164047 -0500
+++ libnl-1.0-pre6/lib/Makefile	2006-11-28 16:03:16.530079501 -0500
@@ -58,7 +58,7 @@ distclean:
 
 install:
 	mkdir -p $(DESTDIR)$(libdir)/
-	install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir)
+	install -m 0755 $(OUT_SLIB) $(DESTDIR)$(libdir)
 	rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB)
 	$(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB)
 	rm -f $(DESTDIR)$(libdir)/$(LN_SLIB)

libnl-Doxyfile-versionfix.patch:

--- NEW FILE libnl-Doxyfile-versionfix.patch ---
--- libnl-1.0-pre6/doc/Doxyfile.orig	2006-11-29 11:01:56.626599706 -0500
+++ libnl-1.0-pre6/doc/Doxyfile	2006-11-29 11:02:03.009741514 -0500
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = libnl
-PROJECT_NUMBER         = 1.0-pre2
+PROJECT_NUMBER         = 1.0-pre6
 OUTPUT_DIRECTORY       = ./
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English


--- NEW FILE libnl.spec ---
%define alphatag pre6
Summary: Netlink socket support library
Name: libnl 
Version: 1.0 
Release:  0.4.%{alphatag}%{?dist} 
Source0: http://people.suug.ch/~tgr/libnl/files/libnl-1.0-pre6.tar.gz
URL: http://people.suug.ch/~tgr/libnl
License: LGPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, graphviz, tetex-latex, tetex-dvips, ghostscript

Patch0: libnl-1.0-debuginfo.patch
Patch1: libnl-Doxyfile-versionfix.patch

%description
libnl is the netlink assist library.  It provides infrastructure to make 
writing programs that use netlink sockets easier

%package devel
Summary: Header files for use with libnl development
Group: Development/Libraries
Requires: libnl = %{version} 

%description devel
The header files for use in development with libnl

%prep
%setup -q -n %{name}-%{version}-%{alphatag}
%patch0 -p1
%patch1 -p1

%build
%configure
%{__make} %{?_smp_mflags}
%{__make} gendoc

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/libnl.so.1*
%doc COPYING 
%doc doc/html

%files devel
%defattr(-,root,root,-)
%{_libdir}/libnl.so
%{_libdir}/pkgconfig/libnl-1.pc
%{_includedir}/*


%changelog
* Tue Nov 29 2006 Neil Horman  - 1.0-0.4.pre6%{?dist}
- Fixing more BuildRequires for bz 27336

* Tue Nov 29 2006 Neil Horman  - 1.0-0.3.pre6%{?dist}
- Add doxygen to BuildRequires

* Tue Nov 28 2006 Neil Horman  - 1.0-0.2.pre6%{?dist}
- More corrections for bz 217366

* Mon Nov 27 2006 Neil Horman  - 1.0-0.1.pre6%{?dist}
- Corrected packaging problems for Fedora Extras review (bz 217366)

* Wed Nov 22 2006 Neil Horman 
- built the package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 15:17:00 -0000	1.1
+++ .cvsignore	30 Nov 2006 15:17:34 -0000	1.2
@@ -0,0 +1 @@
+libnl-1.0-pre6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 15:17:00 -0000	1.1
+++ sources	30 Nov 2006 15:17:34 -0000	1.2
@@ -0,0 +1 @@
+0f57cb7085dc27e054691bff858613c9  libnl-1.0-pre6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:08 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:08 -0500
Subject: rpms/nagios/FC-4 nagios.spec,1.18,1.19 sources,1.9,1.10
Message-ID: <200611301518.kAUFI82M023205@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/FC-4

Modified Files:
	nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nagios.spec	3 Aug 2006 04:25:16 -0000	1.18
+++ nagios.spec	30 Nov 2006 15:17:38 -0000	1.19
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,12 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
+* Thu Sep 07 2006 Mike McGrath  2.5-3
+- Release bump for mass rebuild
+
 * Wed Aug 02 2006 Mike McGrath  2.5-2
 - Fixed default permissions for private and the resource file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2006 15:49:29 -0000	1.9
+++ sources	30 Nov 2006 15:17:38 -0000	1.10
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:04 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:18:04 -0500
Subject: rpms/libnl import.log,1.1,1.2
Message-ID: <200611301518.kAUFI4sO023191@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23073

Modified Files:
	import.log 
Log Message:
auto-import libnl-1.0-0.4.pre6 on branch devel from libnl-1.0-0.4.pre6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libnl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 15:16:54 -0000	1.1
+++ import.log	30 Nov 2006 15:17:34 -0000	1.2
@@ -0,0 +1 @@
+libnl-1_0-0_4_pre6:HEAD:libnl-1.0-0.4.pre6.src.rpm:1164900000



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:08 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:08 -0500
Subject: rpms/nagios/FC-3 nagios.spec,1.11,1.12 sources,1.6,1.7
Message-ID: <200611301518.kAUFI8X7023201@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/FC-3

Modified Files:
	nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/nagios.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nagios.spec	3 Aug 2006 04:25:16 -0000	1.11
+++ nagios.spec	30 Nov 2006 15:17:38 -0000	1.12
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,12 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
+* Thu Sep 07 2006 Mike McGrath  2.5-3
+- Release bump for mass rebuild
+
 * Wed Aug 02 2006 Mike McGrath  2.5-2
 - Fixed default permissions for private and the resource file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2006 15:49:28 -0000	1.6
+++ sources	30 Nov 2006 15:17:38 -0000	1.7
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:13 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:13 -0500
Subject: rpms/nagios/FC-5 nagios.spec,1.18,1.19 sources,1.8,1.9
Message-ID: <200611301518.kAUFIDnH023235@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/FC-5

Modified Files:
	nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nagios.spec	3 Aug 2006 04:25:17 -0000	1.18
+++ nagios.spec	30 Nov 2006 15:17:43 -0000	1.19
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,12 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
+* Thu Sep 07 2006 Mike McGrath  2.5-3
+- Release bump for mass rebuild
+
 * Wed Aug 02 2006 Mike McGrath  2.5-2
 - Fixed default permissions for private and the resource file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2006 15:49:35 -0000	1.8
+++ sources	30 Nov 2006 15:17:43 -0000	1.9
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:14 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:14 -0500
Subject: rpms/nagios/FC-6 nagios.spec,1.25,1.26 sources,1.9,1.10
Message-ID: <200611301518.kAUFIEVe023239@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/FC-6

Modified Files:
	nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-6/nagios.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nagios.spec	7 Sep 2006 17:07:35 -0000	1.25
+++ nagios.spec	30 Nov 2006 15:17:44 -0000	1.26
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 3%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
 * Thu Sep 07 2006 Mike McGrath  2.5-3
 - Release bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2006 15:49:35 -0000	1.9
+++ sources	30 Nov 2006 15:17:44 -0000	1.10
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:14 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:14 -0500
Subject: rpms/nagios/devel .cvsignore, 1.9, 1.10 nagios.spec, 1.25,
	1.26 sources, 1.9, 1.10
Message-ID: <200611301518.kAUFIEm9023244@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/devel

Modified Files:
	.cvsignore nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jul 2006 15:49:35 -0000	1.9
+++ .cvsignore	30 Nov 2006 15:17:44 -0000	1.10
@@ -1 +1 @@
-nagios-2.5.tar.gz
+nagios-2.6.tar.gz


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nagios.spec	7 Sep 2006 17:07:35 -0000	1.25
+++ nagios.spec	30 Nov 2006 15:17:44 -0000	1.26
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 3%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
 * Thu Sep 07 2006 Mike McGrath  2.5-3
 - Release bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2006 15:49:35 -0000	1.9
+++ sources	30 Nov 2006 15:17:44 -0000	1.10
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:22:47 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:22:47 -0500
Subject: owners owners.list,1.2039,1.2040
Message-ID: <200611301522.kAUFMlIc023506@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23486

Modified Files:
	owners.list 
Log Message:
adding libnl entry to owners file



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2039
retrieving revision 1.2040
diff -u -r1.2039 -r1.2040
--- owners.list	30 Nov 2006 12:09:08 -0000	1.2039
+++ owners.list	30 Nov 2006 15:22:17 -0000	1.2040
@@ -963,6 +963,7 @@
 Fedora Extras|libnetfilter_conntrack|Netfilter conntrack userspace library|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|libnfnetlink|Netfilter netlink userspace library|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
+Fedora Extras|libnl|Library for managing netlink sockets|nhorman at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libofa|Open Fingerprint Architecture library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 15:25:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 30 Nov 2006 10:25:13 -0500
Subject: rpms/qtparted/FC-6 qtparted.spec,1.17,1.18
Message-ID: <200611301525.kAUFPDrI023573@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23531

Modified Files:
	qtparted.spec 
Log Message:
Sync with devel.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/FC-6/qtparted.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qtparted.spec	28 Aug 2006 19:45:48 -0000	1.17
+++ qtparted.spec	30 Nov 2006 15:24:43 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -18,7 +18,7 @@
 
 BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 1.6.6
 BuildRequires:  desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
-BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs
+BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs, ntfsprogs-devel
 BuildRequires:  automake, perl, autoconf
 Requires:       usermode-gtk, e2fsprogs, jfsutils, xfsprogs
 
@@ -41,8 +41,7 @@
 
 %configure \
   --with-log-dir=%{_localstatedir}/log \
-  --disable-reiserfs \
-  --disable-ntfs
+  --disable-reiserfs
 make %{?_smp_mflags}
 
 
@@ -54,7 +53,6 @@
   --vendor fedora \
   --mode 644 \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   $RPM_BUILD_ROOT%{_datadir}/applnk/System/qtparted.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 ln -s %{_datadir}/qtparted/pics/qtparted_32.png \
@@ -108,6 +106,13 @@
 
 
 %changelog
+* Tue Nov 21 2006 Steven Pritchard  - 0.4.5-11
+- Yet another rebuild.
+
+* Fri Oct 27 2006 Steven Pritchard  - 0.4.5-10
+- Enable ntfs support.
+- Make desktop-file-install happy with our categories again.
+
 * Mon Aug 28 2006 Steven Pritchard  - 0.4.5-9
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 15:27:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 30 Nov 2006 10:27:53 -0500
Subject: rpms/qtparted/FC-5 qtparted.spec,1.13,1.14
Message-ID: <200611301527.kAUFRrSP023693@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23676

Modified Files:
	qtparted.spec 
Log Message:
Sync with devel.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/FC-5/qtparted.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qtparted.spec	30 Aug 2006 18:37:53 -0000	1.13
+++ qtparted.spec	30 Nov 2006 15:27:23 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -18,7 +18,7 @@
 
 BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 1.6.6
 BuildRequires:  desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
-BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs
+BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs, ntfsprogs-devel
 BuildRequires:  automake, perl, autoconf
 Requires:       usermode-gtk, e2fsprogs, jfsutils, xfsprogs
 
@@ -41,8 +41,7 @@
 
 %configure \
   --with-log-dir=%{_localstatedir}/log \
-  --disable-reiserfs \
-  --disable-ntfs
+  --disable-reiserfs
 make %{?_smp_mflags}
 
 
@@ -54,7 +53,6 @@
   --vendor fedora \
   --mode 644 \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   $RPM_BUILD_ROOT%{_datadir}/applnk/System/qtparted.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 ln -s %{_datadir}/qtparted/pics/qtparted_32.png \
@@ -108,6 +106,13 @@
 
 
 %changelog
+* Tue Nov 21 2006 Steven Pritchard  - 0.4.5-11
+- Yet another rebuild.
+
+* Fri Oct 27 2006 Steven Pritchard  - 0.4.5-10
+- Enable ntfs support.
+- Make desktop-file-install happy with our categories again.
+
 * Mon Aug 28 2006 Steven Pritchard  - 0.4.5-9
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 15:40:30 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 30 Nov 2006 10:40:30 -0500
Subject: rpms/k3d/FC-4 .cvsignore,1.3,1.4 k3d.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200611301540.kAUFeUBS024351@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24290

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Aug 2006 08:46:05 -0000	1.3
+++ .cvsignore	30 Nov 2006 15:40:00 -0000	1.4
@@ -1 +1 @@
-k3d-0.6.0.0-src.tar.bz2
+k3d-0.6.4.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-4/k3d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- k3d.spec	28 Aug 2006 08:46:05 -0000	1.4
+++ k3d.spec	30 Nov 2006 15:40:00 -0000	1.5
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.0.0
+Version:        0.6.4.0
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Denis Leroy  - 0.6.4.0-1
+- Update to 0.6.4.0
+
 * Mon Aug 28 2006 Denis Leroy  - 0.6.0.0-1
 - Update to 0.6.0.0
 - Split example documents into separate package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Aug 2006 08:46:05 -0000	1.3
+++ sources	30 Nov 2006 15:40:00 -0000	1.4
@@ -1 +1 @@
-c9642b1483ddd3e1adc6d4118ba677e4  k3d-0.6.0.0-src.tar.bz2
+3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 15:45:07 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 30 Nov 2006 10:45:07 -0500
Subject: rpms/rpmlint/EL-4 rpmlint.spec,1.13,1.14
Message-ID: <200611301545.kAUFj7Wg024601@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/rpmlint/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24584

Modified Files:
	rpmlint.spec 
Log Message:
add disttag



Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/EL-4/rpmlint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rpmlint.spec	20 Jun 2005 18:02:32 -0000	1.13
+++ rpmlint.spec	30 Nov 2006 15:44:37 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.70
-Release:        1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Tool for checking common errors in RPM packages
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Dennis Gilmore  - 0.70-1
+- add disttag
+
 * Mon Jun 20 2005 Ville Skytt??  - 0:0.70-1
 - 0.70, use sed instead of perl during build.
 - Default configuration improvements: allow Development/Debug group (for



From fedora-extras-commits at redhat.com  Thu Nov 30 16:45:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:45:27 -0500
Subject: rpms/wdm - New directory
Message-ID: <200611301645.kAUGjRFf028782@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28778/wdm

Log Message:
Directory /cvs/extras/rpms/wdm added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 16:45:33 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:45:33 -0500
Subject: rpms/wdm/devel - New directory
Message-ID: <200611301645.kAUGjXMA028795@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28778/wdm/devel

Log Message:
Directory /cvs/extras/rpms/wdm/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 16:45:50 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:45:50 -0500
Subject: rpms/wdm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611301645.kAUGjowo028825@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28819

Added Files:
	Makefile import.log 
Log Message:
Setup of module wdm


--- NEW FILE Makefile ---
# Top level Makefile for module wdm
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 Nov 30 16:45:56 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:45:56 -0500
Subject: rpms/wdm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611301645.kAUGjuoK028840@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28819/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wdm


--- 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 Nov 30 16:47:28 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:47:28 -0500
Subject: rpms/wdm import.log,1.1,1.2
Message-ID: <200611301647.kAUGlSeu028976@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28926

Modified Files:
	import.log 
Log Message:
auto-import wdm-1.28-7 on branch devel from wdm-1.28-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wdm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 16:45:50 -0000	1.1
+++ import.log	30 Nov 2006 16:46:58 -0000	1.2
@@ -0,0 +1 @@
+wdm-1_28-7:HEAD:wdm-1.28-7.src.rpm:1164905324



From fedora-extras-commits at redhat.com  Thu Nov 30 16:47:28 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:47:28 -0500
Subject: rpms/wdm/devel wdm-1.28-failsafe_tmp.patch, NONE,
	1.1 wdm-1.28-fedora.patch, NONE, 1.1 wdm-1.28-reconf.patch, NONE,
	1.1 wdm-Xsession, NONE, 1.1 wdm-update_wdm_wmlist, NONE,
	1.1 wdm.pam, NONE, 1.1 wdm.spec, NONE, 1.1 wdm_1.28-2.1.diff,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611301647.kAUGlShp028980@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28926/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wdm-1.28-failsafe_tmp.patch wdm-1.28-fedora.patch 
	wdm-1.28-reconf.patch wdm-Xsession wdm-update_wdm_wmlist 
	wdm.pam wdm.spec wdm_1.28-2.1.diff 
Log Message:
auto-import wdm-1.28-7 on branch devel from wdm-1.28-7.src.rpm

wdm-1.28-failsafe_tmp.patch:

--- NEW FILE wdm-1.28-failsafe_tmp.patch ---
--- wdm-1.28/configs/Xsession.in.failsafe_tmp	2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/Xsession.in	2006-11-29 10:21:25.000000000 +0100
@@ -16,22 +16,30 @@
 1)
         case $1 in
         failsafe)
-                exec @FAILSAFE@ -geometry 80x24-0-0
+                exec @FAILSAFE_PATH@ -geometry 80x24-0-0
                 ;;
         esac
         echo $1 >$HOME/.wm_style
 esac
 
 # redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-        if ( cp /dev/null "$errfile" 2> /dev/null )
-        then
-                chmod 600 "$errfile"
-                exec > "$errfile" 2>&1
-                break
-        fi
-done
+errfile="$HOME/.xsession-errors"
+if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
+then
+	exec > "$errfile" 2>&1
+else
+
+	mktemp=/bin/mktemp
+ 	for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+	do
+		if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
+		then
+			exec > "$ef" 2>&1
+			mv "$ef" "$errfile" 2> /dev/null
+ 			break
+ 		fi
+	done
+fi
 
 # clean up after xbanner
 # (RedHat code: need freetemp executed IF xbanner is run by Xsetup_0)
--- wdm-1.28/configs/Xclients.in.failsafe_tmp	2006-11-29 10:23:02.000000000 +0100
+++ wdm-1.28/configs/Xclients.in	2006-11-29 10:24:04.000000000 +0100
@@ -36,7 +36,6 @@
 
 # these files are left sitting around by TheNextLevel.
 rm -f $HOME/Xrootenv.0
-rm -f /tmp/fvwmrc* 2>/dev/null
 
 # check for and set x-resources
 if [ -f $HOME/.Xresources ] ; then

wdm-1.28-fedora.patch:

--- NEW FILE wdm-1.28-fedora.patch ---
--- wdm-1.28/configs/wdm-config.in.fedora	2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/wdm-config.in	2006-10-20 11:50:48.000000000 +0200
@@ -2,8 +2,8 @@
 !
 ! wdm configuration file input (sed in Makefile)
 !
-DisplayManager.errorLogFile:    @LOGDIR@/xdm-errors.log
-DisplayManager.pidFile:         @RUNDIR@/xdm-pid
+DisplayManager.errorLogFile:    @LOGDIR@/wdm-errors.log
+DisplayManager.pidFile:         @RUNDIR@/wdm.pid
 DisplayManager.keyFile:         @DMDIR@/xdm-keys
 DisplayManager.servers:         @DMDIR@/Xservers
 DisplayManager.accessFile:      @DMDIR@/Xaccess
@@ -25,11 +25,12 @@
 ! display screen background--if not set or set to none, then the
 !                            background is not set by wdm.
 ! DisplayManager*wdmBg:         none
-DisplayManager*wdmBg:           solid:RoyalBlue
+! DisplayManager*wdmBg:           solid:RoyalBlue
 ! DisplayManager*wdmBg:         dgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         hgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         vgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         pixmap:@GFXDIR@/Stars.jpg
+DisplayManager*wdmBg:         pixmap:@GFXDIR@/../../backgrounds/images/default.jpg
 !
 ! optional pixmap for logo
 @PIXMAPCOMMENT at DisplayManager*wdmLogo:  @GFXDIR@/@PIXMAPFILE@
@@ -65,7 +66,7 @@
 ! DisplayManager*wdmHalt:       @SHUTDOWN@ -t3 -h now
 !
 ! true/false to require valid username/passwd to reboot,halt, or exit
-DisplayManager*wdmVerify:       true
+DisplayManager*wdmVerify:       false
 ! true/false to require root as valid username/passwd to reboot,halt, or exit
 DisplayManager*wdmRoot:         false
 ! true=enable, false=disable shake and rollup animations

wdm-1.28-reconf.patch:

--- NEW FILE wdm-1.28-reconf.patch ---
--- wdm-1.28/configs/wdmReconfig.in.reconf	2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/wdmReconfig.in	2006-11-29 18:14:42.000000000 +0100
@@ -87,6 +87,7 @@
 		-e "s:@SHUTDOWN\@:@SHUTDOWN@:" \
 		-e "s:@LOGDIR\@:@LOGDIR@:" \
 		-e "s:@RUNDIR\@:@RUNDIR@:" \
+		-e "s:@GFXDIR\@:@GFXDIR@:" \
 		-e "s:@PIXMAPFILE\@:@PIXMAPFILE@:" \
 		-e "s:@PIXMAPCOMMENT\@:@PIXMAPCOMMENT@:" \
 		-e "s:@exec_prefix\@:@exec_prefix@:" \
@@ -99,6 +100,8 @@
 	configfile=@DMDIR@/Xclients
 	rm -f $configfile
 	sed -e "s:@XRDB_PATH\@:@XRDB_PATH@:" \
+	    -e "s:@SHELL_LOGIN\@:@SHELL_LOGIN@:" \
+	    -e "s:@configure_input\@:configs/Xclients.  Generated from Xclients.in by wdmReconfig:" \
 	    -e "s'@WMAKER_PATH\@'$WMAKER_PATH'" \
 	    -e "s'@AFTERSTEP_PATH\@'$AFTERSTEP_PATH'" \
 	    -e "s'@BLACKBOX_PATH\@'$BLACKBOX_PATH'" \


--- NEW FILE wdm-Xsession ---
#! /bin/sh

wm=

case $# in
1)
        wm=$1
        case $wm in
        failsafe|custom)
             ;;
        *) 
             echo $wm >$HOME/.wm_style
             ;;
        esac
    ;;
0)
        if [ -f $HOME/.wm_style ] ; then
             wm=`cat $HOME/.wm_style`
        fi
    ;;
esac

exec /etc/X11/xinit/Xsession $wm


--- NEW FILE wdm-update_wdm_wmlist ---
#!/usr/bin/perl -w
#
# update_wdm_wmlist, (c) 1998 Marcelo Magall?n 
# rewriten to use the x-window-manager alternative
# modified to also use the x-session-manager alternative by Arthur Korn
# Copyright 2000 Wichert Akkerman 
# Modified to use the freedesktop.org .desktop like kdm and gdm
#
# This script will read the list of installed window managers from
# the freedesktop .desktop files in /X11/sessions/:/dm/Sessions/:
# /xsessions/
# and update the DisplayManager*wdmWm resource in /etc/X11/wdm/wdm-config.
# BEWARE: It doesn't ask any questions about this. It just does it. It
# takes an optional list of window managers.

use strict;
use File::DesktopEntry;

my $wm_list='';
my %desktop_files;

unless (@ARGV) {
    #my @wm_list = ('default');
    my @wm_list;
    foreach my $dir ('/etc/X11/sessions/','/etc/dm/Sessions/','/usr/share/xsessions/') {
	    next unless (opendir DIR, $dir);
	    my @files;
	    @files = grep { /\.desktop$/ && -r "$dir/$_" } readdir(DIR);
	    foreach my $file (@files) {
		   push @{$desktop_files{$file}}, "$dir/$file";
	    }
    }
    DESKTOP: foreach my $desktop_file (keys(%desktop_files)) {
	    foreach my $file (@{$desktop_files{$desktop_file}}) {
		    my $entry = File::DesktopEntry->new_from_file($file);
		    next DESKTOP if (defined($entry->get_value('Hidden'))
			and $entry->get_value('Hidden') eq 'true');
		    if ($entry->get_value('Name') =~ /^gnome$/i) {
			    push (@wm_list, 'gnome');
		    }
		    elsif ($entry->get_value('Name') =~ /^kde$/i) {
			    push (@wm_list, 'kde');
		    }
		    elsif (defined($entry->get_value('Exec'))) {
			    push (@wm_list, $entry->get_value('Exec'));
		    }
		    else { # not found, go to next file
			    next;
		    }
		    # found, proceed to next destop file
		    next DESKTOP;
	    }
    }
   $wm_list = join (':', sort @wm_list) . ':custom';
} else {
    $wm_list = join (':', sort @ARGV);
}

open (WDM_CONFIG_FILE, '/etc/wdm/wdm-config.new')
    or die "Can't open /etc/wdm/wdm-config.new for writing: $!";

while () {
    s|^(!?\s*.*wdmWm:\s*).*|$1$wm_list|;
    print NEW_WDM_CONFIG_FILE;
}

close(WDM_CONFIG_FILE);
close(NEW_WDM_CONFIG_FILE);

rename '/etc/wdm/wdm-config.new', '/etc/wdm/wdm-config'
    or die "Can't rename /etc/wdm/wdw-config.new: $!";

exit 0;


--- NEW FILE wdm.pam ---
#%PAM-1.0
auth       required	pam_env.so
auth       include	system-auth
account    required	pam_nologin.so
account    include	system-auth
password   include	system-auth
session    optional	pam_keyinit.so force revoke
session    include	system-auth
session    required	pam_loginuid.so
session    optional	pam_console.so


--- NEW FILE wdm.spec ---
Name:           wdm
Version:        1.28
Release:        7%{?dist}
Summary:        WINGs Display Manager

Group:          User Interface/X
License:        GPL
URL:            http://voins.program.ru/wdm/
Source0:        http://voins.program.ru/wdm/wdm-%{version}.tar.bz2
# stolen from xdm
Source1:        %{name}.pam
# adapted from debian to use freedesktop
Source2:        wdm-update_wdm_wmlist
# record and reuse previous session before launching generic Xsession
Source3:        wdm-Xsession
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# debian patch modified to remove the configure patching
#Patch0:         http://ftp.debian.org/debian/pool/main/w/wdm/wdm_1.28-2.1.diff.gz
Patch0:         wdm_1.28-2.1.diff
# use fedora background/icon and match gdm default config
Patch1:         wdm-1.28-fedora.patch
# fix failsafe path and insecure use of /tmp
Patch2:         wdm-1.28-failsafe_tmp.patch
# fix reconfiguration script
Patch3:         wdm-1.28-reconf.patch

BuildRequires:  WindowMaker-devel gettext libselinux-devel pam-devel
BuildRequires:  libXt-devel libXmu-devel
BuildRequires:  xrdb xterm /sbin/shutdown
Requires:       xrdb xterm /sbin/shutdown
Requires:       %{_sysconfdir}/pam.d
# we don't want to have new files, we reuse the kdm/xdm files
Requires:       xdm xorg-x11-xinit
# we use 'include' in the pam file, so
Requires:       pam >= 0.80
# reuse the images
Requires:       desktop-backgrounds-basic fedora-logos

%description
wdm combines the functions of a graphical display manager identifying 
and authenticating a user on a system with some of the functions of a 
session manager in selecting and starting a window manager. Optionally, 
wdm can shutdown (reboot or halt) the system.

wdm is a modification of XFree86's xdm package for graphically handling 
authentication and system login. Most of xdm has been preserved 
(XFree86 4.2.1.1) with the Login interface based on a WINGs. Tom 
Rothamel's "external greet" interface (see AUTHORS) was used to 
communicate wdm with wdmLogin. 

In fedora, wdm may be called through a wrapper, wdm-dynwm, which determines
the available window managers using the freedesktop information and modifies
the wdm-config configuration file accordingly, before launching wdm.

%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .fedora
%patch2 -p1 -b .failsafe_tmp
%patch3 -p1 -b .reconf

%build

export DEF_SERVER='%{_bindir}/X -nolisten tcp'
export INSTALL='install -p'

%configure \
   --with-pamdir=%{_sysconfdir}/pam.d \
   --with-logdir=%{_localstatedir}/log \
   --with-runlockdir=%{_localstatedir}/run \
   --with-wdmdir=%{_sysconfdir}/wdm \
   --with-nlsdir=%{_datadir}/locale \
   --with-fakehome=%{_localstatedir}/run/wdm \
   --with-gfxdir=%{_datadir}/pixmaps/wdm \
   --with-Logo=../../backgrounds/tiles/default_blue.jpg \
   --with-defuserpath='/bin:%{_bindir}' \
   --with-defsystempath='/sbin:%{_sbindir}:/bin:%{_bindir}' \
   --enable-selinux \
   --enable-aafont 


make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update_wdm_wmlist

# do a wdm wrapper which updates the window manager list before
# launching wdm
cat > $RPM_BUILD_ROOT%{_bindir}/wdm-dynwm << EOF
#!/bin/sh
update_wdm_wmlist
wdm "\$@"
EOF

chmod 0755 $RPM_BUILD_ROOT%{_bindir}/wdm-dynwm

# move the reconfiguration script to _bindir
mv $RPM_BUILD_ROOT%{_sysconfdir}/wdm/wdmReconfig $RPM_BUILD_ROOT%{_bindir}

chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/wdm/wdm-config

install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wdm

# remove old X session script, and old XFree86 session script
rm $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.orig
rm $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.XFree86

# use xdm/kdm files 
# first rename wdm files
for file in Xaccess Xsession Xsetup_0 GiveConsole TakeConsole; do
mv $RPM_BUILD_ROOT%{_sysconfdir}/wdm/$file $RPM_BUILD_ROOT%{_sysconfdir}/wdm/$file.wdm
done

# then use symlinks or wrapper
# calls /etc/X11xinit/Xsession
install -p -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession
ln -s ../X11/xdm/Xaccess $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xaccess
ln -s ../X11/xdm/Xsetup_0 $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsetup_0
ln -s ../X11/xdm/GiveConsole $RPM_BUILD_ROOT%{_sysconfdir}/wdm/GiveConsole
ln -s ../X11/xdm/TakeConsole $RPM_BUILD_ROOT%{_sysconfdir}/wdm/TakeConsole
ln -s ../X11/xdm/Xsession $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.xorg

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog* NEWS README* TODO NASA_image_guideline.html 
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pam.d/wdm
%dir %{_sysconfdir}/wdm/
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/wdm-config
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/wdm-config.in
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/Xresources
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/Xservers
%config %{_sysconfdir}/wdm/GiveConsole.wdm
%config %{_sysconfdir}/wdm/TakeConsole.wdm
%config %{_sysconfdir}/wdm/Xaccess.wdm
%config %{_sysconfdir}/wdm/Xclients
%config %{_sysconfdir}/wdm/Xclients.in
%config %{_sysconfdir}/wdm/Xservers.fs
%config %{_sysconfdir}/wdm/Xservers.ws
%config %{_sysconfdir}/wdm/Xsession
%config %{_sysconfdir}/wdm/Xsession.wdm
%config %{_sysconfdir}/wdm/Xsetup_0.wdm
# links
%config %{_sysconfdir}/wdm/GiveConsole
%config %{_sysconfdir}/wdm/TakeConsole
%config %{_sysconfdir}/wdm/Xaccess
%config %{_sysconfdir}/wdm/Xsession.xorg
%config %{_sysconfdir}/wdm/Xsetup_0
%{_bindir}/wdm*
%{_bindir}/update_wdm_wmlist
%{_mandir}/man1/wdm*.1*
%{_datadir}/pixmaps/wdm/
%dir %{_localstatedir}/run/wdm


%changelog
* Thu Nov 30 2006 Patrice Dumas  1.28-7
- keep timestamps for shipped files
- enable aa fonts

* Wed Nov 29 2006 Patrice Dumas  1.28-6
- fix reconfiguration script
- requires pam recent enough
- don't set noreplace for scripts and example config files

* Wed Nov 29 2006 Patrice Dumas  1.28-5
- fix insecure use of /tmp in original wdm script
- remove obsolete session scripts

* Sun Nov 12 2006 Patrice Dumas  1.28-4
- add BR libXt-devel and libXmu-devel

* Fri Oct 20 2006 Patrice Dumas  1.28-3
- correct wdm-dynwm

* Fri Oct 20 2006 Patrice Dumas  1.28-2
- use images from desktop-backgrounds-basic fedora-logos
- record session style before calling the generic Xsession, and add
  previous session and custom session handling.
- ship the original config files
- fix a bug in the default config files

* Thu Oct 19 2006 Patrice Dumas  1.28-1
- initial packaging

wdm_1.28-2.1.diff:

--- NEW FILE wdm_1.28-2.1.diff ---
--- wdm-1.28.orig/debian/changelog
+++ wdm-1.28/debian/changelog
@@ -0,0 +1,647 @@
+wdm (1.28-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Split xlibs-dev build-dep (Closes: #347055).
+  * Added Swedish debconf translation (Closes: #332556).
+  * Added Portuguese debconf translation (Closes: #336233).
+
+ -- Luk Claes   Sat, 21 Jan 2006 16:19:30 +0100
+
+wdm (1.28-2) unstable; urgency=low
+
+  * New maintainer: Vladimir Shakhov  
+    (Closes: #323600,#287873).
+  * Mark /etc/logrotate.d/wdm as conf file and use dh_installlogrotate 
+    instead of manual copying. lintian cleanup. Place dh_installlogrotate
+    above sed hack to generate debian/conffiles.
+  * Use dh_installpam instead of manual copying. debian/wdm.pamd rename to
+    debian/wdm.pam.
+  * Use dh_installdirs instead call "install -d".
+  * /usr/X11R6 replacement with /usr (as Debian Policy, paragraph 11.8.7,
+    said). Some debian/wdm.config and debian/wdm.postinst changes to provide
+    clean upgrade.
+  * TODO updated (Closes: #319573).
+  * Prevent ChangeLog duplication (Closes: #320321).
+  * Current package already use newest upstream version (Closes: #303868).
+  * Build-Depends against libwraster3 (Closes: #281328).
+  
+ -- Vladimir Shakhov   Wed, 17 Aug 2005 19:25:13 +0300
+
+wdm (1.28-1) unstable; urgency=low
+
+  * new upstream version (see /usr/share/doc/wdm/NEWS.gz for details)
+  * enable SELinux (Closes: #283372)
+
+ -- Noah Meyerhans   Wed, 20 Apr 2005 21:15:39 -0400
+
+wdm (1.27-2.2) unstable; urgency=medium
+
+  * NMU.
+  * Removed dependency on libproplist0-dev (bug #294719)
+  * Added update translations (bugs #267130, #283974, #286093)
+  * Kept urgency=medium in order to enter testing quickly.
+
+ -- Giuseppe Sacco   Wed, 23 Feb 2005 15:08:21 +0100
+
+wdm (1.27-2.1) unstable; urgency=medium
+
+  * NMU.
+  * Updated Build-Depends to libwraster3-dev (Closes: #282287).
+  * Add libxft-dev to Build-Depends.
+  * Add missing -lXft to configure.ac and configure (but did not run
+    autoconf; touch'ing configure instead in debian/rules).
+
+ -- Christoph Berg   Wed,  1 Dec 2004 22:53:39 +0100
+
+wdm (1.27-2) unstable; urgency=medium
+
+  * Remove unnecessary build-dep on libtiff3g-dev (Closes: #264576)
+  * Re-enable ExitLogin functionality. (Closes: #260249)
+
+ -- Noah Meyerhans   Wed, 18 Aug 2004 15:44:29 -0400
+
+wdm (1.27-1) unstable; urgency=low
+
+  * New upstream release
+  * Rotate /var/log/wdm.log (closes: #241441)
+  * Update default config to properly initialize syslog
+    (closes: #242155)
+  * Add Czech debconf traslation, thanks to Miroslav Kure
+     (closes: #237987)
+  * Add Turkish debconf translation, thanks to Recai Oktas
+     (closes: #248327)
+  * Add manual page for the wdmlogin.conf file (closes: #239928)
+  * Fix prerm to reconfigure /etc/X11/default-display-manager
+    (closes: #219184)
+
+ -- Noah Meyerhans   Thu, 27 May 2004 23:54:31 -0400
+
+wdm (1.26-1) unstable; urgency=low
+
+  * New upstream version.  See /usr/share/doc/wdm/ChangeLog.gz for details.
+  * Update PAM configuration to use new @include functionality.
+  * Explicitly set the wdmLocale resource in wdm-config, since wdmLogin
+    will not display help text otherwise.
+
+ -- Noah Meyerhans   Tue, 30 Sep 2003 19:54:45 -0400
+
+wdm (1.25-1) unstable; urgency=low
+
+  * New upstream version (Closes: #202818)
+  * wdmLogin geometry option added upstream (Closes: #155459)
+  * Added dependency on xbase-clients (Closes: #203311)
+  * wdm man page cleanup (Closes: #189340)
+  * Applied patch from Christian Perrier  to provide
+    gettext-based debconf templates (Closes: #203102)
+  * corrected some errors in output of update_wdm_wmlist (Closes: #192780)
+  * Cleaned up the source tree, resulting in a cleaner merge of my
+    CVS stuff with upstream's source.  Got rid of some files left over
+    from patches that are no longer relevant.
+  * Install localized message files in /usr/share/locale (Closes: #193899)
+
+ -- Noah Meyerhans   Sun, 10 Aug 2003 17:21:09 -0400
+
+wdm (1.22.1-2) unstable; urgency=low
+
+  * PAM fix after I accidentally sucked in upstream's pam file that is
+    not Debian-friendly.  (Closes: #182161)
+
+ -- Noah Meyerhans   Sun, 23 Feb 2003 16:44:16 -0500
+
+wdm (1.22.1-1) unstable; urgency=low
+
+  * New upstream version fixes PAM bug introduced in 1.22.  PAM
+    service name had erroneously been set to "xdm".  (Closes: #181838)
+
+ -- Noah Meyerhans   Fri, 21 Feb 2003 15:23:47 -0500
+
+wdm (1.22-2) unstable; urgency=low
+
+  * Fix prerm script to abort if wdm is managing a display the user
+    chooses not to stop it. (Closes: Bug#177609)
+
+ -- Noah Meyerhans   Tue, 18 Feb 2003 16:57:58 -0500
+
+wdm (1.22-1) unstable; urgency=low
+
+  * New upstream release (Closes: Bug#180810, Bug#80542, Bug#108734)
+  * Small update to build-depends (Closes: Bug#170236)
+  * Bumped standards version.
+  * Updated copyright.
+
+ -- Noah Meyerhans   Mon, 17 Feb 2003 23:32:19 -0500
+
+wdm (1.20-18) unstable; urgency=low
+
+  * debian/control: build-depend on libpng12-0-dev
+  * Rebuild with new libproplist
+
+ -- Noah Meyerhans   Thu, 23 Jan 2003 19:24:42 -0500
+
+wdm (1.20-17) unstable; urgency=low
+
+  * Really fixed the maintainer field.
+  * Changed build deps to depend on libungif4-dev (Closes: Bug#165542)
+  * Applied a patch from Frederik Schueler to Login.c to fix the 
+    buggy help display.  (Closes: Bug#122430)
+
+ -- Noah Meyerhans   Fri, 25 Oct 2002 18:51:05 -0400
+
+wdm (1.20-16) unstable; urgency=low
+
+  * added -nolisten tcp to X server flags.
+  * set DisplayManager.requestPort to 0 in /etc/X11/wdm/wdm-config
+    to disable XDMCP by default.
+  * Updated the manual page to include much of the content of the XDM
+    man page.  This eliminates the need to refer to the XDM man page,
+    which is usually not installed on systems that run wdm.
+  * (closes: #145980)  The previous 3 changelog entries close this bug.
+  * Added polish debconf translation (Closes: #142541)
+  * Added a Xinerama patch from Will Andrews 
+    (Closes: #142930)
+  * updated the Maintainer field to point to the right email address.
+  * Note that we still depend on libpng2 until libwraster2 updates to
+    libpng3.
+
+ -- Noah Meyerhans   Wed,  4 Sep 2002 15:59:33 -0400
+
+wdm (1.20-15) unstable; urgency=low
+
+  * Added code to postrm to delete /var/lib/wdm/ if possible
+    (Closes: Bug#114788).
+  * Added references to update_wdm_wmlist(8) and wdm.options(5) in
+    the wdm.1x man page.  (Closes: Bug#135693)
+  * Stopped creating /usr/X11R6/share/man/man1. (Closes: Bug#122042)
+  * Added debconf translations for French, Spanish, and Japanese
+    (Closes: Bug#137939, Bug#134462, Bug#137141)
+
+ -- Noah Meyerhans   Tue, 12 Mar 2002 19:26:18 -0500
+
+wdm (1.20-14) unstable; urgency=low
+
+  * Removed a bashism from /etc/X11/wdm/Xsession (Closes: Bug#121990)
+  * Fixed a typo in prerm that prevented wdm from properly giving
+    control to another display manager in the event that it was purged.
+
+ -- Noah Meyerhans   Mon, 14 Jan 2002 14:10:39 -0500
+
+wdm (1.20-13) unstable; urgency=high
+
+  * Fixed incoherent references to authentication directory.  This was
+    a serious security flaw that allowed wdm to allow all clients to
+    access the display it was managing.  (Closes: Bug#121056)
+  * Added Brazilian portuguese localized debconf template.
+  * Applied a small change to Login.c to prevent array bounds overruns
+    when >13 window managers are installed.  A cleanup is in order, as
+    there's no reason to hardcode a 13 WM limit, but I'll save the more
[...4215 lines suppressed...]
+running wdm process is found to have no children.  In the event the wdm daemon
+is not stopped and restarted, the administrator will have to do so by hand
+(probably with "/etc/init.d/wdm restart", or by rebooting the system) before
+the newly installed wdm binary is used.
+.IP run-xconsole
+This option opens an
+.BR xconsole (1)
+client to catch messages that would normally go to the Linux virtual
+console and thus be missed in many cases by the user.  By default, this
+option is only supported in the Xsetup file for display :0
+.RI ( /etc/X11/xdm/Xsetup_0 ),
+but any Xsetup script may use it if appropriately edited.
+.IP use-sessreg
+If this option is enabled (the Debian default), the sessreg program will
+be invoked to register X sessions managed by wdm in the utmp and wtmp
+files.  Otherwise, it is not, and the utmp and wtmp files will have no
+record of wdm sessions.
+.SH HISTORY
+Flags controlling wdm used to be kept in
+.I /etc/X11/config
+on Debian/GNU Linux systems.
+.SH SEE ALSO
+.BR sessreg (1),
+.BR xconsole (1),
+.BR xmessage (1),
+.BR wdm (1)
+.SH AUTHOR
+This manpage was written by Branden Robinson for Debian GNU/Linux and
+modified by Marcelo Magallon for wdm.
--- wdm-1.28.orig/debian/man/wdmLogin.1x
+++ wdm-1.28/debian/man/wdmLogin.1x
@@ -0,0 +1,76 @@
+.TH wdmLogin 1x "August 1998"
+.SH NAME
+wdmLogin \- wdm login panel
+.SH SYNOPSIS
+\fBwdmLogin\fP [-d \fIdisplay\fP] [-l \fIlogo\fP] [-w \fI\fP] [-b \fIbackground\fP] [-h \fIhelpfile\fP] [-u \fIusername\fP] [-p \fIpassword\fP]
+.SH DESCRIPTION
+\fBwdmLogin\fP is greeter designed to work with \fBwdm\fP(1x). It has
+several features not found on xdm's greeter. wdmLogin should not be
+called directly, that's wdm's task.
+.SH OPTIONS
+.TP
+.B \-d
+starts on the specified \fIdisplay\fP
+.TP
+.B \-l
+uses the specified \fIlogo\fP for the panel. The logo will be \fBresized\fP
+to 200 by 130 pixels.
+.TP
+.B \-w
+presents the \fBcolon separated\fP list of \fIwindow managers\fP, for
+the user to pick one, or None if you want only NoChange to appear.
+.TP
+.B \-a
+enables animations consisting of 
+shaking the Login panel (if an error) and 
+rolling up the image (when closing the panel).
+.TP
+.B \-h
+uses the specified text file to display in the help panel instead of
+the static help message which is in the sources. Take care of long lines
+which may cause display trouble in the help panel.
+.TP
+.B \-u
+use the default username and password as specified in wdm-config if nothing is typed
+by the user. USE WITH EXTREME CAUTION.
+.TP
+.B \-b
+uses the specified background image (see the next section).  If this is
+not specified, then the background is \fBNOT\fP set.
+.SH BACKGROUND IMAGE SPECIFICATION
+There are several possible ways of specifing a background image. The
+generic format is \-b\fItype\fP:\fIimage\fP. \fItype\fP can be any of:
+.TP
+.B none
+do not set the background.  This user can still set the background
+via other means.
+.TP
+.B solid
+it renders a solid backgroud, and \fIimage\fP is a color name
+.TP
+\fBhgradient\fP, \fBvgradient\fP, \fBdgradient\fP
+a gradient (either horizontal, vertical or diagonal) will be
+rendered. \fIimage\fP is \fBcomma separated\fP of color names, and any
+number of colors can be specified.
+.TP
+\fBpixmap\fP
+a pixmap will be used for the background. \fIimage\fP is the full path
+to an image file (tiff, png, jpeg and xpm allowed) and it will be
+scaled to use the full screen.
+.SH FILES
+\fBwdmLogin\fP can be customized by modifying \fI/etc/X11/wdm/wdm-config\fP.
+.SH ENVIRONMENT VARIABLES
+Some variables that defines locale affects the look of wdmLogin. wdm program
+will set LANG environment variable according to `wdmLocale' resource in wdm-config
+file.
+.SH SEE ALSO
+.BR wdm (1x)
+,
+.BR locale (1)
+.SH AUTHOR
+wmdLogin was written by Gene Czarcinski . wdm is
+based on work by Tom Rothamel (xdm's external greeter protocol) and
+xdm itself, (c) 1988 X Consortium
+.PP
+This man page was written by Marcelo Magallon 
+and modified by Jerome Alet 
--- wdm-1.28.orig/debian/man/wdmlogin.conf.5
+++ wdm-1.28/debian/man/wdmlogin.conf.5
@@ -0,0 +1,63 @@
+.\" This manpage is copyright (C) 2004 Noah Meyerhans 
+.\"
+.\" This is free software; you may 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,
+.\" or (at your option) any later version.
+.\"
+.\" This 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 apt; if not, write to the Free Software
+.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+.\" 02111-1307 USA
+.TH wmlogin.conf 5 "27 May 2004" "Debian GNU/Linux"
+
+.SH NAME
+wdmlogin.conf \- configuration options for wdmLogin
+
+.SH DESCRIPTION
+.I /etc/X11/wdm/wdmlogin.conf
+specifies geometry and font attributes for wdmLogin, the login widget
+that is a component of the wdm package.  An alternate location for
+this file can be specified via the wdmLoginConfig resource in
+/etc/X11/wdm/wdm.config.
+
+.I wdmlogin.conf
+uses the somewhat ill-documented libproplist file format.  The file
+must begin and end with an open- and close-brace, respectively.
+Between the braces, three options are available:
+
+.IP "geometry = (w, h, x, y);"
+If set, this option allows the wdmLogin window to be resized and
+repositioned within the screen.  The x and y coordinates specify the
+location of the top left corner of the window and are optional.
+
+.IP "aa = ;"
+If set to yes, then support for antialiased fonts is enabled.  Note
+that this is not currently supported by libWINGs in Debian, and thus
+has no effect.
+
+.IP "multibyte = ;"
+If set to yes, then support for multibyte character sets is enabled.
+Note that this is not currently supported by libWINGs in Debian, and
+thus has no effect.
+
+.SH EXAMPLE
+ {
+        geometry = (530, 240);
+        aa = no;
+        multibyte = no;
+ }
+
+.SH SEE ALSO
+.BR wdm(1x)
+.BR wdmLogin(1x)
+
+.SH AUTHOR
+This manual page was written by Noah Meyerhans for Debian GNU/Linux.
+The wdm package was written by a long list of names that can be found
+in /usr/share/doc/wdm/AUTHORS
--- wdm-1.28.orig/debian/TODO.old
+++ wdm-1.28/debian/TODO.old
@@ -0,0 +1,13 @@
+Things to do for the Debian package:
+
+ * Check X4 behaviour
+ * Check xdm->wdm, wdm->xdm, gdm->wdm, wdm->gdm upgrading 
+   behaviour (bug #38391)
+ * Implement alternatives for gdm, wdm, xdm, kdm (bug #64966)
+ * Check ability to serve indirect and broadcast XDMCP requests
+ * Add chooser to wdm. Right now, indirect or broadcast XDMCP calls
+   can't be handled without one (bug #52215)
+ * Correct handling of on which vt X is started (bug #60892)
+ * Add check on +x of /etc/X11/Xsession in npostinst script (bug #78413)
+
+-- Bas Zoetekouw  Wed Nov 15 21:05:22 CET 2000
--- wdm-1.28.orig/debian/NEWS.Debian
+++ wdm-1.28/debian/NEWS.Debian
@@ -0,0 +1,7 @@
+wdm (1.28-2) unstable; urgency=low
+  
+  * Previous versions of WDM package use policy-incompatible files layout.
+    Since 1.28-2, WDM placed in /usr/{bin,share/man}. I suppose, that was 
+    not problems with upgrade, but if you have one - please report me.
+
+ -- Vladimir Shakhov   Wed, 18 Aug 2005 03:25:13 +0300


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wdm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 16:45:56 -0000	1.1
+++ .cvsignore	30 Nov 2006 16:46:58 -0000	1.2
@@ -0,0 +1 @@
+wdm-1.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wdm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 16:45:56 -0000	1.1
+++ sources	30 Nov 2006 16:46:58 -0000	1.2
@@ -0,0 +1 @@
+4da8ffe3af233305786d9b6aab78b838  wdm-1.28.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 16:52:04 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:52:04 -0500
Subject: owners owners.list,1.2040,1.2041
Message-ID: <200611301652.kAUGq4Is029089@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29074

Modified Files:
	owners.list 
Log Message:
add wdm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -r1.2040 -r1.2041
--- owners.list	30 Nov 2006 15:22:17 -0000	1.2040
+++ owners.list	30 Nov 2006 16:51:34 -0000	1.2041
@@ -2438,6 +2438,7 @@
 Fedora Extras|wavpack|A completely open audiocodec|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|
 Fedora Extras|wcstools|Software utilities to display and manipulate the WCS of a FITS image|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
+Fedora Extras|wdm|WINGs Display Manager|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|wfmath|WorldForge client math library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|wfut|WorldForge updater tool|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 16:57:16 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 11:57:16 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.20,1.21
Message-ID: <200611301657.kAUGvGgB029133@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29118

Modified Files:
	Push.py 
Log Message:
Make invalid rebuilds stand out.


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Push.py	30 Nov 2006 10:56:49 -0000	1.20
+++ Push.py	30 Nov 2006 16:57:16 -0000	1.21
@@ -378,7 +378,7 @@
             buildreportinfo += 'NEW\n'
     else:  # src.rpm published before, exclude entire build job
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
-        buildreportinfo = 'Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        buildreportinfo = '*** Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
         if buildreport:
             rundirfile.write(buildreportinfo)
         rundirfile.close()



From fedora-extras-commits at redhat.com  Thu Nov 30 17:03:46 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Thu, 30 Nov 2006 12:03:46 -0500
Subject: rpms/heartbeat/devel heartbeat.spec,1.11,1.12
Message-ID: <200611301703.kAUH3kdT032257@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32240

Modified Files:
	heartbeat.spec 
Log Message:
* Thu Nov 30 2006 Joost Soeterbroek  - 2.0.7-5
- add Requires net-snmp-libs to stonith , add BuildReqs net-snmp-devel >= 5.4



Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- heartbeat.spec	28 Nov 2006 17:06:03 -0000	1.11
+++ heartbeat.spec	30 Nov 2006 17:03:16 -0000	1.12
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          4%{?dist}
+Release:          5%{?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
+BuildRequires:    net-snmp-devel >= 5.4
 BuildRequires:    bzip2-devel 
 BuildRequires:    ncurses-devel
 %if %{ENABLE_MGMT}
@@ -72,6 +72,7 @@
 
 %package -n stonith
 Requires:       pils = %{version}-%{release}
+Requires:       net-snmp-libs
 Summary:        Provides an interface to Shoot The Other Node In The Head 
 Group:          System Environment/Daemons
 
@@ -301,6 +302,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Nov 30 2006 Joost Soeterbroek  - 2.0.7-5
+- add Requires net-snmp-libs to stonith , add BuildReqs net-snmp-devel >= 5.4
+
 * Tue Nov 28 2006 Joost Soeterbroek  - 2.0.7-4
 - rebuild for updated net-snmp, soname change
 



From fedora-extras-commits at redhat.com  Thu Nov 30 17:14:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 30 Nov 2006 12:14:39 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.25, 1.26 abcm2ps.spec, 1.28,
	1.29 sources, 1.25, 1.26
Message-ID: <200611301714.kAUHEd9X032362@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32343

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Nov 2006 20:54:07 -0000	1.25
+++ .cvsignore	30 Nov 2006 17:14:09 -0000	1.26
@@ -1,2 +1,2 @@
-abcm2ps-5.1.2.tar.gz
+abcm2ps-5.2.0.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- abcm2ps.spec	14 Nov 2006 20:54:07 -0000	1.28
+++ abcm2ps.spec	30 Nov 2006 17:14:09 -0000	1.29
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.2
+Version:        5.2.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.2.0.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Gerard Milmeister  - 5.2.0-1
+- new version 5.2.0
+
 * Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
 - new version 5.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Nov 2006 20:54:07 -0000	1.25
+++ sources	30 Nov 2006 17:14:09 -0000	1.26
@@ -1,2 +1,2 @@
-2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
+d962713c080a4200ef12c4a7fa32f1de  abcm2ps-5.2.0.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Thu Nov 30 17:16:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 30 Nov 2006 12:16:48 -0500
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.24, 1.25 abcm2ps.spec, 1.26,
	1.27 sources, 1.24, 1.25
Message-ID: <200611301716.kAUHGmEa032448@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32411/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	14 Nov 2006 20:54:06 -0000	1.24
+++ .cvsignore	30 Nov 2006 17:16:18 -0000	1.25
@@ -1,2 +1,2 @@
-abcm2ps-5.1.2.tar.gz
+abcm2ps-5.2.0.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/abcm2ps.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- abcm2ps.spec	14 Nov 2006 20:54:06 -0000	1.26
+++ abcm2ps.spec	30 Nov 2006 17:16:18 -0000	1.27
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.2
+Version:        5.2.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.2.0.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Gerard Milmeister  - 5.2.0-1
+- new version 5.2.0
+
 * Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
 - new version 5.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	14 Nov 2006 20:54:06 -0000	1.24
+++ sources	30 Nov 2006 17:16:18 -0000	1.25
@@ -1,2 +1,2 @@
-2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
+d962713c080a4200ef12c4a7fa32f1de  abcm2ps-5.2.0.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Thu Nov 30 17:16:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 30 Nov 2006 12:16:48 -0500
Subject: rpms/abcm2ps/FC-6 .cvsignore, 1.25, 1.26 abcm2ps.spec, 1.28,
	1.29 sources, 1.25, 1.26
Message-ID: <200611301716.kAUHGmSD032453@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32411/FC-6

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Nov 2006 20:54:07 -0000	1.25
+++ .cvsignore	30 Nov 2006 17:16:18 -0000	1.26
@@ -1,2 +1,2 @@
-abcm2ps-5.1.2.tar.gz
+abcm2ps-5.2.0.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/abcm2ps.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- abcm2ps.spec	14 Nov 2006 20:54:07 -0000	1.28
+++ abcm2ps.spec	30 Nov 2006 17:16:18 -0000	1.29
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.2
+Version:        5.2.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.2.0.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Gerard Milmeister  - 5.2.0-1
+- new version 5.2.0
+
 * Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
 - new version 5.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Nov 2006 20:54:07 -0000	1.25
+++ sources	30 Nov 2006 17:16:18 -0000	1.26
@@ -1,2 +1,2 @@
-2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
+d962713c080a4200ef12c4a7fa32f1de  abcm2ps-5.2.0.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Thu Nov 30 17:26:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 30 Nov 2006 12:26:57 -0500
Subject: rpms/apcupsd/devel apcupsd-net-snmp.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 apcupsd.spec, 1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200611301726.kAUHQv3N000578@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv556

Modified Files:
	.cvsignore apcupsd.spec sources 
Added Files:
	apcupsd-net-snmp.patch 
Log Message:
Update to 3.13.9, add gui package


apcupsd-net-snmp.patch:

--- NEW FILE apcupsd-net-snmp.patch ---
--- apcupsd-3.13.9/src/drivers/snmp/snmp.h.net-snmp	2006-07-07 07:06:57.000000000 -0600
+++ apcupsd-3.13.9/src/drivers/snmp/snmp.h	2006-11-29 13:42:14.000000000 -0700
@@ -39,6 +39,7 @@
 #else
 
 # ifdef HAVE_NET_SNMP
+#  include 
 #  include 
 #  include 
 #  include 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2006 16:43:01 -0000	1.6
+++ .cvsignore	30 Nov 2006 17:26:26 -0000	1.7
@@ -1 +1 @@
-apcupsd-3.12.4.tar.gz
+apcupsd-3.13.9.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apcupsd.spec	9 Oct 2006 16:47:43 -0000	1.11
+++ apcupsd.spec	30 Nov 2006 17:26:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.12.4
-Release:      3%{?dist}
+Version:      3.13.9
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -10,10 +10,12 @@
 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: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers
+BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils
 Requires:      /bin/mail
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -40,13 +42,24 @@
 A CGI interface to the APC UPS monitoring daemon.
 
 
+%package gui
+Summary:      GUI interface for apcupsd
+Group:        Applications/System
+Requires:     %{name} = %{version}-%{release}
+
+%description gui
+A GUI interface to the APC UPS monitoring daemon.
+
+
 %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
 
+
 %build
 %configure \
         --sysconfdir="%{_sysconfdir}/apcupsd" \
@@ -54,7 +67,6 @@
         --enable-cgi \
         --enable-pthreads \
         --enable-net \
-        --enable-master-slave \
         --enable-apcsmart \
         --enable-dumb \
         --enable-net-snmp \
@@ -62,13 +74,13 @@
         --enable-usb \
         --enable-powerflute \
         --enable-nls \
+        --enable-gapcmon \
+        --enable-pcnet \
         --with-libwrap=%{_libdir} \
         --with-serial-dev= \
         --with-upstype=usb \
         --with-upscable=usb \
         APCUPSD_MAIL=/bin/mail
-
-
 make
 
 
@@ -93,6 +105,12 @@
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
+desktop-file-install --vendor="fedora" \
+        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+        --delete-original \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop
+
+# Cleanup for later %doc processing
 chmod -x examples/*.conf examples/*.c
 rm examples/*.in
 
@@ -127,6 +145,17 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf
 %{_localstatedir}/www/apcupsd/
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/gapcmon
+%{_datadir}/applications/fedora-gapcmon.desktop
+%{_datadir}/pixmaps/apcupsd.png
+%{_datadir}/pixmaps/charging.png
+%{_datadir}/pixmaps/gapc_prefs.png
+%{_datadir}/pixmaps/onbatt.png
+%{_datadir}/pixmaps/online.png
+%{_datadir}/pixmaps/unplugged.png
+
 
 %post
 # add our links
@@ -143,6 +172,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 - Orion Poplawski  - 3.13.9-1
+- Update to 3.13.9, add gui package
+
 * Mon Oct  9 2006 - Orion Poplawski  - 3.12.4-3
 - Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
   Patch from Clive Messer (clive at vacuumtube.org.uk)
@@ -179,13 +211,13 @@
 - Compile in snmp, net-snmp, powerflute, nls, add tcp_wrappers support
 
 * Mon Oct 17 2005 - Orion Poplawski  - 3.10.18-3
-- Removed %{_smp_mflags} from make, broke builds
+- Removed %%{_smp_mflags} from make, broke builds
 - Patch init file to not start automatically and add reload
 - Mark css file config
 - Require /sbin/chkconfig
 
 * Mon Oct 17 2005 - Orion Poplawski  - 3.10.18-2
-- Add %defattr to -cgi package
+- Add %%defattr to -cgi package
 
 * Wed Aug 17 2005 - Orion Poplawski  - 3.10.18-1
 - Initial Fedora Version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2006 16:43:01 -0000	1.6
+++ sources	30 Nov 2006 17:26:26 -0000	1.7
@@ -1 +1 @@
-669c833ec02a2bc29fa98f845e5f5de5  apcupsd-3.12.4.tar.gz
+a58f1a1c4387da5b2fa3666a246c8165  apcupsd-3.13.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 17:27:50 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 30 Nov 2006 12:27:50 -0500
Subject: rpms/fedora-usermgmt/EL-4 fedora-usermgmt.spec,1.6,1.7
Message-ID: <200611301727.kAUHRo7p000601@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/fedora-usermgmt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv584

Modified Files:
	fedora-usermgmt.spec 
Log Message:
add disttag




Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/EL-4/fedora-usermgmt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-usermgmt.spec	10 Dec 2005 11:59:18 -0000	1.6
+++ fedora-usermgmt.spec	30 Nov 2006 17:27:20 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
 Version:	0.8
-Release:	1
+Release:	1%{?dist}
 
 License:	GPL
 BuildArch:	noarch
@@ -145,6 +145,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Dennis Gilmore  - 0.8-1
+- add disttag
+
 * Sat Dec 10 2005 Enrico Scholz  - 0.8-1
 - fixed URL metadata (bz #172758)
 - execute 'nscd -i ...' before and after creating users/groups; this



From fedora-extras-commits at redhat.com  Thu Nov 30 17:40:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 12:40:01 -0500
Subject: fedora-security/audit fe5,1.110,1.111 fe6,1.26,1.27
Message-ID: <200611301740.kAUHe1r9000859@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv842

Modified Files:
	fe5 fe6 
Log Message:
CVE-2006-5815 should be fixed for FE5+


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fe5	27 Nov 2006 20:49:17 -0000	1.110
+++ fe5	30 Nov 2006 17:40:00 -0000	1.111
@@ -6,7 +6,7 @@
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
-CVE-2006-5815 ** (proftpd) #214820
+CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fe6	27 Nov 2006 20:49:17 -0000	1.26
+++ fe6	30 Nov 2006 17:40:00 -0000	1.27
@@ -7,7 +7,7 @@
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
-CVE-2006-5815 ** (proftpd) #214820
+CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
 CVE-2006-5748 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985



From fedora-extras-commits at redhat.com  Thu Nov 30 18:04:48 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 13:04:48 -0500
Subject: rpms/tachyon/FC-5 tachyon.spec,1.1,1.2
Message-ID: <200611301804.kAUI4mLJ004282@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4266

Modified Files:
	tachyon.spec 
Log Message:
- work around libpng bug #217903


Index: tachyon.spec
===================================================================
RCS file: /cvs/extras/rpms/tachyon/FC-5/tachyon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tachyon.spec	30 Nov 2006 11:52:52 -0000	1.1
+++ tachyon.spec	30 Nov 2006 18:04:18 -0000	1.2
@@ -11,7 +11,7 @@
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
 Version: 0.97
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
 Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz
@@ -22,6 +22,7 @@
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: lam-devel
+BuildRequires: pkgconfig
 
 %description
 A portable, high performance parallel ray tracing system supporting MPI
@@ -139,6 +140,9 @@
 %{_datadir}/tachyon
 
 %changelog
+* Thu Nov 30 2006 Dominik 'Rathann' Mierzejewski  0.97-2.fc5.1
+- work around libpng bug #217903
+
 * Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski  0.97-2
 - use only kosher CFLAGS
 - fix target setting



From fedora-extras-commits at redhat.com  Thu Nov 30 18:43:44 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Thu, 30 Nov 2006 13:43:44 -0500
Subject: rpms/tcpick/devel tcpick.spec,1.3,1.4
Message-ID: <200611301843.kAUIhiuc004723@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4708

Modified Files:
	tcpick.spec 
Log Message:
Rebuilt



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/devel/tcpick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcpick.spec	9 Sep 2006 22:39:43 -0000	1.3
+++ tcpick.spec	30 Nov 2006 18:43:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPL
 Group: 		Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/it/man8/%{name}.8.gz
 
 %changelog
+* Wed Nov 29 2006 Robert Scheck  0.2.1-11
+- Rebuilt
+
 * Sun Sep 10 2006 Robert Scheck  0.2.1-10
 - Better workaround for CVE-2006-0048 to make tcpick usable again
 - Added patches for double-free, broken pointers and getopt on ppc



From fedora-extras-commits at redhat.com  Thu Nov 30 18:44:49 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Thu, 30 Nov 2006 13:44:49 -0500
Subject: rpms/tcpick/FC-6 tcpick.spec,1.3,1.4
Message-ID: <200611301844.kAUIinW8004792@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4774

Modified Files:
	tcpick.spec 
Log Message:
Rebuilt



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/FC-6/tcpick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcpick.spec	9 Sep 2006 22:39:43 -0000	1.3
+++ tcpick.spec	30 Nov 2006 18:44:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPL
 Group: 		Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/it/man8/%{name}.8.gz
 
 %changelog
+* Wed Nov 29 2006 Robert Scheck  0.2.1-11
+- Rebuilt
+
 * Sun Sep 10 2006 Robert Scheck  0.2.1-10
 - Better workaround for CVE-2006-0048 to make tcpick usable again
 - Added patches for double-free, broken pointers and getopt on ppc



From fedora-extras-commits at redhat.com  Thu Nov 30 18:45:59 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Thu, 30 Nov 2006 13:45:59 -0500
Subject: rpms/tcpick/FC-5 tcpick.spec,1.3,1.4
Message-ID: <200611301845.kAUIjxbF004882@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4862

Modified Files:
	tcpick.spec 
Log Message:
Rebuilt



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/FC-5/tcpick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcpick.spec	9 Sep 2006 22:41:35 -0000	1.3
+++ tcpick.spec	30 Nov 2006 18:45:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPL
 Group: 		Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/it/man8/%{name}.8.gz
 
 %changelog
+* Wed Nov 29 2006 Robert Scheck  0.2.1-11
+- Rebuilt
+
 * Sun Sep 10 2006 Robert Scheck  0.2.1-10
 - Better workaround for CVE-2006-0048 to make tcpick usable again
 - Added patches for double-free, broken pointers and getopt on ppc



From fedora-extras-commits at redhat.com  Thu Nov 30 18:47:08 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Thu, 30 Nov 2006 13:47:08 -0500
Subject: rpms/tcpick/FC-4 tcpick.spec,1.3,1.4
Message-ID: <200611301847.kAUIl8QV004951@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4931

Modified Files:
	tcpick.spec 
Log Message:
Rebuilt



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/FC-4/tcpick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcpick.spec	9 Sep 2006 22:43:15 -0000	1.3
+++ tcpick.spec	30 Nov 2006 18:46:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPL
 Group: 		Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/it/man8/%{name}.8.gz
 
 %changelog
+* Wed Nov 29 2006 Robert Scheck  0.2.1-11
+- Rebuilt
+
 * Sun Sep 10 2006 Robert Scheck  0.2.1-10
 - Better workaround for CVE-2006-0048 to make tcpick usable again
 - Added patches for double-free, broken pointers and getopt on ppc



From fedora-extras-commits at redhat.com  Thu Nov 30 19:27:06 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 30 Nov 2006 14:27:06 -0500
Subject: rpms/plague/FC-3 plague-0.4.4-old-createrepo.patch,NONE,1.1
Message-ID: <200611301927.kAUJR6vX008322@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8315

Added Files:
	plague-0.4.4-old-createrepo.patch 
Log Message:
work around older createrepo versions that lack caching

plague-0.4.4-old-createrepo.patch:

--- NEW FILE plague-0.4.4-old-createrepo.patch ---
--- plague-0.4.4.1/server/Repo.py.old-createrepo	2006-11-30 14:29:59.000000000 -0500
+++ plague-0.4.4.1/server/Repo.py	2006-11-30 14:30:18.000000000 -0500
@@ -118,7 +118,7 @@
 
         self._repo_additions = []
 
-        (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % (self._repo_cache_dir, self._repodir))
+        (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % self._repodir)
         if s != 0:
             print "Error: createrepo failed with exit status %d!  Output: '%s'" % (s, o)
 



From fedora-extras-commits at redhat.com  Thu Nov 30 19:43:57 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 30 Nov 2006 14:43:57 -0500
Subject: rpms/syck/devel syck.spec,1.6,1.7
Message-ID: <200611301943.kAUJhvJO008441@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8421

Modified Files:
	syck.spec 
Log Message:
* Thu Nov 30 2006 Jason L Tibbitts III  - 0.55-11
- Rebuild for updated php.



Index: syck.spec
===================================================================
RCS file: /cvs/extras/rpms/syck/devel/syck.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- syck.spec	1 Sep 2006 14:04:00 -0000	1.6
+++ syck.spec	30 Nov 2006 19:43:27 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:		YAML for C, Python, and PHP
 
 Version:		0.55
-Release:		10%{?dist}
+Release:		11%{?dist}
 
 License:		BSD
 Group:			System Environment/Libraries
@@ -185,6 +185,9 @@
 %{php_extdir}/*.so
 
 %changelog
+* Thu Nov 30 2006 Jason L Tibbitts III  - 0.55-11
+- Rebuild for updated php.
+
 * Fri Sep 01 2006 Jason L Tibbitts III  - 0.55-10
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 19:48:41 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 30 Nov 2006 14:48:41 -0500
Subject: rpms/gtkmozembedmm/FC-6 gtkmozembedmm.spec,1.8,1.9
Message-ID: <200611301948.kAUJmf3Y008519@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8493

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/FC-6/gtkmozembedmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtkmozembedmm.spec	23 Nov 2006 13:07:08 -0000	1.8
+++ gtkmozembedmm.spec	30 Nov 2006 19:48:11 -0000	1.9
@@ -1,4 +1,4 @@
-%define gecko_ver 1.8.1
+%define gecko_ver 1.8.0.8
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
 Release:        6%{?dist}



From fedora-extras-commits at redhat.com  Thu Nov 30 20:17:40 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 30 Nov 2006 15:17:40 -0500
Subject: rpms/gliv/FC-5 gliv.spec,1.1,1.2
Message-ID: <200611302017.kAUKHeRP011721@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11702/FC-5

Modified Files:
	gliv.spec 
Log Message:
Added missing BR for FC5


Index: gliv.spec
===================================================================
RCS file: /cvs/extras/rpms/gliv/FC-5/gliv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gliv.spec	22 Nov 2006 18:20:26 -0000	1.1
+++ gliv.spec	30 Nov 2006 20:17:10 -0000	1.2
@@ -5,7 +5,7 @@
 Summary:	Image viewing utility
 Name:		gliv
 Version:	1.9.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://guichaz.free.fr/gliv/
@@ -14,6 +14,7 @@
 BuildRequires: gtk2-devel >= 2.6.0
 BuildRequires: gtkglext-devel >= 0.7.0
 BuildRequires: desktop-file-utils
+BuildRequires: libGL-devel
 
 %description
 GLiv is an OpenGL image viewer. GLiv is very fast and smooth at rotating,
@@ -88,6 +89,9 @@
 
 %changelog
 
+* Thu Nov 30 2006 Peter Lemenkov  1.9.6-3
+- added missing BR
+
 * Wed Nov 22 2006 Peter Lemenkov  1.9.6-2
 - Spec cleanup
 



From fedora-extras-commits at redhat.com  Thu Nov 30 20:42:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 15:42:45 -0500
Subject: fedora-security/audit fe3, 1.35, 1.36 fe4, 1.102, 1.103 fe5, 1.111,
	1.112
Message-ID: <200611302042.kAUKgjmj011888@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11869

Modified Files:
	fe3 fe4 fe5 
Log Message:
Note FE[345] tin fixes.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fe3	27 Nov 2006 20:49:17 -0000	1.35
+++ fe3	30 Nov 2006 20:42:45 -0000	1.36
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
+CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
@@ -60,7 +60,7 @@
 CVE-2006-0840 VULNERABLE (mantis) bz#191089
 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297
 CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
-CVE-2006-0804 VULNERABLE (tin, fixed 1.8.1) #217422
+CVE-2006-0804 version (tin, fixed 1.8.1) #217422
 CVE-2006-0760 ** version (lighttpd, fixed 1.4.10))
 CVE-2006-0665 VULNERABLE (mantis) bz#191089
 CVE-2006-0664 VULNERABLE (mantis) bz#191089


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fe4	27 Nov 2006 20:49:17 -0000	1.102
+++ fe4	30 Nov 2006 20:42:45 -0000	1.103
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
+CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fe5	30 Nov 2006 17:40:00 -0000	1.111
+++ fe5	30 Nov 2006 20:42:45 -0000	1.112
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
+CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077



From fedora-extras-commits at redhat.com  Thu Nov 30 20:53:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 15:53:25 -0500
Subject: rpms/lirc/devel .cvsignore, 1.12, 1.13 lirc.spec, 1.18, 1.19 sources,
	1.12, 1.13
Message-ID: <200611302053.kAUKrPnP011951@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11932

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Thu Nov 30 2006 Ville Skytt??  - 0.8.1-0.2.pre3
- 0.8.1pre3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Oct 2006 20:24:14 -0000	1.12
+++ .cvsignore	30 Nov 2006 20:52:55 -0000	1.13
@@ -1 +1 @@
-lirc-0.8.1pre2.tar.bz2
+lirc-0.8.1pre3.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lirc.spec	15 Oct 2006 20:23:20 -0000	1.18
+++ lirc.spec	30 Nov 2006 20:52:55 -0000	1.19
@@ -16,14 +16,14 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre2%{?dist}
+Release:        0.2.pre3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre2.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre3.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +81,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}pre3
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Ville Skytt??  - 0.8.1-0.2.pre3
+- 0.8.1pre3.
+
 * Sun Oct 15 2006 Ville Skytt??  - 0.8.1-0.2.pre2
 - 0.8.1pre2, optflags patch no longer needed.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Oct 2006 20:24:14 -0000	1.12
+++ sources	30 Nov 2006 20:52:55 -0000	1.13
@@ -1 +1 @@
-c8c1f5f692222050bcbafbf1ba6a1217  lirc-0.8.1pre2.tar.bz2
+68ea2f504f45e528ee8b5d3ff23c5181  lirc-0.8.1pre3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 20:58:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 15:58:36 -0500
Subject: fedora-security/audit fe3, 1.36, 1.37 fe4, 1.103, 1.104 fe5, 1.112, 
	1.113 fe6, 1.27, 1.28
Message-ID: <200611302058.kAUKwaQO012079@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12058

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
Catch up with new proftpd 1.3.0* CVE ids.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fe3	30 Nov 2006 20:42:45 -0000	1.36
+++ fe3	30 Nov 2006 20:58:36 -0000	1.37
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-6171 VULNERABLE (proftpd) #214820
+CVE-2006-6170 VULNERABLE (proftpd) #214820
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fe4	30 Nov 2006 20:42:45 -0000	1.103
+++ fe4	30 Nov 2006 20:58:36 -0000	1.104
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-6171 VULNERABLE (proftpd) #214820
+CVE-2006-6170 VULNERABLE (proftpd) #214820
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fe5	30 Nov 2006 20:42:45 -0000	1.112
+++ fe5	30 Nov 2006 20:58:36 -0000	1.113
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fe6	30 Nov 2006 17:40:00 -0000	1.27
+++ fe6	30 Nov 2006 20:58:36 -0000	1.28
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
 CVE-2006-6122 ignore (tin, <= 1.8.1 not shipped)
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263



From fedora-extras-commits at redhat.com  Thu Nov 30 20:58:59 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 30 Nov 2006 15:58:59 -0500
Subject: rpms/codeblocks/devel .cvsignore, 1.9, 1.10 codeblocks.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200611302058.kAUKwxXx012084@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12038

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3315


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Nov 2006 20:26:57 -0000	1.9
+++ .cvsignore	30 Nov 2006 20:58:29 -0000	1.10
@@ -1 +1 @@
-codeblocks-svn3295.tar.bz2
+codeblocks-svn3315.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- codeblocks.spec	28 Nov 2006 20:26:57 -0000	1.8
+++ codeblocks.spec	30 Nov 2006 20:58:29 -0000	1.9
@@ -1,9 +1,9 @@
-%define		rev	3295
-%define		date	20061128
+%define		rev	3315
+%define		date	20061130
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.16.%{date}svn%{rev}%{?dist}
+Release:	0.17.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -67,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -207,6 +207,7 @@
 %{pkgdatadir}/keybinder.zip
 %{pkgdatadir}/lib_finder.zip
 %{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/RegExTestbed.zip
 %{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
@@ -223,11 +224,15 @@
 %{plugindir}/libkeybinder.so
 %{plugindir}/liblib_finder.so
 %{plugindir}/libProfiler.so
+%{plugindir}/libRegExTestbed.so
 %{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Thu Nov 30 2006 Dan Horak  1.0-0.17.20061130svn3315
+- update to revision 3315
+
 * Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
 - update to revision 3295
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Nov 2006 20:26:57 -0000	1.9
+++ sources	30 Nov 2006 20:58:29 -0000	1.10
@@ -1 +1 @@
-74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2
+be8df0b63fa5f452b7f2be72413aab33  codeblocks-svn3315.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 21:04:32 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 30 Nov 2006 16:04:32 -0500
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.9, 1.10 codeblocks.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200611302104.kAUL4WhD015230@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15207

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3315


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Nov 2006 20:33:49 -0000	1.9
+++ .cvsignore	30 Nov 2006 21:04:02 -0000	1.10
@@ -1 +1 @@
-codeblocks-svn3295.tar.bz2
+codeblocks-svn3315.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- codeblocks.spec	28 Nov 2006 20:33:49 -0000	1.8
+++ codeblocks.spec	30 Nov 2006 21:04:02 -0000	1.9
@@ -1,9 +1,9 @@
-%define		rev	3295
-%define		date	20061128
+%define		rev	3315
+%define		date	20061130
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.16.%{date}svn%{rev}%{?dist}
+Release:	0.17.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -67,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -207,6 +207,7 @@
 %{pkgdatadir}/keybinder.zip
 %{pkgdatadir}/lib_finder.zip
 %{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/RegExTestbed.zip
 %{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
@@ -223,11 +224,15 @@
 %{plugindir}/libkeybinder.so
 %{plugindir}/liblib_finder.so
 %{plugindir}/libProfiler.so
+%{plugindir}/libRegExTestbed.so
 %{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Thu Nov 30 2006 Dan Horak  1.0-0.17.20061130svn3315
+- update to revision 3315
+
 * Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
 - update to revision 3295
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Nov 2006 20:33:49 -0000	1.9
+++ sources	30 Nov 2006 21:04:02 -0000	1.10
@@ -1 +1 @@
-74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2
+be8df0b63fa5f452b7f2be72413aab33  codeblocks-svn3315.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 21:07:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 16:07:46 -0500
Subject: fedora-security/audit fe3, 1.37, 1.38 fe4, 1.104, 1.105 fe5, 1.113, 
	1.114 fe6, 1.28, 1.29
Message-ID: <200611302107.kAUL7k0e015316@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15295

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- fe3	30 Nov 2006 20:58:36 -0000	1.37
+++ fe3	30 Nov 2006 21:07:45 -0000	1.38
@@ -4,6 +4,7 @@
 
 CVE-2006-6171 VULNERABLE (proftpd) #214820
 CVE-2006-6170 VULNERABLE (proftpd) #214820
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fe4	30 Nov 2006 20:58:36 -0000	1.104
+++ fe4	30 Nov 2006 21:07:45 -0000	1.105
@@ -4,6 +4,7 @@
 
 CVE-2006-6171 VULNERABLE (proftpd) #214820
 CVE-2006-6170 VULNERABLE (proftpd) #214820
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fe5	30 Nov 2006 20:58:36 -0000	1.113
+++ fe5	30 Nov 2006 21:07:45 -0000	1.114
@@ -4,6 +4,7 @@
 
 CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
 CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fe6	30 Nov 2006 20:58:36 -0000	1.28
+++ fe6	30 Nov 2006 21:07:45 -0000	1.29
@@ -4,6 +4,7 @@
 
 CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
 CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950
 CVE-2006-6122 ignore (tin, <= 1.8.1 not shipped)
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263



From fedora-extras-commits at redhat.com  Thu Nov 30 21:10:32 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 30 Nov 2006 16:10:32 -0500
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.9, 1.10 codeblocks.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200611302110.kAULAWcS015354@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15331

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3315


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Nov 2006 20:36:17 -0000	1.9
+++ .cvsignore	30 Nov 2006 21:10:02 -0000	1.10
@@ -1 +1 @@
-codeblocks-svn3295.tar.bz2
+codeblocks-svn3315.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- codeblocks.spec	28 Nov 2006 20:36:17 -0000	1.8
+++ codeblocks.spec	30 Nov 2006 21:10:02 -0000	1.9
@@ -1,9 +1,9 @@
-%define		rev	3295
-%define		date	20061128
+%define		rev	3315
+%define		date	20061130
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.16.%{date}svn%{rev}%{?dist}
+Release:	0.17.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -67,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -207,6 +207,7 @@
 %{pkgdatadir}/keybinder.zip
 %{pkgdatadir}/lib_finder.zip
 %{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/RegExTestbed.zip
 %{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
@@ -223,11 +224,15 @@
 %{plugindir}/libkeybinder.so
 %{plugindir}/liblib_finder.so
 %{plugindir}/libProfiler.so
+%{plugindir}/libRegExTestbed.so
 %{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Thu Nov 30 2006 Dan Horak  1.0-0.17.20061130svn3315
+- update to revision 3315
+
 * Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
 - update to revision 3295
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Nov 2006 20:36:17 -0000	1.9
+++ sources	30 Nov 2006 21:10:02 -0000	1.10
@@ -1 +1 @@
-74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2
+be8df0b63fa5f452b7f2be72413aab33  codeblocks-svn3315.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 21:45:27 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu, 30 Nov 2006 16:45:27 -0500
Subject: fedora-security/audit fc5,1.404,1.405 fc6,1.155,1.156
Message-ID: <200611302145.kAULjRRE015595@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15578

Modified Files:
	fc5 fc6 
Log Message:
Note a new libgsf issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- fc5	29 Nov 2006 08:58:59 -0000	1.404
+++ fc5	30 Nov 2006 21:45:26 -0000	1.405
@@ -3,7 +3,6 @@
 
 
 ** are items that need attention
-
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
 CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 ignore (kernel, fixed **) separate modules
@@ -105,6 +104,7 @@
 CVE-2006-4561 VULNERABLE (firefox)
 CVE-2006-4538 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] ia64 and sparc only
 CVE-2006-4535 version (kernel, fixed 2.6.17.12, fixed 2.6.18-rc6) [since FEDORA-2006-967]
+CVE-2006-4514 VULNERABLE (libgsf, fixed 1.14.2) #217957
 CVE-2006-4507 ignore (libtiff) can't reproduce
 CVE-2006-4486 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
 CVE-2006-4485 version (php, fixed 5.1.5) [since FEDORA-2006-1024]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- fc6	29 Nov 2006 08:58:59 -0000	1.155
+++ fc6	30 Nov 2006 21:45:27 -0000	1.156
@@ -98,6 +98,7 @@
 CVE-2006-4561 VULNERABLE (firefox)
 CVE-2006-4538 version (kernel, fixed after 2.6.18-rc6)
 CVE-2006-4535 version (kernel, fixed 2.6.18-rc6)
+CVE-2006-4514 VULNERABLE (libgsf, fixed 1.14.2) #217957
 CVE-2006-4507 ignore (libtiff) can't reproduce
 CVE-2006-4486 version (php, fixed 5.1.6)
 CVE-2006-4485 version (php, fixed 5.1.5)



From fedora-extras-commits at redhat.com  Thu Nov 30 22:17:23 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:17:23 -0500
Subject: rpms/devilspie - New directory
Message-ID: <200611302217.kAUMHNEt018817@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18813/devilspie

Log Message:
Directory /cvs/extras/rpms/devilspie added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 22:17:28 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:17:28 -0500
Subject: rpms/devilspie/devel - New directory
Message-ID: <200611302217.kAUMHSSD018830@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18813/devilspie/devel

Log Message:
Directory /cvs/extras/rpms/devilspie/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 22:17:47 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:17:47 -0500
Subject: rpms/devilspie Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611302217.kAUMHlGw018867@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18861

Added Files:
	Makefile import.log 
Log Message:
Setup of module devilspie


--- NEW FILE Makefile ---
# Top level Makefile for module devilspie
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 Nov 30 22:17:52 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:17:52 -0500
Subject: rpms/devilspie/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611302217.kAUMHqqF018884@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18861/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module devilspie


--- 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 Nov 30 22:19:04 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:19:04 -0500
Subject: rpms/devilspie import.log,1.1,1.2
Message-ID: <200611302219.kAUMJ4hL018963@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18933

Modified Files:
	import.log 
Log Message:
auto-import devilspie-0.18-1.fc6 on branch devel from devilspie-0.18-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/devilspie/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 22:17:47 -0000	1.1
+++ import.log	30 Nov 2006 22:18:34 -0000	1.2
@@ -0,0 +1 @@
+devilspie-0_18-1_fc6:HEAD:devilspie-0.18-1.fc6.src.rpm:1164925319



From fedora-extras-commits at redhat.com  Thu Nov 30 22:19:05 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:19:05 -0500
Subject: rpms/devilspie/devel devilspie.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611302219.kAUMJ5mE018967@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18933/devel

Modified Files:
	.cvsignore sources 
Added Files:
	devilspie.spec 
Log Message:
auto-import devilspie-0.18-1.fc6 on branch devel from devilspie-0.18-1.fc6.src.rpm


--- NEW FILE devilspie.spec ---
Name:           devilspie
Version:        0.18
Release:        1%{?dist}
Summary:        A window-matching utility

Group:          User Interface/X
License:        GPL
URL:            http://www.burtonini.com/blog/computers/devilspie
Source0:        http://www.burtonini.com/computing/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libwnck-devel
BuildRequires:  libpng-devel
BuildRequires:  libxml2-devel
BuildRequires:  gettext
BuildRequires:  gob2
BuildRequires:  perl-XML-Parser

%description
A window-matching utility, inspired by Sawfish's "Matched Windows" option and
the lack such functionality in Metacity. Devil's Pie can be configured to
detect windows as they are created, and match the window to a set of rules. If
the window matches the rules, it can perform a series of actions on that
window. 

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING TODO
%{_bindir}/devilspie
%{_mandir}/man1/devilspie.1.gz

%changelog
* Wed Oct 25 2006 Sebastian Vahl  0.18-1
- New upstream version: 0.18

* Wed Aug 23 2006 Sebastian Vahl  0.17.1-2
- removed redundant dependencies: atk-devel gtk2-devel pango-devel
- shorten summary and description
- fixed rpmlint in spec error: mixed-use-of-spaces-and-tabs

* Wed Mar 08 2006 Sebastian Vahl  0.17.1-1
- New upstream version: 0.17.1

* Mon Jan 09 2006 Sebastian Vahl  0.16-1
- New upstream version: 0.16

* Mon Jul 18 2005 Menno Smits  0.10-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/devilspie/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 22:17:52 -0000	1.1
+++ .cvsignore	30 Nov 2006 22:18:34 -0000	1.2
@@ -0,0 +1 @@
+devilspie-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/devilspie/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 22:17:52 -0000	1.1
+++ sources	30 Nov 2006 22:18:34 -0000	1.2
@@ -0,0 +1 @@
+148537a51037875aaba91b3822055332  devilspie-0.18.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 22:24:32 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:24:32 -0500
Subject: owners owners.list,1.2041,1.2042
Message-ID: <200611302224.kAUMOWjl019047@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19017

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2041
retrieving revision 1.2042
diff -u -r1.2041 -r1.2042
--- owners.list	30 Nov 2006 16:51:34 -0000	1.2041
+++ owners.list	30 Nov 2006 22:24:02 -0000	1.2042
@@ -305,6 +305,7 @@
 Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|deutex|Doom wad manipulation tool|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|DevIL|A cross-platform image library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
+Fedora Extras|devilspie|A window-matching utility|fedora at deadbabylon.de|extras-qa at fedoraproject.org|
 Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|dia|A diagram drawing program|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 22:27:07 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:27:07 -0500
Subject: rpms/pgfouine - New directory
Message-ID: <200611302227.kAUMR74D019123@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19119/pgfouine

Log Message:
Directory /cvs/extras/rpms/pgfouine added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 22:27:12 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:27:12 -0500
Subject: rpms/pgfouine/devel - New directory
Message-ID: <200611302227.kAUMRCVR019137@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19119/pgfouine/devel

Log Message:
Directory /cvs/extras/rpms/pgfouine/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 22:27:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:27:34 -0500
Subject: rpms/pgfouine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611302227.kAUMRYCL019177@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19171

Added Files:
	Makefile import.log 
Log Message:
Setup of module pgfouine


--- NEW FILE Makefile ---
# Top level Makefile for module pgfouine
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 Nov 30 22:27:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:27:40 -0500
Subject: rpms/pgfouine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611302227.kAUMRere019192@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19171/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pgfouine


--- 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 Nov 30 22:29:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:29:21 -0500
Subject: rpms/pgfouine import.log,1.1,1.2
Message-ID: <200611302229.kAUMTL1k019284@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19248

Modified Files:
	import.log 
Log Message:
auto-import pgfouine-0.7.1-2 on branch devel from pgfouine-0.7.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 22:27:34 -0000	1.1
+++ import.log	30 Nov 2006 22:28:51 -0000	1.2
@@ -0,0 +1 @@
+pgfouine-0_7_1-2:HEAD:pgfouine-0.7.1-2.src.rpm:1164925885



From fedora-extras-commits at redhat.com  Thu Nov 30 22:29:22 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:29:22 -0500
Subject: rpms/pgfouine/devel pgfouine-0.7-include_path.patch, NONE,
	1.1 pgfouine-tutorial.txt, NONE, 1.1 pgfouine.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611302229.kAUMTM60019288@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19248/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pgfouine-0.7-include_path.patch pgfouine-tutorial.txt 
	pgfouine.spec 
Log Message:
auto-import pgfouine-0.7.1-2 on branch devel from pgfouine-0.7.1-2.src.rpm

pgfouine-0.7-include_path.patch:

--- NEW FILE pgfouine-0.7-include_path.patch ---
--- pgfouine_vacuum.php.orig	2006-08-11 00:13:57.797229593 +0200
+++ pgfouine_vacuum.php	2006-08-11 00:15:16.800770504 +0200
@@ -30,6 +30,8 @@
 	error_reporting(E_ALL);
 }
 
+ini_set('include_path', '@INCLUDEPATH@');
+
 include('version.php');
 require_once('include/lib/common.lib.php');
 require_once('include/base.lib.php');

--- pgfouine.php.orig	2006-08-11 00:17:07.628330143 +0200
+++ pgfouine.php	2006-08-11 00:18:39.298492488 +0200
@@ -30,6 +30,8 @@
 	error_reporting(E_ALL);
 }
 
+ini_set('include_path', '@INCLUDEPATH@');
+
 include('version.php');
 require_once('include/lib/common.lib.php');
 require_once('include/base.lib.php');


--- NEW FILE pgfouine-tutorial.txt ---
Installation instructions & Tutorial
Installation

You can either untar the pgFouine tarball or install the RPM package.

    * If you use the tarball, pgFouine is installed locally and can be 
run with ./pgfouine.php in the directory where you installed it.
    * If you install the RPM package, pgFouine is installed globally 
and you can run pgFouine with pgfouine.php.

How to enable query logging
PostgreSQL 7.x

Edit your postgresql.conf file (usually located in 
/var/lib/pgsql/data/) and set the following configuration directives:

    * To log queries slower than n milliseconds:

      syslog = 2
      log_min_duration_statement = n
      log_duration = false
      log_statement = false

      To log every query executed, set log_min_duration_statement to 0. 
Set it to -1 to disable query logging.
    * To log queries slower than n milliseconds AND duration for ALL 
queries (it only works with PostgreSQL 7.x; pgFouine counts every 
duration only once):

      syslog = 2
      log_min_duration_statement = n
      log_duration = true
      log_statement = false

Then edit your /etc/syslog.conf to set up a PostgreSQL facility:

local0.*		-/var/log/pgsql

You should also ignore PostgreSQL facility for the default log file otherwise you will log the queries twice:

*.info;mail.none;authpriv.none;cron.none;local0.none                /var/log/messages

Restart syslogd and PostgreSQL.

Apart from the extra I/O, the overhead of logging is barely noticeable. 
You can set syslog to send the log to another server through the 
network with @ip.ad.dr.ess.


PostgreSQL 8.x
Syslog configuration

Edit your postgresql.conf file (usually located in 
/var/lib/pgsql/data/) and set the following configuration directives:

    * To enable syslog logging:

      log_destination = 'syslog'
      redirect_stderr = off
      silent_mode = on

    * To log queries slower than n milliseconds:

      log_min_duration_statement = n
      log_duration = off
      log_statement = 'none'

      To log every query executed, set log_min_duration_statement to 0. Set it to -1 to disable query logging.

Then edit your /etc/syslog.conf to set up a PostgreSQL facility:

local0.*		-/var/log/pgsql

You should also ignore PostgreSQL facility for the default log file 
otherwise you will log the queries twice:

*.info;mail.none;authpriv.none;cron.none;local0.none                /var/log/messages

Restart syslogd and PostgreSQL.

Apart from the extra I/O, the overhead of logging is barely noticeable. 
You can set syslog to send the log to another server through the 
network with @ip.ad.dr.ess.


Filter on database and/or user

You can filter your log file on database and user using the -database 
and -user options. To do so, you need to configure the following 
log_line_prefix:

log_line_prefix = 'user=%u,db=%d'

Using stderr log file

Using the following configuration, you can log to stderr instead of 
syslog. This is not recommended as we cannot guarantee the consistency 
of statements if they are multilines.

log_destination = 'stderr'
redirect_stderr = on
log_line_prefix = '%t [%p]: [%l-1] '

Usage

pgFouine is an easy to use command line tool. The following command 
generates an HTML report with all default options:

$ pgfouine.php -file your/log/file.log > your-report.html

The following command line displays a text report with only 10 queries 
in each list to the standard output:

$ pgfouine.php -file your/log/file.log -top 10 -format text

By using pgfouine.php -help, you can display the usage information.


--- NEW FILE pgfouine.spec ---
Summary:	PgFouine PostgreSQL log analyzer
Name:		pgfouine
Version:	0.7.1
Release:	2%{?dist}
BuildArch:	noarch
License:	GPL
Group:		Development/Tools
Source0:	http://pgfouine.projects.postgresql.org/releases/%{name}-%{version}.tar.gz
Source2:	pgfouine-tutorial.txt
URL: 		http://pgfouine.projects.postgresql.org
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1:		pgfouine-0.7-include_path.patch

%description
pgFouine is a PostgreSQL log analyzer. It generates text 
or HTML reports from PostgreSQL log files. These reports 
contain the list of the slowest queries, the queries that 
take the most time and so on.

pgFouine can also:
- analyze VACUUM VERBOSE output to help you improve your 
VACUUM strategy,
- generate Tsung sessions file to benchmark your 
PostgreSQL server.

%prep
%setup -q 
%patch1 -p0
sed -i 's!@INCLUDEPATH@!%{_datadir}/%{name}!' pgfouine_vacuum.php
sed -i 's!@INCLUDEPATH@!%{_datadir}/%{name}!' pgfouine.php

cp %{SOURCE2} .

%build

%install
# cleaning build environment
rm -rf %{buildroot}

# creating required directories
install -m 755 -d %{buildroot}/%{_datadir}/%{name}
install -m 755 -d %{buildroot}/%{_bindir}

# installing pgFouine
for i in include version.php; do
	cp -rp $i %{buildroot}/%{_datadir}/%{name}/
done

install -m 755 pgfouine.php %{buildroot}/%{_bindir}/
install -m 755 pgfouine_vacuum.php %{buildroot}/%{_bindir}/

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING THANKS README pgfouine-tutorial.txt
%attr(0755, root, root) %{_bindir}/pgfouine.php
%attr(0755, root, root) %{_bindir}/pgfouine_vacuum.php
%{_datadir}/%{name}

%changelog 
* Thu Nov 30 2006 Devrim Gunduz  - 0.7.1-2
- Added tutorial.txt per bugzilla review
* Sat Oct 28 2006 Guillaume Smet  - 0.7.1-1
- released 0.7.1
* Sun Sep 3 2006 Guillaume Smet  - 0.7-4
- fixed spec according to bugzilla #202901 comment #2
* Thu Aug 18 2006 Devrim Gunduz  - 0.7-3
- fixed spec, per bugzilla review
* Thu Aug 17 2006 Devrim Gunduz  - 0.7-2
- fixed rpmlint warnings, and made cosmetic changes
* Thu Aug 17 2006 Guillaume Smet 
- released 0.7
* Thu Aug 10 2006 Guillaume Smet 
- fixed RPM packaging for 0.7
* Wed Jul 19 2006 Guillaume Smet 
- added pgfouine_vacuum.php
* Sun May 21 2006 Guillaume Smet 
- released 0.6
* Sun Mar 26 2006 Guillaume Smet 
- released 0.5
* Tue Jan 10 2006 Guillaume Smet 
- released 0.2.1
* Sun Dec 4 2005 Guillaume Smet 
- released 0.2
* Fri Nov 18 2005 Guillaume Smet 
- initial RPM packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 22:27:40 -0000	1.1
+++ .cvsignore	30 Nov 2006 22:28:52 -0000	1.2
@@ -0,0 +1 @@
+pgfouine-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 22:27:40 -0000	1.1
+++ sources	30 Nov 2006 22:28:52 -0000	1.2
@@ -0,0 +1 @@
+79df9b088a9cd0a7741de0b5857dc3e7  pgfouine-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 23:49:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 18:49:34 -0500
Subject: owners owners.list,1.2042,1.2043
Message-ID: <200611302349.kAUNnYBU023230@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23205/owners

Modified Files:
	owners.list 
Log Message:
Added pgFouine



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2042
retrieving revision 1.2043
diff -u -r1.2042 -r1.2043
--- owners.list	30 Nov 2006 22:24:02 -0000	1.2042
+++ owners.list	30 Nov 2006 23:49:04 -0000	1.2043
@@ -1820,6 +1820,7 @@
 Fedora Extras|pessulus|A lockdown editor for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|pgfouine|PgFouine PostgreSQL log analyzer|devrim at commandprompt.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-adodb|Active Data Objects Data Base|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 23:50:28 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Thu, 30 Nov 2006 18:50:28 -0500
Subject: rpms/qcomicbook/devel .cvsignore, 1.3, 1.4 qcomicbook.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200611302350.kAUNoSLN023257@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23236

Modified Files:
	.cvsignore qcomicbook.spec sources 
Log Message:
Testing a new build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Oct 2006 16:29:41 -0000	1.3
+++ .cvsignore	30 Nov 2006 23:49:58 -0000	1.4
@@ -1 +1 @@
-qcomicbook-0.3.3.tar.gz
+qcomicbook-0.3.4.tar.gz


Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qcomicbook.spec	9 Oct 2006 16:43:27 -0000	1.8
+++ qcomicbook.spec	30 Nov 2006 23:49:58 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
-Version: 0.3.3
-Release: 5%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -60,6 +60,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Thu Nov 11 2006 Scott Baker  - 0.3.4-1
+- Update to the latest version
+
 * Mon Oct 09 2006 Scott Baker  - 0.3.3-5
 - Build on FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Oct 2006 16:29:41 -0000	1.3
+++ sources	30 Nov 2006 23:49:58 -0000	1.4
@@ -1 +1 @@
-a52b768ccca632a820094739e6aaec36  qcomicbook-0.3.3.tar.gz
+f93f29e0635f8fe64f036bf654050438  qcomicbook-0.3.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 00:14:50 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 31 Oct 2006 17:14:50 -0700
Subject: rpms/darcs/devel darcs.spec,1.13,1.14
Message-ID: <200611010014.kA10EoU1006854@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6828

Modified Files:
	darcs.spec 
Log Message:
rebuild for new libcurl



Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- darcs.spec	28 Sep 2006 05:09:19 -0000	1.13
+++ darcs.spec	1 Nov 2006 00:14:20 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           darcs
 Version:        1.0.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 Jens Petersen  - 1.0.8-4
+- rebuild for new libcurl
+
 * Thu Sep 28 2006 Jens Petersen  - 1.0.8-3
 - rebuild for FC6
 - enable make check



From fedora-extras-commits at redhat.com  Wed Nov  1 00:29:22 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 17:29:22 -0700
Subject: rpms/dap-freeform_handler/devel dap-freeform_handler.spec,1.8,1.9
Message-ID: <200611010029.kA10TMGS006950@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-freeform_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6929

Modified Files:
	dap-freeform_handler.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas  3.7.2-3
- rebuild for new libcurl soname (indirect dependency through libdap)



Index: dap-freeform_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/dap-freeform_handler.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dap-freeform_handler.spec	4 Oct 2006 22:46:12 -0000	1.8
+++ dap-freeform_handler.spec	1 Nov 2006 00:28:52 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:         FreeForm data handler for the OPeNDAP Data server
 Name:            dap-freeform_handler
 Version:         3.7.2
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/freeform_handler-%{version}.tar.gz
@@ -44,8 +44,11 @@
 %doc COPYING COPYRIGHT NEWS README
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas  3.7.2-3
+- rebuild for new libcurl soname (indirect dependency through libdap)
+
 * Thu Oct 05 2006 Christian Iseli  3.7.2-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
 
 * Wed Sep 20 2006 Patrice Dumas  3.7.2-1
 - update to 3.7.2



From fedora-extras-commits at redhat.com  Wed Nov  1 00:31:25 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 17:31:25 -0700
Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler.spec,1.12,1.13
Message-ID: <200611010031.kA10VPeS007043@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/dap-hdf4_handler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018

Modified Files:
	dap-hdf4_handler.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas  3.7.2-4
- rebuild for new libcurl soname (indirect dependency through libdap)



Index: dap-hdf4_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dap-hdf4_handler.spec	4 Oct 2006 22:44:55 -0000	1.12
+++ dap-hdf4_handler.spec	1 Nov 2006 00:30:55 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:         HDF4 data handler for the OPeNDAP Data server
 Name:            dap-hdf4_handler
 Version:         3.7.2
-Release:         3%{?dist}
+Release:         4%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz
@@ -20,7 +20,7 @@
 %setup -q -n hdf4_handler-%{version}
 
 %build
-%configure --disable-static
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -37,8 +37,11 @@
 %doc README
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas  3.7.2-4
+- rebuild for new libcurl soname (indirect dependency through libdap)
+
 * Thu Oct 05 2006 Christian Iseli  3.7.2-3
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Wed Sep 20 2006 Patrice Dumas  3.7.2-2
 - update to 3.7.2



From fedora-extras-commits at redhat.com  Wed Nov  1 00:33:44 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Oct 2006 17:33:44 -0700
Subject: rpms/grads/devel grads.spec,1.17,1.18
Message-ID: <200611010033.kA10XikR007115@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7090

Modified Files:
	grads.spec 
Log Message:
* Tue Oct 31 2006 Patrice Dumas  1.9b4-18
- rebuild for new libcurl soname (indirect dependency through libnc-dap)



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grads.spec	4 Oct 2006 22:36:59 -0000	1.17
+++ grads.spec	1 Nov 2006 00:33:14 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -107,8 +107,11 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Tue Oct 31 2006 Patrice Dumas  1.9b4-18
+- rebuild for new libcurl soname (indirect dependency through libnc-dap)
+
 * Thu Oct 05 2006 Christian Iseli  1.9b4-17
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Wed Sep 20 2006 Patrice Dumas  1.9b4-16
 - rebuild against libdap 3.7.2



From fedora-extras-commits at redhat.com  Wed Nov  1 02:01:37 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 31 Oct 2006 19:01:37 -0700
Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.2,1.3
Message-ID: <200611010201.kA121bQY013464@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10536

Modified Files:
	eclipse-emf.spec 
Log Message:
* Tue Oct 31 2006 Andrew Overholt  2.2.1-1
- Change usage of copy-platform to work with upcoming changes to SDK.
- Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation.



Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-emf.spec	30 Oct 2006 17:53:31 -0000	1.2
+++ eclipse-emf.spec	1 Nov 2006 02:01:06 -0000	1.3
@@ -144,7 +144,7 @@
 homedir=$(cd home > /dev/null && pwd)
 
 # See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+/bin/sh -x %{eclipse_base}/buildscripts/copy-platform `pwd`/SDK %{eclipse_base}
 SDK=$(cd SDK > /dev/null && pwd)
 
 # Build the EMF builder helper jars
@@ -165,6 +165,7 @@
 
 java -cp %{eclipse_base}/startup.jar                   \
      -Duser.home=$homedir                              \
+     -Dosgi.sharedConfiguration.area=$SDK/fragments/eclipse/configuration \
      org.eclipse.core.launcher.Main                    \
      -application org.eclipse.ant.core.antRunner       \
      -Dtype=plugin                                    \
@@ -501,6 +502,10 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
+* Tue Oct 31 2006 Andrew Overholt  2.2.1-1
+- Change usage of copy-platform to work with upcoming changes to SDK.
+- Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation.
+
 * Thu Oct 19 2006 Andrew Overholt  2.2.1-1
 - 2.2.1.
 - Add sdk package, fix up inter-dependencies to match upstream.



From fedora-extras-commits at redhat.com  Wed Nov  1 02:02:45 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Tue, 31 Oct 2006 19:02:45 -0700
Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.3,1.4
Message-ID: <200611010202.kA122j6L013492@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472

Modified Files:
	eclipse-emf.spec 
Log Message:
Bump release.


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-emf.spec	1 Nov 2006 02:01:06 -0000	1.3
+++ eclipse-emf.spec	1 Nov 2006 02:02:15 -0000	1.4
@@ -8,7 +8,7 @@
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
@@ -502,7 +502,7 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
-* Tue Oct 31 2006 Andrew Overholt  2.2.1-1
+* Tue Oct 31 2006 Andrew Overholt  2.2.1-2
 - Change usage of copy-platform to work with upcoming changes to SDK.
 - Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation.
 



From fedora-extras-commits at redhat.com  Wed Nov  1 02:36:54 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 31 Oct 2006 19:36:54 -0700
Subject: rpms/quarry/FC-3 .cvsignore, 1.3, 1.4 quarry.spec, 1.3, 1.4 sources,
	1.3, 1.4 gtp-client.diff, 1.1, NONE
Message-ID: <200611010236.kA12ask1013908@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/FC-3

Modified Files:
	.cvsignore quarry.spec sources 
Removed Files:
	gtp-client.diff 
Log Message:
Update to 0.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 13:34:11 -0000	1.3
+++ .cvsignore	1 Nov 2006 02:36:24 -0000	1.4
@@ -1 +1 @@
-quarry-0.1.19.tar.gz
+quarry-0.1.20.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/quarry.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quarry.spec	10 Oct 2006 00:35:01 -0000	1.3
+++ quarry.spec	1 Nov 2006 02:36:24 -0000	1.4
@@ -1,23 +1,20 @@
 Name:           quarry
-Version:        0.1.19
-Release:        2%{?dist}
+Version:        0.1.20
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Patch0:		gtp-client.diff
-#Source0:	quarry-%{version}.tar.bz2
-#Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
+BuildRequires:  desktop-file-utils
 BuildRequires:  librsvg2-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 Quarry is a multi-purpose GUI for several board games, at present Go, Amazons
@@ -29,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -44,10 +40,10 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --add-category X-Fedora \
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
 %find_lang %{name}
 
@@ -74,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Michel Salim  - 0.1.20-1
+- Update to 0.1.20
+
 * Mon Oct  9 2006 Michel Salim  - 0.1.19-2
 - Incorporated upstream patch to fix gtp-client string handling
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 13:34:11 -0000	1.3
+++ sources	1 Nov 2006 02:36:24 -0000	1.4
@@ -1 +1 @@
-15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz
+c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz


--- gtp-client.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 02:36:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 31 Oct 2006 19:36:55 -0700
Subject: rpms/quarry/FC-4 .cvsignore, 1.3, 1.4 quarry.spec, 1.3, 1.4 sources,
	1.3, 1.4 gtp-client.diff, 1.1, NONE
Message-ID: <200611010236.kA12at6E013913@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/FC-4

Modified Files:
	.cvsignore quarry.spec sources 
Removed Files:
	gtp-client.diff 
Log Message:
Update to 0.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 13:34:12 -0000	1.3
+++ .cvsignore	1 Nov 2006 02:36:25 -0000	1.4
@@ -1 +1 @@
-quarry-0.1.19.tar.gz
+quarry-0.1.20.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/quarry.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quarry.spec	10 Oct 2006 00:35:02 -0000	1.3
+++ quarry.spec	1 Nov 2006 02:36:25 -0000	1.4
@@ -1,23 +1,20 @@
 Name:           quarry
-Version:        0.1.19
-Release:        2%{?dist}
+Version:        0.1.20
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Patch0:		gtp-client.diff
-#Source0:	quarry-%{version}.tar.bz2
-#Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
+BuildRequires:  desktop-file-utils
 BuildRequires:  librsvg2-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 Quarry is a multi-purpose GUI for several board games, at present Go, Amazons
@@ -29,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -44,10 +40,10 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --add-category X-Fedora \
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
 %find_lang %{name}
 
@@ -74,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Michel Salim  - 0.1.20-1
+- Update to 0.1.20
+
 * Mon Oct  9 2006 Michel Salim  - 0.1.19-2
 - Incorporated upstream patch to fix gtp-client string handling
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 13:34:12 -0000	1.3
+++ sources	1 Nov 2006 02:36:25 -0000	1.4
@@ -1 +1 @@
-15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz
+c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz


--- gtp-client.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 02:37:01 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 31 Oct 2006 19:37:01 -0700
Subject: rpms/quarry/FC-5 .cvsignore, 1.3, 1.4 quarry.spec, 1.4, 1.5 sources,
	1.3, 1.4 gtp-client.diff, 1.1, NONE
Message-ID: <200611010237.kA12b1Tt013918@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/FC-5

Modified Files:
	.cvsignore quarry.spec sources 
Removed Files:
	gtp-client.diff 
Log Message:
Update to 0.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 13:34:17 -0000	1.3
+++ .cvsignore	1 Nov 2006 02:36:31 -0000	1.4
@@ -1 +1 @@
-quarry-0.1.19.tar.gz
+quarry-0.1.20.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/quarry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- quarry.spec	10 Oct 2006 00:35:03 -0000	1.4
+++ quarry.spec	1 Nov 2006 02:36:31 -0000	1.5
@@ -1,23 +1,20 @@
 Name:           quarry
-Version:        0.1.19
-Release:        2%{?dist}
+Version:        0.1.20
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Patch0:		gtp-client.diff
-#Source0:	quarry-%{version}.tar.bz2
-#Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
+BuildRequires:  desktop-file-utils
 BuildRequires:  librsvg2-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 Quarry is a multi-purpose GUI for several board games, at present Go, Amazons
@@ -29,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -44,10 +40,10 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --add-category X-Fedora \
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
 %find_lang %{name}
 
@@ -74,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Michel Salim  - 0.1.20-1
+- Update to 0.1.20
+
 * Mon Oct  9 2006 Michel Salim  - 0.1.19-2
 - Incorporated upstream patch to fix gtp-client string handling
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 13:34:17 -0000	1.3
+++ sources	1 Nov 2006 02:36:31 -0000	1.4
@@ -1 +1 @@
-15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz
+c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz


--- gtp-client.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 02:37:02 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 31 Oct 2006 19:37:02 -0700
Subject: rpms/quarry/FC-6 .cvsignore, 1.3, 1.4 quarry.spec, 1.4, 1.5 sources,
	1.3, 1.4 gtp-client.diff, 1.1, NONE
Message-ID: <200611010237.kA12b2qG013923@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/FC-6

Modified Files:
	.cvsignore quarry.spec sources 
Removed Files:
	gtp-client.diff 
Log Message:
Update to 0.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 13:34:18 -0000	1.3
+++ .cvsignore	1 Nov 2006 02:36:31 -0000	1.4
@@ -1 +1 @@
-quarry-0.1.19.tar.gz
+quarry-0.1.20.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/quarry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- quarry.spec	10 Oct 2006 00:35:03 -0000	1.4
+++ quarry.spec	1 Nov 2006 02:36:31 -0000	1.5
@@ -1,23 +1,20 @@
 Name:           quarry
-Version:        0.1.19
-Release:        2%{?dist}
+Version:        0.1.20
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Patch0:		gtp-client.diff
-#Source0:	quarry-%{version}.tar.bz2
-#Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
+BuildRequires:  desktop-file-utils
 BuildRequires:  librsvg2-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 Quarry is a multi-purpose GUI for several board games, at present Go, Amazons
@@ -29,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -44,10 +40,10 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --add-category X-Fedora \
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
 %find_lang %{name}
 
@@ -74,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Michel Salim  - 0.1.20-1
+- Update to 0.1.20
+
 * Mon Oct  9 2006 Michel Salim  - 0.1.19-2
 - Incorporated upstream patch to fix gtp-client string handling
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 13:34:18 -0000	1.3
+++ sources	1 Nov 2006 02:36:31 -0000	1.4
@@ -1 +1 @@
-15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz
+c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz


--- gtp-client.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 02:37:07 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 31 Oct 2006 19:37:07 -0700
Subject: rpms/quarry/devel .cvsignore, 1.3, 1.4 quarry.spec, 1.4, 1.5 sources,
	1.3, 1.4 gtp-client.diff, 1.1, NONE
Message-ID: <200611010237.kA12b7nN013928@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814/devel

Modified Files:
	.cvsignore quarry.spec sources 
Removed Files:
	gtp-client.diff 
Log Message:
Update to 0.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Oct 2006 13:34:18 -0000	1.3
+++ .cvsignore	1 Nov 2006 02:36:37 -0000	1.4
@@ -1 +1 @@
-quarry-0.1.19.tar.gz
+quarry-0.1.20.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- quarry.spec	10 Oct 2006 00:35:03 -0000	1.4
+++ quarry.spec	1 Nov 2006 02:36:37 -0000	1.5
@@ -1,23 +1,20 @@
 Name:           quarry
-Version:        0.1.19
-Release:        2%{?dist}
+Version:        0.1.20
+Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://home.gna.org/quarry/
 Source0:        http://download.gna.org/quarry/quarry-%{version}.tar.gz
-Patch0:		gtp-client.diff
-#Source0:	quarry-%{version}.tar.bz2
-#Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
+BuildRequires:  desktop-file-utils
 BuildRequires:  librsvg2-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 Quarry is a multi-purpose GUI for several board games, at present Go, Amazons
@@ -29,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -44,10 +40,10 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    --add-category X-Fedora \
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/quarry.desktop
 
 %find_lang %{name}
 
@@ -74,6 +70,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Michel Salim  - 0.1.20-1
+- Update to 0.1.20
+
 * Mon Oct  9 2006 Michel Salim  - 0.1.19-2
 - Incorporated upstream patch to fix gtp-client string handling
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Oct 2006 13:34:18 -0000	1.3
+++ sources	1 Nov 2006 02:36:37 -0000	1.4
@@ -1 +1 @@
-15314b4ec4f0c4bb5d0c7205e4a77f2e  quarry-0.1.19.tar.gz
+c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz


--- gtp-client.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 02:51:12 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 31 Oct 2006 19:51:12 -0700
Subject: rpms/scim-input-pad/devel scim-input-pad.spec,1.8,1.9
Message-ID: <200611010251.kA12pCVG014189@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-input-pad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171

Modified Files:
	scim-input-pad.spec 
Log Message:
- run autoconf for scim-input-pad-libexecdir.patch
- remove %%with_libstdc_preview



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-input-pad.spec	16 Sep 2006 15:52:34 -0000	1.8
+++ scim-input-pad.spec	1 Nov 2006 02:50:42 -0000	1.9
@@ -1,8 +1,6 @@
-%define with_libstdc_preview 0
-
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -15,9 +13,8 @@
 Patch1:         scim-input-pad-libexecdir.patch
 
 BuildRequires:  scim-devel
-%if %{with_libstdc_preview}
-Buildrequires:  libstdc++so7-devel
-%endif
+# patch1 touches configure.ac
+BuildRequires:  autoconf
 Requires:       scim
 
 %description
@@ -27,25 +24,16 @@
 %setup -q
 %patch0 -p0 -b .0-rpath
 %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 --disable-rpath
-%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 DESTDIR=${RPM_BUILD_ROOT} install
 
 rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/Helper/input-pad.la
@@ -75,6 +63,10 @@
 
 
 %changelog
+* Wed Nov  1 2006 Jens Petersen  - 0.1.1-7
+- run autoconf for scim-input-pad-libexecdir.patch
+- remove %%with_libstdc_preview
+
 * Sun Sep 17 2006 Ryo Dairiki  - 0.1.1-6
 - mass rebuilding
 



From fedora-extras-commits at redhat.com  Wed Nov  1 02:53:18 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 31 Oct 2006 19:53:18 -0700
Subject: rpms/scim-input-pad/FC-6 scim-input-pad.spec,1.8,1.9
Message-ID: <200611010253.kA12rIRQ014256@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-input-pad/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14238

Modified Files:
	scim-input-pad.spec 
Log Message:
- run autoconf for scim-input-pad-libexecdir.patch
- remove %%with_libstdc_preview



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-6/scim-input-pad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-input-pad.spec	16 Sep 2006 15:52:34 -0000	1.8
+++ scim-input-pad.spec	1 Nov 2006 02:52:48 -0000	1.9
@@ -1,8 +1,6 @@
-%define with_libstdc_preview 0
-
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -15,9 +13,8 @@
 Patch1:         scim-input-pad-libexecdir.patch
 
 BuildRequires:  scim-devel
-%if %{with_libstdc_preview}
-Buildrequires:  libstdc++so7-devel
-%endif
+# patch1 touches configure.ac
+BuildRequires:  autoconf
 Requires:       scim
 
 %description
@@ -27,25 +24,16 @@
 %setup -q
 %patch0 -p0 -b .0-rpath
 %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 --disable-rpath
-%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 DESTDIR=${RPM_BUILD_ROOT} install
 
 rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/Helper/input-pad.la
@@ -75,6 +63,10 @@
 
 
 %changelog
+* Wed Nov  1 2006 Jens Petersen  - 0.1.1-7
+- run autoconf for scim-input-pad-libexecdir.patch
+- remove %%with_libstdc_preview
+
 * Sun Sep 17 2006 Ryo Dairiki  - 0.1.1-6
 - mass rebuilding
 



From fedora-extras-commits at redhat.com  Wed Nov  1 02:56:49 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 31 Oct 2006 19:56:49 -0700
Subject: rpms/scim-input-pad/FC-5 scim-input-pad.spec,1.9,1.10
Message-ID: <200611010256.kA12unCj014326@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-input-pad/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14310

Modified Files:
	scim-input-pad.spec 
Log Message:
- run autoconf for scim-input-pad-libexecdir.patch



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-5/scim-input-pad.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-input-pad.spec	4 Aug 2006 07:07:29 -0000	1.9
+++ scim-input-pad.spec	1 Nov 2006 02:56:19 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -15,6 +15,8 @@
 Patch1:         scim-input-pad-libexecdir.patch
 
 BuildRequires:  scim-devel
+# patch1 touches configure.ac
+BuildRequires:  autoconf
 %if %{with_libstdc_preview}
 Buildrequires:  libstdc++so7-devel
 %endif
@@ -23,10 +25,13 @@
 %description
 Scim-input-pad is an on-screen input pad used to input symbols easily.
 
+
 %prep
 %setup -q
 %patch0 -p0 -b .0-rpath
 %patch1 -p1 -b .1-libexec
+# patch1 touches configure.ac
+autoconf
 
 
 %build
@@ -75,6 +80,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 Jens Petersen  - 0.1.1-6.fc5
+- run autoconf for scim-input-pad-libexecdir.patch
+
 * Fri Aug  4 2006 Jens Petersen  - 0.1.1-5.fc5
 - fix libexecdir in wrapper script for new module path
 - rebuild against new libstdc++so7 (#197718)



From fedora-extras-commits at redhat.com  Wed Nov  1 07:51:38 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 1 Nov 2006 00:51:38 -0700
Subject: rpms/deskbar-applet/devel .cvsignore, 1.14, 1.15 deskbar-applet.spec,
	1.32, 1.33 sources, 1.14, 1.15
Message-ID: <200611010751.kA17pckN030204@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30184

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.16.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Oct 2006 22:03:15 -0000	1.14
+++ .cvsignore	1 Nov 2006 07:51:07 -0000	1.15
@@ -1 +1 @@
-deskbar-applet-2.16.0.tar.bz2
+deskbar-applet-2.16.1.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- deskbar-applet.spec	28 Oct 2006 22:08:21 -0000	1.32
+++ deskbar-applet.spec	1 Nov 2006 07:51:07 -0000	1.33
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.16.0
-Release:        2%{?dist}
+Version:        2.16.1
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -91,6 +91,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Nov  1 2006 Luke Macken  - 2.16.1-1
+- 2.16.1
+
 * Sat Oct 28 2006 Luke Macken  - 2.16.0-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Oct 2006 22:03:15 -0000	1.14
+++ sources	1 Nov 2006 07:51:07 -0000	1.15
@@ -1 +1 @@
-9f14a65f75142cd5b233bf9376a1f946  deskbar-applet-2.16.0.tar.bz2
+b236c4d3d70fbc20164ba208de84e5db  deskbar-applet-2.16.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  1 08:31:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 1 Nov 2006 01:31:09 -0700
Subject: rpms/python-dialog/FC-6 python-dialog.spec,1.8,1.9
Message-ID: <200611010831.kA18V915000985@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/python-dialog/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930/FC-6

Modified Files:
	python-dialog.spec 
Log Message:
unghost *.pyo files


Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/FC-6/python-dialog.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-dialog.spec	30 Aug 2006 16:35:31 -0000	1.8
+++ python-dialog.spec	1 Nov 2006 08:30:39 -0000	1.9
@@ -1,10 +1,8 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?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-dialog
 Version:        2.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -15,7 +13,6 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:       python-abi = %{pyver}
 Requires:       dialog
 
 %description
@@ -43,12 +40,13 @@
 %files
 %defattr(-,root,root,-)
 %doc demo.py AUTHORS COPYING DEBUGGING README TODO
-%{python_sitelib}/dialog.py
-%{python_sitelib}/dialog.pyc
-%ghost %{python_sitelib}/dialog.pyo
+%{python_sitelib}/dialog.py*
 
 
 %changelog
+* Wed Nov 01 2006 Aurelien Bompard  2.7-5
+- unghost .pyo file
+
 * Wed Aug 30 2006 Aurelien Bompard  2.7-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov  1 08:31:10 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 1 Nov 2006 01:31:10 -0700
Subject: rpms/python-dialog/devel python-dialog.spec,1.8,1.9
Message-ID: <200611010831.kA18VAR6000988@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/python-dialog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930/devel

Modified Files:
	python-dialog.spec 
Log Message:
unghost *.pyo files


Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/devel/python-dialog.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-dialog.spec	30 Aug 2006 16:35:31 -0000	1.8
+++ python-dialog.spec	1 Nov 2006 08:30:40 -0000	1.9
@@ -1,10 +1,8 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?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-dialog
 Version:        2.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -15,7 +13,6 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:       python-abi = %{pyver}
 Requires:       dialog
 
 %description
@@ -43,12 +40,13 @@
 %files
 %defattr(-,root,root,-)
 %doc demo.py AUTHORS COPYING DEBUGGING README TODO
-%{python_sitelib}/dialog.py
-%{python_sitelib}/dialog.pyc
-%ghost %{python_sitelib}/dialog.pyo
+%{python_sitelib}/dialog.py*
 
 
 %changelog
+* Wed Nov 01 2006 Aurelien Bompard  2.7-5
+- unghost .pyo file
+
 * Wed Aug 30 2006 Aurelien Bompard  2.7-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov  1 08:31:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 1 Nov 2006 01:31:08 -0700
Subject: rpms/python-dialog/FC-5 python-dialog.spec,1.7,1.8
Message-ID: <200611010831.kA18V8bA000982@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/python-dialog/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930/FC-5

Modified Files:
	python-dialog.spec 
Log Message:
unghost *.pyo files


Index: python-dialog.spec
===================================================================
RCS file: /cvs/extras/rpms/python-dialog/FC-5/python-dialog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-dialog.spec	22 Feb 2006 15:59:31 -0000	1.7
+++ python-dialog.spec	1 Nov 2006 08:30:38 -0000	1.8
@@ -1,10 +1,8 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?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-dialog
 Version:        2.7
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Python interface to the Unix dialog utility
 
 Group:          Development/Languages
@@ -15,7 +13,6 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:       python-abi = %{pyver}
 Requires:       dialog
 
 %description
@@ -43,12 +40,16 @@
 %files
 %defattr(-,root,root,-)
 %doc demo.py AUTHORS COPYING DEBUGGING README TODO
-%{python_sitelib}/dialog.py
-%{python_sitelib}/dialog.pyc
-%ghost %{python_sitelib}/dialog.pyo
+%{python_sitelib}/dialog.py*
 
 
 %changelog
+* Wed Nov 01 2006 Aurelien Bompard  2.7-5
+- unghost .pyo file
+
+* Wed Aug 30 2006 Aurelien Bompard  2.7-4
+- rebuild
+
 * Wed Feb 22 2006 Aurelien Bompard  2.7-3
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Wed Nov  1 10:52:57 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 03:52:57 -0700
Subject: rpms/gdeskcal import.log,1.7,1.8
Message-ID: <200611011052.kA1AqvvR007557@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7524

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-1.0-4 on branch FC-5 from gdeskcal-1.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	8 Oct 2006 14:04:20 -0000	1.7
+++ import.log	1 Nov 2006 10:52:27 -0000	1.8
@@ -4,3 +4,4 @@
 gdeskcal-0_57_1-5:HEAD:gdeskcal-0.57.1-5.src.rpm:1144665627
 gdeskcal-0_57_1-5:FC-5:gdeskcal-0.57.1-5.src.rpm:1144665747
 gdeskcal-1_0-2:HEAD:gdeskcal-1.0-2.src.rpm:1160316248
+gdeskcal-1_0-4:FC-5:gdeskcal-1.0-4.src.rpm:1162378335



From fedora-extras-commits at redhat.com  Wed Nov  1 10:52:58 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 03:52:58 -0700
Subject: rpms/gdeskcal/FC-5 .cvsignore, 1.3, 1.4 gdeskcal.desktop, 1.2,
	1.3 gdeskcal.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200611011052.kA1AqwQL007563@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7524/FC-5

Modified Files:
	.cvsignore gdeskcal.desktop gdeskcal.spec sources 
Log Message:
auto-import gdeskcal-1.0-4 on branch FC-5 from gdeskcal-1.0-4.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:22:43 -0000	1.3
+++ .cvsignore	1 Nov 2006 10:52:28 -0000	1.4
@@ -1 +1 @@
-gDeskCal-0_57_1.tar.gz
+gDeskCal-1.0.tar.gz


Index: gdeskcal.desktop
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdeskcal.desktop	8 Nov 2004 04:22:43 -0000	1.2
+++ gdeskcal.desktop	1 Nov 2006 10:52:28 -0000	1.3
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=gDeskCal
-Comment=Calendar program for the Gnome Desktop.
+Name=gDeskcal
+Comment=A desktop calendar
 Exec=gdeskcal
 Icon=gdeskcal.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
+StartupNotify=true


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gdeskcal.spec	10 Apr 2006 10:42:40 -0000	1.9
+++ gdeskcal.spec	1 Nov 2006 10:52:28 -0000	1.10
@@ -1,11 +1,11 @@
 Name:           gdeskcal
-Version:        0.57.1
-Release:        5%{?dist}
+Version:        1.0
+Release:        4%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.pycage.de/software_gdeskcal.html
-Source0:        http://www.pycage.de/download/gDeskCal-0_57_1.tar.gz
+Source0:        http://www.pycage.de/download/gDeskCal-1.0.tar.gz
 Source1:        gdeskcal.png
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,45 +22,54 @@
 transparency with smooth alpha-blending and its appearance can be changed
 completely by using skins.
 
-
 %prep
 %setup -q -n gDeskCal-%{version}
 
 %build
-
+%configure
+make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p  ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/
-mkdir -p  ${RPM_BUILD_ROOT}/%{_datadir}
-cp -a code data po skins ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}/
-cp -a locale ${RPM_BUILD_ROOT}/%{_datadir}/
-cp -a gdeskcal ${RPM_BUILD_ROOT}/%{_libdir}/%{name}-%{version}
-mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}/
-ln -sf %{_libdir}/%{name}-%{version}/gdeskcal ${RPM_BUILD_ROOT}/%{_bindir}/
-install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gdeskcal.png
-%find_lang %{name}
+rm -rf %{buildroot}
+install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png
+make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
+%if "%{?fedora}" <= "6"
   --add-category X-Fedora                               \
+%endif
   %{SOURCE2}
 
+%find_lang gdesklets
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%post
+update-desktop-database &> /dev/null ||:
+
+%postun
+update-desktop-database &> /dev/null ||:
 
+%clean
+rm -rf %{buildroot}
 
-%files -f %{name}.lang
+%files -f gdesklets.lang
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE NEWS README README.i18n README.skins
+%doc AUTHORS NEWS README 
 %{_bindir}/gdeskcal
 %{_datadir}/applications/fedora-%{name}.desktop
+%exclude %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_libdir}/%{name}-%{version}
-
+%{_libdir}/%{name}/
 
 %changelog
+* Wed Nov 01 2006 Paul F. Johnson  1.0-4
+- added post and postun
+- conditional for the X-Fedora in the desktop icon
+- fixed the spec file
+
+* Sat Oct 07 2006 Paul F. Johnson  1.0-1
+- bump to new version
+
 * Fri Apr 7 2006 Paul F. Johnson  0.5.7.1-5
 - rebuilt
 - minor spec changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:22:43 -0000	1.3
+++ sources	1 Nov 2006 10:52:28 -0000	1.4
@@ -1 +1 @@
-c2c1de1046e9026558c51e90fe6f8a9e  gDeskCal-0_57_1.tar.gz
+eddbf6387b9937c067e9c437f1abfacf  gDeskCal-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 10:54:22 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 03:54:22 -0700
Subject: rpms/gdeskcal import.log,1.8,1.9
Message-ID: <200611011054.kA1AsMZe007651@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7620

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-1.0-4 on branch FC-6 from gdeskcal-1.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	1 Nov 2006 10:52:27 -0000	1.8
+++ import.log	1 Nov 2006 10:53:52 -0000	1.9
@@ -5,3 +5,4 @@
 gdeskcal-0_57_1-5:FC-5:gdeskcal-0.57.1-5.src.rpm:1144665747
 gdeskcal-1_0-2:HEAD:gdeskcal-1.0-2.src.rpm:1160316248
 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



From fedora-extras-commits at redhat.com  Wed Nov  1 10:54:23 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 03:54:23 -0700
Subject: rpms/gdeskcal/FC-6 gdeskcal.desktop, 1.2, 1.3 gdeskcal.spec, 1.12,
	1.13
Message-ID: <200611011054.kA1AsN4I007655@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7620/FC-6

Modified Files:
	gdeskcal.desktop gdeskcal.spec 
Log Message:
auto-import gdeskcal-1.0-4 on branch FC-6 from gdeskcal-1.0-4.src.rpm


Index: gdeskcal.desktop
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdeskcal.desktop	8 Nov 2004 04:22:43 -0000	1.2
+++ gdeskcal.desktop	1 Nov 2006 10:53:53 -0000	1.3
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=gDeskCal
-Comment=Calendar program for the Gnome Desktop.
+Name=gDeskcal
+Comment=A desktop calendar
 Exec=gdeskcal
 Icon=gdeskcal.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
+StartupNotify=true


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdeskcal.spec	11 Oct 2006 11:36:27 -0000	1.12
+++ gdeskcal.spec	1 Nov 2006 10:53:53 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils perl(XML::Parser)
+BuildRequires:  desktop-file-utils
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -22,7 +22,6 @@
 transparency with smooth alpha-blending and its appearance can be changed
 completely by using skins.
 
-
 %prep
 %setup -q -n gDeskCal-%{version}
 
@@ -32,33 +31,41 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_libdir}/%{name}
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-mkdir -p %{buildroot}%{_bindir}
-cp -a code data ical skins %{buildroot}/%{_libdir}/%{name}/
-install -m0755 gdeskcal %{buildroot}/%{_libdir}/%{name}/gdeskcal-bin
-ln -sf %{_libdir}/%{name}/gdeskcal-bin %{buildroot}/%{_bindir}/%{name}
 install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png
+make DESTDIR=%{buildroot} install
+
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
+%if "%{?fedora}" <= "6"
   --add-category X-Fedora                               \
+%endif
   %{SOURCE2}
 
+%find_lang gdesklets
+
+%post
+update-desktop-database &> /dev/null ||:
+
+%postun
+update-desktop-database &> /dev/null ||:
+
 %clean
 rm -rf %{buildroot}
 
-%files 
+%files -f gdesklets.lang
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS README 
 %{_bindir}/gdeskcal
 %{_datadir}/applications/fedora-%{name}.desktop
+%exclude %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_libdir}/%{name}
-
+%{_libdir}/%{name}/
 
 %changelog
-* Sun Oct 08 2006 Paul F. Johnson  1.0-2
-- Remove using the real makeinstall as it's broken
+* Wed Nov 01 2006 Paul F. Johnson  1.0-4
+- added post and postun
+- conditional for the X-Fedora in the desktop icon
+- fixed the spec file
 
 * Sat Oct 07 2006 Paul F. Johnson  1.0-1
 - bump to new version



From fedora-extras-commits at redhat.com  Wed Nov  1 10:55:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 03:55:49 -0700
Subject: rpms/gdeskcal import.log,1.9,1.10
Message-ID: <200611011055.kA1AtnWs007757@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7724

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-1.0-4 on branch devel from gdeskcal-1.0-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	1 Nov 2006 10:53:52 -0000	1.9
+++ import.log	1 Nov 2006 10:55:19 -0000	1.10
@@ -6,3 +6,4 @@
 gdeskcal-1_0-2:HEAD:gdeskcal-1.0-2.src.rpm:1160316248
 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



From fedora-extras-commits at redhat.com  Wed Nov  1 10:55:50 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 03:55:50 -0700
Subject: rpms/gdeskcal/devel gdeskcal.desktop, 1.2, 1.3 gdeskcal.spec, 1.12,
	1.13
Message-ID: <200611011055.kA1AtoQM007761@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7724/devel

Modified Files:
	gdeskcal.desktop gdeskcal.spec 
Log Message:
auto-import gdeskcal-1.0-4 on branch devel from gdeskcal-1.0-4.src.rpm


Index: gdeskcal.desktop
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdeskcal.desktop	8 Nov 2004 04:22:43 -0000	1.2
+++ gdeskcal.desktop	1 Nov 2006 10:55:20 -0000	1.3
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=gDeskCal
-Comment=Calendar program for the Gnome Desktop.
+Name=gDeskcal
+Comment=A desktop calendar
 Exec=gdeskcal
 Icon=gdeskcal.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
+StartupNotify=true


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdeskcal.spec	11 Oct 2006 11:36:27 -0000	1.12
+++ gdeskcal.spec	1 Nov 2006 10:55:20 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils perl(XML::Parser)
+BuildRequires:  desktop-file-utils
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -22,7 +22,6 @@
 transparency with smooth alpha-blending and its appearance can be changed
 completely by using skins.
 
-
 %prep
 %setup -q -n gDeskCal-%{version}
 
@@ -32,33 +31,41 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_libdir}/%{name}
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-mkdir -p %{buildroot}%{_bindir}
-cp -a code data ical skins %{buildroot}/%{_libdir}/%{name}/
-install -m0755 gdeskcal %{buildroot}/%{_libdir}/%{name}/gdeskcal-bin
-ln -sf %{_libdir}/%{name}/gdeskcal-bin %{buildroot}/%{_bindir}/%{name}
 install -p -D -m0644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/gdeskcal.png
+make DESTDIR=%{buildroot} install
+
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
+%if "%{?fedora}" <= "6"
   --add-category X-Fedora                               \
+%endif
   %{SOURCE2}
 
+%find_lang gdesklets
+
+%post
+update-desktop-database &> /dev/null ||:
+
+%postun
+update-desktop-database &> /dev/null ||:
+
 %clean
 rm -rf %{buildroot}
 
-%files 
+%files -f gdesklets.lang
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS README 
 %{_bindir}/gdeskcal
 %{_datadir}/applications/fedora-%{name}.desktop
+%exclude %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_libdir}/%{name}
-
+%{_libdir}/%{name}/
 
 %changelog
-* Sun Oct 08 2006 Paul F. Johnson  1.0-2
-- Remove using the real makeinstall as it's broken
+* Wed Nov 01 2006 Paul F. Johnson  1.0-4
+- added post and postun
+- conditional for the X-Fedora in the desktop icon
+- fixed the spec file
 
 * Sat Oct 07 2006 Paul F. Johnson  1.0-1
 - bump to new version



From fedora-extras-commits at redhat.com  Wed Nov  1 11:00:09 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 04:00:09 -0700
Subject: rpms/monodevelop/FC-5 monodevelop.spec,1.10,1.11
Message-ID: <200611011100.kA1B09eM007957@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7929

Modified Files:
	monodevelop.spec 
Log Message:

Add R gtk-sharp2-gapi 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/FC-5/monodevelop.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monodevelop.spec	27 Oct 2006 22:12:05 -0000	1.10
+++ monodevelop.spec	1 Nov 2006 10:59:39 -0000	1.11
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://www.monodevelop.com
+URL: http://go-mono.com/sources/%{name}/
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -58,7 +58,9 @@
 %find_lang %{name}
 desktop-file-install --vendor fedora \
         --dir %{buildroot}%{_datadir}/applications \
+%if "%{?fedora}" <= "6"
         --add-category X-Fedora \
+%endif
         --delete-original \
         %{buildroot}%{_datadir}/applications/monodevelop.desktop
 
@@ -96,9 +98,12 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Nov 01 2006 Paul F. Johnson  0.12-7
+- Added R gtk-sharp2-gapi
+
 * Fri Oct 27 2006 Paul F. Johnson  0.12-6
-- fix for SVN
-- url now correct
+- fixed url
+- added R apr-devel
 
 * Wed Sep 27 2006 Paul F. Johnson  0.12-5
 - pkgconfig fix 



From fedora-extras-commits at redhat.com  Wed Nov  1 11:01:36 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 04:01:36 -0700
Subject: rpms/monodevelop/FC-6 monodevelop.spec,1.11,1.12
Message-ID: <200611011101.kA1B1at0010939@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8009

Modified Files:
	monodevelop.spec 
Log Message:

Added R gtk-sharp2-gapi 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/FC-6/monodevelop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- monodevelop.spec	27 Oct 2006 22:14:43 -0000	1.11
+++ monodevelop.spec	1 Nov 2006 11:01:06 -0000	1.12
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://www.monodevelop.com
+URL: http://go-mono.com/sources/%{name}/
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -58,7 +58,9 @@
 %find_lang %{name}
 desktop-file-install --vendor fedora \
         --dir %{buildroot}%{_datadir}/applications \
+%if "%{?fedora}" <= "6"
         --add-category X-Fedora \
+%endif
         --delete-original \
         %{buildroot}%{_datadir}/applications/monodevelop.desktop
 
@@ -96,6 +98,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Nov 01 2006 Paul F. Johnson  0.12-7
+- Added R gtk-sharp2-gapi
+
 * Fri Oct 27 2006 Paul F. Johnson  0.12-6
 - fixed url
 - added R apr-devel



From fedora-extras-commits at redhat.com  Wed Nov  1 11:03:17 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 04:03:17 -0700
Subject: rpms/monodevelop/devel monodevelop.spec,1.11,1.12
Message-ID: <200611011103.kA1B3HCc011139@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11104

Modified Files:
	monodevelop.spec 
Log Message:

Added R: gtk-sharp2-gapi 
 	monodevelop.spec 



Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- monodevelop.spec	27 Oct 2006 22:17:07 -0000	1.11
+++ monodevelop.spec	1 Nov 2006 11:02:43 -0000	1.12
@@ -7,11 +7,11 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-URL: http://www.monodevelop.com
+URL: http://go-mono.com/sources/%{name}/
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +23,7 @@
 BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
 %endif
 
-Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr-devel
+Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi
 
 %description
 This package provides MonoDevelop, a full-featured IDE for Mono
@@ -58,7 +58,9 @@
 %find_lang %{name}
 desktop-file-install --vendor fedora \
         --dir %{buildroot}%{_datadir}/applications \
+%if "%{?fedora}" <= "6"
         --add-category X-Fedora \
+%endif
         --delete-original \
         %{buildroot}%{_datadir}/applications/monodevelop.desktop
 
@@ -96,6 +98,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Nov 01 2006 Paul F. Johnson  0.12-7
+- Added R gtk-sharp2-gapi
+
 * Fri Oct 27 2006 Paul F. Johnson  0.12-6
 - fixed url
 - added R apr-devel



From fedora-extras-commits at redhat.com  Wed Nov  1 11:05:43 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 1 Nov 2006 04:05:43 -0700
Subject: rpms/guiloader/devel .cvsignore, 1.2, 1.3 guiloader.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611011105.kA1B5hDh011309@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11229

Modified Files:
	.cvsignore guiloader.spec sources 
Log Message:
Update to 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guiloader/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 10:04:34 -0000	1.2
+++ .cvsignore	1 Nov 2006 11:05:13 -0000	1.3
@@ -1 +1 @@
-guiloader-2.8.0.tar.bz2
+guiloader-2.8.1.tar.bz2


Index: guiloader.spec
===================================================================
RCS file: /cvs/extras/rpms/guiloader/devel/guiloader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- guiloader.spec	5 Oct 2006 10:04:34 -0000	1.1
+++ guiloader.spec	1 Nov 2006 11:05:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           guiloader
-Version:        2.8.0
-Release:        2%{?dist}
+Version:        2.8.1
+Release:        1%{?dist}
 Summary:        Gideon GuiXml Loader Library
 
 Group:          System Environment/Libraries
@@ -78,7 +78,10 @@
 
 
 %changelog
-* Thu Oct  5 2006 Denis Leroy  - 2.8.0-1
+* Wed Nov  1 2006 Denis Leroy  - 2.8.1-1
+- Update to 2.8.1
+
+* Thu Oct  5 2006 Denis Leroy  - 2.8.0-2
 - Added pkgconfig devel Requires
 
 * Sun Sep  3 2006 Denis Leroy  - 2.8.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guiloader/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 10:04:34 -0000	1.2
+++ sources	1 Nov 2006 11:05:13 -0000	1.3
@@ -1 +1 @@
-98980d8c65e53f0f5288d1ebdb652b70  guiloader-2.8.0.tar.bz2
+233d52e42a196667ba57cd9528cd2837  guiloader-2.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  1 11:37:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed,  1 Nov 2006 04:37:12 -0700
Subject: extras-buildsys/utils/pushscript Push.py,1.12,1.13
Message-ID: <200611011137.kA1BbCih011621@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11603

Modified Files:
	Push.py 
Log Message:
Just a way to push without processing the post_cmds (such as repoclosure
and upgradecheck).




Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Push.py	29 Oct 2006 18:03:18 -0000	1.12
+++ Push.py	1 Nov 2006 11:37:09 -0000	1.13
@@ -590,6 +590,9 @@
     if '-f' in sys.argv[2:]:
         sys.argv.remove('-f')
         opts.force = True
+    if '-s' in sys.argv[2:]:
+        sys.argv.remove('-s')
+        cfg.post_cmds = []
     
     diststopush = []
     for d in sys.argv[2:]:



From fedora-extras-commits at redhat.com  Wed Nov  1 11:40:26 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed,  1 Nov 2006 04:40:26 -0700
Subject: extras-buildsys/utils/pushscript README,1.6,1.7
Message-ID: <200611011140.kA1BeQS2011658@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11640

Modified Files:
	README 
Log Message:
document the List.py helper


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- README	28 Oct 2006 23:01:15 -0000	1.6
+++ README	1 Nov 2006 11:40:24 -0000	1.7
@@ -34,3 +34,9 @@
   extras-repoview      -> pushscript/extras-repoview
   extras-repoprune     -> pushscript/extras-repoprune
 
+[...]
+
+Helpers:
+
+  pushscript/List.py Extras
+



From fedora-extras-commits at redhat.com  Wed Nov  1 13:49:46 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 1 Nov 2006 06:49:46 -0700
Subject: rpms/e2tools - New directory
Message-ID: <200611011349.kA1Dnk4e018291@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/e2tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18287/e2tools

Log Message:
Directory /cvs/extras/rpms/e2tools added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  1 13:49:52 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 1 Nov 2006 06:49:52 -0700
Subject: rpms/e2tools/devel - New directory
Message-ID: <200611011349.kA1Dnq8w018305@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/e2tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18287/e2tools/devel

Log Message:
Directory /cvs/extras/rpms/e2tools/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  1 13:50:13 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 1 Nov 2006 06:50:13 -0700
Subject: rpms/e2tools Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611011350.kA1DoDpx018336@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/e2tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18330

Added Files:
	Makefile import.log 
Log Message:
Setup of module e2tools


--- NEW FILE Makefile ---
# Top level Makefile for module e2tools
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  Wed Nov  1 13:50:19 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 1 Nov 2006 06:50:19 -0700
Subject: rpms/e2tools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611011350.kA1DoJIM018354@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/e2tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18330/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module e2tools


--- 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 Nov  1 13:52:26 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 1 Nov 2006 06:52:26 -0700
Subject: rpms/e2tools/devel e2cp.1, NONE, 1.1 e2ln.1, NONE, 1.1 e2ls.1, NONE,
	1.1 e2mkdir.1, NONE, 1.1 e2mv.1, NONE, 1.1 e2rm.1, NONE,
	1.1 e2tail.1, NONE, 1.1 e2tools-fedora-fixes.patch, NONE,
	1.1 e2tools-test.sh, NONE, 1.1 e2tools.7, NONE, 1.1 e2tools.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611011352.kA1DqQSQ018494@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/e2tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18446/devel

Modified Files:
	.cvsignore sources 
Added Files:
	e2cp.1 e2ln.1 e2ls.1 e2mkdir.1 e2mv.1 e2rm.1 e2tail.1 
	e2tools-fedora-fixes.patch e2tools-test.sh e2tools.7 
	e2tools.spec 
Log Message:
auto-import e2tools-0.0.16-5 on branch devel from e2tools-0.0.16-5.src.rpm


--- NEW FILE e2cp.1 ---
.TH E2CP 1 "March 2, 2005"
.\"
.SH NAME
e2cp \- copies files from/to an e2fs filesystem
.\"
.SH SYNOPSIS
.B e2cp
.RI [ options ] " files... dest"
.\"
.SH DESCRIPTION
The \fBe2cp\fP command copies files to/from an e2fs filesystem from/to the
machine's filesystem.
.\"
.SH OPTIONS
A single `-' (dash) can be used instead of a file name to indicate standard
input/output.
.TP
.B \-0
Input lines terminated by a null character.
.TP
.B \-a
Absolute directory names - create directories instead of just copying
into the destination. Only valid for copying into an ext2fs filesystem.
.TP
.B \-d \fIdest_dir\fP
Destination of files to be copied. May be in the ext2fs filesystem or
the host filesystem.
.TP
.B \-G \fIgid\fP
Set the default group to gid.
.TP
.B \-O \fIuid\fP
Set the default file owner to uid.
.TP
.B \-p
Preserve host file attributes (permissions, times, etc.) when copying
files.
.TP
.B \-P \fImode\fP
Set the file permissions (ie 755, 666).
.TP
.B \-s \fIsrc_dir\fP
The source of the files to be copied.
.TP
.B \-v
Be verbose.
.\"
.SH SEE ALSO
.BR e2tools (7),
.BR e2ln (1),
.BR e2ls (1),
.BR e2mkdir (1),
.BR e2mv (1),
.BR e2rm (1),
.BR e2tail (1).
.\"
.SH AUTHOR
The \fBe2tools\fP were written by Keith Sheffield .
.PP
This manual page was written by Lucas Wall ,
for the Debian project (but may be used by others).


--- NEW FILE e2ln.1 ---
.TH E2LN 1 "March 2, 2005"
.\"
.SH NAME
e2ln \- create hard links on an ext2 filesystem
.\"
.SH SYNOPSIS
.B e2ln
.RI [ options ] " source destination"
.\"
.SH DESCRIPTION
The \fBe2ln\fP command is used to create hard links on an ext2 filesystem.
.\"
.SH OPTIONS
.TP
.B \-f
Force the operation to remove any existing files.
.TP
.B \-s
Create a symlink.
.TP
.B \-v
Be verbose.
.PP
Note: creating symlinks is not operational at this time.
.\"
.SH SEE ALSO
.BR e2tools (7),
.BR e2mv (1),
.BR e2ls (1),
.BR e2mkdir (1),
.BR e2cp (1),
.BR e2rm (1),
.BR e2tail (1).
.\"
.SH AUTHOR
The \fBe2tools\fP were written by Keith Sheffield .
.PP
This manual page was written by Lucas Wall ,
for the Debian project (but may be used by others).


--- NEW FILE e2ls.1 ---
.TH E2LS 1 "March 2, 2005"
.\"
.SH NAME
e2ls \- list files and directories on an ext2 filesystem
.\"
.SH SYNOPSIS
.B e2ls
.RI [ options ] " file_specification"
.\"
.SH DESCRIPTION
The \fBe2ls\fP command is used to list files and directories on an ext2
filesystem.
.PP
Note: Files deleted via e2rm sometimes will show up even without the -D
option. It is being investigated.
.\"
.SH OPTIONS
.TP
.B \-a
Show hidden directories.
.TP
.B \-c
Sort by creation time (must include -t when using -l).
.TP
.B \-d \fIdir\fP
Open the ext2 filesystem specified by dir.
.TP
.B \-D
Show deleted files bracketed with ><.
.TP
.B \-f
No sorting of the file list.
.TP
.B \-i
Show the inodes (very useful for the -l option).
.TP
.B \-l
Long listing.
.TP
.B \-r
Reverse the sort order.
.TP
.B \-t
Sort by time.
.\"
.SH SEE ALSO
.BR e2tools (7),
.BR e2ln (1),
.BR e2mv (1),
.BR e2mkdir (1),
.BR e2cp (1),
.BR e2rm (1),
.BR e2tail (1).
.\"
.SH AUTHOR
The \fBe2tools\fP were written by Keith Sheffield .
.PP
This manual page was written by Lucas Wall ,
for the Debian project (but may be used by others).


--- NEW FILE e2mkdir.1 ---
.TH E2MKDIR 1 "March 2, 2005"
.\"
.SH NAME
e2mkdir \- creates a directory on an ext2 filesystem
.\"
.SH SYNOPSIS
.B e2mkdir
.RI [ options ] " directory..."
.\"
.SH DESCRIPTION
The \fBe2mkdir\fP command creates directories on an ext2 filesystem. It
behaves similar to `mkdir -p'.
.\"
.SH OPTIONS
.TP
.B \-G \fIgid\fP
Set the default group to gid.
.TP
.B \-O \fIuid\fP
Set the default file owner to uid.
.TP
.B \-P \fImode\fP
Set the file permissions (ie 755, 666).
.TP
.B \-v
Be verbose.
.\"
.SH SEE ALSO
.BR e2tools (7),
.BR e2ln (1),
.BR e2ls (1),
.BR e2mv (1),
.BR e2cp (1),
.BR e2rm (1),
.BR e2tail (1).
.\"
.SH AUTHOR
The \fBe2tools\fP were written by Keith Sheffield .
.PP
This manual page was written by Lucas Wall ,
for the Debian project (but may be used by others).


--- NEW FILE e2mv.1 ---
.TH E2MV 1 "March 2, 2005"
.\"
.SH NAME
e2mv \- moves or renames files on an ext2fs filesystem
.\"
.SH SYNOPSIS
.B e2mv
.RI [ options ] " files... dest"
.\"
.SH DESCRIPTION
The \fBe2mv\fP command moves or renames files on an ext2fs filesystem. The
source files must be explicitly stated. It does not use regular expressions,
yet.
.\"
.SH OPTIONS
.TP
.B \-f
Force the operation to remove any existing files.
.TP
.B \-s
Swap names of the two files.
.TP
.B \-v
Be verbose.
.\"
.SH SEE ALSO
.BR e2tools (7),
.BR e2ln (1),
.BR e2ls (1),
.BR e2mkdir (1),
.BR e2cp (1),
.BR e2rm (1),
.BR e2tail (1).
.\"
.SH AUTHOR
The \fBe2tools\fP were written by Keith Sheffield .
.PP
This manual page was written by Lucas Wall ,
for the Debian project (but may be used by others).


--- NEW FILE e2rm.1 ---
.TH E2RM 1 "March 2, 2005"
.\"
.SH NAME
e2rm \- removes files and directories on an ext2 filesystem
.\"
.SH SYNOPSIS
.B e2rm
.RI [ options ] " files..."
.\"
.SH DESCRIPTION
The \fBe2rm\fP command removes files and directories on an ext2 filesystem.
.\"
.SH OPTIONS
.TP
.B \-r
Recursively delete files if a directory name is given.
.TP
.B \-v
Be verbose.
.\"
.SH SEE ALSO
.BR e2tools (7),
.BR e2ln (1),
.BR e2ls (1),
.BR e2mkdir (1),
.BR e2cp (1),
.BR e2mv (1),
.BR e2tail (1).
.\"
.SH AUTHOR
The \fBe2tools\fP were written by Keith Sheffield .
.PP
This manual page was written by Lucas Wall ,
for the Debian project (but may be used by others).


--- NEW FILE e2tail.1 ---
.TH E2TAIL 1 "March 2, 2005"
.\"
.SH NAME
e2tail \- a basic version of the tail command for an ext2 filesystem
.\"
.SH SYNOPSIS
.B e2tail
.RI [ options ] " file"
.\"
.SH DESCRIPTION
The \fBe2tail\fP command implements a basic version of the tail command.
.\"
.SH OPTIONS
.TP
.B \-n \fInum_lines\fP
The number of lines to display
.TP
.B \-f
Output appended data as the file grows.  This is inode dependent, so if the
file is renamed, it will keep checking it.
.TP
.B \-F
Output appended data as the file grows.  This is file name dependent, so if
the file is renamed, it will check on any new files with the same name as the
original.  This is useful for watching log files that may be rotated out
occasionally.  This was requested by a person in the computer security field
for monitoring 'honeypot' type machines.
.TP
.B \-s \fIsleep_interval\fP
The number of seconds to sleep before checking if the file has grown while
in 'follow' mode.  The default is 1.
.\"
.SH SEE ALSO
.BR e2tools (7),
.BR e2ln (1),
.BR e2ls (1),
.BR e2mkdir (1),
.BR e2cp (1),
.BR e2rm (1),
.BR e2mv (1).
.\"
.SH AUTHOR
The \fBe2tools\fP were written by Keith Sheffield .
.PP
This manual page was written by Lucas Wall ,
for the Debian project (but may be used by others).

e2tools-fedora-fixes.patch:

--- NEW FILE e2tools-fedora-fixes.patch ---
Only in e2tools-0.0.16.fedora: _b
Only in e2tools-0.0.16.fedora: configure.in~
diff -rup e2tools-0.0.16.orig/copy.c e2tools-0.0.16.fedora/copy.c
--- e2tools-0.0.16.orig/copy.c	2004-04-07 03:15:20.000000000 +0200
+++ e2tools-0.0.16.fedora/copy.c	2006-07-17 11:55:48.000000000 +0200
@@ -239,11 +239,10 @@ copy(int argc, char *argv[])
 {
   ext2_filsys fs = NULL;
   ext2_ino_t root;
-  ext2_ino_t orig_cwd;
+  ext2_ino_t orig_cwd = -1;
   ext2_ino_t cwd;
   char tmpbuf[BUF_SIZE];
   char outpath[BUF_SIZE];
-  char *last_filesys = NULL;
   char *cur_filesys = NULL;
   int retval;
   int c;
@@ -251,7 +250,7 @@ copy(int argc, char *argv[])
   char *dest_dir = NULL;
   char *in_file = NULL;
   char *out_file = NULL;
-  int max_out_len;
+  int max_out_len = -1;
   int keep = 0;
   int absolute = 0;
   int verbose = 0;
@@ -1054,7 +1053,6 @@ read_string(char *inbuf)
   char *ptr;
   char *boundary;
   int c;
-  int cnt;
 
   boundary = inbuf + BUF_SIZE - 1;
   ptr = inbuf;
Only in e2tools-0.0.16.fedora: copy.c~
diff -rup e2tools-0.0.16.orig/e2tools.h e2tools-0.0.16.fedora/e2tools.h
--- e2tools-0.0.16.orig/e2tools.h	2004-04-07 03:15:55.000000000 +0200
+++ e2tools-0.0.16.fedora/e2tools.h	2006-07-17 12:02:16.000000000 +0200
@@ -57,44 +57,45 @@ extern int optreset;		/* defined by BSD,
 #include 
 #include 
 #include 
+#include 
 #include "ext2fs/ext2_fs.h"
 #include "ext2fs/ext2fs.h"
 
 #define E2T_FORCE 1
 #define E2T_DO_MV 2
 
-#ifndef COPY_C
+/* from copy.c */
 extern long copy(int argc, char *argv[]);
 extern int my_strcmp(const void *n1, const void *n2);
-#endif
 
-#ifdef LN_C
+
+/* from ln.c */
 extern long do_ln(int argc, char *argv[]);
 
 extern long create_hard_link(ext2_filsys fs, ext2_ino_t cwd, ext2_ino_t
                              new_file_ino, char *newfile, int ln_flags);
-#endif
 
-#ifndef LS_C
+
+/* from ls.c */
 extern long do_list_dir(int argc, char *argv[]);
-#endif
 
-#ifndef MKDIR_C
+
+/* from mkdir.c */
 extern long e2mkdir(int argc, char *argv[]);
 extern long create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
                        char *dirname, struct stat *def_stat);
-#endif
+extern long change_cwd(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
+		       char *dirname);
 
-#ifdef MV_C
+
+/* from mv.c */
 extern long do_mv(int argc, char *argv[]);
 extern long get_file_parts(ext2_filsys fs, ext2_ino_t root, char *pathname,
                            ext2_ino_t *dir_ino, char **dir_name,
                            char **base_name);
 
-#endif
-
 
-#ifndef READ_C
+/* from read.c */
 extern long get_file(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
                      char *infile, char *outfile, int keep);
 extern long retrieve_data(ext2_filsys fs, ext2_ino_t src, int dest_fd,
@@ -102,17 +103,17 @@ extern long retrieve_data(ext2_filsys fs
                           ext2_off_t *ret_pos);
 extern long read_to_eof(ext2_file_t infile, int dest_fd, ext2_off_t offset,
                         ext2_off_t *ret_pos);
-#endif
 
-#ifndef RM_C
+
+/* from rm.c */
 extern long e2rm(int argc, char *argv[]);
 #endif
 
-#ifndef TAIL_C
+/* from tail.c */
 extern long do_tail(int argc, char *argv[]);
-#endif
 
-#ifndef UTIL_C
+
+/* from util.c */
 extern mode_t ext2_mode_xlate(__u16 lmode);
 extern __u16 host_mode_xlate(mode_t hmode);
 extern long open_filesystem(char *name, ext2_filsys *fs, ext2_ino_t *root, int
@@ -125,14 +126,12 @@ extern long rm_file(ext2_filsys fs, ext2
                     delfile); 
 extern long delete_file(ext2_filsys fs, ext2_ino_t inode);
 extern void init_stat_buf(struct stat *buf);
-#endif
+extern int  is_file_regexp(char *ptr);
+extern regex_t *make_regexp(char *shell);
 
-#ifndef WRITE_C
+/* from write.c */
 extern long
 put_file(ext2_filsys fs, ext2_ino_t cwd, char *infile, char *outfile,
          ext2_ino_t *outfile_ino, int keep, struct stat *def_stat);
-#endif
-
-#endif
 
 
Only in e2tools-0.0.16.fedora: e2tools.h~
Only in e2tools-0.0.16.fedora: e2tools-test.sh
Only in e2tools-0.0.16.fedora: e2tools-test.sh~
diff -rup e2tools-0.0.16.orig/elist.c e2tools-0.0.16.fedora/elist.c
--- e2tools-0.0.16.orig/elist.c	2004-04-06 22:00:16.000000000 +0200
+++ e2tools-0.0.16.fedora/elist.c	2006-07-17 11:44:07.000000000 +0200
@@ -41,6 +41,7 @@
 /* Feature Test Switches */
 /* Headers */
 #include 
+#include 
 #include "elist.h"
 
 #ifndef NULL
@@ -79,8 +80,6 @@ elist_delete(elist_t *l, void (*data_fre
 void
 elist_free(elist_t *l, void (*data_free)(void *))
 {
-  elist_t *n;
-  
   if (l)
     {
       do
@@ -136,7 +135,7 @@ elist_insert(elist_t *l, void *data)
   return(l);
 }
 
-void elist_sort(elist_t *l, int (sort_func)(void *, void *), int reverse)
+void elist_sort(elist_t *l, int (*sort_func)(const void *, const void *), int reverse)
 {
   int c=0;
   elist_t *tl;
Only in e2tools-0.0.16.fedora: elist.c~
Only in e2tools-0.0.16.fedora: _i
diff -rup e2tools-0.0.16.orig/ln.c e2tools-0.0.16.fedora/ln.c
--- e2tools-0.0.16.orig/ln.c	2002-06-30 07:54:02.000000000 +0200
+++ e2tools-0.0.16.fedora/ln.c	2006-07-17 11:44:27.000000000 +0200
@@ -95,7 +95,6 @@ do_ln(int argc, char *argv[])
   int verbose=0;
   int force=0;
   int symlink=0;
-  int num_files;
   int errcnt=0;
   char *cur_filesys = NULL;
   ext2_filsys fs = NULL;
Only in e2tools-0.0.16.fedora: ln.c~
diff -rup e2tools-0.0.16.orig/ls.c e2tools-0.0.16.fedora/ls.c
--- e2tools-0.0.16.orig/ls.c	2004-04-07 05:31:39.000000000 +0200
+++ e2tools-0.0.16.fedora/ls.c	2006-07-17 11:48:12.000000000 +0200
@@ -143,7 +143,6 @@ static int
 list_dir_proc(ext2_ino_t dir, int entry, struct ext2_dir_entry *dirent,
               int offset, int blocksize, char *buf, void *private)
 {
-  struct ext2_inode	inode;
   char			name[EXT2_NAME_LEN];
   struct list_dir_struct *ls = (struct list_dir_struct *) private;
   int thislen;
@@ -485,7 +484,7 @@ do_list_dir(int argc, char *argv[])
       if (ls.options & DELETED_OPT)
         flags |= DIRENT_FLAG_INCLUDE_REMOVED;
             
-      if (retval = ext2fs_check_directory(fs, inode))
+      if ((retval = ext2fs_check_directory(fs, inode)))
         {
         if (retval != EXT2_ET_NO_DIRECTORY)
             {
@@ -703,7 +702,7 @@ void short_disp(ls_file_t *info, int *co
   char lbr, rbr;
   char tmp[300];
   int thislen;
-  static max_col_size = 0;
+  static int max_col_size = 0;
 
   if (max_col_size == 0)
     {
@@ -1023,9 +1022,7 @@ int creat_time_sort(void *n1, void *n2)
 elist_t * remove_ls_dups(elist_t *list)
 {
   elist_t *start = list;
-  elist_t *next;
   ls_file_t *cd;
-  ls_file_t *nd;
   int cnt=0;
 
   while(list != NULL)
Only in e2tools-0.0.16.fedora: ls.c~
diff -rup e2tools-0.0.16.orig/Makefile.am e2tools-0.0.16.fedora/Makefile.am
--- e2tools-0.0.16.orig/Makefile.am	2003-07-12 19:06:54.000000000 +0200
+++ e2tools-0.0.16.fedora/Makefile.am	2006-07-17 12:22:28.000000000 +0200
@@ -27,3 +27,11 @@ install-exec-hook:
 	$(LN_S) -f e2cp $(DESTDIR)$(bindir)/e2mv
 	$(LN_S) -f e2cp $(DESTDIR)$(bindir)/e2rm
 	$(LN_S) -f e2cp $(DESTDIR)$(bindir)/e2tail
+
+uninstall-exec-hook:
+	$(RM) -f $(DESTDIR)$(bindir)/e2ln
+	$(RM) -f $(DESTDIR)$(bindir)/e2ls
+	$(RM) -f $(DESTDIR)$(bindir)/e2mkdir
+	$(RM) -f $(DESTDIR)$(bindir)/e2mv
+	$(RM) -f $(DESTDIR)$(bindir)/e2rm
+	$(RM) -f $(DESTDIR)$(bindir)/e2tail
Only in e2tools-0.0.16.fedora: Makefile.am~
Only in e2tools-0.0.16.fedora: Makefile.in~
diff -rup e2tools-0.0.16.orig/mkdir.c e2tools-0.0.16.fedora/mkdir.c
--- e2tools-0.0.16.orig/mkdir.c	2004-04-07 05:19:32.000000000 +0200
+++ e2tools-0.0.16.fedora/mkdir.c	2006-07-17 12:06:33.000000000 +0200
@@ -281,7 +281,6 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
   ext2_ino_t parent;          /* the parent directory inode number*/
   ext2_ino_t child;           /* the inode number of the new directory */
   struct ext2_inode inode;    /* inode of file/directory dirname */
-  char *name;                 /* basename of the new directory */
   long retval;                /* function return value */
   char *buf;
   int len;
@@ -315,7 +314,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
         parent = *cwd;
 
       /* allocate memory for the lookups */
-      if ((retval = ext2fs_get_mem(fs->blocksize, (void **) &buf)))
+      if ((retval = ext2fs_get_mem(fs->blocksize, (void *) &buf)))
         {
           fprintf(stderr, "%s\n", error_message(retval));
           return retval;
@@ -357,16 +356,16 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
                                               def_stat)))
                     {
                       fprintf(stderr,
-                              "create_dir: error creating directory %s/%s:%d\n",
+                              "create_dir: error creating directory %s/%s:%ld\n",
                               dirname, dname, retval);
-                      ext2fs_free_mem((void **) &buf);
+                      ext2fs_free_mem((void *) &buf);
                       return(retval);
                     }
                 }
               else
                 {
                   fprintf(stderr, "%s\n", error_message(retval));
-                  ext2fs_free_mem((void **) &buf);
+                  ext2fs_free_mem((void *) &buf);
                   return retval;
                 }
             }
@@ -380,7 +379,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
                                                &parent)))
                 {
                   fprintf(stderr, "%s\n", error_message(retval));
-                  ext2fs_free_mem((void **) &buf);
+                  ext2fs_free_mem((void *) &buf);
                   return retval;
                 }
 
@@ -388,7 +387,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
               if ((retval = ext2fs_read_inode(fs, parent, &inode)))
                 {
                   fprintf(stderr, "%s\n", error_message(retval));
-                  ext2fs_free_mem((void **) &buf);
+                  ext2fs_free_mem((void *) &buf);
                   return retval;
                 }
 
@@ -397,7 +396,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
                 {
                   fprintf(stderr, "create_dir: %s/%s is not a directory: %o\n",
                           dirname, dname, inode.i_mode);
-                  ext2fs_free_mem((void **) &buf);
+                  ext2fs_free_mem((void *) &buf);
                   return(-1);
                 }
             }
@@ -407,7 +406,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
             *--dname = '/';
           dname = ptr;
         }
-      ext2fs_free_mem((void **) &buf);
+      ext2fs_free_mem((void *) &buf);
       *cwd = parent;
     }
   else
@@ -415,7 +414,7 @@ create_dir(ext2_filsys fs, ext2_ino_t ro
       if ((retval = create_subdir(fs, root, cwd, dirname, def_stat)))
         {
           fprintf(stderr,
-                  "create_dir: error creating directory %s:%d\n",
+                  "create_dir: error creating directory %s:%ld\n",
                   dirname, retval);
           return(retval);
         }
@@ -493,7 +492,7 @@ long create_subdir(ext2_filsys fs, ext2_
       return(0);
     }
   
-  /* ok, the directory doesn't exist
+  /* ok, the directory doesn't exist */
   /* get a new inode number */
   if ((retval = ext2fs_new_inode(fs, parent, LINUX_S_IFDIR | 0755, 0, &child)))
     {
Only in e2tools-0.0.16.fedora: mkdir.c~
diff -rup e2tools-0.0.16.orig/mv.c e2tools-0.0.16.fedora/mv.c
--- e2tools-0.0.16.orig/mv.c	2002-06-09 23:30:25.000000000 +0200
+++ e2tools-0.0.16.fedora/mv.c	2006-07-17 11:58:30.000000000 +0200
@@ -84,7 +84,6 @@ do_mv(int argc, char *argv[])
   int verbose=0;
   int force=0;
   int swap_files=0;
-  int num_files;
   int errcnt=0;
   char *cur_filesys = NULL;
   ext2_filsys fs = NULL;
Only in e2tools-0.0.16.fedora: mv.c~
Only in e2tools-0.0.16.fedora: mv.h
Only in e2tools-0.0.16.fedora: mv.h~
diff -rup e2tools-0.0.16.orig/progress.c e2tools-0.0.16.fedora/progress.c
--- e2tools-0.0.16.orig/progress.c	2002-06-26 13:18:07.000000000 +0200
+++ e2tools-0.0.16.fedora/progress.c	2006-07-17 11:46:38.000000000 +0200
@@ -27,6 +27,7 @@
 /* System Headers */
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -154,7 +155,7 @@ void update_progress(unsigned long num_b
   if (prog_sbuf != NULL && prog_time != tv.tv_sec)
     {
       prog_time = tv.tv_sec;
-      fprintf(stderr, "%s %10d / %10d\r", prog_file, num_bytes,
+      fprintf(stderr, "%s %10ld / %10ld\r", prog_file, num_bytes,
               prog_sbuf->st_size);
       fflush(stderr);
     }
Only in e2tools-0.0.16.fedora: progress.c~
diff -rup e2tools-0.0.16.orig/read.c e2tools-0.0.16.fedora/read.c
--- e2tools-0.0.16.orig/read.c	2002-08-08 09:58:35.000000000 +0200
+++ e2tools-0.0.16.fedora/read.c	2006-07-17 11:52:12.000000000 +0200
@@ -9,9 +9,7 @@
  *
  */
 
-static char rcsid[] = "$Id: read.c,v 0.2 2002/08/08 07:58:35 ksheff Exp $";
-
-static char copyright[] = "Copyright 2002 Keith W Sheffield";
+static char __attribute__ ((used)) copyright[] = "Copyright 2002 Keith W Sheffield";
 
 #ifndef READ_C
 #define READ_C
@@ -106,7 +104,6 @@ long
 get_file(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
          char *infile, char *outfile, int keep)
 {
-  int fd;
   ext2_ino_t src;
   int dest;
   int retval;
Only in e2tools-0.0.16.fedora: read.c~
Only in e2tools-0.0.16.fedora: README~
diff -rup e2tools-0.0.16.orig/rm.c e2tools-0.0.16.fedora/rm.c
--- e2tools-0.0.16.orig/rm.c	2004-04-07 04:00:43.000000000 +0200
+++ e2tools-0.0.16.fedora/rm.c	2006-07-21 16:13:25.000000000 +0200
@@ -244,8 +244,8 @@ e2rm(int argc, char *argv[])
                   retval = ext2fs_dir_iterate2(gbl_fs, curr_ino,
                                                DIRENT_FLAG_INCLUDE_EMPTY, 0,
                                                rm_dir_proc,
-                                               (void *)
-                                               (verbose) ? &verbose : NULL);
+                                               (void *) 
+                                               ((verbose) ? &verbose : NULL));
                 }
               else
                 {
Only in e2tools-0.0.16.fedora: rm.c~
diff -rup e2tools-0.0.16.orig/tail.c e2tools-0.0.16.fedora/tail.c
--- e2tools-0.0.16.orig/tail.c	2003-07-12 18:33:11.000000000 +0200
+++ e2tools-0.0.16.fedora/tail.c	2006-07-17 12:39:06.000000000 +0200
@@ -251,7 +251,6 @@ tail(ext2_filsys *fs_ptr, ext2_ino_t roo
   unsigned int bytes_to_read;
   unsigned int bytes_read;
   char *ptr;
-  off_t pos;
   struct ext2_inode inode;
   ext2_file_t tail_fd;    
   ext2_off_t offset;
@@ -320,7 +319,11 @@ tail(ext2_filsys *fs_ptr, ext2_ino_t roo
               if (bytes_to_read != bytes_read - 1)
                 {
                   ptr++;
-                  write(1, ptr, bytes_read - bytes_to_read - 1);
+		  if (0 > write(1, ptr, bytes_read - bytes_to_read - 1))
+		    {
+		      perror("writing bytes to stdout");
+		      return -1;
+		    }
                 }
               offset = 0;       /* make sure we break out of the main loop */
               break;
@@ -338,7 +341,12 @@ tail(ext2_filsys *fs_ptr, ext2_ino_t roo
    */
   
   if (num_lines > 0)
-    write(1, buf, bytes_read);
+    {
+      if (0 > write(1, buf, bytes_read)) {
+	perror("writing bytes to stdout");
+	return -1;
+      }
+    }
     
   /* retreive the current position in the file */
   if ((retval = ext2fs_file_lseek(tail_fd, 0, EXT2_SEEK_CUR, &cur_pos)))
Only in e2tools-0.0.16.fedora: tail.c~
diff -rup e2tools-0.0.16.orig/util.c e2tools-0.0.16.fedora/util.c
--- e2tools-0.0.16.orig/util.c	2002-06-09 23:30:26.000000000 +0200
+++ e2tools-0.0.16.fedora/util.c	2006-07-17 11:45:25.000000000 +0200
@@ -276,10 +276,9 @@ make_regexp(char *shell)
   char *tmpstr;
   char *ptr;
   static regex_t reg;
-  int l;
   char c;
 
-  if (NULL == (tmpstr = alloca((strlen(shell)) << 1 + 3)))
+  if (NULL == (tmpstr = alloca(((strlen(shell)) << 1) + 3)))
     {
       perror("make_regexp");
       return(NULL);
Only in e2tools-0.0.16.fedora: util.c~
diff -rup e2tools-0.0.16.orig/write.c e2tools-0.0.16.fedora/write.c
--- e2tools-0.0.16.orig/write.c	2004-04-07 03:12:30.000000000 +0200
+++ e2tools-0.0.16.fedora/write.c	2006-07-17 11:44:42.000000000 +0200
@@ -9,8 +9,6 @@
  * and modified by Robert Sanders 
  */
 
-static char rcsid[] = "$Id: write.c,v 0.5 2004/04/07 01:12:30 ksheff Exp $";
-
 #ifndef WRITE_C
 #define WRITE_C
 #endif
Only in e2tools-0.0.16.fedora: write.c~


--- NEW FILE e2tools-test.sh ---
#!/bin/sh
# Simple test for est e2tools 
# Copyright (C) 2006 Hans Ulrich Niedermann
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

set -ex

# Caution: An image of 100G size needs 1.6GB on disk just to be formatted!
for imgsize in 1M; do
    testimg="test-${imgsize}.img"
    trap "" EXIT
    # create sparse image file full of zeros
    rm -f "${testimg}"
    /bin/dd if=/dev/null of="${testimg}" bs=1 count=1 seek="$imgsize"
    # create file system on image file
    /sbin/mkfs.ext2 -F "${testimg}"
    # check a few things
    ./e2mkdir "${testimg}:/foo"
    ./e2ls -l "${testimg}:"

    ./e2mkdir "${testimg}:/bar"
    ./e2mkdir "${testimg}:/bla"
    ./e2ls -l "${testimg}:"

    for file in README configure; do

	./e2cp "${file}" "${testimg}:/foo"
	./e2ls -l "${testimg}:/foo"

	trap "rm -f ${file}.test-c" EXIT
	./e2cp "${testimg}:/foo/${file}" "${file}.test-c"

	./e2rm ${testimg}:/foo/${file}
	./e2ls -l "${testimg}:/foo"

	cmp ${file} ${file}.test-c
	rm -f ${file}.test-c
    done

    # remove the test image
    rm -f "${testimg}"
    trap "" EXIT
done

exit 0


--- NEW FILE e2tools.7 ---
.TH E2TOOLS 7 "March 2, 2005"
.\"
.SH NAME
e2tools \-  utilities to manipulate files in an ext2/ext3 filesystem
.\"
.SH DESCRIPTION
E2tools is a simple set of GPL'ed utilities to read, write, and
manipulate files in an ext2/ext3 filesystem. These utilities access a
filesystem directly using the ext2fs library. I wrote these tools in order
to copy files into a linux filesystem on a machine that does not have ext2
support. Of course, they can also be used on a linux machine to read/write
to disk images or floppies without having to mount them or have root
access.
.PP
Supported functionality:
.TP
.B e2cp
copy files
.TP
.B e2mv
move files
.TP
.B e2rm
remove files
.TP
.B e2mkdir
create directory
.TP
.B e2ln
create hard links
.TP
.B e2ls
list files/directories
.TP
.B e2tail
output the last part of a file
.PP
In general, to specify a directory or file on an ext2 filesystem for the
e2tools utilities, use the following form:
.IP
filesystem:directory_path
.PP
The filesystem can be an unmounted partition or a regular file that's been
formatted to contain an ext2 filesystem.  In general, if a command takes
multiple file names on the command line, if the first one contains an ext2
file specification, the rest of the files are assumed to be on the same
filesystem until another one is explicitly stated:
.IP
/tmp/boot.img:/tmp/file1
.IP
/tmp/file2
.IP
/tmp/file3
.IP
/tmp/boot2.img:/tmp/file4
.PP
Files 1-3 are on /tmp/boot.img and the last file is on /tmp/boot2.img
.\"
.SH SEE ALSO
.BR e2cp (1),
.BR e2ln (1),
.BR e2ls (1),
.BR e2mkdir (1),
.BR e2mv (1),
.BR e2rm (1),
.BR e2tail (1).
.\"
.SH AUTHOR
The \fBe2tools\fP were written by Keith Sheffield .
.PP
This manual page was written by Lucas Wall ,
for the Debian project (but may be used by others).


--- NEW FILE e2tools.spec ---
Name:           e2tools
Version:        0.0.16
Release:        5%{?dist}
Summary:        Manipulate files in unmounted ext2/ext3 filesystems

Group:          Applications/System
License:        GPL
URL:            http://home.earthlink.net/~k_sheff/sw/e2tools/
Source0:        http://home.earthlink.net/~k_sheff/sw/e2tools/e2tools-0.0.16.tar.gz
Source1:        e2tools-test.sh
# Thank you very much for the man pages from Debian package.
Source2:        e2cp.1
Source3:        e2ln.1
Source4:        e2ls.1
Source5:        e2mkdir.1
Source6:        e2mv.1
Source7:        e2rm.1
Source8:        e2tail.1
Source9:        e2tools.7
Patch1:         e2tools-fedora-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  e2fsprogs-devel >= 1.27

# For e2tools-test.sh
BuildRequires:  e2fsprogs, diffutils
#Requires:       


%description
A simple set of utilities to read, write, and manipulate files in an
ext2/ext3 filesystem directly using the ext2fs library. This works

  - without root access
  - without the filesystem being mounted
  - without kernel ext2/ext3 support

The utilities are: e2cp e2ln e2ls e2mkdir e2mv e2rm e2tail


%prep
%setup -q
%patch1 -p1


%build
%configure
make %{?_smp_mflags} CPPFLAGS="-Wall -Werror"


%check
# Run tests
for e in e2ln e2ls e2mkdir e2mv e2rm e2tail; do
    ln -s e2cp $e
done
sh %{SOURCE1}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1/
%{__install} \
    %{SOURCE2} \
    %{SOURCE3} \
    %{SOURCE4} \
    %{SOURCE5} \
    %{SOURCE6} \
    %{SOURCE7} \
    %{SOURCE8} \
    $RPM_BUILD_ROOT%{_mandir}/man1/
%{__install} -D %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/e2tools.7


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING ChangeLog TODO AUTHORS
%{_bindir}/e2cp
%{_bindir}/e2ln
%{_bindir}/e2ls
%{_bindir}/e2mkdir
%{_bindir}/e2mv
%{_bindir}/e2rm
%{_bindir}/e2tail
%doc %{_mandir}/man1/e2cp.1.gz
%doc %{_mandir}/man1/e2ln.1.gz
%doc %{_mandir}/man1/e2ls.1.gz
%doc %{_mandir}/man1/e2mkdir.1.gz
%doc %{_mandir}/man1/e2mv.1.gz
%doc %{_mandir}/man1/e2rm.1.gz
%doc %{_mandir}/man1/e2tail.1.gz
%doc %{_mandir}/man7/e2tools.7.gz


%changelog
* Mon Jul 31 2006 Andreas Thienemann  - 0.0.16-5
- fix broken cast in rm.c:248 (exhibited on x86_64, but buggy everywhere) from Hans Ulrich Niedermann

* Mon Jul 17 2006 Andreas Thienemann  - 0.0.16-4
- Introduced %%check

* Mon Jul 17 2006 Hans Ulrich Niedermann  - 0.0.16-3
- initial package for fedora extras



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/e2tools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Nov 2006 13:50:19 -0000	1.1
+++ .cvsignore	1 Nov 2006 13:51:56 -0000	1.2
@@ -0,0 +1 @@
+e2tools-0.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/e2tools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Nov 2006 13:50:19 -0000	1.1
+++ sources	1 Nov 2006 13:51:56 -0000	1.2
@@ -0,0 +1 @@
+1829b2b261e0e0d07566066769b5b28b  e2tools-0.0.16.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 13:52:25 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 1 Nov 2006 06:52:25 -0700
Subject: rpms/e2tools import.log,1.1,1.2
Message-ID: <200611011352.kA1DqPTw018490@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/e2tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18446

Modified Files:
	import.log 
Log Message:
auto-import e2tools-0.0.16-5 on branch devel from e2tools-0.0.16-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/e2tools/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Nov 2006 13:50:13 -0000	1.1
+++ import.log	1 Nov 2006 13:51:55 -0000	1.2
@@ -0,0 +1 @@
+e2tools-0_0_16-5:HEAD:e2tools-0.0.16-5.src.rpm:1162389108



From fedora-extras-commits at redhat.com  Wed Nov  1 13:55:46 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 1 Nov 2006 06:55:46 -0700
Subject: owners owners.list,1.1880,1.1881
Message-ID: <200611011355.kA1DtkA1018555@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18539

Modified Files:
	owners.list 
Log Message:
Added e2tools



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1880
retrieving revision 1.1881
diff -u -r1.1880 -r1.1881
--- owners.list	31 Oct 2006 20:27:45 -0000	1.1880
+++ owners.list	1 Nov 2006 13:55:16 -0000	1.1881
@@ -321,6 +321,7 @@
 Fedora Extras|dx-samples|Sample files for OpenDX|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|dxpc|A Differential X Protocol Compressor|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dynamite|Extract data compressed with PKWARE Data Compression Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|e2tools|Manipulate files in unmounted ext2/ext3 filesystems|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|echoping|TCP "echo" performance test|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  1 14:33:43 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 1 Nov 2006 07:33:43 -0700
Subject: rpms/gg2/devel gg2-desktop.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gg2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611011433.kA1EXhKq021863@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/gg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21840

Modified Files:
	.cvsignore gg2.spec sources 
Added Files:
	gg2-desktop.patch 
Log Message:
- updated to 2.3.0
- fix desktop file
- fix locale installation


gg2-desktop.patch:

--- NEW FILE gg2-desktop.patch ---
--- gg2-2.3.0/gg2.desktop.r	2004-08-04 22:53:57.000000000 +0200
+++ gg2-2.3.0/gg2.desktop	2006-11-01 15:07:18.000000000 +0100
@@ -9,5 +9,5 @@
 Icon=gg2.png
 Terminal=false
 Type=Application
-Categories=Application;Network;InstantMessaging;GTK;
+Categories=Network;InstantMessaging;GTK;
 # vi: encoding=utf-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gg2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 20:15:19 -0000	1.2
+++ .cvsignore	1 Nov 2006 14:33:13 -0000	1.3
@@ -1 +1 @@
-gg2-2.2.9.tar.gz
+gg2-2.3.0.tar.bz2


Index: gg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gg2/devel/gg2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gg2.spec	17 Sep 2006 20:15:19 -0000	1.1
+++ gg2.spec	1 Nov 2006 14:33:13 -0000	1.2
@@ -1,13 +1,14 @@
 Name: gg2
-Version: 2.2.9
-Release: 7%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 Summary: GNU Gadu 2 - free talking
 Summary(es): GNU Gadu 2 - charlar libremente
 Summary(pl): GNU Gadu 2 - wolne gadanie
 License: GPL
 Group: Applications/Internet
-Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.gz
+Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.bz2
 Patch0: %{name}-pc.patch
+Patch1: %{name}-desktop.patch
 URL: http://www.gnugadu.org/
 BuildRequires: arts-devel
 BuildRequires: autoconf
@@ -196,6 +197,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .p
+%patch1 -p1 -b .d
 
 %build
 # autoreconf fails here
@@ -238,14 +240,13 @@
 chmod -x contrib/{gg2sms,mkgg2snap,plugin_example/build.sh}
 
 %{__make} install \
+	localedir=%{_datadir}/locale \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 desktop-file-install --vendor Fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    --add-category Application \
-    --add-category Internet \
     %{name}.desktop
 
 %find_lang %{name} --with-gnome
@@ -347,6 +348,11 @@
 %{_libdir}/pkgconfig/gg2_core.pc
 
 %changelog
+* Mon Oct 16 2006 Dominik Mierzejewski  2.3.0-1
+- updated to 2.3.0
+- fix desktop file
+- fix locale installation
+
 * Sun Sep 17 2006 Dominik Mierzejewski  2.2.9-7
 - removed perl Requires: from -devel
 - verified building with latest libgadu


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gg2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2006 20:15:19 -0000	1.2
+++ sources	1 Nov 2006 14:33:13 -0000	1.3
@@ -1 +1 @@
-e12c2153993dbbf66f8cefa3c628e7cd  gg2-2.2.9.tar.gz
+dbe6c0f85c9dbb115ee1911d8abbea33  gg2-2.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  1 14:51:42 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 1 Nov 2006 07:51:42 -0700
Subject: rpms/gg2/FC-6 gg2-desktop.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gg2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611011451.kA1EpgoN022062@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/gg2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22039

Modified Files:
	.cvsignore gg2.spec sources 
Added Files:
	gg2-desktop.patch 
Log Message:
- updated to 2.3.0
- fix desktop file
- fix locale installation


gg2-desktop.patch:

--- NEW FILE gg2-desktop.patch ---
--- gg2-2.3.0/gg2.desktop.r	2004-08-04 22:53:57.000000000 +0200
+++ gg2-2.3.0/gg2.desktop	2006-11-01 15:07:18.000000000 +0100
@@ -9,5 +9,5 @@
 Icon=gg2.png
 Terminal=false
 Type=Application
-Categories=Application;Network;InstantMessaging;GTK;
+Categories=Network;InstantMessaging;GTK;
 # vi: encoding=utf-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gg2/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 20:15:19 -0000	1.2
+++ .cvsignore	1 Nov 2006 14:51:12 -0000	1.3
@@ -1 +1 @@
-gg2-2.2.9.tar.gz
+gg2-2.3.0.tar.bz2


Index: gg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gg2/FC-6/gg2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gg2.spec	17 Sep 2006 20:15:19 -0000	1.1
+++ gg2.spec	1 Nov 2006 14:51:12 -0000	1.2
@@ -1,13 +1,14 @@
 Name: gg2
-Version: 2.2.9
-Release: 7%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 Summary: GNU Gadu 2 - free talking
 Summary(es): GNU Gadu 2 - charlar libremente
 Summary(pl): GNU Gadu 2 - wolne gadanie
 License: GPL
 Group: Applications/Internet
-Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.gz
+Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.bz2
 Patch0: %{name}-pc.patch
+Patch1: %{name}-desktop.patch
 URL: http://www.gnugadu.org/
 BuildRequires: arts-devel
 BuildRequires: autoconf
@@ -196,6 +197,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .p
+%patch1 -p1 -b .d
 
 %build
 # autoreconf fails here
@@ -238,14 +240,13 @@
 chmod -x contrib/{gg2sms,mkgg2snap,plugin_example/build.sh}
 
 %{__make} install \
+	localedir=%{_datadir}/locale \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 desktop-file-install --vendor Fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    --add-category Application \
-    --add-category Internet \
     %{name}.desktop
 
 %find_lang %{name} --with-gnome
@@ -347,6 +348,11 @@
 %{_libdir}/pkgconfig/gg2_core.pc
 
 %changelog
+* Mon Oct 16 2006 Dominik Mierzejewski  2.3.0-1
+- updated to 2.3.0
+- fix desktop file
+- fix locale installation
+
 * Sun Sep 17 2006 Dominik Mierzejewski  2.2.9-7
 - removed perl Requires: from -devel
 - verified building with latest libgadu


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gg2/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2006 20:15:19 -0000	1.2
+++ sources	1 Nov 2006 14:51:12 -0000	1.3
@@ -1 +1 @@
-e12c2153993dbbf66f8cefa3c628e7cd  gg2-2.2.9.tar.gz
+dbe6c0f85c9dbb115ee1911d8abbea33  gg2-2.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  1 14:52:55 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 1 Nov 2006 07:52:55 -0700
Subject: rpms/gg2/FC-5 gg2-desktop.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gg2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611011452.kA1Eqttf022129@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/gg2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22106

Modified Files:
	.cvsignore gg2.spec sources 
Added Files:
	gg2-desktop.patch 
Log Message:
- updated to 2.3.0
- fix desktop file
- fix locale installation


gg2-desktop.patch:

--- NEW FILE gg2-desktop.patch ---
--- gg2-2.3.0/gg2.desktop.r	2004-08-04 22:53:57.000000000 +0200
+++ gg2-2.3.0/gg2.desktop	2006-11-01 15:07:18.000000000 +0100
@@ -9,5 +9,5 @@
 Icon=gg2.png
 Terminal=false
 Type=Application
-Categories=Application;Network;InstantMessaging;GTK;
+Categories=Network;InstantMessaging;GTK;
 # vi: encoding=utf-8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gg2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 20:15:19 -0000	1.2
+++ .cvsignore	1 Nov 2006 14:52:24 -0000	1.3
@@ -1 +1 @@
-gg2-2.2.9.tar.gz
+gg2-2.3.0.tar.bz2


Index: gg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gg2/FC-5/gg2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gg2.spec	17 Sep 2006 20:15:19 -0000	1.1
+++ gg2.spec	1 Nov 2006 14:52:24 -0000	1.2
@@ -1,13 +1,14 @@
 Name: gg2
-Version: 2.2.9
-Release: 7%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 Summary: GNU Gadu 2 - free talking
 Summary(es): GNU Gadu 2 - charlar libremente
 Summary(pl): GNU Gadu 2 - wolne gadanie
 License: GPL
 Group: Applications/Internet
-Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.gz
+Source: http://dl.sourceforge.net/ggadu/%{name}-%{version}.tar.bz2
 Patch0: %{name}-pc.patch
+Patch1: %{name}-desktop.patch
 URL: http://www.gnugadu.org/
 BuildRequires: arts-devel
 BuildRequires: autoconf
@@ -196,6 +197,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .p
+%patch1 -p1 -b .d
 
 %build
 # autoreconf fails here
@@ -238,14 +240,13 @@
 chmod -x contrib/{gg2sms,mkgg2snap,plugin_example/build.sh}
 
 %{__make} install \
+	localedir=%{_datadir}/locale \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 desktop-file-install --vendor Fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
-    --add-category Application \
-    --add-category Internet \
     %{name}.desktop
 
 %find_lang %{name} --with-gnome
@@ -347,6 +348,11 @@
 %{_libdir}/pkgconfig/gg2_core.pc
 
 %changelog
+* Mon Oct 16 2006 Dominik Mierzejewski  2.3.0-1
+- updated to 2.3.0
+- fix desktop file
+- fix locale installation
+
 * Sun Sep 17 2006 Dominik Mierzejewski  2.2.9-7
 - removed perl Requires: from -devel
 - verified building with latest libgadu


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gg2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2006 20:15:19 -0000	1.2
+++ sources	1 Nov 2006 14:52:24 -0000	1.3
@@ -1 +1 @@
-e12c2153993dbbf66f8cefa3c628e7cd  gg2-2.2.9.tar.gz
+dbe6c0f85c9dbb115ee1911d8abbea33  gg2-2.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  1 15:09:26 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 1 Nov 2006 08:09:26 -0700
Subject: rpms/jd/devel .cvsignore, 1.9, 1.10 jd.spec, 1.16, 1.17 sources, 1.9,
	1.10
Message-ID: <200611011509.kA1F9Q4E025245@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25219

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Nov  1 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061101
- cvs 061101 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	31 Oct 2006 04:43:24 -0000	1.9
+++ .cvsignore	1 Nov 2006 15:08:56 -0000	1.10
@@ -1 +1 @@
-jd-1.8.0-cvs061030.tgz
+jd-1.8.0-cvs061101.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jd.spec	31 Oct 2006 04:43:24 -0000	1.16
+++ jd.spec	1 Nov 2006 15:08:56 -0000	1.17
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061030
+%define         strtag        cvs061101
 %define         repoid        22352
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Oct 30 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061030
-- cvs 061030 (25:15 JST)
+* Wed Nov  1 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061101
+- cvs 061101 (23:59 JST)
 
 * Sat Oct 28 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061028
 - Detect libSM and libICE for x86_64.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	31 Oct 2006 04:43:24 -0000	1.9
+++ sources	1 Nov 2006 15:08:56 -0000	1.10
@@ -1 +1 @@
-5810c2bb6cb4b6ff8cc84000eb0c166a  jd-1.8.0-cvs061030.tgz
+8b38d865dfab3b5a17be7a921a8b701a  jd-1.8.0-cvs061101.tgz



From fedora-extras-commits at redhat.com  Wed Nov  1 16:10:03 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 1 Nov 2006 09:10:03 -0700
Subject: rpms/ctorrent/devel .cvsignore, 1.3, 1.4 ctorrent.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200611011610.kA1GA3ir028783@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/ctorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28763

Modified Files:
	.cvsignore ctorrent.spec sources 
Log Message:
- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
- add more docs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Sep 2006 18:18:53 -0000	1.3
+++ .cvsignore	1 Nov 2006 16:09:33 -0000	1.4
@@ -1 +1 @@
-ctorrent-1.3.4.tar.bz2
+ctorrent-1.3.4-dnh2.1.tar.gz


Index: ctorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/devel/ctorrent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ctorrent.spec	3 Oct 2006 21:56:47 -0000	1.4
+++ ctorrent.spec	1 Nov 2006 16:09:33 -0000	1.5
@@ -1,11 +1,13 @@
+%define dnh dnh2.1
+
 Name: ctorrent
 Version: 1.3.4
-Release: 2%{?dist}
+Release: 3.%{dnh}%{?dist}
 Summary: BitTorrent Client written in C
 Group: Applications/Internet
 License: GPL
-URL: http://ctorrent.sourceforge.net
-Source0: http://switch.dl.sourceforge.net/sourceforge/ctorrent/%{name}-%{version}.tar.bz2
+URL: http://www.rahul.net/dholmes/ctorrent/
+Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
@@ -14,7 +16,7 @@
 doesn't require any graphical component, such as an X server.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dnh}
 
 %build
 %configure
@@ -30,9 +32,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ctorrent
-%doc AUTHORS README NEWS
+%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT
 
 %changelog
+* Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski  1.3.4-3.dnh2.1
+- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
+- add more docs
+
 * Tue Oct 03 2006 Dominik 'Rathann' Mierzejewski  1.3.4-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Sep 2006 18:18:53 -0000	1.3
+++ sources	1 Nov 2006 16:09:33 -0000	1.4
@@ -1 +1 @@
-823010ec78215d476537c9eba9381cdd  ctorrent-1.3.4.tar.bz2
+5cc1e46e1d1a3144f319cdec43256169  ctorrent-1.3.4-dnh2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 16:29:16 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 1 Nov 2006 09:29:16 -0700
Subject: rpms/amarok/FC-5 amarok.spec,1.63,1.64
Message-ID: <200611011629.kA1GTGsI029025@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28978/FC-5

Modified Files:
	amarok.spec 
Log Message:
fix description


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- amarok.spec	31 Oct 2006 11:01:33 -0000	1.63
+++ amarok.spec	1 Nov 2006 16:28:46 -0000	1.64
@@ -58,8 +58,8 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
-Amarok can use various engines to decode sound : gstreamer, helix
-and xine (disabled by default for patent reasons)
+Amarok can use various engines to decode sound : helix and xine.
+(gstreamer is in the works)
 To use the helix engine, you'll have to install either HelixPlayer
 or RealPlayer
 



From fedora-extras-commits at redhat.com  Wed Nov  1 16:29:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 1 Nov 2006 09:29:17 -0700
Subject: rpms/amarok/FC-6 amarok.spec,1.64,1.65
Message-ID: <200611011629.kA1GTH5Y029028@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28978/FC-6

Modified Files:
	amarok.spec 
Log Message:
fix description


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- amarok.spec	31 Oct 2006 11:01:42 -0000	1.64
+++ amarok.spec	1 Nov 2006 16:28:47 -0000	1.65
@@ -58,8 +58,8 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
-Amarok can use various engines to decode sound : gstreamer, helix
-and xine (disabled by default for patent reasons)
+Amarok can use various engines to decode sound : helix and xine.
+(gstreamer is in the works)
 To use the helix engine, you'll have to install either HelixPlayer
 or RealPlayer
 



From fedora-extras-commits at redhat.com  Wed Nov  1 16:29:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 1 Nov 2006 09:29:18 -0700
Subject: rpms/amarok/devel amarok.spec,1.64,1.65
Message-ID: <200611011629.kA1GTIRo029029@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28978/devel

Modified Files:
	amarok.spec 
Log Message:
fix description


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- amarok.spec	31 Oct 2006 11:01:45 -0000	1.64
+++ amarok.spec	1 Nov 2006 16:28:48 -0000	1.65
@@ -58,8 +58,8 @@
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
-Amarok can use various engines to decode sound : gstreamer, helix
-and xine (disabled by default for patent reasons)
+Amarok can use various engines to decode sound : helix and xine.
+(gstreamer is in the works)
 To use the helix engine, you'll have to install either HelixPlayer
 or RealPlayer
 



From fedora-extras-commits at redhat.com  Wed Nov  1 16:42:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 1 Nov 2006 09:42:05 -0700
Subject: rpms/guiloader-c++/devel .cvsignore, 1.2, 1.3 guiloader-c++.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611011642.kA1Gg5A7029191@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/guiloader-c++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29162

Modified Files:
	.cvsignore guiloader-c++.spec sources 
Log Message:
Update to 2.8.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2006 09:29:59 -0000	1.2
+++ .cvsignore	1 Nov 2006 16:41:35 -0000	1.3
@@ -1 +1 @@
-guiloader-c++-2.8.0.tar.bz2
+guiloader-c++-2.8.1.tar.bz2


Index: guiloader-c++.spec
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/devel/guiloader-c++.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- guiloader-c++.spec	6 Oct 2006 09:29:59 -0000	1.1
+++ guiloader-c++.spec	1 Nov 2006 16:41:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           guiloader-c++
-Version:        2.8.0
-Release:        2%{?dist}
+Version:        2.8.1
+Release:        1%{?dist}
 Summary:        C++ Binding to GuiLoader Library
 
 Group:          System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 Denis Leroy  - 2.8.1-1
+- Update to 2.8.1
+
 * Fri Oct  6 2006 Denis Leroy  - 2.8.0-2
 - Added pkgconfig devel Requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/guiloader-c++/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2006 09:29:59 -0000	1.2
+++ sources	1 Nov 2006 16:41:35 -0000	1.3
@@ -1 +1 @@
-c66f7ef235cbc82f1a0b1dd5cdb14848  guiloader-c++-2.8.0.tar.bz2
+22045cd53914fdcaf646802e4ce3f9c8  guiloader-c++-2.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  1 16:54:04 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 1 Nov 2006 09:54:04 -0700
Subject: rpms/ctorrent/FC-6 .cvsignore, 1.3, 1.4 ctorrent.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200611011654.kA1Gs4Vm029331@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/ctorrent/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29306

Modified Files:
	.cvsignore ctorrent.spec sources 
Log Message:
- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
- add more docs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Sep 2006 18:18:53 -0000	1.3
+++ .cvsignore	1 Nov 2006 16:53:33 -0000	1.4
@@ -1 +1 @@
-ctorrent-1.3.4.tar.bz2
+ctorrent-1.3.4-dnh2.1.tar.gz


Index: ctorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-6/ctorrent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ctorrent.spec	3 Oct 2006 21:56:47 -0000	1.4
+++ ctorrent.spec	1 Nov 2006 16:53:33 -0000	1.5
@@ -1,11 +1,13 @@
+%define dnh dnh2.1
+
 Name: ctorrent
 Version: 1.3.4
-Release: 2%{?dist}
+Release: 3.%{dnh}%{?dist}
 Summary: BitTorrent Client written in C
 Group: Applications/Internet
 License: GPL
-URL: http://ctorrent.sourceforge.net
-Source0: http://switch.dl.sourceforge.net/sourceforge/ctorrent/%{name}-%{version}.tar.bz2
+URL: http://www.rahul.net/dholmes/ctorrent/
+Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
@@ -14,7 +16,7 @@
 doesn't require any graphical component, such as an X server.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dnh}
 
 %build
 %configure
@@ -30,9 +32,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ctorrent
-%doc AUTHORS README NEWS
+%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT
 
 %changelog
+* Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski  1.3.4-3.dnh2.1
+- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
+- add more docs
+
 * Tue Oct 03 2006 Dominik 'Rathann' Mierzejewski  1.3.4-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Sep 2006 18:18:53 -0000	1.3
+++ sources	1 Nov 2006 16:53:33 -0000	1.4
@@ -1 +1 @@
-823010ec78215d476537c9eba9381cdd  ctorrent-1.3.4.tar.bz2
+5cc1e46e1d1a3144f319cdec43256169  ctorrent-1.3.4-dnh2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 16:56:48 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 1 Nov 2006 09:56:48 -0700
Subject: rpms/csound/FC-6 csound-5.03.0-default-opcodedir.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 csound-5.03.0-enable-fluidsynth.patch,
	1.2, 1.3 csound.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611011656.kA1GumqH029425@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29397

Modified Files:
	.cvsignore csound-5.03.0-enable-fluidsynth.patch csound.spec 
	sources 
Added Files:
	csound-5.03.0-default-opcodedir.patch 
Log Message:
* Wed Nov  1 2006 Dan Williams  5.03.0-8
- CVS snapshot to pick up virtual Midi keyboard
- Make the default for OPCODEDIR be where the plugins are actually installed



csound-5.03.0-default-opcodedir.patch:

--- NEW FILE csound-5.03.0-default-opcodedir.patch ---
--- Csound5.03.0/Top/csmodule.c.default-plugindir	2006-11-01 10:44:42.000000000 -0500
+++ Csound5.03.0/Top/csmodule.c	2006-11-01 10:45:58.000000000 -0500
@@ -123,17 +123,20 @@
 /* default directory to load plugins from if environment variable is not set */
 #if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
 #  define ENABLE_OPCODEDIR_WARNINGS 1
-#  ifdef CS_DEFAULT_PLUGINDIR
-#    undef CS_DEFAULT_PLUGINDIR
+#  ifndef CS_DEFAULT_PLUGINDIR
+#    ifndef USE_DOUBLE
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib/csound/plugins"
+#    else
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib64/csound/plugins"
+#    endif
 #  endif
-#  define CS_DEFAULT_PLUGINDIR      "."
 #else
 #  define ENABLE_OPCODEDIR_WARNINGS 0
 #  ifndef CS_DEFAULT_PLUGINDIR
 #    ifndef USE_DOUBLE
-#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins"
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib/csound/plugins"
 #    else
-#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins64"
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib64/csound/plugins"
 #    endif
 #  endif
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Sep 2006 18:09:14 -0000	1.2
+++ .cvsignore	1 Nov 2006 16:56:17 -0000	1.3
@@ -1,2 +1,3 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
+Csound5.03.0_src-cvs20061101.tar.bz2

csound-5.03.0-enable-fluidsynth.patch:

Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound-5.03.0-enable-fluidsynth.patch	29 Oct 2006 03:32:20 -0000	1.2
+++ csound-5.03.0-enable-fluidsynth.patch	1 Nov 2006 16:56:17 -0000	1.3
@@ -1,24 +1,24 @@
---- Csound5.03.0/SConstruct.enable-fluidsynth	2006-10-21 11:03:22.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-10-23 15:36:10.000000000 -0400
-@@ -225,6 +225,9 @@
+--- Csound5.03.0/SConstruct.enable-fluidsynth	2006-11-01 09:50:30.000000000 -0500
++++ Csound5.03.0/SConstruct	2006-11-01 10:36:08.000000000 -0500
+@@ -224,6 +224,9 @@
      '0')
  opts.Add('isWinNT', 'On windows, if win2000 or NT is used',
            '%d' % withMSVC())
 +opts.Add('useFluidsynth',
 +    'Set to 1 if you want OSC support',
 +    '0')
- 
- # Define the common part of the build environment.
- # This section also sets up customized options for third-party libraries, which
-@@ -426,6 +429,7 @@
- pdhfound = configure.CheckHeader("m_pd.h", language = "C")
- tclhfound = configure.CheckHeader("tcl.h", language = "C")
+ opts.Add('buildCSEditor',
+     'Set to 1 to build the Csound syntax highlighting text editor. Requires FLTK headers and libs',
+     '0')
+@@ -437,6 +440,7 @@
+         tmp = '%s/tcl.h' % i
+         tclhfound = tclhfound or configure.CheckHeader(tmp, language = "C")
  luaFound = configure.CheckHeader("lua.h", language = "C")
 +fluidsynthFound = configure.CheckHeader("fluidsynth.h", language = "C")
  swigFound = 'swig' in commonEnvironment['TOOLS']
  print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
  pythonFound = configure.CheckHeader("Python.h", language = "C")
-@@ -1228,7 +1232,7 @@
+@@ -1263,7 +1267,7 @@
  
  # FLUIDSYNTH OPCODES
  


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csound.spec	29 Oct 2006 03:32:20 -0000	1.3
+++ csound.spec	1 Nov 2006 16:56:17 -0000	1.4
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       7%{?dist}
+Release:       8%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -40,8 +40,7 @@
 Patch1: csound-5.03.0-gstabs-disable-option.patch
 Patch2: csound-5.03.0-no-usr-local.patch
 Patch3: csound-5.03.0-disable-atsa.patch
-Patch4: csound-5.03.0-remote-fixes.patch
-
+Patch4: csound-5.03.0-default-opcodedir.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -184,7 +183,7 @@
 %patch1 -p1 -b .gstabs-disable-option
 %patch2 -p1 -b .no-usr-local
 %patch3 -p1 -b .disable-atsa
-%patch4 -p1 -b .remote-fixes
+%patch4 -p1 -b .default-opcodedir
 
 tar xf %{SOURCE1}
 
@@ -403,6 +402,10 @@
 %doc tutorial/*.py
 
 %changelog
+* Wed Nov  1 2006 Dan Williams  5.03.0-8
+- CVS snapshot to pick up virtual Midi keyboard
+- Make the default for OPCODEDIR be where the plugins are actually installed
+
 * Sat Oct 28 2006 Dan Williams  5.03.0-7
 - Rebuild to drop old source tarball
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2006 03:32:20 -0000	1.3
+++ sources	1 Nov 2006 16:56:17 -0000	1.4
@@ -1,2 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-8f01e4b65c3cb046df04f7eae92448d5  Csound5.03_src-cvs20061027.tar.bz2
+5211f0c1fb54484c29de996e09ca6e3c  Csound5.03.0_src-cvs20061101.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  1 17:01:27 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 1 Nov 2006 10:01:27 -0700
Subject: rpms/ctorrent/FC-5 .cvsignore, 1.3, 1.4 ctorrent.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200611011701.kA1H1R9d032434@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/ctorrent/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29500

Modified Files:
	.cvsignore ctorrent.spec sources 
Log Message:
- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
- add more docs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Sep 2006 18:23:05 -0000	1.3
+++ .cvsignore	1 Nov 2006 17:00:54 -0000	1.4
@@ -1 +1 @@
-ctorrent-1.3.4.tar.bz2
+ctorrent-1.3.4-dnh2.1.tar.gz


Index: ctorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-5/ctorrent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ctorrent.spec	21 Sep 2006 18:23:05 -0000	1.3
+++ ctorrent.spec	1 Nov 2006 17:00:54 -0000	1.4
@@ -1,11 +1,13 @@
+%define dnh dnh2.1
+
 Name: ctorrent
 Version: 1.3.4
-Release: 1%{?dist}
+Release: 2.%{dnh}%{?dist}
 Summary: BitTorrent Client written in C
 Group: Applications/Internet
 License: GPL
-URL: http://ctorrent.sourceforge.net
-Source0: http://switch.dl.sourceforge.net/sourceforge/ctorrent/%{name}-%{version}.tar.bz2
+URL: http://www.rahul.net/dholmes/ctorrent/
+Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 
@@ -14,7 +16,7 @@
 doesn't require any graphical component, such as an X server.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dnh}
 
 %build
 %configure
@@ -30,9 +32,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ctorrent
-%doc AUTHORS README NEWS
+%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT
 
 %changelog
+* Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski  1.3.4-2.dnh2.1
+- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
+- add more docs
+
 * Thu Sep 21 2006 Dominik 'Rathann' Mierzejewski  1.3.4-1
 - update to 1.3.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Sep 2006 18:23:05 -0000	1.3
+++ sources	1 Nov 2006 17:00:54 -0000	1.4
@@ -1 +1 @@
-823010ec78215d476537c9eba9381cdd  ctorrent-1.3.4.tar.bz2
+5cc1e46e1d1a3144f319cdec43256169  ctorrent-1.3.4-dnh2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 17:06:22 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 1 Nov 2006 10:06:22 -0700
Subject: rpms/freefont - New directory
Message-ID: <200611011706.kA1H6M1X032609@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/freefont
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32601/freefont

Log Message:
Directory /cvs/extras/rpms/freefont added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  1 17:06:28 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 1 Nov 2006 10:06:28 -0700
Subject: rpms/freefont/devel - New directory
Message-ID: <200611011706.kA1H6Slv032626@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/freefont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32601/freefont/devel

Log Message:
Directory /cvs/extras/rpms/freefont/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  1 17:06:56 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 1 Nov 2006 10:06:56 -0700
Subject: rpms/freefont Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611011706.kA1H6uWo032702@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/freefont
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32696

Added Files:
	Makefile import.log 
Log Message:
Setup of module freefont


--- NEW FILE Makefile ---
# Top level Makefile for module freefont
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  Wed Nov  1 17:07:02 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 1 Nov 2006 10:07:02 -0700
Subject: rpms/freefont/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611011707.kA1H72k6032720@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/freefont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32696/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module freefont


--- 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 Nov  1 17:08:32 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 1 Nov 2006 10:08:32 -0700
Subject: rpms/freefont import.log,1.1,1.2
Message-ID: <200611011708.kA1H8WcM000339@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/freefont
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv303

Modified Files:
	import.log 
Log Message:
auto-import freefont-20060126-3.fc5 on branch devel from freefont-20060126-3.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freefont/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Nov 2006 17:06:56 -0000	1.1
+++ import.log	1 Nov 2006 17:08:02 -0000	1.2
@@ -0,0 +1 @@
+freefont-20060126-3_fc5:HEAD:freefont-20060126-3.fc5.src.rpm:1162400874



From fedora-extras-commits at redhat.com  Wed Nov  1 17:08:33 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 1 Nov 2006 10:08:33 -0700
Subject: rpms/freefont/devel freefont.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611011708.kA1H8XaP000343@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/freefont/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv303/devel

Modified Files:
	.cvsignore sources 
Added Files:
	freefont.spec 
Log Message:
auto-import freefont-20060126-3.fc5 on branch devel from freefont-20060126-3.fc5.src.rpm


--- NEW FILE freefont.spec ---
%define fontdir         %{_datadir}/fonts/freefont

Name:      freefont
Version:   20060126 
Release:   3%{?dist}
Summary:   Free UCS Outline Fonts
Group:     User Interface/X
License:   GPL 
URL:       http://www.nongnu.org/freefont/ 
Source:    http://savannah.nongnu.org/download/freefont/freefont-ttf-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires:  %{_datadir}/fonts

Obsoletes: freefont-ttf < %{version}-%{release}
Provides: freefont-ttf = %{version}-%{release}

%description
This project aims to privide a set of free scalable (i.e.,
OpenType) fonts covering the ISO 10646/Unicode UCS (Universal
Character Set).


%prep
%setup -q


%build


%install
rm -rf %{buildroot}

install -d %{buildroot}%{fontdir}
install -p -m644 *.ttf  %{buildroot}%{fontdir}/


%clean
rm -rf %{buildroot}


%post
if [ -x /usr/bin/fc-cache ]; then
  /usr/bin/fc-cache %{fontdir} || :
fi

%postun
if [ $1 -eq 0 ]; then
  if [ -x /usr/bin/fc-cache ]; then
    /usr/bin/fc-cache %{fontdir} || :
  fi
fi


%files
%defattr(0644,root,root,0755)
%doc AUTHORS ChangeLog CREDITS COPYING README
%dir %{fontdir}
%{fontdir}/*.ttf


%changelog
* Tue Oct 31 2006 Orion Poplawski  20060126-3
- BOO!
- Make Provides/Osoletes versioned
- Make setup quiet

* Wed Oct 25 2006 Orion Poplawski  20060126-2
- Remove fonts.cache refs
- fc-cache /usr/share/fonts/freefont

* Thu Oct 12 2006 Orion Poplawski  20060126-1
- freefont-ttf-20060126

* Tue Dec 06 2005 Rex Dieter 20051206-1
- freefont-ttf-20051206


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/freefont/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Nov 2006 17:07:02 -0000	1.1
+++ .cvsignore	1 Nov 2006 17:08:03 -0000	1.2
@@ -0,0 +1 @@
+freefont-ttf-20060126.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/freefont/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Nov 2006 17:07:02 -0000	1.1
+++ sources	1 Nov 2006 17:08:03 -0000	1.2
@@ -0,0 +1 @@
+822aba4e2ed065d9d3ded6e26e495854  freefont-ttf-20060126.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 17:13:06 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 1 Nov 2006 10:13:06 -0700
Subject: rpms/csound/devel .cvsignore, 1.4,
	1.5 csound-5.03.0-enable-fluidsynth.patch, 1.2, 1.3 csound.spec,
	1.5, 1.6 sources, 1.4, 1.5 csound-5.03.0-remote-fixes.patch, 1.2, NONE
Message-ID: <200611011713.kA1HD6Q3000473@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv444

Modified Files:
	.cvsignore csound-5.03.0-enable-fluidsynth.patch csound.spec 
	sources 
Removed Files:
	csound-5.03.0-remote-fixes.patch 
Log Message:
* Wed Nov  1 2006 Dan Williams  5.03.0-8
- CVS snapshot to pick up virtual Midi keyboard
- Make the default for OPCODEDIR be where the plugins are actually installed




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Oct 2006 21:12:05 -0000	1.4
+++ .cvsignore	1 Nov 2006 17:12:36 -0000	1.5
@@ -1,4 +1,3 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
-Csound5.03_src-cvs20061023.tar.bz2
-Csound5.03_src-cvs20061027.tar.bz2
+Csound5.03.0_src-cvs20061101.tar.bz2

csound-5.03.0-enable-fluidsynth.patch:

Index: csound-5.03.0-enable-fluidsynth.patch
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound-5.03.0-enable-fluidsynth.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- csound-5.03.0-enable-fluidsynth.patch	24 Oct 2006 04:35:22 -0000	1.2
+++ csound-5.03.0-enable-fluidsynth.patch	1 Nov 2006 17:12:36 -0000	1.3
@@ -1,24 +1,24 @@
---- Csound5.03.0/SConstruct.enable-fluidsynth	2006-10-21 11:03:22.000000000 -0400
-+++ Csound5.03.0/SConstruct	2006-10-23 15:36:10.000000000 -0400
-@@ -225,6 +225,9 @@
+--- Csound5.03.0/SConstruct.enable-fluidsynth	2006-11-01 09:50:30.000000000 -0500
++++ Csound5.03.0/SConstruct	2006-11-01 10:36:08.000000000 -0500
+@@ -224,6 +224,9 @@
      '0')
  opts.Add('isWinNT', 'On windows, if win2000 or NT is used',
            '%d' % withMSVC())
 +opts.Add('useFluidsynth',
 +    'Set to 1 if you want OSC support',
 +    '0')
- 
- # Define the common part of the build environment.
- # This section also sets up customized options for third-party libraries, which
-@@ -426,6 +429,7 @@
- pdhfound = configure.CheckHeader("m_pd.h", language = "C")
- tclhfound = configure.CheckHeader("tcl.h", language = "C")
+ opts.Add('buildCSEditor',
+     'Set to 1 to build the Csound syntax highlighting text editor. Requires FLTK headers and libs',
+     '0')
+@@ -437,6 +440,7 @@
+         tmp = '%s/tcl.h' % i
+         tclhfound = tclhfound or configure.CheckHeader(tmp, language = "C")
  luaFound = configure.CheckHeader("lua.h", language = "C")
 +fluidsynthFound = configure.CheckHeader("fluidsynth.h", language = "C")
  swigFound = 'swig' in commonEnvironment['TOOLS']
  print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
  pythonFound = configure.CheckHeader("Python.h", language = "C")
-@@ -1228,7 +1232,7 @@
+@@ -1263,7 +1267,7 @@
  
  # FLUIDSYNTH OPCODES
  


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- csound.spec	27 Oct 2006 21:12:05 -0000	1.5
+++ csound.spec	1 Nov 2006 17:12:36 -0000	1.6
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       7%{?dist}
+Release:       8%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03_src-cvs20061027.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -40,8 +40,7 @@
 Patch1: csound-5.03.0-gstabs-disable-option.patch
 Patch2: csound-5.03.0-no-usr-local.patch
 Patch3: csound-5.03.0-disable-atsa.patch
-Patch4: csound-5.03.0-remote-fixes.patch
-
+Patch4: csound-5.03.0-default-opcodedir.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -184,7 +183,7 @@
 %patch1 -p1 -b .gstabs-disable-option
 %patch2 -p1 -b .no-usr-local
 %patch3 -p1 -b .disable-atsa
-%patch4 -p1 -b .remote-fixes
+%patch4 -p1 -b .default-opcodedir
 
 tar xf %{SOURCE1}
 
@@ -403,6 +402,13 @@
 %doc tutorial/*.py
 
 %changelog
+* Wed Nov  1 2006 Dan Williams  5.03.0-8
+- CVS snapshot to pick up virtual Midi keyboard
+- Make the default for OPCODEDIR be where the plugins are actually installed
+
+* Sat Oct 28 2006 Dan Williams  5.03.0-7
+- Rebuild to drop old source tarball
+
 * Fri Oct 27 2006 Dan Williams  5.03.0-6
 - Update to a cvs snapshot for the remote plugin and a few other fixes
 - Split csound FLTK plugin out from -gui package since it's unrelated to the GUI bits


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Oct 2006 21:12:05 -0000	1.4
+++ sources	1 Nov 2006 17:12:36 -0000	1.5
@@ -1,3 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-58b8a3f2f7729387acb7cd365191a979  Csound5.03_src-cvs20061023.tar.bz2
-8f01e4b65c3cb046df04f7eae92448d5  Csound5.03_src-cvs20061027.tar.bz2
+5211f0c1fb54484c29de996e09ca6e3c  Csound5.03.0_src-cvs20061101.tar.bz2


--- csound-5.03.0-remote-fixes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 17:15:25 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 1 Nov 2006 10:15:25 -0700
Subject: rpms/csound/devel csound-5.03.0-default-opcodedir.patch,NONE,1.1
Message-ID: <200611011715.kA1HFPqE000584@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv560

Added Files:
	csound-5.03.0-default-opcodedir.patch 
Log Message:
Add forgotten patch


csound-5.03.0-default-opcodedir.patch:

--- NEW FILE csound-5.03.0-default-opcodedir.patch ---
--- Csound5.03.0/Top/csmodule.c.default-plugindir	2006-11-01 10:44:42.000000000 -0500
+++ Csound5.03.0/Top/csmodule.c	2006-11-01 10:45:58.000000000 -0500
@@ -123,17 +123,20 @@
 /* default directory to load plugins from if environment variable is not set */
 #if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
 #  define ENABLE_OPCODEDIR_WARNINGS 1
-#  ifdef CS_DEFAULT_PLUGINDIR
-#    undef CS_DEFAULT_PLUGINDIR
+#  ifndef CS_DEFAULT_PLUGINDIR
+#    ifndef USE_DOUBLE
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib/csound/plugins"
+#    else
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib64/csound/plugins"
+#    endif
 #  endif
-#  define CS_DEFAULT_PLUGINDIR      "."
 #else
 #  define ENABLE_OPCODEDIR_WARNINGS 0
 #  ifndef CS_DEFAULT_PLUGINDIR
 #    ifndef USE_DOUBLE
-#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins"
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib/csound/plugins"
 #    else
-#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins64"
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib64/csound/plugins"
 #    endif
 #  endif
 #endif



From fedora-extras-commits at redhat.com  Wed Nov  1 17:15:53 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 1 Nov 2006 10:15:53 -0700
Subject: rpms/ctorrent/FC-4 .cvsignore, 1.2, 1.3 ctorrent.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611011715.kA1HFr8q000599@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/ctorrent/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv556

Modified Files:
	.cvsignore ctorrent.spec sources 
Log Message:
- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
- add more docs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 May 2006 23:54:20 -0000	1.2
+++ .cvsignore	1 Nov 2006 17:15:22 -0000	1.3
@@ -1 +1 @@
-ctorrent-1.3.2.tar.gz
+ctorrent-1.3.4-dnh2.1.tar.gz


Index: ctorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-4/ctorrent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ctorrent.spec	27 May 2006 23:54:20 -0000	1.1
+++ ctorrent.spec	1 Nov 2006 17:15:22 -0000	1.2
@@ -1,22 +1,22 @@
-Name: ctorrent       
-Version: 1.3.2       
-Release: 3%{?dist}
-Summary: BitTorrent Client written in C      
-
-Group: Applications/Internet	        
-License: GPL        
-URL: http://ctorrent.sourceforge.net         
-Source0: http://download.sourceforge.net/ctorrent/ctorrent-1.3.2.tar.gz      
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define dnh dnh2.1
 
-BuildRequires: openssl-devel   
+Name: ctorrent
+Version: 1.3.4
+Release: 1.%{dnh}%{?dist}
+Summary: BitTorrent Client written in C
+Group: Applications/Internet
+License: GPL
+URL: http://www.rahul.net/dholmes/ctorrent/
+Source0: http://www.rahul.net/dholmes/ctorrent/%{name}-%{version}-%{dnh}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: openssl-devel
 
 %description
 CTorrent is a BitTorrent Client written in C that
 doesn't require any graphical component, such as an X server.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dnh}
 
 %build
 %configure
@@ -32,9 +32,13 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/ctorrent
-%doc AUTHORS README NEWS
+%doc AUTHORS COPYING ChangeLog NEWS README README-DNH.TXT
 
 %changelog
+* Wed Nov 01 2006 Dominik 'Rathann' Mierzejewski  1.3.4-1.dnh2.1
+- upstream has stopped development, rebase to Enhanced CTorrent, fixes #212307
+- add more docs
+
 * Wed May 24 2006 Andrea Veri  1.3.2-3
  - Added openssl-devel to BR
  - Removed libc.so.6 libc.so.6(GLIBC_2.0), libc.so.6(GLIBC_2.1) in BR


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctorrent/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 May 2006 23:54:20 -0000	1.2
+++ sources	1 Nov 2006 17:15:22 -0000	1.3
@@ -1 +1 @@
-1bc787df91285a9cec8509617c3152d6  ctorrent-1.3.2.tar.gz
+5cc1e46e1d1a3144f319cdec43256169  ctorrent-1.3.4-dnh2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 17:17:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 1 Nov 2006 10:17:39 -0700
Subject: rpms/ntfs-3g/FC-5 ntfs-3g.spec,1.2,1.3
Message-ID: <200611011717.kA1HHdXV000734@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv639/FC-5

Modified Files:
	ntfs-3g.spec 
Log Message:

Obsolete ntfsprogs-fuse, make useful symlinks so old users just keep working.



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-5/ntfs-3g.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ntfs-3g.spec	25 Oct 2006 14:53:27 -0000	1.2
+++ ntfs-3g.spec	1 Nov 2006 17:17:09 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.4.%{buildrev}%{?dist}
+Release:	0.5.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -14,6 +14,7 @@
 Requires:	fuse
 Epoch:		1
 Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Obsoletes:	ntfsprogs-fuse
 Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
@@ -56,6 +57,13 @@
 rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
 cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
 
+# Actually make some symlinks for simplicity...
+# ... since we're obsoleting ntfsprogs-fuse
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s ntfs-3g ntfsmount
+cd $RPM_BUILD_ROOT/sbin
+ln -s mount.ntfs-3g mount.ntfs-fuse
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -67,7 +75,9 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs-3g
+/sbin/mount.ntfs-fuse
 %{_bindir}/ntfs-3g
+%{_bindir}/ntfsmount
 %{_libdir}/libntfs-3g.so.*
 %{_mandir}/man8/*
 
@@ -77,6 +87,10 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Nov  1 2006 Tom "spot" Callaway  1:0-0.5.20070920
+- add an obsoletes for ntfsprogs-fuse
+- make some convenience symlinks
+
 * Wed Oct 25 2006 Tom "spot" Callaway  1:0-0.4.20070920
 - add some extra Provides
 



From fedora-extras-commits at redhat.com  Wed Nov  1 17:17:40 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 1 Nov 2006 10:17:40 -0700
Subject: rpms/ntfs-3g/FC-6 ntfs-3g.spec,1.2,1.3
Message-ID: <200611011717.kA1HHeAn000738@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv639/FC-6

Modified Files:
	ntfs-3g.spec 
Log Message:

Obsolete ntfsprogs-fuse, make useful symlinks so old users just keep working.



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/FC-6/ntfs-3g.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ntfs-3g.spec	25 Oct 2006 14:53:28 -0000	1.2
+++ ntfs-3g.spec	1 Nov 2006 17:17:10 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.4.%{buildrev}%{?dist}
+Release:	0.5.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -14,6 +14,7 @@
 Requires:	fuse
 Epoch:		1
 Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Obsoletes:	ntfsprogs-fuse
 Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
@@ -56,6 +57,13 @@
 rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
 cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
 
+# Actually make some symlinks for simplicity...
+# ... since we're obsoleting ntfsprogs-fuse
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s ntfs-3g ntfsmount
+cd $RPM_BUILD_ROOT/sbin
+ln -s mount.ntfs-3g mount.ntfs-fuse
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -67,7 +75,9 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs-3g
+/sbin/mount.ntfs-fuse
 %{_bindir}/ntfs-3g
+%{_bindir}/ntfsmount
 %{_libdir}/libntfs-3g.so.*
 %{_mandir}/man8/*
 
@@ -77,6 +87,10 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Nov  1 2006 Tom "spot" Callaway  1:0-0.5.20070920
+- add an obsoletes for ntfsprogs-fuse
+- make some convenience symlinks
+
 * Wed Oct 25 2006 Tom "spot" Callaway  1:0-0.4.20070920
 - add some extra Provides
 



From fedora-extras-commits at redhat.com  Wed Nov  1 17:17:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 1 Nov 2006 10:17:41 -0700
Subject: rpms/ntfs-3g/devel ntfs-3g.spec,1.2,1.3
Message-ID: <200611011717.kA1HHfG4000741@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ntfs-3g/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv639/devel

Modified Files:
	ntfs-3g.spec 
Log Message:

Obsolete ntfsprogs-fuse, make useful symlinks so old users just keep working.



Index: ntfs-3g.spec
===================================================================
RCS file: /cvs/extras/rpms/ntfs-3g/devel/ntfs-3g.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ntfs-3g.spec	25 Oct 2006 14:53:29 -0000	1.2
+++ ntfs-3g.spec	1 Nov 2006 17:17:11 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	0
-Release:	0.4.%{buildrev}%{?dist}
+Release:	0.5.%{buildrev}%{?dist}
 License:	GPL
 Group:		System Environment/Base
 Source0:	http://mlf.linux.rulez.org/mlf/ezaz/%{name}-%{buildrev}-BETA.tgz
@@ -14,6 +14,7 @@
 Requires:	fuse
 Epoch:		1
 Provides:	ntfsprogs-fuse = %{epoch}:%{version}-%{release}
+Obsoletes:	ntfsprogs-fuse
 Provides:	fuse-ntfs-3g = %{epoch}:%{version}-%{release}
 
 %description
@@ -56,6 +57,13 @@
 rm -rf $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
 cp -a $RPM_BUILD_ROOT%{_bindir}/ntfs-3g $RPM_BUILD_ROOT/sbin/mount.ntfs-3g
 
+# Actually make some symlinks for simplicity...
+# ... since we're obsoleting ntfsprogs-fuse
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s ntfs-3g ntfsmount
+cd $RPM_BUILD_ROOT/sbin
+ln -s mount.ntfs-3g mount.ntfs-fuse
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -67,7 +75,9 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 /sbin/mount.ntfs-3g
+/sbin/mount.ntfs-fuse
 %{_bindir}/ntfs-3g
+%{_bindir}/ntfsmount
 %{_libdir}/libntfs-3g.so.*
 %{_mandir}/man8/*
 
@@ -77,6 +87,10 @@
 %{_libdir}/libntfs-3g.so
 
 %changelog
+* Wed Nov  1 2006 Tom "spot" Callaway  1:0-0.5.20070920
+- add an obsoletes for ntfsprogs-fuse
+- make some convenience symlinks
+
 * Wed Oct 25 2006 Tom "spot" Callaway  1:0-0.4.20070920
 - add some extra Provides
 



From fedora-extras-commits at redhat.com  Wed Nov  1 17:22:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 1 Nov 2006 10:22:57 -0700
Subject: owners owners.list,1.1881,1.1882
Message-ID: <200611011722.kA1HMvqx000984@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv966

Modified Files:
	owners.list 
Log Message:
Add freefont



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1881
retrieving revision 1.1882
diff -u -r1.1881 -r1.1882
--- owners.list	1 Nov 2006 13:55:16 -0000	1.1881
+++ owners.list	1 Nov 2006 17:22:27 -0000	1.1882
@@ -421,6 +421,7 @@
 Fedora Extras|freedoom-freedm|Deathmatch levels for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|freefont|Free UCS Outline Fonts|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|freehdl|A project to develop a free, open source, GPL'ed VHDL simulator for Linux|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  1 17:39:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 1 Nov 2006 10:39:21 -0700
Subject: rpms/asymptote/FC-4 .cvsignore, 1.10, 1.11 asymptote.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200611011739.kA1HdLsA001116@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048/FC-4

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Oct 2006 22:18:16 -0000	1.10
+++ .cvsignore	1 Nov 2006 17:38:51 -0000	1.11
@@ -1 +1 @@
-asymptote-1.16.tar.gz
+asymptote-1.17.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/asymptote.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- asymptote.spec	25 Oct 2006 22:18:16 -0000	1.11
+++ asymptote.spec	1 Nov 2006 17:38:51 -0000	1.12
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.16
+Version:        1.17
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 Jose Pedro Oliveira  - 1.17-1
+- Update to 1.17.
+
 * Wed Oct 25 2006 Jose Pedro Oliveira  - 1.16-1
 - Update to 1.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Oct 2006 22:18:16 -0000	1.10
+++ sources	1 Nov 2006 17:38:51 -0000	1.11
@@ -1 +1 @@
-ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz
+6fee58869caf0bdc89da24978af8f1d6  asymptote-1.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 17:39:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 1 Nov 2006 10:39:22 -0700
Subject: rpms/asymptote/FC-5 .cvsignore, 1.10, 1.11 asymptote.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200611011739.kA1HdMeB001121@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048/FC-5

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Oct 2006 22:18:17 -0000	1.10
+++ .cvsignore	1 Nov 2006 17:38:52 -0000	1.11
@@ -1 +1 @@
-asymptote-1.16.tar.gz
+asymptote-1.17.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/asymptote.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- asymptote.spec	25 Oct 2006 22:18:17 -0000	1.11
+++ asymptote.spec	1 Nov 2006 17:38:52 -0000	1.12
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.16
+Version:        1.17
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 Jose Pedro Oliveira  - 1.17-1
+- Update to 1.17.
+
 * Wed Oct 25 2006 Jose Pedro Oliveira  - 1.16-1
 - Update to 1.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Oct 2006 22:18:17 -0000	1.10
+++ sources	1 Nov 2006 17:38:52 -0000	1.11
@@ -1 +1 @@
-ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz
+6fee58869caf0bdc89da24978af8f1d6  asymptote-1.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 17:39:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 1 Nov 2006 10:39:28 -0700
Subject: rpms/asymptote/FC-6 .cvsignore, 1.10, 1.11 asymptote.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200611011739.kA1HdS8X001126@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048/FC-6

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Oct 2006 22:18:17 -0000	1.10
+++ .cvsignore	1 Nov 2006 17:38:57 -0000	1.11
@@ -1 +1 @@
-asymptote-1.16.tar.gz
+asymptote-1.17.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/asymptote.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- asymptote.spec	25 Oct 2006 22:18:17 -0000	1.11
+++ asymptote.spec	1 Nov 2006 17:38:57 -0000	1.12
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.16
+Version:        1.17
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 Jose Pedro Oliveira  - 1.17-1
+- Update to 1.17.
+
 * Wed Oct 25 2006 Jose Pedro Oliveira  - 1.16-1
 - Update to 1.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Oct 2006 22:18:17 -0000	1.10
+++ sources	1 Nov 2006 17:38:57 -0000	1.11
@@ -1 +1 @@
-ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz
+6fee58869caf0bdc89da24978af8f1d6  asymptote-1.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 17:39:29 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 1 Nov 2006 10:39:29 -0700
Subject: rpms/asymptote/devel .cvsignore, 1.10, 1.11 asymptote.spec, 1.11,
	1.12 sources, 1.10, 1.11
Message-ID: <200611011739.kA1HdTb2001131@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048/devel

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Oct 2006 22:18:18 -0000	1.10
+++ .cvsignore	1 Nov 2006 17:38:58 -0000	1.11
@@ -1 +1 @@
-asymptote-1.16.tar.gz
+asymptote-1.17.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- asymptote.spec	25 Oct 2006 22:18:18 -0000	1.11
+++ asymptote.spec	1 Nov 2006 17:38:58 -0000	1.12
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.16
+Version:        1.17
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 Jose Pedro Oliveira  - 1.17-1
+- Update to 1.17.
+
 * Wed Oct 25 2006 Jose Pedro Oliveira  - 1.16-1
 - Update to 1.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Oct 2006 22:18:18 -0000	1.10
+++ sources	1 Nov 2006 17:38:58 -0000	1.11
@@ -1 +1 @@
-ebdaa519a7672caa8c294ef8d90b23d9  asymptote-1.16.tar.gz
+6fee58869caf0bdc89da24978af8f1d6  asymptote-1.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 17:48:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 1 Nov 2006 10:48:30 -0700
Subject: rpms/gambas/devel gambas.spec,1.19,1.20
Message-ID: <200611011748.kA1HmUjH001337@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1319

Modified Files:
	gambas.spec 
Log Message:

Clean up examples files.



Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gambas.spec	31 Oct 2006 22:35:57 -0000	1.19
+++ gambas.spec	1 Nov 2006 17:48:00 -0000	1.20
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.17
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -251,6 +251,12 @@
   --add-category X-Fedora				\
   debian/gambas.desktop
 
+# Pull buildroot out of the examples files
+for i in `grep -lr "$RPM_BUILD_ROOT" $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/`; 
+do
+  sed -i 's|$RPM_BUILD_ROOT||g' $i; 
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -416,6 +422,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Wed Nov  1 2006 Tom "spot" Callaway  1.0.17-5
+- pull buildroot out of the examples files
+
 * Tue Oct 31 2006 Tom "spot" Callaway  1.0.17-4
 - a spoooky halloween bump for development
 



From fedora-extras-commits at redhat.com  Wed Nov  1 18:03:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  1 Nov 2006 11:03:35 -0700
Subject: fedora-security/audit fe4,1.86,1.87 fe5,1.94,1.95 fe6,1.7,1.8
Message-ID: <200611011803.kA1I3Z9H004439@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4417

Modified Files:
	fe4 fe5 fe6 
Log Message:
moodle #206516 issues fixed


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- fe4	28 Oct 2006 06:48:21 -0000	1.86
+++ fe4	1 Nov 2006 18:03:32 -0000	1.87
@@ -8,21 +8,21 @@
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-CVE-2006-5129 ** (moodle) #206516
+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
-CVE-2006-4943 ** (moodle) #206516
-CVE-2006-4942 ** (moodle) #206516
-CVE-2006-4941 ** (moodle) #206516
-CVE-2006-4940 ** (moodle) #206516
-CVE-2006-4939 ** (moodle) #206516
-CVE-2006-4938 ** (moodle) #206516
-CVE-2006-4937 ** (moodle) #206516
-CVE-2006-4936 ** (moodle) #206516
-CVE-2006-4935 ** (moodle) #206516
-CVE-2006-4786 ** (moodle) #206516
-CVE-2006-4785 ** (moodle) #206516
-CVE-2006-4784 ** (moodle) #206516
+CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
 CVE-2006-4571 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4570 VULNERABLE (seamonkey, fixed 1.0.5) #209167


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- fe5	28 Oct 2006 20:17:41 -0000	1.94
+++ fe5	1 Nov 2006 18:03:32 -0000	1.95
@@ -8,21 +8,21 @@
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-CVE-2006-5129 ** (moodle) #206516
+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
-CVE-2006-4943 ** (moodle) #206516
-CVE-2006-4942 ** (moodle) #206516
-CVE-2006-4941 ** (moodle) #206516
-CVE-2006-4940 ** (moodle) #206516
-CVE-2006-4939 ** (moodle) #206516
-CVE-2006-4938 ** (moodle) #206516
-CVE-2006-4937 ** (moodle) #206516
-CVE-2006-4936 ** (moodle) #206516
-CVE-2006-4935 ** (moodle) #206516
-CVE-2006-4786 ** (moodle) #206516
-CVE-2006-4785 ** (moodle) #206516
-CVE-2006-4784 ** (moodle) #206516
+CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
 CVE-2006-4571 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4570 version (seamonkey, fixed 1.0.5) #209167


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fe6	28 Oct 2006 20:17:41 -0000	1.7
+++ fe6	1 Nov 2006 18:03:32 -0000	1.8
@@ -8,21 +8,21 @@
 CVE-2006-5454 VULNERABLE (bugzilla) #212355
 CVE-2006-5453 VULNERABLE (bugzilla) #212355
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
-CVE-2006-5129 ** (moodle) #206516
+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
-CVE-2006-4943 ** (moodle) #206516
-CVE-2006-4942 ** (moodle) #206516
-CVE-2006-4941 ** (moodle) #206516
-CVE-2006-4940 ** (moodle) #206516
-CVE-2006-4939 ** (moodle) #206516
-CVE-2006-4938 ** (moodle) #206516
-CVE-2006-4937 ** (moodle) #206516
-CVE-2006-4936 ** (moodle) #206516
-CVE-2006-4935 ** (moodle) #206516
-CVE-2006-4786 ** (moodle) #206516
-CVE-2006-4785 ** (moodle) #206516
-CVE-2006-4784 ** (moodle) #206516
+CVE-2006-4943 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4942 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4941 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4940 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4939 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4938 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4784 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4743 ignore (wordpress, dupe of an old non-issue) #206514
 CVE-2006-4571 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4570 version (seamonkey, fixed 1.0.5) #209167



From fedora-extras-commits at redhat.com  Wed Nov  1 18:04:42 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 1 Nov 2006 11:04:42 -0700
Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.33,1.34
Message-ID: <200611011804.kA1I4gii004469@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4451

Modified Files:
	deskbar-applet.spec 
Log Message:
add gnome-python2 to BR


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- deskbar-applet.spec	1 Nov 2006 07:51:07 -0000	1.33
+++ deskbar-applet.spec	1 Nov 2006 18:04:12 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.16.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -16,7 +16,7 @@
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
 BuildRequires:  libSM-devel gnome-python2-applet desktop-file-utils
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	perl(XML::Parser) gnome-python2
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo
 Requires:       gnome-python2-gconf pygtk2 gnome-python2-libwnck
 Requires(pre):  GConf2
@@ -91,6 +91,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Nov  1 2006 Luke Macken  - 2.16.1-2
+- Add gnome-python2 to BuildRequires
+
 * Wed Nov  1 2006 Luke Macken  - 2.16.1-1
 - 2.16.1
 



From fedora-extras-commits at redhat.com  Wed Nov  1 18:33:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 1 Nov 2006 11:33:06 -0700
Subject: rpms/kdemultimedia-extras/devel .cvsignore, 1.5,
	1.6 kdemultimedia-extras.spec, 1.12, 1.13 sources, 1.5,
	1.6 kde-libtool.patch, 1.1,
	NONE kdemultimedia-3.4.0-arts_includes.patch, 1.1,
	NONE kdemultimedia-3.5.0-116958.patch, 1.1, NONE
Message-ID: <200611011833.kA1IX67a004730@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4710

Modified Files:
	.cvsignore kdemultimedia-extras.spec sources 
Removed Files:
	kde-libtool.patch kdemultimedia-3.4.0-arts_includes.patch 
	kdemultimedia-3.5.0-116958.patch 
Log Message:
* Wed Nov 01 2006 Rex Dieter  6:3.5.5-0.3
- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg)

* Wed Oct 25 2006 Rex Dieter  6:3.5.5-0.2
- exclude kfile_mpeg from main pkg (it's in -extras-nonfree).
  Arguably, doesn't *have* to be marked nonfree, but that's another battle.

* Wed Oct 04 2006 Rex Dieter  6:3.5.5-0.1
- -extras: own %%_datadir/apps/juk/pics
- 3.5.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Aug 2006 18:41:46 -0000	1.5
+++ .cvsignore	1 Nov 2006 18:32:36 -0000	1.6
@@ -1,3 +1,4 @@
 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


Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdemultimedia-extras.spec	4 Oct 2006 19:44:29 -0000	1.12
+++ kdemultimedia-extras.spec	1 Nov 2006 18:32:36 -0000	1.13
@@ -31,7 +31,7 @@
 %if "%{?nonfree}" == "1"
 %define _with_akode --with-akode
 BuildRequires: akode-extras
-%define _with_lame --with-lame --disable-lametest
+%define _with_lame --with-lame
 %define _with_taglib --with-taglib
 %define _with_xine --with-xine
 %endif
@@ -66,8 +66,8 @@
 #if "%{?core}" == "1"
 Epoch:	 6
 #endif
-Version: 3.5.4
-Release: 8%{?dist}%{?kde}
+Version: 3.5.5
+Release: 0.3%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -107,8 +107,6 @@
 %{?_with_jack:BuildRequires: jack-audio-connection-kit}
 %{?_with_polypaudio:BuildRequires: polypaudio-devel}
 
-Patch0: kde-libtool.patch
-Patch1: kdemultimedia-3.4.0-arts_includes.patch
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 
@@ -119,8 +117,6 @@
 Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch
 # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744
 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch
-# akode: http://bugs.kde.org/116958
-Patch116958: kdemultimedia-3.5.0-116958.patch
 
 %if "%{?core}" == "1"
 %description
@@ -159,7 +155,7 @@
 %description 
 %{summary}, including: 
 * akode_artsplugin (akode)
-* juk (libtunepimp)
+* juk %{?_with_musicbrainz:(libtunepimp)}
 * kfile-plugins: flac, mpc (taglib)
 %endif
 
@@ -189,17 +185,16 @@
 %setup -q -n kdemultimedia 
 %endif
 
-#patch0 -p1 -b .libtool
-%if "%{version}" < "3.5.3"
-%patch1 -p1 -b .arts_include
-%endif
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 
-#with mpeglib in -extras, not really needed -- Rex
+#with mpeglib in -extras-nonfree, not really needed -- Rex
 #patch1000   -p1 -b .oggvorbis_artsplugin
 %{?nonfree:%patch74744  -p1 -b .74744}
-%patch116958 -p1 -b .116958
+
+%if "%{?patched:1}" != "1"
+%patch1001 -p1 -b .omit_kfile_mpeg
+%endif
 
 %if "%{is_release}" != "1"
   make -f admin/Makefile.common cvs
@@ -220,11 +215,18 @@
 
 %{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"}
 
+# -- disable-new-ldflags for nonfree/fc6, since --as-needed fails for lame -- Rex
+# until either binutils or lame (livna bug #1207) is fixed
+
 %configure \
   --includedir=%{_includedir}/kde \
   --disable-rpath \
   --disable-gcc-hidden-visibility \
+%if "%{?fedora}" == "6" && "%{?nonfree:1}" == "1" 
+  --disable-new-ldflags \
+%else
   --enable-new-ldflags \
+%endif
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --enable-final \
   --without-libltdl \
@@ -273,12 +275,10 @@
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module
 done
 
-#if "%{?juk:1}" == "1"
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   --add-category="X-Fedora" --vendor="" \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop
-#endif
 
 %if "%{?debug}" == "1"
 # Conflicts check (debuging only)
@@ -380,7 +380,7 @@
 
 %if "%{?core}" == "1"
 %post
-/sbin/ldconfig
+/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 ||:
@@ -388,16 +388,16 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig
+/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 || :
-%endif
 
+%endif
 %if "%{?extras}" == "1"
-#if "%{?juk:1}" == "1"
+
 %post
 for icon_theme in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
@@ -409,13 +409,16 @@
   touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
 done
-#endif
-%endif
 
+%endif
 %if "%{?nonfree}" == "1"
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%post 
+/sbin/ldconfig ||:
+
+%postun
+/sbin/ldconfig ||:
+
 %endif
 
 
@@ -440,37 +443,113 @@
 %{_libdir}/mcop/*
 %{_libdir}/kde3/*
 
-%files devel 
+%files devel -f devel.list
 %defattr(-,root,root,-)
 %{_includedir}/*
 %endif
 
 %if "%{?extras}" == "1"
-%files -f extras.list
+#files -f extras.list
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/apps/juk/
+# juk
+%{_bindir}/juk
+%{_datadir}/applications/kde/juk.desktop
+%{_datadir}/apps/juk
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/*/juk*
+%{_datadir}/icons/hicolor/*/*/juk*
+# kfile-plugins
+%{_libdir}/kde3/kfile_flac.*
+%{_libdir}/kde3/kfile_mpc.*
+%{_datadir}/services/kfile_flac.desktop
+%{_datadir}/services/kfile_mpc.desktop
+# akode_artsplugin (free bits)
+%{_libdir}/libarts_akode.[ls][ao]
+%{_libdir}/libarts_akode.so.*
+%{_libdir}/mcop/akodeMPCPlayObject.mcopclass
+%{_libdir}/mcop/akodePlayObject.mcopclass
+%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeXiphPlayObject.mcopclass
+%{_libdir}/mcop/akodearts.mcopclass
+%{_libdir}/mcop/akodearts.mcoptype
 %endif
 
 %if "%{?nonfree}" == "1"
-%files -f nonfree.list
+#files -f nonfree.list
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/apps/videothumbnail/
-## FIXME? -- Rex
+%{_bindir}/yaf-cdda
+%{_bindir}/yaf-mpgplay
+%{_bindir}/yaf-splay
+%{_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}/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
+#defattr(-,root,root,-)
+%{_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
+%{_libdir}/mcop/NULLPlayObject.mcopclass
+%{_libdir}/mcop/OGGPlayObject.mcopclass
+%{_libdir}/mcop/SplayPlayObject.mcopclass
+%{_libdir}/mcop/WAVPlayObject.mcopclass
+%{_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"
+%{_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/
 %endif
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter  6:3.5.4-8 
-- respin
+* Wed Nov 01 2006 Rex Dieter  6:3.5.5-0.3
+- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg)
+
+* Wed Oct 25 2006 Rex Dieter  6:3.5.5-0.2
+- exclude kfile_mpeg from main pkg (it's in -extras-nonfree).  
+  Arguably, doesn't *have* to be marked nonfree, but that's another battle.
+
+* Wed Oct 04 2006 Rex Dieter  6:3.5.5-0.1
+- -extras: own %%_datadir/apps/juk/pics
+- 3.5.5
 
 * Tue Sep 19 2006 Rex Dieter  6:3.5.4-7
 - -extras: drop --with-musicbrainz (for now)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Aug 2006 18:41:46 -0000	1.5
+++ sources	1 Nov 2006 18:32:36 -0000	1.6
@@ -1 +1 @@
-3cf5d9173232cadcf9042d7a60605de3  kdemultimedia-3.5.4-patched.tar.bz2
+7439844e5105091e2b93b3821d999da5  kdemultimedia-3.5.5-patched.tar.bz2


--- kde-libtool.patch DELETED ---


--- kdemultimedia-3.4.0-arts_includes.patch DELETED ---


--- kdemultimedia-3.5.0-116958.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 18:36:54 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 1 Nov 2006 11:36:54 -0700
Subject: rpms/gambas/devel gambas.spec,1.20,1.21
Message-ID: <200611011836.kA1Ias4I004832@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gambas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4816

Modified Files:
	gambas.spec 
Log Message:

double quotes, not single quotes.



Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gambas.spec	1 Nov 2006 17:48:00 -0000	1.20
+++ gambas.spec	1 Nov 2006 18:36:24 -0000	1.21
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.17
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -254,7 +254,7 @@
 # Pull buildroot out of the examples files
 for i in `grep -lr "$RPM_BUILD_ROOT" $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/`; 
 do
-  sed -i 's|$RPM_BUILD_ROOT||g' $i; 
+  sed -i "s|$RPM_BUILD_ROOT||g" $i; 
 done
 
 %clean
@@ -422,6 +422,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Wed Nov  1 2006 Tom "spot" Callaway  1.0.17-6
+- double quotes, not single quotes
+
 * Wed Nov  1 2006 Tom "spot" Callaway  1.0.17-5
 - pull buildroot out of the examples files
 



From fedora-extras-commits at redhat.com  Wed Nov  1 18:55:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 1 Nov 2006 11:55:18 -0700
Subject: rpms/kdemultimedia-extras/FC-6 .cvsignore, 1.5,
	1.6 kdemultimedia-extras.spec, 1.12, 1.13 sources, 1.5,
	1.6 kde-libtool.patch, 1.1,
	NONE kdemultimedia-3.4.0-arts_includes.patch, 1.1,
	NONE kdemultimedia-3.5.0-116958.patch, 1.1, NONE
Message-ID: <200611011855.kA1ItIXo004956@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4935

Modified Files:
	.cvsignore kdemultimedia-extras.spec sources 
Removed Files:
	kde-libtool.patch kdemultimedia-3.4.0-arts_includes.patch 
	kdemultimedia-3.5.0-116958.patch 
Log Message:
* Wed Nov 01 2006 Rex Dieter  6:3.5.5-0.3
- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg)

* Wed Oct 25 2006 Rex Dieter  6:3.5.5-0.2
- exclude kfile_mpeg from main pkg (it's in -extras-nonfree).
  Arguably, doesn't *have* to be marked nonfree, but that's another battle.

* Wed Oct 04 2006 Rex Dieter  6:3.5.5-0.1
- -extras: own %%_datadir/apps/juk/pics
- 3.5.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Aug 2006 18:41:46 -0000	1.5
+++ .cvsignore	1 Nov 2006 18:54:48 -0000	1.6
@@ -1,3 +1,2 @@
-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


Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-6/kdemultimedia-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdemultimedia-extras.spec	4 Oct 2006 19:44:29 -0000	1.12
+++ kdemultimedia-extras.spec	1 Nov 2006 18:54:48 -0000	1.13
@@ -31,7 +31,7 @@
 %if "%{?nonfree}" == "1"
 %define _with_akode --with-akode
 BuildRequires: akode-extras
-%define _with_lame --with-lame --disable-lametest
+%define _with_lame --with-lame
 %define _with_taglib --with-taglib
 %define _with_xine --with-xine
 %endif
@@ -66,8 +66,8 @@
 #if "%{?core}" == "1"
 Epoch:	 6
 #endif
-Version: 3.5.4
-Release: 8%{?dist}%{?kde}
+Version: 3.5.5
+Release: 0.3%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -107,8 +107,6 @@
 %{?_with_jack:BuildRequires: jack-audio-connection-kit}
 %{?_with_polypaudio:BuildRequires: polypaudio-devel}
 
-Patch0: kde-libtool.patch
-Patch1: kdemultimedia-3.4.0-arts_includes.patch
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 
@@ -119,8 +117,6 @@
 Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch
 # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744
 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch
-# akode: http://bugs.kde.org/116958
-Patch116958: kdemultimedia-3.5.0-116958.patch
 
 %if "%{?core}" == "1"
 %description
@@ -159,7 +155,7 @@
 %description 
 %{summary}, including: 
 * akode_artsplugin (akode)
-* juk (libtunepimp)
+* juk %{?_with_musicbrainz:(libtunepimp)}
 * kfile-plugins: flac, mpc (taglib)
 %endif
 
@@ -189,17 +185,16 @@
 %setup -q -n kdemultimedia 
 %endif
 
-#patch0 -p1 -b .libtool
-%if "%{version}" < "3.5.3"
-%patch1 -p1 -b .arts_include
-%endif
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 
-#with mpeglib in -extras, not really needed -- Rex
+#with mpeglib in -extras-nonfree, not really needed -- Rex
 #patch1000   -p1 -b .oggvorbis_artsplugin
 %{?nonfree:%patch74744  -p1 -b .74744}
-%patch116958 -p1 -b .116958
+
+%if "%{?patched:1}" != "1"
+%patch1001 -p1 -b .omit_kfile_mpeg
+%endif
 
 %if "%{is_release}" != "1"
   make -f admin/Makefile.common cvs
@@ -220,11 +215,18 @@
 
 %{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"}
 
+# -- disable-new-ldflags for nonfree/fc6, since --as-needed fails for lame -- Rex
+# until either binutils or lame (livna bug #1207) is fixed
+
 %configure \
   --includedir=%{_includedir}/kde \
   --disable-rpath \
   --disable-gcc-hidden-visibility \
+%if "%{?fedora}" == "6" && "%{?nonfree:1}" == "1" 
+  --disable-new-ldflags \
+%else
   --enable-new-ldflags \
+%endif
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --enable-final \
   --without-libltdl \
@@ -273,12 +275,10 @@
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module
 done
 
-#if "%{?juk:1}" == "1"
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   --add-category="X-Fedora" --vendor="" \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop
-#endif
 
 %if "%{?debug}" == "1"
 # Conflicts check (debuging only)
@@ -380,7 +380,7 @@
 
 %if "%{?core}" == "1"
 %post
-/sbin/ldconfig
+/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 ||:
@@ -388,16 +388,16 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig
+/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 || :
-%endif
 
+%endif
 %if "%{?extras}" == "1"
-#if "%{?juk:1}" == "1"
+
 %post
 for icon_theme in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
@@ -409,13 +409,16 @@
   touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
 done
-#endif
-%endif
 
+%endif
 %if "%{?nonfree}" == "1"
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%post 
+/sbin/ldconfig ||:
+
+%postun
+/sbin/ldconfig ||:
+
 %endif
 
 
@@ -440,37 +443,113 @@
 %{_libdir}/mcop/*
 %{_libdir}/kde3/*
 
-%files devel 
+%files devel -f devel.list
 %defattr(-,root,root,-)
 %{_includedir}/*
 %endif
 
 %if "%{?extras}" == "1"
-%files -f extras.list
+#files -f extras.list
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/apps/juk/
+# juk
+%{_bindir}/juk
+%{_datadir}/applications/kde/juk.desktop
+%{_datadir}/apps/juk
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/*/juk*
+%{_datadir}/icons/hicolor/*/*/juk*
+# kfile-plugins
+%{_libdir}/kde3/kfile_flac.*
+%{_libdir}/kde3/kfile_mpc.*
+%{_datadir}/services/kfile_flac.desktop
+%{_datadir}/services/kfile_mpc.desktop
+# akode_artsplugin (free bits)
+%{_libdir}/libarts_akode.[ls][ao]
+%{_libdir}/libarts_akode.so.*
+%{_libdir}/mcop/akodeMPCPlayObject.mcopclass
+%{_libdir}/mcop/akodePlayObject.mcopclass
+%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeXiphPlayObject.mcopclass
+%{_libdir}/mcop/akodearts.mcopclass
+%{_libdir}/mcop/akodearts.mcoptype
 %endif
 
 %if "%{?nonfree}" == "1"
-%files -f nonfree.list
+#files -f nonfree.list
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/apps/videothumbnail/
-## FIXME? -- Rex
+%{_bindir}/yaf-cdda
+%{_bindir}/yaf-mpgplay
+%{_bindir}/yaf-splay
+%{_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}/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
+#defattr(-,root,root,-)
+%{_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
+%{_libdir}/mcop/NULLPlayObject.mcopclass
+%{_libdir}/mcop/OGGPlayObject.mcopclass
+%{_libdir}/mcop/SplayPlayObject.mcopclass
+%{_libdir}/mcop/WAVPlayObject.mcopclass
+%{_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"
+%{_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/
 %endif
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter  6:3.5.4-8 
-- respin
+* Wed Nov 01 2006 Rex Dieter  6:3.5.5-0.3
+- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg)
+
+* Wed Oct 25 2006 Rex Dieter  6:3.5.5-0.2
+- exclude kfile_mpeg from main pkg (it's in -extras-nonfree).  
+  Arguably, doesn't *have* to be marked nonfree, but that's another battle.
+
+* Wed Oct 04 2006 Rex Dieter  6:3.5.5-0.1
+- -extras: own %%_datadir/apps/juk/pics
+- 3.5.5
 
 * Tue Sep 19 2006 Rex Dieter  6:3.5.4-7
 - -extras: drop --with-musicbrainz (for now)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Aug 2006 18:41:46 -0000	1.5
+++ sources	1 Nov 2006 18:54:48 -0000	1.6
@@ -1 +1 @@
-3cf5d9173232cadcf9042d7a60605de3  kdemultimedia-3.5.4-patched.tar.bz2
+7439844e5105091e2b93b3821d999da5  kdemultimedia-3.5.5-patched.tar.bz2


--- kde-libtool.patch DELETED ---


--- kdemultimedia-3.4.0-arts_includes.patch DELETED ---


--- kdemultimedia-3.5.0-116958.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 18:56:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 1 Nov 2006 11:56:24 -0700
Subject: rpms/kdemultimedia-extras/FC-5 .cvsignore, 1.5,
	1.6 kdemultimedia-extras.spec, 1.7, 1.8 sources, 1.6,
	1.7 kde-libtool.patch, 1.1,
	NONE kdemultimedia-3.4.0-arts_includes.patch, 1.1,
	NONE kdemultimedia-3.5.0-116958.patch, 1.1, NONE
Message-ID: <200611011856.kA1IuOnS005026@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5006

Modified Files:
	.cvsignore kdemultimedia-extras.spec sources 
Removed Files:
	kde-libtool.patch kdemultimedia-3.4.0-arts_includes.patch 
	kdemultimedia-3.5.0-116958.patch 
Log Message:
* Wed Nov 01 2006 Rex Dieter  6:3.5.5-0.3
- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg)

* Wed Oct 25 2006 Rex Dieter  6:3.5.5-0.2
- exclude kfile_mpeg from main pkg (it's in -extras-nonfree).
  Arguably, doesn't *have* to be marked nonfree, but that's another battle.

* Wed Oct 04 2006 Rex Dieter  6:3.5.5-0.1
- -extras: own %%_datadir/apps/juk/pics
- 3.5.5




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Sep 2006 20:25:28 -0000	1.5
+++ .cvsignore	1 Nov 2006 18:55:54 -0000	1.6
@@ -1,3 +1,2 @@
-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


Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdemultimedia-extras.spec	7 Oct 2006 12:07:27 -0000	1.7
+++ kdemultimedia-extras.spec	1 Nov 2006 18:55:54 -0000	1.8
@@ -31,7 +31,7 @@
 %if "%{?nonfree}" == "1"
 %define _with_akode --with-akode
 BuildRequires: akode-extras
-%define _with_lame --with-lame --disable-lametest
+%define _with_lame --with-lame
 %define _with_taglib --with-taglib
 %define _with_xine --with-xine
 %endif
@@ -66,8 +66,8 @@
 #if "%{?core}" == "1"
 Epoch:	 6
 #endif
-Version: 3.5.4
-Release: 8%{?dist}%{?kde}
+Version: 3.5.5
+Release: 0.3%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -107,8 +107,6 @@
 %{?_with_jack:BuildRequires: jack-audio-connection-kit}
 %{?_with_polypaudio:BuildRequires: polypaudio-devel}
 
-Patch0: kde-libtool.patch
-Patch1: kdemultimedia-3.4.0-arts_includes.patch
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 
@@ -119,8 +117,6 @@
 Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch
 # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744
 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch
-# akode: http://bugs.kde.org/116958
-Patch116958: kdemultimedia-3.5.0-116958.patch
 
 %if "%{?core}" == "1"
 %description
@@ -159,7 +155,7 @@
 %description 
 %{summary}, including: 
 * akode_artsplugin (akode)
-* juk (libtunepimp)
+* juk %{?_with_musicbrainz:(libtunepimp)}
 * kfile-plugins: flac, mpc (taglib)
 %endif
 
@@ -189,17 +185,16 @@
 %setup -q -n kdemultimedia 
 %endif
 
-#patch0 -p1 -b .libtool
-%if "%{version}" < "3.5.3"
-%patch1 -p1 -b .arts_include
-%endif
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 
-#with mpeglib in -extras, not really needed -- Rex
+#with mpeglib in -extras-nonfree, not really needed -- Rex
 #patch1000   -p1 -b .oggvorbis_artsplugin
 %{?nonfree:%patch74744  -p1 -b .74744}
-%patch116958 -p1 -b .116958
+
+%if "%{?patched:1}" != "1"
+%patch1001 -p1 -b .omit_kfile_mpeg
+%endif
 
 %if "%{is_release}" != "1"
   make -f admin/Makefile.common cvs
@@ -220,11 +215,18 @@
 
 %{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"}
 
+# -- disable-new-ldflags for nonfree/fc6, since --as-needed fails for lame -- Rex
+# until either binutils or lame (livna bug #1207) is fixed
+
 %configure \
   --includedir=%{_includedir}/kde \
   --disable-rpath \
   --disable-gcc-hidden-visibility \
+%if "%{?fedora}" == "6" && "%{?nonfree:1}" == "1" 
+  --disable-new-ldflags \
+%else
   --enable-new-ldflags \
+%endif
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --enable-final \
   --without-libltdl \
@@ -273,12 +275,10 @@
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module
 done
 
-#if "%{?juk:1}" == "1"
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   --add-category="X-Fedora" --vendor="" \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop
-#endif
 
 %if "%{?debug}" == "1"
 # Conflicts check (debuging only)
@@ -380,7 +380,7 @@
 
 %if "%{?core}" == "1"
 %post
-/sbin/ldconfig
+/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 ||:
@@ -388,16 +388,16 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig
+/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 || :
-%endif
 
+%endif
 %if "%{?extras}" == "1"
-#if "%{?juk:1}" == "1"
+
 %post
 for icon_theme in crystalsvg hicolor ; do
   touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
@@ -409,13 +409,16 @@
   touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
 done
-#endif
-%endif
 
+%endif
 %if "%{?nonfree}" == "1"
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%post 
+/sbin/ldconfig ||:
+
+%postun
+/sbin/ldconfig ||:
+
 %endif
 
 
@@ -440,38 +443,113 @@
 %{_libdir}/mcop/*
 %{_libdir}/kde3/*
 
-%files devel 
+%files devel -f devel.list
 %defattr(-,root,root,-)
 %{_includedir}/*
 %endif
 
 %if "%{?extras}" == "1"
-%files -f extras.list
+#files -f extras.list
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/apps/juk/
-%dir %{_datadir}/apps/juk/pics
+# juk
+%{_bindir}/juk
+%{_datadir}/applications/kde/juk.desktop
+%{_datadir}/apps/juk
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/*/juk*
+%{_datadir}/icons/hicolor/*/*/juk*
+# kfile-plugins
+%{_libdir}/kde3/kfile_flac.*
+%{_libdir}/kde3/kfile_mpc.*
+%{_datadir}/services/kfile_flac.desktop
+%{_datadir}/services/kfile_mpc.desktop
+# akode_artsplugin (free bits)
+%{_libdir}/libarts_akode.[ls][ao]
+%{_libdir}/libarts_akode.so.*
+%{_libdir}/mcop/akodeMPCPlayObject.mcopclass
+%{_libdir}/mcop/akodePlayObject.mcopclass
+%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeXiphPlayObject.mcopclass
+%{_libdir}/mcop/akodearts.mcopclass
+%{_libdir}/mcop/akodearts.mcoptype
 %endif
 
 %if "%{?nonfree}" == "1"
-%files -f nonfree.list
+#files -f nonfree.list
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%dir %{_datadir}/apps/videothumbnail/
-## FIXME? -- Rex
+%{_bindir}/yaf-cdda
+%{_bindir}/yaf-mpgplay
+%{_bindir}/yaf-splay
+%{_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}/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
+#defattr(-,root,root,-)
+%{_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
+%{_libdir}/mcop/NULLPlayObject.mcopclass
+%{_libdir}/mcop/OGGPlayObject.mcopclass
+%{_libdir}/mcop/SplayPlayObject.mcopclass
+%{_libdir}/mcop/WAVPlayObject.mcopclass
+%{_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"
+%{_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/
 %endif
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Oct 04 2006 Rex Dieter  6:3.5.4-8
+* Wed Nov 01 2006 Rex Dieter  6:3.5.5-0.3
+- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg)
+
+* Wed Oct 25 2006 Rex Dieter  6:3.5.5-0.2
+- exclude kfile_mpeg from main pkg (it's in -extras-nonfree).  
+  Arguably, doesn't *have* to be marked nonfree, but that's another battle.
+
+* Wed Oct 04 2006 Rex Dieter  6:3.5.5-0.1
 - -extras: own %%_datadir/apps/juk/pics
+- 3.5.5
 
 * Tue Sep 19 2006 Rex Dieter  6:3.5.4-7
 - -extras: drop --with-musicbrainz (for now)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 20:25:28 -0000	1.6
+++ sources	1 Nov 2006 18:55:54 -0000	1.7
@@ -1 +1 @@
-3cf5d9173232cadcf9042d7a60605de3  kdemultimedia-3.5.4-patched.tar.bz2
+7439844e5105091e2b93b3821d999da5  kdemultimedia-3.5.5-patched.tar.bz2


--- kde-libtool.patch DELETED ---


--- kdemultimedia-3.4.0-arts_includes.patch DELETED ---


--- kdemultimedia-3.5.0-116958.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 19:06:46 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed,  1 Nov 2006 12:06:46 -0700
Subject: fedora-security/audit fc5,1.378,1.379 fc6,1.131,1.132
Message-ID: <200611011906.kA1J6kKm008126@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8106

Modified Files:
	fc5 fc6 
Log Message:
Note a new rpm issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- fc5	31 Oct 2006 19:47:47 -0000	1.378
+++ fc5	1 Nov 2006 19:06:43 -0000	1.379
@@ -12,6 +12,7 @@
 CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
+CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- fc6	31 Oct 2006 19:47:47 -0000	1.131
+++ fc6	1 Nov 2006 19:06:43 -0000	1.132
@@ -12,6 +12,7 @@
 CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
 CVE-2006-5467 VULNERABLE (ruby) #212396
+CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)



From fedora-extras-commits at redhat.com  Wed Nov  1 19:26:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 1 Nov 2006 12:26:29 -0700
Subject: rpms/evolution-bogofilter/devel evolution-bogofilter.spec,1.1,1.2
Message-ID: <200611011926.kA1JQTZg008600@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/evolution-bogofilter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8584

Modified Files:
	evolution-bogofilter.spec 
Log Message:

Bump for new evo in devel.



Index: evolution-bogofilter.spec
===================================================================
RCS file: /cvs/extras/rpms/evolution-bogofilter/devel/evolution-bogofilter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-bogofilter.spec	1 Oct 2006 04:42:02 -0000	1.1
+++ evolution-bogofilter.spec	1 Nov 2006 19:25:59 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		evolution-bogofilter
 Summary:	A plugin for bogofilter support in evolution
 Version: 	0.2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://people.altlinux.ru/~mhz/software/projects/bf-eplugin/
@@ -54,6 +54,9 @@
 %{_libdir}/evolution/%{evopluginver}/plugins/*
 
 %changelog
+* Wed Nov  1 2006 Tom "spot" Callaway  0.2.0-4
+- bump for new evo in devel
+
 * Fri Sep 29 2006 Tom "spot" Callaway  0.2.0-3
 - add URL, even if it is a bit pointless
 - add docs



From fedora-extras-commits at redhat.com  Wed Nov  1 22:34:09 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 1 Nov 2006 15:34:09 -0700
Subject: rpms/ruby-bdb - New directory
Message-ID: <200611012234.kA1MY9wt018886@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18881/ruby-bdb

Log Message:
Directory /cvs/extras/rpms/ruby-bdb added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  1 22:34:14 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 1 Nov 2006 15:34:14 -0700
Subject: rpms/ruby-bdb/devel - New directory
Message-ID: <200611012234.kA1MYEmO018899@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18881/ruby-bdb/devel

Log Message:
Directory /cvs/extras/rpms/ruby-bdb/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  1 22:34:26 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 1 Nov 2006 15:34:26 -0700
Subject: rpms/ruby-bdb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611012234.kA1MYQ7o018930@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18924

Added Files:
	Makefile import.log 
Log Message:
Setup of module ruby-bdb


--- NEW FILE Makefile ---
# Top level Makefile for module ruby-bdb
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  Wed Nov  1 22:34:32 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 1 Nov 2006 15:34:32 -0700
Subject: rpms/ruby-bdb/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611012234.kA1MYWrA018946@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18924/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ruby-bdb


--- 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 Nov  1 22:35:23 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 1 Nov 2006 15:35:23 -0700
Subject: rpms/ruby-bdb/devel ruby-bdb.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611012235.kA1MZNco019025@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18987/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ruby-bdb.spec 
Log Message:
auto-import ruby-bdb-0.5.9-6 on branch devel from ruby-bdb-0.5.9-6.src.rpm


--- NEW FILE ruby-bdb.spec ---
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}

%define        tarname bdb
Summary:       Sleepycat Berkeley DB and DB XML
Name:          ruby-bdb
Version:       0.5.9
Release:       6%{?dist}
License:       Ruby License 
Group:         Development/Libraries
Source:        ftp://moulon.inra.fr/pub/ruby/%{tarname}-%{version}.tar.gz
URL:           http://moulon.inra.fr/ruby/bdb.html
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ruby, ruby-devel, db4-devel
Requires:      ruby(abi) = 1.8
Provides:      ruby(bdb) = %{version}

%description
Berkeley DB is an embedded database system that supports keyed access
to data.

%prep
%setup -q -n %{tarname}-%{version}

%build
ruby extconf.rb
make %{?_smp_mflags}

%check
make test

%clean 
rm -rf $RPM_BUILD_ROOT


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install


%files 
%defattr(-,root,root)
%doc Changes README.en bdb.html bdb.rd docs/ examples/
%{ruby_sitearch}/bdb.so

%changelog
* Fri Oct 20 2006 Michael Rice  - 0.5.9-6
- Adjust to make 'test'

* Thu Oct 19 2006 Michael Rice  - 0.5.9-5
- Add make tests
- Remove tests/ from package

* Mon Oct 16 2006 Michael Rice  - 0.5.9-4
- Remove unneeded Require for bdb (thanks Jason Tibbitts)

* Mon Oct 09 2006 Michael Rice  - 0.5.9-3
- add proper Requires per wiki guidelines
- add provides per wiki guidelines
- add -q into setup per bugzilla request 209965
- Change license to ruby license per bugzilla 209965
- Remove the conditional stuff since its not possible to build for older ruby in
  extras

* Mon Oct 09 2006 Michael Rice  - 0.5.9-2
- add smp_mflags to make line
- remove find command and replace with list instead
- add ruby_sitesearch for bdb.so
- remove strip to create a debug package


* Sun Sep 10 2006 Michael Rice  0.5.9-1
- 0.5.9

* Tue May 17 2005 Ian Macdonald  0.5.6-1
- 0.5.6

* Fri Dec 31 2004 Ian Macdonald  0.5.4-1
- 0.5.4

* Sat Nov 20 2004 Ian Macdonald  0.5.3-1
- 0.5.3

* Thu Nov 18 2004 Ian Macdonald  0.5.2-1
- 0.5.2

* Fri Jul 25 2003 Ian Macdonald  0.4.6-1
- 0.4.6

* Mon Jul  7 2003 Ian Macdonald  0.4.5-1
- 0.4.5

* Tue Jun 24 2003 Ian Macdonald  0.4.4-1
- 0.4.4

* Wed Jun 10 2003 Ian Macdonald  0.4.3-1
- 0.4.3

* Wed May 28 2003 Ian Macdonald  0.4.2-1
- 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Nov 2006 22:34:32 -0000	1.1
+++ .cvsignore	1 Nov 2006 22:34:53 -0000	1.2
@@ -0,0 +1 @@
+bdb-0.5.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Nov 2006 22:34:32 -0000	1.1
+++ sources	1 Nov 2006 22:34:53 -0000	1.2
@@ -0,0 +1 @@
+b4bb9f2811e395f9c7e49c7fd9a977b0  bdb-0.5.9.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 22:35:22 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 1 Nov 2006 15:35:22 -0700
Subject: rpms/ruby-bdb import.log,1.1,1.2
Message-ID: <200611012235.kA1MZMVC019021@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18987

Modified Files:
	import.log 
Log Message:
auto-import ruby-bdb-0.5.9-6 on branch devel from ruby-bdb-0.5.9-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Nov 2006 22:34:26 -0000	1.1
+++ import.log	1 Nov 2006 22:34:52 -0000	1.2
@@ -0,0 +1 @@
+ruby-bdb-0_5_9-6:HEAD:ruby-bdb-0.5.9-6.src.rpm:1162420488



From fedora-extras-commits at redhat.com  Wed Nov  1 22:41:10 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 1 Nov 2006 15:41:10 -0700
Subject: owners owners.list,1.1882,1.1883
Message-ID: <200611012241.kA1MfAon019121@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19078

Modified Files:
	owners.list 
Log Message:
Adding my self as maintainer to ruby-bdb bug: 209965



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1882
retrieving revision 1.1883
diff -u -r1.1882 -r1.1883
--- owners.list	1 Nov 2006 17:22:27 -0000	1.1882
+++ owners.list	1 Nov 2006 22:40:40 -0000	1.1883
@@ -2026,6 +2026,7 @@
 Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|ruby-bdb|A Ruby interface to Berkeley DB|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-mysql|A Ruby interface to MySQL|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-postgres|A Ruby interface to Postgres|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-racc|A Ruby LALR(1) Parser Generator|dlutter at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  1 22:41:30 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed, 1 Nov 2006 15:41:30 -0700
Subject: rpms/sysprof/devel .cvsignore, 1.2, 1.3 sysprof.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200611012241.kA1MfUQw019126@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19082

Modified Files:
	.cvsignore sysprof.spec sources 
Log Message:
version updated to 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2006 14:40:56 -0000	1.2
+++ .cvsignore	1 Nov 2006 22:40:59 -0000	1.3
@@ -1 +1 @@
-sysprof-1.0.3.tar.gz
+sysprof-1.0.5.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sysprof.spec	8 Oct 2006 21:31:17 -0000	1.3
+++ sysprof.spec	1 Nov 2006 22:40:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sysprof      
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -61,13 +61,16 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Sun Oct 8 2006 Gianluca Sforna  1.0.3-6
+* Wed Nov  1 2006 Gianluca Sforna  1.0.5-1
+- version update
+
+* Sun Oct  8 2006 Gianluca Sforna  1.0.3-6
 - better to use ExclusiveArch %{ix86} (thanks Ville)
 
-* Thu Oct 5 2006 Gianluca Sforna  1.0.3-5
+* Thu Oct  5 2006 Gianluca Sforna  1.0.3-5
 - add ExclusiveArch to match sysprof-kmod supported archs
 
-* Tue Oct 2 2006 Gianluca Sforna  1.0.3-4
+* Tue Oct  2 2006 Gianluca Sforna  1.0.3-4
 - add .desktop file
 
 * Fri Sep 30 2006 Gianluca Sforna  1.0.3-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2006 14:40:56 -0000	1.2
+++ sources	1 Nov 2006 22:40:59 -0000	1.3
@@ -1 +1 @@
-8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz
+cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  1 22:49:30 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 15:49:30 -0700
Subject: rpms/gdeskcal/FC-5 gdeskcal.spec,1.10,1.11
Message-ID: <200611012249.kA1MnUK2019249@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19233

Modified Files:
	gdeskcal.spec 
Log Message:

Added perl(XML::Parser) 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdeskcal.spec	1 Nov 2006 10:52:28 -0000	1.10
+++ gdeskcal.spec	1 Nov 2006 22:49:00 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils, perl(XML::Parser)
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 



From fedora-extras-commits at redhat.com  Wed Nov  1 22:51:14 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 15:51:14 -0700
Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.13,1.14
Message-ID: <200611012251.kA1MpEuv019317@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19299

Modified Files:
	gdeskcal.spec 
Log Message:

Added BR perl(XML::Parser) 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gdeskcal.spec	1 Nov 2006 10:53:53 -0000	1.13
+++ gdeskcal.spec	1 Nov 2006 22:50:44 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils, perl(XML::Parser)
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 



From fedora-extras-commits at redhat.com  Wed Nov  1 22:53:25 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed, 1 Nov 2006 15:53:25 -0700
Subject: rpms/sysprof-kmod/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sysprof-kmod.spec, 1.9, 1.10 sysprof-config.patch, 1.1, NONE
Message-ID: <200611012253.kA1MrPIf019404@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19361

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Removed Files:
	sysprof-config.patch 
Log Message:
update to version 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2006 16:27:26 -0000	1.2
+++ .cvsignore	1 Nov 2006 22:52:55 -0000	1.3
@@ -1 +1 @@
-sysprof-1.0.3.tar.gz
+sysprof-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2006 16:27:26 -0000	1.2
+++ sources	1 Nov 2006 22:52:55 -0000	1.3
@@ -1 +1 @@
-8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz
+cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sysprof-kmod.spec	17 Oct 2006 12:12:34 -0000	1.9
+++ sysprof-kmod.spec	1 Nov 2006 22:52:55 -0000	1.10
@@ -29,8 +29,8 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.3
-Release:        5.%(echo %{kverrel} | tr - _)
+Version:        1.0.5
+Release:        1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -40,7 +40,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         %{kmod_name}-avoid_depmod.patch
-Patch1:         %{kmod_name}-config.patch
 
 ExclusiveArch:  i586 i686 x86_64
 
@@ -64,7 +63,6 @@
 %setup -q -c -T -a 0
 pushd %{kmod_name}-%{version}*
 %patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
 # configure script breaks in mock builds (missing BRs), so we create here 
 # a config.h with the needed symbol
 echo '#define PACKAGE_VERSION "%{version}"' > config.h
@@ -105,6 +103,10 @@
 
 
 %changelog
+* Wed Nov  1 2006 Gianluca Sforna  1.0.5-1
+- version update
+- drop upstreamed patch
+
 * Tue Oct 17 2006 Gianluca Sforna 
 - rebuild for kernel 2.6.18-1.2798
 


--- sysprof-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  1 22:53:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 15:53:40 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.13,1.14
Message-ID: <200611012253.kA1Mrec6019409@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19367

Modified Files:
	gdeskcal.spec 
Log Message:

Added BR perl(XML::Parser) 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gdeskcal.spec	1 Nov 2006 10:55:20 -0000	1.13
+++ gdeskcal.spec	1 Nov 2006 22:53:10 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils, perl(XML::Parser)
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -62,6 +62,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Wed Nov 01 2006 Paul F. Johnson  1.0-5
+- added BR perl(xml-parser)
+
 * Wed Nov 01 2006 Paul F. Johnson  1.0-4
 - added post and postun
 - conditional for the X-Fedora in the desktop icon



From fedora-extras-commits at redhat.com  Wed Nov  1 22:58:15 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 15:58:15 -0700
Subject: rpms/anjuta-gdl import.log,1.5,1.6
Message-ID: <200611012258.kA1MwF5X019579@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19549

Modified Files:
	import.log 
Log Message:
auto-import anjuta-gdl-0.6.1-5 on branch FC-5 from anjuta-gdl-0.6.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta-gdl/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	9 Jul 2006 12:34:13 -0000	1.5
+++ import.log	1 Nov 2006 22:57:45 -0000	1.6
@@ -2,3 +2,4 @@
 anjuta-gdl-0_6_1-2:HEAD:anjuta-gdl-0.6.1-2.src.rpm:1149112710
 anjuta-gdl-0_6_1-3:HEAD:anjuta-gdl-0.6.1-3.src.rpm:1152396216
 anjuta-gdl-0_6_1-4:HEAD:anjuta-gdl-0.6.1-4.src.rpm:1152448435
+anjuta-gdl-0_6_1-5:FC-5:anjuta-gdl-0.6.1-5.src.rpm:1162421844



From fedora-extras-commits at redhat.com  Wed Nov  1 22:58:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 1 Nov 2006 15:58:16 -0700
Subject: rpms/anjuta-gdl/FC-5 anjuta-gdl.spec,1.6,1.7
Message-ID: <200611012258.kA1MwGhe019582@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19549/FC-5

Modified Files:
	anjuta-gdl.spec 
Log Message:
auto-import anjuta-gdl-0.6.1-5 on branch FC-5 from anjuta-gdl-0.6.1-5.src.rpm


Index: anjuta-gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta-gdl/FC-5/anjuta-gdl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- anjuta-gdl.spec	30 Sep 2006 20:03:52 -0000	1.6
+++ anjuta-gdl.spec	1 Nov 2006 22:57:45 -0000	1.7
@@ -25,6 +25,7 @@
 
 %prep
 %setup -q -n gdl-%{version}
+sed -i -e "s/Name: gdl/Name: anjuta-gdl/" gdl-1.0.pc.in
 
 %build
 %configure --disable-static
@@ -36,6 +37,7 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 %find_lang gdl-1
+mv %{buildroot}/%{_libdir}/pkgconfig/gdl-1.0.pc %{buildroot}/%{_libdir}/pkgconfig/anjuta-gdl-1.0.pc
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -54,11 +56,11 @@
 %defattr (-, root, root)
 %{_includedir}/libgdl-1.0
 %{_libdir}/libgdl-1.so
-%{_libdir}/pkgconfig/gdl-1.0.pc
+%{_libdir}/pkgconfig/anjuta-gdl-1.0.pc
 
 %changelog
-* Sat Sep 30 2006 Paul F. Johnson  0.6.1-5
-- rebuild
+* Sun Jul 09 2006 Paul F. Johnson  0.6.1-5
+- renamed .pc file to anjuta-gdl as gdl is used by another package
 
 * Sun Jul 09 2006 Paul F. Johnson  0.6.1-4
 - fixed the missing -devel package deps properly (thanks Mike)



From fedora-extras-commits at redhat.com  Thu Nov  2 04:47:33 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Wed, 1 Nov 2006 21:47:33 -0700
Subject: rpms/libibverbs import.log,1.13,1.14
Message-ID: <200611020447.kA24lXEv006953@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6917

Modified Files:
	import.log 
Log Message:
auto-import libibverbs-1.0.4-1 on branch devel from libibverbs-1.0.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	2 May 2006 22:55:26 -0000	1.13
+++ import.log	2 Nov 2006 04:47:03 -0000	1.14
@@ -10,3 +10,4 @@
 libibverbs-1_0_3-1:HEAD:libibverbs-1.0.3-1.src.rpm:1146610338
 libibverbs-1_0_3-1:FC-5:libibverbs-1.0.3-1.src.rpm:1146610477
 libibverbs-1_0_3-1:FC-4:libibverbs-1.0.3-1.src.rpm:1146610524
+libibverbs-1_0_4-1:HEAD:libibverbs-1.0.4-1.src.rpm:1162442818



From fedora-extras-commits at redhat.com  Thu Nov  2 04:47:34 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Wed, 1 Nov 2006 21:47:34 -0700
Subject: rpms/libibverbs/devel .cvsignore, 1.7, 1.8 libibverbs.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200611020447.kA24lYN4006958@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6917/devel

Modified Files:
	.cvsignore libibverbs.spec sources 
Log Message:
auto-import libibverbs-1.0.4-1 on branch devel from libibverbs-1.0.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 May 2006 22:52:22 -0000	1.7
+++ .cvsignore	2 Nov 2006 04:47:04 -0000	1.8
@@ -1 +1 @@
-libibverbs-1.0.3.tar.gz
+libibverbs-1.0.4.tar.gz


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libibverbs.spec	12 Sep 2006 18:08:08 -0000	1.7
+++ libibverbs.spec	2 Nov 2006 04:47:04 -0000	1.8
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.3
+%define ver      1.0.4
 
 Name: libibverbs
-Version: 1.0.3
-Release: 2%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz
+Source: http://openib.org/downloads/libibverbs-1.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: %{_includedir}/sysfs/libsysfs.h
@@ -77,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu May  4 2006 Roland Dreier  - 1.0.4-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 May 2006 22:52:22 -0000	1.7
+++ sources	2 Nov 2006 04:47:04 -0000	1.8
@@ -1 +1 @@
-344a4a385bf1013e9c6fef9e8a243771  libibverbs-1.0.3.tar.gz
+f075cef91b9a1d3445c3859cb7880b2f  libibverbs-1.0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 04:52:14 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Wed, 1 Nov 2006 21:52:14 -0700
Subject: rpms/libibverbs/FC-4 libibverbs.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <200611020452.kA24qE5e007138@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7090/FC-4

Modified Files:
	libibverbs.spec sources 
Log Message:
Import libibverbs 1.0.4 release


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libibverbs.spec	2 May 2006 22:55:27 -0000	1.6
+++ libibverbs.spec	2 Nov 2006 04:51:44 -0000	1.7
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.3
+%define ver      1.0.4
 
 Name: libibverbs
-Version: 1.0.3
+Version: 1.0.4
 Release: 1%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz
+Source: http://openib.org/downloads/libibverbs-1.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: %{_includedir}/sysfs/libsysfs.h
@@ -77,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu May  4 2006 Roland Dreier  - 1.0.4-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 May 2006 22:55:27 -0000	1.7
+++ sources	2 Nov 2006 04:51:44 -0000	1.8
@@ -1 +1 @@
-344a4a385bf1013e9c6fef9e8a243771  libibverbs-1.0.3.tar.gz
+f075cef91b9a1d3445c3859cb7880b2f  libibverbs-1.0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 04:52:21 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Wed, 1 Nov 2006 21:52:21 -0700
Subject: rpms/libibverbs/FC-6 libibverbs.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <200611020452.kA24qLhO007146@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7090/FC-6

Modified Files:
	libibverbs.spec sources 
Log Message:
Import libibverbs 1.0.4 release


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-6/libibverbs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libibverbs.spec	12 Sep 2006 18:08:08 -0000	1.7
+++ libibverbs.spec	2 Nov 2006 04:51:50 -0000	1.8
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.3
+%define ver      1.0.4
 
 Name: libibverbs
-Version: 1.0.3
-Release: 2%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz
+Source: http://openib.org/downloads/libibverbs-1.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: %{_includedir}/sysfs/libsysfs.h
@@ -77,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu May  4 2006 Roland Dreier  - 1.0.4-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 May 2006 22:52:22 -0000	1.7
+++ sources	2 Nov 2006 04:51:50 -0000	1.8
@@ -1 +1 @@
-344a4a385bf1013e9c6fef9e8a243771  libibverbs-1.0.3.tar.gz
+f075cef91b9a1d3445c3859cb7880b2f  libibverbs-1.0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 04:52:15 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Wed, 1 Nov 2006 21:52:15 -0700
Subject: rpms/libibverbs/FC-5 libibverbs.spec,1.6,1.7 sources,1.7,1.8
Message-ID: <200611020452.kA24qFw3007142@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7090/FC-5

Modified Files:
	libibverbs.spec sources 
Log Message:
Import libibverbs 1.0.4 release


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-5/libibverbs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libibverbs.spec	2 May 2006 22:54:40 -0000	1.6
+++ libibverbs.spec	2 Nov 2006 04:51:45 -0000	1.7
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.3
+%define ver      1.0.4
 
 Name: libibverbs
-Version: 1.0.3
+Version: 1.0.4
 Release: 1%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz
+Source: http://openib.org/downloads/libibverbs-1.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: %{_includedir}/sysfs/libsysfs.h
@@ -77,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu May  4 2006 Roland Dreier  - 1.0.4-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 May 2006 22:54:40 -0000	1.7
+++ sources	2 Nov 2006 04:51:45 -0000	1.8
@@ -1 +1 @@
-344a4a385bf1013e9c6fef9e8a243771  libibverbs-1.0.3.tar.gz
+f075cef91b9a1d3445c3859cb7880b2f  libibverbs-1.0.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 07:39:01 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 2 Nov 2006 00:39:01 -0700
Subject: rpms/php-pecl-zip/devel .cvsignore, 1.7, 1.8 php-pecl-zip.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200611020739.kA27d1tl016679@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16659

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	update to 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2006 16:37:23 -0000	1.7
+++ .cvsignore	2 Nov 2006 07:38:31 -0000	1.8
@@ -1 +1 @@
-zip-1.7.5.tgz
+zip-1.8.0.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/php-pecl-zip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pecl-zip.spec	24 Oct 2006 16:37:23 -0000	1.7
+++ php-pecl-zip.spec	2 Nov 2006 07:38:31 -0000	1.8
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.5
+Version:      1.8.0
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Thu Nov 02 2006 Remi Collet  1.8.0-1
+- update to 1.8.0
+
 * Tue Oct 24 2006 Remi Collet  1.7.5-1
 - update to 1.7.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Oct 2006 16:37:23 -0000	1.7
+++ sources	2 Nov 2006 07:38:31 -0000	1.8
@@ -1 +1 @@
-e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz
+21ba5f9055074a5dbf9cb55922b7262e  zip-1.8.0.tgz



From fedora-extras-commits at redhat.com  Thu Nov  2 09:11:14 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu,  2 Nov 2006 02:11:14 -0700
Subject: fedora-security/audit fc5,1.379,1.380 fc6,1.132,1.133
Message-ID: <200611020911.kA29BElD022930@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22903

Modified Files:
	fc5 fc6 
Log Message:
Updates from last few days; I've not dealt with kde yet since some of
the backports may have gone away with rebase



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -r1.379 -r1.380
--- fc5	1 Nov 2006 19:06:43 -0000	1.379
+++ fc5	2 Nov 2006 09:11:11 -0000	1.380
@@ -1,17 +1,18 @@
-Up to date CVE as of CVE email 20061029
-Up to date FC5 as of 20061029
+Up to date CVE as of CVE email 20061101
+Up to date FC5 as of 20061101
 
 ** are items that need attention
 
+CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
-CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
-CVE-2006-5470 VULNERABLE (wireshark, fixed 0.99.4)
-CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4)
-CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
-CVE-2006-5467 VULNERABLE (ruby) #212396
+CVE-2006-5470 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
+CVE-2006-5469 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
+CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
+CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
 CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
@@ -43,14 +44,14 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
-CVE-2006-4805 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
 CVE-2006-4624 version (mailman, fixed 2.1.9rc1) #205652 [since FEDORA-2006-1013]
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1) [since FEDORA-2006-1022]
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
-CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-4574 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
@@ -1078,6 +1079,7 @@
 CVE-2005-0488 backport (krb5) krb5-1.4.1-telnet-environ.patch
 CVE-2005-0473 version (gaim, fixed 1.1.3)
 CVE-2005-0472 version (gaim, fixed 1.1.3)
+CVE-2005-0470 version (wpa_supplicant, fixed 0.2.7)
 CVE-2005-0469 version (krb5, fixed 1.4.1)
 CVE-2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
 CVE-2005-0468 version (krb5, fixed 1.4.1)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- fc6	1 Nov 2006 19:06:43 -0000	1.132
+++ fc6	2 Nov 2006 09:11:11 -0000	1.133
@@ -1,17 +1,18 @@
-Up to date CVE as of CVE email 20061029
-Up to date FC6 as of 20061029
+Up to date CVE as of CVE email 20061101
+Up to date FC6 as of 20061101
 
 ** are items that need attention
 
+CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
-CVE-2006-5595 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5540 VULNERABLE (postgresql, fixed 8.1.5) #212360
-CVE-2006-5470 VULNERABLE (wireshark, fixed 0.99.4)
-CVE-2006-5469 VULNERABLE (wireshark, fixed 0.99.4)
-CVE-2006-5468 VULNERABLE (wireshark, fixed 0.99.4)
-CVE-2006-5467 VULNERABLE (ruby) #212396
+CVE-2006-5470 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
+CVE-2006-5469 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
+CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
+CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1109]
 CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
@@ -43,14 +44,14 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055]
-CVE-2006-4805 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability
 CVE-2006-4625 ignore (php) safe mode isn't safe
 CVE-2006-4624 version (mailman, fixed 2.1.9rc1)
 CVE-2006-4623 version (kernel, fixed 2.6.18-rc1)
 CVE-2006-4600 version (openldap, fixed 2.3.25)
-CVE-2006-4574 VULNERABLE (wireshark, fixed 0.99.4)
+CVE-2006-4574 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-4573 VULNERABLE (screen) #212057
 CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
@@ -945,6 +946,7 @@
 CVE-2005-0488 backport (krb5) krb5-1.4.1-telnet-environ.patch
 CVE-2005-0473 version (gaim, fixed 1.1.3)
 CVE-2005-0472 version (gaim, fixed 1.1.3)
+CVE-2005-0470 version (wpa_supplicant, fixed 0.2.7)
 CVE-2005-0469 version (krb5, fixed 1.4.1)
 CVE-2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
 CVE-2005-0468 version (krb5, fixed 1.4.1)



From fedora-extras-commits at redhat.com  Thu Nov  2 10:08:45 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Thu, 2 Nov 2006 03:08:45 -0700
Subject: rpms/sysprof-kmod/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sysprof-kmod.spec, 1.9, 1.10 sysprof-config.patch, 1.1, NONE
Message-ID: <200611021008.kA2A8j8J026106@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-serv26086

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Removed Files:
	sysprof-config.patch 
Log Message:
Update version to 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2006 16:27:26 -0000	1.2
+++ .cvsignore	2 Nov 2006 10:08:14 -0000	1.3
@@ -1 +1 @@
-sysprof-1.0.3.tar.gz
+sysprof-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2006 16:27:26 -0000	1.2
+++ sources	2 Nov 2006 10:08:14 -0000	1.3
@@ -1 +1 @@
-8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz
+cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sysprof-kmod.spec	17 Oct 2006 12:12:34 -0000	1.9
+++ sysprof-kmod.spec	2 Nov 2006 10:08:14 -0000	1.10
@@ -29,8 +29,8 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.3
-Release:        5.%(echo %{kverrel} | tr - _)
+Version:        1.0.5
+Release:        1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -40,7 +40,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         %{kmod_name}-avoid_depmod.patch
-Patch1:         %{kmod_name}-config.patch
 
 ExclusiveArch:  i586 i686 x86_64
 
@@ -64,7 +63,6 @@
 %setup -q -c -T -a 0
 pushd %{kmod_name}-%{version}*
 %patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
 # configure script breaks in mock builds (missing BRs), so we create here 
 # a config.h with the needed symbol
 echo '#define PACKAGE_VERSION "%{version}"' > config.h
@@ -105,6 +103,10 @@
 
 
 %changelog
+* Thu Nov  2 2006 Gianluca Sforna  1.0.5-1
+- version update
+- drop upstreamed patch
+
 * Tue Oct 17 2006 Gianluca Sforna 
 - rebuild for kernel 2.6.18-1.2798
 


--- sysprof-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 10:11:21 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Thu, 2 Nov 2006 03:11:21 -0700
Subject: rpms/sysprof/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sysprof.spec, 1.3, 1.4
Message-ID: <200611021011.kA2ABLqb026161@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26131

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
Updated version to 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2006 14:40:56 -0000	1.2
+++ .cvsignore	2 Nov 2006 10:10:51 -0000	1.3
@@ -1 +1 @@
-sysprof-1.0.3.tar.gz
+sysprof-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2006 14:40:56 -0000	1.2
+++ sources	2 Nov 2006 10:10:51 -0000	1.3
@@ -1 +1 @@
-8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz
+cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/sysprof.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sysprof.spec	8 Oct 2006 21:31:17 -0000	1.3
+++ sysprof.spec	2 Nov 2006 10:10:51 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sysprof      
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -61,13 +61,16 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Sun Oct 8 2006 Gianluca Sforna  1.0.3-6
+* Thu Nov  2 2006 Gianluca Sforna  1.0.5-1
+- version update
+
+* Sun Oct  8 2006 Gianluca Sforna  1.0.3-6
 - better to use ExclusiveArch %{ix86} (thanks Ville)
 
-* Thu Oct 5 2006 Gianluca Sforna  1.0.3-5
+* Thu Oct  5 2006 Gianluca Sforna  1.0.3-5
 - add ExclusiveArch to match sysprof-kmod supported archs
 
-* Tue Oct 2 2006 Gianluca Sforna  1.0.3-4
+* Tue Oct  2 2006 Gianluca Sforna  1.0.3-4
 - add .desktop file
 
 * Fri Sep 30 2006 Gianluca Sforna  1.0.3-3



From fedora-extras-commits at redhat.com  Thu Nov  2 13:00:58 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Thu, 2 Nov 2006 06:00:58 -0700
Subject: comps comps-fe5.xml.in, 1.183, 1.184 comps-fe6.xml.in, 1.206,
	1.207 comps-fe7.xml.in, 1.4, 1.5
Message-ID: <200611021300.kA2D0wH3000796@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv762

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Added entries for sunifdef for FC-5 FC-6 and FC-7.



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- comps-fe5.xml.in	31 Oct 2006 20:02:24 -0000	1.183
+++ comps-fe5.xml.in	2 Nov 2006 13:00:28 -0000	1.184
@@ -156,6 +156,7 @@
       smarteiffel
       splint
       srecord
+      sunifdef
       svnmailer
       sysconftool
       sysprof


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- comps-fe6.xml.in	31 Oct 2006 20:07:05 -0000	1.206
+++ comps-fe6.xml.in	2 Nov 2006 13:00:28 -0000	1.207
@@ -188,6 +188,7 @@
       splint
       Sprog
       srecord
+      sunifdef
       svn2cl
       svnmailer
       sysconftool


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comps-fe7.xml.in	31 Oct 2006 20:07:05 -0000	1.4
+++ comps-fe7.xml.in	2 Nov 2006 13:00:28 -0000	1.5
@@ -188,6 +188,7 @@
       splint
       Sprog
       srecord
+      sunifdef
       svn2cl
       svnmailer
       sysconftool



From fedora-extras-commits at redhat.com  Thu Nov  2 13:56:45 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 2 Nov 2006 06:56:45 -0700
Subject: rpms/mediawiki/FC-6 mediawiki.spec,1.8,1.9
Message-ID: <200611021356.kA2Duj9B004111@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4093

Modified Files:
	mediawiki.spec 
Log Message:
Try to fix #212600.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-6/mediawiki.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mediawiki.spec	14 Oct 2006 09:35:59 -0000	1.8
+++ mediawiki.spec	2 Nov 2006 13:56:14 -0000	1.9
@@ -1,24 +1,24 @@
 %define wikidir %{_var}/www/mediawiki
 
-Name:           mediawiki
-Version:        1.8.2
-Release:        4%{?dist}
-Summary:        The PHP-based wiki software behind Wikipedia
-
-Group:          Applications/Internet
-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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:       httpd
-Requires:       php >= 4.1.2
-Requires:	php-mysql
-Requires:	php-gd, diffutils, ImageMagick
+Name: mediawiki
+Version: 1.8.2
+Release: 5%{?dist}
+Summary: A wiki engine
+
+Group: Applications/Internet
+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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Requires: httpd
+Requires: php >= 5
+Requires: php-mysql
+Requires: php-gd, diffutils, ImageMagick
 # to make sure the "apache" group is created before mediawiki is installed
-Requires(pre):  httpd
+Requires(pre): httpd
 
 %description
 MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and
@@ -30,12 +30,12 @@
 
 
 %package math
-Summary:        Mathematical formula support for MediaWiki
-Group:          Applications/Internet
+Summary: Mathematical formula support for MediaWiki
+Group: Applications/Internet
 
-BuildRequires:  ocaml
-Requires:	mediawiki = %{version}-%{release}
-Requires:       ImageMagick tetex-latex tetex-dvips
+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.
@@ -50,22 +50,22 @@
 
 %build
 cd math
-make %{?_smp_mflags}
+make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{wikidir}
-cp -pr config extensions images includes languages $RPM_BUILD_ROOT%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.*  $RPM_BUILD_ROOT%{wikidir}
-%{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl
-
-install -d $RPM_BUILD_ROOT%{wikidir}/math
-install math/texvc $RPM_BUILD_ROOT%{wikidir}/math
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+rm -rf %{buildroot}
+install -d %{buildroot}%{wikidir}
+cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir}
+cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+%{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
+
+install -d %{buildroot}%{wikidir}/math
+install math/texvc %{buildroot}%{wikidir}/math
+install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -90,6 +90,11 @@
 
 
 %changelog
+* Thu Nov 2 2006 Axel Thimm  - 1.8.2-5
+- Fix depenencies, add versions.
+- Add missing *.php files.
+- Cosmetic changes.
+
 * Sat Oct 14 2006 Axel Thimm  - 1.8.2-4
 - Update to 1.8.2.
 
@@ -111,7 +116,7 @@
 
 * Mon Feb 06 2006 Roozbeh Pournader  - 1.5.6-5
 - Put internal doc files in the right directory, renaming it
-  back to docs (#180177)
+ back to docs (#180177)
 
 * Sat Feb 04 2006 Roozbeh Pournader  - 1.5.6-4
 - Use Requires(pre) instead of PreReq (Mike McGrath)



From fedora-extras-commits at redhat.com  Thu Nov  2 14:49:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 2 Nov 2006 07:49:50 -0700
Subject: rpms/jd/devel .cvsignore, 1.10, 1.11 jd.spec, 1.17, 1.18 sources,
	1.10, 1.11
Message-ID: <200611021449.kA2EnoO8007435@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7415

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Nov  1 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061102
- cvs 061102 (23:30 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Nov 2006 15:08:56 -0000	1.10
+++ .cvsignore	2 Nov 2006 14:49:20 -0000	1.11
@@ -1 +1 @@
-jd-1.8.0-cvs061101.tgz
+jd-1.8.0-cvs061102.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jd.spec	1 Nov 2006 15:08:56 -0000	1.17
+++ jd.spec	2 Nov 2006 14:49:20 -0000	1.18
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061101
+%define         strtag        cvs061102
 %define         repoid        22352
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Nov  1 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061101
-- cvs 061101 (23:59 JST)
+* Wed Nov  1 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061102
+- cvs 061102 (23:30 JST)
 
 * Sat Oct 28 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061028
 - Detect libSM and libICE for x86_64.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Nov 2006 15:08:56 -0000	1.10
+++ sources	2 Nov 2006 14:49:20 -0000	1.11
@@ -1 +1 @@
-8b38d865dfab3b5a17be7a921a8b701a  jd-1.8.0-cvs061101.tgz
+10acd84c05665bb70cbad02975c5dfc2  jd-1.8.0-cvs061102.tgz



From fedora-extras-commits at redhat.com  Thu Nov  2 15:23:42 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 2 Nov 2006 08:23:42 -0700
Subject: rpms/CGAL/devel CGAL-3.2.1-build-libCGALQt-shared.patch, 1.1,
	1.2 CGAL.spec, 1.3, 1.4
Message-ID: <200611021523.kA2FNgrJ010846@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/CGAL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783/devel

Modified Files:
	CGAL-3.2.1-build-libCGALQt-shared.patch CGAL.spec 
Log Message:
Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675)



CGAL-3.2.1-build-libCGALQt-shared.patch:

Index: CGAL-3.2.1-build-libCGALQt-shared.patch
===================================================================
RCS file: /cvs/extras/rpms/CGAL/devel/CGAL-3.2.1-build-libCGALQt-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CGAL-3.2.1-build-libCGALQt-shared.patch	11 Sep 2006 13:27:07 -0000	1.1
+++ CGAL-3.2.1-build-libCGALQt-shared.patch	2 Nov 2006 15:23:11 -0000	1.2
@@ -45,7 +45,7 @@
 +SOMAJOR=1
 +
 +shared_lib: $(CGAL_OBJECTS)
-+	$(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR}\
++	$(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR} \
 +	`ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\
 +		$(CGAL_SHARED_LIB_LDFLAGS) -lGL
 +	mv libCGALQt.so.$(SOVERSION) '$(CGAL_LIB_DESTINATION)'


Index: CGAL.spec
===================================================================
RCS file: /cvs/extras/rpms/CGAL/devel/CGAL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CGAL.spec	15 Sep 2006 12:39:06 -0000	1.3
+++ CGAL.spec	2 Nov 2006 15:23:11 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.2.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Laurent Rineau  - 3.2.1-19
+- Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675)
+
 * Fri Sep 15 2006 Laurent Rineau  - 3.2.1-18
 - Move LICENSE.OPENNL to %doc CGAL-devel (bug #206575).
 



From fedora-extras-commits at redhat.com  Thu Nov  2 15:23:40 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 2 Nov 2006 08:23:40 -0700
Subject: rpms/CGAL/FC-5 CGAL-3.2.1-build-libCGALQt-shared.patch, 1.1,
	1.2 CGAL.spec, 1.3, 1.4
Message-ID: <200611021523.kA2FNe8C010840@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/CGAL/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783/FC-5

Modified Files:
	CGAL-3.2.1-build-libCGALQt-shared.patch CGAL.spec 
Log Message:
Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675)



CGAL-3.2.1-build-libCGALQt-shared.patch:

Index: CGAL-3.2.1-build-libCGALQt-shared.patch
===================================================================
RCS file: /cvs/extras/rpms/CGAL/FC-5/CGAL-3.2.1-build-libCGALQt-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CGAL-3.2.1-build-libCGALQt-shared.patch	11 Sep 2006 13:27:07 -0000	1.1
+++ CGAL-3.2.1-build-libCGALQt-shared.patch	2 Nov 2006 15:23:09 -0000	1.2
@@ -45,7 +45,7 @@
 +SOMAJOR=1
 +
 +shared_lib: $(CGAL_OBJECTS)
-+	$(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR}\
++	$(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR} \
 +	`ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\
 +		$(CGAL_SHARED_LIB_LDFLAGS) -lGL
 +	mv libCGALQt.so.$(SOVERSION) '$(CGAL_LIB_DESTINATION)'


Index: CGAL.spec
===================================================================
RCS file: /cvs/extras/rpms/CGAL/FC-5/CGAL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CGAL.spec	15 Sep 2006 12:54:12 -0000	1.3
+++ CGAL.spec	2 Nov 2006 15:23:09 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.2.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Laurent Rineau  - 3.2.1-19
+- Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675)
+
 * Fri Sep 15 2006 Laurent Rineau  - 3.2.1-18
 - Move LICENSE.OPENNL to %doc CGAL-devel (bug #206575).
 



From fedora-extras-commits at redhat.com  Thu Nov  2 15:23:41 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 2 Nov 2006 08:23:41 -0700
Subject: rpms/CGAL/FC-6 CGAL-3.2.1-build-libCGALQt-shared.patch, 1.1,
	1.2 CGAL.spec, 1.3, 1.4
Message-ID: <200611021523.kA2FNfee010844@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/CGAL/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783/FC-6

Modified Files:
	CGAL-3.2.1-build-libCGALQt-shared.patch CGAL.spec 
Log Message:
Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675)



CGAL-3.2.1-build-libCGALQt-shared.patch:

Index: CGAL-3.2.1-build-libCGALQt-shared.patch
===================================================================
RCS file: /cvs/extras/rpms/CGAL/FC-6/CGAL-3.2.1-build-libCGALQt-shared.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CGAL-3.2.1-build-libCGALQt-shared.patch	11 Sep 2006 13:27:07 -0000	1.1
+++ CGAL-3.2.1-build-libCGALQt-shared.patch	2 Nov 2006 15:23:10 -0000	1.2
@@ -45,7 +45,7 @@
 +SOMAJOR=1
 +
 +shared_lib: $(CGAL_OBJECTS)
-+	$(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR}\
++	$(CGAL_SHARED_LIB_CREATE)libCGALQt.so.$(SOVERSION) -Wl,-soname,libCGALQt.so.${SOMAJOR} \
 +	`ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\
 +		$(CGAL_SHARED_LIB_LDFLAGS) -lGL
 +	mv libCGALQt.so.$(SOVERSION) '$(CGAL_LIB_DESTINATION)'


Index: CGAL.spec
===================================================================
RCS file: /cvs/extras/rpms/CGAL/FC-6/CGAL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CGAL.spec	15 Sep 2006 12:39:06 -0000	1.3
+++ CGAL.spec	2 Nov 2006 15:23:10 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           CGAL
 Version:        3.2.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Computational Geometry Algorithms Library
 
 Group:          System Environment/Libraries
@@ -234,6 +234,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Laurent Rineau  - 3.2.1-19
+- Fix CGAL-3.2.1-build-libCGALQt-shared.patch (bug #213675)
+
 * Fri Sep 15 2006 Laurent Rineau  - 3.2.1-18
 - Move LICENSE.OPENNL to %doc CGAL-devel (bug #206575).
 



From fedora-extras-commits at redhat.com  Thu Nov  2 15:45:28 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 2 Nov 2006 08:45:28 -0700
Subject: rpms/kdetoys/devel .cvsignore, 1.5, 1.6 kdetoys.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200611021545.kA2FjSEJ011185@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdetoys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11161

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
- 3.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Aug 2006 18:29:11 -0000	1.5
+++ .cvsignore	2 Nov 2006 15:44:58 -0000	1.6
@@ -1,2 +1,3 @@
 kdetoys-3.5.3.tar.bz2
 kdetoys-3.5.4.tar.bz2
+kdetoys-3.5.5.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/kdetoys.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdetoys.spec	29 Aug 2006 18:29:11 -0000	1.5
+++ kdetoys.spec	2 Nov 2006 15:44:58 -0000	1.6
@@ -3,8 +3,8 @@
 Name: 	 kdetoys
 Group:	 Amusements/Graphics
 Epoch:	 7
-Version: 3.5.4
-Release: 2%{?dist}.1
+Version: 3.5.5
+Release: 1%{?dist}
 
 License: GPL
 Url:     http://www.kde.org/
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
+- 3.5.5
+
 * Tue Aug 29 2006 Rex Dieter  7:3.5.4-2.1
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jul 2006 01:06:25 -0000	1.4
+++ sources	2 Nov 2006 15:44:58 -0000	1.5
@@ -1 +1 @@
-f959e936d05697ac6b1a0b066632b2fd  kdetoys-3.5.4.tar.bz2
+2b03fd068209cf324396b75334f39aba  kdetoys-3.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 15:47:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 2 Nov 2006 08:47:22 -0700
Subject: rpms/kdetoys/FC-6 .cvsignore, 1.5, 1.6 kdetoys.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200611021547.kA2FlMHV011265@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdetoys/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11240

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
- 3.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Aug 2006 18:29:11 -0000	1.5
+++ .cvsignore	2 Nov 2006 15:46:51 -0000	1.6
@@ -1,2 +1,3 @@
 kdetoys-3.5.3.tar.bz2
 kdetoys-3.5.4.tar.bz2
+kdetoys-3.5.5.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-6/kdetoys.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdetoys.spec	29 Aug 2006 18:29:11 -0000	1.5
+++ kdetoys.spec	2 Nov 2006 15:46:51 -0000	1.6
@@ -3,8 +3,8 @@
 Name: 	 kdetoys
 Group:	 Amusements/Graphics
 Epoch:	 7
-Version: 3.5.4
-Release: 2%{?dist}.1
+Version: 3.5.5
+Release: 1%{?dist}
 
 License: GPL
 Url:     http://www.kde.org/
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
+- 3.5.5
+
 * Tue Aug 29 2006 Rex Dieter  7:3.5.4-2.1
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jul 2006 01:06:25 -0000	1.4
+++ sources	2 Nov 2006 15:46:51 -0000	1.5
@@ -1 +1 @@
-f959e936d05697ac6b1a0b066632b2fd  kdetoys-3.5.4.tar.bz2
+2b03fd068209cf324396b75334f39aba  kdetoys-3.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 15:48:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 2 Nov 2006 08:48:46 -0700
Subject: rpms/kdetoys/FC-5 .cvsignore, 1.5, 1.6 kdetoys.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611021548.kA2Fmk6Q011342@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdetoys/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11322

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
- 3.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2006 12:00:39 -0000	1.5
+++ .cvsignore	2 Nov 2006 15:48:16 -0000	1.6
@@ -1,2 +1,3 @@
 kdetoys-3.5.3.tar.bz2
 kdetoys-3.5.4.tar.bz2
+kdetoys-3.5.5.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-5/kdetoys.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdetoys.spec	1 Aug 2006 15:19:51 -0000	1.5
+++ kdetoys.spec	2 Nov 2006 15:48:16 -0000	1.6
@@ -3,8 +3,8 @@
 Name: 	 kdetoys
 Group:	 Amusements/Graphics
 Epoch:	 7
-Version: 3.5.3
-Release: 3%{?dist}
+Version: 3.5.5
+Release: 1%{?dist}
 
 License: GPL
 Url:     http://www.kde.org/
@@ -96,6 +96,8 @@
 # not sure of the point for just one header file 'AmorIface.h'
 # omit (for now).
 rm -rf $RPM_BUILD_ROOT%{_includedir}
+# la files, keep, they're just loadable modules, not shared libs
+#rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %post
@@ -125,9 +127,18 @@
 
 
 %changelog
-* Tue Aug 1 2006 Rex Dieter  7:3.5.3-3
+* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
+- 3.5.5
+
+* Tue Aug 29 2006 Rex Dieter  7:3.5.4-2.1
+- fc6 respin
+
+* Tue Aug 1 2006 Rex Dieter  7:3.5.4-2
 - %%description: remove references to (long gone) kaphorism, kscore (#200877)
 
+* Tue Jul 25 2006 Rex Dieter  7:3.5.4-1
+- kde-3.5.4
+
 * Wed May 24 2006 Rex Dieter  7:3.5.3-1
 - kde-3.5.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdetoys/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2006 12:00:39 -0000	1.5
+++ sources	2 Nov 2006 15:48:16 -0000	1.6
@@ -1 +1 @@
-dbce8029253a6151546e3016f299f4ef  kdetoys-3.5.3.tar.bz2
+2b03fd068209cf324396b75334f39aba  kdetoys-3.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 15:56:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Thu, 2 Nov 2006 08:56:22 -0700
Subject: comps comps-fe6.xml.in,1.207,1.208 comps-fe7.xml.in,1.5,1.6
Message-ID: <200611021556.kA2FuMqC011449@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11431

Modified Files:
	comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Remove packages not present in the repo.


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- comps-fe6.xml.in	2 Nov 2006 13:00:28 -0000	1.207
+++ comps-fe6.xml.in	2 Nov 2006 15:55:51 -0000	1.208
@@ -133,7 +133,6 @@
       cvs2cl
       cvs2svn
       cvsgraph
-      cvsplot
       cvsps
       cvsweb
       darcs
@@ -234,7 +233,6 @@
       scite
       scribes
       scribes-templates
-      TeXmacs
     
   
   
@@ -273,7 +271,6 @@
       geant321
       genius	
       geda-docs
-      geda-example
       geda-gattrib
       geda-gnetlist
       geda-gschem
@@ -318,7 +315,6 @@
       qcad
       qucs
       R
-      R-gnomeGUI
       rrdtool
       scalapack
       scrip
@@ -413,16 +409,13 @@
       pipenightdreams
       powermanga
       ppracer
-      qascade
       qgo
-      qqo
       rafkill
       raidem
       rocksndiamonds
       rogue
       scorched3d
       shippy
-      sirius
       sopwith
       starfighter
       sturmbahnfahrer
@@ -459,8 +452,6 @@
     true
     true
     
-      alacarte
-      brightside
       buoh
       byzanz
       deskbar-applet
@@ -470,7 +461,6 @@
       gmpc
       gnochm
       gnome-applet-netspeed
-      gnome-applet-rhythmbox
       gnome-applet-sensors
       gnome-applet-timer
       gnome-theme-clearlooks-bigpack
@@ -487,7 +477,6 @@
       rss-glx-gnome-screensaver
       sabayon
       seahorse
-      smeg
       themes-backgrounds-gnome
       verbiste-gnome
       wallpapoz
@@ -505,7 +494,6 @@
     
       anjuta
       anjuta-docs
-      at-poke
       bakery-devel
       bit-devel
       bitgtkmm-devel
@@ -521,7 +509,6 @@
       gquilt
       gtk+extra
       gtk2hs
-      gtkalog
       gtkdatabox
       gtkmm24-devel
       libglademm24-devel
@@ -561,7 +548,6 @@
       gg2
       gnome-blog
       gnome-ppp
-      gnome-telnet
       gnome-translate
       gnubiff
       gossip
@@ -627,7 +613,6 @@
       renrot
       showimg
       skencil
-      sodipodi
       tuxpaint
       ufraw
       wings
@@ -679,26 +664,6 @@
     
   
   
-    java
-    <_name>Java
-    <_description>Support for running programs written in the Java programming language.
-    true
-    false
-    
-      jikes
-    
-  
-  
-    java-development
-    <_name>Java Development
-    <_description>Support for developing programs in the Java programming language.
-    false
-    true
-    
-      jlint
-    
-  
-  
     kde-desktop
     <_name>KDE (K Desktop Environment)
     <_description>KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager.
@@ -770,7 +735,6 @@
       exim-doc
       milter-regex
       mlmmj
-      perl-Cyrus
       pyzor
       spamass-milter
     
@@ -838,13 +802,11 @@
       gnumeric
       gramps
       grisbi
-      gsview
       hnb
       koffice-suite
       krecipes
       lyx
       notecase
-      notemeister
       pybliographer
       qa-assistant
       qcad
@@ -870,7 +832,6 @@
       amarok
       audacity
       bin2iso
-      bmp
       brasero
       camE
       cdlabelgen
@@ -879,7 +840,6 @@
       gcdmaster
       gcfilms
       gcombust
-      glrellmms
       gnomad2
       gnomebaker
       gnomeradio
@@ -889,7 +849,6 @@
       jack-audio-connection-kit
       kid3
       kover
-      libvisual-plugins
       nomadsync
       regionset
       rosegarden4
@@ -962,7 +921,6 @@
       ip6sic
       isic
       jfbterm
-      john
       kdirstat
       keychain
       ksmarttray
@@ -1034,7 +992,6 @@
       cone
       ctorrent
       ekg
-      elmo
       iperf
       irssi
       libtranslate
@@ -1042,7 +999,6 @@
       nail
       naim
       ncftp
-      nget
       ninja
       nmh
       pork
@@ -1179,7 +1135,6 @@
       xfce4-sensors-plugin
       xfce4-systemload-plugin
       xfce4-taskmanager
-      xfce4-toys
       xfce4-wavelan-plugin
       xfce4-weather-plugin
       xfce4-websearch-plugin
@@ -1198,17 +1153,12 @@
       x-software-development
     
     
-      glib2-devel
-      gtk-doc
-      gtk2-devel
       libxfce4mcs-devel
       libxfce4util-devel
       libxfcegui4-devel
       xfce-mcs-manager-devel
       xfce4-panel-devel
       xfce4-session-devel
-      glade2
-      pygtk2-devel
     
   
   


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comps-fe7.xml.in	2 Nov 2006 13:00:28 -0000	1.5
+++ comps-fe7.xml.in	2 Nov 2006 15:55:51 -0000	1.6
@@ -133,7 +133,6 @@
       cvs2cl
       cvs2svn
       cvsgraph
-      cvsplot
       cvsps
       cvsweb
       darcs
@@ -234,7 +233,6 @@
       scite
       scribes
       scribes-templates
-      TeXmacs
     
   
   
@@ -273,7 +271,6 @@
       geant321
       genius	
       geda-docs
-      geda-example
       geda-gattrib
       geda-gnetlist
       geda-gschem
@@ -318,7 +315,6 @@
       qcad
       qucs
       R
-      R-gnomeGUI
       rrdtool
       scalapack
       scrip
@@ -413,16 +409,13 @@
       pipenightdreams
       powermanga
       ppracer
-      qascade
       qgo
-      qqo
       rafkill
       raidem
       rocksndiamonds
       rogue
       scorched3d
       shippy
-      sirius
       sopwith
       starfighter
       sturmbahnfahrer
@@ -459,8 +452,6 @@
     true
     true
     
-      alacarte
-      brightside
       buoh
       byzanz
       deskbar-applet
@@ -470,7 +461,6 @@
       gmpc
       gnochm
       gnome-applet-netspeed
-      gnome-applet-rhythmbox
       gnome-applet-sensors
       gnome-applet-timer
       gnome-theme-clearlooks-bigpack
@@ -487,7 +477,6 @@
       rss-glx-gnome-screensaver
       sabayon
       seahorse
-      smeg
       themes-backgrounds-gnome
       verbiste-gnome
       wallpapoz
@@ -505,7 +494,6 @@
     
       anjuta
       anjuta-docs
-      at-poke
       bakery-devel
       bit-devel
       bitgtkmm-devel
@@ -521,7 +509,6 @@
       gquilt
       gtk+extra
       gtk2hs
-      gtkalog
       gtkdatabox
       gtkmm24-devel
       libglademm24-devel
@@ -561,7 +548,6 @@
       gg2
       gnome-blog
       gnome-ppp
-      gnome-telnet
       gnome-translate
       gnubiff
       gossip
@@ -627,7 +613,6 @@
       renrot
       showimg
       skencil
-      sodipodi
       tuxpaint
       ufraw
       wings
@@ -679,26 +664,6 @@
     
   
   
-    java
-    <_name>Java
-    <_description>Support for running programs written in the Java programming language.
-    true
-    false
-    
-      jikes
-    
-  
-  
-    java-development
-    <_name>Java Development
-    <_description>Support for developing programs in the Java programming language.
-    false
-    true
-    
-      jlint
-    
-  
-  
     kde-desktop
     <_name>KDE (K Desktop Environment)
     <_description>KDE is a powerful, graphical user interface which includes a panel, desktop, system icons, and a graphical file manager.
@@ -770,7 +735,6 @@
       exim-doc
       milter-regex
       mlmmj
-      perl-Cyrus
       pyzor
       spamass-milter
     
@@ -838,13 +802,11 @@
       gnumeric
       gramps
       grisbi
-      gsview
       hnb
       koffice-suite
       krecipes
       lyx
       notecase
-      notemeister
       pybliographer
       qa-assistant
       qcad
@@ -870,7 +832,6 @@
       amarok
       audacity
       bin2iso
-      bmp
       brasero
       camE
       cdlabelgen
@@ -879,7 +840,6 @@
       gcdmaster
       gcfilms
       gcombust
-      glrellmms
       gnomad2
       gnomebaker
       gnomeradio
@@ -889,7 +849,6 @@
       jack-audio-connection-kit
       kid3
       kover
-      libvisual-plugins
       nomadsync
       regionset
       rosegarden4
@@ -962,7 +921,6 @@
       ip6sic
       isic
       jfbterm
-      john
       kdirstat
       keychain
       ksmarttray
@@ -1034,7 +992,6 @@
       cone
       ctorrent
       ekg
-      elmo
       iperf
       irssi
       libtranslate
@@ -1042,7 +999,6 @@
       nail
       naim
       ncftp
-      nget
       ninja
       nmh
       pork
@@ -1179,7 +1135,6 @@
       xfce4-sensors-plugin
       xfce4-systemload-plugin
       xfce4-taskmanager
-      xfce4-toys
       xfce4-wavelan-plugin
       xfce4-weather-plugin
       xfce4-websearch-plugin
@@ -1198,17 +1153,12 @@
       x-software-development
     
     
-      glib2-devel
-      gtk-doc
-      gtk2-devel
       libxfce4mcs-devel
       libxfce4util-devel
       libxfcegui4-devel
       xfce-mcs-manager-devel
       xfce4-panel-devel
       xfce4-session-devel
-      glade2
-      pygtk2-devel
     
   
   



From fedora-extras-commits at redhat.com  Thu Nov  2 16:14:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 2 Nov 2006 09:14:24 -0700
Subject: rpms/kdegraphics-extras/devel .cvsignore, 1.3,
	1.4 kdegraphics-extras.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200611021614.kA2GEORm014598@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdegraphics-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573

Modified Files:
	.cvsignore kdegraphics-extras.spec sources 
Log Message:
* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
- 3.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics-extras/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Jul 2006 01:39:24 -0000	1.3
+++ .cvsignore	2 Nov 2006 16:13:54 -0000	1.4
@@ -1,2 +1,3 @@
 kdegraphics-3.5.3.tar.bz2
 kdegraphics-3.5.4.tar.bz2
+kdegraphics-3.5.5.tar.bz2


Index: kdegraphics-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics-extras/devel/kdegraphics-extras.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdegraphics-extras.spec	11 Sep 2006 02:46:20 -0000	1.8
+++ kdegraphics-extras.spec	2 Nov 2006 16:13:54 -0000	1.9
@@ -20,8 +20,8 @@
 Name:    kdegraphics-extras 
 %endif
 
-Version: 3.5.4
-Release: 6%{?dist}
+Version: 3.5.5
+Release: 1%{?dist}
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -309,6 +309,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
+- 3.5.5
+
 * Sun Sep 10 2006 Rex Dieter  7:3.5.4-6
 - -extras: fc6 respin for new(er) OpenEXR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics-extras/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jul 2006 01:39:24 -0000	1.3
+++ sources	2 Nov 2006 16:13:54 -0000	1.4
@@ -1,2 +1,3 @@
 56bd5537521dc94633f8effaace523cb  kdegraphics-3.5.3.tar.bz2
 de1f6d0597235f52186aaeeaabe7dc08  kdegraphics-3.5.4.tar.bz2
+cdbe15afc01c5da7af9557e803bbb7e6  kdegraphics-3.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 16:17:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 2 Nov 2006 09:17:43 -0700
Subject: rpms/plplot/FC-5 plplot-5.6.1-font.patch, NONE, 1.1 plplot.spec,
	1.19, 1.20
Message-ID: <200611021617.kA2GHhKu014703@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14667/FC-5

Modified Files:
	plplot.spec 
Added Files:
	plplot-5.6.1-font.patch 
Log Message:
Point to the freefont package properly (bug #210517)


plplot-5.6.1-font.patch:

--- NEW FILE plplot-5.6.1-font.patch ---
--- plplot-5.6.1/configure.font	2006-11-01 16:59:20.000000000 -0700
+++ plplot-5.6.1/configure	2006-11-01 16:59:58.000000000 -0700
@@ -23552,21 +23552,7 @@
 ;;
 esac
 
-# Check one of the usual fonts and the symbol font.
-# If they are not found, warn and turn off freetype.
-if test "$with_freetype" = "yes"; then
-    if test -r "$with_freetype_font_dir/$with_freetype_sans_font" -o -r "$with_freetype_font_dir/$with_symbol_font" ; then
-       freetype_font_dir="$with_freetype_font_dir"
-    fi
-    if test -z "$freetype_font_dir" ; then
-        { echo "$as_me:$LINENO: WARNING: \"freetype fonts not found - please check fonts.  Freetype font support is disabled.\"," >&5
-echo "$as_me: WARNING: \"freetype fonts not found - please check fonts.  Freetype font support is disabled.\"," >&2;}
-	with_freetype=no
-    else
-        echo "$as_me:$LINENO: result: fonts found in $freetype_font_dir" >&5
-echo "${ECHO_T}fonts found in $freetype_font_dir" >&6
-    fi
-fi
+freetype_font_dir="$with_freetype_font_dir"
 
 if test "$with_freetype" = "yes"; then
 


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-5/plplot.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plplot.spec	6 Oct 2006 20:14:58 -0000	1.19
+++ plplot.spec	2 Nov 2006 16:17:13 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -12,6 +12,7 @@
 Patch0:         plplot-5.5.3-matwrap.patch
 Patch1:         plplot-5.6.1-octave.patch
 Patch2:         plplot-5.6.1-info.patch
+Patch3:         plplot-5.6.1-font.patch
 Patch6:         plplot-5.6.0-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +26,7 @@
 BuildRequires:  wxGTK-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires:       freefont
 
 %description
 PLplot is a library of functions that are useful for making scientific
@@ -145,12 +147,13 @@
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .octave
 %patch2 -p1 -b .orig
+%patch3 -p1 -b .font
 %patch6 -p1 -b .orig
 
 
 %build
 %configure --enable-f95 --disable-static --without-rpath --with-pthreads \
-           --with-freetype-font-dir=/usr/share/fonts \
+           --with-freetype-font-dir=/usr/share/fonts/freefont \
            --with-libunicode=no --disable-cgm --disable-linuxvga \
            --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \
            --with-prebuiltdoc
@@ -347,6 +350,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 - Orion Poplawski  - 5.6.1-6
+- Point to the freefont package properly (bug #210517)
+
 * Fri Oct  6 2006 - Orion Poplawski  - 5.6.1-5
 - Rebuild for new octave API version
 



From fedora-extras-commits at redhat.com  Thu Nov  2 16:17:44 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 2 Nov 2006 09:17:44 -0700
Subject: rpms/plplot/FC-6 plplot-5.6.1-font.patch, NONE, 1.1 plplot.spec,
	1.22, 1.23
Message-ID: <200611021617.kA2GHiNq014706@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14667/FC-6

Modified Files:
	plplot.spec 
Added Files:
	plplot-5.6.1-font.patch 
Log Message:
Point to the freefont package properly (bug #210517)


plplot-5.6.1-font.patch:

--- NEW FILE plplot-5.6.1-font.patch ---
--- plplot-5.6.1/configure.font	2006-11-01 16:59:20.000000000 -0700
+++ plplot-5.6.1/configure	2006-11-01 16:59:58.000000000 -0700
@@ -23552,21 +23552,7 @@
 ;;
 esac
 
-# Check one of the usual fonts and the symbol font.
-# If they are not found, warn and turn off freetype.
-if test "$with_freetype" = "yes"; then
-    if test -r "$with_freetype_font_dir/$with_freetype_sans_font" -o -r "$with_freetype_font_dir/$with_symbol_font" ; then
-       freetype_font_dir="$with_freetype_font_dir"
-    fi
-    if test -z "$freetype_font_dir" ; then
-        { echo "$as_me:$LINENO: WARNING: \"freetype fonts not found - please check fonts.  Freetype font support is disabled.\"," >&5
-echo "$as_me: WARNING: \"freetype fonts not found - please check fonts.  Freetype font support is disabled.\"," >&2;}
-	with_freetype=no
-    else
-        echo "$as_me:$LINENO: result: fonts found in $freetype_font_dir" >&5
-echo "${ECHO_T}fonts found in $freetype_font_dir" >&6
-    fi
-fi
+freetype_font_dir="$with_freetype_font_dir"
 
 if test "$with_freetype" = "yes"; then
 


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-6/plplot.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- plplot.spec	6 Oct 2006 20:13:17 -0000	1.22
+++ plplot.spec	2 Nov 2006 16:17:14 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           plplot
 Version:        5.6.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -12,6 +12,7 @@
 Patch0:         plplot-5.5.3-matwrap.patch
 Patch1:         plplot-5.6.1-octave.patch
 Patch2:         plplot-5.6.1-info.patch
+Patch3:         plplot-5.6.1-font.patch
 Patch6:         plplot-5.6.0-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +26,7 @@
 BuildRequires:  wxGTK-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires:       freefont
 
 %description
 PLplot is a library of functions that are useful for making scientific
@@ -145,12 +147,13 @@
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .octave
 %patch2 -p1 -b .orig
+%patch3 -p1 -b .font
 %patch6 -p1 -b .orig
 
 
 %build
 %configure --enable-f95 --disable-static --without-rpath --with-pthreads \
-           --with-freetype-font-dir=/usr/share/fonts \
+           --with-freetype-font-dir=/usr/share/fonts/freefont \
            --with-libunicode=no --disable-cgm --disable-linuxvga \
            --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \
            --with-prebuiltdoc
@@ -347,6 +350,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 - Orion Poplawski  - 5.6.1-8
+- Point to the freefont package properly (bug #210517)
+
 * Fri Oct  6 2006 - Orion Poplawski  - 5.6.1-7
 - Rebuild for new octave API version
 



From fedora-extras-commits at redhat.com  Thu Nov  2 16:31:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Thu,  2 Nov 2006 09:31:20 -0700
Subject: status-report-scripts parseBZbugList,1.55,1.56
Message-ID: <200611021631.kA2GVKdM014928@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14910

Modified Files:
	parseBZbugList 
Log Message:
Username/password are required to get members list.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- parseBZbugList	30 Oct 2006 09:36:30 -0000	1.55
+++ parseBZbugList	2 Nov 2006 16:31:17 -0000	1.56
@@ -50,7 +50,7 @@
 
 my %opt;
 my @options = ( "help", "repourl=s", "o=s", "d=s", "cvs=s",
-		"comps=s", "currel=i", "firstrel=i" );
+		"comps=s", "currel=i", "firstrel=i", "u=s", "p=s" );
 
 $main::repourl = "http://mirrors.kernel.org/fedora";
 $main::members
@@ -58,6 +58,8 @@
 $main::cvsDir = "/export/scratch/extras";
 $main::currel = 6;
 $main::firstrel = 1;
+$main::username = "c4chris";
+$main::password = "";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
@@ -67,6 +69,8 @@
 $main::compsDir = $opt{"comps"} if defined $opt{"comps"};
 $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::password = $opt{"p"} if defined $opt{"p"};
 
 &usage() if defined $opt{'help'};
 
@@ -122,9 +126,9 @@
   "php-pecl-sqlite" => 1,
   "wxPythonGTK2" => 1
 );
-if ($main::members ne "") {
+if ($main::members ne "" && $main::password ne "") {
   local *IN;
-  open IN, "wget -nv -O - --no-check-certificate \"$main::members\"|"
+  open IN, "wget --user=$main::username --password=$main::password -nv -O - --no-check-certificate \"$main::members\"|"
     or die "Failed to wget members list : $!";
   while (  ) {
     s/\s+$//;
@@ -978,8 +982,10 @@
   -cvs       extras CVS directory [$main::cvsDir]
   -firstrel  first Fedora release number [$main::firstrel]
   -o        owners.list file
+  -p         password (to retrieve members list)
   -repourl   Fedora core and extras SRPMS development repo base
-                  [$main::repourl]\n";
+                  [$main::repourl]
+  -u         username (to retrieve members list) [$main::username]\n";
   exit 1;
 }
 



From fedora-extras-commits at redhat.com  Thu Nov  2 16:31:30 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 2 Nov 2006 09:31:30 -0700
Subject: rpms/plplot/devel plplot-5.6.1-font.patch, NONE,
	1.1 plplot-5.6.1-octave.patch, 1.1, 1.2 plplot.spec, 1.22, 1.23
Message-ID: <200611021631.kA2GVUNu014932@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14880

Modified Files:
	plplot-5.6.1-octave.patch plplot.spec 
Added Files:
	plplot-5.6.1-font.patch 
Log Message:
- Point to the freefont package properly (bug #210517)
- Move libriaries to -libs, -devel requires -libs for multilib support


plplot-5.6.1-font.patch:

--- NEW FILE plplot-5.6.1-font.patch ---
--- plplot-5.6.1/configure.font	2006-11-01 16:59:20.000000000 -0700
+++ plplot-5.6.1/configure	2006-11-01 16:59:58.000000000 -0700
@@ -23552,21 +23552,7 @@
 ;;
 esac
 
-# Check one of the usual fonts and the symbol font.
-# If they are not found, warn and turn off freetype.
-if test "$with_freetype" = "yes"; then
-    if test -r "$with_freetype_font_dir/$with_freetype_sans_font" -o -r "$with_freetype_font_dir/$with_symbol_font" ; then
-       freetype_font_dir="$with_freetype_font_dir"
-    fi
-    if test -z "$freetype_font_dir" ; then
-        { echo "$as_me:$LINENO: WARNING: \"freetype fonts not found - please check fonts.  Freetype font support is disabled.\"," >&5
-echo "$as_me: WARNING: \"freetype fonts not found - please check fonts.  Freetype font support is disabled.\"," >&2;}
-	with_freetype=no
-    else
-        echo "$as_me:$LINENO: result: fonts found in $freetype_font_dir" >&5
-echo "${ECHO_T}fonts found in $freetype_font_dir" >&6
-    fi
-fi
+freetype_font_dir="$with_freetype_font_dir"
 
 if test "$with_freetype" = "yes"; then
 

plplot-5.6.1-octave.patch:

Index: plplot-5.6.1-octave.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.6.1-octave.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.6.1-octave.patch	7 Aug 2006 21:39:24 -0000	1.1
+++ plplot-5.6.1-octave.patch	2 Nov 2006 16:30:59 -0000	1.2
@@ -67,39 +67,6 @@
  
  printf ("Use PLplot: %s\n", use_plplot_state);
  
-Index: plplot/test/plplot-test.sh.in
-===================================================================
-RCS file: /cvsroot/plplot/plplot/test/plplot-test.sh.in,v
-retrieving revision 1.37
-diff -u -r1.37 plplot-test.sh.in
---- plplot/test/plplot-test.sh.in	27 Jul 2006 21:55:35 -0000	1.37
-+++ plplot/test/plplot-test.sh.in	7 Aug 2006 17:45:44 -0000
-@@ -146,7 +146,7 @@
- perldir=$SRC_EXAMPLES_DIR/perl
- javadir=$EXAMPLES_DIR/java
- octave=@OCTAVE@
--octavedir=$SRC_EXAMPLES_DIR/../bindings/octave//:$SRC_EXAMPLES_DIR/octave//:@PLPLOT_OCTAVE_DIR@//:@OCTAVE_M_DIR@//:@OCTAVE_OCT_DIR@//:
-+octavedir=$SRC_EXAMPLES_DIR/../bindings/octave
- PATH=$EXAMPLES_DIR/../utils:@exec_prefix@/bin:$PATH
- export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir PATH
- 
-Index: plplot/test/test_octave.sh.in
-===================================================================
-RCS file: /cvsroot/plplot/plplot/test/test_octave.sh.in,v
-retrieving revision 1.4
-diff -u -r1.4 test_octave.sh.in
---- plplot/test/test_octave.sh.in	26 Apr 2006 14:36:02 -0000	1.4
-+++ plplot/test/test_octave.sh.in	7 Aug 2006 17:45:44 -0000
-@@ -30,7 +30,8 @@
- export LD_LIBRARY_PATH=$TOPDIR/src/.libs:$TOPDIR/lib/csa/.libs:$TOPDIR/lib/nn/.libs
- 
- # Launch an Octave script that exercises all the demos
--$octave -f -q -p $octavedir <&5
- echo $ECHO_N "checking Octave m dir... $ECHO_C" >&6
--	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
-+	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then
-             # Octave version 2.1
- 
- OCTAVE_M_DIR=`$OCTAVE -q -f <&5
- echo $ECHO_N "checking Octave oct dir... $ECHO_C" >&6
--	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
-+	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then
-             # Octave version 2.1
- 
- OCTAVE_OCT_DIR=`$OCTAVE -q -f < - 5.6.1-8
+- Point to the freefont package properly (bug #210517)
+- Move libriaries to -libs, -devel requires -libs for multilib support
+
 * Fri Oct  6 2006 - Orion Poplawski  - 5.6.1-7
 - Rebuild for new octave API version
 



From fedora-extras-commits at redhat.com  Thu Nov  2 16:45:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 2 Nov 2006 09:45:33 -0700
Subject: rpms/kdegraphics-extras/FC-6 .cvsignore, 1.3,
	1.4 kdegraphics-extras.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200611021645.kA2GjXoS015075@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdegraphics-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15052

Modified Files:
	.cvsignore kdegraphics-extras.spec sources 
Log Message:
* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
- 3.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics-extras/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Jul 2006 01:39:24 -0000	1.3
+++ .cvsignore	2 Nov 2006 16:45:01 -0000	1.4
@@ -1,2 +1,3 @@
 kdegraphics-3.5.3.tar.bz2
 kdegraphics-3.5.4.tar.bz2
+kdegraphics-3.5.5.tar.bz2


Index: kdegraphics-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics-extras/FC-6/kdegraphics-extras.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdegraphics-extras.spec	11 Sep 2006 02:46:20 -0000	1.8
+++ kdegraphics-extras.spec	2 Nov 2006 16:45:01 -0000	1.9
@@ -20,8 +20,8 @@
 Name:    kdegraphics-extras 
 %endif
 
-Version: 3.5.4
-Release: 6%{?dist}
+Version: 3.5.5
+Release: 1%{?dist}
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -309,6 +309,9 @@
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter  7:3.5.5-1
+- 3.5.5
+
 * Sun Sep 10 2006 Rex Dieter  7:3.5.4-6
 - -extras: fc6 respin for new(er) OpenEXR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics-extras/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jul 2006 01:39:24 -0000	1.3
+++ sources	2 Nov 2006 16:45:01 -0000	1.4
@@ -1,2 +1 @@
-56bd5537521dc94633f8effaace523cb  kdegraphics-3.5.3.tar.bz2
-de1f6d0597235f52186aaeeaabe7dc08  kdegraphics-3.5.4.tar.bz2
+cdbe15afc01c5da7af9557e803bbb7e6  kdegraphics-3.5.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 16:57:04 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 2 Nov 2006 09:57:04 -0700
Subject: rpms/plplot/devel plplot-5.6.1-octave.patch,1.2,1.3
Message-ID: <200611021657.kA2Gv4kd015184@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15165

Modified Files:
	plplot-5.6.1-octave.patch 
Log Message:
Restore original octave patch


plplot-5.6.1-octave.patch:

Index: plplot-5.6.1-octave.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.6.1-octave.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plplot-5.6.1-octave.patch	2 Nov 2006 16:30:59 -0000	1.2
+++ plplot-5.6.1-octave.patch	2 Nov 2006 16:56:33 -0000	1.3
@@ -67,6 +67,39 @@
  
  printf ("Use PLplot: %s\n", use_plplot_state);
  
+Index: plplot/test/plplot-test.sh.in
+===================================================================
+RCS file: /cvsroot/plplot/plplot/test/plplot-test.sh.in,v
+retrieving revision 1.37
+diff -u -r1.37 plplot-test.sh.in
+--- plplot/test/plplot-test.sh.in	27 Jul 2006 21:55:35 -0000	1.37
++++ plplot/test/plplot-test.sh.in	7 Aug 2006 17:45:44 -0000
+@@ -146,7 +146,7 @@
+ perldir=$SRC_EXAMPLES_DIR/perl
+ javadir=$EXAMPLES_DIR/java
+ octave=@OCTAVE@
+-octavedir=$SRC_EXAMPLES_DIR/../bindings/octave//:$SRC_EXAMPLES_DIR/octave//:@PLPLOT_OCTAVE_DIR@//:@OCTAVE_M_DIR@//:@OCTAVE_OCT_DIR@//:
++octavedir=$SRC_EXAMPLES_DIR/../bindings/octave
+ PATH=$EXAMPLES_DIR/../utils:@exec_prefix@/bin:$PATH
+ export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir PATH
+ 
+Index: plplot/test/test_octave.sh.in
+===================================================================
+RCS file: /cvsroot/plplot/plplot/test/test_octave.sh.in,v
+retrieving revision 1.4
+diff -u -r1.4 test_octave.sh.in
+--- plplot/test/test_octave.sh.in	26 Apr 2006 14:36:02 -0000	1.4
++++ plplot/test/test_octave.sh.in	7 Aug 2006 17:45:44 -0000
+@@ -30,7 +30,8 @@
+ export LD_LIBRARY_PATH=$TOPDIR/src/.libs:$TOPDIR/lib/csa/.libs:$TOPDIR/lib/nn/.libs
+ 
+ # Launch an Octave script that exercises all the demos
+-$octave -f -q -p $octavedir <&5
+ echo $ECHO_N "checking Octave m dir... $ECHO_C" >&6
+-	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
++	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then
+             # Octave version 2.1
+ 
+ OCTAVE_M_DIR=`$OCTAVE -q -f <&5
+ echo $ECHO_N "checking Octave oct dir... $ECHO_C" >&6
+-	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.1//p;d;q'`" ; then
++	if test -n "`echo $OCTAVE_VERSION | sed 's/^2.[19]//p;d;q'`" ; then
+             # Octave version 2.1
+ 
+ OCTAVE_OCT_DIR=`$OCTAVE -q -f <

Author: scop

Update of /cvs/extras/rpms/pcsc-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18151

Modified Files:
	pcsc-perl.spec 
Log Message:
* Thu Nov  2 2006 Ville Skytt??  - 1.4.4-2
- Rebuild with pcsc-lite 1.3.2 for extended APDU support.



Index: pcsc-perl.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pcsc-perl.spec	28 Aug 2006 16:48:40 -0000	1.10
+++ pcsc-perl.spec	2 Nov 2006 17:01:11 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           pcsc-perl
 Version:        1.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl interface to the PC/SC smart card library
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Ville Skytt??  - 1.4.4-2
+- Rebuild with pcsc-lite 1.3.2 for extended APDU support.
+
 * Tue Aug 15 2006 Ville Skytt??  - 1.4.4-1
 - 1.4.4.
 



From fedora-extras-commits at redhat.com  Thu Nov  2 17:09:22 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 2 Nov 2006 10:09:22 -0700
Subject: rpms/kdesvn/FC-5 .cvsignore, 1.10, 1.11 kdesvn.spec, 1.17,
	1.18 sources, 1.10, 1.11
Message-ID: <200611021709.kA2H9MAr018365@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18305/FC-5

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
Update to 0.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Sep 2006 15:41:14 -0000	1.10
+++ .cvsignore	2 Nov 2006 17:08:51 -0000	1.11
@@ -1 +1 @@
-kdesvn-0.9.2.tar.bz2
+kdesvn-0.11.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-5/kdesvn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdesvn.spec	1 Sep 2006 15:56:09 -0000	1.17
+++ kdesvn.spec	2 Nov 2006 17:08:51 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        0.9.2
+Version:        0.11.0
 Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
@@ -7,7 +7,6 @@
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
 Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{version}.tar.bz2
-Patch0:         kdesvn-0.9.2-lib64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, cmake, gettext
@@ -39,7 +38,6 @@
 
 %prep
 %setup -q
-%patch -p0 -b .lib64
 
 
 %build
@@ -132,6 +130,10 @@
 
 
 %changelog
+* Wed Nov  1 2006 - Orion Poplawski  - 0.11.0-1
+- Update to 0.11.0
+- Remove patch applied upstream
+
 * Fri Sep  1 2006 - Orion Poplawski  - 0.9.2-1
 - Update to 0.9.2, uses cmake
 - Add patch from Rajko Albrecht to fix lib64 installs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Sep 2006 15:41:14 -0000	1.10
+++ sources	2 Nov 2006 17:08:51 -0000	1.11
@@ -1 +1 @@
-d21c5c6ddc00d1948014149ecffeb5d0  kdesvn-0.9.2.tar.bz2
+466ea28e5e66d0536ff57b9da4cc95bd  kdesvn-0.11.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 17:09:23 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 2 Nov 2006 10:09:23 -0700
Subject: rpms/kdesvn/FC-6 .cvsignore, 1.12, 1.13 kdesvn.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <200611021709.kA2H9NiA018370@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18305/FC-6

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
Update to 0.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Oct 2006 22:46:26 -0000	1.12
+++ .cvsignore	2 Nov 2006 17:08:52 -0000	1.13
@@ -1 +1 @@
-kdesvn-0.10.0.tar.bz2
+kdesvn-0.11.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-6/kdesvn.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kdesvn.spec	4 Oct 2006 22:46:26 -0000	1.22
+++ kdesvn.spec	2 Nov 2006 17:08:52 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        0.10.0
+Version:        0.11.0
 Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 - Orion Poplawski  - 0.11.0-1
+- Update to 0.11.0
+
 * Wed Oct  4 2006 - Orion Poplawski  - 0.10.0-1
 - Update to 0.10.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Oct 2006 22:46:26 -0000	1.12
+++ sources	2 Nov 2006 17:08:52 -0000	1.13
@@ -1 +1 @@
-896d62ac8687236f05e984ba6cd69e6b  kdesvn-0.10.0.tar.bz2
+466ea28e5e66d0536ff57b9da4cc95bd  kdesvn-0.11.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 17:09:23 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 2 Nov 2006 10:09:23 -0700
Subject: rpms/kdesvn/devel .cvsignore, 1.12, 1.13 kdesvn.spec, 1.22,
	1.23 sources, 1.12, 1.13
Message-ID: <200611021709.kA2H9NTQ018375@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18305/devel

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
Update to 0.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Oct 2006 22:46:26 -0000	1.12
+++ .cvsignore	2 Nov 2006 17:08:53 -0000	1.13
@@ -1 +1 @@
-kdesvn-0.10.0.tar.bz2
+kdesvn-0.11.0.tar.bz2


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kdesvn.spec	4 Oct 2006 22:46:26 -0000	1.22
+++ kdesvn.spec	2 Nov 2006 17:08:53 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           kdesvn
-Version:        0.10.0
+Version:        0.11.0
 Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Wed Nov  1 2006 - Orion Poplawski  - 0.11.0-1
+- Update to 0.11.0
+
 * Wed Oct  4 2006 - Orion Poplawski  - 0.10.0-1
 - Update to 0.10.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Oct 2006 22:46:26 -0000	1.12
+++ sources	2 Nov 2006 17:08:53 -0000	1.13
@@ -1 +1 @@
-896d62ac8687236f05e984ba6cd69e6b  kdesvn-0.10.0.tar.bz2
+466ea28e5e66d0536ff57b9da4cc95bd  kdesvn-0.11.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 17:19:38 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Thu,  2 Nov 2006 10:19:38 -0700
Subject: status-report-scripts parseBZbugList,1.56,1.57
Message-ID: <200611021719.kA2HJcAF018574@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18556

Modified Files:
	parseBZbugList 
Log Message:
Add TODO item about open re-review tickets.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- parseBZbugList	2 Nov 2006 16:31:17 -0000	1.56
+++ parseBZbugList	2 Nov 2006 17:19:35 -0000	1.57
@@ -25,6 +25,8 @@
 # TODO stuff
 #  See why count in "Inactive maintainers with open bug reports" is strange.
 #  Maybe report a count of FE-DEADREVIEW.
+#  Do not warn about open review tickets when a package already exists
+#  in CVS with a dead.package file.
 
 use strict;
 use Getopt::Long;



From fedora-extras-commits at redhat.com  Thu Nov  2 17:22:28 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 2 Nov 2006 10:22:28 -0700
Subject: owners owners.list,1.1883,1.1884
Message-ID: <200611021722.kA2HMSVB018623@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18605

Modified Files:
	owners.list 
Log Message:
Add crossvc to owners.list


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1883
retrieving revision 1.1884
diff -u -r1.1883 -r1.1884
--- owners.list	1 Nov 2006 22:40:40 -0000	1.1883
+++ owners.list	2 Nov 2006 17:21:58 -0000	1.1884
@@ -239,6 +239,7 @@
 Fedora Extras|crossfire|Crossfire game server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|crossfire-client|Crossfire game client|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|crossfire-maps|Crossfire game server maps|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|crossvc|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|crystal|KDE window decoration|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  2 17:31:10 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 2 Nov 2006 10:31:10 -0700
Subject: rpms/plplot/devel plplot.spec,1.23,1.24
Message-ID: <200611021731.kA2HVAR4018727@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18709

Modified Files:
	plplot.spec 
Log Message:
Change BR on gnome-python2 to gnome-python2-devel



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plplot.spec	2 Nov 2006 16:30:59 -0000	1.23
+++ plplot.spec	2 Nov 2006 17:30:40 -0000	1.24
@@ -20,7 +20,7 @@
 BuildRequires:  java-devel, libgcj-devel, ncurses-devel
 BuildRequires:  gd-devel, tcl-devel, tk-devel
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
-BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
+BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
 BuildRequires:  perl(XML::DOM)
 BuildRequires:  lasi-devel
 BuildRequires:  wxGTK-devel
@@ -364,6 +364,7 @@
 * Thu Nov  2 2006 - Orion Poplawski  - 5.6.1-8
 - Point to the freefont package properly (bug #210517)
 - Move libriaries to -libs, -devel requires -libs for multilib support
+- Change BR on gnome-python2 to gnome-python2-devel
 
 * Fri Oct  6 2006 - Orion Poplawski  - 5.6.1-7
 - Rebuild for new octave API version



From fedora-extras-commits at redhat.com  Thu Nov  2 17:50:25 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Thu, 2 Nov 2006 10:50:25 -0700
Subject: rpms/kadu/devel kadu.spec,1.15,1.16 sources,1.7,1.8
Message-ID: <200611021750.kA2HoPqI018915@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18897

Modified Files:
	kadu.spec sources 
Log Message:
* Thu Nov 02 2006 Micha?? Bentkowski  - 0.5.0-0.18.20060915svn
- Come back to 20060915



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kadu.spec	29 Oct 2006 11:49:20 -0000	1.15
+++ kadu.spec	2 Nov 2006 17:49:55 -0000	1.16
@@ -1,7 +1,7 @@
-%define		cvs_date	20061029
+%define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.17.%{cvs_date}svn%{?dist}
+Release:	0.18.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -453,6 +453,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Thu Nov 02 2006 Micha?? Bentkowski  - 0.5.0-0.18.20060915svn
+- Come back to 20060915
+
 * Sun Oct 29 2006 Micha?? Bentkowski  - 0.5.0-0.17.20061029svn
 - Disabling kadu-amarok on ppc arch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Oct 2006 11:24:27 -0000	1.7
+++ sources	2 Nov 2006 17:49:55 -0000	1.8
@@ -1,3 +1,4 @@
+575746c975382dc7a7d275175449cb21  kadu-20060915.tar.bz2
 62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
 0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
@@ -15,4 +16,3 @@
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
 422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz
-203d4b6a041f39703a9b5d259a259c38  kadu-20061029.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 18:48:47 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 2 Nov 2006 11:48:47 -0700
Subject: comps comps-fe5.xml.in, 1.184, 1.185 comps-fe6.xml.in, 1.208,
	1.209 comps-fe7.xml.in, 1.6, 1.7
Message-ID: <200611021848.kA2ImlBa022226@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22206

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Add crossvc in comps.xml


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- comps-fe5.xml.in	2 Nov 2006 13:00:28 -0000	1.184
+++ comps-fe5.xml.in	2 Nov 2006 18:48:16 -0000	1.185
@@ -110,6 +110,7 @@
       cpan2rpm
       cpanspec
       cppunit
+      crossvc
       curry
       cvsps
       cvsweb
@@ -132,7 +133,6 @@
       kuipc
       lcov
       lightning
-      lincvs
       lua
       mach
       mcrypt


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- comps-fe6.xml.in	2 Nov 2006 15:55:51 -0000	1.208
+++ comps-fe6.xml.in	2 Nov 2006 18:48:16 -0000	1.209
@@ -129,6 +129,7 @@
       cpanspec
       cppunit
       cproto
+      crossvc
       curry
       cvs2cl
       cvs2svn
@@ -157,7 +158,6 @@
       kuipc
       lcov
       lightning
-      lincvs
       lua
       mach
       mcrypt


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- comps-fe7.xml.in	2 Nov 2006 15:55:51 -0000	1.6
+++ comps-fe7.xml.in	2 Nov 2006 18:48:16 -0000	1.7
@@ -129,6 +129,7 @@
       cpanspec
       cppunit
       cproto
+      crossvc
       curry
       cvs2cl
       cvs2svn
@@ -157,7 +158,6 @@
       kuipc
       lcov
       lightning
-      lincvs
       lua
       mach
       mcrypt



From fedora-extras-commits at redhat.com  Thu Nov  2 18:58:30 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 2 Nov 2006 11:58:30 -0700
Subject: rpms/lincvs/FC-6 dead.package, NONE, 1.1 crossvc.desktop, 1.1,
	NONE crossvc.spec, 1.3, NONE sources, 1.6, NONE
Message-ID: <200611021858.kA2IwUL9022316@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22311

Added Files:
	dead.package 
Removed Files:
	crossvc.desktop crossvc.spec sources 
Log Message:
Retired lincvs in FC-6


--- NEW FILE dead.package ---
Package was renamed into crossvc.


--- crossvc.desktop DELETED ---


--- crossvc.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 19:02:46 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 2 Nov 2006 12:02:46 -0700
Subject: rpms/lincvs/FC-5 dead.package, NONE, 1.1 crossvc.desktop, 1.1,
	NONE crossvc.spec, 1.3, NONE sources, 1.6, NONE
Message-ID: <200611021902.kA2J2k7m025294@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lincvs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25287

Added Files:
	dead.package 
Removed Files:
	crossvc.desktop crossvc.spec sources 
Log Message:
Retired lincvs in FC-6


--- NEW FILE dead.package ---
Package was renamed into crossvc.


--- crossvc.desktop DELETED ---


--- crossvc.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 19:07:27 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu,  2 Nov 2006 12:07:27 -0700
Subject: fedora-security/audit fc5,1.380,1.381 fc6,1.133,1.134
Message-ID: <200611021907.kA2J7R0b025412@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25392

Modified Files:
	fc5 fc6 
Log Message:
Note a new php issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- fc5	2 Nov 2006 09:11:11 -0000	1.380
+++ fc5	2 Nov 2006 19:07:24 -0000	1.381
@@ -14,6 +14,7 @@
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
 CVE-2006-5466 VULNERABLE (rpm) #212833
+CVE-2006-5465 VULNERABLE (php, fixed 5.2.0) #213732
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- fc6	2 Nov 2006 09:11:11 -0000	1.133
+++ fc6	2 Nov 2006 19:07:24 -0000	1.134
@@ -14,6 +14,7 @@
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1109]
 CVE-2006-5466 VULNERABLE (rpm) #212833
+CVE-2006-5465 VULNERABLE (php, fixed 5.2.0) #213732
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)



From fedora-extras-commits at redhat.com  Thu Nov  2 19:11:53 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu,  2 Nov 2006 12:11:53 -0700
Subject: fedora-security/audit fe4,1.87,1.88
Message-ID: <200611021911.kA2JBrbV025463@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25445

Modified Files:
	fe4 
Log Message:
Note that a backported fix for wv was applied.



Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- fe4	1 Nov 2006 18:03:32 -0000	1.87
+++ fe4	2 Nov 2006 19:11:50 -0000	1.88
@@ -29,7 +29,7 @@
 CVE-2006-4568 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4566 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4565 VULNERABLE (seamonkey, fixed 1.0.5) #209167
-CVE-2006-4513 VULNERABLE (wv) #212696
+CVE-2006-4513 backport (wv, fixed 1.0.3-3) #212696
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167



From fedora-extras-commits at redhat.com  Thu Nov  2 19:21:43 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 2 Nov 2006 12:21:43 -0700
Subject: rpms/pgp-tools/devel .cvsignore, 1.6, 1.7 pgp-tools.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611021921.kA2JLh7X025559@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25527

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
upgrade to 0.4.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Oct 2006 03:24:23 -0000	1.6
+++ .cvsignore	2 Nov 2006 19:21:12 -0000	1.7
@@ -1 +1 @@
-signing-party_0.4.8.orig.tar.gz
+signing-party_0.4.9.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/pgp-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgp-tools.spec	8 Oct 2006 03:24:23 -0000	1.5
+++ pgp-tools.spec	2 Nov 2006 19:21:12 -0000	1.6
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -77,6 +77,13 @@
 
 
 %changelog
+* Thu Nov 02 2006 Matt Domsch  0.4.9-1
+- upgrade to 0.4.9
+  - Fix a bug with checking if we have exactly one or more keys that failed downloading.
+  - Mention in manpage that keyserver-options is a useful setting in
+    .caff/gnupghome/gpg.conf (Closes: debian #392811).
+  - q-p-encode From: header (Closes: debian #366745).
+
 * Sat Oct 07 2006 Matt Domsch  0.4.8-1
 - upgrade to 0.4.8
   - gpglist: do not die with with-fingerprint (Closes: debian #382019).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Oct 2006 03:24:23 -0000	1.6
+++ sources	2 Nov 2006 19:21:12 -0000	1.7
@@ -1 +1 @@
-61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz
+da6bc997b3b12bc504acee87001e8be1  signing-party_0.4.9.orig.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 19:23:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  2 Nov 2006 12:23:26 -0700
Subject: fedora-security/audit fe3, 1.26, 1.27 fe4, 1.88, 1.89 fe5, 1.95,
	1.96 fe6, 1.8, 1.9
Message-ID: <200611021923.kA2JNQll025680@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25656

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-4248 ignore (thttpd, Debian specific issue)


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fe3	28 Oct 2006 06:48:21 -0000	1.26
+++ fe3	2 Nov 2006 19:23:23 -0000	1.27
@@ -9,6 +9,7 @@
 CVE-2006-4976 ** (php-adodb) #208299
 CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4513 ** (abiword) #212698
+CVE-2006-4248 ignore (thttpd, Debian specific issue)
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 VULNERABLE (libmodplug)
 CVE-2006-4182 version (clamav, fixed 0.88.5) #210973


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- fe4	2 Nov 2006 19:11:50 -0000	1.88
+++ fe4	2 Nov 2006 19:23:23 -0000	1.89
@@ -33,6 +33,7 @@
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 VULNERABLE (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 VULNERABLE (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4248 ignore (thttpd, Debian specific issue)
 CVE-2006-4247 ignore (plone, 2.1.x not affected) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.7-4)
 CVE-2006-4182 version (clamav, fixed 0.88.5) #210973


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- fe5	1 Nov 2006 18:03:32 -0000	1.95
+++ fe5	2 Nov 2006 19:23:23 -0000	1.96
@@ -33,6 +33,7 @@
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4248 ignore (thttpd, Debian specific issue)
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4182 version (clamav, fixed 0.88.5) #210973


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fe6	1 Nov 2006 18:03:32 -0000	1.8
+++ fe6	2 Nov 2006 19:23:23 -0000	1.9
@@ -33,6 +33,7 @@
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4340 version (seamonkey, fixed 1.0.5) #209167
 CVE-2006-4253 version (seamonkey, fixed 1.0.5) #209167
+CVE-2006-4248 ignore (thttpd, Debian specific issue)
 CVE-2006-4247 patch (plone, fixed 2.5-4) #209163
 CVE-2006-4192 patch (libmodplug, fixed 0.8-3)
 CVE-2006-4182 version (clamav, fixed 0.88.5) #210973



From fedora-extras-commits at redhat.com  Thu Nov  2 19:39:32 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 2 Nov 2006 12:39:32 -0700
Subject: rpms/pgp-tools/FC-6 .cvsignore, 1.6, 1.7 pgp-tools.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611021939.kA2JdWXG025797@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25777

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
update to 0.4.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Oct 2006 03:24:23 -0000	1.6
+++ .cvsignore	2 Nov 2006 19:39:02 -0000	1.7
@@ -1 +1 @@
-signing-party_0.4.8.orig.tar.gz
+signing-party_0.4.9.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-6/pgp-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgp-tools.spec	8 Oct 2006 03:24:23 -0000	1.5
+++ pgp-tools.spec	2 Nov 2006 19:39:02 -0000	1.6
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -77,6 +77,13 @@
 
 
 %changelog
+* Thu Nov 02 2006 Matt Domsch  0.4.9-1
+- upgrade to 0.4.9
+  - Fix a bug with checking if we have exactly one or more keys that failed downloading.
+  - Mention in manpage that keyserver-options is a useful setting in
+    .caff/gnupghome/gpg.conf (Closes: debian #392811).
+  - q-p-encode From: header (Closes: debian #366745).
+
 * Sat Oct 07 2006 Matt Domsch  0.4.8-1
 - upgrade to 0.4.8
   - gpglist: do not die with with-fingerprint (Closes: debian #382019).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Oct 2006 03:24:23 -0000	1.6
+++ sources	2 Nov 2006 19:39:02 -0000	1.7
@@ -1 +1 @@
-61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz
+da6bc997b3b12bc504acee87001e8be1  signing-party_0.4.9.orig.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 19:41:07 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 2 Nov 2006 12:41:07 -0700
Subject: rpms/pgp-tools/FC-5 .cvsignore, 1.6, 1.7 pgp-tools.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611021941.kA2Jf7Y0025873@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25851

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
update to 0.4.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Oct 2006 03:27:26 -0000	1.6
+++ .cvsignore	2 Nov 2006 19:40:37 -0000	1.7
@@ -1 +1 @@
-signing-party_0.4.8.orig.tar.gz
+signing-party_0.4.9.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/pgp-tools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgp-tools.spec	8 Oct 2006 03:27:26 -0000	1.5
+++ pgp-tools.spec	2 Nov 2006 19:40:37 -0000	1.6
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -77,6 +77,13 @@
 
 
 %changelog
+* Thu Nov 02 2006 Matt Domsch  0.4.9-1
+- upgrade to 0.4.9
+  - Fix a bug with checking if we have exactly one or more keys that failed downloading.
+  - Mention in manpage that keyserver-options is a useful setting in
+    .caff/gnupghome/gpg.conf (Closes: debian #392811).
+  - q-p-encode From: header (Closes: debian #366745).
+
 * Sat Oct 07 2006 Matt Domsch  0.4.8-1
 - upgrade to 0.4.8
   - gpglist: do not die with with-fingerprint (Closes: debian #382019).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Oct 2006 03:27:26 -0000	1.6
+++ sources	2 Nov 2006 19:40:37 -0000	1.7
@@ -1 +1 @@
-61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz
+da6bc997b3b12bc504acee87001e8be1  signing-party_0.4.9.orig.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 19:42:43 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 2 Nov 2006 12:42:43 -0700
Subject: rpms/pgp-tools/FC-4 .cvsignore, 1.5, 1.6 pgp-tools.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611021942.kA2Jghsp025947@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25923

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
update to 0.4.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 03:28:34 -0000	1.5
+++ .cvsignore	2 Nov 2006 19:42:13 -0000	1.6
@@ -1 +1 @@
-signing-party_0.4.8.orig.tar.gz
+signing-party_0.4.9.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/pgp-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pgp-tools.spec	8 Oct 2006 03:28:34 -0000	1.4
+++ pgp-tools.spec	2 Nov 2006 19:42:13 -0000	1.5
@@ -1,6 +1,6 @@
 %define tarballname signing-party
 Name:           pgp-tools
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
@@ -77,6 +77,13 @@
 
 
 %changelog
+* Thu Nov 02 2006 Matt Domsch  0.4.9-1
+- upgrade to 0.4.9
+  - Fix a bug with checking if we have exactly one or more keys that failed downloading.
+  - Mention in manpage that keyserver-options is a useful setting in
+    .caff/gnupghome/gpg.conf (Closes: debian #392811).
+  - q-p-encode From: header (Closes: debian #366745).
+
 * Sat Oct 07 2006 Matt Domsch  0.4.8-1
 - upgrade to 0.4.8
   - gpglist: do not die with with-fingerprint (Closes: debian #382019).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 03:28:34 -0000	1.5
+++ sources	2 Nov 2006 19:42:13 -0000	1.6
@@ -1 +1 @@
-61f4d997e0b989e70f8ae850680106a7  signing-party_0.4.8.orig.tar.gz
+da6bc997b3b12bc504acee87001e8be1  signing-party_0.4.9.orig.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 19:51:06 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 2 Nov 2006 12:51:06 -0700
Subject: rpms/magicor/devel .cvsignore, 1.2, 1.3 magicor.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611021951.kA2Jp6xK026047@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26025

Modified Files:
	.cvsignore magicor.spec sources 
Log Message:
* Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
- New upstream release 1.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2006 20:11:54 -0000	1.2
+++ .cvsignore	2 Nov 2006 19:50:36 -0000	1.3
@@ -1,2 +1,2 @@
-magicor-0.1.tar.gz
-magicor-data-0.1.tar.gz
+magicor-1.0-rc1.tar.gz
+magicor-data-1.0-rc1.tar.gz


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/magicor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.spec	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.spec	2 Nov 2006 19:50:36 -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 pre_version rc1
+
 Name:           magicor
-Version:        0.1
-Release:        2%{?dist}
+Version:        1.0
+Release:        0.1.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +26,7 @@
 
 
 %prep
-%setup -q -b 1
+%setup -q -b 1 -n %{name}-%{version}-%{pre_version}
 sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
 sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
   scripts/Magicor-LevelEditor.py
@@ -89,6 +91,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
+- New upstream release 1.0-rc1
+
 * Sat Oct 21 2006 Hans de Goede  0.1-2
 - Mark /etc/magicor.conf %%config(noreplace)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2006 20:11:54 -0000	1.2
+++ sources	2 Nov 2006 19:50:36 -0000	1.3
@@ -1,2 +1,2 @@
-d5872a5fb0457af8c14a0c392b824c68  magicor-0.1.tar.gz
-0f9920721788147331d8e7d0a6d60a46  magicor-data-0.1.tar.gz
+ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
+9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 19:52:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 2 Nov 2006 12:52:18 -0700
Subject: rpms/magicor/FC-6 .cvsignore, 1.2, 1.3 magicor.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611021952.kA2JqICU026111@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26091

Modified Files:
	.cvsignore magicor.spec sources 
Log Message:
* Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
- New upstream release 1.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2006 20:11:54 -0000	1.2
+++ .cvsignore	2 Nov 2006 19:51:48 -0000	1.3
@@ -1,2 +1,2 @@
-magicor-0.1.tar.gz
-magicor-data-0.1.tar.gz
+magicor-1.0-rc1.tar.gz
+magicor-data-1.0-rc1.tar.gz


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/magicor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.spec	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.spec	2 Nov 2006 19:51:48 -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 pre_version rc1
+
 Name:           magicor
-Version:        0.1
-Release:        2%{?dist}
+Version:        1.0
+Release:        0.1.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +26,7 @@
 
 
 %prep
-%setup -q -b 1
+%setup -q -b 1 -n %{name}-%{version}-%{pre_version}
 sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
 sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
   scripts/Magicor-LevelEditor.py
@@ -89,6 +91,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
+- New upstream release 1.0-rc1
+
 * Sat Oct 21 2006 Hans de Goede  0.1-2
 - Mark /etc/magicor.conf %%config(noreplace)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2006 20:11:54 -0000	1.2
+++ sources	2 Nov 2006 19:51:48 -0000	1.3
@@ -1,2 +1,2 @@
-d5872a5fb0457af8c14a0c392b824c68  magicor-0.1.tar.gz
-0f9920721788147331d8e7d0a6d60a46  magicor-data-0.1.tar.gz
+ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
+9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 19:53:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 2 Nov 2006 12:53:11 -0700
Subject: rpms/magicor/FC-5 .cvsignore, 1.2, 1.3 magicor.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611021953.kA2JrBKO026181@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26156

Modified Files:
	.cvsignore magicor.spec sources 
Log Message:
* Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
- New upstream release 1.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2006 20:11:54 -0000	1.2
+++ .cvsignore	2 Nov 2006 19:52:41 -0000	1.3
@@ -1,2 +1,2 @@
-magicor-0.1.tar.gz
-magicor-data-0.1.tar.gz
+magicor-1.0-rc1.tar.gz
+magicor-data-1.0-rc1.tar.gz


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/magicor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.spec	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.spec	2 Nov 2006 19:52:41 -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 pre_version rc1
+
 Name:           magicor
-Version:        0.1
-Release:        2%{?dist}
+Version:        1.0
+Release:        0.1.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +26,7 @@
 
 
 %prep
-%setup -q -b 1
+%setup -q -b 1 -n %{name}-%{version}-%{pre_version}
 sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
 sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
   scripts/Magicor-LevelEditor.py
@@ -89,6 +91,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
+- New upstream release 1.0-rc1
+
 * Sat Oct 21 2006 Hans de Goede  0.1-2
 - Mark /etc/magicor.conf %%config(noreplace)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2006 20:11:54 -0000	1.2
+++ sources	2 Nov 2006 19:52:41 -0000	1.3
@@ -1,2 +1,2 @@
-d5872a5fb0457af8c14a0c392b824c68  magicor-0.1.tar.gz
-0f9920721788147331d8e7d0a6d60a46  magicor-data-0.1.tar.gz
+ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
+9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 20:45:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 2 Nov 2006 13:45:58 -0700
Subject: rpms/scorched3d/devel .cvsignore, 1.4, 1.5 scorched3d-help.patch,
	1.3, 1.4 scorched3d-syslibs.patch, 1.3, 1.4 scorched3d-wx26.patch,
	1.1, 1.2 scorched3d.spec, 1.17, 1.18 sources, 1.4, 1.5
Message-ID: <200611022045.kA2Kjw8n029444@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29409

Modified Files:
	.cvsignore scorched3d-help.patch scorched3d-syslibs.patch 
	scorched3d-wx26.patch scorched3d.spec sources 
Log Message:
* Tue Aug 29 2006 Hans de Goede  40.1c-1
- New upstream release 40.1c
- Drop 64 bit patch (integrated upstream)
- Don't install our data files in /usr/share/games, but in /usr/share
- Some minor specfile cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jul 2006 20:04:07 -0000	1.4
+++ .cvsignore	2 Nov 2006 20:45:26 -0000	1.5
@@ -1 +1 @@
-Scorched3D-40-src.tar.gz
+Scorched3D-40.1c-src.tar.gz

scorched3d-help.patch:

Index: scorched3d-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-help.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scorched3d-help.patch	16 Jul 2006 19:11:25 -0000	1.3
+++ scorched3d-help.patch	2 Nov 2006 20:45:26 -0000	1.4
@@ -1,25 +1,3 @@
-diff -ur scorched.orig/src/scorched/HtmlHelpDialog.cpp scorched/src/scorched/HtmlHelpDialog.cpp
---- scorched.orig/src/scorched/HtmlHelpDialog.cpp	2006-02-17 18:48:54.000000000 +0100
-+++ scorched/src/scorched/HtmlHelpDialog.cpp	2006-07-16 11:03:57.000000000 +0200
-@@ -137,13 +137,13 @@
- void HelpFrame::onHome(wxCommandEvent &event)
- {
- 	html_->HistoryClear();
--	html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8));
-+	html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8));
- }
- 
- void showHtmlHelpDialog()
- {
- 	// For the moment just show the documentation in the default web browser
--	showURL(formatString("file://%s", getDocFile("documentation/html/index.html")));
-+	showURL(formatString("file://%s", getDocFile("html/index.html")));
- 
- 	//HelpFrame *frame = new HelpFrame();
- 	//frame->Show();
-Only in scorched/src/scorched: HtmlHelpDialog.cpp.orig
-Only in scorched/src/scorched: HtmlHelpDialog.cpp.rej
-Only in scorched/src/scorched: HtmlHelpDialog.cpp~
 diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
 --- scorched.orig/src/scorched/MainDialog.cpp	2006-05-14 17:00:11.000000000 +0200
 +++ scorched/src/scorched/MainDialog.cpp	2006-07-16 11:05:27.000000000 +0200
@@ -34,6 +12,3 @@
  #endif // __DARWIN__
  #endif // _WIN32
  }
-Only in scorched/src/scorched: MainDialog.cpp.orig
-Only in scorched/src/scorched: MainDialog.cpp.rej
-Only in scorched/src/scorched: MainDialog.cpp~

scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-syslibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scorched3d-syslibs.patch	16 Jul 2006 19:11:25 -0000	1.3
+++ scorched3d-syslibs.patch	2 Nov 2006 20:45:26 -0000	1.4
@@ -1,16 +1,16 @@
---- scorched/src/coms/NetServerProtocol.cpp.syslibs	2006-02-13 18:54:26.000000000 +0100
-+++ scorched/src/coms/NetServerProtocol.cpp	2006-07-16 11:36:19.000000000 +0200
+--- scorched/src/coms/NetServerProtocol.cpp.syslibs	2006-08-04 15:35:15.000000000 +0200
++++ scorched/src/coms/NetServerProtocol.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -22,7 +22,7 @@
  #include 
- #include 
+ #include 
  #include 
 -#include 
 +#include 
  
  NetServerProtocol::NetServerProtocol()
  {
---- scorched/src/coms/ComsMessageSender.cpp.syslibs	2006-02-13 18:54:26.000000000 +0100
-+++ scorched/src/coms/ComsMessageSender.cpp	2006-07-16 11:36:19.000000000 +0200
+--- scorched/src/coms/ComsMessageSender.cpp.syslibs	2006-09-08 17:07:59.000000000 +0200
++++ scorched/src/coms/ComsMessageSender.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -27,7 +27,7 @@
  #include 
  #include 
@@ -21,7 +21,7 @@
  
  bool ComsMessageSender::sendToServer(ComsMessage &message)
 --- scorched/src/XML/XMLParser.h.syslibs	2006-05-01 01:42:52.000000000 +0200
-+++ scorched/src/XML/XMLParser.h	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/XML/XMLParser.h	2006-10-31 20:11:27.000000000 +0100
 @@ -21,7 +21,7 @@
  #if !defined(__INCLUDE_XMLParserh_INCLUDE__)
  #define __INCLUDE_XMLParserh_INCLUDE__
@@ -31,18 +31,18 @@
  #include 
  
  class XMLParser
---- scorched/src/scorched/Makefile.am.syslibs	2006-07-15 17:14:50.000000000 +0200
-+++ scorched/src/scorched/Makefile.am	2006-07-16 11:36:47.000000000 +0200
-@@ -260,7 +260,6 @@
- 	../common/Vector.h \
+--- scorched/src/scorched/Makefile.am.syslibs	2006-10-27 20:48:23.000000000 +0200
++++ scorched/src/scorched/Makefile.am	2006-10-31 20:12:35.000000000 +0100
+@@ -271,7 +271,6 @@
+ 	../common/Vector4.h \
  	../common/VectorLib.cpp \
  	../common/VectorLib.h \
 -	../common/snprintf.c \
  	../3dsparse/ASEModelFactory.cpp \
  	../3dsparse/ASEModelFactory.h \
  	../3dsparse/Bone.cpp \
-@@ -602,95 +601,6 @@
- 	../weapons/WeaponTranslate.h \
+@@ -637,96 +636,6 @@
+ 	../weapons/WeaponTypeAction.h \
  	../weapons/WeaponVelocity.cpp \
  	../weapons/WeaponVelocity.h \
 -	../ode/array.cpp \
@@ -50,6 +50,7 @@
 -	../ode/collision.h \
 -	../ode/collision_kernel.cpp \
 -	../ode/collision_kernel.h \
+-	../ode/collision_quadtreespace.cpp \
 -	../ode/collision_space.cpp \
 -	../ode/collision_space.h \
 -	../ode/collision_space_internal.h \
@@ -137,7 +138,7 @@
  	../actions/AddTarget.cpp \
  	../actions/AddTarget.h \
  	../actions/Animation.cpp \
-@@ -1100,14 +1010,6 @@
+@@ -1134,14 +1043,6 @@
  	../XML/XMLParser.h \
  	../XML/XMLStringBuffer.cpp \
  	../XML/XMLStringBuffer.h \
@@ -152,18 +153,18 @@
  	../target/Target.cpp \
  	../target/Target.h \
  	../target/TargetContainer.cpp \
---- scorched/src/scorched/Makefile.in.syslibs	2006-07-15 17:15:28.000000000 +0200
-+++ scorched/src/scorched/Makefile.in	2006-07-16 11:37:23.000000000 +0200
-@@ -360,7 +360,6 @@
- 	../common/Vector.h \
+--- scorched/src/scorched/Makefile.in.syslibs	2006-10-30 19:10:42.000000000 +0100
++++ scorched/src/scorched/Makefile.in	2006-10-31 20:19:02.000000000 +0100
+@@ -372,7 +372,6 @@
+ 	../common/Vector4.h \
  	../common/VectorLib.cpp \
  	../common/VectorLib.h \
 -	../common/snprintf.c \
  	../3dsparse/ASEModelFactory.cpp \
  	../3dsparse/ASEModelFactory.h \
  	../3dsparse/Bone.cpp \
-@@ -702,95 +701,6 @@
- 	../weapons/WeaponTranslate.h \
+@@ -738,96 +737,6 @@
+ 	../weapons/WeaponTypeAction.h \
  	../weapons/WeaponVelocity.cpp \
  	../weapons/WeaponVelocity.h \
 -	../ode/array.cpp \
@@ -171,6 +172,7 @@
 -	../ode/collision.h \
 -	../ode/collision_kernel.cpp \
 -	../ode/collision_kernel.h \
+-	../ode/collision_quadtreespace.cpp \
 -	../ode/collision_space.cpp \
 -	../ode/collision_space.h \
 -	../ode/collision_space_internal.h \
@@ -258,7 +260,7 @@
  	../actions/AddTarget.cpp \
  	../actions/AddTarget.h \
  	../actions/Animation.cpp \
-@@ -1200,14 +1110,6 @@
+@@ -1235,14 +1144,6 @@
  	../XML/XMLParser.h \
  	../XML/XMLStringBuffer.cpp \
  	../XML/XMLStringBuffer.h \
@@ -273,20 +275,21 @@
  	../target/Target.cpp \
  	../target/Target.h \
  	../target/TargetContainer.cpp \
-@@ -1426,7 +1328,7 @@
- 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
- 	StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
- 	StatsLoggerMySQL.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
+@@ -1471,7 +1372,7 @@
+ 	SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \
+ 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
+ 	Triangle.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
 -	VectorLib.$(OBJEXT) snprintf.$(OBJEXT) \
 +	VectorLib.$(OBJEXT) \
  	ASEModelFactory.$(OBJEXT) Bone.$(OBJEXT) Face.$(OBJEXT) \
  	ImageID.$(OBJEXT) ImageStore.$(OBJEXT) MSModelFactory.$(OBJEXT) \
  	Mesh.$(OBJEXT) MeshLOD.$(OBJEXT) MeshLODTri.$(OBJEXT) \
-@@ -1506,21 +1408,6 @@
- 	WeaponScatterPosition.$(OBJEXT) WeaponSkyFlash.$(OBJEXT) \
- 	WeaponSound.$(OBJEXT) WeaponTeleport.$(OBJEXT) \
- 	WeaponTranslate.$(OBJEXT) WeaponVelocity.$(OBJEXT) \
--	array.$(OBJEXT) collision_kernel.$(OBJEXT) \
+@@ -1558,22 +1459,7 @@
+ 	WeaponTankPosition.$(OBJEXT) WeaponTankVelocity.$(OBJEXT) \
+ 	WeaponTeamAction.$(OBJEXT) WeaponTeleport.$(OBJEXT) \
+ 	WeaponTranslate.$(OBJEXT) WeaponTypeAction.$(OBJEXT) \
+-	WeaponVelocity.$(OBJEXT) array.$(OBJEXT) \
+-	collision_kernel.$(OBJEXT) collision_quadtreespace.$(OBJEXT) \
 -	collision_space.$(OBJEXT) collision_std.$(OBJEXT) \
 -	collision_transform.$(OBJEXT) collision_util.$(OBJEXT) \
 -	error.$(OBJEXT) export-dif.$(OBJEXT) fastdot.$(OBJEXT) \
@@ -301,21 +304,19 @@
 -	infblock.$(OBJEXT) infcodes.$(OBJEXT) inffast.$(OBJEXT) \
 -	inflate.$(OBJEXT) inftrees.$(OBJEXT) infutil.$(OBJEXT) \
 -	trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \
++	WeaponVelocity.$(OBJEXT) \
  	AddTarget.$(OBJEXT) Animation.$(OBJEXT) \
  	CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \
  	Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \
-@@ -1625,8 +1512,8 @@
- 	TankAIStore.$(OBJEXT) TankAIStrings.$(OBJEXT) \
- 	ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) ShipGroup.$(OBJEXT) \
- 	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
--	XMLStringBuffer.$(OBJEXT) xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) \
--	xmltok.$(OBJEXT) Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
-+	XMLStringBuffer.$(OBJEXT) \
-+	Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
+@@ -1677,7 +1563,6 @@
+ 	TankAIStrings.$(OBJEXT) ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) \
+ 	ShipGroup.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
+ 	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+-	xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) xmltok.$(OBJEXT) \
+ 	Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
  	TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \
- 	TargetLife.$(OBJEXT) TargetParachute.$(OBJEXT) \
- 	TargetRenderer.$(OBJEXT) TargetShield.$(OBJEXT) \
-@@ -2178,35 +2065,9 @@
+ 	TargetGroupEntry.$(OBJEXT) TargetLife.$(OBJEXT) \
+@@ -2252,36 +2137,9 @@
  @AMDEP_TRUE@	./$(DEPDIR)/WindowSetup.Po ./$(DEPDIR)/XMLFile.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/XMLNode.Po ./$(DEPDIR)/XMLParser.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/XMLStringBuffer.Po \
@@ -323,6 +324,7 @@
  @AMDEP_TRUE@	./$(DEPDIR)/aseFile.lex.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/aseFile.tab.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_kernel.Po \
+- at AMDEP_TRUE@	./$(DEPDIR)/collision_quadtreespace.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_space.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_std.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_transform.Po \
@@ -352,20 +354,21 @@
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
-@@ -2386,7 +2247,6 @@
- Triangle.$(OBJEXT): ../common/Triangle.cpp
+@@ -2468,7 +2326,6 @@
  Vector.$(OBJEXT): ../common/Vector.cpp
+ Vector4.$(OBJEXT): ../common/Vector4.cpp
  VectorLib.$(OBJEXT): ../common/VectorLib.cpp
 -snprintf.$(OBJEXT): ../common/snprintf.c
  ASEModelFactory.$(OBJEXT): ../3dsparse/ASEModelFactory.cpp
  Bone.$(OBJEXT): ../3dsparse/Bone.cpp
  Face.$(OBJEXT): ../3dsparse/Face.cpp
-@@ -2563,49 +2423,6 @@
- WeaponTeleport.$(OBJEXT): ../weapons/WeaponTeleport.cpp
+@@ -2658,50 +2515,6 @@
  WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp
+ WeaponTypeAction.$(OBJEXT): ../weapons/WeaponTypeAction.cpp
  WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp
 -array.$(OBJEXT): ../ode/array.cpp
 -collision_kernel.$(OBJEXT): ../ode/collision_kernel.cpp
+-collision_quadtreespace.$(OBJEXT): ../ode/collision_quadtreespace.cpp
 -collision_space.$(OBJEXT): ../ode/collision_space.cpp
 -collision_std.$(OBJEXT): ../ode/collision_std.cpp
 -collision_transform.$(OBJEXT): ../ode/collision_transform.cpp
@@ -410,7 +413,7 @@
  AddTarget.$(OBJEXT): ../actions/AddTarget.cpp
  Animation.$(OBJEXT): ../actions/Animation.cpp
  CallbackWeapon.$(OBJEXT): ../actions/CallbackWeapon.cpp
-@@ -2807,9 +2624,6 @@
+@@ -2902,9 +2715,6 @@
  XMLNode.$(OBJEXT): ../XML/XMLNode.cpp
  XMLParser.$(OBJEXT): ../XML/XMLParser.cpp
  XMLStringBuffer.$(OBJEXT): ../XML/XMLStringBuffer.cpp
@@ -420,7 +423,7 @@
  Target.$(OBJEXT): ../target/Target.cpp
  TargetContainer.$(OBJEXT): ../target/TargetContainer.cpp
  TargetDamageCalc.$(OBJEXT): ../target/TargetDamageCalc.cpp
-@@ -3476,56 +3290,9 @@
+@@ -3593,57 +3403,9 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNode.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLParser.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@
@@ -429,6 +432,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_kernel.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_quadtreespace.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_space.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_std.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_transform.Po at am__quote@
@@ -477,7 +481,7 @@
  
  distclean-depend:
  	-rm -rf ./$(DEPDIR)
-@@ -3542,269 +3309,6 @@
+@@ -3660,269 +3422,6 @@
  @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(COMPILE) -c `cygpath -w $<`
  
@@ -747,7 +751,7 @@
  CCDEPMODE = @CCDEPMODE@
  
  .cpp.o:
-@@ -7395,306 +6897,6 @@
+@@ -7717,318 +7216,6 @@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WeaponVelocity.obj `cygpath -w ../weapons/WeaponVelocity.cpp`
  
@@ -775,6 +779,18 @@
 - at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.obj `cygpath -w ../ode/collision_kernel.cpp`
 -
+-collision_quadtreespace.o: ../ode/collision_quadtreespace.cpp
+- at AMDEP_TRUE@	source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.o `test -f '../ode/collision_quadtreespace.cpp' || echo '$(srcdir)/'`../ode/collision_quadtreespace.cpp
+-
+-collision_quadtreespace.obj: ../ode/collision_quadtreespace.cpp
+- at AMDEP_TRUE@	source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.obj `cygpath -w ../ode/collision_quadtreespace.cpp`
+-
 -collision_space.o: ../ode/collision_space.cpp
 - at AMDEP_TRUE@	source='../ode/collision_space.cpp' object='collision_space.o' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@
@@ -1055,7 +1071,7 @@
  @AMDEP_TRUE@	source='../actions/AddTarget.cpp' object='AddTarget.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@	depfile='$(DEPDIR)/AddTarget.Po' tmpdepfile='$(DEPDIR)/AddTarget.TPo' @AMDEPBACKSLASH@
 --- scorched/src/engine/ModFileEntry.cpp.syslibs	2006-04-13 00:49:26.000000000 +0200
-+++ scorched/src/engine/ModFileEntry.cpp	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/engine/ModFileEntry.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -21,7 +21,7 @@
  #include 
  #include 
@@ -1066,7 +1082,7 @@
  #include 
  
 --- scorched/src/tank/TankAvatar.cpp.syslibs	2006-02-13 18:54:27.000000000 +0100
-+++ scorched/src/tank/TankAvatar.cpp	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/tank/TankAvatar.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -22,7 +22,7 @@
  #include 
  #include 
@@ -1076,8 +1092,8 @@
  #include 
  
  GLTexture *TankAvatar::defaultTexture_ = 0;
---- scorched/src/landscape/HeightMapSender.cpp~	2006-07-16 11:55:01.000000000 +0200
-+++ scorched/src/landscape/HeightMapSender.cpp	2006-07-16 11:55:01.000000000 +0200
+--- scorched/src/landscape/HeightMapSender.cpp.syslibs	2005-11-25 11:35:42.000000000 +0100
++++ scorched/src/landscape/HeightMapSender.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -20,7 +20,7 @@
  
  #include 

scorched3d-wx26.patch:

Index: scorched3d-wx26.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-wx26.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-wx26.patch	16 Jul 2006 19:11:25 -0000	1.1
+++ scorched3d-wx26.patch	2 Nov 2006 20:45:26 -0000	1.2
@@ -1,28 +1,3 @@
---- scorched/src/scorched/NetLan.cpp~	2006-07-16 12:50:44.000000000 +0200
-+++ scorched/src/scorched/NetLan.cpp	2006-07-16 12:50:44.000000000 +0200
-@@ -96,9 +96,9 @@
- 	// Radio Buttons
- 	wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5);
- 	IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, 
--		"Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-+		wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
- 	IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, 
--		"LAN", wxDefaultPosition, wxDefaultSize, 0);
-+		wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0);
- 	radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10);
- 	radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0);
- 	sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5);
---- scorched/src/scorched/OptionEntrySetter.cpp~	2006-07-16 13:04:56.000000000 +0200
-+++ scorched/src/scorched/OptionEntrySetter.cpp	2006-07-16 13:04:56.000000000 +0200
-@@ -122,7 +122,7 @@
- 		{
- 			sizer->Add(control = 
- 				new wxCheckBox(parent, -1,
--					"",
-+					wxT(""),
- 					wxDefaultPosition, wxDefaultSize),
- 					0, wxALIGN_LEFT);
- 			control->SetToolTip(
 --- scorched/src/scorched/NetLan.cpp~	2006-07-16 20:36:19.000000000 +0200
 +++ scorched/src/scorched/NetLan.cpp	2006-07-16 20:36:19.000000000 +0200
 @@ -71,17 +71,11 @@


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scorched3d.spec	29 Aug 2006 06:03:35 -0000	1.17
+++ scorched3d.spec	2 Nov 2006 20:45:26 -0000	1.18
@@ -1,27 +1,20 @@
 Name:           scorched3d
-Version:        40
-Release:        2%{?dist}
+Version:        40.1c
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.scorched3d.co.uk/
-Source0:        http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz
+Source0:        http://dl.sf.net/%{name}/Scorched3D-%{version}-src.tar.gz
 Source1:        %{name}.desktop
 Patch1:         %{name}-syslibs.patch
 Patch2:         %{name}-wx26.patch
-Patch4:         %{name}-64bit.patch
-Patch5:         %{name}-openal.patch
-Patch6:         %{name}-help.patch
+Patch3:         %{name}-openal.patch
+Patch4:         %{name}-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  wxGTK-devel
-BuildRequires:  openal-devel
-BuildRequires:  freealut-devel
-BuildRequires:  SDL_net-devel
-BuildRequires:  ImageMagick
-BuildRequires:  libGLU-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  expat-devel
-BuildRequires:  ode-devel
+BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
+BuildRequires:  expat-devel ImageMagick desktop-file-utils
+Requires:       hicolor-icon-theme
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -42,13 +35,12 @@
 
 %prep
 %setup -q -n scorched
-rm -r autom4te.cache `find . -name Makefile`
+rm -r `find . -name Makefile`
 rm -r src/zlib src/ode `find src/XML ! -name "X*"`
-%patch1 -p1
-%patch2 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1 -p1 -z .syslibs
+%patch2 -p1 -z .wx26
+%patch3 -p1 -z .openal
+%patch4 -p1 -z .help
 # make rpmlint happy with debuginfo package
 chmod -x src/GLEXT/*
 # stop autoxxx from running
@@ -58,29 +50,27 @@
 
 
 %build
-%configure \
-  --disable-dependency-tracking \
-  --datadir=%{_datadir}/games/%{name} \
-  --with-docdir=$RPM_DOC_DIR/%{name}-%{version}
+%configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \
+  --with-docdir=%{_docdir}/%{name}-%{version}
 # LDFLAGS=-lode for use of system ode
 make %{?_smp_mflags} LDFLAGS=-lode
-convert data/windows/tank2.ico tank2.png
+convert data/windows/tank2.ico %{name}.png
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html .
 
-desktop-file-install \
-  --vendor fedora \
+# 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 \
-  --mode 644 \
-  --add-category X-Fedora \
+  --add-category X-Fedora                       \
   %{SOURCE1}
-install -Dpm 644 tank2.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png
-
-mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+install -p -m 644 %{name}.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
 
 %clean
@@ -88,22 +78,34 @@
 
 
 %post
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+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
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+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 TODO __docs/*
-%{_bindir}/scorched3d
-%{_datadir}/games/scorched3d/
-%{_datadir}/applications/*scorched3d.desktop
-%{_datadir}/icons/hicolor/*/apps/scorched3d.png
+%doc AUTHORS COPYING TODO html
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Tue Aug 29 2006 Hans de Goede  40.1c-1
+- New upstream release 40.1c
+- Drop 64 bit patch (integrated upstream)
+- Don't install our data files in /usr/share/games, but in /usr/share
+- Some minor specfile cleanups
+
 * Tue Aug 29 2006 Hans de Goede  40-2
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jul 2006 19:11:25 -0000	1.4
+++ sources	2 Nov 2006 20:45:26 -0000	1.5
@@ -1 +1 @@
-76b60b9f73d2c971d86bfac761989cf4  Scorched3D-40-src.tar.gz
+a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 20:47:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 2 Nov 2006 13:47:02 -0700
Subject: rpms/scorched3d/devel scorched3d-64bit.patch,1.6,NONE
Message-ID: <200611022047.kA2Kl2v8029498@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29493

Removed Files:
	scorched3d-64bit.patch 
Log Message:
remove integrated 64 bit patch


--- scorched3d-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 20:49:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 2 Nov 2006 13:49:07 -0700
Subject: rpms/scorched3d/FC-6 .cvsignore, 1.4, 1.5 scorched3d-help.patch, 1.3,
	1.4 scorched3d-syslibs.patch, 1.3, 1.4 scorched3d-wx26.patch,
	1.1, 1.2 scorched3d.spec, 1.17, 1.18 sources, 1.4,
	1.5 scorched3d-64bit.patch, 1.6, NONE
Message-ID: <200611022049.kA2Kn7m3029560@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29525

Modified Files:
	.cvsignore scorched3d-help.patch scorched3d-syslibs.patch 
	scorched3d-wx26.patch scorched3d.spec sources 
Removed Files:
	scorched3d-64bit.patch 
Log Message:
* Tue Aug 29 2006 Hans de Goede  40.1c-1
- New upstream release 40.1c
- Drop 64 bit patch (integrated upstream)
- Don't install our data files in /usr/share/games, but in /usr/share
- Some minor specfile cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jul 2006 20:04:07 -0000	1.4
+++ .cvsignore	2 Nov 2006 20:48:36 -0000	1.5
@@ -1 +1 @@
-Scorched3D-40-src.tar.gz
+Scorched3D-40.1c-src.tar.gz

scorched3d-help.patch:

Index: scorched3d-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d-help.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scorched3d-help.patch	16 Jul 2006 19:11:25 -0000	1.3
+++ scorched3d-help.patch	2 Nov 2006 20:48:36 -0000	1.4
@@ -1,25 +1,3 @@
-diff -ur scorched.orig/src/scorched/HtmlHelpDialog.cpp scorched/src/scorched/HtmlHelpDialog.cpp
---- scorched.orig/src/scorched/HtmlHelpDialog.cpp	2006-02-17 18:48:54.000000000 +0100
-+++ scorched/src/scorched/HtmlHelpDialog.cpp	2006-07-16 11:03:57.000000000 +0200
-@@ -137,13 +137,13 @@
- void HelpFrame::onHome(wxCommandEvent &event)
- {
- 	html_->HistoryClear();
--	html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8));
-+	html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8));
- }
- 
- void showHtmlHelpDialog()
- {
- 	// For the moment just show the documentation in the default web browser
--	showURL(formatString("file://%s", getDocFile("documentation/html/index.html")));
-+	showURL(formatString("file://%s", getDocFile("html/index.html")));
- 
- 	//HelpFrame *frame = new HelpFrame();
- 	//frame->Show();
-Only in scorched/src/scorched: HtmlHelpDialog.cpp.orig
-Only in scorched/src/scorched: HtmlHelpDialog.cpp.rej
-Only in scorched/src/scorched: HtmlHelpDialog.cpp~
 diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
 --- scorched.orig/src/scorched/MainDialog.cpp	2006-05-14 17:00:11.000000000 +0200
 +++ scorched/src/scorched/MainDialog.cpp	2006-07-16 11:05:27.000000000 +0200
@@ -34,6 +12,3 @@
  #endif // __DARWIN__
  #endif // _WIN32
  }
-Only in scorched/src/scorched: MainDialog.cpp.orig
-Only in scorched/src/scorched: MainDialog.cpp.rej
-Only in scorched/src/scorched: MainDialog.cpp~

scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d-syslibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scorched3d-syslibs.patch	16 Jul 2006 19:11:25 -0000	1.3
+++ scorched3d-syslibs.patch	2 Nov 2006 20:48:36 -0000	1.4
@@ -1,16 +1,16 @@
---- scorched/src/coms/NetServerProtocol.cpp.syslibs	2006-02-13 18:54:26.000000000 +0100
-+++ scorched/src/coms/NetServerProtocol.cpp	2006-07-16 11:36:19.000000000 +0200
+--- scorched/src/coms/NetServerProtocol.cpp.syslibs	2006-08-04 15:35:15.000000000 +0200
++++ scorched/src/coms/NetServerProtocol.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -22,7 +22,7 @@
  #include 
- #include 
+ #include 
  #include 
 -#include 
 +#include 
  
  NetServerProtocol::NetServerProtocol()
  {
---- scorched/src/coms/ComsMessageSender.cpp.syslibs	2006-02-13 18:54:26.000000000 +0100
-+++ scorched/src/coms/ComsMessageSender.cpp	2006-07-16 11:36:19.000000000 +0200
+--- scorched/src/coms/ComsMessageSender.cpp.syslibs	2006-09-08 17:07:59.000000000 +0200
++++ scorched/src/coms/ComsMessageSender.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -27,7 +27,7 @@
  #include 
  #include 
@@ -21,7 +21,7 @@
  
  bool ComsMessageSender::sendToServer(ComsMessage &message)
 --- scorched/src/XML/XMLParser.h.syslibs	2006-05-01 01:42:52.000000000 +0200
-+++ scorched/src/XML/XMLParser.h	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/XML/XMLParser.h	2006-10-31 20:11:27.000000000 +0100
 @@ -21,7 +21,7 @@
  #if !defined(__INCLUDE_XMLParserh_INCLUDE__)
  #define __INCLUDE_XMLParserh_INCLUDE__
@@ -31,18 +31,18 @@
  #include 
  
  class XMLParser
---- scorched/src/scorched/Makefile.am.syslibs	2006-07-15 17:14:50.000000000 +0200
-+++ scorched/src/scorched/Makefile.am	2006-07-16 11:36:47.000000000 +0200
-@@ -260,7 +260,6 @@
- 	../common/Vector.h \
+--- scorched/src/scorched/Makefile.am.syslibs	2006-10-27 20:48:23.000000000 +0200
++++ scorched/src/scorched/Makefile.am	2006-10-31 20:12:35.000000000 +0100
+@@ -271,7 +271,6 @@
+ 	../common/Vector4.h \
  	../common/VectorLib.cpp \
  	../common/VectorLib.h \
 -	../common/snprintf.c \
  	../3dsparse/ASEModelFactory.cpp \
  	../3dsparse/ASEModelFactory.h \
  	../3dsparse/Bone.cpp \
-@@ -602,95 +601,6 @@
- 	../weapons/WeaponTranslate.h \
+@@ -637,96 +636,6 @@
+ 	../weapons/WeaponTypeAction.h \
  	../weapons/WeaponVelocity.cpp \
  	../weapons/WeaponVelocity.h \
 -	../ode/array.cpp \
@@ -50,6 +50,7 @@
 -	../ode/collision.h \
 -	../ode/collision_kernel.cpp \
 -	../ode/collision_kernel.h \
+-	../ode/collision_quadtreespace.cpp \
 -	../ode/collision_space.cpp \
 -	../ode/collision_space.h \
 -	../ode/collision_space_internal.h \
@@ -137,7 +138,7 @@
  	../actions/AddTarget.cpp \
  	../actions/AddTarget.h \
  	../actions/Animation.cpp \
-@@ -1100,14 +1010,6 @@
+@@ -1134,14 +1043,6 @@
  	../XML/XMLParser.h \
  	../XML/XMLStringBuffer.cpp \
  	../XML/XMLStringBuffer.h \
@@ -152,18 +153,18 @@
  	../target/Target.cpp \
  	../target/Target.h \
  	../target/TargetContainer.cpp \
---- scorched/src/scorched/Makefile.in.syslibs	2006-07-15 17:15:28.000000000 +0200
-+++ scorched/src/scorched/Makefile.in	2006-07-16 11:37:23.000000000 +0200
-@@ -360,7 +360,6 @@
- 	../common/Vector.h \
+--- scorched/src/scorched/Makefile.in.syslibs	2006-10-30 19:10:42.000000000 +0100
++++ scorched/src/scorched/Makefile.in	2006-10-31 20:19:02.000000000 +0100
+@@ -372,7 +372,6 @@
+ 	../common/Vector4.h \
  	../common/VectorLib.cpp \
  	../common/VectorLib.h \
 -	../common/snprintf.c \
  	../3dsparse/ASEModelFactory.cpp \
  	../3dsparse/ASEModelFactory.h \
  	../3dsparse/Bone.cpp \
-@@ -702,95 +701,6 @@
- 	../weapons/WeaponTranslate.h \
+@@ -738,96 +737,6 @@
+ 	../weapons/WeaponTypeAction.h \
  	../weapons/WeaponVelocity.cpp \
  	../weapons/WeaponVelocity.h \
 -	../ode/array.cpp \
@@ -171,6 +172,7 @@
 -	../ode/collision.h \
 -	../ode/collision_kernel.cpp \
 -	../ode/collision_kernel.h \
+-	../ode/collision_quadtreespace.cpp \
 -	../ode/collision_space.cpp \
 -	../ode/collision_space.h \
 -	../ode/collision_space_internal.h \
@@ -258,7 +260,7 @@
  	../actions/AddTarget.cpp \
  	../actions/AddTarget.h \
  	../actions/Animation.cpp \
-@@ -1200,14 +1110,6 @@
+@@ -1235,14 +1144,6 @@
  	../XML/XMLParser.h \
  	../XML/XMLStringBuffer.cpp \
  	../XML/XMLStringBuffer.h \
@@ -273,20 +275,21 @@
  	../target/Target.cpp \
  	../target/Target.h \
  	../target/TargetContainer.cpp \
-@@ -1426,7 +1328,7 @@
- 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
- 	StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
- 	StatsLoggerMySQL.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
+@@ -1471,7 +1372,7 @@
+ 	SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \
+ 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
+ 	Triangle.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
 -	VectorLib.$(OBJEXT) snprintf.$(OBJEXT) \
 +	VectorLib.$(OBJEXT) \
  	ASEModelFactory.$(OBJEXT) Bone.$(OBJEXT) Face.$(OBJEXT) \
  	ImageID.$(OBJEXT) ImageStore.$(OBJEXT) MSModelFactory.$(OBJEXT) \
  	Mesh.$(OBJEXT) MeshLOD.$(OBJEXT) MeshLODTri.$(OBJEXT) \
-@@ -1506,21 +1408,6 @@
- 	WeaponScatterPosition.$(OBJEXT) WeaponSkyFlash.$(OBJEXT) \
- 	WeaponSound.$(OBJEXT) WeaponTeleport.$(OBJEXT) \
- 	WeaponTranslate.$(OBJEXT) WeaponVelocity.$(OBJEXT) \
--	array.$(OBJEXT) collision_kernel.$(OBJEXT) \
+@@ -1558,22 +1459,7 @@
+ 	WeaponTankPosition.$(OBJEXT) WeaponTankVelocity.$(OBJEXT) \
+ 	WeaponTeamAction.$(OBJEXT) WeaponTeleport.$(OBJEXT) \
+ 	WeaponTranslate.$(OBJEXT) WeaponTypeAction.$(OBJEXT) \
+-	WeaponVelocity.$(OBJEXT) array.$(OBJEXT) \
+-	collision_kernel.$(OBJEXT) collision_quadtreespace.$(OBJEXT) \
 -	collision_space.$(OBJEXT) collision_std.$(OBJEXT) \
 -	collision_transform.$(OBJEXT) collision_util.$(OBJEXT) \
 -	error.$(OBJEXT) export-dif.$(OBJEXT) fastdot.$(OBJEXT) \
@@ -301,21 +304,19 @@
 -	infblock.$(OBJEXT) infcodes.$(OBJEXT) inffast.$(OBJEXT) \
 -	inflate.$(OBJEXT) inftrees.$(OBJEXT) infutil.$(OBJEXT) \
 -	trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \
++	WeaponVelocity.$(OBJEXT) \
  	AddTarget.$(OBJEXT) Animation.$(OBJEXT) \
  	CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \
  	Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \
-@@ -1625,8 +1512,8 @@
- 	TankAIStore.$(OBJEXT) TankAIStrings.$(OBJEXT) \
- 	ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) ShipGroup.$(OBJEXT) \
- 	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
--	XMLStringBuffer.$(OBJEXT) xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) \
--	xmltok.$(OBJEXT) Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
-+	XMLStringBuffer.$(OBJEXT) \
-+	Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
+@@ -1677,7 +1563,6 @@
+ 	TankAIStrings.$(OBJEXT) ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) \
+ 	ShipGroup.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
+ 	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+-	xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) xmltok.$(OBJEXT) \
+ 	Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
  	TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \
- 	TargetLife.$(OBJEXT) TargetParachute.$(OBJEXT) \
- 	TargetRenderer.$(OBJEXT) TargetShield.$(OBJEXT) \
-@@ -2178,35 +2065,9 @@
+ 	TargetGroupEntry.$(OBJEXT) TargetLife.$(OBJEXT) \
+@@ -2252,36 +2137,9 @@
  @AMDEP_TRUE@	./$(DEPDIR)/WindowSetup.Po ./$(DEPDIR)/XMLFile.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/XMLNode.Po ./$(DEPDIR)/XMLParser.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/XMLStringBuffer.Po \
@@ -323,6 +324,7 @@
  @AMDEP_TRUE@	./$(DEPDIR)/aseFile.lex.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/aseFile.tab.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_kernel.Po \
+- at AMDEP_TRUE@	./$(DEPDIR)/collision_quadtreespace.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_space.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_std.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_transform.Po \
@@ -352,20 +354,21 @@
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
-@@ -2386,7 +2247,6 @@
- Triangle.$(OBJEXT): ../common/Triangle.cpp
+@@ -2468,7 +2326,6 @@
  Vector.$(OBJEXT): ../common/Vector.cpp
+ Vector4.$(OBJEXT): ../common/Vector4.cpp
  VectorLib.$(OBJEXT): ../common/VectorLib.cpp
 -snprintf.$(OBJEXT): ../common/snprintf.c
  ASEModelFactory.$(OBJEXT): ../3dsparse/ASEModelFactory.cpp
  Bone.$(OBJEXT): ../3dsparse/Bone.cpp
  Face.$(OBJEXT): ../3dsparse/Face.cpp
-@@ -2563,49 +2423,6 @@
- WeaponTeleport.$(OBJEXT): ../weapons/WeaponTeleport.cpp
+@@ -2658,50 +2515,6 @@
  WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp
+ WeaponTypeAction.$(OBJEXT): ../weapons/WeaponTypeAction.cpp
  WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp
 -array.$(OBJEXT): ../ode/array.cpp
 -collision_kernel.$(OBJEXT): ../ode/collision_kernel.cpp
+-collision_quadtreespace.$(OBJEXT): ../ode/collision_quadtreespace.cpp
 -collision_space.$(OBJEXT): ../ode/collision_space.cpp
 -collision_std.$(OBJEXT): ../ode/collision_std.cpp
 -collision_transform.$(OBJEXT): ../ode/collision_transform.cpp
@@ -410,7 +413,7 @@
  AddTarget.$(OBJEXT): ../actions/AddTarget.cpp
  Animation.$(OBJEXT): ../actions/Animation.cpp
  CallbackWeapon.$(OBJEXT): ../actions/CallbackWeapon.cpp
-@@ -2807,9 +2624,6 @@
+@@ -2902,9 +2715,6 @@
  XMLNode.$(OBJEXT): ../XML/XMLNode.cpp
  XMLParser.$(OBJEXT): ../XML/XMLParser.cpp
  XMLStringBuffer.$(OBJEXT): ../XML/XMLStringBuffer.cpp
@@ -420,7 +423,7 @@
  Target.$(OBJEXT): ../target/Target.cpp
  TargetContainer.$(OBJEXT): ../target/TargetContainer.cpp
  TargetDamageCalc.$(OBJEXT): ../target/TargetDamageCalc.cpp
-@@ -3476,56 +3290,9 @@
+@@ -3593,57 +3403,9 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNode.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLParser.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@
@@ -429,6 +432,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_kernel.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_quadtreespace.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_space.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_std.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_transform.Po at am__quote@
@@ -477,7 +481,7 @@
  
  distclean-depend:
  	-rm -rf ./$(DEPDIR)
-@@ -3542,269 +3309,6 @@
+@@ -3660,269 +3422,6 @@
  @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(COMPILE) -c `cygpath -w $<`
  
@@ -747,7 +751,7 @@
  CCDEPMODE = @CCDEPMODE@
  
  .cpp.o:
-@@ -7395,306 +6897,6 @@
+@@ -7717,318 +7216,6 @@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WeaponVelocity.obj `cygpath -w ../weapons/WeaponVelocity.cpp`
  
@@ -775,6 +779,18 @@
 - at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.obj `cygpath -w ../ode/collision_kernel.cpp`
 -
+-collision_quadtreespace.o: ../ode/collision_quadtreespace.cpp
+- at AMDEP_TRUE@	source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.o `test -f '../ode/collision_quadtreespace.cpp' || echo '$(srcdir)/'`../ode/collision_quadtreespace.cpp
+-
+-collision_quadtreespace.obj: ../ode/collision_quadtreespace.cpp
+- at AMDEP_TRUE@	source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.obj `cygpath -w ../ode/collision_quadtreespace.cpp`
+-
 -collision_space.o: ../ode/collision_space.cpp
 - at AMDEP_TRUE@	source='../ode/collision_space.cpp' object='collision_space.o' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@
@@ -1055,7 +1071,7 @@
  @AMDEP_TRUE@	source='../actions/AddTarget.cpp' object='AddTarget.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@	depfile='$(DEPDIR)/AddTarget.Po' tmpdepfile='$(DEPDIR)/AddTarget.TPo' @AMDEPBACKSLASH@
 --- scorched/src/engine/ModFileEntry.cpp.syslibs	2006-04-13 00:49:26.000000000 +0200
-+++ scorched/src/engine/ModFileEntry.cpp	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/engine/ModFileEntry.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -21,7 +21,7 @@
  #include 
  #include 
@@ -1066,7 +1082,7 @@
  #include 
  
 --- scorched/src/tank/TankAvatar.cpp.syslibs	2006-02-13 18:54:27.000000000 +0100
-+++ scorched/src/tank/TankAvatar.cpp	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/tank/TankAvatar.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -22,7 +22,7 @@
  #include 
  #include 
@@ -1076,8 +1092,8 @@
  #include 
  
  GLTexture *TankAvatar::defaultTexture_ = 0;
---- scorched/src/landscape/HeightMapSender.cpp~	2006-07-16 11:55:01.000000000 +0200
-+++ scorched/src/landscape/HeightMapSender.cpp	2006-07-16 11:55:01.000000000 +0200
+--- scorched/src/landscape/HeightMapSender.cpp.syslibs	2005-11-25 11:35:42.000000000 +0100
++++ scorched/src/landscape/HeightMapSender.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -20,7 +20,7 @@
  
  #include 

scorched3d-wx26.patch:

Index: scorched3d-wx26.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d-wx26.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-wx26.patch	16 Jul 2006 19:11:25 -0000	1.1
+++ scorched3d-wx26.patch	2 Nov 2006 20:48:36 -0000	1.2
@@ -1,28 +1,3 @@
---- scorched/src/scorched/NetLan.cpp~	2006-07-16 12:50:44.000000000 +0200
-+++ scorched/src/scorched/NetLan.cpp	2006-07-16 12:50:44.000000000 +0200
-@@ -96,9 +96,9 @@
- 	// Radio Buttons
- 	wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5);
- 	IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, 
--		"Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-+		wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
- 	IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, 
--		"LAN", wxDefaultPosition, wxDefaultSize, 0);
-+		wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0);
- 	radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10);
- 	radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0);
- 	sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5);
---- scorched/src/scorched/OptionEntrySetter.cpp~	2006-07-16 13:04:56.000000000 +0200
-+++ scorched/src/scorched/OptionEntrySetter.cpp	2006-07-16 13:04:56.000000000 +0200
-@@ -122,7 +122,7 @@
- 		{
- 			sizer->Add(control = 
- 				new wxCheckBox(parent, -1,
--					"",
-+					wxT(""),
- 					wxDefaultPosition, wxDefaultSize),
- 					0, wxALIGN_LEFT);
- 			control->SetToolTip(
 --- scorched/src/scorched/NetLan.cpp~	2006-07-16 20:36:19.000000000 +0200
 +++ scorched/src/scorched/NetLan.cpp	2006-07-16 20:36:19.000000000 +0200
 @@ -71,17 +71,11 @@


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scorched3d.spec	29 Aug 2006 06:03:35 -0000	1.17
+++ scorched3d.spec	2 Nov 2006 20:48:36 -0000	1.18
@@ -1,27 +1,20 @@
 Name:           scorched3d
-Version:        40
-Release:        2%{?dist}
+Version:        40.1c
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.scorched3d.co.uk/
-Source0:        http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz
+Source0:        http://dl.sf.net/%{name}/Scorched3D-%{version}-src.tar.gz
 Source1:        %{name}.desktop
 Patch1:         %{name}-syslibs.patch
 Patch2:         %{name}-wx26.patch
-Patch4:         %{name}-64bit.patch
-Patch5:         %{name}-openal.patch
-Patch6:         %{name}-help.patch
+Patch3:         %{name}-openal.patch
+Patch4:         %{name}-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  wxGTK-devel
-BuildRequires:  openal-devel
-BuildRequires:  freealut-devel
-BuildRequires:  SDL_net-devel
-BuildRequires:  ImageMagick
-BuildRequires:  libGLU-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  expat-devel
-BuildRequires:  ode-devel
+BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
+BuildRequires:  expat-devel ImageMagick desktop-file-utils
+Requires:       hicolor-icon-theme
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -42,13 +35,12 @@
 
 %prep
 %setup -q -n scorched
-rm -r autom4te.cache `find . -name Makefile`
+rm -r `find . -name Makefile`
 rm -r src/zlib src/ode `find src/XML ! -name "X*"`
-%patch1 -p1
-%patch2 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1 -p1 -z .syslibs
+%patch2 -p1 -z .wx26
+%patch3 -p1 -z .openal
+%patch4 -p1 -z .help
 # make rpmlint happy with debuginfo package
 chmod -x src/GLEXT/*
 # stop autoxxx from running
@@ -58,29 +50,27 @@
 
 
 %build
-%configure \
-  --disable-dependency-tracking \
-  --datadir=%{_datadir}/games/%{name} \
-  --with-docdir=$RPM_DOC_DIR/%{name}-%{version}
+%configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \
+  --with-docdir=%{_docdir}/%{name}-%{version}
 # LDFLAGS=-lode for use of system ode
 make %{?_smp_mflags} LDFLAGS=-lode
-convert data/windows/tank2.ico tank2.png
+convert data/windows/tank2.ico %{name}.png
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html .
 
-desktop-file-install \
-  --vendor fedora \
+# 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 \
-  --mode 644 \
-  --add-category X-Fedora \
+  --add-category X-Fedora                       \
   %{SOURCE1}
-install -Dpm 644 tank2.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png
-
-mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+install -p -m 644 %{name}.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
 
 %clean
@@ -88,22 +78,34 @@
 
 
 %post
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+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
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+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 TODO __docs/*
-%{_bindir}/scorched3d
-%{_datadir}/games/scorched3d/
-%{_datadir}/applications/*scorched3d.desktop
-%{_datadir}/icons/hicolor/*/apps/scorched3d.png
+%doc AUTHORS COPYING TODO html
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Tue Aug 29 2006 Hans de Goede  40.1c-1
+- New upstream release 40.1c
+- Drop 64 bit patch (integrated upstream)
+- Don't install our data files in /usr/share/games, but in /usr/share
+- Some minor specfile cleanups
+
 * Tue Aug 29 2006 Hans de Goede  40-2
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jul 2006 19:11:25 -0000	1.4
+++ sources	2 Nov 2006 20:48:36 -0000	1.5
@@ -1 +1 @@
-76b60b9f73d2c971d86bfac761989cf4  Scorched3D-40-src.tar.gz
+a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz


--- scorched3d-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 21:14:58 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:14:58 -0700
Subject: rpms/autogen import.log,1.5,1.6
Message-ID: <200611022114.kA2LEwQt032738@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32707

Modified Files:
	import.log 
Log Message:
auto-import autogen-5.8.7-3 on branch FC-5 from autogen-5.8.7-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/autogen/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	21 Oct 2006 11:15:59 -0000	1.5
+++ import.log	2 Nov 2006 21:14:28 -0000	1.6
@@ -2,3 +2,4 @@
 autogen-5_8_5-7:FC-5:autogen-5.8.5-7.src.rpm:1157924662
 autogen-5_8_7-1:HEAD:autogen-5.8.7-1.src.rpm:1161429254
 autogen-5_8_7-1:FC-5:autogen-5.8.7-1.src.rpm:1161429346
+autogen-5_8_7-3:FC-5:autogen-5.8.7-3.src.rpm:1162502055



From fedora-extras-commits at redhat.com  Thu Nov  2 21:14:59 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:14:59 -0700
Subject: rpms/autogen/FC-5 autogen.spec,1.4,1.5
Message-ID: <200611022114.kA2LExLE032741@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32707/FC-5

Modified Files:
	autogen.spec 
Log Message:
auto-import autogen-5.8.7-3 on branch FC-5 from autogen-5.8.7-3.src.rpm


Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-5/autogen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- autogen.spec	23 Oct 2006 21:28:47 -0000	1.4
+++ autogen.spec	2 Nov 2006 21:14:29 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -13,6 +13,9 @@
 Requires(preun): /sbin/install-info %{_sbindir}/alternatives
 Requires(post): /sbin/install-info %{_sbindir}/alternatives
 
+Obsoletes: libopts-devel
+Obsoletes: libopts
+
 %description
 AutoGen is a tool designed to simplify the creation and maintenance of 
 programes that contain large amounts of repetitious text. It is especially
@@ -32,9 +35,10 @@
 chmod 0644 COPYING
 
 %build
-%configure --disable-autoopts
+%configure
 #find -name Makefile -exec sed -i -e 's/-Werror//' {} \;
-make LIBTOOL=%{_bindir}/libtool
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
+
 # no smp flags as it falls over during build
 
 %install
@@ -47,9 +51,7 @@
 mv %{buildroot}/%{_bindir}/columns %{buildroot}/%{_bindir}/columns.autogen
 mv %{buildroot}/%{_bindir}/getdefs %{buildroot}/%{_bindir}/getdefs.autogen
 mkdir -p %{buildroot}/%{_sysconfdir}/alternatives
-rm -f %{buildroot}/%{_datadir}/autogen/libopts-27.4.2.tar.gz
-rm -f %{buildroot}/%{_libdir}/libopts*
-rm -f %{buildroot}/%{_datadir}/aclocal/liboptschk.m4
+rm -f %{buildroot}/%{_datadir}/autogen/libopts*.tar.gz
 
 %check
 make check
@@ -106,20 +108,25 @@
 %{_infodir}/autogen.info*
 %{_bindir}/xml2ag
 %{_libdir}/libguileopts.so.0*
+%{_libdir}/libopts.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_datadir}/aclocal/autoopts.m4
+%{_datadir}/aclocal/liboptschk.m4
 %{_libdir}/pkgconfig/autoopts.pc
 %exclude %{_mandir}/man3/*
 %{_mandir}/man1/autoopts-config*
 %exclude %{_includedir}/autoopts/
 %{_bindir}/autoopts-config
 %{_libdir}/libguileopts.so
+%{_libdir}/libopts.so
+%{_includedir}/autoopts
 
 %changelog
-* Mon Oct 23 2006 Paul F. Johnson  5.8.7-2
-- rebuild for newer libopts
+* Thu Nov 02 2006 Paul F. Johnson  5.8.7-3
+- obsoletes libopts
+- now links to it's own version of libopts shipped with the tarball
 
 * Fri Oct 21 2006 Paul F. Johnson  5.8.7-1
 - bump to new version



From fedora-extras-commits at redhat.com  Thu Nov  2 21:16:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:16:33 -0700
Subject: rpms/autogen/FC-6 autogen.spec,1.4,1.5
Message-ID: <200611022116.kA2LGXGc000370@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv335/FC-6

Modified Files:
	autogen.spec 
Log Message:
auto-import autogen-5.8.7-3 on branch FC-6 from autogen-5.8.7-3.src.rpm


Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/FC-6/autogen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- autogen.spec	25 Oct 2006 06:36:24 -0000	1.4
+++ autogen.spec	2 Nov 2006 21:16:03 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -13,6 +13,9 @@
 Requires(preun): /sbin/install-info %{_sbindir}/alternatives
 Requires(post): /sbin/install-info %{_sbindir}/alternatives
 
+Obsoletes: libopts-devel
+Obsoletes: libopts
+
 %description
 AutoGen is a tool designed to simplify the creation and maintenance of 
 programes that contain large amounts of repetitious text. It is especially
@@ -32,9 +35,10 @@
 chmod 0644 COPYING
 
 %build
-%configure --disable-autoopts
+%configure
 #find -name Makefile -exec sed -i -e 's/-Werror//' {} \;
-make LIBTOOL=%{_bindir}/libtool
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
+
 # no smp flags as it falls over during build
 
 %install
@@ -47,9 +51,7 @@
 mv %{buildroot}/%{_bindir}/columns %{buildroot}/%{_bindir}/columns.autogen
 mv %{buildroot}/%{_bindir}/getdefs %{buildroot}/%{_bindir}/getdefs.autogen
 mkdir -p %{buildroot}/%{_sysconfdir}/alternatives
-rm -f %{buildroot}/%{_datadir}/autogen/libopts-27.4.2.tar.gz
-rm -f %{buildroot}/%{_libdir}/libopts*
-rm -f %{buildroot}/%{_datadir}/aclocal/liboptschk.m4
+rm -f %{buildroot}/%{_datadir}/autogen/libopts*.tar.gz
 
 %check
 make check
@@ -106,20 +108,25 @@
 %{_infodir}/autogen.info*
 %{_bindir}/xml2ag
 %{_libdir}/libguileopts.so.0*
+%{_libdir}/libopts.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_datadir}/aclocal/autoopts.m4
+%{_datadir}/aclocal/liboptschk.m4
 %{_libdir}/pkgconfig/autoopts.pc
 %exclude %{_mandir}/man3/*
 %{_mandir}/man1/autoopts-config*
 %exclude %{_includedir}/autoopts/
 %{_bindir}/autoopts-config
 %{_libdir}/libguileopts.so
+%{_libdir}/libopts.so
+%{_includedir}/autoopts
 
 %changelog
-* Wed Oct 25 2006 Paul F. Johnson  5.8.7-2
-- rebuild
+* Thu Nov 02 2006 Paul F. Johnson  5.8.7-3
+- obsoletes libopts
+- now links to it's own version of libopts shipped with the tarball
 
 * Fri Oct 21 2006 Paul F. Johnson  5.8.7-1
 - bump to new version



From fedora-extras-commits at redhat.com  Thu Nov  2 21:16:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:16:32 -0700
Subject: rpms/autogen import.log,1.6,1.7
Message-ID: <200611022116.kA2LGWrv000367@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv335

Modified Files:
	import.log 
Log Message:
auto-import autogen-5.8.7-3 on branch FC-6 from autogen-5.8.7-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/autogen/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	2 Nov 2006 21:14:28 -0000	1.6
+++ import.log	2 Nov 2006 21:16:02 -0000	1.7
@@ -3,3 +3,4 @@
 autogen-5_8_7-1:HEAD:autogen-5.8.7-1.src.rpm:1161429254
 autogen-5_8_7-1:FC-5:autogen-5.8.7-1.src.rpm:1161429346
 autogen-5_8_7-3:FC-5:autogen-5.8.7-3.src.rpm:1162502055
+autogen-5_8_7-3:FC-6:autogen-5.8.7-3.src.rpm:1162502151



From fedora-extras-commits at redhat.com  Thu Nov  2 21:18:22 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:18:22 -0700
Subject: rpms/autogen import.log,1.7,1.8
Message-ID: <200611022118.kA2LIM1p000463@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv432

Modified Files:
	import.log 
Log Message:
auto-import autogen-5.8.7-3 on branch devel from autogen-5.8.7-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/autogen/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	2 Nov 2006 21:16:02 -0000	1.7
+++ import.log	2 Nov 2006 21:17:51 -0000	1.8
@@ -4,3 +4,4 @@
 autogen-5_8_7-1:FC-5:autogen-5.8.7-1.src.rpm:1161429346
 autogen-5_8_7-3:FC-5:autogen-5.8.7-3.src.rpm:1162502055
 autogen-5_8_7-3:FC-6:autogen-5.8.7-3.src.rpm:1162502151
+autogen-5_8_7-3:HEAD:autogen-5.8.7-3.src.rpm:1162502259



From fedora-extras-commits at redhat.com  Thu Nov  2 21:18:22 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:18:22 -0700
Subject: rpms/autogen/devel autogen.spec,1.4,1.5
Message-ID: <200611022118.kA2LIMwt000466@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/autogen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv432/devel

Modified Files:
	autogen.spec 
Log Message:
auto-import autogen-5.8.7-3 on branch devel from autogen-5.8.7-3.src.rpm


Index: autogen.spec
===================================================================
RCS file: /cvs/extras/rpms/autogen/devel/autogen.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- autogen.spec	25 Oct 2006 20:46:49 -0000	1.4
+++ autogen.spec	2 Nov 2006 21:17:52 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Sourcecode autogenerator
 Name: autogen
 Version: 5.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@@ -13,6 +13,9 @@
 Requires(preun): /sbin/install-info %{_sbindir}/alternatives
 Requires(post): /sbin/install-info %{_sbindir}/alternatives
 
+Obsoletes: libopts-devel
+Obsoletes: libopts
+
 %description
 AutoGen is a tool designed to simplify the creation and maintenance of 
 programes that contain large amounts of repetitious text. It is especially
@@ -32,9 +35,10 @@
 chmod 0644 COPYING
 
 %build
-%configure --disable-autoopts
+%configure
 #find -name Makefile -exec sed -i -e 's/-Werror//' {} \;
-make LIBTOOL=%{_bindir}/libtool
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
+
 # no smp flags as it falls over during build
 
 %install
@@ -47,9 +51,7 @@
 mv %{buildroot}/%{_bindir}/columns %{buildroot}/%{_bindir}/columns.autogen
 mv %{buildroot}/%{_bindir}/getdefs %{buildroot}/%{_bindir}/getdefs.autogen
 mkdir -p %{buildroot}/%{_sysconfdir}/alternatives
-rm -f %{buildroot}/%{_datadir}/autogen/libopts-27.4.2.tar.gz
-rm -f %{buildroot}/%{_libdir}/libopts*
-rm -f %{buildroot}/%{_datadir}/aclocal/liboptschk.m4
+rm -f %{buildroot}/%{_datadir}/autogen/libopts*.tar.gz
 
 %check
 make check
@@ -106,20 +108,25 @@
 %{_infodir}/autogen.info*
 %{_bindir}/xml2ag
 %{_libdir}/libguileopts.so.0*
+%{_libdir}/libopts.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_datadir}/aclocal/autoopts.m4
+%{_datadir}/aclocal/liboptschk.m4
 %{_libdir}/pkgconfig/autoopts.pc
 %exclude %{_mandir}/man3/*
 %{_mandir}/man1/autoopts-config*
 %exclude %{_includedir}/autoopts/
 %{_bindir}/autoopts-config
 %{_libdir}/libguileopts.so
+%{_libdir}/libopts.so
+%{_includedir}/autoopts
 
 %changelog
-* Wed Oct 25 2006 Paul F. Johnson  5.8.7-2
-- rebuild
+* Thu Nov 02 2006 Paul F. Johnson  5.8.7-3
+- obsoletes libopts
+- now links to it's own version of libopts shipped with the tarball
 
 * Fri Oct 21 2006 Paul F. Johnson  5.8.7-1
 - bump to new version



From fedora-extras-commits at redhat.com  Thu Nov  2 21:21:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:21:40 -0700
Subject: rpms/libopts Makefile,1.1,NONE import.log,1.9,NONE
Message-ID: <200611022121.kA2LLe1Y000546@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538/libopts

Removed Files:
	Makefile import.log 
Log Message:

Removing package - now part of autogen 
 	libopts/Makefile libopts/import.log libopts/FC-5/Makefile 
 	libopts/FC-5/branch libopts/FC-5/libopts.spec 
 	libopts/FC-5/sources libopts/FC-6/Makefile libopts/FC-6/branch 
 	libopts/FC-6/libopts.spec libopts/FC-6/sources 
 	libopts/devel/Makefile libopts/devel/libopts.spec 
 	libopts/devel/sources 



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 21:21:46 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:21:46 -0700
Subject: rpms/libopts/FC-5 Makefile, 1.1, NONE branch, 1.1, NONE libopts.spec,
	1.5, NONE sources, 1.3, NONE
Message-ID: <200611022121.kA2LLkLw000560@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538/libopts/FC-5

Removed Files:
	Makefile branch libopts.spec sources 
Log Message:

Removing package - now part of autogen 
 	libopts/Makefile libopts/import.log libopts/FC-5/Makefile 
 	libopts/FC-5/branch libopts/FC-5/libopts.spec 
 	libopts/FC-5/sources libopts/FC-6/Makefile libopts/FC-6/branch 
 	libopts/FC-6/libopts.spec libopts/FC-6/sources 
 	libopts/devel/Makefile libopts/devel/libopts.spec 
 	libopts/devel/sources 



--- Makefile DELETED ---


--- branch DELETED ---


--- libopts.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 21:21:51 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:21:51 -0700
Subject: rpms/libopts/FC-6 Makefile, 1.1, NONE branch, 1.1, NONE libopts.spec,
	1.6, NONE sources, 1.3, NONE
Message-ID: <200611022121.kA2LLpUm000574@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538/libopts/FC-6

Removed Files:
	Makefile branch libopts.spec sources 
Log Message:

Removing package - now part of autogen 
 	libopts/Makefile libopts/import.log libopts/FC-5/Makefile 
 	libopts/FC-5/branch libopts/FC-5/libopts.spec 
 	libopts/FC-5/sources libopts/FC-6/Makefile libopts/FC-6/branch 
 	libopts/FC-6/libopts.spec libopts/FC-6/sources 
 	libopts/devel/Makefile libopts/devel/libopts.spec 
 	libopts/devel/sources 



--- Makefile DELETED ---


--- branch DELETED ---


--- libopts.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 21:21:57 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:21:57 -0700
Subject: rpms/libopts/devel Makefile, 1.1, NONE libopts.spec, 1.6,
	NONE sources, 1.3, NONE
Message-ID: <200611022121.kA2LLvkh000588@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libopts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538/libopts/devel

Removed Files:
	Makefile libopts.spec sources 
Log Message:

Removing package - now part of autogen 
 	libopts/Makefile libopts/import.log libopts/FC-5/Makefile 
 	libopts/FC-5/branch libopts/FC-5/libopts.spec 
 	libopts/FC-5/sources libopts/FC-6/Makefile libopts/FC-6/branch 
 	libopts/FC-6/libopts.spec libopts/FC-6/sources 
 	libopts/devel/Makefile libopts/devel/libopts.spec 
 	libopts/devel/sources 



--- Makefile DELETED ---


--- libopts.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 21:25:07 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:25:07 -0700
Subject: rpms/gdeskcal/FC-5 gdeskcal.spec,1.11,1.12
Message-ID: <200611022125.kA2LP7E2000740@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv724

Modified Files:
	gdeskcal.spec 
Log Message:

Added BR pygtk2-devel 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdeskcal.spec	1 Nov 2006 22:49:00 -0000	1.11
+++ gdeskcal.spec	2 Nov 2006 21:24:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, perl(XML::Parser)
+BuildRequires:  desktop-file-utils, pygtk2-devel
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -62,6 +62,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Nov 02 2006 Paul F. Johnson  1.0-6
+- a couple of small fixes
+
 * Wed Nov 01 2006 Paul F. Johnson  1.0-4
 - added post and postun
 - conditional for the X-Fedora in the desktop icon



From fedora-extras-commits at redhat.com  Thu Nov  2 21:26:26 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:26:26 -0700
Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.14,1.15
Message-ID: <200611022126.kA2LQQQn000804@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv788

Modified Files:
	gdeskcal.spec 
Log Message:

Added BR pygtk2-devel 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gdeskcal.spec	1 Nov 2006 22:50:44 -0000	1.14
+++ gdeskcal.spec	2 Nov 2006 21:25:56 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, perl(XML::Parser)
+BuildRequires:  desktop-file-utils, pygtk2-devel
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -62,6 +62,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Nov 02 2006 Paul F. Johnson  1.0-6
+- a couple of small fixes
+
 * Wed Nov 01 2006 Paul F. Johnson  1.0-4
 - added post and postun
 - conditional for the X-Fedora in the desktop icon



From fedora-extras-commits at redhat.com  Thu Nov  2 21:27:53 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:27:53 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.14,1.15
Message-ID: <200611022127.kA2LRr0m000864@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv848

Modified Files:
	gdeskcal.spec 
Log Message:

Added BR: pygtk2-devel 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gdeskcal.spec	1 Nov 2006 22:53:10 -0000	1.14
+++ gdeskcal.spec	2 Nov 2006 21:27:23 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, perl(XML::Parser)
+BuildRequires:  desktop-file-utils, pygtk2-devel
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -62,8 +62,8 @@
 %{_libdir}/%{name}/
 
 %changelog
-* Wed Nov 01 2006 Paul F. Johnson  1.0-5
-- added BR perl(xml-parser)
+* Thu Nov 02 2006 Paul F. Johnson  1.0-6
+- a couple of small fixes
 
 * Wed Nov 01 2006 Paul F. Johnson  1.0-4
 - added post and postun



From fedora-extras-commits at redhat.com  Thu Nov  2 21:31:00 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:31:00 -0700
Subject: owners owners.list,1.1884,1.1885
Message-ID: <200611022131.kA2LV0eb000936@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv908

Modified Files:
	owners.list 
Log Message:

Removed libopts - it is now part of autogen. Having the separate libopts was causing a big problem with autogen 
 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1884
retrieving revision 1.1885
diff -u -r1.1884 -r1.1885
--- owners.list	2 Nov 2006 17:21:58 -0000	1.1884
+++ owners.list	2 Nov 2006 21:30:30 -0000	1.1885
@@ -927,7 +927,6 @@
 Fedora Extras|libopensync-plugin-kdepim|KDE plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libopensync-plugin-palm|Palm plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libopensync-plugin-python|Python plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|libopts|Options library for autogen|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libosip|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|libosip2|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xelerance.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  2 21:37:38 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:37:38 -0700
Subject: rpms/gdeskcal/FC-5 gdeskcal.spec,1.12,1.13
Message-ID: <200611022137.kA2LbcIa001171@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1095

Modified Files:
	gdeskcal.spec 
Log Message:

ARGH! perl(xml::parser) vanished somewhere! 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdeskcal.spec	2 Nov 2006 21:24:37 -0000	1.12
+++ gdeskcal.spec	2 Nov 2006 21:37:08 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, pygtk2-devel
+BuildRequires:  desktop-file-utils, pygtk2-devel, perl(XML::Parser)
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -62,6 +62,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Nov 02 2006 Paul F. Johnson  1.0.7
+- added BR perl(xml::parser) - it was there in -5 but vanished!
+
 * Thu Nov 02 2006 Paul F. Johnson  1.0-6
 - a couple of small fixes
 



From fedora-extras-commits at redhat.com  Thu Nov  2 21:39:29 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:39:29 -0700
Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.15,1.16
Message-ID: <200611022139.kA2LdTKR001265@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1247

Modified Files:
	gdeskcal.spec 
Log Message:

ARGH! Somehow, perl(xml::parser) vanished! 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gdeskcal.spec	2 Nov 2006 21:25:56 -0000	1.15
+++ gdeskcal.spec	2 Nov 2006 21:38:58 -0000	1.16
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, pygtk2-devel
+BuildRequires:  desktop-file-utils, pygtk2-devel, perl(XML::Parser)
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 



From fedora-extras-commits at redhat.com  Thu Nov  2 21:41:11 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:41:11 -0700
Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.16,1.17
Message-ID: <200611022141.kA2LfBeQ001326@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1308

Modified Files:
	gdeskcal.spec 
Log Message:

 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gdeskcal.spec	2 Nov 2006 21:38:58 -0000	1.16
+++ gdeskcal.spec	2 Nov 2006 21:40:41 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -62,6 +62,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Nov 02 2006 Paul F. Johnson  1.0-7
+- added perl(xml::parser)
+
 * Thu Nov 02 2006 Paul F. Johnson  1.0-6
 - a couple of small fixes
 



From fedora-extras-commits at redhat.com  Thu Nov  2 21:43:24 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 2 Nov 2006 14:43:24 -0700
Subject: comps comps-fe6.xml.in,1.209,1.210 comps-fe7.xml.in,1.7,1.8
Message-ID: <200611022143.kA2LhOut001411@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1391

Modified Files:
	comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
added gcl


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- comps-fe6.xml.in	2 Nov 2006 18:48:16 -0000	1.209
+++ comps-fe6.xml.in	2 Nov 2006 21:42:54 -0000	1.210
@@ -143,6 +143,7 @@
       fpc
       ftnchek
       gauche
+      gcl
       gforth
       ghc
       git


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comps-fe7.xml.in	2 Nov 2006 18:48:16 -0000	1.7
+++ comps-fe7.xml.in	2 Nov 2006 21:42:54 -0000	1.8
@@ -143,6 +143,7 @@
       fpc
       ftnchek
       gauche
+      gcl
       gforth
       ghc
       git



From fedora-extras-commits at redhat.com  Thu Nov  2 21:44:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 2 Nov 2006 14:44:28 -0700
Subject: comps comps-fe5.xml.in,1.185,1.186
Message-ID: <200611022144.kA2LiS7i001455@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1421

Modified Files:
	comps-fe5.xml.in 
Log Message:
added gcl


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- comps-fe5.xml.in	2 Nov 2006 18:48:16 -0000	1.185
+++ comps-fe5.xml.in	2 Nov 2006 21:43:58 -0000	1.186
@@ -121,6 +121,7 @@
       fpc
       ftnchek
       gauche
+      gcl
       gforth
       ghc
       git



From fedora-extras-commits at redhat.com  Thu Nov  2 21:44:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 14:44:33 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.15,1.16
Message-ID: <200611022144.kA2LiXwm001458@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1417

Modified Files:
	gdeskcal.spec 
Log Message:

Somewhere, perl(xml::parser) did vanish. It's now back 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gdeskcal.spec	2 Nov 2006 21:27:23 -0000	1.15
+++ gdeskcal.spec	2 Nov 2006 21:44:03 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, pygtk2-devel
+BuildRequires:  desktop-file-utils, pygtk2-devel, perl(XML::Parser)
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -62,6 +62,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Nov 02 2006 Paul F. Johnson  1.0-7
+- added perl(xml::parser)
+
 * Thu Nov 02 2006 Paul F. Johnson  1.0-6
 - a couple of small fixes
 



From fedora-extras-commits at redhat.com  Thu Nov  2 21:47:27 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 2 Nov 2006 14:47:27 -0700
Subject: comps comps-fe5.xml.in, 1.186, 1.187 comps-fe6.xml.in, 1.210,
	1.211 comps-fe7.xml.in, 1.8, 1.9
Message-ID: <200611022147.kA2LlRTG001537@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1517

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
added abcm2ps


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- comps-fe5.xml.in	2 Nov 2006 21:43:58 -0000	1.186
+++ comps-fe5.xml.in	2 Nov 2006 21:46:57 -0000	1.187
@@ -46,6 +46,7 @@
     false
     true
     
+      abcm2ps
       BibTool
       conglomerate
       docbook2X


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- comps-fe6.xml.in	2 Nov 2006 21:42:54 -0000	1.210
+++ comps-fe6.xml.in	2 Nov 2006 21:46:57 -0000	1.211
@@ -46,6 +46,7 @@
     false
     true
     
+      abcm2ps
       BibTool
       conglomerate
       docbook2X


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- comps-fe7.xml.in	2 Nov 2006 21:42:54 -0000	1.8
+++ comps-fe7.xml.in	2 Nov 2006 21:46:57 -0000	1.9
@@ -46,6 +46,7 @@
     false
     true
     
+      abcm2ps
       BibTool
       conglomerate
       docbook2X



From fedora-extras-commits at redhat.com  Thu Nov  2 21:49:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 2 Nov 2006 14:49:48 -0700
Subject: comps comps-fe5.xml.in, 1.187, 1.188 comps-fe6.xml.in, 1.211,
	1.212 comps-fe7.xml.in, 1.9, 1.10
Message-ID: <200611022149.kA2Lnm1R001571@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1549

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
added ecl


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- comps-fe5.xml.in	2 Nov 2006 21:46:57 -0000	1.187
+++ comps-fe5.xml.in	2 Nov 2006 21:49:18 -0000	1.188
@@ -116,6 +116,7 @@
       cvsps
       cvsweb
       darcs
+      ecl
       epydoc
       erlang
       flasm


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- comps-fe6.xml.in	2 Nov 2006 21:46:57 -0000	1.211
+++ comps-fe6.xml.in	2 Nov 2006 21:49:18 -0000	1.212
@@ -138,6 +138,7 @@
       cvsps
       cvsweb
       darcs
+      ecl
       epydoc
       erlang
       flasm


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- comps-fe7.xml.in	2 Nov 2006 21:46:57 -0000	1.9
+++ comps-fe7.xml.in	2 Nov 2006 21:49:18 -0000	1.10
@@ -137,7 +137,8 @@
       cvsgraph
       cvsps
       cvsweb
-      darcs
+      ecl
+      gcl
       epydoc
       erlang
       flasm



From fedora-extras-commits at redhat.com  Thu Nov  2 21:52:58 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 2 Nov 2006 14:52:58 -0700
Subject: comps comps-fe5.xml.in, 1.188, 1.189 comps-fe6.xml.in, 1.212,
	1.213 comps-fe7.xml.in, 1.10, 1.11
Message-ID: <200611022152.kA2LqwMj001613@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1593

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
added scons


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- comps-fe5.xml.in	2 Nov 2006 21:49:18 -0000	1.188
+++ comps-fe5.xml.in	2 Nov 2006 21:52:28 -0000	1.189
@@ -157,6 +157,7 @@
       rpmdevtools
       rpmlint
       smarteiffel
+      scons
       splint
       srecord
       sunifdef


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- comps-fe6.xml.in	2 Nov 2006 21:49:18 -0000	1.212
+++ comps-fe6.xml.in	2 Nov 2006 21:52:28 -0000	1.213
@@ -186,6 +186,7 @@
       regexxer
       rpmdevtools
       rpmlint
+      scons
       smarteiffel
       splint
       Sprog


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- comps-fe7.xml.in	2 Nov 2006 21:49:18 -0000	1.10
+++ comps-fe7.xml.in	2 Nov 2006 21:52:28 -0000	1.11
@@ -186,6 +186,7 @@
       regexxer
       rpmdevtools
       rpmlint
+      scons
       smarteiffel
       splint
       Sprog



From fedora-extras-commits at redhat.com  Thu Nov  2 22:04:54 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 2 Nov 2006 15:04:54 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.16,1.17
Message-ID: <200611022204.kA2M4smJ004753@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4706

Modified Files:
	gdeskcal.spec 
Log Message:

Removed smp_mflags as it's annoying the RH buildsys 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gdeskcal.spec	2 Nov 2006 21:44:03 -0000	1.16
+++ gdeskcal.spec	2 Nov 2006 22:04:24 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -27,7 +27,8 @@
 
 %build
 %configure
-make %{?_smp_mflags}
+make 
+# no multi build as it's annoying the buildsys
 
 %install
 rm -rf %{buildroot}
@@ -62,6 +63,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* 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  Thu Nov  2 22:05:21 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Thu, 2 Nov 2006 15:05:21 -0700
Subject: rpms/mantis/devel .cvsignore, 1.4, 1.5 mantis.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <200611022205.kA2M5LRB004769@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4731

Modified Files:
	.cvsignore mantis.spec sources 
Log Message:
updated to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Oct 2006 11:50:35 -0000	1.4
+++ .cvsignore	2 Nov 2006 22:04:50 -0000	1.5
@@ -1 +1 @@
-mantis_1.0.5.tar.gz
+mantis-1.0.6.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mantis.spec	10 Oct 2006 11:50:35 -0000	1.12
+++ mantis.spec	2 Nov 2006 22:04:50 -0000	1.13
@@ -6,13 +6,13 @@
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	1.0.5
+Version:	1.0.6
 Release:	1%{dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.mantisbugtracker.com/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-1.0.0rc2-noadmin.patch
@@ -48,7 +48,7 @@
 
 
 %prep
-%setup -q -n %{name}_%{version}
+%setup -q
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Gianluca Sforna  - 1.0.6-1
+- updated to 1.0.6
+
 * Tue Oct 10 2006 Gianluca Sforna  - 1.0.5-1
 - updated to 1.0.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Oct 2006 11:50:35 -0000	1.9
+++ sources	2 Nov 2006 22:04:50 -0000	1.10
@@ -1 +1 @@
-01c5fb87e5ac161a681471573711bcf6  mantis_1.0.5.tar.gz
+64af171288bad777d6a1bba493e4a88b  mantis-1.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 22:21:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 2 Nov 2006 15:21:03 -0700
Subject: rpms/rxvt-unicode/FC-5 .cvsignore, 1.19, 1.20 rxvt-unicode.spec,
	1.26, 1.27 sources, 1.19, 1.20
Message-ID: <200611022221.kA2ML3tR005176@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/FC-5

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	8 Aug 2006 10:16:51 -0000	1.19
+++ .cvsignore	2 Nov 2006 22:20:33 -0000	1.20
@@ -1 +1 @@
-rxvt-unicode-7.9.tar.bz2
+rxvt-unicode-8.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-5/rxvt-unicode.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rxvt-unicode.spec	8 Aug 2006 10:16:51 -0000	1.26
+++ rxvt-unicode.spec	2 Nov 2006 22:20:33 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.9
+Version:        8.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -73,6 +73,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Nov 02 2006 Andreas Bierfert 
+8.0-1
+- version upgrade
+
 * Tue Aug 08 2006 Andreas Bierfert 
 7.9-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Aug 2006 10:16:51 -0000	1.19
+++ sources	2 Nov 2006 22:20:33 -0000	1.20
@@ -1 +1 @@
-7a0c73ccf0e31808ad37b61e730cd10e  rxvt-unicode-7.9.tar.bz2
+e349f3d2bc8f4dfdf052cf63b4baa065  rxvt-unicode-8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 22:21:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 2 Nov 2006 15:21:01 -0700
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.18, 1.19 rxvt-unicode.spec,
	1.21, 1.22 sources, 1.18, 1.19
Message-ID: <200611022221.kA2ML1qv005166@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	18 Jul 2006 09:38:30 -0000	1.18
+++ .cvsignore	2 Nov 2006 22:20:31 -0000	1.19
@@ -1 +1 @@
-rxvt-unicode-7.8.tar.bz2
+rxvt-unicode-8.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rxvt-unicode.spec	18 Jul 2006 09:38:30 -0000	1.21
+++ rxvt-unicode.spec	2 Nov 2006 22:20:31 -0000	1.22
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.8
+Version:        8.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -68,6 +68,14 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Nov 02 2006 Andreas Bierfert 
+8.0-1
+- version upgrade
+
+* Tue Aug 08 2006 Andreas Bierfert 
+7.9-1
+- version upgrade
+
 * Tue Jul 18 2006 Andreas Bierfert 
 7.8-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	18 Jul 2006 09:38:30 -0000	1.18
+++ sources	2 Nov 2006 22:20:31 -0000	1.19
@@ -1 +1 @@
-8bb2746eaa814f90d795534d67d9198a  rxvt-unicode-7.8.tar.bz2
+e349f3d2bc8f4dfdf052cf63b4baa065  rxvt-unicode-8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 22:21:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 2 Nov 2006 15:21:02 -0700
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.19, 1.20 rxvt-unicode.spec,
	1.22, 1.23 sources, 1.19, 1.20
Message-ID: <200611022221.kA2ML2QM005171@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	8 Aug 2006 10:16:51 -0000	1.19
+++ .cvsignore	2 Nov 2006 22:20:32 -0000	1.20
@@ -1 +1 @@
-rxvt-unicode-7.9.tar.bz2
+rxvt-unicode-8.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rxvt-unicode.spec	8 Aug 2006 10:16:51 -0000	1.22
+++ rxvt-unicode.spec	2 Nov 2006 22:20:32 -0000	1.23
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.9
+Version:        8.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -68,6 +68,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Nov 02 2006 Andreas Bierfert 
+8.0-1
+- version upgrade
+
 * Tue Aug 08 2006 Andreas Bierfert 
 7.9-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Aug 2006 10:16:51 -0000	1.19
+++ sources	2 Nov 2006 22:20:32 -0000	1.20
@@ -1 +1 @@
-7a0c73ccf0e31808ad37b61e730cd10e  rxvt-unicode-7.9.tar.bz2
+e349f3d2bc8f4dfdf052cf63b4baa065  rxvt-unicode-8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 22:21:04 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 2 Nov 2006 15:21:04 -0700
Subject: rpms/rxvt-unicode/FC-6 .cvsignore, 1.19, 1.20 rxvt-unicode.spec,
	1.27, 1.28 sources, 1.19, 1.20
Message-ID: <200611022221.kA2ML44T005181@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/FC-6

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-6/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	8 Aug 2006 10:16:52 -0000	1.19
+++ .cvsignore	2 Nov 2006 22:20:33 -0000	1.20
@@ -1 +1 @@
-rxvt-unicode-7.9.tar.bz2
+rxvt-unicode-8.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-6/rxvt-unicode.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rxvt-unicode.spec	15 Sep 2006 06:53:39 -0000	1.27
+++ rxvt-unicode.spec	2 Nov 2006 22:20:33 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
-Version:        7.9
-Release:        2%{?dist}
+Version:        8.0
+Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -73,6 +73,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Nov 02 2006 Andreas Bierfert 
+8.0-1
+- version upgrade
+
 * Fri Sep 15 2006 Andreas Bierfert 
 7.9-2
 - FE6 rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-6/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Aug 2006 10:16:52 -0000	1.19
+++ sources	2 Nov 2006 22:20:33 -0000	1.20
@@ -1 +1 @@
-7a0c73ccf0e31808ad37b61e730cd10e  rxvt-unicode-7.9.tar.bz2
+e349f3d2bc8f4dfdf052cf63b4baa065  rxvt-unicode-8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 22:21:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 2 Nov 2006 15:21:09 -0700
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.19, 1.20 rxvt-unicode.spec,
	1.27, 1.28 sources, 1.19, 1.20
Message-ID: <200611022221.kA2ML9Y6005186@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	8 Aug 2006 10:16:52 -0000	1.19
+++ .cvsignore	2 Nov 2006 22:20:39 -0000	1.20
@@ -1 +1 @@
-rxvt-unicode-7.9.tar.bz2
+rxvt-unicode-8.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rxvt-unicode.spec	15 Sep 2006 06:53:39 -0000	1.27
+++ rxvt-unicode.spec	2 Nov 2006 22:20:39 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
-Version:        7.9
-Release:        2%{?dist}
+Version:        8.0
+Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -73,6 +73,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Nov 02 2006 Andreas Bierfert 
+8.0-1
+- version upgrade
+
 * Fri Sep 15 2006 Andreas Bierfert 
 7.9-2
 - FE6 rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Aug 2006 10:16:52 -0000	1.19
+++ sources	2 Nov 2006 22:20:39 -0000	1.20
@@ -1 +1 @@
-7a0c73ccf0e31808ad37b61e730cd10e  rxvt-unicode-7.9.tar.bz2
+e349f3d2bc8f4dfdf052cf63b4baa065  rxvt-unicode-8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 22:25:11 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Thu, 2 Nov 2006 15:25:11 -0700
Subject: rpms/mantis/FC-6 .cvsignore, 1.4, 1.5 mantis.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <200611022225.kA2MPBmK005333@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4924

Modified Files:
	.cvsignore mantis.spec sources 
Log Message:
update to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Oct 2006 11:50:35 -0000	1.4
+++ .cvsignore	2 Nov 2006 22:24:41 -0000	1.5
@@ -1 +1 @@
-mantis_1.0.5.tar.gz
+mantis-1.0.6.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-6/mantis.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mantis.spec	10 Oct 2006 11:50:35 -0000	1.12
+++ mantis.spec	2 Nov 2006 22:24:41 -0000	1.13
@@ -6,13 +6,13 @@
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	1.0.5
+Version:	1.0.6
 Release:	1%{dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.mantisbugtracker.com/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-1.0.0rc2-noadmin.patch
@@ -48,7 +48,7 @@
 
 
 %prep
-%setup -q -n %{name}_%{version}
+%setup -q
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Gianluca Sforna  - 1.0.6-1
+- updated to 1.0.6
+
 * Tue Oct 10 2006 Gianluca Sforna  - 1.0.5-1
 - updated to 1.0.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Oct 2006 11:50:35 -0000	1.9
+++ sources	2 Nov 2006 22:24:41 -0000	1.10
@@ -1 +1 @@
-01c5fb87e5ac161a681471573711bcf6  mantis_1.0.5.tar.gz
+64af171288bad777d6a1bba493e4a88b  mantis-1.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 22:27:03 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Thu, 2 Nov 2006 15:27:03 -0700
Subject: rpms/amsn/devel .cvsignore, 1.2, 1.3 amsn.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200611022227.kA2MR3ro005452@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/amsn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5419

Modified Files:
	.cvsignore amsn.spec sources 
Log Message:
* Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
- updated to 0.96 final
- drop nolocate and locallibs patch because they were accepted upstream
- changed URL because they moved the website



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amsn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 19:00:48 -0000	1.2
+++ .cvsignore	2 Nov 2006 22:26:32 -0000	1.3
@@ -1 +1 @@
-amsn-0.96rc1.tar.bz2
+amsn-0.96.tar.bz2


Index: amsn.spec
===================================================================
RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amsn.spec	28 Aug 2006 10:34:46 -0000	1.4
+++ amsn.spec	2 Nov 2006 22:26:32 -0000	1.5
@@ -1,21 +1,17 @@
-%define alphatag rc1
-
 Name:           amsn
 Version:        0.96
-Release:        0.13.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://amsn.sourceforge.net/
-Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}%{alphatag}.tar.bz2
+URL:            http://www.amsn-project.net/
+Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
 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
-Patch1: amsn-0.96-configureac-nolocate.patch
-Patch2: amsn-0.96-tkcximage-locallibs.patch
-Patch3: amsn-0.96-system-bwidget.patch
+Patch1: amsn-0.96-system-bwidget.patch
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -33,17 +29,14 @@
 snapshots with your webcam to use as your display picture.
 
 %prep
-%setup -n %{name}-%{version}%{alphatag} -q
-%patch1 -p1 -b .1-nolocate
-%patch2 -p1 -b .2-locallibs
-%patch3 -p1 -b .3-system-bwidget
+%setup -q
+%patch1 -p1 -b .1-system-bwidget
 rm -r utils/TkCximage/src/{jpeg,png,zlib}
 rm -r utils/BWidget-1.7.0
 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in
 %{__sed} -i 's#mozilla#htmlview#' config.tcl
 %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
 %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "/usr/share/amsn/"#' amsn amsn-remote amsn-remote-CLI
-%{__sed} -i 's#"##' amsn.desktop
 autoconf
 
 %build
@@ -123,6 +116,11 @@
 
 
 %changelog
+* Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
+- updated to 0.96 final
+- drop nolocate and locallibs patch because they were accepted upstream
+- changed URL because they moved the website
+
 * Tue Aug 28 2006 Sander Hoentjen  - 0.96-0.13.rc1
 - Tag error, so bumping the release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amsn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 19:00:48 -0000	1.2
+++ sources	2 Nov 2006 22:26:32 -0000	1.3
@@ -1 +1 @@
-1b90fdbb0a51c7646f4d2e6b22f18711  amsn-0.96rc1.tar.bz2
+3df6b0d34ef1997a47c0b8af29b2547a  amsn-0.96.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  2 22:33:05 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Thu, 2 Nov 2006 15:33:05 -0700
Subject: rpms/mantis/FC-5 .cvsignore, 1.3, 1.4 mantis.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200611022233.kA2MX5vf005603@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/mantis/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5575

Modified Files:
	.cvsignore mantis.spec sources 
Log Message:
updated to 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Mar 2005 18:21:20 -0000	1.3
+++ .cvsignore	2 Nov 2006 22:32:35 -0000	1.4
@@ -1,2 +1 @@
-mantis-*.tar.gz
-mantis-*.*.rpm
+mantis-1.0.6.tar.gz


Index: mantis.spec
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/mantis.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mantis.spec	17 Oct 2006 09:21:59 -0000	1.13
+++ mantis.spec	2 Nov 2006 22:32:35 -0000	1.14
@@ -6,13 +6,13 @@
 
 Summary:	Web-based bugtracking system
 Name:		mantis
-Version:	1.0.5
-Release:	1%{dist}.1
+Version:	1.0.6
+Release:	1%{dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.mantisbugtracker.com/
 BuildArch:	noarch
-Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}_%{version}.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/mantisbt/%{name}-%{version}.tar.gz
 Patch0:		mantis-1.0.0a3-iis.patch
 Patch1:		mantis-0.19.2-noexamplecom.patch
 Patch2:		mantis-1.0.0rc2-noadmin.patch
@@ -48,7 +48,7 @@
 
 
 %prep
-%setup -q -n %{name}_%{version}
+%setup -q
 %patch0 -p1 -b .iis
 %patch1 -p1 -b .noexamplecom
 %patch2 -p1 -b .noadmin
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Thu Nov  2 2006 Gianluca Sforna  - 1.0.6-1
+- updated to 1.0.6
+
 * Tue Oct 17 2006 Gianluca Sforna  - 1.0.5-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mantis/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Oct 2006 09:59:10 -0000	1.9
+++ sources	2 Nov 2006 22:32:35 -0000	1.10
@@ -1 +1 @@
-01c5fb87e5ac161a681471573711bcf6  mantis_1.0.5.tar.gz
+64af171288bad777d6a1bba493e4a88b  mantis-1.0.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 22:34:18 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Thu, 2 Nov 2006 15:34:18 -0700
Subject: rpms/libipoddevice/devel .cvsignore, 1.3, 1.4 libipoddevice.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200611022234.kA2MYI1J005686@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/libipoddevice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5658

Modified Files:
	.cvsignore libipoddevice.spec sources 
Log Message:
* Thu Nov  2 2006 Christopher Aillon  0.5.1-1
- Update to 0.5.1
- BuildRequire: sg3_utils-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libipoddevice/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 May 2006 18:28:57 -0000	1.3
+++ .cvsignore	2 Nov 2006 22:33:48 -0000	1.4
@@ -1 +1 @@
-libipoddevice-0.4.5.tar.gz
+libipoddevice-0.5.1.tar.gz


Index: libipoddevice.spec
===================================================================
RCS file: /cvs/extras/rpms/libipoddevice/devel/libipoddevice.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libipoddevice.spec	1 Sep 2006 20:45:17 -0000	1.5
+++ libipoddevice.spec	2 Nov 2006 22:33:48 -0000	1.6
@@ -2,8 +2,8 @@
 %define hal_ver 0.5.2
 
 Name:    libipoddevice
-Version: 0.4.5
-Release: 3%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
 Summary: Device-specific layer for the Apple iPod
 
 Group:   Development/Libraries
@@ -16,6 +16,7 @@
 BuildRequires: hal-devel >= %{hal_ver}
 BuildRequires: libgtop2-devel >= %{libgtop_ver}
 BuildRequires: udev
+BuildRequires: sg3_utils-devel
 
 %description
 libipoddevice is a device-specific layer for the Apple iPod
@@ -57,6 +58,8 @@
 %doc COPYING
 %{_bindir}/ipod
 %{_libdir}/libipoddevice.so.*
+%{_libdir}/hal/hal-ipod-info
+%{_datadir}/hal/fdi/policy/20thirdparty/20-ipod-info.fdi
 
 %files devel
 %{_libdir}/libipoddevice.so
@@ -68,6 +71,10 @@
 
 
 %changelog
+* Thu Nov  2 2006 Christopher Aillon  0.5.1-1
+- Update to 0.5.1
+- BuildRequire: sg3_utils-devel
+
 * Fri Sep  1 2006 Christopher Aillon  0.4.5-3
 - Rebuild against newer toolchain
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libipoddevice/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 May 2006 18:28:57 -0000	1.3
+++ sources	2 Nov 2006 22:33:48 -0000	1.4
@@ -1 +1 @@
-aac402761cf2eca2b16d14acf81dd2b3  libipoddevice-0.4.5.tar.gz
+548806535b1f6eb260e7729030a7ea30  libipoddevice-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  2 22:41:55 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Thu, 2 Nov 2006 15:41:55 -0700
Subject: rpms/amsn/FC-6 .cvsignore, 1.2, 1.3 amsn.spec, 1.4, 1.5 sources, 1.2,
	1.3 amsn-0.96-configureac-nolocate.patch, 1.1,
	NONE amsn-0.96-tkcximage-locallibs.patch, 1.1, NONE
Message-ID: <200611022241.kA2Mftnc005802@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/amsn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5781

Modified Files:
	.cvsignore amsn.spec sources 
Removed Files:
	amsn-0.96-configureac-nolocate.patch 
	amsn-0.96-tkcximage-locallibs.patch 
Log Message:
* Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
- updated to 0.96 final
- drop nolocate and locallibs patch because they were accepted upstream
- changed URL because they moved the website



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amsn/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 19:00:48 -0000	1.2
+++ .cvsignore	2 Nov 2006 22:41:25 -0000	1.3
@@ -1 +1 @@
-amsn-0.96rc1.tar.bz2
+amsn-0.96.tar.bz2


Index: amsn.spec
===================================================================
RCS file: /cvs/extras/rpms/amsn/FC-6/amsn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amsn.spec	28 Aug 2006 10:34:46 -0000	1.4
+++ amsn.spec	2 Nov 2006 22:41:25 -0000	1.5
@@ -1,21 +1,17 @@
-%define alphatag rc1
-
 Name:           amsn
 Version:        0.96
-Release:        0.13.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://amsn.sourceforge.net/
-Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}%{alphatag}.tar.bz2
+URL:            http://www.amsn-project.net/
+Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
 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
-Patch1: amsn-0.96-configureac-nolocate.patch
-Patch2: amsn-0.96-tkcximage-locallibs.patch
-Patch3: amsn-0.96-system-bwidget.patch
+Patch1: amsn-0.96-system-bwidget.patch
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -33,17 +29,14 @@
 snapshots with your webcam to use as your display picture.
 
 %prep
-%setup -n %{name}-%{version}%{alphatag} -q
-%patch1 -p1 -b .1-nolocate
-%patch2 -p1 -b .2-locallibs
-%patch3 -p1 -b .3-system-bwidget
+%setup -q
+%patch1 -p1 -b .1-system-bwidget
 rm -r utils/TkCximage/src/{jpeg,png,zlib}
 rm -r utils/BWidget-1.7.0
 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in
 %{__sed} -i 's#mozilla#htmlview#' config.tcl
 %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
 %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "/usr/share/amsn/"#' amsn amsn-remote amsn-remote-CLI
-%{__sed} -i 's#"##' amsn.desktop
 autoconf
 
 %build
@@ -123,6 +116,11 @@
 
 
 %changelog
+* Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
+- updated to 0.96 final
+- drop nolocate and locallibs patch because they were accepted upstream
+- changed URL because they moved the website
+
 * Tue Aug 28 2006 Sander Hoentjen  - 0.96-0.13.rc1
 - Tag error, so bumping the release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amsn/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 19:00:48 -0000	1.2
+++ sources	2 Nov 2006 22:41:25 -0000	1.3
@@ -1 +1 @@
-1b90fdbb0a51c7646f4d2e6b22f18711  amsn-0.96rc1.tar.bz2
+3df6b0d34ef1997a47c0b8af29b2547a  amsn-0.96.tar.bz2


--- amsn-0.96-configureac-nolocate.patch DELETED ---


--- amsn-0.96-tkcximage-locallibs.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 22:45:49 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Thu, 2 Nov 2006 15:45:49 -0700
Subject: rpms/amsn/FC-5 .cvsignore, 1.2, 1.3 amsn.spec, 1.1, 1.2 sources, 1.2,
	1.3 amsn-0.96-configureac-nolocate.patch, 1.1,
	NONE amsn-0.96-tkcximage-locallibs.patch, 1.1, NONE
Message-ID: <200611022245.kA2MjnEU005878@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/amsn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5857

Modified Files:
	.cvsignore amsn.spec sources 
Removed Files:
	amsn-0.96-configureac-nolocate.patch 
	amsn-0.96-tkcximage-locallibs.patch 
Log Message:
* Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
- updated to 0.96 final
- drop nolocate and locallibs patch because they were accepted upstream
- changed URL because they moved the website



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amsn/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jun 2006 19:00:48 -0000	1.2
+++ .cvsignore	2 Nov 2006 22:45:19 -0000	1.3
@@ -1 +1 @@
-amsn-0.96rc1.tar.bz2
+amsn-0.96.tar.bz2


Index: amsn.spec
===================================================================
RCS file: /cvs/extras/rpms/amsn/FC-5/amsn.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amsn.spec	20 Jun 2006 19:00:48 -0000	1.1
+++ amsn.spec	2 Nov 2006 22:45:19 -0000	1.2
@@ -1,21 +1,17 @@
-%define alphatag rc1
-
 Name:           amsn
 Version:        0.96
-Release:        0.11.%{alphatag}%{?dist}
+Release:        1%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://amsn.sourceforge.net/
-Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}%{alphatag}.tar.bz2
+URL:            http://www.amsn-project.net/
+Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
 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
-Patch1: amsn-0.96-configureac-nolocate.patch
-Patch2: amsn-0.96-tkcximage-locallibs.patch
-Patch3: amsn-0.96-system-bwidget.patch
+Patch1: amsn-0.96-system-bwidget.patch
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -33,17 +29,14 @@
 snapshots with your webcam to use as your display picture.
 
 %prep
-%setup -n %{name}-%{version}%{alphatag} -q
-%patch1 -p1 -b .1-nolocate
-%patch2 -p1 -b .2-locallibs
-%patch3 -p1 -b .3-system-bwidget
+%setup -q
+%patch1 -p1 -b .1-system-bwidget
 rm -r utils/TkCximage/src/{jpeg,png,zlib}
 rm -r utils/BWidget-1.7.0
 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in
 %{__sed} -i 's#mozilla#htmlview#' config.tcl
 %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
 %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "/usr/share/amsn/"#' amsn amsn-remote amsn-remote-CLI
-%{__sed} -i 's#"##' amsn.desktop
 autoconf
 
 %build
@@ -123,6 +116,17 @@
 
 
 %changelog
+* Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
+- updated to 0.96 final
+- drop nolocate and locallibs patch because they were accepted upstream
+- changed URL because they moved the website
+
+* Tue Aug 28 2006 Sander Hoentjen  - 0.96-0.13.rc1
+- Tag error, so bumping the release
+
+* Tue Aug 28 2006 Sander Hoentjen  - 0.96-0.12.rc1
+- FC6 mass rebuild
+
 * Tue Jun 20 2006 Sander Hoentjen  - 0.96-0.11.rc1
 - requires sox, htmlview and tkdnd now
 - moved amsn, amsn-remote and amsn-remote-CLI to bindir


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amsn/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jun 2006 19:00:48 -0000	1.2
+++ sources	2 Nov 2006 22:45:19 -0000	1.3
@@ -1 +1 @@
-1b90fdbb0a51c7646f4d2e6b22f18711  amsn-0.96rc1.tar.bz2
+3df6b0d34ef1997a47c0b8af29b2547a  amsn-0.96.tar.bz2


--- amsn-0.96-configureac-nolocate.patch DELETED ---


--- amsn-0.96-tkcximage-locallibs.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  2 23:25:10 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Thu, 2 Nov 2006 16:25:10 -0700
Subject: rpms/libipoddevice/devel libipoddevice.spec,1.6,1.7
Message-ID: <200611022325.kA2NPAEo009142@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/libipoddevice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9126

Modified Files:
	libipoddevice.spec 
Log Message:
* Thu Nov  2 2006 Christopher Aillon  0.5.1-1
- BuildRequire: libxml2-devel



Index: libipoddevice.spec
===================================================================
RCS file: /cvs/extras/rpms/libipoddevice/devel/libipoddevice.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libipoddevice.spec	2 Nov 2006 22:33:48 -0000	1.6
+++ libipoddevice.spec	2 Nov 2006 23:24:39 -0000	1.7
@@ -14,6 +14,7 @@
 
 BuildRequires: dbus-glib-devel
 BuildRequires: hal-devel >= %{hal_ver}
+BuildRequires: libxml2-devel
 BuildRequires: libgtop2-devel >= %{libgtop_ver}
 BuildRequires: udev
 BuildRequires: sg3_utils-devel
@@ -73,7 +74,7 @@
 %changelog
 * Thu Nov  2 2006 Christopher Aillon  0.5.1-1
 - Update to 0.5.1
-- BuildRequire: sg3_utils-devel
+- BuildRequire: sg3_utils-devel libxml2-devel
 
 * Fri Sep  1 2006 Christopher Aillon  0.4.5-3
 - Rebuild against newer toolchain



From fedora-extras-commits at redhat.com  Fri Nov  3 00:41:57 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 2 Nov 2006 17:41:57 -0700
Subject: rpms/tetex-tex4ht/devel AlDraTex.sty, NONE, 1.1 AlProTex.sty, NONE, 
	1.1 DraTex.sty, NONE, 1.1 ProTex.sty, NONE,
	1.1 tetex-tex4ht-1.0-prev.patch, NONE,
	1.1 tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch, NONE,
	1.1 texmf.cnf.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.8,
	1.9 tetex-tex4ht.spec, 1.8, 1.9 tex4ht-env.patch, 1.1, NONE
Message-ID: <200611030041.kA30fvM3015955@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/tetex-tex4ht/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15834

Modified Files:
	.cvsignore sources tetex-tex4ht.spec 
Added Files:
	AlDraTex.sty AlProTex.sty DraTex.sty ProTex.sty 
	tetex-tex4ht-1.0-prev.patch 
	tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch texmf.cnf.patch 
Removed Files:
	tex4ht-env.patch 
Log Message:
* Fri Nov  3 2006 Patrice Dumas  1.0.2006_10_28_1705-1
- update
- use debian patchset
- remove the patch modifying paths in tex4ht.env, it is unneeded with 
  kpathsee



--- NEW FILE AlDraTex.sty ---
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  v 1.7
%  AlDraTex                                             %
%  Copyright (C) 1992 Eitan M. Gurari                   %
%                                                       %
% This program can redistributed and/or modified under  %
% the terms of the LaTeX Project Public License         %
% Distributed from CTAN archives in directory           %
% macros/latex/base/lppl.txt; either version 1 of the   %
% License, or (at your option) any later version.       %
%                                                       %
% However, you are allowed to modify this program       %
% without changing its name, if you modify its          %
% signature. Changes to the signature can be introduced %
% with a directive of the form                          %
%            \message{signature}                        %
%                                                       %
%                            gurari at cse.ohio-state.edu  %
%        http://http://www.cse.ohio-state.edu/~gurari/  %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
   \catcode`\noexpand\noexpand\noexpand \^=\the\catcode`\^%
}
\catcode`\^=7
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
   \csname :RestoreCatcodes\endcsname
   \catcode`\noexpand \_=\the\catcode`\_%
   \catcode`\noexpand :=\the\catcode`:%
   \catcode`\noexpand &=\the\catcode`&%
   \catcode`\noexpand \#=\the\catcode`\#%
   \catcode`\noexpand \^^M=\the\catcode`\^^M%
   \let\expandafter\noexpand
       \csname:RestoreCatcodes\endcsname=\noexpand\undefined}
\catcode`\:=11
\ifx \AlDraTex\:undefined  \def\AlDraTex{chart,diagram} \fi

\newif\if:circle
\newif\if:option
\def\:CheckOption#1{ \def\:temp{#1}
   \:optionfalse
   \expandafter\:GetOptions\AlDraTex,,// }

\def\:GetOptions#1,#2//{  \def\:next{#1}
   \ifx        \:next\empty
   \else \ifx  \:temp\:next   \:optiontrue   \let\:next=\relax
   \else \def\:next{\:GetOptions#2//}
   \fi  \fi  \:next }
\def\:DefineExt#1{%
   \Define#1{\begingroup  \:DraCatCodes
             \csname .:\string#1\endcsname}%
  \expandafter\Define\csname .:\string#1\endcsname}
\IntVar\:C   \IntVar\:Ca
\IntVar\:Cb  \IntVar\:Cc  \newtoks\:tk
\DecVar\Va   \DecVar\Vb
\DecVar\:Vc   \DecVar\:Vd   \DecVar\:Ve

\Define\:GetX(2){\Va=#1;}
\Define\:GetY(2){\Vb=#2;}
\Define\:GetXY(2){\Va=#1;\Vb=#2;}\Define\:GetExit(2){
    \:Vc=#1;  \IF \LtDec(\:Vc,0)  \THEN  \:Vc=-\:Vc;  \FI
    \:Vd=#2;  \IF \LtDec(\:Vd,0)  \THEN  \:Vd=-\:Vd;  \FI
    \IF  \LtDec(\:Vd,\:Vc)  \THEN  \:Vd=\:Vc;  \FI
    \Va=#1;   \Vb=#2;
    \IF \GtDec(\:Vd,0)  \THEN  \Va/\:Vd;  \Vb/\:Vd;   \FI }
\Define\:GetEdgeFront(1){\def\:EdgeFront{#1}}
\Define\:Count(1){\:C+1;}\let\Defend=\noexpand
\def\KeepSpaces{\def\:Spaces{\catcode`\ =10 \relax}}
\def\RemoveSpaces{\let\:Spaces=\relax}
\RemoveSpaces\def\:edef#1#2{\edef\:Temp{\noexpand\Define
   \noexpand#1{#2}}\:Temp }
\:CheckOption{chart}\if:option
   \edef\AlDraTex{\AlDraTex,pie,bar,xy}
\else \:CheckOption{pie}\if:option
   \edef\AlDraTex{\AlDraTex,chart}
\else \:CheckOption{xy}\if:option
   \edef\AlDraTex{\AlDraTex,chart}
\else \:CheckOption{bar}\if:option
   \edef\AlDraTex{\AlDraTex,chart}
\fi\fi\fi\fi
\:CheckOption{chart}\if:option
   \def\Compute#1(#2){\def\NextDefine{\::Comp#1(#2)}\Define\:Comp(#2)}

\def\::Comp#1(#2){\Define\:Temp(#2){}\ifx \:Temp\:Comp
         \let\:Compute=\empty
   \else \Define\:Compute(1){\:Comp(##1)\:Return#1}\fi}

\Compute\I(1){}\Define\:ChooseColor(1){
\IF \EqDec(#1,1) \THEN  \SetBrush(0,0){}
\ELSE\IF \EqDec(#1,2) \THEN
   \SetBrush(2pt\du,1pt\du){  \PenSize(0.2pt)
        \Units(1pt,1pt)  \Move(0,-0.37)  \Line(0,0.75)}
\ELSE\IF \EqDec(#1,3) \THEN
   \SetBrush(1pt\du,2pt\du){  \PenSize(0.2pt)
        \Units(1pt,1pt)  \Move(-0.37,0)  \Line(0.75,0)}
\ELSE\IF \EqDec(#1,4) \THEN
   \SetBrush(2pt\du,2pt\du){  \PenSize(0.2pt)
        \Units(1pt,1pt){\Move(-1,0)\Line(2,0)}
               \Move(0,-1)\Line(0,2)}
\ELSE\IF \EqDec(#1,5) \THEN
   \SetBrush(5pt\du,2pt\du){  \PenSize(0.2pt)
        \Units(1pt,1pt)  \Move(0,-0.37)  \Line(0,0.75)}
\ELSE\IF \EqDec(#1,6) \THEN
   \SetBrush(2pt\du,5pt\du){  \PenSize(0.2pt)
        \Units(1pt,1pt)  \Move(-0.37,0)  \Line(0.75,0)}
\ELSE
   \SetBrush(#1pt\du,#1pt\du){
                \Units(1pt,1pt)\PaintRect(0.37,0.37)}
\FI\FI\FI\FI\FI\FI} 
\fi
\:CheckOption{pie}\if:option
   \Define\PieChart{\begingroup   \:Spaces  \:PieChart}

\Define\:PieChart(1){\endgroup
   \Table\:Temp{#1}
   \:Ve=0;  \:Temp(0,99){\:total}
   \MarkLoc(o:) \MoveF(\:PieR)  \MarkLoc(b:)
   \DSeg\:Vd(o:,b:) \MoveToLoc(o:)
   \:C=0;  \:Temp(0,99){\:InsertSlice} }  \Define\PieChartSpec(1){
   \IF  \EqText(,#1)  \THEN\ELSE   \:PieSpec(#1)
   \FI  \:PieCol}

\Define\:PieSpec(3){
   \:edef\:PieR{#2}      \:edef\:LblDist{#3}
   \IF  \EqInt(1,#1)  \THEN
      \def\:ReturnComp##1{\:slice(\Val##1,\Val##1)}
      \Define\:total(1){
         \ifx  \:Compute\empty          \:Ve+##1;
         \else \let\:Return=\:ReturnAdd \:Compute(##1)\fi}
      \Define\:InsertSlice(1){
         \ifx \:Compute\empty           \:slice(##1,##1)
         \else \let\:Return=\:ReturnComp\:Compute(##1) \fi}
   \ELSE
      \def\:ReturnComp##1{\edef\:tempa{\Val##1}}
      \Define\:total(2){
         \ifx  \:Compute\empty          \:Ve+##1;
         \else \let\:Return=\:ReturnAdd \:Compute(##1)\fi}
      \Define\:InsertSlice(2){
         \ifx \:Compute\empty           \:slice(##1,##2)
         \else \let\:Return=\:ReturnComp\:Compute(##1)
                                       \:slice(\:tempa,##2) \fi}
   \FI  }
\def\:ReturnAdd#1{\:Ve+#1;}\Define\:slice(2){  \:C+1;  \Va=#1;  \Va/\:Ve;
    \Va*360; {
       \Va/2;  \Rotate(\Val\Va)   \:DetachSlice
       \MarkLoc(o:)
       \MoveF(1pt\du)  \MarkLoc(x:)  \CSeg\:SetEnEx(x:,o:)
       \MoveToLoc(o:)  \MoveF(\:LblDist)  \:AdjChatLbl(0,99){\:MvLbl}
       \SliceText(--#2--)  \MoveToLoc(o:)
       \Vb=\:Vd; \Vb+\Va;  \Vb+\Va;
       \DrawOvalArc(\:PieR,\:PieR)(\Val\:Vd,\Val\Vb)
       \:Ca=0; \:PieColors(0,99){\:Ca+1;\:PaintPie}
   {\RotateTo(\Val\:Vd)  \LineF(\:PieR)}
       \RotateTo(\Val\Vb)  \LineF(\:PieR)
    }  \Rotate(\Val\Va)  \:Vd+\Va;  }

\Define\:SetEnEx(2){\:Vc=#1; \Vb=#2; \EntryExit(\Val\:Vc,\Val\Vb,0,0)}
\Define\DetachSlices(2){
   \IF  \EqInt(#2,0)  \THEN
      \Define\:DetachSlice{}
   \ELSE\IF  \EqText(,#1) \THEN
      \def\:DetachSlice{ \MoveF(#2) }
   \ELSE
      \Table\:DSlice{#1}
      \Define\:OptDSlice(1){
         \IF \EqInt(\:C,##1) \THEN
            \MoveF(#2)
         \FI}
      \Define\:DetachSlice{ \:DSlice(0,99){\:OptDSlice} }
   \FI  \FI } \Define\MovePieLabels(1){
   \IF  \EqText(,#1)  \THEN
      \Table\:AdjChatLbl{0,0,0}
   \ELSE     \Table\:AdjChatLbl{0,0,0}  \FI}

\Define\:MvLbl(3){
   \IF \EqInt(\:C,#1)  \THEN  \Move(#2,#3)  \FI }
\:DefineExt\:PieCol(1){\endgroup
   \IF \EqText(,#1)  \THEN
   \ELSE                   \Table\:PieColors{#1} \FI}
\Define\:PaintPie(1){{
   \IF \EqInt(\:C,\:Ca) \THEN
      \IF \GtDec(#1,0) \THEN
         \:ChooseColor(#1)
          \:Ve=\:PieR;
          \IF \GtDec(\Va,90) \THEN
             \Va=\:Vd;  \Va+181;
             \PaintOvalArc(\Val\:Ve,\Val\:Ve)(\Val\:Vd,\Val\Va)
             \Va-1;  \:Vd=\Va;    \FI
          \PaintOvalArc(\Val\:Ve,\Val\:Ve)(\Val\:Vd,\Val\Vb)
          \RotateTo(\Val\Vb)  \MoveF(\:PieR)  \MarkLoc(a:)
\MoveToLoc(o:)  \RotateTo(\Val\:Vd)  \MoveF(\:PieR)
\MarkLoc(b:)    \PaintQuad(o:,o:,a:,b:) 
          \MoveF(-0.5pt\du)  \MarkLoc(b:) \MoveToLoc(o:)
\Rotate(1) \MoveF(\:PieR)  \MarkLoc(b':)
\MoveToLoc(o:) \RotateTo(\Val\Vb)  \MoveF(\:PieR)
\MoveF(-0.5pt\du)  \MarkLoc(a:) \MoveToLoc(o:)
\Rotate(-1) \MoveF(\:PieR) \MarkLoc(a':)
\PaintQuad(a:,a':,b':,b:)
   \FI \FI  }}\Define\Legend(1){   \AlignGrid(-1,\:LgEn)
   \PictNode(2){  \EntryExit(-1,\:LgEn,0,0)
      \DrawRect(\:LgSzX,\:LgSzY)
[...1863 lines suppressed...]
\MarkLoc(a:)  \MarkXLoc(IN:)
\MarkXLoc(INc:) 
\MoveToLoc(o:)   \CSeg\:MoveHV(o:,b:)
\MarkXLoc(OUT:)  \MarkLoc(b:)
\MoveToLoc(o:)   \CSeg\:MoveHV(o:,-12:)   \MarkLoc(-12:)
\MoveToLoc(a:)   \CSeg\:DistH(a:,-12:)
\IF  \LtDec(\Va,0) \THEN
   \ifx  H\:TreeDir
   \else             \Move(\Val\Va,0)   \fi
\ELSE
   \ifx  H\:TreeDir  \Move(0,\Val\Va)
   \else            \fi
  \FI
\MarkXLoc(INx:)
\MoveToLoc(o:)   \CSeg\:MoveHV(o:,OUTx:)   \MarkLoc(OUTx:)
\MoveToLoc(b:)   \CSeg\:DistH(b:,OUTx:)
\IF  \GtDec(\Va,0) \THEN
   \ifx  H\:TreeDir
   \else             \Move(\Val\Va,0)   \fi
\ELSE
   \ifx  H\:TreeDir  \Move(0,\Val\Va)
   \else               \fi
 \FI
\MarkXLoc(OUTx:)  }
\Define\:Clnd(2){
   \MarkLoc(o:)  \:TreeEnEx  \:C=#1;  \:LeafNode(#1..\Val\:Ca,#2)
\ifx H\:TreeDir
   \MoveToNode(#1..\Val\:Ca,0,1) \MarkLoc(IN:)
   \MoveToNode(#1..\Val\:Ca,0,-1)
\else
   \MoveToNode(#1..\Val\:Ca,-1,0) \MarkLoc(IN:)
   \MoveToNode(#1..\Val\:Ca,1,0)               \fi
\MarkLoc(OUT:)   \MoveToLoc(o:)   \CSeg\:MoveHV(o:,IN:)
\MarkXLoc(IN:)   \MarkXLoc(INc:)    \MarkXLoc(INx:)
\MoveToLoc(o:)   \CSeg\:MoveHV(o:,OUT:)
\MarkXLoc(OUT:)  \MarkXLoc(OUTx:)   }
\Define\TreeAlign(3){ \let\:TreeDir=#1
   \def\:EntryX{#2}  \def\:EntryY{#3}    \:AlignTree}

\Define\:AlignTree(3){
   \def\:AlignA{#1}   \def\:AlignB{#2}   \def\:AlignC{#3}}

\TreeAlign(V,0,0)(0,0,0)
\Define\:trcTree{\:TrcDiag{\immediate\write16{\space
   \:parmB..\Val\:Ca,\Val\:Cc..\Val\:Cb}}}
\Define\:ChildLoc(2){
\IF  \LtDec(#1,0)  \THEN \Va=-#1;
                   \ELSE \Va= #1;  \FI
\IF \LtDec(\Va,100) \THEN
   \::ChildLoc(#1,#2)
\ELSE   \Va/100; \:C[\Va]; \Vb=#1;
   \IF  \GtDec(#1,0)   \THEN  \Vb-\:C 00;
   \ELSE  \Vb+\:C 00; \FI
   \edef\:Temp{\noexpand\::ChildLoc
      (\Val\Vb,-\Val\:C2:,-\Val\:C1:,\Val\:C1:,\Val\:C2:)}\:Temp
\FI } \Define\::ChildLoc(5){
   \IF  \LtDec(#1,-2)  \THEN
      \MoveToLoc(#2)  \:MoveH(#1,#1)
   \ELSE \IF  \GtDec(#1,2)  \THEN
      \MoveToLoc(#4)  \:MoveH(#1,#1)
   \ELSE \IF  \LtDec(#1,-1)  \THEN
      \MoveToLoc(#3)   \Va=#1;  \Va+1;
      \CSeg[\Val\Va]\Move(#2,#3)
   \ELSE \IF  \GtDec(#1,1)  \THEN
      \MoveToLoc(#4)   \Va=#1;  \Va-1;
      \CSeg[\Val\Va]\Move(#4,#5)
   \ELSE   \MoveToLoc(#3)
      \CSeg[0.5]\Move(#3,#4)  \:MoveH(#1,#1)
   \FI \FI \FI \FI}\def\:GetIx#1..#2//{\:Ca=#1;\:Cb=#2;}

\Define\::MoveToInv(3){
   \Indirect{\let\:temp=}<#1.mvto>
   \expandafter\ifx\:temp\MoveToInv
      \:GetIx#1//        \ifx H\:TreeDir \:Cb-#3; \else \:Cb-#2; \fi
      \edef\:Temp{\noexpand\MoveToInv(\Val\:Ca..\Val\:Cb,
                     \ifx H\:TreeDir 0,#3 \else -#2,0 \fi)}
      \expandafter\:Temp
   \ELSE
      \ifx H\:TreeDir  \Indirect<#1.mvto>(#1,0,#3)
      \else            \Indirect<#1.mvto>(#1,-#2,0)  \fi
   \FI    }

\def\MoveToInv{\:MoveToInv}
\let\:MoveToInv=\MoveToRect \Define\::MergTree{
   \edef\:Temp{\DoReg=\the\DoReg\relax}
   \Table\:tempa{\:frL}
\Table\:tempb{\:frR}
\:tempa(0,0){\:left}
\:tempb(0,0){\:right}  
\IF \GtInt(\:dpR,\:dpL) \THEN
   \:both(\:dpL)  \:DoReg=\:dpL  \advance\:DoReg by 1\relax
\:tempb(\:DoReg,\:dpR){\:copy}        
   \let\:dpL=\:dpR
\ELSE
   \:both(\:dpR)
\IF  \GtInt(\:dpL,\:dpR) \THEN
   \:DoReg=\:dpR    \advance\:DoReg by 1\relax
   \:tempa(\:DoReg,\:dpL){\:copy}
\FI  
\FI      \:Temp } \Define\:copt(3){\::copt(#3,)}
\Define\::copt(2){
   \IF \EqText(#1,C) \THEN
       \let\:MergTree=\::MergTree  \FI }
\Define\:MeasureRow(3){
   \:TrcDiag{{      \:tk={#1,#2,#3}
       \immediate\write16{\Val\:C..\Val\:Ca\space\space\the\:tk}}}
   \IF  \EqInt(#2,0) \THEN
         \FigSize\Va\Vb{\:LeafNode(x,#3)}
   \ELSE \FigSize\Va\Vb{\:TreeNode(x,#3)} \FI
   \expandafter\expandafter\expandafter\:tempb
      \expandafter{\:tempa &}
   \edef\:tempa{\the\:tk #2,\Val\Va,\Val\Vb}
   \IF \LtDec(\:Vc,\:tempc)  \THEN  \:Vc=\:tempc; \FI  }
\Define\:AddVerTreeSp(1){
   \:Ca+1; \Indirect+#1;
   \Va=#1; \Va*\:TreeEdgeSpec; \Indirect+\Va;   }

\:DefineExt\TreeSpace(3){\endgroup
   \IF \EqText(D,#1) \THEN
      \def\:OutOutx{OUT:}   \def\:InInx{IN:}  \FI
   \IF \EqText(C,#1) \THEN
   \def\:OutOutx{OUT:}   \def\:InInx{INc:}
   \let\:Cspace=\:InInx  \FI 
   \IF \EqText(S,#1) \THEN
      \def\:OutOutx{OUTx:}  \def\:InInx{INx:}   \FI
   \:edef\:HorTreeSp{#2}
   \:edef\:VerTreeSp{#3}  }

\TreeSpace(S,10,20)\:DefineExt\AdjTree(1){\endgroup
   \IF \EqText(#1,) \THEN \Table\:TrSp{,,}
   \ELSE                  \Table\:TrSp{#1} \FI }

\AdjTree()\Define\:unl(3){
   \IF \EqText(#1,L) \THEN
      \IF \EqInt(\:Cc,#2) \THEN \TreeSpace(#3,0) \FI
   \ELSE \IF \EqText(#1,N) \THEN
      \:edef\:Temp{\noexpand\EqText(\Val\:Cc..\Val\:Ca,#2)}
      \IF \:Temp \THEN \TreeSpace(#3,0) \FI
   \FI \FI}\Define\:spbn(3){
   \IF \EqText(#1,B) \THEN
      \:edef\:Temp{\noexpand\EqText(\Val\:Cc..\Val\:Cb,#2)}
      \IF \:Temp \THEN  \:MoveH(#3,#3)
   \FI\FI}\Define\:lcalg(3){
   \IF \EqText(#1,A) \THEN
      \:edef\:Temp{\noexpand\EqText(\Val\:C..\Val\:Ca,#2)}
      \IF \:Temp \THEN
         \:xalg(#3)
   \FI\FI}
\Define\:xalg(2){ \def\:EntryX{#1} \:AlignTree(#2)  }
\Define\:mvpr(3){
   \IF \EqText(#1,M) \THEN
      \:edef\:Temp{\noexpand\EqText(\Val\:C..\Val\:Ca,#2)}
      \IF \:Temp \THEN  \:MoveH(#3,-#3)
   \FI\FI}\Define\TreeEdgeSpec(1){\:edef\:TreeEdgeSpec{#1}}
\TreeEdgeSpec(0.5) \def\:ChkInv{\MoveToInv}

                              \Define\:Temp{
\def\:MvToDivider##1..##2..{
   \ifx H\:TreeDir   \Indirect{\Move(\Val},0)
   \else             \Indirect{\Move(0,-\Val})  \fi  }
                              }\:Temp \Define\TreeEdge(2){
   \ifx H\:TreeDir   \HHEdge(#1,#2,EdgeGuide)
   \else             \VVEdge(#1,#2,EdgeGuide)  \fi }
\Define\:AddNodesAddr(1){
   \Define\:temp{\gdef\:GetNodesAddr}
   \expandafter\expandafter\expandafter
      \:temp\expandafter{\:GetNodesAddr & #1  }}

\Define\:SubTreeAddrs{
   \Table\:AddrPoly{ \:GetNodesAddr}
   \:AddrPoly(\Val\:AddrCount,999){\:AddrCount+1;\:RecordAddr}  }

\Define\:RecordAddr(1){\MoveToLoc(#1)     \MarkXLoc(#1)
      \MoveToLoc(#1;:11)  \MarkXLoc(#1;:11)}

\IntVar\:AddrCount\TreeSpec(\Node)()(\TreeEdge) 
\fi
\let\if:option=\:undefined
\let\:CheckOption=\:undefined
\let\:GetOptions=\:undefined
\let\AlDraTex=\:undefined 
\def\:aldwarn#1#2{\immediate
   \write16{---AlDraTeX warning--- \ifcase #1
      insufficient space for arrow head   %0
   \or \string\Tree(too many values)(...) %1
   \or     edge from node #2 to itself    %2
   \or     #2 not a grid point            %3
   \or     too many entries in (#2)       %4
   \or     too many rows: \Val\:C         %5
   \or     row \Val\:C\space has too many columns: \Val\:Ca    %6
   \or     \Val\:C\space(>5) entries in \string\BarChartSpec   %7
   \or     more than one bar in \string\BarChartSpec(\the\:tk) %8
   \or     no font for \string\NewCIRCNode, trying `\string
           \font\string\CIRC=lcircle10 scaled\string\magstep5'   %9
   \or     \string\PutNode(#2)?                                  %10
   \or     \string\GridDiagram(#2)? less than 2 rows/columns     %11
                                   \fi}}

\:RestoreCatcodes    \endinput



--- NEW FILE AlProTex.sty ---
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%  AlProTex.sty                       2004-06-18-18:54  %
%  Copyright (C) 1992--2004  by Eitan M. Gurari         %
%                                                       %
% This program can redistributed and/or modified under  %
% the terms of the LaTeX Project Public License         %
% Distributed from CTAN archives in directory           %
% macros/latex/base/lppl.txt; either version 1 of the   %
% License, or (at your option) any later version.       %
%                                                       %
% However, you are allowed to modify this program       %
% without changing its name, if you modify its          %
% signature. Changes to the signature can be introduced %
% with a directive of the form                          %
%            \message{signature}                        %
%                                                       %
%                            gurari at cse.ohio-state.edu  %
%                http://www.cse.ohio-state.edu/~gurari  %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\immediate\write-1{version 2004-06-18-18:54}

\expandafter\edef\csname :RestoreCatcodes\endcsname{%
   \catcode`\noexpand\noexpand\noexpand \^=\the\catcode`\^%
   \catcode`\noexpand\noexpand\noexpand \_=\the\catcode`\_%
}
\catcode`\^=7  \catcode`\_=8
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
   \csname :RestoreCatcodes\endcsname
   \csname du:cc\endcsname
   \catcode`\noexpand "=\the\catcode`\"%
   \catcode`\noexpand |=\the\catcode`\|%
   \catcode`\noexpand :=\the\catcode`:%
   \catcode`\noexpand @=\the\catcode`@%
   \catcode`\noexpand -=\the\catcode`-%
   \catcode`\noexpand +=\the\catcode`+%
   \catcode`\noexpand /=\the\catcode`/%
   \catcode`\noexpand .=\the\catcode`.%
   \catcode`\noexpand \^^M=\the\catcode`\^^M%
   \catcode`\noexpand \^^I=\the\catcode`\^^I%
   \catcode`\noexpand \%=\the\catcode`\%%
   \let\expandafter\noexpand
      \csname:RestoreCatcodes\endcsname=\noexpand\undefined}
\catcode`\@=11  \catcode`\:=11  \catcode`\"=12  \catcode`\|=12
\def\TagLine[#1]{}     \def\ResetLineCount{}
\def\RefLine[#1]{}     \def\ShowLineCount{}
\def\HideLineCount{}   \def\PauseLineCount{}
\def\ContLineCount{} \def\:InitAlProTex#1,#2//{
   \def\:InitAlProTex{#1}%
   \let\:ModifyOutputCodeO=\ModifyOutputCode
   \def\ModifyOutputCode{\def\Extension{#1}\:ModifyOutputCodeO}
   \ifx \html:addr\:UnDeF    \def\AlProTex{#2}\else
      \ifx \html:addr\empty  \def\AlProTex{#2}\else
                        \def\AlProTex{html,#2}\fi \fi}

\expandafter\:InitAlProTex\AlProTex,//


\def\:temp{\csname newif\endcsname}
\expandafter\ifx \csname :Optionfalse\endcsname\relax
    \expandafter\:temp \csname if:Option\endcsname
\fi
\def\:CheckOption#1{ \def\:temp{#1}
   \:Optionfalse
   \expandafter\:GetOptions\AlProTex,,// }

\def\:GetOptions#1,#2//{  \def\:next{#1}
   \ifx        \:next\empty
   \else \ifx  \:temp\:next   \:Optiontrue   \let\:next=\relax
   \else \def\:next{\:GetOptions#2//}
   \fi  \fi  \:next }
\def\:CntrlChar{`\\}
\catcode`\|=0  |catcode`|\=12
|def|:notex{\}
|catcode`|\=0 |catcode`||=12
\def\:temp{ \catcode`\@=12
   \def\:temp##1{\catcode`\@=11
                 \:CheckOption{##1}} \:temp}
\:temp{@}
\if:Option  \def\:CntrlChar{`\@}
\catcode`\@=12
\def\:notex{@}
\catcode`\@=11
\let\:ModifyAppendCodeII=\ModifyAppendCode
\let\:ModifyShowCodeII=\ModifyShowCode
\let\:ModifyOutputCodeII=\ModifyOutputCode
\def\ModifyAppendCode{\catcode`\@=0   \catcode`\\=12
   \:ModifyAppendCodeII}
\def\ModifyOutputCode{\def\@{@}\:ModifyOutputCodeII}
\def\ModifyShowCode#1{\:ModifyShowCodeII{#1}\def\@{\char64 }}
\else  \ifx \:ModifyAppendCodeII\:undefined
   \:CheckOption{|}   \if:Option
   \def\:CntrlChar{`\|}
\def\:notex{|}
\let\:ModifyAppendCodeII=\ModifyAppendCode
\let\:ModifyShowCodeII=\ModifyShowCode
\let\:ModifyOutputCodeII=\ModifyOutputCode
\def\ModifyAppendCode{\catcode`\|=0   \catcode`\\=12
   \:ModifyAppendCodeII}
\def\ModifyOutputCode{\def\|{|}\:ModifyOutputCodeII}
\def\ModifyShowCode#1{\:ModifyShowCodeII{#1}\def\|{\char124 }}
\else   \ifx \:ModifyAppendCodeII\:undefined
   \:CheckOption{`}   \if:Option
   \def\:CntrlChar{`\`}
\def\:notex{`}
\let\:ModifyAppendCodeII=\ModifyAppendCode
\let\:ModifyShowCodeII=\ModifyShowCode
\let\:ModifyOutputCodeII=\ModifyOutputCode
\def\ModifyAppendCode{\catcode`\`=0   \catcode`\\=12
   \:ModifyAppendCodeII}
\def\ModifyOutputCode{\def\`{`}\:ModifyOutputCodeII}
\def\ModifyShowCode#1{\:ModifyShowCodeII{#1}\def\`{\char96 }}
\else   \ifx \:ModifyAppendCodeII\:undefined
   \:CheckOption{?}   \if:Option
   \def\:CntrlChar{`\?}
\def\:notex{?}
\let\:ModifyAppendCodeII=\ModifyAppendCode
\let\:ModifyShowCodeII=\ModifyShowCode
\let\:ModifyOutputCodeII=\ModifyOutputCode
\def\ModifyAppendCode{\catcode`\?=0   \catcode`\\=12
   \:ModifyAppendCodeII}
\def\ModifyOutputCode{\def\?{?}\:ModifyOutputCodeII}
\def\ModifyShowCode#1{\:ModifyShowCodeII{#1}\def\?{\char63 }}
\fi \fi \fi \fi \fi \fi \fi\:CheckOption{xref}     \if:Option
   \csname newread\endcsname\sdx:file
\immediate\openin\sdx:file=\jobname.sdx
\csname newwrite\endcsname\cdx:file
\immediate\openout\cdx:file=\jobname.cpg
\let\xref:OutputCode=\OutputCode
\def\OutputCode#1{%
   {\Comment{ startcodefragment}{//}%
    \let\ProTexMssg=\:gobble
    \let\xref:ModifyOutputCode=\ModifyOutputCode
    \def\wrt:index##115{\immediate\write\cdx:file }%
    \def\ModifyOutputCode##1{\xref:ModifyOutputCode{##1}\bgroup
       \def\relax####115####215{\egroup
          \expandafter\wrt:index\:WriteCode
    }}%
    \xref:OutputCode#1}%
   \xref:OutputCode#1}

   \expandafter\ifx \csname tmp:cnt\endcsname\relax
   \csname newcount\endcsname\tmp:cnt
\fi
\def\change:cats#1#2#3{%
   \tmp:cnt#1
   \def\no::catcodes{%
      \catcode\tmp:cnt#3
      \ifnum\tmp:cnt<#2
          \advance\tmp:cnt  1  \expandafter\no::catcodes
      \fi }%
   \no::catcodes }

\def\scan:token{\futurelet\:next\check:ch}
\def\check:ch{\ifx \:next\par \expandafter\end
              \else           \expandafter\scan:ch\fi}
\def\scan:ch#1{\relax
   \ifx #1\egroup \index:tok \expandafter\egroup\else
   \ifcat #1a%
      \ifx \index:tok\empty
         \change:cats{48}{57}{11}% 0--9
      \fi
      \edef\index:tok{\index:tok#1}%
      \ifx \index:tok\start:comment
        \let\index:tok=\empty \let~=\scan:comment
        \change:cats{48}{57}{12}% 0--9
      \fi
    \else
       \change:cats{48}{57}{12}% 0--9
       \if \index:tok\empty \else
         \write:index{1
               \sp:id\index:id \space1 \l:idel\index:tok\r:idel }%
         \write:index{2
               \l:idel\index:tok\r:idel \space \sp:id\index:id }%
       \fi
       \let\index:tok=\empty
    \fi   \expandafter~\fi}
\def\sp:id#1{%
   \ifnum #1<10000 \space\fi
   \ifnum #1<1000 \space\fi
   \ifnum #1<100  \space\fi
   \ifnum #1<10   \space\fi
   #1}

\catcode`\@=0 \catcode`\\=12 @relax
             @:CheckOption{html}   @if:Option
@def at scan:comment#1\<#2\>{%
  @def at index:tok{#2}%
  @afterassignment at exit:comment at tmp:cnt=}
             @else
@def at scan:comment#1\<#2\>.{%
  @def at index:tok{#2}%
  @afterassignment at exit:comment at tmp:cnt=}
             @fi
@catcode`@\=0 \catcode`\@=11

\def\start:comment{startcodefragment}
\def\exit:comment#1//{\def\:temp{#1}%
   \ifx \:temp\open:comment
      \index:push
      \edef\index:level{I\index:level}%
       \ifx \prev:comment\index:tok \else
          \code:index{}%
      \fi
      \expandafter\edef\csname L \index:level\endcsname{%
         \expandafter\ifx \csname L \index:level\endcsname\relax \else
                  \csname L \index:level\endcsname,
           \fi  \the\tmp:cnt
      }%
      \let\prev:dir=u%
      \let\prev:comment=\index:tok%
   \else
         \code:index{I}%
      \edef\index:level{\expandafter\:gobble\index:level}%
      \let\prev:dir=d%
      \index:pop\index:pop\index:push
   \fi
   \let\index:tok=\empty \edef\index:id{\the\tmp:cnt}%
   \let~=\scan:token ~}
\def\open:comment{...}
\def\index:id{0}
\def\index:level{}
\let\prev:dir=f
\def\:gobble#1{}



\def\index:push{\edef\pd:mem{\the\tmp:cnt,\pd:mem}}
\def\index:pop{\expandafter\do:pop\pd:mem//}
\def\do:pop#1,#2//{%
   \if !#1!\tmp:cnt=-1 \else  \tmp:cnt=#1\def\pd:mem{#2}\fi}
\def\pd:mem{,}


\def\code:index#1{%
  \if d\prev:dir
    \bgroup
       \edef\index:tok{\l:idel\prev:comment\r:idel\space /\the\tmp:cnt/%
          \expandafter\ifx \csname L #1\index:level\endcsname\relax \else
                  , \csname L #1\index:level\endcsname
            \fi}%
       \write:index{3 \index:tok }%
       \expandafter\ifx \csname L #1\index:level\endcsname\relax \else
         \edef\:tmp{\noexpand\derive:index \space
                    \csname L #1\index:level\endcsname,,}\:tmp
       \fi
     \egroup
     \expandafter\let\csname L #1\index:level\endcsname=\:UnDe
  \fi
}

\def\derive:index#1,{%
   \if !#1!\else
   \write:index{1\sp:id{#1} 2
                \index:tok}\expandafter\derive:index\fi}

\def\write:index{\immediate\write\cdx:file }
\def\l:idel{<}
\def\r:idel{>}

\def\CodeIndex{%
   \immediate\closeout\cdx:file   \def\read:sdx{%
   \ifeof\sdx:file \else
      \immediate\read\sdx:file to\sdx:in  \sdx:in
      \expandafter\read:sdx
   \fi
}\noindent\vrule\vbox{\tt
\hsize=0.8\hsize
\rightskip=3em plus 4em
\leftskip=3em
\parindent=0pt

\ifnum \index:typ<4
  \sdx:in   \fi
 \read:sdx
}%
\immediate\closein\sdx:file
 %
   \immediate\openout\cdx:file=\jobname.cdx
   \bgroup
    \change:cats{0}{255}{12}%
    \change:cats{97}{122}{11}% a--z
    \change:cats{65}{90}{11}%  A--Z
    \change:cats{95}{95}{11}%  _
    \let\index:tok=\empty  \let~=\scan:token
    \expandafter~\input \jobname.cpg \egroup
    \immediate\write16{-- Have \jobname.cdx processed
          into \jobname.sdx --}%
}%

   \let\xref:ModifyShowCode=\ModifyShowCode
\def\ModifyShowCode#1{%
   \xref:ModifyShowCode{#1}%
   \let\xref:ModifyShowLastCode=\ModifyShowLastCode
   \def\ModifyShowLastCode{\xref:ModifyShowLastCode{#1}%
     \def\:BackTitle{\noindent\vrule\vtop{%
\tt
\hsize=0.8\hsize
\rightskip=3em plus 4em
\leftskip=3em
\parindent=0pt
        --\the\:CodeNumber--: \small:index
}}}}
\def\small:index{%
   \ifnum \:CodeNumber<\index:num \else
       \sdx:in
      \ifeof\sdx:file
          \def\index:num{1000000}\gdef\index:typ{4}%
      \else
          \immediate\read\sdx:file to\sdx:in
          \expandafter\get:typ \sdx:in //%
      \fi
      \expandafter\small:index
   \fi}
\def\get:typ#1 {%
   \gdef\index:typ{#1}%
   \ifnum #1>1 \def\index:num{1000000}\expandafter\id:gobble
   \else   \expandafter\get:nm\fi}
\def\id:gobble#1//{}
\def\get:nm#1 #2//{\def\index:num{#1}}
\def\index:num{0}
\let\sdx:in=\empty

\fi
\:CheckOption{basic}     \if:Option
    \def\AlProTex{[[]],<<<>>>,list,title,ClearCode}
    \def\:temp{\catcode`\`=12}
\catcode`\;=0    \catcode`\\=12
;expandafter;catcode ;:CntrlChar=13
;ifnum 92=;:CntrlChar
   ;edef;:notex{;noexpand;::notex;noexpand\;:notex}
;fi
;ifnum 124=;:CntrlChar
   ;edef;:notex{;noexpand;::notex;noexpand|;:notex}
;fi
;ifnum 64=;:CntrlChar
   ;edef;:notex{;noexpand;::notex;noexpand@;:notex}
;fi
;ifnum 96=;:CntrlChar
   ;edef;:notex{;noexpand;::notex;noexpand`;:notex}
;fi
;:temp   ;catcode`;\=0    ;catcode`;;=12 
    \def\::notex#1#2{\let\:notex=\:undefined
                     \let\::notex=\:undefined
       %
       \ifx \documentstyle\:undefined \errmessage{LaTeX is missing}\fi
       \documentstyle{book} \let\cleardoublepage=\clearpage
       \textwidth=469.75499pt   \textheight=643.20255pt
       \topmargin=-0.5in  \oddsidemargin=0pt  \evensidemargin=0pt
       \begin{document}
       \hbadness=10000  \vbadness=10000  \hfuzz=99in \vfuzz=\hfuzz
       \tableofcontents   \begingroup
       %
       \def\:amp{#2}
       \def#1{\begingroup
          \catcode`\ =12   \catcode`\^^M=12    \catcode`\^^I=12
          \expandafter\catcode\:CntrlChar=12   \:doAmp  }
       %
       \def\:doAmp##1{\endgroup
          \if      ##1<  \def\:next####1#1>{\<####1\>}%
\else          \def\:next{##1}%
\ifx \:next\:amp
\else\if ##1c  \def\:next{\:sect\chapter}%
\else\if ##1s  \def\:next{ \vfil\:sect\section}%
\else\if ##1u  \def\:next{ \vfil\:sect\subsection}%
\else\if ##1v  \def\:next{\expandafter\def\csname\string
                             @xverbatim\endcsname########1#2{%
                              ########1\end{verbatim}\egroup}%
                          \bgroup\expandafter\catcode\:CntrlChar=12
                          \begin{verbatim}}%
\else\if ##1o  \def\:next####1#1<####2#1>{\OutputCode####1\<####2\>}%
\else\if ##1n  \def\:next{\ClearCode}%
\else\if ##1e  \def\:next{\endgroup\end{document}}%
\else    \edef\:next{\noexpand\errmessage{\:amp##1?}}%
\fi\fi \fi\fi \fi\fi \fi\fi \fi
\:next   }
       %
       \:NoSpecials{12}{0}{255}
       \catcode`\ =10    \catcode`\^^M=5    \catcode`\^^I=10
       \escapechar=\:CntrlChar
       \expandafter\catcode\:CntrlChar=13  }
   \def\:specialactive{\catcode`\_=13
   \catcode`\~=13   \catcode`\\=13   \catcode`\#=13
   \catcode`\$=13   \catcode`\%=13   \catcode`\^=13
   \catcode`\&=13   \catcode`\{=13   \catcode`\}=13 }

\def\:sect{\begingroup \:specialactive \::sect}

\catcode`\/=0   \catcode`\[=1   \catcode`\]=2
\catcode`\@=6   \catcode`\*=14  \:specialactive

/def/::sect at 1@2/par[/endgroup/begingroup
   /def~[/bgroup/tt/char126/egroup]*
   /def\[/bgroup/tt/char92/egroup]*
   /def#[/bgroup/tt/char35/egroup]*
   /def$[/bgroup/tt/char36/egroup]*
   /def%[/bgroup/tt/char37/egroup]*
   /def^[/bgroup/tt/char94/egroup]*
   /def_[/bgroup/tt/char95/egroup]*
   /def&[/bgroup/tt/char38/egroup]*
   /def{[/bgroup/tt/char123/egroup]*
   /def}[/bgroup/tt/char125/egroup]*
   /escapechar=92   @1[@2]/endgroup]

/catcode`/\=0   \catcode`\#=6   \catcode`\$=3   \catcode`\%=14
\catcode`\^=7   \catcode`\&=4   \catcode`\{=1   \catcode`\}=2
\catcode`\_=8   \catcode`\/=12  \catcode`\[=12  \catcode`\]=12
\catcode`\@=11  \catcode`\*=12

\else
   \let\:CntrlChar=\:undefined
   \def\:notex{\let\:notex=\:undefined}
\fi
\:CheckOption{<<<>>>}     \if:Option
\def\:OpenCode#1#2{\def\:OpenCode{#1}\def\:CloseCode{#2}}
\edef\:CloseCode{\noexpand\:OpenCode
  \ifx \CodeDel\:UnDefined{<<<}{>>>}\else \CodeDel\fi }  \:CloseCode
\let\:ModifyAppendCodeI=\ModifyAppendCode
                                   \catcode`\^^M=13
\edef\ModifyAppendCode{%
\catcode`\noexpand\{=12  \catcode`\noexpand\}=12 %
\let\noexpand\::ScanAppend=\noexpand\:ScanAppend %
  \def\noexpand\:ScanAppend\:OpenCode##1^^M##2\:CloseCode{%
                           \noexpand\::ScanAppend{##2}}%
\noexpand\:ModifyAppendCodeI}%
                                             \catcode`\^^M=5
\fi \:CheckOption{[]}
\if:Option \else   \:CheckOption{[[]]}\fi
\def\:temp{}
\if:Option
  \def\:temp{\csname newdimen\endcsname\:BoxDepth}
\def\WindowTitle#1{{\leavevmode
   \leftskip=0em  \rightskip=0em
   \parindent=0em \:BoxDepth=0.4pt
   \setbox0=\hbox{#1}%
   \advance\:BoxDepth by \dp0
   \advance\:BoxDepth by 0.4mm   \raise -\:BoxDepth
   \hbox{\vrule
      \vbox{\hrule          \vskip 0.4mm
            \hbox{\hskip 0.4mm\relax #1\hskip 0.4mm}%
            \vskip 0.4mm    \hrule}%
         \vrule}}}
\let\:ModifyShowCodeIII=\ModifyShowCode
\def\ModifyShowCode#1{\:ModifyShowCodeIII{#1}%
   \def\PortTitle##1{\WindowTitle{\WindowTitle{##1}}}%
   \def\:BackTitle{\hbox{---}}}
\fi   \:temp \:CheckOption{[[]]}
\def\:temp{}
\if:Option
  \let\:ShowCodeI=\:ShowCode
\def\:ShowCode#1{\par\:FrameCode{\:ShowCodeI{#1}}}
\def\:FrameCode#1{\vtop{%
            \advance\hsize by -\leftskip
            \noindent\vrule
            \vtop{\leftskip=0pt    \advance\hsize by -0.8pt
                  \hrule#1\hrule}\vrule}\vskip3pt minus1pt\relax}
\let\:ModifyShowCodeV=\ModifyShowCode
\def\ModifyShowCode#1{\:ModifyShowCodeV{#1}%
           \let\PortTitle=\:PortTitleI
           \def\:BottomTitle{}}
\def\:PortTitleI#1{{\parindent=0pt
           \leftskip=0pt plus 0.5\hsize
           \rightskip=\leftskip #1\par  \vskip-1ex
           \noindent\dotfill\null}}
\let\:ModifyShowLastCodeI=\ModifyShowLastCode
\def\ModifyShowLastCode#1{\:ModifyShowLastCodeI{#1}%
                      \advance\leftskip by -2em   }
\fi   \:temp \:CheckOption{list}  \if:Option
\def\:show{%
   \ifx \:title\empty \def\:show{\ShowCode-}%
   \else              \def\:show{\ShowCode}%
   \fi     \:show}
\fi

\catcode`\-=13 \catcode`\+=13  \if:Option
\def\AfterCode#1{{%
   \def-##1##2{\def\:title{##1}}%
   \let+=\:ignoreII
   #1\relax
   \:show #1}}
\def\:ignoreII#1#2{}
\fi
\catcode`\-=12 \catcode`\+=12

 \:CheckOption{enumerate} \def\:temp{}  \if:Option
   \def\:temp{\csname newcount\endcsname\:LineCount}
   \let\:ModifyShowLastCode=\ModifyShowLastCode
   \def\ModifyShowLastCode{\everypar={\:CountLines
      {\it \:ShowLineCount \quad}}%
      \let\:BottomTitleX=\:BottomTitle
      \def\:BottomTitle{\everypar={}\:BottomTitleX}%
   \:ModifyShowLastCode}
   \def\ResetLineCount{ \global\:LineCount=0 }
   \def\ShowLineCount{\def\:ShowLineCount{\ifnum\:LineCount<100 0\fi
                                          \ifnum\:LineCount<10  0\fi
                                          \the\:LineCount}}
   \def\HideLineCount{\def\:ShowLineCount{}}
   \def\ContLineCount{\def\:CountLines{\global\advance\:LineCount by 1 }}
   \def\PauseLineCount{\def\:CountLines{}}
   \ShowLineCount \ContLineCount
   \def\TagLine[#1]{%
      \edef\:temp{\noexpand\Tag\noexpand{C #1\noexpand}\noexpand{%
                  \the\:LineCount\noexpand}}\:temp}
   \def\RefLine[#1]{\Ref{C #1}}
   \let\:ModifyOutputCodeZ=\ModifyOutputCode
   \def\ModifyOutputCode{\def\RefLine[##1]{}%
      \def\TagLine[##1]{}\:ModifyOutputCodeZ}
\fi
\:temp \:CheckOption{ClearCode}
\if:Option
   \gdef\:EraseCode{}
   \def\ModifyCode#1{%
      \let\clearcode:id=\clearcode::id
      \def\:temp{\gdef\:EraseCode}%
      \expandafter\expandafter\expandafter
      \:temp\expandafter{\:EraseCode~#1}}
   \def\ClearCode{{%
      \def~##1{\global\let##1=\:undefined}%
      \:EraseCode \:CodeNumber=\clearcode::id
\advance\:CodeNumber by 1
\xdef\clearcode::id{\the\:CodeNumber }
}%
      \gdef\:EraseCode{}}
   \let\:ModifyShowCodeVI=\ModifyShowCode
\let\:AfterCodeI=\AfterCode
\let\:RefLineI=\RefLine
\let\:TagLineI=\TagLine
\def\ModifyShowCode#1{\:ModifyShowCodeVI{#1}%
   \def\RefLine[##1]{{\def\clearcode:id{0}\:RefLineI[##1]}}%
   \def\TagLine[##1]{{\def\clearcode:id{0}\:TagLineI[##1]}}%
   \let\clearcode:id=\clearcode::id}
\def\AfterCode#1{\:AfterCodeI{#1}\def\clearcode:id{0}}
\ifx\clearcode:id\:UnDef
   \gdef\clearcode:id{0} \gdef\clearcode::id{0}
\fi

\fi\:CheckOption{LibCode}
\if:Option
\def\LibCode{\bgroup \catcode`\ =9 \catcode`\^^M=9 \catcode`\^^I=9
   \catcode`\,=13   \:LibCode}
\def\:LibCode[#1]{\catcode`\,=12   \:LibC[#1]}
                                      \catcode`\,=13 \catcode`\^^M=13
\def\:LibC[#1]#2(){\egroup                        %
   \def,{ \noexpand\input\space}%
   \edef\:LibFiles{\noexpand\:checkoption , #1 }%
   \def\:next{\let\:xparms=\:parms                %
     \begingroup                                    %
       \let\LibCall=\:LibCall                       %
       \def\AddLibCall####1{}%
       \def\AddNestedLibCall####1{}%
       \def\ifLibEnd{\csname ifx\endcsname\:parms\empty}%
       \csname :LibFiles\endcsname \Comment{}{}%
       \FreeCode\<\:TempFileName\>
       \<\:TempFileName\><<<
         \ >>>      %
       \edef\:temp{\noexpand\OutputCodE
          \noexpand\<\:TempFileName\noexpand\>}%
       \:temp  \input \:TempFileName                %
     \endgroup                                      %
     \::LibC }%
   \def\:parms{#2}%
   \let\:xparms=\empty   \::LibC %
   \let\:parms=\:UnDef  \let\:xparms=\:UnDef}%
\def\LibTempFileName#1{\def\:TempFileName{#1}}
\LibTempFileName{lib.lib}
                                     \catcode`\,=12 \catcode`\^^M=9
\def\::LibC{%
   \ifx       \:parms\empty      \let\:next=\relax
   \else\ifx  \:parms\:xparms    \let\:next=\relax
      \:warn{No code for \string\LibCode\space\:parms}
   \fi\fi   \:next}

\def\LibShow#1{{\tt\par--- Include library component #1}}

\def\:LibShow#1{%
  \AddLibCall{#1}%
  \LibShow{#1}}

\def\:LibCall(#1,#2,#3){%
  \xdef\:parms{%
    (#1,#2,#3)%
    \:parms}%
  \def\temp{\global\let}%
  \expandafter\temp\csname#2 \endcsname=\:LibShow
  \gdef\:LibShow##1{%
    \AddNestedLibCall{(#1,#2,#3)}%
    \def\temp{\global\let\:LibShow=}%
    \expandafter\temp\csname#2 \endcsname
  }%
}

\def\:checkoption{%
  \def\:ShowCode##1{}%
  \def\ProTexMssg##1{}%
  %
  \def\ifoption##1{%
     \let\:rparms=\:parms
     \def\parms{}%
     \def\:lparms{}%
     \def\:cond{##1}%
     \def\:type{}%
     \let\:next=\:ifoption  \:next
     \xdef\:parms{\:lparms\parms\:rparms}%
     \csname ifx\endcsname \:type\:cond
       \xdef\:parms{\:lparms\:rparms}%
       \edef\:next{\noexpand\:LibShow{\parms}}%
       \:next
     }%
  %
  \def\:ifoption{%
     \expandafter\:getoption\:rparms()%
     \ifx \:type\:cond    \let\:next=\relax   \fi
   \:next   }%
  %
  \def\:getoption##1(){%
     \def\:temp{##1}%
     \ifx \:temp\empty \let\:next=\relax
     \else              \::getoption##1()\fi }%
  %
  \def\::getoption(##1,##2,##3)##4(){%
     \edef\:lparms{\:lparms\parms}%
     \def\parms{(##1,##2,##3)}%
     \def\:rparms{##4}%
     \def\:type{##2}}%
}
\fi\def\TextIndex#1{}   \def\SecIndex#1{}
\def\ShowIndex{\:warn{\string\ShowIndex?}}

\:CheckOption{ShowIndex}

\def\:temp{}
\catcode`\-=13 \catcode`\+=13

\if:Option
\def\:temp{\csname newcount\endcsname \:IdxCount}
\def\:GetTrc{%
   \immediate\read15 to \:x
   \ifx \:PAR\:x \let\:GetTrc=\relax
   \else \expandafter\:AddEntry\:x \fi
   \:GetTrc}                           \def\:PAR{\par}

\def\:AddEntry#1{\def\:cs{#1}\futurelet\:p\:RemoveField}
\def\:RemoveField{\ifx .\:p \def\:next##1 {\:AppendEntry}
                  \else    \let\:next=\:AppendEntry \fi \:next}

\def\:AppendEntry#1#2#3{\def\:y{#1}%
   \ifx \:y\:NS \AppendCode\:idx{\endgroup
                   \:Section{#2}{#3}\begingroup}%
      \expandafter\let\csname :idx\the\:IdxCount\endcsname=\:idx
      \def\:temp{\Code\:idx{}}%
      \expandafter\expandafter\expandafter\:temp\expandafter
                      {\csname :idx\the\:IdxCount\endcsname}%
      \advance\:IdxCount by 1
   \else\ifx \:y\:V
      \expandafter\ifx \csname :\:Title #2;;:\endcsname\relax
         \expandafter\Code\csname :\:Title #2;;:\endcsname{}{\?{#2}}%
      \fi
      \expandafter\AppendCode\csname :\:Title #2;;:\endcsname{ #3}%
      \:AddIdx{\csname :\:Title #2;;:\endcsname}%
   \else
      \edef\:cs{\expandafter\string\:cs.:}
\edef\:cs{\expandafter\noexpand\csname\:cs\endcsname}
      \ifx      \:y\:DT \expandafter\Code\:cs{}{\tr{#2}}%
      \else\ifx \:y\:ST \expandafter\AppendCode\:cs{ \underbar{#3}}%
                \:AddIdx{\:cs}%
      \else\ifx \:y\:SC \expandafter\AppendCode\:cs{ #3}%
                \:AddIdx{\:cs}%
   \fi\fi\fi\fi\fi}\def\:AddIdx{%
   \def\:y{\AppendCode\:idx}%
   \expandafter\expandafter\expandafter\:y\expandafter}

\def\SecIndex#1{{\let\:refout=\:trcfile  \def\:TagCs{.}%
   \Tag{section}{{#1};;}}}

\def\TextIndex#1{{\let\:refout=\:trcfile  \def\:TagCs{.}%
   \Tag{user}{#1;;}}}

\let\i:ModifyShowCode=\ModifyShowCode
\let\i:ModifyOutputCode=\ModifyOutputCode
\def\ModifyOutputCode{%
   \ifx \:OpenCode\:UnDef \def\TextIndex##1{}%
   \else  \let\TextIndex=\Text:Index \fi
   \i:ModifyOutputCode}
\def\ModifyShowCode{%
   \ifx \:OpenCode\:UnDef \else  \let\TextIndex=\::TextIndex \fi
   \i:ModifyShowCode }
\let\:TextIndex=\TextIndex
\catcode`\[=1  \catcode`\{=12  \catcode`\]=2  \catcode`\}=12
\def\::TextIndex{#1}[\:TextIndex[#1]]
\def\Text:Index{#1}[]
\catcode`\[=12 \catcode`\{=1   \catcode`\]=12 \catcode`\}=2

\def\:V{user}
\def\:DT{DefineTitle}  \def\:ST{ShowTitle}  \def\:SC{ShowCode}
\def\:NS{section}

\def\:Title#1;;#2;;{#1}
\def\:TitleA#1;;#2;;{$\triangleleft\triangleleft$ #1
   $\triangleright\triangleright$}

\def\:Index{\vfil\eject   \Comment{}{}%
   \immediate\closeout\:trcfile
   \def\ModifyShowCode##1{}%
   \def\ModifyAppendCode##1{}%
   \def\ModifyFrontTitle##1{}%
   \def\ModifyShowLastCode##1{##1}%
   \def\AfterCode##1{}%
   \def\:WriteTrc##1{}%
   \let\:TraceDef=\:ignoreII
   \def\:warn##1{}%
   \def\:gobble##1{}%
   \let\CodeId=\:ignoreII
   \def\ModifyOutputCode##1{\def\:FileName{\jobname.xidx}}%
   \Code\:idx{}{\BeforeIndex\begingroup}%
   \:PauseIndex  \immediate\openin15=\:jobname
   \:GetTrc  \AppendCode\:idx{\endgroup}%
   {\def\?##1{\par\noindent{\tt\:Title ##1;;}\hfill}%
    \def\tr##1{\par\noindent{\tt\:TitleA ##1;;}\hfill}%
    \def\:Section##1##2{{\bf\smallskip\noindent{\:Title ##1;;}\hfill
                         ##2\smallskip}}%
    \def\ModifyShowLastCode##1{%
       \leftskip=0pt \rightskip=0pt
       \def\:LastCode{\:idx}%
       \:SetShowIndex}%
     \let\:FrameCode=\empty
     \expandafter   \ShowCode\:minus\:idx   }}


\def\:ignoreII#1#2{}

\def\:SetShowIndex{\def-##1##2{\expandafter\def\csname
       \expandafter\:gobble##2\endcsname{}}%
                   \def+##1##2{##1}}

\def\BeforeIndex{}
\def\:PauseIndex{}
\def\PauseIndex{\def\PauseIndex{\immediate\read16 to \PressReturn}}
\def\ShowIndex{{%
   \let\:SvCode=\Code
   \def\Code##1{\ModifyCode{##1}\:SvCode##1}%
   \ifx \::AddEntry\:undefined
   \else    \let\:AddEntry=\::AddEntry   \fi
   \:Index   \global\let\:idx=\:undefined }%
   \xdef\:jobname{\jobname.trc\the\pageno}%
   \immediate\openout\:trcfile=\:jobname \relax        }

\xdef\:jobname{\jobname.trc}
    \fi    \catcode`\-=12 \catcode`\+=12   \:temp
\:CheckOption{title+}  \if:Option
   \def\:temp{\def\AlProTex}
   \def\temp:{title,}
   \expandafter\expandafter\expandafter\expandafter\expandafter
       \expandafter\expandafter\:temp\expandafter\expandafter
                      \expandafter{\expandafter \temp:\AlProTex}
\fi
\:CheckOption{title}  \if:Option
       \def\:Name#1{<#1\string\>\endcsname}
\def\:DoName#1{\expandafter#1\csname\:Name}

\def\getTitle:env{\catcode`\_=11 }%
\def\<{\bgroup \getTitle:env \cont:title}%
\def\cont:title#1\>{\egroup\edef\CodeInputLineNo{\the\inputlineno}%
  \:DoName\ifx{#1}\relax
      \edef\:temp{\noexpand\Code\:DoName
         \noexpand{#1}\noexpand{#1\noexpand}}%
      \:DoName\let{#1}=\:undefined
   \else  \def\:temp{\:DoName\AppendCode{#1}}\fi\:temp}

                     \catcode`\.=10 \catcode`\ =13
\let\:ModifyShowCodeIV=\ModifyShowCode%
\def\ModifyShowCode{%
..\def\:gobble##1{}%
..\def\<##1\>{{\def {\space}%
...\:DoName\ifx{##1}\relax%
.....\let\AppendCode=\:gobble%
.....\:DoName\Code{##1}{##1}{}\fi%
..\csname\:Name{##1}}}\:ModifyShowCodeIV}%
\def\:OutputCodeI#1\<#2\>{%
...\let\:SaveSp= \def {}%
...\def\:temp{#2}%
...\ifx\:temp\empty.\def\:temp{ProTexOutput}%
...\else.\let\:temp=\empty.\fi%
...\expandafter\ifx.\csname.\:temp#2\endcsname\relax%
...\else.\immediate\write16{---.AlProTex. warning.---.%
......\string\OutputCode#1%
......\string\<#2\string\>\space.temporarily\space.%
......redefines.\:backslash#2}\fi%
...\edef\:FileName{\:temp#2}%
...\let =\:SaveSp%
...\expandafter\def\csname\:FileName\endcsname{\csname\:Name{#2}}%
...\def\:tempa{\:OutputCodeIV#1}%
...\expandafter\:tempa\csname\:FileName\endcsname%
..\endgroup}%
\catcode`\ =10\catcode`\.=12

\let\:OutputCodeIV=\OutputCode
\def\OutputCode{%
   \begingroup
      \def\<##1\>{\csname\:Name{##1}}%
      \let\:WriteTrcI=\:WriteTrc     \def\:gobble##1{}%
      \def\:WriteTrc{\edef\:TagCs{\string\<\expandafter\expandafter
                              \expandafter\:gobble \:TagCs\string\>}%
                   \:WriteTrcI}
      \catcode` =13 \:OutputCodeI}

\def\OutputCodE\<#1.#2\>{{
   \:DoName\def{#1}{\<#1.#2\>}
   \OutputCode[#2]\<#1\>}}

\def\FreeCode\<#1\>{{%
  \def\temp##1{\global\let##1=\:UnDefined}%
  \:DoName\temp{#1}}}

\def\ShowCode#1{%
   \def\:test{#1}%
   \ifx \:test\:minus  \def\:next{\:iname\:ShowCode}\else
      \def\:next{\:iname\:ShowCode#1}\fi
   \:next}

\def\:iname#1#2{\def\:next{#2}\def\:temp{\<}%
   \ifx \:next\:temp
      \def\:next##1\>{\expandafter#1\csname\:Name{##1}}\else
   \def\:next{#1#2}\fi   \:next}

\def\::AddEntry#1{%
   \ifx #1\<    \let\:Next=\:AddEntryA
   \else        \def\:Next{\def\:cs{#1}\:AddEntryB}\fi
   \:Next }

\def\:AddEntryA#1\>{%
   \edef\:cs{\expandafter\noexpand
             \csname#1:.\endcsname}\:AddEntryB}

\def\:AddEntryB{%
   \futurelet\:p\:RemoveField}%
   \def\:RemoveField{\ifx .\:p \def\:next##1 {\:AppendEntry}%
                  \else    \let\:next=\:AppendEntry \fi \:next}

\let\id:WriteTrc=\:WriteTrc
\def\:WriteTrc#1{%
  \def\:temp{#1}\def\:tempa{ShowTitle}\ifx\:temp\:tempa
     \expandafter\def\expandafter\:TagCs\expandafter
         {\:TagCs.\the\:CodeNumber}%
  \fi
  \id:WriteTrc{#1}}

   \:CheckOption{macro} \if:Option   
\let\:saveMusp=\>

\def\>{\ifmmode \expandafter\:saveMusp \else \expandafter\:CodeMacro \fi }

\def\:CodeMacro(#1)#2\<{%
   \begingroup
     \:getcodeprms(\string\1,\string\2,\string\3,\string\4,%
                       \string\5,\string\6,\string\7,\string\8,\string\9)%
     \xdef\:temp{()#2}%
   \endgroup
   \def\:next{#1}%
   \ifx\:next\empty
      \expandafter\ifx\csname\:temp\space :<\endcsname\relax
          \ifx\:EraseCode\:UnDef\else
             \expandafter\:adderase \csname\:temp\space :<\endcsname
          \fi
      \else
         \:warn{Redefine \string\>\:temp\string\<}%
      \fi
      \def\:next{\expandafter\:getpseducode
                    \csname\:temp\space :<\endcsname{#2}}%
   \else
      \begingroup
        \:getcodeprms(#1,,,,,,,,,)%
        \:protectcommands  \ModifyIndirectCode{(#1)#2}%
        \xdef\:next{\csname\:temp\space :<\endcsname}%
      \endgroup
   \fi
   \:next}

\def\:adderase#1{%
  \def\:next{\gdef\:EraseCode}%
  \expandafter\expandafter\expandafter\:next\expandafter{\:EraseCode~#1}%
}

\def\:getpseducode#1#2{\begingroup
  \:defaultcats
  \ModifyAppendCode{}%
  \:getpseducodeI#1{#2}}

\def\:getpseducodeI#1#2#3{\endgroup
  \def#1{\<#2\>{#3}}%
}%

\def\:getpseducodeII{%
  \ifx \:OpenCode\:UndDef
  \else
    \edef\:getpseducodeI{%
       \def\noexpand
          \:getpseducodeI####1####2####3\:OpenCode####4\:CloseCode{%
                             \endgroup
          \def\noexpand\:temp{####3}%
          \noexpand\ifx\noexpand\:temp\noexpand\empty
            \def####1{\noexpand\<####2\noexpand
                             \>\:OpenCode####4\:CloseCode}%
          \noexpand\else
            \errmessage{\string\>()...\string
                            \<...?...\:OpenCode...\:CloseCode}
            \let####1=\noexpand\:UnDef
          \noexpand\fi
       }%
    }%
    \:getpseducodeI
  \fi
  \let\:getpseducodeII=\:UndDef
}
                   \catcode`\ =13 \catcode`\^^M=13 \catcode`\^^I=13
                                 \catcode`\#=14      \catcode`\%=12
\def\:protectcommands{#
\let\<=\relax#
\let\>=\relax#
\let\%=\csname#
\expandafter\let\%NL%\endcsname=\relax#
\let\%=\relax#
\let\ =\relax#
\let^^M=\relax#
\let^^I=\relax#
\ifx\TagLine\:UnDef\else\let\TagLine=\relax\fi#
\ifx\RefLine\:UnDef\else\let\RefLine=\relax\fi#
}
                                 \catcode`\#=6       \catcode`\%=14
                    \catcode`\ =10 \catcode`\^^M=9 \catcode`\^^I=10

\def\ModifyIndirectCode#1{}
\def\:getcodeprms(#1,#2,#3,#4,#5,#6,#7,#8,#9){%
   \def\1{#1}%
   \def\2{#2}%
   \def\3{#3}%
   \def\4{#4}%
   \def\5{#5}%
   \def\6{#6}%
   \def\7{#7}%
   \def\8{#8}%
   \def\9##1,##2){\def\9{##1}}%
   \9#9,)}  \fi
   \:CheckOption{title}\if:Option   \def\TitleAlias#1#2{%
   \expandafter\let\csname C\string#1\endcsname=\<%
   \expandafter\let\csname O\string#1\endcsname=\OutputCode
   \def\<##1\>{\def\:temp{##1}\def\:tempa{#2}%
      \ifx \:temp\:tempa
        \def\:temp{\csname C\string#1\endcsname#1\>}\else
        \def\:temp{\csname C\string#1\endcsname##1\>}\fi \:temp}
   \def\OutputCode##1\<##2\>{\def\:temp{##2}\def\:tempa{#2}%
      \ifx \:temp\:tempa
         \def\:temp{\csname O\string#1\endcsname##1\<#1\>}%
      \else \def\:temp{\csname O\string#1\endcsname##1\<##2\>}\fi
      \:temp}}
  \fi
\fi
\:CheckOption{eline}
\catcode`\%=12
\if:Option
  \let\:ModifyOutputCodeJ=\ModifyOutputCode
  \def\ModifyOutputCode{\def\:Ln{ %^^J}\:ModifyOutputCodeJ}
\fi  \catcode`\%=14
\:CheckOption{ShowFile}
\if:Option
\catcode`\^^I=13\catcode`\ =13\catcode`\^^M=13%
\def\:ObeyIn{\CodeFont\parindent=0pt%
   \parskip=0pt\everypar{}%
   \:NoSpecials{12}{0}{255}\catcode`\ =13%
   \catcode`\^^M=13\catcode`\^^I=13%
   \def^^M{\leavevmode\par}\def^^I{  }%
   \def {\leavevmode\:Sp}}%
\catcode`\^^M=5\catcode`\ =10\catcode`\^^I=10
\expandafter\ifx \csname :Sp\endcsname\relax
  \expandafter\def\csname :Sp\endcsname{ }
\fi
\def\ShowFile#1{{\:ObeyIn    \openin15=#1
  \ifeof15 \:warn{\string\ShowFile{#1}?}\else
    \input #1 \fi \closein15 }}
\else  \def\ShowFile#1{\:warn{\string\ShowFile?}}
\fi\let\Note=\empty   \let\EndNote=\empty

\:CheckOption{NoShow}  \if:Option
   \let\:svShowCode=\:ShowCode
   \def\ShowOn{\let\Note=\empty
               \let\:ShowCode=\:svShowCode}
   \def\ShowOff{\let\Note=\:NoShow
                \def\:ShowCode##1{}}
   \def\:NoShow{\begingroup
      \:NoSpecials{11}{0}{255}\:EndNoShow}
   \catcode`\/=0   \catcode`\\=11
   /def/:EndNoShow#1\EndNote{/endgroup}
   /catcode`/\=0   /catcode`//=12
\fi\:CheckOption{ShowTop}
\catcode`\-=13  \catcode`\+=13
\if:Option
\def\:ShowTop#1{{\par
   \def\ModifyFrontTitle##1{\def\:AppendSign{}}%
   \def\ModifyShowLastCode##1{\let\:save=-%
      \def\:LastCode{#1}%
      \def-####1####2{\let-=\:save}%
      \def+####1####2{{\ShowSep\let+=\:ignoreII ####1}}}%
   \ShowCode#1}}

\def\ShowSep{}
\def\ShowTop{\:iname\:ShowTop}
\def\:ignoreII#1#2{}
\def\:iname#1#2{\def\:next{#2}\def\:temp{\<}%
   \ifx \:next\:temp
      \def\:next##1\>{\expandafter#1\csname\:Name{##1}}\else
   \def\:next{#1#2}\fi   \:next}
\fi
\catcode`\-=12  \catcode`\+=12
\def\LinkPort{\:HRefCode{)\clearcode:id P:}}
\def\LinkWindow{\:HRefCode{)\clearcode:id Z:}}
\def\:HRefCode#1\<#2\>{}
\:CheckOption{info}  \if:Option
   \let\inf:ModifyOutputCode=\ModifyOutputCode
   \def\ModifyOutputCode#1{%
     \inf:ModifyOutputCode{#1}%
     \expandafter\ifx \csname \Extension :cdinfo\endcsname \relax \else
         \edef\:FileName{\:FileName}%
         \expandafter\expandafter\csname \Extension :cdinfo\endcsname
                                           \:FileName!*?: %
     \fi   }
   \def\CodeInfo{\futurelet\:temp\cd:inf}
   \edef\cd:inf{\noexpand\ifx [\noexpand\:temp
                   \let\noexpand\:temp=\noexpand\cdi:nf
      \noexpand\else \def\noexpand\:temp{\noexpand\cdi:nf
                                   [\:InitAlProTex]}\noexpand\fi
      \noexpand\:temp}
   \def\cdi:nf[#1]{\expandafter\def\csname
                             #1:cdinfo\endcsname##1.##2!*?: }
\fi

\ifx \HCode\:UnDef \ifx \Htmltrue\:UnDef
   \def\:temp{\csname newif\endcsname}
   \expandafter\:temp \csname ifHtml\endcsname  \Htmlfalse
\fi

\def\EndLink{\ifx \empty:lnk\empty \HCode{}\fi}
\def\:HRef{\ifx [\:temp \expandafter\::HRef
           \else \expandafter\:::HRef \fi }
\def\HT:tag{\ifx -\let:val   \expandafter\H:Tag
            \else            \expandafter\HTa:g\fi }
\def\HTa:g{\H:Tag-}
\def\Link{\let\:attr\empty \futurelet\let:val\HRefT:ag}
\def\HRefT:ag{\ifx -\let:val \expandafter\H:RefTag
              \else          \expandafter\HRefTa:g\fi   }
\def\HRefTa:g{\H:RefTag-}
\def\H:RefTag#1{\futurelet\:temp\:HRefTag}
\def\:HRefTag{\ifx [\:temp \expandafter\::HRefTag
              \else \expandafter\:::HRefTag \fi }

\def\HCode#1{}
\def\H:Tag#1#2{}
\def\::HRef[#1]#2{}
\def\:::HRef#1{}
\def\::HRefTag[#1]#2#3{}
\def\:::HRefTag#1#2{}
\def\:TagHTag#1{}


 \fi
\:CheckOption{html}
   \if:Option  \else \:CheckOption{xhtml}\fi
\if:Option
   \def\WindowTitle#1{\leavevmode\hbox{%
   \disable:
   \expandafter\ifx\csname \clearcode:id W-#1\endcsname\relax
   \let \:temp=\empty
\else
   \edef\:temp{ \HREF:"\expandafter\get:href
                     \csname \clearcode:id W-#1\endcsname -"}%
\fi
\html:addr
\HCode{<\tag:A\:newlnch \NAME:"\expandafter\get:htag\last:haddr -"\:temp
          >}\ttl:del{<.}\HCode{}%
\expandafter\expandafter\expandafter\global\expandafter\let
                    \csname \clearcode:id W-#1\endcsname=\last:haddr
%
   \expandafter\ifx\csname \clearcode:id :cw:#1\endcsname\relax
   \expandafter\expandafter\expandafter\global
       \expandafter\def\csname \clearcode:id :cw:#1\endcsname{0}%
   \Tag{)\clearcode:id Z:#1}{\last:haddr}%
\fi
\frag:href{)\clearcode:id P:#1}{}#1\HCode{}%
%
   \:nextlink{\clearcode:id :cw:#1}{.>}%
%
   }}
\def\disable:{\let\rm=\empty \let\tt=\empty
   \let\sl=\empty \let\bf=\empty  \let\it=\empty }
\def\frag:href#1#2{%
   \HCode{<\tag:A\:newlnch \HREF:"%
     \expandafter\ifx \csname  cw:#1\endcsname \relax
        \expandafter\get:href\last:haddr -%
  \else
     \expandafter\expandafter\expandafter\get:href\csname
          cw:#1\endcsname -%
  \fi
"#2>}}
\def\html:PortTitle#1{\hbox{%
  \disable:
  \bgroup  \def\:Sp{\space}%
  \html:addr
  \ifx\:AppendSign\empty
     \HCode{<\tag:A\:newlnch \NAME:"\get:htag\last:haddr-">}%
     \expandafter\expandafter\expandafter\global\expandafter\edef
            \csname \clearcode:id 9:#1\endcsname{0}%
  \else
     \HCode{<\tag:A\:newlnch \HREF:"\expandafter\get:href
             \csname \space\clearcode:id P:#1\endcsname-"
             \NAME:"\get:htag\last:haddr-">}%
  \fi
  \ttl:del{<..}\HCode{}%
  \expandafter\expandafter\expandafter\global\expandafter\let
                    \csname \space\clearcode:id P:#1\endcsname=\last:haddr
\egroup
%
  \bgroup  \def\:Sp{\space}%
   \ifx\:AppendSign\empty
      \Tag{)\clearcode:id P:#1}{\last:haddr}%
   \fi
   \frag:href{)\clearcode:id Z:#1}{\ifx \:LastCodeLabel\empty \else
   \expandafter\html:codeid\:LastCodeLabel\fi
%
}%
\egroup
#1\HCode{}%
%
  \:nextlink{\clearcode:id 9:#1}{..}%
%
  }}
\def\:HRefCode#1\<#2\>{{%
  \let\clearcode:id=\clearcode::id
  \expandafter\ifx\csname
                 cw:#1#2\endcsname\relax
     \HCode{<\tag:A>}\else
     \HCode{<\tag:A\:newlnch \HREF:"}\expandafter\get:href
            \csname  cw:#1#2\endcsname
     -\HCode{">}%
  \fi}}
\def\:nextlink#1#2{%
   \bgroup  \def\:Sp{\space}%
      \def\:lbl{)\the\tmp:cnt :#1}%
      \tmp:cnt=\csname #1\endcsname\space
      \html:addr
      \Tag{\:lbl}{\last:haddr}%
      \advance\tmp:cnt by 1\space
      \expandafter\xdef\csname #1\endcsname{\the\tmp:cnt}%
      \expandafter\ifx\csname  cw:\:lbl\endcsname\relax
         \HCode{<\tag:A\:newlnch
                   \NAME:"\expandafter\get:htag\last:haddr-">}%
      \else
         \HCode{<\tag:A\:newlnch
                     \NAME:"\expandafter\get:htag\last:haddr-"\space
                     \HREF:"\expandafter\expandafter\expandafter
                                \get:href\:LikeRef{\:lbl}-">}%
      \fi
      \ttl:del{#2>}\HCode{}%
   \egroup
}
\def\:LikeRef#1{\csname  cw:#1\endcsname}
\let\html:ShowCode=\ShowCode
\def\ShowCode{\par \html:ShowCode}
\let\html:ModifyShowCode=\ModifyShowCode
\def\ModifyShowCode#1{%
   \def\%##1\%{\c:protex##1\d:protex}%
   \html:ModifyShowCode{#1}%
   \let\PortTitle=\html:PortTitle
   \let\:FrontTitle=\frnt:ttl
   \def\:BackTitle{\b:protex\par}%
   \let\:CodeSkip=\empty
   \def\:TopTitle##1{{\:FrontTitle{##1}}}%
   \def\:BottomTitle{\:BackTitle}%
   \let\html:ModifyShowLastCode=\ModifyShowLastCode
\ifx\:ModifyShowLastCode\:UnDeF   \def\:CntLines##1{}\else
                                  \def\:CntLines{\:CountLines}\fi
\def\ModifyShowLastCode##1{%
   \ifx \:test\:minus
      \def\:CodeSkip{{\par\parindent=0pt\leftskip=0pt
                      \everypar{}\b:protex\par}%
                      \global\:removeindenttrue}%
      \leavevmode\a:protex\par
   \else   \global\:removeindenttrue   \fi
   \html:ModifyShowLastCode{##1}%
   \everypar{\e:protex \:CntLines {\it \:ShowLineCount \quad}}%
}%
\f:protex
%
   }
\def\frnt:ttl#1{{\htmlprotex:par
      {\expandafter\ifx \csname ListCounter\endcsname\relax
         \else  \:removeindentfalse \fi       \leavevmode}%
      \PortTitle{#1}\:AppendSign}\a:protex
    }%
\def\a:protex{%
%   \ifvmode \csname IgnorePar\endcsname
%   \else    \hfil\break\fi
%   \csname EndP\endcsname
   \HCode{\ifx \:test\:minus  \else 
      \fi
      \html:src\html:invisible}%
   \nobreak %  \hskip\leftskip  \hskip\parindent
}
\def\b:protex{\HCode{\html:BackTitle\html:src}}
\def\e:protex{\HCode{
      \html:invisible}}
\def\c:protex{\HCode{}}
\def\d:protex{\HCode{}}
\def\f:protex{\def\:Sp{\HCode{\string }}}
\long\def\c:ShowCode:#1#2#3#4#5#6{\def\a:protex{#1}%
   \def\b:protex{#2}\def\e:protex{#3}\def\c:protex{#4}%
   \def\d:protex{#5}\def\f:protex{\def\:Sp{#6}}}
\def\L:Del{<..}
\def\l:Del{<.}
\def\R:Del{..>}
\def\ttl:del#1{\def\:tempa{#1}%
   \ifx \:tempa\L:Del \L:del
   \else \ifx \:tempa\l:Del \l:del
   \else \ifx \:tempa\R:Del \R:del
   \else \r:del \fi\fi\fi}
\def\HShowCode#1#2#3#4#5{%
   \def\:temp{#1#2}\ifx \:temp\empty \else
     \def\L:del{#1}\def\R:del{#2}\fi
   \def\:temp{#3#4}\ifx \:temp\empty \else
     \def\l:del{#3}\def\r:del{#4}\fi
   \def\:temp{#5}\ifx \:temp\empty \else
     \def\html:BackTitle{#5}\fi
}
\bgroup
\catcode`\_=12
\gdef\:temp{\HShowCode{<..}{..>}{<.}{.>}{-_-_-}} \aftergroup\:temp
\egroup
\let\html:ProTexMssg=\ProTexMssg
\def\ProTexMssg{%
   {\let\:gobble=\empty\def\:TagCs{\:FileName}\:WriteTrc{FileName}}%
   \html:ProTexMssg  }
\catcode`\^^I=13\catcode`\ =13\catcode`\^^M=13%
\def\:ObeyIn{\CodeFont\parindent=0pt%
   \parskip=0pt\everypar{}%
   \:NoSpecials{12}{0}{255}\catcode`\ =13%
   \catcode`\^^M=13\catcode`\^^I=13%
   \def^^M{\leavevmode\e:protex\par}\def^^I{  }%
   \def {\leavevmode\:Sp}}%
\catcode`\^^M=5\catcode`\ =10\catcode`\^^I=10
\expandafter\ifx \csname :Sp\endcsname\relax
  \expandafter\def\csname :Sp\endcsname{ }
\fi
\def\ShowFile#1{{\:ObeyIn    \openin15=#1
  \ifeof15 \:warn{\string\ShowFile{#1}?}\else
    \a:ShowFile\input #1 \b:ShowFile \fi \closein15 }}
\def\a:ShowFile{\ifvmode \csname IgnorePar\endcsname\fi
   \csname EndP\endcsname
   \HCode{
      \html:src\html:invisible}\hfill\break
   \f:protex }
\def\b:ShowFile{\HCode{
      \html:src}}
\long\def\c:ShowFile:#1#2{\def\a:ShowFile{#1}\def\b:ShowFile{#2}}
\def\html:codeid#1Q#2"#3{ \NAME:
   "Q#2"}
\ifx \aXrefFile\:UnDef \let\aXrefFile=\empty \fi

\def\CodeId#1#2{\expandafter\ifx
    \csname  cw:)F\aXrefFile \file:id
                    \empty F-\endcsname\relax
  \else\:LikeRef{)F\aXrefFile \file:id\empty F-}\fi
  \:sharp              Q\make:addr{#2}"#1%
  \ifx \CodeInputLineNo\:UnDef \the\inputlineno \else \CodeInputLineNo\fi}
\let\showttl:WriteTrc=\:WriteTrc
\def\:WriteTrc#1{%
  \def\:temp{#1}\def\:tempa{ShowCode}\ifx\:temp\:tempa
     \def\:TagCs{\expandafter\trc:shw\:LastCodeLabel\trc:shw}%
  \else \ifx \id:WriteTrc\:Undef
     \def\:tempa{ShowTitle}\ifx\:temp\:tempa
     \expandafter\def\expandafter\:TagCs\expandafter
         {\:TagCs.\the\:CodeNumber}%
  \fi \fi \fi
  \showttl:WriteTrc{#1}}
\def\trc:shw#1"#2\trc:shw{#2 "#1"}
\ifx \footline\:UnDef \else
   \footline={\hfil}   \headline={\hfil}
\fi
\def\HREF:{ href=}
\def\tag:A{a}
\def\NAME:{ name=}
\def\make:addr#1{%
   \ifnum\clearcode:id>0 \romannumeral\clearcode:id Q\else PrTx\fi
   #1}
\ifx\clearcode:id\:UnDef
     \def\clearcode::id{0}  \def\clearcode:id{0}
\fi
\ifx \html:par\:UnDef \def\html:par{\HCode{
      }} \fi
\def\html:invisible{\string }
\expandafter\ifx\csname htmlprotex:par\endcsname\relax
   \ifx\:removeindenttrue\:UnDef
      \def\:removeindenttrue{\let\:Undef=\:Undef}
   \fi
   \def\htmlprotex:par{{\everypar{}\csname
                HtmlPar\endcsname}\HCode{\html:src}}
\fi
\ifx\html:addr\:UnDeF
   \immediate\write16{--- needs --- tex4ht \jobname\space ---}%
\ifx\tmp:cnt\:UnDeF    \csname newcount\endcsname\tmp:cnt \fi
\def\g:advance#1{\bgroup \def\:temp{#1}%
                 \tmp:cnt=#1\afterassignment\:gplus \advance\tmp:cnt}
\def\:gplus{\expandafter\xdef\:temp{\the\tmp:cnt}\egroup}
\def\html:lbl{1}
\def\html:addr{\xdef\last:haddr{\file:id-\html:lbl}%
     \g:advance\html:lbl by 1\relax }
\ifx  \file:id\:UnDef
   \gdef\file:id{1}
   \global\let\maxfile:id=\file:id
\fi
\hbadness=10000      \vbadness=10000
\:CheckOption{fussy}  \if:Option  \else
   \hfuzz=99in          \vfuzz=\hfuzz
\fi
\hyphenpenalty=1000  \exhyphenpenalty=1000
\def\html:rightskip{\rightskip = 0pt plus 0.5\hsize  minus0.5\hsize }
\html:rightskip
\ifx \ht:special\:UnDef
   \let\ht:special=\special
\fi
\def\HCode#1{\ifx \EndPicture\:UnDef
   \ifvmode\leavevmode\fi\ht:special{t4ht=#1}\fi}
\let\:HCode=\HCode
\def\NewLineChar{\bgroup \catcode`\^=7 \:NewLineChar}
\def\:NewLineChar#1{\egroup \def\:newlnch{ #1}}
\NewLineChar{^^J}
\def\::HRef[#1]{\get:attr{#1}\::hRef\:::HRef}
\def\::HRefTag[#1]{\get:attr{#1}\::hRefTag\:::HRefTag}
\def\get:attr#1{\edef\:attr{\noexpand\get:atr #1 !*?: }\:attr}
\def\get:atr#1 #2!*?: #3#4{\def\:attr{\space#2}%
   \def\:te:mpa{#1}\ifx \:te:mpa\empty \let\:te:mpa#4\else
   \def\:te:mpa{#3[#1]}\fi \:te:mpa}
\def\H:Tag#1#2{\:TagHTag{#2}\HCode{<\tag:A\:newlnch
   \NAME:"#2"\empty:lnk>}}
\def\::hRef[#1]#2{%
   \HCode{<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{}\else
             \HREF:"#1\if\relax#1\relax \else\:sharp #2\fi"\fi
           \:attr \empty:lnk>}}
\def\:::HRef#1{%
   \HCode{<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{}\else
               \HREF:"\get:hfile{#1}\:sharp #1"\fi \:attr \empty:lnk>}}
\def\::hRefTag[#1]#2#3{%
   \if\relax#3\relax\else\:TagHTag{#3}\fi
   \HCode{<\tag:A\:newlnch \if\relax#1#2\relax \NOHREF:{#3}\else
                 \HREF:"#1\if\relax#2\relax \else\:sharp #2\fi"\fi
               \if\relax#3\relax\else\space \NAME:"#3"\fi
             \:attr \empty:lnk>}}
\def\:::HRefTag#1#2{%
   \if\relax#2\relax\else\:TagHTag{#2}\fi
   \HCode{<\tag:A\:newlnch \if\relax#1\relax \NOHREF:{#2}%
                 \else\HREF:"\get:hfile{#1}\:sharp #1"\fi
               \if\relax#2\relax\else\space  \NAME:"#2"\fi
             \:attr \empty:lnk>}}
\let\empty:lnk=\empty
\def\NOHREF#1{\space}
\def\:TagHTag#1{\ifx -\let:val\else \Tag{)Q\aXrefFile #1}{\file:id}\fi}
\def\get:href{\expandafter\get::href}
\def\get::href#1-#2-{\ifnum #1=\file:id\space         \else
      \:LikeRef{)F\aXrefFile #1\empty F-}\fi
   \:sharp \make:addr{#2}}
\def\get:htag{\expandafter\get::htag}
\def\get::htag#1-#2-{\make:addr{#2}}
\ifx \aXrefFile\:UnDef \let\aXrefFile=\empty \fi

\def\get:hfile#1{%
   \expandafter\ifx\csname
                cw:)Q\aXrefFile #1\endcsname\relax
      \get at hfile{#1}%
   \else
      \expandafter\expandafter\expandafter\get::hfile
          \csname  cw:)Q\aXrefFile #1\endcsname,//%
   \fi  }
\def\get::hfile#1,#2//{%
   \ifnum \file:id=0#1  \else
       \expandafter\ifx
   \csname  cw:)F\aXrefFile #1%
                 \empty F-\endcsname\relax \else
      \:LikeRef{)F\aXrefFile #1\empty F-}%
\fi %
   \fi }
\ifx\get at hfile\:Undef \let\get at hfile=\:gobble \fi
      \let\html:src=\empty
\catcode`\#=12   \def\:sharp{#}   \catcode`\#=6

   \Htmltrue
\fi


\fi\:CheckOption{_^}  \if:Option
\def\du:cc{\catcode`\_=13  \catcode`\^=13  \let\du:cc=\:UnDef}
\let\:sub=_  \let\:sup=^
\catcode`\_=13  \catcode`\^=13
\def_{\ifmmode \:sub \else \string_\fi}
\def^{\ifmmode \:sup \else \string^\fi}
\:CheckOption{html}
   \if:Option  \else \:CheckOption{xhtml}\fi
\if:Option
  \append:def\SUBOn{\def_{\ifmmode \:sub \else \string_\fi}}
  \append:def\SUPOn{\def^{\ifmmode \:sup \else \string^\fi}}
\fi

  \fi\:CheckOption{pdf}
\if:Option
  \ifx \hyper:link\:UnDef   \let\:temp=\hyper:target
\else                     \let\:temp=\:UnDef      \fi
                            \ifx \:temp\:UnDef
\def\hyper:link{\hyperlink}
\def\hyper:target{\hypertarget}
\def\:temp{\ifx\pdfstartlink\:UnDef       
      \let\pdfstartlink\pdfannotlink
  \fi
  \ifx \pdfstartlink\:UnDef
     \long\def\hyper:target##1##2{\special
            {html:}\special{html:}}%
     \long\def\hyper:link##1##2{\special
            {html:}##2\special{html:}}%
  \else
     \long\def\hyper:target##1##2{\pdfdest name {##1} xyz}%
     \long\def\hyper:link##1##2{%
        \leavevmode \pdfstartlink  goto name {##1}##2\pdfendlink }    %
  \fi
}
\ifx \hyperlink\:UnDef  \:temp
\else   \ifx \hypertarget\:UnDef \:temp \fi \fi
                            \fi
\let\hyper::WindowTitle=\WindowTitle
\def\WindowTitle#1{\bgroup
   \def\WindowTitle##1{##1}%
   \xdef\:temp{\noexpand\H:WindowTitle{#1}}\egroup \:temp}

\def\H:WindowTitle#1{\leavevmode\hbox{%
   \expandafter\ifx\csname \clearcode:id W-#1\endcsname\relax
       \ttl:del{<.}%
   \else
       \hyper:link{\expandafter\get:href
           \csname \clearcode:id W-#1\endcsname -}{\ttl:del{<.}}%
   \fi
   \html:addr
   \hyper:target{\expandafter\get:htag\last:haddr -}{}%
   \expandafter\expandafter\expandafter\global\expandafter\let
                    \csname \clearcode:id W-#1\endcsname=\last:haddr
   \expandafter\ifx\csname \clearcode:id :cw:#1\endcsname\relax
      \expandafter\expandafter\expandafter\global
          \expandafter\def\csname \clearcode:id :cw:#1\endcsname{0}%
      \Tag{)\clearcode:id Z:#1}{\last:haddr}%
   \fi
   \def\:temp##1{\leavevmode \hbox{$\triangleleft
      \triangleleft$}~##1~\hbox{$\triangleright \triangleright$}}%
   \ifx \:temp    \hyper::WindowTitle \def\hyper::WindowTitle##1{~##1~}\fi
   \hyper::WindowTitle{\frag:href{)\clearcode:id P:#1}{#1}}%
   \:nextlink{\clearcode:id :cw:#1}{.>}%
   }}
\let\hyper::ModifyShowCode=\ModifyShowCode
\def\ModifyShowCode#1{%
   \hyper::ModifyShowCode{#1}%
   \let\H:PortTitle=\PortTitle
   \let\PortTitle=\hyper::PortTitle
   }
\let\hyper::PortTitle=\PortTitle
\def\hyper::PortTitle#1{\hbox{%
  \def\:Sp{ }%
  \bgroup
     \html:addr
     \hyper:target{\get:htag\last:haddr-}{}%
     \ifx\:AppendSign\empty
        \expandafter\expandafter\expandafter\global\expandafter\edef
               \csname \clearcode:id 9:#1\endcsname{0}%
        \ttl:del{<..}%
     \else
        \hyper:link{\expandafter\get:href
             \csname \space\clearcode:id P:#1\endcsname-}{\ttl:del{<..}}%
     \fi
     \expandafter\expandafter\expandafter\global\expandafter\let
             \csname \space\clearcode:id P:#1\endcsname=\last:haddr
  \egroup
  \bgroup
      \ifx\:AppendSign\empty
         \Tag{)\clearcode:id P:#1}{\last:haddr}%
      \fi
      \def\:temp##1{\leavevmode \hbox{$\triangleright
         \triangleright$}~##1~\hbox{$\triangleleft \triangleleft$}}%
      \ifx \:temp\H:PortTitle \def\H:PortTitle##1{~##1~}\fi
            \H:PortTitle{\frag:href{)\clearcode:id Z:#1}{#1}}%
   \egroup
  \:nextlink{\clearcode:id 9:#1}{..>}%
}}
\def\frag:href#1#2{%
   \hyper:link{%
     \expandafter\ifx \csname  cw:#1\endcsname \relax
        \expandafter\get:href\last:haddr -%
  \else
     \expandafter\expandafter\expandafter
                \get:href\csname cw:#1\endcsname -%
  \fi}{#2}}
\def\:nextlink#1#2{%
   \bgroup    \def\:Sp{\space}%
      \def\:lbl{)\the\tmp:cnt :#1}%
      \tmp:cnt=\csname #1\endcsname\space
      \Tag{\:lbl}{\last:haddr}%
      \advance\tmp:cnt by 1\space
      \expandafter\xdef\csname #1\endcsname{\the\tmp:cnt}%
      \expandafter\ifx\csname  cw:\:lbl\endcsname\relax
         \ttl:del{#2}%
      \else
         \hyper:link{\expandafter\expandafter\expandafter
                       \get:href\:LikeRef{\:lbl}-}{\ttl:del{#2}}%
      \fi
   \egroup
}
\let\:sharp=\empty   \def\clearcode::id{0}  \def\clearcode:id{0}
\def\file:id{1}
\def\get:href{\expandafter\get::href}
\def\get::href#1-#2-{\ifnum #1=\file:id\space         \else
      \:LikeRef{)F\aXrefFile#1\empty F-}\fi
   \:sharp \make:addr{#2}}
\def\get:htag{\expandafter\get::htag}
\def\get::htag#1-#2-{\make:addr{#2}}
\def\get:hfile#1{%
   \expandafter\ifx\csname
                cw:)Q\aXrefFile#1\endcsname\relax
      \get at hfile{#1}%
   \else
      \expandafter\expandafter\expandafter\get::hfile
          \csname  cw:)Q\aXrefFile#1\endcsname,//%
   \fi  }
\ifx \aXrefFile\:UnDef \let\aXrefFile=\empty \fi
\def\get::hfile#1,#2//{%
   \ifnum \file:id=0#1  \else
       \expandafter\ifx
   \csname  cw:)F\aXrefFile#1%
                 \empty F-\endcsname\relax \else
      \:LikeRef{)F\aXrefFile#1\empty F-}%
\fi %
   \fi }
\ifx\get at hfile\:Undef \let\get at hfile=\:gobble \fi
\def\L:Del{<..}
\def\l:Del{<.}
\def\R:Del{..>}
\def\ttl:del#1{\def\:tempa{#1}%
   \ifx \:tempa\L:Del \L:del
   \else \ifx \:tempa\l:Del \l:del
   \else \ifx \:tempa\R:Del \R:del
   \else \r:del \fi\fi\fi}
\def\HShowCode#1#2#3#4#5{%
   \def\:temp{#1#2}\ifx \:temp\empty \else
     \def\L:del{#1}\def\R:del{#2}\fi
   \def\:temp{#3#4}\ifx \:temp\empty \else
     \def\l:del{#3}\def\r:del{#4}\fi
   \def\:temp{#5}\ifx \:temp\empty \else
     \def\html:BackTitle{#5}\fi
}
\HShowCode{$\triangleleft\triangleleft$}
          {$\triangleright\triangleright$}
          {$\triangleright\triangleright$}
          {$\triangleleft\triangleleft$}   {}
\ifx\tmp:cnt\:UnDeF    \csname newcount\endcsname\tmp:cnt \fi
\def\g:advance#1{\bgroup \def\:temp{#1}%
                 \tmp:cnt=#1\afterassignment\:gplus \advance\tmp:cnt}
\def\:gplus{\expandafter\xdef\:temp{\the\tmp:cnt}\egroup}
\def\html:lbl{1}
\def\html:addr{\xdef\last:haddr{\file:id-\html:lbl}%
     \g:advance\html:lbl by 1\relax }
\def\make:addr#1{%
   \ifnum\clearcode:id>0 \romannumeral\clearcode:id Q\else PrTx\fi
   #1}

\def\:LikeRef#1{\csname  cw:#1\endcsname}

\fi \def\AlProTex{\:warn{AlProTex already loaded}}
\let\:InitAlProTex=\:undefined
\let\:CheckOption=\:undefined
\let\:GetOptions=\:undefined

\def\:temp{ \let\:temp=\:undefined
   \csname :notex\endcsname \csname :getpseducodeII\endcsname
    \endinput}
\:RestoreCatcodes
\csname :temp\endcsname



--- NEW FILE DraTex.sty ---
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  v 1.6
%  DraTex                                               %
%  Copyright (C) 1992 by Eitan M. Gurari                %
%                                                       %
% This program can redistributed and/or modified under  %
% the terms of the LaTeX Project Public License         %
% Distributed from CTAN archives in directory           %
% macros/latex/base/lppl.txt; either version 1 of the   %
% License, or (at your option) any later version.       %
%                                                       %
% However, you are allowed to modify this program       %
% without changing its name, if you modify its          %
% signature. Changes to the signature can be introduced %
% with a directive of the form                          %
%            \message{signature}                        %
%                                                       %
%                            gurari at cse.ohio-state.edu  %
%                http://www.cse.ohio-state.edu/~gurari  %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
   \catcode`\noexpand\noexpand\noexpand \^=\the\catcode`\^%
}
\catcode`\^=7
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
   \csname :RestoreCatcodes\endcsname
   \catcode`\noexpand \_=\the\catcode`\_%
   \catcode`\noexpand :=\the\catcode`:%
   \catcode`\noexpand @=\the\catcode`@%
   \catcode`\noexpand /=\the\catcode`/%
   \catcode`\noexpand &=\the\catcode`&%
   \catcode`\noexpand \^^M=\the\catcode`\^^M%
   \catcode`\noexpand \^^I=\the\catcode`\^^I%
   \let\expandafter\noexpand
       \csname:RestoreCatcodes\endcsname=\noexpand\undefined}
\catcode`\:11  \catcode`\@11
   \let\:wlog\wlog \def\wlog#1{}
   \def\:wrn#1#2{\immediate\write\sixt@@n{--DraTeX warning--
      \ifcase #1
    DraTex.sty already loaded              
\or \string\Draw\space within \string\Draw 
\or Changing definition of \string#2      
\or No intersection points: #2            
\or Improper rotation of axes: #2         
\or (#2) in \string\DSeg\space is a point 
\fi}}
\def\:err#1#2{\errmessage{--DraTeX error-- \ifcase #1
     \string#2\space meaningless in three dimensions 
\or  \string#2\space meaningless in two dimensions   
\or  No \string\MarkLoc(#2)            
\or  \string#2 in three dimensions     
\or  Too many parameters in definition 
\or  \string\MoveFToOval(#2)? 
\fi}}
   \ifx\:Xunits\:undefined \else \:wrn0{} \fi
   \catcode`\ 9  \catcode`\^^M9 \catcode`\^^I9
      \def\:UBorder{0}
\newdimen\:LBorder \newdimen\:RBorder\chardef\:eight=8
\mathchardef\:cccvx=360
\newdimen\:mp    \:mp   0.1\p@
\newdimen\:mmp   \:mmp  0.01\p@
\newdimen\:mmmp  \:mmmp 0.001\p@
\newdimen\:XC    \:XC   90\p@
\newdimen\:CVXXX \:CVXXX180\p@
\newdimen\:CCCVX \:CCCVX\:cccvx\p@ \newdimen\:TeXLoc
\newbox\:box\newif\if:IIID  \newdimen\:Z   \newdimen\:Zunits
\newdimen\:Ex   \newdimen\:Ey  \newdimen\:Ez

\def\:AbsVal#1{ \ifdim#1<\z at -\fi #1 }
\def\:abs#1{\ifdim #1<\z@ #1-#1 \fi}
\def\:AbsDif#1#2#3{  #1#2   \advance#1  -#3
   \ifdim #1<\z@ #1-#1 \fi}
\def\:diff#1#2#3{ #1#2  \advance#1 -#3 }
\def\:average#1#2#3{
   #1#2  \advance#1  #3   \divide#1 \tw@}\def\:Opt#1#2#3#4{
   \def\:temp{
      \ifx      \:next\ifnum \def\:next{#3#1#4#2}
      \else\ifx \:next#1     \def\:next{#3}
      \else                  \def\:next{#3#1#4#2}\fi\fi \:next}
   \futurelet\:next\:temp}\def\Define#1{\:multid#1
   \:Opt(){\:Define#1}0}

\def\:DraCatCodes{\catcode`\ 9   \catcode`\^^M9
   \expandafter\ifx  \csname ;catcode\endcsname\relax %
   \expandafter\edef  \csname ;catcode\endcsname{%
        \catcode`;\the\catcode`\;}%
\fi            %
\catcode`;12 %
%
   \catcode`\^^I9  \catcode`\&13  \catcode`\~13 }

\def\:Define#1(#2){\begingroup  \:DraCatCodes  \::Define#1(#2)}

\def\::Define#1(#2)#3{\endgroup
   \let\:NextDefine\NextDefine
   \let\NextDefine\relax
   \ifcase#2\relax
      \def#1{#3}\or
      \:TxtPar\def#1(##1){#3}\or
         \:TxtPar\def#1(##1,##2){#3}\or
   \:TxtPar\def#1(##1,##2,##3){#3}\or
   \:TxtPar\def#1(##1,##2,##3,##4){#3}\or
   \:TxtPar\def#1(##1,##2,##3,##4,##5){#3}\or
   \:TxtPar\def#1(##1,##2,##3,##4,##5,##6){#3}\or
   \:TxtPar\def#1(##1,##2,##3,##4,##5,##6,##7){#3}\or
   \:TxtPar\def#1(##1,##2,##3,##4,##5,##6,##7,##8){#3}\or 
      \:TxtPar\def#1(##1,##2,##3,##4,##5,##6,##7,##8,##9){#3}\or
      \:err4{}\fi      \let\:TxtPar\relax  \:NextDefine}

\let\NextDefine\relax\let\:TxtPar\relax
\def\WarningOn{\def\:multid##1{
   \ifx ##1\:undefined \else \:wrn2##1\fi}}
\def\:gobble#1{}
\def\WarningOff{\let\:multid\:gobble}     \WarningOff
\Define\Indirect{\futurelet\:next\:Indirect}

\Define\:Indirect{\:theDoReg
   \ifx \:next<
      \def\:temp{\let\DoReg\:DoReg}
      \def\:next<##1>{\expandafter\:temp\csname :<##1>\endcsname}
   \else
      \def\:next##1<##2>{
         \expandafter\ifx \csname :<##2> \endcsname \relax
               \def\:next{##1}     \fi
\:indrwrn\Define     \:indrwrn\Object
\:indrwrn\Table      \:indrwrn\IntVar     \:indrwrn\DecVar 
         \def\:temp{\let\DoReg\:DoReg##1}
         \expandafter\:temp \csname :<##2> \endcsname}
   \fi      \:next}  \def\:indrwrn#1{    \def\:temp{#1}
   \ifx \:next\:temp \def\:wrn##1##2{\let\:wrn\::wrn} \fi}
\let\::wrn\:wrn 
\Define\:Hline{
   \setbox\:box\hbox{\vrule height0.5\:thickness
                    depth 0.5\:thickness width\:x}
   {\:d\:X \advance\:d \wd\:box
 \advance\:X -\:TeXLoc   \global\:TeXLoc\:d
 \vrule width\:X depth\z@ height\z@
 \raise \:Y \box\:box} }\Define\:Vline{
   \setbox\:box\hbox{\vrule width\:thickness
                 \ifdim \:y>\z@ height\:y  depth\z@
                 \else          height\z@  depth-\:y \fi}
   \advance\:X  -0.5\:thickness
   {\:d\:X \advance\:d \wd\:box
 \advance\:X -\:TeXLoc   \global\:TeXLoc\:d
 \vrule width\:X depth\z@ height\z@
 \raise \:Y \box\:box} }\Define\:MvTo(2){\:X#1\:Xunits \:Y#2\:Yunits}
\Define\:Mv(2){\advance\:X  #1\:Xunits
               \advance\:Y  #2\:Yunits}
\def\:DLn(#1,#2,{\:MvTo(#1,#2) \:LnTo(}\Define\:LnTo(2){
   \:x#1\:Xunits \advance\:x  -\:X
   \:y#2\:Yunits \advance\:y  -\:Y
   \:Ln(\:x\du,\:y\du) }\Define\:Ln(2){
   \:x#1\:Xunits \:y#2\:Yunits
   { \ifdim \:x<\z@
        \advance\:X \:x   \:x-\:x
        \advance\:Y \:y   \:y-\:y
     \fi
     \:yy\:AbsVal\:y
     \:dd\:yy \advance\:dd \:x
     \ifdim \:dd>\:mmmp
        \ifdim \:x>\:yy
           { \ifdim\:X<\:LBorder \global\:LBorder\:X\fi
\advance \:X  \:x
\ifdim \:X>\:RBorder \global\:RBorder\:X\fi\advance \:Y  0.5\:thickness
\ifdim \:Y>\:UBorder \xdef\:UBorder{\the\:Y} \fi
\advance \:Y  \:y
\ifdim \:Y>\:UBorder \xdef\:UBorder{\the\:Y} \fi }
           \let\:Yunitsy\:x  \let\:Xunitsx\:y  \let\:temp\:Hline
           \:dd0.6\:yy    \:divide\:dd\:x  
        \else
           { \advance \:X  -0.5\:thickness
\ifdim \:X<\:LBorder \global\:LBorder\:X \fi
\advance \:X  \:thickness
\advance \:X  \:x
\ifdim \:X>\:RBorder \global\:RBorder\:X\fi
\ifdim \:Y>\:UBorder \xdef\:UBorder{\the\:Y} \fi
\advance \:Y  \:y
\ifdim \:Y>\:UBorder \xdef\:UBorder{\the\:Y} \fi }
           \let\:Yunitsy\:y  \let\:Xunitsx\:x  \let\:temp\:Vline
           \:dd0.6\:x
\ifdim \:x>\:mmp    \:divide\:dd\:yy   \fi
        \fi
        \advance\:dd  0.4\p@
\:ragged\:Cons\:dd\:ragged
        \:HVLn
      \fi }
   \advance\:X  \:x   \advance\:Y  \:y}\Define\:HVLn{
   \:xx\:AbsVal\:Xunitsx  \:divide\:xx\:ragged
   \advance\:xx  0.99\p@   \:K\:InCons\:xx \relax
   \ifnum \:K>\z@
      \divide\:Xunitsx \:K  \advance\:K \@ne
      \divide\:Yunitsy \:K
   \else \:K\@ne  \fi  \:NextLn}


\Define\:NextLn{
   \ifnum\:K=\z@  \let\:NextLn\relax
   \else  { \:temp }  \advance\:K  \m at ne
      \advance\:X  \:x   \advance\:Y  \:y
   \fi   \:NextLn}\newdimen\:ragged

\Define\Ragged(1){    \:ragged#1\p@  \:ragged0.1\:ragged }
\Ragged(7.5)
\Define\PaintUnderCurve(4){{
   \:Z\:Y   \def\:next{\Curve(#1,#2,#3,#4)}
   \MoveToLoc(#1)  \:d\:X   \MoveToLoc(#4)
   \advance\:d -\:X
   \ifdim \:AbsVal\:d<\:mmp  \def\:next{}
   \else
      \def\:CrvLnTo(##1,##2){
         \:x \:X   \:y  \:Y    \:X\:DJ  \:Y\:yyyy
         \:xx\:X   \:dddd \:Y  \:X\:x  \:Y\:y
         { \advance\:Y  \:dddd   \divide\:Y \tw@
           \advance\:Z -\:Y
           \advance\:Y   0.5\:Z
           \:dddd  \:AbsVal \:Z  \:d\z@
           \def\:CrvLnTo{\:LnTo}
           \:yy\:Y  \:dd\:dddd  \:ddd\:dddd
           \::paint  }}
    \fi \:next       }}
\Define\DoCurve(1){ \let\:StopCurve\:SlowCurve
  \def\:CMv(##1){  \:x\:X \:y\:Y   \:MvTo(##1)
      \advance\:x -\:X   \advance\:y -\:Y
      \:xxx \:x    \:yyy\:y}
   \:DoCurve{\Curve(#1)}
   \let\:StopCurve\:FastCurve}

\def\:DoCurve#1(#2)#3{{\XSaveUnits
   \def\:next{#1}    \:MvTo(#2,#2)
   \:x\:AbsVal\:X  \:y\:Y  \:ddd\z@  \:length
   \:Z\:d   \:divide\:Z{1.41421\p@}
   \edef\:tempa{\the\:DoDist}   \global\:DoDist\z@
   \def\:CrvLnTo(##1){ \MarkLoc(1^)    \:CMv(##1)
      { \MarkLoc(2^)   \:ddd\z@    \:length
\:dd  \:DoDist  \global\advance\:DoDist  \:d
\:ddd \:DoDist  \:divide\:ddd\:Z
\DoReg\:InCons\:ddd  \:Z\DoReg\:Z

      \ifdim \:Z>\:dd
         \advance\:Z -\:DoDist
\advance\:dd -\:DoDist
\:divide\:Z\:dd
\advance\:X \:Cons\:Z\:xxx
\advance\:Y \:Cons\:Z\:yyy   \:DoRot 
         \def\:CrvLnTo{\:LnTo}
         \def\:OvalLn{\:Ln}  \XRecallUnits    #3 \fi}}
   \:next    \xdef\:DoDim{\:Cons\:DoDist}
   \global\:DoDist\:tempa     }
   \let\DoDim\:DoDim}

\newdimen\:DoDist\def\:DoRot{ \DSeg\RotateTo(1^,2^) }
\def\DoLine(#1,#2)(#3)#4{
   \MarkLoc($1)  \Move(#1,#2)
   \def\:next{   { \MarkLoc($2)
     \DSeg\RotateTo($1,$2)   \let\:DoRot\relax
     \edef\:RecallRagged{\the\:ragged} \MoveTo(#3,#3)
     \:x\:AbsVal\:X  \:y\:Y  \:ddd\z@  \:length
     \:ragged\:d   \divide\:ragged \tw@
     \DoCurve($1,$1,$2,$2)(#3)
        {\:ragged\:RecallRagged #4}  }
   \let\DoDim\:DoDim}  \:next }
\def\Table#1{\begingroup  \:DraCatCodes   \:multid#1
   \:DefineData#1}


\def\:DefineData#1#2{\endgroup
   \let\:temp~  \def~{\noexpand~}
   \edef#1{\noexpand\:DoPoly\expandafter\noexpand\csname
              :\string#1\endcsname}
   \expandafter\edef  \csname :\string#1\endcsname
       ##1{\noexpand\ifcase##1(#2)\noexpand\fi}
   \let~\:temp   \:DoNextPoly   \:DoNextPoly}

\def\:OR{\let\:or\or}  \:OR \catcode`\&13  \def&{)\noexpand\:or(}

\def\TableData{\begingroup  \:DraCatCodes  \:TableData}

\def\:TableData#1#2#3{\endgroup   \Table\:temp{#3}
   \:K\z@   \:J\z@    \def\:tempa(##1){\advance\:J \@ne }
   \:temp(0,999){\:tempa}    \let\:tempa&      \def\:temp{\def#1}
   \def&##1&{
      \ifnum  \:K<\:J
         \advance\:K \@ne
         \ifnum  \:K=\@ne   \def#1{#2(##1)}
         \else
            \:IIIexpandafter\:temp\expandafter{
               #1 & #2(##1) }
         \fi
      \else  \let\:next\relax \fi
      \:next}
   \let\:next&     &&   \let&\:tempa }

\catcode`\&4  \def\:DoPoly#1(#2,#3)#4{
   \expandafter\let \csname :Back\the\:level\endcsname\:or
\expandafter\edef\csname :DoVars\the\:level\endcsname{
   \:DoB\the\:DoB}
\advance\:level  \@ne
   \:DoB#3  \advance\:DoB -#2
   \def\:PolyOr(##1){
      \ifnum  \:DoB=\z@  \:OR
      \else   #4(##1)   \advance\:DoB \m at ne    \fi}
   \:OR
   \def\:temp{\let\:or\:PolyOr #4}
   \:IIIexpandafter\:temp#1{#2}
   \advance\:level  \m at ne
\csname :DoVars\the\:level\endcsname
\def\:temp{\let\:or}
\expandafter\:temp\csname :Back\the\:level\endcsname }
\Define\PaintRect(2){\def\:next{{   \MarkLoc(^)
   \MoveToLoc(^) \Move( #1,0) \MarkLoc(^1) \Move(0,#2)
   \MarkLoc(^2)  \Move(-#1,0) \MarkLoc(^3)
   \PaintQuad(^,^1,^2,^3)        }}\:next}
\Define\PaintRectAt(4){\def\:next{{   \MoveTo(#1,#2)
   \:Ex#3\p@ \advance\:Ex -#1\p@
   \:Ey#4\p@ \advance\:Ey -#2\p@
   \PaintRect(\:Cons\:Ex,\:Cons\:Ey)}}
   \:next}\def\::paint{
   \ifdim \:d<\:ragged      \advance\:xx -\:X
      \:yyy\:Y \:xxx\:dddd
      \advance\:Y \:yy  \divide\:Y \tw@
      \:average\:dddd\:dd\:ddd
      \def\:next{\:brush(\:xx,\z@)\:Y\:yyy\:dddd\:xxx}
   \else  \divide\:d \tw@
      \:average\:x\:X\:xx
      \:average\:y\:Y\:yy
      \:average\:dddd\:dd\:ddd
   \fi   \:next}\Define\:paint{{   \:AbsDif\:d\:xx\:x
   \ifdim \:d<\:mmp  \let\::paint\relax
   \else
      \ifdim  \:y >\:yyy   \:dd\:y   \:y \:yyy   \:yyy \:dd  \fi
      \ifdim  \:yy>\:yyyy  \:dd\:yy  \:yy\:yyyy  \:yyyy\:dd  \fi
      \:AbsDif\:dd\:yyyy\:yyy      \:AbsDif\:ddd\:yy\:y
      \ifdim \:dd<\:ddd  \:dd\:ddd  \fi
      \ifdim \:d >\:dd   \:d\:dd  \fi
      \advance\:d \:d      \:diff\:dd\:y\:yyy
      \:diff\:ddd\:yy\:yyyy
      \advance\:y    -0.5\:dd    \:abs\:dd
      \advance\:yy   -0.5\:ddd   \:abs\:ddd
      \:X\:x  \:Y\:y
      \:average\:dddd\:dd\:ddd
      \def\:next{ \:lpaint \:rpaint }
   \fi
   \::paint }}

\Define\:lpaint{ { \:xx\:x  \:yy \:y  \:ddd\:dddd  \::paint} }
\Define\:rpaint{ { \:X \:x  \:Y  \:y  \:dd \:dddd  \::paint} }
\Define\PaintQuad(4){\def\:next{{\Units(1pt,1pt)
   \MoveToLoc(#1)  \:x  \:X  \:y  \:Y
   \MoveToLoc(#2)  \:xx \:X  \:yy \:Y
   \MoveToLoc(#3)  \:xxx\:X  \:yyy\:Y
   \MoveToLoc(#4)  \:xxxx  \:X  \:yyyy \:Y
   
   \:paintQuad  }}\:next}

\def\:paintQuad{{
   \:SetVal\:a\:x\:y\:xx\:yy\:xxxx\:yyyy
\:SetVal\:b\:xx\:yy\:xxx\:yyy\:x\:y
\:SetVal\:c\:xxx\:yyy\:xx\:yy\:xxxx\:yyyy
\:SetVal\:cc\:xxxx\:yyyy\:xxx\:yyy\:x\:y
\def\:A{\:a} \def\:B{\:b} \def\:C{\:c} \def\:D{\:cc}
\:sort\:B\:A
\:sort\:C\:B  \:sort\:B\:A
\:sort\:D\:C  \:sort\:C\:B  \:sort\:B\:A
\let\:temp\relax
\:IsTriang\:A\:B
\:IsTriang\:B\:C
\:IsTriang\:C\:D
\:temp  
   \:Quad\:A\:temp>   \:xxxx\:xx \:yyyy\:yy \:Z\:d
\:Quad\:D\:next<   
   \:PrePaint(\:xx,\:yy,\:d,\:xxxx,\:yyyy,\:Z)
   \:temp  \:next }}
\Define\:PrePaint(6){
   \:x#1 \:y#2 \:yyy#3 \:xx#4 \:yy#5 \:yyyy#6
   \:paint }\def\:Quad#1#2#3{
         \:GetVal#1\:x\:y0
   \:GetVal#1\:xx\:yy1
   \:GetVal#1\:xxx\:yyy2
   \ifdim \:xx#3\:xxx
      \:ddd\:xx   \:xx\:xxx   \:xxx\:ddd
      \:ddd\:yy   \:yy\:yyy   \:yyy\:ddd
   \fi
          \def#2{}
   \:diff\:dd\:xxx\:xx
   \ifdim \ifdim\:AbsVal\:dd<\:mp  \:yy=\:yyy   \else  \z@>\z@  \fi
      
      \:d\:yy
   \else
      \ifdim \:AbsVal\:dd>\:mp
         \:diff\:dd\:xxx\:x   \:diff\:ddd\:yyy\:y
         \:divide\:ddd\:dd    \:diff\:dd\:xx\:xxx
         \:ddd\:Cons\:ddd\:dd   \advance\:ddd \:yyy
         \:d\:ddd
      \else \:d\:yyy \fi
      \edef#2{  \noexpand\:PrePaint
         (\the\:x ,\the\:y ,\the\:y,
         \the\:xx,\the\:yy,\the\:d)    }
   \fi}\def\:SetVal#1#2#3#4#5#6#7{
   \edef#1{(\the#2,\the#3,\the#4,\the#5,\the#6,\the#7)}}

\def\:sort#1#2{
   \ifdim \:IIIexpandafter\:field#1 <
          \:IIIexpandafter\:field#2
      \let\:temp#1  \let#1#2  \let#2\:temp
   \fi  }

\Define\:field(6){#1}

\def\:GetVal#1#2#3{
   \:IIIexpandafter\::GetVal #1#2#3}

\def\::GetVal(#1,#2,#3,#4,#5,#6)#7#8#9{
      \ifcase #9 #7#1   #8#2\or #7#3   #8#4\or #7#5   #8#6 \fi}
\def\:IsTriang#1#2{
   \ifdim \:IIIexpandafter\:field#1 =
          \:IIIexpandafter\:field#2
      \ifdim \:IIIexpandafter\:fieldB#1 =
             \:IIIexpandafter\:fieldB#2
         \def\:temp{ \:FixTria }
   \fi \fi      }


\def\:FixTria{
   \edef\:temp{\:IIIexpandafter\:FrsII\:B}
   \ifdim \:IIIexpandafter\:field\:A =
          \:IIIexpandafter\:field\:B
      \ifdim \:IIIexpandafter\:fieldB\:A =
             \:IIIexpandafter\:fieldB\:B
          \edef\:temp{\:IIIexpandafter\:FrsII\:C}
   \fi\fi
   \edef\:A{\:IIIexpandafter\:FrsII\:A}
   \edef\:D{\:IIIexpandafter\:FrsII\:D}
   \edef\:temp{
      \def\noexpand\:a{(\:A,\:temp,\:D)}
      \def\noexpand\:b{(\:temp,\:A,\:D)}
      \def\noexpand\:c{\noexpand\:b}
      \def\noexpand\:cc{(\:D,\:A,\:temp)}}
   \:temp
   \def\:A{\:a}  \def\:B{\:b}  \def\:C{\:c}  \def\:D{\:cc}  }

\Define\:fieldB(6){#2}
\Define\:FrsII(6){#1,#2}
\def\:IIIexpandafter{\expandafter\expandafter\expandafter}

\Define\DrawRect(2){ \Line( #1,0) \Line(0, #2)
                     \Line(-#1,0) \Line(0,-#2)}

\Define\DrawRectAt(4){{
   \MoveTo(#1,#2) \LineTo(#3,#2) \LineTo(#3,#4)
   \LineTo(#1,#4) \LineTo(#1,#2)}}
\def\du#1{ \ifx#1\:Xunits   \else\ifx#1\:Yunits
      \else\ifx#1\:Zunits   \else #1
      \fi \fi \fi}
\let\:svdu=\du
\Define\XSaveUnits{
   \expandafter\edef\csname XRecallUnits\the\:level\endcsname{
      \:StoreUnits}
    \advance\:level  \@ne}

\Define\XRecallUnits{
   \advance\:level \m at ne
   \csname XRecallUnits\the\:level \endcsname}

\Define\SaveUnits{
   \edef\RecallUnits{ \:StoreUnits }  }

\Define\:StoreUnits{       \:Xunits \the\:Xunits
   \:Yunits \the\:Yunits \:Zunits \the\:Zunits
   \:Xunitsx\the\:Xunitsx \:Xunitsy\the\:Xunitsy
\:Yunitsx\the\:Yunitsx \:Yunitsy\the\:Yunitsy }
\Define\:SearchDir{
   \ifdim \:x<\z@  \:x-\:x  \:y-\:y
   \edef\:tempA{\advance\:ddd  \ifdim \:y<\z@ - \fi\:CVXXX}
\else         \def\:tempA{} \fi
\ifdim \:y<\z@
   \edef\:tempA{\:ddd-\:ddd \advance\:ddd  \:CCCVX \:tempA}
   \:y-\:y
\fi
\ifdim \:y>\:x
   \:ddd\:y \:y\:x \:x\:ddd
   \edef\:tempA{\advance\:ddd  -\:XC \:ddd-\:ddd \:tempA}
\fi
   \:divide\:y\:x  \:d57.29578\:y
   \:ddd\:d       \:sqr\:y  \:K  \@ne
   \Do(1,30){\advance\:K \tw@
      \:d-\:Cons\:y\:d  \:dd\:d  \divide\:dd \:K
      \advance\:ddd \:dd  }
   \advance\:ddd -0.49182\:dd
   \:tempA }\Define\Curve(4){\def\:next{{  \XSaveUnits \Units(1pt,1pt)
   \MoveToLoc(#1) \:DI \:X  \:DK \:Y
   \MoveToLoc(#2) \:ddd \:X  \:Ez \:Y
   \MoveToLoc(#3) \:dd\:X  \:Ey\:Y
   \MoveToLoc(#4) \:DJ\:X  \:yyyy\:Y   \:Curve    }}\:next}
\Define\:FastCurve{   \:AbsDif\:d\:DI\:ddd  \:AbsDif\:dddd\:DK\:Ez
   \advance\:d \:dddd
   \ifnum \:d<\:ragged
      \:AbsDif\:d\:DJ\:dd \:AbsDif\:dddd\:yyyy\:Ey
      \advance\:d \:dddd                     \fi}
\let\:StopCurve\:FastCurve
\Define\:SlowCurve{
   \:AbsDif\:d\:DI\:DJ  \:AbsDif\:dddd\:DK\:yyyy
   \advance\:d \:dddd                     }
\Define\:Curve{   \:StopCurve
   \ifnum \:d<\:ragged   \:X\:DI \:Y\:DK
                    \:CrvLnTo(\:Cons\:DJ,\:Cons\:yyyy)
   \def\:SubCurves{}  \fi
   \:SubCurves}

\def\:CrvLnTo{\:LnTo}\Define\:SubCurves{
   \:average\:yy\:DI\:ddd     \:average\:Ex\:DK\:Ez
   \:average\:ddd\:ddd\:dd    \:average\:Ez\:Ez\:Ey
   \:average\:dd\:dd\:DJ  \:average\:Ey\:Ey\:yyyy
   \:average\:Zunits\:yy\:ddd    \:average\:Vdirection\:Ex\:Ez
   \:average\:ddd\:ddd\:dd    \:average\:Ez\:Ez\:Ey
   \:average\:DL\:Zunits\:ddd  \:average\:xxxx\:Vdirection\:Ez
   { \:ddd \:yy  \:Ez \:Ex   \:dd\:Zunits
     \:Ey\:Vdirection \:DJ\:DL \:yyyy\:xxxx \:Curve }
   \:DI \:DL \:DK \:xxxx               \:Curve   }
\def\MoveToCurve[#1]{
   \Define\:BiSect(3){\MoveToLoc(##1)
      \CSeg[#1]\Move(##1,##2)
   \MarkLoc(##3) }\:MvToCrv}

\Define\:MvToCrv(4){  \:BiSect(#1,#2,:a) \:BiSect(#2,#3,:b)
   \:BiSect(#3,#4,:c) \:BiSect(:a,:b,:A) \:BiSect(:b,:c,:B)
   \:BiSect(:A,:B,:Q)}
\Define\:OvalDir(3){   \:CosSin{#3\p@}
   \:Zunits\p@   \:d#2\:Zunits   \:x\:Cons\:d\:x
   \:Zunits\p@   \:d#1\:Zunits   \:y\:Cons\:d\:y
   \:SearchDir   }\Define\DrawOval   (2){ \DrawOvalArc(#1,#2)(0,\:cccvx) }
\Define\PaintOval  (2){ \PaintOvalArc(#1,#2)(0,\:cccvx) }
\Define\DrawCircle (1){ \DrawOval(#1,#1) }
\Define\PaintCircle(1){ \PaintOval(#1,#1) }
\def\DrawOvalArc(#1,#2)(#3,#4){{
       \:xxxx#4\p@  \advance\:xxxx -#3\p@
       \ifdim \:xxxx=\z@ \else
   \let\:SinOne\:SinB  \:OvalDir(#1,#2,#3)  \:DJ\:ddd
\:OvalDir(#1,#2,#4)  \:diff\:DI\:ddd\:DJ
\ifdim\:DI<\z@ \advance\:DI  \:CCCVX \fi
\ifdim \:xxxx<\:CCCVX \else \:DI\:CCCVX \fi
\:InitOval(#1,#2)  \:CosSin\:DJ 
   \:xxxx\:x  \:yyyy\:y   \:xx\:X  \:yy\:Y
   \advance\:X \:Xx\:x  \advance\:X \:Yx\:y
   \advance\:Y \:Xy\:x  \advance\:Y \:Yy\:y
   \let\:Xunits\empty  \let\:Yunits\empty
   \Do(1,\:InCons\:DI){
      \:dd\:X  \:ddd\:Y  \:X\:xx  \:Y\:yy
      \:AdvOv\:xxx\:yyy\:xxxx\:yyyy
      \:X\:dd  \:Y\:ddd
      \advance\:xxx -\:X   \advance\:yyy -\:Y
      \:d\:AbsVal\:xxx
      \advance\:d  \:AbsVal\:yyy
      \ifdim \:d>\:ragged
         \:OvalLn(\:xxx,\:yyy)  \fi  }
   \:OvalDir(#1,#2,#4)    \:CosSin\:ddd
   \advance\:xx \:Xx\:x  \advance\:xx \:Yx\:y
   \advance\:yy \:Xy\:x  \advance\:yy \:Yy\:y
   \advance\:xx -\:X     \advance\:yy -\:Y
   \:OvalLn(\:xx,\:yy) \fi }}

\def\:OvalLn{\:Ln}\def\DoOvalArc(#1)(#2){   \:xx\:X  \:yy\:Y
   \def\:CMv(##1){  \:Mv(\:xxx,\:yyy)
      \:x\:xxx  \:y\:yyy}
   \:DoCurve{             \:X\:xx  \:Y\:yy
       \def\:DoRot{  \let\:Xunits\:XunitsReg
                     \let\:Yunits\:YunitsReg
                     \DSeg\RotateTo(1^,2^)     }
       \let\::OvalLn\:CrvLnTo
\Define\:OvalLn(2){ \:dd\:AbsVal####1
   \advance\:dd \:AbsVal####2 \:divide\:dd\:ragged
   \:J\:InCons\:dd  \advance\:J  \@ne
   \divide####1  \:J  \divide####2  \:J
   \Do(1,\:J){\::OvalLn(####1,####2)}}
       \DrawOvalArc(#1)(#2)}}
\def\NextTable{\begingroup  \:DraCatCodes \:NextTable}

\def\:NextTable#1{\endgroup
  \def\:DoNextPoly{#1\NextTable{}}}
\NextTable{}\def\:AdvOv#1#2#3#4{
   \:d\:CosOne#3 \advance\:d -\:SinOne#4
   #4\:CosOne#4    \advance#4     \:SinOne#3   #3\:d
   \divide#3 \:eight  \divide#4 \:eight
   #1\:X   #2\:Y
   \:d\:Xx#3  \advance\:d \:Yx#4  \advance#1  \:d
   \:d\:Xy#3  \advance\:d \:Yy#4  \advance#2  \:d  }

\def\:CosOne{7.99878}   \def\:SinB{0.13962}
\def\PaintOvalArc(#1,#2)(#3,#4){{ \ifdim #3\p@=#4\p@
                      \let\:next\relax  \else
   \:d\:AbsVal{#1\:Xunits} \advance\:d \:AbsVal{#2\:Yunits}
   \ifdim \:d<3\:ragged   \divide \:d \tw@   \PenSize(\:d)
\:Mv(-0.5\:d\du,0)  \:Ln(\:d\du,0)
   \else    \:InitOval(#1,#2)
      \MarkLoc(o$)   \RotateTo(#3) \MoveFToOval(#1,#2)
      \:Ex\:X  \:Ey\:Y   \edef\:FirstOvDir{\:Cons\:ddd\p@}
      \MoveToLoc(o$) \RotateTo(#4) \MoveFToOval(#1,#2)
      \:Ez \:X  \:Vdirection \:Y   \edef\:LastOvDir{\:Cons\:ddd\p@}
      \MoveToLoc(o$)
      \if:rotated
      \:Zunits\p@     \:Zunits#1\:Zunits
      \:xx\:Cons\:Zunits\:Xunitsx
      \:Zunits\p@     \:Zunits#2\:Zunits
      \:yy\:Cons\:Zunits\:Yunitsx
      \:x\:xx  \:y\:yy  \:ddd\z@  \:length
      \:ddd\:d  \:divide\:xx\:ddd   \:divide\:yy\:ddd
\else \:xx\p@  \:yy\z@   \fi
      \:AbsDif\:d{#3\p@}{#4\p@}
      \ifdim \:d>359\p@ \:Ez-\:Xx\:xx  \advance\:Ez -\:Yx\:yy
\:Vdirection-\:Xy\:xx  \advance\:Vdirection -\:Yy\:yy
\advance\:Ez \:X  \advance\:Vdirection \:Y
\:setpaint\:PaintOvOv<> 
      \else
         \:x\:xx \:y\:yy \:SearchDir
\:xxx\:FirstOvDir  \advance\:xxx -\:ddd
\ifdim \:xxx<\z@    \advance\:xxx \:CCCVX  \fi
\:yyy\:LastOvDir   \advance\:yyy -\:ddd
\ifdim \:yyy<\z@    \advance\:yyy \:CCCVX  \fi
\:J\z@
\ifdim \:xxx<\:yyy  \ifdim        \:yyy<\:CVXXX
            \:Pntovln\:FirstOvDir\:FirstOvDir\:LastOvDir
\else \ifdim  \:xxx>\:CVXXX
            \:Pntovln\:FirstOvDir\:FirstOvDir\:LastOvDir
\else \:yyy-\:yyy  \advance\:yyy \:CCCVX
      \ifdim  \:xxx<\:yyy
            \:setpaint\:PntLeftOvOv><  \:PntMovln\:FirstOvDir\:xx
      \else \:FxLx  \:setpaint\:PntLeftOvOv><  \:Pntmovln\:LastOvDir
\fi  \fi  \fi
\else               \ifdim        \:xxx<\:CVXXX
            { \:setpaint\:PaintOvOv<> }  \:FxLx  \:setpaint\:PntLeftOvOv><
\:Usrch  \:PaintMidOvLn\:LastOvDir\:FirstOvDir
\else \ifdim  \:yyy>\:CVXXX
            { \:FxLx \:setpaint\:PaintOvOv<>  } \:setpaint\:PntLeftOvOv><
 \:Dsrch  \:PaintMidOvLn\:LastOvDir\:FirstOvDir
\else \:xxx-\:xxx  \advance\:xxx \:CCCVX
      \ifdim  \:yyy<\:xxx
            \:setpaint\:PaintOvOv<>    \:PntMovln\:FirstOvDir\:xx
      \else
            \:FxLx  \:setpaint\:PaintOvOv<>   \:Pntmovln\:LastOvDir
\fi  \fi  \fi  \fi
   \fi \fi \fi}}\def\:setpaint#1#2#3{{\aftergroup#1
\:d\:Xx\:xx   \advance\:d \:Yx\:yy
\ifdim \:d<\z@  \aftergroup#3
\else           \aftergroup#2  \fi}}
\def\:FxLx{\:d\:Ex  \:Ex\:Ez  \:Ez\:d}

\def\:Pntovln#1{
   \let\:SinOne\:SinB     \:CosSin#1
   \:xxxx\:Ex  \:yyyy\:Ey  \:Z\z@
   \:PaintOvLn}

\def\:PntMovln{
   \:Dsrch  \:FxLx   \:xx\:ddd  \:PaintOvLn}

\def\:Pntmovln{
   \:Usrch  \:FxLx  \:xx\:ddd   \:PaintOvLn\:xx}
\def\:PaintMidOvLn#1#2{
   \:FxLx   \:xx\:ddd  \:PaintOvLn#1#2
   \:xxx\:Ez  \:yyy\:Vdirection
   \:ddd\:Xy\:x  \advance\:ddd \:Yy\:y  \advance\:ddd \:Y
   \:PaintSlice}

\def\:PntLeftOvOv{
   \:xx-\:xx  \:yy-\:yy  \:PaintOvOv}

\def\:Dsrch{      \def\:SinOne{-\:SinB}
   \:xx\:x  \:yy\:y   \:SearchDir
   \:x\:xx  \:y\:yy
   \:d\:Ey  \:Ey\:Vdirection  \:Vdirection\:d }

\def\:Usrch{
   \let\:SinOne\:SinB
   \:x\:xx  \:y\:yy   \:SearchDir
   \:x\:xx  \:y\:yy}\def\:PaintOvLn#1#2{
   \:diff\:dd\:Ey\:Vdirection  \:diff\:ddd\:Ex\:Ez
   \ifdim \:AbsVal\:ddd>\:mp
      \:divide\:dd\:ddd      \:d#2
      \advance\:d -#1
      \ifnum \:d<\z@  \advance\:d \:CCCVX  \fi
      \:DoB\:InCons\:d  \let\:next\:PntDo  \:next
   \fi}

\def\:PntDo{
   \ifnum\:DoB=\z@ \let\:next\relax
   \else
      \::AdvOv\:x\:y
      \ifdim \:d>\:ragged
         \:ddd\:xxx  \advance\:ddd -\:Ez
         \:ddd\:Cons\:dd\:ddd
         \advance\:ddd \:Vdirection  \:PaintSlice
      \fi
      \advance\:DoB \m at ne
   \fi  \:next}\Define\:PaintSlice{   \:AbsDif\:dddd\:yyy\:ddd
   \advance\:yyy \:ddd  \divide\:yyy \tw@
   { \advance\:dddd \:Z  \divide\:dddd \tw@
      \:X\:xxxx  \:Y\:yyy
      \:xx\:xxx  \advance\:xxx -\:xxxx
      \:d\z@
      \:yy\:Y  \:dd\:dddd  \:ddd\:dddd
      \::paint     }
   \:xxxx\:xxx  \:yyyy\:yyy  \:Z\:dddd    \:J\z@}
\def\::AdvOv#1#2{  \:AdvOv\:xxx\:yyy#1#2
   \:AbsDif\:d\:xxxx\:xxx       \advance\:J \@ne
   \ifnum \:J=\sixt@@n   \multiply\:d \@cclvi
   \fi }\def\:PaintOvOv#1{   \def\:hdir{#1}
   \:xxx\:Xx\:xx  \advance\:xxx \:Yx\:yy
   \:yyy\:Xy\:xx  \advance\:yyy \:Yy\:yy
   \advance\:xxx \:X   \advance\:yyy \:Y
   \:Z\z@  \:xxxx\:xxx  \:yyyy\:yyy
   \:x\:xx   \:y\:yy   \:DoB\z@   \:J\z@
   \let\:next\:scanOvOv  \:next }
\Define\:scanOvOv{  \advance\:DoB \@ne
   \advance\:J \@ne
   \:AbsDif\:d\:xxx\:Ez
   \ifdim \ifdim      \:xxx\:hdir\:Ez    -
          \else\ifdim \thr@@\:d<\:ragged -
          \else\ifnum \:DoB>358            -
          \fi \fi \fi                     \p@<\z@
      \:ddd\:yyyy  \advance\:ddd -0.5\:dddd
      \:yyy\:yyyy   \advance\:yyy   0.5\:dddd
      \:xxx\:Ez \:PaintSlice
      \let\:next\relax
   \else
     \:d\:xx \advance\:d -\:x
     \:xxx\:yy \advance\:xxx -\:y
     \ifdim -\:Xx\:d\:hdir\:Yx\:xxx
        \let\:SinOne\:SinB
        \::AdvOv\:xx\:yy
        \ifdim  \ifdim       \:d >\:ragged -
                \else \ifnum \:J>\sixt@@n -
                \fi\fi                      \p@<\z@
           \:J\z@  \def\:SinOne{-\:SinB}
           \:AdvOv\:dd\:ddd\:x\:y  \:PaintSlice  \fi
     \else
        \def\:SinOne{-\:SinB}
        \::AdvOv\:x\:y
        \ifdim  \ifdim       \:d >\:ragged -
                \else \ifnum \:J>\sixt@@n -
                \fi\fi                      \p@<\z@
           \:J\z@   \let\:SinOne\:SinB
           \:AdvOv\:dd\:ddd\:xx\:yy  \:PaintSlice  \fi
   \fi \fi
   \:next}\Define\SetBrush{\:Opt[]\:SetBrush{}}

\def\:SetBrush[#1](#2,#3)#4{    \def\:temp{#4}
   \ifx \:temp\empty
      \def\:brush{   \let\:Xunits\empty \let\:Yunits\empty
                     \:thickness\:dddd  \:Ln  }
   \else       \def\:BruShape{#4}
      \:dd#2\:Xunits      \:ddd#3\:Yunits
      \edef\:Grd{ \:dd\the\:dd  \:ddd\the\:ddd }
      \MarkLoc($$)  \def\:temp{#1}
\ifx \:temp\empty  \:X\z@  \:Y\z@
\else  \MoveTo(#1) \fi
\edef\:BrOrg{ \:x\the\:X  \:y\the\:Y }
\MoveToLoc($$)
      \def\:brush(##1,##2){ \::brush }  \fi  }

\SetBrush(,){}\def\::brush{{  \SetBrush(,){}
\let\:Xunits\:XunitsReg   \let\:Yunits\:YunitsReg
\advance\:Y -0.5\:dddd   \:yy\:Y
\advance\:yy \:dddd
\:BrOrg  \:Grd  \advance\:xx  \:X
\ifdim \:xx<\:X  \:d\:X \:X\:xx \:xx\:d  \fi
   \:GridPt\:X\:x\:dd
   \:GridPt\:Y\:y\:ddd            \:x\:X
   \:DoBrush       }}\Define\:DoBrush{
   \ifdim       \:Y>\:yy  \let\:DoBrush\relax
   \else \ifdim \:X>\:xx \advance\:Y \:ddd     \:X\:x
   \else { \:BruShape }  \advance\:X \:dd
   \fi  \fi  \:DoBrush  }\def\:GridPt#1#2#3{   \:xxxx#1
   \advance#1 -#2  \:divide#1#3
   #1\:InCons#1#3  \advance#1 #2
   \ifdim #1=\:xxxx
   \else  \ifdim \:xxxx>#2 \advance#1 #3 \fi \fi  }
\newcount\:IntId    \edef\:IntCount{0\space}
\newcount\:DecId    \edef\:DecCount{0\space}

\Define\:NewCount{\alloc@ 0\count \countdef \insc at unt }
\Define\:NewDimen{\alloc@ 1\dimen \dimendef \insc at unt }

\def\:NewVar#1#2#3#4#5{ \:multid#1
   \def\:temp{    \csname \string#4\the#4\endcsname\z@
      \edef#1{\noexpand#3  \csname \string#4\the#4\endcsname}}
   \def\:next{  \xdef#5{\the#4\space}   #2#1 \def\:next{\global\let}
     \expandafter\:next \csname \string#4\the#4\endcsname#1  \:temp }
   \advance#4  \@ne
   \ifnum #4 > #5 \expandafter\:next \else \expandafter\:temp \fi }

\def\IntVar#1{\:NewVar#1\:NewCount\:IntOp\:IntId\:IntCount}
\def\DecVar#1{\:NewVar#1\:NewDimen\:DecOp\:DecId\:DecCount}


\DecVar\Q  \DecVar\R   \DecVar\T
\IntVar\I  \IntVar\J   \IntVar\K
\def\WriteVal#1{\immediate\write\sixt@@n{...\string#1=#1;}}

\newdimen\:X   \newdimen\:Y
\newdimen\:x   \newdimen\:y   \newdimen\:d
\newdimen\:xx  \newdimen\:yy  \newdimen\:dd
\newdimen\:xxx \newdimen\:yyy \newdimen\:ddd
\newdimen\:xxxx\newdimen\:yyyy\newdimen\:dddd
\newcount\:J  \newcount\:K
\newdimen\:DI   \newdimen\:DJ
\newdimen\:DK   \newdimen\:DL   \newtoks\:t
\def\:IntFromPt#1#2{
   \:d#2\relax
   \advance\:d  \ifdim\:d<-0.5\p at -\fi  0.5\p@
   #1\:d    \divide#1  65536\relax}
\def\:temp{\catcode`\p12  \catcode`\t12}
\def\:Cons{\catcode`\p11  \catcode`\t11}
\:temp  \def\:Frac#1pt{#1}
        \def\:rnd#1.#2pt{#1}  \:Cons

\def\:Cons#1{\expandafter\:Frac\the#1}
\def\:sqr#1{#1\expandafter\:Frac\the#1#1}
\def\:InCons#1{\expandafter\:rnd\the#1}\def\:Val#1{#1;}
\let\Val\:Val\def\:IntOp#1#2{\csname :Op#2\endcsname#1}
\let\:SvIntOp\:IntOp
\def\:PreIntOp{\let\:IntOp\empty
   \let\Val\empty}
\def\:PostIntOp{\let\:IntOp\:SvIntOp
   \let\Val\:Val}

\expandafter\def\csname :Op;\endcsname#1{ \the#1}
\expandafter\def\csname :Op=\endcsname#1#2;{
   \:PreIntOp#1#2\:PostIntOp}
\expandafter\def\csname :Op+\endcsname#1#2;{
   \:PreIntOp\advance #1  #2\:PostIntOp}
\expandafter\def\csname :Op-\endcsname#1#2;{
   \:PreIntOp\advance #1  -#2\:PostIntOp}
\expandafter\def\csname :Op/\endcsname#1#2;{
   \:PreIntOp\divide#1   #2\:PostIntOp}
\expandafter\def\csname :Op*\endcsname#1#2;{
   \:PreIntOp\multiply#1   #2\:PostIntOp}
\def\:DecOp#1#2{ \csname :xOp#2\endcsname#1}
\let\:SvDecOp\:DecOp
\def\:PreDecOp{\let\:IntOp\the \def\:DecOp{\:Cons}
   \let\Val\empty   \let\:du\empty}
\def\:PostDecOp{\let\:IntOp\:SvIntOp \let\Val\:Val
   \let\:DecOp\:SvDecOp  \let\:du\::du  }

\def\::du#1{\p@
   \ifx#1\p@ \let\:temp\relax
   \else     \def\:temp{\du{#1}}
   \fi\:temp}                    \:PostDecOp

\expandafter\def\csname :xOp;\endcsname#1{ \:Cons#1}
\expandafter\def\csname :Op[\endcsname#1#2];{
   \:PreDecOp \:dd#2\p@  \:IntFromPt#1\:dd
                                 \:PostDecOp  }
\expandafter\def\csname :xOp=\endcsname#1#2;{
   \:PreDecOp#1#2\p@\:PostDecOp               }
\expandafter\def\csname :xOp(\endcsname#1#2){
   \:PreDecOp#1#2\p@\:PostDecOp               }
\expandafter\def\csname :xOp+\endcsname#1#2;{
   \:PreDecOp\advance #1  #2\p@\:PostDecOp  }
\expandafter\def\csname :xOp-\endcsname#1#2;{
   \:PreDecOp\advance #1  -#2\p@\:PostDecOp }
\expandafter\def\csname :xOp*\endcsname#1#2;{
   \:PreDecOp#1 #2#1\:PostDecOp              }
\expandafter\def\csname :xOp/\endcsname#1#2;{
   \:PreDecOp  \:divide#1{#2\p@}  \:PostDecOp }
\let\IF\ifnum    \let\THEN\relax
\let\ELSE\else   \let\FI\fi

\def\EqText(#1,#2){
   \z@=\z@ \fi  \def\:temp{#1}
                \def\:next{#2}    \ifx \:temp\:next }

\def\:IfInt#1(#2,#3){ \z@=\z@ \fi
   \:IntOp\:K=#2;  \:IntOp\:J=#3; \ifnum  \:K#1\:J }

\def\:IfDim#1(#2,#3){ \z@=\z@ \fi
   \:DecOp\:d=#2;  \:DecOp\:dd=#3; \ifdim  \:d#1\:dd }

\def\EqInt{ \:IfInt= }  \def\LtInt{ \:IfInt< }
\def\GtInt{ \:IfInt> }

\def\EqDec{ \:IfDim= }  \def\LtDec{ \:IfDim< }
\def\GtDec{ \:IfDim> } \def\Do(#1,#2)#3{
   \expandafter\let
   \csname :Back\the\:level\endcsname\:Do
\expandafter\edef\csname :DoVars\the\:level\endcsname{
   \DoReg\the\DoReg \:DoB\the\:DoB}
\advance\:level  \@ne
   \DoReg#1  \:DoB#2  \relax
   \ifnum \DoReg<\:DoB
      \def\:Do{\ifnum \DoReg>\:DoB
                  \let\:Do\relax
               \else  #3\advance\DoReg  \@ne \fi
               \:Do}
   \else
      \def\:Do{\ifnum \DoReg<\:DoB
                  \let\:Do\relax
               \else  #3\advance\DoReg \m at ne  \fi
               \:Do}
   \fi  \def\:nextdo{ \:Do \advance\:level  \m at ne
\csname :DoVars\the\:level\endcsname
\def\:temp{\let\:Do}
\expandafter\:temp\csname
   :Back\the\:level\endcsname  } \:nextdo}

\let\:Do\relax

\newcount\DoReg   \let\:DoReg\DoReg       \newcount\:DoB
 \newcount\:level\def\::divide#1{   \:DI\:DK   \:dddd\:DL
   \advance\:DI -\:Cons\:dddd#1
   \:IntFromPt\:J\:dddd  \advance\:dddd -\:J\p@
   \multiply\:J  \@M   \:IntFromPt\:K{\@M\:dddd}
   \advance\:J \:K     \:dddd\@M\p@
   \divide\:dddd \:J   \advance#1 \:Cons\:DI\:dddd  }

\def\:divide#1#2{   \:DK#1   \:DL#2   #1\z@
   \::divide#1  \::divide#1  \::divide#1
   \::divide#1  \::divide#1  }
\def\:Sqrt#1{ \ifdim #1<\:mmp   #1\z@  \else
   \:dd#1   \divide\:dd \tw@
   \def\::Sqrt{  \:ddd#1
      \:divide\:ddd\:dd      \:AbsDif\:d\:dd\:ddd
      \advance\:dd \:ddd   \divide\:dd \tw@
      \ifdim  \:d < \:mmmp
         \let\::Sqrt\relax  \fi
      \::Sqrt}
   \::Sqrt   #1\:dd   \fi }\Define\:length{
   \:dd \:AbsVal \:ddd
   \:abs\:x  \:abs\:y
   \ifdim \:dd<\:x \:dd\:x \fi
   \ifdim \:dd<\:y \:dd\:y \fi
   \ifdim \:dd>\:mp
      \:divide\:x\:dd     \:sqr\:x
      \:divide\:y\:dd     \:sqr\:y
      \:divide\:ddd\:dd   \:sqr\:ddd
      \advance\:x  \:y  \advance\:x \:ddd
      \:y\:dd  \:Sqrt\:x  \:d\:Cons\:x\:y
   \else \:d\:dd \fi}\Define\:distance(2){\MarkLoc(@^)
   \MoveToLoc(#1)  \:x \:X  \:y \:Y  \:ddd\:Z
   \MoveToLoc(#2)
   \advance\:x  -\:X   \advance\:y  -\:Y
   \advance\:ddd  -\if:IIID \:Z \else \:ddd \fi
   \:length  \MoveToLoc(@^)}\def\:NormalizeDeg#1{
   \:DL#1   \:K\:InCons\:DL
   \divide\:K  \:cccvx   \multiply\:K  \:cccvx
   \advance #1 -\:K\p@
   \ifdim #1<\z@ \advance #1  \:CCCVX \fi
   \ifdim #1=\z@
      \ifdim\:DL=\z@ \else
         \advance #1  \:CCCVX \fi \fi }\def\:CosSin#1{ \:DK#1
   \:NormalizeDeg\:DK \def\:tempA{}
\ifdim \:CVXXX<\:DK
   \def\:tempA{\:y-\:y}
   \advance\:DK -\:CCCVX  \:DK-\:DK   \fi
\ifdim \:XC<\:DK
   \edef\:tempA{\:x-\:x \:tempA}
   \advance\:DK -\:CVXXX  \:DK-\:DK   \fi
\ifdim 45\p@<\:DK
   \edef\:tempA{\:d\:x \:x\:y \:y\:d \:tempA}
   \advance\:DK -\:XC   \:DK-\:DK   \fi
   \:x\p@   \:y0.01745\:DK   \:d\:y   \:K\@ne
   \edef\:next{\advance\:K \@ne
      \:sqr\:d  \divide\:d \:K  \advance}
   \:next \:x -\:d   \:next \:y -\:d
   \:next \:x  \:d   \:next \:y  \:d
   \:next \:x -\:d   \:next \:y -\:d
   \:next \:x  \:d   \:next \:y  \:d
   \:tempA   }   \Define\:rInitOval(2){
   \XSaveUnits   \let\du=\:rdu
   \:Zunits\p@   \:dd#1\:Zunits
   \:d\:Cons\:dd\:Xunitsx   \edef\:Xx{\:Cons\:d}
   \:d\:Cons\:dd\:Xunitsy   \edef\:Xy{\:Cons\:d}
   \:dd#2\:Zunits
   \:d\:Cons\:dd\:Yunitsx   \edef\:Yx{\:Cons\:d}
   \:d\:Cons\:dd\:Yunitsy   \edef\:Yy{\:Cons\:d}
   \XRecallUnits  \let\du=\:svdu
}
\Define\:xyInitOval(2){
   \:d#1\:Xunits   \edef\:Xx{\:Cons\:d} \def\:Xy{0}
   \:d#2\:Yunits   \edef\:Yy{\:Cons\:d} \def\:Yx{0} }
 \def\:FigSize#1#2#3{
   \:x\:LBorder   \:y\:RBorder   \:d\:TeXLoc
   {\Object\:temp{#3}
    \setbox\:box\hbox{ \:temp
       \multiply\:x by \tw@  \multiply\:y by \tw@
       \xdef\:FSize{ \noexpand#1=\:Cons\:x;
                       \noexpand#2=\:Cons\:y;}}}
   \global\:LBorder\:x   \global\:RBorder\:y
   \global\:TeXLoc \:d
   \:FSize}
\expandafter\let \csname 0:Ln \endcsname\:Ln
\expandafter\def\csname 1:Ln \endcsname{
      \advance\:x -\:X  \advance\:y -\:Y
      \csname 0:Ln \endcsname(\:x,\:y)  }

\newcount\:ClipLevel   \:ClipLevel\@ne

\Define\Clip{\futurelet\:next\:Clip}

\Define\:Clip{
   \ifx \:next[  \expandafter\:DefClipOut
        \else    \expandafter\:DefClip     \fi }

\def\:DefClipOut[#1]{ \:DefClip(#1) }
\Define\:DefClip(1){  \def\:temp{#1}
   \ifx \:temp\empty
      \:ClipLevel\@ne     \def\:next{\let\:Ln}
      \expandafter\:next\csname 0:Ln \endcsname
   \else  \def\:temp{\::DefClip(#1)}  \fi  \:temp }
\Define\::DefClip(1){  \MarkLoc(^)
   \:x\:X  \:y \:Y  \Move(#1)
   \ifdim\:x>\:X  \:dd\:X  \:X\:x  \:x\:dd  \fi
   \ifdim\:y>\:Y  \:dd\:Y  \:Y\:y  \:y\:dd  \fi
   \advance\:ClipLevel  \@ne
   \expandafter\edef\csname \the
      \:ClipLevel :Ln \endcsname{
          \:xxx \the\:x   \:yyy \the\:y
          \:xxxx\the\:X  \:yyyy\the\:Y
          \ifx \:next[   \noexpand\:ClipOut
          \else          \noexpand\:ClipIn     \fi }
   \let\:Ln\:ClipLn   \MoveToLoc(^)  }\def\:ClipLn(#1,#2){
   \:x#1\:Xunits \:y#2\:Yunits
   {  \let\:Xunits\empty  \let\:Yunits\empty
   \advance\:x \:X   \advance\:y \:Y
   \ifdim \:x<\:X  \:dd\:X \:X\:x \:x\:dd
                   \:dd\:Y \:Y\:y \:y\:dd  \fi
   \:diff\:dd\:X\:x   \:diff\:ddd\:Y\:y
\:Z \:AbsVal \:dd
\advance\:Z  \:AbsVal\:ddd
\ifdim \:Z>\sixt@@n\p@
   \divide\:dd   128
   \divide\:ddd  128  \fi
\:Z\:Cons\:y\:dd
\advance\:Z -\:Cons\:x\:ddd
\ifdim \:dd<\z@
  \:dd-\:dd  \:ddd-\:ddd  \:Z-\:Z
\fi
   \csname \the \:ClipLevel :Ln \endcsname      } 
   \advance\:X \:x   \advance\:Y \:y  }\Define\:ClipIn{
   \def\:next{\let\:next}
   \expandafter\:next\csname \the
      \:ClipLevel :Ln \endcsname
   \advance\:ClipLevel \m at ne
   { \:ClipLeft\:xxxx \:ClipDown\:yyy \:ClipUp\:yyyy \:next }
   { \:ClipRight\:xxx \:ClipDown\:yyy \:ClipUp\:yyyy \:next  }
   { \:ClipDown\:yyyy \:next }
     \:ClipUp\:yyy    \:next }

\Define\:ClipOut{
   \:ClipLeft\:xxx      \:ClipRight\:xxxx
   \:ClipUp  \:yyyy     \:ClipDown \:yyy
   \def\:next{\let\:next}
   \expandafter\:next
      \csname \the\:ClipLevel :Ln \endcsname
   \advance\:ClipLevel \m at ne      \:next  }\def\:ClipLeft#1{
   \ifdim       \:x<#1  \:KilledLine
   \else \ifdim \:X<#1  \:X#1
      \ifdim \:dd>\:mmmp
         \:Y\:Cons\:ddd\:X  \advance\:Y \:Z
         \:divide\:Y\:dd
   \fi \fi \fi     \:CondKilLn  }

\def\:ClipRight#1{
   \ifdim       \:X>#1  \:KilledLine
   \else \ifdim \:x>#1  \:x#1
      \ifdim \:dd>\:mmmp
         \:y\:Cons\:ddd\:x  \advance\:y \:Z
         \:divide\:y\:dd
   \fi \fi \fi    \:CondKilLn }

\Define\:CondKilLn{
   \:d\:x  \advance\:d -\:X
   \ifdim \:d<\z@  \:d-\:d \fi
   \ifdim \:y<\:Y  \advance\:d \:Y \advance\:d -\:y
   \else           \advance\:d \:y \advance\:d -\:Y  \fi
   \ifdim  \:d<\:mmp   \:KilledLine \fi
   \ifdim  \:thickness=\z@ \:KilledLine \fi}

\Define\:KilledLine{
   \let\:ClipLeft\:gobble  \let\:ClipRight\:gobble
   \let\:ClipUp  \:gobble  \let\:ClipDown \:gobble
   \let\:next\relax
   \expandafter\def\csname 1:Ln \endcsname{}}\def\:ClipUp#1{
   \:AbsDif\:d\:y\:Y
   \ifdim  \:d<\:ragged
      \advance\:y  0.5\:thickness
\advance\:Y -0.5\:thickness
\ifdim       \:Y>#1  \:KilledLine
\else \ifdim \:y>#1
   \:thickness#1 \advance\:thickness -\:Y
   \advance\:Y  0.5\:thickness  \:y\:Y
\else
   \advance\:Y  0.5\:thickness
   \advance\:y -0.5\:thickness
\fi  \fi
\:dd\p@   \:ddd\z@
\def\:temp{  \:Z\:Y }  \:temp
   \else \let\:temp\relax
          \ifdim \ifdim\:Y<\:y\:Y\else\:y\fi >#1  \:KilledLine
   \else  \ifdim  \::ClipUp#1\:X\:Y
   \else  \ifdim  \::ClipUp#1\:x\:y
   \fi \fi \fi \fi   \:CondKilLn  }

\def\::ClipUp#1#2#3{
#3>#1   #3#1
\ifdim \:AbsVal\:ddd>\:mmmp
   #2\:Cons\:dd#3  \advance#2 -\:Z
   \:divide#2\:ddd
\fi  }\def\:ClipDown#1{   \:Ex2#1
   \:Flip\:y  \:Flip\:Y  \:ClipUp#1
   \:Flip\:y  \:Flip\:Y  \:temp }

\def\:Flip#1{   #1-#1  \advance#1 \:Ex  }
\Define\:SetDrawWidth{
   \hsize\:RBorder      \advance\hsize -\:LBorder
   \leftskip -\:LBorder \rightskip\z@}
\newdimen\:thickness   \:thickness0.75\p@

\Define\PenSize(1){\:thickness#1\relax}
\Define\:Draw{   \ifvmode \noindent\hfil\fi
   \global\:TeXLoc\z@
   \vbox\bgroup
           \begingroup
   \def\EndDraw{
           \endgroup   \:SetDrawWidth
         \egroup}
   \:DraCatCodes      \parindent\z@    \everypar{}
\leftskip\z@     \rightskip\z@    \boxmaxdepth\maxdimen
\linepenalty10   \let\FigSize\:FigSize
\def\Draw{\:wrn1{}} \:CommonIID   \:InDraw }
\Define\:CommonIID{\def\RotateTo{\:RotateTo}
\def\Rotate{\:Rotate}
\def\MoveF{\:MvF}\def\LineToLoc{\:LnToLoc}}\newdimen\:Xunits   \:Xunits\p@
\newdimen\:Yunits   \:Yunits\p@
\Define\:InDraw{\:Opt()\::InDraw{\:Xunits,\:Yunits}}
\Define\::InDraw(2){   \:X\z@   \:Y\z@
   \:Xunits#1 \relax  \:Yunits#2  \:AdjRunits
   \global\:LBorder\z@    \global\:RBorder\z@   \gdef\:UBorder{0pt}
   \:loadIID   \leavevmode }

\Define\:Resize(2){
   \:Xunits#1\:Xunits  \relax
   \:Yunits#2\:Yunits  \:AdjRunits  }
\Define\:Units(2){
   \:Xunits#1 \relax   \:Yunits#2    \:AdjRunits   }
\Define\:loadIID{
   \def\LineAt{\:DLn}
   \def\LineTo{\:LnTo}
   \def\MoveTo{\:MvTo}
   \def\Line{\:Ln}
   \def\Move{\:Mv}
   \def\MoveF{\:MvF}
   \:rotatedfalse\def\:InitOval{\:xyInitOval}
   \def\Scale{\:Resize}
   \def\Units{\:Units}}\let\SaveAll\begingroup
\let\RecallAll\endgroup
\def\DrawOn{\def\Draw{\:Draw}}                      \DrawOn
\def\DrawOff{\def\Draw{\begingroup \:J\@cclv
                       \:NoDrawSpecials \:NoDraw}}
\catcode`\/0 \catcode`\\11
/def/:NoDraw#1\EndDraw{/endgroup}
/catcode`/\0 /catcode`//12

\def\:NoDrawSpecials{\catcode\:J11
  \ifnum \:J=\z@
     \let \:NoDrawSpecials\relax \fi
  \advance\:J  \m at ne \:NoDrawSpecials}
\let\:XunitsReg\:Xunits   \let\:YunitsReg\:Yunits  \Define\EntryExit(4){
   \edef\:InOut##1{
      \noexpand\ifcase ##1\space
         #1\noexpand\or #2\noexpand\or
         #3\noexpand\or #4\noexpand\fi}}

\EntryExit(0,0,0,0)\Define\:DrawBox{   \:x0.5\wd\:box
   \:y\ht\:box \advance\:y  \dp\:box
   \divide\:y \tw@
   \advance \:X -\:InOut0\:x
   \advance \:Y -\:InOut1\:y
   { \advance \:X -\:x
     {  \advance \:Y \:y
\ifdim\:Y>\:UBorder \xdef\:UBorder{\the\:Y}\fi
\ifdim\:X<\:LBorder \global\:LBorder\:X\fi
\advance\:X \wd\:box
\ifdim\:X>\:RBorder \global\:RBorder\:X\fi }
      \advance \:Y -\:y  \advance \:Y  \dp\:box
     {\:d\:X \advance\:d \wd\:box
 \advance\:X -\:TeXLoc   \global\:TeXLoc\:d
 \vrule width\:X depth\z@ height\z@
 \raise \:Y \box\:box} }
   \edef\MoveToExit(##1,##2){
   \:X\the\:X   \:Y\the\:Y
   \:x\the\:x   \:y\the\:y
   \advance\:X  ##1\:x
   \advance\:Y  ##2\:y}
   \advance \:X  \:InOut2\:x
   \advance \:Y  \:InOut3\:y }
 \Define\ThreeDim{\:Opt[]\:ThreeDim{\p@}}

\def\:ThreeDim[#1](#2){\::ThreeDim[#1](#2,,)}

\def\::ThreeDim[#1](#2,#3,#4,#5){ \bgroup\begingroup
   \def\EndThreeDim{          \endgroup\egroup}
   \:IIIDtrue   \:Zunits#1  \:Z\z@
   \def\:temp{#4}
   \ifx \:temp\empty   \:CosSin{#3\p@}  \:divide\:x\:y       \:Ey\:x
\:CosSin{#2\p@}  \:Ex\:Cons\:Ey\:x  \:Ey\:Cons\:Ey\:y
\let\:project\:projectPar

   \else               \:Ex#2\:Xunits \:Ey#3\:Yunits \:Ez#4\:Zunits
\let\:project\:projectPer
 \fi
   \def\LineAt{\:tDLn}
\def\LineTo{\:tLnTo}
\def\MoveTo{\:tMvTo}
\def\Line{\:tLn}
\def\Move{\:tMv}
\def\Scale{\:tResize}
\def\Units{\:tUnits}\def\RotateTo{\:tRotateTo}
\def\Rotate{\:tRotate}
\def\MoveF{\:tMvF}
\:Vdirection\z@ \def\LineToLoc{\:tLnToLoc} }  \Define\:projectPer{
   \:diff\:x\:X\:Ex   \:diff\:y\:Y\:Ey
   \:diff\:xxxx\:Z\:Ez
   \:divide\:x\:xxxx      \:divide\:y\:xxxx
   \:x-\:Cons\:Ez\:x     \:y-\:Cons\:Ez\:y
   \advance\:x  \:Ex    \advance\:y \:Ey}
\Define\:projectPar{
   \:x\:Cons\:Ex\:Z  \advance\:x \:X
   \:y\:Cons\:Ey\:Z  \advance\:y \:Y}
\def\:tDLn(#1,#2,#3,{\:tMvTo(#1,#2,#3)
                     \:tLnTo(}
\Define\:tMvTo(3){   \:X#1\:Xunits
   \:Y#2\:Yunits    \:Z#3\:Zunits}
\Define\:tMv(3){     \advance\:X  #1\:Xunits
   \advance\:Y  #2\:Yunits
   \advance\:Z  #3\:Zunits}
\Define\:tResize(3){   \:Xunits#1\:Xunits
   \:Yunits#2\:Yunits \:Zunits#3\:Zunits
   \:AdjRunits}
\Define\:tUnits(3){    \:Xunits#1  \relax
   \:Yunits#2  \relax       \:Zunits#3
   \:AdjRunits}\Define\:tLnTo(3){
   \:project   \edef\:temp{\:x\the\:x \:y\the\:y}
   \:X#1\:Xunits  \:Y#2\:Yunits  \:Z#3\:Zunits
   \:DLN}

\Define\:tLn(3){
   \:project   \edef\:temp{\:x\the\:x \:y\the\:y}
   \advance\:X  #1\:Xunits
   \advance\:Y  #2\:Yunits
   \advance\:Z  #3\:Zunits   \:DLN}

\Define\:DLN{
   \TwoDim      \:temp        \LineTo(\:x\du,\:y\du)
   \EndTwoDim }\Define\TwoDim{\bgroup\begingroup
   \def\EndTwoDim{\endgroup\egroup}
   \:loadIID
   \if:IIID  \:IIIDfalse \:project \:X\:x \:Y\:y
             \:CommonIID \fi
   \Units(\:Xunits,\:Yunits)}  
\newif\if:rotated
\Define\RotatedAxes(2){\begingroup
   \def\EndRotatedAxes{\endgroup}
   \if:IIID  \:IIIDfalse
             \:project \:X\:x \:Y\:y
             \:CommonIID    \fi
   \:DK#2\p@ \advance\:DK -#1\p@
\advance\:DK -\:CVXXX   \:NormalizeDeg\:DK
\ifdim \:DK<\:mmp \:wrn4{(#1,#2)}
\else
  \:DK#1\p@ \:NormalizeDeg\:DK    \:CosSin\:DK
  \:Xunitsx\:x  \:Xunitsy\:y
  \:DK#2\p@ \advance\:DK -\:XC \:NormalizeDeg\:DK \:CosSin\:DK
  \edef\Units(##1,##2){\noexpand\:Units(##1,##2)
    \:Xunitsx \:Cons\:Xunitsx\:Xunits
    \:Xunitsy \:Cons\:Xunitsy\:Xunits
    \:Yunitsx-\:Cons\:y\:Yunits
    \:Yunitsy \:Cons\:x\:Yunits  } \fi
\def\Scale{\:rResize} \def\MoveTo{\:rMvTo}
\def\Move{\:rMv}
\def\LineTo{\:rLnTo}
\def\Line{\:rLn}
\def\LineAt{\:rDLn}
\def\MoveF{\:rMvF}\def\:InitOval{\:rInitOval}

   \MarkLoc(:org) \Units(\:Xunits,\:Yunits)  \:rotatedtrue }
\newdimen\:Xunitsx  \newdimen\:Xunitsy
\newdimen\:Yunitsx  \newdimen\:Yunitsy
\Define\:rResize(2){
   \:Xunits #1\:Xunits    \:Yunits #2\:Yunits
   \:Xunitsx#1\:Xunitsx   \:Xunitsy#1\:Xunitsy
   \:Yunitsx#2\:Yunitsx   \:Yunitsy#2\:Yunitsy  }
\def\:rdu#1{%
   \ifx #1\:Xunits \units:i\else
   \ifx #1\:Yunits \units:i\else
   \ifx #1\:Zunits \units:i\else #1\fi \fi \fi }
\def\units:i{\Units(\p@,\p@)}
\Define\:rMvTo{\MoveToLoc(:org) \:rMv}
\Define\:rMv(1){ \:rxy(#1)
   \advance\:X  \:x \advance\:Y  \:y}
\Define\:rLnTo(1){ \MarkLoc(:a) \:rMvTo(#1) {\LineToLoc(:a)} }
\Define\:rLn(1){ \:rxy(#1) \:Ln(\:x\du,\:y\du) }
\def\:rDLn(#1,#2,{\:rMvTo(#1,#2)\:rLnTo(}
\Define\:rxy(2){                           \XSaveUnits   \let\du=\:rdu
   \:Zunits\p@   \:Zunits#1\:Zunits
   \:x\:Cons\:Zunits\:Xunitsx
   \:y\:Cons\:Zunits\:Xunitsy            \XRecallUnits  \XSaveUnits
   \:Zunits\p@   \:Zunits#2\:Zunits
   \advance\:x  \:Cons\:Zunits\:Yunitsx
   \advance\:y  \:Cons\:Zunits\:Yunitsy \XRecallUnits  \let\du=\:svdu}
\Define\:rMvF(1){  \:CosSin\:direction   \XSaveUnits   \let\du=\:rdu
   \:Zunits\p@            \:Zunits#1\:Zunits
   \:x\:Cons\:Zunits\:x   \:y\:Cons\:Zunits\:y
   \edef\:temp{(\:Cons\:x,\:Cons\:y)}   \expandafter\Move\:temp
   \XRecallUnits  \let\du=\:svdu}
\Define\:AdjRunits{
   \:Xunitsx\:Xunits   \:Xunitsy\z@
   \:Yunitsx\z@        \:Yunitsy\:Yunits}
\Define\Text{  \setbox\:box
   \vtop\bgroup    \edef\DoReg{\the\DoReg}
      \hyphenpenalty\@M  \exhyphenpenalty\@M
      \catcode`\ 10 \catcode`\^^M13 \catcode`\^^I10
      \catcode`\&4  \let~\space  \csname ;catcode\endcsname %
%
      \:Text}                       \catcode`\^^M13 %
\def\:Text(--#1--){%
      \:SetLines#1\hbox{}^^M--)^^M %
   \egroup                  %
   \if:IIID \TwoDim  \:DrawBox  \EndTwoDim %
   \else             \:DrawBox  \fi}       %
\def\:SetLines#1^^M{        %
   \def\:TextLine{#1}       %
   \ifx \:TextLine\:LastLine   \let\:temp\relax      %
   \else  \def\:temp{                                 %
             \:IndirectLines#1\relax~~--)~~\:SetLines}%
   \fi  \:temp }                      \catcode`\^^M9
\def\:IndirectLines#1~~{    \def\:TextLine{#1}
  \ifx \:TextLine\:LastLine   \let\:temp\relax
  \else  \def\:temp{\:AddLine{#1}\:IndirectLines}
  \fi  \:temp }

\Define\:LastLine{--)}

\def\:AddLine#1{
   \ifvmode \noindent    \hsize\z@ \else
      \hfil \penalty-500 \hbox{}    \fi
   \hfil#1
   \setbox\:box\hbox{#1}
   \ifdim \wd\:box>\hsize \hsize\wd\:box \fi}\def\TextPar#1#2{
   \def\:TxtPar##1(##2){##1(--##2--)}
   \edef\:temp{\expandafter\noexpand\csname :\string#2\endcsname}
   \edef#2{\noexpand\:TextPar\expandafter\noexpand\:temp}
   \expandafter\let\:temp\:undefined
   \expandafter#1\:temp}
                                   \catcode`\^^M13
\def\:TextPar#1{\begingroup     \catcode`\&4         %
   \csname ;catcode\endcsname %
%
   \catcode`\ 10 \catcode`\^^M13 \catcode`\^^I10 %
   \:TPar{#1}}                     \catcode`\^^M9  %

\def\:TPar#1(--#2--){\endgroup
   #1(--#2--)  }
 \newdimen\:direction  \newdimen\:Vdirection
\Define\:Rotate(1){   \advance \:direction   #1\p@
                      \:NormalizeDeg\:direction  }
\Define\:RotateTo(1){ \:direction  #1\p@
                      \:NormalizeDeg\:direction  }

\Define\:tRotate(2){
   \advance\:Vdirection  #2\p@
   \:NormalizeDeg\:Vdirection  \:Rotate(#1)}
\Define\:tRotateTo(2){
   \:Vdirection #2\p@
   \:NormalizeDeg\:Vdirection  \:RotateTo(#1)}
\Define\LineF(1){\MarkLoc(,)\MoveF(#1) {\LineToLoc(,)}}
\Define\:MvF(1){    \:CosSin\:direction
   \:d#1\:Xunits   \advance\:X  \:Cons\:d\:x
   \:d#1\:Yunits   \advance\:Y  \:Cons\:d\:y   }
\Define\MoveFToOval(2){
   \:NormalizeDeg\:direction \:CosSin\:direction  \:Zunits\p@
   \:d#2\:Zunits    \:x\:Cons\:d\:x
   \ifdim \:d=\z@  \:err5{...,\:Cons\:d} \fi
   \:d#1\:Zunits    \:y\:Cons\:d\:y
   \ifdim \:d=\z@  \:err5{\:Cons\:d,...} \fi     \:SearchDir
   \XSaveUnits
      \if:rotated
        \:Zunits\p@     \:Zunits#1\:Zunits
        \:x\:Cons\:Zunits\:Xunits
        \:Zunits\p@     \:Zunits#2\:Zunits
        \:y\:Cons\:Zunits\:Yunits
      \else
        \:x#1\:Xunits  \:y#2\:Yunits  \fi     \relax
      \Units(\:x,\:y)
      \:Vdirection\:direction  \:direction\:ddd
      \MoveF(\@ne)  \:direction\:Vdirection  \XRecallUnits  }
\Define\:tMvF(1){    \:CosSin\:Vdirection
   \:d #1\:Zunits   \advance\:Z  \:Cons\:y\:d
   \:xx#1\:Xunits     \:yy#1\:Yunits
   \:xx\:Cons\:x\:xx    \:yy\:Cons\:x\:yy
   \:CosSin\:direction
   \:x\:Cons\:xx\:x    \:y\:Cons\:yy\:y
   \advance\:X  \:x   \advance\:Y  \:y } \Define\CSeg{\:Opt[]\:CSeg1}
\def\:CSeg[#1]#2(#3,#4){   \MarkLoc($^)
   \MoveToLoc(#4) \:x\:X \:y\:Y
   \if:IIID  \:d\:Z  \fi   \MoveToLoc(#3)
   \advance\:x -\:X  \:x#1\:x
   \advance\:y -\:Y  \:y#1\:y
   \if:IIID   \advance\:d -\:Z  \:d#1\:d \fi
   \:t{#2}
   \edef\:temp{\the\:t(
      \expandafter\:Frac\the\:x\noexpand\:du,
      \expandafter\:Frac\the\:y\noexpand\:du \if:IIID ,
      \expandafter\:Frac\the\:d\noexpand\:du \fi)}
   \MoveToLoc($^)     \:temp}\Define\LSeg{\:Opt[]\:LSeg1}
\def\:LSeg[#1]#2(#3,#4){   \:distance(#3,#4)
   \:d#1\:d  \:t{#2}
   \edef\:temp{\the\:t(\expandafter\:Frac\the\:d\noexpand\:du)}
   \:temp}\Define\DSeg{\:Opt[]\:DSeg1}

\def\:DSeg[#1]#2(#3,#4){   \MarkLoc(^)
   \MoveToLoc(#4)  \:xxx\:X   \:yyy\:Y \:xxxx\:Z
   \MoveToLoc(#3)
   \advance\:xxx -\:X   \advance\:yyy -\:Y
   \ifdim \:AbsVal\:xxx<\:mmmp
      \ifdim \:AbsVal\:yyy<\:mmmp \:wrn5{#3,#4}
   \fi\fi
   \if:IIID
      \advance \:xxxx  -\:Z
      \:divide\:xxx\:Xunitsx
      \:divide\:yyy\:Yunitsy
      \:divide\:xxxx\:Zunits
      \:x\:xxx  \:y\:yyy   \:ddd\z@  \:length
      \:x\:d    \:y\:xxxx  \:SearchDir
      \:yyyy\:ddd
      \:x\:xxx  \:y\:yyy
   \else
      \:x  \:AbsVal\:Yunitsy
\:y  \:AbsVal\:Xunitsy  \ifdim \:y>\:x  \:x\:y  \fi
\:y  \:AbsVal\:Yunitsx  \ifdim \:y>\:x  \:x\:y  \fi
\:y  \:AbsVal\:Xunitsx  \ifdim \:y>\:x  \:x\:y  \fi
\:K  \:InCons\:x  \relax
      \ifnum \:K<\thr@@     \:K\@ne
\else \ifnum \:K<\sixt@@n   \:K4
\else \ifnum \:K<\:XC       \:K\sixt@@n
\else \ifnum \:K<\@m        \:K\@cclvi
\fi \fi \fi \fi
\divide\:xxx \:K
\divide\:yyy \:K  
      \:x \:Cons\:Yunitsy\:xxx
\advance\:x -\:Cons\:Yunitsx\:yyy
      \:y-\:Cons\:Xunitsy\:xxx
\advance\:y \:Cons\:Xunitsx\:yyy     
   \fi
   \:SearchDir   \:ddd#1\:ddd   \:t{#2}
   \edef\:temp{\the\:t(
      \:Cons\:ddd \if:IIID ,\:Cons\:yyyy \fi)}
   \MoveToLoc(^) \:temp}   \def\:theDoReg{\def\DoReg{\the\:DoReg}}

\Define\MarkLoc{  \:theDoReg
   \expandafter\edef \csname \:MarkLoc}

\Define\MarkGLoc{  \:theDoReg
   \expandafter\xdef \csname \:MarkLoc}

\Define\:MarkLoc(1){ Loc\space#1:\endcsname{
   \:X\the\:X  \:Y\the\:Y
   \if:IIID \:Z\the\:Z \fi  }       \let\DoReg\:DoReg }

\Define\MoveToLoc(1){   \:theDoReg   \expandafter\ifx
   \csname Loc\space#1:\endcsname\relax \:err2{#1}\fi
   \csname Loc\space#1:\endcsname     \let\DoReg\:DoReg  }

\Define\MarkPLoc(1){  \:theDoReg
   \if:IIID   \:project
      \expandafter\edef \csname Loc\space#1:\endcsname{
         \:X\the\:x  \:Y\the\:y  \:Z\z@}
   \else \:err1\MarkPLoc  \fi   \let\DoReg\:DoReg}

\Define\WriteLoc(1){{ \:theDoReg \edef\:temp{#1}
   \ifx \:temp\empty \else \MoveToLoc(#1) \fi
   \immediate\write\sixt@@n{...
      \:temp=(\the\:X,\the\:Y\if:IIID,\the\:Z\fi)}}}

\Define\:LnToLoc(1){
   \:x\:X \:y\:Y   \MoveToLoc(#1)
   { \:LnTo(\:x\du,\:y\du) }}

\Define\:tLnToLoc(1){
   \:xx\:X \:yy\:Y \:dd\:Z     \MoveToLoc(#1)
   { \:tLnTo(\:xx\du,\:yy\du,\:dd\du) }}\def\:GetLine#1#2#3#4#5{
   \MoveToLoc(#1)   \divide\:X \:eight  \divide\:Y \:eight
   #3\:X  #4\:Y
   \MoveToLoc(#2)   \divide\:X \:eight  \divide\:Y \:eight
   \advance #3 -\:X  \advance #4 -\:Y
   #5\:Cons#3\:Y      \advance #5 -\:Cons#4\:X
   \divide #3 \:eight     \divide  #4 \:eight \relax      }
\def\MoveToLL(#1,#2)(#3,#4){
   \:GetLine{#1}{#2}\:x \:y \:xxx
   \:GetLine{#3}{#4}\:xx\:yy\:xxxx
   \:ddd \:Cons\:x \:yy     \advance\:ddd -\:Cons\:xx\:y
   \ifdim  \:AbsVal\:ddd < \:mmmp
      \:X\@cclv\p@  \:Y\:X
      \:wrn3{(\string#1,\string#2)(\string#3,\string#4)}
   \else
      \:divide\:xxx\:ddd    \:divide\:xxxx\:ddd
      \:X\:Cons\:xxx\:xx   \advance\:X -\:Cons\:xxxx\:x
      \:Y\:Cons\:xxx\:yy   \advance\:Y -\:Cons\:xxxx\:y
   \fi   }\Define\MoveToCC{\:Opt[]\:MoveToCC{}}

\def\:MoveToCC[#1](#2,#3)(#4,#5){
  \:UserUnits(#2,#3)(#4,#5)
  \:distance($#2,$#4)
\ifnum \:d<\:mp \MoveToLoc(#3)
   \:wrn3{(#1,#2)(#3,#4)}
\else                 \:xx \:d
   \:distance($#2,$#3)  \:xxx\:d
   \:distance($#5,$#4) 
     \:yy \:xxx  \advance\:yy -\:d
\:yyy\:xxx  \advance\:yyy \:d
\:divide\:yy\:xx     \:yy\:Cons\:yy\:yyy
\advance\:yy \:xx  \divide\:yy \tw@
     \:yyy \ifdim \:AbsVal\:xxx>\:AbsVal\:yy \:xxx \else \:yy \fi
\ifdim \:AbsVal\:yyy<\:mp \:yyy\z@ \else
   \:divide\:xxx\:yyy  \:sqr\:xxx
   \:yyyy\:yy  \:divide\:yyyy\:yyy  \:sqr\:yyyy
   \advance\:xxx -\:yyyy   \:Sqrt\:xxx
   \:yyy\:Cons\:yyy\:xxx
\fi 
     \MoveToLoc($#4)  \:x\:X  \:y\:Y  \:divide\:yy\:xx
\MoveToLoc($#2)
\advance\:x -\:X     \advance\:y -\:Y
\advance\:X \:Cons\:yy\:x
\advance\:Y \:Cons\:yy\:y
     \:divide\:yyy\:xx
\advance\:X  #1\:Cons\:yyy\:y
\advance\:Y -#1\:Cons\:yyy\:x

  \fi  \:SysUnits  }\def\:UserUnits(#1,#2)(#3,#4){
   \:xx\:Xunitsx  \:xxx\:Xunitsy
   \:yy\:Yunitsx  \:yyy\:Yunitsy
   \:xxxx\:Cons\:yy\:xxx  \advance\:xxxx \:Cons\:yyy\:xx
   \ifdim \:AbsVal\:xxxx>\:mmmp
      \:divide\:xx\:xxxx   \:divide\:xxx{-\:xxxx}
      \:divide\:yy{\:xxxx} \:divide\:yyy\:xxxx
   \fi
   \:UnLoc(#1)  \:UnLoc(#2)
   \:UnLoc(#3)  \:UnLoc(#4)}\Define\:SysUnits{
   \MoveTo(\:Cons\:X,\:Cons\:Y)}\Define\:UnLoc(1){
   \MoveToLoc(#1)  \:d\:Cons\:yyy\:X
   \advance\:d \:Cons\:yy\:Y
   \:Y\:Cons\:xx\:Y
   \advance\:Y  \:Cons\:xxx\:X   \:X\:d
   \MarkLoc($#1)}\def\MoveToLC{\:Opt[]\:MoveToLC{}}

\def\:MoveToLC[#1](#2,#3)(#4,#5){
   \:UserUnits(#2,#3)(#4,#5)
   \MoveToLoc($#2)  \:x\:X  \:y\:Y
\MoveToLoc($#3)  \advance\:x -\:X
                \advance\:y -\:Y
   \edef\:temp{ \:xxx\the\:x  \:yyy\the\:y }
\MoveToLoc($#4)
\advance\:X \:y  \advance\:Y -\:x
\MarkLoc(^$) \MoveToLL($#4,^$)($#2,$#3)
\MarkLoc(^$)  
   \:distance($#4,$#5)  \:xx\:d  \:distance($#4,^$)
\ifdim      \:d>\:xx        \:wrn3{(#2,#3)(#4,#5)}
\else \ifdim \:d<\:mmp     \:yy\:xx   \else   \:yy\:d
      \:divide\:yy\:xx  \:sqr\:yy
      \:yy-\:yy   \advance\:yy \p@
      \:Sqrt\:yy  \:yy\:Cons\:xx\:yy
\fi \fi
   \:temp   \:x\:xxx  \:y\:yyy  \:length  \:xx\:d
\:divide\:xxx\:xx
\:divide\:yyy\:xx
\advance\:X  #1\:Cons\:yy\:xxx
\advance\:Y  #1\:Cons\:yy\:yyy
   \:SysUnits }  \def\Object#1{\:Opt(){\:DefineSD#1}0}

\def\:DefineSD#1(#2){\begingroup  \:multid#1
   \:DraCatCodes   \:DefSD#1(#2)}

\def\:DefSD#1(#2)#3{
   \expandafter\::Define\csname\string#1.\endcsname(#2){
      \:t{\:SubD{#3}}
      \if:IIID \edef\:temp{\noexpand\TwoDim \the\:t
                           \noexpand\EndTwoDim}
      \else    \def\:temp{\the\:t}   \fi         \:temp}
   \def#1{\def\:SDname{\csname\string#1.\endcsname}
          \:Opt[]\:CallSD{}}}

\def\:CallSD[#1]{ \edef\:Entry{#1} \:SDname }\def\:SubD#1{
   \let\::RecallXLoc\:AddXLoc   \gdef\:AddXLoc{}
   \edef\:RecallBor{ \global\:LBorder  \the\:LBorder
                  \global\:RBorder  \the\:RBorder
                  \xdef\noexpand\:UBorder{\:UBorder}
                  \global\:TeXLoc\the\:TeXLoc }
\global\:TeXLoc\z@
\setbox\:box\vbox{\EntryExit(0,0,0,0)
\begingroup
   \def\MarkXLoc{\:MarkXLoc}
   \:InDraw  #1
\endgroup
\:SetDrawWidth                    \let\:XLoc\relax
\xdef\:AddXLoc{\:dd\the\:LBorder  \:AddXLoc}}
\:RecallBor
   \:ddd\dp\:box
   \ifx \:Entry\empty
   \:DrawBox
\else
   \let\:RecallIn\:InOut
   \:x\:X    \:y\:Y
   \def\:XLoc(##1,##2,##3){
      \def\:temp{##1}
      \ifx \:temp\:Entry \:X\:x  \advance\:X -##2
                         \:Y\:y  \advance\:Y -##3
      \fi}
   \:AddXLoc
   \advance\:X  \:dd      \advance\:Y -\:ddd
   \EntryExit(-1,-1,\:InOut2,\:InOut3)  \:DrawBox
   \let\:InOut\:RecallIn
\fi
   \MarkLoc(^)
      \MoveToExit(-1,-1)
   \:xxx\:X   \:yyy\:Y   \advance\:yyy  \:ddd
   \def\:XLoc(##1,##2,##3){
      \:X\:xxx  \advance\:X  ##2     \advance\:X -\:dd
      \:Y\:yyy  \advance\:Y  ##3
      \MarkLoc(##1)}
   \:AddXLoc
   \MoveToLoc(^)
   \ifx \:Entry\empty \else     \MoveToLoc(\:Entry) \fi
   \global\let\:AddXLoc\::RecallXLoc }
\Define\:MarkXLoc(1){  \:theDoReg
   \let\:XLoc\relax
   \xdef\:AddXLoc{\:AddXLoc \:XLoc(#1,\the\:X,\the\:Y)}
   \let\DoReg\:DoReg} 
   \catcode`\ 10 \catcode`\^^M5 \catcode`\^^I10
   \let\wlog\:wlog  \let\:wlog\:undefined
\:RestoreCatcodes     \tracingstats1   \endinput


--- NEW FILE ProTex.sty ---
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  v 1.5
% ProTex                                                %
% Copyright (C) 1990,1991 by Eitan M. Gurari            %
%                                                       %
% This program can redistributed and/or modified under  %
% the terms of the LaTeX Project Public License         %
% Distributed from CTAN archives in directory           %
% macros/latex/base/lppl.txt; either version 1 of the   %
% License, or (at your option) any later version.       %
%                                                       %
% However, you are allowed to modify this program       %
% without changing its name, if you modify its          %
% signature. Changes to the signature can be introduced %
% with a directive of the form                          %
%            \message{signature}                        %
%                                                       %
%                            gurari at cse.ohio-state.edu  %
%                http://www.cse.ohio-state.edu/~gurari  %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
   \catcode`\noexpand :=\the\catcode`:%
   \catcode`\noexpand @=\the\catcode`@%
   \catcode`\noexpand -=\the\catcode`-%
   \catcode`\noexpand +=\the\catcode`+%
   \catcode`\noexpand ^=\the\catcode`^%
   \let\expandafter\noexpand\csname:RestoreCatcodes\endcsname=
                                   \noexpand\undefined}
\catcode`\:=11 \catcode`\@=11  \catcode`\^=7
\def\:latexpg{\ifx\pageno\:undefined
  \let\pageno=\c at page \fi}
\:latexpg
\def\:minus{-}  \catcode`\-=13  \catcode`\+=13
\def\Code#1#2{%
  {\:TraceDef#1{#2}}%
  \ifx #1\:undefined   \else  \def#1{}%
   \:warn{\string\Code\space redefines \string#1}\fi
\ifx #1\:undefined   \ModifyCode{#1}\fi
  \gdef#1{-{#2}{\string#1}}\AppendCode#1}\def\ModifyCode#1{}

\def\:warn#1{\immediate \write16{l.\the\inputlineno
   \space\:minus\string- Warning \:minus\string- #1}}
\def\:CheckCommand#1#2{%
   \def-##1##2{\let\:undefined=\relax}%
   \def+##1##2{}%
   #2\relax
   \ifx \:undefined\relax     \else
      \errmessage{\string#1\string#2 without
                  \string\Code\string#2}\fi}
\def\AppendCode#1{%
   \begingroup
      \:CheckCommand\AppendCode#1%
      \:defaultcats
      \def\:ScanAppend##1{\endgroup
         \:ifempty{##1}\else
   \global\advance\:CodeNumber by 1
   {\def\:TagCs{\string#1.\the\:CodeNumber}%
 \:WriteTrc{DefineCode}}%
   \:ExpandDef#1{+{##1}}{\noexpand
      {\CodeId{\string#1}{\the\:CodeNumber}\noexpand}}%
   \AfterCode{#1}%
\fi}%
      \ModifyAppendCode{#1}\relax
      \:ScanAppend}\def\ModifyAppendCode#1{} \def\AfterCode#1{}

\def\:ifempty#1{\def\:parm{#1}%
   \ifx \:parm\empty}\def\CodeId#1#2{#1.#2} \newcount\:CodeNumber
\newtoks\:tokens
\def\:ExpandDef#1#2#3{%
   \:tokens=\expandafter{#1#2}%
   \xdef#1{\the\:tokens #3}}\def\:defaultcats{%
  \:NoSpecials{12}{0}{255}%
  \:NoSpecials{11}{65}{90}%
  \:NoSpecials{11}{97}{122}%
  \catcode`\\=0  \catcode`\{=1    \catcode`\}=2
  \catcode`\ =13 \catcode`\^^M=13 \catcode`\^^I=13 }

\def\:NoSpecials#1#2#3{\edef\:temp{\the\:CodeNumber}%
  \global\:CodeNumber=#3
  \def\:next{\catcode\:CodeNumber=#1
    \ifnum \:CodeNumber=#2 \let\:next=\relax \fi
    \global\advance\:CodeNumber by \:minus1 \:next}\:next
  \global\:CodeNumber=\:temp  }
\def-#1#2{{\CodeFont \WindowTitle{#1}}}
\def+#1#2{}
\def\WindowTitle#1{\leavevmode \hbox{$\triangleleft
   \triangleleft$}~#1~\hbox{$\triangleright
   \triangleright$}}
\let\CodeFont=\tt  
\def\ShowCode#1{%
   \def\:test{#1}%
   \ifx \:test\:minus  \expandafter\:ShowCode  \else
                                   \:ShowCode#1\fi}\def\:ShowCode#1{%
   \begingroup  \:ShowCommands
      \:SpTbLn
\def\\{\char 92 }%
\def\{{\char 123 }%
\def\}{\char 125 }%
\ifvmode
   \def\:Sp{\leavevmode\phantom{x}}%
   \def\:Tb{\:Sp\:Sp}%
   \def\:Ln{\leavevmode\par}%
\else
   \def\:Sp{ }%
   \def\:Tb{ \ignorespaces}%
   \def\:Ln{\:Tb}%
\fi
      \ifvmode  \everypar={}%
   \:CodeSkip
   \parskip=0em  \parindent=\:minus3em
   \advance \leftskip by 6em
   %
   \def\:TopTitle##1{{\:TitleShift
            \noindent \hfil \:FrontTitle{##1}\par
            \nobreak \smallskip}}%
   \def\:BottomTitle{{\par  \nobreak  \:TitleShift
            \noindent  \hfil \:BackTitle\par}}%
\else
   \def\:TopTitle##1{\:FrontTitle{##1} }%
   \def\:BottomTitle{ \:BackTitle}%
   \def\:CodeSkip{}%
\fi
\def\:FrontTitle##1{\PortTitle{##1}\:AppendSign}%
\def\:BackTitle{\hbox{$\diamond\diamond\diamond$}}%
%
\def\PortTitle##1{\leavevmode \hbox{$\triangleright
   \triangleright$}~##1~\hbox{$\triangleleft
   \triangleleft$}}%
\def-##1##2{}%
\def+##1##2{\let+=\:next}%
\def\:next##1##2{\def\:AppendSign{\char43 }}%
\def\:AppendSign{}%
#1\relax
      \def-##1##2{}%
\def+##1##2{\def\:LastCodeLabel{##2}}%
\def\:LastCodeLabel{}%
#1\relax
\ifx\:LastCodeLabel\empty\else
   {\def\:TagCs{\:LastCodeLabel}\:WriteTrc{ShowCode}}%
\fi
      \CodeFont
      \:CheckCommand{\ShowCode}{#1}%
      \ModifyShowCode{#1}\relax
      \ifx \:test\:minus \else
   \def-##1##2{\:TopTitle{##1}}%
   \def+##1##2{}%
   \ModifyFrontTitle{#1}\relax
   #1\relax
\fi
      \def-##1##2{}%
\def+##1##2{\def\:LastCode{##1}}%
\def\:LastCode{}%
\ModifyLastCode{#1}\relax
#1\relax\def-##1##2{{\def\:TagCs{##2}\:WriteTrc{ShowTitle}}%
   \WindowTitle{##1}}%
\def+##1##2{}%
\ModifyShowLastCode{#1}\relax
\:LastCode
      \ifx \:test\:minus \else
   \:BottomTitle
\fi
\:CodeSkip
   \endgroup}

\def\ModifyShowCode#1{}
\def\:CodeSkip{\ifdim \CodeSkipAmount>0pt
                     \vskip\:minus\lastskip \fi
  \vskip\CodeSkipAmount}
\def\CodeSkipAmount{\medskipamount}
\def\ShiftTitle#1{%   
   \def\:TitleShift{\advance \leftskip by #1}}
\ShiftTitle{\:minus6em}
\def\ModifyFrontTitle#1{}\def\ModifyLastCode#1{}
\def\ModifyShowLastCode#1{}\begingroup
   \catcode`\.=10  \catcode`\^^I=13  \catcode`\^^M=13%
   \catcode`\ =13%
...\gdef\:SpTbLn{%
......\def {\:Sp}\def^^M{\:Ln}\def^^I{\:Tb}}%
\endgroup\begingroup
  \catcode`\{=12  \catcode`\}=12
  \catcode`\[=1   \catcode`\]=2
     \gdef\:lbrc[{]  \gdef\:rbrc[}]
  \catcode`\,=0  \catcode`\\=12
     ,gdef,:backslash[\]
,endgroup
\catcode`\%=12 \catcode`\@=14
\def\:ShowCommands{@         \tempor 
   \ifvmode
      \linepenalty=100
      \def\NL%{$\rightarrow\rightarrow$\hfill\break}@
      \def\%##1\%{{\CommentFont          
         \def\:Tb{ \ignorespaces}@
         \def\:Sp{ }@
         \def\:Ln{\hfill\break}@
         ##1}}@
   \else
      \def\NL%{}@
      \def\%##1\%{{\CommentFont ##1}}@
   \fi}
\def\CommentFont{\it}
\def\:OutCommands{\def\NL%{}\def\%##1\%{}}
\catcode`\%=14  \catcode`\@=11 \def\:OutputCode#1{%
   \begingroup \:OutCommands
      \:CheckCommand{\OutputCode}{#1}%
      \:latexpg
      {\def\:TagCs{\string#1}\:WriteTrc{OutputCode}}%
      \def\Tag##1##2{}\def\Ref##1{}%
      \:SpTbLn      
\def\:Sp{ }%
\def\:Tb{\:Sp\:Sp}%
\newlinechar`\^^J     \def\:Ln{^^J}%
\def\\{\:backslash}%
\def\{{\:lbrc}%
\def\}{\:rbrc}%
      \def\Extension{prg}%
      \def\:WriteCode{\immediate\write15{#1}}%
      % rules for expanding the code macros
         \def-##1##2{}%
         \def+##1##2{\:comment{##2\ifx \CodeId\:gobbleii\else...\fi}##1%
                     \:comment{\ifx \CodeId\:gobbleii\else...\fi##2}}%
      % name for the auxiliary code file
         \def\:gobble##1{}%
         \def\:FileName{\expandafter
            \:gobble\string#1.\Extension}%
      % writing the file
         \ModifyOutputCode{#1}\relax
         \immediate\openout15=\:FileName  \:WriteCode
         \immediate\closeout15
      % notifying the user
         \ProTexMssg{\string-\string-\string-
            Writing file    \string-\string-\string-
            \:FileName\space\string-\string-\string-}%
   \endgroup }
\def\:gobbleii#1#2{}
\def\ProTexMssg{\immediate\write16}

\def\:ParOutputCode#1]#2{{%
   \let\:ModifyOutputCode=\ModifyOutputCode
   \def\ModifyOutputCode##1{\:ModifyOutputCode{##1}%
      \def\Extension{#1}}%
   \:OutputCode #2}}

\def\OutputCode#1{%
   \ifx#1[\let\:next=\:ParOutputCode
    \else \def\:next{\:OutputCode#1}\fi \:next}

\def\ModifyOutputCode#1{}\def\:comment#1{}
\def\Comment{\begingroup
   \:defaultcats
   \::comment}

\def\::comment#1#2{\endgroup
   \def\:flag{}%
   \:ifempty{#1}\else \def\:flag{.}\fi
   \:ifempty{#2}\else \def\:flag{.}\fi
   \ifx \:flag\empty  \def\:comment##1{}%
\else              \def\:comment##1{#1##1#2}\fi}
\def\Ref#1{%
   \:ifempty{#1}\:warn{Empty field in \noexpand\Ref}%
   \else
      \expandafter\ifx \csname  cw:#1\endcsname \relax
         \:NoTag{#1}%
      \else \expandafter\csname cw:#1\endcsname \fi
    \fi}
\def\Tag#1#2{%
  \:ifempty{#1}\:warn{First field
                         empty in \noexpand\Tag}%
  \else
     \begingroup
        \:latexpg
        \edef\:head{\:TagCs\space{#1}{#2}}%
        \def\:write{\write\:refout}%
        \expandafter \expandafter
           \expandafter\:write
              \expandafter{\:head{\the\pageno}}%
     \endgroup
  \fi}

\let\:trc=\Tag
\def\:TagCs{\string\:CrossWord}     \catcode`\-=12   \catcode`\+=12
\ifx \:refout\:UnDef
   \openin15    \jobname.xref
   \ifeof15     \immediate\write16{No file \jobname.xref}
                \def\:NoTag#1{\hbox{$???$}}
   \else
      \begingroup
         \def\:CrossWord#1#2#3{%
   \def\:parm{#2}%
   \ifx \:parm\empty  \:AddTag{#1}{#3}\else
                      \:AddTag{#1}{#2}\fi}

\def\:AddTag#1#2{%
   \expandafter \ifx \csname  cw:#1\endcsname \relax
         \def \:entries{#2}%
   \else \edef\:entries{\csname  cw:#1\endcsname , #2}%
   \fi
   \expandafter \xdef \csname cw:#1\endcsname{\:entries}}
         \input \jobname.xref
      \endgroup
      \def\:NoTag#1{\hbox{$???$}%
                    \:warn{\string\Ref\string{\string#1\string}?}}
   \fi
   \closein15
\fi
                                 \catcode`\-=13   \catcode`\+=13
\ifx \:refout\:UnDef
   \csname newwrite\endcsname\:refout
          \openout\:refout=\jobname.xref
\fi 
\newwrite\:trcfile
\immediate\openout\:trcfile=\jobname.trc

\def\:WriteTrc#1{{\let\:refout=\:trcfile
   \:trc{\string#1}{\the\inputlineno}}}
\def\:TraceDef#1#2{\:tokens={#2}%
   \immediate\write\:trcfile{%
      \string#1\space{DefineTitle}{{\the
                   \:tokens};;\the\inputlineno}{}}}
\def\:AlProTex{\ifx \:next[
  \def\AlProTex[##1]##2{\egroup \def\AlProTex{##2}\input ##1 }
  \else
  \def\AlProTex##1{\egroup \def\AlProTex{##1}\input AlProTex.sty }
  \fi        \let\:AlProTex=\:undefined        \AlProTex}
\def\AlProTex{\bgroup  \catcode`\@=12     \catcode`\^=7  \catcode`\_=8
  \futurelet\:next\:AlProTex}
\ifx \inputlineno\undefined
  \csname newcount\endcsname\inputlineno
  \let\:oldNoSpecials=\:NoSpecials
  \def\:NoSpecials#1#2#3{\ifnum #3>127
     \:oldNoSpecials{#1}{#2}{127}\else
     \:oldNoSpecials{#1}{#2}{#3}\fi }
\fi 
\:RestoreCatcodes \endinput


tetex-tex4ht-1.0-prev.patch:

--- NEW FILE tetex-tex4ht-1.0-prev.patch ---
--- tex4ht-1.0.2006_10_24_0142/debian/lit/rebuild.sh.prev	2006-10-31 11:10:45.000000000 +0100
+++ tex4ht-1.0.2006_10_24_0142/debian/lit/rebuild.sh	2006-11-03 00:08:29.000000000 +0100
@@ -3,6 +3,8 @@
 # This program is released into the public domain.
 # You may do whatever you please with it.
 
+set -x
+
 # This script takes the literate sources for Eitan Gurari's TeX4HT
 # system and produces a directory tree like the one that is
 # distributed as a tar.gz archive. It is gleaned from the 3-4 line
@@ -30,6 +32,8 @@
 DESTDIR=${TOP}/dest
 DEBDIR=${TOP}/debian
 
+unset  TEXINPUTS TEXMFCNF TEX4HTINPUTS T4HTINPUTS \
+	TEX4HTFONTSET TEXINPUTS_tex4ht TEXINPUTS_t4ht
 # We need a different texmf.cnf that expands
 # TeX's memory usage. We will create this in 
 # the following directory:
@@ -119,10 +123,13 @@
 [ -d ${LITDIR} -a -d ${DEBDIR} ] || \
 (echo "Must be in top-level source directory to run this"; exit 0)
 
+rm -rf ${DESTDIR}
+
 # Initialise the working environment
 mkdirheir
 makesomefiles
 setupenv
+
 cd $DESTDIR
 
 # Make tex4ht.c
@@ -131,8 +138,12 @@
 # Make t4ht.c
 tex tex4ht-t4ht
 
+# Make htcmd
+tex tex4ht-htcmd
+
 # Make scripts
 latex tex4ht-mkht
+perl -c mk4ht.perl
 latex ./mkht-scripts.4ht
 
 # Make tex4ht.sty
@@ -168,6 +179,7 @@
 
 # The xttl files are for the experimental speech support.
 # These are built using xhlatex.
+htlatex xtpipes "xhtml,3,next" "" "-d./"
 xhlatex tex4ht-docbook-xttl "html,next,3" "" "-d./"
 xhlatex tex4ht-oo-xttl "html,next,3" "" "-d./"
 xhlatex tex4ht-html-speech-xtpipes "html,next,3" "" "-d./"
@@ -177,14 +189,18 @@
 
 # Make font files. The Needs directives in this file cause "t4ht" to
 # move the files into their correct locations automatically.
-tex tex4ht-fonts-noncjk
-tex tex4ht-fonts-noncjk
-tex4ht tex4ht-fonts-noncjk
-t4ht tex4ht-fonts-noncjk
-latex tex4ht-fonts-4hf
-latex tex4ht-fonts-4hf
-tex4ht tex4ht-fonts-4hf
-t4ht tex4ht-fonts-4hf
+for font in noncjk cjk; do
+tex tex4ht-fonts-${font}
+tex tex4ht-fonts-${font}
+tex4ht tex4ht-fonts-${font}
+t4ht tex4ht-fonts-${font}
+done
+for font in 4hf; do
+latex tex4ht-fonts-${font}
+latex tex4ht-fonts-${font}
+tex4ht tex4ht-fonts-${font}
+t4ht tex4ht-fonts-${font}
+done
 
 movefiles
 texclean

tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch:

--- NEW FILE tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch ---
--- tex4ht-1.0.2006_10_24_0142/lit/xtpipes.tex.nohome	2006-11-02 23:03:41.000000000 +0100
+++ tex4ht-1.0.2006_10_24_0142/lit/xtpipes.tex	2006-11-02 23:43:25.000000000 +0100
@@ -70,7 +70,7 @@
     \def\StartDir{}\fi
 }
 \def\SLASH{/}
-\def\MYdir{work.dir}  
+\def\MYdir{.}  
 
 
 \expandafter\let\csname !/\endcsname\empty
@@ -117,23 +117,21 @@
 
 
 \AtEndDocument{\Needs{"
-  cd work.dir
-  ;
   javac -Xlint:unchecked xtpipes/*.java
-        -d /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+        -d texmf/tex4ht/bin/.
   ;
   javac -Xlint:unchecked xtpipes/*/*.java
-        -d /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+        -d texmf/tex4ht/bin/.
   ;
   javac -Xlint:unchecked xtpipes.java
-        -d /home/4/gurari/tex4ht.dir/texmf/tex4ht/bin/.
+        -d texmf/tex4ht/bin/.
 "}}
 
 
 
 % \Needs{"cp xtpipes.dtd xtpipes.dtd.1"}
 % \AddFile[xtpipes.dtd](/home/4/gurari/tex4ht.dir/texmf/tex4ht/bin){xtpipes.dtd.1}{xtpipes/lib}
-\AddFile(/home/4/gurari/tex4ht.dir/texmf/tex4ht/bin){xtpipes.dtd}{xtpipes/lib}
+\AddFile{xtpipes.dtd}{texmf/tex4ht/bin/xtpipes/lib}
 
 
 % \Needs{" 
@@ -2507,7 +2505,7 @@
    \OutputCodE\
 }
 
-\AddFile(/home/4/gurari/tex4ht.dir/texmf/tex4ht/bin){xtpipes-default.4xt}{xtpipes/lib}
+\AddFile{xtpipes-default.4xt}{texmf/tex4ht/bin/xtpipes/lib}
 
 
 

texmf.cnf.patch:

--- NEW FILE texmf.cnf.patch ---
--- texmf.cnf.orig	2006-10-02 00:11:40.000000000 +0200
+++ texmf.cnf	2006-10-25 22:34:21.000000000 +0200
@@ -161,7 +161,7 @@
 
 % Plain TeX.  Have the command tex check all directories as a last
 % resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.tex = $TEXMF/tex/{plain,generic,}//;.
 
 % Other plain-based formats.
 TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}//
@@ -177,7 +177,7 @@
 % latex209, useful for macros that were written for 2.09 and do not
 % mention 2e at all, but can be used with 2e.
 TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
+TEXINPUTS.latex = $TEXMF/tex/{latex,generic,}//;.
 TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
 TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
 
@@ -192,8 +192,8 @@
 
 % e-TeX.  This form of the input paths is borrowed from teTeX.  A certain
 % variant of TDS is assumed here, unaffected by the build variables.
-TEXINPUTS.elatex   = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex     = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.elatex   = $TEXMF/tex/{latex,generic,}//;.
+TEXINPUTS.etex     = $TEXMF/tex/{plain,generic,}//;.
 
 % pdfTeX.  This form of the input paths is borrowed from teTeX.  A certain
 % variant of TDS is assumed here, unaffected by the build variables.
@@ -254,7 +254,7 @@
 TEXINPUTS.pdfplatex = .;$TEXMF/tex/{platex,latex,generic,}//
 
 % Earlier entries override later ones, so put this last.
-TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
+TEXINPUTS = $TEXMF/tex/{$progname,generic,}//;.
 
 % Metafont, MetaPost inputs.
 MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
@@ -388,6 +388,8 @@
 % a program that uses the 'other text files' or 'other binary files'
 % search formats, you'll want to add their variables here as well.
 T4HTINPUTS   = .;$TEXMF/tex4ht//
+TEXINPUTS.tex4ht = .;$TEXMF/tex4ht//
+TEXINPUTS.t4ht = .;$TEXMF/tex4ht/ht-fonts//
 
 % Architecture independent executables
 TEXMFSCRIPTS = $TEXMF/scripts//
@@ -494,9 +496,9 @@
 % For some xy-pic samples, you may need as much as 700000 words of memory.
 % For the vast majority of documents, 60000 or less will do.
 % 
-main_memory = 1000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0     % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.
+main_memory = 25000000 % words of inimemory available; also applies to inimf&mp
+extra_mem_top = 4000000     % extra high memory for chars, tokens, etc.
+extra_mem_bot = 8000000     % extra low memory for boxes, glue, breakpoints, etc.
 
 % ConTeXt is a memory hog...
 extra_mem_top.context = 2000000
@@ -507,25 +509,25 @@
 main_memory.xmltex = 2500000
 
 % Words of font info for TeX (total size of all TFM files, approximately). 
-font_mem_size = 500000
+font_mem_size = 5000000
 
 % Total number of fonts. Must be >= 50 and <= 2000 (without tex.ch changes).
 font_max = 2000
 
 % Extra space for the hash table of control sequences (which allows 10K
 % names as distributed).
-hash_extra = 50000
+hash_extra = 500000
 
 % Max number of characters in all strings, including all error messages,
 % help texts, font names, control sequences.  These values apply to TeX and MP.
-pool_size = 1250000
+pool_size = 3000000
 % Minimum pool space after TeX/MP's own strings; must be at least
 % 25000 less than pool_size, but doesn't need to be nearly that large.
-string_vacancies = 90000
+string_vacancies = 200000
 % Maximum number of strings.
-max_strings = 100000
+max_strings = 1500000
 % min pool space left after loading .fmt
-pool_free = 47500
+pool_free = 475000
 
 % Hyphenation trie. As distributed, the maximum is 65535; this should
 % work unless `unsigned short' is not supported or is smaller than 16
@@ -538,14 +540,14 @@
 % German: 14000.
 % US English: 10000.
 % 
-trie_size = 262000
+trie_size = 300000
 
 % Buffer size.  TeX uses the buffer to contain input lines, but macro
 % expansion works by writing material into the buffer and reparsing the
 % line.  As a consequence, certain constructs require the buffer to be
 % very large.  As distributed, the size is 50000; most documents can be
 % handled within a tenth of this size.
-buf_size = 200000
+buf_size = 300000
 
 hyph_size = 1000        % number of hyphenation exceptions, >610 and <32767.
 nest_size = 500		% simultaneous semantic levels (e.g., groups)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Aug 2006 10:32:14 -0000	1.7
+++ .cvsignore	3 Nov 2006 00:41:27 -0000	1.8
@@ -1 +1,4 @@
-tex4ht-1.0.2006_08_26_2341.tar.gz
+tex4ht-all-20050228.zip
+tex4ht-lit-20061028.zip
+tex4ht_20060913-1.diff.gz
+tex4ht-1.0.2006_10_28_1705.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Aug 2006 18:27:01 -0000	1.8
+++ sources	3 Nov 2006 00:41:27 -0000	1.9
@@ -1,2 +1,4 @@
-2dd8bbec7cb147391ca08efe4ae7d445  tex4ht-1.0.2006_08_26_2341.tar.gz
 26eb8df2d6631794b3df0d6fb87a0219  tex4ht-all-20050228.zip
+a2837b2bd29e66afb574f1d0f99d4190  tex4ht-lit-20061028.zip
+a69edc1e15d23777bc89b9f3132930b0  tex4ht_20060913-1.diff.gz
+de456f43632f5fb321f5bdbeeb92dfe1  tex4ht-1.0.2006_10_28_1705.tar.gz


Index: tetex-tex4ht.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tetex-tex4ht.spec	6 Sep 2006 10:46:07 -0000	1.8
+++ tetex-tex4ht.spec	3 Nov 2006 00:41:27 -0000	1.9
@@ -2,8 +2,8 @@
 
 Summary:       Translates TeX and LaTeX into HTML or XML+MathML
 Name:          tetex-tex4ht
-Version:       1.0.2006_08_26_2341
-Release:       2%{?dist}
+Version:       1.0.2006_10_28_1705
+Release:       1%{?dist}
 License:       LaTeX Project Public License
 Group:         Applications/Publishing
 URL:           http://www.cse.ohio-state.edu/~gurari/TeX4ht/
@@ -14,17 +14,39 @@
 # unversioned upstream source, downloaded with wget -N
 #Source1 http://www.cse.ohio-state.edu/~gurari/TeX4ht/tex4ht-all.zip
 Source2:       tex4ht-lppl.txt
-Patch0:        tex4ht-env.patch
+# unversioned upstream litteral source, downloaded with wget -N
+#Source3:       http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-lit.zip
+Source3:       tex4ht-lit-20061028.zip
+Source4:       http://www.cse.ohio-state.edu/~gurari/tpf/ProTex.sty
+Source5:       http://www.cse.ohio-state.edu/~gurari/tpf/AlProTex.sty
+Source6:       http://www.cse.ohio-state.edu/~gurari/tpf/DraTex.sty
+Source7:       http://www.cse.ohio-state.edu/~gurari/tpf/AlDraTex.sty
+#Patch0:        tex4ht-1.0.2006_10_24_0142-paths.patch
+# debian
+Patch1:         http://ftp.debian.org/debian/pool/main/t/tex4ht/tex4ht_20060913-1.diff.gz
+# patch similar from debian/lit/texmf.cnf.patch, modified to fit fedora
+Patch2:        texmf.cnf.patch
+# update debian rebuild script
+Patch3:        tetex-tex4ht-1.0-prev.patch
+# if building from litteral sources, install xtpipes files in dest
+Patch4:        tetex-tex4ht-1.0.2006_10_24_0142-nohome.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  /usr/bin/kpsewhich
 BuildRequires:  tetex-fonts
-Requires:       ImageMagick
+# for uudecode to generate the debian tutorial images
+BuildRequires:  sharutils
+# pnmcrop and pnmtopng are in netpbm-progs. 
+Requires:       netpbm-progs
+# ImageMagick, pstoedit depends on ghostscript and gs is in ghostscript
+Requires:       ImageMagick pstoedit
+# dvips is in tetex-dvips. tetex-latex depends on tetex-dvips.
+# dvipng is in tetex. tetex-latex depends on tetex.
 Requires:       tetex-latex
 Requires(post):   /usr/bin/texhash
 Requires(postun): /usr/bin/texhash
-Obsoletes:      tex4ht
-Provides:       tex4ht
+Obsoletes:      tex4ht < %{version}-%{release}
+Provides:       tex4ht = %{version}-%{release}
 
 # description taken from ctan and modified
 %description 
@@ -38,15 +60,43 @@
 
 %prep
 %setup -q -n tex4ht-%{version}
-%patch -p 1
+%patch1 -p1
+
+# apply debian path which avoids using xtpipes since we cannot compile it
+patch -p1 < debian/patches/fix_mk4ht.diff
+
 chmod a-x src/*.c
 cp %{SOURCE2} lppl.txt
 mkdir doc
 cp %{SOURCE1} doc
 pushd doc 
 unzip tex4ht-all-*.zip
-rm -f *.zip
+rm *.zip
 popd
+mkdir lit
+cp %{SOURCE3} lit
+pushd lit
+unzip tex4ht-lit-*.zip
+rm *.zip
+chmod 0644 *.tex
+popd
+cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} lit/
+
+# avoid duplicating the debian patches while still allowing to rebuild
+# from literate sources
+patch -p1 < debian/lit/patches/fix_tex4ht_dir.diff
+patch -p1 < debian/lit/patches/fix_tex4ht_fonts_4hf.diff
+%patch4 -p1 -b .nohome
+
+patch -p1 < debian/patches/add_manpage.diff
+
+cp %{PATCH2} debian/lit/
+
+%patch3 -p1 -b .prev
+
+chmod a+x debian/lit/rebuild.sh*
+
+(cd debian/images; for i in *.uue; do uudecode $i; done; mv *.png ../html)
 
 find  texmf -type f -exec chmod a-x \{\} \;
 
@@ -55,12 +105,12 @@
 CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRING_H -DHAVE_DIRENT_H -DHAVE_UNISTD_H \
  -DHAVE_SYS_DIR_H -DKPATHSEA -DENVFILE=\"%{_texmf}/tex4ht/base/unix/tex4ht.env\""
 LDFLAGS=-lkpathsea
-gcc -c $CFLAGS tex4ht.c
-gcc -c $CFLAGS t4ht.c
-gcc -o tex4ht tex4ht.o $LDFLAGS
-gcc -o t4ht t4ht.o $LDFLAGS
+gcc -o tex4ht $CFLAGS tex4ht.c $LDFLAGS
+gcc -o t4ht $CFLAGS t4ht.c $LDFLAGS
 popd
 
+# files in bin/ht/unix have a shebang but use xtpipes
+
 # add shebangs to the scripts that lacks one
 for file in bin/unix/*; do
     if grep '^#! */' $file > /dev/null 2>&1; then continue; fi 
@@ -74,18 +124,31 @@
 install -d -m755 $RPM_BUILD_ROOT%{_bindir}
 install -m755 src/tex4ht $RPM_BUILD_ROOT%{_bindir}
 install -m755 src/t4ht $RPM_BUILD_ROOT%{_bindir}
+#install -m755 bin/ht/unix/* $RPM_BUILD_ROOT%{_bindir}
 install -m755 bin/unix/* $RPM_BUILD_ROOT%{_bindir}
 
 pushd texmf
 install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
 cp tex4ht/base/unix/tex4ht.env $RPM_BUILD_ROOT%{_texmf}/tex4ht/base/unix
 
-cp -r tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht
+cp -pr tex4ht/ht-fonts $RPM_BUILD_ROOT%{_texmf}/tex4ht
 
 install -d -m755 $RPM_BUILD_ROOT%{_texmf}/tex/generic
-cp -r tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic
+cp -pr tex/generic/tex4ht $RPM_BUILD_ROOT%{_texmf}/tex/generic
 popd
 
+cp -pr debian/html tutorial
+
+sed 's/Debian packaged/Debian and Fedora packaged/' debian/README.kpathsea \
+   > README.kpathsea 
+
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+sed -e 's;@SCRIPTSDIR@;%{_bindir};' \
+ -e 's;@TEX4HTDIR@;%{_texmf}/tex4ht/base/unix;' \
+ -e 's;@TEXMFCNF@;%{_texmf}/web2c/texmf.cnf;' \
+ -e 's;@HTFDIR@;%{_texmf}/tex4ht/ht-fonts;' \
+ -e 's;@TEXDIR@;%{_texmf}/tex/generic/tex4ht;g' \
+ src/tex4ht.man > $RPM_BUILD_ROOT%{_mandir}/man1/tex4ht.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,7 +158,8 @@
 %{_texmf}/tex4ht/
 %{_texmf}/tex/generic/tex4ht/
 %{_bindir}/*
-%doc lppl.txt doc
+%{_mandir}/man1/tex4ht.1*
+%doc lppl.txt doc tutorial README.kpathsea 
 
 %post
 texhash > /dev/null 2>&1 || :
@@ -104,6 +168,12 @@
 texhash > /dev/null 2>&1 || :
 
 %changelog
+* Fri Nov  3 2006 Patrice Dumas  1.0.2006_10_28_1705-1
+- update
+- use debian patchset
+- remove the patch modifying paths in tex4ht.env, it is unneeded with 
+  kpathsee
+
 * Mon Aug 28 2006 Patrice Dumas  1.0.2006_08_26_2341-2
 - update
 


--- tex4ht-env.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 01:59:19 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 2 Nov 2006 18:59:19 -0700
Subject: rpms/cacti/FC-3 cacti.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200611030159.kA31xJ8M031888@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/FC-3

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version as well as bz#198569


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-3/cacti.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cacti.spec	22 Feb 2006 09:04:28 -0000	1.4
+++ cacti.spec	3 Nov 2006 01:58:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6h
-Release: 6%{?dist}
+Version: 0.8.6i
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -10,6 +10,9 @@
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+
+Patch1: cacti-0.8.6h-dbcfg.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
@@ -17,12 +20,6 @@
 Requires(postun): /sbin/service 
 BuildArch: noarch
 
-Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch
-Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
-Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
-Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch
-
 %description
 Cacti is a complete frontend to RRDTool. It stores all of the
 necessary information to create graphs and populate them with
@@ -35,10 +32,6 @@
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -51,7 +44,7 @@
 %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/
-%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
+%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/
 %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
 %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
@@ -65,6 +58,8 @@
 ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log
+ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/
+ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/
 
 %clean
 rm -rf %{buildroot}
@@ -104,8 +99,16 @@
 %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/
 %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
+- Upstream released new version
+
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6h-7
+- Mass rebuild
+
 * Wed Feb 22 2006 Mike McGrath  - 0.8.6h-6
 - Disabled Cron job by default
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Feb 2006 01:42:50 -0000	1.2
+++ sources	3 Nov 2006 01:58:49 -0000	1.3
@@ -1 +1,2 @@
 5f6100b525b5b29e81f43cc7c55f4000  cacti-0.8.6h.tar.gz
+341b5828d95db91f81f5fbba65411d63  cacti-0.8.6i.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 01:59:20 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 2 Nov 2006 18:59:20 -0700
Subject: rpms/cacti/FC-4 cacti.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200611030159.kA31xKe8031894@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/FC-4

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version as well as bz#198569


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-4/cacti.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cacti.spec	22 Feb 2006 09:04:48 -0000	1.4
+++ cacti.spec	3 Nov 2006 01:58:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6h
-Release: 6%{?dist}
+Version: 0.8.6i
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -10,6 +10,9 @@
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+
+Patch1: cacti-0.8.6h-dbcfg.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
@@ -17,12 +20,6 @@
 Requires(postun): /sbin/service 
 BuildArch: noarch
 
-Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch
-Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
-Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
-Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch
-
 %description
 Cacti is a complete frontend to RRDTool. It stores all of the
 necessary information to create graphs and populate them with
@@ -35,10 +32,6 @@
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -51,7 +44,7 @@
 %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/
-%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
+%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/
 %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
 %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
@@ -65,6 +58,8 @@
 ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log
+ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/
+ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/
 
 %clean
 rm -rf %{buildroot}
@@ -104,8 +99,16 @@
 %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/
 %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
+- Upstream released new version
+
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6h-7
+- Mass rebuild
+
 * Wed Feb 22 2006 Mike McGrath  - 0.8.6h-6
 - Disabled Cron job by default
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Feb 2006 01:42:50 -0000	1.2
+++ sources	3 Nov 2006 01:58:49 -0000	1.3
@@ -1 +1,2 @@
 5f6100b525b5b29e81f43cc7c55f4000  cacti-0.8.6h.tar.gz
+341b5828d95db91f81f5fbba65411d63  cacti-0.8.6i.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 01:59:21 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 2 Nov 2006 18:59:21 -0700
Subject: rpms/cacti/FC-5 cacti.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200611030159.kA31xLFf031900@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/FC-5

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version as well as bz#198569


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-5/cacti.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cacti.spec	22 Feb 2006 09:04:56 -0000	1.4
+++ cacti.spec	3 Nov 2006 01:58:50 -0000	1.5
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6h
-Release: 6%{?dist}
+Version: 0.8.6i
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -10,6 +10,9 @@
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+
+Patch1: cacti-0.8.6h-dbcfg.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
@@ -17,12 +20,6 @@
 Requires(postun): /sbin/service 
 BuildArch: noarch
 
-Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch
-Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
-Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
-Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch
-
 %description
 Cacti is a complete frontend to RRDTool. It stores all of the
 necessary information to create graphs and populate them with
@@ -35,10 +32,6 @@
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -51,7 +44,7 @@
 %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/
-%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
+%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/
 %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
 %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
@@ -65,6 +58,8 @@
 ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log
+ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/
+ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/
 
 %clean
 rm -rf %{buildroot}
@@ -104,8 +99,16 @@
 %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/
 %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
+- Upstream released new version
+
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6h-7
+- Mass rebuild
+
 * Wed Feb 22 2006 Mike McGrath  - 0.8.6h-6
 - Disabled Cron job by default
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Feb 2006 01:42:50 -0000	1.2
+++ sources	3 Nov 2006 01:58:50 -0000	1.3
@@ -1 +1,2 @@
 5f6100b525b5b29e81f43cc7c55f4000  cacti-0.8.6h.tar.gz
+341b5828d95db91f81f5fbba65411d63  cacti-0.8.6i.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 01:59:26 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 2 Nov 2006 18:59:26 -0700
Subject: rpms/cacti/devel .cvsignore, 1.2, 1.3 cacti.spec, 1.5, 1.6 sources, 
	1.2, 1.3
Message-ID: <200611030159.kA31xQlj031921@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/devel

Modified Files:
	.cvsignore cacti.spec sources 
Log Message:
upstream released new version as well as bz#198569


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Feb 2006 01:42:50 -0000	1.2
+++ .cvsignore	3 Nov 2006 01:58:56 -0000	1.3
@@ -1 +1,2 @@
 cacti-0.8.6h.tar.gz
+cacti-0.8.6i.tar.gz


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cacti.spec	7 Sep 2006 20:31:46 -0000	1.5
+++ cacti.spec	3 Nov 2006 01:58:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6h
-Release: 7%{?dist}
+Version: 0.8.6i
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -10,6 +10,9 @@
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+
+Patch1: cacti-0.8.6h-dbcfg.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
@@ -17,12 +20,6 @@
 Requires(postun): /sbin/service 
 BuildArch: noarch
 
-Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch
-Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
-Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
-Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch
-
 %description
 Cacti is a complete frontend to RRDTool. It stores all of the
 necessary information to create graphs and populate them with
@@ -35,10 +32,6 @@
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -51,7 +44,7 @@
 %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/
-%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
+%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/
 %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
 %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
@@ -65,6 +58,8 @@
 ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log
+ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/
+ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/
 
 %clean
 rm -rf %{buildroot}
@@ -104,8 +99,13 @@
 %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/
 %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6h-7
 - Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Feb 2006 01:42:50 -0000	1.2
+++ sources	3 Nov 2006 01:58:56 -0000	1.3
@@ -1 +1,2 @@
 5f6100b525b5b29e81f43cc7c55f4000  cacti-0.8.6h.tar.gz
+341b5828d95db91f81f5fbba65411d63  cacti-0.8.6i.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 02:04:12 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 2 Nov 2006 19:04:12 -0700
Subject: rpms/cacti/FC-6 cacti.spec,1.5,1.6 sources,1.2,1.3
Message-ID: <200611030204.kA324ChH003258@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3180

Modified Files:
	cacti.spec sources 
Log Message:
upstream released new version


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cacti.spec	7 Sep 2006 20:31:46 -0000	1.5
+++ cacti.spec	3 Nov 2006 02:03:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 0.8.6h
-Release: 7%{?dist}
+Version: 0.8.6i
+Release: 2%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -10,6 +10,9 @@
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+
+Patch1: cacti-0.8.6h-dbcfg.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
@@ -17,12 +20,6 @@
 Requires(postun): /sbin/service 
 BuildArch: noarch
 
-Patch1: cacti-0.8.6h-dbcfg.patch
-Patch2: http://www.cacti.net/downloads/patches/0.8.6h/fix_search_session_clear_issue.patch
-Patch3: http://www.cacti.net/downloads/patches/0.8.6h/fix_sql_syntax_related_to_default_rra_id.patch
-Patch4: http://www.cacti.net/downloads/patches/0.8.6h/nth_percentile_empty_return_set_issue.patch
-Patch5: http://www.cacti.net/downloads/patches/0.8.6h/mysql_5x_strict.patch
-
 %description
 Cacti is a complete frontend to RRDTool. It stores all of the
 necessary information to create graphs and populate them with
@@ -35,10 +32,6 @@
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
@@ -51,7 +44,7 @@
 %{__install} -d -m 0775 log/ %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -m 0664 log/* %{buildroot}/%{_localstatedir}/log/%{name}/
 %{__install} -d -m 0755 rra/ %{buildroot}/%{_localstatedir}/lib/%{name}/rra/
-%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
+%{__install} -d -m 0755 scripts/ %{buildroot}/%{_localstatedir}/lib//%{name}/scripts/
 %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
 %{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
@@ -65,6 +58,8 @@
 ln -s %{_localstatedir}/lib/%{name}/rra %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/lib/%{name}/scripts %{buildroot}/%{_datadir}/%{name}/
 ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{_datadir}/%{name}/log
+ln -s %{_datadir}/%{name}/lib %{buildroot}/%{_localstatedir}/lib/%{name}/
+ln -s %{_datadir}/%{name}/include %{buildroot}/%{_localstatedir}/lib/%{name}/
 
 %clean
 rm -rf %{buildroot}
@@ -104,8 +99,13 @@
 %attr(-,cacti,apache) %{_localstatedir}/log/%{name}/
 %attr(-,cacti,root) %{_localstatedir}/lib/%{name}/rra/
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/scripts/*php
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/include
+%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6h-7
 - Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Feb 2006 01:42:50 -0000	1.2
+++ sources	3 Nov 2006 02:03:42 -0000	1.3
@@ -1 +1,2 @@
 5f6100b525b5b29e81f43cc7c55f4000  cacti-0.8.6h.tar.gz
+341b5828d95db91f81f5fbba65411d63  cacti-0.8.6i.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 02:06:58 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 2 Nov 2006 19:06:58 -0700
Subject: rpms/cacti/FC-6 cacti.spec,1.6,1.7
Message-ID: <200611030206.kA326wEv003701@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3546/FC-6

Modified Files:
	cacti.spec 
Log Message:
release bump because Im a dumbass


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cacti.spec	3 Nov 2006 02:03:42 -0000	1.6
+++ cacti.spec	3 Nov 2006 02:06:28 -0000	1.7
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6i
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -103,6 +103,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6i-3
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Nov  3 02:06:59 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 2 Nov 2006 19:06:59 -0700
Subject: rpms/cacti/devel cacti.spec,1.6,1.7
Message-ID: <200611030206.kA326xiN003707@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3546/devel

Modified Files:
	cacti.spec 
Log Message:
release bump because Im a dumbass


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cacti.spec	3 Nov 2006 01:58:56 -0000	1.6
+++ cacti.spec	3 Nov 2006 02:06:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6i
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -103,6 +103,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6i-3
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Nov  3 02:06:56 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 2 Nov 2006 19:06:56 -0700
Subject: rpms/cacti/FC-5 cacti.spec,1.5,1.6
Message-ID: <200611030206.kA326uF0003688@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3546/FC-5

Modified Files:
	cacti.spec 
Log Message:
release bump because Im a dumbass


Index: cacti.spec
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-5/cacti.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cacti.spec	3 Nov 2006 01:58:50 -0000	1.5
+++ cacti.spec	3 Nov 2006 02:06:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.6i
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -103,6 +103,9 @@
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Thu Sep 07 2006 Mike McGrath  - 0.8.6i-3
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Nov  3 02:13:31 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 2 Nov 2006 19:13:31 -0700
Subject: rpms/haddock/devel .cvsignore, 1.2, 1.3 haddock.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200611030213.kA32DVXU005025@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/haddock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4744

Modified Files:
	.cvsignore haddock.spec sources 
Log Message:
- update to 0.8
- use new cabal build system
- update file list



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Sep 2005 03:00:15 -0000	1.2
+++ .cvsignore	3 Nov 2006 02:13:01 -0000	1.3
@@ -1 +1 @@
-haddock-0.7-src.tar.gz
+haddock-0.8-src.tar.gz


Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- haddock.spec	28 Sep 2006 01:26:09 -0000	1.4
+++ haddock.spec	3 Nov 2006 02:13:01 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           haddock
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Haddock documentation tool for annotated Haskell source code
 
 Group:          Development/Tools
@@ -32,24 +32,17 @@
 
 
 %build
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
-make %{?_smp_mflags}
-(cd haddock/doc ; make html )
+runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir}
+runhaskell Setup.lhs build
+cd doc
+test -f configure || autoreconf
+./configure
+make html
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-
-# move datafiles into their expected location
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}
-find ${RPM_BUILD_ROOT}%{_datadir} -type f | xargs mv --target-directory=${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}
-
-sed -i -e "s!%{_libdir}/%{name}-%{version}!%{_libexecdir}!" ${RPM_BUILD_ROOT}%{_bindir}/%{name}-%{version}
-
-# drop versioned binary wrapper
-rm ${RPM_BUILD_ROOT}%{_bindir}/%{name}
-mv ${RPM_BUILD_ROOT}%{_bindir}/%{name}{-%{version},}
+runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}
 
 
 %clean
@@ -62,14 +55,18 @@
 
 %files
 %defattr(-,root,root)
-%doc haddock/README
-%doc haddock/doc/haddock
+%doc README
+%doc doc/haddock/*
 %{_bindir}/haddock
-%{_libexecdir}/haddock.bin
 %{_datadir}/haddock-%{version}
 
 
 %changelog
+* Fri Nov  3 2006 Jens Petersen  - 0.8-1
+- update to 0.8
+- use new cabal build system
+- update file list
+
 * Thu Sep 28 2006 Jens Petersen  - 0.7-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2005 03:00:15 -0000	1.2
+++ sources	3 Nov 2006 02:13:01 -0000	1.3
@@ -1 +1 @@
-759419e78416d5f093190968a4dc18f5  haddock-0.7-src.tar.gz
+0a1bb64e7642f64d2560dc258c570c1d  haddock-0.8-src.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 03:17:01 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 2 Nov 2006 20:17:01 -0700
Subject: rpms/haddock/devel haddock.spec,1.5,1.6
Message-ID: <200611030317.kA33H1Le010258@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/haddock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10242

Modified Files:
	haddock.spec 
Log Message:
buildrequire autoconf



Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/devel/haddock.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- haddock.spec	3 Nov 2006 02:13:01 -0000	1.5
+++ haddock.spec	3 Nov 2006 03:16:31 -0000	1.6
@@ -9,7 +9,7 @@
 Source0:        http://www.haskell.org/haddock/%{name}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ghc libxslt docbook-style-xsl
+BuildRequires:  ghc libxslt docbook-style-xsl autoconf
 # need chcon
 PreReq:		coreutils
 
@@ -66,6 +66,7 @@
 - update to 0.8
 - use new cabal build system
 - update file list
+- buildrequire autoconf
 
 * Thu Sep 28 2006 Jens Petersen  - 0.7-4
 - rebuild for FC6



From fedora-extras-commits at redhat.com  Fri Nov  3 04:08:50 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 21:08:50 -0700
Subject: rpms/perl-Tree-Simple/devel .cvsignore, 1.3,
	1.4 perl-Tree-Simple.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200611030408.kA348op9013695@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13654

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Apr 2006 06:23:12 -0000	1.3
+++ .cvsignore	3 Nov 2006 04:08:19 -0000	1.4
@@ -1 +1 @@
-Tree-Simple-1.16.tar.gz
+Tree-Simple-1.17.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/perl-Tree-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Tree-Simple.spec	5 Sep 2006 09:25:26 -0000	1.5
+++ perl-Tree-Simple.spec	3 Nov 2006 04:08:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
-Version: 	1.16
-Release: 	2%{?dist}
+Version: 	1.17
+Release: 	1%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 1.16-2
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Apr 2006 06:23:12 -0000	1.3
+++ sources	3 Nov 2006 04:08:19 -0000	1.4
@@ -1 +1 @@
-7f003a9af1aea6a9931c3de8fc49b3ab  Tree-Simple-1.16.tar.gz
+c1468eb79c414090bf16e2da4fc9637c  Tree-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 04:09:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 21:09:45 -0700
Subject: rpms/perl-Tree-Simple/FC-6 .cvsignore, 1.3,
	1.4 perl-Tree-Simple.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200611030409.kA349j0j013755@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13735

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Apr 2006 06:23:12 -0000	1.3
+++ .cvsignore	3 Nov 2006 04:09:15 -0000	1.4
@@ -1 +1 @@
-Tree-Simple-1.16.tar.gz
+Tree-Simple-1.17.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-6/perl-Tree-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Tree-Simple.spec	5 Sep 2006 09:25:26 -0000	1.5
+++ perl-Tree-Simple.spec	3 Nov 2006 04:09:15 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
-Version: 	1.16
-Release: 	2%{?dist}
+Version: 	1.17
+Release: 	1%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 1.16-2
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Apr 2006 06:23:12 -0000	1.3
+++ sources	3 Nov 2006 04:09:15 -0000	1.4
@@ -1 +1 @@
-7f003a9af1aea6a9931c3de8fc49b3ab  Tree-Simple-1.16.tar.gz
+c1468eb79c414090bf16e2da4fc9637c  Tree-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 04:10:41 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 21:10:41 -0700
Subject: rpms/perl-Tree-Simple/FC-5 .cvsignore, 1.3,
	1.4 perl-Tree-Simple.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611030410.kA34AfJi013792@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13764

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Apr 2006 06:24:14 -0000	1.3
+++ .cvsignore	3 Nov 2006 04:10:11 -0000	1.4
@@ -1 +1 @@
-Tree-Simple-1.16.tar.gz
+Tree-Simple-1.17.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/perl-Tree-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Tree-Simple.spec	4 Apr 2006 06:24:14 -0000	1.4
+++ perl-Tree-Simple.spec	3 Nov 2006 04:10:11 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Tree-Simple
-Version: 	1.16
+Version: 	1.17
 Release: 	1%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
@@ -50,6 +50,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.16-2
+- Mass rebuild.
+
 * Tue Apr 04 2006 Ralf Cors??pius  - 1.16-1
 - Upsteam update.
 - BR: Scalar::Util >= 1.18.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Apr 2006 06:24:14 -0000	1.3
+++ sources	3 Nov 2006 04:10:11 -0000	1.4
@@ -1 +1 @@
-7f003a9af1aea6a9931c3de8fc49b3ab  Tree-Simple-1.16.tar.gz
+c1468eb79c414090bf16e2da4fc9637c  Tree-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 04:11:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 21:11:36 -0700
Subject: rpms/perl-Tree-Simple/FC-4 .cvsignore, 1.2,
	1.3 perl-Tree-Simple.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611030411.kA34BaZP013833@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13800

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 01:08:39 -0000	1.2
+++ .cvsignore	3 Nov 2006 04:11:06 -0000	1.3
@@ -1 +1 @@
-Tree-Simple-1.15.tar.gz
+Tree-Simple-1.17.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/perl-Tree-Simple.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Tree-Simple.spec	20 Aug 2005 01:16:28 -0000	1.2
+++ perl-Tree-Simple.spec	3 Nov 2006 04:11:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
-Version: 	1.15
-Release: 	2%{?dist}
+Version: 	1.17
+Release: 	1%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Scalar::Util) >= 1.18
 BuildRequires: 	perl(Test::Exception) >= 0.15 
 BuildRequires: 	perl(Test::Pod) >=  1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
@@ -49,6 +50,19 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.16-2
+- Mass rebuild.
+
+* Tue Apr 04 2006 Ralf Cors??pius  - 1.16-1
+- Upsteam update.
+- BR: Scalar::Util >= 1.18.
+
+* Tue Feb 28 2006 Ralf Cors??pius  - 1.15-3
+- Rebuild for perl-5.8.8.
+
 * Thu Aug 20 2005 Ralf Corsepius  - 1.15-2
 - Spec cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 01:08:39 -0000	1.2
+++ sources	3 Nov 2006 04:11:06 -0000	1.3
@@ -1 +1 @@
-f4bb1afd402186952ea0b87ceeb3bc41  Tree-Simple-1.15.tar.gz
+c1468eb79c414090bf16e2da4fc9637c  Tree-Simple-1.17.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 04:15:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 2 Nov 2006 21:15:49 -0700
Subject: rpms/gaim-rhythmbox - New directory
Message-ID: <200611030415.kA34FnPK014072@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14068/gaim-rhythmbox

Log Message:
Directory /cvs/extras/rpms/gaim-rhythmbox added to the repository




From fedora-extras-commits at redhat.com  Fri Nov  3 04:15:50 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 2 Nov 2006 21:15:50 -0700
Subject: rpms/gaim-rhythmbox/devel - New directory
Message-ID: <200611030415.kA34Fo0t014086@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14068/gaim-rhythmbox/devel

Log Message:
Directory /cvs/extras/rpms/gaim-rhythmbox/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov  3 04:16:06 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 2 Nov 2006 21:16:06 -0700
Subject: rpms/gaim-rhythmbox Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611030416.kA34G6Fu014117@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14111

Added Files:
	Makefile import.log 
Log Message:
Setup of module gaim-rhythmbox


--- NEW FILE Makefile ---
# Top level Makefile for module gaim-rhythmbox
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  Fri Nov  3 04:16:12 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 2 Nov 2006 21:16:12 -0700
Subject: rpms/gaim-rhythmbox/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611030416.kA34GC0J014134@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14111/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gaim-rhythmbox


--- 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  Fri Nov  3 04:17:45 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 2 Nov 2006 21:17:45 -0700
Subject: rpms/gaim-rhythmbox import.log,1.1,1.2
Message-ID: <200611030417.kA34HjPj014215@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14180

Modified Files:
	import.log 
Log Message:
auto-import gaim-rhythmbox-2.0-0.3.beta3 on branch devel from gaim-rhythmbox-2.0-0.3.beta3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Nov 2006 04:16:06 -0000	1.1
+++ import.log	3 Nov 2006 04:17:14 -0000	1.2
@@ -0,0 +1 @@
+gaim-rhythmbox-2_0-0_3_beta3:HEAD:gaim-rhythmbox-2.0-0.3.beta3.src.rpm:1162527424



From fedora-extras-commits at redhat.com  Fri Nov  3 04:17:45 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 2 Nov 2006 21:17:45 -0700
Subject: rpms/gaim-rhythmbox/devel gaim-rhythmbox-configure.diff, NONE,
	1.1 gaim-rhythmbox.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611030417.kA34HjAC014219@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14180/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gaim-rhythmbox-configure.diff gaim-rhythmbox.spec 
Log Message:
auto-import gaim-rhythmbox-2.0-0.3.beta3 on branch devel from gaim-rhythmbox-2.0-0.3.beta3.src.rpm

gaim-rhythmbox-configure.diff:

--- NEW FILE gaim-rhythmbox-configure.diff ---
--- configure.orig	2006-09-24 02:36:08.000000000 -0400
+++ configure	2006-10-28 18:19:44.000000000 -0400
@@ -20593,7 +20593,7 @@
 
 
 
-GAIM_INSTALL="`$PKG_CONFIG gaim --variable=prefix`/lib/gaim"
+GAIM_INSTALL="`$PKG_CONFIG gaim --variable=libdir`/gaim"
 
 
 ac_config_files="$ac_config_files Makefile src/Makefile"


--- NEW FILE gaim-rhythmbox.spec ---
%define prever beta3
Name:           gaim-rhythmbox
Version:        2.0
Release:        0.3.%{prever}%{?dist}
Summary:        Rhythmbox plugin for GAIM

Group:          Applications/Internet
License:        GPL
URL:            http://jon.oberheide.org/projects/gaim-rhythmbox/
Source0:        http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}%{prever}.tar.gz
Patch0:         gaim-rhythmbox-configure.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gaim-devel
BuildRequires:  gtk2-devel
BuildRequires:  dbus-glib-devel dbus-devel
Requires:       rhythmbox

%description
The Gaim-Rhythmbox plugin will automatically update your Gaim user and
status info with the currently playing music in Rhythmbox. If the
artist and title are known, it will also attempt to create a link to
the song's lyrics by using Google's "I'm Feeling Lucky"
feature. Gaim-Rhythmbox will replace %rb in your user info and status
message with the song information.


%prep
%setup -q -n %{name}-%{version}%{?prever}
%patch0


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove .la file
rm $RPM_BUILD_ROOT/%{_libdir}/gaim/gaim-rhythmbox.la


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/gaim/gaim-rhythmbox.so


%changelog
* Thu Nov  2 2006 Michel Salim  2.0-0.3.beta3
- Tidy up prever use, description field, and add files to documentation

* Thu Nov  2 2006 Michel Salim  2.0-0.2.beta3
- Add missing BuildRequires

* Sat Oct 28 2006 Michel Salim  2.0-0.1.beta3
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Nov 2006 04:16:12 -0000	1.1
+++ .cvsignore	3 Nov 2006 04:17:15 -0000	1.2
@@ -0,0 +1 @@
+gaim-rhythmbox-2.0beta3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Nov 2006 04:16:12 -0000	1.1
+++ sources	3 Nov 2006 04:17:15 -0000	1.2
@@ -0,0 +1 @@
+a9e836986dae7857b408120782264d5a  gaim-rhythmbox-2.0beta3.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 04:26:15 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 2 Nov 2006 21:26:15 -0700
Subject: owners owners.list,1.1885,1.1886
Message-ID: <200611030426.kA34QFTg014294@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14274

Modified Files:
	owners.list 
Log Message:
Added gaim-rhythmbox



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1885
retrieving revision 1.1886
diff -u -r1.1885 -r1.1886
--- owners.list	2 Nov 2006 21:30:30 -0000	1.1885
+++ owners.list	3 Nov 2006 04:25:45 -0000	1.1886
@@ -450,6 +450,7 @@
 Fedora Extras|gaim-guifications|Guifications plugin for GAIM|byte at fedoraproject.org|extras-qa at fedoraproject.org|tcallawa at redhat.com
 Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xelerance.com|extras-qa at fedoraproject.org|
+Fedora Extras|gaim-rhythmbox|Rhythmbox plugin for GAIM|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|galago-daemon|Galago presence daemon|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|galago-filesystem|Galago filesystem layout|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov  3 04:44:35 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 21:44:35 -0700
Subject: rpms/perl-Test-LongString/devel .cvsignore, 1.3,
	1.4 perl-Test-LongString.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200611030444.kA34iZZV014382@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-LongString/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14362

Modified Files:
	.cvsignore perl-Test-LongString.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2005 06:34:22 -0000	1.3
+++ .cvsignore	3 Nov 2006 04:44:05 -0000	1.4
@@ -1 +1 @@
-Test-LongString-0.09.tar.gz
+Test-LongString-0.10.tar.gz


Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/perl-Test-LongString.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-LongString.spec	5 Sep 2006 08:57:53 -0000	1.5
+++ perl-Test-LongString.spec	3 Nov 2006 04:44:05 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Test-LongString
-Version: 	0.09
-Release: 	3%{?dist}
+Version: 	0.10
+Release: 	1%{?dist}
 Summary: 	Perl module to test long strings
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.10-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 0.09-3
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2005 06:34:22 -0000	1.3
+++ sources	3 Nov 2006 04:44:05 -0000	1.4
@@ -1 +1 @@
-a956f4f0a8f7a8704f984523ce58fa66  Test-LongString-0.09.tar.gz
+66f3fa30c0100d0f8d8089741964ad52  Test-LongString-0.10.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 04:55:49 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 21:55:49 -0700
Subject: rpms/perl-Tree-Simple/FC-4 .cvsignore, 1.3,
	1.4 perl-Tree-Simple.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611030455.kA34tnLS014497@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14477

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
Backout; FC-4's perl is to outdated to be able to build this package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Nov 2006 04:11:06 -0000	1.3
+++ .cvsignore	3 Nov 2006 04:55:19 -0000	1.4
@@ -1 +1 @@
-Tree-Simple-1.17.tar.gz
+Tree-Simple-1.15.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/perl-Tree-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Tree-Simple.spec	3 Nov 2006 04:11:06 -0000	1.3
+++ perl-Tree-Simple.spec	3 Nov 2006 04:55:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
-Version: 	1.17
-Release: 	1%{?dist}
+Version: 	1.15
+Release: 	2%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -9,7 +9,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
-BuildRequires:	perl(Scalar::Util) >= 1.18
 BuildRequires: 	perl(Test::Exception) >= 0.15 
 BuildRequires: 	perl(Test::Pod) >=  1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
@@ -50,19 +49,6 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Nov 03 2006 Ralf Cors??pius  - 1.17-1
-- Upstream update.
-
-* Tue Sep 05 2006 Ralf Cors??pius  - 1.16-2
-- Mass rebuild.
-
-* Tue Apr 04 2006 Ralf Cors??pius  - 1.16-1
-- Upsteam update.
-- BR: Scalar::Util >= 1.18.
-
-* Tue Feb 28 2006 Ralf Cors??pius  - 1.15-3
-- Rebuild for perl-5.8.8.
-
 * Thu Aug 20 2005 Ralf Corsepius  - 1.15-2
 - Spec cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Nov 2006 04:11:06 -0000	1.3
+++ sources	3 Nov 2006 04:55:19 -0000	1.4
@@ -1 +1 @@
-c1468eb79c414090bf16e2da4fc9637c  Tree-Simple-1.17.tar.gz
+f4bb1afd402186952ea0b87ceeb3bc41  Tree-Simple-1.15.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:00:42 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 2 Nov 2006 22:00:42 -0700
Subject: rpms/ghc/devel .cvsignore, 1.6, 1.7 ghc.spec, 1.16, 1.17 sources,
	1.8, 1.9
Message-ID: <200611030500.kA350gGw014550@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14519

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
- update to 6.6 release
- buildrequire haddock >= 0.8
- fix summary of ghcver package (Michel Salim, #209574)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Apr 2006 07:59:27 -0000	1.6
+++ .cvsignore	3 Nov 2006 05:00:12 -0000	1.7
@@ -1 +1,2 @@
-ghc-6.4.2-src.tar.bz2
+ghc-6.6-src.tar.bz2
+ghc-6.6-src-extralibs.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ghc.spec	28 Sep 2006 01:44:23 -0000	1.16
+++ ghc.spec	3 Nov 2006 05:00:12 -0000	1.17
@@ -1,16 +1,17 @@
-%define ghcver ghc642
+%define ghcver ghc66
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
 Name:		ghc
-Version:	6.4.2
-Release:	4%{?dist}
+Version:	6.6
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
-Source:		http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source0:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source1:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,7 +21,7 @@
 Buildrequires:  freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates docs in libraries
-Buildrequires: libxslt, docbook-style-xsl, haddock
+Buildrequires: libxslt, docbook-style-xsl, haddock >= 0.8
 %endif
 Prefix:		%{_prefix}
 
@@ -35,7 +36,7 @@
 interface.
 
 %package -n %{ghcver}
-Summary:	Documentation for GHC
+Summary:	Glasgow Haskell Compilation system
 Group:		Development/Languages
 Requires:	gcc gmp-devel readline-devel
 
@@ -79,7 +80,7 @@
 %define __spec_install_post /usr/lib/rpm/brp-compress
 
 %prep
-%setup -q -n ghc-%{version}
+%setup -q -n ghc-%{version} -b1
 
 %build
 %if !%{build_prof}
@@ -154,7 +155,7 @@
 
 %files -n %{ghcver} -f rpm-base-filelist
 %defattr(-,root,root,-)
-%doc ghc/ANNOUNCE ghc/LICENSE ghc/README
+%doc ANNOUNCE HACKING LICENSE README
 %{_bindir}/ghc*%{version}
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 %ghost %{_libdir}/ghc-%{version}/package.conf.old
@@ -174,6 +175,11 @@
 
 
 %changelog
+* Fri Nov  3 2006 Jens Petersen  - 6.6-1
+- update to 6.6 release
+- buildrequire haddock >= 0.8
+- fix summary of ghcver package (Michel Salim, #209574)
+
 * Thu Sep 28 2006 Jens Petersen  - 6.4.2-4
 - turn on docs generation again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 12:34:59 -0000	1.8
+++ sources	3 Nov 2006 05:00:12 -0000	1.9
@@ -1 +1,2 @@
-a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2
+2427a8d7d14f86e0878df6b54938acf7  ghc-6.6-src.tar.bz2
+14b22fce36caffa509046361724bc119  ghc-6.6-src-extralibs.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov  3 05:04:02 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:04:02 -0700
Subject: rpms/perl-Test-LongString/FC-6 .cvsignore, 1.3,
	1.4 perl-Test-LongString.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200611030504.kA3542pb017608@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-LongString/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17583

Modified Files:
	.cvsignore perl-Test-LongString.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2005 06:34:22 -0000	1.3
+++ .cvsignore	3 Nov 2006 05:03:32 -0000	1.4
@@ -1 +1 @@
-Test-LongString-0.09.tar.gz
+Test-LongString-0.10.tar.gz


Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-6/perl-Test-LongString.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Test-LongString.spec	5 Sep 2006 08:57:53 -0000	1.5
+++ perl-Test-LongString.spec	3 Nov 2006 05:03:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Test-LongString
-Version: 	0.09
-Release: 	3%{?dist}
+Version: 	0.10
+Release: 	1%{?dist}
 Summary: 	Perl module to test long strings
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.10-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 0.09-3
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2005 06:34:22 -0000	1.3
+++ sources	3 Nov 2006 05:03:32 -0000	1.4
@@ -1 +1 @@
-a956f4f0a8f7a8704f984523ce58fa66  Test-LongString-0.09.tar.gz
+66f3fa30c0100d0f8d8089741964ad52  Test-LongString-0.10.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:05:02 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 2 Nov 2006 22:05:02 -0700
Subject: rpms/scribes/devel .cvsignore, 1.6, 1.7 scribes.spec, 1.18,
	1.19 sources, 1.6, 1.7
Message-ID: <200611030505.kA3552Cd017672@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17645

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to new upstream release (0.2.9.91)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Oct 2006 05:55:57 -0000	1.6
+++ .cvsignore	3 Nov 2006 05:04:32 -0000	1.7
@@ -1 +1 @@
-scribes-0.2.9.89.tar.bz2
+scribes-0.2.9.91.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scribes.spec	28 Oct 2006 07:39:13 -0000	1.18
+++ scribes.spec	3 Nov 2006 05:04:32 -0000	1.19
@@ -3,8 +3,8 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.89
-Release:	3%{?dist}
+Version:	0.2.9.91
+Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
 License:	GPL
@@ -153,6 +153,10 @@
 
 
 %changelog
+* Thu Nov 02 2006 Peter Gordon  - 0.2.9.91-1
+- Update to upstream version 0.2.9.91, which fixes the ugly bracket-matched
+  highlighting that slipped into the 0.2.9.89 release (among other bugs)
+
 * Sat Oct 28 2006 Peter Gordon  - 0.2.9.89-3
 - Drop Application category from the installed .desktop file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Oct 2006 05:55:57 -0000	1.6
+++ sources	3 Nov 2006 05:04:32 -0000	1.7
@@ -1 +1 @@
-7e94cc1ddb8ac32820fabefaf9ed305d  scribes-0.2.9.89.tar.bz2
+81b68ffa6f2662429ee199cb2e356cb9  scribes-0.2.9.91.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov  3 05:06:35 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:06:35 -0700
Subject: rpms/perl-Test-LongString/FC-5 .cvsignore, 1.3,
	1.4 perl-Test-LongString.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611030506.kA356Zmf017699@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-LongString/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17678

Modified Files:
	.cvsignore perl-Test-LongString.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2005 06:34:22 -0000	1.3
+++ .cvsignore	3 Nov 2006 05:06:04 -0000	1.4
@@ -1 +1 @@
-Test-LongString-0.09.tar.gz
+Test-LongString-0.10.tar.gz


Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-5/perl-Test-LongString.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-LongString.spec	28 Feb 2006 23:31:38 -0000	1.4
+++ perl-Test-LongString.spec	3 Nov 2006 05:06:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Test-LongString
-Version: 	0.09
-Release: 	2%{?dist}
+Version: 	0.10
+Release: 	1%{?dist}
 Summary: 	Perl module to test long strings
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -51,6 +51,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.10-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.09-3
+- Mass rebuild.
+
 * Wed Mar 01 2006 Ralf Cors??pius  - 0.09-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2005 06:34:22 -0000	1.3
+++ sources	3 Nov 2006 05:06:04 -0000	1.4
@@ -1 +1 @@
-a956f4f0a8f7a8704f984523ce58fa66  Test-LongString-0.09.tar.gz
+66f3fa30c0100d0f8d8089741964ad52  Test-LongString-0.10.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:09:10 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:09:10 -0700
Subject: rpms/perl-Test-LongString/FC-4 .cvsignore, 1.3,
	1.4 perl-Test-LongString.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611030509.kA359AQI017859@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Test-LongString/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17839

Modified Files:
	.cvsignore perl-Test-LongString.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2005 06:42:25 -0000	1.3
+++ .cvsignore	3 Nov 2006 05:08:40 -0000	1.4
@@ -1 +1 @@
-Test-LongString-0.09.tar.gz
+Test-LongString-0.10.tar.gz


Index: perl-Test-LongString.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-4/perl-Test-LongString.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Test-LongString.spec	7 Oct 2005 06:42:25 -0000	1.3
+++ perl-Test-LongString.spec	3 Nov 2006 05:08:40 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Test-LongString
-Version: 	0.09
+Version: 	0.10
 Release: 	1%{?dist}
 Summary: 	Perl module to test long strings
 License: 	GPL or Artistic
@@ -51,6 +51,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.10-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.09-3
+- Mass rebuild.
+
+* Wed Mar 01 2006 Ralf Cors??pius  - 0.09-2
+- Rebuild for perl-5.8.8.
+
 * Fri Oct 07 2005 Ralf Corsepius  - 0.09-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-LongString/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2005 06:42:25 -0000	1.3
+++ sources	3 Nov 2006 05:08:40 -0000	1.4
@@ -1 +1 @@
-a956f4f0a8f7a8704f984523ce58fa66  Test-LongString-0.09.tar.gz
+66f3fa30c0100d0f8d8089741964ad52  Test-LongString-0.10.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:22:09 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 2 Nov 2006 22:22:09 -0700
Subject: rpms/scribes/FC-6 .cvsignore, 1.6, 1.7 scribes.spec, 1.16,
	1.17 sources, 1.6, 1.7
Message-ID: <200611030522.kA35M9RX017980@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17960

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to new upstream release (0.2.9.91)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Oct 2006 05:59:37 -0000	1.6
+++ .cvsignore	3 Nov 2006 05:21:39 -0000	1.7
@@ -1 +1 @@
-scribes-0.2.9.89.tar.bz2
+scribes-0.2.9.91.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scribes.spec	28 Oct 2006 06:49:20 -0000	1.16
+++ scribes.spec	3 Nov 2006 05:21:39 -0000	1.17
@@ -3,7 +3,7 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.89
+Version:	0.2.9.91
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
@@ -153,6 +153,10 @@
 
 
 %changelog
+* Thu Nov 02 2006 Peter Gordon  - 0.2.9.91-1
+- Update to upstream version 0.2.9.91, which fixes the ugly bracket-matched
+  highlighting that slipped into the 0.2.9.89 release (among other bugs)
+
 * Wed Oct 18 2006 Peter Gordon  - 0.2.9.89-1
 - Update to new upstream version (0.2.9.89)
 - Update dbus-python dependency version (>= 0.70)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Oct 2006 05:59:37 -0000	1.6
+++ sources	3 Nov 2006 05:21:39 -0000	1.7
@@ -1 +1 @@
-7e94cc1ddb8ac32820fabefaf9ed305d  scribes-0.2.9.89.tar.bz2
+81b68ffa6f2662429ee199cb2e356cb9  scribes-0.2.9.91.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov  3 05:30:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:30:36 -0700
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.15,
	1.16 perl-Params-Util.spec, 1.16, 1.17 sources, 1.15, 1.16
Message-ID: <200611030530.kA35UadA018097@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18074/devel

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.22-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Oct 2006 09:39:09 -0000	1.15
+++ .cvsignore	3 Nov 2006 05:30:06 -0000	1.16
@@ -1 +1 @@
-Params-Util-0.21.tar.gz
+Params-Util-0.22.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Params-Util.spec	19 Oct 2006 09:39:09 -0000	1.16
+++ perl-Params-Util.spec	3 Nov 2006 05:30:06 -0000	1.17
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.21
+Version: 	0.22
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.22-1
+- Upstream update.
+
 * Thu Oct 19 2006 Ralf Cors??pius  - 0.21-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	19 Oct 2006 09:39:09 -0000	1.15
+++ sources	3 Nov 2006 05:30:06 -0000	1.16
@@ -1 +1 @@
-5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz
+47ff67318801dbc0aae41f94080cc8af  Params-Util-0.22.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:31:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:31:15 -0700
Subject: rpms/perl-Params-Util/FC-6 .cvsignore, 1.15,
	1.16 perl-Params-Util.spec, 1.16, 1.17 sources, 1.15, 1.16
Message-ID: <200611030531.kA35VF6W018125@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18103/FC-6

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.22-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Oct 2006 09:39:09 -0000	1.15
+++ .cvsignore	3 Nov 2006 05:30:45 -0000	1.16
@@ -1 +1 @@
-Params-Util-0.21.tar.gz
+Params-Util-0.22.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-6/perl-Params-Util.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Params-Util.spec	19 Oct 2006 09:39:09 -0000	1.16
+++ perl-Params-Util.spec	3 Nov 2006 05:30:45 -0000	1.17
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.21
+Version: 	0.22
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.22-1
+- Upstream update.
+
 * Thu Oct 19 2006 Ralf Cors??pius  - 0.21-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	19 Oct 2006 09:39:09 -0000	1.15
+++ sources	3 Nov 2006 05:30:45 -0000	1.16
@@ -1 +1 @@
-5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz
+47ff67318801dbc0aae41f94080cc8af  Params-Util-0.22.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:31:55 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:31:55 -0700
Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.15,
	1.16 perl-Params-Util.spec, 1.15, 1.16 sources, 1.15, 1.16
Message-ID: <200611030531.kA35VtXv018151@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18131/FC-5

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.22-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Oct 2006 09:40:35 -0000	1.15
+++ .cvsignore	3 Nov 2006 05:31:24 -0000	1.16
@@ -1 +1 @@
-Params-Util-0.21.tar.gz
+Params-Util-0.22.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/perl-Params-Util.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Params-Util.spec	19 Oct 2006 09:40:35 -0000	1.15
+++ perl-Params-Util.spec	3 Nov 2006 05:31:24 -0000	1.16
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.21
+Version: 	0.22
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.22-1
+- Upstream update.
+
 * Thu Oct 19 2006 Ralf Cors??pius  - 0.21-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	19 Oct 2006 09:40:35 -0000	1.15
+++ sources	3 Nov 2006 05:31:24 -0000	1.16
@@ -1 +1 @@
-5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz
+47ff67318801dbc0aae41f94080cc8af  Params-Util-0.22.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:32:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:32:34 -0700
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.15,
	1.16 perl-Params-Util.spec, 1.14, 1.15 sources, 1.15, 1.16
Message-ID: <200611030532.kA35WY9n018182@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18157/FC-4

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.22-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Oct 2006 09:42:06 -0000	1.15
+++ .cvsignore	3 Nov 2006 05:32:04 -0000	1.16
@@ -1 +1 @@
-Params-Util-0.21.tar.gz
+Params-Util-0.22.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Params-Util.spec	19 Oct 2006 09:42:06 -0000	1.14
+++ perl-Params-Util.spec	3 Nov 2006 05:32:04 -0000	1.15
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.21
+Version: 	0.22
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.22-1
+- Upstream update.
+
 * Thu Oct 19 2006 Ralf Cors??pius  - 0.21-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	19 Oct 2006 09:42:06 -0000	1.15
+++ sources	3 Nov 2006 05:32:04 -0000	1.16
@@ -1 +1 @@
-5d27fa5ba324e7b1e13671c16402870d  Params-Util-0.21.tar.gz
+47ff67318801dbc0aae41f94080cc8af  Params-Util-0.22.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:43:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:43:48 -0700
Subject: rpms/perl-File-Remove/devel .cvsignore, 1.3,
	1.4 perl-File-Remove.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200611030543.kA35hmDZ018440@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18420/devel

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jan 2006 14:25:45 -0000	1.3
+++ .cvsignore	3 Nov 2006 05:43:18 -0000	1.4
@@ -1 +1 @@
-File-Remove-0.31.tar.gz
+File-Remove-0.33.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-File-Remove.spec	5 Sep 2006 09:35:06 -0000	1.5
+++ perl-File-Remove.spec	3 Nov 2006 05:43:18 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.31
-Release:	3%{?dist}
+Version:	0.33
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -9,6 +9,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:	perl(File::Spec) >= 0.84
+BuildRequires:	perl(File::Path)
+BuildRequires:	perl(File::Glob)
+
 BuildArch: 	noarch
 
 %description
@@ -36,12 +41,14 @@
 
 %files
 %defattr(-,root,root,-)
-# For license text(s), see the perl package.
-%doc CHANGES README
+%doc Changes README LICENSE
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 0.31-3
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jan 2006 14:25:45 -0000	1.3
+++ sources	3 Nov 2006 05:43:18 -0000	1.4
@@ -1 +1 @@
-8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz
+a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:44:29 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:44:29 -0700
Subject: rpms/perl-File-Remove/FC-6 .cvsignore, 1.3,
	1.4 perl-File-Remove.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200611030544.kA35iTSY018466@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18446/FC-6

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jan 2006 14:25:45 -0000	1.3
+++ .cvsignore	3 Nov 2006 05:43:58 -0000	1.4
@@ -1 +1 @@
-File-Remove-0.31.tar.gz
+File-Remove-0.33.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/perl-File-Remove.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-File-Remove.spec	5 Sep 2006 09:35:06 -0000	1.5
+++ perl-File-Remove.spec	3 Nov 2006 05:43:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.31
-Release:	3%{?dist}
+Version:	0.33
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -9,6 +9,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:	perl(File::Spec) >= 0.84
+BuildRequires:	perl(File::Path)
+BuildRequires:	perl(File::Glob)
+
 BuildArch: 	noarch
 
 %description
@@ -36,12 +41,14 @@
 
 %files
 %defattr(-,root,root,-)
-# For license text(s), see the perl package.
-%doc CHANGES README
+%doc Changes README LICENSE
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 0.31-3
 - Mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jan 2006 14:25:45 -0000	1.3
+++ sources	3 Nov 2006 05:43:58 -0000	1.4
@@ -1 +1 @@
-8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz
+a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:45:09 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:45:09 -0700
Subject: rpms/perl-File-Remove/FC-5 .cvsignore, 1.3,
	1.4 perl-File-Remove.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611030545.kA35j9iS018494@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18472/FC-5

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jan 2006 14:25:45 -0000	1.3
+++ .cvsignore	3 Nov 2006 05:44:38 -0000	1.4
@@ -1 +1 @@
-File-Remove-0.31.tar.gz
+File-Remove-0.33.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/perl-File-Remove.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-Remove.spec	28 Feb 2006 23:23:20 -0000	1.4
+++ perl-File-Remove.spec	3 Nov 2006 05:44:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.31
-Release:	2%{?dist}
+Version:	0.33
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -9,6 +9,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:	perl(File::Spec) >= 0.84
+BuildRequires:	perl(File::Path)
+BuildRequires:	perl(File::Glob)
+
 BuildArch: 	noarch
 
 %description
@@ -36,12 +41,17 @@
 
 %files
 %defattr(-,root,root,-)
-# For license text(s), see the perl package.
-%doc CHANGES README
+%doc Changes README LICENSE
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.31-3
+- Mass rebuild.
+
 * Wed Mar 01 2006 Ralf Cors??pius  - 0.31-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jan 2006 14:25:45 -0000	1.3
+++ sources	3 Nov 2006 05:44:38 -0000	1.4
@@ -1 +1 @@
-8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz
+a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:45:49 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 2 Nov 2006 22:45:49 -0700
Subject: rpms/perl-File-Remove/FC-4 .cvsignore, 1.3,
	1.4 perl-File-Remove.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611030545.kA35jnGI018520@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18500/FC-4

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jan 2006 14:27:51 -0000	1.3
+++ .cvsignore	3 Nov 2006 05:45:19 -0000	1.4
@@ -1 +1 @@
-File-Remove-0.31.tar.gz
+File-Remove-0.33.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/perl-File-Remove.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-File-Remove.spec	11 Jan 2006 14:27:51 -0000	1.3
+++ perl-File-Remove.spec	3 Nov 2006 05:45:19 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.31
+Version:	0.33
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -9,6 +9,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+BuildRequires:	perl(File::Spec) >= 0.84
+BuildRequires:	perl(File::Path)
+BuildRequires:	perl(File::Glob)
+
 BuildArch: 	noarch
 
 %description
@@ -36,12 +41,20 @@
 
 %files
 %defattr(-,root,root,-)
-# For license text(s), see the perl package.
-%doc CHANGES README
+%doc Changes README LICENSE
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.31-3
+- Mass rebuild.
+
+* Wed Mar 01 2006 Ralf Cors??pius  - 0.31-2
+- Rebuild for perl-5.8.8.
+
 * Wed Jan 11 2006 Ralf Corsepius  - 0.31-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jan 2006 14:27:51 -0000	1.3
+++ sources	3 Nov 2006 05:45:19 -0000	1.4
@@ -1 +1 @@
-8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz
+a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 05:48:20 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 2 Nov 2006 22:48:20 -0700
Subject: rpms/scorched3d/devel scorched3d.spec,1.18,1.19
Message-ID: <200611030548.kA35mKYJ018699@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18679

Modified Files:
	scorched3d.spec 
Log Message:
* Fri Nov  3 2006 Hans de Goede  40.1c-2
- Add libvorbis-devel BR so that ogg/vorbis support gets build in



Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scorched3d.spec	2 Nov 2006 20:45:26 -0000	1.18
+++ scorched3d.spec	3 Nov 2006 05:47:50 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        40.1c
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -13,7 +13,7 @@
 Patch4:         %{name}-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
-BuildRequires:  expat-devel ImageMagick desktop-file-utils
+BuildRequires:  expat-devel libvorbis-devel ImageMagick desktop-file-utils
 Requires:       hicolor-icon-theme
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
@@ -100,7 +100,10 @@
 
 
 %changelog
-* Tue Aug 29 2006 Hans de Goede  40.1c-1
+* Fri Nov  3 2006 Hans de Goede  40.1c-2
+- Add libvorbis-devel BR so that ogg/vorbis support gets build in
+
+* Thu Nov  2 2006 Hans de Goede  40.1c-1
 - New upstream release 40.1c
 - Drop 64 bit patch (integrated upstream)
 - Don't install our data files in /usr/share/games, but in /usr/share



From fedora-extras-commits at redhat.com  Fri Nov  3 07:28:21 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 3 Nov 2006 00:28:21 -0700
Subject: rpms/awstats/FC-5 awstats.spec,1.16,1.17
Message-ID: <200611030728.kA37SLZS025108@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25064/FC-5

Modified Files:
	awstats.spec 
Log Message:
fix bug 213803


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- awstats.spec	30 Oct 2006 14:23:25 -0000	1.16
+++ awstats.spec	3 Nov 2006 07:27:51 -0000	1.17
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.5
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -57,7 +57,7 @@
 
 if [ -f %{_localstatedir}/log/httpd/access_log ] ; then
         exec perl %{_datadir}/awstats/tools/awstats_updateall.pl now \
-                -confdir="%{_sysconfdir}/awstats" \
+                -configdir="%{_sysconfdir}/awstats" \
                 -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null
 fi
 exit 0
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Fri Nov 03 2006 Aurelien Bompard  6.5-6
+- fix typo in the cron job (bug 213803)
+
 * Mon Oct 30 2006 Aurelien Bompard  6.5-5
 - fix DOS encoding on logresolvemerge.pl
 



From fedora-extras-commits at redhat.com  Fri Nov  3 07:28:23 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 3 Nov 2006 00:28:23 -0700
Subject: rpms/awstats/FC-6 awstats.spec,1.16,1.17
Message-ID: <200611030728.kA37SNSG025111@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25064/FC-6

Modified Files:
	awstats.spec 
Log Message:
fix bug 213803


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-6/awstats.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- awstats.spec	30 Oct 2006 14:05:07 -0000	1.16
+++ awstats.spec	3 Nov 2006 07:27:52 -0000	1.17
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.6
-Release:    0.3.beta%{?dist}
+Release:    0.4.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -54,7 +54,7 @@
 
 if [ -f %{_localstatedir}/log/httpd/access_log ] ; then
         exec perl %{_datadir}/awstats/tools/awstats_updateall.pl now \
-                -confdir="%{_sysconfdir}/awstats" \
+                -configdir="%{_sysconfdir}/awstats" \
                 -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null
 fi
 exit 0
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Fri Nov 03 2006 Aurelien Bompard  6.6-0.4.beta
+- fix typo in the cron job (bug 213803)
+
 * Mon Oct 30 2006 Aurelien Bompard  6.6-0.3.beta
 - fix DOS encoding on logresolvemerge.pl
 



From fedora-extras-commits at redhat.com  Fri Nov  3 07:28:23 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 3 Nov 2006 00:28:23 -0700
Subject: rpms/awstats/devel awstats.spec,1.16,1.17
Message-ID: <200611030728.kA37SNC7025114@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25064/devel

Modified Files:
	awstats.spec 
Log Message:
fix bug 213803


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- awstats.spec	30 Oct 2006 14:05:09 -0000	1.16
+++ awstats.spec	3 Nov 2006 07:27:53 -0000	1.17
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.6
-Release:    0.3.beta%{?dist}
+Release:    0.4.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -54,7 +54,7 @@
 
 if [ -f %{_localstatedir}/log/httpd/access_log ] ; then
         exec perl %{_datadir}/awstats/tools/awstats_updateall.pl now \
-                -confdir="%{_sysconfdir}/awstats" \
+                -configdir="%{_sysconfdir}/awstats" \
                 -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null
 fi
 exit 0
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Fri Nov 03 2006 Aurelien Bompard  6.6-0.4.beta
+- fix typo in the cron job (bug 213803)
+
 * Mon Oct 30 2006 Aurelien Bompard  6.6-0.3.beta
 - fix DOS encoding on logresolvemerge.pl
 



From fedora-extras-commits at redhat.com  Fri Nov  3 08:46:57 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Fri, 3 Nov 2006 01:46:57 -0700
Subject: rpms/python-formencode/devel .cvsignore, 1.4,
	1.5 python-formencode.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200611030846.kA38kvQM028605@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-formencode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28585

Modified Files:
	.cvsignore python-formencode.spec sources 
Log Message:
0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jul 2006 21:54:13 -0000	1.4
+++ .cvsignore	3 Nov 2006 08:46:26 -0000	1.5
@@ -1 +1 @@
-FormEncode-0.5.1.tar.gz
+FormEncode-0.6.tar.gz


Index: python-formencode.spec
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/python-formencode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-formencode.spec	3 Sep 2006 21:10:29 -0000	1.8
+++ python-formencode.spec	3 Nov 2006 08:46:26 -0000	1.9
@@ -2,14 +2,14 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-formencode
-Version:        0.5.1
-Release:        3%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        HTML form validation, generation, and convertion package  
 
 Group:          Development/Libraries
 License:        PSF
 URL:            http://formencode.org/
-Source0:        http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz  
+Source0:        http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz
 Patch:          %{name}-%{version}-badurl.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -47,6 +47,9 @@
 %{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Fri Nov  3 2006 Luke Macken  0.6-1
+- 0.6
+
 * Sun Sep  3 2006 Luke Macken  0.5.1-3
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jul 2006 21:54:13 -0000	1.4
+++ sources	3 Nov 2006 08:46:26 -0000	1.5
@@ -1 +1 @@
-f240217726f1962762bcf889a16f4450  FormEncode-0.5.1.tar.gz
+8504d515a8e25f1bba6842224b7494ae  FormEncode-0.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 08:49:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Fri, 3 Nov 2006 01:49:06 -0700
Subject: rpms/python-formencode/devel python-formencode-0.6-badurl.patch,
	NONE, 1.1 python-formencode.spec, 1.9,
	1.10 python-formencode-0.5.1-badurl.patch, 1.1, NONE
Message-ID: <200611030849.kA38n6JW028700@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-formencode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28663

Modified Files:
	python-formencode.spec 
Added Files:
	python-formencode-0.6-badurl.patch 
Removed Files:
	python-formencode-0.5.1-badurl.patch 
Log Message:
add patch and rebuild

python-formencode-0.6-badurl.patch:

--- NEW FILE python-formencode-0.6-badurl.patch ---
--- setup.cfg.orig	2006-07-29 16:59:12.000000000 -0400
+++ setup.cfg	2006-07-29 16:59:16.000000000 -0400
@@ -1,5 +1,4 @@
 [easy_install]
-find_links = http://svn.pythonpaste.org/package_index.html
 
 [pudge]
 title = FormEncode


Index: python-formencode.spec
===================================================================
RCS file: /cvs/extras/rpms/python-formencode/devel/python-formencode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-formencode.spec	3 Nov 2006 08:46:26 -0000	1.9
+++ python-formencode.spec	3 Nov 2006 08:48:36 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:           python-formencode
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HTML form validation, generation, and convertion package  
 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{python_sitelib}/FormEncode-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Fri Nov  3 2006 Luke Macken  0.6-2
+- Rebuild
+
 * Fri Nov  3 2006 Luke Macken  0.6-1
 - 0.6
 


--- python-formencode-0.5.1-badurl.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 09:20:39 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 3 Nov 2006 02:20:39 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.17,1.18
Message-ID: <200611030920.kA39Kdib031970@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31950

Modified Files:
	gdeskcal.spec 
Log Message:

Added BR gettext 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gdeskcal.spec	2 Nov 2006 22:04:24 -0000	1.17
+++ gdeskcal.spec	3 Nov 2006 09:20:08 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, pygtk2-devel, perl(XML::Parser)
+BuildRequires:  desktop-file-utils, pygtk2-devel, perl(XML::Parser), gettext
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -63,6 +63,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Fri Nov 03 2006 Paul F. Johnson  1.0-9
+- added BR gettext
+
 * Thu Nov 02 2006 Paul F. Johnson  1.0-8
 - removed the smp_mflags as it was annoying the RH buildsys
 



From fedora-extras-commits at redhat.com  Fri Nov  3 09:46:31 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri, 3 Nov 2006 02:46:31 -0700
Subject: rpms/soundconverter/FC-5 .cvsignore, 1.6, 1.7 soundconverter.spec,
	1.7, 1.8 sources, 1.6, 1.7
Message-ID: <200611030946.kA39kV6J032208@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32188

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Oct 2006 08:48:35 -0000	1.6
+++ .cvsignore	3 Nov 2006 09:46:00 -0000	1.7
@@ -1 +1 @@
-soundconverter-0.9.2.tar.gz
+soundconverter-0.9.3.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/soundconverter.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- soundconverter.spec	17 Oct 2006 08:48:35 -0000	1.7
+++ soundconverter.spec	3 Nov 2006 09:46:00 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           soundconverter
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Denis Leroy  - 0.9.3-1
+- Update to 0.9.3
+
 * Tue Oct 17 2006 Denis Leroy  - 0.9.2-1
 - Update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Oct 2006 08:48:35 -0000	1.6
+++ sources	3 Nov 2006 09:46:00 -0000	1.7
@@ -1 +1 @@
-ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz
+4f54b5b706c2f69924936f6bd5b0bcd6  soundconverter-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 09:59:18 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 3 Nov 2006 02:59:18 -0700
Subject: rpms/codeblocks/devel .cvsignore, 1.4, 1.5 codeblocks.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611030959.kA39xIsX032343@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32323

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
- update to revision 3170


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Oct 2006 07:50:41 -0000	1.4
+++ .cvsignore	3 Nov 2006 09:58:48 -0000	1.5
@@ -1 +1 @@
-codeblocks-svn3157.tar.bz2
+codeblocks-svn3170.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- codeblocks.spec	30 Oct 2006 07:50:41 -0000	1.3
+++ codeblocks.spec	3 Nov 2006 09:58:48 -0000	1.4
@@ -1,9 +1,9 @@
-%define		rev	3157
-%define		date	20061029
+%define		rev	3170
+%define		date	20061102
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.11.%{date}svn%{rev}%{?dist}
+Release:	0.12.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -225,6 +225,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+- update to revision 3170
+
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157
 - update to revision 3157
 - kill rpath in the spec file using sed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Oct 2006 07:50:41 -0000	1.4
+++ sources	3 Nov 2006 09:58:48 -0000	1.5
@@ -1 +1 @@
-da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2
+bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov  3 10:03:21 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 3 Nov 2006 03:03:21 -0700
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.4, 1.5 codeblocks.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611031003.kA3A3L6W002912@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2881

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
- update to revision 3170


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Oct 2006 08:39:39 -0000	1.4
+++ .cvsignore	3 Nov 2006 10:02:48 -0000	1.5
@@ -1 +1 @@
-codeblocks-svn3157.tar.bz2
+codeblocks-svn3170.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- codeblocks.spec	30 Oct 2006 08:39:39 -0000	1.3
+++ codeblocks.spec	3 Nov 2006 10:02:48 -0000	1.4
@@ -1,9 +1,9 @@
-%define		rev	3157
-%define		date	20061029
+%define		rev	3170
+%define		date	20061102
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.11.%{date}svn%{rev}%{?dist}
+Release:	0.12.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -225,6 +225,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+- update to revision 3170
+
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157
 - update to revision 3157
 - kill rpath in the spec file using sed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Oct 2006 08:39:39 -0000	1.4
+++ sources	3 Nov 2006 10:02:48 -0000	1.5
@@ -1 +1 @@
-da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2
+bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov  3 10:06:53 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Fri, 3 Nov 2006 03:06:53 -0700
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.4, 1.5 codeblocks.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611031006.kA3A6reI003051@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3031

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
- update to revision 3170


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Oct 2006 08:46:37 -0000	1.4
+++ .cvsignore	3 Nov 2006 10:06:23 -0000	1.5
@@ -1 +1 @@
-codeblocks-svn3157.tar.bz2
+codeblocks-svn3170.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- codeblocks.spec	30 Oct 2006 08:46:37 -0000	1.3
+++ codeblocks.spec	3 Nov 2006 10:06:23 -0000	1.4
@@ -1,9 +1,9 @@
-%define		rev	3157
-%define		date	20061029
+%define		rev	3170
+%define		date	20061102
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.11.%{date}svn%{rev}%{?dist}
+Release:	0.12.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -225,6 +225,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+- update to revision 3170
+
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157
 - update to revision 3157
 - kill rpath in the spec file using sed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Oct 2006 08:46:37 -0000	1.4
+++ sources	3 Nov 2006 10:06:23 -0000	1.5
@@ -1 +1 @@
-da2093d8d0f32d8822836a4c95c71258  codeblocks-svn3157.tar.bz2
+bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov  3 10:21:04 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Fri, 3 Nov 2006 03:21:04 -0700
Subject: rpms/soundconverter/FC-4 .cvsignore, 1.4, 1.5 soundconverter.spec,
	1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200611031021.kA3AL4pf003175@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3153

Modified Files:
	.cvsignore soundconverter.spec sources 
Log Message:
Update to 0.9.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Oct 2006 09:27:37 -0000	1.4
+++ .cvsignore	3 Nov 2006 10:20:34 -0000	1.5
@@ -1 +1 @@
-soundconverter-0.9.2.tar.gz
+soundconverter-0.9.3.tar.gz


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/soundconverter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- soundconverter.spec	17 Oct 2006 09:27:37 -0000	1.5
+++ soundconverter.spec	3 Nov 2006 10:20:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           soundconverter
-Version:        0.9.2
+Version:        0.9.3
 Release:        1%{?dist}
 Summary:        A simple sound converter application for GNOME
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Denis Leroy  - 0.9.3-1
+- Update to 0.9.3
+
 * Tue Oct 17 2006 Denis Leroy  - 0.9.2-1
 - Update to 0.9.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Oct 2006 09:27:37 -0000	1.4
+++ sources	3 Nov 2006 10:20:34 -0000	1.5
@@ -1 +1 @@
-ecde29fc6847e8441e4fe5acb8ef26d1  soundconverter-0.9.2.tar.gz
+4f54b5b706c2f69924936f6bd5b0bcd6  soundconverter-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 11:21:40 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 04:21:40 -0700
Subject: rpms/scorched3d/FC-6 scorched3d.spec,1.18,1.19
Message-ID: <200611031121.kA3BLeTK006740@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6722

Modified Files:
	scorched3d.spec 
Log Message:
* Fri Nov  3 2006 Hans de Goede  40.1c-2
- Add libvorbis-devel BR so that ogg/vorbis support gets build in



Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scorched3d.spec	2 Nov 2006 20:48:36 -0000	1.18
+++ scorched3d.spec	3 Nov 2006 11:21:09 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        40.1c
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -13,7 +13,7 @@
 Patch4:         %{name}-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
-BuildRequires:  expat-devel ImageMagick desktop-file-utils
+BuildRequires:  expat-devel libvorbis-devel ImageMagick desktop-file-utils
 Requires:       hicolor-icon-theme
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
@@ -100,7 +100,10 @@
 
 
 %changelog
-* Tue Aug 29 2006 Hans de Goede  40.1c-1
+* Fri Nov  3 2006 Hans de Goede  40.1c-2
+- Add libvorbis-devel BR so that ogg/vorbis support gets build in
+
+* Thu Nov  2 2006 Hans de Goede  40.1c-1
 - New upstream release 40.1c
 - Drop 64 bit patch (integrated upstream)
 - Don't install our data files in /usr/share/games, but in /usr/share



From fedora-extras-commits at redhat.com  Fri Nov  3 11:24:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 04:24:09 -0700
Subject: rpms/scorched3d/FC-5 .cvsignore, 1.4, 1.5 scorched3d-help.patch, 1.3,
	1.4 scorched3d-syslibs.patch, 1.3, 1.4 scorched3d-wx26.patch,
	1.1, 1.2 scorched3d.spec, 1.16, 1.17 sources, 1.4,
	1.5 scorched3d-64bit.patch, 1.6, NONE
Message-ID: <200611031124.kA3BO9hS006832@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6797

Modified Files:
	.cvsignore scorched3d-help.patch scorched3d-syslibs.patch 
	scorched3d-wx26.patch scorched3d.spec sources 
Removed Files:
	scorched3d-64bit.patch 
Log Message:
* Fri Nov  3 2006 Hans de Goede  40.1c-2
- Add libvorbis-devel BR so that ogg/vorbis support gets build in



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jul 2006 20:05:42 -0000	1.4
+++ .cvsignore	3 Nov 2006 11:23:38 -0000	1.5
@@ -1 +1 @@
-Scorched3D-40-src.tar.gz
+Scorched3D-40.1c-src.tar.gz

scorched3d-help.patch:

Index: scorched3d-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-help.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scorched3d-help.patch	16 Jul 2006 20:05:42 -0000	1.3
+++ scorched3d-help.patch	3 Nov 2006 11:23:38 -0000	1.4
@@ -1,25 +1,3 @@
-diff -ur scorched.orig/src/scorched/HtmlHelpDialog.cpp scorched/src/scorched/HtmlHelpDialog.cpp
---- scorched.orig/src/scorched/HtmlHelpDialog.cpp	2006-02-17 18:48:54.000000000 +0100
-+++ scorched/src/scorched/HtmlHelpDialog.cpp	2006-07-16 11:03:57.000000000 +0200
-@@ -137,13 +137,13 @@
- void HelpFrame::onHome(wxCommandEvent &event)
- {
- 	html_->HistoryClear();
--	html_->LoadPage(wxString(getDocFile("documentation/html/index.html"), wxConvUTF8));
-+	html_->LoadPage(wxString(getDocFile("html/index.html"), wxConvUTF8));
- }
- 
- void showHtmlHelpDialog()
- {
- 	// For the moment just show the documentation in the default web browser
--	showURL(formatString("file://%s", getDocFile("documentation/html/index.html")));
-+	showURL(formatString("file://%s", getDocFile("html/index.html")));
- 
- 	//HelpFrame *frame = new HelpFrame();
- 	//frame->Show();
-Only in scorched/src/scorched: HtmlHelpDialog.cpp.orig
-Only in scorched/src/scorched: HtmlHelpDialog.cpp.rej
-Only in scorched/src/scorched: HtmlHelpDialog.cpp~
 diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
 --- scorched.orig/src/scorched/MainDialog.cpp	2006-05-14 17:00:11.000000000 +0200
 +++ scorched/src/scorched/MainDialog.cpp	2006-07-16 11:05:27.000000000 +0200
@@ -34,6 +12,3 @@
  #endif // __DARWIN__
  #endif // _WIN32
  }
-Only in scorched/src/scorched: MainDialog.cpp.orig
-Only in scorched/src/scorched: MainDialog.cpp.rej
-Only in scorched/src/scorched: MainDialog.cpp~

scorched3d-syslibs.patch:

Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-syslibs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scorched3d-syslibs.patch	16 Jul 2006 20:05:42 -0000	1.3
+++ scorched3d-syslibs.patch	3 Nov 2006 11:23:38 -0000	1.4
@@ -1,16 +1,16 @@
---- scorched/src/coms/NetServerProtocol.cpp.syslibs	2006-02-13 18:54:26.000000000 +0100
-+++ scorched/src/coms/NetServerProtocol.cpp	2006-07-16 11:36:19.000000000 +0200
+--- scorched/src/coms/NetServerProtocol.cpp.syslibs	2006-08-04 15:35:15.000000000 +0200
++++ scorched/src/coms/NetServerProtocol.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -22,7 +22,7 @@
  #include 
- #include 
+ #include 
  #include 
 -#include 
 +#include 
  
  NetServerProtocol::NetServerProtocol()
  {
---- scorched/src/coms/ComsMessageSender.cpp.syslibs	2006-02-13 18:54:26.000000000 +0100
-+++ scorched/src/coms/ComsMessageSender.cpp	2006-07-16 11:36:19.000000000 +0200
+--- scorched/src/coms/ComsMessageSender.cpp.syslibs	2006-09-08 17:07:59.000000000 +0200
++++ scorched/src/coms/ComsMessageSender.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -27,7 +27,7 @@
  #include 
  #include 
@@ -21,7 +21,7 @@
  
  bool ComsMessageSender::sendToServer(ComsMessage &message)
 --- scorched/src/XML/XMLParser.h.syslibs	2006-05-01 01:42:52.000000000 +0200
-+++ scorched/src/XML/XMLParser.h	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/XML/XMLParser.h	2006-10-31 20:11:27.000000000 +0100
 @@ -21,7 +21,7 @@
  #if !defined(__INCLUDE_XMLParserh_INCLUDE__)
  #define __INCLUDE_XMLParserh_INCLUDE__
@@ -31,18 +31,18 @@
  #include 
  
  class XMLParser
---- scorched/src/scorched/Makefile.am.syslibs	2006-07-15 17:14:50.000000000 +0200
-+++ scorched/src/scorched/Makefile.am	2006-07-16 11:36:47.000000000 +0200
-@@ -260,7 +260,6 @@
- 	../common/Vector.h \
+--- scorched/src/scorched/Makefile.am.syslibs	2006-10-27 20:48:23.000000000 +0200
++++ scorched/src/scorched/Makefile.am	2006-10-31 20:12:35.000000000 +0100
+@@ -271,7 +271,6 @@
+ 	../common/Vector4.h \
  	../common/VectorLib.cpp \
  	../common/VectorLib.h \
 -	../common/snprintf.c \
  	../3dsparse/ASEModelFactory.cpp \
  	../3dsparse/ASEModelFactory.h \
  	../3dsparse/Bone.cpp \
-@@ -602,95 +601,6 @@
- 	../weapons/WeaponTranslate.h \
+@@ -637,96 +636,6 @@
+ 	../weapons/WeaponTypeAction.h \
  	../weapons/WeaponVelocity.cpp \
  	../weapons/WeaponVelocity.h \
 -	../ode/array.cpp \
@@ -50,6 +50,7 @@
 -	../ode/collision.h \
 -	../ode/collision_kernel.cpp \
 -	../ode/collision_kernel.h \
+-	../ode/collision_quadtreespace.cpp \
 -	../ode/collision_space.cpp \
 -	../ode/collision_space.h \
 -	../ode/collision_space_internal.h \
@@ -137,7 +138,7 @@
  	../actions/AddTarget.cpp \
  	../actions/AddTarget.h \
  	../actions/Animation.cpp \
-@@ -1100,14 +1010,6 @@
+@@ -1134,14 +1043,6 @@
  	../XML/XMLParser.h \
  	../XML/XMLStringBuffer.cpp \
  	../XML/XMLStringBuffer.h \
@@ -152,18 +153,18 @@
  	../target/Target.cpp \
  	../target/Target.h \
  	../target/TargetContainer.cpp \
---- scorched/src/scorched/Makefile.in.syslibs	2006-07-15 17:15:28.000000000 +0200
-+++ scorched/src/scorched/Makefile.in	2006-07-16 11:37:23.000000000 +0200
-@@ -360,7 +360,6 @@
- 	../common/Vector.h \
+--- scorched/src/scorched/Makefile.in.syslibs	2006-10-30 19:10:42.000000000 +0100
++++ scorched/src/scorched/Makefile.in	2006-10-31 20:19:02.000000000 +0100
+@@ -372,7 +372,6 @@
+ 	../common/Vector4.h \
  	../common/VectorLib.cpp \
  	../common/VectorLib.h \
 -	../common/snprintf.c \
  	../3dsparse/ASEModelFactory.cpp \
  	../3dsparse/ASEModelFactory.h \
  	../3dsparse/Bone.cpp \
-@@ -702,95 +701,6 @@
- 	../weapons/WeaponTranslate.h \
+@@ -738,96 +737,6 @@
+ 	../weapons/WeaponTypeAction.h \
  	../weapons/WeaponVelocity.cpp \
  	../weapons/WeaponVelocity.h \
 -	../ode/array.cpp \
@@ -171,6 +172,7 @@
 -	../ode/collision.h \
 -	../ode/collision_kernel.cpp \
 -	../ode/collision_kernel.h \
+-	../ode/collision_quadtreespace.cpp \
 -	../ode/collision_space.cpp \
 -	../ode/collision_space.h \
 -	../ode/collision_space_internal.h \
@@ -258,7 +260,7 @@
  	../actions/AddTarget.cpp \
  	../actions/AddTarget.h \
  	../actions/Animation.cpp \
-@@ -1200,14 +1110,6 @@
+@@ -1235,14 +1144,6 @@
  	../XML/XMLParser.h \
  	../XML/XMLStringBuffer.cpp \
  	../XML/XMLStringBuffer.h \
@@ -273,20 +275,21 @@
  	../target/Target.cpp \
  	../target/Target.h \
  	../target/TargetContainer.cpp \
-@@ -1426,7 +1328,7 @@
- 	SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
- 	StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
- 	StatsLoggerMySQL.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
+@@ -1471,7 +1372,7 @@
+ 	SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \
+ 	StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
+ 	Triangle.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
 -	VectorLib.$(OBJEXT) snprintf.$(OBJEXT) \
 +	VectorLib.$(OBJEXT) \
  	ASEModelFactory.$(OBJEXT) Bone.$(OBJEXT) Face.$(OBJEXT) \
  	ImageID.$(OBJEXT) ImageStore.$(OBJEXT) MSModelFactory.$(OBJEXT) \
  	Mesh.$(OBJEXT) MeshLOD.$(OBJEXT) MeshLODTri.$(OBJEXT) \
-@@ -1506,21 +1408,6 @@
- 	WeaponScatterPosition.$(OBJEXT) WeaponSkyFlash.$(OBJEXT) \
- 	WeaponSound.$(OBJEXT) WeaponTeleport.$(OBJEXT) \
- 	WeaponTranslate.$(OBJEXT) WeaponVelocity.$(OBJEXT) \
--	array.$(OBJEXT) collision_kernel.$(OBJEXT) \
+@@ -1558,22 +1459,7 @@
+ 	WeaponTankPosition.$(OBJEXT) WeaponTankVelocity.$(OBJEXT) \
+ 	WeaponTeamAction.$(OBJEXT) WeaponTeleport.$(OBJEXT) \
+ 	WeaponTranslate.$(OBJEXT) WeaponTypeAction.$(OBJEXT) \
+-	WeaponVelocity.$(OBJEXT) array.$(OBJEXT) \
+-	collision_kernel.$(OBJEXT) collision_quadtreespace.$(OBJEXT) \
 -	collision_space.$(OBJEXT) collision_std.$(OBJEXT) \
 -	collision_transform.$(OBJEXT) collision_util.$(OBJEXT) \
 -	error.$(OBJEXT) export-dif.$(OBJEXT) fastdot.$(OBJEXT) \
@@ -301,21 +304,19 @@
 -	infblock.$(OBJEXT) infcodes.$(OBJEXT) inffast.$(OBJEXT) \
 -	inflate.$(OBJEXT) inftrees.$(OBJEXT) infutil.$(OBJEXT) \
 -	trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \
++	WeaponVelocity.$(OBJEXT) \
  	AddTarget.$(OBJEXT) Animation.$(OBJEXT) \
  	CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \
  	Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \
-@@ -1625,8 +1512,8 @@
- 	TankAIStore.$(OBJEXT) TankAIStrings.$(OBJEXT) \
- 	ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) ShipGroup.$(OBJEXT) \
- 	XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
--	XMLStringBuffer.$(OBJEXT) xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) \
--	xmltok.$(OBJEXT) Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
-+	XMLStringBuffer.$(OBJEXT) \
-+	Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
+@@ -1677,7 +1563,6 @@
+ 	TankAIStrings.$(OBJEXT) ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) \
+ 	ShipGroup.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
+ 	XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+-	xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) xmltok.$(OBJEXT) \
+ 	Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
  	TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \
- 	TargetLife.$(OBJEXT) TargetParachute.$(OBJEXT) \
- 	TargetRenderer.$(OBJEXT) TargetShield.$(OBJEXT) \
-@@ -2178,35 +2065,9 @@
+ 	TargetGroupEntry.$(OBJEXT) TargetLife.$(OBJEXT) \
+@@ -2252,36 +2137,9 @@
  @AMDEP_TRUE@	./$(DEPDIR)/WindowSetup.Po ./$(DEPDIR)/XMLFile.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/XMLNode.Po ./$(DEPDIR)/XMLParser.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/XMLStringBuffer.Po \
@@ -323,6 +324,7 @@
  @AMDEP_TRUE@	./$(DEPDIR)/aseFile.lex.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/aseFile.tab.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_kernel.Po \
+- at AMDEP_TRUE@	./$(DEPDIR)/collision_quadtreespace.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_space.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_std.Po \
 - at AMDEP_TRUE@	./$(DEPDIR)/collision_transform.Po \
@@ -352,20 +354,21 @@
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
-@@ -2386,7 +2247,6 @@
- Triangle.$(OBJEXT): ../common/Triangle.cpp
+@@ -2468,7 +2326,6 @@
  Vector.$(OBJEXT): ../common/Vector.cpp
+ Vector4.$(OBJEXT): ../common/Vector4.cpp
  VectorLib.$(OBJEXT): ../common/VectorLib.cpp
 -snprintf.$(OBJEXT): ../common/snprintf.c
  ASEModelFactory.$(OBJEXT): ../3dsparse/ASEModelFactory.cpp
  Bone.$(OBJEXT): ../3dsparse/Bone.cpp
  Face.$(OBJEXT): ../3dsparse/Face.cpp
-@@ -2563,49 +2423,6 @@
- WeaponTeleport.$(OBJEXT): ../weapons/WeaponTeleport.cpp
+@@ -2658,50 +2515,6 @@
  WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp
+ WeaponTypeAction.$(OBJEXT): ../weapons/WeaponTypeAction.cpp
  WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp
 -array.$(OBJEXT): ../ode/array.cpp
 -collision_kernel.$(OBJEXT): ../ode/collision_kernel.cpp
+-collision_quadtreespace.$(OBJEXT): ../ode/collision_quadtreespace.cpp
 -collision_space.$(OBJEXT): ../ode/collision_space.cpp
 -collision_std.$(OBJEXT): ../ode/collision_std.cpp
 -collision_transform.$(OBJEXT): ../ode/collision_transform.cpp
@@ -410,7 +413,7 @@
  AddTarget.$(OBJEXT): ../actions/AddTarget.cpp
  Animation.$(OBJEXT): ../actions/Animation.cpp
  CallbackWeapon.$(OBJEXT): ../actions/CallbackWeapon.cpp
-@@ -2807,9 +2624,6 @@
+@@ -2902,9 +2715,6 @@
  XMLNode.$(OBJEXT): ../XML/XMLNode.cpp
  XMLParser.$(OBJEXT): ../XML/XMLParser.cpp
  XMLStringBuffer.$(OBJEXT): ../XML/XMLStringBuffer.cpp
@@ -420,7 +423,7 @@
  Target.$(OBJEXT): ../target/Target.cpp
  TargetContainer.$(OBJEXT): ../target/TargetContainer.cpp
  TargetDamageCalc.$(OBJEXT): ../target/TargetDamageCalc.cpp
-@@ -3476,56 +3290,9 @@
+@@ -3593,57 +3403,9 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNode.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLParser.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@
@@ -429,6 +432,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_kernel.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_quadtreespace.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_space.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_std.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_transform.Po at am__quote@
@@ -477,7 +481,7 @@
  
  distclean-depend:
  	-rm -rf ./$(DEPDIR)
-@@ -3542,269 +3309,6 @@
+@@ -3660,269 +3422,6 @@
  @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(COMPILE) -c `cygpath -w $<`
  
@@ -747,7 +751,7 @@
  CCDEPMODE = @CCDEPMODE@
  
  .cpp.o:
-@@ -7395,306 +6897,6 @@
+@@ -7717,318 +7216,6 @@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WeaponVelocity.obj `cygpath -w ../weapons/WeaponVelocity.cpp`
  
@@ -775,6 +779,18 @@
 - at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.obj `cygpath -w ../ode/collision_kernel.cpp`
 -
+-collision_quadtreespace.o: ../ode/collision_quadtreespace.cpp
+- at AMDEP_TRUE@	source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.o `test -f '../ode/collision_quadtreespace.cpp' || echo '$(srcdir)/'`../ode/collision_quadtreespace.cpp
+-
+-collision_quadtreespace.obj: ../ode/collision_quadtreespace.cpp
+- at AMDEP_TRUE@	source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.obj `cygpath -w ../ode/collision_quadtreespace.cpp`
+-
 -collision_space.o: ../ode/collision_space.cpp
 - at AMDEP_TRUE@	source='../ode/collision_space.cpp' object='collision_space.o' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@	depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@
@@ -1055,7 +1071,7 @@
  @AMDEP_TRUE@	source='../actions/AddTarget.cpp' object='AddTarget.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@	depfile='$(DEPDIR)/AddTarget.Po' tmpdepfile='$(DEPDIR)/AddTarget.TPo' @AMDEPBACKSLASH@
 --- scorched/src/engine/ModFileEntry.cpp.syslibs	2006-04-13 00:49:26.000000000 +0200
-+++ scorched/src/engine/ModFileEntry.cpp	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/engine/ModFileEntry.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -21,7 +21,7 @@
  #include 
  #include 
@@ -1066,7 +1082,7 @@
  #include 
  
 --- scorched/src/tank/TankAvatar.cpp.syslibs	2006-02-13 18:54:27.000000000 +0100
-+++ scorched/src/tank/TankAvatar.cpp	2006-07-16 11:36:19.000000000 +0200
++++ scorched/src/tank/TankAvatar.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -22,7 +22,7 @@
  #include 
  #include 
@@ -1076,8 +1092,8 @@
  #include 
  
  GLTexture *TankAvatar::defaultTexture_ = 0;
---- scorched/src/landscape/HeightMapSender.cpp~	2006-07-16 11:55:01.000000000 +0200
-+++ scorched/src/landscape/HeightMapSender.cpp	2006-07-16 11:55:01.000000000 +0200
+--- scorched/src/landscape/HeightMapSender.cpp.syslibs	2005-11-25 11:35:42.000000000 +0100
++++ scorched/src/landscape/HeightMapSender.cpp	2006-10-31 20:11:27.000000000 +0100
 @@ -20,7 +20,7 @@
  
  #include 

scorched3d-wx26.patch:

Index: scorched3d-wx26.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-wx26.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-wx26.patch	16 Jul 2006 20:05:42 -0000	1.1
+++ scorched3d-wx26.patch	3 Nov 2006 11:23:38 -0000	1.2
@@ -1,28 +1,3 @@
---- scorched/src/scorched/NetLan.cpp~	2006-07-16 12:50:44.000000000 +0200
-+++ scorched/src/scorched/NetLan.cpp	2006-07-16 12:50:44.000000000 +0200
-@@ -96,9 +96,9 @@
- 	// Radio Buttons
- 	wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5);
- 	IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, 
--		"Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-+		wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
- 	IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, 
--		"LAN", wxDefaultPosition, wxDefaultSize, 0);
-+		wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0);
- 	radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10);
- 	radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0);
- 	sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5);
---- scorched/src/scorched/OptionEntrySetter.cpp~	2006-07-16 13:04:56.000000000 +0200
-+++ scorched/src/scorched/OptionEntrySetter.cpp	2006-07-16 13:04:56.000000000 +0200
-@@ -122,7 +122,7 @@
- 		{
- 			sizer->Add(control = 
- 				new wxCheckBox(parent, -1,
--					"",
-+					wxT(""),
- 					wxDefaultPosition, wxDefaultSize),
- 					0, wxALIGN_LEFT);
- 			control->SetToolTip(
 --- scorched/src/scorched/NetLan.cpp~	2006-07-16 20:36:19.000000000 +0200
 +++ scorched/src/scorched/NetLan.cpp	2006-07-16 20:36:19.000000000 +0200
 @@ -71,17 +71,11 @@


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scorched3d.spec	17 Jul 2006 07:21:26 -0000	1.16
+++ scorched3d.spec	3 Nov 2006 11:23:38 -0000	1.17
@@ -1,27 +1,20 @@
 Name:           scorched3d
-Version:        40
-Release:        1%{?dist}
+Version:        40.1c
+Release:        2%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.scorched3d.co.uk/
-Source0:        http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz
+Source0:        http://dl.sf.net/%{name}/Scorched3D-%{version}-src.tar.gz
 Source1:        %{name}.desktop
 Patch1:         %{name}-syslibs.patch
 Patch2:         %{name}-wx26.patch
-Patch4:         %{name}-64bit.patch
-Patch5:         %{name}-openal.patch
-Patch6:         %{name}-help.patch
+Patch3:         %{name}-openal.patch
+Patch4:         %{name}-help.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  wxGTK-devel
-BuildRequires:  openal-devel
-BuildRequires:  freealut-devel
-BuildRequires:  SDL_net-devel
-BuildRequires:  ImageMagick
-BuildRequires:  libGLU-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  expat-devel
-BuildRequires:  ode-devel
+BuildRequires:  wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
+BuildRequires:  expat-devel libvorbis-devel ImageMagick desktop-file-utils
+Requires:       hicolor-icon-theme
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -42,13 +35,12 @@
 
 %prep
 %setup -q -n scorched
-rm -r autom4te.cache `find . -name Makefile`
+rm -r `find . -name Makefile`
 rm -r src/zlib src/ode `find src/XML ! -name "X*"`
-%patch1 -p1
-%patch2 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1 -p1 -z .syslibs
+%patch2 -p1 -z .wx26
+%patch3 -p1 -z .openal
+%patch4 -p1 -z .help
 # make rpmlint happy with debuginfo package
 chmod -x src/GLEXT/*
 # stop autoxxx from running
@@ -58,29 +50,27 @@
 
 
 %build
-%configure \
-  --disable-dependency-tracking \
-  --datadir=%{_datadir}/games/%{name} \
-  --with-docdir=$RPM_DOC_DIR/%{name}-%{version}
+%configure --disable-dependency-tracking --datadir=%{_datadir}/%{name} \
+  --with-docdir=%{_docdir}/%{name}-%{version}
 # LDFLAGS=-lode for use of system ode
 make %{?_smp_mflags} LDFLAGS=-lode
-convert data/windows/tank2.ico tank2.png
+convert data/windows/tank2.ico %{name}.png
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html .
 
-desktop-file-install \
-  --vendor fedora \
+# 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 \
-  --mode 644 \
-  --add-category X-Fedora \
+  --add-category X-Fedora                       \
   %{SOURCE1}
-install -Dpm 644 tank2.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/scorched3d.png
-
-mv $RPM_BUILD_ROOT$RPM_DOC_DIR/%{name}-%{version}/documentation __docs
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+install -p -m 644 %{name}.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
 
 %clean
@@ -88,22 +78,40 @@
 
 
 %post
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+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
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+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 TODO __docs/*
-%{_bindir}/scorched3d
-%{_datadir}/games/scorched3d/
-%{_datadir}/applications/*scorched3d.desktop
-%{_datadir}/icons/hicolor/*/apps/scorched3d.png
+%doc AUTHORS COPYING TODO html
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Fri Nov  3 2006 Hans de Goede  40.1c-2
+- Add libvorbis-devel BR so that ogg/vorbis support gets build in
+
+* Thu Nov  2 2006 Hans de Goede  40.1c-1
+- New upstream release 40.1c
+- Drop 64 bit patch (integrated upstream)
+- Don't install our data files in /usr/share/games, but in /usr/share
+- Some minor specfile cleanups
+
+* Tue Aug 29 2006 Hans de Goede  40-2
+- FE6 Rebuild
+
 * Sun Jul 15 2006 Hans de Goede  40-1
 - New upstream release 40
 - Drop many upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jul 2006 20:05:42 -0000	1.4
+++ sources	3 Nov 2006 11:23:38 -0000	1.5
@@ -1 +1 @@
-76b60b9f73d2c971d86bfac761989cf4  Scorched3D-40-src.tar.gz
+a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz


--- scorched3d-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 12:39:36 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Fri, 3 Nov 2006 05:39:36 -0700
Subject: rpms/gdeskcal/FC-6 gdeskcal.spec,1.17,1.18
Message-ID: <200611031239.kA3Cda3l010162@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145

Modified Files:
	gdeskcal.spec 
Log Message:

Added gettext BR 
 	gdeskcal.spec 



Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-6/gdeskcal.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gdeskcal.spec	2 Nov 2006 21:40:41 -0000	1.17
+++ gdeskcal.spec	3 Nov 2006 12:39:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gdeskcal
 Version:        1.0
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Eye-candy calendar for your desktop
 Group:          User Interface/Desktops
 License:        GPL
@@ -10,7 +10,7 @@
 Source2:        gdeskcal.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, pygtk2-devel, perl(XML::Parser)
+BuildRequires:  desktop-file-utils, pygtk2-devel, perl(XML::Parser), gettext
 Requires:       pygtk2 >= 1.99.14
 Requires:       python >= 2.0.0
 
@@ -62,6 +62,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Fri Nov 03 2006 Paul F. Johnson  1.0-9
+- added gettext
+
 * Thu Nov 02 2006 Paul F. Johnson  1.0-7
 - added perl(xml::parser)
 



From fedora-extras-commits at redhat.com  Fri Nov  3 12:59:16 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 3 Nov 2006 05:59:16 -0700
Subject: rpms/jd/devel .cvsignore, 1.11, 1.12 jd.spec, 1.18, 1.19 sources,
	1.11, 1.12
Message-ID: <200611031259.kA3CxGpf010308@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10288

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
- 1.8.0 beta 061103



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Nov 2006 14:49:20 -0000	1.11
+++ .cvsignore	3 Nov 2006 12:58:46 -0000	1.12
@@ -1 +1 @@
-jd-1.8.0-cvs061102.tgz
+jd-1.8.0-beta061103.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jd.spec	2 Nov 2006 14:49:20 -0000	1.18
+++ jd.spec	3 Nov 2006 12:58:46 -0000	1.19
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061102
-%define         repoid        22352
+%define         strtag        beta061103
+%define         repoid        22566
 
 
 # Defined by vendor
 #
-%define         vendor_rel    4
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -43,8 +43,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Nov  1 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061102
-- cvs 061102 (23:30 JST)
+* Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
+- 1.8.0 beta 061103
 
 * Sat Oct 28 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061028
 - Detect libSM and libICE for x86_64.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Nov 2006 14:49:20 -0000	1.11
+++ sources	3 Nov 2006 12:58:46 -0000	1.12
@@ -1 +1 @@
-10acd84c05665bb70cbad02975c5dfc2  jd-1.8.0-cvs061102.tgz
+fb89210bb7fa49b0fcdf3a28c1e22711  jd-1.8.0-beta061103.tgz



From fedora-extras-commits at redhat.com  Fri Nov  3 13:01:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 3 Nov 2006 06:01:22 -0700
Subject: rpms/jd/FC-6 .cvsignore, 1.7, 1.8 jd.spec, 1.8, 1.9 sources, 1.7,
	1.8 jd-1.8.0-cvs061028-support-x86_64.patch, 1.1, NONE
Message-ID: <200611031301.kA3D1MSc013269@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10344

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
- 1.8.0 beta 061103



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2006 05:32:41 -0000	1.7
+++ .cvsignore	3 Nov 2006 13:00:49 -0000	1.8
@@ -1 +1 @@
-jd-1.8.0-beta061023.tgz
+jd-1.8.0-beta061103.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jd.spec	28 Oct 2006 17:37:39 -0000	1.8
+++ jd.spec	3 Nov 2006 13:00:49 -0000	1.9
@@ -10,17 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061023
-%define         repoid        22352
+%define         strtag        beta061103
+%define         repoid        22566
 
 
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
-%define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
 
@@ -46,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.0-cvs061028-support-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -62,7 +60,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -80,10 +77,11 @@
 
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
+# desktop-file-tools 0.10->0.11 change
+# 0.11 no longer accepts Application, X-Fedora, X-Red-Hat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --add-category %{category} \
    %{name}.desktop
 
 %clean
@@ -105,8 +103,16 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Oct 28 2006 Mamoru Tasaka  - 1.8.0-0.3.beta061023
+* Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
+- 1.8.0 beta 061103
+
+* Sat Oct 28 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061028
 - Detect libSM and libICE for x86_64.
+- cvs 061028 (23:59 JST)
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 1.8.0-0.3.beta061023
+- Remove some category from desktop files due to
+  desktop-file-utils change.
 
 * Tue Oct 24 2006 Mamoru Tasaka  - 1.8.0-0.2.beta061023
 - 1.8.0 beta 061023


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Oct 2006 05:32:41 -0000	1.7
+++ sources	3 Nov 2006 13:00:49 -0000	1.8
@@ -1 +1 @@
-31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz
+fb89210bb7fa49b0fcdf3a28c1e22711  jd-1.8.0-beta061103.tgz


--- jd-1.8.0-cvs061028-support-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 13:03:35 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 3 Nov 2006 06:03:35 -0700
Subject: rpms/jd/FC-5 .cvsignore, 1.6, 1.7 jd.spec, 1.7, 1.8 sources, 1.6,
	1.7 jd-1.8.0-cvs061028-support-x86_64.patch, 1.1, NONE
Message-ID: <200611031303.kA3D3ZhJ013385@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13365

Modified Files:
	.cvsignore jd.spec sources 
Removed Files:
	jd-1.8.0-cvs061028-support-x86_64.patch 
Log Message:
* Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
- 1.8.0 beta 061103



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Oct 2006 05:34:08 -0000	1.6
+++ .cvsignore	3 Nov 2006 13:03:03 -0000	1.7
@@ -1 +1 @@
-jd-1.8.0-beta061023.tgz
+jd-1.8.0-beta061103.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jd.spec	28 Oct 2006 17:39:17 -0000	1.7
+++ jd.spec	3 Nov 2006 13:03:03 -0000	1.8
@@ -10,17 +10,16 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061023
-%define         repoid        22352
+%define         strtag        beta061103
+%define         repoid        22566
 
 
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    5
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
-%define         category      X-Fedora
 %define         gtkmmdevel    gtkmm24-devel
 %define         icondir       %{_datadir}/icons/hicolor/96x96/apps/
 
@@ -46,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.0-cvs061028-support-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -62,7 +60,6 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p1 -b .x86_64
 find . -name CVS | sort -r | xargs %{__rm} -rf
 
 %build
@@ -80,10 +77,11 @@
 
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
+# desktop-file-tools 0.10->0.11 change
+# 0.11 no longer accepts Application, X-Fedora, X-Red-Hat-Base
 desktop-file-install \
    --vendor %{vendorname} \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --add-category %{category} \
    %{name}.desktop
 
 %clean
@@ -105,8 +103,16 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Oct 28 2006 Mamoru Tasaka  - 1.8.0-0.3.beta061023
+* Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
+- 1.8.0 beta 061103
+
+* Sat Oct 28 2006 Mamoru Tasaka  - 1.8.0-0.4.cvs061028
 - Detect libSM and libICE for x86_64.
+- cvs 061028 (23:59 JST)
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 1.8.0-0.3.beta061023
+- Remove some category from desktop files due to
+  desktop-file-utils change.
 
 * Tue Oct 24 2006 Mamoru Tasaka  - 1.8.0-0.2.beta061023
 - 1.8.0 beta 061023


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Oct 2006 05:34:08 -0000	1.6
+++ sources	3 Nov 2006 13:03:03 -0000	1.7
@@ -1 +1 @@
-31f5bf79fecf9d06f0bffd99b494c512  jd-1.8.0-beta061023.tgz
+fb89210bb7fa49b0fcdf3a28c1e22711  jd-1.8.0-beta061103.tgz


--- jd-1.8.0-cvs061028-support-x86_64.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 13:24:25 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 3 Nov 2006 06:24:25 -0700
Subject: rpms/fwfstab - New directory
Message-ID: <200611031324.kA3DOPK8013696@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwfstab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692/fwfstab

Log Message:
Directory /cvs/extras/rpms/fwfstab added to the repository




From fedora-extras-commits at redhat.com  Fri Nov  3 13:24:31 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 3 Nov 2006 06:24:31 -0700
Subject: rpms/fwfstab/devel - New directory
Message-ID: <200611031324.kA3DOVCW013710@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwfstab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692/fwfstab/devel

Log Message:
Directory /cvs/extras/rpms/fwfstab/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov  3 13:24:45 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 3 Nov 2006 06:24:45 -0700
Subject: rpms/fwfstab Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611031324.kA3DOjqo013743@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwfstab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13737

Added Files:
	Makefile import.log 
Log Message:
Setup of module fwfstab


--- NEW FILE Makefile ---
# Top level Makefile for module fwfstab
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  Fri Nov  3 13:24:51 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 3 Nov 2006 06:24:51 -0700
Subject: rpms/fwfstab/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611031324.kA3DOpUN013762@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwfstab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13737/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fwfstab


--- 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  Fri Nov  3 13:25:42 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 3 Nov 2006 06:25:42 -0700
Subject: rpms/fwfstab import.log,1.1,1.2
Message-ID: <200611031325.kA3DPgwU013851@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwfstab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13808

Modified Files:
	import.log 
Log Message:
auto-import fwfstab-0.01.1-1 on branch devel from fwfstab-0.01.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fwfstab/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Nov 2006 13:24:45 -0000	1.1
+++ import.log	3 Nov 2006 13:25:12 -0000	1.2
@@ -0,0 +1 @@
+fwfstab-0_01_1-1:HEAD:fwfstab-0.01.1-1.src.rpm:1162560251



From fedora-extras-commits at redhat.com  Fri Nov  3 13:25:42 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 3 Nov 2006 06:25:42 -0700
Subject: rpms/fwfstab/devel fwfstab.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611031325.kA3DPgSN013855@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/rpms/fwfstab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13808/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fwfstab.spec 
Log Message:
auto-import fwfstab-0.01.1-1 on branch devel from fwfstab-0.01.1-1.src.rpm


--- NEW FILE fwfstab.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

%{!?fedoraver: %define fedoraver  %(test -e /etc/fedora-release && rpm -q fedora-release --qf "%{VERSION}")}

Name:		fwfstab
Version:		0.01.1
Release:		1%{?dist}
BuildArch:	noarch
Summary:	A graphical file system table editor

Group:		Applications/System
License:		GPL
URL:		http://www.diffingo.com/content/view/32/45/lang,en/
Source0:		http://www.diffingo.com/downloads/fwfstab/fwfstab-%{version}.tar.gz
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:		desktop-file-utils
Requires:		pygtk2 pygtk2-libglade redhat-artwork usermode
%description
fwfstab is a graphical file system table (fstab) editor, used to edit the 
/etc/fstab file. It lets users add, edit or remove new entries in a simple,
straight-forward way. It is meant to make the task of editing the file
system table easier without sacrificing flexibility.


%prep
%setup -q


%build


%install
rm -rf $RPM_BUILD_ROOT

install -d -p -m755 ${RPM_BUILD_ROOT}%{_bindir}

install -D -p -m644 etc/pam.d/fwfstab ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/fwfstab

install -D -p -m644 etc/security/console.apps/fwfstab ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/fwfstab

install -D -p -m755 usr/share/fwfstab/fwfstab-runapp.py ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/fwfstab-runapp.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/__init__.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/__init__.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/BaseClasses.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/BaseClasses.py

install -D -p -m644 usr/lib/python2.4/site-packages/fwfstab/Callbacks.py ${RPM_BUILD_ROOT}%{python_sitelib}/fwfstab/Callbacks.py

install -D -p -m644 usr/share/fwfstab/mountoptions ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/mountoptions

install -D -p -m644 usr/share/fwfstab/fwfstab.glade ${RPM_BUILD_ROOT}%{_datadir}/fwfstab/fwfstab.glade

install -D -p -m755 usr/sbin/fwfstab ${RPM_BUILD_ROOT}%{_sbindir}/fwfstab

ln -sf ../../../usr/bin/consolehelper ${RPM_BUILD_ROOT}%{_bindir}/fwfstab

desktop-file-install --vendor fedora\
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications\
	--add-category X-Fedora\
	usr/share/applications/fwfstab.desktop

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%dir %{_datadir}/fwfstab
%dir %{python_sitelib}/fwfstab

%{_bindir}/fwfstab
%{_sbindir}/fwfstab
%{_datadir}/fwfstab/*
%{_datadir}/applications/fedora-*.desktop
%{python_sitelib}/fwfstab/*

%config(noreplace) %{_sysconfdir}/security/console.apps/fwfstab
%config(noreplace) %{_sysconfdir}/pam.d/fwfstab

%doc README COPYING CHANGELOG

%changelog

* Thu Nov 2 2006 Stewart Adam  0.01.1-1
- Update to 0.01.1

* Wed Nov 1 2006 Stewart Adam  0.01-3
- Bug fixes... Mount point comes before filesystem in /etc/fstab!

* Mon Oct 29 2006 Stewart Adam  0.01-2
- Fix error with comments in fstab
- Don't quit when there's an error parsing the fstab

* Sat Oct 28 2006 Stewart Adam  0.01-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwfstab/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Nov 2006 13:24:50 -0000	1.1
+++ .cvsignore	3 Nov 2006 13:25:12 -0000	1.2
@@ -0,0 +1 @@
+fwfstab-0.01.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwfstab/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Nov 2006 13:24:50 -0000	1.1
+++ sources	3 Nov 2006 13:25:12 -0000	1.2
@@ -0,0 +1 @@
+fb87e760037a9497b1e8f47c8715e65d  fwfstab-0.01.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 13:32:34 2006
From: fedora-extras-commits at redhat.com (Stewart Adam (firewing))
Date: Fri, 3 Nov 2006 06:32:34 -0700
Subject: owners owners.list,1.1886,1.1887
Message-ID: <200611031332.kA3DWYtN013933@cvs-int.fedora.redhat.com>

Author: firewing

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13912

Modified Files:
	owners.list 
Log Message:
Added 'fwfstab'



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1886
retrieving revision 1.1887
diff -u -r1.1886 -r1.1887
--- owners.list	3 Nov 2006 04:25:45 -0000	1.1886
+++ owners.list	3 Nov 2006 13:32:04 -0000	1.1887
@@ -439,6 +439,7 @@
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwbackups|A feature-rich user backup program|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
+Fedora Extras|fwfstab|A graphical file system table editor|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net



From fedora-extras-commits at redhat.com  Fri Nov  3 13:43:34 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 3 Nov 2006 06:43:34 -0700
Subject: rpms/php-pecl-zip/FC-6 .cvsignore, 1.7, 1.8 php-pecl-zip.spec, 1.7, 
	1.8 sources, 1.7, 1.8
Message-ID: <200611031343.kA3DhYJr014029@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14009

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	update to 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Oct 2006 05:25:50 -0000	1.7
+++ .cvsignore	3 Nov 2006 13:43:04 -0000	1.8
@@ -1 +1 @@
-zip-1.7.5.tgz
+zip-1.8.0.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/php-pecl-zip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pecl-zip.spec	25 Oct 2006 05:25:50 -0000	1.7
+++ php-pecl-zip.spec	3 Nov 2006 13:43:04 -0000	1.8
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.5
+Version:      1.8.0
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Thu Nov 02 2006 Remi Collet  1.8.0-1
+- update to 1.8.0
+
 * Tue Oct 24 2006 Remi Collet  1.7.5-1
 - update to 1.7.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Oct 2006 05:25:50 -0000	1.7
+++ sources	3 Nov 2006 13:43:04 -0000	1.8
@@ -1 +1 @@
-e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz
+21ba5f9055074a5dbf9cb55922b7262e  zip-1.8.0.tgz



From fedora-extras-commits at redhat.com  Fri Nov  3 13:45:21 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 3 Nov 2006 06:45:21 -0700
Subject: rpms/php-pecl-zip/FC-5 .cvsignore, 1.7, 1.8 php-pecl-zip.spec, 1.6, 
	1.7 sources, 1.7, 1.8
Message-ID: <200611031345.kA3DjLtT014109@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14087

Modified Files:
	.cvsignore php-pecl-zip.spec sources 
Log Message:
	update to 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Oct 2006 05:27:29 -0000	1.7
+++ .cvsignore	3 Nov 2006 13:44:51 -0000	1.8
@@ -1 +1 @@
-zip-1.7.5.tgz
+zip-1.8.0.tgz


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/php-pecl-zip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pecl-zip.spec	25 Oct 2006 05:27:29 -0000	1.6
+++ php-pecl-zip.spec	3 Nov 2006 13:44:51 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:      A zip management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.7.5
+Version:      1.8.0
 Release:      1%{?dist}
 License:      PHP License
 Group:        Development/Languages
@@ -61,6 +61,9 @@
 %{php_extdir}/zip.so
 
 %changelog
+* Thu Nov 02 2006 Remi Collet  1.8.0-1
+- update to 1.8.0
+
 * Tue Oct 24 2006 Remi Collet  1.7.5-1
 - update to 1.7.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Oct 2006 05:27:29 -0000	1.7
+++ sources	3 Nov 2006 13:44:51 -0000	1.8
@@ -1 +1 @@
-e5aaeaac4e0724f95aef1e4a5f2ef8b6  zip-1.7.5.tgz
+21ba5f9055074a5dbf9cb55922b7262e  zip-1.8.0.tgz



From fedora-extras-commits at redhat.com  Fri Nov  3 15:34:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 08:34:07 -0700
Subject: rpms/alex4 - New directory
Message-ID: <200611031534.kA3FY7Zb022204@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alex4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22200/alex4

Log Message:
Directory /cvs/extras/rpms/alex4 added to the repository




From fedora-extras-commits at redhat.com  Fri Nov  3 15:34:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 08:34:14 -0700
Subject: rpms/alex4/devel - New directory
Message-ID: <200611031534.kA3FYEhE022220@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alex4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22200/alex4/devel

Log Message:
Directory /cvs/extras/rpms/alex4/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov  3 15:34:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 08:34:31 -0700
Subject: rpms/alex4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611031534.kA3FYVld022249@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alex4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22243

Added Files:
	Makefile import.log 
Log Message:
Setup of module alex4


--- NEW FILE Makefile ---
# Top level Makefile for module alex4
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  Fri Nov  3 15:34:37 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 08:34:37 -0700
Subject: rpms/alex4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611031534.kA3FYbVj022266@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alex4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22243/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alex4


--- 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  Fri Nov  3 15:35:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 08:35:53 -0700
Subject: rpms/alex4 import.log,1.1,1.2
Message-ID: <200611031535.kA3FZrsK022360@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alex4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22323

Modified Files:
	import.log 
Log Message:
auto-import alex4-1.0-2 on branch devel from alex4-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alex4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Nov 2006 15:34:30 -0000	1.1
+++ import.log	3 Nov 2006 15:35:23 -0000	1.2
@@ -0,0 +1 @@
+alex4-1_0-2:HEAD:alex4-1.0-2.src.rpm:1162568181



From fedora-extras-commits at redhat.com  Fri Nov  3 15:35:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 08:35:54 -0700
Subject: rpms/alex4/devel alex4-unix.patch, NONE, 1.1 alex4.desktop, NONE,
	1.1 alex4.png, NONE, 1.1 alex4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611031535.kA3FZsTA022364@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/alex4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22323/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alex4-unix.patch alex4.desktop alex4.png alex4.spec 
Log Message:
auto-import alex4-1.0-2 on branch devel from alex4-1.0-2.src.rpm

alex4-unix.patch:

--- NEW FILE alex4-unix.patch ---
--- alex4src/src/main.c.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/main.c	2006-11-03 13:26:37.000000000 +0100
@@ -38,6 +38,7 @@
 #include "main.h"
 #include "edit.h"
 #include "shooter.h"
+#include "unix.h"
 
 #include "../data/data.h"
 
@@ -66,7 +67,6 @@
 Tscroller hscroll;
 Thisc *hisc_table;
 Thisc *hisc_table_space;
-char working_directory[1024];
 
 // the map
 Tmap *map = NULL;
@@ -126,6 +126,7 @@
 int playing_original_game = 1;
 int init_ok = 0;
 
+static FILE* log_fp = NULL;
 
 
 // // // // // // // // // // // // // // // // // // // // // 
@@ -154,20 +155,18 @@
 // loggs the text to the text file
 void log2file(char *format, ...) {
 	va_list ptr; /* get an arg pointer */
- 	FILE *fp;
 	
-	fp = fopen("log.txt", "at");
-	if (fp) {
+	if (log_fp) {
 		/* initialize ptr to point to the first argument after the format string */
 		va_start(ptr, format);
  
 		/* Write to logfile. */
-		vfprintf(fp, format, ptr); // Write passed text.
-		fprintf(fp, "\n"); // New line..
+		vfprintf(log_fp, format, ptr); // Write passed text.
+		fprintf(log_fp, "\n"); // New line..
  
 		va_end(ptr);
  
-		fclose(fp);
+		fflush(log_fp);
 	}
 
 }
@@ -618,6 +617,10 @@
 	BITMAP *bmp;
 	int i;
 	int w, h;
+#ifdef __unix__   
+	char filename[512];
+	char *homedir = get_homedir();
+#endif 	
 
 	log2file("\nInit routines:");
 
@@ -625,7 +628,13 @@
 	log2file(" initializing allegro");
 	text_mode(-1);
 	garble_string(init_string, 53);
+#ifdef __unix__
+	snprintf(filename, sizeof(filename), "%s/.alex4/alex4.ini",
+		homedir? homedir:".");
+	override_config_file(filename);
+#else
 	set_config_file("alex4.ini");
+#endif
 	set_window_close_button(FALSE);
 	
 	// install timers
@@ -663,7 +672,7 @@
 	
 
 	// init gfx
-	if (get_config_int("graphics", "fullscreen", 0)) {
+	if (get_config_int("graphics", "fullscreen", 1)) {
 		w = get_config_int("graphics", "f_width", 640);
 		h = get_config_int("graphics", "f_height", 480);
 	}
@@ -672,10 +681,10 @@
 		h = get_config_int("graphics", "w_height", 480);
 	}
 
-	log2file(" entering gfx mode set in alex4.ini (%dx%d %s)", w, h, (get_config_int("graphics", "fullscreen", 0) ? "full" : "win"));
+	log2file(" entering gfx mode set in alex4.ini (%dx%d %s)", w, h, (get_config_int("graphics", "fullscreen", 1) ? "full" : "win"));
 
     if (set_gfx_mode(
-		(get_config_int("graphics", "fullscreen", 0) ? GFX_AUTODETECT_FULLSCREEN : GFX_AUTODETECT_WINDOWED),
+		(get_config_int("graphics", "fullscreen", 1) ? GFX_AUTODETECT_FULLSCREEN : GFX_AUTODETECT_WINDOWED),
 		w, h, 0, 0)) {
 		log2file("  *** failed");
 		log2file(" entering gfx mode (640x480 windowed)");
@@ -695,6 +704,7 @@
 	textout_centre(swap_screen, font, "loading...", 320, 200, 1);
 	blit_to_screen(swap_screen);
 
+#ifndef __unix__
 	// set switch modes and callbacks
 	if (set_display_switch_mode(SWITCH_PAUSE) < 0)
 		log2file("  * display switch mode failed");
@@ -702,6 +712,7 @@
 		log2file("  * display switch in failed");
 	if (set_display_switch_callback(SWITCH_OUT, display_switch_out) < 0)
 		log2file("  * display switch out failed");
+#endif
 
 
 	// set win title (no! really???)
@@ -718,7 +729,7 @@
 	// load data
 	log2file(" loading data");
 	packfile_password(init_string);
-	data = load_datafile("data/data.dat");
+	data = load_datafile(DATADIR "data.dat");
 	packfile_password(NULL);
 	if (data == NULL) {
     	log2file("  *** failed");
@@ -728,7 +739,13 @@
 
 	// load options
 	log2file(" loading options");
+#ifdef __unix__
+	snprintf(filename, sizeof(filename), "%s/.alex4/alex4.sav",
+		homedir? homedir:".");
+	pf = pack_fopen(filename, "rp");
+#else
 	pf = pack_fopen("alex4.sav", "rp");
+#endif
 	if (pf) {
 		load_options(&options, pf);
 		pack_fclose(pf);
@@ -740,7 +757,13 @@
 
 	// loading highscores
 	log2file(" loading hiscores");
+#ifdef __unix__
+	snprintf(filename, sizeof(filename), "%s/.alex4/alex4.hi",
+		homedir? homedir:".");
+	pf = pack_fopen(filename, "rp");
+#else
 	pf = pack_fopen("alex4.hi", "rp");
+#endif
 	if (pf) {
 		load_hisc_table(hisc_table, pf);
 		load_hisc_table(hisc_table_space, pf);
@@ -776,7 +799,7 @@
 		log2file(" loading original maps");
 		packfile_password(init_string);
 		num_levels = -1;  // skip end object when counting
-		maps = load_datafile_callback("data/maps.dat", count_maps_callback);
+		maps = load_datafile_callback(DATADIR "maps.dat", count_maps_callback);
 		packfile_password(NULL);
 		if (maps == NULL) {
 	    	log2file("  *** failed");
@@ -835,11 +858,12 @@
 	// install sound
 	log2file(" installing sound");
    	set_volume_per_voice(0);
-	switch(get_config_int("sound", "sound_device", 0)) {
+	switch(get_config_int("sound", "sound_device", 1)) {
 		case 1:
 			i = DIGI_AUTODETECT;
 			log2file("  DIGI_AUTODETECT selected (%d)", i);
 			break;
+#ifdef ALLEGRO_WINDOWS
 		case 2:
 			i = DIGI_DIRECTX(0);
 			log2file("  DIGI_DIRECTX(0) selected (%d)", i);
@@ -848,6 +872,20 @@
 			i = DIGI_DIRECTAMX(0);
 			log2file("  DIGI_DIRECTAMX(0) selected (%d)", i);
 			break;
+#elif defined ALLEGRO_UNIX
+#ifdef DIGI_OSS
+		case 2:
+			i = DIGI_OSS;
+			log2file("  DIGI_OSS selected (%d)", i);
+			break;
+#endif
+#ifdef DIGI_ALSA
+		case 3:
+			i = DIGI_ALSA;
+			log2file("  DIGI_ALSA selected (%d)", i);
+			break;
+#endif
+#endif
 		default:
 			i = -770405;	// dummy number
 			got_sound = 0;
@@ -870,9 +908,9 @@
 		if (get_config_int("sound", "use_sound_datafile", 1)) {
 			log2file(" loading sound datafile");
 			packfile_password(init_string);
-			sfx_data = load_datafile("data/sfx_44.dat");
+			sfx_data = load_datafile(DATADIR "sfx_44.dat");
 			if (sfx_data == NULL) {
-				sfx_data = load_datafile("data/sfx_22.dat");
+				sfx_data = load_datafile(DATADIR "sfx_22.dat");
 				log2file("  sfx_44.dat not found");
 				s = 0;
 			}
@@ -971,6 +1009,10 @@
 void uninit_game() {
 	int i;
 	PACKFILE *pf;
+#ifdef __unix__   
+	char filename[512];
+	char *homedir = get_homedir();
+#endif 	
 
 	log2file("\nExit routines:");
 
@@ -989,14 +1031,26 @@
 	// only save if everything was inited ok!
 	if (init_ok) {
 		log2file(" saving options");
+#ifdef __unix__
+		snprintf(filename, sizeof(filename), "%s/.alex4/alex4.sav",
+			homedir? homedir:".");
+		pf = pack_fopen(filename, "wp");
+#else
 		pf = pack_fopen("alex4.sav", "wp");
+#endif
 		if (pf) {
 			save_options(&options, pf);
 			pack_fclose(pf);
 		}
 		
 		log2file(" saving highscores");
+#ifdef __unix__
+		snprintf(filename, sizeof(filename), "%s/.alex4/alex4.hi",
+			homedir? homedir:".");
+		pf = pack_fopen(filename, "wp");
+#else
 		pf = pack_fopen("alex4.hi", "wp");
+#endif
 		if (pf) {
 			save_hisc_table(hisc_table, pf);
 			save_hisc_table(hisc_table_space, pf);
@@ -1289,7 +1343,7 @@
 			// poll music machine
 			if (got_sound) al_poll_duh(dp);
 
-			if (mode == 1 && (keypressed() || is_fire(&ctrl) || is_jump(&ctrl) ) || my_counter > 200) {
+			if (((mode == 1) && (keypressed() || is_fire(&ctrl) || is_jump(&ctrl))) || (my_counter > 200)) {
 				mode = 2;
 			}
 			
@@ -1343,7 +1397,7 @@
 	if (space) {
 		// get space bg
 		packfile_password(init_string);
-		df = load_datafile_object("data/a45.dat", "BG1");
+		df = load_datafile_object(DATADIR "a45.dat", "BG1");
 		packfile_password(NULL);
 		if (df != NULL)	{
 			bg = df->dat;
@@ -2149,7 +2203,7 @@
 
 // calculates camera pos for map m considering player p
 void calculate_camera_pos(Tplayer *p, Tmap *m) {
-	static camera_type = 1;
+	static int camera_type = 1;
 
 	if (p->actor->status == AC_BALL) {
 		camera_type = 2;
@@ -2841,6 +2895,10 @@
 			}
 			else {
 				PACKFILE *pf;
+#ifdef __unix__   
+				char filename[512];
+				char *homedir = get_homedir();
+#endif 	
 				log2file(" level complete");
 				if (got_sound) stop_music();
 				if (level < MAX_LEVELS && playing_original_game) {
@@ -2875,7 +2933,14 @@
 
 				// save options
 				log2file(" saving options");
+#ifdef __unix__
+				snprintf(filename, sizeof(filename),
+					"%s/.alex4/alex4.sav",
+					homedir? homedir:".");
+				pf = pack_fopen(filename, "wp");
+#else
 				pf = pack_fopen("alex4.sav", "wp");
+#endif
 				if (pf) {
 					save_options(&options, pf);
 					pack_fclose(pf);
@@ -2969,24 +3034,36 @@
 
 // main
 int main(int argc, char **argv) {   
-	FILE *fp;
 	int i;
 	char full_path[1024];
+#ifndef __unix__   
+	char working_directory[1024];
+#else
+	char *homedir = get_homedir();
+#endif
 
 	// init allegro
 	allegro_init();
 
+#ifdef __unix__
+	// start logfile
+	snprintf(full_path, sizeof(full_path), "%s/.alex4",
+		homedir? homedir:".");
+	check_and_create_dir(full_path);
+	snprintf(full_path, sizeof(full_path), "%s/.alex4/log.txt",
+		homedir? homedir:".");
+	log_fp = fopen(full_path, "wt");
+#else
 	// get working directory
 	get_executable_name(full_path, 1024);
 	replace_filename(working_directory, full_path, "", 1024);
 	chdir(working_directory);
 
-
 	// start logfile
-	fp = fopen("log.txt", "wt");
-	if (fp) {
-		fprintf(fp, "Alex 4 (%s) - log file\n-------------------\n", GAME_VERSION_STR);
-		fclose(fp);
+	log_fp = fopen("log.txt", "wt");
+#endif
+	if (log_fp) {
+		fprintf(log_fp, "Alex 4 (%s) - log file\n-------------------\n", GAME_VERSION_STR);
 	}
 
 	// log program arguments
@@ -2994,7 +3071,9 @@
 	for(i = 0; i < argc; i ++) {
 		log2file("   %s", argv[i]);
 	}
+#ifndef __unix__
 	log2file("Working directory is:\n   %s", working_directory);
+#endif
 
 	// test wether to play real game
 	// or custom levels
@@ -3022,6 +3101,8 @@
 	uninit_game();
 	allegro_exit();
 	log2file("\nDone...\n");
+	if (log_fp)
+		fclose(log_fp);
 
 	return 0;
 } END_OF_MAIN(); 
--- alex4src/src/player.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/player.h	2006-11-03 13:26:37.000000000 +0100
@@ -60,4 +60,4 @@
 void wound_player(Tplayer *p);
 void kill_player(Tplayer *p);
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/map.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/map.h	2006-11-03 13:26:37.000000000 +0100
@@ -111,4 +111,4 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
--- /dev/null	2006-11-03 08:26:09.036129000 +0100
+++ alex4src/src/unix.c	2006-11-03 13:26:37.000000000 +0100
@@ -0,0 +1,82 @@
+#ifdef __unix__
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#if defined(__DECC) && defined(VMS)
+#include 
+static char *vms_to_unix_buffer = NULL;
+static int convert_vms_to_unix(char *vms_dir_name)
+{
+	vms_to_unix_buffer = vms_dir_name;
+}
+#endif
+
+char *get_homedir(void)
+{
+	struct passwd *pw;
+
+	if (!(pw = getpwuid(getuid())))
+	{ 
+		fprintf(stderr, "Who are you? Not found in passwd database!!\n");
+		return getenv("HOME");
+	}
+
+#if defined(__DECC) && defined(VMS)
+	/* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix
+	   Format. */
+	decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1);
+	return vms_to_unix_buffer;
+#else
+	return pw->pw_dir;
+#endif
+}
+//-----------------------------------------------------------------------------
+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;
+}
+#endif
--- /dev/null	2006-11-03 08:26:09.036129000 +0100
+++ alex4src/src/Makefile	2006-11-03 13:26:37.000000000 +0100
@@ -0,0 +1,24 @@
+PREFIX  = /usr/local
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS  = -g -Wall -Wno-deprecated-declarations -O2
+LDFLAGS = `allegro-config --libs` -laldmb -ldumb
+DEFINES = -DDATADIR=\"$(DATADIR)/\"
+OBJS    =  actor.o    edit.o  map.o       player.o    shooter.o unix.o \
+           bullet.o   hisc.o  options.o   script.o    timer.o          \
+           control.o  main.o  particle.o  scroller.o  token.o
+TARGET  = alex4
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
+
+install: $(TARGET)
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(DATADIR)
+	install -p -m 755 $(TARGET) $(PREFIX)/bin
+	install -p -m 644 ../data/*.dat $(DATADIR)
+	
+clean:
+	rm -f $(OBJS) $(TARGET) *~
--- alex4src/src/token.h.unix	2003-07-26 12:53:54.000000000 +0200
+++ alex4src/src/token.h	2006-11-03 13:26:37.000000000 +0100
@@ -41,4 +41,4 @@
 Ttoken *tokenize(char *str);
 
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/shooter.c.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/shooter.c	2006-11-03 13:26:37.000000000 +0100
@@ -1372,7 +1372,7 @@
 	// load data
 	log2file(" loading shooter data");
 	packfile_password(get_init_string());
-	s_data = load_datafile("data/a45.dat");
+	s_data = load_datafile(DATADIR "a45.dat");
 	if (!s_data) {
 		log2file(" *** failed");
 		return -1;
--- alex4src/src/particle.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/particle.h	2006-11-03 13:26:37.000000000 +0100
@@ -54,4 +54,4 @@
 void update_particle_with_map(Tparticle *p, Tmap *m);
 void create_burst(Tparticle *ps, int x, int y, int spread, int num, int life, int bmp);
 
-#endif
\ No newline at end of file
+#endif
--- /dev/null	2006-11-03 08:26:09.036129000 +0100
+++ alex4src/src/unix.h	2006-11-03 13:26:37.000000000 +0100
@@ -0,0 +1,6 @@
+#ifdef __unix__
+
+char *get_homedir();
+int check_and_create_dir(const char *name);
+
+#endif
--- alex4src/src/scroller.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/scroller.h	2006-11-03 13:26:37.000000000 +0100
@@ -51,4 +51,4 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/map.c.unix	2003-07-28 18:50:36.000000000 +0200
+++ alex4src/src/map.c	2006-11-03 14:17:51.000000000 +0100
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "allegro.h"
 #include "map.h"
 #include "timer.h"
@@ -64,7 +65,41 @@
 
 	return m;
 }
-	
+
+static void mem_to_int(int *dest, unsigned char *mem)
+{
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	memcpy(dest, mem, 4);
+#else
+	*dest = mem[0] | (((int)mem[1]) << 8) | (((int)mem[2]) << 16) |
+		(((int)mem[3]) << 24);
+#endif
+}
+
+static void fread_int(int *dest, FILE *fp)
+{
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	fread(dest, 4, 1, fp);
+#else
+	unsigned char buf[4];
+	fread(buf, 1, 4, fp);
+	mem_to_int(dest, buf);
+#endif
+}
+
+static void fwrite_int(const int *src, FILE *fp)
+{
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+	fwrite(src, 4, 1, fp);
+#else
+	unsigned char buf[4];
+	buf[0] = *src;
+	buf[1] = *src >> 8;
+	buf[2] = *src >> 16;
+	buf[3] = *src >> 24;
+	fwrite(buf, 1, 4, fp);
+#endif
+}
 
 // loads one splendind map from disk
 Tmap *load_map(char *fname) {
@@ -93,7 +128,19 @@
 	}
 	
 	// read datastruct
-	fread(m, sizeof(Tmap), 1, fp);
+	// a mapfile contain a raw dump of the Tmap struct made on an i386
+	// the code below reads these struct dumps in an arch neutral manner
+	// Note this dumps contains pointers, these are not used because these
+	// ofcourse point to some no longer valid address.
+	fread(m, 64, 1, fp);             // first 64 bytes data
+	fread_int(&(m->width), fp);
+	fread_int(&(m->height), fp);
+	fread(header, 4, 1, fp);         // skip the first pointer
+	fread_int(&(m->offset_x), fp);
+	fread_int(&(m->offset_y), fp);
+	fread(header, 4, 1, fp);         // skip the second pointer
+	fread_int(&(m->start_x), fp);
+	fread_int(&(m->start_y), fp);
 
 	// read map data
 	m->dat = malloc(m->width * m->height * sizeof(Tmappos));
@@ -116,8 +163,8 @@
 // loads one splendind map from memory
 Tmap *load_map_from_memory(void *mem) {
 	Tmap *m;
-	char header[6];
-    char *c = (char *)mem;
+	unsigned char header[6];
+	unsigned char *c = (unsigned char *)mem;
 
 	
 	// does the header match?
@@ -137,9 +184,19 @@
 	}
 	
 	// read datastruct
-	// fread(m, sizeof(Tmap), 1, fp);
-	memcpy(m, c, sizeof(Tmap));
-    c += sizeof(Tmap);
+	// a mapfile contain a raw dump of the Tmap struct made on an i386
+	// the code below reads these struct dumps in an arch neutral manner
+	// Note this dumps contains pointers, these are not used because these
+	// ofcourse point to some no longer valid address.
+	memcpy(m, c, 64); c += 64;             // first 64 bytes data
+	mem_to_int(&(m->width), c);  c += 4;
+	mem_to_int(&(m->height), c); c += 4;
+	c += 4;	                               // skip the first pointer
+	mem_to_int(&(m->offset_x), c); c += 4;
+	mem_to_int(&(m->offset_y), c); c += 4;
+	c += 4;                                // skip the second pointer
+	mem_to_int(&(m->start_x), c); c+= 4;
+	mem_to_int(&(m->start_y), c); c+= 4;
 
 	// read map data
 	m->dat = malloc(m->width * m->height * sizeof(Tmappos));
@@ -174,7 +231,18 @@
 	fwrite(header, 6, 1, fp);
 
 	// write datastruct
-	fwrite(m, sizeof(Tmap), 1, fp);
+	// a mapfile should contain a raw dump of the Tmap struct as made on an
+	// i386 the code below writes a struct dump as an i386 in an arch
+	// neutral manner
+	fwrite(m, 64, 1, fp);             // first 64 bytes data
+	fwrite_int(&(m->width), fp);
+	fwrite_int(&(m->height), fp);
+	fwrite(header, 4, 1, fp);         // skip the first pointer
+	fwrite_int(&(m->offset_x), fp);
+	fwrite_int(&(m->offset_y), fp);
+	fwrite(header, 4, 1, fp);         // skip the second pointer
+	fwrite_int(&(m->start_x), fp);
+	fwrite_int(&(m->start_y), fp);
 
 	// write map data
 	fwrite(m->dat, sizeof(Tmappos), m->width * m->height, fp);
@@ -409,7 +477,7 @@
 	}
 
 	if (mask == 5 && oy > 31 - ox) return mask; // 45 degree slope / 
-	if (mask == 6 && oy > ox) return mask;		// 45 degree slope \
+	if (mask == 6 && oy > ox) return mask;		// 45 degree slope \ .
 
 	// the not so simple ones
 	if (mask == 3 && oy > 31 - ox / 2) return mask;	// 22 degree slope / (low)
--- alex4src/src/shooter.h.unix	2003-07-26 12:53:54.000000000 +0200
+++ alex4src/src/shooter.h	2006-11-03 13:26:37.000000000 +0100
@@ -83,8 +83,8 @@
 	int difficulty;
 
 	// player related
-	long unsigned int score;
-	long unsigned int show_score;
+	unsigned int score;
+	unsigned int show_score;
 	int lives;
 	int power_gauge;
 	int power_level;
@@ -118,4 +118,4 @@
 int start_shooter(Tcontrol *c, int with_sound);
 
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/timer.h.unix	2003-07-26 12:53:54.000000000 +0200
+++ alex4src/src/timer.h	2006-11-03 13:26:37.000000000 +0100
@@ -37,4 +37,4 @@
 void fps_counter(void);
 void cycle_counter(void);
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/main.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/main.h	2006-11-03 13:26:37.000000000 +0100
@@ -93,5 +93,8 @@
 #define check_bb_collision(x1,y1,w1,h1,x2,y2,w2,h2) (!( ((x1)>=(x2)+(w2)) || ((x2)>=(x1)+(w1)) || \
                                                         ((y1)>=(y2)+(h2)) || ((y2)>=(y1)+(h1)) ))
 
+#ifndef DATADIR
+#define DATADIR "data/"
+#endif
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/script.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/script.h	2006-11-03 13:26:37.000000000 +0100
@@ -51,4 +51,4 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/edit.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/edit.h	2006-11-03 13:26:37.000000000 +0100
@@ -37,4 +37,4 @@
 void draw_edit_mode(BITMAP *bmp, Tmap *map, int mx, int my);
 void update_edit_mode(Tmap *map, BITMAP *bmp, int mx, int my, int mb);
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/token.c.unix	2003-07-26 18:50:40.000000000 +0200
+++ alex4src/src/token.c	2006-11-03 13:26:37.000000000 +0100
@@ -67,7 +67,7 @@
 
 // tokenizes the string str
 Ttoken *tokenize(char *str) {
-    Ttoken *tok_list, *tok_tmp;
+    Ttoken *tok_list, *tok_tmp = NULL;
     char word[256];
     int a, b, c;
     int i = 0;
--- alex4src/src/hisc.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/hisc.h	2006-11-03 13:26:37.000000000 +0100
@@ -48,4 +48,4 @@
 void draw_hisc_post(Thisc *table, BITMAP *bmp, FONT *fnt, int x, int y, int color, int show_level);
 void draw_hisc_table(Thisc *table, BITMAP *bmp, FONT *fnt, int x, int y, int color, int show_level);
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/options.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/options.h	2006-11-03 13:26:37.000000000 +0100
@@ -43,4 +43,4 @@
 void load_options(Toptions *o, PACKFILE *fp);
 void reset_options(Toptions *o);
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/timer.c.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/timer.c	2006-11-03 13:26:37.000000000 +0100
@@ -60,4 +60,4 @@
 	game_count ++;
 
 	return TRUE;
-}
\ No newline at end of file
+}
--- alex4src/src/actor.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/actor.h	2006-11-03 13:26:37.000000000 +0100
@@ -91,4 +91,4 @@
 void kill_actor(Tactor *a);
 
 
-#endif
\ No newline at end of file
+#endif
--- alex4src/src/bullet.h.unix	2003-07-26 12:53:52.000000000 +0200
+++ alex4src/src/bullet.h	2006-11-03 13:26:37.000000000 +0100
@@ -52,4 +52,4 @@
 void update_bullet(Tbullet *b);
 void update_bullet_with_map(Tbullet *b, Tmap *m);
 
-#endif
\ No newline at end of file
+#endif


--- NEW FILE alex4.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Alex the Allegator 4
Comment=Old school platform game
Exec=alex4
Icon=alex4.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;


--- NEW FILE alex4.spec ---
Name:           alex4
Version:        1.0
Release:        2%{?dist}
Summary:        Alex the Allegator 4 - Platform game
Group:          Amusements/Games
License:        GPL
URL:            http://allegator.sourceforge.net/
Source0:        http://dl.sf.net/sourceforge/allegator/alex4src_data.zip
Source1:        alex4.desktop
Source2:        alex4.png
Patch0:         alex4-unix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel dumb-devel desktop-file-utils ImageMagick
Requires:       hicolor-icon-theme

%description
In the latest installment of the series Alex travels through the jungle in
search of his kidnapped girlfriend. Plenty of classic platforming in four
nice colors guaranteed!


%prep
%setup -q -n alex4src
%patch0 -p1 -z .unix
sed -i 's/\r//' *.txt


%build
pushd src
make %{?_smp_mflags} PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS -Wno-deprecated-declarations"
popd


%install
rm -rf $RPM_BUILD_ROOT
pushd src
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                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $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 license.txt readme.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Fri Nov  3 2006 Hans de Goede  1.0-2
- Updated alex4-unix.patch to take big endian machines into account when
  loading maps

* Thu Nov  2 2006 Hans de Goede  1.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alex4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Nov 2006 15:34:36 -0000	1.1
+++ .cvsignore	3 Nov 2006 15:35:24 -0000	1.2
@@ -0,0 +1 @@
+alex4src_data.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alex4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Nov 2006 15:34:36 -0000	1.1
+++ sources	3 Nov 2006 15:35:24 -0000	1.2
@@ -0,0 +1 @@
+c81b8e3813300a0cfbe828bcdff60fda  alex4src_data.zip



From fedora-extras-commits at redhat.com  Fri Nov  3 15:44:37 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 08:44:37 -0700
Subject: owners owners.list,1.1887,1.1888
Message-ID: <200611031544.kA3FibB3022511@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22493

Modified Files:
	owners.list 
Log Message:
added alex4


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1887
retrieving revision 1.1888
diff -u -r1.1887 -r1.1888
--- owners.list	3 Nov 2006 13:32:04 -0000	1.1887
+++ owners.list	3 Nov 2006 15:44:04 -0000	1.1888
@@ -35,6 +35,7 @@
 Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|akode|Audio-decoding framework|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|alacarte|Simple menu editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|foolish at guezz.net,jpmahowald at gmail.com
+Fedora Extras|alex4|Alex the Allegator 4 - Platform game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|alleggl|OpenGL support library for Allegro|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
 Fedora Extras|AllegroOGG|Ogg library for use with the Allegro game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov  3 16:09:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 09:09:46 -0700
Subject: rpms/nyquist - New directory
Message-ID: <200611031609.kA3G9kuH025635@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/nyquist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25631/nyquist

Log Message:
Directory /cvs/extras/rpms/nyquist added to the repository




From fedora-extras-commits at redhat.com  Fri Nov  3 16:09:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 09:09:52 -0700
Subject: rpms/nyquist/devel - New directory
Message-ID: <200611031609.kA3G9qbc025649@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/nyquist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25631/nyquist/devel

Log Message:
Directory /cvs/extras/rpms/nyquist/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov  3 16:10:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 09:10:13 -0700
Subject: rpms/nyquist Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611031610.kA3GADK7025688@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/nyquist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25682

Added Files:
	Makefile import.log 
Log Message:
Setup of module nyquist


--- NEW FILE Makefile ---
# Top level Makefile for module nyquist
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  Fri Nov  3 16:10:18 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 09:10:18 -0700
Subject: rpms/nyquist/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611031610.kA3GAIRq025710@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/nyquist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25682/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nyquist


--- 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  Fri Nov  3 16:21:27 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 09:21:27 -0700
Subject: rpms/nyquist import.log,1.1,1.2
Message-ID: <200611031621.kA3GLRqS025879@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/nyquist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25841

Modified Files:
	import.log 
Log Message:
auto-import nyquist-2.31-3 on branch devel from nyquist-2.31-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nyquist/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Nov 2006 16:10:12 -0000	1.1
+++ import.log	3 Nov 2006 16:20:57 -0000	1.2
@@ -0,0 +1 @@
+nyquist-2_31-3:HEAD:nyquist-2.31-3.src.rpm:1162570849



From fedora-extras-commits at redhat.com  Fri Nov  3 16:21:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 09:21:28 -0700
Subject: rpms/nyquist/devel nyqsrc231-pafix.patch, NONE, 1.1 nyquist.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611031621.kA3GLS7A025883@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/nyquist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25841/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nyqsrc231-pafix.patch nyquist.spec 
Log Message:
auto-import nyquist-2.31-3 on branch devel from nyquist-2.31-3.src.rpm

nyqsrc231-pafix.patch:

--- NEW FILE nyqsrc231-pafix.patch ---
--- nyquist/portaudio/pa_linux_alsa/pa_linux_alsa.c.pafix	2006-11-02 22:17:31.000000000 +0100
+++ nyquist/portaudio/pa_linux_alsa/pa_linux_alsa.c	2006-11-02 22:18:56.000000000 +0100
@@ -2248,7 +2248,7 @@
         playbackAvail = playbackAvail == 0 ? INT_MAX : playbackAvail;   /* Disregard if zero */
     }
     
-    assert( !(captureAvail == playbackAvail == INT_MAX) );
+    assert( !(captureAvail == INT_MAX && playbackAvail == INT_MAX) );
 
     commonAvail = MIN( captureAvail, playbackAvail );
     commonAvail -= commonAvail % stream->frames_per_period;


--- NEW FILE nyquist.spec ---
Name:           nyquist
Version:        2.31
Release:        3%{?dist}
Summary:        Sound synthesis and composition language with a Lisp syntax

Group:          Applications/Multimedia
License:        BSD
URL:            http://www-2.cs.cmu.edu/~music/music.software.html
Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc231.zip
Patch0:         nyqsrc231-pafix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel
BuildRequires:  dos2unix

%description
Nyquist is a language for sound synthesis and music
composition. Unlike score languages that tend to deal only with
events, or signal processing languages that tend to deal only with
signals and synthesis, Nyquist handles both in a single integrated
system. Nyquist is also flexible and easy to use because it is based
on an interactive Lisp interpreter.


%prep
%setup -q -n nyquist
%patch0 -p1
# remove cvs cruft
find -name CVS | xargs rm -fr
# add opt flags
sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile
sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile
# do not build with buggy readline support
sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile
# build with alsa
sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile
sed -i "s|^ALSA_OBJECTS =|ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o|" sys/unix/linux/Makefile
# change end-of-line
find -name "*.htm*" \
    -or -name "*.lsp" \
    -or -name "*.txt" \
    -or -name "*.ny" \
    -or -name "*.dat" | xargs dos2unix -q

%build
(cd misc; make %{?_smp_mflags})
make %{?_smp_mflags} -f sys/unix/linux/Makefile


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}

cp -pr runtime $RPM_BUILD_ROOT%{_datadir}/nyquist
cp -pr lib $RPM_BUILD_ROOT%{_datadir}/nyquist
cp -p ny $RPM_BUILD_ROOT%{_libexecdir}

cat > $RPM_BUILD_ROOT%{_bindir}/ny < - 2.31-3
- added patch for portaudio bug

* Thu Feb  2 2006 Gerard Milmeister  - 2.31-2
- new version 2.31

* Sat Mar 26 2005 Gerard Milmeister  - 2.30-1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nyquist/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Nov 2006 16:10:18 -0000	1.1
+++ .cvsignore	3 Nov 2006 16:20:57 -0000	1.2
@@ -0,0 +1 @@
+nyqsrc231.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nyquist/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Nov 2006 16:10:18 -0000	1.1
+++ sources	3 Nov 2006 16:20:57 -0000	1.2
@@ -0,0 +1 @@
+49ff7053ce76b11f61685f22fd068928  nyqsrc231.zip



From fedora-extras-commits at redhat.com  Fri Nov  3 16:36:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 09:36:23 -0700
Subject: owners owners.list,1.1888,1.1889
Message-ID: <200611031636.kA3GaNIJ026048@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26029

Modified Files:
	owners.list 
Log Message:
added nyquist


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1888
retrieving revision 1.1889
diff -u -r1.1888 -r1.1889
--- owners.list	3 Nov 2006 15:44:04 -0000	1.1888
+++ owners.list	3 Nov 2006 16:35:53 -0000	1.1889
@@ -1169,6 +1169,7 @@
 Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|numpy|A fast multidimensional array facility for Python|jwilson at redhat.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|nuttcp|A network performance measurement tool intended for use by network and system managers|rvokal at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|nyquist|Sound synthesis and composition language with a Lisp syntax|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|obby|A library which provides synced document buffers|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|obconf|A graphical configuration editor for the Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov  3 16:41:39 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 3 Nov 2006 09:41:39 -0700
Subject: rpms/lilypond/devel .cvsignore, 1.5, 1.6 lilypond.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611031641.kA3GfdwV026129@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26109

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 21:47:48 -0000	1.5
+++ .cvsignore	3 Nov 2006 16:41:08 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7.tar.gz
+lilypond-2.8.8.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lilypond.spec	9 Oct 2006 21:47:48 -0000	1.5
+++ lilypond.spec	3 Nov 2006 16:41:08 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		lilypond
-Version:	2.8.7
+Version:	2.8.8
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Quentin Spencer  2.8.8-1
+- New release.
+
 * Mon Oct  9 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 21:47:48 -0000	1.5
+++ sources	3 Nov 2006 16:41:08 -0000	1.6
@@ -1 +1 @@
-f2513f545adb211a256c21cc6b28ab3a  lilypond-2.8.7.tar.gz
+2fe58ff2fcbc848def46ef287a693189  lilypond-2.8.8.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 19:06:49 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 12:06:49 -0700
Subject: rpms/kmenu-gnome import.log,1.5,1.6
Message-ID: <200611031906.kA3J6nPb003808@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3773

Modified Files:
	import.log 
Log Message:
auto-import kmenu-gnome-0.6.1-2 on branch FC-6 from kmenu-gnome-0.6.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	15 Oct 2006 15:53:14 -0000	1.5
+++ import.log	3 Nov 2006 19:06:18 -0000	1.6
@@ -2,3 +2,4 @@
 kmenu-gnome-0_6-4:HEAD:kmenu-gnome-0.6-4.src.rpm:1157408049
 kmenu-gnome-0_6_0_1-2:FC-5:kmenu-gnome-0.6.0.1-2.src.rpm:1160927686
 kmenu-gnome-0_6_0_1-2:HEAD:kmenu-gnome-0.6.0.1-2.src.rpm:1160927814
+kmenu-gnome-0_6_1-2:FC-6:kmenu-gnome-0.6.1-2.src.rpm:1162581027



From fedora-extras-commits at redhat.com  Fri Nov  3 19:06:50 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 12:06:50 -0700
Subject: rpms/kmenu-gnome/FC-6 .cvsignore, 1.3, 1.4 kmenu-gnome.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200611031906.kA3J6ogr003813@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3773/FC-6

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Log Message:
auto-import kmenu-gnome-0.6.1-2 on branch FC-6 from kmenu-gnome-0.6.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2006 15:53:15 -0000	1.3
+++ .cvsignore	3 Nov 2006 19:06:19 -0000	1.4
@@ -1 +1 @@
-kmenu-gnome-0.6.0.1.tar.gz
+31025-kmenu-gnome-0.6.1.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/kmenu-gnome.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmenu-gnome.spec	15 Oct 2006 15:53:15 -0000	1.3
+++ kmenu-gnome.spec	3 Nov 2006 19:06:19 -0000	1.4
@@ -1,16 +1,15 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.0.1
+Version:    0.6.1
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
-#Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
-#Use local tarball until new release to fix #208788:
-Source:     %{name}-%{version}.tar.gz
+
+Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,13 +27,13 @@
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 mkdir -p %{buildroot}%{_icondir}/Bluecurve/{16x16,24x24,32x32,48x48}/apps
-mv %{name}/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
-mv %{name}/fc5-hide-bug196275.menu \
-%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+cp xdg/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275
+cp xdg/fc5-hide-bug196275.menu \
+%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
-#Ignore dangling-relative-symlink warnings
+#Ignore dangling-relative-symlink warnings:
 #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings
 ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps
 ln -s icon-office.png ooomain.png )
@@ -44,6 +43,7 @@
 ln -s icon-office.png ooomain.png )
 ( cd %{buildroot}%{_icondir}/Bluecurve/48x48/apps
 ln -s icon-office.png ooomain.png )
+#Stock icons
 ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps
 ln -s ../../../gnome/16x16/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/16x16/stock/net/stock_contact.png .
@@ -55,8 +55,6 @@
 ln -s ../../../gnome/32x32/stock/io/stock_print.png .
 ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
-ln -s ../../../gnome/48x48/apps/accessibility-directory.png .
-#ln -s ../../../gnome/48x48/apps/gnome-system.png .
 ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/48x48/stock/net/stock_contact.png .
 ln -s ../../../gnome/48x48/stock/io/stock_print.png . )
@@ -89,6 +87,13 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Nov 01 2006 Chitlesh Goorah - 0.6.1-2
+- New upstream release for FE
+
+* Sat Oct 28 2006 Ariszlo  - 0.6.1-1
+- Removed link to accessibility-directory.png
+- release 0.6.1
+
 * Sun Oct 15 2006 Chitlesh Goorah  - 0.6.0.1-2
 - Removed duplicate gnome-system.png
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2006 15:53:15 -0000	1.3
+++ sources	3 Nov 2006 19:06:19 -0000	1.4
@@ -1 +1 @@
-b0759e688cafd1dcfbe6c34e9e533e33  kmenu-gnome-0.6.0.1.tar.gz
+27425ea61069ece88565220033bd7cbb  31025-kmenu-gnome-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 19:08:30 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 12:08:30 -0700
Subject: rpms/kmenu-gnome import.log,1.6,1.7
Message-ID: <200611031908.kA3J8UWY003910@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3875

Modified Files:
	import.log 
Log Message:
auto-import kmenu-gnome-0.6.1-2 on branch FC-5 from kmenu-gnome-0.6.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	3 Nov 2006 19:06:18 -0000	1.6
+++ import.log	3 Nov 2006 19:07:59 -0000	1.7
@@ -3,3 +3,4 @@
 kmenu-gnome-0_6_0_1-2:FC-5:kmenu-gnome-0.6.0.1-2.src.rpm:1160927686
 kmenu-gnome-0_6_0_1-2:HEAD:kmenu-gnome-0.6.0.1-2.src.rpm:1160927814
 kmenu-gnome-0_6_1-2:FC-6:kmenu-gnome-0.6.1-2.src.rpm:1162581027
+kmenu-gnome-0_6_1-2:FC-5:kmenu-gnome-0.6.1-2.src.rpm:1162581127



From fedora-extras-commits at redhat.com  Fri Nov  3 19:08:30 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 12:08:30 -0700
Subject: rpms/kmenu-gnome/FC-5 .cvsignore, 1.3, 1.4 kmenu-gnome.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611031908.kA3J8Uu5003915@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3875/FC-5

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Log Message:
auto-import kmenu-gnome-0.6.1-2 on branch FC-5 from kmenu-gnome-0.6.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2006 15:51:07 -0000	1.3
+++ .cvsignore	3 Nov 2006 19:08:00 -0000	1.4
@@ -1 +1 @@
-kmenu-gnome-0.6.0.1.tar.gz
+31025-kmenu-gnome-0.6.1.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/kmenu-gnome.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmenu-gnome.spec	15 Oct 2006 15:51:07 -0000	1.2
+++ kmenu-gnome.spec	3 Nov 2006 19:08:00 -0000	1.3
@@ -1,16 +1,15 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.0.1
+Version:    0.6.1
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
-#Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
-#Use local tarball until new release to fix #208788:
-Source:     %{name}-%{version}.tar.gz
+
+Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,13 +27,13 @@
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 mkdir -p %{buildroot}%{_icondir}/Bluecurve/{16x16,24x24,32x32,48x48}/apps
-mv %{name}/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
-mv %{name}/fc5-hide-bug196275.menu \
-%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+cp xdg/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275
+cp xdg/fc5-hide-bug196275.menu \
+%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
-#Ignore dangling-relative-symlink warnings
+#Ignore dangling-relative-symlink warnings:
 #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings
 ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps
 ln -s icon-office.png ooomain.png )
@@ -44,6 +43,7 @@
 ln -s icon-office.png ooomain.png )
 ( cd %{buildroot}%{_icondir}/Bluecurve/48x48/apps
 ln -s icon-office.png ooomain.png )
+#Stock icons
 ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps
 ln -s ../../../gnome/16x16/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/16x16/stock/net/stock_contact.png .
@@ -55,8 +55,6 @@
 ln -s ../../../gnome/32x32/stock/io/stock_print.png .
 ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
-ln -s ../../../gnome/48x48/apps/accessibility-directory.png .
-#ln -s ../../../gnome/48x48/apps/gnome-system.png .
 ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/48x48/stock/net/stock_contact.png .
 ln -s ../../../gnome/48x48/stock/io/stock_print.png . )
@@ -89,6 +87,13 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Nov 01 2006 Chitlesh Goorah - 0.6.1-2
+- New upstream release for FE
+
+* Sat Oct 28 2006 Ariszlo  - 0.6.1-1
+- Removed link to accessibility-directory.png
+- release 0.6.1
+
 * Sun Oct 15 2006 Chitlesh Goorah  - 0.6.0.1-2
 - Removed duplicate gnome-system.png
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2006 15:51:07 -0000	1.3
+++ sources	3 Nov 2006 19:08:00 -0000	1.4
@@ -1 +1 @@
-b0759e688cafd1dcfbe6c34e9e533e33  kmenu-gnome-0.6.0.1.tar.gz
+27425ea61069ece88565220033bd7cbb  31025-kmenu-gnome-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 19:11:33 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 12:11:33 -0700
Subject: rpms/kmenu-gnome import.log,1.7,1.8
Message-ID: <200611031911.kA3JBX8o004068@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4028

Modified Files:
	import.log 
Log Message:
auto-import kmenu-gnome-0.6.1-2 on branch devel from kmenu-gnome-0.6.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	3 Nov 2006 19:07:59 -0000	1.7
+++ import.log	3 Nov 2006 19:11:03 -0000	1.8
@@ -4,3 +4,4 @@
 kmenu-gnome-0_6_0_1-2:HEAD:kmenu-gnome-0.6.0.1-2.src.rpm:1160927814
 kmenu-gnome-0_6_1-2:FC-6:kmenu-gnome-0.6.1-2.src.rpm:1162581027
 kmenu-gnome-0_6_1-2:FC-5:kmenu-gnome-0.6.1-2.src.rpm:1162581127
+kmenu-gnome-0_6_1-2:HEAD:kmenu-gnome-0.6.1-2.src.rpm:1162581312



From fedora-extras-commits at redhat.com  Fri Nov  3 19:11:34 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 12:11:34 -0700
Subject: rpms/kmenu-gnome/devel .cvsignore, 1.3, 1.4 kmenu-gnome.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200611031911.kA3JBYaH004073@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kmenu-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4028/devel

Modified Files:
	.cvsignore kmenu-gnome.spec sources 
Log Message:
auto-import kmenu-gnome-0.6.1-2 on branch devel from kmenu-gnome-0.6.1-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2006 15:53:15 -0000	1.3
+++ .cvsignore	3 Nov 2006 19:11:04 -0000	1.4
@@ -1 +1 @@
-kmenu-gnome-0.6.0.1.tar.gz
+31025-kmenu-gnome-0.6.1.tar.gz


Index: kmenu-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/kmenu-gnome.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmenu-gnome.spec	15 Oct 2006 15:53:15 -0000	1.3
+++ kmenu-gnome.spec	3 Nov 2006 19:11:04 -0000	1.4
@@ -1,16 +1,15 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:       kmenu-gnome
-Version:    0.6.0.1
+Version:    0.6.1
 Release:    2%{?dist}
 Summary:    K Menu with Gnome directory
 
 License:    GPL/LGPL
 Group:      User Interface/Desktops
 URL:        http://ariszlo.tripod.com
-#Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
-#Use local tarball until new release to fix #208788:
-Source:     %{name}-%{version}.tar.gz
+
+Source:     http://www.kde-look.org/content/files/31025-%{name}-%{version}.tar.gz
 
 BuildArchitectures: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,13 +27,13 @@
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 mkdir -p %{buildroot}%{_icondir}/Bluecurve/{16x16,24x24,32x32,48x48}/apps
-mv %{name}/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
-mv %{name}/fc5-hide-bug196275.menu \
-%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+cp xdg/%{name}.menu %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196275
+cp xdg/fc5-hide-bug196275.menu \
+%{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
 cp -pr desktop-directories icons %{name} %{buildroot}%{_datadir}
 
-#Ignore dangling-relative-symlink warnings
+#Ignore dangling-relative-symlink warnings:
 #http://qa.mandriva.com/twiki/bin/view/Main/PackagingProblems#RpmLint_Warnings
 ( cd %{buildroot}%{_icondir}/Bluecurve/16x16/apps
 ln -s icon-office.png ooomain.png )
@@ -44,6 +43,7 @@
 ln -s icon-office.png ooomain.png )
 ( cd %{buildroot}%{_icondir}/Bluecurve/48x48/apps
 ln -s icon-office.png ooomain.png )
+#Stock icons
 ( cd %{buildroot}%{_icondir}/crystalsvg/16x16/apps
 ln -s ../../../gnome/16x16/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/16x16/stock/net/stock_contact.png .
@@ -55,8 +55,6 @@
 ln -s ../../../gnome/32x32/stock/io/stock_print.png .
 ln -s ../../../gnome/24x24/stock/document/stock_task.png . )
 ( cd %{buildroot}%{_icondir}/crystalsvg/48x48/apps
-ln -s ../../../gnome/48x48/apps/accessibility-directory.png .
-#ln -s ../../../gnome/48x48/apps/gnome-system.png .
 ln -s ../../../gnome/48x48/stock/generic/stock_calendar.png .
 ln -s ../../../gnome/48x48/stock/net/stock_contact.png .
 ln -s ../../../gnome/48x48/stock/io/stock_print.png . )
@@ -89,6 +87,13 @@
 %doc ChangeLog COPYING GPL LGPL README
 
 %Changelog
+* Wed Nov 01 2006 Chitlesh Goorah - 0.6.1-2
+- New upstream release for FE
+
+* Sat Oct 28 2006 Ariszlo  - 0.6.1-1
+- Removed link to accessibility-directory.png
+- release 0.6.1
+
 * Sun Oct 15 2006 Chitlesh Goorah  - 0.6.0.1-2
 - Removed duplicate gnome-system.png
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmenu-gnome/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2006 15:53:15 -0000	1.3
+++ sources	3 Nov 2006 19:11:04 -0000	1.4
@@ -1 +1 @@
-b0759e688cafd1dcfbe6c34e9e533e33  kmenu-gnome-0.6.0.1.tar.gz
+27425ea61069ece88565220033bd7cbb  31025-kmenu-gnome-0.6.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:10:14 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:10:14 -0700
Subject: rpms/libgeda import.log,1.8,1.9
Message-ID: <200611032010.kA3KAEPw007939@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7839

Modified Files:
	import.log 
Log Message:
auto-import libgeda-20061020-1 on branch FC-5 from libgeda-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgeda/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	12 Oct 2006 18:44:00 -0000	1.8
+++ import.log	3 Nov 2006 20:09:44 -0000	1.9
@@ -5,3 +5,4 @@
 libgeda-20060906-2:HEAD:libgeda-20060906-2.src.rpm:1157923568
 libgeda-20060906-3:FC-5:libgeda-20060906-3.src.rpm:1160678794
 libgeda-20060906-3:HEAD:libgeda-20060906-3.src.rpm:1160678840
+libgeda-20061020-1:FC-5:libgeda-20061020-1.src.rpm:1162584824



From fedora-extras-commits at redhat.com  Fri Nov  3 20:10:15 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:10:15 -0700
Subject: rpms/libgeda/FC-5 .cvsignore, 1.4, 1.5 libgeda.spec, 1.4,
	1.5 sources, 1.4, 1.5 libgeda-20060906-arc.patch, 1.1,
	NONE libgeda-20060906-configure.patch, 1.1, NONE
Message-ID: <200611032010.kA3KAF3K007944@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7839/FC-5

Modified Files:
	.cvsignore libgeda.spec sources 
Removed Files:
	libgeda-20060906-arc.patch libgeda-20060906-configure.patch 
Log Message:
auto-import libgeda-20061020-1 on branch FC-5 from libgeda-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:20:03 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:09:45 -0000	1.5
@@ -1 +1 @@
-libgeda-20060906.tar.gz
+libgeda-20061020.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/libgeda.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgeda.spec	12 Oct 2006 18:43:15 -0000	1.4
+++ libgeda.spec	3 Nov 2006 20:09:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:            libgeda
-Version:         20060906
-Release:         3%{?dist}
+Version:         20061020
+Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
@@ -8,8 +8,8 @@
 URL:             http://www.geda.seul.org
 
 Source:          ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz
-Patch0:          %{name}-%{version}-arc.patch
-Patch1:          %{name}-%{version}-configure.patch
+#Patch0:          %{name}-%{version}-arc.patch
+#Patch1:          %{name}-%{version}-configure.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
@@ -44,8 +44,8 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b o_arc_basic.c
-%patch1 -p0 -b configure.ac
+#%patch0 -p0 -b o_arc_basic.c
+#%patch1 -p0 -b configure.ac
 
 %build
 
@@ -91,6 +91,9 @@
 
 
 %Changelog
+* Wed Nov 01 2006 Chitlesh Goorah  - 20061020-1
+- New upstreeam release
+
 * Wed Oct 11 2006 Chitlesh Goorah  - 20060906-3
 - Fixes Bug 210121 Printing does not produce correct post-script
 - Changed ownership of prolog.ps from libgeda-doc to libgeda


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:20:03 -0000	1.4
+++ sources	3 Nov 2006 20:09:45 -0000	1.5
@@ -1 +1 @@
-1199ba6a71f3c03081a82e19fa550bc3  libgeda-20060906.tar.gz
+3caf1aeee5627706b9abe54f6601a7dc  libgeda-20061020.tar.gz


--- libgeda-20060906-arc.patch DELETED ---


--- libgeda-20060906-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 20:10:26 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:10:26 -0700
Subject: rpms/geda-examples import.log,1.4,1.5
Message-ID: <200611032010.kA3KAQ8V008004@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7894

Modified Files:
	import.log 
Log Message:
auto-import geda-examples-20061020-1 on branch FC-5 from geda-examples-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	10 Sep 2006 21:48:25 -0000	1.4
+++ import.log	3 Nov 2006 20:09:56 -0000	1.5
@@ -1,3 +1,4 @@
 geda-examples-20060824-4:HEAD:geda-examples-20060824-4.src.rpm:1157536073
 geda-examples-20060906-1:FC-5:geda-examples-20060906-1.src.rpm:1157925033
 geda-examples-20060906-2:HEAD:geda-examples-20060906-2.src.rpm:1157925154
+geda-examples-20061020-1:FC-5:geda-examples-20061020-1.src.rpm:1162584846



From fedora-extras-commits at redhat.com  Fri Nov  3 20:10:27 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:10:27 -0700
Subject: rpms/geda-examples/FC-5 .cvsignore, 1.3, 1.4 geda-examples.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611032010.kA3KARbR008010@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7894/FC-5

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:
auto-import geda-examples-20061020-1 on branch FC-5 from geda-examples-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:46:58 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:09:57 -0000	1.4
@@ -1 +1 @@
-geda-examples-20060906.tar.gz
+geda-examples-20061020.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-5/geda-examples.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-examples.spec	10 Sep 2006 21:46:58 -0000	1.2
+++ geda-examples.spec	3 Nov 2006 20:09:57 -0000	1.3
@@ -1,7 +1,7 @@
 %define gedaexampledir %{_datadir}/gEDA/examples
 
 Name:       geda-examples
-Version:    20060906
+Version:    20061020
 Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
@@ -32,7 +32,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 #the above installs nothing, do this again manually
 %{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
@@ -82,6 +82,12 @@
 %{gedaexampledir}/RF_Amp
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream release
+
+* Sun Sep 10 2006 Chitlesh Goorah  - 20061006-2
+- Rebuilt for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
 - Upstream release 20060906
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:46:58 -0000	1.3
+++ sources	3 Nov 2006 20:09:57 -0000	1.4
@@ -1 +1 @@
-10860925e2ee1e26cceb03a49f8f21db  geda-examples-20060906.tar.gz
+6e469eff8e2ecbab525bc16c8e22253a  geda-examples-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:11:01 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:11:01 -0700
Subject: rpms/geda-gattrib import.log,1.4,1.5
Message-ID: <200611032011.kA3KB1Mk008113@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8018

Modified Files:
	import.log 
Log Message:
auto-import geda-gattrib-20061020-1 on branch devel from geda-gattrib-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	10 Sep 2006 21:47:34 -0000	1.4
+++ import.log	3 Nov 2006 20:10:31 -0000	1.5
@@ -1,3 +1,4 @@
 geda-gattrib-20060824-1:HEAD:geda-gattrib-20060824-1.src.rpm:1157469570
 geda-gattrib-20060906-1:FC-5:geda-gattrib-20060906-1.src.rpm:1157924925
 geda-gattrib-20060906-2:HEAD:geda-gattrib-20060906-2.src.rpm:1157925101
+geda-gattrib-20061020-1:HEAD:geda-gattrib-20061020-1.src.rpm:1162584880



From fedora-extras-commits at redhat.com  Fri Nov  3 20:11:02 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:11:02 -0700
Subject: rpms/geda-gattrib/devel .cvsignore, 1.3, 1.4 geda-gattrib.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611032011.kA3KB2KQ008120@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8018/devel

Modified Files:
	.cvsignore geda-gattrib.spec sources 
Log Message:
auto-import geda-gattrib-20061020-1 on branch devel from geda-gattrib-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:47:35 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:10:32 -0000	1.4
@@ -1 +1 @@
-geda-gattrib-20060906.tar.gz
+geda-gattrib-20061020.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/geda-gattrib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-gattrib.spec	10 Sep 2006 21:47:35 -0000	1.2
+++ geda-gattrib.spec	3 Nov 2006 20:10:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           geda-gattrib
-Version:        20060906
-Release:        2%{?dist}
+Version:        20061020
+Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
@@ -13,7 +13,8 @@
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils, autoconf
+BuildRequires:  libgeda-devel, desktop-file-utils
+#, autoconf
 Requires:       geda-symbols
 
 %description
@@ -30,23 +31,24 @@
 %setup -q
 
 %build
-%{__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
+#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
 
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make INSTALL="install -p" install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor=fedora \
     --add-category Engineering \
@@ -87,6 +89,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream Release
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
 - Rebuilt for FC-6 devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:47:35 -0000	1.3
+++ sources	3 Nov 2006 20:10:32 -0000	1.4
@@ -1 +1 @@
-c6fdafcf6e9e0278105e73778b50c857  geda-gattrib-20060906.tar.gz
+74295c8b0b0d78ebf0953673ecdfb28f  geda-gattrib-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:11:35 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:11:35 -0700
Subject: rpms/geda-gnetlist import.log,1.7,1.8
Message-ID: <200611032011.kA3KBZec008208@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8129

Modified Files:
	import.log 
Log Message:
auto-import geda-gnetlist-20061020-1 on branch FC-5 from geda-gnetlist-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	10 Sep 2006 21:47:32 -0000	1.7
+++ import.log	3 Nov 2006 20:11:05 -0000	1.8
@@ -4,3 +4,4 @@
 geda-gnetlist-20060824-2:HEAD:geda-gnetlist-20060824-2.src.rpm:1157471840
 geda-gnetlist-20060906-1:FC-5:geda-gnetlist-20060906-1.src.rpm:1157924899
 geda-gnetlist-20060906-2:HEAD:geda-gnetlist-20060906-2.src.rpm:1157925089
+geda-gnetlist-20061020-1:FC-5:geda-gnetlist-20061020-1.src.rpm:1162584914



From fedora-extras-commits at redhat.com  Fri Nov  3 20:11:36 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:11:36 -0700
Subject: rpms/geda-gnetlist/FC-5 .cvsignore, 1.4, 1.5 geda-gnetlist.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200611032011.kA3KBa21008214@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8129/FC-5

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:
auto-import geda-gnetlist-20061020-1 on branch FC-5 from geda-gnetlist-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:44:25 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:11:06 -0000	1.5
@@ -1 +1 @@
-geda-gnetlist-20060906.tar.gz
+geda-gnetlist-20061020.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-5/geda-gnetlist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geda-gnetlist.spec	10 Sep 2006 21:44:25 -0000	1.4
+++ geda-gnetlist.spec	3 Nov 2006 20:11:06 -0000	1.5
@@ -1,7 +1,7 @@
 %define gedadocdir %{_datadir}/gEDA/docs
 
 Name:           geda-gnetlist
-Version:        20060906
+Version:        20061020
 Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
@@ -74,6 +74,12 @@
 %{gedadocdir}/man/gnetlist.html
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- Upstream release 20061020
+
+* Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
+- Rebuilt for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
 - Upstream release 20060906
 
@@ -159,8 +165,8 @@
 - updated to version 20001006
 
 * Thu Aug 10 2000 Emmanuel Rouat 
-- added '*' as manpage extension since Mandrake compresss it with 
-bzip2 while redhat use gzip 
+- added '*' as manpage extension since Mandrake compresss it with
+bzip2 while redhat use gzip
 - rebuilt with latest rpm
 
 * Fri Jul  7 2000 Emmanuel Rouat 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:44:25 -0000	1.4
+++ sources	3 Nov 2006 20:11:06 -0000	1.5
@@ -1 +1 @@
-e70f4d1f2088d1b6516a205a041cdb9e  geda-gnetlist-20060906.tar.gz
+f9a06c48281b45cf70f4488a685339b0  geda-gnetlist-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:31 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:31 -0700
Subject: rpms/geda-gschem import.log,1.6,1.7
Message-ID: <200611032013.kA3KDVrO008581@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8341

Modified Files:
	import.log 
Log Message:
auto-import geda-gschem-20061020-1 on branch FC-5 from geda-gschem-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	12 Oct 2006 18:48:13 -0000	1.6
+++ import.log	3 Nov 2006 20:13:00 -0000	1.7
@@ -3,3 +3,4 @@
 geda-gschem-20060906-2:HEAD:geda-gschem-20060906-2.src.rpm:1157925079
 geda-gschem-20060906-3:FC-5:geda-gschem-20060906-3.src.rpm:1160679025
 geda-gschem-20060906-3:HEAD:geda-gschem-20060906-3.src.rpm:1160679092
+geda-gschem-20061020-1:FC-5:geda-gschem-20061020-1.src.rpm:1162585010



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:39 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:39 -0700
Subject: rpms/geda-symbols/FC-5 .cvsignore, 1.4, 1.5 geda-symbols.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <200611032013.kA3KDdsU008630@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8406/FC-5

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:
auto-import geda-symbols-20061020-1 on branch FC-5 from geda-symbols-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:41:05 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:13:08 -0000	1.5
@@ -1 +1 @@
-geda-symbols-20060906.tar.gz
+geda-symbols-20061020.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-5/geda-symbols.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-symbols.spec	10 Sep 2006 21:41:05 -0000	1.5
+++ geda-symbols.spec	3 Nov 2006 20:13:08 -0000	1.6
@@ -1,5 +1,5 @@
 Name:       geda-symbols
-Version:    20060906
+Version:    20061020
 Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
@@ -63,6 +63,12 @@
 %{_datadir}/gEDA/system-gafrc
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream release
+
+* Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
+- Rebuilt for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
 - Upstream release 20060906
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:41:05 -0000	1.4
+++ sources	3 Nov 2006 20:13:08 -0000	1.5
@@ -1 +1 @@
-43d938b2cfa45e039c69b1d7e00643d9  geda-symbols-20060906.tar.gz
+0cc22d0d36c5f2f1c09aa82eb6d0edf6  geda-symbols-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:39 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:39 -0700
Subject: rpms/geda-utils import.log,1.4,1.5
Message-ID: <200611032013.kA3KDdBj008638@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8423

Modified Files:
	import.log 
Log Message:
auto-import geda-utils-20061020-1 on branch FC-5 from geda-utils-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	10 Sep 2006 21:47:43 -0000	1.4
+++ import.log	3 Nov 2006 20:13:09 -0000	1.5
@@ -1,3 +1,4 @@
 geda-utils-20060824-2:HEAD:geda-utils-20060824-2.src.rpm:1157495617
 geda-utils-20060906-1:FC-5:geda-utils-20060906-1.src.rpm:1157924985
 geda-utils-20060906-2:HEAD:geda-utils-20060906-2.src.rpm:1157925111
+geda-utils-20061020-1:FC-5:geda-utils-20061020-1.src.rpm:1162585038



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:31 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:31 -0700
Subject: rpms/geda-gschem/FC-5 .cvsignore, 1.3, 1.4 geda-gschem.spec, 1.3,
	1.4 sources, 1.3, 1.4 geda-gschem-ru.po.diff, 1.1, NONE
Message-ID: <200611032013.kA3KDVvw008587@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-serv8341/FC-5

Modified Files:
	.cvsignore geda-gschem.spec sources 
Removed Files:
	geda-gschem-ru.po.diff 
Log Message:
auto-import geda-gschem-20061020-1 on branch FC-5 from geda-gschem-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:43:33 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:13:01 -0000	1.4
@@ -1 +1 @@
-geda-gschem-20060906.tar.gz
+geda-gschem-20061020.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-5/geda-gschem.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-gschem.spec	12 Oct 2006 18:47:07 -0000	1.3
+++ geda-gschem.spec	3 Nov 2006 20:13:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             geda-gschem
-Version:          20060906
-Release:          3%{?dist}
+Version:          20061020
+Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
@@ -13,7 +13,8 @@
 Source2:          gschem.xpm
 
 # by Andy Shevchenko #206280
-Patch0:           geda-gschem-ru.po.diff
+#TO BE TESTED
+#Patch0:           geda-gschem-ru.po.diff
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,26 +27,27 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b ru.po
+#%patch0 -p0 -b ru.po
 
 %build
-%{__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
+# 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
 
 %configure --with-docdir=%{_datadir}/gEDA/docs
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make INSTALL="install -p" install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 install -d %{buildroot}%{_datadir}/gEDA/examples
 install -d %{buildroot}%{_datadir}/gEDA/scheme
@@ -138,6 +140,9 @@
 
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New Upstream Release
+
 * Fri Sep 15 2006 Chitlesh Goorah  - 20060906-3
 - patch for russian translation by Andy Shevchenko #206280
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:43:33 -0000	1.3
+++ sources	3 Nov 2006 20:13:01 -0000	1.4
@@ -1 +1 @@
-8f224c572f30162928a9141b352c7558  geda-gschem-20060906.tar.gz
+c00d1692984d4fc89476beded6c2d571  geda-gschem-20061020.tar.gz


--- geda-gschem-ru.po.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:38 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:38 -0700
Subject: rpms/geda-symbols import.log,1.10,1.11
Message-ID: <200611032013.kA3KDc22008609@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8406

Modified Files:
	import.log 
Log Message:
auto-import geda-symbols-20061020-1 on branch FC-5 from geda-symbols-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	10 Sep 2006 21:43:25 -0000	1.10
+++ import.log	3 Nov 2006 20:13:07 -0000	1.11
@@ -7,3 +7,4 @@
 geda-symbols-20060824-2:HEAD:geda-symbols-20060824-2.src.rpm:1157471543
 geda-symbols-20060906-1:FC-5:geda-symbols-20060906-1.src.rpm:1157924713
 geda-symbols-20060906-2:HEAD:geda-symbols-20060906-2.src.rpm:1157924853
+geda-symbols-20061020-1:FC-5:geda-symbols-20061020-1.src.rpm:1162585037



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:44 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:44 -0700
Subject: rpms/geda-utils/FC-5 .cvsignore, 1.3, 1.4 geda-utils.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611032013.kA3KDido008691@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8423/FC-5

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:
auto-import geda-utils-20061020-1 on branch FC-5 from geda-utils-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:46:25 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:13:14 -0000	1.4
@@ -1 +1 @@
-geda-utils-20060906.tar.gz
+geda-utils-20061020.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-5/geda-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-utils.spec	10 Sep 2006 21:46:25 -0000	1.2
+++ geda-utils.spec	3 Nov 2006 20:13:14 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           geda-utils
-Version:        20060906
+Version:        20061020
 Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
@@ -65,6 +65,12 @@
 %{_datadir}/gEDA/docs/readmes/README*
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New Upstream Release
+
+* Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
+- Rebuild for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
 - Upstream release 20060906
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:46:25 -0000	1.3
+++ sources	3 Nov 2006 20:13:14 -0000	1.4
@@ -1 +1 @@
-452326bae9bee19722da2627f0ea05d8  geda-utils-20060906.tar.gz
+d54b7dc1e8c91dbc6aef94ee5dcf65a1  geda-utils-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:46 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:46 -0700
Subject: rpms/geda-gattrib import.log,1.5,1.6
Message-ID: <200611032013.kA3KDkU5008713@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8493

Modified Files:
	import.log 
Log Message:
auto-import geda-gattrib-20061020-1 on branch FC-5 from geda-gattrib-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	3 Nov 2006 20:10:31 -0000	1.5
+++ import.log	3 Nov 2006 20:13:16 -0000	1.6
@@ -2,3 +2,4 @@
 geda-gattrib-20060906-1:FC-5:geda-gattrib-20060906-1.src.rpm:1157924925
 geda-gattrib-20060906-2:HEAD:geda-gattrib-20060906-2.src.rpm:1157925101
 geda-gattrib-20061020-1:HEAD:geda-gattrib-20061020-1.src.rpm:1162584880
+geda-gattrib-20061020-1:FC-5:geda-gattrib-20061020-1.src.rpm:1162585044



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:47 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:47 -0700
Subject: rpms/geda-examples import.log,1.5,1.6
Message-ID: <200611032013.kA3KDlVK008717@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8494

Modified Files:
	import.log 
Log Message:
auto-import geda-examples-20061020-1 on branch FC-6 from geda-examples-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	3 Nov 2006 20:09:56 -0000	1.5
+++ import.log	3 Nov 2006 20:13:16 -0000	1.6
@@ -2,3 +2,4 @@
 geda-examples-20060906-1:FC-5:geda-examples-20060906-1.src.rpm:1157925033
 geda-examples-20060906-2:HEAD:geda-examples-20060906-2.src.rpm:1157925154
 geda-examples-20061020-1:FC-5:geda-examples-20061020-1.src.rpm:1162584846
+geda-examples-20061020-1:FC-6:geda-examples-20061020-1.src.rpm:1162585045



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:47 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:47 -0700
Subject: rpms/geda-gattrib/FC-5 .cvsignore, 1.3, 1.4 geda-gattrib.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <200611032013.kA3KDlOT008723@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-serv8493/FC-5

Modified Files:
	.cvsignore geda-gattrib.spec sources 
Log Message:
auto-import geda-gattrib-20061020-1 on branch FC-5 from geda-gattrib-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:44:53 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:13:17 -0000	1.4
@@ -1 +1 @@
-geda-gattrib-20060906.tar.gz
+geda-gattrib-20061020.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-5/geda-gattrib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-gattrib.spec	10 Sep 2006 21:44:53 -0000	1.2
+++ geda-gattrib.spec	3 Nov 2006 20:13:17 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           geda-gattrib
-Version:        20060906
+Version:        20061020
 Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
@@ -13,7 +13,8 @@
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils, autoconf
+BuildRequires:  libgeda-devel, desktop-file-utils
+#, autoconf
 Requires:       geda-symbols
 
 %description
@@ -30,23 +31,24 @@
 %setup -q
 
 %build
-%{__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
+#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
 
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make INSTALL="install -p" install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor=fedora \
     --add-category Engineering \
@@ -87,6 +89,12 @@
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream Release
+
+* Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
+- Rebuilt for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
 - Upstream release 20060906
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:44:53 -0000	1.3
+++ sources	3 Nov 2006 20:13:17 -0000	1.4
@@ -1 +1 @@
-c6fdafcf6e9e0278105e73778b50c857  geda-gattrib-20060906.tar.gz
+74295c8b0b0d78ebf0953673ecdfb28f  geda-gattrib-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:13:48 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:13:48 -0700
Subject: rpms/geda-examples/FC-6 .cvsignore, 1.3, 1.4 geda-examples.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611032013.kA3KDmER008728@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8494/FC-6

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:
auto-import geda-examples-20061020-1 on branch FC-6 from geda-examples-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:48:26 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:13:18 -0000	1.4
@@ -1 +1 @@
-geda-examples-20060906.tar.gz
+geda-examples-20061020.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/geda-examples.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-examples.spec	10 Sep 2006 21:48:26 -0000	1.2
+++ geda-examples.spec	3 Nov 2006 20:13:18 -0000	1.3
@@ -1,8 +1,8 @@
 %define gedaexampledir %{_datadir}/gEDA/examples
 
 Name:       geda-examples
-Version:    20060906
-Release:    2%{?dist}
+Version:    20061020
+Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
 Group:      Applications/Engineering
@@ -32,7 +32,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 #the above installs nothing, do this again manually
 %{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
@@ -82,7 +82,10 @@
 %{gedaexampledir}/RF_Amp
 
 %Changelog
-* Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream release
+
+* Sun Sep 10 2006 Chitlesh Goorah  - 20061006-2
 - Rebuilt for FC-6 devel
 
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:48:26 -0000	1.3
+++ sources	3 Nov 2006 20:13:18 -0000	1.4
@@ -1 +1 @@
-10860925e2ee1e26cceb03a49f8f21db  geda-examples-20060906.tar.gz
+6e469eff8e2ecbab525bc16c8e22253a  geda-examples-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:14:08 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:14:08 -0700
Subject: rpms/geda-gnetlist import.log,1.8,1.9
Message-ID: <200611032014.kA3KE8nH008858@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8593

Modified Files:
	import.log 
Log Message:
auto-import geda-gnetlist-20061020-1 on branch FC-6 from geda-gnetlist-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	3 Nov 2006 20:11:05 -0000	1.8
+++ import.log	3 Nov 2006 20:13:37 -0000	1.9
@@ -5,3 +5,4 @@
 geda-gnetlist-20060906-1:FC-5:geda-gnetlist-20060906-1.src.rpm:1157924899
 geda-gnetlist-20060906-2:HEAD:geda-gnetlist-20060906-2.src.rpm:1157925089
 geda-gnetlist-20061020-1:FC-5:geda-gnetlist-20061020-1.src.rpm:1162584914
+geda-gnetlist-20061020-1:FC-6:geda-gnetlist-20061020-1.src.rpm:1162585064



From fedora-extras-commits at redhat.com  Fri Nov  3 20:14:09 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:14:09 -0700
Subject: rpms/libgeda import.log,1.9,1.10
Message-ID: <200611032014.kA3KE9ZH008866@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8602

Modified Files:
	import.log 
Log Message:
auto-import libgeda-20061020-1 on branch FC-6 from libgeda-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgeda/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	3 Nov 2006 20:09:44 -0000	1.9
+++ import.log	3 Nov 2006 20:13:39 -0000	1.10
@@ -6,3 +6,4 @@
 libgeda-20060906-3:FC-5:libgeda-20060906-3.src.rpm:1160678794
 libgeda-20060906-3:HEAD:libgeda-20060906-3.src.rpm:1160678840
 libgeda-20061020-1:FC-5:libgeda-20061020-1.src.rpm:1162584824
+libgeda-20061020-1:FC-6:libgeda-20061020-1.src.rpm:1162585066



From fedora-extras-commits at redhat.com  Fri Nov  3 20:14:08 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:14:08 -0700
Subject: rpms/geda-gnetlist/FC-6 .cvsignore, 1.4, 1.5 geda-gnetlist.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200611032014.kA3KE8K3008863@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8593/FC-6

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:
auto-import geda-gnetlist-20061020-1 on branch FC-6 from geda-gnetlist-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:47:33 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:13:38 -0000	1.5
@@ -1 +1 @@
-geda-gnetlist-20060906.tar.gz
+geda-gnetlist-20061020.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/geda-gnetlist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geda-gnetlist.spec	10 Sep 2006 21:47:33 -0000	1.4
+++ geda-gnetlist.spec	3 Nov 2006 20:13:38 -0000	1.5
@@ -1,8 +1,8 @@
 %define gedadocdir %{_datadir}/gEDA/docs
 
 Name:           geda-gnetlist
-Version:        20060906
-Release:        2%{?dist}
+Version:        20061020
+Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
 Group:          Applications/Engineering
@@ -74,6 +74,9 @@
 %{gedadocdir}/man/gnetlist.html
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- Upstream release 20061020
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
 - Rebuilt for FC-6 devel
 
@@ -162,8 +165,8 @@
 - updated to version 20001006
 
 * Thu Aug 10 2000 Emmanuel Rouat 
-- added '*' as manpage extension since Mandrake compresss it with 
-bzip2 while redhat use gzip 
+- added '*' as manpage extension since Mandrake compresss it with
+bzip2 while redhat use gzip
 - rebuilt with latest rpm
 
 * Fri Jul  7 2000 Emmanuel Rouat 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:47:33 -0000	1.4
+++ sources	3 Nov 2006 20:13:38 -0000	1.5
@@ -1 +1 @@
-e70f4d1f2088d1b6516a205a041cdb9e  geda-gnetlist-20060906.tar.gz
+f9a06c48281b45cf70f4488a685339b0  geda-gnetlist-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:14:15 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:14:15 -0700
Subject: rpms/libgeda/FC-6 .cvsignore, 1.4, 1.5 libgeda.spec, 1.4,
	1.5 sources, 1.4, 1.5 libgeda-20060906-arc.patch, 1.1,
	NONE libgeda-20060906-configure.patch, 1.1, NONE
Message-ID: <200611032014.kA3KEF92008907@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8602/FC-6

Modified Files:
	.cvsignore libgeda.spec sources 
Removed Files:
	libgeda-20060906-arc.patch libgeda-20060906-configure.patch 
Log Message:
auto-import libgeda-20061020-1 on branch FC-6 from libgeda-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:22:00 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:13:45 -0000	1.5
@@ -1 +1 @@
-libgeda-20060906.tar.gz
+libgeda-20061020.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/libgeda.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgeda.spec	12 Oct 2006 18:44:01 -0000	1.4
+++ libgeda.spec	3 Nov 2006 20:13:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:            libgeda
-Version:         20060906
-Release:         3%{?dist}
+Version:         20061020
+Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
@@ -8,8 +8,8 @@
 URL:             http://www.geda.seul.org
 
 Source:          ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz
-Patch0:          %{name}-%{version}-arc.patch
-Patch1:          %{name}-%{version}-configure.patch
+#Patch0:          %{name}-%{version}-arc.patch
+#Patch1:          %{name}-%{version}-configure.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
@@ -44,8 +44,8 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b o_arc_basic.c
-%patch1 -p0 -b configure.ac
+#%patch0 -p0 -b o_arc_basic.c
+#%patch1 -p0 -b configure.ac
 
 %build
 
@@ -91,6 +91,9 @@
 
 
 %Changelog
+* Wed Nov 01 2006 Chitlesh Goorah  - 20061020-1
+- New upstreeam release
+
 * Wed Oct 11 2006 Chitlesh Goorah  - 20060906-3
 - Fixes Bug 210121 Printing does not produce correct post-script
 - Changed ownership of prolog.ps from libgeda-doc to libgeda


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:22:01 -0000	1.4
+++ sources	3 Nov 2006 20:13:45 -0000	1.5
@@ -1 +1 @@
-1199ba6a71f3c03081a82e19fa550bc3  libgeda-20060906.tar.gz
+3caf1aeee5627706b9abe54f6601a7dc  libgeda-20061020.tar.gz


--- libgeda-20060906-arc.patch DELETED ---


--- libgeda-20060906-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:35 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:35 -0700
Subject: rpms/geda-gattrib import.log,1.6,1.7
Message-ID: <200611032015.kA3KFZ6a009333@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gattrib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9088

Modified Files:
	import.log 
Log Message:
auto-import geda-gattrib-20061020-1 on branch FC-6 from geda-gattrib-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	3 Nov 2006 20:13:16 -0000	1.6
+++ import.log	3 Nov 2006 20:15:05 -0000	1.7
@@ -3,3 +3,4 @@
 geda-gattrib-20060906-2:HEAD:geda-gattrib-20060906-2.src.rpm:1157925101
 geda-gattrib-20061020-1:HEAD:geda-gattrib-20061020-1.src.rpm:1162584880
 geda-gattrib-20061020-1:FC-5:geda-gattrib-20061020-1.src.rpm:1162585044
+geda-gattrib-20061020-1:FC-6:geda-gattrib-20061020-1.src.rpm:1162585153



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:36 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:36 -0700
Subject: rpms/geda-gattrib/FC-6 .cvsignore, 1.3, 1.4 geda-gattrib.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <200611032015.kA3KFajJ009339@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-serv9088/FC-6

Modified Files:
	.cvsignore geda-gattrib.spec sources 
Log Message:
auto-import geda-gattrib-20061020-1 on branch FC-6 from geda-gattrib-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:47:35 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:15:06 -0000	1.4
@@ -1 +1 @@
-geda-gattrib-20060906.tar.gz
+geda-gattrib-20061020.tar.gz


Index: geda-gattrib.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/geda-gattrib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-gattrib.spec	10 Sep 2006 21:47:35 -0000	1.2
+++ geda-gattrib.spec	3 Nov 2006 20:15:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           geda-gattrib
-Version:        20060906
-Release:        2%{?dist}
+Version:        20061020
+Release:        1%{?dist}
 
 Summary:        Attribute editor for gEDA
 Group:          Applications/Engineering
@@ -13,7 +13,8 @@
 Source2:        gattrib.xpm
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgeda-devel, desktop-file-utils, autoconf
+BuildRequires:  libgeda-devel, desktop-file-utils
+#, autoconf
 Requires:       geda-symbols
 
 %description
@@ -30,23 +31,24 @@
 %setup -q
 
 %build
-%{__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
+#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
 
 %configure
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make INSTALL="install -p" install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor=fedora \
     --add-category Engineering \
@@ -87,6 +89,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/gattrib.xpm
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream Release
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
 - Rebuilt for FC-6 devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gattrib/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:47:35 -0000	1.3
+++ sources	3 Nov 2006 20:15:06 -0000	1.4
@@ -1 +1 @@
-c6fdafcf6e9e0278105e73778b50c857  geda-gattrib-20060906.tar.gz
+74295c8b0b0d78ebf0953673ecdfb28f  geda-gattrib-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:32 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:32 -0700
Subject: rpms/geda-gschem import.log,1.7,1.8
Message-ID: <200611032015.kA3KFWaB009288@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9041

Modified Files:
	import.log 
Log Message:
auto-import geda-gschem-20061020-1 on branch FC-6 from geda-gschem-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	3 Nov 2006 20:13:00 -0000	1.7
+++ import.log	3 Nov 2006 20:15:02 -0000	1.8
@@ -4,3 +4,4 @@
 geda-gschem-20060906-3:FC-5:geda-gschem-20060906-3.src.rpm:1160679025
 geda-gschem-20060906-3:HEAD:geda-gschem-20060906-3.src.rpm:1160679092
 geda-gschem-20061020-1:FC-5:geda-gschem-20061020-1.src.rpm:1162585010
+geda-gschem-20061020-1:FC-6:geda-gschem-20061020-1.src.rpm:1162585139



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:33 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:33 -0700
Subject: rpms/geda-gschem/FC-6 .cvsignore, 1.3, 1.4 geda-gschem.spec, 1.3,
	1.4 sources, 1.3, 1.4 geda-gschem-ru.po.diff, 1.1, NONE
Message-ID: <200611032015.kA3KFXcn009294@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-serv9041/FC-6

Modified Files:
	.cvsignore geda-gschem.spec sources 
Removed Files:
	geda-gschem-ru.po.diff 
Log Message:
auto-import geda-gschem-20061020-1 on branch FC-6 from geda-gschem-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:47:14 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:15:02 -0000	1.4
@@ -1 +1 @@
-geda-gschem-20060906.tar.gz
+geda-gschem-20061020.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/geda-gschem.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-gschem.spec	12 Oct 2006 18:48:14 -0000	1.3
+++ geda-gschem.spec	3 Nov 2006 20:15:02 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             geda-gschem
-Version:          20060906
-Release:          3%{?dist}
+Version:          20061020
+Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
@@ -13,7 +13,8 @@
 Source2:          gschem.xpm
 
 # by Andy Shevchenko #206280
-Patch0:           geda-gschem-ru.po.diff
+#TO BE TESTED
+#Patch0:           geda-gschem-ru.po.diff
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,26 +27,27 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b ru.po
+#%patch0 -p0 -b ru.po
 
 %build
-%{__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
+# 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
 
 %configure --with-docdir=%{_datadir}/gEDA/docs
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make INSTALL="install -p" install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 install -d %{buildroot}%{_datadir}/gEDA/examples
 install -d %{buildroot}%{_datadir}/gEDA/scheme
@@ -138,6 +140,9 @@
 
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New Upstream Release
+
 * Fri Sep 15 2006 Chitlesh Goorah  - 20060906-3
 - patch for russian translation by Andy Shevchenko #206280
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:47:14 -0000	1.3
+++ sources	3 Nov 2006 20:15:02 -0000	1.4
@@ -1 +1 @@
-8f224c572f30162928a9141b352c7558  geda-gschem-20060906.tar.gz
+c00d1692984d4fc89476beded6c2d571  geda-gschem-20061020.tar.gz


--- geda-gschem-ru.po.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:45 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:45 -0700
Subject: rpms/geda-examples import.log,1.6,1.7
Message-ID: <200611032015.kA3KFjxG009408@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9158

Modified Files:
	import.log 
Log Message:
auto-import geda-examples-20061020-1 on branch devel from geda-examples-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	3 Nov 2006 20:13:16 -0000	1.6
+++ import.log	3 Nov 2006 20:15:15 -0000	1.7
@@ -3,3 +3,4 @@
 geda-examples-20060906-2:HEAD:geda-examples-20060906-2.src.rpm:1157925154
 geda-examples-20061020-1:FC-5:geda-examples-20061020-1.src.rpm:1162584846
 geda-examples-20061020-1:FC-6:geda-examples-20061020-1.src.rpm:1162585045
+geda-examples-20061020-1:HEAD:geda-examples-20061020-1.src.rpm:1162585164



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:46 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:46 -0700
Subject: rpms/geda-examples/devel .cvsignore, 1.3, 1.4 geda-examples.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611032015.kA3KFkRj009419@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-examples/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9158/devel

Modified Files:
	.cvsignore geda-examples.spec sources 
Log Message:
auto-import geda-examples-20061020-1 on branch devel from geda-examples-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:48:26 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:15:15 -0000	1.4
@@ -1 +1 @@
-geda-examples-20060906.tar.gz
+geda-examples-20061020.tar.gz


Index: geda-examples.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/geda-examples.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-examples.spec	10 Sep 2006 21:48:26 -0000	1.2
+++ geda-examples.spec	3 Nov 2006 20:15:15 -0000	1.3
@@ -1,8 +1,8 @@
 %define gedaexampledir %{_datadir}/gEDA/examples
 
 Name:       geda-examples
-Version:    20060906
-Release:    2%{?dist}
+Version:    20061020
+Release:    1%{?dist}
 
 Summary:    Circuit examples for gEDA
 Group:      Applications/Engineering
@@ -32,7 +32,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 #the above installs nothing, do this again manually
 %{__install} -d %{buildroot}%{gedaexampledir}/lightning_detector/
@@ -82,7 +82,10 @@
 %{gedaexampledir}/RF_Amp
 
 %Changelog
-* Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream release
+
+* Sun Sep 10 2006 Chitlesh Goorah  - 20061006-2
 - Rebuilt for FC-6 devel
 
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-examples/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:48:26 -0000	1.3
+++ sources	3 Nov 2006 20:15:15 -0000	1.4
@@ -1 +1 @@
-10860925e2ee1e26cceb03a49f8f21db  geda-examples-20060906.tar.gz
+6e469eff8e2ecbab525bc16c8e22253a  geda-examples-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:51 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:51 -0700
Subject: rpms/geda-utils import.log,1.5,1.6
Message-ID: <200611032015.kA3KFp9h009462@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9208

Modified Files:
	import.log 
Log Message:
auto-import geda-utils-20061020-1 on branch FC-6 from geda-utils-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	3 Nov 2006 20:13:09 -0000	1.5
+++ import.log	3 Nov 2006 20:15:21 -0000	1.6
@@ -2,3 +2,4 @@
 geda-utils-20060906-1:FC-5:geda-utils-20060906-1.src.rpm:1157924985
 geda-utils-20060906-2:HEAD:geda-utils-20060906-2.src.rpm:1157925111
 geda-utils-20061020-1:FC-5:geda-utils-20061020-1.src.rpm:1162585038
+geda-utils-20061020-1:FC-6:geda-utils-20061020-1.src.rpm:1162585170



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:52 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:52 -0700
Subject: rpms/geda-symbols import.log,1.11,1.12
Message-ID: <200611032015.kA3KFqcS009480@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9209

Modified Files:
	import.log 
Log Message:
auto-import geda-symbols-20061020-1 on branch FC-6 from geda-symbols-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	3 Nov 2006 20:13:07 -0000	1.11
+++ import.log	3 Nov 2006 20:15:21 -0000	1.12
@@ -8,3 +8,4 @@
 geda-symbols-20060906-1:FC-5:geda-symbols-20060906-1.src.rpm:1157924713
 geda-symbols-20060906-2:HEAD:geda-symbols-20060906-2.src.rpm:1157924853
 geda-symbols-20061020-1:FC-5:geda-symbols-20061020-1.src.rpm:1162585037
+geda-symbols-20061020-1:FC-6:geda-symbols-20061020-1.src.rpm:1162585170



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:52 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:52 -0700
Subject: rpms/geda-utils/FC-6 .cvsignore, 1.3, 1.4 geda-utils.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611032015.kA3KFqbu009483@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9208/FC-6

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:
auto-import geda-utils-20061020-1 on branch FC-6 from geda-utils-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:47:44 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:15:22 -0000	1.4
@@ -1 +1 @@
-geda-utils-20060906.tar.gz
+geda-utils-20061020.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/geda-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-utils.spec	10 Sep 2006 21:47:44 -0000	1.2
+++ geda-utils.spec	3 Nov 2006 20:15:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           geda-utils
-Version:        20060906
-Release:        2%{?dist}
+Version:        20061020
+Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
@@ -65,6 +65,9 @@
 %{_datadir}/gEDA/docs/readmes/README*
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New Upstream Release
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
 - Rebuild for FC-6 devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:47:44 -0000	1.3
+++ sources	3 Nov 2006 20:15:22 -0000	1.4
@@ -1 +1 @@
-452326bae9bee19722da2627f0ea05d8  geda-utils-20060906.tar.gz
+d54b7dc1e8c91dbc6aef94ee5dcf65a1  geda-utils-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:15:58 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:15:58 -0700
Subject: rpms/geda-symbols/FC-6 .cvsignore, 1.4, 1.5 geda-symbols.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <200611032015.kA3KFwnH009499@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9209/FC-6

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:
auto-import geda-symbols-20061020-1 on branch FC-6 from geda-symbols-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:43:26 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:15:28 -0000	1.5
@@ -1 +1 @@
-geda-symbols-20060906.tar.gz
+geda-symbols-20061020.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/geda-symbols.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-symbols.spec	10 Sep 2006 21:43:26 -0000	1.5
+++ geda-symbols.spec	3 Nov 2006 20:15:28 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       geda-symbols
-Version:    20060906
-Release:    2%{?dist}
+Version:    20061020
+Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
 Group:      Applications/Engineering
@@ -63,6 +63,9 @@
 %{_datadir}/gEDA/system-gafrc
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream release
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
 - Rebuilt for FC-6 devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:43:26 -0000	1.4
+++ sources	3 Nov 2006 20:15:28 -0000	1.5
@@ -1 +1 @@
-43d938b2cfa45e039c69b1d7e00643d9  geda-symbols-20060906.tar.gz
+0cc22d0d36c5f2f1c09aa82eb6d0edf6  geda-symbols-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:16:04 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:16:04 -0700
Subject: rpms/geda-gnetlist/devel .cvsignore, 1.4, 1.5 geda-gnetlist.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611032016.kA3KG4lr009567@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9289/devel

Modified Files:
	.cvsignore geda-gnetlist.spec sources 
Log Message:
auto-import geda-gnetlist-20061020-1 on branch devel from geda-gnetlist-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:47:33 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:15:34 -0000	1.5
@@ -1 +1 @@
-geda-gnetlist-20060906.tar.gz
+geda-gnetlist-20061020.tar.gz


Index: geda-gnetlist.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/geda-gnetlist.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geda-gnetlist.spec	10 Sep 2006 21:47:33 -0000	1.4
+++ geda-gnetlist.spec	3 Nov 2006 20:15:34 -0000	1.5
@@ -1,8 +1,8 @@
 %define gedadocdir %{_datadir}/gEDA/docs
 
 Name:           geda-gnetlist
-Version:        20060906
-Release:        2%{?dist}
+Version:        20061020
+Release:        1%{?dist}
 
 Summary:        Netlister for the gEDA project
 Group:          Applications/Engineering
@@ -74,6 +74,9 @@
 %{gedadocdir}/man/gnetlist.html
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- Upstream release 20061020
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
 - Rebuilt for FC-6 devel
 
@@ -162,8 +165,8 @@
 - updated to version 20001006
 
 * Thu Aug 10 2000 Emmanuel Rouat 
-- added '*' as manpage extension since Mandrake compresss it with 
-bzip2 while redhat use gzip 
+- added '*' as manpage extension since Mandrake compresss it with
+bzip2 while redhat use gzip
 - rebuilt with latest rpm
 
 * Fri Jul  7 2000 Emmanuel Rouat 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:47:33 -0000	1.4
+++ sources	3 Nov 2006 20:15:34 -0000	1.5
@@ -1 +1 @@
-e70f4d1f2088d1b6516a205a041cdb9e  geda-gnetlist-20060906.tar.gz
+f9a06c48281b45cf70f4488a685339b0  geda-gnetlist-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:16:03 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:16:03 -0700
Subject: rpms/geda-gnetlist import.log,1.9,1.10
Message-ID: <200611032016.kA3KG3HK009561@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gnetlist
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9289

Modified Files:
	import.log 
Log Message:
auto-import geda-gnetlist-20061020-1 on branch devel from geda-gnetlist-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gnetlist/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	3 Nov 2006 20:13:37 -0000	1.9
+++ import.log	3 Nov 2006 20:15:33 -0000	1.10
@@ -6,3 +6,4 @@
 geda-gnetlist-20060906-2:HEAD:geda-gnetlist-20060906-2.src.rpm:1157925089
 geda-gnetlist-20061020-1:FC-5:geda-gnetlist-20061020-1.src.rpm:1162584914
 geda-gnetlist-20061020-1:FC-6:geda-gnetlist-20061020-1.src.rpm:1162585064
+geda-gnetlist-20061020-1:HEAD:geda-gnetlist-20061020-1.src.rpm:1162585177



From fedora-extras-commits at redhat.com  Fri Nov  3 20:16:16 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:16:16 -0700
Subject: rpms/libgeda import.log,1.10,1.11
Message-ID: <200611032016.kA3KGGoK009580@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9407

Modified Files:
	import.log 
Log Message:
auto-import libgeda-20061020-1 on branch devel from libgeda-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libgeda/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	3 Nov 2006 20:13:39 -0000	1.10
+++ import.log	3 Nov 2006 20:15:46 -0000	1.11
@@ -7,3 +7,4 @@
 libgeda-20060906-3:HEAD:libgeda-20060906-3.src.rpm:1160678840
 libgeda-20061020-1:FC-5:libgeda-20061020-1.src.rpm:1162584824
 libgeda-20061020-1:FC-6:libgeda-20061020-1.src.rpm:1162585066
+libgeda-20061020-1:HEAD:libgeda-20061020-1.src.rpm:1162585195



From fedora-extras-commits at redhat.com  Fri Nov  3 20:16:22 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:16:22 -0700
Subject: rpms/libgeda/devel .cvsignore, 1.4, 1.5 libgeda.spec, 1.4,
	1.5 sources, 1.4, 1.5 libgeda-20060906-arc.patch, 1.1,
	NONE libgeda-20060906-configure.patch, 1.1, NONE
Message-ID: <200611032016.kA3KGMe2009621@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9407/devel

Modified Files:
	.cvsignore libgeda.spec sources 
Removed Files:
	libgeda-20060906-arc.patch libgeda-20060906-configure.patch 
Log Message:
auto-import libgeda-20061020-1 on branch devel from libgeda-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:22:00 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:15:51 -0000	1.5
@@ -1 +1 @@
-libgeda-20060906.tar.gz
+libgeda-20061020.tar.gz


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgeda.spec	12 Oct 2006 18:44:01 -0000	1.4
+++ libgeda.spec	3 Nov 2006 20:15:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:            libgeda
-Version:         20060906
-Release:         3%{?dist}
+Version:         20061020
+Release:         1%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
@@ -8,8 +8,8 @@
 URL:             http://www.geda.seul.org
 
 Source:          ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz
-Patch0:          %{name}-%{version}-arc.patch
-Patch1:          %{name}-%{version}-configure.patch
+#Patch0:          %{name}-%{version}-arc.patch
+#Patch1:          %{name}-%{version}-configure.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
@@ -44,8 +44,8 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b o_arc_basic.c
-%patch1 -p0 -b configure.ac
+#%patch0 -p0 -b o_arc_basic.c
+#%patch1 -p0 -b configure.ac
 
 %build
 
@@ -91,6 +91,9 @@
 
 
 %Changelog
+* Wed Nov 01 2006 Chitlesh Goorah  - 20061020-1
+- New upstreeam release
+
 * Wed Oct 11 2006 Chitlesh Goorah  - 20060906-3
 - Fixes Bug 210121 Printing does not produce correct post-script
 - Changed ownership of prolog.ps from libgeda-doc to libgeda


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:22:01 -0000	1.4
+++ sources	3 Nov 2006 20:15:51 -0000	1.5
@@ -1 +1 @@
-1199ba6a71f3c03081a82e19fa550bc3  libgeda-20060906.tar.gz
+3caf1aeee5627706b9abe54f6601a7dc  libgeda-20061020.tar.gz


--- libgeda-20060906-arc.patch DELETED ---


--- libgeda-20060906-configure.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 20:17:20 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:17:20 -0700
Subject: rpms/geda-gschem/devel .cvsignore, 1.3, 1.4 geda-gschem.spec, 1.3, 
	1.4 sources, 1.3, 1.4 geda-gschem-ru.po.diff, 1.1, NONE
Message-ID: <200611032017.kA3KHKkT009827@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9693/devel

Modified Files:
	.cvsignore geda-gschem.spec sources 
Removed Files:
	geda-gschem-ru.po.diff 
Log Message:
auto-import geda-gschem-20061020-1 on branch devel from geda-gschem-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:47:14 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:16:50 -0000	1.4
@@ -1 +1 @@
-geda-gschem-20060906.tar.gz
+geda-gschem-20061020.tar.gz


Index: geda-gschem.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/geda-gschem.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-gschem.spec	12 Oct 2006 18:48:14 -0000	1.3
+++ geda-gschem.spec	3 Nov 2006 20:16:50 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             geda-gschem
-Version:          20060906
-Release:          3%{?dist}
+Version:          20061020
+Release:          1%{?dist}
 
 Summary:          Electronics schematics editor
 Group:            Applications/Engineering
@@ -13,7 +13,8 @@
 Source2:          gschem.xpm
 
 # by Andy Shevchenko #206280
-Patch0:           geda-gschem-ru.po.diff
+#TO BE TESTED
+#Patch0:           geda-gschem-ru.po.diff
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,26 +27,27 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b ru.po
+#%patch0 -p0 -b ru.po
 
 %build
-%{__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
+# 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
 
 %configure --with-docdir=%{_datadir}/gEDA/docs
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make INSTALL="install -p" install DESTDIR=%{buildroot}
+%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
 
 install -d %{buildroot}%{_datadir}/gEDA/examples
 install -d %{buildroot}%{_datadir}/gEDA/scheme
@@ -138,6 +140,9 @@
 
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New Upstream Release
+
 * Fri Sep 15 2006 Chitlesh Goorah  - 20060906-3
 - patch for russian translation by Andy Shevchenko #206280
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:47:14 -0000	1.3
+++ sources	3 Nov 2006 20:16:50 -0000	1.4
@@ -1 +1 @@
-8f224c572f30162928a9141b352c7558  geda-gschem-20060906.tar.gz
+c00d1692984d4fc89476beded6c2d571  geda-gschem-20061020.tar.gz


--- geda-gschem-ru.po.diff DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov  3 20:17:28 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:17:28 -0700
Subject: rpms/geda-utils import.log,1.6,1.7
Message-ID: <200611032017.kA3KHSeR009838@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9742

Modified Files:
	import.log 
Log Message:
auto-import geda-utils-20061020-1 on branch devel from geda-utils-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	3 Nov 2006 20:15:21 -0000	1.6
+++ import.log	3 Nov 2006 20:16:57 -0000	1.7
@@ -3,3 +3,4 @@
 geda-utils-20060906-2:HEAD:geda-utils-20060906-2.src.rpm:1157925111
 geda-utils-20061020-1:FC-5:geda-utils-20061020-1.src.rpm:1162585038
 geda-utils-20061020-1:FC-6:geda-utils-20061020-1.src.rpm:1162585170
+geda-utils-20061020-1:HEAD:geda-utils-20061020-1.src.rpm:1162585266



From fedora-extras-commits at redhat.com  Fri Nov  3 20:17:20 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:17:20 -0700
Subject: rpms/geda-gschem import.log,1.8,1.9
Message-ID: <200611032017.kA3KHKjc009824@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gschem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9693

Modified Files:
	import.log 
Log Message:
auto-import geda-gschem-20061020-1 on branch devel from geda-gschem-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gschem/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	3 Nov 2006 20:15:02 -0000	1.8
+++ import.log	3 Nov 2006 20:16:49 -0000	1.9
@@ -5,3 +5,4 @@
 geda-gschem-20060906-3:HEAD:geda-gschem-20060906-3.src.rpm:1160679092
 geda-gschem-20061020-1:FC-5:geda-gschem-20061020-1.src.rpm:1162585010
 geda-gschem-20061020-1:FC-6:geda-gschem-20061020-1.src.rpm:1162585139
+geda-gschem-20061020-1:HEAD:geda-gschem-20061020-1.src.rpm:1162585258



From fedora-extras-commits at redhat.com  Fri Nov  3 20:17:28 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:17:28 -0700
Subject: rpms/geda-utils/devel .cvsignore, 1.3, 1.4 geda-utils.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611032017.kA3KHSc6009870@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9742/devel

Modified Files:
	.cvsignore geda-utils.spec sources 
Log Message:
auto-import geda-utils-20061020-1 on branch devel from geda-utils-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2006 21:47:44 -0000	1.3
+++ .cvsignore	3 Nov 2006 20:16:58 -0000	1.4
@@ -1 +1 @@
-geda-utils-20060906.tar.gz
+geda-utils-20061020.tar.gz


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/geda-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geda-utils.spec	10 Sep 2006 21:47:44 -0000	1.2
+++ geda-utils.spec	3 Nov 2006 20:16:58 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           geda-utils
-Version:        20060906
-Release:        2%{?dist}
+Version:        20061020
+Release:        1%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
@@ -65,6 +65,9 @@
 %{_datadir}/gEDA/docs/readmes/README*
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New Upstream Release
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
 - Rebuild for FC-6 devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2006 21:47:44 -0000	1.3
+++ sources	3 Nov 2006 20:16:58 -0000	1.4
@@ -1 +1 @@
-452326bae9bee19722da2627f0ea05d8  geda-utils-20060906.tar.gz
+d54b7dc1e8c91dbc6aef94ee5dcf65a1  geda-utils-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:17:48 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:17:48 -0700
Subject: rpms/geda-symbols import.log,1.12,1.13
Message-ID: <200611032017.kA3KHmSf010011@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9792

Modified Files:
	import.log 
Log Message:
auto-import geda-symbols-20061020-1 on branch devel from geda-symbols-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	3 Nov 2006 20:15:21 -0000	1.12
+++ import.log	3 Nov 2006 20:17:18 -0000	1.13
@@ -9,3 +9,4 @@
 geda-symbols-20060906-2:HEAD:geda-symbols-20060906-2.src.rpm:1157924853
 geda-symbols-20061020-1:FC-5:geda-symbols-20061020-1.src.rpm:1162585037
 geda-symbols-20061020-1:FC-6:geda-symbols-20061020-1.src.rpm:1162585170
+geda-symbols-20061020-1:HEAD:geda-symbols-20061020-1.src.rpm:1162585288



From fedora-extras-commits at redhat.com  Fri Nov  3 20:17:49 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:17:49 -0700
Subject: rpms/geda-symbols/devel .cvsignore, 1.4, 1.5 geda-symbols.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200611032017.kA3KHnrl010017@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-symbols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9792/devel

Modified Files:
	.cvsignore geda-symbols.spec sources 
Log Message:
auto-import geda-symbols-20061020-1 on branch devel from geda-symbols-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:43:26 -0000	1.4
+++ .cvsignore	3 Nov 2006 20:17:19 -0000	1.5
@@ -1 +1 @@
-geda-symbols-20060906.tar.gz
+geda-symbols-20061020.tar.gz


Index: geda-symbols.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/geda-symbols.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geda-symbols.spec	10 Sep 2006 21:43:26 -0000	1.5
+++ geda-symbols.spec	3 Nov 2006 20:17:19 -0000	1.6
@@ -1,6 +1,6 @@
 Name:       geda-symbols
-Version:    20060906
-Release:    2%{?dist}
+Version:    20061020
+Release:    1%{?dist}
 Summary:    Electronic symbols for gEDA
 
 Group:      Applications/Engineering
@@ -63,6 +63,9 @@
 %{_datadir}/gEDA/system-gafrc
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- New upstream release
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
 - Rebuilt for FC-6 devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-symbols/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:43:26 -0000	1.4
+++ sources	3 Nov 2006 20:17:19 -0000	1.5
@@ -1 +1 @@
-43d938b2cfa45e039c69b1d7e00643d9  geda-symbols-20060906.tar.gz
+0cc22d0d36c5f2f1c09aa82eb6d0edf6  geda-symbols-20061020.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 20:18:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 13:18:12 -0700
Subject: rpms/childsplay/FC-5 childsplay.desktop,1.1,1.2
Message-ID: <200611032018.kA3KICdu010080@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9939/FC-5

Modified Files:
	childsplay.desktop 
Log Message:
add KidsGame to .desktop file catagories (bz 213890)


Index: childsplay.desktop
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-5/childsplay.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay.desktop	11 May 2006 13:20:41 -0000	1.1
+++ childsplay.desktop	3 Nov 2006 20:17:41 -0000	1.2
@@ -8,5 +8,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;
-Version=0.81.8
+Categories=Application;Game;KidsGame;



From fedora-extras-commits at redhat.com  Fri Nov  3 20:18:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 13:18:12 -0700
Subject: rpms/childsplay/FC-6 childsplay.desktop,1.1,1.2
Message-ID: <200611032018.kA3KICqT010083@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9939/FC-6

Modified Files:
	childsplay.desktop 
Log Message:
add KidsGame to .desktop file catagories (bz 213890)


Index: childsplay.desktop
===================================================================
RCS file: /cvs/extras/rpms/childsplay/FC-6/childsplay.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay.desktop	11 May 2006 13:20:41 -0000	1.1
+++ childsplay.desktop	3 Nov 2006 20:17:42 -0000	1.2
@@ -8,5 +8,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;
-Version=0.81.8
+Categories=Application;Game;KidsGame;



From fedora-extras-commits at redhat.com  Fri Nov  3 20:18:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 3 Nov 2006 13:18:13 -0700
Subject: rpms/childsplay/devel childsplay.desktop,1.1,1.2
Message-ID: <200611032018.kA3KIDSu010086@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/childsplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9939/devel

Modified Files:
	childsplay.desktop 
Log Message:
add KidsGame to .desktop file catagories (bz 213890)


Index: childsplay.desktop
===================================================================
RCS file: /cvs/extras/rpms/childsplay/devel/childsplay.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- childsplay.desktop	11 May 2006 13:20:41 -0000	1.1
+++ childsplay.desktop	3 Nov 2006 20:17:43 -0000	1.2
@@ -8,5 +8,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;
-Version=0.81.8
+Categories=Application;Game;KidsGame;



From fedora-extras-commits at redhat.com  Fri Nov  3 20:43:00 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:43:00 -0700
Subject: rpms/kdmtheme import.log,1.3,1.4
Message-ID: <200611032043.kA3Kh02Z011689@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kdmtheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11641

Modified Files:
	import.log 
Log Message:
auto-import kdmtheme-1.1.2-4 on branch FC-5 from kdmtheme-1.1.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kdmtheme/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	4 Sep 2006 22:43:14 -0000	1.3
+++ import.log	3 Nov 2006 20:42:30 -0000	1.4
@@ -1,2 +1,3 @@
 kdmtheme-1_1_2-2:HEAD:kdmtheme-1.1.2-2.src.rpm:1156174278
 kdmtheme-1_1_2-3:HEAD:kdmtheme-1.1.2-3.src.rpm:1157410021
+kdmtheme-1_1_2-4:FC-5:kdmtheme-1.1.2-4.src.rpm:1162586799



From fedora-extras-commits at redhat.com  Fri Nov  3 20:43:01 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:43:01 -0700
Subject: rpms/kdmtheme/FC-5 kdmtheme.spec,1.1,1.2
Message-ID: <200611032043.kA3Kh1Ch011692@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kdmtheme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11641/FC-5

Modified Files:
	kdmtheme.spec 
Log Message:
auto-import kdmtheme-1.1.2-4 on branch FC-5 from kdmtheme-1.1.2-4.src.rpm


Index: kdmtheme.spec
===================================================================
RCS file: /cvs/extras/rpms/kdmtheme/FC-5/kdmtheme.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdmtheme.spec	21 Aug 2006 15:28:23 -0000	1.1
+++ kdmtheme.spec	3 Nov 2006 20:42:31 -0000	1.2
@@ -1,16 +1,16 @@
-Name:       kdmtheme
-Version:    1.1.2
-Release:    2%{?dist}
-Summary:    Theme Manager for KDM
-
-License:    GPL
-Group:      User Interface/Desktops
-URL:        http://www.kde-look.org/content/show.php?content=22120
+Name:              kdmtheme
+Version:           1.1.2
+Release:           4%{?dist}
+Summary:           Theme Manager for KDM
+
+License:           GPL
+Group:             User Interface/Desktops
+URL:               http://www.kde-look.org/content/show.php?content=22120
 
-Source0:    http://beta.smileaf.org/files/%{name}/%{name}-%{version}.tar.bz2
+Source0:           http://beta.smileaf.org/files/%{name}/%{name}-%{version}.tar.bz2
 
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    kdelibs-devel, desktop-file-utils, kdebase-devel
+BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:     desktop-file-utils, kdebase-devel
 Requires:          kdebase
 
 %description
@@ -28,24 +28,29 @@
    --disable-warnings   \
    --disable-dependency-tracking \
    --enable-final
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
+
 # Fix absolute symlink
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
-ln -s ../common $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
+%{__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
 
-desktop-file-install --vendor fedora \
-    --add-category X-Fedora \
-    --add-category System \
-    --delete-original \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-    $RPM_BUILD_ROOT%{_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 $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -55,7 +60,17 @@
 %{_libdir}/kde3/kcm_%{name}.so
 %{_docdir}/HTML/*/%{name}/
 
-%changelog
+
+%Changelog
+* Fri Nov 03 2006 Chitlesh Goorah  - 1.1.2-4
+- fixed proper kcmshell call
+
+* Tue Sep 05 2006 Chitlesh Goorah  - 1.1.2-3
+- Rebuilt for FC6-devel
+
+* Tue Jun 13 2006 Chitlesh Goorah  - 1.1.2-2
+- Minor fixes and removed useless BR
+
 * Tue Jun 13 2006 Chitlesh Goorah  - 1.1.2-1
 - Corrected %%URL and %%configure
 



From fedora-extras-commits at redhat.com  Fri Nov  3 20:44:53 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:44:53 -0700
Subject: rpms/kdmtheme import.log,1.4,1.5
Message-ID: <200611032044.kA3Kireo011848@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kdmtheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11781

Modified Files:
	import.log 
Log Message:
auto-import kdmtheme-1.1.2-4 on branch FC-6 from kdmtheme-1.1.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kdmtheme/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Nov 2006 20:42:30 -0000	1.4
+++ import.log	3 Nov 2006 20:44:23 -0000	1.5
@@ -1,3 +1,4 @@
 kdmtheme-1_1_2-2:HEAD:kdmtheme-1.1.2-2.src.rpm:1156174278
 kdmtheme-1_1_2-3:HEAD:kdmtheme-1.1.2-3.src.rpm:1157410021
 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



From fedora-extras-commits at redhat.com  Fri Nov  3 20:44:54 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:44:54 -0700
Subject: rpms/kdmtheme/FC-6 kdmtheme.spec,1.2,1.3
Message-ID: <200611032044.kA3KisVK011851@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kdmtheme/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11781/FC-6

Modified Files:
	kdmtheme.spec 
Log Message:
auto-import kdmtheme-1.1.2-4 on branch FC-6 from kdmtheme-1.1.2-4.src.rpm


Index: kdmtheme.spec
===================================================================
RCS file: /cvs/extras/rpms/kdmtheme/FC-6/kdmtheme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdmtheme.spec	4 Sep 2006 22:43:15 -0000	1.2
+++ kdmtheme.spec	3 Nov 2006 20:44:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:              kdmtheme
 Version:           1.1.2
-Release:           3%{?dist}
+Release:           4%{?dist}
 Summary:           Theme Manager for KDM
 
 License:           GPL
@@ -28,7 +28,7 @@
    --disable-warnings   \
    --disable-dependency-tracking \
    --enable-final
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -45,6 +45,10 @@
     --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}
 
@@ -58,6 +62,9 @@
 
 
 %Changelog
+* Fri Nov 03 2006 Chitlesh Goorah  - 1.1.2-4
+- fixed proper kcmshell call
+
 * Tue Sep 05 2006 Chitlesh Goorah  - 1.1.2-3
 - Rebuilt for FC6-devel
 



From fedora-extras-commits at redhat.com  Fri Nov  3 20:48:05 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:48:05 -0700
Subject: rpms/kdmtheme import.log,1.5,1.6
Message-ID: <200611032048.kA3Km5Jw011955@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kdmtheme
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925

Modified Files:
	import.log 
Log Message:
auto-import kdmtheme-1.1.2-4 on branch devel from kdmtheme-1.1.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kdmtheme/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	3 Nov 2006 20:44:23 -0000	1.5
+++ import.log	3 Nov 2006 20:47:35 -0000	1.6
@@ -2,3 +2,4 @@
 kdmtheme-1_1_2-3:HEAD:kdmtheme-1.1.2-3.src.rpm:1157410021
 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



From fedora-extras-commits at redhat.com  Fri Nov  3 20:48:06 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Fri, 3 Nov 2006 13:48:06 -0700
Subject: rpms/kdmtheme/devel kdmtheme.spec,1.2,1.3
Message-ID: <200611032048.kA3Km6s8011958@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kdmtheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11925/devel

Modified Files:
	kdmtheme.spec 
Log Message:
auto-import kdmtheme-1.1.2-4 on branch devel from kdmtheme-1.1.2-4.src.rpm


Index: kdmtheme.spec
===================================================================
RCS file: /cvs/extras/rpms/kdmtheme/devel/kdmtheme.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdmtheme.spec	4 Sep 2006 22:43:15 -0000	1.2
+++ kdmtheme.spec	3 Nov 2006 20:47:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:              kdmtheme
 Version:           1.1.2
-Release:           3%{?dist}
+Release:           4%{?dist}
 Summary:           Theme Manager for KDM
 
 License:           GPL
@@ -28,7 +28,7 @@
    --disable-warnings   \
    --disable-dependency-tracking \
    --enable-final
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -45,6 +45,10 @@
     --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}
 
@@ -58,6 +62,9 @@
 
 
 %Changelog
+* Fri Nov 03 2006 Chitlesh Goorah  - 1.1.2-4
+- fixed proper kcmshell call
+
 * Tue Sep 05 2006 Chitlesh Goorah  - 1.1.2-3
 - Rebuilt for FC6-devel
 



From fedora-extras-commits at redhat.com  Fri Nov  3 20:55:09 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri,  3 Nov 2006 13:55:09 -0700
Subject: check-mirrors return-mirrorlist.py,1.18,1.19
Message-ID: <200611032055.kA3Kt9Bm012300@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12282

Modified Files:
	return-mirrorlist.py 
Log Message:
Added regular expression to take $ARCH out of the mirror list



Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- return-mirrorlist.py	26 Oct 2006 20:57:52 -0000	1.18
+++ return-mirrorlist.py	3 Nov 2006 20:55:06 -0000	1.19
@@ -29,6 +29,7 @@
 import ConfigParser
 import cgi
 import sqlite
+import re
 
 # prettier errors
 
@@ -84,7 +85,7 @@
         results = 0
         for row in rows:
             for field in row:
-                print "%s" % field
+                print "%s" % re.sub('\$ARCH', self.arch, field)
                 results = results + 1
 
         if results == 0:



From fedora-extras-commits at redhat.com  Fri Nov  3 21:03:53 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 3 Nov 2006 14:03:53 -0700
Subject: rpms/mock/devel arch-specific-repo.patch, NONE, 1.1 mock.spec, 1.25,
	1.26
Message-ID: <200611032103.kA3L3r9g015303@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15284

Modified Files:
	mock.spec 
Added Files:
	arch-specific-repo.patch 
Log Message:
add patch to make mock repos arch specific

arch-specific-repo.patch:

--- NEW FILE arch-specific-repo.patch ---
--- etc/fedora-4-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-ppc-core.cfg	2006-11-03 15:30:39.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
 
 [local]
 name=local
--- etc/fedora-5-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-i386-core.cfg	2006-11-03 15:43:12.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
 
 [local]
 name=local
--- etc/fedora-3-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-3-i386-core.cfg	2006-11-03 15:25:55.000000000 -0500
@@ -19,11 +19,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386
 
 
 [groups]
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386
 
 [local]
 name=local
--- etc/fedora-5-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-x86_64-core.cfg	2006-11-03 15:46:11.000000000 -0500
@@ -21,11 +21,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64
 
 [groups]
 name=groups
@@ -33,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-5-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-ppc-core.cfg	2006-11-03 15:44:53.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
 
 [local]
 name=local
--- etc/fedora-6-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-x86_64-core.cfg	2006-11-03 15:50:34.000000000 -0500
@@ -21,7 +21,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64
 
 [groups]
 name=groups
@@ -29,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-devel-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-x86_64-core.cfg	2006-11-03 15:57:08.000000000 -0500
@@ -21,7 +21,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
 
 [groups]
 name=groups
@@ -29,7 +29,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-4-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-x86_64-core.cfg	2006-11-03 15:31:21.000000000 -0500
@@ -20,12 +20,12 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
 
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
 
 [groups]
 name=groups
@@ -33,6 +33,7 @@
 
 [extras]
 name=extras
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
 
 [local]
--- etc/fedora-3-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-3-x86_64-core.cfg	2006-11-03 15:59:55.000000000 -0500
@@ -19,12 +19,12 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os
 
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64
 
 [local]
 name=local
--- etc/fedora-devel-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-ppc-core.cfg	2006-11-03 15:56:39.000000000 -0500
@@ -20,7 +20,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc
 
 [groups]
 name=groups
@@ -28,7 +28,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc
 
 [local]
 name=local
--- etc/fedora-devel-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-i386-core.cfg	2006-11-03 15:55:54.000000000 -0500
@@ -20,7 +20,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
 
 [groups]
 name=groups
@@ -28,7 +28,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386
 
 [local]
 name=local
--- etc/fedora-4-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-i386-core.cfg	2006-11-03 15:29:44.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386
 
 
 [groups]
@@ -33,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386
 
 [local]
 name=local
--- etc/fedora-6-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-i386-core.cfg	2006-11-03 15:48:02.000000000 -0500
@@ -20,7 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386
 
 [groups]
 name=groups
@@ -28,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
 
 [local]
 name=local
--- etc/fedora-6-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-ppc-core.cfg	2006-11-03 15:49:06.000000000 -0500
@@ -20,7 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc
 
 [groups]
 name=groups
@@ -28,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
 
 [local]
 name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mock.spec	30 Oct 2006 21:29:50 -0000	1.25
+++ mock.spec	3 Nov 2006 21:03:23 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: arch-specific-repo.patch
 
 
 %description
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Jesse Keating  - 0.6.8-2
+- Add patch to fix repo files to use arch specific repos (#213516)
+
 * Mon Oct 30 2006 Clark Williams  - 0.6.8-1
 - respun tarballs without buildsys rpms
 



From fedora-extras-commits at redhat.com  Fri Nov  3 21:13:00 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 3 Nov 2006 14:13:00 -0700
Subject: rpms/mock/FC-5 arch-specific-repo.patch, NONE, 1.1 mock.spec, 1.23,
	1.24
Message-ID: <200611032113.kA3LD0H4015584@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15546/FC-5

Modified Files:
	mock.spec 
Added Files:
	arch-specific-repo.patch 
Log Message:
Port devel changes back to FC-5 and FC-6


arch-specific-repo.patch:

--- NEW FILE arch-specific-repo.patch ---
--- etc/fedora-4-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-ppc-core.cfg	2006-11-03 15:30:39.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
 
 [local]
 name=local
--- etc/fedora-5-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-i386-core.cfg	2006-11-03 15:43:12.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
 
 [local]
 name=local
--- etc/fedora-3-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-3-i386-core.cfg	2006-11-03 15:25:55.000000000 -0500
@@ -19,11 +19,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386
 
 
 [groups]
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386
 
 [local]
 name=local
--- etc/fedora-5-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-x86_64-core.cfg	2006-11-03 15:46:11.000000000 -0500
@@ -21,11 +21,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64
 
 [groups]
 name=groups
@@ -33,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-5-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-ppc-core.cfg	2006-11-03 15:44:53.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
 
 [local]
 name=local
--- etc/fedora-6-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-x86_64-core.cfg	2006-11-03 15:50:34.000000000 -0500
@@ -21,7 +21,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64
 
 [groups]
 name=groups
@@ -29,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-devel-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-x86_64-core.cfg	2006-11-03 15:57:08.000000000 -0500
@@ -21,7 +21,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
 
 [groups]
 name=groups
@@ -29,7 +29,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-4-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-x86_64-core.cfg	2006-11-03 15:31:21.000000000 -0500
@@ -20,12 +20,12 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
 
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
 
 [groups]
 name=groups
@@ -33,6 +33,7 @@
 
 [extras]
 name=extras
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
 
 [local]
--- etc/fedora-3-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-3-x86_64-core.cfg	2006-11-03 15:59:55.000000000 -0500
@@ -19,12 +19,12 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os
 
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64
 
 [local]
 name=local
--- etc/fedora-devel-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-ppc-core.cfg	2006-11-03 15:56:39.000000000 -0500
@@ -20,7 +20,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc
 
 [groups]
 name=groups
@@ -28,7 +28,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc
 
 [local]
 name=local
--- etc/fedora-devel-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-i386-core.cfg	2006-11-03 15:55:54.000000000 -0500
@@ -20,7 +20,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
 
 [groups]
 name=groups
@@ -28,7 +28,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386
 
 [local]
 name=local
--- etc/fedora-4-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-i386-core.cfg	2006-11-03 15:29:44.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386
 
 
 [groups]
@@ -33,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386
 
 [local]
 name=local
--- etc/fedora-6-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-i386-core.cfg	2006-11-03 15:48:02.000000000 -0500
@@ -20,7 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386
 
 [groups]
 name=groups
@@ -28,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
 
 [local]
 name=local
--- etc/fedora-6-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-ppc-core.cfg	2006-11-03 15:49:06.000000000 -0500
@@ -20,7 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc
 
 [groups]
 name=groups
@@ -28,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
 
 [local]
 name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mock.spec	30 Oct 2006 21:48:19 -0000	1.23
+++ mock.spec	3 Nov 2006 21:12:30 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: arch-specific-repo.patch
 
 
 %description
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Jesse Keating  - 0.6.8-2
+- Add patch to fix repo files to use arch specific repos (#213516)
+
 * Mon Oct 30 2006 Clark Williams  - 0.6.8-1
 - respun tarballs without buildsys rpms
 



From fedora-extras-commits at redhat.com  Fri Nov  3 21:13:01 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Fri, 3 Nov 2006 14:13:01 -0700
Subject: rpms/mock/FC-6 arch-specific-repo.patch, NONE, 1.1 mock.spec, 1.24,
	1.25
Message-ID: <200611032113.kA3LD1Gi015587@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15546/FC-6

Modified Files:
	mock.spec 
Added Files:
	arch-specific-repo.patch 
Log Message:
Port devel changes back to FC-5 and FC-6


arch-specific-repo.patch:

--- NEW FILE arch-specific-repo.patch ---
--- etc/fedora-4-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-ppc-core.cfg	2006-11-03 15:30:39.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
 
 [local]
 name=local
--- etc/fedora-5-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-i386-core.cfg	2006-11-03 15:43:12.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
 
 [local]
 name=local
--- etc/fedora-3-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-3-i386-core.cfg	2006-11-03 15:25:55.000000000 -0500
@@ -19,11 +19,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386
 
 
 [groups]
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386
 
 [local]
 name=local
--- etc/fedora-5-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-x86_64-core.cfg	2006-11-03 15:46:11.000000000 -0500
@@ -21,11 +21,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64
 
 [groups]
 name=groups
@@ -33,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-5-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-5-ppc-core.cfg	2006-11-03 15:44:53.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
 
 [local]
 name=local
--- etc/fedora-6-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-x86_64-core.cfg	2006-11-03 15:50:34.000000000 -0500
@@ -21,7 +21,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64
 
 [groups]
 name=groups
@@ -29,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-devel-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-x86_64-core.cfg	2006-11-03 15:57:08.000000000 -0500
@@ -21,7 +21,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
 
 [groups]
 name=groups
@@ -29,7 +29,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64
 
 [local]
 name=local
--- etc/fedora-4-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-x86_64-core.cfg	2006-11-03 15:31:21.000000000 -0500
@@ -20,12 +20,12 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
 
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
 
 [groups]
 name=groups
@@ -33,6 +33,7 @@
 
 [extras]
 name=extras
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
 
 [local]
--- etc/fedora-3-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-3-x86_64-core.cfg	2006-11-03 15:59:55.000000000 -0500
@@ -19,12 +19,12 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os
 
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64
 
 [groups]
 name=groups
@@ -32,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64
 
 [local]
 name=local
--- etc/fedora-devel-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-ppc-core.cfg	2006-11-03 15:56:39.000000000 -0500
@@ -20,7 +20,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc
 
 [groups]
 name=groups
@@ -28,7 +28,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc
 
 [local]
 name=local
--- etc/fedora-devel-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-devel-i386-core.cfg	2006-11-03 15:55:54.000000000 -0500
@@ -20,7 +20,7 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
 
 [groups]
 name=groups
@@ -28,7 +28,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386
 
 [local]
 name=local
--- etc/fedora-4-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-4-i386-core.cfg	2006-11-03 15:29:44.000000000 -0500
@@ -20,11 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os
 
 [updates-released]
 name=updates
-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386
 
 
 [groups]
@@ -33,7 +33,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386
 
 [local]
 name=local
--- etc/fedora-6-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-i386-core.cfg	2006-11-03 15:48:02.000000000 -0500
@@ -20,7 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386
 
 [groups]
 name=groups
@@ -28,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
 
 [local]
 name=local
--- etc/fedora-6-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
+++ etc/fedora-6-ppc-core.cfg	2006-11-03 15:49:06.000000000 -0500
@@ -20,7 +20,11 @@
 
 [core]
 name=core
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc
 
 [groups]
 name=groups
@@ -28,7 +32,7 @@
 
 [extras]
 name=extras
-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
 
 [local]
 name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mock.spec	30 Oct 2006 21:48:20 -0000	1.24
+++ mock.spec	3 Nov 2006 21:12:31 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: arch-specific-repo.patch
 
 
 %description
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Jesse Keating  - 0.6.8-2
+- Add patch to fix repo files to use arch specific repos (#213516)
+
 * Mon Oct 30 2006 Clark Williams  - 0.6.8-1
 - respun tarballs without buildsys rpms
 



From fedora-extras-commits at redhat.com  Fri Nov  3 21:32:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 3 Nov 2006 14:32:54 -0700
Subject: rpms/perl-Net-SCP/devel perl-Net-SCP.spec,1.10,1.11
Message-ID: <200611032132.kA3LWs1q016479@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Net-SCP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16445

Modified Files:
	perl-Net-SCP.spec 
Log Message:
Cleanup to more closely match cpanspec output.


Index: perl-Net-SCP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SCP/devel/perl-Net-SCP.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Net-SCP.spec	28 Aug 2006 04:24:48 -0000	1.10
+++ perl-Net-SCP.spec	3 Nov 2006 21:32:23 -0000	1.11
@@ -1,62 +1,55 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Net-SCP
 Version:        0.07
-Release:        4%{dist}
-
+Release:        5%{?dist}
 Summary:        Perl extension for secure copy protocol
-
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-SCP/
-Source0:        http://www.cpan.org/authors/id/I/IV/IVAN/Net-SCP-0.07.tar.gz
+Source0:        http://www.cpan.org/authors/id/I/IV/IVAN/Net-SCP-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-BuildRequires:  perl(Net::SSH), perl(String::ShellQuote)
+BuildRequires:  perl(Net::SSH)
+BuildRequires:  perl(String::ShellQuote)
 Requires:       openssh-clients
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module implements a Perl interface to scp.
 
-
 %prep
 %setup -q -n Net-SCP-%{version}
 chmod 644 Changes README SCP.pm
 
-
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
-
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make install \
-  PERL_INSTALL_ROOT=%{buildroot} \
-  INSTALLARCHLIB=%{buildroot}%{perl_archlib}
-find %{buildroot} -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+rm -rf $RPM_BUILD_ROOT
 
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
-%check || :
-make test
+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/*
 
-%clean
-rm -rf %{buildroot}
+%check
+make test
 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/Net
-%{_mandir}/man3/*.3*
-
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
 
 %changelog
+* Thu Nov 02 2006 Steven Pritchard  0.07-5
+- Cleanup to more closely match cpanspec output.
+
 * Mon Aug 27 2006 Michael J. Knox  - 0.07-4
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Fri Nov  3 21:38:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 3 Nov 2006 14:38:54 -0700
Subject: rpms/perl-Archive-Extract/devel .cvsignore, 1.4,
	1.5 perl-Archive-Extract.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611032138.kA3Lcs0g016616@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16558

Modified Files:
	.cvsignore perl-Archive-Extract.spec sources 
Log Message:
Update to 0.14.
Use fixperms macro instead of our own chmod incantation.
BR IPC::Cmd >= 0.29.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Aug 2006 21:43:00 -0000	1.4
+++ .cvsignore	3 Nov 2006 21:38:24 -0000	1.5
@@ -1 +1 @@
-Archive-Extract-0.12.tar.gz
+Archive-Extract-0.14.tar.gz


Index: perl-Archive-Extract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/perl-Archive-Extract.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Archive-Extract.spec	17 Sep 2006 22:38:27 -0000	1.4
+++ perl-Archive-Extract.spec	3 Nov 2006 21:38:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Extract
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Generic archive extracting mechanism
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -8,7 +8,7 @@
 Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Archive-Extract-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IPC::Cmd) >= 0.24
+BuildRequires:  perl(IPC::Cmd) >= 0.29
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load::Conditional) >= 0.04
 BuildRequires:  perl(Params::Check) >= 0.07
@@ -32,7 +32,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -47,6 +47,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Steven Pritchard  0.14-1
+- Update to 0.14.
+- Use fixperms macro instead of our own chmod incantation.
+- BR IPC::Cmd >= 0.29.
+
 * Sun Sep 17 2006 Steven Pritchard  0.12-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Aug 2006 21:43:00 -0000	1.4
+++ sources	3 Nov 2006 21:38:24 -0000	1.5
@@ -1 +1 @@
-131e67f4356220e3cc279feb1ffd183a  Archive-Extract-0.12.tar.gz
+b25deb6aa5893c95cbe22d837ddd186c  Archive-Extract-0.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 21:39:18 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 14:39:18 -0700
Subject: rpms/audacity/FC-6 .cvsignore, 1.3,
	1.4 audacity-1.2.2-aboutdialog.patch, 1.1, 1.2 audacity.spec,
	1.14, 1.15 sources, 1.5, 1.6
Message-ID: <200611032139.kA3LdIZc016654@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16595

Modified Files:
	.cvsignore audacity-1.2.2-aboutdialog.patch audacity.spec 
	sources 
Log Message:
new version 1.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Mar 2006 00:58:52 -0000	1.3
+++ .cvsignore	3 Nov 2006 21:38:47 -0000	1.4
@@ -1 +1 @@
-audacity-src-1.2.4b.tar.gz
+audacity-src-1.2.5.tar.gz

audacity-1.2.2-aboutdialog.patch:

Index: audacity-1.2.2-aboutdialog.patch
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/audacity-1.2.2-aboutdialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacity-1.2.2-aboutdialog.patch	25 Nov 2004 00:01:49 -0000	1.1
+++ audacity-1.2.2-aboutdialog.patch	3 Nov 2006 21:38:47 -0000	1.2
@@ -1,15 +1,21 @@
-diff -Nur audacity-src-1.2.2-orig/src/AboutDialog.cpp audacity-src-1.2.2/src/AboutDialog.cpp
---- audacity-src-1.2.2-orig/src/AboutDialog.cpp	2004-08-26 05:27:33.000000000 +0200
-+++ audacity-src-1.2.2/src/AboutDialog.cpp	2004-05-03 19:14:36.000000000 +0200
-@@ -129,11 +125,9 @@
+--- audacity-src-1.2.5/src/AboutDialog.cpp.about	2006-11-03 22:05:02.000000000 +0100
++++ audacity-src-1.2.5/src/AboutDialog.cpp	2006-11-03 22:06:22.000000000 +0100
+@@ -129,18 +129,9 @@
        translatorCredits += _("translator_credits");
        translatorCredits += "";
     }
 -   wxString localeStr = wxLocale::GetSystemEncodingName();
+-
+-   #if defined(__WXGTK__) && defined(wxUSE_UNICODE) && !wxCHECK_VERSION(2, 5, 0)
+-   // HTML Charsets are broken in wxGTK 2.4.x with unicode turned on
+-   wxString metaTag = "";
+-   #else
+-   wxString metaTag = "";
+-   #endif
  
     wxString creditStr = 
        ""
--      ""
+-      "" + metaTag + ""
        ""
        ""
        "
      "


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- audacity.spec	27 Aug 2006 23:23:54 -0000	1.14
+++ audacity.spec	3 Nov 2006 21:38:47 -0000	1.15
@@ -1,21 +1,29 @@
-Name:		audacity
-Version:	1.2.4
-Release:	0.2.b%{?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.2.4b.tar.gz
-Source1:	audacity.png
-Patch1:		audacity-1.2.2-aboutdialog.patch
-Patch2:     audacity-1.2.3-gcc41.patch
-Patch3:     audacity-1.2.4b-missing-pango.patch
+Name:           audacity
+Version:        1.2.5
+Release:        1%{?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.2.5.tar.gz
+Source1:        audacity.png
+Patch1:         audacity-1.2.2-aboutdialog.patch
+Patch2:         audacity-1.2.3-gcc41.patch
+Patch3:         audacity-1.2.4b-missing-pango.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libogg-devel, libvorbis-devel, zlib-devel, perl
-BuildRequires:	gettext, zip, flac-devel, ladspa-devel
-BuildRequires:	libsamplerate-devel, libsndfile-devel
-BuildRequires:	libid3tag-devel, desktop-file-utils
+BuildRequires:	libogg-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  zlib-devel
+BuildRequires:  perl
+BuildRequires:	gettext
+BuildRequires:  zip
+BuildRequires:  flac-devel
+BuildRequires:  ladspa-devel
+BuildRequires:	libsamplerate-devel
+BuildRequires:  libsndfile-devel
+BuildRequires:	libid3tag-devel
+BuildRequires:  desktop-file-utils
 %{?_with_mp3:BuildRequires: libmad-devel}
 %{?_with_gtk2:BuildRequires: compat-wxGTK2-devel}
 %{!?_with_gtk2:BuildRequires: compat-wxGTK-devel}
@@ -39,9 +47,9 @@
 Linux/*BSD, MacOS, and Windows.
 
 %prep
-%setup -q -n %{name}-src-%{version}b
+%setup -q -n %{name}-src-%{version}
 %patch1 -p1 -b .aboutdialog
-%patch2 -p1 -b .gcc4
+#%patch2 -p1 -b .gcc4
 %{?_with_gtk2: %patch3 -p1 -b .missing-pango }
 cp -a src/Languages.cpp src/Languages.cpp.orig
 iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
@@ -111,6 +119,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-1
+- new version 1.2.5
+
 * Mon Aug 28 2006 Gerard Milmeister  - 1.2.4-0.2.b
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Mar 2006 00:58:52 -0000	1.5
+++ sources	3 Nov 2006 21:38:47 -0000	1.6
@@ -1 +1 @@
-37df5b6119302f7ab77ca16d25311756  audacity-src-1.2.4b.tar.gz
+7558373bee9fd4e7195901b9c0a747f1  audacity-src-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 21:43:03 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 14:43:03 -0700
Subject: rpms/audacity/devel .cvsignore, 1.3,
	1.4 audacity-1.2.2-aboutdialog.patch, 1.1, 1.2 audacity.spec,
	1.14, 1.15 sources, 1.5, 1.6
Message-ID: <200611032143.kA3Lh3Fh016772@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16717/devel

Modified Files:
	.cvsignore audacity-1.2.2-aboutdialog.patch audacity.spec 
	sources 
Log Message:
new version 1.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Mar 2006 00:58:52 -0000	1.3
+++ .cvsignore	3 Nov 2006 21:42:32 -0000	1.4
@@ -1 +1 @@
-audacity-src-1.2.4b.tar.gz
+audacity-src-1.2.5.tar.gz

audacity-1.2.2-aboutdialog.patch:

Index: audacity-1.2.2-aboutdialog.patch
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity-1.2.2-aboutdialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacity-1.2.2-aboutdialog.patch	25 Nov 2004 00:01:49 -0000	1.1
+++ audacity-1.2.2-aboutdialog.patch	3 Nov 2006 21:42:32 -0000	1.2
@@ -1,15 +1,21 @@
-diff -Nur audacity-src-1.2.2-orig/src/AboutDialog.cpp audacity-src-1.2.2/src/AboutDialog.cpp
---- audacity-src-1.2.2-orig/src/AboutDialog.cpp	2004-08-26 05:27:33.000000000 +0200
-+++ audacity-src-1.2.2/src/AboutDialog.cpp	2004-05-03 19:14:36.000000000 +0200
-@@ -129,11 +125,9 @@
+--- audacity-src-1.2.5/src/AboutDialog.cpp.about	2006-11-03 22:05:02.000000000 +0100
++++ audacity-src-1.2.5/src/AboutDialog.cpp	2006-11-03 22:06:22.000000000 +0100
+@@ -129,18 +129,9 @@
        translatorCredits += _("translator_credits");
        translatorCredits += "
      ";
     }
 -   wxString localeStr = wxLocale::GetSystemEncodingName();
+-
+-   #if defined(__WXGTK__) && defined(wxUSE_UNICODE) && !wxCHECK_VERSION(2, 5, 0)
+-   // HTML Charsets are broken in wxGTK 2.4.x with unicode turned on
+-   wxString metaTag = "";
+-   #else
+-   wxString metaTag = "";
+-   #endif
  
     wxString creditStr = 
        ""
--      ""
+-      "" + metaTag + ""
        ""
        ""
        "
      "


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- audacity.spec	27 Aug 2006 23:23:54 -0000	1.14
+++ audacity.spec	3 Nov 2006 21:42:32 -0000	1.15
@@ -1,21 +1,29 @@
-Name:		audacity
-Version:	1.2.4
-Release:	0.2.b%{?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.2.4b.tar.gz
-Source1:	audacity.png
-Patch1:		audacity-1.2.2-aboutdialog.patch
-Patch2:     audacity-1.2.3-gcc41.patch
-Patch3:     audacity-1.2.4b-missing-pango.patch
+Name:           audacity
+Version:        1.2.5
+Release:        1%{?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.2.5.tar.gz
+Source1:        audacity.png
+Patch1:         audacity-1.2.2-aboutdialog.patch
+Patch2:         audacity-1.2.3-gcc41.patch
+Patch3:         audacity-1.2.4b-missing-pango.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libogg-devel, libvorbis-devel, zlib-devel, perl
-BuildRequires:	gettext, zip, flac-devel, ladspa-devel
-BuildRequires:	libsamplerate-devel, libsndfile-devel
-BuildRequires:	libid3tag-devel, desktop-file-utils
+BuildRequires:	libogg-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  zlib-devel
+BuildRequires:  perl
+BuildRequires:	gettext
+BuildRequires:  zip
+BuildRequires:  flac-devel
+BuildRequires:  ladspa-devel
+BuildRequires:	libsamplerate-devel
+BuildRequires:  libsndfile-devel
+BuildRequires:	libid3tag-devel
+BuildRequires:  desktop-file-utils
 %{?_with_mp3:BuildRequires: libmad-devel}
 %{?_with_gtk2:BuildRequires: compat-wxGTK2-devel}
 %{!?_with_gtk2:BuildRequires: compat-wxGTK-devel}
@@ -39,9 +47,9 @@
 Linux/*BSD, MacOS, and Windows.
 
 %prep
-%setup -q -n %{name}-src-%{version}b
+%setup -q -n %{name}-src-%{version}
 %patch1 -p1 -b .aboutdialog
-%patch2 -p1 -b .gcc4
+#%patch2 -p1 -b .gcc4
 %{?_with_gtk2: %patch3 -p1 -b .missing-pango }
 cp -a src/Languages.cpp src/Languages.cpp.orig
 iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
@@ -111,6 +119,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-1
+- new version 1.2.5
+
 * Mon Aug 28 2006 Gerard Milmeister  - 1.2.4-0.2.b
 - Rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Mar 2006 00:58:52 -0000	1.5
+++ sources	3 Nov 2006 21:42:32 -0000	1.6
@@ -1 +1 @@
-37df5b6119302f7ab77ca16d25311756  audacity-src-1.2.4b.tar.gz
+7558373bee9fd4e7195901b9c0a747f1  audacity-src-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 21:43:02 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 14:43:02 -0700
Subject: rpms/audacity/FC-5 .cvsignore, 1.4,
	1.5 audacity-1.2.2-aboutdialog.patch, 1.1, 1.2 audacity.spec,
	1.14, 1.15 sources, 1.6, 1.7
Message-ID: <200611032143.kA3Lh27H016763@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16717/FC-5

Modified Files:
	.cvsignore audacity-1.2.2-aboutdialog.patch audacity.spec 
	sources 
Log Message:
new version 1.2.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Mar 2006 21:49:32 -0000	1.4
+++ .cvsignore	3 Nov 2006 21:42:31 -0000	1.5
@@ -1 +1 @@
-audacity-src-1.3.0b.tar.gz
+audacity-src-1.2.5.tar.gz

audacity-1.2.2-aboutdialog.patch:

Index: audacity-1.2.2-aboutdialog.patch
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/audacity-1.2.2-aboutdialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacity-1.2.2-aboutdialog.patch	25 Nov 2004 00:01:49 -0000	1.1
+++ audacity-1.2.2-aboutdialog.patch	3 Nov 2006 21:42:31 -0000	1.2
@@ -1,15 +1,21 @@
-diff -Nur audacity-src-1.2.2-orig/src/AboutDialog.cpp audacity-src-1.2.2/src/AboutDialog.cpp
---- audacity-src-1.2.2-orig/src/AboutDialog.cpp	2004-08-26 05:27:33.000000000 +0200
-+++ audacity-src-1.2.2/src/AboutDialog.cpp	2004-05-03 19:14:36.000000000 +0200
-@@ -129,11 +125,9 @@
+--- audacity-src-1.2.5/src/AboutDialog.cpp.about	2006-11-03 22:05:02.000000000 +0100
++++ audacity-src-1.2.5/src/AboutDialog.cpp	2006-11-03 22:06:22.000000000 +0100
+@@ -129,18 +129,9 @@
        translatorCredits += _("translator_credits");
        translatorCredits += "
      ";
     }
 -   wxString localeStr = wxLocale::GetSystemEncodingName();
+-
+-   #if defined(__WXGTK__) && defined(wxUSE_UNICODE) && !wxCHECK_VERSION(2, 5, 0)
+-   // HTML Charsets are broken in wxGTK 2.4.x with unicode turned on
+-   wxString metaTag = "";
+-   #else
+-   wxString metaTag = "";
+-   #endif
  
     wxString creditStr = 
        ""
--      ""
+-      "" + metaTag + ""
        ""
        ""
        "
      "


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- audacity.spec	26 Mar 2006 21:49:32 -0000	1.14
+++ audacity.spec	3 Nov 2006 21:42:31 -0000	1.15
@@ -1,44 +1,43 @@
-Name:		audacity
-Version:	1.3.0
-Release:	1.beta.1%{?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.0b.tar.gz
-Source1:	audacity.png
-#Patch1:	audacity-1.2.2-aboutdialog.patch
-#Patch2:	audacity-1.2.3-gcc41.patch
-#Patch3:	audacity-1.2.4b-missing-pango.patch
-Patch4:		audacity-1.3.0b-gcc41.patch
-Patch5:		audacity-1.3.0b-lsrver.patch
-Patch6:		audacity-1.3.0b-install.patch
+Name:           audacity
+Version:        1.2.5
+Release:        1%{?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.2.5.tar.gz
+Source1:        audacity.png
+Patch1:         audacity-1.2.2-aboutdialog.patch
+Patch2:         audacity-1.2.3-gcc41.patch
+Patch3:         audacity-1.2.4b-missing-pango.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libogg-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	zlib-devel
-BuildRequires:	perl
+BuildRequires:  libvorbis-devel
+BuildRequires:  zlib-devel
+BuildRequires:  perl
 BuildRequires:	gettext
-BuildRequires:	zip
-BuildRequires:	flac-devel
-BuildRequires:	ladspa-devel
+BuildRequires:  zip
+BuildRequires:  flac-devel
+BuildRequires:  ladspa-devel
 BuildRequires:	libsamplerate-devel
-BuildRequires:	libsndfile-devel
+BuildRequires:  libsndfile-devel
 BuildRequires:	libid3tag-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	wxGTK-devel >= 2.6.2
+BuildRequires:  desktop-file-utils
 %{?_with_mp3:BuildRequires: libmad-devel}
+%{?_with_gtk2:BuildRequires: compat-wxGTK2-devel}
+%{!?_with_gtk2:BuildRequires: compat-wxGTK-devel}
 # libwx_gtk2-2.4.so: undefined reference to `pango_x_get_context'
-#%{?_with_gtk2: BuildRequires:  pango-devel}
-Requires(post):		desktop-file-utils, shared-mime-info
-Requires(postun):	desktop-file-utils, shared-mime-info
+%{?_with_gtk2: BuildRequires:  pango-devel}
+Requires(post):		desktop-file-utils
+Requires(postun):	desktop-file-utils
 
 # Compile options:
 # --with mp3          : enable mp3 support
 # --with gtk2	      : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version
 # --with portaudiov19 : enable version 19 of portaudio (disables portmixer)
 
+
 %description
 Audacity is a cross-platform multitrack audio editor. It allows you to
 record sounds directly or to import Ogg, WAV, AIFF, AU, IRCAM, or MP3
@@ -47,46 +46,28 @@
 and the audio I/O currently uses OSS under Linux. Audacity runs on
 Linux/*BSD, MacOS, and Windows.
 
-
 %prep
-%setup -q -n %{name}-src-%{version}b-beta
-#%patch1 -p1 -b .aboutdialog
+%setup -q -n %{name}-src-%{version}
+%patch1 -p1 -b .aboutdialog
 #%patch2 -p1 -b .gcc4
-#%{?_with_gtk2: %patch3 -p1 -b .missing-pango }
-%patch4 -p1 -b .gcc41
-%patch5 -p1 -b .lsrver
-%patch6 -p1 -b .install
-
-# convert Languages.cpp from latin1 to UTF-8
+%{?_with_gtk2: %patch3 -p1 -b .missing-pango }
 cp -a src/Languages.cpp src/Languages.cpp.orig
 iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
-
-# is this still necessary?
 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
 do
    perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
 
-
 %build
 # Push a softlink into PATH so the renamed wx-config inside
 # the compat-wxGTK2-devel package is found and taken.
-#%define mybindir __mybin__
-#mkdir %{mybindir}
-#ln -s $(which wx-2.4-config) %{mybindir}/wx-config
-#export PATH=$(pwd)/%{mybindir}:$PATH
-
-%configure \
-	--with-help \
-	--with-libsndfile=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
+%define mybindir __mybin__
+mkdir %{mybindir}
+ln -s $(which wx-2.4-config) %{mybindir}/wx-config
+export PATH=$(pwd)/%{mybindir}:$PATH
 
+%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}
+make
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -105,7 +86,7 @@
 Comment=A multitrack audio editor
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.4
-MimeType=application/ogg;application/x-ogg;audio/x-ogg;audio/x-wav;audio/x-flac;audio/aiff;audio/x-aifc;audio/aiffc;audio/x-aiff;audio/basic;application/x-audacity-project
+MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
 StartupWMClass=Audacity
 EOF
 
@@ -122,17 +103,12 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %post
-/usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1 || :
 /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
 
-
 %postun
-/usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1 || :
 /usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || :
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -140,13 +116,11 @@
 %{_mandir}/*/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
-%{_datadir}/mime/packages/*
 %doc %{_datadir}/doc/*
 
-
 %changelog
-* Sun Mar 26 2006 Gerard Milmeister  - 1.3.0-1.beta.1
-- new version 1.3.0beta
+* Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-1
+- new version 1.2.5
 
 * Fri Mar 17 2006 Michael Schwendt  - 1.2.4-0.1.b
 - Update to 1.2.4b (stable release).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Mar 2006 21:49:32 -0000	1.6
+++ sources	3 Nov 2006 21:42:31 -0000	1.7
@@ -1 +1 @@
-d1c5a3359ad95eab6ca8b375972c1a91  audacity-src-1.3.0b.tar.gz
+7558373bee9fd4e7195901b9c0a747f1  audacity-src-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 21:52:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 14:52:21 -0700
Subject: rpms/audacity/FC-6 audacity.spec,1.15,1.16
Message-ID: <200611032152.kA3LqLFt016916@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- audacity.spec	3 Nov 2006 21:38:47 -0000	1.15
+++ audacity.spec	3 Nov 2006 21:51:51 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -57,6 +57,10 @@
 do
    perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
+%ifarch ppc ppc64
+# this flag is not available on ppc
+perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.*
+%endif
 
 %build
 # Push a softlink into PATH so the renamed wx-config inside
@@ -119,6 +123,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2
+- remove -msse flag for ppc
+
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-1
 - new version 1.2.5
 



From fedora-extras-commits at redhat.com  Fri Nov  3 22:09:06 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 15:09:06 -0700
Subject: rpms/audacity/devel audacity.spec,1.15,1.16
Message-ID: <200611032209.kA3M96PA020085@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20064/devel

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- audacity.spec	3 Nov 2006 21:42:32 -0000	1.15
+++ audacity.spec	3 Nov 2006 22:08:35 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -57,6 +57,10 @@
 do
    perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
+%ifarch ppc ppc64
+# this flag is not available on ppc
+perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.*
+%endif
 
 %build
 # Push a softlink into PATH so the renamed wx-config inside
@@ -119,6 +123,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2
+- remove -msse flag for ppc
+
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-1
 - new version 1.2.5
 



From fedora-extras-commits at redhat.com  Fri Nov  3 22:12:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Fri, 3 Nov 2006 15:12:54 -0700
Subject: rpms/audacity/FC-5 audacity.spec,1.15,1.16
Message-ID: <200611032212.kA3MCs4Z020212@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20173

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- audacity.spec	3 Nov 2006 21:42:31 -0000	1.15
+++ audacity.spec	3 Nov 2006 22:12:24 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -57,6 +57,10 @@
 do
    perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
+%ifarch ppc ppc64
+# this flag is not available on ppc
+perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.*
+%endif
 
 %build
 # Push a softlink into PATH so the renamed wx-config inside
@@ -119,6 +123,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2
+- remove -msse flag for ppc
+
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-1
 - new version 1.2.5
 



From fedora-extras-commits at redhat.com  Fri Nov  3 22:13:45 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 3 Nov 2006 15:13:45 -0700
Subject: rpms/perl-DateTime/devel DateTime-LeapSecond-utf8.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 perl-DateTime.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200611032213.kA3MDjEQ020283@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20211

Modified Files:
	.cvsignore perl-DateTime.spec sources 
Added Files:
	DateTime-LeapSecond-utf8.patch 
Log Message:
Update to DateTime 0.35.
Update to DateTime::Locale 0.3101.
LICENSE.icu seems to have been renamed LICENSE.cldr.
Update to DateTime::TimeZone 0.54.
Use fixperms macro instead of our own chmod incantation.
Convert DateTime::LeapSecond to UTF-8 to avoid a rpmlint warning.


DateTime-LeapSecond-utf8.patch:

--- NEW FILE DateTime-LeapSecond-utf8.patch ---
--- DateTime-0.35/lib/DateTime/LeapSecond.pm.orig	2006-02-28 19:15:01.000000000 -0600
+++ DateTime-0.35/lib/DateTime/LeapSecond.pm	2006-11-03 15:53:44.000000000 -0600
@@ -159,11 +159,11 @@
 
 =head1 AUTHOR
 
-Fl?vio Soibelmann Glock, Efglock at pucrs.brE
+Fl??vio Soibelmann Glock, Efglock at pucrs.brE
 
 =head1 COPYRIGHT
 
-Copyright (c) 2003 Fl?vio Soibelmann Glock.  Copyright (c) 2004-2006
+Copyright (c) 2003 Fl??vio Soibelmann Glock.  Copyright (c) 2004-2006
 David Rolsky.  All rights reserved.  This program is free software;
 you can redistribute it and/or modify it under the same terms as Perl
 itself.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 Aug 2006 23:23:54 -0000	1.10
+++ .cvsignore	3 Nov 2006 22:13:14 -0000	1.11
@@ -1,3 +1,3 @@
-DateTime-0.34.tar.gz
-DateTime-Locale-0.22.tar.gz
-DateTime-TimeZone-0.48.tar.gz
+DateTime-0.35.tar.gz
+DateTime-Locale-0.3101.tar.gz
+DateTime-TimeZone-0.54.tar.gz


Index: perl-DateTime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/perl-DateTime.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-DateTime.spec	29 Aug 2006 23:23:54 -0000	1.10
+++ perl-DateTime.spec	3 Nov 2006 22:13:14 -0000	1.11
@@ -1,9 +1,9 @@
-%define DTTimeZone_version 0.48
-%define DTLocale_version 0.22
+%define DTTimeZone_version 0.54
+%define DTLocale_version 0.3101
 
 Name:           perl-DateTime
-Version:        0.34
-Release:        3%{?dist}
+Version:        0.35
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Date and time objects
 License:        GPL or Artistic
@@ -12,6 +12,7 @@
 Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-%{version}.tar.gz
 Source1:        http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-%{DTTimeZone_version}.tar.gz
 Source2:        http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-%{DTLocale_version}.tar.gz
+Patch0:         DateTime-LeapSecond-utf8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Params::Validate) >= 0.76
@@ -42,6 +43,10 @@
 %setup -q -T -D -n DateTimeBundle -a 1
 %setup -q -T -D -n DateTimeBundle -a 2
 
+cd DateTime-%{version}
+%patch0 -p1
+cd -
+
 cat > filter-provides.sh << EOF
 #!/bin/sh
 # Remove redundant unversioned provides of perl(DateTime) and perl(DateTime::TimeZone)
@@ -88,12 +93,12 @@
 find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
 find %{buildroot} -depth  -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w %{buildroot}/*
+%{_fixperms} %{buildroot}/*
 
 # Move documentation into bundle area
 mkdir DT::Locale DT::TimeZone
 mv DateTime-%{version}/{CREDITS,Changes,LICENSE,README,TODO} .
-mv DateTime-Locale-%{DTLocale_version}/{Changes,LICENSE.icu} DT::Locale
+mv DateTime-Locale-%{DTLocale_version}/{Changes,LICENSE.cldr} DT::Locale
 mv DateTime-TimeZone-%{DTTimeZone_version}/{Changes,README} DT::TimeZone
 
 %check
@@ -129,6 +134,14 @@
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Fri Nov 03 2006 Steven Pritchard  1:0.35-1
+- Update to DateTime 0.35.
+- Update to DateTime::Locale 0.3101.
+- LICENSE.icu seems to have been renamed LICENSE.cldr.
+- Update to DateTime::TimeZone 0.54.
+- Use fixperms macro instead of our own chmod incantation.
+- Convert DateTime::LeapSecond to UTF-8 to avoid a rpmlint warning.
+
 * Tue Aug 29 2006 Steven Pritchard  1:0.34-3
 - Update to DateTime::TimeZone 0.48.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	29 Aug 2006 23:23:54 -0000	1.10
+++ sources	3 Nov 2006 22:13:14 -0000	1.11
@@ -1,3 +1,3 @@
-71285d93eba0f92e3285a9e011fc33e1  DateTime-0.34.tar.gz
-bcf9fa78efa8d00fad1293b9d860ce75  DateTime-Locale-0.22.tar.gz
-5c23bc4002a2b67585fd9fa24a3514e3  DateTime-TimeZone-0.48.tar.gz
+3734eafb22059c1ad706edfee66036fd  DateTime-0.35.tar.gz
+1c2b7b145c4f321c61f2cf32a625e942  DateTime-Locale-0.3101.tar.gz
+37bf508b02d941eef2a8bf2990dcca48  DateTime-TimeZone-0.54.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 22:37:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 3 Nov 2006 15:37:19 -0700
Subject: rpms/perl-IPC-Cmd/devel .cvsignore, 1.4, 1.5 perl-IPC-Cmd.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611032237.kA3MbJ1Q020624@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20599

Modified Files:
	.cvsignore perl-IPC-Cmd.spec sources 
Log Message:
Update to 0.34.
Explicitly BR Params::Check >= 0.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Oct 2006 20:35:15 -0000	1.4
+++ .cvsignore	3 Nov 2006 22:36:49 -0000	1.5
@@ -1 +1 @@
-IPC-Cmd-0.32.tar.gz
+IPC-Cmd-0.34.tar.gz


Index: perl-IPC-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/perl-IPC-Cmd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-IPC-Cmd.spec	17 Oct 2006 20:35:15 -0000	1.3
+++ perl-IPC-Cmd.spec	3 Nov 2006 22:36:49 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-IPC-Cmd
-Version:        0.32
+Version:        0.34
 Release:        1%{?dist}
 Summary:        Finding and running system commands made easy
 License:        GPL or Artistic
@@ -10,7 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Load::Conditional)
-BuildRequires:  perl(Params::Check)
+BuildRequires:  perl(Params::Check) >= 0.20
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -47,6 +47,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Steven Pritchard  0.34-1
+- Update to 0.34.
+- Explicitly BR Params::Check >= 0.20.
+
 * Tue Oct 17 2006 Steven Pritchard  0.32-1
 - Update to 0.32.
 - Use fixperms macro instead of our own chmod incantation.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Oct 2006 20:35:15 -0000	1.4
+++ sources	3 Nov 2006 22:36:49 -0000	1.5
@@ -1 +1 @@
-4a9828ce6bd63fedba46bca124743850  IPC-Cmd-0.32.tar.gz
+cfd848ecb76e2a71757f74501396dd48  IPC-Cmd-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 22:40:50 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 3 Nov 2006 15:40:50 -0700
Subject: rpms/perl-Term-UI/devel .cvsignore, 1.2, 1.3 perl-Term-UI.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611032240.kA3MeoKI020731@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20705

Modified Files:
	.cvsignore perl-Term-UI.spec sources 
Log Message:
Update to 0.14.
Use fixperms macro instead of our own chmod incantation.
Include CHANGES in docs.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Apr 2006 23:14:31 -0000	1.2
+++ .cvsignore	3 Nov 2006 22:40:19 -0000	1.3
@@ -1 +1 @@
-Term-UI-0.12.tar.gz
+Term-UI-0.14.tar.gz


Index: perl-Term-UI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/devel/perl-Term-UI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Term-UI.spec	17 Sep 2006 22:26:21 -0000	1.2
+++ perl-Term-UI.spec	3 Nov 2006 22:40:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Term-UI
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Term::ReadLine UI made easy
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -34,7 +34,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
-chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
@@ -44,11 +44,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc CHANGES README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 03 2006 Steven Pritchard  0.14-1
+- Update to 0.14.
+- Use fixperms macro instead of our own chmod incantation.
+- Include CHANGES in docs.
+
 * Sat Sep 16 2006 Steven Pritchard  0.12-2
 - Fix find option order.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Apr 2006 23:14:31 -0000	1.2
+++ sources	3 Nov 2006 22:40:19 -0000	1.3
@@ -1 +1 @@
-b34442df078685f3e8b1197e1e98d1e6  Term-UI-0.12.tar.gz
+a929235d67c718af3d1d431987796cd8  Term-UI-0.14.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 22:47:11 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 3 Nov 2006 15:47:11 -0700
Subject: rpms/perl-Apache-LogRegex/devel perl-Apache-LogRegex.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611032247.kA3MlBL0020859@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-LogRegex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20839

Modified Files:
	perl-Apache-LogRegex.spec sources 
Log Message:
Update to 1.4.
Cleanup to more closely match cpanspec output.



Index: perl-Apache-LogRegex.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/devel/perl-Apache-LogRegex.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Apache-LogRegex.spec	26 Sep 2006 21:23:57 -0000	1.2
+++ perl-Apache-LogRegex.spec	3 Nov 2006 22:46:41 -0000	1.3
@@ -1,14 +1,12 @@
 Name:           perl-Apache-LogRegex
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Parse a line from an Apache logfile into a hash
-
-Group:          Development/Libraries
 License:        GPL or Artistic
+Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Apache-LogRegex/
-Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETERHI/Apache-LogRegex-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETERHI/Apache-LogRegex-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -20,38 +18,38 @@
 
 %prep
 %setup -q -n Apache-LogRegex-%{version}
-perldoc -t perlartistic > Artistic
-perldoc -t perlgpl      > COPYING 
-
 
 %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 ';'
-chmod -R u+w $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 README Artistic COPYING
-%{perl_vendorlib}/Apache/
-%{_mandir}/man3/*.3*
+%doc README
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Oct 30 2006 Steven Pritchard  1.4-1
+- Update to 1.4.
+- Cleanup to more closely match cpanspec output.
+
 * Tue Sep 26 2006 Steven Pritchard  1.3-1
 - Update to 1.3.
 - Fix find option order.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-LogRegex/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 21:23:57 -0000	1.2
+++ sources	3 Nov 2006 22:46:41 -0000	1.3
@@ -1 +1 @@
-c45cbbf57fcd6aed4b5e745654530734  Apache-LogRegex-1.3.tar.gz
+512fb013427ef3d1246f6d23fece5870  Apache-LogRegex-1.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov  3 23:52:46 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 3 Nov 2006 16:52:46 -0700
Subject: rpms/raptor/devel raptor.spec,1.6,1.7
Message-ID: <200611032352.kA3NqkR7025010@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24990

Modified Files:
	raptor.spec 
Log Message:
Increment revision.  Rebuild for new libcurl.



Index: raptor.spec
===================================================================
RCS file: /cvs/extras/rpms/raptor/devel/raptor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- raptor.spec	4 Oct 2006 22:52:43 -0000	1.6
+++ raptor.spec	3 Nov 2006 23:52:16 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:       Raptor RDF Parser Toolkit for Redland
 Name:          raptor
 Version:       1.4.9
-Release:       5%{?dist}
+Release:       6%{?dist}
 License:       LGPL or Apache License Version 2.0
 Group:         System Environment/Libraries
 Source:        http://www.redland.opensource.ac.uk/dist/source/raptor-1.4.9.tar.gz
@@ -70,6 +70,9 @@
 %{_bindir}/raptor-config
 
 %changelog
+* Fri Nov 3 2006 Anthony Green  1.4.9-6
+- Rebuild for new libcurl.
+
 * Thu Oct 05 2006 Christian Iseli  1.4.9-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Sat Nov  4 01:21:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:21:46 -0700
Subject: rpms/SoQt/devel .cvsignore, 1.6, 1.7 SoQt.spec, 1.18, 1.19 sources, 
	1.6, 1.7
Message-ID: <200611040121.kA41Lkvj031519@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31497/devel

Modified Files:
	.cvsignore SoQt.spec sources 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SoQt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2006 03:55:56 -0000	1.6
+++ .cvsignore	4 Nov 2006 01:21:15 -0000	1.7
@@ -1 +1 @@
-SoQt-1.4.0.tar.gz
+SoQt-1.4.1.tar.gz


Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SoQt.spec	8 Sep 2006 03:55:56 -0000	1.18
+++ SoQt.spec	4 Nov 2006 01:21:15 -0000	1.19
@@ -3,7 +3,7 @@
 
 Summary: High-level 3D visualization library
 Name: SoQt
-Version: 1.4.0
+Version: 1.4.1
 Release: 1%{?dist}
 
 License: GPL
@@ -94,6 +94,9 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
+- Upstream update.
+
 * Tue Sep 08 2006 Ralf Cors??pius  - 1.4.0-1
 - Upstream update.
 - Add utf-8/doxygen hack.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SoQt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2006 03:55:56 -0000	1.6
+++ sources	4 Nov 2006 01:21:15 -0000	1.7
@@ -1 +1 @@
-b1209e7a2ab1c598d72d1bc364ce5ce5  SoQt-1.4.0.tar.gz
+6dddafb755e9afb9924da1d46f3cd0d4  SoQt-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 01:22:24 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:22:24 -0700
Subject: rpms/SoQt/FC-6 .cvsignore, 1.6, 1.7 SoQt.spec, 1.18, 1.19 sources,
	1.6, 1.7
Message-ID: <200611040122.kA41MO05031545@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31525/FC-6

Modified Files:
	.cvsignore SoQt.spec sources 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2006 03:55:56 -0000	1.6
+++ .cvsignore	4 Nov 2006 01:21:53 -0000	1.7
@@ -1 +1 @@
-SoQt-1.4.0.tar.gz
+SoQt-1.4.1.tar.gz


Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-6/SoQt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SoQt.spec	8 Sep 2006 03:55:56 -0000	1.18
+++ SoQt.spec	4 Nov 2006 01:21:53 -0000	1.19
@@ -3,7 +3,7 @@
 
 Summary: High-level 3D visualization library
 Name: SoQt
-Version: 1.4.0
+Version: 1.4.1
 Release: 1%{?dist}
 
 License: GPL
@@ -94,6 +94,9 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
+- Upstream update.
+
 * Tue Sep 08 2006 Ralf Cors??pius  - 1.4.0-1
 - Upstream update.
 - Add utf-8/doxygen hack.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2006 03:55:56 -0000	1.6
+++ sources	4 Nov 2006 01:21:53 -0000	1.7
@@ -1 +1 @@
-b1209e7a2ab1c598d72d1bc364ce5ce5  SoQt-1.4.0.tar.gz
+6dddafb755e9afb9924da1d46f3cd0d4  SoQt-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 01:23:02 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:23:02 -0700
Subject: rpms/SoQt/FC-5 .cvsignore, 1.6, 1.7 SoQt.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200611040123.kA41N2c2031573@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31551/FC-5

Modified Files:
	.cvsignore SoQt.spec sources 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2006 04:15:29 -0000	1.6
+++ .cvsignore	4 Nov 2006 01:22:32 -0000	1.7
@@ -1 +1 @@
-SoQt-1.4.0.tar.gz
+SoQt-1.4.1.tar.gz


Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-5/SoQt.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SoQt.spec	8 Sep 2006 04:15:29 -0000	1.17
+++ SoQt.spec	4 Nov 2006 01:22:32 -0000	1.18
@@ -3,7 +3,7 @@
 
 Summary: High-level 3D visualization library
 Name: SoQt
-Version: 1.4.0
+Version: 1.4.1
 Release: 1%{?dist}
 
 License: GPL
@@ -94,6 +94,9 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
+- Upstream update.
+
 * Tue Sep 08 2006 Ralf Cors??pius  - 1.4.0-1
 - Upstream update.
 - Add utf-8/doxygen hack.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2006 04:15:29 -0000	1.6
+++ sources	4 Nov 2006 01:22:32 -0000	1.7
@@ -1 +1 @@
-b1209e7a2ab1c598d72d1bc364ce5ce5  SoQt-1.4.0.tar.gz
+6dddafb755e9afb9924da1d46f3cd0d4  SoQt-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 01:23:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:23:40 -0700
Subject: rpms/SoQt/FC-4 .cvsignore, 1.5, 1.6 SoQt.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200611040123.kA41NeEc031599@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31579/FC-4

Modified Files:
	.cvsignore SoQt.spec sources 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 04:17:17 -0000	1.5
+++ .cvsignore	4 Nov 2006 01:23:10 -0000	1.6
@@ -1 +1 @@
-SoQt-1.4.0.tar.gz
+SoQt-1.4.1.tar.gz


Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-4/SoQt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SoQt.spec	8 Sep 2006 04:17:17 -0000	1.12
+++ SoQt.spec	4 Nov 2006 01:23:10 -0000	1.13
@@ -3,7 +3,7 @@
 
 Summary: High-level 3D visualization library
 Name: SoQt
-Version: 1.4.0
+Version: 1.4.1
 Release: 1%{?dist}
 
 License: GPL
@@ -94,6 +94,9 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
+- Upstream update.
+
 * Tue Sep 08 2006 Ralf Cors??pius  - 1.4.0-1
 - Upstream update.
 - Add utf-8/doxygen hack.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 04:17:17 -0000	1.5
+++ sources	4 Nov 2006 01:23:10 -0000	1.6
@@ -1 +1 @@
-b1209e7a2ab1c598d72d1bc364ce5ce5  SoQt-1.4.0.tar.gz
+6dddafb755e9afb9924da1d46f3cd0d4  SoQt-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 01:45:03 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:45:03 -0700
Subject: rpms/SoQt/devel SoQt.spec,1.19,1.20
Message-ID: <200611040145.kA41j36v031908@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31882

Modified Files:
	SoQt.spec 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
- Inc Release due to buildsys bug.



Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/devel/SoQt.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SoQt.spec	4 Nov 2006 01:21:15 -0000	1.19
+++ SoQt.spec	4 Nov 2006 01:44:33 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: High-level 3D visualization library
 Name: SoQt
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -94,6 +94,9 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
+- Inc Release due to buildsys bug.
+
 * Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Nov  4 01:46:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:46:43 -0700
Subject: rpms/SoQt/FC-6 SoQt.spec,1.19,1.20
Message-ID: <200611040146.kA41kh14031973@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31957

Modified Files:
	SoQt.spec 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
- Inc Release due to buildsys bug.



Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-6/SoQt.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SoQt.spec	4 Nov 2006 01:21:53 -0000	1.19
+++ SoQt.spec	4 Nov 2006 01:46:13 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: High-level 3D visualization library
 Name: SoQt
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -94,6 +94,9 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
+- Inc Release due to buildsys bug.
+
 * Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Nov  4 01:48:19 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:48:19 -0700
Subject: rpms/SoQt/FC-5 SoQt.spec,1.18,1.19
Message-ID: <200611040148.kA41mJKK032033@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32017

Modified Files:
	SoQt.spec 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
- Inc Release due to buildsys bug.



Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-5/SoQt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SoQt.spec	4 Nov 2006 01:22:32 -0000	1.18
+++ SoQt.spec	4 Nov 2006 01:47:49 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: High-level 3D visualization library
 Name: SoQt
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -94,6 +94,9 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
+- Inc Release due to buildsys bug.
+
 * Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Nov  4 01:52:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:52:42 -0700
Subject: rpms/SoQt/FC-4 SoQt.spec,1.13,1.14
Message-ID: <200611040152.kA41qgU4032122@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32106

Modified Files:
	SoQt.spec 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
- Inc Release due to buildsys bug.



Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-4/SoQt.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SoQt.spec	4 Nov 2006 01:23:10 -0000	1.13
+++ SoQt.spec	4 Nov 2006 01:52:11 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: High-level 3D visualization library
 Name: SoQt
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -94,6 +94,9 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
+- Inc Release due to buildsys bug.
+
 * Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
 - Upstream update.
 



From fedora-extras-commits at redhat.com  Sat Nov  4 01:54:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Fri, 3 Nov 2006 18:54:43 -0700
Subject: rpms/SoQt/FC-3 .cvsignore, 1.5, 1.6 SoQt.spec, 1.9, 1.10 sources,
	1.5, 1.6
Message-ID: <200611040154.kA41she7032193@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SoQt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32173

Modified Files:
	.cvsignore SoQt.spec sources 
Log Message:
* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
- Inc Release due to buildsys bug.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Sep 2006 04:18:55 -0000	1.5
+++ .cvsignore	4 Nov 2006 01:54:13 -0000	1.6
@@ -1 +1 @@
-SoQt-1.4.0.tar.gz
+SoQt-1.4.1.tar.gz


Index: SoQt.spec
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-3/SoQt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SoQt.spec	8 Sep 2006 04:18:55 -0000	1.9
+++ SoQt.spec	4 Nov 2006 01:54:13 -0000	1.10
@@ -3,8 +3,8 @@
 
 Summary: High-level 3D visualization library
 Name: SoQt
-Version: 1.4.0
-Release: 1%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -94,6 +94,12 @@
 %{_mandir}/man?/*.?.gz
 
 %changelog
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-2
+- Inc Release due to buildsys bug.
+
+* Sat Nov 04 2006 Ralf Cors??pius  - 1.4.1-1
+- Upstream update.
+
 * Tue Sep 08 2006 Ralf Cors??pius  - 1.4.0-1
 - Upstream update.
 - Add utf-8/doxygen hack.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SoQt/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Sep 2006 04:18:55 -0000	1.5
+++ sources	4 Nov 2006 01:54:13 -0000	1.6
@@ -1 +1 @@
-b1209e7a2ab1c598d72d1bc364ce5ce5  SoQt-1.4.0.tar.gz
+6dddafb755e9afb9924da1d46f3cd0d4  SoQt-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 04:32:46 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 3 Nov 2006 21:32:46 -0700
Subject: rpms/gaim-rhythmbox/FC-6 .cvsignore, 1.2, 1.3 gaim-rhythmbox.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611040432.kA44Wkef009614@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9573/FC-6

Modified Files:
	.cvsignore gaim-rhythmbox.spec sources 
Log Message:
Update FC-6 and devel to 2.0beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2006 04:17:15 -0000	1.2
+++ .cvsignore	4 Nov 2006 04:32:16 -0000	1.3
@@ -1 +1 @@
-gaim-rhythmbox-2.0beta3.tar.gz
+gaim-rhythmbox-2.0beta4.tar.gz


Index: gaim-rhythmbox.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-6/gaim-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-rhythmbox.spec	3 Nov 2006 04:17:15 -0000	1.1
+++ gaim-rhythmbox.spec	4 Nov 2006 04:32:16 -0000	1.2
@@ -1,14 +1,13 @@
-%define prever beta3
+%define prever beta4
 Name:           gaim-rhythmbox
 Version:        2.0
-Release:        0.3.%{prever}%{?dist}
+Release:        0.4.%{prever}%{?dist}
 Summary:        Rhythmbox plugin for GAIM
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jon.oberheide.org/projects/gaim-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}%{prever}.tar.gz
-Patch0:         gaim-rhythmbox-configure.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim-devel
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch0
 
 
 %build
@@ -53,6 +51,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Michel Salim  2.0-0.4.beta4
+- Update to beta4
+
 * Thu Nov  2 2006 Michel Salim  2.0-0.3.beta3
 - Tidy up prever use, description field, and add files to documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2006 04:17:15 -0000	1.2
+++ sources	4 Nov 2006 04:32:16 -0000	1.3
@@ -1 +1 @@
-a9e836986dae7857b408120782264d5a  gaim-rhythmbox-2.0beta3.tar.gz
+40d08481c38c8afd57d7c8b20d6dadbf  gaim-rhythmbox-2.0beta4.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 04:32:47 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 3 Nov 2006 21:32:47 -0700
Subject: rpms/gaim-rhythmbox/devel .cvsignore, 1.2, 1.3 gaim-rhythmbox.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611040432.kA44WlRZ009619@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9573/devel

Modified Files:
	.cvsignore gaim-rhythmbox.spec sources 
Log Message:
Update FC-6 and devel to 2.0beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2006 04:17:15 -0000	1.2
+++ .cvsignore	4 Nov 2006 04:32:17 -0000	1.3
@@ -1 +1 @@
-gaim-rhythmbox-2.0beta3.tar.gz
+gaim-rhythmbox-2.0beta4.tar.gz


Index: gaim-rhythmbox.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/gaim-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-rhythmbox.spec	3 Nov 2006 04:17:15 -0000	1.1
+++ gaim-rhythmbox.spec	4 Nov 2006 04:32:17 -0000	1.2
@@ -1,14 +1,13 @@
-%define prever beta3
+%define prever beta4
 Name:           gaim-rhythmbox
 Version:        2.0
-Release:        0.3.%{prever}%{?dist}
+Release:        0.4.%{prever}%{?dist}
 Summary:        Rhythmbox plugin for GAIM
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jon.oberheide.org/projects/gaim-rhythmbox/
 Source0:        http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}%{prever}.tar.gz
-Patch0:         gaim-rhythmbox-configure.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim-devel
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
-%patch0
 
 
 %build
@@ -53,6 +51,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Michel Salim  2.0-0.4.beta4
+- Update to beta4
+
 * Thu Nov  2 2006 Michel Salim  2.0-0.3.beta3
 - Tidy up prever use, description field, and add files to documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2006 04:17:15 -0000	1.2
+++ sources	4 Nov 2006 04:32:17 -0000	1.3
@@ -1 +1 @@
-a9e836986dae7857b408120782264d5a  gaim-rhythmbox-2.0beta3.tar.gz
+40d08481c38c8afd57d7c8b20d6dadbf  gaim-rhythmbox-2.0beta4.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 06:16:40 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 3 Nov 2006 23:16:40 -0700
Subject: rpms/R/FC-4 R.spec,1.17,1.18
Message-ID: <200611040616.kA46GevC015923@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/FC-4

Modified Files:
	R.spec 
Log Message:

Update to current patched level to fix buffer overflow condition.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- R.spec	16 Oct 2006 21:09:25 -0000	1.17
+++ R.spec	4 Nov 2006 06:16:09 -0000	1.18
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.4.0
-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
@@ -16,6 +16,9 @@
 BuildRequires: java-1.4.2-gcj-compat, lapack-devel
 Requires: evince, cups, firefox
 
+# This syncs us with the "patched" development tree.
+Patch0: R-2.4.0-patched-2006-11-03.patch
+
 # These are the submodules that R provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are 
 # provided for packager convenience. 
@@ -96,6 +99,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
 export R_PDFVIEWER="%{_bindir}/evince"
@@ -115,7 +119,7 @@
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib )\
- | egrep '^R is now|^ |^$' - > CAPABILITIES
+ | grep -A30 'R is now' - > CAPABILITIES
 make 
 (cd src/nmath/standalone; make)
 #make check-all
@@ -226,6 +230,9 @@
 /sbin/ldconfig
 
 %changelog
+* Fri Nov  3 2006 Tom "spot" Callaway  2.4.0-2
+- sync with patched 2006-11-03 level to fix PR#9339
+
 * Sun Oct 15 2006 Tom "spot" Callaway  2.4.0-1
 - bump for 2.4.0
 



From fedora-extras-commits at redhat.com  Sat Nov  4 06:16:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 3 Nov 2006 23:16:42 -0700
Subject: rpms/R/FC-6 R.spec,1.19,1.20
Message-ID: <200611040616.kA46Ggir015929@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/FC-6

Modified Files:
	R.spec 
Log Message:

Update to current patched level to fix buffer overflow condition.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-6/R.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- R.spec	16 Oct 2006 21:09:27 -0000	1.19
+++ R.spec	4 Nov 2006 06:16:11 -0000	1.20
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.4.0
-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
@@ -16,6 +16,9 @@
 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 Requires: evince, cups, firefox
 
+# This syncs us with the "patched" development tree.
+Patch0: R-2.4.0-patched-2006-11-03.patch
+
 # These are the submodules that R provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are 
 # provided for packager convenience. 
@@ -95,7 +98,8 @@
 and header files.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1
 
 %build
 export R_PDFVIEWER="%{_bindir}/evince"
@@ -108,7 +112,7 @@
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib )\
- | egrep '^R is now|^ |^$' - > CAPABILITIES
+ | grep -A30 'R is now' - > CAPABILITIES
 make 
 (cd src/nmath/standalone; make)
 #make check-all
@@ -219,6 +223,9 @@
 /sbin/ldconfig
 
 %changelog
+* Fri Nov  3 2006 Tom "spot" Callaway  2.4.0-2
+- sync with patched 2006-11-03 level to fix PR#9339
+
 * Sun Oct 15 2006 Tom "spot" Callaway  2.4.0-1
 - bump for 2.4.0
 



From fedora-extras-commits at redhat.com  Sat Nov  4 06:16:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 3 Nov 2006 23:16:41 -0700
Subject: rpms/R/FC-5 R.spec,1.17,1.18
Message-ID: <200611040616.kA46GfGd015926@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/FC-5

Modified Files:
	R.spec 
Log Message:

Update to current patched level to fix buffer overflow condition.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/R.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- R.spec	16 Oct 2006 21:09:26 -0000	1.17
+++ R.spec	4 Nov 2006 06:16:11 -0000	1.18
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.4.0
-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
@@ -16,6 +16,9 @@
 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 Requires: evince, cups, firefox
 
+# This syncs us with the "patched" development tree.
+Patch0: R-2.4.0-patched-2006-11-03.patch
+
 # These are the submodules that R provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are 
 # provided for packager convenience. 
@@ -95,7 +98,8 @@
 and header files.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1
 
 %build
 export R_PDFVIEWER="%{_bindir}/evince"
@@ -108,7 +112,7 @@
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib )\
- | egrep '^R is now|^ |^$' - > CAPABILITIES
+ | grep -A30 'R is now' - > CAPABILITIES
 make 
 (cd src/nmath/standalone; make)
 #make check-all
@@ -219,6 +223,9 @@
 /sbin/ldconfig
 
 %changelog
+* Fri Nov  3 2006 Tom "spot" Callaway  2.4.0-2
+- sync with patched 2006-11-03 level to fix PR#9339
+
 * Sun Oct 15 2006 Tom "spot" Callaway  2.4.0-1
 - bump for 2.4.0
 



From fedora-extras-commits at redhat.com  Sat Nov  4 06:16:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 3 Nov 2006 23:16:42 -0700
Subject: rpms/R/devel R.spec,1.19,1.20
Message-ID: <200611040616.kA46Ggtn015932@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15862/devel

Modified Files:
	R.spec 
Log Message:

Update to current patched level to fix buffer overflow condition.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- R.spec	16 Oct 2006 21:09:27 -0000	1.19
+++ R.spec	4 Nov 2006 06:16:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.4.0
-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
@@ -16,6 +16,9 @@
 BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 Requires: evince, cups, firefox
 
+# This syncs us with the "patched" development tree.
+Patch0: R-2.4.0-patched-2006-11-03.patch
+
 # These are the submodules that R provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are 
 # provided for packager convenience. 
@@ -95,7 +98,8 @@
 and header files.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1
 
 %build
 export R_PDFVIEWER="%{_bindir}/evince"
@@ -108,7 +112,7 @@
     --with-tcl-config=%{_libdir}/tclConfig.sh \
     --with-tk-config=%{_libdir}/tkConfig.sh \
     --enable-R-shlib )\
- | egrep '^R is now|^ |^$' - > CAPABILITIES
+ | grep -A30 'R is now' - > CAPABILITIES
 make 
 (cd src/nmath/standalone; make)
 #make check-all
@@ -219,6 +223,9 @@
 /sbin/ldconfig
 
 %changelog
+* Fri Nov  3 2006 Tom "spot" Callaway  2.4.0-2
+- sync with patched 2006-11-03 level to fix PR#9339
+
 * Sun Oct 15 2006 Tom "spot" Callaway  2.4.0-1
 - bump for 2.4.0
 



From fedora-extras-commits at redhat.com  Sat Nov  4 06:19:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 3 Nov 2006 23:19:57 -0700
Subject: rpms/R/FC-5 R-2.4.0-patched-2006-11-03.patch,NONE,1.1
Message-ID: <200611040620.kA46JvNq016027@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/FC-5

Added Files:
	R-2.4.0-patched-2006-11-03.patch 
Log Message:

Patch from upstream


R-2.4.0-patched-2006-11-03.patch:

--- NEW FILE R-2.4.0-patched-2006-11-03.patch ---
diff -urp R-2.4.0.old/config.site R-2.4.0/config.site
--- R-2.4.0.old/config.site	2006-09-04 09:41:48.000000000 -0500
+++ R-2.4.0/config.site	2006-10-28 14:36:13.000000000 -0500
@@ -43,12 +43,16 @@
 ## If unspecified, a search is made for gcc and cc (in that order).
 ## To override this choice, specify the name of the command which runs
 ## the compiler here, for example 'c89'.
+## It is also convenient to set the architecture here, e.g. 'gcc -m32'.
+## NB, as from R 2.5.0 configure will append flags for C99 compliance,
+## e.g. CC=gcc -std=gnu99
+## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS.
 ## CC=
 
 ## Debugging and optimization options for the C compiler.
 ## Use this to specify CFLAGS for the version of the C compiler
 ## specified above.
-## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, 
+## If unspecified, defaults to '-g -O2' for gcc, 
 ## and '-g' in all other cases except icc (for which see R-admin.html).
 ## CFLAGS=
 
diff -urp R-2.4.0.old/configure R-2.4.0/configure
--- R-2.4.0.old/configure	2006-10-03 05:01:50.000000000 -0500
+++ R-2.4.0/configure	2006-11-03 19:41:47.000000000 -0600
@@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+## next is a macro borrowed from autoconf 2.60
+   echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_c99+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include 
+#include 
+#include 
+#include 
+#include 
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict(ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy work.
+static void
+test_varargs(const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  va_list args_copy;
+  va_copy(args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg(args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg(args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = (float) va_arg(args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end(args_copy);
+  va_end(args);
+}
+
+int
+main ()
+{
+
+  // Check bool and long long datatypes.
+  _Bool success = false;
+  long long int bignum = -1234567890LL;
+  unsigned long long int ubignum = 1234567890uLL;
+
+  // Check restrict.
+  if (test_restrict("String literal") != 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs("s, d' f .", "string", 65, 34.234);
+
+  // Check incomplete arrays work.
+  struct incomplete_array *ia =
+    malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = (double) i * 1.234;
+
+  // Check named initialisers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[43] = 543;
+
+  // work around unused variable warnings
+  return  bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x';
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_c99=$ac_arg
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  xno)
+    echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6 ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
[...9677 lines suppressed...]
-48.24 496.53 (Rural Male) 0 0 0 t
-48.24 389.83 (Rural Female) 0 0 0 t
-48.24 283.13 (Urban Male) 0 0 0 t
-48.24 176.43 (Urban Female) 0 0 0 t
+63.36 469.38 (Rural Male) 0 0 0 t
+63.36 379.24 (Rural Female) 0 0 0 t
+63.36 289.10 (Urban Male) 0 0 0 t
+63.36 198.96 (Urban Female) 0 0 0 t
 0.75 setlinewidth
 [] 0 setdash
 1 setlinecap
 1 setlinejoin
 10.00 setmiterlimit
 np
-206.83 91.44 m
-553.53 0 l
+220.11 128.16 m
+526.75 0 l
 o
 np
-206.83 91.44 m
+220.11 128.16 m
 0 -10.80 l
 o
 np
-299.08 91.44 m
+307.90 128.16 m
 0 -10.80 l
 o
 np
-391.34 91.44 m
+395.69 128.16 m
 0 -10.80 l
 o
 np
-483.60 91.44 m
+483.48 128.16 m
 0 -10.80 l
 o
 np
-575.85 91.44 m
+571.27 128.16 m
 0 -10.80 l
 o
 np
-668.11 91.44 m
+659.06 128.16 m
 0 -10.80 l
 o
 np
-760.36 91.44 m
+746.86 128.16 m
 0 -10.80 l
 o
-206.83 52.56 (10) .5 0 0 t
-299.08 52.56 (20) .5 0 0 t
-391.34 52.56 (30) .5 0 0 t
-483.60 52.56 (40) .5 0 0 t
-575.85 52.56 (50) .5 0 0 t
-668.11 52.56 (60) .5 0 0 t
-760.36 52.56 (70) .5 0 0 t
-np
-168.93 91.44 m
-624.72 0 l
-0 426.80 l
--624.72 0 l
-0 -426.80 l
+220.11 89.28 (10) .5 0 0 t
+307.90 89.28 (20) .5 0 0 t
+395.69 89.28 (30) .5 0 0 t
+483.48 89.28 (40) .5 0 0 t
+571.27 89.28 (50) .5 0 0 t
+659.06 89.28 (60) .5 0 0 t
+746.86 89.28 (70) .5 0 0 t
+np
+184.05 128.16 m
+594.48 0 l
+0 360.56 l
+-594.48 0 l
+0 -360.56 l
 o
 18.00 18.00 823.89 577.28 cl
 /ps 22 def /Font2 findfont 22 s
 0 0 0 rgb
-481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t
+481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t
 ep
 %%Page: 5 5
 bp
@@ -3771,8 +3771,8 @@ np
 0 -7.20 l
 o
 /ps 12 def /Font1 findfont 12 s
-78.70 65.52 (1   e-11) .5 0 0 t
-222.02 65.52 (1   e+53) .5 0 0 t
+78.70 65.52 (1e-11) .5 0 0 t
+222.02 65.52 (1e+53) .5 0 0 t
 365.35 65.52 (1e+117) .5 0 0 t
 508.68 65.52 (1e+181) .5 0 0 t
 652.00 65.52 (1e+245) .5 0 0 t
@@ -3800,8 +3800,8 @@ np
 77.04 436.50 m
 -7.20 0 l
 o
-59.76 92.27 (1   e-10) .5 0 90 t
-59.76 178.32 (1   e+49) .5 0 90 t
+59.76 92.27 (1e-10) .5 0 90 t
+59.76 178.32 (1e+49) .5 0 90 t
 59.76 264.38 (1e+108) .5 0 90 t
 59.76 350.44 (1e+167) .5 0 90 t
 59.76 436.50 (1e+226) .5 0 90 t
diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R
--- R-2.4.0.old/tests/reg-tests-1.R	2006-09-25 21:05:07.000000000 -0500
+++ R-2.4.0/tests/reg-tests-1.R	2006-10-28 14:36:01.000000000 -0500
@@ -4494,3 +4494,20 @@ test <- 1:10
 try(test[2:4] <- ls) # fails
 stopifnot(!exists("*tmp*", where=1))
 ## was true < 2.4.0
+
+
+## merge on zero-row data frames
+L3 <- LETTERS[1:3]
+d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE))
+e <- d[-1,]
+merge(d, e, by.x = "x", by.y = "x", all.x = TRUE)
+##
+
+
+## PR#9313
+library(stats4)
+g <- function(x, y) -cos(x) + abs(y)
+fit1 <- mle(g, start = list(x = 0, y = 7))
+fit2 <- mle(g, start = list(y = 7, x = 0))
+stopifnot(all.equal(coef(fit1), coef(fit2)))
+## Found different solutions in 2.4.0, as names were not remapped in fit2
diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R
--- R-2.4.0.old/tests/reg-tests-2.R	2006-09-22 21:05:09.000000000 -0500
+++ R-2.4.0/tests/reg-tests-2.R	2006-10-28 14:36:01.000000000 -0500
@@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",")
 
 
 ### end of tests added in 2.4.0 ###
+
+
+## Platform-specific behaviour in lowess reported to R-help
+## 2006-10-12 by Frank Harrell
+x <- c(0,7,8,14,15,120,242)
+y <- c(122,128,130,158,110,110,92)
+lowess(x, y, iter=0)
+lowess(x, y)
+## MAD of iterated residuals was zero, and result depended on the platform.
+
+
+### end of tests added in 2.4.1 ###
diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save
--- R-2.4.0.old/tests/reg-tests-2.Rout.save	2006-09-25 21:05:07.000000000 -0500
+++ R-2.4.0/tests/reg-tests-2.Rout.save	2006-10-28 14:36:01.000000000 -0500
@@ -1,6 +1,6 @@
 
-R version 2.4.0 beta (2005-09-25 r39509)
-Copyright (C)  The R Foundation for Statistical Computing
+R version 2.5.0 Under development (unstable) (2006-10-15 r39637)
+Copyright (C) 2006 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg
 > 
 > ### end of tests added in 2.4.0 ###
 > 
+> 
+> ## Platform-specific behaviour in lowess reported to R-help
+> ## 2006-10-12 by Frank Harrell
+> x <- c(0,7,8,14,15,120,242)
+> y <- c(122,128,130,158,110,110,92)
+> lowess(x, y, iter=0)
+$x
+[1]   0   7   8  14  15 120 242
+
+$y
+[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903  92.00003
+
+> lowess(x, y)
+$x
+[1]   0   7   8  14  15 120 242
+
+$y
+[1] 122 128 128 158 110 110  92
+
+> ## MAD of iterated residuals was zero, and result depended on the platform.
+> 
+> 
+> ### end of tests added in 2.4.1 ###
+> 
diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION
--- R-2.4.0.old/VERSION	2006-10-03 05:00:12.000000000 -0500
+++ R-2.4.0/VERSION	2006-10-03 07:19:25.000000000 -0500
@@ -1 +1 @@
-2.4.0
+2.4.0 Patched



From fedora-extras-commits at redhat.com  Sat Nov  4 06:19:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 3 Nov 2006 23:19:58 -0700
Subject: rpms/R/FC-6 R-2.4.0-patched-2006-11-03.patch,NONE,1.1
Message-ID: <200611040620.kA46Jw3h016042@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/FC-6

Added Files:
	R-2.4.0-patched-2006-11-03.patch 
Log Message:

Patch from upstream


R-2.4.0-patched-2006-11-03.patch:

--- NEW FILE R-2.4.0-patched-2006-11-03.patch ---
diff -urp R-2.4.0.old/config.site R-2.4.0/config.site
--- R-2.4.0.old/config.site	2006-09-04 09:41:48.000000000 -0500
+++ R-2.4.0/config.site	2006-10-28 14:36:13.000000000 -0500
@@ -43,12 +43,16 @@
 ## If unspecified, a search is made for gcc and cc (in that order).
 ## To override this choice, specify the name of the command which runs
 ## the compiler here, for example 'c89'.
+## It is also convenient to set the architecture here, e.g. 'gcc -m32'.
+## NB, as from R 2.5.0 configure will append flags for C99 compliance,
+## e.g. CC=gcc -std=gnu99
+## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS.
 ## CC=
 
 ## Debugging and optimization options for the C compiler.
 ## Use this to specify CFLAGS for the version of the C compiler
 ## specified above.
-## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, 
+## If unspecified, defaults to '-g -O2' for gcc, 
 ## and '-g' in all other cases except icc (for which see R-admin.html).
 ## CFLAGS=
 
diff -urp R-2.4.0.old/configure R-2.4.0/configure
--- R-2.4.0.old/configure	2006-10-03 05:01:50.000000000 -0500
+++ R-2.4.0/configure	2006-11-03 19:41:47.000000000 -0600
@@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+## next is a macro borrowed from autoconf 2.60
+   echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_c99+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include 
+#include 
+#include 
+#include 
+#include 
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict(ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy work.
+static void
+test_varargs(const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  va_list args_copy;
+  va_copy(args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg(args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg(args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = (float) va_arg(args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end(args_copy);
+  va_end(args);
+}
+
+int
+main ()
+{
+
+  // Check bool and long long datatypes.
+  _Bool success = false;
+  long long int bignum = -1234567890LL;
+  unsigned long long int ubignum = 1234567890uLL;
+
+  // Check restrict.
+  if (test_restrict("String literal") != 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs("s, d' f .", "string", 65, 34.234);
+
+  // Check incomplete arrays work.
+  struct incomplete_array *ia =
+    malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = (double) i * 1.234;
+
+  // Check named initialisers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[43] = 543;
+
+  // work around unused variable warnings
+  return  bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x';
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_c99=$ac_arg
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  xno)
+    echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6 ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
[...9677 lines suppressed...]
-48.24 496.53 (Rural Male) 0 0 0 t
-48.24 389.83 (Rural Female) 0 0 0 t
-48.24 283.13 (Urban Male) 0 0 0 t
-48.24 176.43 (Urban Female) 0 0 0 t
+63.36 469.38 (Rural Male) 0 0 0 t
+63.36 379.24 (Rural Female) 0 0 0 t
+63.36 289.10 (Urban Male) 0 0 0 t
+63.36 198.96 (Urban Female) 0 0 0 t
 0.75 setlinewidth
 [] 0 setdash
 1 setlinecap
 1 setlinejoin
 10.00 setmiterlimit
 np
-206.83 91.44 m
-553.53 0 l
+220.11 128.16 m
+526.75 0 l
 o
 np
-206.83 91.44 m
+220.11 128.16 m
 0 -10.80 l
 o
 np
-299.08 91.44 m
+307.90 128.16 m
 0 -10.80 l
 o
 np
-391.34 91.44 m
+395.69 128.16 m
 0 -10.80 l
 o
 np
-483.60 91.44 m
+483.48 128.16 m
 0 -10.80 l
 o
 np
-575.85 91.44 m
+571.27 128.16 m
 0 -10.80 l
 o
 np
-668.11 91.44 m
+659.06 128.16 m
 0 -10.80 l
 o
 np
-760.36 91.44 m
+746.86 128.16 m
 0 -10.80 l
 o
-206.83 52.56 (10) .5 0 0 t
-299.08 52.56 (20) .5 0 0 t
-391.34 52.56 (30) .5 0 0 t
-483.60 52.56 (40) .5 0 0 t
-575.85 52.56 (50) .5 0 0 t
-668.11 52.56 (60) .5 0 0 t
-760.36 52.56 (70) .5 0 0 t
-np
-168.93 91.44 m
-624.72 0 l
-0 426.80 l
--624.72 0 l
-0 -426.80 l
+220.11 89.28 (10) .5 0 0 t
+307.90 89.28 (20) .5 0 0 t
+395.69 89.28 (30) .5 0 0 t
+483.48 89.28 (40) .5 0 0 t
+571.27 89.28 (50) .5 0 0 t
+659.06 89.28 (60) .5 0 0 t
+746.86 89.28 (70) .5 0 0 t
+np
+184.05 128.16 m
+594.48 0 l
+0 360.56 l
+-594.48 0 l
+0 -360.56 l
 o
 18.00 18.00 823.89 577.28 cl
 /ps 22 def /Font2 findfont 22 s
 0 0 0 rgb
-481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t
+481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t
 ep
 %%Page: 5 5
 bp
@@ -3771,8 +3771,8 @@ np
 0 -7.20 l
 o
 /ps 12 def /Font1 findfont 12 s
-78.70 65.52 (1   e-11) .5 0 0 t
-222.02 65.52 (1   e+53) .5 0 0 t
+78.70 65.52 (1e-11) .5 0 0 t
+222.02 65.52 (1e+53) .5 0 0 t
 365.35 65.52 (1e+117) .5 0 0 t
 508.68 65.52 (1e+181) .5 0 0 t
 652.00 65.52 (1e+245) .5 0 0 t
@@ -3800,8 +3800,8 @@ np
 77.04 436.50 m
 -7.20 0 l
 o
-59.76 92.27 (1   e-10) .5 0 90 t
-59.76 178.32 (1   e+49) .5 0 90 t
+59.76 92.27 (1e-10) .5 0 90 t
+59.76 178.32 (1e+49) .5 0 90 t
 59.76 264.38 (1e+108) .5 0 90 t
 59.76 350.44 (1e+167) .5 0 90 t
 59.76 436.50 (1e+226) .5 0 90 t
diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R
--- R-2.4.0.old/tests/reg-tests-1.R	2006-09-25 21:05:07.000000000 -0500
+++ R-2.4.0/tests/reg-tests-1.R	2006-10-28 14:36:01.000000000 -0500
@@ -4494,3 +4494,20 @@ test <- 1:10
 try(test[2:4] <- ls) # fails
 stopifnot(!exists("*tmp*", where=1))
 ## was true < 2.4.0
+
+
+## merge on zero-row data frames
+L3 <- LETTERS[1:3]
+d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE))
+e <- d[-1,]
+merge(d, e, by.x = "x", by.y = "x", all.x = TRUE)
+##
+
+
+## PR#9313
+library(stats4)
+g <- function(x, y) -cos(x) + abs(y)
+fit1 <- mle(g, start = list(x = 0, y = 7))
+fit2 <- mle(g, start = list(y = 7, x = 0))
+stopifnot(all.equal(coef(fit1), coef(fit2)))
+## Found different solutions in 2.4.0, as names were not remapped in fit2
diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R
--- R-2.4.0.old/tests/reg-tests-2.R	2006-09-22 21:05:09.000000000 -0500
+++ R-2.4.0/tests/reg-tests-2.R	2006-10-28 14:36:01.000000000 -0500
@@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",")
 
 
 ### end of tests added in 2.4.0 ###
+
+
+## Platform-specific behaviour in lowess reported to R-help
+## 2006-10-12 by Frank Harrell
+x <- c(0,7,8,14,15,120,242)
+y <- c(122,128,130,158,110,110,92)
+lowess(x, y, iter=0)
+lowess(x, y)
+## MAD of iterated residuals was zero, and result depended on the platform.
+
+
+### end of tests added in 2.4.1 ###
diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save
--- R-2.4.0.old/tests/reg-tests-2.Rout.save	2006-09-25 21:05:07.000000000 -0500
+++ R-2.4.0/tests/reg-tests-2.Rout.save	2006-10-28 14:36:01.000000000 -0500
@@ -1,6 +1,6 @@
 
-R version 2.4.0 beta (2005-09-25 r39509)
-Copyright (C)  The R Foundation for Statistical Computing
+R version 2.5.0 Under development (unstable) (2006-10-15 r39637)
+Copyright (C) 2006 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg
 > 
 > ### end of tests added in 2.4.0 ###
 > 
+> 
+> ## Platform-specific behaviour in lowess reported to R-help
+> ## 2006-10-12 by Frank Harrell
+> x <- c(0,7,8,14,15,120,242)
+> y <- c(122,128,130,158,110,110,92)
+> lowess(x, y, iter=0)
+$x
+[1]   0   7   8  14  15 120 242
+
+$y
+[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903  92.00003
+
+> lowess(x, y)
+$x
+[1]   0   7   8  14  15 120 242
+
+$y
+[1] 122 128 128 158 110 110  92
+
+> ## MAD of iterated residuals was zero, and result depended on the platform.
+> 
+> 
+> ### end of tests added in 2.4.1 ###
+> 
diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION
--- R-2.4.0.old/VERSION	2006-10-03 05:00:12.000000000 -0500
+++ R-2.4.0/VERSION	2006-10-03 07:19:25.000000000 -0500
@@ -1 +1 @@
-2.4.0
+2.4.0 Patched



From fedora-extras-commits at redhat.com  Sat Nov  4 06:19:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 3 Nov 2006 23:19:59 -0700
Subject: rpms/R/devel R-2.4.0-patched-2006-11-03.patch,NONE,1.1
Message-ID: <200611040620.kA46Jxsk016057@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/devel

Added Files:
	R-2.4.0-patched-2006-11-03.patch 
Log Message:

Patch from upstream


R-2.4.0-patched-2006-11-03.patch:

--- NEW FILE R-2.4.0-patched-2006-11-03.patch ---
diff -urp R-2.4.0.old/config.site R-2.4.0/config.site
--- R-2.4.0.old/config.site	2006-09-04 09:41:48.000000000 -0500
+++ R-2.4.0/config.site	2006-10-28 14:36:13.000000000 -0500
@@ -43,12 +43,16 @@
 ## If unspecified, a search is made for gcc and cc (in that order).
 ## To override this choice, specify the name of the command which runs
 ## the compiler here, for example 'c89'.
+## It is also convenient to set the architecture here, e.g. 'gcc -m32'.
+## NB, as from R 2.5.0 configure will append flags for C99 compliance,
+## e.g. CC=gcc -std=gnu99
+## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS.
 ## CC=
 
 ## Debugging and optimization options for the C compiler.
 ## Use this to specify CFLAGS for the version of the C compiler
 ## specified above.
-## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, 
+## If unspecified, defaults to '-g -O2' for gcc, 
 ## and '-g' in all other cases except icc (for which see R-admin.html).
 ## CFLAGS=
 
diff -urp R-2.4.0.old/configure R-2.4.0/configure
--- R-2.4.0.old/configure	2006-10-03 05:01:50.000000000 -0500
+++ R-2.4.0/configure	2006-11-03 19:41:47.000000000 -0600
@@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+## next is a macro borrowed from autoconf 2.60
+   echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_c99+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include 
+#include 
+#include 
+#include 
+#include 
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict(ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy work.
+static void
+test_varargs(const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  va_list args_copy;
+  va_copy(args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg(args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg(args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = (float) va_arg(args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end(args_copy);
+  va_end(args);
+}
+
+int
+main ()
+{
+
+  // Check bool and long long datatypes.
+  _Bool success = false;
+  long long int bignum = -1234567890LL;
+  unsigned long long int ubignum = 1234567890uLL;
+
+  // Check restrict.
+  if (test_restrict("String literal") != 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs("s, d' f .", "string", 65, 34.234);
+
+  // Check incomplete arrays work.
+  struct incomplete_array *ia =
+    malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = (double) i * 1.234;
+
+  // Check named initialisers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[43] = 543;
+
+  // work around unused variable warnings
+  return  bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x';
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_c99=$ac_arg
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  xno)
+    echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6 ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
[...9677 lines suppressed...]
-48.24 496.53 (Rural Male) 0 0 0 t
-48.24 389.83 (Rural Female) 0 0 0 t
-48.24 283.13 (Urban Male) 0 0 0 t
-48.24 176.43 (Urban Female) 0 0 0 t
+63.36 469.38 (Rural Male) 0 0 0 t
+63.36 379.24 (Rural Female) 0 0 0 t
+63.36 289.10 (Urban Male) 0 0 0 t
+63.36 198.96 (Urban Female) 0 0 0 t
 0.75 setlinewidth
 [] 0 setdash
 1 setlinecap
 1 setlinejoin
 10.00 setmiterlimit
 np
-206.83 91.44 m
-553.53 0 l
+220.11 128.16 m
+526.75 0 l
 o
 np
-206.83 91.44 m
+220.11 128.16 m
 0 -10.80 l
 o
 np
-299.08 91.44 m
+307.90 128.16 m
 0 -10.80 l
 o
 np
-391.34 91.44 m
+395.69 128.16 m
 0 -10.80 l
 o
 np
-483.60 91.44 m
+483.48 128.16 m
 0 -10.80 l
 o
 np
-575.85 91.44 m
+571.27 128.16 m
 0 -10.80 l
 o
 np
-668.11 91.44 m
+659.06 128.16 m
 0 -10.80 l
 o
 np
-760.36 91.44 m
+746.86 128.16 m
 0 -10.80 l
 o
-206.83 52.56 (10) .5 0 0 t
-299.08 52.56 (20) .5 0 0 t
-391.34 52.56 (30) .5 0 0 t
-483.60 52.56 (40) .5 0 0 t
-575.85 52.56 (50) .5 0 0 t
-668.11 52.56 (60) .5 0 0 t
-760.36 52.56 (70) .5 0 0 t
-np
-168.93 91.44 m
-624.72 0 l
-0 426.80 l
--624.72 0 l
-0 -426.80 l
+220.11 89.28 (10) .5 0 0 t
+307.90 89.28 (20) .5 0 0 t
+395.69 89.28 (30) .5 0 0 t
+483.48 89.28 (40) .5 0 0 t
+571.27 89.28 (50) .5 0 0 t
+659.06 89.28 (60) .5 0 0 t
+746.86 89.28 (70) .5 0 0 t
+np
+184.05 128.16 m
+594.48 0 l
+0 360.56 l
+-594.48 0 l
+0 -360.56 l
 o
 18.00 18.00 823.89 577.28 cl
 /ps 22 def /Font2 findfont 22 s
 0 0 0 rgb
-481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t
+481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t
 ep
 %%Page: 5 5
 bp
@@ -3771,8 +3771,8 @@ np
 0 -7.20 l
 o
 /ps 12 def /Font1 findfont 12 s
-78.70 65.52 (1   e-11) .5 0 0 t
-222.02 65.52 (1   e+53) .5 0 0 t
+78.70 65.52 (1e-11) .5 0 0 t
+222.02 65.52 (1e+53) .5 0 0 t
 365.35 65.52 (1e+117) .5 0 0 t
 508.68 65.52 (1e+181) .5 0 0 t
 652.00 65.52 (1e+245) .5 0 0 t
@@ -3800,8 +3800,8 @@ np
 77.04 436.50 m
 -7.20 0 l
 o
-59.76 92.27 (1   e-10) .5 0 90 t
-59.76 178.32 (1   e+49) .5 0 90 t
+59.76 92.27 (1e-10) .5 0 90 t
+59.76 178.32 (1e+49) .5 0 90 t
 59.76 264.38 (1e+108) .5 0 90 t
 59.76 350.44 (1e+167) .5 0 90 t
 59.76 436.50 (1e+226) .5 0 90 t
diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R
--- R-2.4.0.old/tests/reg-tests-1.R	2006-09-25 21:05:07.000000000 -0500
+++ R-2.4.0/tests/reg-tests-1.R	2006-10-28 14:36:01.000000000 -0500
@@ -4494,3 +4494,20 @@ test <- 1:10
 try(test[2:4] <- ls) # fails
 stopifnot(!exists("*tmp*", where=1))
 ## was true < 2.4.0
+
+
+## merge on zero-row data frames
+L3 <- LETTERS[1:3]
+d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE))
+e <- d[-1,]
+merge(d, e, by.x = "x", by.y = "x", all.x = TRUE)
+##
+
+
+## PR#9313
+library(stats4)
+g <- function(x, y) -cos(x) + abs(y)
+fit1 <- mle(g, start = list(x = 0, y = 7))
+fit2 <- mle(g, start = list(y = 7, x = 0))
+stopifnot(all.equal(coef(fit1), coef(fit2)))
+## Found different solutions in 2.4.0, as names were not remapped in fit2
diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R
--- R-2.4.0.old/tests/reg-tests-2.R	2006-09-22 21:05:09.000000000 -0500
+++ R-2.4.0/tests/reg-tests-2.R	2006-10-28 14:36:01.000000000 -0500
@@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",")
 
 
 ### end of tests added in 2.4.0 ###
+
+
+## Platform-specific behaviour in lowess reported to R-help
+## 2006-10-12 by Frank Harrell
+x <- c(0,7,8,14,15,120,242)
+y <- c(122,128,130,158,110,110,92)
+lowess(x, y, iter=0)
+lowess(x, y)
+## MAD of iterated residuals was zero, and result depended on the platform.
+
+
+### end of tests added in 2.4.1 ###
diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save
--- R-2.4.0.old/tests/reg-tests-2.Rout.save	2006-09-25 21:05:07.000000000 -0500
+++ R-2.4.0/tests/reg-tests-2.Rout.save	2006-10-28 14:36:01.000000000 -0500
@@ -1,6 +1,6 @@
 
-R version 2.4.0 beta (2005-09-25 r39509)
-Copyright (C)  The R Foundation for Statistical Computing
+R version 2.5.0 Under development (unstable) (2006-10-15 r39637)
+Copyright (C) 2006 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg
 > 
 > ### end of tests added in 2.4.0 ###
 > 
+> 
+> ## Platform-specific behaviour in lowess reported to R-help
+> ## 2006-10-12 by Frank Harrell
+> x <- c(0,7,8,14,15,120,242)
+> y <- c(122,128,130,158,110,110,92)
+> lowess(x, y, iter=0)
+$x
+[1]   0   7   8  14  15 120 242
+
+$y
+[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903  92.00003
+
+> lowess(x, y)
+$x
+[1]   0   7   8  14  15 120 242
+
+$y
+[1] 122 128 128 158 110 110  92
+
+> ## MAD of iterated residuals was zero, and result depended on the platform.
+> 
+> 
+> ### end of tests added in 2.4.1 ###
+> 
diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION
--- R-2.4.0.old/VERSION	2006-10-03 05:00:12.000000000 -0500
+++ R-2.4.0/VERSION	2006-10-03 07:19:25.000000000 -0500
@@ -1 +1 @@
-2.4.0
+2.4.0 Patched



From fedora-extras-commits at redhat.com  Sat Nov  4 06:20:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 3 Nov 2006 23:20:27 -0700
Subject: rpms/R/FC-4 R-2.4.0-patched-2006-11-03.patch, NONE, 1.1 R.spec, 1.18,
	1.19
Message-ID: <200611040620.kA46KRlC016077@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/FC-4

Modified Files:
	R.spec 
Added Files:
	R-2.4.0-patched-2006-11-03.patch 
Log Message:

Patch from upstream


R-2.4.0-patched-2006-11-03.patch:

--- NEW FILE R-2.4.0-patched-2006-11-03.patch ---
diff -urp R-2.4.0.old/config.site R-2.4.0/config.site
--- R-2.4.0.old/config.site	2006-09-04 09:41:48.000000000 -0500
+++ R-2.4.0/config.site	2006-10-28 14:36:13.000000000 -0500
@@ -43,12 +43,16 @@
 ## If unspecified, a search is made for gcc and cc (in that order).
 ## To override this choice, specify the name of the command which runs
 ## the compiler here, for example 'c89'.
+## It is also convenient to set the architecture here, e.g. 'gcc -m32'.
+## NB, as from R 2.5.0 configure will append flags for C99 compliance,
+## e.g. CC=gcc -std=gnu99
+## To avoid this, set contradictory flags (such as -ansi) as part of CFLAGS.
 ## CC=
 
 ## Debugging and optimization options for the C compiler.
 ## Use this to specify CFLAGS for the version of the C compiler
 ## specified above.
-## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc, 
+## If unspecified, defaults to '-g -O2' for gcc, 
 ## and '-g' in all other cases except icc (for which see R-admin.html).
 ## CFLAGS=
 
diff -urp R-2.4.0.old/configure R-2.4.0/configure
--- R-2.4.0.old/configure	2006-10-03 05:01:50.000000000 -0500
+++ R-2.4.0/configure	2006-11-03 19:41:47.000000000 -0600
@@ -4629,6 +4629,182 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+## next is a macro borrowed from autoconf 2.60
+   echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_c99+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include 
+#include 
+#include 
+#include 
+#include 
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict(ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy work.
+static void
+test_varargs(const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  va_list args_copy;
+  va_copy(args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg(args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg(args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = (float) va_arg(args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end(args_copy);
+  va_end(args);
+}
+
+int
+main ()
+{
+
+  // Check bool and long long datatypes.
+  _Bool success = false;
+  long long int bignum = -1234567890LL;
+  unsigned long long int ubignum = 1234567890uLL;
+
+  // Check restrict.
+  if (test_restrict("String literal") != 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs("s, d' f .", "string", 65, 34.234);
+
+  // Check incomplete arrays work.
+  struct incomplete_array *ia =
+    malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = (double) i * 1.234;
+
+  // Check named initialisers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[43] = 543;
+
+  // work around unused variable warnings
+  return  bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x';
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_c99=$ac_arg
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  xno)
+    echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6 ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
[...9677 lines suppressed...]
-48.24 496.53 (Rural Male) 0 0 0 t
-48.24 389.83 (Rural Female) 0 0 0 t
-48.24 283.13 (Urban Male) 0 0 0 t
-48.24 176.43 (Urban Female) 0 0 0 t
+63.36 469.38 (Rural Male) 0 0 0 t
+63.36 379.24 (Rural Female) 0 0 0 t
+63.36 289.10 (Urban Male) 0 0 0 t
+63.36 198.96 (Urban Female) 0 0 0 t
 0.75 setlinewidth
 [] 0 setdash
 1 setlinecap
 1 setlinejoin
 10.00 setmiterlimit
 np
-206.83 91.44 m
-553.53 0 l
+220.11 128.16 m
+526.75 0 l
 o
 np
-206.83 91.44 m
+220.11 128.16 m
 0 -10.80 l
 o
 np
-299.08 91.44 m
+307.90 128.16 m
 0 -10.80 l
 o
 np
-391.34 91.44 m
+395.69 128.16 m
 0 -10.80 l
 o
 np
-483.60 91.44 m
+483.48 128.16 m
 0 -10.80 l
 o
 np
-575.85 91.44 m
+571.27 128.16 m
 0 -10.80 l
 o
 np
-668.11 91.44 m
+659.06 128.16 m
 0 -10.80 l
 o
 np
-760.36 91.44 m
+746.86 128.16 m
 0 -10.80 l
 o
-206.83 52.56 (10) .5 0 0 t
-299.08 52.56 (20) .5 0 0 t
-391.34 52.56 (30) .5 0 0 t
-483.60 52.56 (40) .5 0 0 t
-575.85 52.56 (50) .5 0 0 t
-668.11 52.56 (60) .5 0 0 t
-760.36 52.56 (70) .5 0 0 t
-np
-168.93 91.44 m
-624.72 0 l
-0 426.80 l
--624.72 0 l
-0 -426.80 l
+220.11 89.28 (10) .5 0 0 t
+307.90 89.28 (20) .5 0 0 t
+395.69 89.28 (30) .5 0 0 t
+483.48 89.28 (40) .5 0 0 t
+571.27 89.28 (50) .5 0 0 t
+659.06 89.28 (60) .5 0 0 t
+746.86 89.28 (70) .5 0 0 t
+np
+184.05 128.16 m
+594.48 0 l
+0 360.56 l
+-594.48 0 l
+0 -360.56 l
 o
 18.00 18.00 823.89 577.28 cl
 /ps 22 def /Font2 findfont 22 s
 0 0 0 rgb
-481.29 539.86 (Death Rates in Virginia - 1940) .5 0 0 t
+481.29 525.10 (Death Rates in Virginia - 1940) .5 0 0 t
 ep
 %%Page: 5 5
 bp
@@ -3771,8 +3771,8 @@ np
 0 -7.20 l
 o
 /ps 12 def /Font1 findfont 12 s
-78.70 65.52 (1   e-11) .5 0 0 t
-222.02 65.52 (1   e+53) .5 0 0 t
+78.70 65.52 (1e-11) .5 0 0 t
+222.02 65.52 (1e+53) .5 0 0 t
 365.35 65.52 (1e+117) .5 0 0 t
 508.68 65.52 (1e+181) .5 0 0 t
 652.00 65.52 (1e+245) .5 0 0 t
@@ -3800,8 +3800,8 @@ np
 77.04 436.50 m
 -7.20 0 l
 o
-59.76 92.27 (1   e-10) .5 0 90 t
-59.76 178.32 (1   e+49) .5 0 90 t
+59.76 92.27 (1e-10) .5 0 90 t
+59.76 178.32 (1e+49) .5 0 90 t
 59.76 264.38 (1e+108) .5 0 90 t
 59.76 350.44 (1e+167) .5 0 90 t
 59.76 436.50 (1e+226) .5 0 90 t
diff -urp R-2.4.0.old/tests/reg-tests-1.R R-2.4.0/tests/reg-tests-1.R
--- R-2.4.0.old/tests/reg-tests-1.R	2006-09-25 21:05:07.000000000 -0500
+++ R-2.4.0/tests/reg-tests-1.R	2006-10-28 14:36:01.000000000 -0500
@@ -4494,3 +4494,20 @@ test <- 1:10
 try(test[2:4] <- ls) # fails
 stopifnot(!exists("*tmp*", where=1))
 ## was true < 2.4.0
+
+
+## merge on zero-row data frames
+L3 <- LETTERS[1:3]
+d <- data.frame(cbind(x=1, y=1), fac=sample(L3, 1, repl=TRUE))
+e <- d[-1,]
+merge(d, e, by.x = "x", by.y = "x", all.x = TRUE)
+##
+
+
+## PR#9313
+library(stats4)
+g <- function(x, y) -cos(x) + abs(y)
+fit1 <- mle(g, start = list(x = 0, y = 7))
+fit2 <- mle(g, start = list(y = 7, x = 0))
+stopifnot(all.equal(coef(fit1), coef(fit2)))
+## Found different solutions in 2.4.0, as names were not remapped in fit2
diff -urp R-2.4.0.old/tests/reg-tests-2.R R-2.4.0/tests/reg-tests-2.R
--- R-2.4.0.old/tests/reg-tests-2.R	2006-09-22 21:05:09.000000000 -0500
+++ R-2.4.0/tests/reg-tests-2.R	2006-10-28 14:36:01.000000000 -0500
@@ -1988,3 +1988,15 @@ format(matrix(1:16, 4), big.mark = ",")
 
 
 ### end of tests added in 2.4.0 ###
+
+
+## Platform-specific behaviour in lowess reported to R-help
+## 2006-10-12 by Frank Harrell
+x <- c(0,7,8,14,15,120,242)
+y <- c(122,128,130,158,110,110,92)
+lowess(x, y, iter=0)
+lowess(x, y)
+## MAD of iterated residuals was zero, and result depended on the platform.
+
+
+### end of tests added in 2.4.1 ###
diff -urp R-2.4.0.old/tests/reg-tests-2.Rout.save R-2.4.0/tests/reg-tests-2.Rout.save
--- R-2.4.0.old/tests/reg-tests-2.Rout.save	2006-09-25 21:05:07.000000000 -0500
+++ R-2.4.0/tests/reg-tests-2.Rout.save	2006-10-28 14:36:01.000000000 -0500
@@ -1,6 +1,6 @@
 
-R version 2.4.0 beta (2005-09-25 r39509)
-Copyright (C)  The R Foundation for Statistical Computing
+R version 2.5.0 Under development (unstable) (2006-10-15 r39637)
+Copyright (C) 2006 The R Foundation for Statistical Computing
 ISBN 3-900051-07-0
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
@@ -5572,3 +5572,27 @@ Residual standard error: 1.735 on 44 deg
 > 
 > ### end of tests added in 2.4.0 ###
 > 
+> 
+> ## Platform-specific behaviour in lowess reported to R-help
+> ## 2006-10-12 by Frank Harrell
+> x <- c(0,7,8,14,15,120,242)
+> y <- c(122,128,130,158,110,110,92)
+> lowess(x, y, iter=0)
+$x
+[1]   0   7   8  14  15 120 242
+
+$y
+[1] 121.95735 128.00000 131.06649 136.93673 126.76467 109.99903  92.00003
+
+> lowess(x, y)
+$x
+[1]   0   7   8  14  15 120 242
+
+$y
+[1] 122 128 128 158 110 110  92
+
+> ## MAD of iterated residuals was zero, and result depended on the platform.
+> 
+> 
+> ### end of tests added in 2.4.1 ###
+> 
diff -urp R-2.4.0.old/VERSION R-2.4.0/VERSION
--- R-2.4.0.old/VERSION	2006-10-03 05:00:12.000000000 -0500
+++ R-2.4.0/VERSION	2006-10-03 07:19:25.000000000 -0500
@@ -1 +1 @@
-2.4.0
+2.4.0 Patched


Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- R.spec	4 Nov 2006 06:16:09 -0000	1.18
+++ R.spec	4 Nov 2006 06:19:56 -0000	1.19
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.4.0
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 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
@@ -230,6 +230,9 @@
 /sbin/ldconfig
 
 %changelog
+* Sat Nov  4 2006 Tom "spot" Callaway  2.4.0-2.1
+- minor bump to fix my idiot mistake in cvs for fc4
+
 * Fri Nov  3 2006 Tom "spot" Callaway  2.4.0-2
 - sync with patched 2006-11-03 level to fix PR#9339
 



From fedora-extras-commits at redhat.com  Sat Nov  4 08:58:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 4 Nov 2006 01:58:46 -0700
Subject: rpms/gaim-gaym/devel .cvsignore, 1.4, 1.5 gaim-gaym.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611040858.kA48wkZs022906@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22883

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
update to svn release 290



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Oct 2006 06:05:07 -0000	1.4
+++ .cvsignore	4 Nov 2006 08:58:16 -0000	1.5
@@ -1,2 +1,2 @@
-qrc-0.96-289svn.tar.gz
-gaim-2.0.0beta3.tar.bz2
+qrc-0.96-290svn.tar.gz
+gaim-2.0.0beta4.tar.gz


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gaim-gaym.spec	24 Oct 2006 06:05:07 -0000	1.3
+++ gaim-gaym.spec	4 Nov 2006 08:58:16 -0000	1.4
@@ -2,23 +2,23 @@
 %define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
 %define gaim_max 2:3.0.0
 
-%define gaimsrcver 2.0.0beta3
+%define gaimsrcver 2.0.0beta4
 
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
-#   svn release: 289
-%define alphatag 289svn
+#   svn release: 290
+%define alphatag 290svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.2.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.4.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://groups.yahoo.com/group/gaymplugin/
 Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz
-Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2
+Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim-devel < %{gaim_max}, gtk2-devel
@@ -43,15 +43,15 @@
 
 # copy the needed headers to the right places...
 for i in gaym/src bot-challenger gaym-extras/src ; do
-    cp gaim-%{gaimsrcver}/src/internal.h $i
-    cp gaim-%{gaimsrcver}/src/prefix.h   $i
+    cp gaim-%{gaimsrcver}/libgaim/internal.h $i
+    cp gaim-%{gaimsrcver}/libgaim/prefix.h   $i
 done
 
 rm -rf gaim-%{gaimsrcver}
 
 %build
 autoreconf --force --install
-%configure --enable-display_options
+%configure --enable-display_options --disable-gaym-extras
 make %{?_smp_mflags}
 
 
@@ -70,12 +70,19 @@
 # README.svn and README.mingw pertain to devel & win32 issues
 %doc ChangeLog COPYING INSTALL README TODO
 %{_libdir}/gaim/*.so
-%{_datadir}/pixmaps/gaim/gaym
 %{_datadir}/pixmaps/gaim/status/default/*
 %exclude %{_libdir}/gaim/*.la
 
 
 %changelog
+* Sat Nov 04 2006 Chris Weyl  0.96-3.4.290svn
+- update to svn rel 290, tag fork-for-gaim-2
+
+* Sun Oct 29 2006 Chris Weyl  0.96-3.3.289svn
+- rebuilt with beta4
+- disable the extras plugin; beta4 breaks compilation :(
+- gaim_url_fetch becomes gaim_util_fetch_url
+
 * Mon Oct 23 2006 Chris Weyl  0.96-3.2.289svn
 - it helps to upload all sources to the lookaside cache.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Oct 2006 06:05:07 -0000	1.4
+++ sources	4 Nov 2006 08:58:16 -0000	1.5
@@ -1,2 +1,2 @@
-34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz
-c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2
+e21596c613f98a9d4661a1118757e35b  qrc-0.96-290svn.tar.gz
+9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 08:59:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 4 Nov 2006 01:59:52 -0700
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.2,1.3 sources,1.3,1.4
Message-ID: <200611040859.kA48xqDt022971@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22949

Modified Files:
	gaim-gaym.spec sources 
Log Message:
update to svn 290



Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gaim-gaym.spec	24 Oct 2006 06:12:24 -0000	1.2
+++ gaim-gaym.spec	4 Nov 2006 08:59:22 -0000	1.3
@@ -2,23 +2,23 @@
 %define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
 %define gaim_max 2:3.0.0
 
-%define gaimsrcver 2.0.0beta3
+%define gaimsrcver 2.0.0beta4
 
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
-#   svn release: 289
-%define alphatag 289svn
+#   svn release: 290
+%define alphatag 290svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.2.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.4.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://groups.yahoo.com/group/gaymplugin/
 Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz
-Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2
+Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim-devel < %{gaim_max}, gtk2-devel
@@ -43,15 +43,15 @@
 
 # copy the needed headers to the right places...
 for i in gaym/src bot-challenger gaym-extras/src ; do
-    cp gaim-%{gaimsrcver}/src/internal.h $i
-    cp gaim-%{gaimsrcver}/src/prefix.h   $i
+    cp gaim-%{gaimsrcver}/libgaim/internal.h $i
+    cp gaim-%{gaimsrcver}/libgaim/prefix.h   $i
 done
 
 rm -rf gaim-%{gaimsrcver}
 
 %build
 autoreconf --force --install
-%configure --enable-display_options
+%configure --enable-display_options --disable-gaym-extras
 make %{?_smp_mflags}
 
 
@@ -70,12 +70,19 @@
 # README.svn and README.mingw pertain to devel & win32 issues
 %doc ChangeLog COPYING INSTALL README TODO
 %{_libdir}/gaim/*.so
-%{_datadir}/pixmaps/gaim/gaym
 %{_datadir}/pixmaps/gaim/status/default/*
 %exclude %{_libdir}/gaim/*.la
 
 
 %changelog
+* Sat Nov 04 2006 Chris Weyl  0.96-3.4.290svn
+- update to svn rel 290, tag fork-for-gaim-2
+
+* Sun Oct 29 2006 Chris Weyl  0.96-3.3.289svn
+- rebuilt with beta4
+- disable the extras plugin; beta4 breaks compilation :(
+- gaim_url_fetch becomes gaim_util_fetch_url
+
 * Mon Oct 23 2006 Chris Weyl  0.96-3.2.289svn
 - it helps to upload all sources to the lookaside cache.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Oct 2006 06:12:24 -0000	1.3
+++ sources	4 Nov 2006 08:59:22 -0000	1.4
@@ -1,2 +1,2 @@
-34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz
-c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2
+e21596c613f98a9d4661a1118757e35b  qrc-0.96-290svn.tar.gz
+9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 09:14:50 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 4 Nov 2006 02:14:50 -0700
Subject: rpms/plone/FC-6 .cvsignore, 1.12, 1.13 plone.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <200611040914.kA49EoEe026264@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26207/FC-6

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
add Plone Hotfix 20061031 (bug 213983)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Oct 2006 18:22:07 -0000	1.12
+++ .cvsignore	4 Nov 2006 09:14:19 -0000	1.13
@@ -1 +1,2 @@
 Plone-2.5.1-final.tar.gz
+PloneHotFix20061031.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plone.spec	30 Oct 2006 18:22:07 -0000	1.19
+++ plone.spec	4 Nov 2006 09:14:19 -0000	1.20
@@ -6,14 +6,14 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
 #Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
-#Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
+Source10:       http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz
 #Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,8 +28,9 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
-#%patch0 -p0 -b .atxmlperms
+#%%setup -q -n Plone-%{version} -a 10
+# Hotfix
+%setup -q -n Plone-%{version} -a 10
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -72,6 +73,9 @@
 
 
 %changelog
+* Sat Nov 04 2006 Aurelien Bompard  2.5.1-3
+- add Plone Hotfix 20061031 (bug 213983)
+
 * Mon Oct 30 2006 Aurelien Bompard  2.5.1-1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Oct 2006 18:22:07 -0000	1.12
+++ sources	4 Nov 2006 09:14:19 -0000	1.13
@@ -1 +1,2 @@
 cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz
+bc2b48651750bfc9e901664695e0e44c  PloneHotFix20061031.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 09:14:49 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 4 Nov 2006 02:14:49 -0700
Subject: rpms/plone/FC-5 .cvsignore, 1.12, 1.13 plone.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <200611040914.kA49Enks026259@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26207/FC-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
add Plone Hotfix 20061031 (bug 213983)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Oct 2006 18:22:06 -0000	1.12
+++ .cvsignore	4 Nov 2006 09:14:18 -0000	1.13
@@ -1 +1,2 @@
 Plone-2.5.1-final.tar.gz
+PloneHotFix20061031.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plone.spec	30 Oct 2006 18:22:06 -0000	1.19
+++ plone.spec	4 Nov 2006 09:14:18 -0000	1.20
@@ -6,14 +6,14 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
 #Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
-#Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
+Source10:       http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz
 #Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,8 +28,9 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
-#%patch0 -p0 -b .atxmlperms
+#%%setup -q -n Plone-%{version} -a 10
+# Hotfix
+%setup -q -n Plone-%{version} -a 10
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -72,6 +73,9 @@
 
 
 %changelog
+* Sat Nov 04 2006 Aurelien Bompard  2.5.1-3
+- add Plone Hotfix 20061031 (bug 213983)
+
 * Mon Oct 30 2006 Aurelien Bompard  2.5.1-1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Oct 2006 18:22:06 -0000	1.12
+++ sources	4 Nov 2006 09:14:18 -0000	1.13
@@ -1 +1,2 @@
 cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz
+bc2b48651750bfc9e901664695e0e44c  PloneHotFix20061031.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 09:14:55 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 4 Nov 2006 02:14:55 -0700
Subject: rpms/plone/devel .cvsignore, 1.12, 1.13 plone.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <200611040914.kA49EtAg026269@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26207/devel

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
add Plone Hotfix 20061031 (bug 213983)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Oct 2006 17:27:20 -0000	1.12
+++ .cvsignore	4 Nov 2006 09:14:25 -0000	1.13
@@ -1 +1,2 @@
 Plone-2.5.1-final.tar.gz
+PloneHotFix20061031.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plone.spec	30 Oct 2006 18:22:08 -0000	1.19
+++ plone.spec	4 Nov 2006 09:14:25 -0000	1.20
@@ -6,14 +6,14 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
 #Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
-#Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
+Source10:       http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz
 #Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,8 +28,9 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
-#%patch0 -p0 -b .atxmlperms
+#%%setup -q -n Plone-%{version} -a 10
+# Hotfix
+%setup -q -n Plone-%{version} -a 10
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -72,6 +73,9 @@
 
 
 %changelog
+* Sat Nov 04 2006 Aurelien Bompard  2.5.1-3
+- add Plone Hotfix 20061031 (bug 213983)
+
 * Mon Oct 30 2006 Aurelien Bompard  2.5.1-1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 Oct 2006 17:27:20 -0000	1.12
+++ sources	4 Nov 2006 09:14:25 -0000	1.13
@@ -1 +1,2 @@
 cb965ed5eb4f863b124c0151824a2b5a  Plone-2.5.1-final.tar.gz
+bc2b48651750bfc9e901664695e0e44c  PloneHotFix20061031.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 09:17:50 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 4 Nov 2006 02:17:50 -0700
Subject: rpms/perl-Event Makefile,1.2,1.3
Message-ID: <200611040917.kA49Ho1c026454@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385

Modified Files:
	Makefile 
Log Message:
update to 1.08



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	16 Oct 2006 04:37:24 -0000	1.2
+++ Makefile	4 Nov 2006 09:17:20 -0000	1.3
@@ -3,7 +3,7 @@
 	@cvs update
 
 # for target build-all
-BRANCHES := $(shell cat ~/fedora-extras/current-branches | sed -e 's/:.*//')
+BRANCHES := $(shell cat ../current-branches | sed -e 's/:.*//')
 
 # tag & build all non-legacy branches...
 build-all :



From fedora-extras-commits at redhat.com  Sat Nov  4 09:17:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 4 Nov 2006 02:17:51 -0700
Subject: rpms/perl-Event/FC-5 perl-Event.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200611040917.kA49HpGb026458@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385/FC-5

Modified Files:
	perl-Event.spec sources 
Log Message:
update to 1.08



Index: perl-Event.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/FC-5/perl-Event.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Event.spec	16 Oct 2006 04:37:25 -0000	1.3
+++ perl-Event.spec	4 Nov 2006 09:17:21 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-Event
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Event loop processing
 
@@ -13,9 +13,6 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Time::HiRes)
 
-# for some reason this isn't automagically picked up
-Provides: perl(Event) = %{version}
-
 %description
 The Event module provide a central facility to watch for various types of
 events and invoke a callback when these events occur. The idea is to delay the
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Sat Nov 04 2006 Chris Weyl  1.08-1
+- update to 1.08
+
 * Sun Oct 15 2006 Chris Weyl  1.07-1
 - update to 1.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2006 04:37:25 -0000	1.3
+++ sources	4 Nov 2006 09:17:21 -0000	1.4
@@ -1 +1 @@
-34b6eaf0b3658cd800b7d8727be7e9c4  Event-1.07.tar.gz
+475b5613c584256fa23b4215103f106c  Event-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 09:17:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 4 Nov 2006 02:17:57 -0700
Subject: rpms/perl-Event/devel .cvsignore, 1.3, 1.4 perl-Event.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200611040917.kA49Hv2a026467@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385/devel

Modified Files:
	.cvsignore perl-Event.spec sources 
Log Message:
update to 1.08



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Oct 2006 04:37:26 -0000	1.3
+++ .cvsignore	4 Nov 2006 09:17:27 -0000	1.4
@@ -1 +1 @@
-Event-1.07.tar.gz
+Event-1.08.tar.gz


Index: perl-Event.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/perl-Event.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Event.spec	16 Oct 2006 04:37:26 -0000	1.4
+++ perl-Event.spec	4 Nov 2006 09:17:27 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Event
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Event loop processing
 
@@ -13,9 +13,6 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Time::HiRes)
 
-# for some reason this isn't automagically picked up
-Provides: perl(Event) = %{version}
-
 %description
 The Event module provide a central facility to watch for various types of
 events and invoke a callback when these events occur. The idea is to delay the
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Sat Nov 04 2006 Chris Weyl  1.08-1
+- update to 1.08
+
 * Sun Oct 15 2006 Chris Weyl  1.07-1
 - update to 1.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2006 04:37:26 -0000	1.3
+++ sources	4 Nov 2006 09:17:27 -0000	1.4
@@ -1 +1 @@
-34b6eaf0b3658cd800b7d8727be7e9c4  Event-1.07.tar.gz
+475b5613c584256fa23b4215103f106c  Event-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 09:17:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 4 Nov 2006 02:17:56 -0700
Subject: rpms/perl-Event/FC-6 perl-Event.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200611040917.kA49HuoS026462@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Event/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26385/FC-6

Modified Files:
	perl-Event.spec sources 
Log Message:
update to 1.08



Index: perl-Event.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/FC-6/perl-Event.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Event.spec	16 Oct 2006 04:37:26 -0000	1.4
+++ perl-Event.spec	4 Nov 2006 09:17:26 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Event
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Event loop processing
 
@@ -13,9 +13,6 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Time::HiRes)
 
-# for some reason this isn't automagically picked up
-Provides: perl(Event) = %{version}
-
 %description
 The Event module provide a central facility to watch for various types of
 events and invoke a callback when these events occur. The idea is to delay the
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Sat Nov 04 2006 Chris Weyl  1.08-1
+- update to 1.08
+
 * Sun Oct 15 2006 Chris Weyl  1.07-1
 - update to 1.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Event/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Oct 2006 04:37:26 -0000	1.3
+++ sources	4 Nov 2006 09:17:26 -0000	1.4
@@ -1 +1 @@
-34b6eaf0b3658cd800b7d8727be7e9c4  Event-1.07.tar.gz
+475b5613c584256fa23b4215103f106c  Event-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 09:37:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat,  4 Nov 2006 02:37:45 -0700
Subject: fedora-security/audit fe4,1.89,1.90 fe5,1.96,1.97 fe6,1.9,1.10
Message-ID: <200611040937.kA49bkhf026693@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26671

Modified Files:
	fe4 fe5 fe6 
Log Message:
+CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- fe4	2 Nov 2006 19:23:23 -0000	1.89
+++ fe4	4 Nov 2006 09:37:43 -0000	1.90
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- fe5	2 Nov 2006 19:23:23 -0000	1.96
+++ fe5	4 Nov 2006 09:37:43 -0000	1.97
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fe6	2 Nov 2006 19:23:23 -0000	1.9
+++ fe6	4 Nov 2006 09:37:43 -0000	1.10
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
 CVE-2006-5455 VULNERABLE (bugzilla) #212355



From fedora-extras-commits at redhat.com  Sat Nov  4 12:04:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 4 Nov 2006 05:04:43 -0700
Subject: comps comps-fe5.xml.in, 1.189, 1.190 comps-fe6.xml.in, 1.213,
	1.214 comps-fe7.xml.in, 1.11, 1.12
Message-ID: <200611041204.kA4C4hDk004594@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4566

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
added nyquist


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- comps-fe5.xml.in	2 Nov 2006 21:52:28 -0000	1.189
+++ comps-fe5.xml.in	4 Nov 2006 12:04:12 -0000	1.190
@@ -804,6 +804,7 @@
       kid3
       kover
       libvisual-plugins
+      nyquist
       regionset
       rosegarden4
       soundconverter


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- comps-fe6.xml.in	2 Nov 2006 21:52:28 -0000	1.213
+++ comps-fe6.xml.in	4 Nov 2006 12:04:12 -0000	1.214
@@ -854,6 +854,7 @@
       kid3
       kover
       nomadsync
+      nyquist
       regionset
       rosegarden4
       soundconverter


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- comps-fe7.xml.in	2 Nov 2006 21:52:28 -0000	1.11
+++ comps-fe7.xml.in	4 Nov 2006 12:04:12 -0000	1.12
@@ -854,6 +854,7 @@
       kid3
       kover
       nomadsync
+      nyquist
       regionset
       rosegarden4
       soundconverter



From fedora-extras-commits at redhat.com  Sat Nov  4 12:26:02 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sat, 4 Nov 2006 05:26:02 -0700
Subject: rpms/moomps/devel moomps.spec,1.14,1.15
Message-ID: <200611041226.kA4CQ2BQ004798@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4769

Modified Files:
	moomps.spec 
Log Message:
properly support 64 bit architecture by passing library directories to make.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- moomps.spec	24 Oct 2006 18:50:31 -0000	1.14
+++ moomps.spec	4 Nov 2006 12:25:32 -0000	1.15
@@ -1,6 +1,6 @@
 Name: moomps
 Version: 5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
@@ -29,7 +29,7 @@
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make LIBDIR=%_libdir TCLLIBDIR=%_libdir
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +81,10 @@
 
 
 %changelog
+* Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
+- properly support 64 bit architecture by passing library
+  directories to make
+
 * Sat Oct 1 2006 Jean-Luc Fontaine  5.7-1
 - 5.7 upstream release
 



From fedora-extras-commits at redhat.com  Sat Nov  4 12:28:34 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sat, 4 Nov 2006 05:28:34 -0700
Subject: rpms/moomps/FC-6 moomps.spec,1.14,1.15
Message-ID: <200611041228.kA4CSY7K004877@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4861

Modified Files:
	moomps.spec 
Log Message:
properly support 64 bit architecture by passing library directories to make.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/moomps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- moomps.spec	24 Oct 2006 18:54:15 -0000	1.14
+++ moomps.spec	4 Nov 2006 12:28:04 -0000	1.15
@@ -1,6 +1,6 @@
 Name: moomps
 Version: 5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
@@ -29,7 +29,7 @@
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make LIBDIR=%_libdir TCLLIBDIR=%_libdir
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +81,10 @@
 
 
 %changelog
+* Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
+- properly support 64 bit architecture by passing library
+  directories to make
+
 * Sat Oct 1 2006 Jean-Luc Fontaine  5.7-1
 - 5.7 upstream release
 



From fedora-extras-commits at redhat.com  Sat Nov  4 12:30:00 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sat, 4 Nov 2006 05:30:00 -0700
Subject: rpms/moomps/FC-5 moomps.spec,1.13,1.14
Message-ID: <200611041230.kA4CU0Ae004937@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4921

Modified Files:
	moomps.spec 
Log Message:
properly support 64 bit architecture by passing library directories to make.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- moomps.spec	24 Oct 2006 18:51:57 -0000	1.13
+++ moomps.spec	4 Nov 2006 12:29:30 -0000	1.14
@@ -1,6 +1,6 @@
 Name: moomps
 Version: 5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
@@ -29,7 +29,7 @@
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make LIBDIR=%_libdir TCLLIBDIR=%_libdir
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +81,10 @@
 
 
 %changelog
+* Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
+- properly support 64 bit architecture by passing library
+  directories to make
+
 * Sat Oct 1 2006 Jean-Luc Fontaine  5.7-1
 - 5.7 upstream release
 



From fedora-extras-commits at redhat.com  Sat Nov  4 12:56:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 4 Nov 2006 05:56:11 -0700
Subject: owners owners.list,1.1889,1.1890
Message-ID: <200611041256.kA4CuBPL005127@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5106

Modified Files:
	owners.list 
Log Message:
fix broken alex4 entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1889
retrieving revision 1.1890
diff -u -r1.1889 -r1.1890
--- owners.list	3 Nov 2006 16:35:53 -0000	1.1889
+++ owners.list	4 Nov 2006 12:55:41 -0000	1.1890
@@ -35,7 +35,7 @@
 Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|akode|Audio-decoding framework|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|alacarte|Simple menu editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|foolish at guezz.net,jpmahowald at gmail.com
-Fedora Extras|alex4|Alex the Allegator 4 - Platform game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|alex4|Alex the Allegator 4 - Platform game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|alleggl|OpenGL support library for Allegro|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
 Fedora Extras|AllegroOGG|Ogg library for use with the Allegro game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov  4 12:59:12 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Sat, 4 Nov 2006 05:59:12 -0700
Subject: rpms/amsn/devel amsn.spec, 1.5,
	1.6 amsn-0.96-configureac-nolocate.patch, 1.1,
	NONE amsn-0.96-tkcximage-locallibs.patch, 1.1, NONE
Message-ID: <200611041259.kA4CxC7Z005179@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/amsn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5158

Modified Files:
	amsn.spec 
Removed Files:
	amsn-0.96-configureac-nolocate.patch 
	amsn-0.96-tkcximage-locallibs.patch 
Log Message:
* Thu Sep 4 2006 Sander Hoentjen  - 0.96-2
- webcam now works (bug #206674)




Index: amsn.spec
===================================================================
RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- amsn.spec	2 Nov 2006 22:26:32 -0000	1.5
+++ amsn.spec	4 Nov 2006 12:58:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           amsn
 Version:        0.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -33,6 +33,11 @@
 %patch1 -p1 -b .1-system-bwidget
 rm -r utils/TkCximage/src/{jpeg,png,zlib}
 rm -r utils/BWidget-1.7.0
+
+# for webcam to work these paths need to be added because we move libs around
+%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
+%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
+
 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in
 %{__sed} -i 's#mozilla#htmlview#' config.tcl
 %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
@@ -116,6 +121,9 @@
 
 
 %changelog
+* Thu Sep 4 2006 Sander Hoentjen  - 0.96-2
+- webcam now works (bug #206674)
+
 * Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
 - updated to 0.96 final
 - drop nolocate and locallibs patch because they were accepted upstream


--- amsn-0.96-configureac-nolocate.patch DELETED ---


--- amsn-0.96-tkcximage-locallibs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov  4 13:01:32 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Sat, 4 Nov 2006 06:01:32 -0700
Subject: rpms/amsn/FC-6 amsn.spec,1.5,1.6
Message-ID: <200611041301.kA4D1WDf008171@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/amsn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5240

Modified Files:
	amsn.spec 
Log Message:
* Thu Sep 4 2006 Sander Hoentjen  - 0.96-2
- webcam now works (bug #206674)




Index: amsn.spec
===================================================================
RCS file: /cvs/extras/rpms/amsn/FC-6/amsn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- amsn.spec	2 Nov 2006 22:41:25 -0000	1.5
+++ amsn.spec	4 Nov 2006 13:01:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           amsn
 Version:        0.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -33,6 +33,11 @@
 %patch1 -p1 -b .1-system-bwidget
 rm -r utils/TkCximage/src/{jpeg,png,zlib}
 rm -r utils/BWidget-1.7.0
+
+# for webcam to work these paths need to be added because we move libs around
+%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
+%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
+
 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in
 %{__sed} -i 's#mozilla#htmlview#' config.tcl
 %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
@@ -116,6 +121,9 @@
 
 
 %changelog
+* Thu Sep 4 2006 Sander Hoentjen  - 0.96-2
+- webcam now works (bug #206674)
+
 * Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
 - updated to 0.96 final
 - drop nolocate and locallibs patch because they were accepted upstream



From fedora-extras-commits at redhat.com  Sat Nov  4 13:04:06 2006
From: fedora-extras-commits at redhat.com (Sander Hoentjen (tjikkun))
Date: Sat, 4 Nov 2006 06:04:06 -0700
Subject: rpms/amsn/FC-5 amsn.spec,1.2,1.3
Message-ID: <200611041304.kA4D469M008261@cvs-int.fedora.redhat.com>

Author: tjikkun

Update of /cvs/extras/rpms/amsn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8233

Modified Files:
	amsn.spec 
Log Message:
* Thu Sep 4 2006 Sander Hoentjen  - 0.96-2
- webcam now works (bug #206674)



Index: amsn.spec
===================================================================
RCS file: /cvs/extras/rpms/amsn/FC-5/amsn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amsn.spec	2 Nov 2006 22:45:19 -0000	1.2
+++ amsn.spec	4 Nov 2006 13:03:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           amsn
 Version:        0.96
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -33,6 +33,11 @@
 %patch1 -p1 -b .1-system-bwidget
 rm -r utils/TkCximage/src/{jpeg,png,zlib}
 rm -r utils/BWidget-1.7.0
+
+# for webcam to work these paths need to be added because we move libs around
+%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
+%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
+
 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in
 %{__sed} -i 's#mozilla#htmlview#' config.tcl
 %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
@@ -116,6 +121,9 @@
 
 
 %changelog
+* Thu Sep 4 2006 Sander Hoentjen  - 0.96-2
+- webcam now works (bug #206674)
+
 * Thu Sep 2 2006 Sander Hoentjen  - 0.96-1
 - updated to 0.96 final
 - drop nolocate and locallibs patch because they were accepted upstream



From fedora-extras-commits at redhat.com  Sat Nov  4 13:05:18 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sat, 4 Nov 2006 06:05:18 -0700
Subject: rpms/mail-notification/devel
	mail-notification-fedora-plugin-hint.patch, NONE,
	1.1 mail-notification.spec, 1.30, 1.31
Message-ID: <200611041305.kA4D5Ijg008338@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8315

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-fedora-plugin-hint.patch 
Log Message:
3.0-9 -- add a patch that informs the user to install the evolution-plugin if he want to use mn with evo

mail-notification-fedora-plugin-hint.patch:

--- NEW FILE mail-notification-fedora-plugin-hint.patch ---
diff -Naur mail-notification-3.0.org/src/mn-evolution-mailbox-properties.c mail-notification-3.0/src/mn-evolution-mailbox-properties.c
--- mail-notification-3.0.org/src/mn-evolution-mailbox-properties.c	2006-11-04 13:28:17.000000000 +0100
+++ mail-notification-3.0/src/mn-evolution-mailbox-properties.c	2006-11-04 13:39:55.000000000 +0100
@@ -387,7 +387,7 @@
     selfp->pbag = bonobo_object_release_unref(selfp->pbag, NULL);
     selfp->listener = bonobo_object_release_unref(selfp->listener, NULL);
 
-    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded."));
+    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded and installed. Fedora ships the plugin in a sperate package called mail-notification-evolution-plugin you might need to install manually."));
 
     gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mail-notification.spec	29 Oct 2006 15:26:17 -0000	1.30
+++ mail-notification.spec	4 Nov 2006 13:04:46 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:           mail-notification
 Version:        3.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 URL:            http://www.nongnu.org/mailnotify/
 Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz
 Source1:        mail-notification-README.FEDORA
+Patch0:         mail-notification-fedora-plugin-hint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -55,6 +56,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .patch0
 cp %{SOURCE1} ./README.FEDORA
 # FIXME -- quick workaround for now
 sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
@@ -131,6 +133,10 @@
 
 
 %changelog
+* 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
+
 * Sun Oct 29 2006 Thorsten Leemhuis   3.0-8
 - add workaround that hacks configure to allow building with evo 2.10
 



From fedora-extras-commits at redhat.com  Sat Nov  4 13:05:49 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sat, 4 Nov 2006 06:05:49 -0700
Subject: rpms/mock/devel arch-specific-repo.patch, 1.1, 1.2 mock.spec, 1.26,
	1.27
Message-ID: <200611041305.kA4D5n9F008400@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8337

Modified Files:
	arch-specific-repo.patch mock.spec 
Log Message:
Fix a typo


arch-specific-repo.patch:

Index: arch-specific-repo.patch
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/arch-specific-repo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arch-specific-repo.patch	3 Nov 2006 21:03:23 -0000	1.1
+++ arch-specific-repo.patch	4 Nov 2006 13:05:18 -0000	1.2
@@ -5,12 +5,12 @@
  [core]
  name=core
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os
  
  [updates-released]
  name=updates
 -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc
  
  [groups]
  name=groups
@@ -19,7 +19,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc
  
  [local]
  name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mock.spec	3 Nov 2006 21:03:23 -0000	1.26
+++ mock.spec	4 Nov 2006 13:05:18 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Nov  4 2006 Jesse Keating  - 0.6.8-3
+- Fix a typo in the patch that added x86_64 repos for fc4ppc
+
 * Fri Nov  3 2006 Jesse Keating  - 0.6.8-2
 - Add patch to fix repo files to use arch specific repos (#213516)
 



From fedora-extras-commits at redhat.com  Sat Nov  4 13:07:58 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sat, 4 Nov 2006 06:07:58 -0700
Subject: rpms/mock/FC-5 arch-specific-repo.patch, 1.1, 1.2 mock.spec, 1.24,
	1.25
Message-ID: <200611041307.kA4D7wO7008544@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8503/FC-5

Modified Files:
	arch-specific-repo.patch mock.spec 
Log Message:
Port devel/ fixes back to FC-6 and FC-5


arch-specific-repo.patch:

Index: arch-specific-repo.patch
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/arch-specific-repo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arch-specific-repo.patch	3 Nov 2006 21:12:30 -0000	1.1
+++ arch-specific-repo.patch	4 Nov 2006 13:07:28 -0000	1.2
@@ -5,12 +5,12 @@
  [core]
  name=core
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os
  
  [updates-released]
  name=updates
 -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc
  
  [groups]
  name=groups
@@ -19,7 +19,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc
  
  [local]
  name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mock.spec	3 Nov 2006 21:12:30 -0000	1.24
+++ mock.spec	4 Nov 2006 13:07:28 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Nov  4 2006 Jesse Keating  - 0.6.8-3
+- Fix a typo in the patch that added x86_64 repos for fc4ppc
+
 * Fri Nov  3 2006 Jesse Keating  - 0.6.8-2
 - Add patch to fix repo files to use arch specific repos (#213516)
 



From fedora-extras-commits at redhat.com  Sat Nov  4 13:07:59 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Sat, 4 Nov 2006 06:07:59 -0700
Subject: rpms/mock/FC-6 arch-specific-repo.patch, 1.1, 1.2 mock.spec, 1.25,
	1.26
Message-ID: <200611041307.kA4D7xRV008548@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8503/FC-6

Modified Files:
	arch-specific-repo.patch mock.spec 
Log Message:
Port devel/ fixes back to FC-6 and FC-5


arch-specific-repo.patch:

Index: arch-specific-repo.patch
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/arch-specific-repo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arch-specific-repo.patch	3 Nov 2006 21:12:31 -0000	1.1
+++ arch-specific-repo.patch	4 Nov 2006 13:07:28 -0000	1.2
@@ -5,12 +5,12 @@
  [core]
  name=core
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/ppc/os
  
  [updates-released]
  name=updates
 -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/ppc
  
  [groups]
  name=groups
@@ -19,7 +19,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
-+baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/ppc
  
  [local]
  name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mock.spec	3 Nov 2006 21:12:31 -0000	1.25
+++ mock.spec	4 Nov 2006 13:07:28 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Nov  4 2006 Jesse Keating  - 0.6.8-3
+- Fix a typo in the patch that added x86_64 repos for fc4ppc
+
 * Fri Nov  3 2006 Jesse Keating  - 0.6.8-2
 - Add patch to fix repo files to use arch specific repos (#213516)
 



From fedora-extras-commits at redhat.com  Sat Nov  4 13:21:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 4 Nov 2006 06:21:45 -0700
Subject: rpms/WindowMaker/FC-5
	WindowMaker-0.91.0-peter-appicon-bouncer2.patch, 
	1.1, 1.2 WindowMaker.spec, 1.18, 1.19
Message-ID: <200611041321.kA4DLjDn008775@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/WindowMaker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8704/FC-5

Modified Files:
	WindowMaker-0.91.0-peter-appicon-bouncer2.patch 
	WindowMaker.spec 
Log Message:
- fix #185579: bouncing animation will respect animations off setting
- fix #211263: missing dependencies in devel package 


WindowMaker-0.91.0-peter-appicon-bouncer2.patch:

Index: WindowMaker-0.91.0-peter-appicon-bouncer2.patch
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/FC-5/WindowMaker-0.91.0-peter-appicon-bouncer2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-peter-appicon-bouncer2.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-peter-appicon-bouncer2.patch	4 Nov 2006 13:21:14 -0000	1.2
@@ -1,13 +1,3 @@
---- WindowMaker-0.91.0/src/window.c.vns	2005-05-19 12:42:35 +0400
-+++ WindowMaker-0.91.0/src/window.c	2005-05-19 12:42:35 +0400
-@@ -1410,6 +1410,7 @@
-                     raise = True;
-                 }
-             }
-+	    wAppBounce(app);
-         }
-     }
- 
 --- WindowMaker-0.91.0/src/application.c.vns	2005-05-19 12:42:35 +0400
 +++ WindowMaker-0.91.0/src/application.c	2005-05-19 12:42:35 +0400
 @@ -448,6 +448,16 @@
@@ -223,3 +213,17 @@
 +{
 +}
 +#endif
+--- WindowMaker-0.92.0/src/window.c.orig	2006-11-04 09:57:52.000000000 +0100
++++ WindowMaker-0.92.0/src/window.c	2006-11-04 10:00:33.000000000 +0100
+@@ -1399,6 +1399,11 @@
+                     raise = True;
+                 }
+             }
++	    /* only do the Bounce when animations are activated */
++	    if(!wPreferences.no_animations)
++	    {
++		wAppBounce(app);
++	    }
+         }
+     }
+ 


Index: WindowMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/FC-5/WindowMaker.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WindowMaker.spec	2 Mar 2006 22:57:20 -0000	1.18
+++ WindowMaker.spec	4 Nov 2006 13:21:14 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:	A fast, feature rich Window Manager
 Name:		WindowMaker
 Version:	0.92.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 
 License:	GPL
 Group:		User Interface/Desktops
@@ -43,6 +43,8 @@
 Patch207:	WindowMaker-0.91.0-sga-moving-add.patch
 Patch208:	WindowMaker-0.91.0-peter-newappicon.patch
 Patch209:	WindowMaker-0.91.0-peter-mouse-placement.patch
+# actually a fixed version that does respect animations of settings
+# for the bounce animation. Fixes #185579.
 Patch210:	WindowMaker-0.91.0-peter-appicon-bouncer2.patch
 Patch211:       WindowMaker-0.91.0-sga-swpanel-customization.patch
 Patch212:       WindowMaker-0.92.0-alt-newpo.patch
@@ -66,6 +68,21 @@
 Summary:	libraries needed for WindowMaker.
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	xorg-x11-proto-devel
+Requires:	libX11-devel
+Requires:	pkgconfig
+Requires:	libXinerama-devel
+Requires:	fontconfig-devel
+Requires:	freetype-devel
+Requires:	libXft-devel
+Requires:	libXext-devel
+Requires:	libXrender-devel
+Requires:	libtiff-devel
+Requires:	zlib-devel
+Requires:	libXpm-devel
+Requires:	libjpeg-devel
+Requires:	libpng-devel
+Requires:	libungif-devel
 
 
 %description
@@ -193,6 +210,11 @@
 
 
 %changelog
+* Sat Nov 04 2006 Andreas Bierfert 
+0.92.0-9
+- fix #185579: bouncing animation will respect animations off setting
+- fix #211263: missing dependencies in devel package
+
 * Thu Mar 02 2006 Andreas Bierfert 
 0.92.0-8
 - fix gdm detection



From fedora-extras-commits at redhat.com  Sat Nov  4 13:21:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 4 Nov 2006 06:21:46 -0700
Subject: rpms/WindowMaker/FC-6
	WindowMaker-0.91.0-peter-appicon-bouncer2.patch, 
	1.1, 1.2 WindowMaker.spec, 1.19, 1.20
Message-ID: <200611041321.kA4DLk1W008779@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/WindowMaker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8704/FC-6

Modified Files:
	WindowMaker-0.91.0-peter-appicon-bouncer2.patch 
	WindowMaker.spec 
Log Message:
- fix #185579: bouncing animation will respect animations off setting
- fix #211263: missing dependencies in devel package 


WindowMaker-0.91.0-peter-appicon-bouncer2.patch:

Index: WindowMaker-0.91.0-peter-appicon-bouncer2.patch
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/FC-6/WindowMaker-0.91.0-peter-appicon-bouncer2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-peter-appicon-bouncer2.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-peter-appicon-bouncer2.patch	4 Nov 2006 13:21:15 -0000	1.2
@@ -1,13 +1,3 @@
---- WindowMaker-0.91.0/src/window.c.vns	2005-05-19 12:42:35 +0400
-+++ WindowMaker-0.91.0/src/window.c	2005-05-19 12:42:35 +0400
-@@ -1410,6 +1410,7 @@
-                     raise = True;
-                 }
-             }
-+	    wAppBounce(app);
-         }
-     }
- 
 --- WindowMaker-0.91.0/src/application.c.vns	2005-05-19 12:42:35 +0400
 +++ WindowMaker-0.91.0/src/application.c	2005-05-19 12:42:35 +0400
 @@ -448,6 +448,16 @@
@@ -223,3 +213,17 @@
 +{
 +}
 +#endif
+--- WindowMaker-0.92.0/src/window.c.orig	2006-11-04 09:57:52.000000000 +0100
++++ WindowMaker-0.92.0/src/window.c	2006-11-04 10:00:33.000000000 +0100
+@@ -1399,6 +1399,11 @@
+                     raise = True;
+                 }
+             }
++	    /* only do the Bounce when animations are activated */
++	    if(!wPreferences.no_animations)
++	    {
++		wAppBounce(app);
++	    }
+         }
+     }
+ 


Index: WindowMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/FC-6/WindowMaker.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- WindowMaker.spec	15 Sep 2006 13:40:04 -0000	1.19
+++ WindowMaker.spec	4 Nov 2006 13:21:15 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	A fast, feature rich Window Manager
 Name:		WindowMaker
 Version:	0.92.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 License:	GPL
 Group:		User Interface/Desktops
@@ -43,6 +43,8 @@
 Patch207:	WindowMaker-0.91.0-sga-moving-add.patch
 Patch208:	WindowMaker-0.91.0-peter-newappicon.patch
 Patch209:	WindowMaker-0.91.0-peter-mouse-placement.patch
+# actually a fixed version that does respect animations of settings
+# for the bounce animation. Fixes #185579.
 Patch210:	WindowMaker-0.91.0-peter-appicon-bouncer2.patch
 Patch211:       WindowMaker-0.91.0-sga-swpanel-customization.patch
 Patch212:       WindowMaker-0.92.0-alt-newpo.patch
@@ -66,6 +68,21 @@
 Summary:	libraries needed for WindowMaker.
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	xorg-x11-proto-devel
+Requires:	libX11-devel
+Requires:	pkgconfig
+Requires:	libXinerama-devel
+Requires:	fontconfig-devel
+Requires:	freetype-devel
+Requires:	libXft-devel
+Requires:	libXext-devel
+Requires:	libXrender-devel
+Requires:	libtiff-devel
+Requires:	zlib-devel
+Requires:	libXpm-devel
+Requires:	libjpeg-devel
+Requires:	libpng-devel
+Requires:	libungif-devel
 
 
 %description
@@ -193,6 +210,11 @@
 
 
 %changelog
+* Sat Nov 04 2006 Andreas Bierfert 
+0.92.0-10
+- fix #185579: bouncing animation will respect animations off setting
+- fix #211263: missing dependencies in devel package
+
 * Fri Sep 15 2006 Andreas Bierfert 
 0.92.0-9
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Sat Nov  4 13:21:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 4 Nov 2006 06:21:46 -0700
Subject: rpms/WindowMaker/devel
	WindowMaker-0.91.0-peter-appicon-bouncer2.patch, 1.1,
	1.2 WindowMaker.spec, 1.19, 1.20
Message-ID: <200611041321.kA4DLkBI008783@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/WindowMaker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8704/devel

Modified Files:
	WindowMaker-0.91.0-peter-appicon-bouncer2.patch 
	WindowMaker.spec 
Log Message:
- fix #185579: bouncing animation will respect animations off setting
- fix #211263: missing dependencies in devel package 


WindowMaker-0.91.0-peter-appicon-bouncer2.patch:

Index: WindowMaker-0.91.0-peter-appicon-bouncer2.patch
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker-0.91.0-peter-appicon-bouncer2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WindowMaker-0.91.0-peter-appicon-bouncer2.patch	2 Mar 2006 14:16:26 -0000	1.1
+++ WindowMaker-0.91.0-peter-appicon-bouncer2.patch	4 Nov 2006 13:21:16 -0000	1.2
@@ -1,13 +1,3 @@
---- WindowMaker-0.91.0/src/window.c.vns	2005-05-19 12:42:35 +0400
-+++ WindowMaker-0.91.0/src/window.c	2005-05-19 12:42:35 +0400
-@@ -1410,6 +1410,7 @@
-                     raise = True;
-                 }
-             }
-+	    wAppBounce(app);
-         }
-     }
- 
 --- WindowMaker-0.91.0/src/application.c.vns	2005-05-19 12:42:35 +0400
 +++ WindowMaker-0.91.0/src/application.c	2005-05-19 12:42:35 +0400
 @@ -448,6 +448,16 @@
@@ -223,3 +213,17 @@
 +{
 +}
 +#endif
+--- WindowMaker-0.92.0/src/window.c.orig	2006-11-04 09:57:52.000000000 +0100
++++ WindowMaker-0.92.0/src/window.c	2006-11-04 10:00:33.000000000 +0100
+@@ -1399,6 +1399,11 @@
+                     raise = True;
+                 }
+             }
++	    /* only do the Bounce when animations are activated */
++	    if(!wPreferences.no_animations)
++	    {
++		wAppBounce(app);
++	    }
+         }
+     }
+ 


Index: WindowMaker.spec
===================================================================
RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- WindowMaker.spec	15 Sep 2006 13:40:04 -0000	1.19
+++ WindowMaker.spec	4 Nov 2006 13:21:16 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	A fast, feature rich Window Manager
 Name:		WindowMaker
 Version:	0.92.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 License:	GPL
 Group:		User Interface/Desktops
@@ -43,6 +43,8 @@
 Patch207:	WindowMaker-0.91.0-sga-moving-add.patch
 Patch208:	WindowMaker-0.91.0-peter-newappicon.patch
 Patch209:	WindowMaker-0.91.0-peter-mouse-placement.patch
+# actually a fixed version that does respect animations of settings
+# for the bounce animation. Fixes #185579.
 Patch210:	WindowMaker-0.91.0-peter-appicon-bouncer2.patch
 Patch211:       WindowMaker-0.91.0-sga-swpanel-customization.patch
 Patch212:       WindowMaker-0.92.0-alt-newpo.patch
@@ -66,6 +68,21 @@
 Summary:	libraries needed for WindowMaker.
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	xorg-x11-proto-devel
+Requires:	libX11-devel
+Requires:	pkgconfig
+Requires:	libXinerama-devel
+Requires:	fontconfig-devel
+Requires:	freetype-devel
+Requires:	libXft-devel
+Requires:	libXext-devel
+Requires:	libXrender-devel
+Requires:	libtiff-devel
+Requires:	zlib-devel
+Requires:	libXpm-devel
+Requires:	libjpeg-devel
+Requires:	libpng-devel
+Requires:	libungif-devel
 
 
 %description
@@ -193,6 +210,11 @@
 
 
 %changelog
+* Sat Nov 04 2006 Andreas Bierfert 
+0.92.0-10
+- fix #185579: bouncing animation will respect animations off setting
+- fix #211263: missing dependencies in devel package
+
 * Fri Sep 15 2006 Andreas Bierfert 
 0.92.0-9
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Sat Nov  4 14:01:32 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 4 Nov 2006 07:01:32 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 telepathy-gabble.spec, 1.13, 1.14
Message-ID: <200611041401.kA4E1WiB012004@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9593

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Sat Nov  4 2006 Brian Pepple  - 0.4.3-1
- Update to 0.4.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Oct 2006 17:43:07 -0000	1.13
+++ .cvsignore	4 Nov 2006 14:01:01 -0000	1.14
@@ -1 +1 @@
-telepathy-gabble-0.4.2.tar.gz
+telepathy-gabble-0.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Oct 2006 17:43:07 -0000	1.13
+++ sources	4 Nov 2006 14:01:01 -0000	1.14
@@ -1 +1 @@
-a1bc3939da26f9221b11806484d2b272  telepathy-gabble-0.4.2.tar.gz
+fdf8fdb60a29243bff32c46fc707ab4c  telepathy-gabble-0.4.3.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- telepathy-gabble.spec	27 Oct 2006 17:43:07 -0000	1.13
+++ telepathy-gabble.spec	4 Nov 2006 14:01:01 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.2
+Version:        0.4.3
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Sat Nov  4 2006 Brian Pepple  - 0.4.3-1
+- Update to 0.4.3.
+
 * Fri Oct 27 2006 Brian Pepple  - 0.4.2-1
 - Update to 0.4.2.
 



From fedora-extras-commits at redhat.com  Sat Nov  4 14:20:37 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 07:20:37 -0700
Subject: rpms/geda-gsymcheck import.log,1.6,1.7
Message-ID: <200611041420.kA4EKbbW012334@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12270

Modified Files:
	import.log 
Log Message:
auto-import geda-gsymcheck-20061020-1 on branch FC-5 from geda-gsymcheck-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	10 Sep 2006 21:47:27 -0000	1.6
+++ import.log	4 Nov 2006 14:20:07 -0000	1.7
@@ -3,3 +3,4 @@
 geda-gsymcheck-20060824-1:HEAD:geda-gsymcheck-20060824-1.src.rpm:1157393474
 geda-gsymcheck-20060906-1:FC-5:geda-gsymcheck-20060906-1.src.rpm:1157924902
 geda-gsymcheck-20060906-2:HEAD:geda-gsymcheck-20060906-2.src.rpm:1157925096
+geda-gsymcheck-20061020-1:FC-5:geda-gsymcheck-20061020-1.src.rpm:1162650257



From fedora-extras-commits at redhat.com  Sat Nov  4 14:20:38 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 07:20:38 -0700
Subject: rpms/geda-gsymcheck/FC-5 .cvsignore, 1.4, 1.5 geda-gsymcheck.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200611041420.kA4EKcd6012339@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12270/FC-5

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:
auto-import geda-gsymcheck-20061020-1 on branch FC-5 from geda-gsymcheck-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:44:27 -0000	1.4
+++ .cvsignore	4 Nov 2006 14:20:08 -0000	1.5
@@ -1 +1 @@
-geda-gsymcheck-20060906.tar.gz
+geda-gsymcheck-20061020.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-5/geda-gsymcheck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-gsymcheck.spec	10 Sep 2006 21:44:27 -0000	1.3
+++ geda-gsymcheck.spec	4 Nov 2006 14:20:08 -0000	1.4
@@ -1,5 +1,5 @@
 Name:             geda-gsymcheck
-Version:          20060906
+Version:          20061020
 Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
@@ -53,6 +53,12 @@
 %{_datadir}/gEDA/docs/man/gsymcheck.html
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- Upstream release 20060906
+
+* Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
+- Rebuilt for FC-6 devel
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-1
 - Upstream release 20060906
 
@@ -132,7 +138,7 @@
 - updated to version 20010304
 
 * Thu Aug 10 2000 Emmanuel Rouat 
-- added '*' as manpage extension because Mandrake compresses them 
+- added '*' as manpage extension because Mandrake compresses them
 with bzip2 while redhat use gzip
 - rebuilt with latest version of rpm
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:44:27 -0000	1.4
+++ sources	4 Nov 2006 14:20:08 -0000	1.5
@@ -1 +1 @@
-0c8e049f49326f20b11de686dd146128  geda-gsymcheck-20060906.tar.gz
+729c8c32598a20ff8c551a96eef1a496  geda-gsymcheck-20061020.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 14:22:39 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 07:22:39 -0700
Subject: rpms/geda-gsymcheck import.log,1.7,1.8
Message-ID: <200611041422.kA4EMdJR012434@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402

Modified Files:
	import.log 
Log Message:
auto-import geda-gsymcheck-20061020-1 on branch FC-6 from geda-gsymcheck-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	4 Nov 2006 14:20:07 -0000	1.7
+++ import.log	4 Nov 2006 14:22:08 -0000	1.8
@@ -4,3 +4,4 @@
 geda-gsymcheck-20060906-1:FC-5:geda-gsymcheck-20060906-1.src.rpm:1157924902
 geda-gsymcheck-20060906-2:HEAD:geda-gsymcheck-20060906-2.src.rpm:1157925096
 geda-gsymcheck-20061020-1:FC-5:geda-gsymcheck-20061020-1.src.rpm:1162650257
+geda-gsymcheck-20061020-1:FC-6:geda-gsymcheck-20061020-1.src.rpm:1162650379



From fedora-extras-commits at redhat.com  Sat Nov  4 14:22:39 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 07:22:39 -0700
Subject: rpms/geda-gsymcheck/FC-6 .cvsignore, 1.4, 1.5 geda-gsymcheck.spec,
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200611041422.kA4EMd9S012439@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402/FC-6

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:
auto-import geda-gsymcheck-20061020-1 on branch FC-6 from geda-gsymcheck-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:47:28 -0000	1.4
+++ .cvsignore	4 Nov 2006 14:22:09 -0000	1.5
@@ -1 +1 @@
-geda-gsymcheck-20060906.tar.gz
+geda-gsymcheck-20061020.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/geda-gsymcheck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-gsymcheck.spec	10 Sep 2006 21:47:28 -0000	1.3
+++ geda-gsymcheck.spec	4 Nov 2006 14:22:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             geda-gsymcheck
-Version:          20060906
-Release:          2%{?dist}
+Version:          20061020
+Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
 Group:            Applications/Engineering
@@ -53,6 +53,9 @@
 %{_datadir}/gEDA/docs/man/gsymcheck.html
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- Upstream release 20060906
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
 - Rebuilt for FC-6 devel
 
@@ -135,7 +138,7 @@
 - updated to version 20010304
 
 * Thu Aug 10 2000 Emmanuel Rouat 
-- added '*' as manpage extension because Mandrake compresses them 
+- added '*' as manpage extension because Mandrake compresses them
 with bzip2 while redhat use gzip
 - rebuilt with latest version of rpm
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:47:28 -0000	1.4
+++ sources	4 Nov 2006 14:22:09 -0000	1.5
@@ -1 +1 @@
-0c8e049f49326f20b11de686dd146128  geda-gsymcheck-20060906.tar.gz
+729c8c32598a20ff8c551a96eef1a496  geda-gsymcheck-20061020.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 14:30:59 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 07:30:59 -0700
Subject: rpms/geda-gsymcheck import.log,1.8,1.9
Message-ID: <200611041430.kA4EUxGo012560@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526

Modified Files:
	import.log 
Log Message:
auto-import geda-gsymcheck-20061020-1 on branch devel from geda-gsymcheck-20061020-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	4 Nov 2006 14:22:08 -0000	1.8
+++ import.log	4 Nov 2006 14:30:29 -0000	1.9
@@ -5,3 +5,4 @@
 geda-gsymcheck-20060906-2:HEAD:geda-gsymcheck-20060906-2.src.rpm:1157925096
 geda-gsymcheck-20061020-1:FC-5:geda-gsymcheck-20061020-1.src.rpm:1162650257
 geda-gsymcheck-20061020-1:FC-6:geda-gsymcheck-20061020-1.src.rpm:1162650379
+geda-gsymcheck-20061020-1:HEAD:geda-gsymcheck-20061020-1.src.rpm:1162650880



From fedora-extras-commits at redhat.com  Sat Nov  4 14:31:00 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 07:31:00 -0700
Subject: rpms/geda-gsymcheck/devel .cvsignore, 1.4, 1.5 geda-gsymcheck.spec, 
	1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200611041431.kA4EV09R012565@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/geda-gsymcheck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526/devel

Modified Files:
	.cvsignore geda-gsymcheck.spec sources 
Log Message:
auto-import geda-gsymcheck-20061020-1 on branch devel from geda-gsymcheck-20061020-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Sep 2006 21:47:28 -0000	1.4
+++ .cvsignore	4 Nov 2006 14:30:30 -0000	1.5
@@ -1 +1 @@
-geda-gsymcheck-20060906.tar.gz
+geda-gsymcheck-20061020.tar.gz


Index: geda-gsymcheck.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/geda-gsymcheck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-gsymcheck.spec	10 Sep 2006 21:47:28 -0000	1.3
+++ geda-gsymcheck.spec	4 Nov 2006 14:30:30 -0000	1.4
@@ -1,6 +1,6 @@
 Name:             geda-gsymcheck
-Version:          20060906
-Release:          2%{?dist}
+Version:          20061020
+Release:          1%{?dist}
 
 Summary:          Symbol checker for electronics schematics editor
 Group:            Applications/Engineering
@@ -53,6 +53,9 @@
 %{_datadir}/gEDA/docs/man/gsymcheck.html
 
 %Changelog
+* Thu Nov 02 2006 Chitlesh Goorah  - 20061020-1
+- Upstream release 20060906
+
 * Sun Sep 10 2006 Chitlesh Goorah  - 20060906-2
 - Rebuilt for FC-6 devel
 
@@ -135,7 +138,7 @@
 - updated to version 20010304
 
 * Thu Aug 10 2000 Emmanuel Rouat 
-- added '*' as manpage extension because Mandrake compresses them 
+- added '*' as manpage extension because Mandrake compresses them
 with bzip2 while redhat use gzip
 - rebuilt with latest version of rpm
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geda-gsymcheck/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2006 21:47:28 -0000	1.4
+++ sources	4 Nov 2006 14:30:30 -0000	1.5
@@ -1 +1 @@
-0c8e049f49326f20b11de686dd146128  geda-gsymcheck-20060906.tar.gz
+729c8c32598a20ff8c551a96eef1a496  geda-gsymcheck-20061020.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 15:39:28 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 4 Nov 2006 08:39:28 -0700
Subject: rpms/gaim-rhythmbox/FC-5 .cvsignore, 1.2, 1.3 gaim-rhythmbox.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611041539.kA4FdS7S016049@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/gaim-rhythmbox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16029

Modified Files:
	.cvsignore gaim-rhythmbox.spec sources 
Log Message:
Revert to 1.5.0.1 for FC5, which has only Gaim 1.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2006 04:17:15 -0000	1.2
+++ .cvsignore	4 Nov 2006 15:38:58 -0000	1.3
@@ -1 +1 @@
-gaim-rhythmbox-2.0beta3.tar.gz
+gaim-rhythmbox-1.5.0.1.tar.gz


Index: gaim-rhythmbox.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-5/gaim-rhythmbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-rhythmbox.spec	3 Nov 2006 04:17:15 -0000	1.1
+++ gaim-rhythmbox.spec	4 Nov 2006 15:38:58 -0000	1.2
@@ -1,20 +1,21 @@
-%define prever beta3
 Name:           gaim-rhythmbox
-Version:        2.0
-Release:        0.3.%{prever}%{?dist}
+Version:        1.5.0.1
+Release:        1%{?dist}
 Summary:        Rhythmbox plugin for GAIM
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jon.oberheide.org/projects/gaim-rhythmbox/
-Source0:        http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}%{prever}.tar.gz
+Source0:        http://jon.oberheide.org/projects/gaim-rhythmbox/downloads/gaim-rhythmbox-%{version}.tar.gz
 Patch0:         gaim-rhythmbox-configure.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gaim-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  dbus-glib-devel dbus-devel
-Requires:       rhythmbox
+BuildRequires:  libbonobo-devel
+BuildRequires:  ORBit2-devel
+BuildRequires:  rhythmbox
+Requires:       gaim rhythmbox
 
 %description
 The Gaim-Rhythmbox plugin will automatically update your Gaim user and
@@ -26,8 +27,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
-%patch0
+%setup -q -n %{name}-%{version}
+%patch0 -b .gaim-rhythmbox-configure
 
 
 %build
@@ -53,11 +54,5 @@
 
 
 %changelog
-* Thu Nov  2 2006 Michel Salim  2.0-0.3.beta3
-- Tidy up prever use, description field, and add files to documentation
-
-* Thu Nov  2 2006 Michel Salim  2.0-0.2.beta3
-- Add missing BuildRequires
-
-* Sat Oct 28 2006 Michel Salim  2.0-0.1.beta3
+* Sat Nov  4 2006 Michel Salim  1.5.0.1-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-rhythmbox/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2006 04:17:15 -0000	1.2
+++ sources	4 Nov 2006 15:38:58 -0000	1.3
@@ -1 +1 @@
-a9e836986dae7857b408120782264d5a  gaim-rhythmbox-2.0beta3.tar.gz
+e2b2f7d3b1ef2f9f89b6728629ecdab5  gaim-rhythmbox-1.5.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 15:54:53 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 4 Nov 2006 08:54:53 -0700
Subject: rpms/tcl-thread - New directory
Message-ID: <200611041554.kA4FsrF2016257@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/tcl-thread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253/tcl-thread

Log Message:
Directory /cvs/extras/rpms/tcl-thread added to the repository




From fedora-extras-commits at redhat.com  Sat Nov  4 15:54:59 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 4 Nov 2006 08:54:59 -0700
Subject: rpms/tcl-thread/devel - New directory
Message-ID: <200611041554.kA4FsxQK016272@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/tcl-thread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253/tcl-thread/devel

Log Message:
Directory /cvs/extras/rpms/tcl-thread/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov  4 15:55:14 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 4 Nov 2006 08:55:14 -0700
Subject: rpms/tcl-thread Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611041555.kA4FtEuN016306@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/tcl-thread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300

Added Files:
	Makefile import.log 
Log Message:
Setup of module tcl-thread


--- NEW FILE Makefile ---
# Top level Makefile for module tcl-thread
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  Sat Nov  4 15:55:20 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 4 Nov 2006 08:55:20 -0700
Subject: rpms/tcl-thread/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611041555.kA4FtKjI016325@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/tcl-thread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16300/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcl-thread


--- 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  Sat Nov  4 15:56:23 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 4 Nov 2006 08:56:23 -0700
Subject: rpms/tcl-thread import.log,1.1,1.2
Message-ID: <200611041556.kA4FuNe0016410@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/tcl-thread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16375

Modified Files:
	import.log 
Log Message:
auto-import tcl-thread-2.6.5-2 on branch devel from tcl-thread-2.6.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tcl-thread/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Nov 2006 15:55:14 -0000	1.1
+++ import.log	4 Nov 2006 15:55:52 -0000	1.2
@@ -0,0 +1 @@
+tcl-thread-2_6_5-2:HEAD:tcl-thread-2.6.5-2.src.rpm:1162655699



From fedora-extras-commits at redhat.com  Sat Nov  4 15:56:23 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 4 Nov 2006 08:56:23 -0700
Subject: rpms/tcl-thread/devel tcl-thread-x86_64-build.patch, NONE,
	1.1 tcl-thread.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611041556.kA4FuNPm016414@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/tcl-thread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16375/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tcl-thread-x86_64-build.patch tcl-thread.spec 
Log Message:
auto-import tcl-thread-2.6.5-2 on branch devel from tcl-thread-2.6.5-2.src.rpm

tcl-thread-x86_64-build.patch:

--- NEW FILE tcl-thread-x86_64-build.patch ---
--- configure.orig	2006-11-02 14:42:53.000000000 -0800
+++ configure	2006-11-02 14:43:11.000000000 -0800
@@ -6155,6 +6155,7 @@
 
     if test x"${gincdir}" = x -o x"${glibdir}" = x; then
         for i in \
+                `ls -d ${libdir} 2>/dev/null`\
                 `ls -d ${exec_prefix}/lib 2>/dev/null`\
                 `ls -d ${prefix}/lib 2>/dev/null`\
                 `ls -d /usr/local/lib 2>/dev/null`\
--- aclocal.m4.orig	2006-11-02 14:42:57.000000000 -0800
+++ aclocal.m4	2006-11-02 14:43:04.000000000 -0800
@@ -40,6 +40,7 @@
     ])
     if test x"${gincdir}" = x -o x"${glibdir}" = x; then
         for i in \
+                `ls -d ${libdir} 2>/dev/null`\
                 `ls -d ${exec_prefix}/lib 2>/dev/null`\
                 `ls -d ${prefix}/lib 2>/dev/null`\
                 `ls -d /usr/local/lib 2>/dev/null`\


--- NEW FILE tcl-thread.spec ---
Name:		tcl-thread
Summary:	Tcl Thread extension
License:	BSD
Group:		Development/Tools
Version:	2.6.5
Release:	2%{?dist}
Source:		http://prdownloads.sourceforge.net/tcl/thread2.6.5.tar.gz
URL:		http://tcl.sourceforge.net
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel gdbm-devel
Requires: tcl
Patch0: tcl-thread-x86_64-build.patch

%description
Thread extension for the Tcl toolkit.  You can use this extension to gain
script level access to Tcl threading capabilities.

%prep
%setup -q -n thread%{version}
%patch0 -p0

%build
%configure --enable-threads --with-gdbm
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

%check

make DESTDIR=$RPM_BUILD_ROOT test

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-, root, root)
%doc license.terms README ChangeLog
%{_libdir}/thread%{version}
%{_mandir}/mann/*

%changelog
* Fri Nov 3 2006 - jwboyer at jdub.homelinux.org 2.6.5-2
- Update for review comments
- Add patch to compile on x86_64

* Thu Oct 26 2006 - jwboyer at jdub.homelinux.org 2.6.5-1
- Initial tcl-threads


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcl-thread/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Nov 2006 15:55:20 -0000	1.1
+++ .cvsignore	4 Nov 2006 15:55:53 -0000	1.2
@@ -0,0 +1 @@
+thread2.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcl-thread/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Nov 2006 15:55:20 -0000	1.1
+++ sources	4 Nov 2006 15:55:53 -0000	1.2
@@ -0,0 +1 @@
+3c69b4a891590f23bb79a1fa98d879f7  thread2.6.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 16:05:24 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 4 Nov 2006 09:05:24 -0700
Subject: owners owners.list,1.1890,1.1891
Message-ID: <200611041605.kA4G5OTx019409@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19391

Modified Files:
	owners.list 
Log Message:
Add tcl-thread



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1890
retrieving revision 1.1891
diff -u -r1.1890 -r1.1891
--- owners.list	4 Nov 2006 12:55:41 -0000	1.1890
+++ owners.list	4 Nov 2006 16:04:54 -0000	1.1891
@@ -2177,6 +2177,7 @@
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tango-icon-theme|Icons from Tango Project|raven at pmail.pl|extras-qa at fedoraproject.org|
 Fedora Extras|taskjuggler|Project management tool|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov  4 16:52:29 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 4 Nov 2006 09:52:29 -0700
Subject: rpms/gramps/devel .cvsignore, 1.14, 1.15 gramps.spec, 1.22,
	1.23 sources, 1.14, 1.15
Message-ID: <200611041652.kA4GqTWf019966@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19946

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Sat Nov  4 2006 Brian Pepple  - 2.2.2-1
- Update to 2.2.2.
- Add scriptlet for gtk+ icon cache.
- Disable scrollkeeper & mime-install in configure.
- Simplify files since we are no longer ghosting *.pyo files.
- Drop X-Fedora desktop category.
- Add BR on gnome-doc-utils.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 May 2006 15:16:56 -0000	1.14
+++ .cvsignore	4 Nov 2006 16:51:59 -0000	1.15
@@ -1 +1 @@
-gramps-2.0.11.tar.gz
+gramps-2.2.2.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gramps.spec	6 Sep 2006 14:24:29 -0000	1.22
+++ gramps.spec	4 Nov 2006 16:51:59 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           gramps
-Version:        2.0.11
-Release:        5%{?dist}
+Version:        2.2.2
+Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -19,6 +19,7 @@
 BuildRequires:  pygtk2-libglade
 BuildRequires:  python-devel
 BuildRequires:  scrollkeeper
+BuildRequires:	gnome-doc-utils
 
 Requires:       gnome-python2-canvas
 Requires:       gnome-python2-gconf
@@ -51,24 +52,23 @@
 
 
 %build
-%configure --disable-schemas-install
+%configure --disable-schemas-install --disable-scrollkeeper --disable-mime-install
 make
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall GNOME_DATADIR="${RPM_BUILD_ROOT}%{_datadir}"
-rm -rf ${RPM_BUILD_ROOT}%{_localstatedir}/scrollkeeper
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome/
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{application,mime.cache}
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses}
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-cp -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
+#Remove duplicate doc
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/COPYING
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+cp -p $RPM_BUILD_ROOT%{_datadir}/%{name}/images/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+
 %find_lang %{name}
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
@@ -91,6 +91,8 @@
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %preun
@@ -105,49 +107,36 @@
 scrollkeeper-update -q || :
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
+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 COPYING-DOCS FAQ NEWS TODO
 %{_bindir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/application-registry/%{name}.applications
 %{_datadir}/omf/%{name}/
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mime-info/*
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_mandir}/man1/%{name}.1.gz
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.py
-%{_datadir}/%{name}/*.pyc
-%{_datadir}/%{name}/*.png
-%{_datadir}/%{name}/*.jpg
-%{_datadir}/%{name}/*.glade
-%{_datadir}/%{name}/*.pyo
-%{_datadir}/%{name}/data/
-%dir %{_datadir}/%{name}/dates
-%{_datadir}/%{name}/dates/*.py
-%{_datadir}/%{name}/dates/*.pyc
-%{_datadir}/%{name}/dates/*.pyo
-%dir %{_datadir}/%{name}/docgen
-%{_datadir}/%{name}/docgen/*.py
-%{_datadir}/%{name}/docgen/*.pyc
-%{_datadir}/%{name}/docgen/*.pyo
-%{_datadir}/%{name}/example/
-%{_datadir}/%{name}/gnome/
-%dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/*.py
-%{_datadir}/%{name}/plugins/*.pyc
-%{_datadir}/%{name}/plugins/*.glade
-%{_datadir}/%{name}/plugins/*.xml
-%{_datadir}/%{name}/plugins/*.png
-%{_datadir}/%{name}/plugins/*.pyo
+%{_datadir}/gnome/help/%{name}/
 
 
 %changelog
+* Sat Nov  4 2006 Brian Pepple  - 2.2.2-1
+- Update to 2.2.2.
+- Add scriptlet for gtk+ icon cache.
+- Disable scrollkeeper & mime-install in configure.
+- Simplify files since we are no longer ghosting *.pyo files.
+- Drop X-Fedora desktop category.
+- Add BR on gnome-doc-utils.
+
 * Wed Sep  6 2006 Brian Pepple  - 2.0.11-5
 - Don't ghost *.pyo files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 May 2006 15:16:56 -0000	1.14
+++ sources	4 Nov 2006 16:51:59 -0000	1.15
@@ -1 +1 @@
-650873c3c571a921a9c42b975ced2105  gramps-2.0.11.tar.gz
+c640782457bccc7324d17c1baf21701c  gramps-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 17:06:13 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 4 Nov 2006 10:06:13 -0700
Subject: rpms/gqview/devel gqview-2.0.3-desktop.patch, NONE, 1.1 .cvsignore, 
	1.6, 1.7 gqview.spec, 1.10, 1.11 sources, 1.7,
	1.8 gqview-2.0.0-desktop.patch, 1.2, NONE
Message-ID: <200611041706.kA4H6DjK023012@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22989

Modified Files:
	.cvsignore gqview.spec sources 
Added Files:
	gqview-2.0.3-desktop.patch 
Removed Files:
	gqview-2.0.0-desktop.patch 
Log Message:
* Sat Nov  4 2006 Michael Schwendt  - 2.0.3-1
- update to 2.0.3
- .desktop patch: additional MIME types merged upstream


gqview-2.0.3-desktop.patch:

--- NEW FILE gqview-2.0.3-desktop.patch ---
diff -Nur gqview-2.0.3-orig/gqview.desktop gqview-2.0.3/gqview.desktop
--- gqview-2.0.3-orig/gqview.desktop	2006-11-03 00:05:28.000000000 +0100
+++ gqview-2.0.3/gqview.desktop	2006-11-04 17:58:52.000000000 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=GQview
+Name=GQview Image Viewer
 GenericName=Image Viewer
 GenericName[et]=Piltide vaatur
 GenericName[tr]=Resim g??stericisi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Oct 2006 16:13:51 -0000	1.6
+++ .cvsignore	4 Nov 2006 17:05:41 -0000	1.7
@@ -1 +1 @@
-gqview-2.0.2.tar.gz
+gqview-2.0.3.tar.gz


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gqview.spec	14 Oct 2006 16:13:51 -0000	1.10
+++ gqview.spec	4 Nov 2006 17:05:41 -0000	1.11
@@ -1,11 +1,11 @@
 Summary:	Image browser and viewer
 Name:		gqview
-Version:	2.0.2
+Version:	2.0.3
 Release: 1%{?dist}
 License:	GPL
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
-Patch1:		gqview-2.0.0-desktop.patch
+Patch1:		gqview-2.0.3-desktop.patch
 Patch2:		gqview-2.0.0-editors.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL:		http://gqview.sourceforge.net/
@@ -76,6 +76,10 @@
 
 
 %changelog
+* Sat Nov  4 2006 Michael Schwendt  - 2.0.3-1
+- update to 2.0.3
+- .desktop patch: additional MIME types merged upstream
+
 * Sat Oct 14 2006 Michael Schwendt  - 2.0.2-1
 - update to 2.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Oct 2006 16:13:51 -0000	1.7
+++ sources	4 Nov 2006 17:05:41 -0000	1.8
@@ -1 +1 @@
-0bb325001b3cea88c2487c84e06ba738  gqview-2.0.2.tar.gz
+8759106bcc16b50234b4b419064d245c  gqview-2.0.3.tar.gz


--- gqview-2.0.0-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov  4 17:10:54 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 4 Nov 2006 10:10:54 -0700
Subject: rpms/gqview/devel gqview.spec,1.11,1.12
Message-ID: <200611041710.kA4HAs18023159@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23141

Modified Files:
	gqview.spec 
Log Message:
UTF-8 conversion


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gqview.spec	4 Nov 2006 17:05:41 -0000	1.11
+++ gqview.spec	4 Nov 2006 17:10:24 -0000	1.12
@@ -190,7 +190,7 @@
 * Sun Jun 24 2001 Elliot Lee 
 - Bump release + rebuild.
 
-* Tue Feb 27 2001 Trond Eivind Glomsr?d 
+* Tue Feb 27 2001 Trond Eivind Glomsr??d 
 - use %%{_tmppath}
 
 * Thu Jul 13 2000 Prospector 



From fedora-extras-commits at redhat.com  Sat Nov  4 18:04:58 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Sat, 4 Nov 2006 11:04:58 -0700
Subject: rpms/gnubiff import.log,1.6,1.7
Message-ID: <200611041804.kA4I4wnR026619@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26587

Modified Files:
	import.log 
Log Message:
auto-import gnubiff-2.2.3-1 on branch devel from gnubiff-2.2.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	16 Oct 2006 18:41:40 -0000	1.6
+++ import.log	4 Nov 2006 18:04:28 -0000	1.7
@@ -3,3 +3,4 @@
 gnubiff-2_2_2-2_fc6:HEAD:gnubiff-2.2.2-2.fc6.src.rpm:1156786285
 gnubiff-2_2_2-3:HEAD:gnubiff-2.2.2-3.src.rpm:1160768093
 gnubiff-2_2_2-4:HEAD:gnubiff-2.2.2-4.src.rpm:1161024092
+gnubiff-2_2_3-1:HEAD:gnubiff-2.2.3-1.src.rpm:1162663463



From fedora-extras-commits at redhat.com  Sat Nov  4 18:05:01 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Sat, 4 Nov 2006 11:05:01 -0700
Subject: rpms/gnubiff/devel .cvsignore, 1.3, 1.4 gnubiff.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200611041805.kA4I51BI026622@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26587/devel

Modified Files:
	.cvsignore gnubiff.spec sources 
Log Message:
auto-import gnubiff-2.2.3-1 on branch devel from gnubiff-2.2.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Aug 2006 23:59:53 -0000	1.3
+++ .cvsignore	4 Nov 2006 18:04:31 -0000	1.4
@@ -1 +1 @@
-gnubiff-2.2.2.tar.gz
+gnubiff-2.2.3.tar.gz


Index: gnubiff.spec
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/devel/gnubiff.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnubiff.spec	16 Oct 2006 18:41:41 -0000	1.5
+++ gnubiff.spec	4 Nov 2006 18:04:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name:	gnubiff
-Version:	2.2.2        
-Release:	4%{?dist}
+Version:	2.2.3        
+Release:	1%{?dist}
 Summary:	A mail notification program
 
 Group:	Applications/Internet
@@ -64,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 04 2006 Damien Durand  - 2.2.3-1
+- Upgrade to 2.2.3
+
 * Sun Oct 15 2006 Damien Durand  - 2.2.2-4
 - Add perl-XML-Parser in BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Aug 2006 23:59:53 -0000	1.3
+++ sources	4 Nov 2006 18:04:31 -0000	1.4
@@ -1 +1 @@
-54e026ed12571350dcf8965a090dfa45  gnubiff-2.2.2.tar.gz
+548c8a65ef27acbf23a134c67ce0f37b  gnubiff-2.2.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 18:10:06 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Sat, 4 Nov 2006 11:10:06 -0700
Subject: rpms/gnubiff/FC-5 gnubiff.spec,1.1,NONE
Message-ID: <200611041810.kA4IA6H0027037@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27031

Removed Files:
	gnubiff.spec 
Log Message:



--- gnubiff.spec DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov  4 18:11:23 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Sat, 4 Nov 2006 11:11:23 -0700
Subject: rpms/gnubiff/FC-5 gnubiff.spec,1.2,1.3
Message-ID: <200611041811.kA4IBNvR027100@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27075

Added Files:
	gnubiff.spec 
Log Message:



Index: gnubiff.spec
===================================================================
RCS file: gnubiff.spec
diff -N gnubiff.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnubiff.spec	4 Nov 2006 18:10:53 -0000	1.3
@@ -0,0 +1,98 @@
+Name:	gnubiff
+Version:	2.2.3        
+Release:	1%{?dist}
+Summary:	A mail notification program
+
+Group:	Applications/Internet
+License:	GPL
+URL:	http://gnubiff.sourceforge.net/
+Source0:	http://belnet.dl.sourceforge.net/sourceforge/gnubiff/%{name}-%{version}.tar.gz
+Source1:	%{name}.desktop
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gamin-devel, libglade2-devel, desktop-file-utils, gnome-panel-devel, openssl-devel, perl-XML-Parser  
+Requires(post): /sbin/install-info    
+Requires(preun): /sbin/install-info
+
+%description
+Gnubiff is a mail notification program that periodically checks 
+for mail and displays headers when new mail has arrived
+
+%prep
+%setup -q
+
+
+%build
+%configure 
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir
+
+desktop-file-install --vendor fedora                            \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --add-category X-Fedora                                 \
+        %{SOURCE1}
+
+%find_lang %{name}
+
+%post 
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun 
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README THANKS TODO
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_infodir}/*.info.gz
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/*.png
+%{_datadir}/gnome-2.0/ui
+%{_libdir}/bonobo/servers
+%{_mandir}/man1/*
+
+%changelog
+* Sun Nov 04 2006 Damien Durand  - 2.2.3-1
+- Upgrade to 2.2.3
+
+* Sun Oct 15 2006 Damien Durand  - 2.2.2-4
+- Add perl-XML-Parser in BR
+
+* Thu Oct 13 2006 Damien Durand  - 2.2.2-3
+- Bump Release
+
+* Mon Aug 28 2006 Damien Durand  - 2.2.2-2
+- Bump Release
+
+* Wed Aug 09 2006 Damien Durand  - 2.2.2-1
+- Upgrade to 2.2.2
+
+* Wed Apr 24 2006 Damien Durand  - 2.2.1-2
+- Remove --prefix='pkg-config libpanelapplet-2.0 openssl --variable=prefix
+- Remove ABOUT-NLS & Changelog in %file section
+- Fixing %{_datadir}/info to {_infodir}
+
+* Tue Apr 23 2006 Damien Durand  - 2.2.1-1
+- Upgrade to 2.2.1
+- Add --prefix='pkg-config libpanelapplet-2.0 openssl --variable=prefix in %configure section
+- Add gnome-panel-devel, openssl-devel in BuildRequires
+
+* Sun Apr 21 2006 Damien Durand  - 2.2.0-2
+- Add gettext-devel, remove gtk-devel in BuildRequires
+- Add %{_datadir}/info/*.info.gz in files section
+- Add %post and %preun sections
+
+* Wed Apr 19 2006 Damien Durand  - 2.2.0-1
+- Initial package



From fedora-extras-commits at redhat.com  Sat Nov  4 18:13:00 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Sat, 4 Nov 2006 11:13:00 -0700
Subject: rpms/gnubiff/FC-5 sources,1.2,1.3
Message-ID: <200611041813.kA4ID0NF027160@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27144

Modified Files:
	sources 
Log Message:



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 May 2006 04:23:47 -0000	1.2
+++ sources	4 Nov 2006 18:12:30 -0000	1.3
@@ -1 +1 @@
-8d2ef679f42e7a593dc88b750d0cca4c  gnubiff-2.2.1.tar.gz
+548c8a65ef27acbf23a134c67ce0f37b  gnubiff-2.2.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 18:14:38 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Sat, 4 Nov 2006 11:14:38 -0700
Subject: rpms/gnubiff/FC-6 gnubiff.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <200611041814.kA4IEcd6027252@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/gnubiff/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27234

Modified Files:
	gnubiff.spec sources 
Log Message:



Index: gnubiff.spec
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/FC-6/gnubiff.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnubiff.spec	16 Oct 2006 18:41:41 -0000	1.5
+++ gnubiff.spec	4 Nov 2006 18:14:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:	gnubiff
-Version:	2.2.2        
-Release:	4%{?dist}
+Version:	2.2.3        
+Release:	1%{?dist}
 Summary:	A mail notification program
 
 Group:	Applications/Internet
@@ -64,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 04 2006 Damien Durand  - 2.2.3-1
+- Upgrade to 2.2.3
+
 * Sun Oct 15 2006 Damien Durand  - 2.2.2-4
 - Add perl-XML-Parser in BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnubiff/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Aug 2006 23:59:53 -0000	1.3
+++ sources	4 Nov 2006 18:14:08 -0000	1.4
@@ -1 +1 @@
-54e026ed12571350dcf8965a090dfa45  gnubiff-2.2.2.tar.gz
+548c8a65ef27acbf23a134c67ce0f37b  gnubiff-2.2.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 18:21:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 4 Nov 2006 11:21:19 -0700
Subject: rpms/vdr/FC-6 vdr-timercmds.conf, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 vdr.spec, 1.1, 1.2 vdr-1.4.3-1.diff, 1.1, NONE
Message-ID: <200611041821.kA4ILJYH027392@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27354/FC-6

Modified Files:
	.cvsignore sources vdr.spec 
Added Files:
	vdr-timercmds.conf 
Removed Files:
	vdr-1.4.3-1.diff 
Log Message:
* Sat Nov  4 2006 Ville Skytt??  - 1.4.4-1
- 1.4.4.
- Apply epgsearch and timer info patches.
- Mark console.perms snippet noreplace again.



--- NEW FILE vdr-timercmds.conf ---
# Timer commands for VDR.  See the vdr(5) manual page; the syntax is the
# same as for reccmds.conf.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2006 18:50:35 -0000	1.2
+++ .cvsignore	4 Nov 2006 18:20:48 -0000	1.3
@@ -1,3 +1,3 @@
-vdr-1.4.3-liemikuutio-1.13.diff.gz
-vdr-1.4.3.tar.bz2
 vdr_1.4.3-1.ds.diff.gz
+vdr-1.4.4.tar.bz2
+vdr-1.4.4-liemikuutio-1.13.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2006 18:50:35 -0000	1.2
+++ sources	4 Nov 2006 18:20:49 -0000	1.3
@@ -1,3 +1,3 @@
-ed95f0e5844816d313edcb7f7231e06a  vdr-1.4.3-liemikuutio-1.13.diff.gz
-9bb82d1f090dad746d784d147dbb0126  vdr-1.4.3.tar.bz2
 a0f1441e534715a190e4507c2f58268f  vdr_1.4.3-1.ds.diff.gz
+3d5dbacda725f769099b774577d2e3af  vdr-1.4.4.tar.bz2
+967281c1f666b24cbc3f46cd17dffe98  vdr-1.4.4-liemikuutio-1.13.diff.gz


Index: vdr.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr.spec	16 Oct 2006 18:50:35 -0000	1.1
+++ vdr.spec	4 Nov 2006 18:20:49 -0000	1.2
@@ -14,11 +14,11 @@
 %define vdr_user  vdr
 %define vdr_group video
 # From APIVERSION in config.h
-%define apiver    1.4.3
+%define apiver    1.4.4
 
 Name:           vdr
-Version:        1.4.3
-Release:        3%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -36,12 +36,12 @@
 Source10:       %{name}-README.package
 Source11:       %{name}-skincurses.conf
 Source12:       %{name}-sky.conf
+Source13:       %{name}-timercmds.conf
 Patch0:         %{name}-channel+epg.patch
 Patch1:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.3-1.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.3-liemikuutio-1.13.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.4-liemikuutio-1.13.diff.gz
 Patch3:         %{name}-1.4.1-paths.patch
 Patch4:         %{name}-1.4.1-dumpable.patch
-Patch10:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.3-1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -119,15 +119,14 @@
 #patch -i debian/patches/12_skinclassic_icons.dpatch
 #patch -i debian/patches/15_cut_compensate_start_time.dpatch
 patch -i debian/patches/19_debian_osdbase_maxitems.dpatch
-#patch -i debian/patches/opt-20_epgsearch.dpatch
+patch -i debian/patches/opt-20_epgsearch.dpatch
 #patch -i debian/patches/opt-20_liemikuutio.dpatch
 patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch
 patch -i debian/patches/opt-20_suspend.dpatch
-#patch -i debian/patches/opt-20_vdr-timer-info.dpatch
+patch -i debian/patches/opt-20_vdr-timer-info.dpatch
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch10 -p1
 
 # Fix up paths
 sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c
@@ -152,6 +151,7 @@
   PLUGINS/src/sky/{getskyepg.pl,README,HISTORY}
 
 cp -p %{SOURCE5} reccmds.conf
+cp -p %{SOURCE13} timercmds.conf
 sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf
 # Unfortunately these can't have comments in them, so ship 'em empty.
 cat /dev/null > channels.conf
@@ -343,8 +343,7 @@
 %doc CONTRIBUTORS COPYING HISTORY* MANUAL README* UPDATE-1.[24].0
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
-# Temporarily not noreplace for upgrade from 1.4.1-8 due to #202132
-%config %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config %{_sysconfdir}/sysconfig/vdr-plugins.d/
 %{_initrddir}/vdr
 %{_bindir}/epg2html
@@ -400,6 +399,11 @@
 %endif
 
 %changelog
+* Sat Nov  4 2006 Ville Skytt??  - 1.4.4-1
+- 1.4.4.
+- Apply epgsearch and timer info patches.
+- Mark console.perms snippet noreplace again.
+
 * Sun Oct 15 2006 Ville Skytt??  - 1.4.3-3
 - Apply upstream 1.4.3-1 maintenance patch.
 - Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13.


--- vdr-1.4.3-1.diff DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov  4 18:21:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 4 Nov 2006 11:21:19 -0700
Subject: rpms/vdr/devel vdr-timercmds.conf, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 vdr.spec, 1.1, 1.2 vdr-1.4.3-1.diff, 1.1, NONE
Message-ID: <200611041821.kA4ILJh0027397@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27354/devel

Modified Files:
	.cvsignore sources vdr.spec 
Added Files:
	vdr-timercmds.conf 
Removed Files:
	vdr-1.4.3-1.diff 
Log Message:
* Sat Nov  4 2006 Ville Skytt??  - 1.4.4-1
- 1.4.4.
- Apply epgsearch and timer info patches.
- Mark console.perms snippet noreplace again.



--- NEW FILE vdr-timercmds.conf ---
# Timer commands for VDR.  See the vdr(5) manual page; the syntax is the
# same as for reccmds.conf.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2006 18:50:35 -0000	1.2
+++ .cvsignore	4 Nov 2006 18:20:49 -0000	1.3
@@ -1,3 +1,3 @@
-vdr-1.4.3-liemikuutio-1.13.diff.gz
-vdr-1.4.3.tar.bz2
 vdr_1.4.3-1.ds.diff.gz
+vdr-1.4.4.tar.bz2
+vdr-1.4.4-liemikuutio-1.13.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2006 18:50:35 -0000	1.2
+++ sources	4 Nov 2006 18:20:49 -0000	1.3
@@ -1,3 +1,3 @@
-ed95f0e5844816d313edcb7f7231e06a  vdr-1.4.3-liemikuutio-1.13.diff.gz
-9bb82d1f090dad746d784d147dbb0126  vdr-1.4.3.tar.bz2
 a0f1441e534715a190e4507c2f58268f  vdr_1.4.3-1.ds.diff.gz
+3d5dbacda725f769099b774577d2e3af  vdr-1.4.4.tar.bz2
+967281c1f666b24cbc3f46cd17dffe98  vdr-1.4.4-liemikuutio-1.13.diff.gz


Index: vdr.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr.spec	16 Oct 2006 18:50:35 -0000	1.1
+++ vdr.spec	4 Nov 2006 18:20:49 -0000	1.2
@@ -14,11 +14,11 @@
 %define vdr_user  vdr
 %define vdr_group video
 # From APIVERSION in config.h
-%define apiver    1.4.3
+%define apiver    1.4.4
 
 Name:           vdr
-Version:        1.4.3
-Release:        3%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -36,12 +36,12 @@
 Source10:       %{name}-README.package
 Source11:       %{name}-skincurses.conf
 Source12:       %{name}-sky.conf
+Source13:       %{name}-timercmds.conf
 Patch0:         %{name}-channel+epg.patch
 Patch1:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.3-1.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.3-liemikuutio-1.13.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.4-liemikuutio-1.13.diff.gz
 Patch3:         %{name}-1.4.1-paths.patch
 Patch4:         %{name}-1.4.1-dumpable.patch
-Patch10:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.3-1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -119,15 +119,14 @@
 #patch -i debian/patches/12_skinclassic_icons.dpatch
 #patch -i debian/patches/15_cut_compensate_start_time.dpatch
 patch -i debian/patches/19_debian_osdbase_maxitems.dpatch
-#patch -i debian/patches/opt-20_epgsearch.dpatch
+patch -i debian/patches/opt-20_epgsearch.dpatch
 #patch -i debian/patches/opt-20_liemikuutio.dpatch
 patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch
 patch -i debian/patches/opt-20_suspend.dpatch
-#patch -i debian/patches/opt-20_vdr-timer-info.dpatch
+patch -i debian/patches/opt-20_vdr-timer-info.dpatch
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch10 -p1
 
 # Fix up paths
 sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c
@@ -152,6 +151,7 @@
   PLUGINS/src/sky/{getskyepg.pl,README,HISTORY}
 
 cp -p %{SOURCE5} reccmds.conf
+cp -p %{SOURCE13} timercmds.conf
 sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf
 # Unfortunately these can't have comments in them, so ship 'em empty.
 cat /dev/null > channels.conf
@@ -343,8 +343,7 @@
 %doc CONTRIBUTORS COPYING HISTORY* MANUAL README* UPDATE-1.[24].0
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
-# Temporarily not noreplace for upgrade from 1.4.1-8 due to #202132
-%config %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config %{_sysconfdir}/sysconfig/vdr-plugins.d/
 %{_initrddir}/vdr
 %{_bindir}/epg2html
@@ -400,6 +399,11 @@
 %endif
 
 %changelog
+* Sat Nov  4 2006 Ville Skytt??  - 1.4.4-1
+- 1.4.4.
+- Apply epgsearch and timer info patches.
+- Mark console.perms snippet noreplace again.
+
 * Sun Oct 15 2006 Ville Skytt??  - 1.4.3-3
 - Apply upstream 1.4.3-1 maintenance patch.
 - Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13.


--- vdr-1.4.3-1.diff DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov  4 18:39:05 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Sat, 4 Nov 2006 11:39:05 -0700
Subject: common branches,1.5,1.6
Message-ID: <200611041839.kA4Id5U1027680@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27664

Modified Files:
	branches 
Log Message:
add EPEL



Index: branches
===================================================================
RCS file: /cvs/extras/common/branches,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- branches	23 Oct 2006 14:12:37 -0000	1.5
+++ branches	4 Nov 2006 18:38:35 -0000	1.6
@@ -1,6 +1,8 @@
 RHL-7:rhl7:.rhl7:rhl:7
 RHL-8:rhl8:.rhl8:rhl:8
 RHL-9:rhl9:.rhl9:rhl:9
+EL-4:el4:.el4:epel:4
+EL-5:el5:.el5:epel:5
 FC-1:fc1:.fc1:fedora:1
 FC-2:fc2:.fc2:fedora:2
 FC-3:fc3:.fc3:fedora:3



From fedora-extras-commits at redhat.com  Sat Nov  4 20:08:01 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 4 Nov 2006 13:08:01 -0700
Subject: rpms/scribes/devel .cvsignore, 1.7, 1.8 scribes.spec, 1.19,
	1.20 sources, 1.7, 1.8
Message-ID: <200611042008.kA4K8193001751@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1730

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to 0.3 final release from upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Nov 2006 05:04:32 -0000	1.7
+++ .cvsignore	4 Nov 2006 20:07:31 -0000	1.8
@@ -1 +1 @@
-scribes-0.2.9.91.tar.bz2
+scribes-0.3.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/scribes.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scribes.spec	3 Nov 2006 05:04:32 -0000	1.19
+++ scribes.spec	4 Nov 2006 20:07:31 -0000	1.20
@@ -3,7 +3,7 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.91
+Version:	0.3
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Sat Nov 04 2006 Peter Gordon  - 0.3-1
+- Update to new upstream release (0.3 final)
+
 * Thu Nov 02 2006 Peter Gordon  - 0.2.9.91-1
 - Update to upstream version 0.2.9.91, which fixes the ugly bracket-matched
   highlighting that slipped into the 0.2.9.89 release (among other bugs)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Nov 2006 05:04:32 -0000	1.7
+++ sources	4 Nov 2006 20:07:31 -0000	1.8
@@ -1 +1 @@
-81b68ffa6f2662429ee199cb2e356cb9  scribes-0.2.9.91.tar.bz2
+2abe30a606fcb6aa310c7322df8e5ab7  scribes-0.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov  4 20:16:54 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 4 Nov 2006 13:16:54 -0700
Subject: rpms/scribes/FC-6 .cvsignore, 1.7, 1.8 scribes.spec, 1.17,
	1.18 sources, 1.7, 1.8
Message-ID: <200611042016.kA4KGsQ3001867@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/scribes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1847

Modified Files:
	.cvsignore scribes.spec sources 
Log Message:
Update to 0.3 final release from upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Nov 2006 05:21:39 -0000	1.7
+++ .cvsignore	4 Nov 2006 20:16:24 -0000	1.8
@@ -1 +1 @@
-scribes-0.2.9.91.tar.bz2
+scribes-0.3.tar.bz2


Index: scribes.spec
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/scribes.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scribes.spec	3 Nov 2006 05:21:39 -0000	1.17
+++ scribes.spec	4 Nov 2006 20:16:24 -0000	1.18
@@ -3,7 +3,7 @@
 %define	python_module_name	SCRIBES
 
 Name:		scribes
-Version:	0.2.9.91
+Version:	0.3
 Release:	1%{?dist}
 Summary:	A sleek, simple, and powerful text editor for the GNOME desktop
 Group:		Applications/Editors
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Sat Nov 04 2006 Peter Gordon  - 0.3-1
+- Update to new upstream release (0.3 final)
+
 * Thu Nov 02 2006 Peter Gordon  - 0.2.9.91-1
 - Update to upstream version 0.2.9.91, which fixes the ugly bracket-matched
   highlighting that slipped into the 0.2.9.89 release (among other bugs)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribes/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Nov 2006 05:21:39 -0000	1.7
+++ sources	4 Nov 2006 20:16:24 -0000	1.8
@@ -1 +1 @@
-81b68ffa6f2662429ee199cb2e356cb9  scribes-0.2.9.91.tar.bz2
+2abe30a606fcb6aa310c7322df8e5ab7  scribes-0.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov  4 20:34:37 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 4 Nov 2006 13:34:37 -0700
Subject: rpms/pan/devel .cvsignore, 1.13, 1.14 pan.spec, 1.23, 1.24 sources, 
	1.13, 1.14
Message-ID: <200611042034.kA4KYbdC002002@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1982

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
update to latest upstream version
"Lots of bugfixes this time as we try go get everything nailed down for 1.0.
There are also a couple of speed improvements..."

http://bugzilla.gnome.org/buglist.cgi?bug_id=358061,360375,361448,362436,364357,365990,363268,366542,366663,366665,367578,369008




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Oct 2006 12:18:03 -0000	1.13
+++ .cvsignore	4 Nov 2006 20:34:07 -0000	1.14
@@ -1 +1 @@
-pan-0.117.tar.bz2
+pan-0.118.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pan.spec	22 Oct 2006 15:10:11 -0000	1.23
+++ pan.spec	4 Nov 2006 20:34:07 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.117
-Release:	2%{?dist}
+Version:	0.118
+Release:	1%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -60,8 +60,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Sun Oct 22 2006 Alexander Dalloz  - 1:0.117-2
-- Bump release to correct cvs commit mistake
+* Sat Nov 04 2006 Alexander Dalloz  - 1:0.118-1
+- Update to 0.118
 
 * Sun Oct 22 2006 Alexander Dalloz  - 1:0.117-1
 - Update to 0.117


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Oct 2006 12:18:03 -0000	1.13
+++ sources	4 Nov 2006 20:34:07 -0000	1.14
@@ -1 +1 @@
-0545c24799f675db73f77cd3fa0bffa0  pan-0.117.tar.bz2
+03c8ed7192d0454684a0c17c6082b92a  pan-0.118.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov  4 20:59:15 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 4 Nov 2006 13:59:15 -0700
Subject: rpms/pan/FC-6 .cvsignore, 1.13, 1.14 pan.spec, 1.23, 1.24 sources, 
	1.13, 1.14
Message-ID: <200611042059.kA4KxFYQ002169@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2149

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
update to latest upstream version

"Lots of bugfixes this time as we try go get everything nailed down for 1.0.
There are also a couple of speed improvements..."

http://bugzilla.gnome.org/buglist.cgi?bug_id=358061,360375,361448,362436,364357,365990,363268,366542,366663,366665,367578,369008




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Oct 2006 12:18:03 -0000	1.13
+++ .cvsignore	4 Nov 2006 20:58:45 -0000	1.14
@@ -1 +1 @@
-pan-0.117.tar.bz2
+pan-0.118.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/pan.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pan.spec	22 Oct 2006 15:10:11 -0000	1.23
+++ pan.spec	4 Nov 2006 20:58:45 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.117
-Release:	2%{?dist}
+Version:	0.118
+Release:	1%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -60,8 +60,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Sun Oct 22 2006 Alexander Dalloz  - 1:0.117-2
-- Bump release to correct cvs commit mistake
+* Sat Nov 04 2006 Alexander Dalloz  - 1:0.118-1
+- Update to 0.118
 
 * Sun Oct 22 2006 Alexander Dalloz  - 1:0.117-1
 - Update to 0.117


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Oct 2006 12:18:03 -0000	1.13
+++ sources	4 Nov 2006 20:58:45 -0000	1.14
@@ -1 +1 @@
-0545c24799f675db73f77cd3fa0bffa0  pan-0.117.tar.bz2
+03c8ed7192d0454684a0c17c6082b92a  pan-0.118.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov  4 21:24:23 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 4 Nov 2006 14:24:23 -0700
Subject: rpms/keychain/devel .cvsignore, 1.4, 1.5 keychain.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200611042124.kA4LON74005310@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/keychain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5280

Modified Files:
	.cvsignore keychain.spec sources 
Log Message:
update to latest upstream version

changes:

# keychain 2.6.8 (24 Oct 2006)

Save LC_ALL for gpg invocation so that pinentry-curses works. This affected
peper and kloeri, though it seems to work for me in any case.

# keychain 2.6.7 (24 Oct 2006)

Prevent gpg_listmissing from accidentally loading keys




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2006 02:11:46 -0000	1.4
+++ .cvsignore	4 Nov 2006 21:23:53 -0000	1.5
@@ -1 +1 @@
-keychain-2.6.2.tar.bz2
+keychain-2.6.8.tar.bz2


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- keychain.spec	1 Sep 2006 02:11:46 -0000	1.6
+++ keychain.spec	4 Nov 2006 21:23:53 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-Version:	2.6.2
+Version:	2.6.8
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
@@ -49,6 +49,9 @@
 %{_mandir}/man1/keychain.1*
 
 %changelog
+* Sat Nov 04 2006 Alexander Dalloz  - 2.6.8-1
+- Update to 2.6.8.
+
 * Fri Sep 01 2006 Alexander Dalloz  - 2.6.2-1
 - Update to 2.6.2.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2006 02:11:46 -0000	1.4
+++ sources	4 Nov 2006 21:23:53 -0000	1.5
@@ -1 +1 @@
-b20933be0fdbb0b32aa5eb7b5b082852  keychain-2.6.2.tar.bz2
+2a23b311e438ecebed5639b568738d28  keychain-2.6.8.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov  4 21:27:58 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 14:27:58 -0700
Subject: owners owners.list,1.1891,1.1892
Message-ID: <200611042127.kA4LRwGZ005396@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5376/owners

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1891
retrieving revision 1.1892
diff -u -r1.1891 -r1.1892
--- owners.list	4 Nov 2006 16:04:54 -0000	1.1891
+++ owners.list	4 Nov 2006 21:27:28 -0000	1.1892
@@ -818,6 +818,7 @@
 Fedora Extras|kshutdown|KShutDown is an advanced shut down utility for KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kst|Plots scientific data|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|ksynaptics|KDE configuration for synaptics module|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|ktechlab|Development and simulation of microcontrollers and electronic circuits|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|ktorrent|KTorrent is a BitTorrent program for KDE|wolters.liste at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kxdocker|A Mac OSX style docker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -2242,6 +2243,7 @@
 Fedora Extras|tolua++|A tool to integrate C/C++ code with Lua|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|tong|A game of skill|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|toped|IC Layout Editor|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|tor|Anonymizing overlay network for TCP (The onion router)|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov  4 22:02:10 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 15:02:10 -0700
Subject: rpms/katapult import.log,1.3,1.4
Message-ID: <200611042202.kA4M2ATb008584@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8551

Modified Files:
	import.log 
Log Message:
auto-import katapult-0.3.1.4-1 on branch FC-5 from katapult-0.3.1.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/katapult/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Sep 2006 10:43:31 -0000	1.3
+++ import.log	4 Nov 2006 22:01:39 -0000	1.4
@@ -1,2 +1,3 @@
 katapult-0_3_1_3-4:HEAD:katapult-0.3.1.3-4.src.rpm:1156067817
 katapult-0_3_1_3-5:HEAD:katapult-0.3.1.3-5.src.rpm:1157194032
+katapult-0_3_1_4-1:FC-5:katapult-0.3.1.4-1.src.rpm:1162677950



From fedora-extras-commits at redhat.com  Sat Nov  4 22:02:13 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 15:02:13 -0700
Subject: rpms/katapult/FC-5 .cvsignore, 1.2, 1.3 katapult.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611042202.kA4M2DJh008588@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8551/FC-5

Modified Files:
	.cvsignore katapult.spec sources 
Log Message:
auto-import katapult-0.3.1.4-1 on branch FC-5 from katapult-0.3.1.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2006 09:54:05 -0000	1.2
+++ .cvsignore	4 Nov 2006 22:01:41 -0000	1.3
@@ -1 +1 @@
-katapult_0.3.1.3.orig.tar.gz
+katapult_0.3.1.4.orig.tar.gz


Index: katapult.spec
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-5/katapult.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- katapult.spec	20 Aug 2006 09:54:05 -0000	1.1
+++ katapult.spec	4 Nov 2006 22:01:41 -0000	1.2
@@ -1,24 +1,24 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
-Name:       katapult
-Version:    0.3.1.3
-Release:    4%{?dist}
-Summary:    Faster access to applications, bookmarks, and other items
-
-License:    GPL
-Group:      User Interface/Desktops
-URL:        http://www.thekatapult.org.uk/
+Name:           katapult
+Version:        0.3.1.4
+Release:        1%{?dist}
+Summary:        Faster access to applications, bookmarks, and other items
+
+License:        GPL
+Group:          User Interface/Desktops
+URL:            http://www.thekatapult.org.uk/
 
-Source0:    http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
+Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
 
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    kdelibs-devel, desktop-file-utils
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  kdelibs-devel, desktop-file-utils, automake
 
 %description
 Katapult is an application for KDE, designed to allow faster access to
 applications, bookmarks, and other items. It is plugin-based, so it can
-launch anything that is has a plugin for. Its display is driven by 
-plugins as well, so its appearance is completely customizable. It was 
+launch anything that is has a plugin for. Its display is driven by
+plugins as well, so its appearance is completely customizable. It was
 inspired by Quicksilver for OS X.
 
 %prep
@@ -26,41 +26,39 @@
 
 %build
 %configure --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor fedora \
     --add-category X-Fedora \
     --add-category System \
     --delete-original \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-    $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
+    --dir %{buildroot}%{_datadir}/applications/ \
+    %{buildroot}%{_datadir}/applications/kde/%{name}.desktop
+
+%{__rm} -f %{buildroot}%{_libdir}/*.la
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post
 /sbin/ldconfig
 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
 /sbin/ldconfig
 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 || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INDEX README TODO VERSION
+%doc AUTHORS ChangeLog COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/services/%{name}*
@@ -69,15 +67,21 @@
 %{_icondir}/hicolor/128x128/actions/no.png
 %{_icondir}/hicolor/128x128/apps/%{name}.png
 %{_icondir}/hicolor/128x128/apps/xcalc.png
+%{_icondir}/crystalsvg/128x128/actions/%{name}spellcheck.png
+%{_icondir}/crystalsvg/scalable/actions/%{name}spellcheck.svgz
 %{_icondir}/hicolor/??x??/apps/%{name}.png
 %{_icondir}/hicolor/scalable/apps/%{name}.svgz
 %{_libdir}/kde3/*
 %{_libdir}/lib%{name}.so*
-%{_libdir}/lib%{name}catalog.so*
-%{_libdir}/lib%{name}display.so*
-%exclude %{_libdir}/*.la
 
-%changelog
+
+%Changelog
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-1
+- New upstream release
+
+* Sat Sep 02 2006 Chitlesh Goorah  - 0.3.1.3-5
+- Rebuild for FC6-devel
+
 * Fri Jul 14 2006 Chitlesh Goorah  - 0.3.1.3-4
 - removed useless devel package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2006 09:54:05 -0000	1.2
+++ sources	4 Nov 2006 22:01:41 -0000	1.3
@@ -1 +1 @@
-09ef2951e6e861b32fc63121e281f1da  katapult_0.3.1.3.orig.tar.gz
+818dee9454dc46e955b396d3a1cd4dd1  katapult_0.3.1.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 22:02:54 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 4 Nov 2006 15:02:54 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/devel .cvsignore, 1.3,
	1.4 gnome-theme-clearlooks-bigpack.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611042202.kA4M2sNw008647@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8627

Modified Files:
	.cvsignore gnome-theme-clearlooks-bigpack.spec sources 
Log Message:
Add cairo-enabled themes; fix a bunch of aesthetic issues; fix URL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Dec 2005 06:05:16 -0000	1.3
+++ .cvsignore	4 Nov 2006 22:02:24 -0000	1.4
@@ -1 +1,2 @@
 Clearlooks-Big_Pack-0.6.x.tar.gz
+ALL-CL-Big_Pack-Cairo-0.6.tar.gz


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-theme-clearlooks-bigpack.spec	12 Oct 2006 03:21:53 -0000	1.4
+++ gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:02:24 -0000	1.5
@@ -1,12 +1,16 @@
 Name:		gnome-theme-clearlooks-bigpack
 Version:	0.6
-Release:	2%{?dist}
-Summary:        Additional Clearlooks color schemes
+Release:	3%{?dist}
+Summary:	Additional Clearlooks color schemes
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://www.gnome-look.org/content/show.php?content=25557
+URL:		http://gnomethemes.org/?p=43
+
 Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
+## Using my own hosting so that the tarball will be versioned; have sent an
+## inquiry about this to upstream.
+Source1:	http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -15,33 +19,46 @@
 %description
 Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine.
 
+
 %prep
-%setup -q -c
+%setup -b 0 -q -c
+%setup -D -b 1 -q -c
+
 
 %build
+# Nothing to build...
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes
-cp -ap Clearlooks* $RPM_BUILD_ROOT%{_datadir}/themes
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_datadir}/themes
+cp -ap Clearlooks* %{buildroot}%{_datadir}/themes
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
 %defattr(-,root,root,-)
 %{_datadir}/themes/*
 
+
 %changelog
-* Wed Oct 11 2006 Peter Gordon  0.6-2
+* Sat Nov 04 2006 Peter Gordon  - 0.6-3
+- Fix homepage URL
+- A bunch of aesthetic cleanups to the spec
+- Add Cairo-enabled themes
+
+* Wed Oct 11 2006 Peter Gordon  - 0.6-2
 - Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel)
 - Use hard tabs instead of spaces for the tags for simplicity
 
-* Fri Dec 23 2005 Ignacio Vazquez-Abrams  0.6-1
+* Fri Dec 23 2005 Ignacio Vazquez-Abrams  - 0.6-1
 - Upstream update
 
-* Thu Apr  7 2005 Ignacio Vazquez-Abrams  0.5-1.fc4
+* Thu Apr  7 2005 Ignacio Vazquez-Abrams  - 0.5-1.fc4
 - Dist split
 
-* Wed Apr  6 2005 Ignacio Vazquez-Abrams  0.5-1
+* Wed Apr  6 2005 Ignacio Vazquez-Abrams  - 0.5-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Dec 2005 06:05:17 -0000	1.3
+++ sources	4 Nov 2006 22:02:24 -0000	1.4
@@ -1 +1,2 @@
 9bf7ab320a7054c4ee1e8ee7ec97adca  Clearlooks-Big_Pack-0.6.x.tar.gz
+fbeb82065381d9cebe023e68e19a6d34  ALL-CL-Big_Pack-Cairo-0.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 22:05:17 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 15:05:17 -0700
Subject: rpms/katapult import.log,1.4,1.5
Message-ID: <200611042205.kA4M5HU6008725@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8693

Modified Files:
	import.log 
Log Message:
auto-import katapult-0.3.1.4-1 on branch FC-6 from katapult-0.3.1.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/katapult/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	4 Nov 2006 22:01:39 -0000	1.4
+++ import.log	4 Nov 2006 22:04:44 -0000	1.5
@@ -1,3 +1,4 @@
 katapult-0_3_1_3-4:HEAD:katapult-0.3.1.3-4.src.rpm:1156067817
 katapult-0_3_1_3-5:HEAD:katapult-0.3.1.3-5.src.rpm:1157194032
 katapult-0_3_1_4-1:FC-5:katapult-0.3.1.4-1.src.rpm:1162677950
+katapult-0_3_1_4-1:FC-6:katapult-0.3.1.4-1.src.rpm:1162678131



From fedora-extras-commits at redhat.com  Sat Nov  4 22:05:18 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 15:05:18 -0700
Subject: rpms/katapult/FC-6 .cvsignore, 1.2, 1.3 katapult.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611042205.kA4M5I7B008730@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8693/FC-6

Modified Files:
	.cvsignore katapult.spec sources 
Log Message:
auto-import katapult-0.3.1.4-1 on branch FC-6 from katapult-0.3.1.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2006 09:54:05 -0000	1.2
+++ .cvsignore	4 Nov 2006 22:04:48 -0000	1.3
@@ -1 +1 @@
-katapult_0.3.1.3.orig.tar.gz
+katapult_0.3.1.4.orig.tar.gz


Index: katapult.spec
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-6/katapult.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- katapult.spec	2 Sep 2006 10:43:32 -0000	1.2
+++ katapult.spec	4 Nov 2006 22:04:48 -0000	1.3
@@ -1,8 +1,8 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:           katapult
-Version:        0.3.1.3
-Release:        5%{?dist}
+Version:        0.3.1.4
+Release:        1%{?dist}
 Summary:        Faster access to applications, bookmarks, and other items
 
 License:        GPL
@@ -26,11 +26,11 @@
 
 %build
 %configure --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor fedora \
     --add-category X-Fedora \
@@ -58,7 +58,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INDEX README TODO VERSION
+%doc AUTHORS ChangeLog COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/services/%{name}*
@@ -67,15 +67,18 @@
 %{_icondir}/hicolor/128x128/actions/no.png
 %{_icondir}/hicolor/128x128/apps/%{name}.png
 %{_icondir}/hicolor/128x128/apps/xcalc.png
+%{_icondir}/crystalsvg/128x128/actions/%{name}spellcheck.png
+%{_icondir}/crystalsvg/scalable/actions/%{name}spellcheck.svgz
 %{_icondir}/hicolor/??x??/apps/%{name}.png
 %{_icondir}/hicolor/scalable/apps/%{name}.svgz
 %{_libdir}/kde3/*
 %{_libdir}/lib%{name}.so*
-%{_libdir}/lib%{name}catalog.so*
-%{_libdir}/lib%{name}display.so*
 
 
 %Changelog
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-1
+- New upstream release
+
 * Sat Sep 02 2006 Chitlesh Goorah  - 0.3.1.3-5
 - Rebuild for FC6-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2006 09:54:05 -0000	1.2
+++ sources	4 Nov 2006 22:04:48 -0000	1.3
@@ -1 +1 @@
-09ef2951e6e861b32fc63121e281f1da  katapult_0.3.1.3.orig.tar.gz
+818dee9454dc46e955b396d3a1cd4dd1  katapult_0.3.1.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 22:07:01 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 4 Nov 2006 15:07:01 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6 .cvsignore, 1.3,
	1.4 gnome-theme-clearlooks-bigpack.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611042207.kA4M71vj008857@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8801

Modified Files:
	.cvsignore gnome-theme-clearlooks-bigpack.spec sources 
Log Message:
Add cairo-enabled themes; fix a bunch of aesthetic issues; fix URL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Dec 2005 06:05:16 -0000	1.3
+++ .cvsignore	4 Nov 2006 22:06:30 -0000	1.4
@@ -1 +1,2 @@
 Clearlooks-Big_Pack-0.6.x.tar.gz
+ALL-CL-Big_Pack-Cairo-0.6.tar.gz


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-theme-clearlooks-bigpack.spec	12 Oct 2006 03:21:53 -0000	1.4
+++ gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:06:30 -0000	1.5
@@ -1,12 +1,16 @@
 Name:		gnome-theme-clearlooks-bigpack
 Version:	0.6
-Release:	2%{?dist}
-Summary:        Additional Clearlooks color schemes
+Release:	3%{?dist}
+Summary:	Additional Clearlooks color schemes
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://www.gnome-look.org/content/show.php?content=25557
+URL:		http://gnomethemes.org/?p=43
+
 Source0:	http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
+## Using my own hosting so that the tarball will be versioned; have sent an
+## inquiry about this to upstream.
+Source1:	http://mirror.thecodergeek.com/ALL-CL-Big_Pack-Cairo-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -15,24 +19,37 @@
 %description
 Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine.
 
+
 %prep
-%setup -q -c
+%setup -b 0 -q -c
+%setup -D -b 1 -q -c
+
 
 %build
+# Nothing to build...
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes
-cp -ap Clearlooks* $RPM_BUILD_ROOT%{_datadir}/themes
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_datadir}/themes
+cp -ap Clearlooks* %{buildroot}%{_datadir}/themes
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files
 %defattr(-,root,root,-)
 %{_datadir}/themes/*
 
+
 %changelog
+* Sat Nov 04 2006 Peter Gordon  - 0.6-3
+- Fix homepage URL
+- A bunch of aesthetic cleanups to the spec
+- Add Cairo-enabled themes
+
 * Wed Oct 11 2006 Peter Gordon  0.6-2
 - Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel)
 - Use hard tabs instead of spaces for the tags for simplicity


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Dec 2005 06:05:17 -0000	1.3
+++ sources	4 Nov 2006 22:06:30 -0000	1.4
@@ -1 +1,2 @@
 9bf7ab320a7054c4ee1e8ee7ec97adca  Clearlooks-Big_Pack-0.6.x.tar.gz
+fbeb82065381d9cebe023e68e19a6d34  ALL-CL-Big_Pack-Cairo-0.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 22:07:09 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 15:07:09 -0700
Subject: rpms/katapult import.log,1.5,1.6
Message-ID: <200611042207.kA4M79Fx008860@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8823

Modified Files:
	import.log 
Log Message:
auto-import katapult-0.3.1.4-1 on branch devel from katapult-0.3.1.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/katapult/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	4 Nov 2006 22:04:44 -0000	1.5
+++ import.log	4 Nov 2006 22:06:37 -0000	1.6
@@ -2,3 +2,4 @@
 katapult-0_3_1_3-5:HEAD:katapult-0.3.1.3-5.src.rpm:1157194032
 katapult-0_3_1_4-1:FC-5:katapult-0.3.1.4-1.src.rpm:1162677950
 katapult-0_3_1_4-1:FC-6:katapult-0.3.1.4-1.src.rpm:1162678131
+katapult-0_3_1_4-1:HEAD:katapult-0.3.1.4-1.src.rpm:1162678248



From fedora-extras-commits at redhat.com  Sat Nov  4 22:07:10 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 15:07:10 -0700
Subject: rpms/katapult/devel .cvsignore, 1.2, 1.3 katapult.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611042207.kA4M7AY1008863@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8823/devel

Modified Files:
	.cvsignore katapult.spec sources 
Log Message:
auto-import katapult-0.3.1.4-1 on branch devel from katapult-0.3.1.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/katapult/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2006 09:54:05 -0000	1.2
+++ .cvsignore	4 Nov 2006 22:06:40 -0000	1.3
@@ -1 +1 @@
-katapult_0.3.1.3.orig.tar.gz
+katapult_0.3.1.4.orig.tar.gz


Index: katapult.spec
===================================================================
RCS file: /cvs/extras/rpms/katapult/devel/katapult.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- katapult.spec	2 Sep 2006 10:43:32 -0000	1.2
+++ katapult.spec	4 Nov 2006 22:06:40 -0000	1.3
@@ -1,8 +1,8 @@
 %{?!_icondir:%define _icondir   %{_datadir}/icons}
 
 Name:           katapult
-Version:        0.3.1.3
-Release:        5%{?dist}
+Version:        0.3.1.4
+Release:        1%{?dist}
 Summary:        Faster access to applications, bookmarks, and other items
 
 License:        GPL
@@ -26,11 +26,11 @@
 
 %build
 %configure --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor fedora \
     --add-category X-Fedora \
@@ -58,7 +58,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INDEX README TODO VERSION
+%doc AUTHORS ChangeLog COPYING
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/services/%{name}*
@@ -67,15 +67,18 @@
 %{_icondir}/hicolor/128x128/actions/no.png
 %{_icondir}/hicolor/128x128/apps/%{name}.png
 %{_icondir}/hicolor/128x128/apps/xcalc.png
+%{_icondir}/crystalsvg/128x128/actions/%{name}spellcheck.png
+%{_icondir}/crystalsvg/scalable/actions/%{name}spellcheck.svgz
 %{_icondir}/hicolor/??x??/apps/%{name}.png
 %{_icondir}/hicolor/scalable/apps/%{name}.svgz
 %{_libdir}/kde3/*
 %{_libdir}/lib%{name}.so*
-%{_libdir}/lib%{name}catalog.so*
-%{_libdir}/lib%{name}display.so*
 
 
 %Changelog
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-1
+- New upstream release
+
 * Sat Sep 02 2006 Chitlesh Goorah  - 0.3.1.3-5
 - Rebuild for FC6-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/katapult/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2006 09:54:05 -0000	1.2
+++ sources	4 Nov 2006 22:06:40 -0000	1.3
@@ -1 +1 @@
-09ef2951e6e861b32fc63121e281f1da  katapult_0.3.1.3.orig.tar.gz
+818dee9454dc46e955b396d3a1cd4dd1  katapult_0.3.1.4.orig.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov  4 22:15:24 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 4 Nov 2006 15:15:24 -0700
Subject: rpms/keychain/FC-6 .cvsignore, 1.4, 1.5 keychain.csh, 1.3,
	1.4 keychain.sh, 1.3, 1.4 keychain.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611042215.kA4MFOw0009234@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/keychain/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9118

Modified Files:
	.cvsignore keychain.csh keychain.sh keychain.spec sources 
Log Message:
update to current upstream version
fix https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=212190




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2006 02:11:46 -0000	1.4
+++ .cvsignore	4 Nov 2006 22:14:54 -0000	1.5
@@ -1 +1 @@
-keychain-2.6.2.tar.bz2
+keychain-2.6.8.tar.bz2


Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-6/keychain.csh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.csh	1 Dec 2005 13:28:40 -0000	1.3
+++ keychain.csh	4 Nov 2006 22:14:54 -0000	1.4
@@ -2,7 +2,7 @@
 # read in user's keychain settings or use defaults running keychain
 
 set USERHOME = `getent passwd $USER | cut -d: -f6`
-if ($HOME == $USERHOME && -f $HOME/.keychainrc) then
+if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then
 
     eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \
 	sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'`


Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-6/keychain.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.sh	1 Dec 2005 13:28:40 -0000	1.3
+++ keychain.sh	4 Nov 2006 22:14:54 -0000	1.4
@@ -2,7 +2,7 @@
 # read in user's keychain settings or use defaults running keychain
 
 USERHOME=`getent passwd $USER | cut -d: -f6`
-if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then
+if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then
 
     . $HOME/.keychainrc
 


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-6/keychain.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- keychain.spec	1 Sep 2006 02:11:46 -0000	1.6
+++ keychain.spec	4 Nov 2006 22:14:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-Version:	2.6.2
+Version:	2.6.8
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
@@ -49,6 +49,9 @@
 %{_mandir}/man1/keychain.1*
 
 %changelog
+* Sat Nov 04 2006 Alexander Dalloz  - 2.6.8-1
+- Update to 2.6.8.
+
 * Fri Sep 01 2006 Alexander Dalloz  - 2.6.2-1
 - Update to 2.6.2.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2006 02:11:46 -0000	1.4
+++ sources	4 Nov 2006 22:14:54 -0000	1.5
@@ -1 +1 @@
-b20933be0fdbb0b32aa5eb7b5b082852  keychain-2.6.2.tar.bz2
+2a23b311e438ecebed5639b568738d28  keychain-2.6.8.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov  4 22:17:34 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 4 Nov 2006 15:17:34 -0700
Subject: rpms/keychain/FC-6 keychain.spec,1.7,1.8
Message-ID: <200611042217.kA4MHY15009380@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/keychain/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9355

Modified Files:
	keychain.spec 
Log Message:
add missing fix for #212190 in %changelog




Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-6/keychain.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- keychain.spec	4 Nov 2006 22:14:54 -0000	1.7
+++ keychain.spec	4 Nov 2006 22:17:04 -0000	1.8
@@ -50,7 +50,8 @@
 
 %changelog
 * Sat Nov 04 2006 Alexander Dalloz  - 2.6.8-1
-- Update to 2.6.8.
+- Update to 2.6.8
+- Fix #212190.
 
 * Fri Sep 01 2006 Alexander Dalloz  - 2.6.2-1
 - Update to 2.6.2.



From fedora-extras-commits at redhat.com  Sat Nov  4 22:22:27 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 4 Nov 2006 15:22:27 -0700
Subject: rpms/keychain/FC-5 .cvsignore, 1.4, 1.5 keychain.csh, 1.3,
	1.4 keychain.sh, 1.3, 1.4 keychain.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200611042222.kA4MMRlg009464@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/keychain/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9440

Modified Files:
	.cvsignore keychain.csh keychain.sh keychain.spec sources 
Log Message:
update to latest upstream version
fix #212190




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2006 17:23:52 -0000	1.4
+++ .cvsignore	4 Nov 2006 22:21:57 -0000	1.5
@@ -1 +1 @@
-keychain-2.6.2.tar.bz2
+keychain-2.6.8.tar.bz2


Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-5/keychain.csh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.csh	1 Dec 2005 13:28:40 -0000	1.3
+++ keychain.csh	4 Nov 2006 22:21:57 -0000	1.4
@@ -2,7 +2,7 @@
 # read in user's keychain settings or use defaults running keychain
 
 set USERHOME = `getent passwd $USER | cut -d: -f6`
-if ($HOME == $USERHOME && -f $HOME/.keychainrc) then
+if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then
 
     eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \
 	sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'`


Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-5/keychain.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.sh	1 Dec 2005 13:28:40 -0000	1.3
+++ keychain.sh	4 Nov 2006 22:21:57 -0000	1.4
@@ -2,7 +2,7 @@
 # read in user's keychain settings or use defaults running keychain
 
 USERHOME=`getent passwd $USER | cut -d: -f6`
-if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then
+if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then
 
     . $HOME/.keychainrc
 


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-5/keychain.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- keychain.spec	8 Sep 2006 17:23:52 -0000	1.5
+++ keychain.spec	4 Nov 2006 22:21:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-Version:	2.6.2
+Version:	2.6.8
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
@@ -49,9 +49,16 @@
 %{_mandir}/man1/keychain.1*
 
 %changelog
-* Fri Sep 08 2006 Alexander Dalloz  - 2.6.2-1
+* Sat Nov 04 2006 Alexander Dalloz  - 2.6.8-1
+- Update to 2.6.8
+- Fix #212190.
+
+* Fri Sep 01 2006 Alexander Dalloz  - 2.6.2-1
 - Update to 2.6.2.
 
+* Tue Aug 29 2006 Alexander Dalloz  - 2.6.1-2
+- Rebuild for FC6.
+
 * Sat Nov 26 2005 Ville Skytt??  - 2.6.1-1
 - Update to 2.6.1.
 - Invoke keychain with --noask in opt-in scripts in non-interactive shells


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2006 17:23:52 -0000	1.4
+++ sources	4 Nov 2006 22:21:57 -0000	1.5
@@ -1 +1 @@
-b20933be0fdbb0b32aa5eb7b5b082852  keychain-2.6.2.tar.bz2
+2a23b311e438ecebed5639b568738d28  keychain-2.6.8.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov  4 22:27:22 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 4 Nov 2006 15:27:22 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/FC-5
	gnome-theme-clearlooks-bigpack.spec, 1.3, 1.4
Message-ID: <200611042227.kA4MRMHJ009541@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9525/FC-5

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Fix URL entry


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-5/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-theme-clearlooks-bigpack.spec	23 Dec 2005 06:05:17 -0000	1.3
+++ gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:26:52 -0000	1.4
@@ -5,7 +5,7 @@
 
 Group:          User Interface/Desktops
 License:        GPL
-URL:            http://www.gnome-look.org/content/show.php?content=25557
+URL:            http://gnomethemes.org/?p=43
 Source0:        http://kwh.kernow-gb.com/~bvc/theme/gtk/clearlooks/Clearlooks-Big_Pack-0.6.x.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch



From fedora-extras-commits at redhat.com  Sat Nov  4 22:35:03 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 4 Nov 2006 15:35:03 -0700
Subject: rpms/keychain/devel keychain.csh, 1.3, 1.4 keychain.sh, 1.3,
	1.4 keychain.spec, 1.7, 1.8
Message-ID: <200611042235.kA4MZ32o009643@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/keychain/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9623

Modified Files:
	keychain.csh keychain.sh keychain.spec 
Log Message:
add fix for bug #212190




Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.csh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.csh	1 Dec 2005 13:28:40 -0000	1.3
+++ keychain.csh	4 Nov 2006 22:34:33 -0000	1.4
@@ -2,7 +2,7 @@
 # read in user's keychain settings or use defaults running keychain
 
 set USERHOME = `getent passwd $USER | cut -d: -f6`
-if ($HOME == $USERHOME && -f $HOME/.keychainrc) then
+if ( "$HOME" == "$USERHOME" && -f "$HOME/.keychainrc" ) then
 
     eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \
 	sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'`


Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.sh	1 Dec 2005 13:28:40 -0000	1.3
+++ keychain.sh	4 Nov 2006 22:34:33 -0000	1.4
@@ -2,7 +2,7 @@
 # read in user's keychain settings or use defaults running keychain
 
 USERHOME=`getent passwd $USER | cut -d: -f6`
-if [ $HOME = $USERHOME -a -f $HOME/.keychainrc ]; then
+if [ "$HOME" = "$USERHOME" -a -f "$HOME/.keychainrc" ]; then
 
     . $HOME/.keychainrc
 


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/devel/keychain.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- keychain.spec	4 Nov 2006 21:23:53 -0000	1.7
+++ keychain.spec	4 Nov 2006 22:34:33 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
 Version:	2.6.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/
@@ -49,6 +49,9 @@
 %{_mandir}/man1/keychain.1*
 
 %changelog
+* Sat Nov 04 2006 Alexander Dalloz  - 2.6.8-2
+- Fix #212190.
+
 * Sat Nov 04 2006 Alexander Dalloz  - 2.6.8-1
 - Update to 2.6.8.
 



From fedora-extras-commits at redhat.com  Sat Nov  4 22:37:56 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 4 Nov 2006 15:37:56 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6
	gnome-theme-clearlooks-bigpack.spec, 1.5, 1.6
Message-ID: <200611042237.kA4MbuPg009738@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9706/FC-6

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Since we're doing the cairo-enabled theme goodness, ensure that we explicitly depend on gtk2-engines >= 2.8


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:06:30 -0000	1.5
+++ gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:37:25 -0000	1.6
@@ -14,7 +14,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-Requires:	gtk2-engines
+Requires:	gtk2-engines >= 2.8
 
 %description
 Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine.
@@ -45,6 +45,10 @@
 
 
 %changelog
+* Sat Nov 04 2006 Peter Gordon 
+- Explicitly depend on gtk2-engines >= 2.8, since we're doing Cairo-enabled
+  goodness
+
 * Sat Nov 04 2006 Peter Gordon  - 0.6-3
 - Fix homepage URL
 - A bunch of aesthetic cleanups to the spec



From fedora-extras-commits at redhat.com  Sat Nov  4 22:37:56 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat, 4 Nov 2006 15:37:56 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/devel
	gnome-theme-clearlooks-bigpack.spec, 1.5, 1.6
Message-ID: <200611042237.kA4Mbu56009741@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9706/devel

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Since we're doing the cairo-enabled theme goodness, ensure that we explicitly depend on gtk2-engines >= 2.8


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:02:24 -0000	1.5
+++ gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:37:26 -0000	1.6
@@ -14,7 +14,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-Requires:	gtk2-engines
+Requires:	gtk2-engines >= 2.8
 
 %description
 Lots and lots of color schemes for the Clearlooks GTK+ 2.x engine.
@@ -45,6 +45,10 @@
 
 
 %changelog
+* Sat Nov 04 2006 Peter Gordon 
+- Explicitly depend on gtk2-engines >= 2.8, since we're doing Cairo-enabled
+  goodness
+
 * Sat Nov 04 2006 Peter Gordon  - 0.6-3
 - Fix homepage URL
 - A bunch of aesthetic cleanups to the spec



From fedora-extras-commits at redhat.com  Sat Nov  4 23:00:57 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 16:00:57 -0700
Subject: rpms/katapult import.log,1.6,1.7
Message-ID: <200611042300.kA4N0voq010281@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10246

Modified Files:
	import.log 
Log Message:
auto-import katapult-0.3.1.4-2 on branch FC-5 from katapult-0.3.1.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/katapult/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	4 Nov 2006 22:06:37 -0000	1.6
+++ import.log	4 Nov 2006 23:00:27 -0000	1.7
@@ -3,3 +3,4 @@
 katapult-0_3_1_4-1:FC-5:katapult-0.3.1.4-1.src.rpm:1162677950
 katapult-0_3_1_4-1:FC-6:katapult-0.3.1.4-1.src.rpm:1162678131
 katapult-0_3_1_4-1:HEAD:katapult-0.3.1.4-1.src.rpm:1162678248
+katapult-0_3_1_4-2:FC-5:katapult-0.3.1.4-2.src.rpm:1162681478



From fedora-extras-commits at redhat.com  Sat Nov  4 23:00:58 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sat, 4 Nov 2006 16:00:58 -0700
Subject: rpms/katapult/FC-5 katapult.spec,1.2,1.3
Message-ID: <200611042300.kA4N0wMK010284@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10246/FC-5

Modified Files:
	katapult.spec 
Log Message:
auto-import katapult-0.3.1.4-2 on branch FC-5 from katapult-0.3.1.4-2.src.rpm


Index: katapult.spec
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-5/katapult.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- katapult.spec	4 Nov 2006 22:01:41 -0000	1.2
+++ katapult.spec	4 Nov 2006 23:00:27 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           katapult
 Version:        0.3.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Faster access to applications, bookmarks, and other items
 
 License:        GPL
@@ -12,7 +12,7 @@
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs-devel, desktop-file-utils, automake
+BuildRequires:  kdelibs-devel, desktop-file-utils, automake, intltool
 
 %description
 Katapult is an application for KDE, designed to allow faster access to
@@ -76,6 +76,9 @@
 
 
 %Changelog
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-2
+- Added intltool as BR
+
 * Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Nov  5 00:00:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 4 Nov 2006 17:00:55 -0700
Subject: rpms/zeroinstall-injector/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zeroinstall-injector.spec, 1.2, 1.3
Message-ID: <200611050000.kA500txN013690@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/FC-3

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.24



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2006 05:31:39 -0000	1.2
+++ .cvsignore	5 Nov 2006 00:00:24 -0000	1.3
@@ -1 +1 @@
-zeroinstall-injector-0.23.tar.gz.gpg
+zeroinstall-injector-0.24.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2006 05:31:39 -0000	1.2
+++ sources	5 Nov 2006 00:00:24 -0000	1.3
@@ -1 +1 @@
-52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg
+d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/zeroinstall-injector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zeroinstall-injector.spec	8 Oct 2006 05:31:39 -0000	1.2
+++ zeroinstall-injector.spec	5 Nov 2006 00:00:24 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:    zeroinstall-injector
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -48,19 +48,19 @@
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
 %dir %{python_sitelib}/zeroinstall/zerostore/
-%ghost %{python_sitelib}/zeroinstall/*.pyo
-%{python_sitelib}/zeroinstall/*.py
-%{python_sitelib}/zeroinstall/*.pyc
-%ghost %{python_sitelib}/zeroinstall/*/*.pyo
+%{python_sitelib}/zeroinstall/*.py*
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
-%{python_sitelib}/zeroinstall/*/*.py
-%{python_sitelib}/zeroinstall/*/*.pyc
+%{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sat Nov  4 2006 Michel Salim  0.24-1
+- Update to 0.24
+- Not ghosting .pyos any longer
+
 * Sun Oct  8 2006 Michel Salim  0.23-1
 - Update to 0.23
 



From fedora-extras-commits at redhat.com  Sun Nov  5 00:00:56 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 4 Nov 2006 17:00:56 -0700
Subject: rpms/zeroinstall-injector/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zeroinstall-injector.spec, 1.2, 1.3
Message-ID: <200611050000.kA500u3M013695@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/FC-4

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.24



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2006 05:31:40 -0000	1.2
+++ .cvsignore	5 Nov 2006 00:00:25 -0000	1.3
@@ -1 +1 @@
-zeroinstall-injector-0.23.tar.gz.gpg
+zeroinstall-injector-0.24.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2006 05:31:40 -0000	1.2
+++ sources	5 Nov 2006 00:00:25 -0000	1.3
@@ -1 +1 @@
-52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg
+d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/zeroinstall-injector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zeroinstall-injector.spec	8 Oct 2006 05:31:40 -0000	1.2
+++ zeroinstall-injector.spec	5 Nov 2006 00:00:25 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:    zeroinstall-injector
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -13,7 +13,6 @@
 
 BuildArch: noarch
 BuildRequires: python gnupg
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: PyXML pygtk2 gnupg
 
 %description
@@ -35,7 +34,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,19 +47,19 @@
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
 %dir %{python_sitelib}/zeroinstall/zerostore/
-%ghost %{python_sitelib}/zeroinstall/*.pyo
-%{python_sitelib}/zeroinstall/*.py
-%{python_sitelib}/zeroinstall/*.pyc
-%ghost %{python_sitelib}/zeroinstall/*/*.pyo
+%{python_sitelib}/zeroinstall/*.py*
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
-%{python_sitelib}/zeroinstall/*/*.py
-%{python_sitelib}/zeroinstall/*/*.pyc
+%{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sat Nov  4 2006 Michel Salim  0.24-1
+- Update to 0.24
+- Not ghosting .pyos any longer
+
 * Sun Oct  8 2006 Michel Salim  0.23-1
 - Update to 0.23
 



From fedora-extras-commits at redhat.com  Sun Nov  5 00:01:02 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 4 Nov 2006 17:01:02 -0700
Subject: rpms/zeroinstall-injector/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zeroinstall-injector.spec, 1.2, 1.3
Message-ID: <200611050001.kA5012PG014472@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/FC-6

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.24



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2006 05:31:42 -0000	1.2
+++ .cvsignore	5 Nov 2006 00:00:32 -0000	1.3
@@ -1 +1 @@
-zeroinstall-injector-0.23.tar.gz.gpg
+zeroinstall-injector-0.24.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2006 05:31:42 -0000	1.2
+++ sources	5 Nov 2006 00:00:32 -0000	1.3
@@ -1 +1 @@
-52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg
+d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-6/zeroinstall-injector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zeroinstall-injector.spec	8 Oct 2006 05:31:42 -0000	1.2
+++ zeroinstall-injector.spec	5 Nov 2006 00:00:32 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:    zeroinstall-injector
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -13,7 +13,6 @@
 
 BuildArch: noarch
 BuildRequires: python gnupg
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: PyXML pygtk2 gnupg
 
 %description
@@ -35,7 +34,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,19 +47,19 @@
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
 %dir %{python_sitelib}/zeroinstall/zerostore/
-%ghost %{python_sitelib}/zeroinstall/*.pyo
-%{python_sitelib}/zeroinstall/*.py
-%{python_sitelib}/zeroinstall/*.pyc
-%ghost %{python_sitelib}/zeroinstall/*/*.pyo
+%{python_sitelib}/zeroinstall/*.py*
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
-%{python_sitelib}/zeroinstall/*/*.py
-%{python_sitelib}/zeroinstall/*/*.pyc
+%{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sat Nov  4 2006 Michel Salim  0.24-1
+- Update to 0.24
+- Not ghosting .pyos any longer
+
 * Sun Oct  8 2006 Michel Salim  0.23-1
 - Update to 0.23
 



From fedora-extras-commits at redhat.com  Sun Nov  5 00:01:01 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 4 Nov 2006 17:01:01 -0700
Subject: rpms/zeroinstall-injector/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 zeroinstall-injector.spec, 1.2, 1.3
Message-ID: <200611050001.kA501172013702@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/FC-5

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.24



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2006 05:31:41 -0000	1.2
+++ .cvsignore	5 Nov 2006 00:00:31 -0000	1.3
@@ -1 +1 @@
-zeroinstall-injector-0.23.tar.gz.gpg
+zeroinstall-injector-0.24.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2006 05:31:41 -0000	1.2
+++ sources	5 Nov 2006 00:00:31 -0000	1.3
@@ -1 +1 @@
-52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg
+d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/zeroinstall-injector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zeroinstall-injector.spec	8 Oct 2006 05:31:41 -0000	1.2
+++ zeroinstall-injector.spec	5 Nov 2006 00:00:31 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:    zeroinstall-injector
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -13,7 +13,6 @@
 
 BuildArch: noarch
 BuildRequires: python gnupg
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: PyXML pygtk2 gnupg
 
 %description
@@ -35,7 +34,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,19 +47,19 @@
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
 %dir %{python_sitelib}/zeroinstall/zerostore/
-%ghost %{python_sitelib}/zeroinstall/*.pyo
-%{python_sitelib}/zeroinstall/*.py
-%{python_sitelib}/zeroinstall/*.pyc
-%ghost %{python_sitelib}/zeroinstall/*/*.pyo
+%{python_sitelib}/zeroinstall/*.py*
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
-%{python_sitelib}/zeroinstall/*/*.py
-%{python_sitelib}/zeroinstall/*/*.pyc
+%{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sat Nov  4 2006 Michel Salim  0.24-1
+- Update to 0.24
+- Not ghosting .pyos any longer
+
 * Sun Oct  8 2006 Michel Salim  0.23-1
 - Update to 0.23
 



From fedora-extras-commits at redhat.com  Sun Nov  5 00:01:03 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 4 Nov 2006 17:01:03 -0700
Subject: rpms/zeroinstall-injector/devel .cvsignore, 1.2, 1.3 sources, 1.2, 
	1.3 zeroinstall-injector.spec, 1.2, 1.3
Message-ID: <200611050001.kA5013xx015380@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598/devel

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Log Message:
Update to 0.24



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Oct 2006 05:31:42 -0000	1.2
+++ .cvsignore	5 Nov 2006 00:00:33 -0000	1.3
@@ -1 +1 @@
-zeroinstall-injector-0.23.tar.gz.gpg
+zeroinstall-injector-0.24.tar.gz.gpg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2006 05:31:42 -0000	1.2
+++ sources	5 Nov 2006 00:00:33 -0000	1.3
@@ -1 +1 @@
-52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg
+d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zeroinstall-injector.spec	8 Oct 2006 05:31:42 -0000	1.2
+++ zeroinstall-injector.spec	5 Nov 2006 00:00:33 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:    zeroinstall-injector
-Version: 0.23
+Version: 0.24
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -13,7 +13,6 @@
 
 BuildArch: noarch
 BuildRequires: python gnupg
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: PyXML pygtk2 gnupg
 
 %description
@@ -35,7 +34,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,19 +47,19 @@
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
 %dir %{python_sitelib}/zeroinstall/zerostore/
-%ghost %{python_sitelib}/zeroinstall/*.pyo
-%{python_sitelib}/zeroinstall/*.py
-%{python_sitelib}/zeroinstall/*.pyc
-%ghost %{python_sitelib}/zeroinstall/*/*.pyo
+%{python_sitelib}/zeroinstall/*.py*
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
-%{python_sitelib}/zeroinstall/*/*.py
-%{python_sitelib}/zeroinstall/*/*.pyc
+%{python_sitelib}/zeroinstall/*/*.py*
 %{_mandir}/man1/0*
 
 
 %changelog
+* Sat Nov  4 2006 Michel Salim  0.24-1
+- Update to 0.24
+- Not ghosting .pyos any longer
+
 * Sun Oct  8 2006 Michel Salim  0.23-1
 - Update to 0.23
 



From fedora-extras-commits at redhat.com  Sun Nov  5 03:32:29 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Sat, 4 Nov 2006 20:32:29 -0700
Subject: rpms/python-4Suite-XML/devel .cvsignore, 1.2,
	1.3 python-4Suite-XML.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200611050332.kA53WTPS026753@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26720

Modified Files:
	.cvsignore python-4Suite-XML.spec sources 
Log Message:
* Sun Nov  5 2006 Miloslav Trmac  - 1.0-1
- Update to 4Suite-XML-1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 11:16:49 -0000	1.2
+++ .cvsignore	5 Nov 2006 03:31:58 -0000	1.3
@@ -1 +1 @@
-4Suite-XML-1.0b3.tar.bz2
+4Suite-XML-1.0.tar.bz2


Index: python-4Suite-XML.spec
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/python-4Suite-XML.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-4Suite-XML.spec	10 Sep 2006 20:33:02 -0000	1.3
+++ python-4Suite-XML.spec	5 Nov 2006 03:31:58 -0000	1.4
@@ -1,9 +1,9 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define ver 1.0b3
+%define ver 1.0
 
 Name: python-4Suite-XML
 Version: 1.0
-Release: 0.5.b3
+Release: 1
 Summary: A collection of XML-related technologies for Python
 
 Group: Development/Libraries
@@ -13,7 +13,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 4Suite-XML is a suite of Python modules for XML and RDF processing.
@@ -25,7 +24,7 @@
  * Ft.Lib: Various support libraries that can be used independently.
 
 %prep
-%setup -q -n 4Suite-%{ver}
+%setup -q -n 4Suite-XML-%{ver}
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -40,13 +39,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-python setup.py bdist_install -O1 --root=$RPM_BUILD_ROOT
+python setup.py install --root=$RPM_BUILD_ROOT
 
 chmod a-x $RPM_BUILD_ROOT%{_datadir}/4Suite/Data/Stylesheets/*.xslt
 
 # Move documentation to the right place
 mv $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/html html
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/xml
+rm $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/{COPYRIGHT,README}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,9 +56,13 @@
 %{_bindir}/4*
 %exclude %{_libdir}/4Suite
 %{python_sitearch}/Ft
+%{python_sitearch}/4Suite_XML-1.0-py2.4.egg-info
 %{_datadir}/4Suite
 
 %changelog
+* Sun Nov  5 2006 Miloslav Trmac  - 1.0-1
+- Update to 4Suite-XML-1.0
+
 * Sun Sep 10 2006 Miloslav Trmac  - 1.0-0.5.b3
 - Rebuild for Fedora Extras 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 11:16:49 -0000	1.2
+++ sources	5 Nov 2006 03:31:58 -0000	1.3
@@ -1 +1 @@
-9decb8b1032415ae155fe9a917fe8126  4Suite-XML-1.0b3.tar.bz2
+6f87c2b25c507d65783a7ad9bf7de179  4Suite-XML-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov  5 09:23:22 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 5 Nov 2006 02:23:22 -0700
Subject: rpms/sparse - New directory
Message-ID: <200611050923.kA59NMm3031184@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31179/sparse

Log Message:
Directory /cvs/extras/rpms/sparse added to the repository




From fedora-extras-commits at redhat.com  Sun Nov  5 09:23:28 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 5 Nov 2006 02:23:28 -0700
Subject: rpms/sparse/devel - New directory
Message-ID: <200611050923.kA59NSd1031208@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31179/sparse/devel

Log Message:
Directory /cvs/extras/rpms/sparse/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov  5 09:23:42 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 5 Nov 2006 02:23:42 -0700
Subject: rpms/sparse Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611050923.kA59NgMU031264@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31258

Added Files:
	Makefile import.log 
Log Message:
Setup of module sparse


--- NEW FILE Makefile ---
# Top level Makefile for module sparse
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 Nov  5 09:23:48 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 5 Nov 2006 02:23:48 -0700
Subject: rpms/sparse/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611050923.kA59NmUg031291@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31258/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sparse


--- 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 Nov  5 09:24:39 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 5 Nov 2006 02:24:39 -0700
Subject: rpms/sparse import.log,1.1,1.2
Message-ID: <200611050924.kA59OdcI031455@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31370

Modified Files:
	import.log 
Log Message:
auto-import sparse-0-0.1.20061026git on branch devel from sparse-0-0.1.20061026git.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sparse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Nov 2006 09:23:42 -0000	1.1
+++ import.log	5 Nov 2006 09:24:09 -0000	1.2
@@ -0,0 +1 @@
+sparse-0-0_1_20061026git:HEAD:sparse-0-0.1.20061026git.src.rpm:1162718644



From fedora-extras-commits at redhat.com  Sun Nov  5 09:24:39 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 5 Nov 2006 02:24:39 -0700
Subject: rpms/sparse/devel sparse.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611050924.kA59Odio031461@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31370/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sparse.spec 
Log Message:
auto-import sparse-0-0.1.20061026git on branch devel from sparse-0-0.1.20061026git.src.rpm


--- NEW FILE sparse.spec ---
%define snapshot_date 20061026
%define prerelease 1
%define alphatag %{snapshot_date}git
Name: sparse          
Version: 0        
Release: 0.%{prerelease}.%{alphatag}%{?dist}
Summary: A semantic parser of source files

Group:      Development/Tools
License:    Open Software License
URL:        http://www.kernel.org/pub/scm/devel/sparse/sparse.git/    
# git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git/
# snapshots also available at http://www.codemonkey.org.uk/projects/git-snapshots/sparse/
Source0:    sparse-%{snapshot_date}.tar.bz2
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Sparse is a semantic parser of source files: it's neither a compiler
(although it could be used as a front-end for one) nor is it a
preprocessor (although it contains as a part of it a preprocessing
phase).

It is meant to be a small - and simple - library.  Scanty and meager,
and partly because of that easy to use.  It has one mission in life:
create a semantic parse tree for some arbitrary user for further
analysis.  It's not a tokenizer, nor is it some generic context-free
parser.  In fact, context (semantics) is what it's all about - figuring
out not just what the grouping of tokens are, but what the _types_ are
that the grouping implies.

Sparse is primarily used in the development and debugging of the Linux kernel.

%prep
%setup -q -n sparse


%build
make %{?_smp_mflags} PREFIX="%{_prefix}" CFLAGS="%{optflags} -Wwrite-strings -fpic"


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_libdir}
make install PREFIX=%{buildroot}%{_prefix}
# no reason to ship libsparse.so until something exists that links against it
rm %{buildroot}%{_bindir}/libsparse.so

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE README FAQ
%{_bindir}/sparse

%changelog
* Thu Oct 26 2006 Matt Domsch  0-0.1.20061026git
- Initial packaging for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sparse/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Nov 2006 09:23:47 -0000	1.1
+++ .cvsignore	5 Nov 2006 09:24:09 -0000	1.2
@@ -0,0 +1 @@
+sparse-20061026.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sparse/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Nov 2006 09:23:47 -0000	1.1
+++ sources	5 Nov 2006 09:24:09 -0000	1.2
@@ -0,0 +1 @@
+724e23dc62375879f75708f35f245e58  sparse-20061026.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov  5 09:28:33 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Sun, 5 Nov 2006 02:28:33 -0700
Subject: owners owners.list,1.1892,1.1893
Message-ID: <200611050928.kA59SXU6031933@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31842

Modified Files:
	owners.list 
Log Message:
add sparse


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1892
retrieving revision 1.1893
diff -u -r1.1892 -r1.1893
--- owners.list	4 Nov 2006 21:27:28 -0000	1.1892
+++ owners.list	5 Nov 2006 09:28:02 -0000	1.1893
@@ -2123,6 +2123,7 @@
 Fedora Extras|source-highlight|Produces a document with syntax highlighting|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org|
+Fedora Extras|sparse|A semantic parser of source files|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov  5 13:05:31 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 5 Nov 2006 06:05:31 -0700
Subject: rpms/katapult/FC-5 katapult.spec,1.3,1.4
Message-ID: <200611051305.kA5D5V6F005839@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5775/FC-5

Modified Files:
	katapult.spec 
Log Message:
auto-import katapult-0.3.1.4-3 on branch FC-5 from katapult-0.3.1.4-3.src.rpm


Index: katapult.spec
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-5/katapult.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- katapult.spec	4 Nov 2006 23:00:27 -0000	1.3
+++ katapult.spec	5 Nov 2006 13:05:00 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           katapult
 Version:        0.3.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Faster access to applications, bookmarks, and other items
 
 License:        GPL
@@ -12,7 +12,7 @@
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs-devel, desktop-file-utils, automake, intltool
+BuildRequires:  kdelibs-devel, desktop-file-utils, automake, gettext
 
 %description
 Katapult is an application for KDE, designed to allow faster access to
@@ -76,6 +76,9 @@
 
 
 %Changelog
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-3
+- Added gettext as BR instead of intltool
+
 * Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-2
 - Added intltool as BR
 



From fedora-extras-commits at redhat.com  Sun Nov  5 13:05:29 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 5 Nov 2006 06:05:29 -0700
Subject: rpms/katapult import.log,1.7,1.8
Message-ID: <200611051305.kA5D5T0k005834@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5775

Modified Files:
	import.log 
Log Message:
auto-import katapult-0.3.1.4-3 on branch FC-5 from katapult-0.3.1.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/katapult/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	4 Nov 2006 23:00:27 -0000	1.7
+++ import.log	5 Nov 2006 13:04:53 -0000	1.8
@@ -4,3 +4,4 @@
 katapult-0_3_1_4-1:FC-6:katapult-0.3.1.4-1.src.rpm:1162678131
 katapult-0_3_1_4-1:HEAD:katapult-0.3.1.4-1.src.rpm:1162678248
 katapult-0_3_1_4-2:FC-5:katapult-0.3.1.4-2.src.rpm:1162681478
+katapult-0_3_1_4-3:FC-5:katapult-0.3.1.4-3.src.rpm:1162732144



From fedora-extras-commits at redhat.com  Sun Nov  5 13:16:48 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 5 Nov 2006 06:16:48 -0700
Subject: rpms/katapult import.log,1.8,1.9
Message-ID: <200611051316.kA5DGm1q007011@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6924

Modified Files:
	import.log 
Log Message:
auto-import katapult-0.3.1.4-3 on branch FC-6 from katapult-0.3.1.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/katapult/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	5 Nov 2006 13:04:53 -0000	1.8
+++ import.log	5 Nov 2006 13:16:18 -0000	1.9
@@ -5,3 +5,4 @@
 katapult-0_3_1_4-1:HEAD:katapult-0.3.1.4-1.src.rpm:1162678248
 katapult-0_3_1_4-2:FC-5:katapult-0.3.1.4-2.src.rpm:1162681478
 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



From fedora-extras-commits at redhat.com  Sun Nov  5 13:16:49 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 5 Nov 2006 06:16:49 -0700
Subject: rpms/katapult/FC-6 katapult.spec,1.3,1.4
Message-ID: <200611051316.kA5DGnU3007016@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6924/FC-6

Modified Files:
	katapult.spec 
Log Message:
auto-import katapult-0.3.1.4-3 on branch FC-6 from katapult-0.3.1.4-3.src.rpm


Index: katapult.spec
===================================================================
RCS file: /cvs/extras/rpms/katapult/FC-6/katapult.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- katapult.spec	4 Nov 2006 22:04:48 -0000	1.3
+++ katapult.spec	5 Nov 2006 13:16:18 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           katapult
 Version:        0.3.1.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Faster access to applications, bookmarks, and other items
 
 License:        GPL
@@ -12,7 +12,7 @@
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs-devel, desktop-file-utils, automake
+BuildRequires:  kdelibs-devel, desktop-file-utils, automake, gettext
 
 %description
 Katapult is an application for KDE, designed to allow faster access to
@@ -76,6 +76,12 @@
 
 
 %Changelog
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-3
+- Added gettext as BR instead of intltool
+
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-2
+- Added intltool as BR
+
 * Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Nov  5 13:18:57 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 5 Nov 2006 06:18:57 -0700
Subject: rpms/katapult import.log,1.9,1.10
Message-ID: <200611051318.kA5DIvnF007317@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7232

Modified Files:
	import.log 
Log Message:
auto-import katapult-0.3.1.4-3 on branch devel from katapult-0.3.1.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/katapult/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	5 Nov 2006 13:16:18 -0000	1.9
+++ import.log	5 Nov 2006 13:18:27 -0000	1.10
@@ -6,3 +6,4 @@
 katapult-0_3_1_4-2:FC-5:katapult-0.3.1.4-2.src.rpm:1162681478
 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



From fedora-extras-commits at redhat.com  Sun Nov  5 13:18:58 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 5 Nov 2006 06:18:58 -0700
Subject: rpms/katapult/devel katapult.spec,1.3,1.4
Message-ID: <200611051318.kA5DIwCH007321@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/katapult/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7232/devel

Modified Files:
	katapult.spec 
Log Message:
auto-import katapult-0.3.1.4-3 on branch devel from katapult-0.3.1.4-3.src.rpm


Index: katapult.spec
===================================================================
RCS file: /cvs/extras/rpms/katapult/devel/katapult.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- katapult.spec	4 Nov 2006 22:06:40 -0000	1.3
+++ katapult.spec	5 Nov 2006 13:18:27 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           katapult
 Version:        0.3.1.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Faster access to applications, bookmarks, and other items
 
 License:        GPL
@@ -12,7 +12,7 @@
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}_%{version}.orig.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs-devel, desktop-file-utils, automake
+BuildRequires:  kdelibs-devel, desktop-file-utils, automake, gettext
 
 %description
 Katapult is an application for KDE, designed to allow faster access to
@@ -76,6 +76,12 @@
 
 
 %Changelog
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-3
+- Added gettext as BR instead of intltool
+
+* Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-2
+- Added intltool as BR
+
 * Sat Nov 04 2006 Chitlesh Goorah  - 0.3.1.4-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Nov  5 16:18:40 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 5 Nov 2006 09:18:40 -0700
Subject: rpms/jd/devel .cvsignore, 1.12, 1.13 jd.spec, 1.19, 1.20 sources,
	1.12, 1.13
Message-ID: <200611051618.kA5GIeho003123@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3034

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Nov  4 2006 Mamoru Tasaka  - 1.8.0-0.5.cvs061105
- cvs 061105 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Nov 2006 12:58:46 -0000	1.12
+++ .cvsignore	5 Nov 2006 16:18:10 -0000	1.13
@@ -1 +1 @@
-jd-1.8.0-beta061103.tgz
+jd-1.8.0-cvs061105.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jd.spec	3 Nov 2006 12:58:46 -0000	1.19
+++ jd.spec	5 Nov 2006 16:18:10 -0000	1.20
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061103
+%define         strtag        cvs061105
 %define         repoid        22566
 
 
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Nov  4 2006 Mamoru Tasaka  - 1.8.0-0.5.cvs061105
+- cvs 061105 (23:59 JST)
+
 * Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
 - 1.8.0 beta 061103
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Nov 2006 12:58:46 -0000	1.12
+++ sources	5 Nov 2006 16:18:10 -0000	1.13
@@ -1 +1 @@
-fb89210bb7fa49b0fcdf3a28c1e22711  jd-1.8.0-beta061103.tgz
+99d1dc3707cfb4a074e9419e19a2b139  jd-1.8.0-cvs061105.tgz



From fedora-extras-commits at redhat.com  Sun Nov  5 16:24:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 5 Nov 2006 09:24:26 -0700
Subject: rpms/perl-Data-Compare/FC-5 .cvsignore, 1.2,
	1.3 perl-Data-Compare.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611051624.kA5GOQRm003996@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Data-Compare/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3866/FC-5

Modified Files:
	.cvsignore perl-Data-Compare.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Aug 2006 14:38:45 -0000	1.2
+++ .cvsignore	5 Nov 2006 16:23:56 -0000	1.3
@@ -1 +1 @@
-Data-Compare-0.13.tar.gz
+Data-Compare-0.14.tar.gz


Index: perl-Data-Compare.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-5/perl-Data-Compare.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-Compare.spec	15 Aug 2006 14:38:45 -0000	1.1
+++ perl-Data-Compare.spec	5 Nov 2006 16:23:56 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Data-Compare
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Compare perl data structures
 
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Sun Nov  5 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Sun Apr 09 2006 Jose Pedro Oliveira  - 0.13-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Aug 2006 14:38:45 -0000	1.2
+++ sources	5 Nov 2006 16:23:56 -0000	1.3
@@ -1 +1 @@
-874a13f201c6948e84867f82d950907a  Data-Compare-0.13.tar.gz
+15a77e350d066277953af7993110680c  Data-Compare-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 16:24:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 5 Nov 2006 09:24:27 -0700
Subject: rpms/perl-Data-Compare/FC-6 .cvsignore, 1.2,
	1.3 perl-Data-Compare.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611051624.kA5GORtE004005@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Data-Compare/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3866/FC-6

Modified Files:
	.cvsignore perl-Data-Compare.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Aug 2006 14:38:45 -0000	1.2
+++ .cvsignore	5 Nov 2006 16:23:56 -0000	1.3
@@ -1 +1 @@
-Data-Compare-0.13.tar.gz
+Data-Compare-0.14.tar.gz


Index: perl-Data-Compare.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-6/perl-Data-Compare.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-Compare.spec	15 Aug 2006 14:38:45 -0000	1.1
+++ perl-Data-Compare.spec	5 Nov 2006 16:23:56 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Data-Compare
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Compare perl data structures
 
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Sun Nov  5 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Sun Apr 09 2006 Jose Pedro Oliveira  - 0.13-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Aug 2006 14:38:45 -0000	1.2
+++ sources	5 Nov 2006 16:23:56 -0000	1.3
@@ -1 +1 @@
-874a13f201c6948e84867f82d950907a  Data-Compare-0.13.tar.gz
+15a77e350d066277953af7993110680c  Data-Compare-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 16:24:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 5 Nov 2006 09:24:27 -0700
Subject: rpms/perl-Data-Compare/devel .cvsignore, 1.2,
	1.3 perl-Data-Compare.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611051624.kA5GORhI004010@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Data-Compare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3866/devel

Modified Files:
	.cvsignore perl-Data-Compare.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Aug 2006 14:38:45 -0000	1.2
+++ .cvsignore	5 Nov 2006 16:23:57 -0000	1.3
@@ -1 +1 @@
-Data-Compare-0.13.tar.gz
+Data-Compare-0.14.tar.gz


Index: perl-Data-Compare.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/devel/perl-Data-Compare.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Data-Compare.spec	15 Aug 2006 14:38:45 -0000	1.1
+++ perl-Data-Compare.spec	5 Nov 2006 16:23:57 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Data-Compare
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Compare perl data structures
 
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Sun Nov  5 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Sun Apr 09 2006 Jose Pedro Oliveira  - 0.13-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Aug 2006 14:38:45 -0000	1.2
+++ sources	5 Nov 2006 16:23:57 -0000	1.3
@@ -1 +1 @@
-874a13f201c6948e84867f82d950907a  Data-Compare-0.13.tar.gz
+15a77e350d066277953af7993110680c  Data-Compare-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 16:39:15 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sun, 5 Nov 2006 09:39:15 -0700
Subject: rpms/yakuake/FC-6 yakuake-getSessionName.diff, NONE,
	1.1 yakuake.spec, 1.4, 1.5
Message-ID: <200611051639.kA5GdFXp005833@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/yakuake/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5782

Modified Files:
	yakuake.spec 
Added Files:
	yakuake-getSessionName.diff 
Log Message:
Add support for KonsoleScripts (#212862)

yakuake-getSessionName.diff:

--- NEW FILE yakuake-getSessionName.diff ---
diff -ur yakuake-2.7.5/yakuake/src/dcop_interface.h yakuake-2.7.5-patched/yakuake/src/dcop_interface.h
--- yakuake-2.7.5/yakuake/src/dcop_interface.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/dcop_interface.h	2006-08-08 14:10:16.721056702 +0300
@@ -43,6 +43,8 @@
     virtual void    slotToggleState() = 0;
 
     virtual void    slotRenameSession(int id, const QString & name) = 0;
+
+	virtual QString slotSessionName(int id) = 0;
     virtual void    slotSetSessionTitleText(int id, const QString & name) = 0;
     virtual void    slotRunCommandInSession(int id, const QString & value) = 0;
 };
diff -ur yakuake-2.7.5/yakuake/src/main_window.cpp yakuake-2.7.5-patched/yakuake/src/main_window.cpp
--- yakuake-2.7.5/yakuake/src/main_window.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.cpp	2006-08-08 14:12:08.191976212 +0300
@@ -290,6 +290,16 @@
 
 
 /******************************************************************************
+** Gets caption from an item given its id
+*********************************/
+
+QString MainWindow::slotSessionName(int id)
+{
+	return tabs_bar->getCaption(id);
+}
+
+
+/******************************************************************************
 ** Open inline edit for the current item and show tab bar if necessary
 ************************************************************************/
 
diff -ur yakuake-2.7.5/yakuake/src/main_window.h yakuake-2.7.5-patched/yakuake/src/main_window.h
--- yakuake-2.7.5/yakuake/src/main_window.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.h	2006-08-08 14:06:43.891845419 +0300
@@ -280,6 +280,7 @@
     void    slotPasteClipboard();
 
     void    slotRenameSession(int id, const QString & name);
+	QString slotSessionName(int id);
     void    slotInteractiveRename();
     void    slotSetSessionTitleText(int id, const QString & name);
     void    slotRunCommandInSession(int id, const QString & value);
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.cpp yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp
--- yakuake-2.7.5/yakuake/src/tabbed_widget.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp	2006-08-08 13:59:13.379880079 +0300
@@ -157,6 +157,18 @@
 
 
 /******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString    TabbedWidget::getCaption(int id)
+{
+    int index = items.findIndex(id);
+
+    return captions[index];
+}
+
+
+/******************************************************************************
 ** Open inline edit for the current item
 ******************************************/
 
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.h yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h
--- yakuake-2.7.5/yakuake/src/tabbed_widget.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h	2006-08-08 14:08:45.551397384 +0300
@@ -145,6 +145,7 @@
     void    selectPreviousItem();
 
     void    renameItem(int id, const QString & name);
+	QString getCaption(int id);
     void    interactiveRename();
 
     void    setFontColor(const QColor & color);
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.cpp yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp
--- yakuake-2.7.5/yakuake/src/tabs_bar.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp	2006-08-08 14:14:43.405611033 +0300
@@ -86,6 +86,16 @@
     tabs_widget->renameItem(id, name);
 }
 
+/******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString    TabsBar::getCaption(int id)
+{
+    return tabs_widget->getCaption(id);
+}
+
+
 
 /******************************************************************************
 ** Open inline edit for the current item
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.h yakuake-2.7.5-patched/yakuake/src/tabs_bar.h
--- yakuake-2.7.5/yakuake/src/tabs_bar.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.h	2006-08-08 14:15:04.210902512 +0300
@@ -127,6 +127,7 @@
     int     removeItem(int id);
 
     void    renameItem(int id, const QString & name);
+	QString getCaption(int id);
     void    interactiveRename();
 
 


Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/FC-6/yakuake.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yakuake.spec	15 Sep 2006 13:27:15 -0000	1.4
+++ yakuake.spec	5 Nov 2006 16:38:45 -0000	1.5
@@ -1,12 +1,14 @@
 Name:           yakuake
 Version:        2.7.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Terminal emulator for KDE
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://extragear.kde.org/apps/yakuake/
 Source0:        http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2
+# http://www.kde-look.org/content/download.php?content=43873&id=2
+Patch0:         http://ota.tr.spt.fi/~fisu81/stuff/konsolescripts/yakuake-getSessionName.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -19,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -79,6 +82,9 @@
 
 
 %changelog
+* Mon Oct 30 2006 Dawid Gajownik  - 2.7.5-4
+- Add support for KonsoleScripts (#212862)
+
 * Fri Sep 15 2006 Dawid Gajownik  - 2.7.5-3
 - Rebuild for FE6
 - Update e-mail address



From fedora-extras-commits at redhat.com  Sun Nov  5 16:44:16 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sun, 5 Nov 2006 09:44:16 -0700
Subject: rpms/yakuake/FC-5 yakuake-getSessionName.diff, NONE,
	1.1 yakuake.spec, 1.3, 1.4
Message-ID: <200611051644.kA5GiGYb006124@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/yakuake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6100

Modified Files:
	yakuake.spec 
Added Files:
	yakuake-getSessionName.diff 
Log Message:
Add support for KonsoleScripts (#212862)

yakuake-getSessionName.diff:

--- NEW FILE yakuake-getSessionName.diff ---
diff -ur yakuake-2.7.5/yakuake/src/dcop_interface.h yakuake-2.7.5-patched/yakuake/src/dcop_interface.h
--- yakuake-2.7.5/yakuake/src/dcop_interface.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/dcop_interface.h	2006-08-08 14:10:16.721056702 +0300
@@ -43,6 +43,8 @@
     virtual void    slotToggleState() = 0;
 
     virtual void    slotRenameSession(int id, const QString & name) = 0;
+
+	virtual QString slotSessionName(int id) = 0;
     virtual void    slotSetSessionTitleText(int id, const QString & name) = 0;
     virtual void    slotRunCommandInSession(int id, const QString & value) = 0;
 };
diff -ur yakuake-2.7.5/yakuake/src/main_window.cpp yakuake-2.7.5-patched/yakuake/src/main_window.cpp
--- yakuake-2.7.5/yakuake/src/main_window.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.cpp	2006-08-08 14:12:08.191976212 +0300
@@ -290,6 +290,16 @@
 
 
 /******************************************************************************
+** Gets caption from an item given its id
+*********************************/
+
+QString MainWindow::slotSessionName(int id)
+{
+	return tabs_bar->getCaption(id);
+}
+
+
+/******************************************************************************
 ** Open inline edit for the current item and show tab bar if necessary
 ************************************************************************/
 
diff -ur yakuake-2.7.5/yakuake/src/main_window.h yakuake-2.7.5-patched/yakuake/src/main_window.h
--- yakuake-2.7.5/yakuake/src/main_window.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/main_window.h	2006-08-08 14:06:43.891845419 +0300
@@ -280,6 +280,7 @@
     void    slotPasteClipboard();
 
     void    slotRenameSession(int id, const QString & name);
+	QString slotSessionName(int id);
     void    slotInteractiveRename();
     void    slotSetSessionTitleText(int id, const QString & name);
     void    slotRunCommandInSession(int id, const QString & value);
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.cpp yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp
--- yakuake-2.7.5/yakuake/src/tabbed_widget.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.cpp	2006-08-08 13:59:13.379880079 +0300
@@ -157,6 +157,18 @@
 
 
 /******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString    TabbedWidget::getCaption(int id)
+{
+    int index = items.findIndex(id);
+
+    return captions[index];
+}
+
+
+/******************************************************************************
 ** Open inline edit for the current item
 ******************************************/
 
diff -ur yakuake-2.7.5/yakuake/src/tabbed_widget.h yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h
--- yakuake-2.7.5/yakuake/src/tabbed_widget.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabbed_widget.h	2006-08-08 14:08:45.551397384 +0300
@@ -145,6 +145,7 @@
     void    selectPreviousItem();
 
     void    renameItem(int id, const QString & name);
+	QString getCaption(int id);
     void    interactiveRename();
 
     void    setFontColor(const QColor & color);
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.cpp yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp
--- yakuake-2.7.5/yakuake/src/tabs_bar.cpp	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.cpp	2006-08-08 14:14:43.405611033 +0300
@@ -86,6 +86,16 @@
     tabs_widget->renameItem(id, name);
 }
 
+/******************************************************************************
+** Gets Caption from an item given its id
+*********************************/
+
+QString    TabsBar::getCaption(int id)
+{
+    return tabs_widget->getCaption(id);
+}
+
+
 
 /******************************************************************************
 ** Open inline edit for the current item
diff -ur yakuake-2.7.5/yakuake/src/tabs_bar.h yakuake-2.7.5-patched/yakuake/src/tabs_bar.h
--- yakuake-2.7.5/yakuake/src/tabs_bar.h	2006-03-21 20:14:26.000000000 +0200
+++ yakuake-2.7.5-patched/yakuake/src/tabs_bar.h	2006-08-08 14:15:04.210902512 +0300
@@ -127,6 +127,7 @@
     int     removeItem(int id);
 
     void    renameItem(int id, const QString & name);
+	QString getCaption(int id);
     void    interactiveRename();
 
 


Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/FC-5/yakuake.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yakuake.spec	20 May 2006 16:33:12 -0000	1.3
+++ yakuake.spec	5 Nov 2006 16:43:46 -0000	1.4
@@ -1,12 +1,14 @@
 Name:           yakuake
 Version:        2.7.5
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Terminal emulator for KDE
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://extragear.kde.org/apps/yakuake/
 Source0:        http://www.kde-apps.org/content/files/29153-yakuake-2.7.5.tar.bz2
+# http://www.kde-look.org/content/download.php?content=43873&id=2
+Patch0:         http://ota.tr.spt.fi/~fisu81/stuff/konsolescripts/yakuake-getSessionName.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -19,16 +21,17 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
-	--disable-debug \
-	--disable-dependency-tracking \
-	--disable-rpath \
-	--enable-final
+        --disable-debug \
+        --disable-dependency-tracking \
+        --disable-rpath \
+        --enable-final
 make %{?_smp_mflags}
 
 
@@ -39,12 +42,12 @@
 desktop-file-install --vendor fedora                            \
         --dir %{buildroot}%{_datadir}/applications              \
         --add-category X-Fedora                                 \
-	--add-category Application 				\
-	--add-category Utility 					\
-  	--add-category KDE 					\
-  	--add-category Qt 					\
-    	--delete-original 					\
-	%{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop
+        --add-category Application                              \
+        --add-category Utility                                  \
+        --add-category KDE                                      \
+        --add-category Qt                                       \
+        --delete-original                                       \
+        %{buildroot}%{_datadir}/applnk/Utilities/yakuake.desktop
 chmod 755 %{buildroot}%{_datadir}/apps/yakuake/default/install.sh
 
 %find_lang %{name}
@@ -53,7 +56,7 @@
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x ${_bindir}/gtk-update-icon-cache ] ; then
-	${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+        ${_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
@@ -79,10 +82,17 @@
 
 
 %changelog
-* Sat May 20 2006 Dawid Gajownik  - 2.7.5-2
+* Mon Oct 30 2006 Dawid Gajownik  - 2.7.5-4
+- Add support for KonsoleScripts (#212862)
+
+* Fri Sep 15 2006 Dawid Gajownik  - 2.7.5-3
+- Update e-mail address
+- Fix mixed-use-of-spaces-and-tabs rpmlint warning
+
+* Sat May 20 2006 Dawid Gajownik  - 2.7.5-2
 - Add dist tag
 
-* Sat May 20 2006 Dawid Gajownik  - 2.7.5-1
+* Sat May 20 2006 Dawid Gajownik  - 2.7.5-1
 - Update to 2.7.5
 - Add `--disable-dependency-tracking' and `--enable-final' options
 - Include translations



From fedora-extras-commits at redhat.com  Sun Nov  5 16:48:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 5 Nov 2006 09:48:52 -0700
Subject: rpms/perl-Data-Compare/devel perl-Data-Compare.spec,1.2,1.3
Message-ID: <200611051648.kA5GmqmQ006255@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Data-Compare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6233

Modified Files:
	perl-Data-Compare.spec 
Log Message:
New BR: perl(Clone) is needed by t/deep-objects.t.


Index: perl-Data-Compare.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Data-Compare/devel/perl-Data-Compare.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Data-Compare.spec	5 Nov 2006 16:23:57 -0000	1.2
+++ perl-Data-Compare.spec	5 Nov 2006 16:48:22 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Data-Compare
 Version:        0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Compare perl data structures
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(File::Find::Rule)
 BuildRequires:  perl(Scalar::Properties)
+BuildRequires:  perl(Clone)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +53,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Jose Pedro Oliveira  - 0.14-2
+- New BR: perl(Clone) is needed by t/deep-objects.t.
+
 * Sun Nov  5 2006 Jose Pedro Oliveira  - 0.14-1
 - Update to 0.14.
 



From fedora-extras-commits at redhat.com  Sun Nov  5 17:42:19 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 5 Nov 2006 10:42:19 -0700
Subject: rpms/ctapi-cyberjack/devel .cvsignore, 1.4, 1.5 ctapi-cyberjack.spec,
	1.17, 1.18 sources, 1.4, 1.5
Message-ID: <200611051742.kA5HgJaB009654@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9620

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to version 2.0.12 of the lib



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2006 14:14:07 -0000	1.4
+++ .cvsignore	5 Nov 2006 17:41:48 -0000	1.5
@@ -1 +1 @@
-ctapi-cyberjack-2.0.11.tar.gz
+ctapi-cyberjack-2.0.12.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ctapi-cyberjack.spec	16 Sep 2006 18:30:00 -0000	1.17
+++ ctapi-cyberjack.spec	5 Nov 2006 17:41:48 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	2.0.11
-Release:	6%{?dist}
+Version:	2.0.12
+Release:	1%{?dist}
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
@@ -11,7 +11,7 @@
 #For FC4
 #BuildRequires:  libusb-devel readline-devel kernel-devel
 
-URL:		http://support.reiner-sct.de/downloads/LINUX/V2.0.11/ctapi-cyberjack-2.0.11.tar.gz
+URL:		http://support.reiner-sct.de/downloads/LINUX/V2.0.12/ctapi-cyberjack-2.0.12.tar.gz
 
 License: 	LGPL
 Group: 		Development/Libraries
@@ -108,7 +108,6 @@
 %{_libdir}/ctapi/libctapi-cyberjack.so.*
 %{_bindir}/cjgeldkarte
 %{_bindir}/ctsh
-%{_bindir}/ctpin
 %{_sysconfdir}/*
 
 %files pcsc
@@ -125,6 +124,9 @@
 %{_libdir}/ctapi/libctapi-cyberjack.la
 
 %changelog 
+* Sun Nov 5 2006 Frank B??ttner  - 2.0.12-1%{?dist}
+- update to driver version 2.0.12
+
 * Sat Sep 16 2006 Frank B??ttner  - 2.0.11-6%{?dist}
 - try %configure instead of configure
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2006 14:14:07 -0000	1.4
+++ sources	5 Nov 2006 17:41:48 -0000	1.5
@@ -1 +1 @@
-4c6c324a7d76fac0069013bcec549b4d  ctapi-cyberjack-2.0.11.tar.gz
+c85e4629692e26f87b02ff6d6da7a8c7  ctapi-cyberjack-2.0.12.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 17:56:31 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Sun, 5 Nov 2006 10:56:31 -0700
Subject: rpms/ctapi-cyberjack/FC-6 .cvsignore, 1.4, 1.5 ctapi-cyberjack.spec,
	1.17, 1.18 sources, 1.4, 1.5
Message-ID: <200611051756.kA5HuVmm009783@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9760

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Log Message:
update to version 2.0.12 of the lib



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2006 14:14:07 -0000	1.4
+++ .cvsignore	5 Nov 2006 17:56:00 -0000	1.5
@@ -1 +1 @@
-ctapi-cyberjack-2.0.11.tar.gz
+ctapi-cyberjack-2.0.12.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/ctapi-cyberjack.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ctapi-cyberjack.spec	16 Sep 2006 18:30:00 -0000	1.17
+++ ctapi-cyberjack.spec	5 Nov 2006 17:56:00 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	2.0.11
-Release:	6%{?dist}
+Version:	2.0.12
+Release:	1%{?dist}
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
@@ -11,7 +11,7 @@
 #For FC4
 #BuildRequires:  libusb-devel readline-devel kernel-devel
 
-URL:		http://support.reiner-sct.de/downloads/LINUX/V2.0.11/ctapi-cyberjack-2.0.11.tar.gz
+URL:		http://support.reiner-sct.de/downloads/LINUX/V2.0.12/ctapi-cyberjack-2.0.12.tar.gz
 
 License: 	LGPL
 Group: 		Development/Libraries
@@ -108,7 +108,6 @@
 %{_libdir}/ctapi/libctapi-cyberjack.so.*
 %{_bindir}/cjgeldkarte
 %{_bindir}/ctsh
-%{_bindir}/ctpin
 %{_sysconfdir}/*
 
 %files pcsc
@@ -125,6 +124,9 @@
 %{_libdir}/ctapi/libctapi-cyberjack.la
 
 %changelog 
+* Sun Nov 5 2006 Frank B??ttner  - 2.0.12-1%{?dist}
+- update to driver version 2.0.12
+
 * Sat Sep 16 2006 Frank B??ttner  - 2.0.11-6%{?dist}
 - try %configure instead of configure
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2006 14:14:07 -0000	1.4
+++ sources	5 Nov 2006 17:56:00 -0000	1.5
@@ -1 +1 @@
-4c6c324a7d76fac0069013bcec549b4d  ctapi-cyberjack-2.0.11.tar.gz
+c85e4629692e26f87b02ff6d6da7a8c7  ctapi-cyberjack-2.0.12.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 18:32:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 5 Nov 2006 11:32:44 -0700
Subject: owners owners.list,1.1893,1.1894
Message-ID: <200611051832.kA5IWiNu013055@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029

Modified Files:
	owners.list 
Log Message:
orphaning zope, plone, mpc and gmpc


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1893
retrieving revision 1.1894
diff -u -r1.1893 -r1.1894
--- owners.list	5 Nov 2006 09:28:02 -0000	1.1893
+++ owners.list	5 Nov 2006 18:32:14 -0000	1.1894
@@ -537,7 +537,7 @@
 Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|glyph-keeper|Library for text rendering|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|gmpc|GNOME frontend for the MPD|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnash|GNU flash movie player|pertusus at free.fr|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|gnet2|A simple network library built upon glib|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnochm|CHM file viewer|pertusus at free.fr|extras-qa at fedoraproject.org|
@@ -1092,7 +1092,7 @@
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mousepad|A simple text editor for Xfce|kevin at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|mpc|Command-line client for MPD|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mtd-utils|Utilities for dealing with MTD (flash) devices|dwmw2 at redhat.com|extras-qa at fedoraproject.org|jwboyer at jdub.homelinux.org
 Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1812,7 +1812,7 @@
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|plib|Set of portable libraries especially useful for games|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|matthias at rpmforge.net
 Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
-Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|plone|User friendly and powerful open source Content Management System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|plotmm|GTKmm plot widget for scientific applications|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|plotutils|GNU vector and raster graphics utilities and libraries|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -2477,7 +2477,7 @@
 Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
-Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|zope|Application server in Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|zvbi|Raw VBI, Teletext and Closed Caption decoding library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|zynaddsubfx|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov  5 19:09:14 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 12:09:14 -0700
Subject: rpms/libtasn1/FC-6 sources,1.7,1.8 libtasn1.spec,1.14,1.15
Message-ID: <200611051909.kA5J9EkC016250@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/FC-6

Modified Files:
	sources libtasn1.spec 
Log Message:
- updated to 0.3.6
- BR valgrind



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Sep 2006 17:45:37 -0000	1.7
+++ sources	5 Nov 2006 19:08:44 -0000	1.8
@@ -1,2 +1,2 @@
-6315b320944e3a4e4c4e73d98cb6123e  libtasn1-0.3.5.tar.gz
-dd3a54bd747c7017af9ad8a1746dbb06  libtasn1-0.3.5.tar.gz.sig
+491e5434a2eaec6277b98f6b362210ba  libtasn1-0.3.6.tar.gz.sig
+1a373457a4e6ad3c1641a847e7c70cf4  libtasn1-0.3.6.tar.gz


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/FC-6/libtasn1.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libtasn1.spec	15 Sep 2006 17:45:37 -0000	1.14
+++ libtasn1.spec	5 Nov 2006 19:08:44 -0000	1.15
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.5
+Version:	0.3.6
 Release: 	%release_func 1
 
 License:	LGPL
@@ -13,7 +13,7 @@
 Source0:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz
 Source1:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-BuildRequires:	bison
+BuildRequires:	bison valgrind
 
 
 %package devel
@@ -110,6 +110,10 @@
 
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.3.6-1
+- updated to 0.3.6
+- BR valgrind
+
 * Fri Sep 15 2006 Enrico Scholz  - 0.3.5-1
 - updated to 0.3.5
 



From fedora-extras-commits at redhat.com  Sun Nov  5 19:09:15 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 12:09:15 -0700
Subject: rpms/libtasn1/FC-5 sources,1.7,1.8 libtasn1.spec,1.14,1.15
Message-ID: <200611051909.kA5J9F05016254@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/FC-5

Modified Files:
	sources libtasn1.spec 
Log Message:
- updated to 0.3.6
- BR valgrind



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Sep 2006 17:45:36 -0000	1.7
+++ sources	5 Nov 2006 19:08:44 -0000	1.8
@@ -1,2 +1,2 @@
-6315b320944e3a4e4c4e73d98cb6123e  libtasn1-0.3.5.tar.gz
-dd3a54bd747c7017af9ad8a1746dbb06  libtasn1-0.3.5.tar.gz.sig
+491e5434a2eaec6277b98f6b362210ba  libtasn1-0.3.6.tar.gz.sig
+1a373457a4e6ad3c1641a847e7c70cf4  libtasn1-0.3.6.tar.gz


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/FC-5/libtasn1.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libtasn1.spec	15 Sep 2006 17:45:36 -0000	1.14
+++ libtasn1.spec	5 Nov 2006 19:08:45 -0000	1.15
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.5
+Version:	0.3.6
 Release: 	%release_func 1
 
 License:	LGPL
@@ -13,7 +13,7 @@
 Source0:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz
 Source1:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-BuildRequires:	bison
+BuildRequires:	bison valgrind
 
 
 %package devel
@@ -110,6 +110,10 @@
 
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.3.6-1
+- updated to 0.3.6
+- BR valgrind
+
 * Fri Sep 15 2006 Enrico Scholz  - 0.3.5-1
 - updated to 0.3.5
 



From fedora-extras-commits at redhat.com  Sun Nov  5 19:09:13 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 12:09:13 -0700
Subject: rpms/libtasn1/devel sources,1.7,1.8 libtasn1.spec,1.14,1.15
Message-ID: <200611051909.kA5J9Dsx016244@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/libtasn1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/devel

Modified Files:
	sources libtasn1.spec 
Log Message:
- updated to 0.3.6
- BR valgrind



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Sep 2006 17:45:37 -0000	1.7
+++ sources	5 Nov 2006 19:08:42 -0000	1.8
@@ -1,2 +1,2 @@
-6315b320944e3a4e4c4e73d98cb6123e  libtasn1-0.3.5.tar.gz
-dd3a54bd747c7017af9ad8a1746dbb06  libtasn1-0.3.5.tar.gz.sig
+491e5434a2eaec6277b98f6b362210ba  libtasn1-0.3.6.tar.gz.sig
+1a373457a4e6ad3c1641a847e7c70cf4  libtasn1-0.3.6.tar.gz


Index: libtasn1.spec
===================================================================
RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libtasn1.spec	15 Sep 2006 17:45:37 -0000	1.14
+++ libtasn1.spec	5 Nov 2006 19:08:42 -0000	1.15
@@ -4,7 +4,7 @@
 
 Summary:	This is the ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	0.3.5
+Version:	0.3.6
 Release: 	%release_func 1
 
 License:	LGPL
@@ -13,7 +13,7 @@
 Source0:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz
 Source1:	ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%name-%version.tar.gz.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
-BuildRequires:	bison
+BuildRequires:	bison valgrind
 
 
 %package devel
@@ -110,6 +110,10 @@
 
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.3.6-1
+- updated to 0.3.6
+- BR valgrind
+
 * Fri Sep 15 2006 Enrico Scholz  - 0.3.5-1
 - updated to 0.3.5
 



From fedora-extras-commits at redhat.com  Sun Nov  5 19:10:25 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 5 Nov 2006 12:10:25 -0700
Subject: rpms/abiword/devel .cvsignore, 1.15, 1.16 abiword.spec, 1.39,
	1.40 sources, 1.15, 1.16 abiword-2.4.5-fontconfig.patch, 1.1, NONE
Message-ID: <200611051910.kA5JAPfB016398@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298

Modified Files:
	.cvsignore abiword.spec sources 
Removed Files:
	abiword-2.4.5-fontconfig.patch 
Log Message:
Update to 2.4.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Jul 2006 12:23:54 -0000	1.15
+++ .cvsignore	5 Nov 2006 19:09:55 -0000	1.16
@@ -1 +1 @@
-abiword-2.4.5.tar.bz2
+abiword-2.4.6.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- abiword.spec	12 Oct 2006 14:55:56 -0000	1.39
+++ abiword.spec	5 Nov 2006 19:09:55 -0000	1.40
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.5
-Release: 4%{?dist}
+Version: 2.4.6
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -45,7 +45,6 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
-Patch2: abiword-2.4.5-fontconfig.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -55,7 +54,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .fontconfig
 
 %build
 cd abi
@@ -137,6 +135,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sun Nov 05 2006 Marc Maurer  - 1:2.4.6-1.fc7
+- Update to 2.4.6
+
 * Thu Oct 12 2006 Marc Maurer  - 1:2.4.5-4.fc6
 - Fix bug 207294
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Jul 2006 12:23:54 -0000	1.15
+++ sources	5 Nov 2006 19:09:55 -0000	1.16
@@ -1 +1 @@
-e018669a154164d31c768f773a1c95b4  abiword-2.4.5.tar.bz2
+8ed5fb282b9741aca75b9e47500d39a1  abiword-2.4.6.tar.bz2


--- abiword-2.4.5-fontconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov  5 19:22:26 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 5 Nov 2006 12:22:26 -0700
Subject: rpms/abiword/FC-5 .cvsignore, 1.15, 1.16 abiword.spec, 1.38,
	1.39 sources, 1.15, 1.16
Message-ID: <200611051922.kA5JMQb8016554@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16510

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
Update to 2.4.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Jul 2006 12:16:48 -0000	1.15
+++ .cvsignore	5 Nov 2006 19:21:56 -0000	1.16
@@ -1 +1 @@
-abiword-2.4.5.tar.bz2
+abiword-2.4.6.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- abiword.spec	16 Jul 2006 11:22:22 -0000	1.38
+++ abiword.spec	5 Nov 2006 19:21:56 -0000	1.39
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.5
-Release: 2%{?dist}
+Version: 2.4.6
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -135,6 +135,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sun Nov 05 2006 Marc Maurer  - 1:2.4.6-1.fc5
+- Update to 2.4.6
+
 * Sat Jul 15 2006 Marc Maurer  - 1:2.4.5-2.fc5
 - Fix http://bugzilla.abisource.com/show_bug.cgi?id=10229
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Jul 2006 12:16:48 -0000	1.15
+++ sources	5 Nov 2006 19:21:56 -0000	1.16
@@ -1 +1 @@
-e018669a154164d31c768f773a1c95b4  abiword-2.4.5.tar.bz2
+8ed5fb282b9741aca75b9e47500d39a1  abiword-2.4.6.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov  5 19:38:28 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 5 Nov 2006 12:38:28 -0700
Subject: rpms/abiword/FC-6 .cvsignore, 1.15, 1.16 abiword.spec, 1.39,
	1.40 sources, 1.15, 1.16 abiword-2.4.5-fontconfig.patch, 1.1, NONE
Message-ID: <200611051938.kA5JcS23016662@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16642

Modified Files:
	.cvsignore abiword.spec sources 
Removed Files:
	abiword-2.4.5-fontconfig.patch 
Log Message:
Update to 2.4.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Jul 2006 12:23:54 -0000	1.15
+++ .cvsignore	5 Nov 2006 19:37:58 -0000	1.16
@@ -1 +1 @@
-abiword-2.4.5.tar.bz2
+abiword-2.4.6.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-6/abiword.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- abiword.spec	12 Oct 2006 14:55:56 -0000	1.39
+++ abiword.spec	5 Nov 2006 19:37:58 -0000	1.40
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.5
-Release: 4%{?dist}
+Version: 2.4.6
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -45,7 +45,6 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
-Patch2: abiword-2.4.5-fontconfig.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -55,7 +54,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .fontconfig
 
 %build
 cd abi
@@ -137,6 +135,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sun Nov 05 2006 Marc Maurer  - 1:2.4.6-1.fc6
+- Update to 2.4.6
+
 * Thu Oct 12 2006 Marc Maurer  - 1:2.4.5-4.fc6
 - Fix bug 207294
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Jul 2006 12:23:54 -0000	1.15
+++ sources	5 Nov 2006 19:37:58 -0000	1.16
@@ -1 +1 @@
-e018669a154164d31c768f773a1c95b4  abiword-2.4.5.tar.bz2
+8ed5fb282b9741aca75b9e47500d39a1  abiword-2.4.6.tar.bz2


--- abiword-2.4.5-fontconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov  5 20:11:51 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:11:51 -0700
Subject: rpms/clamav/FC-6 sources,1.20,1.21 clamav.spec,1.43,1.44
Message-ID: <200611052011.kA5KBpgK019912@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/FC-6

Modified Files:
	sources clamav.spec 
Log Message:
updated to 0.88.6



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-6/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Oct 2006 07:22:18 -0000	1.20
+++ sources	5 Nov 2006 20:11:21 -0000	1.21
@@ -1,2 +1,2 @@
-d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
-5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig
+db7f8b947bc21023f36e04bfdd555dd0  clamav-0.88.6.tar.gz
+38070a003e0eb5438ba7ad901556fd25  clamav-0.88.6.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-6/clamav.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- clamav.spec	18 Oct 2006 07:22:18 -0000	1.43
+++ clamav.spec	5 Nov 2006 20:11:21 -0000	1.44
@@ -18,8 +18,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.5
-Release: %release_func 1
+Version:	0.88.6
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -448,6 +448,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.88.6-1
+- updated to 0.88.6
+
 * Wed Oct 18 2006 Enrico Scholz  - 0.88.5-1
 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
 - added patch to set '__attribute__ ((visibility("hidden")))' for



From fedora-extras-commits at redhat.com  Sun Nov  5 20:11:53 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:11:53 -0700
Subject: rpms/clamav/FC-4 sources,1.19,1.20 clamav.spec,1.35,1.36
Message-ID: <200611052011.kA5KBrl1019918@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/FC-4

Modified Files:
	sources clamav.spec 
Log Message:
updated to 0.88.6



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	21 Oct 2006 09:30:58 -0000	1.19
+++ sources	5 Nov 2006 20:11:22 -0000	1.20
@@ -1,2 +1,2 @@
-d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
-5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig
+db7f8b947bc21023f36e04bfdd555dd0  clamav-0.88.6.tar.gz
+38070a003e0eb5438ba7ad901556fd25  clamav-0.88.6.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- clamav.spec	21 Oct 2006 09:30:58 -0000	1.35
+++ clamav.spec	5 Nov 2006 20:11:22 -0000	1.36
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.5
+Version:	0.88.6
 Release:	%release_func 1
 
 License:	GPL
@@ -432,6 +432,9 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.88.6-1
+- updated to 0.88.6
+
 * Sat Oct 21 2006 Enrico Scholz  - 0.88.5-1
 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
 



From fedora-extras-commits at redhat.com  Sun Nov  5 20:11:50 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:11:50 -0700
Subject: rpms/clamav/devel sources,1.20,1.21 clamav.spec,1.43,1.44
Message-ID: <200611052011.kA5KBovL019908@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/devel

Modified Files:
	sources clamav.spec 
Log Message:
updated to 0.88.6



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Oct 2006 07:22:18 -0000	1.20
+++ sources	5 Nov 2006 20:11:19 -0000	1.21
@@ -1,2 +1,2 @@
-d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
-5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig
+db7f8b947bc21023f36e04bfdd555dd0  clamav-0.88.6.tar.gz
+38070a003e0eb5438ba7ad901556fd25  clamav-0.88.6.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- clamav.spec	18 Oct 2006 07:22:18 -0000	1.43
+++ clamav.spec	5 Nov 2006 20:11:19 -0000	1.44
@@ -18,8 +18,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.5
-Release: %release_func 1
+Version:	0.88.6
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -448,6 +448,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.88.6-1
+- updated to 0.88.6
+
 * Wed Oct 18 2006 Enrico Scholz  - 0.88.5-1
 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
 - added patch to set '__attribute__ ((visibility("hidden")))' for



From fedora-extras-commits at redhat.com  Sun Nov  5 20:11:53 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:11:53 -0700
Subject: rpms/clamav/FC-3 sources,1.17,1.18 clamav.spec,1.25,1.26
Message-ID: <200611052011.kA5KBrFc019922@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/FC-3

Modified Files:
	sources clamav.spec 
Log Message:
updated to 0.88.6



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	21 Oct 2006 09:28:51 -0000	1.17
+++ sources	5 Nov 2006 20:11:23 -0000	1.18
@@ -1,2 +1,2 @@
-d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
-5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig
+db7f8b947bc21023f36e04bfdd555dd0  clamav-0.88.6.tar.gz
+38070a003e0eb5438ba7ad901556fd25  clamav-0.88.6.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- clamav.spec	21 Oct 2006 09:28:51 -0000	1.25
+++ clamav.spec	5 Nov 2006 20:11:23 -0000	1.26
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.5
+Version:	0.88.6
 Release:	%release_func 1
 
 License:	GPL
@@ -432,8 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.88.6-1
+- updated to 0.88.6
+
 * Sat Oct 21 2006 Enrico Scholz  - 0.88.5-1
-- updated to 0.88.5
+- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
 
 * Tue Aug  8 2006 Enrico Scholz  - 0.88.4-1
 - updated to 0.88.4 (SECURITY)



From fedora-extras-commits at redhat.com  Sun Nov  5 20:11:52 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:11:52 -0700
Subject: rpms/clamav/FC-5 sources,1.19,1.20 clamav.spec,1.38,1.39
Message-ID: <200611052011.kA5KBqfW019916@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19830/FC-5

Modified Files:
	sources clamav.spec 
Log Message:
updated to 0.88.6



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	18 Oct 2006 07:24:32 -0000	1.19
+++ sources	5 Nov 2006 20:11:21 -0000	1.20
@@ -1,2 +1,2 @@
-d62376205647b208eba4191dde821830  clamav-0.88.5.tar.gz
-5daea1b5d8ab49257dea3ccc5dacaf35  clamav-0.88.5.tar.gz.sig
+db7f8b947bc21023f36e04bfdd555dd0  clamav-0.88.6.tar.gz
+38070a003e0eb5438ba7ad901556fd25  clamav-0.88.6.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/clamav.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- clamav.spec	18 Oct 2006 07:24:32 -0000	1.38
+++ clamav.spec	5 Nov 2006 20:11:21 -0000	1.39
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.5
+Version:	0.88.6
 Release:	%release_func 1
 
 License:	GPL
@@ -434,6 +434,9 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.88.6-1
+- updated to 0.88.6
+
 * Wed Oct 18 2006 Enrico Scholz  - 0.88.5-1
 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295
 



From fedora-extras-commits at redhat.com  Sun Nov  5 20:28:29 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:28:29 -0700
Subject: rpms/opencdk/FC-5 .cvsignore,1.3,1.4
Message-ID: <200611052028.kA5KSTDZ020200@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20156/FC-5

Modified Files:
	.cvsignore 
Log Message:
ignore some more files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opencdk/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Feb 2005 23:09:47 -0000	1.3
+++ .cvsignore	5 Nov 2006 20:27:59 -0000	1.4
@@ -1,2 +1,4 @@
 opencdk*.tar.bz2*
+opencdk*.tar.gz*
 opencdk*.tar.bz2.sig.asc
+opencdk*.tar.gz.sig



From fedora-extras-commits at redhat.com  Sun Nov  5 20:28:31 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:28:31 -0700
Subject: rpms/opencdk/devel .cvsignore,1.4,1.5
Message-ID: <200611052028.kA5KSVaf020204@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20156/devel

Modified Files:
	.cvsignore 
Log Message:
ignore some more files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Sep 2006 06:40:23 -0000	1.4
+++ .cvsignore	5 Nov 2006 20:28:01 -0000	1.5
@@ -1,4 +1,4 @@
 opencdk*.tar.bz2*
-opencdk*.tar.bz2.sig.asc
 opencdk*.tar.gz*
+opencdk*.tar.bz2.sig.asc
 opencdk*.tar.gz.sig



From fedora-extras-commits at redhat.com  Sun Nov  5 20:28:30 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:28:30 -0700
Subject: rpms/opencdk/FC-6 .cvsignore,1.4,1.5
Message-ID: <200611052028.kA5KSUg2020203@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20156/FC-6

Modified Files:
	.cvsignore 
Log Message:
ignore some more files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opencdk/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Sep 2006 06:40:23 -0000	1.4
+++ .cvsignore	5 Nov 2006 20:28:00 -0000	1.5
@@ -1,4 +1,4 @@
 opencdk*.tar.bz2*
-opencdk*.tar.bz2.sig.asc
 opencdk*.tar.gz*
+opencdk*.tar.bz2.sig.asc
 opencdk*.tar.gz.sig



From fedora-extras-commits at redhat.com  Sun Nov  5 20:29:51 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:29:51 -0700
Subject: rpms/opencdk/devel sources,1.5,1.6 opencdk.spec,1.9,1.10
Message-ID: <200611052029.kA5KTpJp020279@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20224/devel

Modified Files:
	sources opencdk.spec 
Log Message:
- updated to 0.5.11
- added pkgconfig file



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Sep 2006 18:01:04 -0000	1.5
+++ sources	5 Nov 2006 20:29:21 -0000	1.6
@@ -1,2 +1,2 @@
-7dd032032850719ccb6a75353e331f07  opencdk-0.5.9.tar.gz.sig
-b692c2dc2cedd1435e2a2ef3f5a2c708  opencdk-0.5.9.tar.gz
+de16f52a7f2215e3df9e81067ebae60d  opencdk-0.5.11.tar.gz
+6521460eb777c6fab25c71943e3b8d3e  opencdk-0.5.11.tar.gz.sig


Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/devel/opencdk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- opencdk.spec	15 Sep 2006 18:01:04 -0000	1.9
+++ opencdk.spec	5 Nov 2006 20:29:21 -0000	1.10
@@ -4,7 +4,7 @@
 
 Summary:	Provides basic parts of the OpenPGP message format
 Name:		opencdk
-Version:	0.5.9
+Version:	0.5.11
 Release:	%release_func 1
 
 License:	GPL
@@ -19,7 +19,7 @@
 Summary:	Files which are needed to develop applications using opencdk
 Group:		Development/Libraries
 Requires:	%name = %version-%release
-Requires:	libgcrypt-devel zlib-devel
+Requires:	libgcrypt-devel zlib-devel pkgconfig
 
 
 %description
@@ -88,9 +88,14 @@
 %_includedir/*
 %_libdir/*.a
 %_libdir/*.so
+%_libdir/*/*.pc
 
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.5.11-1
+- updated to 0.5.11
+- added pkgconfig file
+
 * Fri Sep 15 2006 Enrico Scholz  - 0.5.9-1
 - updated to 0.5.9
 



From fedora-extras-commits at redhat.com  Sun Nov  5 20:29:52 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:29:52 -0700
Subject: rpms/opencdk/FC-6 sources,1.5,1.6 opencdk.spec,1.9,1.10
Message-ID: <200611052029.kA5KTqM7020283@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20224/FC-6

Modified Files:
	sources opencdk.spec 
Log Message:
- updated to 0.5.11
- added pkgconfig file



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencdk/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Sep 2006 18:01:04 -0000	1.5
+++ sources	5 Nov 2006 20:29:22 -0000	1.6
@@ -1,2 +1,2 @@
-7dd032032850719ccb6a75353e331f07  opencdk-0.5.9.tar.gz.sig
-b692c2dc2cedd1435e2a2ef3f5a2c708  opencdk-0.5.9.tar.gz
+de16f52a7f2215e3df9e81067ebae60d  opencdk-0.5.11.tar.gz
+6521460eb777c6fab25c71943e3b8d3e  opencdk-0.5.11.tar.gz.sig


Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/FC-6/opencdk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- opencdk.spec	15 Sep 2006 18:01:04 -0000	1.9
+++ opencdk.spec	5 Nov 2006 20:29:22 -0000	1.10
@@ -4,7 +4,7 @@
 
 Summary:	Provides basic parts of the OpenPGP message format
 Name:		opencdk
-Version:	0.5.9
+Version:	0.5.11
 Release:	%release_func 1
 
 License:	GPL
@@ -19,7 +19,7 @@
 Summary:	Files which are needed to develop applications using opencdk
 Group:		Development/Libraries
 Requires:	%name = %version-%release
-Requires:	libgcrypt-devel zlib-devel
+Requires:	libgcrypt-devel zlib-devel pkgconfig
 
 
 %description
@@ -88,9 +88,14 @@
 %_includedir/*
 %_libdir/*.a
 %_libdir/*.so
+%_libdir/*/*.pc
 
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.5.11-1
+- updated to 0.5.11
+- added pkgconfig file
+
 * Fri Sep 15 2006 Enrico Scholz  - 0.5.9-1
 - updated to 0.5.9
 



From fedora-extras-commits at redhat.com  Sun Nov  5 20:29:57 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 5 Nov 2006 13:29:57 -0700
Subject: rpms/opencdk/FC-5 sources,1.5,1.6 opencdk.spec,1.9,1.10
Message-ID: <200611052029.kA5KTvMx020289@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/opencdk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20224/FC-5

Modified Files:
	sources opencdk.spec 
Log Message:
- updated to 0.5.11
- added pkgconfig file



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencdk/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Sep 2006 18:01:03 -0000	1.5
+++ sources	5 Nov 2006 20:29:27 -0000	1.6
@@ -1,2 +1,2 @@
-7dd032032850719ccb6a75353e331f07  opencdk-0.5.9.tar.gz.sig
-b692c2dc2cedd1435e2a2ef3f5a2c708  opencdk-0.5.9.tar.gz
+de16f52a7f2215e3df9e81067ebae60d  opencdk-0.5.11.tar.gz
+6521460eb777c6fab25c71943e3b8d3e  opencdk-0.5.11.tar.gz.sig


Index: opencdk.spec
===================================================================
RCS file: /cvs/extras/rpms/opencdk/FC-5/opencdk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- opencdk.spec	15 Sep 2006 18:01:03 -0000	1.9
+++ opencdk.spec	5 Nov 2006 20:29:27 -0000	1.10
@@ -4,7 +4,7 @@
 
 Summary:	Provides basic parts of the OpenPGP message format
 Name:		opencdk
-Version:	0.5.9
+Version:	0.5.11
 Release:	%release_func 1
 
 License:	GPL
@@ -19,7 +19,7 @@
 Summary:	Files which are needed to develop applications using opencdk
 Group:		Development/Libraries
 Requires:	%name = %version-%release
-Requires:	libgcrypt-devel zlib-devel
+Requires:	libgcrypt-devel zlib-devel pkgconfig
 
 
 %description
@@ -88,9 +88,14 @@
 %_includedir/*
 %_libdir/*.a
 %_libdir/*.so
+%_libdir/*/*.pc
 
 
 %changelog
+* Sun Nov  5 2006 Enrico Scholz  - 0.5.11-1
+- updated to 0.5.11
+- added pkgconfig file
+
 * Fri Sep 15 2006 Enrico Scholz  - 0.5.9-1
 - updated to 0.5.9
 



From fedora-extras-commits at redhat.com  Sun Nov  5 21:28:31 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Sun, 5 Nov 2006 14:28:31 -0700
Subject: comps comps-fe5.xml.in, 1.190, 1.191 comps-fe6.xml.in, 1.214,
	1.215 comps-fe7.xml.in, 1.12, 1.13
Message-ID: <200611052128.kA5LSVEw023629@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23609/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- comps-fe5.xml.in	4 Nov 2006 12:04:12 -0000	1.190
+++ comps-fe5.xml.in	5 Nov 2006 21:28:01 -0000	1.191
@@ -236,7 +236,7 @@
       galculator
       gdl
       geant321
-      genius	
+      genius
       ghdl
       gnucap
       gpredict
@@ -249,6 +249,7 @@
       hmmer
       kicad
       kst
+      ktechlab
       lagan
       lapack
       libctl
@@ -276,6 +277,7 @@
       scrip
       sextractor
       SIBsim4
+      toped
       wcstools
       xdrawchem
     


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- comps-fe6.xml.in	4 Nov 2006 12:04:12 -0000	1.214
+++ comps-fe6.xml.in	5 Nov 2006 21:28:01 -0000	1.215
@@ -273,7 +273,7 @@
       galculator
       gdl
       geant321
-      genius	
+      genius
       geda-docs
       geda-gattrib
       geda-gnetlist
@@ -295,6 +295,7 @@
       kicad
       kpolynome
       kst
+      ktechlab
       lagan
       lapack
       libctl
@@ -324,6 +325,7 @@
       scrip
       sextractor
       SIBsim4
+      toped
       veusz
       wcstools
       xcircuit


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- comps-fe7.xml.in	4 Nov 2006 12:04:12 -0000	1.12
+++ comps-fe7.xml.in	5 Nov 2006 21:28:01 -0000	1.13
@@ -273,7 +273,7 @@
       galculator
       gdl
       geant321
-      genius	
+      genius
       geda-docs
       geda-gattrib
       geda-gnetlist
@@ -295,6 +295,7 @@
       kicad
       kpolynome
       kst
+      ktechlab
       lagan
       lapack
       libctl
@@ -324,6 +325,7 @@
       scrip
       sextractor
       SIBsim4
+      toped
       veusz
       wcstools
       xcircuit



From fedora-extras-commits at redhat.com  Sun Nov  5 21:40:35 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sun, 5 Nov 2006 14:40:35 -0700
Subject: rpms/abiword/FC-4 .cvsignore, 1.12, 1.13 abiword.spec, 1.27,
	1.28 sources, 1.12, 1.13
Message-ID: <200611052140.kA5LeZYv023780@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23756

Modified Files:
	.cvsignore abiword.spec sources 
Log Message:
Update to 2.4.6




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Jul 2006 17:35:22 -0000	1.12
+++ .cvsignore	5 Nov 2006 21:40:05 -0000	1.13
@@ -1 +1 @@
-abiword-2.4.5.tar.bz2
+abiword-2.4.6.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- abiword.spec	16 Jul 2006 11:30:07 -0000	1.27
+++ abiword.spec	5 Nov 2006 21:40:05 -0000	1.28
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.5
-Release: 2%{?dist}
+Version: 2.4.6
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -136,6 +136,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sun Nov 05 2006 Marc Maurer  - 1:2.4.6-1.fc4
+- Update to 2.4.6
+
 * Sun Jul 16 2006 Marc Maurer  - 1:2.4.5-2.fc4
 - Fix http://bugzilla.abisource.com/show_bug.cgi?id=10229
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Jul 2006 17:35:22 -0000	1.12
+++ sources	5 Nov 2006 21:40:05 -0000	1.13
@@ -1 +1 @@
-e018669a154164d31c768f773a1c95b4  abiword-2.4.5.tar.bz2
+8ed5fb282b9741aca75b9e47500d39a1  abiword-2.4.6.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov  5 21:53:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sun, 5 Nov 2006 14:53:47 -0700
Subject: rpms/xaos/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xaos.spec, 1.3,
	1.4
Message-ID: <200611052153.kA5LrlWJ023886@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/xaos/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23864

Modified Files:
	.cvsignore sources xaos.spec 
Log Message:
new version 3.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xaos/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2006 16:06:21 -0000	1.2
+++ .cvsignore	5 Nov 2006 21:53:17 -0000	1.3
@@ -1 +1 @@
-XaoS-3.2.1.tar.gz
+XaoS-3.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xaos/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2006 16:06:21 -0000	1.2
+++ sources	5 Nov 2006 21:53:17 -0000	1.3
@@ -1 +1 @@
-8df634737b276f9f172060f3ffc489be  XaoS-3.2.1.tar.gz
+bd347d6be1ff7e4f7a81975d82c36921  XaoS-3.2.2.tar.gz


Index: xaos.spec
===================================================================
RCS file: /cvs/extras/rpms/xaos/FC-6/xaos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xaos.spec	28 Aug 2006 11:00:25 -0000	1.3
+++ xaos.spec	5 Nov 2006 21:53:17 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           xaos
-Version:        3.2.1
-Release:        4%{?dist}
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        A fast, portable real-time interactive fractal zoomer
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://xaos.sourceforge.net
-Source0:        http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.1.tar.gz
+Source0:        http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.2.tar.gz
 Source1:	xaos.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  slang-devel
@@ -39,7 +39,7 @@
 
 
 %prep
-%setup0 -q -n XaoS-%{version}
+%setup0 -q -n XaoS
 # disable stripping binaries when installing
 sed -i 's| -s | |' Makefile.in
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Gerard Milmeister  - 3.2.2-1
+- new version 3.2.2
+
 * Mon Aug 28 2006 Gerard Milmeister  - 3.2.1-4
 - Rebuild for FE6
 - added BR: gettext



From fedora-extras-commits at redhat.com  Sun Nov  5 22:09:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sun, 5 Nov 2006 15:09:33 -0700
Subject: rpms/mediawiki/devel mediawiki.spec,1.8,1.9
Message-ID: <200611052209.kA5M9X5C026899@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26883

Modified Files:
	mediawiki.spec 
Log Message:
Forward-port changes for FC-6.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mediawiki.spec	14 Oct 2006 09:35:59 -0000	1.8
+++ mediawiki.spec	5 Nov 2006 22:09:03 -0000	1.9
@@ -1,24 +1,24 @@
 %define wikidir %{_var}/www/mediawiki
 
-Name:           mediawiki
-Version:        1.8.2
-Release:        4%{?dist}
-Summary:        The PHP-based wiki software behind Wikipedia
-
-Group:          Applications/Internet
-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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:       httpd
-Requires:       php >= 4.1.2
-Requires:	php-mysql
-Requires:	php-gd, diffutils, ImageMagick
+Name: mediawiki
+Version: 1.8.2
+Release: 5%{?dist}
+Summary: A wiki engine
+
+Group: Applications/Internet
+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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Requires: httpd
+Requires: php >= 5
+Requires: php-mysql
+Requires: php-gd, diffutils, ImageMagick
 # to make sure the "apache" group is created before mediawiki is installed
-Requires(pre):  httpd
+Requires(pre): httpd
 
 %description
 MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and
@@ -30,12 +30,12 @@
 
 
 %package math
-Summary:        Mathematical formula support for MediaWiki
-Group:          Applications/Internet
+Summary: Mathematical formula support for MediaWiki
+Group: Applications/Internet
 
-BuildRequires:  ocaml
-Requires:	mediawiki = %{version}-%{release}
-Requires:       ImageMagick tetex-latex tetex-dvips
+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.
@@ -50,22 +50,22 @@
 
 %build
 cd math
-make %{?_smp_mflags}
+make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{wikidir}
-cp -pr config extensions images includes languages $RPM_BUILD_ROOT%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.*  $RPM_BUILD_ROOT%{wikidir}
-%{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl
-
-install -d $RPM_BUILD_ROOT%{wikidir}/math
-install math/texvc $RPM_BUILD_ROOT%{wikidir}/math
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+rm -rf %{buildroot}
+install -d %{buildroot}%{wikidir}
+cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir}
+cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+%{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
+
+install -d %{buildroot}%{wikidir}/math
+install math/texvc %{buildroot}%{wikidir}/math
+install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -90,6 +90,11 @@
 
 
 %changelog
+* Thu Nov 2 2006 Axel Thimm  - 1.8.2-5
+- Fix depenencies, add versions.
+- Add missing *.php files.
+- Cosmetic changes.
+
 * Sat Oct 14 2006 Axel Thimm  - 1.8.2-4
 - Update to 1.8.2.
 
@@ -111,7 +116,7 @@
 
 * Mon Feb 06 2006 Roozbeh Pournader  - 1.5.6-5
 - Put internal doc files in the right directory, renaming it
-  back to docs (#180177)
+ back to docs (#180177)
 
 * Sat Feb 04 2006 Roozbeh Pournader  - 1.5.6-4
 - Use Requires(pre) instead of PreReq (Mike McGrath)



From fedora-extras-commits at redhat.com  Sun Nov  5 22:42:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sun, 5 Nov 2006 15:42:30 -0700
Subject: rpms/xaos/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xaos.spec,
	1.3, 1.4
Message-ID: <200611052242.kA5MgUwp027159@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/xaos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27118/devel

Modified Files:
	.cvsignore sources xaos.spec 
Log Message:
new version 3.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xaos/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2006 16:06:21 -0000	1.2
+++ .cvsignore	5 Nov 2006 22:41:59 -0000	1.3
@@ -1 +1 @@
-XaoS-3.2.1.tar.gz
+XaoS-3.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xaos/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2006 16:06:21 -0000	1.2
+++ sources	5 Nov 2006 22:41:59 -0000	1.3
@@ -1 +1 @@
-8df634737b276f9f172060f3ffc489be  XaoS-3.2.1.tar.gz
+bd347d6be1ff7e4f7a81975d82c36921  XaoS-3.2.2.tar.gz


Index: xaos.spec
===================================================================
RCS file: /cvs/extras/rpms/xaos/devel/xaos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xaos.spec	28 Aug 2006 11:00:25 -0000	1.3
+++ xaos.spec	5 Nov 2006 22:41:59 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           xaos
-Version:        3.2.1
-Release:        4%{?dist}
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        A fast, portable real-time interactive fractal zoomer
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://xaos.sourceforge.net
-Source0:        http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.1.tar.gz
+Source0:        http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.2.tar.gz
 Source1:	xaos.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  slang-devel
@@ -39,7 +39,7 @@
 
 
 %prep
-%setup0 -q -n XaoS-%{version}
+%setup0 -q -n XaoS
 # disable stripping binaries when installing
 sed -i 's| -s | |' Makefile.in
 
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Gerard Milmeister  - 3.2.2-1
+- new version 3.2.2
+
 * Mon Aug 28 2006 Gerard Milmeister  - 3.2.1-4
 - Rebuild for FE6
 - added BR: gettext



From fedora-extras-commits at redhat.com  Sun Nov  5 22:42:29 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sun, 5 Nov 2006 15:42:29 -0700
Subject: rpms/xaos/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xaos.spec, 1.2,
	1.3
Message-ID: <200611052242.kA5MgT7R027154@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/xaos/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27118/FC-5

Modified Files:
	.cvsignore sources xaos.spec 
Log Message:
new version 3.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xaos/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2006 16:06:21 -0000	1.2
+++ .cvsignore	5 Nov 2006 22:41:58 -0000	1.3
@@ -1 +1 @@
-XaoS-3.2.1.tar.gz
+XaoS-3.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xaos/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2006 16:06:21 -0000	1.2
+++ sources	5 Nov 2006 22:41:58 -0000	1.3
@@ -1 +1 @@
-8df634737b276f9f172060f3ffc489be  XaoS-3.2.1.tar.gz
+bd347d6be1ff7e4f7a81975d82c36921  XaoS-3.2.2.tar.gz


Index: xaos.spec
===================================================================
RCS file: /cvs/extras/rpms/xaos/FC-5/xaos.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xaos.spec	10 Jun 2006 17:04:33 -0000	1.2
+++ xaos.spec	5 Nov 2006 22:41:58 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           xaos
-Version:        3.2.1
-Release:        3%{?dist}
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        A fast, portable real-time interactive fractal zoomer
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://xaos.sourceforge.net
-Source0:        http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.1.tar.gz
+Source0:        http://puzzle.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.2.tar.gz
 Source1:	xaos.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  slang-devel
@@ -24,6 +24,7 @@
 BuildRequires:	texinfo
 BuildRequires:	texinfo-tex
 BuildRequires:  desktop-file-utils
+BuildRequires:	gettext
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -38,7 +39,7 @@
 
 
 %prep
-%setup0 -q -n XaoS-%{version}
+%setup0 -q -n XaoS
 # disable stripping binaries when installing
 sed -i 's| -s | |' Makefile.in
 
@@ -119,6 +120,13 @@
 
 
 %changelog
+* Sun Nov  5 2006 Gerard Milmeister  - 3.2.2-1
+- new version 3.2.2
+
+* Mon Aug 28 2006 Gerard Milmeister  - 3.2.1-4
+- Rebuild for FE6
+- added BR: gettext
+
 * Sat Jun 10 2006 Gerard Milmeister  - 3.2.1-3
 - disabled stripping of binaries
 



From fedora-extras-commits at redhat.com  Sun Nov  5 22:47:39 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 5 Nov 2006 15:47:39 -0700
Subject: rpms/drivel/FC-3 drivel.spec,1.7,1.8
Message-ID: <200611052247.kA5MldQj027302@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/drivel/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27279

Modified Files:
	drivel.spec 
Log Message:
Rebuild against new libcurl (devel only)


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-3/drivel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- drivel.spec	2 Sep 2006 17:01:55 -0000	1.7
+++ drivel.spec	5 Nov 2006 22:47:09 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: A journal or "blog" client
 Name: drivel
 Version: 2.1.0
-Release: 0.3.%{cvsdate}cvs%{?dist}
+Release: 0.4.%{cvsdate}cvs%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
@@ -120,6 +120,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Nov  5 2006 Paul W. Frields  - 2.1.0-0.4.20060527cvs
+- Rebuild against new libcurl
+
 * Sat Sep  2 2006 Paul W. Frields  - 2.1.0-0.3.20060527cvs
 - Add BuildRequires: intltool for build system happiness
 - Bump release for FC6 mass rebuild



From fedora-extras-commits at redhat.com  Sun Nov  5 22:48:16 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 5 Nov 2006 15:48:16 -0700
Subject: rpms/drivel/FC-4 drivel.spec,1.7,1.8
Message-ID: <200611052248.kA5MmGWk027358@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/drivel/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27337

Modified Files:
	drivel.spec 
Log Message:
Rebuild against new libcurl (devel only)


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-4/drivel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- drivel.spec	2 Sep 2006 17:01:59 -0000	1.7
+++ drivel.spec	5 Nov 2006 22:47:46 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: A journal or "blog" client
 Name: drivel
 Version: 2.1.0
-Release: 0.3.%{cvsdate}cvs%{?dist}
+Release: 0.4.%{cvsdate}cvs%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
@@ -120,6 +120,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Nov  5 2006 Paul W. Frields  - 2.1.0-0.4.20060527cvs
+- Rebuild against new libcurl
+
 * Sat Sep  2 2006 Paul W. Frields  - 2.1.0-0.3.20060527cvs
 - Add BuildRequires: intltool for build system happiness
 - Bump release for FC6 mass rebuild



From fedora-extras-commits at redhat.com  Sun Nov  5 22:48:54 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 5 Nov 2006 15:48:54 -0700
Subject: rpms/drivel/FC-5 drivel.spec,1.7,1.8
Message-ID: <200611052248.kA5MmsGH027483@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/drivel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27393

Modified Files:
	drivel.spec 
Log Message:
Rebuild against new libcurl (devel only)


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-5/drivel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- drivel.spec	2 Sep 2006 17:02:00 -0000	1.7
+++ drivel.spec	5 Nov 2006 22:48:23 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: A journal or "blog" client
 Name: drivel
 Version: 2.1.0
-Release: 0.3.%{cvsdate}cvs%{?dist}
+Release: 0.4.%{cvsdate}cvs%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
@@ -120,6 +120,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Nov  5 2006 Paul W. Frields  - 2.1.0-0.4.20060527cvs
+- Rebuild against new libcurl
+
 * Sat Sep  2 2006 Paul W. Frields  - 2.1.0-0.3.20060527cvs
 - Add BuildRequires: intltool for build system happiness
 - Bump release for FC6 mass rebuild



From fedora-extras-commits at redhat.com  Sun Nov  5 22:49:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 5 Nov 2006 15:49:08 -0700
Subject: rpms/asymptote/FC-4 .cvsignore, 1.11, 1.12 asymptote.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200611052249.kA5Mn8Cp027536@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27417/FC-4

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.18.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Nov 2006 17:38:51 -0000	1.11
+++ .cvsignore	5 Nov 2006 22:48:38 -0000	1.12
@@ -1 +1 @@
-asymptote-1.17.tar.gz
+asymptote-1.18.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/asymptote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- asymptote.spec	1 Nov 2006 17:38:51 -0000	1.12
+++ asymptote.spec	5 Nov 2006 22:48:38 -0000	1.13
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.17
+Version:        1.18
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Jose Pedro Oliveira  - 1.18-1
+- Update to 1.18.
+
 * Wed Nov  1 2006 Jose Pedro Oliveira  - 1.17-1
 - Update to 1.17.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Nov 2006 17:38:51 -0000	1.11
+++ sources	5 Nov 2006 22:48:38 -0000	1.12
@@ -1 +1 @@
-6fee58869caf0bdc89da24978af8f1d6  asymptote-1.17.tar.gz
+00006bb1bb3a17bfca322dfa38ce0520  asymptote-1.18.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 22:49:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 5 Nov 2006 15:49:09 -0700
Subject: rpms/asymptote/FC-5 .cvsignore, 1.11, 1.12 asymptote.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200611052249.kA5Mn9hw027541@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27417/FC-5

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.18.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Nov 2006 17:38:52 -0000	1.11
+++ .cvsignore	5 Nov 2006 22:48:38 -0000	1.12
@@ -1 +1 @@
-asymptote-1.17.tar.gz
+asymptote-1.18.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/asymptote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- asymptote.spec	1 Nov 2006 17:38:52 -0000	1.12
+++ asymptote.spec	5 Nov 2006 22:48:38 -0000	1.13
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.17
+Version:        1.18
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Jose Pedro Oliveira  - 1.18-1
+- Update to 1.18.
+
 * Wed Nov  1 2006 Jose Pedro Oliveira  - 1.17-1
 - Update to 1.17.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Nov 2006 17:38:52 -0000	1.11
+++ sources	5 Nov 2006 22:48:38 -0000	1.12
@@ -1 +1 @@
-6fee58869caf0bdc89da24978af8f1d6  asymptote-1.17.tar.gz
+00006bb1bb3a17bfca322dfa38ce0520  asymptote-1.18.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 22:49:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 5 Nov 2006 15:49:14 -0700
Subject: rpms/asymptote/FC-6 .cvsignore, 1.11, 1.12 asymptote.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200611052249.kA5MnE8N027546@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27417/FC-6

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.18.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Nov 2006 17:38:57 -0000	1.11
+++ .cvsignore	5 Nov 2006 22:48:44 -0000	1.12
@@ -1 +1 @@
-asymptote-1.17.tar.gz
+asymptote-1.18.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/asymptote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- asymptote.spec	1 Nov 2006 17:38:57 -0000	1.12
+++ asymptote.spec	5 Nov 2006 22:48:44 -0000	1.13
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.17
+Version:        1.18
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Jose Pedro Oliveira  - 1.18-1
+- Update to 1.18.
+
 * Wed Nov  1 2006 Jose Pedro Oliveira  - 1.17-1
 - Update to 1.17.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Nov 2006 17:38:57 -0000	1.11
+++ sources	5 Nov 2006 22:48:44 -0000	1.12
@@ -1 +1 @@
-6fee58869caf0bdc89da24978af8f1d6  asymptote-1.17.tar.gz
+00006bb1bb3a17bfca322dfa38ce0520  asymptote-1.18.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 22:49:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 5 Nov 2006 15:49:15 -0700
Subject: rpms/asymptote/devel .cvsignore, 1.11, 1.12 asymptote.spec, 1.12,
	1.13 sources, 1.11, 1.12
Message-ID: <200611052249.kA5MnFNU027551@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/asymptote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27417/devel

Modified Files:
	.cvsignore asymptote.spec sources 
Log Message:
Update to 1.18.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Nov 2006 17:38:58 -0000	1.11
+++ .cvsignore	5 Nov 2006 22:48:45 -0000	1.12
@@ -1 +1 @@
-asymptote-1.17.tar.gz
+asymptote-1.18.tar.gz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- asymptote.spec	1 Nov 2006 17:38:58 -0000	1.12
+++ asymptote.spec	5 Nov 2006 22:48:45 -0000	1.13
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.17
+Version:        1.18
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Sun Nov  5 2006 Jose Pedro Oliveira  - 1.18-1
+- Update to 1.18.
+
 * Wed Nov  1 2006 Jose Pedro Oliveira  - 1.17-1
 - Update to 1.17.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Nov 2006 17:38:58 -0000	1.11
+++ sources	5 Nov 2006 22:48:45 -0000	1.12
@@ -1 +1 @@
-6fee58869caf0bdc89da24978af8f1d6  asymptote-1.17.tar.gz
+00006bb1bb3a17bfca322dfa38ce0520  asymptote-1.18.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov  5 22:49:31 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 5 Nov 2006 15:49:31 -0700
Subject: rpms/drivel/FC-6 drivel.spec,1.7,1.8
Message-ID: <200611052249.kA5MnVCT027588@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/drivel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27518

Modified Files:
	drivel.spec 
Log Message:
Rebuild against new libcurl (devel only)


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/FC-6/drivel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- drivel.spec	2 Sep 2006 17:01:47 -0000	1.7
+++ drivel.spec	5 Nov 2006 22:49:01 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: A journal or "blog" client
 Name: drivel
 Version: 2.1.0
-Release: 0.3.%{cvsdate}cvs%{?dist}
+Release: 0.4.%{cvsdate}cvs%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
@@ -120,6 +120,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Nov  5 2006 Paul W. Frields  - 2.1.0-0.4.20060527cvs
+- Rebuild against new libcurl
+
 * Sat Sep  2 2006 Paul W. Frields  - 2.1.0-0.3.20060527cvs
 - Add BuildRequires: intltool for build system happiness
 - Bump release for FC6 mass rebuild



From fedora-extras-commits at redhat.com  Sun Nov  5 22:50:08 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 5 Nov 2006 15:50:08 -0700
Subject: rpms/drivel/devel drivel.spec,1.7,1.8
Message-ID: <200611052250.kA5Mo8qI027648@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/drivel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27628

Modified Files:
	drivel.spec 
Log Message:
Rebuild against new libcurl (devel only)


Index: drivel.spec
===================================================================
RCS file: /cvs/extras/rpms/drivel/devel/drivel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- drivel.spec	2 Sep 2006 17:01:47 -0000	1.7
+++ drivel.spec	5 Nov 2006 22:49:38 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: A journal or "blog" client
 Name: drivel
 Version: 2.1.0
-Release: 0.3.%{cvsdate}cvs%{?dist}
+Release: 0.4.%{cvsdate}cvs%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
@@ -120,6 +120,9 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Nov  5 2006 Paul W. Frields  - 2.1.0-0.4.20060527cvs
+- Rebuild against new libcurl
+
 * Sat Sep  2 2006 Paul W. Frields  - 2.1.0-0.3.20060527cvs
 - Add BuildRequires: intltool for build system happiness
 - Bump release for FC6 mass rebuild



From fedora-extras-commits at redhat.com  Mon Nov  6 02:36:57 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 5 Nov 2006 19:36:57 -0700
Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.34,1.35
Message-ID: <200611060236.kA62avMW008479@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8461

Modified Files:
	deskbar-applet.spec 
Log Message:
add gnome-python2-devel to BR


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- deskbar-applet.spec	1 Nov 2006 18:04:12 -0000	1.34
+++ deskbar-applet.spec	6 Nov 2006 02:36:26 -0000	1.35
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.16.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -16,7 +16,7 @@
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
 BuildRequires:  libSM-devel gnome-python2-applet desktop-file-utils
-BuildRequires:	perl(XML::Parser) gnome-python2
+BuildRequires:	perl(XML::Parser) gnome-python2-devel
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo
 Requires:       gnome-python2-gconf pygtk2 gnome-python2-libwnck
 Requires(pre):  GConf2
@@ -91,6 +91,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sun Nov  5 2006 Luke Macken  - 2.16-1-3
+- Add gnome-python2-devel to BR
+
 * Wed Nov  1 2006 Luke Macken  - 2.16.1-2
 - Add gnome-python2 to BuildRequires
 



From fedora-extras-commits at redhat.com  Mon Nov  6 03:50:39 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun,  5 Nov 2006 20:50:39 -0700
Subject: fedora-updates-system README,1.1,1.2
Message-ID: <200611060350.kA63odwl012236@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-updates-system
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12218

Modified Files:
	README 
Log Message:
test


Index: README
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README	22 Oct 2006 23:43:55 -0000	1.1
+++ README	6 Nov 2006 03:50:36 -0000	1.2
@@ -0,0 +1,2 @@
+
+



From fedora-extras-commits at redhat.com  Mon Nov  6 03:56:40 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  5 Nov 2006 20:56:40 -0700
Subject: fedora-updates-system dev.cfg, NONE, 1.1 sample-prod.cfg, NONE,
	1.1 setup.py, NONE, 1.1 start-updatessystem.py, NONE,
	1.1 README, 1.2, 1.3
Message-ID: <200611060356.kA63ueDB012335@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12305

Modified Files:
	README 
Added Files:
	dev.cfg sample-prod.cfg setup.py start-updatessystem.py 
Log Message:
Initial import


--- NEW FILE dev.cfg ---
[global]
# This is where all of your settings go for your development environment
# Settings that are the same for both development and production
# (such as template engine, encodings, etc.) all go in 
# updatessystem/config/app.cfg

# DATABASE

# pick the form for your database
# sqlobject.dburi="postgres://username at hostname/databasename"
# sqlobject.dburi="mysql://username:password at hostname:port/databasename"
# sqlobject.dburi="sqlite:///file_name_and_path"

# If you have sqlite, here's a simple default to get you started
# in development
sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite"


# if you are using a database or table type without transactions
# (MySQL default, for example), you should turn off transactions
# by prepending notrans_ on the uri
# sqlobject.dburi="notrans_mysql://username:password at hostname:port/databasename"

# for Windows users, sqlite URIs look like:
# sqlobject.dburi="sqlite:///drive_letter:/path/to/file"

# SERVER

# Some server parameters that you may want to tweak
# server.socket_port=6543

# Enable the debug output at the end on pages.
# log_debug_info_filter.on = False

server.environment="development"
autoreload.package="updatessystem"

# session_filter.on = True

# Set to True if you'd like to abort execution if a controller gets an
# unexpected parameter. False by default
tg.strict_parameters = True

# LOGGING
# Logging configuration generally follows the style of the standard
# Python logging module configuration. Note that when specifying
# log format messages, you need to use *() for formatting variables.
# Deployment independent log configuration is in updatessystem/config/log.cfg
[logging]

[[loggers]]
[[[updatessystem]]]
level='DEBUG'
qualname='updatessystem'
handlers=['debug_out']

[[[allinfo]]]
level='INFO'
handlers=['debug_out']

[[[access]]]
level='INFO'
qualname='turbogears.access'
handlers=['access_out']
propagate=0


--- NEW FILE sample-prod.cfg ---
[global]
# This is where all of your settings go for your production environment.
# You'll copy this file over to your production server and provide it
# as a command-line option to your start script.
# Settings that are the same for both development and production
# (such as template engine, encodings, etc.) all go in 
# updatessystem/config/app.cfg

# pick the form for your database
# sqlobject.dburi="postgres://username at hostname/databasename"
# sqlobject.dburi="mysql://username:password at hostname:port/databasename"
# sqlobject.dburi="sqlite:///file_name_and_path"

# If you have sqlite, here's a simple default to get you started
# in development
sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite"


# if you are using a database or table type without transactions
# (MySQL default, for example), you should turn off transactions
# by prepending notrans_ on the uri
# sqlobject.dburi="notrans_mysql://username:password at hostname:port/databasename"

# for Windows users, sqlite URIs look like:
# sqlobject.dburi="sqlite:///drive_letter:/path/to/file"


# SERVER

server.environment="production"

# Sets the number of threads the server uses
# server.thread_pool = 1

# if this is part of a larger site, you can set the path
# to the TurboGears instance here
# server.webpath=""

# session_filter.on = True

# Set to True if you'd like to abort execution if a controller gets an
# unexpected parameter. False by default
# tg.strict_parameters = False

# LOGGING
# Logging configuration generally follows the style of the standard
# Python logging module configuration. Note that when specifying
# log format messages, you need to use *() for formatting variables.
# Deployment independent log configuration is in updatessystem/config/log.cfg
[logging]

[[handlers]]

[[[access_out]]]
# set the filename as the first argument below
args="('server.log',)"
class='FileHandler'
level='INFO'
formatter='message_only'

[[loggers]]
[[[updatessystem]]]
level='ERROR'
qualname='updatessystem'
handlers=['error_out']

[[[access]]]
level='INFO'
qualname='turbogears.access'
handlers=['access_out']
propagate=0


--- NEW FILE setup.py ---
from setuptools import setup, find_packages
from turbogears.finddata import find_package_data

import os
execfile(os.path.join("updatessystem", "release.py"))

setup(
    name="Fedora-Updates-System",
    version=version,
    
    # uncomment the following lines if you fill them out in release.py
    #description=description,
    #author=author,
    #author_email=email,
    #url=url,
    #download_url=download_url,
    #license=license,
    
    install_requires = [
        "TurboGears >= 1.0b1",
    ],
    scripts = ["start-updatessystem.py"],
    zip_safe=False,
    packages=find_packages(),
    package_data = find_package_data(where='updatessystem',
                                     package='updatessystem'),
    keywords = [
        # Use keywords if you'll be adding your package to the
        # Python Cheeseshop
        
        # if this has widgets, uncomment the next line
        # 'turbogears.widgets',
        
        # if this has a tg-admin command, uncomment the next line
        # 'turbogears.command',
        
        # if this has identity providers, uncomment the next line
        # 'turbogears.identity.provider',
    
        # If this is a template plugin, uncomment the next line
        # 'python.templating.engines',
        
        # If this is a full application, uncomment the next line
        # 'turbogears.app',
    ],
    classifiers = [
        'Development Status :: 3 - Alpha',
        'Operating System :: OS Independent',
        'Programming Language :: Python',
        'Topic :: Software Development :: Libraries :: Python Modules',
        'Framework :: TurboGears',
        # if this is an application that you'll distribute through
        # the Cheeseshop, uncomment the next line
        # 'Framework :: TurboGears :: Applications',
        
        # if this is a package that includes widgets that you'll distribute
        # through the Cheeseshop, uncomment the next line
        # 'Framework :: TurboGears :: Widgets',
    ],
    test_suite = 'nose.collector',
    )
    


--- NEW FILE start-updatessystem.py ---
#!/usr/bin/python
import pkg_resources
pkg_resources.require("TurboGears")

import turbogears
import cherrypy
cherrypy.lowercase_api = True

from os.path import *
import sys

# first look on the command line for a desired config file,
# if it's not on the command line, then
# look for setup.py in this directory. If it's not there, this script is
# probably installed
if len(sys.argv) > 1:
    turbogears.update_config(configfile=sys.argv[1], 
        modulename="updatessystem.config")
elif exists(join(dirname(__file__), "setup.py")):
    turbogears.update_config(configfile="dev.cfg",
        modulename="updatessystem.config")
else:
    turbogears.update_config(configfile="prod.cfg",
        modulename="updatessystem.config")

from updatessystem.controllers import Root

turbogears.start_server(Root())


Index: README
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README	6 Nov 2006 03:50:36 -0000	1.2
+++ README	6 Nov 2006 03:56:37 -0000	1.3
@@ -1,2 +1,6 @@
+Fedora Updates System
+http://fedoraproject.org/wiki/Infrastructure/UpdatesSystem
+Luke Macken 
 
-
+NOTE: This project is still under heavy development and is not yet ready
+      for production.



From fedora-extras-commits at redhat.com  Mon Nov  6 09:07:49 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 02:07:49 -0700
Subject: rpms/audacious/devel audacious.spec,1.11,1.12
Message-ID: <200611060907.kA697n9G031821@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31754

Modified Files:
	audacious.spec 
Log Message:
- Rebuild because of the new curl
- Don't BuildRequire desktop-file-utils twice



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- audacious.spec	20 Oct 2006 07:24:45 -0000	1.11
+++ audacious.spec	6 Nov 2006 09:07:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -23,7 +23,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
-BuildRequires:  zlib-devel, desktop-file-utils, alsa-lib-devel
+BuildRequires:  zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel
 BuildRequires:  gnome-vfs2-devel, libglade2-devel >= 2.4, libsidplay-devel
 BuildRequires:  libmpcdec-devel, libmusicbrainz-devel, GConf2-devel
 BuildRequires:  taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2
@@ -31,7 +31,6 @@
 BuildRequires:  gettext, libsndfile-devel, curl-devel, libbinio-devel
 BuildRequires:  arts-devel, libmodplug-devel, lirc-devel
 BuildRequires:  jack-audio-connection-kit-devel, libsamplerate-devel
-BuildRequires:   desktop-file-utils >= 0.9
 
 Requires(post):  desktop-file-utils >= 0.9, /sbin/ldconfig
 Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
@@ -209,6 +208,10 @@
 
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  1.1.2-3.fc6
+- Rebuild because of the new curl
+- Don't BuildRequire desktop-file-utils twice
+
 * Wed Oct 18 2006 Ralf Ertzinger  1.1.2-2.fc6
 - Add Obsoletes/Provides for BMP
 



From fedora-extras-commits at redhat.com  Mon Nov  6 09:11:54 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 02:11:54 -0700
Subject: rpms/bzflag/devel bzflag.spec,1.28,1.29
Message-ID: <200611060911.kA69Bs52031961@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bzflag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31945

Modified Files:
	bzflag.spec 
Log Message:
- rebuild because of the new curl



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/devel/bzflag.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bzflag.spec	28 Aug 2006 13:40:35 -0000	1.28
+++ bzflag.spec	6 Nov 2006 09:11:24 -0000	1.29
@@ -16,7 +16,7 @@
 Summary: 3D multi-player tank battle game
 Name: bzflag
 Version: 2.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://bzflag.org
@@ -96,6 +96,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  2.0.8-4
+- rebuild because of the new curl
+
 * Mon Aug 28 2006 Nils Philippsen  2.0.8-3
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Mon Nov  6 09:58:52 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 02:58:52 -0700
Subject: rpms/centericq/devel centericq.spec,1.25,1.26
Message-ID: <200611060958.kA69wqDQ000781@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv709

Modified Files:
	centericq.spec 
Log Message:
- rebuild for the new curl



Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- centericq.spec	12 Sep 2006 07:12:22 -0000	1.25
+++ centericq.spec	6 Nov 2006 09:58:22 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -97,6 +97,9 @@
 %exclude %{_includedir}/msn
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy 
+- rebuild because of the new curl
+
 * Tue Sep 12 2006 Andreas Bierfert 
 4.21.0-8
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Mon Nov  6 10:00:43 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  6 Nov 2006 03:00:43 -0700
Subject: fedora-security/audit fc5,1.381,1.382 fc6,1.134,1.135
Message-ID: <200611061000.kA6A0h8i001011@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv983

Modified Files:
	fc5 fc6 
Log Message:
Update with weekend CVE mails



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- fc5	2 Nov 2006 19:07:24 -0000	1.381
+++ fc5	6 Nov 2006 10:00:40 -0000	1.382
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20061101
-Up to date FC5 as of 20061101
+Up to date CVE as of CVE email 20061105
+Up to date FC5 as of 20061105
 
 ** are items that need attention
 
+CVE-2006-5706 ** php, fixed 5.2.0
+CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- fc6	2 Nov 2006 19:07:24 -0000	1.134
+++ fc6	6 Nov 2006 10:00:40 -0000	1.135
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20061101
-Up to date FC6 as of 20061101
+Up to date CVE as of CVE email 20061105
+Up to date FC6 as of 20061105
 
 ** are items that need attention
 
+CVE-2006-5706 ** php, fixed 5.2.0
+CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]



From fedora-extras-commits at redhat.com  Mon Nov  6 10:52:14 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 6 Nov 2006 03:52:14 -0700
Subject: rpms/lighttpd/devel lighttpd.logrotate, 1.2, 1.3 lighttpd.spec, 1.29,
	1.30
Message-ID: <200611061052.kA6AqE2E007903@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7847/devel

Modified Files:
	lighttpd.logrotate lighttpd.spec 
Log Message:
Switch to using killall for log rotation to fix it when using workers.



Index: lighttpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lighttpd.logrotate	4 Apr 2005 19:31:33 -0000	1.2
+++ lighttpd.logrotate	6 Nov 2006 10:51:43 -0000	1.3
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-	/bin/kill -HUP `cat /var/run/lighttpd.pid 2>/dev/null` 2>/dev/null || :
+        /usr/bin/killall -HUP lighttpd &>/dev/null || :
     endscript
 }


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lighttpd.spec	16 Oct 2006 16:13:33 -0000	1.29
+++ lighttpd.spec	6 Nov 2006 10:51:43 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Matthias Saou  1.4.13-3
+- Switch to using killall for log rotation to fix it when using workers.
+
 * Mon Oct 16 2006 Matthias Saou  1.4.13-2
 - Remove gcc-c++ build req, it's part of the defaults.
 - Add readline-devel build req, needed on RHEL4.



From fedora-extras-commits at redhat.com  Mon Nov  6 10:52:12 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 6 Nov 2006 03:52:12 -0700
Subject: rpms/lighttpd/FC-5 lighttpd.logrotate, 1.2, 1.3 lighttpd.spec, 1.24,
	1.25
Message-ID: <200611061052.kA6AqC3h007895@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7847/FC-5

Modified Files:
	lighttpd.logrotate lighttpd.spec 
Log Message:
Switch to using killall for log rotation to fix it when using workers.



Index: lighttpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/lighttpd.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lighttpd.logrotate	4 Apr 2005 19:31:33 -0000	1.2
+++ lighttpd.logrotate	6 Nov 2006 10:51:41 -0000	1.3
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-	/bin/kill -HUP `cat /var/run/lighttpd.pid 2>/dev/null` 2>/dev/null || :
+        /usr/bin/killall -HUP lighttpd &>/dev/null || :
     endscript
 }


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/lighttpd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- lighttpd.spec	16 Oct 2006 13:45:57 -0000	1.24
+++ lighttpd.spec	6 Nov 2006 10:51:41 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.13
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -21,7 +21,8 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++
+BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: readline-devel
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
@@ -173,6 +174,13 @@
 
 
 %changelog
+* Mon Nov  6 2006 Matthias Saou  1.4.13-3
+- Switch to using killall for log rotation to fix it when using workers.
+
+* Mon Oct 16 2006 Matthias Saou  1.4.13-2
+- Remove gcc-c++ build req, it's part of the defaults.
+- Add readline-devel build req, needed on RHEL4.
+
 * Wed Oct 11 2006 Matthias Saou  1.4.13-1
 - Update to 1.4.13, which contains the previous fix.
 



From fedora-extras-commits at redhat.com  Mon Nov  6 10:52:13 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 6 Nov 2006 03:52:13 -0700
Subject: rpms/lighttpd/FC-6 lighttpd.logrotate, 1.2, 1.3 lighttpd.spec, 1.29,
	1.30
Message-ID: <200611061052.kA6AqDPk007899@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7847/FC-6

Modified Files:
	lighttpd.logrotate lighttpd.spec 
Log Message:
Switch to using killall for log rotation to fix it when using workers.



Index: lighttpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-6/lighttpd.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lighttpd.logrotate	4 Apr 2005 19:31:33 -0000	1.2
+++ lighttpd.logrotate	6 Nov 2006 10:51:43 -0000	1.3
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-	/bin/kill -HUP `cat /var/run/lighttpd.pid 2>/dev/null` 2>/dev/null || :
+        /usr/bin/killall -HUP lighttpd &>/dev/null || :
     endscript
 }


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-6/lighttpd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lighttpd.spec	16 Oct 2006 16:13:33 -0000	1.29
+++ lighttpd.spec	6 Nov 2006 10:51:43 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Matthias Saou  1.4.13-3
+- Switch to using killall for log rotation to fix it when using workers.
+
 * Mon Oct 16 2006 Matthias Saou  1.4.13-2
 - Remove gcc-c++ build req, it's part of the defaults.
 - Add readline-devel build req, needed on RHEL4.



From fedora-extras-commits at redhat.com  Mon Nov  6 11:06:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 6 Nov 2006 04:06:10 -0700
Subject: rpms/bluefish/devel bluefish.spec, 1.21, 1.22 sources, 1.8,
	1.9 .cvsignore, 1.8, 1.9
Message-ID: <200611061106.kA6B6Aki011215@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bluefish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11195

Modified Files:
	bluefish.spec sources .cvsignore 
Log Message:
update to 1.0.7
update download URL
don't add category X-Fedora in desktop files



Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bluefish.spec	29 Aug 2006 10:21:44 -0000	1.21
+++ bluefish.spec	6 Nov 2006 11:05:39 -0000	1.22
@@ -1,11 +1,11 @@
 Name:           bluefish
-Version:        1.0.5
-Release:        4%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        GTK2 web development application for experienced users
 Group:          Development/Tools
 License:        GPL
 URL:            http://bluefish.openoffice.nl/
-Source0:        http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2
+Source0:        http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  aspell-devel >= 0.5
 BuildRequires:  desktop-file-utils
@@ -39,11 +39,9 @@
 %find_lang %{name}
 /usr/bin/desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   %{buildroot}%{_datadir}/applications/bluefish.desktop
 /usr/bin/desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   %{buildroot}%{_datadir}/applications/bluefish-project.desktop
 
 %clean
@@ -71,6 +69,11 @@
 %{_mandir}/man1/bluefish.1*
 
 %changelog
+* Mon Nov  6 2006 Paul Howarth  - 1.0.7-1
+- update to 1.0.7
+- update download URL
+- don't add category X-Fedora in desktop files
+
 * Tue Aug 29 2006 Paul Howarth  - 1.0.5-4
 - rebuild for dynamic linking speedups (FE6)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluefish/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Feb 2006 11:46:25 -0000	1.8
+++ sources	6 Nov 2006 11:05:40 -0000	1.9
@@ -1 +1 @@
-26701c09d41e5dea987155cdc9d0ac94  bluefish-1.0.5.tar.bz2
+2c3b3c9c8f8e32b9473dfd879f216dea  bluefish-1.0.7.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Feb 2006 11:46:25 -0000	1.8
+++ .cvsignore	6 Nov 2006 11:05:40 -0000	1.9
@@ -1 +1 @@
-bluefish-1.0.5.tar.bz2
+bluefish-1.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov  6 11:31:45 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 6 Nov 2006 04:31:45 -0700
Subject: rpms/bluefish/FC-6 .cvsignore, 1.8, 1.9 bluefish.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <200611061131.kA6BVj14011552@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bluefish/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11530

Modified Files:
	.cvsignore bluefish.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Feb 2006 11:46:25 -0000	1.8
+++ .cvsignore	6 Nov 2006 11:31:14 -0000	1.9
@@ -1 +1 @@
-bluefish-1.0.5.tar.bz2
+bluefish-1.0.7.tar.bz2


Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-6/bluefish.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bluefish.spec	29 Aug 2006 10:21:44 -0000	1.21
+++ bluefish.spec	6 Nov 2006 11:31:14 -0000	1.22
@@ -1,11 +1,11 @@
 Name:           bluefish
-Version:        1.0.5
-Release:        4%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        GTK2 web development application for experienced users
 Group:          Development/Tools
 License:        GPL
 URL:            http://bluefish.openoffice.nl/
-Source0:        http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2
+Source0:        http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  aspell-devel >= 0.5
 BuildRequires:  desktop-file-utils
@@ -39,11 +39,9 @@
 %find_lang %{name}
 /usr/bin/desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   %{buildroot}%{_datadir}/applications/bluefish.desktop
 /usr/bin/desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   %{buildroot}%{_datadir}/applications/bluefish-project.desktop
 
 %clean
@@ -71,6 +69,11 @@
 %{_mandir}/man1/bluefish.1*
 
 %changelog
+* Mon Nov  6 2006 Paul Howarth  - 1.0.7-1
+- update to 1.0.7
+- update download URL
+- don't add category X-Fedora in desktop files
+
 * Tue Aug 29 2006 Paul Howarth  - 1.0.5-4
 - rebuild for dynamic linking speedups (FE6)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Feb 2006 11:46:25 -0000	1.8
+++ sources	6 Nov 2006 11:31:14 -0000	1.9
@@ -1 +1 @@
-26701c09d41e5dea987155cdc9d0ac94  bluefish-1.0.5.tar.bz2
+2c3b3c9c8f8e32b9473dfd879f216dea  bluefish-1.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov  6 11:32:47 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 6 Nov 2006 04:32:47 -0700
Subject: rpms/bluefish/FC-5 .cvsignore, 1.8, 1.9 bluefish.spec, 1.19,
	1.20 sources, 1.8, 1.9
Message-ID: <200611061132.kA6BWlRr011621@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bluefish/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11596

Modified Files:
	.cvsignore bluefish.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Feb 2006 11:46:25 -0000	1.8
+++ .cvsignore	6 Nov 2006 11:32:17 -0000	1.9
@@ -1 +1 @@
-bluefish-1.0.5.tar.bz2
+bluefish-1.0.7.tar.bz2


Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-5/bluefish.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bluefish.spec	22 May 2006 07:45:30 -0000	1.19
+++ bluefish.spec	6 Nov 2006 11:32:17 -0000	1.20
@@ -1,11 +1,11 @@
 Name:           bluefish
-Version:        1.0.5
-Release:        3%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        GTK2 web development application for experienced users
 Group:          Development/Tools
 License:        GPL
 URL:            http://bluefish.openoffice.nl/
-Source0:        http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2
+Source0:        http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  aspell-devel >= 0.5
 BuildRequires:  desktop-file-utils
@@ -39,11 +39,9 @@
 %find_lang %{name}
 /usr/bin/desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   %{buildroot}%{_datadir}/applications/bluefish.desktop
 /usr/bin/desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   %{buildroot}%{_datadir}/applications/bluefish-project.desktop
 
 %clean
@@ -71,6 +69,14 @@
 %{_mandir}/man1/bluefish.1*
 
 %changelog
+* Mon Nov  6 2006 Paul Howarth  - 1.0.7-1
+- update to 1.0.7
+- update download URL
+- don't add category X-Fedora in desktop files
+
+* Tue Aug 29 2006 Paul Howarth  - 1.0.5-4
+- rebuild for dynamic linking speedups (FE6)
+
 * Mon May 22 2006 Paul Howarth  - 1.0.5-3
 - fix broken debuginfo packages by not stripping binaries (#192617)
 - cosmetic changes to spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Feb 2006 11:46:25 -0000	1.8
+++ sources	6 Nov 2006 11:32:17 -0000	1.9
@@ -1 +1 @@
-26701c09d41e5dea987155cdc9d0ac94  bluefish-1.0.5.tar.bz2
+2c3b3c9c8f8e32b9473dfd879f216dea  bluefish-1.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov  6 11:34:16 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 6 Nov 2006 04:34:16 -0700
Subject: rpms/bluefish/FC-4 .cvsignore, 1.8, 1.9 bluefish.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <200611061134.kA6BYGWr011688@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/bluefish/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11668

Modified Files:
	.cvsignore bluefish.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Feb 2006 11:55:17 -0000	1.8
+++ .cvsignore	6 Nov 2006 11:33:46 -0000	1.9
@@ -1 +1 @@
-bluefish-1.0.5.tar.bz2
+bluefish-1.0.7.tar.bz2


Index: bluefish.spec
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bluefish.spec	22 May 2006 07:47:03 -0000	1.17
+++ bluefish.spec	6 Nov 2006 11:33:46 -0000	1.18
@@ -1,11 +1,11 @@
 Name:           bluefish
-Version:        1.0.5
-Release:        3%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 Summary:        GTK2 web development application for experienced users
 Group:          Development/Tools
 License:        GPL
 URL:            http://bluefish.openoffice.nl/
-Source0:        http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2
+Source0:        http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  aspell-devel >= 0.5
 BuildRequires:  desktop-file-utils
@@ -39,11 +39,9 @@
 %find_lang %{name}
 /usr/bin/desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   %{buildroot}%{_datadir}/applications/bluefish.desktop
 /usr/bin/desktop-file-install --vendor fedora --delete-original \
   --dir %{buildroot}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
   %{buildroot}%{_datadir}/applications/bluefish-project.desktop
 
 %clean
@@ -71,6 +69,14 @@
 %{_mandir}/man1/bluefish.1*
 
 %changelog
+* Mon Nov  6 2006 Paul Howarth  - 1.0.7-1
+- update to 1.0.7
+- update download URL
+- don't add category X-Fedora in desktop files
+
+* Tue Aug 29 2006 Paul Howarth  - 1.0.5-4
+- rebuild for dynamic linking speedups (FE6)
+
 * Mon May 22 2006 Paul Howarth  - 1.0.5-3
 - fix broken debuginfo packages by not stripping binaries (#192617)
 - cosmetic changes to spec file


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluefish/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Feb 2006 11:55:17 -0000	1.8
+++ sources	6 Nov 2006 11:33:46 -0000	1.9
@@ -1 +1 @@
-26701c09d41e5dea987155cdc9d0ac94  bluefish-1.0.5.tar.bz2
+2c3b3c9c8f8e32b9473dfd879f216dea  bluefish-1.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov  6 12:31:25 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 05:31:25 -0700
Subject: rpms/icecast/devel icecast-curl.patch, NONE, 1.1 icecast.spec, 1.3,
	1.4
Message-ID: <200611061231.kA6CVPNV015016@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/icecast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14997

Modified Files:
	icecast.spec 
Added Files:
	icecast-curl.patch 
Log Message:
- rebuild because of the new curl


icecast-curl.patch:

--- NEW FILE icecast-curl.patch ---
--- icecast-2.3.1/src/auth_url.c.curl	2005-11-30 13:16:17.000000000 -0500
+++ icecast-2.3.1/src/auth_url.c	2006-11-06 07:21:06.000000000 -0500
@@ -518,7 +518,6 @@
     curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->handle);
     curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L);
     curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L);
-    curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass);
     curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]);
 
     if (url_info->username && url_info->password)


Index: icecast.spec
===================================================================
RCS file: /cvs/extras/rpms/icecast/devel/icecast.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icecast.spec	8 Sep 2006 17:27:54 -0000	1.3
+++ icecast.spec	6 Nov 2006 12:30:55 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: ShoutCast compatible streaming media server
 Name: icecast
 Version: 2.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://www.icecast.org/
@@ -10,6 +10,7 @@
 Source2: icecast.init
 Source3: icecast.logrotate
 Source4: icecast.xml
+Patch1: icecast-curl.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: streaming-server
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .curl
 find -name "*.html" -or -name "*.jpg" -or -name "*.css" | xargs chmod 644
 %{__sed} -i -e 's/icecast2/icecast/g' debian/icecast2.1
 
@@ -107,6 +109,9 @@
 %dir %attr(-,icecast,icecast) %{_localstatedir}/run/icecast
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  - 2.3.1-4
+- rebuild because of the new curl
+
 * Fri Sep 08 2006 Andreas Thienemann  - 2.3.1-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Mon Nov  6 12:58:04 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 05:58:04 -0700
Subject: rpms/rtorrent/devel rtorrent.spec,1.12,1.13
Message-ID: <200611061258.kA6Cw4cO015198@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15182

Modified Files:
	rtorrent.spec 
Log Message:
- rebuild against new curl



Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rtorrent.spec	29 Sep 2006 10:06:28 -0000	1.12
+++ rtorrent.spec	6 Nov 2006 12:57:33 -0000	1.13
@@ -2,7 +2,7 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.6.2
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -40,6 +40,9 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  - 0.6.2-5
+- rebuild against new curl
+
 * Fri Sep 29 2006 Chris Chabot  - 0.6.2-4
 - re-tag
 



From fedora-extras-commits at redhat.com  Mon Nov  6 13:09:10 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 06:09:10 -0700
Subject: rpms/sblim-wbemcli/devel sblim-wbemcli.spec,1.5,1.6
Message-ID: <200611061309.kA6D9AXN018272@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/sblim-wbemcli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18256

Modified Files:
	sblim-wbemcli.spec 
Log Message:
- rebuild against new curl



Index: sblim-wbemcli.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-wbemcli/devel/sblim-wbemcli.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sblim-wbemcli.spec	4 Oct 2006 23:09:24 -0000	1.5
+++ sblim-wbemcli.spec	6 Nov 2006 13:08:40 -0000	1.6
@@ -9,7 +9,7 @@
 Summary: SBLIM WBEM Command Line Interface
 Name: sblim-wbemcli
 Version: 1.5.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL
@@ -47,10 +47,12 @@
 %{_datadir}/%{name}
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  1.5.1-5
+- rebuild against new curl
+
 * Thu Oct 05 2006 Christian Iseli  1.5.1-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
-
 * Mon Nov 21 2005 Viktor Mihajlovski  1.5.1-1
   - Upgrade to version 1.5.1 (SSL V3 enforced, default CACERT).
     Created Fedora/RH specific spec file.



From fedora-extras-commits at redhat.com  Mon Nov  6 13:17:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 06:17:16 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.15, 1.16 gnupg2.spec, 1.54,
	1.55 sources, 1.17, 1.18
Message-ID: <200611061317.kA6DHGxf018398@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18378

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Mon Nov 06 2006 Rex Dieter  1.9.95-1
- 1.9.95



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	25 Oct 2006 18:43:03 -0000	1.15
+++ .cvsignore	6 Nov 2006 13:16:45 -0000	1.16
@@ -1,2 +1,4 @@
 gnupg-1.9.94.tar.bz2
 gnupg-1.9.94.tar.bz2.sig
+gnupg-1.9.95.tar.bz2
+gnupg-1.9.95.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnupg2.spec	25 Oct 2006 18:43:03 -0000	1.54
+++ gnupg2.spec	6 Nov 2006 13:16:45 -0000	1.55
@@ -1,5 +1,6 @@
 
-# Keep an eye on http://bugzilla.redhat.com/175744, in case these dirs go away or change
+## Keep an eye on http://bugzilla.redhat.com/175744, 
+## in case these dirs go away or change
 %if "%{?fedora}" > "3" || "%{?rhel}" > "4"
 %define kde_scriptdir %{_sysconfdir}/kde
 %else
@@ -11,7 +12,7 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.94
+Version: 1.9.95
 Release: 1%{?dist}
 
 License: GPL
@@ -183,7 +184,11 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  1.9.95-1
+- 1.9.95
+
 * Wed Oct 25 2006 Rex Dieter  1.9.94-1
+- 1.9.94
 
 * Wed Oct 18 2006 Rex Dieter  1.9.93-1
 - 1.9.93


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Oct 2006 18:43:03 -0000	1.17
+++ sources	6 Nov 2006 13:16:45 -0000	1.18
@@ -1,2 +1,2 @@
-1da8c928948800efa2a13d4aecb8d013  gnupg-1.9.94.tar.bz2
-18c269ffc15801ee62e1add2644391ec  gnupg-1.9.94.tar.bz2.sig
+2f8f134c4b0a8a69f2017100e7a51101  gnupg-1.9.95.tar.bz2
+a0d38a16e7542e4c4fd10607fe029745  gnupg-1.9.95.tar.bz2.sig



From fedora-extras-commits at redhat.com  Mon Nov  6 13:20:23 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 06:20:23 -0700
Subject: rpms/streamtuner/devel streamtuner.spec,1.7,1.8
Message-ID: <200611061320.kA6DKNoj018478@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18458

Modified Files:
	streamtuner.spec 
Log Message:
- rebuild against new curl



Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- streamtuner.spec	15 Sep 2006 08:34:08 -0000	1.7
+++ streamtuner.spec	6 Nov 2006 13:19:53 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  - 0.99.99-14
+- rebuild against new curl
+
 * Fri Sep 15 2006 Matthias Haase  - 0.99.99-13
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Mon Nov  6 13:36:34 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 06:36:34 -0700
Subject: rpms/octave-forge/devel octave-forge.spec,1.32,1.33
Message-ID: <200611061336.kA6DaY2N018664@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648

Modified Files:
	octave-forge.spec 
Log Message:
- rebuild against the new curl



Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- octave-forge.spec	4 Oct 2006 22:25:19 -0000	1.32
+++ octave-forge.spec	6 Nov 2006 13:36:04 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.07.09
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  2006.07.09-8
+- rebuild against the new curl
+
 * Thu Oct 05 2006 Christian Iseli  2006.07.09-7
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Mon Nov  6 13:53:50 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 06:53:50 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-curl.patch, NONE, 
	1.1 sylpheed-claws-plugins.spec, 1.23, 1.24
Message-ID: <200611061353.kA6Dro51018793@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774

Modified Files:
	sylpheed-claws-plugins.spec 
Added Files:
	sylpheed-claws-curl.patch 
Log Message:
- rebuild against the new curl


sylpheed-claws-curl.patch:

--- NEW FILE sylpheed-claws-curl.patch ---
--- sylpheed-claws-extra-plugins-2.5.2/rssyl-0.6.1/src/feed.c.curl	2006-09-25 12:55:29.000000000 -0400
+++ sylpheed-claws-extra-plugins-2.5.2/rssyl-0.6.1/src/feed.c	2006-11-06 08:42:55.000000000 -0500
@@ -121,7 +121,6 @@
 
 	curl_easy_setopt(eh, CURLOPT_URL, ctx->url);
 	curl_easy_setopt(eh, CURLOPT_NOPROGRESS, 1);
-	curl_easy_setopt(eh, CURLOPT_MUTE, 1);
 	curl_easy_setopt(eh, CURLOPT_WRITEDATA, f);
 	curl_easy_setopt(eh, CURLOPT_FOLLOWLOCATION, 1);
 	curl_easy_setopt(eh, CURLOPT_MAXREDIRS, 3);
--- sylpheed-claws-extra-plugins-2.5.2/gtkhtml2_viewer-0.11/src/gtkhtml2_viewer.c.curl	2006-09-25 12:55:35.000000000 -0400
+++ sylpheed-claws-extra-plugins-2.5.2/gtkhtml2_viewer-0.11/src/gtkhtml2_viewer.c	2006-11-06 08:42:28.000000000 -0500
@@ -372,7 +372,6 @@
 
 	curl_easy_setopt(eh, CURLOPT_URL, ctx->url);
 	curl_easy_setopt(eh, CURLOPT_NOPROGRESS, 1);
-	curl_easy_setopt(eh, CURLOPT_MUTE, 1);
 	curl_easy_setopt(eh, CURLOPT_WRITEDATA, f);
 	curl_easy_setopt(eh, CURLOPT_FOLLOWLOCATION, 1);
 	curl_easy_setopt(eh, CURLOPT_MAXREDIRS, 3);


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sylpheed-claws-plugins.spec	20 Oct 2006 09:47:50 -0000	1.23
+++ sylpheed-claws-plugins.spec	6 Nov 2006 13:53:20 -0000	1.24
@@ -1,12 +1,13 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
+Patch1:		sylpheed-claws-curl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -183,6 +184,7 @@
 
 %prep
 %setup -q -n sylpheed-claws-extra-plugins-%{version}
+%patch1 -p1 -b .curl
 
 %build
 #acpi_notifier
@@ -510,6 +512,9 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  2.5.2-5
+- rebuild against the new curl
+
 * Fri Oct 20 2006 Andreas Bierfert 
 2.5.2-4
 - rebuild



From fedora-extras-commits at redhat.com  Mon Nov  6 13:58:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 6 Nov 2006 06:58:11 -0700
Subject: rpms/abcMIDI/FC-5 .cvsignore, 1.11, 1.12 abcMIDI.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200611061358.kA6DwBGA018916@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864/FC-5

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061103


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 14:07:49 -0000	1.11
+++ .cvsignore	6 Nov 2006 13:57:41 -0000	1.12
@@ -1 +1 @@
-abcMIDI-2006-10-27.zip
+abcMIDI-2006-11-03.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/abcMIDI.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abcMIDI.spec	31 Oct 2006 14:07:49 -0000	1.11
+++ abcMIDI.spec	6 Nov 2006 13:57:41 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061027
+Version:        20061103
 Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-11-03.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Gerard Milmeister  - 20061103-1
+- new version 20061103
+
 * Tue Oct 31 2006 Gerard Milmeister  - 20061027-1
 - new version 20061027
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Oct 2006 14:07:49 -0000	1.11
+++ sources	6 Nov 2006 13:57:41 -0000	1.12
@@ -1 +1 @@
-d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip
+888a007986d0b02c789cdaaf1401a04c  abcMIDI-2006-11-03.zip



From fedora-extras-commits at redhat.com  Mon Nov  6 13:58:12 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 6 Nov 2006 06:58:12 -0700
Subject: rpms/abcMIDI/FC-6 .cvsignore, 1.11, 1.12 abcMIDI.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <200611061358.kA6DwCCi018921@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864/FC-6

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061103


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 14:07:50 -0000	1.11
+++ .cvsignore	6 Nov 2006 13:57:42 -0000	1.12
@@ -1 +1 @@
-abcMIDI-2006-10-27.zip
+abcMIDI-2006-11-03.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/abcMIDI.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- abcMIDI.spec	31 Oct 2006 14:07:50 -0000	1.13
+++ abcMIDI.spec	6 Nov 2006 13:57:42 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061027
+Version:        20061103
 Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-11-03.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Gerard Milmeister  - 20061103-1
+- new version 20061103
+
 * Tue Oct 31 2006 Gerard Milmeister  - 20061027-1
 - new version 20061027
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Oct 2006 14:07:50 -0000	1.11
+++ sources	6 Nov 2006 13:57:42 -0000	1.12
@@ -1 +1 @@
-d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip
+888a007986d0b02c789cdaaf1401a04c  abcMIDI-2006-11-03.zip



From fedora-extras-commits at redhat.com  Mon Nov  6 13:58:12 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 6 Nov 2006 06:58:12 -0700
Subject: rpms/abcMIDI/devel .cvsignore, 1.11, 1.12 abcMIDI.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <200611061358.kA6DwCkg018926@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcMIDI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864/devel

Modified Files:
	.cvsignore abcMIDI.spec sources 
Log Message:
new version 20061103


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 14:07:51 -0000	1.11
+++ .cvsignore	6 Nov 2006 13:57:42 -0000	1.12
@@ -1 +1 @@
-abcMIDI-2006-10-27.zip
+abcMIDI-2006-11-03.zip


Index: abcMIDI.spec
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/abcMIDI.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- abcMIDI.spec	31 Oct 2006 14:07:51 -0000	1.13
+++ abcMIDI.spec	6 Nov 2006 13:57:42 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           abcMIDI
-Version:        20061027
+Version:        20061103
 Release:        1%{?dist}
 Summary:        ABC to/from MIDI conversion utilities
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://abc.sourceforge.net/abcMIDI
-Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-10-27.zip
+Source0:        http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2006-11-03.zip
 Patch0:		abcmidi-snprintf.patch
 Patch1:		abcmidi-sprintf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Gerard Milmeister  - 20061103-1
+- new version 20061103
+
 * Tue Oct 31 2006 Gerard Milmeister  - 20061027-1
 - new version 20061027
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcMIDI/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Oct 2006 14:07:51 -0000	1.11
+++ sources	6 Nov 2006 13:57:42 -0000	1.12
@@ -1 +1 @@
-d162f0a583565f38b8bd2ab4cfcb745e  abcMIDI-2006-10-27.zip
+888a007986d0b02c789cdaaf1401a04c  abcMIDI-2006-11-03.zip



From fedora-extras-commits at redhat.com  Mon Nov  6 14:02:06 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 07:02:06 -0700
Subject: rpms/xmlrpc-c/devel xmlrpc-c.spec,1.10,1.11
Message-ID: <200611061402.kA6E26e9021886@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21868

Modified Files:
	xmlrpc-c.spec 
Log Message:
- rebuild against the new curl



Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/xmlrpc-c.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmlrpc-c.spec	2 Oct 2006 15:02:03 -0000	1.10
+++ xmlrpc-c.spec	6 Nov 2006 14:01:36 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
 Version:	1.06.05
-Release:	%release_func 2
+Release:	%release_func 3
 License:	BSD/PSF -- see COPYING
 Group:		System Environment/Libraries
 URL:	 	http://xmlrpc-c.sourceforge.net/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Jindrich Novy  - 1.06.05-3
+- rebuild against the new curl
+
 * Mon Oct  2 2006 Enrico Scholz  - 1.06.05-2
 - updated cmake patch
 - strip installed libraries



From fedora-extras-commits at redhat.com  Mon Nov  6 14:04:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 07:04:17 -0700
Subject: rpms/xdg-utils/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xdg-utils.spec, 1.9, 1.10
Message-ID: <200611061404.kA6E4HFP022075@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22050

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  1.0.1-1
- xdg-utils-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2006 12:48:28 -0000	1.6
+++ .cvsignore	6 Nov 2006 14:03:45 -0000	1.7
@@ -1,3 +1,4 @@
 clog
 xdg-utils-1.0rc1.tgz
 xdg-utils-1.0.tgz
+xdg-utils-1.0.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2006 12:48:28 -0000	1.6
+++ sources	6 Nov 2006 14:03:45 -0000	1.7
@@ -1 +1 @@
-69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz
+d67b8e5eaace131c56ea7ae811c6f9f1  xdg-utils-1.0.1.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/devel/xdg-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdg-utils.spec	24 Oct 2006 15:48:23 -0000	1.9
+++ xdg-utils.spec	6 Nov 2006 14:03:45 -0000	1.10
@@ -1,8 +1,8 @@
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
-Version: 1.0 
-Release: 3%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  1.0.1-1
+- xdg-utils-1.0.1
+
 * Tue Oct 24 2006 Rex Dieter 

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22196

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  1.0.1-1
- xdg-utils-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2006 12:48:28 -0000	1.6
+++ .cvsignore	6 Nov 2006 14:10:54 -0000	1.7
@@ -1,3 +1,4 @@
 clog
 xdg-utils-1.0rc1.tgz
 xdg-utils-1.0.tgz
+xdg-utils-1.0.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2006 12:48:28 -0000	1.6
+++ sources	6 Nov 2006 14:10:54 -0000	1.7
@@ -1 +1 @@
-69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz
+d67b8e5eaace131c56ea7ae811c6f9f1  xdg-utils-1.0.1.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-6/xdg-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdg-utils.spec	24 Oct 2006 16:00:09 -0000	1.9
+++ xdg-utils.spec	6 Nov 2006 14:10:54 -0000	1.10
@@ -1,8 +1,8 @@
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
-Version: 1.0 
-Release: 3%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  1.0.1-1
+- xdg-utils-1.0.1
+
 * Tue Oct 24 2006 Rex Dieter 

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22271

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  1.0.1-1
- xdg-utils-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2006 12:51:18 -0000	1.6
+++ .cvsignore	6 Nov 2006 14:11:40 -0000	1.7
@@ -1,3 +1,4 @@
 clog
 xdg-utils-1.0rc1.tgz
 xdg-utils-1.0.tgz
+xdg-utils-1.0.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2006 12:51:18 -0000	1.6
+++ sources	6 Nov 2006 14:11:40 -0000	1.7
@@ -1 +1 @@
-69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz
+d67b8e5eaace131c56ea7ae811c6f9f1  xdg-utils-1.0.1.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xdg-utils.spec	24 Oct 2006 16:01:45 -0000	1.8
+++ xdg-utils.spec	6 Nov 2006 14:11:40 -0000	1.9
@@ -1,8 +1,8 @@
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
-Version: 1.0 
-Release: 3%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  1.0.1-1
+- xdg-utils-1.0.1
+
 * Tue Oct 24 2006 Rex Dieter 

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22337

Modified Files:
	.cvsignore sources xdg-utils.spec 
Added Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Mon Nov 06 2006 Rex Dieter  1.0.1-1
- xdg-utils-1.0.1


xdg-utils-1.0-mimeopen.patch:

--- NEW FILE xdg-utils-1.0-mimeopen.patch ---
--- xdg-utils-1.0/scripts/xdg-open.mimeopen	2006-10-17 22:55:02.000000000 +0200
+++ xdg-utils-1.0/scripts/xdg-open	2006-10-17 22:55:15.000000000 +0200
@@ -360,6 +360,15 @@
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        else
+            exit_failure_operation_failed
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2006 12:50:53 -0000	1.6
+++ .cvsignore	6 Nov 2006 14:12:27 -0000	1.7
@@ -1,3 +1,4 @@
 clog
 xdg-utils-1.0rc1.tgz
 xdg-utils-1.0.tgz
+xdg-utils-1.0.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2006 12:50:53 -0000	1.6
+++ sources	6 Nov 2006 14:12:27 -0000	1.7
@@ -1 +1 @@
-69842bbf2eb627519680a904541308fa  xdg-utils-1.0.tgz
+d67b8e5eaace131c56ea7ae811c6f9f1  xdg-utils-1.0.1.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-4/xdg-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdg-utils.spec	10 Oct 2006 12:50:53 -0000	1.7
+++ xdg-utils.spec	6 Nov 2006 14:12:27 -0000	1.8
@@ -1,7 +1,7 @@
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
-Version: 1.0 
+Version: 1.0.1
 Release: 1%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
@@ -11,14 +11,16 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Not really used (yet)
-#BuildRequires: xmlto
+Patch1: xdg-utils-1.0-mimeopen.patch
 
 Requires: desktop-file-utils
 ## kde-config
-#Requires: kdelibs
-# update-gtk-icon-cache
-#Requires: gtk2
+#Requires(hint): kdelibs
+## update-gtk-icon-cache
+#Requires(hint): gtk2
+## mimeopen generic default
+#Requires(hint): %{_bindir}/mimeopen
+#Requires(hint): perl-File-MimeInfo 
 
 
 %description
@@ -46,6 +48,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch1 -p1 -b .mimeopen
+
 
 %build
 %configure
@@ -71,6 +75,15 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  1.0.1-1
+- xdg-utils-1.0.1
+
+* Tue Oct 24 2006 Rex Dieter  1.0-2
+- prefer mimeopen as generic default (#210797)
+
 * Tue Oct 10 2006 Rex Dieter  1.0-1
 - 1.0(final)
 



From fedora-extras-commits at redhat.com  Mon Nov  6 14:13:13 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 07:13:13 -0700
Subject: rpms/xmms-scrobbler/devel xmms-scrobbler.spec,1.3,1.4
Message-ID: <200611061413.kA6EDDoN022418@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22361

Modified Files:
	xmms-scrobbler.spec 
Log Message:
- rebuild against the new curl



Index: xmms-scrobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/xmms-scrobbler.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmms-scrobbler.spec	8 Sep 2006 17:45:24 -0000	1.3
+++ xmms-scrobbler.spec	6 Nov 2006 14:12:43 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: Audioscrobbler plugin for XMMS
 Name: xmms-scrobbler
 Version: 0.3.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.last.fm/downloads.php
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Jindrich Novy  - 0.3.8.1-3
+- rebuild against the new curl
+
 * Fri Sep 08 2006 Andreas Thienemann  - 0.3.8.1-2
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Mon Nov  6 14:44:13 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 07:44:13 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.4,1.5
Message-ID: <200611061444.kA6EiDdn022645@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22629

Modified Files:
	xmoto.spec 
Log Message:
- Rebuild against the new curl



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmoto.spec	13 Sep 2006 20:57:31 -0000	1.4
+++ xmoto.spec	6 Nov 2006 14:43:43 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xmoto
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Jindrich Novy  0.2.0-2
+- Rebuild against the new curl
+
 * Wed Sep 13 2006 Hugo Cisneiros  0.2.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:08:05 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 6 Nov 2006 08:08:05 -0700
Subject: rpms/jd/devel .cvsignore, 1.13, 1.14 jd.spec, 1.20, 1.21 sources,
	1.13, 1.14
Message-ID: <200611061508.kA6F857V025799@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25760

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Nov  4 2006 Mamoru Tasaka  - 1.8.0-0.5.cvs061106
- cvs 061106 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Nov 2006 16:18:10 -0000	1.13
+++ .cvsignore	6 Nov 2006 15:07:35 -0000	1.14
@@ -1 +1 @@
-jd-1.8.0-cvs061105.tgz
+jd-1.8.0-cvs061106.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jd.spec	5 Nov 2006 16:18:10 -0000	1.20
+++ jd.spec	6 Nov 2006 15:07:35 -0000	1.21
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061105
+%define         strtag        cvs061106
 %define         repoid        22566
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Nov  4 2006 Mamoru Tasaka  - 1.8.0-0.5.cvs061105
-- cvs 061105 (23:59 JST)
+* Sat Nov  4 2006 Mamoru Tasaka  - 1.8.0-0.5.cvs061106
+- cvs 061106 (23:59 JST)
 
 * Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
 - 1.8.0 beta 061103


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Nov 2006 16:18:10 -0000	1.13
+++ sources	6 Nov 2006 15:07:35 -0000	1.14
@@ -1 +1 @@
-99d1dc3707cfb4a074e9419e19a2b139  jd-1.8.0-cvs061105.tgz
+5590a3ab50666cd728b9ea3d25389ac5  jd-1.8.0-cvs061106.tgz



From fedora-extras-commits at redhat.com  Mon Nov  6 15:08:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 08:08:08 -0700
Subject: rpms/PyQt-qscintilla/devel PyQt-qscintilla.spec,1.4,1.5
Message-ID: <200611061508.kA6F88TS025804@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25781

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  3.16-6
- devel subpkg 



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/PyQt-qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PyQt-qscintilla.spec	29 Aug 2006 18:39:52 -0000	1.4
+++ PyQt-qscintilla.spec	6 Nov 2006 15:07:38 -0000	1.5
@@ -2,12 +2,12 @@
 Summary: PyQt qscintilla extentions 
 Name: 	 PyQt-qscintilla
 Version: 3.16
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group: 	 Development/Languages
-Url: 	 http://www.riverbankcomputing.co.uk/pyqt/
-Source:	 http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-%{version}.tar.gz
+Url: 	 http://www.riverbankcomputing.com/pyqt/
+Source0: http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/PyQt-x11-gpl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt-devel
@@ -15,13 +15,20 @@
 BuildRequires: sip-devel
 %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)")
-Requires: python-abi = %{python_ver} 
-
+Requires: python-abi = %{python_ver}
 Requires: PyQt = %{version}
 
 %description
 %{summary}.
 
+%package devel
+Summary: Libraries and header files for %{name} development
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: sip-devel
+%description devel
+%{summary}.
+
 
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
@@ -51,13 +58,17 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-# IMO, sip should own this -- Rex
-%dir %{_datadir}/sip
-%{_datadir}/sip/qtext/
 %{python_sitedir}/qtext*.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_datadir}/sip/qtext/
+
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  3.16-6
+- devel subpkg 
+
 * Tue Aug 29 2006 Rex Dieter  3.16-5
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:09:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 08:09:05 -0700
Subject: rpms/PyQt-qscintilla/FC-6 PyQt-qscintilla.spec,1.4,1.5
Message-ID: <200611061509.kA6F95GB025917@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25892

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  3.16-6
- devel subpkg 



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-6/PyQt-qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PyQt-qscintilla.spec	29 Aug 2006 18:39:52 -0000	1.4
+++ PyQt-qscintilla.spec	6 Nov 2006 15:08:35 -0000	1.5
@@ -2,12 +2,12 @@
 Summary: PyQt qscintilla extentions 
 Name: 	 PyQt-qscintilla
 Version: 3.16
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group: 	 Development/Languages
-Url: 	 http://www.riverbankcomputing.co.uk/pyqt/
-Source:	 http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-%{version}.tar.gz
+Url: 	 http://www.riverbankcomputing.com/pyqt/
+Source0: http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/PyQt-x11-gpl-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt-devel
@@ -15,13 +15,20 @@
 BuildRequires: sip-devel
 %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)")
-Requires: python-abi = %{python_ver} 
-
+Requires: python-abi = %{python_ver}
 Requires: PyQt = %{version}
 
 %description
 %{summary}.
 
+%package devel
+Summary: Libraries and header files for %{name} development
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: sip-devel
+%description devel
+%{summary}.
+
 
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
@@ -51,13 +58,17 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-# IMO, sip should own this -- Rex
-%dir %{_datadir}/sip
-%{_datadir}/sip/qtext/
 %{python_sitedir}/qtext*.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_datadir}/sip/qtext/
+
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  3.16-6
+- devel subpkg 
+
 * Tue Aug 29 2006 Rex Dieter  3.16-5
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:10:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 08:10:56 -0700
Subject: rpms/PyQt-qscintilla/FC-5 PyQt-qscintilla.spec,1.3,1.4
Message-ID: <200611061510.kA6FAugC025995@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25969

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  3.15-3
- devel subpkg



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-5/PyQt-qscintilla.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PyQt-qscintilla.spec	19 Jun 2006 11:59:00 -0000	1.3
+++ PyQt-qscintilla.spec	6 Nov 2006 15:10:26 -0000	1.4
@@ -2,7 +2,7 @@
 Summary: PyQt qscintilla extentions 
 Name: 	 PyQt-qscintilla
 Version: 3.15
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Development/Languages
@@ -16,12 +16,19 @@
 %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)")
 Requires: python-abi = %{python_ver} 
-
 Requires: PyQt = %{version}
 
 %description
 %{summary}.
 
+%package devel
+Summary: Libraries and header files for %{name} development
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: sip-devel
+%description devel
+%{summary}.
+
 
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
@@ -49,13 +56,17 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-# IMO, sip should own this
-%dir %{_datadir}/sip
-%{_datadir}/sip/qtext/
 %{python_sitedir}/qtext*.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_datadir}/sip/qtext/
+
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  3.15-3
+- devel subpkg
+
 * Mon Jun 05 2006 Rex Dieter  3.15-2
 - own %%_datadir/sip
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:18:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 08:18:49 -0700
Subject: rpms/PyQt-qscintilla/FC-5 PyQt-qscintilla.spec,1.4,1.5
Message-ID: <200611061518.kA6FInhU026084@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26068

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  3.15-4
- devel: Requires: PyQt-devel 



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-5/PyQt-qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PyQt-qscintilla.spec	6 Nov 2006 15:10:26 -0000	1.4
+++ PyQt-qscintilla.spec	6 Nov 2006 15:18:18 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: PyQt qscintilla extentions 
 Name: 	 PyQt-qscintilla
 Version: 3.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Development/Languages
@@ -26,6 +26,7 @@
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: sip-devel
+Requires: PyQt-devel
 %description devel
 %{summary}.
 
@@ -64,6 +65,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  3.15-4
+- devel: Requires: PyQt-devel 
+
 * Mon Nov 06 2006 Rex Dieter  3.15-3
 - devel subpkg
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:20:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 08:20:04 -0700
Subject: rpms/PyQt-qscintilla/devel PyQt-qscintilla.spec,1.5,1.6
Message-ID: <200611061520.kA6FK4IW026158@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26134

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  3.16-7
- -devel: Requires: PyQt-devel



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/PyQt-qscintilla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PyQt-qscintilla.spec	6 Nov 2006 15:07:38 -0000	1.5
+++ PyQt-qscintilla.spec	6 Nov 2006 15:19:33 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: PyQt qscintilla extentions 
 Name: 	 PyQt-qscintilla
 Version: 3.16
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group: 	 Development/Languages
@@ -26,6 +26,7 @@
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: sip-devel
+Requires: PyQt-devel
 %description devel
 %{summary}.
 
@@ -66,6 +67,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  3.16-7
+- -devel: Requires: PyQt-devel
+
 * Mon Nov 06 2006 Rex Dieter  3.16-6
 - devel subpkg 
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:20:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 08:20:52 -0700
Subject: rpms/PyQt-qscintilla/FC-6 PyQt-qscintilla.spec,1.5,1.6
Message-ID: <200611061520.kA6FKqJ4026229@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26211

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  3.16-7
- -devel: Requires: PyQt-devel



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-6/PyQt-qscintilla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PyQt-qscintilla.spec	6 Nov 2006 15:08:35 -0000	1.5
+++ PyQt-qscintilla.spec	6 Nov 2006 15:20:21 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: PyQt qscintilla extentions 
 Name: 	 PyQt-qscintilla
 Version: 3.16
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group: 	 Development/Languages
@@ -26,6 +26,7 @@
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: sip-devel
+Requires: PyQt-devel
 %description devel
 %{summary}.
 
@@ -66,6 +67,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  3.16-7
+- -devel: Requires: PyQt-devel
+
 * Mon Nov 06 2006 Rex Dieter  3.16-6
 - devel subpkg 
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:25:01 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  6 Nov 2006 08:25:01 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.12,1.13
Message-ID: <200611061525.kA6FP1ni026347@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26329

Modified Files:
	Config_Extras.py 
Log Message:
enable Fedora Legacy for FC3+FC4


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Config_Extras.py	29 Oct 2006 18:03:18 -0000	1.12
+++ Config_Extras.py	6 Nov 2006 15:24:59 -0000	1.13
@@ -84,16 +84,16 @@
                 }
 
 # For RepoSupport.py features.
-baserepos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'],
-              '4' : ['fedora-core','fedora-core-updates','fedora-extras'],
+baserepos = { '3' : ['fedora-core','fedora-legacy-updates','fedora-extras'],
+              '4' : ['fedora-core','fedora-legacy-updates','fedora-extras'],
               '5' : ['fedora-core','fedora-core-updates','fedora-extras'],
               '6' : ['fedora-core','fedora-core-updates','fedora-extras'],
               'development' : ['fedora-core','fedora-extras']
               }
 
 # For RepoSupport.py features.
-testrepos = { '3' : ['fedora-core-updates-testing'],
-              '4' : ['fedora-core-updates-testing'],
+testrepos = { '3' : ['fedora-legacy-updates-testing'],
+              '4' : ['fedora-legacy-updates-testing'],
               '5' : ['fedora-core-updates-testing'],
               '6' : ['fedora-core-updates-testing'],
               'development' : []
@@ -103,6 +103,8 @@
 reponames = { 'fedora-core' : 'Fedora Core',
               'fedora-core-updates' : 'Fedora Core Released Updates',
               'fedora-core-updates-testing' : 'Fedora Core Test Updates',
+              'fedora-legacy-updates' : 'Fedora Legacy Released Updates',
+              'fedora-legacy-updates-testing' : 'Fedora Legacy Test Updates',
               'fedora-extras' : 'Fedora Extras'
               }
 
@@ -111,6 +113,8 @@
 repourls = { 'fedora-core' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/%s/%s/os/',
              'fedora-core-updates' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/updates/%s/%s/',
              'fedora-core-updates-testing' : 'http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/%s/%s/',
+             'fedora-legacy-updates' : 'http://download.fedoralegacy.org/fedora/%s/updates/%s/',
+             'fedora-legacy-updates-testing' : 'http://download.fedoralegacy.org/fedora/%s/updates-testing/%s/',
              'fedora-extras' : 'file:///srv/rpmbuild/extras/tree/extras/%s/%s/'
              }
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:30:40 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 6 Nov 2006 08:30:40 -0700
Subject: rpms/mock/devel arch-specific-repo.patch, 1.2, 1.3 mock.spec, 1.27,
	1.28
Message-ID: <200611061530.kA6FUee7026423@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26391

Modified Files:
	arch-specific-repo.patch mock.spec 
Log Message:
Oh no!  I suck again!  More typos in the patch


arch-specific-repo.patch:

Index: arch-specific-repo.patch
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/arch-specific-repo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- arch-specific-repo.patch	4 Nov 2006 13:05:18 -0000	1.2
+++ arch-specific-repo.patch	6 Nov 2006 15:30:09 -0000	1.3
@@ -303,7 +303,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
-+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386
  
  [local]
  name=local
@@ -327,7 +327,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
-+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc
  
  [local]
  name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mock.spec	4 Nov 2006 13:05:18 -0000	1.27
+++ mock.spec	6 Nov 2006 15:30:09 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Jesse Keating  - 0.6.8-4
+- Fix a couple typos pointing fc6 chroots to fe5.
+
 * Sat Nov  4 2006 Jesse Keating  - 0.6.8-3
 - Fix a typo in the patch that added x86_64 repos for fc4ppc
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:31:50 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 6 Nov 2006 08:31:50 -0700
Subject: rpms/mock/FC-5 arch-specific-repo.patch, 1.2, 1.3 mock.spec, 1.25,
	1.26
Message-ID: <200611061531.kA6FVof0026508@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26469/FC-5

Modified Files:
	arch-specific-repo.patch mock.spec 
Log Message:
Port devel updates to FC-6 and FC-5


arch-specific-repo.patch:

Index: arch-specific-repo.patch
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/arch-specific-repo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- arch-specific-repo.patch	4 Nov 2006 13:07:28 -0000	1.2
+++ arch-specific-repo.patch	6 Nov 2006 15:31:20 -0000	1.3
@@ -303,7 +303,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
-+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386
  
  [local]
  name=local
@@ -327,7 +327,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
-+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc
  
  [local]
  name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mock.spec	4 Nov 2006 13:07:28 -0000	1.25
+++ mock.spec	6 Nov 2006 15:31:20 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Jesse Keating  - 0.6.8-4
+- Fix a couple typos pointing fc6 chroots to fe5.
+
 * Sat Nov  4 2006 Jesse Keating  - 0.6.8-3
 - Fix a typo in the patch that added x86_64 repos for fc4ppc
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:31:51 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Mon, 6 Nov 2006 08:31:51 -0700
Subject: rpms/mock/FC-6 arch-specific-repo.patch, 1.2, 1.3 mock.spec, 1.26,
	1.27
Message-ID: <200611061531.kA6FVpsF026512@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/mock/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26469/FC-6

Modified Files:
	arch-specific-repo.patch mock.spec 
Log Message:
Port devel updates to FC-6 and FC-5


arch-specific-repo.patch:

Index: arch-specific-repo.patch
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/arch-specific-repo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- arch-specific-repo.patch	4 Nov 2006 13:07:28 -0000	1.2
+++ arch-specific-repo.patch	6 Nov 2006 15:31:20 -0000	1.3
@@ -303,7 +303,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
-+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=i386
  
  [local]
  name=local
@@ -327,7 +327,7 @@
  [extras]
  name=extras
 -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
-+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=ppc
  
  [local]
  name=local


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-6/mock.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mock.spec	4 Nov 2006 13:07:28 -0000	1.26
+++ mock.spec	6 Nov 2006 15:31:20 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Jesse Keating  - 0.6.8-4
+- Fix a couple typos pointing fc6 chroots to fe5.
+
 * Sat Nov  4 2006 Jesse Keating  - 0.6.8-3
 - Fix a typo in the patch that added x86_64 repos for fc4ppc
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:36:22 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 6 Nov 2006 08:36:22 -0700
Subject: rpms/git/devel git.spec,1.23,1.24
Message-ID: <200611061536.kA6FaM1k026623@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26607

Modified Files:
	git.spec 
Log Message:
- rebuild against the new curl



Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- git.spec	17 Oct 2006 18:31:21 -0000	1.23
+++ git.spec	6 Nov 2006 15:35:52 -0000	1.24
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.4.2.4
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -136,6 +136,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Nov 6 2006 Jindrich Novy  1.4.2.4-2
+- rebuild against the new curl
+
 * Tue Oct 17 2006 Chris Wright  1.4.2.4-1
 - git-1.4.2.4
 



From fedora-extras-commits at redhat.com  Mon Nov  6 15:53:18 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 6 Nov 2006 08:53:18 -0700
Subject: rpms/audacious/devel audacious-1.1.2-mainwin-update.patch, NONE,
	1.1 audacious.spec, 1.12, 1.13
Message-ID: <200611061553.kA6FrI7r026759@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26740

Modified Files:
	audacious.spec 
Added Files:
	audacious-1.1.2-mainwin-update.patch 
Log Message:

- Decrease main window update frequency somewhat


audacious-1.1.2-mainwin-update.patch:

--- NEW FILE audacious-1.1.2-mainwin-update.patch ---
diff -uNr audacious-fedora-1.1.2-orig/audacious/mainwin.h audacious-fedora-1.1.2/audacious/mainwin.h
--- audacious-fedora-1.1.2-orig/audacious/mainwin.h	2006-11-06 15:54:10.000000000 +0100
+++ audacious-fedora-1.1.2/audacious/mainwin.h	2006-11-06 15:55:54.000000000 +0100
@@ -39,7 +39,7 @@
 #define MAINWIN_TITLEBAR_HEIGHT  (gint)14
 #define MAINWIN_SHADED_HEIGHT    MAINWIN_TITLEBAR_HEIGHT
 
-#define MAINWIN_UPDATE_INTERVAL  10
+#define MAINWIN_UPDATE_INTERVAL  100
 
 #define MAINWIN_DEFAULT_POS_X    20
 #define MAINWIN_DEFAULT_POS_Y    20


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- audacious.spec	6 Nov 2006 09:07:19 -0000	1.12
+++ audacious.spec	6 Nov 2006 15:52:48 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -20,6 +20,7 @@
 Patch6:         audacious-1.1.1-shaded-skin.patch
 Patch7:         audacious-1.1.1-controlsocket-name.patch
 Patch8:         audacious-1.1.1-playlist-twenty.patch
+Patch9:         audacious-1.1.2-mainwin-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
@@ -117,6 +118,9 @@
 # Fix "%20" in playlist entries
 %patch8 -p1 -b playlist-twenty
 
+# Decease main window update frequency when the player is idle
+%patch9 -p1 -b mainwin-update
+
 %build
 %configure \
 	--disable-rpath \
@@ -208,6 +212,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Ralf Ertzinger  1.1.2-4.fc7
+- Decrease main window update frequency somewhat
+
 * Mon Nov 06 2006 Jindrich Novy  1.1.2-3.fc6
 - Rebuild because of the new curl
 - Don't BuildRequire desktop-file-utils twice



From fedora-extras-commits at redhat.com  Mon Nov  6 16:49:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 09:49:12 -0700
Subject: rpms/libetpan/FC-3 .cvsignore, 1.9, 1.10 libetpan.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200611061649.kA6GnC6w030324@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/FC-3

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Oct 2006 16:27:57 -0000	1.9
+++ .cvsignore	6 Nov 2006 16:48:41 -0000	1.10
@@ -1 +1 @@
-libetpan-0.47.tar.gz
+libetpan-0.48.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/libetpan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libetpan.spec	19 Oct 2006 16:27:57 -0000	1.8
+++ libetpan.spec	6 Nov 2006 16:48:41 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.47
+Version:        0.48
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,10 +65,18 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+0.48-1
+- version upgrade
+
 * Thu Oct 19 2006 Andreas Bierfert 
 0.47-1
 - version upgrade
 
+* Sat Sep 30 2006 Andreas Bierfert 
+0.46-1
+- version upgrade
+
 * Wed Apr 05 2006 Andreas Bierfert 
 0.45-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Oct 2006 16:27:57 -0000	1.9
+++ sources	6 Nov 2006 16:48:41 -0000	1.10
@@ -1 +1 @@
-bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz
+493de1bfc84c1e0f82fd865795e48ffb  libetpan-0.48.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 16:49:15 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 09:49:15 -0700
Subject: rpms/libetpan/devel .cvsignore, 1.10, 1.11 libetpan.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200611061649.kA6GnFNq030342@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/devel

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Oct 2006 16:28:00 -0000	1.10
+++ .cvsignore	6 Nov 2006 16:48:45 -0000	1.11
@@ -1 +1 @@
-libetpan-0.47.tar.gz
+libetpan-0.48.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libetpan.spec	19 Oct 2006 16:28:00 -0000	1.14
+++ libetpan.spec	6 Nov 2006 16:48:45 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.47
+Version:        0.48
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+0.48-1
+- version upgrade
+
 * Thu Oct 19 2006 Andreas Bierfert 
 0.47-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Oct 2006 16:28:00 -0000	1.10
+++ sources	6 Nov 2006 16:48:45 -0000	1.11
@@ -1 +1 @@
-bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz
+493de1bfc84c1e0f82fd865795e48ffb  libetpan-0.48.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 16:49:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 09:49:13 -0700
Subject: rpms/libetpan/FC-4 .cvsignore, 1.10, 1.11 libetpan.spec, 1.9,
	1.10 sources, 1.10, 1.11
Message-ID: <200611061649.kA6GnDDo030329@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/FC-4

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Oct 2006 16:27:58 -0000	1.10
+++ .cvsignore	6 Nov 2006 16:48:42 -0000	1.11
@@ -1 +1 @@
-libetpan-0.47.tar.gz
+libetpan-0.48.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/libetpan.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libetpan.spec	19 Oct 2006 16:27:58 -0000	1.9
+++ libetpan.spec	6 Nov 2006 16:48:42 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.47
+Version:        0.48
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+0.48-1
+- version upgrade
+
 * Thu Oct 19 2006 Andreas Bierfert 
 0.47-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Oct 2006 16:27:58 -0000	1.10
+++ sources	6 Nov 2006 16:48:42 -0000	1.11
@@ -1 +1 @@
-bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz
+493de1bfc84c1e0f82fd865795e48ffb  libetpan-0.48.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 16:49:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 09:49:13 -0700
Subject: rpms/libetpan/FC-5 .cvsignore, 1.10, 1.11 libetpan.spec, 1.12,
	1.13 sources, 1.10, 1.11
Message-ID: <200611061649.kA6GnDsa030334@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/FC-5

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Oct 2006 16:27:59 -0000	1.10
+++ .cvsignore	6 Nov 2006 16:48:43 -0000	1.11
@@ -1 +1 @@
-libetpan-0.47.tar.gz
+libetpan-0.48.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/libetpan.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libetpan.spec	19 Oct 2006 16:27:59 -0000	1.12
+++ libetpan.spec	6 Nov 2006 16:48:43 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.47
+Version:        0.48
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+0.48-1
+- version upgrade
+
 * Thu Oct 19 2006 Andreas Bierfert 
 0.47-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Oct 2006 16:27:59 -0000	1.10
+++ sources	6 Nov 2006 16:48:43 -0000	1.11
@@ -1 +1 @@
-bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz
+493de1bfc84c1e0f82fd865795e48ffb  libetpan-0.48.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 16:49:14 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 09:49:14 -0700
Subject: rpms/libetpan/FC-6 .cvsignore, 1.10, 1.11 libetpan.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200611061649.kA6GnEis030339@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libetpan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224/FC-6

Modified Files:
	.cvsignore libetpan.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Oct 2006 16:28:00 -0000	1.10
+++ .cvsignore	6 Nov 2006 16:48:44 -0000	1.11
@@ -1 +1 @@
-libetpan-0.47.tar.gz
+libetpan-0.48.tar.gz


Index: libetpan.spec
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-6/libetpan.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libetpan.spec	19 Oct 2006 16:28:00 -0000	1.14
+++ libetpan.spec	6 Nov 2006 16:48:44 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           libetpan
-Version:        0.47
+Version:        0.48
 Release:        1%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
@@ -43,7 +43,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libetpan.la
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.8.1.0
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.10.0.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +65,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+0.48-1
+- version upgrade
+
 * Thu Oct 19 2006 Andreas Bierfert 
 0.47-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libetpan/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Oct 2006 16:28:00 -0000	1.10
+++ sources	6 Nov 2006 16:48:44 -0000	1.11
@@ -1 +1 @@
-bdbe010dcd70fa358d7184b998c3228a  libetpan-0.47.tar.gz
+493de1bfc84c1e0f82fd865795e48ffb  libetpan-0.48.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 16:56:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 09:56:17 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.55,1.56
Message-ID: <200611061656.kA6GuHZC030619@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30603

Modified Files:
	gnupg2.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  1.9.95-2
- fix (more) file conflicts with gnupg



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnupg2.spec	6 Nov 2006 13:16:45 -0000	1.55
+++ gnupg2.spec	6 Nov 2006 16:55:47 -0000	1.56
@@ -130,15 +130,12 @@
 
 %find_lang %{name}
 
-## NOTE:
-#file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-#file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-#file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+# file conflicts with gnupg-1.x 
 rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
+rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html}
 mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
 
-
-## Unpackaged files
+# Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
@@ -184,6 +181,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  1.9.95-2
+- fix (more) file conflicts with gnupg
+
 * Mon Nov 06 2006 Rex Dieter  1.9.95-1
 - 1.9.95
 



From fedora-extras-commits at redhat.com  Mon Nov  6 17:11:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 6 Nov 2006 10:11:43 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.56,1.57
Message-ID: <200611061711.kA6HBhin001305@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1284

Modified Files:
	gnupg2.spec 
Log Message:
Release++



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnupg2.spec	6 Nov 2006 16:55:47 -0000	1.56
+++ gnupg2.spec	6 Nov 2006 17:11:13 -0000	1.57
@@ -13,7 +13,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System



From fedora-extras-commits at redhat.com  Mon Nov  6 17:41:24 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 6 Nov 2006 10:41:24 -0700
Subject: rpms/bzr/devel .cvsignore, 1.7, 1.8 bzr.spec, 1.10, 1.11 sources,
	1.7, 1.8
Message-ID: <200611061741.kA6HfOrN001574@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1532

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
- Update to 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 04:22:09 -0000	1.7
+++ .cvsignore	6 Nov 2006 17:40:53 -0000	1.8
@@ -1 +1 @@
-bzr-0.11.tar.gz
+bzr-0.12.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/bzr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bzr.spec	9 Oct 2006 04:22:09 -0000	1.10
+++ bzr.spec	6 Nov 2006 17:40:53 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr
-Version:        0.11
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -158,6 +158,9 @@
 %{python_sitelib}/bzrlib/tests/*
 
 %changelog
+* Thu Oct 30 2006 Toshio Kuratomi  0.12-1
+- Update to 0.12
+
 * Thu Oct 08 2006 Toshio Kuratomi  0.11-1
 - Update to 0.11
 - New download location.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 04:22:09 -0000	1.7
+++ sources	6 Nov 2006 17:40:53 -0000	1.8
@@ -1 +1 @@
-94fced266d6da6ed298e4738ca7414e0  bzr-0.11.tar.gz
+68bf4e425a93bdf5961af9c3c35229bf  bzr-0.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 17:41:48 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 6 Nov 2006 10:41:48 -0700
Subject: rpms/bzrtools/devel .cvsignore, 1.6, 1.7 bzrtools.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200611061741.kA6HfmQS001608@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1554

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
- Update to 0.12.2
- The push command was renamed to rspush.  Update the %description to match.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Oct 2006 04:36:29 -0000	1.6
+++ .cvsignore	6 Nov 2006 17:41:18 -0000	1.7
@@ -1 +1 @@
-bzrtools-0.11.0.tar.gz
+bzrtools-0.12.2.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bzrtools.spec	9 Oct 2006 04:36:29 -0000	1.10
+++ bzrtools.spec	6 Nov 2006 17:41:18 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzrtools
-Version:        0.11.0
+Version:        0.12.2
 Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
@@ -19,7 +19,7 @@
 %description
 BzrTools is a collection of plugins for Bazaar-NG (bzr).  Among the included
 plugins are:
-* push - uses rsync to push local changes to a remote server
+* rspush - uses rsync to push local changes to a remote server
 * annotate - prints a file annotated with the revision next to each line
 * baz-import - (Requres PyBaz) import an arch archive losslessly into bzr
 * shelve/unshelve - allows you to undo some changes, commit, and restore
@@ -30,7 +30,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 
 %build
@@ -43,6 +43,8 @@
 # remove shebangs from all files as none should be executable scripts
 sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +59,10 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Toshio Kuratomi  0.12.2-1
+- Update to 0.12.2
+- The push command was renamed to rspush.  Update the %%description to match.
+
 * Thu Oct 05 2006 Toshio Kuratomi  0.11.0-1
 - Update to 0.11.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Oct 2006 04:36:29 -0000	1.6
+++ sources	6 Nov 2006 17:41:18 -0000	1.7
@@ -1 +1 @@
-8d34615bafbd40518e75509e7d3a8c04  bzrtools-0.11.0.tar.gz
+3653679f3295deca085811e54da2b6fa  bzrtools-0.12.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 17:56:32 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 6 Nov 2006 10:56:32 -0700
Subject: rpms/mftrace/devel .cvsignore, 1.3, 1.4 mftrace.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200611061756.kA6HuW2u001802@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1780

Modified Files:
	.cvsignore mftrace.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 May 2006 06:04:16 -0000	1.3
+++ .cvsignore	6 Nov 2006 17:56:02 -0000	1.4
@@ -1 +1 @@
-mftrace-1.2.4.tar.gz
+mftrace-1.2.5.tar.gz


Index: mftrace.spec
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/mftrace.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mftrace.spec	6 Sep 2006 19:14:30 -0000	1.6
+++ mftrace.spec	6 Nov 2006 17:56:02 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		mftrace
-Version:	1.2.4
-Release:	4%{?dist}
+Version:	1.2.5
+Release:	1%{?dist}
 Summary:	Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts
 
 Group:		Applications/Publishing
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Quentin Spencer  1.2.5-1
+- New release.
+
 * Mon Aug 28 2006 Quentin Spencer  1.2.4-4
 - Rebuild for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 May 2006 06:04:16 -0000	1.3
+++ sources	6 Nov 2006 17:56:02 -0000	1.4
@@ -1 +1 @@
-8abde3284dc7dc25c829bd4262f836ee  mftrace-1.2.4.tar.gz
+c74c812e4e7f63f63376a13b792249da  mftrace-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 17:59:13 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 6 Nov 2006 10:59:13 -0700
Subject: rpms/mftrace/FC-6 .cvsignore, 1.3, 1.4 mftrace.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200611061759.kA6HxDLX001902@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1856

Modified Files:
	.cvsignore mftrace.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mftrace/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 May 2006 06:04:16 -0000	1.3
+++ .cvsignore	6 Nov 2006 17:58:43 -0000	1.4
@@ -1 +1 @@
-mftrace-1.2.4.tar.gz
+mftrace-1.2.5.tar.gz


Index: mftrace.spec
===================================================================
RCS file: /cvs/extras/rpms/mftrace/FC-6/mftrace.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mftrace.spec	6 Sep 2006 19:14:30 -0000	1.6
+++ mftrace.spec	6 Nov 2006 17:58:43 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		mftrace
-Version:	1.2.4
-Release:	4%{?dist}
+Version:	1.2.5
+Release:	1%{?dist}
 Summary:	Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts
 
 Group:		Applications/Publishing
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Quentin Spencer  1.2.5-1
+- New release.
+
 * Mon Aug 28 2006 Quentin Spencer  1.2.4-4
 - Rebuild for FC6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mftrace/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 May 2006 06:04:16 -0000	1.3
+++ sources	6 Nov 2006 17:58:43 -0000	1.4
@@ -1 +1 @@
-8abde3284dc7dc25c829bd4262f836ee  mftrace-1.2.4.tar.gz
+c74c812e4e7f63f63376a13b792249da  mftrace-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 17:59:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 6 Nov 2006 10:59:19 -0700
Subject: rpms/dnsmasq/devel dnsmasq-2.35-conf-dir.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 dnsmasq.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200611061759.kA6HxJEm001907@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1828

Modified Files:
	.cvsignore dnsmasq.spec sources 
Added Files:
	dnsmasq-2.35-conf-dir.patch 
Log Message:

* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-1
- Update to 2.35
- Removed UPGRADING_to_2.0 from %%doc as per upstream change
- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
- Added %%dir /etc/dnsmasq.d to %%files as per above RFE


dnsmasq-2.35-conf-dir.patch:

--- NEW FILE dnsmasq-2.35-conf-dir.patch ---
diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example
--- dnsmasq-2.35/dnsmasq.conf.example	2006-10-18 15:24:50.000000000 -0500
+++ dnsmasq-2.35-patched/dnsmasq.conf.example	2006-11-06 11:46:38.000000000 -0600
@@ -382,4 +382,4 @@
 
 # Include a another lot of configuration options.
 #conf-file=/etc/dnsmasq.more.conf
-#conf-dir=/etc/dnsmasq.d
+conf-dir=/etc/dnsmasq.d


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Oct 2006 18:09:19 -0000	1.6
+++ .cvsignore	6 Nov 2006 17:58:49 -0000	1.7
@@ -1 +1 @@
-dnsmasq-2.34.tar.gz
+dnsmasq-2.35.tar.gz


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dnsmasq.spec	24 Oct 2006 16:26:49 -0000	1.13
+++ dnsmasq.spec	6 Nov 2006 17:58:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           dnsmasq
-Version:        2.34
-Release:        2%{?dist}
+Version:        2.35
+Release:        1%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -9,6 +9,7 @@
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
 Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
 Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
+Patch2:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -39,6 +40,7 @@
 %if "%fedora" > "3" || "%aurora" > "2"
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -78,8 +80,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
+%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%dir /etc/dnsmasq.d
 %if "%fedora" > "3" || "%aurora" > "2"
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
 %endif
@@ -89,6 +92,12 @@
 
 
 %changelog
+* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-1
+- Update to 2.35
+- Removed UPGRADING_to_2.0 from %%doc as per upstream change
+- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
+- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
+
 * Tue Oct 24 2006 Patrick "Jima" Laughton  2.34-2
 - Fixed BZ#212005
 - Moved %%postun scriptlet to %%post, where it made more sense


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Oct 2006 18:09:19 -0000	1.6
+++ sources	6 Nov 2006 17:58:49 -0000	1.7
@@ -1 +1 @@
-a40b79bec295bb4631b1c033cf0bbdf1  dnsmasq-2.34.tar.gz
+57b8643dc394cf2fbd1bced64536c6df  dnsmasq-2.35.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:01:50 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 6 Nov 2006 11:01:50 -0700
Subject: rpms/mftrace/FC-5 .cvsignore, 1.3, 1.4 mftrace.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200611061801.kA6I1odc005052@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5001

Modified Files:
	.cvsignore mftrace.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mftrace/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 May 2006 06:12:39 -0000	1.3
+++ .cvsignore	6 Nov 2006 18:01:19 -0000	1.4
@@ -1 +1 @@
-mftrace-1.2.4.tar.gz
+mftrace-1.2.5.tar.gz


Index: mftrace.spec
===================================================================
RCS file: /cvs/extras/rpms/mftrace/FC-5/mftrace.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mftrace.spec	20 May 2006 06:54:39 -0000	1.4
+++ mftrace.spec	6 Nov 2006 18:01:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		mftrace
-Version:	1.2.4
-Release:	2%{?dist}
+Version:	1.2.5
+Release:	1%{?dist}
 Summary:	Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts
 
 Group:		Applications/Publishing
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Quentin Spencer  1.2.5-1
+- New release.
+
 * Sat May 20 2006 Quentin Spencer  1.2.4-2
 - Make sure $RPM_OPT_FLAGS are used
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mftrace/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 May 2006 06:12:39 -0000	1.3
+++ sources	6 Nov 2006 18:01:19 -0000	1.4
@@ -1 +1 @@
-8abde3284dc7dc25c829bd4262f836ee  mftrace-1.2.4.tar.gz
+c74c812e4e7f63f63376a13b792249da  mftrace-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:04:57 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 6 Nov 2006 11:04:57 -0700
Subject: rpms/bzr/FC-6 .cvsignore, 1.7, 1.8 bzr.spec, 1.10, 1.11 sources, 1.7,
	1.8
Message-ID: <200611061804.kA6I4vWS005127@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5107

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
- Update to 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 04:22:09 -0000	1.7
+++ .cvsignore	6 Nov 2006 18:04:27 -0000	1.8
@@ -1 +1 @@
-bzr-0.11.tar.gz
+bzr-0.12.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-6/bzr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bzr.spec	9 Oct 2006 04:22:09 -0000	1.10
+++ bzr.spec	6 Nov 2006 18:04:27 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr
-Version:        0.11
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -158,6 +158,9 @@
 %{python_sitelib}/bzrlib/tests/*
 
 %changelog
+* Thu Oct 30 2006 Toshio Kuratomi  0.12-1
+- Update to 0.12
+
 * Thu Oct 08 2006 Toshio Kuratomi  0.11-1
 - Update to 0.11
 - New download location.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 04:22:09 -0000	1.7
+++ sources	6 Nov 2006 18:04:27 -0000	1.8
@@ -1 +1 @@
-94fced266d6da6ed298e4738ca7414e0  bzr-0.11.tar.gz
+68bf4e425a93bdf5961af9c3c35229bf  bzr-0.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:08:45 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 6 Nov 2006 11:08:45 -0700
Subject: rpms/dnsmasq/devel dnsmasq.spec,1.14,1.15
Message-ID: <200611061808.kA6I8jHM005254@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5204

Modified Files:
	dnsmasq.spec 
Log Message:

* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-2
- Stop creating /etc/sysconfig on %%install
- Create /etc/dnsmasq.d on %%install



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dnsmasq.spec	6 Nov 2006 17:58:49 -0000	1.14
+++ dnsmasq.spec	6 Nov 2006 18:08:15 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.35
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -51,7 +51,7 @@
 # normally i'd do 'make install'...it's a bit messy, though
 mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
         $RPM_BUILD_ROOT%{_mandir}/man8 \
-        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+        $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
         $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
 install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
 install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-2
+- Stop creating /etc/sysconfig on %%install
+- Create /etc/dnsmasq.d on %%install
+
 * Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-1
 - Update to 2.35
 - Removed UPGRADING_to_2.0 from %%doc as per upstream change



From fedora-extras-commits at redhat.com  Mon Nov  6 18:26:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 6 Nov 2006 11:26:02 -0700
Subject: rpms/dnsmasq/FC-6 dnsmasq-2.35-conf-dir.patch, NONE,
	1.1 dnsmasq.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200611061826.kA6IQ2Ca005448@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5421

Modified Files:
	dnsmasq.spec sources 
Added Files:
	dnsmasq-2.35-conf-dir.patch 
Log Message:

* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-2
- Stop creating /etc/sysconfig on %%install
- Create /etc/dnsmasq.d on %%install

* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-1
- Update to 2.35
- Removed UPGRADING_to_2.0 from %%doc as per upstream change
- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
- Added %%dir /etc/dnsmasq.d to %%files as per above RFE


dnsmasq-2.35-conf-dir.patch:

--- NEW FILE dnsmasq-2.35-conf-dir.patch ---
diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example
--- dnsmasq-2.35/dnsmasq.conf.example	2006-10-18 15:24:50.000000000 -0500
+++ dnsmasq-2.35-patched/dnsmasq.conf.example	2006-11-06 11:46:38.000000000 -0600
@@ -382,4 +382,4 @@
 
 # Include a another lot of configuration options.
 #conf-file=/etc/dnsmasq.more.conf
-#conf-dir=/etc/dnsmasq.d
+conf-dir=/etc/dnsmasq.d


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-6/dnsmasq.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dnsmasq.spec	24 Oct 2006 16:37:10 -0000	1.13
+++ dnsmasq.spec	6 Nov 2006 18:25:32 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           dnsmasq
-Version:        2.34
+Version:        2.35
 Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
@@ -9,6 +9,7 @@
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
 Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
 Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
+Patch2:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -39,6 +40,7 @@
 %if "%fedora" > "3" || "%aurora" > "2"
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -49,7 +51,7 @@
 # normally i'd do 'make install'...it's a bit messy, though
 mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
         $RPM_BUILD_ROOT%{_mandir}/man8 \
-        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+        $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
         $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
 install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
 install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
@@ -78,8 +80,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
+%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%dir /etc/dnsmasq.d
 %if "%fedora" > "3" || "%aurora" > "2"
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
 %endif
@@ -89,6 +92,16 @@
 
 
 %changelog
+* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-2
+- Stop creating /etc/sysconfig on %%install
+- Create /etc/dnsmasq.d on %%install
+
+* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-1
+- Update to 2.35
+- Removed UPGRADING_to_2.0 from %%doc as per upstream change
+- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
+- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
+
 * Tue Oct 24 2006 Patrick "Jima" Laughton  2.34-2
 - Fixed BZ#212005
 - Moved %%postun scriptlet to %%post, where it made more sense


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Oct 2006 18:09:19 -0000	1.6
+++ sources	6 Nov 2006 18:25:32 -0000	1.7
@@ -1 +1 @@
-a40b79bec295bb4631b1c033cf0bbdf1  dnsmasq-2.34.tar.gz
+57b8643dc394cf2fbd1bced64536c6df  dnsmasq-2.35.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:29:51 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 6 Nov 2006 11:29:51 -0700
Subject: rpms/bzr/FC-5 .cvsignore, 1.7, 1.8 bzr.spec, 1.10, 1.11 sources, 1.7,
	1.8
Message-ID: <200611061829.kA6ITp77005543@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzr/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5512

Modified Files:
	.cvsignore bzr.spec sources 
Log Message:
- Update to 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 04:34:22 -0000	1.7
+++ .cvsignore	6 Nov 2006 18:29:21 -0000	1.8
@@ -1 +1 @@
-bzr-0.11.tar.gz
+bzr-0.12.tar.gz


Index: bzr.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/bzr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bzr.spec	9 Oct 2006 04:34:22 -0000	1.10
+++ bzr.spec	6 Nov 2006 18:29:21 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr
-Version:        0.11
+Version:        0.12
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -158,6 +158,9 @@
 %{python_sitelib}/bzrlib/tests/*
 
 %changelog
+* Thu Oct 30 2006 Toshio Kuratomi  0.12-1
+- Update to 0.12
+
 * Thu Oct 08 2006 Toshio Kuratomi  0.11-1
 - Update to 0.11
 - New download location.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 04:34:22 -0000	1.7
+++ sources	6 Nov 2006 18:29:21 -0000	1.8
@@ -1 +1 @@
-94fced266d6da6ed298e4738ca7414e0  bzr-0.11.tar.gz
+68bf4e425a93bdf5961af9c3c35229bf  bzr-0.12.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:30:49 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 6 Nov 2006 11:30:49 -0700
Subject: rpms/perl-Class-MOP Makefile,1.2,1.3
Message-ID: <200611061830.kA6IUn2b005645@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5568

Modified Files:
	Makefile 
Log Message:
update to 0.36



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	4 Oct 2006 04:13:51 -0000	1.2
+++ Makefile	6 Nov 2006 18:30:18 -0000	1.3
@@ -2,12 +2,14 @@
 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 WARNING: building for devel and FC-5
+	@echo NOTICE: building for ${BRANCHES}
 	@sleep 5s
-	@cd FC-5  && test -f dead.package || ( make tag && make plague )
-	@cd devel && test -f dead.package || ( make tag && make plague )
+	@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  Mon Nov  6 18:30:49 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 6 Nov 2006 11:30:49 -0700
Subject: rpms/perl-Class-MOP/FC-5 perl-Class-MOP.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200611061830.kA6IUn1i005649@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5568/FC-5

Modified Files:
	perl-Class-MOP.spec sources 
Log Message:
update to 0.36



Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-5/perl-Class-MOP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Class-MOP.spec	4 Oct 2006 04:13:51 -0000	1.3
+++ perl-Class-MOP.spec	6 Nov 2006 18:30:19 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           perl-Class-MOP
-Version:        0.35
+Version:        0.36
 Release:        1%{?dist}
-Summary:        Class::MOP Perl module
+Summary:        Metaobject programming model for Perl
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-MOP/
@@ -57,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 06 2006 Chris Weyl  0.36-1
+- update to 0.36
+- update summary tag
+
 * Tue Oct 03 2006 Chris Weyl  0.35-1
 - update to 0.35
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:13:51 -0000	1.3
+++ sources	6 Nov 2006 18:30:19 -0000	1.4
@@ -1 +1 @@
-967208472643a15cfee9704b6ecb03eb  Class-MOP-0.35.tar.gz
+f46c6cedd8d88f081be0547d1775baf0  Class-MOP-0.36.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:30:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 6 Nov 2006 11:30:56 -0700
Subject: rpms/perl-Class-MOP/devel .cvsignore, 1.3, 1.4 perl-Class-MOP.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611061830.kA6IUuaW005663@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5568/devel

Modified Files:
	.cvsignore perl-Class-MOP.spec sources 
Log Message:
update to 0.36



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 04:13:57 -0000	1.3
+++ .cvsignore	6 Nov 2006 18:30:25 -0000	1.4
@@ -1 +1 @@
-Class-MOP-0.35.tar.gz
+Class-MOP-0.36.tar.gz


Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/perl-Class-MOP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Class-MOP.spec	4 Oct 2006 04:13:57 -0000	1.3
+++ perl-Class-MOP.spec	6 Nov 2006 18:30:25 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           perl-Class-MOP
-Version:        0.35
+Version:        0.36
 Release:        1%{?dist}
-Summary:        Class::MOP Perl module
+Summary:        Metaobject programming model for Perl
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-MOP/
@@ -57,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 06 2006 Chris Weyl  0.36-1
+- update to 0.36
+- update summary tag
+
 * Tue Oct 03 2006 Chris Weyl  0.35-1
 - update to 0.35
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:13:57 -0000	1.3
+++ sources	6 Nov 2006 18:30:25 -0000	1.4
@@ -1 +1 @@
-967208472643a15cfee9704b6ecb03eb  Class-MOP-0.35.tar.gz
+f46c6cedd8d88f081be0547d1775baf0  Class-MOP-0.36.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:30:50 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 6 Nov 2006 11:30:50 -0700
Subject: rpms/perl-Class-MOP/FC-6 perl-Class-MOP.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200611061830.kA6IUo4g005655@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-MOP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5568/FC-6

Modified Files:
	perl-Class-MOP.spec sources 
Log Message:
update to 0.36



Index: perl-Class-MOP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-6/perl-Class-MOP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Class-MOP.spec	4 Oct 2006 04:13:57 -0000	1.3
+++ perl-Class-MOP.spec	6 Nov 2006 18:30:20 -0000	1.4
@@ -1,7 +1,7 @@
 Name:           perl-Class-MOP
-Version:        0.35
+Version:        0.36
 Release:        1%{?dist}
-Summary:        Class::MOP Perl module
+Summary:        Metaobject programming model for Perl
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Class-MOP/
@@ -57,6 +57,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 06 2006 Chris Weyl  0.36-1
+- update to 0.36
+- update summary tag
+
 * Tue Oct 03 2006 Chris Weyl  0.35-1
 - update to 0.35
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-MOP/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 04:13:57 -0000	1.3
+++ sources	6 Nov 2006 18:30:20 -0000	1.4
@@ -1 +1 @@
-967208472643a15cfee9704b6ecb03eb  Class-MOP-0.35.tar.gz
+f46c6cedd8d88f081be0547d1775baf0  Class-MOP-0.36.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:32:57 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 6 Nov 2006 11:32:57 -0700
Subject: rpms/bzrtools/FC-6 .cvsignore, 1.6, 1.7 bzrtools.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200611061832.kA6IWvw5005846@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5821

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
- Update to 0.12.2
- The push command was renamed to rspush.  Update the %description to match.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Oct 2006 04:36:29 -0000	1.6
+++ .cvsignore	6 Nov 2006 18:32:27 -0000	1.7
@@ -1 +1 @@
-bzrtools-0.11.0.tar.gz
+bzrtools-0.12.2.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-6/bzrtools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bzrtools.spec	9 Oct 2006 04:36:29 -0000	1.10
+++ bzrtools.spec	6 Nov 2006 18:32:27 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzrtools
-Version:        0.11.0
+Version:        0.12.2
 Release:        1%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
@@ -19,7 +19,7 @@
 %description
 BzrTools is a collection of plugins for Bazaar-NG (bzr).  Among the included
 plugins are:
-* push - uses rsync to push local changes to a remote server
+* rspush - uses rsync to push local changes to a remote server
 * annotate - prints a file annotated with the revision next to each line
 * baz-import - (Requres PyBaz) import an arch archive losslessly into bzr
 * shelve/unshelve - allows you to undo some changes, commit, and restore
@@ -30,7 +30,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 
 %build
@@ -43,6 +43,8 @@
 # remove shebangs from all files as none should be executable scripts
 sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
 
+# No need to ship the tests
+rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +59,10 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
 
 %changelog
+* Thu Oct 05 2006 Toshio Kuratomi  0.12.2-1
+- Update to 0.12.2
+- The push command was renamed to rspush.  Update the %%description to match.
+
 * Thu Oct 05 2006 Toshio Kuratomi  0.11.0-1
 - Update to 0.11.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Oct 2006 04:36:29 -0000	1.6
+++ sources	6 Nov 2006 18:32:27 -0000	1.7
@@ -1 +1 @@
-8d34615bafbd40518e75509e7d3a8c04  bzrtools-0.11.0.tar.gz
+3653679f3295deca085811e54da2b6fa  bzrtools-0.12.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:35:58 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 6 Nov 2006 11:35:58 -0700
Subject: rpms/lilypond/FC-6 .cvsignore, 1.5, 1.6 lilypond.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611061835.kA6IZwac005892@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5869

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 21:47:48 -0000	1.5
+++ .cvsignore	6 Nov 2006 18:35:28 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7.tar.gz
+lilypond-2.8.8.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/lilypond.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lilypond.spec	9 Oct 2006 21:47:48 -0000	1.5
+++ lilypond.spec	6 Nov 2006 18:35:28 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		lilypond
-Version:	2.8.7
+Version:	2.8.8
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Fri Nov  3 2006 Quentin Spencer  2.8.8-1
+- New release.
+
 * Mon Oct  9 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 21:47:48 -0000	1.5
+++ sources	6 Nov 2006 18:35:28 -0000	1.6
@@ -1 +1 @@
-f2513f545adb211a256c21cc6b28ab3a  lilypond-2.8.7.tar.gz
+2fe58ff2fcbc848def46ef287a693189  lilypond-2.8.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:38:21 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 6 Nov 2006 11:38:21 -0700
Subject: rpms/lilypond/FC-5 .cvsignore, 1.5, 1.6 lilypond.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200611061838.kA6IcLoh005975@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5955

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 21:50:10 -0000	1.5
+++ .cvsignore	6 Nov 2006 18:37:50 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7.tar.gz
+lilypond-2.8.8.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/lilypond.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lilypond.spec	9 Oct 2006 21:50:10 -0000	1.7
+++ lilypond.spec	6 Nov 2006 18:37:50 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		lilypond
-Version:	2.8.7
+Version:	2.8.8
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Nov  6 2006 Quentin Spencer  2.8.8-1
+- New release.
+
 * Mon Oct  9 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 21:50:10 -0000	1.5
+++ sources	6 Nov 2006 18:37:50 -0000	1.6
@@ -1 +1 @@
-f2513f545adb211a256c21cc6b28ab3a  lilypond-2.8.7.tar.gz
+2fe58ff2fcbc848def46ef287a693189  lilypond-2.8.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:49:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 6 Nov 2006 11:49:57 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <200611061849.kA6InvKU006117@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067/FC-5

Modified Files:
	perl-Moose.spec sources 
Log Message:
update to 0.15



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Moose.spec	10 Oct 2006 15:53:45 -0000	1.5
+++ perl-Moose.spec	6 Nov 2006 18:49:27 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -9,7 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  perl(Class::MOP) >= 0.34
+BuildRequires:  perl(Class::MOP) >= 0.36
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Sub::Exporter) >= 0.954
 BuildRequires:  perl(Sub::Install) >= 0.92
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 06 2006 Chris Weyl  0.15-1
+- update to 0.15
+
 * Tue Oct 10 2006 Chris Weyl  0.14-1
 - update to 0.14
 - drop some cruft from the specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Oct 2006 15:46:56 -0000	1.4
+++ sources	6 Nov 2006 18:49:27 -0000	1.5
@@ -1 +1 @@
-78839b212fb9712c37e60588042fc829  Moose-0.14.tar.gz
+0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:49:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 6 Nov 2006 11:49:58 -0700
Subject: rpms/perl-Moose/FC-6 perl-Moose.spec,1.5,1.6 sources,1.4,1.5
Message-ID: <200611061849.kA6InwBE006121@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067/FC-6

Modified Files:
	perl-Moose.spec sources 
Log Message:
update to 0.15



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-6/perl-Moose.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Moose.spec	10 Oct 2006 15:53:46 -0000	1.5
+++ perl-Moose.spec	6 Nov 2006 18:49:27 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -9,7 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  perl(Class::MOP) >= 0.34
+BuildRequires:  perl(Class::MOP) >= 0.36
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Sub::Exporter) >= 0.954
 BuildRequires:  perl(Sub::Install) >= 0.92
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 06 2006 Chris Weyl  0.15-1
+- update to 0.15
+
 * Tue Oct 10 2006 Chris Weyl  0.14-1
 - update to 0.14
 - drop some cruft from the specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Oct 2006 15:46:56 -0000	1.4
+++ sources	6 Nov 2006 18:49:27 -0000	1.5
@@ -1 +1 @@
-78839b212fb9712c37e60588042fc829  Moose-0.14.tar.gz
+0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:49:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 6 Nov 2006 11:49:58 -0700
Subject: rpms/perl-Moose/devel .cvsignore, 1.4, 1.5 perl-Moose.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200611061849.kA6InwRY006126@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6067/devel

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
update to 0.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Oct 2006 15:46:56 -0000	1.4
+++ .cvsignore	6 Nov 2006 18:49:28 -0000	1.5
@@ -1 +1 @@
-Moose-0.14.tar.gz
+Moose-0.15.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Moose.spec	10 Oct 2006 15:53:46 -0000	1.5
+++ perl-Moose.spec	6 Nov 2006 18:49:28 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.14
+Version:        0.15
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -9,7 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  perl(Class::MOP) >= 0.34
+BuildRequires:  perl(Class::MOP) >= 0.36
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Sub::Exporter) >= 0.954
 BuildRequires:  perl(Sub::Install) >= 0.92
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 06 2006 Chris Weyl  0.15-1
+- update to 0.15
+
 * Tue Oct 10 2006 Chris Weyl  0.14-1
 - update to 0.14
 - drop some cruft from the specfile


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Oct 2006 15:46:56 -0000	1.4
+++ sources	6 Nov 2006 18:49:28 -0000	1.5
@@ -1 +1 @@
-78839b212fb9712c37e60588042fc829  Moose-0.14.tar.gz
+0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 18:51:43 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 6 Nov 2006 11:51:43 -0700
Subject: rpms/bzrtools/devel bzrtools.spec,1.11,1.12
Message-ID: <200611061851.kA6IphLG006155@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6139

Modified Files:
	bzrtools.spec 
Log Message:
- Add the tests directory as bzr has an undocumented "selftest" subcommand
  that relies on them.



Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/devel/bzrtools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bzrtools.spec	6 Nov 2006 17:41:18 -0000	1.11
+++ bzrtools.spec	6 Nov 2006 18:51:13 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           bzrtools
 Version:        0.12.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -43,9 +43,6 @@
 # remove shebangs from all files as none should be executable scripts
 sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
 
-# No need to ship the tests
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,8 +54,13 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.py
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
+%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Mon Nov 06 2006 Toshio Kuratomi  0.12.2-2
+- Add the tests directory as bzr has an undocumented "selftest" subcommand
+  that relies on them.
+
 * Thu Oct 05 2006 Toshio Kuratomi  0.12.2-1
 - Update to 0.12.2
 - The push command was renamed to rspush.  Update the %%description to match.



From fedora-extras-commits at redhat.com  Mon Nov  6 18:55:29 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 6 Nov 2006 11:55:29 -0700
Subject: rpms/bzrtools/FC-6 bzrtools.spec,1.11,1.12
Message-ID: <200611061855.kA6ItTxX006416@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6400

Modified Files:
	bzrtools.spec 
Log Message:
- Add the tests directory as bzr has an undocumented "selftest" subcommand
  that relies on them.



Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-6/bzrtools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bzrtools.spec	6 Nov 2006 18:32:27 -0000	1.11
+++ bzrtools.spec	6 Nov 2006 18:54:59 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           bzrtools
 Version:        0.12.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -43,9 +43,6 @@
 # remove shebangs from all files as none should be executable scripts
 sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
 
-# No need to ship the tests
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,8 +54,13 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.py
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
+%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Mon Nov 06 2006 Toshio Kuratomi  0.12.2-2
+- Add the tests directory as bzr has an undocumented "selftest" subcommand
+  that relies on them.
+
 * Thu Oct 05 2006 Toshio Kuratomi  0.12.2-1
 - Update to 0.12.2
 - The push command was renamed to rspush.  Update the %%description to match.



From fedora-extras-commits at redhat.com  Mon Nov  6 18:59:50 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 6 Nov 2006 11:59:50 -0700
Subject: rpms/dnsmasq/FC-5 dnsmasq-2.35-conf-dir.patch, NONE,
	1.1 dnsmasq.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200611061859.kA6IxoOA006505@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6480

Modified Files:
	dnsmasq.spec sources 
Added Files:
	dnsmasq-2.35-conf-dir.patch 
Log Message:

* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-2
- Stop creating /etc/sysconfig on %%install
- Create /etc/dnsmasq.d on %%install

* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-1
- Update to 2.35
- Removed UPGRADING_to_2.0 from %%doc as per upstream change
- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
- Added %%dir /etc/dnsmasq.d to %%files as per above RFE


dnsmasq-2.35-conf-dir.patch:

--- NEW FILE dnsmasq-2.35-conf-dir.patch ---
diff -urN dnsmasq-2.35/dnsmasq.conf.example dnsmasq-2.35-patched/dnsmasq.conf.example
--- dnsmasq-2.35/dnsmasq.conf.example	2006-10-18 15:24:50.000000000 -0500
+++ dnsmasq-2.35-patched/dnsmasq.conf.example	2006-11-06 11:46:38.000000000 -0600
@@ -382,4 +382,4 @@
 
 # Include a another lot of configuration options.
 #conf-file=/etc/dnsmasq.more.conf
-#conf-dir=/etc/dnsmasq.d
+conf-dir=/etc/dnsmasq.d


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dnsmasq.spec	24 Oct 2006 16:39:09 -0000	1.8
+++ dnsmasq.spec	6 Nov 2006 18:59:20 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           dnsmasq
-Version:        2.34
+Version:        2.35
 Release:        2%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
@@ -9,6 +9,7 @@
 Source0:        http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
 Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
 Patch1:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
+Patch2:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%fedora" > "3" || "%aurora" > "2"
@@ -39,6 +40,7 @@
 %if "%fedora" > "3" || "%aurora" > "2"
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 make %{?_smp_mflags}
@@ -49,7 +51,7 @@
 # normally i'd do 'make install'...it's a bit messy, though
 mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
         $RPM_BUILD_ROOT%{_mandir}/man8 \
-        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
+        $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.d \
         $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
 install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
 install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
@@ -78,8 +80,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
+%doc CHANGELOG COPYING FAQ doc.html setup.html dbus/DBus-interface
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
+%dir /etc/dnsmasq.d
 %if "%fedora" > "3" || "%aurora" > "2"
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
 %endif
@@ -89,6 +92,16 @@
 
 
 %changelog
+* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-2
+- Stop creating /etc/sysconfig on %%install
+- Create /etc/dnsmasq.d on %%install
+
+* Mon Nov 06 2006 Patrick "Jima" Laughton  2.35-1
+- Update to 2.35
+- Removed UPGRADING_to_2.0 from %%doc as per upstream change
+- Enabled conf-dir in default config as per RFE BZ#214220 (thanks Chris!)
+- Added %%dir /etc/dnsmasq.d to %%files as per above RFE
+
 * Tue Oct 24 2006 Patrick "Jima" Laughton  2.34-2
 - Fixed BZ#212005
 - Moved %%postun scriptlet to %%post, where it made more sense


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Oct 2006 18:19:48 -0000	1.6
+++ sources	6 Nov 2006 18:59:20 -0000	1.7
@@ -1 +1 @@
-a40b79bec295bb4631b1c033cf0bbdf1  dnsmasq-2.34.tar.gz
+57b8643dc394cf2fbd1bced64536c6df  dnsmasq-2.35.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 19:08:40 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 6 Nov 2006 12:08:40 -0700
Subject: rpms/libopm - New directory
Message-ID: <200611061908.kA6J8eP6009630@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/libopm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9626/libopm

Log Message:
Directory /cvs/extras/rpms/libopm added to the repository




From fedora-extras-commits at redhat.com  Mon Nov  6 19:08:46 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 6 Nov 2006 12:08:46 -0700
Subject: rpms/libopm/devel - New directory
Message-ID: <200611061908.kA6J8kNB009644@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/libopm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9626/libopm/devel

Log Message:
Directory /cvs/extras/rpms/libopm/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov  6 19:09:04 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 6 Nov 2006 12:09:04 -0700
Subject: rpms/libopm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611061909.kA6J94jf009675@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/libopm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9669

Added Files:
	Makefile import.log 
Log Message:
Setup of module libopm


--- NEW FILE Makefile ---
# Top level Makefile for module libopm
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  Mon Nov  6 19:09:05 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 6 Nov 2006 12:09:05 -0700
Subject: rpms/libopm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611061909.kA6J95aP009697@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/libopm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9669/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libopm


--- 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 Nov  6 19:10:06 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 6 Nov 2006 12:10:06 -0700
Subject: rpms/libopm import.log,1.1,1.2
Message-ID: <200611061910.kA6JA6eF009784@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/libopm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744

Modified Files:
	import.log 
Log Message:
auto-import libopm-0.1-3.20050731cvs on branch devel from libopm-0.1-3.20050731cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libopm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Nov 2006 19:09:04 -0000	1.1
+++ import.log	6 Nov 2006 19:09:36 -0000	1.2
@@ -0,0 +1 @@
+libopm-0_1-3_20050731cvs:HEAD:libopm-0.1-3.20050731cvs.src.rpm:1162840169



From fedora-extras-commits at redhat.com  Mon Nov  6 19:10:07 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 6 Nov 2006 12:10:07 -0700
Subject: rpms/libopm/devel libopm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611061910.kA6JA7r5009788@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/libopm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libopm.spec 
Log Message:
auto-import libopm-0.1-3.20050731cvs on branch devel from libopm-0.1-3.20050731cvs.src.rpm


--- NEW FILE libopm.spec ---
Summary:        Blitzed open proxy monitor library
Name:           libopm
Version:        0.1
Release:        3.20050731cvs%{?dist}
License:        GPL
Group:          System Environment/Libraries
URL:            http://wiki.blitzed.org/BOPM
# cvs -z3 -d:pserver:anon at cvs.blitzed.org:/ co -D "20050731 23:59" libopm
# find libopm -type f -name .cvsignore -exec rm -f {} ';'
# find libopm -type d -name CVS -exec rm -rf {} 2>/dev/null ';'
# mv -f libopm libopm-$(grep AC_INIT libopm/configure.in | sed -e 's/.*\[\(.*\)\].*/\1/')
Source:         %{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
An open proxy detection library, developed by the blitzed
IRC network team. Its original use was to detect open proxies
running on clients connecting to various IRC servers, but it
has evolved to become a generic open proxy detection library.

%package devel
Summary:        Headers and development libraries for libopm
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
The libopm-devel package contains the header files and libraries
necessary for developing applications which use libopm.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

# Don't install any libtool .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc ChangeLog LICENSE
%{_libdir}/%{name}.so.*

%files devel
%defattr(-,root,root)
%doc doc/libopm-api.txt
%{_includedir}/opm*
%{_libdir}/%{name}.so

%changelog
* Mon Nov 06 2006 Robert Scheck  0.1-3.20050731cvs
- Changes to match with Fedora Packaging Guidelines (#212894 #c2, #c3, #c6)

* Tue Oct 03 2006 Robert Scheck  0.1-2.20050731cvs
- Upgrade to CVS 20050731

* Fri May 05 2006 Robert Scheck  0.1-1.20030106cvs
- Upgrade to CVS 20030106 (equals with libopm from BOPM 3.1.2)
- Initial spec file for Fedora Core


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libopm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Nov 2006 19:09:05 -0000	1.1
+++ .cvsignore	6 Nov 2006 19:09:37 -0000	1.2
@@ -0,0 +1 @@
+libopm-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libopm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Nov 2006 19:09:05 -0000	1.1
+++ sources	6 Nov 2006 19:09:37 -0000	1.2
@@ -0,0 +1 @@
+5537327b4e76bd2c5074996b16cad361  libopm-0.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 19:11:08 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Mon, 6 Nov 2006 12:11:08 -0700
Subject: owners owners.list,1.1894,1.1895
Message-ID: <200611061911.kA6JB8d5009854@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9829

Modified Files:
	owners.list 
Log Message:
Added libopm



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1894
retrieving revision 1.1895
diff -u -r1.1894 -r1.1895
--- owners.list	5 Nov 2006 18:32:14 -0000	1.1894
+++ owners.list	6 Nov 2006 19:10:38 -0000	1.1895
@@ -931,6 +931,7 @@
 Fedora Extras|libopensync-plugin-kdepim|KDE plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libopensync-plugin-palm|Palm plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libopensync-plugin-python|Python plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|libopm|Blitzed open proxy monitor library|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|libosip|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|libosip2|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xelerance.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov  6 19:16:27 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Mon, 6 Nov 2006 12:16:27 -0700
Subject: rpms/bzrtools/FC-5 .cvsignore, 1.6, 1.7 bzrtools.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200611061916.kA6JGRvO009931@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/bzrtools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9906

Modified Files:
	.cvsignore bzrtools.spec sources 
Log Message:
- Update to 0.12.2
- The push command was renamed to rspush.  Update the %%description to match.
- Add the tests directory as bzr has an undocumented "selftest" subcommand
  that relies on them.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Oct 2006 04:38:16 -0000	1.6
+++ .cvsignore	6 Nov 2006 19:15:56 -0000	1.7
@@ -1 +1 @@
-bzrtools-0.11.0.tar.gz
+bzrtools-0.12.2.tar.gz


Index: bzrtools.spec
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/bzrtools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bzrtools.spec	9 Oct 2006 04:38:16 -0000	1.8
+++ bzrtools.spec	6 Nov 2006 19:15:56 -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:           bzrtools
-Version:        0.11.0
-Release:        1%{?dist}
+Version:        0.12.2
+Release:        2%{?dist}
 Summary:        A collection of utilities and plugins for Bazaar-NG
 
 Group:          Development/Tools
@@ -19,7 +19,7 @@
 %description
 BzrTools is a collection of plugins for Bazaar-NG (bzr).  Among the included
 plugins are:
-* push - uses rsync to push local changes to a remote server
+* rspush - uses rsync to push local changes to a remote server
 * annotate - prints a file annotated with the revision next to each line
 * baz-import - (Requres PyBaz) import an arch archive losslessly into bzr
 * shelve/unshelve - allows you to undo some changes, commit, and restore
@@ -30,7 +30,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 
 %build
@@ -43,7 +43,6 @@
 # remove shebangs from all files as none should be executable scripts
 sed -e '/^#!\//,1 d' -i $RPM_BUILD_ROOT/%{python_sitelib}/bzrlib/plugins/bzrtools/*.py
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -55,8 +54,17 @@
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.py
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyc
 %{python_sitelib}/bzrlib/plugins/bzrtools/*.pyo
+%{python_sitelib}/bzrlib/plugins/bzrtools/tests/
 
 %changelog
+* Mon Nov 06 2006 Toshio Kuratomi  0.12.2-2
+- Add the tests directory as bzr has an undocumented "selftest" subcommand
+  that relies on them.
+
+* Thu Oct 05 2006 Toshio Kuratomi  0.12.2-1
+- Update to 0.12.2
+- The push command was renamed to rspush.  Update the %%description to match.
+
 * Thu Oct 05 2006 Toshio Kuratomi  0.11.0-1
 - Update to 0.11.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzrtools/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Oct 2006 04:38:16 -0000	1.6
+++ sources	6 Nov 2006 19:15:56 -0000	1.7
@@ -1 +1 @@
-8d34615bafbd40518e75509e7d3a8c04  bzrtools-0.11.0.tar.gz
+3653679f3295deca085811e54da2b6fa  bzrtools-0.12.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov  6 19:34:21 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  6 Nov 2006 12:34:21 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.13,1.14
Message-ID: <200611061934.kA6JYLi5010247@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10229

Modified Files:
	Config_Extras.py 
Log Message:
legacy do not offer ppc


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Config_Extras.py	6 Nov 2006 15:24:59 -0000	1.13
+++ Config_Extras.py	6 Nov 2006 19:34:19 -0000	1.14
@@ -85,7 +85,8 @@
 
 # For RepoSupport.py features.
 baserepos = { '3' : ['fedora-core','fedora-legacy-updates','fedora-extras'],
-              '4' : ['fedora-core','fedora-legacy-updates','fedora-extras'],
+              '4' : ['fedora-core','fedora-core-updates','fedora-extras'],
+#              '4' : ['fedora-core','fedora-legacy-updates','fedora-extras'],
               '5' : ['fedora-core','fedora-core-updates','fedora-extras'],
               '6' : ['fedora-core','fedora-core-updates','fedora-extras'],
               'development' : ['fedora-core','fedora-extras']



From fedora-extras-commits at redhat.com  Mon Nov  6 19:40:20 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 6 Nov 2006 12:40:20 -0700
Subject: rpms/rssowl/devel rssowl.script,1.8,1.9 rssowl.spec,1.16,1.17
Message-ID: <200611061940.kA6JeKXE010297@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10275

Modified Files:
	rssowl.script rssowl.spec 
Log Message:
* Mon Nov 06 2006 Andrew Overholt  1.2.2-7
- Use copy-platform in %%{_libdir}.
- Use SWT in new %%{_libdir} location.



Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rssowl.script	4 Oct 2006 14:00:51 -0000	1.8
+++ rssowl.script	6 Nov 2006 19:39:49 -0000	1.9
@@ -10,7 +10,7 @@
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
 
 
 


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rssowl.spec	4 Oct 2006 15:04:50 -0000	1.16
+++ rssowl.spec	6 Nov 2006 19:39:49 -0000	1.17
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2.2
-%define release 6%{?dist}
+%define release 7%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -59,9 +59,10 @@
 rm doc/mpl-v11.txt
 
 %build
-build-jar-repository -p lib swt-gtk-3.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
+build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
 ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
 ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
+ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar lib
 cd src
 ant deploy_linux
 
@@ -136,6 +137,10 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Mon Nov 06 2006 Andrew Overholt  1.2.2-7
+- Use copy-platform in %%{_libdir}.
+- Use SWT in new %%{_libdir} location.
+
 * Wed Oct  4 2006 Anthony Green  - 1.2.2-6
 - Fix build classpath.
 



From fedora-extras-commits at redhat.com  Mon Nov  6 19:43:59 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 6 Nov 2006 12:43:59 -0700
Subject: rpms/rssowl/devel rssowl.spec,1.17,1.18
Message-ID: <200611061943.kA6Jhx8g010367@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10351

Modified Files:
	rssowl.spec 
Log Message:
Remove erroneous comment.  Fixes still apply.


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rssowl.spec	6 Nov 2006 19:39:49 -0000	1.17
+++ rssowl.spec	6 Nov 2006 19:43:29 -0000	1.18
@@ -138,7 +138,6 @@
 
 %changelog
 * Mon Nov 06 2006 Andrew Overholt  1.2.2-7
-- Use copy-platform in %%{_libdir}.
 - Use SWT in new %%{_libdir} location.
 
 * Wed Oct  4 2006 Anthony Green  - 1.2.2-6



From fedora-extras-commits at redhat.com  Mon Nov  6 19:45:27 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 6 Nov 2006 12:45:27 -0700
Subject: rpms/eclipse-emf/devel eclipse-emf.spec,1.4,1.5
Message-ID: <200611061945.kA6JjRKY010405@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10384

Modified Files:
	eclipse-emf.spec 
Log Message:
* Mon Nov 06 2006 Andrew Overholt  2.2.1-3
- Use copy-platform in %%{_libdir}.
- Add Requires(post,postun) for sub-packages using rebuild-gcj-db.



Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/devel/eclipse-emf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-emf.spec	1 Nov 2006 02:02:15 -0000	1.4
+++ eclipse-emf.spec	6 Nov 2006 19:44:56 -0000	1.5
@@ -8,7 +8,7 @@
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
@@ -63,6 +63,10 @@
 Summary:        Eclipse EMF SDO
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        sdo-sdk
 Summary:        Eclipse EMF SDO Source (SDK)
@@ -73,6 +77,10 @@
 Summary:        Eclipse EMF XSD
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        xsd-sdk
 Summary:        Eclipse EMF XSD Source (SDK)
@@ -84,6 +92,10 @@
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-xsd = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        standalone
 Summary:        Eclipse EMF Standalone
@@ -144,7 +156,7 @@
 homedir=$(cd home > /dev/null && pwd)
 
 # See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform `pwd`/SDK %{eclipse_base}
+/bin/sh -x %{_libdir}/eclipse/buildscripts/copy-platform `pwd`/SDK %{eclipse_base}
 SDK=$(cd SDK > /dev/null && pwd)
 
 # Build the EMF builder helper jars
@@ -163,10 +175,7 @@
 echo "" > build/assemble.org.eclipse.emf.build.ant.all.xml
 echo "" > build/package.org.eclipse.emf.build.ant.all.xml
 
-java -cp %{eclipse_base}/startup.jar                   \
-     -Duser.home=$homedir                              \
-     -Dosgi.sharedConfiguration.area=$SDK/fragments/eclipse/configuration \
-     org.eclipse.core.launcher.Main                    \
+eclipse \
      -application org.eclipse.ant.core.antRunner       \
      -Dtype=plugin                                    \
      -Did=org.eclipse.emf.build.ant                   \
@@ -176,8 +185,7 @@
      -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
 
 pushd build/plugins/org.eclipse.emf.build.ant
-java -cp /usr/share/eclipse/startup.jar                   \
-     org.eclipse.core.launcher.Main                    \
+eclipse \
      -application org.eclipse.ant.core.antRunner       \
      -f build.xml build.update.jar
 popd
@@ -197,11 +205,8 @@
 # Remove the bits of the SDK that we don't need
 rm SDK/features/org.eclipse.pde.source*
 rm SDK/features/org.eclipse.jdt.source*
-rm SDK/features/org.eclipse.sdk*
 rm SDK/plugins/org.eclipse.pde.source*
 rm SDK/plugins/org.eclipse.jdt.source*
-rm SDK/plugins/org.eclipse.jdt.doc*
-rm SDK/plugins/org.eclipse.sdk*
 # This tomcat chicanery will be fixed in a future Eclipse SDK RPM
 mkdir SDK2
 pushd SDK
@@ -233,6 +238,11 @@
 
 # some notes about what we're doing here:
 #
+# -Dosgi.sharedConfiguration.area=: we can't use the binary launcher since it
+#                                   doesn't see the EMF helper plugins so we
+#                                   have to set this manually.  If it ever
+#                                   changes in the Eclipse SDK, we'll need to
+#                                   change it here.
 # -Duser.home=$homedir: override java.home in the vm so that eclipse only adds files in the buildroot 
 # -Dcomponent=sdk: the component of EMF we want to build 
 # -DjavacFailOnError=true: fail if there is an error 
@@ -243,6 +253,7 @@
 # -DskipFetch=true: don't fetch the sources 
 # -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
 java -cp $SDK/startup.jar \
+    -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration                        \
     -Duser.home=$homedir                        \
      org.eclipse.core.launcher.Main             \
     -application org.eclipse.ant.core.antRunner \
@@ -317,6 +328,12 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+
 %post sdo
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -502,6 +519,10 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
+* Mon Nov 06 2006 Andrew Overholt  2.2.1-3
+- Use copy-platform in %%{_libdir}.
+- Add Requires(post,postun) for sub-packages using rebuild-gcj-db.
+
 * Tue Oct 31 2006 Andrew Overholt  2.2.1-2
 - Change usage of copy-platform to work with upcoming changes to SDK.
 - Pass -Dosgi.sharedConfiguration.area to work with new split SDK installation.



From fedora-extras-commits at redhat.com  Mon Nov  6 19:46:14 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 6 Nov 2006 12:46:14 -0700
Subject: rpms/azureus/devel azureus.script,1.10,1.11 azureus.spec,1.38,1.39
Message-ID: <200611061946.kA6JkEeK010533@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10411

Modified Files:
	azureus.script azureus.spec 
Log Message:
* Mon Nov 06 2006 Andrew Overholt  2.5.0.0-9
- Use new swt jar location.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- azureus.script	28 Oct 2006 14:15:55 -0000	1.10
+++ azureus.script	6 Nov 2006 19:45:44 -0000	1.11
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:`build-classpath jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- azureus.spec	28 Oct 2006 14:15:55 -0000	1.38
+++ azureus.spec	6 Nov 2006 19:45:44 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -101,8 +101,9 @@
 
 %build
 mkdir -p build/libs
-build-jar-repository -p build/libs jakarta-commons-cli swt-gtk-3.2 log4j gnu-crypto gtk2.8 glib0.2
+build-jar-repository -p build/libs jakarta-commons-cli log4j gnu-crypto gtk2.8 glib0.2
 ln -s /usr/share/java/gcj-endorsed/bcprov-1.33.jar build/libs
+ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar build/libs
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -115,7 +116,7 @@
 cd plugins/azplugins
 unzip -q %{SOURCE5}
 rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:.
 find ./ -name \*java | xargs rm
 jar cvf azplugins_1.9.jar .
 cd ../..
@@ -124,7 +125,7 @@
 cd plugins/bdcc
 unzip *.jar
 rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:.
 find ./ -name \*java | xargs rm
 jar cvf bdcc_2.2.2.jar .
 cd ../..
@@ -206,6 +207,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Nov 06 2006 Andrew Overholt  2.5.0.0-9
+- Use new swt jar location.
+
 * Sat Oct 28 2006 Anthony Green  2.5.0.0-8
 - Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it
   will run on non-gcj java alternatives.



From fedora-extras-commits at redhat.com  Mon Nov  6 19:49:30 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 6 Nov 2006 12:49:30 -0700
Subject: rpms/eclipse-gef/devel eclipse-gef.spec,1.3,1.4
Message-ID: <200611061949.kA6JnUKZ010702@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-gef/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10680

Modified Files:
	eclipse-gef.spec 
Log Message:
* Mon Nov 06 2006 Andrew Overholt  3.2.1-3
- Use copy-platform in %%{_libdir}.
- Use binary launcher rather than startup.jar to guard against future
  osgi.sharedConfiguration.area changes.



Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-gef.spec	19 Oct 2006 20:34:09 -0000	1.3
+++ eclipse-gef.spec	6 Nov 2006 19:49:00 -0000	1.4
@@ -16,7 +16,7 @@
 Summary:        Graphical Editor Framework (GEF) plugin for Eclipse
 Name:           %{eclipse_name}-gef
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/gef/
@@ -137,7 +137,7 @@
 
 %build
 # See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+/bin/sh -x %{_libdir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base}
 SDK=$(cd SDK > /dev/null && pwd)
 
 mkdir home
@@ -156,9 +156,7 @@
 #                      put the plugins that have just been built
 # -DskipFetch=true: don't fetch the sources 
 # -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
-java -cp $SDK/startup.jar                       \
-    -Duser.home=$homedir                        \
-     org.eclipse.core.launcher.Main             \
+eclipse \
     -application org.eclipse.ant.core.antRunner \
     -Dcomponent=sdk                             \
     -DjavacFailOnError=true                     \
@@ -169,9 +167,7 @@
     -DbaseExists=true
 
 # build the examples
-java -cp $SDK/startup.jar                       \
-    -Duser.home=$homedir                        \
-     org.eclipse.core.launcher.Main             \
+eclipse \
     -application org.eclipse.ant.core.antRunner \
     -Dcomponent=examples                        \
     -DjavacFailOnError=true                     \
@@ -250,6 +246,11 @@
 %endif
 
 %changelog
+* Mon Nov 06 2006 Andrew Overholt  3.2.1-3
+- Use copy-platform in %%{_libdir}.
+- Use binary launcher rather than startup.jar to guard against future
+  osgi.sharedConfiguration.area changes.
+
 * Thu Oct 19 2006 Andrew Overholt  3.2.1-2
 - Fix buildroot (don't know how the wrong one slipped in).
 



From fedora-extras-commits at redhat.com  Mon Nov  6 20:18:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 6 Nov 2006 13:18:49 -0700
Subject: rpms/vala - New directory
Message-ID: <200611062018.kA6KInpX013920@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/vala
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13916/vala

Log Message:
Directory /cvs/extras/rpms/vala added to the repository




From fedora-extras-commits at redhat.com  Mon Nov  6 20:18:54 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 6 Nov 2006 13:18:54 -0700
Subject: rpms/vala/devel - New directory
Message-ID: <200611062018.kA6KIsmw013934@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13916/vala/devel

Log Message:
Directory /cvs/extras/rpms/vala/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov  6 20:19:13 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 6 Nov 2006 13:19:13 -0700
Subject: rpms/vala Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611062019.kA6KJD3T013965@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/vala
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13959

Added Files:
	Makefile import.log 
Log Message:
Setup of module vala


--- NEW FILE Makefile ---
# Top level Makefile for module vala
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  Mon Nov  6 20:19:19 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 6 Nov 2006 13:19:19 -0700
Subject: rpms/vala/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611062019.kA6KJJao013983@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13959/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vala


--- 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 Nov  6 20:21:08 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 6 Nov 2006 13:21:08 -0700
Subject: rpms/vala import.log,1.1,1.2
Message-ID: <200611062021.kA6KL8Ya014082@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/vala
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14033

Modified Files:
	import.log 
Log Message:
auto-import vala-0.0.5-1 on branch devel from vala-0.0.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vala/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Nov 2006 20:19:13 -0000	1.1
+++ import.log	6 Nov 2006 20:20:38 -0000	1.2
@@ -0,0 +1 @@
+vala-0_0_5-1:HEAD:vala-0.0.5-1.src.rpm:1162844430



From fedora-extras-commits at redhat.com  Mon Nov  6 20:21:09 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 6 Nov 2006 13:21:09 -0700
Subject: rpms/vala/devel vala.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611062021.kA6KL9P9014086@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/vala/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14033/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vala.spec 
Log Message:
auto-import vala-0.0.5-1 on branch devel from vala-0.0.5-1.src.rpm


--- NEW FILE vala.spec ---
Name:           vala
Version:        0.0.5
Release:        1%{?dist}
Summary:        A modern programming language for GNOME

Group:          Development/Languages
License:        LGPL
URL:            http://vala.paldo.org/
Source0:        http://www.paldo.org/vala/vala-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  glib2-devel flex bison
#Requires:       

%description
Vala is a new programming language that aims to bring modern programming
language features to GNOME developers without imposing any additional
runtime requirements and without using a different ABI compared to
applications and libraries written in C.

valac, the Vala compiler, is a self-hosting compiler that translates
Vala source code into C source and header files. It uses the GObject
type system to create classes and interfaces declared in the Vala source
code. It's also planned to generate GIDL files when gobject-
introspection is ready.

The syntax of Vala is similar to C#, modified to better fit the GObject
type system.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
Development files for %{name}. This is not necessary for using the %{name}
compiler.


%prep
%setup -q


%build
%configure
# Don't use rpath!
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libvala.la


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
%{_bindir}/valac
%{_datadir}/vala
%{_libdir}/libvala.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/vala-1.0
%{_libdir}/libvala.so
%{_libdir}/pkgconfig/vala-1.0.pc



%changelog
* Mon Nov  6 2006 Michel Salim  - 0.0.5-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vala/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Nov 2006 20:19:18 -0000	1.1
+++ .cvsignore	6 Nov 2006 20:20:38 -0000	1.2
@@ -0,0 +1 @@
+vala-0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vala/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Nov 2006 20:19:18 -0000	1.1
+++ sources	6 Nov 2006 20:20:38 -0000	1.2
@@ -0,0 +1 @@
+ec3c9b717c49bd4fb207d368fe296475  vala-0.0.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov  6 20:21:32 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 6 Nov 2006 13:21:32 -0700
Subject: owners owners.list,1.1895,1.1896
Message-ID: <200611062021.kA6KLWiF014120@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14024

Modified Files:
	owners.list 
Log Message:
Added vala to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1895
retrieving revision 1.1896
diff -u -r1.1895 -r1.1896
--- owners.list	6 Nov 2006 19:10:38 -0000	1.1895
+++ owners.list	6 Nov 2006 20:21:02 -0000	1.1896
@@ -2297,6 +2297,7 @@
 Fedora Extras|uuid|Universally Unique Identifier library|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|uw-imap|UW Server daemons for IMAP and POP network mail protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|v2strip|ID3v2 tags remover|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
+Fedora Extras|vala|A modern programming language for GNOME|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov  6 20:36:37 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Mon, 6 Nov 2006 13:36:37 -0700
Subject: rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.2,1.3
Message-ID: <200611062036.kA6KabAb014270@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14253

Modified Files:
	eclipse-emf.spec 
Log Message:
* Mon Nov 06 2006 Andrew Overholt  2.2.1-2
- Add Requires(post,postun) for sub-packages using rebuild-gcj-db.
- Change usage of copy-platform to work with upcoming changes to SDK.



Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-emf.spec	30 Oct 2006 17:53:31 -0000	1.2
+++ eclipse-emf.spec	6 Nov 2006 20:36:06 -0000	1.3
@@ -8,7 +8,7 @@
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        1%{?dist}
+Release:        3%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
@@ -63,6 +63,10 @@
 Summary:        Eclipse EMF SDO
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        sdo-sdk
 Summary:        Eclipse EMF SDO Source (SDK)
@@ -73,6 +77,10 @@
 Summary:        Eclipse EMF XSD
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        xsd-sdk
 Summary:        Eclipse EMF XSD Source (SDK)
@@ -84,6 +92,10 @@
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-xsd = %{version}-%{release}
+%if %{gcj_support}
+Requires(post):   java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
 
 %package        standalone
 Summary:        Eclipse EMF Standalone
@@ -144,7 +156,7 @@
 homedir=$(cd home > /dev/null && pwd)
 
 # See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+/bin/sh -x %{eclipse_base}/buildscripts/copy-platform `pwd`/SDK %{eclipse_base}
 SDK=$(cd SDK > /dev/null && pwd)
 
 # Build the EMF builder helper jars
@@ -163,9 +175,7 @@
 echo "" > build/assemble.org.eclipse.emf.build.ant.all.xml
 echo "" > build/package.org.eclipse.emf.build.ant.all.xml
 
-java -cp %{eclipse_base}/startup.jar                   \
-     -Duser.home=$homedir                              \
-     org.eclipse.core.launcher.Main                    \
+eclipse \
      -application org.eclipse.ant.core.antRunner       \
      -Dtype=plugin                                    \
      -Did=org.eclipse.emf.build.ant                   \
@@ -175,8 +185,7 @@
      -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
 
 pushd build/plugins/org.eclipse.emf.build.ant
-java -cp /usr/share/eclipse/startup.jar                   \
-     org.eclipse.core.launcher.Main                    \
+eclipse \
      -application org.eclipse.ant.core.antRunner       \
      -f build.xml build.update.jar
 popd
@@ -196,11 +205,8 @@
 # Remove the bits of the SDK that we don't need
 rm SDK/features/org.eclipse.pde.source*
 rm SDK/features/org.eclipse.jdt.source*
-rm SDK/features/org.eclipse.sdk*
 rm SDK/plugins/org.eclipse.pde.source*
 rm SDK/plugins/org.eclipse.jdt.source*
-rm SDK/plugins/org.eclipse.jdt.doc*
-rm SDK/plugins/org.eclipse.sdk*
 # This tomcat chicanery will be fixed in a future Eclipse SDK RPM
 mkdir SDK2
 pushd SDK
@@ -316,6 +322,12 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+
 %post sdo
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -501,6 +513,10 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
+* Mon Nov 06 2006 Andrew Overholt  2.2.1-2
+- Add Requires(post,postun) for sub-packages using rebuild-gcj-db.
+- Change usage of copy-platform to work with upcoming changes to SDK.
+
 * Thu Oct 19 2006 Andrew Overholt  2.2.1-1
 - 2.2.1.
 - Add sdk package, fix up inter-dependencies to match upstream.



From fedora-extras-commits at redhat.com  Mon Nov  6 21:01:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 6 Nov 2006 14:01:26 -0700
Subject: rpms/xmms/FC-6 xmms-1.2.10-pls-188603.patch, NONE, 1.1 xmms.sh, NONE,
	1.1 xmms.spec, 1.25, 1.26
Message-ID: <200611062101.kA6L1QCw019233@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16224/FC-6

Modified Files:
	xmms.spec 
Added Files:
	xmms-1.2.10-pls-188603.patch xmms.sh 
Log Message:
* Mon Nov  6 2006 Ville Skytt??  - 1:1.2.10-29
- Work around incompatibilities with the Composite X extension (#213172).
- Apply upstream playlist randomization improvements (#188603).


xmms-1.2.10-pls-188603.patch:

--- NEW FILE xmms-1.2.10-pls-188603.patch ---
diff -u -p -r1.84 -r1.85
--- xmms/xmms/playlist.c	2004/03/21 16:41:56	1.84
+++ xmms/xmms/playlist.c	2004/04/12 19:06:58	1.85
@@ -1633,14 +1640,14 @@ static GList *playlist_shuffle_list(GLis
 	for (node = list, i = 0; i < len; node = g_list_next(node), i++)
 		ptrs[i] = node;
 
-	j = random() % len;
+	j = (int)(random() / (RAND_MAX + 1.0) * len); 
 	list = ptrs[j];
 	ptrs[j]->next = NULL;
 	ptrs[j] = ptrs[0];
 
 	for (i = 1; i < len; i++)
 	{
-		j = random() % (len - i);
+		j = (int)(random() / (RAND_MAX + 1.0) * (len - i));
 		list->prev = ptrs[i + j];
 		ptrs[i + j]->next = list;
 		list = ptrs[i + j];
diff -u -p -r1.88 -r1.89
--- xmms/xmms/playlist.c	2005/05/06 23:57:03	1.88
+++ xmms/xmms/playlist.c	2005/05/07 01:47:35	1.89
@@ -563,7 +563,7 @@ void playlist_play(void)
 		/* If there are entries */
 		if (g_list_length(skinlist)) {
 			/* Get a random value to select the skin to use */
-			int randval = random() % (g_list_length(skinlist) + 1);
+			int randval = (gint)(random() / (RAND_MAX + 1.0) * (g_list_length(skinlist) + 1));
 			/* If the random value is 0, use the default skin */
 			/* Otherwise subtract 1 from the random value and */
 			/* select the skin */


--- NEW FILE xmms.sh ---
#!/bin/sh

# https://bugzilla.redhat.com/213172
if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then
    exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/xmms "$@"
else
    exec /usr/libexec/xmms "$@"
fi


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-6/xmms.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xmms.spec	28 Aug 2006 16:06:01 -0000	1.25
+++ xmms.spec	6 Nov 2006 21:00:56 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.10
-Release:        28%{?dist}
+Release:        29%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -12,6 +12,7 @@
 # $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2
 # $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10
 Source0:        %{name}-%{version}.patched.tar.bz2
+Source1:        xmms.sh
 Source2:        xmms.xpm
 Source3:        rh_mp3.c
 # http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9
@@ -29,6 +30,7 @@
 Patch10:        %{name}-alsa-backport.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
 Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
+Patch13:        %{name}-1.2.10-pls-188603.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel
@@ -109,6 +111,8 @@
 %patch11 -p1 -b .gcc4
 # Fix for crossfade >= 0.3.9 to work properly
 %patch12 -p1 -b .crossfade
+# Randomize playlists better
+%patch13 -p1 -b .pls
 # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
@@ -141,6 +145,15 @@
 # On FC5 x86_64, some get created even though we pass --disable-static
 rm -f $RPM_BUILD_ROOT%{_libdir}/xmms/*/*.a
 
+# https://bugzilla.redhat.com/213172
+for bin in xmms wmxmms ; do
+    install -Dpm 755 $RPM_BUILD_ROOT%{_bindir}/$bin \
+        $RPM_BUILD_ROOT%{_libexecdir}/$bin
+    sed -e "s|/usr/libexec/xmms|%{_libexecdir}/$bin|" %{SOURCE1} > \
+        $RPM_BUILD_ROOT%{_bindir}/$bin
+    chmod 755 $RPM_BUILD_ROOT%{_bindir}/$bin
+done
+
 # Link to the desktop menu entry included in redhat-menus
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications
 ln -s ../desktop-menu-patches/redhat-audio-player.desktop \
@@ -175,6 +188,8 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
+%{_libexecdir}/xmms
+%{_libexecdir}/wmxmms
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*x*/apps/xmms.xpm
 %{_datadir}/xmms/
@@ -208,6 +223,10 @@
 
 
 %changelog
+* Mon Nov  6 2006 Ville Skytt??  - 1:1.2.10-29
+- Work around incompatibilities with the Composite X extension (#213172).
+- Apply upstream playlist randomization improvements (#188603).
+
 * Mon Aug 28 2006 Ville Skytt??  - 1:1.2.10-28
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Nov  6 21:01:29 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 6 Nov 2006 14:01:29 -0700
Subject: rpms/xmms/devel xmms-1.2.10-pls-188603.patch, NONE, 1.1 xmms.sh,
	NONE, 1.1 xmms.spec, 1.25, 1.26
Message-ID: <200611062101.kA6L1TsD019236@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16224/devel

Modified Files:
	xmms.spec 
Added Files:
	xmms-1.2.10-pls-188603.patch xmms.sh 
Log Message:
* Mon Nov  6 2006 Ville Skytt??  - 1:1.2.10-29
- Work around incompatibilities with the Composite X extension (#213172).
- Apply upstream playlist randomization improvements (#188603).


xmms-1.2.10-pls-188603.patch:

--- NEW FILE xmms-1.2.10-pls-188603.patch ---
diff -u -p -r1.84 -r1.85
--- xmms/xmms/playlist.c	2004/03/21 16:41:56	1.84
+++ xmms/xmms/playlist.c	2004/04/12 19:06:58	1.85
@@ -1633,14 +1640,14 @@ static GList *playlist_shuffle_list(GLis
 	for (node = list, i = 0; i < len; node = g_list_next(node), i++)
 		ptrs[i] = node;
 
-	j = random() % len;
+	j = (int)(random() / (RAND_MAX + 1.0) * len); 
 	list = ptrs[j];
 	ptrs[j]->next = NULL;
 	ptrs[j] = ptrs[0];
 
 	for (i = 1; i < len; i++)
 	{
-		j = random() % (len - i);
+		j = (int)(random() / (RAND_MAX + 1.0) * (len - i));
 		list->prev = ptrs[i + j];
 		ptrs[i + j]->next = list;
 		list = ptrs[i + j];
diff -u -p -r1.88 -r1.89
--- xmms/xmms/playlist.c	2005/05/06 23:57:03	1.88
+++ xmms/xmms/playlist.c	2005/05/07 01:47:35	1.89
@@ -563,7 +563,7 @@ void playlist_play(void)
 		/* If there are entries */
 		if (g_list_length(skinlist)) {
 			/* Get a random value to select the skin to use */
-			int randval = random() % (g_list_length(skinlist) + 1);
+			int randval = (gint)(random() / (RAND_MAX + 1.0) * (g_list_length(skinlist) + 1));
 			/* If the random value is 0, use the default skin */
 			/* Otherwise subtract 1 from the random value and */
 			/* select the skin */


--- NEW FILE xmms.sh ---
#!/bin/sh

# https://bugzilla.redhat.com/213172
if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then
    exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/xmms "$@"
else
    exec /usr/libexec/xmms "$@"
fi


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xmms.spec	28 Aug 2006 16:06:01 -0000	1.25
+++ xmms.spec	6 Nov 2006 21:00:57 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           xmms
 Version:        1.2.10
-Release:        28%{?dist}
+Release:        29%{?dist}
 Epoch:          1
 Summary:        The X MultiMedia System, a media player
 
@@ -12,6 +12,7 @@
 # $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2
 # $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10
 Source0:        %{name}-%{version}.patched.tar.bz2
+Source1:        xmms.sh
 Source2:        xmms.xpm
 Source3:        rh_mp3.c
 # http://cvs.xmms.org/cvsweb.cgi/xmms/General/joystick/joy.c.diff?r1=1.8&r2=1.9
@@ -29,6 +30,7 @@
 Patch10:        %{name}-alsa-backport.patch
 Patch11:        %{name}-1.2.10-gcc4.patch
 Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
+Patch13:        %{name}-1.2.10-pls-188603.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk+-devel
@@ -109,6 +111,8 @@
 %patch11 -p1 -b .gcc4
 # Fix for crossfade >= 0.3.9 to work properly
 %patch12 -p1 -b .crossfade
+# Randomize playlists better
+%patch13 -p1 -b .pls
 # Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
 sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
@@ -141,6 +145,15 @@
 # On FC5 x86_64, some get created even though we pass --disable-static
 rm -f $RPM_BUILD_ROOT%{_libdir}/xmms/*/*.a
 
+# https://bugzilla.redhat.com/213172
+for bin in xmms wmxmms ; do
+    install -Dpm 755 $RPM_BUILD_ROOT%{_bindir}/$bin \
+        $RPM_BUILD_ROOT%{_libexecdir}/$bin
+    sed -e "s|/usr/libexec/xmms|%{_libexecdir}/$bin|" %{SOURCE1} > \
+        $RPM_BUILD_ROOT%{_bindir}/$bin
+    chmod 755 $RPM_BUILD_ROOT%{_bindir}/$bin
+done
+
 # Link to the desktop menu entry included in redhat-menus
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications
 ln -s ../desktop-menu-patches/redhat-audio-player.desktop \
@@ -175,6 +188,8 @@
 %doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
+%{_libexecdir}/xmms
+%{_libexecdir}/wmxmms
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*x*/apps/xmms.xpm
 %{_datadir}/xmms/
@@ -208,6 +223,10 @@
 
 
 %changelog
+* Mon Nov  6 2006 Ville Skytt??  - 1:1.2.10-29
+- Work around incompatibilities with the Composite X extension (#213172).
+- Apply upstream playlist randomization improvements (#188603).
+
 * Mon Aug 28 2006 Ville Skytt??  - 1:1.2.10-28
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Mon Nov  6 22:12:44 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 6 Nov 2006 15:12:44 -0700
Subject: rpms/sword/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200611062212.kA6MCiEJ024722@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24697

Modified Files:
	.cvsignore sources 
Log Message:
Replace sword-src.rpm with sword tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 18:57:47 -0000	1.3
+++ .cvsignore	6 Nov 2006 22:12:14 -0000	1.4
@@ -1 +1 @@
-sword-1.5.9-1.src.rpm
+sword-1.5.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 18:57:47 -0000	1.3
+++ sources	6 Nov 2006 22:12:14 -0000	1.4
@@ -1 +1 @@
-2718a640384bf378fc8d229514f8abbd  sword-1.5.9-1.src.rpm
+e1f1af8c2add8310d0bbcddc9af523b8  sword-1.5.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov  7 01:15:47 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:15:47 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.28, 1.29 sources, 1.29,
	1.30 sylpheed-claws.spec, 1.54, 1.55
Message-ID: <200611070115.kA71Flrb001992@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	20 Oct 2006 07:17:22 -0000	1.28
+++ .cvsignore	7 Nov 2006 01:15:17 -0000	1.29
@@ -1 +1 @@
-sylpheed-claws-2.5.6.tar.bz2
+sylpheed-claws-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	20 Oct 2006 07:17:22 -0000	1.29
+++ sources	7 Nov 2006 01:15:17 -0000	1.30
@@ -1 +1 @@
-f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2
+c16d658bd7d48bbecc2574e70b95c560  sylpheed-claws-2.6.0.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sylpheed-claws.spec	20 Oct 2006 07:17:22 -0000	1.54
+++ sylpheed-claws.spec	7 Nov 2006 01:15:17 -0000	1.55
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.6
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.6.0.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -24,7 +24,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.46
+BuildRequires:  libetpan-devel >= 0.48
 BuildRequires:  libgnomeprintui22-devel
 
 %description
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Thu Oct 19 2006 Andreas Bierfert 
 2.5.6-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Nov  7 01:15:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:15:44 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.24, 1.25 sources, 1.25,
	1.26 sylpheed-claws.spec, 1.48, 1.49
Message-ID: <200611070115.kA71Fim0001979@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	20 Oct 2006 08:21:19 -0000	1.24
+++ .cvsignore	7 Nov 2006 01:15:14 -0000	1.25
@@ -1 +1 @@
-sylpheed-claws-2.5.6.tar.bz2
+sylpheed-claws-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Oct 2006 08:21:19 -0000	1.25
+++ sources	7 Nov 2006 01:15:14 -0000	1.26
@@ -1 +1 @@
-f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2
+c16d658bd7d48bbecc2574e70b95c560  sylpheed-claws-2.6.0.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sylpheed-claws.spec	20 Oct 2006 08:21:19 -0000	1.48
+++ sylpheed-claws.spec	7 Nov 2006 01:15:14 -0000	1.49
@@ -1,13 +1,13 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
 Name:           sylpheed-claws
-Version:        2.5.6
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.6.0.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -26,7 +26,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.46
+BuildRequires:  libetpan-devel >= 0.48
 BuildRequires:  libgnomeprintui22-devel
 BuildRequires:  libtool
 
@@ -179,6 +179,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Fri Oct 20 2006 Andreas Bierfert 
 2.5.6-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Nov  7 01:15:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:15:45 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.28, 1.29 sources, 1.29,
	1.30 sylpheed-claws.spec, 1.53, 1.54
Message-ID: <200611070115.kA71Fja3001984@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	20 Oct 2006 08:21:20 -0000	1.28
+++ .cvsignore	7 Nov 2006 01:15:15 -0000	1.29
@@ -1 +1 @@
-sylpheed-claws-2.5.6.tar.bz2
+sylpheed-claws-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	20 Oct 2006 08:21:20 -0000	1.29
+++ sources	7 Nov 2006 01:15:15 -0000	1.30
@@ -1 +1 @@
-f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2
+c16d658bd7d48bbecc2574e70b95c560  sylpheed-claws-2.6.0.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sylpheed-claws.spec	20 Oct 2006 08:21:20 -0000	1.53
+++ sylpheed-claws.spec	7 Nov 2006 01:15:15 -0000	1.54
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.6
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.6.0.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -24,7 +24,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.46
+BuildRequires:  libetpan-devel >= 0.48
 BuildRequires:  libgnomeprintui22-devel
 
 %description
@@ -168,6 +168,10 @@
 %{_libdir}/sylpheed-claws/plugins/bogofilter.so
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Fri Oct 20 2006 Andreas Bierfert 
 2.5.6-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Nov  7 01:15:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:15:46 -0700
Subject: rpms/sylpheed-claws/FC-6 .cvsignore, 1.28, 1.29 sources, 1.29,
	1.30 sylpheed-claws.spec, 1.54, 1.55
Message-ID: <200611070115.kA71Fkjp001989@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/FC-6

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-6/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	20 Oct 2006 07:17:22 -0000	1.28
+++ .cvsignore	7 Nov 2006 01:15:16 -0000	1.29
@@ -1 +1 @@
-sylpheed-claws-2.5.6.tar.bz2
+sylpheed-claws-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-6/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	20 Oct 2006 07:17:22 -0000	1.29
+++ sources	7 Nov 2006 01:15:16 -0000	1.30
@@ -1 +1 @@
-f342f7be46a3d2771f6aaad44838e513  sylpheed-claws-2.5.6.tar.bz2
+c16d658bd7d48bbecc2574e70b95c560  sylpheed-claws-2.6.0.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-6/sylpheed-claws.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sylpheed-claws.spec	20 Oct 2006 07:17:22 -0000	1.54
+++ sylpheed-claws.spec	7 Nov 2006 01:15:16 -0000	1.55
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.5.6
+Version:        2.6.0
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.5.6.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.6.0.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -24,7 +24,7 @@
 BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 BuildRequires:  gettext-devel
-BuildRequires:  libetpan-devel >= 0.46
+BuildRequires:  libetpan-devel >= 0.48
 BuildRequires:  libgnomeprintui22-devel
 
 %description
@@ -169,6 +169,10 @@
 
 
 %changelog
+* Mon Nov 06 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Thu Oct 19 2006 Andreas Bierfert 
 2.5.6-1
 - version upgrade



From fedora-extras-commits at redhat.com  Tue Nov  7 01:25:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:25:09 -0700
Subject: rpms/sylpheed-claws-plugins/FC-6 sylpheed-claws-plugins.spec, 1.23, 
	1.24
Message-ID: <200611070125.kA71P91J002246@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182/FC-6

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-6/sylpheed-claws-plugins.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sylpheed-claws-plugins.spec	20 Oct 2006 09:47:50 -0000	1.23
+++ sylpheed-claws-plugins.spec	7 Nov 2006 01:24:39 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert 
+2.5.2-5
+- rebuild
+
 * Fri Oct 20 2006 Andreas Bierfert 
 2.5.2-4
 - rebuild



From fedora-extras-commits at redhat.com  Tue Nov  7 01:25:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:25:08 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins.spec, 1.17, 
	1.18
Message-ID: <200611070125.kA71P8o9002240@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182/FC-4

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sylpheed-claws-plugins.spec	20 Oct 2006 09:47:48 -0000	1.17
+++ sylpheed-claws-plugins.spec	7 Nov 2006 01:24:38 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert 
+2.5.2-5
+- rebuild
+
 * Fri Oct 20 2006 Andreas Bierfert 
 2.5.2-4
 - rebuild



From fedora-extras-commits at redhat.com  Tue Nov  7 01:25:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:25:09 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.22, 
	1.23
Message-ID: <200611070125.kA71P9b7002243@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sylpheed-claws-plugins.spec	20 Oct 2006 09:47:49 -0000	1.22
+++ sylpheed-claws-plugins.spec	7 Nov 2006 01:24:38 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -510,6 +510,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert 
+2.5.2-5
+- rebuild
+
 * Fri Oct 20 2006 Andreas Bierfert 
 2.5.2-4
 - rebuild



From fedora-extras-commits at redhat.com  Tue Nov  7 01:25:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:25:10 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.24,
	1.25
Message-ID: <200611070125.kA71PAiX002249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- rebuild



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sylpheed-claws-plugins.spec	6 Nov 2006 13:53:20 -0000	1.24
+++ sylpheed-claws-plugins.spec	7 Nov 2006 01:24:40 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           sylpheed-claws-plugins
 Version:        2.5.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -512,6 +512,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert 
+2.5.2-6
+- rebuild
+
 * Mon Nov 06 2006 Jindrich Novy  2.5.2-5
 - rebuild against the new curl
 



From fedora-extras-commits at redhat.com  Tue Nov  7 01:56:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:56:28 -0700
Subject: rpms/qiv/FC-6 qiv.sh,NONE,1.1 qiv.spec,1.11,1.12
Message-ID: <200611070156.kA71uSJN002411@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/qiv/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2379/FC-6

Modified Files:
	qiv.spec 
Added Files:
	qiv.sh 
Log Message:
- fix #213581



--- NEW FILE qiv.sh ---
#!/bin/sh

# https://bugzilla.redhat.com/213581
if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then
    exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/qiv "$@"
else
    exec /usr/libexec/qiv "$@"
fi


Index: qiv.spec
===================================================================
RCS file: /cvs/extras/rpms/qiv/FC-6/qiv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qiv.spec	15 Sep 2006 06:49:06 -0000	1.11
+++ qiv.spec	7 Nov 2006 01:55:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           qiv
 Version:        2.0
-Release:        6
+Release:        7
 
 Summary:        Quick Image Viewer
 
@@ -8,6 +8,8 @@
 License:        GPL
 URL:            http://www.klografx.net/qiv/
 Source0:        http://www.klografx.net/qiv/download/qiv-2.0-src.tgz
+# fixes #213581 (script 'stolen' from xmms -> thanks ville)
+Source1:        qiv.sh
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,9 +30,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 qiv $RPM_BUILD_ROOT%{_bindir}/qiv
+install -Dpm 755 qiv $RPM_BUILD_ROOT%{_libexecdir}/qiv
 install -Dpm 644 qiv.1 $RPM_BUILD_ROOT%{_mandir}/man1/qiv.1
-
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/qiv
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,10 +42,14 @@
 %defattr(-,root,root,-)
 %doc README README.CHANGES README.COPYING README.TODO qiv-command.example
 %{_bindir}/qiv
+%{_libexecdir}/qiv
 %{_mandir}/man1/qiv.1*
 
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert  2.0-7
+- fix #213581
+
 * Fri Sep 15 2006 Andreas Bierfert  2.0-6
 - FE6 rebuild
 



From fedora-extras-commits at redhat.com  Tue Nov  7 01:56:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:56:28 -0700
Subject: rpms/qiv/devel qiv.sh,NONE,1.1 qiv.spec,1.11,1.12
Message-ID: <200611070156.kA71uSBB002414@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/qiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2379/devel

Modified Files:
	qiv.spec 
Added Files:
	qiv.sh 
Log Message:
- fix #213581



--- NEW FILE qiv.sh ---
#!/bin/sh

# https://bugzilla.redhat.com/213581
if [ -z "$XLIB_SKIP_ARGB_VISUALS" ] ; then
    exec env XLIB_SKIP_ARGB_VISUALS=1 /usr/libexec/qiv "$@"
else
    exec /usr/libexec/qiv "$@"
fi


Index: qiv.spec
===================================================================
RCS file: /cvs/extras/rpms/qiv/devel/qiv.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qiv.spec	15 Sep 2006 06:49:06 -0000	1.11
+++ qiv.spec	7 Nov 2006 01:55:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           qiv
 Version:        2.0
-Release:        6
+Release:        7
 
 Summary:        Quick Image Viewer
 
@@ -8,6 +8,8 @@
 License:        GPL
 URL:            http://www.klografx.net/qiv/
 Source0:        http://www.klografx.net/qiv/download/qiv-2.0-src.tgz
+# fixes #213581 (script 'stolen' from xmms -> thanks ville)
+Source1:        qiv.sh
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,9 +30,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 qiv $RPM_BUILD_ROOT%{_bindir}/qiv
+install -Dpm 755 qiv $RPM_BUILD_ROOT%{_libexecdir}/qiv
 install -Dpm 644 qiv.1 $RPM_BUILD_ROOT%{_mandir}/man1/qiv.1
-
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/qiv
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,10 +42,14 @@
 %defattr(-,root,root,-)
 %doc README README.CHANGES README.COPYING README.TODO qiv-command.example
 %{_bindir}/qiv
+%{_libexecdir}/qiv
 %{_mandir}/man1/qiv.1*
 
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert  2.0-7
+- fix #213581
+
 * Fri Sep 15 2006 Andreas Bierfert  2.0-6
 - FE6 rebuild
 



From fedora-extras-commits at redhat.com  Tue Nov  7 01:58:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:58:53 -0700
Subject: rpms/qiv/FC-6 qiv.spec,1.12,1.13
Message-ID: <200611070158.kA71wrLF002536@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/qiv/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2506/FC-6

Modified Files:
	qiv.spec 
Log Message:
- dist ?!



Index: qiv.spec
===================================================================
RCS file: /cvs/extras/rpms/qiv/FC-6/qiv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qiv.spec	7 Nov 2006 01:55:57 -0000	1.12
+++ qiv.spec	7 Nov 2006 01:58:23 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           qiv
 Version:        2.0
-Release:        7
+Release:        7%{?dist}
 
 Summary:        Quick Image Viewer
 



From fedora-extras-commits at redhat.com  Tue Nov  7 01:58:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 6 Nov 2006 18:58:54 -0700
Subject: rpms/qiv/devel qiv.spec,1.12,1.13
Message-ID: <200611070158.kA71wsNs002539@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/qiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2506/devel

Modified Files:
	qiv.spec 
Log Message:
- dist ?!



Index: qiv.spec
===================================================================
RCS file: /cvs/extras/rpms/qiv/devel/qiv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qiv.spec	7 Nov 2006 01:55:58 -0000	1.12
+++ qiv.spec	7 Nov 2006 01:58:24 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           qiv
 Version:        2.0
-Release:        7
+Release:        7%{?dist}
 
 Summary:        Quick Image Viewer
 



From fedora-extras-commits at redhat.com  Tue Nov  7 02:56:43 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Mon, 6 Nov 2006 19:56:43 -0700
Subject: rpms/granule/devel granule.spec,1.1,1.2
Message-ID: <200611070256.kA72uhLO005989@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5973

Modified Files:
	granule.spec 
Log Message:
Removed libtool call.



Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- granule.spec	22 Oct 2006 02:04:37 -0000	1.1
+++ granule.spec	7 Nov 2006 02:56:13 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.2.3
-Release:    2
+Release:    3
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/
@@ -27,8 +27,6 @@
 
 
 %build
-glib-gettextize --copy --force
-intltoolize --automake --copy --force
 %configure
 make %{?_smp_mflags}
 
@@ -65,16 +63,19 @@
 
 
 %changelog
+* Wed Nov 06 2006 Vladislav Grinchenko  - 1.2.3-3
+- Removed libtool call.
+
 * Wed Oct 18 2006 Michael Schwendt  - 1.2.3-2
 - Fix missing BR and remaining spec issues.
 
-* Sat Oct 14 2006 Vladislav Grinchenko  - 1.2.3
+* Sat Oct 14 2006 Vladislav Grinchenko  - 1.2.3
 - Overall makeup to adhere to the RPM packaging guidelines.
 
-* Sun Nov  6 2005 Vladislav Grinchenko  
+* Sun Nov  6 2005 Vladislav Grinchenko  
 - Fixed License tag
 
-* Mon Jul  4 2005 Vladislav Grinchenko  
+* Mon Jul  4 2005 Vladislav Grinchenko  
 - Changed XML dir.
  
 * Thu Jun  3 2004 Vladislav Grinchenko  - 1.0.0



From fedora-extras-commits at redhat.com  Tue Nov  7 03:36:43 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Mon, 6 Nov 2006 20:36:43 -0700
Subject: rpms/granule/FC-6 granule.spec,1.1,1.2
Message-ID: <200611070336.kA73ahr7009354@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9338

Modified Files:
	granule.spec 
Log Message:
Removed unnecessary call to libtool.



Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/FC-6/granule.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- granule.spec	22 Oct 2006 02:04:37 -0000	1.1
+++ granule.spec	7 Nov 2006 03:36:12 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.2.3
-Release:    2
+Release:    3
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/
@@ -27,8 +27,6 @@
 
 
 %build
-glib-gettextize --copy --force
-intltoolize --automake --copy --force
 %configure
 make %{?_smp_mflags}
 
@@ -65,18 +63,21 @@
 
 
 %changelog
+* Wed Nov 06 2006 Vladislav Grinchenko  - 1.2.3-3
+- Removed libtool call.
+
 * Wed Oct 18 2006 Michael Schwendt  - 1.2.3-2
 - Fix missing BR and remaining spec issues.
 
-* Sat Oct 14 2006 Vladislav Grinchenko  - 1.2.3
+* Sat Oct 14 2006 Vladislav Grinchenko  - 1.2.3
 - Overall makeup to adhere to the RPM packaging guidelines.
 
-* Sun Nov  6 2005 Vladislav Grinchenko  
+* Sun Nov  6 2005 Vladislav Grinchenko  
 - Fixed License tag
 
-* Mon Jul  4 2005 Vladislav Grinchenko  
+* Mon Jul  4 2005 Vladislav Grinchenko  
 - Changed XML dir.
  
-* Thu Jun  3 2004 Vladislav Grinchenko  - 1.0.0
+* Thu Jun  3 2004 Vladislav Grinchenko  - 1.0.0
 - Initial release.
 



From fedora-extras-commits at redhat.com  Tue Nov  7 03:47:48 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Mon, 6 Nov 2006 20:47:48 -0700
Subject: rpms/granule/devel granule.spec,1.2,1.3
Message-ID: <200611070347.kA73lmAP009552@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9536

Modified Files:
	granule.spec 
Log Message:
Two tags of the same name collide?



Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- granule.spec	7 Nov 2006 02:56:13 -0000	1.2
+++ granule.spec	7 Nov 2006 03:47:18 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.2.3
-Release:    3
+Release:    4
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/
@@ -63,7 +63,7 @@
 
 
 %changelog
-* Wed Nov 06 2006 Vladislav Grinchenko  - 1.2.3-3
+* Wed Nov 06 2006 Vladislav Grinchenko  - 1.2.3-4
 - Removed libtool call.
 
 * Wed Oct 18 2006 Michael Schwendt  - 1.2.3-2



From fedora-extras-commits at redhat.com  Tue Nov  7 04:14:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 6 Nov 2006 21:14:06 -0700
Subject: rpms/tile/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tile.spec,
	1.3, 1.4 tile-0.7.2-broken-tclm4.patch, 1.1, NONE
Message-ID: <200611070414.kA74E6AU012793@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12763

Modified Files:
	.cvsignore sources tile.spec 
Removed Files:
	tile-0.7.2-broken-tclm4.patch 
Log Message:
Update to 0.7.8




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tile/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Feb 2006 07:34:08 -0000	1.2
+++ .cvsignore	7 Nov 2006 04:13:36 -0000	1.3
@@ -1 +1 @@
-tile-0.7.2.tar.gz
+tile-0.7.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tile/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Feb 2006 07:34:08 -0000	1.2
+++ sources	7 Nov 2006 04:13:36 -0000	1.3
@@ -1 +1 @@
-9a941d213b77b804af042d5a9434c024  tile-0.7.2.tar.gz
+1172c1875ae63d7a73d8ba27835e16d4  tile-0.7.8.tar.gz


Index: tile.spec
===================================================================
RCS file: /cvs/extras/rpms/tile/devel/tile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tile.spec	29 Aug 2006 00:56:00 -0000	1.3
+++ tile.spec	7 Nov 2006 04:13:36 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           tile
-Version:        0.7.2
-Release:        5%{?dist}
+Version:        0.7.8
+Release:        1%{?dist}
 Summary:        Modernized widgets for Tk
 
-Group:		Development/Libraries
+Group:          Development/Libraries
 License:        MIT
 URL:            http://tktable.sourceforge.net/tile/
-Source0:        http://download.sourceforge.net/tktable/tile-0.7.2.tar.gz
-Patch0:         tile-0.7.2-broken-tclm4.patch
+Source0:        http://download.sourceforge.net/tktable/tile-0.7.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       tcl tk
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -67,6 +65,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Nov 6 2006 Wart  - 0.7.8-1
+- Update to 0.7.8
+- Remove patch; it was accepted upstream
+
 * Mon Aug 28 2006 Wart  - 0.7.2-5
 - Rebuild for Fedora Extras
 


--- tile-0.7.2-broken-tclm4.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov  7 04:15:18 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 6 Nov 2006 21:15:18 -0700
Subject: rpms/tile/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tile.spec, 1.3,
	1.4 tile-0.7.2-broken-tclm4.patch, 1.1, NONE
Message-ID: <200611070415.kA74FI5r012871@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12845

Modified Files:
	.cvsignore sources tile.spec 
Removed Files:
	tile-0.7.2-broken-tclm4.patch 
Log Message:
Update to 0.7.8




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tile/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Feb 2006 07:34:08 -0000	1.2
+++ .cvsignore	7 Nov 2006 04:14:48 -0000	1.3
@@ -1 +1 @@
-tile-0.7.2.tar.gz
+tile-0.7.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tile/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Feb 2006 07:34:08 -0000	1.2
+++ sources	7 Nov 2006 04:14:48 -0000	1.3
@@ -1 +1 @@
-9a941d213b77b804af042d5a9434c024  tile-0.7.2.tar.gz
+1172c1875ae63d7a73d8ba27835e16d4  tile-0.7.8.tar.gz


Index: tile.spec
===================================================================
RCS file: /cvs/extras/rpms/tile/FC-6/tile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tile.spec	29 Aug 2006 00:56:00 -0000	1.3
+++ tile.spec	7 Nov 2006 04:14:48 -0000	1.4
@@ -1,13 +1,12 @@
 Name:           tile
-Version:        0.7.2
-Release:        5%{?dist}
+Version:        0.7.8
+Release:        1%{?dist}
 Summary:        Modernized widgets for Tk
 
-Group:		Development/Libraries
+Group:          Development/Libraries
 License:        MIT
 URL:            http://tktable.sourceforge.net/tile/
-Source0:        http://download.sourceforge.net/tktable/tile-0.7.2.tar.gz
-Patch0:         tile-0.7.2-broken-tclm4.patch
+Source0:        http://download.sourceforge.net/tktable/tile-0.7.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       tcl tk
@@ -28,7 +27,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -67,6 +65,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Nov 6 2006 Wart  - 0.7.8-1
+- Update to 0.7.8
+- Remove patch; it was accepted upstream
+
 * Mon Aug 28 2006 Wart  - 0.7.2-5
 - Rebuild for Fedora Extras
 


--- tile-0.7.2-broken-tclm4.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov  7 10:12:58 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  7 Nov 2006 03:12:58 -0700
Subject: fedora-security/audit fc5,1.382,1.383 fc6,1.135,1.136
Message-ID: <200611071012.kA7ACw8C032244@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32224

Modified Files:
	fc5 fc6 
Log Message:
Yesterdays updates, not yet dealt with kde or python updates



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- fc5	6 Nov 2006 10:00:40 -0000	1.382
+++ fc5	7 Nov 2006 10:12:54 -0000	1.383
@@ -1,8 +1,9 @@
-Up to date CVE as of CVE email 20061105
-Up to date FC5 as of 20061105
+Up to date CVE as of CVE email 20061106
+Up to date FC5 as of 20061106
 
 ** are items that need attention
 
+CVE-2006-5757 ** kernel
 CVE-2006-5706 ** php, fixed 5.2.0
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- fc6	6 Nov 2006 10:00:40 -0000	1.135
+++ fc6	7 Nov 2006 10:12:54 -0000	1.136
@@ -1,8 +1,9 @@
-Up to date CVE as of CVE email 20061105
-Up to date FC6 as of 20061105
+Up to date CVE as of CVE email 20061106
+Up to date FC6 as of 20061106
 
 ** are items that need attention
 
+CVE-2006-5757 ** kernel
 CVE-2006-5706 ** php, fixed 5.2.0
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
@@ -16,7 +17,7 @@
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1109]
 CVE-2006-5466 VULNERABLE (rpm) #212833
-CVE-2006-5465 VULNERABLE (php, fixed 5.2.0) #213732
+CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDOA-2006-1169]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)



From fedora-extras-commits at redhat.com  Tue Nov  7 10:17:34 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  7 Nov 2006 03:17:34 -0700
Subject: fedora-security/audit fc5,1.383,1.384
Message-ID: <200611071017.kA7AHYlK032320@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32302

Modified Files:
	fc5 
Log Message:
Fix missed fc5 updates (python, php)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- fc5	7 Nov 2006 10:12:54 -0000	1.383
+++ fc5	7 Nov 2006 10:17:32 -0000	1.384
@@ -17,7 +17,7 @@
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
 CVE-2006-5466 VULNERABLE (rpm) #212833
-CVE-2006-5465 VULNERABLE (php, fixed 5.2.0) #213732
+CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
@@ -41,7 +41,7 @@
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022]
-CVE-2006-4980 VULNERABLE (python) #208166
+CVE-2006-4980 backport (python) #208166 [since FEDORA-2006-1049]
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr



From fedora-extras-commits at redhat.com  Tue Nov  7 11:42:20 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Jos=C3=A9_Ab=C3=ADlio_Oliveira_Matos?= (jamatos))
Date: Tue, 7 Nov 2006 04:42:20 -0700
Subject: rpms/python-enchant/devel .cvsignore, 1.3, 1.4 python-enchant.spec, 
	1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200611071142.kA7BgKgV003543@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3521

Modified Files:
	.cvsignore python-enchant.spec sources 
Log Message:
* Tue Nov  7 2006 Jos?? Matos  - 1.2.0-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Feb 2006 08:29:15 -0000	1.3
+++ .cvsignore	7 Nov 2006 11:41:49 -0000	1.4
@@ -1 +1 @@
-pyenchant-1.1.5.tar.gz
+pyenchant-1.2.0.tar.gz


Index: python-enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/python-enchant.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-enchant.spec	4 Oct 2006 22:40:43 -0000	1.8
+++ python-enchant.spec	7 Nov 2006 11:41:49 -0000	1.9
@@ -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-enchant
-Version:        1.1.5
-Release:        5%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Python bindings for Enchant spellchecking library
 
 Group:          Development/Languages
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Tue Nov  7 2006 Jos?? Matos  - 1.2.0-1
+- New upstream release
+
 * Thu Oct 05 2006 Christian Iseli  1.1.5-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-enchant/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Feb 2006 08:29:15 -0000	1.3
+++ sources	7 Nov 2006 11:41:49 -0000	1.4
@@ -1 +1 @@
-d9a07392f1f0910635a221273ac9654d  pyenchant-1.1.5.tar.gz
+2fefef0868b110b1da7de89c08344dd2  pyenchant-1.2.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov  7 12:41:10 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Tue, 7 Nov 2006 05:41:10 -0700
Subject: rpms/audacious/FC-6 audacious.spec,1.11,1.12
Message-ID: <200611071241.kA7CfAkU006808@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6790

Modified Files:
	audacious.spec 
Log Message:

- Disable gnome-vfs, it causes too much trouble



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/FC-6/audacious.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- audacious.spec	20 Oct 2006 07:24:45 -0000	1.11
+++ audacious.spec	7 Nov 2006 12:40:40 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -23,7 +23,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
-BuildRequires:  zlib-devel, desktop-file-utils, alsa-lib-devel
+BuildRequires:  zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel
 BuildRequires:  gnome-vfs2-devel, libglade2-devel >= 2.4, libsidplay-devel
 BuildRequires:  libmpcdec-devel, libmusicbrainz-devel, GConf2-devel
 BuildRequires:  taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2
@@ -31,7 +31,6 @@
 BuildRequires:  gettext, libsndfile-devel, curl-devel, libbinio-devel
 BuildRequires:  arts-devel, libmodplug-devel, lirc-devel
 BuildRequires:  jack-audio-connection-kit-devel, libsamplerate-devel
-BuildRequires:   desktop-file-utils >= 0.9
 
 Requires(post):  desktop-file-utils >= 0.9, /sbin/ldconfig
 Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
@@ -122,7 +121,7 @@
 %configure \
 	--disable-rpath \
 	--enable-gconf \
-	--enable-gnome-vfs \
+	--disable-gnome-vfs \
 	--enable-amidiplug \
 	--disable-amidiplug-dummy \
 	--disable-dependency-tracking
@@ -209,6 +208,9 @@
 
 
 %changelog
+* Tue Nov 7 2006 Ralf Ertzinger  1.1.2-3.fc6
+- Disable gnome-vfs, it causes too much trouble
+ 
 * Wed Oct 18 2006 Ralf Ertzinger  1.1.2-2.fc6
 - Add Obsoletes/Provides for BMP
 



From fedora-extras-commits at redhat.com  Tue Nov  7 13:13:27 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Tue, 7 Nov 2006 06:13:27 -0700
Subject: rpms/audacious/devel audacious-1.1.2-mainwin-update.patch, 1.1,
	1.2 audacious.spec, 1.13, 1.14
Message-ID: <200611071313.kA7DDR7b009962@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9935

Modified Files:
	audacious-1.1.2-mainwin-update.patch audacious.spec 
Log Message:

- Disable gnome-vfs, it causes too much trouble


audacious-1.1.2-mainwin-update.patch:

Index: audacious-1.1.2-mainwin-update.patch
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious-1.1.2-mainwin-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-1.1.2-mainwin-update.patch	6 Nov 2006 15:52:48 -0000	1.1
+++ audacious-1.1.2-mainwin-update.patch	7 Nov 2006 13:12:56 -0000	1.2
@@ -6,7 +6,7 @@
  #define MAINWIN_SHADED_HEIGHT    MAINWIN_TITLEBAR_HEIGHT
  
 -#define MAINWIN_UPDATE_INTERVAL  10
-+#define MAINWIN_UPDATE_INTERVAL  100
++#define MAINWIN_UPDATE_INTERVAL  50
  
  #define MAINWIN_DEFAULT_POS_X    20
  #define MAINWIN_DEFAULT_POS_Y    20


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- audacious.spec	6 Nov 2006 15:52:48 -0000	1.13
+++ audacious.spec	7 Nov 2006 13:12:56 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -125,7 +125,7 @@
 %configure \
 	--disable-rpath \
 	--enable-gconf \
-	--enable-gnome-vfs \
+	--disable-gnome-vfs \
 	--enable-amidiplug \
 	--disable-amidiplug-dummy \
 	--disable-dependency-tracking
@@ -212,6 +212,9 @@
 
 
 %changelog
+* Tue Nov 7 2006 Ralf Ertzinger  1.1.2-6.fc7
+- Disable gnome-vfs, it causes too much trouble
+ 
 * Mon Nov 06 2006 Ralf Ertzinger  1.1.2-4.fc7
 - Decrease main window update frequency somewhat
 



From fedora-extras-commits at redhat.com  Tue Nov  7 13:42:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue, 7 Nov 2006 06:42:25 -0700
Subject: rpms/SIBsim4/devel .cvsignore, 1.6, 1.7 SIBsim4.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200611071342.kA7DgPw0010162@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10136

Modified Files:
	.cvsignore SIBsim4.spec sources 
Log Message:
New version 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Jun 2006 17:09:40 -0000	1.6
+++ .cvsignore	7 Nov 2006 13:41:55 -0000	1.7
@@ -1 +1 @@
-SIBsim4-0.13.tar.bz2
+SIBsim4-0.14.tar.gz


Index: SIBsim4.spec
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/devel/SIBsim4.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SIBsim4.spec	5 Sep 2006 18:26:30 -0000	1.7
+++ SIBsim4.spec	7 Nov 2006 13:41:55 -0000	1.8
@@ -1,11 +1,11 @@
 Name:           SIBsim4
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Align expressed RNA sequences on a DNA template
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://sibsim4.sourceforge.net
-Source0:        http://dl.sf.net/sibsim4/%{name}-%{version}.tar.bz2
+Source0:        http://dl.sf.net/sibsim4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -43,6 +43,10 @@
 
 
 %changelog
+* Tue Nov  7 2006 Christian Iseli  0.14-0
+- Version 0.14.
+- Source is .gz instead of .bz2.
+
 * Tue Sep  5 2006 Christian Iseli  0.13-2
 - Rebuild for FC 6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jun 2006 17:09:40 -0000	1.6
+++ sources	7 Nov 2006 13:41:55 -0000	1.7
@@ -1 +1 @@
-526a8a3be41ead4b8a11fca073e28cc8  SIBsim4-0.13.tar.bz2
+b63af91d9cacf7d4f557d72119f934e5  SIBsim4-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov  7 13:45:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue, 7 Nov 2006 06:45:44 -0700
Subject: rpms/SIBsim4/FC-6 .cvsignore, 1.6, 1.7 SIBsim4.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200611071345.kA7Dji2O010260@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10235

Modified Files:
	.cvsignore SIBsim4.spec sources 
Log Message:
New version 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Jun 2006 17:09:40 -0000	1.6
+++ .cvsignore	7 Nov 2006 13:45:14 -0000	1.7
@@ -1 +1 @@
-SIBsim4-0.13.tar.bz2
+SIBsim4-0.14.tar.gz


Index: SIBsim4.spec
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/FC-6/SIBsim4.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SIBsim4.spec	5 Sep 2006 18:26:30 -0000	1.7
+++ SIBsim4.spec	7 Nov 2006 13:45:14 -0000	1.8
@@ -1,11 +1,11 @@
 Name:           SIBsim4
-Version:        0.13
-Release:        2%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Align expressed RNA sequences on a DNA template
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://sibsim4.sourceforge.net
-Source0:        http://dl.sf.net/sibsim4/%{name}-%{version}.tar.bz2
+Source0:        http://dl.sf.net/sibsim4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -43,6 +43,10 @@
 
 
 %changelog
+* Tue Nov  7 2006 Christian Iseli  0.14-0
+- Version 0.14.
+- Source is .gz instead of .bz2.
+
 * Tue Sep  5 2006 Christian Iseli  0.13-2
 - Rebuild for FC 6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jun 2006 17:09:40 -0000	1.6
+++ sources	7 Nov 2006 13:45:14 -0000	1.7
@@ -1 +1 @@
-526a8a3be41ead4b8a11fca073e28cc8  SIBsim4-0.13.tar.bz2
+b63af91d9cacf7d4f557d72119f934e5  SIBsim4-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov  7 13:48:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Tue, 7 Nov 2006 06:48:58 -0700
Subject: rpms/SIBsim4/FC-5 .cvsignore, 1.6, 1.7 SIBsim4.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611071348.kA7Dmwtr010339@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10319

Modified Files:
	.cvsignore SIBsim4.spec sources 
Log Message:
New version 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Jun 2006 17:12:11 -0000	1.6
+++ .cvsignore	7 Nov 2006 13:48:28 -0000	1.7
@@ -1 +1 @@
-SIBsim4-0.13.tar.bz2
+SIBsim4-0.14.tar.gz


Index: SIBsim4.spec
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/FC-5/SIBsim4.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SIBsim4.spec	19 Jun 2006 17:12:11 -0000	1.6
+++ SIBsim4.spec	7 Nov 2006 13:48:28 -0000	1.7
@@ -1,11 +1,11 @@
 Name:           SIBsim4
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Align expressed RNA sequences on a DNA template
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://sibsim4.sourceforge.net
-Source0:        http://dl.sf.net/sibsim4/%{name}-%{version}.tar.bz2
+Source0:        http://dl.sf.net/sibsim4/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -43,6 +43,10 @@
 
 
 %changelog
+* Tue Nov  7 2006 Christian Iseli  0.14-1
+- Version 0.14.
+- Source is .gz instead of .bz2.
+
 * Fri Jun 19 2006 Christian Iseli  0.13-1
 - Version 0.13.
 - No longer needs math lib.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jun 2006 17:12:11 -0000	1.6
+++ sources	7 Nov 2006 13:48:28 -0000	1.7
@@ -1 +1 @@
-526a8a3be41ead4b8a11fca073e28cc8  SIBsim4-0.13.tar.bz2
+b63af91d9cacf7d4f557d72119f934e5  SIBsim4-0.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov  7 15:01:19 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Tue, 7 Nov 2006 08:01:19 -0700
Subject: rpms/audacious/devel audacious.spec,1.14,1.15
Message-ID: <200611071501.kA7F1JCH016510@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13575

Modified Files:
	audacious.spec 
Log Message:

- Add --enable-chardet



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- audacious.spec	7 Nov 2006 13:12:56 -0000	1.14
+++ audacious.spec	7 Nov 2006 15:00:48 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -128,6 +128,7 @@
 	--disable-gnome-vfs \
 	--enable-amidiplug \
 	--disable-amidiplug-dummy \
+	--enable-chardet \
 	--disable-dependency-tracking
 make V=1 %{?_smp_mflags}
 
@@ -212,8 +213,9 @@
 
 
 %changelog
-* Tue Nov 7 2006 Ralf Ertzinger  1.1.2-6.fc7
+* Tue Nov 7 2006 Ralf Ertzinger  1.1.2-7.fc7
 - Disable gnome-vfs, it causes too much trouble
+- Add --enable-chardet
  
 * Mon Nov 06 2006 Ralf Ertzinger  1.1.2-4.fc7
 - Decrease main window update frequency somewhat



From fedora-extras-commits at redhat.com  Tue Nov  7 15:04:54 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Tue, 7 Nov 2006 08:04:54 -0700
Subject: rpms/audacious/FC-6 audacious.spec,1.12,1.13
Message-ID: <200611071504.kA7F4sxN016583@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16567

Modified Files:
	audacious.spec 
Log Message:

- Add --enable-chardet



Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/FC-6/audacious.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- audacious.spec	7 Nov 2006 12:40:40 -0000	1.12
+++ audacious.spec	7 Nov 2006 15:04:23 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           audacious
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
@@ -124,6 +124,7 @@
 	--disable-gnome-vfs \
 	--enable-amidiplug \
 	--disable-amidiplug-dummy \
+	--enable-chardet \
 	--disable-dependency-tracking
 make V=1 %{?_smp_mflags}
 
@@ -208,8 +209,9 @@
 
 
 %changelog
-* Tue Nov 7 2006 Ralf Ertzinger  1.1.2-3.fc6
+* Tue Nov 7 2006 Ralf Ertzinger  1.1.2-4.fc6
 - Disable gnome-vfs, it causes too much trouble
+- Add --enable-chardet
  
 * Wed Oct 18 2006 Ralf Ertzinger  1.1.2-2.fc6
 - Add Obsoletes/Provides for BMP



From fedora-extras-commits at redhat.com  Tue Nov  7 16:18:28 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 7 Nov 2006 09:18:28 -0700
Subject: owners owners.list,1.1896,1.1897
Message-ID: <200611071618.kA7GISjl019928@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19908

Modified Files:
	owners.list 
Log Message:
unorphaned mpc and gmpc



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1896
retrieving revision 1.1897
diff -u -r1.1896 -r1.1897
--- owners.list	6 Nov 2006 20:21:02 -0000	1.1896
+++ owners.list	7 Nov 2006 16:17:57 -0000	1.1897
@@ -537,7 +537,7 @@
 Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|glyph-keeper|Library for text rendering|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|gmpc|GNOME frontend for the MPD|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gmpc|GNOME frontend for the MPD|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|gnash|GNU flash movie player|pertusus at free.fr|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|gnet2|A simple network library built upon glib|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnochm|CHM file viewer|pertusus at free.fr|extras-qa at fedoraproject.org|
@@ -1093,7 +1093,7 @@
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mousepad|A simple text editor for Xfce|kevin at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|mpc|Command-line client for MPD|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|mpc|Command-line client for MPD|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mtd-utils|Utilities for dealing with MTD (flash) devices|dwmw2 at redhat.com|extras-qa at fedoraproject.org|jwboyer at jdub.homelinux.org
 Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov  7 16:26:22 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:26:22 -0700
Subject: rpms/php-pear-Console-Getargs/devel .cvsignore, 1.3,
	1.4 php-pear-Console-Getargs.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611071626.kA7GQMGr020133@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20113

Modified Files:
	.cvsignore php-pear-Console-Getargs.spec sources 
Log Message:
	update to 1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 16:43:00 -0000	1.3
+++ .cvsignore	7 Nov 2006 16:25:51 -0000	1.4
@@ -1 +1 @@
-Console_Getargs-1.3.2.tgz
+Console_Getargs-1.3.3.tgz


Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/php-pear-Console-Getargs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Console-Getargs.spec	4 Oct 2006 16:43:00 -0000	1.2
+++ php-pear-Console-Getargs.spec	7 Nov 2006 16:25:51 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Console_Getargs
 
 Name:           php-pear-Console-Getargs
-Version:        1.3.2
+Version:        1.3.3
 Release:        1%{?dist}
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
@@ -82,6 +82,9 @@
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Tue Oct  7 2006 Remi Collet  1.3.3-1
+- update to 1.3.3
+
 * Wed Oct  4 2006 Remi Collet  1.3.2-1
 - update to 1.3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 16:43:00 -0000	1.3
+++ sources	7 Nov 2006 16:25:51 -0000	1.4
@@ -1 +1 @@
-de2421c4d6409d84678d07afa2b59651  Console_Getargs-1.3.2.tgz
+e35638dbaf82efbf9c431153b6dac796  Console_Getargs-1.3.3.tgz



From fedora-extras-commits at redhat.com  Tue Nov  7 16:30:21 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:30:21 -0700
Subject: rpms/php-pear-Net-FTP - New directory
Message-ID: <200611071630.kA7GULlp020252@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-FTP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20248/php-pear-Net-FTP

Log Message:
Directory /cvs/extras/rpms/php-pear-Net-FTP added to the repository




From fedora-extras-commits at redhat.com  Tue Nov  7 16:30:27 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:30:27 -0700
Subject: rpms/php-pear-Net-FTP/devel - New directory
Message-ID: <200611071630.kA7GURYM020266@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-FTP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20248/php-pear-Net-FTP/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Net-FTP/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov  7 16:30:47 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:30:47 -0700
Subject: rpms/php-pear-Net-FTP Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611071630.kA7GUlRp020299@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-FTP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Net-FTP


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Net-FTP
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  Tue Nov  7 16:30:53 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:30:53 -0700
Subject: rpms/php-pear-Net-FTP/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611071630.kA7GUrBh020315@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-FTP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Net-FTP


--- 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 Nov  7 16:32:10 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:32:10 -0700
Subject: rpms/php-pear-Net-FTP import.log,1.1,1.2
Message-ID: <200611071632.kA7GWAPn020402@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-FTP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Net-FTP-1.3.2-1.fc6 on branch devel from php-pear-Net-FTP-1.3.2-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-FTP/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Nov 2006 16:30:47 -0000	1.1
+++ import.log	7 Nov 2006 16:31:40 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Net-FTP-1_3_2-1_fc6:HEAD:php-pear-Net-FTP-1.3.2-1.fc6.src.rpm:1162917091



From fedora-extras-commits at redhat.com  Tue Nov  7 16:32:11 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:32:11 -0700
Subject: rpms/php-pear-Net-FTP/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-Net-FTP.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611071632.kA7GWBtQ020406@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-FTP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-Net-FTP.spec xml2changelog 
Log Message:
auto-import php-pear-Net-FTP-1.3.2-1.fc6 on branch devel from php-pear-Net-FTP-1.3.2-1.fc6.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-Net-FTP.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Net_FTP

Name:           php-pear-Net-FTP
Version:        1.3.2
Release:        1%{?dist}
Summary:        Provides an OO interface to the PHP FTP functions plus some additions

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Net_FTP
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
Requires:       php-pear(PEAR) >= 1.3.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}


%description
Net_FTP allows you to communicate with FTP servers in a more comfortable
way than the native FTP functions of PHP do. The class implements everything
nativly supported by PHP and additionally features like recursive up- and
downloading, dircreation and chmodding. It although implements an observer
pattern to allow for example the view of a progress bar.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
%{__install} -m 644 -c %{SOURCE1} LICENSE

cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
# Fix rpmlint warnings
dos2unix ../docdir/example/observer.php


# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE docdir/example

%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Net


%changelog
* Sun Nov  5 2006 Remi Collet  1.3.2-1
- initial RPM (generated specfile + cleanup)
- add CHANGELOG and LICENSE


--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-FTP/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Nov 2006 16:30:53 -0000	1.1
+++ .cvsignore	7 Nov 2006 16:31:41 -0000	1.2
@@ -0,0 +1 @@
+Net_FTP-1.3.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-FTP/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Nov 2006 16:30:53 -0000	1.1
+++ sources	7 Nov 2006 16:31:41 -0000	1.2
@@ -0,0 +1 @@
+fce386d6029e1171ab8f46c7568f2637  Net_FTP-1.3.2.tgz



From fedora-extras-commits at redhat.com  Tue Nov  7 16:35:29 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:35:29 -0700
Subject: owners owners.list,1.1897,1.1898
Message-ID: <200611071635.kA7GZTYK020466@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20450

Modified Files:
	owners.list 
Log Message:
	php-pear-Net-FTP



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1897
retrieving revision 1.1898
diff -u -r1.1897 -r1.1898
--- owners.list	7 Nov 2006 16:17:57 -0000	1.1897
+++ owners.list	7 Nov 2006 16:34:58 -0000	1.1898
@@ -1774,6 +1774,7 @@
 Fedora Extras|php-pear-Mail-Mime|Classes to create and decode mime messages|fedora at theholbrooks.org|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-MDB2|Database Abstraction Layer|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-Curl|OO interface to PHP's cURL extension|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Net-FTP|Provides an OO interface to the PHP FTP functions plus some additions|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-SMTP|Provides an implementation of the SMTP protocol|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-Socket|Network Socket Interface|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Payment-Process|Unified payment processor|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov  7 16:38:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 7 Nov 2006 09:38:59 -0700
Subject: rpms/perl-Class-InsideOut/FC-6 perl-Class-InsideOut.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200611071638.kA7GcxXZ020589@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-serv20518/FC-6

Modified Files:
	perl-Class-InsideOut.spec sources 
Log Message:
update to 1.03 



Index: perl-Class-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-6/perl-Class-InsideOut.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-InsideOut.spec	1 Sep 2006 03:59:24 -0000	1.6
+++ perl-Class-InsideOut.spec	7 Nov 2006 16:38:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Class-InsideOut
-Version:        1.02 
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        A safe, simple inside-out object construction kit 
 
 Group:          Development/Libraries
@@ -45,11 +45,12 @@
 
 %install
 rm -rf %{buildroot}
+
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
 
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
@@ -61,12 +62,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README Todo Changes LICENSE
+# note that perl(base) ends up as a dep from the code under t/Object; however
+# perl(base) is provided by perl, which is already a dep of this package, so
+# no big deal.
+%doc README Todo Changes LICENSE examples/ t/Object/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Nov 07 2006 Chris Weyl  1.03-1
+- update to 1.03
+- minor spec tweaks
+
 * Thu Aug 31 2006 Chris Weyl  1.02-3
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Aug 2006 16:20:41 -0000	1.4
+++ sources	7 Nov 2006 16:38:29 -0000	1.5
@@ -1 +1 @@
-96d8ff279114bbd0ecbb26e890499b72  Class-InsideOut-1.02.tar.gz
+ac3c30b555ecedb1c0da1f7380b99652  Class-InsideOut-1.03.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov  7 16:39:00 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 7 Nov 2006 09:39:00 -0700
Subject: rpms/perl-Class-InsideOut/devel .cvsignore, 1.4,
	1.5 perl-Class-InsideOut.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611071639.kA7Gd0AX020594@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-serv20518/devel

Modified Files:
	.cvsignore perl-Class-InsideOut.spec sources 
Log Message:
update to 1.03 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Aug 2006 16:20:41 -0000	1.4
+++ .cvsignore	7 Nov 2006 16:38:30 -0000	1.5
@@ -1 +1 @@
-Class-InsideOut-1.02.tar.gz
+Class-InsideOut-1.03.tar.gz


Index: perl-Class-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/perl-Class-InsideOut.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-InsideOut.spec	1 Sep 2006 03:59:24 -0000	1.6
+++ perl-Class-InsideOut.spec	7 Nov 2006 16:38:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Class-InsideOut
-Version:        1.02 
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        A safe, simple inside-out object construction kit 
 
 Group:          Development/Libraries
@@ -45,11 +45,12 @@
 
 %install
 rm -rf %{buildroot}
+
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
 
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
@@ -61,12 +62,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README Todo Changes LICENSE
+# note that perl(base) ends up as a dep from the code under t/Object; however
+# perl(base) is provided by perl, which is already a dep of this package, so
+# no big deal.
+%doc README Todo Changes LICENSE examples/ t/Object/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Nov 07 2006 Chris Weyl  1.03-1
+- update to 1.03
+- minor spec tweaks
+
 * Thu Aug 31 2006 Chris Weyl  1.02-3
 - bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-InsideOut/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Aug 2006 16:20:41 -0000	1.4
+++ sources	7 Nov 2006 16:38:30 -0000	1.5
@@ -1 +1 @@
-96d8ff279114bbd0ecbb26e890499b72  Class-InsideOut-1.02.tar.gz
+ac3c30b555ecedb1c0da1f7380b99652  Class-InsideOut-1.03.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov  7 16:38:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 7 Nov 2006 09:38:57 -0700
Subject: rpms/perl-Class-InsideOut Makefile,1.1,1.2
Message-ID: <200611071638.kA7Gcv3M020581@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Class-InsideOut
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20518

Modified Files:
	Makefile 
Log Message:
update to 1.03 



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-InsideOut/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Jul 2006 03:02:23 -0000	1.1
+++ Makefile	7 Nov 2006 16:38:27 -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 Nov  7 16:38:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 7 Nov 2006 09:38:58 -0700
Subject: rpms/perl-Class-InsideOut/FC-5 perl-Class-InsideOut.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200611071638.kA7Gcwod020585@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-serv20518/FC-5

Modified Files:
	perl-Class-InsideOut.spec sources 
Log Message:
update to 1.03 



Index: perl-Class-InsideOut.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-5/perl-Class-InsideOut.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Class-InsideOut.spec	16 Aug 2006 16:22:05 -0000	1.4
+++ perl-Class-InsideOut.spec	7 Nov 2006 16:38:28 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-Class-InsideOut
-Version:        1.02 
+Version:        1.03
 Release:        1%{?dist}
 Summary:        A safe, simple inside-out object construction kit 
 
@@ -45,11 +45,12 @@
 
 %install
 rm -rf %{buildroot}
+
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
 
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
@@ -61,12 +62,25 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README Todo Changes LICENSE
+# note that perl(base) ends up as a dep from the code under t/Object; however
+# perl(base) is provided by perl, which is already a dep of this package, so
+# no big deal.
+%doc README Todo Changes LICENSE examples/ t/Object/
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Tue Nov 07 2006 Chris Weyl  1.03-1
+- update to 1.03
+- minor spec tweaks
+
+* Thu Aug 31 2006 Chris Weyl  1.02-3
+- bump for mass rebuild
+
+* Wed Aug 16 2006 Chris Weyl  1.02-2
+- *sigh* tagging issues, so bump
+
 * Wed Aug 16 2006 Chris Weyl  1.02-1
 - update to 1.02
 - dropped some depreciated spec bits


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-InsideOut/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Aug 2006 16:22:05 -0000	1.4
+++ sources	7 Nov 2006 16:38:28 -0000	1.5
@@ -1 +1 @@
-96d8ff279114bbd0ecbb26e890499b72  Class-InsideOut-1.02.tar.gz
+ac3c30b555ecedb1c0da1f7380b99652  Class-InsideOut-1.03.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov  7 16:49:34 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 7 Nov 2006 09:49:34 -0700
Subject: rpms/mpc/devel .cvsignore,1.3,1.4 mpc.spec,1.8,1.9 sources,1.3,1.4
Message-ID: <200611071649.kA7GnYbn020794@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/mpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20764

Modified Files:
	.cvsignore mpc.spec sources 
Log Message:
* Tue Nov 07 2006 Adrian Reber  - 0.12.0-1
- updated to 0.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Mar 2005 08:38:55 -0000	1.3
+++ .cvsignore	7 Nov 2006 16:49:03 -0000	1.4
@@ -1 +1 @@
-mpc-0.11.2.tar.gz
+mpc-0.12.0.tar.bz2


Index: mpc.spec
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/mpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mpc.spec	30 Aug 2006 15:55:12 -0000	1.8
+++ mpc.spec	7 Nov 2006 16:49:03 -0000	1.9
@@ -1,12 +1,12 @@
 Name:             mpc
 Summary:          Command-line client for MPD
-Version:          0.11.2
-Release:          5%{?dist}
+Version:          0.12.0
+Release:          1%{?dist}
 
 License:          GPL
 Group:            Applications/Multimedia
 URL:              http://www.musicpd.org/mpc.shtml
-Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.11.2.tar.gz
+Source0:          http://mercury.chem.pitt.edu/~shank/mpc-0.12.0.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Tue Nov 07 2006 Adrian Reber  - 0.12.0-1
+- updated to 0.12.0
+
 * Wed Aug 30 2006 Aurelien Bompard  0.11.2-5
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mpc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Mar 2005 08:38:55 -0000	1.3
+++ sources	7 Nov 2006 16:49:03 -0000	1.4
@@ -1 +1 @@
-c8411da7936662312cf9483f3490e285  mpc-0.11.2.tar.gz
+9ec03c5f3d136a9a58ef665dfb100e52  mpc-0.12.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov  7 16:51:01 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:51:01 -0700
Subject: rpms/php-pear-Console-Getargs/FC-6 .cvsignore, 1.3,
	1.4 php-pear-Console-Getargs.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611071651.kA7Gp1re020880@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20812

Modified Files:
	.cvsignore php-pear-Console-Getargs.spec sources 
Log Message:
	update to 1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 16:43:00 -0000	1.3
+++ .cvsignore	7 Nov 2006 16:50:30 -0000	1.4
@@ -1 +1 @@
-Console_Getargs-1.3.2.tgz
+Console_Getargs-1.3.3.tgz


Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-6/php-pear-Console-Getargs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Console-Getargs.spec	4 Oct 2006 16:43:00 -0000	1.2
+++ php-pear-Console-Getargs.spec	7 Nov 2006 16:50:30 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Console_Getargs
 
 Name:           php-pear-Console-Getargs
-Version:        1.3.2
+Version:        1.3.3
 Release:        1%{?dist}
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
@@ -82,6 +82,9 @@
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Tue Oct  7 2006 Remi Collet  1.3.3-1
+- update to 1.3.3
+
 * Wed Oct  4 2006 Remi Collet  1.3.2-1
 - update to 1.3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 16:43:00 -0000	1.3
+++ sources	7 Nov 2006 16:50:30 -0000	1.4
@@ -1 +1 @@
-de2421c4d6409d84678d07afa2b59651  Console_Getargs-1.3.2.tgz
+e35638dbaf82efbf9c431153b6dac796  Console_Getargs-1.3.3.tgz



From fedora-extras-commits at redhat.com  Tue Nov  7 16:53:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 7 Nov 2006 09:53:04 -0700
Subject: rpms/php-pear-Console-Getargs/FC-5 .cvsignore, 1.3,
	1.4 php-pear-Console-Getargs.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611071653.kA7Gr4fw020969@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Console-Getargs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945

Modified Files:
	.cvsignore php-pear-Console-Getargs.spec sources 
Log Message:
	update to 1.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Oct 2006 16:44:38 -0000	1.3
+++ .cvsignore	7 Nov 2006 16:52:34 -0000	1.4
@@ -1 +1 @@
-Console_Getargs-1.3.2.tgz
+Console_Getargs-1.3.3.tgz


Index: php-pear-Console-Getargs.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/php-pear-Console-Getargs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Console-Getargs.spec	4 Oct 2006 16:44:38 -0000	1.3
+++ php-pear-Console-Getargs.spec	7 Nov 2006 16:52:34 -0000	1.4
@@ -2,7 +2,7 @@
 %define pear_name Console_Getargs
 
 Name:           php-pear-Console-Getargs
-Version:        1.3.2
+Version:        1.3.3
 Release:        1%{?dist}
 Summary:        Command-line arguments and parameters parser
 Summary(fr):    Analyseur des arguments et param??tres en ligne de commande
@@ -82,6 +82,9 @@
 %{pear_testdir}/%{pear_name}
 
 %changelog
+* Tue Oct  7 2006 Remi Collet  1.3.3-1
+- update to 1.3.3
+
 * Wed Oct  4 2006 Remi Collet  1.3.2-1
 - update to 1.3.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Console-Getargs/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Oct 2006 16:44:38 -0000	1.3
+++ sources	7 Nov 2006 16:52:34 -0000	1.4
@@ -1 +1 @@
-de2421c4d6409d84678d07afa2b59651  Console_Getargs-1.3.2.tgz
+e35638dbaf82efbf9c431153b6dac796  Console_Getargs-1.3.3.tgz



From fedora-extras-commits at redhat.com  Tue Nov  7 16:56:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 7 Nov 2006 09:56:17 -0700
Subject: rpms/openal/FC-5 openal.spec,1.19,1.20
Message-ID: <200611071656.kA7GuHaK021095@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/FC-5

Modified Files:
	openal.spec 
Log Message:
- fix #190438



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-5/openal.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openal.spec	21 Aug 2006 07:41:16 -0000	1.19
+++ openal.spec	7 Nov 2006 16:55:47 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           openal
 Version:        0.0.9
-Release:        0.6.20060204cvs%{?dist}
+Release:        0.7.20060204cvs%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
@@ -78,7 +78,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
 install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
-
+rm -rf common/specification/CVS
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -103,6 +103,10 @@
 
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert 
+0.0.9-0.7.20060204
+- fix #190438
+
 * Mon Aug 21 2006 Andreas Bierfert 
 0.0.9-0.6.20060204
 - apply patch from Hans de Goede (#202260)



From fedora-extras-commits at redhat.com  Tue Nov  7 16:56:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 7 Nov 2006 09:56:16 -0700
Subject: rpms/openal/FC-3 openal.spec,1.14,1.15
Message-ID: <200611071656.kA7GuGmU021089@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/FC-3

Modified Files:
	openal.spec 
Log Message:
- fix #190438



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/openal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openal.spec	21 Aug 2006 07:55:37 -0000	1.14
+++ openal.spec	7 Nov 2006 16:55:46 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           openal
 Version:        0.0.9
-Release:        0.5.20060204cvs%{?dist}
+Release:        0.6.20060204cvs%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
@@ -77,7 +77,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
 install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
-
+rm -rf common/specification/CVS
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -102,6 +102,10 @@
 
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert 
+0.0.9-0.6.20060204
+- fix #190438
+
 * Mon Aug 21 2006 Andreas Bierfert 
 0.0.9-0.5.20060204
 - apply patch from Hans de Goede (#202260)



From fedora-extras-commits at redhat.com  Tue Nov  7 16:56:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 7 Nov 2006 09:56:17 -0700
Subject: rpms/openal/FC-4 openal.spec,1.19,1.20
Message-ID: <200611071656.kA7GuH6a021092@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/FC-4

Modified Files:
	openal.spec 
Log Message:
- fix #190438



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openal.spec	21 Aug 2006 07:55:38 -0000	1.19
+++ openal.spec	7 Nov 2006 16:55:47 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           openal
 Version:        0.0.9
-Release:        0.5.20060204cvs%{?dist}
+Release:        0.6.20060204cvs%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
@@ -77,7 +77,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
 install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
-
+rm -rf common/specification/CVS
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -102,6 +102,10 @@
 
 
 %changelog
+* Tue Nov 07 2006 Andreas Bierfert 
+0.0.9-0.6.20060204
+- fix #190438
+
 * Mon Aug 21 2006 Andreas Bierfert 
 0.0.9-0.5.20060204
 - apply patch from Hans de Goede (#202260)



From fedora-extras-commits at redhat.com  Tue Nov  7 16:56:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 7 Nov 2006 09:56:24 -0700
Subject: rpms/openal/devel openal.spec,1.20,1.21
Message-ID: <200611071656.kA7GuOl0021101@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/devel

Modified Files:
	openal.spec 
Log Message:
- fix #190438



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openal.spec	15 Sep 2006 06:42:03 -0000	1.20
+++ openal.spec	7 Nov 2006 16:55:54 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           openal
 Version:        0.0.9
-Release:        0.8.20060204cvs%{?dist}
+Release:        0.9.20060204cvs%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
@@ -77,7 +77,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
 install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
-
+rm -rf common/specification/CVS
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -102,6 +102,10 @@
 
 
 %changelog
+* Sat Nov 04 2006 Andreas Bierfert 
+0.0.9-0.9.20060204
+- fix #190438
+
 * Fri Sep 15 2006 Andreas Bierfert 
 0.0.9-0.8.20060204
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Tue Nov  7 16:56:23 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 7 Nov 2006 09:56:23 -0700
Subject: rpms/openal/FC-6 openal.spec,1.20,1.21
Message-ID: <200611071656.kA7GuNDZ021098@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21017/FC-6

Modified Files:
	openal.spec 
Log Message:
- fix #190438



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-6/openal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openal.spec	15 Sep 2006 06:42:03 -0000	1.20
+++ openal.spec	7 Nov 2006 16:55:53 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           openal
 Version:        0.0.9
-Release:        0.8.20060204cvs%{?dist}
+Release:        0.9.20060204cvs%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
@@ -77,7 +77,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
 install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
-
+rm -rf common/specification/CVS
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -102,6 +102,10 @@
 
 
 %changelog
+* Sat Nov 04 2006 Andreas Bierfert 
+0.0.9-0.9.20060204
+- fix #190438
+
 * Fri Sep 15 2006 Andreas Bierfert 
 0.0.9-0.8.20060204
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Tue Nov  7 17:28:05 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 7 Nov 2006 10:28:05 -0700
Subject: rpms/vpnc/devel vpnc-0.3.3-cloexec.patch, NONE, 1.1 vpnc.spec, 1.17,
	1.18
Message-ID: <200611071728.kA7HS5Wi024402@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24383

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.3.3-cloexec.patch 
Log Message:
* Tue Nov  7 2006 Tomas Mraz  - 0.3.3-13
- don't leak socket fds


vpnc-0.3.3-cloexec.patch:

--- NEW FILE vpnc-0.3.3-cloexec.patch ---
--- vpnc-0.3.3/vpnc.c.cloexec	2006-11-07 18:00:52.000000000 +0100
+++ vpnc-0.3.3/vpnc.c	2006-11-07 18:06:29.000000000 +0100
@@ -221,6 +221,8 @@
 	if (sock < 0)
 		error(1, errno, "making socket");
 
+	fcntl(sock, F_SETFD, FD_CLOEXEC);
+	
 	/* Give the socket a name. */
 	name.sin_family = AF_INET;
 	name.sin_port = port;
@@ -2216,6 +2218,7 @@
 				if (tunnelfd == -1) {
 					error(1, errno, "socket(SOCK_RAW) failed");
 				}
+				fcntl(tunnelfd, F_SETFD, FD_CLOEXEC);
 			}
 		}
 		if (dh_grp)


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vpnc.spec	12 Sep 2006 16:38:12 -0000	1.17
+++ vpnc.spec	7 Nov 2006 17:27:35 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        12
+Release:        13%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -14,6 +14,7 @@
 Patch2:		vpnc-0.3.3-ip-output.patch
 Patch3:		vpnc-0.3.3-no-srcport.patch
 Patch4:		vpnc-0.3.3-rekeying.patch
+Patch5:		vpnc-0.3.3-cloexec.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .ip-output
 %patch3 -p1 -b .no-srcport
 %patch4 -p1 -b .rekeying
+%patch5 -p1 -b .cloexec
 
 %build
 make PREFIX=/usr
@@ -65,6 +67,9 @@
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Tue Nov  7 2006 Tomas Mraz  - 0.3.3-13
+- don't leak socket fds
+
 * Tue Sep 12 2006 Tomas Mraz  - 0.3.3-12
 - drop hoplimit from ip route output (#205923)
 - let's try enabling -fstack-protector again, seems to work now



From fedora-extras-commits at redhat.com  Tue Nov  7 17:46:49 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 7 Nov 2006 10:46:49 -0700
Subject: rpms/vpnc/FC-6 vpnc-0.3.3-cloexec.patch, NONE, 1.1 vpnc.spec, 1.17,
	1.18
Message-ID: <200611071746.kA7HknqB024548@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/extras/rpms/vpnc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24529

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.3.3-cloexec.patch 
Log Message:
* Tue Nov  7 2006 Tomas Mraz  - 0.3.3-13
- don't leak socket fds


vpnc-0.3.3-cloexec.patch:

--- NEW FILE vpnc-0.3.3-cloexec.patch ---
--- vpnc-0.3.3/vpnc.c.cloexec	2006-11-07 18:00:52.000000000 +0100
+++ vpnc-0.3.3/vpnc.c	2006-11-07 18:06:29.000000000 +0100
@@ -221,6 +221,8 @@
 	if (sock < 0)
 		error(1, errno, "making socket");
 
+	fcntl(sock, F_SETFD, FD_CLOEXEC);
+	
 	/* Give the socket a name. */
 	name.sin_family = AF_INET;
 	name.sin_port = port;
@@ -2216,6 +2218,7 @@
 				if (tunnelfd == -1) {
 					error(1, errno, "socket(SOCK_RAW) failed");
 				}
+				fcntl(tunnelfd, F_SETFD, FD_CLOEXEC);
 			}
 		}
 		if (dh_grp)


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/FC-6/vpnc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vpnc.spec	12 Sep 2006 16:38:12 -0000	1.17
+++ vpnc.spec	7 Nov 2006 17:46:19 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        12
+Release:        13%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -14,6 +14,7 @@
 Patch2:		vpnc-0.3.3-ip-output.patch
 Patch3:		vpnc-0.3.3-no-srcport.patch
 Patch4:		vpnc-0.3.3-rekeying.patch
+Patch5:		vpnc-0.3.3-cloexec.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .ip-output
 %patch3 -p1 -b .no-srcport
 %patch4 -p1 -b .rekeying
+%patch5 -p1 -b .cloexec
 
 %build
 make PREFIX=/usr
@@ -65,6 +67,9 @@
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Tue Nov  7 2006 Tomas Mraz  - 0.3.3-13
+- don't leak socket fds
+
 * Tue Sep 12 2006 Tomas Mraz  - 0.3.3-12
 - drop hoplimit from ip route output (#205923)
 - let's try enabling -fstack-protector again, seems to work now



From fedora-extras-commits at redhat.com  Tue Nov  7 19:10:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 7 Nov 2006 12:10:35 -0700
Subject: rpms/gcompris/devel .cvsignore, 1.4, 1.5 gcompris.spec, 1.16,
	1.17 sources, 1.4, 1.5 gcompris-8.0-fullscreen.patch, 1.1,
	NONE gcompris-8.0-silence.patch, 1.1,
	NONE gcompris-8.0-warn.patch, 1.1, NONE gcompris.6, 1.1, NONE
Message-ID: <200611071910.kA7JAZVr030988@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30964

Modified Files:
	.cvsignore gcompris.spec sources 
Removed Files:
	gcompris-8.0-fullscreen.patch gcompris-8.0-silence.patch 
	gcompris-8.0-warn.patch gcompris.6 
Log Message:
* Tue Nov  7 2006 Hans de Goede  8.2-1
- New upstream release 8.2
- Drop most patches (integrated upstream)
- Drop seperate / addon man page (integrated upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 14:41:12 -0000	1.4
+++ .cvsignore	7 Nov 2006 19:10:04 -0000	1.5
@@ -1 +1 @@
-gcompris-8.1.tar.gz
+gcompris-8.2.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gcompris.spec	15 Oct 2006 15:08:23 -0000	1.16
+++ gcompris.spec	7 Nov 2006 19:10:04 -0000	1.17
@@ -1,16 +1,12 @@
 Name:           gcompris
-Version:        8.1
+Version:        8.2
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        gcompris.6
-Patch0:         gcompris-8.0-warn.patch
-Patch1:         gcompris-8.0-fullscreen.patch
-Patch2:         gcompris-8.0-silence.patch
-Patch3:         gcompris-8.1-icon.patch
+Patch0:         gcompris-8.1-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -180,6 +176,14 @@
 Voice samples for the GCompris games in Russian.
 
 
+%package sound-so
+Summary:        GCompris voices in Somali
+Group:          Amusements/Games
+
+%description sound-so
+Voice samples for the GCompris games in Somali.
+
+
 %package sound-sv
 Summary:        GCompris voices in Swedish
 Group:          Amusements/Games
@@ -215,9 +219,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
 
@@ -240,8 +241,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
 rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la
 rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -440,6 +439,13 @@
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/ru
 
+%files sound-so
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/so
+
 %files sound-sv
 %defattr(-,root,root,-)
 %dir %{_datadir}/gcompris
@@ -469,6 +475,11 @@
 
 
 %changelog
+* Tue Nov  7 2006 Hans de Goede  8.2-1
+- New upstream release 8.2
+- Drop most patches (integrated upstream)
+- Drop seperate / addon man page (integrated upstream)
+
 * Sun Oct 15 2006 Hans de Goede  8.1-1
 - New upstream release 8.1
 - Drop most patches (integrated upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 14:41:12 -0000	1.4
+++ sources	7 Nov 2006 19:10:04 -0000	1.5
@@ -1 +1 @@
-439b70411ccdbd99c6391d6bfb5e6fb6  gcompris-8.1.tar.gz
+56849e2b09bea6a47eb6f177cc85258f  gcompris-8.2.tar.gz


--- gcompris-8.0-fullscreen.patch DELETED ---


--- gcompris-8.0-silence.patch DELETED ---


--- gcompris-8.0-warn.patch DELETED ---


--- gcompris.6 DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov  7 19:11:49 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 7 Nov 2006 12:11:49 -0700
Subject: rpms/gcompris/FC-6 .cvsignore, 1.4, 1.5 gcompris.spec, 1.16,
	1.17 sources, 1.4, 1.5 gcompris-8.0-fullscreen.patch, 1.1,
	NONE gcompris-8.0-silence.patch, 1.1,
	NONE gcompris-8.0-warn.patch, 1.1, NONE gcompris.6, 1.1, NONE
Message-ID: <200611071911.kA7JBnrY031062@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31039

Modified Files:
	.cvsignore gcompris.spec sources 
Removed Files:
	gcompris-8.0-fullscreen.patch gcompris-8.0-silence.patch 
	gcompris-8.0-warn.patch gcompris.6 
Log Message:
* Tue Nov  7 2006 Hans de Goede  8.2-1
- New upstream release 8.2
- Drop most patches (integrated upstream)
- Drop seperate / addon man page (integrated upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 14:41:12 -0000	1.4
+++ .cvsignore	7 Nov 2006 19:11:19 -0000	1.5
@@ -1 +1 @@
-gcompris-8.1.tar.gz
+gcompris-8.2.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-6/gcompris.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gcompris.spec	15 Oct 2006 15:08:23 -0000	1.16
+++ gcompris.spec	7 Nov 2006 19:11:19 -0000	1.17
@@ -1,16 +1,12 @@
 Name:           gcompris
-Version:        8.1
+Version:        8.2
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        gcompris.6
-Patch0:         gcompris-8.0-warn.patch
-Patch1:         gcompris-8.0-fullscreen.patch
-Patch2:         gcompris-8.0-silence.patch
-Patch3:         gcompris-8.1-icon.patch
+Patch0:         gcompris-8.1-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -180,6 +176,14 @@
 Voice samples for the GCompris games in Russian.
 
 
+%package sound-so
+Summary:        GCompris voices in Somali
+Group:          Amusements/Games
+
+%description sound-so
+Voice samples for the GCompris games in Somali.
+
+
 %package sound-sv
 Summary:        GCompris voices in Swedish
 Group:          Amusements/Games
@@ -215,9 +219,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
 
@@ -240,8 +241,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
 rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la
 rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -440,6 +439,13 @@
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/ru
 
+%files sound-so
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/so
+
 %files sound-sv
 %defattr(-,root,root,-)
 %dir %{_datadir}/gcompris
@@ -469,6 +475,11 @@
 
 
 %changelog
+* Tue Nov  7 2006 Hans de Goede  8.2-1
+- New upstream release 8.2
+- Drop most patches (integrated upstream)
+- Drop seperate / addon man page (integrated upstream)
+
 * Sun Oct 15 2006 Hans de Goede  8.1-1
 - New upstream release 8.1
 - Drop most patches (integrated upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 14:41:12 -0000	1.4
+++ sources	7 Nov 2006 19:11:19 -0000	1.5
@@ -1 +1 @@
-439b70411ccdbd99c6391d6bfb5e6fb6  gcompris-8.1.tar.gz
+56849e2b09bea6a47eb6f177cc85258f  gcompris-8.2.tar.gz


--- gcompris-8.0-fullscreen.patch DELETED ---


--- gcompris-8.0-silence.patch DELETED ---


--- gcompris-8.0-warn.patch DELETED ---


--- gcompris.6 DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov  7 19:17:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 7 Nov 2006 12:17:11 -0700
Subject: rpms/gcompris/FC-5 gcompris-8.1-icon.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 gcompris.spec, 1.9, 1.10 sources, 1.3, 1.4 U006A.ogg, 1.1,
	NONE gcompris-7.4-xf86vidmode.patch, 1.4,
	NONE gcompris-7.4-xf86vidmode2.patch, 1.1,
	NONE gcompris-7.4-xf86vidmode3.patch, 1.1,
	NONE gcompris-click_on_letter.patch, 1.1,
	NONE gcompris-electric.patch, 1.1, NONE gcompris-nl.patch, 1.1,
	NONE gcompris-sys-assetml.patch, 1.1, NONE gcompris.6, 1.1, NONE
Message-ID: <200611071917.kA7JHBCo031168@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31145

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-8.1-icon.patch 
Removed Files:
	U006A.ogg gcompris-7.4-xf86vidmode.patch 
	gcompris-7.4-xf86vidmode2.patch 
	gcompris-7.4-xf86vidmode3.patch gcompris-click_on_letter.patch 
	gcompris-electric.patch gcompris-nl.patch 
	gcompris-sys-assetml.patch gcompris.6 
Log Message:
* Tue Nov  7 2006 Hans de Goede  8.2-1
- New upstream release 8.2
- Drop most patches (integrated upstream)
- Drop seperate / addon man page (integrated upstream)


gcompris-8.1-icon.patch:

--- NEW FILE gcompris-8.1-icon.patch ---
--- gcompris-8.1/src/gcompris/gcompris.c~	2006-10-15 14:44:14.000000000 +0200
+++ gcompris-8.1/src/gcompris/gcompris.c	2006-10-15 14:44:14.000000000 +0200
@@ -625,7 +625,7 @@
    * Set an icon for gcompris
    * ------------------------
    */
-  icon_file = g_strconcat(properties->system_icon_dir, "/gcompris.png", NULL);
+  icon_file = g_strconcat("/usr/share/icons/hicolor/48x48/apps", "/gcompris.png", NULL);
   if (!g_file_test (icon_file, G_FILE_TEST_EXISTS)) {
       /* Now check if this file is on the net */
       icon_file = gc_net_get_url_from_file("gcompris.png", NULL);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2006 10:35:38 -0000	1.3
+++ .cvsignore	7 Nov 2006 19:16:40 -0000	1.4
@@ -1,2 +1 @@
-gcompris-7.4.tar.gz
-gcompris-africa-patch.tar.gz
+gcompris-8.2.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-5/gcompris.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gcompris.spec	13 Aug 2006 10:35:38 -0000	1.9
+++ gcompris.spec	7 Nov 2006 19:16:40 -0000	1.10
@@ -1,29 +1,19 @@
 Name:           gcompris
-Version:        7.4
-Release:        13%{?dist}
+Version:        8.2
+Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        gcompris.6
-Source2:        U006A.ogg
-Source3:        gcompris-africa-patch.tar.gz
-Patch1:         gcompris-sys-assetml.patch
-Patch2:         gcompris-nl.patch
-Patch3:         gcompris-electric.patch
-Patch4:         gcompris-click_on_letter.patch
-Patch5:         gcompris-7.4-xf86vidmode.patch
-Patch6:         gcompris-7.4-xf86vidmode2.patch
-Patch7:         gcompris-7.4-xf86vidmode3.patch
+Patch0:         gcompris-8.1-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:  libgnomeui-devel sqlite-devel libassetml-devel python-devel
+Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
-Buildrequires:  xorg-x11-proto-devel
-Buildrequires:  gnome-python2-canvas python-sqlite2 texinfo texi2html
-Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
-Requires:       gnuchess gnucap tuxpaint gcompris-flags
-Requires:       gnome-python2-canvas python-sqlite2
+Buildrequires:  gnome-python2 xorg-x11-proto-devel python-sqlite2 texi2html
+Buildrequires:  texinfo perl(XML::Parser) gettext desktop-file-utils gnuchess
+Requires:       gnuchess gnucap tuxpaint gcompris-flags hicolor-icon-theme
+Requires:       pygtk2 python-sqlite2
 Requires:       %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -82,114 +72,116 @@
 Developmental files for the core-engine library of GCompris
 
 
+%package sound-cs
+Summary:        GCompris voices in Tsjech
+Group:          Amusements/Games
+
+%description sound-cs
+Voice samples for the GCompris games in Tsjech.
+
+
 %package sound-da
 Summary:        GCompris voices in Danish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-da
-Voice samples for the GCompris games in Danish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Danish.
 
 
 %package sound-de
 Summary:        GCompris voices in German
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-de
-Voice samples for the GCompris games in German, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in German.
 
 
 %package sound-en
 Summary:        GCompris voices in English
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-en
-Voice samples for the GCompris games in English, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in English.
 
 
 %package sound-es
 Summary:        GCompris voices in Spanish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-es
-Voice samples for the GCompris games in Spanish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Spanish.
 
 
 %package sound-fi
 Summary:        GCompris voices in Finish
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-fi
-Voice samples for the GCompris games in Finish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Finish.
 
 
 %package sound-fr
 Summary:        GCompris voices in French
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-fr
-Voice samples for the GCompris games in French, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in French.
 
 
 %package sound-hu
 Summary:        GCompris voices in Hungarian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-hu
-Voice samples for the GCompris games in Hungarian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Hungarian.
 
 
 %package sound-it
 Summary:        GCompris voices in Italian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-it
-Voice samples for the GCompris games in Italian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Italian.
+
+
+%package sound-mr
+Summary:        GCompris voices in Indian Marathi
+Group:          Amusements/Games
+
+%description sound-mr
+Voice samples for the GCompris games in Indian Marathi.
 
 
 %package sound-nl
 Summary:        GCompris voices in Dutch
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-nl
-Voice samples for the GCompris games in Dutch, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Dutch.
 
 
 %package sound-pt
 Summary:        GCompris voices in Portuguese
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-pt
-Voice samples for the GCompris games in Portuguese, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Portuguese.
 
 
 %package sound-ru
 Summary:        GCompris voices in Russian
 Group:          Amusements/Games
-Requires:       /usr/share/assetml
 
 %description sound-ru
-Voice samples for the GCompris games in Russian, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Russian.
+
+
+%package sound-so
+Summary:        GCompris voices in Somali
+Group:          Amusements/Games
+
+%description sound-so
+Voice samples for the GCompris games in Somali.
 
 
 %package sound-sv
@@ -197,8 +189,15 @@
 Group:          Amusements/Games
 
 %description sound-sv
-Voice samples for the GCompris games in Swedish, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Swedish.
+
+
+%package sound-tr
+Summary:        GCompris voices in Turk
+Group:          Amusements/Games
+
+%description sound-tr
+Voice samples for the GCompris games in Turk.
 
 
 %package sound-eu
@@ -206,8 +205,7 @@
 Group:          Amusements/Games
 
 %description sound-eu
-Voice samples for the GCompris games in Basque, these come with an assetml
-description so they could potentially be used by other packages.
+Voice samples for the GCompris games in Basque.
 
 
 %package flags
@@ -215,56 +213,20 @@
 Group:          Amusements/Games
 
 %description flags
-Country flags for use with GCompris (60x40 PNG), these come with an assetml
-description so they could potentially be used by other packages.
+Country flags for use with GCompris (60x40 PNG).
 
 
 %prep
 %setup -q
-%patch1 -p1 -z .sysassetml -E
-# no backup files for this patch, otherwise they get installed under /usr/share
-%patch2 -p1
-%patch3 -p1 -z .electric
-%patch4 -p1 -z .click_on_letter
-%patch5 -p1 -z .xf86vm
-%patch6 -p1 -z .xf86vm2
-%patch7 -p1 -z .xf86vm3
+%patch0 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
-# fix gnome.canvas deprecation warnings
-for i in src/boards/python.c `find src/boards/python -name "*.py"`; do
-   %{__sed} -i 's/gnome\.canvas/gnomecanvas/g' $i
-done
-# fix up broken dutch alphabet sounds
-pushd boards/sounds/nl/alphabet
-for i in U007{B..F}.ogg; do
-  mv $i `echo $i|%{__sed} s/7/6/`
-done
-cp %{SOURCE2} .
-popd
-# fix up missing dutch "ok zo" sound
-pushd boards/sounds/nl/misc
-cp ok.ogg check_answer.ogg
-popd
-# fixup african maps with files from CVS (BZ 197758)
-tar xfz %{SOURCE3}
-# these are no longer used
-rm boards/geography/africa/north_africa.xcf \
-  boards/geography/afrique/burundi.png \
-  boards/geography/afrique/djibouti.png \
-  boards/geography/afrique/equatorial_guinea.png \
-  boards/geography/afrique/gambia.png \
-  boards/geography/afrique/guinea_bissau.png \
-  boards/geography/afrique/lesotho.png \
-  boards/geography/afrique/rwanda.png \
-  boards/geography/afrique/sierra_leone.png \
-  boards/geography/afrique/swaziland.png
 
 
 %build
 # The configure check for python-gnome.canvas fails without X running,
 # --enable-py-build-only works around this
-%configure --enable-py-build-only
+%configure --enable-py-build-only --enable-gnet
 # we can't use %%{?_smp_mflags} because that breaks compilation!
 make 
 # Fixup the desktop files a bit, we don't use a patch because that breaks
@@ -279,8 +241,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
 rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la
 rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -353,6 +313,7 @@
 %{_datadir}/gcompris/boards/l*
 %{_datadir}/gcompris/boards/m*
 %{_datadir}/gcompris/boards/n*
+%{_datadir}/gcompris/boards/o*
 %{_datadir}/gcompris/boards/p*
 %{_datadir}/gcompris/boards/r*
 %{_datadir}/gcompris/boards/s*.xml
@@ -365,6 +326,7 @@
 %{_datadir}/gcompris/boards/sounds/chronos
 %{_datadir}/gcompris/boards/sounds/LuneRouge
 %{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE
+%{_datadir}/gcompris/boards/sounds/README
 %{_datadir}/gcompris/boards/submarine
 %{_datadir}/gcompris/boards/t*
 %{_datadir}/gcompris/boards/w*
@@ -385,9 +347,15 @@
 %{_libdir}/libgcompris-1.so
 %{_libdir}/pkgconfig/libgcompris-1.0.pc
 
+%files sound-cs
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/cs
+
 %files sound-da
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_da.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -395,7 +363,6 @@
 
 %files sound-de
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_de.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -403,7 +370,6 @@
 
 %files sound-en
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_en.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -411,7 +377,6 @@
 
 %files sound-es
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_es.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -419,7 +384,6 @@
 
 %files sound-fi
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_fi.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -427,7 +391,6 @@
 
 %files sound-fr
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_fr.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -435,7 +398,6 @@
 
 %files sound-hu
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_hu.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -443,15 +405,20 @@
 
 %files sound-it
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_it.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/it
 
+%files sound-mr
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/mr
+
 %files sound-nl
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_nl.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -459,31 +426,42 @@
 
 %files sound-pt
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_pt.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/pt
+%{_datadir}/gcompris/boards/sounds/pt_BR
 
 %files sound-ru
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_ru.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/ru
 
+%files sound-so
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/so
+
 %files sound-sv
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_sv.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/sv
 
+%files sound-tr
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/tr
+
 %files sound-eu
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_*_eu.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %dir %{_datadir}/gcompris/boards/sounds
@@ -491,13 +469,24 @@
 
 %files flags
 %defattr(-,root,root,-)
-%{_datadir}/assetml/gcompris_flags.assetml
 %dir %{_datadir}/gcompris
 %dir %{_datadir}/gcompris/boards
 %{_datadir}/gcompris/boards/flags
 
 
 %changelog
+* Tue Nov  7 2006 Hans de Goede  8.2-1
+- New upstream release 8.2
+- Drop most patches (integrated upstream)
+- Drop seperate / addon man page (integrated upstream)
+
+* Sun Oct 15 2006 Hans de Goede  8.1-1
+- New upstream release 8.1
+- Drop most patches (integrated upstream)
+
+* Mon Aug 28 2006 Hans de Goede  7.4-14
+- FE6 Rebuild
+
 * Sun Aug 13 2006 Hans de Goede  7.4-13
 - Fix BZ 197758 (backport from upstream CVS)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2006 10:35:38 -0000	1.3
+++ sources	7 Nov 2006 19:16:40 -0000	1.4
@@ -1,2 +1 @@
-d80e55da21170a98d671c98b3e582cc3  gcompris-7.4.tar.gz
-bc3d9ba72b4dd9742859ec6b90d12056  gcompris-africa-patch.tar.gz
+56849e2b09bea6a47eb6f177cc85258f  gcompris-8.2.tar.gz


--- U006A.ogg DELETED ---


--- gcompris-7.4-xf86vidmode.patch DELETED ---


--- gcompris-7.4-xf86vidmode2.patch DELETED ---


--- gcompris-7.4-xf86vidmode3.patch DELETED ---


--- gcompris-click_on_letter.patch DELETED ---


--- gcompris-electric.patch DELETED ---


--- gcompris-nl.patch DELETED ---


--- gcompris-sys-assetml.patch DELETED ---


--- gcompris.6 DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov  7 21:44:38 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 7 Nov 2006 14:44:38 -0700
Subject: rpms/audacity/FC-6 audacity.spec,1.16,1.17
Message-ID: <200611072144.kA7LicX6005306@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/FC-6

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacity.spec	3 Nov 2006 21:51:51 -0000	1.16
+++ audacity.spec	7 Nov 2006 21:44:07 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -57,7 +57,7 @@
 do
    perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
-%ifarch ppc ppc64
+%ifnarch %{ix86} x86_64
 # this flag is not available on ppc
 perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.*
 %endif
@@ -123,6 +123,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+- msse flag only on intel
+
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2
 - remove -msse flag for ppc
 



From fedora-extras-commits at redhat.com  Tue Nov  7 21:44:38 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 7 Nov 2006 14:44:38 -0700
Subject: rpms/audacity/devel audacity.spec,1.16,1.17
Message-ID: <200611072144.kA7LicUo005309@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/devel

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacity.spec	3 Nov 2006 22:08:35 -0000	1.16
+++ audacity.spec	7 Nov 2006 21:44:08 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -57,7 +57,7 @@
 do
    perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
-%ifarch ppc ppc64
+%ifnarch %{ix86} x86_64
 # this flag is not available on ppc
 perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.*
 %endif
@@ -123,6 +123,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+- msse flag only on intel
+
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2
 - remove -msse flag for ppc
 



From fedora-extras-commits at redhat.com  Tue Nov  7 21:44:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 7 Nov 2006 14:44:36 -0700
Subject: rpms/audacity/FC-5 audacity.spec,1.16,1.17
Message-ID: <200611072144.kA7LiaEP005303@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/FC-5

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacity.spec	3 Nov 2006 22:12:24 -0000	1.16
+++ audacity.spec	7 Nov 2006 21:44:06 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -57,7 +57,7 @@
 do
    perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
 done
-%ifarch ppc ppc64
+%ifnarch %{ix86} x86_64
 # this flag is not available on ppc
 perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.*
 %endif
@@ -123,6 +123,9 @@
 %doc %{_datadir}/doc/*
 
 %changelog
+* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+- msse flag only on intel
+
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2
 - remove -msse flag for ppc
 



From fedora-extras-commits at redhat.com  Tue Nov  7 22:35:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  7 Nov 2006 15:35:58 -0700
Subject: fedora-rpmdevtools rmdevelrpms.conf, 1.3, 1.4 rpmdev-rmdevelrpms,
	1.2, 1.3 rpmdevtools.spec, 1.19, 1.20
Message-ID: <200611072235.kA7MZwiQ008584@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8562

Modified Files:
	rmdevelrpms.conf rpmdev-rmdevelrpms rpmdevtools.spec 
Log Message:
* Wed Nov  8 2006 Ville Skytt?? 
- Arch-qualify output of matched packages in rmdevelrpms and allow
  arch-qualified packages in the config file.



Index: rmdevelrpms.conf
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rmdevelrpms.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rmdevelrpms.conf	20 Aug 2006 15:40:44 -0000	1.3
+++ rmdevelrpms.conf	7 Nov 2006 22:35:56 -0000	1.4
@@ -2,17 +2,17 @@
 #
 # To prevent rpmdev-rmdevelrpms from removing some packages, add them to
 # nondevpkgs.  The value can be a Python tuple or a whitespace separated
-# string.  For example:
-#   nondevpkgs = ("foo-devel", "bar-devel")
-#   nondevpkgs = "foo-devel bar-devel"
+# string containing package names or name.arch strings.  For example:
+#   nondevpkgs = ("foo-devel.x86_64", "bar-devel")
+#   nondevpkgs = "foo-devel.x86_64 bar-devel"
 #
 nondevpkgs = ""
 
 #
 # To add packages to the removal list, add them to devpkgs.
-# The value can be a Python tuple or a whitespace separated string.
+# The value's format is the same as for nondevpkgs above.
 # For example:
-#   devpkgs = ("libfoo", "bar")
-#   devpkgs = "libfoo bar"
+#   devpkgs = ("libfoo", "bar.i386", "quux-tools.noarch")
+#   devpkgs = "libfoo bar.i386 quux-tools.noarch"
 #
 devpkgs = ""


Index: rpmdev-rmdevelrpms
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-rmdevelrpms,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpmdev-rmdevelrpms	2 Oct 2006 16:03:21 -0000	1.2
+++ rpmdev-rmdevelrpms	7 Nov 2006 22:35:56 -0000	1.3
@@ -24,7 +24,7 @@
 import getopt, os, re, rpm, stat, sys, types
 
 
-__version__ = "1.3"
+__version__ = "1.4"
 
 
 dev_re  = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE)
@@ -66,10 +66,11 @@
     if not hdr: return 0
     name = hdr[rpm.RPMTAG_NAME]
     if not name: return 0
-    if name in nondevpkgs: return 0
-    if name in devpkgs: return 1
-    if name in def_nondevpkgs: return 0
-    if name in def_devpkgs: return 1
+    na = "%s.%s" % (name, hdr[rpm.RPMTAG_ARCH])
+    if name in nondevpkgs or na in nondevpkgs: return 0
+    if name in devpkgs or na in devpkgs: return 1
+    if name in def_nondevpkgs or na in def_nondevpkgs: return 0
+    if name in def_devpkgs or na in def_devpkgs: return 1
     if jdev_re.search(name): return 0
     if dev_re.search(name): return 1
     if test_re.search(name): return 1
@@ -177,16 +178,20 @@
             confirm = 0
     ts = rpm.TransactionSet("/")
     ts.setVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
-    for pkg in ts.dbMatch():
+    mi = ts.dbMatch()
+    for pkg in mi:
         if isDevelPkg(pkg):
-            # addErase behaves like "--allmatches"
-            ts.addErase(pkg[rpm.RPMTAG_NAME])
+            ts.addErase(mi.instance())
     ts.order()
     pkgs = []
     try:
         te = ts.next()
         while te:
-            pkgs.append(te.NEVR())
+            arch = te.A()
+            if arch:
+                pkgs.append("%s.%s" % (te.NEVR(), arch))
+            else:
+                pkgs.append(te.NEVR())
             te = ts.next()
     except StopIteration:
         pass
@@ -196,6 +201,7 @@
             print "Found %d devel packages:" % len(pkgs)
             for pkg in pkgs:
                 print "  %s" % pkg
+            # TODO: is there a way to get arch for the unresolved deps?
             unresolved = ts.check()
             if unresolved:
                 print "...but removal would cause unresolved dependencies:"


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmdevtools.spec	25 Oct 2006 12:22:46 -0000	1.19
+++ rpmdevtools.spec	7 Nov 2006 22:35:56 -0000	1.20
@@ -120,6 +120,10 @@
 
 
 %changelog
+* Wed Nov  8 2006 Ville Skytt?? 
+- Arch-qualify output of matched packages in rmdevelrpms and allow
+  arch-qualified packages in the config file.
+
 * Wed Oct 25 2006 Ville Skytt??  - 5.3-1
 - Update spectool to 1.0.8, fixes #212108.
 



From fedora-extras-commits at redhat.com  Tue Nov  7 23:18:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:18:15 -0700
Subject: rpms/php-pear-Pager - New directory
Message-ID: <200611072318.kA7NIF4f011862@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11858/php-pear-Pager

Log Message:
Directory /cvs/extras/rpms/php-pear-Pager added to the repository




From fedora-extras-commits at redhat.com  Tue Nov  7 23:18:21 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:18:21 -0700
Subject: rpms/php-pear-Pager/devel - New directory
Message-ID: <200611072318.kA7NILaY011876@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11858/php-pear-Pager/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Pager/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov  7 23:18:33 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:18:33 -0700
Subject: rpms/php-pear-Pager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611072318.kA7NIXG0011907@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11901

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Pager


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Pager
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  Tue Nov  7 23:18:39 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:18:39 -0700
Subject: rpms/php-pear-Pager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611072318.kA7NIdEh011924@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11901/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Pager


--- 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 Nov  7 23:19:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:19:29 -0700
Subject: rpms/php-pear-Pager import.log,1.1,1.2
Message-ID: <200611072319.kA7NJTDm011997@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11965

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Pager-2.4.2-1 on branch devel from php-pear-Pager-2.4.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Nov 2006 23:18:33 -0000	1.1
+++ import.log	7 Nov 2006 23:18:59 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Pager-2_4_2-1:HEAD:php-pear-Pager-2.4.2-1.src.rpm:1162941536



From fedora-extras-commits at redhat.com  Tue Nov  7 23:19:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:19:30 -0700
Subject: rpms/php-pear-Pager/devel php-pear-Pager.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611072319.kA7NJUNX012001@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11965/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Pager.spec 
Log Message:
auto-import php-pear-Pager-2.4.2-1 on branch devel from php-pear-Pager-2.4.2-1.src.rpm


--- NEW FILE php-pear-Pager.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Pager

Name:           php-pear-Pager
Version:        2.4.2
Release:        1%{?dist}
Summary:        Data paging class

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Pager
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
Requires:       php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
It takes an array of data as input and pages it according to various
parameters. It also builds links within a specified range, and allows
complete customization of the output (it even works with front controllers
and mod_rewrite). Two operating modes available: "Jumping" and "Sliding"
window style.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

# Fix rpmlint warning
dos2unix docdir/%{pear_name}/examples/example.php

%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/%{pear_name}

%changelog
* Sun Oct 29 2006 Christoper Stone  2.4.2-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Nov 2006 23:18:39 -0000	1.1
+++ .cvsignore	7 Nov 2006 23:19:00 -0000	1.2
@@ -0,0 +1 @@
+Pager-2.4.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Pager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Nov 2006 23:18:39 -0000	1.1
+++ sources	7 Nov 2006 23:19:00 -0000	1.2
@@ -0,0 +1 @@
+9dd1fd0aee0e8039f1a4033f822d50c3  Pager-2.4.2.tgz



From fedora-extras-commits at redhat.com  Tue Nov  7 23:21:17 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:21:17 -0700
Subject: owners owners.list,1.1898,1.1899
Message-ID: <200611072321.kA7NLHgV012056@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12037

Modified Files:
	owners.list 
Log Message:
php-pear-Pager


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -r1.1898 -r1.1899
--- owners.list	7 Nov 2006 16:34:58 -0000	1.1898
+++ owners.list	7 Nov 2006 23:20:47 -0000	1.1899
@@ -1777,6 +1777,7 @@
 Fedora Extras|php-pear-Net-FTP|Provides an OO interface to the PHP FTP functions plus some additions|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-SMTP|Provides an implementation of the SMTP protocol|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-Socket|Network Socket Interface|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Pager|Data paging class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Payment-Process|Unified payment processor|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PEAR-Command-Packaging|Create RPM spec files from PEAR modules|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHP-Compat|Provides missing functionality for older versions of PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov  7 23:37:17 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:37:17 -0700
Subject: rpms/php-pear-Net-URL - New directory
Message-ID: <200611072337.kA7NbHnJ012241@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Net-URL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12237/php-pear-Net-URL

Log Message:
Directory /cvs/extras/rpms/php-pear-Net-URL added to the repository




From fedora-extras-commits at redhat.com  Tue Nov  7 23:37:23 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:37:23 -0700
Subject: rpms/php-pear-Net-URL/devel - New directory
Message-ID: <200611072337.kA7NbNFB012255@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Net-URL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12237/php-pear-Net-URL/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Net-URL/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov  7 23:37:35 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:37:35 -0700
Subject: rpms/php-pear-Net-URL Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611072337.kA7NbZD9012286@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Net-URL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12280

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Net-URL


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Net-URL
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  Tue Nov  7 23:37:41 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:37:41 -0700
Subject: rpms/php-pear-Net-URL/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611072337.kA7NbfvC012304@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Net-URL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12280/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Net-URL


--- 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 Nov  7 23:38:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:38:29 -0700
Subject: rpms/php-pear-Net-URL import.log,1.1,1.2
Message-ID: <200611072338.kA7NcTdN012376@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Net-URL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12344

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Net-URL-1.0.14-1 on branch devel from php-pear-Net-URL-1.0.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-URL/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Nov 2006 23:37:35 -0000	1.1
+++ import.log	7 Nov 2006 23:37:59 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Net-URL-1_0_14-1:HEAD:php-pear-Net-URL-1.0.14-1.src.rpm:1162942676



From fedora-extras-commits at redhat.com  Tue Nov  7 23:38:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:38:30 -0700
Subject: rpms/php-pear-Net-URL/devel php-pear-Net-URL.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611072338.kA7NcUU2012380@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Net-URL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12344/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Net-URL.spec 
Log Message:
auto-import php-pear-Net-URL-1.0.14-1 on branch devel from php-pear-Net-URL-1.0.14-1.src.rpm


--- NEW FILE php-pear-Net-URL.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Net_URL

Name:           php-pear-Net-URL
Version:        1.0.14
Release:        1%{?dist}
Summary:        Easy parsing of URLs

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Net_URL
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
Provides easy parsing of URLs and their constituent parts.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Net


%changelog
* Sun Oct 29 2006 Christopher Stone  1.0.14-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-URL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Nov 2006 23:37:41 -0000	1.1
+++ .cvsignore	7 Nov 2006 23:38:00 -0000	1.2
@@ -0,0 +1 @@
+Net_URL-1.0.14.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-URL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Nov 2006 23:37:41 -0000	1.1
+++ sources	7 Nov 2006 23:38:00 -0000	1.2
@@ -0,0 +1 @@
+4be5ac05dc5a9bc54a33cec66d87eb0a  Net_URL-1.0.14.tgz



From fedora-extras-commits at redhat.com  Tue Nov  7 23:40:11 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:40:11 -0700
Subject: owners owners.list,1.1899,1.1900
Message-ID: <200611072340.kA7NeBls012436@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12416

Modified Files:
	owners.list 
Log Message:
php-pear-Net-URL


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1899
retrieving revision 1.1900
diff -u -r1.1899 -r1.1900
--- owners.list	7 Nov 2006 23:20:47 -0000	1.1899
+++ owners.list	7 Nov 2006 23:39:41 -0000	1.1900
@@ -1777,6 +1777,7 @@
 Fedora Extras|php-pear-Net-FTP|Provides an OO interface to the PHP FTP functions plus some additions|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-SMTP|Provides an implementation of the SMTP protocol|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-Socket|Network Socket Interface|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Net-URL|Easy parsing of URLs|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Pager|Data paging class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Payment-Process|Unified payment processor|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PEAR-Command-Packaging|Create RPM spec files from PEAR modules|rpm at timj.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov  7 23:56:36 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:56:36 -0700
Subject: rpms/php-pear-HTTP-Request - New directory
Message-ID: <200611072356.kA7Nua32012639@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTTP-Request
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12635/php-pear-HTTP-Request

Log Message:
Directory /cvs/extras/rpms/php-pear-HTTP-Request added to the repository




From fedora-extras-commits at redhat.com  Tue Nov  7 23:56:42 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:56:42 -0700
Subject: rpms/php-pear-HTTP-Request/devel - New directory
Message-ID: <200611072356.kA7NugjX012653@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTTP-Request/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12635/php-pear-HTTP-Request/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTTP-Request/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov  7 23:56:55 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:56:55 -0700
Subject: rpms/php-pear-HTTP-Request Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611072356.kA7Nut9G012684@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTTP-Request
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTTP-Request


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTTP-Request
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  Tue Nov  7 23:57:01 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:57:01 -0700
Subject: rpms/php-pear-HTTP-Request/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611072357.kA7Nv1hX012702@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTTP-Request/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTTP-Request


--- 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 Nov  7 23:57:50 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:57:50 -0700
Subject: rpms/php-pear-HTTP-Request import.log,1.1,1.2
Message-ID: <200611072357.kA7NvoTK012778@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTTP-Request
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742

Modified Files:
	import.log 
Log Message:
auto-import php-pear-HTTP-Request-1.4.0-1 on branch devel from php-pear-HTTP-Request-1.4.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Nov 2006 23:56:55 -0000	1.1
+++ import.log	7 Nov 2006 23:57:19 -0000	1.2
@@ -0,0 +1 @@
+php-pear-HTTP-Request-1_4_0-1:HEAD:php-pear-HTTP-Request-1.4.0-1.src.rpm:1162943836



From fedora-extras-commits at redhat.com  Tue Nov  7 23:57:50 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:57:50 -0700
Subject: rpms/php-pear-HTTP-Request/devel php-pear-HTTP-Request.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611072357.kA7NvoOb012782@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTTP-Request/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-HTTP-Request.spec 
Log Message:
auto-import php-pear-HTTP-Request-1.4.0-1 on branch devel from php-pear-HTTP-Request-1.4.0-1.src.rpm


--- NEW FILE php-pear-HTTP-Request.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTTP_Request

Name:           php-pear-HTTP-Request
Version:        1.4.0
Release:        1%{?dist}
Summary:        Provides an easy way to perform HTTP requests

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTTP_Request
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
Requires:       php-pear(PEAR) >= 1.4.0b1
Requires:       php-pear(Net_URL) >= 1.0.12
Requires:       php-pear(Net_Socket) >= 1.0.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
Supports GET/POST/HEAD/TRACE/PUT/DELETE, Basic authentication, Proxy,
Proxy Authentication, SSL, file uploads etc.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

# Fix rpmlint warnings
dos2unix docdir/%{pear_name}/docs/example.php
dos2unix docdir/%{pear_name}/docs/download-progress.php


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/HTTP


%changelog
* Sun Oct 29 2006 Christopher Stone  1.4.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Nov 2006 23:57:01 -0000	1.1
+++ .cvsignore	7 Nov 2006 23:57:20 -0000	1.2
@@ -0,0 +1 @@
+HTTP_Request-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP-Request/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Nov 2006 23:57:01 -0000	1.1
+++ sources	7 Nov 2006 23:57:20 -0000	1.2
@@ -0,0 +1 @@
+2aacf8ac8ce9aa865269f6b5e4c256b9  HTTP_Request-1.4.0.tgz



From fedora-extras-commits at redhat.com  Tue Nov  7 23:59:20 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 7 Nov 2006 16:59:20 -0700
Subject: owners owners.list,1.1900,1.1901
Message-ID: <200611072359.kA7NxKZ9012831@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12815

Modified Files:
	owners.list 
Log Message:
php-pear-HTTP-Request


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1900
retrieving revision 1.1901
diff -u -r1.1900 -r1.1901
--- owners.list	7 Nov 2006 23:39:41 -0000	1.1900
+++ owners.list	7 Nov 2006 23:58:50 -0000	1.1901
@@ -1768,6 +1768,7 @@
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Log|Abstracted logging facility for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Mail|Class that provides multiple interfaces for sending emails|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  8 00:52:19 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 17:52:19 -0700
Subject: rpms/tbcload - New directory
Message-ID: <200611080052.kA80qJ7Y019212@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tbcload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19206/tbcload

Log Message:
Directory /cvs/extras/rpms/tbcload added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  8 00:52:25 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 17:52:25 -0700
Subject: rpms/tbcload/devel - New directory
Message-ID: <200611080052.kA80qPtS019234@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tbcload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19206/tbcload/devel

Log Message:
Directory /cvs/extras/rpms/tbcload/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  8 00:52:36 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 17:52:36 -0700
Subject: rpms/tbcload Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611080052.kA80qah3019283@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tbcload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19276

Added Files:
	Makefile import.log 
Log Message:
Setup of module tbcload


--- NEW FILE Makefile ---
# Top level Makefile for module tbcload
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  Wed Nov  8 00:52:42 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 17:52:42 -0700
Subject: rpms/tbcload/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611080052.kA80qgwp019314@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tbcload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19276/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tbcload


--- 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 Nov  8 00:53:36 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 17:53:36 -0700
Subject: rpms/tbcload import.log,1.1,1.2
Message-ID: <200611080053.kA80rara019496@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tbcload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406

Modified Files:
	import.log 
Log Message:
auto-import tbcload-1.4-3.20061030cvs on branch devel from tbcload-1.4-3.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tbcload/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2006 00:52:36 -0000	1.1
+++ import.log	8 Nov 2006 00:53:06 -0000	1.2
@@ -0,0 +1 @@
+tbcload-1_4-3_20061030cvs:HEAD:tbcload-1.4-3.20061030cvs.src.rpm:1162947183



From fedora-extras-commits at redhat.com  Wed Nov  8 00:53:37 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 17:53:37 -0700
Subject: rpms/tbcload/devel tbcload-1.4-configure.patch, NONE,
	1.1 tbcload.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611080053.kA80rbar019501@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tbcload/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tbcload-1.4-configure.patch tbcload.spec 
Log Message:
auto-import tbcload-1.4-3.20061030cvs on branch devel from tbcload-1.4-3.20061030cvs.src.rpm

tbcload-1.4-configure.patch:

--- NEW FILE tbcload-1.4-configure.patch ---
--- configure.orig	2006-10-31 21:10:39.000000000 -0800
+++ configure	2006-10-31 21:12:24.000000000 -0800
@@ -1505,10 +1505,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -7051,7 +7053,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


--- NEW FILE tbcload.spec ---
%define cvsdate 20061030

Summary: Tcl bytecode loader
Name: tbcload
Version: 1.4
Release: 3.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tbcload-20061030cvs tbcload
# tar czf tbcload-20061030cvs.tgz ./tbcload-20061030cvs
Source0: tbcload-%{cvsdate}cvs.tgz
Patch0:  tbcload-1.4-configure.patch
URL: http://tclpro.sourceforge.net/
Requires: tcl
BuildRequires: tcl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A Tcl bytecode loader that loads tcl bytecode files for faster loading
and execution.

%package devel
Summary: Header files for compiling against tbcload
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} tcl-devel
%description devel
Header files for compiling against tbcload

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch -p0

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog license.terms
%defattr(-,root,root)
%{_libdir}/%{name}%{version}

%files devel
%defattr(-,root,root)
%{_includedir}/*.h

%changelog
* Tue Nov 7 2006 Wart  1.4-3.20061030cvs
- Fix rpmlint warning about changelog entries

* Thu Nov 2 2006 Wart  1.4-2.20061030cvs
- Added missing license file

* Tue Oct 31 2006 Wart  1.4-1.20061030cvs
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tbcload/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Nov 2006 00:52:41 -0000	1.1
+++ .cvsignore	8 Nov 2006 00:53:07 -0000	1.2
@@ -0,0 +1 @@
+tbcload-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tbcload/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Nov 2006 00:52:41 -0000	1.1
+++ sources	8 Nov 2006 00:53:07 -0000	1.2
@@ -0,0 +1 @@
+a62c0d6acc58fbe53dc285090ceff444  tbcload-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Wed Nov  8 00:54:04 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 7 Nov 2006 17:54:04 -0700
Subject: rpms/soundconverter/FC-6 soundconverter-0.9.3-taglib.patch, NONE,
	1.1 soundconverter.spec, 1.11, 1.12
Message-ID: <200611080054.kA80s4gP019563@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19474

Modified Files:
	soundconverter.spec 
Added Files:
	soundconverter-0.9.3-taglib.patch 
Log Message:
Added patch to detect missing id3v2mux gst plugin (bz 214035)

soundconverter-0.9.3-taglib.patch:

--- NEW FILE soundconverter-0.9.3-taglib.patch ---
--- soundconverter-0.9.3/src/soundconverter.py.orig	2006-11-08 01:47:19.000000000 +0100
+++ soundconverter-0.9.3/src/soundconverter.py	2006-11-08 01:48:21.000000000 +0100
@@ -1065,7 +1065,10 @@
 			
 			cmd += "%s=%s " % (properties[self.mp3_mode][1], self.mp3_quality)
 	
-		return cmd + " ! id3v2mux "
+		if (gst.element_factory_find("id3v2mux")):
+			return cmd + " ! id3v2mux "
+		else:
+			return cmd
 
 class FileList:
 	"""List of files added by the user."""


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-6/soundconverter.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- soundconverter.spec	19 Oct 2006 15:03:24 -0000	1.11
+++ soundconverter.spec	8 Nov 2006 00:53:34 -0000	1.12
@@ -1,12 +1,13 @@
 Name:           soundconverter
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://soundconverter.berlios.de/
 Source0:        http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz
+Patch0:         soundconverter-0.9.3-taglib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .taglib
 
 
 %build
@@ -62,6 +64,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Denis Leroy  - 0.9.3-2
+- Added patch to detect missing id3v2mux gst plugin
+
 * Thu Oct 19 2006 Denis Leroy  - 0.9.3-1
 - Update to 0.9.3
 



From fedora-extras-commits at redhat.com  Wed Nov  8 00:56:50 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 7 Nov 2006 17:56:50 -0700
Subject: rpms/soundconverter/FC-5 soundconverter-0.9.3-taglib.patch, NONE,
	1.1 soundconverter.spec, 1.8, 1.9
Message-ID: <200611080056.kA80uoBj019760@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19741

Modified Files:
	soundconverter.spec 
Added Files:
	soundconverter-0.9.3-taglib.patch 
Log Message:
Added patch to detect missing id3v2mux gst plugin (bz 214035)

soundconverter-0.9.3-taglib.patch:

--- NEW FILE soundconverter-0.9.3-taglib.patch ---
--- soundconverter-0.9.3/src/soundconverter.py.orig	2006-11-08 01:47:19.000000000 +0100
+++ soundconverter-0.9.3/src/soundconverter.py	2006-11-08 01:48:21.000000000 +0100
@@ -1065,7 +1065,10 @@
 			
 			cmd += "%s=%s " % (properties[self.mp3_mode][1], self.mp3_quality)
 	
-		return cmd + " ! id3v2mux "
+		if (gst.element_factory_find("id3v2mux")):
+			return cmd + " ! id3v2mux "
+		else:
+			return cmd
 
 class FileList:
 	"""List of files added by the user."""


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-5/soundconverter.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- soundconverter.spec	3 Nov 2006 09:46:00 -0000	1.8
+++ soundconverter.spec	8 Nov 2006 00:56:20 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           soundconverter
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://soundconverter.berlios.de/
 Source0:        http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz
+Patch0:         soundconverter-0.9.3-taglib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .taglib
 
 
 %build
@@ -62,6 +64,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Denis Leroy  - 0.9.3-2
+- Added patch to detect missing id3v2mux gst plugin
+
 * Fri Nov  3 2006 Denis Leroy  - 0.9.3-1
 - Update to 0.9.3
 



From fedora-extras-commits at redhat.com  Wed Nov  8 00:59:05 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 7 Nov 2006 17:59:05 -0700
Subject: rpms/soundconverter/devel soundconverter-0.9.3-taglib.patch, NONE, 
	1.1 soundconverter.spec, 1.11, 1.12
Message-ID: <200611080059.kA80x5wK019800@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19781

Modified Files:
	soundconverter.spec 
Added Files:
	soundconverter-0.9.3-taglib.patch 
Log Message:
Added patch to detect missing id3v2mux gst plugin (bz 214035)

soundconverter-0.9.3-taglib.patch:

--- NEW FILE soundconverter-0.9.3-taglib.patch ---
--- soundconverter-0.9.3/src/soundconverter.py.orig	2006-11-08 01:47:19.000000000 +0100
+++ soundconverter-0.9.3/src/soundconverter.py	2006-11-08 01:48:21.000000000 +0100
@@ -1065,7 +1065,10 @@
 			
 			cmd += "%s=%s " % (properties[self.mp3_mode][1], self.mp3_quality)
 	
-		return cmd + " ! id3v2mux "
+		if (gst.element_factory_find("id3v2mux")):
+			return cmd + " ! id3v2mux "
+		else:
+			return cmd
 
 class FileList:
 	"""List of files added by the user."""


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/devel/soundconverter.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- soundconverter.spec	19 Oct 2006 15:03:24 -0000	1.11
+++ soundconverter.spec	8 Nov 2006 00:58:35 -0000	1.12
@@ -1,12 +1,13 @@
 Name:           soundconverter
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://soundconverter.berlios.de/
 Source0:        http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz
+Patch0:         soundconverter-0.9.3-taglib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .taglib
 
 
 %build
@@ -62,6 +64,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Denis Leroy  - 0.9.3-2
+- Added patch to detect missing id3v2mux gst plugin
+
 * Thu Oct 19 2006 Denis Leroy  - 0.9.3-1
 - Update to 0.9.3
 



From fedora-extras-commits at redhat.com  Wed Nov  8 01:05:00 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 7 Nov 2006 18:05:00 -0700
Subject: rpms/soundconverter/FC-4 soundconverter-0.9.3-taglib.patch, NONE,
	1.1 soundconverter.spec, 1.6, 1.7
Message-ID: <200611080105.kA8150S6022829@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/soundconverter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22810

Modified Files:
	soundconverter.spec 
Added Files:
	soundconverter-0.9.3-taglib.patch 
Log Message:
Added patch to detect missing id3v2mux gst plugin (bz 214035)

soundconverter-0.9.3-taglib.patch:

--- NEW FILE soundconverter-0.9.3-taglib.patch ---
--- soundconverter-0.9.3/src/soundconverter.py.orig	2006-11-08 01:47:19.000000000 +0100
+++ soundconverter-0.9.3/src/soundconverter.py	2006-11-08 01:48:21.000000000 +0100
@@ -1065,7 +1065,10 @@
 			
 			cmd += "%s=%s " % (properties[self.mp3_mode][1], self.mp3_quality)
 	
-		return cmd + " ! id3v2mux "
+		if (gst.element_factory_find("id3v2mux")):
+			return cmd + " ! id3v2mux "
+		else:
+			return cmd
 
 class FileList:
 	"""List of files added by the user."""


Index: soundconverter.spec
===================================================================
RCS file: /cvs/extras/rpms/soundconverter/FC-4/soundconverter.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- soundconverter.spec	3 Nov 2006 10:20:34 -0000	1.6
+++ soundconverter.spec	8 Nov 2006 01:04:30 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           soundconverter
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://soundconverter.berlios.de/
 Source0:        http://download.berlios.de/soundconverter/%{name}-%{version}.tar.gz
+Patch0:         soundconverter-0.9.3-taglib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .taglib
 
 %build
 %configure --disable-dependency-tracking
@@ -59,6 +61,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Denis Leroy  - 0.9.3-2
+- Added patch to detect missing id3v2mux gst plugin
+
 * Fri Nov  3 2006 Denis Leroy  - 0.9.3-1
 - Update to 0.9.3
 



From fedora-extras-commits at redhat.com  Wed Nov  8 01:19:33 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 7 Nov 2006 18:19:33 -0700
Subject: rpms/gtk2hs/devel .cvsignore, 1.2, 1.3 gtk2hs.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200611080119.kA81JXPK023059@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23038

Modified Files:
	.cvsignore gtk2hs.spec sources 
Log Message:
- update to latest darcs snapshot for ghc66
- add soegtk and remove mogul ghc packages



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 May 2006 03:18:55 -0000	1.2
+++ .cvsignore	8 Nov 2006 01:19:03 -0000	1.3
@@ -1 +1 @@
-gtk2hs-0.9.10.tar.gz
+gtk2hs-0.9.10.2.tar.gz


Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk2hs.spec	28 Sep 2006 05:37:36 -0000	1.5
+++ gtk2hs.spec	8 Nov 2006 01:19:03 -0000	1.6
@@ -1,14 +1,13 @@
-%define ghc_version 6.4.2
-%define ghcver ghc642
-#%%define mozver 1.5.0.6
+%define ghc_version 6.6
+%define ghcver ghc66
 
 %define build_mozembed 1
 %define build_cairo 1
 
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
-Version:        0.9.10
-Release:        4%{?dist}
+Version:        0.9.10.2
+Release:        0.20061107%{?dist}
 License:        LGPL
 Group:          Development/Libraries
 Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -60,8 +59,7 @@
 management, unicode support, and wide coverage of Gtk+ 2 widgets.
 
 This package also includes the bindings for cairo, gconf, glade, glib, and
-sourceview, and the mogul wrapper library.  The libraries are compiled for
-ghc-%{ghc_version}.
+sourceview.  The libraries are compiled for ghc-%{ghc_version}.
 
 
 %package doc
@@ -99,7 +97,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
@@ -128,7 +126,7 @@
 make DESTDIR=%{buildroot} install
 
 # make ghost files
-for i in gconf glade glib gtk mogul sourceview \
+for i in gconf glade glib gtk sourceview soegtk \
 %if %{build_cairo}
         cairo \
 %endif
@@ -158,10 +156,10 @@
         cairo \
 %endif
         gtk \
-        mogul \
         gconf \
         glade \
         sourceview \
+	soegtk \
 ; do
 %{ghcpkg_inst $i}
 done
@@ -176,10 +174,10 @@
 %preun -n %{ghcver}-%{name}
 if [ "$1" = 0 ]; then
   for i in \
+	soegtk \
         gconf \
         glade \
         sourceview \
-        mogul \
         gtk \
 %if %{build_cairo}
         cairo \
@@ -218,35 +216,29 @@
 %{gtk2hsdir}/cairo.package.conf
 %{gtk2hsdir}/libHScairo.a
 %ghost %{gtk2hsdir}/HScairo.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/cairo
 %endif
 %{gtk2hsdir}/gconf.package.conf
 %{gtk2hsdir}/libHSgconf.a
 %ghost %{gtk2hsdir}/HSgconf.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/gconf
 %{gtk2hsdir}/glade.package.conf
 %{gtk2hsdir}/libHSglade.a
 %ghost %{gtk2hsdir}/HSglade.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/glade
 %{gtk2hsdir}/glib.package.conf
 %{gtk2hsdir}/libHSglib.a
 %ghost %{gtk2hsdir}/HSglib.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/glib
 %dir %{gtk2hsdir}/include
 %{gtk2hsdir}/include/gtk2hs-config.h
-%{gtk2hsdir}/mogul.package.conf
-%{gtk2hsdir}/libHSmogul.a
-%ghost %{gtk2hsdir}/HSmogul.o
-%dir %{gtk2hsdir}/imports
-%{gtk2hsdir}/imports/mogul
+%{gtk2hsdir}/soegtk.package.conf
+%{gtk2hsdir}/libHSsoegtk.a
+%ghost %{gtk2hsdir}/HSsoegtk.o
+%{gtk2hsdir}/imports/soegtk
 %{gtk2hsdir}/sourceview.package.conf
 %{gtk2hsdir}/libHSsourceview.a
 %ghost %{gtk2hsdir}/HSsourceview.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/sourceview
 
 
@@ -261,12 +253,15 @@
 %{gtk2hsdir}/mozembed.package.conf
 %{gtk2hsdir}/libHSmozembed.a
 %ghost %{gtk2hsdir}/HSmozembed.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/mozembed
 %endif
 
 
 %changelog
+* Wed Nov  8 2006 Jens Petersen  - 0.9.10.2-0
+- update to latest darcs snapshot for ghc66
+- add soegtk and remove mogul ghc packages
+
 * Thu Sep 28 2006 Jens Petersen  - 0.9.10-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 May 2006 03:18:55 -0000	1.2
+++ sources	8 Nov 2006 01:19:03 -0000	1.3
@@ -1 +1 @@
-13d300e07153f37ba5893ac336b078bc  gtk2hs-0.9.10.tar.gz
+1da9b3f4d89d411f07d746dcb23d3414  gtk2hs-0.9.10.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 01:20:55 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue, 7 Nov 2006 18:20:55 -0700
Subject: rpms/gtk2hs/devel gtk2hs.spec,1.6,1.7
Message-ID: <200611080120.kA81Kt22023116@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23079

Modified Files:
	gtk2hs.spec 
Log Message:
add .1 to release



Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk2hs.spec	8 Nov 2006 01:19:03 -0000	1.6
+++ gtk2hs.spec	8 Nov 2006 01:20:25 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
 Version:        0.9.10.2
-Release:        0.20061107%{?dist}
+Release:        0.1.20061107%{?dist}
 License:        LGPL
 Group:          Development/Libraries
 Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 01:21:37 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 18:21:37 -0700
Subject: owners owners.list,1.1901,1.1902
Message-ID: <200611080121.kA81LbRd023182@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23115

Modified Files:
	owners.list 
Log Message:
Added tbcload



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1901
retrieving revision 1.1902
diff -u -r1.1901 -r1.1902
--- owners.list	7 Nov 2006 23:58:50 -0000	1.1901
+++ owners.list	8 Nov 2006 01:21:06 -0000	1.1902
@@ -2184,6 +2184,7 @@
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tango-icon-theme|Icons from Tango Project|raven at pmail.pl|extras-qa at fedoraproject.org|
 Fedora Extras|taskjuggler|Project management tool|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|tbcload|Tcl bytecode loader|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  8 01:26:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 18:26:48 -0700
Subject: rpms/tclcompiler - New directory
Message-ID: <200611080126.kA81QmfB023239@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclcompiler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23235/tclcompiler

Log Message:
Directory /cvs/extras/rpms/tclcompiler added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  8 01:26:54 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 18:26:54 -0700
Subject: rpms/tclcompiler/devel - New directory
Message-ID: <200611080126.kA81Qs4D023253@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclcompiler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23235/tclcompiler/devel

Log Message:
Directory /cvs/extras/rpms/tclcompiler/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  8 01:27:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 18:27:05 -0700
Subject: rpms/tclcompiler Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611080127.kA81R50N023284@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclcompiler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23278

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclcompiler


--- NEW FILE Makefile ---
# Top level Makefile for module tclcompiler
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  Wed Nov  8 01:27:11 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 18:27:11 -0700
Subject: rpms/tclcompiler/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611080127.kA81RBgm023301@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclcompiler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23278/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclcompiler


--- 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 Nov  8 01:28:03 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 18:28:03 -0700
Subject: rpms/tclcompiler import.log,1.1,1.2
Message-ID: <200611080128.kA81S3iV023382@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclcompiler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23347

Modified Files:
	import.log 
Log Message:
auto-import tclcompiler-1.5-2.20061030cvs on branch devel from tclcompiler-1.5-2.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclcompiler/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2006 01:27:05 -0000	1.1
+++ import.log	8 Nov 2006 01:27:33 -0000	1.2
@@ -0,0 +1 @@
+tclcompiler-1_5-2_20061030cvs:HEAD:tclcompiler-1.5-2.20061030cvs.src.rpm:1162949250



From fedora-extras-commits at redhat.com  Wed Nov  8 01:28:03 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 18:28:03 -0700
Subject: rpms/tclcompiler/devel tclcompiler-1.5-configure.patch, NONE,
	1.1 tclcompiler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611080128.kA81S3mI023386@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclcompiler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23347/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tclcompiler-1.5-configure.patch tclcompiler.spec 
Log Message:
auto-import tclcompiler-1.5-2.20061030cvs on branch devel from tclcompiler-1.5-2.20061030cvs.src.rpm

tclcompiler-1.5-configure.patch:

--- NEW FILE tclcompiler-1.5-configure.patch ---
--- configure.orig	2006-10-31 21:41:47.000000000 -0800
+++ configure	2006-10-31 21:41:31.000000000 -0800
@@ -1495,10 +1495,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -6979,7 +6981,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


--- NEW FILE tclcompiler.spec ---
%define cvsdate 20061030

Summary: Tcl bytecode compiler
Name: tclcompiler
Version: 1.5
Release: 2.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclcompiler-20061030cvs tclcompiler
# tar czf tclcompiler-20061030cvs.tgz ./tclcompiler-20061030cvs
Source0: tclcompiler-%{cvsdate}cvs.tgz
Patch0:  tclcompiler-1.5-configure.patch
URL: http://tclpro.sourceforge.net/
Requires: tcl
BuildRequires: tbcload-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A Tcl bytecode compiler that compiles .tcl script files into Tcl bytecode
for faster loading and execution.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch -p0

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
# fails because there is no test suite for this package.
#make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog license.terms
%defattr(-,root,root)
%{_libdir}/%{name}%{version}

%changelog
* Thu Nov 2 2006 Wart  1.5-2.20061030cvs
- Added missing license file

* Tue Oct 31 2006 Wart  1.5-1.20061030cvs
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclcompiler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Nov 2006 01:27:10 -0000	1.1
+++ .cvsignore	8 Nov 2006 01:27:33 -0000	1.2
@@ -0,0 +1 @@
+tclcompiler-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclcompiler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Nov 2006 01:27:10 -0000	1.1
+++ sources	8 Nov 2006 01:27:33 -0000	1.2
@@ -0,0 +1 @@
+6e4c81bd2a1ee86d3043326c9615528b  tclcompiler-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Wed Nov  8 01:29:32 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 7 Nov 2006 18:29:32 -0700
Subject: owners owners.list,1.1902,1.1903
Message-ID: <200611080129.kA81TW2L023450@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23418

Modified Files:
	owners.list 
Log Message:
Added tclcompiler




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1902
retrieving revision 1.1903
diff -u -r1.1902 -r1.1903
--- owners.list	8 Nov 2006 01:21:06 -0000	1.1902
+++ owners.list	8 Nov 2006 01:29:01 -0000	1.1903
@@ -2187,6 +2187,7 @@
 Fedora Extras|tbcload|Tcl bytecode loader|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|tclcompiler|Tcl bytecode compiler|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  8 02:09:35 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 7 Nov 2006 19:09:35 -0700
Subject: rpms/shorewall/devel .cvsignore, 1.21, 1.22 shorewall.spec, 1.28,
	1.29 sources, 1.21, 1.22
Message-ID: <200611080209.kA829Zvj026667@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26641

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	29 Sep 2006 22:41:57 -0000	1.21
+++ .cvsignore	8 Nov 2006 02:09:05 -0000	1.22
@@ -1 +1 @@
-shorewall-3.2.4.tar.bz2
+shorewall-3.2.5.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- shorewall.spec	29 Sep 2006 22:41:57 -0000	1.28
+++ shorewall.spec	8 Nov 2006 02:09:05 -0000	1.29
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.2.4
+Version: 3.2.5
 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 Nov 07 2006 Robert Marcano  - 3.2.5-1
+- Update to upstream 3.2.5
+
 * Fri Sep 29 2006 Robert Marcano  - 3.2.4-1
 - Update to upstream 3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	29 Sep 2006 22:41:57 -0000	1.21
+++ sources	8 Nov 2006 02:09:05 -0000	1.22
@@ -1 +1 @@
-c23d666b22d0e13a0dab1e5c5593933a  shorewall-3.2.4.tar.bz2
+7f3e80d8a1fe1d14dd15b00187ddc8e1  shorewall-3.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 02:12:31 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 7 Nov 2006 19:12:31 -0700
Subject: rpms/shorewall/FC-6 .cvsignore, 1.21, 1.22 shorewall.spec, 1.28,
	1.29 sources, 1.21, 1.22
Message-ID: <200611080212.kA82CVaB026801@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26781

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	29 Sep 2006 22:41:57 -0000	1.21
+++ .cvsignore	8 Nov 2006 02:12:01 -0000	1.22
@@ -1 +1 @@
-shorewall-3.2.4.tar.bz2
+shorewall-3.2.5.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/shorewall.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- shorewall.spec	29 Sep 2006 22:41:57 -0000	1.28
+++ shorewall.spec	8 Nov 2006 02:12:01 -0000	1.29
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.2.4
+Version: 3.2.5
 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 Nov 07 2006 Robert Marcano  - 3.2.5-1
+- Update to upstream 3.2.5
+
 * Fri Sep 29 2006 Robert Marcano  - 3.2.4-1
 - Update to upstream 3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-6/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	29 Sep 2006 22:41:57 -0000	1.21
+++ sources	8 Nov 2006 02:12:01 -0000	1.22
@@ -1 +1 @@
-c23d666b22d0e13a0dab1e5c5593933a  shorewall-3.2.4.tar.bz2
+7f3e80d8a1fe1d14dd15b00187ddc8e1  shorewall-3.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 02:16:33 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 7 Nov 2006 19:16:33 -0700
Subject: rpms/shorewall/FC-5 .cvsignore, 1.19, 1.20 shorewall.spec, 1.26,
	1.27 sources, 1.19, 1.20
Message-ID: <200611080216.kA82GXxL026873@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26853

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 Sep 2006 22:47:13 -0000	1.19
+++ .cvsignore	8 Nov 2006 02:16:03 -0000	1.20
@@ -1 +1 @@
-shorewall-3.2.4.tar.bz2
+shorewall-3.2.5.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-5/shorewall.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- shorewall.spec	29 Sep 2006 22:47:13 -0000	1.26
+++ shorewall.spec	8 Nov 2006 02:16:03 -0000	1.27
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.2.4
+Version: 3.2.5
 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 Nov 07 2006 Robert Marcano  - 3.2.5-1
+- Update to upstream 3.2.5
+
 * Fri Sep 29 2006 Robert Marcano  - 3.2.4-1
 - Update to upstream 3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-5/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 Sep 2006 22:47:13 -0000	1.19
+++ sources	8 Nov 2006 02:16:03 -0000	1.20
@@ -1 +1 @@
-c23d666b22d0e13a0dab1e5c5593933a  shorewall-3.2.4.tar.bz2
+7f3e80d8a1fe1d14dd15b00187ddc8e1  shorewall-3.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 02:18:07 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue, 7 Nov 2006 19:18:07 -0700
Subject: rpms/shorewall/FC-4 .cvsignore, 1.13, 1.14 shorewall.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <200611080218.kA82I7CH026941@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26917

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	29 Sep 2006 22:48:23 -0000	1.13
+++ .cvsignore	8 Nov 2006 02:17:36 -0000	1.14
@@ -1 +1 @@
-shorewall-3.2.4.tar.bz2
+shorewall-3.2.5.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- shorewall.spec	29 Sep 2006 22:48:23 -0000	1.21
+++ shorewall.spec	8 Nov 2006 02:17:36 -0000	1.22
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.2.4
+Version: 3.2.5
 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 Nov 07 2006 Robert Marcano  - 3.2.5-1
+- Update to upstream 3.2.5
+
 * Fri Sep 29 2006 Robert Marcano  - 3.2.4-1
 - Update to upstream 3.2.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Sep 2006 22:48:23 -0000	1.13
+++ sources	8 Nov 2006 02:17:36 -0000	1.14
@@ -1 +1 @@
-c23d666b22d0e13a0dab1e5c5593933a  shorewall-3.2.4.tar.bz2
+7f3e80d8a1fe1d14dd15b00187ddc8e1  shorewall-3.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 02:25:38 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Tue, 7 Nov 2006 19:25:38 -0700
Subject: rpms/granule/FC-6 granule.spec,1.2,1.3
Message-ID: <200611080225.kA82Pcn4027049@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27029

Modified Files:
	granule.spec 
Log Message:
Trying to resolve tag name conflict between different branches (devel vs FC-6).



Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/FC-6/granule.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- granule.spec	7 Nov 2006 03:36:12 -0000	1.2
+++ granule.spec	8 Nov 2006 02:25:08 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.2.3
-Release:    3
+Release:    3%{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/



From fedora-extras-commits at redhat.com  Wed Nov  8 05:48:16 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 7 Nov 2006 22:48:16 -0700
Subject: rpms/gdesklets/devel .cvsignore, 1.3, 1.4 gdesklets.spec, 1.20,
	1.21 sources, 1.3, 1.4
Message-ID: <200611080548.kA85mGH1004460@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4440

Modified Files:
	.cvsignore gdesklets.spec sources 
Log Message:
updated tarball and spec files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2006 23:21:09 -0000	1.3
+++ .cvsignore	8 Nov 2006 05:47:46 -0000	1.4
@@ -1 +1 @@
-gDesklets-0.35.3.tar.bz2
+gDesklets-0.35.4.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gdesklets.spec	31 Aug 2006 21:59:38 -0000	1.20
+++ gdesklets.spec	8 Nov 2006 05:47:46 -0000	1.21
@@ -1,16 +1,15 @@
-Name:           gdesklets
-Version:        0.35.3
-Release:        14%{?dist}
-Summary:        Advanced architecture for desktop applets
-
-Group:          User Interface/Desktops
-License:        GPL
-
-URL:            http://www.gdesklets.org/
-Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		Pyorbit-1.0-fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		gdesklets
+Version:	0.35.4
+Release:	1%{?dist}
+Summary:	An interactive Imlib2 console for the X Window system
 
+Group:		User Interface/Desktops
+License:	GPL
+
+URL:		http://www.gdesklets.org/
+Source0:	http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
@@ -18,9 +17,7 @@
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -32,7 +29,6 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1
 
 %build
 
@@ -47,12 +43,12 @@
 %find_lang %{name}
 
 desktop-file-install --vendor=fedora  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-  --add-category X-Fedora \
-  --add-category Accessories \
-  --add-category Application \
-  --add-category Utility \
-        data/%{name}.desktop
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+	--add-category X-Fedora \
+	--add-category Accessories \
+	--add-category Application \
+	--add-category Utility \
+	data/%{name}.desktop
 
 mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
 ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
@@ -65,12 +61,9 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -90,43 +83,32 @@
 
 
 %changelog
-* Thu Aug 31 2006 Luya Tshimbalanga  - 0.35-3-14
+* Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-1
+- Removed patch no longer needed
+- Updated to 0.35.4
+
+* Thu Aug 31 2006 Luya Tshimbalanga  - 0.35.3-14
 - Add patch related to pyorbit due to upstream bug
 
-* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35-3-13.2
+* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35.3-13.2
 - pyorbit for FC-4 is 2.0.1 (-_-)
 
-* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35-3-13
+* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35.3-13
 - Fixed a silly typo
 - Added intltool for BuildRequires
 
-* Sun Aug 27 2006 Luya Tshimbalanga  - 0.35-3-10
+* Sun Aug 27 2006 Luya Tshimbalanga  - 0.35.3-10
 - Removed unecessary comment
 
-* Tue Aug 01 2006 Luya Tshimbalanga  - 0.35.3-9
-- Rebuilt
-
 * Wed Apr 19 2006 Luya Tshimbalanga  - 0.35.3-8
 - Remove conditional sign for pyorbit-devel
 
-* Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-7
-- Bump 
-
-* Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-6
-- Bump 
-
 * Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-5
 - Ajusted pyorbit requirement for ppc64
 
 * Thu Jan 19 2006 Luya Tshimbalanga  - 0.35.3-4
 - Rebuild for Fedora Extras 5
 
-* Thu Jan 19 2006 Luya Tshimbalanga  - 0.35.3-2
-- Rebuilt
-
-* Mon Jan 16 2006 Luya Tshimbalanga  - 0.35.3-1.1
-- Rebuilt
-
 * Mon Jan 16 2006 Luya Tshimbalanga  - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbmail
@@ -159,27 +141,14 @@
 - Fixed the right path for symbolic link
 
 * Sat Dec 3 2005 Luya Tshimbalanga  - 0.35.2-19
-- Added disable-schemas-install on %_configure
+- Added disable-schemas-install on configure
 - Trying to symlink using nrpms method based on FC3 version
 
 * Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-18
 - Added patch against NullObject.py (thanks jwb)
 
 * Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-17
-- Reorganized names and fixed %_install
-
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-16
-- Rebuild
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-15
-- Fixed %_install
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-14
-- Bump
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-13
-- Bump
+- Reorganized names and fixed install
 
 * Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-12
 - Removed pygtk2
@@ -197,12 +166,6 @@
 * Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-8
 - Fixed error on mime.cache
 
-* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-7
-- Rebuilt
-
-* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-6
-- Rebuilt
-
 * Wed Nov 16 2005 Luya Tshimbalanga  - 0.35.2-5
 - Added desktop-file-utils command for post and postun
 
@@ -212,8 +175,5 @@
 * Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-3
 - Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net))
 
-* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-2
-- bump
-
 * Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-1
 - Initial Fedora Extras package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2006 23:21:09 -0000	1.3
+++ sources	8 Nov 2006 05:47:46 -0000	1.4
@@ -1 +1 @@
-3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2
+2b4318ed80d451afd38a9f235dfb400a  gDesklets-0.35.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 05:49:51 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 7 Nov 2006 22:49:51 -0700
Subject: rpms/gdesklets/devel Pyorbit-1.0-fix.patch,1.1,NONE
Message-ID: <200611080549.kA85npLm004481@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4476

Removed Files:
	Pyorbit-1.0-fix.patch 
Log Message:
removed patch. No longer needed


--- Pyorbit-1.0-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 05:52:47 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 7 Nov 2006 22:52:47 -0700
Subject: rpms/gdesklets/FC-6 .cvsignore, 1.3, 1.4 gdesklets.spec, 1.20,
	1.21 sources, 1.3, 1.4 Pyorbit-1.0-fix.patch, 1.1, NONE
Message-ID: <200611080552.kA85ql4x004572@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4552

Modified Files:
	.cvsignore gdesklets.spec sources 
Removed Files:
	Pyorbit-1.0-fix.patch 
Log Message:
source updated to 0.35.4. spec updated. Remove pathc, no longer needed


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2006 23:21:09 -0000	1.3
+++ .cvsignore	8 Nov 2006 05:52:17 -0000	1.4
@@ -1 +1 @@
-gDesklets-0.35.3.tar.bz2
+gDesklets-0.35.4.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-6/gdesklets.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gdesklets.spec	31 Aug 2006 21:59:38 -0000	1.20
+++ gdesklets.spec	8 Nov 2006 05:52:17 -0000	1.21
@@ -1,16 +1,15 @@
-Name:           gdesklets
-Version:        0.35.3
-Release:        14%{?dist}
-Summary:        Advanced architecture for desktop applets
-
-Group:          User Interface/Desktops
-License:        GPL
-
-URL:            http://www.gdesklets.org/
-Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		Pyorbit-1.0-fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		gdesklets
+Version:	0.35.4
+Release:	1%{?dist}
+Summary:	An interactive Imlib2 console for the X Window system
 
+Group:		User Interface/Desktops
+License:	GPL
+
+URL:		http://www.gdesklets.org/
+Source0:	http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
@@ -18,9 +17,7 @@
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -32,7 +29,6 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1
 
 %build
 
@@ -47,12 +43,12 @@
 %find_lang %{name}
 
 desktop-file-install --vendor=fedora  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-  --add-category X-Fedora \
-  --add-category Accessories \
-  --add-category Application \
-  --add-category Utility \
-        data/%{name}.desktop
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+	--add-category X-Fedora \
+	--add-category Accessories \
+	--add-category Application \
+	--add-category Utility \
+	data/%{name}.desktop
 
 mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
 ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
@@ -65,12 +61,9 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -90,43 +83,32 @@
 
 
 %changelog
-* Thu Aug 31 2006 Luya Tshimbalanga  - 0.35-3-14
+* Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-1
+- Removed patch no longer needed
+- Updated to 0.35.4
+
+* Thu Aug 31 2006 Luya Tshimbalanga  - 0.35.3-14
 - Add patch related to pyorbit due to upstream bug
 
-* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35-3-13.2
+* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35.3-13.2
 - pyorbit for FC-4 is 2.0.1 (-_-)
 
-* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35-3-13
+* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35.3-13
 - Fixed a silly typo
 - Added intltool for BuildRequires
 
-* Sun Aug 27 2006 Luya Tshimbalanga  - 0.35-3-10
+* Sun Aug 27 2006 Luya Tshimbalanga  - 0.35.3-10
 - Removed unecessary comment
 
-* Tue Aug 01 2006 Luya Tshimbalanga  - 0.35.3-9
-- Rebuilt
-
 * Wed Apr 19 2006 Luya Tshimbalanga  - 0.35.3-8
 - Remove conditional sign for pyorbit-devel
 
-* Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-7
-- Bump 
-
-* Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-6
-- Bump 
-
 * Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-5
 - Ajusted pyorbit requirement for ppc64
 
 * Thu Jan 19 2006 Luya Tshimbalanga  - 0.35.3-4
 - Rebuild for Fedora Extras 5
 
-* Thu Jan 19 2006 Luya Tshimbalanga  - 0.35.3-2
-- Rebuilt
-
-* Mon Jan 16 2006 Luya Tshimbalanga  - 0.35.3-1.1
-- Rebuilt
-
 * Mon Jan 16 2006 Luya Tshimbalanga  - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbmail
@@ -159,27 +141,14 @@
 - Fixed the right path for symbolic link
 
 * Sat Dec 3 2005 Luya Tshimbalanga  - 0.35.2-19
-- Added disable-schemas-install on %_configure
+- Added disable-schemas-install on configure
 - Trying to symlink using nrpms method based on FC3 version
 
 * Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-18
 - Added patch against NullObject.py (thanks jwb)
 
 * Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-17
-- Reorganized names and fixed %_install
-
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-16
-- Rebuild
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-15
-- Fixed %_install
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-14
-- Bump
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-13
-- Bump
+- Reorganized names and fixed install
 
 * Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-12
 - Removed pygtk2
@@ -197,12 +166,6 @@
 * Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-8
 - Fixed error on mime.cache
 
-* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-7
-- Rebuilt
-
-* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-6
-- Rebuilt
-
 * Wed Nov 16 2005 Luya Tshimbalanga  - 0.35.2-5
 - Added desktop-file-utils command for post and postun
 
@@ -212,8 +175,5 @@
 * Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-3
 - Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net))
 
-* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-2
-- bump
-
 * Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-1
 - Initial Fedora Extras package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2006 23:21:09 -0000	1.3
+++ sources	8 Nov 2006 05:52:17 -0000	1.4
@@ -1 +1 @@
-3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2
+2b4318ed80d451afd38a9f235dfb400a  gDesklets-0.35.4.tar.bz2


--- Pyorbit-1.0-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 05:56:00 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 7 Nov 2006 22:56:00 -0700
Subject: rpms/gdesklets/FC-5 .cvsignore, 1.3, 1.4 gdesklets.spec, 1.23,
	1.24 sources, 1.3, 1.4
Message-ID: <200611080556.kA85u0Uw004662@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4639

Modified Files:
	.cvsignore gdesklets.spec sources 
Log Message:
source updated to 0.35.4. spec updated. Remove patch, no longer needed


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2006 23:21:09 -0000	1.3
+++ .cvsignore	8 Nov 2006 05:55:30 -0000	1.4
@@ -1 +1 @@
-gDesklets-0.35.3.tar.bz2
+gDesklets-0.35.4.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gdesklets.spec	31 Aug 2006 21:59:37 -0000	1.23
+++ gdesklets.spec	8 Nov 2006 05:55:30 -0000	1.24
@@ -1,16 +1,15 @@
-Name:           gdesklets
-Version:        0.35.3
-Release:        14%{?dist}
-Summary:        Advanced architecture for desktop applets
-
-Group:          User Interface/Desktops
-License:        GPL
-
-URL:            http://www.gdesklets.org/
-Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		Pyorbit-1.0-fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		gdesklets
+Version:	0.35.4
+Release:	1%{?dist}
+Summary:	An interactive Imlib2 console for the X Window system
 
+Group:		User Interface/Desktops
+License:	GPL
+
+URL:		http://www.gdesklets.org/
+Source0:	http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
@@ -18,9 +17,7 @@
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -32,7 +29,6 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1
 
 %build
 
@@ -47,12 +43,12 @@
 %find_lang %{name}
 
 desktop-file-install --vendor=fedora  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-  --add-category X-Fedora \
-  --add-category Accessories \
-  --add-category Application \
-  --add-category Utility \
-        data/%{name}.desktop
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+	--add-category X-Fedora \
+	--add-category Accessories \
+	--add-category Application \
+	--add-category Utility \
+	data/%{name}.desktop
 
 mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
 ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
@@ -65,12 +61,9 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -90,43 +83,32 @@
 
 
 %changelog
-* Thu Aug 31 2006 Luya Tshimbalanga  - 0.35-3-14
+* Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-1
+- Removed patch no longer needed
+- Updated to 0.35.4
+
+* Thu Aug 31 2006 Luya Tshimbalanga  - 0.35.3-14
 - Add patch related to pyorbit due to upstream bug
 
-* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35-3-13.2
+* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35.3-13.2
 - pyorbit for FC-4 is 2.0.1 (-_-)
 
-* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35-3-13
+* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35.3-13
 - Fixed a silly typo
 - Added intltool for BuildRequires
 
-* Sun Aug 27 2006 Luya Tshimbalanga  - 0.35-3-10
+* Sun Aug 27 2006 Luya Tshimbalanga  - 0.35.3-10
 - Removed unecessary comment
 
-* Tue Aug 01 2006 Luya Tshimbalanga  - 0.35.3-9
-- Rebuilt
-
 * Wed Apr 19 2006 Luya Tshimbalanga  - 0.35.3-8
 - Remove conditional sign for pyorbit-devel
 
-* Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-7
-- Bump 
-
-* Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-6
-- Bump 
-
 * Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-5
 - Ajusted pyorbit requirement for ppc64
 
 * Thu Jan 19 2006 Luya Tshimbalanga  - 0.35.3-4
 - Rebuild for Fedora Extras 5
 
-* Thu Jan 19 2006 Luya Tshimbalanga  - 0.35.3-2
-- Rebuilt
-
-* Mon Jan 16 2006 Luya Tshimbalanga  - 0.35.3-1.1
-- Rebuilt
-
 * Mon Jan 16 2006 Luya Tshimbalanga  - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbmail
@@ -159,27 +141,14 @@
 - Fixed the right path for symbolic link
 
 * Sat Dec 3 2005 Luya Tshimbalanga  - 0.35.2-19
-- Added disable-schemas-install on %_configure
+- Added disable-schemas-install on configure
 - Trying to symlink using nrpms method based on FC3 version
 
 * Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-18
 - Added patch against NullObject.py (thanks jwb)
 
 * Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-17
-- Reorganized names and fixed %_install
-
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-16
-- Rebuild
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-15
-- Fixed %_install
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-14
-- Bump
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-13
-- Bump
+- Reorganized names and fixed install
 
 * Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-12
 - Removed pygtk2
@@ -197,12 +166,6 @@
 * Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-8
 - Fixed error on mime.cache
 
-* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-7
-- Rebuilt
-
-* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-6
-- Rebuilt
-
 * Wed Nov 16 2005 Luya Tshimbalanga  - 0.35.2-5
 - Added desktop-file-utils command for post and postun
 
@@ -212,8 +175,5 @@
 * Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-3
 - Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net))
 
-* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-2
-- bump
-
 * Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-1
 - Initial Fedora Extras package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2006 23:21:09 -0000	1.3
+++ sources	8 Nov 2006 05:55:30 -0000	1.4
@@ -1 +1 @@
-3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2
+2b4318ed80d451afd38a9f235dfb400a  gDesklets-0.35.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 05:59:10 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 7 Nov 2006 22:59:10 -0700
Subject: rpms/gdesklets/FC-4 .cvsignore, 1.3, 1.4 gdesklets.spec, 1.18,
	1.19 sources, 1.3, 1.4 Pyorbit-1.0-fix.patch, 1.1, NONE
Message-ID: <200611080559.kA85xAMb004752@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4729

Modified Files:
	.cvsignore gdesklets.spec sources 
Removed Files:
	Pyorbit-1.0-fix.patch 
Log Message:
source updated to 0.35.4. spec updated. Remove patch, no longer needed


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2006 23:24:40 -0000	1.3
+++ .cvsignore	8 Nov 2006 05:58:40 -0000	1.4
@@ -1 +1 @@
-gDesklets-0.35.3.tar.bz2
+gDesklets-0.35.4.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gdesklets.spec	31 Aug 2006 21:59:36 -0000	1.18
+++ gdesklets.spec	8 Nov 2006 05:58:40 -0000	1.19
@@ -1,23 +1,23 @@
-Name:           gdesklets
-Version:        0.35.3
-Release:        14%{?dist}
-Summary:        Advanced architecture for desktop applets
-
-Group:          User Interface/Desktops
-License:        GPL
-URL:            http://www.gdesklets.org/
-Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		Pyorbit-1.0-fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		gdesklets
+Version:	0.35.4
+Release:	1%{?dist}
+Summary:	An interactive Imlib2 console for the X Window system
+
+Group:		User Interface/Desktops
+License:	GPL
+
+URL:		http://www.gdesklets.org/
+Source0:	http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
-BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, intltool
+BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
+BuildRequires:  intltool
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
-#Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-#Requires(post): desktop-file-utils
+Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires(post): shared-mime-info
-#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -29,7 +29,6 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1
 
 %build
 
@@ -44,12 +43,12 @@
 %find_lang %{name}
 
 desktop-file-install --vendor=fedora  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-  --add-category X-Fedora \
-  --add-category Accessories \
-  --add-category Application \
-  --add-category Utility \
-        data/%{name}.desktop
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+	--add-category X-Fedora \
+	--add-category Accessories \
+	--add-category Application \
+	--add-category Utility \
+	data/%{name}.desktop
 
 mkdir -p  ${RPM_BUILD_ROOT}{%{_bindir},%{_datadir}/%{name}/data/}
 ln -sf ../../../../%{_datadir}/pixmaps/%{name}.png ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/data/%{name}.png
@@ -62,12 +61,9 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -87,46 +83,32 @@
 
 
 %changelog
-* Thu Aug 31 2006 Luya Tshimbalanga  - 0.35-3-14
+* Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-1
+- Removed patch no longer needed
+- Updated to 0.35.4
+
+* Thu Aug 31 2006 Luya Tshimbalanga  - 0.35.3-14
 - Add patch related to pyorbit due to upstream bug
 
-* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35-3-13.2
+* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35.3-13.2
 - pyorbit for FC-4 is 2.0.1 (-_-)
 
-* Wed Aug 30 2006 Luya Tshimbalang  - 0.35.3-13
+* Wed Aug 30 2006 Luya Tshimbalanga  - 0.35.3-13
 - Fixed a silly typo
 - Added intltool for BuildRequires
 
 * Sun Aug 27 2006 Luya Tshimbalanga  - 0.35.3-10
-- Removed unecessary comment about GConf.
-
-* Wed Aug 02 2006 Luya Tshimbalanga  - 0.35.3-9
-- Minor update to match Extras name guideline
-
-* Wed Apr 19 2006 Luya Tshimbalanga  - 0.35.3-8.1
-- Removed libXau-devel and libXdmcp-devel as they don't belong to FC-4
+- Removed unecessary comment
 
 * Wed Apr 19 2006 Luya Tshimbalanga  - 0.35.3-8
 - Remove conditional sign for pyorbit-devel
 
-* Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-7
-- Bump 
-
-* Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-6
-- Bump 
-
 * Mon Apr 03 2006 Luya Tshimbalanga  - 0.35.3-5
 - Ajusted pyorbit requirement for ppc64
 
 * Thu Jan 19 2006 Luya Tshimbalanga  - 0.35.3-4
 - Rebuild for Fedora Extras 5
 
-* Thu Jan 19 2006 Luya Tshimbalanga  - 0.35.3-2
-- Rebuilt
-
-* Mon Jan 16 2006 Luya Tshimbalanga  - 0.35.3-1.1
-- Rebuilt
-
 * Mon Jan 16 2006 Luya Tshimbalanga  - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbmail
@@ -159,27 +141,14 @@
 - Fixed the right path for symbolic link
 
 * Sat Dec 3 2005 Luya Tshimbalanga  - 0.35.2-19
-- Added disable-schemas-install on %_configure
+- Added disable-schemas-install on configure
 - Trying to symlink using nrpms method based on FC3 version
 
 * Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-18
 - Added patch against NullObject.py (thanks jwb)
 
 * Tue Nov 29 2005 Luya Tshimbalanga  - 0.35.2-17
-- Reorganized names and fixed %_install
-
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-16
-- Rebuild
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-15
-- Fixed %_install
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-14
-- Bump
-
-* Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-13
-- Bump
+- Reorganized names and fixed install
 
 * Mon Nov 21 2005 Luya Tshimbalanga  - 0.35.2-12
 - Removed pygtk2
@@ -197,12 +166,6 @@
 * Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-8
 - Fixed error on mime.cache
 
-* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-7
-- Rebuilt
-
-* Fri Nov 18 2005 Luya Tshimbalanga  - 0.35.2-6
-- Rebuilt
-
 * Wed Nov 16 2005 Luya Tshimbalanga  - 0.35.2-5
 - Added desktop-file-utils command for post and postun
 
@@ -212,8 +175,5 @@
 * Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-3
 - Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net))
 
-* Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-2
-- bump
-
 * Sat Nov 12 2005 Luya Tshimbalanga  - 0.35.2-1
 - Initial Fedora Extras package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2006 23:24:40 -0000	1.3
+++ sources	8 Nov 2006 05:58:40 -0000	1.4
@@ -1 +1 @@
-3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2
+2b4318ed80d451afd38a9f235dfb400a  gDesklets-0.35.4.tar.bz2


--- Pyorbit-1.0-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 06:09:37 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 7 Nov 2006 23:09:37 -0700
Subject: rpms/gdesklets/devel gdesklets.spec,1.21,1.22
Message-ID: <200611080609.kA869bOT007822@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7806

Modified Files:
	gdesklets.spec 
Log Message:
spec updated. Removed gnome-python which is no longer on rawhide


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gdesklets.spec	8 Nov 2006 05:47:46 -0000	1.21
+++ gdesklets.spec	8 Nov 2006 06:09:07 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		gdesklets
 Version:	0.35.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An interactive Imlib2 console for the X Window system
 
 Group:		User Interface/Desktops
@@ -14,7 +14,7 @@
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  libXau-devel, libXdmcp-devel, intltool
-BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
+BuildRequires:  libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires(post): shared-mime-info
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-2
+- Removed gnome-python for buildrequires
+
 * Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-1
 - Removed patch no longer needed
 - Updated to 0.35.4



From fedora-extras-commits at redhat.com  Wed Nov  8 09:24:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 02:24:29 -0700
Subject: rpms/scummvm - New directory
Message-ID: <200611080924.kA89OTxJ017598@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17594/scummvm

Log Message:
Directory /cvs/extras/rpms/scummvm added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  8 09:24:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 02:24:34 -0700
Subject: rpms/scummvm/devel - New directory
Message-ID: <200611080924.kA89OYvS017612@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17594/scummvm/devel

Log Message:
Directory /cvs/extras/rpms/scummvm/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov  8 09:24:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 02:24:51 -0700
Subject: rpms/scummvm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611080924.kA89OpkX017643@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17637

Added Files:
	Makefile import.log 
Log Message:
Setup of module scummvm


--- NEW FILE Makefile ---
# Top level Makefile for module scummvm
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  Wed Nov  8 09:24:57 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 02:24:57 -0700
Subject: rpms/scummvm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611080924.kA89Ovpr017661@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17637/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module scummvm


--- 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 Nov  8 09:26:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 02:26:26 -0700
Subject: rpms/scummvm import.log,1.1,1.2
Message-ID: <200611080926.kA89QQrv017755@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17717

Modified Files:
	import.log 
Log Message:
auto-import scummvm-0.9.1-1 on branch devel from scummvm-0.9.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/scummvm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Nov 2006 09:24:51 -0000	1.1
+++ import.log	8 Nov 2006 09:25:56 -0000	1.2
@@ -0,0 +1 @@
+scummvm-0_9_1-1:HEAD:scummvm-0.9.1-1.src.rpm:1162978017



From fedora-extras-commits at redhat.com  Wed Nov  8 09:26:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 02:26:27 -0700
Subject: rpms/scummvm/devel scummvm-0.9.0-gcc41.patch, NONE,
	1.1 scummvm-0.9.0-nostrip.patch, NONE, 1.1 scummvm.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611080926.kA89QRYk017759@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17717/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scummvm-0.9.0-gcc41.patch scummvm-0.9.0-nostrip.patch 
	scummvm.spec 
Log Message:
auto-import scummvm-0.9.1-1 on branch devel from scummvm-0.9.1-1.src.rpm

scummvm-0.9.0-gcc41.patch:

--- NEW FILE scummvm-0.9.0-gcc41.patch ---
diff -Naupr scummvm-0.9.0.orig/common/array.h scummvm-0.9.0/common/array.h
--- scummvm-0.9.0.orig/common/array.h	2006-06-21 23:16:01.000000000 +0200
+++ scummvm-0.9.0/common/array.h	2006-10-29 18:26:41.000000000 +0100
@@ -48,11 +48,7 @@ public:
 			_data[i] = array._data[i];
 	}
 
-#ifdef __SYMBIAN32__
 	~Array()
-#else
-	~Array()
-#endif
 	{
 		if (_data)
 			delete [] _data;
diff -Naupr scummvm-0.9.0.orig/common/list.h scummvm-0.9.0/common/list.h
--- scummvm-0.9.0.orig/common/list.h	2006-06-21 23:16:01.000000000 +0200
+++ scummvm-0.9.0/common/list.h	2006-10-29 18:28:48.000000000 +0100
@@ -129,11 +129,7 @@ public:
 		insert(begin(), list.begin(), list.end());
 	}
 
-#ifndef __SYMBIAN32__
-	~List()
-#else
 	~List()
-#endif
 	{
 		clear();
 		delete _anchor;

scummvm-0.9.0-nostrip.patch:

--- NEW FILE scummvm-0.9.0-nostrip.patch ---
diff -Naupr scummvm-0.9.0.orig/Makefile scummvm-0.9.0/Makefile
--- scummvm-0.9.0.orig/Makefile	2006-06-21 23:19:07.000000000 +0200
+++ scummvm-0.9.0/Makefile	2006-10-29 18:56:40.000000000 +0100
@@ -45,7 +45,7 @@ config.mak: $(srcdir)/configure
 
 install: all
 	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
-	$(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+	$(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
 	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
 	$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"


--- NEW FILE scummvm.spec ---
Name:           scummvm
Version:        0.9.1
Release:        1%{?dist}
Summary:        Interpreter for several adventure games
Group:          Applications/Emulators
License:        GPL
URL:            http://scummvm.sourceforge.net/
Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
#######         Icons extracted from icons/scummvm.ico with the gimp
Source1:        scummvm-icons.tar.gz
Patch0:         scummvm-0.9.0-gcc41.patch
Patch1:         scummvm-0.9.0-nostrip.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel libvorbis-devel flac-devel zlib-devel nasm
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme

%description
ScummVM is an implementation of the SCUMM (Script Creation Utility for
Maniac Mansion) engine used in various Lucas Arts games such as Monkey
Island and Day of the Tentacle. At this time ScummVM should be considered
ALPHA software, as it's still under heavy development. Be aware that while
many games will work with few major bugs, crashes can happen. Also note
that saved games can, and probably will, be incompatible between releases.

Also ScummVM is capable of playing several non-SCUMM games.


%prep
%setup -q -a 1
%patch0 -p1 -b .gcc41
%patch1 -p1 -b .nostrip
sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \
  dists/%{name}.desktop


%build
# No rpm configure because scummvm's configure isn't a real configure and thus
# doesn't understand some of the options %configure passes. This includes
# -libdir, so rpmlint's complaints should be ignored.
# The disables are so that these don't accidently get build in when rebuilding
# on a system with the necesarry deps installed
./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \
  --datadir=%{_datadir} --disable-mpeg2 --disable-mad --disable-fluidsynth
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
install -D -p -m 0644 gui/themes/modern.ini \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/modern.ini
install -D -p -m 0644 gui/themes/modern.zip \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/modern.zip
# Remove doc files we want to include with %doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{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 \
  --add-category X-Fedora                       \
  dists/%{name}.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
install -m 644 %{name}-16x16.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -m 644 %{name}-32x32.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -m 644 %{name}-48x48.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
install -m 644 %{name}-128x128.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm


%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 NEWS README TODO
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png


%changelog
* Sat Nov  4 2006 Hans de Goede  0.9.1-1
- New upstream release 0.9.1
- Prepare for inclusion into FE
- Remove mp3 support (the same files are also available in ogg format)
- Remove mpeg2 video support (problem, but only for one game I will
  request upstream to add theora support)

* Sun Oct 29 2006 Matthias Saou  0.9.0-1
- Update to 0.9.0.
- Spec file cleanup.
- Add datadir patch from upstream in order to include themes.

* Thu Mar 09 2006 Andreas Bierfert 
- switch to new release field
- drop Epoch

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Mon Feb 06 2006 Andreas Bierfert 
0:0.8.2-0.lvn.1
- version upgrade

* Mon Jan 30 2006 Andreas Bierfert 
0:0.8.1-0.lvn.1
- version upgrade

* Thu Dec 08 2005 Andreas Bierfert 
0:0.8.0-0.lvn.2
- fix #693 (desktop entry)
- beautify desktop-file-install

* Sat Oct 29 2005 Andreas Bierfert 
0:0.8.0-0.lvn.1
- version upgrade

* Mon Jun 20 2005 Andreas Bierfert 
0:0.7.1-0.lvn.3
- add --disable--mt32emu switch to fix build with gcc4

* Mon May 30 2005 Andreas Bierfert 
0:0.7.1-0.lvn.2
- fix x86_64 build

* Thu Mar 31 2005 Andreas Bierfert 
0:0.7.1-0.lvn.1
- Version Upgrade

* Tue Feb 22 2005 Andreas Bierfert 
0:0.7.0-0.lvn.3
- add nasm <-> x86_64

* Tue Feb 22 2005 Andreas Bierfert 
0:0.7.0-0.lvn.2
- fixed #371 (bild on non ix86 - David Woodhouse)

* Fri Dec 24 2004 Andreas Bierfert 
0:0.7.0-0.lvn.1
- added AUTHORS and TODO

* Thu Dec 23 2004 Andreas Bierfert 
- added off. 0.7.0 sources

* Sun Dec 19 2004 Andreas Bierfert 
- upgrade to 0.7.0 cvs (20041219), prep. for 0.7.0
- added more BuildRequires
- if without-alsa is defined actually disable alsa via configure

* Thu Nov 25 2004 Andreas Bierfert 
0:0.6.1b-0.lvn.1
-upgrade to 0.6.1b

* Thu May 27 2004 Andreas Bierfert 
0:0.6.0-0.lvn.1
- upgrade to 0.6.0

* Thu Oct 02 2003 Andreas Bierfert 
0:0.5.1-0.fdr.6
- removed #--- lines

* Tue Sep 16 2003 Andreas Bierfert 
0:0.5.1-0.fdr.5
- added ${RPM_OPT_FLAGS}

* Mon Sep 08 2003 Andreas Bierfert 
0:0.5.1-0.fdr.4
- added libvorbis-devel

* Tue Sep 02 2003 Andreas Bierfert 
0:0.5.1-0.fdr.3
- upgrade to new minor version

* Wed Aug 06 2003 Andreas Bierfert 
0:0.5.0-0.fdr.2
- upgrade to new major version

* Fri Aug 01 2003 Andreas Bierfert 
0:0.4.1-0.fdr.1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Nov 2006 09:24:57 -0000	1.1
+++ .cvsignore	8 Nov 2006 09:25:57 -0000	1.2
@@ -0,0 +1,2 @@
+scummvm-0.9.1.tar.bz2
+scummvm-icons.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Nov 2006 09:24:57 -0000	1.1
+++ sources	8 Nov 2006 09:25:57 -0000	1.2
@@ -0,0 +1,2 @@
+30a82ad466bae223875e66ee14b94904  scummvm-0.9.1.tar.bz2
+b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 09:53:15 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 02:53:15 -0700
Subject: owners owners.list,1.1903,1.1904
Message-ID: <200611080953.kA89rFAq017948@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17932

Modified Files:
	owners.list 
Log Message:
Add scummvm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1903
retrieving revision 1.1904
diff -u -r1.1903 -r1.1904
--- owners.list	8 Nov 2006 01:29:01 -0000	1.1903
+++ owners.list	8 Nov 2006 09:52:45 -0000	1.1904
@@ -1171,8 +1171,8 @@
 Fedora Extras|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|numpy|A fast multidimensional array facility for Python|jwilson at redhat.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|nuttcp|A network performance measurement tool intended for use by network and system managers|rvokal at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|nyquist|Sound synthesis and composition language with a Lisp syntax|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|nyquist|Sound synthesis and composition language with a Lisp syntax|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|obby|A library which provides synced document buffers|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|obconf|A graphical configuration editor for the Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|obmenu|A graphical menu editor for the Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|
@@ -2081,6 +2081,7 @@
 Fedora Extras|scrip|Spherical Coordinate Remapping and Interpolation Package|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|scrot|Screen-shot capture using Imlib2|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scummvm|Interpreter for several adventure games|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|matthias at rpmforge.net
 Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  8 09:58:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 02:58:26 -0700
Subject: comps comps-fe5.xml.in, 1.191, 1.192 comps-fe6.xml.in, 1.215,
	1.216 comps-fe7.xml.in, 1.13, 1.14
Message-ID: <200611080958.kA89wQak018061@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18041

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Add alex4


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- comps-fe5.xml.in	5 Nov 2006 21:28:01 -0000	1.191
+++ comps-fe5.xml.in	8 Nov 2006 09:57:56 -0000	1.192
@@ -302,6 +302,7 @@
     
       abe
       abuse
+      alex4
       atomix
       auriferous
       ballbuster


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- comps-fe6.xml.in	5 Nov 2006 21:28:01 -0000	1.215
+++ comps-fe6.xml.in	8 Nov 2006 09:57:56 -0000	1.216
@@ -352,6 +352,7 @@
     
       abe
       abuse
+      alex4
       atomix
       auriferous
       ballbuster


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- comps-fe7.xml.in	5 Nov 2006 21:28:01 -0000	1.13
+++ comps-fe7.xml.in	8 Nov 2006 09:57:56 -0000	1.14
@@ -352,6 +352,7 @@
     
       abe
       abuse
+      alex4
       atomix
       auriferous
       ballbuster



From fedora-extras-commits at redhat.com  Wed Nov  8 10:01:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 03:01:43 -0700
Subject: rpms/scummvm/devel scummvm.spec,1.1,1.2
Message-ID: <200611081001.kA8A1hsW021024@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20996

Modified Files:
	scummvm.spec 
Log Message:
don't use single % in comments


Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scummvm.spec	8 Nov 2006 09:25:57 -0000	1.1
+++ scummvm.spec	8 Nov 2006 10:01:13 -0000	1.2
@@ -37,7 +37,7 @@
 
 %build
 # No rpm configure because scummvm's configure isn't a real configure and thus
-# doesn't understand some of the options %configure passes. This includes
+# doesn't understand some of the options %%configure passes. This includes
 # -libdir, so rpmlint's complaints should be ignored.
 # The disables are so that these don't accidently get build in when rebuilding
 # on a system with the necesarry deps installed



From fedora-extras-commits at redhat.com  Wed Nov  8 11:36:01 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 8 Nov 2006 04:36:01 -0700
Subject: comps comps-fe5.xml,1.14,NONE comps-fe6.xml,1.18,NONE
Message-ID: <200611081136.kA8Ba1A2026617@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26609

Removed Files:
	comps-fe5.xml comps-fe6.xml 
Log Message:
misleading and not used as long as they are generated on-the-fly


--- comps-fe5.xml DELETED ---


--- comps-fe6.xml DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 11:37:27 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 8 Nov 2006 04:37:27 -0700
Subject: rpms/eclipse-subclipse/devel
	eclipse-subclipse-1.1.8-plugin-classpath.patch, NONE,
	1.1 subclipse-fetch-1.1.8.sh, NONE, 1.1 .cvsignore, 1.2,
	1.3 eclipse-subclipse.spec, 1.2, 1.3 sources, 1.2,
	1.3 eclipse-subclipse-1.1.5-plugin-classpath.patch, 1.1,
	NONE subclipse-fetch-1.1.5.sh, 1.1, NONE
Message-ID: <200611081137.kA8BbRP1026782@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26698

Modified Files:
	.cvsignore eclipse-subclipse.spec sources 
Added Files:
	eclipse-subclipse-1.1.8-plugin-classpath.patch 
	subclipse-fetch-1.1.8.sh 
Removed Files:
	eclipse-subclipse-1.1.5-plugin-classpath.patch 
	subclipse-fetch-1.1.5.sh 
Log Message:
Update to upstream 1.1.8


eclipse-subclipse-1.1.8-plugin-classpath.patch:

--- NEW FILE eclipse-subclipse-1.1.8-plugin-classpath.patch ---
diff -Naur subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF
--- subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
+++ subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
@@ -2,7 +2,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
 Bundle-Version: 1.1.8
-Bundle-ClassPath: .,
+Bundle-ClassPath: lib/subclipse-core.jar,
  lib/svnClientAdapter.jar,
  lib/svnjavahl.jar,
  lib/javasvn.jar,


--- NEW FILE subclipse-fetch-1.1.8.sh ---
#!/bin/sh
VERSION=1.1.8
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Aug 2006 00:56:47 -0000	1.2
+++ .cvsignore	8 Nov 2006 11:36:57 -0000	1.3
@@ -1 +1 @@
-subclipse-1.1.5.tgz
+subclipse-1.1.8.tgz


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-subclipse.spec	28 Aug 2006 03:45:28 -0000	1.2
+++ eclipse-subclipse.spec	8 Nov 2006 11:36:57 -0000	1.3
@@ -7,7 +7,7 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.1.5
+Version:        1.1.8
 Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
@@ -18,7 +18,7 @@
 # Script to fetch the source code
 # the new source tarball does not includes the book feature and the layout is
 # different than the source repository
-Source10:       subclipse-fetch-1.1.5.sh
+Source10:       subclipse-fetch-1.1.8.sh
 # Disable javahl support temporaly until apparent classloader problem is fixed
 Patch0:         eclipse-subclipse-1.0.1-default-javasvn.patch
 Patch1:         svnClientAdapter-1.1.4-javac-target.patch
@@ -26,7 +26,7 @@
 # This patch is applied after the build has finished when unpacking the plugin
 # jar and replacing internal jars with links to its dependencies. It can not be
 # applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.1.5-plugin-classpath.patch
+Source50:       eclipse-subclipse-1.1.8-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -211,6 +211,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Nov 08 2006 Robert Marcano  1.1.8-2
+- Update to upstream 1.1.8
+
 * Mon Aug 28 2006 Robert Marcano  1.1.5-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Aug 2006 00:56:47 -0000	1.2
+++ sources	8 Nov 2006 11:36:57 -0000	1.3
@@ -1 +1 @@
-7c317c03fc7dc8fae0612c75e46564ae  subclipse-1.1.5.tgz
+bbc6dd6c7cb8107fe3906460b2f556e4  subclipse-1.1.8.tgz


--- eclipse-subclipse-1.1.5-plugin-classpath.patch DELETED ---


--- subclipse-fetch-1.1.5.sh DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 12:11:25 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 8 Nov 2006 05:11:25 -0700
Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.23,1.24
Message-ID: <200611081211.kA8CBPJF030233@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30209

Modified Files:
	php-eaccelerator.spec 
Log Message:
Change to require php-common instead of php, for fastcgi without apache.



Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- php-eaccelerator.spec	16 Oct 2006 16:44:20 -0000	1.23
+++ php-eaccelerator.spec	8 Nov 2006 12:10:55 -0000	1.24
@@ -16,15 +16,15 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Languages
-URL: http://eaccelerator.sourceforge.net/
+URL: http://eaccelerator.net/
 Source: http://bart.eaccelerator.net/source/%{module_version}/eaccelerator-%{module_version}.tar.bz2
 Patch0: eaccelerator-0.9.5-rc1-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: php-api = %{php_apiver}
-Requires: php = %{php_version}
+Requires: php-common = %{php_version}
 Provides: php-zend_extension
 Conflicts: php-mmcache
 BuildRequires: php, php-devel
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Matthias Saou  5.1.6_0.9.5-2
+- Change to require php-common instead of php, for fastcgi without apache.
+
 * Mon Oct 16 2006 Matthias Saou  5.1.6_0.9.5-1
 - Update to 0.9.5 final.
 - Add cleanup of the cache directory upon package removal.



From fedora-extras-commits at redhat.com  Wed Nov  8 13:28:29 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed,  8 Nov 2006 06:28:29 -0700
Subject: fedora-security/audit fc5,1.384,1.385 fc6,1.136,1.137
Message-ID: <200611081328.kA8DSTco000986@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv966

Modified Files:
	fc5 fc6 
Log Message:
Updates from yesterday and today, still to do kde and python



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- fc5	7 Nov 2006 10:17:32 -0000	1.384
+++ fc5	8 Nov 2006 13:28:25 -0000	1.385
@@ -1,9 +1,12 @@
-Up to date CVE as of CVE email 20061106
-Up to date FC5 as of 20061106
+Up to date CVE as of CVE email 20061107
+Up to date FC5 as of 20061107
 
 ** are items that need attention
 
+CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
+CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5706 ** php, fixed 5.2.0
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
@@ -16,6 +19,8 @@
 CVE-2006-5469 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
+CVE-2006-5464 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5463 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- fc6	7 Nov 2006 10:12:54 -0000	1.136
+++ fc6	8 Nov 2006 13:28:25 -0000	1.137
@@ -1,9 +1,14 @@
-Up to date CVE as of CVE email 20061106
-Up to date FC6 as of 20061106
+Up to date CVE as of CVE email 20061107
+Up to date FC6 as of 20061107
 
 ** are items that need attention
 
+CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
+CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
+CVE-2006-5748 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
+CVE-2006-5747 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
+CVE-2006-5747 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5706 ** php, fixed 5.2.0
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
@@ -18,6 +23,10 @@
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1109]
 CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDOA-2006-1169]
+CVE-2006-5464 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
+CVE-2006-5464 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
+CVE-2006-5463 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
+CVE-2006-5463 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
 CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)



From fedora-extras-commits at redhat.com  Wed Nov  8 13:56:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 06:56:22 -0700
Subject: rpms/PyQt-qscintilla/devel .cvsignore, 1.2, 1.3 PyQt-qscintilla.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200611081356.kA8DuM7L001129@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1109

Modified Files:
	.cvsignore PyQt-qscintilla.spec sources 
Log Message:
* Mon Nov 06 2006 Rex Dieter  3.17-1
- PyQt-3.17



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jun 2006 20:29:53 -0000	1.2
+++ .cvsignore	8 Nov 2006 13:55:52 -0000	1.3
@@ -1 +1,2 @@
 PyQt-x11-gpl-3.16.tar.gz
+PyQt-x11-gpl-3.17.tar.gz


Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/PyQt-qscintilla.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PyQt-qscintilla.spec	6 Nov 2006 15:19:33 -0000	1.6
+++ PyQt-qscintilla.spec	8 Nov 2006 13:55:52 -0000	1.7
@@ -1,8 +1,8 @@
 
 Summary: PyQt qscintilla extentions 
 Name: 	 PyQt-qscintilla
-Version: 3.16
-Release: 7%{?dist}
+Version: 3.17
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Development/Languages
@@ -13,9 +13,12 @@
 BuildRequires: qt-devel
 BuildRequires: qscintilla-devel
 BuildRequires: sip-devel
+BuildRequires: python-devel 
 %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"
 Requires: python-abi = %{python_ver}
+%endif
 Requires: PyQt = %{version}
 
 %description
@@ -67,6 +70,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  3.17-1
+- PyQt-3.17
+
 * Mon Nov 06 2006 Rex Dieter  3.16-7
 - -devel: Requires: PyQt-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jun 2006 20:29:53 -0000	1.2
+++ sources	8 Nov 2006 13:55:52 -0000	1.3
@@ -1 +1 @@
-5f7a32a15bf8afe17c0d0a0cc46de690  PyQt-x11-gpl-3.16.tar.gz
+dd0ecb6258215cd8e47e6de1c37a6da2  PyQt-x11-gpl-3.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 14:12:30 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 07:12:30 -0700
Subject: rpms/eric/devel eric.spec,1.5,1.6
Message-ID: <200611081412.kA8ECUvf004311@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4295

Modified Files:
	eric.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  5.9.1-4
- BR: PyQt-qscintilla-devel
- (unversioned) Requires: PyQt-qscintilla



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eric.spec	7 Sep 2006 19:52:25 -0000	1.5
+++ eric.spec	8 Nov 2006 14:11:59 -0000	1.6
@@ -5,7 +5,7 @@
 Name:	 eric
 Summary: Python IDE
 Version: 3.9.1
-Release: 3%{?dist}%{?kde}
+Release: 4%{?dist}%{?kde}
 
 License: GPL
 Group:	 Development/Tools
@@ -25,19 +25,18 @@
 Patch3: gen_sip_api-PyQt4.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: PyQt-qscintilla
+BuildRequires: PyQt-qscintilla-devel
 # PyQt api's
 BuildRequires: PyQt-devel
-%global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
-%if "%{?pyqt_ver}" > "2"
-Requires: PyQt = %{pyqt_ver}
-%endif
 
+# This can be left unversioned
 Requires: PyQt-qscintilla
 
 %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()")
+%if "%{?python_ver}" > "2"
 Requires: python-abi = %{python_ver}
+%endif
 
 %description
 eric3 is a full featured Python IDE that is written in PyQt using
@@ -141,6 +140,10 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  5.9.1-4
+- BR: PyQt-qscintilla-devel
+- (unversioned) Requires: PyQt-qscintilla
+
 * Thu Sep 07 2006 Rex Dieter  5.9.1-3
 - include .py[c,o] files again (with no %%ghost'ing)
 



From fedora-extras-commits at redhat.com  Wed Nov  8 14:14:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 07:14:31 -0700
Subject: rpms/eric/FC-6 eric.spec,1.5,1.6
Message-ID: <200611081414.kA8EEVbU004391@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4375

Modified Files:
	eric.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  5.9.1-4
- BR: PyQt-qscintilla-devel
- (unversioned) Requires: PyQt-qscintilla



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/FC-6/eric.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eric.spec	7 Sep 2006 19:52:25 -0000	1.5
+++ eric.spec	8 Nov 2006 14:14:01 -0000	1.6
@@ -5,7 +5,7 @@
 Name:	 eric
 Summary: Python IDE
 Version: 3.9.1
-Release: 3%{?dist}%{?kde}
+Release: 4%{?dist}%{?kde}
 
 License: GPL
 Group:	 Development/Tools
@@ -25,19 +25,18 @@
 Patch3: gen_sip_api-PyQt4.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: PyQt-qscintilla
+BuildRequires: PyQt-qscintilla-devel
 # PyQt api's
 BuildRequires: PyQt-devel
-%global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
-%if "%{?pyqt_ver}" > "2"
-Requires: PyQt = %{pyqt_ver}
-%endif
 
+# This can be left unversioned
 Requires: PyQt-qscintilla
 
 %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()")
+%if "%{?python_ver}" > "2"
 Requires: python-abi = %{python_ver}
+%endif
 
 %description
 eric3 is a full featured Python IDE that is written in PyQt using
@@ -141,6 +140,10 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  5.9.1-4
+- BR: PyQt-qscintilla-devel
+- (unversioned) Requires: PyQt-qscintilla
+
 * Thu Sep 07 2006 Rex Dieter  5.9.1-3
 - include .py[c,o] files again (with no %%ghost'ing)
 



From fedora-extras-commits at redhat.com  Wed Nov  8 14:15:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 07:15:56 -0700
Subject: rpms/eric/FC-5 eric.spec,1.5,1.6
Message-ID: <200611081415.kA8EFut8004464@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4447

Modified Files:
	eric.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter  5.9.1-4
- BR: PyQt-qscintilla-devel
- (unversioned) Requires: PyQt-qscintilla



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/FC-5/eric.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eric.spec	7 Sep 2006 19:53:08 -0000	1.5
+++ eric.spec	8 Nov 2006 14:15:25 -0000	1.6
@@ -5,7 +5,7 @@
 Name:	 eric
 Summary: Python IDE
 Version: 3.9.1
-Release: 3%{?dist}%{?kde}
+Release: 4%{?dist}%{?kde}
 
 License: GPL
 Group:	 Development/Tools
@@ -25,19 +25,18 @@
 Patch3: gen_sip_api-PyQt4.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: PyQt-qscintilla
+BuildRequires: PyQt-qscintilla-devel
 # PyQt api's
 BuildRequires: PyQt-devel
-%global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
-%if "%{?pyqt_ver}" > "2"
-Requires: PyQt = %{pyqt_ver}
-%endif
 
+# This can be left unversioned
 Requires: PyQt-qscintilla
 
 %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()")
+%if "%{?python_ver}" > "2"
 Requires: python-abi = %{python_ver}
+%endif
 
 %description
 eric3 is a full featured Python IDE that is written in PyQt using
@@ -141,6 +140,10 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter  5.9.1-4
+- BR: PyQt-qscintilla-devel
+- (unversioned) Requires: PyQt-qscintilla
+
 * Thu Sep 07 2006 Rex Dieter  5.9.1-3
 - include .py[c,o] files again (with no %%ghost'ing)
 



From fedora-extras-commits at redhat.com  Wed Nov  8 14:25:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 07:25:12 -0700
Subject: rpms/sbcl/FC-6 .cvsignore, 1.16, 1.17 sbcl.spec, 1.52, 1.53 sources,
	1.18, 1.19
Message-ID: <200611081425.kA8EPCqu004579@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4559

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Thu Oct 26 2006 Rex Dieter  0.9.18-1
- sbcl-0.9.18



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-6/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Sep 2006 13:06:00 -0000	1.16
+++ .cvsignore	8 Nov 2006 14:24:42 -0000	1.17
@@ -3,3 +3,4 @@
 sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 sbcl-0.9.16-source.tar.bz2
 sbcl-0.9.17-source.tar.bz2
+sbcl-0.9.18-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-6/sbcl.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sbcl.spec	27 Sep 2006 13:06:00 -0000	1.52
+++ sbcl.spec	8 Nov 2006 14:24:42 -0000	1.53
@@ -9,7 +9,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.17
+Version: 0.9.18
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -215,8 +215,11 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter  0.9.18-1
+- sbcl-0.9.18
+
 * Tue Sep 26 2006 Rex Dieter  0.9.17-1
-- 0.9.17
+- sbcl-0.9.17
 
 * Mon Aug 28 2006 Rex Dieter  0.9.16-3
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	27 Sep 2006 13:06:00 -0000	1.18
+++ sources	8 Nov 2006 14:24:42 -0000	1.19
@@ -1 +1 @@
-1f2297931f35d6d84d632c30aa099c13  sbcl-0.9.17-source.tar.bz2
+a00122024746ecb81bfff1a328bb2336  sbcl-0.9.18-source.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 14:41:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 07:41:47 -0700
Subject: rpms/sbcl/FC-5 .cvsignore, 1.16, 1.17 sbcl.spec, 1.49, 1.50 sources,
	1.18, 1.19
Message-ID: <200611081441.kA8EflEV004769@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4749

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Thu Oct 26 2006 Rex Dieter  0.9.18-1
- sbcl-0.9.18



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	27 Sep 2006 13:43:53 -0000	1.16
+++ .cvsignore	8 Nov 2006 14:41:17 -0000	1.17
@@ -3,3 +3,4 @@
 sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 sbcl-0.9.16-source.tar.bz2
 sbcl-0.9.17-source.tar.bz2
+sbcl-0.9.18-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sbcl.spec	27 Sep 2006 13:43:53 -0000	1.49
+++ sbcl.spec	8 Nov 2006 14:41:17 -0000	1.50
@@ -9,7 +9,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.17
+Version: 0.9.18
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -215,8 +215,11 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter  0.9.18-1
+- sbcl-0.9.18
+
 * Tue Sep 26 2006 Rex Dieter  0.9.17-1
-- 0.9.17
+- sbcl-0.9.17
 
 * Mon Aug 28 2006 Rex Dieter  0.9.16-3
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	27 Sep 2006 13:43:53 -0000	1.18
+++ sources	8 Nov 2006 14:41:17 -0000	1.19
@@ -1 +1 @@
-1f2297931f35d6d84d632c30aa099c13  sbcl-0.9.17-source.tar.bz2
+a00122024746ecb81bfff1a328bb2336  sbcl-0.9.18-source.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 15:09:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 08:09:15 -0700
Subject: rpms/maxima/FC-6 maxima.spec,1.42,1.43 xmaxima.desktop,1.4,1.5
Message-ID: <200611081509.kA8F9Fa5008073@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8053

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Thu Oct 26 2006 Rex Dieter  5.10.0-7
- respin for sbcl-0.9.18
- fixup %triggerun's
- drop dfi --add-category=X-Fedora



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/maxima.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- maxima.spec	2 Oct 2006 16:55:41 -0000	1.42
+++ maxima.spec	8 Nov 2006 15:08:45 -0000	1.43
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -158,7 +158,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 # almost any sbcl will do, but we want to be sure we're using the latest -- Rex
-BuildRequires: sbcl >= 0.9.17
+BuildRequires: sbcl >= 0.9.18
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -239,7 +239,7 @@
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" --vendor="fedora" \
+  --vendor="fedora" \
   %{SOURCE2} 
 
 # emaxima LaTeX style
@@ -303,11 +303,16 @@
 ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||:
 
 %triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+if [ $2 -eq 0 ]; then
+ rm -f %{emacs_sitelisp}/maxima || :
+ rm -f %{emacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 %triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
-
+if [ $2 -eq 0 ]; then
+ rm -f %{xemacs_sitelisp}/maxima || :
+ rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 
 %clean
@@ -380,6 +385,11 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter  5.10.0-7
+- respin for sbcl-0.9.18
+- fixup %%triggerun's
+- drop dfi --add-category=X-Fedora
+
 * Mon Oct 02 2006 Rex Dieter  5.10.0-5
 - update xdg-utils patch (for .dvi handling too)
 


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/xmaxima.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmaxima.desktop	5 Jan 2006 14:56:22 -0000	1.4
+++ xmaxima.desktop	8 Nov 2006 15:08:45 -0000	1.5
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Application;Science;Education;Math;
+Categories=Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Wed Nov  8 15:12:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Wed, 8 Nov 2006 08:12:05 -0700
Subject: rpms/qt4-qsa/devel qt4-qsa.spec,1.10,1.11
Message-ID: <200611081512.kA8FC5go008147@cvs-int.fedora.redhat.com>

Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8131

Modified Files:
	qt4-qsa.spec 
Log Message:
fix doc files Bug #214577



Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt4-qsa.spec	14 Oct 2006 16:04:15 -0000	1.10
+++ qt4-qsa.spec	8 Nov 2006 15:11:35 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	19%{?dist}
+Release:	20%{?dist}
 BuildRequires:	qt4-devel
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
@@ -95,10 +95,14 @@
 %{qtinc}/*
 %{qtlib}/libqsa.so
 %{qtdir}/mkspecs/features/qsa.prf
+%defattr(0644,root,root,0755)
 %doc examples
 %doc doc/html
 
 %changelog 
+* Mon Nov 08 2006 Frank B??ttner   - 1.2.1-20%{?dist}
+- fix doc files Bug #214577
+
 * Sat Oct 14 2006 Frank B??ttner   - 1.2.1-19%{?dist}
 - back to old one because the patch for bug 210544 fails
 



From fedora-extras-commits at redhat.com  Wed Nov  8 15:19:34 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 8 Nov 2006 08:19:34 -0700
Subject: rpms/anjuta import.log,1.24,1.25
Message-ID: <200611081519.kA8FJYvk008321@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8283

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-10 on branch FC-5 from anjuta-2.0.2-10.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- import.log	21 Oct 2006 11:20:03 -0000	1.24
+++ import.log	8 Nov 2006 15:19:03 -0000	1.25
@@ -21,3 +21,4 @@
 anjuta-1_2_4a-7:FC-5:anjuta-1.2.4a-7.src.rpm:1157214616
 anjuta-2_0_2-8:HEAD:anjuta-2.0.2-8.src.rpm:1161204122
 anjuta-2_0_2-8:FC-5:anjuta-2.0.2-8.src.rpm:1161429591
+anjuta-2_0_2-10:FC-5:anjuta-2.0.2-10.src.rpm:1162999129



From fedora-extras-commits at redhat.com  Wed Nov  8 15:19:34 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 8 Nov 2006 08:19:34 -0700
Subject: rpms/anjuta/FC-5 anjuta-dialog.patch, NONE, 1.1 anjuta.spec, 1.22, 
	1.23 anjuta2.spec, 1.1, NONE
Message-ID: <200611081519.kA8FJYbo008324@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8283/FC-5

Added Files:
	anjuta-dialog.patch anjuta.spec 
Removed Files:
	anjuta2.spec 
Log Message:
auto-import anjuta-2.0.2-10 on branch FC-5 from anjuta-2.0.2-10.src.rpm

anjuta-dialog.patch:

--- NEW FILE anjuta-dialog.patch ---
--- anjuta-2.0.2/src/action-callbacks.c	2005-03-13 10:55:26.000000000 +0000
+++ anjuta-2.0.2/src/action-callbacks-new.c	2006-11-08 14:31:26.000000000 +0000
@@ -177,5 +177,7 @@
 on_about_activate (GtkAction * action, gpointer user_data)
 {
 	GtkWidget *about_dlg = about_box_new ();
+	g_signal_connect_swapped(about_dlg, "response",
+							 G_CALLBACK(gtk_widget_destroy), about_dlg);
 	gtk_widget_show (about_dlg);
 }


Index: anjuta.spec
===================================================================
RCS file: anjuta.spec
diff -N anjuta.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ anjuta.spec	8 Nov 2006 15:19:04 -0000	1.23
@@ -0,0 +1,179 @@
+Summary: Integrated Development Environment
+Name:    anjuta
+Version: 2.0.2
+Release: 10%{?dist}
+License: GPL
+Group:   Development/Tools
+URL:     http://www.anjuta.org
+Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0: anjuta-dialog.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
+BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Epoch: 1
+
+%description
+Anjuta DevStudio is a versatile Integrated Development Environment (IDE)
+on GNOME Desktop Environment and features a number of advanced
+programming facilities. These include project management, application and
+class wizards, an on-board interactive debugger, powerful source editor,
+syntax highlighting, intellisense autocompletions, symbol navigation,
+version controls, integrated GUI designing and other tools.
+
+%package devel
+Summary: Libraries and include files for Anjuta plugins development
+Group:   Development/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: libgnomeui-devel, libglade2-devel, pkgconfig
+
+%description devel
+Libraries, header files and API docs for developing Anjuta plugins
+
+%package docs
+Summary: Anjuta 2 documentation
+Group: Documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
+
+%description docs
+Anjuta 2 documentation
+
+%prep
+%setup -q
+sed -i 's/\r//' doc/ScintillaDoc.html
+%{_bindir}/iconv -t UTF-8 THANKS -o THANKS
+%{_bindir}/iconv -t UTF-8 COPYING -o COPYING
+%{_bindir}/iconv -t UTF-8 NEWS -o NEWS
+%{_bindir}/iconv -t UTF-8 README -o README
+chmod 644 scintilla/*.cxx
+chmod 644 scintilla/*.h
+%patch0 -p1 -b .orig
+
+%build
+%configure --disable-static --disable-plugin-subversion --enable-nls
+%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
+sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} INSTALL="install -c -p" install
+%find_lang %{name}
+
+desktop-file-install --vendor fedora --delete-original \
+  --dir %{buildroot}/%{_datadir}/applications      \
+  --add-category X-Fedora                              \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
+
+%clean
+rm -rf %{buildroot}
+
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%post docs
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun docs
+scrollkeeper-update -q || :
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%doc doc/ScintillaDoc.html
+%{_bindir}/%{name}*
+%{_bindir}/create_global_tags.sh
+%{_bindir}/test_tm_buffer
+%{_libdir}/lib%{name}*.so.*
+%{_libdir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/%{name}
+%{_datadir}/doc/%{name}
+%{_datadir}/application-registry/%{name}.applications
+%{_datadir}/mime-info/%{name}.mime
+%{_datadir}/mime-info/%{name}.keys
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/icons/hicolor/48x48/apps/anjuta*
+%{_datadir}/icons/hicolor/scalable/apps/anjuta*
+%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png
+%{_mandir}/man1/anjuta*
+
+%files docs
+%defattr(-,root, root, -)
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/omf/%{name}
+
+%files devel
+%defattr (-, root, root)
+%{_includedir}/*%{name}*
+%{_libdir}/pkgconfig/*%{name}*
+%{_libdir}/lib%{name}*.so
+%{_datadir}/gtk-doc/html/*%{name}*
+
+%changelog
+* Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
+- add patch for close dialog on the about window
+- renamed spec file to anjuta
+
+* Sat Oct 28 2006 Paul F. Johnson  2.0.2-9
+- rebuild against new libopts
+
+* Tue Oct 17 2006 Paul F. Johnson  2.0.2-8
+- fix the INSTALL line in install
+- fixed encoding on text files
+- removed two docs (not really needed)
+- fixed ldconfig
+
+* Sun Oct 15 2006 Paul F. Johnson  2.0.2-7
+- install keeps timestampe
+- now keeps time stamps
+- lots of BRs removed
+- Moved docs Rs to the correct place
+- fixed encodings
+
+* Sat Oct 14 2006 Paul F. Johnson  2.0.2-6
+- removed RPM_BUILD_ROOT
+- fixed devel package
+- altered update-mime-database
+- fixed debuginfo permission problems
+- altered R and BR
+
+* Wed Oct 11 2006 Paul F. Johnson  2.0.2-5
+- re-enabled docs
+- multiple spec fixes
+- spec file clean
+- added gtksourceview-devel and gtksourceview to BR and R
+
+* Thu Jun 06 2006 Paul F. Johnson  2.0.2-2
+- Lotza fixes!
+
+* Tue May 23 2006 Paul F. Johnson  2.0.2-1
+- bump to new version 
+
+* Thu Apr 27 2006 Paul F. Johnson  2.0.1-3
+- removed the hack from anjuta (1.2.4a)
+- added anjuta-docs subpackage
+
+* Wed Apr 26 2006 Paul F. Johnson  2.0.1-2
+- removed smp_flags
+
+* Tue Feb 21 2006 Paul F. Johnson  2.0.1-1
+- Initial import for FC
+- Sanitised the spec file somewhat
+- Removed .a and .la files


--- anjuta2.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 15:21:35 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 8 Nov 2006 08:21:35 -0700
Subject: rpms/anjuta import.log,1.25,1.26
Message-ID: <200611081521.kA8FLZLf008436@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8403

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-10 on branch FC-6 from anjuta-2.0.2-10.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- import.log	8 Nov 2006 15:19:03 -0000	1.25
+++ import.log	8 Nov 2006 15:21:05 -0000	1.26
@@ -22,3 +22,4 @@
 anjuta-2_0_2-8:HEAD:anjuta-2.0.2-8.src.rpm:1161204122
 anjuta-2_0_2-8:FC-5:anjuta-2.0.2-8.src.rpm:1161429591
 anjuta-2_0_2-10:FC-5:anjuta-2.0.2-10.src.rpm:1162999129
+anjuta-2_0_2-10:FC-6:anjuta-2.0.2-10.src.rpm:1162999249



From fedora-extras-commits at redhat.com  Wed Nov  8 15:21:36 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 8 Nov 2006 08:21:36 -0700
Subject: rpms/anjuta/FC-6 anjuta-dialog.patch, NONE, 1.1 anjuta.spec, 1.23, 
	1.24 anjuta2.spec, 1.2, NONE
Message-ID: <200611081521.kA8FLahl008439@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8403/FC-6

Added Files:
	anjuta-dialog.patch anjuta.spec 
Removed Files:
	anjuta2.spec 
Log Message:
auto-import anjuta-2.0.2-10 on branch FC-6 from anjuta-2.0.2-10.src.rpm

anjuta-dialog.patch:

--- NEW FILE anjuta-dialog.patch ---
--- anjuta-2.0.2/src/action-callbacks.c	2005-03-13 10:55:26.000000000 +0000
+++ anjuta-2.0.2/src/action-callbacks-new.c	2006-11-08 14:31:26.000000000 +0000
@@ -177,5 +177,7 @@
 on_about_activate (GtkAction * action, gpointer user_data)
 {
 	GtkWidget *about_dlg = about_box_new ();
+	g_signal_connect_swapped(about_dlg, "response",
+							 G_CALLBACK(gtk_widget_destroy), about_dlg);
 	gtk_widget_show (about_dlg);
 }


Index: anjuta.spec
===================================================================
RCS file: anjuta.spec
diff -N anjuta.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ anjuta.spec	8 Nov 2006 15:21:06 -0000	1.24
@@ -0,0 +1,179 @@
+Summary: Integrated Development Environment
+Name:    anjuta
+Version: 2.0.2
+Release: 10%{?dist}
+License: GPL
+Group:   Development/Tools
+URL:     http://www.anjuta.org
+Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0: anjuta-dialog.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
+BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Epoch: 1
+
+%description
+Anjuta DevStudio is a versatile Integrated Development Environment (IDE)
+on GNOME Desktop Environment and features a number of advanced
+programming facilities. These include project management, application and
+class wizards, an on-board interactive debugger, powerful source editor,
+syntax highlighting, intellisense autocompletions, symbol navigation,
+version controls, integrated GUI designing and other tools.
+
+%package devel
+Summary: Libraries and include files for Anjuta plugins development
+Group:   Development/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: libgnomeui-devel, libglade2-devel, pkgconfig
+
+%description devel
+Libraries, header files and API docs for developing Anjuta plugins
+
+%package docs
+Summary: Anjuta 2 documentation
+Group: Documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
+
+%description docs
+Anjuta 2 documentation
+
+%prep
+%setup -q
+sed -i 's/\r//' doc/ScintillaDoc.html
+%{_bindir}/iconv -t UTF-8 THANKS -o THANKS
+%{_bindir}/iconv -t UTF-8 COPYING -o COPYING
+%{_bindir}/iconv -t UTF-8 NEWS -o NEWS
+%{_bindir}/iconv -t UTF-8 README -o README
+chmod 644 scintilla/*.cxx
+chmod 644 scintilla/*.h
+%patch0 -p1 -b .orig
+
+%build
+%configure --disable-static --disable-plugin-subversion --enable-nls
+%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
+sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} INSTALL="install -c -p" install
+%find_lang %{name}
+
+desktop-file-install --vendor fedora --delete-original \
+  --dir %{buildroot}/%{_datadir}/applications      \
+  --add-category X-Fedora                              \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
+
+%clean
+rm -rf %{buildroot}
+
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%post docs
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun docs
+scrollkeeper-update -q || :
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%doc doc/ScintillaDoc.html
+%{_bindir}/%{name}*
+%{_bindir}/create_global_tags.sh
+%{_bindir}/test_tm_buffer
+%{_libdir}/lib%{name}*.so.*
+%{_libdir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/%{name}
+%{_datadir}/doc/%{name}
+%{_datadir}/application-registry/%{name}.applications
+%{_datadir}/mime-info/%{name}.mime
+%{_datadir}/mime-info/%{name}.keys
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/icons/hicolor/48x48/apps/anjuta*
+%{_datadir}/icons/hicolor/scalable/apps/anjuta*
+%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png
+%{_mandir}/man1/anjuta*
+
+%files docs
+%defattr(-,root, root, -)
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/omf/%{name}
+
+%files devel
+%defattr (-, root, root)
+%{_includedir}/*%{name}*
+%{_libdir}/pkgconfig/*%{name}*
+%{_libdir}/lib%{name}*.so
+%{_datadir}/gtk-doc/html/*%{name}*
+
+%changelog
+* Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
+- add patch for close dialog on the about window
+- renamed spec file to anjuta
+
+* Sat Oct 28 2006 Paul F. Johnson  2.0.2-9
+- rebuild against new libopts
+
+* Tue Oct 17 2006 Paul F. Johnson  2.0.2-8
+- fix the INSTALL line in install
+- fixed encoding on text files
+- removed two docs (not really needed)
+- fixed ldconfig
+
+* Sun Oct 15 2006 Paul F. Johnson  2.0.2-7
+- install keeps timestampe
+- now keeps time stamps
+- lots of BRs removed
+- Moved docs Rs to the correct place
+- fixed encodings
+
+* Sat Oct 14 2006 Paul F. Johnson  2.0.2-6
+- removed RPM_BUILD_ROOT
+- fixed devel package
+- altered update-mime-database
+- fixed debuginfo permission problems
+- altered R and BR
+
+* Wed Oct 11 2006 Paul F. Johnson  2.0.2-5
+- re-enabled docs
+- multiple spec fixes
+- spec file clean
+- added gtksourceview-devel and gtksourceview to BR and R
+
+* Thu Jun 06 2006 Paul F. Johnson  2.0.2-2
+- Lotza fixes!
+
+* Tue May 23 2006 Paul F. Johnson  2.0.2-1
+- bump to new version 
+
+* Thu Apr 27 2006 Paul F. Johnson  2.0.1-3
+- removed the hack from anjuta (1.2.4a)
+- added anjuta-docs subpackage
+
+* Wed Apr 26 2006 Paul F. Johnson  2.0.1-2
+- removed smp_flags
+
+* Tue Feb 21 2006 Paul F. Johnson  2.0.1-1
+- Initial import for FC
+- Sanitised the spec file somewhat
+- Removed .a and .la files


--- anjuta2.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 15:23:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 8 Nov 2006 08:23:09 -0700
Subject: rpms/jd/devel .cvsignore,1.14,1.15 sources,1.14,1.15
Message-ID: <200611081523.kA8FN9aR008542@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8514

Modified Files:
	.cvsignore sources 
Log Message:
* Sat Nov  4 2006 Mamoru Tasaka  - 1.8.0-0.5.cvs061106
- cvs 061106 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	6 Nov 2006 15:07:35 -0000	1.14
+++ .cvsignore	8 Nov 2006 15:22:39 -0000	1.15
@@ -1 +1 @@
-jd-1.8.0-cvs061106.tgz
+jd-1.8.0-rc061108.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	6 Nov 2006 15:07:35 -0000	1.14
+++ sources	8 Nov 2006 15:22:39 -0000	1.15
@@ -1 +1 @@
-5590a3ab50666cd728b9ea3d25389ac5  jd-1.8.0-cvs061106.tgz
+1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz



From fedora-extras-commits at redhat.com  Wed Nov  8 15:24:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 8 Nov 2006 08:24:01 -0700
Subject: rpms/anjuta import.log,1.26,1.27
Message-ID: <200611081524.kA8FO1Nd008597@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8556

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-10 on branch devel from anjuta-2.0.2-10.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- import.log	8 Nov 2006 15:21:05 -0000	1.26
+++ import.log	8 Nov 2006 15:23:30 -0000	1.27
@@ -23,3 +23,4 @@
 anjuta-2_0_2-8:FC-5:anjuta-2.0.2-8.src.rpm:1161429591
 anjuta-2_0_2-10:FC-5:anjuta-2.0.2-10.src.rpm:1162999129
 anjuta-2_0_2-10:FC-6:anjuta-2.0.2-10.src.rpm:1162999249
+anjuta-2_0_2-10:HEAD:anjuta-2.0.2-10.src.rpm:1162999392



From fedora-extras-commits at redhat.com  Wed Nov  8 15:24:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Wed, 8 Nov 2006 08:24:01 -0700
Subject: rpms/anjuta/devel anjuta-dialog.patch, NONE, 1.1 anjuta.spec, 1.23, 
	1.24 anjuta2.spec, 1.2, NONE
Message-ID: <200611081524.kA8FO1PB008601@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8556/devel

Added Files:
	anjuta-dialog.patch anjuta.spec 
Removed Files:
	anjuta2.spec 
Log Message:
auto-import anjuta-2.0.2-10 on branch devel from anjuta-2.0.2-10.src.rpm

anjuta-dialog.patch:

--- NEW FILE anjuta-dialog.patch ---
--- anjuta-2.0.2/src/action-callbacks.c	2005-03-13 10:55:26.000000000 +0000
+++ anjuta-2.0.2/src/action-callbacks-new.c	2006-11-08 14:31:26.000000000 +0000
@@ -177,5 +177,7 @@
 on_about_activate (GtkAction * action, gpointer user_data)
 {
 	GtkWidget *about_dlg = about_box_new ();
+	g_signal_connect_swapped(about_dlg, "response",
+							 G_CALLBACK(gtk_widget_destroy), about_dlg);
 	gtk_widget_show (about_dlg);
 }


Index: anjuta.spec
===================================================================
RCS file: anjuta.spec
diff -N anjuta.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ anjuta.spec	8 Nov 2006 15:23:31 -0000	1.24
@@ -0,0 +1,179 @@
+Summary: Integrated Development Environment
+Name:    anjuta
+Version: 2.0.2
+Release: 10%{?dist}
+License: GPL
+Group:   Development/Tools
+URL:     http://www.anjuta.org
+Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0: anjuta-dialog.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
+BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Epoch: 1
+
+%description
+Anjuta DevStudio is a versatile Integrated Development Environment (IDE)
+on GNOME Desktop Environment and features a number of advanced
+programming facilities. These include project management, application and
+class wizards, an on-board interactive debugger, powerful source editor,
+syntax highlighting, intellisense autocompletions, symbol navigation,
+version controls, integrated GUI designing and other tools.
+
+%package devel
+Summary: Libraries and include files for Anjuta plugins development
+Group:   Development/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: libgnomeui-devel, libglade2-devel, pkgconfig
+
+%description devel
+Libraries, header files and API docs for developing Anjuta plugins
+
+%package docs
+Summary: Anjuta 2 documentation
+Group: Documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
+
+%description docs
+Anjuta 2 documentation
+
+%prep
+%setup -q
+sed -i 's/\r//' doc/ScintillaDoc.html
+%{_bindir}/iconv -t UTF-8 THANKS -o THANKS
+%{_bindir}/iconv -t UTF-8 COPYING -o COPYING
+%{_bindir}/iconv -t UTF-8 NEWS -o NEWS
+%{_bindir}/iconv -t UTF-8 README -o README
+chmod 644 scintilla/*.cxx
+chmod 644 scintilla/*.h
+%patch0 -p1 -b .orig
+
+%build
+%configure --disable-static --disable-plugin-subversion --enable-nls
+%define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
+sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} INSTALL="install -c -p" install
+%find_lang %{name}
+
+desktop-file-install --vendor fedora --delete-original \
+  --dir %{buildroot}/%{_datadir}/applications      \
+  --add-category X-Fedora                              \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
+
+%clean
+rm -rf %{buildroot}
+
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%post docs
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+%postun docs
+scrollkeeper-update -q || :
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%doc doc/ScintillaDoc.html
+%{_bindir}/%{name}*
+%{_bindir}/create_global_tags.sh
+%{_bindir}/test_tm_buffer
+%{_libdir}/lib%{name}*.so.*
+%{_libdir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/%{name}
+%{_datadir}/doc/%{name}
+%{_datadir}/application-registry/%{name}.applications
+%{_datadir}/mime-info/%{name}.mime
+%{_datadir}/mime-info/%{name}.keys
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/icons/hicolor/48x48/apps/anjuta*
+%{_datadir}/icons/hicolor/scalable/apps/anjuta*
+%{_datadir}/icons/gnome/48x48/mimetypes/*%{name}.png
+%{_mandir}/man1/anjuta*
+
+%files docs
+%defattr(-,root, root, -)
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/omf/%{name}
+
+%files devel
+%defattr (-, root, root)
+%{_includedir}/*%{name}*
+%{_libdir}/pkgconfig/*%{name}*
+%{_libdir}/lib%{name}*.so
+%{_datadir}/gtk-doc/html/*%{name}*
+
+%changelog
+* Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
+- add patch for close dialog on the about window
+- renamed spec file to anjuta
+
+* Sat Oct 28 2006 Paul F. Johnson  2.0.2-9
+- rebuild against new libopts
+
+* Tue Oct 17 2006 Paul F. Johnson  2.0.2-8
+- fix the INSTALL line in install
+- fixed encoding on text files
+- removed two docs (not really needed)
+- fixed ldconfig
+
+* Sun Oct 15 2006 Paul F. Johnson  2.0.2-7
+- install keeps timestampe
+- now keeps time stamps
+- lots of BRs removed
+- Moved docs Rs to the correct place
+- fixed encodings
+
+* Sat Oct 14 2006 Paul F. Johnson  2.0.2-6
+- removed RPM_BUILD_ROOT
+- fixed devel package
+- altered update-mime-database
+- fixed debuginfo permission problems
+- altered R and BR
+
+* Wed Oct 11 2006 Paul F. Johnson  2.0.2-5
+- re-enabled docs
+- multiple spec fixes
+- spec file clean
+- added gtksourceview-devel and gtksourceview to BR and R
+
+* Thu Jun 06 2006 Paul F. Johnson  2.0.2-2
+- Lotza fixes!
+
+* Tue May 23 2006 Paul F. Johnson  2.0.2-1
+- bump to new version 
+
+* Thu Apr 27 2006 Paul F. Johnson  2.0.1-3
+- removed the hack from anjuta (1.2.4a)
+- added anjuta-docs subpackage
+
+* Wed Apr 26 2006 Paul F. Johnson  2.0.1-2
+- removed smp_flags
+
+* Tue Feb 21 2006 Paul F. Johnson  2.0.1-1
+- Initial import for FC
+- Sanitised the spec file somewhat
+- Removed .a and .la files


--- anjuta2.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 15:24:56 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 8 Nov 2006 08:24:56 -0700
Subject: rpms/jd/devel jd.spec,1.21,1.22
Message-ID: <200611081524.kA8FOu0g008664@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644

Modified Files:
	jd.spec 
Log Message:
* Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
- 1.8.0 rc 061108



Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jd.spec	6 Nov 2006 15:07:35 -0000	1.21
+++ jd.spec	8 Nov 2006 15:24:26 -0000	1.22
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061106
-%define         repoid        22566
+%define         strtag        rc061108
+%define         repoid        22637
 
 
 # Defined by vendor
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Nov  4 2006 Mamoru Tasaka  - 1.8.0-0.5.cvs061106
-- cvs 061106 (23:59 JST)
+* Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
+- 1.8.0 rc 061108
 
 * Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
 - 1.8.0 beta 061103



From fedora-extras-commits at redhat.com  Wed Nov  8 15:26:27 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 8 Nov 2006 08:26:27 -0700
Subject: rpms/jd/FC-6 .cvsignore,1.8,1.9 jd.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <200611081526.kA8FQRkF008854@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8767

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
- 1.8.0 rc 061108



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Nov 2006 13:00:49 -0000	1.8
+++ .cvsignore	8 Nov 2006 15:25:57 -0000	1.9
@@ -1 +1 @@
-jd-1.8.0-beta061103.tgz
+jd-1.8.0-rc061108.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jd.spec	3 Nov 2006 13:00:49 -0000	1.9
+++ jd.spec	8 Nov 2006 15:25:57 -0000	1.10
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061103
-%define         repoid        22566
+%define         strtag        rc061108
+%define         repoid        22637
 
 
 # Defined by vendor
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
+- 1.8.0 rc 061108
+
 * Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
 - 1.8.0 beta 061103
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Nov 2006 13:00:49 -0000	1.8
+++ sources	8 Nov 2006 15:25:57 -0000	1.9
@@ -1 +1 @@
-fb89210bb7fa49b0fcdf3a28c1e22711  jd-1.8.0-beta061103.tgz
+1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz



From fedora-extras-commits at redhat.com  Wed Nov  8 15:30:09 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Wed, 8 Nov 2006 08:30:09 -0700
Subject: rpms/eclipse-subclipse/FC-6
	eclipse-subclipse-1.1.8-plugin-classpath.patch, NONE,
	1.1 subclipse-fetch-1.1.8.sh, NONE, 1.1 .cvsignore, 1.2,
	1.3 eclipse-subclipse.spec, 1.2, 1.3 sources, 1.2,
	1.3 eclipse-subclipse-1.1.5-plugin-classpath.patch, 1.1,
	NONE subclipse-fetch-1.1.5.sh, 1.1, NONE
Message-ID: <200611081530.kA8FU9U7008932@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8892

Modified Files:
	.cvsignore eclipse-subclipse.spec sources 
Added Files:
	eclipse-subclipse-1.1.8-plugin-classpath.patch 
	subclipse-fetch-1.1.8.sh 
Removed Files:
	eclipse-subclipse-1.1.5-plugin-classpath.patch 
	subclipse-fetch-1.1.5.sh 
Log Message:
Update to upstream 1.1.8


eclipse-subclipse-1.1.8-plugin-classpath.patch:

--- NEW FILE eclipse-subclipse-1.1.8-plugin-classpath.patch ---
diff -Naur subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF
--- subclipse-1.1.8.original/subclipse/core/META-INF/MANIFEST.MF	2006-10-23 13:10:29.000000000 -0400
+++ subclipse-1.1.8/subclipse/core/META-INF/MANIFEST.MF	2006-11-08 07:16:12.000000000 -0400
@@ -2,7 +2,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
 Bundle-Version: 1.1.8
-Bundle-ClassPath: .,
+Bundle-ClassPath: lib/subclipse-core.jar,
  lib/svnClientAdapter.jar,
  lib/svnjavahl.jar,
  lib/javasvn.jar,


--- NEW FILE subclipse-fetch-1.1.8.sh ---
#!/bin/sh
VERSION=1.1.8
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Aug 2006 00:56:47 -0000	1.2
+++ .cvsignore	8 Nov 2006 15:29:38 -0000	1.3
@@ -1 +1 @@
-subclipse-1.1.5.tgz
+subclipse-1.1.8.tgz


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/eclipse-subclipse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-subclipse.spec	28 Aug 2006 03:45:28 -0000	1.2
+++ eclipse-subclipse.spec	8 Nov 2006 15:29:38 -0000	1.3
@@ -7,7 +7,7 @@
 
 
 Name:           eclipse-subclipse
-Version:        1.1.5
+Version:        1.1.8
 Release:        2%{?dist}
 Summary:        Subversion Eclipse plugin
 
@@ -18,7 +18,7 @@
 # Script to fetch the source code
 # the new source tarball does not includes the book feature and the layout is
 # different than the source repository
-Source10:       subclipse-fetch-1.1.5.sh
+Source10:       subclipse-fetch-1.1.8.sh
 # Disable javahl support temporaly until apparent classloader problem is fixed
 Patch0:         eclipse-subclipse-1.0.1-default-javasvn.patch
 Patch1:         svnClientAdapter-1.1.4-javac-target.patch
@@ -26,7 +26,7 @@
 # This patch is applied after the build has finished when unpacking the plugin
 # jar and replacing internal jars with links to its dependencies. It can not be
 # applied at "prep" stage because it causes errors at build time
-Source50:       eclipse-subclipse-1.1.5-plugin-classpath.patch
+Source50:       eclipse-subclipse-1.1.8-plugin-classpath.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:          ant
@@ -211,6 +211,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Wed Nov 08 2006 Robert Marcano  1.1.8-2
+- Update to upstream 1.1.8
+
 * Mon Aug 28 2006 Robert Marcano  1.1.5-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Aug 2006 00:56:47 -0000	1.2
+++ sources	8 Nov 2006 15:29:38 -0000	1.3
@@ -1 +1 @@
-7c317c03fc7dc8fae0612c75e46564ae  subclipse-1.1.5.tgz
+bbc6dd6c7cb8107fe3906460b2f556e4  subclipse-1.1.8.tgz


--- eclipse-subclipse-1.1.5-plugin-classpath.patch DELETED ---


--- subclipse-fetch-1.1.5.sh DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 15:32:01 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 8 Nov 2006 08:32:01 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.7,1.8 jd.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <200611081532.kA8FW15Y009014@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8987

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
- 1.8.0 rc 061108



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Nov 2006 13:03:03 -0000	1.7
+++ .cvsignore	8 Nov 2006 15:31:31 -0000	1.8
@@ -1 +1 @@
-jd-1.8.0-beta061103.tgz
+jd-1.8.0-rc061108.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jd.spec	3 Nov 2006 13:03:03 -0000	1.8
+++ jd.spec	8 Nov 2006 15:31:31 -0000	1.9
@@ -10,8 +10,8 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        beta061103
-%define         repoid        22566
+%define         strtag        rc061108
+%define         repoid        22637
 
 
 # Defined by vendor
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
+- 1.8.0 rc 061108
+
 * Fri Nov  3 2006 Mamoru Tasaka  - 1.8.0-0.5.beta061103
 - 1.8.0 beta 061103
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Nov 2006 13:03:03 -0000	1.7
+++ sources	8 Nov 2006 15:31:31 -0000	1.8
@@ -1 +1 @@
-fb89210bb7fa49b0fcdf3a28c1e22711  jd-1.8.0-beta061103.tgz
+1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz



From fedora-extras-commits at redhat.com  Wed Nov  8 15:36:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 08:36:11 -0700
Subject: rpms/maxima/FC-5 maxima-5.10.0-xdg-utils.patch, NONE,
	1.1 maxima.spec, 1.30, 1.31 xmaxima.desktop, 1.4,
	1.5 maxima-5.10.0-xdg_open.patch, 1.1,
	NONE maxima-5.9.4-evince.patch, 1.1, NONE
Message-ID: <200611081536.kA8FaB3K009210@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9188

Modified Files:
	maxima.spec xmaxima.desktop 
Added Files:
	maxima-5.10.0-xdg-utils.patch 
Removed Files:
	maxima-5.10.0-xdg_open.patch maxima-5.9.4-evince.patch 
Log Message:
* Thu Oct 26 2006 Rex Dieter  5.10.0-7
- respin for sbcl-0.9.18
- fixup %%triggerun's
- drop dfi --add-category=X-Fedora

* Mon Oct 02 2006 Rex Dieter  5.10.0-5
- update xdg-utils patch (for .dvi handling too)


maxima-5.10.0-xdg-utils.patch:

--- NEW FILE maxima-5.10.0-xdg-utils.patch ---
--- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.xdg_open	2006-09-11 10:38:01.000000000 -0500
+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-10-02 11:46:43.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }
--- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl.xdg_open	2006-08-03 08:21:57.000000000 -0500
+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-10-02 11:48:30.000000000 -0500
@@ -143,9 +143,9 @@
     image/gif  netmath
     image/png  netmath
     image/jpeg netmath
-    application/postscript "ghostview -safer %s"
-    application/pdf "acroread %s"
-    application/x-dvi "xdvi %s"
+    application/postscript "xdg-open %s"
+    application/pdf "xdg-open %s"
+    application/x-dvi "xdg-open %s"
 }
 set maxima_priv(imagecounter) 0
 
--- maxima-5.10.0/src/plot.lisp.xdg_open	2006-08-26 06:13:40.000000000 -0500
+++ maxima-5.10.0/src/plot.lisp	2006-10-02 11:46:43.000000000 -0500
@@ -75,7 +75,7 @@
                         ((mlist) $plot_realpart nil)
                         ))
 
-(defvar $viewps_command  "(ghostview \"~a\")")
+(defvar $viewps_command  "(xdg-open \"~a\")")
 
 ;; $plot_realpart option is false by default but *plot-realpart* is true because coerce-float-fun
 ;; is used outside of plot package too.


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- maxima.spec	2 Oct 2006 16:30:27 -0000	1.30
+++ maxima.spec	8 Nov 2006 15:35:40 -0000	1.31
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 4%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -44,13 +44,11 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.10.0-xdg_open.patch
+Patch1: maxima-5.10.0-xdg-utils.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
 Patch3: maxima-5.9.4-sbcl-disable-debugger.patch
-# ghostview -> evince (ps/pdf viewer)
-Patch4: maxima-5.9.4-evince.patch
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
 # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
@@ -97,7 +95,6 @@
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
 Requires: xdg-utils
-#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -161,7 +158,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 # almost any sbcl will do, but we want to be sure we're using the latest -- Rex
-BuildRequires: sbcl >= 0.9.17
+BuildRequires: sbcl >= 0.9.18
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -185,9 +182,6 @@
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
-%if "%{?fedora}" > "3"
-%patch4 -p1 -b .evince
-%endif
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -245,7 +239,7 @@
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" --vendor="fedora" \
+  --vendor="fedora" \
   %{SOURCE2} 
 
 # emaxima LaTeX style
@@ -309,11 +303,16 @@
 ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||:
 
 %triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+if [ $2 -eq 0 ]; then
+ rm -f %{emacs_sitelisp}/maxima || :
+ rm -f %{emacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 %triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
-
+if [ $2 -eq 0 ]; then
+ rm -f %{xemacs_sitelisp}/maxima || :
+ rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 
 %clean
@@ -386,8 +385,16 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter  5.10.0-7
+- respin for sbcl-0.9.18
+- fixup %%triggerun's
+- drop dfi --add-category=X-Fedora
+
+* Mon Oct 02 2006 Rex Dieter  5.10.0-5
+- update xdg-utils patch (for .dvi handling too)
+
 * Mon Oct 02 2006 Rex Dieter  5.10.0-4
-- -gui: htmlview -> xdg-open,Requires: xdg-utils
+- -gui: htmlview -> xdg-open, Requires: xdg-utils
 
 * Tue Sep 26 2006 Rex Dieter  5.10.0-2
 - respin for sbcl-0.9.17


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/xmaxima.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmaxima.desktop	5 Jan 2006 14:56:22 -0000	1.4
+++ xmaxima.desktop	8 Nov 2006 15:35:40 -0000	1.5
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Application;Science;Education;Math;
+Categories=Science;Education;Math;
 Encoding=UTF-8


--- maxima-5.10.0-xdg_open.patch DELETED ---


--- maxima-5.9.4-evince.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 15:39:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Wed, 8 Nov 2006 08:39:26 -0700
Subject: rpms/qt4-qsa/FC-6 qt4-qsa.spec,1.10,1.11
Message-ID: <200611081539.kA8FdQ3k009294@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-serv9271

Modified Files:
	qt4-qsa.spec 
Log Message:
fix for bug 214577 



Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/FC-6/qt4-qsa.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt4-qsa.spec	14 Oct 2006 16:04:15 -0000	1.10
+++ qt4-qsa.spec	8 Nov 2006 15:38:56 -0000	1.11
@@ -1,7 +1,7 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	19%{?dist}
+Release:	20%{?dist}
 BuildRequires:	qt4-devel
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
@@ -95,10 +95,14 @@
 %{qtinc}/*
 %{qtlib}/libqsa.so
 %{qtdir}/mkspecs/features/qsa.prf
+%defattr(0644,root,root,0755)
 %doc examples
 %doc doc/html
 
 %changelog 
+* Mon Nov 08 2006 Frank B??ttner   - 1.2.1-20%{?dist}
+- fix doc files Bug #214577
+
 * Sat Oct 14 2006 Frank B??ttner   - 1.2.1-19%{?dist}
 - back to old one because the patch for bug 210544 fails
 



From fedora-extras-commits at redhat.com  Wed Nov  8 15:58:16 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 8 Nov 2006 08:58:16 -0700
Subject: rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.3,1.4
Message-ID: <200611081558.kA8FwGBK009410@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9394

Modified Files:
	eclipse-emf.spec 
Log Message:
* Wed Nov 08 2006 Andrew Overholt  2.2.1-3
- Remove the bits of the SDK that we don't need for building.



Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-emf.spec	6 Nov 2006 20:36:06 -0000	1.3
+++ eclipse-emf.spec	8 Nov 2006 15:57:45 -0000	1.4
@@ -203,10 +203,12 @@
 pushd ../..
 rm SDK/plugins/org.eclipse.pde.build
 # Remove the bits of the SDK that we don't need
+rm SDK/features/org.eclipse.sdk*
 rm SDK/features/org.eclipse.pde.source*
 rm SDK/features/org.eclipse.jdt.source*
 rm SDK/plugins/org.eclipse.pde.source*
 rm SDK/plugins/org.eclipse.jdt.source*
+rm SDK/plugins/org.eclipse.sdk*
 # This tomcat chicanery will be fixed in a future Eclipse SDK RPM
 mkdir SDK2
 pushd SDK
@@ -513,6 +515,9 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
+* Wed Nov 08 2006 Andrew Overholt  2.2.1-3
+- Remove the bits of the SDK that we don't need for building.
+
 * Mon Nov 06 2006 Andrew Overholt  2.2.1-2
 - Add Requires(post,postun) for sub-packages using rebuild-gcj-db.
 - Change usage of copy-platform to work with upcoming changes to SDK.



From fedora-extras-commits at redhat.com  Wed Nov  8 16:02:33 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Frank_B=C3=BCttner?= (frankb))
Date: Wed, 8 Nov 2006 09:02:33 -0700
Subject: rpms/qt4-qsa/FC-5 qt4-qsa.spec,1.4,1.5
Message-ID: <200611081602.kA8G2XHR012416@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-serv12398

Modified Files:
	qt4-qsa.spec 
Log Message:
fix for bug #214577



Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/FC-5/qt4-qsa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt4-qsa.spec	12 Oct 2006 18:40:01 -0000	1.4
+++ qt4-qsa.spec	8 Nov 2006 16:02:03 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	16%{?dist}
+Release:	17%{?dist}
 BuildRequires:	qt4-devel => 4.2
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
@@ -94,10 +94,14 @@
 %{qtinc}/*
 %{qtlib}/libqsa.so
 %{qtdir}/mkspecs/features/qsa.prf
+%defattr(0644,root,root,0755)
 %doc examples
 %doc doc/html
 
 %changelog 
+* Mon Nov 08 2006 Frank B??ttner   - 1.2.1-17%{?dist}
+- fix doc files Bug #214577
+
 * Mon Aug 07 2006 Frank B??ttner   - 1.2.1-16%{?dist}
 - fix build for EMT64
 



From fedora-extras-commits at redhat.com  Wed Nov  8 16:22:44 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 8 Nov 2006 09:22:44 -0700
Subject: rpms/python-nltk/FC-3 python-nltk.spec,1.2,1.3
Message-ID: <200611081622.kA8GMikb012664@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/FC-3

Modified Files:
	python-nltk.spec 
Log Message:
Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution



Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/python-nltk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nltk.spec	6 Feb 2006 13:20:27 -0000	1.2
+++ python-nltk.spec	8 Nov 2006 16:22:13 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-nltk
-Version:        1.4.2
-Release:        1%{?dist}
+Version:        1.4.4
+Release:        3%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 
 BuildRequires:  python
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:	python-numeric, tkinter
+Requires:	python-numarray, tkinter
 
 %description
 The Natural Language Toolkit is a Python package that simplifies the
@@ -55,17 +55,16 @@
 %dir %{python_sitelib}/nltk/test
 %dir %{python_sitelib}/nltk/tokenizer
 %dir %{python_sitelib}/nltk/tokenreader
-%{python_sitelib}/nltk/*.py
-%{python_sitelib}/nltk/*.pyc
-%{python_sitelib}/nltk/*/*.py
-%{python_sitelib}/nltk/*/*.pyc
-%ghost %{python_sitelib}/nltk/*.pyo
-%ghost %{python_sitelib}/nltk/*/*.pyo
+%{python_sitelib}/nltk/*.py*
+%{python_sitelib}/nltk/*/*.py*
 
 
 %changelog
-* Mon Feb  6 2006 Michel Salim  - 1.4.2-1
-- Downgrade to 1.4.2 for FC3 only, to match older version of Python installed
+* Wed Nov  8 2006 Michel Salim  - 1.4.4-3
+- Include *.pyos, for compliance with new Python guidelines
 
-* Sun Sep 11 2005 Michel Salim  - 1.4.4-1
+* Mon Oct  9 2006 Michel Salim  - 1.4.4-2
+- Rebuild for FE6
+
+* Sun Sep 11 2005 Michel Salim  - 1.4.4-1
 - Initial package



From fedora-extras-commits at redhat.com  Wed Nov  8 16:22:45 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 8 Nov 2006 09:22:45 -0700
Subject: rpms/python-nltk/FC-4 python-nltk.spec,1.1,1.2
Message-ID: <200611081622.kA8GMjMt012667@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/FC-4

Modified Files:
	python-nltk.spec 
Log Message:
Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution



Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-4/python-nltk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-nltk.spec	17 Nov 2005 05:22:25 -0000	1.1
+++ python-nltk.spec	8 Nov 2006 16:22:15 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-nltk
 Version:        1.4.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -13,7 +13,6 @@
 BuildArch:	noarch
 
 BuildRequires:  python
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-numarray, tkinter
 
 %description
@@ -32,7 +31,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 
 %clean
@@ -55,14 +54,16 @@
 %dir %{python_sitelib}/nltk/test
 %dir %{python_sitelib}/nltk/tokenizer
 %dir %{python_sitelib}/nltk/tokenreader
-%{python_sitelib}/nltk/*.py
-%{python_sitelib}/nltk/*.pyc
-%{python_sitelib}/nltk/*/*.py
-%{python_sitelib}/nltk/*/*.pyc
-%ghost %{python_sitelib}/nltk/*.pyo
-%ghost %{python_sitelib}/nltk/*/*.pyo
+%{python_sitelib}/nltk/*.py*
+%{python_sitelib}/nltk/*/*.py*
 
 
 %changelog
+* Wed Nov  8 2006 Michel Salim  - 1.4.4-3
+- Include *.pyos, for compliance with new Python guidelines
+
+* Mon Oct  9 2006 Michel Salim  - 1.4.4-2
+- Rebuild for FE6
+
 * Sun Sep 11 2005 Michel Salim  - 1.4.4-1
 - Initial package



From fedora-extras-commits at redhat.com  Wed Nov  8 16:22:51 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 8 Nov 2006 09:22:51 -0700
Subject: rpms/python-nltk/FC-5 python-nltk.spec,1.1,1.2
Message-ID: <200611081622.kA8GMpgf012670@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/FC-5

Modified Files:
	python-nltk.spec 
Log Message:
Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution



Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-5/python-nltk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-nltk.spec	17 Nov 2005 05:22:25 -0000	1.1
+++ python-nltk.spec	8 Nov 2006 16:22:20 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-nltk
 Version:        1.4.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -13,7 +13,6 @@
 BuildArch:	noarch
 
 BuildRequires:  python
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-numarray, tkinter
 
 %description
@@ -32,7 +31,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 
 %clean
@@ -55,14 +54,16 @@
 %dir %{python_sitelib}/nltk/test
 %dir %{python_sitelib}/nltk/tokenizer
 %dir %{python_sitelib}/nltk/tokenreader
-%{python_sitelib}/nltk/*.py
-%{python_sitelib}/nltk/*.pyc
-%{python_sitelib}/nltk/*/*.py
-%{python_sitelib}/nltk/*/*.pyc
-%ghost %{python_sitelib}/nltk/*.pyo
-%ghost %{python_sitelib}/nltk/*/*.pyo
+%{python_sitelib}/nltk/*.py*
+%{python_sitelib}/nltk/*/*.py*
 
 
 %changelog
+* Wed Nov  8 2006 Michel Salim  - 1.4.4-3
+- Include *.pyos, for compliance with new Python guidelines
+
+* Mon Oct  9 2006 Michel Salim  - 1.4.4-2
+- Rebuild for FE6
+
 * Sun Sep 11 2005 Michel Salim  - 1.4.4-1
 - Initial package



From fedora-extras-commits at redhat.com  Wed Nov  8 16:22:51 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 8 Nov 2006 09:22:51 -0700
Subject: rpms/python-nltk/FC-6 python-nltk.spec,1.2,1.3
Message-ID: <200611081622.kA8GMp7c012673@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/FC-6

Modified Files:
	python-nltk.spec 
Log Message:
Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution



Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-6/python-nltk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nltk.spec	10 Oct 2006 00:45:00 -0000	1.2
+++ python-nltk.spec	8 Nov 2006 16:22:21 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-nltk
 Version:        1.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -13,7 +13,6 @@
 BuildArch:	noarch
 
 BuildRequires:  python
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-numarray, tkinter
 
 %description
@@ -32,7 +31,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 
 %clean
@@ -55,15 +54,14 @@
 %dir %{python_sitelib}/nltk/test
 %dir %{python_sitelib}/nltk/tokenizer
 %dir %{python_sitelib}/nltk/tokenreader
-%{python_sitelib}/nltk/*.py
-%{python_sitelib}/nltk/*.pyc
-%{python_sitelib}/nltk/*/*.py
-%{python_sitelib}/nltk/*/*.pyc
-%ghost %{python_sitelib}/nltk/*.pyo
-%ghost %{python_sitelib}/nltk/*/*.pyo
+%{python_sitelib}/nltk/*.py*
+%{python_sitelib}/nltk/*/*.py*
 
 
 %changelog
+* Wed Nov  8 2006 Michel Salim  - 1.4.4-3
+- Include *.pyos, for compliance with new Python guidelines
+
 * Mon Oct  9 2006 Michel Salim  - 1.4.4-2
 - Rebuild for FE6
 



From fedora-extras-commits at redhat.com  Wed Nov  8 16:22:57 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 8 Nov 2006 09:22:57 -0700
Subject: rpms/python-nltk/devel python-nltk.spec,1.2,1.3
Message-ID: <200611081622.kA8GMvxh012676@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12590/devel

Modified Files:
	python-nltk.spec 
Log Message:
Fix to follow Python packaging guidelines. This package will be retired once nltk-lite enters the repository, this is a stop-gap solution



Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/devel/python-nltk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nltk.spec	10 Oct 2006 00:45:00 -0000	1.2
+++ python-nltk.spec	8 Nov 2006 16:22:27 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           python-nltk
 Version:        1.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -13,7 +13,6 @@
 BuildArch:	noarch
 
 BuildRequires:  python
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:	python-numarray, tkinter
 
 %description
@@ -32,7 +31,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 
 %clean
@@ -55,15 +54,14 @@
 %dir %{python_sitelib}/nltk/test
 %dir %{python_sitelib}/nltk/tokenizer
 %dir %{python_sitelib}/nltk/tokenreader
-%{python_sitelib}/nltk/*.py
-%{python_sitelib}/nltk/*.pyc
-%{python_sitelib}/nltk/*/*.py
-%{python_sitelib}/nltk/*/*.pyc
-%ghost %{python_sitelib}/nltk/*.pyo
-%ghost %{python_sitelib}/nltk/*/*.pyo
+%{python_sitelib}/nltk/*.py*
+%{python_sitelib}/nltk/*/*.py*
 
 
 %changelog
+* Wed Nov  8 2006 Michel Salim  - 1.4.4-3
+- Include *.pyos, for compliance with new Python guidelines
+
 * Mon Oct  9 2006 Michel Salim  - 1.4.4-2
 - Rebuild for FE6
 



From fedora-extras-commits at redhat.com  Wed Nov  8 16:38:11 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Wed, 8 Nov 2006 09:38:11 -0700
Subject: rpms/mail-notification/FC-6
	mail-notification-fedora-plugin-hint.patch, NONE,
	1.1 mail-notification.spec, 1.29, 1.30
Message-ID: <200611081638.kA8GcBYj012943@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-serv12924

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-fedora-plugin-hint.patch 
Log Message:
3.0-9 -- add a patch that informs the user to install the evolution-plugin if he want to use mn with evo

mail-notification-fedora-plugin-hint.patch:

--- NEW FILE mail-notification-fedora-plugin-hint.patch ---
diff -Naur mail-notification-3.0.org/src/mn-evolution-mailbox-properties.c mail-notification-3.0/src/mn-evolution-mailbox-properties.c
--- mail-notification-3.0.org/src/mn-evolution-mailbox-properties.c	2006-11-04 13:28:17.000000000 +0100
+++ mail-notification-3.0/src/mn-evolution-mailbox-properties.c	2006-11-04 13:39:55.000000000 +0100
@@ -387,7 +387,7 @@
     selfp->pbag = bonobo_object_release_unref(selfp->pbag, NULL);
     selfp->listener = bonobo_object_release_unref(selfp->listener, NULL);
 
-    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded."));
+    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded and installed. Fedora ships the plugin in a sperate package called mail-notification-evolution-plugin you might need to install manually."));
 
     gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/FC-6/mail-notification.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mail-notification.spec	2 Sep 2006 11:14:38 -0000	1.29
+++ mail-notification.spec	8 Nov 2006 16:37:41 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        3.0
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://www.nongnu.org/mailnotify/
 Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz
 Source1:        mail-notification-README.FEDORA
+Patch0:         mail-notification-fedora-plugin-hint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -53,6 +54,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .patch0
 cp %{SOURCE1} ./README.FEDORA
 
 %build
@@ -127,6 +129,12 @@
 
 
 %changelog
+* 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
+
 * Sat Sep 02 2006 Thorsten Leemhuis   3.0-7
 - don't run mail-notification with unset-obsolete-configuration at all
 



From fedora-extras-commits at redhat.com  Wed Nov  8 17:28:25 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 8 Nov 2006 10:28:25 -0700
Subject: rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.4,1.5
Message-ID: <200611081728.kA8HSPwx016217@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16201

Modified Files:
	eclipse-emf.spec 
Log Message:
Bump release.


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-emf.spec	8 Nov 2006 15:57:45 -0000	1.4
+++ eclipse-emf.spec	8 Nov 2006 17:27:55 -0000	1.5
@@ -8,7 +8,7 @@
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
@@ -515,7 +515,7 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
-* Wed Nov 08 2006 Andrew Overholt  2.2.1-3
+* Wed Nov 08 2006 Andrew Overholt  2.2.1-4
 - Remove the bits of the SDK that we don't need for building.
 
 * Mon Nov 06 2006 Andrew Overholt  2.2.1-2



From fedora-extras-commits at redhat.com  Wed Nov  8 17:29:31 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 8 Nov 2006 10:29:31 -0700
Subject: rpms/eclipse-emf/FC-6 eclipse-emf.spec,1.5,1.6
Message-ID: <200611081729.kA8HTV5O016274@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/eclipse-emf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253

Modified Files:
	eclipse-emf.spec 
Log Message:
Bump release.


Index: eclipse-emf.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-emf/FC-6/eclipse-emf.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-emf.spec	8 Nov 2006 17:27:55 -0000	1.5
+++ eclipse-emf.spec	8 Nov 2006 17:29:00 -0000	1.6
@@ -8,7 +8,7 @@
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
@@ -515,7 +515,7 @@
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
-* Wed Nov 08 2006 Andrew Overholt  2.2.1-4
+* Wed Nov 08 2006 Andrew Overholt  2.2.1-5
 - Remove the bits of the SDK that we don't need for building.
 
 * Mon Nov 06 2006 Andrew Overholt  2.2.1-2



From fedora-extras-commits at redhat.com  Wed Nov  8 17:32:20 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 8 Nov 2006 10:32:20 -0700
Subject: rpms/python-nltk/FC-3 python-nltk.spec,1.3,1.4 sources,1.3,1.4
Message-ID: <200611081732.kA8HWKX5016355@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16337

Modified Files:
	python-nltk.spec sources 
Log Message:
Fix source for FC3



Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/python-nltk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-nltk.spec	8 Nov 2006 16:22:13 -0000	1.3
+++ python-nltk.spec	8 Nov 2006 17:31:50 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           python-nltk
 Version:        1.4.4
-Release:        3%{?dist}
+Release:        3.1%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Michel Salim  - 1.4.4-3.1
+- Rebuild with correct source
+
 * Wed Nov  8 2006 Michel Salim  - 1.4.4-3
 - Include *.pyos, for compliance with new Python guidelines
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Feb 2006 13:20:27 -0000	1.3
+++ sources	8 Nov 2006 17:31:50 -0000	1.4
@@ -1 +1 @@
-f24e6ac9c2152e9cf6f9fa09e259d783 nltk-1.4.2.tar.gz
+fb402d42d71844fe4483affa100814e5  nltk-1.4.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 18:00:12 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 11:00:12 -0700
Subject: owners owners.list,1.1904,1.1905
Message-ID: <200611081800.kA8I0CJi016601@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16570

Modified Files:
	owners.list 
Log Message:
- de-orphan doulos-fonts, fonttools, gtranslator, translate-toolkit, and
  ttf2pt1 that were automatically orphaned
- removed myself from CC list for spicctrl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1904
retrieving revision 1.1905
diff -u -r1.1904 -r1.1905
--- owners.list	8 Nov 2006 09:52:45 -0000	1.1904
+++ owners.list	8 Nov 2006 17:59:41 -0000	1.1905
@@ -307,7 +307,7 @@
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|doulos-fonts|Doulos SIL fonts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|driftnet|Network image sniffer|bnocera at redhat.com|extras-qa at fedoraproject.org|
@@ -409,7 +409,7 @@
 Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fontforge|An outline and bitmap font editor|kevin at tummy.com|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|fonts-hebrew-fancy|Fancy Hebrew fonts|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
-Fedora Extras|fonttools|A tool to convert True/OpenType fonts to XML and back|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|fonttools|A tool to convert True/OpenType fonts to XML and back|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|foremost|Program that recovers files by carving them from a raw disk|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|fortune-firefly|An addon of Firefly quotes for fortune-mod|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org|
@@ -640,7 +640,7 @@
 Fedora Extras|gtkterm|Serial port terminal|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gts|GNU Triangulated Surface Library|ed at eh3.com|extras-qa at fedoraproject.org|rc040203 at freenet.de
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtypist|GNU typing tutor|zing at fastmail.fm|extras-qa at fedoraproject.org|
@@ -2130,7 +2130,7 @@
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|sparse|A semantic parser of source files|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
-Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|imlinux at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -2263,14 +2263,14 @@
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|trackballs|Steer a marble ball through a labyrinth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|trackballs-music|In-game music for Trackballs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|translate-toolkit|A collection of tools to assist software localization|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|transmission|A lightweight GTK+ BitTorrent client|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|tre|POSIX compatible regexp library with approximate matching|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tremulous|First Person Shooter game based on the Quake 3 engine|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|tremulous-data|Data files for tremulous the FPS game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|TurboGears|Back-to-front web development in Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  8 18:10:30 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 8 Nov 2006 11:10:30 -0700
Subject: rpms/galeon/FC-3 galeon.spec,1.9,1.10
Message-ID: <200611081810.kA8IAUGx019732@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/galeon/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19707

Modified Files:
	galeon.spec 
Log Message:
Rebuild for mozilla 1.7.13


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-3/galeon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- galeon.spec	28 Nov 2005 22:48:02 -0000	1.9
+++ galeon.spec	8 Nov 2006 18:10:00 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Denis Leroy  - 2.0.0-2
+- Rebuild for mozilla 1.7.13
+
 * Mon Nov 28 2005 Denis Leroy  - 2.0.0-1
 - Update to 2.0.0
 



From fedora-extras-commits at redhat.com  Wed Nov  8 18:16:45 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 11:16:45 -0700
Subject: rpms/doulos-fonts/devel Makefile, 1.2, 1.3 doulos-fonts.spec, 1.2, 
	1.3 sources, 1.3, 1.4 dead.package, 1.1, NONE
Message-ID: <200611081816.kA8IGjJx019948@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/doulos-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19923

Added Files:
	Makefile doulos-fonts.spec sources 
Removed Files:
	dead.package 
Log Message:
* Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-2
- Rebuild to make package available in Rawhide again



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	8 Nov 2006 18:16:15 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: doulos-fonts
+# $Id$
+NAME := doulos-fonts
+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)


Index: doulos-fonts.spec
===================================================================
RCS file: doulos-fonts.spec
diff -N doulos-fonts.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ doulos-fonts.spec	8 Nov 2006 18:16:15 -0000	1.3
@@ -0,0 +1,73 @@
+%define fontdir         %{_datadir}/fonts/doulos
+
+Name:           doulos-fonts
+Version:        4.0.14
+Release:        2
+Summary:        Doulos SIL fonts
+
+Group:          User Interface/X
+License:        SIL Open Font License
+URL:            http://scripts.sil.org/DoulosSILFont
+# Source0 can be downloaded from http://scripts.sil.org/DoulosSIL_download#FontsDownload
+Source0:        DoulosSIL%{version}.r1.zip
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+%description
+Doulos SIL provides glyphs for a wide range of Latin and Cyrillic characters.
+Doulos is very similar to Times/Times New Roman, but only has a single
+regular face. It is intended for use alongside other Times-like fonts where
+a range of styles (italic, bold) are not needed.
+
+
+%prep
+%setup -q -c
+%{__sed} -i 's/\r//' *.txt
+
+%build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
+install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
+
+# "touch" all files we've got flagged as %ghost  but which are not
+# present in the RPM_BUILD_ROOT when RPM looks for files
+/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ -x %{_bindir}/fc-cache ]; then
+  %{_bindir}/fc-cache %{_datadir}/fonts
+fi
+
+
+%postun
+if [ "$1" = "0" ]; then
+  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{_datadir}/fonts
+  fi
+fi
+
+
+%files
+%defattr(0644,root,root,0755)
+%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt DoulosSIL4FontDocumentation.pdf
+
+%dir %{fontdir}
+%{fontdir}/*.ttf
+%ghost %{fontdir}/fonts.cache-1
+
+
+%changelog
+* Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-2
+- Rebuild to make package available in Rawhide again
+
+* Sat Feb 18 2006 Roozbeh Pournader  - 4.0.14-1
+- Initial packaging, based on gentium-fonts


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	8 Nov 2006 18:16:15 -0000	1.4
@@ -0,0 +1 @@
+70263b39119d488d432a04a4512cfc57  DoulosSIL4.0.14.r1.zip


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 18:27:30 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 8 Nov 2006 11:27:30 -0700
Subject: rpms/galeon/FC-6 galeon.spec,1.25,1.26
Message-ID: <200611081827.kA8IRUrN020077@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/galeon/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20061

Modified Files:
	galeon.spec 
Log Message:
Rebuild for firefox 1.5.0.8


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-6/galeon.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- galeon.spec	19 Oct 2006 14:06:10 -0000	1.25
+++ galeon.spec	8 Nov 2006 18:27:00 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Denis Leroy  - 2.0.3-4
+- Rebuild for firefox 1.5.0.8
+
 * Thu Oct 19 2006 Denis Leroy  - 2.0.3-3
 - Added patch to fix flash plugin crash
 - Make package depend on gecko-devel



From fedora-extras-commits at redhat.com  Wed Nov  8 18:35:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 8 Nov 2006 11:35:54 -0700
Subject: rpms/gkrellm/devel gkrellm-2.2.10-via686.patch, NONE,
	1.1 gkrellm.spec, 1.5, 1.6
Message-ID: <200611081835.kA8IZsPq020228@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20209

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.2.10-via686.patch 
Log Message:
* Wed Nov  8 2006 Hans de Goede  2.2.10-2
- Add special case for via 686 volt sensors  (bug 213304)


gkrellm-2.2.10-via686.patch:

--- NEW FILE gkrellm-2.2.10-via686.patch ---
diff -ur gkrellm-2.2.10/src/sysdeps/linux.c gkrellm-2.2.10.new/src/sysdeps/linux.c
--- gkrellm-2.2.10/src/sysdeps/linux.c	2006-10-27 00:06:07.000000000 +0200
+++ gkrellm-2.2.10.new/src/sysdeps/linux.c	2006-11-08 17:00:26.000000000 +0100
@@ -2016,6 +2016,7 @@
 
 #ifdef HAVE_LIBSENSORS
 #include 
+#include 
 
 static gboolean
 libsensors_init(void)
@@ -2028,6 +2029,7 @@
 	gchar			id_name[512], sensor_path[512];
 	gint			type, n_sensors_added;
 	ConfigMap		*config_map;
+	char			*endptr;
 
 	f = fopen("/etc/sensors.conf", "r");
 	if (!f)
@@ -2070,6 +2072,9 @@
 				*/
 				snprintf(sensor_path, sizeof (sensor_path), "%s:%s",
 						name->prefix, name->busname ? name->busname : "NULL");
+						
+				/* For VIA 686 volt sensors special case */
+				strtol(feature->name, &endptr, 10);
 
 				if (!strncmp(feature->name, "temp", 4))
 					type = SENSOR_TEMPERATURE;
@@ -2077,6 +2082,12 @@
 					type = SENSOR_FAN;
 				else if (!strncmp(feature->name, "in", 2))
 					type = SENSOR_VOLTAGE;
+				/* HURRAY! special case for VIA 686 volt sensors,
+				   which genius made up those feature names? */
+				else if ((endptr[0] == 'V' && endptr[1] == 0) ||
+				         (endptr[0] == '.' && isdigit(endptr[1]) &&
+				          endptr[2] == 'V' && endptr[3] == 0))
+					type = SENSOR_VOLTAGE;
 				else
 					{
 					if (_GK.debug_level & DEBUG_SENSORS)
Only in gkrellm-2.2.10.new/src/sysdeps: linux.c~


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gkrellm.spec	31 Oct 2006 16:29:31 -0000	1.5
+++ gkrellm.spec	8 Nov 2006 18:35:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.2.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPL
@@ -15,6 +15,7 @@
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
 Patch5:         gkrellm-2.2.9-gkrellmd.conf.patch
+Patch6:         gkrellm-2.2.10-via686.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
 %ifarch %{ix86} x86_64
 BuildRequires:  lm_sensors-devel
@@ -67,6 +68,7 @@
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
 %patch5 -p1 -z .conf-patch
+%patch6 -p1 -z .via686
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -180,6 +182,9 @@
 
 
 %changelog
+* Wed Nov  8 2006 Hans de Goede  2.2.10-2
+- Add special case for via 686 volt sensors  (bug 213304)
+
 * Tue Oct 31 2006 Hans de Goede  2.2.10-1
 - New upstream release 2.2.10
 - Drop integrated lmsensors and sysfs sensors patches



From fedora-extras-commits at redhat.com  Wed Nov  8 18:51:31 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 8 Nov 2006 11:51:31 -0700
Subject: rpms/gqview/FC-4 gqview-2.0.3-desktop.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 gqview.spec, 1.6, 1.7 sources, 1.6,
	1.7 gqview-2.0.0-desktop.patch, 1.2, NONE
Message-ID: <200611081851.kA8IpV3b020376@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20315/FC-4

Modified Files:
	.cvsignore gqview.spec sources 
Added Files:
	gqview-2.0.3-desktop.patch 
Removed Files:
	gqview-2.0.0-desktop.patch 
Log Message:
sync with devel, latest minor updates

gqview-2.0.3-desktop.patch:

--- NEW FILE gqview-2.0.3-desktop.patch ---
diff -Nur gqview-2.0.3-orig/gqview.desktop gqview-2.0.3/gqview.desktop
--- gqview-2.0.3-orig/gqview.desktop	2006-11-03 00:05:28.000000000 +0100
+++ gqview-2.0.3/gqview.desktop	2006-11-04 17:58:52.000000000 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=GQview
+Name=GQview Image Viewer
 GenericName=Image Viewer
 GenericName[et]=Piltide vaatur
 GenericName[tr]=Resim g??stericisi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 May 2005 21:23:33 -0000	1.5
+++ .cvsignore	8 Nov 2006 18:51:00 -0000	1.6
@@ -1 +1 @@
-gqview-2.0.1.tar.gz
+gqview-2.0.3.tar.gz


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-4/gqview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gqview.spec	14 May 2005 21:23:33 -0000	1.6
+++ gqview.spec	8 Nov 2006 18:51:00 -0000	1.7
@@ -1,11 +1,11 @@
 Summary:	Image browser and viewer
 Name:		gqview
-Version:	2.0.1
-Release:	1
+Version:	2.0.3
+Release: 1%{?dist}
 License:	GPL
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
-Patch1:		gqview-2.0.0-desktop.patch
+Patch1:		gqview-2.0.3-desktop.patch
 Patch2:		gqview-2.0.0-editors.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL:		http://gqview.sourceforge.net/
@@ -76,6 +76,22 @@
 
 
 %changelog
+* Sat Nov  4 2006 Michael Schwendt  - 2.0.3-1
+- update to 2.0.3
+- .desktop patch: additional MIME types merged upstream
+
+* Sat Oct 14 2006 Michael Schwendt  - 2.0.2-1
+- update to 2.0.2
+
+* Mon Aug 28 2006 Michael Schwendt  - 2.0.1-4
+- rebuilt
+
+* Wed Feb 15 2006 Michael Schwendt  - 2.0.1-3
+- rebuilt for FC5
+
+* Wed Aug 17 2005 Michael Schwendt  - 2.0.1-2
+- rebuilt
+
 * Sat May 14 2005 Michael Schwendt  2.0.1-1
 - update to 2.0.1
 
@@ -174,7 +190,7 @@
 * Sun Jun 24 2001 Elliot Lee 
 - Bump release + rebuild.
 
-* Tue Feb 27 2001 Trond Eivind Glomsr?d 
+* Tue Feb 27 2001 Trond Eivind Glomsr??d 
 - use %%{_tmppath}
 
 * Thu Jul 13 2000 Prospector 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 May 2005 21:23:33 -0000	1.6
+++ sources	8 Nov 2006 18:51:00 -0000	1.7
@@ -1 +1 @@
-acd8f1dad2b04389c1936adac1512e32  gqview-2.0.1.tar.gz
+8759106bcc16b50234b4b419064d245c  gqview-2.0.3.tar.gz


--- gqview-2.0.0-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 18:51:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 8 Nov 2006 11:51:32 -0700
Subject: rpms/gqview/FC-6 gqview-2.0.3-desktop.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 gqview.spec, 1.10, 1.11 sources, 1.7,
	1.8 gqview-2.0.0-desktop.patch, 1.2, NONE
Message-ID: <200611081851.kA8IpWlQ020386@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20315/FC-6

Modified Files:
	.cvsignore gqview.spec sources 
Added Files:
	gqview-2.0.3-desktop.patch 
Removed Files:
	gqview-2.0.0-desktop.patch 
Log Message:
sync with devel, latest minor updates

gqview-2.0.3-desktop.patch:

--- NEW FILE gqview-2.0.3-desktop.patch ---
diff -Nur gqview-2.0.3-orig/gqview.desktop gqview-2.0.3/gqview.desktop
--- gqview-2.0.3-orig/gqview.desktop	2006-11-03 00:05:28.000000000 +0100
+++ gqview-2.0.3/gqview.desktop	2006-11-04 17:58:52.000000000 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=GQview
+Name=GQview Image Viewer
 GenericName=Image Viewer
 GenericName[et]=Piltide vaatur
 GenericName[tr]=Resim g??stericisi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Oct 2006 16:13:51 -0000	1.6
+++ .cvsignore	8 Nov 2006 18:51:02 -0000	1.7
@@ -1 +1 @@
-gqview-2.0.2.tar.gz
+gqview-2.0.3.tar.gz


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-6/gqview.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gqview.spec	14 Oct 2006 16:13:51 -0000	1.10
+++ gqview.spec	8 Nov 2006 18:51:02 -0000	1.11
@@ -1,11 +1,11 @@
 Summary:	Image browser and viewer
 Name:		gqview
-Version:	2.0.2
+Version:	2.0.3
 Release: 1%{?dist}
 License:	GPL
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
-Patch1:		gqview-2.0.0-desktop.patch
+Patch1:		gqview-2.0.3-desktop.patch
 Patch2:		gqview-2.0.0-editors.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL:		http://gqview.sourceforge.net/
@@ -76,6 +76,10 @@
 
 
 %changelog
+* Sat Nov  4 2006 Michael Schwendt  - 2.0.3-1
+- update to 2.0.3
+- .desktop patch: additional MIME types merged upstream
+
 * Sat Oct 14 2006 Michael Schwendt  - 2.0.2-1
 - update to 2.0.2
 
@@ -186,7 +190,7 @@
 * Sun Jun 24 2001 Elliot Lee 
 - Bump release + rebuild.
 
-* Tue Feb 27 2001 Trond Eivind Glomsr?d 
+* Tue Feb 27 2001 Trond Eivind Glomsr??d 
 - use %%{_tmppath}
 
 * Thu Jul 13 2000 Prospector 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Oct 2006 16:13:51 -0000	1.7
+++ sources	8 Nov 2006 18:51:02 -0000	1.8
@@ -1 +1 @@
-0bb325001b3cea88c2487c84e06ba738  gqview-2.0.2.tar.gz
+8759106bcc16b50234b4b419064d245c  gqview-2.0.3.tar.gz


--- gqview-2.0.0-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 18:51:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 8 Nov 2006 11:51:32 -0700
Subject: rpms/gqview/FC-5 gqview-2.0.3-desktop.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 gqview.spec, 1.8, 1.9 sources, 1.6,
	1.7 gqview-2.0.0-desktop.patch, 1.2, NONE
Message-ID: <200611081851.kA8IpWkR020381@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/gqview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20315/FC-5

Modified Files:
	.cvsignore gqview.spec sources 
Added Files:
	gqview-2.0.3-desktop.patch 
Removed Files:
	gqview-2.0.0-desktop.patch 
Log Message:
sync with devel, latest minor updates

gqview-2.0.3-desktop.patch:

--- NEW FILE gqview-2.0.3-desktop.patch ---
diff -Nur gqview-2.0.3-orig/gqview.desktop gqview-2.0.3/gqview.desktop
--- gqview-2.0.3-orig/gqview.desktop	2006-11-03 00:05:28.000000000 +0100
+++ gqview-2.0.3/gqview.desktop	2006-11-04 17:58:52.000000000 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=GQview
+Name=GQview Image Viewer
 GenericName=Image Viewer
 GenericName[et]=Piltide vaatur
 GenericName[tr]=Resim g??stericisi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 May 2005 21:23:33 -0000	1.5
+++ .cvsignore	8 Nov 2006 18:51:01 -0000	1.6
@@ -1 +1 @@
-gqview-2.0.1.tar.gz
+gqview-2.0.3.tar.gz


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-5/gqview.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gqview.spec	15 Feb 2006 02:13:40 -0000	1.8
+++ gqview.spec	8 Nov 2006 18:51:01 -0000	1.9
@@ -1,11 +1,11 @@
 Summary:	Image browser and viewer
 Name:		gqview
-Version:	2.0.1
-Release:	3
+Version:	2.0.3
+Release: 1%{?dist}
 License:	GPL
 Group:		User Interface/X
 Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
-Patch1:		gqview-2.0.0-desktop.patch
+Patch1:		gqview-2.0.3-desktop.patch
 Patch2:		gqview-2.0.0-editors.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL:		http://gqview.sourceforge.net/
@@ -76,6 +76,16 @@
 
 
 %changelog
+* Sat Nov  4 2006 Michael Schwendt  - 2.0.3-1
+- update to 2.0.3
+- .desktop patch: additional MIME types merged upstream
+
+* Sat Oct 14 2006 Michael Schwendt  - 2.0.2-1
+- update to 2.0.2
+
+* Mon Aug 28 2006 Michael Schwendt  - 2.0.1-4
+- rebuilt
+
 * Wed Feb 15 2006 Michael Schwendt  - 2.0.1-3
 - rebuilt for FC5
 
@@ -180,7 +190,7 @@
 * Sun Jun 24 2001 Elliot Lee 
 - Bump release + rebuild.
 
-* Tue Feb 27 2001 Trond Eivind Glomsr?d 
+* Tue Feb 27 2001 Trond Eivind Glomsr??d 
 - use %%{_tmppath}
 
 * Thu Jul 13 2000 Prospector 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 May 2005 21:23:33 -0000	1.6
+++ sources	8 Nov 2006 18:51:01 -0000	1.7
@@ -1 +1 @@
-acd8f1dad2b04389c1936adac1512e32  gqview-2.0.1.tar.gz
+8759106bcc16b50234b4b419064d245c  gqview-2.0.3.tar.gz


--- gqview-2.0.0-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 19:12:00 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 12:12:00 -0700
Subject: rpms/doulos-fonts/devel .cvsignore,1.3,1.4
Message-ID: <200611081912.kA8JC0Ia023585@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/doulos-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23564

Added Files:
	.cvsignore 
Log Message:
Re-adding .cvsignore



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	8 Nov 2006 19:11:30 -0000	1.4
@@ -0,0 +1 @@
+DoulosSIL4.0.14.r1.zip



From fedora-extras-commits at redhat.com  Wed Nov  8 19:17:43 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 12:17:43 -0700
Subject: rpms/fonttools/devel Makefile, 1.2,
	1.3 fonttools-20050315-20050624.patch, 1.2,
	1.3 fonttools-unsigned-ranges.patch, 1.2, 1.3 fonttools.spec,
	1.5, 1.6 sources, 1.3, 1.4 dead.package, 1.1, NONE
Message-ID: <200611081917.kA8JHhOq023680@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fonttools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23645

Added Files:
	Makefile fonttools-20050315-20050624.patch 
	fonttools-unsigned-ranges.patch fonttools.spec sources 
Removed Files:
	dead.package 
Log Message:
De-orphan



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	8 Nov 2006 19:17:12 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: fonttools
+# $Id$
+NAME := fonttools
+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)

fonttools-20050315-20050624.patch:

Index: fonttools-20050315-20050624.patch
===================================================================
RCS file: fonttools-20050315-20050624.patch
diff -N fonttools-20050315-20050624.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fonttools-20050315-20050624.patch	8 Nov 2006 19:17:12 -0000	1.3
@@ -0,0 +1,279 @@
+diff -urN fonttools-20050315/Lib/fontTools/fondLib.py fonttools-20050624/Lib/fontTools/fondLib.py
+--- fonttools-20050315/Lib/fontTools/fondLib.py	2002-10-29 19:19:25.000000000 +0330
++++ fonttools-20050624/Lib/fontTools/fondLib.py	2005-06-24 14:05:16.000000000 +0430
+@@ -12,6 +12,7 @@
+ DEBUG = 0
+ 
+ headerformat = """
++	>
+ 	ffFlags:	h
+ 	ffFamID:	h
+ 	ffFirstChar:	h
+@@ -127,9 +128,9 @@
+ 	def _getheader(self):
+ 		data = self.FOND.data
+ 		sstruct.unpack(headerformat, data[:28], self)
+-		self.ffProperty = struct.unpack("9h", data[28:46])
+-		self.ffIntl = struct.unpack("hh", data[46:50])
+-		self.ffVersion, = struct.unpack("h", data[50:FONDheadersize])
++		self.ffProperty = struct.unpack(">9h", data[28:46])
++		self.ffIntl = struct.unpack(">hh", data[46:50])
++		self.ffVersion, = struct.unpack(">h", data[50:FONDheadersize])
+ 		
+ 		if DEBUG:
+ 			self._rawheader = data[:FONDheadersize]
+@@ -137,9 +138,9 @@
+ 	
+ 	def _buildheader(self):
+ 		header = sstruct.pack(headerformat, self)
+-		header = header + apply(struct.pack, ("9h",) + self.ffProperty)
+-		header = header + apply(struct.pack, ("hh",) + self.ffIntl)
+-		header = header + struct.pack("h", self.ffVersion)
++		header = header + apply(struct.pack, (">9h",) + self.ffProperty)
++		header = header + apply(struct.pack, (">hh",) + self.ffIntl)
++		header = header + struct.pack(">h", self.ffVersion)
+ 		if DEBUG:
+ 			print "header is the same?", self._rawheader == header and 'yes.' or 'no.'
+ 			if self._rawheader <> header:
+@@ -149,12 +150,12 @@
+ 	def _getfontassociationtable(self):
+ 		data = self.FOND.data
+ 		offset = FONDheadersize
+-		numberofentries, = struct.unpack("h", data[offset:offset+2])
++		numberofentries, = struct.unpack(">h", data[offset:offset+2])
+ 		numberofentries = numberofentries + 1
+ 		size = numberofentries * 6
+ 		self.fontAssoc = []
+ 		for i in range(offset + 2, offset + size, 6):
+-			self.fontAssoc.append(struct.unpack("3h", data[i:i+6]))
++			self.fontAssoc.append(struct.unpack(">3h", data[i:i+6]))
+ 		
+ 		self._endoffontassociationtable = offset + size + 2
+ 		if DEBUG:
+@@ -162,9 +163,9 @@
+ 			self.parsedthings.append((offset, self._endoffontassociationtable, 'fontassociationtable'))
+ 	
+ 	def _buildfontassociationtable(self):
+-		data = struct.pack("h", len(self.fontAssoc) - 1)
++		data = struct.pack(">h", len(self.fontAssoc) - 1)
+ 		for size, stype, ID in self.fontAssoc:
+-			data = data + struct.pack("3h", size, stype, ID)
++			data = data + struct.pack(">3h", size, stype, ID)
+ 		
+ 		if DEBUG:
+ 			print "font association table is the same?", self._rawfontassociationtable == data and 'yes.' or 'no.'
+@@ -194,10 +195,10 @@
+ 			return
+ 		boxes = {}
+ 		data = self._rawoffsettable[6:]
+-		numstyles = struct.unpack("h", data[:2])[0] + 1
++		numstyles = struct.unpack(">h", data[:2])[0] + 1
+ 		data = data[2:]
+ 		for i in range(numstyles):
+-			style, l, b, r, t = struct.unpack("hhhhh", data[:10])
++			style, l, b, r, t = struct.unpack(">hhhhh", data[:10])
+ 			boxes[style] = (l, b, r, t)
+ 			data = data[10:]
+ 		self.boundingBoxes = boxes
+@@ -206,9 +207,9 @@
+ 		if self.boundingBoxes and self._rawoffsettable[:6] == '\0\0\0\0\0\6':
+ 			boxes = self.boundingBoxes.items()
+ 			boxes.sort()
+-			data = '\0\0\0\0\0\6' + struct.pack("h", len(boxes) - 1)
++			data = '\0\0\0\0\0\6' + struct.pack(">h", len(boxes) - 1)
+ 			for style, (l, b, r, t) in boxes:
+-				data = data + struct.pack("hhhhh", style, l, b, r, t)
++				data = data + struct.pack(">hhhhh", style, l, b, r, t)
+ 			self._rawoffsettable = data
+ 	
+ 	def _getglyphwidthtable(self):
+@@ -217,15 +218,15 @@
+ 			return
+ 		data = self.FOND.data
+ 		offset = self.ffWTabOff
+-		numberofentries, = struct.unpack("h", data[offset:offset+2])
++		numberofentries, = struct.unpack(">h", data[offset:offset+2])
+ 		numberofentries = numberofentries + 1
+ 		count = offset + 2
+ 		for i in range(numberofentries):
+-			stylecode, = struct.unpack("h", data[count:count+2])
++			stylecode, = struct.unpack(">h", data[count:count+2])
+ 			widthtable = self.widthTables[stylecode] = []
+ 			count = count + 2
+ 			for j in range(3 + self.ffLastChar - self.ffFirstChar):
+-				width, = struct.unpack("h", data[count:count+2])
++				width, = struct.unpack(">h", data[count:count+2])
+ 				widthtable.append(width)
+ 				count = count + 2
+ 		
+@@ -238,15 +239,15 @@
+ 			self._rawglyphwidthtable = ""
+ 			return
+ 		numberofentries = len(self.widthTables)
+-		data = struct.pack('h', numberofentries - 1)
++		data = struct.pack('>h', numberofentries - 1)
+ 		tables = self.widthTables.items()
+ 		tables.sort()
+ 		for stylecode, table in tables:
+-			data = data + struct.pack('h', stylecode)
++			data = data + struct.pack('>h', stylecode)
+ 			if len(table) <> (3 + self.ffLastChar - self.ffFirstChar):
+ 				raise error, "width table has wrong length"
+ 			for width in table:
+-				data = data + struct.pack('h', width)
++				data = data + struct.pack('>h', width)
+ 		if DEBUG:
+ 			print "glyph width table is the same?", self._rawglyphwidthtable == data and 'yes.' or 'no.'
+ 		self._rawglyphwidthtable = data
+@@ -257,17 +258,17 @@
+ 			return
+ 		data = self.FOND.data
+ 		offset = self.ffKernOff
+-		numberofentries, = struct.unpack("h", data[offset:offset+2])
++		numberofentries, = struct.unpack(">h", data[offset:offset+2])
+ 		numberofentries = numberofentries + 1
+ 		count = offset + 2
+ 		for i in range(numberofentries):
+-			stylecode, = struct.unpack("h", data[count:count+2])
++			stylecode, = struct.unpack(">h", data[count:count+2])
+ 			count = count + 2
+-			numberofpairs, = struct.unpack("h", data[count:count+2])
++			numberofpairs, = struct.unpack(">h", data[count:count+2])
+ 			count = count + 2
+ 			kerntable = self.kernTables[stylecode] = []
+ 			for j in range(numberofpairs):
+-				firstchar, secondchar, kerndistance = struct.unpack("cch", data[count:count+4])
++				firstchar, secondchar, kerndistance = struct.unpack(">cch", data[count:count+4])
+ 				kerntable.append((ord(firstchar), ord(secondchar), kerndistance))
+ 				count = count + 4
+ 		
+@@ -281,14 +282,14 @@
+ 			self.ffKernOff = 0
+ 			return
+ 		numberofentries = len(self.kernTables)
+-		data = [struct.pack('h', numberofentries - 1)]
++		data = [struct.pack('>h', numberofentries - 1)]
+ 		tables = self.kernTables.items()
+ 		tables.sort()
+ 		for stylecode, table in tables:
+-			data.append(struct.pack('h', stylecode))
+-			data.append(struct.pack('h', len(table)))  # numberofpairs
++			data.append(struct.pack('>h', stylecode))
++			data.append(struct.pack('>h', len(table)))  # numberofpairs
+ 			for firstchar, secondchar, kerndistance in table:
+-				data.append(struct.pack("cch", chr(firstchar), chr(secondchar), kerndistance))
++				data.append(struct.pack(">cch", chr(firstchar), chr(secondchar), kerndistance))
+ 		
+ 		data = string.join(data, '')
+ 		
+@@ -308,9 +309,9 @@
+ 			return
+ 		data = self.FOND.data
+ 		self.fondClass, self.glyphTableOffset, self.styleMappingReserved, = \
+-				struct.unpack("hll", data[offset:offset+10])
+-		self.styleIndices = struct.unpack('48b', data[offset + 10:offset + 58])
+-		stringcount, = struct.unpack('h', data[offset+58:offset+60])
++				struct.unpack(">hll", data[offset:offset+10])
++		self.styleIndices = struct.unpack('>48b', data[offset + 10:offset + 58])
++		stringcount, = struct.unpack('>h', data[offset+58:offset+60])
+ 		
+ 		count = offset + 60
+ 		for i in range(stringcount):
+@@ -331,14 +332,14 @@
+ 		if not self.styleIndices:
+ 			self._rawstylemappingtable = ""
+ 			return
+-		data = struct.pack("hll", self.fondClass, self.glyphTableOffset, 
++		data = struct.pack(">hll", self.fondClass, self.glyphTableOffset, 
+ 					self.styleMappingReserved)
+ 		
+ 		self._packstylestrings()
+-		data = data + apply(struct.pack, ("48b",) + self.styleIndices)
++		data = data + apply(struct.pack, (">48b",) + self.styleIndices)
+ 		
+ 		stringcount = len(self.styleStrings)
+-		data = data + struct.pack("h", stringcount)
++		data = data + struct.pack(">h", stringcount)
+ 		for string in self.styleStrings:
+ 			data = data + chr(len(string)) + string
+ 		
+@@ -401,7 +402,7 @@
+ 		data = self._rawstylemappingtable
+ 		if not data:
+ 			return
+-		data = data[:2] + struct.pack("l", self.glyphTableOffset) + data[6:]
++		data = data[:2] + struct.pack(">l", self.glyphTableOffset) + data[6:]
+ 		self._rawstylemappingtable = data
+ 	
+ 	def _getglyphencodingsubtable(self):
+@@ -410,7 +411,7 @@
+ 			return
+ 		offset = self.ffStylOff + self.glyphTableOffset
+ 		data = self.FOND.data
+-		numberofentries, = struct.unpack("h", data[offset:offset+2])
++		numberofentries, = struct.unpack(">h", data[offset:offset+2])
+ 		count = offset + 2
+ 		for i in range(numberofentries):
+ 			glyphcode = ord(data[count])
+@@ -430,7 +431,7 @@
+ 			self._rawglyphencodingsubtable = ""
+ 			return
+ 		numberofentries = len(self.glyphEncoding)
+-		data = struct.pack("h", numberofentries)
++		data = struct.pack(">h", numberofentries)
+ 		items = self.glyphEncoding.items()
+ 		items.sort()
+ 		for glyphcode, glyphname in items:
+diff -urN fonttools-20050315/Lib/fontTools/misc/psCharStrings.py fonttools-20050624/Lib/fontTools/misc/psCharStrings.py
+--- fonttools-20050315/Lib/fontTools/misc/psCharStrings.py	2005-02-24 00:52:27.000000000 +0330
++++ fonttools-20050624/Lib/fontTools/misc/psCharStrings.py	2005-05-07 13:11:12.000000000 +0430
+@@ -780,7 +780,8 @@
+ 	#
+ 	def op_hflex(self, index):
+ 		dx1, dx2, dy2, dx3, dx4, dx5, dx6 = self.popall()
+-		dy1 = dy3 = dy4 = dy5 = dy6 = 0
++		dy1 = dy3 = dy4 = dy6 = 0
++		dy5 = -dy2
+ 		self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3))
+ 		self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6))
+ 	def op_flex(self, index):
+@@ -789,7 +790,9 @@
+ 		self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6))
+ 	def op_hflex1(self, index):
+ 		dx1, dy1, dx2, dy2, dx3, dx4, dx5, dy5, dx6 = self.popall()
+-		dy3 = dy4 = dy6 = 0
++		dy3 = dy4 = 0
++		dy6 = -(dy1 + dy2 + dy3 + dy4 + dy5)
++
+ 		self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3))
+ 		self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6))
+ 	def op_flex1(self, index):
+@@ -798,9 +801,9 @@
+ 		dy = dy1 + dy2 + dy3 + dy4 + dy5
+ 		if abs(dx) > abs(dy):
+ 			dx6 = d6
+-			dy6 = 0
++			dy6 = -dy
+ 		else:
+-			dx6 = 0
++			dx6 = -dx
+ 			dy6 = d6
+ 		self.rCurveTo((dx1, dy1), (dx2, dy2), (dx3, dy3))
+ 		self.rCurveTo((dx4, dy4), (dx5, dy5), (dx6, dy6))
+diff -urN fonttools-20050315/Lib/fontTools/pens/basePen.py fonttools-20050624/Lib/fontTools/pens/basePen.py
+--- fonttools-20050315/Lib/fontTools/pens/basePen.py	2005-03-08 13:20:55.000000000 +0330
++++ fonttools-20050624/Lib/fontTools/pens/basePen.py	2005-04-10 17:48:42.000000000 +0430
+@@ -162,8 +162,11 @@
+ 		of the base glyph and draws it onto self.
+ 		"""
+ 		from fontTools.pens.transformPen import TransformPen
+-		glyph = self.glyphSet.get(glyphName)
+-		if glyph is not None:
++		try:
++			glyph = self.glyphSet[glyphName]
++		except KeyError:
++			pass
++		else:
+ 			tPen = TransformPen(self, transformation)
+ 			glyph.draw(tPen)
+ 

fonttools-unsigned-ranges.patch:

Index: fonttools-unsigned-ranges.patch
===================================================================
RCS file: fonttools-unsigned-ranges.patch
diff -N fonttools-unsigned-ranges.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fonttools-unsigned-ranges.patch	8 Nov 2006 19:17:12 -0000	1.3
@@ -0,0 +1,17 @@
+--- fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py.unsigned-ranges	2006-05-08 17:13:17.000000000 +0330
++++ fonttools/Lib/fontTools/ttLib/tables/O_S_2f_2.py	2006-05-08 17:14:04.000000000 +0330
+@@ -52,10 +52,10 @@
+ 	yStrikeoutPosition:     h       # strikeout position
+ 	sFamilyClass:           h       # font family class and subclass
+ 	panose:                 10s     # panose classification number
+-	ulUnicodeRange1:        l       # character range
+-	ulUnicodeRange2:        l       # character range
+-	ulUnicodeRange3:        l       # character range
+-	ulUnicodeRange4:        l       # character range
++	ulUnicodeRange1:        L       # character range
++	ulUnicodeRange2:        L       # character range
++	ulUnicodeRange3:        L       # character range
++	ulUnicodeRange4:        L       # character range
+ 	achVendID:              4s      # font vendor identification
+ 	fsSelection:            H       # font selection flags
+ 	fsFirstCharIndex:       H       # first unicode character index


Index: fonttools.spec
===================================================================
RCS file: fonttools.spec
diff -N fonttools.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fonttools.spec	8 Nov 2006 19:17:12 -0000	1.6
@@ -0,0 +1,100 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define alphatag 20050624cvs
+
+Name:           fonttools
+Version:        2.0
+Release:        0.6.%{alphatag}%{?dist}
+Summary:        A tool to convert True/OpenType fonts to XML and back
+
+Group:          Development/Tools
+License:        BSD
+URL:            http://sourceforge.net/projects/fonttools/
+Source0:        http://fonttools.sourceforge.net/cvs-snapshots/bzip2/fonttools-2005-03-15.210812.tar.bz2
+Patch1:         fonttools-20050315-20050624.patch
+Patch2:         fonttools-unsigned-ranges.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  python-devel python-numeric
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-numeric
+
+Provides:       ttx
+
+%description
+TTX/FontTools is a tool for manipulating TrueType and OpenType fonts. It is
+written in Python and has a BSD-style, open-source license. TTX can dump
+TrueType and OpenType fonts to an XML-based text format and vice versa.
+
+
+%prep
+%setup -q -n %{name}
+%patch1 -p1 -b .20050624
+%patch2 -p1 -b .unsigned-ranges
+
+%{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py
+%{__chmod} a-x LICENSE.txt
+
+
+%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
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/FontTools/fontTools/ttLib/test
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt
+%doc Doc/bugs.txt Doc/ChangeLog.txt Doc/changes.txt Doc/documentation.html
+%{python_sitearch}/FontTools.pth
+%dir %{python_sitearch}/FontTools
+%dir %{python_sitearch}/FontTools/fontTools
+%dir %{python_sitearch}/FontTools/fontTools/encodings
+%dir %{python_sitearch}/FontTools/fontTools/misc
+%dir %{python_sitearch}/FontTools/fontTools/pens
+%dir %{python_sitearch}/FontTools/fontTools/ttLib
+%dir %{python_sitearch}/FontTools/fontTools/ttLib/tables
+%{python_sitearch}/FontTools/*.py
+%{python_sitearch}/FontTools/*.pyc
+%ghost %{python_sitearch}/FontTools/*.pyo
+%{python_sitearch}/FontTools/fontTools/*.py
+%{python_sitearch}/FontTools/fontTools/*.pyc
+%ghost %{python_sitearch}/FontTools/fontTools/*.pyo
+%{python_sitearch}/FontTools/fontTools/*/*.py
+%{python_sitearch}/FontTools/fontTools/*/*.pyc
+%ghost %{python_sitearch}/FontTools/fontTools/*/*.pyo
+%{python_sitearch}/FontTools/fontTools/*/*/*.py
+%{python_sitearch}/FontTools/fontTools/*/*/*.pyc
+%ghost %{python_sitearch}/FontTools/fontTools/*/*/*.pyo
+%{python_sitearch}/FontTools/fontTools/misc/eexecOp.so
+%{_bindir}/ttx
+
+
+%changelog
+* Mon May 08 2006 Roozbeh Pournader  - 2.0-0.6.20050624cvs
+- Change specification of ulUnicodeRange1-4 to unsigned long
+
+* Mon Feb 13 2006 Roozbeh Pournader  - 2.0-0.5.20050624cvs
+- Rebuild for Fedora Extras 5
+
+* Thu Feb 02 2006 Roozbeh Pournader  - 2.0-0.4.20050624cvs
+- Provide ttx
+
+* Wed Feb 01 2006 Roozbeh Pournader  - 2.0-0.3.20050624cvs
+- Use upstream snapshots, moving the difference into a patch
+- Change alphatag time to the latest change in CVS
+- Use %%{python_sitearch} instead of %%{python_sitelib} (for x86_86)
+- Use sed instead of a patch to remove shebang
+
+* Sun Jan 08 2006 Roozbeh Pournader  - 2.0-0.2.20060103cvs
+- Add %%{?dist} tag
+
+* Fri Jan 06 2006 Roozbeh Pournader  - 2.0-0.1.20060103cvs
+- Initial packaging


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	8 Nov 2006 19:17:12 -0000	1.4
@@ -0,0 +1 @@
+b44a299a0530a2a4f65d1937aa99f734  fonttools-2005-03-15.210812.tar.bz2


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 19:26:33 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 12:26:33 -0700
Subject: rpms/fonttools/devel fonttools.spec,1.6,1.7
Message-ID: <200611081926.kA8JQXZs023835@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fonttools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783

Modified Files:
	fonttools.spec 
Log Message:
* Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.7.20050624cvs
- Rebuild to get into Rawhide



Index: fonttools.spec
===================================================================
RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fonttools.spec	8 Nov 2006 19:17:12 -0000	1.6
+++ fonttools.spec	8 Nov 2006 19:26:03 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           fonttools
 Version:        2.0
-Release:        0.6.%{alphatag}%{?dist}
+Release:        0.7.%{alphatag}%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.7.20050624cvs
+- Rebuild to get into Rawhide
+
 * Mon May 08 2006 Roozbeh Pournader  - 2.0-0.6.20050624cvs
 - Change specification of ulUnicodeRange1-4 to unsigned long
 



From fedora-extras-commits at redhat.com  Wed Nov  8 19:43:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 8 Nov 2006 12:43:00 -0700
Subject: rpms/PyKDE/devel PyKDE.spec,1.5,1.6
Message-ID: <200611081943.kA8Jh01M025424@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25408

Modified Files:
	PyKDE.spec 
Log Message:
* Wed Nov 08 2006 Rex Dieter  3.16.0-3
- (unversioned) Requires: PyQt
- rebuild for PyQt-3.17 (fc7+)



Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PyKDE.spec	4 Oct 2006 19:37:49 -0000	1.5
+++ PyKDE.spec	8 Nov 2006 19:42:30 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -21,11 +21,12 @@
 
 BuildRequires: sip-devel >= 4.4.3 
 BuildRequires: PyQt-devel >= 3.16 
-%global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
-%if "%{?pyqt_ver}" > "2"
-Requires: PyQt = %{pyqt_ver}
-%endif
-
+## try to leave this unversioned, for now -- Rex
+Requires: PyQt
+#global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
+#if "%{?pyqt_ver}" > "2"
+#Requires: PyQt = %{pyqt_ver}
+#endif
 
 BuildRequires: kdelibs-devel kdebase
 %global kdelibs_ver %(kde-config --version 2>/dev/null | grep KDE | cut -d' ' -f2 | cut -d- -f1)
@@ -90,6 +91,10 @@
 
 
 %changelog
+* Wed Nov 08 2006 Rex Dieter  3.16.0-3
+- (unversioned) Requires: PyQt
+- rebuild for PyQt-3.17 (fc7+)
+
 * Wed Oct 04 2006 Rex Dieter  3.16.0-2 
 - respin
 



From fedora-extras-commits at redhat.com  Wed Nov  8 19:47:19 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 12:47:19 -0700
Subject: rpms/translate-toolkit/devel .cvsignore, 1.4, 1.5 sources, 1.5,
	1.6 translate-toolkit.spec, 1.8, 1.9 dead.package, 1.1, NONE
Message-ID: <200611081947.kA8JlJbd025556@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25534

Added Files:
	.cvsignore sources translate-toolkit.spec 
Removed Files:
	dead.package 
Log Message:
De-orphan



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	8 Nov 2006 19:46:49 -0000	1.5
@@ -0,0 +1 @@
+translate-toolkit-0.8.tar.gz


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	8 Nov 2006 19:46:49 -0000	1.6
@@ -0,0 +1 @@
+81204110ab605435862b8999558e9649  translate-toolkit-0.8.tar.gz


Index: translate-toolkit.spec
===================================================================
RCS file: translate-toolkit.spec
diff -N translate-toolkit.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ translate-toolkit.spec	8 Nov 2006 19:46:49 -0000	1.9
@@ -0,0 +1,96 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Name:           translate-toolkit
+Version:        0.8
+Release:        1%{?dist}
+Summary:        A collection of tools to assist software localization
+
+Group:          Development/Tools
+License:        GPL
+URL:            http://translate.sourceforge.net/
+Source0:        http://dl.sourceforge.net/sourceforge/translate/translate-toolkit-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-elementtree
+Requires:       python-enchant
+
+%description
+The Translate Toolkit includes programs to convert various localization
+formats to the common gettext PO format and vice versa, and programs to
+check and manage PO files. Also part of the package are programs to create
+word counts, merge translations, and perform various checks on PO files.
+
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%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
+
+# This removes the documentation files that were installed in site-packages
+find $RPM_BUILD_ROOT%{python_sitelib}/translate -type f -name "[[:upper:]]*" | xargs rm -fv
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog translate/COPYING translate/README
+%dir %{python_sitelib}/translate
+%dir %{python_sitelib}/translate/tools
+%dir %{python_sitelib}/translate/filters
+%dir %{python_sitelib}/translate/storage
+%dir %{python_sitelib}/translate/misc
+%dir %{python_sitelib}/translate/convert
+%{python_sitelib}/translate/*.py
+%{python_sitelib}/translate/*.pyc
+%ghost %{python_sitelib}/translate/*.pyo
+%{python_sitelib}/translate/*/*.py
+%{python_sitelib}/translate/*/*.pyc
+%ghost %{python_sitelib}/translate/*/*.pyo
+%{_bindir}/*
+
+
+%changelog
+* Mon Feb 20 2006 Roozbeh Pournader  - 0.8-1
+- Update to final 0.8
+
+* Sun Feb 19 2006 Roozbeh Pournader  - 0.8-0.10.rc6
+- Fix a typo in po2dtd that made po2moz fail
+
+* Tue Feb 14 2006 Roozbeh Pournader  - 0.8-0.9.rc6
+- Rebuild for Fedora Extras 5
+
+* Tue Feb 07 2006 Roozbeh Pournader  - 0.8-0.8.rc6
+- Require python-enchant for spellchecking support in pofilter
+
+* Sat Feb 04 2006 Roozbeh Pournader  - 0.8-0.7.rc6
+- Rebuild
+
+* Sat Feb 04 2006 Roozbeh Pournader  - 0.8-0.6.rc6
+- Update to 0.8rc6
+
+* Sat Jan 21 2006 Roozbeh Pournader  - 0.8-0.5.rc5
+- Use sed instead of dos2unix
+
+* Mon Jan 09 2006 Roozbeh Pournader  - 0.8-0.4.rc5
+- Own forgotten subdirectories
+
+* Mon Jan 09 2006 Roozbeh Pournader  - 0.8-0.3.rc5
+- Fix the jToolkit requirement
+
+* Sun Jan 08 2006 Roozbeh Pournader  - 0.8-0.2.rc5
+- Add %%{?dist} tag
+
+* Sat Jan 07 2006 Roozbeh Pournader  - 0.8-0.1.rc5
+- Initial packaging


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov  8 19:49:46 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 12:49:46 -0700
Subject: rpms/translate-toolkit/devel Makefile,1.2,1.3
Message-ID: <200611081949.kA8Jnkg1025604@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25588

Added Files:
	Makefile 
Log Message:
Add forgotten Makefile



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	8 Nov 2006 19:49:16 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: translate-toolkit
+# $Id$
+NAME := translate-toolkit
+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)



From fedora-extras-commits at redhat.com  Wed Nov  8 19:53:11 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 12:53:11 -0700
Subject: rpms/translate-toolkit/devel translate-toolkit.spec,1.9,1.10
Message-ID: <200611081953.kA8JrBWo025635@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/translate-toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25619

Modified Files:
	translate-toolkit.spec 
Log Message:
* Wed Nov 08 2006 Roozbeh Pournader  - 0.8-2
- Rebuild to get into Rawhide



Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/translate-toolkit/devel/translate-toolkit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- translate-toolkit.spec	8 Nov 2006 19:46:49 -0000	1.9
+++ translate-toolkit.spec	8 Nov 2006 19:52:41 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           translate-toolkit
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of tools to assist software localization
 
 Group:          Development/Tools
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Wed Nov 08 2006 Roozbeh Pournader  - 0.8-2
+- Rebuild to get into Rawhide
+
 * Mon Feb 20 2006 Roozbeh Pournader  - 0.8-1
 - Update to final 0.8
 



From fedora-extras-commits at redhat.com  Wed Nov  8 19:58:24 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 12:58:24 -0700
Subject: rpms/doulos-fonts/FC-6 doulos-fonts.spec,1.3,1.4
Message-ID: <200611081958.kA8JwOnQ025763@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/doulos-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25742

Modified Files:
	doulos-fonts.spec 
Log Message:
* Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-3
- Add dist tag



Index: doulos-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/FC-6/doulos-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- doulos-fonts.spec	8 Nov 2006 18:16:15 -0000	1.3
+++ doulos-fonts.spec	8 Nov 2006 19:57:53 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           doulos-fonts
 Version:        4.0.14
-Release:        2
+Release:        3%{?dist}
 Summary:        Doulos SIL fonts
 
 Group:          User Interface/X
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-3
+- Add dist tag
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-2
 - Rebuild to make package available in Rawhide again
 



From fedora-extras-commits at redhat.com  Wed Nov  8 19:59:06 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 12:59:06 -0700
Subject: rpms/doulos-fonts/devel doulos-fonts.spec,1.3,1.4
Message-ID: <200611081959.kA8Jx6T2025821@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/doulos-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25767

Modified Files:
	doulos-fonts.spec 
Log Message:
* Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-3
- Add dist tag



Index: doulos-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/doulos-fonts/devel/doulos-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- doulos-fonts.spec	8 Nov 2006 18:16:15 -0000	1.3
+++ doulos-fonts.spec	8 Nov 2006 19:58:36 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           doulos-fonts
 Version:        4.0.14
-Release:        2
+Release:        3%{?dist}
 Summary:        Doulos SIL fonts
 
 Group:          User Interface/X
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-3
+- Add dist tag
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 4.0.14-2
 - Rebuild to make package available in Rawhide again
 



From fedora-extras-commits at redhat.com  Wed Nov  8 20:06:04 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 13:06:04 -0700
Subject: rpms/fonttools/devel fonttools.spec,1.7,1.8
Message-ID: <200611082006.kA8K64Bu028933@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fonttools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28879

Modified Files:
	fonttools.spec 
Log Message:
* Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.8.20050624cvs
- De-ghost .pyo files



Index: fonttools.spec
===================================================================
RCS file: /cvs/extras/rpms/fonttools/devel/fonttools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fonttools.spec	8 Nov 2006 19:26:03 -0000	1.7
+++ fonttools.spec	8 Nov 2006 20:05:31 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           fonttools
 Version:        2.0
-Release:        0.7.%{alphatag}%{?dist}
+Release:        0.8.%{alphatag}%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
@@ -63,21 +63,24 @@
 %dir %{python_sitearch}/FontTools/fontTools/ttLib/tables
 %{python_sitearch}/FontTools/*.py
 %{python_sitearch}/FontTools/*.pyc
-%ghost %{python_sitearch}/FontTools/*.pyo
+%{python_sitearch}/FontTools/*.pyo
 %{python_sitearch}/FontTools/fontTools/*.py
 %{python_sitearch}/FontTools/fontTools/*.pyc
-%ghost %{python_sitearch}/FontTools/fontTools/*.pyo
+%{python_sitearch}/FontTools/fontTools/*.pyo
 %{python_sitearch}/FontTools/fontTools/*/*.py
 %{python_sitearch}/FontTools/fontTools/*/*.pyc
-%ghost %{python_sitearch}/FontTools/fontTools/*/*.pyo
+%{python_sitearch}/FontTools/fontTools/*/*.pyo
 %{python_sitearch}/FontTools/fontTools/*/*/*.py
 %{python_sitearch}/FontTools/fontTools/*/*/*.pyc
-%ghost %{python_sitearch}/FontTools/fontTools/*/*/*.pyo
+%{python_sitearch}/FontTools/fontTools/*/*/*.pyo
 %{python_sitearch}/FontTools/fontTools/misc/eexecOp.so
 %{_bindir}/ttx
 
 
 %changelog
+* Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.8.20050624cvs
+- De-ghost .pyo files
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.7.20050624cvs
 - Rebuild to get into Rawhide
 



From fedora-extras-commits at redhat.com  Wed Nov  8 20:09:56 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 13:09:56 -0700
Subject: owners owners.list,1.1905,1.1906
Message-ID: <200611082009.kA8K9uGG029144@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29106

Modified Files:
	owners.list 
Log Message:
re-orphan gtranslator and ttf2pt1: upstream silent



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1905
retrieving revision 1.1906
diff -u -r1.1905 -r1.1906
--- owners.list	8 Nov 2006 17:59:41 -0000	1.1905
+++ owners.list	8 Nov 2006 20:09:25 -0000	1.1906
@@ -640,7 +640,7 @@
 Fedora Extras|gtkterm|Serial port terminal|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
+Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|gts|GNU Triangulated Surface Library|ed at eh3.com|extras-qa at fedoraproject.org|rc040203 at freenet.de
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtypist|GNU typing tutor|zing at fastmail.fm|extras-qa at fedoraproject.org|
@@ -2270,7 +2270,7 @@
 Fedora Extras|tremulous|First Person Shooter game based on the Quake 3 engine|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|tremulous-data|Data files for tremulous the FPS game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
+Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|TurboGears|Back-to-front web development in Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov  8 20:13:10 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Wed, 8 Nov 2006 13:13:10 -0700
Subject: rpms/kadu/FC-6 kadu-0.5.0-tabs_patch.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 kadu.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200611082013.kA8KDAXb029276@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29253

Modified Files:
	.cvsignore kadu.spec sources 
Added Files:
	kadu-0.5.0-tabs_patch.patch 
Log Message:
* Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.16.rc1
- Update kadu to RC1
- Update ext_info module to 2.0beta9
- Update powerkadu module to 20061026
- Update xmms module to 1.32
- Update amarok module to 1.19
- Amarok builds on all architectures again
- Add tabs patch


kadu-0.5.0-tabs_patch.patch:

--- NEW FILE kadu-0.5.0-tabs_patch.patch ---
--- ./modules/tabs/tabs.cpp.tabs_patch	2006-11-08 19:59:47.000000000 +0100
+++ ./modules/tabs/tabs.cpp	2006-11-08 20:01:02.000000000 +0100
@@ -83,7 +83,7 @@
 
 	Action* action = new Action(
 		QPixmap(dataPath("kadu/modules/data/tabs/attach.png")),
-		tr("Attach this chat to tabs"), "tab_attach_action");
+		tr("Attach this chat to tabs"), "tab_attach_action", Action::TypeChat);
 
 	connect(action, SIGNAL(activated(const UserGroup*,const QWidget*,bool)),
 		this, SLOT(onTabAttach(const UserGroup*)));


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Sep 2006 10:14:41 -0000	1.6
+++ .cvsignore	8 Nov 2006 20:12:40 -0000	1.7
@@ -1 +1,6 @@
 kadu-20060915.tar.bz2
+powerkadu-20061026.tar.gz
+kadu-0.5.0-rc1.tar.bz2
+ext_info-2.0beta9.tar.bz2
+xmms-1.32.tar.gz
+amarok-1.19.tar.gz


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/kadu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kadu.spec	10 Oct 2006 16:12:24 -0000	1.12
+++ kadu.spec	8 Nov 2006 20:12:40 -0000	1.13
@@ -1,31 +1,31 @@
-%define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.15.%{cvs_date}svn%{?dist}
+Release:	0.16.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
 URL:		http://www.kadu.net
-Source0:	http://www.kadu.net/download/snapshots/2006/kadu-%{cvs_date}.tar.bz2
+Source0:	http://www.kadu.net/download/stable/kadu-0.5.0-rc1.tar.bz2
 Source3:	kadu.desktop
 # Sources 100-149 are external modules
-Source100:	http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz
-Source101:	http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.17.tar.gz
+Source100:	http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.32.tar.gz
+Source101:	http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.19.tar.gz
 Source102:	http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz
 Source103:	http://www.kadu.net/download/modules_mirror/mail-current.tar.gz
 Source104:	http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz
 Source105:	http://kadu.net/~blysk/weather-3.03.tar.bz2
-Source106:	http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta8.tar.bz2
+Source106:	http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta9.tar.bz2
 Source107:	http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
 Source108:	http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-1.3.5.tar.gz
 Source109:	http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz
 Source110:	http://kadu.net/~blysk/led_notify-0.9.tar.bz2
 Source111:	http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz
 Source112:	http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2
-Source113:	http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz
+Source113:	http://kadu.net/~patryk/powerkadu/powerkadu-20061026.tar.gz
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+Patch0:		kadu-0.5.0-tabs_patch.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel
@@ -237,6 +237,8 @@
 %setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
 %setup -q -D -T -n kadu
 
+%patch0 -p1 -b tabs_patch
+
 ##==some changes in .config file
 #1. compile something as shared...
 #	module_mail \
@@ -244,9 +246,7 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
-%ifnarch ppc64 x86_64 s390 s390x ia64
 	module_amarok \
-%endif
 	module_filedesc \
 	module_spellchecker \
 	module_weather \
@@ -408,10 +408,8 @@
 %mod_files2 xmms
 
 
-%ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
 
-%endif
 
 %mod_files2 filedesc
 
@@ -453,6 +451,15 @@
 %{_moddata}/data/weather
 
 %changelog
+* Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.16.rc1
+- Update kadu to RC1
+- Update ext_info module to 2.0beta9
+- Update powerkadu module to 20061026
+- Update xmms module to 1.32
+- Update amarok module to 1.19
+- Amarok builds on all architectures again
+- Add tabs patch
+
 * Tue Oct 10 2006 Micha?? Bentkowski  - 0.5.0-0.15.20060915svn
 - Another fix to not rebuilding kadu-amarok
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Sep 2006 10:14:41 -0000	1.6
+++ sources	8 Nov 2006 20:12:40 -0000	1.7
@@ -1,18 +1,18 @@
-575746c975382dc7a7d275175449cb21  kadu-20060915.tar.bz2
 62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
-0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
 15e6ba4e7ec1cacce3290525cd51e696  exec_notify-20060424.tar.bz2
-4a120b52760f1b4093001e043d852d03  ext_info-2.0beta8.tar.bz2
 d5e5718f3a64f33874a869b235bbdff7  filedesc-1.12.tar.gz
 e9d8676608f8c731f665ffc5c5288ad0  filtering-0.3.2-20060727-0.5.0.tar.bz2
 6233a8ef21d901fc5fb91c0db40d0e32  kadu-iwait4u-1.3.tar.gz
 739e2c76fdae17f570d1f4934958cae6  kadu-profiles-0.1.tar.gz
 3f9e347fd775324f4077f2f6849a0de7  led_notify-0.9.tar.bz2
 fae1f6bd3d4aca845ef5a57403b5b58c  miastoplusa_sms-0.5-1.3.5.tar.gz
-7148f9fbf312abd6a142339d453e1d90  powerkadu-20060719.tar.gz
 6bf19f183eb4e5ea48e2a27d04da2ead  spellchecker-0.18.tar.gz
 ef56085ab7d8e60be15d86d2c5f4a424  tabs-current.tar.gz
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
-422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz
+11436971c7c45bb4b70f3d6ed569f95c  powerkadu-20061026.tar.gz
+75e5ebd7d0952e5ac4d10ea87b8f3f60  kadu-0.5.0-rc1.tar.bz2
+69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
+e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
+139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 20:15:48 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Wed, 8 Nov 2006 13:15:48 -0700
Subject: rpms/fonttools/FC-6 fonttools.spec,1.7,1.8
Message-ID: <200611082015.kA8KFmPd029361@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fonttools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29336

Modified Files:
	fonttools.spec 
Log Message:
* Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.8.20050624cvs
- De-ghost .pyo files



Index: fonttools.spec
===================================================================
RCS file: /cvs/extras/rpms/fonttools/FC-6/fonttools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fonttools.spec	8 Nov 2006 19:26:03 -0000	1.7
+++ fonttools.spec	8 Nov 2006 20:15:18 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           fonttools
 Version:        2.0
-Release:        0.7.%{alphatag}%{?dist}
+Release:        0.8.%{alphatag}%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
@@ -63,21 +63,24 @@
 %dir %{python_sitearch}/FontTools/fontTools/ttLib/tables
 %{python_sitearch}/FontTools/*.py
 %{python_sitearch}/FontTools/*.pyc
-%ghost %{python_sitearch}/FontTools/*.pyo
+%{python_sitearch}/FontTools/*.pyo
 %{python_sitearch}/FontTools/fontTools/*.py
 %{python_sitearch}/FontTools/fontTools/*.pyc
-%ghost %{python_sitearch}/FontTools/fontTools/*.pyo
+%{python_sitearch}/FontTools/fontTools/*.pyo
 %{python_sitearch}/FontTools/fontTools/*/*.py
 %{python_sitearch}/FontTools/fontTools/*/*.pyc
-%ghost %{python_sitearch}/FontTools/fontTools/*/*.pyo
+%{python_sitearch}/FontTools/fontTools/*/*.pyo
 %{python_sitearch}/FontTools/fontTools/*/*/*.py
 %{python_sitearch}/FontTools/fontTools/*/*/*.pyc
-%ghost %{python_sitearch}/FontTools/fontTools/*/*/*.pyo
+%{python_sitearch}/FontTools/fontTools/*/*/*.pyo
 %{python_sitearch}/FontTools/fontTools/misc/eexecOp.so
 %{_bindir}/ttx
 
 
 %changelog
+* Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.8.20050624cvs
+- De-ghost .pyo files
+
 * Wed Nov 08 2006 Roozbeh Pournader  - 2.0-0.7.20050624cvs
 - Rebuild to get into Rawhide
 



From fedora-extras-commits at redhat.com  Wed Nov  8 20:22:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed,  8 Nov 2006 13:22:11 -0700
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.14,1.15
Message-ID: <200611082022.kA8KMB46029428@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29410

Modified Files:
	Config_Extras.py 
Log Message:
a few useful comps.xml config values


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Config_Extras.py	6 Nov 2006 19:34:19 -0000	1.14
+++ Config_Extras.py	8 Nov 2006 20:22:08 -0000	1.15
@@ -74,6 +74,15 @@
 # repository symlinks to remove/create since they confuse createrepo
 repobuild_linkdict = {}
 
+# comps.xml updating and installation
+comps_up_pass1 = 'LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras update'
+comps_up_pass2 = 'make'
+comps_dangerousfiles = ['Makefile','update-comps','po/Makefile']
+comps_map = { 'development' : 'comps-fe7.xml',
+              '6' : 'comps-fe6.xml',
+              '5' : 'comps-fe5.xml',
+              }
+
 diversion_dict = { 'mugshot' : stagesdir+'/fedora-extras'+'/mugshot',
                    }
 



From fedora-extras-commits at redhat.com  Wed Nov  8 20:23:59 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed,  8 Nov 2006 13:23:59 -0700
Subject: extras-buildsys/utils/pushscript Comps.py,NONE,1.1
Message-ID: <200611082023.kA8KNx2T029456@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29439

Added Files:
	Comps.py 
Log Message:
add Comps.py module


--- NEW FILE Comps.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 errno, os, sys
import commands, shutil, tempfile

import Utils

def _fingerprint(filename):
    """return MD5 fingerprint of a file"""
    import md5
    m = md5.new()

    if os.path.isfile(filename):
        f = open(filename,'r')
        data = f.read()
        f.close()
        m.update(data)
    return m.hexdigest()


class CompsUpdater:

    def __init__(self,cfg):
        self.tmpdir = None
        self.cfg = cfg


    def _cleanup(self):
        if self.tmpdir:
            shutil.rmtree(self.tmpdir)
            self.tmpdir = None

    
    def _backup(self):
        # Back up some security relevant files of the working-copy.
        # throws: OSError, IOError
        self.tmpdir = tempfile.mkdtemp('','.tmp',os.getcwd())
        for sourcefile in self.cfg.comps_dangerousfiles:
            targetfile = os.path.join(self.tmpdir,sourcefile.replace('/','___'))
            if os.path.exists(sourcefile):
                shutil.copy2(sourcefile,targetfile)


    def _restoreBackup(self):
        # Restore backups.
        # throws: IOError
        for f in os.listdir(self.tmpdir):
            sourcefile = os.path.join(self.tmpdir,f)
            targetfile = f.replace('___','/')
            Utils.install_copy(sourcefile,targetfile,True)
    

    def Update(self):
        self.workdir = os.path.join(cfg.rundir,'comps')
        if not os.path.exists(self.workdir):
            print 'WARNING: %s missing! Manual setup needed.' % self.workdir
            return

        self.olddir= os.getcwd()
        try:
            os.chdir(self.workdir)
            self._backup()
            if self._update(self.cfg.comps_up_pass1):
                self._restoreBackup()
                if self._update(self.cfg.comps_up_pass2):
                    for dist in self.cfg.alldists:
                        self._install(dist)
        except IOError:
            os.chdir(self.olddir)
            self._cleanup()
        except OSError:
            os.chdir(self.olddir)
            self._cleanup()
        except KeyboardInterrupt:
            os.chdir(self.olddir)
            self._cleanup()
            raise
        os.chdir(self.olddir)
        self._cleanup()


    def _update(self,cmd):
        # Update working-copy.
        if cmd:
            (rc, rv) = commands.getstatusoutput(cmd)
            print rv
            if rc:
                print 'WARNING: comps update failed: %s' % cmd
                return False
        return True


    def _install(self,dist):
        # If a new comps file for this dist exists, make sure it's
        # well-formed. Else delete it and return.
        # throws: IOError, OSError
        compsnew = self.cfg.comps_map.get(dist,None)
        if not compsnew or not os.path.exists(compsnew):
            return
        compsvalid = 'comps.xml.valid'
        command = 'xmllint %s --output %s' % (compsnew,compsvalid)
        (rc, rv) = commands.getstatusoutput(command)
        if rc:
            print 'WARNING: malformed %s' % compsnew
            if os.path.exists(compsnew):
                os.remove(compsnew)
            return
        
        # Install new comps file only if fingerprint differs.
        # First repo gets a new copy, further repos a hardlink.
        oldfingerprint = None
        newfingerprint = _fingerprint(compsvalid)
        reporoot = os.path.join(self.cfg.treedir,dist)
        linkloc = None
        for arch in self.cfg.archdict[dist]:  # list of repo archs
            compstarget = os.path.join(reporoot,arch,'comps.xml')
            if not oldfingerprint:
                oldfingerprint = _fingerprint(compstarget)
            if os.path.exists(compstarget) and (oldfingerprint == newfingerprint):
                # This copy of comps.xml is the same, don't overwrite it,
                # but use it as link source.
                linkloc = compstarget
                return
            print '  Updating %s' % compstarget
            if os.path.exists(compstarget):
                os.remove(compstarget)
            if linkloc:
                Utils.install_link_or_copy(linkloc,compstarget)
            else:
                Utils.install_copy(compsvalid,compstarget)
                linkloc = compstarget
                os.remove(compsvalid)


def main(cfg):
    c = CompsUpdater(cfg)
    c.Update()
    

if __name__ == '__main__':
    if len(sys.argv) < 2:
        print 'Usage: %s \n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)

    cfg = Utils.load_config_module(sys.argv[1])

    Utils.signer_gid_check(cfg.signersgid)
    os.umask(cfg.signersumask)

    main(cfg)
    sys.exit(0)



From fedora-extras-commits at redhat.com  Wed Nov  8 20:37:08 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Wed, 8 Nov 2006 13:37:08 -0700
Subject: rpms/kadu/devel kadu-0.5.0-tabs_patch.patch, NONE, 1.1 kadu.spec,
	1.16, 1.17 sources, 1.8, 1.9
Message-ID: <200611082037.kA8Kb8pf029576@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29534

Modified Files:
	kadu.spec sources 
Added Files:
	kadu-0.5.0-tabs_patch.patch 
Log Message:
* Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.19.rc1
- Update kadu to RC1
- Update ext_info module to 2.0beta9
- Update powerkadu module to 20061026
- Update xmms module to 1.32
- Update amarok module to 1.19
- Amarok builds on all architectures again
- Add tabs patch


kadu-0.5.0-tabs_patch.patch:

--- NEW FILE kadu-0.5.0-tabs_patch.patch ---
--- ./modules/tabs/tabs.cpp.tabs_patch	2006-11-08 19:59:47.000000000 +0100
+++ ./modules/tabs/tabs.cpp	2006-11-08 20:01:02.000000000 +0100
@@ -83,7 +83,7 @@
 
 	Action* action = new Action(
 		QPixmap(dataPath("kadu/modules/data/tabs/attach.png")),
-		tr("Attach this chat to tabs"), "tab_attach_action");
+		tr("Attach this chat to tabs"), "tab_attach_action", Action::TypeChat);
 
 	connect(action, SIGNAL(activated(const UserGroup*,const QWidget*,bool)),
 		this, SLOT(onTabAttach(const UserGroup*)));


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kadu.spec	2 Nov 2006 17:49:55 -0000	1.16
+++ kadu.spec	8 Nov 2006 20:36:38 -0000	1.17
@@ -1,32 +1,32 @@
-%define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.18.%{cvs_date}svn%{?dist}
+Release:	0.19.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
 URL:		http://www.kadu.net
-Source0:	http://www.kadu.net/download/snapshots/2006/kadu-%{cvs_date}.tar.bz2
+Source0:	http://www.kadu.net/download/stable/kadu-0.5.0-rc1.tar.bz2
 Source3:	kadu.desktop
 # Sources 100-149 are external modules
-Source100:	http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz
-Source101:	http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.17.tar.gz
+Source100:	http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.32.tar.gz
+Source101:	http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.19.tar.gz
 Source102:	http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz
 Source103:	http://www.kadu.net/download/modules_mirror/mail-current.tar.gz
 Source104:	http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz
 Source105:	http://kadu.net/~blysk/weather-3.03.tar.bz2
-Source106:	http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta8.tar.bz2
+Source106:	http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta9.tar.bz2
 Source107:	http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
 Source108:	http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-1.3.5.tar.gz
 Source109:	http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz
 Source110:	http://kadu.net/~blysk/led_notify-0.9.tar.bz2
 Source111:	http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz
 Source112:	http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2
-Source113:	http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz
+Source113:	http://www.kadu.net/~patryk/powerkadu/powerkadu-20061026.tar.gz
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
 
+Patch0:		kadu-0.5.0-tabs_patch.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel
 %define		_kadudir	%{_datadir}/kadu
@@ -237,6 +237,8 @@
 %setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
 %setup -q -D -T -n kadu
 
+%patch0 -p1 -b tabs_patch
+
 ##==some changes in .config file
 #1. compile something as shared...
 #	module_mail \
@@ -244,9 +246,7 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
-%ifnarch ppc64 x86_64 s390 s390x ia64 ppc
 	module_amarok \
-%endif
 	module_filedesc \
 	module_spellchecker \
 	module_weather \
@@ -408,10 +408,8 @@
 %mod_files2 xmms
 
 
-%ifnarch ppc64 x86_64 s390 s390x ia64 ppc
 %mod_files2 amarok
 
-%endif
 
 %mod_files2 filedesc
 
@@ -453,6 +451,15 @@
 %{_moddata}/data/weather
 
 %changelog
+* Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.19.rc1
+- Update kadu to RC1
+- Update ext_info module to 2.0beta9
+- Update powerkadu module to 20061026
+- Update xmms module to 1.32
+- Update amarok module to 1.19
+- Amarok builds on all architectures again
+- Add tabs patch
+
 * Thu Nov 02 2006 Micha?? Bentkowski  - 0.5.0-0.18.20060915svn
 - Come back to 20060915
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Nov 2006 17:49:55 -0000	1.8
+++ sources	8 Nov 2006 20:36:38 -0000	1.9
@@ -1,18 +1,19 @@
-575746c975382dc7a7d275175449cb21  kadu-20060915.tar.bz2
 62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
-0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
 15e6ba4e7ec1cacce3290525cd51e696  exec_notify-20060424.tar.bz2
-4a120b52760f1b4093001e043d852d03  ext_info-2.0beta8.tar.bz2
 d5e5718f3a64f33874a869b235bbdff7  filedesc-1.12.tar.gz
 e9d8676608f8c731f665ffc5c5288ad0  filtering-0.3.2-20060727-0.5.0.tar.bz2
 6233a8ef21d901fc5fb91c0db40d0e32  kadu-iwait4u-1.3.tar.gz
 739e2c76fdae17f570d1f4934958cae6  kadu-profiles-0.1.tar.gz
 3f9e347fd775324f4077f2f6849a0de7  led_notify-0.9.tar.bz2
 fae1f6bd3d4aca845ef5a57403b5b58c  miastoplusa_sms-0.5-1.3.5.tar.gz
-7148f9fbf312abd6a142339d453e1d90  powerkadu-20060719.tar.gz
 6bf19f183eb4e5ea48e2a27d04da2ead  spellchecker-0.18.tar.gz
 ef56085ab7d8e60be15d86d2c5f4a424  tabs-current.tar.gz
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
-422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz
+11436971c7c45bb4b70f3d6ed569f95c  powerkadu-20061026.tar.gz
+75e5ebd7d0952e5ac4d10ea87b8f3f60  kadu-0.5.0-rc1.tar.bz2
+69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
+e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
+139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
+



From fedora-extras-commits at redhat.com  Wed Nov  8 20:41:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed,  8 Nov 2006 13:41:15 -0700
Subject: fedora-security/audit fe3, 1.27, 1.28 fe4, 1.90, 1.91 fe5, 1.97,
	1.98 fe6, 1.10, 1.11
Message-ID: <200611082041.kA8KfFJ8029754@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29730

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-480[6-9] ** (imlib2) #214676


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fe3	2 Nov 2006 19:23:23 -0000	1.27
+++ fe3	8 Nov 2006 20:41:12 -0000	1.28
@@ -7,6 +7,10 @@
 CVE-2006-5295 version (clamav, fixed 0.88.5) #210973
 CVE-2006-5111 version (libksba, fixed 0.9.14)
 CVE-2006-4976 ** (php-adodb) #208299
+CVE-2006-4809 ** (imlib2) #214676
+CVE-2006-4808 ** (imlib2) #214676
+CVE-2006-4807 ** (imlib2) #214676
+CVE-2006-4806 ** (imlib2) #214676
 CVE-2006-4513 VULNERABLE (wv) #212696
 CVE-2006-4513 ** (abiword) #212698
 CVE-2006-4248 ignore (thttpd, Debian specific issue)


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- fe4	4 Nov 2006 09:37:43 -0000	1.90
+++ fe4	8 Nov 2006 20:41:12 -0000	1.91
@@ -21,6 +21,10 @@
 CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4809 ** (imlib2) #214676
+CVE-2006-4808 ** (imlib2) #214676
+CVE-2006-4807 ** (imlib2) #214676
+CVE-2006-4806 ** (imlib2) #214676
 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- fe5	4 Nov 2006 09:37:43 -0000	1.97
+++ fe5	8 Nov 2006 20:41:12 -0000	1.98
@@ -21,6 +21,10 @@
 CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4809 ** (imlib2) #214676
+CVE-2006-4808 ** (imlib2) #214676
+CVE-2006-4807 ** (imlib2) #214676
+CVE-2006-4806 ** (imlib2) #214676
 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fe6	4 Nov 2006 09:37:43 -0000	1.10
+++ fe6	8 Nov 2006 20:41:12 -0000	1.11
@@ -21,6 +21,10 @@
 CVE-2006-4937 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4936 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4935 version (moodle, fixed 1.6.3) #206516
+CVE-2006-4809 ** (imlib2) #214676
+CVE-2006-4808 ** (imlib2) #214676
+CVE-2006-4807 ** (imlib2) #214676
+CVE-2006-4806 ** (imlib2) #214676
 CVE-2006-4786 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4785 version (moodle, fixed 1.6.3) #206516
 CVE-2006-4784 version (moodle, fixed 1.6.3) #206516



From fedora-extras-commits at redhat.com  Wed Nov  8 20:44:25 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Wed, 8 Nov 2006 13:44:25 -0700
Subject: rpms/kadu/FC-5 kadu-0.5.0-tabs_patch.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 kadu.spec, 1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200611082044.kA8KiPhQ029800@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29777

Modified Files:
	.cvsignore kadu.spec sources 
Added Files:
	kadu-0.5.0-tabs_patch.patch 
Log Message:
* Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.10.rc1
- Update kadu to RC1
- Update ext_info module to 2.0beta9
- Update powerkadu module to 20061026
- Update xmms module to 1.32
- Update amarok module to 1.19
- Amarok builds on all architectures again
- Add tabs patch


kadu-0.5.0-tabs_patch.patch:

--- NEW FILE kadu-0.5.0-tabs_patch.patch ---
--- ./modules/tabs/tabs.cpp.tabs_patch	2006-11-08 19:59:47.000000000 +0100
+++ ./modules/tabs/tabs.cpp	2006-11-08 20:01:02.000000000 +0100
@@ -83,7 +83,7 @@
 
 	Action* action = new Action(
 		QPixmap(dataPath("kadu/modules/data/tabs/attach.png")),
-		tr("Attach this chat to tabs"), "tab_attach_action");
+		tr("Attach this chat to tabs"), "tab_attach_action", Action::TypeChat);
 
 	connect(action, SIGNAL(activated(const UserGroup*,const QWidget*,bool)),
 		this, SLOT(onTabAttach(const UserGroup*)));


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Sep 2006 10:20:48 -0000	1.6
+++ .cvsignore	8 Nov 2006 20:43:55 -0000	1.7
@@ -1 +1 @@
-kadu-20060915.tar.bz2
+kadu-20061029.tar.bz2


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kadu.spec	10 Oct 2006 17:01:31 -0000	1.6
+++ kadu.spec	8 Nov 2006 20:43:55 -0000	1.7
@@ -1,31 +1,31 @@
-%define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.9.%{cvs_date}svn%{?dist}
+Release:	0.10.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
 URL:		http://www.kadu.net
-Source0:	http://www.kadu.net/download/snapshots/2006/kadu-%{cvs_date}.tar.bz2
+Source0:	http://www.kadu.net/download/stable/kadu-0.5.0-rc1.tar.bz2
 Source3:	kadu.desktop
 # Sources 100-149 are external modules
-Source100:	http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz
-Source101:	http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.17.tar.gz
+Source100:	http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.32.tar.gz
+Source101:	http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.19.tar.gz
 Source102:	http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz
 Source103:	http://www.kadu.net/download/modules_mirror/mail-current.tar.gz
 Source104:	http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz
 Source105:	http://kadu.net/~blysk/weather-3.03.tar.bz2
-Source106:	http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta8.tar.bz2
+Source106:	http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta9.tar.bz2
 Source107:	http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
 Source108:	http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-1.3.5.tar.gz
 Source109:	http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz
 Source110:	http://kadu.net/~blysk/led_notify-0.9.tar.bz2
 Source111:	http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz
 Source112:	http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2
-Source113:	http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz
+Source113:	http://kadu.net/~patryk/powerkadu/powerkadu-20061026.tar.gz
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+Patch0:		kadu-0.5.0-tabs_patch.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel
@@ -237,6 +237,8 @@
 %setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
 %setup -q -D -T -n kadu
 
+%patch0 -p1 -b tabs_patch
+
 ##==some changes in .config file
 #1. compile something as shared...
 #	module_mail \
@@ -244,9 +246,7 @@
 	module_arts_sound \
 	module_esd_sound \
 	module_xmms \
-%ifnarch ppc64 x86_64 s390 s390x ia64
 	module_amarok \
-%endif
 	module_filedesc \
 	module_spellchecker \
 	module_weather \
@@ -408,10 +408,8 @@
 
 %mod_files2 xmms
 
-%ifnarch ppc64 x86_64 s390 s390x ia64
 %mod_files2 amarok
 
-%endif
 
 %mod_files2 filedesc
 
@@ -453,6 +451,15 @@
 %{_moddata}/data/weather
 
 %changelog
+* Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.10.rc1
+- Update kadu to RC1
+- Update ext_info module to 2.0beta9
+- Update powerkadu module to 20061026
+- Update xmms module to 1.32
+- Update amarok module to 1.19
+- Amarok builds on all architectures again
+- Add tabs patch
+
 * Tue Oct 10 2006 Micha?? Bentkowski  - 0.5.0-0.9.20060915svn
 - Not rebuilding kadu-amarok on some archs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Sep 2006 10:20:48 -0000	1.6
+++ sources	8 Nov 2006 20:43:55 -0000	1.7
@@ -1,4 +1,3 @@
-575746c975382dc7a7d275175449cb21  kadu-20060915.tar.bz2
 62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
 0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
@@ -16,3 +15,4 @@
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
 422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz
+203d4b6a041f39703a9b5d259a259c38  kadu-20061029.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov  8 20:53:09 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Wed, 8 Nov 2006 13:53:09 -0700
Subject: rpms/kadu/FC-5 kadu.spec,1.7,1.8 sources,1.7,1.8
Message-ID: <200611082053.kA8Kr9FK029893@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29875

Modified Files:
	kadu.spec sources 
Log Message:
* Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.11.rc1
- Fixed sources file



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kadu.spec	8 Nov 2006 20:43:55 -0000	1.7
+++ kadu.spec	8 Nov 2006 20:52:39 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		kadu
 Version:	0.5.0
-Release:	0.10.rc1%{?dist}
+Release:	0.11.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -451,6 +451,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.11.rc1
+- Fixed sources file
+
 * Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.10.rc1
 - Update kadu to RC1
 - Update ext_info module to 2.0beta9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Nov 2006 20:43:55 -0000	1.7
+++ sources	8 Nov 2006 20:52:39 -0000	1.8
@@ -1,18 +1,19 @@
 62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
-0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
 15e6ba4e7ec1cacce3290525cd51e696  exec_notify-20060424.tar.bz2
-4a120b52760f1b4093001e043d852d03  ext_info-2.0beta8.tar.bz2
 d5e5718f3a64f33874a869b235bbdff7  filedesc-1.12.tar.gz
 e9d8676608f8c731f665ffc5c5288ad0  filtering-0.3.2-20060727-0.5.0.tar.bz2
 6233a8ef21d901fc5fb91c0db40d0e32  kadu-iwait4u-1.3.tar.gz
 739e2c76fdae17f570d1f4934958cae6  kadu-profiles-0.1.tar.gz
 3f9e347fd775324f4077f2f6849a0de7  led_notify-0.9.tar.bz2
 fae1f6bd3d4aca845ef5a57403b5b58c  miastoplusa_sms-0.5-1.3.5.tar.gz
-7148f9fbf312abd6a142339d453e1d90  powerkadu-20060719.tar.gz
 6bf19f183eb4e5ea48e2a27d04da2ead  spellchecker-0.18.tar.gz
 ef56085ab7d8e60be15d86d2c5f4a424  tabs-current.tar.gz
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
-422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz
-203d4b6a041f39703a9b5d259a259c38  kadu-20061029.tar.bz2
+11436971c7c45bb4b70f3d6ed569f95c  powerkadu-20061026.tar.gz
+75e5ebd7d0952e5ac4d10ea87b8f3f60  kadu-0.5.0-rc1.tar.bz2
+69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
+e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
+139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
+



From fedora-extras-commits at redhat.com  Wed Nov  8 22:09:34 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 8 Nov 2006 15:09:34 -0700
Subject: rpms/mimedefang/devel .cvsignore, 1.2, 1.3 README.FEDORA, 1.1,
	1.2 mimedefang.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611082209.kA8M9YsI003876@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3854

Modified Files:
	.cvsignore README.FEDORA mimedefang.spec sources 
Log Message:
Upgrade to 2.58 and fixed quoting in example file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2006 17:19:57 -0000	1.2
+++ .cvsignore	8 Nov 2006 22:09:04 -0000	1.3
@@ -1 +1 @@
-mimedefang-2.57.tar.gz
+mimedefang-2.58.tar.gz


Index: README.FEDORA
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/README.FEDORA,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.FEDORA	16 Sep 2006 17:19:57 -0000	1.1
+++ README.FEDORA	8 Nov 2006 22:09:04 -0000	1.2
@@ -7,7 +7,7 @@
 example the following lines to your /etc/mail/sendmail.mc file:
 
   define(`MILTER', `1')dnl
-  define(`confMILTER_LOG_LEVEL', 6)dnl
+  define(`confMILTER_LOG_LEVEL', `6')dnl
   INPUT_MAIL_FILTER(`mimedefang', `S=unix:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=S:1m;R:1m;E:5m')dnl
 
 Use "service sendmail restart" to rebuild your /etc/mail/sendmail.cf file, run


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/mimedefang.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mimedefang.spec	3 Oct 2006 19:23:37 -0000	1.2
+++ mimedefang.spec	8 Nov 2006 22:09:04 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.57
-Release:           5%{?dist}
+Version:           2.58
+Release:           1%{?dist}
 License:           GPL
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -86,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Wed Nov 08 2006 Robert Scheck  2.58-1
+- Upgrade to 2.58 (#212657)
+
 * Tue Oct 03 2006 Robert Scheck  2.57-5
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2006 17:19:57 -0000	1.2
+++ sources	8 Nov 2006 22:09:04 -0000	1.3
@@ -1 +1 @@
-e55b22dda54c4a3b52e1fbeb9135b0cf  mimedefang-2.57.tar.gz
+6424dd840f1a8251181bffb042e01961  mimedefang-2.58.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 22:10:55 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 8 Nov 2006 15:10:55 -0700
Subject: rpms/mimedefang/FC-6 .cvsignore, 1.2, 1.3 README.FEDORA, 1.1,
	1.2 mimedefang.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611082210.kA8MAtKS003919@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3891

Modified Files:
	.cvsignore README.FEDORA mimedefang.spec sources 
Log Message:
Upgrade to 2.58 and fixed quoting in example file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2006 17:19:57 -0000	1.2
+++ .cvsignore	8 Nov 2006 22:10:24 -0000	1.3
@@ -1 +1 @@
-mimedefang-2.57.tar.gz
+mimedefang-2.58.tar.gz


Index: README.FEDORA
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-6/README.FEDORA,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.FEDORA	16 Sep 2006 17:19:57 -0000	1.1
+++ README.FEDORA	8 Nov 2006 22:10:24 -0000	1.2
@@ -7,7 +7,7 @@
 example the following lines to your /etc/mail/sendmail.mc file:
 
   define(`MILTER', `1')dnl
-  define(`confMILTER_LOG_LEVEL', 6)dnl
+  define(`confMILTER_LOG_LEVEL', `6')dnl
   INPUT_MAIL_FILTER(`mimedefang', `S=unix:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=S:1m;R:1m;E:5m')dnl
 
 Use "service sendmail restart" to rebuild your /etc/mail/sendmail.cf file, run


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-6/mimedefang.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mimedefang.spec	3 Oct 2006 19:23:37 -0000	1.2
+++ mimedefang.spec	8 Nov 2006 22:10:24 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.57
-Release:           5%{?dist}
+Version:           2.58
+Release:           1%{?dist}
 License:           GPL
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -86,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Wed Nov 08 2006 Robert Scheck  2.58-1
+- Upgrade to 2.58 (#212657)
+
 * Tue Oct 03 2006 Robert Scheck  2.57-5
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2006 17:19:57 -0000	1.2
+++ sources	8 Nov 2006 22:10:24 -0000	1.3
@@ -1 +1 @@
-e55b22dda54c4a3b52e1fbeb9135b0cf  mimedefang-2.57.tar.gz
+6424dd840f1a8251181bffb042e01961  mimedefang-2.58.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 22:11:53 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Wed, 8 Nov 2006 15:11:53 -0700
Subject: rpms/mimedefang/FC-5 .cvsignore, 1.2, 1.3 README.FEDORA, 1.1,
	1.2 mimedefang.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611082211.kA8MBr9O003952@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/mimedefang/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3930

Modified Files:
	.cvsignore README.FEDORA mimedefang.spec sources 
Log Message:
Upgrade to 2.58 and fixed quoting in example file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2006 17:19:57 -0000	1.2
+++ .cvsignore	8 Nov 2006 22:11:22 -0000	1.3
@@ -1 +1 @@
-mimedefang-2.57.tar.gz
+mimedefang-2.58.tar.gz


Index: README.FEDORA
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-5/README.FEDORA,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.FEDORA	16 Sep 2006 17:19:57 -0000	1.1
+++ README.FEDORA	8 Nov 2006 22:11:22 -0000	1.2
@@ -7,7 +7,7 @@
 example the following lines to your /etc/mail/sendmail.mc file:
 
   define(`MILTER', `1')dnl
-  define(`confMILTER_LOG_LEVEL', 6)dnl
+  define(`confMILTER_LOG_LEVEL', `6')dnl
   INPUT_MAIL_FILTER(`mimedefang', `S=unix:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=S:1m;R:1m;E:5m')dnl
 
 Use "service sendmail restart" to rebuild your /etc/mail/sendmail.cf file, run


Index: mimedefang.spec
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-5/mimedefang.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mimedefang.spec	3 Oct 2006 19:24:15 -0000	1.2
+++ mimedefang.spec	8 Nov 2006 22:11:22 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:           E-Mail filtering framework using Sendmail's Milter interface
 Name:              mimedefang
-Version:           2.57
-Release:           5%{?dist}
+Version:           2.58
+Release:           1%{?dist}
 License:           GPL
 Group:             System Environment/Daemons
 URL:               http://www.mimedefang.org/
@@ -86,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
 %changelog
+* Wed Nov 08 2006 Robert Scheck  2.58-1
+- Upgrade to 2.58 (#212657)
+
 * Tue Oct 03 2006 Robert Scheck  2.57-5
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimedefang/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2006 17:19:57 -0000	1.2
+++ sources	8 Nov 2006 22:11:22 -0000	1.3
@@ -1 +1 @@
-e55b22dda54c4a3b52e1fbeb9135b0cf  mimedefang-2.57.tar.gz
+6424dd840f1a8251181bffb042e01961  mimedefang-2.58.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov  8 22:19:01 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Wed, 8 Nov 2006 15:19:01 -0700
Subject: owners owners.list,1.1906,1.1907
Message-ID: <200611082219.kA8MJ1xg004219@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4194

Modified Files:
	owners.list 
Log Message:
Taking over spicctrl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1906
retrieving revision 1.1907
diff -u -r1.1906 -r1.1907
--- owners.list	8 Nov 2006 20:09:25 -0000	1.1906
+++ owners.list	8 Nov 2006 22:18:31 -0000	1.1907
@@ -2130,7 +2130,7 @@
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|spandsp|A DSP library for telephony|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|sparse|A semantic parser of source files|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
-Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Sprog|A graphical tool to build programs by plugging parts together|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|imlinux at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net



From fedora-extras-commits at redhat.com  Wed Nov  8 23:38:41 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Wed, 8 Nov 2006 16:38:41 -0700
Subject: rpms/bugzilla/FC-5 bugzilla-bz212355-fixvuln.patch, NONE,
	1.1 bugzilla.spec, 1.2, 1.3
Message-ID: <200611082338.kA8NcfDV007862@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/bugzilla/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7843

Modified Files:
	bugzilla.spec 
Added Files:
	bugzilla-bz212355-fixvuln.patch 
Log Message:
Fixes for bz # 212355 - multiple vulnerabilities


bugzilla-bz212355-fixvuln.patch:

--- NEW FILE bugzilla-bz212355-fixvuln.patch ---
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/attachment.cgi bugzilla-2.22.1/attachment.cgi
--- bugzilla-2.22/attachment.cgi	2006-04-09 11:28:49.000000000 -0700
+++ bugzilla-2.22.1/attachment.cgi	2006-10-14 14:07:19.000000000 -0700
@@ -130,6 +130,7 @@
 sub validateID
 {
     my $param = @_ ? $_[0] : 'id';
+    my $user = Bugzilla->user;
 
     # If we're not doing interdiffs, check if id wasn't specified and
     # prompt them with a page that allows them to choose an attachment.
@@ -151,18 +152,18 @@
      || ThrowUserError("invalid_attach_id", { attach_id => $cgi->param($param) });
   
     # Make sure the attachment exists in the database.
-    SendSQL("SELECT bug_id, isprivate FROM attachments WHERE attach_id = $attach_id");
+    SendSQL("SELECT bug_id, isprivate, submitter_id
+             FROM attachments WHERE attach_id = $attach_id");
     MoreSQLData()
       || ThrowUserError("invalid_attach_id", { attach_id => $attach_id });
 
     # Make sure the user is authorized to access this attachment's bug.
-    (my $bugid, my $isprivate) = FetchSQLData();
+    my ($bugid, $isprivate, $submitter_id) = FetchSQLData();
 
     ValidateBugID($bugid);
-    if ($isprivate && Param("insidergroup")) {
-        UserInGroup(Param("insidergroup"))
-          || ThrowUserError("auth_failure", {action => "access",
-                                             object => "attachment"});
+    if ($isprivate && $user->id != $submitter_id && !$user->is_insider) {
+        ThrowUserError("auth_failure", {action => "access",
+                                        object => "attachment"});
     }
 
     return ($attach_id,$bugid);
@@ -199,17 +200,23 @@
 sub validateCanEdit
 {
     my ($attach_id) = (@_);
+    my $user = Bugzilla->user;
 
-    # People in editbugs can edit all attachments
-    return if UserInGroup("editbugs");
+    my $attachment = Bugzilla::Attachment->get($attach_id);
 
     # Bug 97729 - the submitter can edit their attachments
-    SendSQL("SELECT attach_id FROM attachments WHERE " .
-            "attach_id = $attach_id AND submitter_id = " . Bugzilla->user->id);
+    return if ($attachment->attacher->id == $user->id);
 
-    FetchSQLData()
-      || ThrowUserError("illegal_attachment_edit",
-                        { attach_id => $attach_id });
+    # Only people in the insider group can view private attachments.
+    if ($attachment->isprivate && !$user->is_insider) {
+        ThrowUserError('illegal_attachment_edit', {attach_id => $attachment->id});
+    }
+
+    # People in editbugs can edit all attachments
+    return if UserInGroup("editbugs");
+
+    # If we come here, then this attachment cannot be seen by the user.
+    ThrowUserError('illegal_attachment_edit', { attach_id => $attachment->id });
 }
 
 sub validateCanChangeAttachment 
@@ -393,7 +400,8 @@
   my @obsolete_ids = ();
 
   # Make sure the attachment id is valid and the user has permissions to view
-  # the bug to which it is attached.
+  # the bug to which it is attached. Make sure also that the user can view
+  # the attachment itself.
   foreach my $attachid ($cgi->param('obsolete')) {
     my $vars = {};
     $vars->{'attach_id'} = $attachid;
@@ -410,6 +418,9 @@
 
     my ($bugid, $isobsolete, $description) = FetchSQLData();
 
+    # Check that the user can modify this attachment
+    validateCanEdit($attachid);
+
     $vars->{'description'} = $description;
     
     if ($bugid != $cgi->param('bugid'))
@@ -424,8 +435,6 @@
       ThrowCodeError("attachment_already_obsolete", $vars);
     }
 
-    # Check that the user can modify this attachment
-    validateCanEdit($attachid);
     push(@obsolete_ids, $attachid);
   }
 
@@ -759,28 +768,35 @@
   }
   else
   {
-    $vars->{other_patches} = [];
+    my @other_patches = ();
     if ($::interdiffbin && $::diffpath) {
-      # Get list of attachments on this bug.
+      # Get the list of attachments that the user can view in this bug.
+      my @attachments = @{Bugzilla::Attachment->get_attachments_by_bug($bugid)};
+      # Extract patches only.
+      @attachments = grep {$_->ispatch == 1} @attachments;
+      # We want them sorted from newer to older.
+      @attachments = sort { $b->id <=> $a->id } @attachments;
+
       # Ignore the current patch, but select the one right before it
       # chronologically.
-      SendSQL("SELECT attach_id, description FROM attachments WHERE bug_id = $bugid AND ispatch = 1 ORDER BY creation_ts DESC");
       my $select_next_patch = 0;
-      while (my ($other_id, $other_desc) = FetchSQLData()) {
-        if ($other_id eq $attach_id) {
-          $select_next_patch = 1;
-        } else {
-          push @{$vars->{other_patches}}, { id => $other_id, desc => $other_desc, selected => $select_next_patch };
-          if ($select_next_patch) {
-            $select_next_patch = 0;
+      foreach my $attach (@attachments) {
+          if ($attach->id == $attach_id) {
+              $select_next_patch = 1;
+          }
+          else {
+              push(@other_patches, { 'id'       => $attach->id,
+                                     'desc'     => $attach->description,
+                                     'selected' => $select_next_patch });
+              $select_next_patch = 0;
           }
-        }
       }
     }
 
     $vars->{bugid} = $bugid;
     $vars->{attachid} = $attach_id;
     $vars->{description} = $description;
+    $vars->{other_patches} = \@other_patches;
     setup_template_patch_reader($last_reader, $format, $context);
     # Actually print out the patch
     $reader->iterate_string("Attachment $attach_id", $thedata);
@@ -795,37 +811,10 @@
     my $bugid = $cgi->param('bugid');
     ValidateBugID($bugid);
 
-    # Retrieve the attachments from the database and write them into an array
-    # of hashes where each hash represents one attachment.
-    my $privacy = "";
-    my $dbh = Bugzilla->dbh;
-
-    if (Param("insidergroup") && !(UserInGroup(Param("insidergroup")))) {
-        $privacy = "AND isprivate < 1 ";
+    my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bugid);
+    foreach my $a (@$attachments) {
+        $a->{'isviewable'} = isViewable($a->contenttype);
     }
-    SendSQL("SELECT attach_id, " .
-            $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ",
-            mimetype, description, ispatch, isobsolete, isprivate, 
-            LENGTH(thedata)
-            FROM attachments 
-            INNER JOIN attach_data
-            ON attach_id = id
-            WHERE bug_id = $bugid $privacy 
-            ORDER BY attach_id");
-  my @attachments; # the attachments array
-  while (MoreSQLData())
-  {
-    my %a; # the attachment hash
-    ($a{'attachid'}, $a{'date'}, $a{'contenttype'},
-     $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'},
-     $a{'datasize'}) = FetchSQLData();
-    $a{'isviewable'} = isViewable($a{'contenttype'});
-    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'},
-                                          'is_active' => 1 });
-
-    # Add the hash representing the attachment to the array of attachments.
-    push @attachments, \%a;
-  }
 
   # Retrieve the bug summary (for displaying on screen) and assignee.
   SendSQL("SELECT short_desc, assigned_to FROM bugs " .
@@ -834,7 +823,7 @@
 
   # Define the variables and functions that will be passed to the UI template.
   $vars->{'bugid'} = $bugid;
-  $vars->{'attachments'} = \@attachments;
+  $vars->{'attachments'} = $attachments;
   $vars->{'bugassignee_id'} = $assignee_id;
   $vars->{'bugsummary'} = $bugsummary;
   $vars->{'GetBugLink'} = \&GetBugLink;
@@ -922,8 +911,9 @@
     validateIsPatch();
     validateDescription();
   
-    if (($attachurl =~ /^(http|https|ftp):\/\/\S+/) 
-         && !(defined $cgi->upload('data'))) {
[...12227 lines suppressed...]
  %]
@@ -52,7 +52,7 @@
       
         [% keyword.name FILTER html %]
     
-    
      		[% keyword.description %][% keyword.description FILTER html_light %]
     
       [% IF keyword.bugcount > 0 %]
         
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/request/email.txt.tmpl bugzilla-2.22.1/template/en/default/request/email.txt.tmpl
--- bugzilla-2.22/template/en/default/request/email.txt.tmpl	2005-12-29 16:32:37.000000000 -0800
+++ bugzilla-2.22.1/template/en/default/request/email.txt.tmpl	2006-07-05 19:20:08.000000000 -0700
@@ -61,7 +61,7 @@
 [%- FILTER bullet = wrap(80) %]
 
 [% USE Bugzilla %]
-[% IF Bugzilla.cgi.param("comment").length > 0 %]
+[% IF Bugzilla.cgi.param("comment") && Bugzilla.cgi.param("comment").length > 0 %]
 ------- Additional Comments from [% user.identity %]
 [%+ Bugzilla.cgi.param("comment") %]
 [% END %]
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl
--- bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl	2004-12-10 16:27:45.000000000 -0800
+++ bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl	2006-06-07 14:34:35.000000000 -0700
@@ -46,7 +46,7 @@
 
   
      
     
-      Advanced Searching Using Boolean Charts:
+      Advanced Searching Using Boolean Charts:
     
   
      
 
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl
--- bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl	2005-04-11 15:34:50.000000000 -0700
+++ bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl	2006-05-22 17:22:29.000000000 -0700
@@ -33,7 +33,7 @@
 
 [% PROCESS global/header.html.tmpl 
   title = "Create New Data Set"
-  onload = "selectProduct(document.forms['chartform']);"
+  onload = "doOnSelectProduct(0);"
   javascript = js_data 
   javascript_urls = [ "js/productform.js" ]
 %]
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/whine/schedule.html.tmpl bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl
--- bugzilla-2.22/template/en/default/whine/schedule.html.tmpl	2005-09-12 07:03:01.000000000 -0700
+++ bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl	2006-10-14 15:05:59.000000000 -0700
@@ -82,6 +82,7 @@
 
 
+
 
 [% FOREACH event = events %]
 
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/testserver.pl bugzilla-2.22.1/testserver.pl
--- bugzilla-2.22/testserver.pl	2006-01-05 03:07:01.000000000 -0800
+++ bugzilla-2.22.1/testserver.pl	2006-07-24 23:21:07.000000000 -0700
@@ -14,7 +14,7 @@
 # Contributor(s): Joel Peshkin 
 #                 Byron Jones 
 
-# testserver.pl is involked with the baseurl of the Bugzilla installation
+# testserver.pl is invoked with the baseurl of the Bugzilla installation
 # as its only argument.  It attempts to troubleshoot as many installation
 # issues as possible.
 
@@ -194,6 +194,14 @@
             print "TEST-FAILED Chart returned: $@\n";
         }
     }
+
+    eval 'use Template::Plugin::GD::Image';
+    if ($@) {
+        print "TEST-FAILED Template::Plugin::GD is not installed.\n";
+    }
+    else {
+        print "TEST-OK Template::Plugin::GD is installed.\n";
+    }
 }
 
 sub fetch {
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/token.cgi bugzilla-2.22.1/token.cgi
--- bugzilla-2.22/token.cgi	2005-10-24 16:11:55.000000000 -0700
+++ bugzilla-2.22.1/token.cgi	2006-09-22 16:25:51.000000000 -0700
@@ -67,9 +67,8 @@
   $::token = $cgi->param('t');
   
   # Make sure the token contains only valid characters in the right amount.
-  # Validate password will throw an error if token is invalid
+  # ValidatePassword will throw an error if token is invalid
   ValidatePassword($::token);
-  trick_taint($::token); # Only used in placeholders
 
   Bugzilla::Token::CleanTokenTable();
 
@@ -98,9 +97,11 @@
 
 # If the user is requesting a password change, make sure they submitted
 # their login name and it exists in the database, and that the DB module is in
-# the list of allowed verification methids.
+# the list of allowed verification methods.
+my $login_name;
 if ( $::action eq 'reqpw' ) {
-    defined $cgi->param('loginname')
+    $login_name = $cgi->param('loginname');
+    defined $login_name
       || ThrowUserError("login_needed_for_password_change");
 
     # check verification methods
@@ -108,27 +109,25 @@
         ThrowUserError("password_change_requests_not_allowed");
     }
 
-    # Make sure the login name looks like an email address.
-    validate_email_syntax($cgi->param('loginname'))
-      || ThrowUserError('illegal_email_address',
-                        {addr => $cgi->param('loginname')});
+    validate_email_syntax($login_name)
+      || ThrowUserError('illegal_email_address', {addr => $login_name});
 
-    my $loginname = $cgi->param('loginname');
-    trick_taint($loginname); # Used only in a placeholder
     my ($user_id) = $dbh->selectrow_array('SELECT userid FROM profiles WHERE ' .
                                           $dbh->sql_istrcmp('login_name', '?'),
-                                          undef, $loginname);
+                                          undef, $login_name);
     $user_id || ThrowUserError("account_inexistent");
 }
 
 # If the user is changing their password, make sure they submitted a new
 # password and that the new password is valid.
+my $password;
 if ( $::action eq 'chgpw' ) {
-    defined $cgi->param('password')
+    $password = $cgi->param('password');
+    defined $password
       && defined $cgi->param('matchpassword')
       || ThrowUserError("require_new_password");
 
-    ValidatePassword($cgi->param('password'), $cgi->param('matchpassword'));
+    ValidatePassword($password, $cgi->param('matchpassword'));
 }
 
 ################################################################################
@@ -140,13 +139,13 @@
 # that variable and runs the appropriate code.
 
 if ($::action eq 'reqpw') { 
-    requestChangePassword(); 
+    requestChangePassword($login_name);
 } elsif ($::action eq 'cfmpw') { 
     confirmChangePassword(); 
 } elsif ($::action eq 'cxlpw') { 
     cancelChangePassword(); 
 } elsif ($::action eq 'chgpw') { 
-    changePassword(); 
+    changePassword($password);
 } elsif ($::action eq 'cfmem') {
     confirmChangeEmail();
 } elsif ($::action eq 'cxlem') {
@@ -167,7 +166,8 @@
 ################################################################################
 
 sub requestChangePassword {
-    Bugzilla::Token::IssuePasswordToken($cgi->param('loginname'));
+    my ($login_name) = @_;
+    Bugzilla::Token::IssuePasswordToken($login_name);
 
     $vars->{'message'} = "password_change_request";
 
@@ -194,11 +194,11 @@
 }
 
 sub changePassword {
+    my ($password) = @_;
     my $dbh = Bugzilla->dbh;
 
     # Create a crypted version of the new password
-    my $cryptedpassword = bz_crypt($cgi->param('password'));
-    trick_taint($cryptedpassword); # Used only in a placeholder
+    my $cryptedpassword = bz_crypt($password);
 
     # Get the user's ID from the tokens table.
     my ($userid) = $dbh->selectrow_array('SELECT userid FROM tokens
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/votes.cgi bugzilla-2.22.1/votes.cgi
--- bugzilla-2.22/votes.cgi	2005-10-24 16:11:55.000000000 -0700
+++ bugzilla-2.22.1/votes.cgi	2006-10-13 06:01:57.000000000 -0700
@@ -358,7 +358,8 @@
     $dbh->bz_unlock_tables();
 
     $vars->{'type'} = "votes";
-    $vars->{'mailrecipients'} = { 'changer' => $who };
+    $vars->{'mailrecipients'} = { 'changer' => Bugzilla->user->login };
+    $vars->{'title_tag'} = 'change_votes';
 
     foreach my $bug_id (@updated_bugs) {
         $vars->{'id'} = $bug_id;


Index: bugzilla.spec
===================================================================
RCS file: /cvs/extras/rpms/bugzilla/FC-5/bugzilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bugzilla.spec	27 Jun 2006 12:55:03 -0000	1.2
+++ bugzilla.spec	8 Nov 2006 23:38:10 -0000	1.3
@@ -6,13 +6,14 @@
 Name: bugzilla
 Version: 2.22
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MPL
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-data-dir.patch
 Patch1: bugzilla-config-path.patch
+Patch2: bugzilla-bz212355-fixvuln.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: smtpdaemon, webserver, graphviz, patchutils
@@ -40,6 +41,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
@@ -125,6 +127,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Wed Nov  8 2006 John Berninger  - 2.22-7
+- Fix for BZ 212355 vulnerabilities
+
 * Tue Jun 26 2006 John Berninger  - 2.22-6
 - Clean up BugzillaEmail requires (filter it out)
 



From fedora-extras-commits at redhat.com  Thu Nov  9 00:26:25 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Wed, 8 Nov 2006 17:26:25 -0700
Subject: rpms/bugzilla/FC-6 bugzilla-bz212355-fixvuln.patch, NONE,
	1.1 bugzilla.spec, 1.2, 1.3
Message-ID: <200611090026.kA90QPtD011195@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/bugzilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11175

Modified Files:
	bugzilla.spec 
Added Files:
	bugzilla-bz212355-fixvuln.patch 
Log Message:
Fix for bz 212355 - multiple vulns


bugzilla-bz212355-fixvuln.patch:

--- NEW FILE bugzilla-bz212355-fixvuln.patch ---
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/attachment.cgi bugzilla-2.22.1/attachment.cgi
--- bugzilla-2.22/attachment.cgi	2006-04-09 11:28:49.000000000 -0700
+++ bugzilla-2.22.1/attachment.cgi	2006-10-14 14:07:19.000000000 -0700
@@ -130,6 +130,7 @@
 sub validateID
 {
     my $param = @_ ? $_[0] : 'id';
+    my $user = Bugzilla->user;
 
     # If we're not doing interdiffs, check if id wasn't specified and
     # prompt them with a page that allows them to choose an attachment.
@@ -151,18 +152,18 @@
      || ThrowUserError("invalid_attach_id", { attach_id => $cgi->param($param) });
   
     # Make sure the attachment exists in the database.
-    SendSQL("SELECT bug_id, isprivate FROM attachments WHERE attach_id = $attach_id");
+    SendSQL("SELECT bug_id, isprivate, submitter_id
+             FROM attachments WHERE attach_id = $attach_id");
     MoreSQLData()
       || ThrowUserError("invalid_attach_id", { attach_id => $attach_id });
 
     # Make sure the user is authorized to access this attachment's bug.
-    (my $bugid, my $isprivate) = FetchSQLData();
+    my ($bugid, $isprivate, $submitter_id) = FetchSQLData();
 
     ValidateBugID($bugid);
-    if ($isprivate && Param("insidergroup")) {
-        UserInGroup(Param("insidergroup"))
-          || ThrowUserError("auth_failure", {action => "access",
-                                             object => "attachment"});
+    if ($isprivate && $user->id != $submitter_id && !$user->is_insider) {
+        ThrowUserError("auth_failure", {action => "access",
+                                        object => "attachment"});
     }
 
     return ($attach_id,$bugid);
@@ -199,17 +200,23 @@
 sub validateCanEdit
 {
     my ($attach_id) = (@_);
+    my $user = Bugzilla->user;
 
-    # People in editbugs can edit all attachments
-    return if UserInGroup("editbugs");
+    my $attachment = Bugzilla::Attachment->get($attach_id);
 
     # Bug 97729 - the submitter can edit their attachments
-    SendSQL("SELECT attach_id FROM attachments WHERE " .
-            "attach_id = $attach_id AND submitter_id = " . Bugzilla->user->id);
+    return if ($attachment->attacher->id == $user->id);
 
-    FetchSQLData()
-      || ThrowUserError("illegal_attachment_edit",
-                        { attach_id => $attach_id });
+    # Only people in the insider group can view private attachments.
+    if ($attachment->isprivate && !$user->is_insider) {
+        ThrowUserError('illegal_attachment_edit', {attach_id => $attachment->id});
+    }
+
+    # People in editbugs can edit all attachments
+    return if UserInGroup("editbugs");
+
+    # If we come here, then this attachment cannot be seen by the user.
+    ThrowUserError('illegal_attachment_edit', { attach_id => $attachment->id });
 }
 
 sub validateCanChangeAttachment 
@@ -393,7 +400,8 @@
   my @obsolete_ids = ();
 
   # Make sure the attachment id is valid and the user has permissions to view
-  # the bug to which it is attached.
+  # the bug to which it is attached. Make sure also that the user can view
+  # the attachment itself.
   foreach my $attachid ($cgi->param('obsolete')) {
     my $vars = {};
     $vars->{'attach_id'} = $attachid;
@@ -410,6 +418,9 @@
 
     my ($bugid, $isobsolete, $description) = FetchSQLData();
 
+    # Check that the user can modify this attachment
+    validateCanEdit($attachid);
+
     $vars->{'description'} = $description;
     
     if ($bugid != $cgi->param('bugid'))
@@ -424,8 +435,6 @@
       ThrowCodeError("attachment_already_obsolete", $vars);
     }
 
-    # Check that the user can modify this attachment
-    validateCanEdit($attachid);
     push(@obsolete_ids, $attachid);
   }
 
@@ -759,28 +768,35 @@
   }
   else
   {
-    $vars->{other_patches} = [];
+    my @other_patches = ();
     if ($::interdiffbin && $::diffpath) {
-      # Get list of attachments on this bug.
+      # Get the list of attachments that the user can view in this bug.
+      my @attachments = @{Bugzilla::Attachment->get_attachments_by_bug($bugid)};
+      # Extract patches only.
+      @attachments = grep {$_->ispatch == 1} @attachments;
+      # We want them sorted from newer to older.
+      @attachments = sort { $b->id <=> $a->id } @attachments;
+
       # Ignore the current patch, but select the one right before it
       # chronologically.
-      SendSQL("SELECT attach_id, description FROM attachments WHERE bug_id = $bugid AND ispatch = 1 ORDER BY creation_ts DESC");
       my $select_next_patch = 0;
-      while (my ($other_id, $other_desc) = FetchSQLData()) {
-        if ($other_id eq $attach_id) {
-          $select_next_patch = 1;
-        } else {
-          push @{$vars->{other_patches}}, { id => $other_id, desc => $other_desc, selected => $select_next_patch };
-          if ($select_next_patch) {
-            $select_next_patch = 0;
+      foreach my $attach (@attachments) {
+          if ($attach->id == $attach_id) {
+              $select_next_patch = 1;
+          }
+          else {
+              push(@other_patches, { 'id'       => $attach->id,
+                                     'desc'     => $attach->description,
+                                     'selected' => $select_next_patch });
+              $select_next_patch = 0;
           }
-        }
       }
     }
 
     $vars->{bugid} = $bugid;
     $vars->{attachid} = $attach_id;
     $vars->{description} = $description;
+    $vars->{other_patches} = \@other_patches;
     setup_template_patch_reader($last_reader, $format, $context);
     # Actually print out the patch
     $reader->iterate_string("Attachment $attach_id", $thedata);
@@ -795,37 +811,10 @@
     my $bugid = $cgi->param('bugid');
     ValidateBugID($bugid);
 
-    # Retrieve the attachments from the database and write them into an array
-    # of hashes where each hash represents one attachment.
-    my $privacy = "";
-    my $dbh = Bugzilla->dbh;
-
-    if (Param("insidergroup") && !(UserInGroup(Param("insidergroup")))) {
-        $privacy = "AND isprivate < 1 ";
+    my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bugid);
+    foreach my $a (@$attachments) {
+        $a->{'isviewable'} = isViewable($a->contenttype);
     }
-    SendSQL("SELECT attach_id, " .
-            $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ",
-            mimetype, description, ispatch, isobsolete, isprivate, 
-            LENGTH(thedata)
-            FROM attachments 
-            INNER JOIN attach_data
-            ON attach_id = id
-            WHERE bug_id = $bugid $privacy 
-            ORDER BY attach_id");
-  my @attachments; # the attachments array
-  while (MoreSQLData())
-  {
-    my %a; # the attachment hash
-    ($a{'attachid'}, $a{'date'}, $a{'contenttype'},
-     $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'},
-     $a{'datasize'}) = FetchSQLData();
-    $a{'isviewable'} = isViewable($a{'contenttype'});
-    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'},
-                                          'is_active' => 1 });
-
-    # Add the hash representing the attachment to the array of attachments.
-    push @attachments, \%a;
-  }
 
   # Retrieve the bug summary (for displaying on screen) and assignee.
   SendSQL("SELECT short_desc, assigned_to FROM bugs " .
@@ -834,7 +823,7 @@
 
   # Define the variables and functions that will be passed to the UI template.
   $vars->{'bugid'} = $bugid;
-  $vars->{'attachments'} = \@attachments;
+  $vars->{'attachments'} = $attachments;
   $vars->{'bugassignee_id'} = $assignee_id;
   $vars->{'bugsummary'} = $bugsummary;
   $vars->{'GetBugLink'} = \&GetBugLink;
@@ -922,8 +911,9 @@
     validateIsPatch();
     validateDescription();
   
-    if (($attachurl =~ /^(http|https|ftp):\/\/\S+/) 
-         && !(defined $cgi->upload('data'))) {
[...12227 lines suppressed...]
  %]
@@ -52,7 +52,7 @@
       
         [% keyword.name FILTER html %]
     
-          		[% keyword.description %][% keyword.description FILTER html_light %]
     
       [% IF keyword.bugcount > 0 %]
         
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/request/email.txt.tmpl bugzilla-2.22.1/template/en/default/request/email.txt.tmpl
--- bugzilla-2.22/template/en/default/request/email.txt.tmpl	2005-12-29 16:32:37.000000000 -0800
+++ bugzilla-2.22.1/template/en/default/request/email.txt.tmpl	2006-07-05 19:20:08.000000000 -0700
@@ -61,7 +61,7 @@
 [%- FILTER bullet = wrap(80) %]
 
 [% USE Bugzilla %]
-[% IF Bugzilla.cgi.param("comment").length > 0 %]
+[% IF Bugzilla.cgi.param("comment") && Bugzilla.cgi.param("comment").length > 0 %]
 ------- Additional Comments from [% user.identity %]
 [%+ Bugzilla.cgi.param("comment") %]
 [% END %]
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl
--- bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl	2004-12-10 16:27:45.000000000 -0800
+++ bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl	2006-06-07 14:34:35.000000000 -0700
@@ -46,7 +46,7 @@
 
   
      
     
-      Advanced Searching Using Boolean Charts:
+      Advanced Searching Using Boolean Charts:
     
   
      
 
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl
--- bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl	2005-04-11 15:34:50.000000000 -0700
+++ bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl	2006-05-22 17:22:29.000000000 -0700
@@ -33,7 +33,7 @@
 
 [% PROCESS global/header.html.tmpl 
   title = "Create New Data Set"
-  onload = "selectProduct(document.forms['chartform']);"
+  onload = "doOnSelectProduct(0);"
   javascript = js_data 
   javascript_urls = [ "js/productform.js" ]
 %]
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/whine/schedule.html.tmpl bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl
--- bugzilla-2.22/template/en/default/whine/schedule.html.tmpl	2005-09-12 07:03:01.000000000 -0700
+++ bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl	2006-10-14 15:05:59.000000000 -0700
@@ -82,6 +82,7 @@
 
 
+
 
 [% FOREACH event = events %]
 
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/testserver.pl bugzilla-2.22.1/testserver.pl
--- bugzilla-2.22/testserver.pl	2006-01-05 03:07:01.000000000 -0800
+++ bugzilla-2.22.1/testserver.pl	2006-07-24 23:21:07.000000000 -0700
@@ -14,7 +14,7 @@
 # Contributor(s): Joel Peshkin 
 #                 Byron Jones 
 
-# testserver.pl is involked with the baseurl of the Bugzilla installation
+# testserver.pl is invoked with the baseurl of the Bugzilla installation
 # as its only argument.  It attempts to troubleshoot as many installation
 # issues as possible.
 
@@ -194,6 +194,14 @@
             print "TEST-FAILED Chart returned: $@\n";
         }
     }
+
+    eval 'use Template::Plugin::GD::Image';
+    if ($@) {
+        print "TEST-FAILED Template::Plugin::GD is not installed.\n";
+    }
+    else {
+        print "TEST-OK Template::Plugin::GD is installed.\n";
+    }
 }
 
 sub fetch {
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/token.cgi bugzilla-2.22.1/token.cgi
--- bugzilla-2.22/token.cgi	2005-10-24 16:11:55.000000000 -0700
+++ bugzilla-2.22.1/token.cgi	2006-09-22 16:25:51.000000000 -0700
@@ -67,9 +67,8 @@
   $::token = $cgi->param('t');
   
   # Make sure the token contains only valid characters in the right amount.
-  # Validate password will throw an error if token is invalid
+  # ValidatePassword will throw an error if token is invalid
   ValidatePassword($::token);
-  trick_taint($::token); # Only used in placeholders
 
   Bugzilla::Token::CleanTokenTable();
 
@@ -98,9 +97,11 @@
 
 # If the user is requesting a password change, make sure they submitted
 # their login name and it exists in the database, and that the DB module is in
-# the list of allowed verification methids.
+# the list of allowed verification methods.
+my $login_name;
 if ( $::action eq 'reqpw' ) {
-    defined $cgi->param('loginname')
+    $login_name = $cgi->param('loginname');
+    defined $login_name
       || ThrowUserError("login_needed_for_password_change");
 
     # check verification methods
@@ -108,27 +109,25 @@
         ThrowUserError("password_change_requests_not_allowed");
     }
 
-    # Make sure the login name looks like an email address.
-    validate_email_syntax($cgi->param('loginname'))
-      || ThrowUserError('illegal_email_address',
-                        {addr => $cgi->param('loginname')});
+    validate_email_syntax($login_name)
+      || ThrowUserError('illegal_email_address', {addr => $login_name});
 
-    my $loginname = $cgi->param('loginname');
-    trick_taint($loginname); # Used only in a placeholder
     my ($user_id) = $dbh->selectrow_array('SELECT userid FROM profiles WHERE ' .
                                           $dbh->sql_istrcmp('login_name', '?'),
-                                          undef, $loginname);
+                                          undef, $login_name);
     $user_id || ThrowUserError("account_inexistent");
 }
 
 # If the user is changing their password, make sure they submitted a new
 # password and that the new password is valid.
+my $password;
 if ( $::action eq 'chgpw' ) {
-    defined $cgi->param('password')
+    $password = $cgi->param('password');
+    defined $password
       && defined $cgi->param('matchpassword')
       || ThrowUserError("require_new_password");
 
-    ValidatePassword($cgi->param('password'), $cgi->param('matchpassword'));
+    ValidatePassword($password, $cgi->param('matchpassword'));
 }
 
 ################################################################################
@@ -140,13 +139,13 @@
 # that variable and runs the appropriate code.
 
 if ($::action eq 'reqpw') { 
-    requestChangePassword(); 
+    requestChangePassword($login_name);
 } elsif ($::action eq 'cfmpw') { 
     confirmChangePassword(); 
 } elsif ($::action eq 'cxlpw') { 
     cancelChangePassword(); 
 } elsif ($::action eq 'chgpw') { 
-    changePassword(); 
+    changePassword($password);
 } elsif ($::action eq 'cfmem') {
     confirmChangeEmail();
 } elsif ($::action eq 'cxlem') {
@@ -167,7 +166,8 @@
 ################################################################################
 
 sub requestChangePassword {
-    Bugzilla::Token::IssuePasswordToken($cgi->param('loginname'));
+    my ($login_name) = @_;
+    Bugzilla::Token::IssuePasswordToken($login_name);
 
     $vars->{'message'} = "password_change_request";
 
@@ -194,11 +194,11 @@
 }
 
 sub changePassword {
+    my ($password) = @_;
     my $dbh = Bugzilla->dbh;
 
     # Create a crypted version of the new password
-    my $cryptedpassword = bz_crypt($cgi->param('password'));
-    trick_taint($cryptedpassword); # Used only in a placeholder
+    my $cryptedpassword = bz_crypt($password);
 
     # Get the user's ID from the tokens table.
     my ($userid) = $dbh->selectrow_array('SELECT userid FROM tokens
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/votes.cgi bugzilla-2.22.1/votes.cgi
--- bugzilla-2.22/votes.cgi	2005-10-24 16:11:55.000000000 -0700
+++ bugzilla-2.22.1/votes.cgi	2006-10-13 06:01:57.000000000 -0700
@@ -358,7 +358,8 @@
     $dbh->bz_unlock_tables();
 
     $vars->{'type'} = "votes";
-    $vars->{'mailrecipients'} = { 'changer' => $who };
+    $vars->{'mailrecipients'} = { 'changer' => Bugzilla->user->login };
+    $vars->{'title_tag'} = 'change_votes';
 
     foreach my $bug_id (@updated_bugs) {
         $vars->{'id'} = $bug_id;


Index: bugzilla.spec
===================================================================
RCS file: /cvs/extras/rpms/bugzilla/FC-6/bugzilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bugzilla.spec	27 Jun 2006 12:56:19 -0000	1.2
+++ bugzilla.spec	9 Nov 2006 00:25:54 -0000	1.3
@@ -6,13 +6,14 @@
 Name: bugzilla
 Version: 2.22
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MPL
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-data-dir.patch
 Patch1: bugzilla-config-path.patch
+Patch2: bugzilla-bz212355-fixvuln.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: smtpdaemon, webserver, graphviz, patchutils
@@ -40,6 +41,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
@@ -125,6 +127,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Wed Nov  8 2006 John Berninger  - 2.22-7
+- Fixes for bz # 212355
+
 * Tue Jun 26 2006 John Berninger  - 2.22-6
 - Clean up BugzillaEmail requires (filter it out)
 



From fedora-extras-commits at redhat.com  Thu Nov  9 00:43:58 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Wed, 8 Nov 2006 17:43:58 -0700
Subject: owners owners.list,1.1907,1.1908
Message-ID: <200611090043.kA90hw9k011269@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11253

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1907
retrieving revision 1.1908
diff -u -r1.1907 -r1.1908
--- owners.list	8 Nov 2006 22:18:31 -0000	1.1907
+++ owners.list	9 Nov 2006 00:43:28 -0000	1.1908
@@ -770,6 +770,7 @@
 Fedora Extras|kbackup|Back up your data in a simple, user friendly way|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|
 Fedora Extras|kchmviewer|CHM viewer|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|kcometen3|OpenGL Screensaver for KDE|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|kdeartwork-extras|Artwork Extras, including xscreensaver-based screensavers|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdegraphics-extras|Extras for KDE graphics applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdemultimedia-extras|Extras for KDE multimedia applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 00:47:18 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Wed, 8 Nov 2006 17:47:18 -0700
Subject: rpms/kcometen3 - New directory
Message-ID: <200611090047.kA90lImM011331@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/kcometen3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11327/kcometen3

Log Message:
Directory /cvs/extras/rpms/kcometen3 added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 00:47:24 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Wed, 8 Nov 2006 17:47:24 -0700
Subject: rpms/kcometen3/devel - New directory
Message-ID: <200611090047.kA90lO3g011345@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/kcometen3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11327/kcometen3/devel

Log Message:
Directory /cvs/extras/rpms/kcometen3/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 00:47:43 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Wed, 8 Nov 2006 17:47:43 -0700
Subject: rpms/kcometen3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611090047.kA90lhmY011379@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/kcometen3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11373

Added Files:
	Makefile import.log 
Log Message:
Setup of module kcometen3


--- NEW FILE Makefile ---
# Top level Makefile for module kcometen3
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 Nov  9 00:47:49 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Wed, 8 Nov 2006 17:47:49 -0700
Subject: rpms/kcometen3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611090047.kA90lnSi011396@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/kcometen3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11373/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kcometen3


--- 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 Nov  9 00:48:55 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Wed, 8 Nov 2006 17:48:55 -0700
Subject: rpms/kcometen3 import.log,1.1,1.2
Message-ID: <200611090048.kA90mtxF011477@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/kcometen3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445

Modified Files:
	import.log 
Log Message:
auto-import kcometen3-1.1-4 on branch devel from kcometen3-1.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kcometen3/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Nov 2006 00:47:43 -0000	1.1
+++ import.log	9 Nov 2006 00:48:25 -0000	1.2
@@ -0,0 +1 @@
+kcometen3-1_1-4:HEAD:kcometen3-1.1-4.src.rpm:1163038622



From fedora-extras-commits at redhat.com  Thu Nov  9 00:48:56 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Wed, 8 Nov 2006 17:48:56 -0700
Subject: rpms/kcometen3/devel kcometen3.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611090049.kA90muiZ011481@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/kcometen3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kcometen3.spec 
Log Message:
auto-import kcometen3-1.1-4 on branch devel from kcometen3-1.1-4.src.rpm


--- NEW FILE kcometen3.spec ---
Name:           kcometen3
Version:        1.1
Release:        4%{?dist}
Summary:        An OpenGL screensaver for KDE

Group:          Amusements/Graphics
License:        GPL
URL:            http://user.cs.tu-berlin.de/~pmueller/
Source0:        http://user.cs.tu-berlin.de/~pmueller/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gettext
BuildRequires:  kdelibs-devel
BuildRequires:  libGLU-devel
BuildRequires:  libpng-devel
BuildRequires:  libICE-devel
Requires:       xscreensaver-base

%description
An OpenGL screensaver for KDE.


%prep
%setup -q
# Permission cleanups for debug rpm
chmod -x src/*.h src/*.cpp

%build
%configure --disable-rpath
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/kcometen3.kss
%{_datadir}/applnk/System/ScreenSavers/kcometen3.desktop
%{_datadir}/apps/kcometen3
%doc AUTHORS COPYING


%changelog
* Thu Nov 09 2006 Ian Chapman  1.1-4%{?dist}
- Removed a few BRs which are imported by other BRs anyway

* Mon Nov 06 2006 Ian Chapman  1.1-3%{?dist}
- Potential migration to FE

* Sat Jun 03 2006 Ian Chapman  1.1-2%{?dist}
- Changed URL and source URL not to use a mirror
- Replaced xorg-x11-devel buildrequire with libGLU-devel for compatibility with
  both modular and non modular X

* Tue May 02 2006 Ian Chapman  1.1-1.iss
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kcometen3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Nov 2006 00:47:48 -0000	1.1
+++ .cvsignore	9 Nov 2006 00:48:26 -0000	1.2
@@ -0,0 +1 @@
+kcometen3-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kcometen3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Nov 2006 00:47:48 -0000	1.1
+++ sources	9 Nov 2006 00:48:26 -0000	1.2
@@ -0,0 +1 @@
+36f846b6a3e5f71c4532070b1f17b717  kcometen3-1.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 00:57:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed,  8 Nov 2006 17:57:11 -0700
Subject: extras-buildsys/utils/pushscript Comps.py, 1.1, 1.2 Push.py, 1.13,
	1.14
Message-ID: <200611090057.kA90vBVZ011582@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11562

Modified Files:
	Comps.py Push.py 
Log Message:
enable Comps.py module in push process




Index: Comps.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Comps.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Comps.py	8 Nov 2006 20:23:57 -0000	1.1
+++ Comps.py	9 Nov 2006 00:57:08 -0000	1.2
@@ -66,7 +66,7 @@
     
 
     def Update(self):
-        self.workdir = os.path.join(cfg.rundir,'comps')
+        self.workdir = os.path.join(self.cfg.rundir,'comps')
         if not os.path.exists(self.workdir):
             print 'WARNING: %s missing! Manual setup needed.' % self.workdir
             return
@@ -80,16 +80,14 @@
                 if self._update(self.cfg.comps_up_pass2):
                     for dist in self.cfg.alldists:
                         self._install(dist)
+        # TODO: Error-handling and reporting. We don't want these to
+        # be fatal.
         except IOError:
-            os.chdir(self.olddir)
-            self._cleanup()
+            pass
         except OSError:
-            os.chdir(self.olddir)
-            self._cleanup()
+            pass
         except KeyboardInterrupt:
-            os.chdir(self.olddir)
-            self._cleanup()
-            raise
+            pass
         os.chdir(self.olddir)
         self._cleanup()
 


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Push.py	1 Nov 2006 11:37:09 -0000	1.13
+++ Push.py	9 Nov 2006 00:57:08 -0000	1.14
@@ -24,7 +24,7 @@
 import tempfile
 import time
 
-import Utils, MultiLib
+import Utils, MultiLib, Comps
 import RepoBuild, RepoPrune, RepoView
 
 DEBUG = False
@@ -638,6 +638,10 @@
     if opts.force:
         changed = diststopush
 
+    print 'Processing comps.xml updates (Ctrl+C to skip)'
+    sys.stdout.flush()
+    Comps.main(cfg)
+
     for dist in changed:
         if cfg.opts.repoprune:
             RepoPrune.main(cfg,dist)



From fedora-extras-commits at redhat.com  Thu Nov  9 01:25:37 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 8 Nov 2006 18:25:37 -0700
Subject: rpms/csound/FC-6 .cvsignore, 1.3, 1.4 csound.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200611090125.kA91PbmA014808@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14784

Modified Files:
	.cvsignore csound.spec sources 
Log Message:
* Wed Nov  8 2006 Dan Williams  5.03.0-9
- CVS snapshot for fixes to the virtual midi keyboard




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Nov 2006 16:56:17 -0000	1.3
+++ .cvsignore	9 Nov 2006 01:25:07 -0000	1.4
@@ -1,3 +1,4 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
 Csound5.03.0_src-cvs20061101.tar.bz2
+Csound5.03.0_src-cvs20061108.tar.bz2


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/csound.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- csound.spec	1 Nov 2006 16:56:17 -0000	1.4
+++ csound.spec	9 Nov 2006 01:25:07 -0000	1.5
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       8%{?dist}
+Release:       9%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061108.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -402,6 +402,9 @@
 %doc tutorial/*.py
 
 %changelog
+* Wed Nov  8 2006 Dan Williams  5.03.0-9
+- CVS snapshot for fixes to the virtual midi keyboard
+
 * Wed Nov  1 2006 Dan Williams  5.03.0-8
 - CVS snapshot to pick up virtual Midi keyboard
 - Make the default for OPCODEDIR be where the plugins are actually installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Nov 2006 16:56:17 -0000	1.4
+++ sources	9 Nov 2006 01:25:07 -0000	1.5
@@ -1,2 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-5211f0c1fb54484c29de996e09ca6e3c  Csound5.03.0_src-cvs20061101.tar.bz2
+9e26eac5de2de842cabfbb759ed83fe4  Csound5.03.0_src-cvs20061108.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  9 01:28:30 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 8 Nov 2006 18:28:30 -0700
Subject: rpms/csound/devel .cvsignore, 1.5, 1.6 csound.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200611090128.kA91SUNL014910@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14878

Modified Files:
	.cvsignore csound.spec sources 
Log Message:
* Wed Nov  8 2006 Dan Williams  5.03.0-9
- CVS snapshot for fixes to the virtual midi keyboard




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Nov 2006 17:12:36 -0000	1.5
+++ .cvsignore	9 Nov 2006 01:28:00 -0000	1.6
@@ -1,3 +1,4 @@
 Csound5.03_manual.tgz
 Csound5.03_src.tgz
 Csound5.03.0_src-cvs20061101.tar.bz2
+Csound5.03.0_src-cvs20061108.tar.bz2


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- csound.spec	1 Nov 2006 17:12:36 -0000	1.6
+++ csound.spec	9 Nov 2006 01:28:00 -0000	1.7
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       8%{?dist}
+Release:       9%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -28,7 +28,7 @@
 BuildRequires: tk-devel tcl-devel
 BuildRequires: tetex tetex-latex libxslt
 
-Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061101.tar.bz2
+Source0: http://superb-east.dl.sourceforge.net/sourceforge/csound/Csound5.03.0_src-cvs20061108.tar.bz2
 
 # NOTE:
 # Manual sources aren't distributed, but may be extracted from CVS via...
@@ -402,6 +402,9 @@
 %doc tutorial/*.py
 
 %changelog
+* Wed Nov  8 2006 Dan Williams  5.03.0-9
+- CVS snapshot for fixes to the virtual midi keyboard
+
 * Wed Nov  1 2006 Dan Williams  5.03.0-8
 - CVS snapshot to pick up virtual Midi keyboard
 - Make the default for OPCODEDIR be where the plugins are actually installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Nov 2006 17:12:36 -0000	1.5
+++ sources	9 Nov 2006 01:28:00 -0000	1.6
@@ -1,2 +1,2 @@
 acebd377b0ca008d082657ef0270a949  Csound5.03_manual.tgz
-5211f0c1fb54484c29de996e09ca6e3c  Csound5.03.0_src-cvs20061101.tar.bz2
+9e26eac5de2de842cabfbb759ed83fe4  Csound5.03.0_src-cvs20061108.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  9 02:14:25 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Wed, 8 Nov 2006 19:14:25 -0700
Subject: rpms/bugzilla/devel .cvsignore, 1.2, 1.3 bugzilla.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611090214.kA92EPRW018235@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/bugzilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18207

Modified Files:
	.cvsignore bugzilla.spec sources 
Log Message:
Update to 2.22.1 to resolve bz 212355 - multiple vulns



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bugzilla/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 17:53:13 -0000	1.2
+++ .cvsignore	9 Nov 2006 02:13:55 -0000	1.3
@@ -1 +1 @@
-bugzilla-2.22.tar.gz
+bugzilla-2.22.1.tar.gz


Index: bugzilla.spec
===================================================================
RCS file: /cvs/extras/rpms/bugzilla/devel/bugzilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bugzilla.spec	27 Jun 2006 12:56:19 -0000	1.2
+++ bugzilla.spec	9 Nov 2006 02:13:55 -0000	1.3
@@ -4,9 +4,9 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 2.22
+Version: 2.22.1
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: MPL
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -125,7 +125,7 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
-* Tue Jun 26 2006 John Berninger  - 2.22-6
+* Tue Jun 26 2006 John Berninger  - 2.22.1-1
 - Clean up BugzillaEmail requires (filter it out)
 
 * Mon Jun 26 2006 John Berninger  - 2.22-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bugzilla/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 17:53:13 -0000	1.2
+++ sources	9 Nov 2006 02:13:55 -0000	1.3
@@ -1 +1 @@
-bbf2f1ec5607978d39855df104231973  bugzilla-2.22.tar.gz
+d52e2818441f3c2a5caeddf6c40b9f00  bugzilla-2.22.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 02:44:50 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 8 Nov 2006 19:44:50 -0700
Subject: rpms/taskjuggler/FC-5 sources,1.2,1.3 taskjuggler.spec,1.1,1.2
Message-ID: <200611090244.kA92ioQK018445@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/taskjuggler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18427

Modified Files:
	sources taskjuggler.spec 
Log Message:
update to 2.3.0 (#212950)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/taskjuggler/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jun 2006 06:38:51 -0000	1.2
+++ sources	9 Nov 2006 02:44:20 -0000	1.3
@@ -1 +1 @@
-0f7a0301a6e1ec82378bbf4e2539af66  taskjuggler-2.2.0.tar.bz2
+c45b95507caf96ba39b7f40065c9f34b  taskjuggler-2.3.0.tar.bz2


Index: taskjuggler.spec
===================================================================
RCS file: /cvs/extras/rpms/taskjuggler/FC-5/taskjuggler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- taskjuggler.spec	21 Jun 2006 06:38:51 -0000	1.1
+++ taskjuggler.spec	9 Nov 2006 02:44:20 -0000	1.2
@@ -1,5 +1,5 @@
 Name:          taskjuggler
-Version:       2.2.0
+Version:       2.3.0
 Release:       1%{?dist}
 Summary:       Project management tool
 
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Thu Nov  9 2006 Jens Petersen  - 2.3.0-1
+- update to 2.3.0
+
 * Mon May  8 2006 Jens Petersen  - 2.2.0-1
 - packaging fixes from John Mahowald (#166470)
 



From fedora-extras-commits at redhat.com  Thu Nov  9 02:51:15 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 8 Nov 2006 19:51:15 -0700
Subject: rpms/haddock/FC-6 haddock.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200611090251.kA92pFRX018544@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/haddock/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18516

Modified Files:
	haddock.spec sources 
Log Message:
sync with devel:
- update to 0.8
- use new cabal build system
- update file list
- buildrequire autoconf



Index: haddock.spec
===================================================================
RCS file: /cvs/extras/rpms/haddock/FC-6/haddock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- haddock.spec	28 Sep 2006 01:26:09 -0000	1.4
+++ haddock.spec	9 Nov 2006 02:50:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           haddock
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8
+Release:        1%{?dist}
 Summary:        Haddock documentation tool for annotated Haskell source code
 
 Group:          Development/Tools
@@ -9,7 +9,7 @@
 Source0:        http://www.haskell.org/haddock/%{name}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ghc libxslt docbook-style-xsl
+BuildRequires:  ghc libxslt docbook-style-xsl autoconf
 # need chcon
 PreReq:		coreutils
 
@@ -32,24 +32,17 @@
 
 
 %build
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
-make %{?_smp_mflags}
-(cd haddock/doc ; make html )
+runhaskell Setup.lhs configure --prefix=%{_prefix} --libdir=%{_libdir}
+runhaskell Setup.lhs build
+cd doc
+test -f configure || autoreconf
+./configure
+make html
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-
-# move datafiles into their expected location
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}
-find ${RPM_BUILD_ROOT}%{_datadir} -type f | xargs mv --target-directory=${RPM_BUILD_ROOT}%{_datadir}/%{name}-%{version}
-
-sed -i -e "s!%{_libdir}/%{name}-%{version}!%{_libexecdir}!" ${RPM_BUILD_ROOT}%{_bindir}/%{name}-%{version}
-
-# drop versioned binary wrapper
-rm ${RPM_BUILD_ROOT}%{_bindir}/%{name}
-mv ${RPM_BUILD_ROOT}%{_bindir}/%{name}{-%{version},}
+runhaskell Setup.lhs copy --destdir=${RPM_BUILD_ROOT}
 
 
 %clean
@@ -62,14 +55,19 @@
 
 %files
 %defattr(-,root,root)
-%doc haddock/README
-%doc haddock/doc/haddock
+%doc README
+%doc doc/haddock/*
 %{_bindir}/haddock
-%{_libexecdir}/haddock.bin
 %{_datadir}/haddock-%{version}
 
 
 %changelog
+* Fri Nov  3 2006 Jens Petersen  - 0.8-1
+- update to 0.8
+- use new cabal build system
+- update file list
+- buildrequire autoconf
+
 * Thu Sep 28 2006 Jens Petersen  - 0.7-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/haddock/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Sep 2005 03:00:15 -0000	1.2
+++ sources	9 Nov 2006 02:50:45 -0000	1.3
@@ -1 +1 @@
-759419e78416d5f093190968a4dc18f5  haddock-0.7-src.tar.gz
+0a1bb64e7642f64d2560dc258c570c1d  haddock-0.8-src.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 03:31:27 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 8 Nov 2006 20:31:27 -0700
Subject: rpms/ghc/FC-6 .cvsignore, 1.6, 1.7 ghc.spec, 1.16, 1.17 sources, 1.8,
	1.9
Message-ID: <200611090331.kA93VRBN021898@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21846

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
sync with devel:
- update to 6.6 release
- buildrequire haddock >= 0.8
- fix summary of ghcver package (Michel Salim, #209574)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Apr 2006 07:59:27 -0000	1.6
+++ .cvsignore	9 Nov 2006 03:30:56 -0000	1.7
@@ -1 +1,2 @@
-ghc-6.4.2-src.tar.bz2
+ghc-6.6-src.tar.bz2
+ghc-6.6-src-extralibs.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-6/ghc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ghc.spec	28 Sep 2006 01:44:23 -0000	1.16
+++ ghc.spec	9 Nov 2006 03:30:56 -0000	1.17
@@ -1,16 +1,17 @@
-%define ghcver ghc642
+%define ghcver ghc66
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
 Name:		ghc
-Version:	6.4.2
-Release:	4%{?dist}
+Version:	6.6
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
-Source:		http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source0:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source1:	http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,7 +21,7 @@
 Buildrequires:  freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates docs in libraries
-Buildrequires: libxslt, docbook-style-xsl, haddock
+Buildrequires: libxslt, docbook-style-xsl, haddock >= 0.8
 %endif
 Prefix:		%{_prefix}
 
@@ -35,7 +36,7 @@
 interface.
 
 %package -n %{ghcver}
-Summary:	Documentation for GHC
+Summary:	Glasgow Haskell Compilation system
 Group:		Development/Languages
 Requires:	gcc gmp-devel readline-devel
 
@@ -79,7 +80,7 @@
 %define __spec_install_post /usr/lib/rpm/brp-compress
 
 %prep
-%setup -q -n ghc-%{version}
+%setup -q -n ghc-%{version} -b1
 
 %build
 %if !%{build_prof}
@@ -154,7 +155,7 @@
 
 %files -n %{ghcver} -f rpm-base-filelist
 %defattr(-,root,root,-)
-%doc ghc/ANNOUNCE ghc/LICENSE ghc/README
+%doc ANNOUNCE HACKING LICENSE README
 %{_bindir}/ghc*%{version}
 %config(noreplace) %{_libdir}/ghc-%{version}/package.conf
 %ghost %{_libdir}/ghc-%{version}/package.conf.old
@@ -174,6 +175,11 @@
 
 
 %changelog
+* Thu Nov  9 2006 Jens Petersen  - 6.6-1
+- update to 6.6 release
+- buildrequire haddock >= 0.8
+- fix summary of ghcver package (Michel Salim, #209574)
+
 * Thu Sep 28 2006 Jens Petersen  - 6.4.2-4
 - turn on docs generation again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 Sep 2006 12:34:59 -0000	1.8
+++ sources	9 Nov 2006 03:30:56 -0000	1.9
@@ -1 +1,2 @@
-a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2
+2427a8d7d14f86e0878df6b54938acf7  ghc-6.6-src.tar.bz2
+14b22fce36caffa509046361724bc119  ghc-6.6-src-extralibs.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  9 04:20:20 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 8 Nov 2006 21:20:20 -0700
Subject: rpms/sword/devel sword.spec, 1.11, 1.12 ar_EG-cp1256.conf, 1.1,
	NONE ar_EG-utf8.conf, 1.1, NONE
Message-ID: <200611090420.kA94KK9J025193@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25156/devel

Modified Files:
	sword.spec 
Removed Files:
	ar_EG-cp1256.conf ar_EG-utf8.conf 
Log Message:
auto-import sword-1.5.9-1 on branch devel from sword-1.5.9-1.src.rpm


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/devel/sword.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sword.spec	4 Oct 2006 22:36:34 -0000	1.11
+++ sword.spec	9 Nov 2006 04:19:49 -0000	1.12
@@ -1,21 +1,19 @@
 Name:           sword           
-Version:        1.5.8
-Release:        10%{?dist}
+Version:        1.5.9
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
-Source1:        ar_EG-cp1256.conf
-Source2:        ar_EG-utf8.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sed >= 3.95
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libicu-devel icu
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -40,13 +38,9 @@
 
 %prep
 %setup -q
-%{__sed} -i 's?\r??' include/ftptrans.h
-%{__sed} -i 's?\r??' include/ftplibftpt.h
-%{__sed} -i 's?\r??' include/curlftpt.h
-
 
 %build
-%configure --disable-static
+%configure --disable-static --with-icu
 make 
 #%%{?_smp_mflags} sometimes causes build failure
 
@@ -55,8 +49,6 @@
 rm -rf %buildroot
 make install DESTDIR=%buildroot
 %__mkdir_p %buildroot%_datadir/sword/modules
-install -p -m644 %{SOURCE1} %buildroot%_datadir/sword/locales.d/
-install -p -m644 %{SOURCE2} %buildroot%_datadir/sword/locales.d/
 
 find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';'
 
@@ -75,7 +67,7 @@
 %doc samples doc
 %config(noreplace) %_sysconfdir/sword.conf
 %_bindir/*
-%dir %_libdir/sword
+%_libdir/sword/
 %_libdir/libsword-%{version}.so
 %_datadir/sword
 
@@ -88,8 +80,9 @@
 
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli  1.5.8-10
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Wed Nov 08 2006 Deji Akingunola  - 1.5.9-1
+- New release
+- Build with icu support
 
 * Wed Sep 20 2006 Deji Akingunola  - 1.5.8-9
 - Take over from Michael A. Peters


--- ar_EG-cp1256.conf DELETED ---


--- ar_EG-utf8.conf DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  9 04:20:19 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 8 Nov 2006 21:20:19 -0700
Subject: rpms/sword import.log,1.2,1.3
Message-ID: <200611090420.kA94KJDD025190@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25156

Modified Files:
	import.log 
Log Message:
auto-import sword-1.5.9-1 on branch devel from sword-1.5.9-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sword/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Jun 2005 11:54:45 -0000	1.2
+++ import.log	9 Nov 2006 04:19:48 -0000	1.3
@@ -1 +1,2 @@
 sword-1_5_8-1:HEAD:sword-1.5.8-1.src.rpm:1118145261
+sword-1_5_9-1:HEAD:sword-1.5.9-1.src.rpm:1163045983



From fedora-extras-commits at redhat.com  Thu Nov  9 04:24:27 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 8 Nov 2006 21:24:27 -0700
Subject: rpms/gnomesword import.log,1.5,1.6
Message-ID: <200611090424.kA94ORfr025342@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310

Modified Files:
	import.log 
Log Message:
auto-import gnomesword-2.1.8-1 on branch devel from gnomesword-2.1.8-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	15 Sep 2005 23:33:47 -0000	1.5
+++ import.log	9 Nov 2006 04:23:57 -0000	1.6
@@ -2,3 +2,4 @@
 gnomesword-2_1_2-2_2:FC-4:gnomesword-2.1.2-2.2.src.rpm:1126783889
 gnomesword-2_1_2-2_2:HEAD:gnomesword-2.1.2-2.2.src.rpm:1126784329
 gnomesword-2_1_2-2_3_fc4:FC-3:gnomesword-2.1.2-2.3.fc4.src.rpm:1126827156
+gnomesword-2_1_8-1:HEAD:gnomesword-2.1.8-1.src.rpm:1163046233



From fedora-extras-commits at redhat.com  Thu Nov  9 04:24:28 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 8 Nov 2006 21:24:28 -0700
Subject: rpms/gnomesword/devel .cvsignore, 1.4, 1.5 gnomesword.spec, 1.13,
	1.14 sources, 1.5, 1.6 gnomesword-2.1.6-svn1213-kjvot.patch, 1.1, NONE
Message-ID: <200611090424.kA94OSfp025347@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25310/devel

Modified Files:
	.cvsignore gnomesword.spec sources 
Removed Files:
	gnomesword-2.1.6-svn1213-kjvot.patch 
Log Message:
auto-import gnomesword-2.1.8-1 on branch devel from gnomesword-2.1.8-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Apr 2006 07:41:35 -0000	1.4
+++ .cvsignore	9 Nov 2006 04:23:58 -0000	1.5
@@ -1,3 +1 @@
-gnomesword-2.1.2.tar.gz
-gnomesword-2.1.3.tar.gz
-gnomesword-2.1.6.tar.gz
+gnomesword-2.1.8.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnomesword.spec	4 Oct 2006 22:36:09 -0000	1.13
+++ gnomesword.spec	9 Nov 2006 04:23:58 -0000	1.14
@@ -1,17 +1,16 @@
 Name:           gnomesword           
-Version:        2.1.6
-Release:        5%{?dist}
+Version:        2.1.8
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.6-svn1213-kjvot.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
-BuildRequires:  sword-devel >= 1.5.8
+BuildRequires:  sword-devel >= 1.5.9
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
@@ -83,8 +81,8 @@
 
 
 %changelog
-* Thu Oct 05 2006 Christian Iseli  2.1.6-5
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+* Wed Nov 08 2006 Deji Akingunola  - 2.1.8-1
+- Update to new (unstable) version 
 
 * Wed Sep 20 2006 Deji Akingunola  - 2.1.6-4
 - Add perl(XML::Parser) to the BRs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2006 07:41:35 -0000	1.5
+++ sources	9 Nov 2006 04:23:58 -0000	1.6
@@ -1,2 +1 @@
-61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
-7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz
+fd648e8690e1c96b8f94b249eeb09b03  gnomesword-2.1.8.tar.gz


--- gnomesword-2.1.6-svn1213-kjvot.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  9 05:12:51 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 8 Nov 2006 22:12:51 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6
	gnome-theme-clearlooks-bigpack.spec, 1.6, 1.7
Message-ID: <200611090512.kA95Cpo9028560@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/FC-6

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Spec fixes; explicitly require gtk2-engines >= 2.8 since we're doing cairo-enabled goodness


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:37:25 -0000	1.6
+++ gnome-theme-clearlooks-bigpack.spec	9 Nov 2006 05:12:20 -0000	1.7
@@ -45,14 +45,15 @@
 
 
 %changelog
-* Sat Nov 04 2006 Peter Gordon 
+* Sat Nov 04 2006 Peter Gordon  - 0.6-4
 - Explicitly depend on gtk2-engines >= 2.8, since we're doing Cairo-enabled
   goodness
+- Add bug# to previous %%changelog entry.
 
 * Sat Nov 04 2006 Peter Gordon  - 0.6-3
 - Fix homepage URL
 - A bunch of aesthetic cleanups to the spec
-- Add Cairo-enabled themes
+- Add Cairo-enabled themes (resolves bug #214030)
 
 * Wed Oct 11 2006 Peter Gordon  0.6-2
 - Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel)



From fedora-extras-commits at redhat.com  Thu Nov  9 05:12:52 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 8 Nov 2006 22:12:52 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/devel
	gnome-theme-clearlooks-bigpack.spec, 1.6, 1.7
Message-ID: <200611090512.kA95CqlA028563@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/devel

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Spec fixes; explicitly require gtk2-engines >= 2.8 since we're doing cairo-enabled goodness


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/devel/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-theme-clearlooks-bigpack.spec	4 Nov 2006 22:37:26 -0000	1.6
+++ gnome-theme-clearlooks-bigpack.spec	9 Nov 2006 05:12:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		gnome-theme-clearlooks-bigpack
 Version:	0.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Additional Clearlooks color schemes
 
 Group:		User Interface/Desktops
@@ -45,14 +45,15 @@
 
 
 %changelog
-* Sat Nov 04 2006 Peter Gordon 
+* Sat Nov 04 2006 Peter Gordon  - 0.6-4
 - Explicitly depend on gtk2-engines >= 2.8, since we're doing Cairo-enabled
   goodness
+- Add bug# to previous %%changelog entry.
 
 * Sat Nov 04 2006 Peter Gordon  - 0.6-3
 - Fix homepage URL
 - A bunch of aesthetic cleanups to the spec
-- Add Cairo-enabled themes
+- Add Cairo-enabled themes (resolves bug #214030)
 
 * Wed Oct 11 2006 Peter Gordon  - 0.6-2
 - Bump EVR and rebuild to pick up new dist tag evaluation (for FC6/Devel)



From fedora-extras-commits at redhat.com  Thu Nov  9 05:16:16 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 8 Nov 2006 22:16:16 -0700
Subject: rpms/gnome-theme-clearlooks-bigpack/FC-6
	gnome-theme-clearlooks-bigpack.spec, 1.7, 1.8
Message-ID: <200611090516.kA95GG1m028596@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28579/FC-6

Modified Files:
	gnome-theme-clearlooks-bigpack.spec 
Log Message:
Actually bump EVR properly for FC-6 branch...


Index: gnome-theme-clearlooks-bigpack.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-theme-clearlooks-bigpack/FC-6/gnome-theme-clearlooks-bigpack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-theme-clearlooks-bigpack.spec	9 Nov 2006 05:12:20 -0000	1.7
+++ gnome-theme-clearlooks-bigpack.spec	9 Nov 2006 05:15:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		gnome-theme-clearlooks-bigpack
 Version:	0.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Additional Clearlooks color schemes
 
 Group:		User Interface/Desktops



From fedora-extras-commits at redhat.com  Thu Nov  9 06:31:59 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 8 Nov 2006 23:31:59 -0700
Subject: rpms/gnomesword/devel gnomesword.spec,1.14,1.15
Message-ID: <200611090631.kA96Vx4m032026@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32010

Modified Files:
	gnomesword.spec 
Log Message:
* Thu Nov 09 2006 Deji Akingunola  - 2.1.8-2
- Fix Build requires



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnomesword.spec	9 Nov 2006 04:23:58 -0000	1.14
+++ gnomesword.spec	9 Nov 2006 06:31:28 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -19,6 +19,7 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  perl(XML::Parser)
+BuildRequires:  libicu-devel icu
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -81,6 +82,9 @@
 
 
 %changelog
+* Thu Nov 09 2006 Deji Akingunola  - 2.1.8-2
+- Fix Build requires
+
 * Wed Nov 08 2006 Deji Akingunola  - 2.1.8-1
 - Update to new (unstable) version 
 



From fedora-extras-commits at redhat.com  Thu Nov  9 06:45:48 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 8 Nov 2006 23:45:48 -0700
Subject: rpms/gnomesword/devel gnomesword.spec,1.15,1.16
Message-ID: <200611090645.kA96jmPc032111@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32095

Modified Files:
	gnomesword.spec 
Log Message:
* Thu Nov 09 2006 Deji Akingunola  - 2.1.8-3
- Seems parallel make is causing problems



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnomesword.spec	9 Nov 2006 06:31:28 -0000	1.15
+++ gnomesword.spec	9 Nov 2006 06:45:18 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -41,8 +41,8 @@
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
-make %{?_smp_mflags}
-
+#make %{?_smp_mflags} : // Dosn't seem to work on i386
+make
 
 %install
 rm -rf %buildroot
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Thu Nov 09 2006 Deji Akingunola  - 2.1.8-3
+- Seems parallel make is causing problems
+
 * Thu Nov 09 2006 Deji Akingunola  - 2.1.8-2
 - Fix Build requires
 



From fedora-extras-commits at redhat.com  Thu Nov  9 07:14:09 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 00:14:09 -0700
Subject: rpms/gperiodic import.log,1.4,1.5
Message-ID: <200611090714.kA97E99g002814@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2784

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-5 on branch devel from gperiodic-2.0.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	14 Feb 2006 21:49:38 -0000	1.4
+++ import.log	9 Nov 2006 07:13:39 -0000	1.5
@@ -1,3 +1,4 @@
 gperiodic-2_0_8-2:HEAD:gperiodic-2.0.8-2.src.rpm:1130708935
 gperiodic-2_0_8-3:HEAD:gperiodic-2.0.8-3.src.rpm:1139607599
 gperiodic-2_0_8-4:HEAD:gperiodic-2.0.8-4.src.rpm:1139953768
+gperiodic-2_0_8-5:HEAD:gperiodic-2.0.8-5.src.rpm:1163056409



From fedora-extras-commits at redhat.com  Thu Nov  9 07:14:10 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 00:14:10 -0700
Subject: rpms/gperiodic/devel gperiodic.spec,1.4,1.5
Message-ID: <200611090714.kA97EAit002817@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2784/devel

Modified Files:
	gperiodic.spec 
Log Message:
auto-import gperiodic-2.0.8-5 on branch devel from gperiodic-2.0.8-5.src.rpm


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gperiodic.spec	28 Aug 2006 07:07:24 -0000	1.4
+++ gperiodic.spec	9 Nov 2006 07:13:40 -0000	1.5
@@ -4,8 +4,8 @@
 Release: 5%{?dist}
 License: GPL
 Group: Applications/Engineering
-URL: http://koti.welho.com/jfrantz/software/gperiodic.html
-Source: http://koti.welho.com/jfrantz/software/gperiodic-%{version}.tar.gz
+URL: http://www.frantz.fi/software/gperiodic.php
+Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -58,8 +58,8 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
-* Mon Aug 28 2006 Eric Tanguy  - 2.0.8-5
-- Rebuild for Fedora Extras 6
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
+- Modify URL in package descrpition and source
 
 * Tue Feb 14 2006 Eric Tanguy  - 2.0.8-4
 - Rebuild for FC5



From fedora-extras-commits at redhat.com  Thu Nov  9 09:48:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 02:48:47 -0700
Subject: rpms/imlib2/devel imlib2-1.3.0-loader_overflows.patch, NONE,
	1.1 imlib2.spec, 1.24, 1.25
Message-ID: <200611090948.kA99mlw8009505@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9486

Modified Files:
	imlib2.spec 
Added Files:
	imlib2-1.3.0-loader_overflows.patch 
Log Message:
* Thu Nov  9 2006 Hans de Goede  1.3.0-3
- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
  Ubuntu for the patch (bug 214676)


imlib2-1.3.0-loader_overflows.patch:

--- NEW FILE imlib2-1.3.0-loader_overflows.patch ---
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c
--- imlib2-1.2.1/src/modules/loaders/loader_argb.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c	2006-11-06 01:30:41.000000000 -0800
@@ -23,7 +23,7 @@
 load(ImlibImage * im, ImlibProgressFunction progress,
      char progress_granularity, char immediate_load)
 {
-   int                 w, h, alpha;
+   int                 w=0, h=0, alpha=0;
    FILE               *f;
 
    if (im->data)
@@ -36,13 +36,15 @@
    {
       char                buf[256], buf2[256];
 
+      memset(buf, 0, sizeof(buf));
+      memset(buf2, 0, sizeof(buf));
       if (!fgets(buf, 255, f))
         {
            fclose(f);
            return 0;
         }
       sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha);
-      if (strcmp(buf2, "ARGB"))
+      if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383)
         {
            fclose(f);
            return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c
--- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c	2006-11-06 01:33:01.000000000 -0800
@@ -104,8 +104,9 @@
         im->w = w = cinfo.output_width;
         im->h = h = cinfo.output_height;
 
-        if (cinfo.rec_outbuf_height > 16)
+        if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383)
           {
+	     im->w = im->h = 0;
              jpeg_destroy_decompress(&cinfo);
              fclose(f);
              return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c
--- imlib2-1.2.1/src/modules/loaders/loader_lbm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c	2006-11-06 01:30:41.000000000 -0800
@@ -421,7 +421,7 @@
 
         im->w = L2RWORD(ilbm.bmhd.data);
         im->h = L2RWORD(ilbm.bmhd.data + 2);
-        if (im->w <= 0 || im->h <= 0) ok = 0;
+        if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0;
 
         ilbm.depth = ilbm.bmhd.data[8];
         if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
@@ -453,6 +453,7 @@
         }
     }
     if (!full || !ok) {
+        im->w = im->h = 0;
         freeilbm(&ilbm);
         return ok;
     }
@@ -467,12 +468,13 @@
     cancel = 0;
     plane[0] = NULL;
 
+    n = ilbm.depth;
+    if (ilbm.mask == 1) n++;
+
     im->data = malloc(im->w * im->h * sizeof(DATA32));
-    if (im->data) {
-        n = ilbm.depth;
-        if (ilbm.mask == 1) n++;
+    plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
+    if (im->data && plane[0]) {
 
-        plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
         for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
 
         z = ((im->w + 15) / 16) * 2 * n;
@@ -511,6 +513,7 @@
    * the memory for im->data.
    *----------*/
     if (!ok) {
+        im->w = im->h = 0;
         if (im->data) free(im->data);
         im->data = NULL;
     }
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c
--- imlib2-1.2.1/src/modules/loaders/loader_png.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c	2006-11-06 01:30:41.000000000 -0800
@@ -83,6 +83,13 @@
         png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
                      (png_uint_32 *) (&h32), &bit_depth, &color_type,
                      &interlace_type, NULL, NULL);
+        if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383)
+           {
+              png_read_end(png_ptr, info_ptr);
+              png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+              fclose(f);
+              return 0;
+           }
         im->w = (int)w32;
         im->h = (int)h32;
         if (color_type == PNG_COLOR_TYPE_PALETTE)
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c
--- imlib2-1.2.1/src/modules/loaders/loader_pnm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c	2006-11-06 01:30:41.000000000 -0800
@@ -80,7 +80,7 @@
              int                 i = 0;
 
              /* read numbers */
-             while (c != EOF && !isspace(c))
+             while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
                {
                   buf[i++] = c;
                   c = fgetc(f);
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c
--- imlib2-1.2.1/src/modules/loaders/loader_tga.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c	2006-11-06 01:30:41.000000000 -0800
@@ -319,6 +319,7 @@
      {
         unsigned long       datasize;
         unsigned char      *bufptr;
+        unsigned char      *bufend;
         DATA32             *dataptr;
 
         int                 y, pl = 0;
@@ -348,6 +349,9 @@
         /* bufptr is the next byte to be read from the buffer */
         bufptr = filedata;
 
+        /* bufend is one past the last byte to be read from the buffer */
+        bufend = filedata + datasize;
+
         /* dataptr is the next 32-bit pixel to be filled in */
         dataptr = im->data;
 
@@ -365,7 +369,9 @@
                   else
                      dataptr = im->data + (y * im->w);
 
-                  for (x = 0; x < im->w; x++)   /* for each pixel in the row */
+                  for (x = 0;
+                       x < im->w && bufptr+bpp/8 < bufend;
+                       x++)   /* for each pixel in the row */
                     {
                        switch (bpp)
                          {
@@ -422,8 +428,8 @@
              unsigned char       curbyte, red, green, blue, alpha;
              DATA32             *final_pixel = dataptr + im->w * im->h;
 
-             /* loop until we've got all the pixels */
-             while (dataptr < final_pixel)
+             /* loop until we've got all the pixels or run out of input */
+             while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend)
                {
                   int                 count;
 
@@ -441,7 +447,7 @@
                               green = *bufptr++;
                               red = *bufptr++;
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue, alpha);
                                    dataptr++;
@@ -452,7 +458,7 @@
                               blue = *bufptr++;
                               green = *bufptr++;
                               red = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue,
                                               (char)0xff);
@@ -462,7 +468,7 @@
 
                            case 8:
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, alpha, alpha, alpha,
                                               (char)0xff);
@@ -477,7 +483,7 @@
                     {
                        int                 i;
 
-                       for (i = 0; i < count; i++)
+                       for (i = 0; i < count && dataptr < final_pixel; i++)
                          {
                             switch (bpp)
                               {
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c
--- imlib2-1.2.1/src/modules/loaders/loader_tiff.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c	2006-11-06 01:30:41.000000000 -0800
@@ -75,7 +75,7 @@
 raster(TIFFRGBAImage_Extra * img, uint32 * rast,
        uint32 x, uint32 y, uint32 w, uint32 h)
 {
-   uint32              image_width, image_height;
+   int                image_width, image_height;
    uint32             *pixel, pixel_value;
    int                 i, j, dy, rast_offset;
    DATA32             *buffer_pixel, *buffer = img->image->data;
@@ -192,8 +192,16 @@
      }
    
    rgba_image.image = im;
-   im->w = width = rgba_image.rgba.width;
-   im->h = height = rgba_image.rgba.height;
+   width = rgba_image.rgba.width;
+   height = rgba_image.rgba.height;
+   if (width < 1 || height < 1 || width >= 16384 || height >= 16384)
+     {
+        TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
+        TIFFClose(tif);
+        return 0;
+     }
+   im->w = width;
+   im->h = height;
    rgba_image.num_pixels = num_pixels = width * height;
    if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED)
       SET_FLAG(im->flags, F_HAS_ALPHA);


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- imlib2.spec	26 Oct 2006 22:22:38 -0000	1.24
+++ imlib2.spec	9 Nov 2006 09:48:17 -0000	1.25
@@ -1,23 +1,24 @@
-Summary:	Image loading, saving, rendering, and manipulation library
-Name:		imlib2
-Version:	1.3.0
-Release:	2%{?dist}
-License:	BSD
-Group:		System Environment/Libraries
-URL:		http://www.enlightenment.org/Libraries/Imlib2/
-Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0:		imlib2-1.2.1-X11-path.patch
+Summary:        Image loading, saving, rendering, and manipulation library
+Name:           imlib2
+Version:        1.3.0
+Release:        3%{?dist}
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.enlightenment.org/Libraries/Imlib2/
+Source0:        http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0:         imlib2-1.2.1-X11-path.patch
 Patch1:         imlib2-1.3.0-multilib.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libjpeg-devel libpng-devel libtiff-devel
-BuildRequires:	giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
-BuildRequires:	libX11-devel libXext-devel libid3tag-devel pkgconfig
+Patch2:         imlib2-1.3.0-loader_overflows.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
+BuildRequires:  giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
+BuildRequires:  libX11-devel libXext-devel libid3tag-devel pkgconfig
 
 %package devel
-Summary:	Development package for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig
+Summary:        Development package for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig
 
 
 %description
@@ -45,6 +46,7 @@
 %setup -q
 %patch0 -p1 -b .x11-path
 %patch1 -p1 -b .multilib
+%patch2 -p1 -b .overflow
 # sigh stop autoxxx from rerunning because of our patches above.
 touch aclocal.m4
 touch configure
@@ -114,6 +116,10 @@
 
 
 %changelog
+* Thu Nov  9 2006 Hans de Goede  1.3.0-3
+- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
+  Ubuntu for the patch (bug 214676)
+
 * Thu Oct 26 2006 Hans de Goede  1.3.0-2
 - Multilib devel goodness (make -devel i386 and x86_64 parallel installable)
 - Fix bug 212469



From fedora-extras-commits at redhat.com  Thu Nov  9 09:51:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 02:51:29 -0700
Subject: rpms/imlib2/FC-6 imlib2-1.3.0-loader_overflows.patch, NONE,
	1.1 imlib2-1.3.0-multilib.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 imlib2.spec, 1.22, 1.23 sources, 1.6, 1.7
Message-ID: <200611090951.kA99pTto009591@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9563

Modified Files:
	.cvsignore imlib2.spec sources 
Added Files:
	imlib2-1.3.0-loader_overflows.patch 
	imlib2-1.3.0-multilib.patch 
Log Message:
* Thu Nov  9 2006 Hans de Goede  1.3.0-3
- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
  Ubuntu for the patch (bug 214676)


imlib2-1.3.0-loader_overflows.patch:

--- NEW FILE imlib2-1.3.0-loader_overflows.patch ---
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c
--- imlib2-1.2.1/src/modules/loaders/loader_argb.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c	2006-11-06 01:30:41.000000000 -0800
@@ -23,7 +23,7 @@
 load(ImlibImage * im, ImlibProgressFunction progress,
      char progress_granularity, char immediate_load)
 {
-   int                 w, h, alpha;
+   int                 w=0, h=0, alpha=0;
    FILE               *f;
 
    if (im->data)
@@ -36,13 +36,15 @@
    {
       char                buf[256], buf2[256];
 
+      memset(buf, 0, sizeof(buf));
+      memset(buf2, 0, sizeof(buf));
       if (!fgets(buf, 255, f))
         {
            fclose(f);
            return 0;
         }
       sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha);
-      if (strcmp(buf2, "ARGB"))
+      if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383)
         {
            fclose(f);
            return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c
--- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c	2006-11-06 01:33:01.000000000 -0800
@@ -104,8 +104,9 @@
         im->w = w = cinfo.output_width;
         im->h = h = cinfo.output_height;
 
-        if (cinfo.rec_outbuf_height > 16)
+        if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383)
           {
+	     im->w = im->h = 0;
              jpeg_destroy_decompress(&cinfo);
              fclose(f);
              return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c
--- imlib2-1.2.1/src/modules/loaders/loader_lbm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c	2006-11-06 01:30:41.000000000 -0800
@@ -421,7 +421,7 @@
 
         im->w = L2RWORD(ilbm.bmhd.data);
         im->h = L2RWORD(ilbm.bmhd.data + 2);
-        if (im->w <= 0 || im->h <= 0) ok = 0;
+        if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0;
 
         ilbm.depth = ilbm.bmhd.data[8];
         if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
@@ -453,6 +453,7 @@
         }
     }
     if (!full || !ok) {
+        im->w = im->h = 0;
         freeilbm(&ilbm);
         return ok;
     }
@@ -467,12 +468,13 @@
     cancel = 0;
     plane[0] = NULL;
 
+    n = ilbm.depth;
+    if (ilbm.mask == 1) n++;
+
     im->data = malloc(im->w * im->h * sizeof(DATA32));
-    if (im->data) {
-        n = ilbm.depth;
-        if (ilbm.mask == 1) n++;
+    plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
+    if (im->data && plane[0]) {
 
-        plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
         for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
 
         z = ((im->w + 15) / 16) * 2 * n;
@@ -511,6 +513,7 @@
    * the memory for im->data.
    *----------*/
     if (!ok) {
+        im->w = im->h = 0;
         if (im->data) free(im->data);
         im->data = NULL;
     }
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c
--- imlib2-1.2.1/src/modules/loaders/loader_png.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c	2006-11-06 01:30:41.000000000 -0800
@@ -83,6 +83,13 @@
         png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
                      (png_uint_32 *) (&h32), &bit_depth, &color_type,
                      &interlace_type, NULL, NULL);
+        if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383)
+           {
+              png_read_end(png_ptr, info_ptr);
+              png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+              fclose(f);
+              return 0;
+           }
         im->w = (int)w32;
         im->h = (int)h32;
         if (color_type == PNG_COLOR_TYPE_PALETTE)
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c
--- imlib2-1.2.1/src/modules/loaders/loader_pnm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c	2006-11-06 01:30:41.000000000 -0800
@@ -80,7 +80,7 @@
              int                 i = 0;
 
              /* read numbers */
-             while (c != EOF && !isspace(c))
+             while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
                {
                   buf[i++] = c;
                   c = fgetc(f);
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c
--- imlib2-1.2.1/src/modules/loaders/loader_tga.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c	2006-11-06 01:30:41.000000000 -0800
@@ -319,6 +319,7 @@
      {
         unsigned long       datasize;
         unsigned char      *bufptr;
+        unsigned char      *bufend;
         DATA32             *dataptr;
 
         int                 y, pl = 0;
@@ -348,6 +349,9 @@
         /* bufptr is the next byte to be read from the buffer */
         bufptr = filedata;
 
+        /* bufend is one past the last byte to be read from the buffer */
+        bufend = filedata + datasize;
+
         /* dataptr is the next 32-bit pixel to be filled in */
         dataptr = im->data;
 
@@ -365,7 +369,9 @@
                   else
                      dataptr = im->data + (y * im->w);
 
-                  for (x = 0; x < im->w; x++)   /* for each pixel in the row */
+                  for (x = 0;
+                       x < im->w && bufptr+bpp/8 < bufend;
+                       x++)   /* for each pixel in the row */
                     {
                        switch (bpp)
                          {
@@ -422,8 +428,8 @@
              unsigned char       curbyte, red, green, blue, alpha;
              DATA32             *final_pixel = dataptr + im->w * im->h;
 
-             /* loop until we've got all the pixels */
-             while (dataptr < final_pixel)
+             /* loop until we've got all the pixels or run out of input */
+             while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend)
                {
                   int                 count;
 
@@ -441,7 +447,7 @@
                               green = *bufptr++;
                               red = *bufptr++;
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue, alpha);
                                    dataptr++;
@@ -452,7 +458,7 @@
                               blue = *bufptr++;
                               green = *bufptr++;
                               red = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue,
                                               (char)0xff);
@@ -462,7 +468,7 @@
 
                            case 8:
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, alpha, alpha, alpha,
                                               (char)0xff);
@@ -477,7 +483,7 @@
                     {
                        int                 i;
 
-                       for (i = 0; i < count; i++)
+                       for (i = 0; i < count && dataptr < final_pixel; i++)
                          {
                             switch (bpp)
                               {
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c
--- imlib2-1.2.1/src/modules/loaders/loader_tiff.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c	2006-11-06 01:30:41.000000000 -0800
@@ -75,7 +75,7 @@
 raster(TIFFRGBAImage_Extra * img, uint32 * rast,
        uint32 x, uint32 y, uint32 w, uint32 h)
 {
-   uint32              image_width, image_height;
+   int                image_width, image_height;
    uint32             *pixel, pixel_value;
    int                 i, j, dy, rast_offset;
    DATA32             *buffer_pixel, *buffer = img->image->data;
@@ -192,8 +192,16 @@
      }
    
    rgba_image.image = im;
-   im->w = width = rgba_image.rgba.width;
-   im->h = height = rgba_image.rgba.height;
+   width = rgba_image.rgba.width;
+   height = rgba_image.rgba.height;
+   if (width < 1 || height < 1 || width >= 16384 || height >= 16384)
+     {
+        TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
+        TIFFClose(tif);
+        return 0;
+     }
+   im->w = width;
+   im->h = height;
    rgba_image.num_pixels = num_pixels = width * height;
    if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED)
       SET_FLAG(im->flags, F_HAS_ALPHA);

imlib2-1.3.0-multilib.patch:

--- NEW FILE imlib2-1.3.0-multilib.patch ---
--- imlib2-1.3.0/configure.in~	2006-10-27 00:18:39.000000000 +0200
+++ imlib2-1.3.0/configure.in	2006-10-27 00:18:39.000000000 +0200
@@ -190,7 +190,7 @@
   AC_PATH_XTRA
   x_dir=${x_dir:-/usr/X11R6}
   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+  x_libs="-lX11 -lXext"
   AM_CONDITIONAL(BUILD_X11, true)
   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
 else
--- imlib2-1.3.0/configure~	2006-10-27 00:18:25.000000000 +0200
+++ imlib2-1.3.0/configure	2006-10-27 00:18:25.000000000 +0200
@@ -23117,7 +23117,7 @@
 
   x_dir=${x_dir:-/usr/X11R6}
   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+  x_libs="-lX11 -lXext"
 
 
 if true; then
--- imlib2-1.3.0/imlib2-config.in~	2006-10-27 00:17:29.000000000 +0200
+++ imlib2-1.3.0/imlib2-config.in	2006-10-27 00:17:29.000000000 +0200
@@ -45,8 +45,7 @@
       echo $includes
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -lImlib2 @my_libs@
+      echo -lImlib2 @my_libs@
       ;;
     *)
       echo "${usage}" 1>&2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jul 2006 09:07:44 -0000	1.5
+++ .cvsignore	9 Nov 2006 09:50:58 -0000	1.6
@@ -1 +1 @@
-imlib2-1.2.2.tar.gz
+imlib2-1.3.0.tar.gz


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-6/imlib2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- imlib2.spec	28 Aug 2006 14:11:38 -0000	1.22
+++ imlib2.spec	9 Nov 2006 09:50:58 -0000	1.23
@@ -1,22 +1,24 @@
-Summary:	Image loading, saving, rendering, and manipulation library
-Name:		imlib2
-Version:	1.2.2
-Release:	2%{?dist}
-License:	BSD
-Group:		System Environment/Libraries
-URL:		http://www.enlightenment.org/Libraries/Imlib2/
-Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0:		imlib2-1.2.1-X11-path.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libjpeg-devel libpng-devel libtiff-devel
-BuildRequires:	libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
-BuildRequires:	libX11-devel libXext-devel pkgconfig
+Summary:        Image loading, saving, rendering, and manipulation library
+Name:           imlib2
+Version:        1.3.0
+Release:        3%{?dist}
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.enlightenment.org/Libraries/Imlib2/
+Source0:        http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0:         imlib2-1.2.1-X11-path.patch
+Patch1:         imlib2-1.3.0-multilib.patch
+Patch2:         imlib2-1.3.0-loader_overflows.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
+BuildRequires:  giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
+BuildRequires:  libX11-devel libXext-devel libid3tag-devel pkgconfig
 
 %package devel
-Summary:	Development package for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig
+Summary:        Development package for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig
 
 
 %description
@@ -43,6 +45,13 @@
 %prep
 %setup -q
 %patch0 -p1 -b .x11-path
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .overflow
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
 
 
 %build
@@ -107,6 +116,18 @@
 
 
 %changelog
+* Thu Nov  9 2006 Hans de Goede  1.3.0-3
+- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
+  Ubuntu for the patch (bug 214676)
+
+* Thu Oct 26 2006 Hans de Goede  1.3.0-2
+- Multilib devel goodness (make -devel i386 and x86_64 parallel installable)
+- Fix bug 212469
+- Add libid3tag-devel to the BR's so id3tag support gets build in
+
+* Tue Oct 24 2006 Hans de Goede  1.3.0-1
+- New upstream release 1.3.0
+
 * Mon Aug 28 2006 Hans de Goede  1.2.2-2
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jul 2006 09:07:44 -0000	1.6
+++ sources	9 Nov 2006 09:50:58 -0000	1.7
@@ -1 +1 @@
-07b2a7745ddd3c7c4480b50cb916174c  imlib2-1.2.2.tar.gz
+00b724fc6d2dcfa3045bb6a554bb2c8a  imlib2-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 09:54:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 02:54:56 -0700
Subject: rpms/imlib2/FC-5 imlib2-1.3.0-loader_overflows.patch, NONE,
	1.1 imlib2-1.3.0-multilib.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 imlib2.spec, 1.19, 1.20 sources, 1.5, 1.6
Message-ID: <200611090954.kA99suNa009698@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9667

Modified Files:
	.cvsignore imlib2.spec sources 
Added Files:
	imlib2-1.3.0-loader_overflows.patch 
	imlib2-1.3.0-multilib.patch 
Log Message:
* Thu Nov  9 2006 Hans de Goede  1.3.0-3
- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
  Ubuntu for the patch (bug 214676)


imlib2-1.3.0-loader_overflows.patch:

--- NEW FILE imlib2-1.3.0-loader_overflows.patch ---
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c
--- imlib2-1.2.1/src/modules/loaders/loader_argb.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c	2006-11-06 01:30:41.000000000 -0800
@@ -23,7 +23,7 @@
 load(ImlibImage * im, ImlibProgressFunction progress,
      char progress_granularity, char immediate_load)
 {
-   int                 w, h, alpha;
+   int                 w=0, h=0, alpha=0;
    FILE               *f;
 
    if (im->data)
@@ -36,13 +36,15 @@
    {
       char                buf[256], buf2[256];
 
+      memset(buf, 0, sizeof(buf));
+      memset(buf2, 0, sizeof(buf));
       if (!fgets(buf, 255, f))
         {
            fclose(f);
            return 0;
         }
       sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha);
-      if (strcmp(buf2, "ARGB"))
+      if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383)
         {
            fclose(f);
            return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c
--- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c	2006-11-06 01:33:01.000000000 -0800
@@ -104,8 +104,9 @@
         im->w = w = cinfo.output_width;
         im->h = h = cinfo.output_height;
 
-        if (cinfo.rec_outbuf_height > 16)
+        if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383)
           {
+	     im->w = im->h = 0;
              jpeg_destroy_decompress(&cinfo);
              fclose(f);
              return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c
--- imlib2-1.2.1/src/modules/loaders/loader_lbm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c	2006-11-06 01:30:41.000000000 -0800
@@ -421,7 +421,7 @@
 
         im->w = L2RWORD(ilbm.bmhd.data);
         im->h = L2RWORD(ilbm.bmhd.data + 2);
-        if (im->w <= 0 || im->h <= 0) ok = 0;
+        if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0;
 
         ilbm.depth = ilbm.bmhd.data[8];
         if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
@@ -453,6 +453,7 @@
         }
     }
     if (!full || !ok) {
+        im->w = im->h = 0;
         freeilbm(&ilbm);
         return ok;
     }
@@ -467,12 +468,13 @@
     cancel = 0;
     plane[0] = NULL;
 
+    n = ilbm.depth;
+    if (ilbm.mask == 1) n++;
+
     im->data = malloc(im->w * im->h * sizeof(DATA32));
-    if (im->data) {
-        n = ilbm.depth;
-        if (ilbm.mask == 1) n++;
+    plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
+    if (im->data && plane[0]) {
 
-        plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
         for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
 
         z = ((im->w + 15) / 16) * 2 * n;
@@ -511,6 +513,7 @@
    * the memory for im->data.
    *----------*/
     if (!ok) {
+        im->w = im->h = 0;
         if (im->data) free(im->data);
         im->data = NULL;
     }
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c
--- imlib2-1.2.1/src/modules/loaders/loader_png.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c	2006-11-06 01:30:41.000000000 -0800
@@ -83,6 +83,13 @@
         png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
                      (png_uint_32 *) (&h32), &bit_depth, &color_type,
                      &interlace_type, NULL, NULL);
+        if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383)
+           {
+              png_read_end(png_ptr, info_ptr);
+              png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+              fclose(f);
+              return 0;
+           }
         im->w = (int)w32;
         im->h = (int)h32;
         if (color_type == PNG_COLOR_TYPE_PALETTE)
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c
--- imlib2-1.2.1/src/modules/loaders/loader_pnm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c	2006-11-06 01:30:41.000000000 -0800
@@ -80,7 +80,7 @@
              int                 i = 0;
 
              /* read numbers */
-             while (c != EOF && !isspace(c))
+             while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
                {
                   buf[i++] = c;
                   c = fgetc(f);
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c
--- imlib2-1.2.1/src/modules/loaders/loader_tga.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c	2006-11-06 01:30:41.000000000 -0800
@@ -319,6 +319,7 @@
      {
         unsigned long       datasize;
         unsigned char      *bufptr;
+        unsigned char      *bufend;
         DATA32             *dataptr;
 
         int                 y, pl = 0;
@@ -348,6 +349,9 @@
         /* bufptr is the next byte to be read from the buffer */
         bufptr = filedata;
 
+        /* bufend is one past the last byte to be read from the buffer */
+        bufend = filedata + datasize;
+
         /* dataptr is the next 32-bit pixel to be filled in */
         dataptr = im->data;
 
@@ -365,7 +369,9 @@
                   else
                      dataptr = im->data + (y * im->w);
 
-                  for (x = 0; x < im->w; x++)   /* for each pixel in the row */
+                  for (x = 0;
+                       x < im->w && bufptr+bpp/8 < bufend;
+                       x++)   /* for each pixel in the row */
                     {
                        switch (bpp)
                          {
@@ -422,8 +428,8 @@
              unsigned char       curbyte, red, green, blue, alpha;
              DATA32             *final_pixel = dataptr + im->w * im->h;
 
-             /* loop until we've got all the pixels */
-             while (dataptr < final_pixel)
+             /* loop until we've got all the pixels or run out of input */
+             while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend)
                {
                   int                 count;
 
@@ -441,7 +447,7 @@
                               green = *bufptr++;
                               red = *bufptr++;
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue, alpha);
                                    dataptr++;
@@ -452,7 +458,7 @@
                               blue = *bufptr++;
                               green = *bufptr++;
                               red = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue,
                                               (char)0xff);
@@ -462,7 +468,7 @@
 
                            case 8:
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, alpha, alpha, alpha,
                                               (char)0xff);
@@ -477,7 +483,7 @@
                     {
                        int                 i;
 
-                       for (i = 0; i < count; i++)
+                       for (i = 0; i < count && dataptr < final_pixel; i++)
                          {
                             switch (bpp)
                               {
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c
--- imlib2-1.2.1/src/modules/loaders/loader_tiff.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c	2006-11-06 01:30:41.000000000 -0800
@@ -75,7 +75,7 @@
 raster(TIFFRGBAImage_Extra * img, uint32 * rast,
        uint32 x, uint32 y, uint32 w, uint32 h)
 {
-   uint32              image_width, image_height;
+   int                image_width, image_height;
    uint32             *pixel, pixel_value;
    int                 i, j, dy, rast_offset;
    DATA32             *buffer_pixel, *buffer = img->image->data;
@@ -192,8 +192,16 @@
      }
    
    rgba_image.image = im;
-   im->w = width = rgba_image.rgba.width;
-   im->h = height = rgba_image.rgba.height;
+   width = rgba_image.rgba.width;
+   height = rgba_image.rgba.height;
+   if (width < 1 || height < 1 || width >= 16384 || height >= 16384)
+     {
+        TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
+        TIFFClose(tif);
+        return 0;
+     }
+   im->w = width;
+   im->h = height;
    rgba_image.num_pixels = num_pixels = width * height;
    if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED)
       SET_FLAG(im->flags, F_HAS_ALPHA);

imlib2-1.3.0-multilib.patch:

--- NEW FILE imlib2-1.3.0-multilib.patch ---
--- imlib2-1.3.0/configure.in~	2006-10-27 00:18:39.000000000 +0200
+++ imlib2-1.3.0/configure.in	2006-10-27 00:18:39.000000000 +0200
@@ -190,7 +190,7 @@
   AC_PATH_XTRA
   x_dir=${x_dir:-/usr/X11R6}
   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+  x_libs="-lX11 -lXext"
   AM_CONDITIONAL(BUILD_X11, true)
   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
 else
--- imlib2-1.3.0/configure~	2006-10-27 00:18:25.000000000 +0200
+++ imlib2-1.3.0/configure	2006-10-27 00:18:25.000000000 +0200
@@ -23117,7 +23117,7 @@
 
   x_dir=${x_dir:-/usr/X11R6}
   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+  x_libs="-lX11 -lXext"
 
 
 if true; then
--- imlib2-1.3.0/imlib2-config.in~	2006-10-27 00:17:29.000000000 +0200
+++ imlib2-1.3.0/imlib2-config.in	2006-10-27 00:17:29.000000000 +0200
@@ -45,8 +45,7 @@
       echo $includes
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -lImlib2 @my_libs@
+      echo -lImlib2 @my_libs@
       ;;
     *)
       echo "${usage}" 1>&2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Sep 2005 19:09:39 -0000	1.4
+++ .cvsignore	9 Nov 2006 09:54:26 -0000	1.5
@@ -1 +1 @@
-imlib2-1.2.1.tar.gz
+imlib2-1.3.0.tar.gz


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-5/imlib2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- imlib2.spec	23 Jul 2006 08:19:55 -0000	1.19
+++ imlib2.spec	9 Nov 2006 09:54:26 -0000	1.20
@@ -1,22 +1,24 @@
-Summary:	Image loading, saving, rendering, and manipulation library
-Name:		imlib2
-Version:	1.2.1
-Release:	6%{?dist}
-License:	BSD
-Group:		System Environment/Libraries
-URL:		http://www.enlightenment.org/Libraries/Imlib2/
-Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0:		imlib2-1.2.1-X11-path.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	libjpeg-devel libpng-devel libtiff-devel
-BuildRequires:	libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
-BuildRequires:	libX11-devel libXext-devel
+Summary:        Image loading, saving, rendering, and manipulation library
+Name:           imlib2
+Version:        1.3.0
+Release:        3%{?dist}
+License:        BSD
+Group:          System Environment/Libraries
+URL:            http://www.enlightenment.org/Libraries/Imlib2/
+Source0:        http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0:         imlib2-1.2.1-X11-path.patch
+Patch1:         imlib2-1.3.0-multilib.patch
+Patch2:         imlib2-1.3.0-loader_overflows.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
+BuildRequires:  giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
+BuildRequires:  libX11-devel libXext-devel libid3tag-devel pkgconfig
 
 %package devel
-Summary:	Development package for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig
+Summary:        Development package for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig
 
 
 %description
@@ -43,6 +45,13 @@
 %prep
 %setup -q
 %patch0 -p1 -b .x11-path
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .overflow
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
 
 
 %build
@@ -83,12 +92,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS README ChangeLog TODO
-%{_bindir}/imlib2_view
-%{_bindir}/imlib2_bumpmap
-%{_bindir}/imlib2_colorspace
-%{_bindir}/imlib2_conv
-%{_bindir}/imlib2_poly
-%{_bindir}/imlib2_show
+%{_bindir}/imlib2_*
 %{_libdir}/libImlib2.so.*
 %dir %{_datadir}/imlib2/
 %{_datadir}/imlib2/data/
@@ -112,6 +116,24 @@
 
 
 %changelog
+* Thu Nov  9 2006 Hans de Goede  1.3.0-3
+- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
+  Ubuntu for the patch (bug 214676)
+
+* Thu Oct 26 2006 Hans de Goede  1.3.0-2
+- Multilib devel goodness (make -devel i386 and x86_64 parallel installable)
+- Fix bug 212469
+- Add libid3tag-devel to the BR's so id3tag support gets build in
+
+* Tue Oct 24 2006 Hans de Goede  1.3.0-1
+- New upstream release 1.3.0
+
+* Mon Aug 28 2006 Hans de Goede  1.2.2-2
+- FE6 Rebuild
+
+* Sun Jul 23 2006 Hans de Goede  1.2.2-1
+- New upstream release 1.2.2
+
 * Sun Jul 23 2006 Hans de Goede  1.2.1-6
 - Taking over as maintainer since Anvil has other priorities
 - Long long due rebuild with new gcc for FC-5 (bug 185871)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 19:09:39 -0000	1.5
+++ sources	9 Nov 2006 09:54:26 -0000	1.6
@@ -1 +1 @@
-e32970d03d8aee2885782312d0a7f15f  imlib2-1.2.1.tar.gz
+00b724fc6d2dcfa3045bb6a554bb2c8a  imlib2-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 10:07:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 03:07:35 -0700
Subject: rpms/imlib2/FC-4 imlib2-1.3.0-loader_overflows.patch, NONE,
	1.1 imlib2.spec, 1.15, 1.16
Message-ID: <200611091007.kA9A7Zn4012932@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/imlib2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12910

Modified Files:
	imlib2.spec 
Added Files:
	imlib2-1.3.0-loader_overflows.patch 
Log Message:
* Thu Nov  9 2006 Hans de Goede  1.2.1-2
- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
  Ubuntu for the patch (bug 214676)


imlib2-1.3.0-loader_overflows.patch:

--- NEW FILE imlib2-1.3.0-loader_overflows.patch ---
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c
--- imlib2-1.2.1/src/modules/loaders/loader_argb.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c	2006-11-06 01:30:41.000000000 -0800
@@ -23,7 +23,7 @@
 load(ImlibImage * im, ImlibProgressFunction progress,
      char progress_granularity, char immediate_load)
 {
-   int                 w, h, alpha;
+   int                 w=0, h=0, alpha=0;
    FILE               *f;
 
    if (im->data)
@@ -36,13 +36,15 @@
    {
       char                buf[256], buf2[256];
 
+      memset(buf, 0, sizeof(buf));
+      memset(buf2, 0, sizeof(buf));
       if (!fgets(buf, 255, f))
         {
            fclose(f);
            return 0;
         }
       sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha);
-      if (strcmp(buf2, "ARGB"))
+      if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383)
         {
            fclose(f);
            return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c
--- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c	2006-11-06 01:33:01.000000000 -0800
@@ -104,8 +104,9 @@
         im->w = w = cinfo.output_width;
         im->h = h = cinfo.output_height;
 
-        if (cinfo.rec_outbuf_height > 16)
+        if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383)
           {
+	     im->w = im->h = 0;
              jpeg_destroy_decompress(&cinfo);
              fclose(f);
              return 0;
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c
--- imlib2-1.2.1/src/modules/loaders/loader_lbm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c	2006-11-06 01:30:41.000000000 -0800
@@ -421,7 +421,7 @@
 
         im->w = L2RWORD(ilbm.bmhd.data);
         im->h = L2RWORD(ilbm.bmhd.data + 2);
-        if (im->w <= 0 || im->h <= 0) ok = 0;
+        if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0;
 
         ilbm.depth = ilbm.bmhd.data[8];
         if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
@@ -453,6 +453,7 @@
         }
     }
     if (!full || !ok) {
+        im->w = im->h = 0;
         freeilbm(&ilbm);
         return ok;
     }
@@ -467,12 +468,13 @@
     cancel = 0;
     plane[0] = NULL;
 
+    n = ilbm.depth;
+    if (ilbm.mask == 1) n++;
+
     im->data = malloc(im->w * im->h * sizeof(DATA32));
-    if (im->data) {
-        n = ilbm.depth;
-        if (ilbm.mask == 1) n++;
+    plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
+    if (im->data && plane[0]) {
 
-        plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
         for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
 
         z = ((im->w + 15) / 16) * 2 * n;
@@ -511,6 +513,7 @@
    * the memory for im->data.
    *----------*/
     if (!ok) {
+        im->w = im->h = 0;
         if (im->data) free(im->data);
         im->data = NULL;
     }
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_png.c imlib2-1.2.1.new/src/modules/loaders/loader_png.c
--- imlib2-1.2.1/src/modules/loaders/loader_png.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_png.c	2006-11-06 01:30:41.000000000 -0800
@@ -83,6 +83,13 @@
         png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
                      (png_uint_32 *) (&h32), &bit_depth, &color_type,
                      &interlace_type, NULL, NULL);
+        if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383)
+           {
+              png_read_end(png_ptr, info_ptr);
+              png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+              fclose(f);
+              return 0;
+           }
         im->w = (int)w32;
         im->h = (int)h32;
         if (color_type == PNG_COLOR_TYPE_PALETTE)
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c
--- imlib2-1.2.1/src/modules/loaders/loader_pnm.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c	2006-11-06 01:30:41.000000000 -0800
@@ -80,7 +80,7 @@
              int                 i = 0;
 
              /* read numbers */
-             while (c != EOF && !isspace(c))
+             while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
                {
                   buf[i++] = c;
                   c = fgetc(f);
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c
--- imlib2-1.2.1/src/modules/loaders/loader_tga.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c	2006-11-06 01:30:41.000000000 -0800
@@ -319,6 +319,7 @@
      {
         unsigned long       datasize;
         unsigned char      *bufptr;
+        unsigned char      *bufend;
         DATA32             *dataptr;
 
         int                 y, pl = 0;
@@ -348,6 +349,9 @@
         /* bufptr is the next byte to be read from the buffer */
         bufptr = filedata;
 
+        /* bufend is one past the last byte to be read from the buffer */
+        bufend = filedata + datasize;
+
         /* dataptr is the next 32-bit pixel to be filled in */
         dataptr = im->data;
 
@@ -365,7 +369,9 @@
                   else
                      dataptr = im->data + (y * im->w);
 
-                  for (x = 0; x < im->w; x++)   /* for each pixel in the row */
+                  for (x = 0;
+                       x < im->w && bufptr+bpp/8 < bufend;
+                       x++)   /* for each pixel in the row */
                     {
                        switch (bpp)
                          {
@@ -422,8 +428,8 @@
              unsigned char       curbyte, red, green, blue, alpha;
              DATA32             *final_pixel = dataptr + im->w * im->h;
 
-             /* loop until we've got all the pixels */
-             while (dataptr < final_pixel)
+             /* loop until we've got all the pixels or run out of input */
+             while (dataptr < final_pixel && bufptr+1+bpp/8 < bufend)
                {
                   int                 count;
 
@@ -441,7 +447,7 @@
                               green = *bufptr++;
                               red = *bufptr++;
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue, alpha);
                                    dataptr++;
@@ -452,7 +458,7 @@
                               blue = *bufptr++;
                               green = *bufptr++;
                               red = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, red, green, blue,
                                               (char)0xff);
@@ -462,7 +468,7 @@
 
                            case 8:
                               alpha = *bufptr++;
-                              for (i = 0; i < count; i++)
+                              for (i = 0; i < count && dataptr < final_pixel; i++)
                                 {
                                    WRITE_RGBA(dataptr, alpha, alpha, alpha,
                                               (char)0xff);
@@ -477,7 +483,7 @@
                     {
                        int                 i;
 
-                       for (i = 0; i < count; i++)
+                       for (i = 0; i < count && dataptr < final_pixel; i++)
                          {
                             switch (bpp)
                               {
diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tiff.c imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c
--- imlib2-1.2.1/src/modules/loaders/loader_tiff.c	2006-11-06 01:27:59.000000000 -0800
+++ imlib2-1.2.1.new/src/modules/loaders/loader_tiff.c	2006-11-06 01:30:41.000000000 -0800
@@ -75,7 +75,7 @@
 raster(TIFFRGBAImage_Extra * img, uint32 * rast,
        uint32 x, uint32 y, uint32 w, uint32 h)
 {
-   uint32              image_width, image_height;
+   int                image_width, image_height;
    uint32             *pixel, pixel_value;
    int                 i, j, dy, rast_offset;
    DATA32             *buffer_pixel, *buffer = img->image->data;
@@ -192,8 +192,16 @@
      }
    
    rgba_image.image = im;
-   im->w = width = rgba_image.rgba.width;
-   im->h = height = rgba_image.rgba.height;
+   width = rgba_image.rgba.width;
+   height = rgba_image.rgba.height;
+   if (width < 1 || height < 1 || width >= 16384 || height >= 16384)
+     {
+        TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
+        TIFFClose(tif);
+        return 0;
+     }
+   im->w = width;
+   im->h = height;
    rgba_image.num_pixels = num_pixels = width * height;
    if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED)
       SET_FLAG(im->flags, F_HAS_ALPHA);


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-4/imlib2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- imlib2.spec	20 Sep 2005 19:09:55 -0000	1.15
+++ imlib2.spec	9 Nov 2006 10:07:05 -0000	1.16
@@ -1,11 +1,12 @@
 Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
 Version:	1.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.enlightenment.org/Libraries/Imlib2/
 Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0:		imlib2-1.3.0-loader_overflows.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:	libungif-devel freetype-devel libtool bzip2-devel %{__perl}
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .overflow
 
 
 %build
@@ -118,6 +120,10 @@
 
 
 %changelog
+* Thu Nov  9 2006 Hans de Goede  1.2.1-2
+- Fix CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809, thanks to
+  Ubuntu for the patch (bug 214676)
+
 * Sun Aug 28 2005 Ville Skytt??  - 1.2.1-1
 - 1.2.1, patches applied/obsoleted upstream.
 - Improve summary and description, fix URL.



From fedora-extras-commits at redhat.com  Thu Nov  9 10:19:08 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 9 Nov 2006 03:19:08 -0700
Subject: rpms/mod_fcgid/FC-6 .cvsignore, 1.2, 1.3 configuration.htm, 1.1,
	1.2 doc.htm, 1.1, 1.2 mod_fcgid.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611091019.kA9AJ8P5013072@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-serv13045

Modified Files:
	.cvsignore configuration.htm doc.htm mod_fcgid.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 13:08:59 -0000	1.2
+++ .cvsignore	9 Nov 2006 10:18:38 -0000	1.3
@@ -1 +1 @@
-mod_fcgid.1.10.tar.gz
+mod_fcgid.2.0.tar.gz


Index: configuration.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/configuration.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configuration.htm	6 Sep 2006 13:08:59 -0000	1.1
+++ configuration.htm	9 Nov 2006 10:18:38 -0000	1.2
@@ -9,62 +9,62 @@
 
 
 
-
      This is a for regular fastcgi. 
      LoadModule fcgid_module           
+
      This is a for regular fastcgi. 
      LoadModule fcgid_module              
 modules/mod_fcgid.so
      
-<Location /fcgid>
               
-    SetHandler fcgid-script
               
-    Options ExecCGI
               
-    allow from all
               
+<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            
+
      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 /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 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         
+
      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
               
+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
          
+
      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 *: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 /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>
      
 
         
    
@@ -79,23 +79,89 @@
 
 
      
 

      
-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
           
+<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
          
 </Directory>
      
 
 
      
+
      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 
+(default On)
      
+
      Setting the FastCgiAuthenticatorAuthoritative directive 
+explicitly to Off allows authentication to be passed on to lower level 
+modules
      
+
+
      
+
      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 
+(default On)
      
+
+
      Setting the FastCgiAuthorizerAuthoritative directive explicitly 
+to Off allows authorization to be passed on to lower level modules
      
+
+
      
+
      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 
+(default On)
      
+
      Setting the FastCgiAccessCheckerAuthoritative directive 
+explicitly to Off allows access checking to be passed on to lower level 
+modules
      
+
      ??
      
+
      ??
      
+
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
+
      ??
      
 
      ??
      
 
      ??
      
 
      ??
      


Index: doc.htm
===================================================================
RCS file: /cvs/extras/rpms/mod_fcgid/FC-6/doc.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doc.htm	6 Sep 2006 13:08:59 -0000	1.1
+++ doc.htm	9 Nov 2006 10:18:38 -0000	1.2
@@ -51,7 +51,10 @@
 (non-PHP, non-Ruby, non-Python) 
      Configuration
 for suEXEC fastcgi
      Configuration for PHP
 (UNIX)
      Configuration for suPHP (UNIX)
      Configuration
-for PHP (Windows)
       
+for PHP (Windows)
      Configuration
+for Authenticator
      Configuration
+for Authorizer
      Configuration
+for AccessChecker
       
 
      
 
        
   
      • There are
@@ -90,9 +93,16 @@
 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
+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.
+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.
        
 
 
      
   
      
diff -uNr espeak-1.16-source/docs/phontab.html espeak-1.16-source-mod/docs/phontab.html
--- espeak-1.16-source/docs/phontab.html	2006-09-21 12:05:22.000000000 +0200
+++ espeak-1.16-source-mod/docs/phontab.html	2006-11-02 20:07:04.000000000 +0200
@@ -36,7 +36,7 @@
 <parent> Is the name of a previously defined phoneme table whose phoneme definitions are inherited by this one.  The name base indicates the first (base) phoneme table.
 
      
 
      phonemenumber <integer>
-
      This statement is used at the start of the master phonemes file to define some specific code numbers for various phonemes which are used directly within the speak program.
+
      This statement is used at the start of the master phonemes file to define some specific code numbers for various phonemes which are used directly within the espeak program.
 
 
       
      
 
      Phoneme definitions
      
@@ -149,7 +149,7 @@
 
      Change to this if the next phoneme is not a vowel.
 
      
 
      lengthmod <integer>
-
      (C) Determines how this consonant affects the length of the previous vowel. This value is used as index into the length_mods table in the CalcLengths() function in the speak program.
+
      (C) Determines how this consonant affects the length of the previous vowel. This value is used as index into the length_mods table in the CalcLengths() function in the espeak program.
 
      
 
      vowelin <vowel transition data>
 
      (C) Specifies the effects of this consonant on the formants of a following vowel. See "vowel transitions", below.
@@ -180,7 +180,7 @@
 A <sound spec> in the phoneme table can refer to a WAV file, a formant sequence, or a mixture of both. It can also include a numeric value to adjust the length of the sound.
 
       
      
 
      Vowel Transitions
      
-These specify how a consonant affects an adjacent vowel.  A consonant may cause a transition in the vowel's formants as the mouth changes shape between the consonant and the vowel.  The following attributes may be specified.  Note that the maximum rate of change of formant frequencies is limited by the speak program.
      
+These specify how a consonant affects an adjacent vowel.  A consonant may cause a transition in the vowel's formants as the mouth changes shape between the consonant and the vowel.  The following attributes may be specified.  Note that the maximum rate of change of formant frequencies is limited by the espeak program.
      
 
        
 
        len=<integer>
 
        Nominal length of the transition in mS.  If omitted a default value is used.
diff -uNr espeak-1.16-source/docs/voices.html espeak-1.16-source-mod/docs/voices.html
--- espeak-1.16-source/docs/voices.html	2006-09-21 12:41:22.000000000 +0200
+++ espeak-1.16-source-mod/docs/voices.html	2006-11-02 20:04:35.000000000 +0200
@@ -15,9 +15,9 @@
 A Voice file specifies a language (and possibly a language variant or dialect) together with various attributes that affect the characteristics of the voice quality and how the language is spoken.
        
 Voice files are placed in the espeak-data/voices directory, or within subdirectories in there.
        
 The available voice files can be listed by:
        -   speak --voices
+   espeak --voices
 or
-   speak --voices=<language>
        
+   espeak --voices=<language>
 
        
 
        5.2 Contents of Voice Files
        
 The language attribute is mandatory.  All the other attributes are optional.
@@ -109,7 +109,7 @@
 
        
 dictionary  <name>
        
 
           Specifies which pair of dictionary files to use.  eg. "english"
-   indicates that speak-data/en_dict should
+   indicates that espeak-data/en_dict should
    be used to translate from words to phonemes.  This parameter is usually
    not needed as it is set by default to the first two letters of "language" parameter.
        
 
        
@@ -217,12 +217,12 @@
 
        5.3 Voice Files Provided
        
 A number of Voice files are provided in the espeak-data/voices directory.
 You can select one of these with the -v <voice filename> parameter to the
-speak command.
+espeak command.
 
        
 
        
 
        
 default
        
-
           This voice is used if none is specified in the speak command.  Copy your preferred voice to "default" so you can use the speak command without the need to specify a voice.
        
+
           This voice is used if none is specified in the espeak command.  Copy your preferred voice to "default" so you can use the espeak command without the need to specify a voice.
        
 
        
 For a list of voices provided for English and other languages see Languages.
 
diff -uNr espeak-1.16-source/ReadMe espeak-1.16-source-mod/ReadMe
--- espeak-1.16-source/ReadMe	2006-09-20 23:19:41.000000000 +0200
+++ espeak-1.16-source-mod/ReadMe	2006-11-02 19:57:40.000000000 +0200
@@ -6,9 +6,9 @@
 =========
 
 The  src  directory contains a simple  makefile  that compiles all the
-source files in the directory and produces a  "speak"  binary.
+source files in the directory and produces an  "espeak"  binary.
 
-When run, the "speak" program expects to find the  espeak-data  directory
+When run, the "espeak" program expects to find the  espeak-data  directory
 either in the user's home directory, or if not there, in /use/share.
 
 
@@ -17,7 +17,7 @@
 
 The makefile also compiles a shared library version of eSpeak and creates a
 file:  libespeak.so.1.xx  where xx is the version number.  This is not
-currently used by the "speak" program, but is available for use by other
+currently used by the "espeak" program, but is available for use by other
 software (eg. the next version of Speech Dispatcher).
 
 The API is described in the file:  speak_lib.h.
@@ -26,7 +26,7 @@
 Portaudio.
 ========== 
 
-The "speak" program uses the PortAudio sound interface library.  There are two
+The "espeak" program uses the PortAudio sound interface library.  There are two
 versions, V18 and V19 and their APIs are different.  Some Linux distributions
 use V18 (eg. Debian, Ubuntu) others (eg. SuSe) use V19.
 
diff -uNr espeak-1.16-source/src/Makefile espeak-1.16-source-mod/src/Makefile
--- espeak-1.16-source/src/Makefile	2006-11-02 20:09:34.000000000 +0200
+++ espeak-1.16-source-mod/src/Makefile	2006-11-02 19:55:45.000000000 +0200
@@ -6,7 +6,7 @@
 DATADIR=/usr/share/espeak-data
 
 RELEASE = 1.16
-BIN_NAME = speak
+BIN_NAME = espeak
 LIB_NAME = libespeak.so
 LIB_VERSION = 1
 LIBTAG = $(LIB_VERSION).$(RELEASE)

makefile_install_target.patch:

--- NEW FILE makefile_install_target.patch ---
diff -uNr espeak-1.16-source/src/Makefile espeak-1.16-source-mod/src/Makefile
--- espeak-1.16-source/src/Makefile	2006-10-03 00:59:36.000000000 +0200
+++ espeak-1.16-source-mod/src/Makefile	2006-11-04 18:29:51.000000000 +0200
@@ -1,3 +1,18 @@
+BINDIR=/usr/local/bin
+INCDIR=/usr/include/espeak
+LIBDIR=/usr/lib
+DATADIR=/usr/share/espeak-data
+
+RELEASE = 1.16
+BIN_NAME = speak
+LIB_NAME = libespeak.so
+LIB_VERSION = 1
+LIBTAG = $(LIB_VERSION).$(RELEASE)
+
+INSTALL = /usr/bin/install
+LN_SF = /bin/ln -sf
+MKDIR = mkdir -p
+
 speak_SOURCES = speak.cpp compiledict.cpp dictionary.cpp intonation.cpp \
 	readclause.cpp setlengths.cpp \
 	synthdata.cpp synthesize.cpp translate.cpp tr_english.cpp \
@@ -17,29 +32,48 @@
 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
 LIBS2=-lstdc++
 
+CXXFLAGS=-O2
 
 
-all: speak libespeak.so
-	mv libespeak.so libespeak.so.1.1.16
+all: $(BIN_NAME) $(LIB_NAME)
+	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) -O2 -Wall -pedantic -I. -c -fno-exceptions $<
+	$(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
 
-speak: $(OBJS1)
+$(BIN_NAME): $(OBJS1)
 	$(CXX) -o $@ $(OBJS1) $(LIBS1)
 
 
 
 x_%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -O2 -Wall -fpic -fvisibility=hidden -pedantic \
+	$(CXX) $(CXXFLAGS) -Wall -fpic -fvisibility=hidden -pedantic \
 	-I. -D LIBRARY -c -fno-exceptions $<  -o x_$*.o
 
-libespeak.so: $(OBJS2)
-	$(CXX) -shared -Wl,-soname,libespeak.so.1 -o $@ $(OBJS2) $(LIBS2)
-
+$(LIB_NAME): $(OBJS2)
+	$(CXX) -shared -Wl,-soname,$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
+  
 clean:
 	rm -f *.o *~
 
 distclean: clean
-	rm -f speak
-	rm -f libespeak.so*
+	rm -f $(BIN_NAME)
+	rm -f $(LIB_NAME)*
+
+install: all
+	# Create directories
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(MKDIR) $(DESTDIR)$(LIBDIR)
+	$(MKDIR) $(DESTDIR)$(INCDIR)
+	$(MKDIR) $(DESTDIR)$(DATADIR)
+	# Install executable
+	$(INSTALL) -m 755 $(BIN_NAME) $(DESTDIR)$(BINDIR)
+	# Install shared library
+	$(INSTALL) -m 755 $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)
+	$(LN_SF) $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)/$(LIB_NAME).$(LIB_VERSION)
+	$(LN_SF) $(LIB_NAME).$(LIB_VERSION) $(DESTDIR)$(LIBDIR)/$(LIB_NAME)
+	# Install development headers
+	$(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR)
+	# Install data files
+	cp -prf ../espeak-data/* $(DESTDIR)$(DATADIR)
+
diff -uNr espeak-1.16-source/src/speech.h espeak-1.16-source-mod/src/speech.h
--- espeak-1.16-source/src/speech.h	2006-10-03 00:51:13.000000000 +0200
+++ espeak-1.16-source-mod/src/speech.h	2006-11-04 18:27:02.000000000 +0200
@@ -36,7 +36,10 @@
 #endif
 
 // will look for espeak_data directory here, and also in user's home directory
-#define PATH_ESPEAK_DATA  "/usr/share/espeak-data"
+#ifndef PATH_ESPEAK_DATA
+   #define PATH_ESPEAK_DATA  "/usr/share/espeak-data"
+#endif
+
 
 typedef unsigned short USHORT;
 typedef unsigned char  UCHAR;

makefile_lpthread.patch:

--- NEW FILE makefile_lpthread.patch ---
diff -uNr espeak-1.16-source/src/Makefile espeak-1.16-source-mod/src/Makefile
--- espeak-1.16-source/src/Makefile	2006-10-03 00:59:36.000000000 +0200
+++ espeak-1.16-source-mod/src/Makefile	2006-10-04 15:35:34.000000000 +0200
@@ -11,7 +11,7 @@
 
 SRCS1=$(speak_SOURCES)
 OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
-LIBS1=-lstdc++ -lportaudio
+LIBS1=-lstdc++ -lportaudio -lpthread
 
 SRCS2=$(libespeak_SOURCES)
 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Nov 2006 17:26:33 -0000	1.1
+++ .cvsignore	9 Nov 2006 17:28:19 -0000	1.2
@@ -0,0 +1 @@
+espeak-1.16-source.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Nov 2006 17:26:33 -0000	1.1
+++ sources	9 Nov 2006 17:28:19 -0000	1.2
@@ -0,0 +1 @@
+c376ea94cddda90b093f231926f7ba44  espeak-1.16-source.zip



From fedora-extras-commits at redhat.com  Thu Nov  9 17:30:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Nov 2006 10:30:05 -0700
Subject: fedora-security/extras-errata/errata FEDORA-EXTRAS-2006-004, NONE,
	1.1
Message-ID: <200611091730.kA9HU5E3011420@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/extras-errata/errata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11378/errata

Added Files:
	FEDORA-EXTRAS-2006-004 
Log Message:
FEDORA-EXTRAS-2006-004


--- NEW FILE FEDORA-EXTRAS-2006-004 ---
---------------------------------------------------------------------
Fedora Update Notification
FEDORA-EXTRAS-2006-004
2006-11-09
---------------------------------------------------------------------
Product:    Fedora Extras [3 4 5 6 devel]
Name:       imlib2
Version:    1.2.1-2 [FE 3 4], 1.3.0-3 [FE 5 6 devel]
Summary:    Image loading, saving, rendering, and manipulation library
Description:
Imlib 2 is a library that does image file loading and saving as well
as rendering, manipulation, arbitrary polygon support, etc.
---------------------------------------------------------------------
Update Information:

CVE IDs: CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809

M. Joonas Pihlaja discovered that imlib2 did not sufficiently verify the 
validity of ARGB, JPG, LBM, PNG, PNM, TGA, and TIFF images.  If a user 
were tricked into viewing or processing a specially crafted image with 
an application that uses imlib2, the flaws could be exploited to execute 
arbitrary code with the user's privileges.

Fedora Extras versions earlier then the versions mentioned above are
vulnerable to this problem, upgrade to fix this vulnerability.
---------------------------------------------------------------------
This update can be installed with the 'yum' update program.  Use 'yum
update package-name' at the command line.  For more information, refer
to 'Managing Software with yum,' available at
http://fedora.redhat.com/docs/yum/



From fedora-extras-commits at redhat.com  Thu Nov  9 17:29:59 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu,  9 Nov 2006 10:29:59 -0700
Subject: fedora-security/extras-errata current_id,1.3,1.4
Message-ID: <200611091730.kA9HUTU0011424@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/extras-errata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11378

Modified Files:
	current_id 
Log Message:
FEDORA-EXTRAS-2006-004


Index: current_id
===================================================================
RCS file: /cvs/fedora/fedora-security/extras-errata/current_id,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- current_id	28 Jul 2006 16:04:35 -0000	1.3
+++ current_id	9 Nov 2006 17:29:57 -0000	1.4
@@ -1 +1 @@
-3
+4



From fedora-extras-commits at redhat.com  Thu Nov  9 17:45:08 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Thu, 9 Nov 2006 10:45:08 -0700
Subject: owners owners.list,1.1912,1.1913
Message-ID: <200611091745.kA9Hj8lD011630@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11606

Modified Files:
	owners.list 
Log Message:
Added package: "espeak"



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1912
retrieving revision 1.1913
diff -u -r1.1912 -r1.1913
--- owners.list	9 Nov 2006 17:26:51 -0000	1.1912
+++ owners.list	9 Nov 2006 17:44:38 -0000	1.1913
@@ -361,6 +361,7 @@
 Fedora Extras|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|erlang-esdl|Erlang OpenGL/SDL api and utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
+Fedora Extras|espeak|Software speech synthesizer (text-to-speech)|faucamp at csir.co.za|extras-qa at fedoraproject.org|
 Fedora Extras|evas|A hardware-accelerated canvas API|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|eventlog|Syslog-ng v2 support library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|evolution-bogofilter|A plugin for bogofilter support in evolution|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 17:53:28 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 9 Nov 2006 10:53:28 -0700
Subject: rpms/linphone/FC-6 linphone-1.4.1-libs.patch, NONE, 1.1 .cvsignore, 
	1.5, 1.6 linphone.spec, 1.22, 1.23 sources, 1.5,
	1.6 linphone-1.0.1-pkgconfig.patch, 1.1,
	NONE linphone-1.1.0-Werror.patch, 1.1,
	NONE linphone-1.2.0-gtkentry.patch, 1.1,
	NONE linphone-1.2.0-maxrtp.patch, 1.1,
	NONE linphone-1.2.0-ortp.patch, 1.1, NONE
Message-ID: <200611091753.kA9HrSTS011716@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11693

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.4.1-libs.patch 
Removed Files:
	linphone-1.0.1-pkgconfig.patch linphone-1.1.0-Werror.patch 
	linphone-1.2.0-gtkentry.patch linphone-1.2.0-maxrtp.patch 
	linphone-1.2.0-ortp.patch 
Log Message:
Update to 1.5.0

linphone-1.4.1-libs.patch:

--- NEW FILE linphone-1.4.1-libs.patch ---
diff -ru linphone-1.4.1.old/configure.in linphone-1.4.1.new/configure.in
--- linphone-1.4.1.old/configure.in	2006-09-18 02:28:20.000000000 -0500
+++ linphone-1.4.1.new/configure.in	2006-10-09 08:49:20.000000000 -0500
@@ -242,7 +242,7 @@
 
 AC_SUBST(STRICT_OPTIONS)
 
-AC_CONFIG_SUBDIRS( oRTP mediastreamer2 )
+AC_CONFIG_SUBDIRS( mediastreamer2 )
 
 dnl check for db2html (docbook) to generate html user manual
 AC_CHECK_PROG(have_db2html,db2html, yes, no)
@@ -258,12 +258,7 @@
 
 AC_DEFINE_UNQUOTED(LINPHONE_VERSION,"$PACKAGE_VERSION",[Linphone's version number])
 
-dnl Packaging: Pick oRTP version from ${top_srcdir}/oRTP/configure.ac
-dnl Feel free to propose an alternative & cleaner version...
-top_srcdir=`dirname $0`
-changequote(, )dnl
-ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'`
-changequote([, ])dnl
+ORTP_VERSION=0.11.0
 AC_SUBST([ORTP_VERSION])
 
 AC_OUTPUT([ 
diff -ru linphone-1.4.1.old/Makefile.am linphone-1.4.1.new/Makefile.am
--- linphone-1.4.1.old/Makefile.am	2006-09-11 07:58:46.000000000 -0500
+++ linphone-1.4.1.new/Makefile.am	2006-10-09 08:49:33.000000000 -0500
@@ -3,7 +3,7 @@
 # let make re-run automake upon need
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = m4 pixmaps po ipkg oRTP gsmlib mediastreamer2\
+SUBDIRS = m4 pixmaps po ipkg gsmlib mediastreamer2\
 		media_api exosip coreapi console gnome share
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2006 12:05:15 -0000	1.5
+++ .cvsignore	9 Nov 2006 17:52:58 -0000	1.6
@@ -1 +1 @@
-linphone-1.2.0.tar.gz
+linphone-1.5.0.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/linphone.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linphone.spec	30 Aug 2006 15:50:47 -0000	1.22
+++ linphone.spec	9 Nov 2006 17:52:58 -0000	1.23
@@ -1,24 +1,39 @@
 Name:           linphone
-Version:        1.2.0
-Release:        7%{?dist}
+Version:        1.5.0
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
-URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
+URL:            http://www.linphone.org/
+Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
-Patch1:         linphone-1.2.0-ortp.patch
-Patch2:         linphone-1.1.0-Werror.patch
-Patch3:         linphone-1.2.0-maxrtp.patch
-Patch4:         linphone-1.2.0-gtkentry.patch
+Patch1:         linphone-1.4.1-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
-BuildRequires:  libosip2-devel speex-devel >= 1.0.5  gettext desktop-file-utils
-BuildRequires:  ortp-devel >= 0.7.1
+BuildRequires:  libosip2-devel
+BuildRequires:  ortp-devel = 0.11.0
+
+BuildRequires:  readline-devel
+BuildRequires:  ncurses-devel
+
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  glib2-devel
+BuildRequires:  alsa-lib-devel
+
+BuildRequires:  speex-devel >= 1.2
+
+BuildRequires:  desktop-file-utils
+
 BuildRequires:  perl(XML::Parser)
 
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  libtool
+BuildRequires:  intltool
+BuildRequires:  gettext
+
 %description
 Linphone is mostly sip compliant. It works successfully with these
 implementations:
@@ -27,7 +42,7 @@
     * Hotsip, a free of charge phone for Windows.
     * Vocal, an open source SIP stack from Vovida that includes a SIP proxy
         that works with linphone since version 0.7.1.
-    * Siproxd is a free sip proxy being developped by Thomas Ries because he
+    * Siproxd is a free sip proxy being developed by Thomas Ries because he
         would like to have linphone working behind his firewall. Siproxd is
         simple to setup and works perfectly with linphone.
     * Partysip aims at being a generic and fully functionnal SIP proxy. Visit
@@ -46,14 +61,27 @@
 %prep
 %setup -q
 %patch -p 1 -b .old
-%patch1 -p 1 -b .ortp
-%patch2 -p 1 -b .Werror
-%patch3 -p 1 -b .maxrtp
-%patch4 -p 1 -b .gtkentry
+%patch1 -p 1 -b .libs
+
 rm -r oRTP
 
+libtoolize --copy --force
+autoheader
+aclocal -I m4
+automake --force-missing --add-missing --copy
+autoconf
+rm -rf config.cache
+
+pushd mediastreamer2
+libtoolize --copy --force
+autoheader
+aclocal
+automake --force-missing --add-missing --copy
+autoconf
+popd
+
 %build
-%configure
+%configure --disable-static --disable-video
 make %{?_smp_mflags}
 
 %install
@@ -65,10 +93,11 @@
 desktop-file-install --vendor=fedora \
   --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
+  --remove-category Application \
   --add-category Telephony \
   --add-category GTK \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,12 +112,13 @@
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*.server
 %{_libdir}/liblinphone.so.*
+%{_libdir}/libmediastreamer.so.*
+%{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/gtk-doc/html/mediastreamer
 %{_datadir}/pixmaps/linphone
 %{_datadir}/pixmaps/linphone2.png
 %{_datadir}/sounds/linphone
@@ -96,12 +126,21 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/linphone
-%{_libdir}/liblinphone.a
-%{_libdir}/liblinphone.la
+%{_includedir}/mediastreamer2
 %{_libdir}/liblinphone.so
+%{_libdir}/libmediastreamer.so
+%{_libdir}/libquickstream.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Oct 26 2006 Jeffrey C. Ollie  - 1.5.0-2
+- Don't forget to add new files and remove old ones!
+
+* Thu Oct 26 2006 Jeffrey C. Ollie  - 1.5.0-1
+- Update to 1.5.0
+- Fix spelling error in description.
+- Remove invalid categories on desktop file.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie  - 1.2.0-7
 - Bump release so that I can "make tag"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 12:05:15 -0000	1.5
+++ sources	9 Nov 2006 17:52:58 -0000	1.6
@@ -1 +1 @@
-bd5e513a665ce2e381afce64d569c707  linphone-1.2.0.tar.gz
+e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz


--- linphone-1.0.1-pkgconfig.patch DELETED ---


--- linphone-1.1.0-Werror.patch DELETED ---


--- linphone-1.2.0-gtkentry.patch DELETED ---


--- linphone-1.2.0-maxrtp.patch DELETED ---


--- linphone-1.2.0-ortp.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov  9 18:05:25 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 9 Nov 2006 11:05:25 -0700
Subject: rpms/seamonkey/FC-5 dead.package, NONE, 1.1 Makefile, 1.1,
	NONE find-external-requires, 1.1,
	NONE firefox-0.7.3-default-plugin-less-annoying.patch, 1.1,
	NONE firefox-0.7.3-psfonts.patch, 1.1,
	NONE firefox-1.0-prdtoa.patch, 1.1,
	NONE firefox-1.1-nss-system-nspr.patch, 1.1,
	NONE firefox-1.1-uriloader.patch, 1.1,
	NONE firefox-1.1-visibility.patch, 1.1,
	NONE firefox-1.5-with-system-nss.patch, 1.1,
	NONE firefox-1.5.0.1-dumpstack.patch, 1.1,
	NONE mozilla-1.4.1-ppc64.patch, 1.1,
	NONE mozilla-1.7.3-gnome-vfs-default-app.patch, 1.1,
	NONE mozilla-1.7.5-g-application-name.patch, 1.1,
	NONE mozilla-nspr-packages.patch, 1.1,
	NONE mozilla-psm-exclude-list, 1.1,
	NONE mozilla-xpcom-exclude-list, 1.1, NONE pango-cairo.patch,
	1.1, NONE seamonkey-1.0.1-dumpstack.patch, 1.1,
	NONE seamonkey-cairo-bug5136.patch, 1.1,
	NONE seamonkey-configure.patch, 1.4,
	NONE seamonkey-disable-visibility.patch, 1.1,
	NONE seamonkey-fedora-default-bookmarks.html, 1.1,
	NONE seamonkey-fedora-default-prefs.js, 1.2,
	NONE seamonkey-fedora-home-page.patch, 1.1,
	NONE seamonkey-icon.png, 1.1, NONE seamonkey-mail-icon.png, 1.1,
	NONE seamonkey-mail.desktop, 1.1, NONE seamonkey-make-package.pl,
	1.1, NONE seamonkey-mozconfig, 1.1, NONE seamonkey.desktop, 1.1,
	NONE seamonkey.sh.in, 1.1, NONE seamonkey.spec, 1.7,
	NONE sources, 1.6, NONE thunderbird-0.7.3-gnome-uriloader.patch,
	1.1, NONE thunderbird-1.5-bug304720.patch, 1.1, NONE
Message-ID: <200611091805.kA9I5Phg015046@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15021

Added Files:
	dead.package 
Removed Files:
	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:
The SeaMonkey Fedora Extras package for FC5
will be moved to Fedora Core
and it will made to obsolete the Mozilla package.



--- NEW FILE dead.package ---
The SeaMonkey Fedora Extras package for FC5
will be moved to Fedora Core 
and it will made to obsolete the Mozilla package.


--- 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  Thu Nov  9 18:55:19 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 11:55:19 -0700
Subject: rpms/gperiodic import.log,1.5,1.6
Message-ID: <200611091855.kA9ItJj6015607@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15568

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-5 on branch FC-6 from gperiodic-2.0.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	9 Nov 2006 07:13:39 -0000	1.5
+++ import.log	9 Nov 2006 18:54:48 -0000	1.6
@@ -2,3 +2,4 @@
 gperiodic-2_0_8-3:HEAD:gperiodic-2.0.8-3.src.rpm:1139607599
 gperiodic-2_0_8-4:HEAD:gperiodic-2.0.8-4.src.rpm:1139953768
 gperiodic-2_0_8-5:HEAD:gperiodic-2.0.8-5.src.rpm:1163056409
+gperiodic-2_0_8-5:FC-6:gperiodic-2.0.8-5.src.rpm:1163098476



From fedora-extras-commits at redhat.com  Thu Nov  9 18:55:20 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 11:55:20 -0700
Subject: rpms/gperiodic/FC-6 gperiodic.spec,1.4,1.5
Message-ID: <200611091855.kA9ItKfV015610@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15568/FC-6

Modified Files:
	gperiodic.spec 
Log Message:
auto-import gperiodic-2.0.8-5 on branch FC-6 from gperiodic-2.0.8-5.src.rpm


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/gperiodic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gperiodic.spec	28 Aug 2006 07:07:24 -0000	1.4
+++ gperiodic.spec	9 Nov 2006 18:54:49 -0000	1.5
@@ -4,8 +4,8 @@
 Release: 5%{?dist}
 License: GPL
 Group: Applications/Engineering
-URL: http://koti.welho.com/jfrantz/software/gperiodic.html
-Source: http://koti.welho.com/jfrantz/software/gperiodic-%{version}.tar.gz
+URL: http://www.frantz.fi/software/gperiodic.php
+Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -58,8 +58,8 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
-* Mon Aug 28 2006 Eric Tanguy  - 2.0.8-5
-- Rebuild for Fedora Extras 6
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
+- Modify URL in package descrpition and source
 
 * Tue Feb 14 2006 Eric Tanguy  - 2.0.8-4
 - Rebuild for FC5



From fedora-extras-commits at redhat.com  Thu Nov  9 18:56:41 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 11:56:41 -0700
Subject: rpms/gperiodic import.log,1.6,1.7
Message-ID: <200611091856.kA9IufOQ015701@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15671

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-5 on branch FC-5 from gperiodic-2.0.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	9 Nov 2006 18:54:48 -0000	1.6
+++ import.log	9 Nov 2006 18:56:11 -0000	1.7
@@ -3,3 +3,4 @@
 gperiodic-2_0_8-4:HEAD:gperiodic-2.0.8-4.src.rpm:1139953768
 gperiodic-2_0_8-5:HEAD:gperiodic-2.0.8-5.src.rpm:1163056409
 gperiodic-2_0_8-5:FC-6:gperiodic-2.0.8-5.src.rpm:1163098476
+gperiodic-2_0_8-5:FC-5:gperiodic-2.0.8-5.src.rpm:1163098561



From fedora-extras-commits at redhat.com  Thu Nov  9 18:56:42 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 9 Nov 2006 11:56:42 -0700
Subject: rpms/gperiodic/FC-5 gperiodic.spec,1.3,1.4
Message-ID: <200611091856.kA9IugrK015704@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15671/FC-5

Modified Files:
	gperiodic.spec 
Log Message:
auto-import gperiodic-2.0.8-5 on branch FC-5 from gperiodic-2.0.8-5.src.rpm


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-5/gperiodic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gperiodic.spec	14 Feb 2006 21:49:45 -0000	1.3
+++ gperiodic.spec	9 Nov 2006 18:56:12 -0000	1.4
@@ -1,11 +1,11 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Engineering
-URL: http://koti.welho.com/jfrantz/software/gperiodic.html
-Source: http://koti.welho.com/jfrantz/software/gperiodic-%{version}.tar.gz
+URL: http://www.frantz.fi/software/gperiodic.php
+Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -58,6 +58,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
+- Modify URL in package descrpition and source
+
 * Tue Feb 14 2006 Eric Tanguy  - 2.0.8-4
 - Rebuild for FC5
 



From fedora-extras-commits at redhat.com  Thu Nov  9 19:06:26 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 9 Nov 2006 12:06:26 -0700
Subject: rpms/ganglia/devel ganglia.spec,1.2,1.3
Message-ID: <200611091906.kA9J6QUN018899@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ganglia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18788

Modified Files:
	ganglia.spec 
Log Message:
- Both gmetad and gmond need to run as the ganglia user, but its quite often the case that only one or the other is installed on a system. Have both try to create the ganglia user -- if both try on the same system, the second should silently fail (bz #214762).




Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/ganglia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ganglia.spec	5 Sep 2006 14:06:36 -0000	1.2
+++ ganglia.spec	9 Nov 2006 19:05:56 -0000	1.3
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.0.3
-Release:            10%{?dist}
+Release:            11%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -132,11 +132,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+### Both gmetad and gmond require user ganglia, but monitored
+### nodes only need gmond, servers only need gmetad... So have
+### both packages try to add the user (second one should just
+### fail silently).
 %pre gmetad
 ## Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
+%pre gmond
+## Add the "ganglia" user
+/usr/sbin/useradd -c "Ganglia Monitoring System" \
+        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
+
 %post gmond
 /sbin/chkconfig --add gmond
 
@@ -197,6 +206,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Nov 09 2006 Jarod Wilson  3.0.3-11
+- gmond also needs ganglia user (#214762)
+
 * Tue Sep 05 2006 Jarod Wilson  3.0.3-10
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Thu Nov  9 19:08:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 9 Nov 2006 12:08:13 -0700
Subject: rpms/ganglia/FC-6 ganglia.spec,1.2,1.3
Message-ID: <200611091908.kA9J8DUI018963@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ganglia/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18947

Modified Files:
	ganglia.spec 
Log Message:
- Both gmetad and gmond need to run as the ganglia user, but its quite often the case that only one or the other is installed on a system. Have both try to create the ganglia user -- if both try on the same system, the second should silently fail (bz #214762).




Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/FC-6/ganglia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ganglia.spec	5 Sep 2006 14:06:36 -0000	1.2
+++ ganglia.spec	9 Nov 2006 19:07:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:               ganglia
 Version:            3.0.3
-Release:            10%{?dist}
+Release:            11%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -132,11 +132,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+### Both gmetad and gmond require user ganglia, but monitored
+### nodes only need gmond, servers only need gmetad... So have
+### both packages try to add the user (second one should just
+### fail silently).
 %pre gmetad
 ## Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
+%pre gmond
+## Add the "ganglia" user
+/usr/sbin/useradd -c "Ganglia Monitoring System" \
+        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
+
 %post gmond
 /sbin/chkconfig --add gmond
 
@@ -197,6 +206,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Nov 09 2006 Jarod Wilson  3.0.3-11
+- gmond also needs ganglia user (#214762)
+
 * Tue Sep 05 2006 Jarod Wilson  3.0.3-10
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Thu Nov  9 19:14:29 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Thu, 9 Nov 2006 12:14:29 -0700
Subject: rpms/python-nltk/FC-3 python-nltk-1.4.2-maxent.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 python-nltk.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611091914.kA9JETqN019049@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19025

Modified Files:
	.cvsignore python-nltk.spec sources 
Added Files:
	python-nltk-1.4.2-maxent.patch 
Log Message:
- Updated version 1.4.2 for FE3, with a patch to revert maxent.py to the version that does not require numarray


python-nltk-1.4.2-maxent.patch:

--- NEW FILE python-nltk-1.4.2-maxent.patch ---
--- nltk-1.4.2/nltk/classifier/maxent.py.orig	2004-07-19 06:43:49.000000000 -0400
+++ nltk-1.4.2/nltk/classifier/maxent.py	2006-11-09 14:10:32.000000000 -0500
@@ -5,7 +5,7 @@
 # URL: 
 # For license information, see LICENSE.TXT
 #
-# $Id: maxent.py,v 1.32 2004/07/19 05:34:37 edloper Exp $
+# $Id: maxent.py,v 1.31 2004/07/17 21:03:19 edloper Exp $
 
 """
 
@@ -14,33 +14,20 @@
 emperically consistant with the training data; and chooses the
 distribution with the highest entropy.  A probability distribution is
 X{emperically consistant} with a set of training data if its estimated
-frequency with which a class and a feature vector value co-occur is
-equal to the actual frequency in the data.
+frequency for each pair M{(c, f[i])} is equal to the pair's actual
+frequency in the data, where M{c} is a class and M{f[i]} is the M{i}th
+feature vector element.
+
+                 SUM[t|c[t]=c0] f[i][t]
+freq(c0, f[i]) = -----------------------
+                    SUM[t] f[i][t]
 
-for each pair M{(c, f[i])} is equal to the pair's actual
-frequency in the data, where M{c} is a class and M{f[i]} is a value
-for the M{i}th feature vector element.
 
-"""
-
-# This needs to be updated/fixed:!!
-"""
-                     SUM[t|t[CLASS]=c] t[FEATURE_VECTOR][i]
-actual freq(c, i) = ----------------------------------------
-                          SUM[t] t[FEATURE_VECTOR][i]
-
-
-                  SUM[t] P(t[CLASS]=c) t[FEATURE_VECTOR][i]
-est freq(c, i) = -------------------------------------------
-
-
-                         P(t[c]=c0) t[f][i]
-prob(c0, f[i]) = SUM[t] ---------------------------
-                          SUM[c]
-
-- C{t}: A token
-- C{t[CLASS]}: Token C{t}'s class
-- C{t[FEATURE_VECTOR]}: Token C{t}'s feature vector
+                 SUM[t] SUM[c] P(c[t]=c0) f[i][t]
+prob(c0, f[i]) = ---------------------------------
+                 
+c[t]
+f[i][t]
 
 
 the frequency of each (class, 
@@ -124,9 +111,9 @@
 from nltk import TaskI, PropertyIndirectionMixIn
 import time, types
 
-# Don't use from .. imports, because math and numarray provide
+# Don't use from .. imports, because math and Numeric provide
 # different definitions for useful functions (exp, log, etc.)
-import math, numarray
+import math, Numeric
 
 ##//////////////////////////////////////////////////////
 ##  Maxent Classifier
@@ -346,7 +333,7 @@
 # [XX] requires: features must be encoded with a GISFeatureEncoder!
 class GISMaxentClassifierTrainer(ClassifierTrainerI):
     def _fcount_emperical(self, train_toks):
-        fcount = numarray.zeros(self._weight_vector_len, 'd')
+        fcount = Numeric.zeros(self._weight_vector_len, 'd')
 
         for tok in train_toks:
             feature_vector = tok['FEATURE_VECTOR']
@@ -358,7 +345,7 @@
         return fcount
 
     def _fcount_estimated(self, classifier, train_toks):
-        fcount = numarray.zeros(self._weight_vector_len, 'd')
+        fcount = Numeric.zeros(self._weight_vector_len, 'd')
 
         for tok in train_toks:
             dist = classifier.get_class_probs(tok)
@@ -423,14 +410,14 @@
         # An array that is 1 whenever fcount_emperical is zero.  In
         # other words, it is one for any feature that's not attested
         # in the training data.  This is used to avoid division by zero.
-        unattested = numarray.zeros(len(fcount_emperical))
+        unattested = Numeric.zeros(len(fcount_emperical))
         for i in range(len(fcount_emperical)):
             if fcount_emperical[i] == 0: unattested[i] = 1
 
         # Build the classifier.  Start with weight=1 for each feature,
         # except for the unattested features.  Start those out at
         # zero, since we know that's the correct value.
-        weights = numarray.ones(len(fcount_emperical), 'd')
+        weights = Numeric.ones(len(fcount_emperical), 'd')
         weights -= unattested
         classifier = ConditionalExponentialClassifier(classes, weights)
 
@@ -553,7 +540,7 @@
             emperical frequency for feature M{i}.
         @rtype: C{array} of C{float}
         """
-        fcount = numarray.zeros(self._weight_vector_len, 'd')
+        fcount = Numeric.zeros(self._weight_vector_len, 'd')
 
         for tok in train_toks:
             feature_vector = tok['FEATURE_VECTOR']
@@ -672,12 +659,12 @@
         NEWTON_CONVERGE = 1e-12
         MAX_NEWTON = 30
         
-        deltas = numarray.ones(self._weight_vector_len, 'd')
+        deltas = Numeric.ones(self._weight_vector_len, 'd')
 
         # Precompute the A matrix:
         # A[nf][id] = sum ( p(text) * p(label|text) * f(text,label) )
         # over all label,text s.t. num_features[label,text]=nf
-        A = numarray.zeros((len(nfmap), self._weight_vector_len), 'd')
+        A = Numeric.zeros((len(nfmap), self._weight_vector_len), 'd')
 
         for i, tok in enumerate(train_toks):
             dist = classifier.get_class_probs(tok)
@@ -702,11 +689,11 @@
         #   - sum2[i][nf] = sum p(text)p(label|text)f[i](label,text)
         #                       nf exp(delta[i]nf)
         for rangenum in range(MAX_NEWTON):
-            nf_delta = numarray.outerproduct(nfarray, deltas)
-            exp_nf_delta = numarray.exp(nf_delta)
+            nf_delta = Numeric.outerproduct(nfarray, deltas)
+            exp_nf_delta = Numeric.exp(nf_delta)
             nf_exp_nf_delta = nftranspose * exp_nf_delta
-            sum1 = numarray.sum(exp_nf_delta * A) 
-            sum2 = numarray.sum(nf_exp_nf_delta * A)
+            sum1 = Numeric.sum(exp_nf_delta * A) 
+            sum2 = Numeric.sum(nf_exp_nf_delta * A)
 
             # Avoid division by zero.
             sum2 += unattested
@@ -715,8 +702,8 @@
             deltas -= (ffreq_emperical - sum1) / -sum2
 
             # We can stop once we converge.
-            n_error = (numarray.sum(abs((ffreq_emperical-sum1)))/
-                       numarray.sum(abs(deltas)))
+            n_error = (Numeric.sum(abs((ffreq_emperical-sum1)))/
+                       Numeric.sum(abs(deltas)))
             if n_error < NEWTON_CONVERGE:
                 return deltas
 
@@ -822,20 +809,20 @@
         nfmap = self._nfmap(train_toks)
         nfs = nfmap.items()
         nfs.sort(lambda x,y:cmp(x[1],y[1]))
-        nfarray = numarray.array([nf for (nf, i) in nfs], 'd')
-        nftranspose = numarray.reshape(nfarray, (len(nfarray), 1))
+        nfarray = Numeric.array([nf for (nf, i) in nfs], 'd')
+        nftranspose = Numeric.reshape(nfarray, (len(nfarray), 1))
 
         # An array that is 1 whenever ffreq_emperical is zero.  In
         # other words, it is one for any feature that's not attested
         # in the data.  This is used to avoid division by zero.
-        unattested = numarray.zeros(self._weight_vector_len, 'd')
+        unattested = Numeric.zeros(self._weight_vector_len, 'd')
         for i in range(len(unattested)):
             if ffreq_emperical[i] == 0: unattested[i] = 1
 
         # Build the classifier.  Start with weight=1 for each feature,
         # except for the unattested features.  Start those out at
         # zero, since we know that's the correct value.
-        weights = numarray.ones(self._weight_vector_len, 'd')
+        weights = Numeric.ones(self._weight_vector_len, 'd')
         weights -= unattested
         classifier = ConditionalExponentialClassifier(classes, weights)
                 
@@ -859,7 +846,7 @@
 
             # Use the deltas to update our weights.
             weights = classifier.weights()
-            weights *= numarray.exp(deltas)
+            weights *= Numeric.exp(deltas)
             classifier.set_weights(weights)
                         
             # Check log-likelihood cutoffs.
@@ -963,4 +950,4 @@
             s += '%5s=%.3f' % (val,prob)
         print s + ' ...'
     
-if __name__ == '__main__': demo(1)
+if __name__ == '__main__': demo(30)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Nov 2005 05:22:25 -0000	1.2
+++ .cvsignore	9 Nov 2006 19:13:59 -0000	1.3
@@ -1 +1 @@
-nltk-1.4.4.tar.gz
+nltk-1.4.2.tar.gz


Index: python-nltk.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/python-nltk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-nltk.spec	8 Nov 2006 17:31:50 -0000	1.4
+++ python-nltk.spec	9 Nov 2006 19:13:59 -0000	1.5
@@ -1,20 +1,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-nltk
-Version:        1.4.4
-Release:        3.1%{?dist}
+Version:        1.4.2
+Release:        2%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://nltk.sf.net/
 Source0:        http://dl.sourceforge.net/nltk/nltk-%{version}.tar.gz
+Patch0:         python-nltk-1.4.2-maxent.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:  python
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires:	python-numarray, tkinter
+Requires:	python-numeric, tkinter
 
 %description
 The Natural Language Toolkit is a Python package that simplifies the
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q -n nltk-%{version}
+%patch0 -p1 -b .maxent
 
 
 %build
@@ -60,14 +62,12 @@
 
 
 %changelog
-* Wed Nov  8 2006 Michel Salim  - 1.4.4-3.1
-- Rebuild with correct source
+* Thu Nov  9 2006 Michel Salim  - 1.4.2-2
+- Package .pyos in compliance with new policy
+- Revert maxent.py to a version that does not use numarray
 
-* Wed Nov  8 2006 Michel Salim  - 1.4.4-3
-- Include *.pyos, for compliance with new Python guidelines
+* Mon Feb  6 2006 Michel Salim  - 1.4.2-1
+- Downgrade to 1.4.2 for FC3 only, to match older version of Python installed
 
-* Mon Oct  9 2006 Michel Salim  - 1.4.4-2
-- Rebuild for FE6
-
-* Sun Sep 11 2005 Michel Salim  - 1.4.4-1
+* Sun Sep 11 2005 Michel Salim  - 1.4.4-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nltk/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2006 17:31:50 -0000	1.4
+++ sources	9 Nov 2006 19:13:59 -0000	1.5
@@ -1 +1 @@
-fb402d42d71844fe4483affa100814e5  nltk-1.4.4.tar.gz
+f24e6ac9c2152e9cf6f9fa09e259d783  nltk-1.4.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 19:17:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:17:01 -0700
Subject: rpms/beneath-a-steel-sky - New directory
Message-ID: <200611091917.kA9JH1Xf019151@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19147/beneath-a-steel-sky

Log Message:
Directory /cvs/extras/rpms/beneath-a-steel-sky added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 19:17:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:17:07 -0700
Subject: rpms/beneath-a-steel-sky/devel - New directory
Message-ID: <200611091917.kA9JH7WI019165@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19147/beneath-a-steel-sky/devel

Log Message:
Directory /cvs/extras/rpms/beneath-a-steel-sky/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov  9 19:17:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:17:25 -0700
Subject: rpms/beneath-a-steel-sky Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611091917.kA9JHP53019196@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19190

Added Files:
	Makefile import.log 
Log Message:
Setup of module beneath-a-steel-sky


--- NEW FILE Makefile ---
# Top level Makefile for module beneath-a-steel-sky
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 Nov  9 19:17:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:17:31 -0700
Subject: rpms/beneath-a-steel-sky/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611091917.kA9JHVoi019216@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19190/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beneath-a-steel-sky


--- 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 Nov  9 19:23:04 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:23:04 -0700
Subject: rpms/beneath-a-steel-sky import.log,1.1,1.2
Message-ID: <200611091923.kA9JN4T3019365@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322

Modified Files:
	import.log 
Log Message:
auto-import beneath-a-steel-sky-0.0348-2 on branch devel from beneath-a-steel-sky-0.0348-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Nov 2006 19:17:25 -0000	1.1
+++ import.log	9 Nov 2006 19:22:34 -0000	1.2
@@ -0,0 +1 @@
+beneath-a-steel-sky-0_0348-2:HEAD:beneath-a-steel-sky-0.0348-2.src.rpm:1163100834



From fedora-extras-commits at redhat.com  Thu Nov  9 19:23:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:23:05 -0700
Subject: rpms/beneath-a-steel-sky/devel beneath-a-steel-sky.desktop, NONE,
	1.1 beneath-a-steel-sky.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611091923.kA9JN54Z019369@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19322/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beneath-a-steel-sky.desktop beneath-a-steel-sky.spec 
Log Message:
auto-import beneath-a-steel-sky-0.0348-2 on branch devel from beneath-a-steel-sky-0.0348-2.src.rpm


--- NEW FILE beneath-a-steel-sky.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beneath a Steel Sky
Comment=Adventure Game
Exec=scummvm -f -p /usr/share/beneath-a-steel-sky sky
Icon=scummvm.png
Terminal=false
Type=Application
Categories=Application;Game;AdventureGame;
StartupNotify=false


--- NEW FILE beneath-a-steel-sky.spec ---
Name:           beneath-a-steel-sky
Version:        0.0348
Release:        2
Summary:        Beneath a Steel Sky - Adventure Game
Group:          Amusements/Games
# For further discussion on distribution rights see:
# http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
License:        Distributable
URL:            http://www.revolution.co.uk/_display.php?id=16
Source0:        http://www.mixnmojo.com/bss/BASS-Floppy.zip
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       scummvm >= 0.9.1, hicolor-icon-theme
Obsoletes:      bass <= 0-8
Provides:       bass = 0-8

%description
After the Dungeons and Dragons fantasy setting of Revolution's first game, Lure
of the Temptress, Revolution decided to go down a completely different avenue
with its second adventure game, Beneath a Steel Sky, that of Science Fiction.
A bleak vision of the future was imagined, where mind control and medical
science combined forces to repress the populace. Leading comic artist, Dave
Gibbons, joined the design team to visualise this desperate landscape. The
result is the cult classic Beneath a Steel Sky.

Notice that this package contains the floppy version, the CD version is also
available in the %{name}-cd package. The CD version contains
additional / longer cutscenes and voice acting, but also is much larger: the CD
version ways in at 70 MB where as this version is only 8 MB.


%prep
%setup -q -n sky-floppy


%build
# Nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 sky.* $RPM_BUILD_ROOT%{_datadir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc readme.txt
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Thu Nov  9 2006 Hans de Goede  0.0348-2
- Fix Source0 URL
- Various small specfile cleanups (bug 214057)

* Sun Nov  5 2006 Hans de Goede  0.0348-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Nov 2006 19:17:31 -0000	1.1
+++ .cvsignore	9 Nov 2006 19:22:35 -0000	1.2
@@ -0,0 +1 @@
+BASS-Floppy.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Nov 2006 19:17:31 -0000	1.1
+++ sources	9 Nov 2006 19:22:35 -0000	1.2
@@ -0,0 +1 @@
+cb968b4cfdde8491069915bf15d275b3  BASS-Floppy.zip



From fedora-extras-commits at redhat.com  Thu Nov  9 19:26:29 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 9 Nov 2006 12:26:29 -0700
Subject: rpms/ganglia/FC-5 ganglia.spec,1.1,1.2
Message-ID: <200611091926.kA9JQTx6019551@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ganglia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19535

Modified Files:
	ganglia.spec 
Log Message:
- Both gmetad and gmond need to run as the ganglia user, but its quite often the case that only one or the other is installed on a system. Have both try to create the ganglia user -- if both try on the same system, the second should silently fail (bz #214762).




Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/FC-5/ganglia.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ganglia.spec	15 Jun 2006 20:15:48 -0000	1.1
+++ ganglia.spec	9 Nov 2006 19:25:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ganglia
 Version:	3.0.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Ganglia Distributed Monitoring System
 
 Group:		Applications/Internet
@@ -129,11 +129,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+### Both gmetad and gmond require user ganglia, but monitored
+### nodes only need gmond, servers only need gmetad... So have
+### both packages try to add the user (second one should just
+### fail silently).
 %pre gmetad
 # Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
+%pre gmond
+# Add the "ganglia" user
+/usr/sbin/useradd -c "Ganglia Monitoring System" \
+        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
+
 %post gmond
 /sbin/chkconfig --add gmond
 
@@ -204,6 +213,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Nov 09 2006 Jarod Wilson  3.0.3-8
+- gmond also needs ganglia user (#214762)
+
 * Tue Jun 13 2006 Jarod Wilson  3.0.3-7
 - Clean up documentation
 



From fedora-extras-commits at redhat.com  Thu Nov  9 19:29:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 9 Nov 2006 12:29:16 -0700
Subject: owners owners.list,1.1913,1.1914
Message-ID: <200611091929.kA9JTGxx019601@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19576

Modified Files:
	owners.list 
Log Message:
added beneath-a-steel-sky


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1913
retrieving revision 1.1914
diff -u -r1.1913 -r1.1914
--- owners.list	9 Nov 2006 17:44:38 -0000	1.1913
+++ owners.list	9 Nov 2006 19:28:46 -0000	1.1914
@@ -105,6 +105,7 @@
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov  9 19:31:44 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 9 Nov 2006 12:31:44 -0700
Subject: rpms/sparse/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sparse.spec,
	1.1, 1.2
Message-ID: <200611091931.kA9JViPE019706@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19677

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
upgrade to 0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sparse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Nov 2006 09:24:09 -0000	1.2
+++ .cvsignore	9 Nov 2006 19:31:14 -0000	1.3
@@ -1 +1 @@
-sparse-20061026.tar.bz2
+sparse-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sparse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Nov 2006 09:24:09 -0000	1.2
+++ sources	9 Nov 2006 19:31:14 -0000	1.3
@@ -1 +1 @@
-724e23dc62375879f75708f35f245e58  sparse-20061026.tar.bz2
+367d1cb0a26db26e2da47a491bc95374  sparse-0.1.tar.gz


Index: sparse.spec
===================================================================
RCS file: /cvs/extras/rpms/sparse/devel/sparse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sparse.spec	5 Nov 2006 09:24:09 -0000	1.1
+++ sparse.spec	9 Nov 2006 19:31:14 -0000	1.2
@@ -1,17 +1,11 @@
-%define snapshot_date 20061026
-%define prerelease 1
-%define alphatag %{snapshot_date}git
 Name: sparse          
-Version: 0        
-Release: 0.%{prerelease}.%{alphatag}%{?dist}
-Summary: A semantic parser of source files
-
+Version: 0.1        
+Release: 1%{?dist}
+Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    Open Software License
-URL:        http://www.kernel.org/pub/scm/devel/sparse/sparse.git/    
-# git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git/
-# snapshots also available at http://www.codemonkey.org.uk/projects/git-snapshots/sparse/
-Source0:    sparse-%{snapshot_date}.tar.bz2
+URL:        http://kernel.org/pub/linux/kernel/people/josh/sparse/
+Source0:    http://kernel.org/pub/linux/kernel/people/josh/sparse/dist/sparse-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,7 +25,7 @@
 Sparse is primarily used in the development and debugging of the Linux kernel.
 
 %prep
-%setup -q -n sparse
+%setup -q
 
 
 %build
@@ -43,8 +37,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 make install PREFIX=%{buildroot}%{_prefix}
-# no reason to ship libsparse.so until something exists that links against it
-rm %{buildroot}%{_bindir}/libsparse.so
 
 %clean
 rm -rf %{buildroot}
@@ -54,7 +46,12 @@
 %defattr(-,root,root,-)
 %doc LICENSE README FAQ
 %{_bindir}/sparse
+%{_bindir}/cgcc
 
 %changelog
+* Thu Nov 09 2006 Matt Domsch  0.1-1
+- Upgrade to 0.1, no need for snapshots, yea!  New upstream maintainer.
+- cgcc now installed
+
 * Thu Oct 26 2006 Matt Domsch  0-0.1.20061026git
 - Initial packaging for Fedora Extras



From fedora-extras-commits at redhat.com  Thu Nov  9 19:40:12 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 12:40:12 -0700
Subject: rpms/libapreq2/devel .cvsignore, 1.15, 1.16 libapreq2.spec, 1.22,
	1.23 sources, 1.15, 1.16
Message-ID: <200611091940.kA9JeCBu019839@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19819

Modified Files:
	.cvsignore libapreq2.spec sources 
Log Message:
Bump up to 2.09-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Sep 2006 01:03:04 -0000	1.15
+++ .cvsignore	9 Nov 2006 19:39:42 -0000	1.16
@@ -1 +1 @@
-libapreq2-2.09-rc1.tar.gz
+libapreq2-2.09.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libapreq2.spec	16 Sep 2006 02:34:59 -0000	1.22
+++ libapreq2.spec	9 Nov 2006 19:39:42 -0000	1.23
@@ -2,13 +2,13 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.rc1.3.1%{?dist}
+Release:        0.rc2.1%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://httpd.apache.org/apreq/
-Source0:        http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09-rc1.tar.gz
+Source0:        http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09.tar.gz
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-2.07-rc3-ldflags.patch
@@ -54,11 +54,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
-cd ..
-rm -f %{name}-%{version}
-ln -s %{name}-%{version}-rc1 %{name}-%{version}
-cd %{name}-%{version}
+%setup -q
 
 # Filter unversioned provides for which there's a versioned one in perl-*:
 cat << \EOF > %{name}-perl-prov
@@ -120,7 +116,6 @@
 
 
 %clean
-rm -f ../%{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -158,6 +153,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Bojan Smojver  - 2.09-0.rc2.1
+- bump up to 2.09-rc2
+
 * Sat Sep 16 2006 Bojan Smojver  - 2.09-0.rc1.3.1
 - mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Sep 2006 01:03:04 -0000	1.15
+++ sources	9 Nov 2006 19:39:42 -0000	1.16
@@ -1 +1 @@
-fe69ccbd7198b0f7b4d6436c4d2cea12  libapreq2-2.09-rc1.tar.gz
+3cd98755da8a8431ef35a47461ad67d7  libapreq2-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 19:51:27 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 12:51:27 -0700
Subject: rpms/libapreq2/FC-6 .cvsignore, 1.15, 1.16 libapreq2.spec, 1.22,
	1.23 sources, 1.15, 1.16
Message-ID: <200611091951.kA9JpRSD019995@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/libapreq2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19969

Modified Files:
	.cvsignore libapreq2.spec sources 
Log Message:
Bump up to 2.09-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Sep 2006 01:03:04 -0000	1.15
+++ .cvsignore	9 Nov 2006 19:50:56 -0000	1.16
@@ -1 +1 @@
-libapreq2-2.09-rc1.tar.gz
+libapreq2-2.09.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-6/libapreq2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libapreq2.spec	16 Sep 2006 02:34:59 -0000	1.22
+++ libapreq2.spec	9 Nov 2006 19:50:56 -0000	1.23
@@ -2,13 +2,13 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.rc1.3.1%{?dist}
+Release:        0.rc2.1%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://httpd.apache.org/apreq/
-Source0:        http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09-rc1.tar.gz
+Source0:        http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09.tar.gz
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-2.07-rc3-ldflags.patch
@@ -54,11 +54,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
-cd ..
-rm -f %{name}-%{version}
-ln -s %{name}-%{version}-rc1 %{name}-%{version}
-cd %{name}-%{version}
+%setup -q
 
 # Filter unversioned provides for which there's a versioned one in perl-*:
 cat << \EOF > %{name}-perl-prov
@@ -120,7 +116,6 @@
 
 
 %clean
-rm -f ../%{name}-%{version}
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -158,6 +153,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Bojan Smojver  - 2.09-0.rc2.1
+- bump up to 2.09-rc2
+
 * Sat Sep 16 2006 Bojan Smojver  - 2.09-0.rc1.3.1
 - mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	9 Sep 2006 01:03:04 -0000	1.15
+++ sources	9 Nov 2006 19:50:56 -0000	1.16
@@ -1 +1 @@
-fe69ccbd7198b0f7b4d6436c4d2cea12  libapreq2-2.09-rc1.tar.gz
+3cd98755da8a8431ef35a47461ad67d7  libapreq2-2.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 19:57:43 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 9 Nov 2006 12:57:43 -0700
Subject: rpms/seamonkey/FC-6 .cvsignore, 1.6, 1.7 seamonkey.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200611091957.kA9JvhIB020245@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20216

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
* Thu Nov 09 2006 Kai Engert  1.0.6-0.6
- SeaMonkey 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Sep 2006 01:31:47 -0000	1.6
+++ .cvsignore	9 Nov 2006 19:57:13 -0000	1.7
@@ -1 +1 @@
-seamonkey-1.0.5.source.tar.bz2
+seamonkey-1.0.6.source.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/seamonkey.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- seamonkey.spec	15 Sep 2006 01:31:47 -0000	1.11
+++ seamonkey.spec	9 Nov 2006 19:57:13 -0000	1.12
@@ -10,8 +10,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0.5
-Release:        1%{?dist}
+Version:        1.0.6
+Release:        0.6%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -432,6 +432,8 @@
 
 
 %changelog
+* Thu Nov 09 2006 Kai Engert  1.0.6-0.6
+- SeaMonkey 1.0.6
 * Thu Sep 14 2006 Kai Engert  1.0.5-1
 - SeaMonkey 1.0.5
 * Wed Sep 06 2006 Kai Engert  1.0.4-8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Sep 2006 01:31:47 -0000	1.6
+++ sources	9 Nov 2006 19:57:13 -0000	1.7
@@ -1 +1 @@
-a1b98cd4d2d0f71d50406f8cd3885a5e  seamonkey-1.0.5.source.tar.bz2
+16e1c6bab1e3832b22863933b5b032e7  seamonkey-1.0.6.source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  9 19:58:49 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 12:58:49 -0700
Subject: rpms/libmthca import.log,1.9,1.10
Message-ID: <200611091958.kA9JwnEs020319@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20285

Modified Files:
	import.log 
Log Message:
auto-import libmthca-1.0.3-1 on branch devel from libmthca-1.0.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmthca/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	13 Jun 2006 22:41:06 -0000	1.9
+++ import.log	9 Nov 2006 19:58:19 -0000	1.10
@@ -6,3 +6,4 @@
 libmthca-1_0-1:HEAD:libmthca-1.0-1.src.rpm:1142293099
 libmthca-1_0-1:FC-4:libmthca-1.0-1.src.rpm:1142293165
 libmthca-1_0_2-1:HEAD:libmthca-1.0.2-1.src.rpm:1150238464
+libmthca-1_0_3-1:HEAD:libmthca-1.0.3-1.src.rpm:1163102296



From fedora-extras-commits at redhat.com  Thu Nov  9 19:58:50 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 12:58:50 -0700
Subject: rpms/libmthca/devel .cvsignore, 1.6, 1.7 libmthca.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611091958.kA9JwoxX020324@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20285/devel

Modified Files:
	.cvsignore libmthca.spec sources 
Log Message:
auto-import libmthca-1.0.3-1 on branch devel from libmthca-1.0.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Jun 2006 22:41:07 -0000	1.6
+++ .cvsignore	9 Nov 2006 19:58:20 -0000	1.7
@@ -1 +1 @@
-libmthca-1.0.2.tar.gz
+libmthca-1.0.3.tar.gz


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/libmthca.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmthca.spec	12 Sep 2006 18:24:21 -0000	1.6
+++ libmthca.spec	9 Nov 2006 19:58:20 -0000	1.7
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.2
+%define ver      1.0.3
 
 Name: libmthca
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.2.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Wed Jul 26 2006 Roland Dreier  - 1.0.3-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jun 2006 22:41:07 -0000	1.6
+++ sources	9 Nov 2006 19:58:20 -0000	1.7
@@ -1 +1 @@
-c56d86caac7c002fd8df97ee9f94d9c7  libmthca-1.0.2.tar.gz
+bbcb07450c56b7105c79e33670e3bc81  libmthca-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 20:04:28 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 13:04:28 -0700
Subject: rpms/subversion-api-docs/devel .cvsignore, 1.1, 1.2 doxygen.conf,
	1.1, 1.2 sources, 1.1, 1.2 subversion-api-docs.spec, 1.6, 1.7
Message-ID: <200611092004.kA9K4Sc8023513@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23468

Modified Files:
	.cvsignore doxygen.conf sources subversion-api-docs.spec 
Log Message:
Bump up to 1.4.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 08:48:10 -0000	1.1
+++ .cvsignore	9 Nov 2006 20:03:56 -0000	1.2
@@ -0,0 +1 @@
+doxygen.conf


Index: doxygen.conf
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/doxygen.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doxygen.conf	9 Apr 2006 08:49:09 -0000	1.1
+++ doxygen.conf	9 Nov 2006 20:03:56 -0000	1.2
@@ -373,7 +373,7 @@
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
 # in the documentation.
 
-SHOW_DIRECTORIES       = YES
+SHOW_DIRECTORIES       = NO
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that 
 # doxygen should invoke to get the current version for each file (typically from the 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 08:48:10 -0000	1.1
+++ sources	9 Nov 2006 20:03:56 -0000	1.2
@@ -0,0 +1 @@
+0405b7a76514b3f8cd495a151cf2fd5b  doxygen.conf


Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- subversion-api-docs.spec	16 Sep 2006 02:35:20 -0000	1.6
+++ subversion-api-docs.spec	9 Nov 2006 20:03:56 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		subversion-api-docs
-Version:	1.3.2
-Release:	2.1%{?dist}
+Version:	1.4.2
+Release:	1%{?dist}
 Summary:	Subversion API documentation
 
 Group:		Development/Tools
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Wed Nov 01 2006 Bojan Smojver  1.4.2-1
+- bump up to 1.4.2
+
 * Sat Sep 16 2006 Bojan Smojver  1.3.2-2.1
 - mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov  9 20:16:23 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 13:16:23 -0700
Subject: rpms/subversion-api-docs/devel sources,1.2,1.3
Message-ID: <200611092016.kA9KGN7B023751@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23730

Modified Files:
	sources 
Log Message:
OOPS! Uploaded doxygen.conf as a tarball by mistake. Revert.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 20:03:56 -0000	1.2
+++ sources	9 Nov 2006 20:15:52 -0000	1.3
@@ -1 +0,0 @@
-0405b7a76514b3f8cd495a151cf2fd5b  doxygen.conf



From fedora-extras-commits at redhat.com  Thu Nov  9 20:29:15 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Thu, 9 Nov 2006 13:29:15 -0700
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.7,1.8
Message-ID: <200611092029.kA9KTFeM023821@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23803

Modified Files:
	subversion-api-docs.spec 
Log Message:
Re-tag for rebuild.



Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subversion-api-docs.spec	9 Nov 2006 20:03:56 -0000	1.7
+++ subversion-api-docs.spec	9 Nov 2006 20:28:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		subversion-api-docs
 Version:	1.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Subversion API documentation
 
 Group:		Development/Tools
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Wed Nov 01 2006 Bojan Smojver  1.4.2-2
+- re-tag for rebuild
+
 * Wed Nov 01 2006 Bojan Smojver  1.4.2-1
 - bump up to 1.4.2
 



From fedora-extras-commits at redhat.com  Thu Nov  9 20:47:54 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 13:47:54 -0700
Subject: rpms/libmthca/FC-4 libmthca.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <200611092047.kA9Klsur024062@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24012/FC-4

Modified Files:
	libmthca.spec sources 
Log Message:
Import libmthca 1.0.3 release


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/libmthca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmthca.spec	13 Jun 2006 22:43:04 -0000	1.5
+++ libmthca.spec	9 Nov 2006 20:47:24 -0000	1.6
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.2
+%define ver      1.0.3
 
 Name: libmthca
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.2.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Wed Jul 26 2006 Roland Dreier  - 1.0.3-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jun 2006 22:43:04 -0000	1.6
+++ sources	9 Nov 2006 20:47:24 -0000	1.7
@@ -1 +1 @@
-c56d86caac7c002fd8df97ee9f94d9c7  libmthca-1.0.2.tar.gz
+bbcb07450c56b7105c79e33670e3bc81  libmthca-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 20:47:56 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 13:47:56 -0700
Subject: rpms/libmthca/FC-6 libmthca.spec,1.6,1.7 sources,1.6,1.7
Message-ID: <200611092047.kA9KluXE024068@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24012/FC-6

Modified Files:
	libmthca.spec sources 
Log Message:
Import libmthca 1.0.3 release


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-6/libmthca.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmthca.spec	12 Sep 2006 18:24:21 -0000	1.6
+++ libmthca.spec	9 Nov 2006 20:47:26 -0000	1.7
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.2
+%define ver      1.0.3
 
 Name: libmthca
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.3
+Release: 1%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.2.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Wed Jul 26 2006 Roland Dreier  - 1.0.3-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jun 2006 22:41:07 -0000	1.6
+++ sources	9 Nov 2006 20:47:26 -0000	1.7
@@ -1 +1 @@
-c56d86caac7c002fd8df97ee9f94d9c7  libmthca-1.0.2.tar.gz
+bbcb07450c56b7105c79e33670e3bc81  libmthca-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 20:47:55 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Thu, 9 Nov 2006 13:47:55 -0700
Subject: rpms/libmthca/FC-5 libmthca.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <200611092048.kA9Kltrf024066@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24012/FC-5

Modified Files:
	libmthca.spec sources 
Log Message:
Import libmthca 1.0.3 release


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-5/libmthca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmthca.spec	13 Jun 2006 22:43:05 -0000	1.5
+++ libmthca.spec	9 Nov 2006 20:47:25 -0000	1.6
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0.2
+%define ver      1.0.3
 
 Name: libmthca
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0.2.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0.3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Wed Jul 26 2006 Roland Dreier  - 1.0.3-1
+- New upstream release
+
 * Mon Mar 14 2006 Roland Dreier  - 1.0.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jun 2006 22:43:05 -0000	1.6
+++ sources	9 Nov 2006 20:47:25 -0000	1.7
@@ -1 +1 @@
-c56d86caac7c002fd8df97ee9f94d9c7  libmthca-1.0.2.tar.gz
+bbcb07450c56b7105c79e33670e3bc81  libmthca-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov  9 21:00:52 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 9 Nov 2006 14:00:52 -0700
Subject: rpms/seamonkey/devel .cvsignore, 1.6, 1.7 seamonkey.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200611092100.kA9L0qYB024302@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24265

Modified Files:
	.cvsignore seamonkey.spec sources 
Log Message:
* Thu Nov 09 2006 Kai Engert  1.0.6-1
- SeaMonkey 1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Sep 2006 01:31:47 -0000	1.6
+++ .cvsignore	9 Nov 2006 21:00:22 -0000	1.7
@@ -1 +1 @@
-seamonkey-1.0.5.source.tar.bz2
+seamonkey-1.0.6.source.tar.bz2


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- seamonkey.spec	15 Sep 2006 01:31:47 -0000	1.11
+++ seamonkey.spec	9 Nov 2006 21:00:22 -0000	1.12
@@ -10,7 +10,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0.5
+Version:        1.0.6
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
@@ -432,6 +432,8 @@
 
 
 %changelog
+* Thu Nov 09 2006 Kai Engert  1.0.6-1
+- SeaMonkey 1.0.6
 * Thu Sep 14 2006 Kai Engert  1.0.5-1
 - SeaMonkey 1.0.5
 * Wed Sep 06 2006 Kai Engert  1.0.4-8


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Sep 2006 01:31:47 -0000	1.6
+++ sources	9 Nov 2006 21:00:22 -0000	1.7
@@ -1 +1 @@
-a1b98cd4d2d0f71d50406f8cd3885a5e  seamonkey-1.0.5.source.tar.bz2
+16e1c6bab1e3832b22863933b5b032e7  seamonkey-1.0.6.source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov  9 21:03:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 14:03:18 -0700
Subject: rpms/PyKDE/devel PyKDE.spec,1.6,1.7
Message-ID: <200611092103.kA9L3I7Q027320@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27300

Modified Files:
	PyKDE.spec 
Log Message:
* Thu Nov 09 2006 Rex Dieter  3.16.0-4
- kmimetype patch
- devel: Requires: sip-devel



Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PyKDE.spec	8 Nov 2006 19:42:30 -0000	1.6
+++ PyKDE.spec	9 Nov 2006 21:02:47 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: PyKDE-3.16.0-konsolepart.patch
+Patch2: PyKDE-3.16.0-kmimetype.patch
 
 BuildRequires: python-devel >= 2.3
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -43,6 +44,7 @@
 Summary: %{name} SIP files
 Group: 	 Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: sip-devel
 #Obsoletes: %{name}-docs < %{version}-%{release}
 Provides:  %{name}-docs = %{version}-%{release}
 %description devel
@@ -53,6 +55,7 @@
 %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}}
 
 %patch1 -p1 -b .konsolepart
+%patch2 -p1 -b .kmimetype
 
 
 %build
@@ -60,7 +63,7 @@
 
 %{__python} configure.py -L %{_lib} -d %{python_sitedir}
 
-# smp broken
+# smp broken, do the best we can
 make -k %{?_smp_mflags} || make
 
 
@@ -85,12 +88,14 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/* examples
-# %_datadir/sip should be owned by sip-devel (#206633) 
-#dir %{_datadir}/sip
 %{_datadir}/sip/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  3.16.0-4
+- kmimetype patch
+- devel: Requires: sip-devel
+
 * Wed Nov 08 2006 Rex Dieter  3.16.0-3
 - (unversioned) Requires: PyQt
 - rebuild for PyQt-3.17 (fc7+)



From fedora-extras-commits at redhat.com  Thu Nov  9 21:07:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 14:07:01 -0700
Subject: rpms/PyKDE/devel PyKDE-3.16.0-kmimetype.patch, NONE, 1.1 PyKDE.spec,
	1.7, 1.8
Message-ID: <200611092107.kA9L71Va027401@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27372

Modified Files:
	PyKDE.spec 
Added Files:
	PyKDE-3.16.0-kmimetype.patch 
Log Message:
oops, actually add new patch, Release++


PyKDE-3.16.0-kmimetype.patch:

--- NEW FILE PyKDE-3.16.0-kmimetype.patch ---
--- PyKDE-3.16.0/sip/kio/kmimetype.sip	2006-09-22 18:41:53.000000000 +0530
+++ PyKDE-3.16.0/sip/kio/kmimetype.sip	2006-11-06 05:27:39.000000000 +0530
@@ -101,7 +101,7 @@
 %If ( KDE_3_2_0 -  )
     static KMimeType::Ptr defaultMimeTypePtr ();
     QString              parentMimeType () const;
-    bool                 is (const QString&) const;
+    bool                 is (const QString&) const /PyName=is_/; //'is' is a reserved keyword in python
     static KMimeType::Ptr diagnoseFileName (const QString&, QString&);
 %End
 


Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PyKDE.spec	9 Nov 2006 21:02:47 -0000	1.7
+++ PyKDE.spec	9 Nov 2006 21:06:31 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -92,7 +92,7 @@
 
 
 %changelog
-* Thu Nov 09 2006 Rex Dieter  3.16.0-4
+* Thu Nov 09 2006 Rex Dieter  3.16.0-5
 - kmimetype patch
 - devel: Requires: sip-devel
 



From fedora-extras-commits at redhat.com  Thu Nov  9 21:52:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 9 Nov 2006 14:52:48 -0700
Subject: rpms/PyKDE/FC-6 PyKDE-3.16.0-kmimetype.patch, NONE, 1.1 PyKDE.spec, 
	1.5, 1.6
Message-ID: <200611092152.kA9LqmkU027828@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyKDE/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27809

Modified Files:
	PyKDE.spec 
Added Files:
	PyKDE-3.16.0-kmimetype.patch 
Log Message:
* Thu Nov 09 2006 Rex Dieter  3.16.0-5
- kmimetype patch
- devel: Requires: sip-devel

* Wed Nov 08 2006 Rex Dieter  3.16.0-3
- (unversioned) Requires: PyQt


PyKDE-3.16.0-kmimetype.patch:

--- NEW FILE PyKDE-3.16.0-kmimetype.patch ---
--- PyKDE-3.16.0/sip/kio/kmimetype.sip	2006-09-22 18:41:53.000000000 +0530
+++ PyKDE-3.16.0/sip/kio/kmimetype.sip	2006-11-06 05:27:39.000000000 +0530
@@ -101,7 +101,7 @@
 %If ( KDE_3_2_0 -  )
     static KMimeType::Ptr defaultMimeTypePtr ();
     QString              parentMimeType () const;
-    bool                 is (const QString&) const;
+    bool                 is (const QString&) const /PyName=is_/; //'is' is a reserved keyword in python
     static KMimeType::Ptr diagnoseFileName (const QString&, QString&);
 %End
 


Index: PyKDE.spec
===================================================================
RCS file: /cvs/extras/rpms/PyKDE/FC-6/PyKDE.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PyKDE.spec	4 Oct 2006 19:37:49 -0000	1.5
+++ PyKDE.spec	9 Nov 2006 21:52:18 -0000	1.6
@@ -2,7 +2,7 @@
 Summary: Python bindings for KDE
 Name: 	 PyKDE
 Version: 3.16.0
-Release: 2%{?dist}
+Release: 5%{?dist}
 
 License: GPL 
 URL: 	 http://www.riverbankcomputing.co.uk/pykde/
@@ -11,6 +11,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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
 
 BuildRequires: python-devel >= 2.3
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -21,11 +23,12 @@
 
 BuildRequires: sip-devel >= 4.4.3 
 BuildRequires: PyQt-devel >= 3.16 
-%global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
-%if "%{?pyqt_ver}" > "2"
-Requires: PyQt = %{pyqt_ver}
-%endif
-
+## try to leave this unversioned, for now -- Rex
+Requires: PyQt
+#global pyqt_ver %(pyuic -version 2>&1  | cut -d' ' -f5)
+#if "%{?pyqt_ver}" > "2"
+#Requires: PyQt = %{pyqt_ver}
+#endif
 
 BuildRequires: kdelibs-devel kdebase
 %global kdelibs_ver %(kde-config --version 2>/dev/null | grep KDE | cut -d' ' -f2 | cut -d- -f1)
@@ -42,6 +45,7 @@
 Summary: %{name} SIP files
 Group: 	 Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: sip-devel
 #Obsoletes: %{name}-docs < %{version}-%{release}
 Provides:  %{name}-docs = %{version}-%{release}
 %description devel
@@ -52,6 +56,7 @@
 %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}}
 
 %patch1 -p1 -b .konsolepart
+%patch2 -p1 -b .kmimetype
 
 
 %build
@@ -59,7 +64,7 @@
 
 %{__python} configure.py -L %{_lib} -d %{python_sitedir}
 
-# smp broken
+# smp broken, do the best we can
 make -k %{?_smp_mflags} || make
 
 
@@ -84,12 +89,18 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/* examples
-# %_datadir/sip should be owned by sip-devel (#206633) 
-#dir %{_datadir}/sip
 %{_datadir}/sip/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  3.16.0-5
+- kmimetype patch
+- devel: Requires: sip-devel
+
+* Wed Nov 08 2006 Rex Dieter  3.16.0-3
+- (unversioned) Requires: PyQt
+- rebuild for PyQt-3.17 (fc7+)
+
 * Wed Oct 04 2006 Rex Dieter  3.16.0-2 
 - respin
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:10:52 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 9 Nov 2006 15:10:52 -0700
Subject: rpms/sparse/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sparse.spec,
	1.1, 1.2
Message-ID: <200611092210.kA9MAqXd030996@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30971

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
upgrade to 0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Nov 2006 09:24:09 -0000	1.2
+++ .cvsignore	9 Nov 2006 22:10:22 -0000	1.3
@@ -1 +1 @@
-sparse-20061026.tar.bz2
+sparse-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Nov 2006 09:24:09 -0000	1.2
+++ sources	9 Nov 2006 22:10:22 -0000	1.3
@@ -1 +1 @@
-724e23dc62375879f75708f35f245e58  sparse-20061026.tar.bz2
+367d1cb0a26db26e2da47a491bc95374  sparse-0.1.tar.gz


Index: sparse.spec
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-6/sparse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sparse.spec	5 Nov 2006 09:24:09 -0000	1.1
+++ sparse.spec	9 Nov 2006 22:10:22 -0000	1.2
@@ -1,17 +1,11 @@
-%define snapshot_date 20061026
-%define prerelease 1
-%define alphatag %{snapshot_date}git
 Name: sparse          
-Version: 0        
-Release: 0.%{prerelease}.%{alphatag}%{?dist}
-Summary: A semantic parser of source files
-
+Version: 0.1        
+Release: 1%{?dist}
+Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    Open Software License
-URL:        http://www.kernel.org/pub/scm/devel/sparse/sparse.git/    
-# git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git/
-# snapshots also available at http://www.codemonkey.org.uk/projects/git-snapshots/sparse/
-Source0:    sparse-%{snapshot_date}.tar.bz2
+URL:        http://kernel.org/pub/linux/kernel/people/josh/sparse/
+Source0:    http://kernel.org/pub/linux/kernel/people/josh/sparse/dist/sparse-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,7 +25,7 @@
 Sparse is primarily used in the development and debugging of the Linux kernel.
 
 %prep
-%setup -q -n sparse
+%setup -q
 
 
 %build
@@ -43,8 +37,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 make install PREFIX=%{buildroot}%{_prefix}
-# no reason to ship libsparse.so until something exists that links against it
-rm %{buildroot}%{_bindir}/libsparse.so
 
 %clean
 rm -rf %{buildroot}
@@ -54,7 +46,12 @@
 %defattr(-,root,root,-)
 %doc LICENSE README FAQ
 %{_bindir}/sparse
+%{_bindir}/cgcc
 
 %changelog
+* Thu Nov 09 2006 Matt Domsch  0.1-1
+- Upgrade to 0.1, no need for snapshots, yea!  New upstream maintainer.
+- cgcc now installed
+
 * Thu Oct 26 2006 Matt Domsch  0-0.1.20061026git
 - Initial packaging for Fedora Extras



From fedora-extras-commits at redhat.com  Thu Nov  9 22:12:18 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Thu, 9 Nov 2006 15:12:18 -0700
Subject: rpms/sparse/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sparse.spec,
	1.1, 1.2
Message-ID: <200611092212.kA9MCIjt031079@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/sparse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31049

Modified Files:
	.cvsignore sources sparse.spec 
Log Message:
upgrade to 0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Nov 2006 09:24:09 -0000	1.2
+++ .cvsignore	9 Nov 2006 22:11:48 -0000	1.3
@@ -1 +1 @@
-sparse-20061026.tar.bz2
+sparse-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Nov 2006 09:24:09 -0000	1.2
+++ sources	9 Nov 2006 22:11:48 -0000	1.3
@@ -1 +1 @@
-724e23dc62375879f75708f35f245e58  sparse-20061026.tar.bz2
+367d1cb0a26db26e2da47a491bc95374  sparse-0.1.tar.gz


Index: sparse.spec
===================================================================
RCS file: /cvs/extras/rpms/sparse/FC-5/sparse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sparse.spec	5 Nov 2006 09:24:09 -0000	1.1
+++ sparse.spec	9 Nov 2006 22:11:48 -0000	1.2
@@ -1,17 +1,11 @@
-%define snapshot_date 20061026
-%define prerelease 1
-%define alphatag %{snapshot_date}git
 Name: sparse          
-Version: 0        
-Release: 0.%{prerelease}.%{alphatag}%{?dist}
-Summary: A semantic parser of source files
-
+Version: 0.1        
+Release: 1%{?dist}
+Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    Open Software License
-URL:        http://www.kernel.org/pub/scm/devel/sparse/sparse.git/    
-# git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git/
-# snapshots also available at http://www.codemonkey.org.uk/projects/git-snapshots/sparse/
-Source0:    sparse-%{snapshot_date}.tar.bz2
+URL:        http://kernel.org/pub/linux/kernel/people/josh/sparse/
+Source0:    http://kernel.org/pub/linux/kernel/people/josh/sparse/dist/sparse-%{version}.tar.gz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,7 +25,7 @@
 Sparse is primarily used in the development and debugging of the Linux kernel.
 
 %prep
-%setup -q -n sparse
+%setup -q
 
 
 %build
@@ -43,8 +37,6 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 make install PREFIX=%{buildroot}%{_prefix}
-# no reason to ship libsparse.so until something exists that links against it
-rm %{buildroot}%{_bindir}/libsparse.so
 
 %clean
 rm -rf %{buildroot}
@@ -54,7 +46,12 @@
 %defattr(-,root,root,-)
 %doc LICENSE README FAQ
 %{_bindir}/sparse
+%{_bindir}/cgcc
 
 %changelog
+* Thu Nov 09 2006 Matt Domsch  0.1-1
+- Upgrade to 0.1, no need for snapshots, yea!  New upstream maintainer.
+- cgcc now installed
+
 * Thu Oct 26 2006 Matt Domsch  0-0.1.20061026git
 - Initial packaging for Fedora Extras



From fedora-extras-commits at redhat.com  Thu Nov  9 22:51:36 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 9 Nov 2006 15:51:36 -0700
Subject: rpms/galeon/devel galeon.spec,1.25,1.26
Message-ID: <200611092251.kA9Mpa2U031490@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31474

Modified Files:
	galeon.spec 
Log Message:
- Rebuild for firefox 2
- Added explicit gecko version requirement
- Fixed noreplace rpmlint warning



Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- galeon.spec	19 Oct 2006 14:06:10 -0000	1.25
+++ galeon.spec	9 Nov 2006 22:51:06 -0000	1.26
@@ -1,7 +1,9 @@
+%define gecko_ver 1.8.1
+
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -12,10 +14,13 @@
 BuildRequires:	gettext desktop-file-utils
 BuildRequires:	gtk2-devel >= 2.4.0
 BuildRequires:	gnome-desktop-devel
-BuildRequires:	gecko-devel
+BuildRequires:	gecko-devel = %{gecko_ver}
 BuildRequires:	libgnomeui-devel >= 2.5.2
 BuildRequires:  perl(XML::Parser) scrollkeeper
 BuildRequires:  intltool
+
+Requires: gecko-libs = %{gecko_ver}
+
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires(pre):    GConf2
@@ -93,8 +98,8 @@
 %files -f galeon-2.0.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.README ChangeLog NEWS README INSTALL THANKS TODO FAQ FAQ.html README.ExtraPrefs
-%config %{_sysconfdir}/gconf/schemas/galeon.schemas
-%config %{_sysconfdir}/sound/events/galeon.soundlist
+%config(noreplace) %{_sysconfdir}/gconf/schemas/galeon.schemas
+%config(noreplace) %{_sysconfdir}/sound/events/galeon.soundlist
 %{_bindir}/galeon
 %{_mandir}/man1/galeon.1*
 %{_datadir}/galeon
@@ -110,6 +115,11 @@
 
 
 %changelog
+* Thu Nov  9 2006 Denis Leroy  - 2.0.3-4
+- Rebuild for firefox 2
+- Added explicit gecko version requirement
+- Fixed noreplace rpmlint warning
+
 * Thu Oct 19 2006 Denis Leroy  - 2.0.3-3
 - Added patch to fix flash plugin crash
 - Make package depend on gecko-devel



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:29 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:29 -0700
Subject: rpms/cacti/FC-3 cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.5,
	1.6
Message-ID: <200611092256.kA9MuTRa031654@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/FC-3

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-3/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:55:59 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:36 -0700
Subject: rpms/cacti/FC-6 cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.7,
	1.8
Message-ID: <200611092256.kA9MuaoV031671@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/FC-6

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-6/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:56:06 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:30 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:30 -0700
Subject: rpms/cacti/FC-4 cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.5,
	1.6
Message-ID: <200611092256.kA9MuUTx031658@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/FC-4

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-4/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:55:59 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
+- Upstream released new version
+
 * Thu Sep 07 2006 Mike McGrath  - 0.8.6i-2
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:36 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:36 -0700
Subject: rpms/cacti/FC-5 cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.6,
	1.7
Message-ID: <200611092256.kA9MuafZ031667@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/FC-5

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/FC-5/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:56:05 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Thu Nov  9 22:56:37 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 9 Nov 2006 15:56:37 -0700
Subject: rpms/cacti/devel cacti-0.8.6h-dbcfg.patch, 1.1, 1.2 cacti.spec, 1.7,
	1.8
Message-ID: <200611092256.kA9Mubwp031675@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/cacti/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31561/devel

Modified Files:
	cacti-0.8.6h-dbcfg.patch cacti.spec 
Log Message:
Fixed Bugzilla 214914

cacti-0.8.6h-dbcfg.patch:

Index: cacti-0.8.6h-dbcfg.patch
===================================================================
RCS file: /cvs/extras/rpms/cacti/devel/cacti-0.8.6h-dbcfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cacti-0.8.6h-dbcfg.patch	7 Feb 2006 01:42:50 -0000	1.1
+++ cacti-0.8.6h-dbcfg.patch	9 Nov 2006 22:56:07 -0000	1.2
@@ -20,7 +20,7 @@
 --- include/db.php.orig	1969-12-31 18:00:00.000000000 -0600
 +++ include/db.php	2006-01-13 15:14:07.000000000 -0600
 @@ -0,0 +1,9 @@
-+ - 0.8.6i-4
+- Patch now includes  - 0.8.6i-3
 - Upstream released new version
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:08:13 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:08:13 -0700
Subject: rpms/commoncpp2/FC-5 commoncpp2.spec,1.1,1.2
Message-ID: <200611100008.kAA08Dcq005918@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5797/FC-5

Modified Files:
	commoncpp2.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: commoncpp2.spec
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-5/commoncpp2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commoncpp2.spec	6 Feb 2006 21:47:33 -0000	1.1
+++ commoncpp2.spec	10 Nov 2006 00:07:42 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: GNU Common C++ class framework
 Name: commoncpp2
-Version: 1.3.23
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -70,8 +70,8 @@
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html
-%dir %{_includedir}/cc++2
-%{_includedir}/cc++2/*
+%dir %{_includedir}/cc++
+%{_includedir}/cc++/*
 %{_bindir}/ccgnu2-config
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libccext2.pc
@@ -80,8 +80,17 @@
 %{_infodir}/commoncpp2.info*
 
 %changelog
-* Sun Feb 05 2006 Andreas Thienemann  1.3.23-1
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0
+
+* Sun May 28 2006 Andreas Thienemann  - 1.4.2-1
+- Updated to 1.4.2
+
+* Sun May 28 2006 Andreas Thienemann  - 1.4.1-1
+- Updated to 1.4.1
+
+* Sun Feb 05 2006 Andreas Thienemann  - 1.3.23-1
 - Incorporated suggestions for extras
 
-* Fri Feb 03 2006 Andreas Thienemann  1.3.22-1
+* Fri Feb 03 2006 Andreas Thienemann  - 1.3.22-1
 - Initial spec.



From fedora-extras-commits at redhat.com  Fri Nov 10 00:08:15 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:08:15 -0700
Subject: rpms/commoncpp2/FC-6 commoncpp2.spec,1.3,1.4
Message-ID: <200611100008.kAA08FWR005932@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5797/FC-6

Modified Files:
	commoncpp2.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: commoncpp2.spec
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-6/commoncpp2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- commoncpp2.spec	8 Sep 2006 16:19:44 -0000	1.3
+++ commoncpp2.spec	10 Nov 2006 00:07:45 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: GNU Common C++ class framework
 Name: commoncpp2
-Version: 1.4.2
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -80,6 +80,9 @@
 %{_infodir}/commoncpp2.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0
+
 * Sun May 28 2006 Andreas Thienemann  - 1.4.2-1
 - Updated to 1.4.2
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:08:18 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:08:18 -0700
Subject: rpms/commoncpp2/devel commoncpp2.spec,1.3,1.4
Message-ID: <200611100008.kAA08I5B005935@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5797/devel

Modified Files:
	commoncpp2.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: commoncpp2.spec
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/devel/commoncpp2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- commoncpp2.spec	8 Sep 2006 16:19:44 -0000	1.3
+++ commoncpp2.spec	10 Nov 2006 00:07:47 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: GNU Common C++ class framework
 Name: commoncpp2
-Version: 1.4.2
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -80,6 +80,9 @@
 %{_infodir}/commoncpp2.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0
+
 * Sun May 28 2006 Andreas Thienemann  - 1.4.2-1
 - Updated to 1.4.2
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:14:55 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:14:55 -0700
Subject: rpms/ccrtp/devel ccrtp.spec,1.4,1.5
Message-ID: <200611100014.kAA0EtgK006213@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6163/devel

Modified Files:
	ccrtp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: ccrtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/ccrtp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ccrtp.spec	10 Sep 2006 21:20:05 -0000	1.4
+++ ccrtp.spec	10 Nov 2006 00:14:25 -0000	1.5
@@ -1,13 +1,13 @@
 Summary: Common C++ class framework for RTP/RTCP
 Name: ccrtp
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: http://download.sourceforge.net/gnutelephony/ccrtp-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: commoncpp2-devel, doxygen
+BuildRequires: commoncpp2-devel, doxygen, libgcrypt-devel
 
 %description
 ccRTP is a generic, extensible and efficient C++ framework for
@@ -77,6 +77,9 @@
 %{_infodir}/ccrtp.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0, fixing #209026
+
 * Sun Sep 10 2006 Andreas Thienemann  - 1.4.1-2
 - *bump*
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:14:53 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:14:53 -0700
Subject: rpms/ccrtp/FC-5 ccrtp.spec,1.1,1.2
Message-ID: <200611100014.kAA0Erko006209@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6163/FC-5

Modified Files:
	ccrtp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: ccrtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-5/ccrtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ccrtp.spec	28 Apr 2006 22:02:16 -0000	1.1
+++ ccrtp.spec	10 Nov 2006 00:14:23 -0000	1.2
@@ -1,13 +1,13 @@
 Summary: Common C++ class framework for RTP/RTCP
 Name: ccrtp
-Version: 1.3.7
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: http://download.sourceforge.net/gnutelephony/ccrtp-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: commoncpp2-devel
+BuildRequires: commoncpp2-devel, doxygen, libgcrypt-devel
 
 %description
 ccRTP is a generic, extensible and efficient C++ framework for
@@ -77,8 +77,20 @@
 %{_infodir}/ccrtp.info*
 
 %changelog
-* Mon Apr 24 2006 Andreas Thienemann  1.3.7-1
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0, fixing #209026
+
+* Sun Sep 10 2006 Andreas Thienemann  - 1.4.1-2
+- *bump*
+
+* Fri Sep 08 2006 Andreas Thienemann  - 1.4.1-1
+- Updated to 1.4.1
+
+* Sun Jul 23 2006 Andreas Thienemann  - 1.3.7-2
+- Added doxygen BuildRequire
+
+* Mon Apr 24 2006 Andreas Thienemann  - 1.3.7-1
 - Updated to 1.3.7
 
-* Fri Feb 03 2006 Andreas Thienemann  1.3.6-1
+* Fri Feb 03 2006 Andreas Thienemann  - 1.3.6-1
 - Initial spec.



From fedora-extras-commits at redhat.com  Fri Nov 10 00:14:54 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:14:54 -0700
Subject: rpms/ccrtp/FC-6 ccrtp.spec,1.4,1.5
Message-ID: <200611100014.kAA0Es6K006210@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6163/FC-6

Modified Files:
	ccrtp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: ccrtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-6/ccrtp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ccrtp.spec	10 Sep 2006 21:20:05 -0000	1.4
+++ ccrtp.spec	10 Nov 2006 00:14:24 -0000	1.5
@@ -1,13 +1,13 @@
 Summary: Common C++ class framework for RTP/RTCP
 Name: ccrtp
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: http://download.sourceforge.net/gnutelephony/ccrtp-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: commoncpp2-devel, doxygen
+BuildRequires: commoncpp2-devel, doxygen, libgcrypt-devel
 
 %description
 ccRTP is a generic, extensible and efficient C++ framework for
@@ -77,6 +77,9 @@
 %{_infodir}/ccrtp.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
+- Updated package to 1.5.0, fixing #209026
+
 * Sun Sep 10 2006 Andreas Thienemann  - 1.4.1-2
 - *bump*
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:21:07 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:21:07 -0700
Subject: rpms/commoncpp2/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611100021.kAA0L7ur006427@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6376/FC-5

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Feb 2006 21:47:33 -0000	1.2
+++ .cvsignore	10 Nov 2006 00:20:37 -0000	1.3
@@ -1 +1 @@
-commoncpp2-1.3.23.tar.gz
+commoncpp2-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Feb 2006 21:47:33 -0000	1.2
+++ sources	10 Nov 2006 00:20:37 -0000	1.3
@@ -1 +1 @@
-7cf53157929876054cff3234f6ffaae7  commoncpp2-1.3.23.tar.gz
+c454fa913f2f1ce53a3ccea27ec4a068  commoncpp2-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:21:09 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:21:09 -0700
Subject: rpms/commoncpp2/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200611100021.kAA0L9Wx006435@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6376/devel

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2006 16:19:44 -0000	1.4
+++ .cvsignore	10 Nov 2006 00:20:39 -0000	1.5
@@ -1 +1 @@
-commoncpp2-1.4.2.tar.gz
+commoncpp2-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2006 16:19:44 -0000	1.4
+++ sources	10 Nov 2006 00:20:39 -0000	1.5
@@ -1 +1 @@
-4153ec41bc11c52f05f2f2e35cf66953  commoncpp2-1.4.2.tar.gz
+c454fa913f2f1ce53a3ccea27ec4a068  commoncpp2-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:21:08 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:21:08 -0700
Subject: rpms/commoncpp2/FC-6 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200611100021.kAA0L8UB006431@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/commoncpp2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6376/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Sep 2006 16:19:44 -0000	1.4
+++ .cvsignore	10 Nov 2006 00:20:38 -0000	1.5
@@ -1 +1 @@
-commoncpp2-1.4.2.tar.gz
+commoncpp2-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/commoncpp2/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Sep 2006 16:19:44 -0000	1.4
+++ sources	10 Nov 2006 00:20:38 -0000	1.5
@@ -1 +1 @@
-4153ec41bc11c52f05f2f2e35cf66953  commoncpp2-1.4.2.tar.gz
+c454fa913f2f1ce53a3ccea27ec4a068  commoncpp2-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:33:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:33:14 -0700
Subject: rpms/ccrtp/FC-6 .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200611100033.kAA0XEOr006816@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6766/FC-6

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Sep 2006 16:10:13 -0000	1.3
+++ .cvsignore	10 Nov 2006 00:32:42 -0000	1.4
@@ -1 +1 @@
-ccrtp-1.4.1.tar.gz
+ccrtp-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 16:10:13 -0000	1.3
+++ sources	10 Nov 2006 00:32:42 -0000	1.4
@@ -1 +1 @@
-632aacddec2998f393d1773a078d881a  ccrtp-1.4.1.tar.gz
+019754d20b46b1b23f3bc368aa58d662  ccrtp-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:33:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:33:14 -0700
Subject: rpms/ccrtp/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611100033.kAA0XErK006815@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6766/FC-5

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2006 22:02:16 -0000	1.2
+++ .cvsignore	10 Nov 2006 00:32:42 -0000	1.3
@@ -1 +1 @@
-ccrtp-1.3.7.tar.gz
+ccrtp-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2006 22:02:16 -0000	1.2
+++ sources	10 Nov 2006 00:32:42 -0000	1.3
@@ -1 +1 @@
-6621be1852bd90c3dbbafa895618d8f0  ccrtp-1.3.7.tar.gz
+019754d20b46b1b23f3bc368aa58d662  ccrtp-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:33:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:33:14 -0700
Subject: rpms/ccrtp/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200611100033.kAA0XEkh006818@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6766/devel

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.5.0-1
- Updated package to 1.5.0, fixing #209026



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Sep 2006 16:10:13 -0000	1.3
+++ .cvsignore	10 Nov 2006 00:32:43 -0000	1.4
@@ -1 +1 @@
-ccrtp-1.4.1.tar.gz
+ccrtp-1.5.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 16:10:13 -0000	1.3
+++ sources	10 Nov 2006 00:32:43 -0000	1.4
@@ -1 +1 @@
-632aacddec2998f393d1773a078d881a  ccrtp-1.4.1.tar.gz
+019754d20b46b1b23f3bc368aa58d662  ccrtp-1.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 00:54:43 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Thu, 9 Nov 2006 17:54:43 -0700
Subject: rpms/bugzilla/FC-4 bugzilla-bz212355-fixvuln.patch, NONE,
	1.1 bugzilla.spec, 1.2, 1.3
Message-ID: <200611100054.kAA0shJB007091@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/bugzilla/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7067

Modified Files:
	bugzilla.spec 
Added Files:
	bugzilla-bz212355-fixvuln.patch 
Log Message:
Fix vuln's in bz 212355


bugzilla-bz212355-fixvuln.patch:

--- NEW FILE bugzilla-bz212355-fixvuln.patch ---
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/attachment.cgi bugzilla-2.22.1/attachment.cgi
--- bugzilla-2.22/attachment.cgi	2006-04-09 11:28:49.000000000 -0700
+++ bugzilla-2.22.1/attachment.cgi	2006-10-14 14:07:19.000000000 -0700
@@ -130,6 +130,7 @@
 sub validateID
 {
     my $param = @_ ? $_[0] : 'id';
+    my $user = Bugzilla->user;
 
     # If we're not doing interdiffs, check if id wasn't specified and
     # prompt them with a page that allows them to choose an attachment.
@@ -151,18 +152,18 @@
      || ThrowUserError("invalid_attach_id", { attach_id => $cgi->param($param) });
   
     # Make sure the attachment exists in the database.
-    SendSQL("SELECT bug_id, isprivate FROM attachments WHERE attach_id = $attach_id");
+    SendSQL("SELECT bug_id, isprivate, submitter_id
+             FROM attachments WHERE attach_id = $attach_id");
     MoreSQLData()
       || ThrowUserError("invalid_attach_id", { attach_id => $attach_id });
 
     # Make sure the user is authorized to access this attachment's bug.
-    (my $bugid, my $isprivate) = FetchSQLData();
+    my ($bugid, $isprivate, $submitter_id) = FetchSQLData();
 
     ValidateBugID($bugid);
-    if ($isprivate && Param("insidergroup")) {
-        UserInGroup(Param("insidergroup"))
-          || ThrowUserError("auth_failure", {action => "access",
-                                             object => "attachment"});
+    if ($isprivate && $user->id != $submitter_id && !$user->is_insider) {
+        ThrowUserError("auth_failure", {action => "access",
+                                        object => "attachment"});
     }
 
     return ($attach_id,$bugid);
@@ -199,17 +200,23 @@
 sub validateCanEdit
 {
     my ($attach_id) = (@_);
+    my $user = Bugzilla->user;
 
-    # People in editbugs can edit all attachments
-    return if UserInGroup("editbugs");
+    my $attachment = Bugzilla::Attachment->get($attach_id);
 
     # Bug 97729 - the submitter can edit their attachments
-    SendSQL("SELECT attach_id FROM attachments WHERE " .
-            "attach_id = $attach_id AND submitter_id = " . Bugzilla->user->id);
+    return if ($attachment->attacher->id == $user->id);
 
-    FetchSQLData()
-      || ThrowUserError("illegal_attachment_edit",
-                        { attach_id => $attach_id });
+    # Only people in the insider group can view private attachments.
+    if ($attachment->isprivate && !$user->is_insider) {
+        ThrowUserError('illegal_attachment_edit', {attach_id => $attachment->id});
+    }
+
+    # People in editbugs can edit all attachments
+    return if UserInGroup("editbugs");
+
+    # If we come here, then this attachment cannot be seen by the user.
+    ThrowUserError('illegal_attachment_edit', { attach_id => $attachment->id });
 }
 
 sub validateCanChangeAttachment 
@@ -393,7 +400,8 @@
   my @obsolete_ids = ();
 
   # Make sure the attachment id is valid and the user has permissions to view
-  # the bug to which it is attached.
+  # the bug to which it is attached. Make sure also that the user can view
+  # the attachment itself.
   foreach my $attachid ($cgi->param('obsolete')) {
     my $vars = {};
     $vars->{'attach_id'} = $attachid;
@@ -410,6 +418,9 @@
 
     my ($bugid, $isobsolete, $description) = FetchSQLData();
 
+    # Check that the user can modify this attachment
+    validateCanEdit($attachid);
+
     $vars->{'description'} = $description;
     
     if ($bugid != $cgi->param('bugid'))
@@ -424,8 +435,6 @@
       ThrowCodeError("attachment_already_obsolete", $vars);
     }
 
-    # Check that the user can modify this attachment
-    validateCanEdit($attachid);
     push(@obsolete_ids, $attachid);
   }
 
@@ -759,28 +768,35 @@
   }
   else
   {
-    $vars->{other_patches} = [];
+    my @other_patches = ();
     if ($::interdiffbin && $::diffpath) {
-      # Get list of attachments on this bug.
+      # Get the list of attachments that the user can view in this bug.
+      my @attachments = @{Bugzilla::Attachment->get_attachments_by_bug($bugid)};
+      # Extract patches only.
+      @attachments = grep {$_->ispatch == 1} @attachments;
+      # We want them sorted from newer to older.
+      @attachments = sort { $b->id <=> $a->id } @attachments;
+
       # Ignore the current patch, but select the one right before it
       # chronologically.
-      SendSQL("SELECT attach_id, description FROM attachments WHERE bug_id = $bugid AND ispatch = 1 ORDER BY creation_ts DESC");
       my $select_next_patch = 0;
-      while (my ($other_id, $other_desc) = FetchSQLData()) {
-        if ($other_id eq $attach_id) {
-          $select_next_patch = 1;
-        } else {
-          push @{$vars->{other_patches}}, { id => $other_id, desc => $other_desc, selected => $select_next_patch };
-          if ($select_next_patch) {
-            $select_next_patch = 0;
+      foreach my $attach (@attachments) {
+          if ($attach->id == $attach_id) {
+              $select_next_patch = 1;
+          }
+          else {
+              push(@other_patches, { 'id'       => $attach->id,
+                                     'desc'     => $attach->description,
+                                     'selected' => $select_next_patch });
+              $select_next_patch = 0;
           }
-        }
       }
     }
 
     $vars->{bugid} = $bugid;
     $vars->{attachid} = $attach_id;
     $vars->{description} = $description;
+    $vars->{other_patches} = \@other_patches;
     setup_template_patch_reader($last_reader, $format, $context);
     # Actually print out the patch
     $reader->iterate_string("Attachment $attach_id", $thedata);
@@ -795,37 +811,10 @@
     my $bugid = $cgi->param('bugid');
     ValidateBugID($bugid);
 
-    # Retrieve the attachments from the database and write them into an array
-    # of hashes where each hash represents one attachment.
-    my $privacy = "";
-    my $dbh = Bugzilla->dbh;
-
-    if (Param("insidergroup") && !(UserInGroup(Param("insidergroup")))) {
-        $privacy = "AND isprivate < 1 ";
+    my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bugid);
+    foreach my $a (@$attachments) {
+        $a->{'isviewable'} = isViewable($a->contenttype);
     }
-    SendSQL("SELECT attach_id, " .
-            $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ",
-            mimetype, description, ispatch, isobsolete, isprivate, 
-            LENGTH(thedata)
-            FROM attachments 
-            INNER JOIN attach_data
-            ON attach_id = id
-            WHERE bug_id = $bugid $privacy 
-            ORDER BY attach_id");
-  my @attachments; # the attachments array
-  while (MoreSQLData())
-  {
-    my %a; # the attachment hash
-    ($a{'attachid'}, $a{'date'}, $a{'contenttype'},
-     $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'},
-     $a{'datasize'}) = FetchSQLData();
-    $a{'isviewable'} = isViewable($a{'contenttype'});
-    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'},
-                                          'is_active' => 1 });
-
-    # Add the hash representing the attachment to the array of attachments.
-    push @attachments, \%a;
-  }
 
   # Retrieve the bug summary (for displaying on screen) and assignee.
   SendSQL("SELECT short_desc, assigned_to FROM bugs " .
@@ -834,7 +823,7 @@
 
   # Define the variables and functions that will be passed to the UI template.
   $vars->{'bugid'} = $bugid;
-  $vars->{'attachments'} = \@attachments;
+  $vars->{'attachments'} = $attachments;
   $vars->{'bugassignee_id'} = $assignee_id;
   $vars->{'bugsummary'} = $bugsummary;
   $vars->{'GetBugLink'} = \&GetBugLink;
@@ -922,8 +911,9 @@
     validateIsPatch();
     validateDescription();
   
-    if (($attachurl =~ /^(http|https|ftp):\/\/\S+/) 
-         && !(defined $cgi->upload('data'))) {
[...12227 lines suppressed...]
  %]
@@ -52,7 +52,7 @@
       
         [% keyword.name FILTER html %]
     
-    
      
+    
      [% keyword.description %][% keyword.description FILTER html_light %]
     
       [% IF keyword.bugcount > 0 %]
         
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/request/email.txt.tmpl bugzilla-2.22.1/template/en/default/request/email.txt.tmpl
--- bugzilla-2.22/template/en/default/request/email.txt.tmpl	2005-12-29 16:32:37.000000000 -0800
+++ bugzilla-2.22.1/template/en/default/request/email.txt.tmpl	2006-07-05 19:20:08.000000000 -0700
@@ -61,7 +61,7 @@
 [%- FILTER bullet = wrap(80) %]
 
 [% USE Bugzilla %]
-[% IF Bugzilla.cgi.param("comment").length > 0 %]
+[% IF Bugzilla.cgi.param("comment") && Bugzilla.cgi.param("comment").length > 0 %]
 ------- Additional Comments from [% user.identity %]
 [%+ Bugzilla.cgi.param("comment") %]
 [% END %]
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl
--- bugzilla-2.22/template/en/default/search/boolean-charts.html.tmpl	2004-12-10 16:27:45.000000000 -0800
+++ bugzilla-2.22.1/template/en/default/search/boolean-charts.html.tmpl	2006-06-07 14:34:35.000000000 -0700
@@ -46,7 +46,7 @@
 
   
      
     
-      Advanced Searching Using Boolean Charts:
+      Advanced Searching Using Boolean Charts:
     
   
      
 
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl
--- bugzilla-2.22/template/en/default/search/search-create-series.html.tmpl	2005-04-11 15:34:50.000000000 -0700
+++ bugzilla-2.22.1/template/en/default/search/search-create-series.html.tmpl	2006-05-22 17:22:29.000000000 -0700
@@ -33,7 +33,7 @@
 
 [% PROCESS global/header.html.tmpl 
   title = "Create New Data Set"
-  onload = "selectProduct(document.forms['chartform']);"
+  onload = "doOnSelectProduct(0);"
   javascript = js_data 
   javascript_urls = [ "js/productform.js" ]
 %]
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/template/en/default/whine/schedule.html.tmpl bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl
--- bugzilla-2.22/template/en/default/whine/schedule.html.tmpl	2005-09-12 07:03:01.000000000 -0700
+++ bugzilla-2.22.1/template/en/default/whine/schedule.html.tmpl	2006-10-14 15:05:59.000000000 -0700
@@ -82,6 +82,7 @@
 
 
+
 
 [% FOREACH event = events %]
 
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/testserver.pl bugzilla-2.22.1/testserver.pl
--- bugzilla-2.22/testserver.pl	2006-01-05 03:07:01.000000000 -0800
+++ bugzilla-2.22.1/testserver.pl	2006-07-24 23:21:07.000000000 -0700
@@ -14,7 +14,7 @@
 # Contributor(s): Joel Peshkin 
 #                 Byron Jones 
 
-# testserver.pl is involked with the baseurl of the Bugzilla installation
+# testserver.pl is invoked with the baseurl of the Bugzilla installation
 # as its only argument.  It attempts to troubleshoot as many installation
 # issues as possible.
 
@@ -194,6 +194,14 @@
             print "TEST-FAILED Chart returned: $@\n";
         }
     }
+
+    eval 'use Template::Plugin::GD::Image';
+    if ($@) {
+        print "TEST-FAILED Template::Plugin::GD is not installed.\n";
+    }
+    else {
+        print "TEST-OK Template::Plugin::GD is installed.\n";
+    }
 }
 
 sub fetch {
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/token.cgi bugzilla-2.22.1/token.cgi
--- bugzilla-2.22/token.cgi	2005-10-24 16:11:55.000000000 -0700
+++ bugzilla-2.22.1/token.cgi	2006-09-22 16:25:51.000000000 -0700
@@ -67,9 +67,8 @@
   $::token = $cgi->param('t');
   
   # Make sure the token contains only valid characters in the right amount.
-  # Validate password will throw an error if token is invalid
+  # ValidatePassword will throw an error if token is invalid
   ValidatePassword($::token);
-  trick_taint($::token); # Only used in placeholders
 
   Bugzilla::Token::CleanTokenTable();
 
@@ -98,9 +97,11 @@
 
 # If the user is requesting a password change, make sure they submitted
 # their login name and it exists in the database, and that the DB module is in
-# the list of allowed verification methids.
+# the list of allowed verification methods.
+my $login_name;
 if ( $::action eq 'reqpw' ) {
-    defined $cgi->param('loginname')
+    $login_name = $cgi->param('loginname');
+    defined $login_name
       || ThrowUserError("login_needed_for_password_change");
 
     # check verification methods
@@ -108,27 +109,25 @@
         ThrowUserError("password_change_requests_not_allowed");
     }
 
-    # Make sure the login name looks like an email address.
-    validate_email_syntax($cgi->param('loginname'))
-      || ThrowUserError('illegal_email_address',
-                        {addr => $cgi->param('loginname')});
+    validate_email_syntax($login_name)
+      || ThrowUserError('illegal_email_address', {addr => $login_name});
 
-    my $loginname = $cgi->param('loginname');
-    trick_taint($loginname); # Used only in a placeholder
     my ($user_id) = $dbh->selectrow_array('SELECT userid FROM profiles WHERE ' .
                                           $dbh->sql_istrcmp('login_name', '?'),
-                                          undef, $loginname);
+                                          undef, $login_name);
     $user_id || ThrowUserError("account_inexistent");
 }
 
 # If the user is changing their password, make sure they submitted a new
 # password and that the new password is valid.
+my $password;
 if ( $::action eq 'chgpw' ) {
-    defined $cgi->param('password')
+    $password = $cgi->param('password');
+    defined $password
       && defined $cgi->param('matchpassword')
       || ThrowUserError("require_new_password");
 
-    ValidatePassword($cgi->param('password'), $cgi->param('matchpassword'));
+    ValidatePassword($password, $cgi->param('matchpassword'));
 }
 
 ################################################################################
@@ -140,13 +139,13 @@
 # that variable and runs the appropriate code.
 
 if ($::action eq 'reqpw') { 
-    requestChangePassword(); 
+    requestChangePassword($login_name);
 } elsif ($::action eq 'cfmpw') { 
     confirmChangePassword(); 
 } elsif ($::action eq 'cxlpw') { 
     cancelChangePassword(); 
 } elsif ($::action eq 'chgpw') { 
-    changePassword(); 
+    changePassword($password);
 } elsif ($::action eq 'cfmem') {
     confirmChangeEmail();
 } elsif ($::action eq 'cxlem') {
@@ -167,7 +166,8 @@
 ################################################################################
 
 sub requestChangePassword {
-    Bugzilla::Token::IssuePasswordToken($cgi->param('loginname'));
+    my ($login_name) = @_;
+    Bugzilla::Token::IssuePasswordToken($login_name);
 
     $vars->{'message'} = "password_change_request";
 
@@ -194,11 +194,11 @@
 }
 
 sub changePassword {
+    my ($password) = @_;
     my $dbh = Bugzilla->dbh;
 
     # Create a crypted version of the new password
-    my $cryptedpassword = bz_crypt($cgi->param('password'));
-    trick_taint($cryptedpassword); # Used only in a placeholder
+    my $cryptedpassword = bz_crypt($password);
 
     # Get the user's ID from the tokens table.
     my ($userid) = $dbh->selectrow_array('SELECT userid FROM tokens
diff -urN --exclude=CVS --exclude='*.pdf' bugzilla-2.22/votes.cgi bugzilla-2.22.1/votes.cgi
--- bugzilla-2.22/votes.cgi	2005-10-24 16:11:55.000000000 -0700
+++ bugzilla-2.22.1/votes.cgi	2006-10-13 06:01:57.000000000 -0700
@@ -358,7 +358,8 @@
     $dbh->bz_unlock_tables();
 
     $vars->{'type'} = "votes";
-    $vars->{'mailrecipients'} = { 'changer' => $who };
+    $vars->{'mailrecipients'} = { 'changer' => Bugzilla->user->login };
+    $vars->{'title_tag'} = 'change_votes';
 
     foreach my $bug_id (@updated_bugs) {
         $vars->{'id'} = $bug_id;


Index: bugzilla.spec
===================================================================
RCS file: /cvs/extras/rpms/bugzilla/FC-4/bugzilla.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bugzilla.spec	27 Jun 2006 12:53:05 -0000	1.2
+++ bugzilla.spec	10 Nov 2006 00:54:12 -0000	1.3
@@ -6,13 +6,14 @@
 Name: bugzilla
 Version: 2.22
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MPL
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-data-dir.patch
 Patch1: bugzilla-config-path.patch
+Patch2: bugzilla-bz212355-fixvuln.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: smtpdaemon, webserver, graphviz, patchutils
@@ -40,6 +41,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
@@ -125,6 +127,9 @@
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Wed Nov  8 2006 John Berninger  - 2.22-7
+- Bz 212355 - fix multiple vulns
+
 * Tue Jun 26 2006 John Berninger  - 2.22-6
 - Clean up BugzillaEmail requires (filter it out)
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:58:01 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:58:01 -0700
Subject: rpms/mod_suphp/FC-6 mod_suphp.spec,1.11,1.12
Message-ID: <200611100058.kAA0w1XJ007244@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7194/FC-6

Modified Files:
	mod_suphp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/



Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-6/mod_suphp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_suphp.spec	10 Sep 2006 21:04:32 -0000	1.11
+++ mod_suphp.spec	10 Nov 2006 00:57:30 -0000	1.12
@@ -25,7 +25,7 @@
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -60,6 +60,7 @@
 %patch0 -p 1 -b .userdir
 %patch1 -p 1 -b .AddHandler
 %patch3 -p 1 -b .chroot
+%patch4 -p 1 -b .double-free
 
 # Patch source to conform to apr 1.x standards
 %if "%{fedora}" >= "5"
@@ -127,11 +128,14 @@
 
 
 %changelog
-* Fri Sep 08 2006 Andreas Thienemann  0.6.1-3
+* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
+- Fix double free corruption. For real this time. :-/
+
+* Fri Sep 08 2006 Andreas Thienemann  - 0.6.1-3
 - Finally fixed double free corruption #192415
 - Fixed up configuration creation
 
-* Wed May 24 2006 Andreas Thienemann  0.6.1-2
+* Wed May 24 2006 Andreas Thienemann  - 0.6.1-2
 - Corrected handler for mod_suphp.conf
 - Minor cleanups and fixes
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:58:01 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:58:01 -0700
Subject: rpms/mod_suphp/devel mod_suphp.spec,1.11,1.12
Message-ID: <200611100058.kAA0w12c007247@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7194/devel

Modified Files:
	mod_suphp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/



Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_suphp.spec	10 Sep 2006 21:04:32 -0000	1.11
+++ mod_suphp.spec	10 Nov 2006 00:57:31 -0000	1.12
@@ -25,7 +25,7 @@
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -60,6 +60,7 @@
 %patch0 -p 1 -b .userdir
 %patch1 -p 1 -b .AddHandler
 %patch3 -p 1 -b .chroot
+%patch4 -p 1 -b .double-free
 
 # Patch source to conform to apr 1.x standards
 %if "%{fedora}" >= "5"
@@ -127,11 +128,14 @@
 
 
 %changelog
-* Fri Sep 08 2006 Andreas Thienemann  0.6.1-3
+* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
+- Fix double free corruption. For real this time. :-/
+
+* Fri Sep 08 2006 Andreas Thienemann  - 0.6.1-3
 - Finally fixed double free corruption #192415
 - Fixed up configuration creation
 
-* Wed May 24 2006 Andreas Thienemann  0.6.1-2
+* Wed May 24 2006 Andreas Thienemann  - 0.6.1-2
 - Corrected handler for mod_suphp.conf
 - Minor cleanups and fixes
 



From fedora-extras-commits at redhat.com  Fri Nov 10 00:58:00 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 17:58:00 -0700
Subject: rpms/mod_suphp/FC-5 mod_suphp.conf, 1.1, 1.2 mod_suphp.spec, 1.10,
	1.11
Message-ID: <200611100058.kAA0w00g007241@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7194/FC-5

Modified Files:
	mod_suphp.conf mod_suphp.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/



Index: mod_suphp.conf
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-5/mod_suphp.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_suphp.conf	6 Feb 2006 16:40:00 -0000	1.1
+++ mod_suphp.conf	10 Nov 2006 00:57:30 -0000	1.2
@@ -5,18 +5,14 @@
 
 LoadModule suphp_module modules/mod_suphp.so
 
-# Define PHP Types
-AddType application/x-httpd-php .php
-
 # To use suPHP to parse PHP-Files
-### Uncomment to activate mod_suphp
-#AddHandler x-httpd-php .php
 
 # This option tells mod_suphp if a PHP-script requested on this server (or
 # VirtualHost) should be run with the PHP-interpreter or returned to the
 # browser "as it is".
-suPHP_Engine on
-suPHP_AddHandler x-httpd-php
+### Uncomment to activate mod_suphp
+#suPHP_Engine on
+#suPHP_AddHandler x-httpd-php
 
 # This option tells mod_suphp which path to pass on to the PHP-interpreter
 # (by setting the PHPRC environment variable).


Index: mod_suphp.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_suphp/FC-5/mod_suphp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_suphp.spec	6 Feb 2006 23:44:45 -0000	1.10
+++ mod_suphp.spec	10 Nov 2006 00:57:30 -0000	1.11
@@ -1,26 +1,31 @@
-# Depending on what version of Fedora we're on, use a different php binary
+# Depending on what version of Fedora we're on, use a different php binary, different apr
+# and also different handler.
 %if 0%{?fedora}
    %if "%{fedora}" >= "5"
       %define php /usr/bin/php-cgi
+      %define handler php5-script
       %define apr /usr/bin/apr-1-config
    %endif
    %if "%{fedora}" == "4"
       %define php /usr/bin/php-cgi
+      %define handler x-httpd-php
       %define apr /usr/bin/apr-config
    %endif
    %if "%{fedora}" <= "3"
       %define php /usr/bin/php
+      %define handler x-httpd-php
       %define apr /usr/bin/apr-config
    %endif
 %else
    %define php /usr/bin/php
+      %define handler x-httpd-php
    %define apr /usr/bin/apr-config
 %endif
 
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.1
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -30,30 +35,47 @@
 Patch0: mod_suphp-0.6.1-userdir.patch
 Patch1: mod_suphp-0.6.1-AddHandler.patch
 Patch2: mod_suphp-0.6.1-apr.patch
+Patch3: mod_suphp-0.6.1-chroot.patch
+Patch4: mod_suphp-0.6.1-DoubleFree.patch
 URL: http://www.suphp.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd >= 2.0, php
 Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
+Requires(post): policycoreutils
+Requires(postun): policycoreutils
 BuildRequires: httpd-devel >= 2.0, apr-devel
 
+
 %description
 suPHP is an apache module for executing PHP scripts with the permissions of
 their owners. It consists of an Apache module (mod_suphp) and a setuid root
 binary (suphp) that is called by the Apache module to change the uid of the
 process executing the PHP interpreter.
 
+Please take a look at %{_docdir}/%{name}-%{version}/README.fedora for 
+installation instructions.
+
 %prep
 %setup -q -n suphp-%{version}
 %patch0 -p 1 -b .userdir
 %patch1 -p 1 -b .AddHandler
+%patch3 -p 1 -b .chroot
+%patch4 -p 1 -b .double-free
 
 # Patch source to conform to apr 1.x standards
 %if "%{fedora}" >= "5"
 %patch2 -p 0 -b .apr
 %endif
 
+# fill placeholders
+sed -e 's|###PHP-BIN###|%{php}|g; s|###HANDLER###|%{handler}|g;' %{SOURCE1} > suphp.conf
+sed -e 's|###HANDLER###|%{handler}|g;' %{SOURCE2} > mod_suphp.conf
+sed -e 's|###HANDLER###|%{handler}|g;' %{SOURCE3} > README.fedora
+
+
 %build
 echo "Building mod_suphp with %{php} as PHP interpreter and %{apr} for the apr configuration script."
+echo "%{handler} is used as a AddHandler."
 %configure \
 	--with-apr=%{apr} \
 	--with-apxs=/usr/sbin/apxs \
@@ -73,6 +95,7 @@
 mv .libs/mod_suphp.so .
 popd
 
+
 %install
 rm -rf %{buildroot}
 
@@ -80,27 +103,42 @@
 %{__install} -m 755 -D src/apache2/mod_suphp.so %{buildroot}%{_libdir}/httpd/modules/mod_suphp.so
 
 # Install the config files
-sed -e 's@###PHP-BIN###@%{php}@' %{SOURCE1} > suphp.conf
 %{__install} -m 644 -D suphp.conf %{buildroot}%{_sysconfdir}/suphp.conf
-%{__install} -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf
+%{__install} -m 644 -D mod_suphp.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_suphp.conf
 
 # Rename docs
 cp doc/CONFIG CONFIG.suphp
 cp doc/apache/CONFIG CONFIG.apache
-cp %{SOURCE3} README.fedora
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+
+%postun
+
 %files
 %defattr(-,root,root)
 %doc README COPYING CONFIG.suphp CONFIG.apache README.fedora
-%attr (4755, root, root) %{_sbindir}/suphp
+%attr (4550, root, root) %{_sbindir}/suphp
 %{_libdir}/httpd/modules/*.so
 %config(noreplace) %{_sysconfdir}/suphp.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_suphp.conf
 
+
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
+- Fix double free corruption. For real this time. :-/
+
+* Fri Sep 08 2006 Andreas Thienemann  - 0.6.1-3
+- Finally fixed double free corruption #192415
+- Fixed up configuration creation
+
+* Wed May 24 2006 Andreas Thienemann  - 0.6.1-2
+- Corrected handler for mod_suphp.conf
+- Minor cleanups and fixes
+
 * Mon Feb 06 2006 Andreas Thienemann  0.6.1-1
 - Updated to 0.6.1
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:09:59 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:09:59 -0700
Subject: rpms/mboxgrep/FC-5 mboxgrep-debug.diff,NONE,1.1
Message-ID: <200611100109.kAA19xrM010753@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10744/FC-5

Added Files:
	mboxgrep-debug.diff 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files


mboxgrep-debug.diff:

--- NEW FILE mboxgrep-debug.diff ---
--- mboxgrep-0.7.9/src/Makefile.in.orig	2006-11-10 02:06:29.000000000 +0100
+++ mboxgrep-0.7.9/src/Makefile.in	2006-11-10 02:06:35.000000000 +0100
@@ -52,6 +52,6 @@
 .PHONY: install
 install: mboxgrep
 	$(INSTALL) -d $(prefix)/bin
-	$(INSTALL) -s $(TARGET) $(prefix)/bin
+	$(INSTALL) $(TARGET) $(prefix)/bin
 
 .NOEXPORT:



From fedora-extras-commits at redhat.com  Fri Nov 10 01:10:05 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:10:05 -0700
Subject: rpms/mboxgrep/FC-6 mboxgrep-debug.diff,NONE,1.1
Message-ID: <200611100110.kAA1A5fq010770@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10744/FC-6

Added Files:
	mboxgrep-debug.diff 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files


mboxgrep-debug.diff:

--- NEW FILE mboxgrep-debug.diff ---
--- mboxgrep-0.7.9/src/Makefile.in.orig	2006-11-10 02:06:29.000000000 +0100
+++ mboxgrep-0.7.9/src/Makefile.in	2006-11-10 02:06:35.000000000 +0100
@@ -52,6 +52,6 @@
 .PHONY: install
 install: mboxgrep
 	$(INSTALL) -d $(prefix)/bin
-	$(INSTALL) -s $(TARGET) $(prefix)/bin
+	$(INSTALL) $(TARGET) $(prefix)/bin
 
 .NOEXPORT:



From fedora-extras-commits at redhat.com  Fri Nov 10 01:10:41 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:10:41 -0700
Subject: rpms/mboxgrep/devel mboxgrep-debug.diff, NONE, 1.1 mboxgrep.spec,
	1.2, 1.3
Message-ID: <200611100110.kAA1Af3d010807@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10744/devel

Modified Files:
	mboxgrep.spec 
Added Files:
	mboxgrep-debug.diff 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files


mboxgrep-debug.diff:

--- NEW FILE mboxgrep-debug.diff ---
--- mboxgrep-0.7.9/src/Makefile.in.orig	2006-11-10 02:06:29.000000000 +0100
+++ mboxgrep-0.7.9/src/Makefile.in	2006-11-10 02:06:35.000000000 +0100
@@ -52,6 +52,6 @@
 .PHONY: install
 install: mboxgrep
 	$(INSTALL) -d $(prefix)/bin
-	$(INSTALL) -s $(TARGET) $(prefix)/bin
+	$(INSTALL) $(TARGET) $(prefix)/bin
 
 .NOEXPORT:


Index: mboxgrep.spec
===================================================================
RCS file: /cvs/extras/rpms/mboxgrep/devel/mboxgrep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mboxgrep.spec	8 Sep 2006 17:37:02 -0000	1.2
+++ mboxgrep.spec	10 Nov 2006 01:10:11 -0000	1.3
@@ -1,10 +1,11 @@
 Summary: Displays e-mail messages matching a pattern
 Name: mboxgrep
 Version: 0.7.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz
+Patch0: mboxgrep-debug.diff
 URL: http://www.mboxgrep.org
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, bzip2-devel, pcre-devel
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .debug
 
 %build
 %configure
@@ -49,6 +51,9 @@
 %{_infodir}/mboxgrep.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
+- Fixed up debug package to actually contain debugging files
+
 * Fri Sep 08 2006 Andreas Thienemann  - 0.7.9-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:12:09 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:12:09 -0700
Subject: rpms/mboxgrep/FC-5 mboxgrep.spec,1.1,1.2
Message-ID: <200611100112.kAA1C9wA011086@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11056/FC-5

Modified Files:
	mboxgrep.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files



Index: mboxgrep.spec
===================================================================
RCS file: /cvs/extras/rpms/mboxgrep/FC-5/mboxgrep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mboxgrep.spec	4 May 2006 03:22:55 -0000	1.1
+++ mboxgrep.spec	10 Nov 2006 01:11:39 -0000	1.2
@@ -1,10 +1,11 @@
 Summary: Displays e-mail messages matching a pattern
 Name: mboxgrep
 Version: 0.7.9
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz
+Patch0: mboxgrep-debug.diff
 URL: http://www.mboxgrep.org
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, bzip2-devel, pcre-devel
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .debug
 
 %build
 %configure
@@ -49,6 +51,12 @@
 %{_infodir}/mboxgrep.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
+- Fixed up debug package to actually contain debugging files
+
+* Fri Sep 08 2006 Andreas Thienemann  - 0.7.9-3
+- FE6 Rebuild
+
 * Wed Mar 29 2006 Andreas Thienemann  0.7.9-2
 - Cleaned up for FE
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:12:10 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:12:10 -0700
Subject: rpms/mboxgrep/FC-6 mboxgrep.spec,1.2,1.3
Message-ID: <200611100112.kAA1CAVj011089@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mboxgrep/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11056/FC-6

Modified Files:
	mboxgrep.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
- Fixed up debug package to actually contain debugging files



Index: mboxgrep.spec
===================================================================
RCS file: /cvs/extras/rpms/mboxgrep/FC-6/mboxgrep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mboxgrep.spec	8 Sep 2006 17:37:02 -0000	1.2
+++ mboxgrep.spec	10 Nov 2006 01:11:40 -0000	1.3
@@ -1,10 +1,11 @@
 Summary: Displays e-mail messages matching a pattern
 Name: mboxgrep
 Version: 0.7.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/mboxgrep/mboxgrep-0.7.9.tar.gz
+Patch0: mboxgrep-debug.diff
 URL: http://www.mboxgrep.org
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, bzip2-devel, pcre-devel
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch -p 1 -b .debug
 
 %build
 %configure
@@ -49,6 +51,9 @@
 %{_infodir}/mboxgrep.info*
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 0.7.9-4
+- Fixed up debug package to actually contain debugging files
+
 * Fri Sep 08 2006 Andreas Thienemann  - 0.7.9-3
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:15:11 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:15:11 -0700
Subject: rpms/mod_suphp/FC-5 mod_suphp-0.6.1-DoubleFree.patch,NONE,1.1
Message-ID: <200611100115.kAA1FBmV011352@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11345

Added Files:
	mod_suphp-0.6.1-DoubleFree.patch 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/


mod_suphp-0.6.1-DoubleFree.patch:

--- NEW FILE mod_suphp-0.6.1-DoubleFree.patch ---
diff -urNp suphp-0.6.1.orig/src/API_Linux.cpp suphp-0.6.1/src/API_Linux.cpp
--- suphp-0.6.1.orig/src/API_Linux.cpp	2006-06-19 18:39:17.000000000 +0100
+++ suphp-0.6.1/src/API_Linux.cpp	2006-06-19 18:37:38.000000000 +0100
@@ -42,7 +42,7 @@ extern char **environ;
 
 using namespace suPHP;
 
-SmartPtr suPHP::API_Linux::logger;
+SmartPtr* suPHP::API_Linux::logger;
 
 bool suPHP::API_Linux::isSymlink(const std::string path) const
     throw (SystemException) {
@@ -139,10 +139,10 @@ GroupInfo suPHP::API_Linux::getRealProce
 
 
 Logger& suPHP::API_Linux::getSystemLogger() {
-    if (suPHP::API_Linux::logger.get() == NULL) {
-	suPHP::API_Linux::logger.reset(new API_Linux_Logger());
+    if (suPHP::API_Linux::logger->get() == NULL) {
+	suPHP::API_Linux::logger->reset(new API_Linux_Logger());
     }
-    return *(suPHP::API_Linux::logger);
+    return **(suPHP::API_Linux::logger);
 }
 
 
diff -urNp suphp-0.6.1.orig/src/API_Linux.hpp suphp-0.6.1/src/API_Linux.hpp
--- suphp-0.6.1.orig/src/API_Linux.hpp	2006-06-19 18:39:17.000000000 +0100
+++ suphp-0.6.1/src/API_Linux.hpp	2006-06-19 18:43:23.000000000 +0100
@@ -41,9 +41,10 @@ namespace suPHP {
      */
     class API_Linux : public API {
     private:
-	static SmartPtr logger;
+	/* Try and avoid the "static initialization order fiasco" */
+	static SmartPtr* logger;
 	/**
-	 * Internal function for checking wheter path
+	 * Internal function for checking whether path
 	 * points to a symlink
 	 */
 	bool isSymlink(const std::string path) const 
@@ -57,6 +58,25 @@ namespace suPHP {
 
     public:
 	/**
+	 * Constructor
+	 */
+	API_Linux() {
+		logger = NULL;
+		logger = new SmartPtr;
+	};
+
+	/**
+	 * Destructor
+	 */
+	~API_Linux() {
+		if (logger != NULL) {
+			delete logger;
+		}
+		logger = NULL;
+	};
+	
+	
+	/**
 	 * Get environment variable
 	 */
 	virtual Environment getProcessEnvironment();



From fedora-extras-commits at redhat.com  Fri Nov 10 01:19:16 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:19:16 -0700
Subject: rpms/ddrescue/FC-6 dd_rescue.spec,1.1,1.2
Message-ID: <200611100119.kAA1JGBd011444@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11412/FC-6

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
- Fix debug package



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/FC-6/dd_rescue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dd_rescue.spec	8 Sep 2006 17:16:26 -0000	1.1
+++ dd_rescue.spec	10 Nov 2006 01:18:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        1
+Release:        2
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}/usr INSTASROOT=""
+make install DESTDIR=%{buildroot}/usr INSTASROOT="" INSTALLFLAGS=""
 pushd dd_rhelp-%{rhelp_version}/
 make install DESTDIR=%{buildroot}
 popd
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
+- Fix debug package
+
 * Fri Sep 08 2006 Andreas Thienemann  - 1.12-1
 - Updated to 1.12
 - Finally updated the package name to what we are actually shipping, 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:19:17 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:19:17 -0700
Subject: rpms/ddrescue/devel dd_rescue.spec,1.1,1.2
Message-ID: <200611100119.kAA1JHBO011447@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11412/devel

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
- Fix debug package



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/devel/dd_rescue.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dd_rescue.spec	8 Sep 2006 17:16:26 -0000	1.1
+++ dd_rescue.spec	10 Nov 2006 01:18:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        1
+Release:        2
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}/usr INSTASROOT=""
+make install DESTDIR=%{buildroot}/usr INSTASROOT="" INSTALLFLAGS=""
 pushd dd_rhelp-%{rhelp_version}/
 make install DESTDIR=%{buildroot}
 popd
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
+- Fix debug package
+
 * Fri Sep 08 2006 Andreas Thienemann  - 1.12-1
 - Updated to 1.12
 - Finally updated the package name to what we are actually shipping, 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:22:04 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:22:04 -0700
Subject: rpms/ddrescue/devel dd_rescue.spec,1.2,1.3
Message-ID: <200611100122.kAA1M4WO011585@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11569

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
- *bump*



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/devel/dd_rescue.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dd_rescue.spec	10 Nov 2006 01:18:46 -0000	1.2
+++ dd_rescue.spec	10 Nov 2006 01:21:34 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        2
+Release:        3
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -56,7 +56,10 @@
 
 
 %changelog
-* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
+- *bump*
+
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-2
 - Fix debug package
 
 * Fri Sep 08 2006 Andreas Thienemann  - 1.12-1



From fedora-extras-commits at redhat.com  Fri Nov 10 01:23:31 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:23:31 -0700
Subject: rpms/ddrescue/FC-6 dd_rescue.spec,1.2,1.3
Message-ID: <200611100123.kAA1NVaK011666@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11639

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
- *bump*



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/FC-6/dd_rescue.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dd_rescue.spec	10 Nov 2006 01:18:46 -0000	1.2
+++ dd_rescue.spec	10 Nov 2006 01:23:01 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        2
+Release:        3
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -56,7 +56,10 @@
 
 
 %changelog
-* Fri Nov 10 2006 Andreas Thienemann  - 1.12-1
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
+- *bump*
+
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-2
 - Fix debug package
 
 * Fri Sep 08 2006 Andreas Thienemann  - 1.12-1



From fedora-extras-commits at redhat.com  Fri Nov 10 01:25:15 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:25:15 -0700
Subject: rpms/mod_suphp/FC-5 mod_suphp-0.6.1-chroot.patch,NONE,1.1
Message-ID: <200611100125.kAA1PFOC011739@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/mod_suphp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11730

Added Files:
	mod_suphp-0.6.1-chroot.patch 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 0.6.1-4
- Fix double free corruption. For real this time. :-/


mod_suphp-0.6.1-chroot.patch:

--- NEW FILE mod_suphp-0.6.1-chroot.patch ---
Hello list!

I've written a patch around the chroot() function in
suPHP 0.6.1. First I'll explain our old setup and why
we find this patch useful.

Since we are improving our webserver security at the
moment, we were looking for a possibility to
chroot() some users.

Our old setup consists of mod_php and PHP per VirtualHost
configurations like:
   php_admin_value open_basedir ...
   php_admin_value upload_tmp_dir ...
   ...
With disable_functions we disabled functions like exec(),
system(), etc to let the user stay in his open_basedir
(executed programs don't got the open_basedir
restrictions).

Some users requested the possibility to exec programs like
the ImageMagick tools, needed for Typo3 or other PHP
programs like PHP gallery. I know about the possibility to
configure a safe_mode_exec_dir within the php.ini, but it
is not the best solution.

The new suPHP version 0.6.1 offers the possibility to
chroot and it works nice. Though there are some problems:
- There is only one configuration file and the chroot-path
  is configured within the global config. If you want to
  chroot each virtual host into it's own chroot-jail it
  isn't possible.
- When chrooted the path of the php script stays like
  outsite the chroot environment.
  Example:
     before suPHP chroot()
     SCRIPT_FILENAME = /chroot/YOUR_SITE/var/www/index.php
     CURRENT_ROOT    = /
     CHROOT          = /chroot/YOUR_SITE/

     after suPHP chroot()
     SCRIPT_FILENAME = /chroot/YOUR_SITE/var/www/index.php
     CURRENT_ROOT    = /chroot/YOUR_SITE/

     PHP will look for a file called
        /chroot/YOUR_SITE/var/www/index.php
     inside the chroot environment.
     Infact the file is
        /var/www/index.php
     inside the chroot environment.

What the attached patch does:
- It adds a mod_suphp configuration option called
  "suPHP_Options" (the name might not be the best, but
  since suPHP_ConfigPath was already in use, I've choosen
  this name)
- It "translates" the script path after chroot() so that
  PHP will find the right script.

Here are the steps I used to build a chroot environment for
a virtual host:
- Create a directory structure for the chroot directory:
  $ mkdir -p /chroot/YOUR_SITE/\
{bin,etc,lib,tmp,usr/bin,usr/lib/,var/www}

- Copy the php binary and depending libraries into the
  chroot directory:
  $ ldd /usr/bin/php-cgi | sed -e \
's,.*=> /\(.*\) (0x.*,\1,' | while read lib; \
do
   LIBDIR="/chroot/YOUR_SITE/`dirname ${lib}`"; \
   test ! -d $LIBDIR && mkdir -p $LIBDIR; \
   cp -v /${lib} /chroot/YOUR_SITE/${lib}; \
done

- Copy a php.ini into the chroot directory and change the
  doc_root configuration parameter.
  $ cat /chroot/YOUR_SITE/etc/php.ini |
     sed -e 's,^doc_root.*$,doc_root ="/var/www/",' > \
     /chroot/YOUR_SITE/etc/php.ini

- Create a apache VirtualHost:
    
       ServerName YOUR_SITE.EXAMPLE
       ServerAdmin [11]YOU at YOUR_SITE.EXAMPLE

       DocumentRoot /chroot/YOUR_SITE/var/www/
       
          suPHP_Engine On
          suPHP_Options /chroot/YOUR_SITE-suphp.conf

          # chrooted view
          suPHP_ConfigPath /etc/
       
    

- Create a suPHP configuration file.
  Just pick the default file and set
     chroot=/chroot/YOUR_SITE/

WARNING there are some limitations with this patch:
- First, I'm not the best C, C++ developer and this is my
  first apache module work
- The code is mostly quick and dirty hacked, because I
  wanted to try if this would work.
- Only the apache2 module was patched.

I'd appreciate if you review this patch and post your
comments on this.

Greetings,
Jan

--- suphp-0.6.1/src/apache2/mod_suphp.c.orig	2006-05-24 04:31:35.000000000 +0200
+++ suphp-0.6.1/src/apache2/mod_suphp.c	2006-05-24 04:34:58.000000000 +0200
@@ -114,6 +114,7 @@
     char *target_user;
     char *target_group;
 #endif
+    char *suphp_options;
     apr_table_t *handlers;
 } suphp_conf;
 
@@ -130,7 +131,9 @@
     cfg->target_user = NULL;
     cfg->target_group = NULL;
 #endif
-    
+
+    cfg->suphp_options = NULL;
+
     /* Create table with 0 initial elements */
     /* This size may be increased for performance reasons */
     cfg->handlers = apr_table_make(p, 0);
@@ -175,6 +178,13 @@
     else
         merged->target_group = NULL;
 #endif
+
+    if (child->suphp_options)
+    	merged->suphp_options = apr_pstrdup(p, child->suphp_options);
+    else if (parent->suphp_options)
+	merged->suphp_options = apr_pstrdup(p, parent->suphp_options);
+    else
+	merged->suphp_options = NULL;
     
     merged->handlers = apr_table_overlay(p, child->handlers, parent->handlers);
     
@@ -265,6 +275,17 @@
     return NULL;
 }
 
+static const char *suphp_handle_cmd_options(cmd_parms *cmd, void *mconfig,
+                                           const char *arg)
+{
+    suphp_conf *cfg;
+    cfg = (suphp_conf *) mconfig;
+    
+    cfg->suphp_options = apr_pstrdup(cmd->pool, arg);
+    
+    return NULL;
+}
+
 
 #ifdef SUPHP_USE_USERGROUP
 static const char *suphp_handle_cmd_user_group(cmd_parms *cmd, void *mconfig,
@@ -315,6 +336,7 @@
 #endif
     AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
     AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
+	AP_INIT_TAKE1("suPHP_Options", suphp_handle_cmd_options, NULL, OR_OPTIONS, "The configuration file suPHP should use for this virtual host"),
     {NULL}
 };
 
@@ -436,6 +458,11 @@
     {
         apr_table_setn(r->subprocess_env, "SUPHP_PHP_CONFIG", apr_pstrdup(p, dconf->php_config));
     }
+
+    if (dconf->suphp_options)
+    {
+        apr_table_setn(r->subprocess_env, "SUPHP_OPTIONS", apr_pstrdup(p, dconf->suphp_options));
+    }
     
     apr_table_setn(r->subprocess_env, "SUPHP_HANDLER", r->handler);
     
--- suphp-0.6.1/src/Application.cpp.orig	2006-05-24 04:31:35.000000000 +0200
+++ suphp-0.6.1/src/Application.cpp	2006-05-24 04:34:13.000000000 +0200
@@ -50,16 +50,23 @@
     API& api = API_Helper::getSystemAPI();
     Logger& logger = api.getSystemLogger();
     
-#ifdef OPT_CONFIGFILE
-    File cfgFile = File(OPT_CONFIGFILE);
-#else
-    File cfgFile = File("/etc/suphp.conf");
-#endif
 
     std::string interpreter;
     TargetMode targetMode;
     Environment newEnv;
 
+    File cfgFile = File("");
+    
+    try {
+        cfgFile = File(env.getVar("SUPHP_OPTIONS").c_str());
+    } catch (KeyNotFoundException &e) {
+#ifdef OPT_CONFIGFILE
+	cfgFile = File(OPT_CONFIGFILE);
+#else
+	cfgFile = File("/etc/suphp.conf");
+#endif
+    }
+
     // Begin try block - soft exception cannot really be handled before
     // initialization
     try {
@@ -88,14 +95,23 @@
 	    return 1;
 	}
 
-	this->checkScriptFile(scriptFilename, config, env);
-
 	// Root privileges are needed for chroot()
 	// so do this before changing process permissions
 	if (config.getChrootPath().length() > 0) {
 	    api.chroot(config.getChrootPath());
+
+	    // after chroot() the SCRIPT_FILENAME path has changed
+	    // and needs to get "translated"
+	    std::string strChrootPath(config.getChrootPath());
+
+	    // TODO: check if there is a "/" at the beginning of scriptFilename
+	    scriptFilename.replace(scriptFilename.find(strChrootPath), strChrootPath.length(), "");
+	    env.setVar("DOCUMENT_ROOT", "/");
+	    env.setVar("SCRIPT_FILENAME", scriptFilename);
 	}
 
+	this->checkScriptFile(scriptFilename, config, env);
+
 	this->changeProcessPermissions(scriptFilename, config, env);
 
 	interpreter = this->getInterpreter(env, config);
@@ -396,6 +412,8 @@
 	env.deleteVar("SUPHP_AUTH_PW");
     if (env.hasVar("SUPHP_PHP_CONFIG"))
 	env.deleteVar("SUPHP_PHP_CONFIG");
+    if (env.hasVar("SUPHP_OPTIONS"))
+	env.deleteVar("SUPHP_OPTIONS");
     
     // Reset PATH
     env.putVar("PATH", config.getEnvPath());



From fedora-extras-commits at redhat.com  Fri Nov 10 01:29:03 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:29:03 -0700
Subject: rpms/ddrescue/devel dd_rescue.spec,1.3,1.4
Message-ID: <200611100129.kAA1T3EA012606@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12347

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-4
- Added dist-tag



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/devel/dd_rescue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dd_rescue.spec	10 Nov 2006 01:21:34 -0000	1.3
+++ dd_rescue.spec	10 Nov 2006 01:28:32 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-4
+- Added dist-tag
+
 * Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
 - *bump*
 



From fedora-extras-commits at redhat.com  Fri Nov 10 01:31:58 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 9 Nov 2006 18:31:58 -0700
Subject: rpms/ddrescue/FC-6 dd_rescue.spec,1.3,1.4
Message-ID: <200611100131.kAA1VwPK012805@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ddrescue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12789

Modified Files:
	dd_rescue.spec 
Log Message:
* Fri Nov 10 2006 Andreas Thienemann  - 1.12-4
- Added dist-tag



Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/FC-6/dd_rescue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dd_rescue.spec	10 Nov 2006 01:23:01 -0000	1.3
+++ dd_rescue.spec	10 Nov 2006 01:31:28 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           dd_rescue
 Version:        1.12
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Fault tolerant "dd" utility for rescuing data from bad media
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Andreas Thienemann  - 1.12-4
+- Added dist-tag
+
 * Fri Nov 10 2006 Andreas Thienemann  - 1.12-3
 - *bump*
 



From fedora-extras-commits at redhat.com  Fri Nov 10 03:50:31 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 9 Nov 2006 20:50:31 -0700
Subject: rpms/seamonkey/FC-6 seamonkey.spec,1.12,1.13
Message-ID: <200611100350.kAA3oVSB019784@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19765

Modified Files:
	seamonkey.spec 
Log Message:
* Thu Nov 09 2006 Kai Engert  1.0.6-0.6.1
- Do not run regchrome.



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/seamonkey.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- seamonkey.spec	9 Nov 2006 19:57:13 -0000	1.12
+++ seamonkey.spec	10 Nov 2006 03:50:01 -0000	1.13
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.6
-Release:        0.6%{?dist}
+Release:        0.6.1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -258,9 +258,6 @@
   echo "skin,install,select,classic/1.0" >> chrome/lang/default.txt
   echo "locale,install,select,en-US" >> chrome/lang/default.txt
 
-  # set up the chrome rdf files
-  LD_LIBRARY_PATH=`pwd`:`pwd`/.. MOZILLA_FIVE_HOME=`pwd` MOZ_DISABLE_GNOME=1 ./regchrome
-
   # fix permissions of the chrome directories
   /usr/bin/find . -type d -perm 0700 -exec chmod 755 {} \; || :
 
@@ -432,6 +429,8 @@
 
 
 %changelog
+* Thu Nov 09 2006 Kai Engert  1.0.6-0.6.1
+- Do not run regchrome.
 * Thu Nov 09 2006 Kai Engert  1.0.6-0.6
 - SeaMonkey 1.0.6
 * Thu Sep 14 2006 Kai Engert  1.0.5-1



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:21 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:21 -0700
Subject: rpms/grhino/FC-3 grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200611100759.kAA7xLtN001108@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/FC-3

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:34 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:58:50 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:37:52 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:58:50 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	29 Oct 2006 20:15:18 -0000	1.5
+++ grhino.spec	10 Nov 2006 07:58:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:34 -0000	1.5
+++ sources	10 Nov 2006 07:58:50 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:22 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:22 -0700
Subject: rpms/grhino/FC-4 grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611100759.kAA7xMOg001114@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/FC-4

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:35 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:58:51 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:29:06 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:58:51 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	29 Oct 2006 20:15:19 -0000	1.6
+++ grhino.spec	10 Nov 2006 07:58:51 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:35 -0000	1.5
+++ sources	10 Nov 2006 07:58:51 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:27 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:27 -0700
Subject: rpms/grhino/FC-5 grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611100759.kAA7xRWL001120@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/FC-5

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:35 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:58:57 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:18:55 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:58:57 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	29 Oct 2006 20:15:25 -0000	1.6
+++ grhino.spec	10 Nov 2006 07:58:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:35 -0000	1.5
+++ sources	10 Nov 2006 07:58:57 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:28 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:28 -0700
Subject: rpms/grhino/FC-6 grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200611100759.kAA7xS6i001126@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/FC-6

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:36 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:58:58 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:18:55 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:58:58 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grhino.spec	29 Oct 2006 19:58:39 -0000	1.8
+++ grhino.spec	10 Nov 2006 07:58:58 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Oct 2006 19:58:39 -0000	1.7
+++ sources	10 Nov 2006 07:58:58 -0000	1.8
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 07:59:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 00:59:34 -0700
Subject: rpms/grhino/devel grhino-icon.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 grhino.desktop, 1.2, 1.3 grhino.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200611100759.kAA7xYUM001132@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1001/devel

Modified Files:
	.cvsignore grhino.desktop grhino.spec sources 
Added Files:
	grhino-icon.patch 
Log Message:
Add patch to add application icon


grhino-icon.patch:

--- NEW FILE grhino-icon.patch ---
--- grhino-0.15.2/grhino.cc.orig	2006-08-10 10:57:38.000000000 -0400
+++ grhino-0.15.2/grhino.cc	2006-11-10 02:43:40.000000000 -0500
@@ -1555,6 +1555,9 @@
 
 	init_game_before_draw();
 
+	gtk_window_set_default_icon_from_file("/usr/share/pixmaps/grhino.png",\
+					      NULL);
+
 	main_window = gnome_app_new("GRhino", _(prog_name));
 	g_signal_connect(G_OBJECT(main_window), "destroy",
 			 G_CALLBACK(destroy_signal), 0);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Oct 2006 14:11:36 -0000	1.5
+++ .cvsignore	10 Nov 2006 07:59:04 -0000	1.6
@@ -1 +1 @@
-grhino-0.15.2.tar.gz
+grhino.png


Index: grhino.desktop
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grhino.desktop	5 Sep 2005 00:18:55 -0000	1.2
+++ grhino.desktop	10 Nov 2006 07:59:04 -0000	1.3
@@ -4,9 +4,9 @@
 GenericName=GTP-compliant Reversi game
 Comment=Reversi game for GNOME, supporting the Go/Game Text Protocol
 Exec=grhino
-#Icon=
+Icon=grhino.png
 Terminal=false
 Type=Application
-Version=0.15.0
+Version=0.15.2
 Categories=Application;GNOME;Game;BoardGame;
 StartupNotify=true


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	29 Oct 2006 20:15:26 -0000	1.7
+++ grhino.spec	10 Nov 2006 07:59:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           grhino
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
@@ -8,9 +8,11 @@
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
 Patch2:		grhino-omf.patch
+Patch3:		grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -38,9 +40,10 @@
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
+%patch0 -b .scrollkeeper
+%patch1 -p1 -b .gettext
+%patch2 -b .omf
+%patch3 -p1 -b .icon
 
 
 %build
@@ -62,6 +65,10 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
+# Icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
 %find_lang %{name}
 
 %post
@@ -80,13 +87,16 @@
 %{_bindir}/grhino
 %{_bindir}/gtp-rhino
 %{_datadir}/applications/*.desktop
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/gnome/help/grhino/
+%{_datadir}/pixmaps/grhino.png
 %{_datadir}/grhino-%{version}/
 %{_datadir}/omf/grhino/
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4
+- Add application icon
+
 * Sun Oct 29 2006 Michel Salim  - 0.15.2-3
 - Fix incorrect OMF path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Oct 2006 14:11:36 -0000	1.5
+++ sources	10 Nov 2006 07:59:04 -0000	1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+b98f0e178f6291232babfcb1c4925ea0  grhino.png



From fedora-extras-commits at redhat.com  Fri Nov 10 08:24:54 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 10 Nov 2006 01:24:54 -0700
Subject: rpms/yumex/FC-6 .cvsignore, 1.27, 1.28 sources, 1.35,
	1.36 yumex.spec, 1.41, 1.42
Message-ID: <200611100824.kAA8Os0j004463@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4424/FC-6

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 1.2.0-1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	25 Oct 2006 13:07:26 -0000	1.27
+++ .cvsignore	10 Nov 2006 08:24:23 -0000	1.28
@@ -1 +1 @@
-yumex-1.1.7.tar.gz
+yumex-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Oct 2006 13:07:26 -0000	1.35
+++ sources	10 Nov 2006 08:24:23 -0000	1.36
@@ -1 +1 @@
-307104c00fb4b00c140c353d38d42b6b  yumex-1.1.7.tar.gz
+ee017920c2d4b9be2a01605185677e14  yumex-1.2.0.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-6/yumex.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- yumex.spec	25 Oct 2006 13:07:26 -0000	1.41
+++ yumex.spec	10 Nov 2006 08:24:23 -0000	1.42
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.7
+Version:  1.2.0
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Nov 10 2006 Tim Lauridsen  - 1.2.0-1.0
+- Release 1.2.0-1.0
 * Wed Oct 25 2006 Tim Lauridsen  - 1.1.7-1.0
 - Development Release 1.1.7-1.0
 * Wed Oct 25 2006 Tim Lauridsen  - 1.1.6-1.0



From fedora-extras-commits at redhat.com  Fri Nov 10 08:24:55 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 10 Nov 2006 01:24:55 -0700
Subject: rpms/yumex/devel sources,1.35,1.36 yumex.spec,1.41,1.42
Message-ID: <200611100824.kAA8OtmU004467@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4424/devel

Modified Files:
	sources yumex.spec 
Log Message:
Release 1.2.0-1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	25 Oct 2006 13:07:27 -0000	1.35
+++ sources	10 Nov 2006 08:24:24 -0000	1.36
@@ -1 +1 @@
-307104c00fb4b00c140c353d38d42b6b  yumex-1.1.7.tar.gz
+ee017920c2d4b9be2a01605185677e14  yumex-1.2.0.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- yumex.spec	25 Oct 2006 13:07:27 -0000	1.41
+++ yumex.spec	10 Nov 2006 08:24:24 -0000	1.42
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  1.1.7
+Version:  1.2.0
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -67,6 +67,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Nov 10 2006 Tim Lauridsen  - 1.2.0-1.0
+- Release 1.2.0-1.0
 * Wed Oct 25 2006 Tim Lauridsen  - 1.1.7-1.0
 - Development Release 1.1.7-1.0
 * Wed Oct 25 2006 Tim Lauridsen  - 1.1.6-1.0



From fedora-extras-commits at redhat.com  Fri Nov 10 08:36:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:36:16 -0700
Subject: rpms/beneath-a-steel-sky-cd - New directory
Message-ID: <200611100836.kAA8aG6S004639@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4635/beneath-a-steel-sky-cd

Log Message:
Directory /cvs/extras/rpms/beneath-a-steel-sky-cd added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 08:36:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:36:22 -0700
Subject: rpms/beneath-a-steel-sky-cd/devel - New directory
Message-ID: <200611100836.kAA8aMBc004653@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4635/beneath-a-steel-sky-cd/devel

Log Message:
Directory /cvs/extras/rpms/beneath-a-steel-sky-cd/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 08:36:39 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:36:39 -0700
Subject: rpms/beneath-a-steel-sky-cd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611100836.kAA8advK004684@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4678

Added Files:
	Makefile import.log 
Log Message:
Setup of module beneath-a-steel-sky-cd


--- NEW FILE Makefile ---
# Top level Makefile for module beneath-a-steel-sky-cd
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  Fri Nov 10 08:36:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:36:44 -0700
Subject: rpms/beneath-a-steel-sky-cd/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611100836.kAA8aiZo004702@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4678/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beneath-a-steel-sky-cd


--- 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  Fri Nov 10 08:43:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:43:11 -0700
Subject: rpms/beneath-a-steel-sky-cd import.log,1.1,1.2
Message-ID: <200611100843.kAA8hBYG004791@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4758

Modified Files:
	import.log 
Log Message:
auto-import beneath-a-steel-sky-cd-0.0372-1 on branch devel from beneath-a-steel-sky-cd-0.0372-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky-cd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 08:36:38 -0000	1.1
+++ import.log	10 Nov 2006 08:42:41 -0000	1.2
@@ -0,0 +1 @@
+beneath-a-steel-sky-cd-0_0372-1:HEAD:beneath-a-steel-sky-cd-0.0372-1.src.rpm:1163148224



From fedora-extras-commits at redhat.com  Fri Nov 10 08:43:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:43:12 -0700
Subject: rpms/beneath-a-steel-sky-cd/devel beneath-a-steel-sky-cd.desktop,
	NONE, 1.1 beneath-a-steel-sky-cd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611100843.kAA8hCLB004795@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/beneath-a-steel-sky-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4758/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beneath-a-steel-sky-cd.desktop beneath-a-steel-sky-cd.spec 
Log Message:
auto-import beneath-a-steel-sky-cd-0.0372-1 on branch devel from beneath-a-steel-sky-cd-0.0372-1.src.rpm


--- NEW FILE beneath-a-steel-sky-cd.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beneath a Steel Sky (CD version)
Comment=Adventure Game
Exec=scummvm -f -p /usr/share/beneath-a-steel-sky-cd sky
Icon=scummvm.png
Terminal=false
Type=Application
Categories=Application;Game;AdventureGame;
StartupNotify=false


--- NEW FILE beneath-a-steel-sky-cd.spec ---
Name:           beneath-a-steel-sky-cd
Version:        0.0372
Release:        1
Summary:        Beneath a Steel Sky - Adventure Game - CD version
Group:          Amusements/Games
# For further discussion on distribution rights see:
# http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
License:        Distributable
URL:            http://www.revolution.co.uk/_display.php?id=16
Source0:        http://dl.sf.net/sourceforge/scummvm/bass-cd-1.2.zip
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       scummvm >= 0.9.1, hicolor-icon-theme

%description
After the Dungeons and Dragons fantasy setting of Revolution's first game, Lure
of the Temptress, Revolution decided to go down a completely different avenue
with its second adventure game, Beneath a Steel Sky, that of Science Fiction.
A bleak vision of the future was imagined, where mind control and medical
science combined forces to repress the populace. Leading comic artist, Dave
Gibbons, joined the design team to visualise this desperate landscape. The
result is the cult classic Beneath a Steel Sky.

This package contains the CD version, which contains additional / longer
cutscenes and voice acting, but also is much larger: 70 MB where as the also
available floppy version (package name beneath-a-steel-sky) is only 8 MB.


%prep
%setup -q -n bass-cd-1.2


%build
# Nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 sky.* $RPM_BUILD_ROOT%{_datadir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc readme.txt
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Sun Nov  5 2006 Hans de Goede  0.0372-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky-cd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 08:36:44 -0000	1.1
+++ .cvsignore	10 Nov 2006 08:42:42 -0000	1.2
@@ -0,0 +1 @@
+bass-cd-1.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beneath-a-steel-sky-cd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 08:36:44 -0000	1.1
+++ sources	10 Nov 2006 08:42:42 -0000	1.2
@@ -0,0 +1 @@
+1d4401cd663715332abe8bb5431e356d  bass-cd-1.2.zip



From fedora-extras-commits at redhat.com  Fri Nov 10 08:44:36 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:44:36 -0700
Subject: rpms/flight-of-the-amazon-queen - New directory
Message-ID: <200611100844.kAA8ia4A004887@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4883/flight-of-the-amazon-queen

Log Message:
Directory /cvs/extras/rpms/flight-of-the-amazon-queen added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 08:44:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:44:42 -0700
Subject: rpms/flight-of-the-amazon-queen/devel - New directory
Message-ID: <200611100844.kAA8igiO004901@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4883/flight-of-the-amazon-queen/devel

Log Message:
Directory /cvs/extras/rpms/flight-of-the-amazon-queen/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 08:44:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:44:54 -0700
Subject: rpms/flight-of-the-amazon-queen Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200611100844.kAA8isWs004932@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4926

Added Files:
	Makefile import.log 
Log Message:
Setup of module flight-of-the-amazon-queen


--- NEW FILE Makefile ---
# Top level Makefile for module flight-of-the-amazon-queen
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  Fri Nov 10 08:44:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:44:54 -0700
Subject: rpms/flight-of-the-amazon-queen/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611100844.kAA8isvJ004949@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4926/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flight-of-the-amazon-queen


--- 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  Fri Nov 10 08:46:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:46:29 -0700
Subject: rpms/flight-of-the-amazon-queen import.log,1.1,1.2
Message-ID: <200611100846.kAA8kTr7005033@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5000

Modified Files:
	import.log 
Log Message:
auto-import flight-of-the-amazon-queen-1.0-1 on branch devel from flight-of-the-amazon-queen-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 08:44:53 -0000	1.1
+++ import.log	10 Nov 2006 08:45:58 -0000	1.2
@@ -0,0 +1 @@
+flight-of-the-amazon-queen-1_0-1:HEAD:flight-of-the-amazon-queen-1.0-1.src.rpm:1163148421



From fedora-extras-commits at redhat.com  Fri Nov 10 08:46:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 01:46:29 -0700
Subject: rpms/flight-of-the-amazon-queen/devel
	flight-of-the-amazon-queen.desktop, NONE,
	1.1 flight-of-the-amazon-queen.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611100846.kAA8kTXM005037@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5000/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flight-of-the-amazon-queen.desktop 
	flight-of-the-amazon-queen.spec 
Log Message:
auto-import flight-of-the-amazon-queen-1.0-1 on branch devel from flight-of-the-amazon-queen-1.0-1.src.rpm


--- NEW FILE flight-of-the-amazon-queen.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Flight of the Amazon Queen
Comment=Adventure Game
Exec=scummvm -f -p /usr/share/flight-of-the-amazon-queen queen
Icon=scummvm.png
Terminal=false
Type=Application
Categories=Application;Game;AdventureGame;
StartupNotify=false


--- NEW FILE flight-of-the-amazon-queen.spec ---
Name:           flight-of-the-amazon-queen
Version:        1.0
Release:        1
Summary:        Flight of the Amazon Queen - Adventure Game
Group:          Amusements/Games
# For further discussion on distribution rights see:
# http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
License:        Distributable
URL:            http://www.scummvm.org/downloads.php
Source0:        http://dl.sf.net/sourceforge/scummvm/FOTAQ_Floppy.zip
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       scummvm >= 0.9.1, hicolor-icon-theme

%description
It is 1949 and you play Joe King, pilot for hire with his small private plane
the 'Amazon Queen'. The game is a spoof of old timey radio adventure serials,
and as it begins we find Joe in one of those typical situations. It is 11:58
and 36 seconds and counting, Joe and his date are tied up in an abandoned
warehouse ("you really know how to show a girl a good time, Joe!"), and a bomb
is set to go off at midnight!

Of course they escape, in the nick of time, and immediately set us up for the
next 'adventure'. Joe suddenly remembers that he is scheduled to fly the famous
movie star, Faye Russell, to a photo shoot in the Amazon jungle the next
morning.

Notice that this package contains the floppy version, the CD version is also
available in the %{name}-cd package. The CD version contains
additional / longer cutscenes and voice acting, but also is much larger: the CD
version ways in at 37 MB where as this version is only 7 MB.


%prep
%setup -q -n FOTAQ_Floppy


%build
# Nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 queen.1 $RPM_BUILD_ROOT%{_datadir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc readme.txt
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Sun Nov  5 2006 Hans de Goede  1.0-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 08:44:54 -0000	1.1
+++ .cvsignore	10 Nov 2006 08:45:59 -0000	1.2
@@ -0,0 +1 @@
+FOTAQ_Floppy.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 08:44:54 -0000	1.1
+++ sources	10 Nov 2006 08:45:59 -0000	1.2
@@ -0,0 +1 @@
+eafb6bc4edc6255b871477cfc54312de  FOTAQ_Floppy.zip



From fedora-extras-commits at redhat.com  Fri Nov 10 09:31:12 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 10 Nov 2006 02:31:12 -0700
Subject: fedora-security/audit fc5,1.386,1.387 fc6,1.138,1.139
Message-ID: <200611100931.kAA9VClh008277@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8257

Modified Files:
	fc5 fc6 
Log Message:
Releases and some cleanup



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- fc5	9 Nov 2006 11:34:15 -0000	1.386
+++ fc5	10 Nov 2006 09:31:09 -0000	1.387
@@ -1,14 +1,16 @@
-Up to date CVE as of CVE email 20061108
-Up to date FC5 as of 20061108
+Up to date CVE as of CVE email 20061109
+Up to date FC5 as of 20061109
 
 ** are items that need attention
 
 CVE-2006-5823 ** kernel
-CVE-2006-5794 ** openssh
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5)
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5748 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5747 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5706 ** php, fixed 5.2.0
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
@@ -22,8 +24,11 @@
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
 CVE-2006-5464 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5464 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5463 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5463 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5462 version (thunderbird) [since FEDORA-2006-1194]
+CVE-2006-5462 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5466 VULNERABLE (rpm) #212833
 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
@@ -57,6 +62,7 @@
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
 CVE-2006-4810 ** texinfo
+CVE-2006-4810 backport (texinfo) [since FEDORA-2006-1202]
 CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]
 CVE-2006-4663 ignore (kernel) not a vulnerability


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- fc6	9 Nov 2006 11:34:15 -0000	1.138
+++ fc6	10 Nov 2006 09:31:09 -0000	1.139
@@ -1,10 +1,10 @@
-Up to date CVE as of CVE email 20061108
-Up to date FC6 as of 20061108
+Up to date CVE as of CVE email 20061109
+Up to date FC6 as of 20061109
 
 ** are items that need attention
 
 CVE-2006-5823 ** kernel
-CVE-2006-5794 ** openssh
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5)
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
@@ -61,7 +61,7 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 VULNERABLE (php)
 CVE-2006-4811 version (qt, fixed 3.3.7) [since FEDORA-2006-1055]
-CVE-2006-4810 ** texinfo
+CVE-2006-4810 backport (texinfo) [since FEDORA-2006-1203]
 CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4)
 CVE-2006-4663 ignore (kernel) not a vulnerability



From fedora-extras-commits at redhat.com  Fri Nov 10 09:48:29 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 10 Nov 2006 02:48:29 -0700
Subject: rpms/liferea/FC-6 liferea.spec,1.54,1.55
Message-ID: <200611100948.kAA9mTaF008400@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/liferea/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8384

Modified Files:
	liferea.spec 
Log Message:
* Fri Nov 10 2006 Michael Schwendt  - 1.0.25-2
- Rebuild for new Firefox version (and update the Firefox "Requires").



Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/liferea.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- liferea.spec	27 Oct 2006 16:04:43 -0000	1.54
+++ liferea.spec	10 Nov 2006 09:47:59 -0000	1.55
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -24,7 +24,8 @@
 BuildRequires:	dbus-devel
 %endif
 
-Requires:	firefox = 1.5.0.7
+#Requires:	firefox = 1.5.0.8
+Requires:	firefox = %(rpm -q firefox-devel --qf '%%{version}' 2>/dev/null)
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -108,6 +109,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michael Schwendt  - 1.0.25-2
+- Rebuild for new Firefox version (and update the Firefox "Requires").
+
 * Fri Oct 27 2006 Brian Pepple  - 1.0.25-1
 - Update to 1.0.25.
 - Drop X-Fedora category from desktop file.



From fedora-extras-commits at redhat.com  Fri Nov 10 12:36:05 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Fri, 10 Nov 2006 05:36:05 -0700
Subject: rpms/libatomic_ops/devel .cvsignore, 1.2, 1.3 libatomic_ops.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611101236.kAACa5uN018376@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/libatomic_ops/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18351

Modified Files:
	.cvsignore libatomic_ops.spec sources 
Log Message:
Update to upstream release 1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2006 14:47:29 -0000	1.2
+++ .cvsignore	10 Nov 2006 12:35:34 -0000	1.3
@@ -1 +1 @@
-libatomic_ops-1.1.tar.gz
+libatomic_ops-1.2.tar.gz


Index: libatomic_ops.spec
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/devel/libatomic_ops.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libatomic_ops.spec	9 Sep 2006 14:47:29 -0000	1.1
+++ libatomic_ops.spec	10 Nov 2006 12:35:34 -0000	1.2
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           libatomic_ops
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Atomic memory update operations
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Pierre Ossman  1.2-1
+- Update to 1.2.
+
 * Sat Sep  9 2006 Pierre Ossman  1.1-2
 - Fix naming of package.
 - General cleanup of spec file.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2006 14:47:29 -0000	1.2
+++ sources	10 Nov 2006 12:35:34 -0000	1.3
@@ -1 +1 @@
-359ed8a7c518eeb5f414102c7be24cf4  libatomic_ops-1.1.tar.gz
+1b65e48271c81e3fa2d7a9a69bab7504  libatomic_ops-1.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 13:52:31 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 10 Nov 2006 06:52:31 -0700
Subject: rpms/torcs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 torcs.spec, 
	1.13, 1.14 torcs-1.2.4-extraqualif.patch, 1.1,
	NONE torcs-1.2.4-track_cpp.patch, 1.1, NONE
Message-ID: <200611101352.kAADqV8c021760@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21737

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	torcs-1.2.4-extraqualif.patch torcs-1.2.4-track_cpp.patch 
Log Message:
Update to 1.3.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2005 07:49:42 -0000	1.5
+++ .cvsignore	10 Nov 2006 13:52:01 -0000	1.6
@@ -1,5 +1,5 @@
-TORCS-1.2.4-src-robots-base.tgz
-TORCS-1.2.4-src-robots-berniw.tgz
-TORCS-1.2.4-src-robots-bt.tgz
-TORCS-1.2.4-src-robots-olethros.tgz
-TORCS-1.2.4-src.tgz
+TORCS-1.3.0-src.tgz
+TORCS-1.3.0-src-robots-base.tgz
+TORCS-1.3.0-src-robots-berniw.tgz
+TORCS-1.3.0-src-robots-bt.tgz
+TORCS-1.3.0-src-robots-olethros.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2005 07:49:42 -0000	1.5
+++ sources	10 Nov 2006 13:52:01 -0000	1.6
@@ -1,5 +1,5 @@
-3afe0d23f1e637fe56efccd2b6e8a8f1  TORCS-1.2.4-src-robots-base.tgz
-40aed9595f91051e8468e8a19b65f809  TORCS-1.2.4-src-robots-berniw.tgz
-337eecc6e545aceda094d945e12c3023  TORCS-1.2.4-src-robots-bt.tgz
-13b1eeba1148ca57dc1d989fcb27d308  TORCS-1.2.4-src-robots-olethros.tgz
-f5b41bf29cb7b6160e5ead6e187380b6  TORCS-1.2.4-src.tgz
+915c89f9d3618d13dddd5bfb4d199539  TORCS-1.3.0-src.tgz
+da007d61447f38fbdbd22aec029cc26c  TORCS-1.3.0-src-robots-base.tgz
+abeb72ba3913ef0bde727fdaa9699eef  TORCS-1.3.0-src-robots-berniw.tgz
+ca8506aecc30bee308a5e198304b71b2  TORCS-1.3.0-src-robots-bt.tgz
+227d47687b821298fe6b2f147071e73f  TORCS-1.3.0-src-robots-olethros.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- torcs.spec	28 Aug 2006 16:40:15 -0000	1.13
+++ torcs.spec	10 Nov 2006 13:52:01 -0000	1.14
@@ -2,8 +2,8 @@
 
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.2.4
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -13,8 +13,6 @@
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
 Patch0: torcs-1.2.4-freealutfix.patch
-Patch1: torcs-1.2.4-track_cpp.patch
-Patch2: torcs-1.2.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
@@ -37,7 +35,7 @@
 %package robots
 Summary: The Open Racing Car Simulator robots
 Group: Amusements/Games
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description robots
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -50,20 +48,19 @@
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
 %patch0 -p1 -b .freealutfix
-%patch1 -p0 -b .track_cpp
-%patch2 -p1 -b .extraqualif
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
 
 %build
-# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4)
+# Force locations with modular X (for FC5+ and non-Fedora)
+# Required (1.2.4, still in 1.3.0)
 %configure \
 %if %{!?fedora:5}%{?fedora} >= 5
     --x-includes=%{_includedir} \
     --x-libraries=%{_libdir}
 %endif
-# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.2.4
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0
 %{__make}
 
 
@@ -90,7 +87,7 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
-# We need this for proper automatic stripping to take place (still in 1.2.3)
+# We need this for proper automatic stripping to take place (still in 1.3.0)
 find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x
 
 
@@ -100,7 +97,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG.html COPYING README.linux TODO.html
+%doc COPYING README README.linux
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/drivers/
@@ -163,6 +160,11 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  1.3.0-1
+- Update to 1.3.0.
+- Remove no longer needed track.cpp patch1.
+- Remove no longer needed extraqualif patch2.
+
 * Mon Aug 28 2006 Matthias Saou  1.2.4-4
 - FC6 rebuild.
 


--- torcs-1.2.4-extraqualif.patch DELETED ---


--- torcs-1.2.4-track_cpp.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 10 13:53:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 10 Nov 2006 06:53:22 -0700
Subject: rpms/torcs-data/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 torcs-data.spec, 1.7, 1.8
Message-ID: <200611101353.kAADrMxG021829@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21804

Modified Files:
	.cvsignore sources torcs-data.spec 
Log Message:
Update to 1.3.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Oct 2005 07:49:43 -0000	1.4
+++ .cvsignore	10 Nov 2006 13:52:52 -0000	1.5
@@ -1,6 +1,6 @@
-TORCS-1.2.4-data-cars-extra.tgz
-TORCS-1.2.4-data-cars-nascar.tgz
-TORCS-1.2.4-data.tgz
-TORCS-1.2.4-data-tracks-dirt.tgz
-TORCS-1.2.4-data-tracks-oval.tgz
-TORCS-1.2.4-data-tracks-road.tgz
+TORCS-1.3.0-data-cars-extra.tgz
+TORCS-1.3.0-data-cars-nascar.tgz
+TORCS-1.3.0-data.tgz
+TORCS-1.3.0-data-tracks-dirt.tgz
+TORCS-1.3.0-data-tracks-oval.tgz
+TORCS-1.3.0-data-tracks-road.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Oct 2005 07:49:43 -0000	1.4
+++ sources	10 Nov 2006 13:52:52 -0000	1.5
@@ -1,6 +1,6 @@
-f11f0789885fe427f7b8958a17cc9f52  TORCS-1.2.4-data-cars-extra.tgz
-30e3ab4da6c503a6a7ba6eaf2898ede0  TORCS-1.2.4-data-cars-nascar.tgz
-0129c5c930bbc830964bd32024f9a47d  TORCS-1.2.4-data.tgz
-2464de31150f97da54d9e7609ca125fe  TORCS-1.2.4-data-tracks-dirt.tgz
-b7ddc6ad362bfafc6f66cfcc459ec30b  TORCS-1.2.4-data-tracks-oval.tgz
-9084b2700d71f86fedfc7a5f55959b0b  TORCS-1.2.4-data-tracks-road.tgz
+248ae5c165f703b22bd7224d7c2caed4  TORCS-1.3.0-data-cars-extra.tgz
+40de51f6a929d121f46dd47709d58b8b  TORCS-1.3.0-data-cars-nascar.tgz
+8bff8540f7994dce02d32ba8fb4ad8a8  TORCS-1.3.0-data.tgz
+7c1d5dab87d6c06ac8e7ba8bab30f0b1  TORCS-1.3.0-data-tracks-dirt.tgz
+a27ce8b505dfbf2caba91ac6cc802bab  TORCS-1.3.0-data-tracks-oval.tgz
+8e30d3cc03dafb8392d690d96459f317  TORCS-1.3.0-data-tracks-road.tgz


Index: torcs-data.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs-data/devel/torcs-data.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- torcs-data.spec	13 Oct 2005 07:49:43 -0000	1.7
+++ torcs-data.spec	10 Nov 2006 13:52:52 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: The Open Racing Car Simulator data files
 Name: torcs-data
-Version: 1.2.4
+Version: 1.3.0
 Release: 1
 License: GPL and Free Art License
 Group: Amusements/Games
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  1.3.0-1
+- Update to 1.3.0.
+
 * Wed Oct 12 2005 Matthias Saou  1.2.4-1
 - Update to 1.2.4.
 



From fedora-extras-commits at redhat.com  Fri Nov 10 14:30:49 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 10 Nov 2006 07:30:49 -0700
Subject: extras-buildsys/server PackageJob.py,1.56,1.57
Message-ID: <200611101430.kAAEUnaW025194@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25176

Modified Files:
	PackageJob.py 
Log Message:
Don't traceback on error cleaning up job files; just log it.


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- PackageJob.py	31 Oct 2006 17:57:36 -0000	1.56
+++ PackageJob.py	10 Nov 2006 14:30:47 -0000	1.57
@@ -864,7 +864,10 @@
                     # the original SRPM.
                     if not os.path.exists(srpm_file):
                         shutil.copy(src_file, srpm_file)
-                os.remove(src_file)
+                try:
+                    os.remove(src_file)
+                except OSError, e:
+                    debugprint("%d: Error cleaning up job files - '%s'" % (self.uid, e))
 
         # If there were no builder-built SRPMs, keep the original around
         if not os.path.exists(srpm_file):



From fedora-extras-commits at redhat.com  Fri Nov 10 14:31:49 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 10 Nov 2006 07:31:49 -0700
Subject: extras-buildsys/server PackageJob.py,1.31.2.10,1.31.2.11
Message-ID: <200611101431.kAAEVnNc025229@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25211

Modified Files:
      Tag: STABLE_0_4
	PackageJob.py 
Log Message:
Don't traceback on error cleaning up job files; just log it.


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.10
retrieving revision 1.31.2.11
diff -u -r1.31.2.10 -r1.31.2.11
--- PackageJob.py	13 Mar 2006 04:16:34 -0000	1.31.2.10
+++ PackageJob.py	10 Nov 2006 14:31:47 -0000	1.31.2.11
@@ -653,7 +653,10 @@
                     # the original SRPM.
                     if not os.path.exists(srpm_file):
                         shutil.copy(src_file, srpm_file)
-                os.remove(src_file)
+                try:
+                    os.remove(src_file)
+                except OSError, e:
+                    debugprint("%d: Error cleaning up job files - '%s'" % (self.uid, e))
 
         # If there were no builder-built SRPMs, keep the original around
         if not os.path.exists(srpm_file):



From fedora-extras-commits at redhat.com  Fri Nov 10 16:11:40 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:11:40 -0700
Subject: rpms/bogl - New directory
Message-ID: <200611101611.kAAGBe6U031661@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31657/bogl

Log Message:
Directory /cvs/extras/rpms/bogl added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:11:45 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:11:45 -0700
Subject: rpms/bogl/devel - New directory
Message-ID: <200611101611.kAAGBjRT031675@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31657/bogl/devel

Log Message:
Directory /cvs/extras/rpms/bogl/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:12:03 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:12:03 -0700
Subject: rpms/bogl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611101612.kAAGC3qg031742@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736

Added Files:
	Makefile import.log 
Log Message:
Setup of module bogl


--- NEW FILE Makefile ---
# Top level Makefile for module bogl
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  Fri Nov 10 16:12:09 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:12:09 -0700
Subject: rpms/bogl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611101612.kAAGC9Ef031765@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31736/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bogl


--- 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  Fri Nov 10 16:13:37 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:13:37 -0700
Subject: rpms/phpMyAdmin - New directory
Message-ID: <200611101613.kAAGDbTA032005@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32001/phpMyAdmin

Log Message:
Directory /cvs/extras/rpms/phpMyAdmin added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:13:43 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:13:43 -0700
Subject: rpms/phpMyAdmin/devel - New directory
Message-ID: <200611101613.kAAGDhg9032021@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32001/phpMyAdmin/devel

Log Message:
Directory /cvs/extras/rpms/phpMyAdmin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:13:51 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:13:51 -0700
Subject: rpms/bogl import.log,1.1,1.2
Message-ID: <200611101613.kAAGDpDs032038@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31932

Modified Files:
	import.log 
Log Message:
auto-import bogl-0.1.18-13 on branch devel from bogl-0.1.18-13.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bogl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 16:12:03 -0000	1.1
+++ import.log	10 Nov 2006 16:13:21 -0000	1.2
@@ -0,0 +1 @@
+bogl-0_1_18-13:HEAD:bogl-0.1.18-13.src.rpm:1163175201



From fedora-extras-commits at redhat.com  Fri Nov 10 16:14:01 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:14:01 -0700
Subject: rpms/phpMyAdmin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611101614.kAAGE1pG032088@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32082

Added Files:
	Makefile import.log 
Log Message:
Setup of module phpMyAdmin


--- NEW FILE Makefile ---
# Top level Makefile for module phpMyAdmin
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  Fri Nov 10 16:13:51 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:13:51 -0700
Subject: rpms/bogl/devel bogl-0.1.18-1.1.sigchld.patch, NONE,
	1.1 bogl-0.1.18-1.2.gzip-fonts.patch, NONE,
	1.1 bogl-0.1.18-1.2.reduce-font.patch, NONE,
	1.1 bogl-0.1.18-1.2.term.patch, NONE,
	1.1 bogl-0.1.18-1.5.rh.patch, NONE,
	1.1 bogl-0.1.18-noexecstack.patch, NONE,
	1.1 bogl-0.1.9-2.6fbdev.patch, NONE, 1.1 bogl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611101613.kAAGDpHf032042@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/bogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31932/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bogl-0.1.18-1.1.sigchld.patch bogl-0.1.18-1.2.gzip-fonts.patch 
	bogl-0.1.18-1.2.reduce-font.patch bogl-0.1.18-1.2.term.patch 
	bogl-0.1.18-1.5.rh.patch bogl-0.1.18-noexecstack.patch 
	bogl-0.1.9-2.6fbdev.patch bogl.spec 
Log Message:
auto-import bogl-0.1.18-13 on branch devel from bogl-0.1.18-13.src.rpm

bogl-0.1.18-1.1.sigchld.patch:

--- NEW FILE bogl-0.1.18-1.1.sigchld.patch ---
--- bogl-0.1.18/bterm.c.sigchld	2005-09-20 00:44:06.000000000 +0200
+++ bogl-0.1.18/bterm.c	2005-09-20 00:46:01.000000000 +0200
@@ -124,7 +124,7 @@
 void sigchld(int sig)
 {
   int status;
-  if (waitpid(child_pid, &status, WNOHANG)) {
+  if (waitpid(child_pid, &status, WNOHANG) > 0) {
     child_pid = 0;
     /* Reset ownership and permissions of ttyfd device? */
     tcsetattr(0, TCSAFLUSH, &ttysave);

bogl-0.1.18-1.2.gzip-fonts.patch:

--- NEW FILE bogl-0.1.18-1.2.gzip-fonts.patch ---
* Tue Nov 26 2002 Adrian Havill 
- re-write font loader so it can load uncompressed or gzipped files

--- bogl-0.1.18/bterm.c.gzip-fonts	2006-11-05 15:59:28.000000000 +0100
+++ bogl-0.1.18/bterm.c	2006-11-05 15:59:28.000000000 +0100
@@ -186,7 +186,7 @@
 {
   struct bogl_font *font;
 
-  font = bogl_mmap_font (font_name);
+  font = bogl_load_font (font_name);
   if (font == NULL)
     {
       fprintf(stderr, "Bad font\n");
@@ -260,7 +260,7 @@
     return 1;
   }
 
-  if ((font = bogl_mmap_font(font_name)) == NULL) {
+  if ((font = bogl_load_font(font_name)) == NULL) {
     fprintf(stderr, "Bad font\n");
     return 1;
   }
--- bogl-0.1.18/bogl-bgf.c.gzip-fonts	2001-12-01 18:04:42.000000000 +0100
+++ bogl-0.1.18/bogl-bgf.c	2006-11-05 15:59:28.000000000 +0100
@@ -1,44 +1,130 @@
 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
 
+#include "bogl-bgf.h"
 #include "bogl.h"
-#include "bogl-font.h"
 
-struct bogl_font *bogl_mmap_font(char *file)
-{
-  int fd;
-  struct stat buf;
-  void *f;
-  struct bogl_font *font;
-
-  fd = open(file, O_RDONLY);
-  if (fd == -1)
-    return 0;
-
-  if (fstat(fd, &buf))
-    return 0;
-
-  f = mmap(0, buf.st_size, PROT_READ, MAP_SHARED, fd, 0);
-  if (f == (void *)-1)
-    return 0;
-
-  if (memcmp("BGF1", f, 4))
-    return 0;
-
-  font = (struct bogl_font *)malloc(sizeof(struct bogl_font));
-  if (!font)
-    return 0;
-
-  memcpy(font, f + 4, sizeof(*font));
-  font->name = ((void *)font->name - (void *)0) + f;
-  font->offset = ((void *)font->offset - (void *)0) + f;
-  font->index = ((void *)font->index - (void *)0) + f;
-  font->content = ((void *)font->content - (void *)0) + f;
+#define FONT_SIGNATURE "BGF1"
 
-  return font;
+static size_t get_gz_file_size(const char *path) {
+    size_t size = 0;
+    unsigned char buffer[4] = { 0 };
+    FILE *stream = NULL;
+ 
+    stream = fopen(path, "rb");
+    if (stream == NULL) {
+	perror(path);
+	return -1;
+    }
+    if (fread(buffer, sizeof(char), 2, stream) != 2) {
+        if (ferror(stream)) {
+	    perror(path);
+	    return -1;
+	}
+    }
+    if (memcmp(buffer, "\037\213", 2) == 0) {
+        uint32_t isize = 0;
+
+        if (fseek(stream, -4L, SEEK_END) == EOF) {
+	    perror(path);
+	    return -1;
+	}
+        if (fread(buffer, sizeof(char), (size_t) 4, stream) != 4) {
+            if (ferror(stream)) {
+		perror(path);
+		return -1;
+	    }
+            else {
+                fprintf(stderr, "%s: invalid gzip file\n", path);
+                return -1;
+            }
+        }
+        isize  = buffer[0];
+        isize |= buffer[1] << 8;
+        isize |= buffer[2] << 16;
+        isize |= buffer[3] << 24;
+
+	/* FIXME: ISIZE is not a reliable indicator of size for files >4GB.
+	 * On the other hand, if you have a font >4GB, you've got issues.
+	 */
+        size = (size_t) isize;
+    }
+    else {
+        if (fseek(stream, 0L, SEEK_END) == EOF) {
+	    perror(path);
+	    return -1;
+	}
+        if ((int) (size = (size_t) ftell(stream)) == EOF) {
+	    perror(path);
+	    return -1;
+	}
+    }
+    if (fclose(stream) == EOF) {
+	perror(path);
+	return -1;
+    }
+    return size;
+}
+
+struct bogl_font *bogl_load_font(const char *path) {
+    size_t size;
+    int errnum;
+    gzFile file;
+    void *bgf;
+    struct bogl_font *font;
+
+    size = (size_t) get_gz_file_size(path);
+    if (size == (size_t) -1)
+	return NULL;
+    if ((bgf = malloc(size)) == NULL) {
+	perror(path);
+	return NULL;
+    }
+    file = gzopen(path, "rb");
+    if (file == NULL) {
+        if (errno == 0) {
+            errno = ENOMEM;       // if 0 then zlib error == Z_MEM_ERROR
+        }
+	perror(path);
+	return NULL;
+    }
+    if (gzread(file, bgf, size) == -1) {
+        const char *msg = gzerror(file, &errnum);
+
+        if (errnum == Z_ERRNO) {
+            msg = strerror(errno);
+        }
+        fprintf(stderr, "%s: %s\n", path, msg);
+	return NULL;
+    }
+    if (gzclose(file) < 0) {
+        const char *msg = gzerror(file, &errnum);
+
+        if (errnum == Z_ERRNO) {
+            msg = strerror(errno);
+        }
+        fprintf(stderr, "%s: %s\n", path, msg);
+	return NULL;
+    }
+    if (memcmp(FONT_SIGNATURE, bgf, strlen(FONT_SIGNATURE)) != 0) {
+        fprintf(stderr, "%s: not a BGF font\n", path);
+	return NULL;
+    }
+    font = (struct bogl_font *) malloc(sizeof(struct bogl_font));
+    if (font == NULL) {
+	perror(path);
+	return NULL;
+    }
+    memcpy(font, bgf + strlen(FONT_SIGNATURE), sizeof(struct bogl_font));
+    font->name    = bgf + (ptrdiff_t) font->name;
+    font->offset  = bgf + (ptrdiff_t) font->offset;
+    font->index   = bgf + (ptrdiff_t) font->index;
+    font->content = bgf + (ptrdiff_t) font->content;
+    return font;
 }
--- bogl-0.1.18/bogl-bgf.h.gzip-fonts	2001-12-01 18:04:42.000000000 +0100
+++ bogl-0.1.18/bogl-bgf.h	2006-11-05 15:59:28.000000000 +0100
@@ -1,2 +1,2 @@
 
-struct bogl_font *bogl_mmap_font(char *file);
+struct bogl_font *bogl_load_font(const char *file);
--- bogl-0.1.18/Makefile.gzip-fonts	2006-11-05 15:59:44.000000000 +0100
+++ bogl-0.1.18/Makefile	2006-11-05 15:59:57.000000000 +0100
@@ -79,7 +79,7 @@
 	$(CC) -DSTANDALONE_TEST $(ALLCFLAGS) bowl-boxes.c $(LIBOBJECTS) -o bowl-boxes
 
 bterm: $(LIB) bterm.o bogl-term.o bogl-bgf.o
-	$(CC) $+ $(LIB) -o bterm
+	$(CC) $+ $(LIB) -lz -o bterm
 
 bdftobogl: $(LIBBOGLOBJECTS)
 %.c: %.bdf bdftobogl

bogl-0.1.18-1.2.reduce-font.patch:

--- NEW FILE bogl-0.1.18-1.2.reduce-font.patch ---
* Mon Dec 16 2002 Adrian Havill  0.1.9-11
- fixed broken reduce-font to test ENCODING x instead of STARTCHAR x

--- bogl-0.1.18/reduce-font.c.rh	2001-12-01 18:04:42.000000000 +0100
+++ bogl-0.1.18/reduce-font.c	2006-11-05 15:30:38.000000000 +0100
@@ -42,12 +42,31 @@
     printf (": %d\n", l);
 }
 
+char *
+cat_line(char *sofar, const char *line) {
+	char *buf;
+	size_t length;
+
+	length = sofar == NULL ? 0 : strlen(sofar);
+	length += strlen(line);
+	length++;
+	buf = sofar == NULL
+		? calloc(length, sizeof(char))
+		: realloc(sofar, sizeof(char) * length);
+	if (buf == NULL) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
+	}
+	return strcat(buf, line);
+}
+
 int
 main (int argc, char **argv)
 {
     FILE *font;
     char *buffer = NULL;
     char *locale = setlocale (LC_CTYPE, "");
+    char *onebdffmtchar = NULL;
     int error = 0;
 
     if (locale == NULL) {
@@ -152,14 +171,24 @@
                 if (!header)
                 {
                     if (strncmp (buf, "STARTCHAR ", 10) == 0)
+		    {
+			free(onebdffmtchar);
+			onebdffmtchar = NULL;
+		    }
+		    onebdffmtchar = cat_line(onebdffmtchar, buf);
+
+                    if (strncmp (buf, "ENCODING ", 9) == 0)
                     {
-                        wc = strtol (buf + 12, NULL, 16);
+                        wc = strtol (buf + 9, NULL, 10);
 
                         docopy = used[wc / 32] & (1 << (wc % 32));
                     }
-
-                    if (docopy)
-                        fprintf (stdout, buf);
+		    else if (strncmp (buf, "ENDCHAR", 7) == 0)
+		    {
+                        if (docopy)
+                            fputs (onebdffmtchar, stdout);
+			docopy = 0;
+		    }
                 }
             }
 

bogl-0.1.18-1.2.term.patch:

--- NEW FILE bogl-0.1.18-1.2.term.patch ---
--- bogl-0.1.18/bogl-term.c.term	2003-11-05 05:38:22.000000000 +0100
+++ bogl-0.1.18/bogl-term.c	2006-11-05 21:34:54.000000000 +0100
@@ -24,6 +24,9 @@
  * described by the terminfo source in "bterm.ti".
  */
 
+#include 
+#include 
+
 #include "bogl.h"
 #include "bogl-term.h"
 
@@ -353,6 +356,21 @@
         if (wc == 0)            /* 0 has a special meaning in term->screen[] */
             continue;
 
+        if (wc == 7) {          /* bell=^G: flash screen by XORing it twice */
+            for (i = 0; i < term->xsize * term->ysize; i++) {
+                term->screenfg[i] = term->screenfg[i] ^ 0x7;
+                term->screenbg[i] = term->screenbg[i] ^ 0x7;
+            }
+            bogl_term_redraw(term);
+            usleep(100000); // pause 1/10th of a second
+            for (i = 0; i < term->xsize * term->ysize; i++) {
+                term->screenfg[i] = term->screenfg[i] ^ 0x7;
+                term->screenbg[i] = term->screenbg[i] ^ 0x7;
+            }
+            bogl_term_redraw(term);
+            continue;
+        }
+
         if (wc == 8)
         {                       /* cub1=^H */
             if (term->xpos)

bogl-0.1.18-1.5.rh.patch:

--- NEW FILE bogl-0.1.18-1.5.rh.patch ---
--- bogl-0.1.18/Makefile.rh	2006-11-09 23:39:20.000000000 +0100
+++ bogl-0.1.18/Makefile	2006-11-09 23:42:27.000000000 +0100
@@ -4,11 +4,14 @@
 SONAME = libbogl.so.0
 SHARED_LIB = libbogl.so.0.1
 
+libdir = /usr/lib
+
 CFLAGS = -O2 -g -D_GNU_SOURCE
 WARNCFLAGS += -Wall -D_GNU_SOURCE
 ALLCFLAGS = $(CFLAGS) $(WARNCFLAGS) $(FBCFLAGS)
 
-architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+#architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+architecture := $(patsubst i%86,i386,$(shell uname -m))
 
 LIBOBJECTS = $(LIBBOGLOBJECTS) $(LIBBOMLOBJECTS) $(LIBBOWLOBJECTS)	\
 	$(LIBRSRCOBJECTS)
@@ -27,7 +30,7 @@
 	LIBBOGLOBJECTS += bogl-cfb.o bogl-pcfb.o bogl-tcfb.o
 endif
 
-ifneq (,$(filter i386 arm ia64 amd64,$(architecture)))
+ifneq (,$(filter i386 arm ia64 x86_64,$(architecture)))
 	FBCFLAGS += -DBOGL_VGA16_FB=1
 	LIBBOGLOBJECTS += bogl-vga16.o
 	SOURCES_DEP += bogl-vga16.c bogl-vga16.h
@@ -109,12 +112,12 @@
 endif
 
 install: all
-	install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl $(DESTDIR)/usr/bin
-	install -m644 $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SHARED_LIB)
-	ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(DEVLINK)
-	ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SONAME)
-	install -m644 $(LIB) $(DESTDIR)/usr/lib/$(LIB)
-	install -m644 *.h $(DESTDIR)/usr/include/bogl
+	install -d $(DESTDIR)/$(libdir) $(DESTDIR)/usr/include/bogl $(DESTDIR)/usr/bin
+	install -m755 $(SHARED_LIB) $(DESTDIR)/$(libdir)/$(SHARED_LIB)
+	ln -sf $(SHARED_LIB) $(DESTDIR)/$(libdir)/$(DEVLINK)
+	ln -sf $(SHARED_LIB) $(DESTDIR)/$(libdir)/$(SONAME)
+	install -m644 $(LIB) $(DESTDIR)/$(libdir)/$(LIB)
+	install -p -m644 *.h $(DESTDIR)/usr/include/bogl
 	install -m755 bdftobogl mergebdf bterm pngtobogl reduce-font $(DESTDIR)/usr/bin
 	install -d $(DESTDIR)/usr/share/terminfo
 	tic -o$(DESTDIR)/usr/share/terminfo bterm.ti
--- bogl-0.1.18/bterm.c.rh	2006-11-09 23:39:20.000000000 +0100
+++ bogl-0.1.18/bterm.c	2006-11-09 23:39:20.000000000 +0100
@@ -179,7 +179,7 @@
   ioctl(ttyfd, TIOCSWINSZ, &win);
 }
 
-static char *font_name;
+static char *font_name = "/usr/share/bogl/font.bgf.gz";
 static struct bogl_term *term;
 
 void reload_font(int sig)
@@ -297,7 +297,7 @@
   ntio.c_cc[VTIME] = 0;
   ntio.c_cflag |= CS8;
   ntio.c_line = 0;
-  tcsetattr(0, TCSAFLUSH, &ntio);
+  tcsetattr(0, TCSANOW, &ntio);
 
   set_window_size(ttyfd, term->xsize, term->ysize);
 

bogl-0.1.18-noexecstack.patch:

--- NEW FILE bogl-0.1.18-noexecstack.patch ---
--- bogl/bowl.c.noexecstack	2005-02-17 18:39:23.385647088 +0100
+++ bogl/bowl.c	2005-02-17 18:40:42.681592272 +0100
@@ -324,6 +324,14 @@
   }
 }
 
+static struct widget *callback_widget;
+
+static void
+callback (int percent)
+{
+  bowl_set_scale (callback_widget, percent);
+}
+
 /* Start up BOWL. */
 void
 bowl_init (void)
@@ -342,13 +350,6 @@
 
   if (!inited)
     {
-      struct widget *w;
-
-      void callback (int percent)
-	{
-	  bowl_set_scale (w, percent);
-	}
-
       bowl_init_palette(&pixmap_tux75);
 
       bowl_flush ();
@@ -356,7 +357,7 @@
         {
           bowl_title (_("Please wait"));
           bowl_new_text (_("Detecting mice..."));
-          w = bowl_new_scale (100);
+          callback_widget = bowl_new_scale (100);
           bowl_layout ();
           boml_init (callback);
         }

bogl-0.1.9-2.6fbdev.patch:

--- NEW FILE bogl-0.1.9-2.6fbdev.patch ---
--- bogl/bogl.c.26fb	2004-01-29 17:08:06.000000000 -0500
+++ bogl/bogl.c	2004-02-17 20:49:01.396524931 -0500
@@ -136,7 +136,11 @@
   if (-1 == ioctl (fb, FBIOGET_FSCREENINFO, &fb_fix)
       || -1 == ioctl (fb, FBIOGET_VSCREENINFO, &fb_var))
     return bogl_fail ("reading screen info: %s", strerror (errno));
-  
+
+  fb_var.activate = FB_ACTIVATE_NXTOPEN;
+  if (-1 == ioctl (fb, FBIOPUT_VSCREENINFO, &fb_var))
+      return bogl_fail ("setting fb screeninfo: %s", strerror (errno));
+
   bogl_xres = fb_var.xres;
   bogl_yres = fb_var.yres;
   bogl_bpp = fb_var.bits_per_pixel;


--- NEW FILE bogl.spec ---
Summary: A terminal program for displaying Unicode on the console
Name: bogl
Version: 0.1.18
Release: 13
URL: http://packages.debian.org/unstable/source/bogl
Source0: http://ftp.debian.org/debian/pool/main/b/bogl/bogl_0.1.18-1.5.tar.gz
Source1: 14x14cjk.bdf.gz
Patch0: bogl-0.1.18-1.1.sigchld.patch
Patch1: bogl-0.1.18-1.2.reduce-font.patch
Patch2: bogl-0.1.18-1.2.gzip-fonts.patch
Patch3: bogl-0.1.18-1.2.term.patch
Patch4: bogl-0.1.18-1.5.rh.patch
Patch5: bogl-0.1.9-2.6fbdev.patch
Patch6: bogl-0.1.18-noexecstack.patch
Epoch: 0
License: GPL
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gd-devel, libpng-devel

%description
BOGL stands for Ben's Own Graphics Library.  It is a small graphics
library for Linux kernel frame buffers.  It supports only very simple
graphics.

%package devel
Summary: Development files required to build BOGL applications
Group: Development/Libraries
Requires: bogl = %{epoch}:%{version}-%{release}

%description devel
The bogl-devel package contains the static libraries and header files
for writing BOGL applications.

%package bterm
Summary: A Unicode capable terminal program for the Linux frame buffer
Group: Applications/System
# Only for %{_datadir}/terminfo/b
Requires: ncurses

%description bterm
The bterm application is a terminal emulator that displays to a Linux
frame buffer.  It is able to display Unicode text on the console.

%prep
%setup -q -n bogl-0.1.18
%patch0 -p1 -b .sigchld
%patch1 -p1 -b .reduce-font
%patch2 -p1 -b .gzip-fonts
%patch3 -p1 -b .term
%patch4 -p1 -b .rh
%patch5 -p1 -b .26fbdev
%patch6 -p1 -b .noexecstack

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
gunzip -c %{SOURCE1} > font.bdf
./bdftobogl -b font.bdf > font.bgf

%install
rm -rf $RPM_BUILD_ROOT
make CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} install
mkdir -p $RPM_BUILD_ROOT/usr/share/bogl/
cp font.bgf $RPM_BUILD_ROOT/usr/share/bogl/
gzip -9 $RPM_BUILD_ROOT/usr/share/bogl/font.bgf

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc ChangeLog README debian/copyright
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root)
%{_bindir}/bdftobogl
%{_bindir}/mergebdf
%{_bindir}/pngtobogl
%{_bindir}/reduce-font
%exclude %{_libdir}/*.a
%{_libdir}/*.so
%{_includedir}/bogl

%files bterm
%defattr(-,root,root)
%doc README.BOGL-bterm debian/copyright
%{_bindir}/bterm
%{_datadir}/terminfo/b/bterm
/usr/share/bogl

%changelog
* Fri Nov 10 2006 Miloslav Trmac  - 0:0.1.18-13
- Add URL:
- Preserve modification date of header files
- Ship debian/copyright
- Compile all files with $RPM_OPT_FLAGS

* Sun Nov  5 2006 Miloslav Trmac  - 0:0.1.18-12
- Update to bogl-0.1.18-1.5
- Drop wlite
- Split rh.patch by functionality
- Move the default font to /usr/share/bogl, don't ship it as BDF
- Change to conform to Fedora packaging guidelines

* Tue Oct 17 2006 Miloslav Trmac  - 0:0.1.18-11.2.1.el5.1
- Rebuild for RHEL 5
- Use sysconf(_SC_PAGE_SIZE) instead  to fix build on IA-64

* Fri Feb 10 2006 Jesse Keating  - 0:0.1.18-11.2.1
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating  - 0:0.1.18-11.2
- rebuilt for new gcc4.1 snapshot and glibc changes

* Fri Dec 09 2005 Jesse Keating 
- rebuilt

* Thu Sep 22 2005 Miloslav Trmac  - 0:0.1.18-11
- Update to bogl-0.1.18-1.2

* Tue Sep 20 2005 Miloslav Trmac  - 0:0.1.18-10
- Simplify overzealous bogl-0.1.18-1.1.sigchld.patch

* Tue Sep 20 2005 Miloslav Trmac  - 0:0.1.18-9
- Update to bogl-0.1.18-1.1
- Don't ship unused ucs fonts in the SRPM
- Remove obsolete URL: (#168673)

* Sun Sep 18 2005 Miloslav Trmac  - 0:0.1.18-8
- Ship wlite and Unicode data licenses, and Changelog

* Fri Mar  4 2005 Miloslav Trmac  - 0:0.1.18-7
- Add missing includes in bogl-0.1.18-rh.patch
- Rebuild with gcc 4

* Thu Feb 17 2005 Miloslav Trmac  - 0:0.1.18-6
- Don't require executable stack
- Fix build with gcc 4
- Use $RPM_OPT_FLAGS

* Tue Nov 23 2004 Jeremy Katz  - 0:0.1.18-5
- don't build against dietlibc anymore on x86

* Wed Oct 20 2004 Jeremy Katz  - 0:0.1.18-4
- rebuild again

* Tue Oct 19 2004 Jeremy Katz  - 0:0.1.18-3
- rebuild against newer diet with fixed signal handling

* Mon Sep  6 2004 Jeremy Katz  - 0:0.1.18-2
- fPIC on ppc too (#130719)

* Mon Jul 05 2004 Akira TAGOH  0:0.1.18-1
- New upstream release.
  #113910 has been fixed in this release.
- bogl-0.1.18-rh.patch: updated to be able to apply it for this release.
- bogl-0.1.9-vga16-others.patch: removed. no need this patch anymore.

* Fri Jun 18 2004 Jeremy Katz  - 0:0.1.9-33
- fix build with gcc 3.4

* Tue Jun 15 2004 Elliot Lee 
- rebuilt

* Tue Mar 02 2004 Elliot Lee 
- rebuilt

* Wed Feb 18 2004 Jeremy Katz  - 0:0.1.9-31
- fix build

* Tue Feb 17 2004 Jeremy Katz  - 0:0.1.9-30
- fix to work with changed 2.6 fbdev semantics

* Fri Feb 13 2004 Elliot Lee 
- rebuilt

* Mon Dec 15 2003 Matt Wilson  0:0.1.9-28
- add BuildRequires: gd-devel, libpng-devel (#111165)

* Mon Aug 25 2003 Jeremy Katz  0:0.1.9-27
- add hack to fix #92240

* Wed Jun 04 2003 Elliot Lee 
- rebuilt

* Fri May 30 2003 Matt Wilson  0:0.1.9-25
- rebuild

* Fri May 30 2003 Matt Wilson  0:0.1.9-24
- enable vga16 support on ia64
- removed workaround for AMD64, kernel should be fixed now

* Tue May 06 2003 Phil Knirsch   0:0.1.9-23
- Bumped release and rebuilt due to new gd version.

* Wed Apr  2 2003 Matt Wilson  0:0.1.9-22
- add a workaround for AMD64 that calls iopl(3) in order to gain io
  port access until ioperm() is fixed (#87835).  Workaround for
  (#86321)
- gzip font.bgf

* Wed Mar 19 2003 Jeremy Katz  0:0.1.9-21
- include vga16fb support on x86_64 (#86321)

* Thu Feb 13 2003 Adrian Havill  0:0.1.9-20
- Change the font combo to add zh, change ja to k14 (#81717, #82888)

* Tue Feb 11 2003 Jeremy Katz  0:0.1.9-19
- actually do the test correctly
- buildrequire dietlibc on i386

* Tue Feb 11 2003 Jeremy Katz  0:0.1.9-18
- only fPIC on needed arches, and do it everywhere

* Mon Feb 10 2003 Matt Wilson  0:0.1.9-17
- always use wlite for bogl/bterm (for now) (#83980)
  (this makes bterm useless for any non-UTF-8 locale)
- fixed 'bterm' for the normal usage case

* Mon Feb  3 2003 Matt Wilson  0:0.1.9-16
- add back the Epoch: to support upgrading from betas

* Wed Jan 22 2003 Tim Powers 
- rebuilt

* Mon Dec 30 2002 Jeremy Katz  0.1.9-14
- build wlite with -fPIC
- fix deps of subpackages

* Sun Dec 29 2002 Florian La Roche 
- delete "Epoch: 0" line in spec file

* Mon Dec 16 2002 Adrian Havill  0.1.9-12
- added bogl.bdf.gz to allow us to reduce-font in loader build

* Mon Dec 16 2002 Adrian Havill  0.1.9-11
- fixed broken reduce-font to test ENCODING x instead of STARTCHAR x

* Mon Dec 16 2002 Matt Wilson  0.1.9-10
- made more changes to the rh patch to enable bogl embedding insode loader

* Tue Dec 10 2002 Matt Wilson 
- use all fb drivers on non-i386
- package wlite for use in loader
- use %%{_libdir} to get lib64 right

* Mon Dec 10 2002 Adrian Havill 
- swapped out utf8 code with new and improved wlite

* Tue Nov 26 2002 Adrian Havill 
- re-write font loader so it can load uncompressed or gzipped files
- utf8 lib updated
- fixed bug in bogl_term_new() so struct is inited (s/malloc/calloc/)
- added term bell (screen flash)
- changed background/foreground to pretty pretty blue/white

* Thu Nov 21 2002 Adrian Havill 
- updated utf8 library
- made bogl_term_out reset the state at every call so glibc
  and utf8.c behave consistently
- concatenated two Red Hat diff patches

* Wed Nov 20 2002 Adrian Havill 
- changed behavior of bogl_term_out to queue and save UTF broken between two
  buffers
- utf8 lib improvements

* Thu Nov 14 2002 root 
- integrate havill's utf8 for diet libs
- build and install font

* Tue Jul 23 2002 Matt Wilson 
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bogl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 16:12:09 -0000	1.1
+++ .cvsignore	10 Nov 2006 16:13:21 -0000	1.2
@@ -0,0 +1,2 @@
+14x14cjk.bdf.gz
+bogl_0.1.18-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bogl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 16:12:09 -0000	1.1
+++ sources	10 Nov 2006 16:13:21 -0000	1.2
@@ -0,0 +1,2 @@
+c08ab351a43a91632127f509aadc6797  14x14cjk.bdf.gz
+81aa55429880d424e40014f45770f8ec  bogl_0.1.18-1.5.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 16:14:07 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:14:07 -0700
Subject: rpms/phpMyAdmin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611101614.kAAGE71w032104@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32082/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module phpMyAdmin


--- 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  Fri Nov 10 16:16:20 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:16:20 -0700
Subject: rpms/phpMyAdmin import.log,1.1,1.2
Message-ID: <200611101616.kAAGGKfP032202@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32168

Modified Files:
	import.log 
Log Message:
auto-import phpMyAdmin-2.9.1-1alpha on branch devel from phpMyAdmin-2.9.1-1alpha.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 16:14:01 -0000	1.1
+++ import.log	10 Nov 2006 16:15:50 -0000	1.2
@@ -0,0 +1 @@
+phpMyAdmin-2_9_1-1alpha:HEAD:phpMyAdmin-2.9.1-1alpha.src.rpm:1163175335



From fedora-extras-commits at redhat.com  Fri Nov 10 16:16:20 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 10 Nov 2006 09:16:20 -0700
Subject: rpms/phpMyAdmin/devel phpMyAdmin-config.inc.php, NONE,
	1.1 phpMyAdmin.htaccess, NONE, 1.1 phpMyAdmin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611101616.kAAGGK7H032206@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32168/devel

Modified Files:
	.cvsignore sources 
Added Files:
	phpMyAdmin-config.inc.php phpMyAdmin.htaccess phpMyAdmin.spec 
Log Message:
auto-import phpMyAdmin-2.9.1-1alpha on branch devel from phpMyAdmin-2.9.1-1alpha.src.rpm


--- NEW FILE phpMyAdmin-config.inc.php ---
= 4.3.0)
$cfg['Servers'][$i]['controluser']   = '';          // MySQL control user settings
                                                    // (this user must have read-only
$cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user"
                                                    // and "mysql/db" tables).
                                                    // The controluser is also
                                                    // used for all relational
                                                    // features (pmadb)
$cfg['Servers'][$i]['auth_type']     = 'http';    // Authentication method (config, http or cookie based)?
$cfg['Servers'][$i]['user']          = '';      // MySQL user
$cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                    // with 'config' auth_type)
$cfg['Servers'][$i]['only_db']       = '';          // If set to a db-name, only
                                                    // this db is displayed in left frame
                                                    // It may also be an array of db-names, where sorting order is relevant.
$cfg['Servers'][$i]['hide_db']       = '';          // Database name to be hidden from listings
$cfg['Servers'][$i]['verbose']       = '';          // Verbose name for this host - leave blank to show the hostname

$cfg['Servers'][$i]['pmadb']         = '';          // Database used for Relation, Bookmark and PDF Features
                                                    // (see scripts/create_tables.sql)
                                                    //   - leave blank for no support
                                                    //     DEFAULT: 'phpmyadmin'
$cfg['Servers'][$i]['bookmarktable'] = '';          // Bookmark table
                                                    //   - leave blank for no bookmark support
                                                    //     DEFAULT: 'pma_bookmark'
$cfg['Servers'][$i]['relation']      = '';          // table to describe the relation between links (see doc)
                                                    //   - leave blank for no relation-links support
                                                    //     DEFAULT: 'pma_relation'
$cfg['Servers'][$i]['table_info']    = '';          // table to describe the display fields
                                                    //   - leave blank for no display fields support
                                                    //     DEFAULT: 'pma_table_info'
$cfg['Servers'][$i]['table_coords']  = '';          // table to describe the tables position for the PDF schema
                                                    //   - leave blank for no PDF schema support
                                                    //     DEFAULT: 'pma_table_coords'
$cfg['Servers'][$i]['pdf_pages']     = '';          // table to describe pages of relationpdf
                                                    //   - leave blank if you don't want to use this
                                                    //     DEFAULT: 'pma_pdf_pages'
$cfg['Servers'][$i]['column_info']   = '';          // table to store column information
                                                    //   - leave blank for no column comments/mime types
                                                    //     DEFAULT: 'pma_column_info'
$cfg['Servers'][$i]['history']       = '';          // table to store SQL history
                                                    //   - leave blank for no SQL query history
                                                    //     DEFAULT: 'pma_history'
$cfg['Servers'][$i]['verbose_check'] = TRUE;        // set to FALSE if you know that your pma_* tables
                                                    // are up to date. This prevents compatibility
                                                    // checks and thereby increases performance.
$cfg['Servers'][$i]['AllowRoot']     = TRUE;        // whether to allow root login
$cfg['Servers'][$i]['AllowDeny']['order']           // Host authentication order, leave blank to not use
                                     = '';
$cfg['Servers'][$i]['AllowDeny']['rules']           // Host authentication rules, leave blank for defaults
                                     = array();
?>


--- NEW FILE phpMyAdmin.htaccess ---
# phpMyAdmin - Web based MySQL browser written in php
# 
# Allows only localhost by default
#
# But allowing phpMyAdmin to anyone other than localhost should be considered
# dangerous unless properly secured by SSL

Alias /phpMyAdmin /usr/share/phpMyAdmin

   order deny,allow
   deny from all
   allow from 127.0.0.1


# This directory does not require access over HTTP - taken from the original
# phpMyAdmin upstream tarball
#

    Order Deny,Allow
    Deny from All
    Allow from None


# This configuration prevents mod_security at phpMyAdmin directories from
# filtering SQL etc.
#

    
        SecFilterInheritance Off
    




--- NEW FILE phpMyAdmin.spec ---
Name: phpMyAdmin
Version: 2.9.1
Release: 1alpha
Summary: Web based MySQL browser written in php

Group:	Applications/Internet
License: GPL
URL: http://www.phpmyadmin.net/	
Source0: http://dl.sourceforge.net/sourceforge/phpMyAdmin/phpMyAdmin-%{version}-rc2-all-languages.tar.bz2
Source1: phpMyAdmin-config.inc.php
Source2: phpMyAdmin.htaccess
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: webserver 
Requires: php >= 4.1.0
Requires: php-mysql  >= 4.1.0
Requires: php-mbstring >= 4.1.0
Requires(postun): /sbin/service
Requires(post): /sbin/service

%description
phpMyAdmin is a tool written in PHP intended to handle the administration of
MySQL over the Web. Currently it can create and drop databases,
create/drop/alter tables, delete/edit/add fields, execute any SQL statement,
manage keys on fields, manage privileges,export data into various formats and
is available in 50 languages

%prep
%setup -qn phpMyAdmin-%{version}-rc2-all-languages

%install
rm -rf %{buildroot}
%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
%{__cp} -ad ./* %{buildroot}/%{_datadir}/%{name}
%{__cp} %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf
%{__cp} %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}/config.inc.php
ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php

%{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt
%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLCT]*
%{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess

%clean
rm -rf %{buildroot}

%post
/sbin/service httpd condrestart > /dev/null 2>&1 || :

%postun
/sbin/service httpd condrestart > /dev/null 2>&1 || :

%files
%defattr(-,root,root,-)
%doc INSTALL README LICENSE CREDITS TODO Documentation.txt
%{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf
%config(noreplace) %{_sysconfdir}/%{name}

%changelog
* Fri Nov 10 2006 Mike McGrath  2.9.1-1alpha
- Added alpha tag since this is a release candidate

* Tue Nov 07 2006 Mike McGrath  2.9.1-1
- Upstream released new version

* Wed Oct 04 2006 Mike McGrath  2.9.0.2-1
- Upstream released new version

* Thu Jul 06 2006 Mike McGrath  2.8.2-2
- Fixed a typo in the Apache config

* Mon Jul 03 2006 Mike McGrath  2.8.2-1
- Upstream released 2.8.2
- Added more restrictive directives to httpd/conf.d/phpMyAdmin.conf
- removed htaccess file from the libraries dir
- Specific versions for various requires

* Sat May 13 2006 Mike McGrath  2.8.0.4-1
- Upstream released 2.8.0.4
- Added requires php, instead of requires httpd, now using webserver

* Sun May 07 2006 Mike McGrath  2.8.0.3-2
- Added mysql-php and php-mbstring as a requires

* Thu Apr 07 2006 Mike McGrath  2.8.0.3-1
- Fixed XSS vulnerability: PMASA-2006-1
- It was possible to conduct an XSS attack with a direct call to some scripts
- under the themes directory.

* Tue Apr 04 2006 Mike McGrath  2.8.0.2-3
- Made config files actually configs
- Moved doc files to the doc dir

* Tue Apr 04 2006 Mike McGrath  2.8.0.2-2
- Moved everything to %{_datadir}
- Moved config file to /etc/
- Used description from phpMyAdmin project info

* Mon Apr 03 2006 Mike McGrath  2.8.0.2-1
- Initial Spec file creation for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 16:14:06 -0000	1.1
+++ .cvsignore	10 Nov 2006 16:15:50 -0000	1.2
@@ -0,0 +1 @@
+phpMyAdmin-2.9.1-rc2-all-languages.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 16:14:06 -0000	1.1
+++ sources	10 Nov 2006 16:15:50 -0000	1.2
@@ -0,0 +1 @@
+a49c0d06d98cf842b78f9686e642d952  phpMyAdmin-2.9.1-rc2-all-languages.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov 10 16:17:12 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Fri, 10 Nov 2006 09:17:12 -0700
Subject: owners owners.list,1.1914,1.1915
Message-ID: <200611101617.kAAGHCcg032259@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32238

Modified Files:
	owners.list 
Log Message:
Add bogl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1914
retrieving revision 1.1915
diff -u -r1.1914 -r1.1915
--- owners.list	9 Nov 2006 19:28:46 -0000	1.1914
+++ owners.list	10 Nov 2006 16:16:41 -0000	1.1915
@@ -129,6 +129,7 @@
 Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|bogl|A terminal program for displaying Unicode on the console|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|bogofilter|Fast anti-spam filtering by Bayesian statistical analysis|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|boo|Boo is an OO statically typed language for CLI|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 16:41:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:41:54 -0700
Subject: rpms/theora-exp - New directory
Message-ID: <200611101641.kAAGfsQF032522@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32517/theora-exp

Log Message:
Directory /cvs/extras/rpms/theora-exp added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:42:00 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:42:00 -0700
Subject: rpms/theora-exp/devel - New directory
Message-ID: <200611101642.kAAGg0ib032554@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32517/theora-exp/devel

Log Message:
Directory /cvs/extras/rpms/theora-exp/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 16:42:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:42:17 -0700
Subject: rpms/theora-exp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611101642.kAAGgHCc032585@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32579

Added Files:
	Makefile import.log 
Log Message:
Setup of module theora-exp


--- NEW FILE Makefile ---
# Top level Makefile for module theora-exp
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  Fri Nov 10 16:42:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:42:23 -0700
Subject: rpms/theora-exp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611101642.kAAGgNQW032601@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module theora-exp


--- 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  Fri Nov 10 16:42:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:42:26 -0700
Subject: owners owners.list,1.1915,1.1916
Message-ID: <200611101642.kAAGgQtO032611@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32529

Modified Files:
	owners.list 
Log Message:
added beneath-a-steel-sky-cd


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1915
retrieving revision 1.1916
diff -u -r1.1915 -r1.1916
--- owners.list	10 Nov 2006 16:16:41 -0000	1.1915
+++ owners.list	10 Nov 2006 16:41:56 -0000	1.1916
@@ -106,6 +106,7 @@
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 16:43:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:43:22 -0700
Subject: rpms/theora-exp import.log,1.1,1.2
Message-ID: <200611101643.kAAGhMxT032680@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32644

Modified Files:
	import.log 
Log Message:
auto-import theora-exp-0.0.1-0.1.svn12061 on branch devel from theora-exp-0.0.1-0.1.svn12061.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/theora-exp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 16:42:17 -0000	1.1
+++ import.log	10 Nov 2006 16:42:52 -0000	1.2
@@ -0,0 +1 @@
+theora-exp-0_0_1-0_1_svn12061:HEAD:theora-exp-0.0.1-0.1.svn12061.src.rpm:1163177036



From fedora-extras-commits at redhat.com  Fri Nov 10 16:43:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:43:23 -0700
Subject: rpms/theora-exp/devel theora-exp.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611101643.kAAGhNJS032684@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/theora-exp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32644/devel

Modified Files:
	.cvsignore sources 
Added Files:
	theora-exp.spec 
Log Message:
auto-import theora-exp-0.0.1-0.1.svn12061 on branch devel from theora-exp-0.0.1-0.1.svn12061.src.rpm


--- NEW FILE theora-exp.spec ---
%define svn     svn12061

Name:           theora-exp
Version:        0.0.1
Release:        0.1.%{svn}%{?dist}
Summary:        Experimental theora decoder
Group:          System Environment/Libraries
License:        BSD
URL:            http://svn.xiph.org/trunk/theora-exp/
# create this by doing:
# svn co http://svn.xiph.org/trunk/theora-exp/
# rm -fr `find theora-exp -name .svn`
# rm -fr theora-exp/doc
# tar cvfz theora-exp-%{svn}.tar.gz theora-exp
Source0:        %{name}-%{svn}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtool libvorbis-devel SDL-devel libtheora-devel

%description
Experimental theora decoder with full support for the complete theora
specification (libtheora only supports a subset).


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q -n %{name}
aclocal -I m4
autoheader
libtoolize --automake
automake --add-missing
autoconf


%build
%configure --disable-dependency-tracking --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libtheoradec.la


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_libdir}/libtheoradec.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/theora
%{_libdir}/libtheoradec.so
%{_libdir}/pkgconfig/theoradec.pc


%changelog
* Tue Nov  7 2006 Hans de Goede  0.0.1-0.1.svn12061
- New snapshot svn version 12061
- Various specfile improvements, thanks to Dmitry Butskoy

* Sun Jul 30 2006 Hans de Goede  0.0-0.1.20060730
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/theora-exp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 16:42:23 -0000	1.1
+++ .cvsignore	10 Nov 2006 16:42:53 -0000	1.2
@@ -0,0 +1 @@
+theora-exp-svn12061.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/theora-exp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 16:42:23 -0000	1.1
+++ sources	10 Nov 2006 16:42:53 -0000	1.2
@@ -0,0 +1 @@
+0866b55d727a888e553be2293f2ab9c8  theora-exp-svn12061.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 16:44:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:44:26 -0700
Subject: owners owners.list,1.1916,1.1917
Message-ID: <200611101644.kAAGiQkj032749@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32733

Modified Files:
	owners.list 
Log Message:
added flight-of-the-amazon-queen


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1916
retrieving revision 1.1917
diff -u -r1.1916 -r1.1917
--- owners.list	10 Nov 2006 16:41:56 -0000	1.1916
+++ owners.list	10 Nov 2006 16:43:55 -0000	1.1917
@@ -400,6 +400,7 @@
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flasm|Flash bytecode assembler disassembler|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 16:50:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 09:50:05 -0700
Subject: owners owners.list,1.1917,1.1918
Message-ID: <200611101650.kAAGo5Sh000356@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv338

Modified Files:
	owners.list 
Log Message:
added theora-exp


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1917
retrieving revision 1.1918
diff -u -r1.1917 -r1.1918
--- owners.list	10 Nov 2006 16:43:55 -0000	1.1917
+++ owners.list	10 Nov 2006 16:49:35 -0000	1.1918
@@ -2235,6 +2235,7 @@
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|theora-exp|Experimental theora decoder|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|thewidgetfactory|A tool for previewing widgets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 16:58:05 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 09:58:05 -0700
Subject: rpms/twinkle/devel twinkle.spec, 1.1, 1.2 sources, 1.2,
	1.3 .cvsignore, 1.2, 1.3
Message-ID: <200611101658.kAAGw5DA000488@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv465

Modified Files:
	twinkle.spec sources .cvsignore 
Log Message:
Upgrade to 0.9



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle.spec	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle.spec	10 Nov 2006 16:57:35 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           twinkle
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
-Patch0:		twinkle-libbind.patch
+Patch0:         twinkle-libbind.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
+- Upgrade to 0.9
+
 * Sun Sep 24 2006 Kevin Fenzi  - 0.8.1-2
 - Add bind-libbind-devel as a BuildRequires and link against it
   to fix private glibc symbols. 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 16:32:40 -0000	1.2
+++ sources	10 Nov 2006 16:57:35 -0000	1.3
@@ -1 +1 @@
-245ffd3b4a6f968d8f80d42f6aad079c  twinkle-0.8.1.tar.gz
+74ef85e9f4570cec10bd23d301f5549e  twinkle-0.9.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 16:32:40 -0000	1.2
+++ .cvsignore	10 Nov 2006 16:57:35 -0000	1.3
@@ -1 +1 @@
-twinkle-0.8.1.tar.gz
+twinkle-0.9.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 16:59:20 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Fri, 10 Nov 2006 09:59:20 -0700
Subject: owners owners.list,1.1918,1.1919
Message-ID: <200611101659.kAAGxKem000554@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv538

Modified Files:
	owners.list 
Log Message:
Fix missing pipes and broken initial-CC...


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1918
retrieving revision 1.1919
diff -u -r1.1918 -r1.1919
--- owners.list	10 Nov 2006 16:49:35 -0000	1.1918
+++ owners.list	10 Nov 2006 16:58:50 -0000	1.1919
@@ -106,7 +106,7 @@
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -400,7 +400,7 @@
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flasm|Flash bytecode assembler disassembler|pertusus at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -1979,7 +1979,7 @@
 Fedora Extras|qjackctl|Qt based JACK control application|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|icon at fedoraproject.org,extras-qa at fedoraproject.org|
+Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org|icon at fedoraproject.org
 Fedora Extras|qstat|Real-time Game Server Status for FPS game servers|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|qsynth|Qt based Fluidsynth GUI front end|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -2235,7 +2235,7 @@
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
-Fedora Extras|theora-exp|Experimental theora decoder|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|theora-exp|Experimental theora decoder|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|thewidgetfactory|A tool for previewing widgets|luya_tfz at thefinalzone.com|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 17:54:12 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 10:54:12 -0700
Subject: rpms/twinkle/FC-6 twinkle.spec, 1.1, 1.2 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611101754.kAAHsC0F003841@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3812

Modified Files:
	twinkle.spec .cvsignore sources 
Log Message:
Upgrade to 0.9



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/twinkle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle.spec	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle.spec	10 Nov 2006 17:53:41 -0000	1.2
@@ -1,13 +1,13 @@
 Name:           twinkle
-Version:        0.8.1
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
-Patch0:		twinkle-libbind.patch
+Patch0:         twinkle-libbind.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
+- Upgrade to 0.9
+
 * Sun Sep 24 2006 Kevin Fenzi  - 0.8.1-2
 - Add bind-libbind-devel as a BuildRequires and link against it
   to fix private glibc symbols. 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 16:32:40 -0000	1.2
+++ .cvsignore	10 Nov 2006 17:53:41 -0000	1.3
@@ -1 +1 @@
-twinkle-0.8.1.tar.gz
+twinkle-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 16:32:40 -0000	1.2
+++ sources	10 Nov 2006 17:53:41 -0000	1.3
@@ -1 +1 @@
-245ffd3b4a6f968d8f80d42f6aad079c  twinkle-0.8.1.tar.gz
+74ef85e9f4570cec10bd23d301f5549e  twinkle-0.9.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 18:04:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 11:04:11 -0700
Subject: rpms/twinkle/FC-6 twinkle.spec, 1.2, 1.3 twinkle-libbind.patch, 1.1,
	1.2
Message-ID: <200611101804.kAAI4BOu006922@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6901

Modified Files:
	twinkle.spec twinkle-libbind.patch 
Log Message:
Rebuild with correct libbind patch



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/twinkle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- twinkle.spec	10 Nov 2006 17:53:41 -0000	1.2
+++ twinkle.spec	10 Nov 2006 18:03:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-2
+- Rebuild with correct libbind patch
+
 * Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
 - Upgrade to 0.9
 

twinkle-libbind.patch:

Index: twinkle-libbind.patch
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-6/twinkle-libbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle-libbind.patch	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle-libbind.patch	10 Nov 2006 18:03:40 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur twinkle-0.8.1.orig/configure twinkle-0.8.1/configure
---- twinkle-0.8.1.orig/configure	2006-07-09 08:09:28.000000000 -0600
-+++ twinkle-0.8.1/configure	2006-09-24 14:16:26.000000000 -0600
-@@ -7949,10 +7949,10 @@
+diff -Nur twinkle-0.9.orig/configure twinkle-0.9/configure
+--- twinkle-0.9.orig/configure	2006-10-01 13:11:04.000000000 -0600
++++ twinkle-0.9/configure	2006-10-02 14:56:02.000000000 -0600
+@@ -7965,10 +7965,10 @@
  
  
  
@@ -15,7 +15,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7998,7 +7998,7 @@
+@@ -8014,7 +8014,7 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -24,21 +24,21 @@
        echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
-diff -Nur twinkle-0.8.1.orig/src/gui/Makefile twinkle-0.8.1/src/gui/Makefile
---- twinkle-0.8.1.orig/src/gui/Makefile	2006-07-09 08:10:02.000000000 -0600
-+++ twinkle-0.8.1/src/gui/Makefile	2006-09-24 16:12:14.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/Makefile twinkle-0.9/src/gui/Makefile
+--- twinkle-0.9.orig/src/gui/Makefile	2006-10-01 13:11:54.000000000 -0600
++++ twinkle-0.9/src/gui/Makefile	2006-10-02 14:57:34.000000000 -0600
 @@ -19,7 +19,7 @@
- INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/usr/include/cc++2 -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
+ INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
  LINK     = g++
  LFLAGS   = 
--LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
-+LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
+-LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
++LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
  AR       = ar cqs
  RANLIB   = 
  MOC      = $(QTDIR)/bin/moc
-diff -Nur twinkle-0.8.1.orig/src/gui/twinkle.pro twinkle-0.8.1/src/gui/twinkle.pro
---- twinkle-0.8.1.orig/src/gui/twinkle.pro	2006-07-07 12:44:07.000000000 -0600
-+++ twinkle-0.8.1/src/gui/twinkle.pro	2006-09-24 16:12:01.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/twinkle.pro twinkle-0.9/src/gui/twinkle.pro
+--- twinkle-0.9.orig/src/gui/twinkle.pro	2006-09-30 15:45:13.000000000 -0600
++++ twinkle-0.9/src/gui/twinkle.pro	2006-10-02 14:57:47.000000000 -0600
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
@@ -48,9 +48,9 @@
  
  DEFINES	+= QT_NO_STL
  
-diff -Nur twinkle-0.8.1.orig/src/Makefile.in twinkle-0.8.1/src/Makefile.in
---- twinkle-0.8.1.orig/src/Makefile.in	2006-07-09 08:09:32.000000000 -0600
-+++ twinkle-0.8.1/src/Makefile.in	2006-09-24 14:24:47.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/Makefile.in twinkle-0.9/src/Makefile.in
+--- twinkle-0.9.orig/src/Makefile.in	2006-10-01 13:11:08.000000000 -0600
++++ twinkle-0.9/src/Makefile.in	2006-10-02 14:56:28.000000000 -0600
 @@ -338,7 +338,7 @@
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
@@ -60,9 +60,9 @@
  	-lsndfile\
  	-lboost_regex
  
-diff -Nur twinkle-0.8.1.orig/src/sockets/dnssrv.cpp twinkle-0.8.1/src/sockets/dnssrv.cpp
---- twinkle-0.8.1.orig/src/sockets/dnssrv.cpp	2006-01-01 08:40:15.000000000 -0700
-+++ twinkle-0.8.1/src/sockets/dnssrv.cpp	2006-09-24 16:22:12.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/sockets/dnssrv.cpp twinkle-0.9/src/sockets/dnssrv.cpp
+--- twinkle-0.9.orig/src/sockets/dnssrv.cpp	2006-09-18 14:12:56.000000000 -0600
++++ twinkle-0.9/src/sockets/dnssrv.cpp	2006-10-02 14:57:22.000000000 -0600
 @@ -10,7 +10,6 @@
  #include 
  #include 



From fedora-extras-commits at redhat.com  Fri Nov 10 18:38:38 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 10 Nov 2006 11:38:38 -0700
Subject: rpms/gperiodic/FC-6 gperiodic.spec,1.5,1.6
Message-ID: <200611101838.kAAIccIP007256@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240

Modified Files:
	gperiodic.spec 
Log Message:



Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/gperiodic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gperiodic.spec	9 Nov 2006 18:54:49 -0000	1.5
+++ gperiodic.spec	10 Nov 2006 18:38:08 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
@@ -58,6 +58,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-6
+- Rebuild for distag problem
+
 * Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
 - Modify URL in package descrpition and source
 



From fedora-extras-commits at redhat.com  Fri Nov 10 18:43:09 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 11:43:09 -0700
Subject: rpms/twinkle/FC-5 twinkle.spec, 1.1, 1.2 twinkle-libbind.patch, 1.1,
	1.2 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611101843.kAAIh9LY007998@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7866

Modified Files:
	twinkle.spec twinkle-libbind.patch .cvsignore sources 
Log Message:
Upgrade to 0.9



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-5/twinkle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle.spec	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle.spec	10 Nov 2006 18:42:38 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           twinkle
-Version:        0.8.1
+Version:        0.9
 Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
@@ -7,7 +7,7 @@
 License:        GPL
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
-Patch0:		twinkle-libbind.patch
+Patch0:         twinkle-libbind.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -60,6 +60,12 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-2
+- Rebuild with correct libbind patch
+
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
+- Upgrade to 0.9
+
 * Sun Sep 24 2006 Kevin Fenzi  - 0.8.1-2
 - Add bind-libbind-devel as a BuildRequires and link against it
   to fix private glibc symbols. 

twinkle-libbind.patch:

Index: twinkle-libbind.patch
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-5/twinkle-libbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle-libbind.patch	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle-libbind.patch	10 Nov 2006 18:42:38 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur twinkle-0.8.1.orig/configure twinkle-0.8.1/configure
---- twinkle-0.8.1.orig/configure	2006-07-09 08:09:28.000000000 -0600
-+++ twinkle-0.8.1/configure	2006-09-24 14:16:26.000000000 -0600
-@@ -7949,10 +7949,10 @@
+diff -Nur twinkle-0.9.orig/configure twinkle-0.9/configure
+--- twinkle-0.9.orig/configure	2006-10-01 13:11:04.000000000 -0600
++++ twinkle-0.9/configure	2006-10-02 14:56:02.000000000 -0600
+@@ -7965,10 +7965,10 @@
  
  
  
@@ -15,7 +15,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7998,7 +7998,7 @@
+@@ -8014,7 +8014,7 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -24,21 +24,21 @@
        echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
-diff -Nur twinkle-0.8.1.orig/src/gui/Makefile twinkle-0.8.1/src/gui/Makefile
---- twinkle-0.8.1.orig/src/gui/Makefile	2006-07-09 08:10:02.000000000 -0600
-+++ twinkle-0.8.1/src/gui/Makefile	2006-09-24 16:12:14.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/Makefile twinkle-0.9/src/gui/Makefile
+--- twinkle-0.9.orig/src/gui/Makefile	2006-10-01 13:11:54.000000000 -0600
++++ twinkle-0.9/src/gui/Makefile	2006-10-02 14:57:34.000000000 -0600
 @@ -19,7 +19,7 @@
- INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/usr/include/cc++2 -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
+ INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
  LINK     = g++
  LFLAGS   = 
--LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
-+LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
+-LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
++LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
  AR       = ar cqs
  RANLIB   = 
  MOC      = $(QTDIR)/bin/moc
-diff -Nur twinkle-0.8.1.orig/src/gui/twinkle.pro twinkle-0.8.1/src/gui/twinkle.pro
---- twinkle-0.8.1.orig/src/gui/twinkle.pro	2006-07-07 12:44:07.000000000 -0600
-+++ twinkle-0.8.1/src/gui/twinkle.pro	2006-09-24 16:12:01.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/twinkle.pro twinkle-0.9/src/gui/twinkle.pro
+--- twinkle-0.9.orig/src/gui/twinkle.pro	2006-09-30 15:45:13.000000000 -0600
++++ twinkle-0.9/src/gui/twinkle.pro	2006-10-02 14:57:47.000000000 -0600
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
@@ -48,9 +48,9 @@
  
  DEFINES	+= QT_NO_STL
  
-diff -Nur twinkle-0.8.1.orig/src/Makefile.in twinkle-0.8.1/src/Makefile.in
---- twinkle-0.8.1.orig/src/Makefile.in	2006-07-09 08:09:32.000000000 -0600
-+++ twinkle-0.8.1/src/Makefile.in	2006-09-24 14:24:47.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/Makefile.in twinkle-0.9/src/Makefile.in
+--- twinkle-0.9.orig/src/Makefile.in	2006-10-01 13:11:08.000000000 -0600
++++ twinkle-0.9/src/Makefile.in	2006-10-02 14:56:28.000000000 -0600
 @@ -338,7 +338,7 @@
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
@@ -60,9 +60,9 @@
  	-lsndfile\
  	-lboost_regex
  
-diff -Nur twinkle-0.8.1.orig/src/sockets/dnssrv.cpp twinkle-0.8.1/src/sockets/dnssrv.cpp
---- twinkle-0.8.1.orig/src/sockets/dnssrv.cpp	2006-01-01 08:40:15.000000000 -0700
-+++ twinkle-0.8.1/src/sockets/dnssrv.cpp	2006-09-24 16:22:12.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/sockets/dnssrv.cpp twinkle-0.9/src/sockets/dnssrv.cpp
+--- twinkle-0.9.orig/src/sockets/dnssrv.cpp	2006-09-18 14:12:56.000000000 -0600
++++ twinkle-0.9/src/sockets/dnssrv.cpp	2006-10-02 14:57:22.000000000 -0600
 @@ -10,7 +10,6 @@
  #include 
  #include 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2006 16:32:40 -0000	1.2
+++ .cvsignore	10 Nov 2006 18:42:38 -0000	1.3
@@ -1 +1 @@
-twinkle-0.8.1.tar.gz
+twinkle-0.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2006 16:32:40 -0000	1.2
+++ sources	10 Nov 2006 18:42:38 -0000	1.3
@@ -1 +1 @@
-245ffd3b4a6f968d8f80d42f6aad079c  twinkle-0.8.1.tar.gz
+74ef85e9f4570cec10bd23d301f5549e  twinkle-0.9.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 18:46:10 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 11:46:10 -0700
Subject: rpms/twinkle/devel twinkle-libbind.patch, 1.1, 1.2 twinkle.spec, 1.2,
	1.3
Message-ID: <200611101846.kAAIkAL3008613@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8492

Modified Files:
	twinkle-libbind.patch twinkle.spec 
Log Message:
Rebuild with correct libbind patch


twinkle-libbind.patch:

Index: twinkle-libbind.patch
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle-libbind.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twinkle-libbind.patch	30 Sep 2006 16:32:40 -0000	1.1
+++ twinkle-libbind.patch	10 Nov 2006 18:45:39 -0000	1.2
@@ -1,7 +1,7 @@
-diff -Nur twinkle-0.8.1.orig/configure twinkle-0.8.1/configure
---- twinkle-0.8.1.orig/configure	2006-07-09 08:09:28.000000000 -0600
-+++ twinkle-0.8.1/configure	2006-09-24 14:16:26.000000000 -0600
-@@ -7949,10 +7949,10 @@
+diff -Nur twinkle-0.9.orig/configure twinkle-0.9/configure
+--- twinkle-0.9.orig/configure	2006-10-01 13:11:04.000000000 -0600
++++ twinkle-0.9/configure	2006-10-02 14:56:02.000000000 -0600
+@@ -7965,10 +7965,10 @@
  
  
  
@@ -15,7 +15,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7998,7 +7998,7 @@
+@@ -8014,7 +8014,7 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -24,21 +24,21 @@
        echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
-diff -Nur twinkle-0.8.1.orig/src/gui/Makefile twinkle-0.8.1/src/gui/Makefile
---- twinkle-0.8.1.orig/src/gui/Makefile	2006-07-09 08:10:02.000000000 -0600
-+++ twinkle-0.8.1/src/gui/Makefile	2006-09-24 16:12:14.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/Makefile twinkle-0.9/src/gui/Makefile
+--- twinkle-0.9.orig/src/gui/Makefile	2006-10-01 13:11:54.000000000 -0600
++++ twinkle-0.9/src/gui/Makefile	2006-10-02 14:57:34.000000000 -0600
 @@ -19,7 +19,7 @@
- INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/usr/include/cc++2 -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
+ INCPATH  = -I/usr/lib/qt3/mkspecs/default -I. -I.. -I/usr/include -I/opt/kde3/include -I/usr/include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
  LINK     = g++
  LFLAGS   = 
--LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
-+LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lxml2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lqt-mt -lXext -lX11 -lm -lpthread
+-LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lresolv -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
++LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audio/gsm/libgsm.a ../audits/libaudits.a ../stun/libstun.a -lbind -lsndfile -lboost_regex -L/usr/lib -lccext2 -lz -pthread -lccrtp1 -lccgnu2 -ldl -lrt -L/opt/kde3/lib -lkdecore -lkdeui -L/lib -lkabc -lasound -lspeex -lilbc -lzrtpcpp -lqt-mt -lXext -lX11 -lm -lpthread
  AR       = ar cqs
  RANLIB   = 
  MOC      = $(QTDIR)/bin/moc
-diff -Nur twinkle-0.8.1.orig/src/gui/twinkle.pro twinkle-0.8.1/src/gui/twinkle.pro
---- twinkle-0.8.1.orig/src/gui/twinkle.pro	2006-07-07 12:44:07.000000000 -0600
-+++ twinkle-0.8.1/src/gui/twinkle.pro	2006-09-24 16:12:01.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/gui/twinkle.pro twinkle-0.9/src/gui/twinkle.pro
+--- twinkle-0.9.orig/src/gui/twinkle.pro	2006-09-30 15:45:13.000000000 -0600
++++ twinkle-0.9/src/gui/twinkle.pro	2006-10-02 14:57:47.000000000 -0600
 @@ -3,7 +3,7 @@
  
  CONFIG	+= qt warn_off release thread
@@ -48,9 +48,9 @@
  
  DEFINES	+= QT_NO_STL
  
-diff -Nur twinkle-0.8.1.orig/src/Makefile.in twinkle-0.8.1/src/Makefile.in
---- twinkle-0.8.1.orig/src/Makefile.in	2006-07-09 08:09:32.000000000 -0600
-+++ twinkle-0.8.1/src/Makefile.in	2006-09-24 14:24:47.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/Makefile.in twinkle-0.9/src/Makefile.in
+--- twinkle-0.9.orig/src/Makefile.in	2006-10-01 13:11:08.000000000 -0600
++++ twinkle-0.9/src/Makefile.in	2006-10-02 14:56:28.000000000 -0600
 @@ -338,7 +338,7 @@
          $(top_builddir)/src/audits/libaudits.a\
          $(top_builddir)/src/stun/libstun.a\
@@ -60,9 +60,9 @@
  	-lsndfile\
  	-lboost_regex
  
-diff -Nur twinkle-0.8.1.orig/src/sockets/dnssrv.cpp twinkle-0.8.1/src/sockets/dnssrv.cpp
---- twinkle-0.8.1.orig/src/sockets/dnssrv.cpp	2006-01-01 08:40:15.000000000 -0700
-+++ twinkle-0.8.1/src/sockets/dnssrv.cpp	2006-09-24 16:22:12.000000000 -0600
+diff -Nur twinkle-0.9.orig/src/sockets/dnssrv.cpp twinkle-0.9/src/sockets/dnssrv.cpp
+--- twinkle-0.9.orig/src/sockets/dnssrv.cpp	2006-09-18 14:12:56.000000000 -0600
++++ twinkle-0.9/src/sockets/dnssrv.cpp	2006-10-02 14:57:22.000000000 -0600
 @@ -10,7 +10,6 @@
  #include 
  #include 


Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- twinkle.spec	10 Nov 2006 16:57:35 -0000	1.2
+++ twinkle.spec	10 Nov 2006 18:45:39 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.9-2
+- Rebuild with correct libbind patch
+
 * Fri Nov 10 2006 Kevin Fenzi  - 0.9-1
 - Upgrade to 0.9
 



From fedora-extras-commits at redhat.com  Fri Nov 10 19:11:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 10 Nov 2006 12:11:52 -0700
Subject: rpms/gift-openft/devel gift-openft-0.2.1.6-fhs.patch, NONE,
	1.1 gift-openft.spec, 1.4, 1.5 gift-openft-0.2.1.6-lib64.patch,
	1.1, NONE
Message-ID: <200611101911.kAAJBq8i011936@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift-openft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11912

Modified Files:
	gift-openft.spec 
Added Files:
	gift-openft-0.2.1.6-fhs.patch 
Removed Files:
	gift-openft-0.2.1.6-lib64.patch 
Log Message:
* Fri Nov 10 2006 Rex Dieter  0.2.1.6-5
- respin for new db4 (fc7)

* Tue Oct 31 2006 Rex Dieter  0.2.1.6-4
- cleanup lib64 patch (now -fhs patch)


gift-openft-0.2.1.6-fhs.patch:

--- NEW FILE gift-openft-0.2.1.6-fhs.patch ---
--- gift-openft-0.2.1.6/aclocal.m4.fhs	2005-04-30 19:05:50.000000000 -0500
+++ gift-openft-0.2.1.6/aclocal.m4	2006-10-31 07:34:12.000000000 -0600
@@ -6951,10 +6951,10 @@
      AC_SUBST(prefix)
    fi
 
-   plugindir=${prefix}/lib/giFT
+   plugindir=${libdir}/giFT
    AC_SUBST(plugindir)
 
-   datadir=${prefix}/share/giFT
+   datadir=${datadir}/giFT
    AC_SUBST(datadir)
   ])
 
--- gift-openft-0.2.1.6/configure.fhs	2005-04-30 19:05:57.000000000 -0500
+++ gift-openft-0.2.1.6/configure	2006-10-31 07:35:23.000000000 -0600
@@ -20198,10 +20198,10 @@
 
    fi
 
-   plugindir=${prefix}/lib/giFT
+   plugindir=${libdir}/giFT
 
 
-   datadir=${prefix}/share/giFT
+   datadir=${datadir}/giFT
 
 
 


Index: gift-openft.spec
===================================================================
RCS file: /cvs/extras/rpms/gift-openft/devel/gift-openft.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gift-openft.spec	29 Aug 2006 17:36:44 -0000	1.4
+++ gift-openft.spec	10 Nov 2006 19:11:22 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: Openft plugin for giFT 
 Name:	 gift-openft	
 Version: 0.2.1.6
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group:	 System Environment/Libraries
@@ -10,7 +10,7 @@
 Source:	 http://dl.sourceforge.net/sourceforge/gift/gift-openft-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gift-openft-0.2.1.6-lib64.patch
+Patch1: gift-openft-0.2.1.6-fhs.patch
 
 BuildRequires: gift-devel
 BuildRequires: zlib-devel
@@ -23,7 +23,8 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .lib64
+# See also related gift bug: http://bugzilla.redhat.com/210114
+%patch1 -p1 -b .fhs
 
 
 %build
@@ -50,6 +51,12 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter  0.2.1.6-5
+- respin for new db4 (fc7)
+
+* Tue Oct 31 2006 Rex Dieter  0.2.1.6-4
+- cleanup lib64 patch (now -fhs patch)
+
 * Tue Aug 29 2006 Rex Dieter  0.2.1.6-3
 - fc6 respin
 


--- gift-openft-0.2.1.6-lib64.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 10 19:50:58 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 10 Nov 2006 12:50:58 -0700
Subject: rpms/poedit/devel poedit.spec,1.4,1.5
Message-ID: <200611101950.kAAJow7Z012204@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/poedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12186

Modified Files:
	poedit.spec 
Log Message:
Rebuild with new db4.



Index: poedit.spec
===================================================================
RCS file: /cvs/extras/rpms/poedit/devel/poedit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poedit.spec	30 Oct 2006 15:26:55 -0000	1.4
+++ poedit.spec	10 Nov 2006 19:50:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           poedit
 Version:        1.3.6
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Languages
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Fri Nov 10 2007 Konstantin Ryabitsev  - 1.3.6-1.1
+- Rebuild for newer db4 in devel
+
 * Mon Oct 30 2006 Konstantin Ryabitsev  - 1.3.6-1
 - Upstream 1.3.6
 



From fedora-extras-commits at redhat.com  Fri Nov 10 20:10:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 10 Nov 2006 13:10:39 -0700
Subject: rpms/ccache/FC-6 ccache.spec,1.13,1.14
Message-ID: <200611102010.kAAKAd28015409@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ccache/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15362/FC-6

Modified Files:
	ccache.spec 
Log Message:
* Fri Nov 10 2006 Ville Skytt??  - 2.4-7
- Require coreutils for triggers (#215030).



Index: ccache.spec
===================================================================
RCS file: /cvs/extras/rpms/ccache/FC-6/ccache.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ccache.spec	29 Aug 2006 19:56:32 -0000	1.13
+++ ccache.spec	10 Nov 2006 20:10:09 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -13,6 +13,9 @@
 Patch0:         %{name}-html-links.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires(triggerin): coreutils
+Requires(triggerpostun): coreutils
+
 %description
 ccache is a compiler cache.  It acts as a caching pre-processor to
 C/C++ compilers, using the -E compiler switch and a hash to detect
@@ -83,6 +86,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Ville Skytt??  - 2.4-7
+- Require coreutils for triggers (#215030).
+
 * Wed Aug  9 2006 Ville Skytt??  - 2.4-6
 - Add auto-symlink support for compat-gcc-34(-c++).
 - Untabify, escape macros in changelog.



From fedora-extras-commits at redhat.com  Fri Nov 10 20:10:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 10 Nov 2006 13:10:41 -0700
Subject: rpms/ccache/devel ccache.spec,1.13,1.14
Message-ID: <200611102010.kAAKAfoK015413@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ccache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15362/devel

Modified Files:
	ccache.spec 
Log Message:
* Fri Nov 10 2006 Ville Skytt??  - 2.4-7
- Require coreutils for triggers (#215030).



Index: ccache.spec
===================================================================
RCS file: /cvs/extras/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ccache.spec	29 Aug 2006 19:56:32 -0000	1.13
+++ ccache.spec	10 Nov 2006 20:10:10 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -13,6 +13,9 @@
 Patch0:         %{name}-html-links.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires(triggerin): coreutils
+Requires(triggerpostun): coreutils
+
 %description
 ccache is a compiler cache.  It acts as a caching pre-processor to
 C/C++ compilers, using the -E compiler switch and a hash to detect
@@ -83,6 +86,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Ville Skytt??  - 2.4-7
+- Require coreutils for triggers (#215030).
+
 * Wed Aug  9 2006 Ville Skytt??  - 2.4-6
 - Add auto-symlink support for compat-gcc-34(-c++).
 - Untabify, escape macros in changelog.



From fedora-extras-commits at redhat.com  Fri Nov 10 20:11:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:11:51 -0700
Subject: rpms/php-pear-Cache - New directory
Message-ID: <200611102011.kAAKBpji015536@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15532/php-pear-Cache

Log Message:
Directory /cvs/extras/rpms/php-pear-Cache added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 20:11:57 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:11:57 -0700
Subject: rpms/php-pear-Cache/devel - New directory
Message-ID: <200611102011.kAAKBvYh015551@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15532/php-pear-Cache/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Cache/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 10 20:12:17 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:12:17 -0700
Subject: rpms/php-pear-Cache Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611102012.kAAKCHd0015594@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Cache


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Cache
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  Fri Nov 10 20:12:23 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:12:23 -0700
Subject: rpms/php-pear-Cache/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611102012.kAAKCN0Y015617@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Cache


--- 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  Fri Nov 10 20:13:46 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:13:46 -0700
Subject: rpms/php-pear-Cache import.log,1.1,1.2
Message-ID: <200611102013.kAAKDkqN015714@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15680

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Cache-1.5.5-0.1.RC4.fc6 on branch devel from php-pear-Cache-1.5.5-0.1.RC4.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Nov 2006 20:12:16 -0000	1.1
+++ import.log	10 Nov 2006 20:13:15 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Cache-1_5_5-0_1_RC4_fc6:HEAD:php-pear-Cache-1.5.5-0.1.RC4.fc6.src.rpm:1163189586



From fedora-extras-commits at redhat.com  Fri Nov 10 20:13:47 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:13:47 -0700
Subject: rpms/php-pear-Cache/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-Cache.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611102013.kAAKDl3J015716@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15680/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-Cache.spec xml2changelog 
Log Message:
auto-import php-pear-Cache-1.5.5-0.1.RC4.fc6 on branch devel from php-pear-Cache-1.5.5-0.1.RC4.fc6.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-Cache.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Cache

%define beta RC4

Name:           php-pear-Cache
Version:        1.5.5

%if %{?beta:0}%{!?beta:1}
Release:        1%{?dist}
%else
Release:        0.1.%{beta}%{?dist}
%endif
Summary:        Framework for caching of arbitrary data

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Cache
Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}
Requires:       php-pear(PEAR) >= 1.3.5
Requires(hint): php-pear(HTTP_Request)

%description
With the PEAR Cache you can cache the result of certain function
calls, as well as the output of a whole script run or share data
between applications.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}%{?beta}/%{pear_name}.xml
%{__install} -m 644 -c %{SOURCE1} LICENSE

cd %{pear_name}-%{version}%{?beta}


%build
cd %{pear_name}-%{version}%{?beta}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}%{?beta}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml


# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE

%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Cache.php
%{pear_phpdir}/Cache
%{pear_datadir}/Cache


%changelog
* Tue Oct  7 2006 Remi Collet  1.5.5-0.1.RC4
- use define beta (rather than fullversion)

* Tue Oct  7 2006 Remi Collet  1.5.5-0.1.rc4
- generated specfile (pear make-rpm-spec) + cleaning
- generated CHANGELOG
- add LICENSE



--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Nov 2006 20:12:23 -0000	1.1
+++ .cvsignore	10 Nov 2006 20:13:16 -0000	1.2
@@ -0,0 +1 @@
+Cache-1.5.5RC4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Nov 2006 20:12:23 -0000	1.1
+++ sources	10 Nov 2006 20:13:16 -0000	1.2
@@ -0,0 +1 @@
+d7ababc47030b1d69aba655156a41ea3  Cache-1.5.5RC4.tgz



From fedora-extras-commits at redhat.com  Fri Nov 10 20:16:12 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Fri, 10 Nov 2006 13:16:12 -0700
Subject: owners owners.list,1.1919,1.1920
Message-ID: <200611102016.kAAKGCDn015773@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15757

Modified Files:
	owners.list 
Log Message:
	php-pear-Cache : Framework for caching of arbitrary data



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1919
retrieving revision 1.1920
diff -u -r1.1919 -r1.1920
--- owners.list	10 Nov 2006 16:58:50 -0000	1.1919
+++ owners.list	10 Nov 2006 20:15:42 -0000	1.1920
@@ -1767,6 +1767,7 @@
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Auth-SASL|Abstraction of various SASL mechanism responses|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Benchmark|Framework to benchmark PHP scripts or function calls|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Cache|Framework for caching of arbitrary data|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Console-Getargs|Command-line arguments and parameters parser|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Console-Table|Class that makes it easy to build console style tables|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 10 20:23:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 10 Nov 2006 13:23:36 -0700
Subject: fedora-security/audit fe3, 1.30, 1.31 fe4, 1.94, 1.95 fe5, 1.102,
	1.103 fe6, 1.15, 1.16
Message-ID: <200611102023.kAAKNaLD015853@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15828

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fe3	9 Nov 2006 17:11:36 -0000	1.30
+++ fe3	10 Nov 2006 20:23:33 -0000	1.31
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5602 VULNERABLE (xsupplicant) #212699
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- fe4	9 Nov 2006 17:18:31 -0000	1.94
+++ fe4	10 Nov 2006 20:23:33 -0000	1.95
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fe5	9 Nov 2006 17:18:31 -0000	1.102
+++ fe5	10 Nov 2006 20:23:33 -0000	1.103
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fe6	9 Nov 2006 17:18:31 -0000	1.15
+++ fe6	10 Nov 2006 20:23:33 -0000	1.16
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822



From fedora-extras-commits at redhat.com  Fri Nov 10 20:33:27 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Fri, 10 Nov 2006 13:33:27 -0700
Subject: rpms/cfengine/devel cfengine.spec,1.22,1.23
Message-ID: <200611102033.kAAKXRNM015959@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15943

Modified Files:
	cfengine.spec 
Log Message:
rebuild for new db4


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cfengine.spec	4 Oct 2006 22:21:29 -0000	1.22
+++ cfengine.spec	10 Nov 2006 20:32:57 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A systems administration tool for networks
 Name: cfengine
 Version: 2.1.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.21.tar.gz
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Jeff Sheltren  2.1.21-3
+- rebuild for db4 update
+
 * Thu Oct 05 2006 Christian Iseli  2.1.21-2
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Fri Nov 10 20:41:35 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 10 Nov 2006 13:41:35 -0700
Subject: rpms/vdradmin-am/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vdradmin-am.spec, 1.2, 1.3
Message-ID: <200611102041.kAAKfZMS016092@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdradmin-am/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16069

Modified Files:
	.cvsignore sources vdradmin-am.spec 
Log Message:
* Fri Nov 10 2006 Ville Skytt??  - 3.5.0-1
- 3.5.0, patch to retain autotimer functionality by default on upgrades.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Oct 2006 09:23:37 -0000	1.2
+++ .cvsignore	10 Nov 2006 20:41:05 -0000	1.3
@@ -1 +1 @@
-vdradmin-am-3.4.7.tar.bz2
+vdradmin-am-3.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Oct 2006 09:23:37 -0000	1.2
+++ sources	10 Nov 2006 20:41:05 -0000	1.3
@@ -1 +1 @@
-b3f862dfa078bdef05b52a841850c65a  vdradmin-am-3.4.7.tar.bz2
+945102178caec3f0012dc3aaffcf1014  vdradmin-am-3.5.0.tar.bz2


Index: vdradmin-am.spec
===================================================================
RCS file: /cvs/extras/rpms/vdradmin-am/devel/vdradmin-am.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdradmin-am.spec	25 Oct 2006 09:25:54 -0000	1.2
+++ vdradmin-am.spec	10 Nov 2006 20:41:05 -0000	1.3
@@ -3,8 +3,8 @@
 %define videodir  %(vdr-config --videodir  2>/dev/null || echo ERROR)
 
 Name:           vdradmin-am
-Version:        3.4.7
-Release:        3%{?dist}
+Version:        3.5.0
+Release:        1%{?dist}
 Summary:        Web interface for VDR
 
 Group:          Applications/Internet
@@ -37,7 +37,8 @@
 %{__perl} -pi -e \
   's|"/video"|"%{videodir}"| ;
    s|^(\$CONFIG\{VDRCONFDIR\}\s*=\s*")[^"]*(.*)|$1%{configdir}$2| ;
-   s|\$CONFIG\{VIDEODIR\}/epg\.data|%{cachedir}/epg.data|' \
+   s|\$CONFIG\{VIDEODIR\}/epg\.data|%{cachedir}/epg.data| ;
+   s|-s \$AT_FILENAME |-f \$AT_FILENAME|' \
   vdradmind.pl
 %{__perl} -pi -e \
   's/vdradmind\.pl/vdradmind/g ; s/(TH vdradmin )1/${1}8/' vdradmind.pl.1
@@ -100,7 +101,7 @@
 %files -f vdradmin.lang
 %defattr(-,root,root,-)
 %doc COPYING CREDITS FAQ HISTORY INSTALL README* contrib/*example convert.pl
-%doc %{name}-httpd.conf
+%doc %{name}-httpd.conf autotimer2searchtimer.pl
 %{_initrddir}/vdradmind
 %{_sbindir}/vdradmind
 /usr/share/vdradmin/
@@ -114,6 +115,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Ville Skytt??  - 3.5.0-1
+- 3.5.0, patch to retain autotimer functionality by default on upgrades.
+
 * Wed Oct 25 2006 Ville Skytt??  - 3.4.7-3
 - Improve description (#211043).
 



From fedora-extras-commits at redhat.com  Fri Nov 10 21:02:50 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Fri, 10 Nov 2006 14:02:50 -0700
Subject: rpms/seamonkey/FC-6 seamonkey.spec,1.13,1.14
Message-ID: <200611102102.kAAL2oxP019221@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19201

Modified Files:
	seamonkey.spec 
Log Message:
* Thu Nov 09 2006 Kai Engert  1.0.6-0.6.2
- Fix some .dat and .rdf ghost files.



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-6/seamonkey.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- seamonkey.spec	10 Nov 2006 03:50:01 -0000	1.13
+++ seamonkey.spec	10 Nov 2006 21:02:14 -0000	1.14
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.6
-Release:        0.6.1%{?dist}
+Release:        0.6.2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -319,6 +319,8 @@
 done
 touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/components/myspell
+touch $RPM_BUILD_ROOT%{mozdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{mozdir}/components/xpti.dat
 
 
 %clean
@@ -339,8 +341,8 @@
 %{_datadir}/pixmaps/seamonkey-icon.png
 %{_datadir}/pixmaps/seamonkey-mail-icon.png
 
-%verify (not md5 mtime size) %{mozdir}/components/compreg.dat
-%verify (not md5 mtime size) %{mozdir}/components/xpti.dat
+%ghost %{mozdir}/components/compreg.dat
+%ghost %{mozdir}/components/xpti.dat
 
 %{_mandir}/man1/seamonkey.1.gz
 
@@ -381,11 +383,7 @@
 
 %{mozdir}/defaults/pref/all-fedora.js
 
-
 %ghost %{mozdir}/chrome/chrome.rdf
-%ghost %{mozdir}/chrome/overlays.rdf
-%ghost %{mozdir}/chrome/stylesheets.rdf
-
 
 %ghost %{mozdir}/chrome/overlayinfo/browser/skin/stylesheets.rdf
 %ghost %{mozdir}/chrome/overlayinfo/global/skin/stylesheets.rdf
@@ -429,6 +427,8 @@
 
 
 %changelog
+* Thu Nov 09 2006 Kai Engert  1.0.6-0.6.2
+- Fix some .dat and .rdf ghost files.
 * Thu Nov 09 2006 Kai Engert  1.0.6-0.6.1
 - Do not run regchrome.
 * Thu Nov 09 2006 Kai Engert  1.0.6-0.6



From fedora-extras-commits at redhat.com  Fri Nov 10 21:21:37 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 10 Nov 2006 14:21:37 -0700
Subject: fedora-security/audit fc5,1.387,1.388 fc6,1.139,1.140
Message-ID: <200611102121.kAALLbwN019435@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19415

Modified Files:
	fc5 fc6 
Log Message:
Note the openssh bug id


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- fc5	10 Nov 2006 09:31:09 -0000	1.387
+++ fc5	10 Nov 2006 21:21:33 -0000	1.388
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-5823 ** kernel
-CVE-2006-5794 VULNERABLE (openssh, fixed 4.5)
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- fc6	10 Nov 2006 09:31:09 -0000	1.139
+++ fc6	10 Nov 2006 21:21:33 -0000	1.140
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-5823 ** kernel
-CVE-2006-5794 VULNERABLE (openssh, fixed 4.5)
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 ** kernel
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:21 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:21 -0700
Subject: rpms/grhino/devel .cvsignore, 1.6, 1.7 grhino.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <200611102129.kAALTLdG019606@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/devel

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:59:04 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:51 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grhino.spec	10 Nov 2006 07:59:04 -0000	1.8
+++ grhino.spec	10 Nov 2006 21:28:51 -0000	1.9
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 07:59:04 -0000	1.6
+++ sources	10 Nov 2006 21:28:51 -0000	1.7
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:17 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:17 -0700
Subject: rpms/grhino/FC-3 .cvsignore, 1.6, 1.7 grhino.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <200611102129.kAALTHBM019586@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/FC-3

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:58:50 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:47 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec	10 Nov 2006 07:58:50 -0000	1.6
+++ grhino.spec	10 Nov 2006 21:28:47 -0000	1.7
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 07:58:50 -0000	1.6
+++ sources	10 Nov 2006 21:28:47 -0000	1.7
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:18 -0700
Subject: rpms/grhino/FC-4 .cvsignore, 1.6, 1.7 grhino.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <200611102129.kAALTI6B019592@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/FC-4

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:58:51 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:48 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	10 Nov 2006 07:58:51 -0000	1.7
+++ grhino.spec	10 Nov 2006 21:28:48 -0000	1.8
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 07:58:51 -0000	1.6
+++ sources	10 Nov 2006 21:28:48 -0000	1.7
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:20 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:20 -0700
Subject: rpms/grhino/FC-6 .cvsignore, 1.6, 1.7 grhino.spec, 1.9, 1.10 sources,
	1.8, 1.9
Message-ID: <200611102129.kAALTKFe019601@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/FC-6

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:58:58 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:50 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grhino.spec	10 Nov 2006 07:58:58 -0000	1.9
+++ grhino.spec	10 Nov 2006 21:28:50 -0000	1.10
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Nov 2006 07:58:58 -0000	1.8
+++ sources	10 Nov 2006 21:28:50 -0000	1.9
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 21:29:19 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 14:29:19 -0700
Subject: rpms/grhino/FC-5 .cvsignore, 1.6, 1.7 grhino.spec, 1.7, 1.8 sources,
	1.6, 1.7
Message-ID: <200611102129.kAALTJ0O019597@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19493/FC-5

Modified Files:
	.cvsignore grhino.spec sources 
Log Message:
Rebuild with all sources included



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Nov 2006 07:58:57 -0000	1.6
+++ .cvsignore	10 Nov 2006 21:28:49 -0000	1.7
@@ -1 +1,2 @@
 grhino.png
+grhino-0.15.2.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	10 Nov 2006 07:58:57 -0000	1.7
+++ grhino.spec	10 Nov 2006 21:28:49 -0000	1.8
@@ -1,27 +1,27 @@
 Name:           grhino
 Version:        0.15.2
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-Patch0:		grhino-scrollkeeper.patch
-Patch1:		grhino-configure-gettext.patch
-Patch2:		grhino-omf.patch
-Patch3:		grhino-icon.patch
+Source1:        %{name}.desktop
+Source2:        %{name}.png
+Patch0:         grhino-scrollkeeper.patch
+Patch1:         grhino-configure-gettext.patch
+Patch2:         grhino-omf.patch
+Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 #Requires:       
-Requires(post):		scrollkeeper
-Requires(postun):	scrollkeeper
+Requires(post):         scrollkeeper
+Requires(postun):       scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -61,9 +61,9 @@
 # desktop file
 #mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	%{SOURCE1}
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        --add-category X-Fedora \
+        %{SOURCE1}
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
+- Push both source files to build server
+
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Nov 2006 07:58:57 -0000	1.6
+++ sources	10 Nov 2006 21:28:49 -0000	1.7
@@ -1 +1,2 @@
 b98f0e178f6291232babfcb1c4925ea0  grhino.png
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 10 22:15:28 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Fri, 10 Nov 2006 15:15:28 -0700
Subject: rpms/subversion-api-docs/FC-6 subversion-api-docs.spec,1.7,1.8
Message-ID: <200611102215.kAAMFS6D023025@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23007

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.4.2.



Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/FC-6/subversion-api-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subversion-api-docs.spec	31 Oct 2006 19:52:24 -0000	1.7
+++ subversion-api-docs.spec	10 Nov 2006 22:14:58 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		subversion-api-docs
-Version:	1.4.0
+Version:	1.4.2
 Release:	1%{?dist}
 Summary:	Subversion API documentation
 
@@ -50,6 +50,9 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Sat Nov 11 2006 Bojan Smojver  1.4.2-1
+- bump up to 1.4.2
+
 * Wed Nov 01 2006 Bojan Smojver  1.4.0-1
 - bump up to 1.4.0
 



From fedora-extras-commits at redhat.com  Sat Nov 11 00:00:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 10 Nov 2006 17:00:12 -0700
Subject: rpms/sylpheed-claws-plugins/FC-6 .cvsignore, 1.10, 1.11 sources,
	1.10, 1.11 sylpheed-claws-plugins.spec, 1.24, 1.25
Message-ID: <200611110000.kAB00Ca4000801@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv767

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2006 09:38:29 -0000	1.10
+++ .cvsignore	10 Nov 2006 23:59:41 -0000	1.11
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 09:38:29 -0000	1.10
+++ sources	10 Nov 2006 23:59:41 -0000	1.11
@@ -1 +1 @@
-db771d49bf9bde1cce075b93f8028a19  sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+621e011a8a801485a18202696343b0ce  sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-6/sylpheed-claws-plugins.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sylpheed-claws-plugins.spec	7 Nov 2006 01:24:39 -0000	1.24
+++ sylpheed-claws-plugins.spec	10 Nov 2006 23:59:41 -0000	1.25
@@ -1,6 +1,22 @@
+# define pulgin version
+%define acpinotifier	1.0.4
+%define attremover	1.0.3
+%define cachesaver	0.10.2
+%define	etpanprivacy	0.15.3
+%define fetchinfo	0.4.16
+%define gtkhtml2viewer 0.12
+%define maildir		0.24.2
+%define mailmbox	1.12.2
+%define newmail		0.0.7
+%define notification	0.6
+%define perl		0.9.5
+%define rssyl		0.7
+%define smime		0.5.6
+%define synce		0.6.4
+%define vcalendar	1.90
 Name:           sylpheed-claws-plugins
-Version:        2.5.2
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -182,82 +198,82 @@
 Evolution or Outlook.
 
 %prep
-%setup -q -n sylpheed-claws-extra-plugins-%{version}
+%setup -c -q -n sylpheed-claws-extra-plugins-%{version}
 
 %build
 #acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %configure --disable-static --disable-dependency-tracking --disable-rpath
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -265,77 +281,77 @@
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
  
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
@@ -350,11 +366,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-1.0.3/ChangeLog
-%doc acpi_notifier-1.0.3/COPYING
-%doc acpi_notifier-1.0.3/NEWS
-%doc acpi_notifier-1.0.3/AUTHORS
-%doc acpi_notifier-1.0.3/README
+%doc acpi_notifier-%{acpinotifier}/ChangeLog
+%doc acpi_notifier-%{acpinotifier}/COPYING
+%doc acpi_notifier-%{acpinotifier}/NEWS
+%doc acpi_notifier-%{acpinotifier}/AUTHORS
+%doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -369,39 +385,39 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-1.0.3/AUTHORS
-%doc att_remover-1.0.3/ChangeLog
-%doc att_remover-1.0.3/COPYING
-%doc att_remover-1.0.3/NEWS
-%doc att_remover-1.0.3/README
+%doc att_remover-%{attremover}/AUTHORS
+%doc att_remover-%{attremover}/ChangeLog
+%doc att_remover-%{attremover}/COPYING
+%doc att_remover-%{attremover}/NEWS
+%doc att_remover-%{attremover}/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
 %defattr(-,root,root,-)
-%doc cachesaver-0.10.2/AUTHORS
-%doc cachesaver-0.10.2/ChangeLog
-%doc cachesaver-0.10.2/COPYING
+%doc cachesaver-%{cachesaver}/AUTHORS
+%doc cachesaver-%{cachesaver}/ChangeLog
+%doc cachesaver-%{cachesaver}/COPYING
 %{_libdir}/sylpheed-claws/plugins/cachesaver*
 
 %files etpan-privacy
 %defattr(-,root,root,-)
-%doc etpan-privacy-0.15.3/AUTHORS
-%doc etpan-privacy-0.15.3/ChangeLog
-%doc etpan-privacy-0.15.3/COPYING
-%doc etpan-privacy-0.15.3/README
+%doc etpan-privacy-%{etpanprivacy}/AUTHORS
+%doc etpan-privacy-%{etpanprivacy}/ChangeLog
+%doc etpan-privacy-%{etpanprivacy}/COPYING
+%doc etpan-privacy-%{etpanprivacy}/README
 %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.16/ChangeLog
-%doc fetchinfo-plugin-0.4.16/COPYING
-%doc fetchinfo-plugin-0.4.16/README
+%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
+%doc fetchinfo-plugin-%{fetchinfo}/COPYING
+%doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
 %files gtkhtml2-viewer
 %defattr(-,root,root,-)
-%doc gtkhtml2_viewer-0.11/AUTHORS
-%doc gtkhtml2_viewer-0.11/COPYING
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -415,53 +431,53 @@
 
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.24.2/AUTHORS
-%doc maildir-0.24.2/ChangeLog
-%doc maildir-0.24.2/COPYING
-%doc maildir-0.24.2/README
-%doc maildir-0.24.2/doc/README.xml
+%doc maildir-%{maildir}/AUTHORS
+%doc maildir-%{maildir}/ChangeLog
+%doc maildir-%{maildir}/COPYING
+%doc maildir-%{maildir}/README
+%doc maildir-%{maildir}/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.12.2/AUTHORS
-%doc mailmbox-1.12.2/ChangeLog
-%doc mailmbox-1.12.2/COPYING
-%doc mailmbox-1.12.2/README
+%doc mailmbox-%{mailmbox}/AUTHORS
+%doc mailmbox-%{mailmbox}/ChangeLog
+%doc mailmbox-%{mailmbox}/COPYING
+%doc mailmbox-%{mailmbox}/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
 %files newmail
 %defattr(-,root,root,-)
-%doc newmail-0.0.7/AUTHORS
-%doc newmail-0.0.7/ChangeLog
-%doc newmail-0.0.7/COPYING
-%doc newmail-0.0.7/NEWS
-%doc newmail-0.0.7/README
+%doc newmail-%{newmail}/AUTHORS
+%doc newmail-%{newmail}/ChangeLog
+%doc newmail-%{newmail}/COPYING
+%doc newmail-%{newmail}/NEWS
+%doc newmail-%{newmail}/README
 %{_libdir}/sylpheed-claws/plugins/newmail.so
 
 %files notification
 %defattr(-,root,root,-)
-%doc notification_plugin-0.5/AUTHORS
-%doc notification_plugin-0.5/ChangeLog
-%doc notification_plugin-0.5/COPYING
-%doc notification_plugin-0.5/README
+%doc notification_plugin-%{notification}/AUTHORS
+%doc notification_plugin-%{notification}/ChangeLog
+%doc notification_plugin-%{notification}/COPYING
+%doc notification_plugin-%{notification}/README
 %{_libdir}/sylpheed-claws/plugins/notification_plugin.so
 
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.9.5/AUTHORS
-%doc perl_plugin-0.9.5/ChangeLog
-%doc perl_plugin-0.9.5/COPYING
-%doc perl_plugin-0.9.5/README
-%doc perl_plugin-0.9.5/sc_perl.pod
+%doc perl_plugin-%{perl}/AUTHORS
+%doc perl_plugin-%{perl}/ChangeLog
+%doc perl_plugin-%{perl}/COPYING
+%doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.6.1/AUTHORS
-%doc rssyl-0.6.1/ChangeLog
-%doc rssyl-0.6.1/COPYING
-%doc rssyl-0.6.1/TODO
+%doc rssyl-%{rssyl}/AUTHORS
+%doc rssyl-%{rssyl}/ChangeLog
+%doc rssyl-%{rssyl}/COPYING
+%doc rssyl-%{rssyl}/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -477,25 +493,25 @@
 
 %files smime
 %defattr(-,root,root,-)
-%doc smime-0.5.5/ChangeLog
-%doc smime-0.5.5/COPYING
-%doc smime-0.5.5/NEWS
-%{_libdir}/sylpheed-claws/plugins/smime.so
+%doc smime-%{smime}/ChangeLog
+%doc smime-%{smime}/COPYING
+%doc smime-%{smime}/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime*
 
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.6.4/AUTHORS
-%doc synce_plugin-0.6.4/ChangeLog
-%doc synce_plugin-0.6.4/COPYING
-%doc synce_plugin-0.6.4/README
+%doc synce_plugin-%{synce}/AUTHORS
+%doc synce_plugin-%{synce}/ChangeLog
+%doc synce_plugin-%{synce}/COPYING
+%doc synce_plugin-%{synce}/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.89.1/AUTHORS
-%doc vcalendar-1.89.1/ChangeLog
-%doc vcalendar-1.89.1/COPYING
-%doc vcalendar-1.89.1/README
+%doc vcalendar-%{vcalendar}/AUTHORS
+%doc vcalendar-%{vcalendar}/ChangeLog
+%doc vcalendar-%{vcalendar}/COPYING
+%doc vcalendar-%{vcalendar}/README
 %{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
@@ -510,6 +526,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Nov 09 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Tue Nov 07 2006 Andreas Bierfert 
 2.5.2-5
 - rebuild



From fedora-extras-commits at redhat.com  Sat Nov 11 00:10:37 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Fri, 10 Nov 2006 17:10:37 -0700
Subject: rpms/seamonkey/devel seamonkey.spec,1.12,1.13
Message-ID: <200611110010.kAB0AbWf003944@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3916

Modified Files:
	seamonkey.spec 
Log Message:
* Fri Nov 10 2006 Kai Engert  1.0.6-2
- Do not run regchrome.
- Fix some .dat and .rdf ghost files.



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- seamonkey.spec	9 Nov 2006 21:00:22 -0000	1.12
+++ seamonkey.spec	11 Nov 2006 00:10:07 -0000	1.13
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.6
-Release:        1%{?dist}
+Release:        2{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -258,9 +258,6 @@
   echo "skin,install,select,classic/1.0" >> chrome/lang/default.txt
   echo "locale,install,select,en-US" >> chrome/lang/default.txt
 
-  # set up the chrome rdf files
-  LD_LIBRARY_PATH=`pwd`:`pwd`/.. MOZILLA_FIVE_HOME=`pwd` MOZ_DISABLE_GNOME=1 ./regchrome
-
   # fix permissions of the chrome directories
   /usr/bin/find . -type d -perm 0700 -exec chmod 755 {} \; || :
 
@@ -322,6 +319,8 @@
 done
 touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/components/myspell
+touch $RPM_BUILD_ROOT%{mozdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{mozdir}/components/xpti.dat
 
 
 %clean
@@ -342,8 +341,8 @@
 %{_datadir}/pixmaps/seamonkey-icon.png
 %{_datadir}/pixmaps/seamonkey-mail-icon.png
 
-%verify (not md5 mtime size) %{mozdir}/components/compreg.dat
-%verify (not md5 mtime size) %{mozdir}/components/xpti.dat
+%ghost %{mozdir}/components/compreg.dat
+%ghost %{mozdir}/components/xpti.dat
 
 %{_mandir}/man1/seamonkey.1.gz
 
@@ -384,11 +383,7 @@
 
 %{mozdir}/defaults/pref/all-fedora.js
 
-
 %ghost %{mozdir}/chrome/chrome.rdf
-%ghost %{mozdir}/chrome/overlays.rdf
-%ghost %{mozdir}/chrome/stylesheets.rdf
-
 
 %ghost %{mozdir}/chrome/overlayinfo/browser/skin/stylesheets.rdf
 %ghost %{mozdir}/chrome/overlayinfo/global/skin/stylesheets.rdf
@@ -432,6 +427,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Kai Engert  1.0.6-2
+- Do not run regchrome.
+- Fix some .dat and .rdf ghost files.
 * Thu Nov 09 2006 Kai Engert  1.0.6-1
 - SeaMonkey 1.0.6
 * Thu Sep 14 2006 Kai Engert  1.0.5-1



From fedora-extras-commits at redhat.com  Sat Nov 11 00:14:52 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Fri, 10 Nov 2006 17:14:52 -0700
Subject: rpms/seamonkey/devel seamonkey.spec,1.13,1.14
Message-ID: <200611110014.kAB0Eq56004036@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4009

Modified Files:
	seamonkey.spec 
Log Message:
fix mistake in dist suffix



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- seamonkey.spec	11 Nov 2006 00:10:07 -0000	1.13
+++ seamonkey.spec	11 Nov 2006 00:14:22 -0000	1.14
@@ -11,7 +11,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0.6
-Release:        2{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet



From fedora-extras-commits at redhat.com  Sat Nov 11 02:15:24 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:15:24 -0700
Subject: rpms/php-pear-XML-RSS - New directory
Message-ID: <200611110215.kAB2FOCg017626@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17622/php-pear-XML-RSS

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-RSS added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 02:15:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:15:30 -0700
Subject: rpms/php-pear-XML-RSS/devel - New directory
Message-ID: <200611110215.kAB2FUD0017640@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17622/php-pear-XML-RSS/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-XML-RSS/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 02:15:36 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:15:36 -0700
Subject: rpms/php-pear-XML-RSS Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611110215.kAB2Facn017671@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17665

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-XML-RSS


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-XML-RSS
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  Sat Nov 11 02:15:37 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:15:37 -0700
Subject: rpms/php-pear-XML-RSS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611110215.kAB2FbdM017688@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17665/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-XML-RSS


--- 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  Sat Nov 11 02:16:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:16:28 -0700
Subject: rpms/php-pear-XML-RSS import.log,1.1,1.2
Message-ID: <200611110216.kAB2GSwa017767@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17734

Modified Files:
	import.log 
Log Message:
auto-import php-pear-XML-RSS-0.9.10-2 on branch devel from php-pear-XML-RSS-0.9.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-RSS/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 02:15:36 -0000	1.1
+++ import.log	11 Nov 2006 02:15:57 -0000	1.2
@@ -0,0 +1 @@
+php-pear-XML-RSS-0_9_10-2:HEAD:php-pear-XML-RSS-0.9.10-2.src.rpm:1163211354



From fedora-extras-commits at redhat.com  Sat Nov 11 02:16:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:16:28 -0700
Subject: rpms/php-pear-XML-RSS/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-XML-RSS.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611110216.kAB2GSD2017771@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-XML-RSS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17734/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-XML-RSS.spec 
Log Message:
auto-import php-pear-XML-RSS-0.9.10-2 on branch devel from php-pear-XML-RSS-0.9.10-2.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-XML-RSS.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name XML_RSS

Name:           php-pear-XML-RSS
Version:        0.9.10
Release:        2%{?dist}
Summary:        RSS parser

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/XML_RSS
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(XML_Parser) >= 1.0.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
Parser for Resource Description Framework (RDF) Site Summary (RSS)
documents.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
install -pm 644 -c %{SOURCE1} LICENSE
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc LICENSE
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/XML/RSS.php


%changelog
* Thu Nov 09 2006 Christopher Stone  0.9.10-2
- Added license file to %%doc
- Added versioned requires

* Sun Oct 29 2006 Christopher Stone  0.9.10-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-RSS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 02:15:37 -0000	1.1
+++ .cvsignore	11 Nov 2006 02:15:58 -0000	1.2
@@ -0,0 +1 @@
+XML_RSS-0.9.10.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-RSS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 02:15:37 -0000	1.1
+++ sources	11 Nov 2006 02:15:58 -0000	1.2
@@ -0,0 +1 @@
+eec8e6497bc1960cd7c155863f6f772a  XML_RSS-0.9.10.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 02:18:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 10 Nov 2006 19:18:16 -0700
Subject: owners owners.list,1.1920,1.1921
Message-ID: <200611110218.kAB2IGec017827@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17807

Modified Files:
	owners.list 
Log Message:
php-pear-XML-RSS


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1920
retrieving revision 1.1921
diff -u -r1.1920 -r1.1921
--- owners.list	10 Nov 2006 20:15:42 -0000	1.1920
+++ owners.list	11 Nov 2006 02:17:46 -0000	1.1921
@@ -1797,6 +1797,7 @@
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Parser|XML parsing class based on PHP's bundled expat|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-XML-RSS|RSS parser|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Serializer|Swiss-army knife for reading and writing XML files|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Util|XML utility class|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-apc|APC caches and optimizes PHP intermediate code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 02:51:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 19:51:53 -0700
Subject: rpms/gwget/devel .cvsignore, 1.8, 1.9 gwget-epiphany21x.patch, 1.2, 
	1.3 gwget.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200611110251.kAB2prtQ018048@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18016

Modified Files:
	.cvsignore gwget-epiphany21x.patch gwget.spec sources 
Log Message:
Update to 0.98.2 anf fix for #213480


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Jun 2006 21:10:27 -0000	1.8
+++ .cvsignore	11 Nov 2006 02:51:22 -0000	1.9
@@ -1 +1 @@
-gwget-0.97.tar.bz2
+gwget-0.98.2.tar.bz2

gwget-epiphany21x.patch:

Index: gwget-epiphany21x.patch
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget-epiphany21x.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gwget-epiphany21x.patch	15 Sep 2006 14:33:22 -0000	1.2
+++ gwget-epiphany21x.patch	11 Nov 2006 02:51:22 -0000	1.3
@@ -1,44 +1,41 @@
---- gwget-0.97/configure.in.orig	2006-01-05 22:13:55.000000000 +0100
-+++ gwget-0.97/configure.in	2006-09-15 13:32:02.000000000 +0200
-@@ -71,8 +71,14 @@
+--- gwget-0.98.2/configure.in.orig	2006-11-08 19:49:44.000000000 +0100
++++ gwget-0.98.2/configure.in	2006-11-11 03:04:53.000000000 +0100
+@@ -97,13 +97,15 @@
  
- dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
+ EPHY_VER=
+ AC_ARG_WITH([epiphany-version],
+-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
+-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
++        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17@:>@],
++                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 (default 1.6)]),
+         [EPHY_VER="$withval"])
+ 
+-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15 or 2.16
++dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16 or 2.17
  EPHY_AUTODETECT="(autodetect)"
--if pkg-config --exists epiphany-1.10; then
--               EPHY_VER=1.10
-+if pkg-config --exists epiphany-2.16; then
-+        EPHY_VER=2.16
-+elif pkg-config --exists epiphany-2.15; then
-+        EPHY_VER=2.15
-+elif pkg-config --exists epiphany-2.14; then
-+        EPHY_VER=2.14
-+elif pkg-config --exists epiphany-1.10; then
-+        EPHY_VER=1.10
- elif pkg-config --exists epiphany-1.8; then
-        	EPHY_VER=1.8
- elif pkg-config --exists epiphany-1.6; then
-@@ -107,11 +113,23 @@
-           AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
-           EPIPHANY_PKGCONFIG=epiphany-1.10
-           EPIPHANY_REQUIRED=1.9.0
-+elif test $EPHY_VER = "2.14"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.14
-+          EPIPHANY_REQUIRED=2.14
-+elif test $EPHY_VER = "2.15"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 215, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.15
-+          EPIPHANY_REQUIRED=2.15
-+elif test $EPHY_VER = "2.16"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 216, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.16
-+          EPIPHANY_REQUIRED=2.16
+-if pkg-config --exists epiphany-2.16; then
++if pkg-config --exists epiphany-2.17; then
++        EPHY_VER=2.17
++elif pkg-config --exists epiphany-2.16; then
+         EPHY_VER=2.16
+ elif pkg-config --exists epiphany-2.15; then
+         EPHY_VER=2.15
+@@ -158,13 +160,17 @@
+           EPIPHANY_PKGCONFIG=epiphany-2.16
+           EPIPHANY_REQUIRED=2.16
+           EPIPHANY_SHORTVER=216
++elif test "x$EPHY_VER" = "x2.17"; then
++          EPIPHANY_PKGCONFIG=epiphany-2.17
++          EPIPHANY_REQUIRED=2.17
++          EPIPHANY_SHORTVER=217
  else
       	AC_MSG_RESULT([no epiphany installed])
  fi
  
--if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
-+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"  || test $EPHY_VER = "2.14" || test $EPHY_VER = "2.15" || test $EPHY_VER = "2.16" ; then
+ if test -n "$EPIPHANY_SHORTVER" ; then
+ AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
+-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
++       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216 or 217)])
  AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
  
  LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gwget.spec	15 Sep 2006 13:41:11 -0000	1.17
+++ gwget.spec	11 Nov 2006 02:51:22 -0000	1.18
@@ -1,20 +1,23 @@
-%define epimajor 2.16
+%define epimajor 2.17
 
 Name:		gwget
-Version:	0.97
-Release:	7%{?dist}
+Version:	0.98.2
+Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gnome.org/projects/gwget
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.98/gwget-0.98.2.tar.bz2
 Source1:	gwget.desktop
 Patch0:		gwget-epiphany21x.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0
 BuildRequires:	libglade2-devel >= 2.0
+BuildRequires:	gnome-vfs2-devel >= 2.0
+BuildRequires:	dbus-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	intltool >= 0.29
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
@@ -46,7 +49,7 @@
 autoreconf -f
 
 %build
-export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+#export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -84,11 +87,9 @@
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_Gwget.server
 %{_sysconfdir}/gconf/schemas/gwget.schemas
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/idl/GNOME_Gwget.idl
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %files epiphany-extension
@@ -97,6 +98,15 @@
 
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  0.98.2-1
+- Update to 0.98.2.
+- Don't crash notification area (#213480).
+- Add support for epiphany 2.1.7.
+
+* Fri Sep 15 2006 Christoph Wickert  0.98.1-1
+- Update to 0.98.1.
+- BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
+
 * Fri Sep 15 2006 Christoph Wickert  0.97-7
 - Mass rebuild for Fedora Core 6.
 - Update epiphany-patch for epiphany <= 2.1.6.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Jun 2006 21:10:27 -0000	1.8
+++ sources	11 Nov 2006 02:51:22 -0000	1.9
@@ -1 +1 @@
-b31dd63a2b55f1c0c2dea58490ca8cd2  gwget-0.97.tar.bz2
+26bb748aff0769321bf1fd9b65735649  gwget-0.98.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 02:55:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 19:55:23 -0700
Subject: rpms/gwget/FC-6 .cvsignore, 1.8, 1.9 gwget-epiphany21x.patch, 1.2, 
	1.3 gwget.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200611110255.kAB2tNN3018175@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18133

Modified Files:
	.cvsignore gwget-epiphany21x.patch gwget.spec sources 
Log Message:
Update to 0.98.2 anf fix for #213480


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Jun 2006 21:10:27 -0000	1.8
+++ .cvsignore	11 Nov 2006 02:54:52 -0000	1.9
@@ -1 +1 @@
-gwget-0.97.tar.bz2
+gwget-0.98.2.tar.bz2

gwget-epiphany21x.patch:

Index: gwget-epiphany21x.patch
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/gwget-epiphany21x.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gwget-epiphany21x.patch	15 Sep 2006 14:33:22 -0000	1.2
+++ gwget-epiphany21x.patch	11 Nov 2006 02:54:52 -0000	1.3
@@ -1,44 +1,41 @@
---- gwget-0.97/configure.in.orig	2006-01-05 22:13:55.000000000 +0100
-+++ gwget-0.97/configure.in	2006-09-15 13:32:02.000000000 +0200
-@@ -71,8 +71,14 @@
+--- gwget-0.98.2/configure.in.orig	2006-11-08 19:49:44.000000000 +0100
++++ gwget-0.98.2/configure.in	2006-11-11 03:04:53.000000000 +0100
+@@ -97,13 +97,15 @@
  
- dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
+ EPHY_VER=
+ AC_ARG_WITH([epiphany-version],
+-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
+-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
++        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17@:>@],
++                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 (default 1.6)]),
+         [EPHY_VER="$withval"])
+ 
+-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15 or 2.16
++dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16 or 2.17
  EPHY_AUTODETECT="(autodetect)"
--if pkg-config --exists epiphany-1.10; then
--               EPHY_VER=1.10
-+if pkg-config --exists epiphany-2.16; then
-+        EPHY_VER=2.16
-+elif pkg-config --exists epiphany-2.15; then
-+        EPHY_VER=2.15
-+elif pkg-config --exists epiphany-2.14; then
-+        EPHY_VER=2.14
-+elif pkg-config --exists epiphany-1.10; then
-+        EPHY_VER=1.10
- elif pkg-config --exists epiphany-1.8; then
-        	EPHY_VER=1.8
- elif pkg-config --exists epiphany-1.6; then
-@@ -107,11 +113,23 @@
-           AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
-           EPIPHANY_PKGCONFIG=epiphany-1.10
-           EPIPHANY_REQUIRED=1.9.0
-+elif test $EPHY_VER = "2.14"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.14
-+          EPIPHANY_REQUIRED=2.14
-+elif test $EPHY_VER = "2.15"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 215, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.15
-+          EPIPHANY_REQUIRED=2.15
-+elif test $EPHY_VER = "2.16"; then
-+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 216, [Define to the Epiphany version (12 or 14 or 16)])
-+          EPIPHANY_PKGCONFIG=epiphany-2.16
-+          EPIPHANY_REQUIRED=2.16
+-if pkg-config --exists epiphany-2.16; then
++if pkg-config --exists epiphany-2.17; then
++        EPHY_VER=2.17
++elif pkg-config --exists epiphany-2.16; then
+         EPHY_VER=2.16
+ elif pkg-config --exists epiphany-2.15; then
+         EPHY_VER=2.15
+@@ -158,13 +160,17 @@
+           EPIPHANY_PKGCONFIG=epiphany-2.16
+           EPIPHANY_REQUIRED=2.16
+           EPIPHANY_SHORTVER=216
++elif test "x$EPHY_VER" = "x2.17"; then
++          EPIPHANY_PKGCONFIG=epiphany-2.17
++          EPIPHANY_REQUIRED=2.17
++          EPIPHANY_SHORTVER=217
  else
       	AC_MSG_RESULT([no epiphany installed])
  fi
  
--if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
-+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"  || test $EPHY_VER = "2.14" || test $EPHY_VER = "2.15" || test $EPHY_VER = "2.16" ; then
+ if test -n "$EPIPHANY_SHORTVER" ; then
+ AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
+-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
++       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216 or 217)])
  AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
  
  LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/gwget.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gwget.spec	15 Sep 2006 13:41:11 -0000	1.17
+++ gwget.spec	11 Nov 2006 02:54:52 -0000	1.18
@@ -1,20 +1,23 @@
-%define epimajor 2.16
+%define epimajor 2.17
 
 Name:		gwget
-Version:	0.97
-Release:	7%{?dist}
+Version:	0.98.2
+Release:	1%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gnome.org/projects/gwget
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.98/gwget-0.98.2.tar.bz2
 Source1:	gwget.desktop
 Patch0:		gwget-epiphany21x.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0
 BuildRequires:	libglade2-devel >= 2.0
+BuildRequires:	gnome-vfs2-devel >= 2.0
+BuildRequires:	dbus-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	intltool >= 0.29
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
@@ -46,7 +49,7 @@
 autoreconf -f
 
 %build
-export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+#export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -84,11 +87,9 @@
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_Gwget.server
 %{_sysconfdir}/gconf/schemas/gwget.schemas
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/idl/GNOME_Gwget.idl
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %files epiphany-extension
@@ -97,6 +98,15 @@
 
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  0.98.2-1
+- Update to 0.98.2.
+- Don't crash notification area (#213480).
+- Add support for epiphany 2.1.7.
+
+* Fri Sep 15 2006 Christoph Wickert  0.98.1-1
+- Update to 0.98.1.
+- BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
+
 * Fri Sep 15 2006 Christoph Wickert  0.97-7
 - Mass rebuild for Fedora Core 6.
 - Update epiphany-patch for epiphany <= 2.1.6.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Jun 2006 21:10:27 -0000	1.8
+++ sources	11 Nov 2006 02:54:52 -0000	1.9
@@ -1 +1 @@
-b31dd63a2b55f1c0c2dea58490ca8cd2  gwget-0.97.tar.bz2
+26bb748aff0769321bf1fd9b65735649  gwget-0.98.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 02:56:07 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:56:07 -0700
Subject: rpms/python-nltk_lite - New directory
Message-ID: <200611110256.kAB2u7tt018193@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18189/python-nltk_lite

Log Message:
Directory /cvs/extras/rpms/python-nltk_lite added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 02:56:13 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:56:13 -0700
Subject: rpms/python-nltk_lite/devel - New directory
Message-ID: <200611110256.kAB2uDJT018211@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18189/python-nltk_lite/devel

Log Message:
Directory /cvs/extras/rpms/python-nltk_lite/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 02:56:44 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 19:56:44 -0700
Subject: rpms/gwget/FC-6 gwget.spec,1.18,1.19
Message-ID: <200611110256.kAB2uiB7018247@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18209

Modified Files:
	gwget.spec 
Log Message:
fix epiphany-version for FC6


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-6/gwget.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gwget.spec	11 Nov 2006 02:54:52 -0000	1.18
+++ gwget.spec	11 Nov 2006 02:56:13 -0000	1.19
@@ -1,4 +1,4 @@
-%define epimajor 2.17
+%define epimajor 2.16
 
 Name:		gwget
 Version:	0.98.2



From fedora-extras-commits at redhat.com  Sat Nov 11 02:56:52 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:56:52 -0700
Subject: rpms/python-nltk_lite Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611110256.kAB2uq49018262@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18256

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-nltk_lite


--- NEW FILE Makefile ---
# Top level Makefile for module python-nltk_lite
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  Sat Nov 11 02:56:58 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:56:58 -0700
Subject: rpms/python-nltk_lite/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611110256.kAB2uwN6018278@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18256/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-nltk_lite


--- 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  Sat Nov 11 02:58:15 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:58:15 -0700
Subject: rpms/python-nltk_lite import.log,1.1,1.2
Message-ID: <200611110258.kAB2wFKh018350@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18318

Modified Files:
	import.log 
Log Message:
auto-import python-nltk_lite-0.6.6-1 on branch devel from python-nltk_lite-0.6.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-nltk_lite/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 02:56:52 -0000	1.1
+++ import.log	11 Nov 2006 02:57:45 -0000	1.2
@@ -0,0 +1 @@
+python-nltk_lite-0_6_6-1:HEAD:python-nltk_lite-0.6.6-1.src.rpm:1163213848



From fedora-extras-commits at redhat.com  Sat Nov 11 02:58:16 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 10 Nov 2006 19:58:16 -0700
Subject: rpms/python-nltk_lite/devel python-nltk_lite.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611110258.kAB2wGwR018354@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/python-nltk_lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18318/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-nltk_lite.spec 
Log Message:
auto-import python-nltk_lite-0.6.6-1 on branch devel from python-nltk_lite-0.6.6-1.src.rpm


--- NEW FILE python-nltk_lite.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-nltk_lite
Version:        0.6.6
Release:        1%{?dist}
Summary:        Natural Language Toolkit

Group:          Development/Libraries
License:        GPL
URL:            http://nltk.sf.net/
Source0:        http://dl.sourceforge.net/nltk/nltk_lite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

Obsoletes:      python-nltk <= 1.4.4-2%{?dist}

BuildRequires:  python
Requires:       python-numarray, tkinter

%description
NLTK is a Python package that simplifies the construction of programs
that process natural language; and defines standard interfaces between
the different components of an NLP system.  It was designed primarily
to help teach graduate and undergraduate students about computational
linguistics; but it is also useful as a framework for implementing
research projects.


%prep
%setup -q -n nltk_lite-%{version}


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
# Make scripts executable
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/test/doctest_driver.py
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/nltk_lite/stem/porter.py


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.TXT README.txt
%dir %{python_sitelib}/nltk_lite
%dir %{python_sitelib}/nltk_lite/chat
%dir %{python_sitelib}/nltk_lite/cluster
%dir %{python_sitelib}/nltk_lite/contrib
%dir %{python_sitelib}/nltk_lite/corpora
%dir %{python_sitelib}/nltk_lite/draw
%dir %{python_sitelib}/nltk_lite/misc
%dir %{python_sitelib}/nltk_lite/model
%dir %{python_sitelib}/nltk_lite/parse
%dir %{python_sitelib}/nltk_lite/stem
%dir %{python_sitelib}/nltk_lite/tag
%dir %{python_sitelib}/nltk_lite/test
%dir %{python_sitelib}/nltk_lite/tokenize
%{python_sitelib}/nltk_lite/*.py*
%{python_sitelib}/nltk_lite/*/*.py*


%changelog
* Mon Oct 30 2006 Michel Salim  - 0.6.6-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nltk_lite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 02:56:58 -0000	1.1
+++ .cvsignore	11 Nov 2006 02:57:46 -0000	1.2
@@ -0,0 +1 @@
+nltk_lite-0.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nltk_lite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 02:56:58 -0000	1.1
+++ sources	11 Nov 2006 02:57:46 -0000	1.2
@@ -0,0 +1 @@
+24fd97b553d421686fa30226b210c143  nltk_lite-0.6.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 03:13:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 20:13:56 -0700
Subject: rpms/gwget/FC-5 .cvsignore, 1.6, 1.7 gwget.spec, 1.14, 1.15 sources,
	1.6, 1.7
Message-ID: <200611110313.kAB3Du8a021646@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21620

Modified Files:
	.cvsignore gwget.spec sources 
Log Message:
update to 0.98.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Feb 2006 10:39:23 -0000	1.6
+++ .cvsignore	11 Nov 2006 03:13:25 -0000	1.7
@@ -1 +1 @@
-gwget-0.97.tar.bz2
+gwget-0.98.2.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/gwget.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gwget.spec	15 Jul 2006 15:18:37 -0000	1.14
+++ gwget.spec	11 Nov 2006 03:13:25 -0000	1.15
@@ -1,19 +1,24 @@
 %define epimajor 2.14
 
-Summary:	Graphical download manager that uses wget
 Name:		gwget
-Version:	0.97
-Release:	4%{?dist}
+Version:	0.98.2
+Release:	1%{?dist}
+Summary:	Graphical download manager that uses wget
+
 License:	GPL
 Group:		Applications/Internet
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
-Source1:	gwget.desktop
-Patch0:		gwget-epiphany214.patch
 URL:		http://gnome.org/projects/gwget
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.98/gwget-0.98.2.tar.bz2
+Source1:	gwget.desktop
+Patch0:		gwget-epiphany21x.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:	libgnomeui-devel >= 2.0
 BuildRequires:	libglade2-devel >= 2.0
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	gnome-vfs2-devel >= 2.0
+BuildRequires:	dbus-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	intltool >= 0.29
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 Requires:	wget >= 1.9
@@ -44,8 +49,8 @@
 autoreconf -f
 
 %build
-export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
-%configure 
+#export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -54,14 +59,13 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 rm ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-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				\
+	%{SOURCE1}
 rm -f ${RPM_BUILD_ROOT}/%{_includedir}/gwget/*
 %find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions/libgwgetextension.a
 
 %clean
 rm -rf %{buildroot}
@@ -70,24 +74,22 @@
 # For GConf apps: install schemas as system default
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
 
 %preun
 # For GConf apps: uninstall app's system default schemas
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-uninstall-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
 
 
 %files -f %{name}.lang
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_Gwget.server
 %{_sysconfdir}/gconf/schemas/gwget.schemas
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
-%{_datadir}/idl/GNOME_Gwget.idl
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %files epiphany-extension
@@ -96,9 +98,30 @@
 
 
 %changelog
-* Sat Jul 15 2006 Christoph Wickert  0.97-4
+* Sat Nov 11 2006 Christoph Wickert  0.98.2-1
+- Update to 0.98.2.
+- Don't crash notification area (#213480).
+- Add support for epiphany 2.1.7.
+
+* Fri Sep 15 2006 Christoph Wickert  0.98.1-1
+- Update to 0.98.1.
+- BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
+
+* Fri Sep 15 2006 Christoph Wickert  0.97-7
+- Mass rebuild for Fedora Core 6.
+- Update epiphany-patch for epiphany <= 2.1.6.
+- disable-static instead of removing .a files.
+- BuildRequire intltool instead of perl(XML::Parser).
+
+* Sat Jul 15 2006 Christoph Wickert  0.97-6
 - Fix BR to build in minimal build environment (#198919).
-- fix defattr.
+- Add patch to build against epiphany 2.1.5.
+
+* Mon Jun 26 2006 Christoph Wickert  0.97-5
+- bump release to fix broken upgrade path FE5 -> FE6.
+
+* Mon Jun 26 2006 Christoph Wickert  0.97-4
+- fix %%defattr.
 - fix summary and description of epiphany-extension subpackage.
 - fix BR of epiphany-extension subpackage.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Feb 2006 10:39:23 -0000	1.6
+++ sources	11 Nov 2006 03:13:25 -0000	1.7
@@ -1 +1 @@
-b31dd63a2b55f1c0c2dea58490ca8cd2  gwget-0.97.tar.bz2
+26bb748aff0769321bf1fd9b65735649  gwget-0.98.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 03:17:50 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 10 Nov 2006 20:17:50 -0700
Subject: rpms/gwget/FC-5 gwget-epiphany21x.patch, NONE,
	1.1 gwget-epiphany214.patch, 1.1, NONE
Message-ID: <200611110317.kAB3HoF6021737@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21730

Added Files:
	gwget-epiphany21x.patch 
Removed Files:
	gwget-epiphany214.patch 
Log Message:
include the correct patch

gwget-epiphany21x.patch:

--- NEW FILE gwget-epiphany21x.patch ---
--- gwget-0.98.2/configure.in.orig	2006-11-08 19:49:44.000000000 +0100
+++ gwget-0.98.2/configure.in	2006-11-11 03:04:53.000000000 +0100
@@ -97,13 +97,15 @@
 
 EPHY_VER=
 AC_ARG_WITH([epiphany-version],
-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
-                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
+        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17@:>@],
+                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 (default 1.6)]),
         [EPHY_VER="$withval"])
 
-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15 or 2.16
+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16 or 2.17
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.16; then
+if pkg-config --exists epiphany-2.17; then
+        EPHY_VER=2.17
+elif pkg-config --exists epiphany-2.16; then
         EPHY_VER=2.16
 elif pkg-config --exists epiphany-2.15; then
         EPHY_VER=2.15
@@ -158,13 +160,17 @@
           EPIPHANY_PKGCONFIG=epiphany-2.16
           EPIPHANY_REQUIRED=2.16
           EPIPHANY_SHORTVER=216
+elif test "x$EPHY_VER" = "x2.17"; then
+          EPIPHANY_PKGCONFIG=epiphany-2.17
+          EPIPHANY_REQUIRED=2.17
+          EPIPHANY_SHORTVER=217
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
 if test -n "$EPIPHANY_SHORTVER" ; then
 AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
-       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216 or 217)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


--- gwget-epiphany214.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 06:15:06 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 10 Nov 2006 23:15:06 -0700
Subject: rpms/fuse import.log,1.8,1.9
Message-ID: <200611110615.kAB6F6rQ032277@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32238

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.6.0-1 on branch devel from fuse-2.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	3 May 2006 08:58:06 -0000	1.8
+++ import.log	11 Nov 2006 06:14:35 -0000	1.9
@@ -5,3 +5,4 @@
 fuse-2_5_3-1:HEAD:fuse-2.5.3-1.src.rpm:1146646447
 fuse-2_5_3-1:FC-4:fuse-2.5.3-1.src.rpm:1146646544
 fuse-2_5_3-1:FC-5:fuse-2.5.3-1.src.rpm:1146646666
+fuse-2_6_0-1:HEAD:fuse-2.6.0-1.src.rpm:1163225659



From fedora-extras-commits at redhat.com  Sat Nov 11 06:15:07 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Fri, 10 Nov 2006 23:15:07 -0700
Subject: rpms/fuse/devel .cvsignore, 1.6, 1.7 fuse-udev_rules.patch, 1.6,
	1.7 fuse.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200611110615.kAB6F70X032286@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32238/devel

Modified Files:
	.cvsignore fuse-udev_rules.patch fuse.spec sources 
Log Message:
auto-import fuse-2.6.0-1 on branch devel from fuse-2.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 May 2006 08:54:29 -0000	1.6
+++ .cvsignore	11 Nov 2006 06:14:37 -0000	1.7
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse-udev_rules.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse-udev_rules.patch	29 Oct 2006 19:30:32 -0000	1.6
+++ fuse-udev_rules.patch	11 Nov 2006 06:14:37 -0000	1.7
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fuse.spec	29 Oct 2006 19:30:32 -0000	1.13
+++ fuse.spec	11 Nov 2006 06:14:37 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov  2.5.3-5
 - Fixed udev-rule again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 May 2006 08:54:29 -0000	1.6
+++ sources	11 Nov 2006 06:14:37 -0000	1.7
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 06:40:40 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 23:40:40 -0700
Subject: rpms/libxfce4util/devel sources, 1.6, 1.7 .cvsignore, 1.6,
	1.7 libxfce4util.spec, 1.13, 1.14
Message-ID: <200611110640.kAB6eeir032476@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32452

Modified Files:
	sources .cvsignore libxfce4util.spec 
Log Message:
Update to 4.3.99.2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 01:39:07 -0000	1.6
+++ sources	11 Nov 2006 06:40:09 -0000	1.7
@@ -1 +1 @@
-5474fda120b0f28f3b86bee268467060  libxfce4util-4.3.99.1.tar.bz2
+4b327c64c292b2e672f69a0789deb2b7  libxfce4util-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 01:39:07 -0000	1.6
+++ .cvsignore	11 Nov 2006 06:40:09 -0000	1.7
@@ -1 +1 @@
-libxfce4util-4.3.99.1.tar.bz2
+libxfce4util-4.3.99.2.tar.bz2


Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/devel/libxfce4util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libxfce4util.spec	6 Oct 2006 01:37:15 -0000	1.13
+++ libxfce4util.spec	11 Nov 2006 06:40:09 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD and LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4util-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2
 Group: Development/Libraries
 Requires: glib2 >= 2.0.0
 BuildRequires: glib2-devel >= 2.0.0
@@ -57,6 +57,9 @@
 %{_includedir}/xfce4
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 



From fedora-extras-commits at redhat.com  Sat Nov 11 06:50:06 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 23:50:06 -0700
Subject: rpms/libxfcegui4/devel libxfcegui4.spec, 1.16, 1.17 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110650.kAB6o6rT032566@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32544

Modified Files:
	libxfcegui4.spec sources .cvsignore 
Log Message:
Upgrade to 4.3.99.2



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libxfcegui4.spec	6 Oct 2006 01:38:33 -0000	1.16
+++ libxfcegui4.spec	11 Nov 2006 06:49:36 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gtk2 >= 2.0.6
@@ -67,6 +67,9 @@
 %{_includedir}/xfce4/*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Upgrade to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 01:42:24 -0000	1.5
+++ sources	11 Nov 2006 06:49:36 -0000	1.6
@@ -1 +1 @@
-519bca1ba08e51f03584ce6c007cd10d  libxfcegui4-4.3.99.1.tar.bz2
+98679c67ac65c376833deacec9fcbecf  libxfcegui4-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 01:42:24 -0000	1.5
+++ .cvsignore	11 Nov 2006 06:49:36 -0000	1.6
@@ -1 +1 @@
-libxfcegui4-4.3.99.1.tar.bz2
+libxfcegui4-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 06:54:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:54:53 -0700
Subject: rpms/pachi - New directory
Message-ID: <200611110654.kAB6srb5032702@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32698/pachi

Log Message:
Directory /cvs/extras/rpms/pachi added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 06:54:59 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:54:59 -0700
Subject: rpms/pachi/devel - New directory
Message-ID: <200611110654.kAB6sxKD032716@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32698/pachi/devel

Log Message:
Directory /cvs/extras/rpms/pachi/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 06:55:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:55:17 -0700
Subject: rpms/pachi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611110655.kAB6tHmN032749@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32743

Added Files:
	Makefile import.log 
Log Message:
Setup of module pachi


--- NEW FILE Makefile ---
# Top level Makefile for module pachi
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  Sat Nov 11 06:55:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:55:23 -0700
Subject: rpms/pachi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611110655.kAB6tNAW032767@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32743/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pachi


--- 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  Sat Nov 11 06:58:09 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:58:09 -0700
Subject: rpms/pachi import.log,1.1,1.2
Message-ID: <200611110658.kAB6w9RQ000421@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv375

Modified Files:
	import.log 
Log Message:
auto-import pachi-1.0-1 on branch devel from pachi-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pachi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 06:55:17 -0000	1.1
+++ import.log	11 Nov 2006 06:57:39 -0000	1.2
@@ -0,0 +1 @@
+pachi-1_0-1:HEAD:pachi-1.0-1.src.rpm:1163228966



From fedora-extras-commits at redhat.com  Sat Nov 11 06:58:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 10 Nov 2006 23:58:10 -0700
Subject: rpms/pachi/devel pachi-fixes.patch, NONE, 1.1 pachi.desktop, NONE, 
	1.1 pachi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611110658.kAB6wAu2000425@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pachi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv375/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pachi-fixes.patch pachi.desktop pachi.spec 
Log Message:
auto-import pachi-1.0-1 on branch devel from pachi-1.0-1.src.rpm

pachi-fixes.patch:

--- NEW FILE pachi-fixes.patch ---
diff -ur Pachi/data/Makefile.in Pachi.new/data/Makefile.in
--- Pachi/data/Makefile.in	2002-12-08 15:01:27.000000000 +0100
+++ Pachi.new/data/Makefile.in	2006-11-10 14:44:29.000000000 +0100
@@ -229,8 +229,8 @@
 
 install-data-local:
 	for file in $(score_DATA); do\
-	    chgrp $(group) $(scoredir)/$$file; \
-	    chmod $(perms) $(scoredir)/$$file; \
+	    chgrp $(group) $(DESTDIR)$(scoredir)/$$file; \
+	    chmod $(perms) $(DESTDIR)$(scoredir)/$$file; \
 	done					    
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -ur Pachi/src/faes.cpp Pachi.new/src/faes.cpp
--- Pachi/src/faes.cpp	2004-03-28 20:14:10.000000000 +0200
+++ Pachi.new/src/faes.cpp	2006-11-10 14:57:33.000000000 +0100
@@ -16,6 +16,8 @@
     *                                                                 *
     *******************************************************************/
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
+#include 
 #include
 #include
 #include
@@ -31,6 +33,8 @@
 #include"proto.h"
 #include"credits.h"
 
+FILE *highscore_fp = NULL;
+
 #include"text.c"
 #include"init.c"
 #include"gfx.c"
@@ -55,6 +59,19 @@
 
 int main(int argc, char *argv[])
 {
+    gid_t realgid;
+    
+    highscore_fp = fopen("/var/games/pachi.hs", "r+");
+    
+    /* Figure out who we really are. */
+    realgid = getgid();
+
+    /* This is where we drop our setgid privileges. */
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        return 1;
+    }
+
     initsdl();
 
     if(argc > 1)
@@ -86,6 +103,9 @@
 	    do_hiscores();
 	}
     }
+    if (highscore_fp)
+        fclose(highscore_fp);
+
 //    outro();
     SDL_JoystickClose(joystick);
     SDL_Quit();
Only in Pachi.new/src: faes.cpp~
diff -ur Pachi/src/file.c Pachi.new/src/file.c
--- Pachi/src/file.c	2004-03-28 21:55:10.000000000 +0200
+++ Pachi.new/src/file.c	2006-11-10 14:57:31.000000000 +0100
@@ -96,7 +96,8 @@
     LoadT(&scorefont,DATADIR"/fonts/font16b.T");
     LoadT(&scorefont1,DATADIR"/fonts/font16d.T");
 
-    FILE *file = fopen(SCOREDIR"/data/scores.dat","rb");
+    FILE *file = highscore_fp; /* FIXME, this will crash if (file == NULL) */
+    rewind(file);
     for(int a=0; a < 10; a++)
     {
 	for(int b=0; b < 10; b++)
@@ -124,7 +125,8 @@
 }
 void save_hiscoredata()
 {
-    FILE *file = fopen(SCOREDIR"/data/scores.dat","rb+");
+    FILE *file = highscore_fp; /* FIXME, this will crash if (file == NULL) */
+    rewind(file);
 
     for(int a=0;a<10;a++)
     {    
--- pachi-1.0.orig/src/game.c
+++ pachi-1.0/src/game.c
@@ -324,7 +324,7 @@
 	}
     }
     int object_is_here=0; // esta variable indica si el objeto que sigue en la secuencia esta en la pantalla actual
-    int bright_x, bright_y; // variables que indica en que posicion debe aparecer el brillo del proximo objeto a recoger
+    int bright_x = 0, bright_y = 0; // variables que indica en que posicion debe aparecer el brillo del proximo objeto a recoger
     for(n=0;n<5;n++)
     {
 	if(mobject[(R_current-1)*5+n].seq==sequence)
--- pachi-1.0.orig/src/gameover.c
+++ pachi-1.0/src/gameover.c
@@ -21,7 +21,6 @@
     SDL_SetColorKey(scorefont,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont->format,0,0,0));
     SDL_SetColorKey(scorefont1,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont1->format,0,0,0));
     SDL_SetColorKey(scorefont1,SDL_SRCCOLORKEY,SDL_MapRGB(scorefont1->format,0,0,0));
-    char plyername[]="          ";
     char diflevel[] ="      ";
     print_text(scorefont1,screen,16,16,30, 55,"         PACHI EL MARCIANO    TOP TEN         ");//scorename[a]);
     print_text(scorefont1,screen,16,16,30, 95,"NAME         STAGE    TIME    LEVEL     SCORE ");//scorename[a]);
@@ -103,7 +102,8 @@
 	    hiscore_events();
 	    SDL_FillRect(screen,&box,SDL_MapRGB(screen->format,0,0,0));
 	    print_text(scorefont1,screen,16,16,box.x+10,box.y+5,"ENTER YOUR NAME");
-	    print_text(scorefont1,screen,16,16,box.x+51+(namechar*16),box.y+29,".");
+	    for (int i = namechar; i < 10; i++)
+		print_text(scorefont1,screen,16,16,box.x+51+(i*16),box.y+29,".");
 	    print_text(scorefont,screen,16,16,box.x+51,box.y+24,"%s",playername);
 	    SDL_Flip(screen);
 	}
--- pachi-1.0.orig/src/intro.c
+++ pachi-1.0/src/intro.c
@@ -52,7 +52,6 @@
     double introtime=0;
     escape_exit=0;
     float title_alpha=0;
-    int title_done=0;
     int n=1;
     while(escape_exit==0)
     {
--- pachi-1.0.orig/src/input.c
+++ pachi-1.0/src/input.c
@@ -68,7 +68,7 @@
 		    {
 			namechar=0;
 			for(n=0;n<10;n++)
-			    playername[n] = '.';
+			    playername[n] = ' ';
 		    }
 		}
 	    }
@@ -167,7 +167,6 @@
 
 void code_events()
 {
-    int n;
     SDL_Event event;
     
     while(SDL_PollEvent(&event)==1)
@@ -304,7 +303,6 @@
 
 void game_events()
 {
-    int n;
     SDL_Event event;
     Uint8 *keys;
     
--- pachi-1.0.orig/src/output.c
+++ pachi-1.0/src/output.c
@@ -300,7 +300,6 @@
     if(num==CEMETERY || num==CAVES || num==CASTLE || num==CASTLE+1 || num==LAB)
     {
 	escape_exit=0;
-	SDL_Surface *temp;
 	switch(num)
 	{
 	    case CEMETERY:
--- pachi-1.0.orig/src/text.c
+++ pachi-1.0/src/text.c
@@ -15,7 +15,7 @@
     srctxt.y = 0;
     int linecounter = 0 ; // este contador se utiliza para saber en que linea imprimimos el texto
     int charpos = 0;
-    for(int charcounter = 0; charcounter <= (strlen(texto));charcounter++)
+    for(unsigned charcounter = 0; charcounter <= (strlen(texto));charcounter++)
     {
 	int curchar=texto[charcounter];
 	if(curchar == 94)


--- NEW FILE pachi.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Pachi El Marciano
Comment=2D platform game
Exec=pachi -f
Icon=pachi.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE pachi.spec ---
Name:           pachi
Version:        1.0
Release:        1%{?dist}
Summary:        Pachi El Marciano - Platform Game
Group:          Amusements/Games
License:        GPL
URL:            http://dragontech.sourceforge.net/index.php?main=pachi&lang=en
Source0:        http://dl.sf.net/sourceforge/dragontech/pachi_source.tgz
Source1:        %{name}.desktop
Patch0:         %{name}-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_mixer-devel desktop-file-utils ImageMagick

%description
Pachi El Marciano is a cool 2D platform game inspired by the likes of
Manic Miner, Jet Set Willy, and more from the '80s.


%prep
%setup -q -n Pachi
%patch0 -p1 -z .fixes


%build
%configure
make %{?_smp_mflags}
convert Tgfx/icon.bmp %{name}.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# easier then patching the Makefile
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_var}/games
mv $RPM_BUILD_ROOT%{_var}/lib/games/%{name}/data/scores.dat \
   $RPM_BUILD_ROOT%{_var}/games/%{name}.hs

# 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
install -p -m 644 %{name}.png \
  $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 COPYING ChangeLog README
%attr(2755,root,games) %{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%config(noreplace) %attr (0664,root,games) %{_var}/games/%{name}.hs


%changelog
* Fri Nov 10 2006 Hans de Goede  1.0-1
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pachi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 06:55:23 -0000	1.1
+++ .cvsignore	11 Nov 2006 06:57:40 -0000	1.2
@@ -0,0 +1 @@
+pachi_source.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pachi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 06:55:23 -0000	1.1
+++ sources	11 Nov 2006 06:57:40 -0000	1.2
@@ -0,0 +1 @@
+64906110d6236adc15c81910b43a1ae9  pachi_source.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 06:59:19 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Fri, 10 Nov 2006 23:59:19 -0700
Subject: rpms/libxfce4mcs/devel libxfce4mcs.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110659.kAB6xJnS000531@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv502

Modified Files:
	libxfce4mcs.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/libxfce4mcs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libxfce4mcs.spec	6 Oct 2006 01:55:58 -0000	1.12
+++ libxfce4mcs.spec	11 Nov 2006 06:58:49 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
-Version: 4.3.99.1
-Release: 2%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4mcs-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -62,6 +62,9 @@
 %{_includedir}/xfce4/libxfce4mcs
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - remove unneeded prereq


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 01:48:05 -0000	1.5
+++ sources	11 Nov 2006 06:58:49 -0000	1.6
@@ -1 +1 @@
-ad70646a4ef699d7adcd409339f78884  libxfce4mcs-4.3.99.1.tar.bz2
+7ee4eab238e773b9dbf3fa1472643f6e  libxfce4mcs-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 01:48:05 -0000	1.5
+++ .cvsignore	11 Nov 2006 06:58:49 -0000	1.6
@@ -1 +1 @@
-libxfce4mcs-4.3.99.1.tar.bz2
+libxfce4mcs-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:00:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 11 Nov 2006 00:00:25 -0700
Subject: owners owners.list,1.1921,1.1922
Message-ID: <200611110700.kAB70PnU000625@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv590

Modified Files:
	owners.list 
Log Message:
added pachi


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1921
retrieving revision 1.1922
diff -u -r1.1921 -r1.1922
--- owners.list	11 Nov 2006 02:17:46 -0000	1.1921
+++ owners.list	11 Nov 2006 06:59:55 -0000	1.1922
@@ -1227,6 +1227,7 @@
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|p0rn-comfort|Support programs for browsing image-gallery sites|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|pachi|Pachi El Marciano - Platform Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|padevchooser|Control applet for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|alex at dalloz.de|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|pam_keyring|A PAM module that executes gnome-keyring-daemon and unlocks the default keyring|denis at poolshark.org|extras-qa at fedoraproject.org|redhat at flyn.org



From fedora-extras-commits at redhat.com  Sat Nov 11 07:01:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:01:15 -0700
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec, 1.9, 1.10 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110701.kAB71FF8003592@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv631

Modified Files:
	xfce-mcs-manager.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce-mcs-manager.spec	6 Oct 2006 02:06:08 -0000	1.9
+++ xfce-mcs-manager.spec	11 Nov 2006 07:00:45 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-manager-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: libxfce4mcs >= %{version}
@@ -61,6 +61,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Add period to description
 - Fix defattr


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:01:44 -0000	1.5
+++ sources	11 Nov 2006 07:00:45 -0000	1.6
@@ -1 +1 @@
-1a42226297b3b89f19bd17a6841f5c3a  xfce-mcs-manager-4.3.99.1.tar.bz2
+59d6d8f4f931b562b39ea1decdf9e29e  xfce-mcs-manager-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:01:44 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:00:45 -0000	1.6
@@ -1 +1 @@
-xfce-mcs-manager-4.3.99.1.tar.bz2
+xfce-mcs-manager-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:17:40 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 11 Nov 2006 00:17:40 -0700
Subject: comps comps-fe5.xml.in, 1.192, 1.193 comps-fe6.xml.in, 1.216,
	1.217 comps-fe7.xml.in, 1.14, 1.15
Message-ID: <200611110717.kAB7HeCF003881@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3861

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add fotaq, bass


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- comps-fe5.xml.in	8 Nov 2006 09:57:56 -0000	1.192
+++ comps-fe5.xml.in	11 Nov 2006 07:17:09 -0000	1.193
@@ -306,6 +306,8 @@
       atomix
       auriferous
       ballbuster
+      beneath-a-steel-sky
+      beneath-a-steel-sky-cd
       blobwars
       bsd-games
       bygfoot
@@ -323,6 +325,7 @@
       enigma
       fbg
       fillets-ng
+      flight-of-the-amazon-queen
       foobillard
       fortune-mod
       fRaBs


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- comps-fe6.xml.in	8 Nov 2006 09:57:56 -0000	1.216
+++ comps-fe6.xml.in	11 Nov 2006 07:17:09 -0000	1.217
@@ -356,6 +356,8 @@
       atomix
       auriferous
       ballbuster
+      beneath-a-steel-sky
+      beneath-a-steel-sky-cd
       blobwars
       bsd-games
       bygfoot
@@ -374,6 +376,7 @@
       enigma
       fbg
       fillets-ng
+      flight-of-the-amazon-queen
       foobillard
       fortune-mod
       fRaBs


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- comps-fe7.xml.in	8 Nov 2006 09:57:56 -0000	1.14
+++ comps-fe7.xml.in	11 Nov 2006 07:17:09 -0000	1.15
@@ -356,6 +356,8 @@
       atomix
       auriferous
       ballbuster
+      beneath-a-steel-sky
+      beneath-a-steel-sky-cd
       blobwars
       bsd-games
       bygfoot
@@ -374,6 +376,7 @@
       enigma
       fbg
       fillets-ng
+      flight-of-the-amazon-queen
       foobillard
       fortune-mod
       fRaBs



From fedora-extras-commits at redhat.com  Sat Nov 11 07:23:22 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:23:22 -0700
Subject: rpms/xfce4-panel/devel sources, 1.5, 1.6 .cvsignore, 1.5,
	1.6 xfce4-panel.spec, 1.17, 1.18
Message-ID: <200611110723.kAB7NM9N003963@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3943

Modified Files:
	sources .cvsignore xfce4-panel.spec 
Log Message:
Update to 4.3.99.2 



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:10:26 -0000	1.5
+++ sources	11 Nov 2006 07:22:51 -0000	1.6
@@ -1 +1 @@
-8647de295987605161c75650e4554fd8  xfce4-panel-4.3.99.1.tar.bz2
+53f96a9db5628ac1c629c9e5ecd842e4  xfce4-panel-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:10:26 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:22:51 -0000	1.6
@@ -1 +1 @@
-xfce4-panel-4.3.99.1.tar.bz2
+xfce4-panel-4.3.99.2.tar.bz2


Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfce4-panel.spec	6 Oct 2006 08:13:22 -0000	1.17
+++ xfce4-panel.spec	11 Nov 2006 07:22:51 -0000	1.18
@@ -1,10 +1,10 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.3.99.1
-Release: 7%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= %{version}
@@ -119,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Fri Oct  6 2006 Kevin Fenzi  - 4.3.99.1-7
 - List full old versions in Obsoletes
 



From fedora-extras-commits at redhat.com  Sat Nov 11 07:25:14 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:25:14 -0700
Subject: rpms/gtk-xfce-engine/devel gtk-xfce-engine.spec, 1.13, 1.14 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110725.kAB7PE2S004044@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4019

Modified Files:
	gtk-xfce-engine.spec sources .cvsignore 
Log Message:
Update to 2.3.99.2



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/gtk-xfce-engine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtk-xfce-engine.spec	6 Oct 2006 02:27:27 -0000	1.13
+++ gtk-xfce-engine.spec	11 Nov 2006 07:24:44 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
-Version: 2.3.99.1
-Release: 3%{?dist}
+Version: 2.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/gtk-xfce-engine-2.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/gtk-xfce-engine-2.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.0
@@ -35,6 +35,9 @@
 %{_datadir}/*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 2.3.99.2-1
+- Update to 2.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 2.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:13:53 -0000	1.5
+++ sources	11 Nov 2006 07:24:44 -0000	1.6
@@ -1 +1 @@
-d5e9e9f5113268a1a3662ee420d064f7  gtk-xfce-engine-2.3.99.1.tar.bz2
+430c004dd67bc6445d7a162e626566fb  gtk-xfce-engine-2.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:13:53 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:24:44 -0000	1.6
@@ -1 +1 @@
-gtk-xfce-engine-2.3.99.1.tar.bz2
+gtk-xfce-engine-2.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:27:49 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:27:49 -0700
Subject: rpms/exo/devel sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 exo.spec, 1.19,
	1.20
Message-ID: <200611110727.kAB7RnAx004134@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4113

Modified Files:
	sources .cvsignore exo.spec 
Log Message:
Update to 0.3.1.12rc2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 22:07:51 -0000	1.4
+++ sources	11 Nov 2006 07:27:19 -0000	1.5
@@ -1 +1 @@
-98d5493c898ab54b82b0835fc0e6df87  exo-0.3.1.10rc1.tar.bz2
+4c74431033c4c222efeccd4cf47ab65f  exo-0.3.1.12rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 22:07:51 -0000	1.4
+++ .cvsignore	11 Nov 2006 07:27:19 -0000	1.5
@@ -1 +1 @@
-exo-0.3.1.10rc1.tar.bz2
+exo-0.3.1.12rc2.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- exo.spec	6 Oct 2006 03:51:31 -0000	1.19
+++ exo.spec	11 Nov 2006 07:27:19 -0000	1.20
@@ -2,11 +2,11 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.1.10
-Release: 0.6.rc1%{?dist}
+Version: 0.3.1.12
+Release: 0.1.rc2%{?dist}
 License: LGPL
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/exo-0.3.1.12rc2.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: Development/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 Python libraries and header files for the exo library.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %patch0 -p1 -b x86_64-build
 
@@ -83,6 +83,7 @@
 %{_datadir}/xfce4/helpers
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/ja
+%{_datadir}/xfce4/doc/fr
 %{_mandir}/man1/exo-csource.1.gz
 %{_mandir}/man1/exo-open.1.gz
 %{_bindir}/exo-csource
@@ -93,6 +94,7 @@
 %{_libexecdir}/exo-helper-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
+%{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-other.png
@@ -112,6 +114,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 0.3.1.12-0.1.rc2
+- Update to 0.3.1.12rc2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.3.1.10-0.6.rc1
 - Added libxfce4util-devel Requires for the devel package
 



From fedora-extras-commits at redhat.com  Sat Nov 11 07:30:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:30:15 -0700
Subject: rpms/Thunar/devel Thunar.spec, 1.7, 1.8 sources, 1.2, 1.3 .cvsignore,
	1.2, 1.3
Message-ID: <200611110730.kAB7UFe3004251@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4220

Modified Files:
	Thunar.spec sources .cvsignore 
Log Message:
Upgrade to 0.5.0rc2



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/Thunar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Thunar.spec	9 Oct 2006 19:13:47 -0000	1.7
+++ Thunar.spec	11 Nov 2006 07:29:44 -0000	1.8
@@ -1,10 +1,10 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 0.4.0
-Release: 0.11.rc1%{?dist}
+Version: 0.5.0
+Release: 0.1.rc2%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Thunar-0.5.0rc2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fam-devel
@@ -49,7 +49,7 @@
 libraries and header files for the Thunar file manager.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %build
 %configure --enable-dbus --enable-final --enable-xsltproc --enable-gtk-doc
@@ -164,6 +164,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Nov 09 2006 Kevin Fenzi  - 0.5.0-0.1.rc2
+- Upgrade to 0.5.0rc2
+
 * Mon Oct 09 2006 Kevin Fenzi  - 0.4.0-0.11.rc1
 - Add shared-mime-info and xfce4-icon-theme as Requires (fixes #209592)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2006 22:55:50 -0000	1.2
+++ sources	11 Nov 2006 07:29:44 -0000	1.3
@@ -1 +1 @@
-b07ae97a69964112e0af84ba2f63585d  Thunar-0.4.0rc1.tar.bz2
+c97f6a011eb72b8653ad799290c71d52  Thunar-0.5.0rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 22:55:50 -0000	1.2
+++ .cvsignore	11 Nov 2006 07:29:44 -0000	1.3
@@ -1 +1 @@
-Thunar-0.4.0rc1.tar.bz2
+Thunar-0.5.0rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:43:27 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:43:27 -0700
Subject: rpms/Terminal/devel Terminal.spec, 1.13, 1.14 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200611110743.kAB7hRXn004369@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346

Modified Files:
	Terminal.spec sources .cvsignore 
Log Message:
Update to 0.2.5.8rc2



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Terminal.spec	6 Oct 2006 02:50:50 -0000	1.13
+++ Terminal.spec	11 Nov 2006 07:42:56 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.2.5.6
-Release: 0.3.rc1%{?dist}
+Version: 0.2.5.8
+Release: 0.1.rc2%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Terminal-0.2.5.6rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Terminal-0.2.5.8rc2.tar.bz2
 Group: User Interface/X
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel
@@ -18,7 +18,7 @@
 it unique among X terminal emulators. 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %build
 %configure
@@ -60,6 +60,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.2.5.8-0.1.rc2
+- Update to 0.2.5.8rc2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.2.5.6-0.4.rc1
 - Added gtk-update-icon-cache to post/postun
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 22:22:52 -0000	1.4
+++ sources	11 Nov 2006 07:42:56 -0000	1.5
@@ -1 +1 @@
-4aa04a71f3dd2d132ed3d10f174171ca  Terminal-0.2.5.6rc1.tar.bz2
+d2785c1b11c48ed012042faa708bbf94  Terminal-0.2.5.8rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 22:22:52 -0000	1.4
+++ .cvsignore	11 Nov 2006 07:42:56 -0000	1.5
@@ -1 +1 @@
-Terminal-0.2.5.6rc1.tar.bz2
+Terminal-0.2.5.8rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:45:07 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:45:07 -0700
Subject: rpms/xfce4-appfinder/devel xfce4-appfinder.spec, 1.10, 1.11 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110745.kAB7j71F004455@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4425

Modified Files:
	xfce4-appfinder.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/xfce4-appfinder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-appfinder.spec	6 Oct 2006 05:57:08 -0000	1.10
+++ xfce4-appfinder.spec	11 Nov 2006 07:44:37 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-appfinder-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -49,6 +49,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Add period to description
 - Fix defattr


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:34:54 -0000	1.5
+++ sources	11 Nov 2006 07:44:37 -0000	1.6
@@ -1 +1 @@
-576b6af7ed7223cbdbccf7df509b8c9f  xfce4-appfinder-4.3.99.1.tar.bz2
+a4636f51d79eb68ba65098336d120d56  xfce4-appfinder-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:34:54 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:44:37 -0000	1.6
@@ -1 +1 @@
-xfce4-appfinder-4.3.99.1.tar.bz2
+xfce4-appfinder-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:47:48 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:47:48 -0700
Subject: rpms/xfce4-icon-theme/devel xfce4-icon-theme.spec, 1.11,
	1.12 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110747.kAB7lmuc004534@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4511

Modified Files:
	xfce4-icon-theme.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/xfce4-icon-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-icon-theme.spec	6 Oct 2006 05:59:03 -0000	1.11
+++ xfce4-icon-theme.spec	11 Nov 2006 07:47:18 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-icon-theme-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -37,6 +37,9 @@
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:38:12 -0000	1.5
+++ sources	11 Nov 2006 07:47:18 -0000	1.6
@@ -1 +1 @@
-ccdcd6aa7e03732347d785a826c81f84  xfce4-icon-theme-4.3.99.1.tar.bz2
+e8ad35bc50a84f620848f841d5167fb9  xfce4-icon-theme-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:38:12 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:47:18 -0000	1.6
@@ -1 +1 @@
-xfce4-icon-theme-4.3.99.1.tar.bz2
+xfce4-icon-theme-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:49:21 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:49:21 -0700
Subject: rpms/xfce4-mixer/devel xfce4-mixer.spec, 1.11, 1.12 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110749.kAB7nLww004617@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4590

Modified Files:
	xfce4-mixer.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/xfce4-mixer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-mixer.spec	6 Oct 2006 06:04:58 -0000	1.11
+++ xfce4-mixer.spec	11 Nov 2006 07:48:51 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-mixer-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.3.99.1
@@ -56,6 +56,9 @@
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - Add period to the end of description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:44:00 -0000	1.5
+++ sources	11 Nov 2006 07:48:51 -0000	1.6
@@ -1 +1 @@
-5836282f9795d10b65d41564a923f677  xfce4-mixer-4.3.99.1.tar.bz2
+9648fc403f9eb4baede230644bf5638d  xfce4-mixer-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:44:00 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:48:51 -0000	1.6
@@ -1 +1 @@
-xfce4-mixer-4.3.99.1.tar.bz2
+xfce4-mixer-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:51:19 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:51:19 -0700
Subject: rpms/xfce4-session/devel xfce4-session.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110751.kAB7pJRt004695@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4675

Modified Files:
	xfce4-session.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-session.spec	6 Oct 2006 06:06:11 -0000	1.12
+++ xfce4-session.spec	11 Nov 2006 07:50:49 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.3.99.1
-Release: 6%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-session-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-session-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= 4.3.99.1
@@ -113,6 +113,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-6
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:53:42 -0000	1.5
+++ sources	11 Nov 2006 07:50:49 -0000	1.6
@@ -1 +1 @@
-98c20381becc6fa84fae40be888b2ac7  xfce4-session-4.3.99.1.tar.bz2
+c2a4a306de2538a4425349587dccb7d9  xfce4-session-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:53:42 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:50:49 -0000	1.6
@@ -1 +1 @@
-xfce4-session-4.3.99.1.tar.bz2
+xfce4-session-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:52:57 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:52:57 -0700
Subject: rpms/xfce-mcs-plugins/devel xfce-mcs-plugins.spec, 1.11,
	1.12 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110752.kAB7qv6q004778@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4756

Modified Files:
	xfce-mcs-plugins.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce-mcs-plugins.spec	6 Oct 2006 06:08:38 -0000	1.11
+++ xfce-mcs-plugins.spec	11 Nov 2006 07:52:27 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2
 Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -54,6 +54,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:56:40 -0000	1.5
+++ sources	11 Nov 2006 07:52:27 -0000	1.6
@@ -1 +1 @@
-98b0b149110056b93587c66852fc3194  xfce-mcs-plugins-4.3.99.1.tar.bz2
+6234425227e1145319bd75ef52fa97f5  xfce-mcs-plugins-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:56:40 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:52:27 -0000	1.6
@@ -1 +1 @@
-xfce-mcs-plugins-4.3.99.1.tar.bz2
+xfce-mcs-plugins-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:54:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:54:32 -0700
Subject: rpms/xfce-utils/devel xfce-utils.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110754.kAB7sW8k004867@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4842

Modified Files:
	xfce-utils.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/xfce-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce-utils.spec	6 Oct 2006 06:16:57 -0000	1.12
+++ xfce-utils.spec	11 Nov 2006 07:54:01 -0000	1.13
@@ -2,11 +2,11 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-utils-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2
 Source1: xfce4.desktop
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -81,6 +81,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-5
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:00:52 -0000	1.5
+++ sources	11 Nov 2006 07:54:01 -0000	1.6
@@ -1 +1 @@
-95448f642ee52cdb5ec20dc3c28dcc3b  xfce-utils-4.3.99.1.tar.bz2
+de6502dd93176b2a60e2e66bf052024f  xfce-utils-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:00:52 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:54:01 -0000	1.6
@@ -1 +1 @@
-xfce-utils-4.3.99.1.tar.bz2
+xfce-utils-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:56:29 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:56:29 -0700
Subject: rpms/xfdesktop/devel xfdesktop.spec, 1.14, 1.15 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110756.kAB7uTUr004945@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4925

Modified Files:
	xfdesktop.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfdesktop.spec	6 Oct 2006 06:20:34 -0000	1.14
+++ xfdesktop.spec	11 Nov 2006 07:55:59 -0000	1.15
@@ -1,10 +1,10 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfdesktop-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2
 
 # Change default for Fedora
 Patch0: xfdesktop-image-4.3.90.1.patch
@@ -81,6 +81,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-5
 - Fix defattr
 - Add period to the end of description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:04:46 -0000	1.5
+++ sources	11 Nov 2006 07:55:59 -0000	1.6
@@ -1 +1 @@
-ad4dc2ceeafe10ff69196e287f07090a  xfdesktop-4.3.99.1.tar.bz2
+d44a81b9da9598425d9dd8dcd1cd5485  xfdesktop-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:04:46 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:55:59 -0000	1.6
@@ -1 +1 @@
-xfdesktop-4.3.99.1.tar.bz2
+xfdesktop-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 07:58:41 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 00:58:41 -0700
Subject: rpms/xfprint/devel xfprint.spec, 1.15, 1.16 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110758.kAB7wffO005021@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5001

Modified Files:
	xfprint.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2 



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/xfprint.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfprint.spec	6 Oct 2006 06:31:05 -0000	1.15
+++ xfprint.spec	11 Nov 2006 07:58:11 -0000	1.16
@@ -1,10 +1,10 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD
 URL: http://www.xfce.org
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfprint-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfprint-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -56,13 +56,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -75,7 +75,7 @@
 %{_datadir}/applications/*
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/icons/hicolor/*/*/*
+#%{_datadir}/icons/hicolor/*/*/*
 
 %files devel
 %defattr(-, root, root)
@@ -84,6 +84,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+- Disable icons for now since they were not included in 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:07:51 -0000	1.5
+++ sources	11 Nov 2006 07:58:11 -0000	1.6
@@ -1 +1 @@
-13657288cd3ffaaa8d3701bcb3d7740a  xfprint-4.3.99.1.tar.bz2
+c2eb9dee0002e875b91e73557f7354a1  xfprint-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:07:51 -0000	1.5
+++ .cvsignore	11 Nov 2006 07:58:11 -0000	1.6
@@ -1 +1 @@
-xfprint-4.3.99.1.tar.bz2
+xfprint-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:00:28 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:00:28 -0700
Subject: rpms/xfwm4/devel xfwm4.spec, 1.16, 1.17 sources, 1.6, 1.7 .cvsignore,
	1.6, 1.7
Message-ID: <200611110800.kAB80S2R005118@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5081

Modified Files:
	xfwm4.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/xfwm4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfwm4.spec	6 Oct 2006 06:33:27 -0000	1.16
+++ xfwm4.spec	11 Nov 2006 07:59:57 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-6
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 03:11:10 -0000	1.6
+++ sources	11 Nov 2006 07:59:57 -0000	1.7
@@ -1 +1 @@
-ab8fcfdf496f093bbe711a7d853deb33  xfwm4-4.3.99.1.tar.bz2
+3186d90ae752cce9687698c8bd6b26c3  xfwm4-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 03:11:10 -0000	1.6
+++ .cvsignore	11 Nov 2006 07:59:57 -0000	1.7
@@ -1 +1 @@
-xfwm4-4.3.99.1.tar.bz2
+xfwm4-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:02:36 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:02:36 -0700
Subject: rpms/xfwm4-themes/devel xfwm4-themes.spec, 1.10, 1.11 sources, 1.5, 
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611110802.kAB82arB008145@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8122

Modified Files:
	xfwm4-themes.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/xfwm4-themes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfwm4-themes.spec	6 Oct 2006 06:35:01 -0000	1.10
+++ xfwm4-themes.spec	11 Nov 2006 08:01:57 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-themes-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfwm4
@@ -35,6 +35,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:13:39 -0000	1.5
+++ sources	11 Nov 2006 08:02:04 -0000	1.6
@@ -1 +1 @@
-48f6171c4eed813770e211ccfad8aeaf  xfwm4-themes-4.3.99.1.tar.bz2
+a77e9e700de66d38b6c4850a18283fb1  xfwm4-themes-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:13:39 -0000	1.5
+++ .cvsignore	11 Nov 2006 08:02:04 -0000	1.6
@@ -1 +1 @@
-xfwm4-themes-4.3.99.1.tar.bz2
+xfwm4-themes-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:04:46 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:04:46 -0700
Subject: rpms/orage/devel orage.spec, 1.4, 1.5 sources, 1.2, 1.3 .cvsignore, 
	1.2, 1.3
Message-ID: <200611110804.kAB84kjp008236@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8211

Modified Files:
	orage.spec sources .cvsignore 
Log Message:
Update 4.3.99.2



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/orage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- orage.spec	15 Oct 2006 18:11:32 -0000	1.4
+++ orage.spec	11 Nov 2006 08:04:16 -0000	1.5
@@ -1,10 +1,10 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.3.99.1
-Release: 6%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/orage-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xfce-mcs-manager-devel
@@ -69,6 +69,9 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update 4.3.99.2
+
 * Sun Oct 15 2006 Kevin Fenzi  - 4.3.99.1-6
 - xfce4-datetime-plugin is back, remove obsoletes and provides
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 03:32:29 -0000	1.2
+++ sources	11 Nov 2006 08:04:16 -0000	1.3
@@ -1 +1 @@
-511dce3a93aa6e34973989e4441f23ec  orage-4.3.99.1.tar.bz2
+40607e4b116c4d298745ef0672826cd8  orage-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orage/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 03:32:29 -0000	1.2
+++ .cvsignore	11 Nov 2006 08:04:16 -0000	1.3
@@ -1 +1 @@
-orage-4.3.99.1.tar.bz2
+orage-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:06:38 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:06:38 -0700
Subject: rpms/mousepad/devel mousepad.spec, 1.3, 1.4 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200611110806.kAB86coT008332@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mousepad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8309

Modified Files:
	mousepad.spec sources .cvsignore 
Log Message:
Update to 0.2.10



Index: mousepad.spec
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/mousepad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mousepad.spec	6 Oct 2006 03:00:43 -0000	1.3
+++ mousepad.spec	11 Nov 2006 08:06:07 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           mousepad
-Version:        0.2.8
-Release:        2%{?dist}
+Version:        0.2.10
+Release:        1%{?dist}
 Summary:        Mousepad - A simple text editor for Xfce
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-4.3.90.2/src/mousepad-0.2.8.tar.bz2
+Source0:        http://www.xfce.org/archive/xfce-4.3.99.2/src/mousepad-0.2.10.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxfcegui4-devel
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/* 
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.2.10-1
+- Update to 0.2.10
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.2.8-2
 - Fix typo in description 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 03:16:03 -0000	1.3
+++ sources	11 Nov 2006 08:06:07 -0000	1.4
@@ -1 +1 @@
-ad40c3b610123b7347094464a603e337  mousepad-0.2.8.tar.bz2
+c943c9408cbb35be73c45f75d945b34d  mousepad-0.2.10.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousepad/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 03:16:03 -0000	1.3
+++ .cvsignore	11 Nov 2006 08:06:07 -0000	1.4
@@ -1 +1 @@
-mousepad-0.2.8.tar.bz2
+mousepad-0.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 08:42:59 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 11 Nov 2006 01:42:59 -0700
Subject: rpms/synce/FC-6 synce.spec,1.23,1.24
Message-ID: <200611110843.kAB8gx9M008622@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8592/FC-6

Modified Files:
	synce.spec 
Log Message:
- fix udev script (#215129, #208517)



Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/FC-6/synce.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- synce.spec	15 Sep 2006 13:20:59 -0000	1.23
+++ synce.spec	11 Nov 2006 08:42:29 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           synce
 Version:        0.9.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Serial connection support for Pocket PC devices
 
 Group:          Applications/Communications
@@ -122,7 +122,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/
 ln -s ../../udev/scripts/synce.dev $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/synce.dev
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-echo 'DRIVER="ipaq", NAME="ipaq", SYMLINK="ttyUSB%%n"' > \
+echo 'DRIVER=="ipaq", NAME="ipaq", SYMLINK+="ttyUSB%%n"' > \
     $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/50-ipaq.rules
 cp %{SOURCE7} README.Fedora
 
@@ -195,6 +195,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sat Nov 11 2006 Andreas Bierfert 
+0.9.1-9
+- fix udev script (#215129, #208517)
+
 * Fri Sep 15 2006 Andreas Bierfert 
 0.9.1-8
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Sat Nov 11 08:43:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 11 Nov 2006 01:43:00 -0700
Subject: rpms/synce/devel synce.spec,1.23,1.24
Message-ID: <200611110843.kAB8h0MC008625@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8592/devel

Modified Files:
	synce.spec 
Log Message:
- fix udev script (#215129, #208517)



Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/devel/synce.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- synce.spec	15 Sep 2006 13:20:59 -0000	1.23
+++ synce.spec	11 Nov 2006 08:42:30 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           synce
 Version:        0.9.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Serial connection support for Pocket PC devices
 
 Group:          Applications/Communications
@@ -122,7 +122,7 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/
 ln -s ../../udev/scripts/synce.dev $RPM_BUILD_ROOT/%{_sysconfdir}/dev.d/ipaq/synce.dev
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
-echo 'DRIVER="ipaq", NAME="ipaq", SYMLINK="ttyUSB%%n"' > \
+echo 'DRIVER=="ipaq", NAME="ipaq", SYMLINK+="ttyUSB%%n"' > \
     $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/50-ipaq.rules
 cp %{SOURCE7} README.Fedora
 
@@ -195,6 +195,10 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Sat Nov 11 2006 Andreas Bierfert 
+0.9.1-9
+- fix udev script (#215129, #208517)
+
 * Fri Sep 15 2006 Andreas Bierfert 
 0.9.1-8
 - FE6 rebuild



From fedora-extras-commits at redhat.com  Sat Nov 11 08:57:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 01:57:34 -0700
Subject: rpms/p0f/devel p0f.spec, 1.11, 1.12 sources, 1.5, 1.6 .cvsignore,
	1.5, 1.6
Message-ID: <200611110857.kAB8vYxO008755@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/p0f/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8735

Modified Files:
	p0f.spec sources .cvsignore 
Log Message:
Update to 2.0.8



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- p0f.spec	28 Aug 2006 04:30:47 -0000	1.11
+++ p0f.spec	11 Nov 2006 08:57:04 -0000	1.12
@@ -1,12 +1,12 @@
 Name: p0f
-Version: 2.0.7
-Release: 2%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
 
 Summary: Versatile passive OS fingerprinting tool
 Group: Applications/Internet
 License: GPL
 URL: http://lcamtuf.coredump.cx/p0f.shtml
-Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.7.tgz
+Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.8.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap-devel
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Kevin Fenzi  - 2.0.8-1
+- Update to 2.0.8
+
 * Sun Aug 27 2006 Kevin Fenzi  - 2.0.7-2
 - Rebuild for fc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2006 03:50:37 -0000	1.5
+++ sources	11 Nov 2006 08:57:04 -0000	1.6
@@ -1 +1 @@
-55c222cfb72a0e323e11e9744bbb6ff9  p0f-2.0.7.tgz
+1ccbcd8d4c95ef6dae841120d23c56a5  p0f-2.0.8.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2006 03:50:37 -0000	1.5
+++ .cvsignore	11 Nov 2006 08:57:04 -0000	1.6
@@ -1 +1 @@
-p0f-2.0.7.tgz
+p0f-2.0.8.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 09:06:07 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 02:06:07 -0700
Subject: rpms/p0f/FC-6 p0f.spec, 1.11, 1.12 sources, 1.5, 1.6 .cvsignore, 1.5,
	1.6
Message-ID: <200611110906.kAB967Z8011806@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/p0f/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11783

Modified Files:
	p0f.spec sources .cvsignore 
Log Message:
Update to 2.0.8



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-6/p0f.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- p0f.spec	28 Aug 2006 04:30:47 -0000	1.11
+++ p0f.spec	11 Nov 2006 09:05:36 -0000	1.12
@@ -1,12 +1,12 @@
 Name: p0f
-Version: 2.0.7
-Release: 2%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
 
 Summary: Versatile passive OS fingerprinting tool
 Group: Applications/Internet
 License: GPL
 URL: http://lcamtuf.coredump.cx/p0f.shtml
-Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.7.tgz
+Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.8.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libpcap-devel
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Kevin Fenzi  - 2.0.8-1
+- Update to 2.0.8
+
 * Sun Aug 27 2006 Kevin Fenzi  - 2.0.7-2
 - Rebuild for fc6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2006 03:50:37 -0000	1.5
+++ sources	11 Nov 2006 09:05:36 -0000	1.6
@@ -1 +1 @@
-55c222cfb72a0e323e11e9744bbb6ff9  p0f-2.0.7.tgz
+1ccbcd8d4c95ef6dae841120d23c56a5  p0f-2.0.8.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2006 03:50:37 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:05:36 -0000	1.6
@@ -1 +1 @@
-p0f-2.0.7.tgz
+p0f-2.0.8.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 09:09:41 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 02:09:41 -0700
Subject: rpms/p0f/FC-5 p0f.spec,1.9,1.10 sources,1.5,1.6 .cvsignore,1.5,1.6
Message-ID: <200611110909.kAB99fsE011964@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/p0f/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942

Modified Files:
	p0f.spec sources .cvsignore 
Log Message:
Upgrade to 2.0.8



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-5/p0f.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- p0f.spec	24 Aug 2006 03:54:20 -0000	1.9
+++ p0f.spec	11 Nov 2006 09:09:10 -0000	1.10
@@ -1,5 +1,5 @@
 Name: p0f
-Version: 2.0.7
+Version: 2.0.8
 Release: 1%{?dist}
 
 Summary: Versatile passive OS fingerprinting tool
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Kevin Fenzi  - 2.0.8-1
+- Upgrade to 2.0.8
+
 * Wed Aug 23 2006 Kevin Fenzi  - 2.0.7-1
 - Upgrade to 2.0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Aug 2006 03:54:20 -0000	1.5
+++ sources	11 Nov 2006 09:09:10 -0000	1.6
@@ -1 +1 @@
-55c222cfb72a0e323e11e9744bbb6ff9  p0f-2.0.7.tgz
+1ccbcd8d4c95ef6dae841120d23c56a5  p0f-2.0.8.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p0f/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Aug 2006 03:54:20 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:09:10 -0000	1.6
@@ -1 +1 @@
-p0f-2.0.7.tgz
+p0f-2.0.8.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 09:27:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:27:44 -0700
Subject: rpms/em8300-kmod/FC-5 .cvsignore, 1.3, 1.4 em8300-kmod.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200611110927.kAB9RiMk012583@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-serv12563

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
- 0.16.0-rc2, build for kernel 2.6.18-1.2239.fc5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2006 18:17:12 -0000	1.3
+++ .cvsignore	11 Nov 2006 09:27:14 -0000	1.4
@@ -1 +1 @@
-em8300-nofirmware-0.16.0-rc1.tar.bz2
+em8300-nofirmware-0.16.0-rc2.tar.bz2


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- em8300-kmod.spec	16 Oct 2006 16:03:07 -0000	1.6
+++ em8300-kmod.spec	11 Nov 2006 09:27:14 -0000	1.7
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2200.fc5}
+%{!?kversion: %define kversion 2.6.18-1.2239.fc5}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -22,15 +22,15 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.0.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.0.rc2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
 #Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
-# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc2.tar.gz
 # with modules/em8300.uc removed
-Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
+Source0:        %{kmod_name}-nofirmware-%{version}-rc2.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,13 +44,13 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc1
+cd %{kmod_name}-%{version}-rc2
 %patch0 -p0
 %patch1 -p0
-sed -i -e 's|||' modules/*.[hc]
+sed -i -e '//d' modules/em8300_main.c
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
 done
 
 
@@ -67,8 +67,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
+    cd _kmod_build_$kvariant/modules && \
+    make install DESTDIR=$RPM_BUILD_ROOT \
+        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+    cd ../..
 done
 
 
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+- 0.16.0-rc2, build for kernel 2.6.18-1.2239.fc5.
+
 * Mon Oct 16 2006 Ville Skytt??  - 0.16.0-0.0.rc1
 - Build for kernel 2.6.18-1.2200.fc5.
 - Don't use .


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2006 18:17:12 -0000	1.3
+++ sources	11 Nov 2006 09:27:14 -0000	1.4
@@ -1 +1 @@
-969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b442b787026a262cdc3f74486302f43f  em8300-nofirmware-0.16.0-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:31:34 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:31:34 -0700
Subject: rpms/codeblocks/devel .cvsignore, 1.5, 1.6 codeblocks-plugins.patch,
	1.2, 1.3 codeblocks.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200611110931.kAB9VY0H012694@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12642

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3202
- fixed plugin loading on 64-bit platforms



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 09:58:48 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:31:04 -0000	1.6
@@ -1 +1 @@
-codeblocks-svn3170.tar.bz2
+codeblocks-svn3202.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-plugins.patch	8 Oct 2006 09:16:19 -0000	1.2
+++ codeblocks-plugins.patch	11 Nov 2006 09:31:04 -0000	1.3
@@ -1,14 +1,11 @@
-diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
---- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
-+++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200
-@@ -448,9 +448,7 @@
+--- src/sdk/configmanager.cpp.orig	2006-11-08 14:53:00.000000000 +0100
++++ src/sdk/configmanager.cpp	2006-11-08 17:48:05.000000000 +0100
+@@ -389,7 +389,7 @@
+             return ::wxGetCwd();
  
          case sdPluginsGlobal:
-         {
--            wxString p = ConfigManager::data_path_global + _T("/plugins");
--            if(!wxDirExists(p + wxFILE_SEP_PATH))
--                CreateDirRecursively(p + wxFILE_SEP_PATH);
-+            wxString p = _T("/usr/lib/codeblocks/plugins/");
-             return p;
-         }
+-            return ConfigManager::data_path_global + _T("/plugins");
++            return _T("@libdir@/codeblocks/plugins");
  
+         case sdPluginsUser:
+             return ConfigManager::data_path_user   + _T("/plugins");


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeblocks.spec	3 Nov 2006 09:58:48 -0000	1.4
+++ codeblocks.spec	11 Nov 2006 09:31:04 -0000	1.5
@@ -1,9 +1,9 @@
-%define		rev	3170
-%define		date	20061102
+%define		rev	3202
+%define		date	20061110
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.12.%{date}svn%{rev}%{?dist}
+Release:	0.13.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -53,7 +53,7 @@
 %prep
 
 %setup -q -n codeblocks
-%patch1 -p1
+%patch1
 %patch2 -p1
 %patch3
 
@@ -72,6 +72,9 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
 
+sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
+
+# generate revision.m4
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -225,7 +228,11 @@
 
 
 %changelog
-* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+* Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
+- update to revision 3202
+- fixed plugin loading on 64-bit platforms
+
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061102svn3170
 - update to revision 3170
 
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 09:58:48 -0000	1.5
+++ sources	11 Nov 2006 09:31:04 -0000	1.6
@@ -1 +1 @@
-bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2
+ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:33:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:33:08 -0700
Subject: rpms/em8300-kmod/FC-6 .cvsignore, 1.3, 1.4 em8300-kmod.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200611110933.kAB9X8Y0012784@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-serv12742/FC-6

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
- 0.16.0-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2006 20:18:24 -0000	1.3
+++ .cvsignore	11 Nov 2006 09:32:38 -0000	1.4
@@ -1 +1 @@
-em8300-nofirmware-0.16.0-rc1.tar.bz2
+em8300-nofirmware-0.16.0-rc2.tar.bz2


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- em8300-kmod.spec	17 Oct 2006 19:08:18 -0000	1.9
+++ em8300-kmod.spec	11 Nov 2006 09:32:38 -0000	1.10
@@ -27,15 +27,15 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.3.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.3.rc2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
 #Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
-# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc2.tar.gz
 # with modules/em8300.uc removed
-Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
+Source0:        %{kmod_name}-nofirmware-%{version}-rc2.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,13 +49,13 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc1
+cd %{kmod_name}-%{version}-rc2
 %patch0 -p0
 %patch1 -p0
-sed -i -e 's|||' modules/*.[hc]
+sed -i -e '//d' modules/em8300_main.c
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
 done
 
 
@@ -72,8 +72,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
+    cd _kmod_build_$kvariant/modules && \
+    make install DESTDIR=$RPM_BUILD_ROOT \
+        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+    cd ../..
 done
 
 
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+- 0.16.0-rc2.
+
 * Tue Oct 17 2006 Ville Skytt?? 
 - Rebuild for kernel 2.6.18-1.2798.fc6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2006 20:18:24 -0000	1.3
+++ sources	11 Nov 2006 09:32:38 -0000	1.4
@@ -1 +1 @@
-969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b442b787026a262cdc3f74486302f43f  em8300-nofirmware-0.16.0-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:33:09 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:33:09 -0700
Subject: rpms/em8300-kmod/devel .cvsignore, 1.3, 1.4 em8300-kmod.spec, 1.9, 
	1.10 sources, 1.3, 1.4
Message-ID: <200611110933.kAB9X9qf012789@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12742/devel

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
- 0.16.0-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2006 20:18:24 -0000	1.3
+++ .cvsignore	11 Nov 2006 09:32:39 -0000	1.4
@@ -1 +1 @@
-em8300-nofirmware-0.16.0-rc1.tar.bz2
+em8300-nofirmware-0.16.0-rc2.tar.bz2


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- em8300-kmod.spec	17 Oct 2006 19:08:18 -0000	1.9
+++ em8300-kmod.spec	11 Nov 2006 09:32:39 -0000	1.10
@@ -27,15 +27,15 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.3.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.3.rc2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
 #Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
-# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc2.tar.gz
 # with modules/em8300.uc removed
-Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
+Source0:        %{kmod_name}-nofirmware-%{version}-rc2.tar.bz2
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,13 +49,13 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc1
+cd %{kmod_name}-%{version}-rc2
 %patch0 -p0
 %patch1 -p0
-sed -i -e 's|||' modules/*.[hc]
+sed -i -e '//d' modules/em8300_main.c
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
 done
 
 
@@ -72,8 +72,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
+    cd _kmod_build_$kvariant/modules && \
+    make install DESTDIR=$RPM_BUILD_ROOT \
+        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+    cd ../..
 done
 
 
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+- 0.16.0-rc2.
+
 * Tue Oct 17 2006 Ville Skytt?? 
 - Rebuild for kernel 2.6.18-1.2798.fc6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2006 20:18:24 -0000	1.3
+++ sources	11 Nov 2006 09:32:39 -0000	1.4
@@ -1 +1 @@
-969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b442b787026a262cdc3f74486302f43f  em8300-nofirmware-0.16.0-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:35:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:35:27 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.10,1.11
Message-ID: <200611110935.kAB9ZRSO012884@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12851/devel

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix release in changelog.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- em8300-kmod.spec	11 Nov 2006 09:32:39 -0000	1.10
+++ em8300-kmod.spec	11 Nov 2006 09:34:56 -0000	1.11
@@ -84,7 +84,7 @@
 
 
 %changelog
-* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.3.rc2
 - 0.16.0-rc2.
 
 * Tue Oct 17 2006 Ville Skytt?? 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:35:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:35:26 -0700
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.10,1.11
Message-ID: <200611110935.kAB9ZQff012881@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-serv12851/FC-6

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix release in changelog.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- em8300-kmod.spec	11 Nov 2006 09:32:38 -0000	1.10
+++ em8300-kmod.spec	11 Nov 2006 09:34:56 -0000	1.11
@@ -84,7 +84,7 @@
 
 
 %changelog
-* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.0.rc2
+* Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.3.rc2
 - 0.16.0-rc2.
 
 * Tue Oct 17 2006 Ville Skytt?? 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:37:35 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:37:35 -0700
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.5, 1.6 codeblocks-plugins.patch, 
	1.2, 1.3 codeblocks.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200611110937.kAB9bZbk012926@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12901

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3202
- fixed plugin loading on 64-bit platforms



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 10:02:48 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:37:05 -0000	1.6
@@ -1 +1 @@
-codeblocks-svn3170.tar.bz2
+codeblocks-svn3202.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-plugins.patch	8 Oct 2006 09:16:19 -0000	1.2
+++ codeblocks-plugins.patch	11 Nov 2006 09:37:05 -0000	1.3
@@ -1,14 +1,11 @@
-diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
---- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
-+++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200
-@@ -448,9 +448,7 @@
+--- src/sdk/configmanager.cpp.orig	2006-11-08 14:53:00.000000000 +0100
++++ src/sdk/configmanager.cpp	2006-11-08 17:48:05.000000000 +0100
+@@ -389,7 +389,7 @@
+             return ::wxGetCwd();
  
          case sdPluginsGlobal:
-         {
--            wxString p = ConfigManager::data_path_global + _T("/plugins");
--            if(!wxDirExists(p + wxFILE_SEP_PATH))
--                CreateDirRecursively(p + wxFILE_SEP_PATH);
-+            wxString p = _T("/usr/lib/codeblocks/plugins/");
-             return p;
-         }
+-            return ConfigManager::data_path_global + _T("/plugins");
++            return _T("@libdir@/codeblocks/plugins");
  
+         case sdPluginsUser:
+             return ConfigManager::data_path_user   + _T("/plugins");


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeblocks.spec	3 Nov 2006 10:02:48 -0000	1.4
+++ codeblocks.spec	11 Nov 2006 09:37:05 -0000	1.5
@@ -1,9 +1,9 @@
-%define		rev	3170
-%define		date	20061102
+%define		rev	3202
+%define		date	20061110
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.12.%{date}svn%{rev}%{?dist}
+Release:	0.13.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -53,7 +53,7 @@
 %prep
 
 %setup -q -n codeblocks
-%patch1 -p1
+%patch1
 %patch2 -p1
 %patch3
 
@@ -72,6 +72,9 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
 
+sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
+
+# generate revision.m4
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -225,7 +228,11 @@
 
 
 %changelog
-* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+* Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
+- update to revision 3202
+- fixed plugin loading on 64-bit platforms
+
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061102svn3170
 - update to revision 3170
 
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 10:02:48 -0000	1.5
+++ sources	11 Nov 2006 09:37:05 -0000	1.6
@@ -1 +1 @@
-bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2
+ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:40:26 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:40:26 -0700
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.5, 1.6 codeblocks-plugins.patch, 
	1.2, 1.3 codeblocks.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200611110940.kAB9eQwx013013@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12983

Modified Files:
	.cvsignore codeblocks-plugins.patch codeblocks.spec sources 
Log Message:
- update to revision 3202
- fixed plugin loading on 64-bit platforms



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 10:06:23 -0000	1.5
+++ .cvsignore	11 Nov 2006 09:39:56 -0000	1.6
@@ -1 +1 @@
-codeblocks-svn3170.tar.bz2
+codeblocks-svn3202.tar.bz2

codeblocks-plugins.patch:

Index: codeblocks-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeblocks-plugins.patch	8 Oct 2006 09:18:38 -0000	1.2
+++ codeblocks-plugins.patch	11 Nov 2006 09:39:56 -0000	1.3
@@ -1,14 +1,11 @@
-diff -Nru --exclude .svn codeblocks/src/sdk/configmanager.cpp codeblocks-devel/src/sdk/configmanager.cpp
---- codeblocks/src/sdk/configmanager.cpp	2006-07-08 08:56:20.000000000 +0200
-+++ codeblocks-devel/src/sdk/configmanager.cpp	2006-07-23 12:10:01.000000000 +0200
-@@ -448,9 +448,7 @@
+--- src/sdk/configmanager.cpp.orig	2006-11-08 14:53:00.000000000 +0100
++++ src/sdk/configmanager.cpp	2006-11-08 17:48:05.000000000 +0100
+@@ -389,7 +389,7 @@
+             return ::wxGetCwd();
  
          case sdPluginsGlobal:
-         {
--            wxString p = ConfigManager::data_path_global + _T("/plugins");
--            if(!wxDirExists(p + wxFILE_SEP_PATH))
--                CreateDirRecursively(p + wxFILE_SEP_PATH);
-+            wxString p = _T("/usr/lib/codeblocks/plugins/");
-             return p;
-         }
+-            return ConfigManager::data_path_global + _T("/plugins");
++            return _T("@libdir@/codeblocks/plugins");
  
+         case sdPluginsUser:
+             return ConfigManager::data_path_user   + _T("/plugins");


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- codeblocks.spec	3 Nov 2006 10:06:23 -0000	1.4
+++ codeblocks.spec	11 Nov 2006 09:39:56 -0000	1.5
@@ -1,9 +1,9 @@
-%define		rev	3170
-%define		date	20061102
+%define		rev	3202
+%define		date	20061110
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.12.%{date}svn%{rev}%{?dist}
+Release:	0.13.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -53,7 +53,7 @@
 %prep
 
 %setup -q -n codeblocks
-%patch1 -p1
+%patch1
 %patch2 -p1
 %patch3
 
@@ -72,6 +72,9 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
 
+sed -i 's|@libdir@|%{_libdir}|' src/sdk/configmanager.cpp
+
+# generate revision.m4
 echo "m4_define([SVN_REVISION], trunk-r%{rev})" > revision.m4
 
 ./bootstrap
@@ -225,7 +228,11 @@
 
 
 %changelog
-* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061029svn3170
+* Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
+- update to revision 3202
+- fixed plugin loading on 64-bit platforms
+
+* Fri Nov  3 2006 Dan Horak  1.0-0.12.20061102svn3170
 - update to revision 3170
 
 * Mon Oct 30 2006 Dan Horak  1.0-0.11.20061029svn3157


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 10:06:23 -0000	1.5
+++ sources	11 Nov 2006 09:39:56 -0000	1.6
@@ -1 +1 @@
-bfcda3308b08a096edbc4c0328e98c4b  codeblocks-svn3170.tar.bz2
+ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:47:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:47:05 -0700
Subject: rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.7,1.8
Message-ID: <200611110947.kAB9l5KO013123@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-serv13079/FC-5

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix build when installed kernel is not the target one.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- em8300-kmod.spec	11 Nov 2006 09:27:14 -0000	1.7
+++ em8300-kmod.spec	11 Nov 2006 09:46:35 -0000	1.8
@@ -67,9 +67,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
+    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
     make install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+        KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
     cd ../..
 done
 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:47:06 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:47:06 -0700
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.11,1.12
Message-ID: <200611110947.kAB9l6Qi013126@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-serv13079/FC-6

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix build when installed kernel is not the target one.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- em8300-kmod.spec	11 Nov 2006 09:34:56 -0000	1.11
+++ em8300-kmod.spec	11 Nov 2006 09:46:36 -0000	1.12
@@ -72,9 +72,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
+    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
     make install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+        KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
     cd ../..
 done
 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:47:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 02:47:12 -0700
Subject: rpms/em8300-kmod/devel em8300-kmod.spec,1.11,1.12
Message-ID: <200611110947.kAB9lC1J013129@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13079/devel

Modified Files:
	em8300-kmod.spec 
Log Message:
Fix build when installed kernel is not the target one.


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- em8300-kmod.spec	11 Nov 2006 09:34:56 -0000	1.11
+++ em8300-kmod.spec	11 Nov 2006 09:46:41 -0000	1.12
@@ -72,9 +72,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
+    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
     make install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+        KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
     cd ../..
 done
 



From fedora-extras-commits at redhat.com  Sat Nov 11 09:52:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 11 Nov 2006 02:52:02 -0700
Subject: rpms/scribus/FC-6 .cvsignore, 1.12, 1.13 scribus.spec, 1.23,
	1.24 sources, 1.12, 1.13
Message-ID: <200611110952.kAB9q2iE013300@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/FC-6

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Oct 2006 17:02:30 -0000	1.12
+++ .cvsignore	11 Nov 2006 09:51:31 -0000	1.13
@@ -1 +1 @@
-scribus-1.3.3.4.tar.bz2
+scribus-1.3.3.5.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-6/scribus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scribus.spec	4 Oct 2006 17:02:30 -0000	1.23
+++ scribus.spec	11 Nov 2006 09:51:31 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           scribus
-Version:        1.3.3.4
+Version:        1.3.3.5
 Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
@@ -7,7 +7,7 @@
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://dl.sf.net/scribus/scribus-1.3.3.4.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.3.5.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +136,10 @@
 %{_includedir}/scribus/
 
 %changelog
+* Sat Nov 11 2006 Andreas Bierfert 
+1.3.3.5-1
+- version upgrade
+
 * Wed Oct 04 2006 Andreas Bierfert 
 1.3.3.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Oct 2006 17:02:30 -0000	1.12
+++ sources	11 Nov 2006 09:51:31 -0000	1.13
@@ -1 +1 @@
-ccd7fb34a77b7e3d83e902fb3f5b731b  scribus-1.3.3.4.tar.bz2
+db4c06fa2b6f758aab17555d5253a632  scribus-1.3.3.5.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:52:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 11 Nov 2006 02:52:03 -0700
Subject: rpms/scribus/devel .cvsignore, 1.12, 1.13 scribus.spec, 1.23,
	1.24 sources, 1.12, 1.13
Message-ID: <200611110952.kAB9q3Xm013306@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249/devel

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Oct 2006 17:02:30 -0000	1.12
+++ .cvsignore	11 Nov 2006 09:51:32 -0000	1.13
@@ -1 +1 @@
-scribus-1.3.3.4.tar.bz2
+scribus-1.3.3.5.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scribus.spec	4 Oct 2006 17:02:30 -0000	1.23
+++ scribus.spec	11 Nov 2006 09:51:32 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           scribus
-Version:        1.3.3.4
+Version:        1.3.3.5
 Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
@@ -7,7 +7,7 @@
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://dl.sf.net/scribus/scribus-1.3.3.4.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.3.5.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +136,10 @@
 %{_includedir}/scribus/
 
 %changelog
+* Sat Nov 11 2006 Andreas Bierfert 
+1.3.3.5-1
+- version upgrade
+
 * Wed Oct 04 2006 Andreas Bierfert 
 1.3.3.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Oct 2006 17:02:30 -0000	1.12
+++ sources	11 Nov 2006 09:51:32 -0000	1.13
@@ -1 +1 @@
-ccd7fb34a77b7e3d83e902fb3f5b731b  scribus-1.3.3.4.tar.bz2
+db4c06fa2b6f758aab17555d5253a632  scribus-1.3.3.5.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:54:24 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:54:24 -0700
Subject: rpms/qgit/devel .cvsignore, 1.9, 1.10 qgit.spec, 1.11, 1.12 sources,
	1.9, 1.10
Message-ID: <200611110954.kAB9sOre013418@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13398

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:17:24 -0000	1.9
+++ .cvsignore	11 Nov 2006 09:53:54 -0000	1.10
@@ -1 +1 @@
-qgit-1.5.2.tar.bz2
+qgit-1.5.3.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qgit.spec	30 Sep 2006 09:17:24 -0000	1.11
+++ qgit.spec	11 Nov 2006 09:53:54 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Dan Horak  1.5.3-1
+- update to upstream version 1.5.3
+
 * Sat Sep 30 2006 Dan Horak  1.5.2-1
 - update to upstream version 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:17:24 -0000	1.9
+++ sources	11 Nov 2006 09:53:54 -0000	1.10
@@ -1 +1 @@
-251568da2d93b0e621ea7a2cb7de611d  qgit-1.5.2.tar.bz2
+c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 09:57:44 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 02:57:44 -0700
Subject: rpms/qgit/FC-6 .cvsignore, 1.9, 1.10 qgit.spec, 1.11, 1.12 sources, 
	1.9, 1.10
Message-ID: <200611110957.kAB9viJ3013496@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13476

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:17:24 -0000	1.9
+++ .cvsignore	11 Nov 2006 09:57:13 -0000	1.10
@@ -1 +1 @@
-qgit-1.5.2.tar.bz2
+qgit-1.5.3.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/qgit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qgit.spec	30 Sep 2006 09:17:24 -0000	1.11
+++ qgit.spec	11 Nov 2006 09:57:13 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Dan Horak  1.5.3-1
+- update to upstream version 1.5.3
+
 * Sat Sep 30 2006 Dan Horak  1.5.2-1
 - update to upstream version 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:17:24 -0000	1.9
+++ sources	11 Nov 2006 09:57:13 -0000	1.10
@@ -1 +1 @@
-251568da2d93b0e621ea7a2cb7de611d  qgit-1.5.2.tar.bz2
+c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 10:00:36 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 03:00:36 -0700
Subject: rpms/qgit/FC-5 .cvsignore, 1.9, 1.10 qgit.spec, 1.10, 1.11 sources, 
	1.9, 1.10
Message-ID: <200611111000.kABA0a0i013583@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13559

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:19:03 -0000	1.9
+++ .cvsignore	11 Nov 2006 10:00:06 -0000	1.10
@@ -1 +1 @@
-qgit-1.5.2.tar.bz2
+qgit-1.5.3.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/qgit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qgit.spec	30 Sep 2006 09:19:03 -0000	1.10
+++ qgit.spec	11 Nov 2006 10:00:06 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Dan Horak  1.5.3-1
+- update to upstream version 1.5.3
+
 * Sat Sep 30 2006 Dan Horak  1.5.2-1
 - update to upstream version 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:19:03 -0000	1.9
+++ sources	11 Nov 2006 10:00:06 -0000	1.10
@@ -1 +1 @@
-251568da2d93b0e621ea7a2cb7de611d  qgit-1.5.2.tar.bz2
+c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 10:03:41 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 11 Nov 2006 03:03:41 -0700
Subject: rpms/qgit/FC-4 .cvsignore, 1.9, 1.10 qgit.spec, 1.11, 1.12 sources, 
	1.9, 1.10
Message-ID: <200611111003.kABA3fFH016615@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16595

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
- update to upstream version 1.5.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:20:57 -0000	1.9
+++ .cvsignore	11 Nov 2006 10:03:10 -0000	1.10
@@ -1 +1 @@
-qgit-1.5.2.tar.bz2
+qgit-1.5.3.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/qgit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qgit.spec	30 Sep 2006 09:20:57 -0000	1.11
+++ qgit.spec	11 Nov 2006 10:03:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Dan Horak  1.5.3-1
+- update to upstream version 1.5.3
+
 * Sat Sep 30 2006 Dan Horak  1.5.2-1
 - update to upstream version 1.5.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:20:57 -0000	1.9
+++ sources	11 Nov 2006 10:03:10 -0000	1.10
@@ -1 +1 @@
-251568da2d93b0e621ea7a2cb7de611d  qgit-1.5.2.tar.bz2
+c1420385dc18716f0ab538756e7e2476  qgit-1.5.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 10:48:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 03:48:20 -0700
Subject: fedora-security/audit fe4,1.95,1.96 fe5,1.103,1.104 fe6,1.16,1.17
Message-ID: <200611111048.kABAmKUa016866@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16844

Modified Files:
	fe4 fe5 fe6 
Log Message:
+CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- fe4	10 Nov 2006 20:23:33 -0000	1.95
+++ fe4	11 Nov 2006 10:48:17 -0000	1.96
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fe5	10 Nov 2006 20:23:33 -0000	1.103
+++ fe5	11 Nov 2006 10:48:17 -0000	1.104
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fe6	10 Nov 2006 20:23:33 -0000	1.16
+++ fe6	11 Nov 2006 10:48:17 -0000	1.17
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822



From fedora-extras-commits at redhat.com  Sat Nov 11 11:40:36 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 04:40:36 -0700
Subject: owners owners.list,1.1922,1.1923
Message-ID: <200611111140.kABBea7h020335@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20315

Modified Files:
	owners.list 
Log Message:
change e-mail joost at soeterbroek.com -> joost.soeterbroek at gmail.com


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1922
retrieving revision 1.1923
diff -u -r1.1922 -r1.1923
--- owners.list	11 Nov 2006 06:59:55 -0000	1.1922
+++ owners.list	11 Nov 2006 11:40:05 -0000	1.1923
@@ -194,7 +194,7 @@
 Fedora Extras|clanbomber|Bomberman-like multiplayer game that uses ClanLib|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ClanLib|Cross platform C++ game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ClanLib06|Version 0.6 of this Cross platform C++ game library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|clearsilver|HTML template system|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|clement|An application to filter and manage E-mail traffic|jmp at safe.ca|extras-qa at fedoraproject.org|
 Fedora Extras|clips|CLIPS language for expert systems|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -539,7 +539,7 @@
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|glom|Database Designer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|glunarclock|GNOME applet that displays the current lunar phase|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|glyph-keeper|Library for text rendering|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gmpc|GNOME frontend for the MPD|adrian at lisas.de|extras-qa at fedoraproject.org|
@@ -578,7 +578,7 @@
 Fedora Extras|gnomesword|GNOME-based Bible research tool|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|bdpepple at ameritech.net|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
-Fedora Extras|gnubg|A backgammon game and analyser|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnubg|A backgammon game and analyser|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnubiff|A mail notification program|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnucap|The Gnu Circuit Analysis Package|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
@@ -667,7 +667,7 @@
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
-Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|HelixPlayer|Open source media player based on the Helix framework|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -1017,7 +1017,7 @@
 Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lrmi|Library for calling real mode BIOS routines|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|lsscsi|List SCSI devices (or hosts) and associated information|coldwell at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|ltsp-utils|Linux Terminal Server Project utilities|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|lua|A powerful light-weight programming language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|luks-tools|Utilities for working with LUKS-protected filesystems|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
@@ -2270,7 +2270,7 @@
 Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|trac|Trac is an integrated system for managing software projects|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|trackballs|Steer a marble ball through a labyrinth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|trackballs-music|In-game music for Trackballs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|tracker|An object database, tag/metadata database, search tool and indexer|dakingun at gmail.com|extras-qa at fedoraproject.org|
@@ -2458,7 +2458,7 @@
 Fedora Extras|xmms-adplug|XMMS plugin to play AdLib (OPL2) files|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-crossfade|A crossfade output plugin for XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 11:50:36 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 04:50:36 -0700
Subject: rpms/trac/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 trac.spec,
	1.10, 1.11
Message-ID: <200611111150.kABBoal8020393@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20373

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 16:55:32 -0000	1.6
+++ .cvsignore	11 Nov 2006 11:50:06 -0000	1.7
@@ -1 +1 @@
-trac-0.10.tar.gz
+trac-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 16:55:32 -0000	1.6
+++ sources	11 Nov 2006 11:50:06 -0000	1.7
@@ -1 +1 @@
-36c4ed1dee4709442cf9f3ac8891e8c7  trac-0.10.tar.gz
+55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trac.spec	28 Sep 2006 16:55:32 -0000	1.10
+++ trac.spec	11 Nov 2006 11:50:06 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
+- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
+
 * Thu Sep 28 2006 Joost Soeterbroek  - 0.10
 - upstream release 0.10 'Zengia'
 



From fedora-extras-commits at redhat.com  Sat Nov 11 13:05:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 11 Nov 2006 06:05:05 -0700
Subject: rpms/audacity/FC-6 audacity.spec,1.17,1.18
Message-ID: <200611111305.kABD559F026690@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/FC-6

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audacity.spec	7 Nov 2006 21:44:07 -0000	1.17
+++ audacity.spec	11 Nov 2006 13:04:34 -0000	1.18
@@ -90,7 +90,7 @@
 Comment=A multitrack audio editor
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.4
-MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;
 StartupWMClass=Audacity
 EOF
 
@@ -123,7 +123,8 @@
 %doc %{_datadir}/doc/*
 
 %changelog
-* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+* Sat Nov 11 2006 Gerard Milmeister  - 1.2.5-3
+- correct mime types in .desktop file
 - msse flag only on intel
 
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2



From fedora-extras-commits at redhat.com  Sat Nov 11 13:05:00 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 11 Nov 2006 06:05:00 -0700
Subject: rpms/audacity/FC-5 audacity.spec,1.17,1.18
Message-ID: <200611111305.kABD508u026687@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/FC-5

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audacity.spec	7 Nov 2006 21:44:06 -0000	1.17
+++ audacity.spec	11 Nov 2006 13:04:25 -0000	1.18
@@ -90,7 +90,7 @@
 Comment=A multitrack audio editor
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.4
-MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;
 StartupWMClass=Audacity
 EOF
 
@@ -123,7 +123,8 @@
 %doc %{_datadir}/doc/*
 
 %changelog
-* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+* Sat Nov 11 2006 Gerard Milmeister  - 1.2.5-3
+- correct mime types in .desktop file
 - msse flag only on intel
 
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2



From fedora-extras-commits at redhat.com  Sat Nov 11 13:05:07 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Sat, 11 Nov 2006 06:05:07 -0700
Subject: rpms/audacity/devel audacity.spec,1.17,1.18
Message-ID: <200611111305.kABD57BB026691@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/devel

Modified Files:
	audacity.spec 
Log Message:



Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audacity.spec	7 Nov 2006 21:44:08 -0000	1.17
+++ audacity.spec	11 Nov 2006 13:04:36 -0000	1.18
@@ -90,7 +90,7 @@
 Comment=A multitrack audio editor
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.4
-MimeType=audio/*;application/ogg;application/x-ogg;audio/x-ogg
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;
 StartupWMClass=Audacity
 EOF
 
@@ -123,7 +123,8 @@
 %doc %{_datadir}/doc/*
 
 %changelog
-* Tue Nov  7 2006 Gerard Milmeister  - 1.2.5-3
+* Sat Nov 11 2006 Gerard Milmeister  - 1.2.5-3
+- correct mime types in .desktop file
 - msse flag only on intel
 
 * Fri Nov  3 2006 Gerard Milmeister  - 1.2.5-2



From fedora-extras-commits at redhat.com  Sat Nov 11 13:18:02 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 11 Nov 2006 06:18:02 -0700
Subject: comps comps-fe6.xml.in,1.217,1.218 comps-fe7.xml.in,1.15,1.16
Message-ID: <200611111318.kABDI2NF026845@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26823

Modified Files:
	comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Add fonttools and translate-toolkit



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- comps-fe6.xml.in	11 Nov 2006 07:17:09 -0000	1.217
+++ comps-fe6.xml.in	11 Nov 2006 13:17:32 -0000	1.218
@@ -200,6 +200,7 @@
       tla
       tolua++
       trac
+      translate-toolkit
       ucblogo
       utrac
       xbsql
@@ -606,6 +607,7 @@
       comix
       digikam
       fontforge
+      fonttools
       fyre
       gpp
       gqview


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- comps-fe7.xml.in	11 Nov 2006 07:17:09 -0000	1.15
+++ comps-fe7.xml.in	11 Nov 2006 13:17:32 -0000	1.16
@@ -200,6 +200,7 @@
       tla
       tolua++
       trac
+      translate-toolkit
       ucblogo
       utrac
       xbsql
@@ -606,6 +607,7 @@
       comix
       digikam
       fontforge
+      fonttools
       fyre
       gpp
       gqview



From fedora-extras-commits at redhat.com  Sat Nov 11 13:19:46 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 11 Nov 2006 06:19:46 -0700
Subject: comps comps-fe5.xml.in,1.193,1.194
Message-ID: <200611111319.kABDJk38026867@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26851

Modified Files:
	comps-fe5.xml.in 
Log Message:
add translate-toolkit, move fonttools to appropriate group



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- comps-fe5.xml.in	11 Nov 2006 07:17:09 -0000	1.193
+++ comps-fe5.xml.in	11 Nov 2006 13:19:16 -0000	1.194
@@ -72,7 +72,6 @@
       dejavu-fonts
       dejavu-fonts-experimental
       efont-unicode-bdf
-      fonttools
       lineak-defaultplugin
       lineak-xosdplugin
       lineakd
@@ -166,6 +165,7 @@
       sysprof
       tkcvs
       tla
+      translate-toolkit
       tolua++
       ucblogo
       utrac
@@ -554,6 +554,7 @@
       comix
       digikam
       fontforge
+      fonttools
       fyre
       gpp
       gqview



From fedora-extras-commits at redhat.com  Sat Nov 11 14:19:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:19:28 -0700
Subject: rpms/panelfm - New directory
Message-ID: <200611111419.kABEJSDm030349@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30345/panelfm

Log Message:
Directory /cvs/extras/rpms/panelfm added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 14:19:34 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:19:34 -0700
Subject: rpms/panelfm/devel - New directory
Message-ID: <200611111419.kABEJYEv030363@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30345/panelfm/devel

Log Message:
Directory /cvs/extras/rpms/panelfm/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 14:19:53 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:19:53 -0700
Subject: rpms/panelfm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611111419.kABEJrjX030394@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30388

Added Files:
	Makefile import.log 
Log Message:
Setup of module panelfm


--- NEW FILE Makefile ---
# Top level Makefile for module panelfm
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  Sat Nov 11 14:19:59 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:19:59 -0700
Subject: rpms/panelfm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611111419.kABEJxd9030412@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30388/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module panelfm


--- 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  Sat Nov 11 14:21:00 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:21:00 -0700
Subject: rpms/panelfm/devel panelfm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611111421.kABEL07l030494@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	panelfm.spec 
Log Message:
auto-import panelfm-1.1-2 on branch devel from panelfm-1.1-2.src.rpm


--- NEW FILE panelfm.spec ---
Name:           panelfm
Version:        1.1
Release:        2%{?dist}
Summary:        Quick File Manager Applet

Group:          Applications/File
License:        GPL
URL:            http://panelfm.sourceforge.net/
Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}.tar.gz

Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnomeui-devel
BuildRequires:  gnome-panel-devel

%description
PanelFM is a GNOME applet that provides quick access to the file system. It
uses popup menus to display files and directories. Multiple root points can be
defined for the main menu by creating a .panelfmrc containing a list of root
points, one on each line. Each root point must be an absolute path name.

%prep
%setup -q -n PanelFM

%{__sed} -i.local \
   -e 's|%{_prefix}/local|%{_prefix}|g' \
   panelfm.server
%{__sed} -i.flags \
   -e '/^LDFLAGS/s|^\(.*\)$|\1\n\nCFLAGS += $(OPTFLAGS)|' \
   makefile

%build
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"

%install
%{__rm} -rf %{buildroot}

for dir in \
   %{_bindir} %{_datadir}/pixmaps %{_libdir}/bonobo/servers \
   ; do
   %{__mkdir_p} %{buildroot}/$dir
done

%{__install} -c -m 755 panelfm %{buildroot}%{_bindir}
%{__install} -c -p -m 644 panelfm.xpm \
   %{buildroot}%{_datadir}/pixmaps
%{__install} -c -p -m 644  panelfm.server \
   %{buildroot}%{_libdir}/bonobo/servers

%{__chmod} 0644 README

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc COPYING README

%{_bindir}/*

%{_datadir}/pixmaps/*.xpm
%{_libdir}/bonobo/servers/*.server

%changelog
* Fri Nov 10 2006 Mamoru Tasaka  - 1.1-2
- Change BuildRoot

* Fri Nov 10 2006 Mamoru Tasaka  - 1.1-1
- Rewrite.

* Tue Oct 31 2006 Sawa  - 1.1
- version 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 14:19:58 -0000	1.1
+++ .cvsignore	11 Nov 2006 14:20:30 -0000	1.2
@@ -0,0 +1 @@
+panelfm.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 14:19:58 -0000	1.1
+++ sources	11 Nov 2006 14:20:30 -0000	1.2
@@ -0,0 +1 @@
+5a18f0beba718d6efaace22ed13c1b9e  panelfm.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 14:20:59 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 07:20:59 -0700
Subject: rpms/panelfm import.log,1.1,1.2
Message-ID: <200611111420.kABEKxBN030490@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452

Modified Files:
	import.log 
Log Message:
auto-import panelfm-1.1-2 on branch devel from panelfm-1.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/panelfm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 14:19:53 -0000	1.1
+++ import.log	11 Nov 2006 14:20:29 -0000	1.2
@@ -0,0 +1 @@
+panelfm-1_1-2:HEAD:panelfm-1.1-2.src.rpm:1163254823



From fedora-extras-commits at redhat.com  Sat Nov 11 14:30:49 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 07:30:49 -0700
Subject: rpms/trac/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 trac.spec, 1.9,
	1.10
Message-ID: <200611111430.kABEUnSl030667@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30608/FC-5

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 17:07:02 -0000	1.6
+++ .cvsignore	11 Nov 2006 14:30:19 -0000	1.7
@@ -1 +1 @@
-trac-0.10.tar.gz
+trac-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 17:07:02 -0000	1.6
+++ sources	11 Nov 2006 14:30:19 -0000	1.7
@@ -1 +1 @@
-36c4ed1dee4709442cf9f3ac8891e8c7  trac-0.10.tar.gz
+55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/trac.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- trac.spec	28 Sep 2006 17:07:02 -0000	1.9
+++ trac.spec	11 Nov 2006 14:30:19 -0000	1.10
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
+- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
+
 * Thu Sep 28 2006 Joost Soeterbroek  - 0.10
 - upstream release 0.10 'Zengia'
 



From fedora-extras-commits at redhat.com  Sat Nov 11 14:30:48 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 07:30:48 -0700
Subject: rpms/trac/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 trac.spec, 1.9,
	1.10
Message-ID: <200611111430.kABEUmRQ030662@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30608/FC-4

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 17:07:01 -0000	1.6
+++ .cvsignore	11 Nov 2006 14:30:18 -0000	1.7
@@ -1 +1 @@
-trac-0.10.tar.gz
+trac-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 17:07:01 -0000	1.6
+++ sources	11 Nov 2006 14:30:18 -0000	1.7
@@ -1 +1 @@
-36c4ed1dee4709442cf9f3ac8891e8c7  trac-0.10.tar.gz
+55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- trac.spec	28 Sep 2006 17:07:01 -0000	1.9
+++ trac.spec	11 Nov 2006 14:30:18 -0000	1.10
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
+- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
+
 * Thu Sep 28 2006 Joost Soeterbroek  - 0.10
 - upstream release 0.10 'Zengia'
 



From fedora-extras-commits at redhat.com  Sat Nov 11 14:30:55 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 11 Nov 2006 07:30:55 -0700
Subject: rpms/trac/FC-6 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 trac.spec,
	1.10, 1.11
Message-ID: <200611111430.kABEUto4030672@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30608/FC-6

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Sep 2006 16:55:32 -0000	1.6
+++ .cvsignore	11 Nov 2006 14:30:24 -0000	1.7
@@ -1 +1 @@
-trac-0.10.tar.gz
+trac-0.10.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Sep 2006 16:55:32 -0000	1.6
+++ sources	11 Nov 2006 14:30:24 -0000	1.7
@@ -1 +1 @@
-36c4ed1dee4709442cf9f3ac8891e8c7  trac-0.10.tar.gz
+55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/trac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trac.spec	28 Sep 2006 16:55:32 -0000	1.10
+++ trac.spec	11 Nov 2006 14:30:24 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
+- upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
+
 * Thu Sep 28 2006 Joost Soeterbroek  - 0.10
 - upstream release 0.10 'Zengia'
 



From fedora-extras-commits at redhat.com  Sat Nov 11 15:05:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:05:05 -0700
Subject: rpms/perl-Alien-wxWidgets/devel .cvsignore, 1.5,
	1.6 perl-Alien-wxWidgets.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611111505.kABF55j3001452@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386/devel

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.25.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Oct 2006 13:57:32 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:04:35 -0000	1.6
@@ -1 +1 @@
-Alien-wxWidgets-0.24.tar.gz
+Alien-wxWidgets-0.25.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/perl-Alien-wxWidgets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:32 -0000	1.6
+++ perl-Alien-wxWidgets.spec	11 Nov 2006 15:04:35 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.24
+Version:        0.25
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.25-1
+- Update to 0.25.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.24-1
 - Update to 0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Oct 2006 13:57:32 -0000	1.5
+++ sources	11 Nov 2006 15:04:35 -0000	1.6
@@ -1 +1 @@
-40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz
+79e0404a36b37c1f8af4ce1f6be0537e  Alien-wxWidgets-0.25.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:05:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:05:01 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-5 .cvsignore, 1.4,
	1.5 perl-Alien-wxWidgets.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200611111505.kABF51o4001442@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386/FC-5

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.25.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Oct 2006 13:57:31 -0000	1.4
+++ .cvsignore	11 Nov 2006 15:04:31 -0000	1.5
@@ -1 +1 @@
-Alien-wxWidgets-0.24.tar.gz
+Alien-wxWidgets-0.25.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/perl-Alien-wxWidgets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:31 -0000	1.5
+++ perl-Alien-wxWidgets.spec	11 Nov 2006 15:04:31 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.24
+Version:        0.25
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.25-1
+- Update to 0.25.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.24-1
 - Update to 0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Oct 2006 13:57:31 -0000	1.4
+++ sources	11 Nov 2006 15:04:31 -0000	1.5
@@ -1 +1 @@
-40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz
+79e0404a36b37c1f8af4ce1f6be0537e  Alien-wxWidgets-0.25.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:05:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:05:03 -0700
Subject: rpms/perl-Alien-wxWidgets/FC-6 .cvsignore, 1.5,
	1.6 perl-Alien-wxWidgets.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611111505.kABF53uS001446@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Alien-wxWidgets/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386/FC-6

Modified Files:
	.cvsignore perl-Alien-wxWidgets.spec sources 
Log Message:
Update to 0.25.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Oct 2006 13:57:32 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:04:32 -0000	1.6
@@ -1 +1 @@
-Alien-wxWidgets-0.24.tar.gz
+Alien-wxWidgets-0.25.tar.gz


Index: perl-Alien-wxWidgets.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-6/perl-Alien-wxWidgets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Alien-wxWidgets.spec	21 Oct 2006 13:57:32 -0000	1.6
+++ perl-Alien-wxWidgets.spec	11 Nov 2006 15:04:32 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Alien-wxWidgets
-Version:        0.24
+Version:        0.25
 Release:        1%{?dist}
 Summary:        Building, finding and using wxWidgets binaries
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.25-1
+- Update to 0.25.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.24-1
 - Update to 0.24.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Alien-wxWidgets/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Oct 2006 13:57:32 -0000	1.5
+++ sources	11 Nov 2006 15:04:32 -0000	1.6
@@ -1 +1 @@
-40d3f9aedc32a14fb31be0026ba28c17  Alien-wxWidgets-0.24.tar.gz
+79e0404a36b37c1f8af4ce1f6be0537e  Alien-wxWidgets-0.25.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:13:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:13:50 -0700
Subject: rpms/perl-Sub-Uplevel/FC-5 .cvsignore, 1.5,
	1.6 perl-Sub-Uplevel.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611111513.kABFDoAu001821@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1769/FC-5

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jun 2006 12:38:27 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:13:20 -0000	1.6
@@ -1 +1 @@
-Sub-Uplevel-0.13.tar.gz
+Sub-Uplevel-0.14.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/perl-Sub-Uplevel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Sub-Uplevel.spec	23 Jun 2006 12:38:27 -0000	1.10
+++ perl-Sub-Uplevel.spec	11 Nov 2006 15:13:20 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Sub-Uplevel
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
@@ -37,9 +37,7 @@
 
 
 %check
-# Pod coverage fails if AUTHOR_TESTING defined.
-# AUTHOR_TESTING=1 ./Build test
-./Build test
+AUTHOR_TESTING=1 ./Build test
 
 
 %clean
@@ -48,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README examples/
 %{perl_vendorlib}/Sub/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Fri Jun 23 2006 Jose Pedro Oliveira  - 0.13-1
 - Update to 0.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jun 2006 12:38:27 -0000	1.5
+++ sources	11 Nov 2006 15:13:20 -0000	1.6
@@ -1 +1 @@
-16ea7df857d28cbf50ef668fe19559f7  Sub-Uplevel-0.13.tar.gz
+ed0cbc3ef75df91a22fd0d0404336765  Sub-Uplevel-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:13:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:13:51 -0700
Subject: rpms/perl-Sub-Uplevel/FC-6 .cvsignore, 1.5,
	1.6 perl-Sub-Uplevel.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611111513.kABFDpJC001826@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1769/FC-6

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jun 2006 11:19:36 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:13:21 -0000	1.6
@@ -1 +1 @@
-Sub-Uplevel-0.13.tar.gz
+Sub-Uplevel-0.14.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-6/perl-Sub-Uplevel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Sub-Uplevel.spec	23 Jun 2006 11:19:36 -0000	1.10
+++ perl-Sub-Uplevel.spec	11 Nov 2006 15:13:21 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Sub-Uplevel
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
@@ -37,9 +37,7 @@
 
 
 %check
-# Pod coverage fails if AUTHOR_TESTING defined.
-# AUTHOR_TESTING=1 ./Build test
-./Build test
+AUTHOR_TESTING=1 ./Build test
 
 
 %clean
@@ -48,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README examples/
 %{perl_vendorlib}/Sub/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Fri Jun 23 2006 Jose Pedro Oliveira  - 0.13-1
 - Update to 0.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jun 2006 11:19:36 -0000	1.5
+++ sources	11 Nov 2006 15:13:21 -0000	1.6
@@ -1 +1 @@
-16ea7df857d28cbf50ef668fe19559f7  Sub-Uplevel-0.13.tar.gz
+ed0cbc3ef75df91a22fd0d0404336765  Sub-Uplevel-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:13:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:13:52 -0700
Subject: rpms/perl-Sub-Uplevel/devel .cvsignore, 1.5,
	1.6 perl-Sub-Uplevel.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611111513.kABFDqo9001831@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1769/devel

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Log Message:
Update to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jun 2006 11:19:36 -0000	1.5
+++ .cvsignore	11 Nov 2006 15:13:22 -0000	1.6
@@ -1 +1 @@
-Sub-Uplevel-0.13.tar.gz
+Sub-Uplevel-0.14.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Sub-Uplevel.spec	23 Jun 2006 11:19:36 -0000	1.10
+++ perl-Sub-Uplevel.spec	11 Nov 2006 15:13:22 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Sub-Uplevel
-Version:        0.13
+Version:        0.14
 Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
@@ -37,9 +37,7 @@
 
 
 %check
-# Pod coverage fails if AUTHOR_TESTING defined.
-# AUTHOR_TESTING=1 ./Build test
-./Build test
+AUTHOR_TESTING=1 ./Build test
 
 
 %clean
@@ -48,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README examples/
 %{perl_vendorlib}/Sub/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.14-1
+- Update to 0.14.
+
 * Fri Jun 23 2006 Jose Pedro Oliveira  - 0.13-1
 - Update to 0.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jun 2006 11:19:36 -0000	1.5
+++ sources	11 Nov 2006 15:13:22 -0000	1.6
@@ -1 +1 @@
-16ea7df857d28cbf50ef668fe19559f7  Sub-Uplevel-0.13.tar.gz
+ed0cbc3ef75df91a22fd0d0404336765  Sub-Uplevel-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:17:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 08:17:20 -0700
Subject: rpms/xfce4-genmon-plugin/devel xfce4-genmon-plugin.spec,1.6,1.7
Message-ID: <200611111517.kABFHKlO002027@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2011

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
Rebuild for XFCE 4.3.99.2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-genmon-plugin.spec	31 Oct 2006 01:04:35 -0000	1.6
+++ xfce4-genmon-plugin.spec	11 Nov 2006 15:16:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -41,6 +41,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  - 3.0-2
+- Rebuild for XFCE 4.3.99.2.
+
 * Thu Oct 31 2006 Christoph Wickert  - 3.0-1
 - Update to 3.0.
 - BR xfce4-dev-tools (bugzilla.xfce.org #2435) and gettext.



From fedora-extras-commits at redhat.com  Sat Nov 11 15:18:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 08:18:28 -0700
Subject: owners owners.list,1.1923,1.1924
Message-ID: <200611111518.kABFISra002105@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2087

Modified Files:
	owners.list 
Log Message:
add panelfm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1923
retrieving revision 1.1924
diff -u -r1.1923 -r1.1924
--- owners.list	11 Nov 2006 11:40:05 -0000	1.1923
+++ owners.list	11 Nov 2006 15:17:58 -0000	1.1924
@@ -1239,6 +1239,7 @@
 Fedora Extras|pam_usb|PAM module for use with DSA key pairs and removable devices|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|paman|Management tool for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pan|A GNOME/GTK+ news reader for X|alex at dalloz.de|extras-qa at fedoraproject.org|mpeters at mac.com
+Fedora Extras|panelfm|Quick File Manager Applet|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|papyrus|A C++ canvas library similar to the Gnome canvas|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|par2cmdline|PAR 2.0 compatible file verification and repair tool|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 15:20:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:20:33 -0700
Subject: rpms/perl-Module-ScanDeps/FC-6 .cvsignore, 1.9,
	1.10 perl-Module-ScanDeps.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <200611111520.kABFKXUg002222@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-serv2145/FC-6

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Oct 2006 13:28:37 -0000	1.9
+++ .cvsignore	11 Nov 2006 15:20:03 -0000	1.10
@@ -1 +1 @@
-Module-ScanDeps-0.68.tar.gz
+Module-ScanDeps-0.69.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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Module-ScanDeps.spec	28 Oct 2006 13:28:37 -0000	1.9
+++ perl-Module-ScanDeps.spec	11 Nov 2006 15:20:03 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.68
+Version:        0.69
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
+- Update to 0.69.
+
 * Sat Oct 28 2006 Jose Pedro Oliveira  - 0.68-1
 - Update to 0.68.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Oct 2006 13:28:37 -0000	1.9
+++ sources	11 Nov 2006 15:20:03 -0000	1.10
@@ -1 +1 @@
-747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz
+c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:20:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:20:34 -0700
Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.9,
	1.10 perl-Module-ScanDeps.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <200611111520.kABFKYFk002227@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-serv2145/devel

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Oct 2006 13:28:43 -0000	1.9
+++ .cvsignore	11 Nov 2006 15:20:03 -0000	1.10
@@ -1 +1 @@
-Module-ScanDeps-0.68.tar.gz
+Module-ScanDeps-0.69.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Module-ScanDeps.spec	28 Oct 2006 13:28:43 -0000	1.9
+++ perl-Module-ScanDeps.spec	11 Nov 2006 15:20:04 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.68
+Version:        0.69
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
+- Update to 0.69.
+
 * Sat Oct 28 2006 Jose Pedro Oliveira  - 0.68-1
 - Update to 0.68.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Oct 2006 13:28:43 -0000	1.9
+++ sources	11 Nov 2006 15:20:04 -0000	1.10
@@ -1 +1 @@
-747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz
+c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:20:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:20:32 -0700
Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.9,
	1.10 perl-Module-ScanDeps.spec, 1.9, 1.10 sources, 1.9, 1.10
Message-ID: <200611111520.kABFKWAk002211@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-serv2145/FC-5

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.69.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Oct 2006 13:28:37 -0000	1.9
+++ .cvsignore	11 Nov 2006 15:20:02 -0000	1.10
@@ -1 +1 @@
-Module-ScanDeps-0.68.tar.gz
+Module-ScanDeps-0.69.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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Module-ScanDeps.spec	28 Oct 2006 13:28:37 -0000	1.9
+++ perl-Module-ScanDeps.spec	11 Nov 2006 15:20:02 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.68
+Version:        0.69
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
+- Update to 0.69.
+
 * Sat Oct 28 2006 Jose Pedro Oliveira  - 0.68-1
 - Update to 0.68.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Oct 2006 13:28:37 -0000	1.9
+++ sources	11 Nov 2006 15:20:02 -0000	1.10
@@ -1 +1 @@
-747cf2f097d5874e56bcf4afb5a68390  Module-ScanDeps-0.68.tar.gz
+c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:21:18 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:21:18 -0700
Subject: rpms/php-pear-Net-DIME - New directory
Message-ID: <200611111521.kABFLIIh002330@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2326/php-pear-Net-DIME

Log Message:
Directory /cvs/extras/rpms/php-pear-Net-DIME added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 15:21:24 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:21:24 -0700
Subject: rpms/php-pear-Net-DIME/devel - New directory
Message-ID: <200611111521.kABFLOnc002350@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2326/php-pear-Net-DIME/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Net-DIME/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 15:21:45 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:21:45 -0700
Subject: rpms/php-pear-Net-DIME Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611111521.kABFLjJb002419@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2413

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Net-DIME


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Net-DIME
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  Sat Nov 11 15:21:50 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:21:50 -0700
Subject: rpms/php-pear-Net-DIME/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611111521.kABFLoKp002436@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2413/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Net-DIME


--- 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  Sat Nov 11 15:23:03 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:23:03 -0700
Subject: rpms/php-pear-Net-DIME import.log,1.1,1.2
Message-ID: <200611111523.kABFN3Hg002521@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2487

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Net-DIME-0.3-1.fc6 on branch devel from php-pear-Net-DIME-0.3-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 15:21:45 -0000	1.1
+++ import.log	11 Nov 2006 15:22:32 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Net-DIME-0_3-1_fc6:HEAD:php-pear-Net-DIME-0.3-1.fc6.src.rpm:1163258543



From fedora-extras-commits at redhat.com  Sat Nov 11 15:23:03 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:23:03 -0700
Subject: rpms/php-pear-Net-DIME/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-Net-DIME.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611111523.kABFN3Nv002525@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2487/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-Net-DIME.spec xml2changelog 
Log Message:
auto-import php-pear-Net-DIME-0.3-1.fc6 on branch devel from php-pear-Net-DIME-0.3-1.fc6.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-Net-DIME.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Net_DIME

Name:           php-pear-Net-DIME
Version:        0.3
Release:        1%{?dist}
Summary:        Implements Direct Internet Message Encapsulation (DIME)

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Net_DIME
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}


%description
This is the initial independent release of the Net_DIME package.
Provides an implementation of "Direct Internet Message Encapsulation" (DIME) 
as defined at http://search.ietf.org/internet-drafts/draft-nielsen-dime-02.txt

Note : this specification has been superseded by the SOAP Message Transmission
Optimization Mechanism (MTOM) specification.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
%{__install} -m 644 -c %{SOURCE1} LICENSE

cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Net
%{pear_testdir}/%{pear_name}


%changelog
* Mon Nov  6 2006 Remi Collet  0.3-1
- initial RPM (generated specfile + cleanup)
- add CHANGELOG and LICENSE


--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 15:21:50 -0000	1.1
+++ .cvsignore	11 Nov 2006 15:22:33 -0000	1.2
@@ -0,0 +1 @@
+Net_DIME-0.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 15:21:50 -0000	1.1
+++ sources	11 Nov 2006 15:22:33 -0000	1.2
@@ -0,0 +1 @@
+5e740eff36c049f4dcb348c6fb24da11  Net_DIME-0.3.tgz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:30:59 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:30:59 -0700
Subject: owners owners.list,1.1924,1.1925
Message-ID: <200611111530.kABFUxvI002727@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2671

Modified Files:
	owners.list 
Log Message:
	php-pear-Net-DIME



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1924
retrieving revision 1.1925
diff -u -r1.1924 -r1.1925
--- owners.list	11 Nov 2006 15:17:58 -0000	1.1924
+++ owners.list	11 Nov 2006 15:30:28 -0000	1.1925
@@ -1784,6 +1784,7 @@
 Fedora Extras|php-pear-Mail-Mime|Classes to create and decode mime messages|fedora at theholbrooks.org|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-MDB2|Database Abstraction Layer|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-Curl|OO interface to PHP's cURL extension|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Net-DIME|Implements Direct Internet Message Encapsulation (DIME)|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-FTP|Provides an OO interface to the PHP FTP functions plus some additions|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-SMTP|Provides an implementation of the SMTP protocol|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Net-Socket|Network Socket Interface|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 15:31:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:31:09 -0700
Subject: rpms/perl-Perl-Critic/devel .cvsignore, 1.2,
	1.3 perl-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611111531.kABFV9UM002732@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-serv2707

Modified Files:
	.cvsignore perl-Perl-Critic.spec sources 
Log Message:
Update to 0.21; the new BR needs to be packaged first


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 17:07:14 -0000	1.2
+++ .cvsignore	11 Nov 2006 15:30:39 -0000	1.3
@@ -1 +1 @@
-Perl-Critic-0.2.tar.gz
+Perl-Critic-0.21.tar.gz


Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Perl-Critic.spec	23 Sep 2006 17:07:14 -0000	1.1
+++ perl-Perl-Critic.spec	11 Nov 2006 15:30:39 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Perl-Critic
-Version:        0.2
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
@@ -15,7 +15,8 @@
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable)
-BuildRequires:  perl(PPI) >= 1.117
+BuildRequires:  perl(PPI) >= 1.118
+BuildRequires:  perl(Set::Scalar) >= 1.20
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Pod)
@@ -69,5 +70,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.21-1
+- Update to 0.21.
+- New BR: perl(Set::Scalar).
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 0.2-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 17:07:14 -0000	1.2
+++ sources	11 Nov 2006 15:30:39 -0000	1.3
@@ -1 +1 @@
-a31ab7c92cdb0501c1a3e298495f61c5  Perl-Critic-0.2.tar.gz
+0359235579986f76438d7a1180598feb  Perl-Critic-0.21.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:33:17 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 08:33:17 -0700
Subject: comps comps-fe5.xml.in, 1.194, 1.195 comps-fe6.xml.in, 1.218,
	1.219 comps-fe7.xml.in, 1.16, 1.17
Message-ID: <200611111533.kABFXHue002784@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2753

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add packages related to me


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- comps-fe5.xml.in	11 Nov 2006 13:19:16 -0000	1.194
+++ comps-fe5.xml.in	11 Nov 2006 15:32:47 -0000	1.195
@@ -279,6 +279,7 @@
       SIBsim4
       toped
       wcstools
+      wvs-data
       xdrawchem
     
   
@@ -436,6 +437,7 @@
       nautilus-image-converter
       nautilus-open-terminal
       nautilus-search-tool
+      panelfm
       rss-glx-gnome-screensaver
       sabayon
       seahorse
@@ -611,6 +613,7 @@
     false
     false
     
+      jfbterm
       scim-input-pad
       scim-skk
       scim-tomoe


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- comps-fe6.xml.in	11 Nov 2006 13:17:32 -0000	1.218
+++ comps-fe6.xml.in	11 Nov 2006 15:32:47 -0000	1.219
@@ -329,6 +329,7 @@
       toped
       veusz
       wcstools
+      wvs-data
       xcircuit
       xdrawchem
     
@@ -485,6 +486,7 @@
       nautilus-image-converter
       nautilus-open-terminal
       nautilus-search-tool
+      panelfm
       rss-glx-gnome-screensaver
       sabayon
       seahorse
@@ -670,6 +672,7 @@
     false
     false
     
+      jfbterm
       scim-input-pad
       scim-skk
       scim-tomoe


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- comps-fe7.xml.in	11 Nov 2006 13:17:32 -0000	1.16
+++ comps-fe7.xml.in	11 Nov 2006 15:32:47 -0000	1.17
@@ -329,6 +329,7 @@
       toped
       veusz
       wcstools
+      wvs-data
       xcircuit
       xdrawchem
     
@@ -485,6 +486,7 @@
       nautilus-image-converter
       nautilus-open-terminal
       nautilus-search-tool
+      panelfm
       rss-glx-gnome-screensaver
       sabayon
       seahorse
@@ -670,6 +672,7 @@
     false
     false
     
+      jfbterm
       scim-input-pad
       scim-skk
       scim-tomoe



From fedora-extras-commits at redhat.com  Sat Nov 11 15:37:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 08:37:08 -0700
Subject: rpms/xfce4-dev-tools/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-dev-tools.spec, 1.2, 1.3
Message-ID: <200611111537.kABFb8wI002944@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2886

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
Update to 4.3.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 13:31:04 -0000	1.2
+++ .cvsignore	11 Nov 2006 15:36:37 -0000	1.3
@@ -1 +1 @@
-xfce4-dev-tools-4.3.99.1.tar.bz2
+xfce4-dev-tools-4.3.99.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 13:31:04 -0000	1.2
+++ sources	11 Nov 2006 15:36:37 -0000	1.3
@@ -1 +1 @@
-dc6403caf82edfb896eb3878385b439a  xfce4-dev-tools-4.3.99.1.tar.bz2
+6f79a59eb7ed5a9a5e8ebef253a704f8  xfce4-dev-tools-4.3.99.2.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/devel/xfce4-dev-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-dev-tools.spec	5 Oct 2006 13:51:59 -0000	1.2
+++ xfce4-dev-tools.spec	11 Nov 2006 15:36:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-dev-tools
-Version:	4.3.99.1
-Release:	3%{?dist}
+Version:	4.3.99.2
+Release:	1%{?dist}
 Summary:	Xfce developer tools
 
 Group:		Development/Tools
@@ -42,6 +42,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  - 4.3.99.2-1
+- Update to 4.3.99.2.
+
 * Tue Oct 03 2006 Christoph Wickert  - 4.3.99.1-3
 - Require gettext-devel.
 - Install m4 macros also to /usr/share/aclocal.



From fedora-extras-commits at redhat.com  Sat Nov 11 15:38:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:38:52 -0700
Subject: rpms/perl-Cairo/FC-5 .cvsignore, 1.4, 1.5 perl-Cairo.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611111538.kABFcqaP003114@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3062/FC-5

Modified Files:
	.cvsignore perl-Cairo.spec sources 
Log Message:
Update to 1.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2006 21:48:00 -0000	1.4
+++ .cvsignore	11 Nov 2006 15:38:21 -0000	1.5
@@ -1 +1 @@
-Cairo-1.01.tar.gz
+Cairo-1.02.tar.gz


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-5/perl-Cairo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Cairo.spec	26 Sep 2006 21:48:00 -0000	1.3
+++ perl-Cairo.spec	11 Nov 2006 15:38:21 -0000	1.4
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Cairo
-Version:        1.01
+Version:        1.02
 Release:        1%{?dist}
 Summary:        Perl interface to the cairo library
 
@@ -28,6 +28,7 @@
 
 %prep
 %setup -q -n Cairo-%{version}
+chmod -c a-x examples/*.pl
 
 
 %build
@@ -61,6 +62,12 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.02-1
+- Update to 1.02.
+
+* Mon Oct  2 2006 Jose Pedro Oliveira  - 1.01-2
+- Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
+
 * Tue Sep 26 2006 Jose Pedro Oliveira  - 1.01-1
 - Update to 1.01.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2006 21:48:00 -0000	1.4
+++ sources	11 Nov 2006 15:38:21 -0000	1.5
@@ -1 +1 @@
-d2c6641f1bc33834ea695ff56919c142  Cairo-1.01.tar.gz
+bf1a8443310aa580f7566b2024e55987  Cairo-1.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:38:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:38:52 -0700
Subject: rpms/perl-Cairo/FC-6 .cvsignore, 1.7, 1.8 perl-Cairo.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200611111538.kABFcqM0003119@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3062/FC-6

Modified Files:
	.cvsignore perl-Cairo.spec sources 
Log Message:
Update to 1.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 21:48:00 -0000	1.7
+++ .cvsignore	11 Nov 2006 15:38:22 -0000	1.8
@@ -1 +1 @@
-Cairo-1.01.tar.gz
+Cairo-1.02.tar.gz


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-6/perl-Cairo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Cairo.spec	2 Oct 2006 22:51:54 -0000	1.7
+++ perl-Cairo.spec	11 Nov 2006 15:38:22 -0000	1.8
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Cairo
-Version:        1.01
-Release:        2%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        Perl interface to the cairo library
 
 Group:          Development/Libraries
@@ -28,6 +28,7 @@
 
 %prep
 %setup -q -n Cairo-%{version}
+chmod -c a-x examples/*.pl
 
 
 %build
@@ -61,6 +62,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.02-1
+- Update to 1.02.
+
 * Mon Oct  2 2006 Jose Pedro Oliveira  - 1.01-2
 - Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 21:48:00 -0000	1.7
+++ sources	11 Nov 2006 15:38:22 -0000	1.8
@@ -1 +1 @@
-d2c6641f1bc33834ea695ff56919c142  Cairo-1.01.tar.gz
+bf1a8443310aa580f7566b2024e55987  Cairo-1.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:38:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 08:38:53 -0700
Subject: rpms/perl-Cairo/devel .cvsignore, 1.7, 1.8 perl-Cairo.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200611111538.kABFcr1E003124@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3062/devel

Modified Files:
	.cvsignore perl-Cairo.spec sources 
Log Message:
Update to 1.02.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Sep 2006 21:48:00 -0000	1.7
+++ .cvsignore	11 Nov 2006 15:38:23 -0000	1.8
@@ -1 +1 @@
-Cairo-1.01.tar.gz
+Cairo-1.02.tar.gz


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/perl-Cairo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Cairo.spec	2 Oct 2006 22:51:54 -0000	1.7
+++ perl-Cairo.spec	11 Nov 2006 15:38:23 -0000	1.8
@@ -5,8 +5,8 @@
 #
 
 Name:           perl-Cairo
-Version:        1.01
-Release:        2%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        Perl interface to the cairo library
 
 Group:          Development/Libraries
@@ -28,6 +28,7 @@
 
 %prep
 %setup -q -n Cairo-%{version}
+chmod -c a-x examples/*.pl
 
 
 %build
@@ -61,6 +62,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.02-1
+- Update to 1.02.
+
 * Mon Oct  2 2006 Jose Pedro Oliveira  - 1.01-2
 - Rebuild (https://www.redhat.com/archives/fedora-maintainers/2006-October/msg00005.html).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Sep 2006 21:48:00 -0000	1.7
+++ sources	11 Nov 2006 15:38:23 -0000	1.8
@@ -1 +1 @@
-d2c6641f1bc33834ea695ff56919c142  Cairo-1.01.tar.gz
+bf1a8443310aa580f7566b2024e55987  Cairo-1.02.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 15:43:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 08:43:30 -0700
Subject: rpms/xfce4-dev-tools/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-dev-tools.spec, 1.2, 1.3
Message-ID: <200611111543.kABFhULn003276@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dev-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3256

Modified Files:
	.cvsignore sources xfce4-dev-tools.spec 
Log Message:
Update to 4.3.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 13:31:04 -0000	1.2
+++ .cvsignore	11 Nov 2006 15:43:00 -0000	1.3
@@ -1 +1 @@
-xfce4-dev-tools-4.3.99.1.tar.bz2
+xfce4-dev-tools-4.3.99.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 13:31:04 -0000	1.2
+++ sources	11 Nov 2006 15:43:00 -0000	1.3
@@ -1 +1 @@
-dc6403caf82edfb896eb3878385b439a  xfce4-dev-tools-4.3.99.1.tar.bz2
+6f79a59eb7ed5a9a5e8ebef253a704f8  xfce4-dev-tools-4.3.99.2.tar.bz2


Index: xfce4-dev-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dev-tools/FC-6/xfce4-dev-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-dev-tools.spec	5 Oct 2006 13:51:59 -0000	1.2
+++ xfce4-dev-tools.spec	11 Nov 2006 15:43:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-dev-tools
-Version:	4.3.99.1
-Release:	3%{?dist}
+Version:	4.3.99.2
+Release:	1%{?dist}
 Summary:	Xfce developer tools
 
 Group:		Development/Tools
@@ -42,6 +42,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  - 4.3.99.2-1
+- Update to 4.3.99.2.
+
 * Tue Oct 03 2006 Christoph Wickert  - 4.3.99.1-3
 - Require gettext-devel.
 - Install m4 macros also to /usr/share/aclocal.



From fedora-extras-commits at redhat.com  Sat Nov 11 15:50:02 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 11 Nov 2006 08:50:02 -0700
Subject: rpms/php-pear-Cache/FC-6 php-pear-Cache.spec,1.1,1.2
Message-ID: <200611111550.kABFo274003431@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3412

Modified Files:
	php-pear-Cache.spec 
Log Message:
	bump release to allow FC6 build



Index: php-pear-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/FC-6/php-pear-Cache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Cache.spec	10 Nov 2006 20:13:16 -0000	1.1
+++ php-pear-Cache.spec	11 Nov 2006 15:49:32 -0000	1.2
@@ -9,7 +9,7 @@
 %if %{?beta:0}%{!?beta:1}
 Release:        1%{?dist}
 %else
-Release:        0.1.%{beta}%{?dist}
+Release:        0.1.%{beta}%{?dist}.1
 %endif
 Summary:        Framework for caching of arbitrary data
 
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Remi Collet  1.5.5-0.1.RC4.fc6.1
+- bump release to build en FC6
+
 * Tue Oct  7 2006 Remi Collet  1.5.5-0.1.RC4
 - use define beta (rather than fullversion)
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:05:56 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:05:56 -0700
Subject: rpms/gtkdatabox/FC-5 gtkdatabox.spec,1.6,1.7
Message-ID: <200611111605.kABG5uAd006642@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6626

Modified Files:
	gtkdatabox.spec 
Log Message:
Match version in devel



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-5/gtkdatabox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkdatabox.spec	18 Aug 2006 04:18:57 -0000	1.6
+++ gtkdatabox.spec	11 Nov 2006 16:05:25 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Fri Sep 15 2006 Eric Work  0.7.0.0-3
+- bumped version to prepare for FC6
+
 * Thu Aug 17 2006 Eric Work  0.7.0.0-2
 - removed devel post/postun scripts
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:07:08 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:07:08 -0700
Subject: rpms/gtkdatabox/FC-4 gtkdatabox.spec,1.6,1.7
Message-ID: <200611111607.kABG783h006724@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6701

Modified Files:
	gtkdatabox.spec 
Log Message:
Match devel version



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-4/gtkdatabox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkdatabox.spec	18 Aug 2006 04:18:19 -0000	1.6
+++ gtkdatabox.spec	11 Nov 2006 16:06:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Fri Sep 15 2006 Eric Work  0.7.0.0-3
+- bumped version to prepare for FC6
+
 * Thu Aug 17 2006 Eric Work  0.7.0.0-2
 - removed devel post/postun scripts
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:09:10 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 09:09:10 -0700
Subject: rpms/ochusha/devel
	ochusha-0.5.99.63.2-call-g_thread_init-once.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 ochusha.spec, 1.1, 1.2 sources,
	1.2, 1.3 ochusha-0.5.8.2-cookie-hana-mogera.patch, 1.1,
	NONE ochusha-0.5.8.2-glib-deprecated-option.patch, 1.1, NONE
Message-ID: <200611111609.kABG9Akr006844@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6797

Modified Files:
	.cvsignore ochusha.spec sources 
Added Files:
	ochusha-0.5.99.63.2-call-g_thread_init-once.patch 
Removed Files:
	ochusha-0.5.8.2-cookie-hana-mogera.patch 
	ochusha-0.5.8.2-glib-deprecated-option.patch 
Log Message:
* Sat Nov 11 2006 Mamoru Tasaka  0.5.99.63.2-0.1.cvs061111
- Update to 0.5.99.63.2


ochusha-0.5.99.63.2-call-g_thread_init-once.patch:

--- NEW FILE ochusha-0.5.99.63.2-call-g_thread_init-once.patch ---
--- ochusha-build/ochusha/main.cc.gthread	2006-11-07 22:24:08.000000000 +0900
+++ ochusha-build/ochusha/main.cc	2006-11-11 22:47:11.000000000 +0900
@@ -155,6 +155,7 @@
   g_option_context_set_help_enabled(option_context, TRUE);
 
   GError *error = NULL;
+  // g_option_context_parse calls g_thread_init
   g_option_context_parse(option_context, &argc, &argv, &error);
 
   if (error != NULL)
@@ -199,7 +200,7 @@
 
   xmlInitParser();
 
-  g_thread_init(NULL);
+  //g_thread_init(NULL);
 
   ochusha_gdk_lock = Lock::get_slave_lock();
   gdk_threads_set_lock_functions(ochusha_gdk_threads_enter,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Aug 2006 10:25:50 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:08:40 -0000	1.3
@@ -1 +1 @@
-ochusha-0.5.8.2.tar.bz2
+ochusha-0.5.99.63.2-cvs061111.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ochusha.spec	27 Aug 2006 10:25:50 -0000	1.1
+++ ochusha.spec	11 Nov 2006 16:08:40 -0000	1.2
@@ -1,67 +1,108 @@
+%define              with_system_ca_cert_file    1
+%define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
+
+%define              main_ver        0.5.99.63.2
+%define              strtag          cvs061111
+
+%define              vendor_rel      1
+%define              pre_release     1
+
+%if %{pre_release}
+%define              rel             0.%{vendor_rel}.%{strtag}%{?dist}
+%else
+%define              rel             %{vendor_rel}%{?dist}
+%endif
+
 Summary:             A GTK+ 2ch.net BBS Browser
 Name:                ochusha
-Version:             0.5.8.2
-Release:             3%{?dist}
+Version:             %{main_ver}
+Release:             %{rel}
 URL:                 http://ochusha.sourceforge.jp/
+%if %{pre_release}
+Source:              %{name}-%{main_ver}-%{strtag}.tar.bz2
+%else
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
-# These patches are from discussion on
-# http://pc8.2ch.net/test/read.cgi/linux/1148809116/
-Patch1:              ochusha-0.5.8.2-glib-deprecated-option.patch
-Patch2:              ochusha-0.5.8.2-cookie-hana-mogera.patch
+%endif
+Patch0:              ochusha-0.5.99.63.2-call-g_thread_init-once.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-Requires(post):      /sbin/ldconfig 
-Requires(post):      %{_bindir}/update-desktop-database
-Requires(post):      %{_bindir}/gtk-update-icon-cache
-Requires(postun):    /sbin/ldconfig
-Requires(postun):    %{_bindir}/update-desktop-database
-Requires(postun):    %{_bindir}/gtk-update-icon-cache
 Requires:            fonts-japanese
-BuildRequires:       gtk2-devel
+Requires:            %{system_ca_cert_file}
+
+BuildRequires:       libtool
+BuildRequires:       gettext
 BuildRequires:       libSM-devel
+BuildRequires:       libXt-devel
 BuildRequires:       libxml2-devel
+BuildRequires:       gtk2-devel
 BuildRequires:       openssl-devel
-BuildRequires:       zlib-devel
 BuildRequires:       desktop-file-utils
-BuildRequires:       libXt-devel
 
 %description
 The ochusha is BBS, especially 2ch.net, browser with GUI.
 It uses the GTK+ toolkit for all of its interface needs.
 The ochusha offers a sort of features such as multi-level
-popup view of `response's, inlining and popup view of
+popup view of `response's, embeded and popup view of
 images that helps users to interact with BBSs.
 
 %prep
+%if %{pre_release}
+%setup -q -n %{name}-%{main_ver}-%{strtag}
+%else
 %setup -q
+%endif
 
-%patch1 -p1 -b .glib
-%patch2 -p1 -b .cookie
+%patch0 -p1 -b .g_thread_init
 
 # change desktop entry to use png file in 
 # %{icondir}
-%{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' gtk2/ochusha.desktop.in
+%{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
+
+# Now rawhide has autoconf >= 2.60
+%{__sed} -i.ver -e 's|2.5\[.*\]|2.6[0-9]|' autogen.sh
+%{__chmod} 0755 autogen.sh
 
 %build
-%configure
+sh autogen.sh
+
+%configure \
+%if %{with_system_ca_cert_file}
+   --with-ca-cert-file=%{system_ca_cert_file}
+%endif
+
 %{__make} %{?_smp_flags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
+# find lang
+%find_lang %{name}
+%find_lang %{name}-properties
+
+%{__cat} *.lang > all.lang
+
+# License
+if test -f "oniguruma/COPYING"; then
+  %{__mv} oniguruma/COPYING oniguruma/COPYING.oniguruma
+fi
+
 # remove unneeded files
 %{__rm} -f %{buildroot}%{_libdir}/lib*.{a,la,so}
+%if %{with_system_ca_cert_file}
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/ca-bundle.crt
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/ochusha-gtkrc*
+%endif
 
 # install desktop file and delete original
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
       --delete-original \
       --vendor fedora \
+      --remove-category Application \
       --dir %{buildroot}%{_datadir}/applications \
-      --add-category X-Fedora \
       %{buildroot}%{_datadir}/ochusha/%{name}.desktop
 
 # link Icon png to icondir
@@ -82,10 +123,7 @@
 
 change_encoding EUCJP \
    BUGS ChangeLog INSTALL.jp NEWS README TODO \
-   gtk2/ochusha-gtkrc.gray
-
-# install mo files
-%find_lang %{name}
+   ochusha/ochusha-gtkrc.gray
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -94,27 +132,38 @@
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 %postun
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
 
-%files -f %{name}.lang
+%files -f all.lang
 %defattr(-,root,root)
-%doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog INSTALL* NEWS README TODO
-%doc gtk2/ochusha-gtkrc.*
+# BUGS is empty for now, however I include it for now.
+%doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+%doc ochusha/ochusha-gtkrc.*
+%doc oniguruma/COPYING.oniguruma
+
 %{_bindir}/ochusha
-%{_libdir}/*.so.*
+%{_libdir}/lib*
+
 %{_datadir}/applications/fedora-*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
-%{_datadir}/ochusha
-%{_mandir}/man*/ochusha.1*
 
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sat Nov 11 2006 Mamoru Tasaka  0.5.99.63.2-0.1.cvs061111
+- Update to 0.5.99.63.2
+
+* Fri Nov 03 2006  0.5.99.62-1
+- Version down.
+- Specify the CA certificate file bundled within openssl package.
+
 * Sat Aug 26 2006 Mamoru Tasaka  0.5.8.2-3
 - Install (link) icon to the usual directory and use 
   cache updating method.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Aug 2006 10:25:50 -0000	1.2
+++ sources	11 Nov 2006 16:08:40 -0000	1.3
@@ -1 +1 @@
-167edce1d41f766d18018175458373c7  ochusha-0.5.8.2.tar.bz2
+cf91062cc155ef2fef14e8ec0b8d1b8b  ochusha-0.5.99.63.2-cvs061111.tar.bz2


--- ochusha-0.5.8.2-cookie-hana-mogera.patch DELETED ---


--- ochusha-0.5.8.2-glib-deprecated-option.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:28:36 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:28:36 -0700
Subject: rpms/gtkdatabox/FC-5 gtkdatabox.spec,1.7,1.8
Message-ID: <200611111628.kABGSa7D008027@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7966/FC-5

Modified Files:
	gtkdatabox.spec 
Log Message:
bumped EVR to assure devel replaces FC6



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-5/gtkdatabox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkdatabox.spec	11 Nov 2006 16:05:25 -0000	1.7
+++ gtkdatabox.spec	11 Nov 2006 16:28:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.7.0.0-4
+- bumped EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.7.0.0-3
 - bumped version to prepare for FC6
 
@@ -68,4 +71,3 @@
 
 * Fri Jun 23 2006 Eric Work  0.5.3.0-1
 - initial release
-



From fedora-extras-commits at redhat.com  Sat Nov 11 16:28:37 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:28:37 -0700
Subject: rpms/gtkdatabox/devel gtkdatabox.spec,1.7,1.8
Message-ID: <200611111628.kABGSb1k008033@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7966/devel

Modified Files:
	gtkdatabox.spec 
Log Message:
bumped EVR to assure devel replaces FC6



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/devel/gtkdatabox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkdatabox.spec	15 Sep 2006 16:36:53 -0000	1.7
+++ gtkdatabox.spec	11 Nov 2006 16:28:07 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.7.0.0-4
+- bumped EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.7.0.0-3
 - bumped version to prepare for FC6
 
@@ -68,4 +71,3 @@
 
 * Fri Jun 23 2006 Eric Work  0.5.3.0-1
 - initial release
-



From fedora-extras-commits at redhat.com  Sat Nov 11 16:28:35 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:28:35 -0700
Subject: rpms/gtkdatabox/FC-4 gtkdatabox.spec,1.7,1.8
Message-ID: <200611111628.kABGSZxN008024@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7966/FC-4

Modified Files:
	gtkdatabox.spec 
Log Message:
bumped EVR to assure devel replaces FC6



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-4/gtkdatabox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkdatabox.spec	11 Nov 2006 16:06:37 -0000	1.7
+++ gtkdatabox.spec	11 Nov 2006 16:28:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.7.0.0-4
+- bumped EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.7.0.0-3
 - bumped version to prepare for FC6
 
@@ -68,4 +71,3 @@
 
 * Fri Jun 23 2006 Eric Work  0.5.3.0-1
 - initial release
-



From fedora-extras-commits at redhat.com  Sat Nov 11 16:28:37 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:28:37 -0700
Subject: rpms/gtkdatabox/FC-6 gtkdatabox.spec,1.7,1.8
Message-ID: <200611111628.kABGSbpn008030@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/gtkdatabox/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7966/FC-6

Modified Files:
	gtkdatabox.spec 
Log Message:
bumped EVR to assure devel replaces FC6



Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkdatabox/FC-6/gtkdatabox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkdatabox.spec	15 Sep 2006 16:36:53 -0000	1.7
+++ gtkdatabox.spec	11 Nov 2006 16:28:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gtkdatabox
 Version:        0.7.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPL
@@ -54,6 +54,9 @@
 %{_libdir}/pkgconfig/gtkdatabox.pc
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.7.0.0-4
+- bumped EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.7.0.0-3
 - bumped version to prepare for FC6
 
@@ -68,4 +71,3 @@
 
 * Fri Jun 23 2006 Eric Work  0.5.3.0-1
 - initial release
-



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:25 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:25 -0700
Subject: rpms/tripwire/FC-1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.2, 1.3 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTP3Q008207@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-1

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:28:55 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:28:55 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-1/tripwire.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tripwire.spec	8 Nov 2004 05:29:09 -0000	1.2
+++ tripwire.spec	11 Nov 2006 16:28:55 -0000	1.3
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:27 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:27 -0700
Subject: rpms/tripwire/FC-2 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.3, 1.4 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTRQI008212@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-2

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:28:56 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:28:56 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-2/tripwire.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tripwire.spec	8 Nov 2004 05:29:19 -0000	1.3
+++ tripwire.spec	11 Nov 2006 16:28:56 -0000	1.4
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:29 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:29 -0700
Subject: rpms/tripwire/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.6, 1.7 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTTPU008222@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-4

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:28:58 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:28:58 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-4/tripwire.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tripwire.spec	6 Apr 2005 22:13:34 -0000	1.6
+++ tripwire.spec	11 Nov 2006 16:28:58 -0000	1.7
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:32 -0700
Subject: rpms/centericq/FC-4 .cvsignore, 1.4, 1.5 centericq.spec, 1.22,
	1.23 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTWF9008237@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/FC-4

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:47:28 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:02 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- centericq.spec	2 Mar 2006 21:47:41 -0000	1.22
+++ centericq.spec	11 Nov 2006 16:29:02 -0000	1.23
@@ -23,7 +23,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:47:28 -0000	1.4
+++ sources	11 Nov 2006 16:29:02 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:28 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:28 -0700
Subject: rpms/tripwire/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.4, 1.5 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTSi5008217@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-3

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:28:57 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:28:57 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-3/tripwire.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tripwire.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ tripwire.spec	11 Nov 2006 16:28:57 -0000	1.5
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:30 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:30 -0700
Subject: rpms/tripwire/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tripwire.spec, 1.6, 1.7 tw-20030919.patch, 1.1, NONE
Message-ID: <200611111629.kABGTUwm008227@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tripwire/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/tripwire/FC-5

Modified Files:
	.cvsignore sources tripwire.spec 
Removed Files:
	tw-20030919.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:29:07 -0000	1.2
+++ .cvsignore	11 Nov 2006 16:29:00 -0000	1.3
@@ -1 +1,2 @@
 tripwire-2.3.1-2.tar.gz
+tw-20030919.patch.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:29:07 -0000	1.2
+++ sources	11 Nov 2006 16:29:00 -0000	1.3
@@ -1 +1,2 @@
 6a15fe110565cef9ed33c1c7e070355e  tripwire-2.3.1-2.tar.gz
+728884715c96b27edb31fe0afb60c0cf  tw-20030919.patch.bz2


Index: tripwire.spec
===================================================================
RCS file: /cvs/extras/rpms/tripwire/FC-5/tripwire.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tripwire.spec	6 Apr 2005 22:13:34 -0000	1.6
+++ tripwire.spec	11 Nov 2006 16:29:00 -0000	1.7
@@ -30,7 +30,7 @@
 
 Patch0:		tripwire-2.3.0-50-rfc822.patch
 Patch1:		tripwire-mkstemp.patch
-Patch2:		tw-20030919.patch
+Patch2:		tw-20030919.patch.bz2
 Patch3:		tripwire-2.3.1-gcc3.new.patch
 Patch4:		tripwire-siggen-man8.patch
 Patch5:		pipedmailmessage.patch


--- tw-20030919.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:31 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:31 -0700
Subject: rpms/centericq/FC-3 .cvsignore, 1.4, 1.5 centericq.spec, 1.12,
	1.13 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTVl9008232@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/FC-3

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:52:18 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:01 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- centericq.spec	2 Mar 2006 21:47:35 -0000	1.12
+++ centericq.spec	11 Nov 2006 16:29:01 -0000	1.13
@@ -23,7 +23,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:52:18 -0000	1.4
+++ sources	11 Nov 2006 16:29:01 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:34 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:34 -0700
Subject: rpms/centericq/FC-5 .cvsignore, 1.4, 1.5 centericq.spec, 1.24,
	1.25 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTYi3008242@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/FC-5

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:47:29 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:03 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-5/centericq.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- centericq.spec	2 Mar 2006 21:47:47 -0000	1.24
+++ centericq.spec	11 Nov 2006 16:29:03 -0000	1.25
@@ -24,7 +24,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:47:29 -0000	1.4
+++ sources	11 Nov 2006 16:29:03 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:35 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:35 -0700
Subject: rpms/centericq/FC-6 .cvsignore, 1.4, 1.5 centericq.spec, 1.25,
	1.26 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTZeE008247@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/FC-6

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:47:29 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:04 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-6/centericq.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- centericq.spec	12 Sep 2006 07:12:22 -0000	1.25
+++ centericq.spec	11 Nov 2006 16:29:04 -0000	1.26
@@ -24,7 +24,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:47:29 -0000	1.4
+++ sources	11 Nov 2006 16:29:04 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:29:36 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 09:29:36 -0700
Subject: rpms/centericq/devel .cvsignore, 1.4, 1.5 centericq.spec, 1.26,
	1.27 sources, 1.4, 1.5 centericq-4.21.0.msn.patch, 1.1, NONE
Message-ID: <200611111629.kABGTaqo008252@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039/centericq/devel

Modified Files:
	.cvsignore centericq.spec sources 
Removed Files:
	centericq-4.21.0.msn.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Sep 2005 20:47:29 -0000	1.4
+++ .cvsignore	11 Nov 2006 16:29:05 -0000	1.5
@@ -1 +1,2 @@
 centericq-4.21.0.tar.bz2
+centericq-4.21.0.msn.patch.bz2


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- centericq.spec	6 Nov 2006 09:58:22 -0000	1.26
+++ centericq.spec	11 Nov 2006 16:29:06 -0000	1.27
@@ -24,7 +24,8 @@
 
 ## feature fixes
 # Fix libmsn 
-Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+Patch100:       centericq-4.21.0.msn.patch.bz2
 # Fix ljhook
 Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
 Patch102:       centericq-ljtypo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Sep 2005 20:47:29 -0000	1.4
+++ sources	11 Nov 2006 16:29:06 -0000	1.5
@@ -1 +1,2 @@
 82e426f2b4f6f2ab799c28807f36ade6  centericq-4.21.0.tar.bz2
+244ec357b3c71d7cd77df851b4a7ee19  centericq-4.21.0.msn.patch.bz2


--- centericq-4.21.0.msn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 16:31:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 09:31:08 -0700
Subject: rpms/xfce4-battery-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3, 
	1.4 xfce4-battery-plugin.spec, 1.6, 1.7
Message-ID: <200611111631.kABGV8qn008419@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8397

Modified Files:
	.cvsignore sources xfce4-battery-plugin.spec 
Log Message:
Update to 0.4.90.3 on XFCE 4.3.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 10:53:26 -0000	1.3
+++ .cvsignore	11 Nov 2006 16:30:38 -0000	1.4
@@ -1 +1 @@
-xfce4-battery-plugin-0.4.90.2.tar.bz2
+xfce4-battery-plugin-0.4.90.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 10:53:26 -0000	1.3
+++ sources	11 Nov 2006 16:30:38 -0000	1.4
@@ -1 +1 @@
-4dd103909b3d5bb373c12b69da783a6c  xfce4-battery-plugin-0.4.90.2.tar.bz2
+98fbbe0eb2840d7ad4534f124029ebd0  xfce4-battery-plugin-0.4.90.3.tar.bz2


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-battery-plugin.spec	5 Oct 2006 10:53:26 -0000	1.6
+++ xfce4-battery-plugin.spec	11 Nov 2006 16:30:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
-Version:	0.4.90.2
-Release:	3%{?dist}
+Version:	0.4.90.3
+Release:	1%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,7 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
 BuildRequires:	gettext, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.3.99.1
+Requires:	xfce4-panel >= 4.3.99.2
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -42,6 +42,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 31 2006 Christoph Wickert  - 0.4.90.3-1
+- Update to 0.4.90.3 on XFCE 4.3.99.2.
+
 * Thu Oct 05 2006 Christoph Wickert  - 0.4.90.2-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:39:16 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Sat, 11 Nov 2006 09:39:16 -0700
Subject: owners owners.list,1.1925,1.1926
Message-ID: <200611111639.kABGdGAV008540@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8512

Modified Files:
	owners.list 
Log Message:
Hey! Lazy Fedora Extras package maintainer, I want to file a bug report for phpMyAdmin!
Package was approved as per https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187843



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1925
retrieving revision 1.1926
diff -u -r1.1925 -r1.1926
--- owners.list	11 Nov 2006 15:30:28 -0000	1.1925
+++ owners.list	11 Nov 2006 16:38:45 -0000	1.1926
@@ -1813,6 +1813,7 @@
 Fedora Extras|php-shout|libshout extension for PHP|fedora at theholbrooks.org|extras-qa at fedoraproject.org|
 Fedora Extras|php-Smarty|Template/Presentation Framework for PHP|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
+Fedora Extras|phpMyAdmin|Web based MySQL browser written in php|imlinux at gmail.com|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|picocom|Minimal serial communications program|jafo-redhat at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|pikdev|IDE for development of PICmicro based application (under Linux/KDE)|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 16:41:02 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:41:02 -0700
Subject: rpms/glitz/FC-5 glitz.spec,1.2,1.3
Message-ID: <200611111641.kABGf2bT008637@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/glitz/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8588/FC-5

Modified Files:
	glitz.spec 
Log Message:
bump EVR to assure devel replaces FC6



Index: glitz.spec
===================================================================
RCS file: /cvs/extras/rpms/glitz/FC-5/glitz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glitz.spec	8 Jun 2006 21:59:38 -0000	1.2
+++ glitz.spec	11 Nov 2006 16:40:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           glitz
 Version:        0.5.6
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        OpenGL image compositing library
 Group:          System Environment/Libraries
 License:        BSD
@@ -93,6 +93,12 @@
 %{_mandir}/man3/glitz-glx.3.gz
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.5.6-5
+- bump EVR to assure devel replaces FC6
+
+* Fri Sep 15 2006 Eric Work  0.5.6-4
+- bumped version to prepare for FC6
+
 * Wed Jun 07 2006 Eric Work  0.5.6-3
 - added missing requires to devel packages
 - moved man pages to devel packages



From fedora-extras-commits at redhat.com  Sat Nov 11 16:41:03 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:41:03 -0700
Subject: rpms/glitz/FC-6 glitz.spec,1.3,1.4
Message-ID: <200611111641.kABGf3ih008640@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/glitz/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8588/FC-6

Modified Files:
	glitz.spec 
Log Message:
bump EVR to assure devel replaces FC6



Index: glitz.spec
===================================================================
RCS file: /cvs/extras/rpms/glitz/FC-6/glitz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glitz.spec	15 Sep 2006 16:34:01 -0000	1.3
+++ glitz.spec	11 Nov 2006 16:40:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glitz
 Version:        0.5.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OpenGL image compositing library
 Group:          System Environment/Libraries
 License:        BSD
@@ -93,6 +93,9 @@
 %{_mandir}/man3/glitz-glx.3.gz
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.5.6-5
+- bump EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.5.6-4
 - bumped version to prepare for FC6
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:41:04 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:41:04 -0700
Subject: rpms/glitz/devel glitz.spec,1.3,1.4
Message-ID: <200611111641.kABGf4CW008643@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/glitz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8588/devel

Modified Files:
	glitz.spec 
Log Message:
bump EVR to assure devel replaces FC6



Index: glitz.spec
===================================================================
RCS file: /cvs/extras/rpms/glitz/devel/glitz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glitz.spec	15 Sep 2006 16:34:01 -0000	1.3
+++ glitz.spec	11 Nov 2006 16:40:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glitz
 Version:        0.5.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OpenGL image compositing library
 Group:          System Environment/Libraries
 License:        BSD
@@ -93,6 +93,9 @@
 %{_mandir}/man3/glitz-glx.3.gz
 
 %changelog
+* Sat Nov 11 2006 Eric Work  0.5.6-5
+- bump EVR to assure devel replaces FC6
+
 * Fri Sep 15 2006 Eric Work  0.5.6-4
 - bumped version to prepare for FC6
 



From fedora-extras-commits at redhat.com  Sat Nov 11 16:44:59 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sat, 11 Nov 2006 09:44:59 -0700
Subject: owners owners.list,1.1926,1.1927
Message-ID: <200611111644.kABGixFW008818@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8802

Modified Files:
	owners.list 
Log Message:
Remove libsvg, libsvg-cairo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1926
retrieving revision 1.1927
diff -u -r1.1926 -r1.1927
--- owners.list	11 Nov 2006 16:38:45 -0000	1.1926
+++ owners.list	11 Nov 2006 16:44:29 -0000	1.1927
@@ -966,8 +966,6 @@
 Fedora Extras|libspectrum|The ZX Spectrum library required for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|libstroke|A stroke interface library|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|libsvg|A library for parsing SVG documents|work.eric at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|libsvg-cairo|Renders SVG content using cairo|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsx|Simple X library|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libsynaptics|Synaptics touchpad driver library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 11 17:00:55 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 10:00:55 -0700
Subject: rpms/Canna/FC-6 .cvsignore, 1.2, 1.3 Canna.spec, 1.5, 1.6 sources,
	1.2, 1.3 skk-dictionaries.patch, 1.1, NONE
Message-ID: <200611111700.kABH0twY008996@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Canna/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/FC-6

Modified Files:
	.cvsignore Canna.spec sources 
Removed Files:
	skk-dictionaries.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2005 09:29:14 -0000	1.2
+++ .cvsignore	11 Nov 2006 17:00:25 -0000	1.3
@@ -3,3 +3,4 @@
 pubdic-bonobo-20021028.tar.bz2
 shion.tar.gz
 zipcode-20030204.tar.bz2
+skk-dictionaries.patch.bz2


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-6/Canna.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Canna.spec	11 Sep 2006 02:52:53 -0000	1.5
+++ Canna.spec	11 Nov 2006 17:00:25 -0000	1.6
@@ -24,7 +24,7 @@
 Patch4: Canna-3.6-dont-grab-ctrl-o.patch
 Patch5: Canna-3.6-fix-warnings.patch
 ## some dictionaries were ported from SKK-JISYO.*
-Patch17: skk-dictionaries.patch
+Patch17: skk-dictionaries.patch.bz2
 Patch18: Canna-3.6-cannadic.patch
 Patch19: Canna-3.6-shion.patch
 Patch21: Canna-3.6-bonobo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 09:29:14 -0000	1.2
+++ sources	11 Nov 2006 17:00:25 -0000	1.3
@@ -3,3 +3,4 @@
 1c89701cc7a274068c3b265e2aa36ac2  pubdic-bonobo-20021028.tar.bz2
 9df0656abbcfdcc2001071805d23229b  shion.tar.gz
 d6287eb37f8b9151fa38cc2684952177  zipcode-20030204.tar.bz2
+00d90008e77e09884d9e76247e1b72d5  skk-dictionaries.patch.bz2


--- skk-dictionaries.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 17:00:54 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 10:00:54 -0700
Subject: rpms/Canna/FC-5 .cvsignore, 1.2, 1.3 Canna.spec, 1.4, 1.5 sources,
	1.2, 1.3 skk-dictionaries.patch, 1.1, NONE
Message-ID: <200611111700.kABH0sAU008991@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Canna/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/FC-5

Modified Files:
	.cvsignore Canna.spec sources 
Removed Files:
	skk-dictionaries.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2005 09:29:14 -0000	1.2
+++ .cvsignore	11 Nov 2006 17:00:23 -0000	1.3
@@ -3,3 +3,4 @@
 pubdic-bonobo-20021028.tar.bz2
 shion.tar.gz
 zipcode-20030204.tar.bz2
+skk-dictionaries.patch.bz2


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-5/Canna.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Canna.spec	7 Mar 2006 09:38:09 -0000	1.4
+++ Canna.spec	11 Nov 2006 17:00:23 -0000	1.5
@@ -24,7 +24,7 @@
 Patch4: Canna-3.6-dont-grab-ctrl-o.patch
 Patch5: Canna-3.6-fix-warnings.patch
 ## some dictionaries were ported from SKK-JISYO.*
-Patch17: skk-dictionaries.patch
+Patch17: skk-dictionaries.patch.bz2
 Patch18: Canna-3.6-cannadic.patch
 Patch19: Canna-3.6-shion.patch
 Patch21: Canna-3.6-bonobo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Canna/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 09:29:14 -0000	1.2
+++ sources	11 Nov 2006 17:00:24 -0000	1.3
@@ -3,3 +3,4 @@
 1c89701cc7a274068c3b265e2aa36ac2  pubdic-bonobo-20021028.tar.bz2
 9df0656abbcfdcc2001071805d23229b  shion.tar.gz
 d6287eb37f8b9151fa38cc2684952177  zipcode-20030204.tar.bz2
+00d90008e77e09884d9e76247e1b72d5  skk-dictionaries.patch.bz2


--- skk-dictionaries.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 17:00:57 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 11 Nov 2006 10:00:57 -0700
Subject: rpms/Canna/devel .cvsignore, 1.2, 1.3 Canna.spec, 1.5, 1.6 sources, 
	1.2, 1.3 skk-dictionaries.patch, 1.1, NONE
Message-ID: <200611111700.kABH0vBx009001@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/Canna/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/devel

Modified Files:
	.cvsignore Canna.spec sources 
Removed Files:
	skk-dictionaries.patch 
Log Message:
such huge patch sets, which do not change frequently, belong into the lookaside cache


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2005 09:29:14 -0000	1.2
+++ .cvsignore	11 Nov 2006 17:00:26 -0000	1.3
@@ -3,3 +3,4 @@
 pubdic-bonobo-20021028.tar.bz2
 shion.tar.gz
 zipcode-20030204.tar.bz2
+skk-dictionaries.patch.bz2


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Canna.spec	11 Sep 2006 02:52:53 -0000	1.5
+++ Canna.spec	11 Nov 2006 17:00:26 -0000	1.6
@@ -24,7 +24,7 @@
 Patch4: Canna-3.6-dont-grab-ctrl-o.patch
 Patch5: Canna-3.6-fix-warnings.patch
 ## some dictionaries were ported from SKK-JISYO.*
-Patch17: skk-dictionaries.patch
+Patch17: skk-dictionaries.patch.bz2
 Patch18: Canna-3.6-cannadic.patch
 Patch19: Canna-3.6-shion.patch
 Patch21: Canna-3.6-bonobo.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 09:29:14 -0000	1.2
+++ sources	11 Nov 2006 17:00:27 -0000	1.3
@@ -3,3 +3,4 @@
 1c89701cc7a274068c3b265e2aa36ac2  pubdic-bonobo-20021028.tar.bz2
 9df0656abbcfdcc2001071805d23229b  shion.tar.gz
 d6287eb37f8b9151fa38cc2684952177  zipcode-20030204.tar.bz2
+00d90008e77e09884d9e76247e1b72d5  skk-dictionaries.patch.bz2


--- skk-dictionaries.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 17:26:46 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 11 Nov 2006 10:26:46 -0700
Subject: rpms/pan/devel .cvsignore, 1.14, 1.15 pan.spec, 1.24, 1.25 sources, 
	1.14, 1.15 pan-0.99-gi18n.patch, 1.1, NONE
Message-ID: <200611111726.kABHQkqD012167@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12118

Modified Files:
	.cvsignore pan.spec sources 
Removed Files:
	pan-0.99-gi18n.patch 
Log Message:
update to latest upstream release & removed obsolete patch file

This week's release has a handful of small but important bugfixes, as well
as some good speedups.

This should be the last pre-1.0 release (just like the previous two releases
also should've been. ;)

http://bugzilla.gnome.org/buglist.cgi?bug_id=373193,372616,372241,371720,371453,370930,370195,363166,355805




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Nov 2006 20:34:07 -0000	1.14
+++ .cvsignore	11 Nov 2006 17:26:16 -0000	1.15
@@ -1 +1 @@
-pan-0.118.tar.bz2
+pan-0.119.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pan.spec	4 Nov 2006 20:34:07 -0000	1.24
+++ pan.spec	11 Nov 2006 17:26:16 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.118
+Version:	0.119
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Nov 11 2006 Alexander Dalloz  - 1:0.119-1
+- Update to 0.119
+
 * Sat Nov 04 2006 Alexander Dalloz  - 1:0.118-1
 - Update to 0.118
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Nov 2006 20:34:07 -0000	1.14
+++ sources	11 Nov 2006 17:26:16 -0000	1.15
@@ -1 +1 @@
-03c8ed7192d0454684a0c17c6082b92a  pan-0.118.tar.bz2
+4ae2819c841a6e504c2f4aa51b752f8f  pan-0.119.tar.bz2


--- pan-0.99-gi18n.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 17:45:53 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 10:45:53 -0700
Subject: rpms/libxfce4util/FC-6 libxfce4util.spec, 1.13, 1.14 sources, 1.6, 
	1.7 .cvsignore, 1.6, 1.7
Message-ID: <200611111745.kABHjrH7012432@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4util/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12410

Modified Files:
	libxfce4util.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: libxfce4util.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/FC-6/libxfce4util.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libxfce4util.spec	6 Oct 2006 01:37:15 -0000	1.13
+++ libxfce4util.spec	11 Nov 2006 17:45:23 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Utility library for the Xfce4 desktop environment
 Name: libxfce4util
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD and LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4util-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2
 Group: Development/Libraries
 Requires: glib2 >= 2.0.0
 BuildRequires: glib2-devel >= 2.0.0
@@ -57,6 +57,9 @@
 %{_includedir}/xfce4
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 01:39:07 -0000	1.6
+++ sources	11 Nov 2006 17:45:23 -0000	1.7
@@ -1 +1 @@
-5474fda120b0f28f3b86bee268467060  libxfce4util-4.3.99.1.tar.bz2
+4b327c64c292b2e672f69a0789deb2b7  libxfce4util-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4util/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 01:39:07 -0000	1.6
+++ .cvsignore	11 Nov 2006 17:45:23 -0000	1.7
@@ -1 +1 @@
-libxfce4util-4.3.99.1.tar.bz2
+libxfce4util-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:42 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:42 -0700
Subject: rpms/zeroinstall-injector/FC-3 zeroinstall-x86_64-arch.patch, NONE, 
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHkgGT012561@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-3

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:24 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:12 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -29,13 +30,14 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +59,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:43 -0700
Subject: rpms/zeroinstall-injector/FC-4 zeroinstall-x86_64-arch.patch, NONE, 
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHkhaL012564@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-4

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-4/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:25 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:12 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:50 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:50 -0700
Subject: rpms/zeroinstall-injector/FC-6 zeroinstall-x86_64-arch.patch, NONE, 
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHkoD8012570@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-6

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-6/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:32 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:19 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:43 -0700
Subject: rpms/zeroinstall-injector/FC-5 zeroinstall-x86_64-arch.patch, NONE, 
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHkhdk012567@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-5

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-5/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:31 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:13 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:46:50 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 11 Nov 2006 10:46:50 -0700
Subject: rpms/zeroinstall-injector/devel zeroinstall-x86_64-arch.patch, NONE,
	1.1 zeroinstall-injector.spec, 1.3, 1.4
Message-ID: <200611111746.kABHko7p012573@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/devel

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
+++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
@@ -42,6 +42,7 @@
 		'i486': ['i386'],
 		'i586': ['i486', 'i386'],
 		'i686': ['i586', 'i486', 'i386'],
+		'x86_64': ['i686', 'i586', 'i486', 'i386'],
 		'ppc64': ['ppc32'],
 	}
 	for supported in _machine_matrix.get(this_machine, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/devel/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:33 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:20 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim  0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim  0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer



From fedora-extras-commits at redhat.com  Sat Nov 11 17:51:32 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 10:51:32 -0700
Subject: rpms/libxfcegui4/FC-6 libxfcegui4.spec, 1.16, 1.17 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111751.kABHpWfJ012808@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12786

Modified Files:
	libxfcegui4.spec sources .cvsignore 
Log Message:
Upgrade to 4.3.99.2



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/FC-6/libxfcegui4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libxfcegui4.spec	6 Oct 2006 01:38:33 -0000	1.16
+++ libxfcegui4.spec	11 Nov 2006 17:51:02 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfcegui4-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gtk2 >= 2.0.6
@@ -67,6 +67,9 @@
 %{_includedir}/xfce4/*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Upgrade to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 01:42:24 -0000	1.5
+++ sources	11 Nov 2006 17:51:02 -0000	1.6
@@ -1 +1 @@
-519bca1ba08e51f03584ce6c007cd10d  libxfcegui4-4.3.99.1.tar.bz2
+98679c67ac65c376833deacec9fcbecf  libxfcegui4-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 01:42:24 -0000	1.5
+++ .cvsignore	11 Nov 2006 17:51:02 -0000	1.6
@@ -1 +1 @@
-libxfcegui4-4.3.99.1.tar.bz2
+libxfcegui4-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 17:56:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 10:56:18 -0700
Subject: rpms/perl-Email-Address/FC-5 .cvsignore, 1.6,
	1.7 perl-Email-Address.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200611111756.kABHuIwi012905@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12853/FC-5

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.880.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
+++ .cvsignore	11 Nov 2006 17:55:48 -0000	1.7
@@ -1 +1 @@
-Email-Address-1.871.tar.gz
+Email-Address-1.880.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/perl-Email-Address.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
+++ perl-Email-Address.spec	11 Nov 2006 17:55:48 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.871
+Version:        1.880
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
+- Update to 1.880.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.871-1
 - Update to 1.871.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Oct 2006 19:47:23 -0000	1.6
+++ sources	11 Nov 2006 17:55:48 -0000	1.7
@@ -1 +1 @@
-1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz
+8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 17:56:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 10:56:19 -0700
Subject: rpms/perl-Email-Address/FC-6 .cvsignore, 1.6,
	1.7 perl-Email-Address.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200611111756.kABHuJTw012910@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12853/FC-6

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.880.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
+++ .cvsignore	11 Nov 2006 17:55:49 -0000	1.7
@@ -1 +1 @@
-Email-Address-1.871.tar.gz
+Email-Address-1.880.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/perl-Email-Address.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
+++ perl-Email-Address.spec	11 Nov 2006 17:55:49 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.871
+Version:        1.880
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
+- Update to 1.880.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.871-1
 - Update to 1.871.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Oct 2006 19:47:23 -0000	1.6
+++ sources	11 Nov 2006 17:55:49 -0000	1.7
@@ -1 +1 @@
-1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz
+8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 17:56:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 10:56:20 -0700
Subject: rpms/perl-Email-Address/devel .cvsignore, 1.6,
	1.7 perl-Email-Address.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200611111756.kABHuKs0012915@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12853/devel

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.880.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Oct 2006 19:47:23 -0000	1.6
+++ .cvsignore	11 Nov 2006 17:55:49 -0000	1.7
@@ -1 +1 @@
-Email-Address-1.871.tar.gz
+Email-Address-1.880.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Email-Address.spec	13 Oct 2006 19:47:23 -0000	1.5
+++ perl-Email-Address.spec	11 Nov 2006 17:55:49 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.871
+Version:        1.880
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
+- Update to 1.880.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.871-1
 - Update to 1.871.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Oct 2006 19:47:23 -0000	1.6
+++ sources	11 Nov 2006 17:55:49 -0000	1.7
@@ -1 +1 @@
-1eba5872c0629a3b94fc99d907b7e2e5  Email-Address-1.871.tar.gz
+8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 17:58:16 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 10:58:16 -0700
Subject: rpms/libxfce4mcs/FC-6 libxfce4mcs.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111758.kABHwG8J013109@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfce4mcs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13084

Modified Files:
	libxfce4mcs.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: libxfce4mcs.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/FC-6/libxfce4mcs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libxfce4mcs.spec	6 Oct 2006 01:55:58 -0000	1.12
+++ libxfce4mcs.spec	11 Nov 2006 17:57:46 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: Multi-channel settings management support for Xfce
 Name: libxfce4mcs
-Version: 4.3.99.1
-Release: 2%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/libxfce4mcs-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -62,6 +62,9 @@
 %{_includedir}/xfce4/libxfce4mcs
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - remove unneeded prereq


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 01:48:05 -0000	1.5
+++ sources	11 Nov 2006 17:57:46 -0000	1.6
@@ -1 +1 @@
-ad70646a4ef699d7adcd409339f78884  libxfce4mcs-4.3.99.1.tar.bz2
+7ee4eab238e773b9dbf3fa1472643f6e  libxfce4mcs-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxfce4mcs/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 01:48:05 -0000	1.5
+++ .cvsignore	11 Nov 2006 17:57:46 -0000	1.6
@@ -1 +1 @@
-libxfce4mcs-4.3.99.1.tar.bz2
+libxfce4mcs-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 18:08:24 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 11:08:24 -0700
Subject: rpms/xfce-mcs-manager/FC-6 xfce-mcs-manager.spec, 1.9, 1.10 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111808.kABI8Ono016300@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16274

Modified Files:
	xfce-mcs-manager.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/FC-6/xfce-mcs-manager.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce-mcs-manager.spec	6 Oct 2006 02:06:08 -0000	1.9
+++ xfce-mcs-manager.spec	11 Nov 2006 18:07:54 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-manager-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: libxfce4mcs >= %{version}
@@ -61,6 +61,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Add period to description
 - Fix defattr


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:01:44 -0000	1.5
+++ sources	11 Nov 2006 18:07:54 -0000	1.6
@@ -1 +1 @@
-1a42226297b3b89f19bd17a6841f5c3a  xfce-mcs-manager-4.3.99.1.tar.bz2
+59d6d8f4f931b562b39ea1decdf9e29e  xfce-mcs-manager-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:01:44 -0000	1.5
+++ .cvsignore	11 Nov 2006 18:07:54 -0000	1.6
@@ -1 +1 @@
-xfce-mcs-manager-4.3.99.1.tar.bz2
+xfce-mcs-manager-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 18:10:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 11:10:37 -0700
Subject: rpms/perl-Wx/FC-5 .cvsignore, 1.3, 1.4 perl-Wx.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611111810.kABIAbkX016403@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16330/FC-5

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.60.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Oct 2006 14:04:09 -0000	1.3
+++ .cvsignore	11 Nov 2006 18:10:07 -0000	1.4
@@ -1 +1 @@
-Wx-0.59.tar.gz
+Wx-0.60.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/perl-Wx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Wx.spec	21 Oct 2006 14:04:09 -0000	1.2
+++ perl-Wx.spec	11 Nov 2006 18:10:07 -0000	1.3
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.59
+Version:        0.60
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.22
+BuildRequires:  perl(Alien::wxWidgets) >= 0.25
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
+- Update to 0.60.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.59-1
 - Update to 0.59.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2006 14:04:09 -0000	1.3
+++ sources	11 Nov 2006 18:10:07 -0000	1.4
@@ -1 +1 @@
-8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz
+be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:10:38 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 11:10:38 -0700
Subject: rpms/perl-Wx/FC-6 .cvsignore, 1.3, 1.4 perl-Wx.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611111810.kABIAc87016408@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16330/FC-6

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.60.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Oct 2006 14:04:11 -0000	1.3
+++ .cvsignore	11 Nov 2006 18:10:08 -0000	1.4
@@ -1 +1 @@
-Wx-0.59.tar.gz
+Wx-0.60.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/perl-Wx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Wx.spec	21 Oct 2006 14:04:11 -0000	1.2
+++ perl-Wx.spec	11 Nov 2006 18:10:08 -0000	1.3
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.59
+Version:        0.60
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.22
+BuildRequires:  perl(Alien::wxWidgets) >= 0.25
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
+- Update to 0.60.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.59-1
 - Update to 0.59.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2006 14:04:11 -0000	1.3
+++ sources	11 Nov 2006 18:10:08 -0000	1.4
@@ -1 +1 @@
-8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz
+be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:10:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 11:10:44 -0700
Subject: rpms/perl-Wx/devel .cvsignore, 1.3, 1.4 perl-Wx.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611111810.kABIAiX7016413@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16330/devel

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.60.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Oct 2006 14:04:11 -0000	1.3
+++ .cvsignore	11 Nov 2006 18:10:14 -0000	1.4
@@ -1 +1 @@
-Wx-0.59.tar.gz
+Wx-0.60.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Wx.spec	21 Oct 2006 14:04:11 -0000	1.2
+++ perl-Wx.spec	11 Nov 2006 18:10:14 -0000	1.3
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.59
+Version:        0.60
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -16,7 +16,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wxGTK-devel
-BuildRequires:  perl(Alien::wxWidgets) >= 0.22
+BuildRequires:  perl(Alien::wxWidgets) >= 0.25
 BuildRequires:  perl(Module::Info)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML) >= 0.35
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
+- Update to 0.60.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 0.59-1
 - Update to 0.59.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2006 14:04:11 -0000	1.3
+++ sources	11 Nov 2006 18:10:14 -0000	1.4
@@ -1 +1 @@
-8e65ea7a4ce27d26d84150a656ea8b9b  Wx-0.59.tar.gz
+be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:10:53 2006
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Sat, 11 Nov 2006 11:10:53 -0700
Subject: rpms/pan/FC-6 .cvsignore, 1.14, 1.15 pan.spec, 1.24, 1.25 sources, 
	1.14, 1.15 pan-0.99-gi18n.patch, 1.1, NONE
Message-ID: <200611111810.kABIArxf016427@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/rpms/pan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16297

Modified Files:
	.cvsignore pan.spec sources 
Removed Files:
	pan-0.99-gi18n.patch 
Log Message:
update to latest upstream release & removed obsolete patch file

This week's release has a handful of small but important bugfixes, as well
as some good speedups.

This should be the last pre-1.0 release (just like the previous two releases
also should've been.  ;) 

http://bugzilla.gnome.org/buglist.cgi?bug_id=373193,372616,372241,371720,371453,370930,370195,363166,355805




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Nov 2006 20:58:45 -0000	1.14
+++ .cvsignore	11 Nov 2006 18:10:23 -0000	1.15
@@ -1 +1 @@
-pan-0.118.tar.bz2
+pan-0.119.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/pan.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pan.spec	4 Nov 2006 20:58:45 -0000	1.24
+++ pan.spec	11 Nov 2006 18:10:23 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:	A GNOME/GTK+ news reader for X
 Name:		pan
-Version:	0.118
+Version:	0.119
 Release:	1%{?dist}
 Epoch:		1
 License:	GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sat Nov 11 2006 Alexander Dalloz  - 1:0.119-1
+- Update to 0.119
+
 * Sat Nov 04 2006 Alexander Dalloz  - 1:0.118-1
 - Update to 0.118
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Nov 2006 20:58:45 -0000	1.14
+++ sources	11 Nov 2006 18:10:23 -0000	1.15
@@ -1 +1 @@
-03c8ed7192d0454684a0c17c6082b92a  pan-0.118.tar.bz2
+4ae2819c841a6e504c2f4aa51b752f8f  pan-0.119.tar.bz2


--- pan-0.99-gi18n.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 11 18:18:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 11:18:34 -0700
Subject: rpms/openct/devel .cvsignore, 1.9, 1.10 openct.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200611111818.kABIIY2L016677@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16630/devel

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
- 0.6.10, udev rules fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Sep 2006 08:37:52 -0000	1.9
+++ .cvsignore	11 Nov 2006 18:18:04 -0000	1.10
@@ -1 +1 @@
-openct-0.6.9.tar.gz
+openct-0.6.10.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openct.spec	16 Oct 2006 18:24:51 -0000	1.19
+++ openct.spec	11 Nov 2006 18:18:04 -0000	1.20
@@ -1,8 +1,8 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.9
-Release:        3%{?dist}
+Version:        0.6.10
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -57,7 +57,6 @@
 %setup -q
 sh bootstrap # avoid standard rpaths on lib64 archs
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
-sed -i -e 's|^BUS="|BUS=="|' etc/openct.udev
 
 
 %build
@@ -160,6 +159,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
+- 0.6.10, udev rules fixed upstream.
+
 * Mon Oct 16 2006 Ville Skytt??  - 0.6.9-3
 - Fix udev rules for newer udev versions (#210868).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Sep 2006 08:37:52 -0000	1.9
+++ sources	11 Nov 2006 18:18:04 -0000	1.10
@@ -1 +1 @@
-26c7f8d9fabbd698303601cc7d844252  openct-0.6.9.tar.gz
+fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:18:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 11 Nov 2006 11:18:33 -0700
Subject: rpms/openct/FC-6 .cvsignore, 1.9, 1.10 openct.spec, 1.19,
	1.20 sources, 1.9, 1.10
Message-ID: <200611111818.kABIIXaD016670@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16630/FC-6

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
- 0.6.10, udev rules fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Sep 2006 08:37:52 -0000	1.9
+++ .cvsignore	11 Nov 2006 18:18:03 -0000	1.10
@@ -1 +1 @@
-openct-0.6.9.tar.gz
+openct-0.6.10.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/openct.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openct.spec	16 Oct 2006 18:24:51 -0000	1.19
+++ openct.spec	11 Nov 2006 18:18:03 -0000	1.20
@@ -1,8 +1,8 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.9
-Release:        3%{?dist}
+Version:        0.6.10
+Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -57,7 +57,6 @@
 %setup -q
 sh bootstrap # avoid standard rpaths on lib64 archs
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
-sed -i -e 's|^BUS="|BUS=="|' etc/openct.udev
 
 
 %build
@@ -160,6 +159,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
+- 0.6.10, udev rules fixed upstream.
+
 * Mon Oct 16 2006 Ville Skytt??  - 0.6.9-3
 - Fix udev rules for newer udev versions (#210868).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Sep 2006 08:37:52 -0000	1.9
+++ sources	11 Nov 2006 18:18:03 -0000	1.10
@@ -1 +1 @@
-26c7f8d9fabbd698303601cc7d844252  openct-0.6.9.tar.gz
+fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 18:20:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 11:20:11 -0700
Subject: rpms/xfce4-panel/FC-6 xfce4-panel.spec, 1.17, 1.18 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111820.kABIKB6e016829@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-panel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16804

Modified Files:
	xfce4-panel.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/FC-6/xfce4-panel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xfce4-panel.spec	6 Oct 2006 08:13:22 -0000	1.17
+++ xfce4-panel.spec	11 Nov 2006 18:19:41 -0000	1.18
@@ -1,10 +1,10 @@
 Summary: Next generation panel for Xfce
 Name: xfce4-panel
-Version: 4.3.99.1
-Release: 7%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libxfcegui4 >= %{version}
@@ -119,6 +119,9 @@
 %{_includedir}/xfce4/libxfce4panel
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Fri Oct  6 2006 Kevin Fenzi  - 4.3.99.1-7
 - List full old versions in Obsoletes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:10:26 -0000	1.5
+++ sources	11 Nov 2006 18:19:41 -0000	1.6
@@ -1 +1 @@
-8647de295987605161c75650e4554fd8  xfce4-panel-4.3.99.1.tar.bz2
+53f96a9db5628ac1c629c9e5ecd842e4  xfce4-panel-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:10:26 -0000	1.5
+++ .cvsignore	11 Nov 2006 18:19:41 -0000	1.6
@@ -1 +1 @@
-xfce4-panel-4.3.99.1.tar.bz2
+xfce4-panel-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 18:27:59 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 11 Nov 2006 11:27:59 -0700
Subject: rpms/granule/devel granule.spec,1.3,1.4
Message-ID: <200611111827.kABIRxMV016946@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16917

Modified Files:
	granule.spec 
Log Message:
Added %{?dist} per buildsys request from Michael Schwendt 



Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- granule.spec	7 Nov 2006 03:47:18 -0000	1.3
+++ granule.spec	11 Nov 2006 18:27:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.2.3
-Release:    4
+Release:    4{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/



From fedora-extras-commits at redhat.com  Sat Nov 11 18:32:00 2006
From: fedora-extras-commits at redhat.com (Vladislav Grinchenko (vlg))
Date: Sat, 11 Nov 2006 11:32:00 -0700
Subject: rpms/granule/devel granule.spec,1.4,1.5
Message-ID: <200611111832.kABIW0gh017042@cvs-int.fedora.redhat.com>

Author: vlg

Update of /cvs/extras/rpms/granule/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17021

Modified Files:
	granule.spec 
Log Message:
Added missing percentage.



Index: granule.spec
===================================================================
RCS file: /cvs/extras/rpms/granule/devel/granule.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- granule.spec	11 Nov 2006 18:27:29 -0000	1.4
+++ granule.spec	11 Nov 2006 18:31:29 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:    Flashcards program based on Leitner methodology
 Name:       granule
 Version:    1.2.3
-Release:    4{?dist}
+Release:    4%{?dist}
 License:    GPL
 Group:      Applications/Multimedia
 URL:        http://granule.sourceforge.net/



From fedora-extras-commits at redhat.com  Sat Nov 11 18:48:04 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 11:48:04 -0700
Subject: rpms/gtk-xfce-engine/FC-6 gtk-xfce-engine.spec, 1.13, 1.14 sources, 
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111848.kABIm4Vo017225@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/gtk-xfce-engine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17205

Modified Files:
	gtk-xfce-engine.spec sources .cvsignore 
Log Message:
Update to 2.3.99.2



Index: gtk-xfce-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-6/gtk-xfce-engine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtk-xfce-engine.spec	6 Oct 2006 02:27:27 -0000	1.13
+++ gtk-xfce-engine.spec	11 Nov 2006 18:47:34 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: Port of Xfce engine to GTK+-2.0
 Name: gtk-xfce-engine
-Version: 2.3.99.1
-Release: 3%{?dist}
+Version: 2.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/gtk-xfce-engine-2.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/gtk-xfce-engine-2.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= 2.0.0
@@ -35,6 +35,9 @@
 %{_datadir}/*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 2.3.99.2-1
+- Update to 2.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 2.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:13:53 -0000	1.5
+++ sources	11 Nov 2006 18:47:34 -0000	1.6
@@ -1 +1 @@
-d5e9e9f5113268a1a3662ee420d064f7  gtk-xfce-engine-2.3.99.1.tar.bz2
+430c004dd67bc6445d7a162e626566fb  gtk-xfce-engine-2.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-xfce-engine/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:13:53 -0000	1.5
+++ .cvsignore	11 Nov 2006 18:47:34 -0000	1.6
@@ -1 +1 @@
-gtk-xfce-engine-2.3.99.1.tar.bz2
+gtk-xfce-engine-2.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:07:06 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:07:06 -0700
Subject: rpms/exo/FC-6 exo.spec, 1.19, 1.20 sources, 1.4, 1.5 .cvsignore, 1.4,
	1.5
Message-ID: <200611111907.kABJ760N020330@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20303

Modified Files:
	exo.spec sources .cvsignore 
Log Message:
Update to 0.3.1.12rc2



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-6/exo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- exo.spec	6 Oct 2006 03:51:31 -0000	1.19
+++ exo.spec	11 Nov 2006 19:06:35 -0000	1.20
@@ -2,11 +2,11 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.1.10
-Release: 0.6.rc1%{?dist}
+Version: 0.3.1.12
+Release: 0.1.rc2%{?dist}
 License: LGPL
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/exo-0.3.1.10rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/exo-0.3.1.12rc2.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
 Group: Development/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +43,7 @@
 Python libraries and header files for the exo library.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %patch0 -p1 -b x86_64-build
 
@@ -83,6 +83,7 @@
 %{_datadir}/xfce4/helpers
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/ja
+%{_datadir}/xfce4/doc/fr
 %{_mandir}/man1/exo-csource.1.gz
 %{_mandir}/man1/exo-open.1.gz
 %{_bindir}/exo-csource
@@ -93,6 +94,7 @@
 %{_libexecdir}/exo-helper-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
+%{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-other.png
@@ -112,6 +114,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 0.3.1.12-0.1.rc2
+- Update to 0.3.1.12rc2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.3.1.10-0.6.rc1
 - Added libxfce4util-devel Requires for the devel package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 22:07:51 -0000	1.4
+++ sources	11 Nov 2006 19:06:35 -0000	1.5
@@ -1 +1 @@
-98d5493c898ab54b82b0835fc0e6df87  exo-0.3.1.10rc1.tar.bz2
+4c74431033c4c222efeccd4cf47ab65f  exo-0.3.1.12rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 22:07:51 -0000	1.4
+++ .cvsignore	11 Nov 2006 19:06:35 -0000	1.5
@@ -1 +1 @@
-exo-0.3.1.10rc1.tar.bz2
+exo-0.3.1.12rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:15:30 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:15:30 -0700
Subject: rpms/Thunar/FC-6 Thunar.spec, 1.7, 1.8 sources, 1.2, 1.3 .cvsignore,
	1.2, 1.3
Message-ID: <200611111915.kABJFUec020530@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Thunar/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20508

Modified Files:
	Thunar.spec sources .cvsignore 
Log Message:
Upgrade to 0.5.0rc2



Index: Thunar.spec
===================================================================
RCS file: /cvs/extras/rpms/Thunar/FC-6/Thunar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Thunar.spec	9 Oct 2006 19:13:47 -0000	1.7
+++ Thunar.spec	11 Nov 2006 19:15:00 -0000	1.8
@@ -1,10 +1,10 @@
 Summary: Thunar File Manager
 Name: Thunar
-Version: 0.4.0
-Release: 0.11.rc1%{?dist}
+Version: 0.5.0
+Release: 0.1.rc2%{?dist}
 License: GPL
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Thunar-0.4.0rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Thunar-0.5.0rc2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fam-devel
@@ -49,7 +49,7 @@
 libraries and header files for the Thunar file manager.
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %build
 %configure --enable-dbus --enable-final --enable-xsltproc --enable-gtk-doc
@@ -164,6 +164,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Nov 09 2006 Kevin Fenzi  - 0.5.0-0.1.rc2
+- Upgrade to 0.5.0rc2
+
 * Mon Oct 09 2006 Kevin Fenzi  - 0.4.0-0.11.rc1
 - Add shared-mime-info and xfce4-icon-theme as Requires (fixes #209592)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Thunar/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Sep 2006 22:55:50 -0000	1.2
+++ sources	11 Nov 2006 19:15:00 -0000	1.3
@@ -1 +1 @@
-b07ae97a69964112e0af84ba2f63585d  Thunar-0.4.0rc1.tar.bz2
+c97f6a011eb72b8653ad799290c71d52  Thunar-0.5.0rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Thunar/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Sep 2006 22:55:50 -0000	1.2
+++ .cvsignore	11 Nov 2006 19:15:00 -0000	1.3
@@ -1 +1 @@
-Thunar-0.4.0rc1.tar.bz2
+Thunar-0.5.0rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:29:35 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:29:35 -0700
Subject: rpms/Terminal/FC-6 Terminal.spec, 1.13, 1.14 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200611111929.kABJTZm7020717@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20691

Modified Files:
	Terminal.spec sources .cvsignore 
Log Message:
Update to 0.2.5.8rc2



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/FC-6/Terminal.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Terminal.spec	6 Oct 2006 02:50:50 -0000	1.13
+++ Terminal.spec	11 Nov 2006 19:29:05 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.2.5.6
-Release: 0.3.rc1%{?dist}
+Version: 0.2.5.8
+Release: 0.1.rc2%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/Terminal-0.2.5.6rc1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Terminal-0.2.5.8rc2.tar.bz2
 Group: User Interface/X
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel
@@ -18,7 +18,7 @@
 it unique among X terminal emulators. 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q -n %{name}-%{version}rc2
 
 %build
 %configure
@@ -60,6 +60,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.2.5.8-0.1.rc2
+- Update to 0.2.5.8rc2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.2.5.6-0.4.rc1
 - Added gtk-update-icon-cache to post/postun
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Terminal/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 22:22:52 -0000	1.4
+++ sources	11 Nov 2006 19:29:05 -0000	1.5
@@ -1 +1 @@
-4aa04a71f3dd2d132ed3d10f174171ca  Terminal-0.2.5.6rc1.tar.bz2
+d2785c1b11c48ed012042faa708bbf94  Terminal-0.2.5.8rc2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Terminal/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 22:22:52 -0000	1.4
+++ .cvsignore	11 Nov 2006 19:29:05 -0000	1.5
@@ -1 +1 @@
-Terminal-0.2.5.6rc1.tar.bz2
+Terminal-0.2.5.8rc2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:31:10 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:31:10 -0700
Subject: rpms/xfce4-appfinder/FC-6 xfce4-appfinder.spec, 1.10, 1.11 sources, 
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111931.kABJVA7w020842@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-appfinder/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20796

Modified Files:
	xfce4-appfinder.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-appfinder.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-6/xfce4-appfinder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce4-appfinder.spec	6 Oct 2006 05:57:08 -0000	1.10
+++ xfce4-appfinder.spec	11 Nov 2006 19:30:40 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Appfinder for the Xfce4 Desktop Environment
 Name: xfce4-appfinder
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-appfinder-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -49,6 +49,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-appfinder.png
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Add period to description
 - Fix defattr


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:34:54 -0000	1.5
+++ sources	11 Nov 2006 19:30:40 -0000	1.6
@@ -1 +1 @@
-576b6af7ed7223cbdbccf7df509b8c9f  xfce4-appfinder-4.3.99.1.tar.bz2
+a4636f51d79eb68ba65098336d120d56  xfce4-appfinder-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-appfinder/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:34:54 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:30:40 -0000	1.6
@@ -1 +1 @@
-xfce4-appfinder-4.3.99.1.tar.bz2
+xfce4-appfinder-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:31:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 12:31:20 -0700
Subject: rpms/xfce4-battery-plugin/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-battery-plugin.spec, 1.6, 1.7
Message-ID: <200611111931.kABJVKLO020884@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20819

Modified Files:
	.cvsignore sources xfce4-battery-plugin.spec 
Log Message:
Update to 0.4.90.3 on XFCE 4.3.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 10:53:26 -0000	1.3
+++ .cvsignore	11 Nov 2006 19:30:50 -0000	1.4
@@ -1 +1 @@
-xfce4-battery-plugin-0.4.90.2.tar.bz2
+xfce4-battery-plugin-0.4.90.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 10:53:26 -0000	1.3
+++ sources	11 Nov 2006 19:30:50 -0000	1.4
@@ -1 +1 @@
-4dd103909b3d5bb373c12b69da783a6c  xfce4-battery-plugin-0.4.90.2.tar.bz2
+98fbbe0eb2840d7ad4534f124029ebd0  xfce4-battery-plugin-0.4.90.3.tar.bz2


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-6/xfce4-battery-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-battery-plugin.spec	5 Oct 2006 10:53:26 -0000	1.6
+++ xfce4-battery-plugin.spec	11 Nov 2006 19:30:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
-Version:	0.4.90.2
-Release:	3%{?dist}
+Version:	0.4.90.3
+Release:	1%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,7 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
 BuildRequires:	gettext, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.3.99.1
+Requires:	xfce4-panel >= 4.3.99.2
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -42,6 +42,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Thu Oct 31 2006 Christoph Wickert  - 0.4.90.3-1
+- Update to 0.4.90.3 on XFCE 4.3.99.2.
+
 * Thu Oct 05 2006 Christoph Wickert  - 0.4.90.2-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sat Nov 11 19:32:44 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:32:44 -0700
Subject: rpms/xfce4-icon-theme/FC-6 xfce4-icon-theme.spec, 1.11, 1.12 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111932.kABJWivb020936@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-icon-theme/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20904

Modified Files:
	xfce4-icon-theme.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-icon-theme.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/FC-6/xfce4-icon-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-icon-theme.spec	6 Oct 2006 05:59:03 -0000	1.11
+++ xfce4-icon-theme.spec	11 Nov 2006 19:32:14 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-icon-theme-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -37,6 +37,9 @@
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:38:12 -0000	1.5
+++ sources	11 Nov 2006 19:32:14 -0000	1.6
@@ -1 +1 @@
-ccdcd6aa7e03732347d785a826c81f84  xfce4-icon-theme-4.3.99.1.tar.bz2
+e8ad35bc50a84f620848f841d5167fb9  xfce4-icon-theme-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-icon-theme/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:38:12 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:32:14 -0000	1.6
@@ -1 +1 @@
-xfce4-icon-theme-4.3.99.1.tar.bz2
+xfce4-icon-theme-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:33:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 12:33:27 -0700
Subject: rpms/xfce4-battery-plugin/devel xfce4-battery-plugin.spec,1.7,1.8
Message-ID: <200611111933.kABJXRS9021024@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20978/devel

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
fix date in changelog


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-battery-plugin.spec	11 Nov 2006 16:30:38 -0000	1.7
+++ xfce4-battery-plugin.spec	11 Nov 2006 19:32:56 -0000	1.8
@@ -42,7 +42,7 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Thu Oct 31 2006 Christoph Wickert  - 0.4.90.3-1
+* Sat Nov 11 2006 Christoph Wickert  - 0.4.90.3-1
 - Update to 0.4.90.3 on XFCE 4.3.99.2.
 
 * Thu Oct 05 2006 Christoph Wickert  - 0.4.90.2-3



From fedora-extras-commits at redhat.com  Sat Nov 11 19:33:25 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 12:33:25 -0700
Subject: rpms/xfce4-battery-plugin/FC-6 xfce4-battery-plugin.spec,1.7,1.8
Message-ID: <200611111933.kABJXPaq021021@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20978/FC-6

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
fix date in changelog


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-6/xfce4-battery-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xfce4-battery-plugin.spec	11 Nov 2006 19:30:50 -0000	1.7
+++ xfce4-battery-plugin.spec	11 Nov 2006 19:32:55 -0000	1.8
@@ -42,7 +42,7 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
-* Thu Oct 31 2006 Christoph Wickert  - 0.4.90.3-1
+* Sat Nov 11 2006 Christoph Wickert  - 0.4.90.3-1
 - Update to 0.4.90.3 on XFCE 4.3.99.2.
 
 * Thu Oct 05 2006 Christoph Wickert  - 0.4.90.2-3



From fedora-extras-commits at redhat.com  Sat Nov 11 19:34:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:34:11 -0700
Subject: rpms/xfce4-mixer/FC-6 xfce4-mixer.spec, 1.11, 1.12 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111934.kABJYBQe021084@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-mixer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21030

Modified Files:
	xfce4-mixer.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/FC-6/xfce4-mixer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce4-mixer.spec	6 Oct 2006 06:04:58 -0000	1.11
+++ xfce4-mixer.spec	11 Nov 2006 19:33:40 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Volume control plugin for the Xfce 4 panel
 Name: xfce4-mixer
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-mixer-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfce4-panel >= 4.3.99.1
@@ -56,6 +56,9 @@
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mixer-plugin
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - Add period to the end of description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:44:00 -0000	1.5
+++ sources	11 Nov 2006 19:33:40 -0000	1.6
@@ -1 +1 @@
-5836282f9795d10b65d41564a923f677  xfce4-mixer-4.3.99.1.tar.bz2
+9648fc403f9eb4baede230644bf5638d  xfce4-mixer-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mixer/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:44:00 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:33:40 -0000	1.6
@@ -1 +1 @@
-xfce4-mixer-4.3.99.1.tar.bz2
+xfce4-mixer-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:35:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:35:34 -0700
Subject: rpms/xfce4-session/FC-6 xfce4-session.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111935.kABJZYJ8021168@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21148

Modified Files:
	xfce4-session.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-6/xfce4-session.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-session.spec	6 Oct 2006 06:06:11 -0000	1.12
+++ xfce4-session.spec	11 Nov 2006 19:35:04 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.3.99.1
-Release: 6%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-session-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-session-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= 4.3.99.1
@@ -113,6 +113,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-6
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:53:42 -0000	1.5
+++ sources	11 Nov 2006 19:35:04 -0000	1.6
@@ -1 +1 @@
-98c20381becc6fa84fae40be888b2ac7  xfce4-session-4.3.99.1.tar.bz2
+c2a4a306de2538a4425349587dccb7d9  xfce4-session-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:53:42 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:35:04 -0000	1.6
@@ -1 +1 @@
-xfce4-session-4.3.99.1.tar.bz2
+xfce4-session-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:36:59 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:36:59 -0700
Subject: rpms/xfce-mcs-plugins/FC-6 xfce-mcs-plugins.spec, 1.11, 1.12 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111936.kABJaxYS021271@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-plugins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21229

Modified Files:
	xfce-mcs-plugins.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/FC-6/xfce-mcs-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfce-mcs-plugins.spec	6 Oct 2006 06:08:38 -0000	1.11
+++ xfce-mcs-plugins.spec	11 Nov 2006 19:36:29 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-mcs-plugins-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2
 Patch: xfce-mcs-plugins-4.2.0-rh.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -54,6 +54,9 @@
 %{_datadir}/icons/*/*/apps/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 02:56:40 -0000	1.5
+++ sources	11 Nov 2006 19:36:29 -0000	1.6
@@ -1 +1 @@
-98b0b149110056b93587c66852fc3194  xfce-mcs-plugins-4.3.99.1.tar.bz2
+6234425227e1145319bd75ef52fa97f5  xfce-mcs-plugins-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-plugins/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 02:56:40 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:36:29 -0000	1.6
@@ -1 +1 @@
-xfce-mcs-plugins-4.3.99.1.tar.bz2
+xfce-mcs-plugins-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:37:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 12:37:23 -0700
Subject: rpms/xfce4-genmon-plugin/FC-6 xfce4-genmon-plugin.spec,1.6,1.7
Message-ID: <200611111937.kABJbNjY021312@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
Rebuild for XFCE 4.3.99.2


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-6/xfce4-genmon-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-genmon-plugin.spec	31 Oct 2006 02:01:51 -0000	1.6
+++ xfce4-genmon-plugin.spec	11 Nov 2006 19:36:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -41,6 +41,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 11 2006 Christoph Wickert  - 3.0-2
+- Rebuild for XFCE 4.3.99.2.
+
 * Thu Oct 31 2006 Christoph Wickert  - 3.0-1
 - Update to 3.0.
 - BR xfce4-dev-tools (bugzilla.xfce.org #2435) and gettext.



From fedora-extras-commits at redhat.com  Sat Nov 11 19:38:19 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:38:19 -0700
Subject: rpms/xfce-utils/FC-6 xfce-utils.spec, 1.12, 1.13 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111938.kABJcJhY021387@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21359

Modified Files:
	xfce-utils.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-6/xfce-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce-utils.spec	6 Oct 2006 06:16:57 -0000	1.12
+++ xfce-utils.spec	11 Nov 2006 19:37:49 -0000	1.13
@@ -2,11 +2,11 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce-utils-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2
 Source1: xfce4.desktop
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -81,6 +81,9 @@
 %{xsessiondir}/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-5
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:00:52 -0000	1.5
+++ sources	11 Nov 2006 19:37:49 -0000	1.6
@@ -1 +1 @@
-95448f642ee52cdb5ec20dc3c28dcc3b  xfce-utils-4.3.99.1.tar.bz2
+de6502dd93176b2a60e2e66bf052024f  xfce-utils-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:00:52 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:37:49 -0000	1.6
@@ -1 +1 @@
-xfce-utils-4.3.99.1.tar.bz2
+xfce-utils-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:39:47 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:39:47 -0700
Subject: rpms/xfdesktop/FC-6 xfdesktop.spec, 1.14, 1.15 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111939.kABJdlng021467@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfdesktop/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21442

Modified Files:
	xfdesktop.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-6/xfdesktop.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfdesktop.spec	6 Oct 2006 06:20:34 -0000	1.14
+++ xfdesktop.spec	11 Nov 2006 19:39:17 -0000	1.15
@@ -1,10 +1,10 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfdesktop-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2
 
 # Change default for Fedora
 Patch0: xfdesktop-image-4.3.90.1.patch
@@ -81,6 +81,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-5
 - Fix defattr
 - Add period to the end of description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:04:46 -0000	1.5
+++ sources	11 Nov 2006 19:39:17 -0000	1.6
@@ -1 +1 @@
-ad4dc2ceeafe10ff69196e287f07090a  xfdesktop-4.3.99.1.tar.bz2
+d44a81b9da9598425d9dd8dcd1cd5485  xfdesktop-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:04:46 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:39:17 -0000	1.6
@@ -1 +1 @@
-xfdesktop-4.3.99.1.tar.bz2
+xfdesktop-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:41:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:41:15 -0700
Subject: rpms/xfprint/FC-6 xfprint.spec, 1.15, 1.16 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111941.kABJfFve021548@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfprint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21526

Modified Files:
	xfprint.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfprint.spec
===================================================================
RCS file: /cvs/extras/rpms/xfprint/FC-6/xfprint.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfprint.spec	6 Oct 2006 06:31:05 -0000	1.15
+++ xfprint.spec	11 Nov 2006 19:40:45 -0000	1.16
@@ -1,10 +1,10 @@
 Summary: Print dialog and printer manager for Xfce 4
 Name: xfprint
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: BSD
 URL: http://www.xfce.org
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfprint-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfprint-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -56,13 +56,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+#touch --no-create %{_datadir}/icons/hicolor || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -75,7 +75,7 @@
 %{_datadir}/applications/*
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
-%{_datadir}/icons/hicolor/*/*/*
+#%{_datadir}/icons/hicolor/*/*/*
 
 %files devel
 %defattr(-, root, root)
@@ -84,6 +84,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+- Disable icons for now since they were not included in 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfprint/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:07:51 -0000	1.5
+++ sources	11 Nov 2006 19:40:45 -0000	1.6
@@ -1 +1 @@
-13657288cd3ffaaa8d3701bcb3d7740a  xfprint-4.3.99.1.tar.bz2
+c2eb9dee0002e875b91e73557f7354a1  xfprint-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfprint/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:07:51 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:40:45 -0000	1.6
@@ -1 +1 @@
-xfprint-4.3.99.1.tar.bz2
+xfprint-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:42:43 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:42:43 -0700
Subject: rpms/xfwm4/FC-6 xfwm4.spec, 1.16, 1.17 sources, 1.6, 1.7 .cvsignore,
	1.6, 1.7
Message-ID: <200611111942.kABJghYf021633@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21610

Modified Files:
	xfwm4.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-6/xfwm4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xfwm4.spec	6 Oct 2006 06:33:27 -0000	1.16
+++ xfwm4.spec	11 Nov 2006 19:42:13 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.3.99.1
-Release: 5%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-6
 - Fix defattr
 - Add gtk-update-icon-cache


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Oct 2006 03:11:10 -0000	1.6
+++ sources	11 Nov 2006 19:42:13 -0000	1.7
@@ -1 +1 @@
-ab8fcfdf496f093bbe711a7d853deb33  xfwm4-4.3.99.1.tar.bz2
+3186d90ae752cce9687698c8bd6b26c3  xfwm4-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2006 03:11:10 -0000	1.6
+++ .cvsignore	11 Nov 2006 19:42:13 -0000	1.7
@@ -1 +1 @@
-xfwm4-4.3.99.1.tar.bz2
+xfwm4-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:44:31 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:44:31 -0700
Subject: rpms/xfwm4-themes/FC-6 xfwm4-themes.spec, 1.10, 1.11 sources, 1.5, 
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200611111944.kABJiVZu021710@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfwm4-themes/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21690

Modified Files:
	xfwm4-themes.spec sources .cvsignore 
Log Message:
Update to 4.3.99.2



Index: xfwm4-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/FC-6/xfwm4-themes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfwm4-themes.spec	6 Oct 2006 06:35:01 -0000	1.10
+++ xfwm4-themes.spec	11 Nov 2006 19:44:01 -0000	1.11
@@ -1,10 +1,10 @@
 Summary: Additional themes for xfwm4
 Name: xfwm4-themes
-Version: 4.3.99.1
-Release: 3%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-themes-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xfwm4
@@ -35,6 +35,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update to 4.3.99.2
+
 * Thu Oct  5 2006 Kevin Fenzi  - 4.3.99.1-3
 - Fix defattr
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Oct 2006 03:13:39 -0000	1.5
+++ sources	11 Nov 2006 19:44:01 -0000	1.6
@@ -1 +1 @@
-48f6171c4eed813770e211ccfad8aeaf  xfwm4-themes-4.3.99.1.tar.bz2
+a77e9e700de66d38b6c4850a18283fb1  xfwm4-themes-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4-themes/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Oct 2006 03:13:39 -0000	1.5
+++ .cvsignore	11 Nov 2006 19:44:01 -0000	1.6
@@ -1 +1 @@
-xfwm4-themes-4.3.99.1.tar.bz2
+xfwm4-themes-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:45:56 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:45:56 -0700
Subject: rpms/orage/FC-6 orage.spec, 1.4, 1.5 sources, 1.2, 1.3 .cvsignore,
	1.2, 1.3
Message-ID: <200611111945.kABJjuwe021787@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/orage/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21767

Modified Files:
	orage.spec sources .cvsignore 
Log Message:
Update 4.3.99.2



Index: orage.spec
===================================================================
RCS file: /cvs/extras/rpms/orage/FC-6/orage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- orage.spec	15 Oct 2006 18:11:32 -0000	1.4
+++ orage.spec	11 Nov 2006 19:45:26 -0000	1.5
@@ -1,10 +1,10 @@
 Summary: Time-managing application for Xfce4
 Name: orage
-Version: 4.3.99.1
-Release: 6%{?dist}
+Version: 4.3.99.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/orage-4.3.99.1.tar.bz2
+Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/orage-4.3.99.2.tar.bz2
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xfce-mcs-manager-devel
@@ -69,6 +69,9 @@
 %{_datadir}/xfce4/panel-plugins/orageclock.desktop
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
+- Update 4.3.99.2
+
 * Sun Oct 15 2006 Kevin Fenzi  - 4.3.99.1-6
 - xfce4-datetime-plugin is back, remove obsoletes and provides
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/orage/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Oct 2006 03:32:29 -0000	1.2
+++ sources	11 Nov 2006 19:45:26 -0000	1.3
@@ -1 +1 @@
-511dce3a93aa6e34973989e4441f23ec  orage-4.3.99.1.tar.bz2
+40607e4b116c4d298745ef0672826cd8  orage-4.3.99.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/orage/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Oct 2006 03:32:29 -0000	1.2
+++ .cvsignore	11 Nov 2006 19:45:26 -0000	1.3
@@ -1 +1 @@
-orage-4.3.99.1.tar.bz2
+orage-4.3.99.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 19:47:43 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 11 Nov 2006 12:47:43 -0700
Subject: rpms/mousepad/FC-6 mousepad.spec, 1.3, 1.4 sources, 1.3,
	1.4 .cvsignore, 1.3, 1.4
Message-ID: <200611111947.kABJlhp1021863@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/mousepad/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21843

Modified Files:
	mousepad.spec sources .cvsignore 
Log Message:
Update to 0.2.10



Index: mousepad.spec
===================================================================
RCS file: /cvs/extras/rpms/mousepad/FC-6/mousepad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mousepad.spec	6 Oct 2006 03:00:43 -0000	1.3
+++ mousepad.spec	11 Nov 2006 19:47:13 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           mousepad
-Version:        0.2.8
-Release:        2%{?dist}
+Version:        0.2.10
+Release:        1%{?dist}
 Summary:        Mousepad - A simple text editor for Xfce
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://xfce.org/
-Source0:        http://www.xfce.org/archive/xfce-4.3.90.2/src/mousepad-0.2.8.tar.bz2
+Source0:        http://www.xfce.org/archive/xfce-4.3.99.2/src/mousepad-0.2.10.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxfcegui4-devel
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/* 
 
 %changelog
+* Fri Nov 10 2006 Kevin Fenzi  - 0.2.10-1
+- Update to 0.2.10
+
 * Thu Oct  5 2006 Kevin Fenzi  - 0.2.8-2
 - Fix typo in description 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mousepad/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 03:16:03 -0000	1.3
+++ sources	11 Nov 2006 19:47:13 -0000	1.4
@@ -1 +1 @@
-ad40c3b610123b7347094464a603e337  mousepad-0.2.8.tar.bz2
+c943c9408cbb35be73c45f75d945b34d  mousepad-0.2.10.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mousepad/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 03:16:03 -0000	1.3
+++ .cvsignore	11 Nov 2006 19:47:13 -0000	1.4
@@ -1 +1 @@
-mousepad-0.2.8.tar.bz2
+mousepad-0.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 20:58:45 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Sat, 11 Nov 2006 13:58:45 -0700
Subject: rpms/libatomic_ops/FC-6 .cvsignore, 1.2, 1.3 libatomic_ops.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611112058.kABKwjr2025290@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/libatomic_ops/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25265

Modified Files:
	.cvsignore libatomic_ops.spec sources 
Log Message:
Update to version 1.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2006 14:47:29 -0000	1.2
+++ .cvsignore	11 Nov 2006 20:58:15 -0000	1.3
@@ -1 +1 @@
-libatomic_ops-1.1.tar.gz
+libatomic_ops-1.2.tar.gz


Index: libatomic_ops.spec
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-6/libatomic_ops.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libatomic_ops.spec	9 Sep 2006 14:47:29 -0000	1.1
+++ libatomic_ops.spec	11 Nov 2006 20:58:15 -0000	1.2
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           libatomic_ops
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Atomic memory update operations
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Pierre Ossman  1.2-1
+- Update to 1.2.
+
 * Sat Sep  9 2006 Pierre Ossman  1.1-2
 - Fix naming of package.
 - General cleanup of spec file.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2006 14:47:29 -0000	1.2
+++ sources	11 Nov 2006 20:58:15 -0000	1.3
@@ -1 +1 @@
-359ed8a7c518eeb5f414102c7be24cf4  libatomic_ops-1.1.tar.gz
+1b65e48271c81e3fa2d7a9a69bab7504  libatomic_ops-1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 21:00:40 2006
From: fedora-extras-commits at redhat.com (Pierre Ossman (drzeus))
Date: Sat, 11 Nov 2006 14:00:40 -0700
Subject: rpms/libatomic_ops/FC-5 .cvsignore, 1.2, 1.3 libatomic_ops.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611112100.kABL0e8f025380@cvs-int.fedora.redhat.com>

Author: drzeus

Update of /cvs/extras/rpms/libatomic_ops/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25356

Modified Files:
	.cvsignore libatomic_ops.spec sources 
Log Message:
Update to version 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2006 14:47:29 -0000	1.2
+++ .cvsignore	11 Nov 2006 21:00:10 -0000	1.3
@@ -1 +1 @@
-libatomic_ops-1.1.tar.gz
+libatomic_ops-1.2.tar.gz


Index: libatomic_ops.spec
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-5/libatomic_ops.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libatomic_ops.spec	9 Sep 2006 14:47:29 -0000	1.1
+++ libatomic_ops.spec	11 Nov 2006 21:00:10 -0000	1.2
@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           libatomic_ops
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Atomic memory update operations
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Pierre Ossman  1.2-1
+- Update to 1.2.
+
 * Sat Sep  9 2006 Pierre Ossman  1.1-2
 - Fix naming of package.
 - General cleanup of spec file.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libatomic_ops/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2006 14:47:29 -0000	1.2
+++ sources	11 Nov 2006 21:00:10 -0000	1.3
@@ -1 +1 @@
-359ed8a7c518eeb5f414102c7be24cf4  libatomic_ops-1.1.tar.gz
+1b65e48271c81e3fa2d7a9a69bab7504  libatomic_ops-1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 21:56:01 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sat, 11 Nov 2006 14:56:01 -0700
Subject: rpms/sysprof-kmod/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sysprof-kmod.spec, 1.8, 1.9
Message-ID: <200611112156.kABLu1h9028606@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-serv28583

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Log Message:
Updated for new upstream release and new FC5 kernel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2006 16:27:26 -0000	1.2
+++ .cvsignore	11 Nov 2006 21:55:31 -0000	1.3
@@ -1 +1 @@
-sysprof-1.0.3.tar.gz
+sysprof-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2006 16:27:26 -0000	1.2
+++ sources	11 Nov 2006 21:55:31 -0000	1.3
@@ -1 +1 @@
-8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz
+cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sysprof-kmod.spec	16 Oct 2006 16:25:34 -0000	1.8
+++ sysprof-kmod.spec	11 Nov 2006 21:55:31 -0000	1.9
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2200.fc5}
+%{!?kversion: %define kversion 2.6.18-1.2239.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"
 
@@ -24,8 +24,8 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.3
-Release:        3.%(echo %{kverrel} | tr - _)
+Version:        1.0.5
+Release:        1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -98,6 +98,10 @@
 
 
 %changelog
+* Sat Nov 11 2006 Gianluca Sforna  1.0.5-1
+- rebuild for new kernel 2.6.18-1.2239.fc5
+- update to 1.0.5
+                                                    
 * Mon Oct 16 2006 Gianluca Sforna 
 - rebuild for new kernel 2.6.18-1.2200.fc5
 



From fedora-extras-commits at redhat.com  Sat Nov 11 22:19:29 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sat, 11 Nov 2006 15:19:29 -0700
Subject: rpms/sysprof/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 sysprof.spec, 1.4, 1.5
Message-ID: <200611112219.kABMJTqL031998@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31978

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
version update to 1.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Oct 2006 14:40:56 -0000	1.2
+++ .cvsignore	11 Nov 2006 22:18:59 -0000	1.3
@@ -1 +1 @@
-sysprof-1.0.3.tar.gz
+sysprof-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Oct 2006 14:40:56 -0000	1.2
+++ sources	11 Nov 2006 22:18:59 -0000	1.3
@@ -1 +1 @@
-8949fe32a073b84cb2abb7f9d608f755  sysprof-1.0.3.tar.gz
+cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof.spec	8 Oct 2006 21:31:17 -0000	1.4
+++ sysprof.spec	11 Nov 2006 22:18:59 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           sysprof      
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
 License:        GPL
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Nov 11 2006 Gianluca Sforna  1.0.5-1
+- version update
+
 * Sun Oct 8 2006 Gianluca Sforna  1.0.3-6
 - better to use ExclusiveArch %{ix86} (thanks Ville)
 



From fedora-extras-commits at redhat.com  Sat Nov 11 22:32:28 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 15:32:28 -0700
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200611112232.kABMWSmQ032143@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32105/FC-6

Modified Files:
	gaim-gaym.spec sources 
Log Message:
update to rel 291



Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gaim-gaym.spec	4 Nov 2006 08:59:22 -0000	1.3
+++ gaim-gaym.spec	11 Nov 2006 22:31:58 -0000	1.4
@@ -7,11 +7,11 @@
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
 #   svn release: 290
-%define alphatag 290svn
+%define alphatag 291svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.4.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.5.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Chris Weyl  0.96-3.5.291svn
+- update to svn rel 291, tag fork-for-gaim-2
+
 * Sat Nov 04 2006 Chris Weyl  0.96-3.4.290svn
 - update to svn rel 290, tag fork-for-gaim-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Nov 2006 08:59:22 -0000	1.4
+++ sources	11 Nov 2006 22:31:58 -0000	1.5
@@ -1,2 +1,2 @@
-e21596c613f98a9d4661a1118757e35b  qrc-0.96-290svn.tar.gz
 9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz
+a54d56efc5021c996dacf2d100f5da51  qrc-0.96-291svn.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 22:32:29 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 15:32:29 -0700
Subject: rpms/gaim-gaym/devel .cvsignore, 1.5, 1.6 gaim-gaym.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611112232.kABMWT0C032148@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32105/devel

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
update to rel 291



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Nov 2006 08:58:16 -0000	1.5
+++ .cvsignore	11 Nov 2006 22:31:59 -0000	1.6
@@ -1,2 +1,3 @@
 qrc-0.96-290svn.tar.gz
 gaim-2.0.0beta4.tar.gz
+qrc-0.96-291svn.tar.gz


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gaim-gaym.spec	4 Nov 2006 08:58:16 -0000	1.4
+++ gaim-gaym.spec	11 Nov 2006 22:31:59 -0000	1.5
@@ -7,11 +7,11 @@
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
 #   svn release: 290
-%define alphatag 290svn
+%define alphatag 291svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.4.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.5.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Chris Weyl  0.96-3.5.291svn
+- update to svn rel 291, tag fork-for-gaim-2
+
 * Sat Nov 04 2006 Chris Weyl  0.96-3.4.290svn
 - update to svn rel 290, tag fork-for-gaim-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Nov 2006 08:58:16 -0000	1.5
+++ sources	11 Nov 2006 22:31:59 -0000	1.6
@@ -1,2 +1,2 @@
-e21596c613f98a9d4661a1118757e35b  qrc-0.96-290svn.tar.gz
 9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz
+a54d56efc5021c996dacf2d100f5da51  qrc-0.96-291svn.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 23:23:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:23:01 -0700
Subject: rpms/perl-Set-Scalar - New directory
Message-ID: <200611112323.kABNN1c7002903@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2899/perl-Set-Scalar

Log Message:
Directory /cvs/extras/rpms/perl-Set-Scalar added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 23:23:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:23:07 -0700
Subject: rpms/perl-Set-Scalar/devel - New directory
Message-ID: <200611112323.kABNN7xt002917@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2899/perl-Set-Scalar/devel

Log Message:
Directory /cvs/extras/rpms/perl-Set-Scalar/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 23:23:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:23:21 -0700
Subject: rpms/perl-Set-Scalar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611112323.kABNNLiR002949@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2942

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Set-Scalar


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Set-Scalar
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  Sat Nov 11 23:23:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:23:27 -0700
Subject: rpms/perl-Set-Scalar/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611112323.kABNNRLK002967@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2942/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Set-Scalar


--- 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  Sat Nov 11 23:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:24:30 -0700
Subject: rpms/perl-Set-Scalar import.log,1.1,1.2
Message-ID: <200611112324.kABNOUfU003039@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007

Modified Files:
	import.log 
Log Message:
auto-import perl-Set-Scalar-1.20-1 on branch devel from perl-Set-Scalar-1.20-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Scalar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 23:23:21 -0000	1.1
+++ import.log	11 Nov 2006 23:23:59 -0000	1.2
@@ -0,0 +1 @@
+perl-Set-Scalar-1_20-1:HEAD:perl-Set-Scalar-1.20-1.src.rpm:1163287432



From fedora-extras-commits at redhat.com  Sat Nov 11 23:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:24:30 -0700
Subject: rpms/perl-Set-Scalar/devel perl-Set-Scalar.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611112324.kABNOURF003044@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Set-Scalar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Set-Scalar.spec 
Log Message:
auto-import perl-Set-Scalar-1.20-1 on branch devel from perl-Set-Scalar-1.20-1.src.rpm


--- NEW FILE perl-Set-Scalar.spec ---
Name:           perl-Set-Scalar
Version:        1.20
Release:        1%{?dist}
Summary:        Basic set operations

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Set-Scalar/
Source0:        http://www.cpan.org/authors/id/J/JH/JHI/Set-Scalar-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}.


%prep
%setup -q -n Set-Scalar-%{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 -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorlib}/Set/
%{_mandir}/man3/*.3pm*


%changelog
* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.20-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Scalar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 23:23:26 -0000	1.1
+++ .cvsignore	11 Nov 2006 23:24:00 -0000	1.2
@@ -0,0 +1 @@
+Set-Scalar-1.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Set-Scalar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 23:23:26 -0000	1.1
+++ sources	11 Nov 2006 23:24:00 -0000	1.2
@@ -0,0 +1 @@
+ebef2b178117a07541bacfdbf7c86112  Set-Scalar-1.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 11 23:27:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:27:35 -0700
Subject: owners owners.list,1.1927,1.1928
Message-ID: <200611112327.kABNRZgp003161@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3145

Modified Files:
	owners.list 
Log Message:
New package: perl-Set-Scalar (#215160)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1927
retrieving revision 1.1928
diff -u -r1.1927 -r1.1928
--- owners.list	11 Nov 2006 16:44:29 -0000	1.1927
+++ owners.list	11 Nov 2006 23:27:05 -0000	1.1928
@@ -1638,6 +1638,7 @@
 Fedora Extras|perl-SDL|SDL bindings for the Perl language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Infinite|Sets of intervals|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Set-Scalar|Basic set operations|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Smart-Comments|Comments that do more than just sit there|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Nov 11 23:29:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:29:34 -0700
Subject: rpms/xfce4-eyes-plugin - New directory
Message-ID: <200611112329.kABNTYd1003239@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3234/xfce4-eyes-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-eyes-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 23:29:41 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:29:41 -0700
Subject: rpms/xfce4-eyes-plugin/devel - New directory
Message-ID: <200611112329.kABNTfP6003260@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3234/xfce4-eyes-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-eyes-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 11 23:30:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:30:04 -0700
Subject: rpms/xfce4-eyes-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611112330.kABNU4nk003322@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3312

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-eyes-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-eyes-plugin
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  Sat Nov 11 23:30:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:30:10 -0700
Subject: rpms/xfce4-eyes-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611112330.kABNUASL003340@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3312/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-eyes-plugin


--- 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  Sat Nov 11 23:31:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:31:30 -0700
Subject: rpms/xfce4-eyes-plugin import.log,1.1,1.2
Message-ID: <200611112331.kABNVU8x003423@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3390

Modified Files:
	import.log 
Log Message:
auto-import xfce4-eyes-plugin-4.3.99.1-1.fc7 on branch devel from xfce4-eyes-plugin-4.3.99.1-1.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Nov 2006 23:30:04 -0000	1.1
+++ import.log	11 Nov 2006 23:31:00 -0000	1.2
@@ -0,0 +1 @@
+xfce4-eyes-plugin-4_3_99_1-1_fc7:HEAD:xfce4-eyes-plugin-4.3.99.1-1.fc7.src.rpm:1163287852



From fedora-extras-commits at redhat.com  Sat Nov 11 23:31:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 16:31:31 -0700
Subject: rpms/xfce4-eyes-plugin/devel xfce4-eyes-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611112331.kABNVVZW003427@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3390/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-eyes-plugin.spec 
Log Message:
auto-import xfce4-eyes-plugin-4.3.99.1-1.fc7 on branch devel from xfce4-eyes-plugin-4.3.99.1-1.fc7.src.rpm


--- NEW FILE xfce4-eyes-plugin.spec ---
Name:		xfce4-eyes-plugin
Version:	4.3.99.1
Release:	1%{?dist}
Summary:	Eyes for the Xfce panel

Group:		User Interface/Desktops
License:	GPL
URL:		http://goodies.xfce.org/
Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2
BuildRequires:	libxml2-devel, gettext, perl(XML::Parser)
Requires:	xfce4-panel >= 4.3.99.1

%description
A xfce4 panel plugin that adds eyes which watch your every step. Scary!

%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}


%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


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%doc AUTHORS COPYING ChangeLog README
%{_libexecdir}/xfce4/panel-plugins/%{name}
%{_datadir}/xfce4/panel-plugins/*.desktop
%{_datadir}/icons/hicolor/48x48/apps/xfce4-eyes.png
%{_datadir}/xfce4/eyes


%changelog
* Sat Sep 23 2006 Christoph Wickert  - 4.3.99.1-1
- Initial Fedora Extras version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Nov 2006 23:30:10 -0000	1.1
+++ .cvsignore	11 Nov 2006 23:31:01 -0000	1.2
@@ -0,0 +1 @@
+xfce4-eyes-plugin-4.3.99.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Nov 2006 23:30:10 -0000	1.1
+++ sources	11 Nov 2006 23:31:01 -0000	1.2
@@ -0,0 +1 @@
+dd5bbf3f31ca7d959ec808983a419062  xfce4-eyes-plugin-4.3.99.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 11 23:48:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 16:48:20 -0700
Subject: rpms/perl-Cairo/devel .cvsignore, 1.8, 1.9 perl-Cairo.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200611112348.kABNmKlh003605@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3579

Modified Files:
	.cvsignore perl-Cairo.spec sources 
Log Message:
Update to 1.021.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Nov 2006 15:38:23 -0000	1.8
+++ .cvsignore	11 Nov 2006 23:47:50 -0000	1.9
@@ -1 +1 @@
-Cairo-1.02.tar.gz
+Cairo-1.021.tar.gz


Index: perl-Cairo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/perl-Cairo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Cairo.spec	11 Nov 2006 15:38:23 -0000	1.8
+++ perl-Cairo.spec	11 Nov 2006 23:47:50 -0000	1.9
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Cairo
-Version:        1.02
+Version:        1.021
 Release:        1%{?dist}
 Summary:        Perl interface to the cairo library
 
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 1.021-1
+- Update to 1.021.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 1.02-1
 - Update to 1.02.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Nov 2006 15:38:23 -0000	1.8
+++ sources	11 Nov 2006 23:47:50 -0000	1.9
@@ -1 +1 @@
-bf1a8443310aa580f7566b2024e55987  Cairo-1.02.tar.gz
+72696240a9ba97694209d0a0c7367b57  Cairo-1.021.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 00:06:45 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 17:06:45 -0700
Subject: rpms/perl-Perl-Critic/devel perl-Perl-Critic.spec,1.2,1.3
Message-ID: <200611120006.kAC06jTE006694@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-serv6676

Modified Files:
	perl-Perl-Critic.spec 
Log Message:
Note about Author tests


Index: perl-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/devel/perl-Perl-Critic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Perl-Critic.spec	11 Nov 2006 15:30:39 -0000	1.2
+++ perl-Perl-Critic.spec	12 Nov 2006 00:06:13 -0000	1.3
@@ -53,6 +53,8 @@
 
 
 %check
+# Author tests would require: Test::Kwalitee, Test::Spelling, File::Which, and aspell
+# TEST_AUTHOR=1 ./Build test
 ./Build test
 
 



From fedora-extras-commits at redhat.com  Sun Nov 12 00:18:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 11 Nov 2006 17:18:52 -0700
Subject: rpms/perl-Test-Perl-Critic/devel .cvsignore, 1.2,
	1.3 perl-Test-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611120018.kAC0IqhE006971@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Perl-Critic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6943

Modified Files:
	.cvsignore perl-Test-Perl-Critic.spec sources 
Log Message:
Update to 0.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:31:10 -0000	1.2
+++ .cvsignore	12 Nov 2006 00:18:22 -0000	1.3
@@ -1 +1 @@
-Test-Perl-Critic-0.07.tar.gz
+Test-Perl-Critic-0.08.tar.gz


Index: perl-Test-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/devel/perl-Test-Perl-Critic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Perl-Critic.spec	26 Sep 2006 09:31:10 -0000	1.1
+++ perl-Test-Perl-Critic.spec	12 Nov 2006 00:18:22 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Perl-Critic
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Use Perl::Critic in test programs
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Perl::Critic)
+BuildRequires:  perl(Perl::Critic) >= 0.21
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jose Pedro Oliveira  - 0.08-1
+- Update to 0.08.
+
 * Sat Sep 23 2006 Jose Pedro Oliveira  - 0.07-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:31:10 -0000	1.2
+++ sources	12 Nov 2006 00:18:22 -0000	1.3
@@ -1 +1 @@
-91c1dc234b4c6ec1f06300085f0559cf  Test-Perl-Critic-0.07.tar.gz
+358946b1ca7bca56ea8b6ce77bdd4033  Test-Perl-Critic-0.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 01:05:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 18:05:31 -0700
Subject: owners owners.list,1.1928,1.1929
Message-ID: <200611120105.kAC15VfY010139@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10123

Modified Files:
	owners.list 
Log Message:
add xfce-eyes-plugin (#215158)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1928
retrieving revision 1.1929
diff -u -r1.1928 -r1.1929
--- owners.list	11 Nov 2006 23:27:05 -0000	1.1928
+++ owners.list	12 Nov 2006 01:04:57 -0000	1.1929
@@ -2410,6 +2410,7 @@
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-dev-tools|Xfce developer tools|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-eyes-plugin|Eyes for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 01:12:56 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sat, 11 Nov 2006 18:12:56 -0700
Subject: rpms/monotone/FC-5 .cvsignore, 1.10, 1.11 monotone.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <200611120112.kAC1Cuje010260@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10240

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
New upstream version 0.31


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Oct 2006 18:38:11 -0000	1.10
+++ .cvsignore	12 Nov 2006 01:12:26 -0000	1.11
@@ -1 +1 @@
-monotone-0.30.tar.gz
+monotone-0.31.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- monotone.spec	11 Oct 2006 19:54:19 -0000	1.18
+++ monotone.spec	12 Nov 2006 01:12:26 -0000	1.19
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.30
+Version: 0.31
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Roland McGrath  - 0.31-1
+- Updated for 0.31 release.
+
 * Tue Oct 10 2006 Roland McGrath  - 0.30-1
 - Updated for 0.30 release.
 - Fix service script to work around buggy init.d/functions. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 18:38:11 -0000	1.10
+++ sources	12 Nov 2006 01:12:26 -0000	1.11
@@ -1 +1 @@
-94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz
+5a5feb8d053a5993ab516a1186bb5883  monotone-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 03:14:36 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sat, 11 Nov 2006 20:14:36 -0700
Subject: rpms/monotone/devel .cvsignore, 1.10, 1.11 monotone.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <200611120314.kAC3Ead4016891@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16865

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
New upstream version 0.31


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Oct 2006 19:33:15 -0000	1.10
+++ .cvsignore	12 Nov 2006 03:14:05 -0000	1.11
@@ -1 +1 @@
-monotone-0.30.tar.gz
+monotone-0.31.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- monotone.spec	11 Oct 2006 19:54:20 -0000	1.18
+++ monotone.spec	12 Nov 2006 03:14:05 -0000	1.19
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.30
+Version: 0.31
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Roland McGrath  - 0.31-1
+- Updated for 0.31 release.
+
 * Tue Oct 10 2006 Roland McGrath  - 0.30-1
 - Updated for 0.30 release.
 - Fix service script to work around buggy init.d/functions. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 19:33:15 -0000	1.10
+++ sources	12 Nov 2006 03:14:05 -0000	1.11
@@ -1 +1 @@
-94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz
+5a5feb8d053a5993ab516a1186bb5883  monotone-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 03:16:17 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sat, 11 Nov 2006 20:16:17 -0700
Subject: rpms/monotone/FC-6 .cvsignore, 1.10, 1.11 monotone.spec, 1.18,
	1.19 sources, 1.10, 1.11
Message-ID: <200611120316.kAC3GHAa017002@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16982

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
New upstream version 0.31


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Oct 2006 19:33:15 -0000	1.10
+++ .cvsignore	12 Nov 2006 03:15:47 -0000	1.11
@@ -1 +1 @@
-monotone-0.30.tar.gz
+monotone-0.31.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-6/monotone.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- monotone.spec	11 Oct 2006 19:54:20 -0000	1.18
+++ monotone.spec	12 Nov 2006 03:15:47 -0000	1.19
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.30
+Version: 0.31
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Roland McGrath  - 0.31-1
+- Updated for 0.31 release.
+
 * Tue Oct 10 2006 Roland McGrath  - 0.30-1
 - Updated for 0.30 release.
 - Fix service script to work around buggy init.d/functions. (#198761)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Oct 2006 19:33:15 -0000	1.10
+++ sources	12 Nov 2006 03:15:47 -0000	1.11
@@ -1 +1 @@
-94a1f8369162f7a7df8596b365a1d846  monotone-0.30.tar.gz
+5a5feb8d053a5993ab516a1186bb5883  monotone-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 03:42:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 20:42:35 -0700
Subject: rpms/xfce4-eyes-plugin/devel xfce4-eyes-plugin.spec,1.1,1.2
Message-ID: <200611120342.kAC3gZDm017278@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17262

Modified Files:
	xfce4-eyes-plugin.spec 
Log Message:
add %%defattr


Index: xfce4-eyes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/devel/xfce4-eyes-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-eyes-plugin.spec	11 Nov 2006 23:31:01 -0000	1.1
+++ xfce4-eyes-plugin.spec	12 Nov 2006 03:42:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-eyes-plugin
 Version:	4.3.99.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Eyes for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -49,6 +49,7 @@
 
 
 %files -f %{name}.lang
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
@@ -57,5 +58,8 @@
 
 
 %changelog
+* Sun Nov 12 2006 Christoph Wickert  - 4.3.99.1-2
+- Add %%defattr.
+
 * Sat Sep 23 2006 Christoph Wickert  - 4.3.99.1-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Sun Nov 12 03:58:17 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 11 Nov 2006 20:58:17 -0700
Subject: rpms/xfce4-eyes-plugin/devel xfce4-eyes-plugin.spec,1.2,1.3
Message-ID: <200611120358.kAC3wH1R017411@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-eyes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17395

Modified Files:
	xfce4-eyes-plugin.spec 
Log Message:
cosmetical change in files section


Index: xfce4-eyes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-eyes-plugin/devel/xfce4-eyes-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-eyes-plugin.spec	12 Nov 2006 03:42:04 -0000	1.2
+++ xfce4-eyes-plugin.spec	12 Nov 2006 03:57:47 -0000	1.3
@@ -54,7 +54,7 @@
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xfce4-eyes.png
-%{_datadir}/xfce4/eyes
+%{_datadir}/xfce4/eyes/
 
 
 %changelog



From fedora-extras-commits at redhat.com  Sun Nov 12 04:15:57 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Sat, 11 Nov 2006 21:15:57 -0700
Subject: rpms/gdesklets/devel gdesklets.spec,1.22,1.23
Message-ID: <200611120415.kAC4FvAQ020522@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20506

Modified Files:
	gdesklets.spec 
Log Message:
updated spec


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gdesklets.spec	8 Nov 2006 06:09:07 -0000	1.22
+++ gdesklets.spec	12 Nov 2006 04:15:26 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		gdesklets
 Version:	0.35.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An interactive Imlib2 console for the X Window system
 
 Group:		User Interface/Desktops
@@ -13,7 +13,7 @@
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires:  libXau-devel, libXdmcp-devel, intltool
+BuildRequires:  libXau-devel, libXdmcp-devel, intltool, gnome-python2-devel
 BuildRequires:  libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-3
+- Added gnome-python2-devel for buildrequires (rawhide)
+
 * Tue Nov 07 2006 Luya Tshimbalanga  - 0.35.4-2
 - Removed gnome-python for buildrequires
 



From fedora-extras-commits at redhat.com  Sun Nov 12 05:01:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:35 -0700
Subject: rpms/eiciel - New directory
Message-ID: <200611120501.kAC51Zpw023428@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23411/eiciel

Log Message:
Directory /cvs/extras/rpms/eiciel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 05:01:41 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:41 -0700
Subject: rpms/eiciel/devel - New directory
Message-ID: <200611120501.kAC51fm4023793@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23411/eiciel/devel

Log Message:
Directory /cvs/extras/rpms/eiciel/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 05:01:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:48 -0700
Subject: owners owners.list,1.1929,1.1930
Message-ID: <200611120501.kAC51mES023803@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21528

Modified Files:
	owners.list 
Log Message:
add eiciel


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1929
retrieving revision 1.1930
diff -u -r1.1929 -r1.1930
--- owners.list	12 Nov 2006 01:04:57 -0000	1.1929
+++ owners.list	12 Nov 2006 05:01:18 -0000	1.1930
@@ -341,6 +341,7 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|efont-unicode-bdf|Unicode font by Electronic Font Open Laboratory|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|eggdrop|The world's most popular Open Source IRC bot|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
+Fedora Extras|eiciel|Graphical access control list (ACL) editor|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ejabberd|A distributed, fault-tolerant Jabber/XMPP server|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|ekg|Experimental Gadu-Gadu client|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 05:01:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:51 -0700
Subject: rpms/eiciel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611120501.kAC51pvG023819@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23813

Added Files:
	Makefile import.log 
Log Message:
Setup of module eiciel


--- NEW FILE Makefile ---
# Top level Makefile for module eiciel
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 Nov 12 05:01:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:01:58 -0700
Subject: rpms/eiciel/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611120501.kAC51wSm023832@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23813/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eiciel


--- 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 Nov 12 05:02:56 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:02:56 -0700
Subject: rpms/eiciel/devel eiciel-desktop.patch, NONE, 1.1 eiciel.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611120502.kAC52uq9023913@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eiciel-desktop.patch eiciel.spec 
Log Message:
auto-import eiciel-0.9.2-7.fc6 on branch devel from eiciel-0.9.2-7.fc6.src.rpm

eiciel-desktop.patch:

--- NEW FILE eiciel-desktop.patch ---
--- src/eiciel.desktop     2006-07-09 18:01:00.000000000 +0100
+++ src/eiciel.desktop     2006-07-09 18:04:33.000000000 +0100
@@ -7,9 +7,10 @@
 Comment=View or change ACL and User Extended Attributes on files and directories
 Comment[ca]=Visualitza o canvia la llista de control d'acc??s i els atributs d'usuari en fitxers i directoris
 Comment[es]=Visualiza o cambia la lista de control de acceso y los atributos de usuario en ficheros y directorios
-Exec=/home/roger/eiciel/TEST/bin/eiciel
-Icon=/home/roger/eiciel/TEST/share/eiciel/img/icona_eiciel_24.png
+Exec=/usr/bin/eiciel
+Icon=/usr/share/eiciel/img/icona_eiciel_24.png
 Terminal=false
 Type=Application
 Categories=Application;Accessories;GNOME;System;
-Version=0.9.1
+Version=0.9.5
+# The version refers to desktop file specification *not* eicel version



--- NEW FILE eiciel.spec ---
Name:           eiciel
Version:        0.9.2
Release:        7%{?dist}
Summary:        Graphical access control list (ACL) editor
Group:          Applications/System
License:        GPL
URL:            http://rofi.pinchito.com/eiciel
Source0:        http://rofi.pinchito.com/eiciel/download/%{name}-%{version}.tar.bz2
Patch0:         eiciel-desktop.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnomeui-devel gtkmm24-devel libacl-devel nautilus-devel
BuildRequires:  desktop-file-utils

%description
Graphical editor for access control lists (ACL) 
and extended attributes (XATTR), either as an 
extension within Nautilus, or as a standalone utility.


%prep
%setup -q
%patch0

# this really should not have been packaged with the source tarball
rm doc/C/eiciel.xml

%build
%configure --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%find_lang %{name}
desktop-file-install --vendor fedora                        \
        --dir %{buildroot}%{_datadir}/applications          \
        --add-category X-Fedora                             \
        --delete-original                                   \
        %{buildroot}%{_datadir}/applications/%{name}.desktop

# less is more
cd %{buildroot}%{_datadir}/%{name}/doc/C/figures
for img in `ls *.png` ; do
    if [ -e ../../../img/$img ] ; then
        rm $img
        ln -s ../../../img/$img
    fi
done

%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/*%{name}*
%{_mandir}/man1/%{name}*
%{_libdir}/nautilus/extensions-1.0/lib%{name}*
%exclude %{_libdir}/nautilus/extensions-1.0/*.a
%exclude %{_libdir}/nautilus/extensions-1.0/*.la


%changelog
* Sat Nov 11 2006 Chris Weyl  0.9.2-7
- rm doc/C/eiciel.xml during prep; otherwise it isn't rebuilt properly

* Wed Nov 08 2006 Chris Weyl  0.9.2-6
- minor tweaks, resubmitted

* Sun Jul 09 2006 Andy Burns  0.9.2-5
- Drop excludes for .debug files
- Tidy up summary and description
- Make includes more precise
- Use .desktop file now accepted upstream (but with patch)
- Use existing .png file as icon instead of copy

* Mon Jul 03 2006 Andy Burns  0.9.2-4
- Change .debug excludes to work on x86_64 too

* Mon Jul 03 2006 Andy Burns  0.9.2-3
- Exclude *.debug files
- Remove macros from changelog section to shut up rpmlint
- Reduced file permissions on .spec and .desktop files

* Mon Jul 03 2006 Andy Burns  0.9.2-2
- Claim files under libdir more precisely
- Add nautilus to buildreqs

* Mon Jul 03 2006 Andy Burns  0.9.2-1
- Update source to 0.9.2
- Drop gcc4.1 patch accepted upstream

* Sat Feb 04 2006 Andy Burns  0.9-8
- Use __mkdir and __install macros

* Fri Feb 03 2006 Andy Burns  0.9-7
- Make version key in .desktop refer to fd.o spec ver, not eicel ver
- Actually install the .destop file
- Provide icon for .desktop file in /usr/share/pixmaps
- Replace all RPM_BUILD_ROOT macros with buildroot

* Fri Feb 03 2006 Andy Burns  0.9-6
- All docs are in doc
- All Requires were detected automatically
- Omit .la as well as .a
- Reset file permissions on source files
- Use find_lang for locale files
- Added .desktop file
- Change instances of eiciel to name macro

* Fri Feb 03 2006 Andy Burns  0.9-5
- Exclude .a library which is unlikely to be used
- Use more fine-grained file specs, particularly for man/doc files

* Thu Feb 02 2006 Andy Burns  0.9-4
- Attempt to fix rpmlint ownership warnings about man1 files/dirs

* Thu Feb 02 2006 Andy Burns  0.9-3
- Changed BuildRequires/Requires

* Thu Feb 02 2006 Andy Burns  0.9-2
- Added patch for gcc4.1

* Thu Feb 02 2006 Andy Burns  0.9-1
- Initial RPM build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 05:01:58 -0000	1.1
+++ .cvsignore	12 Nov 2006 05:02:25 -0000	1.2
@@ -0,0 +1 @@
+eiciel-0.9.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 05:01:58 -0000	1.1
+++ sources	12 Nov 2006 05:02:25 -0000	1.2
@@ -0,0 +1 @@
+72576cce092ff36a4fef0311bdc0dede  eiciel-0.9.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 05:02:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:02:55 -0700
Subject: rpms/eiciel import.log,1.1,1.2
Message-ID: <200611120502.kAC52s6T023911@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876

Modified Files:
	import.log 
Log Message:
auto-import eiciel-0.9.2-7.fc6 on branch devel from eiciel-0.9.2-7.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/eiciel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 05:01:51 -0000	1.1
+++ import.log	12 Nov 2006 05:02:24 -0000	1.2
@@ -0,0 +1 @@
+eiciel-0_9_2-7_fc6:HEAD:eiciel-0.9.2-7.fc6.src.rpm:1163307744



From fedora-extras-commits at redhat.com  Sun Nov 12 05:05:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:05:11 -0700
Subject: rpms/eiciel/devel eiciel.spec,1.1,1.2
Message-ID: <200611120505.kAC55BFM023969@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23953

Modified Files:
	eiciel.spec 
Log Message:
release bump


Index: eiciel.spec
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/eiciel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eiciel.spec	12 Nov 2006 05:02:25 -0000	1.1
+++ eiciel.spec	12 Nov 2006 05:04:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           eiciel
 Version:        0.9.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Graphical access control list (ACL) editor
 Group:          Applications/System
 License:        GPL
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Chris Weyl  0.9.2-8
+- bump
+
 * Sat Nov 11 2006 Chris Weyl  0.9.2-7
 - rm doc/C/eiciel.xml during prep; otherwise it isn't rebuilt properly
 



From fedora-extras-commits at redhat.com  Sun Nov 12 05:13:15 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 22:13:15 -0700
Subject: rpms/ochusha/devel .cvsignore, 1.3, 1.4 ochusha.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611120513.kAC5DFCt024077@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24047

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.1.cvs061112
- Update to 0.5.99.63.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Nov 2006 16:08:40 -0000	1.3
+++ .cvsignore	12 Nov 2006 05:12:44 -0000	1.4
@@ -1 +1 @@
-ochusha-0.5.99.63.2-cvs061111.tar.bz2
+ochusha-0.5.99.63.3-cvs061112.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ochusha.spec	11 Nov 2006 16:08:40 -0000	1.2
+++ ochusha.spec	12 Nov 2006 05:12:44 -0000	1.3
@@ -1,8 +1,8 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.2
-%define              strtag          cvs061111
+%define              main_ver        0.5.99.63.3
+%define              strtag          cvs061112
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -157,8 +157,8 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sat Nov 11 2006 Mamoru Tasaka  0.5.99.63.2-0.1.cvs061111
-- Update to 0.5.99.63.2
+* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.1.cvs061112
+- Update to 0.5.99.63.3
 
 * Fri Nov 03 2006  0.5.99.62-1
 - Version down.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Nov 2006 16:08:40 -0000	1.3
+++ sources	12 Nov 2006 05:12:44 -0000	1.4
@@ -1 +1 @@
-cf91062cc155ef2fef14e8ec0b8d1b8b  ochusha-0.5.99.63.2-cvs061111.tar.bz2
+7fd7b7e7fe1ff5911a5b536ab557d573  ochusha-0.5.99.63.3-cvs061112.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 05:23:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sat, 11 Nov 2006 22:23:58 -0700
Subject: comps comps-fe5.xml.in, 1.195, 1.196 comps-fe6.xml.in, 1.219,
	1.220 comps-fe7.xml.in, 1.17, 1.18
Message-ID: <200611120523.kAC5NwZc024255@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24235

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add eiciel



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- comps-fe5.xml.in	11 Nov 2006 15:32:47 -0000	1.195
+++ comps-fe5.xml.in	12 Nov 2006 05:23:27 -0000	1.196
@@ -850,6 +850,7 @@
       dkms
       ebtables
       ed2k_hash
+      eiciel
       enca
       environment-modules
       epylog


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- comps-fe6.xml.in	11 Nov 2006 15:32:47 -0000	1.219
+++ comps-fe6.xml.in	12 Nov 2006 05:23:27 -0000	1.220
@@ -908,6 +908,7 @@
       dkms
       ebtables
       ed2k_hash
+      eiciel
       emelfm2
       enca
       environment-modules


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- comps-fe7.xml.in	11 Nov 2006 15:32:47 -0000	1.17
+++ comps-fe7.xml.in	12 Nov 2006 05:23:27 -0000	1.18
@@ -908,6 +908,7 @@
       dkms
       ebtables
       ed2k_hash
+      eiciel
       emelfm2
       enca
       environment-modules



From fedora-extras-commits at redhat.com  Sun Nov 12 05:30:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 11 Nov 2006 22:30:47 -0700
Subject: rpms/ochusha/devel ochusha-0.5.99.63.3-fix-ppc-typo.patch, NONE,
	1.1 ochusha.spec, 1.3, 1.4
Message-ID: <200611120530.kAC5Ul71024315@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24296

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-0.5.99.63.3-fix-ppc-typo.patch 
Log Message:
* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.1.cvs061112
- Update to 0.5.99.63.3


ochusha-0.5.99.63.3-fix-ppc-typo.patch:

--- NEW FILE ochusha-0.5.99.63.3-fix-ppc-typo.patch ---
--- ochusha-build/libtscore/virtual_machine.cc.typo	2006-11-11 06:46:44.000000000 +0900
+++ ochusha-build/libtscore/virtual_machine.cc	2006-11-12 14:26:43.000000000 +0900
@@ -365,7 +365,6 @@
 {
 #if defined(WORDS_BIGENDIAN) || SIZEOF_INT != 4
   const unsigned char *upc = (const unsigned char *)pc;
-  long value = ;
   return (long)upc[3] << 24 | (long)upc[2] << 16
     | (long)upc[1] << 8 | (long)upc[0];
 #else


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ochusha.spec	12 Nov 2006 05:12:44 -0000	1.3
+++ ochusha.spec	12 Nov 2006 05:30:16 -0000	1.4
@@ -4,7 +4,7 @@
 %define              main_ver        0.5.99.63.3
 %define              strtag          cvs061112
 
-%define              vendor_rel      1
+%define              vendor_rel      2
 %define              pre_release     1
 
 %if %{pre_release}
@@ -24,6 +24,7 @@
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
 %endif
 Patch0:              ochusha-0.5.99.63.2-call-g_thread_init-once.patch
+Patch1:              ochusha-0.5.99.63.3-fix-ppc-typo.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -55,6 +56,7 @@
 %endif
 
 %patch0 -p1 -b .g_thread_init
+%patch1 -p1 -b .ppc_typo
 
 # change desktop entry to use png file in 
 # %{icondir}
@@ -157,7 +159,7 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.1.cvs061112
+* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061112
 - Update to 0.5.99.63.3
 
 * Fri Nov 03 2006  0.5.99.62-1



From fedora-extras-commits at redhat.com  Sun Nov 12 08:45:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:45:01 -0700
Subject: rpms/vdr-osdteletext - New directory
Message-ID: <200611120845.kAC8j1Fb001659@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1655/vdr-osdteletext

Log Message:
Directory /cvs/extras/rpms/vdr-osdteletext added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 08:45:07 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:45:07 -0700
Subject: rpms/vdr-osdteletext/devel - New directory
Message-ID: <200611120845.kAC8j7U5001675@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1655/vdr-osdteletext/devel

Log Message:
Directory /cvs/extras/rpms/vdr-osdteletext/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 08:45:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:45:26 -0700
Subject: rpms/vdr-osdteletext Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611120845.kAC8jQLh001707@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1701

Added Files:
	Makefile import.log 
Log Message:
Setup of module vdr-osdteletext


--- NEW FILE Makefile ---
# Top level Makefile for module vdr-osdteletext
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 Nov 12 08:45:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:45:32 -0700
Subject: rpms/vdr-osdteletext/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611120845.kAC8jWFa001724@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1701/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdr-osdteletext


--- 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 Nov 12 08:46:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:46:53 -0700
Subject: rpms/vdr-osdteletext import.log,1.1,1.2
Message-ID: <200611120846.kAC8krAg001814@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1778

Modified Files:
	import.log 
Log Message:
auto-import vdr-osdteletext-0.5.1-20 on branch devel from vdr-osdteletext-0.5.1-20.src.rpm
Initial import (#190344).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vdr-osdteletext/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 08:45:26 -0000	1.1
+++ import.log	12 Nov 2006 08:46:23 -0000	1.2
@@ -0,0 +1 @@
+vdr-osdteletext-0_5_1-20:HEAD:vdr-osdteletext-0.5.1-20.src.rpm:1163321174



From fedora-extras-commits at redhat.com  Sun Nov 12 08:46:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:46:54 -0700
Subject: rpms/vdr-osdteletext/devel vdr-osdteletext-0.5.1-i18n.patch, NONE, 
	1.1 vdr-osdteletext.conf, NONE, 1.1 vdr-osdteletext.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611120846.kAC8kssL001816@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1778/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vdr-osdteletext-0.5.1-i18n.patch vdr-osdteletext.conf 
	vdr-osdteletext.spec 
Log Message:
auto-import vdr-osdteletext-0.5.1-20 on branch devel from vdr-osdteletext-0.5.1-20.src.rpm
Initial import (#190344).

vdr-osdteletext-0.5.1-i18n.patch:

--- NEW FILE vdr-osdteletext-0.5.1-i18n.patch ---
--- osdteletext.c~	2005-08-16 17:19:25.000000000 +0300
+++ osdteletext.c	2006-01-22 22:43:09.000000000 +0200
@@ -208,12 +208,12 @@
       { "Action_kGreen",    tr("Green key") },
       { "Action_kYellow",   tr("Yellow key") },
       { "Action_kBlue",     tr("Blue key") },
-      { "Action_kPlay",     tr(cKey::ToString( kPlay)) },
-      //{ "Action_kPause",    tr(cKey::ToString( kPause)) },
-      { "Action_kStop",     tr(cKey::ToString( kStop)) },
-      //{ "Action_kRecord",   tr(cKey::ToString( kRecord)) },
-      { "Action_kFastFwd",  tr(cKey::ToString( kFastFwd)) },
-      { "Action_kFastRew",  tr(cKey::ToString( kFastRew)) }
+      { "Action_kPlay",     tr("Key$Play") },
+      //{ "Action_kPause",    tr("Key$Pause") },
+      { "Action_kStop",     tr("Key$Stop") },
+      //{ "Action_kRecord",   tr("Key$Record") },
+      { "Action_kFastFwd",  tr("Key$FastFwd") },
+      { "Action_kFastRew",  tr("Key$FastRew") }
    };
    
    cTeletextSetupPage::actionKeyNames = st_actionKeyNames;


--- NEW FILE vdr-osdteletext.conf ---
# Configuration snippet for vdr-osdteletext                          -*- sh -*-
#
# Add command line options to pass to the osdteletext plugin to PLUGIN_OPTIONS.
# See /usr/share/doc/vdr-osdteletext-*/README for info about available options.

PLUGIN_OPTIONS="-d /var/cache/vdr/osdteletext"


--- NEW FILE vdr-osdteletext.spec ---
%define pname     osdteletext
%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%define cachedir  %(vdr-config --cachedir   2>/dev/null || echo ERROR)
%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)

Name:           vdr-%{pname}
Version:        0.5.1
Release:        20%{?dist}
Summary:        OSD teletext plugin for VDR

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.wiesweg-online.de/linux/linux.html
Source0:        http://www.wiesweg-online.de/linux/vdr/%{name}-%{version}.tgz
Source1:        %{name}.conf
Patch0:         %{name}-0.5.1-i18n.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel >= 1.3.47
Requires:       vdr(abi) = %{apiver}

%description
The OSD teletext plugin displays teletext directly on VDR's on-screen
display, with sound and video from the current channel playing in the
background.


%prep
%setup -q -n %{pname}-%{version}
%patch0
for f in HISTORY README.DE ; do
  iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
done
sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
sed -i -e s/VDRVERSION/APIVERSION/g Makefile


%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr libvdr-%{pname}.so


%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -dm 755 $RPM_BUILD_ROOT%{cachedir}/osdteletext
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d
sed -e 's|/var/cache/vdr/|%{cachedir}/|' < %{SOURCE1} \
  > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/osdteletext.conf
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/*.conf


%clean
rm -rf $RPM_BUILD_ROOT


%preun
if [ $1 -eq 0 ] ; then
  rm -rf %{cachedir}/osdteletext/*
fi


%files
%defattr(-,root,root,-)
%doc COPYING HISTORY README*
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%attr(-,%{vdr_user},root) %{cachedir}/osdteletext/


%changelog
* Sun Apr 30 2006 Ville Skytt??  - 0.5.1-20
- Rebuild for VDR 1.4.0.

* Mon Apr 17 2006 Ville Skytt??  - 0.5.1-19
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.

* Sun Mar 26 2006 Ville Skytt??  - 0.5.1-18
- Rebuild for VDR 1.3.45.

* Sat Mar 18 2006 Thorsten Leemhuis  - 0.5.1-17
- drop 0.lvn from release

* Wed Mar  1 2006 Ville Skytt??  - 0.5.1-0.lvn.17
- Rebuild for VDR 1.3.44.

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Sun Feb 19 2006 Ville Skytt??  - 0.5.1-0.lvn.16
- Rebuild for VDR 1.3.43.

* Sun Feb  5 2006 Ville Skytt??  - 0.5.1-0.lvn.15
- Rebuild for VDR 1.3.42.

* Sun Jan 22 2006 Ville Skytt??  - 0.5.1-0.lvn.14
- Fix translations with VDR >= 1.3.38.
- Rebuild for VDR 1.3.40.

* Sun Jan 15 2006 Ville Skytt??  - 0.5.1-0.lvn.13
- Rebuild for VDR 1.3.39.

* Sun Jan  8 2006 Ville Skytt??  - 0.5.1-0.lvn.12
- Rebuild for VDR 1.3.38.

* Mon Nov 28 2005 Ville Skytt??  - 0.5.1-0.lvn.11
- Rebuild for VDR 1.3.37.

* Sun Nov  6 2005 Ville Skytt??  - 0.5.1-0.lvn.10
- Rebuild for VDR 1.3.36.

* Tue Nov  1 2005 Ville Skytt??  - 0.5.1-0.lvn.9
- Rebuild for VDR 1.3.35.

* Mon Oct  3 2005 Ville Skytt??  - 0.5.1-0.lvn.8
- Rebuild for VDR 1.3.34.

* Sun Sep 25 2005 Ville Skytt??  - 0.5.1-0.lvn.7
- Rebuild for VDR 1.3.33.

* Sun Sep 11 2005 Ville Skytt??  - 0.5.1-0.lvn.6
- Rebuild for VDR 1.3.32.

* Sun Aug 28 2005 Ville Skytt??  - 0.5.1-0.lvn.5
- Rebuild for VDR 1.3.31.

* Sun Aug 21 2005 Ville Skytt??  - 0.5.1-0.lvn.4
- Rebuild for VDR 1.3.30.

* Tue Aug 16 2005 Ville Skytt??  - 0.5.1-0.lvn.3
- Sync with re-re-released upstream 0.5.1 tarball, cache dir is now
  stabilized at %%{cachedir}/osdteletext.
- Try to avoid build system problems by not using %%expand.
- Honor "vdr-config --user".
- Improve description.

* Fri Aug 12 2005 Ville Skytt??  - 0.5.1-0.lvn.2
- Sync with re-released upstream 0.5.1 tarball.

* Thu Aug 11 2005 Ville Skytt??  - 0.5.1-0.lvn.1
- 0.5.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr-osdteletext/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 08:45:32 -0000	1.1
+++ .cvsignore	12 Nov 2006 08:46:24 -0000	1.2
@@ -0,0 +1 @@
+vdr-osdteletext-0.5.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr-osdteletext/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 08:45:32 -0000	1.1
+++ sources	12 Nov 2006 08:46:24 -0000	1.2
@@ -0,0 +1 @@
+52c219e38a089504071237209ad114cd  vdr-osdteletext-0.5.1.tgz



From fedora-extras-commits at redhat.com  Sun Nov 12 08:48:52 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:48:52 -0700
Subject: rpms/vdr-osdteletext/devel vdr-osdteletext.spec,1.1,1.2
Message-ID: <200611120848.kAC8mqTs001880@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1864

Modified Files:
	vdr-osdteletext.spec 
Log Message:
* Sun Nov 12 2006 Ville Skytt??  - 0.5.1-26
- First FE build.



Index: vdr-osdteletext.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr-osdteletext/devel/vdr-osdteletext.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-osdteletext.spec	12 Nov 2006 08:46:24 -0000	1.1
+++ vdr-osdteletext.spec	12 Nov 2006 08:48:22 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.5.1
-Release:        20%{?dist}
+Release:        26%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 Group:          Applications/Multimedia
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Ville Skytt??  - 0.5.1-26
+- First FE build.
+
 * Sun Apr 30 2006 Ville Skytt??  - 0.5.1-20
 - Rebuild for VDR 1.4.0.
 



From fedora-extras-commits at redhat.com  Sun Nov 12 08:54:30 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:54:30 -0700
Subject: owners owners.list,1.1930,1.1931
Message-ID: <200611120854.kAC8sUnD001993@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971

Modified Files:
	owners.list 
Log Message:
+vdr-osdteletext (#190344)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1930
retrieving revision 1.1931
diff -u -r1.1930 -r1.1931
--- owners.list	12 Nov 2006 05:01:18 -0000	1.1930
+++ owners.list	12 Nov 2006 08:53:59 -0000	1.1931
@@ -2323,6 +2323,7 @@
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 08:57:15 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 01:57:15 -0700
Subject: rpms/gperiodic import.log,1.7,1.8
Message-ID: <200611120857.kAC8vFoc002114@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2061

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-7 on branch devel from gperiodic-2.0.8-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	9 Nov 2006 18:56:11 -0000	1.7
+++ import.log	12 Nov 2006 08:56:44 -0000	1.8
@@ -4,3 +4,4 @@
 gperiodic-2_0_8-5:HEAD:gperiodic-2.0.8-5.src.rpm:1163056409
 gperiodic-2_0_8-5:FC-6:gperiodic-2.0.8-5.src.rpm:1163098476
 gperiodic-2_0_8-5:FC-5:gperiodic-2.0.8-5.src.rpm:1163098561
+gperiodic-2_0_8-7:HEAD:gperiodic-2.0.8-7.src.rpm:1163321794



From fedora-extras-commits at redhat.com  Sun Nov 12 08:57:15 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 01:57:15 -0700
Subject: rpms/gperiodic/devel gperiodic-bh.patch, NONE, 1.1 gperiodic.spec,
	1.5, 1.6
Message-ID: <200611120857.kAC8vFai002117@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2061/devel

Modified Files:
	gperiodic.spec 
Added Files:
	gperiodic-bh.patch 
Log Message:
auto-import gperiodic-2.0.8-7 on branch devel from gperiodic-2.0.8-7.src.rpm

gperiodic-bh.patch:

--- NEW FILE gperiodic-bh.patch ---
--- ./table_data.h	2003-10-10 09:44:45.000000000 +0200
+++ ./table_data.h	2006-11-12 09:45:05.000000000 +0100
@@ -265,7 +265,7 @@ struct table_entry table [ELEMENTNUM+1] 
   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d2 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d3 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d4 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d6 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d7 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d9 7s1", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/devel/gperiodic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gperiodic.spec	9 Nov 2006 07:13:40 -0000	1.5
+++ gperiodic.spec	12 Nov 2006 08:56:45 -0000	1.6
@@ -1,11 +1,12 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
+Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
@@ -58,6 +60,12 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-7
+- Correct information for "Bh", Bohrium
+
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-6
+- Rebuild for distag problem
+
 * Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
 - Modify URL in package descrpition and source
 



From fedora-extras-commits at redhat.com  Sun Nov 12 08:57:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:57:45 -0700
Subject: rpms/vdr-subtitles - New directory
Message-ID: <200611120857.kAC8vjj5002169@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2165/vdr-subtitles

Log Message:
Directory /cvs/extras/rpms/vdr-subtitles added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 08:57:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:57:51 -0700
Subject: rpms/vdr-subtitles/devel - New directory
Message-ID: <200611120857.kAC8vpun002183@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2165/vdr-subtitles/devel

Log Message:
Directory /cvs/extras/rpms/vdr-subtitles/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 08:58:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:58:11 -0700
Subject: rpms/vdr-subtitles Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611120858.kAC8wBfX002231@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225

Added Files:
	Makefile import.log 
Log Message:
Setup of module vdr-subtitles


--- NEW FILE Makefile ---
# Top level Makefile for module vdr-subtitles
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 Nov 12 08:58:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:58:17 -0700
Subject: rpms/vdr-subtitles/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611120858.kAC8wH28002253@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module vdr-subtitles


--- 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 Nov 12 08:58:50 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 01:58:50 -0700
Subject: rpms/gperiodic import.log,1.8,1.9
Message-ID: <200611120858.kAC8wobe002324@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-7 on branch FC-6 from gperiodic-2.0.8-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	12 Nov 2006 08:56:44 -0000	1.8
+++ import.log	12 Nov 2006 08:58:19 -0000	1.9
@@ -5,3 +5,4 @@
 gperiodic-2_0_8-5:FC-6:gperiodic-2.0.8-5.src.rpm:1163098476
 gperiodic-2_0_8-5:FC-5:gperiodic-2.0.8-5.src.rpm:1163098561
 gperiodic-2_0_8-7:HEAD:gperiodic-2.0.8-7.src.rpm:1163321794
+gperiodic-2_0_8-7:FC-6:gperiodic-2.0.8-7.src.rpm:1163321889



From fedora-extras-commits at redhat.com  Sun Nov 12 08:58:50 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 01:58:50 -0700
Subject: rpms/gperiodic/FC-6 gperiodic-bh.patch, NONE, 1.1 gperiodic.spec,
	1.6, 1.7
Message-ID: <200611120858.kAC8woqQ002328@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265/FC-6

Modified Files:
	gperiodic.spec 
Added Files:
	gperiodic-bh.patch 
Log Message:
auto-import gperiodic-2.0.8-7 on branch FC-6 from gperiodic-2.0.8-7.src.rpm

gperiodic-bh.patch:

--- NEW FILE gperiodic-bh.patch ---
--- ./table_data.h	2003-10-10 09:44:45.000000000 +0200
+++ ./table_data.h	2006-11-12 09:45:05.000000000 +0100
@@ -265,7 +265,7 @@ struct table_entry table [ELEMENTNUM+1] 
   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d2 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d3 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d4 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d6 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d7 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d9 7s1", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-6/gperiodic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gperiodic.spec	10 Nov 2006 18:38:08 -0000	1.6
+++ gperiodic.spec	12 Nov 2006 08:58:20 -0000	1.7
@@ -1,11 +1,12 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
+Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
@@ -58,6 +60,9 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-7
+- Correct information for "Bh", Bohrium
+
 * Thu Nov 09 2006 Eric Tanguy  - 2.0.8-6
 - Rebuild for distag problem
 



From fedora-extras-commits at redhat.com  Sun Nov 12 08:59:31 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:59:31 -0700
Subject: rpms/vdr-subtitles import.log,1.1,1.2
Message-ID: <200611120859.kAC8xV0f002432@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371

Modified Files:
	import.log 
Log Message:
auto-import vdr-subtitles-0.4.0-1 on branch devel from vdr-subtitles-0.4.0-1.src.rpm
Initial import (#190346).


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 08:58:11 -0000	1.1
+++ import.log	12 Nov 2006 08:59:01 -0000	1.2
@@ -0,0 +1 @@
+vdr-subtitles-0_4_0-1:HEAD:vdr-subtitles-0.4.0-1.src.rpm:1163321932



From fedora-extras-commits at redhat.com  Sun Nov 12 08:59:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 01:59:32 -0700
Subject: rpms/vdr-subtitles/devel vdr-subtitles.conf, NONE,
	1.1 vdr-subtitles.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611120859.kAC8xWI5002437@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371/devel

Modified Files:
	.cvsignore sources 
Added Files:
	vdr-subtitles.conf vdr-subtitles.spec 
Log Message:
auto-import vdr-subtitles-0.4.0-1 on branch devel from vdr-subtitles-0.4.0-1.src.rpm
Initial import (#190346).


--- NEW FILE vdr-subtitles.conf ---
# Configuration snippet for vdr-subtitles                            -*- sh -*-
#
# Add command line options to pass to the subtitles plugin to PLUGIN_OPTIONS.

PLUGIN_OPTIONS=""


--- NEW FILE vdr-subtitles.spec ---
%define pname     subtitles
%define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)

Name:           vdr-%{pname}
Version:        0.4.0
Release:        1%{?dist}
Summary:        DVB subtitles plugin for VDR

Group:          Applications/Multimedia
License:        GPL
URL:            http://virtanen.org/vdr/subtitles/
Source0:        http://virtanen.org/vdr/subtitles/files/%{name}-%{version}.tgz
Source1:        %{name}.conf
Patch0:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  vdr-devel >= 1.3.48
Requires:       vdr(abi) = %{apiver}

%description
There are two subtitling services specified in the DVB standards.  One
is the teletext subtitles and the other one is DVB subtitles.  The
main difference between these two is that the teletext subtitles are
text (sent via teletext service) and DVB subtitles are pixel-based
graphics.  This plugin implements a DVB subtitles decoder for VDR.
The plugin decodes and displays the subtitles and also adds the
selected subtitling streams to the VDR recordings.


%prep
%setup -q -n %{pname}-%{version}
find . -type d -name CVS | xargs rm -r
chmod 644 *
%patch0 -p1
#{__patch} < debian/patches/02_enable_selection.dpatch
sed -i -e s/0.3.11/0.4.0/ debian/patches/03_constness.dpatch
%{__patch} < debian/patches/03_constness.dpatch
%{__patch} < debian/patches/99_transparency_percentage.dpatch
sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile


%build
make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all


%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -Dpm 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
touch $RPM_BUILD_ROOT%{configdir}/plugins/subchannels.conf


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING HISTORY README
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%ghost %{configdir}/plugins/subchannels.conf


%changelog
* Sat May  6 2006 Ville Skytt??  - 0.4.0-1
- 0.4.0.

* Mon May  1 2006 Ville Skytt??  - 0.3.11-2
- Sync with 0.3.11-1.ds, enable transparency percentage patch.

* Sun Apr 30 2006 Ville Skytt??  - 0.3.11-1
- 0.3.11 + 0.3.10-5.ds, build for VDR 1.4.0.

* Mon Apr 17 2006 Ville Skytt??  - 0.3.10-8
- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
- Trim pre-RLO %%changelog entries.

* Sun Mar 26 2006 Ville Skytt??  - 0.3.10-7
- Rebuild for VDR 1.3.45.

* Sat Mar 18 2006 Thorsten Leemhuis  - 0.3.10-6
- drop 0.lvn from release

* Sun Mar  5 2006 Ville Skytt??  - 0.3.10-0.lvn.6
- Sync with 0.3.10-3.ds.

* Wed Mar  1 2006 Ville Skytt??  - 0.3.10-0.lvn.5
- Rebuild for VDR 1.3.44.

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Tue Feb 21 2006 Ville Skytt??  - 0.3.10-0.lvn.4
- Sync with 0.3.10-2.ds.

* Sun Feb 19 2006 Ville Skytt??  - 0.3.10-0.lvn.3
- Sync with 0.3.10-1.ds, rebuild for VDR 1.3.43.

* Sun Feb  5 2006 Ville Skytt??  - 0.3.10-0.lvn.2
- Rebuild for VDR 1.3.42.

* Sun Jan 22 2006 Ville Skytt??  - 0.3.10-0.lvn.1
- 0.3.10.
- Rebuild for VDR 1.3.40.

* Sun Jan 15 2006 Ville Skytt??  - 0.3.8-1.lvn.13
- Rebuild for VDR 1.3.39.

* Tue Jan 10 2006 Ville Skytt??  - 0.3.8-1.lvn.12
- More fixes for VDR 1.3.38 from Rolf Ahrenberg.

* Sun Jan  8 2006 Ville Skytt??  - 0.3.8-1.lvn.11
- Rebuild/patch for VDR 1.3.38.

* Mon Nov 28 2005 Ville Skytt??  - 0.3.8-1.lvn.10
- Rebuild for VDR 1.3.37.

* Sun Nov  6 2005 Ville Skytt??  - 0.3.8-1.lvn.9
- Rebuild for VDR 1.3.36.

* Tue Nov  1 2005 Ville Skytt??  - 0.3.8-1.lvn.8
- Rebuild for VDR 1.3.35.

* Mon Oct  3 2005 Ville Skytt??  - 0.3.8-1.lvn.7
- Rebuild for VDR 1.3.34.

* Sun Sep 25 2005 Ville Skytt??  - 0.3.8-1.lvn.6
- Rebuild for VDR 1.3.33.

* Sun Sep 11 2005 Ville Skytt??  - 0.3.8-1.lvn.5
- Rebuild for VDR 1.3.32.

* Sun Aug 28 2005 Ville Skytt??  - 0.3.8-1.lvn.4
- Rebuild for VDR 1.3.31.

* Sun Aug 21 2005 Ville Skytt??  - 0.3.8-1.lvn.3
- Rebuild for VDR 1.3.30.

* Tue Aug 16 2005 Ville Skytt??  - 0.3.8-1.lvn.2
- Try to avoid build system problems by not using %%expand with vdr-config.

* Sat Aug 13 2005 Ville Skytt??  - 0.3.8-1.lvn.1
- Convert docs to UTF-8.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 08:58:17 -0000	1.1
+++ .cvsignore	12 Nov 2006 08:59:02 -0000	1.2
@@ -0,0 +1,2 @@
+vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
+vdr-subtitles-0.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 08:58:17 -0000	1.1
+++ sources	12 Nov 2006 08:59:02 -0000	1.2
@@ -0,0 +1,2 @@
+63dc32ac87c859cde5acbb854cdb537d  vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
+74780f7f296f1feac13f4358b97bd2f3  vdr-subtitles-0.4.0.tgz



From fedora-extras-commits at redhat.com  Sun Nov 12 09:00:14 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 02:00:14 -0700
Subject: rpms/gperiodic import.log,1.9,1.10
Message-ID: <200611120900.kAC90EIr002555@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2477

Modified Files:
	import.log 
Log Message:
auto-import gperiodic-2.0.8-7 on branch FC-5 from gperiodic-2.0.8-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	12 Nov 2006 08:58:19 -0000	1.9
+++ import.log	12 Nov 2006 08:59:43 -0000	1.10
@@ -6,3 +6,4 @@
 gperiodic-2_0_8-5:FC-5:gperiodic-2.0.8-5.src.rpm:1163098561
 gperiodic-2_0_8-7:HEAD:gperiodic-2.0.8-7.src.rpm:1163321794
 gperiodic-2_0_8-7:FC-6:gperiodic-2.0.8-7.src.rpm:1163321889
+gperiodic-2_0_8-7:FC-5:gperiodic-2.0.8-7.src.rpm:1163321973



From fedora-extras-commits at redhat.com  Sun Nov 12 09:00:14 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Sun, 12 Nov 2006 02:00:14 -0700
Subject: rpms/gperiodic/FC-5 gperiodic-bh.patch, NONE, 1.1 gperiodic.spec,
	1.4, 1.5
Message-ID: <200611120900.kAC90EiS002558@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/gperiodic/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2477/FC-5

Modified Files:
	gperiodic.spec 
Added Files:
	gperiodic-bh.patch 
Log Message:
auto-import gperiodic-2.0.8-7 on branch FC-5 from gperiodic-2.0.8-7.src.rpm

gperiodic-bh.patch:

--- NEW FILE gperiodic-bh.patch ---
--- ./table_data.h	2003-10-10 09:44:45.000000000 +0200
+++ ./table_data.h	2006-11-12 09:45:05.000000000 +0100
@@ -265,7 +265,7 @@ struct table_entry table [ELEMENTNUM+1] 
   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d2 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d3 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d4 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d5 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d6 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d7 7s2", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f14 6d9 7s1", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 


Index: gperiodic.spec
===================================================================
RCS file: /cvs/extras/rpms/gperiodic/FC-5/gperiodic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gperiodic.spec	9 Nov 2006 18:56:12 -0000	1.4
+++ gperiodic.spec	12 Nov 2006 08:59:44 -0000	1.5
@@ -1,11 +1,12 @@
 Summary: Program for browsing the periodic table
 Name: gperiodic
 Version: 2.0.8
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Engineering
 URL: http://www.frantz.fi/software/gperiodic.php
 Source: http://www.frantz.fi/software/gperiodic-%{version}.tar.gz
+Patch0: gperiodic-bh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel, desktop-file-utils, gettext
 
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e "s,CFLAGS=,CFLAGS+=,g;/strip/d" Makefile
 
 %build
@@ -58,6 +60,12 @@
 %doc README AUTHORS ChangeLog gpl.txt
 
 %changelog
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-7
+- Correct information for "Bh", Bohrium
+
+* Thu Nov 09 2006 Eric Tanguy  - 2.0.8-6
+- Rebuild for distag problem
+
 * Thu Nov 09 2006 Eric Tanguy  - 2.0.8-5
 - Modify URL in package descrpition and source
 



From fedora-extras-commits at redhat.com  Sun Nov 12 09:00:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 02:00:33 -0700
Subject: owners owners.list,1.1931,1.1932
Message-ID: <200611120900.kAC90XeL002601@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2515

Modified Files:
	owners.list 
Log Message:
+vdr-subtitles (#190346)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1931
retrieving revision 1.1932
diff -u -r1.1931 -r1.1932
--- owners.list	12 Nov 2006 08:53:59 -0000	1.1931
+++ owners.list	12 Nov 2006 09:00:03 -0000	1.1932
@@ -2324,6 +2324,7 @@
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 09:07:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 02:07:34 -0700
Subject: rpms/vdr-subtitles/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 vdr-subtitles.spec, 1.1, 1.2
Message-ID: <200611120907.kAC97Yeb005877@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/vdr-subtitles/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5823

Modified Files:
	.cvsignore sources vdr-subtitles.spec 
Log Message:
* Sun Nov 12 2006 Ville Skytt??  - 0.4.0-6
- First FE build.
- Update Darren's patchkit to 0.4.0-1.ds.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 08:59:02 -0000	1.2
+++ .cvsignore	12 Nov 2006 09:07:04 -0000	1.3
@@ -1,2 +1,2 @@
-vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
 vdr-subtitles-0.4.0.tgz
+vdr-plugin-subtitles_0.4.0-1.ds.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2006 08:59:02 -0000	1.2
+++ sources	12 Nov 2006 09:07:04 -0000	1.3
@@ -1,2 +1,2 @@
-63dc32ac87c859cde5acbb854cdb537d  vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
 74780f7f296f1feac13f4358b97bd2f3  vdr-subtitles-0.4.0.tgz
+e4cc6275a271789f35ae5e9eb01c31df  vdr-plugin-subtitles_0.4.0-1.ds.diff.gz


Index: vdr-subtitles.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr-subtitles/devel/vdr-subtitles.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-subtitles.spec	12 Nov 2006 08:59:02 -0000	1.1
+++ vdr-subtitles.spec	12 Nov 2006 09:07:04 -0000	1.2
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        6%{?dist}
 Summary:        DVB subtitles plugin for VDR
 
 Group:          Applications/Multimedia
@@ -13,7 +13,7 @@
 URL:            http://virtanen.org/vdr/subtitles/
 Source0:        http://virtanen.org/vdr/subtitles/files/%{name}-%{version}.tgz
 Source1:        %{name}.conf
-Patch0:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr-plugin-subtitles_0.3.11-1.ds.diff.gz
+Patch0:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr-plugin-subtitles_0.4.0-1.ds.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.3.48
@@ -34,10 +34,9 @@
 find . -type d -name CVS | xargs rm -r
 chmod 644 *
 %patch0 -p1
-#{__patch} < debian/patches/02_enable_selection.dpatch
-sed -i -e s/0.3.11/0.4.0/ debian/patches/03_constness.dpatch
-%{__patch} < debian/patches/03_constness.dpatch
-%{__patch} < debian/patches/99_transparency_percentage.dpatch
+#{__patch} -i debian/patches/02_enable_selection.dpatch
+%{__patch} -i debian/patches/03_constness.dpatch
+%{__patch} -i debian/patches/99_transparency_percentage.dpatch
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
 
 
@@ -68,6 +67,10 @@
 
 
 %changelog
+* Sun Nov 12 2006 Ville Skytt??  - 0.4.0-6
+- First FE build.
+- Update Darren's patchkit to 0.4.0-1.ds.
+
 * Sat May  6 2006 Ville Skytt??  - 0.4.0-1
 - 0.4.0.
 



From fedora-extras-commits at redhat.com  Sun Nov 12 09:10:49 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 02:10:49 -0700
Subject: rpms/deskbar-applet/devel .cvsignore, 1.15, 1.16 deskbar-applet.spec,
	1.35, 1.36 sources, 1.15, 1.16
Message-ID: <200611120910.kAC9AngM006011@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5983

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	1 Nov 2006 07:51:07 -0000	1.15
+++ .cvsignore	12 Nov 2006 09:10:18 -0000	1.16
@@ -1 +1 @@
-deskbar-applet-2.16.1.tar.bz2
+deskbar-applet-2.17.2.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- deskbar-applet.spec	6 Nov 2006 02:36:26 -0000	1.35
+++ deskbar-applet.spec	12 Nov 2006 09:10:18 -0000	1.36
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.16.1
-Release:        3%{?dist}
+Version:        2.17.2
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -91,6 +91,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sun Nov 12 2006 Luke Macken  - 2.17.2-1
+- 2.17.2
+
 * Sun Nov  5 2006 Luke Macken  - 2.16-1-3
 - Add gnome-python2-devel to BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	1 Nov 2006 07:51:07 -0000	1.15
+++ sources	12 Nov 2006 09:10:18 -0000	1.16
@@ -1 +1 @@
-b236c4d3d70fbc20164ba208de84e5db  deskbar-applet-2.16.1.tar.bz2
+825cd32ffff8c3a105cd3f4e04ec646e  deskbar-applet-2.17.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 09:20:22 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 02:20:22 -0700
Subject: comps comps-fe7.xml.in,1.18,1.19
Message-ID: <200611120920.kAC9KMjb006092@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6072

Modified Files:
	comps-fe7.xml.in 
Log Message:
+vdr-osdteletext, vdr-subtitles


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- comps-fe7.xml.in	12 Nov 2006 05:23:27 -0000	1.18
+++ comps-fe7.xml.in	12 Nov 2006 09:19:52 -0000	1.19
@@ -875,6 +875,8 @@
       tclabc
       ushare
       vdr
+      vdr-osdteletext
+      vdr-subtitles
       wmix
       xmms
       xmms-adplug



From fedora-extras-commits at redhat.com  Sun Nov 12 09:37:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 02:37:01 -0700
Subject: fedora-security/audit fe6,1.17,1.18
Message-ID: <200611120937.kAC9b1SN006266@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6248

Modified Files:
	fe6 
Log Message:
Seamonkey updated to 1.0.6.


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fe6	11 Nov 2006 10:48:17 -0000	1.17
+++ fe6	12 Nov 2006 09:36:58 -0000	1.18
@@ -5,13 +5,13 @@
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
-CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
-CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5748 version (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5747 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985
 CVE-2006-5602 version (xsupplicant, fixed 1.2.6)
 CVE-2006-5601 VULNERABLE (xsupplicant) #212700
-CVE-2006-5464 VULNERABLE (seamonkey, fixed 1.0.6) #214822
-CVE-2006-5463 VULNERABLE (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5464 version (seamonkey, fixed 1.0.6) #214822
+CVE-2006-5463 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5455 patch (bugzilla, fixed 2.22-7) #212355
 CVE-2006-5454 patch (bugzilla, fixed 2.22-7) #212355
 CVE-2006-5453 patch (bugzilla, fixed 2.22-7) #212355



From fedora-extras-commits at redhat.com  Sun Nov 12 09:50:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 02:50:48 -0700
Subject: rpms/flight-of-the-amazon-queen-cd - New directory
Message-ID: <200611120950.kAC9omSM006332@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6328/flight-of-the-amazon-queen-cd

Log Message:
Directory /cvs/extras/rpms/flight-of-the-amazon-queen-cd added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 09:50:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 02:50:53 -0700
Subject: rpms/flight-of-the-amazon-queen-cd/devel - New directory
Message-ID: <200611120950.kAC9orck006346@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6328/flight-of-the-amazon-queen-cd/devel

Log Message:
Directory /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 09:51:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 02:51:12 -0700
Subject: rpms/flight-of-the-amazon-queen-cd Makefile, NONE, 1.1 import.log, 
	NONE, 1.1
Message-ID: <200611120951.kAC9pCup006377@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6371

Added Files:
	Makefile import.log 
Log Message:
Setup of module flight-of-the-amazon-queen-cd


--- NEW FILE Makefile ---
# Top level Makefile for module flight-of-the-amazon-queen-cd
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 Nov 12 09:51:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 02:51:13 -0700
Subject: rpms/flight-of-the-amazon-queen-cd/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611120951.kAC9pDLt006394@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6371/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flight-of-the-amazon-queen-cd


--- 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 Nov 12 10:11:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 03:11:29 -0700
Subject: rpms/flight-of-the-amazon-queen-cd import.log,1.1,1.2
Message-ID: <200611121011.kACABT3R009704@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9670

Modified Files:
	import.log 
Log Message:
auto-import flight-of-the-amazon-queen-cd-1.0-1 on branch devel from flight-of-the-amazon-queen-cd-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen-cd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 09:51:12 -0000	1.1
+++ import.log	12 Nov 2006 10:10:59 -0000	1.2
@@ -0,0 +1 @@
+flight-of-the-amazon-queen-cd-1_0-1:HEAD:flight-of-the-amazon-queen-cd-1.0-1.src.rpm:1163326970



From fedora-extras-commits at redhat.com  Sun Nov 12 10:11:30 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 03:11:30 -0700
Subject: rpms/flight-of-the-amazon-queen-cd/devel
	flight-of-the-amazon-queen-cd.desktop, NONE,
	1.1 flight-of-the-amazon-queen-cd.spec, NONE, 1.1 readme.txt,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611121011.kACABUTc009708@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9670/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flight-of-the-amazon-queen-cd.desktop 
	flight-of-the-amazon-queen-cd.spec readme.txt 
Log Message:
auto-import flight-of-the-amazon-queen-cd-1.0-1 on branch devel from flight-of-the-amazon-queen-cd-1.0-1.src.rpm


--- NEW FILE flight-of-the-amazon-queen-cd.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Flight of the Amazon Queen (CD version)
Comment=Adventure Game
Exec=scummvm -f -p /usr/share/flight-of-the-amazon-queen-cd queen
Icon=scummvm.png
Terminal=false
Type=Application
Categories=Application;Game;AdventureGame;
StartupNotify=false


--- NEW FILE flight-of-the-amazon-queen-cd.spec ---
Name:           flight-of-the-amazon-queen-cd
Version:        1.0
Release:        1
Summary:        Flight of the Amazon Queen - Adventure Game - CD version
Group:          Amusements/Games
# For further discussion on distribution rights see:
# http://www.redhat.com/archives/fedora-extras-list/2006-November/msg00030.html
License:        Distributable
URL:            http://www.scummvm.org/downloads.php
# This is an ogg compressed sfx/speech variant. It has been rebuilded 
# from the original data using queenrebuild (scummvm tools).
#
# queenrebuild --ogg -Q -b 16 queen.1
Source0:        ftp://ftp.suse.com/pub/suse/i386/supplementary/X/FOTAQ/queen.1c.bz2
Source1:        %{name}.desktop
Source2:        ftp://ftp.suse.com/pub/suse/i386/supplementary/X/FOTAQ/readme.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  desktop-file-utils
BuildArch:      noarch
Requires:       scummvm >= 0.9.1, hicolor-icon-theme

%description
It is 1949 and you play Joe King, pilot for hire with his small private plane
the 'Amazon Queen'. The game is a spoof of old timey radio adventure serials,
and as it begins we find Joe in one of those typical situations. It is 11:58
and 36 seconds and counting, Joe and his date are tied up in an abandoned
warehouse ("you really know how to show a girl a good time, Joe!"), and a bomb
is set to go off at midnight!

Of course they escape, in the nick of time, and immediately set us up for the
next 'adventure'. Joe suddenly remembers that he is scheduled to fly the famous
movie star, Faye Russell, to a photo shoot in the Amazon jungle the next
morning.

This package contains the CD version, which contains additional / longer
cutscenes and voice acting, but also is much larger: 37 MB where as the also
available floppy version (package flight-of-the-amazon-queen) is only 7 MB.


%prep
%setup -q -c -T
bzip2 -dc %{SOURCE0} > queen.1c
install -p -m 644 %{SOURCE2} .


%build
# Nothing to build data only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 queen.1c $RPM_BUILD_ROOT%{_datadir}/%{name}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc readme.txt
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Sun Nov  5 2006 Hans de Goede  1.0-1
- Initial FE package


--- NEW FILE readme.txt ---
Flight of the Amazon Queen (Talkie)                 (C) 1995- John Passfield &
-----------------------------------                           Steve Stamatiadis


March 15 2004
***************
	(Licence and legal stuff at the end of this file. Please read them.)

Once again, we here at ScummVM have the pleasure of bringing you yet another
classic adventure game, thanks to John Passfield and Steve Stamatiadis over at
Krome Studios in Australia. This game requires at least ScummVM 0.6.0 to play.

Flight of the Amazon Queen is a 2D point-and-click adventure game set in the 
1940s, originally published for DOS and the Amiga. 

You assume the role of Joe King, a pilot for hire who is given the job of flying
Faye Russell (a famous movie star) into the Amazon jungle for a photo shoot. Of
course, things never go according to plans. After an unfortunate turn of events
they find themselves stranded in the heart of the Amazon jungle, where Joe will
embark on a quest to rescue a kidnapped princess and in the process, discover
the true sinister intentions of a suspiciously located Lederhosen company. In a
rich 2D environment, Joe will cross paths with a variety of unlikely jungle
inhabitants including, but not limited to, a tribe of Amazon women and 6-foot-
tall pygmies.

Game Quickstart
***************
You need ScummVM version 0.6.0 or newer to play this game, which can be
downloaded at http://www.scummvm.org/.

ScummVM runs on many platforms, including many Unices and BSDs, Windows,
Mac OS X, Windows CE and others. However note that some platforms may not (yet)
be capable of playing all games. Please see the ScummVM Compatibility List for
information on newer versions.

You should always read the instructions included with the latest version of
ScummVM, but for here is a quick three-step guide for the impatient:

 1) Unzip the game to a directory and install ScummVM
 2) After running ScummVM, click the 'Add Game' button and browse to the 
    directory you just created.
 3) After adding the game to the list, on future plays simply select it
    from the 'Game List' and click 'Start'!

You can access the in-game save/load and options menu by using the 'Journal'
inventory item.

Enjoy!,
            James 'Ender' Brown,
            Project Co-Leader,
            ScummVM (http://www.scummvm.org/)

Neither of the game authors, nor ScummVM provide support for this game.
Walkthroughs and hints can easily be found online, but the in case of
technical problems, feel free to ask for help on the ScummVM forums.

********************************************************************************
Special Thanks:

          A full list of credits for ScummVM can be found in its README file,
however the following people deserve special credit... and as usual, the first
thanks should go to the creators of this game!

Steve Stamatiadis (www.spacecaptainsteve.com)
John Passfield	  (www.passfieldgames.com)

Thanks for, obviously, making a great game and giving us the honour of rewriting
the engine and releasing it as freeware.

Traditionally the next set of credits go to those who dug through the original
PC-release C source (which was a rather interesting port of the original Amiga 
AMOS version itself!) and re-engineered a new engine:
  David Eriksson, Gregory Montoir and Joost Peters.

Final credit goes to everybody else on the ScummVM team and my co-lead developer
Max Horn, who has kept everything running whilst I've been on a heat-induced
vacation thanks to a boiling summer here in Western Australia.
********************************************************************************
The Legal Stuff:

Preamble:
  Basically, give this game away, share it with your friends. Don't remove this
Readme, or pretend that you wrote it. You can include it in a software
collection, like a Linux distribution or coverdisk (which may be sold), but
using it in things like commercial adventure game collections without asking is
just playing dirty. You can modify the gamedata for such purposes as compressing
audio. This preamble is not legally binding, but is to clarify the intent of
the following licence.

Licence:
 1) You may distribute this game for free on any medium, provided this Readme
and all associated copyright notices and disclaimers are left intact.

 2) You may charge a reasonable copying fee for this archive, and may
distribute it in aggregate as part of a larger and possibly commercial software
distribution (such as a Linux distribution or magazine coverdisk). You must
provide proper attribution and ensure that this Readme and all associated
copyright notices and disclaimers are left intact.

 3) You may not charge a fee for the game itself. This includes reselling the
game as an individual item.

 4) You may modify the game as you wish.  You may also distribute modified
versions under the terms set forth in this licence, but with the additional
requirement that the work is marked with a prominent notice which states that
it is a modified version.

 5) All game content is (C) John Passfield and Steven Stamatiadis.
    The ScummVM engine is (C) The ScummVM Team (www.scummvm.org).

 6) THE GAME DATA IN THIS ARCHIVE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING AND NOT LIMITED TO ANY IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 09:51:13 -0000	1.1
+++ .cvsignore	12 Nov 2006 10:11:00 -0000	1.2
@@ -0,0 +1 @@
+queen.1c.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flight-of-the-amazon-queen-cd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 09:51:13 -0000	1.1
+++ sources	12 Nov 2006 10:11:00 -0000	1.2
@@ -0,0 +1 @@
+10c38ba9fd533c29cf8a26424d27a9f8  queen.1c.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 10:50:27 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 12 Nov 2006 03:50:27 -0700
Subject: rpms/GeoIP/FC-5 .cvsignore, 1.4, 1.5 GeoIP.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200611121050.kACAoRcL009909@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9885

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Sun Sep 3 2006 Michael Fleming  1.4.0-3
- Upstream upgrade
- Added LICENSE.txt file to %doc, covering GeoIP country/city data license
  (bz #198137)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 May 2006 09:07:37 -0000	1.4
+++ .cvsignore	12 Nov 2006 10:49:57 -0000	1.5
@@ -1 +1,2 @@
-GeoIP-1.3.17.tar.gz
+GeoIP-1.4.0.tar.gz
+LICENSE.txt


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GeoIP.spec	18 May 2006 09:07:37 -0000	1.4
+++ GeoIP.spec	12 Nov 2006 10:49:57 -0000	1.5
@@ -1,11 +1,12 @@
 Name: GeoIP           
-Version: 1.3.17
-Release: 1%{?dist}
+Version: 1.4.0
+Release: 3%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
+Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: geoip < %{version}-%{release}
 Provides: geoip = %{version}-%{release}
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q 
+install -D -m644 %{SOURCE1} LICENSE.txt
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -51,7 +53,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO INSTALL 
+%doc AUTHORS COPYING ChangeLog README TODO INSTALL LICENSE*
 %{_libdir}/libGeoIP.so.*
 %{_libdir}/libGeoIPUpdate.so.*
 %{_bindir}/geoiplookup
@@ -71,6 +73,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Sun Sep 3 2006 Michael Fleming  1.4.0-3
+- Upstream upgrade
+- Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
+  (bz #198137)
+
 * Mon May 15 2006 Michael Fleming  1.3.17-1
 - New upstream release (minor fixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 May 2006 09:07:37 -0000	1.4
+++ sources	12 Nov 2006 10:49:57 -0000	1.5
@@ -1 +1,2 @@
-36ee129b4dce5990cea1cfda122dae93  GeoIP-1.3.17.tar.gz
+da09a3d9a1a91e3d16c0a29e6b056c15  GeoIP-1.4.0.tar.gz
+7a976ca11d0f2c6b1fa230b6d57c34d7  LICENSE.txt



From fedora-extras-commits at redhat.com  Sun Nov 12 10:53:18 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 12 Nov 2006 03:53:18 -0700
Subject: rpms/GeoIP/FC-4 .cvsignore, 1.4, 1.5 GeoIP.spec, 1.3, 1.4 sources,
	1.4, 1.5
Message-ID: <200611121053.kACArInC009984@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9964

Modified Files:
	.cvsignore GeoIP.spec sources 
Log Message:
* Sun Sep 3 2006 Michael Fleming  1.4.0-3
- Upstream upgrade
- Added LICENSE.txt file to %doc, covering GeoIP country/city data license
  (bz #198137)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 May 2006 09:08:36 -0000	1.4
+++ .cvsignore	12 Nov 2006 10:52:48 -0000	1.5
@@ -1 +1,2 @@
-GeoIP-1.3.17.tar.gz
+GeoIP-1.4.0.tar.gz
+LICENSE.txt


Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-4/GeoIP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GeoIP.spec	18 May 2006 09:08:36 -0000	1.3
+++ GeoIP.spec	12 Nov 2006 10:52:48 -0000	1.4
@@ -1,11 +1,12 @@
 Name: GeoIP           
-Version: 1.3.17
-Release: 1%{?dist}
+Version: 1.4.0
+Release: 3%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
 URL: http://www.maxmind.com/app/c            
 Source0: http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz 
+Source1: http://www.maxmind.com/download/geoip/database/LICENSE.txt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: geoip < %{version}-%{release}
 Provides: geoip = %{version}-%{release}
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q 
+install -D -m644 %{SOURCE1} LICENSE.txt
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -51,7 +53,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO INSTALL 
+%doc AUTHORS COPYING ChangeLog README TODO INSTALL LICENSE*
 %{_libdir}/libGeoIP.so.*
 %{_libdir}/libGeoIPUpdate.so.*
 %{_bindir}/geoiplookup
@@ -71,6 +73,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Sun Sep 3 2006 Michael Fleming  1.4.0-3
+- Upstream upgrade
+- Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
+  (bz #198137)
+
 * Mon May 15 2006 Michael Fleming  1.3.17-1
 - New upstream release (minor fixes)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 May 2006 09:08:36 -0000	1.4
+++ sources	12 Nov 2006 10:52:48 -0000	1.5
@@ -1 +1,2 @@
-36ee129b4dce5990cea1cfda122dae93  GeoIP-1.3.17.tar.gz
+da09a3d9a1a91e3d16c0a29e6b056c15  GeoIP-1.4.0.tar.gz
+7a976ca11d0f2c6b1fa230b6d57c34d7  LICENSE.txt



From fedora-extras-commits at redhat.com  Sun Nov 12 11:06:51 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:06:51 -0700
Subject: rpms/tinyca2 - New directory
Message-ID: <200611121106.kACB6piV013368@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13364/tinyca2

Log Message:
Directory /cvs/extras/rpms/tinyca2 added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 11:06:58 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:06:58 -0700
Subject: rpms/tinyca2/devel - New directory
Message-ID: <200611121106.kACB6waR013382@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13364/tinyca2/devel

Log Message:
Directory /cvs/extras/rpms/tinyca2/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 11:07:43 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:07:43 -0700
Subject: rpms/tinyca2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611121107.kACB7hxj013414@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13408

Added Files:
	Makefile import.log 
Log Message:
Setup of module tinyca2


--- NEW FILE Makefile ---
# Top level Makefile for module tinyca2
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 Nov 12 11:07:50 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:07:50 -0700
Subject: rpms/tinyca2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611121107.kACB7o9Z013427@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13408/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tinyca2


--- 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 Nov 12 11:09:19 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:09:19 -0700
Subject: rpms/tinyca2 import.log,1.1,1.2
Message-ID: <200611121109.kACB9JrC013520@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13480

Modified Files:
	import.log 
Log Message:
auto-import tinyca2-0.7.5-3.fc5x on branch devel from tinyca2-0.7.5-3.fc5x.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tinyca2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 11:07:43 -0000	1.1
+++ import.log	12 Nov 2006 11:08:49 -0000	1.2
@@ -0,0 +1 @@
+tinyca2-0_7_5-3_fc5x:HEAD:tinyca2-0.7.5-3.fc5x.src.rpm:1163329718



From fedora-extras-commits at redhat.com  Sun Nov 12 11:09:20 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:09:20 -0700
Subject: rpms/tinyca2/devel tinyca2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611121109.kACB9Kil013524@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13480/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tinyca2.spec 
Log Message:
auto-import tinyca2-0.7.5-3.fc5x on branch devel from tinyca2-0.7.5-3.fc5x.src.rpm


--- NEW FILE tinyca2.spec ---
%global pkgdatadir	%_datadir/%name

%{!?release_func:%global release_func() %1%{?dist}}

Name:		tinyca2
Version:	0.7.5
Release:	%release_func 3
Summary:	Simple graphical userinterface to manage a small CA

Group:		Applications/Productivity
License:	GPL
URL:		http://tinyca.sm-zone.net/
Source0:	http://tinyca.sm-zone.net/%name-%version.tar.bz2
BuildRoot:	%_tmppath/%name-%version-%release-root
BuildArch:	noarch

BuildRequires:	gettext desktop-file-utils
Requires:	openssl tar zip

# filter out the private symbols and do not export them
%global reqsed		sed -e '/perl(\\(GUI\\|HELPERS\\|KEY\\|TCONFIG\\|OpenSSL\\|CA\\|CERT\\|REQ\\)[:)]/d;p'
%global __perl_requires sh -x -c "%__perl_requires | %reqsed"
%global __perl_provides sh -x -c "%__perl_provides | %reqsed"


%description
TinyCA is a simple graphical userinterface written in Perl/Gtk to
manage a small CA (Certification Authority).  TinyCA works as a
frontend for openssl

Currently TinyCA supports the following features:

* Unlimited CAs possible
* Support for creating and managing SubCAs
* Creation and Revocation of x509 - S/MIME certificates
* PKCS#10 Requests can be imported and signed
* RSA and DSA keys can be generated and used
* ServerCertificates
  o Certificates can be exported as: PEM, DER, TXT and PKCS#12
  o Certificates may be used with e.g. Apache, Postfix, OpenLDAP,
    Cyrus, FreeS/WAN, OpenVPN, OpenSWAN, FreeRadius
* ClientCertificates
  o Certificates can be exported as: PEM, DER, TXT and PKCS#12
  o Certificates may be used with e.g. Netscape, Konqueror, Opera,
    Internet Explorer, Outlook (Express) and FreeS/WAN
* Certificate Revocation List
  o CRLs can be exported as: PEM, DER and TXT


%prep
%setup -q
rm -rf locale

sed -i -e 's!./\(lib\|templates\)!%pkgdatadir/\1!g;
           s!./locale/!%_datadir/locale!g' tinyca2


%build
cd po
for i in *.po; do
	base=${i%%.po}
	d=../locale/$base/LC_MESSAGES
	mkdir -p "$d"
	msgfmt "$i" -o "$d"/tinyca2.mo
done


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%pkgdatadir/{lib/GUI,templates},%_datadir,%_bindir}

cp -a locale $RPM_BUILD_ROOT%_datadir
install -p -m0755 tinyca2      $RPM_BUILD_ROOT%_bindir/
install -p -m0644 templates/*  $RPM_BUILD_ROOT%pkgdatadir/templates/
install -p -m0644 lib/*.pm     $RPM_BUILD_ROOT%pkgdatadir/lib/
install -p -m0644 lib/GUI/*.pm $RPM_BUILD_ROOT%pkgdatadir/lib/GUI/

desktop-file-install --vendor="fedora"				\
	--dir=$RPM_BUILD_ROOT%_datadir/applications		\
	tinyca2.desktop

%find_lang tinyca2


%clean
rm -rf $RPM_BUILD_ROOT


%files -f tinyca2.lang
%defattr(-,root,root,-)
%doc CHANGES
%_bindir/*
%_datadir/applications/*.desktop
%pkgdatadir


%changelog
* Sun Nov 12 2006 Enrico Scholz  - 0.7.5-3
- initial Fedora package (review #213600)
- removed the 'X-Fedora' category from the desktop file

* Thu Nov  2 2006 Enrico Scholz  - 0.7.5-2
- initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyca2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 11:07:49 -0000	1.1
+++ .cvsignore	12 Nov 2006 11:08:49 -0000	1.2
@@ -0,0 +1 @@
+tinyca2-0.7.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyca2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 11:07:49 -0000	1.1
+++ sources	12 Nov 2006 11:08:49 -0000	1.2
@@ -0,0 +1 @@
+a7f63806dbdc38a34ed58e42e79f4822  tinyca2-0.7.5.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 12 11:46:24 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:46:24 -0700
Subject: rpms/tinyca2/devel tinyca2.spec,1.1,1.2
Message-ID: <200611121146.kACBkOY7019921@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tinyca2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19905

Modified Files:
	tinyca2.spec 
Log Message:
made __perl_* actions silent


Index: tinyca2.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyca2/devel/tinyca2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyca2.spec	12 Nov 2006 11:08:49 -0000	1.1
+++ tinyca2.spec	12 Nov 2006 11:45:53 -0000	1.2
@@ -19,8 +19,8 @@
 
 # filter out the private symbols and do not export them
 %global reqsed		sed -e '/perl(\\(GUI\\|HELPERS\\|KEY\\|TCONFIG\\|OpenSSL\\|CA\\|CERT\\|REQ\\)[:)]/d;p'
-%global __perl_requires sh -x -c "%__perl_requires | %reqsed"
-%global __perl_provides sh -x -c "%__perl_provides | %reqsed"
+%global __perl_requires sh -c "%__perl_requires | %reqsed"
+%global __perl_provides sh -c "%__perl_provides | %reqsed"
 
 
 %description
@@ -98,6 +98,7 @@
 * Sun Nov 12 2006 Enrico Scholz  - 0.7.5-3
 - initial Fedora package (review #213600)
 - removed the 'X-Fedora' category from the desktop file
+- made __perl_* actions silent
 
 * Thu Nov  2 2006 Enrico Scholz  - 0.7.5-2
 - initial build



From fedora-extras-commits at redhat.com  Sun Nov 12 11:49:24 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:49:24 -0700
Subject: owners owners.list,1.1932,1.1933
Message-ID: <200611121149.kACBnOOV019957@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19941

Modified Files:
	owners.list 
Log Message:
added tinyca2


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1932
retrieving revision 1.1933
diff -u -r1.1932 -r1.1933
--- owners.list	12 Nov 2006 09:00:03 -0000	1.1932
+++ owners.list	12 Nov 2006 11:48:53 -0000	1.1933
@@ -2252,6 +2252,7 @@
 Fedora Extras|tiger|Security auditing tool for UNIX systems|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tile|Modernized widgets for Tk|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tin|A basic Internet news reader|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|tinyca2|Simple graphical userinterface to manage a small CA|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|tinyerp|Open Source ERP Client|dan at danny.cz|extras-qa at fedoraproject.org|tcallawa at redhat.com
 Fedora Extras|tinyfugue|A MU* client|seg at haxxed.com|extras-qa at fedoraproject.org|
 Fedora Extras|tiobench|Threaded I/O benchmark|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 11:57:23 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:57:23 -0700
Subject: rpms/tor/FC-5 sources,1.3,1.4 tor.spec,1.3,1.4
Message-ID: <200611121157.kACBvNYr020045@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20027

Modified Files:
	sources tor.spec 
Log Message:
updated to 0.1.1.25


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2006 12:04:45 -0000	1.3
+++ sources	12 Nov 2006 11:56:53 -0000	1.4
@@ -1,2 +1,2 @@
-28dea6a77a43b6e421e1bd7b2cc3d940  tor-0.1.1.24.tar.gz
-217c02c37858cf6048ba2b0a99d76014  tor-0.1.1.24.tar.gz.asc
+b001fa271b5935f3d9c5222809dbd2f1  tor-0.1.1.25.tar.gz
+30b6c339f851eca6c7a5d672cb57681e  tor-0.1.1.25.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-5/tor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tor.spec	7 Oct 2006 12:04:45 -0000	1.3
+++ tor.spec	12 Nov 2006 11:56:53 -0000	1.4
@@ -9,7 +9,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.1.1.24
+Version:	0.1.1.25
 Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
@@ -27,7 +27,7 @@
 Source1:	http://tor.eff.org/dist/%name-%version.tar.gz.asc
 Source2:	tor.logrotate
 Patch0:		tor-0.1.0.15-setgroups.patch
-BuildRoot:	%_tmppath/%name-%version-%release-root-%(%__id_u -n)
+BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	libevent-devel openssl-devel transfig tetex-latex ghostscript
 Requires:		init(%name)
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Enrico Scholz  - 0.1.1.25-1
+- updated to 0.1.1.25
+
 * Thu Oct  5 2006 Enrico Scholz  - 0.1.1.24-1
 - updated to 0.1.1.24
 



From fedora-extras-commits at redhat.com  Sun Nov 12 11:59:41 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 12 Nov 2006 04:59:41 -0700
Subject: rpms/tor/FC-6 sources,1.3,1.4 tor.spec,1.4,1.5
Message-ID: <200611121159.kACBxfit020114@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/tor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20096

Modified Files:
	sources tor.spec 
Log Message:
updated to 0.1.1.25


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 06:29:54 -0000	1.3
+++ sources	12 Nov 2006 11:59:11 -0000	1.4
@@ -1,2 +1,2 @@
-28dea6a77a43b6e421e1bd7b2cc3d940  tor-0.1.1.24.tar.gz
-217c02c37858cf6048ba2b0a99d76014  tor-0.1.1.24.tar.gz.asc
+b001fa271b5935f3d9c5222809dbd2f1  tor-0.1.1.25.tar.gz
+30b6c339f851eca6c7a5d672cb57681e  tor-0.1.1.25.tar.gz.asc


Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/FC-6/tor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tor.spec	5 Oct 2006 06:29:54 -0000	1.4
+++ tor.spec	12 Nov 2006 11:59:11 -0000	1.5
@@ -10,7 +10,7 @@
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Name:		tor
-Version:	0.1.1.24
+Version:	0.1.1.25
 Release:	%release_func 1
 Group:		System Environment/Daemons
 License:	BSD
@@ -179,6 +179,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Enrico Scholz  - 0.1.1.25-1
+- updated to 0.1.1.25
+
 * Thu Oct  5 2006 Enrico Scholz  - 0.1.1.24-1
 - updated to 0.1.1.24
 



From fedora-extras-commits at redhat.com  Sun Nov 12 12:16:18 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:16:18 -0700
Subject: rpms/pyserial - New directory
Message-ID: <200611121216.kACCGICS023316@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23312/pyserial

Log Message:
Directory /cvs/extras/rpms/pyserial added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 12:16:23 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:16:23 -0700
Subject: rpms/pyserial/devel - New directory
Message-ID: <200611121216.kACCGN6u023330@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23312/pyserial/devel

Log Message:
Directory /cvs/extras/rpms/pyserial/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 12:16:46 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:16:46 -0700
Subject: rpms/pyserial Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611121216.kACCGkm4023361@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23355

Added Files:
	Makefile import.log 
Log Message:
Setup of module pyserial


--- NEW FILE Makefile ---
# Top level Makefile for module pyserial
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 Nov 12 12:16:52 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:16:52 -0700
Subject: rpms/pyserial/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611121216.kACCGqg6023379@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23355/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyserial


--- 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 Nov 12 12:18:03 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:18:03 -0700
Subject: rpms/pyserial import.log,1.1,1.2
Message-ID: <200611121218.kACCI3si023455@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23419

Modified Files:
	import.log 
Log Message:
auto-import pyserial-2.2-4 on branch devel from pyserial-2.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pyserial/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 12:16:46 -0000	1.1
+++ import.log	12 Nov 2006 12:17:33 -0000	1.2
@@ -0,0 +1 @@
+pyserial-2_2-4:HEAD:pyserial-2.2-4.src.rpm:1163333843



From fedora-extras-commits at redhat.com  Sun Nov 12 12:18:03 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Sun, 12 Nov 2006 05:18:03 -0700
Subject: rpms/pyserial/devel pyserial.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611121218.kACCI3K0023459@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/pyserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23419/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pyserial.spec 
Log Message:
auto-import pyserial-2.2-4 on branch devel from pyserial-2.2-4.src.rpm


--- NEW FILE pyserial.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Summary: Python serial port access library
Name: pyserial
Version: 2.2
Release: 4%{?dist}
Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.zip
License: Python license
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://pyserial.sourceforge.net/
BuildRequires: python-devel
BuildArch: noarch

%description
This module encapsulates the access for the serial port. It provides backends
for standard Python running on Windows, Linux, BSD (possibly any POSIX
compilant system) and Jython. The module named "serial" automaticaly selects
the appropriate backend.

%prep
export UNZIP="-aa"
%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

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc LICENSE.txt CHANGES.txt README.txt examples
%{python_sitelib}/*

%changelog
* Mon Nov  6 2006 Paul P Komkoff Jr  - 2.2-4
- remove "export libdirname"

* Tue Oct 24 2006 Paul P Komkoff Jr  - 2.2-3
- Minor specfile fixes

* Sat Oct 14 2006 Paul P Komkoff Jr  - 2.2-2
- Minor specfile fixes

* Tue May  9 2006 Paul P Komkoff Jr  - 2.2-1
- Fedora Extras submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyserial/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 12:16:52 -0000	1.1
+++ .cvsignore	12 Nov 2006 12:17:33 -0000	1.2
@@ -0,0 +1 @@
+pyserial-2.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyserial/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 12:16:52 -0000	1.1
+++ sources	12 Nov 2006 12:17:33 -0000	1.2
@@ -0,0 +1 @@
+14e774b7b6e5aa52820f0590d3b8c4d9  pyserial-2.2.zip



From fedora-extras-commits at redhat.com  Sun Nov 12 12:23:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 05:23:55 -0700
Subject: fedora-security/audit fe4,1.96,1.97 fe5,1.104,1.105 fe6,1.18,1.19
Message-ID: <200611121223.kACCNtpG023529@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23507

Modified Files:
	fe4 fe5 fe6 
Log Message:
CVE-2006-5848 (trac) taken care of for FC4+


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- fe4	11 Nov 2006 10:48:17 -0000	1.96
+++ fe4	12 Nov 2006 12:23:53 -0000	1.97
@@ -3,7 +3,7 @@
 ** are items that need attention
 
 CVE-2006-5864 VULNERABLE (gv) #215136
-CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
+CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fe5	11 Nov 2006 10:48:17 -0000	1.104
+++ fe5	12 Nov 2006 12:23:53 -0000	1.105
@@ -3,7 +3,7 @@
 ** are items that need attention
 
 CVE-2006-5864 VULNERABLE (gv) #215136
-CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
+CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fe6	12 Nov 2006 09:36:58 -0000	1.18
+++ fe6	12 Nov 2006 12:23:53 -0000	1.19
@@ -3,7 +3,7 @@
 ** are items that need attention
 
 CVE-2006-5864 VULNERABLE (gv) #215136
-CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
+CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5748 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 version (seamonkey, fixed 1.0.6) #214822



From fedora-extras-commits at redhat.com  Sun Nov 12 17:09:50 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 10:09:50 -0700
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.12,1.13
Message-ID: <200611121709.kACH9o7C007220@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-serv7204

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sun Nov 12 2006 Ville Skytt?? 
- Rebuild for kernel 2.6.18-1.2849.fc6.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- em8300-kmod.spec	11 Nov 2006 09:46:36 -0000	1.12
+++ em8300-kmod.spec	12 Nov 2006 17:09:20 -0000	1.13
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2849.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Ville Skytt?? 
+- Rebuild for kernel 2.6.18-1.2849.fc6.
+
 * Sat Nov 11 2006 Ville Skytt??  - 0.16.0-0.3.rc2
 - 0.16.0-rc2.
 



From fedora-extras-commits at redhat.com  Sun Nov 12 17:25:22 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Sun, 12 Nov 2006 10:25:22 -0700
Subject: fedora-updates-system README,NONE,1.1
Message-ID: <200611121725.kACHPMrN007421@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/fedora-updates-system
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7404

Added Files:
	README 
Log Message:
Added Readme


--- NEW FILE README ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:30:34 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:30:34 -0700
Subject: rpms/libsvg-cairo/FC-5 Makefile, 1.1, NONE branch, 1.1,
	NONE libsvg-cairo.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200611121830.kACIUYgs010848@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10840/FC-5

Removed Files:
	Makefile branch libsvg-cairo.spec sources 
Log Message:
Setting libsvg as EOL



--- Makefile DELETED ---


--- branch DELETED ---


--- libsvg-cairo.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:30:40 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:30:40 -0700
Subject: rpms/libsvg-cairo/FC-6 Makefile, 1.1, NONE branch, 1.1,
	NONE libsvg-cairo.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <200611121830.kACIUeDl010861@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10840/FC-6

Removed Files:
	Makefile branch libsvg-cairo.spec sources 
Log Message:
Setting libsvg as EOL



--- Makefile DELETED ---


--- branch DELETED ---


--- libsvg-cairo.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:30:45 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:30:45 -0700
Subject: rpms/libsvg-cairo/devel Makefile, 1.1, NONE libsvg-cairo.spec, 1.3, 
	NONE sources, 1.2, NONE
Message-ID: <200611121830.kACIUjx0010877@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10840/devel

Removed Files:
	Makefile libsvg-cairo.spec sources 
Log Message:
Setting libsvg as EOL



--- Makefile DELETED ---


--- libsvg-cairo.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:31:31 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:31:31 -0700
Subject: rpms/libsvg-cairo/FC-5 dead.package,NONE,1.1
Message-ID: <200611121831.kACIVVbL010914@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907/FC-5

Added Files:
	dead.package 
Log Message:
Forgot to add dead.package files



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core



From fedora-extras-commits at redhat.com  Sun Nov 12 18:31:36 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:31:36 -0700
Subject: rpms/libsvg-cairo/FC-6 dead.package,NONE,1.1
Message-ID: <200611121831.kACIVabO010929@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907/FC-6

Added Files:
	dead.package 
Log Message:
Forgot to add dead.package files



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core



From fedora-extras-commits at redhat.com  Sun Nov 12 18:31:42 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:31:42 -0700
Subject: rpms/libsvg-cairo/devel dead.package,NONE,1.1
Message-ID: <200611121831.kACIVgL4010944@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907/devel

Added Files:
	dead.package 
Log Message:
Forgot to add dead.package files



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core



From fedora-extras-commits at redhat.com  Sun Nov 12 18:33:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 11:33:56 -0700
Subject: owners owners.list,1.1933,1.1934
Message-ID: <200611121833.kACIXu1K010991@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10975

Modified Files:
	owners.list 
Log Message:
added flight-of-the-amazon-queen-cd


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1933
retrieving revision 1.1934
diff -u -r1.1933 -r1.1934
--- owners.list	12 Nov 2006 11:48:53 -0000	1.1933
+++ owners.list	12 Nov 2006 18:33:25 -0000	1.1934
@@ -402,6 +402,7 @@
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flasm|Flash bytecode assembler disassembler|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|flight-of-the-amazon-queen-cd|Flight of the Amazon Queen - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -2323,9 +2324,9 @@
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 18:37:18 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 12 Nov 2006 11:37:18 -0700
Subject: rpms/moomps/devel moomps.spec,1.15,1.16
Message-ID: <200611121837.kACIbIVv011029@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11013

Modified Files:
	moomps.spec 
Log Message:
made package architecture dependant since for example Tcl
packages are under /usr/lib on i386 and /usr/lib64 on x86_64



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- moomps.spec	4 Nov 2006 12:25:32 -0000	1.15
+++ moomps.spec	12 Nov 2006 18:36:48 -0000	1.16
@@ -1,12 +1,11 @@
 Name: moomps
 Version: 5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
 Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
 URL: http://moodss.sourceforge.net/
-BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl >= 8.4.7
 Requires(pre): fedora-usermgmt >= 0.8
@@ -81,6 +80,10 @@
 
 
 %changelog
+* Tue Nov 7 2006 Jean-Luc Fontaine  5.7-3
+- made package architecture dependant since for example Tcl
+  packages are under /usr/lib on i386 and /usr/lib64 on x86_64
+
 * Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
 - properly support 64 bit architecture by passing library
   directories to make



From fedora-extras-commits at redhat.com  Sun Nov 12 18:38:49 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 11:38:49 -0700
Subject: comps comps-fe5.xml.in, 1.196, 1.197 comps-fe6.xml.in, 1.220,
	1.221 comps-fe7.xml.in, 1.19, 1.20
Message-ID: <200611121838.kACIcnj5011093@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11073

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add pachi and flight-of-the-amazon-queen-cd


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- comps-fe5.xml.in	12 Nov 2006 05:23:27 -0000	1.196
+++ comps-fe5.xml.in	12 Nov 2006 18:38:19 -0000	1.197
@@ -327,6 +327,7 @@
       fbg
       fillets-ng
       flight-of-the-amazon-queen
+      flight-of-the-amazon-queen-cd
       foobillard
       fortune-mod
       fRaBs
@@ -362,6 +363,7 @@
       njam
       oneko
       overgod
+      pachi
       pengupop
       pinball
       pingus


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- comps-fe6.xml.in	12 Nov 2006 05:23:27 -0000	1.220
+++ comps-fe6.xml.in	12 Nov 2006 18:38:19 -0000	1.221
@@ -379,6 +379,7 @@
       fbg
       fillets-ng
       flight-of-the-amazon-queen
+      flight-of-the-amazon-queen-cd
       foobillard
       fortune-mod
       fRaBs
@@ -415,6 +416,7 @@
       njam
       oneko
       overgod
+      pachi
       pengupop
       pinball
       pingus


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- comps-fe7.xml.in	12 Nov 2006 09:19:52 -0000	1.19
+++ comps-fe7.xml.in	12 Nov 2006 18:38:19 -0000	1.20
@@ -379,6 +379,7 @@
       fbg
       fillets-ng
       flight-of-the-amazon-queen
+      flight-of-the-amazon-queen-cd
       foobillard
       fortune-mod
       fRaBs
@@ -415,6 +416,7 @@
       njam
       oneko
       overgod
+      pachi
       pengupop
       pinball
       pingus



From fedora-extras-commits at redhat.com  Sun Nov 12 18:51:51 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:51:51 -0700
Subject: rpms/libsvg/FC-5 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE libsvg.spec, 1.3, NONE sources, 1.2, NONE
Message-ID: <200611121851.kACIpp2H011174@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11167/FC-5

Added Files:
	dead.package 
Removed Files:
	Makefile branch libsvg.spec sources 
Log Message:
Setting libsvg as EOL



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core


--- Makefile DELETED ---


--- branch DELETED ---


--- libsvg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:51:57 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:51:57 -0700
Subject: rpms/libsvg/FC-6 dead.package, NONE, 1.1 Makefile, 1.1, NONE branch,
	1.1, NONE libsvg.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200611121851.kACIpvfX011189@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11167/FC-6

Added Files:
	dead.package 
Removed Files:
	Makefile branch libsvg.spec sources 
Log Message:
Setting libsvg as EOL



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core


--- Makefile DELETED ---


--- branch DELETED ---


--- libsvg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 18:52:03 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 11:52:03 -0700
Subject: rpms/libsvg/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE libsvg.spec, 1.4, NONE sources, 1.2, NONE
Message-ID: <200611121852.kACIq3pV011204@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11167/devel

Added Files:
	dead.package 
Removed Files:
	Makefile libsvg.spec sources 
Log Message:
Setting libsvg as EOL



--- NEW FILE dead.package ---
libsvg is no longer maintained and has been replaced
by librsvg upstream which is now in core


--- Makefile DELETED ---


--- libsvg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 19:13:43 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 12:13:43 -0700
Subject: owners owners.list,1.1934,1.1935
Message-ID: <200611121913.kACJDhs3014377@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14347

Modified Files:
	owners.list 
Log Message:
Added libsvg, and libsvg-cairo back



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1934
retrieving revision 1.1935
diff -u -r1.1934 -r1.1935
--- owners.list	12 Nov 2006 18:33:25 -0000	1.1934
+++ owners.list	12 Nov 2006 19:13:13 -0000	1.1935
@@ -968,6 +968,8 @@
 Fedora Extras|libspectrum|The ZX Spectrum library required for the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|libstroke|A stroke interface library|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
+Fedora Extras|libsvg|A library for parsing SVG documents|work.eric at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsvg-cairo|Renders SVG content using cairo|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsx|Simple X library|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libsynaptics|Synaptics touchpad driver library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 19:19:40 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 12:19:40 -0700
Subject: rpms/xmoto/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmoto.spec, 
	1.5, 1.6
Message-ID: <200611121919.kACJJesE014439@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14419

Modified Files:
	.cvsignore sources xmoto.spec 
Log Message:
* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Sep 2006 20:40:25 -0000	1.3
+++ .cvsignore	12 Nov 2006 19:19:09 -0000	1.4
@@ -1 +1 @@
-xmoto-0.2.0-src.tar.gz
+xmoto-0.2.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Sep 2006 20:40:25 -0000	1.3
+++ sources	12 Nov 2006 19:19:09 -0000	1.4
@@ -1 +1 @@
-0404467792034dd221b92303f2750ac7  xmoto-0.2.0-src.tar.gz
+bbf2f0c02ba2ffe1f65e4ca78b0a0bd3  xmoto-0.2.2-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmoto.spec	6 Nov 2006 14:43:43 -0000	1.5
+++ xmoto.spec	12 Nov 2006 19:19:09 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           xmoto
-Version:        0.2.0
-Release:        2%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games
@@ -29,7 +29,7 @@
 
 
 %build
-%configure
+%configure --with-enable-zoom=1
 make %{?_smp_mflags}
 
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
+- New upstream release
+
 * Mon Nov  6 2006 Jindrich Novy  0.2.0-2
 - Rebuild against the new curl
 



From fedora-extras-commits at redhat.com  Sun Nov 12 19:43:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 12 Nov 2006 12:43:36 -0700
Subject: rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.13,1.14
Message-ID: <200611121943.kACJhaMO014717@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-serv14695

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sun Nov 12 2006 Ville Skytt??  - 0.16.0-0.4.rc2
- Let rpmbuild strip modules.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- em8300-kmod.spec	12 Nov 2006 17:09:20 -0000	1.13
+++ em8300-kmod.spec	12 Nov 2006 19:43:05 -0000	1.14
@@ -27,7 +27,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.3.rc2.%(echo %{kverrel} | tr - _)
+Release:        0.4.rc2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -79,6 +79,7 @@
         KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
     cd ../..
 done
+chmod +x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*.ko
 
 
 %clean
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Ville Skytt??  - 0.16.0-0.4.rc2
+- Let rpmbuild strip modules.
+
 * Sun Nov 12 2006 Ville Skytt?? 
 - Rebuild for kernel 2.6.18-1.2849.fc6.
 



From fedora-extras-commits at redhat.com  Sun Nov 12 19:44:49 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 12:44:49 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.6,1.7
Message-ID: <200611121944.kACJinwV014782@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14766

Modified Files:
	xmoto.spec 
Log Message:



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xmoto.spec	12 Nov 2006 19:19:09 -0000	1.6
+++ xmoto.spec	12 Nov 2006 19:44:19 -0000	1.7
@@ -1,3 +1,6 @@
+# No debuginfo package due to faulty find-debuginfo.sh
+%define debug_package %{nil}
+
 Name:           xmoto
 Version:        0.2.2
 Release:        1%{?dist}



From fedora-extras-commits at redhat.com  Sun Nov 12 20:00:18 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 13:00:18 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.7,1.8
Message-ID: <200611122000.kACK0IDD014894@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14866

Modified Files:
	xmoto.spec 
Log Message:



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmoto.spec	12 Nov 2006 19:44:19 -0000	1.7
+++ xmoto.spec	12 Nov 2006 19:59:48 -0000	1.8
@@ -33,7 +33,7 @@
 
 %build
 %configure --with-enable-zoom=1
-make %{?_smp_mflags}
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Sun Nov 12 20:01:05 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:01:05 -0700
Subject: rpms/libsvg/FC-5 dead.package,1.1,1.2
Message-ID: <200611122001.kACK15nC017228@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14901/FC-5

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg/FC-5/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:51:51 -0000	1.1
+++ dead.package	12 Nov 2006 20:00:35 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:01:06 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:01:06 -0700
Subject: rpms/libsvg/devel dead.package,1.1,1.2
Message-ID: <200611122001.kACK16pP017568@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14901/devel

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:52:03 -0000	1.1
+++ dead.package	12 Nov 2006 20:00:36 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:01:05 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:01:05 -0700
Subject: rpms/libsvg/FC-6 dead.package,1.1,1.2
Message-ID: <200611122001.kACK15Mc017562@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14901/FC-6

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg/FC-6/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:51:57 -0000	1.1
+++ dead.package	12 Nov 2006 20:00:35 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:05 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:02:05 -0700
Subject: fedora-updates-system/Fedora_Updates_System.egg-info - New directory
Message-ID: <200611122002.kACK25fZ018012@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/Fedora_Updates_System.egg-info
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17986/Fedora_Updates_System.egg-info

Log Message:
Directory /cvs/fedora/fedora-updates-system/Fedora_Updates_System.egg-info added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:05 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:02:05 -0700
Subject: fedora-updates-system/updatessystem - New directory
Message-ID: <200611122002.kACK25BT018015@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17986/updatessystem

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:40 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:02:40 -0700
Subject: rpms/libsvg-cairo/devel dead.package,1.1,1.2
Message-ID: <200611122002.kACK2e8x018065@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982/devel

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg-cairo/devel/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:31:42 -0000	1.1
+++ dead.package	12 Nov 2006 20:02:10 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:40 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:02:40 -0700
Subject: rpms/libsvg-cairo/FC-6 dead.package,1.1,1.2
Message-ID: <200611122002.kACK2eFP018063@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982/FC-6

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg-cairo/FC-6/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:31:36 -0000	1.1
+++ dead.package	12 Nov 2006 20:02:08 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:02:40 2006
From: fedora-extras-commits at redhat.com (Eric Work (ework))
Date: Sun, 12 Nov 2006 13:02:40 -0700
Subject: rpms/libsvg-cairo/FC-5 dead.package,1.1,1.2
Message-ID: <200611122002.kACK2eIT018064@cvs-int.fedora.redhat.com>

Author: ework

Update of /cvs/extras/rpms/libsvg-cairo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982/FC-5

Modified Files:
	dead.package 
Log Message:
Improved dead.package description



Index: dead.package
===================================================================
RCS file: /cvs/extras/rpms/libsvg-cairo/FC-5/dead.package,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dead.package	12 Nov 2006 18:31:31 -0000	1.1
+++ dead.package	12 Nov 2006 20:02:06 -0000	1.2
@@ -1,2 +1,11 @@
-libsvg is no longer maintained and has been replaced
-by librsvg upstream which is now in core
+libsvg was a split from librsvg, working to add a cairo backend for rendering
+SVG.  libsvg is no longer maintained and the author encourages librsvg to
+be used instead, which is now in core.  The API is not compatible but they
+have similar capabilities.
+
+This package was originally added to help developers working with compiz.
+Since then compiz has been patched to use librsvg instead making this package
+no longer necessary.
+
+See discussion referenced below:
+http://sourceforge.net/mailarchive/forum.php?thread_id=8108060&forum_id=12476



From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:40 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:40 -0700
Subject: fedora-updates-system/updatessystem/templates - New directory
Message-ID: <200611122003.kACK3evU018186@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/templates

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/templates added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:41 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:41 -0700
Subject: fedora-updates-system/updatessystem/tests - New directory
Message-ID: <200611122003.kACK3f5W018196@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/tests

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/tests added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:38 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:38 -0700
Subject: fedora-updates-system/updatessystem/static - New directory
Message-ID: <200611122003.kACK3cNv018172@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/static

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/static added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:39 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:39 -0700
Subject: fedora-updates-system/updatessystem/sqlobject-history - New
	directory
Message-ID: <200611122003.kACK3doo018176@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/sqlobject-history
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/sqlobject-history

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/sqlobject-history added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:37 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:37 -0700
Subject: fedora-updates-system/updatessystem/jobs - New directory
Message-ID: <200611122003.kACK3bm2018158@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/jobs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/jobs

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/jobs added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:36 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:36 -0700
Subject: fedora-updates-system/updatessystem/catwalk-session - New directory
Message-ID: <200611122003.kACK3aJA018130@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/catwalk-session
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/catwalk-session

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/catwalk-session added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:03:37 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:03:37 -0700
Subject: fedora-updates-system/updatessystem/config - New directory
Message-ID: <200611122003.kACK3bPN018144@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18089/config

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/config added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:05:45 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:05:45 -0700
Subject: fedora-updates-system/updatessystem/static/css - New directory
Message-ID: <200611122005.kACK5j82018257@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220/css

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/static/css added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:05:46 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:05:46 -0700
Subject: fedora-updates-system/updatessystem/static/images - New directory
Message-ID: <200611122005.kACK5k1F018262@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220/images

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/static/images added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:05:47 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:05:47 -0700
Subject: fedora-updates-system/updatessystem/static/javascript - New
	directory
Message-ID: <200611122005.kACK5lwL018265@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/javascript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18220/javascript

Log Message:
Directory /cvs/fedora/fedora-updates-system/updatessystem/static/javascript added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:00 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:00 -0700
Subject: fedora-updates-system/Fedora_Updates_System.egg-info PKG-INFO, NONE,
	1.1 SOURCES.txt, NONE, 1.1 dependency_links.txt, NONE,
	1.1 not-zip-safe, NONE, 1.1 paster_plugins.txt, NONE,
	1.1 requires.txt, NONE, 1.1 sqlobject.txt, NONE,
	1.1 top_level.txt, NONE, 1.1
Message-ID: <200611122008.kACK8050018365@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/Fedora_Updates_System.egg-info
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/Fedora_Updates_System.egg-info

Added Files:
	PKG-INFO SOURCES.txt dependency_links.txt not-zip-safe 
	paster_plugins.txt requires.txt sqlobject.txt top_level.txt 
Log Message:
initial import


--- NEW FILE PKG-INFO ---
Metadata-Version: 1.0
Name: Fedora-Updates-System
Version: 1.0
Summary: UNKNOWN
Home-page: UNKNOWN
Author: UNKNOWN
Author-email: UNKNOWN
License: UNKNOWN
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 3 - Alpha
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Classifier: Framework :: TurboGears


--- NEW FILE SOURCES.txt ---
README.txt
setup.py
start-updatessystem.py
Fedora_Updates_System.egg-info/PKG-INFO
Fedora_Updates_System.egg-info/SOURCES.txt
Fedora_Updates_System.egg-info/dependency_links.txt
Fedora_Updates_System.egg-info/not-zip-safe
Fedora_Updates_System.egg-info/paster_plugins.txt
Fedora_Updates_System.egg-info/requires.txt
Fedora_Updates_System.egg-info/sqlobject.txt
Fedora_Updates_System.egg-info/top_level.txt
updatessystem/__init__.py
updatessystem/controllers.py
updatessystem/json.py
updatessystem/model.py
updatessystem/release.py
updatessystem/config/__init__.py
updatessystem/templates/__init__.py
updatessystem/tests/__init__.py
updatessystem/tests/test_controllers.py
updatessystem/tests/test_model.py


--- NEW FILE dependency_links.txt ---



--- NEW FILE not-zip-safe ---



--- NEW FILE paster_plugins.txt ---
TurboGears
PasteScript


--- NEW FILE requires.txt ---
TurboGears >= 1.0b1

--- NEW FILE sqlobject.txt ---
db_module=updatessystem.model
history_dir=$base/updatessystem/sqlobject-history


--- NEW FILE top_level.txt ---
updatessystem



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:08 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:08 -0700
Subject: fedora-updates-system/updatessystem/static/images favicon.ico, NONE,
	1.1 header_inner.png, NONE, 1.1 info.png, NONE, 1.1 ok.png,
	NONE, 1.1 tg_under_the_hood.png, NONE,
	1.1 under_the_hood_blue.png, NONE, 1.1
Message-ID: <200611122008.kACK882N018475@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/static/images

Added Files:
	favicon.ico header_inner.png info.png ok.png 
	tg_under_the_hood.png under_the_hood_blue.png 
Log Message:
initial import


--- NEW FILE favicon.ico ---
GIF89a
}\??bD*$h5???? ??
?D??????`-??a@



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:09 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:09 -0700
Subject: fedora-updates-system/updatessystem/tests __init__.py, NONE,
	1.1 test_controllers.py, NONE, 1.1 test_model.py, NONE, 1.1
Message-ID: <200611122008.kACK89or018485@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/tests

Added Files:
	__init__.py test_controllers.py test_model.py 
Log Message:
initial import


--- NEW FILE __init__.py ---


--- NEW FILE test_controllers.py ---
from turbogears import testutil
from updatessystem.controllers import Root
import cherrypy

cherrypy.root = Root()

def test_method():
    "the index method should return a string called now"
    import types
    result = testutil.call(cherrypy.root.index)
    assert type(result["now"]) == types.StringType

def test_indextitle():
    "The mainpage should have the right title"
    testutil.createRequest("/")
    assert "Welcome to TurboGears" in cherrypy.response.body[0]


--- NEW FILE test_model.py ---
# If your project uses a database, you can set up database tests
# similar to what you see below. Be sure to set the db_uri to
# an appropriate uri for your testing database. sqlite is a good
# choice for testing, because you can use an in-memory database
# which is very fast.

from turbogears import testutil, database
# from updatessystem.model import YourDataClass, User

# database.set_db_uri("sqlite:///:memory:")

# class TestUser(testutil.DBTest):
#     def get_model(self):
#         return User
#     def test_creation(self):
#         "Object creation should set the name"
#         obj = User(user_name = "creosote",
#                       email_address = "spam at python.not",
#                       display_name = "Mr Creosote",
#                       password = "Wafer-thin Mint")
#         assert obj.display_name == "Mr Creosote"




From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:06 -0700
Subject: fedora-updates-system/updatessystem/config __init__.py, NONE,
	1.1 app.cfg, NONE, 1.1 log.cfg, NONE, 1.1
Message-ID: <200611122008.kACK86gt018431@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/config

Added Files:
	__init__.py app.cfg log.cfg 
Log Message:
initial import


--- NEW FILE __init__.py ---


--- NEW FILE app.cfg ---
[global]
# The settings in this file should not vary depending on the deployment
# environment. dev.cfg and prod.cfg are the locations for
# the different deployment settings. Settings in this file will
# be overridden by settings in those other files.

# The commented out values below are the defaults

# VIEW

# which view (template engine) to use if one is not specified in the
# template name
# tg.defaultview = "kid"

# The following kid settings determine the settings used by the kid serializer.

# One of (html|xml|json)
# kid.outputformat="html"

# kid.encoding="utf-8"

# The sitetemplate is used for overall styling of a site that
# includes multiple TurboGears applications
# tg.sitetemplate=""

# Allow every exposed function to be called as json,
# tg.allow_json = False

# List of Widgets to include on every page.
# for exemple ['turbogears.mochikit']
# tg.include_widgets = []

# Set to True if the scheduler should be started
# tg.scheduler = False

# VISIT TRACKING
# Each visit to your application will be assigned a unique visit ID tracked via
# a cookie sent to the visitor's browser.
# --------------

# Enable Visit tracking
visit.on=True

# Number of minutes a visit may be idle before it expires.
# visit.timeout=20

# The name of the cookie to transmit to the visitor's browser.
# visit.cookie.name="tg-visit"

# Domain name to specify when setting the cookie (must begin with . according to
# RFC 2109). The default (None) should work for most cases and will default to
# the machine to which the request was made. NOTE: localhost is NEVER a valid
# value and will NOT WORK.
# visit.cookie.domain=None

# Specific path for the cookie
# visit.cookie.path="/"

# The name of the VisitManager plugin to use for visitor tracking.
visit.manager="sqlobject"

# Database class to use for visit tracking
visit.soprovider.model = "updatessystem.model.Visit"

# IDENTITY
# General configuration of the TurboGears Identity management module
# --------

# Switch to turn on or off the Identity management module
identity.on=True

# [REQUIRED] URL to which CherryPy will internally redirect when an access
# control check fails. If Identity management is turned on, a value for this
# option must be specified.
identity.failure_url="/login"

# identity.provider='sqlobject'

# The names of the fields on the login form containing the visitor's user ID
# and password. In addition, the submit button is specified simply so its
# existence may be stripped out prior to passing the form data to the target
# controller.
# identity.form.user_name="user_name"
# identity.form.password="password"
# identity.form.submit="login"

# What sources should the identity provider consider when determining the
# identity associated with a request? Comma separated list of identity sources.
# Valid sources: form, visit, http_auth
# identity.source="form,http_auth,visit"

# SqlObjectIdentityProvider
# Configuration options for the default IdentityProvider
# -------------------------

# The classes you wish to use for your Identity model. Remember to not use reserved
# SQL keywords for class names (at least unless you specify a different table
# name using sqlmeta).
identity.soprovider.model.user="updatessystem.model.User"
identity.soprovider.model.group="updatessystem.model.Group"
identity.soprovider.model.permission="updatessystem.model.Permission"

# The password encryption algorithm used when comparing passwords against what's
# stored in the database. Valid values are 'md5' or 'sha1'. If you do not
# specify an encryption algorithm, passwords are expected to be clear text.
# The SqlObjectProvider *will* encrypt passwords supplied as part of your login
# form.  If you set the password through the password property, like:
# my_user.password = 'secret'
# the password will be encrypted in the database, provided identity is up and 
# running, or you have loaded the configuration specifying what encryption to
# use (in situations where identity may not yet be running, like tests).

# identity.soprovider.encryption_algorithm=None
[/static]
static_filter.on = True
static_filter.dir = "%(top_level_dir)s/static"

[/favicon.ico]
static_filter.on = True
static_filter.file = "%(top_level_dir)s/static/images/favicon.ico"


--- NEW FILE log.cfg ---
# LOGGING
# Logging is often deployment specific, but some handlers and
# formatters can be defined here.

[logging]
[[formatters]]
[[[message_only]]]
format='*(message)s'

[[[full_content]]]
format='*(asctime)s *(name)s *(levelname)s *(message)s'

[[handlers]]
[[[debug_out]]]
class='StreamHandler'
level='DEBUG'
args='(sys.stdout,)'
formatter='full_content'

[[[access_out]]]
class='StreamHandler'
level='INFO'
args='(sys.stdout,)'
formatter='message_only'

[[[error_out]]]
class='StreamHandler'
level='ERROR'
args='(sys.stdout,)'



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:07 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:07 -0700
Subject: fedora-updates-system/updatessystem/static/css style.css,NONE,1.1
Message-ID: <200611122008.kACK8754018472@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/static/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/static/css

Added Files:
	style.css 
Log Message:
initial import


--- NEW FILE style.css ---
/*
 * Quick mash-up of CSS for the TG quick start page.
 */

html, body, th, td {
  color: black;
  background-color: #ddd;
  font: x-small "Lucida Grande", "Lucida Sans Unicode", geneva, verdana, sans-serif;
  margin: 0;
  padding: 0;
}

#header {
  height: 80px;
  width: 777px;
  background: blue URL('../images/header_inner.png') no-repeat;
  border-left: 1px solid #aaa;
  border-right: 1px solid #aaa;
  margin: 0 auto 0 auto;
}

a.link, a, a.active {
  color: #369;
}


#main_content {
  color: black;
  font-size: 127%;
  background-color: white;
  width: 757px;
  margin: 0 auto 0 auto;
  border-left: 1px solid #aaa;
  border-right: 1px solid #aaa;
  padding: 10px;
}

#sidebar {
  border: 1px solid #aaa;
  background-color: #eee;
  margin: 0.5em;
  padding: 1em;
  float: right;
  width: 200px;
  font-size: 88%;
}

#sidebar h2 {
  margin-top: 0;
}

#sidebar ul {
  margin-left: 1.5em;
  padding-left: 0;
}

h1,h2,h3,h4,h5,h6,#getting_started_steps {
  font-family: "Century Schoolbook L", Georgia, serif;
  font-weight: bold;
}

h2 {
  font-size:150%
}

#getting_started_steps a {
  text-decoration:none;
}

#getting_started_steps a:hover {
  text-decoration:underline;
}

#getting_started_steps li {
  font-size:80%
  margin-bottom: 0.5em;
}

#getting_started_steps h2 {
  font-size:120%;
}

#getting_started_steps p {
  font: 100% "Lucida Grande", "Lucida Sans Unicode", geneva, verdana, sans-serif;
}

#footer {
  border: 1px solid #aaa;
  border-top: 0px none;
  color: #999;
  background-color: white;
  padding: 10px;
  font-size: 80%;
  text-align: center;
  width: 757px;
  margin: 0 auto 1em auto;
}

.code {
  font-family: monospace;
}

span.code {
  font-weight: bold;
  background: #eee;
}

#status_block {
	margin: 0 auto 0.5em auto;
	padding: 15px 10px 15px 55px;
  background: #cec URL('../images/ok.png') left center no-repeat;
	border: 1px solid #9c9;
  width: 450px;
  font-size: 120%;
  font-weight: bolder;
}

.notice {
  margin: 0.5em auto 0.5em auto;
  padding: 15px 10px 15px 55px;
  width: 450px;
  background: #eef URL('../images/info.png') left center no-repeat;
  border: 1px solid #cce;
}



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:09 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:09 -0700
Subject: fedora-updates-system/updatessystem/templates __init__.py, NONE,
	1.1 list.kid, NONE, 1.1 login.kid, NONE, 1.1 master.kid, NONE,
	1.1 new.kid, NONE, 1.1 welcome.kid, NONE, 1.1
Message-ID: <200611122008.kACK89V1018480@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/templates

Added Files:
	__init__.py list.kid login.kid master.kid new.kid welcome.kid 
Log Message:
initial import


--- NEW FILE __init__.py ---


--- NEW FILE list.kid ---




    
    Fedora Update System




    ${updates.display()}





--- NEW FILE login.kid ---




    
    Login
    



    
      
        
      Login
      
        
      ${message}
      
        
      
            
      
                
      
                    
                        
                    
                    
                        
                    
                
      
                
      
                    
                        
                    
                    
                        
                    
                
      
                
      
                    
                        
                    
                
      
            
      

            
                
            
        
      
    
      




--- NEW FILE master.kid ---





    
    Your title goes here
    
    
    



    
      
        
            Login
        
        
            Welcome ${tg.identity.user.display_name}.
            Logout
        
    
      

    
      

    
      

	






--- NEW FILE new.kid ---




    



    
      
        
      
            
      
                
                    ${update_form.display()}
                
            
      
        
      
    
      




--- NEW FILE welcome.kid ---




Welcome to TurboGears




      
  
      Your TurboGears application is now running.
      
  
  
  
      
    
        
      
      1. 
        
        Model
        
        
         Design models in the model.py.
        
          Edit dev.cfg to use a different backend, or start with a pre-configured SQLite database. 
        
          Use script tg-admin sql create to create the database tables.
        
      
        2. 
      
      2. 
        
        View
        
        
         Edit html-like templates in the /templates folder;
        
        Put all static contents in the /static folder. 
        
      
        3. 
      
      3. 
        
        Controller
        
        
         Edit  controllers.py and build your
          website structure with the simplicity of Python objects. 
        
          TurboGears will automatically reload itself when you modify your project. 
        
      
        4. 
    
      
    
       If you create something cool, please let people know, and consider contributing something back to the community.
      
  
      
  

      





From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:05 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:05 -0700
Subject: fedora-updates-system/updatessystem __init__.py, NONE,
	1.1 controllers.py, NONE, 1.1 json.py, NONE, 1.1 model.py,
	NONE, 1.1 new.py, NONE, 1.1 release.py, NONE, 1.1
Message-ID: <200611122008.kACK85ii018408@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem

Added Files:
	__init__.py controllers.py json.py model.py new.py release.py 
Log Message:
initial import


--- NEW FILE __init__.py ---


***** Error reading new file: [Errno 2] No such file or directory: 'controllers.py'

--- NEW FILE json.py ---
# This module provides helper functions for the JSON part of your
# view, if you are providing a JSON-based API for your app.

# Here's what most rules would look like:
# @jsonify.when("isinstance(obj, YourClass)")
# def jsonify_yourclass(obj):
#     return [obj.val1, obj.val2]
# The goal is to break your objects down into simple values:
# lists, dicts, numbers and strings

from turbojson.jsonify import jsonify

from turbojson.jsonify import jsonify_sqlobject
from updatessystem.model import User, Group, Permission

@jsonify.when('isinstance(obj, Group)')
def jsonify_group(obj):
    result = jsonify_sqlobject( obj )
    result["users"] = [u.user_name for u in obj.users]
    result["permissions"] = [p.permission_name for p in obj.permissions]
    return result

@jsonify.when('isinstance(obj, User)')
def jsonify_user(obj):
    result = jsonify_sqlobject( obj )
    del result['password']
    result["groups"] = [g.group_name for g in obj.groups]
    result["permissions"] = [p.permission_name for p in obj.permissions]
    return result

@jsonify.when('isinstance(obj, Permission)')
def jsonify_permission(obj):
    result = jsonify_sqlobject( obj )
    result["groups"] = [g.group_name for g in obj.groups]
    return result


***** Error reading new file: [Errno 2] No such file or directory: 'model.py'

***** Error reading new file: [Errno 2] No such file or directory: 'new.py'

***** Error reading new file: [Errno 2] No such file or directory: 'release.py'



From fedora-extras-commits at redhat.com  Sun Nov 12 20:08:07 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:08:07 -0700
Subject: fedora-updates-system/updatessystem/jobs __init__.py,NONE,1.1
Message-ID: <200611122008.kACK87eP018460@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/jobs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300/updatessystem/jobs

Added Files:
	__init__.py 
Log Message:
initial import


***** Error reading new file: [Errno 2] No such file or directory: '__init__.py'



From fedora-extras-commits at redhat.com  Sun Nov 12 20:07:57 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 12 Nov 2006 13:07:57 -0700
Subject: fedora-updates-system dev.cfg, NONE, 1.1 sample-prod.cfg, NONE,
	1.1 setup.py, NONE, 1.1 start-updatessystem.py, NONE,
	1.1 README, 1.1, 1.2
Message-ID: <200611122007.kACK7vFQ018345@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/fedora/fedora-updates-system
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18300

Modified Files:
	README 
Added Files:
	dev.cfg sample-prod.cfg setup.py start-updatessystem.py 
Log Message:
initial import


--- NEW FILE dev.cfg ---
[global]
# This is where all of your settings go for your development environment
# Settings that are the same for both development and production
# (such as template engine, encodings, etc.) all go in 
# updatessystem/config/app.cfg

# DATABASE

# pick the form for your database
# sqlobject.dburi="postgres://username at hostname/databasename"
# sqlobject.dburi="mysql://username:password at hostname:port/databasename"
# sqlobject.dburi="sqlite:///file_name_and_path"

# If you have sqlite, here's a simple default to get you started
# in development
sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite"


# if you are using a database or table type without transactions
# (MySQL default, for example), you should turn off transactions
# by prepending notrans_ on the uri
# sqlobject.dburi="notrans_mysql://username:password at hostname:port/databasename"

# for Windows users, sqlite URIs look like:
# sqlobject.dburi="sqlite:///drive_letter:/path/to/file"

# SERVER

# Some server parameters that you may want to tweak
# server.socket_port=6543

# Enable the debug output at the end on pages.
# log_debug_info_filter.on = False

server.environment="development"
autoreload.package="updatessystem"

# session_filter.on = True

# Set to True if you'd like to abort execution if a controller gets an
# unexpected parameter. False by default
tg.strict_parameters = True

# LOGGING
# Logging configuration generally follows the style of the standard
# Python logging module configuration. Note that when specifying
# log format messages, you need to use *() for formatting variables.
# Deployment independent log configuration is in updatessystem/config/log.cfg
[logging]

[[loggers]]
[[[updatessystem]]]
level='DEBUG'
qualname='updatessystem'
handlers=['debug_out']

[[[allinfo]]]
level='INFO'
handlers=['debug_out']

[[[access]]]
level='INFO'
qualname='turbogears.access'
handlers=['access_out']
propagate=0


--- NEW FILE sample-prod.cfg ---
[global]
# This is where all of your settings go for your production environment.
# You'll copy this file over to your production server and provide it
# as a command-line option to your start script.
# Settings that are the same for both development and production
# (such as template engine, encodings, etc.) all go in 
# updatessystem/config/app.cfg

# pick the form for your database
# sqlobject.dburi="postgres://username at hostname/databasename"
# sqlobject.dburi="mysql://username:password at hostname:port/databasename"
# sqlobject.dburi="sqlite:///file_name_and_path"

# If you have sqlite, here's a simple default to get you started
# in development
sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite"


# if you are using a database or table type without transactions
# (MySQL default, for example), you should turn off transactions
# by prepending notrans_ on the uri
# sqlobject.dburi="notrans_mysql://username:password at hostname:port/databasename"

# for Windows users, sqlite URIs look like:
# sqlobject.dburi="sqlite:///drive_letter:/path/to/file"


# SERVER

server.environment="production"

# Sets the number of threads the server uses
# server.thread_pool = 1

# if this is part of a larger site, you can set the path
# to the TurboGears instance here
# server.webpath=""

# session_filter.on = True

# Set to True if you'd like to abort execution if a controller gets an
# unexpected parameter. False by default
# tg.strict_parameters = False

# LOGGING
# Logging configuration generally follows the style of the standard
# Python logging module configuration. Note that when specifying
# log format messages, you need to use *() for formatting variables.
# Deployment independent log configuration is in updatessystem/config/log.cfg
[logging]

[[handlers]]

[[[access_out]]]
# set the filename as the first argument below
args="('server.log',)"
class='FileHandler'
level='INFO'
formatter='message_only'

[[loggers]]
[[[updatessystem]]]
level='ERROR'
qualname='updatessystem'
handlers=['error_out']

[[[access]]]
level='INFO'
qualname='turbogears.access'
handlers=['access_out']
propagate=0


--- NEW FILE setup.py ---
from setuptools import setup, find_packages
from turbogears.finddata import find_package_data

import os
execfile(os.path.join("updatessystem", "release.py"))

setup(
    name="Fedora-Updates-System",
    version=version,
    
    # uncomment the following lines if you fill them out in release.py
    #description=description,
    #author=author,
    #author_email=email,
    #url=url,
    #download_url=download_url,
    #license=license,
    
    install_requires = [
        "TurboGears >= 1.0b1",
    ],
    scripts = ["start-updatessystem.py"],
    zip_safe=False,
    packages=find_packages(),
    package_data = find_package_data(where='updatessystem',
                                     package='updatessystem'),
    keywords = [
        # Use keywords if you'll be adding your package to the
        # Python Cheeseshop
        
        # if this has widgets, uncomment the next line
        # 'turbogears.widgets',
        
        # if this has a tg-admin command, uncomment the next line
        # 'turbogears.command',
        
        # if this has identity providers, uncomment the next line
        # 'turbogears.identity.provider',
    
        # If this is a template plugin, uncomment the next line
        # 'python.templating.engines',
        
        # If this is a full application, uncomment the next line
        # 'turbogears.app',
    ],
    classifiers = [
        'Development Status :: 3 - Alpha',
        'Operating System :: OS Independent',
        'Programming Language :: Python',
        'Topic :: Software Development :: Libraries :: Python Modules',
        'Framework :: TurboGears',
        # if this is an application that you'll distribute through
        # the Cheeseshop, uncomment the next line
        # 'Framework :: TurboGears :: Applications',
        
        # if this is a package that includes widgets that you'll distribute
        # through the Cheeseshop, uncomment the next line
        # 'Framework :: TurboGears :: Widgets',
    ],
    test_suite = 'nose.collector',
    )
    


--- NEW FILE start-updatessystem.py ---
#!/usr/bin/python
import pkg_resources
pkg_resources.require("TurboGears")

import turbogears
import cherrypy
cherrypy.lowercase_api = True

from os.path import *
import sys

# first look on the command line for a desired config file,
# if it's not on the command line, then
# look for setup.py in this directory. If it's not there, this script is
# probably installed
if len(sys.argv) > 1:
    turbogears.update_config(configfile=sys.argv[1], 
        modulename="updatessystem.config")
elif exists(join(dirname(__file__), "setup.py")):
    turbogears.update_config(configfile="dev.cfg",
        modulename="updatessystem.config")
else:
    turbogears.update_config(configfile="prod.cfg",
        modulename="updatessystem.config")

from updatessystem.controllers import Root

turbogears.start_server(Root())


Index: README
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README	12 Nov 2006 17:25:20 -0000	1.1
+++ README	12 Nov 2006 20:07:50 -0000	1.2
@@ -0,0 +1,6 @@
+Fedora Updates System
+http://fedoraproject.org/wiki/Infrastructure/UpdatesSystem
+Luke Macken 
+
+NOTE: This project is still under heavy development and is not yet ready
+      for production.



From fedora-extras-commits at redhat.com  Sun Nov 12 20:17:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 12 Nov 2006 13:17:35 -0700
Subject: rpms/eiciel/devel .cvsignore, 1.2, 1.3 eiciel.spec, 1.2, 1.3 sources,
	1.2, 1.3 eiciel-desktop.patch, 1.1, NONE
Message-ID: <200611122017.kACKHZc0018623@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18603

Modified Files:
	.cvsignore eiciel.spec sources 
Removed Files:
	eiciel-desktop.patch 
Log Message:
update to 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 05:02:25 -0000	1.2
+++ .cvsignore	12 Nov 2006 20:17:05 -0000	1.3
@@ -1 +1,2 @@
 eiciel-0.9.2.tar.bz2
+eiciel-0.9.3.tar.bz2


Index: eiciel.spec
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/eiciel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eiciel.spec	12 Nov 2006 05:04:40 -0000	1.2
+++ eiciel.spec	12 Nov 2006 20:17:05 -0000	1.3
@@ -1,12 +1,11 @@
 Name:           eiciel
-Version:        0.9.2
-Release:        8%{?dist}
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Graphical access control list (ACL) editor
 Group:          Applications/System
 License:        GPL
 URL:            http://rofi.pinchito.com/eiciel
 Source0:        http://rofi.pinchito.com/eiciel/download/%{name}-%{version}.tar.bz2
-Patch0:         eiciel-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel gtkmm24-devel libacl-devel nautilus-devel
 BuildRequires:  desktop-file-utils
@@ -19,10 +18,9 @@
 
 %prep
 %setup -q
-%patch0
 
 # this really should not have been packaged with the source tarball
-rm doc/C/eiciel.xml
+rm doc/C/eiciel.xml src/eiciel.desktop
 
 %build
 %configure --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0
@@ -65,6 +63,11 @@
 
 
 %changelog
+* Sun Nov 12 2006 Chris Weyl  0.9.3-1
+- update to 0.9.3
+- nuke src/eiciel.desktop during prep, drop the patch and just let configure
+  do its thing
+
 * Sat Nov 11 2006 Chris Weyl  0.9.2-8
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2006 05:02:25 -0000	1.2
+++ sources	12 Nov 2006 20:17:05 -0000	1.3
@@ -1 +1 @@
-72576cce092ff36a4fef0311bdc0dede  eiciel-0.9.2.tar.bz2
+f948b8680c53237235cebc911bdac5cb  eiciel-0.9.3.tar.bz2


--- eiciel-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 20:28:43 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:28:43 -0700
Subject: rpms/blogtk/FC-3 blogtk.spec,1.3,1.4
Message-ID: <200611122028.kACKShH5018707@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18691

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-3/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:49 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:28:12 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:30:07 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:30:07 -0700
Subject: rpms/blogtk/FC-4 blogtk.spec,1.3,1.4
Message-ID: <200611122030.kACKU7WV018795@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18762

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-4/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:50 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:29:36 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:30:50 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:30:50 -0700
Subject: rpms/blogtk/FC-5 blogtk.spec,1.3,1.4
Message-ID: <200611122030.kACKUoNO018865@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18843

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-5/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:56 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:30:20 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:31:36 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:31:36 -0700
Subject: rpms/blogtk/FC-6 blogtk.spec,1.3,1.4
Message-ID: <200611122031.kACKVaUM018926@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18909

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/FC-6/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:56 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:31:05 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:32:19 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:32:19 -0700
Subject: rpms/blogtk/devel blogtk.spec,1.3,1.4
Message-ID: <200611122032.kACKWJAS018986@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/blogtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18969

Modified Files:
	blogtk.spec 
Log Message:
Fix Requires (#214894)


Index: blogtk.spec
===================================================================
RCS file: /cvs/extras/rpms/blogtk/devel/blogtk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blogtk.spec	2 Sep 2006 16:31:56 -0000	1.3
+++ blogtk.spec	12 Nov 2006 20:31:48 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           blogtk
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNOME application for editing/maintaining blogs
 
 Group:          Applications/Internet
@@ -21,6 +21,7 @@
 Requires:	gnome-python2 >= 2.00
 Requires:	pygtk2 >= 2.00
 Requires:	aspell
+Requires:	gnome-python2-gtkhtml2
 # To make sure this doesn't inflict pain on CapNames users
 Provides:	BloGTK = %{version}-%{release}
 
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Paul W. Frields  - 1.1-7
+- Add Requires: gnome-python2-gtkhtml2 (#214894)
+
 * Sat Sep  2 2006 Paul W. Frields  - 1.1-6
 - Bump release for FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Sun Nov 12 20:35:25 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 12 Nov 2006 13:35:25 -0700
Subject: rpms/gnome-sudoku/devel dead.package, NONE, 1.1 Makefile, 1.1,
	NONE gnome-sudoku-0.5.0-gtk-noload.patch, 1.1,
	NONE gnome-sudoku.spec, 1.12, NONE sources, 1.4, NONE
Message-ID: <200611122035.kACKZPhe019056@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19051

Added Files:
	dead.package 
Removed Files:
	Makefile gnome-sudoku-0.5.0-gtk-noload.patch gnome-sudoku.spec 
	sources 
Log Message:
Package moved to gnome-games, BZ #214626


--- NEW FILE dead.package ---
Package moved to gnome-games, BZ #214626


--- Makefile DELETED ---


--- gnome-sudoku-0.5.0-gtk-noload.patch DELETED ---


--- gnome-sudoku.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 12 20:41:21 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 13:41:21 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.8,1.9
Message-ID: <200611122041.kACKfLjm019098@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081

Modified Files:
	xmoto.spec 
Log Message:



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xmoto.spec	12 Nov 2006 19:59:48 -0000	1.8
+++ xmoto.spec	12 Nov 2006 20:40:51 -0000	1.9
@@ -49,6 +49,8 @@
         --add-category X-Fedora                                 \
         %{SOURCE1}
 
+# Locale files
+%find_lang %{name} %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,7 +69,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_bindir}/xmoto
@@ -75,6 +77,8 @@
 %{_datadir}/xmoto
 %{_datadir}/applications/fedora-xmoto.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xmoto.png
+%{_mandir}/mang/xmoto-edit.6.gz
+%{_mandir}/mang/xmoto.6.gz
 
 
 %changelog



From fedora-extras-commits at redhat.com  Sun Nov 12 22:46:24 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 15:46:24 -0700
Subject: rpms/xmoto/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmoto.spec,
	1.3, 1.4
Message-ID: <200611122246.kACMkO1D026225@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26205

Modified Files:
	.cvsignore sources xmoto.spec 
Log Message:
* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Sep 2006 20:41:23 -0000	1.3
+++ .cvsignore	12 Nov 2006 22:45:53 -0000	1.4
@@ -1 +1 @@
-xmoto-0.2.0-src.tar.gz
+xmoto-0.2.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Sep 2006 20:41:23 -0000	1.3
+++ sources	12 Nov 2006 22:45:53 -0000	1.4
@@ -1 +1 @@
-0404467792034dd221b92303f2750ac7  xmoto-0.2.0-src.tar.gz
+bbf2f0c02ba2ffe1f65e4ca78b0a0bd3  xmoto-0.2.2-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-5/xmoto.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmoto.spec	13 Sep 2006 21:13:11 -0000	1.3
+++ xmoto.spec	12 Nov 2006 22:45:53 -0000	1.4
@@ -1,5 +1,8 @@
+# No debuginfo package due to faulty find-debuginfo.sh
+%define debug_package %{nil}
+
 Name:           xmoto
-Version:        0.2.0
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
@@ -29,8 +32,8 @@
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --with-enable-zoom=1
+make
 
 
 %install
@@ -46,6 +49,8 @@
         --add-category X-Fedora                                 \
         %{SOURCE1}
 
+# Locale files
+%find_lang %{name} %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,7 +69,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_bindir}/xmoto
@@ -72,9 +77,17 @@
 %{_datadir}/xmoto
 %{_datadir}/applications/fedora-xmoto.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xmoto.png
+%{_mandir}/mang/xmoto-edit.6.gz
+%{_mandir}/mang/xmoto.6.gz
 
 
 %changelog
+* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
+- New upstream release
+
+* Mon Nov  6 2006 Jindrich Novy  0.2.0-2
+- Rebuild against the new curl
+
 * Wed Sep 13 2006 Hugo Cisneiros  0.2.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Nov 12 22:48:17 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Sun, 12 Nov 2006 15:48:17 -0700
Subject: rpms/xmoto/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xmoto.spec,
	1.4, 1.5
Message-ID: <200611122248.kACMmHI7026306@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26280

Modified Files:
	.cvsignore sources xmoto.spec 
Log Message:
* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Sep 2006 20:40:25 -0000	1.3
+++ .cvsignore	12 Nov 2006 22:47:47 -0000	1.4
@@ -1 +1 @@
-xmoto-0.2.0-src.tar.gz
+xmoto-0.2.2-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Sep 2006 20:40:25 -0000	1.3
+++ sources	12 Nov 2006 22:47:47 -0000	1.4
@@ -1 +1 @@
-0404467792034dd221b92303f2750ac7  xmoto-0.2.0-src.tar.gz
+bbf2f0c02ba2ffe1f65e4ca78b0a0bd3  xmoto-0.2.2-src.tar.gz


Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-6/xmoto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmoto.spec	13 Sep 2006 20:57:31 -0000	1.4
+++ xmoto.spec	12 Nov 2006 22:47:47 -0000	1.5
@@ -1,5 +1,8 @@
+# No debuginfo package due to faulty find-debuginfo.sh
+%define debug_package %{nil}
+
 Name:           xmoto
-Version:        0.2.0
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
@@ -29,8 +32,8 @@
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --with-enable-zoom=1
+make
 
 
 %install
@@ -46,6 +49,8 @@
         --add-category X-Fedora                                 \
         %{SOURCE1}
 
+# Locale files
+%find_lang %{name} %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,7 +69,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_bindir}/xmoto
@@ -72,9 +77,17 @@
 %{_datadir}/xmoto
 %{_datadir}/applications/fedora-xmoto.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xmoto.png
+%{_mandir}/mang/xmoto-edit.6.gz
+%{_mandir}/mang/xmoto.6.gz
 
 
 %changelog
+* Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
+- New upstream release
+
+* Mon Nov  6 2006 Jindrich Novy  0.2.0-2
+- Rebuild against the new curl
+
 * Wed Sep 13 2006 Hugo Cisneiros  0.2.0-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Sun Nov 12 23:08:33 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Sun, 12 Nov 2006 16:08:33 -0700
Subject: rpms/sysprof-kmod/FC-6 sysprof-kmod.spec,1.10,1.11
Message-ID: <200611122308.kACN8XSt029397@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-serv29367

Modified Files:
	sysprof-kmod.spec 
Log Message:
Rebuild for new kernel



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sysprof-kmod.spec	2 Nov 2006 10:08:14 -0000	1.10
+++ sysprof-kmod.spec	12 Nov 2006 23:07:52 -0000	1.11
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2849.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"
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gianluca Sforna 
+- rebuild for kernel 2.6.18-1.2849
+
 * Thu Nov  2 2006 Gianluca Sforna  1.0.5-1
 - version update
 - drop upstreamed patch



From fedora-extras-commits at redhat.com  Sun Nov 12 23:09:38 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:09:38 -0700
Subject: rpms/ssmtp - New directory
Message-ID: <200611122309.kACN9c1W029523@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29519/ssmtp

Log Message:
Directory /cvs/extras/rpms/ssmtp added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 23:09:44 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:09:44 -0700
Subject: rpms/ssmtp/devel - New directory
Message-ID: <200611122309.kACN9iJt029537@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29519/ssmtp/devel

Log Message:
Directory /cvs/extras/rpms/ssmtp/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 23:10:20 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:10:20 -0700
Subject: rpms/ssmtp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611122310.kACNAKhJ029572@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29566

Added Files:
	Makefile import.log 
Log Message:
Setup of module ssmtp


--- NEW FILE Makefile ---
# Top level Makefile for module ssmtp
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 Nov 12 23:10:26 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:10:26 -0700
Subject: rpms/ssmtp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611122310.kACNAQDf029591@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29566/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ssmtp


--- 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 Nov 12 23:12:20 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:12:20 -0700
Subject: rpms/ssmtp import.log,1.1,1.2
Message-ID: <200611122312.kACNCKZa029680@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29642

Modified Files:
	import.log 
Log Message:
auto-import ssmtp-2.61-8 on branch devel from ssmtp-2.61-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 23:10:20 -0000	1.1
+++ import.log	12 Nov 2006 23:11:50 -0000	1.2
@@ -0,0 +1 @@
+ssmtp-2_61-8:HEAD:ssmtp-2.61-8.src.rpm:1163373195



From fedora-extras-commits at redhat.com  Sun Nov 12 23:12:21 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:12:21 -0700
Subject: rpms/ssmtp/devel ssmtp-2.50.3-maxsysuid.patch, NONE,
	1.1 ssmtp-2.61.6.patch, NONE, 1.1 ssmtp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611122312.kACNCLxI029684@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29642/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ssmtp-2.50.3-maxsysuid.patch ssmtp-2.61.6.patch ssmtp.spec 
Log Message:
auto-import ssmtp-2.61-8 on branch devel from ssmtp-2.61-8.src.rpm

ssmtp-2.50.3-maxsysuid.patch:

--- NEW FILE ssmtp-2.50.3-maxsysuid.patch ---
--- ssmtp-2.48/ssmtp.horig	Sun Feb 10 22:32:34 2002
+++ ssmtp-2.48/ssmtp.h	Mon Feb 25 13:39:44 2002
@@ -14,7 +14,7 @@
 #define MAXWAIT (10 * 60)	/* Maximum wait between commands, in seconds */
 #define MEDWAIT (5 * 60)
 
-#define MAXSYSUID 999		/* Highest UID which is a system account */
+#define MAXSYSUID 499		/* Highest UID which is a system account */
 
 #ifndef _POSIX_ARG_MAX
 #define MAXARGS 4096
--- ssmtp-2.48/ssmtp.conf.orig	Tue May  8 14:22:08 2001
+++ ssmtp-2.48/ssmtp.conf	Mon Feb 25 13:42:41 2002
@@ -2,7 +2,7 @@
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #

-# The person who gets all mail for userids < 1000
+# The person who gets all mail for userids < 500
 # Make this empty to disable rewriting.
 root=postmaster

ssmtp-2.61.6.patch:

--- NEW FILE ssmtp-2.61.6.patch ---
--- ssmtp-2.61.orig/configure
+++ ssmtp-2.61/configure
@@ -743,7 +743,7 @@
   CFLAGS="$ac_save_CFLAGS"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g -O2 -Wall"
   else
     CFLAGS="-g"
   fi
--- ssmtp-2.61.orig/ssmtp.conf
+++ ssmtp-2.61/ssmtp.conf
@@ -36,3 +36,8 @@
 
 # Use this RSA certificate.
 #TLSCert=/etc/ssl/certs/ssmtp.pem
+
+# Get enhanced (*really* enhanced) debugging information in the logs
+# If you want to have debugging of the config file parsing, move this option
+# to the top of the config file and uncomment
+#Debug=YES
--- ssmtp-2.61.orig/ssmtp.8
+++ ssmtp-2.61/ssmtp.8
@@ -1,4 +1,4 @@
-.TH SSMTP 8 "Last change: 5 February 2000"
+.TH SSMTP 8 "Last change: 4 February 2005"
 .SH NAME
 ssmtp, sendmail \- send a message using smtp
 .SH SYNOPSIS
@@ -103,7 +103,7 @@
 
 .TP
 \fB\-C\fP\fIfile\fP 
-(ignored) Use alternate configuration file.
+Use alternate configuration file.
 
 .TP
 \fB\-d\fP\fIX\fP
@@ -273,7 +273,7 @@
  /etc/ssmtp/revaliases - reverse aliases file
 
 .SH SEE ALSO
-RFC821, RFC822.
+RFC821, RFC822, ssmtp.conf(5).
 
 .SH AUTHORS
 Matt Ryan (mryan at debian.org)
--- ssmtp-2.61.orig/ssmtp.c
+++ ssmtp-2.61/ssmtp.c
@@ -12,7 +12,8 @@
  See COPYRIGHT for the license
 
 */
-#define VERSION "2.60.4"
+#define VERSION "2.61"
+#define _GNU_SOURCE
 
 #include 
 #include 
@@ -37,7 +38,8 @@
 #include "md5auth/hmac_md5.h"
 #endif
 #include "ssmtp.h"
-
+#include 
+#include "xgethostname.h"
 
 bool_t have_date = False;
 bool_t have_from = False;
@@ -51,6 +53,7 @@
 bool_t use_tls = False;			/* Use SSL to transfer mail to HUB */
 bool_t use_starttls = False;		/* SSL only after STARTTLS (RFC2487) */
 bool_t use_cert = False;		/* Use a certificate to transfer SSL mail */
+bool_t use_oldauth = False;		/* use old AUTH LOGIN username style */
 
 #define ARPADATE_LENGTH 32		/* Current date in RFC format */
 char arpadate[ARPADATE_LENGTH];
@@ -59,7 +62,7 @@
 char *auth_method = (char)NULL;		/* Mechanism for SMTP authentication */
 char *mail_domain = (char)NULL;
 char *from = (char)NULL;		/* Use this as the From: address */
-char hostname[MAXHOSTNAMELEN] = "localhost";
+char *hostname;
 char *mailhost = "mailhub";
 char *minus_f = (char)NULL;
 char *minus_F = (char)NULL;
@@ -68,6 +71,7 @@
 char *root = NULL;
 char *tls_cert = "/etc/ssl/certs/ssmtp.pem";	/* Default Certificate */
 char *uad = (char)NULL;
+char *config_file = (char)NULL;		/* alternate configuration file */
 
 headers_t headers, *ht;
 
@@ -93,6 +97,7 @@
 static char hextab[]="0123456789abcdef";
 #endif
 
+ssize_t outbytes;
 
 /*
 log_event() -- Write event to syslog (or log file if defined)
@@ -129,7 +134,7 @@
 #endif
 }
 
-void smtp_write(int fd, char *format, ...);
+ssize_t smtp_write(int fd, char *format, ...);
 int smtp_read(int fd, char *response);
 int smtp_read_all(int fd, char *response);
 int smtp_okay(int fd, char *response);
@@ -139,7 +144,8 @@
 */
 void dead_letter(void)
 {
-	char path[(MAXPATHLEN + 1)], buf[(BUF_SZ + 1)];
+	char *path;
+	char buf[(BUF_SZ + 1)];
 	struct passwd *pw;
 	uid_t uid;
 	FILE *fp;
@@ -150,7 +156,7 @@
 	if(isatty(fileno(stdin))) {
 		if(log_level > 0) {
 			log_event(LOG_ERR,
-				"stdin is a TTY - not saving to %s/dead.letter, pw->pw_dir");
+				"stdin is a TTY - not saving to %s/dead.letter", pw->pw_dir);
 		}
 		return;
 	}
@@ -163,16 +169,21 @@
 		return;
 	}
 
-	if(snprintf(path, BUF_SZ, "%s/dead.letter", pw->pw_dir) == -1) {
+#define DEAD_LETTER "/dead.letter"
+	path = malloc (strlen (pw->pw_dir) + sizeof (DEAD_LETTER));
+	if (!path) {
 		/* Can't use die() here since dead_letter() is called from die() */
 		exit(1);
 	}
-
+	memcpy (path, pw->pw_dir, strlen (pw->pw_dir));
+	memcpy (path + strlen (pw->pw_dir), DEAD_LETTER, sizeof (DEAD_LETTER));
+	
 	if((fp = fopen(path, "a")) == (FILE *)NULL) {
 		/* Perhaps the person doesn't have a homedir... */
 		if(log_level > 0) {
 			log_event(LOG_ERR, "Can't open %s failing horribly!", path);
 		}
+		free(path);
 		return;
 	}
 
@@ -189,6 +200,7 @@
 				"Can't close %s/dead.letter, possibly truncated", pw->pw_dir);
 		}
 	}
+	free(path);
 }
 
 /*
@@ -212,27 +224,22 @@
 	exit(1);
 }
 
+#ifndef _GNU_SOURCE
 /*
 basename() -- Return last element of path
 */
 char *basename(char *str)
 {
-	char buf[MAXPATHLEN +1], *p;
+	char *p;
 
-	if((p = strrchr(str, '/'))) {
-		if(strncpy(buf, ++p, MAXPATHLEN) == (char *)NULL) {
-			die("basename() -- strncpy() failed");
-		}
+	p = strrchr(str, '/');
+	if (!p) {
+		p = str;
 	}
-	else {
-		if(strncpy(buf, str, MAXPATHLEN) == (char *)NULL) {
-			die("basename() -- strncpy() failed");
-		}
-	}
-	buf[MAXPATHLEN] = (char)NULL;
 
-	return(strdup(buf));
+	return(strdup(p));
 }
+#endif /* _GNU_SOURCE */
 
 /*
 strip_pre_ws() -- Return pointer to first non-whitespace character
@@ -778,10 +785,69 @@
[...2899 lines suppressed...]
+
+# Program End
+exit 0
--- ssmtp-2.61.orig/debian/copyright
+++ ssmtp-2.61/debian/copyright
@@ -0,0 +1,17 @@
+This package is now maintained by Anibal Monsalve Salazar 
+and co-maintained by Santiago Ruano Rincon .
+
+This package was maintained by Matt Ryan.
+
+This package was maintained by Hugo Haas.
+and was put under the GPL in version 2.1.
+Version 2.1 was maintained by Christophe Lameter.
+
+Versions up to version 2.0 were maintained by  David Collier-Brown
+and available as "Public Domain" (whatever that means).
+
+You should have received a copy of the GNU General Public License with
+your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with
+the ssmtp source package as the file COPYING.  If not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
--- ssmtp-2.61.orig/debian/preinst
+++ ssmtp-2.61/debian/preinst
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+#
+# $Id: preinst,v 1.4 2001/03/21 20:29:27 matt Exp $
+#
+
+if test -s /etc/ssmtp.conf
+then
+	echo "Configuration files found in /etc, moving them to /etc/ssmtp"
+
+	mkdir /etc/ssmtp 2>/dev/null || true
+	mv -f /etc/ssmtp.conf /etc/ssmtp 2>/dev/null || true
+
+fi
+
+if test -s /etc/revaliases
+then
+	mkdir /etc/ssmtp 2>/dev/null || true
+	mv -f /etc/revaliases /etc/ssmtp 2>/dev/null || true
+fi
+
+# Program End
+exit 0
--- ssmtp-2.61.orig/debian/logcheck.server
+++ ssmtp-2.61/debian/logcheck.server
@@ -0,0 +1 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ sSMTP\[[0-9]+\]: Sent mail for .* \([0-9]+ Bye\) uid=[0-9]+ username=[\._[:alnum:]-]+ outbytes=[0-9]+$
--- ssmtp-2.61.orig/debian/templates
+++ ssmtp-2.61/debian/templates
@@ -0,0 +1,61 @@
+Template: ssmtp/overwriteconfig
+Type: boolean
+Default: true
+_Description: Automatically overwrite config files?
+ The mail configuration file /etc/ssmtp/ssmtp.conf can be automatically
+ updated on each upgrade with the information supplied to the debconf
+ database. If you do not want this to happen (ie/ you want to maintain
+ control of this file yourself) then set this option to have the program
+ never touch this file.
+
+Template: ssmtp/root
+Type: string
+Default: postmaster
+_Description: Who gets mail for userids < 1000?
+ Mail sent to a local user whose UID is less than 1000 will instead be
+ sent here. This is useful for daemons which mail reports to root and
+ other system UIDs.
+ Make this empty to disable rewriting.
+
+Template: ssmtp/mailhub
+Type: string
+Default: mail
+_Description: Name of your mailhub?
+ This sets the host to which mail is delivered. The actual machine
+ name is required; no MX records are consulted. Commonly, mailhosts
+ are named "mail.domain.com".
+
+Template: ssmtp/port
+Type: string
+Default: 25
+_Description: Remote SMTP port number
+ If your remote SMTP server listens on a port other than 25 (Standard/RFC)
+ then set it here.
+
+Template: ssmtp/rewritedomain
+Type: string
+_Description: What domain to masquerade as?
+ ssmtp will use "username at REWRITEDOMAIN" as the default From: address
+ for outgoing mail which contains only a local username.
+
+Template: ssmtp/mailname
+Type: string
+_Description: What name to store in /etc/mailname
+ This is the portion of the address after the '@' sign to be shown on
+ outgoing news and mail messages.
+
+Template: ssmtp/hostname
+Type: string
+_Description: Fully qualified hostname?
+ This should specify the real hostname of this machine, and will be
+ sent to the mailhub when delivering mail.
+
+Template: ssmtp/fromoverride
+Type: boolean
+Default: false
+_Description: Allow override of From: line in email header?
+ A "positive" response will permit local users to enter any From: line
+ in their messages without it being mangled, and cause ssmtp to rewrite
+ the envelope header with that address. A "negative" response will
+ disallow this, and use only the default address or addresses set in
+ /etc/ssmtp/revaliases.
--- ssmtp-2.61.orig/ssmtp.conf.5
+++ ssmtp-2.61/ssmtp.conf.5
@@ -0,0 +1,81 @@
+.\"/* Copyright 2004 Reuben Thomas
+.\" * All rights reserved
+.\" *
+.\" This man page is distributed under the GNU General Public License
+.\" version 2, or at your option, any later version. There is no warranty.
+.\"
+.Dd October 7, 2004
+.Dt SSMTP.CONF 5
+.Os
+.Sh NAME
+.Nm ssmtp.conf
+.Nd ssmtp configuration file
+.Sh DESCRIPTION
+.Nm ssmtp
+reads configuration data from
+.Pa /etc/ssmtp/ssmtp.conf
+The file contains keyword-argument pairs, one per line.
+Lines starting with
+.Ql #
+and empty lines are interpreted as comments.
+.Pp
+The possible keywords and their meanings are as follows (both are case-insensitive):
+.Bl -tag -width Ds
+.It Cm Root
+The user that gets all mail for userids less than 1000. If blank, address rewriting is disabled.
+.Pp
+.It Cm Mailhub
+The host to send mail to, in the form
+.Ar host No | Ar IP_addr No Oo : Ar port Oc .
+The default port is 25.
+.Pp
+.It Cm RewriteDomain
+The domain from which mail seems to come.
+for user authentication.
+.Pp
+.It Cm Hostname
+The full qualified name of the host.
+If not specified, the host is queried for its hostname.
+.Pp
+.It Cm FromLineOverride
+Specifies whether the From header of an email, if any, may override the default domain.
+The default is
+.Dq no .
+.Pp
+.It Cm UseTLS
+Specifies whether ssmtp uses TLS to talk to the SMTP server.
+The default is
+.Dq no .
+.Pp
+.It Cm UseSTARTTLS
+Specifies whether ssmtp does a EHLO/STARTTLS before starting SSL negotiation.
+See RFC 2487.
+.Pp
+.It Cm TLSCert
+The file name of an RSA certificate to use for TLS, if required.
+.Pp
+.It Cm AuthUser
+The user name to use for SMTP AUTH.
+The default is blank, in which case SMTP AUTH is not used.
+sent without
+.Pp
+.It Cm AuthPass
+The password to use for SMTP AUTH.
+.Pp
+.It Cm AuthMethod
+The authorization method to use.
+If unset, plain text is used.
+May also be set to
+.Dq cram-md5 .
+.Sh FILES
+.Bl -tag -width Ds
+.It Pa /etc/ssmtp/ssmtp.conf
+Contains configuration data for
+.Nm ssmtp .
+.El
+.Sh SEE ALSO
+.Xr ssmtp 8
+.Sh AUTHORS
+Matt Ryan (mryan at debian.org), Hugo Haas (hugo at debian.org), Christoph Lameter (clameter at debian.org)
+and Dave Collier-Brown (davecb at hobbes.ss.org).
+Reuben Thomas (rrt at sc3d.org) wrote the man page.


--- NEW FILE ssmtp.spec ---
Name:		ssmtp
Version:	2.61
Release:	8%{?dist}
Summary:	Extremely simple MTA to get mail off the system to a Mailhub
Group:		Applications/Internet
License:	GPL
URL:		http://packages.debian.org/stable/mail/ssmtp.html
Source0:	ftp://ftp.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.orig.tar.gz
#Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
Patch0:		%{name}-%{version}.6.patch
Patch1:		%{name}-2.50.3-maxsysuid.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
Requires(post):	%{_sbindir}/alternatives
Requires(preun):	%{_sbindir}/alternatives
BuildRequires:	openssl-devel


%description
A secure, effective and simple way of getting mail off a system to your mail
hub. It contains no suid-binaries or other dangerous things - no mail spool
to poke around in, and no daemons running in the background. Mail is simply
forwarded to the configured mailhost. Extremely easy configuration.

WARNING: the above is all it does; it does not receive mail, expand aliases
or manage a queue. That belongs on a mail hub with a system administrator.


%prep
%setup -q
%patch -p1
%patch1 -p1


%build
#on RHEL3 krb5 is somewhere else
#test -e /usr/include/krb5.h || CPPFLAGS="-I/usr/kerberos/include"
#CPPFLAGS=$(pkg-config --cflags-only-I openssl)
%if "0%{?dist}" == "0el3" 
	%define cppflags -I/usr/kerberos/include
%endif
%configure --enable-ssl --enable-md5auth --enable-inet6
%if "0%{?dist}" == "0el3" 
	make %{?_smp_mflags} CPPFLAGS=%{cppflags}
%else
	make %{?_smp_mflags}
%endif
%install 
rm -rf %{buildroot}
install -p -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name}
#install -p -D -m 755 generate_config_alt %{buildroot}%{_bindir}/generate_config_alt
mkdir %{buildroot}%{_bindir}/
install -p -D -m 644 revaliases %{buildroot}%{_sysconfdir}/ssmtp/revaliases
install -p -m 644 ssmtp.conf %{buildroot}%{_sysconfdir}/ssmtp/ssmtp.conf
install -p -D -m 644 ssmtp.8 %{buildroot}%{_mandir}/man8/ssmtp.8
install -p -D -m 644 debian/mailq.8 %{buildroot}%{_mandir}/man1/mailq.ssmtp.1
install -p -m 644 debian/newaliases.8 %{buildroot}%{_mandir}/man1/newaliases.ssmtp.1
install -p -D -m 644 ssmtp.conf.5 %{buildroot}%{_mandir}/man5/ssmtp.conf.5
ln -s %{_sbindir}/%{name} %{buildroot}%{_sbindir}/sendmail.ssmtp
ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/newaliases.ssmtp
ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/mailq.ssmtp


%clean
rm -rf %{buildroot}

%post
%{_sbindir}/alternatives  --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.ssmtp 30 \
	--slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.ssmtp \
	--slave %{_bindir}/newaliases mta-newaliases %{_bindir}/newaliases.ssmtp \
	--slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/mailq.ssmtp.1.gz \
	--slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.ssmtp.1.gz \
	--slave %{_mandir}/man8/sendmail.8.gz mta-sendmailman %{_mandir}/man8/ssmtp.8.gz 


%preun
#only remove in case of erase (but not at upgrade)
if [ $1 -eq 0 ] ; then
	%{_sbindir}/alternatives --remove mta %{_sbindir}/sendmail.ssmtp
fi
exit 0

#%postun
#if [ $1 -eq 0 ] ; then
#	/usr/sbin/alternatives --auto mta
#fi
#exit 0

%files
%defattr(-,root,root,-)
%doc COPYING INSTALL README TLS CHANGELOG_OLD debian/changelog
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_mandir}/man1/*
%{_sbindir}/%{name}
#%{_bindir}/generate_config_alt
%{_sbindir}/sendmail.ssmtp
%{_bindir}/newaliases.ssmtp
%{_bindir}/mailq.ssmtp
%dir %{_sysconfdir}/ssmtp/
%config(noreplace) %{_sysconfdir}/ssmtp/revaliases
%config(noreplace) %{_sysconfdir}/ssmtp/ssmtp.conf


%changelog
* Mon Oct 10 2006 lonely wolf  2.61-8
- enabled IPv6 (just added this option to %%configure, the capability was already there)
- removed yet another man page from %%Provides
- cosmetic fixes - consistent use of macros
- added a missing Require
- I have also included a [commented] URL to the current patch (v9) provided by Debian. Because starting with version 8 the patch modifies the SSL libraries used. I will include this modification once I can perform more tests. 

* Mon Oct 10 2006 lonely wolf  2.61-7
- removed man pages and stubs from %%Provides

* Fri Sep 22 2006 lonely wolf  2.61-6
- cosmetic fixes

* Tue Apr 11 2006 lonely wolf  2.61-5
- cleaner hack for RHEL 3
- added back Provides: smtpdaemon
- correct typo in Provides
 
* Tue Apr 11 2006 lonely wolf  2.61-4
- hack for RHEL 3 which has krb5.h in a different place
 
* Mon Apr 10 2006 lonely wolf  2.61-3
- removed Requires: openssl
- removed Provides: smtpdaemon
- cleaning of %%files
- correct typos in version numbers in changelog
- disabled "alternatives --auto mta" in postrun macro, pending more tests

* Sat Apr 8 2006 lonely wolf  2.61-2
- fix spec file: consistent use of buildroot macro, no double "ssmtp" in files' name, switch back the name of the main patch to the one used by Debian
- removed the generate_config_alt script; it is ugly, buggy and completely replaces the default provided configuration file, including the comments (which are useful)
- add openssl to requires and openssl-devel to buildrequires
- fix pre/post install scriptlets (upgrade would have removed the files from the alternatives system)
- remove two unneeded files from the alternatives call; man sendmail will default to the page provided by ssmtp

* Thu Apr 6 2006 lonely wolf  2.61-1
- Initial rpm version, based on Debian sources & patch
- Includes patch from Mandrake to lower the default system UIDs from 1000 to 500
- Includes generate_config_alt, a small script to generate a customized ssmtp.conf (thus overriding the default one); beware that this script will completely replace the default ssmtp.conf.
- Customized to play nice in the alternatives environment


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 23:10:26 -0000	1.1
+++ .cvsignore	12 Nov 2006 23:11:51 -0000	1.2
@@ -0,0 +1 @@
+ssmtp_2.61.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 23:10:26 -0000	1.1
+++ sources	12 Nov 2006 23:11:51 -0000	1.2
@@ -0,0 +1 @@
+957e6fff08625fe34f4fc33d0925bbc9  ssmtp_2.61.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 12 23:23:24 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Sun, 12 Nov 2006 16:23:24 -0700
Subject: owners owners.list,1.1935,1.1936
Message-ID: <200611122323.kACNNOdp029829@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29801/owners

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1935
retrieving revision 1.1936
diff -u -r1.1935 -r1.1936
--- owners.list	12 Nov 2006 19:13:13 -0000	1.1935
+++ owners.list	12 Nov 2006 23:22:54 -0000	1.1936
@@ -2154,6 +2154,7 @@
 Fedora Extras|srecord|Manipulate EPROM load files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|ss5|A socks firewall|matteo.ricchetti at libero.it|extras-qa at fedoraproject.org|matteo.ricchetti at libero.it
 Fedora Extras|sshfp|Generate SSHFP DNS records from knownhosts files or ssh-keyscan|paul at xelerance.com|extras-qa at fedoraproject.org|
+Fedora Extras|ssmtp|Extremely simple MTA to get mail off the system to a Mailhub|wolfy at nobugconsulting.ro|extras-qa at fedoraproject.org|
 Fedora Extras|ssss|Shamir's secret sharing scheme|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|steghide|A steganography program|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 12 23:43:21 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:43:21 -0700
Subject: rpms/Pound - New directory
Message-ID: <200611122343.kACNhLJb030067@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30063/Pound

Log Message:
Directory /cvs/extras/rpms/Pound added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 23:43:27 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:43:27 -0700
Subject: rpms/Pound/devel - New directory
Message-ID: <200611122343.kACNhRmW030081@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30063/Pound/devel

Log Message:
Directory /cvs/extras/rpms/Pound/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 12 23:43:46 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:43:46 -0700
Subject: rpms/Pound Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611122343.kACNhkV9030112@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30106

Added Files:
	Makefile import.log 
Log Message:
Setup of module Pound


--- NEW FILE Makefile ---
# Top level Makefile for module Pound
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 Nov 12 23:43:52 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:43:52 -0700
Subject: rpms/Pound/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611122343.kACNhqmf030130@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30106/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Pound


--- 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 Nov 12 23:45:06 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:45:06 -0700
Subject: rpms/Pound import.log,1.1,1.2
Message-ID: <200611122345.kACNj6P6030216@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30180

Modified Files:
	import.log 
Log Message:
auto-import Pound-2.1.6-2 on branch devel from Pound-2.1.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Pound/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Nov 2006 23:43:46 -0000	1.1
+++ import.log	12 Nov 2006 23:44:35 -0000	1.2
@@ -0,0 +1 @@
+Pound-2_1_6-2:HEAD:Pound-2.1.6-2.src.rpm:1163375067



From fedora-extras-commits at redhat.com  Sun Nov 12 23:45:06 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:45:06 -0700
Subject: rpms/Pound/devel Pound.spec, NONE, 1.1 pound.cfg, NONE,
	1.1 pound.init, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611122345.kACNj6rF030220@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30180/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Pound.spec pound.cfg pound.init 
Log Message:
auto-import Pound-2.1.6-2 on branch devel from Pound-2.1.6-2.src.rpm


--- NEW FILE Pound.spec ---
%define pound_user	pound
%define pound_group	%{pound_user}
%define pound_home	%{_localstatedir}/lib/pound

Name:		Pound          
Version:	2.1.6       
Release:	2%{?dist}
Summary:	Reverse proxy and load balancer        

Group:		System Environment/Daemons
License:	GPL        
URL:		http://apsis.ch/pound
           
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	openssl-devel, pcre-devel

Requires(pre):    %{_sbindir}/useradd
Requires(post):   /sbin/chkconfig
Requires(preun):  /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service

Source0:	http://apsis.ch/pound/%{name}-%{version}.tgz       
Source1:	pound.init
Source2:	pound.cfg

%description
The Pound program is a reverse proxy, load balancer and
HTTPS front-end for Web server(s). Pound was developed
to enable distributing the load among several Web-servers
and to allow for a convenient SSL wrapper for those Web
servers that do not offer it natively. Pound is distributed
under the GPL - no warranty, it's free to use, copy and
give away

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%{__install} -d %{buildroot}%{pound_home}
%{__install} -p -D -m 0755 -s pound %{buildroot}%{_sbindir}/pound
%{__install} -p -D -m 0755 -s poundctl %{buildroot}%{_sbindir}/poundctl
%{__install} -p -D -m 0644 pound.8 %{buildroot}%{_mandir}/man8/pound.8
%{__install} -p -D -m 0644 poundctl.8 %{buildroot}%{_mandir}/man8/poundctl.8
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/pound
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pound.cfg 

mkdir -p %{buildroot}%{_sysconfdir}/pki/tls/certs
touch %{buildroot}%{_sysconfdir}/pki/tls/certs/pound.pem

%clean
rm -rf %{buildroot}

%pre
%{_sbindir}/useradd -c "Pound user" -s /bin/false -r -d %{pound_home} \
    %{pound_user} 2>/dev/null || :

%post
/sbin/chkconfig --add pound

# generate dummy certificate
exec > /dev/null 2> /dev/null
if [ ! -f %{_sysconfdir}/pki/tls/certs/pound.pem ] ; then
pushd %{_sysconfdir}/pki/tls/certs
umask 077
cat << EOF | make pound.pem
--
SomeState
SomeCity
Pound Example Certificate
SomeOrganizationalUnit
localhost.localdomain
root at localhost.localdomain
EOF
chown root:pound pound.pem
chmod 640 pound.pem
popd
fi
exit 0

%preun
if [ $1 = 0 ]; then
	/sbin/service pound stop >/dev/null 2>&1
	/sbin/chkconfig --del pound
fi

%postun
if [ $1 -ge 1 ] ; then
        /sbin/service pound condrestart > /dev/null 2>&1 || :
fi

%files
%defattr(-,root,root,-)
%doc CHANGELOG FAQ GPL.html README
%{_mandir}/man8/pound.8*
%{_mandir}/man8/poundctl.8*
%{_sbindir}/pound
%{_sbindir}/poundctl
%{_initrddir}/pound
%config(noreplace) %{_sysconfdir}/pound.cfg
%ghost %config(noreplace) %{_sysconfdir}/pki/tls/certs/pound.pem
%attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}

%changelog
* Wed Nov 08 2006  2.1.6-2
- Changed hardcoded paths into rpmmacros
* Mon Nov 06 2006  2.1.6-1
- Synced with upstream version
- Changed Summary
- Added an init script
- Added pound.cfg with an example configuration
- Added pound user and group
- A self-signed ssl certificate is created in %%post

* Fri Nov 03 2006  2.1.5-1
- initial version



--- NEW FILE pound.cfg ---
#
# Default pound.cfg
#
# Pound listens on port 80 for HTTP and port 443 for HTTPS
# and distributes requests to 2 backends running on localhost.
# see pound(8) for configuration directives.
# You can enable/disable backends with poundctl(8).
#

User "pound"
Group "pound"
Control "/var/lib/pound/pound.cfg"

ListenHTTP
    Address 0.0.0.0
    Port 80
End

ListenHTTPS
    Address 0.0.0.0
    Port    443
    Cert    "/etc/pki/tls/certs/pound.pem"
End

Service
    BackEnd
        Address 127.0.0.1
        Port    8000
    End
    
    BackEnd
        Address 127.0.0.1
        Port    8001
    End
End


--- NEW FILE pound.init ---
#!/bin/bash
#
# pound         This shell script starts the Pound load-balancer
#
# Author:       Ruben Kerkhof 
#
# chkconfig: - 85 15
#
# description:  Pound is a reverse proxy and load-balancer
# processname:  pound
# config: /etc/pound.cfg
# pidfile: /var/run/pound.pid
#

# source function library
. /etc/rc.d/init.d/functions

RETVAL=0

start() {
	echo -n $"Starting Pound: "
	daemon pound
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/pound
}

stop() {
	echo -n $"Stopping Pound: "
	killproc pound
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pound
}

restart() {
	stop
	start
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|force-reload|reload)
	restart
	;;
  condrestart)
	[ -f /var/lock/subsys/pound ] && restart
	;;
  status)
	status pound
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Pound/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Nov 2006 23:43:52 -0000	1.1
+++ .cvsignore	12 Nov 2006 23:44:36 -0000	1.2
@@ -0,0 +1 @@
+Pound-2.1.6.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Pound/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Nov 2006 23:43:52 -0000	1.1
+++ sources	12 Nov 2006 23:44:36 -0000	1.2
@@ -0,0 +1 @@
+d9cec1718f733e7d79a2e352b10c06d5  Pound-2.1.6.tgz



From fedora-extras-commits at redhat.com  Sun Nov 12 23:53:04 2006
From: fedora-extras-commits at redhat.com (Ruben Kerkhof (ruben))
Date: Sun, 12 Nov 2006 16:53:04 -0700
Subject: owners owners.list,1.1936,1.1937
Message-ID: <200611122353.kACNr4GO030339@cvs-int.fedora.redhat.com>

Author: ruben

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30270/owners

Modified Files:
	owners.list 
Log Message:
Added Pound



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1936
retrieving revision 1.1937
diff -u -r1.1936 -r1.1937
--- owners.list	12 Nov 2006 23:22:54 -0000	1.1936
+++ owners.list	12 Nov 2006 23:52:34 -0000	1.1937
@@ -1848,6 +1848,7 @@
 Fedora Extras|pork|Console based AIM client that looks like ircII|rmccabe at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|portaudio|Free, cross platform, open-source, audio I/O library|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|poster|Scales PostScript images to span multiple pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
+Fedora Extras|Pound|A reverse-proxy and load balancer|ruben at rubenkerkhof.com|extras-qa at fedoraproject.org|
 Fedora Extras|powerman|Remote Power Management Software|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|powermanga|Arcade 2D shoot-them-up game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ppracer|3D racing game featuring Tux|nphilipp at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 00:23:47 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sun, 12 Nov 2006 17:23:47 -0700
Subject: rpms/mlton/devel .cvsignore, 1.2, 1.3 mlton.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <200611130023.kAD0Nlq1001101@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1074

Modified Files:
	.cvsignore mlton.spec sources 
Log Message:
new mlton


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 13:51:57 -0000	1.2
+++ .cvsignore	13 Nov 2006 00:23:17 -0000	1.3
@@ -1,3 +1 @@
-mlton-20051202-1.src.tgz
-mlton-bootstrap.i386.tar.bz2
-mlton-bootstrap.ppc.tar.bz2
+mlton-20061107.tar.bz2


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlton.spec	1 Sep 2006 03:16:33 -0000	1.3
+++ mlton.spec	13 Nov 2006 00:23:17 -0000	1.4
@@ -1,14 +1,14 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20051202
-Release:	8%{?dist}.1
+Version:	20061107
+Release:	1%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	BSD style and MIT
 URL:		http://mlton.org/
-Source0:	http://mlton.org/pages/Download/attachments/mlton-%{version}-1.src.tgz
+Source0:	mlton-%{version}.tar.bz2
 %if %{mlton_bootstrap}
 # taken from mlton_20060213-1 from Debian
 Source1:	mlton-bootstrap.i386.tar.bz2
@@ -21,7 +21,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gmp-devel htmldoc tetex-latex which
+BuildRequires:	gmp-devel htmldoc tetex-latex
 %if ! %{mlton_bootstrap}
 BuildRequires:	mlton
 %endif
@@ -100,6 +100,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 12 2006 Adam Goode  - 20061107-1
+- New release, taken from svn://mlton.org/mlton/tags/on-20061107
+
 * Thu Aug 31 2006 Adam Goode  - 20051202-8.1
 - Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 13:51:57 -0000	1.2
+++ sources	13 Nov 2006 00:23:17 -0000	1.3
@@ -1,3 +1 @@
-766b25e39dff36da5f3ed81effd5471b  mlton-20051202-1.src.tgz
-34f8bf4c11cca4867beb3bccab04b0a5  mlton-bootstrap.i386.tar.bz2
-16358b27a8f86ec1aede640fff1c77ff  mlton-bootstrap.ppc.tar.bz2
+eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 01:58:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 18:58:31 -0700
Subject: rpms/xfce4-dict-plugin - New directory
Message-ID: <200611130158.kAD1wVSc004470@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4466/xfce4-dict-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-dict-plugin added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 01:58:37 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 18:58:37 -0700
Subject: rpms/xfce4-dict-plugin/devel - New directory
Message-ID: <200611130158.kAD1wbbI004485@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4466/xfce4-dict-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-dict-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 01:58:59 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 18:58:59 -0700
Subject: rpms/xfce4-dict-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611130158.kAD1wxgs004515@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4509

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-dict-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-dict-plugin
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  Mon Nov 13 01:59:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 18:59:04 -0700
Subject: rpms/xfce4-dict-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611130159.kAD1x4vl004532@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4509/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-dict-plugin


--- 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 Nov 13 02:00:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 19:00:23 -0700
Subject: rpms/xfce4-dict-plugin import.log,1.1,1.2
Message-ID: <200611130200.kAD20N1X004617@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4573

Modified Files:
	import.log 
Log Message:
auto-import xfce4-dict-plugin-0.2.0-2.fc6 on branch devel from xfce4-dict-plugin-0.2.0-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dict-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 01:58:58 -0000	1.1
+++ import.log	13 Nov 2006 01:59:53 -0000	1.2
@@ -0,0 +1 @@
+xfce4-dict-plugin-0_2_0-2_fc6:HEAD:xfce4-dict-plugin-0.2.0-2.fc6.src.rpm:1163383185



From fedora-extras-commits at redhat.com  Mon Nov 13 02:00:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 19:00:24 -0700
Subject: rpms/xfce4-dict-plugin/devel xfce4-dict-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611130200.kAD20O3P004621@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-dict-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4573/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-dict-plugin.spec 
Log Message:
auto-import xfce4-dict-plugin-0.2.0-2.fc6 on branch devel from xfce4-dict-plugin-0.2.0-2.fc6.src.rpm


--- NEW FILE xfce4-dict-plugin.spec ---
Name:		xfce4-dict-plugin
Version:	0.2.0
Release:	2%{?dist}
Summary:	A XFCE panel plugin to query a Dict server

Group:		User Interface/Desktops
License:	GPL
URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0:	http://files.uvena.de/xfce4-dict-plugin/xfce4-dict-plugin-0.2.0.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2
BuildRequires:	libxml2-devel, gettext, perl(XML::Parser)
Requires:	xfce4-panel >= 4.3.99.2

%description
With this plugin you can query a dictionary server (see RFC 2229) to search 
for the translation or explanation of a word. You can also choose a dictionary 
offered by the server to improve your search results.

%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}


%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


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libexecdir}/xfce4/panel-plugins/%{name}
%{_datadir}/xfce4/panel-plugins/*.desktop
%{_datadir}/icons/hicolor/scalable/apps/dict-icon.svg


%changelog
* Sun Nov 12 2006 Christoph Wickert  - 0.2.0-2
- Add %%defattr (#215169).

* Sat Nov 11 2006 Christoph Wickert  - 0.2.0-1
- Update to 0.2.0.

* Sat Sep 23 2006 Christoph Wickert  - 0.1.0-1
- Initial Fedora Extras version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dict-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 01:59:04 -0000	1.1
+++ .cvsignore	13 Nov 2006 01:59:54 -0000	1.2
@@ -0,0 +1 @@
+xfce4-dict-plugin-0.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-dict-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 01:59:04 -0000	1.1
+++ sources	13 Nov 2006 01:59:54 -0000	1.2
@@ -0,0 +1 @@
+ac2f3626858b7b6800ac43cc9de6e0bc  xfce4-dict-plugin-0.2.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 02:16:11 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 12 Nov 2006 19:16:11 -0700
Subject: owners owners.list,1.1937,1.1938
Message-ID: <200611130216.kAD2GBEO007809@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7793

Modified Files:
	owners.list 
Log Message:
add xfce4-dict-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1937
retrieving revision 1.1938
diff -u -r1.1937 -r1.1938
--- owners.list	12 Nov 2006 23:52:34 -0000	1.1937
+++ owners.list	13 Nov 2006 02:15:41 -0000	1.1938
@@ -2418,6 +2418,7 @@
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-dev-tools|Xfce developer tools|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-dict-plugin|A Xfce panel plugin to query a Dict server|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-eyes-plugin|Eyes for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 02:36:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Sun, 12 Nov 2006 19:36:54 -0700
Subject: rpms/eiciel/devel .cvsignore, 1.3, 1.4 eiciel.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200611130236.kAD2asnW007926@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7906

Modified Files:
	.cvsignore eiciel.spec sources 
Log Message:
update to 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Nov 2006 20:17:05 -0000	1.3
+++ .cvsignore	13 Nov 2006 02:36:24 -0000	1.4
@@ -1,2 +1 @@
-eiciel-0.9.2.tar.bz2
-eiciel-0.9.3.tar.bz2
+eiciel-0.9.4.tar.bz2


Index: eiciel.spec
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/eiciel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eiciel.spec	12 Nov 2006 20:17:05 -0000	1.3
+++ eiciel.spec	13 Nov 2006 02:36:24 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           eiciel
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        Graphical access control list (ACL) editor
 Group:          Applications/System
@@ -19,8 +19,6 @@
 %prep
 %setup -q
 
-# this really should not have been packaged with the source tarball
-rm doc/C/eiciel.xml src/eiciel.desktop
 
 %build
 %configure --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0
@@ -63,6 +61,10 @@
 
 
 %changelog
+* Sun Nov 12 2006 Chris Weyl 
+- update to 0.9.4
+- src/eiciel.desktop and doc/C/eiciel.xml no longer in source tarball 
+
 * Sun Nov 12 2006 Chris Weyl  0.9.3-1
 - update to 0.9.3
 - nuke src/eiciel.desktop during prep, drop the patch and just let configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Nov 2006 20:17:05 -0000	1.3
+++ sources	13 Nov 2006 02:36:24 -0000	1.4
@@ -1 +1 @@
-f948b8680c53237235cebc911bdac5cb  eiciel-0.9.3.tar.bz2
+7678fe1da7959bed47f653b810f5f285  eiciel-0.9.4.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 05:49:39 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 22:49:39 -0700
Subject: rpms/scummvm/devel scummvm.spec,1.2,1.3
Message-ID: <200611130549.kAD5ndrG017817@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17801

Modified Files:
	scummvm.spec 
Log Message:
* 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)



Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/devel/scummvm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scummvm.spec	8 Nov 2006 10:01:13 -0000	1.2
+++ scummvm.spec	13 Nov 2006 05:49:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scummvm
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPL
@@ -31,7 +31,7 @@
 %patch0 -p1 -b .gcc41
 %patch1 -p1 -b .nostrip
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
-sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \
+sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
 
 
@@ -60,7 +60,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   dists/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -106,6 +105,10 @@
 
 
 %changelog
+* 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)
+
 * Sat Nov  4 2006 Hans de Goede  0.9.1-1
 - New upstream release 0.9.1
 - Prepare for inclusion into FE



From fedora-extras-commits at redhat.com  Mon Nov 13 05:50:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 22:50:47 -0700
Subject: rpms/scummvm/FC-6 scummvm.spec,1.2,1.3
Message-ID: <200611130550.kAD5olvI017879@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17861

Modified Files:
	scummvm.spec 
Log Message:
* 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)



Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/FC-6/scummvm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scummvm.spec	8 Nov 2006 10:01:13 -0000	1.2
+++ scummvm.spec	13 Nov 2006 05:50:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scummvm
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPL
@@ -31,7 +31,7 @@
 %patch0 -p1 -b .gcc41
 %patch1 -p1 -b .nostrip
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
-sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \
+sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
 
 
@@ -60,7 +60,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   dists/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -106,6 +105,10 @@
 
 
 %changelog
+* 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)
+
 * Sat Nov  4 2006 Hans de Goede  0.9.1-1
 - New upstream release 0.9.1
 - Prepare for inclusion into FE



From fedora-extras-commits at redhat.com  Mon Nov 13 05:52:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 12 Nov 2006 22:52:10 -0700
Subject: rpms/scummvm/FC-5 scummvm.spec,1.2,1.3
Message-ID: <200611130552.kAD5qA2o017939@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scummvm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17923

Modified Files:
	scummvm.spec 
Log Message:
* 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)



Index: scummvm.spec
===================================================================
RCS file: /cvs/extras/rpms/scummvm/FC-5/scummvm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scummvm.spec	8 Nov 2006 10:01:13 -0000	1.2
+++ scummvm.spec	13 Nov 2006 05:51:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           scummvm
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPL
@@ -31,7 +31,7 @@
 %patch0 -p1 -b .gcc41
 %patch1 -p1 -b .nostrip
 sed -i 's/%{name}.xpm/%{name}.png/' dists/%{name}.desktop
-sed -i 's/Application;Game;AdventureGame;/Application;Emulators;/' \
+sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
 
 
@@ -60,7 +60,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   dists/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -106,6 +105,10 @@
 
 
 %changelog
+* 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)
+
 * Sat Nov  4 2006 Hans de Goede  0.9.1-1
 - New upstream release 0.9.1
 - Prepare for inclusion into FE



From fedora-extras-commits at redhat.com  Mon Nov 13 06:00:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:00:49 -0700
Subject: rpms/nickle - New directory
Message-ID: <200611130600.kAD60nq1018096@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18092/nickle

Log Message:
Directory /cvs/extras/rpms/nickle added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 06:00:54 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:00:54 -0700
Subject: rpms/nickle/devel - New directory
Message-ID: <200611130600.kAD60sPM018110@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18092/nickle/devel

Log Message:
Directory /cvs/extras/rpms/nickle/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 06:01:16 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:01:16 -0700
Subject: rpms/nickle Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611130601.kAD61GL1021085@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21079

Added Files:
	Makefile import.log 
Log Message:
Setup of module nickle


--- NEW FILE Makefile ---
# Top level Makefile for module nickle
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  Mon Nov 13 06:01:26 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:01:26 -0700
Subject: rpms/nickle/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611130601.kAD61Qws021114@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21079/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nickle


--- 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 Nov 13 06:02:52 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:02:52 -0700
Subject: rpms/nickle/devel nickle.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611130602.kAD62qB6021195@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nickle.spec 
Log Message:
auto-import nickle-2.54-2 on branch devel from nickle-2.54-2.src.rpm


--- NEW FILE nickle.spec ---
Name:    nickle
Version: 2.54
Release: 2%{?dist}
Summary: A programming language-based prototyping environment

Group:   Development/Languages
License: MIT
URL:     http://nickle.org
Source0: http://nickle.org/release/nickle-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: ncurses-devel, readline-devel

%description
Nickle is a programming language based prototyping environment with
powerful programming and scripting capabilities. Nickle supports a
variety of datatypes, especially arbitrary precision numbers. The
programming language vaguely resembles C. Some things in C which do
not translate easily are different, some design choices have been made
differently, and a very few features are simply missing.

Nickle provides the functionality of UNIX bc, dc and expr in
much-improved form. It is also an ideal environment for prototyping
complex algorithms. Nickle's scripting capabilities make it a nice
replacement for spreadsheets in some applications, and its numeric
features nicely complement the limited numeric functionality of
text-oriented languages such as AWK and PERL.

%package devel
Summary:  Include files for Nickle
Group:    Development/Languages
Requires: %{name} = %{version}-%{release}

%description devel
Include files for Nickle, used for bulding external FFI (foreign
function interface) libraries (e.g. the Cairo interface for Nickle).

%prep
%setup -q


%build
%configure
make %{?_smp_flags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm `find examples -name 'Makefile*'`
rm examples/COPYING

# Fix permissions on example files
chmod a-x examples/menace2.5c
chmod a-x examples/turtle/snowflake.5c


%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README README.name COPYING AUTHORS ChangeLog NEWS TODO examples
%{_bindir}/nickle
%{_datadir}/nickle/
%exclude %{_datadir}/nickle/COPYING
%exclude %{_datadir}/nickle/examples
%{_mandir}/man1/nickle.1*

%files devel
%defattr(-, root, root,-)
%{_includedir}/nickle

%changelog
* Sat Nov  4 2006 Michel Salim  2.54-2
- Only package example files once, remove leftover Makefiles

* Thu Nov  2 2006 Michel Salim  2.54-1
- Update to 2.54
- Use exclude macro instead of ghost

* Sun Mar 19 2006 Michel Salim  2.53-3
- Moved examples to doc
- Removed redundant COPYING files from examples

* Sun Mar  5 2006 Michel Salim  2.53-2
- Removed INSTALL from installed documentation
- Added description for devel package

* Sat Feb 18 2006 Michel Salim  2.53-1
- Initial Fedora package

* Thu Mar  1 2004 Mike A. Harris  2.29-2
- Initial rpm spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nickle/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 06:01:25 -0000	1.1
+++ .cvsignore	13 Nov 2006 06:02:20 -0000	1.2
@@ -0,0 +1 @@
+nickle-2.54.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nickle/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 06:01:25 -0000	1.1
+++ sources	13 Nov 2006 06:02:20 -0000	1.2
@@ -0,0 +1 @@
+ffc7b03a830e64ec0547777330ae00b8  nickle-2.54.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 06:02:52 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sun, 12 Nov 2006 23:02:52 -0700
Subject: rpms/nickle import.log,1.1,1.2
Message-ID: <200611130602.kAD62qxE021194@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/nickle
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21157

Modified Files:
	import.log 
Log Message:
auto-import nickle-2.54-2 on branch devel from nickle-2.54-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nickle/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 06:01:16 -0000	1.1
+++ import.log	13 Nov 2006 06:02:19 -0000	1.2
@@ -0,0 +1 @@
+nickle-2_54-2:HEAD:nickle-2.54-2.src.rpm:1163397732



From fedora-extras-commits at redhat.com  Mon Nov 13 07:04:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:04:34 -0700
Subject: rpms/php-pear-HTML-Common - New directory
Message-ID: <200611130704.kAD74YH8024583@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24579/php-pear-HTML-Common

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-Common added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 07:04:38 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:04:38 -0700
Subject: rpms/php-pear-HTML-Common/devel - New directory
Message-ID: <200611130704.kAD74cEQ024594@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24579/php-pear-HTML-Common/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-Common/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 07:04:59 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:04:59 -0700
Subject: rpms/php-pear-HTML-Common Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611130704.kAD74x38024629@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24623

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTML-Common


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML-Common
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  Mon Nov 13 07:05:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:05:05 -0700
Subject: rpms/php-pear-HTML-Common/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611130705.kAD755V7024646@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24623/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML-Common


--- 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 Nov 13 07:06:04 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:06:04 -0700
Subject: rpms/php-pear-HTML-Common import.log,1.1,1.2
Message-ID: <200611130706.kAD764IQ024733@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24697

Modified Files:
	import.log 
Log Message:
auto-import php-pear-HTML-Common-1.2.3-2 on branch devel from php-pear-HTML-Common-1.2.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 07:04:59 -0000	1.1
+++ import.log	13 Nov 2006 07:05:33 -0000	1.2
@@ -0,0 +1 @@
+php-pear-HTML-Common-1_2_3-2:HEAD:php-pear-HTML-Common-1.2.3-2.src.rpm:1163401530



From fedora-extras-commits at redhat.com  Mon Nov 13 07:06:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:06:05 -0700
Subject: rpms/php-pear-HTML-Common/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-HTML-Common.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611130706.kAD765bF024737@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24697/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-HTML-Common.spec 
Log Message:
auto-import php-pear-HTML-Common-1.2.3-2 on branch devel from php-pear-HTML-Common-1.2.3-2.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-HTML-Common.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_Common

Name:           php-pear-HTML-Common
Version:        1.2.3
Release:        2%{?dist}
Summary:        Base class for other HTML classes

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/HTML_Common
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The PEAR::HTML_Common package provides methods for html code display and
attributes handling.
* Methods to set, remove, update html attributes.
* Handles comments in HTML code.
* Handles layout, tabs, line endings for nicer HTML code.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
install -pm 644 -c %{SOURCE1} LICENSE
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc LICENSE
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/*


%changelog
* Sat Nov 11 2006 Christopher Stone  1.2.3-2
- Add License file to %%doc
- Remove Requires PEAR

* Sun Oct 29 2006 Christopher Stone  1.2.3-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 07:05:02 -0000	1.1
+++ .cvsignore	13 Nov 2006 07:05:35 -0000	1.2
@@ -0,0 +1 @@
+HTML_Common-1.2.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 07:05:02 -0000	1.1
+++ sources	13 Nov 2006 07:05:35 -0000	1.2
@@ -0,0 +1 @@
+3598dd20e3be90ae445501e9c2d59506  HTML_Common-1.2.3.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 07:07:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:07:56 -0700
Subject: owners owners.list,1.1938,1.1939
Message-ID: <200611130707.kAD77uS9024849@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24833

Modified Files:
	owners.list 
Log Message:
php-pear-HTML-Common


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1938
retrieving revision 1.1939
diff -u -r1.1938 -r1.1939
--- owners.list	13 Nov 2006 02:15:41 -0000	1.1938
+++ owners.list	13 Nov 2006 07:07:25 -0000	1.1939
@@ -1779,6 +1779,7 @@
 Fedora Extras|php-pear-Date-Holidays|Driver based class to calculate holidays|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 07:25:51 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:25:51 -0700
Subject: rpms/php-pear-HTML-Table - New directory
Message-ID: <200611130725.kAD7Pp55025062@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/php-pear-HTML-Table

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-Table added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 07:25:57 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:25:57 -0700
Subject: rpms/php-pear-HTML-Table/devel - New directory
Message-ID: <200611130725.kAD7Pv24025081@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/php-pear-HTML-Table/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-Table/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 07:26:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:26:09 -0700
Subject: rpms/php-pear-HTML-Table Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611130726.kAD7Q9Vq025125@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25118

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTML-Table


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML-Table
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  Mon Nov 13 07:26:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:26:09 -0700
Subject: rpms/php-pear-HTML-Table/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611130726.kAD7Q9t2025142@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25118/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML-Table


--- 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 Nov 13 07:27:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:27:10 -0700
Subject: rpms/php-pear-HTML-Table import.log,1.1,1.2
Message-ID: <200611130727.kAD7RAtO025225@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25193

Modified Files:
	import.log 
Log Message:
auto-import php-pear-HTML-Table-1.7.5-1 on branch devel from php-pear-HTML-Table-1.7.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Table/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 07:26:08 -0000	1.1
+++ import.log	13 Nov 2006 07:26:39 -0000	1.2
@@ -0,0 +1 @@
+php-pear-HTML-Table-1_7_5-1:HEAD:php-pear-HTML-Table-1.7.5-1.src.rpm:1163402796



From fedora-extras-commits at redhat.com  Mon Nov 13 07:27:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:27:10 -0700
Subject: rpms/php-pear-HTML-Table/devel php-pear-HTML-Table.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611130727.kAD7RA9t025229@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25193/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-HTML-Table.spec 
Log Message:
auto-import php-pear-HTML-Table-1.7.5-1 on branch devel from php-pear-HTML-Table-1.7.5-1.src.rpm


--- NEW FILE php-pear-HTML-Table.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_Table

Name:           php-pear-HTML-Table
Version:        1.7.5
Release:        1%{?dist}
Summary:        Class to easily design HTML tables

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/HTML_Table
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(HTML_Common) >= 1.2.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The PEAR::HTML_Table package provides methods for easy and efficient design
of HTML tables.
- Lots of customization options.
- Tables can be modified at any time.
- The logic is the same as standard HTML editors.
- Handles col and rowspans.
- PHP code is shorter, easier to read and to maintain.
- Tables options can be reused.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
%{pear_xmldir}/%{pear_name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/HTML/Table*


%changelog
* Sat Nov 11 2006 Christopher Stone  1.7.5-1
- Upstream Sync
- Add versioned requires

* Sun Oct 29 2006 Christopher Stone  1.7.4-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Table/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 07:26:09 -0000	1.1
+++ .cvsignore	13 Nov 2006 07:26:40 -0000	1.2
@@ -0,0 +1 @@
+HTML_Table-1.7.5.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-Table/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 07:26:09 -0000	1.1
+++ sources	13 Nov 2006 07:26:40 -0000	1.2
@@ -0,0 +1 @@
+d76f133550d326c33f7fc556afb59555  HTML_Table-1.7.5.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 07:28:48 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 00:28:48 -0700
Subject: owners owners.list,1.1939,1.1940
Message-ID: <200611130728.kAD7Sm7K025283@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25267

Modified Files:
	owners.list 
Log Message:
php-pear-HTML-Table


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1939
retrieving revision 1.1940
diff -u -r1.1939 -r1.1940
--- owners.list	13 Nov 2006 07:07:25 -0000	1.1939
+++ owners.list	13 Nov 2006 07:28:17 -0000	1.1940
@@ -1780,6 +1780,7 @@
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTML-Table|Class to easily design HTML tables|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 08:21:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 13 Nov 2006 01:21:16 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 sylpheed-claws-plugins.spec, 1.18, 1.19
Message-ID: <200611130821.kAD8LGcX028676@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28568/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Sep 2006 09:38:23 -0000	1.9
+++ .cvsignore	13 Nov 2006 08:20:46 -0000	1.10
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Sep 2006 09:38:23 -0000	1.9
+++ sources	13 Nov 2006 08:20:46 -0000	1.10
@@ -1 +1 @@
-db771d49bf9bde1cce075b93f8028a19  sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+621e011a8a801485a18202696343b0ce  sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sylpheed-claws-plugins.spec	7 Nov 2006 01:24:38 -0000	1.18
+++ sylpheed-claws-plugins.spec	13 Nov 2006 08:20:46 -0000	1.19
@@ -1,6 +1,22 @@
+# define pulgin version
+%define acpinotifier	1.0.4
+%define attremover	1.0.3
+%define cachesaver	0.10.2
+%define	etpanprivacy	0.15.3
+%define fetchinfo	0.4.16
+%define gtkhtml2viewer 0.12
+%define maildir		0.24.2
+%define mailmbox	1.12.2
+%define newmail		0.0.7
+%define notification	0.6
+%define perl		0.9.5
+%define rssyl		0.7
+%define smime		0.5.6
+%define synce		0.6.4
+%define vcalendar	1.90
 Name:           sylpheed-claws-plugins
-Version:        2.5.2
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -182,82 +198,82 @@
 Evolution or Outlook.
 
 %prep
-%setup -q -n sylpheed-claws-extra-plugins-%{version}
+%setup -c -q -n sylpheed-claws-extra-plugins-%{version}
 
 %build
 #acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %configure --disable-static --disable-dependency-tracking --disable-rpath
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -265,77 +281,77 @@
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
  
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
@@ -350,11 +366,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-1.0.3/ChangeLog
-%doc acpi_notifier-1.0.3/COPYING
-%doc acpi_notifier-1.0.3/NEWS
-%doc acpi_notifier-1.0.3/AUTHORS
-%doc acpi_notifier-1.0.3/README
+%doc acpi_notifier-%{acpinotifier}/ChangeLog
+%doc acpi_notifier-%{acpinotifier}/COPYING
+%doc acpi_notifier-%{acpinotifier}/NEWS
+%doc acpi_notifier-%{acpinotifier}/AUTHORS
+%doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -369,39 +385,39 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-1.0.3/AUTHORS
-%doc att_remover-1.0.3/ChangeLog
-%doc att_remover-1.0.3/COPYING
-%doc att_remover-1.0.3/NEWS
-%doc att_remover-1.0.3/README
+%doc att_remover-%{attremover}/AUTHORS
+%doc att_remover-%{attremover}/ChangeLog
+%doc att_remover-%{attremover}/COPYING
+%doc att_remover-%{attremover}/NEWS
+%doc att_remover-%{attremover}/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
 %defattr(-,root,root,-)
-%doc cachesaver-0.10.2/AUTHORS
-%doc cachesaver-0.10.2/ChangeLog
-%doc cachesaver-0.10.2/COPYING
+%doc cachesaver-%{cachesaver}/AUTHORS
+%doc cachesaver-%{cachesaver}/ChangeLog
+%doc cachesaver-%{cachesaver}/COPYING
 %{_libdir}/sylpheed-claws/plugins/cachesaver*
 
 %files etpan-privacy
 %defattr(-,root,root,-)
-%doc etpan-privacy-0.15.3/AUTHORS
-%doc etpan-privacy-0.15.3/ChangeLog
-%doc etpan-privacy-0.15.3/COPYING
-%doc etpan-privacy-0.15.3/README
+%doc etpan-privacy-%{etpanprivacy}/AUTHORS
+%doc etpan-privacy-%{etpanprivacy}/ChangeLog
+%doc etpan-privacy-%{etpanprivacy}/COPYING
+%doc etpan-privacy-%{etpanprivacy}/README
 %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.16/ChangeLog
-%doc fetchinfo-plugin-0.4.16/COPYING
-%doc fetchinfo-plugin-0.4.16/README
+%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
+%doc fetchinfo-plugin-%{fetchinfo}/COPYING
+%doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
 %files gtkhtml2-viewer
 %defattr(-,root,root,-)
-%doc gtkhtml2_viewer-0.11/AUTHORS
-%doc gtkhtml2_viewer-0.11/COPYING
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -415,53 +431,53 @@
 
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.24.2/AUTHORS
-%doc maildir-0.24.2/ChangeLog
-%doc maildir-0.24.2/COPYING
-%doc maildir-0.24.2/README
-%doc maildir-0.24.2/doc/README.xml
+%doc maildir-%{maildir}/AUTHORS
+%doc maildir-%{maildir}/ChangeLog
+%doc maildir-%{maildir}/COPYING
+%doc maildir-%{maildir}/README
+%doc maildir-%{maildir}/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.12.2/AUTHORS
-%doc mailmbox-1.12.2/ChangeLog
-%doc mailmbox-1.12.2/COPYING
-%doc mailmbox-1.12.2/README
+%doc mailmbox-%{mailmbox}/AUTHORS
+%doc mailmbox-%{mailmbox}/ChangeLog
+%doc mailmbox-%{mailmbox}/COPYING
+%doc mailmbox-%{mailmbox}/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
 %files newmail
 %defattr(-,root,root,-)
-%doc newmail-0.0.7/AUTHORS
-%doc newmail-0.0.7/ChangeLog
-%doc newmail-0.0.7/COPYING
-%doc newmail-0.0.7/NEWS
-%doc newmail-0.0.7/README
+%doc newmail-%{newmail}/AUTHORS
+%doc newmail-%{newmail}/ChangeLog
+%doc newmail-%{newmail}/COPYING
+%doc newmail-%{newmail}/NEWS
+%doc newmail-%{newmail}/README
 %{_libdir}/sylpheed-claws/plugins/newmail.so
 
 %files notification
 %defattr(-,root,root,-)
-%doc notification_plugin-0.5/AUTHORS
-%doc notification_plugin-0.5/ChangeLog
-%doc notification_plugin-0.5/COPYING
-%doc notification_plugin-0.5/README
+%doc notification_plugin-%{notification}/AUTHORS
+%doc notification_plugin-%{notification}/ChangeLog
+%doc notification_plugin-%{notification}/COPYING
+%doc notification_plugin-%{notification}/README
 %{_libdir}/sylpheed-claws/plugins/notification_plugin.so
 
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.9.5/AUTHORS
-%doc perl_plugin-0.9.5/ChangeLog
-%doc perl_plugin-0.9.5/COPYING
-%doc perl_plugin-0.9.5/README
-%doc perl_plugin-0.9.5/sc_perl.pod
+%doc perl_plugin-%{perl}/AUTHORS
+%doc perl_plugin-%{perl}/ChangeLog
+%doc perl_plugin-%{perl}/COPYING
+%doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.6.1/AUTHORS
-%doc rssyl-0.6.1/ChangeLog
-%doc rssyl-0.6.1/COPYING
-%doc rssyl-0.6.1/TODO
+%doc rssyl-%{rssyl}/AUTHORS
+%doc rssyl-%{rssyl}/ChangeLog
+%doc rssyl-%{rssyl}/COPYING
+%doc rssyl-%{rssyl}/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -477,25 +493,25 @@
 
 %files smime
 %defattr(-,root,root,-)
-%doc smime-0.5.5/ChangeLog
-%doc smime-0.5.5/COPYING
-%doc smime-0.5.5/NEWS
-%{_libdir}/sylpheed-claws/plugins/smime.so
+%doc smime-%{smime}/ChangeLog
+%doc smime-%{smime}/COPYING
+%doc smime-%{smime}/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime*
 
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.6.4/AUTHORS
-%doc synce_plugin-0.6.4/ChangeLog
-%doc synce_plugin-0.6.4/COPYING
-%doc synce_plugin-0.6.4/README
+%doc synce_plugin-%{synce}/AUTHORS
+%doc synce_plugin-%{synce}/ChangeLog
+%doc synce_plugin-%{synce}/COPYING
+%doc synce_plugin-%{synce}/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.89.1/AUTHORS
-%doc vcalendar-1.89.1/ChangeLog
-%doc vcalendar-1.89.1/COPYING
-%doc vcalendar-1.89.1/README
+%doc vcalendar-%{vcalendar}/AUTHORS
+%doc vcalendar-%{vcalendar}/ChangeLog
+%doc vcalendar-%{vcalendar}/COPYING
+%doc vcalendar-%{vcalendar}/README
 %{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
@@ -510,6 +526,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Nov 09 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Tue Nov 07 2006 Andreas Bierfert 
 2.5.2-5
 - rebuild



From fedora-extras-commits at redhat.com  Mon Nov 13 08:21:17 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 13 Nov 2006 01:21:17 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 .cvsignore, 1.10, 1.11 sources,
	1.10, 1.11 sylpheed-claws-plugins.spec, 1.23, 1.24
Message-ID: <200611130821.kAD8LH45028681@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28568/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2006 09:38:23 -0000	1.10
+++ .cvsignore	13 Nov 2006 08:20:47 -0000	1.11
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 09:38:23 -0000	1.10
+++ sources	13 Nov 2006 08:20:47 -0000	1.11
@@ -1 +1 @@
-db771d49bf9bde1cce075b93f8028a19  sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+621e011a8a801485a18202696343b0ce  sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sylpheed-claws-plugins.spec	7 Nov 2006 01:24:38 -0000	1.23
+++ sylpheed-claws-plugins.spec	13 Nov 2006 08:20:47 -0000	1.24
@@ -1,6 +1,22 @@
+# define pulgin version
+%define acpinotifier	1.0.4
+%define attremover	1.0.3
+%define cachesaver	0.10.2
+%define	etpanprivacy	0.15.3
+%define fetchinfo	0.4.16
+%define gtkhtml2viewer 0.12
+%define maildir		0.24.2
+%define mailmbox	1.12.2
+%define newmail		0.0.7
+%define notification	0.6
+%define perl		0.9.5
+%define rssyl		0.7
+%define smime		0.5.6
+%define synce		0.6.4
+%define vcalendar	1.90
 Name:           sylpheed-claws-plugins
-Version:        2.5.2
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
@@ -182,82 +198,82 @@
 Evolution or Outlook.
 
 %prep
-%setup -q -n sylpheed-claws-extra-plugins-%{version}
+%setup -c -q -n sylpheed-claws-extra-plugins-%{version}
 
 %build
 #acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %configure --disable-static --disable-dependency-tracking --disable-rpath
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -265,77 +281,77 @@
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
  
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
@@ -350,11 +366,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-1.0.3/ChangeLog
-%doc acpi_notifier-1.0.3/COPYING
-%doc acpi_notifier-1.0.3/NEWS
-%doc acpi_notifier-1.0.3/AUTHORS
-%doc acpi_notifier-1.0.3/README
+%doc acpi_notifier-%{acpinotifier}/ChangeLog
+%doc acpi_notifier-%{acpinotifier}/COPYING
+%doc acpi_notifier-%{acpinotifier}/NEWS
+%doc acpi_notifier-%{acpinotifier}/AUTHORS
+%doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -369,39 +385,39 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-1.0.3/AUTHORS
-%doc att_remover-1.0.3/ChangeLog
-%doc att_remover-1.0.3/COPYING
-%doc att_remover-1.0.3/NEWS
-%doc att_remover-1.0.3/README
+%doc att_remover-%{attremover}/AUTHORS
+%doc att_remover-%{attremover}/ChangeLog
+%doc att_remover-%{attremover}/COPYING
+%doc att_remover-%{attremover}/NEWS
+%doc att_remover-%{attremover}/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
 %defattr(-,root,root,-)
-%doc cachesaver-0.10.2/AUTHORS
-%doc cachesaver-0.10.2/ChangeLog
-%doc cachesaver-0.10.2/COPYING
+%doc cachesaver-%{cachesaver}/AUTHORS
+%doc cachesaver-%{cachesaver}/ChangeLog
+%doc cachesaver-%{cachesaver}/COPYING
 %{_libdir}/sylpheed-claws/plugins/cachesaver*
 
 %files etpan-privacy
 %defattr(-,root,root,-)
-%doc etpan-privacy-0.15.3/AUTHORS
-%doc etpan-privacy-0.15.3/ChangeLog
-%doc etpan-privacy-0.15.3/COPYING
-%doc etpan-privacy-0.15.3/README
+%doc etpan-privacy-%{etpanprivacy}/AUTHORS
+%doc etpan-privacy-%{etpanprivacy}/ChangeLog
+%doc etpan-privacy-%{etpanprivacy}/COPYING
+%doc etpan-privacy-%{etpanprivacy}/README
 %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.16/ChangeLog
-%doc fetchinfo-plugin-0.4.16/COPYING
-%doc fetchinfo-plugin-0.4.16/README
+%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
+%doc fetchinfo-plugin-%{fetchinfo}/COPYING
+%doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
 %files gtkhtml2-viewer
 %defattr(-,root,root,-)
-%doc gtkhtml2_viewer-0.11/AUTHORS
-%doc gtkhtml2_viewer-0.11/COPYING
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -415,53 +431,53 @@
 
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.24.2/AUTHORS
-%doc maildir-0.24.2/ChangeLog
-%doc maildir-0.24.2/COPYING
-%doc maildir-0.24.2/README
-%doc maildir-0.24.2/doc/README.xml
+%doc maildir-%{maildir}/AUTHORS
+%doc maildir-%{maildir}/ChangeLog
+%doc maildir-%{maildir}/COPYING
+%doc maildir-%{maildir}/README
+%doc maildir-%{maildir}/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.12.2/AUTHORS
-%doc mailmbox-1.12.2/ChangeLog
-%doc mailmbox-1.12.2/COPYING
-%doc mailmbox-1.12.2/README
+%doc mailmbox-%{mailmbox}/AUTHORS
+%doc mailmbox-%{mailmbox}/ChangeLog
+%doc mailmbox-%{mailmbox}/COPYING
+%doc mailmbox-%{mailmbox}/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
 %files newmail
 %defattr(-,root,root,-)
-%doc newmail-0.0.7/AUTHORS
-%doc newmail-0.0.7/ChangeLog
-%doc newmail-0.0.7/COPYING
-%doc newmail-0.0.7/NEWS
-%doc newmail-0.0.7/README
+%doc newmail-%{newmail}/AUTHORS
+%doc newmail-%{newmail}/ChangeLog
+%doc newmail-%{newmail}/COPYING
+%doc newmail-%{newmail}/NEWS
+%doc newmail-%{newmail}/README
 %{_libdir}/sylpheed-claws/plugins/newmail.so
 
 %files notification
 %defattr(-,root,root,-)
-%doc notification_plugin-0.5/AUTHORS
-%doc notification_plugin-0.5/ChangeLog
-%doc notification_plugin-0.5/COPYING
-%doc notification_plugin-0.5/README
+%doc notification_plugin-%{notification}/AUTHORS
+%doc notification_plugin-%{notification}/ChangeLog
+%doc notification_plugin-%{notification}/COPYING
+%doc notification_plugin-%{notification}/README
 %{_libdir}/sylpheed-claws/plugins/notification_plugin.so
 
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.9.5/AUTHORS
-%doc perl_plugin-0.9.5/ChangeLog
-%doc perl_plugin-0.9.5/COPYING
-%doc perl_plugin-0.9.5/README
-%doc perl_plugin-0.9.5/sc_perl.pod
+%doc perl_plugin-%{perl}/AUTHORS
+%doc perl_plugin-%{perl}/ChangeLog
+%doc perl_plugin-%{perl}/COPYING
+%doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.6.1/AUTHORS
-%doc rssyl-0.6.1/ChangeLog
-%doc rssyl-0.6.1/COPYING
-%doc rssyl-0.6.1/TODO
+%doc rssyl-%{rssyl}/AUTHORS
+%doc rssyl-%{rssyl}/ChangeLog
+%doc rssyl-%{rssyl}/COPYING
+%doc rssyl-%{rssyl}/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -477,25 +493,25 @@
 
 %files smime
 %defattr(-,root,root,-)
-%doc smime-0.5.5/ChangeLog
-%doc smime-0.5.5/COPYING
-%doc smime-0.5.5/NEWS
-%{_libdir}/sylpheed-claws/plugins/smime.so
+%doc smime-%{smime}/ChangeLog
+%doc smime-%{smime}/COPYING
+%doc smime-%{smime}/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime*
 
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.6.4/AUTHORS
-%doc synce_plugin-0.6.4/ChangeLog
-%doc synce_plugin-0.6.4/COPYING
-%doc synce_plugin-0.6.4/README
+%doc synce_plugin-%{synce}/AUTHORS
+%doc synce_plugin-%{synce}/ChangeLog
+%doc synce_plugin-%{synce}/COPYING
+%doc synce_plugin-%{synce}/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.89.1/AUTHORS
-%doc vcalendar-1.89.1/ChangeLog
-%doc vcalendar-1.89.1/COPYING
-%doc vcalendar-1.89.1/README
+%doc vcalendar-%{vcalendar}/AUTHORS
+%doc vcalendar-%{vcalendar}/ChangeLog
+%doc vcalendar-%{vcalendar}/COPYING
+%doc vcalendar-%{vcalendar}/README
 %{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
@@ -510,6 +526,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Nov 09 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Tue Nov 07 2006 Andreas Bierfert 
 2.5.2-5
 - rebuild



From fedora-extras-commits at redhat.com  Mon Nov 13 08:21:18 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 13 Nov 2006 01:21:18 -0700
Subject: rpms/sylpheed-claws-plugins/devel .cvsignore, 1.10, 1.11 sources,
	1.10, 1.11 sylpheed-claws-plugins.spec, 1.25, 1.26
Message-ID: <200611130821.kAD8LI6F028686@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28568/devel

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Sep 2006 09:38:29 -0000	1.10
+++ .cvsignore	13 Nov 2006 08:20:48 -0000	1.11
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Sep 2006 09:38:29 -0000	1.10
+++ sources	13 Nov 2006 08:20:48 -0000	1.11
@@ -1 +1 @@
-db771d49bf9bde1cce075b93f8028a19  sylpheed-claws-extra-plugins-2.5.2.tar.bz2
+621e011a8a801485a18202696343b0ce  sylpheed-claws-extra-plugins-2.6.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sylpheed-claws-plugins.spec	7 Nov 2006 01:24:40 -0000	1.25
+++ sylpheed-claws-plugins.spec	13 Nov 2006 08:20:48 -0000	1.26
@@ -1,13 +1,28 @@
+# define pulgin version
+%define acpinotifier	1.0.4
+%define attremover	1.0.3
+%define cachesaver	0.10.2
+%define	etpanprivacy	0.15.3
+%define fetchinfo	0.4.16
+%define gtkhtml2viewer 0.12
+%define maildir		0.24.2
+%define mailmbox	1.12.2
+%define newmail		0.0.7
+%define notification	0.6
+%define perl		0.9.5
+%define rssyl		0.7
+%define smime		0.5.6
+%define synce		0.6.4
+%define vcalendar	1.90
 Name:           sylpheed-claws-plugins
-Version:        2.5.2
-Release:        6%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
-Patch1:		sylpheed-claws-curl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -183,83 +198,82 @@
 Evolution or Outlook.
 
 %prep
-%setup -q -n sylpheed-claws-extra-plugins-%{version}
-%patch1 -p1 -b .curl
+%setup -c -q -n sylpheed-claws-extra-plugins-%{version}
 
 %build
 #acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %configure --disable-static --disable-dependency-tracking --disable-rpath
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -267,77 +281,77 @@
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-1.0.3
+cd acpi_notifier-%{acpinotifier}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # att_remover
-cd ../att_remover-1.0.3
+cd ../att_remover-%{attremover}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 # cachesaver
-cd ../cachesaver-0.10.2
+cd ../cachesaver-%{cachesaver}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #etpan-privacy
-cd ../etpan-privacy-0.15.3
+cd ../etpan-privacy-%{etpanprivacy}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.16
+cd ../fetchinfo-plugin-%{fetchinfo}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
  
 
 #gtkhtml2-viewer
-cd ../gtkhtml2_viewer-0.11
+cd ../gtkhtml2_viewer-%{gtkhtml2viewer}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #maildir
-cd ../maildir-0.24.2
+cd ../maildir-%{maildir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #mailmbox
-cd ../mailmbox-1.12.2
+cd ../mailmbox-%{mailmbox}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #newmail
-cd ../newmail-0.0.7
+cd ../newmail-%{newmail}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #notification-plugin
-cd ../notification_plugin-0.5
+cd ../notification_plugin-%{notification}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #perl
-cd ../perl_plugin-0.9.5
+cd ../perl_plugin-%{perl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #rssyl
-cd ../rssyl-0.6.1
+cd ../rssyl-%{rssyl}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #smime
-cd ../smime-0.5.5
+cd ../smime-%{smime}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #synce
-cd ../synce_plugin-0.6.4
+cd ../synce_plugin-%{synce}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
 #vcalendar
-cd ../vcalendar-1.89.1
+cd ../vcalendar-%{vcalendar}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT SYLPHEED_CLAWS_PLUGINDIR=%{_libdir}/sylpheed-claws/plugins/
 
 
@@ -352,11 +366,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-1.0.3/ChangeLog
-%doc acpi_notifier-1.0.3/COPYING
-%doc acpi_notifier-1.0.3/NEWS
-%doc acpi_notifier-1.0.3/AUTHORS
-%doc acpi_notifier-1.0.3/README
+%doc acpi_notifier-%{acpinotifier}/ChangeLog
+%doc acpi_notifier-%{acpinotifier}/COPYING
+%doc acpi_notifier-%{acpinotifier}/NEWS
+%doc acpi_notifier-%{acpinotifier}/AUTHORS
+%doc acpi_notifier-%{acpinotifier}/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -371,39 +385,39 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-1.0.3/AUTHORS
-%doc att_remover-1.0.3/ChangeLog
-%doc att_remover-1.0.3/COPYING
-%doc att_remover-1.0.3/NEWS
-%doc att_remover-1.0.3/README
+%doc att_remover-%{attremover}/AUTHORS
+%doc att_remover-%{attremover}/ChangeLog
+%doc att_remover-%{attremover}/COPYING
+%doc att_remover-%{attremover}/NEWS
+%doc att_remover-%{attremover}/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
 %defattr(-,root,root,-)
-%doc cachesaver-0.10.2/AUTHORS
-%doc cachesaver-0.10.2/ChangeLog
-%doc cachesaver-0.10.2/COPYING
+%doc cachesaver-%{cachesaver}/AUTHORS
+%doc cachesaver-%{cachesaver}/ChangeLog
+%doc cachesaver-%{cachesaver}/COPYING
 %{_libdir}/sylpheed-claws/plugins/cachesaver*
 
 %files etpan-privacy
 %defattr(-,root,root,-)
-%doc etpan-privacy-0.15.3/AUTHORS
-%doc etpan-privacy-0.15.3/ChangeLog
-%doc etpan-privacy-0.15.3/COPYING
-%doc etpan-privacy-0.15.3/README
+%doc etpan-privacy-%{etpanprivacy}/AUTHORS
+%doc etpan-privacy-%{etpanprivacy}/ChangeLog
+%doc etpan-privacy-%{etpanprivacy}/COPYING
+%doc etpan-privacy-%{etpanprivacy}/README
 %{_libdir}/sylpheed-claws/plugins/etpan-privacy.so
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.16/ChangeLog
-%doc fetchinfo-plugin-0.4.16/COPYING
-%doc fetchinfo-plugin-0.4.16/README
+%doc fetchinfo-plugin-%{fetchinfo}/ChangeLog
+%doc fetchinfo-plugin-%{fetchinfo}/COPYING
+%doc fetchinfo-plugin-%{fetchinfo}/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
 %files gtkhtml2-viewer
 %defattr(-,root,root,-)
-%doc gtkhtml2_viewer-0.11/AUTHORS
-%doc gtkhtml2_viewer-0.11/COPYING
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS
+%doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING
 %{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/gtkhtml2_viewer.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -417,53 +431,53 @@
 
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.24.2/AUTHORS
-%doc maildir-0.24.2/ChangeLog
-%doc maildir-0.24.2/COPYING
-%doc maildir-0.24.2/README
-%doc maildir-0.24.2/doc/README.xml
+%doc maildir-%{maildir}/AUTHORS
+%doc maildir-%{maildir}/ChangeLog
+%doc maildir-%{maildir}/COPYING
+%doc maildir-%{maildir}/README
+%doc maildir-%{maildir}/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.12.2/AUTHORS
-%doc mailmbox-1.12.2/ChangeLog
-%doc mailmbox-1.12.2/COPYING
-%doc mailmbox-1.12.2/README
+%doc mailmbox-%{mailmbox}/AUTHORS
+%doc mailmbox-%{mailmbox}/ChangeLog
+%doc mailmbox-%{mailmbox}/COPYING
+%doc mailmbox-%{mailmbox}/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
 %files newmail
 %defattr(-,root,root,-)
-%doc newmail-0.0.7/AUTHORS
-%doc newmail-0.0.7/ChangeLog
-%doc newmail-0.0.7/COPYING
-%doc newmail-0.0.7/NEWS
-%doc newmail-0.0.7/README
+%doc newmail-%{newmail}/AUTHORS
+%doc newmail-%{newmail}/ChangeLog
+%doc newmail-%{newmail}/COPYING
+%doc newmail-%{newmail}/NEWS
+%doc newmail-%{newmail}/README
 %{_libdir}/sylpheed-claws/plugins/newmail.so
 
 %files notification
 %defattr(-,root,root,-)
-%doc notification_plugin-0.5/AUTHORS
-%doc notification_plugin-0.5/ChangeLog
-%doc notification_plugin-0.5/COPYING
-%doc notification_plugin-0.5/README
+%doc notification_plugin-%{notification}/AUTHORS
+%doc notification_plugin-%{notification}/ChangeLog
+%doc notification_plugin-%{notification}/COPYING
+%doc notification_plugin-%{notification}/README
 %{_libdir}/sylpheed-claws/plugins/notification_plugin.so
 
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.9.5/AUTHORS
-%doc perl_plugin-0.9.5/ChangeLog
-%doc perl_plugin-0.9.5/COPYING
-%doc perl_plugin-0.9.5/README
-%doc perl_plugin-0.9.5/sc_perl.pod
+%doc perl_plugin-%{perl}/AUTHORS
+%doc perl_plugin-%{perl}/ChangeLog
+%doc perl_plugin-%{perl}/COPYING
+%doc perl_plugin-%{perl}/README
+%doc perl_plugin-%{perl}/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.6.1/AUTHORS
-%doc rssyl-0.6.1/ChangeLog
-%doc rssyl-0.6.1/COPYING
-%doc rssyl-0.6.1/TODO
+%doc rssyl-%{rssyl}/AUTHORS
+%doc rssyl-%{rssyl}/ChangeLog
+%doc rssyl-%{rssyl}/COPYING
+%doc rssyl-%{rssyl}/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -479,25 +493,25 @@
 
 %files smime
 %defattr(-,root,root,-)
-%doc smime-0.5.5/ChangeLog
-%doc smime-0.5.5/COPYING
-%doc smime-0.5.5/NEWS
-%{_libdir}/sylpheed-claws/plugins/smime.so
+%doc smime-%{smime}/ChangeLog
+%doc smime-%{smime}/COPYING
+%doc smime-%{smime}/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime*
 
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.6.4/AUTHORS
-%doc synce_plugin-0.6.4/ChangeLog
-%doc synce_plugin-0.6.4/COPYING
-%doc synce_plugin-0.6.4/README
+%doc synce_plugin-%{synce}/AUTHORS
+%doc synce_plugin-%{synce}/ChangeLog
+%doc synce_plugin-%{synce}/COPYING
+%doc synce_plugin-%{synce}/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.89.1/AUTHORS
-%doc vcalendar-1.89.1/ChangeLog
-%doc vcalendar-1.89.1/COPYING
-%doc vcalendar-1.89.1/README
+%doc vcalendar-%{vcalendar}/AUTHORS
+%doc vcalendar-%{vcalendar}/ChangeLog
+%doc vcalendar-%{vcalendar}/COPYING
+%doc vcalendar-%{vcalendar}/README
 %{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
@@ -512,6 +526,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Thu Nov 09 2006 Andreas Bierfert 
+2.6.0-1
+- version upgrade
+
 * Tue Nov 07 2006 Andreas Bierfert 
 2.5.2-6
 - rebuild



From fedora-extras-commits at redhat.com  Mon Nov 13 08:38:39 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 01:38:39 -0700
Subject: rpms/manedit/devel .cvsignore, 1.4, 1.5 Makefile, 1.3,
	1.4 manedit-0.7.1-allow-more_section.patch, NONE,
	1.1 manedit-0.7.1-makefile.patch, NONE,
	1.1 manedit-0.7.1-manbase.patch, NONE,
	1.1 manedit-0.7.1-remove-some-warning.patch, NONE,
	1.1 manedit.desktop, 1.2, 1.3 manedit.spec, 1.13,
	1.14 manview.desktop, NONE, 1.1 sources, 1.4, 1.5 dead.package,
	1.1, NONE
Message-ID: <200611130838.kAD8cdk6029263@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/manedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29226

Added Files:
	.cvsignore Makefile manedit-0.7.1-allow-more_section.patch 
	manedit-0.7.1-makefile.patch manedit-0.7.1-manbase.patch 
	manedit-0.7.1-remove-some-warning.patch manedit.desktop 
	manedit.spec manview.desktop sources 
Removed Files:
	dead.package 
Log Message:
Re-commit manedit


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	13 Nov 2006 08:38:09 -0000	1.5
@@ -0,0 +1 @@
+manedit-0.7.1.tar.bz2


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	13 Nov 2006 08:38:09 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: manedit
+# $Id$
+NAME := manedit
+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)

manedit-0.7.1-allow-more_section.patch:

--- NEW FILE manedit-0.7.1-allow-more_section.patch ---
--- manedit-0.7.1/manedit/main.c.section	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-10-28 15:21:31.000000000 +0900
@@ -553,7 +553,9 @@
 
 	    FileBrowserTypeListNew(
 		list, total,
-		".1 .2 .3 .4 .5 .6 .bz2 .gz",
+		".1 .2 .3 .4 .5 .6 .7 .8 "
+		".1x .2x .3x .4x .5x .6x .7x .8x "
+		".bz2 .gz",
 		"Manual page"
 	    );
 	    FileBrowserTypeListNew(

manedit-0.7.1-makefile.patch:

--- NEW FILE manedit-0.7.1-makefile.patch ---
--- manedit-0.7.1/manedit/Makefile.install.FreeBSD.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile.install.FreeBSD	2006-10-30 16:52:26.000000000 +0900
@@ -11,7 +11,7 @@
 #	PREFIX
 #
 
-INSTALL      = install -o root -g wheel
+INSTALL      = install -c -p
 INSTBINFLAGS = -m 0755
 INSTMANFLAGS = -m 0444
 INSTDATFLAGS = -m 0644
@@ -22,14 +22,14 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-MAN          = $(BIN).1.bz2
+MAN          = $(BIN).1
 ICON         = $(BIN).xpm
 MANVIEW_ICON = manview.xpm
 
 BIN_DIR   = $(PREFIX)/bin
-ICONS_DIR = $(PREFIX)/share/$(BIN)/icons
+ICONS_DIR = $(PREFIX)/share/pixmaps
 DATA_DIR  = $(PREFIX)/share/$(BIN)
-MAN_DIR   = $(PREFIX)/man/man1
+MAN_DIR   = $(PREFIX)/share/man/man1
 
 install:
 	$(INSTALL) -d $(INSTBINFLAGS) $(BIN_DIR)
--- manedit-0.7.1/manedit/Makefile.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile	2006-10-30 16:46:52.000000000 +0900
@@ -19,8 +19,9 @@
 #   absolutly sure that requires modification.
 #
 PREFIX ?= /usr
-LOCALBASE ?= /usr/local
-X11BASE ?= /usr/X11R6
+LOCALBASE ?= /usr/local/share
+X11BASE ?= /usr/share
+MANBASE ?= /usr/share
 
 
 # ########################################################################
@@ -54,10 +55,9 @@
 GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
 CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
           -DPREFIX=\"$(PREFIX)\" \
-          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
-
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" -DMANBASE=\"$(MANBASE)\"
 
+CPPFLAGS = 
 
 # ########################################################################
 # Dependant Libraries:
@@ -91,6 +91,10 @@
 #
 INC =
 
+####################################################################
+
+CFLAGS += $(OPTFLAGS)
+LIB += $(LDFLAGS)
 
 # ########################################################################
 # Program Source and Header Files:
@@ -116,7 +120,7 @@
 # Build Rules:
 #
 $(BIN): $(OBJ_C) $(OBJ_CPP)
-	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
 
 all: $(BIN) $(BIN).1.out
 
@@ -138,8 +142,8 @@
 # Manual Page Build/Subs Rule:
 #
 $(BIN).1.out: $(BIN).1
-	$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
+	$(SED)  -e 's|%%PREFIX%%|$(PREFIX)|g'  \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
 
 # ########################################################################

manedit-0.7.1-manbase.patch:

--- NEW FILE manedit-0.7.1-manbase.patch ---
--- manedit-0.7.1/manedit/pref.c.manbase	2006-08-26 05:00:00.000000000 +0200
+++ manedit-0.7.1/manedit/pref.c	2006-10-31 10:25:44.000000000 +0100
@@ -1708,24 +1708,16 @@
 #if defined(__FreeBSD__)
 	    text[0] = "/usr/share/man";
 #else
-	    text[0] = "/usr/man";
+	    text[0] = MANBASE"/man";
 #endif
 	    text[1] = "Global";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = LOCALBASE "/man";
-#else
-	    text[0] = "/usr/local/man";
-#endif
 	    text[1] = "Local";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = X11BASE"/man";
-#else
-	    text[0] = "/usr/X11R6/man";
-#endif
 	    text[1] = "X Window Systems";
 	    gtk_clist_append(GTK_CLIST(w), text);
 	}

manedit-0.7.1-remove-some-warning.patch:

--- NEW FILE manedit-0.7.1-remove-some-warning.patch ---
--- manedit-0.7.1/manedit/clipboard.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/clipboard.c	2006-11-12 02:17:31.000000000 +0900
@@ -2166,7 +2166,7 @@
 		);
 		if(tmp_text != NULL)
 		{
-		    strncpy(tmp_text, cb->data, cb->data_length);
+		    strncpy(tmp_text, (gchar *)cb->data, cb->data_length);
 		    tmp_text[cb->data_length] = '\0';
 
 		    w = gtk_label_new(tmp_text);
--- manedit-0.7.1/manedit/editor.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editor.c	2006-11-12 02:20:09.000000000 +0900
@@ -69,6 +69,7 @@
 #include "images/icon_replace_20x20.xpm"
 #include "images/icon_replace_all_20x20.xpm"
 
+#include 
 
 editor_item_struct *EditorItemNew(
 	editor_item_type type,
--- manedit-0.7.1/manedit/editorcb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorcb.c	2006-11-12 02:17:31.000000000 +0900
@@ -2856,7 +2856,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,		/* Foreground color */
 			NULL,		/* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2885,7 +2885,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2962,7 +2962,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2992,7 +2992,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
--- manedit-0.7.1/manedit/editordnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editordnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -965,7 +965,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 	data_sent = TRUE;
 
@@ -981,7 +981,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,      /* 8 bits per character */
-		s, strlen(s)
+		(guchar *)s, strlen(s)
 	    );
 	    data_sent = TRUE;
 	}
@@ -1367,7 +1367,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 		EditorFileLoad(editor, path, editor->selected_branch, FALSE);
 		g_free(path);
--- manedit-0.7.1/manedit/editorop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorop.c	2006-11-12 02:26:43.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 		/* For unlink() */
 
+#include 
+
 #include "../include/string.h"
 #include "../include/strexp.h"
 #include "../include/disk.h"
@@ -1143,7 +1145,10 @@
 	tmp_path = g_strdup(PrefixPaths(
 	    prog_tmp_path, "previewXXXXXX"
 	));
-	mkstemp(tmp_path);
+	if ((mkstemp(tmp_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", tmp_path);
+	  exit (1);
+	}
 
 	/* Here we play a trick, first record the full path name
 	 * on the item data and replace it with our tempory file path
--- manedit-0.7.1/manedit/fb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/fb.c	2006-11-12 02:17:31.000000000 +0900
@@ -1458,7 +1458,7 @@
 			selection_data,
 			GDK_SELECTION_TYPE_STRING,
 			8,	/* 8 bits per character */
-			buf, buf_len
+			(guchar *)buf, buf_len
 		    );
 		    data_sent = TRUE;
 		    g_free(buf);
@@ -1475,7 +1475,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,		/* 8 bits per character */
-		s,
+		(guchar *)s,
 		STRLEN(s) + 1	/* Include the '\0' character */
 	    );
 	    data_sent = TRUE;
--- manedit-0.7.1/manedit/guiutils.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/guiutils.c	2006-11-12 02:17:31.000000000 +0900
@@ -979,7 +979,7 @@
 		    g_free(name);
 		}
 	    }
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	    sel_rtn->length = STRLEN(s);
 
 	    /* Change the return type to string */
@@ -1024,7 +1024,7 @@
 	    gchar *s = (gchar *)g_malloc(len + 1);
 	    memcpy(s, selection_data->data, len);
 	    s[len] = '\0';
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	}
 }
 
@@ -3256,7 +3256,7 @@
 
 	/* Create bitmap */
 	bitmap = gdk_bitmap_create_from_data(
-	    window, xbm_data,
+	    window, (gchar *)xbm_data,
 	    width, height
 	);
 	g_free(xbm_data);	/* No longer needed */
--- manedit-0.7.1/manedit/main.c.warn	2006-11-12 02:17:31.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-11-12 02:21:38.000000000 +0900
@@ -3,6 +3,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #include "../include/disk.h"
 #include "../include/string.h"
 
--- manedit-0.7.1/manedit/maneditop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/maneditop.c	2006-11-12 02:29:24.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../include/disk.h"
 #include "../include/fio.h"
 #include "../include/string.h"
@@ -563,7 +565,11 @@
 		    item->full_path = STRDUP(PrefixPaths(
 			prog_tmp_path, "emergencyXXXXXX"
 		    ));
-		    mkstemp(item->full_path);
+		    if ((mkstemp(item->full_path)) == -1){
+		      fprintf(stderr, "Could not open %s\n",
+			      item->full_path);
+		      exit (1);
+		    }
 
 		    /* Save this branch */
 		    EditorFileSave(editor, branch);
--- manedit-0.7.1/manedit/mpfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/mpfio.c	2006-11-12 02:35:51.000000000 +0900
@@ -9,6 +9,8 @@
 #include 
 #endif
 
+#include 
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -286,7 +288,10 @@
 		return(NULL);
 	    }
 
-	    fread(buf, sizeof(char), buf_len, fp);
+	    if (!(fread(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fread failed\n");
+	      exit (1);
+	    }
 	    buf[buf_len] = '\0';
 
 	    FClose(fp);
@@ -462,7 +467,10 @@
             if(fp == NULL)
                 return;
 
-	    fwrite(buf, sizeof(char), buf_len, fp);
+	    if (!(fwrite(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fwrite failed\n");
+	      exit (1);
+	    }
 
             FClose(fp);
         }
--- manedit-0.7.1/manedit/prefop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/prefop.c	2006-11-12 02:56:13.000000000 +0900
@@ -75,6 +75,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
@@ -93,6 +94,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
--- manedit-0.7.1/manedit/viewerdnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerdnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -199,7 +199,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 
 	g_free(buf);
@@ -484,7 +484,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 
 		/* Load manual page into target viewer's view text */
--- manedit-0.7.1/manedit/viewerfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerfio.c	2006-11-12 02:40:38.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -174,11 +176,17 @@
 	stdout_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stdoutXXXXXX"
 	));
-	mkstemp(stdout_path);
+	if ((mkstemp(stdout_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stdout_path);
+	  exit (1);
+	}
 	stderr_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stderrXXXXXX"
 	));
-	mkstemp(stderr_path);
+	if ((mkstemp(stderr_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stderr_path);
+	  exit (1);
+	}
 
 	/* Delete prog_tmp_dir, it is no longer needed */
 	g_free(prog_tmp_dir);


Index: manedit.desktop
===================================================================
RCS file: manedit.desktop
diff -N manedit.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ manedit.desktop	13 Nov 2006 08:38:09 -0000	1.3
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=ManEdit
+Comment=UNIX Manual Page Editor
+Exec=manedit
+Icon=manedit
+Terminal=false
+Type=Application
+Categories=Application;Development;


Index: manedit.spec
===================================================================
RCS file: manedit.spec
diff -N manedit.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ manedit.spec	13 Nov 2006 08:38:09 -0000	1.14
@@ -0,0 +1,162 @@
+Name:           manedit
+Version:        0.7.1
+Release:        5%{?dist}
+Summary:        UNIX Manual Page Editor
+
+Group:          Development/Tools
+License:        GPL
+URL:            http://wolfpack.twu.net/ManEdit/
+Source0:        http://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
+Source1:        manedit.desktop
+Source2:        manview.desktop
+Patch0:         manedit-0.7.1-makefile.patch
+Patch1:         manedit-0.7.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
+BuildRequires:  gtk+-devel
+BuildRequires:  zlib-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  desktop-file-utils
+Requires:       man
+
+%description
+ManEdit is a UNIX manual page editor and viewer, 
+it is designed specifically for the editing of the 
+UNIX manual page format using an integrated XML interface.
+
+NOTE: This is a gtk+ package and some characters,
+especially UTF-8 characters will be garbled.
+
+%prep
+%setup -q
+
+# Base Makefile on FreeBSD style
+%{__cp} -p ./manedit/Makefile.FreeBSD ./manedit/Makefile
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .section
+%patch2 -p1 -b .manbase
+%patch3 -p1 -b .warn
+
+%build
+# I cannot understand this configure!!
+#%%configure
+
+pushd manedit
+%{__make} %{?_smp_mflags} \
+   OPTFLAGS="$RPM_OPT_FLAGS -DHAVE_GZIP -DHAVE_BZIP2" \
+   LDFLAGS="-lz -lbz2"
+%{__make} manedit.1.out ; %{__mv} -f manedit.1.out manedit.1
+popd
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+
+pushd manedit
+%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}
+%{__make} install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+# 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 \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %{SOURCE1}
+
+desktop-file-install \
+   --vendor fedora \
+   --remove-category Application \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   %{SOURCE2}
+
+# install icons
+# size 20 don't seems to be owned by hicolor-icon-theme
+for size in 16x16 48x48 ; do
+   %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/
+   for f in manedit mp_viewer ; do
+      %{__install} -c -p -m 644 images/${f}_${size}.xpm \
+         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/${f}.xpm
+   done
+done
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+
+popd
+
+%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 AUTHORS LICENSE README
+
+%{_bindir}/man*
+
+%{_datadir}/icons/hicolor/*/apps/*.xpm
+%{_datadir}/applications/fedora-*.desktop
+
+%{_datadir}/%{name}/
+%{_mandir}/man1/%{name}.1*
+
+%changelog
+* Sat Nov 11 2006 Mamoru Tasaka  - 0.7.1-5
+- Remove some warnings.
+
+* Thu Nov  2 2006 Mamoru Tasaka  - 0.7.1-4
+- Add a comment about gtk+ issue on %%description.
+
+* Tue Oct 31 2006 Mamoru Tasaka  - 0.7.1-3
+- Install manview desktop, related icons.
+- Change Requires.
+- Remove manwrap
+
+* Sun Oct 29 2006 Mamoru Tasaka  - 0.7.1-2
+- Improve Makefile and mandir treatments, patches from Patrice Dumas.
+- Make man page.
+- Correct install directory.
+
+* Sat Oct 28 2006 Mamoru Tasaka  - 0.7.1-1
+- Re-submit to Fedora Extras.
+
+* Thu Apr 14 2005 Michael Schwendt  - 0.5.11-5
+- Fix build for GCC4.
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
+* Wed Feb  9 2005 Michael Schwendt  - 0:0.5.11-3
+- Add patch for multilib and substitute hardcoded 'lib' in %%prep.
+- Add patch to disable stripping.
+
+* Wed Nov 17 2004 Michael Schwendt  - 0:0.5.11-2
+- BR bzip2-devel + patch to enable bzip2, bump release
+
+* Sat Oct 3 2004 Nils O. Sel??sdal  - 0:0.5.11-0.fdr.1
+- Update to 0.5.11
+
+* Thu Oct 2 2003 Nils O. Sel??sdal  - 0:0.5.10-0.fdr.2
+- Put .desktop in its own file
+- Save .spec file as utf-8
+- use mainstream tar.bz2 instead of tgz
+
+* Wed Aug 27 2003 Nils O. Sel??sdal  - 0:0.5.10-0.fdr.1
+- Initial RPM for Fedora


--- NEW FILE manview.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=ManView
Comment=UNIX Manual Page Viewer
Exec=manview
Icon=mp_viewer
Terminal=false
Type=Application
Categories=Application;Graphics;


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	13 Nov 2006 08:38:09 -0000	1.5
@@ -0,0 +1 @@
+229586101245eb61018ff031c2efb247  manedit-0.7.1.tar.bz2


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 09:10:58 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 02:10:58 -0700
Subject: rpms/manedit/FC-5 manedit-0.7.1-allow-more_section.patch, NONE,
	1.1 manedit-0.7.1-makefile.patch, NONE,
	1.1 manedit-0.7.1-manbase.patch, NONE,
	1.1 manedit-0.7.1-remove-some-warning.patch, NONE,
	1.1 manview.desktop, NONE, 1.1 .cvsignore, 1.3,
	1.4 manedit.desktop, 1.1, 1.2 manedit.spec, 1.12, 1.13 sources,
	1.3, 1.4 manedit-0.5.11-bzip2.patch, 1.1,
	NONE manedit-0.5.11-gcc4.patch, 1.1,
	NONE manedit-0.5.11-multilib.patch, 1.1,
	NONE manedit-0.5.11-nostrip.patch, 1.1, NONE
Message-ID: <200611130910.kAD9Awnn032484@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/manedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32447

Modified Files:
	.cvsignore manedit.desktop manedit.spec sources 
Added Files:
	manedit-0.7.1-allow-more_section.patch 
	manedit-0.7.1-makefile.patch manedit-0.7.1-manbase.patch 
	manedit-0.7.1-remove-some-warning.patch manview.desktop 
Removed Files:
	manedit-0.5.11-bzip2.patch manedit-0.5.11-gcc4.patch 
	manedit-0.5.11-multilib.patch manedit-0.5.11-nostrip.patch 
Log Message:
* Sat Nov 11 2006 Mamoru Tasaka  - 0.7.1-5
- Remove some warnings.


manedit-0.7.1-allow-more_section.patch:

--- NEW FILE manedit-0.7.1-allow-more_section.patch ---
--- manedit-0.7.1/manedit/main.c.section	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-10-28 15:21:31.000000000 +0900
@@ -553,7 +553,9 @@
 
 	    FileBrowserTypeListNew(
 		list, total,
-		".1 .2 .3 .4 .5 .6 .bz2 .gz",
+		".1 .2 .3 .4 .5 .6 .7 .8 "
+		".1x .2x .3x .4x .5x .6x .7x .8x "
+		".bz2 .gz",
 		"Manual page"
 	    );
 	    FileBrowserTypeListNew(

manedit-0.7.1-makefile.patch:

--- NEW FILE manedit-0.7.1-makefile.patch ---
--- manedit-0.7.1/manedit/Makefile.install.FreeBSD.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile.install.FreeBSD	2006-10-30 16:52:26.000000000 +0900
@@ -11,7 +11,7 @@
 #	PREFIX
 #
 
-INSTALL      = install -o root -g wheel
+INSTALL      = install -c -p
 INSTBINFLAGS = -m 0755
 INSTMANFLAGS = -m 0444
 INSTDATFLAGS = -m 0644
@@ -22,14 +22,14 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-MAN          = $(BIN).1.bz2
+MAN          = $(BIN).1
 ICON         = $(BIN).xpm
 MANVIEW_ICON = manview.xpm
 
 BIN_DIR   = $(PREFIX)/bin
-ICONS_DIR = $(PREFIX)/share/$(BIN)/icons
+ICONS_DIR = $(PREFIX)/share/pixmaps
 DATA_DIR  = $(PREFIX)/share/$(BIN)
-MAN_DIR   = $(PREFIX)/man/man1
+MAN_DIR   = $(PREFIX)/share/man/man1
 
 install:
 	$(INSTALL) -d $(INSTBINFLAGS) $(BIN_DIR)
--- manedit-0.7.1/manedit/Makefile.fedora	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/Makefile	2006-10-30 16:46:52.000000000 +0900
@@ -19,8 +19,9 @@
 #   absolutly sure that requires modification.
 #
 PREFIX ?= /usr
-LOCALBASE ?= /usr/local
-X11BASE ?= /usr/X11R6
+LOCALBASE ?= /usr/local/share
+X11BASE ?= /usr/share
+MANBASE ?= /usr/share
 
 
 # ########################################################################
@@ -54,10 +55,9 @@
 GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
 CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
           -DPREFIX=\"$(PREFIX)\" \
-          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
-
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+          -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" -DMANBASE=\"$(MANBASE)\"
 
+CPPFLAGS = 
 
 # ########################################################################
 # Dependant Libraries:
@@ -91,6 +91,10 @@
 #
 INC =
 
+####################################################################
+
+CFLAGS += $(OPTFLAGS)
+LIB += $(LDFLAGS)
 
 # ########################################################################
 # Program Source and Header Files:
@@ -116,7 +120,7 @@
 # Build Rules:
 #
 $(BIN): $(OBJ_C) $(OBJ_CPP)
-	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
+	$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
 
 all: $(BIN) $(BIN).1.out
 
@@ -138,8 +142,8 @@
 # Manual Page Build/Subs Rule:
 #
 $(BIN).1.out: $(BIN).1
-	$(SED) 's|%%PREFIX%%|$(PREFIX)|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
+	$(SED)  -e 's|%%PREFIX%%|$(PREFIX)|g'  \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|%%X11BASE%%|${X11BASE}|g' $(BIN).1 > $(BIN).1.out
 
 # ########################################################################

manedit-0.7.1-manbase.patch:

--- NEW FILE manedit-0.7.1-manbase.patch ---
--- manedit-0.7.1/manedit/pref.c.manbase	2006-08-26 05:00:00.000000000 +0200
+++ manedit-0.7.1/manedit/pref.c	2006-10-31 10:25:44.000000000 +0100
@@ -1708,24 +1708,16 @@
 #if defined(__FreeBSD__)
 	    text[0] = "/usr/share/man";
 #else
-	    text[0] = "/usr/man";
+	    text[0] = MANBASE"/man";
 #endif
 	    text[1] = "Global";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = LOCALBASE "/man";
-#else
-	    text[0] = "/usr/local/man";
-#endif
 	    text[1] = "Local";
 	    gtk_clist_append(GTK_CLIST(w), text);
 
-#if defined(__FreeBSD__)
 	    text[0] = X11BASE"/man";
-#else
-	    text[0] = "/usr/X11R6/man";
-#endif
 	    text[1] = "X Window Systems";
 	    gtk_clist_append(GTK_CLIST(w), text);
 	}

manedit-0.7.1-remove-some-warning.patch:

--- NEW FILE manedit-0.7.1-remove-some-warning.patch ---
--- manedit-0.7.1/manedit/clipboard.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/clipboard.c	2006-11-12 02:17:31.000000000 +0900
@@ -2166,7 +2166,7 @@
 		);
 		if(tmp_text != NULL)
 		{
-		    strncpy(tmp_text, cb->data, cb->data_length);
+		    strncpy(tmp_text, (gchar *)cb->data, cb->data_length);
 		    tmp_text[cb->data_length] = '\0';
 
 		    w = gtk_label_new(tmp_text);
--- manedit-0.7.1/manedit/editor.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editor.c	2006-11-12 02:20:09.000000000 +0900
@@ -69,6 +69,7 @@
 #include "images/icon_replace_20x20.xpm"
 #include "images/icon_replace_all_20x20.xpm"
 
+#include 
 
 editor_item_struct *EditorItemNew(
 	editor_item_type type,
--- manedit-0.7.1/manedit/editorcb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorcb.c	2006-11-12 02:17:31.000000000 +0900
@@ -2856,7 +2856,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,		/* Foreground color */
 			NULL,		/* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2885,7 +2885,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2962,7 +2962,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
@@ -2992,7 +2992,7 @@
 			(style != NULL) ? style->font : NULL,
 			NULL,           /* Foreground color */
 			NULL,           /* Background color */
-			buf,
+			(gchar *)buf,
 			buf_len
 		    );
 		    gtk_text_thaw(GTK_TEXT(w));
--- manedit-0.7.1/manedit/editordnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editordnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -965,7 +965,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 	data_sent = TRUE;
 
@@ -981,7 +981,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,      /* 8 bits per character */
-		s, strlen(s)
+		(guchar *)s, strlen(s)
 	    );
 	    data_sent = TRUE;
 	}
@@ -1367,7 +1367,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 		EditorFileLoad(editor, path, editor->selected_branch, FALSE);
 		g_free(path);
--- manedit-0.7.1/manedit/editorop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/editorop.c	2006-11-12 02:26:43.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 		/* For unlink() */
 
+#include 
+
 #include "../include/string.h"
 #include "../include/strexp.h"
 #include "../include/disk.h"
@@ -1143,7 +1145,10 @@
 	tmp_path = g_strdup(PrefixPaths(
 	    prog_tmp_path, "previewXXXXXX"
 	));
-	mkstemp(tmp_path);
+	if ((mkstemp(tmp_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", tmp_path);
+	  exit (1);
+	}
 
 	/* Here we play a trick, first record the full path name
 	 * on the item data and replace it with our tempory file path
--- manedit-0.7.1/manedit/fb.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/fb.c	2006-11-12 02:17:31.000000000 +0900
@@ -1458,7 +1458,7 @@
 			selection_data,
 			GDK_SELECTION_TYPE_STRING,
 			8,	/* 8 bits per character */
-			buf, buf_len
+			(guchar *)buf, buf_len
 		    );
 		    data_sent = TRUE;
 		    g_free(buf);
@@ -1475,7 +1475,7 @@
 		selection_data,
 		GDK_SELECTION_TYPE_STRING,
 		8,		/* 8 bits per character */
-		s,
+		(guchar *)s,
 		STRLEN(s) + 1	/* Include the '\0' character */
 	    );
 	    data_sent = TRUE;
--- manedit-0.7.1/manedit/guiutils.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/guiutils.c	2006-11-12 02:17:31.000000000 +0900
@@ -979,7 +979,7 @@
 		    g_free(name);
 		}
 	    }
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	    sel_rtn->length = STRLEN(s);
 
 	    /* Change the return type to string */
@@ -1024,7 +1024,7 @@
 	    gchar *s = (gchar *)g_malloc(len + 1);
 	    memcpy(s, selection_data->data, len);
 	    s[len] = '\0';
-	    sel_rtn->data = s;
+	    sel_rtn->data = (guchar *)s;
 	}
 }
 
@@ -3256,7 +3256,7 @@
 
 	/* Create bitmap */
 	bitmap = gdk_bitmap_create_from_data(
-	    window, xbm_data,
+	    window, (gchar *)xbm_data,
 	    width, height
 	);
 	g_free(xbm_data);	/* No longer needed */
--- manedit-0.7.1/manedit/main.c.warn	2006-11-12 02:17:31.000000000 +0900
+++ manedit-0.7.1/manedit/main.c	2006-11-12 02:21:38.000000000 +0900
@@ -3,6 +3,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #include "../include/disk.h"
 #include "../include/string.h"
 
--- manedit-0.7.1/manedit/maneditop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/maneditop.c	2006-11-12 02:29:24.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../include/disk.h"
 #include "../include/fio.h"
 #include "../include/string.h"
@@ -563,7 +565,11 @@
 		    item->full_path = STRDUP(PrefixPaths(
 			prog_tmp_path, "emergencyXXXXXX"
 		    ));
-		    mkstemp(item->full_path);
+		    if ((mkstemp(item->full_path)) == -1){
+		      fprintf(stderr, "Could not open %s\n",
+			      item->full_path);
+		      exit (1);
+		    }
 
 		    /* Save this branch */
 		    EditorFileSave(editor, branch);
--- manedit-0.7.1/manedit/mpfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/mpfio.c	2006-11-12 02:35:51.000000000 +0900
@@ -9,6 +9,8 @@
 #include 
 #endif
 
+#include 
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -286,7 +288,10 @@
 		return(NULL);
 	    }
 
-	    fread(buf, sizeof(char), buf_len, fp);
+	    if (!(fread(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fread failed\n");
+	      exit (1);
+	    }
 	    buf[buf_len] = '\0';
 
 	    FClose(fp);
@@ -462,7 +467,10 @@
             if(fp == NULL)
                 return;
 
-	    fwrite(buf, sizeof(char), buf_len, fp);
+	    if (!(fwrite(buf, sizeof(char), buf_len, fp))){
+	      fprintf(stderr, "fwrite failed\n");
+	      exit (1);
+	    }
 
             FClose(fp);
         }
--- manedit-0.7.1/manedit/prefop.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/prefop.c	2006-11-12 02:56:13.000000000 +0900
@@ -75,6 +75,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
@@ -93,6 +94,7 @@
 							\
  colormap = gdk_window_get_colormap(w->window);		\
 							\
+ gdk_color.pixel = 0;	\
  gdk_color.red = (guint16)(color_ptr->r * 65535.0);	\
  gdk_color.green = (guint16)(color_ptr->g * 65535.0);	\
  gdk_color.blue = (guint16)(color_ptr->b * 65535.0);	\
--- manedit-0.7.1/manedit/viewerdnd.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerdnd.c	2006-11-12 02:17:31.000000000 +0900
@@ -199,7 +199,7 @@
 	    selection_data,
 	    GDK_SELECTION_TYPE_STRING,
 	    8,			/* 8 bits per character */
-	    buf, strlen(buf)
+	    (guchar *)buf, strlen(buf)
 	);
 
 	g_free(buf);
@@ -484,7 +484,7 @@
 	    )
 	    {
 		gchar *path = EditorDNDParseURL(
-		    selection_data->data, selection_data->length
+		    (gchar *)selection_data->data, selection_data->length
 		);
 
 		/* Load manual page into target viewer's view text */
--- manedit-0.7.1/manedit/viewerfio.c.warn	2006-08-26 12:00:00.000000000 +0900
+++ manedit-0.7.1/manedit/viewerfio.c	2006-11-12 02:40:38.000000000 +0900
@@ -4,6 +4,8 @@
 #include 
 #include 
 
+#include 
+
 #include "../include/fio.h"
 #include "../include/disk.h"
 #include "../include/string.h"
@@ -174,11 +176,17 @@
 	stdout_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stdoutXXXXXX"
 	));
-	mkstemp(stdout_path);
+	if ((mkstemp(stdout_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stdout_path);
+	  exit (1);
+	}
 	stderr_path = STRDUP(PrefixPaths(
 	    prog_tmp_dir, "preview_stderrXXXXXX"
 	));
-	mkstemp(stderr_path);
+	if ((mkstemp(stderr_path)) == -1){
+	  fprintf(stderr, "Could not open %s\n", stderr_path);
+	  exit (1);
+	}
 
 	/* Delete prog_tmp_dir, it is no longer needed */
 	g_free(prog_tmp_dir);


--- NEW FILE manview.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=ManView
Comment=UNIX Manual Page Viewer
Exec=manview
Icon=mp_viewer
Terminal=false
Type=Application
Categories=Application;Graphics;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:51:28 -0000	1.3
+++ .cvsignore	13 Nov 2006 09:10:27 -0000	1.4
@@ -1 +1 @@
-manedit-0.5.11.tar.bz2
+manedit-0.7.1.tar.bz2


Index: manedit.desktop
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/manedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manedit.desktop	8 Nov 2004 04:50:55 -0000	1.1
+++ manedit.desktop	13 Nov 2006 09:10:27 -0000	1.2
@@ -1,7 +1,10 @@
 [Desktop Entry]
-Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=ManEdit
+Comment=UNIX Manual Page Editor
 Exec=manedit
-Icon=/usr/share/icons/manedit.xpm
-Name=Manpage Editor
-Terminal=0
-Comment=GUI editor for creating man pages.
+Icon=manedit
+Terminal=false
+Type=Application
+Categories=Application;Development;


Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/manedit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- manedit.spec	2 Mar 2006 21:30:45 -0000	1.12
+++ manedit.spec	13 Nov 2006 09:10:27 -0000	1.13
@@ -1,79 +1,142 @@
 Name:           manedit
-Version:        0.5.11
-Release:        5
-Summary:        GUI editor for creating man pages
+Version:        0.7.1
+Release:        5%{?dist}
+Summary:        UNIX Manual Page Editor
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://wolfpack.twu.net/ManEdit/
-Source0:        ftp://wolfpack.twu.net/users/wolfpack/manedit-0.5.11.tar.bz2
+Source0:        http://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
 Source1:        manedit.desktop
-Patch:          manedit-0.5.11-bzip2.patch
-Patch1:         manedit-0.5.11-nostrip.patch
-Patch2:         manedit-0.5.11-multilib.patch
-Patch3:         manedit-0.5.11-gcc4.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source2:        manview.desktop
+Patch0:         manedit-0.7.1-makefile.patch
+Patch1:         manedit-0.7.1-allow-more_section.patch
+Patch2:         manedit-0.7.1-manbase.patch
+Patch3:         manedit-0.7.1-remove-some-warning.patch
 
-BuildRequires:  gtk+-devel zlib-devel desktop-file-utils bzip2-devel
-Requires:       groff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# This is gtk+ package
+BuildRequires:  gtk+-devel
+BuildRequires:  zlib-devel
+BuildRequires:  bzip2-devel
+BuildRequires:  desktop-file-utils
+Requires:       man
 
 %description
-ManEdit is a UNIX Manual Page Integrated Development Environment.
-It has full UNIX manual page editing capabilities using an XML
-interface with instant preview. ManEdit uses the GTK+ widget set
-and requires the X Window Systems.
-
-%prep
-cat< - 0.7.1-5
+- Remove some warnings.
+
+* Thu Nov  2 2006 Mamoru Tasaka  - 0.7.1-4
+- Add a comment about gtk+ issue on %%description.
+
+* Tue Oct 31 2006 Mamoru Tasaka  - 0.7.1-3
+- Install manview desktop, related icons.
+- Change Requires.
+- Remove manwrap
+
+* Sun Oct 29 2006 Mamoru Tasaka  - 0.7.1-2
+- Improve Makefile and mandir treatments, patches from Patrice Dumas.
+- Make man page.
+- Correct install directory.
+
+* Sat Oct 28 2006 Mamoru Tasaka  - 0.7.1-1
+- Re-submit to Fedora Extras.
+
 * Thu Apr 14 2005 Michael Schwendt  - 0.5.11-5
 - Fix build for GCC4.
 
@@ -97,4 +160,3 @@
 
 * Wed Aug 27 2003 Nils O. Sel??sdal  - 0:0.5.10-0.fdr.1
 - Initial RPM for Fedora
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manedit/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:51:28 -0000	1.3
+++ sources	13 Nov 2006 09:10:27 -0000	1.4
@@ -1 +1 @@
-0059e183650cf7bae18dd1de4fff1352  manedit-0.5.11.tar.bz2
+229586101245eb61018ff031c2efb247  manedit-0.7.1.tar.bz2


--- manedit-0.5.11-bzip2.patch DELETED ---


--- manedit-0.5.11-gcc4.patch DELETED ---


--- manedit-0.5.11-multilib.patch DELETED ---


--- manedit-0.5.11-nostrip.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 09:15:36 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 02:15:36 -0700
Subject: owners owners.list,1.1940,1.1941
Message-ID: <200611130915.kAD9FaOm032557@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32539

Modified Files:
	owners.list 
Log Message:
manedit is unorphaned.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1940
retrieving revision 1.1941
diff -u -r1.1940 -r1.1941
--- owners.list	13 Nov 2006 07:28:17 -0000	1.1940
+++ owners.list	13 Nov 2006 09:15:06 -0000	1.1941
@@ -1040,7 +1040,7 @@
 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|
 Fedora Extras|manaworld-music|Music files for manaworld|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|manedit|GUI editor for creating man pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|manedit|UNIX Manual Page Editor|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|mantis|A web-based bugtracking system|giallu at gmail.com|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 09:18:59 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 02:18:59 -0700
Subject: comps comps-fe5.xml.in, 1.197, 1.198 comps-fe6.xml.in, 1.221,
	1.222 comps-fe7.xml.in, 1.20, 1.21
Message-ID: <200611130918.kAD9Ixjv032603@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32582

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add manedit


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- comps-fe5.xml.in	12 Nov 2006 18:38:19 -0000	1.197
+++ comps-fe5.xml.in	13 Nov 2006 09:18:29 -0000	1.198
@@ -137,6 +137,7 @@
       lightning
       lua
       mach
+      manedit
       mcrypt
       meld
       mercurial


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- comps-fe6.xml.in	12 Nov 2006 18:38:19 -0000	1.221
+++ comps-fe6.xml.in	13 Nov 2006 09:18:29 -0000	1.222
@@ -163,6 +163,7 @@
       lightning
       lua
       mach
+      manedit
       mcrypt
       meld
       mercurial


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- comps-fe7.xml.in	12 Nov 2006 18:38:19 -0000	1.20
+++ comps-fe7.xml.in	13 Nov 2006 09:18:29 -0000	1.21
@@ -163,6 +163,7 @@
       lightning
       lua
       mach
+      manedit
       mcrypt
       meld
       mercurial



From fedora-extras-commits at redhat.com  Mon Nov 13 10:17:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Nov 2006 03:17:22 -0700
Subject: rpms/fillets-ng-data/devel fillets-ng-data-0.7.1-pairs.patch, NONE, 
	1.1 fillets-ng-data.spec, 1.4, 1.5
Message-ID: <200611131017.kADAHMOM003428@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/fillets-ng-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3409

Modified Files:
	fillets-ng-data.spec 
Added Files:
	fillets-ng-data-0.7.1-pairs.patch 
Log Message:
Add pairs patch for lua 5.1 compatilibity (#212920, Ivo Danihelka).


fillets-ng-data-0.7.1-pairs.patch:

--- NEW FILE fillets-ng-data-0.7.1-pairs.patch ---
Index: columns/code.lua
===================================================================
RCS file: /cvsroot/fillets/fillets_data/script/columns/code.lua,v
retrieving revision 1.1
diff -u -r1.1 code.lua
--- columns/code.lua	4 Jul 2004 15:03:14 -0000	1.1
+++ columns/code.lua	31 Oct 2006 18:45:49 -0000
@@ -203,7 +203,7 @@
                     rada1beg.faze = 0
                 end,
             }
-            for index, advice in advices1 do
+            for index, advice in pairs(advices1) do
                 advice:updateAnim()
             end
         end
@@ -312,7 +312,7 @@
                     rada2beg.faze = 0
                 end,
             }
-            for index, advice in advices2 do
+            for index, advice in pairs(advices2) do
                 advice:updateAnim()
             end
         end
Index: gems/code.lua
===================================================================
RCS file: /cvsroot/fillets/fillets_data/script/gems/code.lua,v
retrieving revision 1.2
diff -u -r1.2 code.lua
--- gems/code.lua	18 Aug 2004 14:50:46 -0000	1.2
+++ gems/code.lua	31 Oct 2006 18:45:50 -0000
@@ -85,7 +85,7 @@
         end
 
         return function()
-            for key, gem in gems do
+            for key, gem in pairs(gems) do
                 gem.glob = gem.glob + 1
                 if isIn(gem.glob, {1, 2, 3}) then
                     gem.afaze = gem.afaze + 1
Index: share/Pickle.lua
===================================================================
RCS file: /cvsroot/fillets/fillets_data/script/share/Pickle.lua,v
retrieving revision 1.1
diff -u -r1.1 Pickle.lua
--- share/Pickle.lua	26 Jun 2004 00:22:12 -0000	1.1
+++ share/Pickle.lua	31 Oct 2006 18:45:50 -0000
@@ -78,7 +78,7 @@
   end
   for tnum = 1, table.getn(tables) do
     local t = tables[tnum]
-    local tcopy = {}; for i, v in t do tcopy[i] = v end
+    local tcopy = {}; for i, v in pairs(t) do tcopy[i] = v end
     for i, v in pairs(tcopy) do
       local ni, nv
       if type(i) == "table" then ni = tables[i[1]] else ni = i end


Index: fillets-ng-data.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/fillets-ng-data.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fillets-ng-data.spec	15 Sep 2006 08:48:18 -0000	1.4
+++ fillets-ng-data.spec	13 Nov 2006 10:16:52 -0000	1.5
@@ -1,11 +1,12 @@
 Summary: Game data files for Fish Fillets Next Generation
 Name: fillets-ng-data
 Version: 0.7.1
-Release: 1
+Release: 2
 License: GPL
 Group: Amusements/Games
 URL: http://fillets.sourceforge.net/
 Source: http://dl.sf.net/fillets/fillets-ng-data-%{version}.tar.gz
+Patch0: fillets-ng-data-0.7.1-pairs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: fillets-ng >= 0.6.0
 Obsoletes: fillets-ng-data-cs <= 0.6.0
@@ -24,6 +25,9 @@
 
 %prep
 %setup -q
+cd script
+%patch0 -p0
+cd ..
 
 
 %build
@@ -48,6 +52,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  0.7.1-2
+- Add pairs patch for lua 5.1 compatilibity (#212920, Ivo Danihelka).
+
 * Mon Aug 28 2006 Matthias Saou  0.7.1-1
 - Minor spec file changes.
 



From fedora-extras-commits at redhat.com  Mon Nov 13 11:16:40 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 13 Nov 2006 04:16:40 -0700
Subject: fedora-security/audit fc5,1.388,1.389 fc6,1.140,1.141
Message-ID: <200611131116.kADBGeJl007100@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7080

Modified Files:
	fc5 fc6 
Log Message:
Weekend updates; except for kde, python, kernel.  Time to clear those :)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- fc5	10 Nov 2006 21:21:33 -0000	1.388
+++ fc5	13 Nov 2006 11:16:37 -0000	1.389
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20061109
-Up to date FC5 as of 20061109
+Up to date CVE as of CVE email 20061112
+Up to date FC5 as of 20061112
 
 ** are items that need attention
 
@@ -11,7 +11,7 @@
 CVE-2006-5748 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5747 version (firefox) [since FEDORA-2006-1199]
-CVE-2006-5706 ** php, fixed 5.2.0
+CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
@@ -61,7 +61,6 @@
 CVE-2006-4813 version (kernel, fixed 2.6.13)
 CVE-2006-4812 backport (php) [since FEDORA-2006-1024] **
 CVE-2006-4811 version (qt, fixed 3.3.7) #211342 [since FEDORA-2006-1056]
-CVE-2006-4810 ** texinfo
 CVE-2006-4810 backport (texinfo) [since FEDORA-2006-1202]
 CVE-2006-4805 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4790 backport (gnutls, fixed 1.4.4) [since FEDORA-2006-974]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- fc6	10 Nov 2006 21:21:33 -0000	1.140
+++ fc6	13 Nov 2006 11:16:37 -0000	1.141
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20061109
-Up to date FC6 as of 20061109
+Up to date CVE as of CVE email 20061112
+Up to date FC6 as of 20061112
 
 ** are items that need attention
 
@@ -11,7 +11,7 @@
 CVE-2006-5748 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5747 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5747 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
-CVE-2006-5706 ** php, fixed 5.2.0
+CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
 CVE-2006-5701 ** kernel
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)



From fedora-extras-commits at redhat.com  Mon Nov 13 12:45:54 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 05:45:54 -0700
Subject: rpms/ochusha/devel .cvsignore, 1.4, 1.5 ochusha.spec, 1.4,
	1.5 sources, 
	1.4, 1.5 ochusha-0.5.99.63.2-call-g_thread_init-once.patch, 1.1,
	NONE ochusha-0.5.99.63.3-fix-ppc-typo.patch, 1.1, NONE
Message-ID: <200611131245.kADCjsxi010519@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10496

Modified Files:
	.cvsignore ochusha.spec sources 
Removed Files:
	ochusha-0.5.99.63.2-call-g_thread_init-once.patch 
	ochusha-0.5.99.63.3-fix-ppc-typo.patch 
Log Message:
* Mon Nov 13 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061113
- Update to 0.5.99.63.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2006 05:12:44 -0000	1.4
+++ .cvsignore	13 Nov 2006 12:45:24 -0000	1.5
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061112.tar.bz2
+ochusha-0.5.99.63.3-cvs061113.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ochusha.spec	12 Nov 2006 05:30:16 -0000	1.4
+++ ochusha.spec	13 Nov 2006 12:45:24 -0000	1.5
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.3
-%define              strtag          cvs061112
+%define              strtag          cvs061113
 
 %define              vendor_rel      2
 %define              pre_release     1
@@ -23,8 +23,6 @@
 %else
 Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
 %endif
-Patch0:              ochusha-0.5.99.63.2-call-g_thread_init-once.patch
-Patch1:              ochusha-0.5.99.63.3-fix-ppc-typo.patch
 License:             BSD
 Group:               Applications/Internet
 BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -55,9 +53,6 @@
 %setup -q
 %endif
 
-%patch0 -p1 -b .g_thread_init
-%patch1 -p1 -b .ppc_typo
-
 # change desktop entry to use png file in 
 # %{icondir}
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
@@ -159,7 +154,7 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sun Nov 12 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061112
+* Mon Nov 13 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061113
 - Update to 0.5.99.63.3
 
 * Fri Nov 03 2006  0.5.99.62-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2006 05:12:44 -0000	1.4
+++ sources	13 Nov 2006 12:45:24 -0000	1.5
@@ -1 +1 @@
-7fd7b7e7fe1ff5911a5b536ab557d573  ochusha-0.5.99.63.3-cvs061112.tar.bz2
+5ca01bb450e98685c2f979f144e0d8d1  ochusha-0.5.99.63.3-cvs061113.tar.bz2


--- ochusha-0.5.99.63.2-call-g_thread_init-once.patch DELETED ---


--- ochusha-0.5.99.63.3-fix-ppc-typo.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 12:58:54 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 13 Nov 2006 05:58:54 -0700
Subject: rpms/jd/devel .cvsignore, 1.15, 1.16 jd.spec, 1.22, 1.23 sources,
	1.15, 1.16
Message-ID: <200611131258.kADCws8N010668@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10648

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Nov 13 2006 Mamoru Tasaka  - 1.8.0-0.6.cvs061112
- cvs 061112 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	8 Nov 2006 15:22:39 -0000	1.15
+++ .cvsignore	13 Nov 2006 12:58:24 -0000	1.16
@@ -1 +1 @@
-jd-1.8.0-rc061108.tgz
+jd-1.8.0-cvs061112.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jd.spec	8 Nov 2006 15:24:26 -0000	1.22
+++ jd.spec	13 Nov 2006 12:58:24 -0000	1.23
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        rc061108
+%define         strtag        cvs061112
 %define         repoid        22637
 
 
 # Defined by vendor
 #
-%define         vendor_rel    5
+%define         vendor_rel    6
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -43,8 +43,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Mon Nov 13 2006 Mamoru Tasaka  - 1.8.0-0.6.cvs061112
+- cvs 061112 (23:59 JST)
+
 * Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
 - 1.8.0 rc 061108
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	8 Nov 2006 15:22:39 -0000	1.15
+++ sources	13 Nov 2006 12:58:24 -0000	1.16
@@ -1 +1 @@
-1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz
+6fbae78257a68148a160b508b8f80d7a  jd-1.8.0-cvs061112.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 14:45:27 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:45:27 -0700
Subject: rpms/aumix - New directory
Message-ID: <200611131445.kADEjR8i017380@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17376/aumix

Log Message:
Directory /cvs/extras/rpms/aumix added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 14:45:33 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:45:33 -0700
Subject: rpms/aumix/devel - New directory
Message-ID: <200611131445.kADEjXEx017395@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17376/aumix/devel

Log Message:
Directory /cvs/extras/rpms/aumix/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 14:45:47 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:45:47 -0700
Subject: rpms/aumix Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131445.kADEjlkv017429@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17423

Added Files:
	Makefile import.log 
Log Message:
Setup of module aumix


--- NEW FILE Makefile ---
# Top level Makefile for module aumix
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  Mon Nov 13 14:45:53 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:45:53 -0700
Subject: rpms/aumix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611131445.kADEjral017446@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17423/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aumix


--- 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 Nov 13 14:47:02 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:47:02 -0700
Subject: rpms/aumix import.log,1.1,1.2
Message-ID: <200611131447.kADEl2Us017560@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512

Modified Files:
	import.log 
Log Message:
auto-import aumix-2.8-1 on branch devel from aumix-2.8-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/aumix/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 14:45:47 -0000	1.1
+++ import.log	13 Nov 2006 14:46:32 -0000	1.2
@@ -0,0 +1 @@
+aumix-2_8-1:HEAD:aumix-2.8-1.src.rpm:1163429187



From fedora-extras-commits at redhat.com  Mon Nov 13 14:47:03 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:47:03 -0700
Subject: rpms/aumix/devel aumix-2.8-bug-115869.patch, NONE,
	1.1 aumix-2.8-include-signal_h.patch, NONE,
	1.1 aumix-2.8-save_load.patch, NONE,
	1.1 aumix-fix-crackrock.patch, NONE,
	1.1 aumix-fix-cursor-color-on-exit.patch, NONE, 1.1 aumix.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611131447.kADEl3W2017564@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aumix-2.8-bug-115869.patch aumix-2.8-include-signal_h.patch 
	aumix-2.8-save_load.patch aumix-fix-crackrock.patch 
	aumix-fix-cursor-color-on-exit.patch aumix.spec 
Log Message:
auto-import aumix-2.8-1 on branch devel from aumix-2.8-1.src.rpm

aumix-2.8-bug-115869.patch:

--- NEW FILE aumix-2.8-bug-115869.patch ---
Patch by mharris to fix bug:

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=115869

--- src/mute.bug-115869	Thu Dec 23 11:56:42 2004
+++ src/mute	Thu Dec 23 11:56:55 2004
@@ -8,7 +8,8 @@
 volumes=$(aumix -vq |tr -d ,)
 if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
 	$(echo $volumes | awk '{print $3}') -ne 0 ]; then
-	aumix -S -v 0
+	aumix -S
+	aumix -v 0
 else
 	aumix -L > /dev/null
 fi

aumix-2.8-include-signal_h.patch:

--- NEW FILE aumix-2.8-include-signal_h.patch ---
--- src/common.h.include-signal_h	Sun May 18 01:40:04 2003
+++ src/common.h	Sun May 18 01:38:55 2003
@@ -37,6 +37,7 @@
 #include 		/* getenv() */
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

aumix-2.8-save_load.patch:

--- NEW FILE aumix-2.8-save_load.patch ---
--- aumix-2.7/src/common.c.save_load	Mon Jun 25 22:08:22 2001
+++ aumix-2.7/src/common.c	Mon Jun 25 22:16:30 2001
@@ -114,6 +114,7 @@
 int             main(int argc, char *argv[])
 {
 	int             optn, ii;
+	int		save = 0, load = 0;
 #ifdef HAVE_CURSES
 	int             setcolors = FALSE;
 #endif				/* HAVE_CURSES */
@@ -169,14 +170,10 @@
 				break;
 #endif				/* HAVE_CURSES */
 			case 'S':	/* Save to file. */
-				if (mixer_fd == -1)
-					ErrorExitWarn(InitializeMixer(device_filename), 'e');
-				ErrorExitWarn(SaveSettings(), 'e');
+				save = 1;
 				break;
 			case 'L':	/* Load from file. */
-				if (mixer_fd == -1)
-					ErrorExitWarn(InitializeMixer(device_filename), 'e');
-				ErrorExitWarn(LoadSettings(), 'e');
+				load = 1;
 				break;
 #if defined (HAVE_CURSES) || defined (HAVE_GTK)
 			case 'I':	/* User asked for interactive mode. */
@@ -192,6 +189,17 @@
 			}
 		}
 	}
+	if (save | load) {
+		if (mixer_fd == -1)
+			ErrorExitWarn(InitializeMixer(device_filename), 'e');
+		if (save)
+			ErrorExitWarn(SaveSettings(), 'e');
+		else
+			ErrorExitWarn(LoadSettings(), 'e');
+		close(mixer_fd);
+		exit(EXIT_SUCCESS);
+	}
+	
 #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
 /* Be interactive if no options were given. */
 	if (!interactive && argc <= 1)

aumix-fix-crackrock.patch:

--- NEW FILE aumix-fix-crackrock.patch ---
--- src/common.c.fix-crackrock	Thu Dec 23 12:48:25 2004
+++ src/common.c	Thu Dec 23 12:51:59 2004
@@ -19,6 +19,7 @@
  * Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include 
 #include "common.h"
 #ifdef HAVE_CURSES
 #include "curses.h"
@@ -612,17 +612,16 @@
 int             SetShowNoninter(int dev)
 {
 /* Change or display settings from the command line. */
-	char           *devstr, dest;
+	char           *devstr;
 	int             change = 0, tmp, left, right;
 	/* Increase or decrease levels, optionally by a number. */
 	if (!strncmp(optarg, "+", 1) || !strncmp(optarg, "-", 1)) {
 		ErrorExitWarn(ReadLevel(dev, &tmp), 'e');
 		right = tmp >> 8;	/* I'll take the high byte, */
 		left = tmp & 0xFF;	/* and you take the low byte. */
-		strncpy(&dest, (optarg + 1), 3);
-		change = 1;	/* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
-		if (atoi(&dest))
-			change = atoi(&dest);
+		change = (int) strtol(optarg, NULL, 10);
+		if (errno)
+			change = 1;	/* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
 		if (*optarg == '+') {	/* increase */
 			right += change;
 			left += change;

aumix-fix-cursor-color-on-exit.patch:

--- NEW FILE aumix-fix-cursor-color-on-exit.patch ---
michael at yohe.net - this fixes the blue cursor that appears on some terminals
as - CloseScreen() resets the color to default, but nothing ever gets printed
so the cursor was never updated.  Simply adding a carriage return does not
change the behavior, and will reset the cursor properly.

--- src/common.c	2002-11-25 10:07:08.000000000 -0600
+++ src/common.c	2002-11-25 10:06:50.000000000 -0600
@@ -251,6 +251,9 @@
 		close(mixer_fd);
 #if HAVE_CURSES
 		CloseScreen();
+		
+		/* simple carriage return to reset the cursor */
+		printf( "\n" );
 	}
 #endif				/* HAVE_CURSES */
 	exit(EXIT_SUCCESS);


--- NEW FILE aumix.spec ---
Name: aumix
Version: 2.8
Release: 1%{?dist}
Summary: Audio mixer based on ncurses
License: GPL
Group: Applications/Multimedia
URL: http://jpj.net/~trevor/aumix.html
Source0: http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.bz2
Patch0:  aumix-2.8-save_load.patch
Patch1:  aumix-2.8-include-signal_h.patch
Patch2:  aumix-fix-cursor-color-on-exit.patch
Patch3:  aumix-fix-crackrock.patch
Patch4:  aumix-2.8-bug-115869.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext ncurses-devel

%description
An audio mixer with a compact visual layout based on ncurses.

%prep
%setup -q
%patch0 -p1
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0

%build
%configure --without-gtk --without-gtk1
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall
%{__rm} -rf %{buildroot}/%{_bindir}/mute
%find_lang %{name}

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(-,root,root)
%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_bindir}/aumix
%{_bindir}/xaumix
%{_mandir}/man1/xaumix.*
%{_mandir}/man1/aumix.*
%{_datadir}/aumix

%changelog
* Wed Nov 08 2006 Gabriel L. Somlo  2.8-1
- initial Extras build based on latest Core CVS, including all their patches
- only building ncurses version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 14:45:53 -0000	1.1
+++ .cvsignore	13 Nov 2006 14:46:33 -0000	1.2
@@ -0,0 +1 @@
+aumix-2.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 14:45:53 -0000	1.1
+++ sources	13 Nov 2006 14:46:33 -0000	1.2
@@ -0,0 +1 @@
+dc3fc7209752207c23e7c94ab886b340  aumix-2.8.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 14:50:23 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 07:50:23 -0700
Subject: owners owners.list,1.1941,1.1942
Message-ID: <200611131450.kADEoNWa017659@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17640/owners

Modified Files:
	owners.list 
Log Message:
added aumix entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1941
retrieving revision 1.1942
diff -u -r1.1941 -r1.1942
--- owners.list	13 Nov 2006 09:15:06 -0000	1.1941
+++ owners.list	13 Nov 2006 14:49:52 -0000	1.1942
@@ -84,6 +84,7 @@
 Fedora Extras|atomix|Little mind game where you have to build molecules out of atoms lying around|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|audacious|A GTK2 based media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|aumix|Audio mixer based on ncurses|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|auriferous|Game inspired by the classic Loderunner|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|autobuild-applet|Panel applet for monitoring Test-AutoBuild server status|berrange at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|autogen|A tool to simplify handling large amounts of repeatitous text|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 15:09:26 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Nov 2006 08:09:26 -0700
Subject: rpms/torcs/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 torcs.spec, 
	1.12, 1.13 torcs-1.2.4-extraqualif.patch, 1.1,
	NONE torcs-1.2.4-track_cpp.patch, 1.1, NONE
Message-ID: <200611131509.kADF9QD2020873@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20835/FC-5

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	torcs-1.2.4-extraqualif.patch torcs-1.2.4-track_cpp.patch 
Log Message:
Backport 1.3.0 update from devel to FC-6 and FC-5 branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2005 07:49:42 -0000	1.5
+++ .cvsignore	13 Nov 2006 15:08:56 -0000	1.6
@@ -1,5 +1,5 @@
-TORCS-1.2.4-src-robots-base.tgz
-TORCS-1.2.4-src-robots-berniw.tgz
-TORCS-1.2.4-src-robots-bt.tgz
-TORCS-1.2.4-src-robots-olethros.tgz
-TORCS-1.2.4-src.tgz
+TORCS-1.3.0-src.tgz
+TORCS-1.3.0-src-robots-base.tgz
+TORCS-1.3.0-src-robots-berniw.tgz
+TORCS-1.3.0-src-robots-bt.tgz
+TORCS-1.3.0-src-robots-olethros.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2005 07:49:42 -0000	1.5
+++ sources	13 Nov 2006 15:08:56 -0000	1.6
@@ -1,5 +1,5 @@
-3afe0d23f1e637fe56efccd2b6e8a8f1  TORCS-1.2.4-src-robots-base.tgz
-40aed9595f91051e8468e8a19b65f809  TORCS-1.2.4-src-robots-berniw.tgz
-337eecc6e545aceda094d945e12c3023  TORCS-1.2.4-src-robots-bt.tgz
-13b1eeba1148ca57dc1d989fcb27d308  TORCS-1.2.4-src-robots-olethros.tgz
-f5b41bf29cb7b6160e5ead6e187380b6  TORCS-1.2.4-src.tgz
+915c89f9d3618d13dddd5bfb4d199539  TORCS-1.3.0-src.tgz
+da007d61447f38fbdbd22aec029cc26c  TORCS-1.3.0-src-robots-base.tgz
+abeb72ba3913ef0bde727fdaa9699eef  TORCS-1.3.0-src-robots-berniw.tgz
+ca8506aecc30bee308a5e198304b71b2  TORCS-1.3.0-src-robots-bt.tgz
+227d47687b821298fe6b2f147071e73f  TORCS-1.3.0-src-robots-olethros.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-5/torcs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- torcs.spec	10 Mar 2006 16:34:11 -0000	1.12
+++ torcs.spec	13 Nov 2006 15:08:56 -0000	1.13
@@ -2,8 +2,8 @@
 
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.2.4
-Release: 3%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -13,16 +13,15 @@
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
 Patch0: torcs-1.2.4-freealutfix.patch
-Patch1: torcs-1.2.4-track_cpp.patch
-Patch2: torcs-1.2.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
 BuildRequires: libpng-devel, libjpeg-devel, zlib-devel, openal-devel
 BuildRequires: desktop-file-utils
 # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
-%if %{!?fedora:5}%{?fedora} >= 5
-BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel, libXxf86vm-devel, libXrandr-devel, libXrender-devel
+%if %{!?fedora:6}%{?fedora} >= 5
+BuildRequires: libXext-devel, libXt-devel, libXi-devel, libXmu-devel
+BuildRequires: libXxf86vm-devel, libXrandr-devel, libXrender-devel
 %else
 BuildRequires: xorg-x11-devel
 %endif
@@ -36,7 +35,7 @@
 %package robots
 Summary: The Open Racing Car Simulator robots
 Group: Amusements/Games
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description robots
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -49,20 +48,19 @@
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
 %patch0 -p1 -b .freealutfix
-%patch1 -p0 -b .track_cpp
-%patch2 -p1 -b .extraqualif
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
 
 %build
-# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4)
+# Force locations with modular X (for FC5+ and non-Fedora)
+# Required (1.2.4, still in 1.3.0)
 %configure \
 %if %{!?fedora:5}%{?fedora} >= 5
     --x-includes=%{_includedir} \
     --x-libraries=%{_libdir}
 %endif
-# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.2.4
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0
 %{__make}
 
 
@@ -89,7 +87,7 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
-# We need this for proper automatic stripping to take place (still in 1.2.3)
+# We need this for proper automatic stripping to take place (still in 1.3.0)
 find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x
 
 
@@ -99,7 +97,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG.html COPYING README.linux TODO.html
+%doc COPYING README README.linux
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/drivers/
@@ -162,6 +160,14 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  1.3.0-1
+- Update to 1.3.0.
+- Remove no longer needed track.cpp patch1.
+- Remove no longer needed extraqualif patch2.
+
+* Mon Aug 28 2006 Matthias Saou  1.2.4-4
+- FC6 rebuild.
+
 * Fri Mar 10 2006 Matthias Saou  1.2.4-3
 - Remove patch that disabled checking for openal, since it also disabled
   linking against it, and caused nasty things to happen.


--- torcs-1.2.4-extraqualif.patch DELETED ---


--- torcs-1.2.4-track_cpp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 15:09:27 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Nov 2006 08:09:27 -0700
Subject: rpms/torcs/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 torcs.spec, 
	1.13, 1.14 torcs-1.2.4-extraqualif.patch, 1.1,
	NONE torcs-1.2.4-track_cpp.patch, 1.1, NONE
Message-ID: <200611131509.kADF9RLC020878@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/torcs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20835/FC-6

Modified Files:
	.cvsignore sources torcs.spec 
Removed Files:
	torcs-1.2.4-extraqualif.patch torcs-1.2.4-track_cpp.patch 
Log Message:
Backport 1.3.0 update from devel to FC-6 and FC-5 branches.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2005 07:49:42 -0000	1.5
+++ .cvsignore	13 Nov 2006 15:08:57 -0000	1.6
@@ -1,5 +1,5 @@
-TORCS-1.2.4-src-robots-base.tgz
-TORCS-1.2.4-src-robots-berniw.tgz
-TORCS-1.2.4-src-robots-bt.tgz
-TORCS-1.2.4-src-robots-olethros.tgz
-TORCS-1.2.4-src.tgz
+TORCS-1.3.0-src.tgz
+TORCS-1.3.0-src-robots-base.tgz
+TORCS-1.3.0-src-robots-berniw.tgz
+TORCS-1.3.0-src-robots-bt.tgz
+TORCS-1.3.0-src-robots-olethros.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2005 07:49:42 -0000	1.5
+++ sources	13 Nov 2006 15:08:57 -0000	1.6
@@ -1,5 +1,5 @@
-3afe0d23f1e637fe56efccd2b6e8a8f1  TORCS-1.2.4-src-robots-base.tgz
-40aed9595f91051e8468e8a19b65f809  TORCS-1.2.4-src-robots-berniw.tgz
-337eecc6e545aceda094d945e12c3023  TORCS-1.2.4-src-robots-bt.tgz
-13b1eeba1148ca57dc1d989fcb27d308  TORCS-1.2.4-src-robots-olethros.tgz
-f5b41bf29cb7b6160e5ead6e187380b6  TORCS-1.2.4-src.tgz
+915c89f9d3618d13dddd5bfb4d199539  TORCS-1.3.0-src.tgz
+da007d61447f38fbdbd22aec029cc26c  TORCS-1.3.0-src-robots-base.tgz
+abeb72ba3913ef0bde727fdaa9699eef  TORCS-1.3.0-src-robots-berniw.tgz
+ca8506aecc30bee308a5e198304b71b2  TORCS-1.3.0-src-robots-bt.tgz
+227d47687b821298fe6b2f147071e73f  TORCS-1.3.0-src-robots-olethros.tgz


Index: torcs.spec
===================================================================
RCS file: /cvs/extras/rpms/torcs/FC-6/torcs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- torcs.spec	28 Aug 2006 16:40:15 -0000	1.13
+++ torcs.spec	13 Nov 2006 15:08:57 -0000	1.14
@@ -2,8 +2,8 @@
 
 Summary: The Open Racing Car Simulator
 Name: torcs
-Version: 1.2.4
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://torcs.org/
@@ -13,8 +13,6 @@
 Source3: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-bt.tgz
 Source4: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-olethros.tgz
 Patch0: torcs-1.2.4-freealutfix.patch
-Patch1: torcs-1.2.4-track_cpp.patch
-Patch2: torcs-1.2.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: torcs-data, torcs-data-tracks-road, torcs-data-cars-extra
 BuildRequires: libGL-devel, freeglut-devel, freealut-devel, plib-devel >= 1.8.3
@@ -37,7 +35,7 @@
 %package robots
 Summary: The Open Racing Car Simulator robots
 Group: Amusements/Games
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description robots
 TORCS is a 3D racing cars simulator using OpenGL.  The goal is to have
@@ -50,20 +48,19 @@
 %prep
 %setup -a 1 -a 2 -a 3 -a 4
 %patch0 -p1 -b .freealutfix
-%patch1 -p0 -b .track_cpp
-%patch2 -p1 -b .extraqualif
 # Put the drivers back where they belong
 %{__mv} %{name}-%{version}/src/drivers/* src/drivers/
 
 
 %build
-# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4)
+# Force locations with modular X (for FC5+ and non-Fedora)
+# Required (1.2.4, still in 1.3.0)
 %configure \
 %if %{!?fedora:5}%{?fedora} >= 5
     --x-includes=%{_includedir} \
     --x-libraries=%{_libdir}
 %endif
-# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.2.4
+# Having %{?_smp_mflags} makes the build fail since 1.2.3, still in 1.3.0
 %{__make}
 
 
@@ -90,7 +87,7 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
-# We need this for proper automatic stripping to take place (still in 1.2.3)
+# We need this for proper automatic stripping to take place (still in 1.3.0)
 find %{buildroot}%{_libdir}/%{name}/ -name '*.so' | xargs %{__chmod} +x
 
 
@@ -100,7 +97,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGELOG.html COPYING README.linux TODO.html
+%doc COPYING README README.linux
 %{_bindir}/*
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/drivers/
@@ -163,6 +160,11 @@
 
 
 %changelog
+* Fri Nov 10 2006 Matthias Saou  1.3.0-1
+- Update to 1.3.0.
+- Remove no longer needed track.cpp patch1.
+- Remove no longer needed extraqualif patch2.
+
 * Mon Aug 28 2006 Matthias Saou  1.2.4-4
 - FC6 rebuild.
 


--- torcs-1.2.4-extraqualif.patch DELETED ---


--- torcs-1.2.4-track_cpp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 15:41:29 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Mon, 13 Nov 2006 08:41:29 -0700
Subject: comps comps-fe5.xml.in, 1.198, 1.199 comps-fe6.xml.in, 1.222,
	1.223 comps-fe7.xml.in, 1.21, 1.22
Message-ID: <200611131541.kADFfTub021718@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21660/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
added aumix



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- comps-fe5.xml.in	13 Nov 2006 09:18:29 -0000	1.198
+++ comps-fe5.xml.in	13 Nov 2006 15:40:59 -0000	1.199
@@ -797,6 +797,7 @@
       alsamixergui
       amarok
       audacity
+      aumix
       bin2iso
       bmp
       camE


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- comps-fe6.xml.in	13 Nov 2006 09:18:29 -0000	1.222
+++ comps-fe6.xml.in	13 Nov 2006 15:40:59 -0000	1.223
@@ -849,6 +849,7 @@
       alsamixergui
       amarok
       audacity
+      aumix
       bin2iso
       brasero
       camE


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- comps-fe7.xml.in	13 Nov 2006 09:18:29 -0000	1.21
+++ comps-fe7.xml.in	13 Nov 2006 15:40:59 -0000	1.22
@@ -849,6 +849,7 @@
       alsamixergui
       amarok
       audacity
+      aumix
       bin2iso
       brasero
       camE



From fedora-extras-commits at redhat.com  Mon Nov 13 16:22:21 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 09:22:21 -0700
Subject: rpms/gtk-gnutella/FC-5 .cvsignore, 1.5, 1.6 gtk-gnutella.spec, 1.8, 
	1.9 sources, 1.5, 1.6
Message-ID: <200611131622.kADGMLuR026065@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26045

Modified Files:
	.cvsignore gtk-gnutella.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Oct 2006 11:39:38 -0000	1.5
+++ .cvsignore	13 Nov 2006 16:21:51 -0000	1.6
@@ -1 +1 @@
-gtk-gnutella-0.96.2.tar.bz2
+gtk-gnutella-0.96.3.tar.bz2


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-gnutella.spec	23 Oct 2006 11:55:28 -0000	1.8
+++ gtk-gnutella.spec	13 Nov 2006 16:21:51 -0000	1.9
@@ -1,7 +1,7 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.2
+Version: 0.96.3
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
@@ -48,18 +48,18 @@
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
 install -D -m 644 extra_files/gtk-gnutella.16.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.32.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.svg \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
-desktop-file-install --vendor fedora --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Fedora                                   \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+desktop-file-install --vendor fedora --delete-original	\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	$RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang %{name}
 
@@ -77,10 +77,13 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 
-%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
+%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/shell.txt
 
 
 %changelog
+* Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
+- update to 0.96.3
+
 * Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
 - update to 0.96.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 11:39:38 -0000	1.5
+++ sources	13 Nov 2006 16:21:51 -0000	1.6
@@ -1 +1 @@
-a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2
+c6952037a10ea6d5ac5649e7b75f9d15  gtk-gnutella-0.96.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 16:36:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:36:57 -0700
Subject: rpms/perl-WWW-Babelfish - New directory
Message-ID: <200611131636.kADGavCe026374@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26370/perl-WWW-Babelfish

Log Message:
Directory /cvs/extras/rpms/perl-WWW-Babelfish added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 16:36:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:36:57 -0700
Subject: owners owners.list,1.1942,1.1943
Message-ID: <200611131636.kADGavuV026381@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26343

Modified Files:
	owners.list 
Log Message:
added perl-WWW-Babelfish


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1942
retrieving revision 1.1943
diff -u -r1.1942 -r1.1943
--- owners.list	13 Nov 2006 14:49:52 -0000	1.1942
+++ owners.list	13 Nov 2006 16:36:27 -0000	1.1943
@@ -1743,6 +1743,7 @@
 Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-version|Perl extension for Version Objects|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-WWW-Babelfish|Perl extension for translation via Babelfish or Google|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Bugzilla|Handles submission/update of bugzilla bugs via WWW::Mechanize|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Myspace|Access your myspace.com profile in Perl!|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Nov 13 16:37:03 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:37:03 -0700
Subject: rpms/perl-WWW-Babelfish/devel - New directory
Message-ID: <200611131637.kADGb3ZO026393@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26370/perl-WWW-Babelfish/devel

Log Message:
Directory /cvs/extras/rpms/perl-WWW-Babelfish/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 16:37:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:37:11 -0700
Subject: rpms/perl-WWW-Babelfish Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131637.kADGbBHN026419@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26413

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-WWW-Babelfish


--- NEW FILE Makefile ---
# Top level Makefile for module perl-WWW-Babelfish
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  Mon Nov 13 16:37:17 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:37:17 -0700
Subject: rpms/perl-WWW-Babelfish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611131637.kADGbHZH026435@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26413/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-WWW-Babelfish


--- 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 Nov 13 16:38:00 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:38:00 -0700
Subject: rpms/perl-WWW-Babelfish/devel perl-WWW-Babelfish.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611131638.kADGc0sO026496@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26460/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-WWW-Babelfish.spec 
Log Message:
auto-import perl-WWW-Babelfish-0.15-1.fc6 on branch devel from perl-WWW-Babelfish-0.15-1.fc6.src.rpm


--- NEW FILE perl-WWW-Babelfish.spec ---
Name:           perl-WWW-Babelfish
Version:        0.15
Release:        1%{?dist}
Summary:        Perl extension for translation via Babelfish or Google
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/WWW-Babelfish/
Source0:        http://www.cpan.org/authors/id/D/DU/DURIST/WWW-Babelfish-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(HTML::TokeParser)
BuildRequires:  perl(HTTP::Request)
BuildRequires:  perl(IO::String)
BuildRequires:  perl(LWP::UserAgent)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl interface to the WWW babelfish translation server.

%prep
%setup -q -n WWW-Babelfish-%{version}

%build
# nix internet-based tests
echo n | %{__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 {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Oct 26 2006 Chris Weyl  0.15-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Babelfish/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 16:37:17 -0000	1.1
+++ .cvsignore	13 Nov 2006 16:37:29 -0000	1.2
@@ -0,0 +1 @@
+WWW-Babelfish-0.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Babelfish/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 16:37:17 -0000	1.1
+++ sources	13 Nov 2006 16:37:29 -0000	1.2
@@ -0,0 +1 @@
+bc6293dabcbf5e96435fc8acaf8ac939  WWW-Babelfish-0.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 16:37:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:37:59 -0700
Subject: rpms/perl-WWW-Babelfish import.log,1.1,1.2
Message-ID: <200611131637.kADGbxQa026492@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26460

Modified Files:
	import.log 
Log Message:
auto-import perl-WWW-Babelfish-0.15-1.fc6 on branch devel from perl-WWW-Babelfish-0.15-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Babelfish/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 16:37:11 -0000	1.1
+++ import.log	13 Nov 2006 16:37:29 -0000	1.2
@@ -0,0 +1 @@
+perl-WWW-Babelfish-0_15-1_fc6:HEAD:perl-WWW-Babelfish-0.15-1.fc6.src.rpm:1163435848



From fedora-extras-commits at redhat.com  Mon Nov 13 16:38:49 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 09:38:49 -0700
Subject: rpms/perl-WWW-Babelfish/devel perl-WWW-Babelfish.spec,1.1,1.2
Message-ID: <200611131638.kADGcn1K026548@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Babelfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26532

Modified Files:
	perl-WWW-Babelfish.spec 
Log Message:
release bump


Index: perl-WWW-Babelfish.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Babelfish/devel/perl-WWW-Babelfish.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-WWW-Babelfish.spec	13 Nov 2006 16:37:29 -0000	1.1
+++ perl-WWW-Babelfish.spec	13 Nov 2006 16:38:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-WWW-Babelfish
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for translation via Babelfish or Google
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -48,5 +48,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 13 2006 Chris Weyl  0.15-2
+- bump
+
 * Thu Oct 26 2006 Chris Weyl  0.15-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Mon Nov 13 16:43:47 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Mon, 13 Nov 2006 09:43:47 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.9,1.10
Message-ID: <200611131643.kADGhl2p026632@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26615

Modified Files:
	xmoto.spec 
Log Message:
* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
- Added again the debuginfo package (it's working)



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmoto.spec	12 Nov 2006 20:40:51 -0000	1.9
+++ xmoto.spec	13 Nov 2006 16:43:17 -0000	1.10
@@ -1,6 +1,3 @@
-# No debuginfo package due to faulty find-debuginfo.sh
-%define debug_package %{nil}
-
 Name:           xmoto
 Version:        0.2.2
 Release:        1%{?dist}
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
+- Added again the debuginfo package (it's working)
+
 * Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Nov 13 16:45:14 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Mon, 13 Nov 2006 09:45:14 -0700
Subject: rpms/xmoto/devel xmoto.spec,1.10,1.11
Message-ID: <200611131645.kADGjEJM026664@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26646

Modified Files:
	xmoto.spec 
Log Message:



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/devel/xmoto.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmoto.spec	13 Nov 2006 16:43:17 -0000	1.10
+++ xmoto.spec	13 Nov 2006 16:44:44 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           xmoto
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games



From fedora-extras-commits at redhat.com  Mon Nov 13 16:47:18 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Mon, 13 Nov 2006 09:47:18 -0700
Subject: rpms/xmoto/FC-6 xmoto.spec,1.5,1.6
Message-ID: <200611131647.kADGlIMo026731@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26708

Modified Files:
	xmoto.spec 
Log Message:
* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
- Added again the debuginfo package (it's working)



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-6/xmoto.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmoto.spec	12 Nov 2006 22:47:47 -0000	1.5
+++ xmoto.spec	13 Nov 2006 16:46:48 -0000	1.6
@@ -1,9 +1,6 @@
-# No debuginfo package due to faulty find-debuginfo.sh
-%define debug_package %{nil}
-
 Name:           xmoto
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
+- Added again the debuginfo package (it's working)
+
 * Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Nov 13 16:48:31 2006
From: fedora-extras-commits at redhat.com (Hugo Cisneiros (eitch))
Date: Mon, 13 Nov 2006 09:48:31 -0700
Subject: rpms/xmoto/FC-5 xmoto.spec,1.4,1.5
Message-ID: <200611131648.kADGmVmv026807@cvs-int.fedora.redhat.com>

Author: eitch

Update of /cvs/extras/rpms/xmoto/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26779

Modified Files:
	xmoto.spec 
Log Message:
* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
- Added again the debuginfo package (it's working)



Index: xmoto.spec
===================================================================
RCS file: /cvs/extras/rpms/xmoto/FC-5/xmoto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmoto.spec	12 Nov 2006 22:45:53 -0000	1.4
+++ xmoto.spec	13 Nov 2006 16:48:01 -0000	1.5
@@ -1,9 +1,6 @@
-# No debuginfo package due to faulty find-debuginfo.sh
-%define debug_package %{nil}
-
 Name:           xmoto
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Challenging 2D Motocross Platform Game
 
 Group:          Amusements/Games
@@ -82,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Hugo Cisneiros  0.2.2-2
+- Added again the debuginfo package (it's working)
+
 * Sun Nov 12 2006 Hugo Cisneiros  0.2.2-1
 - New upstream release
 



From fedora-extras-commits at redhat.com  Mon Nov 13 16:50:50 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 13 Nov 2006 09:50:50 -0700
Subject: rpms/gnomesword/devel .cvsignore, 1.5, 1.6 gnomesword.spec, 1.16,
	1.17 sources, 1.6, 1.7
Message-ID: <200611131650.kADGoomN026919@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26892

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Mon Nov 13 2006 Deji Akingunola  - 2.1.9-1
- New release (2.1.9)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Nov 2006 04:23:58 -0000	1.5
+++ .cvsignore	13 Nov 2006 16:50:20 -0000	1.6
@@ -1 +1 @@
-gnomesword-2.1.8.tar.gz
+gnomesword-2.1.9.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnomesword.spec	9 Nov 2006 06:45:18 -0000	1.16
+++ gnomesword.spec	13 Nov 2006 16:50:20 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           gnomesword           
-Version:        2.1.8
-Release:        3%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -41,7 +41,7 @@
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
-#make %{?_smp_mflags} : // Dosn't seem to work on i386
+#make %{?_smp_mflags} : // Doesn't seem to work on i386
 make
 
 %install
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Deji Akingunola  - 2.1.9-1
+- New release (2.1.9)
+
 * Thu Nov 09 2006 Deji Akingunola  - 2.1.8-3
 - Seems parallel make is causing problems
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Nov 2006 04:23:58 -0000	1.6
+++ sources	13 Nov 2006 16:50:20 -0000	1.7
@@ -1 +1 @@
-fd648e8690e1c96b8f94b249eeb09b03  gnomesword-2.1.8.tar.gz
+f6c5ebd5a7ee6d248682289e809f36bf  gnomesword-2.1.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 16:58:01 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Mon, 13 Nov 2006 09:58:01 -0700
Subject: owners owners.list,1.1943,1.1944
Message-ID: <200611131658.kADGw1LF027023@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27007

Modified Files:
	owners.list 
Log Message:
- add multican to owners.list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1943
retrieving revision 1.1944
diff -u -r1.1943 -r1.1944
--- owners.list	13 Nov 2006 16:36:27 -0000	1.1943
+++ owners.list	13 Nov 2006 16:57:31 -0000	1.1944
@@ -1105,6 +1105,7 @@
 Fedora Extras|mpc|Command-line client for MPD|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mtd-utils|Utilities for dealing with MTD (flash) devices|dwmw2 at redhat.com|extras-qa at fedoraproject.org|jwboyer at jdub.homelinux.org
 Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
+Fedora Extras|multican|Remote control utility for Canon cameras|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 17:05:19 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 10:05:19 -0700
Subject: rpms/gtk-gnutella/FC-6 gtk-gnutella.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <200611131705.kADH5JNc030086@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30062

Modified Files:
	gtk-gnutella.spec sources 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-6/gtk-gnutella.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-gnutella.spec	23 Oct 2006 12:04:16 -0000	1.9
+++ gtk-gnutella.spec	13 Nov 2006 17:04:49 -0000	1.10
@@ -1,7 +1,7 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.2
+Version: 0.96.3
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
@@ -48,18 +48,18 @@
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
 install -D -m 644 extra_files/gtk-gnutella.16.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.32.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.svg \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
-desktop-file-install --vendor fedora --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Fedora                                   \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+desktop-file-install --vendor fedora --delete-original	\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	$RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang %{name}
 
@@ -77,19 +77,16 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 
-%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
+%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/shell.txt
 
 
 %changelog
+* Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
+- update to 0.96.3
+
 * Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
 - update to 0.96.2
 
-* Fri Sep  1 2006 Dmitry Butskoy  - 0.96.1-3
-- rebuild for FC6
-
-* Mon Jul  3 2006 Dmitry Butskoy  - 0.96.1-2
-- add BR: gettext
-
 * Fri Feb 24 2006 Dmitry Butskoy  - 0.96.1-1
 - update to 0.96.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 12:04:16 -0000	1.5
+++ sources	13 Nov 2006 17:04:49 -0000	1.6
@@ -1 +1 @@
-a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2
+c6952037a10ea6d5ac5649e7b75f9d15  gtk-gnutella-0.96.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 17:25:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:25:51 -0700
Subject: rpms/perl-Moose-Policy - New directory
Message-ID: <200611131725.kADHPpRm030302@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30298/perl-Moose-Policy

Log Message:
Directory /cvs/extras/rpms/perl-Moose-Policy added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 17:25:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:25:52 -0700
Subject: owners owners.list,1.1944,1.1945
Message-ID: <200611131725.kADHPqNZ030309@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30275

Modified Files:
	owners.list 
Log Message:
added perl-Moose-Policy


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1944
retrieving revision 1.1945
diff -u -r1.1944 -r1.1945
--- owners.list	13 Nov 2006 16:57:31 -0000	1.1944
+++ owners.list	13 Nov 2006 17:25:21 -0000	1.1945
@@ -1563,6 +1563,7 @@
 Fedora Extras|perl-Module-Starter-PBP|Create a module as recommended in "Perl Best Practices"|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Moose|Complete modern object system for Perl 5|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Moose-Policy|Police your project/company-wide Moose policies|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MP3-Info|Manipulate / fetch info from MP3 audio files|chris.stone at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Nov 13 17:25:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:25:57 -0700
Subject: rpms/perl-Moose-Policy/devel - New directory
Message-ID: <200611131725.kADHPv6C030319@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30298/perl-Moose-Policy/devel

Log Message:
Directory /cvs/extras/rpms/perl-Moose-Policy/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 17:26:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:26:11 -0700
Subject: rpms/perl-Moose-Policy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611131726.kADHQBSQ030357@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30335/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Moose-Policy


--- 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 Nov 13 17:26:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:26:05 -0700
Subject: rpms/perl-Moose-Policy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131726.kADHQ594030341@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30335

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Moose-Policy


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Moose-Policy
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  Mon Nov 13 17:26:51 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:26:51 -0700
Subject: rpms/perl-Moose-Policy import.log,1.1,1.2
Message-ID: <200611131726.kADHQpix030414@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30382

Modified Files:
	import.log 
Log Message:
auto-import perl-Moose-Policy-0.02-1.fc6 on branch devel from perl-Moose-Policy-0.02-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Policy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 17:26:05 -0000	1.1
+++ import.log	13 Nov 2006 17:26:21 -0000	1.2
@@ -0,0 +1 @@
+perl-Moose-Policy-0_02-1_fc6:HEAD:perl-Moose-Policy-0.02-1.fc6.src.rpm:1163438781



From fedora-extras-commits at redhat.com  Mon Nov 13 17:26:52 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:26:52 -0700
Subject: rpms/perl-Moose-Policy/devel perl-Moose-Policy.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611131726.kADHQqdZ030418@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30382/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Moose-Policy.spec 
Log Message:
auto-import perl-Moose-Policy-0.02-1.fc6 on branch devel from perl-Moose-Policy-0.02-1.fc6.src.rpm


--- NEW FILE perl-Moose-Policy.spec ---
Name:           perl-Moose-Policy
Version:        0.02
Release:        1%{?dist}
Summary:        Police your project/company-wide Moose policies
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Moose-Policy/
Source0:        http://www.cpan.org/authors/id/S/ST/STEVAN/Moose-Policy-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Moose) >= 0.11
# tests
BuildRequires:  perl(Test::Exception) >= 0.21
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to specify your project-wide or even company-wide
Moose meta-policy.

Most all of Moose's features can be customized through the use of custom
metaclasses, however fiddling with the metaclasses can be hairy. Moose::Policy
removes most of that hairiness and makes it possible to cleanly contain a set
of meta-level customizations in one easy to use module.

This is an early release of this module and it should not be considered to be
complete by any means. It is very basic implemenation at this point and will
likely get more feature-full over time, as people request features. So if you
have a suggestion/need/idea, please speak up.

%prep
%setup -q -n Moose-Policy-%{version}

%build
%{__perl} Build.PL installdirs=vendor
./Build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
./Build test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Nov 06 2006 Chris Weyl  0.02-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Policy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 17:26:10 -0000	1.1
+++ .cvsignore	13 Nov 2006 17:26:22 -0000	1.2
@@ -0,0 +1 @@
+Moose-Policy-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Policy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 17:26:10 -0000	1.1
+++ sources	13 Nov 2006 17:26:22 -0000	1.2
@@ -0,0 +1 @@
+11b2e835e4b97563c4e459475bf9df90  Moose-Policy-0.02.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 17:28:27 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 13 Nov 2006 10:28:27 -0700
Subject: rpms/perl-Moose-Policy/devel perl-Moose-Policy.spec,1.1,1.2
Message-ID: <200611131728.kADHSRN0030469@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose-Policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452

Modified Files:
	perl-Moose-Policy.spec 
Log Message:
release bump


Index: perl-Moose-Policy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose-Policy/devel/perl-Moose-Policy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Moose-Policy.spec	13 Nov 2006 17:26:22 -0000	1.1
+++ perl-Moose-Policy.spec	13 Nov 2006 17:27:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Moose-Policy
 Version:        0.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Police your project/company-wide Moose policies
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -59,5 +59,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 13 2006 Chris Weyl  0.02-2
+- bump
+
 * Mon Nov 06 2006 Chris Weyl  0.02-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Mon Nov 13 17:30:36 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 10:30:36 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.9,1.10
Message-ID: <200611131730.kADHUaRZ030550@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30519

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-gnutella.spec	13 Nov 2006 16:21:51 -0000	1.9
+++ gtk-gnutella.spec	13 Nov 2006 17:30:06 -0000	1.10
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc, groff, gettext
+BuildRequires: libxml2-devel, byacc, groff, gettext, zlib-devel
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Mon Nov 13 17:40:54 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 10:40:54 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.10,1.11
Message-ID: <200611131740.kADHesPu030640@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30622

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-gnutella.spec	13 Nov 2006 17:30:06 -0000	1.10
+++ gtk-gnutella.spec	13 Nov 2006 17:40:24 -0000	1.11
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc, groff, gettext, zlib-devel
+BuildRequires: libxml2-devel, byacc, groff, gettext
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Mon Nov 13 18:11:05 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 13 Nov 2006 11:11:05 -0700
Subject: rpms/proftpd/devel proftpd-1.3.0-cmdbufsize.patch, NONE,
	1.1 proftpd.spec, 1.20, 1.21
Message-ID: <200611131811.kADIB5SN001344@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1315

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.0-cmdbufsize.patch 
Log Message:
Include cmdbufsize patch (#214820).


proftpd-1.3.0-cmdbufsize.patch:

--- NEW FILE proftpd-1.3.0-cmdbufsize.patch ---
--- src/main.c	2006/09/29 16:38:16	1.292
+++ src/main.c	2006/10/31 22:49:03	1.293
@@ -116,6 +116,8 @@ static unsigned char have_dead_child = F
 
 static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
 
+#define PR_DEFAULT_CMD_BUFSZ 512
+
 static char **Argv = NULL;
 static char *LastArgv = NULL;
 static const char *PidPath = PR_PID_FILE_PATH;
@@ -832,16 +834,25 @@
       pr_timer_reset(TIMER_IDLE, NULL);
 
     if (cmd_buf_size == -1) {
-      long *buf_size = get_param_ptr(main_server->conf,
-        "CommandBufferSize", FALSE);
+      int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize",
+        FALSE);
 
-      if (buf_size == NULL || *buf_size <= 0)
-        cmd_buf_size = 512;
+      if (bufsz == NULL ||
+          *bufsz <= 0) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
+          "given, resetting to default buffer size (%u)",
+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*bufsz + 1 > sizeof(buf)) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
+          "given, resetting to default buffer size (%u)",
+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 
-      else if (*buf_size + 1 > sizeof(buf)) {
-	pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
-          "Resetting to 512.");
-	cmd_buf_size = 512;
+      } else {
+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
+        cmd_buf_size = (long) *bufsz;
       }
     }
 


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- proftpd.spec	28 Aug 2006 12:28:49 -0000	1.20
+++ proftpd.spec	13 Nov 2006 18:10:35 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -14,6 +14,7 @@
 Source6: proftpd.pam
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
+Patch2: proftpd-1.3.0-cmdbufsize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +67,7 @@
 %setup
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
+%patch2 -p0 -b .cmdbufsize
 
 
 %build
@@ -186,6 +188,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Matthias Saou  1.3.0-8
+- Include cmdbufsize patch (#214820).
+
 * Mon Aug 28 2006 Matthias Saou  1.3.0-7
 - FC6 rebuild.
 



From fedora-extras-commits at redhat.com  Mon Nov 13 18:13:54 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Nov 2006 11:13:54 -0700
Subject: rpms/lilypond/devel .cvsignore, 1.6, 1.7 lilypond.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611131813.kADIDsRr001433@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release, updated build requirements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Nov 2006 16:41:08 -0000	1.6
+++ .cvsignore	13 Nov 2006 18:13:24 -0000	1.7
@@ -1 +1 @@
-lilypond-2.8.8.tar.gz
+lilypond-2.10.0.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lilypond.spec	3 Nov 2006 16:41:08 -0000	1.6
+++ lilypond.spec	13 Nov 2006 18:13:24 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		lilypond
-Version:	2.8.8
+Version:	2.10.0
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
@@ -13,12 +13,13 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-Buildrequires:  t1utils bison flex mftrace ImageMagick
-BuildRequires:  gettext python-devel tetex
-BuildRequires:  texinfo >= 4.7
-BuildRequires:  guile-devel >= 1.6.4
+Buildrequires:  t1utils bison flex ImageMagick gettext tetex
+BuildRequires:  python-devel >= 2.4.0
+BuildRequires:  mftrace >= 1.1.19
+BuildRequires:  texinfo >= 4.8
+BuildRequires:  guile-devel >= 1.8
 BuildRequires:  ghostscript >= 8.15
-BuildRequires:  pango-devel >= 1.6.0
+BuildRequires:  pango-devel >= 1.12.0
 
 %description
 LilyPond is an automated music engraving system. It formats music
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Quentin Spencer  2.10.0-1
+- New release. Update build requirements for 2.10 series.
+
 * Fri Nov  3 2006 Quentin Spencer  2.8.8-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Nov 2006 16:41:08 -0000	1.6
+++ sources	13 Nov 2006 18:13:24 -0000	1.7
@@ -1 +1 @@
-2fe58ff2fcbc848def46ef287a693189  lilypond-2.8.8.tar.gz
+82e4487c5c1fa1d2e478d5974a3630df  lilypond-2.10.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 18:19:52 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:19:52 -0700
Subject: rpms/php-pear-HTML-QuickForm - New directory
Message-ID: <200611131819.kADIJqXD001496@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492/php-pear-HTML-QuickForm

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-QuickForm added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 18:19:58 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:19:58 -0700
Subject: rpms/php-pear-HTML-QuickForm/devel - New directory
Message-ID: <200611131819.kADIJwQO001510@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1492/php-pear-HTML-QuickForm/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-HTML-QuickForm/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 18:20:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:20:10 -0700
Subject: rpms/php-pear-HTML-QuickForm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131820.kADIKAZB001542@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1535

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-HTML-QuickForm


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-HTML-QuickForm
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  Mon Nov 13 18:20:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:20:16 -0700
Subject: rpms/php-pear-HTML-QuickForm/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611131820.kADIKGYZ001564@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1535/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-HTML-QuickForm


--- 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 Nov 13 18:21:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:21:09 -0700
Subject: rpms/php-pear-HTML-QuickForm import.log,1.1,1.2
Message-ID: <200611131821.kADIL9kX001644@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1609

Modified Files:
	import.log 
Log Message:
auto-import php-pear-HTML-QuickForm-3.2.7-2 on branch devel from php-pear-HTML-QuickForm-3.2.7-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 18:20:10 -0000	1.1
+++ import.log	13 Nov 2006 18:20:38 -0000	1.2
@@ -0,0 +1 @@
+php-pear-HTML-QuickForm-3_2_7-2:HEAD:php-pear-HTML-QuickForm-3.2.7-2.src.rpm:1163442035



From fedora-extras-commits at redhat.com  Mon Nov 13 18:21:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:21:09 -0700
Subject: rpms/php-pear-HTML-QuickForm/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-HTML-QuickForm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611131821.kADIL9hU001648@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-HTML-QuickForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1609/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-HTML-QuickForm.spec 
Log Message:
auto-import php-pear-HTML-QuickForm-3.2.7-2 on branch devel from php-pear-HTML-QuickForm-3.2.7-2.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-HTML-QuickForm.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name HTML_QuickForm

Name:           php-pear-HTML-QuickForm
Version:        3.2.7
Release:        2%{?dist}
Summary:        Class for creating, validating, processing HTML forms

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/HTML_QuickForm
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(HTML_Common) >= 1.2.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
The HTML_QuickForm package provides methods to dynamically create, validate
and render HTML forms.

Features:
* More than 20 ready-to-use form elements.
* XHTML compliant generated code.
* Numerous mixable and extendable validation rules.
* Automatic server-side validation and filtering.
* On request javascript code generation for client-side validation.
* File uploads support.
* Total customization of form rendering.
* Support for external template engines (ITX, Sigma, Flexy, Smarty).
* Pluggable elements, rules and renderers extensions.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
install -pm 644 -c %{SOURCE1} LICENSE
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc LICENSE %{pear_name}-%{version}/docdir/%{pear_name}/docs
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/HTML/QuickForm*


%changelog
* Mon Nov 13 2006 Christopher Stone  3.2.7-2
- Include PHP License in %%doc
- Add versioned Requires

* Sun Oct 29 2006 Christopher Stone  3.2.7-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 18:20:16 -0000	1.1
+++ .cvsignore	13 Nov 2006 18:20:39 -0000	1.2
@@ -0,0 +1 @@
+HTML_QuickForm-3.2.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTML-QuickForm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 18:20:16 -0000	1.1
+++ sources	13 Nov 2006 18:20:39 -0000	1.2
@@ -0,0 +1 @@
+7d3cbe961e17996641abec79c953e3dd  HTML_QuickForm-3.2.7.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 18:23:21 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 11:23:21 -0700
Subject: owners owners.list,1.1945,1.1946
Message-ID: <200611131823.kADINLGV001780@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1721

Modified Files:
	owners.list 
Log Message:
php-pear-HTML-QuickForm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1945
retrieving revision 1.1946
diff -u -r1.1945 -r1.1946
--- owners.list	13 Nov 2006 17:25:21 -0000	1.1945
+++ owners.list	13 Nov 2006 18:22:51 -0000	1.1946
@@ -1785,6 +1785,7 @@
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Table|Class to easily design HTML tables|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTML-QuickForm|Class for creating, validating, processing HTML forms|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 18:28:44 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Mon, 13 Nov 2006 11:28:44 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.11,1.12
Message-ID: <200611131828.kADISibW003310@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2935

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gtk-gnutella.spec	13 Nov 2006 17:40:24 -0000	1.11
+++ gtk-gnutella.spec	13 Nov 2006 18:28:10 -0000	1.12
@@ -33,8 +33,9 @@
 
 %build
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
+	-Dglibpth="%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
-	-Dccflags="$RPM_OPT_FLAGS -Wall" -Dcc=gcc -Doptimize="-O2" \
+	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
 	-Dofficial=true -ders
 make %{?_smp_mflags}
@@ -83,6 +84,7 @@
 %changelog
 * Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
 - update to 0.96.3
+- specify libdirs explicitly for Configure script (needed for x86_64)
 
 * Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
 - update to 0.96.2



From fedora-extras-commits at redhat.com  Mon Nov 13 19:10:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb))
Date: Mon, 13 Nov 2006 12:10:48 -0700
Subject: rpms/muine/FC-6 .cvsignore, 1.3, 1.4 muine.spec, 1.9, 1.10 sources, 
	1.3, 1.4
Message-ID: <200611131910.kADJAmDL008192@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8151

Modified Files:
	.cvsignore muine.spec sources 
Log Message:
Update to 0.8.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2006 11:59:35 -0000	1.3
+++ .cvsignore	13 Nov 2006 19:10:18 -0000	1.4
@@ -1 +1 @@
-muine-0.8.5.tar.gz
+muine-0.8.6.tar.gz


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-6/muine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- muine.spec	29 Sep 2006 00:04:27 -0000	1.9
+++ muine.spec	13 Nov 2006 19:10:18 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           muine
-Version:        0.8.5
-Release:        7%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -81,6 +81,9 @@
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +94,9 @@
 %postun
 update-desktop-database &> /dev/null ||:
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,7 +113,7 @@
 %{_libdir}/muine/*.exe*
 %{_libdir}/muine/plugins/InotifyPlugin.dll*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/muine.png
+%{_datadir}/icons/hicolor/*/apps/muine.*
 %{_libdir}/muine/plugins/TrayIcon.dll*
 %{_libdir}/muine/plugins/muine-tray-*.png
 
@@ -116,6 +122,9 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Nov 13 2006 Sindre Pedersen Bj??rdal  - 0.8.6-1
+- New release
+- Add gtk icon cache scriplet for new icons
 * Fri Sep 29 2006 Sindre Pedersen Bj??rdal  - 0.8.5-7
 - Removed replacement of libdir
 * Fri Sep 15 2006 Sindre Pedersen Bj??rdal  - 0.8.5-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2006 11:59:35 -0000	1.3
+++ sources	13 Nov 2006 19:10:18 -0000	1.4
@@ -1 +1 @@
-6960b21da5fd5cbc7a2e5a93a7bcd2a2  muine-0.8.5.tar.gz
+8646e439667896423c06cc2fcb67754f  muine-0.8.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:12:42 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:12:42 -0700
Subject: owners owners.list,1.1946,1.1947
Message-ID: <200611131912.kADJCguj008288@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8253/owners

Modified Files:
	owners.list 
Log Message:
Add mod_revocator



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1946
retrieving revision 1.1947
diff -u -r1.1946 -r1.1947
--- owners.list	13 Nov 2006 18:22:51 -0000	1.1946
+++ owners.list	13 Nov 2006 19:12:12 -0000	1.1947
@@ -1087,6 +1087,7 @@
 Fedora Extras|mod_geoip|GeoIP module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_mono|Mono module for Apache HTTP server|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|mod_nss|SSL/TLS module using NSS for the Apache HTTP server|rcritten at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|mod_revocator|CRL retrieval module for the Apache HTTP server|rcritten at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 19:12:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb))
Date: Mon, 13 Nov 2006 12:12:54 -0700
Subject: rpms/muine/devel muine.spec,1.9,1.10
Message-ID: <200611131912.kADJCssN008331@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8257

Modified Files:
	muine.spec 
Log Message:
"Update to 0.8.6"



Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/devel/muine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- muine.spec	29 Sep 2006 00:04:27 -0000	1.9
+++ muine.spec	13 Nov 2006 19:12:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           muine
-Version:        0.8.5
-Release:        7%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -81,6 +81,9 @@
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +94,9 @@
 %postun
 update-desktop-database &> /dev/null ||:
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -107,7 +113,7 @@
 %{_libdir}/muine/*.exe*
 %{_libdir}/muine/plugins/InotifyPlugin.dll*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/muine.png
+%{_datadir}/icons/hicolor/*/apps/muine.*
 %{_libdir}/muine/plugins/TrayIcon.dll*
 %{_libdir}/muine/plugins/muine-tray-*.png
 
@@ -116,6 +122,9 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Nov 13 2006 Sindre Pedersen Bj??rdal  - 0.8.6-1
+- New release
+- Add gtk icon cache scriplet for new icons
 * Fri Sep 29 2006 Sindre Pedersen Bj??rdal  - 0.8.5-7
 - Removed replacement of libdir
 * Fri Sep 15 2006 Sindre Pedersen Bj??rdal  - 0.8.5-6



From fedora-extras-commits at redhat.com  Mon Nov 13 19:14:12 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:14:12 -0700
Subject: rpms/mod_revocator - New directory
Message-ID: <200611131914.kADJECvB008528@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8523/mod_revocator

Log Message:
Directory /cvs/extras/rpms/mod_revocator added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 19:14:18 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:14:18 -0700
Subject: rpms/mod_revocator/devel - New directory
Message-ID: <200611131914.kADJEIP9008545@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8523/mod_revocator/devel

Log Message:
Directory /cvs/extras/rpms/mod_revocator/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 19:14:32 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:14:32 -0700
Subject: rpms/mod_revocator Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611131914.kADJEWaN008583@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8577

Added Files:
	Makefile import.log 
Log Message:
Setup of module mod_revocator


--- NEW FILE Makefile ---
# Top level Makefile for module mod_revocator
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  Mon Nov 13 19:14:38 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:14:38 -0700
Subject: rpms/mod_revocator/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611131914.kADJEcqa008601@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8577/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mod_revocator


--- 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 Nov 13 19:15:40 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:15:40 -0700
Subject: rpms/mod_revocator import.log,1.1,1.2
Message-ID: <200611131915.kADJFe8k008686@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8651

Modified Files:
	import.log 
Log Message:
auto-import mod_revocator-1.0.2-1 on branch devel from mod_revocator-1.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mod_revocator/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 19:14:32 -0000	1.1
+++ import.log	13 Nov 2006 19:15:10 -0000	1.2
@@ -0,0 +1 @@
+mod_revocator-1_0_2-1:HEAD:mod_revocator-1.0.2-1.src.rpm:1163445304



From fedora-extras-commits at redhat.com  Mon Nov 13 19:15:41 2006
From: fedora-extras-commits at redhat.com (Robert Crittenden (rcritten))
Date: Mon, 13 Nov 2006 12:15:41 -0700
Subject: rpms/mod_revocator/devel mod_revocator-libpath.patch, NONE,
	1.1 mod_revocator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611131915.kADJFfqn008690@cvs-int.fedora.redhat.com>

Author: rcritten

Update of /cvs/extras/rpms/mod_revocator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8651/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mod_revocator-libpath.patch mod_revocator.spec 
Log Message:
auto-import mod_revocator-1.0.2-1 on branch devel from mod_revocator-1.0.2-1.src.rpm

mod_revocator-libpath.patch:

--- NEW FILE mod_revocator-libpath.patch ---
diff -u mod_revocator-1.0.2.orig/revocator.conf mod_revocator-1.0.2/revocator.conf
--- mod_revocator-1.0.2.orig/revocator.conf	2006-08-04 14:49:33.000000000 -0400
+++ mod_revocator-1.0.2/revocator.conf	2006-10-16 10:10:33.000000000 -0400
@@ -1,4 +1,4 @@
-LoadModule rev_module modules/libmodrev.so
+LoadModule rev_module modules/mod_rev.so
 
 #   CRL Engine Switch:
 #   Enable/Disable CRL retrieval


--- NEW FILE mod_revocator.spec ---
Name: mod_revocator
Version: 1.0.2
Release: 1%{?dist}
Summary: CRL retrieval module for the Apache HTTP server
Group: System Environment/Daemons
License: Apache Software License
URL: http://directory.fedora.redhat.com/wiki/Mod_revocator
Source: http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= 4.6, nss-devel >= 3.11
BuildRequires: nss-pkcs11-devel >= 3.11
BuildRequires: httpd-devel >= 0:2.0.52, apr-devel, apr-util-devel
BuildRequires: pkgconfig
BuildRequires: openldap-devel >= 2.2.29
Requires: httpd >= 0:2.0.52
Requires: nspr >= 4.6
Requires: nss >= 3.11, nss-tools >= 3.11
Requires: mod_nss >= 1.0.3
Patch1: mod_revocator-libpath.patch

%description
The mod_revocator module retrieves and installs remote
Certificate Revocate Lists (CRLs) into an Apache web server. 

%prep
%setup -q
%patch1 -p1

%build

CFLAGS="$RPM_OPT_FLAGS"
export CFLAGS

NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nspr`
NSPR_LIB_DIR=`/usr/bin/pkg-config --variable=libdir nspr`

NSS_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nss`
NSS_LIB_DIR=`/usr/bin/pkg-config --variable=libdir nss`

NSS_BIN=`/usr/bin/pkg-config --variable=exec_prefix nss`

%configure \
    --with-nss-lib=$NSS_LIB_DIR \
    --with-nss-inc=$NSS_INCLUDE_DIR \
    --with-nspr-lib=$NSPR_LIB_DIR \
    --with-nspr-inc=$NSPR_INCLUDE_DIR \
    --with-apr-config --enable-openldap

make %{?_smp_flags} all

%install
# The install target of the Makefile isn't used because that uses apxs
# which tries to enable the module in the build host httpd instead of in
# the build root.
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules
mkdir -p $RPM_BUILD_ROOT%{_bindir}

install -m 644 revocator.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
install -m 755 .libs/libmodrev.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/mod_rev.so
# Ugh, manually create the ldconfig symbolic links
version=`grep -v '^\#' ./libtool-version`
current=`echo $version | cut -d: -f1`
revision=`echo $version | cut -d: -f2`
age=`echo $version | cut -d: -f3`
install -m  755 .libs/librevocation.so.$current.$revision.$age $RPM_BUILD_ROOT%{_libdir}/
(cd $RPM_BUILD_ROOT%{_libdir} && ln -s librevocation.so.$current.$revision.$age librevocation.so.0)
(cd $RPM_BUILD_ROOT%{_libdir} && ln -s librevocation.so.$current.$revision.$age  librevocation.so)
install -m 755 ldapget $RPM_BUILD_ROOT%{_bindir}/

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README LICENSE docs/mod_revocator.html
%config(noreplace) %{_sysconfdir}/httpd/conf.d/revocator.conf
%{_libdir}/httpd/modules/mod_rev.so
# rpmlint will complain that librevocation.so is a shared library but this
# must be ignored because this file is loaded directly by name by the Apache
# module.
%{_libdir}/librevocation.*so*
%{_bindir}/ldapget

%changelog
* Mon Oct 16 2006 Rob Crittenden  1.0.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_revocator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 19:14:37 -0000	1.1
+++ .cvsignore	13 Nov 2006 19:15:11 -0000	1.2
@@ -0,0 +1 @@
+mod_revocator-1.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_revocator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 19:14:37 -0000	1.1
+++ sources	13 Nov 2006 19:15:11 -0000	1.2
@@ -0,0 +1 @@
+07307d8972e3442fd81d84e3852611c5  mod_revocator-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:17:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb))
Date: Mon, 13 Nov 2006 12:17:26 -0700
Subject: rpms/muine/FC-5 .cvsignore, 1.3, 1.4 muine.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200611131917.kADJHQd4008749@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8729

Modified Files:
	.cvsignore muine.spec sources 
Log Message:
Update to 0.8.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2006 12:30:43 -0000	1.3
+++ .cvsignore	13 Nov 2006 19:16:55 -0000	1.4
@@ -1 +1 @@
-muine-0.8.5.tar.gz
+muine-0.8.6.tar.gz


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-5/muine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- muine.spec	21 Jun 2006 12:30:43 -0000	1.4
+++ muine.spec	13 Nov 2006 19:16:55 -0000	1.5
@@ -1,7 +1,7 @@
 %define _libdir /usr/lib
 
 Name:           muine
-Version:        0.8.5
+Version:        0.8.6
 Release:        1%{?dist}
 Summary:        Music Player for GNOME
 
@@ -78,6 +78,10 @@
 
 %post
 update-desktop-database &> /dev/null ||:
+
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
@@ -92,6 +96,11 @@
 %postun
 update-desktop-database &> /dev/null ||:
 
+
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -108,10 +117,11 @@
 %{_libdir}/muine/*.exe*
 %{_libdir}/muine/plugins/InotifyPlugin.dll*
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/muine.png
+%{_datadir}/icons/hicolor/*/apps/muine.*
 %{_libdir}/muine/plugins/TrayIcon.dll*
 %{_libdir}/muine/plugins/muine-tray-*.png
 
+
 %files devel 
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/muine/*.a


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2006 12:30:43 -0000	1.3
+++ sources	13 Nov 2006 19:16:55 -0000	1.4
@@ -1 +1 @@
-6960b21da5fd5cbc7a2e5a93a7bcd2a2  muine-0.8.5.tar.gz
+8646e439667896423c06cc2fcb67754f  muine-0.8.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:34:10 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 13 Nov 2006 12:34:10 -0700
Subject: rpms/lilypond/FC-6 .cvsignore, 1.6, 1.7 lilypond.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611131934.kADJYA8e009019@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999

Modified Files:
	.cvsignore lilypond.spec sources 
Log Message:
New release, updated build requirements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Nov 2006 18:35:28 -0000	1.6
+++ .cvsignore	13 Nov 2006 19:33:40 -0000	1.7
@@ -1 +1 @@
-lilypond-2.8.8.tar.gz
+lilypond-2.10.0.tar.gz


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/lilypond.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lilypond.spec	6 Nov 2006 18:35:28 -0000	1.6
+++ lilypond.spec	13 Nov 2006 19:33:40 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		lilypond
-Version:	2.8.8
+Version:	2.10.0
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
@@ -13,12 +13,13 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-Buildrequires:  t1utils bison flex mftrace ImageMagick
-BuildRequires:  gettext python-devel tetex
-BuildRequires:  texinfo >= 4.7
-BuildRequires:  guile-devel >= 1.6.4
+Buildrequires:  t1utils bison flex ImageMagick gettext tetex
+BuildRequires:  python-devel >= 2.4.0
+BuildRequires:  mftrace >= 1.1.19
+BuildRequires:  texinfo >= 4.8
+BuildRequires:  guile-devel >= 1.8
 BuildRequires:  ghostscript >= 8.15
-BuildRequires:  pango-devel >= 1.6.0
+BuildRequires:  pango-devel >= 1.12.0
 
 %description
 LilyPond is an automated music engraving system. It formats music
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Quentin Spencer  2.10.0-1
+- New release. Update build requirements for 2.10 series.
+
 * Fri Nov  3 2006 Quentin Spencer  2.8.8-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Nov 2006 18:35:28 -0000	1.6
+++ sources	13 Nov 2006 19:33:40 -0000	1.7
@@ -1 +1 @@
-2fe58ff2fcbc848def46ef287a693189  lilypond-2.8.8.tar.gz
+82e4487c5c1fa1d2e478d5974a3630df  lilypond-2.10.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:59:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Nov 2006 12:59:13 -0700
Subject: rpms/perl-Perl-Critic/FC-6 .cvsignore, 1.2,
	1.3 perl-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611131959.kADJxDqh009262@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-serv9211/FC-6

Modified Files:
	.cvsignore perl-Perl-Critic.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 17:07:14 -0000	1.2
+++ .cvsignore	13 Nov 2006 19:58:43 -0000	1.3
@@ -1 +1 @@
-Perl-Critic-0.2.tar.gz
+Perl-Critic-0.21.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Perl-Critic.spec	23 Sep 2006 17:07:14 -0000	1.1
+++ perl-Perl-Critic.spec	13 Nov 2006 19:58:43 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Perl-Critic
-Version:        0.2
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
@@ -15,7 +15,8 @@
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable)
-BuildRequires:  perl(PPI) >= 1.117
+BuildRequires:  perl(PPI) >= 1.118
+BuildRequires:  perl(Set::Scalar) >= 1.20
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Pod)
@@ -52,6 +53,8 @@
 
 
 %check
+# Author tests would require: Test::Kwalitee, Test::Spelling, File::Which, and aspell
+# TEST_AUTHOR=1 ./Build test
 ./Build test
 
 
@@ -69,5 +72,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.21-1
+- Update to 0.21.
+- New BR: perl(Set::Scalar).
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 0.2-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 17:07:14 -0000	1.2
+++ sources	13 Nov 2006 19:58:43 -0000	1.3
@@ -1 +1 @@
-a31ab7c92cdb0501c1a3e298495f61c5  Perl-Critic-0.2.tar.gz
+0359235579986f76438d7a1180598feb  Perl-Critic-0.21.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 19:59:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 13 Nov 2006 12:59:12 -0700
Subject: rpms/perl-Perl-Critic/FC-5 .cvsignore, 1.2,
	1.3 perl-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611131959.kADJxCCw009257@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-serv9211/FC-5

Modified Files:
	.cvsignore perl-Perl-Critic.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Sep 2006 17:07:14 -0000	1.2
+++ .cvsignore	13 Nov 2006 19:58:42 -0000	1.3
@@ -1 +1 @@
-Perl-Critic-0.2.tar.gz
+Perl-Critic-0.21.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Perl-Critic.spec	23 Sep 2006 17:07:14 -0000	1.1
+++ perl-Perl-Critic.spec	13 Nov 2006 19:58:42 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Perl-Critic
-Version:        0.2
+Version:        0.21
 Release:        1%{?dist}
 Summary:        Critique Perl source code for best-practices
 
@@ -15,7 +15,8 @@
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(Module::Pluggable)
-BuildRequires:  perl(PPI) >= 1.117
+BuildRequires:  perl(PPI) >= 1.118
+BuildRequires:  perl(Set::Scalar) >= 1.20
 BuildRequires:  perl(String::Format) >= 1.13
 BuildRequires:  perl(Perl::Tidy)
 BuildRequires:  perl(Test::Pod)
@@ -52,6 +53,8 @@
 
 
 %check
+# Author tests would require: Test::Kwalitee, Test::Spelling, File::Which, and aspell
+# TEST_AUTHOR=1 ./Build test
 ./Build test
 
 
@@ -69,5 +72,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Jose Pedro Oliveira  - 0.21-1
+- Update to 0.21.
+- New BR: perl(Set::Scalar).
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 0.2-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Perl-Critic/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Sep 2006 17:07:14 -0000	1.2
+++ sources	13 Nov 2006 19:58:42 -0000	1.3
@@ -1 +1 @@
-a31ab7c92cdb0501c1a3e298495f61c5  Perl-Critic-0.2.tar.gz
+0359235579986f76438d7a1180598feb  Perl-Critic-0.21.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 20:10:18 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 13 Nov 2006 13:10:18 -0700
Subject: rpms/glipper import.log,1.5,1.6
Message-ID: <200611132010.kADKAIhQ012584@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12543

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.95-1 on branch devel from glipper-0.95-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	16 Oct 2006 20:06:18 -0000	1.5
+++ import.log	13 Nov 2006 20:09:48 -0000	1.6
@@ -2,3 +2,4 @@
 glipper-0_89-3_fc6:HEAD:glipper-0.89-3.fc6.src.rpm:1154108800
 glipper-0_89-4_fc6:HEAD:glipper-0.89-4.fc6.src.rpm:1156791617
 glipper-0_89-5:HEAD:glipper-0.89-5.src.rpm:1161029170
+glipper-0_95-1:HEAD:glipper-0.95-1.src.rpm:1163448587



From fedora-extras-commits at redhat.com  Mon Nov 13 20:10:19 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 13 Nov 2006 13:10:19 -0700
Subject: rpms/glipper/devel .cvsignore, 1.2, 1.3 glipper.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200611132010.kADKAJhJ012589@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12543/devel

Modified Files:
	.cvsignore glipper.spec sources 
Log Message:
auto-import glipper-0.95-1 on branch devel from glipper-0.95-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jul 2006 09:24:10 -0000	1.2
+++ .cvsignore	13 Nov 2006 20:09:49 -0000	1.3
@@ -1 +1 @@
-glipper-0.89.tar.gz
+glipper-0.95.tar.gz


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glipper.spec	16 Oct 2006 20:06:19 -0000	1.4
+++ glipper.spec	13 Nov 2006 20:09:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glipper
-Version:        0.89
-Release:        5%{?dist}
+Version:        0.95
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -41,11 +41,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-
+%{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Mon Nov 13 2006 Damien Durand  - 0.95-1
+- Update to 0.95 release
+- Fix Doc
+
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped
 
@@ -53,12 +58,12 @@
 - Bump release
 
 * Fri Jul 28 2006 Damien Durand  - 0.89-3
-- Fixed Desktop file
+- Fix Desktop file
 
 * Fri Jul 7 2006 Damien Durand  - 0.89-2
-- Fixed mixed-use-of-spaces-and-tabs in changelog
-- Added category Text and delete-original in desktop-file-install
-- Added intltool as BR
+- Fix mixed-use-of-spaces-and-tabs in changelog
+- Add category Text and delete-original in desktop-file-install
+- Add intltool as BR
 
 * Tue Apr 6 2006 Damien Durand  - 0.89-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2006 09:24:10 -0000	1.2
+++ sources	13 Nov 2006 20:09:49 -0000	1.3
@@ -1 +1 @@
-ad96d990d8b7dacd5decdfa1fe22d043  glipper-0.89.tar.gz
+d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 20:10:51 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 13 Nov 2006 13:10:51 -0700
Subject: extras-buildsys/server PackageJob.py,1.57,1.58
Message-ID: <200611132010.kADKApPb012644@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12626/server

Modified Files:
	PackageJob.py 
Log Message:
Fix bad import; found by Joe Todaro


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- PackageJob.py	10 Nov 2006 14:30:47 -0000	1.57
+++ PackageJob.py	13 Nov 2006 20:10:48 -0000	1.58
@@ -510,7 +510,7 @@
                 threshold = 5
             if use_yum_logger == True:
                 # For yum 2.x and earlier
-                base.log = logger.Logger(threshold=threshold, file_object=sys.stdout)
+                base.log = Logger(threshold=threshold, file_object=sys.stdout)
             else:
                 # Use python logging module (yum 3.x and later)
                 base.doLoggingSetup(threshold, 1)



From fedora-extras-commits at redhat.com  Mon Nov 13 20:13:38 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 13 Nov 2006 13:13:38 -0700
Subject: rpms/glipper/FC-6 glipper.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200611132013.kADKDc9I012789@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12769

Modified Files:
	glipper.spec sources 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/glipper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glipper.spec	16 Oct 2006 20:06:19 -0000	1.4
+++ glipper.spec	13 Nov 2006 20:13:07 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glipper
-Version:        0.89
-Release:        5%{?dist}
+Version:        0.95
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -41,11 +41,16 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-
+%{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Mon Nov 13 2006 Damien Durand  - 0.95-1
+- Update to 0.95 release
+- Fix Doc
+
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped
 
@@ -53,12 +58,12 @@
 - Bump release
 
 * Fri Jul 28 2006 Damien Durand  - 0.89-3
-- Fixed Desktop file
+- Fix Desktop file
 
 * Fri Jul 7 2006 Damien Durand  - 0.89-2
-- Fixed mixed-use-of-spaces-and-tabs in changelog
-- Added category Text and delete-original in desktop-file-install
-- Added intltool as BR
+- Fix mixed-use-of-spaces-and-tabs in changelog
+- Add category Text and delete-original in desktop-file-install
+- Add intltool as BR
 
 * Tue Apr 6 2006 Damien Durand  - 0.89-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2006 09:24:10 -0000	1.2
+++ sources	13 Nov 2006 20:13:07 -0000	1.3
@@ -1 +1 @@
-ad96d990d8b7dacd5decdfa1fe22d043  glipper-0.89.tar.gz
+d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 20:15:05 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Mon, 13 Nov 2006 13:15:05 -0700
Subject: rpms/glipper/FC-5 glipper.spec,1.3,1.4 sources,1.2,1.3
Message-ID: <200611132015.kADKF53v012853@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12833

Modified Files:
	glipper.spec sources 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/glipper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glipper.spec	28 Jul 2006 17:53:26 -0000	1.3
+++ glipper.spec	13 Nov 2006 20:14:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           glipper
-Version:        0.89
-Release:        3%{?dist}
+Version:        0.95
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -41,18 +41,29 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-
+%{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Mon Nov 13 2006 Damien Durand  - 0.95-1
+- Update to 0.95 release
+- Fix Doc
+
+* Mon Oct 16 2006 Damien Durand  - 0.89-5
+- Bumped
+
+* Mon Aug 28 2006 Damien Durand  - 0.89-4
+- Bump release
+
 * Fri Jul 28 2006 Damien Durand  - 0.89-3
-- Fixed Desktop file
+- Fix Desktop file
 
 * Fri Jul 7 2006 Damien Durand  - 0.89-2
-- Fixed mixed-use-of-spaces-and-tabs in changelog
-- Added category Text and delete-original in desktop-file-install
-- Added intltool as BR
+- Fix mixed-use-of-spaces-and-tabs in changelog
+- Add category Text and delete-original in desktop-file-install
+- Add intltool as BR
 
 * Tue Apr 6 2006 Damien Durand  - 0.89-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2006 09:24:10 -0000	1.2
+++ sources	13 Nov 2006 20:14:35 -0000	1.3
@@ -1 +1 @@
-ad96d990d8b7dacd5decdfa1fe22d043  glipper-0.89.tar.gz
+d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 20:36:57 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 13:36:57 -0700
Subject: rpms/gnupg2/devel .cvsignore, 1.16, 1.17 gnupg2.spec, 1.57,
	1.58 sources, 1.18, 1.19
Message-ID: <200611132036.kADKavK7013239@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13217

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Mon Nov 13 2006 Rex Dieter  2.0-1
- 2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Nov 2006 13:16:45 -0000	1.16
+++ .cvsignore	13 Nov 2006 20:36:26 -0000	1.17
@@ -1,4 +1,4 @@
-gnupg-1.9.94.tar.bz2
-gnupg-1.9.94.tar.bz2.sig
 gnupg-1.9.95.tar.bz2
 gnupg-1.9.95.tar.bz2.sig
+gnupg-2.0.0.tar.bz2
+gnupg-2.0.0.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnupg2.spec	6 Nov 2006 17:11:13 -0000	1.57
+++ gnupg2.spec	13 Nov 2006 20:36:26 -0000	1.58
@@ -7,18 +7,15 @@
 %define kde_scriptdir %{_prefix}
 %endif
 
-# define to build/include gpg2 binary
-%define _enable_gpg --enable-gpg
-
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.95
-Release: 2%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +23,8 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
+# http://lists.gnupg.org/pipermail/gnupg-devel/2006-November/023359.html 
+Patch1: gnupg-1.9.95-64bit.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 Patch3: gnupg-1.9.91-dearmor.patch
 
@@ -56,10 +55,8 @@
 Requires: fileutils util-linux
 Requires: pinentry >= 0.7.1
 
-%if "%{?_enable_gpg:1}" == "1"
 Provides: gpg
 Provides: openpgp
-%endif
 
 %description
 GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
@@ -79,6 +76,7 @@
 %prep
 %setup -q -n gnupg-%{version}
 
+#patch1 -p1 -b .64bit
 #patch2 -p1 -b .testverbose
 %patch3 -p1 -b .dearmor
 
@@ -96,15 +94,9 @@
 
 %build
 
-# see --disable-optimization below
-%ifarch x86_64
-#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O0|')"
-%endif
-
 %configure \
   --disable-rpath \
   --enable-selinux-support \
-  %{?_enable_gpg} \
 %ifarch x86_64
   --disable-optimization 
 %endif
@@ -113,11 +105,6 @@
 make 
 
 
-%check
-# some gpg2 tests (still) FAIL
-make -k check ||:
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -139,6 +126,11 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
+%check
+# some gpg2 tests (still) FAIL
+make -k check ||:
+
+
 %post
 /sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir ||:
 
@@ -147,15 +139,14 @@
   /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir ||:
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
-%if "%{?_enable_gpg:1}" == "1"
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
-%endif
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
@@ -176,11 +167,18 @@
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  2.0-1
+- 2.0
+
+* Fri Nov 10 2006 Rex Dieter  1.9.95-3
+- upstream 64bit patch
+
 * Mon Nov 06 2006 Rex Dieter  1.9.95-2
 - fix (more) file conflicts with gnupg
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Nov 2006 13:16:45 -0000	1.18
+++ sources	13 Nov 2006 20:36:26 -0000	1.19
@@ -1,2 +1,2 @@
-2f8f134c4b0a8a69f2017100e7a51101  gnupg-1.9.95.tar.bz2
-a0d38a16e7542e4c4fd10607fe029745  gnupg-1.9.95.tar.bz2.sig
+65dc5da3bd4ec127f81c584c8200d813  gnupg-2.0.0.tar.bz2.sig
+13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 13 20:45:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 13:45:58 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.58,1.59
Message-ID: <200611132045.kADKjw7x013398@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13371

Modified Files:
	gnupg2.spec 
Log Message:
drop upstreamed 64bit patch



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnupg2.spec	13 Nov 2006 20:36:26 -0000	1.58
+++ gnupg2.spec	13 Nov 2006 20:45:28 -0000	1.59
@@ -10,7 +10,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -24,7 +24,7 @@
 Source11: gpg-agent-shutdown.sh
 
 # http://lists.gnupg.org/pipermail/gnupg-devel/2006-November/023359.html 
-Patch1: gnupg-1.9.95-64bit.patch
+#Patch1: gnupg-1.9.95-64bit.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 Patch3: gnupg-1.9.91-dearmor.patch
 
@@ -173,8 +173,8 @@
 
 
 %changelog
-* Mon Nov 13 2006 Rex Dieter  2.0-1
-- 2.0
+* Mon Nov 13 2006 Rex Dieter  2.0.0-2
+- 2.0.0
 
 * Fri Nov 10 2006 Rex Dieter  1.9.95-3
 - upstream 64bit patch



From fedora-extras-commits at redhat.com  Mon Nov 13 21:26:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 14:26:03 -0700
Subject: rpms/libassuan/devel .cvsignore, 1.7, 1.8 libassuan.spec, 1.20,
	1.21 sources, 1.7, 1.8 libassuan-0.9.3-m4-2.patch, 1.1,
	NONE libassuan-0.9.3-m4.patch, 1.1, NONE
Message-ID: <200611132126.kADLQ3U7016643@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16621

Modified Files:
	.cvsignore libassuan.spec sources 
Removed Files:
	libassuan-0.9.3-m4-2.patch libassuan-0.9.3-m4.patch 
Log Message:
* Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
- 1.0.0
- rename -devel -> -static (+Obsoletes/Provides: %name-devel)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Oct 2006 18:37:19 -0000	1.7
+++ .cvsignore	13 Nov 2006 21:25:32 -0000	1.8
@@ -1,5 +1,4 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-0.9.2.tar.bz2.sig
-libassuan-0.9.2.tar.bz2
-libassuan-0.9.3.tar.bz2.sig
+libassuan-1.0.0.tar.bz2
+libassuan-1.0.0.tar.bz2.sig


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libassuan.spec	18 Oct 2006 14:07:08 -0000	1.20
+++ libassuan.spec	13 Nov 2006 21:25:32 -0000	1.21
@@ -1,34 +1,32 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 0.9.3
-Release: 2%{?dist}
+Version: 1.0.0 
+Release: 1%{?dist}
 
 License: LGPL
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libassuan-0.9.3-m4.patch
-Patch2: libassuan-0.9.3-m4-2.patch
-
 BuildRequires: pth-devel
 
 %description
 This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
 packages.
 
-%package devel
+%package static 
 Summary: GnuPG IPC library 
 Group: Development/Libraries
 Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Provides: %{name}-static = %{version}-%{release}
-%description devel
-This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
+Obsoletes: %{name}-devel < %{version}-%{release}
+Provides:  %{name}-devel = %{version}-%{release}
+%description static 
+This is the IPC static library used by GnuPG 1.9/2, GPGME and a few other
 packages.
 
 This package contains files needed to develop applications using %{name}.
@@ -37,9 +35,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .m4patch
-%patch2 -p0 -b .m4patch-2
-
 
 %build
 #ifarch x86_64
@@ -59,14 +54,14 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
-%check || :
+%check
 make check
 
 
-%post devel
+%post static 
 /sbin/install-info %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
 
-%postun devel
+%postun static 
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
 fi
@@ -76,7 +71,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files devel
+%files static 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
@@ -87,6 +82,10 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
+- 1.0.0
+- rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
+
 * Wed Oct 18 2006 Rex Dieter  - 0.9.3-2
 - another libassuan.m4 patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Oct 2006 18:37:19 -0000	1.7
+++ sources	13 Nov 2006 21:25:32 -0000	1.8
@@ -1,2 +1,2 @@
-a2e3cb948de5159728e73d53529ae7ad  libassuan-0.9.3.tar.bz2.sig
-60add4aebf1961436da3a470d6ac833c  libassuan-0.9.3.tar.bz2
+f1580ef149e629629a9639a5afdb5908  libassuan-1.0.0.tar.bz2
+c00497327001dcccf7d3a952f56030e4  libassuan-1.0.0.tar.bz2.sig


--- libassuan-0.9.3-m4-2.patch DELETED ---


--- libassuan-0.9.3-m4.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 21:34:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:34:46 -0700
Subject: rpms/gauche/FC-6 gauche.spec,1.4,1.5 gauche-jp.patch,1.1,NONE
Message-ID: <200611132134.kADLYkD2016850@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757/FC-6

Modified Files:
	gauche.spec 
Removed Files:
	gauche-jp.patch 
Log Message:
new version 0.8.8


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-6/gauche.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gauche.spec	28 Aug 2006 00:51:01 -0000	1.4
+++ gauche.spec	13 Nov 2006 21:34:16 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gauche
-Version:	0.8.7
-Release:	6%{?dist}
+Version:	0.8.8
+Release:	1%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz
-Patch0:		gauche-jp.patch
+Source:		http://download.sourceforge.net/gauche/Gauche-0.8.8.tgz
 Patch1:		gauche-arch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gdbm-devel
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n Gauche-%{version}
-%patch0 -p1
 %patch1 -p1
 
 
@@ -123,6 +121,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+- new version 0.8.8
+
 * Mon Aug 28 2006 Gerard Milmeister  - 0.8.7-6
 - Rebuild for FE6
 


--- gauche-jp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 21:34:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:34:45 -0700
Subject: rpms/gauche/FC-5 gauche.spec,1.3,1.4 gauche-jp.patch,1.1,NONE
Message-ID: <200611132134.kADLYjVT016847@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757/FC-5

Modified Files:
	gauche.spec 
Removed Files:
	gauche-jp.patch 
Log Message:
new version 0.8.8


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-5/gauche.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gauche.spec	3 May 2006 22:36:28 -0000	1.3
+++ gauche.spec	13 Nov 2006 21:34:15 -0000	1.4
@@ -1,13 +1,12 @@
 Name:		gauche
-Version:	0.8.7
-Release:	5%{?dist}
+Version:	0.8.8
+Release:	1%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz
-Patch0:		gauche-jp.patch
+Source:		http://download.sourceforge.net/gauche/Gauche-0.8.8.tgz
 Patch1:		gauche-arch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gdbm-devel
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n Gauche-%{version}
-%patch0 -p1
 %patch1 -p1
 
 
@@ -123,6 +121,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+- new version 0.8.8
+
 * Thu May  4 2006 Gerard Milmeister  - 0.8.7-5
 - added patch for consistent arch directories (gauche-arch.patch)
 


--- gauche-jp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 21:34:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:34:47 -0700
Subject: rpms/gauche/devel gauche.spec,1.4,1.5 gauche-jp.patch,1.1,NONE
Message-ID: <200611132134.kADLYlkA016853@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757/devel

Modified Files:
	gauche.spec 
Removed Files:
	gauche-jp.patch 
Log Message:
new version 0.8.8


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/gauche.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gauche.spec	28 Aug 2006 00:51:01 -0000	1.4
+++ gauche.spec	13 Nov 2006 21:34:17 -0000	1.5
@@ -1,13 +1,12 @@
 Name:		gauche
-Version:	0.8.7
-Release:	6%{?dist}
+Version:	0.8.8
+Release:	1%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz
-Patch0:		gauche-jp.patch
+Source:		http://download.sourceforge.net/gauche/Gauche-0.8.8.tgz
 Patch1:		gauche-arch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gdbm-devel
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n Gauche-%{version}
-%patch0 -p1
 %patch1 -p1
 
 
@@ -123,6 +121,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+- new version 0.8.8
+
 * Mon Aug 28 2006 Gerard Milmeister  - 0.8.7-6
 - Rebuild for FE6
 


--- gauche-jp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 21:40:10 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 14:40:10 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.59,1.60
Message-ID: <200611132140.kADLeATa017011@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16992

Modified Files:
	gnupg2.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  2.0.0-3
- BR: libassuan-static >= 1.0.0



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnupg2.spec	13 Nov 2006 20:45:28 -0000	1.59
+++ gnupg2.spec	13 Nov 2006 21:39:40 -0000	1.60
@@ -10,7 +10,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -33,7 +33,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 0.9.3
+BuildRequires: libassuan-static >= 1.0.0 
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  2.0.0-3
+- BR: libassuan-static >= 1.0.0
+
 * Mon Nov 13 2006 Rex Dieter  2.0.0-2
 - 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Nov 13 21:44:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:44:42 -0700
Subject: rpms/gauche-gl/devel Gauche-gl-fix.patch, 1.1, 1.2 gauche-gl.spec,
	1.3, 1.4
Message-ID: <200611132144.kADLigpU017106@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17085

Modified Files:
	Gauche-gl-fix.patch gauche-gl.spec 
Log Message:
new version 0.4.2

Gauche-gl-fix.patch:

Index: Gauche-gl-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/devel/Gauche-gl-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Gauche-gl-fix.patch	9 May 2006 19:27:29 -0000	1.1
+++ Gauche-gl-fix.patch	13 Nov 2006 21:44:12 -0000	1.2
@@ -1,15 +1,22 @@
---- Gauche-gl-0.4/src/gauche-gl.c.fix	2005-07-01 23:58:51.000000000 +0200
-+++ Gauche-gl-0.4/src/gauche-gl.c	2005-07-01 23:59:01.000000000 +0200
-@@ -136,11 +136,7 @@
-    supports GLX for the time being. */
+--- Gauche-gl-0.4.2/src/gauche-gl.c.fix	2006-11-13 22:39:05.000000000 +0100
++++ Gauche-gl-0.4.2/src/gauche-gl.c	2006-11-13 22:42:04.000000000 +0100
+@@ -139,18 +139,7 @@
+ */
  void *Scm_GLGetProcAddress(const char *name)
  {
--#if defined(GLX_VERSION_1_4)
+-#if defined(GLX_ARB_get_proc_address)
+-    if (glXGetProcAddressARB != NULL) {
+-        return glXGetProcAddressARB((const GLubyte*)name);
+-    }
+-#elif defined(GLX_VERSION_1_4)
 -    if (glXGetProcAddress != NULL) {
 -        return glXGetProcAddress(name);
 -    }
--#elif defined(GLX_ARB_get_proc_address)
-+#if defined(GLX_ARB_get_proc_address)
-     if (glXGetProcAddressARB != NULL) {
-         return glXGetProcAddressARB(name);
-     }
+-#elif defined(MacOSX)
+-    return glutGetProcAddress(name);
+-#endif /* !defined(GLX_VERSION_1_4) && !defined(GLX_ARB_get_proc_address) */
+-    Scm_Error("GL extension %s is not supported on this platform", name);
++    return glXGetProcAddressARB((const GLubyte*)name);
+ }
+ 
+ /* List of numbers -> array of doubles.  Returns # of elements. */


Index: gauche-gl.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/devel/gauche-gl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gauche-gl.spec	28 Aug 2006 09:31:53 -0000	1.3
+++ gauche-gl.spec	13 Nov 2006 21:44:12 -0000	1.4
@@ -1,14 +1,14 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gl
-Version:        0.4.1
-Release:        6%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:	OpenGL binding for Gauche
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.1.tgz
+Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.2.tgz
 Patch0:		Gauche-gl-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: 	gauche-devel = %{gauche_version}
@@ -29,7 +29,7 @@
 %prep
 %setup -q -n Gauche-gl-%{version}
 %patch0 -p1
-(cd src; mv gauche-gl.c.orig gauche-gl.c)
+
 
 %build
 %configure
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.2-1
+- new version 0.4.2
+
 * Fri May  5 2006 Gerard Milmeister  - 0.4.1-4
 - cleaned up Requires
 - removed unnecessary files



From fedora-extras-commits at redhat.com  Mon Nov 13 21:53:16 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:53:16 -0700
Subject: rpms/gauche/FC-5 .cvsignore, 1.2, 1.3 gauche.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200611132153.kADLrGgZ017239@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187/FC-5

Modified Files:
	.cvsignore gauche.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2006 22:05:18 -0000	1.2
+++ .cvsignore	13 Nov 2006 21:52:46 -0000	1.3
@@ -1 +1 @@
-Gauche-0.8.7.tgz
+Gauche-0.8.8.tgz


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-5/gauche.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gauche.spec	13 Nov 2006 21:34:15 -0000	1.4
+++ gauche.spec	13 Nov 2006 21:52:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gauche
 Version:	0.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
@@ -121,7 +121,7 @@
 
 
 %changelog
-* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-2
 - new version 0.8.8
 
 * Thu May  4 2006 Gerard Milmeister  - 0.8.7-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2006 22:05:18 -0000	1.2
+++ sources	13 Nov 2006 21:52:46 -0000	1.3
@@ -1 +1 @@
-5c7cb6eba7455c9877aec884b0088a25  Gauche-0.8.7.tgz
+ed12c4e28ec36f68629843c4e8725ccc  Gauche-0.8.8.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 21:53:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:53:17 -0700
Subject: rpms/gauche/FC-6 .cvsignore, 1.2, 1.3 gauche.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200611132153.kADLrHnG017244@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187/FC-6

Modified Files:
	.cvsignore gauche.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2006 22:05:18 -0000	1.2
+++ .cvsignore	13 Nov 2006 21:52:46 -0000	1.3
@@ -1 +1 @@
-Gauche-0.8.7.tgz
+Gauche-0.8.8.tgz


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-6/gauche.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gauche.spec	13 Nov 2006 21:34:16 -0000	1.5
+++ gauche.spec	13 Nov 2006 21:52:46 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gauche
 Version:	0.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
@@ -121,7 +121,7 @@
 
 
 %changelog
-* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-2
 - new version 0.8.8
 
 * Mon Aug 28 2006 Gerard Milmeister  - 0.8.7-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2006 22:05:18 -0000	1.2
+++ sources	13 Nov 2006 21:52:46 -0000	1.3
@@ -1 +1 @@
-5c7cb6eba7455c9877aec884b0088a25  Gauche-0.8.7.tgz
+ed12c4e28ec36f68629843c4e8725ccc  Gauche-0.8.8.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 21:53:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 14:53:17 -0700
Subject: rpms/gauche/devel .cvsignore, 1.2, 1.3 gauche.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200611132153.kADLrHgE017249@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187/devel

Modified Files:
	.cvsignore gauche.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2006 22:05:18 -0000	1.2
+++ .cvsignore	13 Nov 2006 21:52:47 -0000	1.3
@@ -1 +1 @@
-Gauche-0.8.7.tgz
+Gauche-0.8.8.tgz


Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/gauche.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gauche.spec	13 Nov 2006 21:34:17 -0000	1.5
+++ gauche.spec	13 Nov 2006 21:52:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gauche
 Version:	0.8.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
@@ -121,7 +121,7 @@
 
 
 %changelog
-* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-1
+* Mon Nov 13 2006 Gerard Milmeister  - 0.8.8-2
 - new version 0.8.8
 
 * Mon Aug 28 2006 Gerard Milmeister  - 0.8.7-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2006 22:05:18 -0000	1.2
+++ sources	13 Nov 2006 21:52:47 -0000	1.3
@@ -1 +1 @@
-5c7cb6eba7455c9877aec884b0088a25  Gauche-0.8.7.tgz
+ed12c4e28ec36f68629843c4e8725ccc  Gauche-0.8.8.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 21:58:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Sindre_Pedersen_Bj=C3=B8rdal?= (sindrepb))
Date: Mon, 13 Nov 2006 14:58:28 -0700
Subject: rpms/muine/FC-6 muine-trayicon-transparency-bug-343698.patch, NONE, 
	1.1 muine.spec, 1.10, 1.11
Message-ID: <200611132158.kADLwSjs017409@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17384

Modified Files:
	muine.spec 
Added Files:
	muine-trayicon-transparency-bug-343698.patch 
Log Message:
Add patch to fix trayicon

muine-trayicon-transparency-bug-343698.patch:

--- NEW FILE muine-trayicon-transparency-bug-343698.patch ---
? muine-0.8.6.tar.gz
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/muine/ChangeLog,v
retrieving revision 1.701
diff -u -p -r1.701 ChangeLog
--- ChangeLog	10 Nov 2006 23:29:53 -0000	1.701
+++ ChangeLog	13 Nov 2006 21:49:07 -0000
@@ -1,3 +1,15 @@
+2006-11-13  Wouter Bolsterlee  
+
+	* plugins/Makefile.am:
+	* plugins/NotificationArea.cs:
+	* plugins/TrayIcon.cs:
+
+	Ported (copy/pasted) trayicon code from Banshee. It
+	seems newer and contains the previous muine-specific
+	patches to the trayicon code. Amongst possible other
+	things, this makes the muine trayicon transparent. Fixes
+	bug #343698.
+
 2006-11-10  Peter Johanson  
 
 	* NEWS: Add item about new Latvian translation.
Index: plugins/Makefile.am
===================================================================
RCS file: /cvs/gnome/muine/plugins/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- plugins/Makefile.am	21 Mar 2006 08:24:23 -0000	1.10
+++ plugins/Makefile.am	13 Nov 2006 21:49:07 -0000
@@ -22,7 +22,7 @@ DASHBOARD_PLUGIN_CSFILES =		\
 
 TRAY_ICON_CSFILES =			\
 	$(srcdir)/TrayIcon.cs		\
-	$(srcdir)/egg-sharp.cs
+	$(srcdir)/NotificationArea.cs
 
 TRAY_ICON_EXTRA_CSFILES =		\
 	$(top_builddir)/src/Defines.cs	\
Index: plugins/NotificationArea.cs
===================================================================
RCS file: plugins/NotificationArea.cs
diff -N plugins/NotificationArea.cs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ plugins/NotificationArea.cs	13 Nov 2006 21:49:07 -0000
@@ -0,0 +1,513 @@
+/***************************************************************************
+ *  NotificationAreaIcon.cs
+ *
+ * Copyright (C) 2005 Todd Berman 
+ * Copyright (C) 2005 Ed Catmur 
+ * Copyright (C) 2005 Novell, Inc. (Miguel de Icaza, Aaron Bockover)
+ ****************************************************************************/
+
+/*  THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW: 
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),  
+ *  to deal in the Software without restriction, including without limitation  
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,  
+ *  and/or sell copies of the Software, and to permit persons to whom the  
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in 
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ *  DEALINGS IN THE SOFTWARE.
+ */
+
+// NOTE: throughout IntPtr is used for the Xlib long type, as this tends to 
+// have the correct width and does not require any configure checks.
+
+using System;
+using System.Runtime.InteropServices;
+
+using Gtk;
+using Gdk;
+
+#pragma warning disable 0169
+
+public class NotificationArea : Plug
+{
+	private uint stamp;
+	private Orientation orientation;
+	
+	private IntPtr selection_atom;
+	private IntPtr manager_atom;
+	private IntPtr system_tray_opcode_atom;
+	private IntPtr orientation_atom;
+	private IntPtr message_data_atom;
+	private IntPtr manager_window;
+	private FilterFunc filter;
+	
+	public NotificationArea (string name)
+	{
+		Title = name;
+		Init ();
+	}
+
+	public NotificationArea (string name, Gdk.Screen screen)
+	{
+		Title = name;
+		Screen = screen;
+		Init ();
+	}
+	
+	[DllImport ("libc")]
+	private static extern IntPtr memcpy (ref XClientMessageEvent.DataUnion dest, IntPtr src, IntPtr len);
+
+	public uint SendMessage (uint timeout, string message)
+	{
+		if (manager_window == IntPtr.Zero) {
+			return 0;
+		}
+		
+		byte[] arr = System.Text.Encoding.UTF8.GetBytes (message);
+		IntPtr unmanaged_arr = Marshal.AllocHGlobal (arr.Length);
+		Marshal.Copy (arr, 0, unmanaged_arr, arr.Length);
+
+		SendManagerMessage (SystemTrayMessage.BeginMessage, (IntPtr) Id, timeout, (uint) arr.Length, ++stamp);
+
+		gdk_error_trap_push ();
+	
+		for (int index = 0; index < message.Length; index += 20) {
+			XClientMessageEvent ev = new XClientMessageEvent ();
+		
+			IntPtr display = gdk_x11_display_get_xdisplay (Display.Handle);
+		
+			ev.type = XEventName.ClientMessage;
+			ev.window = (IntPtr) Id;
+			ev.format = 8;
+			ev.message_type = message_data_atom;
+       
+			int len = Math.Min (arr.Length - index, 20);
+			memcpy (ref ev.data, (IntPtr)((int)unmanaged_arr + index), (IntPtr)len);
+		
+			XSendEvent (display, manager_window, false, (IntPtr) EventMask.StructureNotifyMask, ref ev);
+			XSync (display, false);
+		}
+	
+		gdk_error_trap_pop ();
+	
+		return stamp;
+	}
+
+	public void CancelMessage (uint id)
+	{
+		if (id == 0) {
+			return;
+		}
+	
+		SendManagerMessage (SystemTrayMessage.CancelMessage, (IntPtr) Id, id, 0, 0);
+	}
+
+	private void Init ()
+	{
+		stamp = 1;
+		orientation = Orientation.Horizontal;
+		AddEvents ((int)EventMask.PropertyChangeMask);
+		filter = new FilterFunc (ManagerFilter);
+	}
+
+        [GLib.ConnectBefore]
+        private void TransparentExposeEvent (object obj, Gtk.ExposeEventArgs args)
+	{
+		Gtk.Widget widget = (Gtk.Widget)obj;
+		Gdk.Rectangle area = args.Event.Area;
+
+		widget.GdkWindow.ClearArea (area.X, area.Y, area.Width, area.Height);
+	}
+
+	private void MakeTransparentAgain (object obj, Gtk.StyleSetArgs args)
+	{
+		Gtk.Widget widget = (Gtk.Widget)obj;
+
+		widget.GdkWindow.SetBackPixmap (null, true);
+	}
+
+        private void MakeTransparent (object obj, EventArgs args)
+	{
+		Gtk.Widget widget = (Gtk.Widget)obj;
+		if (widget.IsNoWindow || widget.IsAppPaintable)
+			return;
+
+		widget.AppPaintable = true;
+		widget.DoubleBuffered = false;
+		widget.GdkWindow.SetBackPixmap (null, true);
+		widget.ExposeEvent += TransparentExposeEvent;
+		widget.StyleSet += MakeTransparentAgain;
+	}
+
+	protected override void OnRealized ()
+	{
+		base.OnRealized ();
+		MakeTransparent (this, EventArgs.Empty);
+		Display display = Screen.Display;
+		IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
+		selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
+		manager_atom = XInternAtom (xdisplay, "MANAGER", false);
+		system_tray_opcode_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_OPCODE", false);
+		orientation_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_ORIENTATION", false);
+		message_data_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_MESSAGE_DATA", false);
+		UpdateManagerWindow (false);
+		SendDockRequest ();
+		Screen.RootWindow.AddFilter (filter);
+	}
+
+	protected override void OnAdded (Gtk.Widget child)
+	{
+		child.Realized += MakeTransparent;
+		base.OnAdded (child);
+	}
+
+	protected override void OnUnrealized ()
+	{
+		if (manager_window != IntPtr.Zero) {
+			Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
+			if (gdkwin != null) {
+				gdkwin.RemoveFilter (filter);
+			}
+		}
+	
+		Screen.RootWindow.RemoveFilter (filter);
+		base.OnUnrealized ();
+	}
+
+	private void UpdateManagerWindow (bool dock_if_realized)
+	{
+		if(Handle == IntPtr.Zero || Display == null || Display.Handle == IntPtr.Zero) {
+			return;
+		}
+
+		IntPtr xdisplay = gdk_x11_display_get_xdisplay (Display.Handle);
+	
+		if (manager_window != IntPtr.Zero) {
+			return;
+		}
+	
+		XGrabServer (xdisplay);
+	
+		manager_window = XGetSelectionOwner (xdisplay, selection_atom);
+		if (manager_window != IntPtr.Zero) {
+			XSelectInput (xdisplay, manager_window, (IntPtr) (EventMask.StructureNotifyMask | EventMask.PropertyChangeMask));
+		}
+	
+		XUngrabServer (xdisplay);
+		XFlush (xdisplay);
+
+		if (manager_window != IntPtr.Zero) {
+			Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
+			if (gdkwin != null) {
+				gdkwin.AddFilter (filter);
+			}
+		
+			if (dock_if_realized && IsRealized) {
+				SendDockRequest ();
+			}
+		
+			GetOrientationProperty ();
+		}
+	}
+
+	private void SendDockRequest ()
+	{
+		SendManagerMessage (SystemTrayMessage.RequestDock, manager_window, Id, 0, 0);
+	}
+
+	private void SendManagerMessage (SystemTrayMessage message, IntPtr window, uint data1, uint data2, uint data3)
+	{
+		XClientMessageEvent ev = new XClientMessageEvent ();
+		IntPtr display;
+	
+		ev.type = XEventName.ClientMessage;
+		ev.window = window;
+		ev.message_type = system_tray_opcode_atom;
+		ev.format = 32;
+		ev.data.ptr1 = (IntPtr)gdk_x11_get_server_time (GdkWindow.Handle);
+		ev.data.ptr2 = (IntPtr)message;
+		ev.data.ptr3 = (IntPtr)data1;
+		ev.data.ptr4 = (IntPtr)data2;
+		ev.data.ptr5 = (IntPtr)data3;
+
+		display = gdk_x11_display_get_xdisplay (Display.Handle);
+		gdk_error_trap_push ();
+		XSendEvent (display, manager_window, false, (IntPtr) EventMask.NoEventMask, ref ev);
+		XSync (display, false);
+		gdk_error_trap_pop ();
+	}
+
+	private FilterReturn ManagerFilter (IntPtr xevent, Event evnt)
+	{
+		XAnyEvent xev = (XAnyEvent) Marshal.PtrToStructure (xevent, typeof(XAnyEvent));
+   
+		if (xev.type == XEventName.ClientMessage){
+			XClientMessageEvent xclient = (XClientMessageEvent) Marshal.PtrToStructure (xevent, typeof(XClientMessageEvent));
+
+			if (xclient.message_type == manager_atom && xclient.data.ptr2 == selection_atom) {
+				UpdateManagerWindow (true);
+				return FilterReturn.Continue;
+			}
+		}
+
+		if (xev.window == manager_window) {
+			if (xev.type == XEventName.PropertyNotify){
+				XPropertyEvent xproperty = (XPropertyEvent) Marshal.PtrToStructure (xevent, typeof(XPropertyEvent));
+				if (xproperty.atom == orientation_atom) {
+					GetOrientationProperty();
+					return FilterReturn.Continue;
+				}
+			}
+
+			if (xev.type == XEventName.DestroyNotify) {
+				ManagerWindowDestroyed();
+			}
+		}
+   
+		return FilterReturn.Continue;
+	}
+
+	private void ManagerWindowDestroyed ()
+	{
+		if (manager_window != IntPtr.Zero) {
+			Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint) manager_window);
+       
+			if (gdkwin != null) {
+				gdkwin.RemoveFilter (filter);
+			}
+       
+			manager_window = IntPtr.Zero;
+			UpdateManagerWindow (true);
+		}
+	}
+
+	private void GetOrientationProperty ()
+	{
+		IntPtr display;
+		IntPtr type;
+		int format;
+		IntPtr prop_return;
+		IntPtr nitems, bytes_after;
+		int error, result;
+
+		if (manager_window == IntPtr.Zero) {
+			return;
+		}
+
+		display = gdk_x11_display_get_xdisplay (Display.Handle);
+   
+		gdk_error_trap_push ();
+		type = IntPtr.Zero;
+   
+		result = XGetWindowProperty (display, manager_window, orientation_atom, (IntPtr) 0, 
+					     (IntPtr) System.Int32.MaxValue, false, (IntPtr) XAtom.Cardinal, out type, out format, 
+					     out nitems, out bytes_after, out prop_return);
+   
+		error = gdk_error_trap_pop ();
+
+		if (error != 0 || result != 0) {
+			return;
+		}
+
+		if (type == (IntPtr) XAtom.Cardinal) {
+			orientation = ((SystemTrayOrientation) Marshal.ReadInt32 (prop_return) == SystemTrayOrientation.Horz) 
+				? Orientation.Horizontal 
+				: Orientation.Vertical;
+		}
+
+		if (prop_return != IntPtr.Zero) {
+			XFree (prop_return);
+		}
+	}
+
+	[DllImport ("libgdk-x11-2.0.so.0")]
+	private static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
+
+	[DllImport ("libgdk-x11-2.0.so.0")]
+	private static extern int gdk_x11_get_server_time (IntPtr window);
+
+	[DllImport ("libgdk-x11-2.0.so.0")]
+	private static extern void gdk_error_trap_push ();
+
+	[DllImport ("libgdk-x11-2.0.so.0")]
+	private static extern int gdk_error_trap_pop ();
+
+	[DllImport ("libX11")]
+	private extern static IntPtr XInternAtom(IntPtr display, string atom_name, bool only_if_exists);
+
+	[DllImport ("libX11")]
+	private extern static void XGrabServer (IntPtr display);
+
+	[DllImport ("libX11")]
+	private extern static void XUngrabServer (IntPtr display);
+
+	[DllImport ("libX11")]
+	private extern static int XFlush (IntPtr display);
+
+	[DllImport ("libX11")]
+	private extern static int XSync (IntPtr display, bool discard);
+
+	[DllImport ("libX11")]
+	private extern static int XFree (IntPtr display);
+
+	[DllImport ("libX11")]
+	private extern static IntPtr XGetSelectionOwner (IntPtr display, IntPtr atom);
+
+	[DllImport ("libX11")]
+	private extern static IntPtr XSelectInput (IntPtr display, IntPtr window, IntPtr mask);
+
+	[DllImport ("libX11")]
+	private extern static int XSendEvent(IntPtr display, IntPtr window, bool propagate, IntPtr event_mask, 
+					     ref XClientMessageEvent send_event);
+
+	[DllImport("libX11")]
+	private extern static int XGetWindowProperty(IntPtr display, IntPtr w, IntPtr property, IntPtr long_offset, 
+						     IntPtr long_length, bool deleteProp, IntPtr req_type,
+						     out IntPtr actual_type_return, out int actual_format_return, 
+						     out IntPtr nitems_return, out IntPtr bytes_after_return, 
+						     out IntPtr prop_return);
+
+	[Flags]
+	private enum EventMask {
+		NoEventMask              = 0,
+		KeyPressMask             = 1 << 0,
+		KeyReleaseMask           = 1 << 1,
+		ButtonPressMask          = 1 << 2,
+		ButtonReleaseMask        = 1 << 3,
+		EnterWindowMask          = 1 << 4,
+		LeaveWindowMask          = 1 << 5,
+		PointerMotionMask        = 1 << 6,
+		PointerMotionHintMask    = 1 << 7,
+		Button1MotionMask        = 1 << 8,
+		Button2MotionMask        = 1 << 9,
+		Button3MotionMask        = 1 << 10,
+		Button4MotionMask        = 1 << 11,
+		Button5MotionMask        = 1 << 12,
+		ButtonMotionMask         = 1 << 13,
+		KeymapStateMask          = 1 << 14,
+		ExposureMask             = 1 << 15,
+		VisibilityChangeMask     = 1 << 16,
+		StructureNotifyMask      = 1 << 17,
+		ResizeRedirectMask       = 1 << 18,
+		SubstructureNotifyMask   = 1 << 19,
+		SubstructureRedirectMask = 1 << 20,
+		FocusChangeMask          = 1 << 21,
+		PropertyChangeMask       = 1 << 22,
+		ColormapChangeMask       = 1 << 23,
+		OwnerGrabButtonMask      = 1 << 24
+	}
+
+	private enum SystemTrayMessage {
+		RequestDock = 0,
+		BeginMessage = 1,
+		CancelMessage = 2
+	}
+
+	private enum SystemTrayOrientation {
+		Horz = 0,
+		Vert = 1
+	}
+
+	private enum XEventName {
+		KeyPress                = 2,
+		KeyRelease              = 3,
+		ButtonPress             = 4,
+		ButtonRelease           = 5,
+		MotionNotify            = 6,
+		EnterNotify             = 7,
+		LeaveNotify             = 8,
+		FocusIn                 = 9,
+		FocusOut                = 10,
+		KeymapNotify            = 11,
+		Expose                  = 12,
+		GraphicsExpose          = 13,
+		NoExpose                = 14,
+		VisibilityNotify        = 15,
+		CreateNotify            = 16,
+		DestroyNotify           = 17,
+		UnmapNotify             = 18,
+		MapNotify               = 19,
+		MapRequest              = 20,
+		ReparentNotify          = 21,
+		ConfigureNotify         = 22,
+		ConfigureRequest        = 23,
+		GravityNotify           = 24,
+		ResizeRequest           = 25,
+		CirculateNotify         = 26,
+		CirculateRequest        = 27,
+		PropertyNotify          = 28,
+		SelectionClear          = 29,
+		SelectionRequest        = 30,
+		SelectionNotify         = 31,
+		ColormapNotify          = 32,
+		ClientMessage           = 33,
+		MappingNotify           = 34,
+		TimerNotify             = 100,
+		LASTEvent
+	}
+
+	private enum XAtom {
+		Cardinal                = 6,
+		LASTAtom
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	private struct XAnyEvent 
+	{
+		internal XEventName    type;
+		internal IntPtr        serial;
+		internal bool          send_event;
+		internal IntPtr        display;
+		internal IntPtr        window;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	private struct XPropertyEvent 
+	{
+		internal XEventName    type;
+		internal IntPtr        serial;
+		internal bool          send_event;
+		internal IntPtr        display;
+		internal IntPtr        window;
+		internal IntPtr        atom;
+		internal IntPtr        time;
+		internal int           state;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	private struct XClientMessageEvent 
+	{
+		internal XEventName     type;
+		internal IntPtr         serial;
+		internal bool           send_event;
+		internal IntPtr         display;
+		internal IntPtr         window;
+		internal IntPtr         message_type;
+		internal int            format;
+    
+		[StructLayout(LayoutKind.Sequential)]
+		internal struct DataUnion 
+		{
+			internal IntPtr ptr1;
+			internal IntPtr ptr2;
+			internal IntPtr ptr3;
+			internal IntPtr ptr4;
+			internal IntPtr ptr5;
+		}
+    
+		internal DataUnion      data;
+	}
+}
+
+#pragma warning restore 0169
+
Index: plugins/TrayIcon.cs
===================================================================
RCS file: /cvs/gnome/muine/plugins/TrayIcon.cs,v
retrieving revision 1.8
diff -u -p -r1.8 TrayIcon.cs
--- plugins/TrayIcon.cs	8 Sep 2006 05:09:35 -0000	1.8
+++ plugins/TrayIcon.cs	13 Nov 2006 21:49:07 -0000
@@ -96,7 +96,7 @@ namespace Muine
 		// Methods :: Public :: Init
 		public void Init ()
 		{
-			icon = new Egg.TrayIcon (string_program);
+			icon = new NotificationArea (string_program);
 
 			icon.DestroyEvent += OnDestroyEvent;
 
Index: plugins/egg-sharp.cs
===================================================================
RCS file: plugins/egg-sharp.cs
diff -N plugins/egg-sharp.cs
--- plugins/egg-sharp.cs	29 May 2006 22:26:52 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2005 Todd Berman , Ed Catmur 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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.
- */
-
-// NOTE: throughout IntPtr is used for the Xlib long type, as this tends to 
-// have the correct width and does not require any configure checks.
-
-using System;
-using System.Runtime.InteropServices;
-
-using Gtk;
-using Gdk;
-
-namespace Egg
-{
-	public class TrayIcon : Plug
-	{
-		uint stamp;
-		Orientation orientation;
-		
-		IntPtr selection_atom;
-		IntPtr manager_atom;
-		IntPtr system_tray_opcode_atom;
-		IntPtr orientation_atom;
-		IntPtr message_data_atom;
-		IntPtr manager_window;
-		FilterFunc filter;
-		
-		public TrayIcon (string name)
-		{
-			Title = name;
-			Init ();
-		}
-		
-		public TrayIcon (string name, Gdk.Screen screen)
-		{
-			Title = name;
-			Screen = screen;
-			Init ();
-		}
-
-		[DllImport ("libc")]
-		private static extern IntPtr memcpy (ref XClientMessageEvent.DataUnion dest, IntPtr src, IntPtr len);
-
-		public uint SendMessage (uint timeout, string message)
-		{
-			if (manager_window == IntPtr.Zero)
-				return 0;
-
-			byte[] arr = System.Text.Encoding.UTF8.GetBytes (message);
-			IntPtr unmanaged_arr = Marshal.AllocHGlobal (arr.Length);
-			Marshal.Copy (arr, 0, unmanaged_arr, arr.Length);
-
-			SendManagerMessage (SystemTrayMessage.BeginMessage, (IntPtr) Id, timeout, (uint) arr.Length, ++stamp);
-
-			gdk_error_trap_push ();
-
-			for (int index = 0; index < message.Length; index += 20) {
-				XClientMessageEvent ev = new XClientMessageEvent ();
-
-				IntPtr display = gdk_x11_display_get_xdisplay (Display.Handle);
-
-				ev.type = XEventName.ClientMessage;
-				ev.window = (IntPtr) Id;
-				ev.format = 8;
-				ev.message_type = message_data_atom;
-
-				int len = Math.Min (arr.Length - index, 20);
-				memcpy (ref ev.data, (IntPtr)((int)unmanaged_arr + index), (IntPtr)len);
-
-				XSendEvent (display, manager_window, false, (IntPtr) EventMask.StructureNotifyMask, ref ev);
-				XSync (display, false);
-			}
-
-			gdk_error_trap_pop ();
-
-			return stamp;
-		}
-
-		public void CancelMessage (uint id)
-		{
-			if (id == 0)
-				return;
-
-			SendManagerMessage (SystemTrayMessage.CancelMessage, (IntPtr) Id, id, 0, 0);
-		}
-
-		private void Init ()
-		{
-			stamp = 1;
-			orientation = Orientation.Horizontal;
-			AddEvents ((int)EventMask.PropertyChangeMask);
-			filter = new FilterFunc (ManagerFilter);
-		}
-
-		protected override void OnRealized ()
-		{
-			base.OnRealized ();
-			Display display = Screen.Display;
-			IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
-			selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
-			manager_atom = XInternAtom (xdisplay, "MANAGER", false);
-			system_tray_opcode_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_OPCODE", false);
-			orientation_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_ORIENTATION", false);
-			message_data_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_MESSAGE_DATA", false);
-			UpdateManagerWindow (false);
-			SendDockRequest ();
-			Screen.RootWindow.AddFilter (filter);
-		}
-
-		protected override void OnUnrealized ()
-		{
-			if (manager_window != IntPtr.Zero)
-			{
-				Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
-				if (gdkwin != null)
-					gdkwin.RemoveFilter (filter);
-			}
-			
-			Screen.RootWindow.RemoveFilter (filter);
-			base.OnUnrealized ();
-		}
-
-		private void UpdateManagerWindow (bool dock_if_realized)
-		{
-			IntPtr xdisplay = gdk_x11_display_get_xdisplay (Display.Handle);
-
-			if (manager_window != IntPtr.Zero)
-				return;
-			
-			XGrabServer (xdisplay);
-
-			manager_window = XGetSelectionOwner (xdisplay, selection_atom);
-			if (manager_window != IntPtr.Zero)
-				XSelectInput (xdisplay, manager_window, EventMask.StructureNotifyMask | EventMask.PropertyChangeMask);
-			XUngrabServer (xdisplay);
-			XFlush (xdisplay);
-
-			if (manager_window != IntPtr.Zero) {
-				Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
-				if (gdkwin != null)
-					gdkwin.AddFilter (filter);
-				if (dock_if_realized && IsRealized)
-					SendDockRequest ();
-				GetOrientationProperty ();
-			}
-		}
-
-		private void SendDockRequest ()
-		{
-			SendManagerMessage (SystemTrayMessage.RequestDock, manager_window, Id, 0, 0);
-		}
-
-		private void SendManagerMessage (SystemTrayMessage message, IntPtr window, uint data1, uint data2, uint data3)
-		{
-			XClientMessageEvent ev = new XClientMessageEvent ();
-			IntPtr display;
-
-			ev.type = XEventName.ClientMessage;
-			ev.window = window;
-			ev.message_type = (IntPtr)system_tray_opcode_atom;
-			ev.format = 32;
-			ev.data.ptr1 = (IntPtr)gdk_x11_get_server_time (GdkWindow.Handle);
-			ev.data.ptr2 = (IntPtr)message;
-			ev.data.ptr3 = (IntPtr)data1;
-			ev.data.ptr4 = (IntPtr)data2;
-			ev.data.ptr5 = (IntPtr)data3;
-
-			display = gdk_x11_display_get_xdisplay (Display.Handle);
-			gdk_error_trap_push ();
-			XSendEvent (display, manager_window, false, (IntPtr)EventMask.NoEventMask, ref ev);
-			XSync (display, false);
-			gdk_error_trap_pop ();
-		}
-
-		private FilterReturn ManagerFilter (IntPtr xevent, Event evnt)
-		{
-			XAnyEvent xev = (XAnyEvent) Marshal.PtrToStructure (xevent, typeof(XAnyEvent));
-
-			if (xev.type == XEventName.ClientMessage){
-				XClientMessageEvent xclient = (XClientMessageEvent) Marshal.PtrToStructure (xevent, typeof(XClientMessageEvent));
-
-				if (xclient.message_type == manager_atom && xclient.data.ptr2 == selection_atom) {
-					UpdateManagerWindow (true);
-					return FilterReturn.Continue;
-				}
-			}
-
-			if (xev.window == manager_window) {
-				if (xev.type == XEventName.PropertyNotify){
-					XPropertyEvent xproperty = (XPropertyEvent) Marshal.PtrToStructure (xevent, typeof(XPropertyEvent));
-					if (xproperty.atom == orientation_atom) {
-						GetOrientationProperty();
-						return FilterReturn.Continue;
-					}
-				}
-
-				if (xev.type == XEventName.DestroyNotify) {
-					ManagerWindowDestroyed();
-				}
-			}
-
-			return FilterReturn.Continue;
-		}
-
-		private void ManagerWindowDestroyed ()
-		{
-			if (manager_window != IntPtr.Zero) {
-				Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint) manager_window);
-				if (gdkwin != null)
-					gdkwin.RemoveFilter (filter);
-				
-				manager_window = IntPtr.Zero;
-
-				UpdateManagerWindow (true);
-			}
-		}
-
-		private void GetOrientationProperty ()
-		{
-			IntPtr display;
-			IntPtr type;
-			int format;
-			IntPtr prop_return;
-			IntPtr nitems, bytes_after;
-			int error, result;
-
-			if (manager_window == IntPtr.Zero)
-				return;
-
-			display = gdk_x11_display_get_xdisplay (Display.Handle);
-			
-			gdk_error_trap_push ();
-			type = IntPtr.Zero;
-			result = XGetWindowProperty (display, manager_window, orientation_atom, (IntPtr) 0, (IntPtr) System.Int32.MaxValue, false, (IntPtr) XAtom.Cardinal, out type, out format, out nitems, out bytes_after, out prop_return);
-			error = gdk_error_trap_pop ();
-
-			if (error != 0 || result != 0)
-				return;
-
-			if (type == (IntPtr) XAtom.Cardinal)
-				orientation = ((SystemTrayOrientation) Marshal.ReadInt32 (prop_return) == SystemTrayOrientation.Horz) ? Orientation.Horizontal : Orientation.Vertical;
-
-			if (prop_return != IntPtr.Zero)
-				XFree (prop_return);
-		}
-
-		[DllImport ("gdk-x11-2.0")]
-		static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
-		[DllImport ("gdk-x11-2.0")]
-		static extern IntPtr gdk_x11_get_server_time (IntPtr window);
-		[DllImport ("gdk-x11-2.0")]
-		static extern void gdk_error_trap_push ();
-		[DllImport ("gdk-x11-2.0")]
-		static extern int gdk_error_trap_pop ();
-		
-		[DllImport ("libX11")]
-		extern static IntPtr XInternAtom(IntPtr display, string atom_name, bool only_if_exists);
-		[DllImport ("libX11")]
-		extern static void XGrabServer (IntPtr display);
-		[DllImport ("libX11")]
-		extern static void XUngrabServer (IntPtr display);
-		[DllImport ("libX11")]
-		extern static int XFlush (IntPtr display);
-		[DllImport ("libX11")]
-		extern static int XSync (IntPtr display, bool discard);
-		[DllImport ("libX11")]
-		extern static int XFree (IntPtr display);
-		[DllImport ("libX11")]
-		extern static IntPtr XGetSelectionOwner (IntPtr display, IntPtr atom);
-		[DllImport ("libX11")]
-		extern static IntPtr XSelectInput (IntPtr window, IntPtr display, EventMask mask);
-		[DllImport ("libX11")]
-		extern static int XSendEvent(IntPtr display, IntPtr window, bool propagate, IntPtr event_mask, ref XClientMessageEvent send_event);
-		[DllImport("libX11")]
-		extern static int XGetWindowProperty(IntPtr display, IntPtr w, IntPtr property, IntPtr long_offset, IntPtr long_length, bool deleteProp, IntPtr req_type, out IntPtr actual_type_return, out int actual_format_return, out IntPtr nitems_return, out IntPtr bytes_after_return, out IntPtr prop_return);
-	}
-
-	[Flags]
-	internal enum EventMask {
-		NoEventMask             = 0,
-		KeyPressMask            = 1<<0,
-		KeyReleaseMask          = 1<<1,
-		ButtonPressMask         = 1<<2,
-		ButtonReleaseMask       = 1<<3,
-		EnterWindowMask         = 1<<4,
-		LeaveWindowMask         = 1<<5,
-		PointerMotionMask       = 1<<6,
-		PointerMotionHintMask   = 1<<7,
-		Button1MotionMask       = 1<<8,
-		Button2MotionMask       = 1<<9,
-		Button3MotionMask       = 1<<10,
-		Button4MotionMask       = 1<<11,
-		Button5MotionMask       = 1<<12,
-		ButtonMotionMask        = 1<<13,
-		KeymapStateMask         = 1<<14,
-		ExposureMask            = 1<<15,
-		VisibilityChangeMask    = 1<<16,
-		StructureNotifyMask     = 1<<17,
-		ResizeRedirectMask      = 1<<18,
-                SubstructureNotifyMask  = 1<<19,
-		SubstructureRedirectMask= 1<<20,
-		FocusChangeMask         = 1<<21,
-		PropertyChangeMask      = 1<<22,
-		ColormapChangeMask      = 1<<23,
-		OwnerGrabButtonMask     = 1<<24
-	}
-
-	internal enum SystemTrayMessage
-	{
-		RequestDock = 0,
-		BeginMessage = 1,
-		CancelMessage = 2
-	}
-
-	internal enum SystemTrayOrientation
-	{
-		Horz = 0,
-		Vert = 1
-	}
-
-  	[StructLayout(LayoutKind.Sequential)]
-	internal struct XAnyEvent {
-		internal XEventName	type;
-		internal IntPtr		serial;
-		internal bool		send_event;
-		internal IntPtr		display;
-		internal IntPtr		window;
-	}
-	
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct XPropertyEvent {
-		internal XEventName	type;
-		internal IntPtr		serial;
-		internal bool		send_event;
-		internal IntPtr		display;
-		internal IntPtr		window;
-		internal IntPtr		atom;
-		internal IntPtr		time;
-		internal int		state;
-	}
-	
-	[StructLayout(LayoutKind.Sequential)]
-	internal struct XClientMessageEvent {
-		internal XEventName     type;
-		internal IntPtr		serial;
-		internal bool           send_event;
-		internal IntPtr         display;
-		internal IntPtr         window;
-		internal IntPtr         message_type;
-		internal int            format;
- 		[StructLayout(LayoutKind.Sequential)]
- 		internal struct DataUnion {
-
- 			internal IntPtr ptr1;
- 			internal IntPtr ptr2;
- 			internal IntPtr ptr3;
- 			internal IntPtr ptr4;
- 			internal IntPtr ptr5;
- 		}
- 		internal DataUnion      data;
-	}
-
-	internal enum XEventName {
-		KeyPress                = 2,
-		KeyRelease              = 3,
-		ButtonPress             = 4,
-		ButtonRelease           = 5,
-		MotionNotify            = 6,
-		EnterNotify             = 7,
-		LeaveNotify             = 8,
-		FocusIn                 = 9,
-		FocusOut                = 10,
-		KeymapNotify            = 11,
-		Expose                  = 12,
-		GraphicsExpose          = 13,
-		NoExpose                = 14,
-		VisibilityNotify        = 15,
-		CreateNotify            = 16,
-		DestroyNotify           = 17,
-		UnmapNotify             = 18,
-		MapNotify               = 19,
-		MapRequest              = 20,
-		ReparentNotify          = 21,
-		ConfigureNotify         = 22,
-		ConfigureRequest        = 23,
-		GravityNotify           = 24,
-		ResizeRequest           = 25,
-		CirculateNotify         = 26,
-		CirculateRequest        = 27,
-		PropertyNotify          = 28,
-		SelectionClear          = 29,
-		SelectionRequest        = 30,
-		SelectionNotify         = 31,
-		ColormapNotify          = 32,
-		ClientMessage           = 33,
-		MappingNotify           = 34,
-		TimerNotify             = 100,
-		
-		LASTEvent
-	}
-
-	internal enum XAtom {
-		Cardinal                = 6,
-
-		LASTAtom
-	}
-}


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-6/muine.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- muine.spec	13 Nov 2006 19:10:18 -0000	1.10
+++ muine.spec	13 Nov 2006 21:57:57 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           muine
 Version:        0.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.muine-player.org/
 Source0:        http://muine-player.org/releases/muine-%{version}.tar.gz
+Patch0:		    muine-trayicon-transparency-bug-343698.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	mono-devel, gtk-sharp2-gapi, gtk-sharp2-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -122,6 +124,8 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Mon Nov 13 2006 Sindre Pedersen Bj??rdal  - 0.8.6-2
+- Add patch to fix trayicon transparency
 * Mon Nov 13 2006 Sindre Pedersen Bj??rdal  - 0.8.6-1
 - New release
 - Add gtk icon cache scriplet for new icons



From fedora-extras-commits at redhat.com  Mon Nov 13 22:15:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 15:15:02 -0700
Subject: rpms/dirmngr/devel dirmngr.spec,1.4,1.5
Message-ID: <200611132215.kADMF2bA020683@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dirmngr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20665

Modified Files:
	dirmngr.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  0.9.6-2
- BR: libassuan-static



Index: dirmngr.spec
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dirmngr.spec	7 Sep 2006 20:04:03 -0000	1.4
+++ dirmngr.spec	13 Nov 2006 22:14:31 -0000	1.5
@@ -5,7 +5,7 @@
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
 Version: 0.9.6
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 
 License: GPL
 Group:	 System Environment/Libraries
@@ -18,9 +18,9 @@
 Source11: ldapservers.conf
 Source12: dirmngr.logrotate
 
+BuildRequires: libassuan-static
 BuildRequires: libgcrypt-devel >= 1.2.0
 BuildRequires: libksba-devel >= 1.0.0 
-BuildRequires: libassuan-devel >= 0.6.10
 buildRequires: pth-devel
 BuildRequires: openldap-devel
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  0.9.6-2
+- BR: libassuan-static
+
 * Tue Sep 05 2006 Rex Dieter  0.9.6-1
 - 0.9.6
 



From fedora-extras-commits at redhat.com  Mon Nov 13 22:20:10 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:20:10 -0700
Subject: rpms/gauche-gl/FC-5 .cvsignore, 1.2, 1.3 Gauche-gl-fix.patch, 1.1, 
	1.2 gauche-gl.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200611132220.kADMKA0m020825@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20768/FC-5

Modified Files:
	.cvsignore Gauche-gl-fix.patch gauche-gl.spec sources 
Log Message:
new version 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 May 2006 19:27:29 -0000	1.2
+++ .cvsignore	13 Nov 2006 22:19:39 -0000	1.3
@@ -1 +1 @@
-Gauche-gl-0.4.1.tgz
+Gauche-gl-0.4.2.tgz

Gauche-gl-fix.patch:

Index: Gauche-gl-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-5/Gauche-gl-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Gauche-gl-fix.patch	9 May 2006 19:27:29 -0000	1.1
+++ Gauche-gl-fix.patch	13 Nov 2006 22:19:39 -0000	1.2
@@ -1,15 +1,22 @@
---- Gauche-gl-0.4/src/gauche-gl.c.fix	2005-07-01 23:58:51.000000000 +0200
-+++ Gauche-gl-0.4/src/gauche-gl.c	2005-07-01 23:59:01.000000000 +0200
-@@ -136,11 +136,7 @@
-    supports GLX for the time being. */
+--- Gauche-gl-0.4.2/src/gauche-gl.c.fix	2006-11-13 22:39:05.000000000 +0100
++++ Gauche-gl-0.4.2/src/gauche-gl.c	2006-11-13 22:42:04.000000000 +0100
+@@ -139,18 +139,7 @@
+ */
  void *Scm_GLGetProcAddress(const char *name)
  {
--#if defined(GLX_VERSION_1_4)
+-#if defined(GLX_ARB_get_proc_address)
+-    if (glXGetProcAddressARB != NULL) {
+-        return glXGetProcAddressARB((const GLubyte*)name);
+-    }
+-#elif defined(GLX_VERSION_1_4)
 -    if (glXGetProcAddress != NULL) {
 -        return glXGetProcAddress(name);
 -    }
--#elif defined(GLX_ARB_get_proc_address)
-+#if defined(GLX_ARB_get_proc_address)
-     if (glXGetProcAddressARB != NULL) {
-         return glXGetProcAddressARB(name);
-     }
+-#elif defined(MacOSX)
+-    return glutGetProcAddress(name);
+-#endif /* !defined(GLX_VERSION_1_4) && !defined(GLX_ARB_get_proc_address) */
+-    Scm_Error("GL extension %s is not supported on this platform", name);
++    return glXGetProcAddressARB((const GLubyte*)name);
+ }
+ 
+ /* List of numbers -> array of doubles.  Returns # of elements. */


Index: gauche-gl.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-5/gauche-gl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gauche-gl.spec	9 May 2006 20:44:54 -0000	1.3
+++ gauche-gl.spec	13 Nov 2006 22:19:39 -0000	1.4
@@ -1,14 +1,14 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gl
-Version:        0.4.1
-Release:        5%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:	OpenGL binding for Gauche
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.1.tgz
+Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.2.tgz
 Patch0:		Gauche-gl-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: 	gauche-devel = %{gauche_version}
@@ -29,7 +29,7 @@
 %prep
 %setup -q -n Gauche-gl-%{version}
 %patch0 -p1
-(cd src; mv gauche-gl.c.orig gauche-gl.c)
+
 
 %build
 %configure
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.2-1
+- new version 0.4.2
+
 * Fri May  5 2006 Gerard Milmeister  - 0.4.1-4
 - cleaned up Requires
 - removed unnecessary files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 May 2006 19:27:29 -0000	1.2
+++ sources	13 Nov 2006 22:19:39 -0000	1.3
@@ -1 +1 @@
-a51b19a0f16f88ed6cd85c6e49cc6e75  Gauche-gl-0.4.1.tgz
+32e0670225a983e9df99f856825e1f63  Gauche-gl-0.4.2.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 22:20:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:20:11 -0700
Subject: rpms/gauche-gl/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611132220.kADMKBaV020838@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20768/devel

Modified Files:
	.cvsignore sources 
Log Message:
new version 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 May 2006 19:27:29 -0000	1.2
+++ .cvsignore	13 Nov 2006 22:19:41 -0000	1.3
@@ -1 +1 @@
-Gauche-gl-0.4.1.tgz
+Gauche-gl-0.4.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 May 2006 19:27:29 -0000	1.2
+++ sources	13 Nov 2006 22:19:41 -0000	1.3
@@ -1 +1 @@
-a51b19a0f16f88ed6cd85c6e49cc6e75  Gauche-gl-0.4.1.tgz
+32e0670225a983e9df99f856825e1f63  Gauche-gl-0.4.2.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 22:20:10 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:20:10 -0700
Subject: rpms/gauche-gl/FC-6 .cvsignore, 1.2, 1.3 Gauche-gl-fix.patch, 1.1, 
	1.2 gauche-gl.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200611132220.kADMKA8s020834@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20768/FC-6

Modified Files:
	.cvsignore Gauche-gl-fix.patch gauche-gl.spec sources 
Log Message:
new version 0.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 May 2006 19:27:29 -0000	1.2
+++ .cvsignore	13 Nov 2006 22:19:40 -0000	1.3
@@ -1 +1 @@
-Gauche-gl-0.4.1.tgz
+Gauche-gl-0.4.2.tgz

Gauche-gl-fix.patch:

Index: Gauche-gl-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/Gauche-gl-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Gauche-gl-fix.patch	9 May 2006 19:27:29 -0000	1.1
+++ Gauche-gl-fix.patch	13 Nov 2006 22:19:40 -0000	1.2
@@ -1,15 +1,22 @@
---- Gauche-gl-0.4/src/gauche-gl.c.fix	2005-07-01 23:58:51.000000000 +0200
-+++ Gauche-gl-0.4/src/gauche-gl.c	2005-07-01 23:59:01.000000000 +0200
-@@ -136,11 +136,7 @@
-    supports GLX for the time being. */
+--- Gauche-gl-0.4.2/src/gauche-gl.c.fix	2006-11-13 22:39:05.000000000 +0100
++++ Gauche-gl-0.4.2/src/gauche-gl.c	2006-11-13 22:42:04.000000000 +0100
+@@ -139,18 +139,7 @@
+ */
  void *Scm_GLGetProcAddress(const char *name)
  {
--#if defined(GLX_VERSION_1_4)
+-#if defined(GLX_ARB_get_proc_address)
+-    if (glXGetProcAddressARB != NULL) {
+-        return glXGetProcAddressARB((const GLubyte*)name);
+-    }
+-#elif defined(GLX_VERSION_1_4)
 -    if (glXGetProcAddress != NULL) {
 -        return glXGetProcAddress(name);
 -    }
--#elif defined(GLX_ARB_get_proc_address)
-+#if defined(GLX_ARB_get_proc_address)
-     if (glXGetProcAddressARB != NULL) {
-         return glXGetProcAddressARB(name);
-     }
+-#elif defined(MacOSX)
+-    return glutGetProcAddress(name);
+-#endif /* !defined(GLX_VERSION_1_4) && !defined(GLX_ARB_get_proc_address) */
+-    Scm_Error("GL extension %s is not supported on this platform", name);
++    return glXGetProcAddressARB((const GLubyte*)name);
+ }
+ 
+ /* List of numbers -> array of doubles.  Returns # of elements. */


Index: gauche-gl.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/gauche-gl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gauche-gl.spec	28 Aug 2006 09:31:53 -0000	1.3
+++ gauche-gl.spec	13 Nov 2006 22:19:40 -0000	1.4
@@ -1,8 +1,8 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gl
-Version:        0.4.1
-Release:        6%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:	OpenGL binding for Gauche
 
 Group:          Development/Languages
@@ -29,7 +29,7 @@
 %prep
 %setup -q -n Gauche-gl-%{version}
 %patch0 -p1
-(cd src; mv gauche-gl.c.orig gauche-gl.c)
+
 
 %build
 %configure
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.2-1
+- new version 0.4.2
+
 * Fri May  5 2006 Gerard Milmeister  - 0.4.1-4
 - cleaned up Requires
 - removed unnecessary files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 May 2006 19:27:29 -0000	1.2
+++ sources	13 Nov 2006 22:19:40 -0000	1.3
@@ -1 +1 @@
-a51b19a0f16f88ed6cd85c6e49cc6e75  Gauche-gl-0.4.1.tgz
+32e0670225a983e9df99f856825e1f63  Gauche-gl-0.4.2.tgz



From fedora-extras-commits at redhat.com  Mon Nov 13 22:27:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:27:43 -0700
Subject: owners owners.list,1.1947,1.1948
Message-ID: <200611132227.kADMRh01020992@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20967

Modified Files:
	owners.list 
Log Message:
Added python-nltk_lite and nickle to list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1947
retrieving revision 1.1948
diff -u -r1.1947 -r1.1948
--- owners.list	13 Nov 2006 19:12:12 -0000	1.1947
+++ owners.list	13 Nov 2006 22:27:12 -0000	1.1948
@@ -1165,6 +1165,7 @@
 Fedora Extras|nget|A utility for retrieving files using the NNTP protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ngrep|Network layer grep tool|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|ngspice|A mixed level/signal circuit simulator|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
+Fedora Extras|nickle|A programming language-based prototyping environment|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|ninja|A text based Internet Relay Chat (IRC) client|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nip2|Interactive image processing system|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|njam|Maze-game, eat all the cookies while avoiding the badguys|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -1936,6 +1937,7 @@
 Fedora Extras|python-mutagen|Python module to handle audio metadata|mr.ecik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-myghty|A Python-based templating system derived from HTML::Mason|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-nltk|Python-based Natural Language Toolkit|michel.salim at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-nltk_lite|Python-based Natural Language Toolkit|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-nose|A discovery-based unittest extension for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numarray|Python array manipulation and computational library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 22:28:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:28:48 -0700
Subject: rpms/gauche-gtk/FC-5 gauche-gtk.spec,1.1,1.2
Message-ID: <200611132228.kADMSmNH021065@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gtk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21003/FC-5

Modified Files:
	gauche-gtk.spec 
Log Message:
rebuilt for gauche 0.8.8


Index: gauche-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gtk/FC-5/gauche-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gauche-gtk.spec	15 May 2006 19:23:41 -0000	1.1
+++ gauche-gtk.spec	13 Nov 2006 22:28:18 -0000	1.2
@@ -1,8 +1,8 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gtk
 Version:        0.4.1
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:	Gauche extension module to use GTK
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.1-9
+- rebuilt for gauche 0.8.8
+
 * Fri May  5 2006 Gerard Milmeister  - 0.4.1-7
 - Added include flags for freetype
 - Added -fPIC flag 



From fedora-extras-commits at redhat.com  Mon Nov 13 22:28:49 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:28:49 -0700
Subject: rpms/gauche-gtk/FC-6 gauche-gtk.spec,1.2,1.3
Message-ID: <200611132228.kADMSnAv021072@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gtk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21003/FC-6

Modified Files:
	gauche-gtk.spec 
Log Message:
rebuilt for gauche 0.8.8


Index: gauche-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gtk/FC-6/gauche-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gauche-gtk.spec	28 Aug 2006 11:15:36 -0000	1.2
+++ gauche-gtk.spec	13 Nov 2006 22:28:18 -0000	1.3
@@ -1,8 +1,8 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gtk
 Version:        0.4.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:	Gauche extension module to use GTK
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.1-9
+- rebuilt for gauche 0.8.8
+
 * Mon Aug 28 2006 Gerard Milmeister  - 0.4.1-8
 - Rebuild for FE6
 



From fedora-extras-commits at redhat.com  Mon Nov 13 22:28:49 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:28:49 -0700
Subject: rpms/gauche-gtk/devel gauche-gtk.spec,1.2,1.3
Message-ID: <200611132228.kADMSnfG021076@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21003/devel

Modified Files:
	gauche-gtk.spec 
Log Message:
rebuilt for gauche 0.8.8


Index: gauche-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gtk/devel/gauche-gtk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gauche-gtk.spec	28 Aug 2006 11:15:36 -0000	1.2
+++ gauche-gtk.spec	13 Nov 2006 22:28:19 -0000	1.3
@@ -1,8 +1,8 @@
-%define gauche_version 0.8.7
+%define gauche_version 0.8.8
 
 Name:           gauche-gtk
 Version:        0.4.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:	Gauche extension module to use GTK
 
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Gerard Milmeister  - 0.4.1-9
+- rebuilt for gauche 0.8.8
+
 * Mon Aug 28 2006 Gerard Milmeister  - 0.4.1-8
 - Rebuild for FE6
 



From fedora-extras-commits at redhat.com  Mon Nov 13 22:30:09 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 13 Nov 2006 15:30:09 -0700
Subject: owners owners.list,1.1948,1.1949
Message-ID: <200611132230.kADMU9UW021143@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21106

Modified Files:
	owners.list 
Log Message:
newpg was actually dropped before FE(3) - no need for it to hang around here.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1948
retrieving revision 1.1949
diff -u -r1.1948 -r1.1949
--- owners.list	13 Nov 2006 22:27:12 -0000	1.1948
+++ owners.list	13 Nov 2006 22:29:38 -0000	1.1949
@@ -1155,7 +1155,6 @@
 Fedora Extras|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|denis at poolshark.org|extras-qa at fedoraproject.org|davidz at redhat.com
 Fedora Extras|neverball|Roll a ball through an obstacle course|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|new|A simple template system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
-Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|newsx|NNTP news exchange utility|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 22:33:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 13 Nov 2006 15:33:51 -0700
Subject: owners owners.list,1.1949,1.1950
Message-ID: <200611132233.kADMXpUX021289@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21273/owners

Modified Files:
	owners.list 
Log Message:
co-maintain qemu


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1949
retrieving revision 1.1950
diff -u -r1.1949 -r1.1950
--- owners.list	13 Nov 2006 22:29:38 -0000	1.1949
+++ owners.list	13 Nov 2006 22:33:21 -0000	1.1950
@@ -1972,8 +1972,7 @@
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
-Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
+Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-zope-interface|Zope interfaces package|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -1990,7 +1989,7 @@
 Fedora Extras|qca-tls|Qt Cryptographic Architecture, TLS plugin|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|qcad|CAD program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|qcomicbook|Comic Viewing Program|scott at perturb.org|extras-qa at fedoraproject.org|
-Fedora Extras|qemu|QEMU is a FAST! processor emulator|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|qemu|QEMU is a FAST! processor emulator|dwmw2 at redhat.com|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
 Fedora Extras|qgit|Browser for GIT repositories|dan at danny.cz|extras-qa at fedoraproject.org|
 Fedora Extras|qgo|Graphical Go client and SGF editor|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|qhull|General dimension convex hull programs|rc040203 at freenet.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 22:34:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:34:55 -0700
Subject: rpms/spicctrl/FC-6 .cvsignore, 1.3, 1.4 Makefile, 1.2, 1.3 sources, 
	1.3, 1.4 spicctrl.spec, 1.4, 1.5 dead.package, 1.1, NONE
Message-ID: <200611132234.kADMYtCZ021397@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/spicctrl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21355/FC-6

Added Files:
	.cvsignore Makefile sources spicctrl.spec 
Removed Files:
	dead.package 
Log Message:
Resurrect spicctrl for FC-6 and devel



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	13 Nov 2006 22:34:25 -0000	1.4
@@ -0,0 +1 @@
+spicctrl-1.9.tar.bz2


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	13 Nov 2006 22:34:25 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: spicctrl
+# $Id$
+NAME := spicctrl
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	13 Nov 2006 22:34:25 -0000	1.4
@@ -0,0 +1 @@
+775a1959c03e59830303b8320ca379d2  spicctrl-1.9.tar.bz2


Index: spicctrl.spec
===================================================================
RCS file: spicctrl.spec
diff -N spicctrl.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ spicctrl.spec	13 Nov 2006 22:34:25 -0000	1.5
@@ -0,0 +1,84 @@
+Name:           spicctrl
+Version:        1.9
+Release:        4%{?dist}
+Summary:        Sony Vaio laptop SPIC control program
+
+Group:          Applications/System
+License:        GPL
+URL:            http://popies.net/sonypi/
+Source0:        http://popies.net/sonypi/spicctrl-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch:	%{ix86}
+
+%description
+spicctrl queries and sets a variety of parameters on Sony Vaio laptop
+computers, including AC Power status, battery status, screen brightness,
+and bluetooth device power status
+
+
+%prep
+%setup -q
+%{__sed} -i 's/ -O2 / $(RPM_OPT_FLAGS) /' Makefile
+
+
+%build
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m755 spicctrl $RPM_BUILD_ROOT%{_sbindir}
+install -p -m644 spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ ! -c /dev/sonypi ]; then
+	rm -f /dev/sonypi
+	mknod /dev/sonypi c 10 250
+fi
+if [ -e /etc/modprobe.conf ]; then
+	grep 'alias char-major-10-250 sonypi' /etc/modprobe.conf > /dev/null
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then
+		echo 'alias char-major-10-250 sonypi' >> /etc/modprobe.conf
+		echo 'options sonypi minor=250' >> /etc/modprobe.conf
+	fi
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGES LICENSE
+%{_sbindir}/spicctrl
+%{_mandir}/man1/spicctrl.1.gz
+
+
+%changelog
+* Sat May 20 2006 Roozbeh Pournader  1.9-4
+- Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct
+  man page permissions (Ville Skytt??)
+
+* Tue Feb 14 2006 Roozbeh Pournader  1.9-3
+- Rebuild for Fedora Extras 5
+
+* Tue Jan 31 2006 Roozbeh Pournader  1.9-2
+- Bumped release to a proper integer
+
+* Sun Jan 08 2006 Roozbeh Pournader  1.9-1.4
+- Add %%{?dist} tag
+
+* Mon Dec 26 2005 Roozbeh Pournader  1.9-1.3
+- Change ExclusiveArch to %%{ix86}
+
+* Mon Dec 26 2005 Roozbeh Pournader  1.9-1.2
+- Add ExclusiveArch
+
+* Thu Dec 22 2005 Roozbeh Pournader  1.9-1.1
+- First revision, based on upstream spec file


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 22:34:56 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:34:56 -0700
Subject: rpms/spicctrl/devel .cvsignore, 1.3, 1.4 Makefile, 1.2, 1.3 sources,
	1.3, 1.4 spicctrl.spec, 1.4, 1.5 dead.package, 1.1, NONE
Message-ID: <200611132234.kADMYu5f021403@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21355/devel

Added Files:
	.cvsignore Makefile sources spicctrl.spec 
Removed Files:
	dead.package 
Log Message:
Resurrect spicctrl for FC-6 and devel



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	13 Nov 2006 22:34:26 -0000	1.4
@@ -0,0 +1 @@
+spicctrl-1.9.tar.bz2


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	13 Nov 2006 22:34:26 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: spicctrl
+# $Id$
+NAME := spicctrl
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	13 Nov 2006 22:34:26 -0000	1.4
@@ -0,0 +1 @@
+775a1959c03e59830303b8320ca379d2  spicctrl-1.9.tar.bz2


Index: spicctrl.spec
===================================================================
RCS file: spicctrl.spec
diff -N spicctrl.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ spicctrl.spec	13 Nov 2006 22:34:26 -0000	1.5
@@ -0,0 +1,84 @@
+Name:           spicctrl
+Version:        1.9
+Release:        4%{?dist}
+Summary:        Sony Vaio laptop SPIC control program
+
+Group:          Applications/System
+License:        GPL
+URL:            http://popies.net/sonypi/
+Source0:        http://popies.net/sonypi/spicctrl-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch:	%{ix86}
+
+%description
+spicctrl queries and sets a variety of parameters on Sony Vaio laptop
+computers, including AC Power status, battery status, screen brightness,
+and bluetooth device power status
+
+
+%prep
+%setup -q
+%{__sed} -i 's/ -O2 / $(RPM_OPT_FLAGS) /' Makefile
+
+
+%build
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m755 spicctrl $RPM_BUILD_ROOT%{_sbindir}
+install -p -m644 spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ ! -c /dev/sonypi ]; then
+	rm -f /dev/sonypi
+	mknod /dev/sonypi c 10 250
+fi
+if [ -e /etc/modprobe.conf ]; then
+	grep 'alias char-major-10-250 sonypi' /etc/modprobe.conf > /dev/null
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then
+		echo 'alias char-major-10-250 sonypi' >> /etc/modprobe.conf
+		echo 'options sonypi minor=250' >> /etc/modprobe.conf
+	fi
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGES LICENSE
+%{_sbindir}/spicctrl
+%{_mandir}/man1/spicctrl.1.gz
+
+
+%changelog
+* Sat May 20 2006 Roozbeh Pournader  1.9-4
+- Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct
+  man page permissions (Ville Skytt??)
+
+* Tue Feb 14 2006 Roozbeh Pournader  1.9-3
+- Rebuild for Fedora Extras 5
+
+* Tue Jan 31 2006 Roozbeh Pournader  1.9-2
+- Bumped release to a proper integer
+
+* Sun Jan 08 2006 Roozbeh Pournader  1.9-1.4
+- Add %%{?dist} tag
+
+* Mon Dec 26 2005 Roozbeh Pournader  1.9-1.3
+- Change ExclusiveArch to %%{ix86}
+
+* Mon Dec 26 2005 Roozbeh Pournader  1.9-1.2
+- Add ExclusiveArch
+
+* Thu Dec 22 2005 Roozbeh Pournader  1.9-1.1
+- First revision, based on upstream spec file


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 13 22:38:19 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:38:19 -0700
Subject: rpms/spicctrl/FC-6 spicctrl.spec,1.5,1.6
Message-ID: <200611132238.kADMcJ0R021493@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/spicctrl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21477

Modified Files:
	spicctrl.spec 
Log Message:
Bump release number for rebuild



Index: spicctrl.spec
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/FC-6/spicctrl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spicctrl.spec	13 Nov 2006 22:34:25 -0000	1.5
+++ spicctrl.spec	13 Nov 2006 22:37:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           spicctrl
 Version:        1.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sony Vaio laptop SPIC control program
 
 Group:          Applications/System
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Michel Salim  1.9-5
+- Rebuild for Fedora Extras 6
+
 * Sat May 20 2006 Roozbeh Pournader  1.9-4
 - Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct
   man page permissions (Ville Skytt??)



From fedora-extras-commits at redhat.com  Mon Nov 13 22:40:47 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Mon, 13 Nov 2006 15:40:47 -0700
Subject: rpms/spicctrl/devel spicctrl.spec,1.5,1.6
Message-ID: <200611132240.kADMel75021564@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21542

Modified Files:
	spicctrl.spec 
Log Message:
Bump up -devel release number to be in sync with FC-6



Index: spicctrl.spec
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/devel/spicctrl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spicctrl.spec	13 Nov 2006 22:34:26 -0000	1.5
+++ spicctrl.spec	13 Nov 2006 22:40:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           spicctrl
 Version:        1.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sony Vaio laptop SPIC control program
 
 Group:          Applications/System
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Michel Salim  1.9-5
+- Rebuild for Fedora Extras 6
+
 * Sat May 20 2006 Roozbeh Pournader  1.9-4
 - Respect $RPM_OPT_FLAGS (also fixes debuginfo), use correct
   man page permissions (Ville Skytt??)



From fedora-extras-commits at redhat.com  Mon Nov 13 22:44:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Mon, 13 Nov 2006 15:44:30 -0700
Subject: rpms/gauche-gl/FC-6 gauche-gl.spec,1.4,1.5
Message-ID: <200611132244.kADMiUBP021722@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche-gl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21693

Modified Files:
	gauche-gl.spec 
Log Message:



Index: gauche-gl.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche-gl/FC-6/gauche-gl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gauche-gl.spec	13 Nov 2006 22:19:40 -0000	1.4
+++ gauche-gl.spec	13 Nov 2006 22:44:00 -0000	1.5
@@ -2,13 +2,13 @@
 
 Name:           gauche-gl
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:	OpenGL binding for Gauche
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.shiro.dreamhost.com/scheme/gauche
-Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.1.tgz
+Source:		http://download.sourceforge.net/gauche/Gauche-gl-0.4.2.tgz
 Patch0:		Gauche-gl-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: 	gauche-devel = %{gauche_version}



From fedora-extras-commits at redhat.com  Mon Nov 13 22:44:32 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:44:32 -0700
Subject: rpms/logserial - New directory
Message-ID: <200611132244.kADMiWhW021729@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21725/logserial

Log Message:
Directory /cvs/extras/rpms/logserial added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 22:44:38 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:44:38 -0700
Subject: rpms/logserial/devel - New directory
Message-ID: <200611132244.kADMicOm021774@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21725/logserial/devel

Log Message:
Directory /cvs/extras/rpms/logserial/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 13 22:45:14 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:45:14 -0700
Subject: rpms/logserial Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611132245.kADMjEfD021852@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21845

Added Files:
	Makefile import.log 
Log Message:
Setup of module logserial


--- NEW FILE Makefile ---
# Top level Makefile for module logserial
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  Mon Nov 13 22:45:19 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:45:19 -0700
Subject: rpms/logserial/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611132245.kADMjJuv021871@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21845/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module logserial


--- 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 Nov 13 22:47:02 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:47:02 -0700
Subject: rpms/logserial import.log,1.1,1.2
Message-ID: <200611132247.kADMl2ZM022003@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21968

Modified Files:
	import.log 
Log Message:
auto-import logserial-0.4.2-3 on branch devel from logserial-0.4.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/logserial/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Nov 2006 22:45:14 -0000	1.1
+++ import.log	13 Nov 2006 22:46:32 -0000	1.2
@@ -0,0 +1 @@
+logserial-0_4_2-3:HEAD:logserial-0.4.2-3.src.rpm:1163458090



From fedora-extras-commits at redhat.com  Mon Nov 13 22:47:03 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:47:03 -0700
Subject: rpms/logserial/devel logserial-makefile.patch, NONE,
	1.1 logserial.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611132247.kADMl3X1022007@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21968/devel

Modified Files:
	.cvsignore sources 
Added Files:
	logserial-makefile.patch logserial.spec 
Log Message:
auto-import logserial-0.4.2-3 on branch devel from logserial-0.4.2-3.src.rpm

logserial-makefile.patch:

--- NEW FILE logserial-makefile.patch ---
--- Makefile	2003-04-12 19:41:07.000000000 +0300
+++ Makefile.new	2006-11-13 14:26:51.000000000 +0200
@@ -15,7 +15,8 @@ OBJS= logserial.o sysdep1.o
 OPTIMIZE= -O3 -m486 -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS
 DEBUG_FLAGS= #-g 
 
-CFLAGS= $(DEBUG_FLAGS) $(OPTIMIZE)
+#CFLAGS= $(DEBUG_FLAGS) $(OPTIMIZE)
+CFLAGS= -D_POSIX $(RPM_OPT_FLAGS)
 
 all: $(NAME)
 


--- NEW FILE logserial.spec ---
Name:           logserial
Version:        0.4.2 
Release:        3%{?dist}
Summary:        Package for logging incoming bytes on asynchronous serial ports

Group:          Applications/Communications
License:        GPL
URL:            http://www.ibiblio.org/pub/Linux/system/serial/logserial-0.4.2.lsm
Source0:        http://www.ibiblio.org/pub/Linux/system/serial/logserial-0.4.2.tar.gz
Patch0:         logserial-makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Package for logging incoming bytes on asynchronous serial ports.
It was written for loging calls on our telephone central, but
you can use it for any devices connected to serial ports. From
version 0.4 it can be used to send data through serial line.

%prep
%setup -q
%patch -p0


%build

echo $RPM_OPT_FLAGS
echo $CFLAGS
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
install -p -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG README
%{_bindir}/%{name}




%changelog
* Mon Nov 13 2006 lonely wolf  0.4.2-3
- corrected the patch to make use of $RPM_OPT_FLAGS

* Sun Nov 12 2006 lonely wolf  0.4.2-2
- Modify the Makefile to make use of $RPM_OPT_FLAGS

* Mon Nov 07 2006 lonely wolf  0.4.2-1
- Initial Fedora package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logserial/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Nov 2006 22:45:19 -0000	1.1
+++ .cvsignore	13 Nov 2006 22:46:32 -0000	1.2
@@ -0,0 +1 @@
+logserial-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logserial/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Nov 2006 22:45:19 -0000	1.1
+++ sources	13 Nov 2006 22:46:32 -0000	1.2
@@ -0,0 +1 @@
+833fff07602e4a21f447aa194d14ecd8  logserial-0.4.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 13 22:50:09 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 13 Nov 2006 15:50:09 -0700
Subject: owners owners.list,1.1950,1.1951
Message-ID: <200611132250.kADMo9WH022073@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22057

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1950
retrieving revision 1.1951
diff -u -r1.1950 -r1.1951
--- owners.list	13 Nov 2006 22:33:21 -0000	1.1950
+++ owners.list	13 Nov 2006 22:49:38 -0000	1.1951
@@ -1015,6 +1015,7 @@
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|logserial|Package for logging incoming bytes on asynchronous serial ports|wolfy at nobugconsulting.ro|extras-qa at fedoraproject.org|
 Fedora Extras|lostirc|Simple IRC client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 13 22:54:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Mon, 13 Nov 2006 15:54:58 -0700
Subject: owners owners.list,1.1951,1.1952
Message-ID: <200611132254.kADMswlo022168@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22148

Modified Files:
	owners.list 
Log Message:
Fix breakage.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1951
retrieving revision 1.1952
diff -u -r1.1951 -r1.1952
--- owners.list	13 Nov 2006 22:49:38 -0000	1.1951
+++ owners.list	13 Nov 2006 22:54:28 -0000	1.1952
@@ -1786,8 +1786,8 @@
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|php-pear-HTML-Table|Class to easily design HTML tables|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-QuickForm|Class for creating, validating, processing HTML forms|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-HTML-Table|Class to easily design HTML tables|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP|Miscellaneous HTTP utilities|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTTP-Request|Provides an easy way to perform HTTP requests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Image-GraphViz|Interface to AT&T's GraphViz tools|chris.stone at gmail.com|extras-qa at fedoraproject.org|
@@ -1973,7 +1973,8 @@
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
-Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
+Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-zope-interface|Zope interfaces package|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 02:18:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 19:18:51 -0700
Subject: rpms/sbcl/devel sbcl.spec,1.53,1.54
Message-ID: <200611140218.kAE2IpbB002774@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2758

Modified Files:
	sbcl.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  0.9.18-2
- fix awol contrib/sb-bsd-sockets (#214568)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sbcl.spec	26 Oct 2006 12:52:20 -0000	1.53
+++ sbcl.spec	14 Nov 2006 02:18:21 -0000	1.54
@@ -4,13 +4,13 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
+%define sbcl_verbose 1 
 %define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -24,7 +24,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -33,17 +33,16 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
 # or
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.12-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
 BuildRequires: sbcl
@@ -112,7 +111,8 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+#export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 # setup local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
@@ -125,9 +125,11 @@
 #define my_setarch ./my_setarch
 
 # WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?)
-# at least until a better solution is found
-# http://bugzilla.redhat.com/bugzilla/169506
+# http://bugzilla.redhat.com/169506
 touch contrib/sb-posix/test-passed
+# WORKAROUND sb-bsd-sockets test failures
+# http://bugzilla.redhat.com/214568
+touch contrib/sb-bsd-sockets/test-passed
 
 # trick contrib/ modules to use optflags too 
 export EXTRA_CFLAGS="$CFLAGS"
@@ -144,18 +146,21 @@
 
 
 %check
-# santity check, did sb-posix get built/included?
-# http://bugzilla.redhat.com/bugzilla/169506
-SB_POSIX=%{_libdir}/sbcl/sb-posix
-if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then
-  echo "${SB_POSIX} awol!"
-  exit 1
-fi
+ERROR=0
+# santity check, essential contrib modules get built/included? 
+CONTRIBS="sb-posix sb-bsd-sockets"
+for CONTRIB in $CONTRIBS ; do
+  if [ ! -d $RPM_BUILD_ROOT%{_libdir}/sbcl/$CONTRIB ]; then
+    echo "WARNING: ${CONTRIB} awol!"
+    ERROR=1 
+  fi
+done
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
 %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
+exit $ERROR
 
 
 %install
@@ -215,6 +220,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  0.9.18-2
+- fix awol contrib/sb-bsd-sockets (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  0.9.18-1
 - sbcl-0.9.18
 



From fedora-extras-commits at redhat.com  Tue Nov 14 02:23:10 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 19:23:10 -0700
Subject: rpms/puppet/FC-6 .cvsignore, 1.8, 1.9 puppet.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <200611140223.kAE2NA01002934@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2875/FC-6

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Oct 2006 00:23:09 -0000	1.8
+++ .cvsignore	14 Nov 2006 02:22:40 -0000	1.9
@@ -1 +1 @@
-puppet-0.20.0.tgz
+puppet-0.20.1.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/puppet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- puppet.spec	24 Oct 2006 00:23:09 -0000	1.8
+++ puppet.spec	14 Nov 2006 02:22:40 -0000	1.9
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.20.0
+Version: 0.20.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Nov 13 2006 David Lutterkort  - 0.20.1-1
+- New version
+
 * Mon Oct 23 2006 David Lutterkort  - 0.20.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 00:23:09 -0000	1.8
+++ sources	14 Nov 2006 02:22:40 -0000	1.9
@@ -1 +1 @@
-0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz
+5d4a35b197f6342742bbd3561aac99e8  puppet-0.20.1.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 02:23:10 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 19:23:10 -0700
Subject: rpms/puppet/FC-5 .cvsignore, 1.8, 1.9 puppet.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <200611140223.kAE2NA86002929@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2875/FC-5

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Oct 2006 00:21:28 -0000	1.8
+++ .cvsignore	14 Nov 2006 02:22:39 -0000	1.9
@@ -1 +1 @@
-puppet-0.20.0.tgz
+puppet-0.20.1.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/puppet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- puppet.spec	24 Oct 2006 00:21:28 -0000	1.8
+++ puppet.spec	14 Nov 2006 02:22:39 -0000	1.9
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.20.0
+Version: 0.20.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Nov 13 2006 David Lutterkort  - 0.20.1-1
+- New version
+
 * Mon Oct 23 2006 David Lutterkort  - 0.20.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 00:21:28 -0000	1.8
+++ sources	14 Nov 2006 02:22:39 -0000	1.9
@@ -1 +1 @@
-0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz
+5d4a35b197f6342742bbd3561aac99e8  puppet-0.20.1.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 02:23:16 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 19:23:16 -0700
Subject: rpms/puppet/devel .cvsignore, 1.8, 1.9 puppet.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <200611140223.kAE2NGEA002939@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/puppet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2875/devel

Modified Files:
	.cvsignore puppet.spec sources 
Log Message:
New version 0.20.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Oct 2006 00:26:21 -0000	1.8
+++ .cvsignore	14 Nov 2006 02:22:46 -0000	1.9
@@ -1 +1 @@
-puppet-0.20.0.tgz
+puppet-0.20.1.tgz


Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/puppet.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- puppet.spec	24 Oct 2006 00:26:21 -0000	1.8
+++ puppet.spec	14 Nov 2006 02:22:46 -0000	1.9
@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.20.0
+Version: 0.20.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -127,6 +127,9 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Nov 13 2006 David Lutterkort  - 0.20.1-1
+- New version
+
 * Mon Oct 23 2006 David Lutterkort  - 0.20.0-1
 - New version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/puppet/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 00:26:21 -0000	1.8
+++ sources	14 Nov 2006 02:22:46 -0000	1.9
@@ -1 +1 @@
-0f323f94e5ebab0236d60b9a093e2e6c  puppet-0.20.0.tgz
+5d4a35b197f6342742bbd3561aac99e8  puppet-0.20.1.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 02:57:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 19:57:12 -0700
Subject: rpms/maxima/devel maxima.spec,1.44,1.45
Message-ID: <200611140257.kAE2vCH5003217@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3200

Modified Files:
	maxima.spec 
Log Message:
* Fri Nov 10 2006 Rex Dieter  5.10.0-8
- omit sbcl-disable-debugger patch (#214568)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- maxima.spec	26 Oct 2006 20:37:14 -0000	1.44
+++ maxima.spec	14 Nov 2006 02:56:42 -0000	1.45
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -181,7 +181,7 @@
 
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
-%patch3 -p1 -b .sbcl-disable-debugger
+#patch3 -p1 -b .sbcl-disable-debugger
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -385,6 +385,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter  5.10.0-8
+- omit sbcl-disable-debugger patch (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  5.10.0-7
 - respin for sbcl-0.9.18
 - fixup %%triggerun's



From fedora-extras-commits at redhat.com  Tue Nov 14 02:59:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 19:59:35 -0700
Subject: rpms/sbcl/FC-6 sbcl.spec,1.53,1.54
Message-ID: <200611140259.kAE2xZcK003287@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3271

Modified Files:
	sbcl.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  0.9.18-2
- fix awol contrib/sb-bsd-sockets (#214568)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-6/sbcl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sbcl.spec	8 Nov 2006 14:24:42 -0000	1.53
+++ sbcl.spec	14 Nov 2006 02:59:05 -0000	1.54
@@ -4,13 +4,13 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
+%define sbcl_verbose 1 
 %define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -24,7 +24,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -33,17 +33,16 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
 # or
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.12-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
 BuildRequires: sbcl
@@ -112,7 +111,8 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+#export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 # setup local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
@@ -125,9 +125,11 @@
 #define my_setarch ./my_setarch
 
 # WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?)
-# at least until a better solution is found
-# http://bugzilla.redhat.com/bugzilla/169506
+# http://bugzilla.redhat.com/169506
 touch contrib/sb-posix/test-passed
+# WORKAROUND sb-bsd-sockets test failures
+# http://bugzilla.redhat.com/214568
+touch contrib/sb-bsd-sockets/test-passed
 
 # trick contrib/ modules to use optflags too 
 export EXTRA_CFLAGS="$CFLAGS"
@@ -144,18 +146,21 @@
 
 
 %check
-# santity check, did sb-posix get built/included?
-# http://bugzilla.redhat.com/bugzilla/169506
-SB_POSIX=%{_libdir}/sbcl/sb-posix
-if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then
-  echo "${SB_POSIX} awol!"
-  exit 1
-fi
+ERROR=0
+# santity check, essential contrib modules get built/included? 
+CONTRIBS="sb-posix sb-bsd-sockets"
+for CONTRIB in $CONTRIBS ; do
+  if [ ! -d $RPM_BUILD_ROOT%{_libdir}/sbcl/$CONTRIB ]; then
+    echo "WARNING: ${CONTRIB} awol!"
+    ERROR=1 
+  fi
+done
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
 %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
+exit $ERROR
 
 
 %install
@@ -215,6 +220,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  0.9.18-2
+- fix awol contrib/sb-bsd-sockets (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  0.9.18-1
 - sbcl-0.9.18
 



From fedora-extras-commits at redhat.com  Tue Nov 14 03:00:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 20:00:40 -0700
Subject: rpms/sbcl/FC-5 sbcl.spec,1.50,1.51
Message-ID: <200611140300.kAE30exT003371@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3350

Modified Files:
	sbcl.spec 
Log Message:
* Mon Nov 13 2006 Rex Dieter  0.9.18-2
- fix awol contrib/sb-bsd-sockets (#214568)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sbcl.spec	8 Nov 2006 14:41:17 -0000	1.50
+++ sbcl.spec	14 Nov 2006 03:00:09 -0000	1.51
@@ -4,13 +4,13 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
+%define sbcl_verbose 1 
 %define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -24,7 +24,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -33,17 +33,16 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.18-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
 # or
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.12-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
 BuildRequires: sbcl
@@ -112,7 +111,8 @@
 
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+#export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 # setup local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
@@ -125,9 +125,11 @@
 #define my_setarch ./my_setarch
 
 # WORKAROUND sb-posix STAT.2, STAT.4 test failures (fc3/fc4 only, fc5 passes?)
-# at least until a better solution is found
-# http://bugzilla.redhat.com/bugzilla/169506
+# http://bugzilla.redhat.com/169506
 touch contrib/sb-posix/test-passed
+# WORKAROUND sb-bsd-sockets test failures
+# http://bugzilla.redhat.com/214568
+touch contrib/sb-bsd-sockets/test-passed
 
 # trick contrib/ modules to use optflags too 
 export EXTRA_CFLAGS="$CFLAGS"
@@ -144,18 +146,21 @@
 
 
 %check
-# santity check, did sb-posix get built/included?
-# http://bugzilla.redhat.com/bugzilla/169506
-SB_POSIX=%{_libdir}/sbcl/sb-posix
-if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then
-  echo "${SB_POSIX} awol!"
-  exit 1
-fi
+ERROR=0
+# santity check, essential contrib modules get built/included? 
+CONTRIBS="sb-posix sb-bsd-sockets"
+for CONTRIB in $CONTRIBS ; do
+  if [ ! -d $RPM_BUILD_ROOT%{_libdir}/sbcl/$CONTRIB ]; then
+    echo "WARNING: ${CONTRIB} awol!"
+    ERROR=1 
+  fi
+done
 pushd tests 
 # Only x86 builds are expected to pass all
 # Don't worry about thread.impure failure(s), threading is optional anyway.
 %{?setarch} %{?sbcl_shell} ./run-tests.sh ||:
 popd
+exit $ERROR
 
 
 %install
@@ -215,6 +220,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  0.9.18-2
+- fix awol contrib/sb-bsd-sockets (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  0.9.18-1
 - sbcl-0.9.18
 



From fedora-extras-commits at redhat.com  Tue Nov 14 03:05:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 20:05:59 -0700
Subject: rpms/libassuan/FC-6 .cvsignore, 1.7, 1.8 libassuan.spec, 1.20,
	1.21 sources, 1.7, 1.8 libassuan-0.9.3-m4-2.patch, 1.1,
	NONE libassuan-0.9.3-m4.patch, 1.1, NONE
Message-ID: <200611140305.kAE35xgu006513@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6491

Modified Files:
	.cvsignore libassuan.spec sources 
Removed Files:
	libassuan-0.9.3-m4-2.patch libassuan-0.9.3-m4.patch 
Log Message:
* Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
- 1.0.0
- rename -devel -> -static (+Obsoletes/Provides: %name-devel)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Oct 2006 18:37:19 -0000	1.7
+++ .cvsignore	14 Nov 2006 03:05:29 -0000	1.8
@@ -1,5 +1,4 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-0.9.2.tar.bz2.sig
-libassuan-0.9.2.tar.bz2
-libassuan-0.9.3.tar.bz2.sig
+libassuan-1.0.0.tar.bz2
+libassuan-1.0.0.tar.bz2.sig


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/libassuan.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libassuan.spec	18 Oct 2006 14:07:08 -0000	1.20
+++ libassuan.spec	14 Nov 2006 03:05:29 -0000	1.21
@@ -1,34 +1,32 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 0.9.3
-Release: 2%{?dist}
+Version: 1.0.0 
+Release: 1%{?dist}
 
 License: LGPL
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: libassuan-0.9.3-m4.patch
-Patch2: libassuan-0.9.3-m4-2.patch
-
 BuildRequires: pth-devel
 
 %description
 This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
 packages.
 
-%package devel
+%package static 
 Summary: GnuPG IPC library 
 Group: Development/Libraries
 Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
-Provides: %{name}-static = %{version}-%{release}
-%description devel
-This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
+Obsoletes: %{name}-devel < %{version}-%{release}
+Provides:  %{name}-devel = %{version}-%{release}
+%description static 
+This is the IPC static library used by GnuPG 1.9/2, GPGME and a few other
 packages.
 
 This package contains files needed to develop applications using %{name}.
@@ -37,9 +35,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .m4patch
-%patch2 -p0 -b .m4patch-2
-
 
 %build
 #ifarch x86_64
@@ -59,14 +54,14 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
-%check || :
+%check
 make check
 
 
-%post devel
+%post static 
 /sbin/install-info %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
 
-%postun devel
+%postun static 
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
 fi
@@ -76,7 +71,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files devel
+%files static 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
@@ -87,6 +82,10 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
+- 1.0.0
+- rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
+
 * Wed Oct 18 2006 Rex Dieter  - 0.9.3-2
 - another libassuan.m4 patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Oct 2006 18:37:19 -0000	1.7
+++ sources	14 Nov 2006 03:05:29 -0000	1.8
@@ -1,2 +1,2 @@
-a2e3cb948de5159728e73d53529ae7ad  libassuan-0.9.3.tar.bz2.sig
-60add4aebf1961436da3a470d6ac833c  libassuan-0.9.3.tar.bz2
+f1580ef149e629629a9639a5afdb5908  libassuan-1.0.0.tar.bz2
+c00497327001dcccf7d3a952f56030e4  libassuan-1.0.0.tar.bz2.sig


--- libassuan-0.9.3-m4-2.patch DELETED ---


--- libassuan-0.9.3-m4.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 03:22:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 20:22:23 -0700
Subject: rpms/eric/devel .cvsignore, 1.3, 1.4 eric.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <200611140322.kAE3MNYY006875@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6855

Modified Files:
	.cvsignore eric.spec sources 
Log Message:
* Mon Nov 13 2006 Rex Dieter  5.9.2-1
- 5.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Jul 2006 12:16:56 -0000	1.3
+++ .cvsignore	14 Nov 2006 03:21:53 -0000	1.4
@@ -1,3 +1,4 @@
 gen_python_api_20050605.tar.gz
 gen_sip_api_20060711.tar.gz
 eric-3.9.1.tar.gz
+eric-3.9.2.tar.gz


Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eric.spec	8 Nov 2006 14:11:59 -0000	1.6
+++ eric.spec	14 Nov 2006 03:21:53 -0000	1.7
@@ -4,8 +4,8 @@
 
 Name:	 eric
 Summary: Python IDE
-Version: 3.9.1
-Release: 4%{?dist}%{?kde}
+Version: 3.9.2
+Release: 1%{?dist}
 
 License: GPL
 Group:	 Development/Tools
@@ -15,7 +15,6 @@
 BuildArch: noarch
 
 Source1: http://www.die-offenbachs.de/detlev/contributions/gen_python_api_20050605.tar.gz
-#Source2: http://www.die-offenbachs.de/detlev/contributions/gen_sip_api_20060123.tar.gz
 Source2: http://www.die-offenbachs.de/detlev/contributions/gen_sip_api_20060711.tar.gz
 
 Source10: eric3.desktop
@@ -140,6 +139,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 Rex Dieter  5.9.2-1
+- 5.9.2
+
 * Mon Nov 06 2006 Rex Dieter  5.9.1-4
 - BR: PyQt-qscintilla-devel
 - (unversioned) Requires: PyQt-qscintilla


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jul 2006 12:16:56 -0000	1.3
+++ sources	14 Nov 2006 03:21:53 -0000	1.4
@@ -1,3 +1,3 @@
 fcea430a92e9d88089d91ce3099db282  gen_python_api_20050605.tar.gz
 8b19482530d51c47a02e43a4ca2bbb79  gen_sip_api_20060711.tar.gz
-7f62b297fa094e547faca7966ccd133d  eric-3.9.1.tar.gz
+b3168b9ccf1625950b6a8dcfbdfc7d35  eric-3.9.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 03:25:25 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:25:25 -0700
Subject: rpms/ruby-activesupport - New directory
Message-ID: <200611140325.kAE3PPBJ007001@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/ruby-activesupport

Log Message:
Directory /cvs/extras/rpms/ruby-activesupport added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 03:25:31 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:25:31 -0700
Subject: rpms/ruby-activesupport/devel - New directory
Message-ID: <200611140325.kAE3PVmU007024@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/ruby-activesupport/devel

Log Message:
Directory /cvs/extras/rpms/ruby-activesupport/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 03:25:56 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:25:56 -0700
Subject: rpms/ruby-activesupport Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611140325.kAE3PuHB007068@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7061

Added Files:
	Makefile import.log 
Log Message:
Setup of module ruby-activesupport


--- NEW FILE Makefile ---
# Top level Makefile for module ruby-activesupport
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  Tue Nov 14 03:25:58 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:25:58 -0700
Subject: rpms/ruby-activesupport/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611140325.kAE3PwIB007087@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7061/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ruby-activesupport


--- 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 Nov 14 03:27:09 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:27:09 -0700
Subject: rpms/ruby-activesupport import.log,1.1,1.2
Message-ID: <200611140327.kAE3R9Ke007183@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7151

Modified Files:
	import.log 
Log Message:
auto-import ruby-activesupport-1.3.1-2 on branch devel from ruby-activesupport-1.3.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ruby-activesupport/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 03:25:56 -0000	1.1
+++ import.log	14 Nov 2006 03:26:38 -0000	1.2
@@ -0,0 +1 @@
+ruby-activesupport-1_3_1-2:HEAD:ruby-activesupport-1.3.1-2.src.rpm:1163474790



From fedora-extras-commits at redhat.com  Tue Nov 14 03:27:10 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:27:10 -0700
Subject: rpms/ruby-activesupport/devel ruby-activesupport.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611140327.kAE3RAsP007187@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7151/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ruby-activesupport.spec 
Log Message:
auto-import ruby-activesupport-1.3.1-2 on branch devel from ruby-activesupport-1.3.1-2.src.rpm


--- NEW FILE ruby-activesupport.spec ---
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%define rname activesupport
Name:           ruby-%{rname}
Version:        1.3.1
Release:        2%{?dist}
Summary:        Utility classes and extension to Ruby's standard library
Group:          Development/Languages

License:        MIT
URL:            http://rubyforge.org/projects/activesupport/
Source0:        http://rubyforge.org/frs/download.php/9563/%{rname}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  ruby
Requires:       ruby(abi) = 1.8
Provides:       ruby(active_support) = 1.3.1

%description
Utility classes and extension to the standard library that were
required by Rails, but found of general use.

%prep
%setup -q -n %{rname}-%{version}

%build
export CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{ruby_sitelib}/
cp -pr lib/* $RPM_BUILD_ROOT/%{ruby_sitelib}/
chmod a-x $RPM_BUILD_ROOT/%{ruby_sitelib}/active_support/breakpoint.rb
find $RPM_BUILD_ROOT/%{ruby_sitelib} -type f -name '._*' | xargs rm

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG
%{ruby_sitelib}/active_support.rb
%{ruby_sitelib}/active_support


%changelog
* Mon Nov  6 2006 David Lutterkort  - 1.3.1-2
- Version the ruby(active_support) provides

* Wed Sep 20 2006  David Lutterkort  - 1.3.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-activesupport/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 03:25:57 -0000	1.1
+++ .cvsignore	14 Nov 2006 03:26:40 -0000	1.2
@@ -0,0 +1 @@
+activesupport-1.3.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-activesupport/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 03:25:57 -0000	1.1
+++ sources	14 Nov 2006 03:26:40 -0000	1.2
@@ -0,0 +1 @@
+4e3fce3bb07e1f66e6f40406291e3266  activesupport-1.3.1.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 03:29:48 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:29:48 -0700
Subject: owners owners.list,1.1952,1.1953
Message-ID: <200611140329.kAE3Tmx6007254@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7224

Modified Files:
	owners.list 
Log Message:
Added ruby-activesupport


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1952
retrieving revision 1.1953
diff -u -r1.1952 -r1.1953
--- owners.list	13 Nov 2006 22:54:28 -0000	1.1952
+++ owners.list	14 Nov 2006 03:29:18 -0000	1.1953
@@ -2062,6 +2062,7 @@
 Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|ruby-activesupport|Utility classes for Ruby|dlutter at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-bdb|A Ruby interface to Berkeley DB|miker5slow at grandecom.net|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-mysql|A Ruby interface to MySQL|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|ruby-postgres|A Ruby interface to Postgres|dlutter at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 03:34:08 2006
From: fedora-extras-commits at redhat.com (David Lutterkort (lutter))
Date: Mon, 13 Nov 2006 20:34:08 -0700
Subject: rpms/ruby-activesupport/devel ruby-activesupport.spec,1.1,1.2
Message-ID: <200611140334.kAE3Y82i007318@cvs-int.fedora.redhat.com>

Author: lutter

Update of /cvs/extras/rpms/ruby-activesupport/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298

Modified Files:
	ruby-activesupport.spec 
Log Message:
Add dependency on ruby-irb (breakpoint.rb needs it)


Index: ruby-activesupport.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-activesupport/devel/ruby-activesupport.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-activesupport.spec	14 Nov 2006 03:26:40 -0000	1.1
+++ ruby-activesupport.spec	14 Nov 2006 03:33:38 -0000	1.2
@@ -2,7 +2,7 @@
 %define rname activesupport
 Name:           ruby-%{rname}
 Version:        1.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility classes and extension to Ruby's standard library
 Group:          Development/Languages
 
@@ -13,7 +13,7 @@
 
 BuildArch:      noarch
 BuildRequires:  ruby
-Requires:       ruby(abi) = 1.8
+Requires:       ruby(abi) = 1.8 ruby-irb
 Provides:       ruby(active_support) = 1.3.1
 
 %description
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Nov 13 2006 David Lutterkort  - 1.3.1-3
+- Add dependency on ruby-irb (breakpoint.rb needs it)
+
 * Mon Nov  6 2006 David Lutterkort  - 1.3.1-2
 - Version the ruby(active_support) provides
 



From fedora-extras-commits at redhat.com  Tue Nov 14 03:37:08 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 13 Nov 2006 20:37:08 -0700
Subject: rpms/lib3ds/devel lib3ds.spec,1.11,1.12
Message-ID: <200611140337.kAE3b8wH007418@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7402

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
- Add Provides: *-static.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/lib3ds.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lib3ds.spec	5 Sep 2006 09:09:13 -0000	1.11
+++ lib3ds.spec	14 Nov 2006 03:36:38 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -42,6 +42,7 @@
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
+Provides:	lib3ds-static = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
@@ -72,6 +73,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
+- Add Provides: *-static.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-9
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 14 03:49:58 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:49:58 -0700
Subject: rpms/php-pear-Structures-DataGrid - New directory
Message-ID: <200611140349.kAE3nwWo007526@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7522/php-pear-Structures-DataGrid

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 03:50:04 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:50:04 -0700
Subject: rpms/php-pear-Structures-DataGrid/devel - New directory
Message-ID: <200611140350.kAE3o40L007540@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7522/php-pear-Structures-DataGrid/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 03:50:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:50:15 -0700
Subject: rpms/php-pear-Structures-DataGrid Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200611140350.kAE3oF3p007571@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7565

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Structures-DataGrid


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Structures-DataGrid
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  Tue Nov 14 03:50:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:50:16 -0700
Subject: rpms/php-pear-Structures-DataGrid/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611140350.kAE3oGAP007588@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7565/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Structures-DataGrid


--- 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 Nov 14 03:51:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:51:05 -0700
Subject: rpms/php-pear-Structures-DataGrid import.log,1.1,1.2
Message-ID: <200611140351.kAE3p5Dq007663@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7629

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Structures-DataGrid-0.7.2-1 on branch devel from php-pear-Structures-DataGrid-0.7.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 03:50:15 -0000	1.1
+++ import.log	14 Nov 2006 03:50:34 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Structures-DataGrid-0_7_2-1:HEAD:php-pear-Structures-DataGrid-0.7.2-1.src.rpm:1163476232



From fedora-extras-commits at redhat.com  Tue Nov 14 03:51:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:51:05 -0700
Subject: rpms/php-pear-Structures-DataGrid/devel
	php-pear-Structures-DataGrid.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611140351.kAE3p58X007667@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7629/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Structures-DataGrid.spec 
Log Message:
auto-import php-pear-Structures-DataGrid-0.7.2-1 on branch devel from php-pear-Structures-DataGrid-0.7.2-1.src.rpm


--- NEW FILE php-pear-Structures-DataGrid.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Structures_DataGrid

Name:           php-pear-Structures-DataGrid
Version:        0.7.2
Release:        1%{?dist}
Summary:        A tabular structure for converting data

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Structures_DataGrid
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This package offers a toolkit to render out a datagrid in HTML format as well
as many other formats such as an XML Document, an Excel Spreadsheet, an XUL
Document and more. It also offers paging and sorting functionallity to limit
the data that is presented and processed. This concept is based on the .NET
Framework DataGrid control and works very well with database and XML result
sets.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/*


%changelog
* Sun Oct 29 2006 Christopher Stone  0.7.2-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 03:50:16 -0000	1.1
+++ .cvsignore	14 Nov 2006 03:50:35 -0000	1.2
@@ -0,0 +1 @@
+Structures_DataGrid-0.7.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 03:50:16 -0000	1.1
+++ sources	14 Nov 2006 03:50:35 -0000	1.2
@@ -0,0 +1 @@
+bb51347f4b792d733c22f6ffd594766c  Structures_DataGrid-0.7.2.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 03:53:04 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 13 Nov 2006 20:53:04 -0700
Subject: owners owners.list,1.1953,1.1954
Message-ID: <200611140353.kAE3r4P0007720@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7704

Modified Files:
	owners.list 
Log Message:
php-pear-Structures-DataGrid


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1953
retrieving revision 1.1954
diff -u -r1.1953 -r1.1954
--- owners.list	14 Nov 2006 03:29:18 -0000	1.1953
+++ owners.list	14 Nov 2006 03:52:34 -0000	1.1954
@@ -1808,6 +1808,7 @@
 Fedora Extras|php-pear-PHP-CompatInfo|Find out version and extensions required for a piece of code to run|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 04:10:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:10:18 -0700
Subject: rpms/kaffeine - New directory
Message-ID: <200611140410.kAE4AIJ7010921@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10917/kaffeine

Log Message:
Directory /cvs/extras/rpms/kaffeine added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 04:10:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:10:24 -0700
Subject: rpms/kaffeine/devel - New directory
Message-ID: <200611140410.kAE4AO3G010943@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10917/kaffeine/devel

Log Message:
Directory /cvs/extras/rpms/kaffeine/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 04:10:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:10:36 -0700
Subject: rpms/kaffeine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611140410.kAE4Aavm010974@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10968

Added Files:
	Makefile import.log 
Log Message:
Setup of module kaffeine


--- NEW FILE Makefile ---
# Top level Makefile for module kaffeine
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  Tue Nov 14 04:10:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:10:42 -0700
Subject: rpms/kaffeine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611140410.kAE4AgEp010991@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10968/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kaffeine


--- 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 Nov 14 04:11:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:11:36 -0700
Subject: rpms/kaffeine import.log,1.1,1.2
Message-ID: <200611140411.kAE4BaU2011068@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11036

Modified Files:
	import.log 
Log Message:
auto-import kaffeine-0.8.2-5 on branch devel from kaffeine-0.8.2-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 04:10:36 -0000	1.1
+++ import.log	14 Nov 2006 04:11:05 -0000	1.2
@@ -0,0 +1 @@
+kaffeine-0_8_2-5:HEAD:kaffeine-0.8.2-5.src.rpm:1163477462



From fedora-extras-commits at redhat.com  Tue Nov 14 04:11:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:11:36 -0700
Subject: rpms/kaffeine/devel kaffeine.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611140411.kAE4Babp011072@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11036/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kaffeine.spec 
Log Message:
auto-import kaffeine-0.8.2-5 on branch devel from kaffeine-0.8.2-5.src.rpm


--- NEW FILE kaffeine.spec ---

%if "%{?fedora}" > "2" || "%{?rhel}" > "4"
%define _with_gstreamer --with-gstreamer
%endif

%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
%define gst 08 
BuildRequires: libXtst-devel libXinerama-devel
%endif

## define to build nonfree bits (for that other repo)
#define nonfree 1

%if "%{?nonfree:1}" == "1"

Name:    kaffeine-extras-nonfree

%define  _with_lame --with-lame
Requires: kaffeine = %{version}
Patch1: kaffeine-0.8.2-codecs.patch
# split occurred here
Conflicts: kaffeine < 0.8.2-2

%else
# Fedora Review: http://bugzilla.redhat.com/213432
Name:    kaffeine
%endif

Version: 0.8.2
Release: 5%{?dist}

License: GPL
Summary: Xine-based media player
Group:   Applications/Multimedia
URL:     http://kaffeine.sourceforge.net/
Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
%{!?_without_dvb:BuildRequires: glibc-kernheaders }
%{?_with_gstreamer:BuildRequires: gstreamer%{?gst}-plugins-devel >= 0.8.7}
# not included in Extras, disabled
%{?_with_lame:BuildRequires: lame-devel}

## kdelibs >= 3.5.4 includes x-mplayer2.desktop mimetype
## everybondy should be using kde >= 3.5.4 by now... (:
#global kdelibs_ver %(kde-config --version 2>/dev/null | grep '^KDE' | cut -d' ' -f2 | cut -d- -f1)
#if "%{?kdelibs_ver}" >= "3.5.4"
%define x_mplayer2_hack 1
Requires: kdelibs >= 6:3.5.4
#or
#Requires: %{_datadir}/mimelnk/application/x-mplayer2.desktop
#endif

%if "%{?nonfree:1}" == "1" 
%if "%{?fedora}" > "4"
# can view dvd's if libdvdcss is available
Requires(hint): libdvdcss
# extra/nonfree codec support
Requires(hint): xine-lib-extras-nonfree
%endif

%description
Nonfree support bits for kaffeine, including DVD playback, MP3
decoding, as well as extended audio/video codec support.

%else
%description
Kaffeine is a xine-based media player for KDE.  It plays back CDs,
and VCDs, and can decode all (local or streamed) multimedia formats 
supported by xine-lib.
Additionally, Kaffeine is fully integrated in KDE, it supports drag
and drop and provides an editable playlist, a bookmark system, a
Konqueror plugin, OSD and much more.

%package devel
Summary: Development files for %{name}
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: kdelibs-devel
%description devel
%{summary}.
%endif


%prep
%setup -q -n kaffeine-%{version}

%{?nonfree:%patch1 -p1 -b .codecs}

# fix perms on docs
chmod -x AUTHORS ChangeLog INSTALL TODO ||:


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh

# easier than patching, and using --with-extra-includes=%{_includedir}/cdda below -- Rex
CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS

%configure \
  --disable-rpath \
  --disable-gcc-hidden-visibility \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking --enable-final \
  %{?_without_dvb} \
  %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
  %{?_with_lame} %{!?_with_lame:--without-lame}

%if "%{?nonfree:1}" == "1"
make %{?_smp_mflags} -C kaffeine/src/input/disc/plugins
%else
make %{?_smp_mflags}
%endif


%install
rm -rf $RPM_BUILD_ROOT

%if "%{?nonfree:1}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT -C kaffeine/src/input/disc/plugins/mp3lame
%else
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install \
  --vendor="" \
  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop

## File lists
# locale's
%find_lang %{name} 
# HTML (1.0)
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
  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

# Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%{?x_mplayer2_hack:rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop}
%endif


%clean
rm -rf $RPM_BUILD_ROOT


%if "%{?nonfree:1}" == "1"
%files 
%defattr(-,root,root,-)
%{_libdir}/kde3/libkaffeinemp3lame.*
%{_datadir}/services/kaffeinemp3lame.desktop
%else

%post
/sbin/ldconfig ||:
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:

%postun
/sbin/ldconfig ||:
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
%{_libdir}/lib*.so.*
%{_libdir}/kde3/lib*.*
%{_datadir}/appl*/*/*.desktop
%{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
%{_datadir}/apps/kaffeine/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/profiles/
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/service*/*.desktop

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/lib*.so
%endif


%changelog
* Sat Nov 04 2006 Rex Dieter  0.8.2-6
- %%doc README

* Fri Nov 03 2006 Rex Dieter  0.8.2-5
- fix chmod so it actually works.

* Thu Nov 02 2006 Rex Dieter  0.8.2-4
- chmod -x AUTHORS ChangeLog TODO
- use rel symlinks under %%_docdir

* Wed Nov 01 2006 Rex Dieter  0.8.2-3
- update %%description to not mention any specific mm containers 
  (like AVI, WMV).

* Wed Nov 01 2006 Rex Dieter  0.8.2-2
- fixup for Extras
- support building kaffeine-extras-nonfree for that other repo. 

* Tue Sep 12 2006 Rex Dieter  0.8.2-1
- 0.8.2

* Thu Aug 10 2006 Rex Dieter  0.8.1-5
- for kdelibs >= 3.5.4, omit 
  /usr/share/mimelnk/application/x-mplayer2.desktop (lvn bug #1132)

* Thu May 18 2006 Rex Dieter  0.8.1-4
- BR: libXtst-devel libXinerama-devel (fc5+)

* Tue Apr 25 2006 Rex Dieter  0.8.1-3
- (re)enable gstreamer support (fc3+)

* Mon Apr 24 2006 Rex Dieter  0.8.1-1
- 0.8.1
- cdda patch (upsgream bug #1463542)

* Sat Mar 25 2006 Rex Dieter  0.7.1-4
- drop --vendor=livna
- fdo icon spec fix
- kaffeine-0.7.x-CVE-2006-0051.patch

* Thu Mar 09 2006 Andreas Bierfert 
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Thu Nov 03 2005 Rex Dieter  - 0.7.1-0.lvn.3
- update-desktop-database (#645)
- -devel pkg (#645)
- -gstreamer subpkg, marked experimental (due to upstream #1254363)
- omit -desktop patch (#645)
- use desktop-file-install (#645)

* Wed Sep  7 2005 Thorsten Leemhuis  - 0:0.7.1-0.lvn.2
- configure with --with-qt-libraries=${QTDIR}/lib to fix build on x86_64

* Sun Sep  4 2005 Ville Skytt??  - 0:0.7.1-0.lvn.1
- 0.7.1, gcc visibility hack no longer needed.

* Mon Aug  8 2005 Ville Skytt??  - 0:0.7-0.lvn.1
- 0.7, now with DVB support (FC4+ only).
- GStreamer support disabled by default due to upstream #1254363, rebuild
  with "--with gstreamer" to enable.
- Quick and dirty workaround for upstream #1253989.

* Sun Mar 20 2005 Ville Skytt??  - 0:0.6-0.lvn.1
- 0.6.

* Thu Dec 23 2004 Ville Skytt??  - 0:0.5-0.lvn.1
- Update to 0.5.

* Fri Nov  5 2004 Ville Skytt??  - 0:0.5-0.lvn.0.1.rc2
- Update to 0.5rc2.

* Sun Oct  3 2004 Ville Skytt??  - 0:0.5-0.lvn.0.1.rc1
- Update to 0.5rc1.
- Requires KDE >= 3.2 -> FC2 only -> make some related cleanups.
- Purge libselinux workarounds, no longer needed.
- Improve GNOME HIG compliance of desktop entry, sync with KPlayer (bug 173).
- Disable dependency tracking to speed up the build.
- Provide -devel.

* Sat May 22 2004 Ville Skytt??  - 0:0.4.3-0.lvn.1.b
- Update to 0.4.3b.
- Add workaround for https://bugzilla.redhat.com/123853

* Mon May  3 2004 Ville Skytt??  - 0:0.4.3-0.lvn.1
- Update to 0.4.3.

* Wed Mar 24 2004 Ville Skytt??  - 0:0.4.2-0.lvn.1
- Update to 0.4.2.

* Sat Jan 17 2004 Ville Skytt??  - 0:0.4.1-0.lvn.1
- Update to 0.4.1, patches applied upstream.
- Update description.

* Mon Nov 17 2003 Ville Skytt??  - 0:0.4-0.lvn.1
- Update to 0.4.
- Disable rpath.
- Add Gnome icon.

* Tue Jul 29 2003 Ville Skytt??  - 0:0.3.2-0.fdr.2
- Own directories under %%{_datadir}/icons.

* Tue Jul  8 2003 Ville Skytt??  - 0:0.3.2-0.fdr.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 04:10:42 -0000	1.1
+++ .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
@@ -0,0 +1 @@
+kaffeine-0.8.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 04:10:42 -0000	1.1
+++ sources	14 Nov 2006 04:11:06 -0000	1.2
@@ -0,0 +1 @@
+bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 04:14:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 13 Nov 2006 21:14:08 -0700
Subject: owners owners.list,1.1954,1.1955
Message-ID: <200611140414.kAE4E82G011127@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11111

Modified Files:
	owners.list 
Log Message:
+kaffeine



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1954
retrieving revision 1.1955
diff -u -r1.1954 -r1.1955
--- owners.list	14 Nov 2006 03:52:34 -0000	1.1954
+++ owners.list	14 Nov 2006 04:13:37 -0000	1.1955
@@ -768,6 +768,7 @@
 Fedora Extras|kadischi|An application for Fedora-based LiveCD generation|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kadu|Gadu-Gadu client for online messaging|mr.ecik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|kadu-theme|Set of themes for Kadu|mr.ecik at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|kaffeine|Xine-based media player|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kanatest|Hiragana and Katakana drill tool|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|kannel|WAP and SMS gateway|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 05:44:56 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:44:56 -0700
Subject: rpms/cups-pdf - New directory
Message-ID: <200611140544.kAE5iuYT014644@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14640/cups-pdf

Log Message:
Directory /cvs/extras/rpms/cups-pdf added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 05:45:02 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:45:02 -0700
Subject: rpms/cups-pdf/devel - New directory
Message-ID: <200611140545.kAE5j2xT014659@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14640/cups-pdf/devel

Log Message:
Directory /cvs/extras/rpms/cups-pdf/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 05:45:28 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:45:28 -0700
Subject: rpms/cups-pdf/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611140545.kAE5jSlH014709@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14685/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cups-pdf


--- 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 Nov 14 05:45:23 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:45:23 -0700
Subject: rpms/cups-pdf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611140545.kAE5jNNA014691@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14685

Added Files:
	Makefile import.log 
Log Message:
Setup of module cups-pdf


--- NEW FILE Makefile ---
# Top level Makefile for module cups-pdf
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  Tue Nov 14 05:46:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:46:55 -0700
Subject: rpms/cups-pdf import.log,1.1,1.2
Message-ID: <200611140546.kAE5kta9014807@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14769

Modified Files:
	import.log 
Log Message:
auto-import cups-pdf-2.4.2-2.fc7 on branch devel from cups-pdf-2.4.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 05:45:23 -0000	1.1
+++ import.log	14 Nov 2006 05:46:24 -0000	1.2
@@ -0,0 +1 @@
+cups-pdf-2_4_2-2_fc7:HEAD:cups-pdf-2.4.2-2.fc7.src.rpm:1163483175



From fedora-extras-commits at redhat.com  Tue Nov 14 05:46:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:46:55 -0700
Subject: rpms/cups-pdf/devel INSTALL.cups-pdf, NONE,
	1.1 INSTALL.fedora.cups-pdf, NONE, 1.1 cups-pdf-conf.patch, NONE,
	1.1 cups-pdf.spec, NONE, 1.1 cups_pdf-2.4.2.te, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611140546.kAE5ktSp014811@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/cups-pdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14769/devel

Modified Files:
	.cvsignore sources 
Added Files:
	INSTALL.cups-pdf INSTALL.fedora.cups-pdf cups-pdf-conf.patch 
	cups-pdf.spec cups_pdf-2.4.2.te 
Log Message:
auto-import cups-pdf-2.4.2-2.fc7 on branch devel from cups-pdf-2.4.2-2.fc7.src.rpm


--- NEW FILE INSTALL.cups-pdf ---
# INSTALL instructions for the rpm version of cups-pdf

  Either you got a binary RPM "cups-pdf_version.ix86.rpm" or a Source RPM (SRPM) "cups-pdf-version.src.rpm"
  depending on this you have to proceed to the following steps.

# CONTENT

1) installing a binary RPM
2) installing a binary SRPM
3) restart CUPS and take a look at the logfiles


1) Installation of a binary RPM
  This package is build as relocatable RPM; this means, that you can set the path, where
  the binary of cups-pdf is installed. This is needed if you installed you CUPS e.g. with the prefix
  /usr/local and not in the standard path /usr/

  The RPM has to be installed with
  $ rpm -i cups-pdf-version.ix86.rpm
  (where "version" and the "x" have to be replaced with the real names)

  if you want to place the binary in an other path than /usr/libs/cups/backend, type
  $ rpm -i --prefix=/usr/local/ cups-pdf-version.ix86.rpm



2) Installation of a SRPM - "for the brave" of you
  First you have to recompile the SRPM with
  $ rpm --rebuild --target ix86 cups-pdf-version.src.rpm
  after successfull compilation you'll find the binaray RPM in you RPMdir
  e.g. under RedHat in /usr/src/redhat/RPMS/ix86/

  "for the brave" of you: passing compiler-flags to the SRPM is possible through
  $ rpm --rebuild --define "optflags -O3 -march=i686 -mcpu=i686" --target i686 cups-pdf-version.src.rpm
  for Redhat 9.0 you have to use
  $ rpmbuild --rebuild --define "optflags -O3 -march=i686 -mcpu=i686" --target i686 cups-pdf-version.src.rpm
  after successfull compilation you'll find the binaray RPM in you RPMdir
  e.g. under RedHat in /usr/src/redhat/RPMS/ix86/

  if you want to modify some paths, to have to extract the SPEC-File, then extract the Sources
  cups-pdf_version.tar.gz edit config.h then edit the same values in cups-pdf.spec, put the modified
  config.h in the archiv cups-pdf_version.tar.gz and recompile with
  $ rpm -ba --define "optflags -O3 -march=ix86 -mcpu=ix86" cups-pdf.spec

3) Restarting CUPS / Logfiles
  please restart CUPS and take a look into the cups-pdf error-log (usually located in /var/log/cups)
  you should see in the file cups-pdf_log something like
  Tue May 27 04:47:46 2003  [DEBUG] initialization finished
  Tue May 27 04:47:46 2003  [STATUS] identification string sent
  All right, you're ready to install a writer and ready to enjoy !

Please report all errors and suggestions around the RPM-Edition to the author of this document.

ver0.2 - 2003/09/09 Karlsruhe (Germany) Dirk Schwier 


--- NEW FILE INSTALL.fedora.cups-pdf ---
This cups-pdf RPM is designed to create a Cups-PDF virtual printer
during the installation, but only if cups is running.

You can create the virtual pinter using :
    /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m PostscriptColor.ppd -E

You can remove the virtual printer using
    /usr/sbin/lpadmin -x Cups-PDF


cups-pdf-conf.patch:

--- NEW FILE cups-pdf-conf.patch ---
--- extra/cups-pdf.conf.orig	2005-12-23 18:28:15.000000000 +0100
+++ extra/cups-pdf.conf	2005-12-23 23:07:22.000000000 +0100
@@ -41,6 +41,7 @@
 ### Default: /var/spool/cups-pdf/${USER}
 
 #Out /var/spool/cups-pdf/${USER}
+Out ${HOME}/Desktop
 
 ### Key: AnonDirName
 ##  ABSOLUTE path for anonymously created PDF files


--- NEW FILE cups-pdf.spec ---
# Module SElinux
%define module cups_pdf

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}
Group:          Applications/Publishing
Source0:        http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz
Source1:        INSTALL.cups-pdf
Source2:        INSTALL.fedora.cups-pdf
Source3:        %{module}-%{version}.te
Patch1:         cups-pdf-conf.patch
URL:            http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/
License:        GPL
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:       ghostscript, cups, policycoreutils
BuildRequires:  selinux-policy-devel, checkpolicy, cups-devel

# These are the defaults paths defined in config.h
# CUPS-PDF spool directory
%define CPSPOOL   %{_localstatedir}/spool/cups-pdf/SPOOL

# CUPS-PDF output directory
%define CPOUT     %{_localstatedir}/spool/cups-pdf

# CUPS-PDF log directory
%define CPLOG     %{_localstatedir}/log/cups

# CUPS-PDF cups-pdf.conf config file
%define ETCCUPS   %(cups-config --serverroot 2>/dev/null || echo %{_sysconfdir}/cups)

# Additional path to backend directory
%define CPBACKEND %(cups-config --serverbin  2>/dev/null || echo %{_libdir}/cups)/backend


%description
"cups-pdf" is a backend script for use with CUPS - the "Common UNIX Printing
System" (see more for CUPS under http://www.cups.org/). 
"cups-pdf" uses the ghostscript pdfwrite device to produce PDF Files.

This version has been modified to store the PDF files on the Desktop of the 
user. This behavior can be changed by editing the configuration file.

%description -l fr
"cups-pdf" est un script de traitement CUPS - le "Common UNIX Printing System"
(plus d'informations sur CUPS ?? l'adresse http://www.cups.org/). 
"cups-pdf" utilise ghostscript pour construire des fichiers au format PDF.

Cette version a ??t?? modifi??e pour produire les fichiers PDF sur le bureau
de l'utilisateur (dossier Desktop du r??pertoire d'accueil de l'utilisateur).
Ce comportement peut ??tre modifi?? en ??ditant le fichier de configuration.

%prep
echo CIBLE = %{name}-%{version}-%{release}
%setup -q -n %{name}-%{version}
%{__cp} %{SOURCE1} INSTALL
%{__cp} %{SOURCE2} INSTALL.fedora

# Relocate output on user's Desktop
%patch1 -p0

%build
pushd src
%{__cc} $RPM_OPT_FLAGS -o cups-pdf cups-pdf.c
popd

# SElinux 
%{__mkdir} selinux
pushd selinux
%{__cp} %{SOURCE3} %{module}.te
echo "%{CPOUT}   system_u:object_r:print_spool_t:s0"  >%{module}.fc
echo "%{CPSPOOL} system_u:object_r:print_spool_t:s0" >>%{module}.fc
make -f %{_datadir}/selinux/devel/Makefile
popd

# Avoid perl dependencies
%{__chmod} -x contrib/pstitleiconv-0.2/pstitleiconv
%{__chmod} -x contrib/cups-pdf-dispatch-0.1/cups-pdf-dispatch

%install
rm -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{CPBACKEND}
%{__mkdir_p} %{buildroot}%{CPSPOOL}
%{__mkdir_p} %{buildroot}%{CPOUT}
%{__mkdir_p} %{buildroot}%{CPLOG}
%{__mkdir_p} %{buildroot}%{CPBACKEND}
%{__mkdir_p} %{buildroot}%{ETCCUPS}
%{__mkdir_p} %{buildroot}%{_datadir}/cups/model/
%{__install} -m644 extra/PostscriptColor.ppd %{buildroot}%{_datadir}/cups/model/PostscriptColor.ppd
# %{__gzip} -d %{buildroot}%{_datadir}/cups/model/PostscriptColor.ppd.gz
%{__install} -m644 extra/cups-pdf.conf %{buildroot}%{ETCCUPS}/cups-pdf.conf
%{__install} -m755 src/cups-pdf %{buildroot}%{CPBACKEND}

# SElinux 
%{__mkdir_p} %{buildroot}%{_datadir}/selinux/packages/%{name}
%{__install} -m644 selinux/%{module}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{module}.pp

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc ChangeLog COPYING README INSTALL INSTALL.fedora contrib/
%dir %{CPSPOOL}
%dir %{CPOUT}
%attr(700, root, root) %{CPBACKEND}/cups-pdf
%config(noreplace) %{ETCCUPS}/cups-pdf.conf
%{_datadir}/cups/model/PostscriptColor.ppd
%{_datadir}/selinux/packages/%{name}/%{module}.pp

%post
# Install/update Selinux policy
semodule -i %{_datadir}/selinux/packages/%{name}/%{module}.pp || :
fixfiles -R %{name} restore

# First install : create the printer if cupsd is running
if [ "$1" -eq "1" -a -f "%{_var}/run/cupsd.pid" ]
then
    if [ -d /proc/$(cat %{_var}/run/cupsd.pid) ]
    then
        /usr/sbin/lpadmin -p Cups-PDF -v cups-pdf:/ -m PostscriptColor.ppd -E || :
    fi
fi

%postun
if [ "$1" -eq "0" ]; then
    # Delete the printer
    /usr/sbin/lpadmin -x Cups-PDF || :

    # Remove the SElinux policy.
    semodule -r %{module} || :
fi

%changelog
* Mon Nov 13 2006 Remi Collet  2.4.2-2
- review comments (URL, INSTALL.fedora as Source2, descr. rewrap)

* Mon Nov 13 2006 Remi Collet  2.4.2-1
- clean spec for Extras
- don't use "service cups restart", only test if cups is running

* Tue Oct 24 2006 Remi Collet  2.4.2-1.fc6.remi
- FC6 build

* Sat Oct  7 2006 Remi Collet  2.4.2-1.fc5.remi
- update to 2.4.2

* Tue May 16 2006 Remi Collet  2.4.0-1.fc{3,4,5}.remi
- update to 2.4.0
- add SElinux module
- spec cleanning

* Tue May 16 2006 Remi Collet  2.3.0-1.fc{3,4,5}.remi
- update to 2.3.0
- chmod 700 on %%{CPBACKEND}/cups-pdf for cups-1.2.0 on FC5

* Fri Apr 14 2006 Remi Collet  2.2.0-1.fc{3,4,5}.remi
- update to 2.2.0

* Sat Apr  8 2006 Remi Collet  2.1.1-1.fc{3,4,5}.remi
- update to 2.1.1

* Sun Mar 26 2006 Remi Collet  2.1.0-1.fc{3,4,5}.remi
- update to 2.1.0

* Sun Jan 29 2006 Remi Collet  2.0.5-1.fc{3,4}.remi
- update to 2.0.5

* Sun Jan 29 2006 Remi Collet  2.0.4-1.fc{3,4}.remi
- update to 2.0.4

* Sat Jan  7 2006 Remi Collet  2.0.3-1.fc{3,4}.remi
- update to 2.0.3

* Wed Jan  4 2006 Remi Collet  2.0.1-1.fc{3,4}.remi
- update to 2.0.1

* Tue Jan  3 2006 Remi Collet  2.0.0-2.fc#.remi
- output to Desktop
- defattr

* Fri Dec 23 2005 Remi Collet  2.0.0-1.fc4.remi
- update to 2.0.0 final

* Sat Nov  5 2005 Remi Collet  2.0-0.1.fc3.remi
- rebuild for FC3

* Sat Nov  5 2005 Remi Collet  2.0-0.1.fc4.remi
- update to 2.0 beta2
- rebuild for FC4
- conditionnal "post" and "postun" script, more robust
- cups-pdf-conf.patch (Out in $HOME)

* Mon Sep 26 2005 Christian Ellsworth C. 
- adapted to fit the new runtime config file of version 2.0

* Sat Sep 10 2005 Remi Collet  1.7.4-1.fc4.remi
- adapted to cups-pdf 1.7.4
- added auto remove a cups-pdf printer in "postun"
- added CHANGELOG, COPYING, README
- creating cups-pdf-home.patch

* Sat Mar 05 2005 Christian Ellsworth C. 
- adapted to cups-pdf 1.7.0
- added auto configure a cups-pdf printer

* Tue Feb 22 2005 Christian Ellsworth C. 
- adapted to cups-pdf 1.6.6

* Thu Aug 12 2004 Volker Behr 
- adapted to cups-pdf 1.5.2 

* Sat Jan 31 2004 Volker Behr 
- adapetd to cups-pdf 1.4.0 and new building environment

* Wed Jan 14 2004 Mark Lane 
- fixed the specfile so that x86_64 version installs the filter
- in /usr/lib64 instead of /usr/lib

* Sun Nov 02 2003 Volker Behr 
- third release of cups-pdf, RPM-Edition for cups-pdf 1.3

* Tue Sep 09 2003 Dirk Schwier 
- second Release of cups-pdf, RPM-Edition for cups-pdf 1.1

* Tue May 27 2003 Dirk Schwier 
- we're proud to present the first version of cups-pdf, RPM-Edition


--- NEW FILE cups_pdf-2.4.2.te ---
policy_module(cups_pdf,2.4.2)

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 05:45:28 -0000	1.1
+++ .cvsignore	14 Nov 2006 05:46:25 -0000	1.2
@@ -0,0 +1 @@
+cups-pdf_2.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cups-pdf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 05:45:28 -0000	1.1
+++ sources	14 Nov 2006 05:46:25 -0000	1.2
@@ -0,0 +1 @@
+97b21ab9dc98659bfce17da921ee2790  cups-pdf_2.4.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 05:50:46 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:50:46 -0700
Subject: owners owners.list,1.1955,1.1956
Message-ID: <200611140550.kAE5okmR014889@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14868

Modified Files:
	owners.list 
Log Message:
	cups-pdf : Extension for creating pdf-Files with CUPS



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1955
retrieving revision 1.1956
diff -u -r1.1955 -r1.1956
--- owners.list	14 Nov 2006 04:13:37 -0000	1.1955
+++ owners.list	14 Nov 2006 05:50:16 -0000	1.1956
@@ -256,6 +256,7 @@
 Fedora Extras|ctorrent|BitTorrent Client written in C|rpm at greysector.net|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|cups-pdf|Extension for creating pdf-Files with CUPS|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2svn|CVS to Subversion Repository Converter|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 05:54:33 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Mon, 13 Nov 2006 22:54:33 -0700
Subject: rpms/php-pear-Net-DIME/FC-6 php-pear-Net-DIME.spec,1.1,1.2
Message-ID: <200611140554.kAE5sXIT015019@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-DIME/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15003

Modified Files:
	php-pear-Net-DIME.spec 
Log Message:
	bump release



Index: php-pear-Net-DIME.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-DIME/FC-6/php-pear-Net-DIME.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Net-DIME.spec	11 Nov 2006 15:22:33 -0000	1.1
+++ php-pear-Net-DIME.spec	14 Nov 2006 05:54:03 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Net-DIME
 Version:        0.3
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Implements Direct Internet Message Encapsulation (DIME)
 
 Group:          Development/Libraries
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Remi Collet  0.3-1.fc6.1
+- bump release to build on FC6
+
 * Mon Nov  6 2006 Remi Collet  0.3-1
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE



From fedora-extras-commits at redhat.com  Tue Nov 14 07:22:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:22:38 -0700
Subject: rpms/Ri-li - New directory
Message-ID: <200611140722.kAE7McPs021595@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21591/Ri-li

Log Message:
Directory /cvs/extras/rpms/Ri-li added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 07:22:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:22:44 -0700
Subject: rpms/Ri-li/devel - New directory
Message-ID: <200611140722.kAE7MiRs021609@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21591/Ri-li/devel

Log Message:
Directory /cvs/extras/rpms/Ri-li/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 07:23:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:23:02 -0700
Subject: rpms/Ri-li Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611140723.kAE7N2vQ021640@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634

Added Files:
	Makefile import.log 
Log Message:
Setup of module Ri-li


--- NEW FILE Makefile ---
# Top level Makefile for module Ri-li
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  Tue Nov 14 07:23:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:23:07 -0700
Subject: rpms/Ri-li/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611140723.kAE7N7rS021657@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Ri-li


--- 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 Nov 14 07:29:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:29:26 -0700
Subject: owners owners.list,1.1956,1.1957
Message-ID: <200611140729.kAE7TQUs021819@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21799

Modified Files:
	owners.list 
Log Message:
added Ri-li


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1956
retrieving revision 1.1957
diff -u -r1.1956 -r1.1957
--- owners.list	14 Nov 2006 05:50:16 -0000	1.1956
+++ owners.list	14 Nov 2006 07:28:56 -0000	1.1957
@@ -255,8 +255,8 @@
 Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctorrent|BitTorrent Client written in C|rpm at greysector.net|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
-Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cups-pdf|Extension for creating pdf-Files with CUPS|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
+Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2svn|CVS to Subversion Repository Converter|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -2041,6 +2041,7 @@
 Fedora Extras|repoml|Tools and data for working with RepoML files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|revelation|Password manager for GNOME 2|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|Ri-li|Arcade game where you drive a toy wood engine|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|tamaster at pobox.com
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 07:31:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:31:23 -0700
Subject: rpms/Ri-li import.log,1.1,1.2
Message-ID: <200611140731.kAE7VNsP021887@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21854

Modified Files:
	import.log 
Log Message:
auto-import Ri-li-2.0.0-1 on branch devel from Ri-li-2.0.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Ri-li/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 07:23:02 -0000	1.1
+++ import.log	14 Nov 2006 07:30:52 -0000	1.2
@@ -0,0 +1 @@
+Ri-li-2_0_0-1:HEAD:Ri-li-2.0.0-1.src.rpm:1163490166



From fedora-extras-commits at redhat.com  Tue Nov 14 07:31:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:31:23 -0700
Subject: rpms/Ri-li/devel Ri-li.desktop, NONE, 1.1 Ri-li.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611140731.kAE7VNEE021891@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Ri-li/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21854/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Ri-li.desktop Ri-li.spec 
Log Message:
auto-import Ri-li-2.0.0-1 on branch devel from Ri-li-2.0.0-1.src.rpm


--- NEW FILE Ri-li.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Ri-li
Comment=Arcade game where you drive a toy wood engine
Exec=Ri_li
Icon=Ri-li.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE Ri-li.spec ---
Name:           Ri-li
Version:        2.0.0
Release:        1%{?dist}
Summary:        Arcade game where you drive a toy wood engine
Group:          Amusements/Games
License:        GPL
URL:            http://ri-li.sourceforge.net/index.html
Source0:        http://dl.sf.net/sourceforge/ri-li/%{name}-%{version}.tar.bz2
Source1:        %{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_mixer-devel desktop-file-utils

%description
You drive a toy wood engine in many levels and you must collect all the coaches
to win. Full-featured: 18 languages, Colorful animated wood engine, 50 levels,
3 beautiful music tracks and many sound effects.


%prep
%setup -q
sed -i 's/\r//g' README COPYING AUTHORS NEWS


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# 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/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -m 644 data/Ri-li-icon-16x16.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
install -m 644 data/Ri-li-icon-32x32.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
install -m 644 data/Ri-li-icon-48x48.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%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 README COPYING AUTHORS NEWS
%{_bindir}/Ri_li
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png


%changelog
* Thu Nov  9 2006 Hans de Goede  2.0.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Ri-li/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 07:23:07 -0000	1.1
+++ .cvsignore	14 Nov 2006 07:30:53 -0000	1.2
@@ -0,0 +1 @@
+Ri-li-2.0.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Ri-li/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 07:23:07 -0000	1.1
+++ sources	14 Nov 2006 07:30:53 -0000	1.2
@@ -0,0 +1 @@
+e6dfa35616f5c84eb14ff82517cea796  Ri-li-2.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 07:40:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 00:40:54 -0700
Subject: comps comps-fe5.xml.in, 1.199, 1.200 comps-fe6.xml.in, 1.223,
	1.224 comps-fe7.xml.in, 1.22, 1.23
Message-ID: <200611140740.kAE7esp4022010@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21988

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add Ri-li to games


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- comps-fe5.xml.in	13 Nov 2006 15:40:59 -0000	1.199
+++ comps-fe5.xml.in	14 Nov 2006 07:40:24 -0000	1.200
@@ -375,6 +375,7 @@
       qqo
       rafkill
       raidem
+      Ri-li
       rocksndiamonds
       rogue
       scorched3d


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- comps-fe6.xml.in	13 Nov 2006 15:40:59 -0000	1.223
+++ comps-fe6.xml.in	14 Nov 2006 07:40:24 -0000	1.224
@@ -427,6 +427,7 @@
       qgo
       rafkill
       raidem
+      Ri-li
       rocksndiamonds
       rogue
       scorched3d


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- comps-fe7.xml.in	13 Nov 2006 15:40:59 -0000	1.22
+++ comps-fe7.xml.in	14 Nov 2006 07:40:24 -0000	1.23
@@ -427,6 +427,7 @@
       qgo
       rafkill
       raidem
+      Ri-li
       rocksndiamonds
       rogue
       scorched3d



From fedora-extras-commits at redhat.com  Tue Nov 14 10:24:54 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Tue, 14 Nov 2006 03:24:54 -0700
Subject: rpms/logserial/devel logserial.spec,1.1,1.2
Message-ID: <200611141024.kAEAOsXZ031699@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/logserial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31683/devel

Modified Files:
	logserial.spec 
Log Message:



Index: logserial.spec
===================================================================
RCS file: /cvs/extras/rpms/logserial/devel/logserial.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logserial.spec	13 Nov 2006 22:46:32 -0000	1.1
+++ logserial.spec	14 Nov 2006 10:24:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           logserial
 Version:        0.4.2 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Package for logging incoming bytes on asynchronous serial ports
 
 Group:          Applications/Communications
@@ -22,9 +22,6 @@
 
 
 %build
-
-echo $RPM_OPT_FLAGS
-echo $CFLAGS
 make %{?_smp_mflags}
 
 
@@ -46,6 +43,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 lonely wolf  0.4.2-4
+- remove some debugging lines from the spec. No effect on generated binaries
+
 * Mon Nov 13 2006 lonely wolf  0.4.2-3
 - corrected the patch to make use of $RPM_OPT_FLAGS
 



From fedora-extras-commits at redhat.com  Tue Nov 14 10:28:43 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Nov 2006 03:28:43 -0700
Subject: rpms/gtkwave/devel gtkwave.spec, 1.27, 1.28 .cvsignore, 1.25,
	1.26 sources, 1.25, 1.26
Message-ID: <200611141028.kAEAShe2031742@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31717

Modified Files:
	gtkwave.spec .cvsignore sources 
Log Message:
update to 3.0.16


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtkwave.spec	30 Oct 2006 15:04:34 -0000	1.27
+++ gtkwave.spec	14 Nov 2006 10:28:13 -0000	1.28
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.15
+Version:		3.0.16
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 14 2006 Paul Howarth  3.0.16-1
+- update to 3.0.16
+
 * Mon Oct 30 2006 Paul Howarth  3.0.15-1
 - update to 3.0.15
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Oct 2006 15:04:34 -0000	1.25
+++ .cvsignore	14 Nov 2006 10:28:13 -0000	1.26
@@ -1 +1 @@
-gtkwave-3.0.15.tar.gz
+gtkwave-3.0.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Oct 2006 15:04:34 -0000	1.25
+++ sources	14 Nov 2006 10:28:13 -0000	1.26
@@ -1 +1 @@
-c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz
+d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 10:48:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Nov 2006 03:48:03 -0700
Subject: rpms/perl-Test-Perl-Critic/FC-6 .cvsignore, 1.2,
	1.3 perl-Test-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611141048.kAEAm3JH032004@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Perl-Critic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31963/FC-6

Modified Files:
	.cvsignore perl-Test-Perl-Critic.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:31:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 10:47:33 -0000	1.3
@@ -1 +1 @@
-Test-Perl-Critic-0.07.tar.gz
+Test-Perl-Critic-0.08.tar.gz


Index: perl-Test-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-6/perl-Test-Perl-Critic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Perl-Critic.spec	26 Sep 2006 09:31:10 -0000	1.1
+++ perl-Test-Perl-Critic.spec	14 Nov 2006 10:47:33 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Perl-Critic
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Use Perl::Critic in test programs
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Perl::Critic)
+BuildRequires:  perl(Perl::Critic) >= 0.21
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jose Pedro Oliveira  - 0.08-1
+- Update to 0.08.
+
 * Sat Sep 23 2006 Jose Pedro Oliveira  - 0.07-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:31:10 -0000	1.2
+++ sources	14 Nov 2006 10:47:33 -0000	1.3
@@ -1 +1 @@
-91c1dc234b4c6ec1f06300085f0559cf  Test-Perl-Critic-0.07.tar.gz
+358946b1ca7bca56ea8b6ce77bdd4033  Test-Perl-Critic-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 10:48:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Nov 2006 03:48:02 -0700
Subject: rpms/perl-Test-Perl-Critic/FC-5 .cvsignore, 1.2,
	1.3 perl-Test-Perl-Critic.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611141048.kAEAm2s7031999@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Perl-Critic/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31963/FC-5

Modified Files:
	.cvsignore perl-Test-Perl-Critic.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Sep 2006 09:31:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 10:47:32 -0000	1.3
@@ -1 +1 @@
-Test-Perl-Critic-0.07.tar.gz
+Test-Perl-Critic-0.08.tar.gz


Index: perl-Test-Perl-Critic.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-5/perl-Test-Perl-Critic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Perl-Critic.spec	26 Sep 2006 09:31:10 -0000	1.1
+++ perl-Test-Perl-Critic.spec	14 Nov 2006 10:47:32 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Perl-Critic
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Use Perl::Critic in test programs
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Perl::Critic)
+BuildRequires:  perl(Perl::Critic) >= 0.21
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -55,5 +55,8 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jose Pedro Oliveira  - 0.08-1
+- Update to 0.08.
+
 * Sat Sep 23 2006 Jose Pedro Oliveira  - 0.07-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Perl-Critic/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2006 09:31:10 -0000	1.2
+++ sources	14 Nov 2006 10:47:32 -0000	1.3
@@ -1 +1 @@
-91c1dc234b4c6ec1f06300085f0559cf  Test-Perl-Critic-0.07.tar.gz
+358946b1ca7bca56ea8b6ce77bdd4033  Test-Perl-Critic-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 10:57:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 14 Nov 2006 03:57:27 -0700
Subject: rpms/perl-Wx/devel .cvsignore, 1.4, 1.5 perl-Wx.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611141057.kAEAvRBV032135@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32115

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.62.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2006 18:10:14 -0000	1.4
+++ .cvsignore	14 Nov 2006 10:56:57 -0000	1.5
@@ -1 +1 @@
-Wx-0.60.tar.gz
+Wx-0.62.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Wx.spec	11 Nov 2006 18:10:14 -0000	1.3
+++ perl-Wx.spec	14 Nov 2006 10:56:57 -0000	1.4
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.60
+Version:        0.62
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Jose Pedro Oliveira  - 0.62-1
+- Update to 0.62.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
 - Update to 0.60.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2006 18:10:14 -0000	1.4
+++ sources	14 Nov 2006 10:56:57 -0000	1.5
@@ -1 +1 @@
-be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz
+1e1edb47fd78931852268a04f096d47b  Wx-0.62.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 11:41:24 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 14 Nov 2006 04:41:24 -0700
Subject: rpms/GeoIP/FC-5 GeoIP.spec,1.5,1.6
Message-ID: <200611141141.kAEBfOQs003221@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3197

Modified Files:
	GeoIP.spec 
Log Message:
Fix date in changelog :-)




Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GeoIP.spec	12 Nov 2006 10:49:57 -0000	1.5
+++ GeoIP.spec	14 Nov 2006 11:40:54 -0000	1.6
@@ -73,7 +73,7 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
-* Sun Sep 3 2006 Michael Fleming  1.4.0-3
+* Tue Nov 14 2006 Michael Fleming  1.4.0-3
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
   (bz #198137)



From fedora-extras-commits at redhat.com  Tue Nov 14 11:43:14 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 14 Nov 2006 04:43:14 -0700
Subject: rpms/frozen-bubble/devel fb-server.init, NONE, 1.1 .cvsignore, 1.2, 
	1.3 frozen-bubble.spec, 1.2, 1.3 sources, 1.2,
	1.3 filter-depends.sh, 1.1, NONE filter-provides.sh, 1.1,
	NONE frozen-bubble-1.0.0-FBLE.pm.patch, 1.1,
	NONE frozen-bubble-1.0.0-perl-SDL.patch, 1.1,
	NONE frozen-bubble-build.patch, 1.1,
	NONE frozen-bubble-debian.patch, 1.1, NONE
Message-ID: <200611141143.kAEBhEFR003253@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3232

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Added Files:
	fb-server.init 
Removed Files:
	filter-depends.sh filter-provides.sh 
	frozen-bubble-1.0.0-FBLE.pm.patch 
	frozen-bubble-1.0.0-perl-SDL.patch frozen-bubble-build.patch 
	frozen-bubble-debian.patch 
Log Message:
Update to 2.0.0.



--- NEW FILE fb-server.init ---
#!/bin/sh
#
# fb-server      Frozen-Bubble server
#
# chkconfig: - 99 01
# description: this is the Frozen-Bubble server; it allows people to play \
#              Frozen-Bubble over the Internet.
# processname: fb-server
# pidfile: /var/run/fb-server.pid
# config: /etc/fb-server*.conf

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

conffiles=/etc/fb-server*.conf
servicename=fb-server

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting Frozen Bubble server(s): "
        ATLEASTONE=-1
        for file in $conffiles; do
            daemon --user fbubble "fb-server -c $file &>/dev/null"
            RETVAL=$?
            if [ "$ATLEASTONE" -ne 0 ]; then
                ATLEASTONE=$RETVAL
            fi
            echo
        done
	if [ $ATLEASTONE -eq 0 ]; then
            touch /var/lock/subsys/$servicename
        fi
	return $ATLEASTONE
}

stop() {
	echo -n $"Stopping Frozen Bubble server(s): "
        killproc fb-server
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
            rm -f /var/lock/subsys/$servicename
        fi
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  status)
        status fb-server
        RETVAL=$?
        ;;
  condrestart)
	[ -f /var/lock/subsys/$servicename ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2006 05:26:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 11:42:43 -0000	1.3
@@ -1 +1 @@
-frozen-bubble-1.0.0.tar.bz2
+frozen-bubble-2.0.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frozen-bubble.spec	28 Aug 2006 11:26:03 -0000	1.2
+++ frozen-bubble.spec	14 Nov 2006 11:42:43 -0000	1.3
@@ -1,30 +1,19 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        1.0.0
-Release:        10%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
-Source0:        http://zarb.org/~gc/fb/frozen-bubble-1.0.0.tar.bz2
+Source0:        http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
 Source1:        frozen-bubble.desktop
-Source2:        filter-depends.sh
-Source3:        filter-provides.sh
-Patch0:         %{name}-build.patch
-Patch1:         %{name}-debian.patch
-Patch2:         %{name}-1.0.0-FBLE.pm.patch
-Patch3:         %{name}-1.0.0-perl-SDL.patch
+Source2:        fb-server.init
 URL:            http://www.frozen-bubble.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, desktop-file-utils
+BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
+BuildRequires:  glib2-devel, gettext, desktop-file-utils
 Requires:       perl-SDL >= 2.1.3
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# hack filter out the autogenerated Provides for our private perl modules
-# (which are installed outside the perlvendorroot) and also filter out
-# the matching AutoRequires to still get an installable package
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
-%define __find_provides %{SOURCE3}
-
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
 and hours of 2p game, 3 professional quality 20-channels musics, 15 stereo
@@ -32,31 +21,51 @@
 You need this game.
 
 
+%package server
+Summary: Frozen Bubble network game dedicated server
+Group: System Environment/Daemons
+
+%description server
+Frozen Bubble network game dedicated server. The server is already included
+with the game in order to be launched automatically for LAN games, so you
+only need to install this package if you want to run a fully dedicated
+Frozen Bubble network game server.
+
+
 %prep
 %setup -q
-%patch0 -p0 -z .build
-%patch1 -p1 -z .deb
-# no backups for this patch otherwise they end up getting installed
-%patch2 -p0
-%patch3 -p0 -z .perl-SDL
-# The "min 1.19.0" requirement check for perl-SDL is broken
-sed -i 's|@if ! perl.*||g' Makefile
 # Add a directory to the module path for the app's private perl modules
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble-editor
+# Rename this README since the main server README has the same name
+mv server/init/README server/README.init
+# Change the example server configuration file to be a working one, which only
+# launches a LAN server and doesn't try to register itself on the Internet
+sed -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
 
 
 %build
-make %{?_smp_mflags} OPTIMIZE="${RPM_OPT_FLAGS}" PREFIX="%{_prefix}" \
-  INSTALLDIRS=vendor
+make %{?_smp_mflags} \
+    OPTIMIZE="${RPM_OPT_FLAGS}" \
+    CFLAGS="${RPM_OPT_FLAGS} `pkg-config glib-2.0 --cflags`" \
+    LIBS="`pkg-config glib-2.0 --libs`" \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    INSTALLDIRS=vendor
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{build_fbsyms,perllocal.pod}
-find $RPM_BUILD_ROOT -name .xvpics | xargs rm -rf
+make install \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
+# Clean up unneeded files
+rm -f `find $RPM_BUILD_ROOT -name perllocal.pod`
 chmod -R u+w $RPM_BUILD_ROOT/*
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
@@ -66,22 +75,29 @@
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/auto $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/*.pm $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 
-# below is the desktop file and icon stuff.
+# 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/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 icons/frozen-bubble-icon-16x16.png \
+install -D -p -m 644 icons/frozen-bubble-icon-16x16.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-32x32.png \
+install -D -p -m 644 icons/frozen-bubble-icon-32x32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-48x48.png \
+install -D -p -m 644 icons/frozen-bubble-icon-48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
+# Install server init script and default configuration
+install -D -p -m 755 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fb-server
+install -D -p -m 644 server/init/fb-server.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/fb-server.conf
+
+# Duplicate the server (it's tiny) to be used in both the game and standalone
+# server package
+cp -a $RPM_BUILD_ROOT%{_libexecdir}/%{name}/fb-server \
+      $RPM_BUILD_ROOT%{_bindir}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,18 +116,48 @@
 fi
 
 
-%files
+%post server
+/usr/sbin/useradd -r -s /sbin/nologin -d / fbubble || :
+/sbin/chkconfig --add fb-server
+
+%preun server
+if [ $1 -eq 0 ]; then
+    /sbin/service fb-server stop &>/dev/null || :
+    /sbin/chkconfig --del fb-server
+fi
+
+%postun server
+/usr/sbin/userdel fbubble || :
+if [ $1 -ge 1 ]; then
+    /sbin/service fb-server condrestart &>/dev/null || :
+fi
+
+
+%files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS COPYING NEWS README TIPS
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
-%{_datadir}/%{name}
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man6/%{name}*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
+%files server
+%defattr(-, root, root)
+%doc COPYING server/AUTHORS server/README*
+%config(noreplace) %{_sysconfdir}/fb-server.conf
+%{_sysconfdir}/rc.d/init.d/fb-server
+%{_bindir}/fb-server
+
 
 %changelog
+* Fri Oct 27 2006 Matthias Saou  2.0.0-1
+- Update to 2.0.0.
+- Add new SDL_Pango dependency.
+- New server standalone sub-package for the dedicated server.
+
 * Mon Aug 28 2006 Hans de Goede  1.0.0-10
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2006 05:26:10 -0000	1.2
+++ sources	14 Nov 2006 11:42:43 -0000	1.3
@@ -1 +1 @@
-2be5ead2aee72adc3fb643630a774b59  frozen-bubble-1.0.0.tar.bz2
+9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2


--- filter-depends.sh DELETED ---


--- filter-provides.sh DELETED ---


--- frozen-bubble-1.0.0-FBLE.pm.patch DELETED ---


--- frozen-bubble-1.0.0-perl-SDL.patch DELETED ---


--- frozen-bubble-build.patch DELETED ---


--- frozen-bubble-debian.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 11:59:48 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Nov 2006 04:59:48 -0700
Subject: rpms/gtkwave/FC-6 .cvsignore, 1.25, 1.26 gtkwave.spec, 1.27,
	1.28 sources, 1.25, 1.26
Message-ID: <200611141159.kAEBxmSk003383@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3363

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Oct 2006 15:07:21 -0000	1.25
+++ .cvsignore	14 Nov 2006 11:59:17 -0000	1.26
@@ -1 +1 @@
-gtkwave-3.0.15.tar.gz
+gtkwave-3.0.16.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/gtkwave.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtkwave.spec	30 Oct 2006 15:07:21 -0000	1.27
+++ gtkwave.spec	14 Nov 2006 11:59:18 -0000	1.28
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.15
+Version:		3.0.16
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 14 2006 Paul Howarth  3.0.16-1
+- update to 3.0.16
+
 * Mon Oct 30 2006 Paul Howarth  3.0.15-1
 - update to 3.0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Oct 2006 15:07:21 -0000	1.25
+++ sources	14 Nov 2006 11:59:18 -0000	1.26
@@ -1 +1 @@
-c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz
+d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 12:01:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Nov 2006 05:01:01 -0700
Subject: rpms/gtkwave/FC-5 .cvsignore, 1.25, 1.26 gtkwave.spec, 1.25,
	1.26 sources, 1.25, 1.26
Message-ID: <200611141201.kAEC11NB003484@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3459

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Oct 2006 15:08:41 -0000	1.25
+++ .cvsignore	14 Nov 2006 12:00:31 -0000	1.26
@@ -1 +1 @@
-gtkwave-3.0.15.tar.gz
+gtkwave-3.0.16.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtkwave.spec	30 Oct 2006 15:08:41 -0000	1.25
+++ gtkwave.spec	14 Nov 2006 12:00:31 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.15
+Version:		3.0.16
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 14 2006 Paul Howarth  3.0.16-1
+- update to 3.0.16
+
 * Mon Oct 30 2006 Paul Howarth  3.0.15-1
 - update to 3.0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Oct 2006 15:08:41 -0000	1.25
+++ sources	14 Nov 2006 12:00:31 -0000	1.26
@@ -1 +1 @@
-c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz
+d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 12:02:26 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 14 Nov 2006 05:02:26 -0700
Subject: rpms/gtkwave/FC-4 .cvsignore, 1.25, 1.26 gtkwave.spec, 1.24,
	1.25 sources, 1.25, 1.26
Message-ID: <200611141202.kAEC2Qxw006542@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6520

Modified Files:
	.cvsignore gtkwave.spec sources 
Log Message:
resync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Oct 2006 15:10:03 -0000	1.25
+++ .cvsignore	14 Nov 2006 12:01:56 -0000	1.26
@@ -1 +1 @@
-gtkwave-3.0.15.tar.gz
+gtkwave-3.0.16.tar.gz


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtkwave.spec	30 Oct 2006 15:10:03 -0000	1.24
+++ gtkwave.spec	14 Nov 2006 12:01:56 -0000	1.25
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.15
+Version:		3.0.16
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 14 2006 Paul Howarth  3.0.16-1
+- update to 3.0.16
+
 * Mon Oct 30 2006 Paul Howarth  3.0.15-1
 - update to 3.0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Oct 2006 15:10:03 -0000	1.25
+++ sources	14 Nov 2006 12:01:56 -0000	1.26
@@ -1 +1 @@
-c20aba58deb25371b3d0cc4f0abc64d1  gtkwave-3.0.15.tar.gz
+d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 12:17:18 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Tue, 14 Nov 2006 05:17:18 -0700
Subject: rpms/gutenprint/devel gutenprint.spec,1.2,1.3
Message-ID: <200611141217.kAECHIad006747@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/gutenprint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6724

Modified Files:
	gutenprint.spec 
Log Message:
Added Dependency for gutenprint-cups


Index: gutenprint.spec
===================================================================
RCS file: /cvs/extras/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gutenprint.spec	3 Oct 2006 04:34:07 -0000	1.2
+++ gutenprint.spec	14 Nov 2006 12:16:48 -0000	1.3
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.0.0
-Release:        0.15%{?dist}
+Release:        0.16%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -200,6 +200,7 @@
 Summary:        CUPS drivers for Canon, Epson, HP and compatible printers
 Group:          Applications/Publishing
 Requires:       cups >= 1.2.1-1.7
+Requires:	gimp-print-cups
 
 %description cups
 This package contains native CUPS support for a wide range of Canon,
@@ -379,6 +380,9 @@
 %{_datadir}/cups/model/gutenprint/5.0/zh_TW
 
 %changelog
+* Tue Nov 14 2006 Parag Nemade - 5.0.0-0.16
+- Added missing dependency of gimp-print-cups in gutenprint-cups
+
 * Thu Oct 03 2006 Parag Nemade - 5.0.0-0.15
 - Did some fix for tag issue
 



From fedora-extras-commits at redhat.com  Tue Nov 14 12:19:07 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 14 Nov 2006 05:19:07 -0700
Subject: rpms/frozen-bubble/FC-6 fb-server.init, NONE, 1.1 .cvsignore, 1.2, 
	1.3 frozen-bubble.spec, 1.2, 1.3 sources, 1.2,
	1.3 filter-depends.sh, 1.1, NONE filter-provides.sh, 1.1,
	NONE frozen-bubble-1.0.0-FBLE.pm.patch, 1.1,
	NONE frozen-bubble-1.0.0-perl-SDL.patch, 1.1,
	NONE frozen-bubble-build.patch, 1.1,
	NONE frozen-bubble-debian.patch, 1.1, NONE
Message-ID: <200611141219.kAECJ7n2006849@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6775/FC-6

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Added Files:
	fb-server.init 
Removed Files:
	filter-depends.sh filter-provides.sh 
	frozen-bubble-1.0.0-FBLE.pm.patch 
	frozen-bubble-1.0.0-perl-SDL.patch frozen-bubble-build.patch 
	frozen-bubble-debian.patch 
Log Message:
Update to 2.0.0.



--- NEW FILE fb-server.init ---
#!/bin/sh
#
# fb-server      Frozen-Bubble server
#
# chkconfig: - 99 01
# description: this is the Frozen-Bubble server; it allows people to play \
#              Frozen-Bubble over the Internet.
# processname: fb-server
# pidfile: /var/run/fb-server.pid
# config: /etc/fb-server*.conf

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

conffiles=/etc/fb-server*.conf
servicename=fb-server

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting Frozen Bubble server(s): "
        ATLEASTONE=-1
        for file in $conffiles; do
            daemon --user fbubble "fb-server -c $file &>/dev/null"
            RETVAL=$?
            if [ "$ATLEASTONE" -ne 0 ]; then
                ATLEASTONE=$RETVAL
            fi
            echo
        done
	if [ $ATLEASTONE -eq 0 ]; then
            touch /var/lock/subsys/$servicename
        fi
	return $ATLEASTONE
}

stop() {
	echo -n $"Stopping Frozen Bubble server(s): "
        killproc fb-server
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
            rm -f /var/lock/subsys/$servicename
        fi
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  status)
        status fb-server
        RETVAL=$?
        ;;
  condrestart)
	[ -f /var/lock/subsys/$servicename ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2006 05:26:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-frozen-bubble-1.0.0.tar.bz2
+frozen-bubble-2.0.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/frozen-bubble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frozen-bubble.spec	28 Aug 2006 11:26:03 -0000	1.2
+++ frozen-bubble.spec	14 Nov 2006 12:18:37 -0000	1.3
@@ -1,30 +1,19 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        1.0.0
-Release:        10%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
-Source0:        http://zarb.org/~gc/fb/frozen-bubble-1.0.0.tar.bz2
+Source0:        http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
 Source1:        frozen-bubble.desktop
-Source2:        filter-depends.sh
-Source3:        filter-provides.sh
-Patch0:         %{name}-build.patch
-Patch1:         %{name}-debian.patch
-Patch2:         %{name}-1.0.0-FBLE.pm.patch
-Patch3:         %{name}-1.0.0-perl-SDL.patch
+Source2:        fb-server.init
 URL:            http://www.frozen-bubble.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, desktop-file-utils
+BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
+BuildRequires:  glib2-devel, gettext, desktop-file-utils
 Requires:       perl-SDL >= 2.1.3
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# hack filter out the autogenerated Provides for our private perl modules
-# (which are installed outside the perlvendorroot) and also filter out
-# the matching AutoRequires to still get an installable package
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
-%define __find_provides %{SOURCE3}
-
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
 and hours of 2p game, 3 professional quality 20-channels musics, 15 stereo
@@ -32,31 +21,51 @@
 You need this game.
 
 
+%package server
+Summary: Frozen Bubble network game dedicated server
+Group: System Environment/Daemons
+
+%description server
+Frozen Bubble network game dedicated server. The server is already included
+with the game in order to be launched automatically for LAN games, so you
+only need to install this package if you want to run a fully dedicated
+Frozen Bubble network game server.
+
+
 %prep
 %setup -q
-%patch0 -p0 -z .build
-%patch1 -p1 -z .deb
-# no backups for this patch otherwise they end up getting installed
-%patch2 -p0
-%patch3 -p0 -z .perl-SDL
-# The "min 1.19.0" requirement check for perl-SDL is broken
-sed -i 's|@if ! perl.*||g' Makefile
 # Add a directory to the module path for the app's private perl modules
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble-editor
+# Rename this README since the main server README has the same name
+mv server/init/README server/README.init
+# Change the example server configuration file to be a working one, which only
+# launches a LAN server and doesn't try to register itself on the Internet
+sed -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
 
 
 %build
-make %{?_smp_mflags} OPTIMIZE="${RPM_OPT_FLAGS}" PREFIX="%{_prefix}" \
-  INSTALLDIRS=vendor
+make %{?_smp_mflags} \
+    OPTIMIZE="${RPM_OPT_FLAGS}" \
+    CFLAGS="${RPM_OPT_FLAGS} `pkg-config glib-2.0 --cflags`" \
+    LIBS="`pkg-config glib-2.0 --libs`" \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    INSTALLDIRS=vendor
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{build_fbsyms,perllocal.pod}
-find $RPM_BUILD_ROOT -name .xvpics | xargs rm -rf
+make install \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
+# Clean up unneeded files
+rm -f `find $RPM_BUILD_ROOT -name perllocal.pod`
 chmod -R u+w $RPM_BUILD_ROOT/*
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
@@ -66,22 +75,29 @@
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/auto $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/*.pm $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 
-# below is the desktop file and icon stuff.
+# 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/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 icons/frozen-bubble-icon-16x16.png \
+install -D -p -m 644 icons/frozen-bubble-icon-16x16.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-32x32.png \
+install -D -p -m 644 icons/frozen-bubble-icon-32x32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-48x48.png \
+install -D -p -m 644 icons/frozen-bubble-icon-48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
+# Install server init script and default configuration
+install -D -p -m 755 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fb-server
+install -D -p -m 644 server/init/fb-server.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/fb-server.conf
+
+# Duplicate the server (it's tiny) to be used in both the game and standalone
+# server package
+cp -a $RPM_BUILD_ROOT%{_libexecdir}/%{name}/fb-server \
+      $RPM_BUILD_ROOT%{_bindir}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,18 +116,48 @@
 fi
 
 
-%files
+%post server
+/usr/sbin/useradd -r -s /sbin/nologin -d / fbubble || :
+/sbin/chkconfig --add fb-server
+
+%preun server
+if [ $1 -eq 0 ]; then
+    /sbin/service fb-server stop &>/dev/null || :
+    /sbin/chkconfig --del fb-server
+fi
+
+%postun server
+/usr/sbin/userdel fbubble || :
+if [ $1 -ge 1 ]; then
+    /sbin/service fb-server condrestart &>/dev/null || :
+fi
+
+
+%files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS COPYING NEWS README TIPS
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
-%{_datadir}/%{name}
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man6/%{name}*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
+%files server
+%defattr(-, root, root)
+%doc COPYING server/AUTHORS server/README*
+%config(noreplace) %{_sysconfdir}/fb-server.conf
+%{_sysconfdir}/rc.d/init.d/fb-server
+%{_bindir}/fb-server
+
 
 %changelog
+* Fri Oct 27 2006 Matthias Saou  2.0.0-1
+- Update to 2.0.0.
+- Add new SDL_Pango dependency.
+- New server standalone sub-package for the dedicated server.
+
 * Mon Aug 28 2006 Hans de Goede  1.0.0-10
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2006 05:26:10 -0000	1.2
+++ sources	14 Nov 2006 12:18:37 -0000	1.3
@@ -1 +1 @@
-2be5ead2aee72adc3fb643630a774b59  frozen-bubble-1.0.0.tar.bz2
+9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2


--- filter-depends.sh DELETED ---


--- filter-provides.sh DELETED ---


--- frozen-bubble-1.0.0-FBLE.pm.patch DELETED ---


--- frozen-bubble-1.0.0-perl-SDL.patch DELETED ---


--- frozen-bubble-build.patch DELETED ---


--- frozen-bubble-debian.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 12:19:06 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 14 Nov 2006 05:19:06 -0700
Subject: rpms/frozen-bubble/FC-5 fb-server.init, NONE, 1.1 .cvsignore, 1.2, 
	1.3 frozen-bubble.spec, 1.2, 1.3 sources, 1.2,
	1.3 filter-depends.sh, 1.1, NONE filter-provides.sh, 1.1,
	NONE frozen-bubble-1.0.0-FBLE.pm.patch, 1.1,
	NONE frozen-bubble-1.0.0-perl-SDL.patch, 1.1,
	NONE frozen-bubble-build.patch, 1.1,
	NONE frozen-bubble-debian.patch, 1.1, NONE
Message-ID: <200611141219.kAECJ6kM006844@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6775/FC-5

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Added Files:
	fb-server.init 
Removed Files:
	filter-depends.sh filter-provides.sh 
	frozen-bubble-1.0.0-FBLE.pm.patch 
	frozen-bubble-1.0.0-perl-SDL.patch frozen-bubble-build.patch 
	frozen-bubble-debian.patch 
Log Message:
Update to 2.0.0.



--- NEW FILE fb-server.init ---
#!/bin/sh
#
# fb-server      Frozen-Bubble server
#
# chkconfig: - 99 01
# description: this is the Frozen-Bubble server; it allows people to play \
#              Frozen-Bubble over the Internet.
# processname: fb-server
# pidfile: /var/run/fb-server.pid
# config: /etc/fb-server*.conf

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

conffiles=/etc/fb-server*.conf
servicename=fb-server

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

start() {
	echo -n $"Starting Frozen Bubble server(s): "
        ATLEASTONE=-1
        for file in $conffiles; do
            daemon --user fbubble "fb-server -c $file &>/dev/null"
            RETVAL=$?
            if [ "$ATLEASTONE" -ne 0 ]; then
                ATLEASTONE=$RETVAL
            fi
            echo
        done
	if [ $ATLEASTONE -eq 0 ]; then
            touch /var/lock/subsys/$servicename
        fi
	return $ATLEASTONE
}

stop() {
	echo -n $"Stopping Frozen Bubble server(s): "
        killproc fb-server
	RETVAL=$?
	echo
	if [ $RETVAL -eq 0 ]; then
            rm -f /var/lock/subsys/$servicename
        fi
	return $RETVAL
}

restart() {
	stop
	start
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart)
	restart
	;;
  status)
        status fb-server
        RETVAL=$?
        ;;
  condrestart)
	[ -f /var/lock/subsys/$servicename ] && restart || :
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|status|condrestart}"
	exit 1
esac

exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2006 05:26:10 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-frozen-bubble-1.0.0.tar.bz2
+frozen-bubble-2.0.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/frozen-bubble.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- frozen-bubble.spec	28 Aug 2006 11:26:03 -0000	1.2
+++ frozen-bubble.spec	14 Nov 2006 12:18:36 -0000	1.3
@@ -1,30 +1,19 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        1.0.0
-Release:        10%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
-Source0:        http://zarb.org/~gc/fb/frozen-bubble-1.0.0.tar.bz2
+Source0:        http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
 Source1:        frozen-bubble.desktop
-Source2:        filter-depends.sh
-Source3:        filter-provides.sh
-Patch0:         %{name}-build.patch
-Patch1:         %{name}-debian.patch
-Patch2:         %{name}-1.0.0-FBLE.pm.patch
-Patch3:         %{name}-1.0.0-perl-SDL.patch
+Source2:        fb-server.init
 URL:            http://www.frozen-bubble.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, desktop-file-utils
+BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
+BuildRequires:  glib2-devel, gettext, desktop-file-utils
 Requires:       perl-SDL >= 2.1.3
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# hack filter out the autogenerated Provides for our private perl modules
-# (which are installed outside the perlvendorroot) and also filter out
-# the matching AutoRequires to still get an installable package
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
-%define __find_provides %{SOURCE3}
-
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
 and hours of 2p game, 3 professional quality 20-channels musics, 15 stereo
@@ -32,31 +21,51 @@
 You need this game.
 
 
+%package server
+Summary: Frozen Bubble network game dedicated server
+Group: System Environment/Daemons
+
+%description server
+Frozen Bubble network game dedicated server. The server is already included
+with the game in order to be launched automatically for LAN games, so you
+only need to install this package if you want to run a fully dedicated
+Frozen Bubble network game server.
+
+
 %prep
 %setup -q
-%patch0 -p0 -z .build
-%patch1 -p1 -z .deb
-# no backups for this patch otherwise they end up getting installed
-%patch2 -p0
-%patch3 -p0 -z .perl-SDL
-# The "min 1.19.0" requirement check for perl-SDL is broken
-sed -i 's|@if ! perl.*||g' Makefile
 # Add a directory to the module path for the app's private perl modules
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble
 sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble-editor
+# Rename this README since the main server README has the same name
+mv server/init/README server/README.init
+# Change the example server configuration file to be a working one, which only
+# launches a LAN server and doesn't try to register itself on the Internet
+sed -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
 
 
 %build
-make %{?_smp_mflags} OPTIMIZE="${RPM_OPT_FLAGS}" PREFIX="%{_prefix}" \
-  INSTALLDIRS=vendor
+make %{?_smp_mflags} \
+    OPTIMIZE="${RPM_OPT_FLAGS}" \
+    CFLAGS="${RPM_OPT_FLAGS} `pkg-config glib-2.0 --cflags`" \
+    LIBS="`pkg-config glib-2.0 --libs`" \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    INSTALLDIRS=vendor
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{build_fbsyms,perllocal.pod}
-find $RPM_BUILD_ROOT -name .xvpics | xargs rm -rf
+make install \
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libexecdir} \
+    DATADIR=%{_datadir} \
+    DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
+
+# Clean up unneeded files
+rm -f `find $RPM_BUILD_ROOT -name perllocal.pod`
 chmod -R u+w $RPM_BUILD_ROOT/*
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
@@ -66,22 +75,29 @@
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/auto $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 mv $RPM_BUILD_ROOT%{perl_vendorarch}/*.pm $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
 
-# below is the desktop file and icon stuff.
+# 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/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 icons/frozen-bubble-icon-16x16.png \
+install -D -p -m 644 icons/frozen-bubble-icon-16x16.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-32x32.png \
+install -D -p -m 644 icons/frozen-bubble-icon-32x32.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 icons/frozen-bubble-icon-48x48.png \
+install -D -p -m 644 icons/frozen-bubble-icon-48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
+# Install server init script and default configuration
+install -D -p -m 755 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fb-server
+install -D -p -m 644 server/init/fb-server.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/fb-server.conf
+
+# Duplicate the server (it's tiny) to be used in both the game and standalone
+# server package
+cp -a $RPM_BUILD_ROOT%{_libexecdir}/%{name}/fb-server \
+      $RPM_BUILD_ROOT%{_bindir}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,18 +116,48 @@
 fi
 
 
-%files
+%post server
+/usr/sbin/useradd -r -s /sbin/nologin -d / fbubble || :
+/sbin/chkconfig --add fb-server
+
+%preun server
+if [ $1 -eq 0 ]; then
+    /sbin/service fb-server stop &>/dev/null || :
+    /sbin/chkconfig --del fb-server
+fi
+
+%postun server
+/usr/sbin/userdel fbubble || :
+if [ $1 -ge 1 ]; then
+    /sbin/service fb-server condrestart &>/dev/null || :
+fi
+
+
+%files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS CHANGES COPYING README
+%doc AUTHORS COPYING NEWS README TIPS
 %{_bindir}/%{name}*
-%{_libdir}/%{name}
-%{_datadir}/%{name}
+%{_libdir}/%{name}/
+%{_libexecdir}/%{name}/
+%{_datadir}/%{name}/
 %{_mandir}/man6/%{name}*.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
+%files server
+%defattr(-, root, root)
+%doc COPYING server/AUTHORS server/README*
+%config(noreplace) %{_sysconfdir}/fb-server.conf
+%{_sysconfdir}/rc.d/init.d/fb-server
+%{_bindir}/fb-server
+
 
 %changelog
+* Fri Oct 27 2006 Matthias Saou  2.0.0-1
+- Update to 2.0.0.
+- Add new SDL_Pango dependency.
+- New server standalone sub-package for the dedicated server.
+
 * Mon Aug 28 2006 Hans de Goede  1.0.0-10
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2006 05:26:10 -0000	1.2
+++ sources	14 Nov 2006 12:18:36 -0000	1.3
@@ -1 +1 @@
-2be5ead2aee72adc3fb643630a774b59  frozen-bubble-1.0.0.tar.bz2
+9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2


--- filter-depends.sh DELETED ---


--- filter-provides.sh DELETED ---


--- frozen-bubble-1.0.0-FBLE.pm.patch DELETED ---


--- frozen-bubble-1.0.0-perl-SDL.patch DELETED ---


--- frozen-bubble-build.patch DELETED ---


--- frozen-bubble-debian.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 12:25:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:25:30 -0700
Subject: rpms/listen/FC-6 listen.spec,1.15,1.16
Message-ID: <200611141225.kAECPUT1006993@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6967

Modified Files:
	listen.spec 
Log Message:

Updated spec to fix build issue and some bugs fixes



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/listen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- listen.spec	20 Oct 2006 14:33:12 -0000	1.15
+++ listen.spec	14 Nov 2006 12:25:00 -0000	1.16
@@ -1,52 +1,56 @@
 Name:           listen
 Version:        0.5
-Release:        8.beta1%{?dist}
+Release:        9.beta1%{?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)
 
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig  
+ 
 Buildrequires: python-devel
+BuildRequires: python-ctypes
+BuildRequires: python-mutagen >= 1.6
+BuildRequires: python-sqlite2
+BuildRequires: dbus-python
 BuildRequires: pygtk2-devel 
 BuildRequires: gtk2-devel
-Buildrequires: pkgconfig
-Buildrequires: docbook2X
-BuildRequires: gettext
-Buildrequires: xorg-x11-server-Xvfb
-Buildrequires: xorg-x11-xauth
-Buildrequires: xorg-x11-fonts-base
-Buildrequires: xorg-x11-fonts-misc
 BuildRequires: gstreamer-python
-BuildRequires: dbus-python
-BuildRequires: python-sqlite2
-BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkhtml2
 BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
 BuildRequires: python-sexy
-BuildRequires: python-mutagen >= 1.6
+Buildrequires: xorg-x11-server-Xvfb
+Buildrequires: xorg-x11-xauth
+Buildrequires: xorg-x11-fonts-base
+Buildrequires: xorg-x11-fonts-misc
+Buildrequires: docbook2X
+BuildRequires: gettext
+Buildrequires: pkgconfig
 BuildRequires: desktop-file-utils
-
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig 
 
 # added explicit Requires
-Requires: python-mutagen >= 1.6
 Requires: python 
-Requires: pygtk2 
-Requires: gstreamer-python 
-Requires: dbus-python
-Requires: python-sqlite2
 Requires: python-ctypes
+Requires: python-mutagen >= 1.6
+Requires: python-sqlite2
+Requires: dbus-python
+Requires: pygtk2 
+Requires: gstreamer-python
 Requires: gnome-python2
 Requires: gnome-python2-extras
-Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
@@ -57,6 +61,7 @@
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
+
 %description
 Listen is a music manager and player for GNOME
 With listen you can:
@@ -83,15 +88,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}b1
-# the path is hardcoded in the Makefile
-%{__sed} -i 's/local//' Makefile
-# Under Fedora dockbook2x-man is renamed db2x_docbook2man
-%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
-# enable the use of %{find_lang} macros
-%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %ifarch x86_64
-# correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
+# correct path issue on x86_64 box
+%{__sed} -i 's/\/lib/\/lib64/' Makefile
 %endif
 
 %build
@@ -100,7 +103,7 @@
 # added - nolisten tcp -ac -terminate to fix build issue with mock
 %{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
 export DISPLAY=:$XDISPLAY
-xauth add $DISPLAY . EE
+xauth add :$XDISPLAY . EE
 make %{?_smp_mflags}
 
 
@@ -148,27 +151,32 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Fri Nov 20 2006 Ha??kel Gu??mar  0.5-8.beta1
+* Mon Nov 13 2006 Ha??kel Gu??mar  0.5-9.beta1
+- Fixed build issue
+- Replaced some sed one-liners by incremental patches
+- Minor bugs fixing (is Listen actively maintained ?)
+
+* Fri Oct 20 2006 Ha??kel Gu??mar  0.5-8.beta1
 - Fixed a path issue that prevent Listen to be launched on x86_64 
  systems. Now owns {_datadir}/%{name}
 
-* Sat Nov 14 2006 Ha??kel Gu??mar  0.5-7.beta1
+* Sat Oct 14 2006 Ha??kel Gu??mar  0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 
-* Thu Nov 12 2006 Ha??kel Gu??mar  0.5-6.beta1
+* Thu Oct 12 2006 Ha??kel Gu??mar  0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-5.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-4.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-4.beta1
 - Fixed build issue on x86_64
 
-* Sun Nov 08 2006 Ha??kel Gu??mar  0.5-3.beta1
+* Sun Oct 08 2006 Ha??kel Gu??mar  0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 
 
-* Thu Nov 05 2006 Ha??kel Gu??mar  0.5b1-2
+* Thu Oct 05 2006 Ha??kel Gu??mar  0.5b1-2
 - Added gettext and gtk2-devel as BR, fixed build issue with mock
 
 * Fri Sep 08 2006 Ha??kel Gu??mar  0.5b1-1
@@ -188,3 +196,6 @@
 
 * Thu May 11 2006 Ha??kel Gu??mar  0.4.3-1
 - First packaging
+
+
+



From fedora-extras-commits at redhat.com  Tue Nov 14 12:26:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:26:45 -0700
Subject: rpms/listen/FC-5 listen.spec,1.15,1.16
Message-ID: <200611141226.kAECQjEQ007042@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7000/FC-5

Modified Files:
	listen.spec 
Log Message:

Updated spec to fix build issue, some bugs fixes



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- listen.spec	20 Oct 2006 14:33:11 -0000	1.15
+++ listen.spec	14 Nov 2006 12:26:15 -0000	1.16
@@ -1,52 +1,56 @@
 Name:           listen
 Version:        0.5
-Release:        8.beta1%{?dist}
+Release:        9.beta1%{?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)
 
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig  
+ 
 Buildrequires: python-devel
+BuildRequires: python-ctypes
+BuildRequires: python-mutagen >= 1.6
+BuildRequires: python-sqlite2
+BuildRequires: dbus-python
 BuildRequires: pygtk2-devel 
 BuildRequires: gtk2-devel
-Buildrequires: pkgconfig
-Buildrequires: docbook2X
-BuildRequires: gettext
-Buildrequires: xorg-x11-server-Xvfb
-Buildrequires: xorg-x11-xauth
-Buildrequires: xorg-x11-fonts-base
-Buildrequires: xorg-x11-fonts-misc
 BuildRequires: gstreamer-python
-BuildRequires: dbus-python
-BuildRequires: python-sqlite2
-BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkhtml2
 BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
 BuildRequires: python-sexy
-BuildRequires: python-mutagen >= 1.6
+Buildrequires: xorg-x11-server-Xvfb
+Buildrequires: xorg-x11-xauth
+Buildrequires: xorg-x11-fonts-base
+Buildrequires: xorg-x11-fonts-misc
+Buildrequires: docbook2X
+BuildRequires: gettext
+Buildrequires: pkgconfig
 BuildRequires: desktop-file-utils
-
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig 
 
 # added explicit Requires
-Requires: python-mutagen >= 1.6
 Requires: python 
-Requires: pygtk2 
-Requires: gstreamer-python 
-Requires: dbus-python
-Requires: python-sqlite2
 Requires: python-ctypes
+Requires: python-mutagen >= 1.6
+Requires: python-sqlite2
+Requires: dbus-python
+Requires: pygtk2 
+Requires: gstreamer-python
 Requires: gnome-python2
 Requires: gnome-python2-extras
-Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
@@ -57,6 +61,7 @@
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
+
 %description
 Listen is a music manager and player for GNOME
 With listen you can:
@@ -83,15 +88,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}b1
-# the path is hardcoded in the Makefile
-%{__sed} -i 's/local//' Makefile
-# Under Fedora dockbook2x-man is renamed db2x_docbook2man
-%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
-# enable the use of %{find_lang} macros
-%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %ifarch x86_64
-# correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
+# correct path issue on x86_64 box
+%{__sed} -i 's/\/lib/\/lib64/' Makefile
 %endif
 
 %build
@@ -100,7 +103,7 @@
 # added - nolisten tcp -ac -terminate to fix build issue with mock
 %{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
 export DISPLAY=:$XDISPLAY
-xauth add $DISPLAY . EE
+xauth add :$XDISPLAY . EE
 make %{?_smp_mflags}
 
 
@@ -148,27 +151,32 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Fri Nov 20 2006 Ha??kel Gu??mar  0.5-8.beta1
+* Mon Nov 13 2006 Ha??kel Gu??mar  0.5-9.beta1
+- Fixed build issue
+- Replaced some sed one-liners by incremental patches
+- Minor bugs fixing (is Listen actively maintained ?)
+
+* Fri Oct 20 2006 Ha??kel Gu??mar  0.5-8.beta1
 - Fixed a path issue that prevent Listen to be launched on x86_64 
  systems. Now owns {_datadir}/%{name}
 
-* Sat Nov 14 2006 Ha??kel Gu??mar  0.5-7.beta1
+* Sat Oct 14 2006 Ha??kel Gu??mar  0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 
-* Thu Nov 12 2006 Ha??kel Gu??mar  0.5-6.beta1
+* Thu Oct 12 2006 Ha??kel Gu??mar  0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-5.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-4.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-4.beta1
 - Fixed build issue on x86_64
 
-* Sun Nov 08 2006 Ha??kel Gu??mar  0.5-3.beta1
+* Sun Oct 08 2006 Ha??kel Gu??mar  0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 
 
-* Thu Nov 05 2006 Ha??kel Gu??mar  0.5b1-2
+* Thu Oct 05 2006 Ha??kel Gu??mar  0.5b1-2
 - Added gettext and gtk2-devel as BR, fixed build issue with mock
 
 * Fri Sep 08 2006 Ha??kel Gu??mar  0.5b1-1
@@ -188,3 +196,6 @@
 
 * Thu May 11 2006 Ha??kel Gu??mar  0.4.3-1
 - First packaging
+
+
+



From fedora-extras-commits at redhat.com  Tue Nov 14 12:26:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:26:46 -0700
Subject: rpms/listen/devel listen.spec,1.15,1.16
Message-ID: <200611141226.kAECQkNB007045@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7000/devel

Modified Files:
	listen.spec 
Log Message:

Updated spec to fix build issue, some bugs fixes



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- listen.spec	20 Oct 2006 14:33:12 -0000	1.15
+++ listen.spec	14 Nov 2006 12:26:16 -0000	1.16
@@ -1,52 +1,56 @@
 Name:           listen
 Version:        0.5
-Release:        8.beta1%{?dist}
+Release:        9.beta1%{?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)
 
 
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig  
+ 
 Buildrequires: python-devel
+BuildRequires: python-ctypes
+BuildRequires: python-mutagen >= 1.6
+BuildRequires: python-sqlite2
+BuildRequires: dbus-python
 BuildRequires: pygtk2-devel 
 BuildRequires: gtk2-devel
-Buildrequires: pkgconfig
-Buildrequires: docbook2X
-BuildRequires: gettext
-Buildrequires: xorg-x11-server-Xvfb
-Buildrequires: xorg-x11-xauth
-Buildrequires: xorg-x11-fonts-base
-Buildrequires: xorg-x11-fonts-misc
 BuildRequires: gstreamer-python
-BuildRequires: dbus-python
-BuildRequires: python-sqlite2
-BuildRequires: python-ctypes
 BuildRequires: gnome-python2
 BuildRequires: gnome-python2-extras
+BuildRequires: gnome-python2-gtkhtml2
 BuildRequires: gnome-python2-gtkmozembed
 BuildRequires: gnome-python2-libegg
 BuildRequires: python-sexy
-BuildRequires: python-mutagen >= 1.6
+Buildrequires: xorg-x11-server-Xvfb
+Buildrequires: xorg-x11-xauth
+Buildrequires: xorg-x11-fonts-base
+Buildrequires: xorg-x11-fonts-misc
+Buildrequires: docbook2X
+BuildRequires: gettext
+Buildrequires: pkgconfig
 BuildRequires: desktop-file-utils
-
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig 
 
 # added explicit Requires
-Requires: python-mutagen >= 1.6
 Requires: python 
-Requires: pygtk2 
-Requires: gstreamer-python 
-Requires: dbus-python
-Requires: python-sqlite2
 Requires: python-ctypes
+Requires: python-mutagen >= 1.6
+Requires: python-sqlite2
+Requires: dbus-python
+Requires: pygtk2 
+Requires: gstreamer-python
 Requires: gnome-python2
 Requires: gnome-python2-extras
-Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-gtkhtml2
+Requires: gnome-python2-gtkmozembed
 Requires: gnome-python2-libegg
 Requires: python-sexy
 # MusicBrainz support
@@ -57,6 +61,7 @@
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
+
 %description
 Listen is a music manager and player for GNOME
 With listen you can:
@@ -83,15 +88,13 @@
 
 %prep
 %setup -q -n %{name}-%{version}b1
-# the path is hardcoded in the Makefile
-%{__sed} -i 's/local//' Makefile
-# Under Fedora dockbook2x-man is renamed db2x_docbook2man
-%{__sed} -i 's/docbook2x-man/db2x_docbook2man/' Makefile
-# enable the use of %{find_lang} macros
-%{__sed} -i 's/lib\/listen\/po/share\/locale/' Makefile
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %ifarch x86_64
-# correct a path issue that prevent Listen to be launched on a x86_64 box
-%{__sed} -i 's/lib\/listen\/listen.py/lib64\/listen\/listen.py/' Makefile
+# correct path issue on x86_64 box
+%{__sed} -i 's/\/lib/\/lib64/' Makefile
 %endif
 
 %build
@@ -100,7 +103,7 @@
 # added - nolisten tcp -ac -terminate to fix build issue with mock
 %{_prefix}/bin/Xvfb :$XDISPLAY -nolisten tcp -ac -terminate &
 export DISPLAY=:$XDISPLAY
-xauth add $DISPLAY . EE
+xauth add :$XDISPLAY . EE
 make %{?_smp_mflags}
 
 
@@ -148,27 +151,32 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
-* Fri Nov 20 2006 Ha??kel Gu??mar  0.5-8.beta1
+* Mon Nov 13 2006 Ha??kel Gu??mar  0.5-9.beta1
+- Fixed build issue
+- Replaced some sed one-liners by incremental patches
+- Minor bugs fixing (is Listen actively maintained ?)
+
+* Fri Oct 20 2006 Ha??kel Gu??mar  0.5-8.beta1
 - Fixed a path issue that prevent Listen to be launched on x86_64 
  systems. Now owns {_datadir}/%{name}
 
-* Sat Nov 14 2006 Ha??kel Gu??mar  0.5-7.beta1
+* Sat Oct 14 2006 Ha??kel Gu??mar  0.5-7.beta1
 - Updated R with gnome-python2-gtkhtml2
 
-* Thu Nov 12 2006 Ha??kel Gu??mar  0.5-6.beta1
+* Thu Oct 12 2006 Ha??kel Gu??mar  0.5-6.beta1
 - Updated R & BR, now use the %{find_lang} macros
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-5.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-5.beta1
 - Moved /usr/lib/listen to /usr/lib64 on x86_64
 
-* Mon Nov 09 2006 Ha??kel Gu??mar  0.5-4.beta1
+* Mon Oct 09 2006 Ha??kel Gu??mar  0.5-4.beta1
 - Fixed build issue on x86_64
 
-* Sun Nov 08 2006 Ha??kel Gu??mar  0.5-3.beta1
+* Sun Oct 08 2006 Ha??kel Gu??mar  0.5-3.beta1
 - Removed audio/mp3 & cie mime types from .desktop, fixed naming issue,
  some enhancements to the spec (thanks M. Sourada), 
 
-* Thu Nov 05 2006 Ha??kel Gu??mar  0.5b1-2
+* Thu Oct 05 2006 Ha??kel Gu??mar  0.5b1-2
 - Added gettext and gtk2-devel as BR, fixed build issue with mock
 
 * Fri Sep 08 2006 Ha??kel Gu??mar  0.5b1-1
@@ -188,3 +196,6 @@
 
 * Thu May 11 2006 Ha??kel Gu??mar  0.4.3-1
 - First packaging
+
+
+



From fedora-extras-commits at redhat.com  Tue Nov 14 12:27:46 2006
From: fedora-extras-commits at redhat.com (Parag Ashok Nemade (paragn))
Date: Tue, 14 Nov 2006 05:27:46 -0700
Subject: rpms/gutenprint/FC-6 gutenprint.spec,1.2,1.3
Message-ID: <200611141227.kAECRk9d007074@cvs-int.fedora.redhat.com>

Author: paragn

Update of /cvs/extras/rpms/gutenprint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7051

Modified Files:
	gutenprint.spec 
Log Message:



Index: gutenprint.spec
===================================================================
RCS file: /cvs/extras/rpms/gutenprint/FC-6/gutenprint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gutenprint.spec	3 Oct 2006 04:34:07 -0000	1.2
+++ gutenprint.spec	14 Nov 2006 12:27:16 -0000	1.3
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.0.0
-Release:        0.15%{?dist}
+Release:        0.16%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -200,6 +200,7 @@
 Summary:        CUPS drivers for Canon, Epson, HP and compatible printers
 Group:          Applications/Publishing
 Requires:       cups >= 1.2.1-1.7
+Requires:	gimp-print-cups
 
 %description cups
 This package contains native CUPS support for a wide range of Canon,
@@ -379,6 +380,9 @@
 %{_datadir}/cups/model/gutenprint/5.0/zh_TW
 
 %changelog
+* Tue Nov 14 2006 Parag Nemade - 5.0.0-0.16
+- Added missing dependency of gimp-print-cups in gutenprint-cups
+
 * Thu Oct 03 2006 Parag Nemade - 5.0.0-0.15
 - Did some fix for tag issue
 



From fedora-extras-commits at redhat.com  Tue Nov 14 12:30:59 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:30:59 -0700
Subject: rpms/listen/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611141230.kAECUxKd007221@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171/FC-5

Modified Files:
	.cvsignore sources 
Log Message:

Uploaded patchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2006 08:26:18 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
@@ -1 +1,5 @@
 listen-0.5b1.tar.gz
+Makefile.patch
+const.py.patch
+check.py.patch
+dialog.py.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Oct 2006 08:26:18 -0000	1.2
+++ sources	14 Nov 2006 12:30:29 -0000	1.3
@@ -1 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
+e72064d64d4611ea539878219ebfad22  Makefile.patch
+7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
+fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
+98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 12:31:00 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:31:00 -0700
Subject: rpms/listen/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611141231.kAECV0nb007229@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171/devel

Modified Files:
	.cvsignore sources 
Log Message:

Uploaded patchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2006 08:26:18 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:30:30 -0000	1.3
@@ -1 +1,5 @@
 listen-0.5b1.tar.gz
+Makefile.patch
+const.py.patch
+check.py.patch
+dialog.py.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Oct 2006 08:26:18 -0000	1.2
+++ sources	14 Nov 2006 12:30:30 -0000	1.3
@@ -1 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
+e72064d64d4611ea539878219ebfad22  Makefile.patch
+7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
+fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
+98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 12:31:00 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 05:31:00 -0700
Subject: rpms/listen/FC-6 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611141231.kAECV0nE007225@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171/FC-6

Modified Files:
	.cvsignore sources 
Log Message:

Uploaded patchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Oct 2006 08:26:18 -0000	1.2
+++ .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
@@ -1 +1,5 @@
 listen-0.5b1.tar.gz
+Makefile.patch
+const.py.patch
+check.py.patch
+dialog.py.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Oct 2006 08:26:18 -0000	1.2
+++ sources	14 Nov 2006 12:30:29 -0000	1.3
@@ -1 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
+e72064d64d4611ea539878219ebfad22  Makefile.patch
+7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
+fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
+98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 12:51:34 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 05:51:34 -0700
Subject: owners owners.list,1.1957,1.1958
Message-ID: <200611141251.kAECpYlQ007505@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7489

Modified Files:
	owners.list 
Log Message:
Added flite



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1957
retrieving revision 1.1958
diff -u -r1.1957 -r1.1958
--- owners.list	14 Nov 2006 07:28:56 -0000	1.1957
+++ owners.list	14 Nov 2006 12:51:03 -0000	1.1958
@@ -406,6 +406,7 @@
 Fedora Extras|flight-of-the-amazon-queen|Flight of the Amazon Queen - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|flight-of-the-amazon-queen-cd|Flight of the Amazon Queen - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|flite|Small, fast speech synthesis engine (text-to-speech)|faucamp at csir.co.za|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fluidsynth|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 12:59:35 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Nov 2006 05:59:35 -0700
Subject: rpms/knetworkmanager/FC-6 .cvsignore, 1.4,
	1.5 knetworkmanager-dbus.patch, 1.1, 1.2 knetworkmanager.spec,
	1.4, 1.5 sources, 1.4, 1.5 01-build-fix.patch, 1.1,
	NONE knetworkmanager-call-scn-not-yast.patch, 1.1, NONE
Message-ID: <200611141259.kAECxZbG007653@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/knetworkmanager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7591

Modified Files:
	.cvsignore knetworkmanager-dbus.patch knetworkmanager.spec 
	sources 
Removed Files:
	01-build-fix.patch knetworkmanager-call-scn-not-yast.patch 
Log Message:
 remove no longer needed patches update to new snapshot 
use kppp instead of system-config-network for dialup



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Sep 2006 12:38:08 -0000	1.4
+++ .cvsignore	14 Nov 2006 12:59:04 -0000	1.5
@@ -1 +1 @@
-knetworkmanager-svn20060912.tar.bz2
+knetworkmanager-svn20061113.tar.bz2

knetworkmanager-dbus.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 knetworkmanager-dbus.patch
Index: knetworkmanager-dbus.patch
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/knetworkmanager-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- knetworkmanager-dbus.patch	11 Aug 2006 02:22:31 -0000	1.1
+++ knetworkmanager-dbus.patch	14 Nov 2006 12:59:04 -0000	1.2
@@ -1,20 +1,1477 @@
 diff -Nur knetworkmanager-orig/knetworkmanager/configure.in.in knetworkmanager/knetworkmanager/configure.in.in
---- knetworkmanager-orig/knetworkmanager/configure.in.in	2006-03-30 05:26:31.000000000 -0600
-+++ knetworkmanager/knetworkmanager/configure.in.in	2006-08-10 20:30:08.000000000 -0500
-@@ -36,10 +36,6 @@
-   CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
--  AC_CHECK_HEADER([dbus/connection.h],,[
--     AC_MSG_WARN([You need D-BUS/Qt3 bindings])
--     DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
--  ])
-   CPPFLAGS=$safe_CPPFLAGS
-   AC_LANG_RESTORE
+--- knetworkmanager-orig/knetworkmanager/configure.in.in	2006-09-22 08:29:20.000000000 -0500
++++ knetworkmanager/knetworkmanager/configure.in.in	2006-11-13 22:17:18.000000000 -0600
+@@ -7,9 +7,6 @@
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION, $KNETWORKMANAGER_VERSION, [KNetworkManager Version])
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION_STRING, "$KNETWORKMANAGER_VERSION", [KNetworkManager Version String])
  
+-# Check for D-Bus and HAL
+-
+-AC_MSG_CHECKING(for D-BUS)
+ 
+ # test if variables are already set
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+@@ -40,10 +37,6 @@
+ CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+-AC_CHECK_HEADER([dbus/connection.h],,[
+-	AC_MSG_WARN([You need D-Bus/Qt3 bindings])
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
+-])
+ CPPFLAGS=$safe_CPPFLAGS
+ AC_LANG_RESTORE
+ 
+@@ -51,6 +44,7 @@
+ AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse]))
+ if test "x$with_distro" = "x"; then
+ 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
++	AC_CHECK_FILE(/etc/fedora-release,with_distro="fedora")
+ 	if test "x$with_distro" = "x"; then
+ 		with_distro=`lsb_release -is`
+ 	fi
+@@ -65,7 +59,10 @@
+ 		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.)"
+ 			;;
+ 	esac
+diff -Nur knetworkmanager-orig/knetworkmanager/Makefile.in knetworkmanager/knetworkmanager/Makefile.in
+--- knetworkmanager-orig/knetworkmanager/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/knetworkmanager/Makefile.in	2006-11-13 22:14:46.000000000 -0600
+@@ -0,0 +1,751 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision$ 
++# @configure_input@
++
++# 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.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++subdir = knetworkmanager
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++	AUTHORS COPYING ChangeLog INSTALL NEWS TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++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)$(dbusservicedir)"
++dbusserviceDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(dbusservice_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTSCCONFIG = @ARTSCCONFIG@
++AUTOCONF = @AUTOCONF@
++AUTODIRS = @AUTODIRS@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CONF_FILES = @CONF_FILES@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DBUS_SYS_DIR = @DBUS_SYS_DIR@
++DCOPIDL = @DCOPIDL@
++DCOPIDL2CPP = @DCOPIDL2CPP@
++DCOPIDLNG = @DCOPIDLNG@
++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
++GMSGFMT = @GMSGFMT@
++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
++KCONFIG_COMPILER = @KCONFIG_COMPILER@
++KDECONFIG = @KDECONFIG@
++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
[...10899 lines suppressed...]
++
++
++install-data-local:
++	@echo ""
++	@echo ""
++	@echo "*************** Important *************************"
++	@echo ""
++	@echo "This module contains unreleased software."
++	@echo ""
++	@echo "The software may compile and work, but it may just"
++	@echo "as well neither compile nor work."
++	@echo ""
++	@echo "****************************************************"
++	@echo ""
++
++dist-hook:
++	cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
++apidox-am-yes:
++	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
++		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++	fi ; \
++	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++	test -d $(top_builddir)/apidocs || \
++		( cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--no-modulename --installdir=$(kde_libs_htmldir)/en \
++		--no-recurse $(abs_top_srcdir) . ) ; \
++	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \
++		$$abs_top_srcdir $(subdir)
++
++apidox-am-toplevel-yes:
++	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \
++		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++	fi ; \
++	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--no-modulename --installdir=$(kde_libs_htmldir)/en \
++		$$abs_top_srcdir
++
++apidox-am-no:
++
++apidox-am-toplevel-no:
++
++apidox:
++	@if test "$(subdir)" != "."; then \
++		$(MAKE) apidox-am- at KDE_HAS_DOXYGEN@ ;\
++	else \
++		$(MAKE) apidox-am-toplevel- at KDE_HAS_DOXYGEN@ ;\
++	fi
++
++install-data-local: install-apidox
++
++install-apidox:
++	@if test "$(subdir)" != "."; then \
++		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html ; \
++		if test -f $(top_builddir)/apidocs/$(subdir)/$(subdir).tag; then \
++		echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		fi; \
++		if test -d $(top_builddir)/apidocs/$(subdir)/html; then \
++			list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \
++			echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\
++			for file in $$list; do \
++				$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
++		done; \
++		fi; \
++	else\
++		if test -d $(top_builddir)/apidocs; then \
++		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
++		list=`cd $(top_builddir)/apidocs && ls -1`; \
++		echo "installing $(top_builddir)/apidocs/$$file" ;\
++		echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \
++		for file in $$list; do \
++			if test -f $(top_builddir)/apidocs/$$file; then \
++				$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
++			fi; \
++		done ; fi; \
++	fi
++
++uninstall-local: uninstall-apidox
++
++uninstall-apidox:
++	@if test "$(subdir)" != "."; then \
++		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
++			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		fi \
++	else \
++		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
++			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
++		fi \
++	fi
++
++install-apidox-recurse: install-apidox
++	@set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
++	    list='$(SUBDIRS)'; \
++	    for subdir in $$list; do \
++		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \
++		echo "Installing apidox from $$subdir"; \
++		if test "$$subdir" != "."; then \
++			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \
++		fi ; fi ;\
++	    done; \
++	fi
++
++.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
++
++# Local Variables:
++# mode: makefile
++# End:
++$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
++
++$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in
++
++$(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES)
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh
++
++$(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
++
++$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
++
++# defining default rules for files that may not be present
++$(top_srcdir)/Makefile.am.in:
++$(CONF_FILES):
++# 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.
++.NOEXPORT:
++
++#>+ 2
++KDE_DIST=knetworkmanager.lang.dbus subdirs Makefile.in knetworkmanager.lang INDEX configure.files config.h.in Makefile.am.dbus configure.in Makefile.cvs aclocal.m4 subdirs.dbus stamp-h1.dbus configure.in.in acinclude.m4 Makefile.am configure libtool.dbus Makefile.am.in 
++
++#>+ 2
++docs-am:
++
++#>+ 7
++force-reedit:
++	 \
++	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++	
++	cd $(top_srcdir) && perl admin/am_edit Makefile.in
++
++
++#>+ 21
++clean-bcheck: 
++	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
++
++bcheck: bcheck-recursive
++
++bcheck-am:
++	@for i in ; do \
++	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
++	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
++	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
++	        echo "$$i"; \
++	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++	            rm -f $$i.bchecktest.cc; exit 1; \
++	        fi ; \
++	        echo "" >> $$i.bchecktest.cc.class; \
++	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
++	        rm -f a.out; \
++	    fi ; \
++	done
++
++
++#>+ 3
++final:
++	$(MAKE) all-am
++
++#>+ 3
++final-install:
++	$(MAKE) install-am
++
++#>+ 3
++no-final:
++	$(MAKE) all-am
++
++#>+ 3
++no-final-install:
++	$(MAKE) install-am
++
++#>+ 3
++kde-rpo-clean:
++	-rm -f *.rpo
++
++#>+ 3
++nmcheck: 
++nmcheck-am: nmcheck
+diff -Nur knetworkmanager-orig/stamp-h1 knetworkmanager/stamp-h1
+--- knetworkmanager-orig/stamp-h1	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/stamp-h1	2006-11-13 22:14:28.000000000 -0600
+@@ -0,0 +1 @@
++timestamp for config.h
+diff -Nur knetworkmanager-orig/subdirs knetworkmanager/subdirs
+--- knetworkmanager-orig/subdirs	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/subdirs	2006-11-13 22:14:28.000000000 -0600
+@@ -0,0 +1 @@
++knetworkmanager


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/knetworkmanager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- knetworkmanager.spec	13 Sep 2006 12:38:08 -0000	1.4
+++ knetworkmanager.spec	14 Nov 2006 12:59:04 -0000	1.5
@@ -1,8 +1,8 @@
-%define		svn svn20060912
+%define		svn svn20061113
 
 Name:           knetworkmanager
 Version:        0.1
-Release:        0.1.%{svn}%{?dist}
+Release:        0.4.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -11,14 +11,8 @@
 Source0:        knetworkmanager-%{svn}.tar.bz2
 #script to make svn tarball
 Source1:	knetworkmanager-svn_checkout.sh
-# Patch Is required because SuSE have a broken kdepim-devel that exports non standard headers 
-# they also hard code the /opt/kde3/include path in there. the patch adds the needed header 
-# file and fixes the path
-Patch0:		http://aur.archlinux.org/packages/knetworkmanager-svn/knetworkmanager-svn/01-build-fix.patch
-# Suse Hard coded yast for dialup configuration. this patch calls System-config-network instead
-Patch1:		knetworkmanager-call-scn-not-yast.patch
 # Patch adds dbus support  as dbusqt3 is no longer in extras
-Patch2:		knetworkmanager-dbus.patch
+Patch0:		knetworkmanager-dbus.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,9 +25,7 @@
 
 %prep
 %setup -q -n knetworkmanager
-%patch0 -p0 
-%patch1 -p1 -b .eww-yast
-%patch2 -p1 -b .dbus
+%patch0 -p1 -b .dbus
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -54,7 +46,6 @@
 --remove-category=Network \
 --add-category=Applications \
 --add-category=System \
---add-category=X-Fedora \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop
 
@@ -93,6 +84,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.4.svn20061113
+- update to new svn snapshot  change dialup networking to call kppp
+
 * Wed Sep 13 2006 Dennis Gilmore  - 0.1-0.4.svn20060912
 - add BR on wireless-tools-devel update snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Sep 2006 12:38:08 -0000	1.4
+++ sources	14 Nov 2006 12:59:04 -0000	1.5
@@ -1 +1 @@
-8e189f0799aa3927a363c6c0c585613d  knetworkmanager-svn20060912.tar.bz2
+e7ecf02d0d9011dab93b665d8d3b28f6  knetworkmanager-svn20061113.tar.bz2


--- 01-build-fix.patch DELETED ---


--- knetworkmanager-call-scn-not-yast.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 13:00:10 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:00:10 -0700
Subject: rpms/flite - New directory
Message-ID: <200611141300.kAED0AQi007704@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7700/flite

Log Message:
Directory /cvs/extras/rpms/flite added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 13:00:16 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:00:16 -0700
Subject: rpms/flite/devel - New directory
Message-ID: <200611141300.kAED0Gfb007720@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7700/flite/devel

Log Message:
Directory /cvs/extras/rpms/flite/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 13:01:09 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:01:09 -0700
Subject: rpms/flite Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611141301.kAED19m3010752@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10403

Added Files:
	Makefile import.log 
Log Message:
Setup of module flite


--- NEW FILE Makefile ---
# Top level Makefile for module flite
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  Tue Nov 14 13:01:17 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:01:17 -0700
Subject: rpms/flite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611141301.kAED1Hv6010786@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10403/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module flite


--- 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 Nov 14 13:05:30 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Nov 2006 06:05:30 -0700
Subject: rpms/knetworkmanager/FC-6 knetworkmanager.spec,1.5,1.6
Message-ID: <200611141305.kAED5UJ2010903@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/knetworkmanager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887

Modified Files:
	knetworkmanager.spec 
Log Message:
messed up checkin tag process :(



Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/FC-6/knetworkmanager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- knetworkmanager.spec	14 Nov 2006 12:59:04 -0000	1.5
+++ knetworkmanager.spec	14 Nov 2006 13:04:55 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           knetworkmanager
 Version:        0.1
-Release:        0.4.%{svn}%{?dist}
+Release:        0.5.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.5.svn20061113
+- messed up check in :(
+
 * Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.4.svn20061113
 - update to new svn snapshot  change dialup networking to call kppp
 



From fedora-extras-commits at redhat.com  Tue Nov 14 13:08:20 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:08:20 -0700
Subject: rpms/flite/devel README-ALSA.txt, NONE,
	1.1 flite-1.3-alsa_support.patch, NONE,
	1.1 flite-1.3-doc_texinfo.patch, NONE,
	1.1 flite-1.3-sharedlibs.patch, NONE, 1.1 flite.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611141308.kAED8KYH011092@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11008/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README-ALSA.txt flite-1.3-alsa_support.patch 
	flite-1.3-doc_texinfo.patch flite-1.3-sharedlibs.patch 
	flite.spec 
Log Message:
auto-import flite-1.3-8 on branch devel from flite-1.3-8.src.rpm


--- NEW FILE README-ALSA.txt ---

Native ALSA support for Flite 1.3 - patch created by
Lukas Loehrer 


flite-1.3-alsa_support.patch:

--- NEW FILE flite-1.3-alsa_support.patch ---
diff -uNr flite-1.3-release/configure.in flite-1.3-release-mod/configure.in
--- flite-1.3-release/configure.in	2005-08-13 13:43:21.000000000 +0200
+++ flite-1.3-release-mod/configure.in	2006-11-13 21:16:27.000000000 +0200
@@ -206,10 +206,10 @@
 AC_CHECK_HEADER(sys/audioio.h,
               [AUDIODRIVER="sun"
                AUDIODEFS=-DCST_AUDIO_SUNOS])
-dnl AC_CHECK_HEADER(sys/asoundlib.h,
-dnl              [AUDIODRIVER="alsa"
-dnl	       AUDIODEFS=-DCST_AUDIO_ALSA
-dnl               AUDIOLIBS=-lasound])
+AC_CHECK_HEADER(alsa/asoundlib.h,
+              [AUDIODRIVER="alsa"
+	       AUDIODEFS=-DCST_AUDIO_ALSA
+               AUDIOLIBS=-lasound])
 AC_CHECK_HEADER(mmsystem.h,
 	      [AUDIODRIVER="wince"
 	       AUDIODEFS=-DCST_AUDIO_WINCE
diff -uNr flite-1.3-release/src/audio/au_alsa.c flite-1.3-release-mod/src/audio/au_alsa.c
--- flite-1.3-release/src/audio/au_alsa.c	1970-01-01 02:00:00.000000000 +0200
+++ flite-1.3-release-mod/src/audio/au_alsa.c	2006-11-13 21:16:54.000000000 +0200
@@ -0,0 +1,311 @@
+/*************************************************************************/
+/*                                                                       */
+/*                  Language Technologies Institute                      */
+/*                     Carnegie Mellon University                        */
+/*                        Copyright (c) 2000                             */
+/*                        All Rights Reserved.                           */
+/*                                                                       */
+/*  Permission is hereby granted, free of charge, to use and distribute  */
+/*  this software and its documentation without restriction, including   */
+/*  without limitation the rights to use, copy, modify, merge, publish,  */
+/*  distribute, sublicense, and/or sell copies of this work, and to      */
+/*  permit persons to whom this work is furnished to do so, subject to   */
+/*  the following conditions:                                            */
+/*   1. The code must retain the above copyright notice, this list of    */
+/*      conditions and the following disclaimer.                         */
+/*   2. Any modifications must be clearly marked as such.                */
+/*   3. Original authors' names are not deleted.                         */
+/*   4. The authors' names are not used to endorse or promote products   */
+/*      derived from this software without specific prior written        */
+/*      permission.                                                      */
+/*                                                                       */
+/*  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         */
+/*  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      */
+/*  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   */
+/*  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      */
+/*  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    */
+/*  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   */
+/*  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          */
+/*  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       */
+/*  THIS SOFTWARE.                                                       */
+/*                                                                       */
+/*********************************************************************** */
+/*             Author:  Lukas Loehrer (                                  */
+/*               Date:  January 2005                                     */
+/*************************************************************************/
+/*                                                                       */
+/*  Native access to alsa audio devices on Linux                         */
+/*  Tested with libasound version 1.0.10                                 */
+/*************************************************************************/
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "cst_string.h"
+#include "cst_wave.h"
+#include "cst_audio.h"
+
+#include 
+
+
+/*static char *pcm_dev_name = "hw:0,0"; */
+static char *pcm_dev_name ="default";
+
+static inline void print_pcm_state(snd_pcm_t *handle, char *msg)
+{
+  fprintf(stderr, "PCM state at %s = %s\n", msg,
+		  snd_pcm_state_name(snd_pcm_state(handle)));
+}
+
+cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt)
+{
+  cst_audiodev *ad;
+  unsigned 	int real_rate;
+  int err;
+
+  /* alsa specific stuff */
+  snd_pcm_t *pcm_handle;          
+  snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;
+  snd_pcm_hw_params_t *hwparams;
+  snd_pcm_format_t format;
+  snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED;
+
+  /* Allocate the snd_pcm_hw_params_t structure on the stack. */
+  snd_pcm_hw_params_alloca(&hwparams);
+
+  /* Open pcm device */
+  err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0);
+  if (err < 0) 
+  {
+	cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n",
+			   pcm_dev_name, snd_strerror(err));
+	return NULL;
+  }
+
+  /* Init hwparams with full configuration space */
+  err = snd_pcm_hw_params_any(pcm_handle, hwparams);
+  if (err < 0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err));
+	return NULL;
+  }
+
+  /* Set access mode */
+  err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access);
+  if (err < 0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err));
+	return NULL;
+  }
+
+  /* Determine matching alsa sample format */
+  /* This could be implemented in a more */
+  /* flexible way (byte order conversion). */
+  switch (fmt)
+  {
+  case CST_AUDIO_LINEAR16:
+	if (CST_LITTLE_ENDIAN)
+	  format = SND_PCM_FORMAT_S16_LE;
+	else
+	  format = SND_PCM_FORMAT_S16_BE;
+	break;
+  case CST_AUDIO_LINEAR8:
+	format = SND_PCM_FORMAT_U8;
+	break;
+  case CST_AUDIO_MULAW:
+	format = SND_PCM_FORMAT_MU_LAW;
+	break;
+  default:
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to find suitable format.\n");
+	return NULL;
+	break;
+  }
+
+  /* Set samble format */
+  err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format);
+  if (err <0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err));
+	return NULL;
+  }
+
+  /* Set sample rate near the disired rate */
+  real_rate = sps;
+  err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0);
+  if (err < 0)   
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err));
+	return NULL;
+  }
+  /*FIXME:  This is probably too strict */
+  assert(sps == real_rate);
+
+  /* Set number of channels */
+  assert(channels >0);
+  err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels);
+  if (err < 0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err));
+	return NULL;
+  }
+
+  /* Commit hardware parameters */
+  err = snd_pcm_hw_params(pcm_handle, hwparams);
+  if (err < 0) 
+  {
+	snd_pcm_close(pcm_handle);
+	cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err));
+	return NULL;
+  }
+
+  /* Make sure the device is ready to accept data */
+  assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED);
+
+  /* Write hardware parameters to flite audio device data structure */
+  ad = cst_alloc(cst_audiodev, 1);
+  assert(ad != NULL);
+  ad->real_sps = ad->sps = sps;
+  ad->real_channels = ad->channels = channels;
+  ad->real_fmt = ad->fmt = fmt;
+  ad->platform_data = (void *) pcm_handle;
+
+  return ad;
+}
+
+int audio_close_alsa(cst_audiodev *ad)
+{
+  int result;
+  snd_pcm_t *pcm_handle;
+
+  if (ad == NULL)
+	return 0;
+
+  pcm_handle = (snd_pcm_t *) ad->platform_data;
+  result = snd_pcm_close(pcm_handle);
+  if (result < 0)
+  {
+	cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result));
+  }
+  cst_free(ad);
+  return result;
+}
+
+/* Returns zero if recovery was successful. */
+static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res)
+{
+  if (res == -EPIPE) /* xrun */
+  {
+	res = snd_pcm_prepare(pcm_handle);
+	if (res < 0) 
+	{
+	  /* Failed to recover from xrun */
+	  cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res));
+	  return res;
+	}
+  } 
+  else if (res == -ESTRPIPE) /* Suspend */
+  {
+	while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) 
+	{
+	  snd_pcm_wait(pcm_handle, 1000);
+	}
+	if (res < 0) 
+	{
+	  res = snd_pcm_prepare(pcm_handle);
+	  if (res <0) 
+	  {
+		/* Resume failed */
+		cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res));
+		return res;
+	  }
+	}
+  } 
+  else if (res < 0) 
+  {
+	/* Unknown failure */
+	cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res));
+	return res;
+  }
+  return 0;
+}
+
+int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes)
+{
+  size_t frame_size;
+  ssize_t num_frames, res;
+  snd_pcm_t *pcm_handle;
+  char *buf = (char *) samples;
+
+  /* Determine frame size in bytes */
+  frame_size  = audio_bps(ad->real_fmt) * ad->real_channels;
+  /* Require that only complete frames are handed in */
+  assert((num_bytes % frame_size) == 0);
+  num_frames = num_bytes / frame_size;
+  pcm_handle = (snd_pcm_t *) ad->platform_data;
+
+  while (num_frames > 0) 
+  {
+	res = snd_pcm_writei(pcm_handle, buf, num_frames);
+	if (res != num_frames) 
+	{
+	  if (res == -EAGAIN || (res > 0 && res < num_frames)) 
+	  {
+		snd_pcm_wait(pcm_handle, 100);
+	  }
+	  else if (recover_from_error(pcm_handle, res) < 0) 
+	  {
+		return -1;
+	  }
+	}
+
+	if (res >0) 
+	{
+	  num_frames -= res;
+	  buf += res * frame_size;
+	}
+  }
+  return num_bytes;
+}
+
+int audio_flush_alsa(cst_audiodev *ad)
+{
+  int result;
+  result = snd_pcm_drain((snd_pcm_t *) ad->platform_data);
+  if (result < 0)
+  {
+	cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
+  }
+	/* Prepare device for more data */
+  result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
+if (result < 0)
+  {
+	cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
+  }
+  return result;
+}
+
+int audio_drain_alsa(cst_audiodev *ad)
+{
+  int result;
+  result = snd_pcm_drop((snd_pcm_t *) ad->platform_data);
+  if (result < 0)
+  {
+	cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
+  }
+/* Prepare device for more data */
+  result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
+if (result < 0)
+  {
+	cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
+  }
+  return result;
+}

flite-1.3-doc_texinfo.patch:

--- NEW FILE flite-1.3-doc_texinfo.patch ---
diff -uNr flite-1.3-release/doc/flite.texi flite-1.3-mod/doc/flite.texi
--- flite-1.3-release/doc/flite.texi	2005-08-14 21:50:02.000000000 +0200
+++ flite-1.3-mod/doc/flite.texi	2006-05-08 12:39:54.000000000 +0200
@@ -711,14 +711,14 @@
 cst_voice *register_cmu_us_kal();
 
 int main(int argc, char **argv)
-{
+@{
     cst_voice *v;
 
     if (argc != 2)
-    {
+    @{
         fprintf(stderr,"usage: flite_test FILE\n");
         exit(-1);
-    }
+    @}
 
     flite_init();
 
@@ -726,7 +726,7 @@
 
     flite_file_to_speech(argv[1],v,"play");
 
-}
+@}
 @end example
 Assuming the shell variable FLITEDIR is set to the flite directory
 the following will compile the system (with appropriate changes for
diff -uNr flite-1.3-release/doc/Makefile flite-1.3-mod/doc/Makefile
--- flite-1.3-release/doc/Makefile	2005-01-04 00:55:33.000000000 +0200
+++ flite-1.3-mod/doc/Makefile	2006-05-08 12:39:45.000000000 +0200
@@ -50,7 +50,7 @@
 flite.html: flite.texi
 	@ if [ ! -d html ] ; \
           then mkdir -p html ; fi
-	(cd html; texi2html -number -split_chapter ../flite.texi)
+	(cd html; texi2html -number -split_chapter ../flite.texi; mv flite/* .; rmdir flite)
 	@ for i in html/*.html ; \
 	  do \
 	    sed 's///' $$i >ttt.html; \

flite-1.3-sharedlibs.patch:

--- NEW FILE flite-1.3-sharedlibs.patch ---
diff -uNr flite-1.3-release/config/common_make_rules flite-1.3-release-mod/config/common_make_rules
--- flite-1.3-release/config/common_make_rules	2004-12-20 00:20:43.000000000 +0200
+++ flite-1.3-release-mod/config/common_make_rules	2006-11-12 12:17:25.000000000 +0200
@@ -59,27 +59,35 @@
 endif
 OBJDIR=$(BUILDDIR)/obj/$(DIRNAME)
 BINDIR=$(BUILDDIR)/bin
+LIBDIR=$(BUILDDIR)/lib
 ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
 BINDIR=$(TOP)/bin
+LIBDIR=$(TOP)/lib
 endif
 
-LIBDIR=$(BUILDDIR)/lib
 BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
 
-FLITELIBS = $(BUILDDIR)/lib/libflite.a
-LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
+ifdef SHFLAGS
+FLITELIBS = $(LIBDIR)/libflite.so
+LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS)
+else
+FLITELIBS = $(LIBDIR)/libflite.a
+LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
+endif
 
 FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
 ifdef SHFLAGS
 SOOBJS = $(OBJS:.o=.os)
-FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
+FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%)
 ifdef LIBNAME
 ALL += $(OBJDIR)/.build_so
 endif
-endif
+else
 ifdef LIBNAME
 ALL += $(OBJDIR)/.build_lib
 endif
+endif
+
 # Only do some directories when you are not cross compiling
 ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
 OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS)
@@ -117,14 +125,14 @@
 	@ touch $(OBJDIR)/.build_so
 
 # Used in the lib/ directory and in building new voices
-$(OBJDIR)/%.so: %.shared.a
+%.so: %.shared.a
 	@ echo making $@
 	@ rm -rf shared_os && mkdir shared_os
-	@ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} 
+	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
 	@ (cd shared_os && ar x ../$<)
-	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-	@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
-	@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
+	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS)))
+	@ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
+	@ ln -s $@.${PROJECT_SHLIB_VERSION} $@
 	@ rm -rf shared_os
 
 $(OBJDIR)/.make_build_dirs:
diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile
--- flite-1.3-release/lib/Makefile	1970-01-01 02:00:00.000000000 +0200
+++ flite-1.3-release-mod/lib/Makefile	2006-11-12 12:17:40.000000000 +0200
@@ -0,0 +1,73 @@
+###########################################################################
+##                                                                       ##
+##                  Language Technologies Institute                      ##
+##                     Carnegie Mellon University                        ##
+##                        Copyright (c) 1999                             ##
+##                        All Rights Reserved.                           ##
+##                                                                       ##
+##  Permission is hereby granted, free of charge, to use and distribute  ##
+##  this software and its documentation without restriction, including   ##
+##  without limitation the rights to use, copy, modify, merge, publish,  ##
+##  distribute, sublicense, and/or sell copies of this work, and to      ##
+##  permit persons to whom this work is furnished to do so, subject to   ##
+##  the following conditions:                                            ##
+##   1. The code must retain the above copyright notice, this list of    ##
+##      conditions and the following disclaimer.                         ##
+##   2. Any modifications must be clearly marked as such.                ##
+##   3. Original authors' names are not deleted.                         ##
+##   4. The authors' names are not used to endorse or promote products   ##
+##      derived from this software without specific prior written        ##
+##      permission.                                                      ##
+##                                                                       ##
+##  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         ##
+##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
+##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
+##  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      ##
+##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
+##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
+##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
+##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
+##  THIS SOFTWARE.                                                       ##
+##                                                                       ##
+###########################################################################
+##                                                                       ##
+##    FLITE libraries                                                    ##
+##                                                                       ##
+###########################################################################
+TOP=..
+DIRNAME=lib
+BUILD_DIRS = 
+ALL_DIRS=
+FILES = Makefile
+LIBNAMES = flite flite_cmulex flite_usenglish \
+           flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb
+
+STATICLIBS= $(LIBNAMES:%=lib%.a)
+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
+#SHAREDLIBS = $(LIBNAMES:%=lib%.so)
+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
+                    $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
+ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
+
+ALL = shared_libs
+
+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
+
+include $(TOP)/config/common_make_rules
+
+ifdef SHFLAGS
+shared_libs: $(SHAREDLIBS)
+libflite_LDLIBS = -lm $(AUDIOLIBS)
+libflite_cmulex_LDLIBS = -lflite
+libflite_usenglish_LDLIBS = -lflite
+libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish
+libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish
+libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
+else
+shared_libs: nothing
+endif
+
+install:
+	@ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
+
diff -uNr flite-1.3-release/main/Makefile flite-1.3-release-mod/main/Makefile
--- flite-1.3-release/main/Makefile	2005-08-08 00:38:42.000000000 +0200
+++ flite-1.3-release-mod/main/Makefile	2006-11-12 11:44:46.000000000 +0200
@@ -50,11 +50,11 @@
 
 flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX) 
 flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
-flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
+flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so)
 
 flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX)
 flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
-flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
+flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so)
 
 include $(TOP)/config/common_make_rules
 
diff -uNr flite-1.3-release/Makefile flite-1.3-release-mod/Makefile
--- flite-1.3-release/Makefile	2005-11-01 15:40:45.000000000 +0200
+++ flite-1.3-release-mod/Makefile	2006-11-12 11:44:46.000000000 +0200
@@ -41,7 +41,7 @@
 ###########################################################################
 TOP=.
 DIRNAME=
-BUILD_DIRS = include src lang doc
+BUILD_DIRS = include src lang lib doc
 ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main
 CONFIG=configure configure.in config.sub config.guess \
        missing install-sh mkinstalldirs


--- NEW FILE flite.spec ---
Name:           flite
Version:        1.3
Release:        8%{?dist}
Summary:        Small, fast speech synthesis engine (text-to-speech)

Group:          Applications/Multimedia
License:        BSD-style
URL:            http://fife.speech.cs.cmu.edu/flite/
Source0:        http://fife.speech.cs.cmu.edu/flite/packed/%{name}-%{version}/%{name}-%{version}-release.tar.gz
Source1:        README-ALSA.txt
Patch0:         flite-1.3-sharedlibs.patch
Patch1:         flite-1.3-doc_texinfo.patch
Patch2:         flite-1.3-alsa_support.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  texi2html ed alsa-lib-devel autoconf


%description
Flite (festival-lite) is a small, fast run-time speech synthesis engine
developed at CMU and primarily designed for small embedded machines and/or
large servers. Flite is designed as an alternative synthesis engine to
Festival for voices built using the FestVox suite of voice building tools.


%package devel
Summary: Development files for flite
Group: Development/Libraries
Requires: flite = %{version}-%{release}


%description devel
Development files for Flite, a small, fast speech synthesis engine.


%prep
%setup -q -n %{name}-%{version}-release
%patch0 -p1 -b .flite-1.3-sharedlibs
%patch1 -p1 -b .flite-1.3-doc_texinfo
%patch2 -p1 -b .flite-1.3-alsa_support
cp -p %{SOURCE1} .


%build
autoconf
%configure --enable-shared --with-audio=alsa
# This package fails parallel make (thus cannot be built using "_smp_flags")
make
# Build documentation
cd doc
make flite.html


%install
rm -rf %{buildroot}
make install INSTALLBINDIR=%{buildroot}%{_bindir} INSTALLLIBDIR=%{buildroot}%{_libdir}  INSTALLINCDIR=%{buildroot}%{_includedir}/flite


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig


%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ACKNOWLEDGEMENTS README COPYING doc/html README-ALSA.txt
%{_libdir}/*.so.*
%{_bindir}/*


%files devel
%defattr(-,root,root)
%{_libdir}/*.so
%{_includedir}/flite


%changelog
* Tue Nov 14 2006 Francois Aucamp  - 1.3-8
- Added comment to %%build stating why "_smp_flags" isn't used with make

* Mon Nov 13 2006 Francois Aucamp  - 1.3-7
- Modified alsa support patch file to patch "configure.in" instead of "configure"
- Added "autoconf" step to %%build
- Added BuildRequires: autoconf
- Fixed patch backup file suffixes
- Renamed patch files to a more standard format
- Moved header files from /usr/include to /usr/include/flite
- Added -p option to all cp operations (to preserve timestamps)

* Sun Nov 12 2006 Francois Aucamp  - 1.3-6
- Recreated patch to allow shared libraries to build correctly (sharedlibs.patch)
- "flite" and "flite_time" binaries now link to flite shared libraries (sharedlibs.patch)
- Simplified the documentation patch filename
- Modified patch steps in %%prep to create backup files with different suffixes
- Removed "_smp_flags" macro from %%build for all archs

* Fri Oct 20 2006 Francois Aucamp  - 1.3-5
- Modified "build" so that "_smp_flags" is only used for i386 arch

* Mon Oct 10 2006 Francois Aucamp  - 1.3-4
- Removed "_smp_flags" macro from "build" for x86_64 arch

* Tue Sep 26 2006 Francois Aucamp  - 1.3-3
- Added README-ALSA.txt (Source1)
- Removed subpackage: flite-devel-static
- Modified shared libraries patch (Patch0) to prevent building static libraries
- Renamed patch files: Patch0, Patch1

* Tue Sep 26 2006 Francois Aucamp  - 1.3-2
- Added flite 1.3 ALSA patch (Patch2) by Lukas Loehrer - thanks Anthony Green for pointing it out
- Added configure option: --with-audio=alsa
- Added BuildRequires: alsa-lib-devel

* Fri Sep 22 2006 Francois Aucamp  - 1.3-1
- Initial RPM build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 13:01:16 -0000	1.1
+++ .cvsignore	14 Nov 2006 13:07:50 -0000	1.2
@@ -0,0 +1 @@
+flite-1.3-release.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 13:01:16 -0000	1.1
+++ sources	14 Nov 2006 13:07:50 -0000	1.2
@@ -0,0 +1 @@
+ae0aca1cb7b4801f4372f3a75a9e52b5  flite-1.3-release.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 13:08:19 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 14 Nov 2006 06:08:19 -0700
Subject: rpms/flite import.log,1.1,1.2
Message-ID: <200611141308.kAED8Jg0011087@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/flite
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11008

Modified Files:
	import.log 
Log Message:
auto-import flite-1.3-8 on branch devel from flite-1.3-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/flite/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 13:01:08 -0000	1.1
+++ import.log	14 Nov 2006 13:07:49 -0000	1.2
@@ -0,0 +1 @@
+flite-1_3-8:HEAD:flite-1.3-8.src.rpm:1163509867



From fedora-extras-commits at redhat.com  Tue Nov 14 13:09:22 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Tue, 14 Nov 2006 06:09:22 -0700
Subject: rpms/knetworkmanager/devel .cvsignore, 1.4,
	1.5 knetworkmanager-dbus.patch, 1.1, 1.2 knetworkmanager.spec,
	1.4, 1.5 sources, 1.4, 1.5 01-build-fix.patch, 1.1,
	NONE knetworkmanager-call-scn-not-yast.patch, 1.1, NONE
Message-ID: <200611141309.kAED9MtO011155@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/knetworkmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10989

Modified Files:
	.cvsignore knetworkmanager-dbus.patch knetworkmanager.spec 
	sources 
Removed Files:
	01-build-fix.patch knetworkmanager-call-scn-not-yast.patch 
Log Message:
update to new svn snapshot.  remove  un needed patches change dialup to use
kppp instead of system-config-network



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Sep 2006 12:38:08 -0000	1.4
+++ .cvsignore	14 Nov 2006 13:08:52 -0000	1.5
@@ -1 +1 @@
-knetworkmanager-svn20060912.tar.bz2
+knetworkmanager-svn20061113.tar.bz2

knetworkmanager-dbus.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 knetworkmanager-dbus.patch
Index: knetworkmanager-dbus.patch
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- knetworkmanager-dbus.patch	11 Aug 2006 02:22:31 -0000	1.1
+++ knetworkmanager-dbus.patch	14 Nov 2006 13:08:52 -0000	1.2
@@ -1,20 +1,1477 @@
 diff -Nur knetworkmanager-orig/knetworkmanager/configure.in.in knetworkmanager/knetworkmanager/configure.in.in
---- knetworkmanager-orig/knetworkmanager/configure.in.in	2006-03-30 05:26:31.000000000 -0600
-+++ knetworkmanager/knetworkmanager/configure.in.in	2006-08-10 20:30:08.000000000 -0500
-@@ -36,10 +36,6 @@
-   CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
--  AC_CHECK_HEADER([dbus/connection.h],,[
--     AC_MSG_WARN([You need D-BUS/Qt3 bindings])
--     DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
--  ])
-   CPPFLAGS=$safe_CPPFLAGS
-   AC_LANG_RESTORE
+--- knetworkmanager-orig/knetworkmanager/configure.in.in	2006-09-22 08:29:20.000000000 -0500
++++ knetworkmanager/knetworkmanager/configure.in.in	2006-11-13 22:17:18.000000000 -0600
+@@ -7,9 +7,6 @@
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION, $KNETWORKMANAGER_VERSION, [KNetworkManager Version])
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION_STRING, "$KNETWORKMANAGER_VERSION", [KNetworkManager Version String])
  
+-# Check for D-Bus and HAL
+-
+-AC_MSG_CHECKING(for D-BUS)
+ 
+ # test if variables are already set
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+@@ -40,10 +37,6 @@
+ CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+-AC_CHECK_HEADER([dbus/connection.h],,[
+-	AC_MSG_WARN([You need D-Bus/Qt3 bindings])
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager"
+-])
+ CPPFLAGS=$safe_CPPFLAGS
+ AC_LANG_RESTORE
+ 
+@@ -51,6 +44,7 @@
+ AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse]))
+ if test "x$with_distro" = "x"; then
+ 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
++	AC_CHECK_FILE(/etc/fedora-release,with_distro="fedora")
+ 	if test "x$with_distro" = "x"; then
+ 		with_distro=`lsb_release -is`
+ 	fi
+@@ -65,7 +59,10 @@
+ 		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.)"
+ 			;;
+ 	esac
+diff -Nur knetworkmanager-orig/knetworkmanager/Makefile.in knetworkmanager/knetworkmanager/Makefile.in
+--- knetworkmanager-orig/knetworkmanager/Makefile.in	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/knetworkmanager/Makefile.in	2006-11-13 22:14:46.000000000 -0600
+@@ -0,0 +1,751 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision$ 
++# @configure_input@
++
++# 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.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++subdir = knetworkmanager
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++	AUTHORS COPYING ChangeLog INSTALL NEWS TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
++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)$(dbusservicedir)"
++dbusserviceDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(dbusservice_DATA)
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTSCCONFIG = @ARTSCCONFIG@
++AUTOCONF = @AUTOCONF@
++AUTODIRS = @AUTODIRS@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CONF_FILES = @CONF_FILES@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DBUS_SYS_DIR = @DBUS_SYS_DIR@
++DCOPIDL = @DCOPIDL@
++DCOPIDL2CPP = @DCOPIDL2CPP@
++DCOPIDLNG = @DCOPIDLNG@
++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
++GMSGFMT = @GMSGFMT@
++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
++KCONFIG_COMPILER = @KCONFIG_COMPILER@
++KDECONFIG = @KDECONFIG@
++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
[...10899 lines suppressed...]
++
++
++install-data-local:
++	@echo ""
++	@echo ""
++	@echo "*************** Important *************************"
++	@echo ""
++	@echo "This module contains unreleased software."
++	@echo ""
++	@echo "The software may compile and work, but it may just"
++	@echo "as well neither compile nor work."
++	@echo ""
++	@echo "****************************************************"
++	@echo ""
++
++dist-hook:
++	cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
++apidox-am-yes:
++	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
++		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++	fi ; \
++	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++	test -d $(top_builddir)/apidocs || \
++		( cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--no-modulename --installdir=$(kde_libs_htmldir)/en \
++		--no-recurse $(abs_top_srcdir) . ) ; \
++	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \
++		$$abs_top_srcdir $(subdir)
++
++apidox-am-toplevel-yes:
++	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \
++		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
++	fi ; \
++	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
++	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
++		--no-modulename --installdir=$(kde_libs_htmldir)/en \
++		$$abs_top_srcdir
++
++apidox-am-no:
++
++apidox-am-toplevel-no:
++
++apidox:
++	@if test "$(subdir)" != "."; then \
++		$(MAKE) apidox-am- at KDE_HAS_DOXYGEN@ ;\
++	else \
++		$(MAKE) apidox-am-toplevel- at KDE_HAS_DOXYGEN@ ;\
++	fi
++
++install-data-local: install-apidox
++
++install-apidox:
++	@if test "$(subdir)" != "."; then \
++		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html ; \
++		if test -f $(top_builddir)/apidocs/$(subdir)/$(subdir).tag; then \
++		echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/$(subdir).tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		fi; \
++		if test -d $(top_builddir)/apidocs/$(subdir)/html; then \
++			list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \
++			echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\
++			for file in $$list; do \
++				$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
++		done; \
++		fi; \
++	else\
++		if test -d $(top_builddir)/apidocs; then \
++		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
++		list=`cd $(top_builddir)/apidocs && ls -1`; \
++		echo "installing $(top_builddir)/apidocs/$$file" ;\
++		echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \
++		for file in $$list; do \
++			if test -f $(top_builddir)/apidocs/$$file; then \
++				$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
++			fi; \
++		done ; fi; \
++	fi
++
++uninstall-local: uninstall-apidox
++
++uninstall-apidox:
++	@if test "$(subdir)" != "."; then \
++		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
++			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
++		fi \
++	else \
++		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
++			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
++		fi \
++	fi
++
++install-apidox-recurse: install-apidox
++	@set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
++	    list='$(SUBDIRS)'; \
++	    for subdir in $$list; do \
++		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \
++		echo "Installing apidox from $$subdir"; \
++		if test "$$subdir" != "."; then \
++			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \
++		fi ; fi ;\
++	    done; \
++	fi
++
++.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
++
++# Local Variables:
++# mode: makefile
++# End:
++$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
++
++$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure_in
++
++$(top_srcdir)/configure.files: $(top_srcdir)/subdirs $(CONF_FILES)
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh configure.files $(top_srcdir)/admin/cvs.sh
++
++$(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am
++
++$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh
++	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs
++
++# defining default rules for files that may not be present
++$(top_srcdir)/Makefile.am.in:
++$(CONF_FILES):
++# 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.
++.NOEXPORT:
++
++#>+ 2
++KDE_DIST=knetworkmanager.lang.dbus subdirs Makefile.in knetworkmanager.lang INDEX configure.files config.h.in Makefile.am.dbus configure.in Makefile.cvs aclocal.m4 subdirs.dbus stamp-h1.dbus configure.in.in acinclude.m4 Makefile.am configure libtool.dbus Makefile.am.in 
++
++#>+ 2
++docs-am:
++
++#>+ 7
++force-reedit:
++	 \
++	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++	
++	cd $(top_srcdir) && perl admin/am_edit Makefile.in
++
++
++#>+ 21
++clean-bcheck: 
++	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
++
++bcheck: bcheck-recursive
++
++bcheck-am:
++	@for i in ; do \
++	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
++	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
++	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
++	        echo "$$i"; \
++	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++	            rm -f $$i.bchecktest.cc; exit 1; \
++	        fi ; \
++	        echo "" >> $$i.bchecktest.cc.class; \
++	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
++	        rm -f a.out; \
++	    fi ; \
++	done
++
++
++#>+ 3
++final:
++	$(MAKE) all-am
++
++#>+ 3
++final-install:
++	$(MAKE) install-am
++
++#>+ 3
++no-final:
++	$(MAKE) all-am
++
++#>+ 3
++no-final-install:
++	$(MAKE) install-am
++
++#>+ 3
++kde-rpo-clean:
++	-rm -f *.rpo
++
++#>+ 3
++nmcheck: 
++nmcheck-am: nmcheck
+diff -Nur knetworkmanager-orig/stamp-h1 knetworkmanager/stamp-h1
+--- knetworkmanager-orig/stamp-h1	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/stamp-h1	2006-11-13 22:14:28.000000000 -0600
+@@ -0,0 +1 @@
++timestamp for config.h
+diff -Nur knetworkmanager-orig/subdirs knetworkmanager/subdirs
+--- knetworkmanager-orig/subdirs	1969-12-31 18:00:00.000000000 -0600
++++ knetworkmanager/subdirs	2006-11-13 22:14:28.000000000 -0600
+@@ -0,0 +1 @@
++knetworkmanager


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- knetworkmanager.spec	13 Sep 2006 12:38:08 -0000	1.4
+++ knetworkmanager.spec	14 Nov 2006 13:08:52 -0000	1.5
@@ -1,8 +1,8 @@
-%define		svn svn20060912
+%define		svn svn20061113
 
 Name:           knetworkmanager
 Version:        0.1
-Release:        0.1.%{svn}%{?dist}
+Release:        0.5.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -11,14 +11,8 @@
 Source0:        knetworkmanager-%{svn}.tar.bz2
 #script to make svn tarball
 Source1:	knetworkmanager-svn_checkout.sh
-# Patch Is required because SuSE have a broken kdepim-devel that exports non standard headers 
-# they also hard code the /opt/kde3/include path in there. the patch adds the needed header 
-# file and fixes the path
-Patch0:		http://aur.archlinux.org/packages/knetworkmanager-svn/knetworkmanager-svn/01-build-fix.patch
-# Suse Hard coded yast for dialup configuration. this patch calls System-config-network instead
-Patch1:		knetworkmanager-call-scn-not-yast.patch
 # Patch adds dbus support  as dbusqt3 is no longer in extras
-Patch2:		knetworkmanager-dbus.patch
+Patch0:		knetworkmanager-dbus.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,9 +25,7 @@
 
 %prep
 %setup -q -n knetworkmanager
-%patch0 -p0 
-%patch1 -p1 -b .eww-yast
-%patch2 -p1 -b .dbus
+%patch0 -p1 -b .dbus
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -54,7 +46,6 @@
 --remove-category=Network \
 --add-category=Applications \
 --add-category=System \
---add-category=X-Fedora \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop
 
@@ -93,6 +84,12 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.5.svn20061113
+- messed up check in :(
+
+* Tue Nov 14 2006 Dennis Gilmore  - 0.1-0.4.svn20061113
+- update to new svn snapshot  change dialup networking to call kppp
+
 * Wed Sep 13 2006 Dennis Gilmore  - 0.1-0.4.svn20060912
 - add BR on wireless-tools-devel update snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Sep 2006 12:38:08 -0000	1.4
+++ sources	14 Nov 2006 13:08:52 -0000	1.5
@@ -1 +1 @@
-8e189f0799aa3927a363c6c0c585613d  knetworkmanager-svn20060912.tar.bz2
+e7ecf02d0d9011dab93b665d8d3b28f6  knetworkmanager-svn20061113.tar.bz2


--- 01-build-fix.patch DELETED ---


--- knetworkmanager-call-scn-not-yast.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 13:17:58 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 06:17:58 -0700
Subject: rpms/listen/devel listen.spec,1.16,1.17 sources,1.3,1.4
Message-ID: <200611141317.kAEDHwLx011324@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11296

Modified Files:
	listen.spec sources 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- listen.spec	14 Nov 2006 12:26:16 -0000	1.16
+++ listen.spec	14 Nov 2006 13:17:28 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}
+Release:        9.beta1%{?dist}.1
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:30:30 -0000	1.3
+++ sources	14 Nov 2006 13:17:28 -0000	1.4
@@ -1,5 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-e72064d64d4611ea539878219ebfad22  Makefile.patch
 7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
 fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
 98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
+46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 13:22:01 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 06:22:01 -0700
Subject: rpms/listen/FC-6 listen.spec,1.16,1.17 sources,1.3,1.4
Message-ID: <200611141322.kAEDM1Jw011432@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11414

Modified Files:
	listen.spec sources 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/listen.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- listen.spec	14 Nov 2006 12:25:00 -0000	1.16
+++ listen.spec	14 Nov 2006 13:21:31 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}
+Release:        9.beta1%{?dist}.1
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:30:29 -0000	1.3
+++ sources	14 Nov 2006 13:21:31 -0000	1.4
@@ -1,5 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-e72064d64d4611ea539878219ebfad22  Makefile.patch
 7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
 fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
 98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
+46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 13:23:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 06:23:48 -0700
Subject: rpms/listen/FC-5 listen.spec,1.16,1.17 sources,1.3,1.4
Message-ID: <200611141323.kAEDNmU1011504@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11481

Modified Files:
	listen.spec sources 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- listen.spec	14 Nov 2006 12:26:15 -0000	1.16
+++ listen.spec	14 Nov 2006 13:23:18 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}
+Release:        9.beta1%{?dist}.1
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:30:29 -0000	1.3
+++ sources	14 Nov 2006 13:23:18 -0000	1.4
@@ -1,5 +1,5 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-e72064d64d4611ea539878219ebfad22  Makefile.patch
 7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
 fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
 98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
+46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 13:44:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 14 Nov 2006 06:44:08 -0700
Subject: rpms/maxima/FC-5 maxima.spec,1.31,1.32
Message-ID: <200611141344.kAEDi8T2011700@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11682

Modified Files:
	maxima.spec 
Log Message:
* Fri Nov 10 2006 Rex Dieter  5.10.0-8
- omit sbcl-disable-debugger patch (#214568)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- maxima.spec	8 Nov 2006 15:35:40 -0000	1.31
+++ maxima.spec	14 Nov 2006 13:43:37 -0000	1.32
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -181,7 +181,7 @@
 
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
-%patch3 -p1 -b .sbcl-disable-debugger
+#patch3 -p1 -b .sbcl-disable-debugger
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -385,6 +385,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter  5.10.0-8
+- omit sbcl-disable-debugger patch (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  5.10.0-7
 - respin for sbcl-0.9.18
 - fixup %%triggerun's



From fedora-extras-commits at redhat.com  Tue Nov 14 13:51:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 14 Nov 2006 06:51:28 -0700
Subject: rpms/jd/devel .cvsignore, 1.16, 1.17 jd.spec, 1.23, 1.24 sources,
	1.16, 1.17
Message-ID: <200611141351.kAEDpSum011805@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11785

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
- 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 Nov 2006 12:58:24 -0000	1.16
+++ .cvsignore	14 Nov 2006 13:50:57 -0000	1.17
@@ -1 +1 @@
-jd-1.8.0-cvs061112.tgz
+jd-1.8.0-061114.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jd.spec	13 Nov 2006 12:58:24 -0000	1.23
+++ jd.spec	14 Nov 2006 13:50:58 -0000	1.24
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        cvs061112
-%define         repoid        22637
+%define         strtag        061114
+%define         repoid        22722
 
 
 # Defined by vendor
 #
-%define         vendor_rel    6
+%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}
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Nov 13 2006 Mamoru Tasaka  - 1.8.0-0.6.cvs061112
-- cvs 061112 (23:59 JST)
+* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
+- 1.8.0
 
 * Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
 - 1.8.0 rc 061108


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Nov 2006 12:58:24 -0000	1.16
+++ sources	14 Nov 2006 13:50:58 -0000	1.17
@@ -1 +1 @@
-6fbae78257a68148a160b508b8f80d7a  jd-1.8.0-cvs061112.tgz
+1dc9ecba8d7430af27ed461155eb6708  jd-1.8.0-061114.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 13:53:20 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 14 Nov 2006 06:53:20 -0700
Subject: rpms/jd/FC-6 .cvsignore, 1.9, 1.10 jd.spec, 1.10, 1.11 sources, 1.9,
	1.10
Message-ID: <200611141353.kAEDrKpv011879@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11853

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
- 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Nov 2006 15:25:57 -0000	1.9
+++ .cvsignore	14 Nov 2006 13:52:50 -0000	1.10
@@ -1 +1 @@
-jd-1.8.0-rc061108.tgz
+jd-1.8.0-061114.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/jd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jd.spec	8 Nov 2006 15:25:57 -0000	1.10
+++ jd.spec	14 Nov 2006 13:52:50 -0000	1.11
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        rc061108
-%define         repoid        22637
+%define         strtag        061114
+%define         repoid        22722
 
 
 # Defined by vendor
 #
-%define         vendor_rel    5
+%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}
@@ -43,8 +43,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
+- 1.8.0
+
 * Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
 - 1.8.0 rc 061108
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Nov 2006 15:25:57 -0000	1.9
+++ sources	14 Nov 2006 13:52:50 -0000	1.10
@@ -1 +1 @@
-1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz
+1dc9ecba8d7430af27ed461155eb6708  jd-1.8.0-061114.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 13:55:07 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 14 Nov 2006 06:55:07 -0700
Subject: rpms/jd/FC-5 .cvsignore,1.8,1.9 jd.spec,1.9,1.10 sources,1.8,1.9
Message-ID: <200611141355.kAEDt7Fn011953@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11933

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
- 1.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Nov 2006 15:31:31 -0000	1.8
+++ .cvsignore	14 Nov 2006 13:54:36 -0000	1.9
@@ -1 +1 @@
-jd-1.8.0-rc061108.tgz
+jd-1.8.0-061114.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/jd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jd.spec	8 Nov 2006 15:31:31 -0000	1.9
+++ jd.spec	14 Nov 2006 13:54:36 -0000	1.10
@@ -10,13 +10,13 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.0
-%define         strtag        rc061108
-%define         repoid        22637
+%define         strtag        061114
+%define         repoid        22722
 
 
 # Defined by vendor
 #
-%define         vendor_rel    5
+%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}
@@ -43,8 +43,8 @@
 Group:          Applications/Internet
 License:        GPL
 URL:            http://jd4linux.sourceforge.jp/
-Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
-#Source0:	%{name}-%{main_ver}-%{strtag}.tgz
+#Source0:        http://osdn.dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
+Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
+- 1.8.0
+
 * Wed Nov  8 2006 Mamoru Tasaka  - 1.8.0-0.5.rc061108
 - 1.8.0 rc 061108
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Nov 2006 15:31:31 -0000	1.8
+++ sources	14 Nov 2006 13:54:36 -0000	1.9
@@ -1 +1 @@
-1f2d616935b25598a8f8eb6218dff34f  jd-1.8.0-rc061108.tgz
+1dc9ecba8d7430af27ed461155eb6708  jd-1.8.0-061114.tgz



From fedora-extras-commits at redhat.com  Tue Nov 14 13:57:35 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Nov 2006 06:57:35 -0700
Subject: rpms/gtk-gnutella/FC-5 gtk-gnutella.spec,1.12,1.13
Message-ID: <200611141357.kAEDvZbA012043@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-5/gtk-gnutella.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gtk-gnutella.spec	13 Nov 2006 18:28:10 -0000	1.12
+++ gtk-gnutella.spec	14 Nov 2006 13:57:05 -0000	1.13
@@ -2,19 +2,25 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
 Version: 0.96.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
 BuildRequires: libxml2-devel, byacc, groff, gettext
+
+BuildRequires: gnutls-devel >= 1.0.16
+#comment out for now, it is experimental stuff...
+#BuildRequires: sqlite-devel >= 3.3.0
+
 BuildRequires: desktop-file-utils >= 0.2.90
 
 
@@ -33,7 +39,7 @@
 
 %build
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
-	-Dglibpth="%{_lib} %{_libdir}" \
+	-Dglibpth="/%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
 	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
@@ -82,6 +88,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dmitry Butskoy  - 0.96.3-2
+- switch GNU TLS support on
+
 * Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
 - update to 0.96.3
 - specify libdirs explicitly for Configure script (needed for x86_64)



From fedora-extras-commits at redhat.com  Tue Nov 14 13:59:28 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Nov 2006 06:59:28 -0700
Subject: rpms/gtk-gnutella/FC-6 gtk-gnutella.spec,1.10,1.11
Message-ID: <200611141359.kAEDxSJA012116@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12100

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-6/gtk-gnutella.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-gnutella.spec	13 Nov 2006 17:04:49 -0000	1.10
+++ gtk-gnutella.spec	14 Nov 2006 13:58:58 -0000	1.11
@@ -2,19 +2,25 @@
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
 Version: 0.96.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
 BuildRequires: libxml2-devel, byacc, groff, gettext
+
+BuildRequires: gnutls-devel >= 1.0.16
+#comment out for now, it is experimental stuff...
+#BuildRequires: sqlite-devel >= 3.3.0
+
 BuildRequires: desktop-file-utils >= 0.2.90
 
 
@@ -33,8 +39,9 @@
 
 %build
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
+	-Dglibpth="/%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
-	-Dccflags="$RPM_OPT_FLAGS -Wall" -Dcc=gcc -Doptimize="-O2" \
+	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
 	-Dofficial=true -ders
 make %{?_smp_mflags}
@@ -81,8 +88,12 @@
 
 
 %changelog
+* Tue Nov 14 2006 Dmitry Butskoy  - 0.96.3-2
+- switch GNU TLS support on
+
 * Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
 - update to 0.96.3
+- specify libdirs explicitly for Configure script (needed for x86_64)
 
 * Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
 - update to 0.96.2



From fedora-extras-commits at redhat.com  Tue Nov 14 14:14:05 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 07:14:05 -0700
Subject: rpms/listen/devel .cvsignore, 1.3, 1.4 listen.spec, 1.17,
	1.18 sources, 1.4, 1.5
Message-ID: <200611141414.kAEEE5ur015340@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15320

Modified Files:
	.cvsignore listen.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:30:30 -0000	1.3
+++ .cvsignore	14 Nov 2006 14:13:35 -0000	1.4
@@ -1,5 +1 @@
 listen-0.5b1.tar.gz
-Makefile.patch
-const.py.patch
-check.py.patch
-dialog.py.patch


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- listen.spec	14 Nov 2006 13:17:28 -0000	1.17
+++ listen.spec	14 Nov 2006 14:13:35 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.1
+Release:        9.beta1%{?dist}.2
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2006 13:17:28 -0000	1.4
+++ sources	14 Nov 2006 14:13:35 -0000	1.5
@@ -1,5 +1 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
-fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
-98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
-46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 14:17:37 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 07:17:37 -0700
Subject: rpms/listen/devel Makefile.patch, NONE, 1.1 check.py.patch, NONE,
	1.1 const.py.patch, NONE, 1.1 dialog.py.patch, NONE, 1.1
Message-ID: <200611141417.kAEEHbQL015423@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15409

Added Files:
	Makefile.patch check.py.patch const.py.patch dialog.py.patch 
Log Message:


Makefile.patch:

--- NEW FILE Makefile.patch ---
--- Makefile.old	2006-11-14 15:03:27.000000000 +0100
+++ Makefile	2006-11-14 15:03:08.000000000 +0100
@@ -2,11 +2,12 @@
 
 PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
 PREFIX ?= /usr
+LIB ?= /lib
 
 GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
 
 all: check mmkeys.so po-data
-	docbook2x-man listen.1.docbook
+	db2x_docbook2man listen.1.docbook
 	@echo "Done"
 	@echo "Type: make install now"
 
@@ -19,7 +20,7 @@
 
 daap.py:
 	cd daap && python ./setup.py build  && cd ..
-	cp daap/build/lib.*/* src/ -rf
+	cp daap/build$(LIB).*/* src/ -rf
 
 mmkeys.so:
 	cd mmkeys && make mmkeys.so && cd ..
@@ -40,29 +41,29 @@
 
 make-install-dirs: make-install-dirs-po
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/formats
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/source
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/library
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/widget
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	mkdir -p $(DESTDIR)$(PREFIX)/share/listen/img/source
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 
 make-install-dirs-po:
-	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES; done
+	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES; done
 
 install: make-install-dirs install-po
 	echo "DATA_DIR = \"$(PREFIX)/share/listen\"" > dists.py
-	install -m 644 dists.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/*.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)/lib/listen/formats
-	install -m 644 src/source/* $(DESTDIR)$(PREFIX)/lib/listen/source
-	install -m 644 src/library/* $(DESTDIR)$(PREFIX)/lib/listen/library
-	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)/lib/listen/widget
+	install -m 644 dists.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/*.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	install -m 644 src/source/* $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	install -m 644 src/library/* $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	install -m 755 data/*.glade $(DESTDIR)$(PREFIX)/share/listen/
 	install -m 755 data/img/*.png $(DESTDIR)$(PREFIX)/share/listen/img
 	install -m 755 data/img/source/*.png $(DESTDIR)$(PREFIX)/share/listen/img/source
@@ -70,11 +71,11 @@
 	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
 	
 	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
-	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
+	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)$(LIB)/listen/listen.py "$$@"'>listen ;
 	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
 
 install-po:
-	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES/; done
+	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p src/po/$$lang/LC_MESSAGES/ ;done

check.py.patch:

--- NEW FILE check.py.patch ---
--- ./check.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./check.py	        2006-11-13 19:22:43.000000000 +0100
@@ -56,7 +56,7 @@
     print "Checking for mutagen:",
     try: 
          import mutagen
-	 if float(mutagen.version_string) < 1.6:
+	 if float(mutagen.version_string[0:3]) < 1.6:
 		raise ImportError
     except ImportError:
         raise SystemExit("not found\n%s require mutagen >= 1.6.\n"

const.py.patch:

--- NEW FILE const.py.patch ---
--- ./src/const.py.old	2006-11-13 20:04:40.000000000 +0100
+++ ./src/const.py	2006-11-13 20:04:49.000000000 +0100
@@ -32,7 +32,7 @@
 
 APPNAME = "Music Player Listen"
 GETTEXT_APP="listen"
-GETTEXT_DIR = "po"
+GETTEXT_DIR = "/usr/share/locale"
 
 if True:
     CONFIG_DIR  = os.path.expanduser("~/.listen-test/")

dialog.py.patch:

--- NEW FILE dialog.py.patch ---
--- ./src/widget/dialog.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./src/widget/dialog.py	2006-11-13 19:59:34.000000000 +0100
@@ -326,5 +326,6 @@
         self.set_translator_credits(const.TRANSLATORS)
         self.set_version(const.VERSION)
         self.set_logo(gtk.gdk.pixbuf_new_from_file(const.PIXMAP_DIR+"listen_big.png"))
-        self.show_all()
-        
\ Pas de fin de ligne ?? la fin du fichier.
+        self.run()
+        self.destroy()
+        



From fedora-extras-commits at redhat.com  Tue Nov 14 14:27:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 07:27:23 -0700
Subject: rpms/listen/devel Makefile.patch,1.1,1.2
Message-ID: <200611141427.kAEERNxr015569@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15550

Modified Files:
	Makefile.patch 
Log Message:


Makefile.patch:

Index: Makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.patch	14 Nov 2006 14:17:37 -0000	1.1
+++ Makefile.patch	14 Nov 2006 14:26:52 -0000	1.2
@@ -1,5 +1,5 @@
---- Makefile.old	2006-11-14 15:03:27.000000000 +0100
-+++ Makefile	2006-11-14 15:03:08.000000000 +0100
+--- ./Makefile.old	2006-11-14 15:03:27.000000000 +0100
++++ ./Makefile	2006-11-14 15:03:08.000000000 +0100
 @@ -2,11 +2,12 @@
  
  PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl



From fedora-extras-commits at redhat.com  Tue Nov 14 14:57:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 14 Nov 2006 07:57:38 -0700
Subject: rpms/maxima/FC-6 maxima.spec,1.43,1.44
Message-ID: <200611141457.kAEEvcnI015808@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15789

Modified Files:
	maxima.spec 
Log Message:
* Fri Nov 10 2006 Rex Dieter  5.10.0-8
- omit sbcl-disable-debugger patch (#214568)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/maxima.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- maxima.spec	8 Nov 2006 15:08:45 -0000	1.43
+++ maxima.spec	14 Nov 2006 14:57:08 -0000	1.44
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -181,7 +181,7 @@
 
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
-%patch3 -p1 -b .sbcl-disable-debugger
+#patch3 -p1 -b .sbcl-disable-debugger
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -385,6 +385,9 @@
 
 
 %changelog
+* Fri Nov 10 2006 Rex Dieter  5.10.0-8
+- omit sbcl-disable-debugger patch (#214568)
+
 * Thu Oct 26 2006 Rex Dieter  5.10.0-7
 - respin for sbcl-0.9.18
 - fixup %%triggerun's



From fedora-extras-commits at redhat.com  Tue Nov 14 15:15:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 08:15:15 -0700
Subject: rpms/listen/devel listen.spec,1.18,1.19
Message-ID: <200611141515.kAEFFFQk019141@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- listen.spec	14 Nov 2006 14:13:35 -0000	1.18
+++ listen.spec	14 Nov 2006 15:14:44 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.2
+Release:        9.beta1%{?dist}.3
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -94,7 +94,7 @@
 %patch3 -p1
 %ifarch x86_64
 # correct path issue on x86_64 box
-%{__sed} -i 's/\/lib/\/lib64/' Makefile
+%{__sed} -i 's/= \/lib/= \/lib64/' Makefile
 %endif
 
 %build



From fedora-extras-commits at redhat.com  Tue Nov 14 15:23:49 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:23:49 -0700
Subject: rpms/gpsim/devel .cvsignore, 1.3, 1.4 gpsim.spec, 1.11, 1.12 sources,
	1.3, 1.4
Message-ID: <200611141523.kAEFNnX5019281@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19261

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:39 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:23:19 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gpsim.spec	4 Oct 2006 22:19:01 -0000	1.11
+++ gpsim.spec	14 Nov 2006 15:23:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	9%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -8,8 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.happy_gcc
-Patch1:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -45,9 +43,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -82,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Thu Oct 05 2006 Christian Iseli  0.21.11-9
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:39 -0000	1.3
+++ sources	14 Nov 2006 15:23:19 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:26:44 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:26:44 -0700
Subject: rpms/gpsim/FC-6 .cvsignore, 1.3, 1.4 gpsim.spec, 1.11, 1.12 sources,
	1.3, 1.4
Message-ID: <200611141526.kAEFQiW1019355@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19335

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:39 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:26:14 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-6/gpsim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gpsim.spec	4 Oct 2006 22:19:01 -0000	1.11
+++ gpsim.spec	14 Nov 2006 15:26:14 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	9%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -8,8 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.happy_gcc
-Patch1:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -45,9 +43,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -82,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Thu Oct 05 2006 Christian Iseli  0.21.11-9
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:39 -0000	1.3
+++ sources	14 Nov 2006 15:26:14 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:28:53 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:28:53 -0700
Subject: rpms/gpsim/FC-5 .cvsignore, 1.3, 1.4 gpsim.spec, 1.9, 1.10 sources, 
	1.3, 1.4
Message-ID: <200611141528.kAEFSrWv019428@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:39 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:28:23 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-5/gpsim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gpsim.spec	23 Sep 2006 17:15:17 -0000	1.9
+++ gpsim.spec	14 Nov 2006 15:28:23 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	7%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -8,8 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.happy_gcc
-Patch1:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -45,9 +43,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -82,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Sat Sep 23 2006 Alain Portal  0.21.11-7
   - Add patch to fix a ktechlab crash, a ktechlab upstream contribution
     See http://ktechlab.org/download/gpsim.php


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:39 -0000	1.3
+++ sources	14 Nov 2006 15:28:23 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:30:34 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:30:34 -0700
Subject: rpms/gpsim/FC-4 .cvsignore, 1.3, 1.4 gpsim.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200611141530.kAEFUY0i019534@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19495

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:20 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:30:04 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-4/gpsim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gpsim.spec	23 Sep 2006 17:18:17 -0000	1.4
+++ gpsim.spec	14 Nov 2006 15:30:04 -0000	1.5
@@ -8,7 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -44,8 +43,6 @@
 
 %prep
 %setup -q
-%patch -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -80,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Sat Sep 23 2006 Alain Portal  0.21.11-3
   - Add patch to fix a ktechlab crash, a ktechlab upstream contribution
     See http://ktechlab.org/download/gpsim.php


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:20 -0000	1.3
+++ sources	14 Nov 2006 15:30:04 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:31:37 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:31:37 -0700
Subject: rpms/gpsim/FC-4 gpsim.spec,1.5,1.6
Message-ID: <200611141531.kAEFVbx6019570@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19546

Modified Files:
	gpsim.spec 
Log Message:
Fix version.


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-4/gpsim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gpsim.spec	14 Nov 2006 15:30:04 -0000	1.5
+++ gpsim.spec	14 Nov 2006 15:31:07 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	3%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 15:32:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 08:32:28 -0700
Subject: rpms/listen/devel listen.spec,1.19,1.20
Message-ID: <200611141532.kAEFWS0S019660@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19565

Modified Files:
	listen.spec 
Log Message:



Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- listen.spec	14 Nov 2006 15:14:44 -0000	1.19
+++ listen.spec	14 Nov 2006 15:31:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.3
+Release:        9.beta1%{?dist}.4
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -111,10 +111,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%ifarch x86_64
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
-%endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada



From fedora-extras-commits at redhat.com  Tue Nov 14 15:32:32 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 14 Nov 2006 08:32:32 -0700
Subject: rpms/gtk-gnutella/devel gtk-gnutella.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <200611141532.kAEFWWG2019674@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19590

Modified Files:
	gtk-gnutella.spec sources 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-gnutella.spec	23 Oct 2006 12:04:16 -0000	1.9
+++ gtk-gnutella.spec	14 Nov 2006 15:32:02 -0000	1.10
@@ -1,20 +1,26 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.96.2
-Release: 1%{?dist}
+Version: 0.96.3
+Release: 2%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
 BuildRequires: libxml2-devel, byacc, groff, gettext
+
+BuildRequires: gnutls-devel >= 1.0.16
+#comment out for now, it is experimental stuff...
+#BuildRequires: sqlite-devel >= 3.3.0
+
 BuildRequires: desktop-file-utils >= 0.2.90
 
 
@@ -33,8 +39,9 @@
 
 %build
 ./Configure -O -Dprefix=%{_prefix} -Dbindir=%{_bindir} \
+	-Dglibpth="/%{_lib} %{_libdir}" \
 	-Dprivlib=%{_datadir}/%{name} -Dsysman=%{_mandir}/man1 \
-	-Dccflags="$RPM_OPT_FLAGS -Wall" -Dcc=gcc -Doptimize="-O2" \
+	-Dccflags="%{optflags} -Wall" -Dcc=%{__cc} -Doptimize=" " \
 	-Dyacc="byacc" -Dgtkversion=%{?_with_gtk1:1}%{!?_with_gtk1:2} \
 	-Dofficial=true -ders
 make %{?_smp_mflags}
@@ -48,18 +55,18 @@
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
 install -D -m 644 extra_files/gtk-gnutella.16.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.32.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.png \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
 install -D -m 644 extra_files/gtk-gnutella.svg \
-        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
+	$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
-desktop-file-install --vendor fedora --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Fedora                                   \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+desktop-file-install --vendor fedora --delete-original	\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	$RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang %{name}
 
@@ -77,18 +84,19 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/hicolor/*/apps/*
 
-%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
+%doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/shell.txt
 
 
 %changelog
-* Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
-- update to 0.96.2
+* Tue Nov 14 2006 Dmitry Butskoy  - 0.96.3-2
+- switch GNU TLS support on
 
-* Fri Sep  1 2006 Dmitry Butskoy  - 0.96.1-3
-- rebuild for FC6
+* Mon Nov 13 2006 Dmitry Butskoy  - 0.96.3-1
+- update to 0.96.3
+- specify libdirs explicitly for Configure script (needed for x86_64)
 
-* Mon Jul  3 2006 Dmitry Butskoy  - 0.96.1-2
-- add BR: gettext
+* Mon Oct 23 2006 Dmitry Butskoy  - 0.96.2-1
+- update to 0.96.2
 
 * Fri Feb 24 2006 Dmitry Butskoy  - 0.96.1-1
 - update to 0.96.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 12:04:16 -0000	1.5
+++ sources	14 Nov 2006 15:32:02 -0000	1.6
@@ -1 +1 @@
-a7c2db6223bbabff3581edc6f8b45106  gtk-gnutella-0.96.2.tar.bz2
+c6952037a10ea6d5ac5649e7b75f9d15  gtk-gnutella-0.96.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 15:33:02 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:33:02 -0700
Subject: rpms/gpsim/FC-3 .cvsignore, 1.3, 1.4 gpsim.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200611141533.kAEFX2mc019729@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/gpsim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19666

Modified Files:
	.cvsignore gpsim.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 07:08:19 -0000	1.3
+++ .cvsignore	14 Nov 2006 15:32:32 -0000	1.4
@@ -1 +1 @@
-gpsim-0.21.11.tar.gz
+gpsim-0.22.0.tar.gz


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-3/gpsim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gpsim.spec	23 Sep 2006 17:21:42 -0000	1.4
+++ gpsim.spec	14 Nov 2006 15:32:32 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		gpsim
-Version:	0.21.11
-Release:	3%{?dist}
+Version:	0.22.0
+Release:	1%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM)
 
@@ -8,7 +8,6 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
-Patch:		%{name}-%{version}.ktechlab.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -44,8 +43,6 @@
 
 %prep
 %setup -q
-%patch -p0
-%{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
 %configure
@@ -80,6 +77,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Nov 14 2006 Alain Portal  0.22.0-1
+  - New upstream version
+  - Remove patches that are no more needed (applied by upstream)
+
 * Sat Sep 23 2006 Alain Portal  0.21.11-3
   - Add patch to fix a ktechlab crash, a ktechlab upstream contribution
     See http://ktechlab.org/download/gpsim.php


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsim/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 07:08:19 -0000	1.3
+++ sources	14 Nov 2006 15:32:32 -0000	1.4
@@ -1 +1 @@
-2acd268dc2dd69d1ad687253bde8dd21  gpsim-0.21.11.tar.gz
+f05a4e58d24b5a5c6b57c8d0e3810f75  gpsim-0.22.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:37:15 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 14 Nov 2006 08:37:15 -0700
Subject: rpms/cobbler/FC-6 .cvsignore, 1.12, 1.13 cobbler.spec, 1.11,
	1.12 sources, 1.13, 1.14
Message-ID: <200611141537.kAEFbFMB019888@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19867

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Update to 0.3.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 Oct 2006 19:54:47 -0000	1.12
+++ .cvsignore	14 Nov 2006 15:36:44 -0000	1.13
@@ -9,3 +9,4 @@
 cobbler-0.2.9.tar.gz
 cobbler-0.3.0.tar.gz
 cobbler-0.3.1.tar.gz
+cobbler-0.3.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cobbler.spec	25 Oct 2006 19:54:47 -0000	1.11
+++ cobbler.spec	14 Nov 2006 15:36:44 -0000	1.12
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.1
+Version: 0.3.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,6 +39,7 @@
 %config(noreplace) /etc/cobbler/default.ks
 %config(noreplace) /etc/cobbler/kickstart_fc5.ks
 %config(noreplace) /etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.pxe
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -52,6 +53,12 @@
 
 %changelog
 
+* Tue Nov 14 2006 Michael DeHaan  - 0.3.3-1
+- Upstream changes (see CHANGELOG)
+
+* Thu Oct 26 2006 Michael DeHaan  - 0.3.2-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Oct 25 2006 Michael DeHaan  - 0.3.1-1
 - Upstream changes (see CHANGELOG)
 - Updated description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Oct 2006 19:54:47 -0000	1.13
+++ sources	14 Nov 2006 15:36:44 -0000	1.14
@@ -1 +1 @@
-0899462306f7da1e1423bd1fdaf679a1  cobbler-0.3.1.tar.gz
+2632fff6f62f8c07735ba729243a208b  cobbler-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:39:45 2006
From: fedora-extras-commits at redhat.com (Michael DeHaan (mdehaan))
Date: Tue, 14 Nov 2006 08:39:45 -0700
Subject: rpms/cobbler/FC-5 .cvsignore, 1.7, 1.8 cobbler.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200611141539.kAEFdjTp019968@cvs-int.fedora.redhat.com>

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19948

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Update to 0.3.3




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Oct 2006 19:56:50 -0000	1.7
+++ .cvsignore	14 Nov 2006 15:39:14 -0000	1.8
@@ -4,3 +4,4 @@
 cobbler-0.2.9.tar.gz
 cobbler-0.3.0.tar.gz
 cobbler-0.3.1.tar.gz
+cobbler-0.3.3.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cobbler.spec	25 Oct 2006 19:56:50 -0000	1.6
+++ cobbler.spec	14 Nov 2006 15:39:14 -0000	1.7
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.1
+Version: 0.3.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,6 +39,7 @@
 %config(noreplace) /etc/cobbler/default.ks
 %config(noreplace) /etc/cobbler/kickstart_fc5.ks
 %config(noreplace) /etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.pxe
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -52,6 +53,12 @@
 
 %changelog
 
+* Tue Nov 14 2006 Michael DeHaan  - 0.3.3-1
+- Upstream changes (see CHANGELOG)
+
+* Thu Oct 26 2006 Michael DeHaan  - 0.3.2-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Oct 25 2006 Michael DeHaan  - 0.3.1-1
 - Upstream changes (see CHANGELOG)
 - Updated description


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Oct 2006 19:56:50 -0000	1.7
+++ sources	14 Nov 2006 15:39:14 -0000	1.8
@@ -1,2 +1 @@
-e297e623564f2bd4387e14ef4f4551c7  cobbler-0.3.0.tar.gz
-0899462306f7da1e1423bd1fdaf679a1  cobbler-0.3.1.tar.gz
+2632fff6f62f8c07735ba729243a208b  cobbler-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 15:52:04 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:52:04 -0700
Subject: rpms/piklab/devel .cvsignore, 1.4, 1.5 piklab.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200611141552.kAEFq42d020131@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20111

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Oct 2006 08:20:22 -0000	1.4
+++ .cvsignore	14 Nov 2006 15:51:34 -0000	1.5
@@ -1 +1 @@
-piklab-0.12.1.tar.bz2
+piklab-0.12.2.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- piklab.spec	16 Oct 2006 08:22:14 -0000	1.6
+++ piklab.spec	14 Nov 2006 15:51:34 -0000	1.7
@@ -1,7 +1,7 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.1
+Version:	0.12.2
 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
@@ -16,8 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-Patch0:		%{name}-%{version}.desktop.typo-fr.patch
-Patch1:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-0.12.1.desktop.typo-fr.patch
+Patch1:		%{name}-0.12.1.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -120,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Tue Nov 14 2006  Alain Portal  0.12.2-1
+  - New upstream version
+
 * Mon Oct 16 2006  Alain Portal  0.12.1-1
   - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Oct 2006 08:20:22 -0000	1.5
+++ sources	14 Nov 2006 15:51:34 -0000	1.6
@@ -1 +1 @@
-b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2
+106496e489f7f65ea73cb8ee241b7f1e  piklab-0.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 15:54:08 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:54:08 -0700
Subject: rpms/piklab/FC-6 .cvsignore, 1.4, 1.5 piklab.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200611141554.kAEFs8JJ020239@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20198

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Oct 2006 08:20:22 -0000	1.4
+++ .cvsignore	14 Nov 2006 15:53:38 -0000	1.5
@@ -1 +1 @@
-piklab-0.12.1.tar.bz2
+piklab-0.12.2.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-6/piklab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- piklab.spec	16 Oct 2006 08:22:14 -0000	1.6
+++ piklab.spec	14 Nov 2006 15:53:38 -0000	1.7
@@ -1,7 +1,7 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.1
+Version:	0.12.2
 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
@@ -16,8 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-Patch0:		%{name}-%{version}.desktop.typo-fr.patch
-Patch1:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-0.12.1.desktop.typo-fr.patch
+Patch1:		%{name}-0.12.1.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -120,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Tue Nov 14 2006  Alain Portal  0.12.2-1
+  - New upstream version
+
 * Mon Oct 16 2006  Alain Portal  0.12.1-1
   - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Oct 2006 08:20:22 -0000	1.5
+++ sources	14 Nov 2006 15:53:38 -0000	1.6
@@ -1 +1 @@
-b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2
+106496e489f7f65ea73cb8ee241b7f1e  piklab-0.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 15:54:31 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 14 Nov 2006 08:54:31 -0700
Subject: rpms/ochusha/devel .cvsignore, 1.5, 1.6 ochusha.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611141554.kAEFsVNr020282@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20219

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Tue Nov 14 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061114
- Update to 0.5.99.63.3 cvs 061114



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Nov 2006 12:45:24 -0000	1.5
+++ .cvsignore	14 Nov 2006 15:54:01 -0000	1.6
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061113.tar.bz2
+ochusha-0.5.99.63.3-cvs061114.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ochusha.spec	13 Nov 2006 12:45:24 -0000	1.5
+++ ochusha.spec	14 Nov 2006 15:54:01 -0000	1.6
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.3
-%define              strtag          cvs061113
+%define              strtag          cvs061114
 
 %define              vendor_rel      2
 %define              pre_release     1
@@ -57,10 +57,6 @@
 # %{icondir}
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
-# Now rawhide has autoconf >= 2.60
-%{__sed} -i.ver -e 's|2.5\[.*\]|2.6[0-9]|' autogen.sh
-%{__chmod} 0755 autogen.sh
-
 %build
 sh autogen.sh
 
@@ -154,8 +150,8 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Mon Nov 13 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061113
-- Update to 0.5.99.63.3
+* Tue Nov 14 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061114
+- Update to 0.5.99.63.3 cvs 061114
 
 * Fri Nov 03 2006  0.5.99.62-1
 - Version down.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Nov 2006 12:45:24 -0000	1.5
+++ sources	14 Nov 2006 15:54:01 -0000	1.6
@@ -1 +1 @@
-5ca01bb450e98685c2f979f144e0d8d1  ochusha-0.5.99.63.3-cvs061113.tar.bz2
+2ffa3fb15ca8b3b1f75f0d7400cc3e8a  ochusha-0.5.99.63.3-cvs061114.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 15:55:23 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 08:55:23 -0700
Subject: rpms/piklab/FC-5 .cvsignore, 1.4, 1.5 piklab.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200611141555.kAEFtNUW020357@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20330

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Oct 2006 08:23:57 -0000	1.4
+++ .cvsignore	14 Nov 2006 15:54:53 -0000	1.5
@@ -1 +1 @@
-piklab-0.12.1.tar.bz2
+piklab-0.12.2.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- piklab.spec	16 Oct 2006 08:23:57 -0000	1.5
+++ piklab.spec	14 Nov 2006 15:54:53 -0000	1.6
@@ -1,7 +1,7 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.12.1
+Version:	0.12.2
 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
+* Tue Nov 14 2006  Alain Portal  0.12.2-1
+  - New upstream version
+
 * Mon Oct 16 2006  Alain Portal  0.12.1-1
   - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Oct 2006 08:23:57 -0000	1.5
+++ sources	14 Nov 2006 15:54:53 -0000	1.6
@@ -1 +1 @@
-b9a3c742940533021771b5d649685907  piklab-0.12.1.tar.bz2
+106496e489f7f65ea73cb8ee241b7f1e  piklab-0.12.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 16:00:01 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 09:00:01 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.6,1.7
Message-ID: <200611141600.kAEG01k9020461@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20433

Modified Files:
	piklab.spec 
Log Message:
Fix patches names.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- piklab.spec	14 Nov 2006 15:54:53 -0000	1.6
+++ piklab.spec	14 Nov 2006 15:59:30 -0000	1.7
@@ -16,8 +16,8 @@
 Source4:	%{name}-pickit2.perms
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
-Patch0:		%{name}-%{version}.desktop.typo-fr.patch
-Patch1:		%{name}-%{version}.x-desktop-fr.patch
+Patch0:		%{name}-0.12.1.desktop.typo-fr.patch
+Patch1:		%{name}-0.12.1.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
@@ -120,6 +120,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Tue Nov 14 2006  Alain Portal  0.12.2-1.1
+  - Fix patches name.
+
 * Tue Nov 14 2006  Alain Portal  0.12.2-1
   - New upstream version
 



From fedora-extras-commits at redhat.com  Tue Nov 14 16:02:08 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 09:02:08 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.7,1.8
Message-ID: <200611141602.kAEG28KG023521@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501

Modified Files:
	piklab.spec 
Log Message:
Fix release.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- piklab.spec	14 Nov 2006 15:59:30 -0000	1.7
+++ piklab.spec	14 Nov 2006 16:01:37 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	1%{?dist}
+Release:	1.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
 



From fedora-extras-commits at redhat.com  Tue Nov 14 16:40:16 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 09:40:16 -0700
Subject: rpms/listen/FC-6 .cvsignore, 1.3, 1.4 listen.spec, 1.17,
	1.18 sources, 1.4, 1.5
Message-ID: <200611141640.kAEGeG6a023812@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23786

Modified Files:
	.cvsignore listen.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
+++ .cvsignore	14 Nov 2006 16:39:46 -0000	1.4
@@ -1,5 +1 @@
 listen-0.5b1.tar.gz
-Makefile.patch
-const.py.patch
-check.py.patch
-dialog.py.patch


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/listen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- listen.spec	14 Nov 2006 13:21:31 -0000	1.17
+++ listen.spec	14 Nov 2006 16:39:46 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.1
+Release:        9.beta1%{?dist}.4
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -94,7 +94,7 @@
 %patch3 -p1
 %ifarch x86_64
 # correct path issue on x86_64 box
-%{__sed} -i 's/\/lib/\/lib64/' Makefile
+%{__sed} -i 's/= \/lib/= \/lib64/' Makefile
 %endif
 
 %build
@@ -111,10 +111,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%ifarch x86_64
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
-%endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2006 13:21:31 -0000	1.4
+++ sources	14 Nov 2006 16:39:46 -0000	1.5
@@ -1,5 +1 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
-fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
-98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
-46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 16:52:13 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Nov 2006 09:52:13 -0700
Subject: rpms/stellarium/devel stellarium-0.8.2-x64_1.patch, NONE,
	1.1 stellarium-0.8.2-x64_2.patch, NONE, 1.1 stellarium.spec,
	1.24, 1.25
Message-ID: <200611141652.kAEGqDdG023950@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23927

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64_1.patch stellarium-0.8.2-x64_2.patch 
Log Message:
Try to fix AMD64 problem

stellarium-0.8.2-x64_1.patch:

--- NEW FILE stellarium-0.8.2-x64_1.patch ---
--- src/translator.cpp  2006-10-05 09:12:12.000000000 +0100
+++ src/translator.cpp  2006-10-22 21:34:22.000000000 +0100
@@ -71,7 +71,7 @@
 	}

 	//change systemLangName to ISO 639 / ISO 3166.
-	unsigned int pos = Translator::systemLangName.find(':', 0);
+	std::string::size_type pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
 	       Translator::systemLangName.resize(pos);
 	pos = Translator::systemLangName.find('.', 0);

stellarium-0.8.2-x64_2.patch:

--- NEW FILE stellarium-0.8.2-x64_2.patch ---
--- stellarium-0.8.2/src/stel_core.cpp~	2006-11-13 23:06:16.000000000 +0100
+++ stellarium-0.8.2/src/stel_core.cpp	2006-11-13 23:06:16.000000000 +0100
@@ -70,8 +70,6 @@
     dataRoot = DATA_ROOT;
     recordActionCallback = recordCallback;
 
-    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
-    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
 
     tone_converter = new ToneReproductor();
     atmosphere = new Atmosphere();
@@ -135,6 +133,10 @@
 // Load core data and initialize with default values
 void StelCore::init(const InitParser& conf)
 {
+    // do NOT do this in the constructor as there is no valid GLcontext there!
+    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
+    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
+
     baseFontFile = getDataDir() + conf.get_str("gui", "base_font_name", "DejaVuSans.ttf");
 
     // Video Section


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/devel/stellarium.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- stellarium.spec	19 Oct 2006 20:19:18 -0000	1.24
+++ stellarium.spec	14 Nov 2006 16:51:43 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,7 +9,9 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
-Patch1:		stellarium-0.8.2-x64.patch
+Patch1:		stellarium-0.8.2-x64_1.patch
+Patch2:		stellarium-0.8.2-x64_2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -40,7 +42,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %configure
@@ -85,6 +88,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Nov 14 2006 Jochen Schmitt  0.8.2-3
+- Try to fix AMD64 problem (#210525)
+
 * Thu Oct 19 2006 Jochen Schmitt  0.8.2-2
 - Fix segfault on x64 systems (#210525)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 16:53:46 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 09:53:46 -0700
Subject: rpms/listen/FC-6 Makefile.patch, NONE, 1.1 check.py.patch, NONE,
	1.1 const.py.patch, NONE, 1.1 dialog.py.patch, NONE, 1.1
Message-ID: <200611141653.kAEGrkd6024008@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990

Added Files:
	Makefile.patch check.py.patch const.py.patch dialog.py.patch 
Log Message:


Makefile.patch:

--- NEW FILE Makefile.patch ---
--- ./Makefile.old	2006-11-14 15:03:27.000000000 +0100
+++ ./Makefile	2006-11-14 15:03:08.000000000 +0100
@@ -2,11 +2,12 @@
 
 PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
 PREFIX ?= /usr
+LIB ?= /lib
 
 GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
 
 all: check mmkeys.so po-data
-	docbook2x-man listen.1.docbook
+	db2x_docbook2man listen.1.docbook
 	@echo "Done"
 	@echo "Type: make install now"
 
@@ -19,7 +20,7 @@
 
 daap.py:
 	cd daap && python ./setup.py build  && cd ..
-	cp daap/build/lib.*/* src/ -rf
+	cp daap/build$(LIB).*/* src/ -rf
 
 mmkeys.so:
 	cd mmkeys && make mmkeys.so && cd ..
@@ -40,29 +41,29 @@
 
 make-install-dirs: make-install-dirs-po
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/formats
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/source
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/library
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/widget
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	mkdir -p $(DESTDIR)$(PREFIX)/share/listen/img/source
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 
 make-install-dirs-po:
-	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES; done
+	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES; done
 
 install: make-install-dirs install-po
 	echo "DATA_DIR = \"$(PREFIX)/share/listen\"" > dists.py
-	install -m 644 dists.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/*.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)/lib/listen/formats
-	install -m 644 src/source/* $(DESTDIR)$(PREFIX)/lib/listen/source
-	install -m 644 src/library/* $(DESTDIR)$(PREFIX)/lib/listen/library
-	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)/lib/listen/widget
+	install -m 644 dists.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/*.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	install -m 644 src/source/* $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	install -m 644 src/library/* $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	install -m 755 data/*.glade $(DESTDIR)$(PREFIX)/share/listen/
 	install -m 755 data/img/*.png $(DESTDIR)$(PREFIX)/share/listen/img
 	install -m 755 data/img/source/*.png $(DESTDIR)$(PREFIX)/share/listen/img/source
@@ -70,11 +71,11 @@
 	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
 	
 	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
-	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
+	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)$(LIB)/listen/listen.py "$$@"'>listen ;
 	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
 
 install-po:
-	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES/; done
+	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p src/po/$$lang/LC_MESSAGES/ ;done

check.py.patch:

--- NEW FILE check.py.patch ---
--- ./check.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./check.py	        2006-11-13 19:22:43.000000000 +0100
@@ -56,7 +56,7 @@
     print "Checking for mutagen:",
     try: 
          import mutagen
-	 if float(mutagen.version_string) < 1.6:
+	 if float(mutagen.version_string[0:3]) < 1.6:
 		raise ImportError
     except ImportError:
         raise SystemExit("not found\n%s require mutagen >= 1.6.\n"

const.py.patch:

--- NEW FILE const.py.patch ---
--- ./src/const.py.old	2006-11-13 20:04:40.000000000 +0100
+++ ./src/const.py	2006-11-13 20:04:49.000000000 +0100
@@ -32,7 +32,7 @@
 
 APPNAME = "Music Player Listen"
 GETTEXT_APP="listen"
-GETTEXT_DIR = "po"
+GETTEXT_DIR = "/usr/share/locale"
 
 if True:
     CONFIG_DIR  = os.path.expanduser("~/.listen-test/")

dialog.py.patch:

--- NEW FILE dialog.py.patch ---
--- ./src/widget/dialog.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./src/widget/dialog.py	2006-11-13 19:59:34.000000000 +0100
@@ -326,5 +326,6 @@
         self.set_translator_credits(const.TRANSLATORS)
         self.set_version(const.VERSION)
         self.set_logo(gtk.gdk.pixbuf_new_from_file(const.PIXMAP_DIR+"listen_big.png"))
-        self.show_all()
-        
\ Pas de fin de ligne ?? la fin du fichier.
+        self.run()
+        self.destroy()
+        



From fedora-extras-commits at redhat.com  Tue Nov 14 16:55:40 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Nov 2006 09:55:40 -0700
Subject: rpms/stellarium/FC-6 stellarium-0.8.2-x64_1.patch, NONE,
	1.1 stellarium-0.8.2-x64_2.patch, NONE, 1.1 stellarium.spec,
	1.24, 1.25
Message-ID: <200611141655.kAEGte68024066@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24041

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64_1.patch stellarium-0.8.2-x64_2.patch 
Log Message:
Try to fix AMD64 problem

stellarium-0.8.2-x64_1.patch:

--- NEW FILE stellarium-0.8.2-x64_1.patch ---
--- src/translator.cpp  2006-10-05 09:12:12.000000000 +0100
+++ src/translator.cpp  2006-10-22 21:34:22.000000000 +0100
@@ -71,7 +71,7 @@
 	}

 	//change systemLangName to ISO 639 / ISO 3166.
-	unsigned int pos = Translator::systemLangName.find(':', 0);
+	std::string::size_type pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
 	       Translator::systemLangName.resize(pos);
 	pos = Translator::systemLangName.find('.', 0);

stellarium-0.8.2-x64_2.patch:

--- NEW FILE stellarium-0.8.2-x64_2.patch ---
--- stellarium-0.8.2/src/stel_core.cpp~	2006-11-13 23:06:16.000000000 +0100
+++ stellarium-0.8.2/src/stel_core.cpp	2006-11-13 23:06:16.000000000 +0100
@@ -70,8 +70,6 @@
     dataRoot = DATA_ROOT;
     recordActionCallback = recordCallback;
 
-    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
-    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
 
     tone_converter = new ToneReproductor();
     atmosphere = new Atmosphere();
@@ -135,6 +133,10 @@
 // Load core data and initialize with default values
 void StelCore::init(const InitParser& conf)
 {
+    // do NOT do this in the constructor as there is no valid GLcontext there!
+    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
+    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
+
     baseFontFile = getDataDir() + conf.get_str("gui", "base_font_name", "DejaVuSans.ttf");
 
     // Video Section


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-6/stellarium.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- stellarium.spec	19 Oct 2006 20:19:18 -0000	1.24
+++ stellarium.spec	14 Nov 2006 16:55:10 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,7 +9,9 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
-Patch1:		stellarium-0.8.2-x64.patch
+Patch1:		stellarium-0.8.2-x64_1.patch
+Patch2:		stellarium-0.8.2-x64_2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -40,7 +42,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %configure
@@ -85,6 +88,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Nov 14 2006 Jochen Schmitt  0.8.2-3
+- Try to fix AMD64 problem (#210525)
+
 * Thu Oct 19 2006 Jochen Schmitt  0.8.2-2
 - Fix segfault on x64 systems (#210525)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 17:10:35 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 14 Nov 2006 10:10:35 -0700
Subject: rpms/listen/FC-5 Makefile.patch, NONE, 1.1 check.py.patch, NONE,
	1.1 const.py.patch, NONE, 1.1 dialog.py.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 listen.spec, 1.17, 1.18 sources, 1.4, 1.5
Message-ID: <200611141710.kAEHAZC1027315@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27260

Modified Files:
	.cvsignore listen.spec sources 
Added Files:
	Makefile.patch check.py.patch const.py.patch dialog.py.patch 
Log Message:


Makefile.patch:

--- NEW FILE Makefile.patch ---
--- ./Makefile.old	2006-11-14 15:03:27.000000000 +0100
+++ ./Makefile	2006-11-14 15:03:08.000000000 +0100
@@ -2,11 +2,12 @@
 
 PO = fr fr_BR en_GB it es hu pl de pt_BR pt nl
 PREFIX ?= /usr
+LIB ?= /lib
 
 GTKMOZEMBED_PATH = `(pkg-config --libs-only-L mozilla-gtkmozembed 2>/dev/null || pkg-config --libs-only-L firefox-gtkmozembed 2>/dev/null) | sed -e "s/-L//"`
 
 all: check mmkeys.so po-data
-	docbook2x-man listen.1.docbook
+	db2x_docbook2man listen.1.docbook
 	@echo "Done"
 	@echo "Type: make install now"
 
@@ -19,7 +20,7 @@
 
 daap.py:
 	cd daap && python ./setup.py build  && cd ..
-	cp daap/build/lib.*/* src/ -rf
+	cp daap/build$(LIB).*/* src/ -rf
 
 mmkeys.so:
 	cd mmkeys && make mmkeys.so && cd ..
@@ -40,29 +41,29 @@
 
 make-install-dirs: make-install-dirs-po
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/formats
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/source
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/library
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/widget
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	mkdir -p $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	mkdir -p $(DESTDIR)$(PREFIX)/share/listen/img/source
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 
 make-install-dirs-po:
-	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES; done
+	for lang in $(PO); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES; done
 
 install: make-install-dirs install-po
 	echo "DATA_DIR = \"$(PREFIX)/share/listen\"" > dists.py
-	install -m 644 dists.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/*.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)/lib/listen
-	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)/lib/listen/formats
-	install -m 644 src/source/* $(DESTDIR)$(PREFIX)/lib/listen/source
-	install -m 644 src/library/* $(DESTDIR)$(PREFIX)/lib/listen/library
-	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)/lib/listen/webradio
-	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)/lib/listen/widget
+	install -m 644 dists.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/*.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 755 src/listen.py $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/mmkeys.so $(DESTDIR)$(PREFIX)$(LIB)/listen
+	install -m 644 src/formats/* $(DESTDIR)$(PREFIX)$(LIB)/listen/formats
+	install -m 644 src/source/* $(DESTDIR)$(PREFIX)$(LIB)/listen/source
+	install -m 644 src/library/* $(DESTDIR)$(PREFIX)$(LIB)/listen/library
+	install -m 644 src/webradio/* $(DESTDIR)$(PREFIX)$(LIB)/listen/webradio
+	install -m 644 src/widget/* $(DESTDIR)$(PREFIX)$(LIB)/listen/widget
 	install -m 755 data/*.glade $(DESTDIR)$(PREFIX)/share/listen/
 	install -m 755 data/img/*.png $(DESTDIR)$(PREFIX)/share/listen/img
 	install -m 755 data/img/source/*.png $(DESTDIR)$(PREFIX)/share/listen/img/source
@@ -70,11 +71,11 @@
 	install -m 644 listen.desktop $(DESTDIR)$(PREFIX)/share/applications/
 	
 	GTKMOZEMBED_PATH=$(GTKMOZEMBED_PATH) && \
-	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)/lib/listen/listen.py "$$@"'>listen ;
+	/bin/echo -e '#!/bin/sh\n\nLD_LIBRARY_PATH='$$GTKMOZEMBED_PATH' $(PREFIX)$(LIB)/listen/listen.py "$$@"'>listen ;
 	install -m 755 listen $(DESTDIR)$(PREFIX)/bin/
 
 install-po:
-	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/lib/listen/po/$$lang/LC_MESSAGES/; done
+	for lang in $(PO); do install -m 644 src/po/$$lang/LC_MESSAGES/* $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p src/po/$$lang/LC_MESSAGES/ ;done

check.py.patch:

--- NEW FILE check.py.patch ---
--- ./check.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./check.py	        2006-11-13 19:22:43.000000000 +0100
@@ -56,7 +56,7 @@
     print "Checking for mutagen:",
     try: 
          import mutagen
-	 if float(mutagen.version_string) < 1.6:
+	 if float(mutagen.version_string[0:3]) < 1.6:
 		raise ImportError
     except ImportError:
         raise SystemExit("not found\n%s require mutagen >= 1.6.\n"

const.py.patch:

--- NEW FILE const.py.patch ---
--- ./src/const.py.old	2006-11-13 20:04:40.000000000 +0100
+++ ./src/const.py	2006-11-13 20:04:49.000000000 +0100
@@ -32,7 +32,7 @@
 
 APPNAME = "Music Player Listen"
 GETTEXT_APP="listen"
-GETTEXT_DIR = "po"
+GETTEXT_DIR = "/usr/share/locale"
 
 if True:
     CONFIG_DIR  = os.path.expanduser("~/.listen-test/")

dialog.py.patch:

--- NEW FILE dialog.py.patch ---
--- ./src/widget/dialog.py.old	2006-09-05 11:30:51.000000000 +0200
+++ ./src/widget/dialog.py	2006-11-13 19:59:34.000000000 +0100
@@ -326,5 +326,6 @@
         self.set_translator_credits(const.TRANSLATORS)
         self.set_version(const.VERSION)
         self.set_logo(gtk.gdk.pixbuf_new_from_file(const.PIXMAP_DIR+"listen_big.png"))
-        self.show_all()
-        
\ Pas de fin de ligne ?? la fin du fichier.
+        self.run()
+        self.destroy()
+        


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:30:29 -0000	1.3
+++ .cvsignore	14 Nov 2006 17:10:04 -0000	1.4
@@ -1,5 +1 @@
 listen-0.5b1.tar.gz
-Makefile.patch
-const.py.patch
-check.py.patch
-dialog.py.patch


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/listen.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- listen.spec	14 Nov 2006 13:23:18 -0000	1.17
+++ listen.spec	14 Nov 2006 17:10:04 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        9.beta1%{?dist}.1
+Release:        9.beta1%{?dist}.4
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -94,7 +94,7 @@
 %patch3 -p1
 %ifarch x86_64
 # correct path issue on x86_64 box
-%{__sed} -i 's/\/lib/\/lib64/' Makefile
+%{__sed} -i 's/= \/lib/= \/lib64/' Makefile
 %endif
 
 %build
@@ -111,10 +111,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%ifarch x86_64
-mkdir $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT%{_prefix}/lib/%{name} $RPM_BUILD_ROOT%{_libdir}/
-%endif
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/listen.py
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/mmkeys.so
 # fixed rights of trackedit.glade thanks to Martin Sourada


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2006 13:23:18 -0000	1.4
+++ sources	14 Nov 2006 17:10:04 -0000	1.5
@@ -1,5 +1 @@
 9dd7b4252ccdddc44199ac0820ac4b91  listen-0.5b1.tar.gz
-7b841bfd4c3ff4159d1580c85f55d6a3  const.py.patch
-fa62e1cb1d61545eafd22cd4369cde8c  check.py.patch
-98d3f4543ef9524239bd142c3f2c03b3  dialog.py.patch
-46c3080b4d40cd23290c2f920e95d58e  Makefile.patch



From fedora-extras-commits at redhat.com  Tue Nov 14 17:33:10 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Tue, 14 Nov 2006 10:33:10 -0700
Subject: rpms/stellarium/FC-5 stellarium-0.8.2-x64_1.patch, NONE,
	1.1 stellarium-0.8.2-x64_2.patch, NONE, 1.1 stellarium.spec,
	1.23, 1.24
Message-ID: <200611141733.kAEHXANl027605@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/stellarium/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583

Modified Files:
	stellarium.spec 
Added Files:
	stellarium-0.8.2-x64_1.patch stellarium-0.8.2-x64_2.patch 
Log Message:
Try to fix AMD64 problem

stellarium-0.8.2-x64_1.patch:

--- NEW FILE stellarium-0.8.2-x64_1.patch ---
--- src/translator.cpp  2006-10-05 09:12:12.000000000 +0100
+++ src/translator.cpp  2006-10-22 21:34:22.000000000 +0100
@@ -71,7 +71,7 @@
 	}

 	//change systemLangName to ISO 639 / ISO 3166.
-	unsigned int pos = Translator::systemLangName.find(':', 0);
+	std::string::size_type pos = Translator::systemLangName.find(':', 0);
 	if(pos != Translator::systemLangName.npos)
 	       Translator::systemLangName.resize(pos);
 	pos = Translator::systemLangName.find('.', 0);

stellarium-0.8.2-x64_2.patch:

--- NEW FILE stellarium-0.8.2-x64_2.patch ---
--- stellarium-0.8.2/src/stel_core.cpp~	2006-11-13 23:06:16.000000000 +0100
+++ stellarium-0.8.2/src/stel_core.cpp	2006-11-13 23:06:16.000000000 +0100
@@ -70,8 +70,6 @@
     dataRoot = DATA_ROOT;
     recordActionCallback = recordCallback;
 
-    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
-    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
 
     tone_converter = new ToneReproductor();
     atmosphere = new Atmosphere();
@@ -135,6 +133,10 @@
 // Load core data and initialize with default values
 void StelCore::init(const InitParser& conf)
 {
+    // do NOT do this in the constructor as there is no valid GLcontext there!
+    projection = Projector::create(Projector::PERSPECTIVE_PROJECTOR, Vec4i(0,0,800,600), 60);
+    glFrontFace(projection->needGlFrontFaceCW()?GL_CW:GL_CCW);
+
     baseFontFile = getDataDir() + conf.get_str("gui", "base_font_name", "DejaVuSans.ttf");
 
     // Video Section


Index: stellarium.spec
===================================================================
RCS file: /cvs/extras/rpms/stellarium/FC-5/stellarium.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- stellarium.spec	15 Oct 2006 19:41:38 -0000	1.23
+++ stellarium.spec	14 Nov 2006 17:32:40 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           stellarium
 Version:        0.8.2
-Release:        1%{?dist}.2
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -9,7 +9,9 @@
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.8.1-1.pdf
-Patch1:	        stellarium-0.8.2-x64.patch
+Patch1:	        stellarium-0.8.2-x64_1.patch
+Patch2:		stellarium-0.8.2-x64_2.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -40,7 +42,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %configure
@@ -85,6 +88,9 @@
 %doc COPYING stellarium_user_guide-0.8.1-1.pdf
 
 %changelog
+* Tue Nov 14 2006 Jochen Schmitt  0.8.2-3
+- Try to fix AMD64 problem (#210525)
+
 * Sun Oct 15 2006 Jochen Schmitt  0.8.2-1.2
 - Fix segfault on x64 systems (#210525)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 17:35:39 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 14 Nov 2006 10:35:39 -0700
Subject: rpms/glipper import.log,1.6,1.7
Message-ID: <200611141735.kAEHZdFX027732@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27699

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.95-2 on branch devel from glipper-0.95-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	13 Nov 2006 20:09:48 -0000	1.6
+++ import.log	14 Nov 2006 17:35:09 -0000	1.7
@@ -3,3 +3,4 @@
 glipper-0_89-4_fc6:HEAD:glipper-0.89-4.fc6.src.rpm:1156791617
 glipper-0_89-5:HEAD:glipper-0.89-5.src.rpm:1161029170
 glipper-0_95-1:HEAD:glipper-0.95-1.src.rpm:1163448587
+glipper-0_95-2:HEAD:glipper-0.95-2.src.rpm:1163525699



From fedora-extras-commits at redhat.com  Tue Nov 14 17:35:40 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 14 Nov 2006 10:35:40 -0700
Subject: rpms/glipper/devel glipper.spec,1.5,1.6
Message-ID: <200611141735.kAEHZeIq027735@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27699/devel

Modified Files:
	glipper.spec 
Log Message:
auto-import glipper-0.95-2 on branch devel from glipper-0.95-2.src.rpm


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glipper.spec	13 Nov 2006 20:09:49 -0000	1.5
+++ glipper.spec	14 Nov 2006 17:35:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
 
 
 %description
@@ -47,9 +47,11 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 14 2006 Damien Durand  - 0.95-2
+- Add gnome-doc-utils in BR
+
 * Mon Nov 13 2006 Damien Durand  - 0.95-1
 - Update to 0.95 release
-- Fix Doc
 
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped



From fedora-extras-commits at redhat.com  Tue Nov 14 17:38:31 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 14 Nov 2006 10:38:31 -0700
Subject: rpms/glipper/FC-6 glipper.spec,1.5,1.6
Message-ID: <200611141738.kAEHcV7L027865@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27849

Modified Files:
	glipper.spec 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/glipper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glipper.spec	13 Nov 2006 20:13:07 -0000	1.5
+++ glipper.spec	14 Nov 2006 17:38:00 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
 
 
 %description
@@ -47,9 +47,11 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 14 2006 Damien Durand  - 0.95-2
+- Add gnome-doc-utils in BR
+
 * Mon Nov 13 2006 Damien Durand  - 0.95-1
 - Update to 0.95 release
-- Fix Doc
 
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped



From fedora-extras-commits at redhat.com  Tue Nov 14 17:40:12 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 14 Nov 2006 10:40:12 -0700
Subject: rpms/glipper/FC-5 glipper.spec,1.4,1.5
Message-ID: <200611141740.kAEHeCgD027931@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27911

Modified Files:
	glipper.spec 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/glipper.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glipper.spec	13 Nov 2006 20:14:35 -0000	1.4
+++ glipper.spec	14 Nov 2006 17:39:42 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.95
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool
+BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
 
 
 %description
@@ -47,9 +47,11 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 14 2006 Damien Durand  - 0.95-2
+- Add gnome-doc-utils in BR
+
 * Mon Nov 13 2006 Damien Durand  - 0.95-1
 - Update to 0.95 release
-- Fix Doc
 
 * Mon Oct 16 2006 Damien Durand  - 0.89-5
 - Bumped



From fedora-extras-commits at redhat.com  Tue Nov 14 17:49:29 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Tue, 14 Nov 2006 10:49:29 -0700
Subject: rpms/kadu/devel .cvsignore, 1.7, 1.8 kadu.spec, 1.17, 1.18 sources, 
	1.9, 1.10
Message-ID: <200611141749.kAEHnTnK028098@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28076

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Mon Nov 14 2006 Micha?? Bentkowski  - 0.5.0-0.20.rc1
- Add advanced_userlist, osdhints_notify and screenshot modules



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Oct 2006 11:24:27 -0000	1.7
+++ .cvsignore	14 Nov 2006 17:48:58 -0000	1.8
@@ -1 +1,4 @@
 kadu-20061029.tar.bz2
+advanced_userlist-20061010.tar.bz2
+kadu-osdhints_notify-0.3.2.1.tar.gz
+screenshot-0.4.4.tar.gz


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kadu.spec	8 Nov 2006 20:36:38 -0000	1.17
+++ kadu.spec	14 Nov 2006 17:48:58 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		kadu
 Version:	0.5.0
-Release:	0.19.rc1%{?dist}
+Release:	0.20.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -25,6 +25,9 @@
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+Source117:	http://www.kadu.net/~joi/advanced_userlist/packages/advanced_userlist-20061010.tar.bz2
+Source118:	http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-0.3.2.1.tar.gz
+Source119:	http://scripts.one.pl/screenshot/devel/0.5.0/screenshot-0.4.4.tar.gz
 
 Patch0:		kadu-0.5.0-tabs_patch.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -230,11 +233,32 @@
 %description wmaker_docking
 WindowMaker docking module
 
-
+%package advanced_userlist
+Summary:	Advanced_userlist module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description advanced_userlist
+User list: support for priorities (VIP/NIP) and
+changing order of sorting functions.
+
+%package osdhints_notify
+Summary:	Osdhints_notify module for Kadu
+Group:		Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description osdhints_notify
+Notification by OSD-like hints
+
+%package screenshot
+Summary:        Screenshot module for Kadu
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description screenshot
+Adds a possibility to select a screen's fragment
+and send image with its content.
 
 %prep
 %setup -q -n kadu
-%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
+%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -a 117 -a 118 -a 119 -n kadu/modules
 %setup -q -D -T -n kadu
 
 %patch0 -p1 -b tabs_patch
@@ -261,7 +285,10 @@
 	module_profiles \
 	module_mail \
 	module_exec_notify \
-	module_firewall
+	module_firewall \
+	module_advanced_userlist \
+	module_osdhints_notify \
+	module_screenshot \
 	module_wmaker_docking"
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
@@ -444,6 +471,15 @@
 
 %mod_files mail
 
+%files advanced_userlist
+%defattr(-,root,root,-)
+%{_modlib}/advanced_userlist.so
+%{_moddata}/advanced_userlist.desc
+
+%mod_files2 osdhints_notify
+
+%mod_files2 screenshot
+
 %files weather
 %defattr(-,root,root,-)
 %{_modlib}/weather.so
@@ -451,6 +487,9 @@
 %{_moddata}/data/weather
 
 %changelog
+* Mon Nov 14 2006 Micha?? Bentkowski  - 0.5.0-0.20.rc1
+- Add advanced_userlist, osdhints_notify and screenshot modules
+
 * Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.19.rc1
 - Update kadu to RC1
 - Update ext_info module to 2.0beta9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Nov 2006 20:36:38 -0000	1.9
+++ sources	14 Nov 2006 17:48:58 -0000	1.10
@@ -16,4 +16,6 @@
 69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
 e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
 139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
-
+403490d44e9650261809cdbca0de816a  advanced_userlist-20061010.tar.bz2
+4568a1cf1b242642a1fc6629969d05dd  kadu-osdhints_notify-0.3.2.1.tar.gz
+c6da85999cfebef413d228dca9c7d91f  screenshot-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 17:54:04 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Tue, 14 Nov 2006 10:54:04 -0700
Subject: rpms/kadu/FC-6 .cvsignore, 1.7, 1.8 kadu.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <200611141754.kAEHs40L028193@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28173

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Mon Nov 13 2006 Micha?? Bentkowski  - 0.5.0-0.17.rc1
- Add advanced_userlist, osdhints_notify and screenshot modules



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Nov 2006 20:12:40 -0000	1.7
+++ .cvsignore	14 Nov 2006 17:53:34 -0000	1.8
@@ -1,6 +1,4 @@
-kadu-20060915.tar.bz2
-powerkadu-20061026.tar.gz
-kadu-0.5.0-rc1.tar.bz2
-ext_info-2.0beta9.tar.bz2
-xmms-1.32.tar.gz
-amarok-1.19.tar.gz
+kadu-20061029.tar.bz2
+advanced_userlist-20061010.tar.bz2
+kadu-osdhints_notify-0.3.2.1.tar.gz
+screenshot-0.4.4.tar.gz


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/kadu.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kadu.spec	8 Nov 2006 20:12:40 -0000	1.13
+++ kadu.spec	14 Nov 2006 17:53:34 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		kadu
 Version:	0.5.0
-Release:	0.16.rc1%{?dist}
+Release:	0.17.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -25,6 +25,9 @@
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+Source117:	http://www.kadu.net/~joi/advanced_userlist/packages/advanced_userlist-20061010.tar.bz2
+Source118:	http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-0.3.2.1.tar.gz
+Source119:	http://scripts.one.pl/screenshot/devel/0.5.0/screenshot-0.4.4.tar.gz
 Patch0:		kadu-0.5.0-tabs_patch.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -230,11 +233,32 @@
 %description wmaker_docking
 WindowMaker docking module
 
+%package advanced_userlist
+Summary:	Advanced_userlist module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description advanced_userlist
+User list: support for priorities (VIP/NIP) and
+changing order of sorting functions.
+
+%package osdhints_notify
+Summary:	Osdhints_notify module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description osdhints_notify
+Notification by OSD-like hints
 
+%package screenshot
+Summary:	Screenshot module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description screenshot
+Adds a possibility to select a screen's fragment
+and send image with its content.
 
 %prep
 %setup -q -n kadu
-%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
+%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -a 117 -a 118 -a 119 -n kadu/modules
 %setup -q -D -T -n kadu
 
 %patch0 -p1 -b tabs_patch
@@ -261,7 +285,10 @@
 	module_profiles \
 	module_mail \
 	module_exec_notify \
-	module_firewall
+	module_firewall \
+	module_advanced_userlist \
+	module_osdhints_notify \
+	module_screenshot \
 	module_wmaker_docking"
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
@@ -450,7 +477,19 @@
 %{_moddata}/weather.desc
 %{_moddata}/data/weather
 
+%files advanced_userlist
+%defattr(-,root,root,-)
+%{_modlib}/advanced_userlist.so
+%{_moddata}/advanced_userlist.desc
+
+%mod_files2 osdhints_notify
+
+%mod_files2 screenshot
+
 %changelog
+* Mon Nov 13 2006 Micha?? Bentkowski  - 0.5.0-0.17.rc1
+- Add advanced_userlist, osdhints_notify and screenshot modules
+
 * Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.16.rc1
 - Update kadu to RC1
 - Update ext_info module to 2.0beta9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Nov 2006 20:12:40 -0000	1.7
+++ sources	14 Nov 2006 17:53:34 -0000	1.8
@@ -16,3 +16,6 @@
 69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
 e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
 139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
+403490d44e9650261809cdbca0de816a  advanced_userlist-20061010.tar.bz2
+4568a1cf1b242642a1fc6629969d05dd  kadu-osdhints_notify-0.3.2.1.tar.gz
+c6da85999cfebef413d228dca9c7d91f  screenshot-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 17:59:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Micha=C5=82_Bentkowski?= (ecik))
Date: Tue, 14 Nov 2006 10:59:45 -0700
Subject: rpms/kadu/FC-5 .cvsignore, 1.7, 1.8 kadu.spec, 1.8, 1.9 sources, 1.8,
	1.9
Message-ID: <200611141759.kAEHxj4Y028291@cvs-int.fedora.redhat.com>

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28269

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Mon Nov 13 2006 Micha?? Bentkowski  - 0.5.0-0.12.rc1
- Add advanced_userlist, osdhints_notify and screenshot modules



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Nov 2006 20:43:55 -0000	1.7
+++ .cvsignore	14 Nov 2006 17:59:15 -0000	1.8
@@ -1 +1,4 @@
 kadu-20061029.tar.bz2
+advanced_userlist-20061010.tar.bz2
+kadu-osdhints_notify-0.3.2.1.tar.gz
+screenshot-0.4.4.tar.gz


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kadu.spec	8 Nov 2006 20:52:39 -0000	1.8
+++ kadu.spec	14 Nov 2006 17:59:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		kadu
 Version:	0.5.0
-Release:	0.11.rc1%{?dist}
+Release:	0.12.rc1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -25,6 +25,9 @@
 Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
 Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
+Source117:	http://www.kadu.net/~joi/advanced_userlist/packages/advanced_userlist-20061010.tar.bz2
+Source118:	http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-0.3.2.1.tar.gz
+Source119:	http://scripts.one.pl/screenshot/devel/0.5.0/screenshot-0.4.4.tar.gz
 Patch0:		kadu-0.5.0-tabs_patch.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -230,11 +233,32 @@
 %description wmaker_docking
 WindowMaker docking module
 
+%package advanced_userlist
+Summary:	Advanced_userlist module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description advanced_userlist
+User list: support for priorities (VIP/NIP) and
+changing order of sorting functions.
+
+%package osdhints_notify
+Summary:	Osdhints_notify module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description osdhints_notify
+Notification by OSD-like hints
 
+%package screenshot
+Summary:	Screenshot module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description screenshot
+Adds a possibility to select a screen's fragment
+and send image with its content.
 
 %prep
 %setup -q -n kadu
-%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
+%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -a 117 -a 118 -a 119 -n kadu/modules
 %setup -q -D -T -n kadu
 
 %patch0 -p1 -b tabs_patch
@@ -261,7 +285,10 @@
 	module_profiles \
 	module_mail \
 	module_exec_notify \
-	module_firewall
+	module_firewall \
+	module_advanced_userlist \
+	module_osdhints_notify \
+	module_screenshot \
 	module_wmaker_docking"
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
@@ -450,7 +477,19 @@
 %{_moddata}/weather.desc
 %{_moddata}/data/weather
 
+%files advanced_userlist
+%defattr(-,root,root,-)
+%{_modlib}/advanced_userlist.so
+%{_moddata}/advanced_userlist.desc
+
+%mod_files2 osdhints_notify
+
+%mod_files2 screenshot
+
 %changelog
+* Mon Nov 13 2006 Micha?? Bentkowski  - 0.5.0-0.12.rc1
+- Add advanced_userlist, osdhints_notify and screenshot modules
+
 * Wed Nov 08 2006 Micha?? Bentkowski  - 0.5.0-0.11.rc1
 - Fixed sources file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Nov 2006 20:52:39 -0000	1.8
+++ sources	14 Nov 2006 17:59:15 -0000	1.9
@@ -16,4 +16,6 @@
 69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
 e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
 139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
-
+403490d44e9650261809cdbca0de816a  advanced_userlist-20061010.tar.bz2
+4568a1cf1b242642a1fc6629969d05dd  kadu-osdhints_notify-0.3.2.1.tar.gz
+c6da85999cfebef413d228dca9c7d91f  screenshot-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 18:09:29 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 14 Nov 2006 11:09:29 -0700
Subject: fedora-security/audit fc5,1.389,1.390
Message-ID: <200611141809.kAEI9TEc031429@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31411/audit

Modified Files:
	fc5 
Log Message:
Update with FEDORA-2006-1221 (kernel)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- fc5	13 Nov 2006 11:16:37 -0000	1.389
+++ fc5	14 Nov 2006 18:09:26 -0000	1.390
@@ -3,18 +3,18 @@
 
 ** are items that need attention
 
-CVE-2006-5823 ** kernel
+CVE-2006-5823 version (kernel) [since FEDORA-2006-1221]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
 CVE-2006-5783 ignore (firefox) disputed
-CVE-2006-5757 ** kernel
+CVE-2006-5757 version (kernel) [since FEDORA-2006-1221]
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5748 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5747 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
-CVE-2006-5701 ** kernel
+CVE-2006-5701 VULNERABLE (kernel, not upstream)
 CVE-2006-5633 ignore (firefox) just a client DoS
-CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
+CVE-2006-5619 version (kernel, fixed 2.6.18.2, fixed 2.6.19-rc4) [since FEDORA-2006-1221]
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
@@ -33,7 +33,7 @@
 CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
-CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
+CVE-2006-5331 VULNERABLE (kernel, fixed 2.6.19-rc3)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5229 ignore (openssh) reported not an issue
@@ -71,7 +71,7 @@
 CVE-2006-4600 VULNERABLE (openldap, fixed 2.3.25) #205827
 CVE-2006-4574 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-4573 VULNERABLE (screen) #212057
-CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
+CVE-2006-4572 VULNERABLE (kernel, fixed 2.6.19-rc4)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7) [since FEDORA-2006-977]
 CVE-2006-4571 VULNERABLE (mozilla)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7) [since FEDORA-2006-976]



From fedora-extras-commits at redhat.com  Tue Nov 14 18:10:06 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 14 Nov 2006 11:10:06 -0700
Subject: fedora-security/audit fc6,1.141,1.142
Message-ID: <200611141810.kAEIA63b031453@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31435/audit

Modified Files:
	fc6 
Log Message:
Update with FEDORA-2006-1223 (kernel)



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- fc6	13 Nov 2006 11:16:37 -0000	1.141
+++ fc6	14 Nov 2006 18:10:03 -0000	1.142
@@ -3,18 +3,18 @@
 
 ** are items that need attention
 
-CVE-2006-5823 ** kernel
+CVE-2006-5823 version (kernel) [since FEDORA-2006-1223]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
 CVE-2006-5783 ignore (firefox) disputed
-CVE-2006-5757 ** kernel
+CVE-2006-5757 version (kernel) [since FEDORA-2006-1223]
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5748 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5747 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5747 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
-CVE-2006-5701 ** kernel
+CVE-2006-5701 VULNERABLE (kernel, not upstream)
 CVE-2006-5633 ignore (firefox) just a client DoS
-CVE-2006-5619 VULNERABLE (kernel, fixed after 2.6.19-rc3)
+CVE-2006-5619 version (kernel, fixed 2.6.18.2, fixed 2.6.19-rc4) [since FEDORA-2006-1223]
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-5542 VULNERABLE (postgresql, fixed 8.1.5) #212360
 CVE-2006-5541 VULNERABLE (postgresql, fixed 8.1.5) #212360
@@ -33,7 +33,7 @@
 CVE-2006-5462 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
-CVE-2006-5331 VULNERABLE (kernel, fixed after 2.6.19-rc2)
+CVE-2006-5331 VULNERABLE (kernel, fixed 2.6.19-rc3)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5229 ignore (openssh) not reproduced
@@ -71,7 +71,7 @@
 CVE-2006-4600 version (openldap, fixed 2.3.25)
 CVE-2006-4574 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]
 CVE-2006-4573 VULNERABLE (screen) #212057
-CVE-2006-4572 VULNERABLE (kernel, fixed after 2.6.19-rc3)
+CVE-2006-4572 VULNERABLE (kernel, fixed 2.6.19-rc4)
 CVE-2006-4571 version (thunderbird, fixed 1.5.0.7)
 CVE-2006-4571 version (firefox, fixed 1.5.0.7)
 CVE-2006-4570 version (thunderbird, fixed 1.5.0.7)



From fedora-extras-commits at redhat.com  Tue Nov 14 18:18:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 11:18:43 -0700
Subject: rpms/qemu/devel qemu-0.8.2-mb-nops.diff, NONE, 1.1 qemu.spec, 1.21,
	1.22
Message-ID: <200611141818.kAEIIh3W031521@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/qemu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31502

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.8.2-mb-nops.diff 
Log Message:
* Mon Nov 13 2006 Hans de Goede  0.8.2-4
- Backport patch to make FC6 guests work by Kevin Kofler
   (bz 207843).


qemu-0.8.2-mb-nops.diff:

--- NEW FILE qemu-0.8.2-mb-nops.diff ---
===================================================================
RCS file: /sources/qemu/qemu/target-i386/translate.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qemu/target-i386/translate.c	2006/07/10 19:53:04	1.59
+++ qemu/target-i386/translate.c	2006/09/03 17:09:02	1.60
@@ -1615,6 +1615,56 @@
     *offset_ptr = disp;
 }
 
+static void gen_nop_modrm(DisasContext *s, int modrm)
+{
+    int mod, rm, base, code;
+
+    mod = (modrm >> 6) & 3;
+    if (mod == 3)
+        return;
+    rm = modrm & 7;
+
+    if (s->aflag) {
+
+        base = rm;
+        
+        if (base == 4) {
+            code = ldub_code(s->pc++);
+            base = (code & 7);
+        }
+        
+        switch (mod) {
+        case 0:
+            if (base == 5) {
+                s->pc += 4;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 4;
+            break;
+        }
+    } else {
+        switch (mod) {
+        case 0:
+            if (rm == 6) {
+                s->pc += 2;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 2;
+            break;
+        }
+    }
+}
+
 /* used for LEA and MOV AX, mem */
 static void gen_add_A0_ds_seg(DisasContext *s)
 {
@@ -5791,10 +5841,15 @@
             gen_lea_modrm(s, modrm, ®_addr, &offset_addr);
             /* nothing more to do */
             break;
-        default:
-            goto illegal_op;
+        default: /* nop (multi byte) */
+            gen_nop_modrm(s, modrm);
+            break;
         }
         break;
+    case 0x119 ... 0x11f: /* nop (multi byte) */
+        modrm = ldub_code(s->pc++);
+        gen_nop_modrm(s, modrm);
+        break;
     case 0x120: /* mov reg, crN */
     case 0x122: /* mov crN, reg */
         if (s->cpl != 0) {


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qemu.spec	11 Sep 2006 07:36:43 -0000	1.21
+++ qemu.spec	14 Nov 2006 18:18:12 -0000	1.22
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -18,6 +18,7 @@
 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
@@ -44,6 +45,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 ./configure \
@@ -92,6 +94,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Nov 13 2006 Hans de Goede  0.8.2-4
+- Backport patch to make FC6 guests work by Kevin Kofler
+   (bz 207843).
+
 * Mon Sep 11 2006 David Woodhouse  0.8.2-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Nov 14 18:20:15 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 11:20:15 -0700
Subject: rpms/qemu/FC-6 qemu-0.8.2-mb-nops.diff, NONE, 1.1 qemu.spec, 1.21,
	1.22
Message-ID: <200611141820.kAEIKFJ6031591@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/qemu/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31571

Modified Files:
	qemu.spec 
Added Files:
	qemu-0.8.2-mb-nops.diff 
Log Message:
* Mon Nov 13 2006 Hans de Goede  0.8.2-4
- Backport patch to make FC6 guests work by Kevin Kofler
   (bz 207843).


qemu-0.8.2-mb-nops.diff:

--- NEW FILE qemu-0.8.2-mb-nops.diff ---
===================================================================
RCS file: /sources/qemu/qemu/target-i386/translate.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qemu/target-i386/translate.c	2006/07/10 19:53:04	1.59
+++ qemu/target-i386/translate.c	2006/09/03 17:09:02	1.60
@@ -1615,6 +1615,56 @@
     *offset_ptr = disp;
 }
 
+static void gen_nop_modrm(DisasContext *s, int modrm)
+{
+    int mod, rm, base, code;
+
+    mod = (modrm >> 6) & 3;
+    if (mod == 3)
+        return;
+    rm = modrm & 7;
+
+    if (s->aflag) {
+
+        base = rm;
+        
+        if (base == 4) {
+            code = ldub_code(s->pc++);
+            base = (code & 7);
+        }
+        
+        switch (mod) {
+        case 0:
+            if (base == 5) {
+                s->pc += 4;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 4;
+            break;
+        }
+    } else {
+        switch (mod) {
+        case 0:
+            if (rm == 6) {
+                s->pc += 2;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 2;
+            break;
+        }
+    }
+}
+
 /* used for LEA and MOV AX, mem */
 static void gen_add_A0_ds_seg(DisasContext *s)
 {
@@ -5791,10 +5841,15 @@
             gen_lea_modrm(s, modrm, ®_addr, &offset_addr);
             /* nothing more to do */
             break;
-        default:
-            goto illegal_op;
+        default: /* nop (multi byte) */
+            gen_nop_modrm(s, modrm);
+            break;
         }
         break;
+    case 0x119 ... 0x11f: /* nop (multi byte) */
+        modrm = ldub_code(s->pc++);
+        gen_nop_modrm(s, modrm);
+        break;
     case 0x120: /* mov reg, crN */
     case 0x122: /* mov crN, reg */
         if (s->cpl != 0) {


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-6/qemu.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qemu.spec	11 Sep 2006 07:36:43 -0000	1.21
+++ qemu.spec	14 Nov 2006 18:19:44 -0000	1.22
@@ -8,7 +8,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 URL: http://www.qemu.org/
@@ -18,6 +18,7 @@
 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
@@ -44,6 +45,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 ./configure \
@@ -92,6 +94,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Nov 13 2006 Hans de Goede  0.8.2-4
+- Backport patch to make FC6 guests work by Kevin Kofler
+   (bz 207843).
+
 * Mon Sep 11 2006 David Woodhouse  0.8.2-3
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Nov 14 18:23:41 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 11:23:41 -0700
Subject: rpms/qemu/FC-5 qemu-0.8.2-mb-nops.diff, NONE, 1.1 .cvsignore, 1.5, 
	1.6 qemu.spec, 1.14, 1.15 sources, 1.5,
	1.6 qemu-0.8.1-syscall-macros.patch, 1.2, NONE
Message-ID: <200611141823.kAEINfp1031686@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/qemu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31663

Modified Files:
	.cvsignore qemu.spec sources 
Added Files:
	qemu-0.8.2-mb-nops.diff 
Removed Files:
	qemu-0.8.1-syscall-macros.patch 
Log Message:
* Mon Nov 13 2006 Hans de Goede  0.8.2-4
- Backport patch to make FC6 guests work by Kevin Kofler
   (bz 207843).


qemu-0.8.2-mb-nops.diff:

--- NEW FILE qemu-0.8.2-mb-nops.diff ---
===================================================================
RCS file: /sources/qemu/qemu/target-i386/translate.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qemu/target-i386/translate.c	2006/07/10 19:53:04	1.59
+++ qemu/target-i386/translate.c	2006/09/03 17:09:02	1.60
@@ -1615,6 +1615,56 @@
     *offset_ptr = disp;
 }
 
+static void gen_nop_modrm(DisasContext *s, int modrm)
+{
+    int mod, rm, base, code;
+
+    mod = (modrm >> 6) & 3;
+    if (mod == 3)
+        return;
+    rm = modrm & 7;
+
+    if (s->aflag) {
+
+        base = rm;
+        
+        if (base == 4) {
+            code = ldub_code(s->pc++);
+            base = (code & 7);
+        }
+        
+        switch (mod) {
+        case 0:
+            if (base == 5) {
+                s->pc += 4;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 4;
+            break;
+        }
+    } else {
+        switch (mod) {
+        case 0:
+            if (rm == 6) {
+                s->pc += 2;
+            }
+            break;
+        case 1:
+            s->pc++;
+            break;
+        default:
+        case 2:
+            s->pc += 2;
+            break;
+        }
+    }
+}
+
 /* used for LEA and MOV AX, mem */
 static void gen_add_A0_ds_seg(DisasContext *s)
 {
@@ -5791,10 +5841,15 @@
             gen_lea_modrm(s, modrm, ®_addr, &offset_addr);
             /* nothing more to do */
             break;
-        default:
-            goto illegal_op;
+        default: /* nop (multi byte) */
+            gen_nop_modrm(s, modrm);
+            break;
         }
         break;
+    case 0x119 ... 0x11f: /* nop (multi byte) */
+        modrm = ldub_code(s->pc++);
+        gen_nop_modrm(s, modrm);
+        break;
     case 0x120: /* mov reg, crN */
     case 0x122: /* mov crN, reg */
         if (s->cpl != 0) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jun 2006 00:00:44 -0000	1.5
+++ .cvsignore	14 Nov 2006 18:23:11 -0000	1.6
@@ -1 +1 @@
-qemu-0.8.1.tar.gz
+qemu-0.8.2.tar.gz


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qemu.spec	8 Jun 2006 10:18:31 -0000	1.14
+++ qemu.spec	14 Nov 2006 18:23:11 -0000	1.15
@@ -1,63 +1,71 @@
+# For FC >= 6 we have gcc 3.4, for FC <= 5 we have gcc 3.2
+%if %{!?fedora:6}%{?fedora} >= 6
+%define gccver 34
+%else
+%define gccver 32
+%endif
+
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.8.1
-Release: 3%{?dist}
-
+Version: 0.8.2
+Release: 4%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
-URL: http://fabrice.bellard.free.fr/qemu
+URL: http://www.qemu.org/
 Source0: http://www.qemu.org/%{name}-%{version}.tar.gz
 Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
 Patch1: qemu-0.8.0-sdata.patch
-Patch2: qemu-0.8.1-syscall-macros.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-32 zlib-devel texi2html
-PreReq: /sbin/chkconfig
-PreReq: /sbin/service
-ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64
+BuildRequires: SDL-devel compat-gcc-%{gccver} zlib-devel which texi2html
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service /sbin/chkconfig
+Requires(postun): /sbin/service
+ExclusiveArch: %{ix86} x86_64 ppc alpha sparc armv4l
 
 %description
-By using dynamic translation it achieves a reasonable speed while being easy
-to port on new host CPUs. QEMU has two operating modes:
+QEMU is a generic and open source processor emulator which achieves a good
+emulation speed by using dynamic translation. QEMU has two operating modes:
 
+ * Full system emulation. In this mode, QEMU emulates a full system (for
+   example a PC), including a processor and various peripherials. It can be
+   used to launch different Operating Systems without rebooting the PC or
+   to debug system code.
  * User mode emulation. In this mode, QEMU can launch Linux processes compiled
-   for one CPU on another CPU. Linux system calls are converted because of
-   endianness and 32/64 bit mismatches. Wine (Windows emulation) and DOSEMU
-   (DOS emulation) are the main targets for QEMU.
- * Full system emulation. In this mode, QEMU emulates a full system, including
-   a processor and various peripherals. Currently, it is only used to launch
-   an x86 Linux kernel on an x86 Linux system. It enables easier testing and
-   debugging of system code. It can also be used to provide virtual hosting
-   of several virtual PC on a single server.
+   for one CPU on another CPU.
 
-As QEMU requires no host kernel patches to run, it is very safe and easy to use.
+As QEMU requires no host kernel patches to run, it is safe and easy to use.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \
-%ifarch x86_64
-   --target-list="i386-user arm-user armeb-user ppc-user mips-user mipsel-user i386-softmmu ppc-softmmu  x86_64-softmmu mips-softmmu arm-softmmu" \
-%endif
-   --cc=gcc32 --enable-alsa
-make
+./configure \
+    --prefix=%{_prefix} \
+    --interp-prefix=%{_prefix}/qemu-%%M \
+    --cc=gcc%{gccver} \
+    --enable-alsa
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make prefix="${RPM_BUILD_ROOT}%{_prefix}" \
-	bindir="${RPM_BUILD_ROOT}%{_bindir}" \
-	sharedir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" \
-	mandir="${RPM_BUILD_ROOT}%{_mandir}" \
-	docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
-	datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
+     bindir="${RPM_BUILD_ROOT}%{_bindir}" \
+     sharedir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" \
+     mandir="${RPM_BUILD_ROOT}%{_mandir}" \
+     docdir="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" \
+     datadir="${RPM_BUILD_ROOT}%{_prefix}/share/qemu" install
 
-install -D $RPM_SOURCE_DIR/qemu.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
+install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/qemu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,22 +74,52 @@
 /sbin/chkconfig --add qemu
 
 %preun
-if [ $1 = 0 ]; then
-        /sbin/service qemu stop > /dev/null 2>&1
+if [ $1 -eq 0 ]; then
+    /sbin/service qemu stop &>/dev/null || :
+    /sbin/chkconfig --del qemu
+fi
+
+%postun
+if [ $1 -ge 1 ]; then
+    /sbin/service qemu condrestart &>/dev/null || :
 fi
-/sbin/chkconfig --del qemu
 
 %files
 %defattr(-,root,root)
 %doc Changelog README README.distrib TODO
-%doc qemu-tech.texi qemu-doc.texi
-%doc *.html
-%{_bindir}/qemu*
-%{_prefix}/share/qemu
-%{_mandir}/man?/*
+%doc qemu-doc.html qemu-tech.html
 %config %{_sysconfdir}/rc.d/init.d/qemu
+%{_bindir}/qemu*
+%{_prefix}/share/qemu/
+%{_mandir}/man1/*
 
 %changelog
+* Mon Nov 13 2006 Hans de Goede  0.8.2-4
+- Backport patch to make FC6 guests work by Kevin Kofler
+   (bz 207843).
+
+* Mon Sep 11 2006 David Woodhouse  0.8.2-3
+- Rebuild
+
+* Thu Aug 24 2006 Matthias Saou  0.8.2-2
+- Remove the target-list iteration for x86_64 since they all build again.
+- Make gcc32 vs. gcc34 conditional on %%{fedora} to share the same spec for
+  FC5 and FC6.
+
+* Wed Aug 23 2006 Matthias Saou  0.8.2-1
+- Update to 0.8.2 (#200065).
+- Drop upstreamed syscall-macros patch2.
+- Put correct scriplet dependencies.
+- Force install mode for the init script to avoid umask problems.
+- Add %%postun condrestart for changes to the init script to be applied if any.
+- Update description with the latest "about" from the web page (more current).
+- Update URL to qemu.org one like the Source.
+- Add which build requirement.
+- Don't include texi files in %%doc since we ship them in html.
+- Switch to using gcc34 on devel, FC5 still has gcc32.
+- Add kernheaders patch to fix linux/compiler.h inclusion.
+- Add target-sparc patch to fix compiling on ppc (some int32 to float).
+
 * Thu Jun  8 2006 David Woodhouse  0.8.1-3
 - More header abuse in modify_ldt(), change BuildRoot:
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jun 2006 00:00:44 -0000	1.5
+++ sources	14 Nov 2006 18:23:11 -0000	1.6
@@ -1 +1 @@
-67d924324a5ab79d017bd97a1e767285  qemu-0.8.1.tar.gz
+5b3a89eb2f256a8a6f3bb07f7b3f1b07  qemu-0.8.2.tar.gz


--- qemu-0.8.1-syscall-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 18:32:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 14 Nov 2006 11:32:54 -0700
Subject: rpms/qemu/FC-5 qemu-0.8.2-kernheaders.patch, NONE,
	1.1 qemu-0.8.2-target-sparc.patch, NONE, 1.1
Message-ID: <200611141832.kAEIWsFw031874@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/qemu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864

Added Files:
	qemu-0.8.2-kernheaders.patch qemu-0.8.2-target-sparc.patch 
Log Message:
* Mon Nov 13 2006 Hans de Goede  0.8.2-4
- Backport patch to make FC6 guests work by Kevin Kofler
   (bz 207843).


qemu-0.8.2-kernheaders.patch:

--- NEW FILE qemu-0.8.2-kernheaders.patch ---
diff -Naupr qemu-0.8.2.orig/usb-linux.c qemu-0.8.2/usb-linux.c
--- qemu-0.8.2.orig/usb-linux.c	2006-07-22 19:23:34.000000000 +0200
+++ qemu-0.8.2/usb-linux.c	2006-08-23 18:47:16.000000000 +0200
@@ -26,7 +26,6 @@
 #if defined(__linux__)
 #include 
 #include 
-#include 
 #include 
 #include 
 

qemu-0.8.2-target-sparc.patch:

--- NEW FILE qemu-0.8.2-target-sparc.patch ---
diff -Naupr qemu-0.8.2.orig/target-sparc/op_helper.c qemu-0.8.2/target-sparc/op_helper.c
--- qemu-0.8.2.orig/target-sparc/op_helper.c	2006-07-22 19:23:34.000000000 +0200
+++ qemu-0.8.2/target-sparc/op_helper.c	2006-08-24 10:58:30.000000000 +0200
@@ -12,12 +12,12 @@ void raise_exception(int tt)
 #ifdef USE_INT_TO_FLOAT_HELPERS
 void do_fitos(void)
 {
-    FT0 = int32_to_float32(*((int32_t *)&FT1));
+    FT0 = int32_to_float32(*((int32_t *)&FT1), &env->fp_status);
 }
 
 void do_fitod(void)
 {
-    DT0 = int32_to_float64(*((int32_t *)&FT1));
+    DT0 = int32_to_float64(*((int32_t *)&FT1), &env->fp_status);
 }
 #endif
 



From fedora-extras-commits at redhat.com  Tue Nov 14 18:39:05 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 11:39:05 -0700
Subject: rpms/rrdtool/devel rrdtool.spec,1.24,1.25
Message-ID: <200611141839.kAEId5EM031946@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31928

Modified Files:
	rrdtool.spec 
Log Message:
- Conditionalize python, php and tcl bits (Resolves #203275)




Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rrdtool.spec	25 Oct 2006 19:28:53 -0000	1.24
+++ rrdtool.spec	14 Nov 2006 18:38:35 -0000	1.25
@@ -1,10 +1,13 @@
+%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.2.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -13,13 +16,8 @@
 Patch0: rrdtool-1.2.13-php.patch
 Patch1: rrdtool-1.2.15-initrrdtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-c++, openssl-devel
+BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
-BuildRequires: freetype-devel, python-devel >= 2.3
-
-%{!?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
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -60,18 +58,24 @@
 %description perl
 The Perl RRDtool bindings
 
+%if %{with_python}
 %package python
 Summary: Python RRDtool bindings
 Group: Development/Languages
-BuildRequires: python
+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
@@ -84,7 +88,9 @@
 %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
@@ -96,12 +102,15 @@
 
 %description tcl
 The %{name}-tcl package includes RRDtool bindings for Tcl.
+%endif
 
 %prep
 %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
+%endif
 %patch1 -p1 -b .initrrdtool
 
 # Fix to find correct python dir on lib64
@@ -115,11 +124,20 @@
 
 %build
 %configure \
-    --disable-static \
-    --with-pic \
+    --with-perl-options='INSTALLDIRS="vendor"' \
+%if %{with_tcl}
     --enable-tcl-site \
     --with-tcllib=%{_libdir} \
-    --with-perl-options='INSTALLDIRS="vendor"'
+%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' \
@@ -135,6 +153,7 @@
 %{__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/
@@ -144,6 +163,7 @@
 %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmp}
+%endif
 
 # Fix @perl@ and @PERL@
 find examples/ -type f \
@@ -156,6 +176,7 @@
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 # 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
@@ -166,6 +187,7 @@
 ; Enable rrdtool extension module
 extension=rrdtool.so
 __EOF__
+%endif
 
 # Pesky RRDp.pm...
 %{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
@@ -224,24 +246,33 @@
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
 
+%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 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)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 19:14:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 12:14:13 -0700
Subject: rpms/rrdtool/FC-5 rrdtool.spec,1.24,1.25
Message-ID: <200611141914.kAEJEDCU002704@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2671/FC-5

Modified Files:
	rrdtool.spec 
Log Message:
Conditionalize build of python, php and tcl bits (Resolves #203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rrdtool.spec	25 Oct 2006 19:37:47 -0000	1.24
+++ rrdtool.spec	14 Nov 2006 19:13:43 -0000	1.25
@@ -1,10 +1,13 @@
+%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.2.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -13,13 +16,8 @@
 Patch0: rrdtool-1.2.13-php.patch
 Patch1: rrdtool-1.2.15-initrrdtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-c++, openssl-devel
+BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
-BuildRequires: freetype-devel, python-devel >= 2.3
-
-%{!?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
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -60,18 +58,24 @@
 %description perl
 The Perl RRDtool bindings
 
+%if %{with_python}
 %package python
 Summary: Python RRDtool bindings
 Group: Development/Languages
-BuildRequires: python
+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
@@ -84,7 +88,9 @@
 %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
@@ -96,12 +102,15 @@
 
 %description tcl
 The %{name}-tcl package includes RRDtool bindings for Tcl.
+%endif
 
 %prep
 %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
+%endif
 %patch1 -p1 -b .initrrdtool
 
 # Fix to find correct python dir on lib64
@@ -115,11 +124,20 @@
 
 %build
 %configure \
-    --disable-static \
-    --with-pic \
+    --with-perl-options='INSTALLDIRS="vendor"' \
+%if %{with_tcl}
     --enable-tcl-site \
     --with-tcllib=%{_libdir} \
-    --with-perl-options='INSTALLDIRS="vendor"'
+%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' \
@@ -135,6 +153,7 @@
 %{__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/
@@ -144,6 +163,7 @@
 %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmp}
+%endif
 
 # Fix @perl@ and @PERL@
 find examples/ -type f \
@@ -156,6 +176,7 @@
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 # 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
@@ -166,6 +187,7 @@
 ; Enable rrdtool extension module
 extension=rrdtool.so
 __EOF__
+%endif
 
 # Pesky RRDp.pm...
 %{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
@@ -224,24 +246,33 @@
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
 
+%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 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)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 19:14:14 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 12:14:14 -0700
Subject: rpms/rrdtool/FC-6 rrdtool.spec,1.24,1.25
Message-ID: <200611141914.kAEJEEkJ002707@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2671/FC-6

Modified Files:
	rrdtool.spec 
Log Message:
Conditionalize build of python, php and tcl bits (Resolves #203275)


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-6/rrdtool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rrdtool.spec	25 Oct 2006 19:35:22 -0000	1.24
+++ rrdtool.spec	14 Nov 2006 19:13:44 -0000	1.25
@@ -1,10 +1,13 @@
+%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.2.15
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
@@ -13,13 +16,8 @@
 Patch0: rrdtool-1.2.13-php.patch
 Patch1: rrdtool-1.2.15-initrrdtool.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gcc-c++, openssl-devel
+BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
-BuildRequires: freetype-devel, python-devel >= 2.3
-
-%{!?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
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -60,18 +58,24 @@
 %description perl
 The Perl RRDtool bindings
 
+%if %{with_python}
 %package python
 Summary: Python RRDtool bindings
 Group: Development/Languages
-BuildRequires: python
+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
@@ -84,7 +88,9 @@
 %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
@@ -96,12 +102,15 @@
 
 %description tcl
 The %{name}-tcl package includes RRDtool bindings for Tcl.
+%endif
 
 %prep
 %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
+%endif
 %patch1 -p1 -b .initrrdtool
 
 # Fix to find correct python dir on lib64
@@ -115,11 +124,20 @@
 
 %build
 %configure \
-    --disable-static \
-    --with-pic \
+    --with-perl-options='INSTALLDIRS="vendor"' \
+%if %{with_tcl}
     --enable-tcl-site \
     --with-tcllib=%{_libdir} \
-    --with-perl-options='INSTALLDIRS="vendor"'
+%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' \
@@ -135,6 +153,7 @@
 %{__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/
@@ -144,6 +163,7 @@
 %{__make} %{?_smp_mflags}
 popd
 %{__rm} -rf %{rrdtmp}
+%endif
 
 # Fix @perl@ and @PERL@
 find examples/ -type f \
@@ -156,6 +176,7 @@
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 # 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
@@ -166,6 +187,7 @@
 ; Enable rrdtool extension module
 extension=rrdtool.so
 __EOF__
+%endif
 
 # Pesky RRDp.pm...
 %{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
@@ -224,24 +246,33 @@
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
 
+%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 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)
 



From fedora-extras-commits at redhat.com  Tue Nov 14 20:19:18 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:19:18 -0700
Subject: rpms/compat-libosip2 - New directory
Message-ID: <200611142019.kAEKJIHt006196@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6190/compat-libosip2

Log Message:
Directory /cvs/extras/rpms/compat-libosip2 added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 20:19:24 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:19:24 -0700
Subject: rpms/compat-libosip2/devel - New directory
Message-ID: <200611142019.kAEKJOLW006210@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6190/compat-libosip2/devel

Log Message:
Directory /cvs/extras/rpms/compat-libosip2/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 20:19:39 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:19:39 -0700
Subject: rpms/compat-libosip2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611142019.kAEKJdAu006241@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6235

Added Files:
	Makefile import.log 
Log Message:
Setup of module compat-libosip2


--- NEW FILE Makefile ---
# Top level Makefile for module compat-libosip2
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  Tue Nov 14 20:19:44 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:19:44 -0700
Subject: rpms/compat-libosip2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611142019.kAEKJiU2006257@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6235/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compat-libosip2


--- 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 Nov 14 20:20:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:20:45 -0700
Subject: rpms/compat-libosip2 import.log,1.1,1.2
Message-ID: <200611142020.kAEKKjjs006339@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6302

Modified Files:
	import.log 
Log Message:
auto-import compat-libosip2-2.2.2-8.fc6 on branch devel from compat-libosip2-2.2.2-8.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 20:19:38 -0000	1.1
+++ import.log	14 Nov 2006 20:20:15 -0000	1.2
@@ -0,0 +1 @@
+compat-libosip2-2_2_2-8_fc6:HEAD:compat-libosip2-2.2.2-8.fc6.src.rpm:1163535661



From fedora-extras-commits at redhat.com  Tue Nov 14 20:20:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:20:45 -0700
Subject: rpms/compat-libosip2/devel compat-libosip2.spec, NONE,
	1.1 libosip2-2.2.2-x64.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611142020.kAEKKjU6006343@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6302/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compat-libosip2.spec libosip2-2.2.2-x64.patch 
Log Message:
auto-import compat-libosip2-2.2.2-8.fc6 on branch devel from compat-libosip2-2.2.2-8.fc6.src.rpm


--- NEW FILE compat-libosip2.spec ---
Name:           compat-libosip2
Version:        2.2.2
Release:        8%{?dist}

Summary:        oSIP is an implementation of SIP

Group:          System Environment/Libraries
License:        LGPL

URL:            http://www.gnu.org/software/osip/
Source0:        http://ftp.gnu.org/gnu/osip/libosip2-%{version}.tar.gz

Patch:          libosip2-2.2.2-x64.patch

Provides:       libosip2 = 2.2.2-5%{?dist}
Obsoletes:      libosip2 < 2.2.2-5%{?dist}

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
oSIP is an implementation of SIP.

SIP stands for the Session Initiation Protocol and is described by the
rfc3261 (wich deprecates rfc2543). This library aims to provide
multimedia and telecom software developers an easy and powerful
interface to initiate and control SIP based sessions in their
applications. SIP is a open standard replacement from IETF for H.323.

This is a compatibility package for applications that have not been
rewritten to use the APIs in newer versions of libosip2.

%package        devel
Summary:        Development libraries for oSIP
Group:          Development/Libraries

Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

Provides:       libosip2-devel = 2.2.2-5%{?dist}
Obsoletes:      libosip2-devel < 2.2.2-5%{?dist}

%description    devel
The GNU oSIP library is written in C and get no dependencies except the
standard C library. oSIP is thread safe and will generally be used in a
multi-threaded application. Nevertheless, this is optional.

oSIP is little in size and code and thus could be use to implement IP
soft-phone as well as embedded SIP software. oSIP is not limited to endpoint
agents, and can also be used to implement "SIP proxy".

oSIP does not intend to provide a high layer API for controlling "SIP Session"
at this step. Instead, it currently provides an API for the SIP message parser,
SDP message parser, and library to handle "SIP transactions" as defined by the
SIP document.

%prep
%setup -q -n libosip2-%{version}
%patch -p1 -b .x64

%{__perl} -pi.compat -e 's/-l([^2]+2)?/-l\1-2.2.2/g' libosip2.pc.in

%build
%configure --disable-static --includedir=%{_includedir}/osip2-2.2.2
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
mv %{buildroot}%{_mandir}/man1/osip.1 %{buildroot}%{_mandir}/man1/osip2-2.2.2.1
mv %{buildroot}%{_libdir}/libosip2.so %{buildroot}%{_libdir}/libosip2-2.2.2.so
mv %{buildroot}%{_libdir}/libosipparser2.so %{buildroot}%{_libdir}/libosipparser2-2.2.2.so
mv %{buildroot}%{_libdir}/pkgconfig/libosip2.pc %{buildroot}%{_libdir}/pkgconfig/libosip2-2.2.2.pc

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING ChangeLog FEATURES HISTORY NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/osip2-2.2.2
%{_includedir}/osip2-2.2.2/osip2
%{_includedir}/osip2-2.2.2/osipparser2
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_mandir}/man1/*.1*

%changelog
* Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-8
- Add Obsoletes

* Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-7
- Fix up provides/obsoletes/conflicts
- Fix package name

* Sat Nov 11 2006 Jeffrey C. Ollie  - 2.2.2-6
- Reconfigure as a compat- package

* Wed Aug 30 2006 Jeffrey C. Ollie  - 2.2.2-4
- Bump release and rebuild.

* Thu Feb 23 2006 Ignacio Vazquez-Abrams  2.2.2-3
- Fix for AMD64

* Mon Feb 13 2006 Ignacio Vazquez-Abrams  2.2.2-2
- Rebuild for Fedora Extras 5

* Thu Dec 22 2005 Ignacio Vazquez-Abrams  2.2.2-1
- Upstream update

* Sat Oct 15 2005 Ignacio Vazquez-Abrams  2.2.1-1
- Upstream update
- Disable static library

* Thu Apr  7 2005 Michael Schwendt 
- rebuilt

* Thu Mar 24 2005 Ignacio Vazquez-Abrams  2.2.0-2
- Renamed osip.1 and moved to -devel

* Thu Mar 24 2005 Ignacio Vazquez-Abrams  2.2.0-1
- Initial RPM release.

libosip2-2.2.2-x64.patch:

--- NEW FILE libosip2-2.2.2-x64.patch ---
--- libosip2-2.2.2/src/osipparser2/osip_parser_cfg.c.x64	2006-02-23 13:29:36.000000000 -0500
+++ libosip2-2.2.2/src/osipparser2/osip_parser_cfg.c	2006-02-23 13:31:48.000000000 -0500
@@ -32,8 +32,15 @@
  * Anyway, this mechanism improves the search time (from binary seach (log(n)) to 1).
  */
 
-#define HASH_TABLE_SIZE 150     /* set this to the hash table size, 150 is the first size
-                                   where no conflicts occur                               */
+#ifndef HASH_TABLE_SIZE
+#ifdef __amd64__
+#define HASH_TABLE_SIZE 450
+#else
+#define HASH_TABLE_SIZE 150     /* set this to the hash table size, 150 is the
+				   first size where no conflicts occur */
+#endif
+#endif
+
 static int hdr_ref_table[HASH_TABLE_SIZE];      /* the hashtable contains indices to the pconfig table    */
 
 /*
@@ -146,6 +153,10 @@
       } else
         {
           /* oops, conflict!-> change the hash table or use another hash function size */
+	  
+	  OSIP_TRACE (osip_trace
+		(__FILE__, __LINE__, OSIP_ERROR, NULL,
+		"conflict with current hashtable size\n"));
           return -1;
         }
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 20:19:44 -0000	1.1
+++ .cvsignore	14 Nov 2006 20:20:15 -0000	1.2
@@ -0,0 +1 @@
+libosip2-2.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 20:19:44 -0000	1.1
+++ sources	14 Nov 2006 20:20:15 -0000	1.2
@@ -0,0 +1 @@
+40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 20:30:43 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:30:43 -0700
Subject: rpms/beryl-core - New directory
Message-ID: <200611142030.kAEKUhiR006621@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/beryl-core

Log Message:
Directory /cvs/extras/rpms/beryl-core added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 20:30:49 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:30:49 -0700
Subject: rpms/beryl-core/devel - New directory
Message-ID: <200611142030.kAEKUnNR006640@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6617/beryl-core/devel

Log Message:
Directory /cvs/extras/rpms/beryl-core/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 14 20:31:04 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:31:04 -0700
Subject: rpms/beryl-core Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611142031.kAEKV4QH006677@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6671

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-core


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-core
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  Tue Nov 14 20:31:10 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:31:10 -0700
Subject: rpms/beryl-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611142031.kAEKVAwS006694@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6671/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-core


--- 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 Nov 14 20:32:06 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:32:06 -0700
Subject: rpms/beryl-core/devel beryl-core.spec, NONE,
	1.1 mesa-6.4.1-x86_64-fixes-1.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611142032.kAEKW6UL006791@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6749/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-core.spec mesa-6.4.1-x86_64-fixes-1.patch 
Log Message:
auto-import beryl-core-0.1.2-3.fc6 on branch devel from beryl-core-0.1.2-3.fc6.src.rpm


--- NEW FILE beryl-core.spec ---
Name:           beryl-core
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        3%{?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
Patch0:         mesa-6.4.1-x86_64-fixes-1.patch

# libdrm is not avaliable on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       mesa-libGL >= 6.5-9
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

Provides:       beryl = %{name}-%{version}

BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
BuildRequires:  startup-notification-devel >= 0.7
BuildRequires:  gettext-devel, libtool, intltool
BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
BuildRequires:  dbus-glib, dbus-devel, librsvg2-devel

%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.


%package devel
Summary: Development packages for beryl
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
The beryl-core-devel package includes the header
and library files for the beryl-core
package.


%prep
%setup -q
%patch0 -p0 -b .mesa64
#autoreconf -v --install


%build
%configure --enable-librsvg --enable-libsvg-cairo
ln -s %{_includedir}/X11 mesa/include/
ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
# Parallel builds currently broken
#make %{?_smp_mflags}
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# Kill static lib and libtool lib
rm -f $RPM_BUILD_ROOT%{_libdir}/libberylsettings.{a,la}


%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/beryl*
%dir %{_datadir}/beryl
%{_datadir}/beryl/*.png
%{_mandir}/man1/beryl*
%{_libdir}/libberylsettings.so.0
%{_libdir}/libberylsettings.so.0.0.0


%files devel
%defattr(-,root,root,-)
%{_libdir}/libberylsettings.so
%{_libdir}/pkgconfig/*.pc
%dir %{_includedir}/beryl
%{_includedir}/beryl/*.h
%{_mandir}/man3/beryl*


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-3
- Put man3 in -devel, remove dead libsvg-cairo-devel BR

* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarballs, now that they finally exist
- Add proper ldconfig bits

* Thu Nov 09 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson  0.1.1-3
- Trim Requires: down a bit

* Thu Oct 26 2006 Jarod Wilson  0.1.1-2
- BR cleanups, should allow building on FC5 - devel

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Move autoreconf bits to prep section

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build

mesa-6.4.1-x86_64-fixes-1.patch:

--- NEW FILE mesa-6.4.1-x86_64-fixes-1.patch ---
--- Mesa-6.4.1/src/glx/x11/indirect_vertex_array.c	2005-08-19 20:53:26.000000000 +0200
+++ mesa/src/glx/x11/indirect_vertex_array.c	2005-12-14 12:28:02.000000000 +0100
@@ -123,10 +123,10 @@
     struct array_state_vector * arrays;
 
     unsigned array_count;
-    unsigned texture_units = 1;
+    int texture_units = 1;
     unsigned i;
     unsigned j;
-    unsigned vertex_program_attribs = 0;
+    int vertex_program_attribs = 0;
 
     GLboolean got_fog = GL_FALSE;
     GLboolean got_secondary_color = GL_FALSE;
@@ -643,11 +643,10 @@
 
     GLubyte * pc;
     size_t elements_per_request;
-    unsigned total_requests = 0;
+    size_t total_requests = 0;
     unsigned i;
     size_t total_sent = 0;
 
-
     pc = emit_DrawArrays_header_old( gc, arrays, & elements_per_request,
 				     & total_requests, mode, count);
 
@@ -773,7 +772,7 @@
 
     GLubyte * pc;
     size_t elements_per_request;
-    unsigned total_requests = 0;
+    size_t total_requests = 0;
     unsigned i;
     unsigned req;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Nov 2006 20:31:10 -0000	1.1
+++ .cvsignore	14 Nov 2006 20:31:35 -0000	1.2
@@ -0,0 +1 @@
+beryl-core-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Nov 2006 20:31:10 -0000	1.1
+++ sources	14 Nov 2006 20:31:35 -0000	1.2
@@ -0,0 +1 @@
+045aceb6e48e997c952d942fbe841e76  beryl-core-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 20:32:05 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:32:05 -0700
Subject: rpms/beryl-core import.log,1.1,1.2
Message-ID: <200611142032.kAEKW5Ff006787@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6749

Modified Files:
	import.log 
Log Message:
auto-import beryl-core-0.1.2-3.fc6 on branch devel from beryl-core-0.1.2-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Nov 2006 20:31:04 -0000	1.1
+++ import.log	14 Nov 2006 20:31:35 -0000	1.2
@@ -0,0 +1 @@
+beryl-core-0_1_2-3_fc6:HEAD:beryl-core-0.1.2-3.fc6.src.rpm:1163536291



From fedora-extras-commits at redhat.com  Tue Nov 14 20:35:20 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 14 Nov 2006 13:35:20 -0700
Subject: owners owners.list,1.1958,1.1959
Message-ID: <200611142035.kAEKZKLB006860@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6844

Modified Files:
	owners.list 
Log Message:
Add beryl-core


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1958
retrieving revision 1.1959
diff -u -r1.1958 -r1.1959
--- owners.list	14 Nov 2006 12:51:03 -0000	1.1958
+++ owners.list	14 Nov 2006 20:34:50 -0000	1.1959
@@ -108,6 +108,7 @@
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-core|Beryl OpenGL window and compositing manager|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 20:40:12 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:40:12 -0700
Subject: owners owners.list,1.1959,1.1960
Message-ID: <200611142040.kAEKeC75006945@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6929

Modified Files:
	owners.list 
Log Message:
Adding compat-libosip2


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1959
retrieving revision 1.1960
diff -u -r1.1959 -r1.1960
--- owners.list	14 Nov 2006 20:34:50 -0000	1.1959
+++ owners.list	14 Nov 2006 20:39:42 -0000	1.1960
@@ -217,6 +217,7 @@
 Fedora Extras|commoncpp2|GNU Common C++ class framework|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|compat-erlang|Compatibility version of Erlang|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|compat-libgda|Library for writing gnome database programs|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|compat-libosip2|oSIP is an implementation of SIP|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|compat-wxGTK|Compatibility version of the wxWidgets GUI library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|compat-wxPythonGTK2|Compatibility version of the wxWidgets GUI toolkit for Python|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|compface|Library for handling X-Faces|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 20:52:20 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 13:52:20 -0700
Subject: rpms/libosip2/FC-6 .cvsignore, 1.4, 1.5 libosip2.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200611142052.kAEKqKG8007055@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7027

Modified Files:
	.cvsignore libosip2.spec sources 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 23:59:46 -0000	1.4
+++ .cvsignore	14 Nov 2006 20:51:50 -0000	1.5
@@ -1 +1 @@
-libosip2-2.2.2.tar.gz
+libosip2-3.0.1.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-6/libosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libosip2.spec	30 Aug 2006 14:55:43 -0000	1.9
+++ libosip2.spec	14 Nov 2006 20:51:50 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libosip2
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -8,7 +8,6 @@
 License:        LGPL
 URL:            http://www.gnu.org/software/osip/
 Source0:        http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
-Patch:          libosip2-2.2.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -41,20 +40,19 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x64
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT%{_mandir}/man1/osip.1 $RPM_BUILD_ROOT%{_mandir}/man1/osip2.1
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+mv %{buildroot}%{_mandir}/man1/osip.1 %{buildroot}%{_mandir}/man1/osip2.1
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -74,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
+- Update to 3.0.1 and remove unnecessary patch.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie  - 2.2.2-4
 - Bump release and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 23:59:46 -0000	1.4
+++ sources	14 Nov 2006 20:51:50 -0000	1.5
@@ -1 +1 @@
-40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz
+417833bb363ffd7c762ff17c931651df  libosip2-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 20:54:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 14 Nov 2006 13:54:36 -0700
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.23, 1.24 abcm2ps.spec, 1.25,
	1.26 sources, 1.23, 1.24
Message-ID: <200611142054.kAEKsatF007129@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7077/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	2 Oct 2006 20:32:46 -0000	1.23
+++ .cvsignore	14 Nov 2006 20:54:06 -0000	1.24
@@ -1,2 +1,2 @@
-abcm2ps-5.1.1.tar.gz
+abcm2ps-5.1.2.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/abcm2ps.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- abcm2ps.spec	2 Oct 2006 20:32:46 -0000	1.25
+++ abcm2ps.spec	14 Nov 2006 20:54:06 -0000	1.26
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.1
+Version:        5.1.2
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
+- new version 5.1.2
+
 * Mon Oct  2 2006 Gerard Milmeister  - 5.1.1-1
 - new version 5.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	2 Oct 2006 20:32:46 -0000	1.23
+++ sources	14 Nov 2006 20:54:06 -0000	1.24
@@ -1,2 +1,2 @@
-48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
+2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Nov 14 20:54:37 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 14 Nov 2006 13:54:37 -0700
Subject: rpms/abcm2ps/FC-6 .cvsignore, 1.24, 1.25 abcm2ps.spec, 1.27,
	1.28 sources, 1.24, 1.25
Message-ID: <200611142054.kAEKsbHB007134@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7077/FC-6

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	2 Oct 2006 20:31:45 -0000	1.24
+++ .cvsignore	14 Nov 2006 20:54:07 -0000	1.25
@@ -1,2 +1,2 @@
-abcm2ps-5.1.1.tar.gz
+abcm2ps-5.1.2.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/abcm2ps.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- abcm2ps.spec	2 Oct 2006 20:31:45 -0000	1.27
+++ abcm2ps.spec	14 Nov 2006 20:54:07 -0000	1.28
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.1
+Version:        5.1.2
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
+- new version 5.1.2
+
 * Mon Oct  2 2006 Gerard Milmeister  - 5.1.1-1
 - new version 5.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Oct 2006 20:31:45 -0000	1.24
+++ sources	14 Nov 2006 20:54:07 -0000	1.25
@@ -1,2 +1,2 @@
-48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
+2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Nov 14 20:54:38 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 14 Nov 2006 13:54:38 -0700
Subject: rpms/abcm2ps/devel .cvsignore, 1.24, 1.25 abcm2ps.spec, 1.27,
	1.28 sources, 1.24, 1.25
Message-ID: <200611142054.kAEKscne007139@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7077/devel

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	2 Oct 2006 20:31:45 -0000	1.24
+++ .cvsignore	14 Nov 2006 20:54:07 -0000	1.25
@@ -1,2 +1,2 @@
-abcm2ps-5.1.1.tar.gz
+abcm2ps-5.1.2.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- abcm2ps.spec	2 Oct 2006 20:31:45 -0000	1.27
+++ abcm2ps.spec	14 Nov 2006 20:54:07 -0000	1.28
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.1
+Version:        5.1.2
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.1.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
+- new version 5.1.2
+
 * Mon Oct  2 2006 Gerard Milmeister  - 5.1.1-1
 - new version 5.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Oct 2006 20:31:45 -0000	1.24
+++ sources	14 Nov 2006 20:54:07 -0000	1.25
@@ -1,2 +1,2 @@
-48f744f40142097b5cd63676c13342bc  abcm2ps-5.1.1.tar.gz
+2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Nov 14 21:01:06 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 14:01:06 -0700
Subject: rpms/libosip2/FC-6 libosip2-2.2.2-x64.patch,1.1,NONE
Message-ID: <200611142101.kAEL16La009409@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9063

Removed Files:
	libosip2-2.2.2-x64.patch 
Log Message:
Don't forget to remove outdated patch.


--- libosip2-2.2.2-x64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 21:04:22 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 14:04:22 -0700
Subject: rpms/libosip2/devel .cvsignore, 1.4, 1.5 libosip2.spec, 1.9,
	1.10 sources, 1.4, 1.5 libosip2-2.2.2-x64.patch, 1.1, NONE
Message-ID: <200611142104.kAEL4M5m010338@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10318

Modified Files:
	.cvsignore libosip2.spec sources 
Removed Files:
	libosip2-2.2.2-x64.patch 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 23:59:46 -0000	1.4
+++ .cvsignore	14 Nov 2006 21:03:51 -0000	1.5
@@ -1 +1 @@
-libosip2-2.2.2.tar.gz
+libosip2-3.0.1.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/libosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libosip2.spec	30 Aug 2006 14:55:43 -0000	1.9
+++ libosip2.spec	14 Nov 2006 21:03:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libosip2
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -8,7 +8,6 @@
 License:        LGPL
 URL:            http://www.gnu.org/software/osip/
 Source0:        http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
-Patch:          libosip2-2.2.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -41,20 +40,19 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x64
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT%{_mandir}/man1/osip.1 $RPM_BUILD_ROOT%{_mandir}/man1/osip2.1
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+mv %{buildroot}%{_mandir}/man1/osip.1 %{buildroot}%{_mandir}/man1/osip2.1
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -74,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
+- Update to 3.0.1 and remove unnecessary patch.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie  - 2.2.2-4
 - Bump release and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 23:59:46 -0000	1.4
+++ sources	14 Nov 2006 21:03:51 -0000	1.5
@@ -1 +1 @@
-40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz
+417833bb363ffd7c762ff17c931651df  libosip2-3.0.1.tar.gz


--- libosip2-2.2.2-x64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 14 21:20:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Nov 2006 14:20:45 -0700
Subject: owners owners.list,1.1960,1.1961
Message-ID: <200611142120.kAELKj5Z010632@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10599

Modified Files:
	owners.list 
Log Message:
Change my email address.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1960
retrieving revision 1.1961
diff -u -r1.1960 -r1.1961
--- owners.list	14 Nov 2006 20:39:42 -0000	1.1960
+++ owners.list	14 Nov 2006 21:20:15 -0000	1.1961
@@ -12,7 +12,7 @@
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 Fedora Extras|915resolution|Intel video BIOS hack to support certain resolutions|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|aalib|An ASCII art library|garrick at usc.edu|extras-qa at fedoraproject.org|
-Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|abcde|A Better CD Encoder|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abcMIDI|ABC to/from MIDI conversion utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -100,7 +100,7 @@
 Fedora Extras|banshee|Music tool to easily import, manage, and play selections from your iPod|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|baobab|Graphical tool to analyse directory trees|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|barcode|Generates barcodes from text strings|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|bash-completion|Programmable completion for Bash|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|bash-completion|Programmable completion for Bash|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|basket|Notes taker for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -156,7 +156,7 @@
 Fedora Extras|bzr-gtk|Bazaar plugin for GTK+ interfaces to most Bazaar operations|wtogami at redhat.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|bzrtools|A collection of utilities and plugins for Bazaar-NG|shahms at shahms.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cabextract|A Microsoft Cabinet file extractor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|cairomm|C++ wrapper for cairo|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|cal3d|Skeletal based 3-D character animation library|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
@@ -164,12 +164,12 @@
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|CastPodder|A multimedia aggregator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ccache|Compiler cache|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
-Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|ccid|Generic USB CCID smart card reader driver|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|ccrtp|Common C++ class framework for RTP/RTCP|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|cd-discid|utility to get CDDB discid information|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cd-discid|utility to get CDDB discid information|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cdiff|Diff readability enhancer for color terminals|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases|rpm at greysector.net|extras-qa at fedoraproject.org|harald at redhat.com
 Fedora Extras|cdo|A program for manipulating GRIB/NetCDF/SERVICE/EXTRA files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|cegui|Free library providing windowing and widgets for graphics APIs / engines|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
@@ -210,7 +210,7 @@
 Fedora Extras|cohoba|GNOME interface for Telepathy|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|coldet|3D Collision Detection Library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|colordiff|Color terminal highlighter for diff files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|comix|A user-friendly, customizable image viewer|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
@@ -253,20 +253,20 @@
 Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|csound|A sound synthesis language and library|dcbw at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctorrent|BitTorrent Client written in C|rpm at greysector.net|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|cups-pdf|Extension for creating pdf-Files with CUPS|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2svn|CVS to Subversion Repository Converter|icon at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cvsgraph|A CVS/RCS repository grapher|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsplot|Cvsplot collects statistics from CVS controlled files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cvsps|Patchset tool for CVS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cvsps|Patchset tool for CVS|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsup|CVS-Optimized General-Purpose Network File Distribution System client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsutils|CVS Utilities|rc040203 at freenet.de|extras-qa at fedoraproject.org|
-Fedora Extras|cvsweb|Web interface for CVS repositories|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cvsweb|Web interface for CVS repositories|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cyphesis|WorldForge game server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|cyrus-imapd|A high-performance mail server with IMAP, POP3, NNTP and SIEVE support|jdennis at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|d4x|Downloader for X that supports resuming and many other features|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -322,9 +322,9 @@
 Fedora Extras|dssi|Disposable Soft Synth Interface|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dstat|System Status Monitor|scott at perturb.org|extras-qa at fedoraproject.org|
 Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|dumpasn1|ASN.1 object dump utility|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
-Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dx|Open source version of IBM's Visualization Data Explorer|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|dx-samples|Sample files for OpenDX|rpm at greysector.net|extras-qa at fedoraproject.org|
@@ -349,8 +349,8 @@
 Fedora Extras|ejabberd|A distributed, fault-tolerant Jabber/XMPP server|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|ekg|Experimental Gadu-Gadu client|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|em8300|DXR3/Hollywood Plus MPEG decoder card support tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|em8300-kmod|Kernel modules for DXR3/Hollywood Plus MPEG decoder cards|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|em8300|DXR3/Hollywood Plus MPEG decoder card support tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|em8300-kmod|Kernel modules for DXR3/Hollywood Plus MPEG decoder cards|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|ed at eh3.com
 Fedora Extras|emacs-common-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-vm|Emacs VM mailreader|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
@@ -390,7 +390,7 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-package-config-apt|Fedora configuration files for the apt-rpm package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
-Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xelerance.com|extras-qa at fedoraproject.org|
@@ -433,7 +433,7 @@
 Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|freedoom|Open-source data files for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedoom-freedm|Deathmatch levels for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|freedroid|Clone of the C64 Game Paradroid|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freefont|Free UCS Outline Fonts|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -494,7 +494,7 @@
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdmap|A tool which allows to visualize disk space|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gdome2|DOM level 2 library for accessing XML files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|geda-docs|Documentation for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-examples|Circuit examples for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-gattrib|Attribute editor for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
@@ -528,10 +528,10 @@
 Fedora Extras|gkrellm|Multiple stacked system monitors in one process|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-volume|GKrellM volume plugin|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-wifi|Wireless monitor plugin for the GNU Krell Monitors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -671,7 +671,7 @@
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
 Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|hddtemp|Hard disk temperature tool|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
@@ -693,11 +693,11 @@
 Fedora Extras|ht2html|The www.python.org Web site generator|ifoox at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|htb-util|Another tool to make your life easier with HTB|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|htmldoc|A tool for converting HTML source files into HTML, PostScript, or PDF|adam at spicenitz.org|extras-qa at fedoraproject.org|
-Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|htop|Interactive process viewer|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|http_ping|HTTP latency measuring utility|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hugs98|Haskell Interpreter|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunky-fonts|Modified Bitstream Vera fonts with additional letters|gajownik at gmail.com|extras-qa at fedoraproject.org|
@@ -709,9 +709,9 @@
 Fedora Extras|ices|Source streaming for Icecast|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|id3-py|Python ID3 tag library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|id3v2|A command line id3v2 tag editor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ifm|Interactive Fiction Mapper|chris at chrisgrau.com|extras-qa at fedoraproject.org|
 Fedora Extras|ifplugd|Detect and take action when an ethernet cable is unplugged|jamatos at fc.up.pt|extras-qa at fedoraproject.org|aaron.bennett at olin.edu
 Fedora Extras|iftop|Command line tool that displays bandwidth usage on an interface|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -800,7 +800,7 @@
 Fedora Extras|keyutils|Kernel key management utilities|dhowells at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kicad|Electronic schematic diagrams and printed circuit board artwork|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|kid3|Efficient ID3 tagger|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kiosktool|KIOSK administration tool for KDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -828,7 +828,7 @@
 Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|paul at xelerance.com|extras-qa at fedoraproject.org|
-Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ksensors|An lm_sensors frontend for KDE|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kshutdown|KShutDown is an advanced shut down utility for KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kst|Plots scientific data|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|ksynaptics|KDE configuration for synaptics module|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -907,7 +907,7 @@
 Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libhugetlbfs|A library which provides easy access to huge pages of memory|drfickle at k-lug.org|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
-Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libid3tag|ID3 tag manipulation library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libifp|A general-purpose library-driver for iRiver's iFP portable audio players|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libipoddevice|Provides device-level support for the Apple iPod|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libjingle|GoogleTalk implementation of Jingle|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -922,7 +922,7 @@
 Fedora Extras|libmatroska|An open Audio/Video container format|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmodelfile|Library for accessing various model file formats|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libmodplug|Modplug mod music file format library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmtp|MTP client library|triad at df.lth.se|extras-qa at fedoraproject.org|
@@ -1013,9 +1013,9 @@
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
-Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|lirc|The Linux Infrared Remote Control package|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
+Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
 Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -1038,7 +1038,7 @@
 Fedora Extras|m17n-db|m17n-lib datafiles for input and output|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|m17n-lib|multilingual text library|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
 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
@@ -1154,7 +1154,7 @@
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org|
 Fedora Extras|netlabel_tools|Tools to manage the Linux NetLabel subsystem|james.antill at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|netmask|Utility for determining network masks|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|netpanzer|An Online Multiplayer Tactical Warfare Game|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|netpanzer-data|Data files for netpanzer|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|NetworkManager-openvpn|NetworkManager VPN integration for OpenVPN|tim at niemueller.de|extras-qa at fedoraproject.org|
@@ -1163,7 +1163,7 @@
 Fedora Extras|new|A simple template system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|newsx|NNTP news exchange utility|rpm at greysector.net|extras-qa at fedoraproject.org|
-Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
@@ -1211,7 +1211,7 @@
 Fedora Extras|openbabel|Chemistry software file format converter|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|openct|Middleware framework for smart card terminals|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|rc040203 at freenet.de|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -1219,7 +1219,7 @@
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openpbx|The Truly Open Source PBX|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|opensc|SmartCard library and applications|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
@@ -1261,9 +1261,9 @@
 Fedora Extras|pavumeter|Volume meter for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcb|An interactive printed circuit board editor|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
-Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
-Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -1339,7 +1339,7 @@
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Clone|Recursively copy perl datatypes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Compress-Bzip2|Interface to Bzip2 compression library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Config-General|Generic configuration module for Perl|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1504,7 +1504,7 @@
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Cmd|Finding and running system commands made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1552,7 +1552,7 @@
 Fedora Extras|perl-Maypole|MVC web application framework|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-MIME-Types|MIME types module for Perl|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1565,7 +1565,7 @@
 Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-ScanDeps|Recursively scan Perl code for dependencies|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Starter|A simple starter kit for any module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Starter-PBP|Create a module as recommended in "Perl Best Practices"|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1573,7 +1573,7 @@
 Fedora Extras|perl-Moose-Policy|Police your project/company-wide Moose policies|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MP3-Info|Manipulate / fetch info from MP3 audio files|chris.stone at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Jabber|Net::Jabber - Jabber client library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-LibIDN|Perl bindings for GNU LibIDN|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1594,7 +1594,7 @@
 Fedora Extras|perl-Package-Constants|List all constants declared in a package|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Package-Generator|Generate new packages quickly and easily|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PadWalker|Play with other peoples' lexical variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Coerce|Allows your classes to do coercion of parameters|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1651,7 +1651,7 @@
 Fedora Extras|perl-Scalar-Properties|Run-time properties on scalar variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SDL|SDL bindings for the Perl language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Infinite|Sets of intervals|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Scalar|Basic set operations|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Smart-Comments|Comments that do more than just sit there|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1668,7 +1668,7 @@
 Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Statistics-Descriptive|Perl module of basic descriptive statistical functions|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Format|Sprintf-like string formatting capabilities with arbitrary format definitions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Exporter|Sophisticated exporter for custom-built routines|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1720,7 +1720,7 @@
 Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Diff|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Levenshtein|Text::Levenshtein Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Quoted|Extract the structure of a quoted mail message|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1768,7 +1768,7 @@
 Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML-Parser-Syck|Perl Wrapper for the YAML Parser Extension: libsyck|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,oliver at linux-kernel.at
-Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pessulus|A lockdown editor for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
@@ -1872,7 +1872,7 @@
 Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|prozilla|An advanced Linux download manager|kushaldas at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|pscan|Limited problem scanner for C source files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pstoedit|Translates PostScript into other vector formats|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
@@ -1926,8 +1926,8 @@
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|jamatos at fc.up.pt|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
-Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|python-id3|ID3 tag library for Python|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-id3|ID3 tag library for Python|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-imaging|Python's own image processing library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-json|A JSON reader and writer for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
@@ -2057,9 +2057,9 @@
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|rpld|RPL/RIPL remote boot daemon|i at stingr.net|extras-qa at fedoraproject.org|
-Fedora Extras|rpmdevtools|RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|rpmdevtools|RPM Development Tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
-Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|rpmlint|RPM correctness checker|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|jwilson at redhat.com|extras-qa at fedoraproject.org|
@@ -2191,7 +2191,7 @@
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|swaks|Command-line SMTP transaction tester|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
@@ -2319,7 +2319,7 @@
 Fedora Extras|twinkle|A SIP Soft Phone|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|ucarp|Common Address Redundancy Protocol (CARP) for Unix|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ucblogo|An interpreter for the Logo programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-Fedora Extras|ucl|Portable lossless data compression library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ucl|Portable lossless data compression library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|udftools|Linux UDF Filesystem userspace utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|udunits|A library for manipulating units of physical quantities|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ufraw|Tool to retrieve raw image data from digital cameras|nphilipp at redhat.com|extras-qa at fedoraproject.org|
@@ -2332,7 +2332,7 @@
 Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|unshield|Install InstallShield applications on a Pocket PC|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|up-imapproxy|University of Pittsburgh IMAP Proxy|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
-Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|upx|The Ultimate Packer for eXecutables|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ushare|UPnP (TM) A/V Media Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
@@ -2345,10 +2345,10 @@
 Fedora Extras|vala|A modern programming language for GNOME|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr|Video Disk Recorder|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdradmin-am|Web interface for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|
@@ -2363,7 +2363,7 @@
 Fedora Extras|vorbisgain|Adds tags to Ogg Vorbis files to adjust the volume|bdpepple at ameritech.net|extras-qa at fedoraproject.org|noa at resare.com
 Fedora Extras|vpnc|IPSec VPN client compatible with Cisco equipment|tmraz at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|w3c-markup-validator|W3C Markup Validator|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wallpapoz|Gnome Multi Backgrounds and Wallpapers Configuration Tool|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
@@ -2421,10 +2421,10 @@
 Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xdg-utils|Basic desktop integration functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|xdrawchem|2D chemical structures drawing tool|rpm at greysector.net|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs|A different version of Emacs|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-sumo|XEmacs Lisp packages|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xeuphoric|An oric emulator capable of emulating the full family|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -2476,7 +2476,7 @@
 Fedora Extras|xfwm4|Next generation window manager for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xgalaxy|Galaxian / Galaga like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|scop at fedoraproject.org
 Fedora Extras|xkeycaps|Graphical front end to xmodmap|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
@@ -2484,16 +2484,16 @@
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-adplug|XMMS plugin to play AdLib (OPL2) files|triad at df.lth.se|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-crossfade|A crossfade output plugin for XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|scop at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-musepack|X MultiMedia System input plugin to play musepack (mpc) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-scrobbler|Audioscrobbler plugin for XMMS|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 21:32:32 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Nov 2006 14:32:32 -0700
Subject: rpms/smb4k/FC-6 .cvsignore, 1.10, 1.11 smb4k.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200611142132.kAELWWhr010798@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10773

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Sep 2006 22:31:35 -0000	1.10
+++ .cvsignore	14 Nov 2006 21:32:02 -0000	1.11
@@ -1 +1 @@
-smb4k-0.7.3.tar.bz2
+smb4k-0.7.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/smb4k.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smb4k.spec	26 Sep 2006 22:31:35 -0000	1.14
+++ smb4k.spec	14 Nov 2006 21:32:02 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.3
+Version:	0.7.4
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 14 2006 Marcin Garski  0.7.4-1
+- Updated to version 0.7.4
+
 * Wed Sep 27 2006 Marcin Garski  0.7.3-1
 - Updated to version 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Sep 2006 22:31:35 -0000	1.10
+++ sources	14 Nov 2006 21:32:02 -0000	1.11
@@ -1 +1 @@
-7cd1d8b0b02fb6eb982bc9f561fec1f6  smb4k-0.7.3.tar.bz2
+69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 22:00:06 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Nov 2006 15:00:06 -0700
Subject: rpms/smb4k/FC-5 .cvsignore, 1.10, 1.11 smb4k.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <200611142200.kAEM06NZ011009@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10989

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Sep 2006 22:35:19 -0000	1.10
+++ .cvsignore	14 Nov 2006 21:59:36 -0000	1.11
@@ -1 +1 @@
-smb4k-0.7.3.tar.bz2
+smb4k-0.7.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- smb4k.spec	26 Sep 2006 22:35:19 -0000	1.13
+++ smb4k.spec	14 Nov 2006 21:59:36 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.3
+Version:	0.7.4
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 14 2006 Marcin Garski  0.7.4-1
+- Updated to version 0.7.4
+
 * Wed Sep 27 2006 Marcin Garski  0.7.3-1
 - Updated to version 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Sep 2006 22:35:19 -0000	1.10
+++ sources	14 Nov 2006 21:59:36 -0000	1.11
@@ -1 +1 @@
-7cd1d8b0b02fb6eb982bc9f561fec1f6  smb4k-0.7.3.tar.bz2
+69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 22:01:15 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 14 Nov 2006 15:01:15 -0700
Subject: rpms/smb4k/devel .cvsignore, 1.10, 1.11 smb4k.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200611142201.kAEM1Fmq014054@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11061

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Sep 2006 22:31:35 -0000	1.10
+++ .cvsignore	14 Nov 2006 22:00:45 -0000	1.11
@@ -1 +1 @@
-smb4k-0.7.3.tar.bz2
+smb4k-0.7.4.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smb4k.spec	26 Sep 2006 22:31:35 -0000	1.14
+++ smb4k.spec	14 Nov 2006 22:00:45 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.3
+Version:	0.7.4
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 14 2006 Marcin Garski  0.7.4-1
+- Updated to version 0.7.4
+
 * Wed Sep 27 2006 Marcin Garski  0.7.3-1
 - Updated to version 0.7.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Sep 2006 22:31:35 -0000	1.10
+++ sources	14 Nov 2006 22:00:45 -0000	1.11
@@ -1 +1 @@
-7cd1d8b0b02fb6eb982bc9f561fec1f6  smb4k-0.7.3.tar.bz2
+69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 14 22:02:23 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 15:02:23 -0700
Subject: rpms/python-musicbrainz2/devel .cvsignore, 1.2,
	1.3 python-musicbrainz2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611142202.kAEM2Nw9014207@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-musicbrainz2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14129

Modified Files:
	.cvsignore python-musicbrainz2.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 01:17:55 -0000	1.2
+++ .cvsignore	14 Nov 2006 22:01:53 -0000	1.3
@@ -1 +1 @@
-python-musicbrainz2-0.3.1.tar.gz
+python-musicbrainz2-0.4.0.tar.gz


Index: python-musicbrainz2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/devel/python-musicbrainz2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-musicbrainz2.spec	17 Aug 2006 01:17:55 -0000	1.1
+++ python-musicbrainz2.spec	14 Nov 2006 22:01:53 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-musicbrainz2
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Library which provides access to the MusicBrainz Database
 
 Group:          Development/Languages
@@ -43,9 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt CHANGES.txt COPYING.txt INSTALL.txt README.txt
+%{_bindir}/mb-submit-disc
 %{python_sitelib}/musicbrainz2
 
 %changelog
+* Tue Nov 14 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0.
+
 * Wed Aug 16 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Add Requires for python-ctypes and libmusicbrainz.
 - Add check section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 01:17:55 -0000	1.2
+++ sources	14 Nov 2006 22:01:53 -0000	1.3
@@ -1 +1 @@
-2ff59193f357c84e9e7b2f89356c0939  python-musicbrainz2-0.3.1.tar.gz
+7d2cf926dfd3c1f785cd2128a82e8c6e  python-musicbrainz2-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 22:06:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 15:06:13 -0700
Subject: rpms/python-musicbrainz2/FC-6 .cvsignore, 1.2,
	1.3 python-musicbrainz2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611142206.kAEM6Dpr014285@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-musicbrainz2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14265

Modified Files:
	.cvsignore python-musicbrainz2.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 01:17:55 -0000	1.2
+++ .cvsignore	14 Nov 2006 22:05:40 -0000	1.3
@@ -1 +1 @@
-python-musicbrainz2-0.3.1.tar.gz
+python-musicbrainz2-0.4.0.tar.gz


Index: python-musicbrainz2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-6/python-musicbrainz2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-musicbrainz2.spec	17 Aug 2006 01:17:55 -0000	1.1
+++ python-musicbrainz2.spec	14 Nov 2006 22:05:40 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-musicbrainz2
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Library which provides access to the MusicBrainz Database
 
 Group:          Development/Languages
@@ -43,9 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt CHANGES.txt COPYING.txt INSTALL.txt README.txt
+%{_bindir}/mb-submit-disc
 %{python_sitelib}/musicbrainz2
 
 %changelog
+* Tue Nov 14 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0.
+
 * Wed Aug 16 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Add Requires for python-ctypes and libmusicbrainz.
 - Add check section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 01:17:55 -0000	1.2
+++ sources	14 Nov 2006 22:05:40 -0000	1.3
@@ -1 +1 @@
-2ff59193f357c84e9e7b2f89356c0939  python-musicbrainz2-0.3.1.tar.gz
+7d2cf926dfd3c1f785cd2128a82e8c6e  python-musicbrainz2-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 22:08:38 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 14 Nov 2006 15:08:38 -0700
Subject: rpms/python-musicbrainz2/FC-5 .cvsignore, 1.2,
	1.3 python-musicbrainz2.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611142208.kAEM8c95014414@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-musicbrainz2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14392

Modified Files:
	.cvsignore python-musicbrainz2.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2006 01:17:55 -0000	1.2
+++ .cvsignore	14 Nov 2006 22:08:08 -0000	1.3
@@ -1 +1 @@
-python-musicbrainz2-0.3.1.tar.gz
+python-musicbrainz2-0.4.0.tar.gz


Index: python-musicbrainz2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-5/python-musicbrainz2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-musicbrainz2.spec	17 Aug 2006 01:17:55 -0000	1.1
+++ python-musicbrainz2.spec	14 Nov 2006 22:08:08 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-musicbrainz2
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Library which provides access to the MusicBrainz Database
 
 Group:          Development/Languages
@@ -43,9 +43,13 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt CHANGES.txt COPYING.txt INSTALL.txt README.txt
+%{_bindir}/mb-submit-disc
 %{python_sitelib}/musicbrainz2
 
 %changelog
+* Tue Nov 14 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0.
+
 * Wed Aug 16 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Add Requires for python-ctypes and libmusicbrainz.
 - Add check section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-musicbrainz2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2006 01:17:55 -0000	1.2
+++ sources	14 Nov 2006 22:08:08 -0000	1.3
@@ -1 +1 @@
-2ff59193f357c84e9e7b2f89356c0939  python-musicbrainz2-0.3.1.tar.gz
+7d2cf926dfd3c1f785cd2128a82e8c6e  python-musicbrainz2-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 14 22:20:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 15:20:19 -0700
Subject: rpms/amavisd-new/devel amavisd-new.spec,1.10,1.11
Message-ID: <200611142220.kAEMKJcQ014500@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14484

Modified Files:
	amavisd-new.spec 
Log Message:
Add dependency on file. (#215492)


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- amavisd-new.spec	14 Oct 2006 17:04:11 -0000	1.10
+++ amavisd-new.spec	14 Nov 2006 22:19:48 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        2%{?prerelease:.%{prerelease}}%{?dist}
+Release:        3%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -22,6 +22,7 @@
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
 Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
+Requires:       file
 Requires:       bzip2
 Requires:       gzip
 Requires:       arj
@@ -152,6 +153,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-3
+- Add dependency on file. (#215492)
+
 * Sat Oct 14 2006 Steven Pritchard  2.4.3-2
 - Fix permissions on the cron.daily script.
 



From fedora-extras-commits at redhat.com  Tue Nov 14 23:13:47 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:13:47 -0700
Subject: rpms/anjuta import.log,1.27,1.28
Message-ID: <200611142313.kAENDlcY017895@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17862

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-11 on branch devel from anjuta-2.0.2-11.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- import.log	8 Nov 2006 15:23:30 -0000	1.27
+++ import.log	14 Nov 2006 23:13:16 -0000	1.28
@@ -24,3 +24,4 @@
 anjuta-2_0_2-10:FC-5:anjuta-2.0.2-10.src.rpm:1162999129
 anjuta-2_0_2-10:FC-6:anjuta-2.0.2-10.src.rpm:1162999249
 anjuta-2_0_2-10:HEAD:anjuta-2.0.2-10.src.rpm:1162999392
+anjuta-2_0_2-11:HEAD:anjuta-2.0.2-11.src.rpm:1163545983



From fedora-extras-commits at redhat.com  Tue Nov 14 23:13:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:13:48 -0700
Subject: rpms/anjuta/devel scintillagtk.patch, NONE, 1.1 anjuta.spec, 1.24,
	1.25
Message-ID: <200611142313.kAENDmDu017898@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17862/devel

Modified Files:
	anjuta.spec 
Added Files:
	scintillagtk.patch 
Log Message:
auto-import anjuta-2.0.2-11 on branch devel from anjuta-2.0.2-11.src.rpm

scintillagtk.patch:

--- NEW FILE scintillagtk.patch ---
--- anjuta-2.0.2/scintilla/ScintillaGTK.cxx	2006-04-27 21:30:27.000000000 +0100
+++ anjuta-2.0.2/scintilla/ScintillaGTK-new.cxx	2006-11-14 22:34:06.000000000 +0000
@@ -2193,7 +2193,7 @@
 	paintState = notPainting;
 
 	if (rgnUpdate) {
-		g_free(rgnUpdate);
+		gdk_region_destroy(rgnUpdate);
 	}
 	rgnUpdate = 0;
 


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- anjuta.spec	8 Nov 2006 15:23:31 -0000	1.24
+++ anjuta.spec	14 Nov 2006 23:13:17 -0000	1.25
@@ -1,12 +1,13 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
 Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: anjuta-dialog.patch
+Patch1: scintillagtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
 BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
@@ -51,6 +52,7 @@
 chmod 644 scintilla/*.cxx
 chmod 644 scintilla/*.h
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 %build
 %configure --disable-static --disable-plugin-subversion --enable-nls
@@ -127,6 +129,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Tue Nov 14 2006 Paul F. Johnson  2.0.2-11
+- scintilla gtk fix
+
 * Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
 - add patch for close dialog on the about window
 - renamed spec file to anjuta



From fedora-extras-commits at redhat.com  Tue Nov 14 23:14:49 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 14 Nov 2006 16:14:49 -0700
Subject: owners owners.list,1.1961,1.1962
Message-ID: <200611142314.kAENEn9r017971@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17935

Modified Files:
	owners.list 
Log Message:
Uh-oh, that address change was not the brightest idea, revert.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1961
retrieving revision 1.1962
diff -u -r1.1961 -r1.1962
--- owners.list	14 Nov 2006 21:20:15 -0000	1.1961
+++ owners.list	14 Nov 2006 23:14:19 -0000	1.1962
@@ -12,7 +12,7 @@
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 Fedora Extras|915resolution|Intel video BIOS hack to support certain resolutions|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|aalib|An ASCII art library|garrick at usc.edu|extras-qa at fedoraproject.org|
-Fedora Extras|abcde|A Better CD Encoder|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|abcde|A Better CD Encoder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|abcm2ps|A program to typeset ABC tunes into Postscript|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abcMIDI|ABC to/from MIDI conversion utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|wart at kobold.org|extras-qa at fedoraproject.org|
@@ -100,7 +100,7 @@
 Fedora Extras|banshee|Music tool to easily import, manage, and play selections from your iPod|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|baobab|Graphical tool to analyse directory trees|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|barcode|Generates barcodes from text strings|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|bash-completion|Programmable completion for Bash|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|bash-completion|Programmable completion for Bash|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|basket|Notes taker for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -156,7 +156,7 @@
 Fedora Extras|bzr-gtk|Bazaar plugin for GTK+ interfaces to most Bazaar operations|wtogami at redhat.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|bzrtools|A collection of utilities and plugins for Bazaar-NG|shahms at shahms.com|extras-qa at fedoraproject.org|toshio at tiki-lounge.com
 Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|cabextract|A Microsoft Cabinet file extractor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|cairomm|C++ wrapper for cairo|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|cal3d|Skeletal based 3-D character animation library|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
@@ -164,12 +164,12 @@
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|CastPodder|A multimedia aggregator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|ccache|Compiler cache|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
-Fedora Extras|ccid|Generic USB CCID smart card reader driver|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|ccrtp|Common C++ class framework for RTP/RTCP|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|cd-discid|utility to get CDDB discid information|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cdiff|Diff readability enhancer for color terminals|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cd-discid|utility to get CDDB discid information|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases|rpm at greysector.net|extras-qa at fedoraproject.org|harald at redhat.com
 Fedora Extras|cdo|A program for manipulating GRIB/NetCDF/SERVICE/EXTRA files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|cegui|Free library providing windowing and widgets for graphics APIs / engines|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
@@ -210,7 +210,7 @@
 Fedora Extras|cohoba|GNOME interface for Telepathy|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|coldet|3D Collision Detection Library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|colordiff|Color terminal highlighter for diff files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|comix|A user-friendly, customizable image viewer|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
@@ -253,20 +253,20 @@
 Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|csound|A sound synthesis language and library|dcbw at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ctapi-common|Common files and packaging infrastructure for CT-API modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ctapi-cyberjack|CT-API 1.1 and PC/SC driver for REINER SCT cyberjack USB chipcard reader|frank-buettner at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctorrent|BitTorrent Client written in C|rpm at greysector.net|extras-qa at fedoraproject.org|bluekuja at ubuntu.com
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|cups-pdf|Extension for creating pdf-Files with CUPS|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|curry|M??nster Curry compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2svn|CVS to Subversion Repository Converter|icon at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cvsgraph|A CVS/RCS repository grapher|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvsplot|Cvsplot collects statistics from CVS controlled files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|cvsps|Patchset tool for CVS|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cvsps|Patchset tool for CVS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cvsup|CVS-Optimized General-Purpose Network File Distribution System client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvsutils|CVS Utilities|rc040203 at freenet.de|extras-qa at fedoraproject.org|
-Fedora Extras|cvsweb|Web interface for CVS repositories|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cvsweb|Web interface for CVS repositories|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cyphesis|WorldForge game server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|cyrus-imapd|A high-performance mail server with IMAP, POP3, NNTP and SIEVE support|jdennis at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|d4x|Downloader for X that supports resuming and many other features|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -322,9 +322,9 @@
 Fedora Extras|dssi|Disposable Soft Synth Interface|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dstat|System Status Monitor|scott at perturb.org|extras-qa at fedoraproject.org|
 Fedora Extras|dumb|IT, XM, S3M and MOD player library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|dumpasn1|ASN.1 object dump utility|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|dumpasn1|ASN.1 object dump utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
-Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|dvdisaster|CD/DVD media data loss/scratch/aging protection|dmitry at butskoy.name|extras-qa at fedoraproject.org|carsten at dvdisaster.de
 Fedora Extras|dx|Open source version of IBM's Visualization Data Explorer|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|dx-samples|Sample files for OpenDX|rpm at greysector.net|extras-qa at fedoraproject.org|
@@ -349,8 +349,8 @@
 Fedora Extras|ejabberd|A distributed, fault-tolerant Jabber/XMPP server|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|ekg|Experimental Gadu-Gadu client|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|em8300|DXR3/Hollywood Plus MPEG decoder card support tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|em8300-kmod|Kernel modules for DXR3/Hollywood Plus MPEG decoder cards|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|em8300|DXR3/Hollywood Plus MPEG decoder card support tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|em8300-kmod|Kernel modules for DXR3/Hollywood Plus MPEG decoder cards|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|ed at eh3.com
 Fedora Extras|emacs-common-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-vm|Emacs VM mailreader|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
@@ -390,7 +390,7 @@
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-package-config-apt|Fedora configuration files for the apt-rpm package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
-Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xelerance.com|extras-qa at fedoraproject.org|
@@ -433,7 +433,7 @@
 Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|freedoom|Open-source data files for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freedoom-freedm|Deathmatch levels for Doom game engines|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|freedroid|Clone of the C64 Game Paradroid|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|freefont|Free UCS Outline Fonts|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|freeglut|A freely licensed alternative to the GLUT library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -494,7 +494,7 @@
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdmap|A tool which allows to visualize disk space|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gdome2|DOM level 2 library for accessing XML files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|geda-docs|Documentation for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-examples|Circuit examples for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-gattrib|Attribute editor for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
@@ -528,10 +528,10 @@
 Fedora Extras|gkrellm|Multiple stacked system monitors in one process|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-volume|GKrellM volume plugin|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-wifi|Wireless monitor plugin for the GNU Krell Monitors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -671,7 +671,7 @@
 Fedora Extras|hamlib|Run-time library to control radio transceivers and receivers|dennis at ausil.us|extras-qa at fedoraproject.org|docs-list at fedoralinks.org
 Fedora Extras|harminv|Program and library for solving the harmonic inversion problem|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|hatari|An Atari ST emulator suitable for playing games|musuruan at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|hddtemp|Hard disk temperature tool|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
@@ -693,11 +693,11 @@
 Fedora Extras|ht2html|The www.python.org Web site generator|ifoox at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|htb-util|Another tool to make your life easier with HTB|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htmldoc|A tool for converting HTML source files into HTML, PostScript, or PDF|adam at spicenitz.org|extras-qa at fedoraproject.org|
-Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htop|Interactive process viewer|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|http_ping|HTTP latency measuring utility|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hugs98|Haskell Interpreter|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunky-fonts|Modified Bitstream Vera fonts with additional letters|gajownik at gmail.com|extras-qa at fedoraproject.org|
@@ -709,9 +709,9 @@
 Fedora Extras|ices|Source streaming for Icecast|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|id3-py|Python ID3 tag library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|id3v2|A command line id3v2 tag editor|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ifm|Interactive Fiction Mapper|chris at chrisgrau.com|extras-qa at fedoraproject.org|
 Fedora Extras|ifplugd|Detect and take action when an ethernet cable is unplugged|jamatos at fc.up.pt|extras-qa at fedoraproject.org|aaron.bennett at olin.edu
 Fedora Extras|iftop|Command line tool that displays bandwidth usage on an interface|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -800,7 +800,7 @@
 Fedora Extras|keyutils|Kernel key management utilities|dhowells at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kicad|Electronic schematic diagrams and printed circuit board artwork|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|kid3|Efficient ID3 tagger|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kile|LaTeX source editor and TeX shell|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kiosktool|KIOSK administration tool for KDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -828,7 +828,7 @@
 Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|paul at xelerance.com|extras-qa at fedoraproject.org|
-Fedora Extras|ksensors|An lm_sensors frontend for KDE|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kshutdown|KShutDown is an advanced shut down utility for KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kst|Plots scientific data|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|ksynaptics|KDE configuration for synaptics module|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -907,7 +907,7 @@
 Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libhugetlbfs|A library which provides easy access to huge pages of memory|drfickle at k-lug.org|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
-Fedora Extras|libid3tag|ID3 tag manipulation library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libifp|A general-purpose library-driver for iRiver's iFP portable audio players|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libipoddevice|Provides device-level support for the Apple iPod|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libjingle|GoogleTalk implementation of Jingle|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -922,7 +922,7 @@
 Fedora Extras|libmatroska|An open Audio/Video container format|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmodelfile|Library for accessing various model file formats|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|libmodplug|Modplug mod music file format library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmtp|MTP client library|triad at df.lth.se|extras-qa at fedoraproject.org|
@@ -1013,9 +1013,9 @@
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|lirc|The Linux Infrared Remote Control package|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
-Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
+Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
+Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|listen|Listen is a music manager and player for GNOME|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -1038,7 +1038,7 @@
 Fedora Extras|m17n-db|m17n-lib datafiles for input and output|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|m17n-lib|multilingual text library|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Macaulay2|A system for algebraic geometry and commutative algebra|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|scop at fedoraproject.org
+Fedora Extras|mach|make a chroot|thomas at apestaart.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 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
@@ -1154,7 +1154,7 @@
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org|
 Fedora Extras|netlabel_tools|Tools to manage the Linux NetLabel subsystem|james.antill at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|netmask|Utility for determining network masks|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|netmask|Utility for determining network masks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|netpanzer|An Online Multiplayer Tactical Warfare Game|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|netpanzer-data|Data files for netpanzer|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|NetworkManager-openvpn|NetworkManager VPN integration for OpenVPN|tim at niemueller.de|extras-qa at fedoraproject.org|
@@ -1163,7 +1163,7 @@
 Fedora Extras|new|A simple template system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|newscache|Free cache server for USENET News|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|newsx|NNTP news exchange utility|rpm at greysector.net|extras-qa at fedoraproject.org|
-Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
@@ -1211,7 +1211,7 @@
 Fedora Extras|openbabel|Chemistry software file format converter|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|openct|Middleware framework for smart card terminals|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|rc040203 at freenet.de|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
@@ -1219,7 +1219,7 @@
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openpbx|The Truly Open Source PBX|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|opensc|SmartCard library and applications|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
@@ -1261,9 +1261,9 @@
 Fedora Extras|pavumeter|Volume meter for PulseAudio|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcb|An interactive printed circuit board editor|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
-Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
-Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|scop at fedoraproject.org|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pdftk|The PDF Tool Kit|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|pdftohtml|A PDF to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -1339,7 +1339,7 @@
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Clone|Recursively copy perl datatypes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Compress-Bzip2|Interface to Bzip2 compression library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Config-General|Generic configuration module for Perl|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1504,7 +1504,7 @@
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Cmd|Finding and running system commands made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1552,7 +1552,7 @@
 Fedora Extras|perl-Maypole|MVC web application framework|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-MIME-Types|MIME types module for Perl|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1565,7 +1565,7 @@
 Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-ScanDeps|Recursively scan Perl code for dependencies|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Starter|A simple starter kit for any module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Starter-PBP|Create a module as recommended in "Perl Best Practices"|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1573,7 +1573,7 @@
 Fedora Extras|perl-Moose-Policy|Police your project/company-wide Moose policies|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MP3-Info|Manipulate / fetch info from MP3 audio files|chris.stone at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Jabber|Net::Jabber - Jabber client library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-LibIDN|Perl bindings for GNU LibIDN|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1594,7 +1594,7 @@
 Fedora Extras|perl-Package-Constants|List all constants declared in a package|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Package-Generator|Generate new packages quickly and easily|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PadWalker|Play with other peoples' lexical variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Coerce|Allows your classes to do coercion of parameters|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1651,7 +1651,7 @@
 Fedora Extras|perl-Scalar-Properties|Run-time properties on scalar variables|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SDL|SDL bindings for the Perl language|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Infinite|Sets of intervals|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Set-IntSpan|Perl module for managing sets of integers|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Set-Scalar|Basic set operations|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Smart-Comments|Comments that do more than just sit there|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SNMP_Session|SNMP support for Perl 5|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1668,7 +1668,7 @@
 Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Statistics-Descriptive|Perl module of basic descriptive statistical functions|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Format|Sprintf-like string formatting capabilities with arbitrary format definitions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Exporter|Sophisticated exporter for custom-built routines|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1720,7 +1720,7 @@
 Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Diff|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|scop at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Levenshtein|Text::Levenshtein Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Quoted|Extract the structure of a quoted mail message|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1768,7 +1768,7 @@
 Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-YAML-Parser-Syck|Perl Wrapper for the YAML Parser Extension: libsyck|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,oliver at linux-kernel.at
-Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pessulus|A lockdown editor for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
@@ -1872,7 +1872,7 @@
 Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|prozilla|An advanced Linux download manager|kushaldas at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|pscan|Limited problem scanner for C source files|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pstoedit|Translates PostScript into other vector formats|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
@@ -1926,8 +1926,8 @@
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|jamatos at fc.up.pt|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
-Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|python-id3|ID3 tag library for Python|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|python-id3|ID3 tag library for Python|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|python-imaging|Python's own image processing library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-json|A JSON reader and writer for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|
@@ -2057,9 +2057,9 @@
 Fedora Extras|roundup|Simple and flexible issue-tracking system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|redhat at flyn.org
 Fedora Extras|rpl|Intelligent recursive search/replace utility|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|rpld|RPL/RIPL remote boot daemon|i at stingr.net|extras-qa at fedoraproject.org|
-Fedora Extras|rpmdevtools|RPM Development Tools|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|rpmdevtools|RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|enrico.scholz at informatik.tu-chemnitz.de
-Fedora Extras|rpmlint|RPM correctness checker|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|jwilson at redhat.com|extras-qa at fedoraproject.org|
@@ -2191,7 +2191,7 @@
 Fedora Extras|supertux|SuperTux is a jump'n run like game similar to Mario Bros|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|supertuxkart|Kids 3D go-kart racing game featuring Tux|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|svnmailer|Tool to post subversion repository commit information|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|swaks|Command-line SMTP transaction tester|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
@@ -2319,7 +2319,7 @@
 Fedora Extras|twinkle|A SIP Soft Phone|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|ucarp|Common Address Redundancy Protocol (CARP) for Unix|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ucblogo|An interpreter for the Logo programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
-Fedora Extras|ucl|Portable lossless data compression library|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|ucl|Portable lossless data compression library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|udftools|Linux UDF Filesystem userspace utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|udunits|A library for manipulating units of physical quantities|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ufraw|Tool to retrieve raw image data from digital cameras|nphilipp at redhat.com|extras-qa at fedoraproject.org|
@@ -2332,7 +2332,7 @@
 Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|unshield|Install InstallShield applications on a Pocket PC|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|up-imapproxy|University of Pittsburgh IMAP Proxy|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
-Fedora Extras|upx|The Ultimate Packer for eXecutables|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ushare|UPnP (TM) A/V Media Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
@@ -2345,10 +2345,10 @@
 Fedora Extras|vala|A modern programming language for GNOME|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|varconf|WorldForge configuration library|wart at kobold.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdr|Video Disk Recorder|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|vdradmin-am|Web interface for VDR|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|vdr|Video Disk Recorder|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-osdteletext|OSD teletext plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdr-subtitles|DVB subtitles plugin for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|vdradmin-am|Web interface for VDR|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|veusz|Scientific plotting package|jeremy at jeremysanders.net|extras-qa at fedoraproject.org|
 Fedora Extras|viaideinfo|Displays the information of installed VIA IDE controllers|peter at thecodergeek.com|extras-qa at fedoraproject.org|
@@ -2363,7 +2363,7 @@
 Fedora Extras|vorbisgain|Adds tags to Ogg Vorbis files to adjust the volume|bdpepple at ameritech.net|extras-qa at fedoraproject.org|noa at resare.com
 Fedora Extras|vpnc|IPSec VPN client compatible with Cisco equipment|tmraz at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|w3c-libwww|HTTP library of common code|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|w3c-markup-validator|W3C Markup Validator|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wallpapoz|Gnome Multi Backgrounds and Wallpapers Configuration Tool|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
@@ -2421,10 +2421,10 @@
 Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xdg-utils|Basic desktop integration functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|xdrawchem|2D chemical structures drawing tool|rpm at greysector.net|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs|A different version of Emacs|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|scop at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|xemacs-sumo|XEmacs Lisp packages|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xeuphoric|An oric emulator capable of emulating the full family|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -2476,7 +2476,7 @@
 Fedora Extras|xfwm4|Next generation window manager for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xgalaxy|Galaxian / Galaga like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|scop at fedoraproject.org
+Fedora Extras|xine-lib|Xine library|gauret at free.fr|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|xkeycaps|Graphical front end to xmodmap|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
@@ -2484,16 +2484,16 @@
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-adplug|XMMS plugin to play AdLib (OPL2) files|triad at df.lth.se|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-cdread|Digital audio CD input plugin for XMMS|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-crossfade|A crossfade output plugin for XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|scop at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-musepack|X MultiMedia System input plugin to play musepack (mpc) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-scrobbler|Audioscrobbler plugin for XMMS|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 14 23:15:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:15:32 -0700
Subject: rpms/anjuta import.log,1.28,1.29
Message-ID: <200611142315.kAENFWIK018015@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17980

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-11 on branch FC-5 from anjuta-2.0.2-11.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- import.log	14 Nov 2006 23:13:16 -0000	1.28
+++ import.log	14 Nov 2006 23:15:02 -0000	1.29
@@ -25,3 +25,4 @@
 anjuta-2_0_2-10:FC-6:anjuta-2.0.2-10.src.rpm:1162999249
 anjuta-2_0_2-10:HEAD:anjuta-2.0.2-10.src.rpm:1162999392
 anjuta-2_0_2-11:HEAD:anjuta-2.0.2-11.src.rpm:1163545983
+anjuta-2_0_2-11:FC-5:anjuta-2.0.2-11.src.rpm:1163546088



From fedora-extras-commits at redhat.com  Tue Nov 14 23:15:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:15:33 -0700
Subject: rpms/anjuta/FC-5 scintillagtk.patch,NONE,1.1 anjuta.spec,1.23,1.24
Message-ID: <200611142315.kAENFX9N018018@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17980/FC-5

Modified Files:
	anjuta.spec 
Added Files:
	scintillagtk.patch 
Log Message:
auto-import anjuta-2.0.2-11 on branch FC-5 from anjuta-2.0.2-11.src.rpm

scintillagtk.patch:

--- NEW FILE scintillagtk.patch ---
--- anjuta-2.0.2/scintilla/ScintillaGTK.cxx	2006-04-27 21:30:27.000000000 +0100
+++ anjuta-2.0.2/scintilla/ScintillaGTK-new.cxx	2006-11-14 22:34:06.000000000 +0000
@@ -2193,7 +2193,7 @@
 	paintState = notPainting;
 
 	if (rgnUpdate) {
-		g_free(rgnUpdate);
+		gdk_region_destroy(rgnUpdate);
 	}
 	rgnUpdate = 0;
 


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- anjuta.spec	8 Nov 2006 15:19:04 -0000	1.23
+++ anjuta.spec	14 Nov 2006 23:15:02 -0000	1.24
@@ -1,12 +1,13 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
 Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: anjuta-dialog.patch
+Patch1: scintillagtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
 BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
@@ -51,6 +52,7 @@
 chmod 644 scintilla/*.cxx
 chmod 644 scintilla/*.h
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 %build
 %configure --disable-static --disable-plugin-subversion --enable-nls
@@ -127,6 +129,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Tue Nov 14 2006 Paul F. Johnson  2.0.2-11
+- scintilla gtk fix
+
 * Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
 - add patch for close dialog on the about window
 - renamed spec file to anjuta



From fedora-extras-commits at redhat.com  Tue Nov 14 23:17:06 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:17:06 -0700
Subject: rpms/anjuta import.log,1.29,1.30
Message-ID: <200611142317.kAENH6LF018112@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18079

Modified Files:
	import.log 
Log Message:
auto-import anjuta-2.0.2-11 on branch FC-6 from anjuta-2.0.2-11.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- import.log	14 Nov 2006 23:15:02 -0000	1.29
+++ import.log	14 Nov 2006 23:16:36 -0000	1.30
@@ -26,3 +26,4 @@
 anjuta-2_0_2-10:HEAD:anjuta-2.0.2-10.src.rpm:1162999392
 anjuta-2_0_2-11:HEAD:anjuta-2.0.2-11.src.rpm:1163545983
 anjuta-2_0_2-11:FC-5:anjuta-2.0.2-11.src.rpm:1163546088
+anjuta-2_0_2-11:FC-6:anjuta-2.0.2-11.src.rpm:1163546180



From fedora-extras-commits at redhat.com  Tue Nov 14 23:17:07 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 14 Nov 2006 16:17:07 -0700
Subject: rpms/anjuta/FC-6 scintillagtk.patch,NONE,1.1 anjuta.spec,1.24,1.25
Message-ID: <200611142317.kAENH7cQ018115@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18079/FC-6

Modified Files:
	anjuta.spec 
Added Files:
	scintillagtk.patch 
Log Message:
auto-import anjuta-2.0.2-11 on branch FC-6 from anjuta-2.0.2-11.src.rpm

scintillagtk.patch:

--- NEW FILE scintillagtk.patch ---
--- anjuta-2.0.2/scintilla/ScintillaGTK.cxx	2006-04-27 21:30:27.000000000 +0100
+++ anjuta-2.0.2/scintilla/ScintillaGTK-new.cxx	2006-11-14 22:34:06.000000000 +0000
@@ -2193,7 +2193,7 @@
 	paintState = notPainting;
 
 	if (rgnUpdate) {
-		g_free(rgnUpdate);
+		gdk_region_destroy(rgnUpdate);
 	}
 	rgnUpdate = 0;
 


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-6/anjuta.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- anjuta.spec	8 Nov 2006 15:21:06 -0000	1.24
+++ anjuta.spec	14 Nov 2006 23:16:36 -0000	1.25
@@ -1,12 +1,13 @@
 Summary: Integrated Development Environment
 Name:    anjuta
 Version: 2.0.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group:   Development/Tools
 URL:     http://www.anjuta.org
 Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: anjuta-dialog.patch
+Patch1: scintillagtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: anjuta-gdl, gnome-build, graphviz, neon, autogen, gettext
 BuildRequires: libgnomeprintui22-devel, vte-devel, pcre-devel, devhelp-devel, anjuta-gdl-devel, gnome-build-devel, graphviz-devel, neon-devel, scrollkeeper, perl(XML::Parser), autogen-devel, gettext-devel, gtksourceview-devel, pkgconfig, libtool, autogen-devel
@@ -51,6 +52,7 @@
 chmod 644 scintilla/*.cxx
 chmod 644 scintilla/*.h
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 %build
 %configure --disable-static --disable-plugin-subversion --enable-nls
@@ -127,6 +129,9 @@
 %{_datadir}/gtk-doc/html/*%{name}*
 
 %changelog
+* Tue Nov 14 2006 Paul F. Johnson  2.0.2-11
+- scintilla gtk fix
+
 * Wed Nov 08 2006 Paul F. Johnson  2.0.2-10
 - add patch for close dialog on the about window
 - renamed spec file to anjuta



From fedora-extras-commits at redhat.com  Wed Nov 15 01:16:00 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:16:00 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.8,1.9
Message-ID: <200611150116.kAF1G0vC024919@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24903

Modified Files:
	piklab.spec 
Log Message:
Remove no more needed patches. Fix EVR.



Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- piklab.spec	14 Nov 2006 16:01:37 -0000	1.8
+++ piklab.spec	15 Nov 2006 01:15:29 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	1.1%{?dist}
+Release:	2%{?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
+* Tue Nov 14 2006  Alain Portal  0.12.2-2
+  - Fix EVR.
+
 * Tue Nov 14 2006  Alain Portal  0.12.2-1.1
   - Fix patches name.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 01:18:49 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:18:49 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.9,1.10
Message-ID: <200611150118.kAF1Ingw024979@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24963

Modified Files:
	piklab.spec 
Log Message:
Fix changelog date.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- piklab.spec	15 Nov 2006 01:15:29 -0000	1.9
+++ piklab.spec	15 Nov 2006 01:18:18 -0000	1.10
@@ -120,7 +120,7 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
-* Tue Nov 14 2006  Alain Portal  0.12.2-2
+* Wed Nov 15 2006  Alain Portal  0.12.2-2
   - Fix EVR.
 
 * Tue Nov 14 2006  Alain Portal  0.12.2-1.1



From fedora-extras-commits at redhat.com  Wed Nov 15 01:21:35 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:21:35 -0700
Subject: rpms/piklab/FC-5 piklab.spec,1.10,1.11
Message-ID: <200611150121.kAF1LZoJ025070@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25022

Modified Files:
	piklab.spec 
Log Message:
GRRRRRRR.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- piklab.spec	15 Nov 2006 01:18:18 -0000	1.10
+++ piklab.spec	15 Nov 2006 01:21:05 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	2%{?dist}
+Release:	3%{?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,7 +120,7 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
-* Wed Nov 15 2006  Alain Portal  0.12.2-2
+* Wed Nov 15 2006  Alain Portal  0.12.2-3
   - Fix EVR.
 
 * Tue Nov 14 2006  Alain Portal  0.12.2-1.1



From fedora-extras-commits at redhat.com  Wed Nov 15 01:23:23 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:23:23 -0700
Subject: rpms/piklab/FC-6 piklab.spec,1.7,1.8
Message-ID: <200611150123.kAF1NNcO025158@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25141

Modified Files:
	piklab.spec 
Log Message:
Remove no more needed patches. Fix EVR.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-6/piklab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- piklab.spec	14 Nov 2006 15:53:38 -0000	1.7
+++ piklab.spec	15 Nov 2006 01:22:53 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	1%{?dist}
+Release:	3%{?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
+* Wed Nov 15 2006  Alain Portal  0.12.2-3
+  - Fix EVR.
+
 * Tue Nov 14 2006  Alain Portal  0.12.2-1
   - New upstream version
 



From fedora-extras-commits at redhat.com  Wed Nov 15 01:25:15 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 14 Nov 2006 18:25:15 -0700
Subject: rpms/piklab/devel piklab.spec,1.7,1.8
Message-ID: <200611150125.kAF1PFGw025217@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25201

Modified Files:
	piklab.spec 
Log Message:
Remove no more needed patches. Fix EVR.


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/piklab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- piklab.spec	14 Nov 2006 15:51:34 -0000	1.7
+++ piklab.spec	15 Nov 2006 01:24:44 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		piklab
 Version:	0.12.2
-Release:	1%{?dist}
+Release:	3%{?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
+* Wed Nov 15 2006  Alain Portal  0.12.2-3
+  - Fix EVR.
+
 * Tue Nov 14 2006  Alain Portal  0.12.2-1
   - New upstream version
 



From fedora-extras-commits at redhat.com  Wed Nov 15 01:56:10 2006
From: fedora-extras-commits at redhat.com (Callum Lerwick (seg))
Date: Tue, 14 Nov 2006 18:56:10 -0700
Subject: rpms/rosegarden4/devel .cvsignore, 1.2, 1.3 rosegarden4.spec, 1.3, 
	1.4 sources, 1.2, 1.3 rosegarden-4-1.2.3-build-fixes.patch, 1.1,
	NONE
Message-ID: <200611150156.kAF1uAQW025518@cvs-int.fedora.redhat.com>

Author: seg

Update of /cvs/extras/rpms/rosegarden4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25496

Modified Files:
	.cvsignore rosegarden4.spec sources 
Removed Files:
	rosegarden-4-1.2.3-build-fixes.patch 
Log Message:
* Sat Nov 11 2006 Callum Lerwick  - 1.4.0-1
- New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 21:29:33 -0000	1.2
+++ .cvsignore	15 Nov 2006 01:55:40 -0000	1.3
@@ -1 +1 @@
-rosegarden-4-1.2.3.tar.bz2
+rosegarden-1.4.0.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/devel/rosegarden4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rosegarden4.spec	5 Sep 2006 08:05:40 -0000	1.3
+++ rosegarden4.spec	15 Nov 2006 01:55:40 -0000	1.4
@@ -1,14 +1,13 @@
 Name:      rosegarden4
-Version:   1.2.3
-Release:   5%{?dist}
+Version:   1.4.0
+Release:   1%{?dist}
 Summary:   MIDI, audio and notation editor
 Group:     Applications/Multimedia
 License:   GPL
 URL:       http://www.rosegardenmusic.com/
-Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-4-%{version}.tar.bz2
-Patch0:    rosegarden-4-1.2.3-build-fixes.patch
-Patch1:    rosegarden-4-desktop-file.patch
-Patch2:    rosegarden-4-1.2.3-lib64.patch
+Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
+Patch0:    rosegarden-4-desktop-file.patch
+Patch1:    rosegarden-4-1.2.3-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: scons
@@ -34,12 +33,11 @@
 musicians, music students, and small studio or home recording environments. 
 
 %prep
-%setup -q -n rosegarden-4-%{version}
+%setup -q -n rosegarden-%{version}
 %patch0 -p1
-%patch1 -p1
 # Look for LADSPA/DSSI plugins in the correct place on x86_64
 %ifarch x86_64
-%patch2 -p1
+%patch1 -p1
 %endif
 
 %build
@@ -90,7 +88,7 @@
 %{_datadir}/applications/fedora-rosegarden.desktop
 %{_datadir}/apps/rosegarden/
 %{_docdir}/HTML/*/rosegarden/
-%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.xpm
+%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.png
 %{_datadir}/icons/hicolor/16x16/mimetypes/x-rosegarden.png
 %{_datadir}/icons/hicolor/32x32/apps/rosegarden.png
 %{_datadir}/icons/hicolor/32x32/mimetypes/x-rosegarden.png
@@ -107,6 +105,9 @@
 %{_datadir}/mimelnk/audio/x-soundfont.desktop
 
 %changelog
+* Sat Nov 11 2006 Callum Lerwick  - 1.4.0-1
+- New upstream version.
+
 * Tue Sep 05 2006 Callum Lerwick  - 1.2.3-5
 - Bump for FC6 mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 21:29:33 -0000	1.2
+++ sources	15 Nov 2006 01:55:40 -0000	1.3
@@ -1 +1 @@
-e7fb7ebcb21ac6841ac5cfd6683f5fb2  rosegarden-4-1.2.3.tar.bz2
+17a0e5a781ffe5d8c8bc8044573151c3  rosegarden-1.4.0.tar.bz2


--- rosegarden-4-1.2.3-build-fixes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 15 02:25:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 19:25:57 -0700
Subject: rpms/amavisd-new/FC-6 amavisd-new.spec,1.10,1.11
Message-ID: <200611150225.kAF2PvJ3032595@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32503

Modified Files:
	amavisd-new.spec 
Log Message:
Add dependency on file. (#215492)


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-6/amavisd-new.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- amavisd-new.spec	14 Oct 2006 17:04:11 -0000	1.10
+++ amavisd-new.spec	15 Nov 2006 02:25:27 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        2%{?prerelease:.%{prerelease}}%{?dist}
+Release:        3%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -22,6 +22,7 @@
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
 Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
+Requires:       file
 Requires:       bzip2
 Requires:       gzip
 Requires:       arj
@@ -152,6 +153,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-3
+- Add dependency on file. (#215492)
+
 * Sat Oct 14 2006 Steven Pritchard  2.4.3-2
 - Fix permissions on the cron.daily script.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 02:32:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 19:32:55 -0700
Subject: rpms/amavisd-new/devel amavisd-new.spec,1.11,1.12
Message-ID: <200611150232.kAF2Wtu6001247@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1152

Modified Files:
	amavisd-new.spec 
Log Message:
Rebuild.


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amavisd-new.spec	14 Nov 2006 22:19:48 -0000	1.11
+++ amavisd-new.spec	15 Nov 2006 02:32:24 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        3%{?prerelease:.%{prerelease}}%{?dist}
+Release:        4%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -153,6 +153,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-4
+- Rebuild.
+
 * Tue Nov 14 2006 Steven Pritchard  2.4.3-3
 - Add dependency on file. (#215492)
 



From fedora-extras-commits at redhat.com  Wed Nov 15 02:35:51 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 19:35:51 -0700
Subject: rpms/amavisd-new/FC-6 amavisd-new.spec,1.11,1.12
Message-ID: <200611150235.kAF2Zp1v001746@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654

Modified Files:
	amavisd-new.spec 
Log Message:
Rebuild.


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-6/amavisd-new.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amavisd-new.spec	15 Nov 2006 02:25:27 -0000	1.11
+++ amavisd-new.spec	15 Nov 2006 02:35:20 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        3%{?prerelease:.%{prerelease}}%{?dist}
+Release:        4%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -153,6 +153,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-4
+- Rebuild.
+
 * Tue Nov 14 2006 Steven Pritchard  2.4.3-3
 - Add dependency on file. (#215492)
 



From fedora-extras-commits at redhat.com  Wed Nov 15 02:37:59 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 14 Nov 2006 19:37:59 -0700
Subject: rpms/amavisd-new/FC-5 amavisd-new.spec,1.7,1.8
Message-ID: <200611150237.kAF2bxgO002118@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2028

Modified Files:
	amavisd-new.spec 
Log Message:
Add dependency on file. (#215492)


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-new.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amavisd-new.spec	15 Oct 2006 00:23:28 -0000	1.7
+++ amavisd-new.spec	15 Nov 2006 02:37:29 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.4.3
-Release:        2%{?prerelease:.%{prerelease}}%{?dist}
+Release:        4%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -22,6 +22,7 @@
 Requires:       smtpdaemon
 Requires:       /usr/sbin/clamd, /etc/clamd.d
 Requires:       /usr/sbin/tmpwatch, /etc/cron.daily
+Requires:       file
 Requires:       bzip2
 Requires:       gzip
 Requires:       arj
@@ -152,6 +153,12 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-4
+- Rebuild.
+
+* Tue Nov 14 2006 Steven Pritchard  2.4.3-3
+- Add dependency on file. (#215492)
+
 * Sat Oct 14 2006 Steven Pritchard  2.4.3-2
 - Fix permissions on the cron.daily script.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 04:34:02 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 21:34:02 -0700
Subject: rpms/ncview/devel ncview.spec,1.5,1.6
Message-ID: <200611150434.kAF4Y2Ee015130@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15080/devel

Modified Files:
	ncview.spec 
Log Message:
bz 215632



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/devel/ncview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncview.spec	2 Sep 2006 15:48:42 -0000	1.5
+++ ncview.spec	15 Nov 2006 04:33:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -46,6 +46,11 @@
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview
 chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+mv ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview \
+   ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/X11
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,11 +61,14 @@
 %doc README COPYING
 %{_bindir}/*
 %{_datadir}/ncview
-%{_libdir}/X11/app-defaults/*
+%{_datadir}/X11/app-defaults/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill  - 1.92e-9
+- bz 215632
+
 * Sat Sep  2 2006 Ed Hill  - 1.92e-8
 - rebuild for imminent FC-6 release
 



From fedora-extras-commits at redhat.com  Wed Nov 15 04:34:00 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 21:34:00 -0700
Subject: rpms/ncview/FC-5 ncview.spec,1.4,1.5
Message-ID: <200611150434.kAF4Y028015124@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15080/FC-5

Modified Files:
	ncview.spec 
Log Message:
bz 215632



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-5/ncview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncview.spec	17 Feb 2006 03:02:10 -0000	1.4
+++ ncview.spec	15 Nov 2006 04:33:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -46,6 +46,11 @@
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview
 chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+mv ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview \
+   ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/X11
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,11 +61,14 @@
 %doc README COPYING
 %{_bindir}/*
 %{_datadir}/ncview
-%{_libdir}/X11/app-defaults/*
+%{_datadir}/X11/app-defaults/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill  - 1.92e-8
+- bz 215632
+
 * Thu Feb 16 2006 Ed Hill  - 1.92e-7
 - rebuild for new gcc
 



From fedora-extras-commits at redhat.com  Wed Nov 15 04:34:02 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 21:34:02 -0700
Subject: rpms/ncview/FC-6 ncview.spec,1.5,1.6
Message-ID: <200611150434.kAF4Y2nG015127@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15080/FC-6

Modified Files:
	ncview.spec 
Log Message:
bz 215632



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-6/ncview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncview.spec	2 Sep 2006 15:48:42 -0000	1.5
+++ ncview.spec	15 Nov 2006 04:33:31 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -46,6 +46,11 @@
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview
 chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+mv ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview \
+   ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/X11
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,11 +61,14 @@
 %doc README COPYING
 %{_bindir}/*
 %{_datadir}/ncview
-%{_libdir}/X11/app-defaults/*
+%{_datadir}/X11/app-defaults/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill  - 1.92e-9
+- bz 215632
+
 * Sat Sep  2 2006 Ed Hill  - 1.92e-8
 - rebuild for imminent FC-6 release
 



From fedora-extras-commits at redhat.com  Wed Nov 15 04:47:09 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Tue, 14 Nov 2006 21:47:09 -0700
Subject: rpms/mlton/devel mlton-debuginfo.patch,1.1,1.2
Message-ID: <200611150447.kAF4l99e015324@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15305

Modified Files:
	mlton-debuginfo.patch 
Log Message:
debug

mlton-debuginfo.patch:

Index: mlton-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlton-debuginfo.patch	9 Jul 2006 13:51:57 -0000	1.1
+++ mlton-debuginfo.patch	15 Nov 2006 04:46:38 -0000	1.2
@@ -1,24 +1,24 @@
-diff -ur mlton-20051202~/bytecode/Makefile mlton-20051202/bytecode/Makefile
---- mlton-20051202~/bytecode/Makefile	2005-11-30 13:36:52.000000000 -0500
-+++ mlton-20051202/bytecode/Makefile	2006-06-25 18:14:13.000000000 -0400
+diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
+--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/bytecode/Makefile	2006-11-14 23:18:42.000000000 -0500
 @@ -10,7 +10,7 @@
  all: interpret.o interpret-gdb.o print-opcodes
  
  CC = gcc -std=gnu99
 -CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
 +CFLAGS = -fomit-frame-pointer -g -I../runtime -I../include -Wall
- 
- ifeq ($(TARGET_ARCH), amd64)
- CFLAGS += -mtune=opteron -m32 
-diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
---- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
-+++ mlton-20051202/Makefile	2006-06-25 18:13:45.000000000 -0400
-@@ -402,17 +402,6 @@
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
+diff -ur mlton-20061107~/Makefile mlton-20061107/Makefile
+--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
++++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
+@@ -411,17 +411,6 @@
  	if $(GZIP_MAN); then						\
  		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
  	fi
 -	case "$(TARGET_OS)" in						\
--	cygwin|darwin|solaris)						\
+-	aix|cygwin|darwin|solaris)					\
 -	;;								\
 -	*)								\
 -		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
@@ -31,15 +31,15 @@
  
  .PHONY: install-docs
  install-docs:
-diff -ur mlton-20051202~/runtime/Makefile mlton-20051202/runtime/Makefile
---- mlton-20051202~/runtime/Makefile	2005-11-29 18:05:07.000000000 -0500
-+++ mlton-20051202/runtime/Makefile	2006-06-25 18:13:45.000000000 -0400
+diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
+--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/runtime/Makefile	2006-11-14 23:20:40.000000000 -0500
 @@ -49,7 +49,7 @@
  endif
  
  CC = gcc -std=gnu99
 -CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
 +CFLAGS = -O2 -Wall -g -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
- DEBUGFLAGS = $(CFLAGS) -gstabs+ -g2
- 
- CFILES = 							\
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)



From fedora-extras-commits at redhat.com  Wed Nov 15 05:18:41 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 22:18:41 -0700
Subject: rpms/ncview/FC-5 ncview.spec,1.5,1.6
Message-ID: <200611150518.kAF5IfK4018538@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18522

Modified Files:
	ncview.spec 
Log Message:
cleanup app-defaults install



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-5/ncview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncview.spec	15 Nov 2006 04:33:28 -0000	1.5
+++ ncview.spec	15 Nov 2006 05:18:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -40,16 +40,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
-mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
+cat > install-appdef < - 1.92e-9
+- cleanup app-defaults install (check-buildroot)
+
 * Tue Nov 14 2006 Ed Hill  - 1.92e-8
 - bz 215632
 



From fedora-extras-commits at redhat.com  Wed Nov 15 05:30:05 2006
From: fedora-extras-commits at redhat.com (Callum Lerwick (seg))
Date: Tue, 14 Nov 2006 22:30:05 -0700
Subject: rpms/rosegarden4/FC-6 .cvsignore, 1.2, 1.3 rosegarden4.spec, 1.3,
	1.4 sources, 1.2, 1.3 rosegarden-4-1.2.3-build-fixes.patch, 1.1, NONE
Message-ID: <200611150530.kAF5U5Fi018691@cvs-int.fedora.redhat.com>

Author: seg

Update of /cvs/extras/rpms/rosegarden4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18654

Modified Files:
	.cvsignore rosegarden4.spec sources 
Removed Files:
	rosegarden-4-1.2.3-build-fixes.patch 
Log Message:
* Sat Nov 11 2006 Callum Lerwick  - 1.4.0-1
- New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 21:29:33 -0000	1.2
+++ .cvsignore	15 Nov 2006 05:29:35 -0000	1.3
@@ -1 +1 @@
-rosegarden-4-1.2.3.tar.bz2
+rosegarden-1.4.0.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/rosegarden4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rosegarden4.spec	5 Sep 2006 08:05:40 -0000	1.3
+++ rosegarden4.spec	15 Nov 2006 05:29:35 -0000	1.4
@@ -1,14 +1,13 @@
 Name:      rosegarden4
-Version:   1.2.3
-Release:   5%{?dist}
+Version:   1.4.0
+Release:   1%{?dist}
 Summary:   MIDI, audio and notation editor
 Group:     Applications/Multimedia
 License:   GPL
 URL:       http://www.rosegardenmusic.com/
-Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-4-%{version}.tar.bz2
-Patch0:    rosegarden-4-1.2.3-build-fixes.patch
-Patch1:    rosegarden-4-desktop-file.patch
-Patch2:    rosegarden-4-1.2.3-lib64.patch
+Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
+Patch0:    rosegarden-4-desktop-file.patch
+Patch1:    rosegarden-4-1.2.3-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: scons
@@ -34,12 +33,11 @@
 musicians, music students, and small studio or home recording environments. 
 
 %prep
-%setup -q -n rosegarden-4-%{version}
+%setup -q -n rosegarden-%{version}
 %patch0 -p1
-%patch1 -p1
 # Look for LADSPA/DSSI plugins in the correct place on x86_64
 %ifarch x86_64
-%patch2 -p1
+%patch1 -p1
 %endif
 
 %build
@@ -90,7 +88,7 @@
 %{_datadir}/applications/fedora-rosegarden.desktop
 %{_datadir}/apps/rosegarden/
 %{_docdir}/HTML/*/rosegarden/
-%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.xpm
+%{_datadir}/icons/hicolor/16x16/apps/x-rosegarden.png
 %{_datadir}/icons/hicolor/16x16/mimetypes/x-rosegarden.png
 %{_datadir}/icons/hicolor/32x32/apps/rosegarden.png
 %{_datadir}/icons/hicolor/32x32/mimetypes/x-rosegarden.png
@@ -107,6 +105,9 @@
 %{_datadir}/mimelnk/audio/x-soundfont.desktop
 
 %changelog
+* Sat Nov 11 2006 Callum Lerwick  - 1.4.0-1
+- New upstream version.
+
 * Tue Sep 05 2006 Callum Lerwick  - 1.2.3-5
 - Bump for FC6 mass rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 21:29:33 -0000	1.2
+++ sources	15 Nov 2006 05:29:35 -0000	1.3
@@ -1 +1 @@
-e7fb7ebcb21ac6841ac5cfd6683f5fb2  rosegarden-4-1.2.3.tar.bz2
+17a0e5a781ffe5d8c8bc8044573151c3  rosegarden-1.4.0.tar.bz2


--- rosegarden-4-1.2.3-build-fixes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 15 06:11:51 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 23:11:51 -0700
Subject: rpms/ncview/FC-5 ncview.spec,1.6,1.7
Message-ID: <200611150611.kAF6BpGp022002@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21986

Modified Files:
	ncview.spec 
Log Message:
more cleanups for check-buildroot



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-5/ncview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ncview.spec	15 Nov 2006 05:18:11 -0000	1.6
+++ ncview.spec	15 Nov 2006 06:11:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -37,6 +37,7 @@
 #  The parallel build was tested and it does NOT work.
 #  make %{?_smp_mflags}
 make
+sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < ncview.1.sed > ncview.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +67,9 @@
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill  - 1.92e-10
+- more cleanups for check-buildroot
+
 * Tue Nov 14 2006 Ed Hill  - 1.92e-9
 - cleanup app-defaults install (check-buildroot)
 



From fedora-extras-commits at redhat.com  Wed Nov 15 06:22:58 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 23:22:58 -0700
Subject: rpms/ncview/devel ncview.spec,1.6,1.7
Message-ID: <200611150622.kAF6Mw1q022127@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22091

Modified Files:
	ncview.spec 
Log Message:
more cleanups



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/devel/ncview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ncview.spec	15 Nov 2006 04:33:32 -0000	1.6
+++ ncview.spec	15 Nov 2006 06:22:28 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -37,19 +37,20 @@
 #  The parallel build was tested and it does NOT work.
 #  make %{?_smp_mflags}
 make
+sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < ncview.1.sed > ncview.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
-mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
+cat > install-appdef < - 1.92e-10
+- more cleanups for check-buildroot
+
 * Tue Nov 14 2006 Ed Hill  - 1.92e-9
 - bz 215632
 



From fedora-extras-commits at redhat.com  Wed Nov 15 06:23:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Tue, 14 Nov 2006 23:23:15 -0700
Subject: rpms/ncview/FC-6 ncview.spec,1.6,1.7
Message-ID: <200611150623.kAF6NF2A022168@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22110

Modified Files:
	ncview.spec 
Log Message:
more cleanups



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-6/ncview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ncview.spec	15 Nov 2006 04:33:31 -0000	1.6
+++ ncview.spec	15 Nov 2006 06:22:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -37,19 +37,20 @@
 #  The parallel build was tested and it does NOT work.
 #  make %{?_smp_mflags}
 make
+sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < ncview.1.sed > ncview.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
-mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
+cat > install-appdef < - 1.92e-10
+- more cleanups for check-buildroot
+
 * Tue Nov 14 2006 Ed Hill  - 1.92e-9
 - bz 215632
 



From fedora-extras-commits at redhat.com  Wed Nov 15 06:49:35 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Tue, 14 Nov 2006 23:49:35 -0700
Subject: rpms/gcin/devel NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.11, 1.12 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150649.kAF6nZ2l022369@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22340

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:14:47 -0000	1.8
+++ .cvsignore	15 Nov 2006 06:49:04 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	20 Oct 2006 08:14:47 -0000	1.11
+++ gcin.spec	15 Nov 2006 06:49:04 -0000	1.12
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +32,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -37,6 +40,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -50,10 +54,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -103,6 +107,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:14:47 -0000	1.2
+++ im-client.patch	15 Nov 2006 06:49:04 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:14:47 -0000	1.8
+++ sources	15 Nov 2006 06:49:04 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 06:58:35 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Tue, 14 Nov 2006 23:58:35 -0700
Subject: rpms/gcin/FC-6 NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.11, 1.12 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150658.kAF6wZK1022486@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22447

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:14:47 -0000	1.8
+++ .cvsignore	15 Nov 2006 06:58:05 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	20 Oct 2006 08:14:47 -0000	1.11
+++ gcin.spec	15 Nov 2006 06:58:05 -0000	1.12
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +32,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -37,6 +40,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -50,10 +54,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -103,6 +107,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:14:47 -0000	1.2
+++ im-client.patch	15 Nov 2006 06:58:05 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:14:47 -0000	1.8
+++ sources	15 Nov 2006 06:58:05 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 07:07:42 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 15 Nov 2006 00:07:42 -0700
Subject: rpms/gcin/FC-5 NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.11, 1.12 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150707.kAF77gnb025636@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25607

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:17:28 -0000	1.8
+++ .cvsignore	15 Nov 2006 07:07:12 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	20 Oct 2006 08:17:28 -0000	1.11
+++ gcin.spec	15 Nov 2006 07:07:12 -0000	1.12
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,6 +32,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -37,6 +40,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -50,10 +54,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -103,6 +107,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:17:28 -0000	1.2
+++ im-client.patch	15 Nov 2006 07:07:12 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:17:28 -0000	1.8
+++ sources	15 Nov 2006 07:07:12 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 07:15:14 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 15 Nov 2006 00:15:14 -0700
Subject: rpms/gcin/FC-4 NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.12, 1.13 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150715.kAF7FEOj025736@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25705

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:22:14 -0000	1.8
+++ .cvsignore	15 Nov 2006 07:14:44 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	20 Oct 2006 08:22:14 -0000	1.12
+++ gcin.spec	15 Nov 2006 07:14:44 -0000	1.13
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -28,6 +30,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -35,6 +38,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,10 +52,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -101,6 +105,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:22:14 -0000	1.2
+++ im-client.patch	15 Nov 2006 07:14:44 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:22:14 -0000	1.8
+++ sources	15 Nov 2006 07:14:44 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 07:22:03 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 15 Nov 2006 00:22:03 -0700
Subject: rpms/gcin/FC-3 NewCJ3.cin, NONE, 1.1 newcj3.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 gcin.spec, 1.11, 1.12 im-client.patch,
	1.2, 1.3 sources, 1.8, 1.9
Message-ID: <200611150722.kAF7M3h6025824@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25792

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Added Files:
	NewCJ3.cin newcj3.patch 
Log Message:
update to 1.2.9 and add NewCJ3.cin


--- NEW FILE NewCJ3.cin ---
%gen_inp
%ename NewCJ3
%cname ????????????
%selkey 123456789
%keyname begin
'  ???
,  ???
.  ???
;  ???
[  ???
]  ???
a  ???
b  ???
c  ???
d  ???
e  ???
f  ???
g  ???
h  ???
i  ???
j  ???
k  ???
l  ???
m  ???
n  ???
o  ???
p  ???
q  ???
r  ???
s  ???
t  ???
u  ???
v  ???
w  ???
x  ???
y  ???
z  ???
%keyname end
%chardef begin
` ???	???????????????????????? gcin ????????? ` ????????????????????????
, ???
,, ???
. ???
.. ???
.. ???
.. ???
.. ???
.. ??
.. ???
.. ???
.. ???
... ???
... ???
... ???
.; ???
' ???
'' "
'' "
'' ???
'' ???
'' ???
'' ???
; ???
; ???
; ???
; ,
; .
; ;
; ???
; ???
; ???
; ???
; ???
; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; "
;; "
;; ???
;; ???
;; ???
;; ???
;; ???
;; ???
;; ??
;; ???
;; ???
;; ???
;;; ???
;;; ???
;;; ??????
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
;;; ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
[[[ ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ???
] ??
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
]]] ???
;a ???
;b ???
;c ???
;cu ???
;d ???
;e ???
;f ???
;g ???
;h ???
;i ???
;ii ??????
;i; ???
;j ???
;k ???
;l ???
;l ???
;l; ???
;m ???
;n ???
;o ???
;p ???
;q ???
;r ???
;s ???
;t ???
;u ???
;uu ??????
;u; ???
;v ???
[...68123 lines suppressed...]
zzao ???
zzap ???
zzaq ???
zzar ???
zzas ???
zzat ???
zzau ???
zzav ???
zzaw ???
zzax ???
zzay ???
cann candyz
candy Chung-Yen Chang
mail candyz0416 at gmail.com
email candyz0416 at gmail.com
blog http://blog.candyz.org/
cle http://cle.linux.org.tw/
cls /clear
msn http://www.msn.com.tw/
googl http://www.google.com.tw/
pchom http://www.pchome.com.tw/
yahoo http://tw.yahoo.com/
fed fedora
deb debian
a ???
a ???
i ???
i ???
u ???
u ???
e ???
e ???
o ???
o ???
ka ???
ki ???
ku ???
ke ???
ko ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi    ???
tsu    ???
tu     ???
tsu	???
tu    ???
te     ???
to     ???
da     ???
di     ???
du     ???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya 	???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo     ???
n	???
a      ???
a     ???
i      ???
i     ???
u      ???
u     ???
e      ???
e     ???
o      ???
o     ???
ka     ???
ki     ???
ku     ???
ke     ???
ko     ???
ga     ???
gi     ???
gu     ???
ge     ???
go     ???
sa     ???
si     ???
shi    ???
su     ???
se     ???
so     ???
za     ???
zi     ???
ji     ???
zu     ???
ze     ???
zo     ???
ta     ???
ti     ???
chi	???
tsu     ???
tsu    ???
te     ???
to     ???
da     ???
di	???
du	???
de     ???
do     ???
na     ???
ni     ???
nu     ???
ne     ???
no     ???
ha     ???
hi     ???
hu     ???
he     ???
ho     ???
ba     ???
bi     ???
bu     ???
be     ???
bo     ???
pa     ???
pi     ???
pu     ???
pe     ???
po     ???
ma     ???
mi     ???
mu     ???
me     ???
mo     ???
ya     ???
ya    ???
yu     ???
yu    ???
yo     ???
yo    ???
ra     ???
ri     ???
ru     ???
re     ???
ro     ???
wa     ???
wa    ???
wi     ???
we     ???
wo      ???
n	???
vu	???
%chardef end

newcj3.patch:

--- NEW FILE newcj3.patch ---
--- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
@@ -2,7 +2,7 @@
 
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
 
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
      cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
      et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
      pinyin.kbm pinyin-asdf.kbm \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Oct 2006 08:31:38 -0000	1.8
+++ .cvsignore	15 Nov 2006 07:21:32 -0000	1.9
@@ -1 +1 @@
-gcin-1.2.8.tar.bz2
+gcin-1.2.9.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcin.spec	20 Oct 2006 08:31:38 -0000	1.11
+++ gcin.spec	15 Nov 2006 07:21:32 -0000	1.12
@@ -1,17 +1,19 @@
 Name:           gcin
-Version:        1.2.8
+Version:        1.2.9
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://cle.linux.org.tw/gcin/
-Source0:        http://www.csie.nctu.edu.tw/~cp76/gcin/download/%{name}-%{version}.tar.bz2
+Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
 Source2:        gcinicon.tgz
+Source3:        NewCJ3.cin
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
+Patch4:         newcj3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -28,6 +30,7 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
+%patch4 -p1 -b .newcj3
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -35,6 +38,7 @@
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
 cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
+cp -f %{SOURCE3} data/
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,10 +52,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
+# devel files {
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
-cd $RPM_BUILD_ROOT/%{_libdir}
-ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
-cd -
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libgcin-im-client.so
+# }
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -101,6 +105,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
+- update to 1.2.9
+- add NewCJ3.cin
+
 * Fri Oct 20 2006 Chung-Yen Chang  - 1.2.8-1
 - update to 1.2.8
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/im-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-client.patch	20 Oct 2006 08:31:38 -0000	1.2
+++ im-client.patch	15 Nov 2006 07:21:32 -0000	1.3
@@ -9,27 +9,19 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -14,15 +14,16 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--libgcin-im-client.so:   $(OBJS)
--	$(CC) $(SO_FLAGS) $(OBJS) -o $@
-+libgcin-im-client.so.1.0.1:   $(OBJS)
-+	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
-+	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
- 	$(MAKE) -C ../gtk-im
- 
+@@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  
  install:
 -	install -d $(gcinlibdir)
--	install -m 755 libgcin-im-client.so $(gcinlibdir)
+-	install -m 755 $(SOFILEVER) $(gcinlibdir)
+-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
 +	install -d $(libdir)
-+	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
- 	install -d $(includedir); \
++	install -m 755 $(SOFILEVER) $(libdir)
++	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ 	ln -sf $(SOFILEVER) $(SOFILE).1
+ 	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
- 
 @@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -47,7 +39,7 @@
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
 +#GCIN_SO= gcin1.so
  
  OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
@@ -70,10 +62,10 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Oct 2006 08:31:38 -0000	1.8
+++ sources	15 Nov 2006 07:21:32 -0000	1.9
@@ -1 +1 @@
-d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2
+c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 07:36:11 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Wed, 15 Nov 2006 00:36:11 -0700
Subject: rpms/gcin/FC-3 tray.patch,NONE,1.1 gcin.spec,1.12,1.13
Message-ID: <200611150736.kAF7aBpv025975@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25955

Modified Files:
	gcin.spec 
Added Files:
	tray.patch 
Log Message:
add tray.patch

tray.patch:

--- NEW FILE tray.patch ---
--- gcin-1.2.9/tray.c.orig	2006-11-14 17:54:43.000000000 +0800
+++ gcin-1.2.9/tray.c	2006-11-15 15:31:43.000000000 +0800
@@ -285,7 +285,7 @@
   pango_layout_set_font_description(pango, desc);
 #if 1
   // strange bug, why do we need this ?
-  desc = pango_layout_get_font_description(pango);
+  //desc = pango_layout_get_font_description(pango);
 #endif
   pango_font_description_set_size(desc, 9 * PANGO_SCALE);
 


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	15 Nov 2006 07:21:32 -0000	1.12
+++ gcin.spec	15 Nov 2006 07:35:40 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         tray.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -31,6 +32,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .tray
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -105,6 +107,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-2
+- add tray.patch
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Wed Nov 15 10:25:43 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 15 Nov 2006 03:25:43 -0700
Subject: fedora-security/audit fc5,1.390,1.391
Message-ID: <200611151025.kAFAPhFb005252@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5212

Modified Files:
	fc5 
Log Message:
CVE updates, fix consistency



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- fc5	14 Nov 2006 18:09:26 -0000	1.390
+++ fc5	15 Nov 2006 10:25:39 -0000	1.391
@@ -1,10 +1,10 @@
 Up to date CVE as of CVE email 20061112
-Up to date FC5 as of 20061112
+Up to date FC5 as of 20061114
 
 ** are items that need attention
 
 CVE-2006-5823 version (kernel) [since FEDORA-2006-1221]
-CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 version (kernel) [since FEDORA-2006-1221]
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
@@ -23,26 +23,27 @@
 CVE-2006-5469 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5468 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]
 CVE-2006-5467 backport (ruby) #212396 [since FEDORA-2006-1110]
+CVE-2006-5466 VULNERABLE (rpm) #212833
+CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
 CVE-2006-5464 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5464 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5463 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5463 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5462 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5462 version (firefox) [since FEDORA-2006-1199]
-CVE-2006-5466 VULNERABLE (rpm) #212833
-CVE-2006-5465 backport (php, fixed 5.2.0) #213732 [since FEDORA-2006-1168]
+CVE-2006-5461 VULNERABLE (avahi, fixed 0.6.15)
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
 CVE-2006-5397 version (libX11, 1.0.2 and 1.0.3 only)
 CVE-2006-5331 VULNERABLE (kernel, fixed 2.6.19-rc3)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1061]
 CVE-2006-5229 ignore (openssh) reported not an issue
-CVE-2006-5215 VULNERABLE (xorg-x11-xdm) bz#212167
-CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5215 VULNERABLE (kdebase) bz#212166
-CVE-2006-5214 VULNERABLE (xorg-x11-xdm) bz#212167
-CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5214 VULNERABLE (kdebase) bz#212166
+CVE-2006-5215 VULNERABLE (xorg-x11-xdm) #212167
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit) #212167
+CVE-2006-5215 VULNERABLE (kdebase) #212166
+CVE-2006-5214 VULNERABLE (xorg-x11-xdm) #212167
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit) #212167
+CVE-2006-5214 VULNERABLE (kdebase) #212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield
@@ -422,10 +423,10 @@
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1608 ignore (php) safe mode isn't safe
 CVE-2006-1549 ignore (php) this is not a security issue
-CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
-CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
-CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
-CVE-2006-1542 backport (python) bz#169046 [since FEDORA-2006-689]
+CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) #187544
+CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) #187544
+CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) #187544
+CVE-2006-1542 backport (python) #169046 [since FEDORA-2006-689]
 CVE-2006-1531 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490]
 CVE-2006-1531 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1530 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490]
@@ -434,7 +435,7 @@
 CVE-2006-1529 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1528 version (kernel, fixed 2.6.13)
 CVE-2006-1527 version (kernel, fixed 2.6.16.13, fixed 2.6.17-rc4) [since FEDORA-2006-499]
-CVE-2006-1526 backport (xorg-x11-server, fixed 1.1.1 at least) bz#189802 [since FEDORA-2006-483] xorg-x11-server-1.0.1-render-tris-CVE-2006-1526.patch
+CVE-2006-1526 backport (xorg-x11-server, fixed 1.1.1 at least) #189802 [since FEDORA-2006-483] xorg-x11-server-1.0.1-render-tris-CVE-2006-1526.patch
 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421]
 CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421]
 CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421]
@@ -446,11 +447,11 @@
 CVE-2006-1490 version (php, fixed 5.1.4) [since FEDORA-2006-289]
 CVE-2006-1470 version (openldap, not 2.3.24 at least) #197278
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
-CVE-2006-1354 VULNERABLE (freeradius, fixed 1.1.2 at least) bz#186084
+CVE-2006-1354 VULNERABLE (freeradius, fixed 1.1.2 at least) #186084
 CVE-2006-1343 version (kernel, fixed 2.6.16.19) [since FEDORA-2006-698]
 CVE-2006-1342 version (kernel, not 2.6) not vulnerable
 CVE-2006-1335 version (gnome-screensaver, fixed 2.14)
-CVE-2006-1296 version (beagle, fixed 0.2.4) bz#185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188
+CVE-2006-1296 version (beagle, fixed 0.2.4) #185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188
 CVE-2006-1273 ignore (firefox) this issue only affects IE
 CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues
 CVE-2006-1242 version (kernel, fixed 2.6.16.1) [since FEDORA-2006-233]
@@ -462,16 +463,16 @@
 CVE-2006-1078 ignore (httpd) not a vulnerability
 CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1061 version (curl, fixed 7.15.3) [since FEDORA-2006-933] was backport since FEDORA-2006-189
-CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
-CVE-2006-1058 backport (busybox) bz#187386 [since FEDORA-2006-510]
-CVE-2006-1057 version (gdm, fixed 2.14.1) bz#188303 [since FEDORA-2006-338]
+CVE-2006-1059 version (samba, fixed 3.0.22 at least) #187170 [since FEDORA-2006-259]
+CVE-2006-1058 backport (busybox) #187386 [since FEDORA-2006-510]
+CVE-2006-1057 version (gdm, fixed 2.14.1) #188303 [since FEDORA-2006-338]
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421]
 CVE-2006-1052 version (kernel, fixed 2.6.16) [since FEDORA-2006-421] was patch-2.6.16-rc6 since FEDORA-2006-233
 CVE-2006-1045 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490]
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe
-CVE-2006-0996 version (php, fixed 5.1.4) bz#187511 [since FEDORA-2006-289]
+CVE-2006-0996 version (php, fixed 5.1.4) #187511 [since FEDORA-2006-289]
 CVE-2006-0903 version (mysql, 4.1.19) #183261 [since FEDORA-2006-553]
 CVE-2006-0884 version (thunderbird, fixed 1.5.0.2) [since FEDORA-2006-490]
 CVE-2006-0836 ignore (thunderbird) only crash on manual import
@@ -724,7 +725,7 @@
 CVE-2005-3089 version (firefox, fixed 1.0.7)
 CVE-2005-3088 ignore (fetchmail) fetchmailconf not shipped
 CVE-2005-3055 version (kernel, fixed 2.6.14 at least)
-CVE-2005-3054 ignore (php) see bz#169857
+CVE-2005-3054 ignore (php) see #169857
 CVE-2005-3053 version (kernel)
 CVE-2005-3044 version (kernel, fixed 2.6.13.2)
 CVE-2005-3011 backport (texinfo) texinfo-CAN-2005-3011.patch
@@ -1104,7 +1105,7 @@
 CVE-2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
 CVE-2005-0455 version (HelixPlayer, fixed 1.0.3)
 CVE-2005-0449 version (kernel, fixed 2.6.11)
-CVE-2005-0448 version (perl, fixed 5.8.6) bz#173793
+CVE-2005-0448 version (perl, fixed 5.8.6) #173793
 CVE-2005-0446 version (squid, fixed 2.5.STABLE9)
 CVE-2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020
 CVE-2005-0403 version (kernel) not upstream
@@ -1241,7 +1242,7 @@
 CVE-2004-2541 ignore (cscope) blocked by FORTIFY_SOURCE
 CVE-2004-2536 version (kernel, fixed 2.6.7)
 CVE-2004-2531 version (gnutls, fixed 1.0.17)
-CVE-2004-2480 ignore (squid) bz#166523, not reproducable
+CVE-2004-2480 ignore (squid) #166523, not reproducable
 CVE-2004-2479 version (squid, fixed 2.5.STABLE8)
 CVE-2004-2396 version (passwd, fixed 0.69)
 CVE-2004-2395 version (passwd, fixed 0.69)



From fedora-extras-commits at redhat.com  Wed Nov 15 10:26:08 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 15 Nov 2006 03:26:08 -0700
Subject: fedora-security/audit fc6,1.142,1.143
Message-ID: <200611151026.kAFAQ8bA005336@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5304

Modified Files:
	fc6 
Log Message:
CVE updates, fix consistency



Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- fc6	14 Nov 2006 18:10:03 -0000	1.142
+++ fc6	15 Nov 2006 10:26:06 -0000	1.143
@@ -1,10 +1,10 @@
 Up to date CVE as of CVE email 20061112
-Up to date FC6 as of 20061112
+Up to date FC6 as of 20061114
 
 ** are items that need attention
 
 CVE-2006-5823 version (kernel) [since FEDORA-2006-1223]
-CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) [#214641]
+CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed
 CVE-2006-5757 version (kernel) [since FEDORA-2006-1223]
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
@@ -31,18 +31,19 @@
 CVE-2006-5463 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5462 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5462 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
+CVE-2006-5461 VULNERABLE (avahi, fixed 0.6.15)
 CVE-2006-5456 VULNERABLE (ImageMagick) #210921
-CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) bz#213280
+CVE-2006-5397 VULNERABLE (libX11, 1.0.2 and 1.0.3 only) #213280
 CVE-2006-5331 VULNERABLE (kernel, fixed 2.6.19-rc3)
 CVE-2006-5298 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5297 backport (mutt) [since FEDORA-2006-1063]
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
-CVE-2006-5215 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5215 VULNERABLE (kdebase) bz#212166
+CVE-2006-5215 VULNERABLE (xorg-x11-xinit) #212167
+CVE-2006-5215 VULNERABLE (kdebase) #212166
 CVE-2006-5214 version (xorg-x11-xdm)
-CVE-2006-5214 VULNERABLE (xorg-x11-xinit) bz#212167
-CVE-2006-5214 VULNERABLE (kdebase) bz#212166
+CVE-2006-5214 VULNERABLE (xorg-x11-xinit) #212167
+CVE-2006-5214 VULNERABLE (kdebase) #212166
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
@@ -118,15 +119,15 @@
 CVE-2006-4262 backport (cscope) 
 CVE-2006-4253 version (firefox, fixed 1.5.0.7)
 CVE-2006-4253 version (thunderbird, fixed 1.5.0.7)
-CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203428
-CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) bz#203434
+CVE-2006-4226 VULNERABLE (mysql, fixed 5.0.26,5.1.12) #203428
+CVE-2006-4227 VULNERABLE (mysql, fixed 5.0.26,5.1.12) #203434
 CVE-2006-4146 backport (gdb)
 CVE-2006-4145 version (kernel, fixed 2.6.17.10, fixed 2.6.18-rc5) needs a better upstream fix
 CVE-2006-4144 backport (ImageMagick, fixed 6.2.9)
 CVE-2006-4096 backport (bind)
 CVE-2006-4095 backport (bind)
 CVE-2006-4093 version (kernel, fixed 2.6.17.9, fixed 2.6.18-rc5)
-CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) bz#202675
+CVE-2006-4031 VULNERABLE (mysql, fixed 5.0.24) #202675
 CVE-2006-4020 version (php, fixed 5.1.5)
 CVE-2006-4019 version (squirrelmail, fixed 1.4.8)
 CVE-2006-3918 version (httpd, fixed 2.2.2)
@@ -187,7 +188,7 @@
 CVE-2006-3469 version (mysql)
 CVE-2006-3468 version (kernel, fixed 2.6.17.8, fixed 2.6.18-rc4)
 CVE-2006-3467 version (freetype, fixed 2.2)
-CVE-2006-3467 ignore (vnc) bz#204052 not a vulnerability
+CVE-2006-3467 ignore (vnc) #204052 not a vulnerability
 CVE-2006-3467 backport (libXfont) fdo-7535.patch
 CVE-2006-3465 backport (libtiff) libtiff-3.8.2-ormandy.patch
 CVE-2006-3464 backport (libtiff) libtiff-3.8.2-ormandy.patch
@@ -260,7 +261,7 @@
 CVE-2006-2753 version (mysql, fixed 5.0.22)
 CVE-2006-2723 ignore (firefox) disputed
 CVE-2006-2661 version (freetype, fixed 2.2.1)
-CVE-2006-2660 ignore (php) see bz#195539
+CVE-2006-2660 ignore (php) see #195539
 CVE-2006-2656 backport (libtiff) tiffsplit-overflow.patch
 CVE-2006-2629 ignore (kernel) couldn't be reproduced on FC
 CVE-2006-2613 ignore (firefox) This isn't an issue on FC



From fedora-extras-commits at redhat.com  Wed Nov 15 11:02:55 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 15 Nov 2006 04:02:55 -0700
Subject: fedora-security/audit fc5,1.391,1.392 fc6,1.143,1.144
Message-ID: <200611151102.kAFB2t7p011143@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11121/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-5701, CVE-2006-5757 and CVE-2006-5823



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- fc5	15 Nov 2006 10:25:39 -0000	1.391
+++ fc5	15 Nov 2006 11:02:50 -0000	1.392
@@ -3,16 +3,16 @@
 
 ** are items that need attention
 
-CVE-2006-5823 version (kernel) [since FEDORA-2006-1221]
+CVE-2006-5823 backport (kernel) [since FEDORA-2006-1221]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed
-CVE-2006-5757 version (kernel) [since FEDORA-2006-1221]
+CVE-2006-5757 backport (kernel, fixed 2.6.19-rc2) [since FEDORA-2006-1221]
 CVE-2006-5748 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5748 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5747 version (thunderbird) [since FEDORA-2006-1194]
 CVE-2006-5747 version (firefox) [since FEDORA-2006-1199]
 CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
-CVE-2006-5701 VULNERABLE (kernel, not upstream)
+CVE-2006-5701 VULNERABLE (kernel) squashfs is not included upstream
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 version (kernel, fixed 2.6.18.2, fixed 2.6.19-rc4) [since FEDORA-2006-1221]
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1141]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- fc6	15 Nov 2006 10:26:06 -0000	1.143
+++ fc6	15 Nov 2006 11:02:50 -0000	1.144
@@ -3,16 +3,16 @@
 
 ** are items that need attention
 
-CVE-2006-5823 version (kernel) [since FEDORA-2006-1223]
+CVE-2006-5823 backport (kernel) [since FEDORA-2006-1223]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed
-CVE-2006-5757 version (kernel) [since FEDORA-2006-1223]
+CVE-2006-5757 backport (kernel, fixed 2.6.19-rc2) [since FEDORA-2006-1223]
 CVE-2006-5748 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5748 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5747 version (firefox, fixed 1.5.0.8) [since FEDORA-2006-1191]
 CVE-2006-5747 version (thunderbird, fixed 1.5.0.8) [since FEDORA-2006-1192]
 CVE-2006-5706 ignore (php, fixed 5.2.0) safe mode isn't safe
-CVE-2006-5701 VULNERABLE (kernel, not upstream)
+CVE-2006-5701 VULNERABLE (kernel) squashfs is not included upstream
 CVE-2006-5633 ignore (firefox) just a client DoS
 CVE-2006-5619 version (kernel, fixed 2.6.18.2, fixed 2.6.19-rc4) [since FEDORA-2006-1223]
 CVE-2006-5595 version (wireshark, fixed 0.99.4) [since FEDORA-2006-1140]



From fedora-extras-commits at redhat.com  Wed Nov 15 11:24:10 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 15 Nov 2006 04:24:10 -0700
Subject: fedora-security/audit fc5,1.392,1.393 fc6,1.144,1.145
Message-ID: <200611151124.kAFBOAtZ013354@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13334

Modified Files:
	fc5 fc6 
Log Message:
Deal with the tricky rebases of kdebase, oprofile, python which needed
more auditing at the source code to verify the outstanding vulnerabilities.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- fc5	15 Nov 2006 11:02:50 -0000	1.392
+++ fc5	15 Nov 2006 11:24:07 -0000	1.393
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20061112
+Up to date CVE as of CVE email 20061114
 Up to date FC5 as of 20061114
 
 ** are items that need attention
@@ -40,10 +40,10 @@
 CVE-2006-5229 ignore (openssh) reported not an issue
 CVE-2006-5215 VULNERABLE (xorg-x11-xdm) #212167
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit) #212167
-CVE-2006-5215 VULNERABLE (kdebase) #212166
+CVE-2006-5215 ignore (kdebase) #212166 links to xinit Xsession
 CVE-2006-5214 VULNERABLE (xorg-x11-xdm) #212167
 CVE-2006-5214 VULNERABLE (xorg-x11-xinit) #212167
-CVE-2006-5214 VULNERABLE (kdebase) #212166
+CVE-2006-5214 ignore (kdebase) #212166 links to xinit Xsession
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] protected by exec-shield
@@ -55,7 +55,7 @@
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4) [since FEDORA-2006-1011]
 CVE-2006-4997 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022]
-CVE-2006-4980 backport (python) #208166 [since FEDORA-2006-1049]
+CVE-2006-4980 backport (python, fixed 2.4.4 at least) #208166 [since FEDORA-2006-1049]
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 backport (openssh) #207957 [since FEDORA-2006-1011]
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
@@ -493,7 +493,7 @@
 CVE-2006-0670 VULNERABLE (bluez-hcidump)
 CVE-2006-0645 version (gnutls, fixed 1.2.10)
 CVE-2006-0591 version (postgresql, fixed 8.0.6)
-CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch
+CVE-2006-0576 backport (oprofile, fixed 0.9.2 at least) oprofile_opcontrol.patch
 CVE-2006-0558 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-0557 version (kernel, fixed 2.6.15.6) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0555 version (kernel, fixed 2.6.16) patch-2.6.16-rc6-git3 [since FEDORA-2006-233]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- fc6	15 Nov 2006 11:02:50 -0000	1.144
+++ fc6	15 Nov 2006 11:24:07 -0000	1.145
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20061112
+Up to date CVE as of CVE email 20061114
 Up to date FC6 as of 20061114
 
 ** are items that need attention
@@ -40,10 +40,10 @@
 CVE-2006-5229 ignore (openssh) not reproduced
 CVE-2006-5215 version (xorg-x11-xdm)
 CVE-2006-5215 VULNERABLE (xorg-x11-xinit) #212167
-CVE-2006-5215 VULNERABLE (kdebase) #212166
+CVE-2006-5215 ignore (kdebase) #212166 links to xinit Xsession
 CVE-2006-5214 version (xorg-x11-xdm)
 CVE-2006-5214 VULNERABLE (xorg-x11-xinit) #212167
-CVE-2006-5214 VULNERABLE (kdebase) #212166
+CVE-2006-5214 ignore (kdebase) #212166 links to xinit Xsession
 CVE-2006-5178 VULNERABLE (php) can't be fixed
 CVE-2006-5174 ignore (kernel, fixed 2.6.19-rc1) s390 only
 CVE-2006-5173 ignore (kernel, fixed 2.6.18) protected by exec-shield
@@ -55,7 +55,7 @@
 CVE-2006-5052 VULNERABLE (openssh, fixed 4.4)
 CVE-2006-5051 backport (openssh, fixed 4.4)
 CVE-2006-4997 version (kernel, fixed 2.6.18)
-CVE-2006-4980 backport (python)
+CVE-2006-4980 version (python, fixed 2.4.4 at least) [since FEDORA-2006-1050] was backport since GA
 CVE-2006-4925 ignore (openssh) client crash only
 CVE-2006-4924 backport (openssh, fixed 4.4)
 CVE-2006-4842 ignore (nspr) Nothing setuid links with nspr
@@ -163,7 +163,7 @@
 CVE-2006-3745 version (kernel, fixed 2.6.17.10, fixed 2.6.18-rc5)
 CVE-2006-3744 backport (ImageMagick)
 CVE-2006-3743 backport (ImageMagick)
-CVE-2006-3742 backport (kdebase) inside kdebase-3.5.4-2-redhat.patch
+CVE-2006-3742 backport (kdebase) inside kdebase-3.5.5-redhat-pam.patch
 CVE-2006-3741 ignore (kernel, fixed 2.6.18-rc7) ia64 only
 CVE-2006-3740 version (libXfont, fixed 1.2.2)
 CVE-2006-3739 version (libXfont, fixed 1.2.2)
@@ -441,7 +441,7 @@
 CVE-2006-0670 version (bluez-hcidump, fixed 1.30)
 CVE-2006-0645 version (gnutls, fixed 1.2.10)
 CVE-2006-0591 version (postgresql, fixed 8.0.6)
-CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch
+CVE-2006-0576 version (oprofile, fixed 0.9.2 at least) [since FEDORA-2006-1172] was backport since GA
 CVE-2006-0558 version (kernel, fixed 2.6.16)
 CVE-2006-0557 version (kernel, fixed 2.6.15.6)
 CVE-2006-0555 version (kernel, fixed 2.6.16)



From fedora-extras-commits at redhat.com  Wed Nov 15 12:04:04 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:04:04 -0700
Subject: rpms/python-twisted-core/devel - New directory
Message-ID: <200611151204.kAFC44n5016619@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16604/python-twisted-core/devel

Log Message:
Directory /cvs/extras/rpms/python-twisted-core/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 12:03:40 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:03:40 -0700
Subject: rpms/python-twisted-core - New directory
Message-ID: <200611151203.kAFC3eT4016608@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16604/python-twisted-core

Log Message:
Directory /cvs/extras/rpms/python-twisted-core added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 12:04:23 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:04:23 -0700
Subject: rpms/python-twisted-core Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611151204.kAFC4NOY016653@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16647

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-twisted-core


--- NEW FILE Makefile ---
# Top level Makefile for module python-twisted-core
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  Wed Nov 15 12:04:30 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:04:30 -0700
Subject: rpms/python-twisted-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611151204.kAFC4UnJ016666@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16647/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-twisted-core


--- 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 Nov 15 12:05:52 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:05:52 -0700
Subject: rpms/python-twisted-core/devel python-twisted-core.spec, NONE,
	1.1 twisted-dropin-cache, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611151205.kAFC5q51016753@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16716/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-twisted-core.spec twisted-dropin-cache 
Log Message:
auto-import python-twisted-core-2.4.0-5 on branch devel from python-twisted-core-2.4.0-5.src.rpm


--- NEW FILE python-twisted-core.spec ---
%{?!python:%define python python}
%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

%define origname TwistedCore

Name:           %{python}-twisted-core
Version:        2.4.0
Release:        5%{?dist}
Summary:        An asynchronous networking framework written in Python

Group:          Development/Libraries
License:        MIT
URL:            http://twistedmatrix.com/trac/wiki/TwistedCore
Source0:        http://tmrc.mit.edu/mirror/twisted/Twisted/2.4/%{origname}-%{version}.tar.bz2
Source1:        twisted-dropin-cache
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  %{python}-devel
BuildRequires:  %{python}-zope-interface

# for FC3 and earlier
%if "%{pybasever}" < "2.4"
Requires:       python(abi) = %{pybasever}
%endif

Requires:       %{python}-zope-interface
Requires:       pyOpenSSL

%description
An extensible framework for Python programming, with special focus
on event-based network programming and multiprotocol integration.

It is expected that one day the project will expanded to the point
that the framework will seamlessly integrate with mail, web, DNS,
netnews, IRC, RDBMSs, desktop environments, and your toaster.

%package doc
Summary:        Documentation for Twisted Core
Group:          Documentation
Requires:       python-twisted-core = %{version}-%{release}

%description doc
Documentation for Twisted Core.

%package zsh
Summary:        Tab completion for Zsh and Twisted Core
Group:          System Environment/Shells
Requires:       python-twisted-core = %{version}-%{release}
Requires:       zsh

%description zsh
Tab completions for Zsh and Twisted Core.

%prep
%setup -n %{origname}-%{version} -q
%{__sed} -i -e '/^#! *\/usr\/bin\/python/d' twisted/internet/glib2reactor.py
%{__sed} -i -e '/^#!\/bin\/python/d'        twisted/trial/test/scripttest.py

find doc -name \*.py | xargs chmod a-x
chmod a-x doc/howto/listings/pb/copy_receiver.tac
%{__sed} -i 's/\r//' doc/howto/listings/udp/MulticastClient.py
%{__sed} -i 's/\r//' doc/howto/listings/udp/MulticastServer.py

# Generate a brief README.zsh
awk '/^Zsh Notes:/,/^Have fun!/' twisted/python/zshcomp.py > README.zsh

%build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT

# cfsupport is support for MacOSX Core Foundations, so we can delete it
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/twisted/internet/cfsupport

# iocpreactor is a win32 reactor, so we can delete it
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/twisted/internet/iocpreactor

# Man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
cp -a doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
rm -rf doc/man

# Zsh tab complete stub (a la teratorn)
mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
sed 's#python -c#%{__python} -c#g' < twisted/python/_twisted_zsh_stub > _twisted_zsh_stub.MOD
install -m 644 _twisted_zsh_stub.MOD $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_twisted_zsh_stub

# remove the version we won't use
rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/python/_twisted_zsh_stub

# script to regenerate dropin.cache
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}

rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/protocols/_c_urlarg.c
rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/spread/cBanana.c

%clean
rm -rf $RPM_BUILD_ROOT

%post -p %{_libexecdir}/twisted-dropin-cache

%files
%defattr(-,root,root,-)
%doc CREDITS LICENSE NEWS README
%{_bindir}/manhole
%{_bindir}/mktap
%{_bindir}/tap2deb
%{_bindir}/tap2rpm
%{_bindir}/tapconvert
%{_bindir}/tkmktap
%{_bindir}/trial
%{_bindir}/twistd
%{_libexecdir}/twisted-dropin-cache

%{_mandir}/man1/*

%dir %{python_sitearch}/twisted/
%{python_sitearch}/twisted/*.py*

%{python_sitearch}/twisted/application/
%{python_sitearch}/twisted/cred/
%{python_sitearch}/twisted/enterprise/
%{python_sitearch}/twisted/internet/

%dir %{python_sitearch}/twisted/manhole/
%{python_sitearch}/twisted/manhole/*.py*
%{python_sitearch}/twisted/manhole/*.glade

%{python_sitearch}/twisted/manhole/ui/
%{python_sitearch}/twisted/manhole/ui/*.py*
%{python_sitearch}/twisted/manhole/ui/*.glade
%{python_sitearch}/twisted/manhole/ui/gtkrc

%{python_sitearch}/twisted/persisted/
%{python_sitearch}/twisted/persisted/journal/

%dir %{python_sitearch}/twisted/plugins/
%{python_sitearch}/twisted/plugins/*.py*
%ghost %{python_sitearch}/twisted/plugins/dropin.cache

%dir %{python_sitearch}/twisted/protocols/
%{python_sitearch}/twisted/protocols/*.py*
%{python_sitearch}/twisted/protocols/*.so

%{python_sitearch}/twisted/protocols/gps/
%{python_sitearch}/twisted/protocols/mice/

%dir %{python_sitearch}/twisted/python/
%{python_sitearch}/twisted/python/*.py*

%dir %{python_sitearch}/twisted/python/zsh/
%{python_sitearch}/twisted/python/zsh/README
%{python_sitearch}/twisted/python/zsh/_*

%{python_sitearch}/twisted/scripts/

%dir %{python_sitearch}/twisted/spread/
%{python_sitearch}/twisted/spread/*.py*
%{python_sitearch}/twisted/spread/*.so

%dir %{python_sitearch}/twisted/spread/ui/
%{python_sitearch}/twisted/spread/ui/*.py*
%{python_sitearch}/twisted/spread/ui/*.glade

%{python_sitearch}/twisted/tap/

%dir %{python_sitearch}/twisted/test/
%{python_sitearch}/twisted/test/*.py*
%{python_sitearch}/twisted/test/server.pem

%dir %{python_sitearch}/twisted/trial/
%{python_sitearch}/twisted/trial/*.py*

%dir %{python_sitearch}/twisted/trial/test/
%{python_sitearch}/twisted/trial/test/*.py*
%{python_sitearch}/twisted/trial/test/notpython

%files doc
%defattr(-,root,root,-)
%doc doc/*

%files zsh
%defattr(-,root,root,-)
%doc README.zsh
%{_datadir}/zsh/site-functions/_twisted_zsh_stub

%changelog
* Tue Nov 07 2006 Thomas Vander Stichele 
- 2.4.0-5
- incorporate suggestsions by Paul Howarth:
- fix groups for doc and zsh
- don't package _twisted_zsh_stub from the python_sitearch dir
- generate README.zsh

* Wed Nov 01 2006 Thomas Vander Stichele 
- 2.4.0-4
- incorporate changes by Jeffrey C. Ollie:
- add doc and zsh subpackage
- remove executable bits from documentation files to avoid dependencies
- remove shebang from some files
- fix up end of line on some files
- remove .c files from being packaged

* Tue Sep 26 2006 Thomas Vander Stichele 
- 2.4.0-3
- no longer ghost .pyo files

* Fri Jun 09 2006 Thomas Vander Stichele 
- 2.4.0-2
- add twisted-dropin-cache script and use it
- ghost the dropin.cache file

* Wed Jun 07 2006 Thomas Vander Stichele 
- 2.4.0-1
- upstream release
- require pyOpenSSL as it is named in Extras

* Mon Oct 10 2005 Jeff Pitman  2.1.0-1
- upstream release

* Tue Aug 23 2005 Jeff Pitman  2.0.1-1
- upstream release

* Mon Apr 04 2005 Jeff Pitman  2.0.0-2
- add zsh support

* Fri Mar 25 2005 Jeff Pitman  2.0.0-1
- final release

* Thu Mar 17 2005 Jeff Pitman  2.0.0-0.2.a3
- dropped web2

* Wed Mar 16 2005 Jeff Pitman  2.0.0-0.1.a3
- upstream release

* Sat Mar 12 2005 Jeff Pitman  2.0.0-0.1.a2
- new prerelease; FE versioning

* Mon Feb 07 2005 Jeff Pitman  2.0.0a1-1
- prep for split

* Fri Aug 20 2004 Jeff Pitman  1.3.0-1
- new version

* Mon Apr 19 2004 Jeff Pitman  1.2.0-3
- vaultize

* Mon Apr 12 2004 Jeff Pitman  1.2.0-2
- require pyOpenSSL, SOAPpy, openssh-clients, crypto, dia so trial can run



--- NEW FILE twisted-dropin-cache ---
#!/usr/bin/env python
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4

# this program regenerates the dropin.cache file for twisted,
# or for the modules specified on the command line

import sys
from twisted.plugin import IPlugin, getPlugins

which = None
if len(sys.argv) > 1:
    which = sys.argv[1:]

if not which:
    list(getPlugins(IPlugin))
else:
    from twisted.python import reflect
    for w in which:
        try:
            module = reflect.namedAny(w)
        except AttributeError:
            sys.stderr.write("No module '%s' found.\n" % w)
            continue
        list(getPlugins(IPlugin, module))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 12:04:29 -0000	1.1
+++ .cvsignore	15 Nov 2006 12:05:21 -0000	1.2
@@ -0,0 +1 @@
+TwistedCore-2.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 12:04:29 -0000	1.1
+++ sources	15 Nov 2006 12:05:21 -0000	1.2
@@ -0,0 +1 @@
+042a57f65fe919a9234047d7ce8c43f1  TwistedCore-2.4.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 12:05:50 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:05:50 -0700
Subject: rpms/python-twisted-core import.log,1.1,1.2
Message-ID: <200611151205.kAFC5ovL016749@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16716

Modified Files:
	import.log 
Log Message:
auto-import python-twisted-core-2.4.0-5 on branch devel from python-twisted-core-2.4.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-core/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 12:04:23 -0000	1.1
+++ import.log	15 Nov 2006 12:05:20 -0000	1.2
@@ -0,0 +1 @@
+python-twisted-core-2_4_0-5:HEAD:python-twisted-core-2.4.0-5.src.rpm:1163592312



From fedora-extras-commits at redhat.com  Wed Nov 15 12:09:06 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 15 Nov 2006 05:09:06 -0700
Subject: owners owners.list,1.1962,1.1963
Message-ID: <200611151209.kAFC961c016816@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16800/owners

Modified Files:
	owners.list 
Log Message:
adding python-twisted-core



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1962
retrieving revision 1.1963
diff -u -r1.1962 -r1.1963
--- owners.list	14 Nov 2006 23:14:19 -0000	1.1962
+++ owners.list	15 Nov 2006 12:08:35 -0000	1.1963
@@ -1979,6 +1979,7 @@
 Fedora Extras|python-turbojson|Python template plugin that supports json|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-turbokid|Python template plugin that supports Kid templates|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-twisted-core|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-vobject|A python library for manipulating vCard and vCalendar files|jbowes at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-vorbis|A Python wrapper for the Ogg Vorbis audio libraries|hugo at devin.com.br|extras-qa at fedoraproject.org|
 Fedora Extras|python-xmpp|Python library for easy scripting with Jabber|jeff at ocjtech.us|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 15:02:41 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:02:41 -0700
Subject: rpms/phpMyAdmin/FC-5 phpMyAdmin.spec,1.1,1.2
Message-ID: <200611151502.kAFF2fcD026751@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26706/FC-5

Modified Files:
	phpMyAdmin.spec 
Log Message:
Fixes for bug 215159


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-5/phpMyAdmin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.spec	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.spec	15 Nov 2006 15:02:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 1alpha
+Release: 2alpha
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -40,7 +40,8 @@
 ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php
 
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLCT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/CREDITS
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess
 
 %clean
@@ -60,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
+- Fixed 215159
+
 * Fri Nov 10 2006 Mike McGrath  2.9.1-1alpha
 - Added alpha tag since this is a release candidate
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:02:51 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:02:51 -0700
Subject: rpms/phpMyAdmin/FC-6 phpMyAdmin.spec,1.1,1.2
Message-ID: <200611151502.kAFF2p51026756@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26706/FC-6

Modified Files:
	phpMyAdmin.spec 
Log Message:
Fixes for bug 215159


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/phpMyAdmin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.spec	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.spec	15 Nov 2006 15:02:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 1alpha
+Release: 2alpha
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -40,7 +40,8 @@
 ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php
 
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLCT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/CREDITS
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess
 
 %clean
@@ -60,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
+- Fixed 215159
+
 * Fri Nov 10 2006 Mike McGrath  2.9.1-1alpha
 - Added alpha tag since this is a release candidate
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:02:51 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:02:51 -0700
Subject: rpms/phpMyAdmin/devel phpMyAdmin.spec,1.1,1.2
Message-ID: <200611151502.kAFF2pcu026755@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26706/devel

Modified Files:
	phpMyAdmin.spec 
Log Message:
Fixes for bug 215159


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phpMyAdmin.spec	10 Nov 2006 16:15:50 -0000	1.1
+++ phpMyAdmin.spec	15 Nov 2006 15:02:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 1alpha
+Release: 2alpha
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -40,7 +40,8 @@
 ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_datadir}/%{name}/config.inc.php
 
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/*txt
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLCT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/[IRLT]*
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/CREDITS
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/libraries/.htaccess
 
 %clean
@@ -60,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
+- Fixed 215159
+
 * Fri Nov 10 2006 Mike McGrath  2.9.1-1alpha
 - Added alpha tag since this is a release candidate
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:22:56 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 08:22:56 -0700
Subject: rpms/beryl-core/devel beryl-core.spec,1.1,1.2
Message-ID: <200611151522.kAFFMucl026913@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26893

Modified Files:
	beryl-core.spec 
Log Message:
- Don't Provides: beryl, instead create meta-packages
- Explicitly turn off use of libsvg-cairo
- Fix for hosed-up release tarball including .o files...

Users should be able to install everything via 'yum install beryl' or desktop environment specific stuff via 'yum install beryl-(gnome|kde)'. Well, once all the other bits are actually in the repo too...




Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-core.spec	14 Nov 2006 20:31:35 -0000	1.1
+++ beryl-core.spec	15 Nov 2006 15:22:26 -0000	1.2
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,8 +17,6 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-Provides:       beryl = %{name}-%{version}
-
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
@@ -47,15 +45,56 @@
 and library files for the beryl-core
 package.
 
+%package -n beryl
+Summary: Beryl meta-package to install all beryl components
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: beryl-gnome = %{version}-%{release}
+Requires: beryl-kde = %{version}-%{release}
+Requires: bdock >= %{version}
+
+%description -n beryl
+This is a meta-package, which depends on all available beryl bits,
+making it easy for users to get all things beryl installed.
+
+%package -n beryl-gnome
+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}, beryl-dbus >= %{version}
+Requires: beryl-vidcap >= %{version}
+Requires: emerald >= %{version}, emerald-themes >= %{version}
+Requires: heliodor >= %{version}
+
+%description -n beryl-gnome
+This is a meta-package, which depends on all available beryl bits
+relevant to the Gnome desktop environment, making it easy for
+users to install all the beryl bits for Gnome.
+
+%package -n beryl-kde
+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}, beryl-vidcap >= %{version}
+Requires: emerald >= %{version}, emerald-themes >= %{version}
+Requires: aquamarine >= %{version}
+
+%description -n beryl-kde
+This is a meta-package, which depends on all available beryl bits
+relevant to the KDE desktop environment, making it easy for
+users to install all the beryl bits for KDE.
 
 %prep
 %setup -q
 %patch0 -p0 -b .mesa64
-#autoreconf -v --install
+# Somebody hosed up the release tarball...
+find mesa/src -name "*.o" | xargs rm -f
 
 
 %build
-%configure --enable-librsvg --enable-libsvg-cairo
+%configure
 ln -s %{_includedir}/X11 mesa/include/
 ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
 # Parallel builds currently broken
@@ -96,8 +135,21 @@
 %{_includedir}/beryl/*.h
 %{_mandir}/man3/beryl*
 
+%files -n beryl
+%defattr(-,root,root,-)
+
+%files -n beryl-gnome
+%defattr(-,root,root,-)
+
+%files -n beryl-kde
+%defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 14 2006 Jarod Wilson  0.1.2-4
+- Don't Provides: beryl, instead create meta-packages
+- Minimize config flags, the build figures it out itself
+- Fix for hosed-up release tarball including .o files...
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-3
 - Put man3 in -devel, remove dead libsvg-cairo-devel BR
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:38:45 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:38:45 -0700
Subject: rpms/phpMyAdmin/FC-6 phpMyAdmin.spec,1.2,1.3
Message-ID: <200611151538.kAFFcjgg027176@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27129/FC-6

Modified Files:
	phpMyAdmin.spec 
Log Message:
Added dist tag


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-6/phpMyAdmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phpMyAdmin.spec	15 Nov 2006 15:02:17 -0000	1.2
+++ phpMyAdmin.spec	15 Nov 2006 15:38:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 2alpha
+Release: 3alpha%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -61,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-3alpha
+- Added dist tag
+
 * Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
 - Fixed 215159
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:38:44 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:38:44 -0700
Subject: rpms/phpMyAdmin/FC-5 phpMyAdmin.spec,1.2,1.3
Message-ID: <200611151538.kAFFcicE027173@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27129/FC-5

Modified Files:
	phpMyAdmin.spec 
Log Message:
Added dist tag


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/FC-5/phpMyAdmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phpMyAdmin.spec	15 Nov 2006 15:02:10 -0000	1.2
+++ phpMyAdmin.spec	15 Nov 2006 15:38:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 2alpha
+Release: 3alpha%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -61,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-3alpha
+- Added dist tag
+
 * Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
 - Fixed 215159
 



From fedora-extras-commits at redhat.com  Wed Nov 15 15:38:46 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Wed, 15 Nov 2006 08:38:46 -0700
Subject: rpms/phpMyAdmin/devel phpMyAdmin.spec,1.2,1.3
Message-ID: <200611151538.kAFFckiL027179@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/phpMyAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27129/devel

Modified Files:
	phpMyAdmin.spec 
Log Message:
Added dist tag


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpMyAdmin/devel/phpMyAdmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phpMyAdmin.spec	15 Nov 2006 15:02:19 -0000	1.2
+++ phpMyAdmin.spec	15 Nov 2006 15:38:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name: phpMyAdmin
 Version: 2.9.1
-Release: 2alpha
+Release: 3alpha%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group:	Applications/Internet
@@ -61,6 +61,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Wed Nov 15 2006 Mike McGrath  2.9.1-3alpha
+- Added dist tag
+
 * Wed Nov 15 2006 Mike McGrath  2.9.1-2alpha
 - Fixed 215159
 



From fedora-extras-commits at redhat.com  Wed Nov 15 16:41:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 15 Nov 2006 09:41:46 -0700
Subject: rpms/qt4/devel qt4.spec,1.26,1.27
Message-ID: <200611151641.kAFGfkC1030599@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30582

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter  4.2.1-3
- move libQtDesigner to -x11



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4.spec	28 Oct 2006 18:51:14 -0000	1.26
+++ qt4.spec	15 Nov 2006 16:41:16 -0000	1.27
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -134,7 +134,7 @@
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-x11 = %{version}-%{release}
+Requires: %{name}-x11 
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -402,12 +402,12 @@
 %files x11 
 %defattr(-,root,root,-)
 %{qt_libdir}/libQt3Support.so.*
+%{qt_libdir}/libQtAssistantClient.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%if "%{version}" >= "4.2.0"
-%{qt_libdir}/libQtAssistantClient.so.*
-%endif
 %{qtdir}/plugins/*
 %exclude %{qtdir}/plugins/designer
 %exclude %{qtdir}/plugins/sqldrivers
@@ -449,8 +449,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -509,14 +507,17 @@
 
 
 %changelog
-* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+* Wed Nov 15 2006 Rex Dieter  4.2.1-3
+- move libQtDesigner to -x11
+
+* Mon Oct 23 2006 Rex Dieter  4.2.1-2
 - use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter  4.2.1-1
 - 4.2.1
 
-* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+* Wed Oct 04 2006 Rex Dieter  4.2.0-1
 - 4.2.0(final)
 
 * Thu Sep 28 2006 Kevin Kofler  4.2.0-0.9.20060927



From fedora-extras-commits at redhat.com  Wed Nov 15 17:24:43 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 10:24:43 -0700
Subject: rpms/compat-libosip2/devel compat-libosip2.spec,1.1,1.2
Message-ID: <200611151724.kAFHOhQH003170@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3152

Modified Files:
	compat-libosip2.spec 
Log Message:
Bump release to work around bad CVS tag.


Index: compat-libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/devel/compat-libosip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-libosip2.spec	14 Nov 2006 20:20:15 -0000	1.1
+++ compat-libosip2.spec	15 Nov 2006 17:24:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           compat-libosip2
 Version:        2.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -94,6 +94,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Nov 15 2006 Jeffrey C. Ollie  - 2.2.2-9
+- Bump release to workaround bad CVS tag.
+
 * Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-8
 - Add Obsoletes
 



From fedora-extras-commits at redhat.com  Wed Nov 15 17:26:11 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 10:26:11 -0700
Subject: rpms/compat-libosip2/FC-6 compat-libosip2.spec,1.1,1.2
Message-ID: <200611151726.kAFHQBXR003244@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3223

Modified Files:
	compat-libosip2.spec 
Log Message:
Bump release to work around bad CVS tag.


Index: compat-libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/FC-6/compat-libosip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-libosip2.spec	14 Nov 2006 20:20:15 -0000	1.1
+++ compat-libosip2.spec	15 Nov 2006 17:25:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           compat-libosip2
 Version:        2.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -94,6 +94,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Nov 15 2006 Jeffrey C. Ollie  - 2.2.2-9
+- Bump release to workaround bad CVS tag.
+
 * Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-8
 - Add Obsoletes
 



From fedora-extras-commits at redhat.com  Wed Nov 15 17:28:00 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 10:28:00 -0700
Subject: rpms/compat-libosip2/FC-5 compat-libosip2.spec,1.1,1.2
Message-ID: <200611151728.kAFHS0Io003323@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/compat-libosip2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3299

Modified Files:
	compat-libosip2.spec 
Log Message:
Bump release to work around bad CVS tag.


Index: compat-libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-libosip2/FC-5/compat-libosip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-libosip2.spec	14 Nov 2006 20:20:15 -0000	1.1
+++ compat-libosip2.spec	15 Nov 2006 17:27:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           compat-libosip2
 Version:        2.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -94,6 +94,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Nov 15 2006 Jeffrey C. Ollie  - 2.2.2-9
+- Bump release to workaround bad CVS tag.
+
 * Mon Nov 13 2006 Jeffrey C. Ollie  - 2.2.2-8
 - Add Obsoletes
 



From fedora-extras-commits at redhat.com  Wed Nov 15 17:31:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 10:31:21 -0700
Subject: rpms/libosip2/FC-5 .cvsignore, 1.4, 1.5 libosip2.spec, 1.8,
	1.9 sources, 1.4, 1.5 libosip2-2.2.2-x64.patch, 1.1, NONE
Message-ID: <200611151731.kAFHVLoD003462@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3438

Modified Files:
	.cvsignore libosip2.spec sources 
Removed Files:
	libosip2-2.2.2-x64.patch 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 23:59:46 -0000	1.4
+++ .cvsignore	15 Nov 2006 17:30:51 -0000	1.5
@@ -1 +1 @@
-libosip2-2.2.2.tar.gz
+libosip2-3.0.1.tar.gz


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-5/libosip2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libosip2.spec	23 Feb 2006 19:11:03 -0000	1.8
+++ libosip2.spec	15 Nov 2006 17:30:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           libosip2
-Version:        2.2.2
-Release:        3%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -8,7 +8,6 @@
 License:        LGPL
 URL:            http://www.gnu.org/software/osip/
 Source0:        http://ftp.gnu.org/gnu/osip/%{name}-%{version}.tar.gz
-Patch:          libosip2-2.2.2-x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -41,20 +40,19 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x64
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT%{_mandir}/man1/osip.1 $RPM_BUILD_ROOT%{_mandir}/man1/osip2.1
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+mv %{buildroot}%{_mandir}/man1/osip.1 %{buildroot}%{_mandir}/man1/osip2.1
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -74,6 +72,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
+- Update to 3.0.1 and remove unnecessary patch.
+
+* Wed Aug 30 2006 Jeffrey C. Ollie  - 2.2.2-4
+- Bump release and rebuild.
+
 * Thu Feb 23 2006 Ignacio Vazquez-Abrams  2.2.2-3
 - Fix for AMD64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 23:59:46 -0000	1.4
+++ sources	15 Nov 2006 17:30:51 -0000	1.5
@@ -1 +1 @@
-40ee3ec89030f0d6dfdb2cf6100e6685  libosip2-2.2.2.tar.gz
+417833bb363ffd7c762ff17c931651df  libosip2-3.0.1.tar.gz


--- libosip2-2.2.2-x64.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 15 17:48:42 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 15 Nov 2006 10:48:42 -0700
Subject: rpms/gnome-phone-manager/devel gnome-phone-manager.spec,1.6,1.7
Message-ID: <200611151748.kAFHmgF8003730@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3669

Modified Files:
	gnome-phone-manager.spec 
Log Message:
Rebuild to pick up libbtctl i/f bump



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-phone-manager.spec	28 Oct 2006 22:50:04 -0000	1.6
+++ gnome-phone-manager.spec	15 Nov 2006 17:48:12 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.8
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -81,6 +81,9 @@
 %{_datadir}/pixmaps/cellphone.png
 
 %changelog
+* Sun Nov 15 2006 Linus Walleij  0.8-5
+- Rebuild to pick up libbtctl i/f bump.
+
 * Sun Oct 29 2006 Linus Walleij  0.8-4
 - Rebuild to pick up libedataserver i/f bump.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 18:02:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Nov 2006 11:02:28 -0700
Subject: rpms/w3c-markup-validator/devel .cvsignore, 1.5, 1.6 sources, 1.5, 
	1.6 w3c-markup-validator.spec, 1.12, 1.13
Message-ID: <200611151802.kAFI2S6Y006880@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6833/devel

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Log Message:
* Wed Nov 15 2006 Ville Skytt??  - 0.7.4-1
- 0.7.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Oct 2006 21:13:31 -0000	1.5
+++ .cvsignore	15 Nov 2006 18:01:57 -0000	1.6
@@ -1,2 +1,2 @@
-validator-0_7_3.tar.gz
-sgml-lib-0_7_3.tar.gz
+validator-0_7_4.tar.gz
+sgml-lib-0_7_4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 21:13:31 -0000	1.5
+++ sources	15 Nov 2006 18:01:57 -0000	1.6
@@ -1,2 +1,2 @@
-8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
-ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz
+e5fbda9e67c6d904fca2b80f7052c1e5  validator-0_7_4.tar.gz
+bb72a0bb7d31b2ceff13ac966a0ff62f  sgml-lib-0_7_4.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- w3c-markup-validator.spec	31 Oct 2006 19:36:46 -0000	1.12
+++ w3c-markup-validator.spec	15 Nov 2006 18:01:57 -0000	1.13
@@ -1,8 +1,8 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -46,15 +46,15 @@
 %patch1 -p1
 %patch2 -p2
 %patch3 -p2
-rm -f htdocs/images/debian.png
+find . -name "*.orig" -print0 | xargs -0 rm
 
 # Localize configs.
 %{__perl} -pi -e \
   's|/usr/local/validator\b|%{_datadir}/%{name}|' \
   htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/*
 %{__perl} -pi -e \
-  's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}|' \
-  htdocs/config/validator.conf
+  's|\$base(_path)?/htdocs/sgml-lib|%{_datadir}/sgml/%{name}|i' \
+  htdocs/config/validator.conf httpd/cgi-bin/check
 
 # Move config out of the way
 mv htdocs/config __config
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Wed Nov 15 2006 Ville Skytt??  - 0.7.4-1
+- 0.7.4.
+
 * Tue Oct 31 2006 Ville Skytt??  - 0.7.3-2
 - Reference HTML 4.01 DTDs directly instead of making all system catalogs
   available - something in the catalogs breaks at least XHTML 1.0 (#213131).



From fedora-extras-commits at redhat.com  Wed Nov 15 18:02:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 15 Nov 2006 11:02:26 -0700
Subject: rpms/w3c-markup-validator/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 w3c-markup-validator.spec, 1.12, 1.13
Message-ID: <200611151802.kAFI2QcG006877@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6833/FC-6

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Log Message:
* Wed Nov 15 2006 Ville Skytt??  - 0.7.4-1
- 0.7.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Oct 2006 21:13:25 -0000	1.5
+++ .cvsignore	15 Nov 2006 18:01:56 -0000	1.6
@@ -1,2 +1,2 @@
-validator-0_7_3.tar.gz
-sgml-lib-0_7_3.tar.gz
+validator-0_7_4.tar.gz
+sgml-lib-0_7_4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Oct 2006 21:13:25 -0000	1.5
+++ sources	15 Nov 2006 18:01:56 -0000	1.6
@@ -1,2 +1,2 @@
-8193a3cf8a5d6061aa832e1952ccaeab  validator-0_7_3.tar.gz
-ac08be405f372e1932fdbe89960254a2  sgml-lib-0_7_3.tar.gz
+e5fbda9e67c6d904fca2b80f7052c1e5  validator-0_7_4.tar.gz
+bb72a0bb7d31b2ceff13ac966a0ff62f  sgml-lib-0_7_4.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/w3c-markup-validator.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- w3c-markup-validator.spec	31 Oct 2006 19:36:40 -0000	1.12
+++ w3c-markup-validator.spec	15 Nov 2006 18:01:56 -0000	1.13
@@ -1,8 +1,8 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.3
-Release:        2%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -46,15 +46,15 @@
 %patch1 -p1
 %patch2 -p2
 %patch3 -p2
-rm -f htdocs/images/debian.png
+find . -name "*.orig" -print0 | xargs -0 rm
 
 # Localize configs.
 %{__perl} -pi -e \
   's|/usr/local/validator\b|%{_datadir}/%{name}|' \
   htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/*
 %{__perl} -pi -e \
-  's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}|' \
-  htdocs/config/validator.conf
+  's|\$base(_path)?/htdocs/sgml-lib|%{_datadir}/sgml/%{name}|i' \
+  htdocs/config/validator.conf httpd/cgi-bin/check
 
 # Move config out of the way
 mv htdocs/config __config
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Wed Nov 15 2006 Ville Skytt??  - 0.7.4-1
+- 0.7.4.
+
 * Tue Oct 31 2006 Ville Skytt??  - 0.7.3-2
 - Reference HTML 4.01 DTDs directly instead of making all system catalogs
   available - something in the catalogs breaks at least XHTML 1.0 (#213131).



From fedora-extras-commits at redhat.com  Wed Nov 15 18:12:29 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Wed, 15 Nov 2006 11:12:29 -0700
Subject: rpms/wcstools/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wcstools.spec, 1.4, 1.5
Message-ID: <200611151812.kAFICTSS007079@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7059

Modified Files:
	.cvsignore sources wcstools.spec 
Log Message:
* Tue Oct 10 2006 Sergio Pascual  3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual  3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual  3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual  3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual  3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual  3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual  3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual  3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 11:28:24 -0000	1.3
+++ .cvsignore	15 Nov 2006 18:11:59 -0000	1.4
@@ -1 +1 @@
-wcstools-3.6.6beta.tar.gz
+wcstools-3.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Oct 2006 11:28:24 -0000	1.3
+++ sources	15 Nov 2006 18:11:59 -0000	1.4
@@ -1 +1 @@
-cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz
+c41af2de22949f40957276978f48e0d7  wcstools-3.6.6.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-6/wcstools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools.spec	10 Oct 2006 11:28:24 -0000	1.4
+++ wcstools.spec	15 Nov 2006 18:11:59 -0000	1.5
@@ -1,12 +1,12 @@
 Name: wcstools
 Version: 3.6.6
-Release: 0.1.beta%{?dist}
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,8 @@
 
 
 %changelog
+* Tue Oct 10 2006 Sergio Pascual  3.6.6-1
+- New upstream source 3.6.6
 * Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
 - New upstream source 3.6.6beta
 * Mon Sep 4 2006 Sergio Pascual  3.6.5-3



From fedora-extras-commits at redhat.com  Wed Nov 15 18:39:50 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:39:50 -0700
Subject: rpms/beryl-settings - New directory
Message-ID: <200611151839.kAFIdokr007773@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7769/beryl-settings

Log Message:
Directory /cvs/extras/rpms/beryl-settings added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 18:39:56 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:39:56 -0700
Subject: rpms/beryl-settings/devel - New directory
Message-ID: <200611151839.kAFIduKK007787@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7769/beryl-settings/devel

Log Message:
Directory /cvs/extras/rpms/beryl-settings/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 18:40:07 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:40:07 -0700
Subject: rpms/beryl-settings Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611151840.kAFIe7P2007818@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7812

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-settings


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-settings
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  Wed Nov 15 18:40:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:40:13 -0700
Subject: rpms/beryl-settings/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611151840.kAFIeD17007836@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7812/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-settings


--- 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 Nov 15 18:41:02 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:41:02 -0700
Subject: rpms/beryl-settings import.log,1.1,1.2
Message-ID: <200611151841.kAFIf2kC007913@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7879

Modified Files:
	import.log 
Log Message:
auto-import beryl-settings-0.1.2-2.fc7 on branch devel from beryl-settings-0.1.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 18:40:07 -0000	1.1
+++ import.log	15 Nov 2006 18:40:31 -0000	1.2
@@ -0,0 +1 @@
+beryl-settings-0_1_2-2_fc7:HEAD:beryl-settings-0.1.2-2.fc7.src.rpm:1163616028



From fedora-extras-commits at redhat.com  Wed Nov 15 18:41:02 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 11:41:02 -0700
Subject: rpms/beryl-settings/devel beryl-settings.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611151841.kAFIf2it007917@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7879/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-settings.spec 
Log Message:
auto-import beryl-settings-0.1.2-2.fc7 on branch devel from beryl-settings-0.1.2-2.fc7.src.rpm


--- NEW FILE beryl-settings.spec ---
Name:           beryl-settings
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        2%{?dist}

Summary:        Beryl OpenGL window and compositing manager GUI config utility
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}
BuildRequires:  libtool, gtk2-devel >= 2.8.0, gettext-devel
BuildRequires:  libXcomposite-devel, libXdamage-devel
BuildRequires:  gnome-desktop-devel, desktop-file-utils
BuildRequires:  intltool, perl-XML-Parser
BuildRequires:  dbus-glib, dbus-devel, librsvg2-devel


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

This package contains a graphical configuration tool
to configure Beryl's plugins and the composite window
manager.


%prep
%setup -q
#autoreconf -v --install
#glib-gettextize --copy --force
#intltoolize --automake --copy --force
perl -pi -e 's/png/svg/g' misc/beryl-settings.desktop

%build
%configure --enable-librsvg
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
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 \
  $RPM_BUILD_ROOT%{_datadir}/applications/beryl-settings.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/beryl-settings
%{_datadir}/beryl/hints
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.svg
%{_mandir}/man1/beryl-settings.1.gz


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson  0.1.1-3
- Fix desktop file to point to proper icon file

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Add missing BR: libtool, gtk2-devel >= 2.8.0, gettext-devel,
  libXcomposite-devel, libXdamage-devel

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Thu Oct 05 2006 Jarod Wilson  0.1.0-3
- Really fix duplicate menu entries this time

* Thu Oct 05 2006 Jarod Wilson  0.1.0-2
- Fix duplicate menu entries
- Add proper post/postun

* Tue Oct 03 2006 - Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 18:40:13 -0000	1.1
+++ .cvsignore	15 Nov 2006 18:40:32 -0000	1.2
@@ -0,0 +1 @@
+beryl-settings-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-settings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 18:40:13 -0000	1.1
+++ sources	15 Nov 2006 18:40:32 -0000	1.2
@@ -0,0 +1 @@
+882aac1837f92dc20b92927900a917f3  beryl-settings-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 19:08:15 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 15 Nov 2006 12:08:15 -0700
Subject: fedora-security/audit fc5,1.393,1.394 fc6,1.145,1.146
Message-ID: <200611151908.kAFJ8FXE011222@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11197

Modified Files:
	fc5 fc6 
Log Message:
Note a new elinks issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- fc5	15 Nov 2006 11:24:07 -0000	1.393
+++ fc5	15 Nov 2006 19:08:05 -0000	1.394
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5924 VULNERABLE (elinks) [#215734]
 CVE-2006-5823 backport (kernel) [since FEDORA-2006-1221]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- fc6	15 Nov 2006 11:24:07 -0000	1.145
+++ fc6	15 Nov 2006 19:08:05 -0000	1.146
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-5924 ignore (elinks) no smbclient support
 CVE-2006-5823 backport (kernel) [since FEDORA-2006-1223]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed



From fedora-extras-commits at redhat.com  Wed Nov 15 19:12:43 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:12:43 -0700
Subject: rpms/beryl-plugins - New directory
Message-ID: <200611151912.kAFJCh6W011492@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487/beryl-plugins

Log Message:
Directory /cvs/extras/rpms/beryl-plugins added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 19:12:48 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:12:48 -0700
Subject: rpms/beryl-plugins/devel - New directory
Message-ID: <200611151912.kAFJCmZ1011505@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487/beryl-plugins/devel

Log Message:
Directory /cvs/extras/rpms/beryl-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 19:13:00 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:13:00 -0700
Subject: rpms/beryl-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611151913.kAFJD0NI011547@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-plugins
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  Wed Nov 15 19:13:06 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:13:06 -0700
Subject: rpms/beryl-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611151913.kAFJD6ew011565@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-plugins


--- 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 Nov 15 19:13:58 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:13:58 -0700
Subject: rpms/beryl-plugins import.log,1.1,1.2
Message-ID: <200611151913.kAFJDwsa011647@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613

Modified Files:
	import.log 
Log Message:
auto-import beryl-plugins-0.1.2-2.fc7 on branch devel from beryl-plugins-0.1.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 19:13:00 -0000	1.1
+++ import.log	15 Nov 2006 19:13:27 -0000	1.2
@@ -0,0 +1 @@
+beryl-plugins-0_1_2-2_fc7:HEAD:beryl-plugins-0.1.2-2.fc7.src.rpm:1163618004



From fedora-extras-commits at redhat.com  Wed Nov 15 19:13:58 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:13:58 -0700
Subject: rpms/beryl-plugins/devel beryl-plugins.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611151913.kAFJDwnv011651@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-plugins.spec 
Log Message:
auto-import beryl-plugins-0.1.2-2.fc7 on branch devel from beryl-plugins-0.1.2-2.fc7.src.rpm


--- NEW FILE beryl-plugins.spec ---
Name:           beryl-plugins
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        2%{?dist}

Summary:        Beryl OpenGL window and compositing manager plug-ins
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}, fedora-logos

BuildRequires:  beryl-core-devel >= %{version}, gnome-desktop-devel
BuildRequires:  libtool, gettext-devel
BuildRequires:  freeglut-devel, intltool, libdrm-devel
BuildRequires:  libwnck-devel, desktop-file-utils
BuildRequires:  librsvg2-devel, libX11-devel
BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
BuildRequires:  libXcomposite-devel, libXdamage-devel, libXext-devel
BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Beryl has a flexible plug-in system, which the
contents of this package take advantage of.


%prep
%setup -q
#autoreconf -v --install
perl -pi -e 's,beryl/cubecaps.png,rhgb/main-logo.png,g' \
    src/cube.settings

%build
%configure --enable-librsvg --disable-libsvg-cairo
# Parallel builds currently broken
#make %{?_smp_mflags}
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%dir %{_libdir}/beryl
%{_libdir}/beryl/*.so
%{_datadir}/beryl/*.png


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Switch to upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson  0.1.1-3
- Fedora-branded cube caps (Chitlesh Goorah)

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Add missing BR: libtool, gettext-devel

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 19:13:06 -0000	1.1
+++ .cvsignore	15 Nov 2006 19:13:28 -0000	1.2
@@ -0,0 +1 @@
+beryl-plugins-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 19:13:06 -0000	1.1
+++ sources	15 Nov 2006 19:13:28 -0000	1.2
@@ -0,0 +1 @@
+6721bf8bd5fcbe0cabb0a67caa920fcb  beryl-plugins-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 19:15:17 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 12:15:17 -0700
Subject: rpms/libeXosip2/devel .cvsignore, 1.5, 1.6 libeXosip2.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200611151915.kAFJFHXc011723@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11693

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2006 05:18:01 -0000	1.5
+++ .cvsignore	15 Nov 2006 19:14:47 -0000	1.6
@@ -1 +1 @@
-libeXosip2-2.2.3.tar.gz
+libeXosip2-3.0.1.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/libeXosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libeXosip2.spec	29 Aug 2006 00:57:54 -0000	1.9
+++ libeXosip2.spec	15 Nov 2006 19:14:47 -0000	1.10
@@ -1,12 +1,11 @@
-
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 2.2.3
-Release: 3%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/exosip/libeXosip2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 05:18:01 -0000	1.5
+++ sources	15 Nov 2006 19:14:47 -0000	1.6
@@ -1 +1 @@
-837a35f085890eac3328ac402b24383b  libeXosip2-2.2.3.tar.gz
+bd52d81c83306c5ba260939537d69577  libeXosip2-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 15 19:16:37 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 12:16:37 -0700
Subject: owners owners.list,1.1963,1.1964
Message-ID: <200611151916.kAFJGb5h011792@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11738

Modified Files:
	owners.list 
Log Message:
Add beryl-plugins and beryl-settings


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1963
retrieving revision 1.1964
diff -u -r1.1963 -r1.1964
--- owners.list	15 Nov 2006 12:08:35 -0000	1.1963
+++ owners.list	15 Nov 2006 19:16:07 -0000	1.1964
@@ -109,6 +109,8 @@
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-core|Beryl OpenGL window and compositing manager|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-plugins|Beryl OpenGL window and compositing manager plugins|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-settings|Beryl OpenGL window and compositing manager settings utility|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 19:18:07 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Wed, 15 Nov 2006 12:18:07 -0700
Subject: rpms/wcstools/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wcstools.spec, 1.4, 1.5
Message-ID: <200611151918.kAFJI76g011845@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11798

Modified Files:
	.cvsignore sources wcstools.spec 
Log Message:
* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Mon Sep 4 2006 Sergio Pascual  3.6.5-3
- Rebuild.
* Wed Aug 30 2006 Sergio Pascual  3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual  3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual  3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual  3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual  3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual  3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 11:28:24 -0000	1.3
+++ .cvsignore	15 Nov 2006 19:17:37 -0000	1.4
@@ -1 +1 @@
-wcstools-3.6.6beta.tar.gz
+wcstools-3.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Oct 2006 11:28:24 -0000	1.3
+++ sources	15 Nov 2006 19:17:37 -0000	1.4
@@ -1 +1 @@
-cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz
+c41af2de22949f40957276978f48e0d7  wcstools-3.6.6.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/devel/wcstools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wcstools.spec	10 Oct 2006 11:28:24 -0000	1.4
+++ wcstools.spec	15 Nov 2006 19:17:37 -0000	1.5
@@ -1,12 +1,12 @@
 Name: wcstools
 Version: 3.6.6
-Release: 0.1.beta%{?dist}
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,8 @@
 
 
 %changelog
+* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
+- New upstream source 3.6.6
 * Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
 - New upstream source 3.6.6beta
 * Mon Sep 4 2006 Sergio Pascual  3.6.5-3



From fedora-extras-commits at redhat.com  Wed Nov 15 19:18:23 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 12:18:23 -0700
Subject: rpms/libeXosip2/FC-6 .cvsignore, 1.5, 1.6 libeXosip2.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200611151918.kAFJINii011862@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11825

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2006 05:18:01 -0000	1.5
+++ .cvsignore	15 Nov 2006 19:17:53 -0000	1.6
@@ -1 +1 @@
-libeXosip2-2.2.3.tar.gz
+libeXosip2-3.0.1.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-6/libeXosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libeXosip2.spec	29 Aug 2006 00:57:54 -0000	1.9
+++ libeXosip2.spec	15 Nov 2006 19:17:53 -0000	1.10
@@ -1,12 +1,11 @@
-
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 2.2.3
-Release: 3%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/exosip/libeXosip2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 05:18:01 -0000	1.5
+++ sources	15 Nov 2006 19:17:53 -0000	1.6
@@ -1 +1 @@
-837a35f085890eac3328ac402b24383b  libeXosip2-2.2.3.tar.gz
+bd52d81c83306c5ba260939537d69577  libeXosip2-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 15 19:20:19 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Wed, 15 Nov 2006 12:20:19 -0700
Subject: rpms/wcstools/FC-6 wcstools.spec,1.5,1.6
Message-ID: <200611151920.kAFJKJRk011982@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11962

Modified Files:
	wcstools.spec 
Log Message:
Fixed date of last modification in changelog



Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-6/wcstools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wcstools.spec	15 Nov 2006 18:11:59 -0000	1.5
+++ wcstools.spec	15 Nov 2006 19:19:48 -0000	1.6
@@ -82,7 +82,7 @@
 
 
 %changelog
-* Tue Oct 10 2006 Sergio Pascual  3.6.6-1
+* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
 - New upstream source 3.6.6
 * Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
 - New upstream source 3.6.6beta



From fedora-extras-commits at redhat.com  Wed Nov 15 19:26:13 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 15 Nov 2006 12:26:13 -0700
Subject: rpms/libeXosip2/FC-5 .cvsignore, 1.5, 1.6 libeXosip2.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200611151926.kAFJQDVN012072@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12052

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 May 2006 05:13:03 -0000	1.5
+++ .cvsignore	15 Nov 2006 19:25:43 -0000	1.6
@@ -1 +1 @@
-libeXosip2-2.2.3.tar.gz
+libeXosip2-3.0.1.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-5/libeXosip2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libeXosip2.spec	6 Jun 2006 03:33:01 -0000	1.8
+++ libeXosip2.spec	15 Nov 2006 19:25:43 -0000	1.9
@@ -1,12 +1,11 @@
-
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 2.2.3
-Release: 2%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
+Source0: http://download.savannah.nongnu.org/releases/exosip/libeXosip2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel
@@ -70,7 +69,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
-* Mon Jun  5 2006 Jeffrey C. Ollie  - 2.2.3
+* Mon Aug 28 2006 Jeffrey C. Ollie  - 2.2.3-3
+- Bump release and rebuild.
+
+* Mon Jun  5 2006 Jeffrey C. Ollie  - 2.2.3-2
 - Add BR for doxygen.
 
 * Mon May 29 2006 Jeffrey C. Ollie  - 2.2.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 05:13:03 -0000	1.5
+++ sources	15 Nov 2006 19:25:43 -0000	1.6
@@ -1 +1 @@
-837a35f085890eac3328ac402b24383b  libeXosip2-2.2.3.tar.gz
+bd52d81c83306c5ba260939537d69577  libeXosip2-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 15 19:51:41 2006
From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr))
Date: Wed, 15 Nov 2006 12:51:41 -0700
Subject: rpms/wcstools/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wcstools.spec, 1.3, 1.4
Message-ID: <200611151951.kAFJpf7k012218@cvs-int.fedora.redhat.com>

Author: sergiopr

Update of /cvs/extras/rpms/wcstools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12198

Modified Files:
	.cvsignore sources wcstools.spec 
Log Message:
* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
- New upstream source 3.6.6
* Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
- New upstream source 3.6.6beta
* Wed Aug 30 2006 Sergio Pascual  3.6.5-2
- Corrected bug in edhead (patch2) (bug #204642).
* Fri Jun 21 2006 Sergio Pascual  3.6.5-1
- New upstream source 3.6.5
* Tue Jun 13 2006 Sergio Pascual  3.6.4-3
- Patched overflows in catutil.c and getdate.c
- Patched incompatible pointer in binread.c
* Mon Jun 12 2006 Sergio Pascual  3.6.4-2
- Patched edhead.
- libwcs provides libwcs.so.3
- libwcs into System Environment/Libraries group
- Makefile uses ${RPM_OPT_FLAGS} and $(CC)
* Fri Jun 09 2006 Sergio Pascual  3.6.4-1
- Removed not needed ldconfig in wcstools and libwcs-devel.
* Wed Mar 08 2006 Sergio Pascual  3.6.3-1
- Initial RPM file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 16:21:29 -0000	1.3
+++ .cvsignore	15 Nov 2006 19:51:11 -0000	1.4
@@ -1 +1 @@
-wcstools-3.6.6beta.tar.gz
+wcstools-3.6.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Oct 2006 16:21:29 -0000	1.3
+++ sources	15 Nov 2006 19:51:11 -0000	1.4
@@ -1 +1 @@
-cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz
+c41af2de22949f40957276978f48e0d7  wcstools-3.6.6.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/extras/rpms/wcstools/FC-5/wcstools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wcstools.spec	10 Oct 2006 16:21:29 -0000	1.3
+++ wcstools.spec	15 Nov 2006 19:51:11 -0000	1.4
@@ -1,12 +1,12 @@
 Name: wcstools
 Version: 3.6.6
-Release: 0.1.beta%{?dist}
+Release: 1%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPL
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +82,8 @@
 
 
 %changelog
+* Wed Nov 15 2006 Sergio Pascual  3.6.6-1
+- New upstream source 3.6.6
 * Tue Oct 10 2006 Sergio Pascual  3.6.6-0.1.beta
 - New upstream source 3.6.6beta
 * Wed Aug 30 2006 Sergio Pascual  3.6.5-2



From fedora-extras-commits at redhat.com  Wed Nov 15 21:10:30 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:10:30 -0700
Subject: rpms/beryl-manager - New directory
Message-ID: <200611152110.kAFLAUEd018669@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18665/beryl-manager

Log Message:
Directory /cvs/extras/rpms/beryl-manager added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:10:35 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:10:35 -0700
Subject: rpms/beryl-manager/devel - New directory
Message-ID: <200611152110.kAFLAZqd018685@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18665/beryl-manager/devel

Log Message:
Directory /cvs/extras/rpms/beryl-manager/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:10:49 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:10:49 -0700
Subject: rpms/beryl-manager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611152110.kAFLAnga018718@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18712

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-manager


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-manager
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  Wed Nov 15 21:10:55 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:10:55 -0700
Subject: rpms/beryl-manager/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611152110.kAFLAt27018736@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18712/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-manager


--- 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 Nov 15 21:11:45 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:11:45 -0700
Subject: rpms/beryl-manager import.log,1.1,1.2
Message-ID: <200611152111.kAFLBjcr018816@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18781

Modified Files:
	import.log 
Log Message:
auto-import beryl-manager-0.1.2-2.fc7 on branch devel from beryl-manager-0.1.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 21:10:49 -0000	1.1
+++ import.log	15 Nov 2006 21:11:15 -0000	1.2
@@ -0,0 +1 @@
+beryl-manager-0_1_2-2_fc7:HEAD:beryl-manager-0.1.2-2.fc7.src.rpm:1163625072



From fedora-extras-commits at redhat.com  Wed Nov 15 21:11:46 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:11:46 -0700
Subject: rpms/beryl-manager/devel beryl-manager-0.1.1-pidof.patch, NONE,
	1.1 beryl-manager.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611152111.kAFLBkcu018820@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18781/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-manager-0.1.1-pidof.patch beryl-manager.spec 
Log Message:
auto-import beryl-manager-0.1.2-2.fc7 on branch devel from beryl-manager-0.1.2-2.fc7.src.rpm

beryl-manager-0.1.1-pidof.patch:

--- NEW FILE beryl-manager-0.1.1-pidof.patch ---
--- beryl-manager-0.1.1/src/main.c.orig	2006-10-26 11:00:37.000000000 -0400
+++ beryl-manager-0.1.1/src/main.c	2006-10-26 11:00:56.000000000 -0400
@@ -274,7 +274,7 @@
 }
 gboolean is_running(const gchar * command)
 {
-    gchar* cmd = g_strconcat("pidof ", command,NULL);
+    gchar* cmd = g_strconcat("/sbin/pidof ", command,NULL);
     gchar* pret;
     gint i;
 
@@ -442,7 +442,7 @@
                 if (WMs[i].Kill)
                 {
                     gchar * pret;
-                    gchar * cm = g_strconcat("pidof ",WMs[i].Grep,NULL);
+                    gchar * cm = g_strconcat("/sbin/pidof ",WMs[i].Grep,NULL);
 
                     if (!g_spawn_command_line_sync(cm,&pret,NULL,NULL,NULL))
                         g_warning(_("No pidof, this may not work right."));


--- NEW FILE beryl-manager.spec ---
Name:           beryl-manager
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
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
Patch0:         beryl-manager-0.1.1-pidof.patch

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
BuildRequires:  libtool, gettext-devel
BuildRequires:  dbus-glib, dbus-devel, intltool, perl-XML-Parser


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Beryl-manager is a tray application to keep beryl
up and running, switch window managers, decorators,
launch beryl-settings and the beryl theme tool.


%prep
%setup -q
# Use absolute path to pidof, not in most users' $PATH
%patch0 -p1 -b .pidof
#autoreconf -v --install
#glib-gettextize --copy --force
#intltoolize --automake --copy --force


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/beryl-manager
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/beryl-manager.1.gz


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Add missing BR: libtool, gettext-devel

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Thu Oct 05 2006 Jarod Wilson  0.1.0-2
- Fix for pidof not in users' $PATH

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 21:10:55 -0000	1.1
+++ .cvsignore	15 Nov 2006 21:11:15 -0000	1.2
@@ -0,0 +1 @@
+beryl-manager-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 21:10:55 -0000	1.1
+++ sources	15 Nov 2006 21:11:15 -0000	1.2
@@ -0,0 +1 @@
+50c0235d59369674827ceaec7d36e53b  beryl-manager-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 21:15:48 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:15:48 -0700
Subject: owners owners.list,1.1964,1.1965
Message-ID: <200611152115.kAFLFmqB018880@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18860

Modified Files:
	owners.list 
Log Message:
Add beryl-manager


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1964
retrieving revision 1.1965
diff -u -r1.1964 -r1.1965
--- owners.list	15 Nov 2006 19:16:07 -0000	1.1964
+++ owners.list	15 Nov 2006 21:15:17 -0000	1.1965
@@ -109,6 +109,7 @@
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-core|Beryl OpenGL window and compositing manager|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-manager|Beryl OpenGL window and compositing manager control application|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-plugins|Beryl OpenGL window and compositing manager plugins|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-settings|Beryl OpenGL window and compositing manager settings utility|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 21:34:55 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:34:55 -0700
Subject: rpms/dar - New directory
Message-ID: <200611152134.kAFLYtPu019084@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19080/dar

Log Message:
Directory /cvs/extras/rpms/dar added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:35:01 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:35:01 -0700
Subject: rpms/dar/devel - New directory
Message-ID: <200611152135.kAFLZ1GH019098@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19080/dar/devel

Log Message:
Directory /cvs/extras/rpms/dar/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:35:16 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:35:16 -0700
Subject: rpms/dar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611152135.kAFLZG06019129@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123

Added Files:
	Makefile import.log 
Log Message:
Setup of module dar


--- NEW FILE Makefile ---
# Top level Makefile for module dar
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  Wed Nov 15 21:35:22 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:35:22 -0700
Subject: rpms/dar/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611152135.kAFLZMcW019146@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dar


--- 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 Nov 15 21:36:59 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:36:59 -0700
Subject: rpms/dar import.log,1.1,1.2
Message-ID: <200611152136.kAFLaxfL019234@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19197

Modified Files:
	import.log 
Log Message:
auto-import dar-2.3.1-3 on branch devel from dar-2.3.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 21:35:16 -0000	1.1
+++ import.log	15 Nov 2006 21:36:29 -0000	1.2
@@ -0,0 +1 @@
+dar-2_3_1-3:HEAD:dar-2.3.1-3.src.rpm:1163626582



From fedora-extras-commits at redhat.com  Wed Nov 15 21:37:00 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:37:00 -0700
Subject: rpms/dar/devel README.Fedora, NONE, 1.1 dar.spec, NONE,
	1.1 man.dar.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611152137.kAFLb0IT019238@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19197/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.Fedora dar.spec man.dar.patch 
Log Message:
auto-import dar-2.3.1-3 on branch devel from dar-2.3.1-3.src.rpm


--- NEW FILE README.Fedora ---
Due to fedora policy and the apparent inability of the current version of
glibc to compile a true static binary, the dar-static package/binaries have
not been built or included with this package.  If you would like to build
static binaries, you can download the source RPM file from the Fedora Extras
repository and recompile it with "--with static" to enable the static binary
and library files.

-Chris Petersen, Fedora package maintainer, 2006-11-14


--- NEW FILE dar.spec ---
#
# Specfile for DAR, the disk archiver
#
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=210790
#

# Static build is disabled by default by fedora policy, but also because the
# latest versions of glibc don't seem to compile proper static binaries.  Use
# "--with static" to enable the static subpackage
%define with_static %{?_with_static: 1} %{?!_with_static: 0}

#
# Basic descriptive tags for this package:
#
Name:           dar
Version:        2.3.1
Release:        3%{?dist}
Summary:        Collection of scripts for making/restoring CD/DVD backups

URL:            http://dar.linux.free.fr/
License:        GPL
Group:          Applications/Archiving

################################################################################

Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:        README.Fedora

Patch:          man.dar.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

################################################################################

BuildRequires:  bzip2-devel
BuildRequires:  openssl-devel

Requires:       par2cmdline

################################################################################

%description
DAR is a command line tool to backup a directory tree and files. DAR is
able to make differential backups, split them over a set of disks or files
of a given size, use compression, filter files or subtrees to be saved or
not saved, directly access and restore given files. DAR is also able
to handle extented attributes, and can make remote backups through an
ssh session for example. Finally, DAR handles save and restore of hard
and symbolic links.

################################################################################

%package -n libdar
Group:      System Environment/Libraries
Summary:    Library providing support for the DAR API

%description -n libdar
Common library code for DAR.

################################################################################

%package -n libdar-devel
Group:      Development/Libraries
Summary:    Development files for libdar
Requires:   libdar = %{version}-%{release}

%description -n libdar-devel
This package contains the header files and libraries for developing
programs that use the DAR API (libdar).

################################################################################
# The following two subpackages are only built when enabled via "--with static"
################################################################################

%if %{with_static}

%package -n dar-static
Group:      Applications/System
Summary:    Statically linked version of dar

%description -n dar-static
Statically linked version of dar that can be installed onto backup disks for
easier file retrieval.

%package -n libdar-static-devel
Group:      Development/Libraries
Summary:    Statically linked dar library files

%description -nlibdar-static-devel
Statically linked version of dar libraries that can be installed onto backup
disks for easier file retrieval.

%endif

################################################################################

%prep
%setup -q

%patch -p0 -b .man

################################################################################

%build

# Options
%if %{with_static}
    STATIC=""
%else
    STATIC="--disable-dar-static --disable-static"
%endif

%configure --disable-build-html $STATIC

make %{?_smp_mflags}

################################################################################

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

# Remove the libtool archive files
rm -f  $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig

# Delete the sample files that we can't seem to disable
rm -rf $RPM_BUILD_ROOT/%{_datadir}/dar/

# Remove the doc makefiles so they don't get installed along with the other files.
rm -f doc/Makefile*
rm -f doc/*/Makefile*

# Rename the documentation directory so it makes more sense after installation.
mv doc html

# Sample scripts should not be executable
chmod 0644 html/samples/*

# Install the fedora readme
cp -a %{SOURCE1} .

################################################################################

%clean
rm -rf $RPM_BUILD_ROOT

################################################################################

%post   -n libdar -p /sbin/ldconfig
%postun -n libdar -p /sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc html/ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO README.Fedora

%{_bindir}/dar
%{_bindir}/dar_cp
%{_bindir}/dar_manager
%{_bindir}/dar_slave
%{_bindir}/dar_xform
%{_mandir}/man1/*

################################################################################

%files -n libdar
%defattr(-,root,root,-)
%{_libdir}/*.so.*

################################################################################

%files -n libdar-devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so

################################################################################

%if %{with_static}

%files -n dar-static
%defattr(-,root,root,-)
%{_bindir}/dar_static

################################################################################

%files -n libdar-static-devel
%defattr(-,root,root,-)
%{_libdir}/*.a

################################################################################
%endif

%changelog

* Tue Nov 14 2006 Chris Petersen                   2.3.1-3
- Fix/standardize Requires/Provides for libdar and libdar-devel
- Remove redundant zlib-devel (covered by openssl-devel)
- Update README.Fedora with my name/date, as requested in the ticket
- Add a patch to fix a funky character in man/dar.1

* Fri Nov 04 2006 Chris Petersen                   2.3.1-2
- Add README.Fedora explaining why we do not include static binaries (upstream's request)
- Add libdar-static-devel subpackage to hold the *.a files
- Disable static subpackages by default, enabled via "--with static" for those who want to compile them

* Thu May 11 2006 Chris Petersen                   2.3.1-1
- Initial package, compiled from half a dozen third party packages


man.dar.patch:

--- NEW FILE man.dar.patch ---
--- man/dar.1.orig	2006-11-14 20:03:39.000000000 -0800
+++ man/dar.1	2006-11-14 20:04:08.000000000 -0800
@@ -338,7 +338,7 @@
  - a , if -af option has been placed before -A on the command-line (or in a included file, see -B option). For more about that feature see -af option below.
 .TP 20
 -@, --aux-ref []/
-specifies an auxiliary archive of reference. This option is only available with -+ option (merging). Over -A option which is mandatory with -+ option, you may give a second archive of reference thanks to the -% option. This allows one to merge two archive in a single one. See also -$, -? and -% for other options concerning auxiliary archive of reference.
+specifies an auxiliary archive of reference. This option is only available with -+ option (merging). Over -A option which is mandatory with -+ option, you may give a second archive of reference thanks to the -% option. This allows one to merge two archive in a single one. See also -$, -~ and -% for other options concerning auxiliary archive of reference.
 .TP 20
 -$, --aux-key [[]:]
 same as -J but for the auxiliary archive of reference (-@ option).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 21:35:21 -0000	1.1
+++ .cvsignore	15 Nov 2006 21:36:29 -0000	1.2
@@ -0,0 +1 @@
+dar-2.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 21:35:21 -0000	1.1
+++ sources	15 Nov 2006 21:36:29 -0000	1.2
@@ -0,0 +1 @@
+cdeb693c9c4a0adcdb39da67e0067d38  dar-2.3.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 15 21:43:53 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:43:53 -0700
Subject: rpms/dar/devel dar.spec,1.1,1.2
Message-ID: <200611152143.kAFLhrhF019309@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/rpms/dar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19293

Modified Files:
	dar.spec 
Log Message:
Change the summary to something more appropriate to what dar actually is


Index: dar.spec
===================================================================
RCS file: /cvs/extras/rpms/dar/devel/dar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dar.spec	15 Nov 2006 21:36:29 -0000	1.1
+++ dar.spec	15 Nov 2006 21:43:23 -0000	1.2
@@ -14,8 +14,8 @@
 #
 Name:           dar
 Version:        2.3.1
-Release:        3%{?dist}
-Summary:        Collection of scripts for making/restoring CD/DVD backups
+Release:        4%{?dist}
+Summary:        Software for making/restoring incremental CD/DVD backups
 
 URL:            http://dar.linux.free.fr/
 License:        GPL
@@ -195,6 +195,9 @@
 
 %changelog
 
+* Wed Nov 15 2006 Chris Petersen                   2.3.1-4
+- Change the main summary -- this is no longer a "collection of scripts"
+
 * Tue Nov 14 2006 Chris Petersen                   2.3.1-3
 - Fix/standardize Requires/Provides for libdar and libdar-devel
 - Remove redundant zlib-devel (covered by openssl-devel)



From fedora-extras-commits at redhat.com  Wed Nov 15 21:45:52 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 14:45:52 -0700
Subject: owners owners.list,1.1965,1.1966
Message-ID: <200611152145.kAFLjqwM019333@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19317

Modified Files:
	owners.list 
Log Message:
Add new package:  dar -- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=210790


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1965
retrieving revision 1.1966
diff -u -r1.1965 -r1.1966
--- owners.list	15 Nov 2006 21:15:17 -0000	1.1965
+++ owners.list	15 Nov 2006 21:45:22 -0000	1.1966
@@ -278,6 +278,7 @@
 Fedora Extras|dap-hdf4_handler|HDF4 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|dap-netcdf_handler|NetCDF 3 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|dap-server|Basic request handling for DAP servers|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|dar|Software for making/restoring incremental CD/DVD backups|rpm at forevermore.net|extras-qa at fedoraproject.org|
 Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dates|Small, lightweight calendar|jkeating at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|db4o|db4o is an object orientated database system for .NET|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 21:58:55 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:58:55 -0700
Subject: rpms/emerald - New directory
Message-ID: <200611152158.kAFLwtGp019451@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19447/emerald

Log Message:
Directory /cvs/extras/rpms/emerald added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:59:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:59:01 -0700
Subject: rpms/emerald/devel - New directory
Message-ID: <200611152159.kAFLx1QT019465@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19447/emerald/devel

Log Message:
Directory /cvs/extras/rpms/emerald/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 15 21:59:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:59:13 -0700
Subject: rpms/emerald Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611152159.kAFLxDW7019496@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19490

Added Files:
	Makefile import.log 
Log Message:
Setup of module emerald


--- NEW FILE Makefile ---
# Top level Makefile for module emerald
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  Wed Nov 15 21:59:19 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 14:59:19 -0700
Subject: rpms/emerald/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611152159.kAFLxJ5t019510@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19490/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emerald


--- 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 Nov 15 22:00:07 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 15:00:07 -0700
Subject: rpms/emerald import.log,1.1,1.2
Message-ID: <200611152200.kAFM07MC019594@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554

Modified Files:
	import.log 
Log Message:
auto-import emerald-0.1.2-3.fc7 on branch devel from emerald-0.1.2-3.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/emerald/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Nov 2006 21:59:13 -0000	1.1
+++ import.log	15 Nov 2006 21:59:37 -0000	1.2
@@ -0,0 +1 @@
+emerald-0_1_2-3_fc7:HEAD:emerald-0.1.2-3.fc7.src.rpm:1163627974



From fedora-extras-commits at redhat.com  Wed Nov 15 22:00:08 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 15:00:08 -0700
Subject: rpms/emerald/devel emerald.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611152200.kAFM08IA019598@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19554/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emerald.spec 
Log Message:
auto-import emerald-0.1.2-3.fc7 on branch devel from emerald-0.1.2-3.fc7.src.rpm


--- NEW FILE emerald.spec ---
Name:           emerald
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        3%{?dist}

Summary:        Themeable window decorator and compositing manager for Beryl
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}
BuildRequires:  libtool, gettext-devel, libwnck-devel
BuildRequires:  libXcomposite-devel, libXdamage-devel
BuildRequires:  gtk2-devel, intltool, desktop-file-utils
BuildRequires:  dbus-glib, dbus-devel, librsvg2-devel
BuildRequires:  startup-notification-devel, perl-XML-Parser


%description
Emerald is themeable window decorator and compositing 
manager for Beryl. Launch Theme Manager from
beryl-manager to change themes.


%package devel
Summary: Development files for emerald
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig

%description devel
The emerald-devel package provides development files
for emerald, the themeable window decorator for beryl.


%prep
%setup -q
# Should only have one Exec line in a desktop file...
perl -pi -e 's|Exec=emerald-theme-manager -i||g' misc/emerald-theme-manager.desktop
# Death to rpaths...
perl -pi -e 's|hardcode_into_libs=.*|hardcode_into_libs=no|g' configure
perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' configure
perl -pi -e 's|runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' configure


%build
%configure --enable-librsvg --disable-mime-update
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
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 \
  $RPM_BUILD_ROOT%{_datadir}/applications/emerald-theme-manager.desktop
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
update-mime-database %{_datadir}/mime &>/dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :

%postun
/sbin/ldconfig
update-mime-database %{_datadir}/mime &>/dev/null || :
update-desktop-database %{_datadir}/applications &> /dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/*
%{_datadir}/pixmaps/*
%dir %{_libdir}/emerald
%{_libdir}/emerald/*
%{_libdir}/libemeraldengine.so.*
%dir %{_datadir}/emerald
%dir %{_datadir}/emerald/theme
%{_datadir}/emerald/theme/*
%{_datadir}/emerald/settings.ini
%{_datadir}/applications/*
%{_datadir}/mime-info/*
%{_datadir}/mime/packages/*
%{_datadir}/icons/hicolor/48x48/mimetypes/*
%{_mandir}/man1/*.1*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libemeraldengine.so

%changelog
* Wed Nov 15 2006 Jarod Wilson  0.1.2-3
- Kill rpaths

* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Add missing BR: libtool, gettext-devel, libwnck-devel,
  libXdamage, libXcomposite

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Thu Oct 05 2006 Jarod Wilson  0.1.0-3
- Really fix the duplicate menu entries this time

* Thu Oct 05 2006 Jarod Wilson  0.1.0-2
- Fix duplicate menu entries

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emerald/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 21:59:19 -0000	1.1
+++ .cvsignore	15 Nov 2006 21:59:38 -0000	1.2
@@ -0,0 +1 @@
+emerald-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emerald/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 21:59:19 -0000	1.1
+++ sources	15 Nov 2006 21:59:38 -0000	1.2
@@ -0,0 +1 @@
+c273fe82c7e3b2867f05073f3b012708  emerald-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 15 22:04:15 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 15:04:15 -0700
Subject: comps comps-fe7.xml.in,1.23,1.24
Message-ID: <200611152204.kAFM4FjO022644@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22628

Modified Files:
	comps-fe7.xml.in 
Log Message:
add dar to comps.fe7


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- comps-fe7.xml.in	14 Nov 2006 07:40:24 -0000	1.23
+++ comps-fe7.xml.in	15 Nov 2006 22:03:43 -0000	1.24
@@ -911,6 +911,7 @@
       connect-proxy
       convmv
       crack
+      dar
       denyhosts
       dkms
       ebtables



From fedora-extras-commits at redhat.com  Wed Nov 15 22:06:40 2006
From: fedora-extras-commits at redhat.com (Chris Petersen (xris))
Date: Wed, 15 Nov 2006 15:06:40 -0700
Subject: owners owners.list,1.1966,1.1967
Message-ID: <200611152206.kAFM6eFA022673@cvs-int.fedora.redhat.com>

Author: xris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22657

Modified Files:
	owners.list 
Log Message:
fix my email address for dar


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1966
retrieving revision 1.1967
diff -u -r1.1966 -r1.1967
--- owners.list	15 Nov 2006 21:45:22 -0000	1.1966
+++ owners.list	15 Nov 2006 22:06:05 -0000	1.1967
@@ -278,7 +278,7 @@
 Fedora Extras|dap-hdf4_handler|HDF4 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|dap-netcdf_handler|NetCDF 3 data handler for the OPeNDAP Data server|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|dap-server|Basic request handling for DAP servers|pertusus at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|dar|Software for making/restoring incremental CD/DVD backups|rpm at forevermore.net|extras-qa at fedoraproject.org|
+Fedora Extras|dar|Software for making/restoring incremental CD/DVD backups|lists at forevermore.net|extras-qa at fedoraproject.org|
 Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dates|Small, lightweight calendar|jkeating at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|db4o|db4o is an object orientated database system for .NET|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 22:18:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 15 Nov 2006 15:18:13 -0700
Subject: owners owners.list,1.1967,1.1968
Message-ID: <200611152218.kAFMID3w022810@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22790

Modified Files:
	owners.list 
Log Message:
Add emerald


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1967
retrieving revision 1.1968
diff -u -r1.1967 -r1.1968
--- owners.list	15 Nov 2006 22:06:05 -0000	1.1967
+++ owners.list	15 Nov 2006 22:17:42 -0000	1.1968
@@ -360,6 +360,7 @@
 Fedora Extras|emacs-vm|Emacs VM mailreader|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|embryo|A C like scripting language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
+Fedora Extras|emerald|Beryl OpenGL window and compositing manager window decorator|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 15 23:00:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 15 Nov 2006 16:00:04 -0700
Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.24,1.25
Message-ID: <200611152300.kAFN04dW022936@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Build/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22918

Modified Files:
	perl-Module-Build.spec 
Log Message:
Don't BR Pod::Readme.  (#215558)


Index: perl-Module-Build.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-Module-Build.spec	17 Sep 2006 22:42:38 -0000	1.24
+++ perl-Module-Build.spec	15 Nov 2006 22:59:34 -0000	1.25
@@ -3,7 +3,7 @@
 Name:           perl-Module-Build
 # When the module version is x.yz, set Version to x.yz00.
 Version:        0.2805
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl module for building and installing Perl modules
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -15,7 +15,8 @@
 BuildRequires:  perl(ExtUtils::CBuilder) >= 0.15
 BuildRequires:  perl(ExtUtils::ParseXS) >= 1.02
 BuildRequires:  perl(YAML)
-BuildRequires:  perl(Pod::Readme) >= 0.04
+# Avoid a circular build dependency (#215558).
+#BuildRequires:  perl(Pod::Readme) >= 0.04
 #BuildRequires:  perl(version) >= 0.661
 Requires:       perl(Archive::Tar) >= 1.08
 Requires:       perl(ExtUtils::CBuilder) >= 0.15
@@ -64,6 +65,9 @@
 %{_mandir}/man3/Module::Build*.3*
 
 %changelog
+* Wed Nov 15 2006 Steven Pritchard  0.2805-3
+- Don't BR Pod::Readme.  (#215558)
+
 * Sun Sep 17 2006 Steven Pritchard  0.2805-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Nov 15 23:44:12 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 15 Nov 2006 16:44:12 -0700
Subject: rpms/grads/devel grads.spec,1.18,1.19
Message-ID: <200611152344.kAFNiClP026215@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26198

Modified Files:
	grads.spec 
Log Message:
* Thu Nov 16 2006 Patrice Dumas  1.9b4-19
- don't ship wgrib but depend on it



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- grads.spec	1 Nov 2006 00:33:14 -0000	1.18
+++ grads.spec	15 Nov 2006 23:43:41 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -39,6 +39,9 @@
 BuildRequires:  libXmu-devel libX11-devel
 BuildRequires:  automake
 
+# in a separate package now
+Requires:       wgrib
+
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
 that is used for easy access, manipulation, and visualization of earth science
@@ -46,6 +49,7 @@
 (Scientific Data Sets). GrADS has been implemented worldwide on a variety of
 commonly used operating systems and is freely distributed over the Internet.
 
+
 %prep
 %setup -q
 %patch -p1
@@ -53,8 +57,8 @@
 %patch -P 2 -p1
 # change path to datas to %{_datadir}/%{name}
 sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gx.h
-# copy grib notice
-cp %{SOURCE2} .
+# no need to copy grib notice anymore, since it is in a separate package
+#cp %{SOURCE2} .
 cp %{SOURCE6} .
 # copy hdf include wrapper file
 cp %{SOURCE7} src
@@ -77,6 +81,7 @@
 make %{?_smp_mflags}
 cp -r doc html
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -90,6 +95,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc COPYRIGHT html README.xorg grads-copyright_summary
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
@@ -101,12 +107,15 @@
 %{_bindir}/gxps
 %{_bindir}/gxtran
 %{_bindir}/stnmap
-%{_bindir}/wgrib
+# wgrib is in a separate package
+%exclude %{_bindir}/wgrib
 %{_datadir}/grads/
 
-%doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas  1.9b4-19
+- don't ship wgrib but depend on it
+
 * Tue Oct 31 2006 Patrice Dumas  1.9b4-18
 - rebuild for new libcurl soname (indirect dependency through libnc-dap)
 



From fedora-extras-commits at redhat.com  Thu Nov 16 01:08:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 15 Nov 2006 18:08:46 -0700
Subject: rpms/uuid/FC-5 ossp-uuid.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 uuid.spec, 1.1, 1.2
Message-ID: <200611160108.kAG18k77032685@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/uuid/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32660

Modified Files:
	.cvsignore sources uuid.spec 
Added Files:
	ossp-uuid.patch 
Log Message:
Sync with devel/FC-6.

ossp-uuid.patch:

--- NEW FILE ossp-uuid.patch ---
diff -urN uuid-1.5.1.orig/Makefile.PL uuid-1.5.1/Makefile.PL
--- uuid-1.5.1.orig/Makefile.PL	2006-01-15 12:37:43.000000000 -0600
+++ uuid-1.5.1/Makefile.PL	2006-09-21 15:59:40.000000000 -0500
@@ -44,7 +44,7 @@
 all pure_all:
 	\@if [ ! -d build ]; then mkdir build; fi
 	\@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi
-	\@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi
+	\@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi
 	\@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi
 	\@cd perl && \$(MAKE) \$(MFLAGS) \$\@
 
diff -urN uuid-1.5.1.orig/Makefile.in uuid-1.5.1/Makefile.in
--- uuid-1.5.1.orig/Makefile.in	2006-07-31 07:20:03.000000000 -0500
+++ uuid-1.5.1/Makefile.in	2006-09-21 16:06:31.000000000 -0500
@@ -61,13 +61,13 @@
 PHP         = @PHP@
 PG_CONFIG   = @PG_CONFIG@
 
-LIB_NAME    = libuuid.la
+LIB_NAME    = libossp-uuid.la
 LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
 
-DCE_NAME    = libuuid_dce.la
+DCE_NAME    = libossp-uuid_dce.la
 DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
 
-CXX_NAME    = libuuid++.la
+CXX_NAME    = libossp-uuid++.la
 CXX_OBJS    = uuid++.lo $(LIB_OBJS)
 
 PRG_NAME    = uuid
@@ -78,10 +78,10 @@
 PERL_NAME   = $(S)/perl/blib/lib/OSSP/uuid.pm
 PERL_OBJS   = $(S)/perl/uuid.pm
 
-PHP_NAME    = $(S)/php/modules/uuid.so
+PHP_NAME    = $(S)/php/modules/ossp-uuid.so
 PHP_OBJS    = $(S)/php/uuid.c
 
-PGSQL_NAME  = $(S)/pgsql/libuuid.so
+PGSQL_NAME  = $(S)/pgsql/libossp-uuid.so
 PGSQL_OBJS  = $(S)/pgsql/uuid.c
 
 TARGETS     = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@
@@ -230,7 +230,7 @@
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
 	$(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
 	$(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
-	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
+	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 	$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
 	- at if [ ".$(WITH_DCE)" = .yes ]; then \
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
@@ -240,7 +240,7 @@
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
 	fi
-	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
+	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
@@ -275,7 +275,7 @@
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \
 	fi
-	-$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
+	-$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
 	    $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
@@ -289,7 +289,7 @@
 	    echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
 	    $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
 	fi
-	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
 	-$(RM) $(DESTDIR)$(bindir)/uuid-config
 	-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
diff -urN uuid-1.5.1.orig/perl/Makefile.PL uuid-1.5.1/perl/Makefile.PL
--- uuid-1.5.1.orig/perl/Makefile.PL	2006-01-13 00:44:33.000000000 -0600
+++ uuid-1.5.1/perl/Makefile.PL	2006-09-21 15:59:40.000000000 -0500
@@ -33,9 +33,9 @@
 use ExtUtils::MakeMaker;
 
 #   determine source directory
-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
-               grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
-    or die "no source directory found (where libuuid.la is located)";
+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
+               grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
+    or die "no source directory found (where libossp-uuid.la is located)";
 
 #   determine extra build options
 my $compat = 0;
@@ -47,7 +47,7 @@
     VERSION_FROM      => 'uuid.pm',
     ABSTRACT_FROM     => 'uuid.pod',
     PREREQ_PM         => {},
-    LIBS              => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
+    LIBS              => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
     DEFINE            => '',
     INC               => "-I. -I$srcdir",
     PM                => { 'uuid.pm'   => '$(INST_LIBDIR)/uuid.pm',
diff -urN uuid-1.5.1.orig/pgsql/Makefile uuid-1.5.1/pgsql/Makefile
--- uuid-1.5.1.orig/pgsql/Makefile	2006-07-31 07:36:58.000000000 -0500
+++ uuid-1.5.1/pgsql/Makefile	2006-09-21 16:07:23.000000000 -0500
@@ -17,13 +17,13 @@
 top_builddir      := $(dir $(PGXS))../..
 include           $(top_builddir)/src/Makefile.global
     
-NAME              = uuid
+NAME              = ossp-uuid
 OBJS              = uuid.o
 SO_MAJOR_VERSION  = 1
 SO_MINOR_VERSION  = 0
 
 override CPPFLAGS := -I.. $(CPPFLAGS)
-SHLIB_LINK        := -L../.libs -luuid
+SHLIB_LINK        := -L../.libs -lossp-uuid
 SHLIB_LINK        += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic")
 rpath             :=
 
@@ -33,16 +33,16 @@
 include           $(top_builddir)/src/Makefile.shlib
 
 uuid.sql: uuid.sql.in
-	sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql
+	sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
+	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
 	$(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql
 
 uninstall:
-	-rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
+	-rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
 	-rm -f $(DESTDIR)$(datadir)/uuid.sql
 
 clean distclean: clean-lib
diff -urN uuid-1.5.1.orig/php/Makefile.local uuid-1.5.1/php/Makefile.local
--- uuid-1.5.1.orig/php/Makefile.local	2006-07-31 06:41:46.000000000 -0500
+++ uuid-1.5.1/php/Makefile.local	2006-09-21 15:59:40.000000000 -0500
@@ -48,7 +48,7 @@
 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
 	echo "installing PHP$$version API into $$extdir"; \
 	./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \
-	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \
+	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \
 	./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php
 
 clean:
diff -urN uuid-1.5.1.orig/php/config.m4 uuid-1.5.1/php/config.m4
--- uuid-1.5.1.orig/php/config.m4	2006-01-13 00:44:34.000000000 -0600
+++ uuid-1.5.1/php/config.m4	2006-09-21 15:59:40.000000000 -0500
@@ -34,7 +34,7 @@
     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
     PHP_ADD_LIBPATH([..], )
-    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
+    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
     PHP_ADD_INCLUDE([..])
     PHP_SUBST(UUID_SHARED_LIBADD)
     dnl  avoid conflict with libc's uuid_create(3)
diff -urN uuid-1.5.1.orig/php/uuid.ts uuid-1.5.1/php/uuid.ts
--- uuid-1.5.1.orig/php/uuid.ts	2006-01-13 00:44:34.000000000 -0600
+++ uuid-1.5.1/php/uuid.ts	2006-09-21 15:59:40.000000000 -0500
@@ -34,9 +34,9 @@
 
 $php_version = $argv[1];
 
-print "++ loading DSO uuid.so (low-level API)\n";
+print "++ loading DSO ossp-uuid.so (low-level API)\n";
 if (!extension_loaded('uuid')) {
-    dl('modules/uuid.so');
+    dl('modules/ossp-uuid.so');
 }
 
 print "++ loading PHP uuid.php${php_version} (high-level API)\n";
diff -urN uuid-1.5.1.orig/uuid-config.in uuid-1.5.1/uuid-config.in
--- uuid-1.5.1.orig/uuid-config.in	2006-01-13 00:44:30.000000000 -0600
+++ uuid-1.5.1/uuid-config.in	2006-09-21 15:59:40.000000000 -0500
@@ -120,7 +120,7 @@
             output_extra="$output_extra $uuid_ldflags"
             ;;
         --libs)
-            output="$output -luuid"
+            output="$output -lossp-uuid"
             output_extra="$output_extra $uuid_libs"
             ;;
         * )
diff -urN uuid-1.5.1.orig/uuid.pc.in uuid-1.5.1/uuid.pc.in
--- uuid-1.5.1.orig/uuid.pc.in	2006-01-13 00:44:30.000000000 -0600
+++ uuid-1.5.1/uuid.pc.in	2006-09-21 15:59:40.000000000 -0500
@@ -37,6 +37,6 @@
 Version: @UUID_VERSION_RAW@
 URL: http://www.ossp.org/pkg/lib/uuid/
 Cflags: -I${includedir}
-Libs: -L${libdir} -luuid
+Libs: -L${libdir} -lossp-uuid
 Libs.private: @LIBS@
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 May 2006 14:20:21 -0000	1.2
+++ .cvsignore	16 Nov 2006 01:08:12 -0000	1.3
@@ -1 +1 @@
-uuid-1.4.2.tar.gz
+uuid-1.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 May 2006 14:20:21 -0000	1.2
+++ sources	16 Nov 2006 01:08:12 -0000	1.3
@@ -1 +1 @@
-fdfe93bc134dfb73814456c3b444dda1  uuid-1.4.2.tar.gz
+d7df0c4cb02dad7ce3e1ec8fc669f724  uuid-1.5.1.tar.gz


Index: uuid.spec
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-5/uuid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uuid.spec	24 May 2006 14:20:21 -0000	1.1
+++ uuid.spec	16 Nov 2006 01:08:12 -0000	1.2
@@ -1,11 +1,12 @@
 Name:           uuid
-Version:        1.4.2
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        2%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.ossp.org/pkg/lib/uuid/
 Source0:        ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz
+Patch0:         ossp-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  /usr/bin/libtool
 
@@ -95,9 +96,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # Build the library.
+export LIB_NAME=libossp-uuid.la
+export DCE_NAME=libossp-uuid_dce.la
+export CXX_NAME=libossp-uuid++.la
+export PHP_NAME=$RPM_SOURCE_DIR/php/modules/ossp-uuid.so
+export PGSQL_NAME=$RPM_SOURCE_DIR/pgsql/libossp-uuid.so
 %configure \
     --disable-static \
     --without-perl \
@@ -178,25 +185,25 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
 %{_bindir}/uuid
-%{_libdir}/libuuid.so.*
+%{_libdir}/libossp-uuid.so.*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/uuid-config
 %{_includedir}/uuid.h
-%{_libdir}/libuuid.so
-%{_libdir}/pkgconfig/uuid.pc
-%{_mandir}/man3/uuid.3*
+%{_libdir}/libossp-uuid.so
+%{_libdir}/pkgconfig/ossp-uuid.pc
+%{_mandir}/man3/ossp-uuid.3*
 
 %files c++
 %defattr(-,root,root,-)
-%{_libdir}/libuuid++.so.*
+%{_libdir}/libossp-uuid++.so.*
 
 %files c++-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid++.hh
-%{_libdir}/libuuid++.so
+%{_libdir}/libossp-uuid++.so
 %{_mandir}/man3/uuid++.3*
 
 %files perl
@@ -218,14 +225,26 @@
 
 %files dce
 %defattr(-,root,root,-)
-%{_libdir}/libuuid_dce.so.*
+%{_libdir}/libossp-uuid_dce.so.*
 
 %files dce-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid_dce.h
-%{_libdir}/libuuid_dce.so
+%{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli  1.5.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Mon Aug 28 2006 Steven Pritchard  1.5.1-1
+- Update to 1.5.1.
+
+* Sat Jul 29 2006 Steven Pritchard  1.5.0-1
+- Update to 1.5.0.
+- Rename libuuid* to libossp-uuid*, uuid.3 to ossp-uuid.3, and uuid.pc
+  to ossp-uuid.pc to avoid conflicts with e2fsprogs-devel (#198520).
+- Clean out the pgsql directory.  (Some cruft shipped with this release.)
+
 * Wed May 24 2006 Steven Pritchard  1.4.2-4
 - Remove static php module.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 01:11:37 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 15 Nov 2006 18:11:37 -0700
Subject: rpms/uuid/FC-4 ossp-uuid.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 uuid.spec, 1.1, 1.2
Message-ID: <200611160111.kAG1Bbh5000383@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/uuid/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv357

Modified Files:
	.cvsignore sources uuid.spec 
Added Files:
	ossp-uuid.patch 
Log Message:
Sync with devel/FC-6.

ossp-uuid.patch:

--- NEW FILE ossp-uuid.patch ---
diff -urN uuid-1.5.1.orig/Makefile.PL uuid-1.5.1/Makefile.PL
--- uuid-1.5.1.orig/Makefile.PL	2006-01-15 12:37:43.000000000 -0600
+++ uuid-1.5.1/Makefile.PL	2006-09-21 15:59:40.000000000 -0500
@@ -44,7 +44,7 @@
 all pure_all:
 	\@if [ ! -d build ]; then mkdir build; fi
 	\@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi
-	\@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi
+	\@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi
 	\@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi
 	\@cd perl && \$(MAKE) \$(MFLAGS) \$\@
 
diff -urN uuid-1.5.1.orig/Makefile.in uuid-1.5.1/Makefile.in
--- uuid-1.5.1.orig/Makefile.in	2006-07-31 07:20:03.000000000 -0500
+++ uuid-1.5.1/Makefile.in	2006-09-21 16:06:31.000000000 -0500
@@ -61,13 +61,13 @@
 PHP         = @PHP@
 PG_CONFIG   = @PG_CONFIG@
 
-LIB_NAME    = libuuid.la
+LIB_NAME    = libossp-uuid.la
 LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
 
-DCE_NAME    = libuuid_dce.la
+DCE_NAME    = libossp-uuid_dce.la
 DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
 
-CXX_NAME    = libuuid++.la
+CXX_NAME    = libossp-uuid++.la
 CXX_OBJS    = uuid++.lo $(LIB_OBJS)
 
 PRG_NAME    = uuid
@@ -78,10 +78,10 @@
 PERL_NAME   = $(S)/perl/blib/lib/OSSP/uuid.pm
 PERL_OBJS   = $(S)/perl/uuid.pm
 
-PHP_NAME    = $(S)/php/modules/uuid.so
+PHP_NAME    = $(S)/php/modules/ossp-uuid.so
 PHP_OBJS    = $(S)/php/uuid.c
 
-PGSQL_NAME  = $(S)/pgsql/libuuid.so
+PGSQL_NAME  = $(S)/pgsql/libossp-uuid.so
 PGSQL_OBJS  = $(S)/pgsql/uuid.c
 
 TARGETS     = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@
@@ -230,7 +230,7 @@
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
 	$(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
 	$(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
-	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
+	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 	$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
 	- at if [ ".$(WITH_DCE)" = .yes ]; then \
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
@@ -240,7 +240,7 @@
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
 	fi
-	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
+	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
@@ -275,7 +275,7 @@
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \
 	fi
-	-$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
+	-$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3
 	- at if [ ".$(WITH_CXX)" = .yes ]; then \
 	    echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
 	    $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
@@ -289,7 +289,7 @@
 	    echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
 	    $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
 	fi
-	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
 	-$(RM) $(DESTDIR)$(bindir)/uuid-config
 	-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
diff -urN uuid-1.5.1.orig/perl/Makefile.PL uuid-1.5.1/perl/Makefile.PL
--- uuid-1.5.1.orig/perl/Makefile.PL	2006-01-13 00:44:33.000000000 -0600
+++ uuid-1.5.1/perl/Makefile.PL	2006-09-21 15:59:40.000000000 -0500
@@ -33,9 +33,9 @@
 use ExtUtils::MakeMaker;
 
 #   determine source directory
-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
-               grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
-    or die "no source directory found (where libuuid.la is located)";
+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
+               grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
+    or die "no source directory found (where libossp-uuid.la is located)";
 
 #   determine extra build options
 my $compat = 0;
@@ -47,7 +47,7 @@
     VERSION_FROM      => 'uuid.pm',
     ABSTRACT_FROM     => 'uuid.pod',
     PREREQ_PM         => {},
-    LIBS              => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
+    LIBS              => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
     DEFINE            => '',
     INC               => "-I. -I$srcdir",
     PM                => { 'uuid.pm'   => '$(INST_LIBDIR)/uuid.pm',
diff -urN uuid-1.5.1.orig/pgsql/Makefile uuid-1.5.1/pgsql/Makefile
--- uuid-1.5.1.orig/pgsql/Makefile	2006-07-31 07:36:58.000000000 -0500
+++ uuid-1.5.1/pgsql/Makefile	2006-09-21 16:07:23.000000000 -0500
@@ -17,13 +17,13 @@
 top_builddir      := $(dir $(PGXS))../..
 include           $(top_builddir)/src/Makefile.global
     
-NAME              = uuid
+NAME              = ossp-uuid
 OBJS              = uuid.o
 SO_MAJOR_VERSION  = 1
 SO_MINOR_VERSION  = 0
 
 override CPPFLAGS := -I.. $(CPPFLAGS)
-SHLIB_LINK        := -L../.libs -luuid
+SHLIB_LINK        := -L../.libs -lossp-uuid
 SHLIB_LINK        += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic")
 rpath             :=
 
@@ -33,16 +33,16 @@
 include           $(top_builddir)/src/Makefile.shlib
 
 uuid.sql: uuid.sql.in
-	sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql
+	sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
+	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
 	$(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql
 
 uninstall:
-	-rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
+	-rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
 	-rm -f $(DESTDIR)$(datadir)/uuid.sql
 
 clean distclean: clean-lib
diff -urN uuid-1.5.1.orig/php/Makefile.local uuid-1.5.1/php/Makefile.local
--- uuid-1.5.1.orig/php/Makefile.local	2006-07-31 06:41:46.000000000 -0500
+++ uuid-1.5.1/php/Makefile.local	2006-09-21 15:59:40.000000000 -0500
@@ -48,7 +48,7 @@
 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
 	echo "installing PHP$$version API into $$extdir"; \
 	./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \
-	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \
+	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \
 	./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php
 
 clean:
diff -urN uuid-1.5.1.orig/php/config.m4 uuid-1.5.1/php/config.m4
--- uuid-1.5.1.orig/php/config.m4	2006-01-13 00:44:34.000000000 -0600
+++ uuid-1.5.1/php/config.m4	2006-09-21 15:59:40.000000000 -0500
@@ -34,7 +34,7 @@
     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
     PHP_ADD_LIBPATH([..], )
-    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
+    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
     PHP_ADD_INCLUDE([..])
     PHP_SUBST(UUID_SHARED_LIBADD)
     dnl  avoid conflict with libc's uuid_create(3)
diff -urN uuid-1.5.1.orig/php/uuid.ts uuid-1.5.1/php/uuid.ts
--- uuid-1.5.1.orig/php/uuid.ts	2006-01-13 00:44:34.000000000 -0600
+++ uuid-1.5.1/php/uuid.ts	2006-09-21 15:59:40.000000000 -0500
@@ -34,9 +34,9 @@
 
 $php_version = $argv[1];
 
-print "++ loading DSO uuid.so (low-level API)\n";
+print "++ loading DSO ossp-uuid.so (low-level API)\n";
 if (!extension_loaded('uuid')) {
-    dl('modules/uuid.so');
+    dl('modules/ossp-uuid.so');
 }
 
 print "++ loading PHP uuid.php${php_version} (high-level API)\n";
diff -urN uuid-1.5.1.orig/uuid-config.in uuid-1.5.1/uuid-config.in
--- uuid-1.5.1.orig/uuid-config.in	2006-01-13 00:44:30.000000000 -0600
+++ uuid-1.5.1/uuid-config.in	2006-09-21 15:59:40.000000000 -0500
@@ -120,7 +120,7 @@
             output_extra="$output_extra $uuid_ldflags"
             ;;
         --libs)
-            output="$output -luuid"
+            output="$output -lossp-uuid"
             output_extra="$output_extra $uuid_libs"
             ;;
         * )
diff -urN uuid-1.5.1.orig/uuid.pc.in uuid-1.5.1/uuid.pc.in
--- uuid-1.5.1.orig/uuid.pc.in	2006-01-13 00:44:30.000000000 -0600
+++ uuid-1.5.1/uuid.pc.in	2006-09-21 15:59:40.000000000 -0500
@@ -37,6 +37,6 @@
 Version: @UUID_VERSION_RAW@
 URL: http://www.ossp.org/pkg/lib/uuid/
 Cflags: -I${includedir}
-Libs: -L${libdir} -luuid
+Libs: -L${libdir} -lossp-uuid
 Libs.private: @LIBS@
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 May 2006 14:20:21 -0000	1.2
+++ .cvsignore	16 Nov 2006 01:11:07 -0000	1.3
@@ -1 +1 @@
-uuid-1.4.2.tar.gz
+uuid-1.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 May 2006 14:20:21 -0000	1.2
+++ sources	16 Nov 2006 01:11:07 -0000	1.3
@@ -1 +1 @@
-fdfe93bc134dfb73814456c3b444dda1  uuid-1.4.2.tar.gz
+d7df0c4cb02dad7ce3e1ec8fc669f724  uuid-1.5.1.tar.gz


Index: uuid.spec
===================================================================
RCS file: /cvs/extras/rpms/uuid/FC-4/uuid.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uuid.spec	24 May 2006 14:20:21 -0000	1.1
+++ uuid.spec	16 Nov 2006 01:11:07 -0000	1.2
@@ -1,11 +1,12 @@
 Name:           uuid
-Version:        1.4.2
-Release:        4%{?dist}
+Version:        1.5.1
+Release:        2%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.ossp.org/pkg/lib/uuid/
 Source0:        ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz
+Patch0:         ossp-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  /usr/bin/libtool
 
@@ -95,9 +96,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # Build the library.
+export LIB_NAME=libossp-uuid.la
+export DCE_NAME=libossp-uuid_dce.la
+export CXX_NAME=libossp-uuid++.la
+export PHP_NAME=$RPM_SOURCE_DIR/php/modules/ossp-uuid.so
+export PGSQL_NAME=$RPM_SOURCE_DIR/pgsql/libossp-uuid.so
 %configure \
     --disable-static \
     --without-perl \
@@ -178,25 +185,25 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
 %{_bindir}/uuid
-%{_libdir}/libuuid.so.*
+%{_libdir}/libossp-uuid.so.*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/uuid-config
 %{_includedir}/uuid.h
-%{_libdir}/libuuid.so
-%{_libdir}/pkgconfig/uuid.pc
-%{_mandir}/man3/uuid.3*
+%{_libdir}/libossp-uuid.so
+%{_libdir}/pkgconfig/ossp-uuid.pc
+%{_mandir}/man3/ossp-uuid.3*
 
 %files c++
 %defattr(-,root,root,-)
-%{_libdir}/libuuid++.so.*
+%{_libdir}/libossp-uuid++.so.*
 
 %files c++-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid++.hh
-%{_libdir}/libuuid++.so
+%{_libdir}/libossp-uuid++.so
 %{_mandir}/man3/uuid++.3*
 
 %files perl
@@ -218,14 +225,26 @@
 
 %files dce
 %defattr(-,root,root,-)
-%{_libdir}/libuuid_dce.so.*
+%{_libdir}/libossp-uuid_dce.so.*
 
 %files dce-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid_dce.h
-%{_libdir}/libuuid_dce.so
+%{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Thu Oct 05 2006 Christian Iseli  1.5.1-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Mon Aug 28 2006 Steven Pritchard  1.5.1-1
+- Update to 1.5.1.
+
+* Sat Jul 29 2006 Steven Pritchard  1.5.0-1
+- Update to 1.5.0.
+- Rename libuuid* to libossp-uuid*, uuid.3 to ossp-uuid.3, and uuid.pc
+  to ossp-uuid.pc to avoid conflicts with e2fsprogs-devel (#198520).
+- Clean out the pgsql directory.  (Some cruft shipped with this release.)
+
 * Wed May 24 2006 Steven Pritchard  1.4.2-4
 - Remove static php module.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 03:42:11 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:42:11 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager - New directory
Message-ID: <200611160342.kAG3gB5C007308@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7304/php-pear-Structures-DataGrid-Renderer-Pager

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 03:42:17 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:42:17 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel - New
	directory
Message-ID: <200611160342.kAG3gHZh007322@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7304/php-pear-Structures-DataGrid-Renderer-Pager/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 03:42:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:42:28 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200611160342.kAG3gSdk007353@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7347

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Structures-DataGrid-Renderer-Pager


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Structures-DataGrid-Renderer-Pager
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 Nov 16 03:42:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:42:29 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel .cvsignore, 
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611160342.kAG3gTPA007370@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7347/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Structures-DataGrid-Renderer-Pager


--- 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 Nov 16 03:43:12 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:43:12 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager import.log, 1.1,
	1.2
Message-ID: <200611160343.kAG3hCAT007445@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7413

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1 on branch devel from php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 03:42:28 -0000	1.1
+++ import.log	16 Nov 2006 03:42:42 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Structures-DataGrid-Renderer-Pager-0_1_0-1:HEAD:php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1.src.rpm:1163648559



From fedora-extras-commits at redhat.com  Thu Nov 16 03:43:13 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:43:13 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel
	php-pear-Structures-DataGrid-Renderer-Pager.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611160343.kAG3hD8k007449@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7413/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Structures-DataGrid-Renderer-Pager.spec 
Log Message:
auto-import php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1 on branch devel from php-pear-Structures-DataGrid-Renderer-Pager-0.1.0-1.src.rpm


--- NEW FILE php-pear-Structures-DataGrid-Renderer-Pager.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Structures_DataGrid_Renderer_Pager

Name:           php-pear-Structures-DataGrid-Renderer-Pager
Version:        0.1.0
Release:        1%{?dist}
Summary:        Renderer driver using PEAR::Pager

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Structures_DataGrid_Renderer_Pager
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(Pager) php-pear(Structures_DataGrid)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is a Renderer driver for Structures_DataGrid using PEAR::Pager.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Structures/DataGrid/Renderer


%changelog
* Sun Oct 29 2006 Christopher Stone  0.1.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 03:42:29 -0000	1.1
+++ .cvsignore	16 Nov 2006 03:42:43 -0000	1.2
@@ -0,0 +1 @@
+Structures_DataGrid_Renderer_Pager-0.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Pager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 03:42:29 -0000	1.1
+++ sources	16 Nov 2006 03:42:43 -0000	1.2
@@ -0,0 +1 @@
+6604bb72ff0b78c8651cd17eef0d5fe4  Structures_DataGrid_Renderer_Pager-0.1.0.tgz



From fedora-extras-commits at redhat.com  Thu Nov 16 03:45:14 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 20:45:14 -0700
Subject: owners owners.list,1.1968,1.1969
Message-ID: <200611160345.kAG3jEs2007520@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7490

Modified Files:
	owners.list 
Log Message:
php-pear-Structures-DataGrid-Renderer-Pager


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1968
retrieving revision 1.1969
diff -u -r1.1968 -r1.1969
--- owners.list	15 Nov 2006 22:17:42 -0000	1.1968
+++ owners.list	16 Nov 2006 03:44:44 -0000	1.1969
@@ -1819,6 +1819,7 @@
 Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 04:05:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:05:09 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel - New
	directory
Message-ID: <200611160405.kAG4594v010696@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10681/php-pear-Structures-DataGrid-Renderer-Smarty/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 04:05:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:05:05 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty - New directory
Message-ID: <200611160405.kAG455Lp010685@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10681/php-pear-Structures-DataGrid-Renderer-Smarty

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 04:05:31 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:05:31 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200611160405.kAG45V9x010736@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Structures-DataGrid-Renderer-Smarty


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Structures-DataGrid-Renderer-Smarty
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 Nov 16 04:05:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:05:34 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel .cvsignore, 
	NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611160405.kAG45Y1N010747@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Structures-DataGrid-Renderer-Smarty


--- 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 Nov 16 04:06:26 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:06:26 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel
	php-pear-Structures-DataGrid-Renderer-Smarty.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611160406.kAG46Qw7010826@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10792/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Structures-DataGrid-Renderer-Smarty.spec 
Log Message:
auto-import php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1 on branch devel from php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1.src.rpm


--- NEW FILE php-pear-Structures-DataGrid-Renderer-Smarty.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Structures_DataGrid_Renderer_Smarty

Name:           php-pear-Structures-DataGrid-Renderer-Smarty
Version:        0.1.2
Release:        1%{?dist}
Summary:        Renderer driver using Smarty

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Structures_DataGrid_Renderer_Smarty
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(Structures_DataGrid_Renderer_Pager)
Requires:       php-Smarty
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is a Rendering driver for Structures_DataGrid using Smarty. It adds the
necessary variables and functions to a Smarty instance, in order to build a
full-featured DataGrid within a Smarty template.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Structures/DataGrid/Renderer/Smarty.php


%changelog
* Sun Oct 29 2006 Christopher Stone  0.1.2-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 04:05:34 -0000	1.1
+++ .cvsignore	16 Nov 2006 04:05:55 -0000	1.2
@@ -0,0 +1 @@
+Structures_DataGrid_Renderer_Smarty-0.1.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 04:05:34 -0000	1.1
+++ sources	16 Nov 2006 04:05:55 -0000	1.2
@@ -0,0 +1 @@
+a5e209d09588b82c3e46b6f4d7fef242  Structures_DataGrid_Renderer_Smarty-0.1.2.tgz



From fedora-extras-commits at redhat.com  Thu Nov 16 04:06:24 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:06:24 -0700
Subject: rpms/php-pear-Structures-DataGrid-Renderer-Smarty import.log, 1.1,
	1.2
Message-ID: <200611160406.kAG46Oft010824@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10792

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1 on branch devel from php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-Renderer-Smarty/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 04:05:31 -0000	1.1
+++ import.log	16 Nov 2006 04:05:53 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Structures-DataGrid-Renderer-Smarty-0_1_2-1:HEAD:php-pear-Structures-DataGrid-Renderer-Smarty-0.1.2-1.src.rpm:1163649950



From fedora-extras-commits at redhat.com  Thu Nov 16 04:08:00 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 15 Nov 2006 21:08:00 -0700
Subject: rpms/mlton/devel mlton.spec,1.4,1.5
Message-ID: <200611160408.kAG480A2010901@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10864

Modified Files:
	mlton.spec 
Log Message:
version


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mlton.spec	13 Nov 2006 00:23:17 -0000	1.4
+++ mlton.spec	16 Nov 2006 04:07:29 -0000	1.5
@@ -44,6 +44,9 @@
 %prep
 %setup -q
 
+# instantiate version numbers
+make version
+
 # build documentation as PDF
 %patch -P 0 -p1
 # enable -g and disable strip so debuginfo packages work



From fedora-extras-commits at redhat.com  Thu Nov 16 04:08:22 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 15 Nov 2006 21:08:22 -0700
Subject: owners owners.list,1.1969,1.1970
Message-ID: <200611160408.kAG48M88010907@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10883

Modified Files:
	owners.list 
Log Message:
php-pear-Structures-DataGrid-Renderer-Smarty


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1969
retrieving revision 1.1970
diff -u -r1.1969 -r1.1970
--- owners.list	16 Nov 2006 03:44:44 -0000	1.1969
+++ owners.list	16 Nov 2006 04:07:48 -0000	1.1970
@@ -1820,6 +1820,7 @@
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Structures-DataGrid-Renderer-Smarty|Renderer driver using Smarty|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate-Finance-CreditCard|Validation class for Credit Cards|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-XML-Beautifier|Class to format XML documents|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 04:37:22 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 15 Nov 2006 21:37:22 -0700
Subject: rpms/gtk2hs/devel .cvsignore, 1.3, 1.4 gtk2hs.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200611160437.kAG4bM6W011241@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11220

Modified Files:
	.cvsignore gtk2hs.spec sources 
Log Message:
update to latest snapshot with header filelist fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2006 01:19:03 -0000	1.3
+++ .cvsignore	16 Nov 2006 04:36:51 -0000	1.4
@@ -1 +1 @@
-gtk2hs-0.9.10.2.tar.gz
+gtk2hs-0.9.10.2-20061116.tar.gz


Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtk2hs.spec	8 Nov 2006 01:20:25 -0000	1.7
+++ gtk2hs.spec	16 Nov 2006 04:36:51 -0000	1.8
@@ -1,3 +1,5 @@
+%define snapdate 20061116
+
 %define ghc_version 6.6
 %define ghcver ghc66
 
@@ -7,10 +9,10 @@
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
 Version:        0.9.10.2
-Release:        0.1.20061107%{?dist}
+Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}-%{snapdate}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
@@ -97,7 +99,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -258,7 +260,7 @@
 
 
 %changelog
-* Wed Nov  8 2006 Jens Petersen  - 0.9.10.2-0
+* Thu Nov 16 2006 Jens Petersen  - 0.9.10.2-0.1
 - update to latest darcs snapshot for ghc66
 - add soegtk and remove mogul ghc packages
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2006 01:19:03 -0000	1.3
+++ sources	16 Nov 2006 04:36:51 -0000	1.4
@@ -1 +1 @@
-1da9b3f4d89d411f07d746dcb23d3414  gtk2hs-0.9.10.2.tar.gz
+58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 04:44:05 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 15 Nov 2006 21:44:05 -0700
Subject: rpms/gtk2hs/FC-6 .cvsignore, 1.2, 1.3 gtk2hs.spec, 1.5, 1.6 sources,
	1.2, 1.3
Message-ID: <200611160444.kAG4i5Sw011343@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11323

Modified Files:
	.cvsignore gtk2hs.spec sources 
Log Message:
sync with devel for ghc66
- update to latest darcs snapshot for ghc66
- add soegtk and remove mogul ghc packages



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 May 2006 03:18:55 -0000	1.2
+++ .cvsignore	16 Nov 2006 04:43:35 -0000	1.3
@@ -1 +1 @@
-gtk2hs-0.9.10.tar.gz
+gtk2hs-0.9.10.2-20061116.tar.gz


Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/gtk2hs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk2hs.spec	28 Sep 2006 05:37:36 -0000	1.5
+++ gtk2hs.spec	16 Nov 2006 04:43:35 -0000	1.6
@@ -1,17 +1,19 @@
-%define ghc_version 6.4.2
-%define ghcver ghc642
-#%%define mozver 1.5.0.6
+%define snapdate 20061116
+
+%define ghc_version 6.6
+%define ghcver ghc66
 
 %define build_mozembed 1
 %define build_cairo 1
 
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
-Version:        0.9.10
-Release:        4%{?dist}
+Version:        0.9.10.2
+Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapd
+ate:-%{snapdate}}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
@@ -60,8 +62,7 @@
 management, unicode support, and wide coverage of Gtk+ 2 widgets.
 
 This package also includes the bindings for cairo, gconf, glade, glib, and
-sourceview, and the mogul wrapper library.  The libraries are compiled for
-ghc-%{ghc_version}.
+sourceview.  The libraries are compiled for ghc-%{ghc_version}.
 
 
 %package doc
@@ -99,7 +100,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q %{?snapdate:-n %{name}-%{version}}
 
 
 %build
@@ -128,7 +129,7 @@
 make DESTDIR=%{buildroot} install
 
 # make ghost files
-for i in gconf glade glib gtk mogul sourceview \
+for i in gconf glade glib gtk sourceview soegtk \
 %if %{build_cairo}
         cairo \
 %endif
@@ -158,10 +159,10 @@
         cairo \
 %endif
         gtk \
-        mogul \
         gconf \
         glade \
         sourceview \
+	soegtk \
 ; do
 %{ghcpkg_inst $i}
 done
@@ -176,10 +177,10 @@
 %preun -n %{ghcver}-%{name}
 if [ "$1" = 0 ]; then
   for i in \
+	soegtk \
         gconf \
         glade \
         sourceview \
-        mogul \
         gtk \
 %if %{build_cairo}
         cairo \
@@ -218,35 +219,29 @@
 %{gtk2hsdir}/cairo.package.conf
 %{gtk2hsdir}/libHScairo.a
 %ghost %{gtk2hsdir}/HScairo.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/cairo
 %endif
 %{gtk2hsdir}/gconf.package.conf
 %{gtk2hsdir}/libHSgconf.a
 %ghost %{gtk2hsdir}/HSgconf.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/gconf
 %{gtk2hsdir}/glade.package.conf
 %{gtk2hsdir}/libHSglade.a
 %ghost %{gtk2hsdir}/HSglade.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/glade
 %{gtk2hsdir}/glib.package.conf
 %{gtk2hsdir}/libHSglib.a
 %ghost %{gtk2hsdir}/HSglib.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/glib
 %dir %{gtk2hsdir}/include
 %{gtk2hsdir}/include/gtk2hs-config.h
-%{gtk2hsdir}/mogul.package.conf
-%{gtk2hsdir}/libHSmogul.a
-%ghost %{gtk2hsdir}/HSmogul.o
-%dir %{gtk2hsdir}/imports
-%{gtk2hsdir}/imports/mogul
+%{gtk2hsdir}/soegtk.package.conf
+%{gtk2hsdir}/libHSsoegtk.a
+%ghost %{gtk2hsdir}/HSsoegtk.o
+%{gtk2hsdir}/imports/soegtk
 %{gtk2hsdir}/sourceview.package.conf
 %{gtk2hsdir}/libHSsourceview.a
 %ghost %{gtk2hsdir}/HSsourceview.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/sourceview
 
 
@@ -261,12 +256,15 @@
 %{gtk2hsdir}/mozembed.package.conf
 %{gtk2hsdir}/libHSmozembed.a
 %ghost %{gtk2hsdir}/HSmozembed.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/mozembed
 %endif
 
 
 %changelog
+* Thu Nov 16 2006 Jens Petersen  - 0.9.10.2-0.1
+- update to latest darcs snapshot for ghc66
+- add soegtk and remove mogul ghc packages
+
 * Thu Sep 28 2006 Jens Petersen  - 0.9.10-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 May 2006 03:18:55 -0000	1.2
+++ sources	16 Nov 2006 04:43:35 -0000	1.3
@@ -1 +1 @@
-13d300e07153f37ba5893ac336b078bc  gtk2hs-0.9.10.tar.gz
+58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 05:50:20 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Wed, 15 Nov 2006 22:50:20 -0700
Subject: rpms/gtk2hs/devel gtk2hs.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200611160550.kAG5oK1J014627@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14604

Modified Files:
	gtk2hs.spec sources 
Log Message:
fix tarball to really include those missing header files



Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk2hs.spec	16 Nov 2006 04:36:51 -0000	1.8
+++ gtk2hs.spec	16 Nov 2006 05:49:50 -0000	1.9
@@ -12,7 +12,7 @@
 Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}-%{snapdate}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
@@ -99,7 +99,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q %{?snapdate:-n %{name}-%{version}}
 
 
 %build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Nov 2006 04:36:51 -0000	1.4
+++ sources	16 Nov 2006 05:49:50 -0000	1.5
@@ -1 +1 @@
-58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz
+0ea8686c934318a590476d4046779ddf  gtk2hs-0.9.10.2-20061116.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 06:08:56 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:08:56 -0700
Subject: rpms/php-pear-SOAP - New directory
Message-ID: <200611160608.kAG68u8v017765@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761/php-pear-SOAP

Log Message:
Directory /cvs/extras/rpms/php-pear-SOAP added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 06:08:58 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:08:58 -0700
Subject: rpms/php-pear-SOAP/devel - New directory
Message-ID: <200611160608.kAG68w2i017774@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761/php-pear-SOAP/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-SOAP/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 06:09:28 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:09:28 -0700
Subject: rpms/php-pear-SOAP Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611160609.kAG69SVW017826@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17820

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-SOAP


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-SOAP
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 Nov 16 06:09:32 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:09:32 -0700
Subject: rpms/php-pear-SOAP/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611160609.kAG69WER017837@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17820/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-SOAP


--- 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 Nov 16 06:10:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:10:48 -0700
Subject: rpms/php-pear-SOAP/devel PHP-LICENSE-3.01, NONE,
	1.1 php-pear-SOAP.spec, NONE, 1.1 xml2changelog, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611160610.kAG6AmYs017978@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17934/devel

Modified Files:
	.cvsignore sources 
Added Files:
	PHP-LICENSE-3.01 php-pear-SOAP.spec xml2changelog 
Log Message:
auto-import php-pear-SOAP-0.9.4-1.fc6 on branch devel from php-pear-SOAP-0.9.4-1.fc6.src.rpm


--- NEW FILE PHP-LICENSE-3.01 ---
-------------------------------------------------------------------- 
                  The PHP License, version 3.01
Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
-------------------------------------------------------------------- 

Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:

  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
 
  3. The name "PHP" must not be used to endorse or promote products
     derived from this software without prior written permission. For
     written permission, please contact group at php.net.
  
  4. Products derived from this software may not be called "PHP", nor
     may "PHP" appear in their name, without prior written permission
     from group at php.net.  You may indicate that your software works in
     conjunction with PHP by saying "Foo for PHP" instead of calling
     it "PHP Foo" or "phpfoo"
 
  5. The PHP Group may publish revised and/or new versions of the
     license from time to time. Each version will be given a
     distinguishing version number.
     Once covered code has been published under a particular version
     of the license, you may always continue to use it under the terms
     of that version. You may also choose to use such covered code
     under the terms of any subsequent version of the license
     published by the PHP Group. No one other than the PHP Group has
     the right to modify the terms applicable to covered code created
     under this License.

  6. Redistributions of any form whatsoever must retain the following
     acknowledgment:
     "This product includes PHP software, freely available from
     ".

THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

-------------------------------------------------------------------- 

This software consists of voluntary contributions made by many
individuals on behalf of the PHP Group.

The PHP Group can be contacted via Email at group at php.net.

For more information on the PHP Group and the PHP project, 
please see .

PHP includes the Zend Engine, freely available at
.


--- NEW FILE php-pear-SOAP.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name SOAP

Name:           php-pear-SOAP
Version:        0.9.4
Release:        1%{?dist}
Summary:        Simple Object Access Protocol (SOAP) Client/Server for PHP

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/SOAP
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1:        PHP-LICENSE-3.01
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Requires:       php-pear(PEAR), php-pear(HTTP_Request)
Requires(hint): php-pear(Mail), php-pear(Mail_Mime), php-pear(Net_DIME)
Provides:       php-pear(%{pear_name}) = %{version}

%description
Implementation of Simple Object Access Protocol (SOAP) protocol and services.
 

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
%{__install} -m 644 -c %{SOURCE1} LICENSE

cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir


# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG LICENSE docdir/*

%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/SOAP


%changelog
* Mon Nov  6 2006 Remi Collet  0.9.4-1
- initial RPM (generated specfile + cleanup)
- add CHANGELOG and LICENSE


--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-SOAP/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 06:09:32 -0000	1.1
+++ .cvsignore	16 Nov 2006 06:10:18 -0000	1.2
@@ -0,0 +1 @@
+SOAP-0.9.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-SOAP/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 06:09:32 -0000	1.1
+++ sources	16 Nov 2006 06:10:18 -0000	1.2
@@ -0,0 +1 @@
+87a26a8abc3ca75fdbe5d307e26102fa  SOAP-0.9.4.tgz



From fedora-extras-commits at redhat.com  Thu Nov 16 06:10:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:10:48 -0700
Subject: rpms/php-pear-SOAP import.log,1.1,1.2
Message-ID: <200611160610.kAG6AmAb017974@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17934

Modified Files:
	import.log 
Log Message:
auto-import php-pear-SOAP-0.9.4-1.fc6 on branch devel from php-pear-SOAP-0.9.4-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-SOAP/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 06:09:28 -0000	1.1
+++ import.log	16 Nov 2006 06:10:17 -0000	1.2
@@ -0,0 +1 @@
+php-pear-SOAP-0_9_4-1_fc6:HEAD:php-pear-SOAP-0.9.4-1.fc6.src.rpm:1163657408



From fedora-extras-commits at redhat.com  Thu Nov 16 06:16:25 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Wed, 15 Nov 2006 23:16:25 -0700
Subject: owners owners.list,1.1970,1.1971
Message-ID: <200611160616.kAG6GPCF018048@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18032

Modified Files:
	owners.list 
Log Message:
	php-pear-SOAP : Simple Object Access Protocol (SOAP) Client/Server for PHP



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1970
retrieving revision 1.1971
diff -u -r1.1970 -r1.1971
--- owners.list	16 Nov 2006 04:07:48 -0000	1.1970
+++ owners.list	16 Nov 2006 06:15:55 -0000	1.1971
@@ -1818,6 +1818,7 @@
 Fedora Extras|php-pear-PHP-CompatInfo|Find out version and extensions required for a piece of code to run|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-SOAP|Simple Object Access Protocol (SOAP) Client/Server for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Smarty|Renderer driver using Smarty|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 06:26:45 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Wed, 15 Nov 2006 23:26:45 -0700
Subject: rpms/mlton/FC-6 .cvsignore, 1.2, 1.3 mlton-debuginfo.patch, 1.1,
	1.2 mlton.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200611160626.kAG6QjIT018186@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18161

Modified Files:
	.cvsignore mlton-debuginfo.patch mlton.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 13:51:57 -0000	1.2
+++ .cvsignore	16 Nov 2006 06:26:14 -0000	1.3
@@ -1,3 +1 @@
-mlton-20051202-1.src.tgz
-mlton-bootstrap.i386.tar.bz2
-mlton-bootstrap.ppc.tar.bz2
+mlton-20061107.tar.bz2

mlton-debuginfo.patch:

Index: mlton-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/mlton-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlton-debuginfo.patch	9 Jul 2006 13:51:57 -0000	1.1
+++ mlton-debuginfo.patch	16 Nov 2006 06:26:14 -0000	1.2
@@ -1,24 +1,24 @@
-diff -ur mlton-20051202~/bytecode/Makefile mlton-20051202/bytecode/Makefile
---- mlton-20051202~/bytecode/Makefile	2005-11-30 13:36:52.000000000 -0500
-+++ mlton-20051202/bytecode/Makefile	2006-06-25 18:14:13.000000000 -0400
+diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
+--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/bytecode/Makefile	2006-11-14 23:18:42.000000000 -0500
 @@ -10,7 +10,7 @@
  all: interpret.o interpret-gdb.o print-opcodes
  
  CC = gcc -std=gnu99
 -CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
 +CFLAGS = -fomit-frame-pointer -g -I../runtime -I../include -Wall
- 
- ifeq ($(TARGET_ARCH), amd64)
- CFLAGS += -mtune=opteron -m32 
-diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
---- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
-+++ mlton-20051202/Makefile	2006-06-25 18:13:45.000000000 -0400
-@@ -402,17 +402,6 @@
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
+diff -ur mlton-20061107~/Makefile mlton-20061107/Makefile
+--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
++++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
+@@ -411,17 +411,6 @@
  	if $(GZIP_MAN); then						\
  		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
  	fi
 -	case "$(TARGET_OS)" in						\
--	cygwin|darwin|solaris)						\
+-	aix|cygwin|darwin|solaris)					\
 -	;;								\
 -	*)								\
 -		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
@@ -31,15 +31,15 @@
  
  .PHONY: install-docs
  install-docs:
-diff -ur mlton-20051202~/runtime/Makefile mlton-20051202/runtime/Makefile
---- mlton-20051202~/runtime/Makefile	2005-11-29 18:05:07.000000000 -0500
-+++ mlton-20051202/runtime/Makefile	2006-06-25 18:13:45.000000000 -0400
+diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
+--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/runtime/Makefile	2006-11-14 23:20:40.000000000 -0500
 @@ -49,7 +49,7 @@
  endif
  
  CC = gcc -std=gnu99
 -CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
 +CFLAGS = -O2 -Wall -g -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
- DEBUGFLAGS = $(CFLAGS) -gstabs+ -g2
- 
- CFILES = 							\
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/mlton.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlton.spec	1 Sep 2006 03:16:33 -0000	1.3
+++ mlton.spec	16 Nov 2006 06:26:14 -0000	1.4
@@ -1,14 +1,14 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20051202
-Release:	8%{?dist}.1
+Version:	20061107
+Release:	1%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	BSD style and MIT
 URL:		http://mlton.org/
-Source0:	http://mlton.org/pages/Download/attachments/mlton-%{version}-1.src.tgz
+Source0:	mlton-%{version}.tar.bz2
 %if %{mlton_bootstrap}
 # taken from mlton_20060213-1 from Debian
 Source1:	mlton-bootstrap.i386.tar.bz2
@@ -21,7 +21,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gmp-devel htmldoc tetex-latex which
+BuildRequires:	gmp-devel htmldoc tetex-latex
 %if ! %{mlton_bootstrap}
 BuildRequires:	mlton
 %endif
@@ -44,6 +44,9 @@
 %prep
 %setup -q
 
+# instantiate version numbers
+make version
+
 # build documentation as PDF
 %patch -P 0 -p1
 # enable -g and disable strip so debuginfo packages work
@@ -100,6 +103,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 12 2006 Adam Goode  - 20061107-1
+- New release, taken from svn://mlton.org/mlton/tags/on-20061107
+
 * Thu Aug 31 2006 Adam Goode  - 20051202-8.1
 - Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 13:51:57 -0000	1.2
+++ sources	16 Nov 2006 06:26:14 -0000	1.3
@@ -1,3 +1 @@
-766b25e39dff36da5f3ed81effd5471b  mlton-20051202-1.src.tgz
-34f8bf4c11cca4867beb3bccab04b0a5  mlton-bootstrap.i386.tar.bz2
-16358b27a8f86ec1aede640fff1c77ff  mlton-bootstrap.ppc.tar.bz2
+eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 07:37:31 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 16 Nov 2006 00:37:31 -0700
Subject: rpms/brasero/devel .cvsignore, 1.3, 1.4 brasero.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611160737.kAG7bVkZ021726@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21706

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
Update to 0.5.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Oct 2006 10:05:09 -0000	1.3
+++ .cvsignore	16 Nov 2006 07:37:00 -0000	1.4
@@ -1 +1 @@
-brasero-0.5.0.tar.bz2
+brasero-0.5.1.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brasero.spec	30 Oct 2006 10:05:09 -0000	1.2
+++ brasero.spec	16 Nov 2006 07:37:00 -0000	1.3
@@ -1,6 +1,6 @@
 
 Name:      brasero
-Version:   0.5.0
+Version:   0.5.1
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Denis Leroy  - 0.5.1-1
+- Update to 0.5.1
+
 * Sun Oct 29 2006 Denis Leroy  - 0.5.0-1
 - Update to 0.5.0
 - Updated icon paths


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Oct 2006 10:05:09 -0000	1.3
+++ sources	16 Nov 2006 07:37:00 -0000	1.4
@@ -1 +1 @@
-9cf947c4ca681e9ee66600022e697c80  brasero-0.5.0.tar.bz2
+f578d2aaf6b434f91beb935f112728e2  brasero-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 07:40:46 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 16 Nov 2006 00:40:46 -0700
Subject: rpms/brasero/FC-6 .cvsignore, 1.3, 1.4 brasero.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611160740.kAG7ek5T021814@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/brasero/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21790

Modified Files:
	.cvsignore brasero.spec sources 
Log Message:
Update to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Oct 2006 09:31:24 -0000	1.3
+++ .cvsignore	16 Nov 2006 07:40:16 -0000	1.4
@@ -1 +1 @@
-brasero-0.5.0.tar.bz2
+brasero-0.5.1.tar.bz2


Index: brasero.spec
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/brasero.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brasero.spec	30 Oct 2006 09:31:24 -0000	1.2
+++ brasero.spec	16 Nov 2006 07:40:16 -0000	1.3
@@ -1,6 +1,6 @@
 
 Name:      brasero
-Version:   0.5.0
+Version:   0.5.1
 Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Denis Leroy  - 0.5.1-1
+- Update to 0.5.1
+
 * Sun Oct 29 2006 Denis Leroy  - 0.5.0-1
 - Update to 0.5.0
 - Updated icon paths


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brasero/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Oct 2006 09:31:24 -0000	1.3
+++ sources	16 Nov 2006 07:40:16 -0000	1.4
@@ -1 +1 @@
-9cf947c4ca681e9ee66600022e697c80  brasero-0.5.0.tar.bz2
+f578d2aaf6b434f91beb935f112728e2  brasero-0.5.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 07:51:02 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 16 Nov 2006 00:51:02 -0700
Subject: rpms/gtk2hs/FC-6 sources,1.3,1.4
Message-ID: <200611160751.kAG7p2KF021933@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21915

Modified Files:
	sources 
Log Message:
fixed tarball



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2006 04:43:35 -0000	1.3
+++ sources	16 Nov 2006 07:50:32 -0000	1.4
@@ -1 +1 @@
-58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz
+0ea8686c934318a590476d4046779ddf  gtk2hs-0.9.10.2-20061116.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 07:54:58 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 16 Nov 2006 00:54:58 -0700
Subject: rpms/gtk2hs/FC-6 gtk2hs.spec,1.6,1.7
Message-ID: <200611160754.kAG7swaP022002@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21981

Modified Files:
	gtk2hs.spec 
Log Message:
fix the mispasted source line



Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/gtk2hs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk2hs.spec	16 Nov 2006 04:43:35 -0000	1.6
+++ gtk2hs.spec	16 Nov 2006 07:54:27 -0000	1.7
@@ -12,8 +12,7 @@
 Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapd
-ate:-%{snapdate}}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}



From fedora-extras-commits at redhat.com  Thu Nov 16 07:55:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 00:55:53 -0700
Subject: rpms/wine/devel .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 wine-README-Fedora, 1.1, 1.2 wine-notepad.desktop, 1.1,
	1.2 wine-regedit.desktop, 1.1, 1.2 wine-uninstaller.desktop, 1.1,
	1.2 wine-winecfg.desktop, 1.1, 1.2 wine-winefile.desktop, 1.1,
	1.2 wine-winhelp.desktop, 1.1, 1.2 wine.init, 1.3, 1.4 wine.spec,
	1.38, 1.39
Message-ID: <200611160755.kAG7trGj022107@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22000/devel

Modified Files:
	.cvsignore sources wine-README-Fedora wine-notepad.desktop 
	wine-regedit.desktop wine-uninstaller.desktop 
	wine-winecfg.desktop wine-winefile.desktop 
	wine-winhelp.desktop wine.init wine.spec 
Log Message:
- version upgrade
- fix init script (#213230)
- fix twain subpackage content (#213396)
- create wine submenu (#205024)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	28 Oct 2006 05:51:35 -0000	1.25
+++ .cvsignore	16 Nov 2006 07:55:22 -0000	1.26
@@ -1 +1 @@
-wine-0.9.24-fe.tar.bz2
+wine-0.9.25-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	28 Oct 2006 05:51:35 -0000	1.26
+++ sources	16 Nov 2006 07:55:23 -0000	1.27
@@ -1 +1 @@
-1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2
+4d26cc14b481f2ab7026c23d83086753  wine-0.9.25-fe.tar.bz2


Index: wine-README-Fedora
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-README-Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-README-Fedora	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-README-Fedora	16 Nov 2006 07:55:23 -0000	1.2
@@ -1,15 +1,22 @@
-Wine directory structure used in Fedora Core Linux:
-===================================================
+Wine directory structure used in Fedora Linux:
+==============================================
 
-\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
-default. It is created with (empty) C:\windows and C:\windows\system
+${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for it 
+by default. It is created with (empty) C:\windows and C:\windows\system
 directories, needed to operate Wine without an existing Windows
-installation, if it doesn't already exists.
+installation, if it does not already exist.
 
 If you want to use Wine with an existing Windows installation that is
 mounted, for example, in /mnt/windows-c, change the symlink
-\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
+${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
 defaults set by installation.
 
-If you do this, you can safely remove \${HOME}/.wine/drive_c.
-(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)
+If you do this, you can safely remove ${HOME}/.wine/drive_c.
+(Alternatively, just mount your Windows partition to ${HOME}/.wine/drive_c.)
+
+Wine bugs:
+==========
+If you find a bug, please take the time to move your ${HOME}/.wine directory
+someplace and try with a fresh version (like mv ${HOME}/.wine{,-save}). If the
+bug is still there look trough https://bugzilla.redhat.com and see if the bug
+is already reported. In case it is not please report it.


Index: wine-notepad.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-notepad.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-notepad.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-notepad.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-regedit.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-regedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-regedit.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-regedit.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-uninstaller.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-uninstaller.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-uninstaller.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-uninstaller.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winecfg.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-winecfg.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winecfg.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winecfg.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winefile.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-winefile.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winefile.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winefile.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winhelp.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-winhelp.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winhelp.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winhelp.desktop	16 Nov 2006 07:55:23 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine.init
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine.init	2 Jan 2006 09:04:37 -0000	1.3
+++ wine.init	16 Nov 2006 07:55:23 -0000	1.4
@@ -11,10 +11,15 @@
 RETVAL=0
 
 start() {
-	echo -n $"Registering binary handler for Windows applications"
-	/sbin/modprobe binfmt_misc &>/dev/null
-	echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
-	echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+# fix bug on changing runlevels #213230
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+	    echo -n $"Binary handler for Windows applications already registered"
+	else	
+	    echo -n $"Registering binary handler for Windows applications"
+	    /sbin/modprobe binfmt_misc &>/dev/null
+	    echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	    echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	fi
 }
 
 stop() {


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wine.spec	28 Oct 2006 05:51:35 -0000	1.38
+++ wine.spec	16 Nov 2006 07:55:23 -0000	1.39
@@ -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.24
+Version:	0.9.25
 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.24-fe.tar.bz2
+Source0:        wine-0.9.25-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -515,7 +515,6 @@
 %{_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
@@ -657,6 +656,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/wine/twain.dll16
 %{_libdir}/wine/twain_32.dll.so
+%{_libdir}/wine/sane.ds.so
 
 %files capi
 %defattr(-,root,root,-)
@@ -691,6 +691,13 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* 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)
+
 * Sat Oct 28 2006 Andreas Bierfert 
 0.9.24-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Nov 16 07:55:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 00:55:52 -0700
Subject: rpms/wine/FC-6 .cvsignore, 1.25, 1.26 sources, 1.26,
	1.27 wine-README-Fedora, 1.1, 1.2 wine-notepad.desktop, 1.1,
	1.2 wine-regedit.desktop, 1.1, 1.2 wine-uninstaller.desktop, 1.1,
	1.2 wine-winecfg.desktop, 1.1, 1.2 wine-winefile.desktop, 1.1,
	1.2 wine-winhelp.desktop, 1.1, 1.2 wine.init, 1.3, 1.4 wine.spec,
	1.38, 1.39
Message-ID: <200611160755.kAG7tq4B022093@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22000/FC-6

Modified Files:
	.cvsignore sources wine-README-Fedora wine-notepad.desktop 
	wine-regedit.desktop wine-uninstaller.desktop 
	wine-winecfg.desktop wine-winefile.desktop 
	wine-winhelp.desktop wine.init wine.spec 
Log Message:
- version upgrade
- fix init script (#213230)
- fix twain subpackage content (#213396)
- create wine submenu (#205024)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	28 Oct 2006 05:51:29 -0000	1.25
+++ .cvsignore	16 Nov 2006 07:55:22 -0000	1.26
@@ -1 +1 @@
-wine-0.9.24-fe.tar.bz2
+wine-0.9.25-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	28 Oct 2006 05:51:29 -0000	1.26
+++ sources	16 Nov 2006 07:55:22 -0000	1.27
@@ -1 +1 @@
-1e1e10bec1cac8f2021b7d7a3e3ef5bd  wine-0.9.24-fe.tar.bz2
+4d26cc14b481f2ab7026c23d83086753  wine-0.9.25-fe.tar.bz2


Index: wine-README-Fedora
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-README-Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-README-Fedora	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-README-Fedora	16 Nov 2006 07:55:22 -0000	1.2
@@ -1,15 +1,22 @@
-Wine directory structure used in Fedora Core Linux:
-===================================================
+Wine directory structure used in Fedora Linux:
+==============================================
 
-\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
-default. It is created with (empty) C:\windows and C:\windows\system
+${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for it 
+by default. It is created with (empty) C:\windows and C:\windows\system
 directories, needed to operate Wine without an existing Windows
-installation, if it doesn't already exists.
+installation, if it does not already exist.
 
 If you want to use Wine with an existing Windows installation that is
 mounted, for example, in /mnt/windows-c, change the symlink
-\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
+${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
 defaults set by installation.
 
-If you do this, you can safely remove \${HOME}/.wine/drive_c.
-(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)
+If you do this, you can safely remove ${HOME}/.wine/drive_c.
+(Alternatively, just mount your Windows partition to ${HOME}/.wine/drive_c.)
+
+Wine bugs:
+==========
+If you find a bug, please take the time to move your ${HOME}/.wine directory
+someplace and try with a fresh version (like mv ${HOME}/.wine{,-save}). If the
+bug is still there look trough https://bugzilla.redhat.com and see if the bug
+is already reported. In case it is not please report it.


Index: wine-notepad.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-notepad.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-notepad.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-notepad.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-regedit.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-regedit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-regedit.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-regedit.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-uninstaller.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-uninstaller.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-uninstaller.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-uninstaller.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winecfg.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-winecfg.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winecfg.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winecfg.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winefile.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-winefile.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winefile.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winefile.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine-winhelp.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine-winhelp.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winhelp.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winhelp.desktop	16 Nov 2006 07:55:22 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Wine;


Index: wine.init
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine.init	2 Jan 2006 09:04:37 -0000	1.3
+++ wine.init	16 Nov 2006 07:55:22 -0000	1.4
@@ -11,10 +11,15 @@
 RETVAL=0
 
 start() {
-	echo -n $"Registering binary handler for Windows applications"
-	/sbin/modprobe binfmt_misc &>/dev/null
-	echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
-	echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+# fix bug on changing runlevels #213230
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+	    echo -n $"Binary handler for Windows applications already registered"
+	else	
+	    echo -n $"Registering binary handler for Windows applications"
+	    /sbin/modprobe binfmt_misc &>/dev/null
+	    echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	    echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	fi
 }
 
 stop() {


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-6/wine.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wine.spec	28 Oct 2006 05:51:29 -0000	1.38
+++ wine.spec	16 Nov 2006 07:55:22 -0000	1.39
@@ -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.24
+Version:	0.9.25
 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.24-fe.tar.bz2
+Source0:        wine-0.9.25-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -515,7 +515,6 @@
 %{_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
@@ -657,6 +656,7 @@
 %defattr(-,root,root,-)
 %{_libdir}/wine/twain.dll16
 %{_libdir}/wine/twain_32.dll.so
+%{_libdir}/wine/sane.ds.so
 
 %files capi
 %defattr(-,root,root,-)
@@ -691,6 +691,13 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* 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)
+
 * Sat Oct 28 2006 Andreas Bierfert 
 0.9.24-1
 - version upgrade



From fedora-extras-commits at redhat.com  Thu Nov 16 09:42:43 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 16 Nov 2006 02:42:43 -0700
Subject: fedora-security/audit fc5,1.394,1.395 fc6,1.146,1.147
Message-ID: <200611160942.kAG9gh6R028676@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28656

Modified Files:
	fc5 fc6 
Log Message:
Fix elinks CVE name



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- fc5	15 Nov 2006 19:08:05 -0000	1.394
+++ fc5	16 Nov 2006 09:42:40 -0000	1.395
@@ -1,9 +1,9 @@
-Up to date CVE as of CVE email 20061114
-Up to date FC5 as of 20061114
+Up to date CVE as of CVE email 20061115
+Up to date FC5 as of 20061115
 
 ** are items that need attention
 
-CVE-2006-5924 VULNERABLE (elinks) [#215734]
+CVE-2006-5925 VULNERABLE (elinks) [#215734]
 CVE-2006-5823 backport (kernel) [since FEDORA-2006-1221]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- fc6	15 Nov 2006 19:08:05 -0000	1.146
+++ fc6	16 Nov 2006 09:42:40 -0000	1.147
@@ -1,9 +1,9 @@
-Up to date CVE as of CVE email 20061114
-Up to date FC6 as of 20061114
+Up to date CVE as of CVE email 20061115
+Up to date FC6 as of 20061115
 
 ** are items that need attention
 
-CVE-2006-5924 ignore (elinks) no smbclient support
+CVE-2006-5925 ignore (elinks) no smbclient support
 CVE-2006-5823 backport (kernel) [since FEDORA-2006-1223]
 CVE-2006-5794 VULNERABLE (openssh, fixed 4.5) #214641
 CVE-2006-5783 ignore (firefox) disputed



From fedora-extras-commits at redhat.com  Thu Nov 16 11:03:11 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 16 Nov 2006 04:03:11 -0700
Subject: rpms/proftpd/devel proftpd-1.3.0-mod_tls.patch, NONE,
	1.1 proftpd.spec, 1.21, 1.22
Message-ID: <200611161103.kAGB3B2u002762@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2740

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.0-mod_tls.patch 
Log Message:
Include mod_tls patch (#214820 too).


proftpd-1.3.0-mod_tls.patch:

--- NEW FILE proftpd-1.3.0-mod_tls.patch ---
This is a possible fix Ralf S. Engelschall 
has made myself for the X.509 issue of mod_tls.c

Index: contrib/mod_tls.c
--- contrib/mod_tls.c.orig      2005-11-08 18:59:49 +0100
+++ contrib/mod_tls.c   2006-11-15 17:54:43 +0100
@@ -2421,6 +2421,8 @@
      datalen = BIO_get_mem_data(mem, &data);

   if (data) {
+    if (datalen > sizeof(buf)-1)
+        datalen = sizeof(buf)-1;
     memset(&buf, '\0', sizeof(buf));
     memcpy(buf, data, datalen);
     buf[datalen] = '\0';


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- proftpd.spec	13 Nov 2006 18:10:35 -0000	1.21
+++ proftpd.spec	16 Nov 2006 11:02:41 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -15,6 +15,7 @@
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
 Patch2: proftpd-1.3.0-cmdbufsize.patch
+Patch3: proftpd-1.3.0-mod_tls.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +69,7 @@
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
 %patch2 -p0 -b .cmdbufsize
+%patch3 -p0 -b .mod_tls
 
 
 %build
@@ -188,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Matthias Saou  1.3.0-9
+- Include mod_tls patch (#214820 too).
+
 * Mon Nov 13 2006 Matthias Saou  1.3.0-8
 - Include cmdbufsize patch (#214820).
 



From fedora-extras-commits at redhat.com  Thu Nov 16 15:24:33 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:24:33 -0700
Subject: owners owners.list,1.1971,1.1972
Message-ID: <200611161524.kAGFOXT6016235@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16219

Modified Files:
	owners.list 
Log Message:
Add emerald-themes


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1971
retrieving revision 1.1972
diff -u -r1.1971 -r1.1972
--- owners.list	16 Nov 2006 06:15:55 -0000	1.1971
+++ owners.list	16 Nov 2006 15:24:03 -0000	1.1972
@@ -361,6 +361,7 @@
 Fedora Extras|embryo|A C like scripting language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora at christoph-wickert.de|extras-qa at fedoraproject.org|
 Fedora Extras|emerald|Beryl OpenGL window and compositing manager window decorator|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|emerald-themes|Themes for Emerald, a Beryl OpenGL window and compositing manager window decorator|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 15:25:49 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:25:49 -0700
Subject: rpms/emerald-themes - New directory
Message-ID: <200611161525.kAGFPnAC016293@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16289/emerald-themes

Log Message:
Directory /cvs/extras/rpms/emerald-themes added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 15:25:50 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:25:50 -0700
Subject: rpms/emerald-themes/devel - New directory
Message-ID: <200611161525.kAGFPogd016307@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16289/emerald-themes/devel

Log Message:
Directory /cvs/extras/rpms/emerald-themes/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 15:26:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:26:01 -0700
Subject: rpms/emerald-themes Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611161526.kAGFQ1m9016338@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16332

Added Files:
	Makefile import.log 
Log Message:
Setup of module emerald-themes


--- NEW FILE Makefile ---
# Top level Makefile for module emerald-themes
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 Nov 16 15:26:07 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:26:07 -0700
Subject: rpms/emerald-themes/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611161526.kAGFQ78O016356@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16332/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module emerald-themes


--- 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 Nov 16 15:26:58 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:26:58 -0700
Subject: rpms/emerald-themes/devel emerald-themes.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611161526.kAGFQwp9016432@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	emerald-themes.spec 
Log Message:
auto-import emerald-themes-0.1.2-2.fc7 on branch devel from emerald-themes-0.1.2-2.fc7.src.rpm


--- NEW FILE emerald-themes.spec ---
Name:           emerald-themes
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        2%{?dist}

Summary:        Themes for Emerald, the window decorator for Beryl
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

BuildArch:      noarch

Requires:       beryl-core >= %{version}, emerald >= %{version}
BuildRequires:  libtool


%description
Emerald is themeable window decorator and compositing 
manager for Beryl. Launch Theme Manager from
beryl-manager to change themes.

This package contains themes for emerald.


%prep
%setup -q
#autoreconf -v --install

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*~" | xargs rm -f
chmod a+r $RPM_BUILD_ROOT%{_datadir}/emerald/themes/Scaled_Black_Mod/*
rm -f $RPM_BUILD_ROOT%{_datadir}/emerald/themes/import.sh

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_datadir}/emerald/*


%changelog
* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarball, now that there is one
- Remove import.sh, only used during build

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Tue Oct 31 2006 Jarod Wilson  0.1.1-2
- Fix perms on Scaled_Black_Mod theme
- Add missing BR: libtool

* Thu Oct 26 2006 Jarod Wilson  0.1.1-1
- New upstream release
- Require beryl-core and emerald of at least the same version
- Move autoreconf bits to prep section

* Tue Oct 03 2006 Jarod Wilson  0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emerald-themes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 15:26:07 -0000	1.1
+++ .cvsignore	16 Nov 2006 15:26:28 -0000	1.2
@@ -0,0 +1 @@
+emerald-themes-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emerald-themes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 15:26:07 -0000	1.1
+++ sources	16 Nov 2006 15:26:28 -0000	1.2
@@ -0,0 +1 @@
+c5aa35e30d3476f05a469f1baac16341  emerald-themes-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 15:26:57 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 08:26:57 -0700
Subject: rpms/emerald-themes import.log,1.1,1.2
Message-ID: <200611161526.kAGFQvhP016428@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/emerald-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16396

Modified Files:
	import.log 
Log Message:
auto-import emerald-themes-0.1.2-2.fc7 on branch devel from emerald-themes-0.1.2-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/emerald-themes/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 15:26:01 -0000	1.1
+++ import.log	16 Nov 2006 15:26:27 -0000	1.2
@@ -0,0 +1 @@
+emerald-themes-0_1_2-2_fc7:HEAD:emerald-themes-0.1.2-2.fc7.src.rpm:1163690784



From fedora-extras-commits at redhat.com  Thu Nov 16 16:22:28 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 16 Nov 2006 09:22:28 -0700
Subject: rpms/swaks/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 swaks.spec, 
	1.3, 1.4
Message-ID: <200611161622.kAGGMSdc019784@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/swaks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19764

Modified Files:
	.cvsignore sources swaks.spec 
Log Message:
* Thu Nov 16 2006 Jason L Tibbitts III  - 20061116.0-1
- Update to 20061116.0.
- Add perl(Digest::SHA1) requirement.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/swaks/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2006 01:40:04 -0000	1.2
+++ .cvsignore	16 Nov 2006 16:21:57 -0000	1.3
@@ -1 +1 @@
-swaks.20060621.0
+swaks.20061116.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/swaks/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2006 01:40:04 -0000	1.2
+++ sources	16 Nov 2006 16:21:57 -0000	1.3
@@ -1 +1 @@
-c2ae5a5466e663bb7649377c6951fad6  swaks.20060621.0
+0be5dfe89ec415f0296680d61b3e4849  swaks.20061116.0


Index: swaks.spec
===================================================================
RCS file: /cvs/extras/rpms/swaks/devel/swaks.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- swaks.spec	1 Sep 2006 01:40:04 -0000	1.3
+++ swaks.spec	16 Nov 2006 16:21:57 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           swaks
-Version:        20060621.0
+Version:        20061116.0
 Release:        1%{?dist}
 Summary:        Command-line SMTP transaction tester
 
@@ -11,6 +11,7 @@
 BuildArch:	noarch
 
 Requires:	perl(Authen::DigestMD5)
+Requires:	perl(Digest::SHA1)
 Requires:	perl(Net::DNS)
 Requires:	perl(Net::SSLeay)
 Requires:	perl(Time::HiRes)
@@ -40,6 +41,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 16 2006 Jason L Tibbitts III  - 20061116.0-1
+- Update to 20061116.0.
+- Add perl(Digest::SHA1) requirement.
+
 * Thu Aug 31 2006 Jason L Tibbitts III  - 20060621.0-1
 - Update to 20060621.0.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 16:24:04 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 16 Nov 2006 09:24:04 -0700
Subject: rpms/swaks/devel swaks.20050709.1,1.1,NONE
Message-ID: <200611161624.kAGGO4XC019815@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/swaks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19810

Removed Files:
	swaks.20050709.1 
Log Message:
Remove errant file.



--- swaks.20050709.1 DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 16 16:57:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 09:57:46 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200611161657.kAGGvkDZ020188@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20137/FC-5

Modified Files:
	perl-Moose.spec sources 
Log Message:
update to 0.17



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Moose.spec	6 Nov 2006 18:49:27 -0000	1.6
+++ perl-Moose.spec	16 Nov 2006 16:57:15 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.15
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-1
+- update to 0.17
+
 * Mon Nov 06 2006 Chris Weyl  0.15-1
 - update to 0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Nov 2006 18:49:27 -0000	1.5
+++ sources	16 Nov 2006 16:57:15 -0000	1.6
@@ -1 +1 @@
-0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz
+42de30613ed0f127a88bd65876eddd27  Moose-0.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 16:57:46 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 09:57:46 -0700
Subject: rpms/perl-Moose/FC-6 perl-Moose.spec,1.6,1.7 sources,1.5,1.6
Message-ID: <200611161657.kAGGvkNC020192@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20137/FC-6

Modified Files:
	perl-Moose.spec sources 
Log Message:
update to 0.17



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-6/perl-Moose.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Moose.spec	6 Nov 2006 18:49:27 -0000	1.6
+++ perl-Moose.spec	16 Nov 2006 16:57:16 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.15
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-1
+- update to 0.17
+
 * Mon Nov 06 2006 Chris Weyl  0.15-1
 - update to 0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Nov 2006 18:49:27 -0000	1.5
+++ sources	16 Nov 2006 16:57:16 -0000	1.6
@@ -1 +1 @@
-0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz
+42de30613ed0f127a88bd65876eddd27  Moose-0.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 16:57:47 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 09:57:47 -0700
Subject: rpms/perl-Moose/devel .cvsignore, 1.5, 1.6 perl-Moose.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200611161657.kAGGvl5p020197@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20137/devel

Modified Files:
	.cvsignore perl-Moose.spec sources 
Log Message:
update to 0.17



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Nov 2006 18:49:28 -0000	1.5
+++ .cvsignore	16 Nov 2006 16:57:17 -0000	1.6
@@ -1 +1 @@
-Moose-0.15.tar.gz
+Moose-0.17.tar.gz


Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Moose.spec	6 Nov 2006 18:49:28 -0000	1.6
+++ perl-Moose.spec	16 Nov 2006 16:57:17 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Moose
-Version:        0.15
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-1
+- update to 0.17
+
 * Mon Nov 06 2006 Chris Weyl  0.15-1
 - update to 0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Nov 2006 18:49:28 -0000	1.5
+++ sources	16 Nov 2006 16:57:17 -0000	1.6
@@ -1 +1 @@
-0249590cebe735f6abea29399cfdf2a4  Moose-0.15.tar.gz
+42de30613ed0f127a88bd65876eddd27  Moose-0.17.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 17:18:10 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 16 Nov 2006 10:18:10 -0700
Subject: rpms/jd/devel .cvsignore, 1.17, 1.18 jd.spec, 1.24, 1.25 sources,
	1.17, 1.18
Message-ID: <200611161718.kAGHIAQ7023467@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23443

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Nov 16 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061116
- cvs 061116 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	14 Nov 2006 13:50:57 -0000	1.17
+++ .cvsignore	16 Nov 2006 17:17:39 -0000	1.18
@@ -1 +1 @@
-jd-1.8.0-061114.tgz
+jd-1.8.1-cvs061116.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jd.spec	14 Nov 2006 13:50:58 -0000	1.24
+++ jd.spec	16 Nov 2006 17:17:39 -0000	1.25
@@ -9,8 +9,8 @@
 ##########################################
 # Defined by upsteam
 #
-%define         main_ver      1.8.0
-%define         strtag        061114
+%define         main_ver      1.8.1
+%define         strtag        cvs061116
 %define         repoid        22722
 
 
@@ -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}
@@ -103,6 +103,9 @@
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Nov 16 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061116
+- cvs 061116 (23:59 JST)
+
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	14 Nov 2006 13:50:58 -0000	1.17
+++ sources	16 Nov 2006 17:17:39 -0000	1.18
@@ -1 +1 @@
-1dc9ecba8d7430af27ed461155eb6708  jd-1.8.0-061114.tgz
+5861afcc6d6894864510a8768ce3e4fd  jd-1.8.1-cvs061116.tgz



From fedora-extras-commits at redhat.com  Thu Nov 16 17:22:03 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 16 Nov 2006 10:22:03 -0700
Subject: rpms/gossip/devel .cvsignore, 1.16, 1.17 gossip.spec, 1.31,
	1.32 sources, 1.16, 1.17
Message-ID: <200611161722.kAGHM3ct023550@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23530

Modified Files:
	.cvsignore gossip.spec sources 
Log Message:
* Thu Nov 16 2006 Brian Pepple  - 0.19-1
- Update to 0.19.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Oct 2006 00:31:50 -0000	1.16
+++ .cvsignore	16 Nov 2006 17:21:32 -0000	1.17
@@ -1 +1 @@
-gossip-0.18.tar.bz2
+gossip-0.19.tar.bz2


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gossip.spec	17 Oct 2006 00:31:50 -0000	1.31
+++ gossip.spec	16 Nov 2006 17:21:33 -0000	1.32
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           gossip
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        Gnome Jabber Client
 
@@ -126,6 +126,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Brian Pepple  - 0.19-1
+- Update to 0.19.
+
 * Mon Oct 16 2006 Brian Pepple  - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gossip/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Oct 2006 00:31:50 -0000	1.16
+++ sources	16 Nov 2006 17:21:33 -0000	1.17
@@ -1 +1 @@
-bb5be4bcb259c36c64e1809b665f7de6  gossip-0.18.tar.bz2
+49c60c4467d17948f7243a169c65775c  gossip-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 17:29:37 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 16 Nov 2006 10:29:37 -0700
Subject: rpms/perl-File-MimeInfo/devel perl-File-MimeInfo.spec,1.1,1.2
Message-ID: <200611161729.kAGHTbdS023656@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23640

Modified Files:
	perl-File-MimeInfo.spec 
Log Message:
* Thu Nov 16 2006 Patrice Dumas  0.13-3
- add a Requires on shared-mime-info (Bug #215972)



Index: perl-File-MimeInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/devel/perl-File-MimeInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-MimeInfo.spec	14 Oct 2006 21:42:51 -0000	1.1
+++ perl-File-MimeInfo.spec	16 Nov 2006 17:29:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-File-MimeInfo
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Determine file type and open application
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(File::BaseDir) perl(File::DesktopEntry)
+Requires:       shared-mime-info
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas  0.13-3
+- add a Requires on shared-mime-info (Bug #215972)
+
 * Wed Oct 11 2006 Patrice Dumas  0.13-2
 - add an option to launch mimeopen non interactively
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:31:29 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 16 Nov 2006 10:31:29 -0700
Subject: rpms/ochusha/devel .cvsignore, 1.6, 1.7 ochusha.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200611161731.kAGHVT6S023803@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23740

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Thu Nov 16 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061116
- Update to 0.5.99.63.3 cvs 061116



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Nov 2006 15:54:01 -0000	1.6
+++ .cvsignore	16 Nov 2006 17:30:59 -0000	1.7
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061114.tar.bz2
+ochusha-0.5.99.63.3-cvs061116.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ochusha.spec	14 Nov 2006 15:54:01 -0000	1.6
+++ ochusha.spec	16 Nov 2006 17:30:59 -0000	1.7
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.3
-%define              strtag          cvs061114
+%define              strtag          cvs061116
 
 %define              vendor_rel      2
 %define              pre_release     1
@@ -150,8 +150,8 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Tue Nov 14 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061114
-- Update to 0.5.99.63.3 cvs 061114
+* Thu Nov 16 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061116
+- Update to 0.5.99.63.3 cvs 061116
 
 * Fri Nov 03 2006  0.5.99.62-1
 - Version down.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Nov 2006 15:54:01 -0000	1.6
+++ sources	16 Nov 2006 17:30:59 -0000	1.7
@@ -1 +1 @@
-2ffa3fb15ca8b3b1f75f0d7400cc3e8a  ochusha-0.5.99.63.3-cvs061114.tar.bz2
+a4f068bb0c128688a050bda77c1a31cb  ochusha-0.5.99.63.3-cvs061116.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 17:31:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 10:31:36 -0700
Subject: rpms/perl-Moose/FC-5 perl-Moose.spec,1.7,1.8
Message-ID: <200611161731.kAGHVaY0023808@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738/FC-5

Modified Files:
	perl-Moose.spec 
Log Message:
add new conditional br's for tests



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-5/perl-Moose.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Moose.spec	16 Nov 2006 16:57:15 -0000	1.7
+++ perl-Moose.spec	16 Nov 2006 17:31:06 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Moose
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -27,6 +27,8 @@
 # commented out as Locale::US's license is ambiguous at the moment, precluding
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
+# optional test #4 (yes, I know IO::File is core)
+BuildRequires:  perl(IO::File), perl(IO::String)
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -75,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-2
+- add IO::File and IO::String to br's for testing
+
 * Thu Nov 16 2006 Chris Weyl  0.17-1
 - update to 0.17
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:31:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 10:31:37 -0700
Subject: rpms/perl-Moose/FC-6 perl-Moose.spec,1.7,1.8
Message-ID: <200611161731.kAGHVbEm023811@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738/FC-6

Modified Files:
	perl-Moose.spec 
Log Message:
add new conditional br's for tests



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/FC-6/perl-Moose.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Moose.spec	16 Nov 2006 16:57:16 -0000	1.7
+++ perl-Moose.spec	16 Nov 2006 17:31:07 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Moose
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -27,6 +27,8 @@
 # commented out as Locale::US's license is ambiguous at the moment, precluding
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
+# optional test #4 (yes, I know IO::File is core)
+BuildRequires:  perl(IO::File), perl(IO::String)
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -75,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-2
+- add IO::File and IO::String to br's for testing
+
 * Thu Nov 16 2006 Chris Weyl  0.17-1
 - update to 0.17
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:31:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 16 Nov 2006 10:31:43 -0700
Subject: rpms/perl-Moose/devel perl-Moose.spec,1.7,1.8
Message-ID: <200611161731.kAGHVh2P023814@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Moose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738/devel

Modified Files:
	perl-Moose.spec 
Log Message:
add new conditional br's for tests



Index: perl-Moose.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Moose/devel/perl-Moose.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Moose.spec	16 Nov 2006 16:57:17 -0000	1.7
+++ perl-Moose.spec	16 Nov 2006 17:31:13 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-Moose
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Complete modern object system for Perl 5
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -27,6 +27,8 @@
 # commented out as Locale::US's license is ambiguous at the moment, precluding
 # packaging it.
 #BuildRequires:  perl(Regexp::Common), perl(Locale::US)
+# optional test #4 (yes, I know IO::File is core)
+BuildRequires:  perl(IO::File), perl(IO::String)
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -75,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Chris Weyl  0.17-2
+- add IO::File and IO::String to br's for testing
+
 * Thu Nov 16 2006 Chris Weyl  0.17-1
 - update to 0.17
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:33:38 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 16 Nov 2006 10:33:38 -0700
Subject: check-mirrors check-mirrors.py, 1.32, 1.33 return-mirrorlist.py,
	1.19, 1.20
Message-ID: <200611161733.kAGHXcbn023888@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23868

Modified Files:
	check-mirrors.py return-mirrorlist.py 
Log Message:
Changes submitted by Mike Canann


Index: check-mirrors.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- check-mirrors.py	26 Oct 2006 20:57:52 -0000	1.32
+++ check-mirrors.py	16 Nov 2006 17:33:36 -0000	1.33
@@ -74,7 +74,7 @@
 
 class RepoDB:
     def __init__(self, db):
-        (self.dbconn, self.dbcursor) = self.connect(db)
+        (self.dbconn, self.dbcursor) = self.connect(db, timeout=25.0)
         self.initdb(0)
         return None
 


Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- return-mirrorlist.py	3 Nov 2006 20:55:06 -0000	1.19
+++ return-mirrorlist.py	16 Nov 2006 17:33:36 -0000	1.20
@@ -148,7 +148,7 @@
 
     def connect(self):
         try:
-            conn = sqlite.connect(self.db)
+            conn = sqlite.connect(self.db, timeout=20.0)
             cursor = conn.cursor()
         except sqlite.Error, errmsg:
             errorprint('Failed to connect to database: %s' % db)
@@ -305,10 +305,10 @@
         else:
             if form.has_key('top'):
                 if not mirrors.printTopMirrors(form['top'].value):
-                    print canonical
+                    print "%s" % re.sub('\$ARCH', arch, canonical)
             else:
                 if not mirrors.printMirrors():
-                    print canonical
+                    print "%s" % re.sub('\$ARCH', arch, canonical)
             
 #        fo = open(return_file, 'r')
 #        for line in fo.readlines():



From fedora-extras-commits at redhat.com  Thu Nov 16 17:37:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 16 Nov 2006 10:37:38 -0700
Subject: rpms/perl-File-MimeInfo/FC-5 perl-File-MimeInfo.spec,1.1,1.2
Message-ID: <200611161737.kAGHbcfV023931@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23899/FC-5

Modified Files:
	perl-File-MimeInfo.spec 
Log Message:
* Thu Nov 16 2006 Patrice Dumas  0.13-3
- add a Requires on shared-mime-info (Bug #215972)



Index: perl-File-MimeInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/FC-5/perl-File-MimeInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-MimeInfo.spec	14 Oct 2006 21:42:51 -0000	1.1
+++ perl-File-MimeInfo.spec	16 Nov 2006 17:37:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-File-MimeInfo
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Determine file type and open application
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(File::BaseDir) perl(File::DesktopEntry)
+Requires:       shared-mime-info
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas  0.13-3
+- add a Requires on shared-mime-info (Bug #215972)
+
 * Wed Oct 11 2006 Patrice Dumas  0.13-2
 - add an option to launch mimeopen non interactively
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:37:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 16 Nov 2006 10:37:39 -0700
Subject: rpms/perl-File-MimeInfo/FC-6 perl-File-MimeInfo.spec,1.1,1.2
Message-ID: <200611161737.kAGHbdE1023934@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-File-MimeInfo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23899/FC-6

Modified Files:
	perl-File-MimeInfo.spec 
Log Message:
* Thu Nov 16 2006 Patrice Dumas  0.13-3
- add a Requires on shared-mime-info (Bug #215972)



Index: perl-File-MimeInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-MimeInfo/FC-6/perl-File-MimeInfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-File-MimeInfo.spec	14 Oct 2006 21:42:51 -0000	1.1
+++ perl-File-MimeInfo.spec	16 Nov 2006 17:37:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-File-MimeInfo
 Version:        0.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Determine file type and open application
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(File::BaseDir) perl(File::DesktopEntry)
+Requires:       shared-mime-info
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +51,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Nov 16 2006 Patrice Dumas  0.13-3
+- add a Requires on shared-mime-info (Bug #215972)
+
 * Wed Oct 11 2006 Patrice Dumas  0.13-2
 - add an option to launch mimeopen non interactively
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:58:36 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 16 Nov 2006 10:58:36 -0700
Subject: rpms/telepathy-butterfly/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 telepathy-butterfly.spec, 1.3, 1.4
Message-ID: <200611161758.kAGHwaJq024110@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24088

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Thu Nov 16 2006 Brian Pepple  - 0.1.3-1
- Update to 0.1.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Oct 2006 17:07:49 -0000	1.4
+++ .cvsignore	16 Nov 2006 17:58:05 -0000	1.5
@@ -1 +1 @@
-telepathy-butterfly-0.1.2.tar.gz
+telepathy-butterfly-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2006 17:07:49 -0000	1.4
+++ sources	16 Nov 2006 17:58:05 -0000	1.5
@@ -1 +1 @@
-e52f238d9716b45961d28b424a9c0e6e  telepathy-butterfly-0.1.2.tar.gz
+288494daa096eeb685d57bdad8bc5b5f  telepathy-butterfly-0.1.3.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/devel/telepathy-butterfly.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-butterfly.spec	8 Oct 2006 17:07:49 -0000	1.3
+++ telepathy-butterfly.spec	16 Nov 2006 17:58:05 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Brian Pepple  - 0.1.3-1
+- Update to 0.1.3.
+
 * Sun Oct  8 2006 Brian Pepple  - 0.1.2-1
 - Update to 0.1.2.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 17:59:27 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 16 Nov 2006 10:59:27 -0700
Subject: check-mirrors check-mirrors.py,1.33,1.34
Message-ID: <200611161759.kAGHxRjb024183@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24165

Modified Files:
	check-mirrors.py 
Log Message:
oops


Index: check-mirrors.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- check-mirrors.py	16 Nov 2006 17:33:36 -0000	1.33
+++ check-mirrors.py	16 Nov 2006 17:59:24 -0000	1.34
@@ -74,13 +74,13 @@
 
 class RepoDB:
     def __init__(self, db):
-        (self.dbconn, self.dbcursor) = self.connect(db, timeout=25.0)
+        (self.dbconn, self.dbcursor) = self.connect(db)
         self.initdb(0)
         return None
 
     def connect(self, db):
         try:
-            conn = sqlite.connect(db)
+            conn = sqlite.connect(db, timeout=25.0)
             cursor = conn.cursor()
         except sqlite.Error, errmsg:
             errorprint('Failed to connect to database: %s' % db)



From fedora-extras-commits at redhat.com  Thu Nov 16 18:03:03 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 16 Nov 2006 11:03:03 -0700
Subject: rpms/telepathy-gabble/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 telepathy-gabble.spec, 1.14, 1.15
Message-ID: <200611161803.kAGI33Jk027227@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-gabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27207

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Log Message:
* Thu Nov 16 2006 Brian Pepple  - 0.4.5-1
- Update to 0.4.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	4 Nov 2006 14:01:01 -0000	1.14
+++ .cvsignore	16 Nov 2006 18:02:32 -0000	1.15
@@ -1 +1 @@
-telepathy-gabble-0.4.3.tar.gz
+telepathy-gabble-0.4.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	4 Nov 2006 14:01:01 -0000	1.14
+++ sources	16 Nov 2006 18:02:32 -0000	1.15
@@ -1 +1 @@
-fdf8fdb60a29243bff32c46fc707ab4c  telepathy-gabble-0.4.3.tar.gz
+225c8ee2e71818c3be4b4ca9b8d8a988  telepathy-gabble-0.4.5.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-gabble/devel/telepathy-gabble.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- telepathy-gabble.spec	4 Nov 2006 14:01:01 -0000	1.14
+++ telepathy-gabble.spec	16 Nov 2006 18:02:32 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.4.3
+Version:        0.4.5
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Brian Pepple  - 0.4.5-1
+- Update to 0.4.5.
+
 * Sat Nov  4 2006 Brian Pepple  - 0.4.3-1
 - Update to 0.4.3.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 18:53:18 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:53:18 -0700
Subject: owners owners.list,1.1972,1.1973
Message-ID: <200611161853.kAGIrIAS027777@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27761

Modified Files:
	owners.list 
Log Message:
Add zabbix


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1972
retrieving revision 1.1973
diff -u -r1.1972 -r1.1973
--- owners.list	16 Nov 2006 15:24:03 -0000	1.1972
+++ owners.list	16 Nov 2006 18:52:47 -0000	1.1973
@@ -2533,6 +2533,7 @@
 Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 Fedora Extras|z88dk|Z80 cross compiler|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|zabbix|Open-source monitoring solution for your IT infrastructure|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|zaptel|Tools and libraries for using/configuring/monitoring Zapata telephony interfaces|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|zasx|Asteroid like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 16 18:55:37 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:55:37 -0700
Subject: rpms/zabbix - New directory
Message-ID: <200611161855.kAGItb0l027838@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27834/zabbix

Log Message:
Directory /cvs/extras/rpms/zabbix added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 18:55:43 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:55:43 -0700
Subject: rpms/zabbix/devel - New directory
Message-ID: <200611161855.kAGIth7F027852@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27834/zabbix/devel

Log Message:
Directory /cvs/extras/rpms/zabbix/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 18:55:55 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:55:55 -0700
Subject: rpms/zabbix Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611161855.kAGItttW027883@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27877

Added Files:
	Makefile import.log 
Log Message:
Setup of module zabbix


--- NEW FILE Makefile ---
# Top level Makefile for module zabbix
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 Nov 16 18:56:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:56:01 -0700
Subject: rpms/zabbix/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611161856.kAGIu1JD027901@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27877/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zabbix


--- 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 Nov 16 18:57:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:57:01 -0700
Subject: rpms/zabbix import.log,1.1,1.2
Message-ID: <200611161857.kAGIv1WV028032@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27996

Modified Files:
	import.log 
Log Message:
auto-import zabbix-1.1.4-2.fc7 on branch devel from zabbix-1.1.4-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zabbix/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 18:55:55 -0000	1.1
+++ import.log	16 Nov 2006 18:56:30 -0000	1.2
@@ -0,0 +1 @@
+zabbix-1_1_4-2_fc7:HEAD:zabbix-1.1.4-2.fc7.src.rpm:1163703387



From fedora-extras-commits at redhat.com  Thu Nov 16 18:57:01 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 11:57:01 -0700
Subject: rpms/zabbix/devel zabbix-agent.init, NONE, 1.1 zabbix-logrotate.in, 
	NONE, 1.1 zabbix-server.init, NONE, 1.1 zabbix-web.conf, NONE,
	1.1 zabbix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611161857.kAGIv1Fk028036@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27996/devel

Modified Files:
	.cvsignore sources 
Added Files:
	zabbix-agent.init zabbix-logrotate.in zabbix-server.init 
	zabbix-web.conf zabbix.spec 
Log Message:
auto-import zabbix-1.1.4-2.fc7 on branch devel from zabbix-1.1.4-2.fc7.src.rpm


--- NEW FILE zabbix-agent.init ---
#! /bin/sh
#
# chkconfig: - 85 15
# description: zabbix agent daemon
#

# zabbix details
ZABBIX_AGENTD=/usr/bin/zabbix_agentd
CONF=/etc/zabbix/zabbix_agentd.conf
PIDFILE=/var/run/zabbix-agent.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $ZABBIX_AGENTD ] || exit 0
[ -e $CONF ] || exit 0

RETVAL=0

case "$1" in
    start)
        echo -n "Starting zabbix agent: "
        daemon $ZABBIX_AGENTD -c $CONF
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix-agent
        ;;
    stop)
        echo -n "Shutting down zabbix agent: "
        killproc zabbix_agentd
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix-agent
        ;;
    restart|reload)
        $0 stop
        $0 start
        RETVAL=$?
        ;;
    status)
        status zabbix_agentd
        RETVAL=$?
        ;;
    *)
	echo "Usage: $0 {start|stop|restart|reload|status}"
	exit 1
	;;
esac

exit $RETVAL



--- NEW FILE zabbix-logrotate.in ---
/var/log/zabbix/zabbix_COMPONENT.log {
	missingok
	monthly
	notifempty
	compress
	create 0664 zabbix zabbix
}


--- NEW FILE zabbix-server.init ---
#! /bin/sh
#
# chkconfig: - 85 15
# description: zabbix server daemon
#

# zabbix details
ZABBIX=/usr/bin/zabbix_server
CONF=/etc/zabbix/zabbix_server.conf
PIDFILE=/var/run/zabbix.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $ZABBIX ] || exit 0
[ -e $CONF ] || exit 0

RETVAL=0

case "$1" in
    start)
        echo -n "Starting zabbix server: "
        daemon $ZABBIX -c $CONF
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix
        ;;
    stop)
        echo -n "Shutting down zabbix server: "
        killproc zabbix_server
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix
        ;;
    restart|reload)
        $0 stop
        $0 start
        RETVAL=$?
        ;;
    status)
        status zabbix_server
        RETVAL=$?
        ;;
    *)
	echo "Usage: $0 {start|stop|restart|reload|status}"
	exit 1
	;;
esac

exit $RETVAL



--- NEW FILE zabbix-web.conf ---
#
# Zabbix monitoring system php web frontend
#

Alias /zabbix /usr/share/zabbix


    Options FollowSymLinks
    AllowOverride None
    Order allow,deny
    Allow from all



    Order deny,allow
    Deny from all
    
        Order deny,allow
        Deny from all
    



    Order deny,allow
    Deny from all
    
        Order deny,allow
        Deny from all
    



--- NEW FILE zabbix.spec ---
Name:           zabbix
Version:        1.1.4
Release:        2%{?dist}
Summary:        Open-source monitoring solution for your IT infrastructure

Group:          Applications/Internet
License:        GPL
URL:            http://www.zabbix.com/
Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Source1:        zabbix-web.conf
Source2:        zabbix-server.init
Source3:        zabbix-agent.init
Source4:        zabbix-logrotate.in
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%define database mysql
%define zdb mysql
%define with_postgresql %{?_with_postgresql: 1} %{?!_with_postgresql: 0}

# Zabbix can only be built with mysql -or- postgresql
# support. We build with mysql by default, but you can
# pass --with postgresql to build with postgresql instead.
%if %{with_postgresql}
%define database postgresql
%define zdb pgsql
%endif

BuildRequires:  %{database}-devel, net-snmp-devel
BuildRequires:  openldap-devel, gnutls-devel
Requires:       logrotate, fping, net-snmp-libs
Requires(pre):      /usr/sbin/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig
Requires(preun):    /sbin/service

%description
ZABBIX is software that monitors numerous parameters of a
network and the health and integrity of servers. ZABBIX
uses a flexible notification mechanism that allows users
to configure e-mail based alerts for virtually any event.
This allows a fast reaction to server problems. ZABBIX
offers excellent reporting and data visualisation features
based on the stored data. This makes ZABBIX ideal for
capacity planning.

ZABBIX supports both polling and trapping. All ZABBIX
reports and statistics, as well as configuration
parameters are accessed through a web-based front end. A
web-based front end ensures that the status of your network
and the health of your servers can be assessed from any
location. Properly configured, ZABBIX can play an important
role in monitoring IT infrastructure. This is equally true
for small organisations with a few servers and for large
companies with a multitude of servers.


%package agent
Summary:        Zabbix Agent
Group:          Applications/Internet
Requires:       logrotate
Requires(pre):      /usr/sbin/useradd
Requires(post):     /sbin/chkconfig
Requires(preun):    /sbin/chkconfig
Requires(preun):    /sbin/service

%description agent
The zabbix client agent, to be installed on monitored systems.

%package web
Summary:        Zabbix Web Frontend
Group:          Applications/Internet
Requires:       php-%{zdb}, php-gd

%description web
The php frontend to display the zabbix web interface.

%prep
%setup -q

# fix up some lib64 issues
%{__perl} -pi.orig -e 's|_LIBDIR=/usr/lib|_LIBDIR=%{_libdir}|g' \
    configure

# fix up pt_br
%{__chmod} a-x frontends/php/include/locales/pt_br.inc.php
%{__sed} -i 's/\r//' frontends/php/include/locales/pt_br.inc.php

%build
%configure \
    --enable-server \
    --enable-agent \
    --with-%{zdb} \
    --with-net-snmp \
    --with-ldap \
    --disable-static

# --disable-static is partially broken atm,
# -static still gets into CFLAGS, so fix up in make
# (and even then, .a files still show their face...)
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
# set up some required directories
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
mkdir -p $RPM_BUILD_ROOT%{_datadir}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
# php frontend
cp -a frontends/php $RPM_BUILD_ROOT%{_datadir}/%{name}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/include/db.inc.php \
    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
ln -s ../../../..%{_sysconfdir}/%{name}/db.inc.php \
    $RPM_BUILD_ROOT%{_datadir}/%{name}/include/db.inc.php
# kill off .htaccess files, options set in SOURCE1
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/.htaccess
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/include/classes/.htaccess
# drop config files in place
install -m 0644 misc/conf/zabbix_agent.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
cat misc/conf/zabbix_agentd.conf | sed \
    -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix_agentd.pid|g' \
    -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|g' \
    > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_agentd.conf
cat misc/conf/zabbix_server.conf | sed \
    -e 's|PidFile=.*|PidFile=%{_localstatedir}/run/zabbix/zabbix.pid|g' \
    -e 's|LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_server.log|g' \
    -e 's|AlertScriptsPath=/home/zabbix/bin/|AlertScriptsPath=%{_localstatedir}/lib/zabbix/|g' \
    -e 's|DBUser=root|DBUser=zabbix|g' \
    -e 's|DBSocket=/tmp/mysql.sock|DBSocket=%{_localstatedir}/lib/%{zdb}/%{zdb}.sock|g' \
    > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/zabbix_server.conf
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
# log rotation
cat %{SOURCE4} | sed -e 's|COMPONENT|server|g' > \
     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix
cat %{SOURCE4} | sed -e 's|COMPONENT|agentd|g' > \
     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent
# init scripts
install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix
install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent

make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_libdir}/libzbx*.a

%clean
rm -rf $RPM_BUILD_ROOT

%pre
# Add the "zabbix" user
/usr/sbin/useradd -c "Zabbix Monitoring System" \
        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} zabbix 2> /dev/null || :

%pre agent
# Add the "zabbix" user
/usr/sbin/useradd -c "Zabbix Monitoring System" \
        -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} zabbix 2> /dev/null || :

%post
/sbin/chkconfig --add zabbix

%post agent
/sbin/chkconfig --add zabbix-agent

%preun
if [ "$1" = 0 ]
then
  /sbin/service zabbix stop >/dev/null 2>&1 || :
  /sbin/chkconfig --del zabbix
fi

%preun agent
if [ "$1" = 0 ]
then
  /sbin/service zabbix-agent stop >/dev/null 2>&1 || :
  /sbin/chkconfig --del zabbix-agent
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ NEWS README
%doc create/data create/%{database}
%dir %{_sysconfdir}/%{name}
%{_bindir}/zabbix_server
%{_sysconfdir}/init.d/zabbix
%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix
%config(noreplace) %{_sysconfdir}/%{name}/zabbix_server.conf
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{name}
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{name}

%files agent
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ NEWS README
%dir %{_sysconfdir}/%{name}
%{_bindir}/zabbix_agent
%{_bindir}/zabbix_agentd
%{_bindir}/zabbix_sender
%{_bindir}/zabbix_get
%{_sysconfdir}/init.d/zabbix-agent
%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent
%config(noreplace) %{_sysconfdir}/%{name}/zabbix_agent.conf
%config(noreplace) %{_sysconfdir}/%{name}/zabbix_agentd.conf
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{name}
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{name}

%files web
%defattr(-,root,root,-)
%doc README
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/db.inc.php
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%{_datadir}/%{name}

%changelog
* Thu Nov 16 2006 Jarod Wilson  1.1.4-2
- Fix up pt_br
- Add Req-pre on useradd

* Wed Nov 15 2006 Jarod Wilson  1.1.4-1
- Update to 1.1.4

* Tue Nov 14 2006 Jarod Wilson  1.1.3-3
- Add BR: gnutls-devel, R: net-snmp-libs

* Tue Nov 14 2006 Jarod Wilson  1.1.3-2
- Fix php-pgsql Requires

* Tue Nov 14 2006 Jarod Wilson  1.1.3-1
- Update to 1.1.3

* Mon Oct 02 2006 Jarod Wilson  1.1.2-1
- Update to 1.1.2
- Enable alternate building with postgresql support

* Thu Aug 17 2006 Jarod Wilson  1.1.1-2
- Yank out Requires: mysql-server
- Add Requires: for php-gd and fping

* Tue Aug 15 2006 Jarod Wilson  1.1.1-1
- Update to 1.1.1
- More macroification
- Fix up zabbix-web Requires:
- Prep for enabling postgres support

* Thu Jul 27 2006 Jarod Wilson  1.1-2
- Add Requires: on chkconfig and service
- Remove openssl-devel from BR, mysql-devel pulls it in
- Alter scriptlets to match Fedora conventions

* Tue Jul 11 2006 Jarod Wilson  1.1-1
- Initial build for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zabbix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 18:56:01 -0000	1.1
+++ .cvsignore	16 Nov 2006 18:56:31 -0000	1.2
@@ -0,0 +1 @@
+zabbix-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zabbix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 18:56:01 -0000	1.1
+++ sources	16 Nov 2006 18:56:31 -0000	1.2
@@ -0,0 +1 @@
+8e733e41506dd34759daba01deeeefd9  zabbix-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 19:08:02 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:02 -0700
Subject: rpms/perl-HTML-Table - New directory
Message-ID: <200611161908.kAGJ82L3031133@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31127/perl-HTML-Table

Log Message:
Directory /cvs/extras/rpms/perl-HTML-Table added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 19:08:22 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:22 -0700
Subject: rpms/perl-HTML-Table/devel - New directory
Message-ID: <200611161908.kAGJ8MVV031147@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31127/perl-HTML-Table/devel

Log Message:
Directory /cvs/extras/rpms/perl-HTML-Table/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 16 19:08:47 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:47 -0700
Subject: rpms/perl-HTML-Table/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611161908.kAGJ8lKo031212@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31191/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTML-Table


--- 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 Nov 16 19:08:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:43 -0700
Subject: rpms/perl-HTML-Table Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611161908.kAGJ8hZv031197@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31191

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-HTML-Table


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTML-Table
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 Nov 16 19:08:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:08:52 -0700
Subject: owners owners.list,1.1973,1.1974
Message-ID: <200611161908.kAGJ8qZe031223@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31139

Modified Files:
	owners.list 
Log Message:
Added perl-HTML-Table



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1973
retrieving revision 1.1974
diff -u -r1.1973 -r1.1974
--- owners.list	16 Nov 2006 18:52:47 -0000	1.1973
+++ owners.list	16 Nov 2006 19:08:22 -0000	1.1974
@@ -1478,6 +1478,7 @@
 Fedora Extras|perl-HTML-FormatText-WithLinks|HTML to text conversion with links as footnotes|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTML-Table|Create HTML tables using simple interface|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-TableExtract|A Perl module for extracting content in HTML tables|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Nov 16 19:09:56 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:09:56 -0700
Subject: rpms/perl-HTML-Table import.log,1.1,1.2
Message-ID: <200611161909.kAGJ9u0l031288@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31256

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-Table-2.04a-1.fc6 on branch devel from perl-HTML-Table-2.04a-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Table/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Nov 2006 19:08:43 -0000	1.1
+++ import.log	16 Nov 2006 19:09:21 -0000	1.2
@@ -0,0 +1 @@
+perl-HTML-Table-2_04a-1_fc6:HEAD:perl-HTML-Table-2.04a-1.fc6.src.rpm:1163704156



From fedora-extras-commits at redhat.com  Thu Nov 16 19:09:56 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 16 Nov 2006 12:09:56 -0700
Subject: rpms/perl-HTML-Table/devel perl-HTML-Table.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611161910.kAGJ9ubF031290@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-HTML-Table/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31256/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-HTML-Table.spec 
Log Message:
auto-import perl-HTML-Table-2.04a-1.fc6 on branch devel from perl-HTML-Table-2.04a-1.fc6.src.rpm


--- NEW FILE perl-HTML-Table.spec ---
Name:           perl-HTML-Table
Version:        2.04a
Release:        1%{?dist}
Summary:        Create HTML tables using simple interface
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/HTML-Table/
Source0:        http://www.cpan.org/modules/by-module/HTML/HTML-Table-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
HTML::Table is used to generate HTML tables for CGI scripts.  By using the
methods provided fairly complex tables can be created, manipulated, then
 printed from Perl scripts.  The module also greatly simplifies creating
tables within tables from Perl.  It is possible to create an entire table
using the methods provided and never use an HTML tag.

HTML::Table also allows for creating dynamically sized tables via its addRow
and addCol methods.  These methods automatically resize the table if passed
more cell values than will fit in the current table grid.

Methods are provided for nearly all valid table, row, and cell tags specified
for HTML 3.0.


%prep
%setup -q -n HTML-Table-%{version}
for f in Changes Table.pm
do
   iconv -f ISO-8859-1 -t UTF-8 -o ${f}.UTF-8 $f
   mv ${f}.UTF-8 $f
done


%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 ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*


%changelog
* Tue Nov  7 2007 Orion Poplawski  2.04a-1
- Update to 2.04a

* Wed Oct 12 2005 Orion Poplawski  2.02-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Table/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Nov 2006 19:08:47 -0000	1.1
+++ .cvsignore	16 Nov 2006 19:09:23 -0000	1.2
@@ -0,0 +1 @@
+HTML-Table-2.04a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Table/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Nov 2006 19:08:47 -0000	1.1
+++ sources	16 Nov 2006 19:09:23 -0000	1.2
@@ -0,0 +1 @@
+12c107450c8759e9dc0f8dea91297132  HTML-Table-2.04a.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 19:31:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 16 Nov 2006 12:31:15 -0700
Subject: comps comps-fe5.xml.in,1.200,1.201 comps-fe6.xml.in,1.224,1.225
Message-ID: <200611161931.kAGJVFSF031556@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31535

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
+vdr-osdteletext, vdr-subtitles


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- comps-fe5.xml.in	14 Nov 2006 07:40:24 -0000	1.200
+++ comps-fe5.xml.in	16 Nov 2006 19:30:45 -0000	1.201
@@ -829,6 +829,8 @@
       tclabc
       ushare
       vdr
+      vdr-osdteletext
+      vdr-subtitles
       xmms
       xmms-cdread
       xmms-flac


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- comps-fe6.xml.in	14 Nov 2006 07:40:24 -0000	1.224
+++ comps-fe6.xml.in	16 Nov 2006 19:30:45 -0000	1.225
@@ -880,6 +880,8 @@
       tclabc
       ushare
       vdr
+      vdr-osdteletext
+      vdr-subtitles
       wmix
       xmms
       xmms-adplug



From fedora-extras-commits at redhat.com  Thu Nov 16 20:16:29 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Thu, 16 Nov 2006 13:16:29 -0700
Subject: rpms/aumix/devel aumix.spec,1.1,1.2
Message-ID: <200611162016.kAGKGTIs002754@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2736

Modified Files:
	aumix.spec 
Log Message:
bumped rel. to 10 to stop buildsys complaining about conflict w. old FC3 package



Index: aumix.spec
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/aumix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix.spec	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix.spec	16 Nov 2006 20:15:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 1%{?dist}
+Release: 10%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPL
 Group: Applications/Multimedia
@@ -48,6 +48,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Thu Nov 16 2006 Gabriel L. Somlo  2.8-10
+- bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package
+
 * Wed Nov 08 2006 Gabriel L. Somlo  2.8-1
 - initial Extras build based on latest Core CVS, including all their patches
 - only building ncurses version



From fedora-extras-commits at redhat.com  Thu Nov 16 20:18:04 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Thu, 16 Nov 2006 13:18:04 -0700
Subject: rpms/aumix/FC-6 aumix.spec,1.1,1.2
Message-ID: <200611162018.kAGKI4Ut002849@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2820

Modified Files:
	aumix.spec 
Log Message:
bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package



Index: aumix.spec
===================================================================
RCS file: /cvs/extras/rpms/aumix/FC-6/aumix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix.spec	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix.spec	16 Nov 2006 20:17:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 1%{?dist}
+Release: 10%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPL
 Group: Applications/Multimedia
@@ -48,6 +48,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Thu Nov 16 2006 Gabriel L. Somlo  2.8-10
+- bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package
+
 * Wed Nov 08 2006 Gabriel L. Somlo  2.8-1
 - initial Extras build based on latest Core CVS, including all their patches
 - only building ncurses version



From fedora-extras-commits at redhat.com  Thu Nov 16 20:19:13 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Thu, 16 Nov 2006 13:19:13 -0700
Subject: rpms/aumix/FC-5 aumix.spec,1.1,1.2
Message-ID: <200611162019.kAGKJDRi002914@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/aumix/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2898

Modified Files:
	aumix.spec 
Log Message:
bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package



Index: aumix.spec
===================================================================
RCS file: /cvs/extras/rpms/aumix/FC-5/aumix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aumix.spec	13 Nov 2006 14:46:33 -0000	1.1
+++ aumix.spec	16 Nov 2006 20:18:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 1%{?dist}
+Release: 10%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPL
 Group: Applications/Multimedia
@@ -48,6 +48,9 @@
 %{_datadir}/aumix
 
 %changelog
+* Thu Nov 16 2006 Gabriel L. Somlo  2.8-10
+- bumped rel. to 10, to stop buildsys complaining about conflicts w. old FC3 package
+
 * Wed Nov 08 2006 Gabriel L. Somlo  2.8-1
 - initial Extras build based on latest Core CVS, including all their patches
 - only building ncurses version



From fedora-extras-commits at redhat.com  Thu Nov 16 20:31:06 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 16 Nov 2006 13:31:06 -0700
Subject: rpms/stratagus/FC-5 stratagus--lua-5.1.diff, 1.1, 1.2 stratagus.spec,
	1.8, 1.9
Message-ID: <200611162031.kAGKV6cW003099@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018/FC-5

Modified Files:
	stratagus--lua-5.1.diff stratagus.spec 
Log Message:
Finally, got it work with Lua5.1

stratagus--lua-5.1.diff:

Index: stratagus--lua-5.1.diff
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/stratagus--lua-5.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stratagus--lua-5.1.diff	16 Sep 2006 10:59:22 -0000	1.1
+++ stratagus--lua-5.1.diff	16 Nov 2006 20:30:35 -0000	1.2
@@ -95,3 +95,78 @@
  
  	DebugPrint("Garbage collect (after): %d/%d\n" _C_
  		lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+--- src/stratagus/script.c.hdg	2006-11-14 23:35:39.000000000 +0100
++++ src/stratagus/script.c	2006-11-14 23:35:39.000000000 +0100
+@@ -149,6 +149,23 @@
+ 	return status;
+ }
+ 
++static int traceback (lua_State *L) {
++  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  if (!lua_istable(L, -1)) {
++    lua_pop(L, 1);
++    return 1;
++  }
++  lua_getfield(L, -1, "traceback");
++  if (!lua_isfunction(L, -1)) {
++    lua_pop(L, 2);
++    return 1;
++  }
++  lua_pushvalue(L, 1);  /* pass error message */
++  lua_pushinteger(L, 2);  /* skip this function and traceback */
++  lua_call(L, 2, 1);  /* call debug.traceback */
++  return 1;
++}
++
+ /**
+ **  Call a lua function
+ **
+@@ -159,19 +176,19 @@
+ */
+ int LuaCall(int narg, int clear)
+ {
+-	int status;
+-	int base;
+-
+-	base = lua_gettop(Lua) - narg;      // function index
+-	lua_pushliteral(Lua, "_TRACEBACK");
+-	lua_rawget(Lua, LUA_GLOBALSINDEX);  // get traceback function
+-	lua_insert(Lua, base);              // put it under chunk and args
+-	signal(SIGINT, laction);
+-	status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
+-	signal(SIGINT, SIG_DFL);
+-	lua_remove(Lua, base);              // remove traceback function
+-
+-	return report(status);
++  int status;
++  int base = lua_gettop(Lua) - narg;  /* function index */
++  lua_pushcfunction(Lua, traceback);  /* push traceback function */
++  lua_insert(Lua, base);  /* put it under chunk and args */
++  signal(SIGINT, laction);
++  status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
++  signal(SIGINT, SIG_DFL);
++  lua_remove(Lua, base);  /* remove traceback function */
++#if 0
++  /* force a complete garbage collection in case of errors */
++  if (status != 0) lua_gc(Lua, LUA_GCCOLLECT, 0);
++#endif
++  return report(status);
+ }
+ 
+ /**
+--- src/ai/script_ai.c.hdg	2004-06-25 01:37:30.000000000 +0200
++++ src/ai/script_ai.c	2006-11-14 23:42:58.000000000 +0100
+@@ -349,7 +349,11 @@
+ 	lua_call(l, 1, 1);
+ 	lua_pushstring(l, "name");
+ 	lua_gettable(l, -2);
+-	aitype->FunctionName = strdup(lua_tostring(l, -1));
++	value = lua_tostring(l, -1);
++	if (value)
++		aitype->FunctionName = strdup(lua_tostring(l, -1));
++	else
++		aitype->FunctionName = NULL;
+ 	lua_pop(l, 2); // FIXME : check if this value is correct.
+ 	// We can have opcode of this function with string.dump(function)
+ 	// Problems are for sub functions...
+


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/stratagus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- stratagus.spec	16 Sep 2006 10:59:22 -0000	1.8
+++ stratagus.spec	16 Nov 2006 20:30:35 -0000	1.9
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Thu Nov 16 2006 Peter Lemenkov  2.1-10
+- Applied patches from Hans de Goede
+
 * Sat Sep 16 2006 Peter Lemenkov  2.1-9%{?dist}
 - Added necessary BuildRequires
 



From fedora-extras-commits at redhat.com  Thu Nov 16 20:31:05 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 16 Nov 2006 13:31:05 -0700
Subject: rpms/stratagus/FC-4 stratagus--lua-5.1.diff, 1.1, 1.2 stratagus.spec,
	1.8, 1.9
Message-ID: <200611162031.kAGKV5k4003095@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018/FC-4

Modified Files:
	stratagus--lua-5.1.diff stratagus.spec 
Log Message:
Finally, got it work with Lua5.1

stratagus--lua-5.1.diff:

Index: stratagus--lua-5.1.diff
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-4/stratagus--lua-5.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stratagus--lua-5.1.diff	16 Sep 2006 10:58:31 -0000	1.1
+++ stratagus--lua-5.1.diff	16 Nov 2006 20:30:35 -0000	1.2
@@ -95,3 +95,78 @@
  
  	DebugPrint("Garbage collect (after): %d/%d\n" _C_
  		lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+--- src/stratagus/script.c.hdg	2006-11-14 23:35:39.000000000 +0100
++++ src/stratagus/script.c	2006-11-14 23:35:39.000000000 +0100
+@@ -149,6 +149,23 @@
+ 	return status;
+ }
+ 
++static int traceback (lua_State *L) {
++  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  if (!lua_istable(L, -1)) {
++    lua_pop(L, 1);
++    return 1;
++  }
++  lua_getfield(L, -1, "traceback");
++  if (!lua_isfunction(L, -1)) {
++    lua_pop(L, 2);
++    return 1;
++  }
++  lua_pushvalue(L, 1);  /* pass error message */
++  lua_pushinteger(L, 2);  /* skip this function and traceback */
++  lua_call(L, 2, 1);  /* call debug.traceback */
++  return 1;
++}
++
+ /**
+ **  Call a lua function
+ **
+@@ -159,19 +176,19 @@
+ */
+ int LuaCall(int narg, int clear)
+ {
+-	int status;
+-	int base;
+-
+-	base = lua_gettop(Lua) - narg;      // function index
+-	lua_pushliteral(Lua, "_TRACEBACK");
+-	lua_rawget(Lua, LUA_GLOBALSINDEX);  // get traceback function
+-	lua_insert(Lua, base);              // put it under chunk and args
+-	signal(SIGINT, laction);
+-	status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
+-	signal(SIGINT, SIG_DFL);
+-	lua_remove(Lua, base);              // remove traceback function
+-
+-	return report(status);
++  int status;
++  int base = lua_gettop(Lua) - narg;  /* function index */
++  lua_pushcfunction(Lua, traceback);  /* push traceback function */
++  lua_insert(Lua, base);  /* put it under chunk and args */
++  signal(SIGINT, laction);
++  status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
++  signal(SIGINT, SIG_DFL);
++  lua_remove(Lua, base);  /* remove traceback function */
++#if 0
++  /* force a complete garbage collection in case of errors */
++  if (status != 0) lua_gc(Lua, LUA_GCCOLLECT, 0);
++#endif
++  return report(status);
+ }
+ 
+ /**
+--- src/ai/script_ai.c.hdg	2004-06-25 01:37:30.000000000 +0200
++++ src/ai/script_ai.c	2006-11-14 23:42:58.000000000 +0100
+@@ -349,7 +349,11 @@
+ 	lua_call(l, 1, 1);
+ 	lua_pushstring(l, "name");
+ 	lua_gettable(l, -2);
+-	aitype->FunctionName = strdup(lua_tostring(l, -1));
++	value = lua_tostring(l, -1);
++	if (value)
++		aitype->FunctionName = strdup(lua_tostring(l, -1));
++	else
++		aitype->FunctionName = NULL;
+ 	lua_pop(l, 2); // FIXME : check if this value is correct.
+ 	// We can have opcode of this function with string.dump(function)
+ 	// Problems are for sub functions...
+


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-4/stratagus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- stratagus.spec	16 Sep 2006 10:58:31 -0000	1.8
+++ stratagus.spec	16 Nov 2006 20:30:35 -0000	1.9
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Thu Nov 16 2006 Peter Lemenkov  2.1-10
+- Applied patches from Hans de Goede
+
 * Sat Sep 16 2006 Peter Lemenkov  2.1-9%{?dist}
 - Added necessary BuildRequires
 



From fedora-extras-commits at redhat.com  Thu Nov 16 20:31:07 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 16 Nov 2006 13:31:07 -0700
Subject: rpms/stratagus/FC-6 stratagus--lua-5.1.diff, 1.1, 1.2 stratagus.spec,
	1.11, 1.12
Message-ID: <200611162031.kAGKV7j3003103@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018/FC-6

Modified Files:
	stratagus--lua-5.1.diff stratagus.spec 
Log Message:
Finally, got it work with Lua5.1

stratagus--lua-5.1.diff:

Index: stratagus--lua-5.1.diff
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-6/stratagus--lua-5.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stratagus--lua-5.1.diff	15 Sep 2006 21:00:04 -0000	1.1
+++ stratagus--lua-5.1.diff	16 Nov 2006 20:30:36 -0000	1.2
@@ -95,3 +95,78 @@
  
  	DebugPrint("Garbage collect (after): %d/%d\n" _C_
  		lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+--- src/stratagus/script.c.hdg	2006-11-14 23:35:39.000000000 +0100
++++ src/stratagus/script.c	2006-11-14 23:35:39.000000000 +0100
+@@ -149,6 +149,23 @@
+ 	return status;
+ }
+ 
++static int traceback (lua_State *L) {
++  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  if (!lua_istable(L, -1)) {
++    lua_pop(L, 1);
++    return 1;
++  }
++  lua_getfield(L, -1, "traceback");
++  if (!lua_isfunction(L, -1)) {
++    lua_pop(L, 2);
++    return 1;
++  }
++  lua_pushvalue(L, 1);  /* pass error message */
++  lua_pushinteger(L, 2);  /* skip this function and traceback */
++  lua_call(L, 2, 1);  /* call debug.traceback */
++  return 1;
++}
++
+ /**
+ **  Call a lua function
+ **
+@@ -159,19 +176,19 @@
+ */
+ int LuaCall(int narg, int clear)
+ {
+-	int status;
+-	int base;
+-
+-	base = lua_gettop(Lua) - narg;      // function index
+-	lua_pushliteral(Lua, "_TRACEBACK");
+-	lua_rawget(Lua, LUA_GLOBALSINDEX);  // get traceback function
+-	lua_insert(Lua, base);              // put it under chunk and args
+-	signal(SIGINT, laction);
+-	status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
+-	signal(SIGINT, SIG_DFL);
+-	lua_remove(Lua, base);              // remove traceback function
+-
+-	return report(status);
++  int status;
++  int base = lua_gettop(Lua) - narg;  /* function index */
++  lua_pushcfunction(Lua, traceback);  /* push traceback function */
++  lua_insert(Lua, base);  /* put it under chunk and args */
++  signal(SIGINT, laction);
++  status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
++  signal(SIGINT, SIG_DFL);
++  lua_remove(Lua, base);  /* remove traceback function */
++#if 0
++  /* force a complete garbage collection in case of errors */
++  if (status != 0) lua_gc(Lua, LUA_GCCOLLECT, 0);
++#endif
++  return report(status);
+ }
+ 
+ /**
+--- src/ai/script_ai.c.hdg	2004-06-25 01:37:30.000000000 +0200
++++ src/ai/script_ai.c	2006-11-14 23:42:58.000000000 +0100
+@@ -349,7 +349,11 @@
+ 	lua_call(l, 1, 1);
+ 	lua_pushstring(l, "name");
+ 	lua_gettable(l, -2);
+-	aitype->FunctionName = strdup(lua_tostring(l, -1));
++	value = lua_tostring(l, -1);
++	if (value)
++		aitype->FunctionName = strdup(lua_tostring(l, -1));
++	else
++		aitype->FunctionName = NULL;
+ 	lua_pop(l, 2); // FIXME : check if this value is correct.
+ 	// We can have opcode of this function with string.dump(function)
+ 	// Problems are for sub functions...
+


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-6/stratagus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stratagus.spec	16 Sep 2006 10:48:38 -0000	1.11
+++ stratagus.spec	16 Nov 2006 20:30:36 -0000	1.12
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Thu Nov 16 2006 Peter Lemenkov  2.1-10
+- Applied patches from Hans de Goede
+
 * Sat Sep 16 2006 Peter Lemenkov  2.1-9%{?dist}
 - Added necessary BuildRequires
 



From fedora-extras-commits at redhat.com  Thu Nov 16 20:31:12 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 16 Nov 2006 13:31:12 -0700
Subject: rpms/stratagus/devel stratagus--lua-5.1.diff, 1.1,
	1.2 stratagus.spec, 1.11, 1.12
Message-ID: <200611162031.kAGKVCXb003107@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3018/devel

Modified Files:
	stratagus--lua-5.1.diff stratagus.spec 
Log Message:
Finally, got it work with Lua5.1

stratagus--lua-5.1.diff:

Index: stratagus--lua-5.1.diff
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus--lua-5.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stratagus--lua-5.1.diff	15 Sep 2006 21:00:04 -0000	1.1
+++ stratagus--lua-5.1.diff	16 Nov 2006 20:30:42 -0000	1.2
@@ -95,3 +95,78 @@
  
  	DebugPrint("Garbage collect (after): %d/%d\n" _C_
  		lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+--- src/stratagus/script.c.hdg	2006-11-14 23:35:39.000000000 +0100
++++ src/stratagus/script.c	2006-11-14 23:35:39.000000000 +0100
+@@ -149,6 +149,23 @@
+ 	return status;
+ }
+ 
++static int traceback (lua_State *L) {
++  lua_getfield(L, LUA_GLOBALSINDEX, "debug");
++  if (!lua_istable(L, -1)) {
++    lua_pop(L, 1);
++    return 1;
++  }
++  lua_getfield(L, -1, "traceback");
++  if (!lua_isfunction(L, -1)) {
++    lua_pop(L, 2);
++    return 1;
++  }
++  lua_pushvalue(L, 1);  /* pass error message */
++  lua_pushinteger(L, 2);  /* skip this function and traceback */
++  lua_call(L, 2, 1);  /* call debug.traceback */
++  return 1;
++}
++
+ /**
+ **  Call a lua function
+ **
+@@ -159,19 +176,19 @@
+ */
+ int LuaCall(int narg, int clear)
+ {
+-	int status;
+-	int base;
+-
+-	base = lua_gettop(Lua) - narg;      // function index
+-	lua_pushliteral(Lua, "_TRACEBACK");
+-	lua_rawget(Lua, LUA_GLOBALSINDEX);  // get traceback function
+-	lua_insert(Lua, base);              // put it under chunk and args
+-	signal(SIGINT, laction);
+-	status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
+-	signal(SIGINT, SIG_DFL);
+-	lua_remove(Lua, base);              // remove traceback function
+-
+-	return report(status);
++  int status;
++  int base = lua_gettop(Lua) - narg;  /* function index */
++  lua_pushcfunction(Lua, traceback);  /* push traceback function */
++  lua_insert(Lua, base);  /* put it under chunk and args */
++  signal(SIGINT, laction);
++  status = lua_pcall(Lua, narg, (clear ? 0 : LUA_MULTRET), base);
++  signal(SIGINT, SIG_DFL);
++  lua_remove(Lua, base);  /* remove traceback function */
++#if 0
++  /* force a complete garbage collection in case of errors */
++  if (status != 0) lua_gc(Lua, LUA_GCCOLLECT, 0);
++#endif
++  return report(status);
+ }
+ 
+ /**
+--- src/ai/script_ai.c.hdg	2004-06-25 01:37:30.000000000 +0200
++++ src/ai/script_ai.c	2006-11-14 23:42:58.000000000 +0100
+@@ -349,7 +349,11 @@
+ 	lua_call(l, 1, 1);
+ 	lua_pushstring(l, "name");
+ 	lua_gettable(l, -2);
+-	aitype->FunctionName = strdup(lua_tostring(l, -1));
++	value = lua_tostring(l, -1);
++	if (value)
++		aitype->FunctionName = strdup(lua_tostring(l, -1));
++	else
++		aitype->FunctionName = NULL;
+ 	lua_pop(l, 2); // FIXME : check if this value is correct.
+ 	// We can have opcode of this function with string.dump(function)
+ 	// Problems are for sub functions...
+


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stratagus.spec	16 Sep 2006 10:48:38 -0000	1.11
+++ stratagus.spec	16 Nov 2006 20:30:42 -0000	1.12
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Thu Nov 16 2006 Peter Lemenkov  2.1-10
+- Applied patches from Hans de Goede
+
 * Sat Sep 16 2006 Peter Lemenkov  2.1-9%{?dist}
 - Added necessary BuildRequires
 



From fedora-extras-commits at redhat.com  Thu Nov 16 20:33:40 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 16 Nov 2006 13:33:40 -0700
Subject: owners owners.list,1.1974,1.1975
Message-ID: <200611162033.kAGKXeAq003262@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3201

Modified Files:
	owners.list 
Log Message:
pyserial - Python serial port access library


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1974
retrieving revision 1.1975
diff -u -r1.1974 -r1.1975
--- owners.list	16 Nov 2006 19:08:22 -0000	1.1974
+++ owners.list	16 Nov 2006 20:33:10 -0000	1.1975
@@ -1905,6 +1905,7 @@
 Fedora Extras|pypoker-eval|Python interface to poker-eval|chris.stone at gmail.com|extras-qa at fedoraproject.org|loic at gnu.org
 Fedora Extras|PyQt-qscintilla|PyQt qscintilla extentions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org|jamatos at fc.up.pt
+Fedora Extras|pyserial|Python serial port access library|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|rvokal at redhat.com|extras-qa at fedoraproject.org|byte at fedoraproject.org



From fedora-extras-commits at redhat.com  Thu Nov 16 20:58:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 13:58:19 -0700
Subject: rpms/gnupg2/devel gnupg2.spec,1.60,1.61
Message-ID: <200611162058.kAGKwJd7003436@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3420

Modified Files:
	gnupg2.spec 
Log Message:
* Thu Nov 16 2006 Rex Dieter  2.0.0-4
- update %description
- drop dearmor patch



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnupg2.spec	13 Nov 2006 21:39:40 -0000	1.60
+++ gnupg2.spec	16 Nov 2006 20:57:49 -0000	1.61
@@ -10,7 +10,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -23,10 +23,7 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
-# http://lists.gnupg.org/pipermail/gnupg-devel/2006-November/023359.html 
-#Patch1: gnupg-1.9.95-64bit.patch
-Patch2: gnupg-1.9.16-testverbose.patch
-Patch3: gnupg-1.9.91-dearmor.patch
+Patch1: gnupg-1.9.16-testverbose.patch
 
 Obsoletes: newpg < 0.9.5
 
@@ -59,26 +56,31 @@
 Provides: openpgp
 
 %description
-GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
-code and the previous newpg package.  It will eventually lead to a
-GnuPG 2.0 release.  Note that GnuPG 1.4 and 1.9 are not always in sync
-and thus features and bug fixes done in 1.4 are not necessarily
-available in 1.9.
-
-You should use this GnuPG version if you want to use the gpg-agent or
-gpgsm (the S/MIME variant of gpg).  Note that the gpg-agent is also
-helpful when using the standard gpg versions (1.4.x as well as some of
-the old 1.2.x).  There are no problems installing 1.4 and 1.9
-alongside; in act we suggest to do this.
+GnuPG is GNU's tool for secure communication and data storage.  It can
+be used to encrypt data and to create digital signatures.  It includes
+an advanced key management facility and is compliant with the proposed
+OpenPGP Internet standard as described in RFC2440 and the S/MIME
+standard as described by several RFCs.
+
+GnuPG 2.0 is the stable version of GnuPG integrating support for
+OpenPGP and S/MIME.  It does not conflict with an installed 1.x
+OpenPGP-only version.
+
+GnuPG 2.0 is a newer version of GnuPG with additional support for
+S/MIME.  It has a different design philosophy that splits
+functionality up into several modules.  Both versions may be installed
+simultaneously without any conflict (gpg is called gpg2 in GnuPG 2).
+In fact, the gpg version from GnuPG 1.x is able to make use of the
+gpg-agent as included in GnuPG 2 and allows for seamless passphrase
+caching.  The advantage of GnupG 1.x is its smaller size and no
+dependency on other modules at run and build time.
 
 
 
 %prep
 %setup -q -n gnupg-%{version}
 
-#patch1 -p1 -b .64bit
-#patch2 -p1 -b .testverbose
-%patch3 -p1 -b .dearmor
+#patch1 -p1 -b .testverbose
 
 # 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,
@@ -91,6 +93,9 @@
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
+# need scratch gpg database for tests
+mkdir -p $HOME/.gnupg 
+
 
 %build
 
@@ -173,6 +178,10 @@
 
 
 %changelog
+* Thu Nov 16 2006 Rex Dieter  2.0.0-4
+- update %%description
+- drop dearmor patch
+
 * Mon Nov 13 2006 Rex Dieter  2.0.0-3
 - BR: libassuan-static >= 1.0.0
 



From fedora-extras-commits at redhat.com  Thu Nov 16 21:00:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 14:00:16 -0700
Subject: rpms/gnupg2/FC-6 .cvsignore, 1.14, 1.15 gnupg2.spec, 1.53,
	1.54 sources, 1.16, 1.17 gnupg-1.9.91-dearmor.patch, 1.1, NONE
Message-ID: <200611162100.kAGL0GPk003537@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3506

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.91-dearmor.patch 
Log Message:
* Thu Nov 16 2006 Rex Dieter  2.0.0-4
- update %%description
- drop dearmor patch

* Mon Nov 13 2006 Rex Dieter  2.0.0-3
- BR: libassuan-static >= 1.0.0

* Mon Nov 13 2006 Rex Dieter  2.0.0-2
- 2.0.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	18 Oct 2006 18:43:44 -0000	1.14
+++ .cvsignore	16 Nov 2006 20:59:45 -0000	1.15
@@ -1,2 +1,4 @@
-gnupg-1.9.93.tar.bz2
-gnupg-1.9.93.tar.bz2.sig
+gnupg-1.9.95.tar.bz2
+gnupg-1.9.95.tar.bz2.sig
+gnupg-2.0.0.tar.bz2
+gnupg-2.0.0.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/gnupg2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnupg2.spec	18 Oct 2006 18:43:44 -0000	1.53
+++ gnupg2.spec	16 Nov 2006 20:59:45 -0000	1.54
@@ -1,23 +1,21 @@
 
-# Keep an eye on http://bugzilla.redhat.com/175744, in case these dirs go away or change
+## Keep an eye on http://bugzilla.redhat.com/175744, 
+## in case these dirs go away or change
 %if "%{?fedora}" > "3" || "%{?rhel}" > "4"
 %define kde_scriptdir %{_sysconfdir}/kde
 %else
 %define kde_scriptdir %{_prefix}
 %endif
 
-# define to build/include gpg2 binary
-%define _enable_gpg --enable-gpg
-
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.93
-Release: 1%{?dist}
+Version: 2.0.0
+Release: 4%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,15 +23,14 @@
 Source10: gpg-agent-startup.sh
 Source11: gpg-agent-shutdown.sh
 
-Patch2: gnupg-1.9.16-testverbose.patch
-Patch3: gnupg-1.9.91-dearmor.patch
+Patch1: gnupg-1.9.16-testverbose.patch
 
 Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-devel >= 0.9.3
+BuildRequires: libassuan-static >= 1.0.0 
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -55,31 +52,35 @@
 Requires: fileutils util-linux
 Requires: pinentry >= 0.7.1
 
-%if "%{?_enable_gpg:1}" == "1"
 Provides: gpg
 Provides: openpgp
-%endif
 
 %description
-GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
-code and the previous newpg package.  It will eventually lead to a
-GnuPG 2.0 release.  Note that GnuPG 1.4 and 1.9 are not always in sync
-and thus features and bug fixes done in 1.4 are not necessarily
-available in 1.9.
-
-You should use this GnuPG version if you want to use the gpg-agent or
-gpgsm (the S/MIME variant of gpg).  Note that the gpg-agent is also
-helpful when using the standard gpg versions (1.4.x as well as some of
-the old 1.2.x).  There are no problems installing 1.4 and 1.9
-alongside; in act we suggest to do this.
+GnuPG is GNU's tool for secure communication and data storage.  It can
+be used to encrypt data and to create digital signatures.  It includes
+an advanced key management facility and is compliant with the proposed
+OpenPGP Internet standard as described in RFC2440 and the S/MIME
+standard as described by several RFCs.
+
+GnuPG 2.0 is the stable version of GnuPG integrating support for
+OpenPGP and S/MIME.  It does not conflict with an installed 1.x
+OpenPGP-only version.
+
+GnuPG 2.0 is a newer version of GnuPG with additional support for
+S/MIME.  It has a different design philosophy that splits
+functionality up into several modules.  Both versions may be installed
+simultaneously without any conflict (gpg is called gpg2 in GnuPG 2).
+In fact, the gpg version from GnuPG 1.x is able to make use of the
+gpg-agent as included in GnuPG 2 and allows for seamless passphrase
+caching.  The advantage of GnupG 1.x is its smaller size and no
+dependency on other modules at run and build time.
 
 
 
 %prep
 %setup -q -n gnupg-%{version}
 
-#patch2 -p1 -b .testverbose
-%patch3 -p1 -b .dearmor
+#patch1 -p1 -b .testverbose
 
 # 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,
@@ -92,17 +93,15 @@
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
+# need scratch gpg database for tests
+mkdir -p $HOME/.gnupg 
 
-%build
 
-%ifarch x86_64
-#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O1|')"
-%endif
+%build
 
 %configure \
   --disable-rpath \
   --enable-selinux-support \
-  %{?_enable_gpg} \
 %ifarch x86_64
   --disable-optimization 
 %endif
@@ -111,11 +110,6 @@
 make 
 
 
-%check
-# some gpg2 tests (still) FAIL
-make -k check ||:
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -128,18 +122,20 @@
 
 %find_lang %{name}
 
-## NOTE:
-#file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-#file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-#file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+# file conflicts with gnupg-1.x 
 rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
+rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html}
 mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
 
-
-## Unpackaged files
+# Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
+%check
+# some gpg2 tests (still) FAIL
+make -k check ||:
+
+
 %post
 /sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir ||:
 
@@ -148,15 +144,14 @@
   /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir ||:
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
-%if "%{?_enable_gpg:1}" == "1"
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
-%endif
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
@@ -177,11 +172,34 @@
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 16 2006 Rex Dieter  2.0.0-4
+- update %%description
+- drop dearmor patch
+
+* Mon Nov 13 2006 Rex Dieter  2.0.0-3
+- BR: libassuan-static >= 1.0.0
+
+* Mon Nov 13 2006 Rex Dieter  2.0.0-2
+- 2.0.0
+
+* Fri Nov 10 2006 Rex Dieter  1.9.95-3
+- upstream 64bit patch
+
+* Mon Nov 06 2006 Rex Dieter  1.9.95-2
+- fix (more) file conflicts with gnupg
+
+* Mon Nov 06 2006 Rex Dieter  1.9.95-1
+- 1.9.95
+
+* Wed Oct 25 2006 Rex Dieter  1.9.94-1
+- 1.9.94
+
 * Wed Oct 18 2006 Rex Dieter  1.9.93-1
 - 1.9.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Oct 2006 18:43:44 -0000	1.16
+++ sources	16 Nov 2006 20:59:46 -0000	1.17
@@ -1,2 +1,2 @@
-fc2d20e6e8aba396953768b503bf07fe  gnupg-1.9.93.tar.bz2.sig
-84b1af5b6c489fcbbbbf4f219aaf2526  gnupg-1.9.93.tar.bz2
+65dc5da3bd4ec127f81c584c8200d813  gnupg-2.0.0.tar.bz2.sig
+13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2


--- gnupg-1.9.91-dearmor.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 16 21:04:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 14:04:31 -0700
Subject: rpms/qt4/FC-6 qt4.spec,1.26,1.27
Message-ID: <200611162104.kAGL4VpF006638@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6622

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter  4.2.1-3
- move libQtDesigner to -x11



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-6/qt4.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4.spec	24 Oct 2006 11:47:42 -0000	1.26
+++ qt4.spec	16 Nov 2006 21:04:01 -0000	1.27
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -134,7 +134,7 @@
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-x11 = %{version}-%{release}
+Requires: %{name}-x11 
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -402,12 +402,12 @@
 %files x11 
 %defattr(-,root,root,-)
 %{qt_libdir}/libQt3Support.so.*
+%{qt_libdir}/libQtAssistantClient.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%if "%{version}" >= "4.2.0"
-%{qt_libdir}/libQtAssistantClient.so.*
-%endif
 %{qtdir}/plugins/*
 %exclude %{qtdir}/plugins/designer
 %exclude %{qtdir}/plugins/sqldrivers
@@ -449,8 +449,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -509,14 +507,17 @@
 
 
 %changelog
-* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+* Wed Nov 15 2006 Rex Dieter  4.2.1-3
+- move libQtDesigner to -x11
+
+* Mon Oct 23 2006 Rex Dieter  4.2.1-2
 - use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter  4.2.1-1
 - 4.2.1
 
-* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+* Wed Oct 04 2006 Rex Dieter  4.2.0-1
 - 4.2.0(final)
 
 * Thu Sep 28 2006 Kevin Kofler  4.2.0-0.9.20060927



From fedora-extras-commits at redhat.com  Thu Nov 16 21:06:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 14:06:14 -0700
Subject: rpms/qt4/FC-5 qt4.spec,1.21,1.22
Message-ID: <200611162106.kAGL6ERF006708@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6692

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter  4.2.1-3
- move libQtDesigner to -x11



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qt4.spec	23 Oct 2006 23:08:15 -0000	1.21
+++ qt4.spec	16 Nov 2006 21:05:37 -0000	1.22
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -134,7 +134,7 @@
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-x11 = %{version}-%{release}
+Requires: %{name}-x11 
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
@@ -402,12 +402,12 @@
 %files x11 
 %defattr(-,root,root,-)
 %{qt_libdir}/libQt3Support.so.*
+%{qt_libdir}/libQtAssistantClient.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtGui.so.*
 %{qt_libdir}/libQtOpenGL.so.*
 %{qt_libdir}/libQtSvg.so.*
-%if "%{version}" >= "4.2.0"
-%{qt_libdir}/libQtAssistantClient.so.*
-%endif
 %{qtdir}/plugins/*
 %exclude %{qtdir}/plugins/designer
 %exclude %{qtdir}/plugins/sqldrivers
@@ -449,8 +449,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # remaining static lib: libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -509,14 +507,17 @@
 
 
 %changelog
-* Mon Oct 23 2006 Rex Dieter 4.2.1-2
+* Wed Nov 15 2006 Rex Dieter  4.2.1-3
+- move libQtDesigner to -x11
+
+* Mon Oct 23 2006 Rex Dieter  4.2.1-2
 - use respun upstream 4.2.1 tarball
 - fix pre-modular-X libGL/libGLU deps (#211898)
 
 * Sun Oct 22 2006 Rex Dieter  4.2.1-1
 - 4.2.1
 
-* Wed Oct 04 2006 Rex Dieter 4.2.0-1
+* Wed Oct 04 2006 Rex Dieter  4.2.0-1
 - 4.2.0(final)
 
 * Thu Sep 28 2006 Kevin Kofler  4.2.0-0.9.20060927



From fedora-extras-commits at redhat.com  Thu Nov 16 21:10:19 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 14:10:19 -0700
Subject: rpms/iksemel/devel iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.3,
	1.4
Message-ID: <200611162110.kAGLAJjK006883@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6860

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
Fix 64 bit issues.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("child");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("I'm fixing parser&tester for "<" and ">" chars.");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("Jabber Site");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("1234 lala ] ]] ]]] ]]>4321");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234  lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("abcd
      <escape>      ");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("john&mary");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("\xFF");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iksemel.spec	29 Aug 2006 00:49:56 -0000	1.3
+++ iksemel.spec	16 Nov 2006 21:09:49 -0000	1.4
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,7 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +116,11 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 1.2-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 21:15:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 16 Nov 2006 14:15:27 -0700
Subject: rpms/qt4/FC-4 qt4.spec,1.16,1.17
Message-ID: <200611162115.kAGLFRt1007016@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6977

Modified Files:
	qt4.spec 
Log Message:
* Wed Nov 15 2006 Rex Dieter  4.1.5-3
- move libQtDesigner to -x11
- fix pre-modular-X libGL/libGLU deps (#211898)



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-4/qt4.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qt4.spec	23 Oct 2006 23:06:49 -0000	1.16
+++ qt4.spec	16 Nov 2006 21:14:57 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -67,9 +67,12 @@
 BuildRequires: freetype-devel
 BuildRequires: zlib-devel
 
-%define x_deps libGL-devel libGLU-devel
-%if "%{?fedora}" > "4"
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
+## In theory, should be as simple as:
+#define x_deps libGL-devel libGLU-devel
+## but, "xorg-x11-devel: missing dep on libGL/libGLU" - http://bugzilla.redhat.com/211898
+%define x_deps xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -353,6 +356,8 @@
 %dir %{qtdir}/bin/
 %dir %{qt_datadir}
 %{qt_libdir}/libQtCore.so.*
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQtNetwork.so.*
 %{qt_libdir}/libQtSql.so.*
 %{qt_libdir}/libQtTest.so.*
@@ -402,8 +407,6 @@
 %{qt_datadir}/mkspecs/
 %{qt_datadir}/phrasebooks/
 %{qt_datadir}/q3porting.xml
-%{qt_libdir}/libQtDesigner.so.*
-%{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
 %{qt_libdir}/libQt*.a
@@ -462,6 +465,10 @@
 
 
 %changelog
+* Wed Nov 15 2006 Rex Dieter  4.1.5-3
+- move libQtDesigner to -x11
+- fix pre-modular-X libGL/libGLU deps (#211898)
+
 * Mon Oct 23 2006 Rex Dieter  4.1.5-2
 - fix qm2ts conflict with qt-devel
 



From fedora-extras-commits at redhat.com  Thu Nov 16 21:15:41 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 16 Nov 2006 14:15:41 -0700
Subject: rpms/sylpheed/devel .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sylpheed.spec, 1.41, 1.42
Message-ID: <200611162115.kAGLFf95007050@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6998

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
* Thu Nov 16 2006 Michael Schwendt  - 2.2.10-1
- Update to 2.2.10 (recommended bug-fixes only).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Sep 2006 08:28:36 -0000	1.22
+++ .cvsignore	16 Nov 2006 21:15:10 -0000	1.23
@@ -1,2 +1,2 @@
-sylpheed-2.2.9.tar.bz2.asc
-sylpheed-2.2.9.tar.bz2
+sylpheed-2.2.10.tar.bz2
+sylpheed-2.2.10.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Sep 2006 08:28:36 -0000	1.22
+++ sources	16 Nov 2006 21:15:10 -0000	1.23
@@ -1,2 +1,2 @@
-987cc37cfa2ad1116c5c60e4f399be30  sylpheed-2.2.9.tar.bz2.asc
-45e9e89775613b0afb732fbc11c73d26  sylpheed-2.2.9.tar.bz2
+68709cd07d2416c7aaeacf2c6921b1a2  sylpheed-2.2.10.tar.bz2
+ddbaab7d093c35592927a0cd426631ad  sylpheed-2.2.10.tar.bz2.asc


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sylpheed.spec	2 Oct 2006 19:40:12 -0000	1.41
+++ sylpheed.spec	16 Nov 2006 21:15:10 -0000	1.42
@@ -4,8 +4,8 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.2.9
-Release: 2%{?dist}
+Version: 2.2.10
+Release: 1%{?dist}
 License: GPL
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -84,6 +84,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 16 2006 Michael Schwendt  - 2.2.10-1
+- Update to 2.2.10 (recommended bug-fixes only).
+
 * Mon Oct 02 2006 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Nov 16 21:28:43 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 14:28:43 -0700
Subject: rpms/iksemel/devel iksemel.spec,1.4,1.5
Message-ID: <200611162128.kAGLSh3O007158@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7142

Modified Files:
	iksemel.spec 
Log Message:
Don't 'make check' on PPC.


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iksemel.spec	16 Nov 2006 21:09:49 -0000	1.4
+++ iksemel.spec	16 Nov 2006 21:28:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           iksemel
 Version:        1.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
 Group:          System Environment/Libraries
@@ -75,7 +75,9 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
+%ifnarch ppp
 make check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -116,6 +118,9 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
+- Don't run make check on PPC - tests failing.
+
 * Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
 - Add patch from Hans de Goede that fixes 64 bit issues
 - Re-enable "make check".



From fedora-extras-commits at redhat.com  Thu Nov 16 21:47:04 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 16 Nov 2006 14:47:04 -0700
Subject: rpms/dejavu-fonts import.log,1.89,1.90
Message-ID: <200611162147.kAGLl4H5007320@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7288

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.12-0.1.rc1.fc7 on branch devel from dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm
2.12-rc1


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- import.log	22 Oct 2006 18:06:28 -0000	1.89
+++ import.log	16 Nov 2006 21:46:34 -0000	1.90
@@ -86,3 +86,4 @@
 dejavu-fonts-2_10_0-2_fc6:HEAD:dejavu-fonts-2.10.0-2.fc6.src.rpm:1159094676
 dejavu-fonts-2_11-1_fc6:HEAD:dejavu-fonts-2.11-1.fc6.src.rpm:1161539797
 dejavu-fonts-2_11-1_fc5:FC-5:dejavu-fonts-2.11-1.fc5.src.rpm:1161540378
+dejavu-fonts-2_12-0_1_rc1_fc7:HEAD:dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm:1163713579



From fedora-extras-commits at redhat.com  Thu Nov 16 21:47:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 16 Nov 2006 14:47:05 -0700
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.24, 1.25 dejavu-fonts.spec,
	1.47, 1.48 sources, 1.24, 1.25
Message-ID: <200611162147.kAGLl5KA007325@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7288/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.12-0.1.rc1.fc7 on branch devel from dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm
2.12-rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Oct 2006 17:56:48 -0000	1.24
+++ .cvsignore	16 Nov 2006 21:46:35 -0000	1.25
@@ -1 +1 @@
-dejavu-sfd-2.11.tar.gz
+dejavu-sfd-20061115-1287.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- dejavu-fonts.spec	22 Oct 2006 17:56:48 -0000	1.47
+++ dejavu-fonts.spec	16 Nov 2006 21:46:35 -0000	1.48
@@ -1,8 +1,8 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-#%define alphatag        20060913svn1149
+%define alphatag        .rc1
 
-%define archiveversion  2.11
+%define archiveversion  20061115-1287
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 
@@ -11,8 +11,8 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.11
-Release:   1%{?dist}
+Version:   2.12
+Release:   0.1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -154,10 +154,12 @@
 
 
 %changelog
-* Sun Oct 22 2006 Nicolas Mailhot 
-- 2.11
-- forget about the "condensed" generic, based on current feedback
-- new minimal fontforge BR
+* Thu Nov 16 2006 Nicolas Mailhot 
+- 2.12-0.1.rc1
+- 2.12-rc1 (a.k.a. 20061115svn1287)
+- ??????WARNING!!! this version reintroduces ligatures, since pulling them didn't
+  motivate Firefox people to fix their bug (in ~ 6 months). If you hit this
+  complain Firefox-side
 
 * Sun Sep 24 2006 Nicolas Mailhot 
 - 2.10.0-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Oct 2006 17:56:48 -0000	1.24
+++ sources	16 Nov 2006 21:46:35 -0000	1.25
@@ -1 +1 @@
-64a34c66b1dbbdaccc108bd40a101d9c  dejavu-sfd-2.11.tar.gz
+2320d60a8bd5d080fa2dfc040f459149  dejavu-sfd-20061115-1287.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 16 21:52:35 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 16 Nov 2006 14:52:35 -0700
Subject: rpms/dejavu-fonts import.log,1.90,1.91
Message-ID: <200611162152.kAGLqZwl007433@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7403

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.12-0.2.rc1.fc7 on branch devel from dejavu-fonts-2.12-0.2.rc1.fc7.src.rpm
fixup


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- import.log	16 Nov 2006 21:46:34 -0000	1.90
+++ import.log	16 Nov 2006 21:52:05 -0000	1.91
@@ -87,3 +87,4 @@
 dejavu-fonts-2_11-1_fc6:HEAD:dejavu-fonts-2.11-1.fc6.src.rpm:1161539797
 dejavu-fonts-2_11-1_fc5:FC-5:dejavu-fonts-2.11-1.fc5.src.rpm:1161540378
 dejavu-fonts-2_12-0_1_rc1_fc7:HEAD:dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm:1163713579
+dejavu-fonts-2_12-0_2_rc1_fc7:HEAD:dejavu-fonts-2.12-0.2.rc1.fc7.src.rpm:1163713911



From fedora-extras-commits at redhat.com  Thu Nov 16 21:52:36 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 16 Nov 2006 14:52:36 -0700
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.48,1.49
Message-ID: <200611162152.kAGLqaBN007436@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7403/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.12-0.2.rc1.fc7 on branch devel from dejavu-fonts-2.12-0.2.rc1.fc7.src.rpm
fixup


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- dejavu-fonts.spec	16 Nov 2006 21:46:35 -0000	1.48
+++ dejavu-fonts.spec	16 Nov 2006 21:52:06 -0000	1.49
@@ -12,7 +12,7 @@
 
 Name:      dejavu-fonts
 Version:   2.12
-Release:   0.1%{?alphatag}%{?dist}
+Release:   0.2%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -155,7 +155,7 @@
 
 %changelog
 * Thu Nov 16 2006 Nicolas Mailhot 
-- 2.12-0.1.rc1
+- 2.12-0.2.rc1
 - 2.12-rc1 (a.k.a. 20061115svn1287)
 - ??????WARNING!!! this version reintroduces ligatures, since pulling them didn't
   motivate Firefox people to fix their bug (in ~ 6 months). If you hit this



From fedora-extras-commits at redhat.com  Thu Nov 16 21:57:38 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 14:57:38 -0700
Subject: rpms/iksemel/devel iksemel.spec,1.5,1.6
Message-ID: <200611162157.kAGLvc1w007510@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7494

Modified Files:
	iksemel.spec 
Log Message:
Fix typo.


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iksemel.spec	16 Nov 2006 21:28:13 -0000	1.5
+++ iksemel.spec	16 Nov 2006 21:57:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           iksemel
 Version:        1.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
 Group:          System Environment/Libraries
@@ -75,7 +75,7 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-%ifnarch ppp
+%ifnarch ppc
 make check
 %endif
 
@@ -118,6 +118,9 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-13
+- ppp != ppc
+
 * Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
 - Don't run make check on PPC - tests failing.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 22:17:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:17:56 -0700
Subject: rpms/unshield/FC-3 unshield-x86-64.patch, NONE, 1.1 unshield.spec,
	1.2, 1.3
Message-ID: <200611162217.kAGMHuAB010889@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/FC-3

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/FC-3/unshield.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unshield.spec	13 Sep 2005 10:59:06 -0000	1.2
+++ unshield.spec	16 Nov 2006 22:17:26 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-3
+- fix #212516 (thanks to Hans de Goede)
+
 * Tue Sep 13 2005 Andreas Bierfert 
 0.5-2
 - add dist



From fedora-extras-commits at redhat.com  Thu Nov 16 22:17:57 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:17:57 -0700
Subject: rpms/unshield/FC-4 unshield-x86-64.patch, NONE, 1.1 unshield.spec,
	1.2, 1.3
Message-ID: <200611162217.kAGMHvfi010892@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/FC-4

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/FC-4/unshield.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unshield.spec	13 Sep 2005 10:59:06 -0000	1.2
+++ unshield.spec	16 Nov 2006 22:17:27 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-3
+- fix #212516 (thanks to Hans de Goede)
+
 * Tue Sep 13 2005 Andreas Bierfert 
 0.5-2
 - add dist



From fedora-extras-commits at redhat.com  Thu Nov 16 22:17:58 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:17:58 -0700
Subject: rpms/unshield/FC-5 unshield-x86-64.patch, NONE, 1.1 unshield.spec,
	1.3, 1.4
Message-ID: <200611162218.kAGMHwJT010895@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/FC-5

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/FC-5/unshield.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unshield.spec	16 Feb 2006 23:07:03 -0000	1.3
+++ unshield.spec	16 Nov 2006 22:17:27 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-4
+- fix #212516 (thanks to Hans de Goede)
+
 * Thu Feb 16 2006 Andreas Bierfert 
 0.5-3
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Thu Nov 16 22:18:04 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:18:04 -0700
Subject: rpms/unshield/FC-6 unshield-x86-64.patch, NONE, 1.1 unshield.spec,
	1.5, 1.6
Message-ID: <200611162218.kAGMI4pV010898@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/FC-6

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/FC-6/unshield.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unshield.spec	4 Oct 2006 23:01:35 -0000	1.5
+++ unshield.spec	16 Nov 2006 22:17:33 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-6
+- fix #212516 (thanks to Hans de Goede)
+
 * Thu Oct 05 2006 Christian Iseli  0.5-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Nov 16 22:18:04 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 16 Nov 2006 15:18:04 -0700
Subject: rpms/unshield/devel unshield-x86-64.patch, NONE, 1.1 unshield.spec, 
	1.5, 1.6
Message-ID: <200611162218.kAGMI4N3010901@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/unshield/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10795/devel

Modified Files:
	unshield.spec 
Added Files:
	unshield-x86-64.patch 
Log Message:
- fix #212516 (thanks to Hans de Goede)


unshield-x86-64.patch:

--- NEW FILE unshield-x86-64.patch ---
--- unshield-0.5/lib/md5/global.h~	2006-11-16 22:01:54.000000000 +0100
+++ unshield-0.5/lib/md5/global.h	2006-11-16 22:01:54.000000000 +0100
@@ -17,7 +17,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
 If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: unshield.spec
===================================================================
RCS file: /cvs/extras/rpms/unshield/devel/unshield.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unshield.spec	4 Oct 2006 23:01:35 -0000	1.5
+++ unshield.spec	16 Nov 2006 22:17:34 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           unshield
 Version:        0.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Install InstallShield applications on a Pocket PC
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://synce.sourceforge.net/
 Source0:        http://dl.sf.net/synce/unshield-0.5.tar.gz
+Patch0:         unshield-x86-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static --disable-rpath
@@ -66,6 +67,10 @@
 %{_datadir}/aclocal/unshield.m4
 
 %changelog
+* Thu Nov 16 2006 Andreas Bierfert 
+0.5-6
+- fix #212516 (thanks to Hans de Goede)
+
 * Thu Oct 05 2006 Christian Iseli  0.5-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Nov 16 22:48:59 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 16 Nov 2006 15:48:59 -0700
Subject: rpms/lilypond-doc/devel .cvsignore, 1.5, 1.6 lilypond-doc.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611162248.kAGMmxgr011307@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11287

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Oct 2006 13:31:46 -0000	1.5
+++ .cvsignore	16 Nov 2006 22:48:28 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7-1.documentation.tar.bz2
+lilypond-2.10.0-2.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/lilypond-doc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lilypond-doc.spec	10 Oct 2006 13:31:46 -0000	1.4
+++ lilypond-doc.spec	16 Nov 2006 22:48:28 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           lilypond-doc
-Version:        2.8.7
-Release:	1%{?dist}
+Version:        2.10.0
+Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
 Group:		Applications/Publishing
 License:	GPL
 URL:		http://www.lilypond.org
-Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-1.documentation.tar.bz2
+Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-2.documentation.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Quentin Spencer  2.10.0-1
+- New release.
+
 * Tue Oct 10 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Oct 2006 13:31:46 -0000	1.5
+++ sources	16 Nov 2006 22:48:28 -0000	1.6
@@ -1 +1 @@
-492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2
+b4fae3abd129e0a19ceddb3dae03fb28  lilypond-2.10.0-2.documentation.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 16 22:59:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 15:59:29 -0700
Subject: rpms/iksemel/FC-6 iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.3,
	1.4
Message-ID: <200611162259.kAGMxTjp011426@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11400

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
64bit fixes.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("child");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("I'm fixing parser&tester for "<" and ">" chars.");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("Jabber Site");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("1234 lala ] ]] ]]] ]]>4321");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234  lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("abcd
      <escape>      ");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("john&mary");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("\xFF");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/FC-6/iksemel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iksemel.spec	29 Aug 2006 00:49:56 -0000	1.3
+++ iksemel.spec	16 Nov 2006 22:58:59 -0000	1.4
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        10%{?dist}
+Release:        13%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,9 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+%ifnarch ppc
+make check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +118,17 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-13
+- ppp != ppc
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
+- Don't run make check on PPC - tests failing.
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 1.2-10
 - Bump release and rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 23:01:34 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 16:01:34 -0700
Subject: rpms/iksemel/FC-5 iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.2,
	1.3
Message-ID: <200611162301.kAGN1YiU014529@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11520

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
64bit fixes.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("child");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("I'm fixing parser&tester for "<" and ">" chars.");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("Jabber Site");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("1234 lala ] ]] ]]] ]]>4321");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234  lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("abcd
      <escape>      ");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("john&mary");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("\xFF");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/FC-5/iksemel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iksemel.spec	3 Aug 2006 00:54:14 -0000	1.2
+++ iksemel.spec	16 Nov 2006 23:00:57 -0000	1.3
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        6%{?dist}
+Release:        13%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,9 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+%ifnarch ppc
+make check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +118,20 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-13
+- ppp != ppc
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
+- Don't run make check on PPC - tests failing.
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
+* Mon Aug 28 2006 Jeffrey C. Ollie  - 1.2-10
+- Bump release and rebuild.
+
 * Wed Aug  2 2006 Jeffrey C. Ollie  - 1.2-6
 - Temporarily disable make check until problems with it can be figured out.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 23:04:06 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 16 Nov 2006 16:04:06 -0700
Subject: rpms/flow-tools/devel flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.10, 1.11
Message-ID: <200611162304.kAGN46hH014598@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14579

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz212928

flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/flow-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flow-tools.spec	10 Sep 2006 09:22:53 -0000	1.10
+++ flow-tools.spec	16 Nov 2006 23:03:36 -0000	1.11
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,6 +14,7 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
 * Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 16 23:07:55 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 16 Nov 2006 16:07:55 -0700
Subject: rpms/iksemel/FC-4 iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.2,
	1.3
Message-ID: <200611162307.kAGN7tY8014650@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/iksemel/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14619

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
64bit fixes.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("child");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("I'm fixing parser&tester for "<" and ">" chars.");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("Jabber Site");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("1234 lala ] ]] ]]] ]]>4321");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234  lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("abcd
      <escape>      ");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("john&mary");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("\xFF");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/FC-4/iksemel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iksemel.spec	3 Aug 2006 00:55:17 -0000	1.2
+++ iksemel.spec	16 Nov 2006 23:07:24 -0000	1.3
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        6%{?dist}
+Release:        13%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,9 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+%ifnarch ppc
+make check
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +118,20 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-13
+- ppp != ppc
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-12
+- Don't run make check on PPC - tests failing.
+
+* Thu Nov 16 2006 Jeffrey C. Ollie  - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
+* Mon Aug 28 2006 Jeffrey C. Ollie  - 1.2-10
+- Bump release and rebuild.
+
 * Wed Aug  2 2006 Jeffrey C. Ollie  - 1.2-6
 - Temporarily disable make check until problems with it can be figured out.
 



From fedora-extras-commits at redhat.com  Thu Nov 16 23:22:39 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 16:22:39 -0700
Subject: rpms/beryl-core/devel beryl-core.spec,1.2,1.3
Message-ID: <200611162322.kAGNMdZx014876@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14859

Modified Files:
	beryl-core.spec 
Log Message:
Fix up -devel Requires to minimize pain in sub-packages


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beryl-core.spec	15 Nov 2006 15:22:26 -0000	1.2
+++ beryl-core.spec	16 Nov 2006 23:22:09 -0000	1.3
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -39,6 +40,12 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+# These Requires: are things (most) beryl sub-packages
+# need to build, so they can minimally BR: beryl-core-devel
+Requires: libX11-devel, libXfixes-devel, libXrender-devel
+Requires: libXdamage-devel, libXcomposite-devel >= 0.3
+Requires: libXext-devel, libXinerama-devel, libXrandr-devel
+Requires: libSM-devel, libpng-devel, startup-notification-devel
 
 %description devel
 The beryl-core-devel package includes the header
@@ -145,6 +152,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Nov 16 2006 Jarod Wilson  0.1.2-5
+- Add BR: libXinerama-devel
+- Fix up R: for beryl-core-devel
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-4
 - Don't Provides: beryl, instead create meta-packages
 - Minimize config flags, the build figures it out itself



From fedora-extras-commits at redhat.com  Thu Nov 16 23:23:24 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Thu, 16 Nov 2006 16:23:24 -0700
Subject: rpms/beryl-core/FC-6 beryl-core.spec,1.2,1.3
Message-ID: <200611162323.kAGNNOpS014923@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-serv14888

Modified Files:
	beryl-core.spec 
Log Message:
Fix up -devel Requires to minimize pain in sub-packages


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beryl-core.spec	15 Nov 2006 15:22:26 -0000	1.2
+++ beryl-core.spec	16 Nov 2006 23:22:54 -0000	1.3
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -39,6 +40,12 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+# These Requires: are things (most) beryl sub-packages
+# need to build, so they can minimally BR: beryl-core-devel
+Requires: libX11-devel, libXfixes-devel, libXrender-devel
+Requires: libXdamage-devel, libXcomposite-devel >= 0.3
+Requires: libXext-devel, libXinerama-devel, libXrandr-devel
+Requires: libSM-devel, libpng-devel, startup-notification-devel
 
 %description devel
 The beryl-core-devel package includes the header
@@ -145,6 +152,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Nov 16 2006 Jarod Wilson  0.1.2-5
+- Add BR: libXinerama-devel
+- Fix up R: for beryl-core-devel
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-4
 - Don't Provides: beryl, instead create meta-packages
 - Minimize config flags, the build figures it out itself



From fedora-extras-commits at redhat.com  Fri Nov 17 00:22:57 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:22:57 -0700
Subject: rpms/gcin/devel NewCJ3.cin,1.1,1.2 gcin.spec,1.12,1.13
Message-ID: <200611170022.kAH0Mv2R018478@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18460

Modified Files:
	NewCJ3.cin gcin.spec 
Log Message:
add gcin129update.patch and update NewCj3.cin


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin	15 Nov 2006 06:49:04 -0000	1.1
+++ NewCJ3.cin	17 Nov 2006 00:22:26 -0000	1.2
@@ -52,7 +52,6 @@
 ... ???
 ... ???
 ... ???
-.; ???
 ' ???
 '' "
 '' "
@@ -171,7 +170,6 @@
 ;a ???
 ;b ???
 ;c ???
-;cu ???
 ;d ???
 ;e ???
 ;f ???
@@ -194,7 +192,9 @@
 ;s ???
 ;t ???
 ;u ???
+;ui ??????
 ;uu ??????
+;uio ?????????
 ;u; ???
 ;v ???
 ;w ???
@@ -216,7 +216,7 @@
 b ???
 b ???
 b ???
-b; ???
+b; ???
 b;; ??????
 c ???
 c ???
@@ -249,7 +249,7 @@
 f ???
 f ???
 f ???
-f; ???
+f; ???
 g ???
 g ???
 g ???
@@ -297,7 +297,7 @@
 l ???
 l ???
 l ???
-l; ???
+l; ???
 m ???
 m ???
 m ???
@@ -347,7 +347,7 @@
 q ???
 q ???
 q ???
-q; ???
+q; ???
 r ???
 r ??
 r ???
@@ -382,7 +382,6 @@
 t ???
 t ???
 t; ???
-t;; ???
 u ???
 u ???
 u ???
@@ -410,7 +409,6 @@
 w ???
 w ???
 w; ???
-w;; ???
 x ???
 x ???
 x ???
@@ -459,7 +457,6 @@
 w. ???
 x. ???
 x. ??
-x.; ??
 y. ???
 z. ???
 a, ???
@@ -493,11 +490,9 @@
 ab ???
 ac ???
 ad ???
-ad; ???
 ae ???
 af ???
 af ???
-af; ???
 ag ???
 ah ???
 ai ???
@@ -526,7 +521,7 @@
 bd ???
 be ???
 bf ???
-bf; ???
+bf; ?????????
 bg ???
 bg ???
 bh ???
@@ -537,8 +532,8 @@
 bm ???
 bm ???
 bm ???
+bn ???
 bn ???
-bn; ???
 bo ???
 bp ???
 bq ???
@@ -546,7 +541,6 @@
 bs ???
 bt ???
 bt ???
-bt; ???
 bu ???
 bv ???
 bw ???
@@ -571,21 +565,18 @@
 ck ???
 cl ???
 cl ???
-cl; ???
 cm ???
 cn ???
 cn; ???
 co ???
 cp ???
-cq ???
-cq; ???
+cq ???
 cr ???
 cs ???
 ct ???
 cu ???
 cu; ???
 cv ???
-cv; ???
 cw ???
 cx ???
 cx; ??????
@@ -605,14 +596,12 @@
 dh ???
 di ???
 di ???
-di; ???
 dj ???
 dk ???
 dk ???
 dl ???
 dm ???
 dm ???
-dm; ???
 dn ???
 do ???
 dp ???
@@ -630,11 +619,11 @@
 ea ???
 ea ???
 ea ???
-ea; ???
 eb ???
 ec ???
 ec ???
 ed ???
+ee ???
 ee ???
 ef ???
 eg ???
@@ -692,7 +681,6 @@
 ga ???
 gb ???
 gb ???
-gb; ???
 gc ???
 gd ???
 ge ???
@@ -715,7 +703,6 @@
 gt ???
 gu ???
 gu ???
-gu; ???
 gv ???
 gw ???
 gx ???
@@ -724,38 +711,28 @@
 ha ???
 hb ???
 hc ???
-hc; ???
 hd ???
 hd; ???
 he ???
-he; ???
 hf ???
 hg ???
-hg; ???
 hh ???
-hh; ???
 hi ???
 hi ???
 hi; ???
 hj ???
 hk ???
-hk; ???
 hl ???
-hm ???
 hm ???
-hm; ???
 hn ???
-hn; ???
 ho ???
 ho ???
-ho; ???
 hp ???
-hp; ???
 hq ???
 hr ???
 hs ???
 hs ???
-hs; ???
+hs; ???
 ht ???
 ht; ???
 ht;; ??????
@@ -766,26 +743,18 @@
 hw; ??????
 hx ???
 hx; ???
-hy ???
-hy; ???
+hy ???
 hz ???
 ia ???
 ib ???
-ib; ???
 ic ???
 id ???
 id ???
-id; ???
-id; ???
 ie ???
-if ???
-if; ??????
+if ??????
 ig ???
 ih ???
-ih; ???
 ii ???
-ii ???
-ii; ???
 ij ???
 ik ???
 il ???
@@ -794,16 +763,15 @@
 io ???
 io; ???
 io; ???
-ip ???
+ip ???
 ip ???
 ip ???
-ip; ???
+ip ???
 iq ???
 ir ???
 is ???
 it ???
 it ???
-it; ???
 iu ???
 iv ???
 iv; ???
@@ -813,8 +781,8 @@
 iz ???
 izo ??????
 ja ???
+jb ???
 jb ???
-jb; ???
 jc ???
 jd ???
 jd ???
@@ -824,8 +792,6 @@
 jh ???
 ji ???
 jj ???
-jj; ???
-jj; ???
 jk ???
 jk; ???
 jl ???
@@ -837,7 +803,6 @@
 jp ???
 jq ???
 jr ???
-jr; ???
 js ???
 jt ???
 ju ???
@@ -849,13 +814,11 @@
 ka ???
 kb ???
 kb ???
-kb; ???
 kc ???
 kd ???
 ke ???
 kf ???
 kf ???
-kf; ???
 kg ???
 kh ???
 ki ???
@@ -866,18 +829,16 @@
 km ???
 kn ???
 kn ???
-kn; ???
 ko ???
 ko; ???
+kp ???
 kp ???
-kp; ???
 kq ???
 kr ???
 ks ???
 kt ???
 ku ???
 ku ???
-ku; ???
 ku; ???
 kv ???
 kw ???
@@ -885,9 +846,7 @@
 ky ???
 kz ???
 la ???
-la; ???
 lb ???
-lb; ???
 lc ???
 ld ???
 le ???
@@ -908,85 +867,70 @@
 ls ???
 lt ???
 lu ???
-lu; ???
 lv ???
 lw ???
+lw; ???
 lx ???
 ly ???
 lz ???
 ma ???
 mb ???
-mb; ???
 mc ???
-mc; ???
 md ???
 me ???
 me ???
 me ???
 me; ???
 mf ???
-mf; ???
 mg ???
+mh ???
 mh ???
-mh; ???
 mi ???
 mi; ???
 mj ???
 mk ???
-mk; ???
+mk; ???
+ml ???
 ml ???
-ml; ???
 mm ???
-mm ???
-mm; ???
 mn ???
 mo ???
-mo; ???
 mp ???
 mq ???
 mr ???
 ms ???
-ms; ???
 mt ???
-mt; ???
+mu ???
 mu ???
 mu ???
-mu; ???
-mv ???
+mv ???
 mv ???
-mv; ???
 mw ???
+mw; ???
 mx ???
 my ???
 mz ???
 na ???
 nb ???
-nb; ???
 nc ???
 nd ???
 ne ???
-ne; ???
 nf ???
 ng ???
 nh ???
 ni ???
 ni ???
-ni; ???
-ni; ???
-ni;; ???
 nj ???
 nk ???
 nl ???
 nl ???
-nl; ???
 nm ???
 nn ???
 no ???
 no ???
 no ???
-no No.
-no; ???
 np ???
+nq ???
 nq ???
 nq ???
 nq; ???
@@ -998,7 +942,6 @@
 nw ???
 nx ???
 nx ???
-nx; ???
 ny ???
 nz ???
 oa ???
@@ -1010,8 +953,8 @@
 ob ???
 ob ???
 ob; ???
+oc ???
 oc ???
-oc; ???
 od ???
 od ???
 od ???
@@ -1039,7 +982,6 @@
 og ???
 og ???
 og ???
-og; ???
 oh ???
 oh ???
 oh ???
@@ -1056,7 +998,6 @@
 oi ???
 oi ???
 oi ???
-oi; ???
 oj ???
 oj ???
 oj ???
@@ -1075,9 +1016,7 @@
 om ???
 om ???
 om ???
-om; ???
 on ???
-on; ???
 oo ???
 oo ???
 oo ???
@@ -1118,7 +1057,6 @@
 oq ???
 oq ???
 or ???
-or; ???
 or ???
 or ???
 or ???
@@ -1162,10 +1100,10 @@
 ou ???
 ou ???
 ou ???
-ou; ???
 ov ???
-ov; ???
+ow ???
 ow ???
+ow; ???
 ow ???
 ow ???
 ow ???
@@ -1177,7 +1115,6 @@
 ow ???
 ow ???
 ow ???
-ow; ???
 ox ???
 oy ???
 oy ???
@@ -1191,14 +1128,13 @@
 oy ???
 oy ???
 oy ???
-oy; ???
 oz ???
 pa ???
 pa ???
 pa; ???
 pb ???
+pc ???
 pc ???
-pc; ???
 pd ???
 pe ???
 pe; ??????
@@ -1207,14 +1143,13 @@
 ph ???
 pi ???
 pi ???
-pi; ???
 pj ???
+pk ???
 pk ???
-pk; ???
 pl ???
 pm ???
+pn ???
 pn ???
-pn; ???
 po ???
 pp ???
 pq ???
@@ -1227,74 +1162,66 @@
 px ???
 py ???
 pz ???
+qa ???
 qa ???
-qa; ???
+qb ???
 qb ???
-qb; ???
+qc ???
 qc ???
-qc; ???
+qd ???
 qd ???
-qd; ???
 qe ???
 qf ???
 qg ???
 qh ???
 qi ???
 qj ???
-qj; ???
 qk ???
 ql ???
 qm ???
-qm; ???
 qn ???
 qo ???
 qp ???
-qq ???
+qq ???
 qr ???
 qs ???
 qt ???
 qu ???
-qu; ???
 qv ???
 qw ???
 qx ???
+qy ???
 qy ???
-qy; ???
 qz ???
 ra ???
 rb ???
-rb; ???
 rc ???
 rc ???
-rc; ???
 rd ???
 re ???
 rf ???
-rf; ???
 rg ???
 rh ???
 ri ???
 rj ???
 rk ???
+rk; ???
 rl ???
 rm ???
 rn ???
 ro ???
 rp ???
-rp; ???
 rq ???
 rr ???
 rs ???
-rt ???
+rt ???
 ru ???
-ru; ???
 ru; ???
 rv ???
 rw ???
 rx ???
 ry ???
 rz ???
-rz; ???
 sa ???
 sb ???
 sc ???
@@ -1314,12 +1241,10 @@
 sp ???
 sq ???
 sr ???
-sr; ???
 ss ???
 st ???
-su ???
 su ???
-su; ???
+su ???
 sv ???
 sw ???
 sw; ???
@@ -1327,7 +1252,6 @@
 sy ???
 sz ???
 ta ???
-ta; ???
 tb ???
 tc ???
 tc ???
@@ -1335,25 +1259,22 @@
 te ???
 tf ???
 tg ???
-tg; ???
 th ???
+ti ???
 ti ???
-ti; ???
+tj ???
 tj ???
-tj; ???
 tj; ???
 tk ???
 tk; ???
 tl ???
 tm ???
-tm; ???
 tn ???
-tn; ???
 tn; ???
 tn; ???
 to ???
+tp ???
 tp ???
-tp; ???
 tq ???
 tr ???
 ts ???
@@ -1361,16 +1282,14 @@
 tt ???
 tt ???
 tt ???
-tt; ???
-tu ???
-tu; ???
+tt; ???
+tu ???
 tv ???
 tv; ???
 tw ???
 tw ???
 tw; ???
 tw; ???
-tw;; ???
 tx ???
 ty ???
 tz ???
@@ -1404,8 +1323,8 @@
 uy ???
 uz ???
 va ???
-vb ???
-vb; ???
+va; ???
+vb ???
 vc ???
 vd ???
 ve ???
@@ -1416,32 +1335,29 @@
 vi ???
 vj ???
 vk ???
-vk; ???
-vl ???
-vl ???
+vl ???
 vl ???
 vl; ???
+vm ???
 vm ???
-vm; ???
+vm; ???
 vn ???
 vo ???
 vo; ???
 vp ???
 vq ???
 vr ???
-vr; ???
 vs ???
 vt ???
+vu ???
 vu ???
-vu; ???
+vv ???
 vv ???
-vv; ???
 vw ???
 vx ???
-vy ???
-vy; ???
+vy ???
+vz ???
 vz ???
-vz; ???
 wa ???
 wb ???
 wc ???
@@ -1451,13 +1367,11 @@
 we ???
 wf ???
 wg ???
-wg; ???
 wh ???
 wi ???
 wj ???
 wj ???
 wk ???
-wk ???
 wl ???
 wm ???
 wn ???
@@ -1468,14 +1382,13 @@
 ws ???
 wt ???
 wu ???
+wv ???
 wv ???
-wv; ???
-ww ???
+ww ???
 wx ???
 wy ???
 wz ???
 wz ???
-wz; ???
 xa ???
 xb ???
 xc ???
@@ -1491,7 +1404,6 @@
 xm ???
 xn ???
 xo ???
-xo; ??
 xp ???
 xq ???
 xr ???
@@ -1518,30 +1430,28 @@
 yj ???
 yj; ???
 yk ???
-yk; ???
 yl ???
 ym ???
 yn ???
 yo ???
 yo; ???
+yp ???
 yp ???
-yp; ???
 yp; ???
 yq ???
 yr ???
+ys ???
 ys ???
-ys; ???
 yt ???
+yu ???
 yu ???
-yu; ???
 yv ???
 yw ???
 yx ???
+yy ???
 yy ???
-yy; ???
 yy, ??????
 yz ???
-yz; ???
 za ???
 zb ???
 zc ???
@@ -1555,7 +1465,7 @@
 zk ???
 zl ???
 zm ???
-zm; ???
+zm ???
 zn ???
 zo ???
 zp ???
@@ -1564,12 +1474,12 @@
 zs ???
 zt ???
 zu ???
-zu; ???
+zu ???
 zv ???
 zw ???
 zx ???
 zy ???
-zy; ???
+zy ???
 zz ???
 aaa ???
 aaa ???
@@ -6623,6 +6533,7 @@
 nbp ???
 nbp; ???
 nbu ???
+ncj ????????????
 ncz ???
 nde ???
 ndk ???
@@ -7052,10 +6963,9 @@
 ojg ???
 oji ???
 ojj ???
+ojk ???
 ojk ???
 ojk ???
-ojk ???
-ojk; ???
 ojm ???
 ojm ???
 ojm; ???
@@ -8546,20 +8456,8 @@
 rgc ???
 rgc ???
 rgc ???
-rgc (?????????)a
-rgc (?????????|||)??????
-rgc =???=b
-rgc ???????????????|||??????
 rgc; ???
 rgg ???
-rgg (????????????)
-rgg ???(???_???;)???
-rgg ??????~??????~
-rgg (??????O???)
-rgg .......\(><)/
-rgg ???*@??@*???
-rgg O_o
-rgg ???(???_???;)?????????~??????~
 rgi ???
 rgj ???
 rgk ???
@@ -9681,9 +9579,8 @@
 tmb ???
 tmb ???
 tmb; ???
-tmc ???
 tmc ???
-tmc; ???
+tmc ???
 tmd ???
 tmd ???
 tmd; ???
@@ -19631,6 +19528,7 @@
 somr ???
 sonl ???
 sorc ???
+sorr ?????????
 sphf ???
 sphh ???
 sqnl ???
@@ -28614,7 +28512,6 @@
 bopo ???
 boqa ???
 boqb ???
-boqh ????????????
 borb ????
 borg ????
 bort ????


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	15 Nov 2006 06:49:04 -0000	1.12
+++ gcin.spec	17 Nov 2006 00:22:27 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         gcin129update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .up
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -107,6 +109,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+- add gcin129update.patch
+- update NewCJ3.cin
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Fri Nov 17 00:25:49 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:25:49 -0700
Subject: rpms/gcin/devel gcin129update.patch,NONE,1.1 gcin.spec,1.13,1.14
Message-ID: <200611170025.kAH0PnCd018561@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18528

Modified Files:
	gcin.spec 
Added Files:
	gcin129update.patch 
Log Message:
add gcin129update.patch

gcin129update.patch:

--- NEW FILE gcin129update.patch ---
diff -urN gcin-1.2.9.orig/Changelog gcin-1.2.9/Changelog
--- gcin-1.2.9.orig/Changelog	2006-11-14 18:24:09.000000000 +0800
+++ gcin-1.2.9/Changelog	2006-11-15 18:52:02.000000000 +0800
@@ -1,5 +1,5 @@
 ** UTF-8 encoding **
-1.2.9:
+1.2.9: (11/15/2006)
 - ???????????? tray icons ???????????? ~/.gcin/icons ???????????? symbolic link ?????????
 - ????????????????????????????????? tray icons??????????????????????????????
 - ???????????????????????????????????????????????????????????????????????????
@@ -7,7 +7,7 @@
 - ???????????????????????? FC6??????????????????????????????
 - ????????? WM(fvwm1) ?????????????????????????????????????????????????????? keyboard focus ??????????????????????????? gcin ??? window????????????????????? click ????????????????????????????????????????????????????????? WM or X11 server ???????????? focus ??????????????? override_redirect ??? window???
 - FreeBSD /usr/bin/bash ??????????????? ./configure ?????????????????? /bin/bash -> /usr/bin/bash
-- libgcin-im-client.so ?????? soname???thanks to caleb
+- libgcin-im-client.so ?????? soname???thanks to candyz
 
 
 1.2.8: (10/19/2006)
diff -urN gcin-1.2.9.orig/configure gcin-1.2.9/configure
--- gcin-1.2.9.orig/configure	2006-11-06 09:29:26.000000000 +0800
+++ gcin-1.2.9/configure	2006-11-15 18:53:54.000000000 +0800
@@ -74,7 +74,7 @@
   echo "/bin/bash -> /usr/bin/bash"
   for i in scripts/*
   do
-    sed -e "s~/bin~/usr/bin" < $i > $i.tmp
+    sed -e "s~/bin~/usr/bin~" < $i > $i.tmp
     mv $i.tmp $i
   done
 fi
diff -urN gcin-1.2.9.orig/data/tsin.src gcin-1.2.9/data/tsin.src
--- gcin-1.2.9.orig/data/tsin.src	2006-11-15 13:05:04.000000000 +0800
+++ gcin-1.2.9/data/tsin.src	2006-11-15 18:56:36.000000000 +0800
@@ -1049,6 +1049,7 @@
 ?????? ???4 ?????? 0
 ?????? ???4 ??????4 0
 ????????????????????? ???4 ?????????2 ???2 ??? ???2 ?????????2 ??????3 0
+????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
 ???????????? ???4 ???2 ???4 ?????????3 0
 ???????????? ???4 ???2 ?????????3 ?????????3 0
 ???????????? ???4 ???2 ??? ?????????3 0
@@ -1439,6 +1440,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????4 ?????????2 ??????2 0
 ???????????? ??????2 ??????4 ?????????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -1448,6 +1450,7 @@
 ???????????? ??????2 ??????4 ?????? ??????4 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ??????4 0
+????????? ??????2 ??????4 ?????????4 0
 ????????? ??????2 ??????4 ??????2 0
 ???????????? ??????2 ??????2 ??????3 ?????????4 0
 ?????? ??????2 ?????????2 0
@@ -1458,6 +1461,7 @@
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????? 0
 ???????????? ??????2 ??????2 ???3 ?????????3 0
+???????????? ??????2 ??????2 ??????2 ??????4 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ??????3 ?????? 0
 ?????? ??????2 ??????2 0
@@ -2442,6 +2446,7 @@
 ????????? ??????3 ??????4 ?????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????2 0
+????????? ??????3 ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
@@ -2547,6 +2552,7 @@
 ?????? ??? ??? 0
 ???????????? ??? ?????? ??????3 ????????? 0
 ?????? ??? ?????????3 0
+???????????? ???2 ???4 ??????2 ?????????4 0
 ?????? ???2 ???4 0
 ?????? ???2 ???4 0
 ???????????? ???2 ??? ???2 ??????4 0
@@ -2556,19 +2562,23 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ????????? 0
 ????????? ???2 ???4 ????????? 0
+???????????? ???2 ??????4 ??????2 ?????????2 0
 ???????????? ???2 ?????? ???2 ??????4 0
 ???????????? ???2 ??????2 ???3 ?????????4 0
+????????????????????? ???2 ??????2 ?????????4 ????????? ????????? ??????4 ??????3 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????3 ???2 ????????? 0
 ???????????? ???2 ??????2 ???2 ???4 0
 ???????????? ???2 ??????2 ??????2 ???4 0
 ????????? ???2 ??????3 ?????????2 0
 ?????? ???2 ??????4 0
+???????????? ???2 ??????3 ??????2 ??????4 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????4 ??? ?????? 0
 ???????????? ???2 ??????4 ??????4 ??????3 0
 ???????????? ???2 ???3 ?????????2 ??????3 0
 ???????????? ???2 ???4 ??????2 ?????? 0
+???????????? ???2 ?????? ???2 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ???2 ??????4 0
 ???????????? ???2 ??????3 ??????2 ?????????4 0
@@ -2577,6 +2587,8 @@
 ???????????? ???2 ?????? ???4 ???2 0
 ??????????????? ???2 ??????4 ???3 ??? ??????4 0
 ?????? ???2 ??????4 0
+???????????? ???2 ????????? ???2 ??????4 0
+???????????? ???2 ?????????4 ?????? ??????2 0
 ???????????? ???2 ?????????2 ???2 ??????4 0
 ????????? ???2 ?????????3 ??????2 0
 ???????????? ???2 ?????????2 ?????? ?????????2 0
@@ -2585,19 +2597,26 @@
 ????????? ???2 ?????????2 ???4 0
 ?????? ???2 ??????3 0
 ???????????? ???2 ??????3 ???2 ????????? 0
+???????????? ???2 ??????3 ??????3 ?????????3 0
 ???????????? ???2 ??????3 ?????? ?????????4 0
+???????????? ???2 ?????? ????????? ???4 0
 ?????? ???2 ??????2 0
 ??????????????? ???2 ?????? ??????4 ??????3 ??????4 0
+???????????? ???2 ??????2 ????????? ??????4 0
 ????????? ???2 ??????3 ??????2 0
 ?????? ???2 ??????2 0
 ????????? ???2 ??????3 ?????????4 0
+???????????? ???2 ??????4 ??????4 ???3 0
+???????????? ???2 ??????4 ???4 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ??????3 ???3 0
+??????????????? ???2 ??????2 ??????2 ??????4 ?????? 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ??????4 ???3 0
 ???????????? ???2 ?????????4 ???2 ????????? 0
 ???????????? ???2 ??????2 ?????? ??????2 0
 ?????? ???2 ??????2 0
+????????? ???2 ?????????2 ?????????4 0
 ?????? ???2 ?????????2 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
@@ -2610,6 +2629,8 @@
 ?????? ???2 ??????4 0
 ????????? ???2 ??????4 ??????3 0
 ???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ?????? ?????????4 0
+??????????????? ???2 ??????4 ??????2 ??? ??????4 0
 ?????? ???2 ?????????2 0
 ???????????? ???2 ??????4 ??????3 ??????3 0
 ?????? ???2 ?????????4 0
@@ -2618,13 +2639,18 @@
 ????????? ???2 ?????? ??????1 0
 ????????? ???2 ????????? ???2 0
 ?????? ???2 ????????? 0
+??????????????? ???2 ????????? ???4 ?????? ????????? 0
 ???????????? ???2 ????????? ?????????4 ??????3 0
+???????????? ???2 ????????? ?????????3 ??????4 0
 ??????????????? ???2 ????????? ?????????3 ??????4 ??????1 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ???2 ??????3 0
+??????????????? ???2 ????????? ??????2 ??????4 ??????4 0
+???????????? ???2 ??????3 ??????4 ??????4 0
 ???????????? ???2 ??????3 ??????3 ??????2 0
 ???????????? ???2 ??????3 ??????4 ?????? 0
 ???????????? ???2 ??????3 ?????????4 ??????4 0
+???????????? ???2 ??????3 ?????????4 ?????????4 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ??????????????? ???2 ??????4 ??????4 ??? ?????? 0
 ?????? ???2 ??????2 0
@@ -2632,7 +2658,10 @@
 ?????? ???2 ?????? 0
 ???????????? ???2 ?????? ??? ??????2 0
 ???????????? ???2 ??????2 ???2 ????????? 0
+????????? ???2 ??????3 ???2 0
 ???????????? ???2 ??????4 ???2 ???4 0
+??????????????? ???2 ??????4 ?????????2 ??????2 ?????????4 0
+???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ????????? ??????3 ????????? 0
 ?????? ???2 ?????????4 0
@@ -2650,7 +2679,9 @@
 ?????? ???2 ?????????2 0
 ????????? ???2 ?????????2 ??????1 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????2 0
 ?????? ???2 ?????????2 0
+???????????? ???2 ?????????2 ???2 ?????????4 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ?????????4 ??? ??????2 0
 ???????????? ???2 ?????????4 ??????3 ??????2 0
@@ -2666,12 +2697,19 @@
 ?????? ???2 ?????????2 0
 ???????????? ???2 ?????????4 ?????? ???2 0
 ?????? ???2 ??? 0
+????????? ???2 ???3 ?????????4 0
 ???????????? ???2 ???3 ?????????4 ??????1 0
 ??????????????? ???2 ?????? ??????4 ??????3 ?????? 0
 ???????????? ???2 ??????4 ?????????4 ???3 0
+??????????????? ???2 ??????4 ??????3 ?????????4 ??????4 0
+?????? ???2 ??????4 0
+????????? ???2 ??????4 ???2 0
 ???????????? ???2 ????????? ?????? ??????3 0
 ?????? ???2 ???3 0
 ????????? ???2 ??????2 ???4 0
+???????????? ???2 ?????? ??????2 ??????4 0
+???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ??????3 ??????4 0
 ???????????? ???2 ??? ???4 ????????? 0
 ???????????? ???2 ???2 ???2 ??????4 0
 ????????? ???2 ???4 ???2 0
@@ -2684,6 +2722,7 @@
 ?????? ???2 ??????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ?????? ?????????2 0
+???????????? ???2 ???4 ????????? ?????? 0
 ?????? ???2 ?????????4 0
 ????????? ???2 ????????? ?????????4 0
 ???????????? ???2 ?????????2 ??????2 ??? 0
@@ -2692,6 +2731,7 @@
 ?????????????????? ???2 ?????????3 ??????2 ??????4 ??????2 ??????2 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ???????????? ???2 ?????????3 ??????4 ??????2 0
+???????????? ???2 ?????????3 ??????4 ????????? 0
 ???????????? ???2 ?????????3 ???4 ???4 0
 ???????????? ???2 ?????????3 ???4 ?????????2 0
 ?????? ???3 ??? 0
@@ -2955,6 +2995,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????3 0
+????????? ??????4 ??????4 ?????????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ?????????2 0
 ?????? ??????4 ?????????2 0
@@ -3674,6 +3715,7 @@
 ????????? ??????3 ??????3 ?????????4 0
 ?????? ??????3 ???4 0
 ???????????? ??????3 ??????4 ????????? ?????? 0
+?????? ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -5947,6 +5989,7 @@
 ???????????? ??????2 ??????4 ???2 ?????????2 0
 ?????? ??????2 ??????4 0
 ????????????????????? ??????2 ??????3 ??????4 ??????2 ???2 ???2 ??????4 0
+?????? ??????2 ??????4 0
 ???????????? ??????2 ??????4 ??? ????????? 0
 ?????? ??????2 ?????????4 0
 ????????? ??????2 ????????? ??????2 0
@@ -6197,6 +6240,8 @@
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ???3 ??????4 0
 ?????? ??????4 ?????????2 0
+???????????? ??????4 ??????3 ??????4 ?????????2 0
+??????????????? ??????4 ??????3 ??????4 ?????????2 ?????? 0
 ???????????? ??????4 ??????3 ??????4 ???3 0
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????2 ??????2 ??????4 0
@@ -6299,6 +6344,7 @@
 ????????? ??????4 ?????? ??????4 0
 ?????? ??????4 ??????2 0
 ????????? ??????4 ??????2 ?????????4 0
+???????????? ??????4 ??????2 ?????????3 ??????3 0
 ????????? ??????4 ??????3 ????????? 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ?????????3 ??????2 0
@@ -6515,7 +6561,9 @@
 ???????????? ?????? ??????3 ?????????4 ?????????2 0
 ?????? ?????? ???3 0
 ???????????? ??????2 ??????2 ?????? ?????? 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ????????? ??????2 ?????? ??????2 0
 ???????????? ??????2 ??????2 ?????? ????????? 0
 ?????? ??????2 ?????? 0
@@ -7118,11 +7166,13 @@
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ??????4 ?????????4 ?????? 0
 ???????????? ??????3 ????????? ?????????2 ?????????4 0
 ????????? ??????3 ?????????2 ?????? 0
 ?????? ??????3 ????????? 0
 ????????? ??????3 ????????? ??????1 0
 ???????????? ??????3 ????????? ??????3 ???4 0
+????????? ??????3 ????????? ??????2 0
 ????????? ??????3 ??????2 ??????2 0
 ????????? ??????3 ??????4 ??? 0
 ?????? ??????3 ??????2 0
@@ -7456,6 +7506,7 @@
 ????????? ??????2 ????????? ??????3 0
 ????????? ??????2 ????????? ?????? 0
 ????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????2 0
 ???????????? ??????2 ?????? ???4 ??????4 0
 ???????????? ??????2 ?????? ??????3 ?????????4 0
 ?????? ??????2 ?????????4 0
@@ -7509,6 +7560,7 @@
 ????????? ??????3 ???2 ??????1 0
 ????????? ??????3 ???4 ????????? 0
 ????????? ??????3 ???4 ?????????3 0
+?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ???4 0
@@ -7974,6 +8026,7 @@
 ?????? ?????????2 ?????? 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????3 ???2 ??????2 ?????? 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ?????????3 0
@@ -7994,10 +8047,13 @@
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ??? ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ???????????? ?????????2 ?????????2 ??????4 ???3 0
+?????? ?????????2 ????????? 0
 ????????? ?????????2 ????????? ??????4 0
+????????? ?????????2 ????????? ??????2 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ????????? ?????????2 ??? ?????????3 0
@@ -8195,6 +8251,7 @@
 ???????????????????????? ?????????2 ????????? ???4 ?????????3 ???4 ?????????4 ??????2 ??????2 0
 ??????????????????????????? ?????????2 ????????? ???4 ?????????3 ??? ???4 ?????????4 ??????2 ??????2 0
 ?????? ?????????2 ?????????4 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ????????? 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????4 0
@@ -8380,6 +8437,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ?????? 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????2 0
@@ -8648,6 +8706,7 @@
 ????????? ?????? ?????????2 ????????? 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ?????????2 0
+????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ??? 0
 ???????????? ?????? ?????????2 ??????3 ??????4 0
@@ -10358,6 +10417,7 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????4 0
 ???????????? ?????? ????????? ????????? ?????????2 0
 ???????????? ?????? ????????? ?????? ??????3 0
 ?????? ?????? ????????? 0
@@ -10526,6 +10586,7 @@
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????3 ???4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ??????4 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ??????3 0
@@ -10706,6 +10767,7 @@
 ????????? ??????4 ??????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????3 0
+?????? ??????4 ?????????3 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
@@ -10719,6 +10781,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -11194,6 +11257,7 @@
 ????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ??????2 ????????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????2 0
@@ -12041,6 +12105,7 @@
 ???????????? ??????2 ???2 ??????4 ??????4 0
 ?????? ??????2 ??????3 0
 ?????? ??????2 ??????4 0
+?????? ??????2 ?????? 0
 ???????????? ??????2 ??????3 ??????4 ??????4 0
 ?????? ??????2 ?????????3 0
 ?????? ??????2 ??????4 0
@@ -12073,6 +12138,7 @@
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????2 ???2 ??????4 0
 ???????????? ?????? ??????2 ???2 ??????4 0
+?????? ?????? ??????2 0
 ?????? ?????? ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????2 0
@@ -12168,6 +12234,8 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????3 0
+??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????3 0
 ?????? ?????? ???2 0
@@ -12336,6 +12404,7 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ???3 ?????????3 0
 ????????? ????????? ????????? ????????? 0
@@ -12492,6 +12561,7 @@
 ???????????? ????????? ????????? ??????4 ??????4 0
 ???????????? ????????? ????????? ?????? ???4 0
 ?????? ????????? ????????? 0
+???????????? ????????? ??????2 ??????2 ?????????4 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ??????2 ??????4 ?????????4 0
@@ -13045,6 +13115,7 @@
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????3 0
 ?????? ?????????2 ?????? 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ?????? 0
@@ -13097,16 +13168,20 @@
 ?????? ?????????4 ??????3 0
 ???????????? ?????????4 ??????2 ???4 ?????? 0
 ?????? ?????????4 ?????? 0
+???????????? ?????????4 ??????4 ???2 ?????????4 0
 ?????? ?????????4 ?????? 0
 ???????????? ?????????4 ?????????4 ??? ?????????4 0
+???????????? ?????????4 ?????????4 ?????????4 ?????????4 0
 ???????????? ?????????4 ??????3 ?????????2 ?????? 0
 ???????????? ?????????4 ?????? ?????????2 ??????4 0
 ???????????? ?????????4 ?????? ??? ?????? 0
 ?????? ?????????4 ??????3 0
+???????????? ?????????4 ??????3 ??????4 ?????? 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ??????4 0
 ?????? ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
+???????????? ?????????4 ????????? ??????2 ??????3 0
 ?????? ?????????4 ???4 0
 ???????????? ?????????4 ??????4 ????????? ?????? 0
 ?????? ?????????4 ??? 0
@@ -13930,6 +14005,7 @@
 ????????? ??????4 ?????? ?????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????2 0
+????????????????????? ??????4 ?????? ??? ?????????4 ????????? ?????????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????1 0
 ???????????? ??????4 ?????????2 ??????3 ?????????4 0
@@ -14847,6 +14923,7 @@
 ???????????? ?????????2 ??????4 ????????? ??????2 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????3 0
+????????? ?????????2 ??????3 ??????3 0
 ?????? ?????????2 ?????????2 0
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ???2 0
@@ -15078,6 +15155,7 @@
 ???????????? ?????????4 ??????2 ??????3 ???3 0
 ???????????? ?????????4 ??????2 ????????? ??????4 0
 ?????????????????? ?????????4 ??????2 ????????? ?????????4 ??????2 ???2 0
+???????????? ?????????4 ??????2 ????????? ??????2 0
 ?????????????????? ?????????4 ??????2 ??????4 ??????4 ??????4 ???3 0
 ?????? ?????????4 ??????4 0
 ?????? ??????2 ??????3 0
@@ -15389,7 +15467,9 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ???4 0
 ????????? ??????4 ?????????4 ?????????3 0
+????????? ??????4 ?????????4 ?????????3 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ??????4 0
@@ -16031,8 +16111,10 @@
 ?????? ?????? ??????2 0
 ?????? ?????? ??? 0
 ?????? ??????3 ???4 0
+????????? ??????3 ???4 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ?????? ??????4 ???3 0
 ?????? ??????3 ??????3 0
 ?????? ??????3 ???4 0
 ?????? ??????4 ??????3 0
@@ -16712,6 +16794,7 @@
 ?????? ?????????3 ?????????2 0
 ???????????? ?????????3 ????????? ??????4 ??????2 0
 ???????????? ????????? ?????? ???4 ?????????4 0
+???????????? ????????? ??????2 ?????? ?????? 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ?????? ????????? ??????2 0
@@ -17655,6 +17738,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ????????? ????????? ????????? ?????????2 0
 ?????? ????????? ?????????4 0
 ???????????? ????????? ?????????2 ??????4 ?????????4 0
@@ -18586,6 +18670,7 @@
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ??????3 0
+????????? ??????2 ??????2 ??????2 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ????????? 0
 ???????????? ??????2 ??????3 ??????2 ??????2 0
@@ -18661,6 +18746,7 @@
 ?????? ??????4 ??????3 0
 ???????????? ??????4 ??????3 ?????????2 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ??????3 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ????????? ???3 ??????3 0
 ?????? ??????4 ?????????4 0
@@ -18830,6 +18916,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ?????????3 ????????? ?????? 0
 ?????? ?????????4 ??????2 0
+????????? ?????????4 ??????2 ?????????3 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ??????3 0
@@ -19311,7 +19398,11 @@
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
+???????????? ?????????2 ?????????2 ???4 ???4 0
+???????????? ?????????2 ?????? ?????????3 ??????4 0
+???????????? ?????????2 ?????? ??????4 ?????????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ???4 ??????3 0
 ???????????? ?????????2 ??????2 ????????? ??????2 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????2 0
@@ -19332,6 +19423,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ???4 ??????2 ??????2 0
 ???????????? ?????????4 ?????????3 ?????? ???2 0
+???????????? ?????????4 ?????????3 ?????? ???2 0
 ????????? ?????????4 ??????2 ??????1 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ?????? ??????4 ??????3 0
@@ -19380,6 +19472,7 @@
 ???????????? ?????????2 ??????2 ?????????2 ???4 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????4 0
+????????? ?????????2 ??????4 ?????? 0
 ????????? ?????????2 ????????? ?????? 0
 ???????????? ?????????2 ????????? ????????? ??????3 0
 ?????? ?????????2 ????????? 0
@@ -19993,6 +20086,7 @@
 ?????? ????????? ?????????3 0
 ???????????? ????????? ?????????3 ?????????3 ??????4 0
 ?????? ????????? ?????????4 0
+????????? ????????? ?????????4 ??????4 0
 ?????? ????????? ?????????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ?????????4 0
@@ -20027,6 +20121,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????3 0
+?????? ????????? ?????????4 0
 ?????? ????????? ??????4 0
 ????????? ????????? ??????4 ??????4 0
 ?????? ????????? ??????2 0
@@ -20428,6 +20523,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ???3 0
 ?????? ????????? ???4 0
+?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ??????3 ??????2 ??????4 0
@@ -20456,6 +20552,7 @@
 ?????? ????????? ??????2 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????3 ??????4 ??????4 0
 ?????? ????????? ????????? 0
 ???????????? ????????? ????????? ????????? ???4 0
 ????????? ????????? ????????? ??????4 0
@@ -20482,6 +20579,7 @@
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????2 ??????4 ?????? 0
 ???????????? ????????? ??????4 ??????4 ??????2 0
 ????????? ????????? ??????4 ????????? 0
 ?????? ????????? ????????? 0
@@ -20904,6 +21002,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ????????? ??????4 ??????2 0
+??? ?????????3 0
 ???????????? ?????????3 ???2 ??????2 ??? 0
 ?????? ?????????3 ???4 0
 ?????? ?????????3 ?????? 0
@@ -20961,6 +21060,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ?????????4 0
 ?????? ?????????3 ?????????3 0
+?????? ?????????3 ?????????3 0
 ?????? ?????????3 ????????? 0
 ?????? ?????????3 ?????????2 0
 ?????? ?????????3 ?????????4 0
@@ -21211,6 +21311,7 @@
 ?????? ?????????3 ??? 0
 ???????????? ?????????3 ??? ???4 ???2 0
 ?????? ?????????3 ??????4 0
+?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????4 ????????? ??????2 0
 ?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????2 ??????4 ?????????2 0
@@ -21631,6 +21732,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ??????3 0
 ?????? ?????????3 ?????? 0
+????????? ?????????3 ??????2 ??????4 0
 ???????????? ?????????3 ??????3 ??? ?????? 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ??????4 0
@@ -21892,6 +21994,7 @@
 ???????????? ?????????2 ??????2 ?????????4 ?????????4 0
 ????????? ?????????2 ??????4 ??????2 0
 ???????????? ?????????2 ??????4 ????????? ??????4 0
+???????????? ?????????2 ??????4 ??????3 ?????????3 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ???????????? ?????????2 ?????????4 ??????3 ???2 0
@@ -22084,6 +22187,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ???2 0
 ???????????? ?????? ???4 ??????4 ?????????2 0
+???????????? ?????? ??????4 ??????4 ???4 0
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????4 ?????? ?????????4 0
 ?????? ?????? ??????4 0
@@ -22114,13 +22218,16 @@
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????3 0
 ???????????? ??????2 ??????4 ??????4 ??????2 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????2 ??????2 ??????3 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????????3 0
+????????? ??????2 ??????4 ??????1 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ?????? 0
@@ -22177,6 +22284,7 @@
 ???????????? ??????2 ????????? ???4 ??????2 0
 ?????? ??????2 ????????? 0
 ????????? ??????2 ????????? ??????3 0
+????????? ??????2 ????????? ??????3 0
 ???????????? ??????2 ???3 ??????4 ??????4 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
@@ -22191,6 +22299,7 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????2 ??? ??????2 0
 ?????? ??????2 ???4 0
+?????? ??????2 ??????4 0
 ????????? ??????3 ???2 ????????? 0
 ?????? ??????3 ???4 0
 ?????? ??????3 ?????? 0
@@ -22430,6 +22539,7 @@
 ?????? ?????????3 ?????????4 0
 ???????????????????????? ?????????3 ??????4 ??????2 ??????2 ???2 ??????3 ??? ????????? 0
 ???????????? ?????????3 ?????????2 ????????? ????????? 0
+???????????? ?????????3 ??????4 ?????????2 ??????4 0
 ????????? ?????????3 ??????4 ?????????2 0
 ????????? ?????????3 ??????4 ??????4 0
 ?????? ?????????3 ??????2 0
@@ -25542,8 +25652,11 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ??????2 0
 ????????? ???2 ???4 ??????2 0
+????????? ???2 ???4 ?????????4 0
 ????????? ???2 ???4 ?????????4 0
 ???????????? ???2 ???4 ?????????4 ??????1 0
+????????? ???2 ???4 ?????????2 0
+???????????? ???2 ???4 ?????????2 ????????? 0
 ????????? ???2 ???4 ??????2 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
@@ -25687,6 +25800,7 @@
 ?????? ???3 ????????? 0
 ?????? ???3 ?????????4 0
 ?????? ???3 ?????????2 0
+?????? ???3 ??????3 0
 ?????? ???3 ??????4 0
 ?????? ???3 ?????????3 0
 ?????? ???3 ?????????4 0
@@ -25751,6 +25865,7 @@
 ?????? ???4 ?????????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ?????????4 0
+????????? ???4 ????????? ????????? 0
 ?????? ???4 ??????2 0
 ???????????? ???4 ?????????2 ??????4 ??????2 0
 ?????? ???4 ??????2 0
@@ -25761,6 +25876,7 @@
 ?????? ???4 ??????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ???2 0
+????????? ???4 ??????4 ??????2 0
 ???????????? ???4 ??????4 ??????4 ??????4 0
 ?????? ???4 ?????????2 0
 ?????? ???4 ?????????2 0
@@ -25928,6 +26044,7 @@
 ???????????? ??????4 ??????2 ?????? ??????2 0
 ????????? ??????4 ?????????2 ??????2 0
 ???????????? ?????? ??????2 ?????????4 ?????????4 0
+????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
 ?????? ?????? ????????? 0
 ???????????? ?????? ????????? ??????3 ??????3 0
 ?????? ?????? ??????2 0
@@ -25938,6 +26055,7 @@
 ???????????? ?????? ??????4 ??????4 ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????3 0
+???????????? ?????? ?????????4 ??????4 ??????3 0
 ?????? ?????? ??????3 0
 ????????? ?????? ??????2 ??????3 0
 ?????? ?????? ?????? 0
@@ -25947,6 +26065,7 @@
 ???????????? ?????? ?????????4 ??????2 ??????4 0
 ???????????? ?????? ?????????3 ??????3 ???3 0
 ???????????? ?????? ??????4 ????????? ??????3 0
+???????????? ?????? ?????? ??????4 ??????4 0
 ?????? ?????? ???4 0
 ??????????????? ?????? ??????2 ??????3 ??????2 ??????1 0
 ?????? ?????? ??????3 0
@@ -26061,6 +26180,7 @@
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
 ????????? ??????4 ??????4 ??????3 0
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ????????? ??????4 ??????4 ?????? 0
@@ -26266,6 +26386,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ??????3 ?????????2 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????4 0
@@ -26488,6 +26609,7 @@
 ?????? ??????3 ??????4 0
 ????????? ??????3 ??????4 ?????????2 0
 ?????? ??????3 ??????4 0
+?????? ??????3 ??????3 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -26564,6 +26686,7 @@
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????? 0
 ???????????? ??????4 ??????2 ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ????????? ??????4 ???4 ??????1 0
@@ -27051,6 +27174,7 @@
 ?????? ???2 ?????????3 0
 ?????? ???2 ???3 0
 ?????? ???2 ??????3 0
+?????? ???3 ????????? 0
 ?????? ???3 ??????4 0
 ?????? ???3 ??????3 0
 ?????? ???3 ??????2 0
@@ -27262,11 +27386,14 @@
 ?????? ?????? ??????4 0
 ??? ??????2 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
+?????? ??????2 ??????3 0
 ????????? ??????2 ????????? ????????? 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
+????????? ??????2 ?????? ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ????????? 0
@@ -28337,6 +28464,7 @@
 ???????????????????????? ??? ??? ????????? ???2 ?????? ??? ?????? ???2 0
 ???????????? ??? ??? ????????? ??????4 0
 ?????? ??? ???2 0
+????????? ??? ???4 ??????4 0
 ?????? ??? ?????? 0
 ?????? ??? ??????3 0
 ?????? ??? ??????3 0
@@ -29455,6 +29583,7 @@
 ?????? ??????4 ???3 0
 ?????? ??????4 ???4 0
 ???????????? ?????? ???4 ?????????4 ?????????2 0
+?????? ?????? ???4 0
 ?????? ?????? ???4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
@@ -30115,8 +30244,10 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????2 0
+????????? ??????3 ??????2 ?????? 0
 ???????????? ??????3 ??????4 ?????? ??????2 0
 ????????? ??????3 ?????? ??????4 0
+?????? ??????3 ????????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ???2 0
 ???????????? ??????4 ???3 ??????4 ??????4 0
@@ -30229,6 +30360,7 @@
 ????????? ?????????4 ???4 ?????? 0
 ???????????? ?????????4 ???4 ?????????4 ??????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????2 0
@@ -30414,6 +30546,7 @@
 ?????? ????????? ?????????3 0
 ????????? ????????? ????????? ???3 0
 ???????????? ????????? ?????????3 ??????2 ?????????4 0
+????????? ????????? ??????2 ????????? 0
 ?????? ????????? ??????4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ?????????3 0
@@ -30989,6 +31122,7 @@
 ?????? ??? ??????2 0
 ?????? ??? ??????3 0
 ????????? ??? ??????3 ???2 0
+?????? ??? ??????3 0
 ?????? ??? ?????? 0
 ?????? ??? ??????4 0
 ?????? ??? ??????4 0
@@ -31008,10 +31142,12 @@
 ?????? ??? ???2 0
 ?????? ??? ???2 0
 ???????????? ??? ???4 ????????? ?????????4 0
+?????? ??? ??????3 0
 ?????? ??? ??????4 0
 ???????????? ??? ?????? ??????4 ?????????4 0
 ?????? ??? ??????3 0
 ?????? ??? ???4 0
+???????????? ??? ???4 ??????4 ???3 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
@@ -31398,6 +31534,7 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ???????????? ??????3 ??????2 ???2 ??????4 0
+????????? ??????3 ??????4 ??????4 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????3 0
@@ -31453,6 +31590,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????? 0
+????????? ?????? ?????????2 ??????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????4 ??????2 0
@@ -31466,6 +31604,8 @@
 ?????? ?????? ??????3 0
 ???????????? ?????? ??????3 ??????4 ?????????2 0
 ?????? ?????? ??? 0
+????????? ?????? ??????3 ??????3 0
+????????? ?????? ??????3 ??????4 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ???3 0
 ????????? ??????4 ???3 ?????????4 0
@@ -31739,6 +31879,7 @@
 ???????????? ?????????4 ?????????3 ??????4 ??????1 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ?????????2 0
+???????????? ?????????4 ??????4 ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
 ????????? ?????????4 ????????? ??????1 0
 ???????????? ?????????4 ?????????4 ??????4 ??????1 0
@@ -31863,6 +32004,7 @@
 ?????? ???2 ?????????4 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????4 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
 ?????? ???2 ?????????4 0
@@ -31934,6 +32076,7 @@
 ???????????? ?????? ?????? ???2 ?????????4 0
 ?????? ?????? ?????? 0
 ?????? ??????4 ??????4 0
+????????? ??????4 ??????4 ?????????4 0
 ???????????? ??????4 ??????3 ??? ????????? 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
@@ -31943,6 +32086,7 @@
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
+????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -32135,6 +32279,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ??????4 0
 ????????? ?????? ??????4 ??????3 0
+???????????? ??????2 ???2 ??????2 ??????4 0
 ?????? ??????2 ???2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -32144,6 +32289,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ?????????3 0
+???????????? ??????2 ????????? ??????4 ?????????2 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
 ???????????? ??????2 ???2 ????????? ????????? 0
@@ -32187,6 +32333,10 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????3 ??????2 ???2 0
 ?????? ??????2 ????????? 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ???4 0
+????????? ??????2 ????????? ??????4 0
 ????????????????????? ??????2 ????????? ?????? ??????3 ??????2 ??????2 ?????????3 0
 ???????????? ??????2 ?????? ??????4 ?????????2 0
 ?????? ??????2 ???4 0
@@ -32986,61 +33136,9 @@
 ?????? ??? ??? 0
 ?????? ??? ??? 0
 ?????? ??? ??? 0
-????????? ??????4 ?????????4 ?????????4 0
-?????? ?????????2 ??????4 0
-?????? ??????3 ?????? 0
-???????????? ??????4 ??????2 ?????????3 ??????3 0
-????????? ??????3 ????????? ??????2 0
-???????????? ??????3 ??????4 ?????????4 ?????? 0
-????????? ??????3 ??????3 ?????? 0
-????????? ?????????3 ??????2 ??????4 0
-?????? ??????3 ????????? 0
-????????? ??????3 ??????2 ?????? 0
-????????? ???4 ????????? ????????? 0
-????????? ???4 ??????4 ??????2 0
-????????? ?????? ??????3 ??????4 0
-????????? ?????? ??????3 ??????3 0
-????????? ?????? ?????????2 ??????2 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ???4 0
-?????? ??????4 ??????2 0
-????????? ??????2 ??????4 ??????1 0
-????????? ??????2 ????????? ??????3 0
-?????? ??????2 ??????3 0
-???????????? ?????? ?????????4 ??????4 ??????3 0
-?????? ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ??????2 ?????? ??????2 0
-???????????? ?????? ?????? ??????4 ??????4 0
-????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
-?????? ??????4 ??????4 0
-???????????? ??????2 ??????2 ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ???2 ???4 ?????????4 0
-???????????? ???2 ???4 ?????????2 ????????? 0
-????????? ???2 ???4 ?????????2 0
-?????? ?????????2 ????????? 0
-???????????? ?????????2 ??????2 ??? ??????4 0
-????????? ?????????2 ????????? ??????2 0
-???????????? ?????? ??????4 ??????4 ???4 0
-???????????? ??????2 ???2 ??????2 ??????4 0
-???????????? ??????2 ????????? ??????4 ?????????2 0
-????????? ??????4 ?????????4 ???4 0
-????????? ??????4 ?????????4 ?????????3 0
-????????? ??????3 ???4 ??????2 0
-???????????? ??????3 ?????? ??????4 ???3 0
-???????????? ??????2 ??????2 ??????2 ??????4 0
-???????????? ??????2 ??????4 ?????????2 ??????2 0
-?????? ??????4 ?????????4 0
-????????? ??????4 ??????4 ?????????2 0
-??? ?????????3 0
-?????? ?????????3 ?????????3 0
-????????? ??????2 ??????2 ??????2 0
-?????? ?????? ??????3 0
-??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
-?????? ???3 ??????3 0
-????????? ????????? ?????????4 ??????4 0
-????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
-????????? ??????3 ??????4 ??????4 0
+????????? ?????? ????????? ??????3 0
+??????????????? ??? ??? ??????3 ??????4 ??????4 0
+?????? ??????3 ??????2 0
+?????? ?????? ????????? 0
+?????? ?????? ????????? 0
+?????? ?????????3 ????????? 0
Binary files gcin-1.2.9.orig/.tedfilepos and gcin-1.2.9/.tedfilepos differ
diff -urN gcin-1.2.9.orig/tenv gcin-1.2.9/tenv
--- gcin-1.2.9.orig/tenv	2006-10-19 14:18:38.000000000 +0800
+++ gcin-1.2.9/tenv	2006-11-15 13:10:24.000000000 +0800
@@ -11,6 +11,6 @@
 gcinpid=$!
 sleep 1
 export LD_PRELOAD=./im-client/libgcin-im-client.so
-#gedit
-leafpad
+gedit
+#leafpad
 pkill gcin.test


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec	17 Nov 2006 00:22:27 -0000	1.13
+++ gcin.spec	17 Nov 2006 00:25:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -109,8 +109,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
-* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-3
 - add gcin129update.patch
+
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
 - update NewCJ3.cin
 
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1



From fedora-extras-commits at redhat.com  Fri Nov 17 00:27:53 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Thu, 16 Nov 2006 17:27:53 -0700
Subject: rpms/mlton/FC-5 .cvsignore, 1.2, 1.3 mlton-debuginfo.patch, 1.1,
	1.2 mlton.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611170027.kAH0Rro2018635@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18606

Modified Files:
	.cvsignore mlton-debuginfo.patch mlton.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2006 13:51:57 -0000	1.2
+++ .cvsignore	17 Nov 2006 00:27:22 -0000	1.3
@@ -1,3 +1 @@
-mlton-20051202-1.src.tgz
-mlton-bootstrap.i386.tar.bz2
-mlton-bootstrap.ppc.tar.bz2
+mlton-20061107.tar.bz2

mlton-debuginfo.patch:

Index: mlton-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/mlton-debuginfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlton-debuginfo.patch	9 Jul 2006 13:51:57 -0000	1.1
+++ mlton-debuginfo.patch	17 Nov 2006 00:27:22 -0000	1.2
@@ -1,24 +1,24 @@
-diff -ur mlton-20051202~/bytecode/Makefile mlton-20051202/bytecode/Makefile
---- mlton-20051202~/bytecode/Makefile	2005-11-30 13:36:52.000000000 -0500
-+++ mlton-20051202/bytecode/Makefile	2006-06-25 18:14:13.000000000 -0400
+diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
+--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/bytecode/Makefile	2006-11-14 23:18:42.000000000 -0500
 @@ -10,7 +10,7 @@
  all: interpret.o interpret-gdb.o print-opcodes
  
  CC = gcc -std=gnu99
 -CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
 +CFLAGS = -fomit-frame-pointer -g -I../runtime -I../include -Wall
- 
- ifeq ($(TARGET_ARCH), amd64)
- CFLAGS += -mtune=opteron -m32 
-diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
---- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
-+++ mlton-20051202/Makefile	2006-06-25 18:13:45.000000000 -0400
-@@ -402,17 +402,6 @@
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
+diff -ur mlton-20061107~/Makefile mlton-20061107/Makefile
+--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
++++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
+@@ -411,17 +411,6 @@
  	if $(GZIP_MAN); then						\
  		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
  	fi
 -	case "$(TARGET_OS)" in						\
--	cygwin|darwin|solaris)						\
+-	aix|cygwin|darwin|solaris)					\
 -	;;								\
 -	*)								\
 -		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
@@ -31,15 +31,15 @@
  
  .PHONY: install-docs
  install-docs:
-diff -ur mlton-20051202~/runtime/Makefile mlton-20051202/runtime/Makefile
---- mlton-20051202~/runtime/Makefile	2005-11-29 18:05:07.000000000 -0500
-+++ mlton-20051202/runtime/Makefile	2006-06-25 18:13:45.000000000 -0400
+diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
+--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/runtime/Makefile	2006-11-14 23:20:40.000000000 -0500
 @@ -49,7 +49,7 @@
  endif
  
  CC = gcc -std=gnu99
 -CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
 +CFLAGS = -O2 -Wall -g -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
- DEBUGFLAGS = $(CFLAGS) -gstabs+ -g2
- 
- CFILES = 							\
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/mlton.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mlton.spec	11 Jul 2006 11:15:43 -0000	1.2
+++ mlton.spec	17 Nov 2006 00:27:22 -0000	1.3
@@ -1,14 +1,14 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20051202
-Release:	8%{?dist}
+Version:	20061107
+Release:	1%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	BSD style and MIT
 URL:		http://mlton.org/
-Source0:	http://mlton.org/pages/Download/attachments/mlton-%{version}-1.src.tgz
+Source0:	mlton-%{version}.tar.bz2
 %if %{mlton_bootstrap}
 # taken from mlton_20060213-1 from Debian
 Source1:	mlton-bootstrap.i386.tar.bz2
@@ -21,7 +21,7 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gmp-devel htmldoc tetex-latex which
+BuildRequires:	gmp-devel htmldoc tetex-latex
 %if ! %{mlton_bootstrap}
 BuildRequires:	mlton
 %endif
@@ -44,6 +44,9 @@
 %prep
 %setup -q
 
+# instantiate version numbers
+make version
+
 # build documentation as PDF
 %patch -P 0 -p1
 # enable -g and disable strip so debuginfo packages work
@@ -100,6 +103,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 12 2006 Adam Goode  - 20061107-1
+- New release, taken from svn://mlton.org/mlton/tags/on-20061107
+
+* Thu Aug 31 2006 Adam Goode  - 20051202-8.1
+- Mass rebuild
+
 * Sun Jul  9 2006 Adam Goode  - 20051202-8
 - Conditionalize bootstrapping and disable it
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2006 13:51:57 -0000	1.2
+++ sources	17 Nov 2006 00:27:22 -0000	1.3
@@ -1,3 +1 @@
-766b25e39dff36da5f3ed81effd5471b  mlton-20051202-1.src.tgz
-34f8bf4c11cca4867beb3bccab04b0a5  mlton-bootstrap.i386.tar.bz2
-16358b27a8f86ec1aede640fff1c77ff  mlton-bootstrap.ppc.tar.bz2
+eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2



From fedora-extras-commits at redhat.com  Fri Nov 17 00:30:03 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:30:03 -0700
Subject: rpms/gcin/FC-6 gcin129update.patch, NONE, 1.1 NewCJ3.cin, 1.1,
	1.2 gcin.spec, 1.12, 1.13
Message-ID: <200611170030.kAH0U3so018719@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18690

Modified Files:
	NewCJ3.cin gcin.spec 
Added Files:
	gcin129update.patch 
Log Message:
add gcin129update.patch and update NewCj3.cin

gcin129update.patch:

--- NEW FILE gcin129update.patch ---
diff -urN gcin-1.2.9.orig/Changelog gcin-1.2.9/Changelog
--- gcin-1.2.9.orig/Changelog	2006-11-14 18:24:09.000000000 +0800
+++ gcin-1.2.9/Changelog	2006-11-15 18:52:02.000000000 +0800
@@ -1,5 +1,5 @@
 ** UTF-8 encoding **
-1.2.9:
+1.2.9: (11/15/2006)
 - ???????????? tray icons ???????????? ~/.gcin/icons ???????????? symbolic link ?????????
 - ????????????????????????????????? tray icons??????????????????????????????
 - ???????????????????????????????????????????????????????????????????????????
@@ -7,7 +7,7 @@
 - ???????????????????????? FC6??????????????????????????????
 - ????????? WM(fvwm1) ?????????????????????????????????????????????????????? keyboard focus ??????????????????????????? gcin ??? window????????????????????? click ????????????????????????????????????????????????????????? WM or X11 server ???????????? focus ??????????????? override_redirect ??? window???
 - FreeBSD /usr/bin/bash ??????????????? ./configure ?????????????????? /bin/bash -> /usr/bin/bash
-- libgcin-im-client.so ?????? soname???thanks to caleb
+- libgcin-im-client.so ?????? soname???thanks to candyz
 
 
 1.2.8: (10/19/2006)
diff -urN gcin-1.2.9.orig/configure gcin-1.2.9/configure
--- gcin-1.2.9.orig/configure	2006-11-06 09:29:26.000000000 +0800
+++ gcin-1.2.9/configure	2006-11-15 18:53:54.000000000 +0800
@@ -74,7 +74,7 @@
   echo "/bin/bash -> /usr/bin/bash"
   for i in scripts/*
   do
-    sed -e "s~/bin~/usr/bin" < $i > $i.tmp
+    sed -e "s~/bin~/usr/bin~" < $i > $i.tmp
     mv $i.tmp $i
   done
 fi
diff -urN gcin-1.2.9.orig/data/tsin.src gcin-1.2.9/data/tsin.src
--- gcin-1.2.9.orig/data/tsin.src	2006-11-15 13:05:04.000000000 +0800
+++ gcin-1.2.9/data/tsin.src	2006-11-15 18:56:36.000000000 +0800
@@ -1049,6 +1049,7 @@
 ?????? ???4 ?????? 0
 ?????? ???4 ??????4 0
 ????????????????????? ???4 ?????????2 ???2 ??? ???2 ?????????2 ??????3 0
+????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
 ???????????? ???4 ???2 ???4 ?????????3 0
 ???????????? ???4 ???2 ?????????3 ?????????3 0
 ???????????? ???4 ???2 ??? ?????????3 0
@@ -1439,6 +1440,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????4 ?????????2 ??????2 0
 ???????????? ??????2 ??????4 ?????????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -1448,6 +1450,7 @@
 ???????????? ??????2 ??????4 ?????? ??????4 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ??????4 0
+????????? ??????2 ??????4 ?????????4 0
 ????????? ??????2 ??????4 ??????2 0
 ???????????? ??????2 ??????2 ??????3 ?????????4 0
 ?????? ??????2 ?????????2 0
@@ -1458,6 +1461,7 @@
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????? 0
 ???????????? ??????2 ??????2 ???3 ?????????3 0
+???????????? ??????2 ??????2 ??????2 ??????4 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ??????3 ?????? 0
 ?????? ??????2 ??????2 0
@@ -2442,6 +2446,7 @@
 ????????? ??????3 ??????4 ?????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????2 0
+????????? ??????3 ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
@@ -2547,6 +2552,7 @@
 ?????? ??? ??? 0
 ???????????? ??? ?????? ??????3 ????????? 0
 ?????? ??? ?????????3 0
+???????????? ???2 ???4 ??????2 ?????????4 0
 ?????? ???2 ???4 0
 ?????? ???2 ???4 0
 ???????????? ???2 ??? ???2 ??????4 0
@@ -2556,19 +2562,23 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ????????? 0
 ????????? ???2 ???4 ????????? 0
+???????????? ???2 ??????4 ??????2 ?????????2 0
 ???????????? ???2 ?????? ???2 ??????4 0
 ???????????? ???2 ??????2 ???3 ?????????4 0
+????????????????????? ???2 ??????2 ?????????4 ????????? ????????? ??????4 ??????3 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????3 ???2 ????????? 0
 ???????????? ???2 ??????2 ???2 ???4 0
 ???????????? ???2 ??????2 ??????2 ???4 0
 ????????? ???2 ??????3 ?????????2 0
 ?????? ???2 ??????4 0
+???????????? ???2 ??????3 ??????2 ??????4 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????4 ??? ?????? 0
 ???????????? ???2 ??????4 ??????4 ??????3 0
 ???????????? ???2 ???3 ?????????2 ??????3 0
 ???????????? ???2 ???4 ??????2 ?????? 0
+???????????? ???2 ?????? ???2 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ???2 ??????4 0
 ???????????? ???2 ??????3 ??????2 ?????????4 0
@@ -2577,6 +2587,8 @@
 ???????????? ???2 ?????? ???4 ???2 0
 ??????????????? ???2 ??????4 ???3 ??? ??????4 0
 ?????? ???2 ??????4 0
+???????????? ???2 ????????? ???2 ??????4 0
+???????????? ???2 ?????????4 ?????? ??????2 0
 ???????????? ???2 ?????????2 ???2 ??????4 0
 ????????? ???2 ?????????3 ??????2 0
 ???????????? ???2 ?????????2 ?????? ?????????2 0
@@ -2585,19 +2597,26 @@
 ????????? ???2 ?????????2 ???4 0
 ?????? ???2 ??????3 0
 ???????????? ???2 ??????3 ???2 ????????? 0
+???????????? ???2 ??????3 ??????3 ?????????3 0
 ???????????? ???2 ??????3 ?????? ?????????4 0
+???????????? ???2 ?????? ????????? ???4 0
 ?????? ???2 ??????2 0
 ??????????????? ???2 ?????? ??????4 ??????3 ??????4 0
+???????????? ???2 ??????2 ????????? ??????4 0
 ????????? ???2 ??????3 ??????2 0
 ?????? ???2 ??????2 0
 ????????? ???2 ??????3 ?????????4 0
+???????????? ???2 ??????4 ??????4 ???3 0
+???????????? ???2 ??????4 ???4 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ??????3 ???3 0
+??????????????? ???2 ??????2 ??????2 ??????4 ?????? 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ??????4 ???3 0
 ???????????? ???2 ?????????4 ???2 ????????? 0
 ???????????? ???2 ??????2 ?????? ??????2 0
 ?????? ???2 ??????2 0
+????????? ???2 ?????????2 ?????????4 0
 ?????? ???2 ?????????2 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
@@ -2610,6 +2629,8 @@
 ?????? ???2 ??????4 0
 ????????? ???2 ??????4 ??????3 0
 ???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ?????? ?????????4 0
+??????????????? ???2 ??????4 ??????2 ??? ??????4 0
 ?????? ???2 ?????????2 0
 ???????????? ???2 ??????4 ??????3 ??????3 0
 ?????? ???2 ?????????4 0
@@ -2618,13 +2639,18 @@
 ????????? ???2 ?????? ??????1 0
 ????????? ???2 ????????? ???2 0
 ?????? ???2 ????????? 0
+??????????????? ???2 ????????? ???4 ?????? ????????? 0
 ???????????? ???2 ????????? ?????????4 ??????3 0
+???????????? ???2 ????????? ?????????3 ??????4 0
 ??????????????? ???2 ????????? ?????????3 ??????4 ??????1 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ???2 ??????3 0
+??????????????? ???2 ????????? ??????2 ??????4 ??????4 0
+???????????? ???2 ??????3 ??????4 ??????4 0
 ???????????? ???2 ??????3 ??????3 ??????2 0
 ???????????? ???2 ??????3 ??????4 ?????? 0
 ???????????? ???2 ??????3 ?????????4 ??????4 0
+???????????? ???2 ??????3 ?????????4 ?????????4 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ??????????????? ???2 ??????4 ??????4 ??? ?????? 0
 ?????? ???2 ??????2 0
@@ -2632,7 +2658,10 @@
 ?????? ???2 ?????? 0
 ???????????? ???2 ?????? ??? ??????2 0
 ???????????? ???2 ??????2 ???2 ????????? 0
+????????? ???2 ??????3 ???2 0
 ???????????? ???2 ??????4 ???2 ???4 0
+??????????????? ???2 ??????4 ?????????2 ??????2 ?????????4 0
+???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ????????? ??????3 ????????? 0
 ?????? ???2 ?????????4 0
@@ -2650,7 +2679,9 @@
 ?????? ???2 ?????????2 0
 ????????? ???2 ?????????2 ??????1 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????2 0
 ?????? ???2 ?????????2 0
+???????????? ???2 ?????????2 ???2 ?????????4 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ?????????4 ??? ??????2 0
 ???????????? ???2 ?????????4 ??????3 ??????2 0
@@ -2666,12 +2697,19 @@
 ?????? ???2 ?????????2 0
 ???????????? ???2 ?????????4 ?????? ???2 0
 ?????? ???2 ??? 0
+????????? ???2 ???3 ?????????4 0
 ???????????? ???2 ???3 ?????????4 ??????1 0
 ??????????????? ???2 ?????? ??????4 ??????3 ?????? 0
 ???????????? ???2 ??????4 ?????????4 ???3 0
+??????????????? ???2 ??????4 ??????3 ?????????4 ??????4 0
+?????? ???2 ??????4 0
+????????? ???2 ??????4 ???2 0
 ???????????? ???2 ????????? ?????? ??????3 0
 ?????? ???2 ???3 0
 ????????? ???2 ??????2 ???4 0
+???????????? ???2 ?????? ??????2 ??????4 0
+???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ??????3 ??????4 0
 ???????????? ???2 ??? ???4 ????????? 0
 ???????????? ???2 ???2 ???2 ??????4 0
 ????????? ???2 ???4 ???2 0
@@ -2684,6 +2722,7 @@
 ?????? ???2 ??????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ?????? ?????????2 0
+???????????? ???2 ???4 ????????? ?????? 0
 ?????? ???2 ?????????4 0
 ????????? ???2 ????????? ?????????4 0
 ???????????? ???2 ?????????2 ??????2 ??? 0
@@ -2692,6 +2731,7 @@
 ?????????????????? ???2 ?????????3 ??????2 ??????4 ??????2 ??????2 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ???????????? ???2 ?????????3 ??????4 ??????2 0
+???????????? ???2 ?????????3 ??????4 ????????? 0
 ???????????? ???2 ?????????3 ???4 ???4 0
 ???????????? ???2 ?????????3 ???4 ?????????2 0
 ?????? ???3 ??? 0
@@ -2955,6 +2995,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????3 0
+????????? ??????4 ??????4 ?????????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ?????????2 0
 ?????? ??????4 ?????????2 0
@@ -3674,6 +3715,7 @@
 ????????? ??????3 ??????3 ?????????4 0
 ?????? ??????3 ???4 0
 ???????????? ??????3 ??????4 ????????? ?????? 0
+?????? ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -5947,6 +5989,7 @@
 ???????????? ??????2 ??????4 ???2 ?????????2 0
 ?????? ??????2 ??????4 0
 ????????????????????? ??????2 ??????3 ??????4 ??????2 ???2 ???2 ??????4 0
+?????? ??????2 ??????4 0
 ???????????? ??????2 ??????4 ??? ????????? 0
 ?????? ??????2 ?????????4 0
 ????????? ??????2 ????????? ??????2 0
@@ -6197,6 +6240,8 @@
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ???3 ??????4 0
 ?????? ??????4 ?????????2 0
+???????????? ??????4 ??????3 ??????4 ?????????2 0
+??????????????? ??????4 ??????3 ??????4 ?????????2 ?????? 0
 ???????????? ??????4 ??????3 ??????4 ???3 0
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????2 ??????2 ??????4 0
@@ -6299,6 +6344,7 @@
 ????????? ??????4 ?????? ??????4 0
 ?????? ??????4 ??????2 0
 ????????? ??????4 ??????2 ?????????4 0
+???????????? ??????4 ??????2 ?????????3 ??????3 0
 ????????? ??????4 ??????3 ????????? 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ?????????3 ??????2 0
@@ -6515,7 +6561,9 @@
 ???????????? ?????? ??????3 ?????????4 ?????????2 0
 ?????? ?????? ???3 0
 ???????????? ??????2 ??????2 ?????? ?????? 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ????????? ??????2 ?????? ??????2 0
 ???????????? ??????2 ??????2 ?????? ????????? 0
 ?????? ??????2 ?????? 0
@@ -7118,11 +7166,13 @@
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ??????4 ?????????4 ?????? 0
 ???????????? ??????3 ????????? ?????????2 ?????????4 0
 ????????? ??????3 ?????????2 ?????? 0
 ?????? ??????3 ????????? 0
 ????????? ??????3 ????????? ??????1 0
 ???????????? ??????3 ????????? ??????3 ???4 0
+????????? ??????3 ????????? ??????2 0
 ????????? ??????3 ??????2 ??????2 0
 ????????? ??????3 ??????4 ??? 0
 ?????? ??????3 ??????2 0
@@ -7456,6 +7506,7 @@
 ????????? ??????2 ????????? ??????3 0
 ????????? ??????2 ????????? ?????? 0
 ????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????2 0
 ???????????? ??????2 ?????? ???4 ??????4 0
 ???????????? ??????2 ?????? ??????3 ?????????4 0
 ?????? ??????2 ?????????4 0
@@ -7509,6 +7560,7 @@
 ????????? ??????3 ???2 ??????1 0
 ????????? ??????3 ???4 ????????? 0
 ????????? ??????3 ???4 ?????????3 0
+?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ???4 0
@@ -7974,6 +8026,7 @@
 ?????? ?????????2 ?????? 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????3 ???2 ??????2 ?????? 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ?????????3 0
@@ -7994,10 +8047,13 @@
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ??? ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ???????????? ?????????2 ?????????2 ??????4 ???3 0
+?????? ?????????2 ????????? 0
 ????????? ?????????2 ????????? ??????4 0
+????????? ?????????2 ????????? ??????2 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ????????? ?????????2 ??? ?????????3 0
@@ -8195,6 +8251,7 @@
 ???????????????????????? ?????????2 ????????? ???4 ?????????3 ???4 ?????????4 ??????2 ??????2 0
 ??????????????????????????? ?????????2 ????????? ???4 ?????????3 ??? ???4 ?????????4 ??????2 ??????2 0
 ?????? ?????????2 ?????????4 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ????????? 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????4 0
@@ -8380,6 +8437,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ?????? 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????2 0
@@ -8648,6 +8706,7 @@
 ????????? ?????? ?????????2 ????????? 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ?????????2 0
+????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ??? 0
 ???????????? ?????? ?????????2 ??????3 ??????4 0
@@ -10358,6 +10417,7 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????4 0
 ???????????? ?????? ????????? ????????? ?????????2 0
 ???????????? ?????? ????????? ?????? ??????3 0
 ?????? ?????? ????????? 0
@@ -10526,6 +10586,7 @@
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????3 ???4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ??????4 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ??????3 0
@@ -10706,6 +10767,7 @@
 ????????? ??????4 ??????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????3 0
+?????? ??????4 ?????????3 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
@@ -10719,6 +10781,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -11194,6 +11257,7 @@
 ????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ??????2 ????????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????2 0
@@ -12041,6 +12105,7 @@
 ???????????? ??????2 ???2 ??????4 ??????4 0
 ?????? ??????2 ??????3 0
 ?????? ??????2 ??????4 0
+?????? ??????2 ?????? 0
 ???????????? ??????2 ??????3 ??????4 ??????4 0
 ?????? ??????2 ?????????3 0
 ?????? ??????2 ??????4 0
@@ -12073,6 +12138,7 @@
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????2 ???2 ??????4 0
 ???????????? ?????? ??????2 ???2 ??????4 0
+?????? ?????? ??????2 0
 ?????? ?????? ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????2 0
@@ -12168,6 +12234,8 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????3 0
+??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????3 0
 ?????? ?????? ???2 0
@@ -12336,6 +12404,7 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ???3 ?????????3 0
 ????????? ????????? ????????? ????????? 0
@@ -12492,6 +12561,7 @@
 ???????????? ????????? ????????? ??????4 ??????4 0
 ???????????? ????????? ????????? ?????? ???4 0
 ?????? ????????? ????????? 0
+???????????? ????????? ??????2 ??????2 ?????????4 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ??????2 ??????4 ?????????4 0
@@ -13045,6 +13115,7 @@
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????3 0
 ?????? ?????????2 ?????? 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ?????? 0
@@ -13097,16 +13168,20 @@
 ?????? ?????????4 ??????3 0
 ???????????? ?????????4 ??????2 ???4 ?????? 0
 ?????? ?????????4 ?????? 0
+???????????? ?????????4 ??????4 ???2 ?????????4 0
 ?????? ?????????4 ?????? 0
 ???????????? ?????????4 ?????????4 ??? ?????????4 0
+???????????? ?????????4 ?????????4 ?????????4 ?????????4 0
 ???????????? ?????????4 ??????3 ?????????2 ?????? 0
 ???????????? ?????????4 ?????? ?????????2 ??????4 0
 ???????????? ?????????4 ?????? ??? ?????? 0
 ?????? ?????????4 ??????3 0
+???????????? ?????????4 ??????3 ??????4 ?????? 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ??????4 0
 ?????? ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
+???????????? ?????????4 ????????? ??????2 ??????3 0
 ?????? ?????????4 ???4 0
 ???????????? ?????????4 ??????4 ????????? ?????? 0
 ?????? ?????????4 ??? 0
@@ -13930,6 +14005,7 @@
 ????????? ??????4 ?????? ?????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????2 0
+????????????????????? ??????4 ?????? ??? ?????????4 ????????? ?????????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????1 0
 ???????????? ??????4 ?????????2 ??????3 ?????????4 0
@@ -14847,6 +14923,7 @@
 ???????????? ?????????2 ??????4 ????????? ??????2 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????3 0
+????????? ?????????2 ??????3 ??????3 0
 ?????? ?????????2 ?????????2 0
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ???2 0
@@ -15078,6 +15155,7 @@
 ???????????? ?????????4 ??????2 ??????3 ???3 0
 ???????????? ?????????4 ??????2 ????????? ??????4 0
 ?????????????????? ?????????4 ??????2 ????????? ?????????4 ??????2 ???2 0
+???????????? ?????????4 ??????2 ????????? ??????2 0
 ?????????????????? ?????????4 ??????2 ??????4 ??????4 ??????4 ???3 0
 ?????? ?????????4 ??????4 0
 ?????? ??????2 ??????3 0
@@ -15389,7 +15467,9 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ???4 0
 ????????? ??????4 ?????????4 ?????????3 0
+????????? ??????4 ?????????4 ?????????3 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ??????4 0
@@ -16031,8 +16111,10 @@
 ?????? ?????? ??????2 0
 ?????? ?????? ??? 0
 ?????? ??????3 ???4 0
+????????? ??????3 ???4 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ?????? ??????4 ???3 0
 ?????? ??????3 ??????3 0
 ?????? ??????3 ???4 0
 ?????? ??????4 ??????3 0
@@ -16712,6 +16794,7 @@
 ?????? ?????????3 ?????????2 0
 ???????????? ?????????3 ????????? ??????4 ??????2 0
 ???????????? ????????? ?????? ???4 ?????????4 0
+???????????? ????????? ??????2 ?????? ?????? 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ?????? ????????? ??????2 0
@@ -17655,6 +17738,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ????????? ????????? ????????? ?????????2 0
 ?????? ????????? ?????????4 0
 ???????????? ????????? ?????????2 ??????4 ?????????4 0
@@ -18586,6 +18670,7 @@
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ??????3 0
+????????? ??????2 ??????2 ??????2 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ????????? 0
 ???????????? ??????2 ??????3 ??????2 ??????2 0
@@ -18661,6 +18746,7 @@
 ?????? ??????4 ??????3 0
 ???????????? ??????4 ??????3 ?????????2 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ??????3 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ????????? ???3 ??????3 0
 ?????? ??????4 ?????????4 0
@@ -18830,6 +18916,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ?????????3 ????????? ?????? 0
 ?????? ?????????4 ??????2 0
+????????? ?????????4 ??????2 ?????????3 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ??????3 0
@@ -19311,7 +19398,11 @@
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
+???????????? ?????????2 ?????????2 ???4 ???4 0
+???????????? ?????????2 ?????? ?????????3 ??????4 0
+???????????? ?????????2 ?????? ??????4 ?????????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ???4 ??????3 0
 ???????????? ?????????2 ??????2 ????????? ??????2 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????2 0
@@ -19332,6 +19423,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ???4 ??????2 ??????2 0
 ???????????? ?????????4 ?????????3 ?????? ???2 0
+???????????? ?????????4 ?????????3 ?????? ???2 0
 ????????? ?????????4 ??????2 ??????1 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ?????? ??????4 ??????3 0
@@ -19380,6 +19472,7 @@
 ???????????? ?????????2 ??????2 ?????????2 ???4 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????4 0
+????????? ?????????2 ??????4 ?????? 0
 ????????? ?????????2 ????????? ?????? 0
 ???????????? ?????????2 ????????? ????????? ??????3 0
 ?????? ?????????2 ????????? 0
@@ -19993,6 +20086,7 @@
 ?????? ????????? ?????????3 0
 ???????????? ????????? ?????????3 ?????????3 ??????4 0
 ?????? ????????? ?????????4 0
+????????? ????????? ?????????4 ??????4 0
 ?????? ????????? ?????????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ?????????4 0
@@ -20027,6 +20121,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????3 0
+?????? ????????? ?????????4 0
 ?????? ????????? ??????4 0
 ????????? ????????? ??????4 ??????4 0
 ?????? ????????? ??????2 0
@@ -20428,6 +20523,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ???3 0
 ?????? ????????? ???4 0
+?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ??????3 ??????2 ??????4 0
@@ -20456,6 +20552,7 @@
 ?????? ????????? ??????2 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????3 ??????4 ??????4 0
 ?????? ????????? ????????? 0
 ???????????? ????????? ????????? ????????? ???4 0
 ????????? ????????? ????????? ??????4 0
@@ -20482,6 +20579,7 @@
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????2 ??????4 ?????? 0
 ???????????? ????????? ??????4 ??????4 ??????2 0
 ????????? ????????? ??????4 ????????? 0
 ?????? ????????? ????????? 0
@@ -20904,6 +21002,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ????????? ??????4 ??????2 0
+??? ?????????3 0
 ???????????? ?????????3 ???2 ??????2 ??? 0
 ?????? ?????????3 ???4 0
 ?????? ?????????3 ?????? 0
@@ -20961,6 +21060,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ?????????4 0
 ?????? ?????????3 ?????????3 0
+?????? ?????????3 ?????????3 0
 ?????? ?????????3 ????????? 0
 ?????? ?????????3 ?????????2 0
 ?????? ?????????3 ?????????4 0
@@ -21211,6 +21311,7 @@
 ?????? ?????????3 ??? 0
 ???????????? ?????????3 ??? ???4 ???2 0
 ?????? ?????????3 ??????4 0
+?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????4 ????????? ??????2 0
 ?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????2 ??????4 ?????????2 0
@@ -21631,6 +21732,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ??????3 0
 ?????? ?????????3 ?????? 0
+????????? ?????????3 ??????2 ??????4 0
 ???????????? ?????????3 ??????3 ??? ?????? 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ??????4 0
@@ -21892,6 +21994,7 @@
 ???????????? ?????????2 ??????2 ?????????4 ?????????4 0
 ????????? ?????????2 ??????4 ??????2 0
 ???????????? ?????????2 ??????4 ????????? ??????4 0
+???????????? ?????????2 ??????4 ??????3 ?????????3 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ???????????? ?????????2 ?????????4 ??????3 ???2 0
@@ -22084,6 +22187,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ???2 0
 ???????????? ?????? ???4 ??????4 ?????????2 0
+???????????? ?????? ??????4 ??????4 ???4 0
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????4 ?????? ?????????4 0
 ?????? ?????? ??????4 0
@@ -22114,13 +22218,16 @@
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????3 0
 ???????????? ??????2 ??????4 ??????4 ??????2 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????2 ??????2 ??????3 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????????3 0
+????????? ??????2 ??????4 ??????1 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ?????? 0
@@ -22177,6 +22284,7 @@
 ???????????? ??????2 ????????? ???4 ??????2 0
 ?????? ??????2 ????????? 0
 ????????? ??????2 ????????? ??????3 0
+????????? ??????2 ????????? ??????3 0
 ???????????? ??????2 ???3 ??????4 ??????4 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
@@ -22191,6 +22299,7 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????2 ??? ??????2 0
 ?????? ??????2 ???4 0
+?????? ??????2 ??????4 0
 ????????? ??????3 ???2 ????????? 0
 ?????? ??????3 ???4 0
 ?????? ??????3 ?????? 0
@@ -22430,6 +22539,7 @@
 ?????? ?????????3 ?????????4 0
 ???????????????????????? ?????????3 ??????4 ??????2 ??????2 ???2 ??????3 ??? ????????? 0
 ???????????? ?????????3 ?????????2 ????????? ????????? 0
+???????????? ?????????3 ??????4 ?????????2 ??????4 0
 ????????? ?????????3 ??????4 ?????????2 0
 ????????? ?????????3 ??????4 ??????4 0
 ?????? ?????????3 ??????2 0
@@ -25542,8 +25652,11 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ??????2 0
 ????????? ???2 ???4 ??????2 0
+????????? ???2 ???4 ?????????4 0
 ????????? ???2 ???4 ?????????4 0
 ???????????? ???2 ???4 ?????????4 ??????1 0
+????????? ???2 ???4 ?????????2 0
+???????????? ???2 ???4 ?????????2 ????????? 0
 ????????? ???2 ???4 ??????2 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
@@ -25687,6 +25800,7 @@
 ?????? ???3 ????????? 0
 ?????? ???3 ?????????4 0
 ?????? ???3 ?????????2 0
+?????? ???3 ??????3 0
 ?????? ???3 ??????4 0
 ?????? ???3 ?????????3 0
 ?????? ???3 ?????????4 0
@@ -25751,6 +25865,7 @@
 ?????? ???4 ?????????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ?????????4 0
+????????? ???4 ????????? ????????? 0
 ?????? ???4 ??????2 0
 ???????????? ???4 ?????????2 ??????4 ??????2 0
 ?????? ???4 ??????2 0
@@ -25761,6 +25876,7 @@
 ?????? ???4 ??????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ???2 0
+????????? ???4 ??????4 ??????2 0
 ???????????? ???4 ??????4 ??????4 ??????4 0
 ?????? ???4 ?????????2 0
 ?????? ???4 ?????????2 0
@@ -25928,6 +26044,7 @@
 ???????????? ??????4 ??????2 ?????? ??????2 0
 ????????? ??????4 ?????????2 ??????2 0
 ???????????? ?????? ??????2 ?????????4 ?????????4 0
+????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
 ?????? ?????? ????????? 0
 ???????????? ?????? ????????? ??????3 ??????3 0
 ?????? ?????? ??????2 0
@@ -25938,6 +26055,7 @@
 ???????????? ?????? ??????4 ??????4 ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????3 0
+???????????? ?????? ?????????4 ??????4 ??????3 0
 ?????? ?????? ??????3 0
 ????????? ?????? ??????2 ??????3 0
 ?????? ?????? ?????? 0
@@ -25947,6 +26065,7 @@
 ???????????? ?????? ?????????4 ??????2 ??????4 0
 ???????????? ?????? ?????????3 ??????3 ???3 0
 ???????????? ?????? ??????4 ????????? ??????3 0
+???????????? ?????? ?????? ??????4 ??????4 0
 ?????? ?????? ???4 0
 ??????????????? ?????? ??????2 ??????3 ??????2 ??????1 0
 ?????? ?????? ??????3 0
@@ -26061,6 +26180,7 @@
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
 ????????? ??????4 ??????4 ??????3 0
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ????????? ??????4 ??????4 ?????? 0
@@ -26266,6 +26386,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ??????3 ?????????2 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????4 0
@@ -26488,6 +26609,7 @@
 ?????? ??????3 ??????4 0
 ????????? ??????3 ??????4 ?????????2 0
 ?????? ??????3 ??????4 0
+?????? ??????3 ??????3 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -26564,6 +26686,7 @@
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????? 0
 ???????????? ??????4 ??????2 ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ????????? ??????4 ???4 ??????1 0
@@ -27051,6 +27174,7 @@
 ?????? ???2 ?????????3 0
 ?????? ???2 ???3 0
 ?????? ???2 ??????3 0
+?????? ???3 ????????? 0
 ?????? ???3 ??????4 0
 ?????? ???3 ??????3 0
 ?????? ???3 ??????2 0
@@ -27262,11 +27386,14 @@
 ?????? ?????? ??????4 0
 ??? ??????2 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
+?????? ??????2 ??????3 0
 ????????? ??????2 ????????? ????????? 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
+????????? ??????2 ?????? ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ????????? 0
@@ -28337,6 +28464,7 @@
 ???????????????????????? ??? ??? ????????? ???2 ?????? ??? ?????? ???2 0
 ???????????? ??? ??? ????????? ??????4 0
 ?????? ??? ???2 0
+????????? ??? ???4 ??????4 0
 ?????? ??? ?????? 0
 ?????? ??? ??????3 0
 ?????? ??? ??????3 0
@@ -29455,6 +29583,7 @@
 ?????? ??????4 ???3 0
 ?????? ??????4 ???4 0
 ???????????? ?????? ???4 ?????????4 ?????????2 0
+?????? ?????? ???4 0
 ?????? ?????? ???4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
@@ -30115,8 +30244,10 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????2 0
+????????? ??????3 ??????2 ?????? 0
 ???????????? ??????3 ??????4 ?????? ??????2 0
 ????????? ??????3 ?????? ??????4 0
+?????? ??????3 ????????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ???2 0
 ???????????? ??????4 ???3 ??????4 ??????4 0
@@ -30229,6 +30360,7 @@
 ????????? ?????????4 ???4 ?????? 0
 ???????????? ?????????4 ???4 ?????????4 ??????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????2 0
@@ -30414,6 +30546,7 @@
 ?????? ????????? ?????????3 0
 ????????? ????????? ????????? ???3 0
 ???????????? ????????? ?????????3 ??????2 ?????????4 0
+????????? ????????? ??????2 ????????? 0
 ?????? ????????? ??????4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ?????????3 0
@@ -30989,6 +31122,7 @@
 ?????? ??? ??????2 0
 ?????? ??? ??????3 0
 ????????? ??? ??????3 ???2 0
+?????? ??? ??????3 0
 ?????? ??? ?????? 0
 ?????? ??? ??????4 0
 ?????? ??? ??????4 0
@@ -31008,10 +31142,12 @@
 ?????? ??? ???2 0
 ?????? ??? ???2 0
 ???????????? ??? ???4 ????????? ?????????4 0
+?????? ??? ??????3 0
 ?????? ??? ??????4 0
 ???????????? ??? ?????? ??????4 ?????????4 0
 ?????? ??? ??????3 0
 ?????? ??? ???4 0
+???????????? ??? ???4 ??????4 ???3 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
@@ -31398,6 +31534,7 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ???????????? ??????3 ??????2 ???2 ??????4 0
+????????? ??????3 ??????4 ??????4 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????3 0
@@ -31453,6 +31590,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????? 0
+????????? ?????? ?????????2 ??????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????4 ??????2 0
@@ -31466,6 +31604,8 @@
 ?????? ?????? ??????3 0
 ???????????? ?????? ??????3 ??????4 ?????????2 0
 ?????? ?????? ??? 0
+????????? ?????? ??????3 ??????3 0
+????????? ?????? ??????3 ??????4 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ???3 0
 ????????? ??????4 ???3 ?????????4 0
@@ -31739,6 +31879,7 @@
 ???????????? ?????????4 ?????????3 ??????4 ??????1 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ?????????2 0
+???????????? ?????????4 ??????4 ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
 ????????? ?????????4 ????????? ??????1 0
 ???????????? ?????????4 ?????????4 ??????4 ??????1 0
@@ -31863,6 +32004,7 @@
 ?????? ???2 ?????????4 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????4 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
 ?????? ???2 ?????????4 0
@@ -31934,6 +32076,7 @@
 ???????????? ?????? ?????? ???2 ?????????4 0
 ?????? ?????? ?????? 0
 ?????? ??????4 ??????4 0
+????????? ??????4 ??????4 ?????????4 0
 ???????????? ??????4 ??????3 ??? ????????? 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
@@ -31943,6 +32086,7 @@
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
+????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -32135,6 +32279,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ??????4 0
 ????????? ?????? ??????4 ??????3 0
+???????????? ??????2 ???2 ??????2 ??????4 0
 ?????? ??????2 ???2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -32144,6 +32289,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ?????????3 0
+???????????? ??????2 ????????? ??????4 ?????????2 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
 ???????????? ??????2 ???2 ????????? ????????? 0
@@ -32187,6 +32333,10 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????3 ??????2 ???2 0
 ?????? ??????2 ????????? 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ???4 0
+????????? ??????2 ????????? ??????4 0
 ????????????????????? ??????2 ????????? ?????? ??????3 ??????2 ??????2 ?????????3 0
 ???????????? ??????2 ?????? ??????4 ?????????2 0
 ?????? ??????2 ???4 0
@@ -32986,61 +33136,9 @@
 ?????? ??? ??? 0
 ?????? ??? ??? 0
 ?????? ??? ??? 0
-????????? ??????4 ?????????4 ?????????4 0
-?????? ?????????2 ??????4 0
-?????? ??????3 ?????? 0
-???????????? ??????4 ??????2 ?????????3 ??????3 0
-????????? ??????3 ????????? ??????2 0
-???????????? ??????3 ??????4 ?????????4 ?????? 0
-????????? ??????3 ??????3 ?????? 0
-????????? ?????????3 ??????2 ??????4 0
-?????? ??????3 ????????? 0
-????????? ??????3 ??????2 ?????? 0
-????????? ???4 ????????? ????????? 0
-????????? ???4 ??????4 ??????2 0
-????????? ?????? ??????3 ??????4 0
-????????? ?????? ??????3 ??????3 0
-????????? ?????? ?????????2 ??????2 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ???4 0
-?????? ??????4 ??????2 0
-????????? ??????2 ??????4 ??????1 0
-????????? ??????2 ????????? ??????3 0
-?????? ??????2 ??????3 0
-???????????? ?????? ?????????4 ??????4 ??????3 0
-?????? ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ??????2 ?????? ??????2 0
-???????????? ?????? ?????? ??????4 ??????4 0
-????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
-?????? ??????4 ??????4 0
-???????????? ??????2 ??????2 ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ???2 ???4 ?????????4 0
-???????????? ???2 ???4 ?????????2 ????????? 0
-????????? ???2 ???4 ?????????2 0
-?????? ?????????2 ????????? 0
-???????????? ?????????2 ??????2 ??? ??????4 0
-????????? ?????????2 ????????? ??????2 0
-???????????? ?????? ??????4 ??????4 ???4 0
-???????????? ??????2 ???2 ??????2 ??????4 0
-???????????? ??????2 ????????? ??????4 ?????????2 0
-????????? ??????4 ?????????4 ???4 0
-????????? ??????4 ?????????4 ?????????3 0
-????????? ??????3 ???4 ??????2 0
-???????????? ??????3 ?????? ??????4 ???3 0
-???????????? ??????2 ??????2 ??????2 ??????4 0
-???????????? ??????2 ??????4 ?????????2 ??????2 0
-?????? ??????4 ?????????4 0
-????????? ??????4 ??????4 ?????????2 0
-??? ?????????3 0
-?????? ?????????3 ?????????3 0
-????????? ??????2 ??????2 ??????2 0
-?????? ?????? ??????3 0
-??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
-?????? ???3 ??????3 0
-????????? ????????? ?????????4 ??????4 0
-????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
-????????? ??????3 ??????4 ??????4 0
+????????? ?????? ????????? ??????3 0
+??????????????? ??? ??? ??????3 ??????4 ??????4 0
+?????? ??????3 ??????2 0
+?????? ?????? ????????? 0
+?????? ?????? ????????? 0
+?????? ?????????3 ????????? 0
Binary files gcin-1.2.9.orig/.tedfilepos and gcin-1.2.9/.tedfilepos differ
diff -urN gcin-1.2.9.orig/tenv gcin-1.2.9/tenv
--- gcin-1.2.9.orig/tenv	2006-10-19 14:18:38.000000000 +0800
+++ gcin-1.2.9/tenv	2006-11-15 13:10:24.000000000 +0800
@@ -11,6 +11,6 @@
 gcinpid=$!
 sleep 1
 export LD_PRELOAD=./im-client/libgcin-im-client.so
-#gedit
-leafpad
+gedit
+#leafpad
 pkill gcin.test


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin	15 Nov 2006 06:58:05 -0000	1.1
+++ NewCJ3.cin	17 Nov 2006 00:29:32 -0000	1.2
@@ -52,7 +52,6 @@
 ... ???
 ... ???
 ... ???
-.; ???
 ' ???
 '' "
 '' "
@@ -171,7 +170,6 @@
 ;a ???
 ;b ???
 ;c ???
-;cu ???
 ;d ???
 ;e ???
 ;f ???
@@ -194,7 +192,9 @@
 ;s ???
 ;t ???
 ;u ???
+;ui ??????
 ;uu ??????
+;uio ?????????
 ;u; ???
 ;v ???
 ;w ???
@@ -216,7 +216,7 @@
 b ???
 b ???
 b ???
-b; ???
+b; ???
 b;; ??????
 c ???
 c ???
@@ -249,7 +249,7 @@
 f ???
 f ???
 f ???
-f; ???
+f; ???
 g ???
 g ???
 g ???
@@ -297,7 +297,7 @@
 l ???
 l ???
 l ???
-l; ???
+l; ???
 m ???
 m ???
 m ???
@@ -347,7 +347,7 @@
 q ???
 q ???
 q ???
-q; ???
+q; ???
 r ???
 r ??
 r ???
@@ -382,7 +382,6 @@
 t ???
 t ???
 t; ???
-t;; ???
 u ???
 u ???
 u ???
@@ -410,7 +409,6 @@
 w ???
 w ???
 w; ???
-w;; ???
 x ???
 x ???
 x ???
@@ -459,7 +457,6 @@
 w. ???
 x. ???
 x. ??
-x.; ??
 y. ???
 z. ???
 a, ???
@@ -493,11 +490,9 @@
 ab ???
 ac ???
 ad ???
-ad; ???
 ae ???
 af ???
 af ???
-af; ???
 ag ???
 ah ???
 ai ???
@@ -526,7 +521,7 @@
 bd ???
 be ???
 bf ???
-bf; ???
+bf; ?????????
 bg ???
 bg ???
 bh ???
@@ -537,8 +532,8 @@
 bm ???
 bm ???
 bm ???
+bn ???
 bn ???
-bn; ???
 bo ???
 bp ???
 bq ???
@@ -546,7 +541,6 @@
 bs ???
 bt ???
 bt ???
-bt; ???
 bu ???
 bv ???
 bw ???
@@ -571,21 +565,18 @@
 ck ???
 cl ???
 cl ???
-cl; ???
 cm ???
 cn ???
 cn; ???
 co ???
 cp ???
-cq ???
-cq; ???
+cq ???
 cr ???
 cs ???
 ct ???
 cu ???
 cu; ???
 cv ???
-cv; ???
 cw ???
 cx ???
 cx; ??????
@@ -605,14 +596,12 @@
 dh ???
 di ???
 di ???
-di; ???
 dj ???
 dk ???
 dk ???
 dl ???
 dm ???
 dm ???
-dm; ???
 dn ???
 do ???
 dp ???
@@ -630,11 +619,11 @@
 ea ???
 ea ???
 ea ???
-ea; ???
 eb ???
 ec ???
 ec ???
 ed ???
+ee ???
 ee ???
 ef ???
 eg ???
@@ -692,7 +681,6 @@
 ga ???
 gb ???
 gb ???
-gb; ???
 gc ???
 gd ???
 ge ???
@@ -715,7 +703,6 @@
 gt ???
 gu ???
 gu ???
-gu; ???
 gv ???
 gw ???
 gx ???
@@ -724,38 +711,28 @@
 ha ???
 hb ???
 hc ???
-hc; ???
 hd ???
 hd; ???
 he ???
-he; ???
 hf ???
 hg ???
-hg; ???
 hh ???
-hh; ???
 hi ???
 hi ???
 hi; ???
 hj ???
 hk ???
-hk; ???
 hl ???
-hm ???
 hm ???
-hm; ???
 hn ???
-hn; ???
 ho ???
 ho ???
-ho; ???
 hp ???
-hp; ???
 hq ???
 hr ???
 hs ???
 hs ???
-hs; ???
+hs; ???
 ht ???
 ht; ???
 ht;; ??????
@@ -766,26 +743,18 @@
 hw; ??????
 hx ???
 hx; ???
-hy ???
-hy; ???
+hy ???
 hz ???
 ia ???
 ib ???
-ib; ???
 ic ???
 id ???
 id ???
-id; ???
-id; ???
 ie ???
-if ???
-if; ??????
+if ??????
 ig ???
 ih ???
-ih; ???
 ii ???
-ii ???
-ii; ???
 ij ???
 ik ???
 il ???
@@ -794,16 +763,15 @@
 io ???
 io; ???
 io; ???
-ip ???
+ip ???
 ip ???
 ip ???
-ip; ???
+ip ???
 iq ???
 ir ???
 is ???
 it ???
 it ???
-it; ???
 iu ???
 iv ???
 iv; ???
@@ -813,8 +781,8 @@
 iz ???
 izo ??????
 ja ???
+jb ???
 jb ???
-jb; ???
 jc ???
 jd ???
 jd ???
@@ -824,8 +792,6 @@
 jh ???
 ji ???
 jj ???
-jj; ???
-jj; ???
 jk ???
 jk; ???
 jl ???
@@ -837,7 +803,6 @@
 jp ???
 jq ???
 jr ???
-jr; ???
 js ???
 jt ???
 ju ???
@@ -849,13 +814,11 @@
 ka ???
 kb ???
 kb ???
-kb; ???
 kc ???
 kd ???
 ke ???
 kf ???
 kf ???
-kf; ???
 kg ???
 kh ???
 ki ???
@@ -866,18 +829,16 @@
 km ???
 kn ???
 kn ???
-kn; ???
 ko ???
 ko; ???
+kp ???
 kp ???
-kp; ???
 kq ???
 kr ???
 ks ???
 kt ???
 ku ???
 ku ???
-ku; ???
 ku; ???
 kv ???
 kw ???
@@ -885,9 +846,7 @@
 ky ???
 kz ???
 la ???
-la; ???
 lb ???
-lb; ???
 lc ???
 ld ???
 le ???
@@ -908,85 +867,70 @@
 ls ???
 lt ???
 lu ???
-lu; ???
 lv ???
 lw ???
+lw; ???
 lx ???
 ly ???
 lz ???
 ma ???
 mb ???
-mb; ???
 mc ???
-mc; ???
 md ???
 me ???
 me ???
 me ???
 me; ???
 mf ???
-mf; ???
 mg ???
+mh ???
 mh ???
-mh; ???
 mi ???
 mi; ???
 mj ???
 mk ???
-mk; ???
+mk; ???
+ml ???
 ml ???
-ml; ???
 mm ???
-mm ???
-mm; ???
 mn ???
 mo ???
-mo; ???
 mp ???
 mq ???
 mr ???
 ms ???
-ms; ???
 mt ???
-mt; ???
+mu ???
 mu ???
 mu ???
-mu; ???
-mv ???
+mv ???
 mv ???
-mv; ???
 mw ???
+mw; ???
 mx ???
 my ???
 mz ???
 na ???
 nb ???
-nb; ???
 nc ???
 nd ???
 ne ???
-ne; ???
 nf ???
 ng ???
 nh ???
 ni ???
 ni ???
-ni; ???
-ni; ???
-ni;; ???
 nj ???
 nk ???
 nl ???
 nl ???
-nl; ???
 nm ???
 nn ???
 no ???
 no ???
 no ???
-no No.
-no; ???
 np ???
+nq ???
 nq ???
 nq ???
 nq; ???
@@ -998,7 +942,6 @@
 nw ???
 nx ???
 nx ???
-nx; ???
 ny ???
 nz ???
 oa ???
@@ -1010,8 +953,8 @@
 ob ???
 ob ???
 ob; ???
+oc ???
 oc ???
-oc; ???
 od ???
 od ???
 od ???
@@ -1039,7 +982,6 @@
 og ???
 og ???
 og ???
-og; ???
 oh ???
 oh ???
 oh ???
@@ -1056,7 +998,6 @@
 oi ???
 oi ???
 oi ???
-oi; ???
 oj ???
 oj ???
 oj ???
@@ -1075,9 +1016,7 @@
 om ???
 om ???
 om ???
-om; ???
 on ???
-on; ???
 oo ???
 oo ???
 oo ???
@@ -1118,7 +1057,6 @@
 oq ???
 oq ???
 or ???
-or; ???
 or ???
 or ???
 or ???
@@ -1162,10 +1100,10 @@
 ou ???
 ou ???
 ou ???
-ou; ???
 ov ???
-ov; ???
+ow ???
 ow ???
+ow; ???
 ow ???
 ow ???
 ow ???
@@ -1177,7 +1115,6 @@
 ow ???
 ow ???
 ow ???
-ow; ???
 ox ???
 oy ???
 oy ???
@@ -1191,14 +1128,13 @@
 oy ???
 oy ???
 oy ???
-oy; ???
 oz ???
 pa ???
 pa ???
 pa; ???
 pb ???
+pc ???
 pc ???
-pc; ???
 pd ???
 pe ???
 pe; ??????
@@ -1207,14 +1143,13 @@
 ph ???
 pi ???
 pi ???
-pi; ???
 pj ???
+pk ???
 pk ???
-pk; ???
 pl ???
 pm ???
+pn ???
 pn ???
-pn; ???
 po ???
 pp ???
 pq ???
@@ -1227,74 +1162,66 @@
 px ???
 py ???
 pz ???
+qa ???
 qa ???
-qa; ???
+qb ???
 qb ???
-qb; ???
+qc ???
 qc ???
-qc; ???
+qd ???
 qd ???
-qd; ???
 qe ???
 qf ???
 qg ???
 qh ???
 qi ???
 qj ???
-qj; ???
 qk ???
 ql ???
 qm ???
-qm; ???
 qn ???
 qo ???
 qp ???
-qq ???
+qq ???
 qr ???
 qs ???
 qt ???
 qu ???
-qu; ???
 qv ???
 qw ???
 qx ???
+qy ???
 qy ???
-qy; ???
 qz ???
 ra ???
 rb ???
-rb; ???
 rc ???
 rc ???
-rc; ???
 rd ???
 re ???
 rf ???
-rf; ???
 rg ???
 rh ???
 ri ???
 rj ???
 rk ???
+rk; ???
 rl ???
 rm ???
 rn ???
 ro ???
 rp ???
-rp; ???
 rq ???
 rr ???
 rs ???
-rt ???
+rt ???
 ru ???
-ru; ???
 ru; ???
 rv ???
 rw ???
 rx ???
 ry ???
 rz ???
-rz; ???
 sa ???
 sb ???
 sc ???
@@ -1314,12 +1241,10 @@
 sp ???
 sq ???
 sr ???
-sr; ???
 ss ???
 st ???
-su ???
 su ???
-su; ???
+su ???
 sv ???
 sw ???
 sw; ???
@@ -1327,7 +1252,6 @@
 sy ???
 sz ???
 ta ???
-ta; ???
 tb ???
 tc ???
 tc ???
@@ -1335,25 +1259,22 @@
 te ???
 tf ???
 tg ???
-tg; ???
 th ???
+ti ???
 ti ???
-ti; ???
+tj ???
 tj ???
-tj; ???
 tj; ???
 tk ???
 tk; ???
 tl ???
 tm ???
-tm; ???
 tn ???
-tn; ???
 tn; ???
 tn; ???
 to ???
+tp ???
 tp ???
-tp; ???
 tq ???
 tr ???
 ts ???
@@ -1361,16 +1282,14 @@
 tt ???
 tt ???
 tt ???
-tt; ???
-tu ???
-tu; ???
+tt; ???
+tu ???
 tv ???
 tv; ???
 tw ???
 tw ???
 tw; ???
 tw; ???
-tw;; ???
 tx ???
 ty ???
 tz ???
@@ -1404,8 +1323,8 @@
 uy ???
 uz ???
 va ???
-vb ???
-vb; ???
+va; ???
+vb ???
 vc ???
 vd ???
 ve ???
@@ -1416,32 +1335,29 @@
 vi ???
 vj ???
 vk ???
-vk; ???
-vl ???
-vl ???
+vl ???
 vl ???
 vl; ???
+vm ???
 vm ???
-vm; ???
+vm; ???
 vn ???
 vo ???
 vo; ???
 vp ???
 vq ???
 vr ???
-vr; ???
 vs ???
 vt ???
+vu ???
 vu ???
-vu; ???
+vv ???
 vv ???
-vv; ???
 vw ???
 vx ???
-vy ???
-vy; ???
+vy ???
+vz ???
 vz ???
-vz; ???
 wa ???
 wb ???
 wc ???
@@ -1451,13 +1367,11 @@
 we ???
 wf ???
 wg ???
-wg; ???
 wh ???
 wi ???
 wj ???
 wj ???
 wk ???
-wk ???
 wl ???
 wm ???
 wn ???
@@ -1468,14 +1382,13 @@
 ws ???
 wt ???
 wu ???
+wv ???
 wv ???
-wv; ???
-ww ???
+ww ???
 wx ???
 wy ???
 wz ???
 wz ???
-wz; ???
 xa ???
 xb ???
 xc ???
@@ -1491,7 +1404,6 @@
 xm ???
 xn ???
 xo ???
-xo; ??
 xp ???
 xq ???
 xr ???
@@ -1518,30 +1430,28 @@
 yj ???
 yj; ???
 yk ???
-yk; ???
 yl ???
 ym ???
 yn ???
 yo ???
 yo; ???
+yp ???
 yp ???
-yp; ???
 yp; ???
 yq ???
 yr ???
+ys ???
 ys ???
-ys; ???
 yt ???
+yu ???
 yu ???
-yu; ???
 yv ???
 yw ???
 yx ???
+yy ???
 yy ???
-yy; ???
 yy, ??????
 yz ???
-yz; ???
 za ???
 zb ???
 zc ???
@@ -1555,7 +1465,7 @@
 zk ???
 zl ???
 zm ???
-zm; ???
+zm ???
 zn ???
 zo ???
 zp ???
@@ -1564,12 +1474,12 @@
 zs ???
 zt ???
 zu ???
-zu; ???
+zu ???
 zv ???
 zw ???
 zx ???
 zy ???
-zy; ???
+zy ???
 zz ???
 aaa ???
 aaa ???
@@ -6623,6 +6533,7 @@
 nbp ???
 nbp; ???
 nbu ???
+ncj ????????????
 ncz ???
 nde ???
 ndk ???
@@ -7052,10 +6963,9 @@
 ojg ???
 oji ???
 ojj ???
+ojk ???
 ojk ???
 ojk ???
-ojk ???
-ojk; ???
 ojm ???
 ojm ???
 ojm; ???
@@ -8546,20 +8456,8 @@
 rgc ???
 rgc ???
 rgc ???
-rgc (?????????)a
-rgc (?????????|||)??????
-rgc =???=b
-rgc ???????????????|||??????
 rgc; ???
 rgg ???
-rgg (????????????)
-rgg ???(???_???;)???
-rgg ??????~??????~
-rgg (??????O???)
-rgg .......\(><)/
-rgg ???*@??@*???
-rgg O_o
-rgg ???(???_???;)?????????~??????~
 rgi ???
 rgj ???
 rgk ???
@@ -9681,9 +9579,8 @@
 tmb ???
 tmb ???
 tmb; ???
-tmc ???
 tmc ???
-tmc; ???
+tmc ???
 tmd ???
 tmd ???
 tmd; ???
@@ -19631,6 +19528,7 @@
 somr ???
 sonl ???
 sorc ???
+sorr ?????????
 sphf ???
 sphh ???
 sqnl ???
@@ -28614,7 +28512,6 @@
 bopo ???
 boqa ???
 boqb ???
-boqh ????????????
 borb ????
 borg ????
 bort ????


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	15 Nov 2006 06:58:05 -0000	1.12
+++ gcin.spec	17 Nov 2006 00:29:32 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         gcin129update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .up
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -107,6 +109,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+- add gcin129update.patch
+- update NewCJ3.cin
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Fri Nov 17 00:33:21 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:33:21 -0700
Subject: rpms/gcin/FC-5 gcin129update.patch, NONE, 1.1 NewCJ3.cin, 1.1,
	1.2 gcin.spec, 1.12, 1.13
Message-ID: <200611170033.kAH0XLkU018806@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18785

Modified Files:
	NewCJ3.cin gcin.spec 
Added Files:
	gcin129update.patch 
Log Message:
add gcin129update.patch and update NewCj3.cin

gcin129update.patch:

--- NEW FILE gcin129update.patch ---
diff -urN gcin-1.2.9.orig/Changelog gcin-1.2.9/Changelog
--- gcin-1.2.9.orig/Changelog	2006-11-14 18:24:09.000000000 +0800
+++ gcin-1.2.9/Changelog	2006-11-15 18:52:02.000000000 +0800
@@ -1,5 +1,5 @@
 ** UTF-8 encoding **
-1.2.9:
+1.2.9: (11/15/2006)
 - ???????????? tray icons ???????????? ~/.gcin/icons ???????????? symbolic link ?????????
 - ????????????????????????????????? tray icons??????????????????????????????
 - ???????????????????????????????????????????????????????????????????????????
@@ -7,7 +7,7 @@
 - ???????????????????????? FC6??????????????????????????????
 - ????????? WM(fvwm1) ?????????????????????????????????????????????????????? keyboard focus ??????????????????????????? gcin ??? window????????????????????? click ????????????????????????????????????????????????????????? WM or X11 server ???????????? focus ??????????????? override_redirect ??? window???
 - FreeBSD /usr/bin/bash ??????????????? ./configure ?????????????????? /bin/bash -> /usr/bin/bash
-- libgcin-im-client.so ?????? soname???thanks to caleb
+- libgcin-im-client.so ?????? soname???thanks to candyz
 
 
 1.2.8: (10/19/2006)
diff -urN gcin-1.2.9.orig/configure gcin-1.2.9/configure
--- gcin-1.2.9.orig/configure	2006-11-06 09:29:26.000000000 +0800
+++ gcin-1.2.9/configure	2006-11-15 18:53:54.000000000 +0800
@@ -74,7 +74,7 @@
   echo "/bin/bash -> /usr/bin/bash"
   for i in scripts/*
   do
-    sed -e "s~/bin~/usr/bin" < $i > $i.tmp
+    sed -e "s~/bin~/usr/bin~" < $i > $i.tmp
     mv $i.tmp $i
   done
 fi
diff -urN gcin-1.2.9.orig/data/tsin.src gcin-1.2.9/data/tsin.src
--- gcin-1.2.9.orig/data/tsin.src	2006-11-15 13:05:04.000000000 +0800
+++ gcin-1.2.9/data/tsin.src	2006-11-15 18:56:36.000000000 +0800
@@ -1049,6 +1049,7 @@
 ?????? ???4 ?????? 0
 ?????? ???4 ??????4 0
 ????????????????????? ???4 ?????????2 ???2 ??? ???2 ?????????2 ??????3 0
+????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
 ???????????? ???4 ???2 ???4 ?????????3 0
 ???????????? ???4 ???2 ?????????3 ?????????3 0
 ???????????? ???4 ???2 ??? ?????????3 0
@@ -1439,6 +1440,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????4 ?????????2 ??????2 0
 ???????????? ??????2 ??????4 ?????????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -1448,6 +1450,7 @@
 ???????????? ??????2 ??????4 ?????? ??????4 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ??????4 0
+????????? ??????2 ??????4 ?????????4 0
 ????????? ??????2 ??????4 ??????2 0
 ???????????? ??????2 ??????2 ??????3 ?????????4 0
 ?????? ??????2 ?????????2 0
@@ -1458,6 +1461,7 @@
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????? 0
 ???????????? ??????2 ??????2 ???3 ?????????3 0
+???????????? ??????2 ??????2 ??????2 ??????4 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ??????3 ?????? 0
 ?????? ??????2 ??????2 0
@@ -2442,6 +2446,7 @@
 ????????? ??????3 ??????4 ?????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????2 0
+????????? ??????3 ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
@@ -2547,6 +2552,7 @@
 ?????? ??? ??? 0
 ???????????? ??? ?????? ??????3 ????????? 0
 ?????? ??? ?????????3 0
+???????????? ???2 ???4 ??????2 ?????????4 0
 ?????? ???2 ???4 0
 ?????? ???2 ???4 0
 ???????????? ???2 ??? ???2 ??????4 0
@@ -2556,19 +2562,23 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ????????? 0
 ????????? ???2 ???4 ????????? 0
+???????????? ???2 ??????4 ??????2 ?????????2 0
 ???????????? ???2 ?????? ???2 ??????4 0
 ???????????? ???2 ??????2 ???3 ?????????4 0
+????????????????????? ???2 ??????2 ?????????4 ????????? ????????? ??????4 ??????3 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????3 ???2 ????????? 0
 ???????????? ???2 ??????2 ???2 ???4 0
 ???????????? ???2 ??????2 ??????2 ???4 0
 ????????? ???2 ??????3 ?????????2 0
 ?????? ???2 ??????4 0
+???????????? ???2 ??????3 ??????2 ??????4 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????4 ??? ?????? 0
 ???????????? ???2 ??????4 ??????4 ??????3 0
 ???????????? ???2 ???3 ?????????2 ??????3 0
 ???????????? ???2 ???4 ??????2 ?????? 0
+???????????? ???2 ?????? ???2 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ???2 ??????4 0
 ???????????? ???2 ??????3 ??????2 ?????????4 0
@@ -2577,6 +2587,8 @@
 ???????????? ???2 ?????? ???4 ???2 0
 ??????????????? ???2 ??????4 ???3 ??? ??????4 0
 ?????? ???2 ??????4 0
+???????????? ???2 ????????? ???2 ??????4 0
+???????????? ???2 ?????????4 ?????? ??????2 0
 ???????????? ???2 ?????????2 ???2 ??????4 0
 ????????? ???2 ?????????3 ??????2 0
 ???????????? ???2 ?????????2 ?????? ?????????2 0
@@ -2585,19 +2597,26 @@
 ????????? ???2 ?????????2 ???4 0
 ?????? ???2 ??????3 0
 ???????????? ???2 ??????3 ???2 ????????? 0
+???????????? ???2 ??????3 ??????3 ?????????3 0
 ???????????? ???2 ??????3 ?????? ?????????4 0
+???????????? ???2 ?????? ????????? ???4 0
 ?????? ???2 ??????2 0
 ??????????????? ???2 ?????? ??????4 ??????3 ??????4 0
+???????????? ???2 ??????2 ????????? ??????4 0
 ????????? ???2 ??????3 ??????2 0
 ?????? ???2 ??????2 0
 ????????? ???2 ??????3 ?????????4 0
+???????????? ???2 ??????4 ??????4 ???3 0
+???????????? ???2 ??????4 ???4 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ??????3 ???3 0
+??????????????? ???2 ??????2 ??????2 ??????4 ?????? 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ??????4 ???3 0
 ???????????? ???2 ?????????4 ???2 ????????? 0
 ???????????? ???2 ??????2 ?????? ??????2 0
 ?????? ???2 ??????2 0
+????????? ???2 ?????????2 ?????????4 0
 ?????? ???2 ?????????2 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
@@ -2610,6 +2629,8 @@
 ?????? ???2 ??????4 0
 ????????? ???2 ??????4 ??????3 0
 ???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ?????? ?????????4 0
+??????????????? ???2 ??????4 ??????2 ??? ??????4 0
 ?????? ???2 ?????????2 0
 ???????????? ???2 ??????4 ??????3 ??????3 0
 ?????? ???2 ?????????4 0
@@ -2618,13 +2639,18 @@
 ????????? ???2 ?????? ??????1 0
 ????????? ???2 ????????? ???2 0
 ?????? ???2 ????????? 0
+??????????????? ???2 ????????? ???4 ?????? ????????? 0
 ???????????? ???2 ????????? ?????????4 ??????3 0
+???????????? ???2 ????????? ?????????3 ??????4 0
 ??????????????? ???2 ????????? ?????????3 ??????4 ??????1 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ???2 ??????3 0
+??????????????? ???2 ????????? ??????2 ??????4 ??????4 0
+???????????? ???2 ??????3 ??????4 ??????4 0
 ???????????? ???2 ??????3 ??????3 ??????2 0
 ???????????? ???2 ??????3 ??????4 ?????? 0
 ???????????? ???2 ??????3 ?????????4 ??????4 0
+???????????? ???2 ??????3 ?????????4 ?????????4 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ??????????????? ???2 ??????4 ??????4 ??? ?????? 0
 ?????? ???2 ??????2 0
@@ -2632,7 +2658,10 @@
 ?????? ???2 ?????? 0
 ???????????? ???2 ?????? ??? ??????2 0
 ???????????? ???2 ??????2 ???2 ????????? 0
+????????? ???2 ??????3 ???2 0
 ???????????? ???2 ??????4 ???2 ???4 0
+??????????????? ???2 ??????4 ?????????2 ??????2 ?????????4 0
+???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ????????? ??????3 ????????? 0
 ?????? ???2 ?????????4 0
@@ -2650,7 +2679,9 @@
 ?????? ???2 ?????????2 0
 ????????? ???2 ?????????2 ??????1 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????2 0
 ?????? ???2 ?????????2 0
+???????????? ???2 ?????????2 ???2 ?????????4 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ?????????4 ??? ??????2 0
 ???????????? ???2 ?????????4 ??????3 ??????2 0
@@ -2666,12 +2697,19 @@
 ?????? ???2 ?????????2 0
 ???????????? ???2 ?????????4 ?????? ???2 0
 ?????? ???2 ??? 0
+????????? ???2 ???3 ?????????4 0
 ???????????? ???2 ???3 ?????????4 ??????1 0
 ??????????????? ???2 ?????? ??????4 ??????3 ?????? 0
 ???????????? ???2 ??????4 ?????????4 ???3 0
+??????????????? ???2 ??????4 ??????3 ?????????4 ??????4 0
+?????? ???2 ??????4 0
+????????? ???2 ??????4 ???2 0
 ???????????? ???2 ????????? ?????? ??????3 0
 ?????? ???2 ???3 0
 ????????? ???2 ??????2 ???4 0
+???????????? ???2 ?????? ??????2 ??????4 0
+???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ??????3 ??????4 0
 ???????????? ???2 ??? ???4 ????????? 0
 ???????????? ???2 ???2 ???2 ??????4 0
 ????????? ???2 ???4 ???2 0
@@ -2684,6 +2722,7 @@
 ?????? ???2 ??????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ?????? ?????????2 0
+???????????? ???2 ???4 ????????? ?????? 0
 ?????? ???2 ?????????4 0
 ????????? ???2 ????????? ?????????4 0
 ???????????? ???2 ?????????2 ??????2 ??? 0
@@ -2692,6 +2731,7 @@
 ?????????????????? ???2 ?????????3 ??????2 ??????4 ??????2 ??????2 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ???????????? ???2 ?????????3 ??????4 ??????2 0
+???????????? ???2 ?????????3 ??????4 ????????? 0
 ???????????? ???2 ?????????3 ???4 ???4 0
 ???????????? ???2 ?????????3 ???4 ?????????2 0
 ?????? ???3 ??? 0
@@ -2955,6 +2995,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????3 0
+????????? ??????4 ??????4 ?????????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ?????????2 0
 ?????? ??????4 ?????????2 0
@@ -3674,6 +3715,7 @@
 ????????? ??????3 ??????3 ?????????4 0
 ?????? ??????3 ???4 0
 ???????????? ??????3 ??????4 ????????? ?????? 0
+?????? ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -5947,6 +5989,7 @@
 ???????????? ??????2 ??????4 ???2 ?????????2 0
 ?????? ??????2 ??????4 0
 ????????????????????? ??????2 ??????3 ??????4 ??????2 ???2 ???2 ??????4 0
+?????? ??????2 ??????4 0
 ???????????? ??????2 ??????4 ??? ????????? 0
 ?????? ??????2 ?????????4 0
 ????????? ??????2 ????????? ??????2 0
@@ -6197,6 +6240,8 @@
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ???3 ??????4 0
 ?????? ??????4 ?????????2 0
+???????????? ??????4 ??????3 ??????4 ?????????2 0
+??????????????? ??????4 ??????3 ??????4 ?????????2 ?????? 0
 ???????????? ??????4 ??????3 ??????4 ???3 0
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????2 ??????2 ??????4 0
@@ -6299,6 +6344,7 @@
 ????????? ??????4 ?????? ??????4 0
 ?????? ??????4 ??????2 0
 ????????? ??????4 ??????2 ?????????4 0
+???????????? ??????4 ??????2 ?????????3 ??????3 0
 ????????? ??????4 ??????3 ????????? 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ?????????3 ??????2 0
@@ -6515,7 +6561,9 @@
 ???????????? ?????? ??????3 ?????????4 ?????????2 0
 ?????? ?????? ???3 0
 ???????????? ??????2 ??????2 ?????? ?????? 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ????????? ??????2 ?????? ??????2 0
 ???????????? ??????2 ??????2 ?????? ????????? 0
 ?????? ??????2 ?????? 0
@@ -7118,11 +7166,13 @@
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ??????4 ?????????4 ?????? 0
 ???????????? ??????3 ????????? ?????????2 ?????????4 0
 ????????? ??????3 ?????????2 ?????? 0
 ?????? ??????3 ????????? 0
 ????????? ??????3 ????????? ??????1 0
 ???????????? ??????3 ????????? ??????3 ???4 0
+????????? ??????3 ????????? ??????2 0
 ????????? ??????3 ??????2 ??????2 0
 ????????? ??????3 ??????4 ??? 0
 ?????? ??????3 ??????2 0
@@ -7456,6 +7506,7 @@
 ????????? ??????2 ????????? ??????3 0
 ????????? ??????2 ????????? ?????? 0
 ????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????2 0
 ???????????? ??????2 ?????? ???4 ??????4 0
 ???????????? ??????2 ?????? ??????3 ?????????4 0
 ?????? ??????2 ?????????4 0
@@ -7509,6 +7560,7 @@
 ????????? ??????3 ???2 ??????1 0
 ????????? ??????3 ???4 ????????? 0
 ????????? ??????3 ???4 ?????????3 0
+?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ???4 0
@@ -7974,6 +8026,7 @@
 ?????? ?????????2 ?????? 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????3 ???2 ??????2 ?????? 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ?????????3 0
@@ -7994,10 +8047,13 @@
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ??? ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ???????????? ?????????2 ?????????2 ??????4 ???3 0
+?????? ?????????2 ????????? 0
 ????????? ?????????2 ????????? ??????4 0
+????????? ?????????2 ????????? ??????2 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ????????? ?????????2 ??? ?????????3 0
@@ -8195,6 +8251,7 @@
 ???????????????????????? ?????????2 ????????? ???4 ?????????3 ???4 ?????????4 ??????2 ??????2 0
 ??????????????????????????? ?????????2 ????????? ???4 ?????????3 ??? ???4 ?????????4 ??????2 ??????2 0
 ?????? ?????????2 ?????????4 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ????????? 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????4 0
@@ -8380,6 +8437,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ?????? 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????2 0
@@ -8648,6 +8706,7 @@
 ????????? ?????? ?????????2 ????????? 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ?????????2 0
+????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ??? 0
 ???????????? ?????? ?????????2 ??????3 ??????4 0
@@ -10358,6 +10417,7 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????4 0
 ???????????? ?????? ????????? ????????? ?????????2 0
 ???????????? ?????? ????????? ?????? ??????3 0
 ?????? ?????? ????????? 0
@@ -10526,6 +10586,7 @@
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????3 ???4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ??????4 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ??????3 0
@@ -10706,6 +10767,7 @@
 ????????? ??????4 ??????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????3 0
+?????? ??????4 ?????????3 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
@@ -10719,6 +10781,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -11194,6 +11257,7 @@
 ????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ??????2 ????????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????2 0
@@ -12041,6 +12105,7 @@
 ???????????? ??????2 ???2 ??????4 ??????4 0
 ?????? ??????2 ??????3 0
 ?????? ??????2 ??????4 0
+?????? ??????2 ?????? 0
 ???????????? ??????2 ??????3 ??????4 ??????4 0
 ?????? ??????2 ?????????3 0
 ?????? ??????2 ??????4 0
@@ -12073,6 +12138,7 @@
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????2 ???2 ??????4 0
 ???????????? ?????? ??????2 ???2 ??????4 0
+?????? ?????? ??????2 0
 ?????? ?????? ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????2 0
@@ -12168,6 +12234,8 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????3 0
+??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????3 0
 ?????? ?????? ???2 0
@@ -12336,6 +12404,7 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ???3 ?????????3 0
 ????????? ????????? ????????? ????????? 0
@@ -12492,6 +12561,7 @@
 ???????????? ????????? ????????? ??????4 ??????4 0
 ???????????? ????????? ????????? ?????? ???4 0
 ?????? ????????? ????????? 0
+???????????? ????????? ??????2 ??????2 ?????????4 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ??????2 ??????4 ?????????4 0
@@ -13045,6 +13115,7 @@
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????3 0
 ?????? ?????????2 ?????? 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ?????? 0
@@ -13097,16 +13168,20 @@
 ?????? ?????????4 ??????3 0
 ???????????? ?????????4 ??????2 ???4 ?????? 0
 ?????? ?????????4 ?????? 0
+???????????? ?????????4 ??????4 ???2 ?????????4 0
 ?????? ?????????4 ?????? 0
 ???????????? ?????????4 ?????????4 ??? ?????????4 0
+???????????? ?????????4 ?????????4 ?????????4 ?????????4 0
 ???????????? ?????????4 ??????3 ?????????2 ?????? 0
 ???????????? ?????????4 ?????? ?????????2 ??????4 0
 ???????????? ?????????4 ?????? ??? ?????? 0
 ?????? ?????????4 ??????3 0
+???????????? ?????????4 ??????3 ??????4 ?????? 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ??????4 0
 ?????? ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
+???????????? ?????????4 ????????? ??????2 ??????3 0
 ?????? ?????????4 ???4 0
 ???????????? ?????????4 ??????4 ????????? ?????? 0
 ?????? ?????????4 ??? 0
@@ -13930,6 +14005,7 @@
 ????????? ??????4 ?????? ?????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????2 0
+????????????????????? ??????4 ?????? ??? ?????????4 ????????? ?????????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????1 0
 ???????????? ??????4 ?????????2 ??????3 ?????????4 0
@@ -14847,6 +14923,7 @@
 ???????????? ?????????2 ??????4 ????????? ??????2 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????3 0
+????????? ?????????2 ??????3 ??????3 0
 ?????? ?????????2 ?????????2 0
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ???2 0
@@ -15078,6 +15155,7 @@
 ???????????? ?????????4 ??????2 ??????3 ???3 0
 ???????????? ?????????4 ??????2 ????????? ??????4 0
 ?????????????????? ?????????4 ??????2 ????????? ?????????4 ??????2 ???2 0
+???????????? ?????????4 ??????2 ????????? ??????2 0
 ?????????????????? ?????????4 ??????2 ??????4 ??????4 ??????4 ???3 0
 ?????? ?????????4 ??????4 0
 ?????? ??????2 ??????3 0
@@ -15389,7 +15467,9 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ???4 0
 ????????? ??????4 ?????????4 ?????????3 0
+????????? ??????4 ?????????4 ?????????3 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ??????4 0
@@ -16031,8 +16111,10 @@
 ?????? ?????? ??????2 0
 ?????? ?????? ??? 0
 ?????? ??????3 ???4 0
+????????? ??????3 ???4 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ?????? ??????4 ???3 0
 ?????? ??????3 ??????3 0
 ?????? ??????3 ???4 0
 ?????? ??????4 ??????3 0
@@ -16712,6 +16794,7 @@
 ?????? ?????????3 ?????????2 0
 ???????????? ?????????3 ????????? ??????4 ??????2 0
 ???????????? ????????? ?????? ???4 ?????????4 0
+???????????? ????????? ??????2 ?????? ?????? 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ?????? ????????? ??????2 0
@@ -17655,6 +17738,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ????????? ????????? ????????? ?????????2 0
 ?????? ????????? ?????????4 0
 ???????????? ????????? ?????????2 ??????4 ?????????4 0
@@ -18586,6 +18670,7 @@
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ??????3 0
+????????? ??????2 ??????2 ??????2 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ????????? 0
 ???????????? ??????2 ??????3 ??????2 ??????2 0
@@ -18661,6 +18746,7 @@
 ?????? ??????4 ??????3 0
 ???????????? ??????4 ??????3 ?????????2 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ??????3 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ????????? ???3 ??????3 0
 ?????? ??????4 ?????????4 0
@@ -18830,6 +18916,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ?????????3 ????????? ?????? 0
 ?????? ?????????4 ??????2 0
+????????? ?????????4 ??????2 ?????????3 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ??????3 0
@@ -19311,7 +19398,11 @@
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
+???????????? ?????????2 ?????????2 ???4 ???4 0
+???????????? ?????????2 ?????? ?????????3 ??????4 0
+???????????? ?????????2 ?????? ??????4 ?????????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ???4 ??????3 0
 ???????????? ?????????2 ??????2 ????????? ??????2 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????2 0
@@ -19332,6 +19423,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ???4 ??????2 ??????2 0
 ???????????? ?????????4 ?????????3 ?????? ???2 0
+???????????? ?????????4 ?????????3 ?????? ???2 0
 ????????? ?????????4 ??????2 ??????1 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ?????? ??????4 ??????3 0
@@ -19380,6 +19472,7 @@
 ???????????? ?????????2 ??????2 ?????????2 ???4 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????4 0
+????????? ?????????2 ??????4 ?????? 0
 ????????? ?????????2 ????????? ?????? 0
 ???????????? ?????????2 ????????? ????????? ??????3 0
 ?????? ?????????2 ????????? 0
@@ -19993,6 +20086,7 @@
 ?????? ????????? ?????????3 0
 ???????????? ????????? ?????????3 ?????????3 ??????4 0
 ?????? ????????? ?????????4 0
+????????? ????????? ?????????4 ??????4 0
 ?????? ????????? ?????????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ?????????4 0
@@ -20027,6 +20121,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????3 0
+?????? ????????? ?????????4 0
 ?????? ????????? ??????4 0
 ????????? ????????? ??????4 ??????4 0
 ?????? ????????? ??????2 0
@@ -20428,6 +20523,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ???3 0
 ?????? ????????? ???4 0
+?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ??????3 ??????2 ??????4 0
@@ -20456,6 +20552,7 @@
 ?????? ????????? ??????2 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????3 ??????4 ??????4 0
 ?????? ????????? ????????? 0
 ???????????? ????????? ????????? ????????? ???4 0
 ????????? ????????? ????????? ??????4 0
@@ -20482,6 +20579,7 @@
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????2 ??????4 ?????? 0
 ???????????? ????????? ??????4 ??????4 ??????2 0
 ????????? ????????? ??????4 ????????? 0
 ?????? ????????? ????????? 0
@@ -20904,6 +21002,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ????????? ??????4 ??????2 0
+??? ?????????3 0
 ???????????? ?????????3 ???2 ??????2 ??? 0
 ?????? ?????????3 ???4 0
 ?????? ?????????3 ?????? 0
@@ -20961,6 +21060,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ?????????4 0
 ?????? ?????????3 ?????????3 0
+?????? ?????????3 ?????????3 0
 ?????? ?????????3 ????????? 0
 ?????? ?????????3 ?????????2 0
 ?????? ?????????3 ?????????4 0
@@ -21211,6 +21311,7 @@
 ?????? ?????????3 ??? 0
 ???????????? ?????????3 ??? ???4 ???2 0
 ?????? ?????????3 ??????4 0
+?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????4 ????????? ??????2 0
 ?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????2 ??????4 ?????????2 0
@@ -21631,6 +21732,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ??????3 0
 ?????? ?????????3 ?????? 0
+????????? ?????????3 ??????2 ??????4 0
 ???????????? ?????????3 ??????3 ??? ?????? 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ??????4 0
@@ -21892,6 +21994,7 @@
 ???????????? ?????????2 ??????2 ?????????4 ?????????4 0
 ????????? ?????????2 ??????4 ??????2 0
 ???????????? ?????????2 ??????4 ????????? ??????4 0
+???????????? ?????????2 ??????4 ??????3 ?????????3 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ???????????? ?????????2 ?????????4 ??????3 ???2 0
@@ -22084,6 +22187,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ???2 0
 ???????????? ?????? ???4 ??????4 ?????????2 0
+???????????? ?????? ??????4 ??????4 ???4 0
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????4 ?????? ?????????4 0
 ?????? ?????? ??????4 0
@@ -22114,13 +22218,16 @@
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????3 0
 ???????????? ??????2 ??????4 ??????4 ??????2 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????2 ??????2 ??????3 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????????3 0
+????????? ??????2 ??????4 ??????1 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ?????? 0
@@ -22177,6 +22284,7 @@
 ???????????? ??????2 ????????? ???4 ??????2 0
 ?????? ??????2 ????????? 0
 ????????? ??????2 ????????? ??????3 0
+????????? ??????2 ????????? ??????3 0
 ???????????? ??????2 ???3 ??????4 ??????4 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
@@ -22191,6 +22299,7 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????2 ??? ??????2 0
 ?????? ??????2 ???4 0
+?????? ??????2 ??????4 0
 ????????? ??????3 ???2 ????????? 0
 ?????? ??????3 ???4 0
 ?????? ??????3 ?????? 0
@@ -22430,6 +22539,7 @@
 ?????? ?????????3 ?????????4 0
 ???????????????????????? ?????????3 ??????4 ??????2 ??????2 ???2 ??????3 ??? ????????? 0
 ???????????? ?????????3 ?????????2 ????????? ????????? 0
+???????????? ?????????3 ??????4 ?????????2 ??????4 0
 ????????? ?????????3 ??????4 ?????????2 0
 ????????? ?????????3 ??????4 ??????4 0
 ?????? ?????????3 ??????2 0
@@ -25542,8 +25652,11 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ??????2 0
 ????????? ???2 ???4 ??????2 0
+????????? ???2 ???4 ?????????4 0
 ????????? ???2 ???4 ?????????4 0
 ???????????? ???2 ???4 ?????????4 ??????1 0
+????????? ???2 ???4 ?????????2 0
+???????????? ???2 ???4 ?????????2 ????????? 0
 ????????? ???2 ???4 ??????2 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
@@ -25687,6 +25800,7 @@
 ?????? ???3 ????????? 0
 ?????? ???3 ?????????4 0
 ?????? ???3 ?????????2 0
+?????? ???3 ??????3 0
 ?????? ???3 ??????4 0
 ?????? ???3 ?????????3 0
 ?????? ???3 ?????????4 0
@@ -25751,6 +25865,7 @@
 ?????? ???4 ?????????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ?????????4 0
+????????? ???4 ????????? ????????? 0
 ?????? ???4 ??????2 0
 ???????????? ???4 ?????????2 ??????4 ??????2 0
 ?????? ???4 ??????2 0
@@ -25761,6 +25876,7 @@
 ?????? ???4 ??????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ???2 0
+????????? ???4 ??????4 ??????2 0
 ???????????? ???4 ??????4 ??????4 ??????4 0
 ?????? ???4 ?????????2 0
 ?????? ???4 ?????????2 0
@@ -25928,6 +26044,7 @@
 ???????????? ??????4 ??????2 ?????? ??????2 0
 ????????? ??????4 ?????????2 ??????2 0
 ???????????? ?????? ??????2 ?????????4 ?????????4 0
+????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
 ?????? ?????? ????????? 0
 ???????????? ?????? ????????? ??????3 ??????3 0
 ?????? ?????? ??????2 0
@@ -25938,6 +26055,7 @@
 ???????????? ?????? ??????4 ??????4 ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????3 0
+???????????? ?????? ?????????4 ??????4 ??????3 0
 ?????? ?????? ??????3 0
 ????????? ?????? ??????2 ??????3 0
 ?????? ?????? ?????? 0
@@ -25947,6 +26065,7 @@
 ???????????? ?????? ?????????4 ??????2 ??????4 0
 ???????????? ?????? ?????????3 ??????3 ???3 0
 ???????????? ?????? ??????4 ????????? ??????3 0
+???????????? ?????? ?????? ??????4 ??????4 0
 ?????? ?????? ???4 0
 ??????????????? ?????? ??????2 ??????3 ??????2 ??????1 0
 ?????? ?????? ??????3 0
@@ -26061,6 +26180,7 @@
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
 ????????? ??????4 ??????4 ??????3 0
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ????????? ??????4 ??????4 ?????? 0
@@ -26266,6 +26386,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ??????3 ?????????2 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????4 0
@@ -26488,6 +26609,7 @@
 ?????? ??????3 ??????4 0
 ????????? ??????3 ??????4 ?????????2 0
 ?????? ??????3 ??????4 0
+?????? ??????3 ??????3 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -26564,6 +26686,7 @@
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????? 0
 ???????????? ??????4 ??????2 ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ????????? ??????4 ???4 ??????1 0
@@ -27051,6 +27174,7 @@
 ?????? ???2 ?????????3 0
 ?????? ???2 ???3 0
 ?????? ???2 ??????3 0
+?????? ???3 ????????? 0
 ?????? ???3 ??????4 0
 ?????? ???3 ??????3 0
 ?????? ???3 ??????2 0
@@ -27262,11 +27386,14 @@
 ?????? ?????? ??????4 0
 ??? ??????2 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
+?????? ??????2 ??????3 0
 ????????? ??????2 ????????? ????????? 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
+????????? ??????2 ?????? ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ????????? 0
@@ -28337,6 +28464,7 @@
 ???????????????????????? ??? ??? ????????? ???2 ?????? ??? ?????? ???2 0
 ???????????? ??? ??? ????????? ??????4 0
 ?????? ??? ???2 0
+????????? ??? ???4 ??????4 0
 ?????? ??? ?????? 0
 ?????? ??? ??????3 0
 ?????? ??? ??????3 0
@@ -29455,6 +29583,7 @@
 ?????? ??????4 ???3 0
 ?????? ??????4 ???4 0
 ???????????? ?????? ???4 ?????????4 ?????????2 0
+?????? ?????? ???4 0
 ?????? ?????? ???4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
@@ -30115,8 +30244,10 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????2 0
+????????? ??????3 ??????2 ?????? 0
 ???????????? ??????3 ??????4 ?????? ??????2 0
 ????????? ??????3 ?????? ??????4 0
+?????? ??????3 ????????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ???2 0
 ???????????? ??????4 ???3 ??????4 ??????4 0
@@ -30229,6 +30360,7 @@
 ????????? ?????????4 ???4 ?????? 0
 ???????????? ?????????4 ???4 ?????????4 ??????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????2 0
@@ -30414,6 +30546,7 @@
 ?????? ????????? ?????????3 0
 ????????? ????????? ????????? ???3 0
 ???????????? ????????? ?????????3 ??????2 ?????????4 0
+????????? ????????? ??????2 ????????? 0
 ?????? ????????? ??????4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ?????????3 0
@@ -30989,6 +31122,7 @@
 ?????? ??? ??????2 0
 ?????? ??? ??????3 0
 ????????? ??? ??????3 ???2 0
+?????? ??? ??????3 0
 ?????? ??? ?????? 0
 ?????? ??? ??????4 0
 ?????? ??? ??????4 0
@@ -31008,10 +31142,12 @@
 ?????? ??? ???2 0
 ?????? ??? ???2 0
 ???????????? ??? ???4 ????????? ?????????4 0
+?????? ??? ??????3 0
 ?????? ??? ??????4 0
 ???????????? ??? ?????? ??????4 ?????????4 0
 ?????? ??? ??????3 0
 ?????? ??? ???4 0
+???????????? ??? ???4 ??????4 ???3 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
@@ -31398,6 +31534,7 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ???????????? ??????3 ??????2 ???2 ??????4 0
+????????? ??????3 ??????4 ??????4 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????3 0
@@ -31453,6 +31590,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????? 0
+????????? ?????? ?????????2 ??????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????4 ??????2 0
@@ -31466,6 +31604,8 @@
 ?????? ?????? ??????3 0
 ???????????? ?????? ??????3 ??????4 ?????????2 0
 ?????? ?????? ??? 0
+????????? ?????? ??????3 ??????3 0
+????????? ?????? ??????3 ??????4 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ???3 0
 ????????? ??????4 ???3 ?????????4 0
@@ -31739,6 +31879,7 @@
 ???????????? ?????????4 ?????????3 ??????4 ??????1 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ?????????2 0
+???????????? ?????????4 ??????4 ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
 ????????? ?????????4 ????????? ??????1 0
 ???????????? ?????????4 ?????????4 ??????4 ??????1 0
@@ -31863,6 +32004,7 @@
 ?????? ???2 ?????????4 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????4 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
 ?????? ???2 ?????????4 0
@@ -31934,6 +32076,7 @@
 ???????????? ?????? ?????? ???2 ?????????4 0
 ?????? ?????? ?????? 0
 ?????? ??????4 ??????4 0
+????????? ??????4 ??????4 ?????????4 0
 ???????????? ??????4 ??????3 ??? ????????? 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
@@ -31943,6 +32086,7 @@
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
+????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -32135,6 +32279,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ??????4 0
 ????????? ?????? ??????4 ??????3 0
+???????????? ??????2 ???2 ??????2 ??????4 0
 ?????? ??????2 ???2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -32144,6 +32289,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ?????????3 0
+???????????? ??????2 ????????? ??????4 ?????????2 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
 ???????????? ??????2 ???2 ????????? ????????? 0
@@ -32187,6 +32333,10 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????3 ??????2 ???2 0
 ?????? ??????2 ????????? 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ???4 0
+????????? ??????2 ????????? ??????4 0
 ????????????????????? ??????2 ????????? ?????? ??????3 ??????2 ??????2 ?????????3 0
 ???????????? ??????2 ?????? ??????4 ?????????2 0
 ?????? ??????2 ???4 0
@@ -32986,61 +33136,9 @@
 ?????? ??? ??? 0
 ?????? ??? ??? 0
 ?????? ??? ??? 0
-????????? ??????4 ?????????4 ?????????4 0
-?????? ?????????2 ??????4 0
-?????? ??????3 ?????? 0
-???????????? ??????4 ??????2 ?????????3 ??????3 0
-????????? ??????3 ????????? ??????2 0
-???????????? ??????3 ??????4 ?????????4 ?????? 0
-????????? ??????3 ??????3 ?????? 0
-????????? ?????????3 ??????2 ??????4 0
-?????? ??????3 ????????? 0
-????????? ??????3 ??????2 ?????? 0
-????????? ???4 ????????? ????????? 0
-????????? ???4 ??????4 ??????2 0
-????????? ?????? ??????3 ??????4 0
-????????? ?????? ??????3 ??????3 0
-????????? ?????? ?????????2 ??????2 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ???4 0
-?????? ??????4 ??????2 0
-????????? ??????2 ??????4 ??????1 0
-????????? ??????2 ????????? ??????3 0
-?????? ??????2 ??????3 0
-???????????? ?????? ?????????4 ??????4 ??????3 0
-?????? ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ??????2 ?????? ??????2 0
-???????????? ?????? ?????? ??????4 ??????4 0
-????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
-?????? ??????4 ??????4 0
-???????????? ??????2 ??????2 ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ???2 ???4 ?????????4 0
-???????????? ???2 ???4 ?????????2 ????????? 0
-????????? ???2 ???4 ?????????2 0
-?????? ?????????2 ????????? 0
-???????????? ?????????2 ??????2 ??? ??????4 0
-????????? ?????????2 ????????? ??????2 0
-???????????? ?????? ??????4 ??????4 ???4 0
-???????????? ??????2 ???2 ??????2 ??????4 0
-???????????? ??????2 ????????? ??????4 ?????????2 0
-????????? ??????4 ?????????4 ???4 0
-????????? ??????4 ?????????4 ?????????3 0
-????????? ??????3 ???4 ??????2 0
-???????????? ??????3 ?????? ??????4 ???3 0
-???????????? ??????2 ??????2 ??????2 ??????4 0
-???????????? ??????2 ??????4 ?????????2 ??????2 0
-?????? ??????4 ?????????4 0
-????????? ??????4 ??????4 ?????????2 0
-??? ?????????3 0
-?????? ?????????3 ?????????3 0
-????????? ??????2 ??????2 ??????2 0
-?????? ?????? ??????3 0
-??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
-?????? ???3 ??????3 0
-????????? ????????? ?????????4 ??????4 0
-????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
-????????? ??????3 ??????4 ??????4 0
+????????? ?????? ????????? ??????3 0
+??????????????? ??? ??? ??????3 ??????4 ??????4 0
+?????? ??????3 ??????2 0
+?????? ?????? ????????? 0
+?????? ?????? ????????? 0
+?????? ?????????3 ????????? 0
Binary files gcin-1.2.9.orig/.tedfilepos and gcin-1.2.9/.tedfilepos differ
diff -urN gcin-1.2.9.orig/tenv gcin-1.2.9/tenv
--- gcin-1.2.9.orig/tenv	2006-10-19 14:18:38.000000000 +0800
+++ gcin-1.2.9/tenv	2006-11-15 13:10:24.000000000 +0800
@@ -11,6 +11,6 @@
 gcinpid=$!
 sleep 1
 export LD_PRELOAD=./im-client/libgcin-im-client.so
-#gedit
-leafpad
+gedit
+#leafpad
 pkill gcin.test


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin	15 Nov 2006 07:07:12 -0000	1.1
+++ NewCJ3.cin	17 Nov 2006 00:32:51 -0000	1.2
@@ -52,7 +52,6 @@
 ... ???
 ... ???
 ... ???
-.; ???
 ' ???
 '' "
 '' "
@@ -171,7 +170,6 @@
 ;a ???
 ;b ???
 ;c ???
-;cu ???
 ;d ???
 ;e ???
 ;f ???
@@ -194,7 +192,9 @@
 ;s ???
 ;t ???
 ;u ???
+;ui ??????
 ;uu ??????
+;uio ?????????
 ;u; ???
 ;v ???
 ;w ???
@@ -216,7 +216,7 @@
 b ???
 b ???
 b ???
-b; ???
+b; ???
 b;; ??????
 c ???
 c ???
@@ -249,7 +249,7 @@
 f ???
 f ???
 f ???
-f; ???
+f; ???
 g ???
 g ???
 g ???
@@ -297,7 +297,7 @@
 l ???
 l ???
 l ???
-l; ???
+l; ???
 m ???
 m ???
 m ???
@@ -347,7 +347,7 @@
 q ???
 q ???
 q ???
-q; ???
+q; ???
 r ???
 r ??
 r ???
@@ -382,7 +382,6 @@
 t ???
 t ???
 t; ???
-t;; ???
 u ???
 u ???
 u ???
@@ -410,7 +409,6 @@
 w ???
 w ???
 w; ???
-w;; ???
 x ???
 x ???
 x ???
@@ -459,7 +457,6 @@
 w. ???
 x. ???
 x. ??
-x.; ??
 y. ???
 z. ???
 a, ???
@@ -493,11 +490,9 @@
 ab ???
 ac ???
 ad ???
-ad; ???
 ae ???
 af ???
 af ???
-af; ???
 ag ???
 ah ???
 ai ???
@@ -526,7 +521,7 @@
 bd ???
 be ???
 bf ???
-bf; ???
+bf; ?????????
 bg ???
 bg ???
 bh ???
@@ -537,8 +532,8 @@
 bm ???
 bm ???
 bm ???
+bn ???
 bn ???
-bn; ???
 bo ???
 bp ???
 bq ???
@@ -546,7 +541,6 @@
 bs ???
 bt ???
 bt ???
-bt; ???
 bu ???
 bv ???
 bw ???
@@ -571,21 +565,18 @@
 ck ???
 cl ???
 cl ???
-cl; ???
 cm ???
 cn ???
 cn; ???
 co ???
 cp ???
-cq ???
-cq; ???
+cq ???
 cr ???
 cs ???
 ct ???
 cu ???
 cu; ???
 cv ???
-cv; ???
 cw ???
 cx ???
 cx; ??????
@@ -605,14 +596,12 @@
 dh ???
 di ???
 di ???
-di; ???
 dj ???
 dk ???
 dk ???
 dl ???
 dm ???
 dm ???
-dm; ???
 dn ???
 do ???
 dp ???
@@ -630,11 +619,11 @@
 ea ???
 ea ???
 ea ???
-ea; ???
 eb ???
 ec ???
 ec ???
 ed ???
+ee ???
 ee ???
 ef ???
 eg ???
@@ -692,7 +681,6 @@
 ga ???
 gb ???
 gb ???
-gb; ???
 gc ???
 gd ???
 ge ???
@@ -715,7 +703,6 @@
 gt ???
 gu ???
 gu ???
-gu; ???
 gv ???
 gw ???
 gx ???
@@ -724,38 +711,28 @@
 ha ???
 hb ???
 hc ???
-hc; ???
 hd ???
 hd; ???
 he ???
-he; ???
 hf ???
 hg ???
-hg; ???
 hh ???
-hh; ???
 hi ???
 hi ???
 hi; ???
 hj ???
 hk ???
-hk; ???
 hl ???
-hm ???
 hm ???
-hm; ???
 hn ???
-hn; ???
 ho ???
 ho ???
-ho; ???
 hp ???
-hp; ???
 hq ???
 hr ???
 hs ???
 hs ???
-hs; ???
+hs; ???
 ht ???
 ht; ???
 ht;; ??????
@@ -766,26 +743,18 @@
 hw; ??????
 hx ???
 hx; ???
-hy ???
-hy; ???
+hy ???
 hz ???
 ia ???
 ib ???
-ib; ???
 ic ???
 id ???
 id ???
-id; ???
-id; ???
 ie ???
-if ???
-if; ??????
+if ??????
 ig ???
 ih ???
-ih; ???
 ii ???
-ii ???
-ii; ???
 ij ???
 ik ???
 il ???
@@ -794,16 +763,15 @@
 io ???
 io; ???
 io; ???
-ip ???
+ip ???
 ip ???
 ip ???
-ip; ???
+ip ???
 iq ???
 ir ???
 is ???
 it ???
 it ???
-it; ???
 iu ???
 iv ???
 iv; ???
@@ -813,8 +781,8 @@
 iz ???
 izo ??????
 ja ???
+jb ???
 jb ???
-jb; ???
 jc ???
 jd ???
 jd ???
@@ -824,8 +792,6 @@
 jh ???
 ji ???
 jj ???
-jj; ???
-jj; ???
 jk ???
 jk; ???
 jl ???
@@ -837,7 +803,6 @@
 jp ???
 jq ???
 jr ???
-jr; ???
 js ???
 jt ???
 ju ???
@@ -849,13 +814,11 @@
 ka ???
 kb ???
 kb ???
-kb; ???
 kc ???
 kd ???
 ke ???
 kf ???
 kf ???
-kf; ???
 kg ???
 kh ???
 ki ???
@@ -866,18 +829,16 @@
 km ???
 kn ???
 kn ???
-kn; ???
 ko ???
 ko; ???
+kp ???
 kp ???
-kp; ???
 kq ???
 kr ???
 ks ???
 kt ???
 ku ???
 ku ???
-ku; ???
 ku; ???
 kv ???
 kw ???
@@ -885,9 +846,7 @@
 ky ???
 kz ???
 la ???
-la; ???
 lb ???
-lb; ???
 lc ???
 ld ???
 le ???
@@ -908,85 +867,70 @@
 ls ???
 lt ???
 lu ???
-lu; ???
 lv ???
 lw ???
+lw; ???
 lx ???
 ly ???
 lz ???
 ma ???
 mb ???
-mb; ???
 mc ???
-mc; ???
 md ???
 me ???
 me ???
 me ???
 me; ???
 mf ???
-mf; ???
 mg ???
+mh ???
 mh ???
-mh; ???
 mi ???
 mi; ???
 mj ???
 mk ???
-mk; ???
+mk; ???
+ml ???
 ml ???
-ml; ???
 mm ???
-mm ???
-mm; ???
 mn ???
 mo ???
-mo; ???
 mp ???
 mq ???
 mr ???
 ms ???
-ms; ???
 mt ???
-mt; ???
+mu ???
 mu ???
 mu ???
-mu; ???
-mv ???
+mv ???
 mv ???
-mv; ???
 mw ???
+mw; ???
 mx ???
 my ???
 mz ???
 na ???
 nb ???
-nb; ???
 nc ???
 nd ???
 ne ???
-ne; ???
 nf ???
 ng ???
 nh ???
 ni ???
 ni ???
-ni; ???
-ni; ???
-ni;; ???
 nj ???
 nk ???
 nl ???
 nl ???
-nl; ???
 nm ???
 nn ???
 no ???
 no ???
 no ???
-no No.
-no; ???
 np ???
+nq ???
 nq ???
 nq ???
 nq; ???
@@ -998,7 +942,6 @@
 nw ???
 nx ???
 nx ???
-nx; ???
 ny ???
 nz ???
 oa ???
@@ -1010,8 +953,8 @@
 ob ???
 ob ???
 ob; ???
+oc ???
 oc ???
-oc; ???
 od ???
 od ???
 od ???
@@ -1039,7 +982,6 @@
 og ???
 og ???
 og ???
-og; ???
 oh ???
 oh ???
 oh ???
@@ -1056,7 +998,6 @@
 oi ???
 oi ???
 oi ???
-oi; ???
 oj ???
 oj ???
 oj ???
@@ -1075,9 +1016,7 @@
 om ???
 om ???
 om ???
-om; ???
 on ???
-on; ???
 oo ???
 oo ???
 oo ???
@@ -1118,7 +1057,6 @@
 oq ???
 oq ???
 or ???
-or; ???
 or ???
 or ???
 or ???
@@ -1162,10 +1100,10 @@
 ou ???
 ou ???
 ou ???
-ou; ???
 ov ???
-ov; ???
+ow ???
 ow ???
+ow; ???
 ow ???
 ow ???
 ow ???
@@ -1177,7 +1115,6 @@
 ow ???
 ow ???
 ow ???
-ow; ???
 ox ???
 oy ???
 oy ???
@@ -1191,14 +1128,13 @@
 oy ???
 oy ???
 oy ???
-oy; ???
 oz ???
 pa ???
 pa ???
 pa; ???
 pb ???
+pc ???
 pc ???
-pc; ???
 pd ???
 pe ???
 pe; ??????
@@ -1207,14 +1143,13 @@
 ph ???
 pi ???
 pi ???
-pi; ???
 pj ???
+pk ???
 pk ???
-pk; ???
 pl ???
 pm ???
+pn ???
 pn ???
-pn; ???
 po ???
 pp ???
 pq ???
@@ -1227,74 +1162,66 @@
 px ???
 py ???
 pz ???
+qa ???
 qa ???
-qa; ???
+qb ???
 qb ???
-qb; ???
+qc ???
 qc ???
-qc; ???
+qd ???
 qd ???
-qd; ???
 qe ???
 qf ???
 qg ???
 qh ???
 qi ???
 qj ???
-qj; ???
 qk ???
 ql ???
 qm ???
-qm; ???
 qn ???
 qo ???
 qp ???
-qq ???
+qq ???
 qr ???
 qs ???
 qt ???
 qu ???
-qu; ???
 qv ???
 qw ???
 qx ???
+qy ???
 qy ???
-qy; ???
 qz ???
 ra ???
 rb ???
-rb; ???
 rc ???
 rc ???
-rc; ???
 rd ???
 re ???
 rf ???
-rf; ???
 rg ???
 rh ???
 ri ???
 rj ???
 rk ???
+rk; ???
 rl ???
 rm ???
 rn ???
 ro ???
 rp ???
-rp; ???
 rq ???
 rr ???
 rs ???
-rt ???
+rt ???
 ru ???
-ru; ???
 ru; ???
 rv ???
 rw ???
 rx ???
 ry ???
 rz ???
-rz; ???
 sa ???
 sb ???
 sc ???
@@ -1314,12 +1241,10 @@
 sp ???
 sq ???
 sr ???
-sr; ???
 ss ???
 st ???
-su ???
 su ???
-su; ???
+su ???
 sv ???
 sw ???
 sw; ???
@@ -1327,7 +1252,6 @@
 sy ???
 sz ???
 ta ???
-ta; ???
 tb ???
 tc ???
 tc ???
@@ -1335,25 +1259,22 @@
 te ???
 tf ???
 tg ???
-tg; ???
 th ???
+ti ???
 ti ???
-ti; ???
+tj ???
 tj ???
-tj; ???
 tj; ???
 tk ???
 tk; ???
 tl ???
 tm ???
-tm; ???
 tn ???
-tn; ???
 tn; ???
 tn; ???
 to ???
+tp ???
 tp ???
-tp; ???
 tq ???
 tr ???
 ts ???
@@ -1361,16 +1282,14 @@
 tt ???
 tt ???
 tt ???
-tt; ???
-tu ???
-tu; ???
+tt; ???
+tu ???
 tv ???
 tv; ???
 tw ???
 tw ???
 tw; ???
 tw; ???
-tw;; ???
 tx ???
 ty ???
 tz ???
@@ -1404,8 +1323,8 @@
 uy ???
 uz ???
 va ???
-vb ???
-vb; ???
+va; ???
+vb ???
 vc ???
 vd ???
 ve ???
@@ -1416,32 +1335,29 @@
 vi ???
 vj ???
 vk ???
-vk; ???
-vl ???
-vl ???
+vl ???
 vl ???
 vl; ???
+vm ???
 vm ???
-vm; ???
+vm; ???
 vn ???
 vo ???
 vo; ???
 vp ???
 vq ???
 vr ???
-vr; ???
 vs ???
 vt ???
+vu ???
 vu ???
-vu; ???
+vv ???
 vv ???
-vv; ???
 vw ???
 vx ???
-vy ???
-vy; ???
+vy ???
+vz ???
 vz ???
-vz; ???
 wa ???
 wb ???
 wc ???
@@ -1451,13 +1367,11 @@
 we ???
 wf ???
 wg ???
-wg; ???
 wh ???
 wi ???
 wj ???
 wj ???
 wk ???
-wk ???
 wl ???
 wm ???
 wn ???
@@ -1468,14 +1382,13 @@
 ws ???
 wt ???
 wu ???
+wv ???
 wv ???
-wv; ???
-ww ???
+ww ???
 wx ???
 wy ???
 wz ???
 wz ???
-wz; ???
 xa ???
 xb ???
 xc ???
@@ -1491,7 +1404,6 @@
 xm ???
 xn ???
 xo ???
-xo; ??
 xp ???
 xq ???
 xr ???
@@ -1518,30 +1430,28 @@
 yj ???
 yj; ???
 yk ???
-yk; ???
 yl ???
 ym ???
 yn ???
 yo ???
 yo; ???
+yp ???
 yp ???
-yp; ???
 yp; ???
 yq ???
 yr ???
+ys ???
 ys ???
-ys; ???
 yt ???
+yu ???
 yu ???
-yu; ???
 yv ???
 yw ???
 yx ???
+yy ???
 yy ???
-yy; ???
 yy, ??????
 yz ???
-yz; ???
 za ???
 zb ???
 zc ???
@@ -1555,7 +1465,7 @@
 zk ???
 zl ???
 zm ???
-zm; ???
+zm ???
 zn ???
 zo ???
 zp ???
@@ -1564,12 +1474,12 @@
 zs ???
 zt ???
 zu ???
-zu; ???
+zu ???
 zv ???
 zw ???
 zx ???
 zy ???
-zy; ???
+zy ???
 zz ???
 aaa ???
 aaa ???
@@ -6623,6 +6533,7 @@
 nbp ???
 nbp; ???
 nbu ???
+ncj ????????????
 ncz ???
 nde ???
 ndk ???
@@ -7052,10 +6963,9 @@
 ojg ???
 oji ???
 ojj ???
+ojk ???
 ojk ???
 ojk ???
-ojk ???
-ojk; ???
 ojm ???
 ojm ???
 ojm; ???
@@ -8546,20 +8456,8 @@
 rgc ???
 rgc ???
 rgc ???
-rgc (?????????)a
-rgc (?????????|||)??????
-rgc =???=b
-rgc ???????????????|||??????
 rgc; ???
 rgg ???
-rgg (????????????)
-rgg ???(???_???;)???
-rgg ??????~??????~
-rgg (??????O???)
-rgg .......\(><)/
-rgg ???*@??@*???
-rgg O_o
-rgg ???(???_???;)?????????~??????~
 rgi ???
 rgj ???
 rgk ???
@@ -9681,9 +9579,8 @@
 tmb ???
 tmb ???
 tmb; ???
-tmc ???
 tmc ???
-tmc; ???
+tmc ???
 tmd ???
 tmd ???
 tmd; ???
@@ -19631,6 +19528,7 @@
 somr ???
 sonl ???
 sorc ???
+sorr ?????????
 sphf ???
 sphh ???
 sqnl ???
@@ -28614,7 +28512,6 @@
 bopo ???
 boqa ???
 boqb ???
-boqh ????????????
 borb ????
 borg ????
 bort ????


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gcin.spec	15 Nov 2006 07:07:12 -0000	1.12
+++ gcin.spec	17 Nov 2006 00:32:51 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         gcin129update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +34,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .up
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -107,6 +109,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+- add gcin129update.patch
+- update NewCJ3.cin
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Fri Nov 17 00:36:19 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 16 Nov 2006 17:36:19 -0700
Subject: rpms/gcin/FC-4 gcin129update.patch, NONE, 1.1 NewCJ3.cin, 1.1,
	1.2 gcin.spec, 1.13, 1.14
Message-ID: <200611170036.kAH0aJLm018876@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18855

Modified Files:
	NewCJ3.cin gcin.spec 
Added Files:
	gcin129update.patch 
Log Message:
add gcin129update.patch and update NewCj3.cin

gcin129update.patch:

--- NEW FILE gcin129update.patch ---
diff -urN gcin-1.2.9.orig/Changelog gcin-1.2.9/Changelog
--- gcin-1.2.9.orig/Changelog	2006-11-14 18:24:09.000000000 +0800
+++ gcin-1.2.9/Changelog	2006-11-15 18:52:02.000000000 +0800
@@ -1,5 +1,5 @@
 ** UTF-8 encoding **
-1.2.9:
+1.2.9: (11/15/2006)
 - ???????????? tray icons ???????????? ~/.gcin/icons ???????????? symbolic link ?????????
 - ????????????????????????????????? tray icons??????????????????????????????
 - ???????????????????????????????????????????????????????????????????????????
@@ -7,7 +7,7 @@
 - ???????????????????????? FC6??????????????????????????????
 - ????????? WM(fvwm1) ?????????????????????????????????????????????????????? keyboard focus ??????????????????????????? gcin ??? window????????????????????? click ????????????????????????????????????????????????????????? WM or X11 server ???????????? focus ??????????????? override_redirect ??? window???
 - FreeBSD /usr/bin/bash ??????????????? ./configure ?????????????????? /bin/bash -> /usr/bin/bash
-- libgcin-im-client.so ?????? soname???thanks to caleb
+- libgcin-im-client.so ?????? soname???thanks to candyz
 
 
 1.2.8: (10/19/2006)
diff -urN gcin-1.2.9.orig/configure gcin-1.2.9/configure
--- gcin-1.2.9.orig/configure	2006-11-06 09:29:26.000000000 +0800
+++ gcin-1.2.9/configure	2006-11-15 18:53:54.000000000 +0800
@@ -74,7 +74,7 @@
   echo "/bin/bash -> /usr/bin/bash"
   for i in scripts/*
   do
-    sed -e "s~/bin~/usr/bin" < $i > $i.tmp
+    sed -e "s~/bin~/usr/bin~" < $i > $i.tmp
     mv $i.tmp $i
   done
 fi
diff -urN gcin-1.2.9.orig/data/tsin.src gcin-1.2.9/data/tsin.src
--- gcin-1.2.9.orig/data/tsin.src	2006-11-15 13:05:04.000000000 +0800
+++ gcin-1.2.9/data/tsin.src	2006-11-15 18:56:36.000000000 +0800
@@ -1049,6 +1049,7 @@
 ?????? ???4 ?????? 0
 ?????? ???4 ??????4 0
 ????????????????????? ???4 ?????????2 ???2 ??? ???2 ?????????2 ??????3 0
+????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
 ???????????? ???4 ???2 ???4 ?????????3 0
 ???????????? ???4 ???2 ?????????3 ?????????3 0
 ???????????? ???4 ???2 ??? ?????????3 0
@@ -1439,6 +1440,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????4 ?????????2 ??????2 0
 ???????????? ??????2 ??????4 ?????????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -1448,6 +1450,7 @@
 ???????????? ??????2 ??????4 ?????? ??????4 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ??????4 0
+????????? ??????2 ??????4 ?????????4 0
 ????????? ??????2 ??????4 ??????2 0
 ???????????? ??????2 ??????2 ??????3 ?????????4 0
 ?????? ??????2 ?????????2 0
@@ -1458,6 +1461,7 @@
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????? 0
 ???????????? ??????2 ??????2 ???3 ?????????3 0
+???????????? ??????2 ??????2 ??????2 ??????4 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ??????3 ?????? 0
 ?????? ??????2 ??????2 0
@@ -2442,6 +2446,7 @@
 ????????? ??????3 ??????4 ?????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????2 0
+????????? ??????3 ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????2 0
@@ -2547,6 +2552,7 @@
 ?????? ??? ??? 0
 ???????????? ??? ?????? ??????3 ????????? 0
 ?????? ??? ?????????3 0
+???????????? ???2 ???4 ??????2 ?????????4 0
 ?????? ???2 ???4 0
 ?????? ???2 ???4 0
 ???????????? ???2 ??? ???2 ??????4 0
@@ -2556,19 +2562,23 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ????????? 0
 ????????? ???2 ???4 ????????? 0
+???????????? ???2 ??????4 ??????2 ?????????2 0
 ???????????? ???2 ?????? ???2 ??????4 0
 ???????????? ???2 ??????2 ???3 ?????????4 0
+????????????????????? ???2 ??????2 ?????????4 ????????? ????????? ??????4 ??????3 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????3 ???2 ????????? 0
 ???????????? ???2 ??????2 ???2 ???4 0
 ???????????? ???2 ??????2 ??????2 ???4 0
 ????????? ???2 ??????3 ?????????2 0
 ?????? ???2 ??????4 0
+???????????? ???2 ??????3 ??????2 ??????4 0
 ?????? ???2 ??????4 0
 ???????????? ???2 ??????4 ??? ?????? 0
 ???????????? ???2 ??????4 ??????4 ??????3 0
 ???????????? ???2 ???3 ?????????2 ??????3 0
 ???????????? ???2 ???4 ??????2 ?????? 0
+???????????? ???2 ?????? ???2 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ???2 ??????4 0
 ???????????? ???2 ??????3 ??????2 ?????????4 0
@@ -2577,6 +2587,8 @@
 ???????????? ???2 ?????? ???4 ???2 0
 ??????????????? ???2 ??????4 ???3 ??? ??????4 0
 ?????? ???2 ??????4 0
+???????????? ???2 ????????? ???2 ??????4 0
+???????????? ???2 ?????????4 ?????? ??????2 0
 ???????????? ???2 ?????????2 ???2 ??????4 0
 ????????? ???2 ?????????3 ??????2 0
 ???????????? ???2 ?????????2 ?????? ?????????2 0
@@ -2585,19 +2597,26 @@
 ????????? ???2 ?????????2 ???4 0
 ?????? ???2 ??????3 0
 ???????????? ???2 ??????3 ???2 ????????? 0
+???????????? ???2 ??????3 ??????3 ?????????3 0
 ???????????? ???2 ??????3 ?????? ?????????4 0
+???????????? ???2 ?????? ????????? ???4 0
 ?????? ???2 ??????2 0
 ??????????????? ???2 ?????? ??????4 ??????3 ??????4 0
+???????????? ???2 ??????2 ????????? ??????4 0
 ????????? ???2 ??????3 ??????2 0
 ?????? ???2 ??????2 0
 ????????? ???2 ??????3 ?????????4 0
+???????????? ???2 ??????4 ??????4 ???3 0
+???????????? ???2 ??????4 ???4 ?????????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ??????3 ???3 0
+??????????????? ???2 ??????2 ??????2 ??????4 ?????? 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ??????4 ???3 0
 ???????????? ???2 ?????????4 ???2 ????????? 0
 ???????????? ???2 ??????2 ?????? ??????2 0
 ?????? ???2 ??????2 0
+????????? ???2 ?????????2 ?????????4 0
 ?????? ???2 ?????????2 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
@@ -2610,6 +2629,8 @@
 ?????? ???2 ??????4 0
 ????????? ???2 ??????4 ??????3 0
 ???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ?????? ?????????4 0
+??????????????? ???2 ??????4 ??????2 ??? ??????4 0
 ?????? ???2 ?????????2 0
 ???????????? ???2 ??????4 ??????3 ??????3 0
 ?????? ???2 ?????????4 0
@@ -2618,13 +2639,18 @@
 ????????? ???2 ?????? ??????1 0
 ????????? ???2 ????????? ???2 0
 ?????? ???2 ????????? 0
+??????????????? ???2 ????????? ???4 ?????? ????????? 0
 ???????????? ???2 ????????? ?????????4 ??????3 0
+???????????? ???2 ????????? ?????????3 ??????4 0
 ??????????????? ???2 ????????? ?????????3 ??????4 ??????1 0
 ?????? ???2 ????????? 0
 ???????????? ???2 ????????? ???2 ??????3 0
+??????????????? ???2 ????????? ??????2 ??????4 ??????4 0
+???????????? ???2 ??????3 ??????4 ??????4 0
 ???????????? ???2 ??????3 ??????3 ??????2 0
 ???????????? ???2 ??????3 ??????4 ?????? 0
 ???????????? ???2 ??????3 ?????????4 ??????4 0
+???????????? ???2 ??????3 ?????????4 ?????????4 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ??????????????? ???2 ??????4 ??????4 ??? ?????? 0
 ?????? ???2 ??????2 0
@@ -2632,7 +2658,10 @@
 ?????? ???2 ?????? 0
 ???????????? ???2 ?????? ??? ??????2 0
 ???????????? ???2 ??????2 ???2 ????????? 0
+????????? ???2 ??????3 ???2 0
 ???????????? ???2 ??????4 ???2 ???4 0
+??????????????? ???2 ??????4 ?????????2 ??????2 ?????????4 0
+???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ??????4 ??????3 ??? 0
 ???????????? ???2 ????????? ??????3 ????????? 0
 ?????? ???2 ?????????4 0
@@ -2650,7 +2679,9 @@
 ?????? ???2 ?????????2 0
 ????????? ???2 ?????????2 ??????1 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????2 0
 ?????? ???2 ?????????2 0
+???????????? ???2 ?????????2 ???2 ?????????4 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ?????????4 ??? ??????2 0
 ???????????? ???2 ?????????4 ??????3 ??????2 0
@@ -2666,12 +2697,19 @@
 ?????? ???2 ?????????2 0
 ???????????? ???2 ?????????4 ?????? ???2 0
 ?????? ???2 ??? 0
+????????? ???2 ???3 ?????????4 0
 ???????????? ???2 ???3 ?????????4 ??????1 0
 ??????????????? ???2 ?????? ??????4 ??????3 ?????? 0
 ???????????? ???2 ??????4 ?????????4 ???3 0
+??????????????? ???2 ??????4 ??????3 ?????????4 ??????4 0
+?????? ???2 ??????4 0
+????????? ???2 ??????4 ???2 0
 ???????????? ???2 ????????? ?????? ??????3 0
 ?????? ???2 ???3 0
 ????????? ???2 ??????2 ???4 0
+???????????? ???2 ?????? ??????2 ??????4 0
+???????????? ???2 ??????4 ??????3 ??????2 0
+???????????? ???2 ??????4 ??????3 ??????4 0
 ???????????? ???2 ??? ???4 ????????? 0
 ???????????? ???2 ???2 ???2 ??????4 0
 ????????? ???2 ???4 ???2 0
@@ -2684,6 +2722,7 @@
 ?????? ???2 ??????2 0
 ?????? ???2 ??????2 0
 ???????????? ???2 ??????2 ?????? ?????????2 0
+???????????? ???2 ???4 ????????? ?????? 0
 ?????? ???2 ?????????4 0
 ????????? ???2 ????????? ?????????4 0
 ???????????? ???2 ?????????2 ??????2 ??? 0
@@ -2692,6 +2731,7 @@
 ?????????????????? ???2 ?????????3 ??????2 ??????4 ??????2 ??????2 0
 ???????????? ???2 ?????????3 ??????2 ??????4 0
 ???????????? ???2 ?????????3 ??????4 ??????2 0
+???????????? ???2 ?????????3 ??????4 ????????? 0
 ???????????? ???2 ?????????3 ???4 ???4 0
 ???????????? ???2 ?????????3 ???4 ?????????2 0
 ?????? ???3 ??? 0
@@ -2955,6 +2995,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????3 0
+????????? ??????4 ??????4 ?????????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ?????????2 0
 ?????? ??????4 ?????????2 0
@@ -3674,6 +3715,7 @@
 ????????? ??????3 ??????3 ?????????4 0
 ?????? ??????3 ???4 0
 ???????????? ??????3 ??????4 ????????? ?????? 0
+?????? ??????3 ?????? 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -5947,6 +5989,7 @@
 ???????????? ??????2 ??????4 ???2 ?????????2 0
 ?????? ??????2 ??????4 0
 ????????????????????? ??????2 ??????3 ??????4 ??????2 ???2 ???2 ??????4 0
+?????? ??????2 ??????4 0
 ???????????? ??????2 ??????4 ??? ????????? 0
 ?????? ??????2 ?????????4 0
 ????????? ??????2 ????????? ??????2 0
@@ -6197,6 +6240,8 @@
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ???3 ??????4 0
 ?????? ??????4 ?????????2 0
+???????????? ??????4 ??????3 ??????4 ?????????2 0
+??????????????? ??????4 ??????3 ??????4 ?????????2 ?????? 0
 ???????????? ??????4 ??????3 ??????4 ???3 0
 ?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????2 ??????2 ??????4 0
@@ -6299,6 +6344,7 @@
 ????????? ??????4 ?????? ??????4 0
 ?????? ??????4 ??????2 0
 ????????? ??????4 ??????2 ?????????4 0
+???????????? ??????4 ??????2 ?????????3 ??????3 0
 ????????? ??????4 ??????3 ????????? 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ?????????3 ??????2 0
@@ -6515,7 +6561,9 @@
 ???????????? ?????? ??????3 ?????????4 ?????????2 0
 ?????? ?????? ???3 0
 ???????????? ??????2 ??????2 ?????? ?????? 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ????????? ??????2 ?????? ??????2 0
 ???????????? ??????2 ??????2 ?????? ????????? 0
 ?????? ??????2 ?????? 0
@@ -7118,11 +7166,13 @@
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ??????4 ?????????4 ?????? 0
 ???????????? ??????3 ????????? ?????????2 ?????????4 0
 ????????? ??????3 ?????????2 ?????? 0
 ?????? ??????3 ????????? 0
 ????????? ??????3 ????????? ??????1 0
 ???????????? ??????3 ????????? ??????3 ???4 0
+????????? ??????3 ????????? ??????2 0
 ????????? ??????3 ??????2 ??????2 0
 ????????? ??????3 ??????4 ??? 0
 ?????? ??????3 ??????2 0
@@ -7456,6 +7506,7 @@
 ????????? ??????2 ????????? ??????3 0
 ????????? ??????2 ????????? ?????? 0
 ????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????2 0
 ???????????? ??????2 ?????? ???4 ??????4 0
 ???????????? ??????2 ?????? ??????3 ?????????4 0
 ?????? ??????2 ?????????4 0
@@ -7509,6 +7560,7 @@
 ????????? ??????3 ???2 ??????1 0
 ????????? ??????3 ???4 ????????? 0
 ????????? ??????3 ???4 ?????????3 0
+?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ???4 0
@@ -7974,6 +8026,7 @@
 ?????? ?????????2 ?????? 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????3 ???2 ??????2 ?????? 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ?????????3 0
@@ -7994,10 +8047,13 @@
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ??? ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ???????????? ?????????2 ?????????2 ??????4 ???3 0
+?????? ?????????2 ????????? 0
 ????????? ?????????2 ????????? ??????4 0
+????????? ?????????2 ????????? ??????2 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ????????? ?????????2 ??? ?????????3 0
@@ -8195,6 +8251,7 @@
 ???????????????????????? ?????????2 ????????? ???4 ?????????3 ???4 ?????????4 ??????2 ??????2 0
 ??????????????????????????? ?????????2 ????????? ???4 ?????????3 ??? ???4 ?????????4 ??????2 ??????2 0
 ?????? ?????????2 ?????????4 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ????????? 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????4 0
@@ -8380,6 +8437,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ?????? 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????2 0
@@ -8648,6 +8706,7 @@
 ????????? ?????? ?????????2 ????????? 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ?????????2 0
+????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ?????????4 0
 ????????? ?????? ?????????2 ??? 0
 ???????????? ?????? ?????????2 ??????3 ??????4 0
@@ -10358,6 +10417,7 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ?????????4 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????4 0
 ???????????? ?????? ????????? ????????? ?????????2 0
 ???????????? ?????? ????????? ?????? ??????3 0
 ?????? ?????? ????????? 0
@@ -10526,6 +10586,7 @@
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????3 ???4 0
 ?????? ?????? ??????4 0
+????????? ?????? ??????4 ??????4 0
 ?????? ?????? ?????????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ??????3 0
@@ -10706,6 +10767,7 @@
 ????????? ??????4 ??????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????3 0
+?????? ??????4 ?????????3 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ??????3 0
@@ -10719,6 +10781,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -11194,6 +11257,7 @@
 ????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????2 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????????4 0
 ???????????? ??????4 ?????????4 ??????2 ????????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????2 0
@@ -12041,6 +12105,7 @@
 ???????????? ??????2 ???2 ??????4 ??????4 0
 ?????? ??????2 ??????3 0
 ?????? ??????2 ??????4 0
+?????? ??????2 ?????? 0
 ???????????? ??????2 ??????3 ??????4 ??????4 0
 ?????? ??????2 ?????????3 0
 ?????? ??????2 ??????4 0
@@ -12073,6 +12138,7 @@
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????2 ???2 ??????4 0
 ???????????? ?????? ??????2 ???2 ??????4 0
+?????? ?????? ??????2 0
 ?????? ?????? ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????2 0
@@ -12168,6 +12234,8 @@
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????4 0
+?????? ?????? ??????3 0
+??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
 ?????? ?????? ??????2 0
 ?????? ?????? ?????????3 0
 ?????? ?????? ???2 0
@@ -12336,6 +12404,7 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ???3 ?????????3 0
 ????????? ????????? ????????? ????????? 0
@@ -12492,6 +12561,7 @@
 ???????????? ????????? ????????? ??????4 ??????4 0
 ???????????? ????????? ????????? ?????? ???4 0
 ?????? ????????? ????????? 0
+???????????? ????????? ??????2 ??????2 ?????????4 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ??????2 ??????4 ?????????4 0
@@ -13045,6 +13115,7 @@
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ?????????3 0
 ?????? ?????????2 ?????? 0
+?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ?????? ?????????2 ??????2 0
 ?????? ?????????2 ?????? 0
@@ -13097,16 +13168,20 @@
 ?????? ?????????4 ??????3 0
 ???????????? ?????????4 ??????2 ???4 ?????? 0
 ?????? ?????????4 ?????? 0
+???????????? ?????????4 ??????4 ???2 ?????????4 0
 ?????? ?????????4 ?????? 0
 ???????????? ?????????4 ?????????4 ??? ?????????4 0
+???????????? ?????????4 ?????????4 ?????????4 ?????????4 0
 ???????????? ?????????4 ??????3 ?????????2 ?????? 0
 ???????????? ?????????4 ?????? ?????????2 ??????4 0
 ???????????? ?????????4 ?????? ??? ?????? 0
 ?????? ?????????4 ??????3 0
+???????????? ?????????4 ??????3 ??????4 ?????? 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ??????4 0
 ?????? ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
+???????????? ?????????4 ????????? ??????2 ??????3 0
 ?????? ?????????4 ???4 0
 ???????????? ?????????4 ??????4 ????????? ?????? 0
 ?????? ?????????4 ??? 0
@@ -13930,6 +14005,7 @@
 ????????? ??????4 ?????? ?????? 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????2 0
+????????????????????? ??????4 ?????? ??? ?????????4 ????????? ?????????2 ??????2 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????1 0
 ???????????? ??????4 ?????????2 ??????3 ?????????4 0
@@ -14847,6 +14923,7 @@
 ???????????? ?????????2 ??????4 ????????? ??????2 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????3 0
+????????? ?????????2 ??????3 ??????3 0
 ?????? ?????????2 ?????????2 0
 ?????? ?????????2 ??? 0
 ?????? ?????????2 ???2 0
@@ -15078,6 +15155,7 @@
 ???????????? ?????????4 ??????2 ??????3 ???3 0
 ???????????? ?????????4 ??????2 ????????? ??????4 0
 ?????????????????? ?????????4 ??????2 ????????? ?????????4 ??????2 ???2 0
+???????????? ?????????4 ??????2 ????????? ??????2 0
 ?????????????????? ?????????4 ??????2 ??????4 ??????4 ??????4 ???3 0
 ?????? ?????????4 ??????4 0
 ?????? ??????2 ??????3 0
@@ -15389,7 +15467,9 @@
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
+????????? ??????4 ?????????4 ???4 0
 ????????? ??????4 ?????????4 ?????????3 0
+????????? ??????4 ?????????4 ?????????3 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ?????? ??????4 ??????4 0
@@ -16031,8 +16111,10 @@
 ?????? ?????? ??????2 0
 ?????? ?????? ??? 0
 ?????? ??????3 ???4 0
+????????? ??????3 ???4 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
+???????????? ??????3 ?????? ??????4 ???3 0
 ?????? ??????3 ??????3 0
 ?????? ??????3 ???4 0
 ?????? ??????4 ??????3 0
@@ -16712,6 +16794,7 @@
 ?????? ?????????3 ?????????2 0
 ???????????? ?????????3 ????????? ??????4 ??????2 0
 ???????????? ????????? ?????? ???4 ?????????4 0
+???????????? ????????? ??????2 ?????? ?????? 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ?????? ????????? ??????2 0
@@ -17655,6 +17738,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ????????? ????????? ????????? ?????????2 0
 ?????? ????????? ?????????4 0
 ???????????? ????????? ?????????2 ??????4 ?????????4 0
@@ -18586,6 +18670,7 @@
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ??????3 0
+????????? ??????2 ??????2 ??????2 0
 ?????? ??????2 ??????2 0
 ????????? ??????2 ??????2 ????????? 0
 ???????????? ??????2 ??????3 ??????2 ??????2 0
@@ -18661,6 +18746,7 @@
 ?????? ??????4 ??????3 0
 ???????????? ??????4 ??????3 ?????????2 ??????4 0
 ???????????? ??????4 ??????3 ??????2 ??????3 0
+?????? ??????4 ??????2 0
 ?????? ??????4 ??????4 0
 ???????????? ??????4 ????????? ???3 ??????3 0
 ?????? ??????4 ?????????4 0
@@ -18830,6 +18916,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ?????????3 ????????? ?????? 0
 ?????? ?????????4 ??????2 0
+????????? ?????????4 ??????2 ?????????3 0
 ?????? ?????????4 ?????????4 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ??????3 0
@@ -19311,7 +19398,11 @@
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
+???????????? ?????????2 ?????????2 ???4 ???4 0
+???????????? ?????????2 ?????? ?????????3 ??????4 0
+???????????? ?????????2 ?????? ??????4 ?????????4 0
 ?????? ?????????2 ??????2 0
+???????????? ?????????2 ??????2 ???4 ??????3 0
 ???????????? ?????????2 ??????2 ????????? ??????2 0
 ?????? ?????????3 ??????2 0
 ?????? ?????????3 ?????????2 0
@@ -19332,6 +19423,7 @@
 ?????? ?????????4 ?????????3 0
 ???????????? ?????????4 ???4 ??????2 ??????2 0
 ???????????? ?????????4 ?????????3 ?????? ???2 0
+???????????? ?????????4 ?????????3 ?????? ???2 0
 ????????? ?????????4 ??????2 ??????1 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ?????? ??????4 ??????3 0
@@ -19380,6 +19472,7 @@
 ???????????? ?????????2 ??????2 ?????????2 ???4 0
 ?????? ?????????2 ??????3 0
 ?????? ?????????2 ??????4 0
+????????? ?????????2 ??????4 ?????? 0
 ????????? ?????????2 ????????? ?????? 0
 ???????????? ?????????2 ????????? ????????? ??????3 0
 ?????? ?????????2 ????????? 0
@@ -19993,6 +20086,7 @@
 ?????? ????????? ?????????3 0
 ???????????? ????????? ?????????3 ?????????3 ??????4 0
 ?????? ????????? ?????????4 0
+????????? ????????? ?????????4 ??????4 0
 ?????? ????????? ?????????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ?????????4 0
@@ -20027,6 +20121,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????3 0
+?????? ????????? ?????????4 0
 ?????? ????????? ??????4 0
 ????????? ????????? ??????4 ??????4 0
 ?????? ????????? ??????2 0
@@ -20428,6 +20523,7 @@
 ?????? ????????? ???4 0
 ?????? ????????? ???3 0
 ?????? ????????? ???4 0
+?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????3 0
 ???????????? ????????? ??????3 ??????2 ??????4 0
@@ -20456,6 +20552,7 @@
 ?????? ????????? ??????2 0
 ?????? ????????? ??????4 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????3 ??????4 ??????4 0
 ?????? ????????? ????????? 0
 ???????????? ????????? ????????? ????????? ???4 0
 ????????? ????????? ????????? ??????4 0
@@ -20482,6 +20579,7 @@
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????2 0
 ?????? ????????? ??????2 0
+???????????? ????????? ??????2 ??????4 ?????? 0
 ???????????? ????????? ??????4 ??????4 ??????2 0
 ????????? ????????? ??????4 ????????? 0
 ?????? ????????? ????????? 0
@@ -20904,6 +21002,7 @@
 ?????? ????????? ??????4 0
 ?????? ????????? ??????4 0
 ???????????? ????????? ????????? ??????4 ??????2 0
+??? ?????????3 0
 ???????????? ?????????3 ???2 ??????2 ??? 0
 ?????? ?????????3 ???4 0
 ?????? ?????????3 ?????? 0
@@ -20961,6 +21060,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ?????????4 0
 ?????? ?????????3 ?????????3 0
+?????? ?????????3 ?????????3 0
 ?????? ?????????3 ????????? 0
 ?????? ?????????3 ?????????2 0
 ?????? ?????????3 ?????????4 0
@@ -21211,6 +21311,7 @@
 ?????? ?????????3 ??? 0
 ???????????? ?????????3 ??? ???4 ???2 0
 ?????? ?????????3 ??????4 0
+?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????4 ????????? ??????2 0
 ?????? ?????????3 ??????3 0
 ???????????? ?????????3 ??????2 ??????4 ?????????2 0
@@ -21631,6 +21732,7 @@
 ?????? ?????????3 ??????4 0
 ?????? ?????????3 ??????3 0
 ?????? ?????????3 ?????? 0
+????????? ?????????3 ??????2 ??????4 0
 ???????????? ?????????3 ??????3 ??? ?????? 0
 ?????? ?????????3 ?????????3 0
 ?????? ?????????3 ??????4 0
@@ -21892,6 +21994,7 @@
 ???????????? ?????????2 ??????2 ?????????4 ?????????4 0
 ????????? ?????????2 ??????4 ??????2 0
 ???????????? ?????????2 ??????4 ????????? ??????4 0
+???????????? ?????????2 ??????4 ??????3 ?????????3 0
 ?????? ?????????2 ??????4 0
 ?????? ?????????2 ?????????4 0
 ???????????? ?????????2 ?????????4 ??????3 ???2 0
@@ -22084,6 +22187,7 @@
 ?????? ?????? ?????????4 0
 ?????? ?????? ???2 0
 ???????????? ?????? ???4 ??????4 ?????????2 0
+???????????? ?????? ??????4 ??????4 ???4 0
 ?????? ?????? ?????? 0
 ???????????? ?????? ??????4 ?????? ?????????4 0
 ?????? ?????? ??????4 0
@@ -22114,13 +22218,16 @@
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????3 0
 ???????????? ??????2 ??????4 ??????4 ??????2 0
+?????? ??????2 ??????3 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ??????4 0
+???????????? ??????2 ??????2 ??????2 ??????3 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
 ????????? ??????2 ??????4 ?????????3 0
+????????? ??????2 ??????4 ??????1 0
 ?????? ??????2 ??????3 0
 ????????? ??????2 ?????? ?????? 0
 ?????? ??????2 ?????? 0
@@ -22177,6 +22284,7 @@
 ???????????? ??????2 ????????? ???4 ??????2 0
 ?????? ??????2 ????????? 0
 ????????? ??????2 ????????? ??????3 0
+????????? ??????2 ????????? ??????3 0
 ???????????? ??????2 ???3 ??????4 ??????4 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
@@ -22191,6 +22299,7 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????2 ??? ??????2 0
 ?????? ??????2 ???4 0
+?????? ??????2 ??????4 0
 ????????? ??????3 ???2 ????????? 0
 ?????? ??????3 ???4 0
 ?????? ??????3 ?????? 0
@@ -22430,6 +22539,7 @@
 ?????? ?????????3 ?????????4 0
 ???????????????????????? ?????????3 ??????4 ??????2 ??????2 ???2 ??????3 ??? ????????? 0
 ???????????? ?????????3 ?????????2 ????????? ????????? 0
+???????????? ?????????3 ??????4 ?????????2 ??????4 0
 ????????? ?????????3 ??????4 ?????????2 0
 ????????? ?????????3 ??????4 ??????4 0
 ?????? ?????????3 ??????2 0
@@ -25542,8 +25652,11 @@
 ?????? ???2 ???4 0
 ????????? ???2 ???4 ??????2 0
 ????????? ???2 ???4 ??????2 0
+????????? ???2 ???4 ?????????4 0
 ????????? ???2 ???4 ?????????4 0
 ???????????? ???2 ???4 ?????????4 ??????1 0
+????????? ???2 ???4 ?????????2 0
+???????????? ???2 ???4 ?????????2 ????????? 0
 ????????? ???2 ???4 ??????2 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
@@ -25687,6 +25800,7 @@
 ?????? ???3 ????????? 0
 ?????? ???3 ?????????4 0
 ?????? ???3 ?????????2 0
+?????? ???3 ??????3 0
 ?????? ???3 ??????4 0
 ?????? ???3 ?????????3 0
 ?????? ???3 ?????????4 0
@@ -25751,6 +25865,7 @@
 ?????? ???4 ?????????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ?????????4 0
+????????? ???4 ????????? ????????? 0
 ?????? ???4 ??????2 0
 ???????????? ???4 ?????????2 ??????4 ??????2 0
 ?????? ???4 ??????2 0
@@ -25761,6 +25876,7 @@
 ?????? ???4 ??????4 0
 ?????? ???4 ??????4 0
 ????????? ???4 ??????4 ???2 0
+????????? ???4 ??????4 ??????2 0
 ???????????? ???4 ??????4 ??????4 ??????4 0
 ?????? ???4 ?????????2 0
 ?????? ???4 ?????????2 0
@@ -25928,6 +26044,7 @@
 ???????????? ??????4 ??????2 ?????? ??????2 0
 ????????? ??????4 ?????????2 ??????2 0
 ???????????? ?????? ??????2 ?????????4 ?????????4 0
+????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
 ?????? ?????? ????????? 0
 ???????????? ?????? ????????? ??????3 ??????3 0
 ?????? ?????? ??????2 0
@@ -25938,6 +26055,7 @@
 ???????????? ?????? ??????4 ??????4 ?????? 0
 ?????? ?????? ??????2 0
 ?????? ?????? ??????3 0
+???????????? ?????? ?????????4 ??????4 ??????3 0
 ?????? ?????? ??????3 0
 ????????? ?????? ??????2 ??????3 0
 ?????? ?????? ?????? 0
@@ -25947,6 +26065,7 @@
 ???????????? ?????? ?????????4 ??????2 ??????4 0
 ???????????? ?????? ?????????3 ??????3 ???3 0
 ???????????? ?????? ??????4 ????????? ??????3 0
+???????????? ?????? ?????? ??????4 ??????4 0
 ?????? ?????? ???4 0
 ??????????????? ?????? ??????2 ??????3 ??????2 ??????1 0
 ?????? ?????? ??????3 0
@@ -26061,6 +26180,7 @@
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
 ????????? ??????4 ??????4 ??????3 0
 ???????????? ??????4 ??????2 ??????4 ?????????3 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ??????3 0
 ?????? ??????4 ??????4 0
 ????????? ??????4 ??????4 ?????? 0
@@ -26266,6 +26386,7 @@
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
 ????????? ??????4 ??????3 ?????????2 0
+?????? ??????4 ??????4 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ?????? 0
 ?????? ??????4 ??????4 0
@@ -26488,6 +26609,7 @@
 ?????? ??????3 ??????4 0
 ????????? ??????3 ??????4 ?????????2 0
 ?????? ??????3 ??????4 0
+?????? ??????3 ??????3 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????4 0
@@ -26564,6 +26686,7 @@
 ?????? ??????4 ??????3 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????4 0
+?????? ??????4 ?????? 0
 ???????????? ??????4 ??????2 ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
 ????????? ??????4 ???4 ??????1 0
@@ -27051,6 +27174,7 @@
 ?????? ???2 ?????????3 0
 ?????? ???2 ???3 0
 ?????? ???2 ??????3 0
+?????? ???3 ????????? 0
 ?????? ???3 ??????4 0
 ?????? ???3 ??????3 0
 ?????? ???3 ??????2 0
@@ -27262,11 +27386,14 @@
 ?????? ?????? ??????4 0
 ??? ??????2 0
 ?????? ??????2 ??????3 0
+?????? ??????2 ??????4 0
 ?????? ??????2 ??????2 0
+?????? ??????2 ??????3 0
 ????????? ??????2 ????????? ????????? 0
 ?????? ??????2 ?????????2 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ?????????2 0
+????????? ??????2 ?????? ??????2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ????????? 0
@@ -28337,6 +28464,7 @@
 ???????????????????????? ??? ??? ????????? ???2 ?????? ??? ?????? ???2 0
 ???????????? ??? ??? ????????? ??????4 0
 ?????? ??? ???2 0
+????????? ??? ???4 ??????4 0
 ?????? ??? ?????? 0
 ?????? ??? ??????3 0
 ?????? ??? ??????3 0
@@ -29455,6 +29583,7 @@
 ?????? ??????4 ???3 0
 ?????? ??????4 ???4 0
 ???????????? ?????? ???4 ?????????4 ?????????2 0
+?????? ?????? ???4 0
 ?????? ?????? ???4 0
 ?????? ?????? ??????4 0
 ?????? ?????? ??????2 0
@@ -30115,8 +30244,10 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ??????2 0
+????????? ??????3 ??????2 ?????? 0
 ???????????? ??????3 ??????4 ?????? ??????2 0
 ????????? ??????3 ?????? ??????4 0
+?????? ??????3 ????????? 0
 ?????? ??????3 ?????????4 0
 ?????? ??????3 ???2 0
 ???????????? ??????4 ???3 ??????4 ??????4 0
@@ -30229,6 +30360,7 @@
 ????????? ?????????4 ???4 ?????? 0
 ???????????? ?????????4 ???4 ?????????4 ??????2 0
 ?????? ????????? ??????4 0
+?????? ????????? ??????3 0
 ?????? ????????? ?????????4 0
 ?????? ????????? ??????3 0
 ?????? ????????? ?????????2 0
@@ -30414,6 +30546,7 @@
 ?????? ????????? ?????????3 0
 ????????? ????????? ????????? ???3 0
 ???????????? ????????? ?????????3 ??????2 ?????????4 0
+????????? ????????? ??????2 ????????? 0
 ?????? ????????? ??????4 0
 ?????? ????????? ?????????2 0
 ?????? ????????? ?????????3 0
@@ -30989,6 +31122,7 @@
 ?????? ??? ??????2 0
 ?????? ??? ??????3 0
 ????????? ??? ??????3 ???2 0
+?????? ??? ??????3 0
 ?????? ??? ?????? 0
 ?????? ??? ??????4 0
 ?????? ??? ??????4 0
@@ -31008,10 +31142,12 @@
 ?????? ??? ???2 0
 ?????? ??? ???2 0
 ???????????? ??? ???4 ????????? ?????????4 0
+?????? ??? ??????3 0
 ?????? ??? ??????4 0
 ???????????? ??? ?????? ??????4 ?????????4 0
 ?????? ??? ??????3 0
 ?????? ??? ???4 0
+???????????? ??? ???4 ??????4 ???3 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
 ?????? ??? ?????? 0
@@ -31398,6 +31534,7 @@
 ?????? ??????3 ??????4 0
 ?????? ??????3 ?????????4 0
 ???????????? ??????3 ??????2 ???2 ??????4 0
+????????? ??????3 ??????4 ??????4 0
 ?????? ??????3 ??????2 0
 ?????? ??????3 ??????4 0
 ?????? ??????3 ??????3 0
@@ -31453,6 +31590,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????? 0
+????????? ?????? ?????????2 ??????2 0
 ?????? ?????? ????????? 0
 ?????? ?????? ?????????3 0
 ???????????? ?????? ?????????3 ?????????4 ??????2 0
@@ -31466,6 +31604,8 @@
 ?????? ?????? ??????3 0
 ???????????? ?????? ??????3 ??????4 ?????????2 0
 ?????? ?????? ??? 0
+????????? ?????? ??????3 ??????3 0
+????????? ?????? ??????3 ??????4 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ???3 0
 ????????? ??????4 ???3 ?????????4 0
@@ -31739,6 +31879,7 @@
 ???????????? ?????????4 ?????????3 ??????4 ??????1 0
 ?????? ?????????4 ?????????2 0
 ?????? ?????????4 ?????????2 0
+???????????? ?????????4 ??????4 ?????????4 ??????2 0
 ?????? ?????????4 ????????? 0
 ????????? ?????????4 ????????? ??????1 0
 ???????????? ?????????4 ?????????4 ??????4 ??????1 0
@@ -31863,6 +32004,7 @@
 ?????? ???2 ?????????4 0
 ?????? ???2 ??????4 0
 ?????? ???2 ??????4 0
+?????? ???2 ?????????4 0
 ?????? ???2 ??????3 0
 ?????? ???2 ??????2 0
 ?????? ???2 ?????????4 0
@@ -31934,6 +32076,7 @@
 ???????????? ?????? ?????? ???2 ?????????4 0
 ?????? ?????? ?????? 0
 ?????? ??????4 ??????4 0
+????????? ??????4 ??????4 ?????????4 0
 ???????????? ??????4 ??????3 ??? ????????? 0
 ?????? ??????4 ??????2 0
 ?????? ??????4 ?????????4 0
@@ -31943,6 +32086,7 @@
 ?????? ??????4 ??????4 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ?????????2 0
+????????? ??????4 ?????????2 ??????2 0
 ?????? ??????4 ?????????4 0
 ?????? ??????4 ????????? 0
 ?????? ??????4 ?????????4 0
@@ -32135,6 +32279,7 @@
 ?????? ?????? ????????? 0
 ?????? ?????? ??????4 0
 ????????? ?????? ??????4 ??????3 0
+???????????? ??????2 ???2 ??????2 ??????4 0
 ?????? ??????2 ???2 0
 ?????? ??????2 ??????4 0
 ?????? ??????2 ??????4 0
@@ -32144,6 +32289,7 @@
 ?????? ??????2 ?????????4 0
 ?????? ??????2 ??????2 0
 ?????? ??????2 ?????????3 0
+???????????? ??????2 ????????? ??????4 ?????????2 0
 ?????? ??????2 ?????? 0
 ?????? ??????2 ??????4 0
 ???????????? ??????2 ???2 ????????? ????????? 0
@@ -32187,6 +32333,10 @@
 ?????? ??????2 ??????2 0
 ???????????? ??????2 ??????3 ??????2 ???2 0
 ?????? ??????2 ????????? 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ??????4 0
+????????? ??????2 ????????? ???4 0
+????????? ??????2 ????????? ??????4 0
 ????????????????????? ??????2 ????????? ?????? ??????3 ??????2 ??????2 ?????????3 0
 ???????????? ??????2 ?????? ??????4 ?????????2 0
 ?????? ??????2 ???4 0
@@ -32986,61 +33136,9 @@
 ?????? ??? ??? 0
 ?????? ??? ??? 0
 ?????? ??? ??? 0
-????????? ??????4 ?????????4 ?????????4 0
-?????? ?????????2 ??????4 0
-?????? ??????3 ?????? 0
-???????????? ??????4 ??????2 ?????????3 ??????3 0
-????????? ??????3 ????????? ??????2 0
-???????????? ??????3 ??????4 ?????????4 ?????? 0
-????????? ??????3 ??????3 ?????? 0
-????????? ?????????3 ??????2 ??????4 0
-?????? ??????3 ????????? 0
-????????? ??????3 ??????2 ?????? 0
-????????? ???4 ????????? ????????? 0
-????????? ???4 ??????4 ??????2 0
-????????? ?????? ??????3 ??????4 0
-????????? ?????? ??????3 ??????3 0
-????????? ?????? ?????????2 ??????2 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ??????4 0
-????????? ??????2 ????????? ???4 0
-?????? ??????4 ??????2 0
-????????? ??????2 ??????4 ??????1 0
-????????? ??????2 ????????? ??????3 0
-?????? ??????2 ??????3 0
-???????????? ?????? ?????????4 ??????4 ??????3 0
-?????? ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ??????2 ?????? ??????2 0
-???????????? ?????? ?????? ??????4 ??????4 0
-????????????????????? ?????? ??????2 ??????4 ??????4 ???3 ??????3 ???3 0
-?????? ??????4 ??????4 0
-???????????? ??????2 ??????2 ??????2 ??????3 0
-?????? ??????2 ??????4 0
-????????? ???2 ???4 ?????????4 0
-???????????? ???2 ???4 ?????????2 ????????? 0
-????????? ???2 ???4 ?????????2 0
-?????? ?????????2 ????????? 0
-???????????? ?????????2 ??????2 ??? ??????4 0
-????????? ?????????2 ????????? ??????2 0
-???????????? ?????? ??????4 ??????4 ???4 0
-???????????? ??????2 ???2 ??????2 ??????4 0
-???????????? ??????2 ????????? ??????4 ?????????2 0
-????????? ??????4 ?????????4 ???4 0
-????????? ??????4 ?????????4 ?????????3 0
-????????? ??????3 ???4 ??????2 0
-???????????? ??????3 ?????? ??????4 ???3 0
-???????????? ??????2 ??????2 ??????2 ??????4 0
-???????????? ??????2 ??????4 ?????????2 ??????2 0
-?????? ??????4 ?????????4 0
-????????? ??????4 ??????4 ?????????2 0
-??? ?????????3 0
-?????? ?????????3 ?????????3 0
-????????? ??????2 ??????2 ??????2 0
-?????? ?????? ??????3 0
-??????????????? ?????? ??????3 ??????4 ?????????3 ??????4 0
-?????? ???3 ??????3 0
-????????? ????????? ?????????4 ??????4 0
-????????????????????????????????????????????? ???4 ??? ??????2 ??????2 ????????? ??????3 ??????4 ??? ??????4 ?????????2 ??????2 ???3 ??????3 ?????????2 ?????? 0
-????????? ??????3 ??????4 ??????4 0
+????????? ?????? ????????? ??????3 0
+??????????????? ??? ??? ??????3 ??????4 ??????4 0
+?????? ??????3 ??????2 0
+?????? ?????? ????????? 0
+?????? ?????? ????????? 0
+?????? ?????????3 ????????? 0
Binary files gcin-1.2.9.orig/.tedfilepos and gcin-1.2.9/.tedfilepos differ
diff -urN gcin-1.2.9.orig/tenv gcin-1.2.9/tenv
--- gcin-1.2.9.orig/tenv	2006-10-19 14:18:38.000000000 +0800
+++ gcin-1.2.9/tenv	2006-11-15 13:10:24.000000000 +0800
@@ -11,6 +11,6 @@
 gcinpid=$!
 sleep 1
 export LD_PRELOAD=./im-client/libgcin-im-client.so
-#gedit
-leafpad
+gedit
+#leafpad
 pkill gcin.test


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin	15 Nov 2006 07:14:44 -0000	1.1
+++ NewCJ3.cin	17 Nov 2006 00:35:49 -0000	1.2
@@ -52,7 +52,6 @@
 ... ???
 ... ???
 ... ???
-.; ???
 ' ???
 '' "
 '' "
@@ -171,7 +170,6 @@
 ;a ???
 ;b ???
 ;c ???
-;cu ???
 ;d ???
 ;e ???
 ;f ???
@@ -194,7 +192,9 @@
 ;s ???
 ;t ???
 ;u ???
+;ui ??????
 ;uu ??????
+;uio ?????????
 ;u; ???
 ;v ???
 ;w ???
@@ -216,7 +216,7 @@
 b ???
 b ???
 b ???
-b; ???
+b; ???
 b;; ??????
 c ???
 c ???
@@ -249,7 +249,7 @@
 f ???
 f ???
 f ???
-f; ???
+f; ???
 g ???
 g ???
 g ???
@@ -297,7 +297,7 @@
 l ???
 l ???
 l ???
-l; ???
+l; ???
 m ???
 m ???
 m ???
@@ -347,7 +347,7 @@
 q ???
 q ???
 q ???
-q; ???
+q; ???
 r ???
 r ??
 r ???
@@ -382,7 +382,6 @@
 t ???
 t ???
 t; ???
-t;; ???
 u ???
 u ???
 u ???
@@ -410,7 +409,6 @@
 w ???
 w ???
 w; ???
-w;; ???
 x ???
 x ???
 x ???
@@ -459,7 +457,6 @@
 w. ???
 x. ???
 x. ??
-x.; ??
 y. ???
 z. ???
 a, ???
@@ -493,11 +490,9 @@
 ab ???
 ac ???
 ad ???
-ad; ???
 ae ???
 af ???
 af ???
-af; ???
 ag ???
 ah ???
 ai ???
@@ -526,7 +521,7 @@
 bd ???
 be ???
 bf ???
-bf; ???
+bf; ?????????
 bg ???
 bg ???
 bh ???
@@ -537,8 +532,8 @@
 bm ???
 bm ???
 bm ???
+bn ???
 bn ???
-bn; ???
 bo ???
 bp ???
 bq ???
@@ -546,7 +541,6 @@
 bs ???
 bt ???
 bt ???
-bt; ???
 bu ???
 bv ???
 bw ???
@@ -571,21 +565,18 @@
 ck ???
 cl ???
 cl ???
-cl; ???
 cm ???
 cn ???
 cn; ???
 co ???
 cp ???
-cq ???
-cq; ???
+cq ???
 cr ???
 cs ???
 ct ???
 cu ???
 cu; ???
 cv ???
-cv; ???
 cw ???
 cx ???
 cx; ??????
@@ -605,14 +596,12 @@
 dh ???
 di ???
 di ???
-di; ???
 dj ???
 dk ???
 dk ???
 dl ???
 dm ???
 dm ???
-dm; ???
 dn ???
 do ???
 dp ???
@@ -630,11 +619,11 @@
 ea ???
 ea ???
 ea ???
-ea; ???
 eb ???
 ec ???
 ec ???
 ed ???
+ee ???
 ee ???
 ef ???
 eg ???
@@ -692,7 +681,6 @@
 ga ???
 gb ???
 gb ???
-gb; ???
 gc ???
 gd ???
 ge ???
@@ -715,7 +703,6 @@
 gt ???
 gu ???
 gu ???
-gu; ???
 gv ???
 gw ???
 gx ???
@@ -724,38 +711,28 @@
 ha ???
 hb ???
 hc ???
-hc; ???
 hd ???
 hd; ???
 he ???
-he; ???
 hf ???
 hg ???
-hg; ???
 hh ???
-hh; ???
 hi ???
 hi ???
 hi; ???
 hj ???
 hk ???
-hk; ???
 hl ???
-hm ???
 hm ???
-hm; ???
 hn ???
-hn; ???
 ho ???
 ho ???
-ho; ???
 hp ???
-hp; ???
 hq ???
 hr ???
 hs ???
 hs ???
-hs; ???
+hs; ???
 ht ???
 ht; ???
 ht;; ??????
@@ -766,26 +743,18 @@
 hw; ??????
 hx ???
 hx; ???
-hy ???
-hy; ???
+hy ???
 hz ???
 ia ???
 ib ???
-ib; ???
 ic ???
 id ???
 id ???
-id; ???
-id; ???
 ie ???
-if ???
-if; ??????
+if ??????
 ig ???
 ih ???
-ih; ???
 ii ???
-ii ???
-ii; ???
 ij ???
 ik ???
 il ???
@@ -794,16 +763,15 @@
 io ???
 io; ???
 io; ???
-ip ???
+ip ???
 ip ???
 ip ???
-ip; ???
+ip ???
 iq ???
 ir ???
 is ???
 it ???
 it ???
-it; ???
 iu ???
 iv ???
 iv; ???
@@ -813,8 +781,8 @@
 iz ???
 izo ??????
 ja ???
+jb ???
 jb ???
-jb; ???
 jc ???
 jd ???
 jd ???
@@ -824,8 +792,6 @@
 jh ???
 ji ???
 jj ???
-jj; ???
-jj; ???
 jk ???
 jk; ???
 jl ???
@@ -837,7 +803,6 @@
 jp ???
 jq ???
 jr ???
-jr; ???
 js ???
 jt ???
 ju ???
@@ -849,13 +814,11 @@
 ka ???
 kb ???
 kb ???
-kb; ???
 kc ???
 kd ???
 ke ???
 kf ???
 kf ???
-kf; ???
 kg ???
 kh ???
 ki ???
@@ -866,18 +829,16 @@
 km ???
 kn ???
 kn ???
-kn; ???
 ko ???
 ko; ???
+kp ???
 kp ???
-kp; ???
 kq ???
 kr ???
 ks ???
 kt ???
 ku ???
 ku ???
-ku; ???
 ku; ???
 kv ???
 kw ???
@@ -885,9 +846,7 @@
 ky ???
 kz ???
 la ???
-la; ???
 lb ???
-lb; ???
 lc ???
 ld ???
 le ???
@@ -908,85 +867,70 @@
 ls ???
 lt ???
 lu ???
-lu; ???
 lv ???
 lw ???
+lw; ???
 lx ???
 ly ???
 lz ???
 ma ???
 mb ???
-mb; ???
 mc ???
-mc; ???
 md ???
 me ???
 me ???
 me ???
 me; ???
 mf ???
-mf; ???
 mg ???
+mh ???
 mh ???
-mh; ???
 mi ???
 mi; ???
 mj ???
 mk ???
-mk; ???
+mk; ???
+ml ???
 ml ???
-ml; ???
 mm ???
-mm ???
-mm; ???
 mn ???
 mo ???
-mo; ???
 mp ???
 mq ???
 mr ???
 ms ???
-ms; ???
 mt ???
-mt; ???
+mu ???
 mu ???
 mu ???
-mu; ???
-mv ???
+mv ???
 mv ???
-mv; ???
 mw ???
+mw; ???
 mx ???
 my ???
 mz ???
 na ???
 nb ???
-nb; ???
 nc ???
 nd ???
 ne ???
-ne; ???
 nf ???
 ng ???
 nh ???
 ni ???
 ni ???
-ni; ???
-ni; ???
-ni;; ???
 nj ???
 nk ???
 nl ???
 nl ???
-nl; ???
 nm ???
 nn ???
 no ???
 no ???
 no ???
-no No.
-no; ???
 np ???
+nq ???
 nq ???
 nq ???
 nq; ???
@@ -998,7 +942,6 @@
 nw ???
 nx ???
 nx ???
-nx; ???
 ny ???
 nz ???
 oa ???
@@ -1010,8 +953,8 @@
 ob ???
 ob ???
 ob; ???
+oc ???
 oc ???
-oc; ???
 od ???
 od ???
 od ???
@@ -1039,7 +982,6 @@
 og ???
 og ???
 og ???
-og; ???
 oh ???
 oh ???
 oh ???
@@ -1056,7 +998,6 @@
 oi ???
 oi ???
 oi ???
-oi; ???
 oj ???
 oj ???
 oj ???
@@ -1075,9 +1016,7 @@
 om ???
 om ???
 om ???
-om; ???
 on ???
-on; ???
 oo ???
 oo ???
 oo ???
@@ -1118,7 +1057,6 @@
 oq ???
 oq ???
 or ???
-or; ???
 or ???
 or ???
 or ???
@@ -1162,10 +1100,10 @@
 ou ???
 ou ???
 ou ???
-ou; ???
 ov ???
-ov; ???
+ow ???
 ow ???
+ow; ???
 ow ???
 ow ???
 ow ???
@@ -1177,7 +1115,6 @@
 ow ???
 ow ???
 ow ???
-ow; ???
 ox ???
 oy ???
 oy ???
@@ -1191,14 +1128,13 @@
 oy ???
 oy ???
 oy ???
-oy; ???
 oz ???
 pa ???
 pa ???
 pa; ???
 pb ???
+pc ???
 pc ???
-pc; ???
 pd ???
 pe ???
 pe; ??????
@@ -1207,14 +1143,13 @@
 ph ???
 pi ???
 pi ???
-pi; ???
 pj ???
+pk ???
 pk ???
-pk; ???
 pl ???
 pm ???
+pn ???
 pn ???
-pn; ???
 po ???
 pp ???
 pq ???
@@ -1227,74 +1162,66 @@
 px ???
 py ???
 pz ???
+qa ???
 qa ???
-qa; ???
+qb ???
 qb ???
-qb; ???
+qc ???
 qc ???
-qc; ???
+qd ???
 qd ???
-qd; ???
 qe ???
 qf ???
 qg ???
 qh ???
 qi ???
 qj ???
-qj; ???
 qk ???
 ql ???
 qm ???
-qm; ???
 qn ???
 qo ???
 qp ???
-qq ???
+qq ???
 qr ???
 qs ???
 qt ???
 qu ???
-qu; ???
 qv ???
 qw ???
 qx ???
+qy ???
 qy ???
-qy; ???
 qz ???
 ra ???
 rb ???
-rb; ???
 rc ???
 rc ???
-rc; ???
 rd ???
 re ???
 rf ???
-rf; ???
 rg ???
 rh ???
 ri ???
 rj ???
 rk ???
+rk; ???
 rl ???
 rm ???
 rn ???
 ro ???
 rp ???
-rp; ???
 rq ???
 rr ???
 rs ???
-rt ???
+rt ???
 ru ???
-ru; ???
 ru; ???
 rv ???
 rw ???
 rx ???
 ry ???
 rz ???
-rz; ???
 sa ???
 sb ???
 sc ???
@@ -1314,12 +1241,10 @@
 sp ???
 sq ???
 sr ???
-sr; ???
 ss ???
 st ???
-su ???
 su ???
-su; ???
+su ???
 sv ???
 sw ???
 sw; ???
@@ -1327,7 +1252,6 @@
 sy ???
 sz ???
 ta ???
-ta; ???
 tb ???
 tc ???
 tc ???
@@ -1335,25 +1259,22 @@
 te ???
 tf ???
 tg ???
-tg; ???
 th ???
+ti ???
 ti ???
-ti; ???
+tj ???
 tj ???
-tj; ???
 tj; ???
 tk ???
 tk; ???
 tl ???
 tm ???
-tm; ???
 tn ???
-tn; ???
 tn; ???
 tn; ???
 to ???
+tp ???
 tp ???
-tp; ???
 tq ???
 tr ???
 ts ???
@@ -1361,16 +1282,14 @@
 tt ???
 tt ???
 tt ???
-tt; ???
-tu ???
-tu; ???
+tt; ???
+tu ???
 tv ???
 tv; ???
 tw ???
 tw ???
 tw; ???
 tw; ???
-tw;; ???
 tx ???
 ty ???
 tz ???
@@ -1404,8 +1323,8 @@
 uy ???
 uz ???
 va ???
-vb ???
-vb; ???
+va; ???
+vb ???
 vc ???
 vd ???
 ve ???
@@ -1416,32 +1335,29 @@
 vi ???
 vj ???
 vk ???
-vk; ???
-vl ???
-vl ???
+vl ???
 vl ???
 vl; ???
+vm ???
 vm ???
-vm; ???
+vm; ???
 vn ???
 vo ???
 vo; ???
 vp ???
 vq ???
 vr ???
-vr; ???
 vs ???
 vt ???
+vu ???
 vu ???
-vu; ???
+vv ???
 vv ???
-vv; ???
 vw ???
 vx ???
-vy ???
-vy; ???
+vy ???
+vz ???
 vz ???
-vz; ???
 wa ???
 wb ???
 wc ???
@@ -1451,13 +1367,11 @@
 we ???
 wf ???
 wg ???
-wg; ???
 wh ???
 wi ???
 wj ???
 wj ???
 wk ???
-wk ???
 wl ???
 wm ???
 wn ???
@@ -1468,14 +1382,13 @@
 ws ???
 wt ???
 wu ???
+wv ???
 wv ???
-wv; ???
-ww ???
+ww ???
 wx ???
 wy ???
 wz ???
 wz ???
-wz; ???
 xa ???
 xb ???
 xc ???
@@ -1491,7 +1404,6 @@
 xm ???
 xn ???
 xo ???
-xo; ??
 xp ???
 xq ???
 xr ???
@@ -1518,30 +1430,28 @@
 yj ???
 yj; ???
 yk ???
-yk; ???
 yl ???
 ym ???
 yn ???
 yo ???
 yo; ???
+yp ???
 yp ???
-yp; ???
 yp; ???
 yq ???
 yr ???
+ys ???
 ys ???
-ys; ???
 yt ???
+yu ???
 yu ???
-yu; ???
 yv ???
 yw ???
 yx ???
+yy ???
 yy ???
-yy; ???
 yy, ??????
 yz ???
-yz; ???
 za ???
 zb ???
 zc ???
@@ -1555,7 +1465,7 @@
 zk ???
 zl ???
 zm ???
-zm; ???
+zm ???
 zn ???
 zo ???
 zp ???
@@ -1564,12 +1474,12 @@
 zs ???
 zt ???
 zu ???
-zu; ???
+zu ???
 zv ???
 zw ???
 zx ???
 zy ???
-zy; ???
+zy ???
 zz ???
 aaa ???
 aaa ???
@@ -6623,6 +6533,7 @@
 nbp ???
 nbp; ???
 nbu ???
+ncj ????????????
 ncz ???
 nde ???
 ndk ???
@@ -7052,10 +6963,9 @@
 ojg ???
 oji ???
 ojj ???
+ojk ???
 ojk ???
 ojk ???
-ojk ???
-ojk; ???
 ojm ???
 ojm ???
 ojm; ???
@@ -8546,20 +8456,8 @@
 rgc ???
 rgc ???
 rgc ???
-rgc (?????????)a
-rgc (?????????|||)??????
-rgc =???=b
-rgc ???????????????|||??????
 rgc; ???
 rgg ???
-rgg (????????????)
-rgg ???(???_???;)???
-rgg ??????~??????~
-rgg (??????O???)
-rgg .......\(><)/
-rgg ???*@??@*???
-rgg O_o
-rgg ???(???_???;)?????????~??????~
 rgi ???
 rgj ???
 rgk ???
@@ -9681,9 +9579,8 @@
 tmb ???
 tmb ???
 tmb; ???
-tmc ???
 tmc ???
-tmc; ???
+tmc ???
 tmd ???
 tmd ???
 tmd; ???
@@ -19631,6 +19528,7 @@
 somr ???
 sonl ???
 sorc ???
+sorr ?????????
 sphf ???
 sphh ???
 sqnl ???
@@ -28614,7 +28512,6 @@
 bopo ???
 boqa ???
 boqb ???
-boqh ????????????
 borb ????
 borg ????
 bort ????


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec	15 Nov 2006 07:14:44 -0000	1.13
+++ gcin.spec	17 Nov 2006 00:35:49 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
+Patch5:         gcin129update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -31,6 +32,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
+%patch5 -p1 -b .up
 cp -f gcinicon/gtab.list data/
 cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -105,6 +107,10 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+- add gcin129update.patch
+- update NewCJ3.cin
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1
 - update to 1.2.9
 - add NewCJ3.cin



From fedora-extras-commits at redhat.com  Fri Nov 17 03:02:03 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:02:03 -0700
Subject: rpms/xfce-mcs-manager/devel xfce-mcs-manager.spec,1.10,1.11
Message-ID: <200611170302.kAH323Jp028865@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28797

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
Add libxfcegui4-devel to requires on devel subpackage



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/devel/xfce-mcs-manager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce-mcs-manager.spec	11 Nov 2006 07:00:45 -0000	1.10
+++ xfce-mcs-manager.spec	17 Nov 2006 03:01:29 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.3.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2
@@ -22,6 +22,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libxfce4mcs-devel
+Requires: libxfcegui4-devel 
 Requires: gtk2-devel
 
 %description devel
@@ -61,6 +62,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-2
+- Add libxfcegui4-devel to requires on devel subpackage
+
 * Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
 - Update to 4.3.99.2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 03:28:19 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 16 Nov 2006 20:28:19 -0700
Subject: rpms/perl-File-Remove/devel .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611170328.kAH3SJqH029376@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:43:18 -0000	1.4
+++ .cvsignore	17 Nov 2006 03:27:48 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Remove.spec	3 Nov 2006 05:43:18 -0000	1.6
+++ perl-File-Remove.spec	17 Nov 2006 03:27:48 -0000	1.7
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:43:18 -0000	1.4
+++ sources	17 Nov 2006 03:27:48 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 17 03:28:56 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 16 Nov 2006 20:28:56 -0700
Subject: rpms/perl-File-Remove/FC-6 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611170328.kAH3SuaE029402@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29382

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:43:58 -0000	1.4
+++ .cvsignore	17 Nov 2006 03:28:26 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/perl-File-Remove.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Remove.spec	3 Nov 2006 05:43:58 -0000	1.6
+++ perl-File-Remove.spec	17 Nov 2006 03:28:26 -0000	1.7
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:43:58 -0000	1.4
+++ sources	17 Nov 2006 03:28:26 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 17 03:29:33 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 16 Nov 2006 20:29:33 -0700
Subject: rpms/perl-File-Remove/FC-5 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200611170329.kAH3TXwu029433@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29408

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:44:38 -0000	1.4
+++ .cvsignore	17 Nov 2006 03:29:03 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/perl-File-Remove.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-File-Remove.spec	3 Nov 2006 05:44:38 -0000	1.5
+++ perl-File-Remove.spec	17 Nov 2006 03:29:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:44:38 -0000	1.4
+++ sources	17 Nov 2006 03:29:03 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 17 03:30:12 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Thu, 16 Nov 2006 20:30:12 -0700
Subject: rpms/perl-File-Remove/FC-4 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611170330.kAH3UCxr029474@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29443

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:45:19 -0000	1.4
+++ .cvsignore	17 Nov 2006 03:29:41 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/perl-File-Remove.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-Remove.spec	3 Nov 2006 05:45:19 -0000	1.4
+++ perl-File-Remove.spec	17 Nov 2006 03:29:41 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 17 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:45:19 -0000	1.4
+++ sources	17 Nov 2006 03:29:41 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 17 03:31:31 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:31:31 -0700
Subject: rpms/exo/devel exo.spec,1.20,1.21
Message-ID: <200611170331.kAH3VVv6029633@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29545

Modified Files:
	exo.spec 
Log Message:
Rebuild with fixed xfce-mcs-manager-devel
Add exo-preferred-applicatons-settings.so



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- exo.spec	11 Nov 2006 07:27:19 -0000	1.20
+++ exo.spec	17 Nov 2006 03:31:00 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.12
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/exo-0.3.1.12rc2.tar.bz2
@@ -94,6 +94,7 @@
 %{_libexecdir}/exo-helper-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
+%{_libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so
 %{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
@@ -114,6 +115,10 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Nov 16 2006 Kevin Fenzi  - 0.3.1.12-0.2.rc2
+- Rebuild with fixed xfce-mcs-manager-devel
+- Add exo-preferred-applicatons-settings.so
+
 * Thu Nov  9 2006 Kevin Fenzi  - 0.3.1.12-0.1.rc2
 - Update to 0.3.1.12rc2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 03:45:28 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:45:28 -0700
Subject: rpms/Terminal/devel Terminal.spec,1.14,1.15
Message-ID: <200611170345.kAH3jSDn029803@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29785

Modified Files:
	Terminal.spec 
Log Message:
Add startup-notification-devel and dbus-glib-devel to BuildRequires



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Terminal.spec	11 Nov 2006 07:42:56 -0000	1.14
+++ Terminal.spec	17 Nov 2006 03:44:58 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.2.5.8
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Terminal-0.2.5.8rc2.tar.bz2
@@ -11,6 +11,8 @@
 BuildRequires: exo-devel >= 0.3.1
 BuildRequires: libSM-devel
 BuildRequires: gettext
+BuildRequires: startup-notification-devel
+BuildRequires: dbus-glib-devel
 
 %description
 Terminal is a lightweight and easy to use terminal emulator application
@@ -60,6 +62,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Nov 16 2006 Kevin Fenzi  - 0.2.5.8-0.2.rc2
+- Add startup-notification-devel and dbus-glib-devel to BuildRequires
+
 * Fri Nov 10 2006 Kevin Fenzi  - 0.2.5.8-0.1.rc2
 - Update to 0.2.5.8rc2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 03:47:17 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:47:17 -0700
Subject: rpms/xfce-mcs-manager/FC-6 xfce-mcs-manager.spec,1.10,1.11
Message-ID: <200611170347.kAH3lHrP029869@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce-mcs-manager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29853

Modified Files:
	xfce-mcs-manager.spec 
Log Message:
Add libxfcegui4-devel to requires on devel subpackage



Index: xfce-mcs-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-mcs-manager/FC-6/xfce-mcs-manager.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfce-mcs-manager.spec	11 Nov 2006 18:07:54 -0000	1.10
+++ xfce-mcs-manager.spec	17 Nov 2006 03:46:47 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Multi channel settings manager
 Name: xfce-mcs-manager
 Version: 4.3.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2
@@ -22,6 +22,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libxfce4mcs-devel
+Requires: libxfcegui4-devel 
 Requires: gtk2-devel
 
 %description devel
@@ -61,6 +62,9 @@
 %{_includedir}/xfce4/xfce-mcs-manager
 
 %changelog
+* Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-2
+- Add libxfcegui4-devel to requires on devel subpackage
+
 * Thu Nov  9 2006 Kevin Fenzi  - 4.3.99.2-1
 - Update to 4.3.99.2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 03:58:38 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 20:58:38 -0700
Subject: rpms/exo/FC-6 exo.spec,1.20,1.21
Message-ID: <200611170358.kAH3wcG8029966@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29945

Modified Files:
	exo.spec 
Log Message:
Rebuild with fixed xfce-mcs-manager-devel
Add exo-preferred-applicatons-settings.so



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-6/exo.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- exo.spec	11 Nov 2006 19:06:35 -0000	1.20
+++ exo.spec	17 Nov 2006 03:58:07 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.1.12
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: LGPL
 URL: http://xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/exo-0.3.1.12rc2.tar.bz2
@@ -94,6 +94,7 @@
 %{_libexecdir}/exo-helper-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
+%{_libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so
 %{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
@@ -114,6 +115,10 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Thu Nov 16 2006 Kevin Fenzi  - 0.3.1.12-0.2.rc2
+- Rebuild with fixed xfce-mcs-manager-devel
+- Add exo-preferred-applicatons-settings.so
+
 * Thu Nov  9 2006 Kevin Fenzi  - 0.3.1.12-0.1.rc2
 - Update to 0.3.1.12rc2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 04:11:29 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Thu, 16 Nov 2006 21:11:29 -0700
Subject: rpms/Terminal/FC-6 Terminal.spec,1.14,1.15
Message-ID: <200611170411.kAH4BTuF000617@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/Terminal/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv592

Modified Files:
	Terminal.spec 
Log Message:
Add startup-notification-devel and dbus-glib-devel to BuildRequires



Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/FC-6/Terminal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Terminal.spec	11 Nov 2006 19:29:05 -0000	1.14
+++ Terminal.spec	17 Nov 2006 04:10:59 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.2.5.8
-Release: 0.1.rc2%{?dist}
+Release: 0.2.rc2%{?dist}
 License: GPL
 URL: http://terminal.os-cillation.com/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/Terminal-0.2.5.8rc2.tar.bz2
@@ -11,6 +11,8 @@
 BuildRequires: exo-devel >= 0.3.1
 BuildRequires: libSM-devel
 BuildRequires: gettext
+BuildRequires: startup-notification-devel
+BuildRequires: dbus-glib-devel
 
 %description
 Terminal is a lightweight and easy to use terminal emulator application
@@ -60,6 +62,9 @@
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Thu Nov 16 2006 Kevin Fenzi  - 0.2.5.8-0.2.rc2
+- Add startup-notification-devel and dbus-glib-devel to BuildRequires
+
 * Fri Nov 10 2006 Kevin Fenzi  - 0.2.5.8-0.1.rc2
 - Update to 0.2.5.8rc2
 



From fedora-extras-commits at redhat.com  Fri Nov 17 05:14:34 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 16 Nov 2006 22:14:34 -0700
Subject: rpms/php-pear-SOAP/FC-6 php-pear-SOAP.spec,1.1,1.2
Message-ID: <200611170514.kAH5EYKU005354@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-SOAP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5315

Modified Files:
	php-pear-SOAP.spec 
Log Message:
	bump release



Index: php-pear-SOAP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-SOAP/FC-6/php-pear-SOAP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-SOAP.spec	16 Nov 2006 06:10:18 -0000	1.1
+++ php-pear-SOAP.spec	17 Nov 2006 05:14:04 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           php-pear-SOAP
 Version:        0.9.4
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Simple Object Access Protocol (SOAP) Client/Server for PHP
 
 Group:          Development/Libraries
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Fri Nov 17 2006 Remi Collet  0.9.4-1.fc6.1
+- dump release
+
 * Mon Nov  6 2006 Remi Collet  0.9.4-1
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE



From fedora-extras-commits at redhat.com  Fri Nov 17 14:46:19 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 17 Nov 2006 07:46:19 -0700
Subject: rpms/lilypond-doc/FC-6 .cvsignore, 1.5, 1.6 lilypond-doc.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <200611171446.kAHEkJbe003707@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3687

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Oct 2006 13:31:46 -0000	1.5
+++ .cvsignore	17 Nov 2006 14:45:48 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7-1.documentation.tar.bz2
+lilypond-2.10.0-2.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/lilypond-doc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lilypond-doc.spec	10 Oct 2006 13:31:46 -0000	1.4
+++ lilypond-doc.spec	17 Nov 2006 14:45:48 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           lilypond-doc
-Version:        2.8.7
-Release:	1%{?dist}
+Version:        2.10.0
+Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
 Group:		Applications/Publishing
 License:	GPL
 URL:		http://www.lilypond.org
-Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-1.documentation.tar.bz2
+Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-2.documentation.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Quentin Spencer  2.10.0-1
+- New release.
+
 * Tue Oct 10 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Oct 2006 13:31:46 -0000	1.5
+++ sources	17 Nov 2006 14:45:48 -0000	1.6
@@ -1 +1 @@
-492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2
+b4fae3abd129e0a19ceddb3dae03fb28  lilypond-2.10.0-2.documentation.tar.bz2



From richardokohII at yahoo.redhat.com  Sun Nov 19 11:56:07 2006
From: richardokohII at yahoo.redhat.com (Richard Okoh)
Date: Sun, 19 Nov 2006 12:56:07 +0100 (CET)
Subject: I WILL ASSIST YOU GET YOUR PAYMENT RELEASED 
Message-ID: <20061119115607.04D7F18B892@jedrzejow.pl>


FROM: Richard Okoh       PRIVATE AND CONFIDENTIAL
      # 3 Onyeama Street, Zone 2 
      Wuse Abuja.                
 
My Dear, 

I know that this letter will come to you with a great suprise, my name is Mr. Richard Okoh chairman consultative monetary panel, and this is in regards to your outstanding payment.
 
I took my time to carrying out a proper verification exercise on this subject matter and all the complications, which was created by some selfish officials who have various interests on the transaction. which I discovered that despite all efforts put in for you to be able to have what rightfully belong to you, all effort being made could not yield any result.
 
In a summary, this is my proposal I have contacted a friend of mine who is a politician and a lawyer by profession he is contesting for a Governor in one of the state here in my country. I was able to talk to him  regarding to your project and he promise to assist and make sure you get your payment realeased to you.
 
Finally, if this is ok by you I can be reach on Telephone Number:+234-805-6224255 Email:okohrichard02 at rediffmail.com as soon as I have your confirmation toward this subject I will arrange for a meeting with the parties concerned, then get back to you and you will be deeply amazed on how soon this transaction will come to an end.
 
Note that you must be carried along on each and every step to actualize this transaction. When i hear from you we can talk more on how  to proceed and what gets to us.
 
Best regards
 
Mr.Richard Okoh
CHAIRMAN 






From fedora-extras-commits at redhat.com  Tue Nov 21 06:20:16 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Tue, 21 Nov 2006 01:20:16 -0500
Subject: rpms/nagios/devel nagios.logrotate,1.2,1.3
Message-ID: <200611210620.kAL6KGKW006301@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6286

Modified Files:
	nagios.logrotate 
Log Message:
removed return


Index: nagios.logrotate
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.logrotate	21 Nov 2006 06:01:28 -0000	1.2
+++ nagios.logrotate	21 Nov 2006 06:19:46 -0000	1.3
@@ -13,4 +13,3 @@
 #       create 644 nagios nagios
 #}
 
-



From fedora-extras-commits at redhat.com  Tue Nov 21 06:31:52 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 01:31:52 -0500
Subject: rpms/openvrml - New directory
Message-ID: <200611210631.kAL6VqUS006580@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6576/openvrml

Log Message:
Directory /cvs/extras/rpms/openvrml added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 06:31:57 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 01:31:57 -0500
Subject: rpms/openvrml/devel - New directory
Message-ID: <200611210631.kAL6VvWR006595@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6576/openvrml/devel

Log Message:
Directory /cvs/extras/rpms/openvrml/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 06:32:18 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 01:32:18 -0500
Subject: rpms/openvrml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611210632.kAL6WIFr006642@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6619/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module openvrml


--- 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 Nov 21 06:32:13 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 01:32:13 -0500
Subject: rpms/openvrml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611210632.kAL6WDFo006625@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6619

Added Files:
	Makefile import.log 
Log Message:
Setup of module openvrml


--- NEW FILE Makefile ---
# Top level Makefile for module openvrml
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  Tue Nov 21 06:38:42 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:38:42 -0500
Subject: rpms/php-pear-Services-Weather - New directory
Message-ID: <200611210638.kAL6cgk0006876@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6872/php-pear-Services-Weather

Log Message:
Directory /cvs/extras/rpms/php-pear-Services-Weather added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 06:38:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:38:48 -0500
Subject: rpms/php-pear-Services-Weather/devel - New directory
Message-ID: <200611210638.kAL6cmoP006889@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6872/php-pear-Services-Weather/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Services-Weather/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 06:39:08 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:39:08 -0500
Subject: rpms/php-pear-Services-Weather Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200611210639.kAL6d8IF006921@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6915

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Services-Weather


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Services-Weather
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  Tue Nov 21 06:39:13 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:39:13 -0500
Subject: rpms/php-pear-Services-Weather/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611210639.kAL6dDoW006936@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6915/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Services-Weather


--- 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 Nov 21 06:44:00 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 01:44:00 -0500
Subject: owners owners.list,1.1975,1.1976
Message-ID: <200611210644.kAL6i0Sd007027@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7010

Modified Files:
	owners.list 
Log Message:
	php-pear-Services-Weather : Interface to various online weather-services Description



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1975
retrieving revision 1.1976
diff -u -r1.1975 -r1.1976
--- owners.list	16 Nov 2006 20:33:10 -0000	1.1975
+++ owners.list	21 Nov 2006 06:43:30 -0000	1.1976
@@ -1820,6 +1820,7 @@
 Fedora Extras|php-pear-PHP-CompatInfo|Find out version and extensions required for a piece of code to run|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit|Regression testing framework for unit tests|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-PHPUnit2|Regression testing framework for unit tests|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Services-Weather|Interface to various online weather-services Description|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-SOAP|Simple Object Access Protocol (SOAP) Client/Server for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 06:53:53 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 01:53:53 -0500
Subject: rpms/libEMF/devel libEMF-amd64.patch, NONE, 1.1 libEMF.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611210653.kAL6rrVJ007914@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libEMF/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7892

Modified Files:
	.cvsignore sources 
Added Files:
	libEMF-amd64.patch libEMF.spec 
Log Message:
initial import into devel branch


libEMF-amd64.patch:

--- NEW FILE libEMF-amd64.patch ---
--- libEMF-1.0.3/libemf/libemf.h.amd64	2004-11-11 23:33:43.000000000 +0100
+++ libEMF-1.0.3/libemf/libemf.h	2006-11-19 00:54:37.000000000 +0100
@@ -306,6 +306,7 @@
 	fread( &word, sizeof(INT16), 1, fp_ );
       return *this;
     }
+#if !(defined(_LP64) || defined(__alpha__))
     /*!
      * Output a double word (long) to the stream (swabbed).
      * \param word word (long) to output.
@@ -374,6 +375,7 @@
 	fread( &long_, sizeof(LONG), 1, fp_ );
       return *this;
     }
+#endif
     /*!
      * Output a (long) int to the stream (swabbed).
      * \param int_ (long) int to output.
--- libEMF-1.0.3/include/libEMF/wine/winbase.h.amd64	2004-07-29 08:20:38.000000000 +0200
+++ libEMF-1.0.3/include/libEMF/wine/winbase.h	2006-11-19 00:55:17.000000000 +0100
@@ -1802,6 +1802,7 @@
 VOID        WINAPI SetLastError(DWORD);
 #endif  /* __i386__ && __GNUC__ */
 
+#if 0
 /* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */
 static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare )
 {
@@ -1812,6 +1813,7 @@
 {
     return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
 }
+#endif
 
 #ifdef __WINE__
 #define GetCurrentProcess() ((HANDLE)0xffffffff)
--- libEMF-1.0.3/include/libEMF/wine/winnt.h.amd64	2005-08-07 17:50:12.000000000 +0200
+++ libEMF-1.0.3/include/libEMF/wine/winnt.h	2006-11-19 00:54:37.000000000 +0100
@@ -29,10 +29,14 @@
 
 /* Architecture dependent settings. */
 /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
 # undef  WORDS_BIGENDIAN
 # undef  BITFIELDS_BIGENDIAN
 # define ALLOW_UNALIGNED_ACCESS
+#elif defined(__alpha__)
+# undef  WORDS_BIGENDIAN
+# undef  BITFIELDS_BIGENDIAN
+# undef  ALLOW_UNALIGNED_ACCESS
 #elif defined(__sparc__)
 # define WORDS_BIGENDIAN
 # define BITFIELDS_BIGENDIAN
@@ -222,8 +226,13 @@
 typedef unsigned short  WORD,       *PWORD,    *LPWORD;
 typedef int             INT,        *PINT,     *LPINT;
 typedef unsigned int    UINT,       *PUINT,    *LPUINT;
+#if defined(_LP64) || defined(__alpha__)
+typedef unsigned int    DWORD,      *PDWORD,   *LPDWORD;
+typedef unsigned int    ULONG,      *PULONG,   *LPULONG;
+#else
 typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
 typedef unsigned long   ULONG,      *PULONG,   *LPULONG;
+#endif
 typedef float           FLOAT,      *PFLOAT,   *LPFLOAT;
 typedef double          DOUBLE,     *PDOUBLE,  *LPDOUBLE;
 typedef double          DATE;
@@ -263,7 +272,11 @@
 typedef BYTE            BOOLEAN,    *PBOOLEAN;
 typedef char            CHAR,       *PCHAR;
 typedef short           SHORT,      *PSHORT;
+#if defined(_LP64) || defined(__alpha__)
+typedef int             LONG,       *PLONG,    *LPLONG;
+#else
 typedef long            LONG,       *PLONG,    *LPLONG;
+#endif
 
 /* Some systems might have wchar_t, but we really need 16 bit characters */
 #ifndef WINE_WCHAR_DEFINED
@@ -652,6 +665,11 @@
 
 #endif  /* __i386__ */
 
+#ifdef __x86_64__
+#define CONTEXT_FULL		1
+typedef struct _CONTEXT CONTEXT;
+#endif
+
 /* Alpha context definitions */
 #ifdef _ALPHA_
 


--- NEW FILE libEMF.spec ---
Summary:	A library for generating Enhanced Metafiles
Summary(pl):	Biblioteka do generowania plik??w w formacie Enhanced Metafile
Name:		libEMF
Version:	1.0.3
Release:	3%{?dist}
License:	LGPL/GPL
Group:		System Environment/Libraries
Source0:	http://dl.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
# Source0-md5:	a4e91fd8077ce5f540f569e20e8ef7ff
Patch0:		%{name}-amd64.patch
URL:		http://libemf.sourceforge.net/
BuildRequires:	libstdc++-devel
BuildRequires:	libtool
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)

%description
libEMF is a library for generating Enhanced Metafiles on systems which
don't natively support the ECMA-234 Graphics Device Interface
(GDI). The library is intended to be used as a driver for other
graphics programs such as Grace or gnuplot. Therefore, it implements a
very limited subset of the GDI.

%description -l pl
libEMF to biblioteka do generowania plik??w w formacie Enhanced
Metafile na systemach nie obs??uguj??cych natywnie systemu graficznego
ECMA-234 GDI. Biblioteka ma s??u??y?? jako sterownik dla innych program??w
graficznych, takich jak Grace czy gnuplot. Z tego powodu ma
zaimplementowany bardzo ograniczony podzbi??r GDI.

%package devel
Summary:	libEMF header files
Summary(pl):	Pliki nag????wkowe libEMF
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	libstdc++-devel

%description devel
libEMF header files.

%description devel -l pl
Pliki nag????wkowe libEMF.

%prep
%setup -q
%patch0 -p1 -b .amd64
chmod 0644 libemf/libemf.h

%build
# supplied libtool is broken (no C++ libraries support)
%{__libtoolize} --force
%{__aclocal}
%{__autoconf}
%{__automake}
%configure \
	--disable-static \
	--enable-editing

%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

export CPPROG="cp -p"
%{__make} install \
	DESTDIR=$RPM_BUILD_ROOT

rm $RPM_BUILD_ROOT%{_libdir}/libEMF.la

%check
%{__make} check

%clean
rm -rf $RPM_BUILD_ROOT

%post	-p /sbin/ldconfig
%postun	-p /sbin/ldconfig

%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_libdir}/lib*.so.*

%files devel
%defattr(644,root,root,755)
%doc doc/html
%attr(755,root,root) %{_libdir}/lib*.so
%{_includedir}/libEMF

%changelog
* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.0.3-3
- remove executable bit from libemf.h

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.0.3-2
- added license texts
- preserved timestamps during install
- added %%check section

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.0.3-1
- adapted PLD spec
- enhanced amd64 patch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libEMF/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 06:04:56 -0000	1.1
+++ .cvsignore	21 Nov 2006 06:53:23 -0000	1.2
@@ -0,0 +1 @@
+libEMF-1.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libEMF/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 06:04:56 -0000	1.1
+++ sources	21 Nov 2006 06:53:23 -0000	1.2
@@ -0,0 +1 @@
+a4e91fd8077ce5f540f569e20e8ef7ff  libEMF-1.0.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 07:40:38 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 02:40:38 -0500
Subject: rpms/gparted/devel gparted.spec,1.14,1.15
Message-ID: <200611210740.kAL7ecBT008348@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8307

Modified Files:
	gparted.spec 
Log Message:
* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
- Rebuild for new parted



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gparted.spec	13 Sep 2006 22:36:12 -0000	1.14
+++ gparted.spec	21 Nov 2006 07:40:08 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
+- Rebuild for new parted
+
 * Wed Sep 13 2006 Deji Akingunola  - 0.3.1-1
 - New version 0.3.1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 07:41:19 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:41:19 -0500
Subject: rpms/mirage - New directory
Message-ID: <200611210741.kAL7fJJL008439@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8435/mirage

Log Message:
Directory /cvs/extras/rpms/mirage added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 07:41:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:41:25 -0500
Subject: rpms/mirage/devel - New directory
Message-ID: <200611210741.kAL7fPAK008452@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8435/mirage/devel

Log Message:
Directory /cvs/extras/rpms/mirage/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 07:41:45 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:41:45 -0500
Subject: rpms/mirage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611210741.kAL7fjWV008519@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8498/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mirage


--- 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 Nov 21 07:41:39 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:41:39 -0500
Subject: rpms/mirage Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611210741.kAL7fdSO008504@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8498

Added Files:
	Makefile import.log 
Log Message:
Setup of module mirage


--- NEW FILE Makefile ---
# Top level Makefile for module mirage
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  Tue Nov 21 07:42:00 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:42:00 -0500
Subject: rpms/jd/devel .cvsignore, 1.18, 1.19 jd.spec, 1.25, 1.26 sources,
	1.18, 1.19
Message-ID: <200611210742.kAL7g0N4008550@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8462

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061120
- cvs 061120 (23:50 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	16 Nov 2006 17:17:39 -0000	1.18
+++ .cvsignore	21 Nov 2006 07:41:29 -0000	1.19
@@ -1 +1 @@
-jd-1.8.1-cvs061116.tgz
+jd-1.8.1-cvs061120.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jd.spec	16 Nov 2006 17:17:39 -0000	1.25
+++ jd.spec	21 Nov 2006 07:41:29 -0000	1.26
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061116
+%define         strtag        cvs061120
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Nov 16 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061116
-- cvs 061116 (23:59 JST)
+* Mon Nov 20 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061120
+- cvs 061120 (23:50 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	16 Nov 2006 17:17:39 -0000	1.18
+++ sources	21 Nov 2006 07:41:29 -0000	1.19
@@ -1 +1 @@
-5861afcc6d6894864510a8768ce3e4fd  jd-1.8.1-cvs061116.tgz
+fe1f6b3350d0f59dc0e8c832caed26d8  jd-1.8.1-cvs061120.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 07:42:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:42:41 -0500
Subject: rpms/mirage import.log,1.1,1.2
Message-ID: <200611210742.kAL7gfPu008647@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8599

Modified Files:
	import.log 
Log Message:
auto-import mirage-0.8.1-1 on branch devel from mirage-0.8.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mirage/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 07:41:39 -0000	1.1
+++ import.log	21 Nov 2006 07:42:11 -0000	1.2
@@ -0,0 +1 @@
+mirage-0_8_1-1:HEAD:mirage-0.8.1-1.src.rpm:1164094931



From fedora-extras-commits at redhat.com  Tue Nov 21 07:42:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:42:41 -0500
Subject: rpms/mirage/devel mirage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611210742.kAL7gfjK008651@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/mirage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8599/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mirage.spec 
Log Message:
auto-import mirage-0.8.1-1 on branch devel from mirage-0.8.1-1.src.rpm


--- NEW FILE mirage.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		mirage
Version:	0.8.1
Release:	1%{?dist}
Summary:	A fast and simple image viewer

Group:		Amusements/Graphics
License:	GPL
URL:		http://mirageiv.berlios.de/
Source0:	http://download.berlios.de/mirageiv/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python-devel
BuildRequires:	desktop-file-utils
Requires:	pygtk2
Requires:	gnome-python2-gconf

%description
Mirage is a fast and simple GTK+ image viewer. Because it 
depends only on PyGTK, Mirage is ideal for users who wish to 
keep their computers lean while still having a clean image viewer.

%prep
%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
%{__python} setup.py build

%install
%{__rm} -rf $RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

# fix permission
%{__chmod} 0755 $RPM_BUILD_ROOT%{python_sitearch}/*.py

# remove document files
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/[A-Z]*

# install desktop file
desktop-file-install \
	--delete-original \
	--remove-category 'Application' \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--vendor fedora \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

# gettext files
%{find_lang} %{name}

%post
%{_bindir}/update-desktop-database &> /dev/null || :

%postun
%{_bindir}/update-desktop-database &> /dev/null || :

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README TODO TRANSLATORS

%{_bindir}/%{name}
%{python_sitearch}/%{name}.py*
%{python_sitearch}/*.so

%{_datadir}/%{name}/
%{_datadir}/pixmaps/*.png

%{_datadir}/applications/*%{name}.desktop

%changelog
* Sat Nov 18 2006 Mamoru Tasaka  - 0.8.1-1
- Initial packaging to import to Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mirage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 07:41:45 -0000	1.1
+++ .cvsignore	21 Nov 2006 07:42:11 -0000	1.2
@@ -0,0 +1 @@
+mirage-0.8.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mirage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 07:41:45 -0000	1.1
+++ sources	21 Nov 2006 07:42:11 -0000	1.2
@@ -0,0 +1 @@
+c87da5b76f856fd7a759a355259b76ed  mirage-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 07:43:43 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 02:43:43 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.7, 1.8 ochusha.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200611210743.kAL7hhGd008783@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8703

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka  0.5.99.63.5-0.1.cvs061120
- 0.5.99.63.5 cvs 061120 (20:00 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Nov 2006 17:30:59 -0000	1.7
+++ .cvsignore	21 Nov 2006 07:43:13 -0000	1.8
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061116.tar.bz2
+ochusha-0.5.99.63.5-cvs061120.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ochusha.spec	16 Nov 2006 17:30:59 -0000	1.7
+++ ochusha.spec	21 Nov 2006 07:43:13 -0000	1.8
@@ -1,10 +1,10 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.3
-%define              strtag          cvs061116
+%define              main_ver        0.5.99.63.5
+%define              strtag          cvs061120
 
-%define              vendor_rel      2
+%define              vendor_rel      1
 %define              pre_release     1
 
 %if %{pre_release}
@@ -53,8 +53,7 @@
 %setup -q
 %endif
 
-# change desktop entry to use png file in 
-# %{icondir}
+# change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
 %build
@@ -75,15 +74,20 @@
 %find_lang %{name}
 %find_lang %{name}-properties
 
-%{__cat} *.lang > all.lang
+%{__cat} %{name}.lang %{name}-properties.lang > all.lang
 
-# License
+# Licenses.
 if test -f "oniguruma/COPYING"; then
   %{__mv} oniguruma/COPYING oniguruma/COPYING.oniguruma
 fi
+if test -f "libochushagtk_lgpl/COPYING"; then
+  %{__mv} libochushagtk_lgpl/COPYING libochushagtk_lgpl/COPYING.libochushagtk_lgpl
+fi
 
 # remove unneeded files
-%{__rm} -f %{buildroot}%{_libdir}/lib*.{a,la,so}
+%{__rm} -f %{buildroot}/%{_libdir}/*.a
+%{__rm} -f %{buildroot}/%{_libdir}/*.la
+%{__rm} -f %{buildroot}/%{_libdir}/*.so
 %if %{with_system_ca_cert_file}
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ca-bundle.crt
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ochusha-gtkrc*
@@ -98,10 +102,10 @@
       --dir %{buildroot}%{_datadir}/applications \
       %{buildroot}%{_datadir}/ochusha/%{name}.desktop
 
-# link Icon png to icondir
+# link icon to icondir according to Icon Theme Specification.
 %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-ln -sf ../../../../ochusha/ochusha48.png \
-   %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+%{__ln_s} -f ../../../../ochusha/ochusha48.png \
+	%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 # change documents' encoding to UTF-8.
 change_encoding(){
@@ -133,30 +137,36 @@
 
 %files -f all.lang
 %defattr(-,root,root)
-# BUGS is empty for now, however I include it for now.
 %doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 %doc ochusha/ochusha-gtkrc.*
 %doc oniguruma/COPYING.oniguruma
+%doc libochushagtk_lgpl/COPYING.libochushagtk_lgpl
 
 %{_bindir}/ochusha
+%{_datadir}/%{name}/*
+%{_datadir}/applications/fedora-%{name}.desktop
+%dir %{_datadir}/%{name}
 %{_libdir}/lib*
+%{_mandir}/man1/%{name}.1*
 
-%{_datadir}/applications/fedora-*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
-
-%{_mandir}/man1/%{name}.1*
-
 %changelog
-* Thu Nov 16 2006 Mamoru Tasaka  0.5.99.63.3-0.2.cvs061116
-- Update to 0.5.99.63.3 cvs 061116
+* Mon Nov 20 2006 Mamoru Tasaka  0.5.99.63.5-0.1.cvs061120
+- 0.5.99.63.5 cvs 061120 (20:00 JST)
+
+* Sat Nov 18 2006 
+- COPYING files of oniguruma and libochushagtk_lgpl will be installed
+  as COPYING.oniguruma and COPYING.libochushagtk_lgpl.
 
 * Fri Nov 03 2006  0.5.99.62-1
 - Version down.
 - Specify the CA certificate file bundled within openssl package.
 
+* Mon Sep 19 2006  0.6-1
+- Version up.
+- Change request fields for gtk+-2.6 and libxml2-2.6.
+
 * Sat Aug 26 2006 Mamoru Tasaka  0.5.8.2-3
 - Install (link) icon to the usual directory and use 
   cache updating method.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Nov 2006 17:30:59 -0000	1.7
+++ sources	21 Nov 2006 07:43:13 -0000	1.8
@@ -1 +1 @@
-a4f068bb0c128688a050bda77c1a31cb  ochusha-0.5.99.63.3-cvs061116.tar.bz2
+d3ce8f7cfe119ab7490cb4043d8357bb  ochusha-0.5.99.63.5-cvs061120.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 07:44:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 02:44:29 -0500
Subject: rpms/tracker import.log,1.2,1.3
Message-ID: <200611210744.kAL7iTgs008896@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8820

Modified Files:
	import.log 
Log Message:
auto-import tracker-0.5.2-1 on branch devel from tracker-0.5.2-1.src.rpm
Update to 0.5.2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tracker/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	9 Nov 2006 16:08:20 -0000	1.2
+++ import.log	21 Nov 2006 07:43:59 -0000	1.3
@@ -1 +1,2 @@
 tracker-0_5_1-1:HEAD:tracker-0.5.1-1.src.rpm:1163088496
+tracker-0_5_2-1:HEAD:tracker-0.5.2-1.src.rpm:1164095041



From fedora-extras-commits at redhat.com  Tue Nov 21 07:44:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 02:44:29 -0500
Subject: rpms/tracker/devel tracker-desktop.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 tracker.spec, 1.2, 1.3 trackerd.desktop,
	1.1, NONE
Message-ID: <200611210744.kAL7iTIh008901@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8820/devel

Modified Files:
	.cvsignore sources tracker.spec 
Added Files:
	tracker-desktop.patch 
Removed Files:
	trackerd.desktop 
Log Message:
auto-import tracker-0.5.2-1 on branch devel from tracker-0.5.2-1.src.rpm
Update to 0.5.2

tracker-desktop.patch:

--- NEW FILE tracker-desktop.patch ---
--- Makefile.in	2006-11-20 13:34:48.000000000 -0500
+++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
@@ -66,8 +66,9 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+xdgconfigDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgconfig_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -299,7 +300,9 @@
 target_alias = @target_alias@
 SUBDIRS = data src filters thumbnailers docs po
 pkgconfigdir = $(libdir)/pkgconfig
+xdgconfigdir = $(sysconfdir)/xdg/autostart
 pkgconfig_DATA = tracker.pc
+xdgconfig_DATA= trackerd.desktop
 debian_files = \
 	debian/changelog \
 	debian/compat \
@@ -331,12 +334,11 @@
 
 EXTRA_DIST = \
 	$(pkgconfig_DATA) \
+	$(xdgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	configure.in \
 	rdf-query-examples/*.rdf \
-	trackerd.desktop \
-	trackerd-kde.desktop \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
@@ -422,6 +424,15 @@
 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
+install-xdgconfigDATA: $(xdgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
@@ -430,6 +441,13 @@
 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
+uninstall-xdgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -710,7 +728,7 @@
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -758,7 +776,7 @@
 
 info-am:
 
-install-data-am: install-pkgconfigDATA
+install-data-am: install-pkgconfigDATA install-xdgconfigDATA
 
 install-exec-am:
 
--- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
+++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
@@ -8,5 +8,8 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true
--- src/tracker-search-tool/tracker-search-tool.desktop.in	2006-11-20 08:11:41.000000000 -0500
+++ src/tracker-search-tool/tracker-search-tool.desktop.in.new	2006-11-20 20:24:40.000000000 -0500
@@ -6,6 +6,6 @@
 Icon=gnome-searchtool
 Terminal=false
 Type=Application
-Categories=GTK;Application;Utility;
+Categories=GTK;Utility;
 StartupNotify=true
-NoDisplay=true 
+NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 16:08:21 -0000	1.2
+++ .cvsignore	21 Nov 2006 07:43:59 -0000	1.3
@@ -1 +1 @@
-tracker-0.5.1.tar.gz
+tracker-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 16:08:21 -0000	1.2
+++ sources	21 Nov 2006 07:43:59 -0000	1.3
@@ -1 +1 @@
-133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz
+1bccb8522668a791366aeb25d43b5da7  tracker-0.5.2.tar.gz


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tracker.spec	9 Nov 2006 16:24:03 -0000	1.2
+++ tracker.spec	21 Nov 2006 07:43:59 -0000	1.3
@@ -1,16 +1,17 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
 Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
-Source1: trackerd.desktop
+Patch0: tracker-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmime-devel, poppler-devel, gettext
 BuildRequires: gnome-desktop-devel, gamin-devel
 BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
+BuildRequires: desktop-file-utils, intltool
 %if "%fedora" >= "6"
 BuildRequires: sqlite-devel
 %else
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .desktop
 
 %build
 %if "%fedora" >= "6"
@@ -59,12 +61,19 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-# Add an autostart for trackerd
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/
+# Add an autostart for trackerd (for KDE)
+mkdir -p %{buildroot}%{_datadir}/autostart
+cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
+
+desktop-file-install --delete-original                   \
+        --vendor="fedora"                           \
+        --dir=%{buildroot}%{_datadir}/applications   \
+        %{buildroot}%{_datadir}/applications/%{name}-search-tool.desktop
 
 rm -rf %{buildroot}%{_libdir}/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -72,7 +81,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
@@ -80,7 +89,9 @@
 %{_bindir}/tracker*
 %{_datadir}/tracker/
 %{_datadir}/pixmaps/tracker/
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/autostart/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/tracker*.1.gz
 %{_sysconfdir}/xdg/autostart/trackerd.desktop
@@ -92,6 +103,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
+- Update to 0.5.2
+
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1
 - Update to new version
 


--- trackerd.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 07:54:47 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 21 Nov 2006 02:54:47 -0500
Subject: rpms/buoh/FC-6 .cvsignore, 1.2, 1.3 buoh.spec, 1.17, 1.18 sources,
	1.2, 1.3
Message-ID: <200611210754.kAL7sllP009109@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9090

Modified Files:
	.cvsignore buoh.spec sources 
Log Message:
Upgrading to new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Dec 2005 22:14:29 -0000	1.2
+++ .cvsignore	21 Nov 2006 07:54:16 -0000	1.3
@@ -1 +0,0 @@
-buoh-0.8.1.tar.gz


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/buoh.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- buoh.spec	11 Sep 2006 15:58:30 -0000	1.17
+++ buoh.spec	21 Nov 2006 07:54:16 -0000	1.18
@@ -1,11 +1,11 @@
 Name:             buoh
 License:          GPL
 Group:            Applications/Internet
-Version:          0.8.1
-Release:          13
+Version:          0.8.2
+Release:          1
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
-Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
+Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
 Requires(post):   GConf2
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
+* Tue Nov 21 2006 Chris Chabot  - 0.8.2-1
+- New upstream version
+
 * Mon Sep 11 2006 Chris Chabot  - 0.8.1-13
 - FC6 retag & rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2005 22:14:29 -0000	1.2
+++ sources	21 Nov 2006 07:54:16 -0000	1.3
@@ -1 +0,0 @@
-5d05a51d7c6616d93e93df3465b49fe7  buoh-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 07:56:43 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Tue, 21 Nov 2006 02:56:43 -0500
Subject: rpms/buoh/devel buoh.spec,1.17,1.18
Message-ID: <200611210756.kAL7uhCn009131@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9116

Modified Files:
	buoh.spec 
Log Message:
Upgrading to new upstream version


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- buoh.spec	11 Sep 2006 15:58:30 -0000	1.17
+++ buoh.spec	21 Nov 2006 07:56:13 -0000	1.18
@@ -1,11 +1,11 @@
 Name:             buoh
 License:          GPL
 Group:            Applications/Internet
-Version:          0.8.1
-Release:          13
+Version:          0.8.2
+Release:          1
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
-Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.gz
+Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
 Requires(post):   GConf2
@@ -76,6 +76,9 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
+* Tue Nov 21 2006 Chris Chabot  - 0.8.2-1
+- New upstream version
+
 * Mon Sep 11 2006 Chris Chabot  - 0.8.1-13
 - FC6 retag & rebuild
 



From fedora-extras-commits at redhat.com  Tue Nov 21 08:06:37 2006
From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer))
Date: Tue, 21 Nov 2006 03:06:37 -0500
Subject: rpms/ghdl/devel ghdl-svn89.patch, NONE, 1.1 ghdl.spec, 1.26,
	1.27 ghdl-svn73.patch, 1.1, NONE
Message-ID: <200611210806.kAL86bV3009212@cvs-int.fedora.redhat.com>

Author: sailer

Update of /cvs/extras/rpms/ghdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9194

Modified Files:
	ghdl.spec 
Added Files:
	ghdl-svn89.patch 
Removed Files:
	ghdl-svn73.patch 
Log Message:
update to svn89


ghdl-svn89.patch:

--- NEW FILE ghdl-svn89.patch ---
diff -urN ghdl-0.25/vhdl/back_end.ads ghdl-0.26dev/vhdl/back_end.ads
--- ghdl-0.25/vhdl/back_end.ads	2005-09-22 23:07:25.000000000 +0200
+++ ghdl-0.26dev/vhdl/back_end.ads	2006-11-20 00:36:24.000000000 +0100
@@ -29,6 +29,14 @@
    Library_To_File_Name : Library_To_File_Name_Acc :=
      Default_Library_To_File_Name'Access;
 
+   --  Back-end options.
+   type Parse_Option_Acc is access function (Opt : String) return Boolean;
+   Parse_Option : Parse_Option_Acc := null;
+
+   --  Disp back-end option help.
+   type Disp_Option_Acc is access procedure;
+   Disp_Option : Disp_Option_Acc := null;
+
    --  UNIT is a design unit from parse.
    --  According to the current back-end, do what is necessary.
    --
@@ -46,8 +54,5 @@
    --  May be NULL for no additionnal checks.
    type Sem_Foreign_Acc is access procedure (Decl : Iir);
    Sem_Foreign : Sem_Foreign_Acc := null;
-
-   --procedure Finish_Compilation
-   --  (Unit : Iir_Design_Unit; Main : Boolean := False);
 end Back_End;
 
diff -urN ghdl-0.25/vhdl/bug.adb ghdl-0.26dev/vhdl/bug.adb
--- ghdl-0.25/vhdl/bug.adb	2005-11-18 02:34:12.000000000 +0100
+++ ghdl-0.26dev/vhdl/bug.adb	2006-11-20 00:36:24.000000000 +0100
@@ -70,7 +70,7 @@
       Put_Line
         (Standard_Error,
          "Please report this bug on http://gna.org/projects/ghdl");
-      Put_Line (Standard_Error, "GHDL version: " & Ghdl_Version);
+      Put_Line (Standard_Error, "GHDL release: " & Ghdl_Release);
       Put_Line (Standard_Error, "Compiled with " & Get_Gnat_Version);
       Put_Line (Standard_Error, "In directory: " &
                 GNAT.Directory_Operations.Get_Current_Dir);
diff -urN ghdl-0.25/vhdl/canon.adb ghdl-0.26dev/vhdl/canon.adb
--- ghdl-0.25/vhdl/canon.adb	2006-07-29 06:42:30.000000000 +0200
+++ ghdl-0.26dev/vhdl/canon.adb	2006-11-20 00:36:24.000000000 +0100
@@ -847,22 +847,6 @@
       end loop;
    end Canon_Sequential_Stmts;
 
-   procedure Add_Driver_For_Signal (Driver_List : Iir_List;
-                                    Signal : Iir)
-   is
-      Choice : Iir;
-   begin
-      if Get_Kind (Signal) = Iir_Kind_Aggregate then
-         Choice := Get_Association_Choices_Chain (Signal);
-         while Choice /= Null_Iir loop
-            Add_Driver_For_Signal (Driver_List, Get_Associated (Choice));
-            Choice := Get_Chain (Choice);
-         end loop;
-      else
-         Add_Element (Driver_List, Get_Longuest_Static_Prefix (Signal));
-      end if;
-   end Add_Driver_For_Signal;
-
    -- Create a statement transform from concurrent_signal_assignment
    -- statement STMT (either selected or conditional).
    -- waveform transformation is not done.
@@ -895,9 +879,6 @@
       --      reserved word POSTPONED.
       Set_Postponed_Flag (Proc, Get_Postponed_Flag (Proc));
 
-      Set_Driver_List (Proc, Create_Iir_List);
-      Add_Driver_For_Signal (Get_Driver_List (Proc), Get_Target (Stmt));
-
       Canon_Extract_Sensitivity (Get_Target (Stmt), Sensitivity_List, True);
 
       if Canon_Flag_Expressions then
@@ -966,7 +947,6 @@
       Assoc_Chain : Iir;
       Assoc : Iir;
       Imp : Iir;
-      Driver_List : Iir_Driver_List;
       Inter : Iir;
       Sensitivity_List : Iir_List;
       Is_Sensitized : Boolean;
@@ -1014,7 +994,6 @@
          Get_Parameter_Association_Chain (Call),
          Call);
       Set_Parameter_Association_Chain (Call, Assoc_Chain);
-      Driver_List := Null_Iir_List;
       Assoc := Assoc_Chain;
 
       --  LRM93 9.3
@@ -1034,18 +1013,6 @@
                   Canon_Extract_Sensitivity
                     (Get_Actual (Assoc), Sensitivity_List, False);
                end if;
-               --  LRM 2.1.1.2 Signal Parameters
-               if Get_Kind (Inter) = Iir_Kind_Signal_Interface_Declaration
-                 and then Get_Mode (Inter) in Iir_Out_Modes
-               then
-                  if Driver_List = Null_Iir_List then
-                     Driver_List := Create_Iir_List;
-                     Set_Driver_List (Proc, Driver_List);
-                  end if;
-                  Add_Element
-                    (Driver_List,
-                     Get_Longuest_Static_Prefix (Get_Actual (Assoc)));
-               end if;
             when Iir_Kind_Association_Element_Open
               | Iir_Kind_Association_Element_By_Individual =>
                null;
diff -urN ghdl-0.25/vhdl/disp_tree.adb ghdl-0.26dev/vhdl/disp_tree.adb
--- ghdl-0.25/vhdl/disp_tree.adb	2005-10-26 14:31:21.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_tree.adb	2006-11-20 00:36:24.000000000 +0100
@@ -1023,8 +1023,6 @@
             Disp_Depth (Get_Subprogram_Depth (Tree));
             Header ("subprogram_body:");
             Disp_Tree_Flat (Get_Subprogram_Body (Tree), Ntab);
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("attribute_value_chain:");
             Disp_Tree_Flat_Chain (Get_Attribute_Value_Chain (Tree), Ntab);
          when Iir_Kind_Procedure_Body
@@ -1423,8 +1421,6 @@
                Header ("sensivity list:");
                Disp_Tree_List (Get_Sensitivity_List (Tree), Ntab, True);
             end if;
-            Header ("driver list:");
-            Disp_Tree_List (Get_Driver_List (Tree), Ntab, True);
             Header ("declaration_chain:");
             Disp_Tree_Chain (Get_Declaration_Chain (Tree), Ntab);
             Header ("process statements:");
diff -urN ghdl-0.25/vhdl/disp_vhdl.adb ghdl-0.26dev/vhdl/disp_vhdl.adb
--- ghdl-0.25/vhdl/disp_vhdl.adb	2006-07-09 03:55:28.000000000 +0200
+++ ghdl-0.26dev/vhdl/disp_vhdl.adb	2006-11-20 00:36:24.000000000 +0100
@@ -893,25 +893,6 @@
       Put_Line (";");
    end Disp_Object_Declaration;
 
-   procedure Disp_Driver_List (List: Iir_Driver_List; Indent : Count)
-   is
-      El: Iir;
-   begin
-      if List = Null_Iir_List or else Get_Nbr_Elements (List) = 0 then
-         return;
-      end if;
-      Set_Col (Indent);
-      Put_Line ("-- drivers needed for signals:");
-      for I in Natural loop
-         El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
-         Set_Col (Indent);
-         Put ("--   ");
-         Disp_Expression (El);
-         New_Line;
-      end loop;
-   end Disp_Driver_List;
-
    procedure Disp_Subprogram_Declaration (Subprg: Iir)
    is
       Indent: Count;
@@ -943,10 +924,6 @@
          when others =>
             raise Internal_Error;
       end case;
-
-      if Get_Kind (Subprg) = Iir_Kind_Procedure_Declaration then
-         Disp_Driver_List (Get_Driver_List (Subprg), Indent);
-      end if;
    end Disp_Subprogram_Declaration;
 
    procedure Disp_Subprogram_Body (Subprg : Iir)
@@ -1517,7 +1494,6 @@
       else
          New_Line;
       end if;
-      Disp_Driver_List (Get_Driver_List (Process), Start + Indentation);
       Disp_Declaration_Chain (Process, Start + Indentation);
       Set_Col (Start);
       Put_Line ("begin");
@@ -2312,10 +2288,10 @@
             Disp_Concurrent_Conditional_Signal_Assignment (An_Iir);
          when Iir_Kinds_Dyadic_Operator =>
             Disp_Dyadic_Operator (An_Iir);
-         when Iir_Kind_Signal_Interface_Declaration =>
+         when Iir_Kind_Signal_Interface_Declaration
+           | Iir_Kind_Signal_Declaration
+           | Iir_Kind_Object_Alias_Declaration =>
             Disp_Name_Of (An_Iir);
-         when Iir_Kind_Signal_Declaration =>
-            Disp_Identifier (An_Iir);
          when Iir_Kind_Enumeration_Literal =>
             Disp_Identifier (An_Iir);
          when Iir_Kind_Component_Instantiation_Statement =>
@@ -2330,8 +2306,11 @@
             Disp_Package_Declaration (An_Iir);
          when Iir_Kind_Wait_Statement =>
             Disp_Wait_Statement (An_Iir);
-         when Iir_Kind_Selected_Name =>
-            Disp_Name (An_Iir);
[...4509 lines suppressed...]
+         end if;
+         return Create_Var_Identifier_From_Buffer (L);
       end Create_Var_Identifier;
 
       function Create_Uniq_Identifier return Var_Ident_Type
@@ -22728,19 +23323,6 @@
          end case;
       end Translate_Succ_Pred_Attribute;
 
-      --  Read the boolean attribute (active or event) FIELD of simple signal
-      --  SIG.
-      function Read_Bool_Signal_Attribute (Sig : O_Enode; Field : O_Fnode)
-                                          return O_Enode
-      is
-         S : O_Enode;
-      begin
-         S := New_Convert_Ov (Sig, Ghdl_Signal_Ptr);
-         return New_Value
-           (New_Selected_Element (New_Access_Element (S), Field));
-         --Ghdl_Signal_Event_Node));
-      end Read_Bool_Signal_Attribute;
-
       type Bool_Sigattr_Data_Type is record
          Label : O_Snode;
          Field : O_Fnode;
@@ -22752,8 +23334,7 @@
          pragma Unreferenced (Targ_Type);
       begin
          Gen_Exit_When (Data.Label,
-                        Read_Bool_Signal_Attribute (New_Value (M2Lv (Targ)),
-                                                    Data.Field));
+                        New_Value (Get_Signal_Field (Targ, Data.Field)));
       end Bool_Sigattr_Non_Composite_Signal;
 
       function Bool_Sigattr_Prepare_Data_Composite
@@ -22819,7 +23400,7 @@
          if Get_Kind (Prefix_Type) in Iir_Kinds_Scalar_Type_Definition then
             --  Effecient handling for a scalar signal.
             Name := Chap6.Translate_Name (Prefix);
-            return Read_Bool_Signal_Attribute (New_Value (M2Lv (Name)), Field);
+            return New_Value (Get_Signal_Field (Name, Field));
          else
             --  Element per element handling for composite signals.
             Res := Create_Temp (Std_Boolean_Type_Node);
@@ -22839,13 +23420,14 @@
 
       function Translate_Event_Attribute (Attr : Iir) return O_Enode is
       begin
-         return Translate_Bool_Signal_Attribute (Attr, Ghdl_Signal_Event_Node);
+         return Translate_Bool_Signal_Attribute
+           (Attr, Ghdl_Signal_Event_Field);
       end Translate_Event_Attribute;
 
       function Translate_Active_Attribute (Attr : Iir) return O_Enode is
       begin
          return Translate_Bool_Signal_Attribute
-           (Attr, Ghdl_Signal_Active_Node);
+           (Attr, Ghdl_Signal_Active_Field);
       end Translate_Active_Attribute;
 
       --  Read signal value FIELD of signal SIG.
@@ -22862,11 +23444,20 @@
            (New_Unchecked_Address (New_Selected_Element (T, Field), S_Type));
       end Get_Signal_Value_Field;
 
+      function Get_Signal_Field (Sig : Mnode; Field : O_Fnode)
+                                return O_Lnode
+      is
+         S : O_Enode;
+      begin
+         S := New_Convert_Ov (New_Value (M2Lv (Sig)), Ghdl_Signal_Ptr);
+         return New_Selected_Element (New_Access_Element (S), Field);
+      end Get_Signal_Field;
+
       function Read_Last_Value (Sig : O_Enode; Sig_Type : Iir) return O_Enode
       is
       begin
          return New_Value (Get_Signal_Value_Field
-                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Node));
+                           (Sig, Sig_Type, Ghdl_Signal_Last_Value_Field));
       end Read_Last_Value;
 
       function Translate_Last_Value is new Chap7.Translate_Signal_Value
@@ -27031,39 +27622,53 @@
         (Chararray_Type, New_Unsigned_Literal (Ghdl_Index_Type, 8));
       New_Type_Decl (Get_Identifier ("__ghdl_scalar_bytes"),
                      Ghdl_Scalar_Bytes);
+
+      Ghdl_Signal_Ptr := New_Access_Type (O_Tnode_Null);
+      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+
       --  Type __signal_signal is record
       Start_Record_Type (Rec);
-      New_Record_Field (Rec, Ghdl_Signal_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Value_Field,
                         Get_Identifier ("value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Driving_Value_Field,
                         Get_Identifier ("driving_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Value_Field,
                         Get_Identifier ("last_value"),
                         Ghdl_Scalar_Bytes);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Event_Field,
                         Get_Identifier ("last_event"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Last_Active_Field,
                         Get_Identifier ("last_active"),
                         Time_Otype);
-      New_Record_Field (Rec, Ghdl_Signal_Event_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Chain_Field,
+                        Get_Identifier ("active_chain"),
+                        Ghdl_Signal_Ptr);
+      New_Record_Field (Rec, Ghdl_Signal_Event_Field,
                         Get_Identifier ("event"),
                         Std_Boolean_Type_Node);
-      New_Record_Field (Rec, Ghdl_Signal_Active_Node,
+      New_Record_Field (Rec, Ghdl_Signal_Active_Field,
                         Get_Identifier ("active"),
                         Std_Boolean_Type_Node);
+      New_Record_Field (Rec, Ghdl_Signal_Has_Active_Field,
+                        Get_Identifier ("has_active"),
+                        Ghdl_Bool_Type);
       Finish_Record_Type (Rec, Ghdl_Signal_Type);
       New_Type_Decl (Get_Identifier ("__ghdl_signal"), Ghdl_Signal_Type);
 
-      Ghdl_Signal_Ptr := New_Access_Type (Ghdl_Signal_Type);
-      New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr"), Ghdl_Signal_Ptr);
+      Finish_Access_Type (Ghdl_Signal_Ptr, Ghdl_Signal_Type);
 
       Ghdl_Signal_Ptr_Ptr := New_Access_Type (Ghdl_Signal_Ptr);
       New_Type_Decl (Get_Identifier ("__ghdl_signal_ptr_ptr"),
                      Ghdl_Signal_Ptr_Ptr);
 
+      New_Var_Decl (Ghdl_Signal_Active_Chain,
+                    Get_Identifier ("__ghdl_signal_active_chain"),
+                    O_Storage_External,
+                    Ghdl_Signal_Ptr);
+
       --  procedure __ghdl_signal_merge_rti
       --       (sig : ghdl_signal_ptr; rti : ghdl_rti_access)
       Start_Procedure_Decl
@@ -27305,6 +27910,17 @@
       New_Interface_Decl (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
       Finish_Subprogram_Decl (Interfaces, Ghdl_Process_Add_Driver);
 
+      --  procedure __ghdl_signal_direct_driver (sig : __ghdl_signal_ptr;
+      --                                         Drv : Ghdl_Ptr_type);
+      Start_Procedure_Decl
+        (Interfaces, Get_Identifier ("__ghdl_signal_direct_driver"),
+         O_Storage_External);
+      New_Interface_Decl
+        (Interfaces, Param, Wki_Sig, Ghdl_Signal_Ptr);
+      New_Interface_Decl
+        (Interfaces, Param, Get_Identifier ("drv"), Ghdl_Ptr_Type);
+      Finish_Subprogram_Decl (Interfaces, Ghdl_Signal_Direct_Driver);
+
       declare
          procedure Create_Signal_Conversion (Name : String; Res : out O_Dnode)
          is
diff -urN ghdl-0.25/vhdl/translation.ads ghdl-0.26dev/vhdl/translation.ads
--- ghdl-0.25/vhdl/translation.ads	2006-08-02 06:13:50.000000000 +0200
+++ ghdl-0.26dev/vhdl/translation.ads	2006-11-20 00:36:15.000000000 +0100
@@ -61,6 +61,21 @@
    --  If set, do not generate code for unused implicit subprograms.
    Flag_Discard_Unused_Implicit : Boolean := False;
 
+   --  If set, dump drivers per process during compilation.
+   Flag_Dump_Drivers : Boolean := False;
+
+   --  If set, try to create direct drivers.
+   Flag_Direct_Drivers : Boolean := True;
+
+   --  If set, checks ranges (subtype ranges).
+   Flag_Range_Checks : Boolean := True;
+
+   --  If set, checks indexes (arrays index and slice).
+   Flag_Index_Checks : Boolean := True;
+
+   --  If set, do not create identifiers (for in memory compilation).
+   Flag_Discard_Identifiers : Boolean := False;
+
    type Foreign_Kind_Type is (Foreign_Unknown,
                               Foreign_Vhpidirect,
                               Foreign_Intrinsic);
diff -urN ghdl-0.25/vhdl/version.ads ghdl-0.26dev/vhdl/version.ads
--- ghdl-0.25/vhdl/version.ads	2006-08-11 05:15:55.000000000 +0200
+++ ghdl-0.26dev/vhdl/version.ads	2006-11-20 00:36:24.000000000 +0100
@@ -1,4 +1,5 @@
 package Version is
-   Ghdl_Version : constant String :=
-      "GHDL 0.25 (20060811) [Sokcho edition]";
+   Ghdl_Release : constant String :=
+      "GHDL 0.26dev (20060819) [Sokcho edition]";
+   Ghdl_Ver : constant String := "0.26dev";
 end Version;


Index: ghdl.spec
===================================================================
RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ghdl.spec	5 Oct 2006 23:30:43 -0000	1.26
+++ ghdl.spec	21 Nov 2006 08:06:06 -0000	1.27
@@ -1,6 +1,6 @@
 %define gccver 4.1.1
 %define ghdlver 0.25
-%define ghdlsvnver 73
+%define ghdlsvnver 89
 
 Summary: A VHDL simulator, using the GCC technology
 Name: ghdl
@@ -288,6 +288,9 @@
 
 
 %changelog
+* Mon Nov 20 2006 Thomas Sailer  - 0.25-0.89svn.0
+- update to svn89
+
 * Fri Oct  6 2006 Thomas Sailer  - 0.25-0.73svn.0
 - update to svn73
 


--- ghdl-svn73.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 08:26:56 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 21 Nov 2006 03:26:56 -0500
Subject: rpms/sylpheed/FC-6 .cvsignore, 1.22, 1.23 sources, 1.22,
	1.23 sylpheed.spec, 1.41, 1.42
Message-ID: <200611210826.kAL8QuVX009293@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9272

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
upstream bug-fix release // use .1 release since tag is used on devel branch because of a non-updated "common" dir ;)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-6/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Sep 2006 08:28:36 -0000	1.22
+++ .cvsignore	21 Nov 2006 08:26:26 -0000	1.23
@@ -1,2 +1,2 @@
-sylpheed-2.2.9.tar.bz2.asc
-sylpheed-2.2.9.tar.bz2
+sylpheed-2.2.10.tar.bz2
+sylpheed-2.2.10.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-6/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Sep 2006 08:28:36 -0000	1.22
+++ sources	21 Nov 2006 08:26:26 -0000	1.23
@@ -1,2 +1,2 @@
-987cc37cfa2ad1116c5c60e4f399be30  sylpheed-2.2.9.tar.bz2.asc
-45e9e89775613b0afb732fbc11c73d26  sylpheed-2.2.9.tar.bz2
+68709cd07d2416c7aaeacf2c6921b1a2  sylpheed-2.2.10.tar.bz2
+ddbaab7d093c35592927a0cd426631ad  sylpheed-2.2.10.tar.bz2.asc


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-6/sylpheed.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sylpheed.spec	2 Oct 2006 19:40:12 -0000	1.41
+++ sylpheed.spec	21 Nov 2006 08:26:26 -0000	1.42
@@ -4,8 +4,8 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.2.9
-Release: 2%{?dist}
+Version: 2.2.10
+Release: 1%{?dist}.1
 License: GPL
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -84,6 +84,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 16 2006 Michael Schwendt  - 2.2.10-1
+- Update to 2.2.10 (recommended bug-fixes only).
+
 * Mon Oct 02 2006 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Nov 21 08:27:46 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 03:27:46 -0500
Subject: rpms/tracker import.log,1.3,1.4
Message-ID: <200611210827.kAL8RkOd009404@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9366

Modified Files:
	import.log 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-6 from tracker-0.5.2-1.src.rpm
Update to 0.5.2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tracker/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	21 Nov 2006 07:43:59 -0000	1.3
+++ import.log	21 Nov 2006 08:27:16 -0000	1.4
@@ -1,2 +1,3 @@
 tracker-0_5_1-1:HEAD:tracker-0.5.1-1.src.rpm:1163088496
 tracker-0_5_2-1:HEAD:tracker-0.5.2-1.src.rpm:1164095041
+tracker-0_5_2-1:FC-6:tracker-0.5.2-1.src.rpm:1164097639



From fedora-extras-commits at redhat.com  Tue Nov 21 08:27:46 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 03:27:46 -0500
Subject: rpms/tracker/FC-6 tracker-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 
	1.3 sources, 1.2, 1.3 tracker.spec, 1.2, 1.3 trackerd.desktop,
	1.1, NONE
Message-ID: <200611210827.kAL8RkG3009409@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9366/FC-6

Modified Files:
	.cvsignore sources tracker.spec 
Added Files:
	tracker-desktop.patch 
Removed Files:
	trackerd.desktop 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-6 from tracker-0.5.2-1.src.rpm
Update to 0.5.2

tracker-desktop.patch:

--- NEW FILE tracker-desktop.patch ---
--- Makefile.am	2006-11-20 23:57:45.000000000 -0500
+++ Makefile.am.new	2006-11-20 23:58:00.000000000 -0500
@@ -1,7 +1,9 @@
 SUBDIRS = data src filters thumbnailers docs po
 
 pkgconfigdir = $(libdir)/pkgconfig
+xdgconfigdir = $(sysconfdir)/xdg/autostart
 pkgconfig_DATA = tracker.pc
+xdgconfig_DATA = trackerd.desktop
 
 debian_files = \
 	debian/changelog \
@@ -34,12 +36,11 @@
 
 EXTRA_DIST = \
 	$(pkgconfig_DATA) \
+	$(xdgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	configure.in \
 	rdf-query-examples/*.rdf \
-	trackerd.desktop \
-	trackerd-kde.desktop \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
--- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
+++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
@@ -8,5 +8,8 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true
--- src/tracker-search-tool/tracker-search-tool.desktop.in	2006-11-20 08:11:41.000000000 -0500
+++ src/tracker-search-tool/tracker-search-tool.desktop.in.new	2006-11-20 20:24:40.000000000 -0500
@@ -6,6 +6,6 @@
 Icon=gnome-searchtool
 Terminal=false
 Type=Application
-Categories=GTK;Application;Utility;
+Categories=GTK;Utility;
 StartupNotify=true
-NoDisplay=true 
+NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 16:08:21 -0000	1.2
+++ .cvsignore	21 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-tracker-0.5.1.tar.gz
+tracker-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 16:08:21 -0000	1.2
+++ sources	21 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz
+1bccb8522668a791366aeb25d43b5da7  tracker-0.5.2.tar.gz


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tracker.spec	9 Nov 2006 16:24:03 -0000	1.2
+++ tracker.spec	21 Nov 2006 08:27:16 -0000	1.3
@@ -1,16 +1,17 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
 Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
-Source1: trackerd.desktop
+Patch0: tracker-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmime-devel, poppler-devel, gettext
 BuildRequires: gnome-desktop-devel, gamin-devel
 BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
+BuildRequires: desktop-file-utils, intltool
 %if "%fedora" >= "6"
 BuildRequires: sqlite-devel
 %else
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .desktop
 
 %build
 %if "%fedora" >= "6"
@@ -59,12 +61,19 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-# Add an autostart for trackerd
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/
+# Add an autostart for trackerd (for KDE)
+mkdir -p %{buildroot}%{_datadir}/autostart
+cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
+
+desktop-file-install --delete-original                   \
+        --vendor="fedora"                           \
+        --dir=%{buildroot}%{_datadir}/applications   \
+        %{buildroot}%{_datadir}/applications/%{name}-search-tool.desktop
 
 rm -rf %{buildroot}%{_libdir}/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -72,7 +81,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
@@ -80,7 +89,9 @@
 %{_bindir}/tracker*
 %{_datadir}/tracker/
 %{_datadir}/pixmaps/tracker/
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/autostart/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/tracker*.1.gz
 %{_sysconfdir}/xdg/autostart/trackerd.desktop
@@ -92,6 +103,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
+- Update to 0.5.2
+
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1
 - Update to new version
 


--- trackerd.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 08:33:32 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 21 Nov 2006 03:33:32 -0500
Subject: rpms/libpng10/devel libpng-1.0.21-soname.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libpng10.spec, 1.4, 1.5 sources, 1.2,
	1.3 libpng-1.0.20-soname.patch, 1.1, NONE
Message-ID: <200611210833.kAL8XWg0009547@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libpng10/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9525

Modified Files:
	.cvsignore libpng10.spec sources 
Added Files:
	libpng-1.0.21-soname.patch 
Removed Files:
	libpng-1.0.20-soname.patch 
Log Message:
update to 1.0.21 to address DoS issue (#216263, CVE-2006-5793)
update soname patch


libpng-1.0.21-soname.patch:

--- NEW FILE libpng-1.0.21-soname.patch ---
--- libpng-1.0.21/ltmain.sh	2006-08-01 15:46:17.000000000 +0100
+++ libpng-1.0.21/ltmain.sh	2006-08-01 15:46:52.000000000 +0100
@@ -3270,7 +3270,7 @@
 	esac
 
 	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]|[0-9].[0-9][0-9]) ;;
 	*)
 	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- libpng-1.0.21/Makefile.am	2006-11-15 12:49:56.000000000 +0000
+++ libpng-1.0.21/Makefile.am	2006-11-18 10:50:43.000000000 +0000
@@ -45,7 +45,7 @@
 	-version-number 0:@PNGLIB_MINOR@:0
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_MINOR@:0
+	-version-number 2:1:0. at PNGLIB_MINOR@
 
 if HAVE_LD_VERSION_SCRIPT
   # Versioned symbols and restricted exports
--- libpng-1.0.21/Makefile.in	2006-11-15 12:50:12.000000000 +0000
+++ libpng-1.0.21/Makefile.in	2006-11-18 10:51:25.000000000 +0000
@@ -291,7 +291,7 @@
 	0:@PNGLIB_MINOR@:0 $(am__append_1) $(am__append_2)
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_MINOR@:0
+	-version-number 2:1:0. at PNGLIB_MINOR@
 
 @HAVE_LD_VERSION_SCRIPT_FALSE at libpng10_la_DEPENDENCIES = libpng.sym
 @HAVE_LD_VERSION_SCRIPT_TRUE at libpng10_la_DEPENDENCIES = libpng.vers


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jul 2006 07:21:50 -0000	1.2
+++ .cvsignore	21 Nov 2006 08:33:02 -0000	1.3
@@ -1 +1 @@
-libpng-1.0.20.tar.bz2
+libpng-1.0.21.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpng10.spec	1 Oct 2006 13:54:52 -0000	1.4
+++ libpng10.spec	21 Nov 2006 08:33:02 -0000	1.5
@@ -1,12 +1,12 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.20
-Release:	4%{?dist}
+Version:	1.0.21
+Release:	1%{?dist}
 License:	zlib License
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
-Patch0:		libpng-1.0.20-soname.patch
+Patch0:		libpng-1.0.21-soname.patch
 Patch1:		libpng-1.0.20-pngconf.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
@@ -108,6 +108,10 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Sat Nov 18 2006 Paul Howarth  1.0.21-1
+- update to 1.0.21 to address DoS issue (#216263, CVE-2006-5793)
+- update soname patch
+
 * Sun Oct  1 2006 Paul Howarth  1.0.20-4
 - rebuild with latest toolchain
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpng10/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jul 2006 07:21:50 -0000	1.2
+++ sources	21 Nov 2006 08:33:02 -0000	1.3
@@ -1 +1 @@
-7c2fb566d3e5e70c8a5eeb719e67f26b  libpng-1.0.20.tar.bz2
+17cca7846f8019acfb8fc1868ea99d2e  libpng-1.0.21.tar.bz2


--- libpng-1.0.20-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 08:50:08 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 03:50:08 -0500
Subject: rpms/tracker/FC-6 tracker-desktop.patch, 1.1, 1.2 tracker.spec, 1.3,
	1.4
Message-ID: <200611210850.kAL8o8mF009685@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9665

Modified Files:
	tracker-desktop.patch tracker.spec 
Log Message:
* Tue Nov 21 2006 Deji Akingunola  - 0.5.2-1
- Patching Makefile.am doesn't work!


tracker-desktop.patch:

Index: tracker-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracker-desktop.patch	21 Nov 2006 08:27:16 -0000	1.1
+++ tracker-desktop.patch	21 Nov 2006 08:49:38 -0000	1.2
@@ -1,16 +1,27 @@
---- Makefile.am	2006-11-20 23:57:45.000000000 -0500
-+++ Makefile.am.new	2006-11-20 23:58:00.000000000 -0500
-@@ -1,7 +1,9 @@
+--- Makefile.in	2006-11-20 13:34:48.000000000 -0500
++++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
+@@ -66,8 +66,9 @@
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
++am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
++xdgconfigDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgconfig_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -299,7 +300,9 @@
+ target_alias = @target_alias@
  SUBDIRS = data src filters thumbnailers docs po
- 
  pkgconfigdir = $(libdir)/pkgconfig
 +xdgconfigdir = $(sysconfdir)/xdg/autostart
  pkgconfig_DATA = tracker.pc
-+xdgconfig_DATA = trackerd.desktop
- 
++xdgconfig_DATA= trackerd.desktop
  debian_files = \
  	debian/changelog \
-@@ -34,12 +36,11 @@
+ 	debian/compat \
+@@ -331,12 +334,11 @@
  
  EXTRA_DIST = \
  	$(pkgconfig_DATA) \
@@ -24,6 +35,54 @@
  	intltool-extract.in \
  	intltool-merge.in \
  	intltool-update.in \
+@@ -422,6 +424,15 @@
+ 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
++install-xdgconfigDATA: $(xdgconfig_DATA)
++	@$(NORMAL_INSTALL)
++	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
++	@list='$(xdgconfig_DATA)'; for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
++	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
++	done
+ 
+ uninstall-pkgconfigDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -430,6 +441,13 @@
+ 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
++uninstall-xdgconfigDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(xdgconfig_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
++	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -710,7 +728,7 @@
+ all-am: Makefile $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
++	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -758,7 +776,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-pkgconfigDATA
++install-data-am: install-pkgconfigDATA install-xdgconfigDATA
+ 
+ install-exec-am:
+ 
 --- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
 +++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
 @@ -8,5 +8,8 @@


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tracker.spec	21 Nov 2006 08:27:16 -0000	1.3
+++ tracker.spec	21 Nov 2006 08:49:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
@@ -103,7 +103,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
+* Tue Nov 21 2006 Deji Akingunola  - 0.5.2-1
+- Patching Makefile.am doesn't work!
+
+* Mon Nov 20 2006 Deji Akingunola  - 0.5.2-1
 - Update to 0.5.2
 
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1



From fedora-extras-commits at redhat.com  Tue Nov 21 08:51:05 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 21 Nov 2006 03:51:05 -0500
Subject: rpms/libpng10/FC-6 libpng-1.0.21-soname.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 libpng10.spec, 1.4, 1.5 sources, 1.2,
	1.3 libpng-1.0.20-soname.patch, 1.1, NONE
Message-ID: <200611210851.kAL8p5Dl009753@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/libpng10/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9729

Modified Files:
	.cvsignore libpng10.spec sources 
Added Files:
	libpng-1.0.21-soname.patch 
Removed Files:
	libpng-1.0.20-soname.patch 
Log Message:
resync with devel

libpng-1.0.21-soname.patch:

--- NEW FILE libpng-1.0.21-soname.patch ---
--- libpng-1.0.21/ltmain.sh	2006-08-01 15:46:17.000000000 +0100
+++ libpng-1.0.21/ltmain.sh	2006-08-01 15:46:52.000000000 +0100
@@ -3270,7 +3270,7 @@
 	esac
 
 	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]|[0-9].[0-9][0-9]) ;;
 	*)
 	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- libpng-1.0.21/Makefile.am	2006-11-15 12:49:56.000000000 +0000
+++ libpng-1.0.21/Makefile.am	2006-11-18 10:50:43.000000000 +0000
@@ -45,7 +45,7 @@
 	-version-number 0:@PNGLIB_MINOR@:0
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_MINOR@:0
+	-version-number 2:1:0. at PNGLIB_MINOR@
 
 if HAVE_LD_VERSION_SCRIPT
   # Versioned symbols and restricted exports
--- libpng-1.0.21/Makefile.in	2006-11-15 12:50:12.000000000 +0000
+++ libpng-1.0.21/Makefile.in	2006-11-18 10:51:25.000000000 +0000
@@ -291,7 +291,7 @@
 	0:@PNGLIB_MINOR@:0 $(am__append_1) $(am__append_2)
 # -rpath is needed as automake doesn't know the directory
 libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-	-version-number 2:@PNGLIB_MINOR@:0
+	-version-number 2:1:0. at PNGLIB_MINOR@
 
 @HAVE_LD_VERSION_SCRIPT_FALSE at libpng10_la_DEPENDENCIES = libpng.sym
 @HAVE_LD_VERSION_SCRIPT_TRUE at libpng10_la_DEPENDENCIES = libpng.vers


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpng10/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jul 2006 07:21:50 -0000	1.2
+++ .cvsignore	21 Nov 2006 08:50:35 -0000	1.3
@@ -1 +1 @@
-libpng-1.0.20.tar.bz2
+libpng-1.0.21.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/extras/rpms/libpng10/FC-6/libpng10.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpng10.spec	1 Oct 2006 13:54:52 -0000	1.4
+++ libpng10.spec	21 Nov 2006 08:50:35 -0000	1.5
@@ -1,12 +1,12 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.20
-Release:	4%{?dist}
+Version:	1.0.21
+Release:	1%{?dist}
 License:	zlib License
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
-Patch0:		libpng-1.0.20-soname.patch
+Patch0:		libpng-1.0.21-soname.patch
 Patch1:		libpng-1.0.20-pngconf.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
@@ -108,6 +108,10 @@
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Sat Nov 18 2006 Paul Howarth  1.0.21-1
+- update to 1.0.21 to address DoS issue (#216263, CVE-2006-5793)
+- update soname patch
+
 * Sun Oct  1 2006 Paul Howarth  1.0.20-4
 - rebuild with latest toolchain
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpng10/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jul 2006 07:21:50 -0000	1.2
+++ sources	21 Nov 2006 08:50:35 -0000	1.3
@@ -1 +1 @@
-7c2fb566d3e5e70c8a5eeb719e67f26b  libpng-1.0.20.tar.bz2
+17cca7846f8019acfb8fc1868ea99d2e  libpng-1.0.21.tar.bz2


--- libpng-1.0.20-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 09:01:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 04:01:41 -0500
Subject: rpms/xscreensaver/devel
	xscreensaver-5.01-webcollage-default-nonet.patch, NONE,
	1.1 xscreensaver.spec, 1.33, 1.34
Message-ID: <200611210901.kAL91fYS009892@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9874

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.01-webcollage-default-nonet.patch 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka  - 1:5.01-5
- Require xorg-x11-resutils (#216245)


xscreensaver-5.01-webcollage-default-nonet.patch:

--- NEW FILE xscreensaver-5.01-webcollage-default-nonet.patch ---
--- xscreensaver-5.01/hacks/config/webcollage.xml.nonet	2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.01/hacks/config/webcollage.xml	2006-11-06 04:29:32.000000000 +0900
@@ -20,7 +20,7 @@
 
   
 
-
+  
 
   <_description>
 This program makes collages out of random images pulled off of the
--- xscreensaver-5.01/driver/XScreenSaver.ad.in.nonet	2006-11-06 04:14:04.000000000 +0900
+++ xscreensaver-5.01/driver/XScreenSaver.ad.in	2006-11-06 04:19:38.000000000 +0900
@@ -302,10 +302,12 @@
 				fiberlamp -root				    \n\
 				boxfit -root				    \n\
 				celtic -root				    \n\
-- default-n:			webcollage -root			    \n\
+- default-n:			webcollage -root			      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:  "WebCollage (whacked)"					      \
 				webcollage -root -filter		      \
-				  'vidwhacker -stdin -stdout'		    \n\
+				  'vidwhacker -stdin -stdout'		      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:			vidwhacker -root			    \n\
 									      \
 @GL_KLUDGE@ GL:			gears -root				    \n\


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xscreensaver.spec	29 Sep 2006 14:41:33 -0000	1.33
+++ xscreensaver.spec	21 Nov 2006 09:01:11 -0000	1.34
@@ -2,7 +2,7 @@
 
 %define version       5.01
 %define beta_ver      %{nil}
-%define fedora_rel    3
+%define fedora_rel    5
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -25,6 +25,7 @@
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch8:          xscreensaver-5.00b5-include-directory.patch
+Patch21:         xscreensaver-5.01-webcollage-default-nonet.patch
 Patch114:        xscreensaver-5.01a1-pam-popup-passwindow.patch
 
 %package base
@@ -50,6 +51,7 @@
 BuildRequires:   fedora-release
 Requires:        /etc/pam.d/system-auth
 Requires:        pam > %{pam_ver}
+Requires:        xorg-x11-resutils
 Provides:        xscreensaver = %{epoch}:%{version}-%{release}
 Obsoletes:       xscreensaver
 
@@ -135,6 +137,7 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch8 -p1 -b .include-dir
+%patch21 -p1 -b .nonet
 # don't apply for now
 %if %{allow_non_passwd}
 %patch114 -p1 -b .non-passwd
@@ -272,7 +275,7 @@
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
    --add-category X-Red-Hat-Base                         \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # This function prints a list of things that get installed.
 # It does this by parsing the output of a dummy run of "make install".
@@ -335,7 +338,6 @@
 
 # create desktop entry for gnome-screensaver
 create_desktop(){
-   set +x
    COMMAND=`cat $1 | sed -n -e 's|^.*$|\1|p'`
    ARG=`cat $1 | sed -n -e 's|^.*> $2
    echo "Type=Application" >> $2
    echo "Categories=Screensaver" >> $2
-   set -x
 }
 
 cd $dd
@@ -378,13 +384,12 @@
       desktop=xscreensaver-`basename $file`
       desktop=${desktop%.xml}.desktop
 
-      set -x
+      echo + create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       echo ${SAVERDIR}/$desktop >> $glist
-      set +x
    done
+   set -x
 done
-set -x
 
 # Make sure all files are readable by all, and writable only by owner.
 #
@@ -409,6 +414,12 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Nov 20 2006 Mamoru Tasaka  - 1:5.01-5
+- Require xorg-x11-resutils (#216245)
+
+* Sun Nov  5 2006 Mamoru Tasaka  - 1:5.01-4
+- No net connection by default for webcollage (possibly fix #214095 ?)
+
 * Fri Sep 29 2006 Mamoru Tasaka  - 1:5.01-3
 - Fix the arguments of desktop files (#208560)
 



From fedora-extras-commits at redhat.com  Tue Nov 21 09:06:08 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 04:06:08 -0500
Subject: rpms/xscreensaver/FC-6
	xscreensaver-5.01-webcollage-default-nonet.patch, NONE,
	1.1 xscreensaver.spec, 1.33, 1.34
Message-ID: <200611210906.kAL968ok010452@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10434

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.01-webcollage-default-nonet.patch 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka  - 1:5.01-5
- Require xorg-x11-resutils (#216245)


xscreensaver-5.01-webcollage-default-nonet.patch:

--- NEW FILE xscreensaver-5.01-webcollage-default-nonet.patch ---
--- xscreensaver-5.01/hacks/config/webcollage.xml.nonet	2006-03-20 21:47:40.000000000 +0900
+++ xscreensaver-5.01/hacks/config/webcollage.xml	2006-11-06 04:29:32.000000000 +0900
@@ -20,7 +20,7 @@
 
   
 
-
+  
 
   <_description>
 This program makes collages out of random images pulled off of the
--- xscreensaver-5.01/driver/XScreenSaver.ad.in.nonet	2006-11-06 04:14:04.000000000 +0900
+++ xscreensaver-5.01/driver/XScreenSaver.ad.in	2006-11-06 04:19:38.000000000 +0900
@@ -302,10 +302,12 @@
 				fiberlamp -root				    \n\
 				boxfit -root				    \n\
 				celtic -root				    \n\
-- default-n:			webcollage -root			    \n\
+- default-n:			webcollage -root			      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:  "WebCollage (whacked)"					      \
 				webcollage -root -filter		      \
-				  'vidwhacker -stdin -stdout'		    \n\
+				  'vidwhacker -stdin -stdout'		      \
+				  -directory @DEFAULT_IMAGE_DIRECTORY@      \n\
 - default-n:			vidwhacker -root			    \n\
 									      \
 @GL_KLUDGE@ GL:			gears -root				    \n\


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/FC-6/xscreensaver.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xscreensaver.spec	29 Sep 2006 14:41:33 -0000	1.33
+++ xscreensaver.spec	21 Nov 2006 09:05:38 -0000	1.34
@@ -2,7 +2,7 @@
 
 %define version       5.01
 %define beta_ver      %{nil}
-%define fedora_rel    3
+%define fedora_rel    5
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -25,6 +25,7 @@
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch8:          xscreensaver-5.00b5-include-directory.patch
+Patch21:         xscreensaver-5.01-webcollage-default-nonet.patch
 Patch114:        xscreensaver-5.01a1-pam-popup-passwindow.patch
 
 %package base
@@ -50,6 +51,7 @@
 BuildRequires:   fedora-release
 Requires:        /etc/pam.d/system-auth
 Requires:        pam > %{pam_ver}
+Requires:        xorg-x11-resutils
 Provides:        xscreensaver = %{epoch}:%{version}-%{release}
 Obsoletes:       xscreensaver
 
@@ -135,6 +137,7 @@
 
 %patch1 -p1 -b .sanitize-hacks
 %patch8 -p1 -b .include-dir
+%patch21 -p1 -b .nonet
 # don't apply for now
 %if %{allow_non_passwd}
 %patch114 -p1 -b .non-passwd
@@ -272,7 +275,7 @@
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
    --add-category X-Red-Hat-Base                         \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # This function prints a list of things that get installed.
 # It does this by parsing the output of a dummy run of "make install".
@@ -335,7 +338,6 @@
 
 # create desktop entry for gnome-screensaver
 create_desktop(){
-   set +x
    COMMAND=`cat $1 | sed -n -e 's|^.*$|\1|p'`
    ARG=`cat $1 | sed -n -e 's|^.*> $2
    echo "Type=Application" >> $2
    echo "Categories=Screensaver" >> $2
-   set -x
 }
 
 cd $dd
@@ -378,13 +384,12 @@
       desktop=xscreensaver-`basename $file`
       desktop=${desktop%.xml}.desktop
 
-      set -x
+      echo + create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
       echo ${SAVERDIR}/$desktop >> $glist
-      set +x
    done
+   set -x
 done
-set -x
 
 # Make sure all files are readable by all, and writable only by owner.
 #
@@ -409,6 +414,12 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Nov 20 2006 Mamoru Tasaka  - 1:5.01-5
+- Require xorg-x11-resutils (#216245)
+
+* Sun Nov  5 2006 Mamoru Tasaka  - 1:5.01-4
+- No net connection by default for webcollage (possibly fix #214095 ?)
+
 * Fri Sep 29 2006 Mamoru Tasaka  - 1:5.01-3
 - Fix the arguments of desktop files (#208560)
 



From fedora-extras-commits at redhat.com  Tue Nov 21 09:19:57 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 04:19:57 -0500
Subject: rpms/tracker import.log,1.4,1.5
Message-ID: <200611210919.kAL9Jvpb010581@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10548

Modified Files:
	import.log 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-5 from tracker-0.5.2-1.src.rpm
Update to 0.5.2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tracker/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	21 Nov 2006 08:27:16 -0000	1.4
+++ import.log	21 Nov 2006 09:19:27 -0000	1.5
@@ -1,3 +1,4 @@
 tracker-0_5_1-1:HEAD:tracker-0.5.1-1.src.rpm:1163088496
 tracker-0_5_2-1:HEAD:tracker-0.5.2-1.src.rpm:1164095041
 tracker-0_5_2-1:FC-6:tracker-0.5.2-1.src.rpm:1164097639
+tracker-0_5_2-1:FC-5:tracker-0.5.2-1.src.rpm:1164100770



From fedora-extras-commits at redhat.com  Tue Nov 21 09:19:57 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue, 21 Nov 2006 04:19:57 -0500
Subject: rpms/tracker/FC-5 tracker-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 
	1.3 sources, 1.2, 1.3 tracker.spec, 1.2, 1.3 trackerd.desktop,
	1.1, NONE
Message-ID: <200611210920.kAL9JvJi010586@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10548/FC-5

Modified Files:
	.cvsignore sources tracker.spec 
Added Files:
	tracker-desktop.patch 
Removed Files:
	trackerd.desktop 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-5 from tracker-0.5.2-1.src.rpm
Update to 0.5.2

tracker-desktop.patch:

--- NEW FILE tracker-desktop.patch ---
--- Makefile.in	2006-11-20 13:34:48.000000000 -0500
+++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
@@ -66,8 +66,9 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+xdgconfigDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgconfig_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -299,7 +300,9 @@
 target_alias = @target_alias@
 SUBDIRS = data src filters thumbnailers docs po
 pkgconfigdir = $(libdir)/pkgconfig
+xdgconfigdir = $(sysconfdir)/xdg/autostart
 pkgconfig_DATA = tracker.pc
+xdgconfig_DATA= trackerd.desktop
 debian_files = \
 	debian/changelog \
 	debian/compat \
@@ -331,12 +334,11 @@
 
 EXTRA_DIST = \
 	$(pkgconfig_DATA) \
+	$(xdgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	configure.in \
 	rdf-query-examples/*.rdf \
-	trackerd.desktop \
-	trackerd-kde.desktop \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
@@ -422,6 +424,15 @@
 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
+install-xdgconfigDATA: $(xdgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
@@ -430,6 +441,13 @@
 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
 	done
+uninstall-xdgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -710,7 +728,7 @@
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -758,7 +776,7 @@
 
 info-am:
 
-install-data-am: install-pkgconfigDATA
+install-data-am: install-pkgconfigDATA install-xdgconfigDATA
 
 install-exec-am:
 
--- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
+++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
@@ -8,5 +8,8 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true
--- src/tracker-search-tool/tracker-search-tool.desktop.in	2006-11-20 08:11:41.000000000 -0500
+++ src/tracker-search-tool/tracker-search-tool.desktop.in.new	2006-11-20 20:24:40.000000000 -0500
@@ -6,6 +6,6 @@
 Icon=gnome-searchtool
 Terminal=false
 Type=Application
-Categories=GTK;Application;Utility;
+Categories=GTK;Utility;
 StartupNotify=true
-NoDisplay=true 
+NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 16:08:21 -0000	1.2
+++ .cvsignore	21 Nov 2006 09:19:27 -0000	1.3
@@ -1 +1 @@
-tracker-0.5.1.tar.gz
+tracker-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 16:08:21 -0000	1.2
+++ sources	21 Nov 2006 09:19:27 -0000	1.3
@@ -1 +1 @@
-133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz
+1bccb8522668a791366aeb25d43b5da7  tracker-0.5.2.tar.gz


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-5/tracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tracker.spec	9 Nov 2006 16:24:03 -0000	1.2
+++ tracker.spec	21 Nov 2006 09:19:27 -0000	1.3
@@ -1,16 +1,17 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
 Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
-Source1: trackerd.desktop
+Patch0: tracker-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmime-devel, poppler-devel, gettext
 BuildRequires: gnome-desktop-devel, gamin-devel
 BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
+BuildRequires: desktop-file-utils, intltool
 %if "%fedora" >= "6"
 BuildRequires: sqlite-devel
 %else
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .desktop
 
 %build
 %if "%fedora" >= "6"
@@ -59,12 +61,19 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-# Add an autostart for trackerd
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/
+# Add an autostart for trackerd (for KDE)
+mkdir -p %{buildroot}%{_datadir}/autostart
+cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
+
+desktop-file-install --delete-original                   \
+        --vendor="fedora"                           \
+        --dir=%{buildroot}%{_datadir}/applications   \
+        %{buildroot}%{_datadir}/applications/%{name}-search-tool.desktop
 
 rm -rf %{buildroot}%{_libdir}/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -72,7 +81,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
@@ -80,7 +89,9 @@
 %{_bindir}/tracker*
 %{_datadir}/tracker/
 %{_datadir}/pixmaps/tracker/
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/autostart/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/tracker*.1.gz
 %{_sysconfdir}/xdg/autostart/trackerd.desktop
@@ -92,6 +103,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Nov 21 2006 Deji Akingunola  - 0.5.2-1
+- Update to 0.5.2
+
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.1-1
 - Update to new version
 


--- trackerd.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 09:24:04 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 04:24:04 -0500
Subject: owners owners.list,1.1976,1.1977
Message-ID: <200611210924.kAL9O4ou010714@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10696

Modified Files:
	owners.list 
Log Message:
add mirage


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1976
retrieving revision 1.1977
diff -u -r1.1976 -r1.1977
--- owners.list	21 Nov 2006 06:43:30 -0000	1.1976
+++ owners.list	21 Nov 2006 09:23:34 -0000	1.1977
@@ -1082,6 +1082,7 @@
 Fedora Extras|mimedefang|E-Mail filtering framework using Sendmail's Milter interface|redhat-bugzilla at linuxnetz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|jtorresh at gmail.com|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|mirage|A fast and simple image viewer|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|mirrormagic|Puzzle game where you steer a beam of light using mirrors|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|mISDN|Userspace part of Modular ISDN stack|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 09:31:41 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 21 Nov 2006 04:31:41 -0500
Subject: rpms/sylpheed/FC-5 .cvsignore, 1.20, 1.21 sources, 1.20,
	1.21 sylpheed.spec, 1.34, 1.35
Message-ID: <200611210931.kAL9VfjD010759@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10739

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
upstream bug-fix release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Sep 2006 00:38:43 -0000	1.20
+++ .cvsignore	21 Nov 2006 09:31:11 -0000	1.21
@@ -1,2 +1,2 @@
-sylpheed-2.2.9.tar.bz2.asc
-sylpheed-2.2.9.tar.bz2
+sylpheed-2.2.10.tar.bz2
+sylpheed-2.2.10.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	25 Sep 2006 00:39:12 -0000	1.20
+++ sources	21 Nov 2006 09:31:11 -0000	1.21
@@ -1,2 +1,2 @@
-987cc37cfa2ad1116c5c60e4f399be30  sylpheed-2.2.9.tar.bz2.asc
-45e9e89775613b0afb732fbc11c73d26  sylpheed-2.2.9.tar.bz2
+68709cd07d2416c7aaeacf2c6921b1a2  sylpheed-2.2.10.tar.bz2
+ddbaab7d093c35592927a0cd426631ad  sylpheed-2.2.10.tar.bz2.asc


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/FC-5/sylpheed.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sylpheed.spec	25 Sep 2006 00:38:43 -0000	1.34
+++ sylpheed.spec	21 Nov 2006 09:31:11 -0000	1.35
@@ -4,7 +4,7 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 2.2.9
+Version: 2.2.10
 Release: 1%{?dist}
 License: GPL
 URL: http://sylpheed.sraoss.jp/
@@ -84,6 +84,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Nov 16 2006 Michael Schwendt  - 2.2.10-1
+- Update to 2.2.10 (recommended bug-fixes only).
+
 * Sat Sep 23 2006 Michael Schwendt  - 2.2.9-1
 - Update to 2.2.9 (also works around #201949).
 - New upstream URLs.



From fedora-extras-commits at redhat.com  Tue Nov 21 10:06:39 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 21 Nov 2006 05:06:39 -0500
Subject: rpms/glom/devel .cvsignore, 1.5, 1.6 glom.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200611211006.kALA6dVE011260@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11241

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Oct 2006 10:16:43 -0000	1.5
+++ .cvsignore	21 Nov 2006 10:06:09 -0000	1.6
@@ -1 +1 @@
-glom-1.2.0.tar.bz2
+glom-1.2.1.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glom.spec	19 Oct 2006 10:16:43 -0000	1.4
+++ glom.spec	21 Nov 2006 10:06:09 -0000	1.5
@@ -1,5 +1,5 @@
 %define major_version  1.2
-%define minor_version  0
+%define minor_version  1
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Denis Leroy  - 1.2.1-2
+- Update to 1.2.1
+
 * Thu Oct 19 2006 Denis Leroy  - 1.2.0-2
 - Rebuild with correct sources files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Oct 2006 10:16:43 -0000	1.5
+++ sources	21 Nov 2006 10:06:09 -0000	1.6
@@ -1 +1 @@
-690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2
+406c28f1bb4e704c7c4fb56a48893f21  glom-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 10:10:49 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 21 Nov 2006 05:10:49 -0500
Subject: rpms/glom/FC-6 .cvsignore, 1.5, 1.6 glom.spec, 1.4, 1.5 sources, 1.5,
	1.6
Message-ID: <200611211010.kALAAn2a011363@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11342

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Oct 2006 10:16:43 -0000	1.5
+++ .cvsignore	21 Nov 2006 10:10:19 -0000	1.6
@@ -1 +1 @@
-glom-1.2.0.tar.bz2
+glom-1.2.1.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-6/glom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glom.spec	19 Oct 2006 10:16:43 -0000	1.4
+++ glom.spec	21 Nov 2006 10:10:19 -0000	1.5
@@ -1,5 +1,5 @@
 %define major_version  1.2
-%define minor_version  0
+%define minor_version  1
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Denis Leroy  - 1.2.1-2
+- Update to 1.2.1
+
 * Thu Oct 19 2006 Denis Leroy  - 1.2.0-2
 - Rebuild with correct sources files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Oct 2006 10:16:43 -0000	1.5
+++ sources	21 Nov 2006 10:10:19 -0000	1.6
@@ -1 +1 @@
-690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2
+406c28f1bb4e704c7c4fb56a48893f21  glom-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 10:12:46 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 21 Nov 2006 05:12:46 -0500
Subject: rpms/glom/FC-5 .cvsignore, 1.4, 1.5 glom.spec, 1.3, 1.4 sources, 1.4,
	1.5
Message-ID: <200611211012.kALACkMM011440@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/glom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421

Modified Files:
	.cvsignore glom.spec sources 
Log Message:
Update to 1.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Oct 2006 10:21:41 -0000	1.4
+++ .cvsignore	21 Nov 2006 10:12:16 -0000	1.5
@@ -1 +1 @@
-glom-1.2.0.tar.bz2
+glom-1.2.1.tar.bz2


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/glom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glom.spec	19 Oct 2006 10:21:41 -0000	1.3
+++ glom.spec	21 Nov 2006 10:12:16 -0000	1.4
@@ -1,5 +1,5 @@
 %define major_version  1.2
-%define minor_version  0
+%define minor_version  1
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Denis Leroy  - 1.2.1-1
+- Update to 1.2.1
+
 * Thu Oct 19 2006 Denis Leroy  - 1.2.0-1
 - Update to 1.2.0
 - Added omf directory


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glom/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Oct 2006 10:21:41 -0000	1.4
+++ sources	21 Nov 2006 10:12:16 -0000	1.5
@@ -1 +1 @@
-690b14bea6086ada40764b7e878924fa  glom-1.2.0.tar.bz2
+406c28f1bb4e704c7c4fb56a48893f21  glom-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:02 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 05:36:02 -0500
Subject: comps comps-fe5.xml.in, 1.201, 1.202 comps-fe6.xml.in, 1.225,
	1.226 comps-fe7.xml.in, 1.24, 1.25
Message-ID: <200611211036.kALAa2Dj011703@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11627

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add mirage


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- comps-fe5.xml.in	16 Nov 2006 19:30:45 -0000	1.201
+++ comps-fe5.xml.in	21 Nov 2006 10:35:31 -0000	1.202
@@ -569,6 +569,7 @@
       gwenview
       inkscape
       k3d
+      mirage
       pstoedit
       pydot
       qiv


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- comps-fe6.xml.in	16 Nov 2006 19:30:45 -0000	1.225
+++ comps-fe6.xml.in	21 Nov 2006 10:35:31 -0000	1.226
@@ -623,6 +623,7 @@
       inkscape
       ipe
       k3d
+      mirage
       optipng
       pstoedit
       pydot


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- comps-fe7.xml.in	15 Nov 2006 22:03:43 -0000	1.24
+++ comps-fe7.xml.in	21 Nov 2006 10:35:31 -0000	1.25
@@ -623,6 +623,7 @@
       inkscape
       ipe
       k3d
+      mirage
       optipng
       pstoedit
       pydot



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:10 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 21 Nov 2006 05:36:10 -0500
Subject: rpms/stratagus/FC-4 stratagus.spec,1.9,1.10
Message-ID: <200611211036.kALAaAt2011706@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11647/FC-4

Modified Files:
	stratagus.spec 
Log Message:
Fixed bug #216166


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-4/stratagus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- stratagus.spec	16 Nov 2006 20:30:35 -0000	1.9
+++ stratagus.spec	21 Nov 2006 10:35:40 -0000	1.10
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -48,6 +48,7 @@
 %patch2
 %patch3
 %patch4
+sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
 
 %build
 %configure  	--with-x \
@@ -79,6 +80,9 @@
 
 %changelog
 
+* Sat Nov 18 2006 Peter Lemenkov  2.1-11
+- fix for bug #216166 suggested by Hans de Goede
+
 * Thu Nov 16 2006 Peter Lemenkov  2.1-10
 - Applied patches from Hans de Goede
 



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:10 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 21 Nov 2006 05:36:10 -0500
Subject: rpms/stratagus/FC-5 stratagus.spec,1.9,1.10
Message-ID: <200611211036.kALAaAPB011709@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11647/FC-5

Modified Files:
	stratagus.spec 
Log Message:
Fixed bug #216166


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-5/stratagus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- stratagus.spec	16 Nov 2006 20:30:35 -0000	1.9
+++ stratagus.spec	21 Nov 2006 10:35:40 -0000	1.10
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -48,6 +48,7 @@
 %patch2
 %patch3
 %patch4
+sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
 
 %build
 %configure  	--with-x \
@@ -79,6 +80,9 @@
 
 %changelog
 
+* Sat Nov 18 2006 Peter Lemenkov  2.1-11
+- fix for bug #216166 suggested by Hans de Goede
+
 * Thu Nov 16 2006 Peter Lemenkov  2.1-10
 - Applied patches from Hans de Goede
 



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:16 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 21 Nov 2006 05:36:16 -0500
Subject: rpms/stratagus/devel stratagus.spec,1.12,1.13
Message-ID: <200611211036.kALAaGWW011715@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11647/devel

Modified Files:
	stratagus.spec 
Log Message:
Fixed bug #216166


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stratagus.spec	16 Nov 2006 20:30:42 -0000	1.12
+++ stratagus.spec	21 Nov 2006 10:35:46 -0000	1.13
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -48,6 +48,7 @@
 %patch2
 %patch3
 %patch4
+sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
 
 %build
 %configure  	--with-x \
@@ -79,6 +80,9 @@
 
 %changelog
 
+* Sat Nov 18 2006 Peter Lemenkov  2.1-11
+- fix for bug #216166 suggested by Hans de Goede
+
 * Thu Nov 16 2006 Peter Lemenkov  2.1-10
 - Applied patches from Hans de Goede
 



From fedora-extras-commits at redhat.com  Tue Nov 21 10:36:15 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 21 Nov 2006 05:36:15 -0500
Subject: rpms/stratagus/FC-6 stratagus.spec,1.12,1.13
Message-ID: <200611211036.kALAaFFL011712@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/stratagus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11647/FC-6

Modified Files:
	stratagus.spec 
Log Message:
Fixed bug #216166


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/FC-6/stratagus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stratagus.spec	16 Nov 2006 20:30:36 -0000	1.12
+++ stratagus.spec	21 Nov 2006 10:35:45 -0000	1.13
@@ -6,7 +6,7 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 License: 	GPL
 Group: 		Development/Libraries
 URL:		http://stratagus.sourceforge.net/
@@ -48,6 +48,7 @@
 %patch2
 %patch3
 %patch4
+sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
 
 %build
 %configure  	--with-x \
@@ -79,6 +80,9 @@
 
 %changelog
 
+* Sat Nov 18 2006 Peter Lemenkov  2.1-11
+- fix for bug #216166 suggested by Hans de Goede
+
 * Thu Nov 16 2006 Peter Lemenkov  2.1-10
 - Applied patches from Hans de Goede
 



From fedora-extras-commits at redhat.com  Tue Nov 21 11:17:34 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:17:34 -0500
Subject: owners owners.list,1.1977,1.1978
Message-ID: <200611211117.kALBHYfY012119@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098

Modified Files:
	owners.list 
Log Message:
Add myself as the maintainer of libEMF and chemtool.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1977
retrieving revision 1.1978
diff -u -r1.1977 -r1.1978
--- owners.list	21 Nov 2006 09:23:34 -0000	1.1977
+++ owners.list	21 Nov 2006 11:17:04 -0000	1.1978
@@ -188,6 +188,7 @@
 Fedora Extras|cgoban|X board for playing go|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|chemtool|A program for 2D drawing organic molecules|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|chess|3D chess game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|childsplay|Suite of educational games for young children|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|childsplay_plugins|Plugins for childsplay (educational games for young children)|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
@@ -865,6 +866,7 @@
 Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|lib765|765 chipset library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|libEMF|A library for generating Enhanced Metafiles|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libapreq2|Apache HTTP request library|bojan at rexursive.com|extras-qa at fedoraproject.org|
 Fedora Extras|libassa|C++ network-oriented application framework|3rdshift at comcast.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 11:18:57 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:18:57 -0500
Subject: owners owners.list,1.1978,1.1979
Message-ID: <200611211118.kALBIvtF012275@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12183

Modified Files:
	owners.list 
Log Message:
Sort into proper position.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1978
retrieving revision 1.1979
diff -u -r1.1978 -r1.1979
--- owners.list	21 Nov 2006 11:17:04 -0000	1.1978
+++ owners.list	21 Nov 2006 11:18:27 -0000	1.1979
@@ -866,7 +866,6 @@
 Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|lib765|765 chipset library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|libEMF|A library for generating Enhanced Metafiles|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libapreq2|Apache HTTP request library|bojan at rexursive.com|extras-qa at fedoraproject.org|
 Fedora Extras|libassa|C++ network-oriented application framework|3rdshift at comcast.net|extras-qa at fedoraproject.org|
@@ -888,6 +887,7 @@
 Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libebml|The Extensible Binary Meta Language library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libedit|The NetBSD Editline library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|libEMF|A library for generating Enhanced Metafiles|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|libetpan|Portable, efficient middleware for different kinds of mail access|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 11:20:49 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:20:49 -0500
Subject: rpms/chemtool - New directory
Message-ID: <200611211120.kALBKncB012510@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12505/chemtool

Log Message:
Directory /cvs/extras/rpms/chemtool added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 11:20:54 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:20:54 -0500
Subject: rpms/chemtool/devel - New directory
Message-ID: <200611211120.kALBKsQd012530@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12505/chemtool/devel

Log Message:
Directory /cvs/extras/rpms/chemtool/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 11:21:12 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:21:12 -0500
Subject: rpms/chemtool Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211121.kALBLCn1012585@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12578

Added Files:
	Makefile import.log 
Log Message:
Setup of module chemtool


--- NEW FILE Makefile ---
# Top level Makefile for module chemtool
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  Tue Nov 21 11:21:17 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:21:17 -0500
Subject: rpms/chemtool/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211121.kALBLHR8012605@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12578/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module chemtool


--- 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 Nov 21 11:25:43 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:25:43 -0500
Subject: rpms/chemtool import.log,1.1,1.2
Message-ID: <200611211125.kALBPhNl013044@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13006

Modified Files:
	import.log 
Log Message:
auto-import chemtool-1.6.9-5 on branch devel from chemtool-1.6.9-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/chemtool/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 11:21:12 -0000	1.1
+++ import.log	21 Nov 2006 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+chemtool-1_6_9-5:HEAD:chemtool-1.6.9-5.src.rpm:1164108369



From fedora-extras-commits at redhat.com  Tue Nov 21 11:25:44 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Tue, 21 Nov 2006 06:25:44 -0500
Subject: rpms/chemtool/devel chemtool-compile.patch, NONE,
	1.1 chemtool-desktop.patch, NONE, 1.1 chemtool.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211125.kALBPiYW013048@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/chemtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13006/devel

Modified Files:
	.cvsignore sources 
Added Files:
	chemtool-compile.patch chemtool-desktop.patch chemtool.spec 
Log Message:
auto-import chemtool-1.6.9-5 on branch devel from chemtool-1.6.9-5.src.rpm

chemtool-compile.patch:

--- NEW FILE chemtool-compile.patch ---
--- chemtool-1.6.9/src-cht/cht-2.5.c.compile	2006-01-23 21:05:41.000000000 +0100
+++ chemtool-1.6.9/src-cht/cht-2.5.c	2006-11-19 01:11:59.000000000 +0100
@@ -121,11 +121,6 @@
 #define LACK_MEMMOVE
 #define LACK_MEMCPY
 
-#else
-
-#define LACK_LABS       /* Undefine these if your library has these */
-#define LACK_MEMMOVE
-
 #endif
 #endif
 
@@ -593,13 +588,15 @@
 
 /* In case your system lacks these... */
 
+#ifdef LACK_LABS
 long my_labs(x)
 long x;
 {
     return((x > 0) ? x : -x);
 }
+#endif /* LACK_LABS */
 
-
+#ifdef LACK_MEMMOVE
 #ifdef __STDC__
 Anyptr my_memmove(Anyptr d, Const Anyptr s, size_t n)
 #else
@@ -623,8 +620,9 @@
     }
     return d;
 }
+#endif /* LACK_MEMMOVE */
 
-
+#ifdef LACK_MEMCPY
 #ifdef __STDC__
 Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n)
 #else
@@ -638,7 +636,9 @@
 	*dd++ = *ss++;
     return d;
 }
+#endif /* LACK_MEMCPY */
 
+#ifdef LACK_MEMCMP
 #ifdef __STDC__
 int my_memcmp(Const Anyptr s1, Const Anyptr s2, size_t n)
 #else
@@ -654,7 +654,9 @@
 	    return i;
     return 0;
 }
+#endif /* LACK_MEMCMP */
 
+#ifdef LACK_MEMSET
 #ifdef __STDC__
 Anyptr my_memset(Anyptr d, int c, size_t n)
 #else
@@ -669,7 +671,7 @@
 	*dd++ = c;
     return d;
 }
-
+#endif /* LACK_MEMSET */
 
 int my_toupper(c)
 int c;
--- chemtool-1.6.9/inout.c.compile	2006-02-27 22:36:58.000000000 +0100
+++ chemtool-1.6.9/inout.c	2006-11-19 01:16:12.000000000 +0100
@@ -13,7 +13,7 @@
 #include "gdk/gdkprivate.h"
 #include 
 #ifdef EMF
-#include 
+#include 
 #endif
 
 #ifdef GTK2

chemtool-desktop.patch:

--- NEW FILE chemtool-desktop.patch ---
--- chemtool-1.6.9/pld/chemtool.desktop.d	2006-01-23 21:05:41.000000000 +0100
+++ chemtool-1.6.9/pld/chemtool.desktop	2006-11-19 01:35:05.000000000 +0100
@@ -1,15 +1,14 @@
 [Desktop Entry]
 Name=Chemtool
 Comment=Molecules 2D drawing program
-Name[cs_CZ.ISO8859-2]=Chemtool
-Comment[cs_CZ.ISO8859-2]=Editor molekul
-Comment[de_DE.ISO8859-1]=Molek?leditor
-Comment[pl_PL.ISO8859-2]=Edytor molek??
+Comment[cs]=Editor molekul
+Comment[de]=Molek??leditor
+Comment[pl]=Edytor moleku??
 Exec=chemtool
 Icon=chemtool.xpm
 Terminal=false
-MultipleArgs=false
+Encoding=UTF-8
 Type=Application
 MimeType=application/x-chemtool;Application
-InitialPreference=2
+X-InitialPreference=2
 


--- NEW FILE chemtool.spec ---
Summary: A program for 2D drawing organic molecules
Name: chemtool
Version: 1.6.9
Release: 5%{?dist}
License: GPL
Group: Applications/Editors
Source0: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/%{name}-%{version}.tar.gz
Patch0: %{name}-compile.patch
Patch1: %{name}-desktop.patch
URL: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: libEMF-devel
BuildRequires: libXt-devel
BuildRequires: gnome-mime-data
BuildRequires: kdelibs
Requires: openbabel
Requires: transfig

%description
Chemtool is a program for drawing organic molecules easily and store them
in a variety of output formats including as a X bitmap, Xfig, SVG or EPS
file.  It runs under the X Window System using the GTK widget set.

%prep
%setup -q
%patch0 -p1 -b .compile
%patch1 -p1 -b .d

%build
%configure \
  --enable-emf \
  --with-kdedir=%{_prefix} \
  --with-gnomedir=%{_prefix}
%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT%{_datadir}/{applications,mimelnk/application,mime-info,mime-types,pixmaps} \
        $RPM_BUILD_ROOT{%{_datadir}/icons/hicolor/{32x32/mimetypes,48x48/apps}}

# fix line endings
pushd examples
tr -d '\r' < 14263232.mol > 14263232.mol.unix && mv -f 14263232.mol.unix 14263232.mol
tr -d '\r' < sample.sdf > sample.sdf.unix && mv -f sample.sdf.unix sample.sdf
popd

%{__make} DESTDIR=$RPM_BUILD_ROOT install

install -p kde/mimelnk/application/x-chemtool.desktop     $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
install -p kde/icons/hicolor/32x32/mimetypes/chemtool.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/mimetypes
desktop-file-install --vendor=fedora \
                     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
                     --add-category=Education \
                     --add-category=Science \
                     --add-category=Chemistry \
                     pld/chemtool.desktop
install -p gnome/gnome-application-chemtool.png           $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/chemtool.png
install -p chemtool.xpm                                   $RPM_BUILD_ROOT%{_datadir}/pixmaps

%{__rm} $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/chemtool.desktop
%{__rm} $RPM_BUILD_ROOT%{_datadir}/pixmaps/mc/gnome-application-chemtool.png

%find_lang %{name}

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/update-desktop-database &> /dev/null ||:

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/update-desktop-database &> /dev/null ||:

%clean
rm -rf %{buildroot}

%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog README TODO examples
%attr(755,root,root) %{_bindir}/*
%{_datadir}/mimelnk/application/*
%{_datadir}/mime-types/chemtool.*
%{_datadir}/pixmaps/*.xpm
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*

%changelog
* Mon Nov 20 2006 Dominik 'Rathann' Mierzejewski  1.6.9-5
- keep the whole examples dir in docs
- add update-desktop-database call to post{,un} scripts

* Mon Nov 20 2006 Dominik 'Rathann' Mierzejewski  1.6.9-4
- fix build without mock

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.6.9-3
- added missing BRs
- add scriptlets to update icon cache

* Sun Nov 19 2006 Dominik 'Rathann' Mierzejewski  1.6.9-2
- don't use non-standard macros

* Fri Nov 17 2006 Dominik 'Rathann' Mierzejewski  1.6.9-1
- initial build, based on bioxray.dk and PLD specfiles


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/chemtool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 11:21:17 -0000	1.1
+++ .cvsignore	21 Nov 2006 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+chemtool-1.6.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/chemtool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 11:21:17 -0000	1.1
+++ sources	21 Nov 2006 11:25:13 -0000	1.2
@@ -0,0 +1 @@
+d13b16c019a9912cf0c3de07ca5bcd29  chemtool-1.6.9.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 11:55:53 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 21 Nov 2006 06:55:53 -0500
Subject: rpms/proftpd/devel proftpd-1.3.0-cmdbufsize.patch, 1.1,
	1.2 proftpd.spec, 1.22, 1.23
Message-ID: <200611211155.kALBtrZj013305@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13285

Modified Files:
	proftpd-1.3.0-cmdbufsize.patch proftpd.spec 
Log Message:
Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).


proftpd-1.3.0-cmdbufsize.patch:

Index: proftpd-1.3.0-cmdbufsize.patch
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd-1.3.0-cmdbufsize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proftpd-1.3.0-cmdbufsize.patch	13 Nov 2006 18:10:35 -0000	1.1
+++ proftpd-1.3.0-cmdbufsize.patch	21 Nov 2006 11:55:23 -0000	1.2
@@ -1,6 +1,6 @@
---- src/main.c	2006/09/29 16:38:16	1.292
-+++ src/main.c	2006/10/31 22:49:03	1.293
-@@ -116,6 +116,8 @@ static unsigned char have_dead_child = F
+--- proftpd-1.3.0/src/main.c.cmdbufsize	2006-03-15 19:41:01.000000000 +0000
++++ proftpd-1.3.0/src/main.c	2006-11-17 16:53:35.000000000 +0000
+@@ -116,6 +116,8 @@
  
  static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
  
@@ -9,28 +9,27 @@
  static char **Argv = NULL;
  static char *LastArgv = NULL;
  static const char *PidPath = PR_PID_FILE_PATH;
-@@ -832,16 +834,25 @@
-       pr_timer_reset(TIMER_IDLE, NULL);
- 
-     if (cmd_buf_size == -1) {
--      long *buf_size = get_param_ptr(main_server->conf,
--        "CommandBufferSize", FALSE);
-+      int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize",
-+        FALSE);
+@@ -823,13 +825,26 @@
+       long *buf_size = get_param_ptr(main_server->conf,
+         "CommandBufferSize", FALSE);
  
 -      if (buf_size == NULL || *buf_size <= 0)
 -        cmd_buf_size = 512;
-+      if (bufsz == NULL ||
-+          *bufsz <= 0) {
-+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++      if (buf_size == NULL) {
++        pr_log_debug(DEBUG1, "no CommandBufferSize size given, "
++          "using default buffer size (%u)", (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
++
++      } else if (*buf_size <= 0) {
++	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
 +          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
 +        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 +
-+      } else if (*bufsz + 1 > sizeof(buf)) {
-+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++      } else if (*buf_size + 1 > sizeof(buf)) {
++	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
 +          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
 +	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
  
 -      else if (*buf_size + 1 > sizeof(buf)) {
@@ -38,8 +37,8 @@
 -          "Resetting to 512.");
 -	cmd_buf_size = 512;
 +      } else {
-+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
-+        cmd_buf_size = (long) *bufsz;
++        pr_log_debug(DEBUG1, "setting CommandBufferSize to %ld", *buf_size);
++        cmd_buf_size = (long) *buf_size;
        }
      }
  


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- proftpd.spec	16 Nov 2006 11:02:41 -0000	1.22
+++ proftpd.spec	21 Nov 2006 11:55:23 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Matthias Saou  1.3.0-10
+- Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
+
 * Thu Nov 16 2006 Matthias Saou  1.3.0-9
 - Include mod_tls patch (#214820 too).
 



From fedora-extras-commits at redhat.com  Tue Nov 21 12:36:02 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 07:36:02 -0500
Subject: rpms/sysprof/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof.spec, 1.4, 1.5
Message-ID: <200611211236.kALCa2ut013588@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13557

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
Version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 10:10:51 -0000	1.3
+++ .cvsignore	21 Nov 2006 12:35:32 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 10:10:51 -0000	1.3
+++ sources	21 Nov 2006 12:35:32 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-6/sysprof.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof.spec	2 Nov 2006 10:10:51 -0000	1.4
+++ sysprof.spec	21 Nov 2006 12:35:32 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           sysprof      
-Version:        1.0.5
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
@@ -61,6 +61,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Thu Nov  2 2006 Gianluca Sforna  1.0.5-1
 - version update
 



From fedora-extras-commits at redhat.com  Tue Nov 21 12:37:14 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 07:37:14 -0500
Subject: rpms/sysprof-kmod/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof-kmod.spec, 1.11, 1.12
Message-ID: <200611211237.kALCbEql013613@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-serv13594

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Log Message:
version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 10:08:14 -0000	1.3
+++ .cvsignore	21 Nov 2006 12:36:44 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 10:08:14 -0000	1.3
+++ sources	21 Nov 2006 12:36:44 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-6/sysprof-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sysprof-kmod.spec	12 Nov 2006 23:07:52 -0000	1.11
+++ sysprof-kmod.spec	21 Nov 2006 12:36:44 -0000	1.12
@@ -29,7 +29,7 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.5
+Version:        1.0.7
 Release:        1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Mon Nov 13 2006 Gianluca Sforna 
 - rebuild for kernel 2.6.18-1.2849
 



From fedora-extras-commits at redhat.com  Tue Nov 21 13:04:53 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 08:04:53 -0500
Subject: rpms/sysprof-kmod/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof-kmod.spec, 1.10, 1.11
Message-ID: <200611211304.kALD4rFI013928@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13869

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Log Message:
Version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Nov 2006 22:52:55 -0000	1.3
+++ .cvsignore	21 Nov 2006 13:04:23 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2006 22:52:55 -0000	1.3
+++ sources	21 Nov 2006 13:04:23 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sysprof-kmod.spec	1 Nov 2006 22:52:55 -0000	1.10
+++ sysprof-kmod.spec	21 Nov 2006 13:04:23 -0000	1.11
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2798.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2849.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"
 
@@ -29,8 +29,8 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.5
-Release:        1.%(echo %{kverrel} | tr - _)
+Version:        1.0.7
+Release:        1.1%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel
@@ -103,6 +103,10 @@
 
 
 %changelog
+* Sun Nov 19 2006 Gianluca Sforna  1.0.7-1.1
+- version update
+- use Release 1.1 to be sure EVR in devel is newer than FC6
+
 * Wed Nov  1 2006 Gianluca Sforna  1.0.5-1
 - version update
 - drop upstreamed patch



From fedora-extras-commits at redhat.com  Tue Nov 21 13:08:09 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 08:08:09 -0500
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.11,1.12
Message-ID: <200611211308.kALD89br014000@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13968

Modified Files:
	sysprof-kmod.spec 
Log Message:
dot missing in Version tag



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sysprof-kmod.spec	21 Nov 2006 13:04:23 -0000	1.11
+++ sysprof-kmod.spec	21 Nov 2006 13:07:39 -0000	1.12
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.7
-Release:        1.1%(echo %{kverrel} | tr - _)
+Release:        1.1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel



From fedora-extras-commits at redhat.com  Tue Nov 21 13:09:18 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 08:09:18 -0500
Subject: rpms/sysprof/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof.spec, 1.4, 1.5
Message-ID: <200611211309.kALD9IkK014080@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14049

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Nov 2006 22:40:59 -0000	1.3
+++ .cvsignore	21 Nov 2006 13:08:48 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Nov 2006 22:40:59 -0000	1.3
+++ sources	21 Nov 2006 13:08:48 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/devel/sysprof.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sysprof.spec	1 Nov 2006 22:40:59 -0000	1.4
+++ sysprof.spec	21 Nov 2006 13:08:48 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           sysprof      
-Version:        1.0.5
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
@@ -61,6 +61,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Wed Nov  1 2006 Gianluca Sforna  1.0.5-1
 - version update
 



From fedora-extras-commits at redhat.com  Tue Nov 21 13:18:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 21 Nov 2006 08:18:34 -0500
Subject: rpms/gnupg2/devel gnupg-1.9.91-dearmor.patch,1.1,NONE
Message-ID: <200611211318.kALDIYsP014226@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14221

Removed Files:
	gnupg-1.9.91-dearmor.patch 
Log Message:
drop deprecated patch



--- gnupg-1.9.91-dearmor.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 13:18:54 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 21 Nov 2006 08:18:54 -0500
Subject: rpms/proftpd/devel proftpd.spec,1.23,1.24
Message-ID: <200611211318.kALDIsUZ014237@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14200

Modified Files:
	proftpd.spec 
Log Message:
Fix patch level.



Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- proftpd.spec	21 Nov 2006 11:55:23 -0000	1.23
+++ proftpd.spec	21 Nov 2006 13:18:24 -0000	1.24
@@ -68,7 +68,7 @@
 %setup
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
-%patch2 -p0 -b .cmdbufsize
+%patch2 -p1 -b .cmdbufsize
 %patch3 -p0 -b .mod_tls
 
 



From fedora-extras-commits at redhat.com  Tue Nov 21 13:30:22 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 21 Nov 2006 08:30:22 -0500
Subject: rpms/gnome-translate/FC-5 gnome-translate.spec,1.8,1.9
Message-ID: <200611211330.kALDUMpM014333@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14316

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/FC-5/gnome-translate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-translate.spec	14 Aug 2006 16:59:04 -0000	1.8
+++ gnome-translate.spec	21 Nov 2006 13:29:52 -0000	1.9
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 8%{?dist}
+Release: 11%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -14,9 +14,6 @@
 Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
 BuildRequires: eel2-devel >= 2.13.0, libtranslate-devel, aspell-devel
-%if "%{?dist}" == ".fc5"
-BuildRequires: gnome-keyring-devel
-%endif
 
 BuildRequires: desktop-file-utils >= 0.2.90
 BuildRequires: startup-notification-devel >= 0.5
@@ -60,7 +57,6 @@
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   --add-category X-Fedora                                   \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
@@ -124,11 +120,20 @@
 
 
 %changelog
-* Mon Aug 14 2006 Dmitry Butskoy  - 0.99-8
+* Tue Nov 21 2006 Dmitry Butskoy  - 0.99-11
+- Don't set "ShowOnlyIn=Gnome" flag, it is not needed.
+
+* Fri Sep  1 2006 Dmitry Butskoy  - 0.99-10
+- rebuild for FC6
+
+* Mon Aug 14 2006 Dmitry Butskoy  - 0.99-9
 - add patch to properly restore selected languages from
   the previous invocation (required for recent gtk2 libraries)
 - drop killall -HUP in scripts -- no more needed.
 
+* Sun Jul 16 2006 Dmitry Butskoy  - 0.99-8
+- rebuild for new libgail
+
 * Tue Apr 11 2006 Dmitry Butskoy  - 0.99-7
 - use "export-dynamic" for the linker, as it is recommended
   by upstream (Solves #188491)



From fedora-extras-commits at redhat.com  Tue Nov 21 13:44:22 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 08:44:22 -0500
Subject: rpms/quodlibet/devel .cvsignore, 1.2, 1.3 dl-quodlibet-plugins.sh,
	1.1, 1.2 quodlibet.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611211344.kALDiMBk014591@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14570

Modified Files:
	.cvsignore dl-quodlibet-plugins.sh quodlibet.spec sources 
Log Message:
Update to 0.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 14:48:13 -0000	1.2
+++ .cvsignore	21 Nov 2006 13:43:52 -0000	1.3
@@ -1,2 +1,2 @@
-quodlibet-0.23.1.tar.gz
+quodlibet-0.24.tar.gz
 quodlibet-plugins.tar.bz2


Index: dl-quodlibet-plugins.sh
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/dl-quodlibet-plugins.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dl-quodlibet-plugins.sh	7 Oct 2006 14:48:13 -0000	1.1
+++ dl-quodlibet-plugins.sh	21 Nov 2006 13:43:52 -0000	1.2
@@ -15,7 +15,7 @@
 #
 # download plugins from Quod Libet SVN
 #
-plugin_revision=3702
+plugin_revision=3905
 plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"
 
 svn -q export -r$plugin_revision $plugin_url


Index: quodlibet.spec
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/quodlibet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quodlibet.spec	7 Oct 2006 14:48:13 -0000	1.1
+++ quodlibet.spec	21 Nov 2006 13:43:52 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           quodlibet
-Version:        0.23.1
+Version:        0.24
 Release:        1%{?dist}
 Summary:        A music management program
 
@@ -27,7 +27,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 
-Requires:       python-mutagen >= 1.5
+Requires:       python-mutagen >= 1.8
 Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.8
 Requires:       gstreamer-python >= 0.10
@@ -122,6 +122,9 @@
 %{_mandir}/man1/quodlibet.1*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.24-1
+- Update to 0.24
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 0.23.1-1
 - Update to 0.23.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 14:48:13 -0000	1.2
+++ sources	21 Nov 2006 13:43:52 -0000	1.3
@@ -1,2 +1,2 @@
-8b9d4f4dc0850b48cfe9b4b390722ef4  quodlibet-0.23.1.tar.gz
-4defba03c3f4b5f12b4c35331f4409fc  quodlibet-plugins.tar.bz2
+39718994ee234d0c442d9db330d7445a  quodlibet-0.24.tar.gz
+79a9aa92622d11f7ae00cbb83ba5232c  quodlibet-plugins.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 13:45:38 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 08:45:38 -0500
Subject: rpms/quodlibet/FC-6 .cvsignore, 1.2, 1.3 dl-quodlibet-plugins.sh,
	1.1, 1.2 quodlibet.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611211345.kALDjclV014659@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14637

Modified Files:
	.cvsignore dl-quodlibet-plugins.sh quodlibet.spec sources 
Log Message:
Update to 0.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 14:48:13 -0000	1.2
+++ .cvsignore	21 Nov 2006 13:45:08 -0000	1.3
@@ -1,2 +1,2 @@
-quodlibet-0.23.1.tar.gz
+quodlibet-0.24.tar.gz
 quodlibet-plugins.tar.bz2


Index: dl-quodlibet-plugins.sh
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-6/dl-quodlibet-plugins.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dl-quodlibet-plugins.sh	7 Oct 2006 14:48:13 -0000	1.1
+++ dl-quodlibet-plugins.sh	21 Nov 2006 13:45:08 -0000	1.2
@@ -15,7 +15,7 @@
 #
 # download plugins from Quod Libet SVN
 #
-plugin_revision=3702
+plugin_revision=3905
 plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"
 
 svn -q export -r$plugin_revision $plugin_url


Index: quodlibet.spec
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-6/quodlibet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quodlibet.spec	7 Oct 2006 14:48:13 -0000	1.1
+++ quodlibet.spec	21 Nov 2006 13:45:08 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           quodlibet
-Version:        0.23.1
+Version:        0.24
 Release:        1%{?dist}
 Summary:        A music management program
 
@@ -27,7 +27,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 
-Requires:       python-mutagen >= 1.5
+Requires:       python-mutagen >= 1.8
 Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.8
 Requires:       gstreamer-python >= 0.10
@@ -122,6 +122,9 @@
 %{_mandir}/man1/quodlibet.1*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.24-1
+- Update to 0.24
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 0.23.1-1
 - Update to 0.23.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 14:48:13 -0000	1.2
+++ sources	21 Nov 2006 13:45:08 -0000	1.3
@@ -1,2 +1,2 @@
-8b9d4f4dc0850b48cfe9b4b390722ef4  quodlibet-0.23.1.tar.gz
-4defba03c3f4b5f12b4c35331f4409fc  quodlibet-plugins.tar.bz2
+39718994ee234d0c442d9db330d7445a  quodlibet-0.24.tar.gz
+79a9aa92622d11f7ae00cbb83ba5232c  quodlibet-plugins.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 13:46:34 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 08:46:34 -0500
Subject: rpms/quodlibet/FC-5 .cvsignore, 1.2, 1.3 dl-quodlibet-plugins.sh,
	1.1, 1.2 quodlibet.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611211346.kALDkYUI014724@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/quodlibet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14703

Modified Files:
	.cvsignore dl-quodlibet-plugins.sh quodlibet.spec sources 
Log Message:
Update to 0.24


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 14:48:13 -0000	1.2
+++ .cvsignore	21 Nov 2006 13:46:04 -0000	1.3
@@ -1,2 +1,2 @@
-quodlibet-0.23.1.tar.gz
+quodlibet-0.24.tar.gz
 quodlibet-plugins.tar.bz2


Index: dl-quodlibet-plugins.sh
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-5/dl-quodlibet-plugins.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dl-quodlibet-plugins.sh	7 Oct 2006 14:48:13 -0000	1.1
+++ dl-quodlibet-plugins.sh	21 Nov 2006 13:46:04 -0000	1.2
@@ -15,7 +15,7 @@
 #
 # download plugins from Quod Libet SVN
 #
-plugin_revision=3702
+plugin_revision=3905
 plugin_url="http://svn.sacredchao.net/svn/quodlibet/trunk/plugins/"
 
 svn -q export -r$plugin_revision $plugin_url


Index: quodlibet.spec
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-5/quodlibet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quodlibet.spec	7 Oct 2006 14:48:13 -0000	1.1
+++ quodlibet.spec	21 Nov 2006 13:46:04 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           quodlibet
-Version:        0.23.1
+Version:        0.24
 Release:        1%{?dist}
 Summary:        A music management program
 
@@ -27,7 +27,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 
-Requires:       python-mutagen >= 1.5
+Requires:       python-mutagen >= 1.8
 Requires:       python >= 2.4
 Requires:       pygtk2 >= 2.8
 Requires:       gstreamer-python >= 0.10
@@ -122,6 +122,9 @@
 %{_mandir}/man1/quodlibet.1*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.24-1
+- Update to 0.24
+
 * Mon Aug 28 2006 Jeffrey C. Ollie  - 0.23.1-1
 - Update to 0.23.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quodlibet/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 14:48:13 -0000	1.2
+++ sources	21 Nov 2006 13:46:04 -0000	1.3
@@ -1,2 +1,2 @@
-8b9d4f4dc0850b48cfe9b4b390722ef4  quodlibet-0.23.1.tar.gz
-4defba03c3f4b5f12b4c35331f4409fc  quodlibet-plugins.tar.bz2
+39718994ee234d0c442d9db330d7445a  quodlibet-0.24.tar.gz
+79a9aa92622d11f7ae00cbb83ba5232c  quodlibet-plugins.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 14:18:01 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:18:01 -0500
Subject: rpms/php-pear-DB-DataObject/devel - New directory
Message-ID: <200611211418.kALEI1JZ015010@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14993/php-pear-DB-DataObject/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-DataObject/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:17:56 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:17:56 -0500
Subject: rpms/php-pear-DB-DataObject - New directory
Message-ID: <200611211417.kALEHu4G014997@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14993/php-pear-DB-DataObject

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-DataObject added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:18:12 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:18:12 -0500
Subject: rpms/php-pear-DB-DataObject Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211418.kALEIChK015041@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15035

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-DB-DataObject


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-DB-DataObject
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  Tue Nov 21 14:18:17 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:18:17 -0500
Subject: rpms/php-pear-DB-DataObject/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611211418.kALEIHTe015056@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15035/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-DB-DataObject


--- 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 Nov 21 14:19:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:19:05 -0500
Subject: rpms/php-pear-DB-DataObject import.log,1.1,1.2
Message-ID: <200611211419.kALEJ5Bk015159@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15095

Modified Files:
	import.log 
Log Message:
auto-import php-pear-DB-DataObject-1.8.4-2 on branch devel from php-pear-DB-DataObject-1.8.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 14:18:12 -0000	1.1
+++ import.log	21 Nov 2006 14:18:35 -0000	1.2
@@ -0,0 +1 @@
+php-pear-DB-DataObject-1_8_4-2:HEAD:php-pear-DB-DataObject-1.8.4-2.src.rpm:1164118722



From fedora-extras-commits at redhat.com  Tue Nov 21 14:19:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:19:05 -0500
Subject: rpms/php-pear-DB-DataObject/devel php-pear-DB-DataObject.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211419.kALEJ5vG015163@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15095/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-DB-DataObject.spec 
Log Message:
auto-import php-pear-DB-DataObject-1.8.4-2 on branch devel from php-pear-DB-DataObject-1.8.4-2.src.rpm


--- NEW FILE php-pear-DB-DataObject.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name DB_DataObject

Name:           php-pear-DB-DataObject
Version:        1.8.4
Release:        2%{?dist}
Summary:        An SQL Builder, Object Interface to Database Tables

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/DB_DataObject
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR)
Requires:       php-pear(DB) >= 1.7.0 php-pear(Date) >= 1.4.3
Requires(hint): php-pear(MDB2) >= 2.0.0 php-pear(Validate) >= 0.1.1
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
DataObject performs 2 tasks:
1. Builds SQL statements based on the objects vars and the builder methods.
2. acts as a datastore for a table row.

The core class is designed to be extended for each of your tables so that you
put the data logic inside the data classes. Included is a Generator to make
your configuration files and your base classes.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mkdir -p docdir
mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

# Move createTables script to %{bindir}
mv $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/createTables.php $RPM_BUILD_ROOT%{_bindir}
chmod +x $RPM_BUILD_ROOT%{_bindir}/createTables.php
ln -s ../../../../..%{_bindir}/createTables.php $RPM_BUILD_ROOT%{pear_phpdir}/DB/DataObject/


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc %{pear_name}-%{version}/docdir/%{pear_name}/docs/*
%{_bindir}/createTables.php
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/DB/DataObject*
%exclude %{_bindir}/DB/scripts/DB_DataObject_createTables.bat


%changelog
* Fri Nov 17 2006 Christohper Stone  1.8.4-2
- Fix version number in %%changelog
- Add versioned Requires
- Move createTables script to %%{_bindir}

* Sun Oct 29 2006 Christopher Stone  1.8.4-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 14:18:17 -0000	1.1
+++ .cvsignore	21 Nov 2006 14:18:35 -0000	1.2
@@ -0,0 +1 @@
+DB_DataObject-1.8.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 14:18:17 -0000	1.1
+++ sources	21 Nov 2006 14:18:35 -0000	1.2
@@ -0,0 +1 @@
+770c44d243066340d639b063235dcc02  DB_DataObject-1.8.4.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 14:19:43 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 21 Nov 2006 09:19:43 -0500
Subject: rpms/gnome-translate/FC-6 gnome-translate.spec,1.10,1.11
Message-ID: <200611211419.kALEJhlZ015218@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15199

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/FC-6/gnome-translate.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-translate.spec	1 Sep 2006 14:09:30 -0000	1.10
+++ gnome-translate.spec	21 Nov 2006 14:19:13 -0000	1.11
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -14,9 +14,6 @@
 Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
 BuildRequires: eel2-devel >= 2.13.0, libtranslate-devel, aspell-devel
-%if "%{?dist}" == ".fc5"
-BuildRequires: gnome-keyring-devel
-%endif
 
 BuildRequires: desktop-file-utils >= 0.2.90
 BuildRequires: startup-notification-devel >= 0.5
@@ -60,7 +57,6 @@
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   --add-category X-Fedora                                   \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
@@ -124,6 +120,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dmitry Butskoy  - 0.99-11
+- Don't set "ShowOnlyIn=Gnome" flag, it is not needed.
+
 * Fri Sep  1 2006 Dmitry Butskoy  - 0.99-10
 - rebuild for FC6
 



From fedora-extras-commits at redhat.com  Tue Nov 21 14:20:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:20:46 -0500
Subject: owners owners.list,1.1979,1.1980
Message-ID: <200611211420.kALEKkCh015286@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15266

Modified Files:
	owners.list 
Log Message:
php-pear-DB-DataObject


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1979
retrieving revision 1.1980
diff -u -r1.1979 -r1.1980
--- owners.list	21 Nov 2006 11:18:27 -0000	1.1979
+++ owners.list	21 Nov 2006 14:20:16 -0000	1.1980
@@ -1799,6 +1799,7 @@
 Fedora Extras|php-pear-Date|Date and Time Zone Classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Date-Holidays|Driver based class to calculate holidays|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-DB-DataObject|An SQL Builder, Object Interface to Database Tables|chris.stone at gmail.com|extrasqa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-QuickForm|Class for creating, validating, processing HTML forms|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 14:21:29 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 21 Nov 2006 09:21:29 -0500
Subject: rpms/gnome-translate/devel gnome-translate.spec,1.10,1.11
Message-ID: <200611211421.kALELTvb015317@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15294

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-translate.spec	1 Sep 2006 14:09:30 -0000	1.10
+++ gnome-translate.spec	21 Nov 2006 14:20:59 -0000	1.11
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -14,9 +14,6 @@
 Requires: gtk2 >= 2.4.0, GConf2 >= 2.4.0, eel2 >= 2.6.0, pango >= 1.2.0
 BuildRequires: gtk2-devel >= 2.4.0, GConf2-devel >= 2.4.0
 BuildRequires: eel2-devel >= 2.13.0, libtranslate-devel, aspell-devel
-%if "%{?dist}" == ".fc5"
-BuildRequires: gnome-keyring-devel
-%endif
 
 BuildRequires: desktop-file-utils >= 0.2.90
 BuildRequires: startup-notification-devel >= 0.5
@@ -60,7 +57,6 @@
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
   --add-category X-Fedora                                   \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
@@ -124,6 +120,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dmitry Butskoy  - 0.99-11
+- Don't set "ShowOnlyIn=Gnome" flag, it is not needed.
+
 * Fri Sep  1 2006 Dmitry Butskoy  - 0.99-10
 - rebuild for FC6
 



From fedora-extras-commits at redhat.com  Tue Nov 21 14:38:19 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:38:19 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder - New directory
Message-ID: <200611211438.kALEcJgE015590@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586/php-pear-DB-DataObject-FormBuilder

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:38:24 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:38:24 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder/devel - New directory
Message-ID: <200611211438.kALEcOP6015603@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15586/php-pear-DB-DataObject-FormBuilder/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:38:35 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:38:35 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder Makefile, NONE,
	1.1 import.log, NONE, 1.1
Message-ID: <200611211438.kALEcZ3k015633@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-DB-DataObject-FormBuilder


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-DB-DataObject-FormBuilder
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  Tue Nov 21 14:38:41 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:38:41 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611211438.kALEcfGN015648@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-DB-DataObject-FormBuilder


--- 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 Nov 21 14:39:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:39:30 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder import.log,1.1,1.2
Message-ID: <200611211439.kALEdUts015723@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15687

Modified Files:
	import.log 
Log Message:
auto-import php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5 on branch devel from php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 14:38:35 -0000	1.1
+++ import.log	21 Nov 2006 14:39:00 -0000	1.2
@@ -0,0 +1 @@
+php-pear-DB-DataObject-FormBuilder-1_0_0-0_1_RC5:HEAD:php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5.src.rpm:1164119947



From fedora-extras-commits at redhat.com  Tue Nov 21 14:39:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:39:30 -0500
Subject: rpms/php-pear-DB-DataObject-FormBuilder/devel
	php-pear-DB-DataObject-FormBuilder.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211439.kALEdUcs015725@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15687/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-DB-DataObject-FormBuilder.spec 
Log Message:
auto-import php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5 on branch devel from php-pear-DB-DataObject-FormBuilder-1.0.0-0.1.RC5.src.rpm


--- NEW FILE php-pear-DB-DataObject-FormBuilder.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name DB_DataObject_FormBuilder
%define beta RC5

Name:           php-pear-DB-DataObject-FormBuilder
Version:        1.0.0
Release:        0.1.%{beta}%{?dist}
Summary:        Automatically build HTML_QuickForm objects

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/DB_DataObject_FormBuilder
Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{beta}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) php-pear(DB_DataObject) php-pear(HTML_QuickForm)
Requires(hint): php-pear(Date) php-pear(HTML_Table)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
DB_DataObject_FormBuilder will aid you in rapid application development using
the packages DB_DataObject and HTML_QuickForm. For having a quick but working
prototype of your application, simply model the database, run DataObject's
createTable script over it and write a script that passes one of the resulting
objects to the FormBuilder class. The FormBuilder will automatically generate
a simple but working HTML_QuickForm object that you can use to test your
application. It also provides a processing method that will automatically
detect if an insert() or update() command has to be executed after the form
has been submitted. If you have set up DataObject's links.ini file correctly,
it will also automatically detect if a table field is a foreign key and will
populate a selectbox with the linked table's entries. There are many optional
parameters that you can place in your DataObjects.ini or in the properties of
your derived classes, that you can use to fine-tune the form-generation,
gradually turning the prototypes into fully-featured forms, and you can take
control at any stage of the process.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}%{beta}/%{pear_name}.xml
cd %{pear_name}-%{version}%{beta}


%build
cd %{pear_name}-%{version}%{beta}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}%{beta}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/DB/DataObject/FormBuilder*


%changelog
* Sun Oct 29 2006 Christopher Stone  1.0.0-0.1.RC5
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 14:38:41 -0000	1.1
+++ .cvsignore	21 Nov 2006 14:39:00 -0000	1.2
@@ -0,0 +1 @@
+DB_DataObject_FormBuilder-1.0.0RC5.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB-DataObject-FormBuilder/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 14:38:41 -0000	1.1
+++ sources	21 Nov 2006 14:39:00 -0000	1.2
@@ -0,0 +1 @@
+0430207937449d635449389ae345854c  DB_DataObject_FormBuilder-1.0.0RC5.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 14:41:19 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:41:19 -0500
Subject: owners owners.list,1.1980,1.1981
Message-ID: <200611211441.kALEfJF4015795@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15777

Modified Files:
	owners.list 
Log Message:
php-pear-DB-DataObject-FormBuilder


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1980
retrieving revision 1.1981
diff -u -r1.1980 -r1.1981
--- owners.list	21 Nov 2006 14:20:16 -0000	1.1980
+++ owners.list	21 Nov 2006 14:40:48 -0000	1.1981
@@ -1800,6 +1800,7 @@
 Fedora Extras|php-pear-Date-Holidays|Driver based class to calculate holidays|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-DB-DataObject|An SQL Builder, Object Interface to Database Tables|chris.stone at gmail.com|extrasqa at fedoraproject.org|
+Fedora Extras|php-pear-DB-DataObject-FormBuilder|Automatically build HTML_QuickForm objects|chris.stone at gmail.com|extrasqa at fedoraproject.org|
 Fedora Extras|php-pear-DB-QueryTool|An OO-interface for easily retrieving and modifying data in a DB|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-Common|Base class for other HTML classes|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-HTML-QuickForm|Class for creating, validating, processing HTML forms|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 14:53:38 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 21 Nov 2006 09:53:38 -0500
Subject: rpms/lilypond-doc/FC-6 .cvsignore, 1.5, 1.6 lilypond-doc.spec, 1.4, 
	1.5 sources, 1.5, 1.6
Message-ID: <200611211453.kALErcfP016085@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/lilypond-doc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16033

Modified Files:
	.cvsignore lilypond-doc.spec sources 
Log Message:
New release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Oct 2006 13:31:46 -0000	1.5
+++ .cvsignore	21 Nov 2006 14:53:08 -0000	1.6
@@ -1 +1 @@
-lilypond-2.8.7-1.documentation.tar.bz2
+lilypond-2.10.0-2.documentation.tar.bz2


Index: lilypond-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/lilypond-doc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lilypond-doc.spec	10 Oct 2006 13:31:46 -0000	1.4
+++ lilypond-doc.spec	21 Nov 2006 14:53:08 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           lilypond-doc
-Version:        2.8.7
-Release:	1%{?dist}
+Version:        2.10.0
+Release:        1%{?dist}
 Summary:        HTML documentation for LilyPond
 
 Group:		Applications/Publishing
 License:	GPL
 URL:		http://www.lilypond.org
-Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-1.documentation.tar.bz2
+Source0:        http://www.lilypond.org/download/binaries/documentation/lilypond-%{version}-2.documentation.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Quentin Spencer  2.10.0-1
+- New release.
+
 * Tue Oct 10 2006 Quentin Spencer  2.8.7-1
 - New release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lilypond-doc/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Oct 2006 13:31:46 -0000	1.5
+++ sources	21 Nov 2006 14:53:08 -0000	1.6
@@ -1 +1 @@
-492b1b59b1b66e8c74c0551ec2137d65  lilypond-2.8.7-1.documentation.tar.bz2
+b4fae3abd129e0a19ceddb3dae03fb28  lilypond-2.10.0-2.documentation.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 14:53:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 09:53:40 -0500
Subject: rpms/openvrml import.log,1.1,1.2
Message-ID: <200611211453.kALErepF016088@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/openvrml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16034

Modified Files:
	import.log 
Log Message:
auto-import openvrml-0.16.1-4 on branch devel from openvrml-0.16.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/openvrml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 06:32:13 -0000	1.1
+++ import.log	21 Nov 2006 14:53:10 -0000	1.2
@@ -0,0 +1 @@
+openvrml-0_16_1-4:HEAD:openvrml-0.16.1-4.src.rpm:1164120785



From fedora-extras-commits at redhat.com  Tue Nov 21 14:53:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 09:53:40 -0500
Subject: rpms/openvrml/devel openvrml-gtkplug-info.patch, NONE,
	1.1 openvrml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211453.kALEreaD016092@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16034/devel

Modified Files:
	.cvsignore sources 
Added Files:
	openvrml-gtkplug-info.patch openvrml.spec 
Log Message:
auto-import openvrml-0.16.1-4 on branch devel from openvrml-0.16.1-4.src.rpm

openvrml-gtkplug-info.patch:

--- NEW FILE openvrml-gtkplug-info.patch ---
--- openvrml-0.16.1/doc/openvrml-gtkplug.info	2006-11-15 00:17:54.000000000 -0500
+++ openvrml-0.16.1-4/doc/openvrml-gtkplug.info	2006-11-15 00:18:12.000000000 -0500
@@ -15,7 +15,7 @@
 
 INFO-DIR-SECTION Miscellaneous
 START-INFO-DIR-ENTRY
-* openvrml-gtkplug: A VRML/X3D browser component for GTK+ applications.
+* openvrml-gtkplug: (openvrml-gtkplug). A VRML/X3D browser component for GTK+ applications.
 END-INFO-DIR-ENTRY
 
 


--- NEW FILE openvrml.spec ---
# -*- rpm-spec -*-
Name:           openvrml
Version:        0.16.1
Release:        4%{?dist}
Summary:        VRML/X3D runtime library
License:        LGPL
Group:          System Environment/Libraries
Source:         http://prdownloads.sf.net/openvrml/%{name}-%{version}.tar.gz
Patch:          openvrml-gtkplug-info.patch
URL:            http://openvrml.org
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pkgconfig >= 0.12.0
BuildRequires:  boost-devel >= 1.33.1
BuildRequires:  libpng-devel >= 1.0.12
BuildRequires:  libjpeg-devel >= 6b
BuildRequires:  fontconfig-devel >= 2.0
BuildRequires:  freetype-devel >= 2.1.2
BuildRequires:  firefox-devel
BuildRequires:  libGLU-devel
BuildRequires:  libXmu-devel
BuildRequires:  gtk2-devel
Requires:       firefox = 1.5.0.8

%description
OpenVRML is a VRML/X3D support library, including a runtime and facilities
for reading and displaying VRML and X3D models.


%package devel
Summary:        Headers for developing C++ programs with OpenVRML
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig
Requires:       boost-devel >= 1.33.1
Requires:       libpng-devel
Requires:       libjpeg-devel
Requires:       fontconfig-devel
Requires:       freetype-devel
Requires:       firefox-devel = 1.5.0.8
%description devel
Headers that programmers will need to develop C++ programs using
OpenVRML.

%package gl
Summary:        OpenGL renderer for OpenVRML
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
%description gl
OpenGL renderer for OpenVRML.

%package gl-devel
Summary:        OpenVRML OpenGL renderer headers
Group:          Development/Libraries
Requires:       %{name}-gl = %{version}-%{release}
Requires:       %{name}-devel = %{version}-%{release}
Requires:       pkgconfig
Requires:       libGLU-devel
Requires:       libXmu-devel
Requires:       gtk2-devel
%description gl-devel
Headers that programmers will need to develop C++ programs using the
OpenVRML OpenGL renderer.

%package gtkplug
Summary:        VRML browser GtkPlug component for embedding in GTK+ applications
Group:          Applications/Internet
License:        GPL
Requires:       %{name}-gl = %{version}-%{release}
%description gtkplug
VRML browser GtkPlug component for embedding in GTK+ applications.

%package mozilla-plugin
Summary:        VRML browser plug-in for Mozilla-based browsers
Group:          Applications/Internet
License:        GPL
Requires:       %{name}-gtkplug = %{version}-%{release}
%description mozilla-plugin
VRML browser plug-in for Mozilla-based browsers.

%prep
%setup

%patch -p1

%build
%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
%{__make} %{?_smp_mflags}

%install
%{__make} DESTDIR=%{buildroot} install
%{__rm} %{buildroot}%{_libdir}/*.la
%{__rm} %{buildroot}%{_libdir}/mozilla/plugins/openvrml.la
%{__rm} -f %{buildroot}%{_infodir}/dir

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
%{_libdir}/libopenvrml.so.*

%files devel
%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
%doc doc/manual
%{_includedir}/%{name}/openvrml-common.h
%{_includedir}/%{name}/openvrml-config.h
%{_includedir}/%{name}/openvrml/*.h
%{_libdir}/libopenvrml.so
%{_libdir}/pkgconfig/openvrml.pc


%post gl -p /sbin/ldconfig

%postun gl -p /sbin/ldconfig

%files gl
%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
%{_libdir}/libopenvrml-gl.so.*


%files gl-devel
%doc AUTHORS COPYING.LESSER ChangeLog NEWS README THANKS
%{_includedir}/%{name}/openvrml-gl-common.h
%{_includedir}/%{name}/openvrml-gl-config.h
%{_includedir}/%{name}/openvrml/gl
%{_libdir}/libopenvrml-gl.so
%{_libdir}/pkgconfig/openvrml-gl.pc


%post gtkplug
/sbin/install-info %{_infodir}/openvrml-gtkplug.info.gz %{_infodir}/dir

%preun gtkplug
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/openvrml-gtkplug.info.gz %{_infodir}/dir
fi

%files gtkplug
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_infodir}/openvrml-gtkplug.info.gz
%{_libexecdir}/openvrml-gtkplug

%files mozilla-plugin
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_libdir}/mozilla/plugins/openvrml.so


%changelog
* Wed Nov 15 2006  Braden McDaniel   - 0.16.1-4
- Patch openvrml-gtkplug.info.

* Tue Nov 14 2006  Braden McDaniel   - 0.16.1-3
- openvrml: Require firefox 1.5.0.8.
- openvrml: Add -fvisibility=hidden to CXXFLAGS.
- openvrml: Use %%{__make} in %%install.
- openvrml: rm %%{buildroot}%%{_infodir}/dir at the end of %%install.
- openvrml-devel: Require pkgconfig, libpng-devel, libjpeg-devel,
  fontconfig-devel, freetype-devel, and firefox-devel = 1.5.0.8.
- openvrml-gl: Removed Requires: mesa-libGLU.
- openvrml-gl-devel: Require pkgconfig, openvrml-devel, libGLU-devel,
  libXmu-devel, and gtk2-devel.

* Mon Oct 30 2006  Braden McDaniel   - 0.16.1-2
- Removed trailing '.' from summaries.
- openvrml-devel: Include %%{version}-%%{release} in dependency on
  openvrml.
- openvrml-devel: Removed mention of static libraries from summary and
  description since they are no longer included.
- openvrml-gl: Run ldconfig in %%post, %%postun.
- openvrml-gl-devel: Include %%{release} in dependency on openvrml.
- openvrml-gl-devel: Removed mention of static libraries from summary and
  description since they are no longer included.
- openvrml-gtkplug: Include %%{release} in dependency on openvrml-gl.
- openvrml-gtkplug: Run install-info in %%post, %%preun.
- openvrml-gtkplug: Removed Requires for gtk2, libXmu.
- openvrml-mozilla-plugin: Include %%{release} in dependency on
  openvrml-gtkplug.
- openvrml-mozilla-plugin: Removed Requires for firefox.

* Sat Oct 28 2006  Braden McDaniel  
- Run ldconfig in %%post and %%postun.
- Updated summary and description.
- Removed BuildRequires for zlib-devel.
- Removed Requires for zlib.
- Removed Requires for libpng.
- Removed Requires for libjpeg.
- Removed Requires for fontconfig.
- Removed Requires for freetype.
- Avoid packaging libtool .la files.
- Do not build static libraries.
- Do not use %%makeinstall.

* Fri Oct 27 2006  Braden McDaniel  
- Removed obsolete references to openvrml.xpt and openvrml.idl by the
  mozilla-plugin package.
- Fixed file name for openvrml-gtkplug texinfo.

* Wed Oct 25 2006  Braden McDaniel  
- Require firefox instead of mozilla.

* Thu Oct 05 2006  Braden McDaniel  
- Added openvrml-gtkplug info.

* Thu Sep 28 2006  Braden McDaniel  
- Added openvrml-gtkplug package.

* Mon Aug 14 2006  Braden McDaniel  
- Added libXmu-devel to BuildRequires.
- Made mozilla-plugin package Require libXmu.

* Thu Aug 10 2006  Braden McDaniel  
- Use %%{__make} instead of make.
- Use %%{__rm} instead of rm.
- Include openvrml-common.h and openvrml-config.h in openvrml-devel.
- Include openvrml-gl-common.h and openvrml-gl-config.h in
  openvrml-gl-devel.

* Wed Jul 26 2006  Braden McDaniel  
- Require boost-devel 1.33.1.
- Added dependency on boost-devel to openvrml-devel.
- Updated Mesa package names for Fedora Core 5.

* Sun Feb 12 2006  Braden McDaniel  
- configure with --disable-exception-specs.

* Tue Apr 20 2005  Braden McDaniel  
- Removed dejagnu build prerequisite.

* Mon Mar 21 2005  Braden McDaniel  
- No longer emit lookat package.
- configure with --disable-examples.

* Wed Jan 26 2005  Braden McDaniel  
- configure with --disable-script-node-java.  The Script node Java binding
  is not currently usable.

* Fri Jan 07 2005  Braden McDaniel  
- Added %%{_libexecdir}/openvrml-player to the openvrml-mozilla-plugin package.

* Fri Dec 29 2004  Braden McDaniel  
- Fixed name of xorg-x11-devel prerequisite for the openvrml-gl-devel package.

* Fri Dec 24 2004  Braden McDaniel  
- Require mozilla >= 1.6.  The plug-in now must link with libxpcom.
- Removed GtkGLExt dependency; added GTK+ 2.x dependency.  GtkGLExt is
  now included in the distribution.

* Thu Dec 03 2004  Braden McDaniel  
- Use %%makeinstall macro.
- Install COPYING (GPL) with lookat documentation rather than COPYING.LESSER
  (LGPL).

* Tue Nov 30 2004  Braden McDaniel  
- Added dejagnu >= 1.4 as a build prerequisite.

* Fri Nov 26 2004  Braden McDaniel  
- Changed Mozilla plug-in RPM name to openvrml-mozilla-plugin.
- Refer to the plug-in in comments as "for Mozilla-based browsers" rather than
  "for Mozilla".

* Sun Nov 21 2004  Braden McDaniel  
- Changed openvrml-gl-devel dependency on XFree86-devel to xorg-X11-devel.
- Removed openvrml-mozilla dependency on mozilla.  Other browsers (e.g.,
  Firefox) could use the plug-in, too.

* Sat May 15 2004  Braden McDaniel  
- Use "License" instead of "Copyright".
- Require xorg-x11 packages instead of XFree86.
- Removed "Prefix" specification.
- Use "%%configure" macro.
- Install script.jar.
- Use %%{_libdir}, etc. macros.
- Install openvrml.idl.

* Sun May 09 2004  Braden McDaniel  
- Corrected description of lookat RPM to reflect the change to using SDL.
- Define NDEBUG when configuring.

* Wed May 05 2004  Braden McDaniel  
- Made Mozilla plug-in scriptable.

* Mon Apr 26 2004  Braden McDaniel  
- Added Mozilla plug-in.

* Thu Nov 20 2003  Braden McDaniel  
- Require SDL for lookat instead of glut.
- Set "DESTDIR" for "make install" rather than "prefix".

* Sun Nov 16 2003  Braden McDaniel  
- Removed unused ARCH_FLAGS variable from "configure" invocation.
- Added _smp_mflags macro to invocation of make.

* Fri Nov 07 2003  Braden McDaniel  
- Added "BuildRequires: libgcj-devel >= 3.3" and analogous Requires. Script
  node Java support is now included in the build, and older versions of libgcj
  have a bug that prevents OpenVRML from compiling.
- Removed glut requirement from opevrml-gl package. (Should have been done
  some time ago.)
- Added glut requirement to lookat package.
- Changed XFree86 requirement of openvrml-gl to XFree86-Mesa-libGLU to
  correspond to Fedora Core package name. Upped required version of XFree86 to
  4.3 to correspond to this.

* Mon Nov 03 2003  Braden McDaniel  
- Removed lookat-bin from lookat package.
- Added mozilla requirement for lookat.  lookat is now built with -rpath for
  the Mozilla library directory; so the binary package requires the same
  Mozilla version it was built against.

* Mon Oct 27 2003  Braden McDaniel  
- Added lookat-bin to lookat package.

* Tue Sep 30 2003  Braden McDaniel  
- Added BuildRequires: boost-devel.

* Sun Sep 28 2003  Braden McDaniel  
- Changed COPYING.LIB to COPYING.LESSER.
- Moved pkg-config metadata files to devel packages.
- Changes for parity with installation directory names.

* Tue Dec 17 2002  Braden McDaniel  
- Removed conformance.html from %%doc.  This doc now incorporated into doxygen
  docs.

* Tue Dec 10 2002  Braden McDaniel  
- Added BuildRequires for pkgconfig, fontconfig-devel, freetype-devel.
- Added Requires for fontconfig, freetype.
- Updated configure arguments.
- Added conformance.html to openvrml's %%doc.
- Added API (doxygen) docs to openvrml-devel's %%doc.
- Removed GL renderer headers in openvrml-devel.
- Added AUTHORS, COPYING.LIB, ChangeLog, NEWS, README, THANKS to %%doc for all
  packages.

* Sun Dec 08 2002  Braden McDaniel  
- Removed COPYING from %%doc.

* Thu Dec 05 2002  Braden McDaniel  
- Added minimum versions to BuildRequires dependencies.
- configure --without-ftflibs.
- Require Mozilla 1.2.1; removed obsolete CPPFLAGS and LDFLAGS when
  configuring.

* Sun Jun 30 2002  Braden McDaniel  
- configure --without-doxygen.
- Removed "doc/conformance.html" from %%doc.

* Sat Jun 15 2002  Braden McDaniel  
- Use CPPFLAGS and LDFLAGS for Mozilla 1.0.0 when running configure.
- Require Mozilla 1.0.0.

* Mon May 20 2002  Braden McDaniel  
- Fixed pkgconfig metafile names.
- Updated dependencies to reflect RPMs shipping with Red Hat 7.3.
- Updated source download URI.
- Removed prefix.
- Added BuildRequires.
- Added Requires for zlib, libpng, libjpeg, mozilla.
- configure --without-jdk.

* Thu Jan 24 2002  Braden McDaniel  
- Added package metafiles for pkgconfig.
- Removed autoconf macros for use by client packages.

* Fri Jun 29 2001  Braden McDaniel  
- Removed MPL-1.1.txt from %%doc. File nolonger distributed.
- Prefer the shorter "sf.net" to "sourceforge.net".

* Wed Jun 6 2001  Braden McDaniel  
- Added COPYING to %%doc.
- Changed URL to 
- Corrected packager e-mail address.

* Thu Jan 25 2001  Braden McDaniel  
- Fixed location of lookat icon in %%files section for lookat
- Added Mesa >= 3.2 as a requirement for openvrml-gl.

* Tue Jan 2 2001  Braden McDaniel  
- Removed obsolete TODO from %%doc.

* Sun Dec 31 2000  Clayton Cottingham 
- Change in install section rm command is now recursive

* Fri Dec 15 2000  Braden McDaniel  
- Added lookat.xpm to files section for lookat.

* Fri Dec 8 2000  Braden McDaniel  
- Changes to reflect library name and header location changes.

* Sun Dec 3 2000  Braden McDaniel  
- Removed README.SOUND from %%doc

* Sun Nov 26 2000  Braden McDaniel  
- Added conformance.html to %%doc.
- Removed obsolete COPYING.ANTLR from %%doc.
- Changed URL to .
- Removed obsolete NODES from %%doc.

* Thu Nov 23 2000  Braden McDaniel  
- Gave much love. Checked into CVS. Still not guaranteed to work, though.

* Tue Oct 24 2000  Braden McDaniel  
- Received initial spec file from Clayton Cottingham .


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 06:32:18 -0000	1.1
+++ .cvsignore	21 Nov 2006 14:53:10 -0000	1.2
@@ -0,0 +1 @@
+openvrml-0.16.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 06:32:18 -0000	1.1
+++ sources	21 Nov 2006 14:53:10 -0000	1.2
@@ -0,0 +1 @@
+6628c0d18078805d2b662b3509f537d3  openvrml-0.16.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 14:57:43 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:57:43 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject - New
	directory
Message-ID: <200611211457.kALEvhhk016257@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253/php-pear-Structures-DataGrid-DataSource-DataObject

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:57:49 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:57:49 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel - New
	directory
Message-ID: <200611211457.kALEvnXb016270@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253/php-pear-Structures-DataGrid-DataSource-DataObject/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 14:57:59 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:57:59 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject Makefile,
	NONE, 1.1 import.log, NONE, 1.1
Message-ID: <200611211457.kALEvxd0016300@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16294

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-Structures-DataGrid-DataSource-DataObject


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-Structures-DataGrid-DataSource-DataObject
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  Tue Nov 21 14:58:00 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:58:00 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
	.cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200611211458.kALEw08T016316@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16294/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-Structures-DataGrid-DataSource-DataObject


--- 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 Nov 21 14:58:01 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 21 Nov 2006 09:58:01 -0500
Subject: rpms/perl-YAML-Parser-Syck/devel perl-YAML-Parser-Syck.spec, 1.3,
	1.4
Message-ID: <200611211458.kALEw1oF016327@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16227

Modified Files:
	perl-YAML-Parser-Syck.spec 
Log Message:
Cleanup to more closely resemble cpanspec output.
Fix find option order.
Use fixperms macro.
Fix directory ownership.  (#216484)



Index: perl-YAML-Parser-Syck.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/devel/perl-YAML-Parser-Syck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-YAML-Parser-Syck.spec	26 Sep 2006 22:09:16 -0000	1.3
+++ perl-YAML-Parser-Syck.spec	21 Nov 2006 14:57:31 -0000	1.4
@@ -1,15 +1,14 @@
-Name:			perl-YAML-Parser-Syck
-Version:		0.01
-Release:		6%{?dist}
-Summary:		Perl Wrapper for the YAML Parser Extension: libsyck
-
-Group:			Development/Libraries
-License:		GPL or Artistic
-URL:			http://search.cpan.org/dist/YAML-Parser-Syck/
-Source0:		http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	syck-devel
-Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:           perl-YAML-Parser-Syck
+Version:        0.01
+Release:        7%{?dist}
+Summary:        Perl Wrapper for the YAML Parser Extension: libsyck
+License:        GPL or Artistic
+Group:          Development/Libraries
+URL:            http://search.cpan.org/dist/YAML-Parser-Syck/
+Source0:        http://www.cpan.org/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  syck-devel
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 libsyck is a *gift* from a gifted Stiff named 'Why'.
@@ -18,34 +17,42 @@
 
 %prep
 %setup -q -n YAML-Parser-Syck-%{version}
-%{_bindir}/perldoc -t perlartistic > Artistic
-%{_bindir}/perldoc -t perlgpl > COPYING
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
-%{__chmod} -R u+w $RPM_BUILD_ROOT/*
+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 f -name '*.bs' -size 0 -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%{__make} test
+make test
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic COPYING Changes
-%{perl_vendorarch}/*
-%{_mandir}/man3/*.3*
+%doc Changes README
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/YAML*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Nov 20 2006 Steven Pritchard  0.01-7
+- Cleanup to more closely resemble cpanspec output.
+- Fix find option order.
+- Use fixperms macro.
+- Fix directory ownership.  (#216484)
+
 * Tue Sep 26 2006 Steven Pritchard  0.01-6
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 21 14:58:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:58:46 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject import.log, 
	1.1, 1.2
Message-ID: <200611211458.kALEwkVX016425@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16359

Modified Files:
	import.log 
Log Message:
auto-import php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1 on branch devel from php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 14:57:59 -0000	1.1
+++ import.log	21 Nov 2006 14:58:16 -0000	1.2
@@ -0,0 +1 @@
+php-pear-Structures-DataGrid-DataSource-DataObject-0_1_0-1:HEAD:php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1.src.rpm:1164121104



From fedora-extras-commits at redhat.com  Tue Nov 21 14:58:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 09:58:47 -0500
Subject: rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
	php-pear-Structures-DataGrid-DataSource-DataObject.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211458.kALEwlIx016429@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16359/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Structures-DataGrid-DataSource-DataObject.spec 
Log Message:
auto-import php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1 on branch devel from php-pear-Structures-DataGrid-DataSource-DataObject-0.1.0-1.src.rpm


--- NEW FILE php-pear-Structures-DataGrid-DataSource-DataObject.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Structures_DataGrid_DataSource_DataObject

Name:           php-pear-Structures-DataGrid-DataSource-DataObject
Version:        0.1.0
Release:        1%{?dist}
Summary:        DataSource driver using PEAR::DB_DataObject

Group:          Development/Libraries
License:        PHP License
URL:            http://pear.php.net/package/Structures_DataGrid_DataSource_DataObject
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires:       php-pear(PEAR) 
Requires:       php-pear(Structures_DataGrid) php-pear(DB_DataObject)
Requires(hint): php-pear(DB_DataObject_FormBuilder)
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

%description
This is a DataSource driver for Structures_DataGrid using PEAR::DB_DataObject.


%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}


%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Structures/DataGrid/DataSource


%changelog
* Sun Oct 29 2006 Christopher Stone  0.1.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 14:57:59 -0000	1.1
+++ .cvsignore	21 Nov 2006 14:58:17 -0000	1.2
@@ -0,0 +1 @@
+Structures_DataGrid_DataSource_DataObject-0.1.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Structures-DataGrid-DataSource-DataObject/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 14:57:59 -0000	1.1
+++ sources	21 Nov 2006 14:58:17 -0000	1.2
@@ -0,0 +1 @@
+8779c153f7299f649b39859abbfa646d  Structures_DataGrid_DataSource_DataObject-0.1.0.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 15:01:03 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 10:01:03 -0500
Subject: owners owners.list,1.1981,1.1982
Message-ID: <200611211501.kALF13Sm016532@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16466

Modified Files:
	owners.list 
Log Message:
php-pear-Structures-DataGrid-DataSource-DataObject


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1981
retrieving revision 1.1982
diff -u -r1.1981 -r1.1982
--- owners.list	21 Nov 2006 14:40:48 -0000	1.1981
+++ owners.list	21 Nov 2006 15:00:32 -0000	1.1982
@@ -1828,6 +1828,7 @@
 Fedora Extras|php-pear-Services-Weather|Interface to various online weather-services Description|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-SOAP|Simple Object Access Protocol (SOAP) Client/Server for PHP|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid|A tabular structure for converting data|chris.stone at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-Structures-DataGrid-DataSource-DataObject|DataSource driver using PEAR::DB_DataObject|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Pager|Renderer driver using PEAR::Pager|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Structures-DataGrid-Renderer-Smarty|Renderer driver using Smarty|chris.stone at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-pear-Validate|Validation Class for Various Data Types|chris.stone at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 15:04:39 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 21 Nov 2006 10:04:39 -0500
Subject: rpms/fontforge/FC-5 fontforge-20060125-glibccrash.patch,1.1,NONE
Message-ID: <200611211504.kALF4duk016618@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/FC-5

Removed Files:
	fontforge-20060125-glibccrash.patch 
Log Message:
Remove unused patch



--- fontforge-20060125-glibccrash.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 15:04:44 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 21 Nov 2006 10:04:44 -0500
Subject: rpms/fontforge/FC-6 fontforge-20060125-glibccrash.patch,1.1,NONE
Message-ID: <200611211504.kALF4iXs016631@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/FC-6

Removed Files:
	fontforge-20060125-glibccrash.patch 
Log Message:
Remove unused patch



--- fontforge-20060125-glibccrash.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 15:04:50 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 21 Nov 2006 10:04:50 -0500
Subject: rpms/fontforge/devel fontforge-20060125-glibccrash.patch,1.1,NONE
Message-ID: <200611211504.kALF4onm016644@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16611/devel

Removed Files:
	fontforge-20060125-glibccrash.patch 
Log Message:
Remove unused patch



--- fontforge-20060125-glibccrash.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 15:06:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 21 Nov 2006 10:06:19 -0500
Subject: rpms/perl-YAML-Parser-Syck/FC-6 perl-YAML-Parser-Syck.spec,1.3,1.4
Message-ID: <200611211506.kALF6JVQ016683@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16668

Modified Files:
	perl-YAML-Parser-Syck.spec 
Log Message:
Cleanup to more closely resemble cpanspec output.
Fix find option order.
Use fixperms macro.
Fix directory ownership.  (#216484)



Index: perl-YAML-Parser-Syck.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/FC-6/perl-YAML-Parser-Syck.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-YAML-Parser-Syck.spec	26 Sep 2006 22:09:16 -0000	1.3
+++ perl-YAML-Parser-Syck.spec	21 Nov 2006 15:05:48 -0000	1.4
@@ -1,15 +1,14 @@
-Name:			perl-YAML-Parser-Syck
-Version:		0.01
-Release:		6%{?dist}
-Summary:		Perl Wrapper for the YAML Parser Extension: libsyck
-
-Group:			Development/Libraries
-License:		GPL or Artistic
-URL:			http://search.cpan.org/dist/YAML-Parser-Syck/
-Source0:		http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	syck-devel
-Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:           perl-YAML-Parser-Syck
+Version:        0.01
+Release:        7%{?dist}
+Summary:        Perl Wrapper for the YAML Parser Extension: libsyck
+License:        GPL or Artistic
+Group:          Development/Libraries
+URL:            http://search.cpan.org/dist/YAML-Parser-Syck/
+Source0:        http://www.cpan.org/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  syck-devel
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 libsyck is a *gift* from a gifted Stiff named 'Why'.
@@ -18,34 +17,42 @@
 
 %prep
 %setup -q -n YAML-Parser-Syck-%{version}
-%{_bindir}/perldoc -t perlartistic > Artistic
-%{_bindir}/perldoc -t perlgpl > COPYING
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
-%{__chmod} -R u+w $RPM_BUILD_ROOT/*
+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 f -name '*.bs' -size 0 -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%{__make} test
+make test
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic COPYING Changes
-%{perl_vendorarch}/*
-%{_mandir}/man3/*.3*
+%doc Changes README
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/YAML*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Nov 20 2006 Steven Pritchard  0.01-7
+- Cleanup to more closely resemble cpanspec output.
+- Fix find option order.
+- Use fixperms macro.
+- Fix directory ownership.  (#216484)
+
 * Tue Sep 26 2006 Steven Pritchard  0.01-6
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:07:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 21 Nov 2006 10:07:39 -0500
Subject: rpms/perl-YAML-Parser-Syck/FC-5 perl-YAML-Parser-Syck.spec,1.2,1.3
Message-ID: <200611211507.kALF7dAQ016763@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16734

Modified Files:
	perl-YAML-Parser-Syck.spec 
Log Message:
Cleanup to more closely resemble cpanspec output.
Fix find option order.
Use fixperms macro.
Fix directory ownership.  (#216484)



Index: perl-YAML-Parser-Syck.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/FC-5/perl-YAML-Parser-Syck.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-YAML-Parser-Syck.spec	9 Mar 2006 15:13:01 -0000	1.2
+++ perl-YAML-Parser-Syck.spec	21 Nov 2006 15:07:09 -0000	1.3
@@ -1,15 +1,14 @@
-Name:			perl-YAML-Parser-Syck
-Version:		0.01
-Release:		5%{?dist}
-Summary:		Perl Wrapper for the YAML Parser Extension: libsyck
-
-Group:			Development/Libraries
-License:		GPL or Artistic
-URL:			http://search.cpan.org/dist/YAML-Parser-Syck/
-Source0:		http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	syck-devel
-Requires:		perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:           perl-YAML-Parser-Syck
+Version:        0.01
+Release:        7%{?dist}
+Summary:        Perl Wrapper for the YAML Parser Extension: libsyck
+License:        GPL or Artistic
+Group:          Development/Libraries
+URL:            http://search.cpan.org/dist/YAML-Parser-Syck/
+Source0:        http://www.cpan.org/authors/id/I/IN/INGY/YAML-Parser-Syck-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  syck-devel
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 libsyck is a *gift* from a gifted Stiff named 'Why'.
@@ -18,34 +17,45 @@
 
 %prep
 %setup -q -n YAML-Parser-Syck-%{version}
-%{_bindir}/perldoc -t perlartistic > Artistic
-%{_bindir}/perldoc -t perlgpl > COPYING
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
-%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';'
-%{__chmod} -R u+w $RPM_BUILD_ROOT/*
+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 f -name '*.bs' -size 0 -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-%{__make} test
+make test
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Artistic COPYING Changes
-%{perl_vendorarch}/*
-%{_mandir}/man3/*.3*
+%doc Changes README
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/YAML*
+%{_mandir}/man3/*
 
 %changelog
+* Mon Nov 20 2006 Steven Pritchard  0.01-7
+- Cleanup to more closely resemble cpanspec output.
+- Fix find option order.
+- Use fixperms macro.
+- Fix directory ownership.  (#216484)
+
+* Tue Sep 26 2006 Steven Pritchard  0.01-6
+- Rebuild.
+
 * Thu Mar 09 2006 Oliver Falk 			- 0.01-5
 - Add dist-tag
 - Rebuild



From fedora-extras-commits at redhat.com  Tue Nov 21 15:14:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:14:15 -0500
Subject: rpms/xsupplicant/FC-4
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch, NONE,
	1.1 xsupplicant.spec, 1.21, 1.22
Message-ID: <200611211514.kALFEFiq016903@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837/FC-4

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch 
Log Message:

Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work)


xsupplicant-1.2.8-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.8-nocompilerh-systemheaders.patch ---
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
@@ -103,7 +103,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
@@ -174,7 +174,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
@@ -203,7 +203,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "netlink.h"
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
@@ -203,7 +203,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xsupplicant.spec	10 Sep 2006 14:40:40 -0000	1.21
+++ xsupplicant.spec	21 Nov 2006 15:13:45 -0000	1.22
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,8 +11,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.1-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL)  1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway  1.2.7-3
 - fix ducttape patch for FC-4/FC-5
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:14:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:14:16 -0500
Subject: rpms/xsupplicant/FC-5
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch, NONE,
	1.1 xsupplicant.spec, 1.22, 1.23
Message-ID: <200611211514.kALFEGkW016906@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837/FC-5

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch 
Log Message:

Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work)


xsupplicant-1.2.8-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.8-nocompilerh-systemheaders.patch ---
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
@@ -103,7 +103,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
@@ -174,7 +174,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
@@ -203,7 +203,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "netlink.h"
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
@@ -203,7 +203,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/xsupplicant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xsupplicant.spec	10 Sep 2006 14:40:40 -0000	1.22
+++ xsupplicant.spec	21 Nov 2006 15:13:45 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,8 +11,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.2-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL)  1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway  1.2.7-3
 - fix ducttape patch for FC-4/FC-5
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:14:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:14:21 -0500
Subject: rpms/xsupplicant/FC-6
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch, NONE,
	1.1 xsupplicant.spec, 1.22, 1.23
Message-ID: <200611211514.kALFELt7016909@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837/FC-6

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch 
Log Message:

Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work)


xsupplicant-1.2.8-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.8-nocompilerh-systemheaders.patch ---
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
@@ -103,7 +103,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
@@ -174,7 +174,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
@@ -203,7 +203,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "netlink.h"
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
@@ -203,7 +203,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-6/xsupplicant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xsupplicant.spec	10 Sep 2006 14:40:46 -0000	1.22
+++ xsupplicant.spec	21 Nov 2006 15:13:51 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,8 +11,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools-devel
 Patch0:		xsupplicant-1.2.2-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL)  1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway  1.2.7-3
 - fix ducttape patch for FC-4/FC-5
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:14:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:14:21 -0500
Subject: rpms/xsupplicant/devel
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch, NONE,
	1.1 xsupplicant.spec, 1.22, 1.23
Message-ID: <200611211514.kALFEL3p016912@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837/devel

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.8-nocompilerh-systemheaders.patch 
Log Message:

Take everything to 1.2.8 (except FC-3, which is going to need a LOT more work)


xsupplicant-1.2.8-nocompilerh-systemheaders.patch:

--- NEW FILE xsupplicant-1.2.8-nocompilerh-systemheaders.patch ---
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_atmel_driver.c	2006-11-21 10:11:17.000000000 +0100
@@ -103,7 +103,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_atmel_driver.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux.c	2006-11-21 10:11:08.000000000 +0100
@@ -174,7 +174,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_rtnetlink.c	2006-11-21 10:11:37.000000000 +0100
@@ -203,7 +203,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "netlink.h"
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_rtnetlink.c~
diff -ur xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c
--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2006-10-08 05:42:53.000000000 +0200
+++ xsupplicant-1.2.8.sal/src/cardif/linux/cardif_linux_wext.c	2006-11-21 10:11:28.000000000 +0100
@@ -203,7 +203,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Only in xsupplicant-1.2.8.sal/src/cardif/linux: cardif_linux_wext.c~


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xsupplicant.spec	10 Sep 2006 14:40:46 -0000	1.22
+++ xsupplicant.spec	21 Nov 2006 15:13:51 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,8 +11,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools-devel
 Patch0:		xsupplicant-1.2.2-docsfix.patch
-Patch2:		xsupplicant-1.2.7-nocompilerh-systemheaders.patch
-Patch3:		xsupplicant-1.2.7-ducttapefixes.patch
+Patch2:		xsupplicant-1.2.8-nocompilerh-systemheaders.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -32,7 +31,6 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -73,6 +71,14 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  1.2.8-1
+- everyone gets 1.2.8, close out bz 212700
+
+* Tue Nov 21 2006 Jan ONDREJ (SAL)  1.2.8-0
+- update to 1.2.8
+- removed xsupplicant-1.2.7-ducttapefixes.patch
+- updated nocompilerh patch for latest version
+
 * Sun Sep 10 2006 Tom "spot" Callaway  1.2.7-3
 - fix ducttape patch for FC-4/FC-5
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:32:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:32:10 -0500
Subject: rpms/rocksndiamonds/FC-4 rocksndiamonds-YN.patch, NONE,
	1.1 rocksndiamonds-highscore.patch, NONE,
	1.1 rocksndiamonds.spec, 1.3, 1.4
Message-ID: <200611211532.kALFWA06017307@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/FC-4

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Patch up to fix bz 210767


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-4/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:57 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, xorg-x11-devel, desktop-file-utils
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1
 - bump to 3.2.2
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:32:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:32:10 -0500
Subject: rpms/rocksndiamonds/FC-5 rocksndiamonds-YN.patch, NONE,
	1.1 rocksndiamonds-highscore.patch, NONE,
	1.1 rocksndiamonds.spec, 1.3, 1.4
Message-ID: <200611211532.kALFWAtU017310@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/FC-5

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Patch up to fix bz 210767


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-5/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:57 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1
 - bump to 3.2.2
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:32:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:32:16 -0500
Subject: rpms/rocksndiamonds/devel rocksndiamonds.spec,1.3,1.4
Message-ID: <200611211532.kALFWG3s017319@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/devel

Modified Files:
	rocksndiamonds.spec 
Log Message:

Patch up to fix bz 210767



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:58 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1
 - bump to 3.2.2
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:32:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:32:15 -0500
Subject: rpms/rocksndiamonds/FC-6 rocksndiamonds-YN.patch, NONE,
	1.1 rocksndiamonds-highscore.patch, NONE,
	1.1 rocksndiamonds.spec, 1.3, 1.4
Message-ID: <200611211532.kALFWF2e017314@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227/FC-6

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Patch up to fix bz 210767


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-6/rocksndiamonds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rocksndiamonds.spec	15 Sep 2006 17:43:58 -0000	1.3
+++ rocksndiamonds.spec	21 Nov 2006 15:31:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -9,6 +9,8 @@
 Source1:	rocksndiamonds.desktop
 Source2:	rocksndiamonds.png
 Patch0:		rocksndiamonds-3.1.1-nosmpeg.patch
+Patch1:		rocksndiamonds-highscore.patch
+Patch2:		rocksndiamonds-YN.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel
 BuildRequires:	SDL_image-devel, SDL_mixer-devel, SDL_net-devel
@@ -20,9 +22,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name}/ RW_GAME_DIR=%{_localstatedir}/games/%{name}/ EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+- add patches from bz 210767
+
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1
 - bump to 3.2.2
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:35:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:35:41 -0500
Subject: rpms/xsupplicant/FC-5 sources,1.9,1.10 xsupplicant.spec,1.23,1.24
Message-ID: <200611211535.kALFZfBg017427@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358/FC-5

Modified Files:
	sources xsupplicant.spec 
Log Message:

Forgot to commit new source tarball. :P



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 06:13:04 -0000	1.9
+++ sources	21 Nov 2006 15:35:11 -0000	1.10
@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/xsupplicant.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xsupplicant.spec	21 Nov 2006 15:13:45 -0000	1.23
+++ xsupplicant.spec	21 Nov 2006 15:35:11 -0000	1.24
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/



From fedora-extras-commits at redhat.com  Tue Nov 21 15:35:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:35:41 -0500
Subject: rpms/xsupplicant/FC-4 .cvsignore, 1.2, 1.3 sources, 1.9,
	1.10 xsupplicant.spec, 1.22, 1.23
Message-ID: <200611211535.kALFZfia017423@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358/FC-4

Modified Files:
	.cvsignore sources xsupplicant.spec 
Log Message:

Forgot to commit new source tarball. :P



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Aug 2005 18:58:19 -0000	1.2
+++ .cvsignore	21 Nov 2006 15:35:11 -0000	1.3
@@ -1 +1,2 @@
 xsupplicant-1.2.tar.gz
+xsupplicant-1.2.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 06:13:03 -0000	1.9
+++ sources	21 Nov 2006 15:35:11 -0000	1.10
@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xsupplicant.spec	21 Nov 2006 15:13:45 -0000	1.22
+++ xsupplicant.spec	21 Nov 2006 15:35:11 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/



From fedora-extras-commits at redhat.com  Tue Nov 21 15:35:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:35:42 -0500
Subject: rpms/xsupplicant/devel sources,1.9,1.10 xsupplicant.spec,1.23,1.24
Message-ID: <200611211535.kALFZgZv017433@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358/devel

Modified Files:
	sources xsupplicant.spec 
Log Message:

Forgot to commit new source tarball. :P



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 06:13:04 -0000	1.9
+++ sources	21 Nov 2006 15:35:12 -0000	1.10
@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xsupplicant.spec	21 Nov 2006 15:13:51 -0000	1.23
+++ xsupplicant.spec	21 Nov 2006 15:35:12 -0000	1.24
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/



From fedora-extras-commits at redhat.com  Tue Nov 21 15:35:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:35:42 -0500
Subject: rpms/xsupplicant/FC-6 sources,1.9,1.10 xsupplicant.spec,1.23,1.24
Message-ID: <200611211535.kALFZgt0017431@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17358/FC-6

Modified Files:
	sources xsupplicant.spec 
Log Message:

Forgot to commit new source tarball. :P



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Sep 2006 06:13:04 -0000	1.9
+++ sources	21 Nov 2006 15:35:12 -0000	1.10
@@ -1 +1 @@
-f66c49cd6e4f331d05bf83513ed91990  xsupplicant-1.2.7.tar.gz
+75f89731b905eb8d36a52621661e1226  xsupplicant-1.2.8.tar.gz


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-6/xsupplicant.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xsupplicant.spec	21 Nov 2006 15:13:51 -0000	1.23
+++ xsupplicant.spec	21 Nov 2006 15:35:12 -0000	1.24
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.8
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/



From fedora-extras-commits at redhat.com  Tue Nov 21 15:37:02 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 21 Nov 2006 10:37:02 -0500
Subject: rpms/python-matplotlib/devel matplotlib-0.87.7-matplotlibrc.patch, 
	NONE, 1.1 matplotlib-0.87.7-tkagg-check.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 python-matplotlib.spec, 1.20,
	1.21 sources, 1.13, 1.14 matplotlib-0.87-matplotlibrc.patch, 1.1, NONE
Message-ID: <200611211537.kALFb2xV017611@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17354

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Added Files:
	matplotlib-0.87.7-matplotlibrc.patch 
	matplotlib-0.87.7-tkagg-check.patch 
Removed Files:
	matplotlib-0.87-matplotlibrc.patch 
Log Message:
- Update to 0.87.7 and fix up the defaults to use numpy
- Force build of tkagg backend without X server
- Use src.rpm from Jef Spaleta, closes bug 216578


matplotlib-0.87.7-matplotlibrc.patch:

--- NEW FILE matplotlib-0.87.7-matplotlibrc.patch ---
--- matplotlib-0.87/setup.py.orig	2006-02-14 11:11:32.000000000 -0700
+++ matplotlib-0.87/setup.py	2006-02-27 15:19:28.000000000 -0700
@@ -258,8 +258,8 @@
 
 # packagers: set rc['numerix'] and rc['backend'] here to override the auto
 # defaults, eg
-#rc['numerix'] = numpy
-#rc['backend'] = GTKAgg
+rc['numerix'] = 'numpy'
+rc['backend'] = 'GTKAgg'
 if sys.platform=='win32':
     rc = dict(backend='TkAgg', numerix='Numeric')
 template = file('matplotlibrc.template').read()

matplotlib-0.87.7-tkagg-check.patch:

--- NEW FILE matplotlib-0.87.7-tkagg-check.patch ---
--- matplotlib-0.87.7/setup.py.fix	2006-11-20 19:49:56.000000000 -0900
+++ matplotlib-0.87.7/setup.py	2006-11-20 19:51:03.000000000 -0900
@@ -251,16 +251,9 @@
         print 'Tkinter present but import failed'
         BUILD_TKAGG = 0
     else:
-        try:
-            tk = Tkinter.Tk()
-            tk.withdraw()
-        except Tkinter.TclError:
-            print 'Tkinter present, but window failed to open'
-            BUILD_TKAGG = 0
-        else:
-            BUILD_AGG = 1
-            build_tkagg(ext_modules, packages, NUMERIX)
-            rc['backend'] = 'TkAgg'
+        BUILD_AGG = 1
+        build_tkagg(ext_modules, packages, NUMERIX)
+        rc['backend'] = 'TkAgg'
 
 if BUILD_WXAGG:
     try:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Oct 2006 17:32:24 -0000	1.13
+++ .cvsignore	21 Nov 2006 15:36:32 -0000	1.14
@@ -1 +1 @@
-matplotlib-0.87.6.tar.gz
+matplotlib-0.87.7.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-matplotlib.spec	6 Oct 2006 17:32:24 -0000	1.20
+++ python-matplotlib.spec	21 Nov 2006 15:36:32 -0000	1.21
@@ -1,7 +1,7 @@
 %{!?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.6
+Version:        0.87.7
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -9,7 +9,8 @@
 License:        Python Software Foundation License 
 URL:            http://sourceforge.net/projects/matplotlib
 Source0:        http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
-Patch0:         matplotlib-0.87-matplotlibrc.patch
+Patch0:         matplotlib-0.87.7-matplotlibrc.patch
+Patch1:         matplotlib-0.87.7-tkagg-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
@@ -38,7 +39,8 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
-%patch -p1 -b .matplotlibrc
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b setup.py 
 chmod -x images/*.svg
 
 %build
@@ -71,6 +73,11 @@
 
 
 %changelog
+* Tue Nov  21 2006 Orion Poplawski  0.87.7-1
+- Update to 0.87.7 and fix up the defaults to use numpy
+- Force build of tkagg backend without X server
+- Use src.rpm from Jef Spaleta, closes bug 216578
+
 * Fri Oct  6 2006 Orion Poplawski  0.87.6-1
 - Update to 0.87.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Oct 2006 17:32:24 -0000	1.13
+++ sources	21 Nov 2006 15:36:32 -0000	1.14
@@ -1 +1 @@
-30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz
+cca3d3a644c1a84d6dcf4af8a9856b7b  matplotlib-0.87.7.tar.gz


--- matplotlib-0.87-matplotlibrc.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 15:38:59 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:38:59 -0500
Subject: rpms/beryl-dbus - New directory
Message-ID: <200611211538.kALFcxRD017801@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17796/beryl-dbus

Log Message:
Directory /cvs/extras/rpms/beryl-dbus added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:39:04 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:39:04 -0500
Subject: rpms/beryl-dbus/devel - New directory
Message-ID: <200611211539.kALFd4rs017816@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17796/beryl-dbus/devel

Log Message:
Directory /cvs/extras/rpms/beryl-dbus/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:39:15 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:39:15 -0500
Subject: rpms/beryl-dbus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211539.kALFdFKX017853@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17847

Added Files:
	Makefile import.log 
Log Message:
Setup of module beryl-dbus


--- NEW FILE Makefile ---
# Top level Makefile for module beryl-dbus
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  Tue Nov 21 15:39:20 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:39:20 -0500
Subject: rpms/beryl-dbus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211539.kALFdKKe017868@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17847/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module beryl-dbus


--- 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 Nov 21 15:39:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:39:51 -0500
Subject: rpms/rocksndiamonds/FC-5 rocksndiamonds.spec,1.4,1.5
Message-ID: <200611211539.kALFdpaX017989@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829/FC-5

Modified Files:
	rocksndiamonds.spec 
Log Message:

Somehow, these files didn't get tagged. *shrug*



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-5/rocksndiamonds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rocksndiamonds.spec	21 Nov 2006 15:31:40 -0000	1.4
+++ rocksndiamonds.spec	21 Nov 2006 15:39:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -65,7 +65,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-3
 - add patches from bz 210767
 
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1



From fedora-extras-commits at redhat.com  Tue Nov 21 15:39:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:39:51 -0500
Subject: rpms/rocksndiamonds/devel rocksndiamonds.spec,1.4,1.5
Message-ID: <200611211539.kALFdpQU017993@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829/devel

Modified Files:
	rocksndiamonds.spec 
Log Message:

Somehow, these files didn't get tagged. *shrug*



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rocksndiamonds.spec	21 Nov 2006 15:31:46 -0000	1.4
+++ rocksndiamonds.spec	21 Nov 2006 15:39:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -65,7 +65,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-3
 - add patches from bz 210767
 
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1



From fedora-extras-commits at redhat.com  Tue Nov 21 15:39:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:39:51 -0500
Subject: rpms/rocksndiamonds/FC-6 rocksndiamonds.spec,1.4,1.5
Message-ID: <200611211539.kALFdpst017992@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829/FC-6

Modified Files:
	rocksndiamonds.spec 
Log Message:

Somehow, these files didn't get tagged. *shrug*



Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/FC-6/rocksndiamonds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rocksndiamonds.spec	21 Nov 2006 15:31:45 -0000	1.4
+++ rocksndiamonds.spec	21 Nov 2006 15:39:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -65,7 +65,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-2
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-3
 - add patches from bz 210767
 
 * Fri Sep 15 2006 Tom "spot" Callaway  3.2.2-1



From fedora-extras-commits at redhat.com  Tue Nov 21 15:40:08 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:40:08 -0500
Subject: rpms/beryl-dbus import.log,1.1,1.2
Message-ID: <200611211540.kALFe8hI018038@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17953

Modified Files:
	import.log 
Log Message:
auto-import beryl-dbus-0.1.2-4.fc7 on branch devel from beryl-dbus-0.1.2-4.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/beryl-dbus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 15:39:15 -0000	1.1
+++ import.log	21 Nov 2006 15:39:38 -0000	1.2
@@ -0,0 +1 @@
+beryl-dbus-0_1_2-4_fc7:HEAD:beryl-dbus-0.1.2-4.fc7.src.rpm:1164123586



From fedora-extras-commits at redhat.com  Tue Nov 21 15:40:08 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:40:08 -0500
Subject: rpms/beryl-dbus/devel beryl-dbus.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611211540.kALFe8vp018042@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17953/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-dbus.spec 
Log Message:
auto-import beryl-dbus-0.1.2-4.fc7 on branch devel from beryl-dbus-0.1.2-4.fc7.src.rpm


--- NEW FILE beryl-dbus.spec ---
Name:           beryl-dbus
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        4%{?dist}

Summary:        Beryl OpenGL window and compositing manager dbus plug-in
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}, dbus-devel


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Beryl has a flexible plug-in system, which the
contents of this package take advantage of.


%prep
%setup -q

%build
%configure
# Parallel builds currently broken
#make %{?_smp_mflags}
make


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README
%dir %{_libdir}/beryl
%{_libdir}/beryl/libdbus.so
%{_datadir}/dbus-1/services/beryl.service


%changelog
* Fri Nov 17 2006 Jarod Wilson  0.1.2-4
- Remove Req: dbus, rely on auto-gen dbus lib dep

* Thu Nov 16 2006 Jarod Wilson  0.1.2-3
- Minimize BR:

* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Use upstream tarballs, now that they exist

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- New upstream release

* Mon Nov 06 2006 Jarod Wilson  0.1.1-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-dbus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:39:20 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:39:38 -0000	1.2
@@ -0,0 +1 @@
+beryl-dbus-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-dbus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:39:20 -0000	1.1
+++ sources	21 Nov 2006 15:39:38 -0000	1.2
@@ -0,0 +1 @@
+15e9d90594b8e9ffa59e41f5c766749f  beryl-dbus-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:40:47 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 21 Nov 2006 10:40:47 -0500
Subject: rpms/gossip/FC-6 .cvsignore, 1.16, 1.17 gossip.spec, 1.31,
	1.32 sources, 1.16, 1.17
Message-ID: <200611211540.kALFelXB018300@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gossip/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18118

Modified Files:
	.cvsignore gossip.spec sources 
Log Message:
* Sun Nov 19 2006 Brian Pepple  - 0.19-1
- Update to 0.19.
- Remove X-Fedora category from desktop file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-6/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	17 Oct 2006 00:31:50 -0000	1.16
+++ .cvsignore	21 Nov 2006 15:40:17 -0000	1.17
@@ -1 +1 @@
-gossip-0.18.tar.bz2
+gossip-0.19.tar.bz2


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-6/gossip.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gossip.spec	17 Oct 2006 00:31:50 -0000	1.31
+++ gossip.spec	21 Nov 2006 15:40:17 -0000	1.32
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           gossip
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        Gnome Jabber Client
 
@@ -67,7 +67,6 @@
 
 desktop-file-install --vendor fedora --delete-original	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 
@@ -126,6 +125,10 @@
 
 
 %changelog
+* Sun Nov 19 2006 Brian Pepple  - 0.19-1
+- Update to 0.19.
+- Remove X-Fedora category from desktop file.
+
 * Mon Oct 16 2006 Brian Pepple  - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-6/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Oct 2006 00:31:50 -0000	1.16
+++ sources	21 Nov 2006 15:40:17 -0000	1.17
@@ -1 +1 @@
-bb5be4bcb259c36c64e1809b665f7de6  gossip-0.18.tar.bz2
+49c60c4467d17948f7243a169c65775c  gossip-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:41:25 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:41:25 -0500
Subject: rpms/bdock - New directory
Message-ID: <200611211541.kALFfPBd018406@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401/bdock

Log Message:
Directory /cvs/extras/rpms/bdock added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:41:30 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:41:30 -0500
Subject: rpms/bdock/devel - New directory
Message-ID: <200611211541.kALFfUth018456@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18401/bdock/devel

Log Message:
Directory /cvs/extras/rpms/bdock/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:41:46 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:41:46 -0500
Subject: rpms/bdock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611211541.kALFfkvd018539@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18515/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bdock


--- 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 Nov 21 15:41:41 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:41:41 -0500
Subject: rpms/bdock Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211541.kALFffoM018521@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18515

Added Files:
	Makefile import.log 
Log Message:
Setup of module bdock


--- NEW FILE Makefile ---
# Top level Makefile for module bdock
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  Tue Nov 21 15:42:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 21 Nov 2006 10:42:02 -0500
Subject: rpms/rocksndiamonds/devel rocksndiamonds-YN.patch, NONE,
	1.1 rocksndiamonds-highscore.patch, NONE,
	1.1 rocksndiamonds.spec, 1.5, 1.6
Message-ID: <200611211542.kALFg2FY018587@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rocksndiamonds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18375

Modified Files:
	rocksndiamonds.spec 
Added Files:
	rocksndiamonds-YN.patch rocksndiamonds-highscore.patch 
Log Message:

Actually cvs add the new patches in the devel branch. Idiot.


rocksndiamonds-YN.patch:

--- NEW FILE rocksndiamonds-YN.patch ---
--- rocksndiamonds-3.2.2/src/tools.c.yesno	2006-08-29 19:50:13.000000000 +0200
+++ rocksndiamonds-3.2.2/src/tools.c	2006-10-14 14:33:15.000000000 +0200
@@ -2513,6 +2513,18 @@
 	    case KSYM_Escape:
 	      result = 0;
 	      break;
+            
+            case KSYM_y:
+            case KSYM_Y:
+              if (req_state & REQ_ASK)
+                result = TRUE;
+              break;
+
+            case KSYM_n:
+            case KSYM_N:
+              if (req_state & REQ_ASK)
+                result = FALSE;
+              break;
 
 	    default:
 	      break;

rocksndiamonds-highscore.patch:

--- NEW FILE rocksndiamonds-highscore.patch ---
--- rocksndiamonds-3.2.2/src/libgame/setup.c.hs	2006-08-20 14:05:41.000000000 +0200
+++ rocksndiamonds-3.2.2/src/libgame/setup.c	2006-10-14 14:56:13.000000000 +0200
@@ -126,7 +126,11 @@
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  char *data_dir = getUserGameDataDir();
+#else
   char *data_dir = getCommonDataDir();
+#endif
   char *score_subdir = SCORES_DIRECTORY;
 
   checked_free(score_dir);
@@ -781,7 +785,11 @@
 
 void InitScoreDirectory(char *level_subdir)
 {
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+  createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+#else
   createDirectory(getCommonDataDir(), "common data", PERMS_PUBLIC);
+#endif
   createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }


Index: rocksndiamonds.spec
===================================================================
RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rocksndiamonds.spec	21 Nov 2006 15:39:21 -0000	1.5
+++ rocksndiamonds.spec	21 Nov 2006 15:41:32 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		rocksndiamonds
 Version:	3.2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	Underground digging game
@@ -65,6 +65,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-4
+- actually cvs add the devel patches
+
 * Tue Nov 21 2006 Tom "spot" Callaway  3.2.2-3
 - add patches from bz 210767
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:42:33 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:42:33 -0500
Subject: rpms/bdock import.log,1.1,1.2
Message-ID: <200611211542.kALFgXs4018665@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18590

Modified Files:
	import.log 
Log Message:
auto-import bdock-0.1.2-4.fc7 on branch devel from bdock-0.1.2-4.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bdock/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 15:41:41 -0000	1.1
+++ import.log	21 Nov 2006 15:42:03 -0000	1.2
@@ -0,0 +1 @@
+bdock-0_1_2-4_fc7:HEAD:bdock-0.1.2-4.fc7.src.rpm:1164123731



From fedora-extras-commits at redhat.com  Tue Nov 21 15:42:38 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:42:38 -0500
Subject: rpms/bdock/devel bdock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611211542.kALFgcGw018669@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/bdock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18590/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bdock.spec 
Log Message:
auto-import bdock-0.1.2-4.fc7 on branch devel from bdock-0.1.2-4.fc7.src.rpm


--- NEW FILE bdock.spec ---
Name:           bdock
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        4%{?dist}

Summary:        Beryl project's replacement windowmaker dock
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Source only available via svn right now
# svn://svn.beryl-project.org/beryl/tags/release-%{version}/%{name}
Source0:        %{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}
BuildRequires:  libtool, gettext-devel
BuildRequires:  libwnck-devel, gtk2-devel >= 2.8.0


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Bdock is a replacement for the windowmaker dock.


%prep
%setup -q
# Make pixmaps install where binary expects them
# (fixed in upstream svn).
perl -pi -e 's/pixmaps$/bdock/g' pixmaps/Makefile.am
autoreconf -v --install

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_bindir}/bdock
%dir %{_datadir}/bdock
%{_datadir}/bdock/*

%changelog
* Mon Nov 20 2006 Jarod Wilson  0.1.2-4
- Make pixmaps install where binary expects them

* Thu Nov 14 2006 Jarod Wilson  0.1.2-3
- Trim BR:

* Tue Nov 14 2006 Jarod Wilson  0.1.2-2
- Remove zero-length doc files (note to self, don't forget
  to re-include them if/when they have content...)

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bdock/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:41:46 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:42:08 -0000	1.2
@@ -0,0 +1 @@
+bdock-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bdock/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:41:46 -0000	1.1
+++ sources	21 Nov 2006 15:42:08 -0000	1.2
@@ -0,0 +1 @@
+104825e8ef5ffa2f5e2ec5d8642d5b68  bdock-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:44:46 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:44:46 -0500
Subject: rpms/heliodor - New directory
Message-ID: <200611211544.kALFik5s018810@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18806/heliodor

Log Message:
Directory /cvs/extras/rpms/heliodor added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:44:51 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:44:51 -0500
Subject: rpms/heliodor/devel - New directory
Message-ID: <200611211544.kALFipOw018835@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18806/heliodor/devel

Log Message:
Directory /cvs/extras/rpms/heliodor/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:45:02 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:45:02 -0500
Subject: rpms/heliodor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211545.kALFj2f7018870@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864

Added Files:
	Makefile import.log 
Log Message:
Setup of module heliodor


--- NEW FILE Makefile ---
# Top level Makefile for module heliodor
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  Tue Nov 21 15:45:07 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:45:07 -0500
Subject: rpms/heliodor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211545.kALFj7Gd018885@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18864/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module heliodor


--- 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 Nov 21 15:45:56 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:45:56 -0500
Subject: rpms/heliodor import.log,1.1,1.2
Message-ID: <200611211545.kALFjuHC018962@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18929

Modified Files:
	import.log 
Log Message:
auto-import heliodor-0.1.2-4.fc7 on branch devel from heliodor-0.1.2-4.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/heliodor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 15:45:02 -0000	1.1
+++ import.log	21 Nov 2006 15:45:26 -0000	1.2
@@ -0,0 +1 @@
+heliodor-0_1_2-4_fc7:HEAD:heliodor-0.1.2-4.fc7.src.rpm:1164123934



From fedora-extras-commits at redhat.com  Tue Nov 21 15:45:56 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:45:56 -0500
Subject: rpms/heliodor/devel heliodor-0.1.2-metacity217.patch, NONE,
	1.1 heliodor.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211546.kALFjuWJ018966@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/heliodor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18929/devel

Modified Files:
	.cvsignore sources 
Added Files:
	heliodor-0.1.2-metacity217.patch heliodor.spec 
Log Message:
auto-import heliodor-0.1.2-4.fc7 on branch devel from heliodor-0.1.2-4.fc7.src.rpm

heliodor-0.1.2-metacity217.patch:

--- NEW FILE heliodor-0.1.2-metacity217.patch ---
diff -ur heliodor-0.1.2.orig/src/main.c heliodor-0.1.2/src/main.c
--- heliodor-0.1.2.orig/src/main.c	2006-11-09 11:07:50.000000000 -0500
+++ heliodor-0.1.2/src/main.c	2006-11-17 14:17:15.000000000 -0500
@@ -1383,7 +1383,7 @@
 
     corners_xregion = XCreateRegion ();
 
-    if (fgeom->top_left_corner_rounded)
+    if (fgeom->top_left_corner_rounded_radius)
     {
 	xrect.x = 0;
 	xrect.y = 0;
@@ -1409,7 +1409,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->top_right_corner_rounded)
+    if (fgeom->top_right_corner_rounded_radius)
     {
 	xrect.x = width - 5;
 	xrect.y = 0;
@@ -1438,7 +1438,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->bottom_left_corner_rounded)
+    if (fgeom->bottom_left_corner_rounded_radius)
     {
 	xrect.x = 0;
 	xrect.y = height - 1;
@@ -1464,7 +1464,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->bottom_right_corner_rounded)
+    if (fgeom->bottom_right_corner_rounded_radius)
     {
 	xrect.x = width - 5;
 	xrect.y = height - 1;
@@ -1715,16 +1715,16 @@
 	    static decor_color_t color = { 0.0, 0.0, 0.0 };
 	    int			 corners = 0;
 
-	    if (fgeom.top_left_corner_rounded)
+	    if (fgeom.top_left_corner_rounded_radius)
 		corners |= CORNER_TOPLEFT;
 
-	    if (fgeom.top_right_corner_rounded)
+	    if (fgeom.top_right_corner_rounded_radius)
 		corners |= CORNER_TOPRIGHT;
 
-	    if (fgeom.bottom_left_corner_rounded)
+	    if (fgeom.bottom_left_corner_rounded_radius)
 		corners |= CORNER_BOTTOMLEFT;
 
-	    if (fgeom.bottom_right_corner_rounded)
+	    if (fgeom.bottom_right_corner_rounded_radius)
 		corners |= CORNER_BOTTOMRIGHT;
 
 	    if (d->state & (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
Only in heliodor-0.1.2.orig/src: .main.c.swp


--- NEW FILE heliodor.spec ---
Name:           heliodor
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        4%{?dist}

Summary:        Beryl window decorator with Metacity theme support
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Source only available via svn right now
# svn://svn.beryl-project.org/beryl/tags/release-%{version}/%{name}
Source0:        %{name}-%{version}.tar.bz2
Patch0:         heliodor-0.1.2-metacity217.patch

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}, gnome-desktop-devel
BuildRequires:  metacity, control-center-devel
BuildRequires:  libtool, gettext-devel
BuildRequires:  libwnck-devel


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Heliodor is a gtk-window-decorator for use with beryl
that supports using Metacity themes.


%prep
%setup -q
%if "%{?fedora}" >= "7"
%patch0 -p1 -b .metacity217
%endif
autoreconf -v --install


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/window-manager-settings/libberyl.so
%{_bindir}/heliodor
%{_datadir}/gnome/wm-properties/beryl.desktop


%changelog
* Mon Nov 20 2006 Jarod Wilson  0.1.2-4
- Remove some R:, let auto lib deps pull them in

* Fri Nov 17 2006 Jarod Wilson  0.1.2-3
- Fix for Metacity 2.17+ changes

* Thu Nov 16 2006 Jarod Wilson  0.1.2-2
- Trim BR:

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heliodor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:45:07 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:45:26 -0000	1.2
@@ -0,0 +1 @@
+heliodor-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heliodor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:45:07 -0000	1.1
+++ sources	21 Nov 2006 15:45:26 -0000	1.2
@@ -0,0 +1 @@
+2594e689f6f319f8f42a5ef582aac307  heliodor-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:47:08 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:47:08 -0500
Subject: rpms/aquamarine - New directory
Message-ID: <200611211547.kALFl8SN019043@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19039/aquamarine

Log Message:
Directory /cvs/extras/rpms/aquamarine added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:47:13 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:47:13 -0500
Subject: rpms/aquamarine/devel - New directory
Message-ID: <200611211547.kALFlD8m019056@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19039/aquamarine/devel

Log Message:
Directory /cvs/extras/rpms/aquamarine/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 15:47:24 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:47:24 -0500
Subject: rpms/aquamarine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211547.kALFlOBc019086@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19080

Added Files:
	Makefile import.log 
Log Message:
Setup of module aquamarine


--- NEW FILE Makefile ---
# Top level Makefile for module aquamarine
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  Tue Nov 21 15:47:29 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:47:29 -0500
Subject: rpms/aquamarine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211547.kALFlThc019101@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19080/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aquamarine


--- 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 Nov 21 15:48:16 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:48:16 -0500
Subject: rpms/aquamarine import.log,1.1,1.2
Message-ID: <200611211548.kALFmGj2019174@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19144

Modified Files:
	import.log 
Log Message:
auto-import aquamarine-0.1.2-3.fc7 on branch devel from aquamarine-0.1.2-3.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 15:47:24 -0000	1.1
+++ import.log	21 Nov 2006 15:47:46 -0000	1.2
@@ -0,0 +1 @@
+aquamarine-0_1_2-3_fc7:HEAD:aquamarine-0.1.2-3.fc7.src.rpm:1164124074



From fedora-extras-commits at redhat.com  Tue Nov 21 15:48:16 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 10:48:16 -0500
Subject: rpms/aquamarine/devel aquamarine.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611211548.kALFmGPR019178@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/aquamarine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19144/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aquamarine.spec 
Log Message:
auto-import aquamarine-0.1.2-3.fc7 on branch devel from aquamarine-0.1.2-3.fc7.src.rpm


--- NEW FILE aquamarine.spec ---
Name:           aquamarine
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        3%{?dist}

Summary:        Themeable window decorator and compositing manager for Beryl
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Source only available via svn right now
# svn://svn.beryl-project.org/beryl/tags/release-%{version}/%{name}
Source0:        %{name}-%{version}.tar.bz2

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}
BuildRequires:  qt-devel, kdelibs-devel, kdebase-devel
BuildRequires:  libtool


%description
Aquamarine is themeable window decorator and compositing
manager for Beryl. Launch Theme Manager from
beryl-manager to change themes. Aquamarine is intended
for use with KDE.

%prep
%setup -q
make -f admin/Makefile.common svn

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/aquamarine


%changelog
* Fri Nov 17 2006 Jarod Wilson  0.1.2-3
- Remove R: qt, kdelibs, rely on auto-gen lib deps

* Thu Nov 16 2006 Jarod Wilson  0.1.2-2
- Trim BR:

* Fri Nov 10 2006 Jarod Wilson  0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:47:29 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:47:46 -0000	1.2
@@ -0,0 +1 @@
+aquamarine-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aquamarine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:47:29 -0000	1.1
+++ sources	21 Nov 2006 15:47:46 -0000	1.2
@@ -0,0 +1 @@
+72f02f7d8b0c6fed9ece870266b1fd8f  aquamarine-0.1.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 15:55:57 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 10:55:57 -0500
Subject: rpms/lib3ds/FC-6 lib3ds.spec,1.11,1.12
Message-ID: <200611211555.kALFtvvh019279@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19254

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
- Add Provides: *-static.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-6/lib3ds.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lib3ds.spec	5 Sep 2006 09:09:13 -0000	1.11
+++ lib3ds.spec	21 Nov 2006 15:55:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -42,6 +42,7 @@
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
+Provides:	lib3ds-static = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
@@ -72,6 +73,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
+- Add Provides: *-static.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-9
 - Mass rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:57:33 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 10:57:33 -0500
Subject: rpms/lib3ds/FC-5 lib3ds.spec,1.10,1.11
Message-ID: <200611211557.kALFvXtl019389@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19342

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
- Add Provides: *-static.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-5/lib3ds.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lib3ds.spec	28 Feb 2006 17:53:30 -0000	1.10
+++ lib3ds.spec	21 Nov 2006 15:57:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        7%{?dist}
+Release:        10%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -42,6 +42,7 @@
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
+Provides:	lib3ds-static = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
@@ -72,6 +73,15 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
+- Add Provides: *-static.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-9
+- Mass rebuild.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-8
+- Mass rebuild.
+
 * Thu Feb 28 2006 Ralf Corsepius  - 1.2.0-7
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:57:40 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 21 Nov 2006 10:57:40 -0500
Subject: rpms/lat/devel lat.spec,1.11,1.12
Message-ID: <200611211557.kALFvePi019397@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/lat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19361

Modified Files:
	lat.spec 
Log Message:
Add missing runtime dep, gnome-sharp


Index: lat.spec
===================================================================
RCS file: /cvs/extras/rpms/lat/devel/lat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lat.spec	20 Oct 2006 15:00:39 -0000	1.11
+++ lat.spec	21 Nov 2006 15:57:10 -0000	1.12
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.1.1
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPL
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
@@ -13,7 +13,7 @@
 BuildRequires:      gtk-sharp2 >= 2.8.0
 %else
 BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
-Requires:           scrollkeeper
+Requires:           scrollkeeper, gnome-sharp
 %endif
 Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp
 
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Tue Nov 21 2006 Paul Howarth  1.2.1.1-2
+- Add missing runtime dep, gnome-sharp
+
 * Fri Oct 20 2006 Paul Howarth  1.2.1.1-1
 - Update to 1.2.1.1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 15:59:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Tue, 21 Nov 2006 10:59:11 -0500
Subject: rpms/lib3ds/FC-4 lib3ds.spec,1.8,1.9
Message-ID: <200611211559.kALFxBcW019508@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19455

Modified Files:
	lib3ds.spec 
Log Message:
* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
- Add Provides: *-static.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-4/lib3ds.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lib3ds.spec	5 Jan 2006 14:15:31 -0000	1.8
+++ lib3ds.spec	21 Nov 2006 15:58:41 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        6%{?dist}
+Release:        10%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -42,6 +42,7 @@
 %package        devel
 Summary:        %summary
 Group:          Development/Libraries
+Provides:	lib3ds-static = %{version}-%{release}
 
 %description    devel
 Development files for lib3ds
@@ -72,6 +73,18 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Nov 14 2006 Ralf Cors??pius  - 1.2.0-10
+- Add Provides: *-static.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-9
+- Mass rebuild.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.2.0-8
+- Mass rebuild.
+
+* Thu Feb 28 2006 Ralf Corsepius  - 1.2.0-7
+- Rebuild.
+
 * Thu Jan 05 2006 Ralf Corsepius  - 1.2.0-6
 - PR 176665: Apply upstream patch.
 - Add %%dist.



From fedora-extras-commits at redhat.com  Tue Nov 21 16:00:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 21 Nov 2006 11:00:01 -0500
Subject: rpms/lat/FC-6 lat.spec,1.11,1.12
Message-ID: <200611211600.kALG014X019595@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/lat/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19564

Modified Files:
	lat.spec 
Log Message:
Add missing runtime dep, gnome-sharp


Index: lat.spec
===================================================================
RCS file: /cvs/extras/rpms/lat/FC-6/lat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lat.spec	20 Oct 2006 15:00:39 -0000	1.11
+++ lat.spec	21 Nov 2006 15:59:31 -0000	1.12
@@ -1,7 +1,7 @@
 Name:               lat
 Summary:            LDAP Administration Tool
 Version:            1.2.1.1
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPL
 Group:              Applications/Productivity
 Url:                http://dev.mmgsecurity.com/projects/lat/
@@ -13,7 +13,7 @@
 BuildRequires:      gtk-sharp2 >= 2.8.0
 %else
 BuildRequires:      gnome-sharp-devel, gtk-sharp2-devel >= 2.8.0, dbus-sharp-devel
-Requires:           scrollkeeper
+Requires:           scrollkeeper, gnome-sharp
 %endif
 Requires:           mono-data, gtk-sharp2, dbus-sharp, avahi-sharp
 
@@ -111,6 +111,9 @@
 %{_libdir}/pkgconfig/lat-plugins.pc
 
 %changelog
+* Tue Nov 21 2006 Paul Howarth  1.2.1.1-2
+- Add missing runtime dep, gnome-sharp
+
 * Fri Oct 20 2006 Paul Howarth  1.2.1.1-1
 - Update to 1.2.1.1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 16:03:45 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 11:03:45 -0500
Subject: owners owners.list,1.1982,1.1983
Message-ID: <200611211603.kALG3jhf019940@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19895

Modified Files:
	owners.list 
Log Message:
Add aquamarine, bdock, beryl-dbus and heliodor


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1982
retrieving revision 1.1983
diff -u -r1.1982 -r1.1983
--- owners.list	21 Nov 2006 15:00:32 -0000	1.1982
+++ owners.list	21 Nov 2006 16:03:15 -0000	1.1983
@@ -64,6 +64,7 @@
 Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|aquamarine|Themeable window decorator and compositing manager for Beryl|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|archmage|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|ardour|Multichannel Digital Audio Workstation|green at redhat.com|extras-qa at fedoraproject.org|
@@ -106,9 +107,11 @@
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|bdock|Beryl project's replacement windowmaker dock|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky|Beneath a Steel Sky - Adventure Game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beneath-a-steel-sky-cd|Beneath a Steel Sky - Adventure Game - CD version|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-core|Beryl OpenGL window and compositing manager|jwilson at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|beryl-dbus|Beryl OpenGL window and compositing manager dbus plugin|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-manager|Beryl OpenGL window and compositing manager control application|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-plugins|Beryl OpenGL window and compositing manager plugins|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|beryl-settings|Beryl OpenGL window and compositing manager settings utility|jwilson at redhat.com|extras-qa at fedoraproject.org|
@@ -682,6 +685,7 @@
 Fedora Extras|hdf|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|pertusus at free.fr
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|heliodor|Beryl window decorator with Metacity theme support|jwilson at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|HelixPlayer|Open source media player based on the Helix framework|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 16:06:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 21 Nov 2006 11:06:09 -0500
Subject: rpms/jd/devel .cvsignore, 1.19, 1.20 jd.spec, 1.26, 1.27 sources,
	1.19, 1.20
Message-ID: <200611211606.kALG69j0019993@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19974

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 21 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061121
- cvs 061121 (25:00 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	21 Nov 2006 07:41:29 -0000	1.19
+++ .cvsignore	21 Nov 2006 16:05:39 -0000	1.20
@@ -1 +1 @@
-jd-1.8.1-cvs061120.tgz
+jd-1.8.1-cvs061121.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jd.spec	21 Nov 2006 07:41:29 -0000	1.26
+++ jd.spec	21 Nov 2006 16:05:39 -0000	1.27
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061120
+%define         strtag        cvs061121
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Nov 20 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061120
-- cvs 061120 (23:50 JST)
+* Tue Nov 21 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061121
+- cvs 061121 (25:00 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	21 Nov 2006 07:41:29 -0000	1.19
+++ sources	21 Nov 2006 16:05:39 -0000	1.20
@@ -1 +1 @@
-fe1f6b3350d0f59dc0e8c832caed26d8  jd-1.8.1-cvs061120.tgz
+c26742d0e0b634d5a8ad49bc6cb7fd04  jd-1.8.1-cvs061121.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:07:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 21 Nov 2006 11:07:48 -0500
Subject: rpms/prboom/devel .cvsignore, 1.8, 1.9 prboom.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200611211607.kALG7mNv020080@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20021

Modified Files:
	.cvsignore prboom.spec sources 
Log Message:
Update to 2.4.7




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2006 03:01:59 -0000	1.8
+++ .cvsignore	21 Nov 2006 16:07:18 -0000	1.9
@@ -1 +1 @@
-prboom-2.4.6.tar.gz
+prboom-2.4.7.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- prboom.spec	18 Oct 2006 03:01:59 -0000	1.12
+++ prboom.spec	21 Nov 2006 16:07:18 -0000	1.13
@@ -1,14 +1,14 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.4.6
+Version:        2.4.7
 Release:        1%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://prboom.sourceforge.net/
-Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.6.tar.gz
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.7.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -58,6 +58,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Nov 19 2006 Wart  2.4.7-1
+- Update to 2.4.7
+
 * Tue Oct 17 2006 Wart  2.4.6-1
 - Update to 2.4.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2006 03:01:59 -0000	1.8
+++ sources	21 Nov 2006 16:07:18 -0000	1.9
@@ -1 +1 @@
-0f60f3ad6a8dad5b2c6d4360f181ac22  prboom-2.4.6.tar.gz
+9942f521764d7f89df2218a456da4f02  prboom-2.4.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:19:29 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Tue, 21 Nov 2006 11:19:29 -0500
Subject: owners owners.list,1.1983,1.1984
Message-ID: <200611211619.kALGJTRr020262@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20205

Modified Files:
	owners.list 
Log Message:
Added openvrml.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1983
retrieving revision 1.1984
diff -u -r1.1983 -r1.1984
--- owners.list	21 Nov 2006 16:03:15 -0000	1.1983
+++ owners.list	21 Nov 2006 16:18:59 -0000	1.1984
@@ -1237,6 +1237,7 @@
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|optipng|A PNG optimizer and converter|opensource at till.name|extras-qa at fedoraproject.org|
+Fedora Extras|openvrml|VRML/X3D runtime library and player|braden at endoframe.com|extras-qa at fedoraproject.org|
 Fedora Extras|orage|Time-managing application for Xfce4|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ORBit|CORBA Object Request Broker library for GNOME-1 compatibility|paul at city-fan.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 16:31:55 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 21 Nov 2006 11:31:55 -0500
Subject: rpms/gnash/devel .cvsignore, 1.2, 1.3 gnash.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <200611211631.kALGVtCt021214@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21192

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Sat Nov  6 2006 Patrice Dumas  0.7.2-1
- update for 0.7.2 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Aug 2006 08:39:02 -0000	1.2
+++ .cvsignore	21 Nov 2006 16:31:25 -0000	1.3
@@ -1 +1 @@
-gnash-0.7.1.tar.bz2
+gnash-0.7.2.tar.bz2


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnash.spec	4 Oct 2006 22:21:54 -0000	1.3
+++ gnash.spec	21 Nov 2006 16:31:25 -0000	1.4
@@ -1,24 +1,27 @@
 Name:           gnash
-Version:        0.7.1
-Release:        9%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
-Source1:        gnash-README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel libjpeg-devel libogg-devel libXmu-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
+BuildRequires:  boost-devel curl-devel 
+# the opengl devel packages are required by gtkglext-devel
+# monolithic Xorg
+#BuildRequires:  xorg-x11-devel
+# modular Xorg 
+#BuildRequires:  libGLU-devel libGL-devel
+BuildRequires:  SDL-devel 
 BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel
-## GStreamer isn't used yet, but will be in the near future.
-#BuildRequires:  gstreamer-devel
 BuildRequires:  docbook2X
+BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  scrollkeeper
-BuildRequires:  automake, libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -26,23 +29,16 @@
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Patch1:         gnash-configure-pkgconfig.patch
-Patch2:		gnash-continue_on_info_install_error.patch
-Patch3:         gnash-plugin-tempfile-dir.patch
 
 %description
 Gnash is a GNU Flash movie player based on GameSWF,
 and supports many SWF v7 features.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %package plugin
-Summary:   Flash movie player plugin for Mozilla Browser
+Summary:   Web-client flash movie player plugin 
 Requires:  %{name} = %{version}-%{release}
 # this doesn't prevent wrong dependencies, in case a package
-# provides %{_libdir}/mozilla/plugins (like kdebase for konqueror)
+# provides %%{_libdir}/mozilla/plugins (like kdebase for konqueror)
 # and another unrelated webbrowser is installed, like w3m-el.
 # Moreover konqueror could provide webclient some day
 Requires:  %{_libdir}/mozilla/plugins webclient
@@ -51,10 +47,6 @@
 %description plugin
 The gnash flash movie player plugin for firefox or mozilla.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %package klash
 Summary:   Konqueror flash movie player plugin
 Requires:  %{name} = %{version}-%{release}
@@ -63,35 +55,32 @@
 %description klash
 The gnash flash movie player plugin for Konqueror.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %prep
 %setup -q
-cp -p %{SOURCE1} README.fedora
-%patch1 -p1 -b .1
-%patch2 -p0 -b .2
-%patch3 -p0 -b .3
-autoreconf
-
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-klash --disable-rpath \
-  --disable-dependency-tracking --with-qtdir=$QTDIR
+  --enable-ghelp --enable-docbook --enable-sound=GST \
+  --disable-dependency-tracking --disable-rpath \
+  --with-qtdir=$QTDIR
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,so}
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,18 +90,15 @@
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 
-
 %preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
-
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
@@ -121,19 +107,16 @@
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
+%{_libdir}/libgnash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/
-%{_libdir}/libgnash*.so.*
-
 
 %files plugin
 %defattr(-,root,root,-)
-%doc README.fedora
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
-
 %files klash
 %defattr(-,root,root,-)
 %{_bindir}/klash
@@ -142,13 +125,15 @@
 %{_datadir}/config/klashrc
 %{_datadir}/services/klash_part.desktop
 
-
 %changelog
+* Sat Nov  6 2006 Patrice Dumas  0.7.2-1
+- update for 0.7.2 release.
+
 * Thu Oct 05 2006 Christian Iseli  0.7.1-9
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Sun Sep 24 2006 Patrice Dumas  0.7.1-8
-- plugin requires %{_libdir}/mozilla/plugins. Fix (incompletly and 
+- plugin requires %%{_libdir}/mozilla/plugins. Fix (incompletly and 
   temporarily, but there is no better solution yet) #207613
 
 * Sun Aug 27 2006 Patrice Dumas  - 0.7.1-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Aug 2006 08:39:02 -0000	1.2
+++ sources	21 Nov 2006 16:31:25 -0000	1.3
@@ -1 +1 @@
-d860981aeaac0fc941a28abc3c24223c  gnash-0.7.1.tar.bz2
+ccef0f45be01a4c2992b46c2363a514f  gnash-0.7.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 16:38:56 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 21 Nov 2006 11:38:56 -0500
Subject: rpms/espeak/devel .cvsignore, 1.2, 1.3 espeak.spec, 1.1,
	1.2 espeak_program_name.patch, 1.1, 1.2 sources, 1.2,
	1.3 compiledict-amd64_sizeof.patch, 1.1,
	NONE makefile_install_target.patch, 1.1, NONE
Message-ID: <200611211638.kALGcu0T021356@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21329

Modified Files:
	.cvsignore espeak.spec espeak_program_name.patch sources 
Removed Files:
	compiledict-amd64_sizeof.patch makefile_install_target.patch 
Log Message:
- Update to version 1.17
- Removed "makefile install target" patch as it has been included upstream
- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
- Minor modification to "espeak program name" patch to allow patching current version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 17:28:19 -0000	1.2
+++ .cvsignore	21 Nov 2006 16:38:26 -0000	1.3
@@ -1 +1 @@
-espeak-1.16-source.zip
+espeak-1.17-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/espeak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak.spec	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak.spec	21 Nov 2006 16:38:26 -0000	1.2
@@ -1,16 +1,14 @@
 Name:           espeak
-Version:        1.16
-Release:        4%{?dist}
+Version:        1.17
+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-1.16-source.zip
+Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
 Patch0:         makefile_lpthread.patch
-Patch1:         makefile_install_target.patch
-Patch2:         compiledict-amd64_sizeof.patch
-Patch3:         espeak_program_name.patch
+Patch1:         espeak_program_name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -43,9 +41,7 @@
 %setup -q -n espeak-%{version}-source
 chmod 0644 src/* 
 %patch0 -p1 -b .pthread
-%patch1 -p1 -b .install_target
-%patch2 -p1 -b .amd64sizeof
-%patch3 -p1 -b .espeak_name
+%patch1 -p1 -b .espeak_name
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
@@ -91,6 +87,12 @@
 
 
 %changelog
+* Mon Nov 20 2006 Francois Aucamp  - 1.17-1
+- Update to version 1.17
+- Removed "makefile install target" patch as it has been included upstream
+- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
+- Minor modification to "espeak program name" patch to allow patching current version
+
 * Tue Nov 07 2006 Francois Aucamp  - 1.16-4
 - Modified patch steps to create backups with different suffixes
 - Renamed patch file extensions to .patch

espeak_program_name.patch:

Index: espeak_program_name.patch
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/espeak_program_name.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak_program_name.patch	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak_program_name.patch	21 Nov 2006 16:38:26 -0000	1.2
@@ -263,7 +263,7 @@
 @@ -6,7 +6,7 @@
  DATADIR=/usr/share/espeak-data
  
- RELEASE = 1.16
+ RELEASE = 1.17
 -BIN_NAME = speak
 +BIN_NAME = espeak
  LIB_NAME = libespeak.so


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 17:28:19 -0000	1.2
+++ sources	21 Nov 2006 16:38:26 -0000	1.3
@@ -1 +1 @@
-c376ea94cddda90b093f231926f7ba44  espeak-1.16-source.zip
+6deb00b3fc73b0ef0cc6687b4cfc7ae2  espeak-1.17-source.zip


--- compiledict-amd64_sizeof.patch DELETED ---


--- makefile_install_target.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 16:43:02 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Tue, 21 Nov 2006 11:43:02 -0500
Subject: rpms/php-pear-Services-Weather/devel php-pear-Services-Weather.spec,
	NONE, 1.1 xml2changelog, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611211643.kALGh2Qx021501@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/php-pear-Services-Weather/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21473

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-Services-Weather.spec xml2changelog 
Log Message:
	upload



--- NEW FILE php-pear-Services-Weather.spec ---
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%define pear_name Services_Weather

Name:           php-pear-Services-Weather
Version:        1.4.0
Release:        2%{?dist}
Summary:        This class acts as an interface to various online weather-services

Group:          Development/Libraries
License:        BSD
URL:            http://pear.php.net/package/Services_Weather
Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source2:        xml2changelog
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
Provides:       php-pear(%{pear_name}) = %{version}

Requires:       php-pear(PEAR) php-pear(HTTP_Request) >= 1.2.0
Requires(hint): php-pear(Net_FTP) >= 1.3.1, php-pear(Cache) >= 1.5.3, php-pear(DB) >= 1.4.0
Requires(hint): php-pear(SOAP) >= 0.7.5, php-pear(XML_Serializer) >= 0.8

%description
Services_Weather searches for given locations and retrieves current
weather data and, dependent on the used service, also forecasts.
Up to now, GlobalWeather from CapeScience, Weather XML from EJSE (US
only), a XOAP service from Weather.com and METAR/TAF from NOAA are
supported. Further services will get included, if they become available, 
have a usable API and are properly documented.

%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}


%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.


%install
rm -rf $RPM_BUILD_ROOT docdir
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml

# Move documentation
mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir


# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*

# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}

# Make buildMetarDB.php working
sed -i -e s@/usr/local/bin/php@%{_bindir}/php@ $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/buildMetarDB.php
chmod +x $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/buildMetarDB.php

%clean
rm -rf $RPM_BUILD_ROOT


%post
%{__pear} install --nodeps --soft --force --register-only \
    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :

%postun
if [ $1 -eq 0 ] ; then
    %{__pear} uninstall --nodeps --ignore-errors --register-only \
        %{pear_name} >/dev/null || :
fi


%files
%defattr(-,root,root,-)
%doc CHANGELOG docdir/*

%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/Services
%{pear_datadir}/%{pear_name}


%changelog
* Sat Nov 18 2006 Remi Collet  1.4.0-2
- Unobfuscate sed command

* Sat Nov 04 2006 Remi Collet  1.4.0-1
- initial RPM (generated + cleanup)
- add genarated CHANGELOG
- fix buildMetarDB.php


--- NEW FILE xml2changelog ---
= "2"){ // Package.xml V 2.0
	printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
		$xml->version->release, $xml->stability->release, 
		$xml->version->api, $xml->stability->api, 
		$xml->date, $xml->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
			$rel->version->release, $rel->stability->release, 
			$rel->version->api, $rel->stability->api, 
			$rel->date, $rel->notes);
} else { // Package.xml V 1.0
	printf("* Version %s (%s) - %s\n\n%s\n\n",
		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);

	foreach($xml->changelog->release as $rel)
		printf("* Version %s (%s) - %s\n\n%s\n\n",
			$rel->version, $rel->state, $rel->date, $rel->notes);
}
?>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Services-Weather/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 06:39:13 -0000	1.1
+++ .cvsignore	21 Nov 2006 16:42:32 -0000	1.2
@@ -0,0 +1 @@
+Services_Weather-1.4.0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Services-Weather/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 06:39:13 -0000	1.1
+++ sources	21 Nov 2006 16:42:32 -0000	1.2
@@ -0,0 +1 @@
+a83fbf5e2e7ffd22219c513cfefe6b52  Services_Weather-1.4.0.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:44:22 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 21 Nov 2006 11:44:22 -0500
Subject: rpms/espeak/FC-6 .cvsignore, 1.2, 1.3 espeak.spec, 1.1,
	1.2 espeak_program_name.patch, 1.1, 1.2 sources, 1.2,
	1.3 compiledict-amd64_sizeof.patch, 1.1,
	NONE makefile_install_target.patch, 1.1, NONE
Message-ID: <200611211644.kALGiMMk021581@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21515

Modified Files:
	.cvsignore espeak.spec espeak_program_name.patch sources 
Removed Files:
	compiledict-amd64_sizeof.patch makefile_install_target.patch 
Log Message:
- Update to version 1.17
- Removed "makefile install target" patch as it has been included upstream
- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
- Minor modification to "espeak program name" patch to allow patching current version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 17:28:19 -0000	1.2
+++ .cvsignore	21 Nov 2006 16:43:52 -0000	1.3
@@ -1 +1 @@
-espeak-1.16-source.zip
+espeak-1.17-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/espeak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak.spec	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak.spec	21 Nov 2006 16:43:52 -0000	1.2
@@ -1,16 +1,14 @@
 Name:           espeak
-Version:        1.16
-Release:        4%{?dist}
+Version:        1.17
+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-1.16-source.zip
+Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
 Patch0:         makefile_lpthread.patch
-Patch1:         makefile_install_target.patch
-Patch2:         compiledict-amd64_sizeof.patch
-Patch3:         espeak_program_name.patch
+Patch1:         espeak_program_name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -43,9 +41,7 @@
 %setup -q -n espeak-%{version}-source
 chmod 0644 src/* 
 %patch0 -p1 -b .pthread
-%patch1 -p1 -b .install_target
-%patch2 -p1 -b .amd64sizeof
-%patch3 -p1 -b .espeak_name
+%patch1 -p1 -b .espeak_name
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
@@ -91,6 +87,12 @@
 
 
 %changelog
+* Mon Nov 20 2006 Francois Aucamp  - 1.17-1
+- Update to version 1.17
+- Removed "makefile install target" patch as it has been included upstream
+- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
+- Minor modification to "espeak program name" patch to allow patching current version
+
 * Tue Nov 07 2006 Francois Aucamp  - 1.16-4
 - Modified patch steps to create backups with different suffixes
 - Renamed patch file extensions to .patch

espeak_program_name.patch:

Index: espeak_program_name.patch
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/espeak_program_name.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak_program_name.patch	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak_program_name.patch	21 Nov 2006 16:43:52 -0000	1.2
@@ -263,7 +263,7 @@
 @@ -6,7 +6,7 @@
  DATADIR=/usr/share/espeak-data
  
- RELEASE = 1.16
+ RELEASE = 1.17
 -BIN_NAME = speak
 +BIN_NAME = espeak
  LIB_NAME = libespeak.so


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 17:28:19 -0000	1.2
+++ sources	21 Nov 2006 16:43:52 -0000	1.3
@@ -1 +1 @@
-c376ea94cddda90b093f231926f7ba44  espeak-1.16-source.zip
+6deb00b3fc73b0ef0cc6687b4cfc7ae2  espeak-1.17-source.zip


--- compiledict-amd64_sizeof.patch DELETED ---


--- makefile_install_target.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 16:46:22 2006
From: fedora-extras-commits at redhat.com (Francois Aucamp (faucamp))
Date: Tue, 21 Nov 2006 11:46:22 -0500
Subject: rpms/espeak/FC-5 .cvsignore, 1.2, 1.3 espeak.spec, 1.1,
	1.2 espeak_program_name.patch, 1.1, 1.2 sources, 1.2,
	1.3 compiledict-amd64_sizeof.patch, 1.1,
	NONE makefile_install_target.patch, 1.1, NONE
Message-ID: <200611211646.kALGkMFZ021704@cvs-int.fedora.redhat.com>

Author: faucamp

Update of /cvs/extras/rpms/espeak/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21662

Modified Files:
	.cvsignore espeak.spec espeak_program_name.patch sources 
Removed Files:
	compiledict-amd64_sizeof.patch makefile_install_target.patch 
Log Message:
- Update to version 1.17
- Removed "makefile install target" patch as it has been included upstream
- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
- Minor modification to "espeak program name" patch to allow patching current version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 17:28:19 -0000	1.2
+++ .cvsignore	21 Nov 2006 16:45:51 -0000	1.3
@@ -1 +1 @@
-espeak-1.16-source.zip
+espeak-1.17-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-5/espeak.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak.spec	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak.spec	21 Nov 2006 16:45:51 -0000	1.2
@@ -1,16 +1,14 @@
 Name:           espeak
-Version:        1.16
-Release:        4%{?dist}
+Version:        1.17
+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-1.16-source.zip
+Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
 Patch0:         makefile_lpthread.patch
-Patch1:         makefile_install_target.patch
-Patch2:         compiledict-amd64_sizeof.patch
-Patch3:         espeak_program_name.patch
+Patch1:         espeak_program_name.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -43,9 +41,7 @@
 %setup -q -n espeak-%{version}-source
 chmod 0644 src/* 
 %patch0 -p1 -b .pthread
-%patch1 -p1 -b .install_target
-%patch2 -p1 -b .amd64sizeof
-%patch3 -p1 -b .espeak_name
+%patch1 -p1 -b .espeak_name
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
@@ -91,6 +87,12 @@
 
 
 %changelog
+* Mon Nov 20 2006 Francois Aucamp  - 1.17-1
+- Update to version 1.17
+- Removed "makefile install target" patch as it has been included upstream
+- Removed "AMD64 sizeof(char *)" patch as it has been included upstream
+- Minor modification to "espeak program name" patch to allow patching current version
+
 * Tue Nov 07 2006 Francois Aucamp  - 1.16-4
 - Modified patch steps to create backups with different suffixes
 - Renamed patch file extensions to .patch

espeak_program_name.patch:

Index: espeak_program_name.patch
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-5/espeak_program_name.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- espeak_program_name.patch	9 Nov 2006 17:28:19 -0000	1.1
+++ espeak_program_name.patch	21 Nov 2006 16:45:51 -0000	1.2
@@ -263,7 +263,7 @@
 @@ -6,7 +6,7 @@
  DATADIR=/usr/share/espeak-data
  
- RELEASE = 1.16
+ RELEASE = 1.17
 -BIN_NAME = speak
 +BIN_NAME = espeak
  LIB_NAME = libespeak.so


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 17:28:19 -0000	1.2
+++ sources	21 Nov 2006 16:45:51 -0000	1.3
@@ -1 +1 @@
-c376ea94cddda90b093f231926f7ba44  espeak-1.16-source.zip
+6deb00b3fc73b0ef0cc6687b4cfc7ae2  espeak-1.17-source.zip


--- compiledict-amd64_sizeof.patch DELETED ---


--- makefile_install_target.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 21 16:51:14 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 11:51:14 -0500
Subject: rpms/spandsp/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 spandsp.spec, 1.3, 1.4
Message-ID: <200611211651.kALGpEN5021819@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21800

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 14:38:32 -0000	1.4
+++ .cvsignore	21 Nov 2006 16:50:44 -0000	1.5
@@ -1 +1 @@
-spandsp-0.0.3pre24.tgz
+spandsp-0.0.3pre25.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 14:38:32 -0000	1.4
+++ sources	21 Nov 2006 16:50:44 -0000	1.5
@@ -1 +1 @@
-1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz
+6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spandsp.spec	7 Oct 2006 14:38:32 -0000	1.3
+++ spandsp.spec	21 Nov 2006 16:50:44 -0000	1.4
@@ -1,4 +1,4 @@
-%define pre 24
+%define pre 25
 
 Summary: A DSP library for telephony
 Name: spandsp
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.0.3-1.pre25
+- Update to 0.0.3pre25
+
 * Sat Oct  7 2006 Jeffrey C. Ollie  - 0.0.3-1.pre24
 - Update to 0.0.3pre24
 - Add dist tag.



From fedora-extras-commits at redhat.com  Tue Nov 21 16:54:04 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 11:54:04 -0500
Subject: rpms/numpy/FC-6 numpy-1.0-gfortran.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 numpy.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611211654.kALGs41X021952@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/numpy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21918

Modified Files:
	.cvsignore numpy.spec sources 
Added Files:
	numpy-1.0-gfortran.patch 
Log Message:
Bump to numpy 1.0 release

numpy-1.0-gfortran.patch:

--- NEW FILE numpy-1.0-gfortran.patch ---
diff -ur numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py numpy-1.0/numpy/distutils/fcompiler/gnu.py
--- numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py	2006-10-09 03:46:59.000000000 -0400
+++ numpy-1.0/numpy/distutils/fcompiler/gnu.py	2006-10-25 13:51:18.000000000 -0400
@@ -30,7 +30,7 @@
         'compiler_f77' : [fc_exe, "-g", "-Wall","-fno-second-underscore"],
         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
         'compiler_fix' : None,
-        'linker_so'    : [fc_exe, "-g", "-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-g", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe, "-g", "-Wall"]
@@ -255,7 +255,7 @@
         'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
         'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
         'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
-        'linker_so'    : [fc_exe,"-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe,"-Wall"]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Sep 2006 20:36:23 -0000	1.5
+++ .cvsignore	21 Nov 2006 16:53:34 -0000	1.6
@@ -1,2 +1,3 @@
 numpy-0.9.6.tar.gz
 numpy-0.9.8.tar.gz
+numpy-1.0.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/numpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numpy.spec	5 Sep 2006 20:36:23 -0000	1.6
+++ numpy.spec	21 Nov 2006 16:53:34 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        0.9.8
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -12,8 +12,7 @@
 URL:            http://numeric.scipy.org/
 Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-0.9.4-f2pynumpy.patch
-Patch1:         numpy-0.9.8-gfortran.patch
-Patch2:         numpy-0.9.8-check_types.patch
+Patch1:         numpy-1.0-gfortran.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran
@@ -34,7 +33,6 @@
 %setup -q
 %patch0 -p1 -b .f2pynumpy
 %patch1 -p1 -b .gfortran
-%patch2 -p1 -b .check_types
 
 %build
 ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -43,7 +41,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# skip-build currently broken, this works around it for now
+ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
+    %{__python} setup.py install --root $RPM_BUILD_ROOT
 rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
 rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc .
@@ -68,6 +70,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Oct 25 2006 Jarod Wilson  1.0-1
+- New upstream release
+
 * Tue Sep 06 2006 Jarod Wilson  0.9.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Sep 2006 20:36:23 -0000	1.5
+++ sources	21 Nov 2006 16:53:34 -0000	1.6
@@ -1 +1 @@
-ca528d2b460a6567d70bb6bdf0dc1805  numpy-0.9.8.tar.gz
+47dd0daa82e7b3f0fe74b969b388d7b3  numpy-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:54:50 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 11:54:50 -0500
Subject: rpms/spandsp/FC-6 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 spandsp.spec, 1.3, 1.4
Message-ID: <200611211654.kALGsoVX021992@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21962

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 14:38:32 -0000	1.4
+++ .cvsignore	21 Nov 2006 16:54:20 -0000	1.5
@@ -1 +1 @@
-spandsp-0.0.3pre24.tgz
+spandsp-0.0.3pre25.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 14:38:32 -0000	1.4
+++ sources	21 Nov 2006 16:54:20 -0000	1.5
@@ -1 +1 @@
-1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz
+6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/spandsp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spandsp.spec	7 Oct 2006 14:38:32 -0000	1.3
+++ spandsp.spec	21 Nov 2006 16:54:20 -0000	1.4
@@ -1,4 +1,4 @@
-%define pre 24
+%define pre 25
 
 Summary: A DSP library for telephony
 Name: spandsp
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.0.3-1.pre25
+- Update to 0.0.3pre25
+
 * Sat Oct  7 2006 Jeffrey C. Ollie  - 0.0.3-1.pre24
 - Update to 0.0.3pre24
 - Add dist tag.



From fedora-extras-commits at redhat.com  Tue Nov 21 16:55:21 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 21 Nov 2006 11:55:21 -0500
Subject: rpms/manaworld/devel .cvsignore, 1.4, 1.5 manaworld.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200611211655.kALGtLBQ022051@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21989

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.21.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 03:22:08 -0000	1.4
+++ .cvsignore	21 Nov 2006 16:54:51 -0000	1.5
@@ -1 +1 @@
-tmw-0.0.21.tar.gz
+tmw-0.0.21.1.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/manaworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- manaworld.spec	31 Oct 2006 16:29:27 -0000	1.5
+++ manaworld.spec	21 Nov 2006 16:54:51 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           manaworld
-Version:        0.0.21
-Release:        2%{?dist}
+Version:        0.0.21.1
+Release:        1%{?dist}
 Summary:        2D MMORPG world
 
 Group:          Amusements/Games
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Wart  0.0.21.1-1
+- Update to 0.0.21.1
+
 * Tue Oct 31 2006 Wart  0.0.21-2
 - Rebuild for curl .so name change
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manaworld/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 03:22:08 -0000	1.4
+++ sources	21 Nov 2006 16:54:51 -0000	1.5
@@ -1 +1 @@
-e13a748b8e279fa694db5eb14ac4a8a9  tmw-0.0.21.tar.gz
+d5eacb0f5355ea105771bc5383bd99aa  tmw-0.0.21.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 16:56:07 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 11:56:07 -0500
Subject: rpms/spandsp/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 spandsp.spec, 1.3, 1.4
Message-ID: <200611211656.kALGu7Q7022131@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22096

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 14:41:22 -0000	1.4
+++ .cvsignore	21 Nov 2006 16:55:37 -0000	1.5
@@ -1 +1 @@
-spandsp-0.0.3pre24.tgz
+spandsp-0.0.3pre25.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 14:41:22 -0000	1.4
+++ sources	21 Nov 2006 16:55:37 -0000	1.5
@@ -1 +1 @@
-1546abc89df5b36170acac6622784799  spandsp-0.0.3pre24.tgz
+6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/spandsp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spandsp.spec	7 Oct 2006 14:41:22 -0000	1.3
+++ spandsp.spec	21 Nov 2006 16:55:37 -0000	1.4
@@ -1,4 +1,4 @@
-%define pre 24
+%define pre 25
 
 Summary: A DSP library for telephony
 Name: spandsp
@@ -73,6 +73,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.0.3-1.pre25
+- Update to 0.0.3pre25
+
 * Sat Oct  7 2006 Jeffrey C. Ollie  - 0.0.3-1.pre24
 - Update to 0.0.3pre24
 - Add dist tag.



From fedora-extras-commits at redhat.com  Tue Nov 21 16:56:54 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 21 Nov 2006 11:56:54 -0500
Subject: rpms/python-basemap/devel .cvsignore, 1.8, 1.9 python-basemap.spec, 
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200611211656.kALGusKN022247@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22188

Modified Files:
	.cvsignore python-basemap.spec sources 
Log Message:
Update to upstream 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2006 16:07:53 -0000	1.8
+++ .cvsignore	21 Nov 2006 16:56:24 -0000	1.9
@@ -1 +1 @@
-basemap-0.9.3.tar.gz
+basemap-0.9.4.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-basemap.spec	18 Oct 2006 16:07:53 -0000	1.10
+++ python-basemap.spec	21 Nov 2006 16:56:24 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-basemap
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Nov 20 2006 Orion Poplawski  0.9.4-1
+- Update to upstream 0.9.4
+
 * Wed Oct 18 2006 Orion Poplawski  0.9.3-1
 - Update to upstream 0.9.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2006 16:07:53 -0000	1.8
+++ sources	21 Nov 2006 16:56:24 -0000	1.9
@@ -1 +1 @@
-1d02d6230286262a3bb6c11aad3f58ce  basemap-0.9.3.tar.gz
+0bbe631db05dbb987bb0bf8e8422039c  basemap-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 17:11:58 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 12:11:58 -0500
Subject: rpms/sysprof-kmod/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof-kmod.spec, 1.9, 1.10
Message-ID: <200611211711.kALHBwXr022579@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-serv22558

Modified Files:
	.cvsignore sources sysprof-kmod.spec 
Log Message:
version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Nov 2006 21:55:31 -0000	1.3
+++ .cvsignore	21 Nov 2006 17:11:28 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Nov 2006 21:55:31 -0000	1.3
+++ sources	21 Nov 2006 17:11:28 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/FC-5/sysprof-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sysprof-kmod.spec	11 Nov 2006 21:55:31 -0000	1.9
+++ sysprof-kmod.spec	21 Nov 2006 17:11:28 -0000	1.10
@@ -24,7 +24,7 @@
 
 
 Name:           %{kmod_name}-kmod
-Version:        1.0.5
+Version:        1.0.7
 Release:        1.%(echo %{kverrel} | tr - _)
 Summary:        Sysprof kernel module
 
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Sat Nov 11 2006 Gianluca Sforna  1.0.5-1
 - rebuild for new kernel 2.6.18-1.2239.fc5
 - update to 1.0.5



From fedora-extras-commits at redhat.com  Tue Nov 21 17:52:40 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Tue, 21 Nov 2006 12:52:40 -0500
Subject: rpms/sysprof/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 sysprof.spec, 1.5, 1.6
Message-ID: <200611211752.kALHqePS023082@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23041

Modified Files:
	.cvsignore sources sysprof.spec 
Log Message:
version update to 1.0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Nov 2006 22:18:59 -0000	1.3
+++ .cvsignore	21 Nov 2006 17:52:10 -0000	1.4
@@ -1 +1 @@
-sysprof-1.0.5.tar.gz
+sysprof-1.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Nov 2006 22:18:59 -0000	1.3
+++ sources	21 Nov 2006 17:52:10 -0000	1.4
@@ -1 +1 @@
-cc71e4cee32ebe4dca02c272d0877fb2  sysprof-1.0.5.tar.gz
+c07597d59734d0bacca11003bc15de7b  sysprof-1.0.7.tar.gz


Index: sysprof.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof/FC-5/sysprof.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sysprof.spec	11 Nov 2006 22:18:59 -0000	1.5
+++ sysprof.spec	21 Nov 2006 17:52:10 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           sysprof      
-Version:        1.0.5
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        Sysprof is a sampling CPU profiler
 Group:          Development/System
@@ -60,6 +60,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Nov 21 2006 Gianluca Sforna  1.0.7-1
+- version update to 1.0.7
+
 * Sat Nov 11 2006 Gianluca Sforna  1.0.5-1
 - version update
 



From fedora-extras-commits at redhat.com  Tue Nov 21 17:53:02 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:53:02 -0500
Subject: rpms/Zim - New directory
Message-ID: <200611211753.kALHr2FE023098@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23094/Zim

Log Message:
Directory /cvs/extras/rpms/Zim added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 17:53:08 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:53:08 -0500
Subject: rpms/Zim/devel - New directory
Message-ID: <200611211753.kALHr8OC023115@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23094/Zim/devel

Log Message:
Directory /cvs/extras/rpms/Zim/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 17:53:11 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:53:11 -0500
Subject: rpms/Zim Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211753.kALHrBPj023136@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130

Added Files:
	Makefile import.log 
Log Message:
Setup of module Zim


--- NEW FILE Makefile ---
# Top level Makefile for module Zim
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  Tue Nov 21 17:53:16 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:53:16 -0500
Subject: rpms/Zim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611211753.kALHrGhA023151@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23130/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Zim


--- 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 Nov 21 17:54:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:54:01 -0500
Subject: rpms/Zim import.log,1.1,1.2
Message-ID: <200611211754.kALHs1VP023205@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23175

Modified Files:
	import.log 
Log Message:
auto-import Zim-0.17-2.fc6 on branch devel from Zim-0.17-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Zim/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 17:53:11 -0000	1.1
+++ import.log	21 Nov 2006 17:53:31 -0000	1.2
@@ -0,0 +1 @@
+Zim-0_17-2_fc6:HEAD:Zim-0.17-2.fc6.src.rpm:1164131622



From fedora-extras-commits at redhat.com  Tue Nov 21 17:54:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:54:01 -0500
Subject: rpms/Zim/devel Zim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200611211754.kALHs1HM023209@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23175/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Zim.spec 
Log Message:
auto-import Zim-0.17-2.fc6 on branch devel from Zim-0.17-2.fc6.src.rpm


--- NEW FILE Zim.spec ---
Name:           Zim
Version:        0.17 
Release:        2%{?dist}
Summary:        Desktop wiki & notekeeper

Group:          Applications/Editors
License:        GPL or Artistic
URL:            http://zoidberg.student.utwente.nl/zim/index.shtml
Source0:        ftp://zoidberg.student.utwente.nl/Zim/Zim-%{version}.tar.gz 
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Gtk2) >= 1.040, perl(Gtk2::TrayIcon), perl(Gtk2::Spell)
BuildRequires:  perl(File::MimeInfo) >= 0.12, perl(File::DesktopEntry)
BuildRequires:  perl(File::BaseDir), desktop-file-utils
BuildRequires:  perl(Module::Build)

# testing
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)

# until perl-File-MimeInfo requires it, BZ#215972
BuildRequires:  shared-mime-info

Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))


%description
Zim is a WYSIWYG text editor written in Gtk2-Perl which aims to bring the
concept of a wiki to your desktop. Every page is saved as a text file with
wiki markup. Pages can contain links to other pages, and are saved
automatically. Creating a new page is as easy as linking to a non-existing
page. Pages are ordered in a hierarchical structure that gives it the look and
feel of an outliner. This tool is intended to keep track of TODO lists or to
serve as a personal scratch book. 


%prep
%setup -q

# We're not running on Win32.  Really :)
rm ./lib/Zim/Win32.pm


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'

%{_fixperms} %{buildroot}/*

desktop-file-install --vendor="fedora" --delete-original    \
    --dir=%{buildroot}%{_datadir}/applications              \
     %{buildroot}%{_datadir}/applications/zim.desktop


%check
./Build test


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc Changes ExamplePlugin.pl
%{perl_vendorlib}/*
%{_mandir}/man[13]/*.[13]*
%{_bindir}/*
%{_datadir}/zim
%{_datadir}/pixmaps/*
%{_datadir}/applications/*


%changelog
* Thu Nov 16 2006 Chris Weyl  0.17-2
- add requires on shared-mime-info

* Wed Nov 15 2006 Chris Weyl  0.17-1
- initial packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 17:53:16 -0000	1.1
+++ .cvsignore	21 Nov 2006 17:53:31 -0000	1.2
@@ -0,0 +1 @@
+Zim-0.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 17:53:16 -0000	1.1
+++ sources	21 Nov 2006 17:53:31 -0000	1.2
@@ -0,0 +1 @@
+b665ab613fc777073e14b5eee44f37d9  Zim-0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 17:57:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:57:54 -0500
Subject: owners owners.list,1.1984,1.1985
Message-ID: <200611211757.kALHvsQn023324@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23286

Modified Files:
	owners.list 
Log Message:
added Zim


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1984
retrieving revision 1.1985
diff -u -r1.1984 -r1.1985
--- owners.list	21 Nov 2006 16:18:59 -0000	1.1984
+++ owners.list	21 Nov 2006 17:57:23 -0000	1.1985
@@ -1236,8 +1236,8 @@
 Fedora Extras|OpenSceneGraph|High performance real-time graphics toolkit|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
-Fedora Extras|optipng|A PNG optimizer and converter|opensource at till.name|extras-qa at fedoraproject.org|
 Fedora Extras|openvrml|VRML/X3D runtime library and player|braden at endoframe.com|extras-qa at fedoraproject.org|
+Fedora Extras|optipng|A PNG optimizer and converter|opensource at till.name|extras-qa at fedoraproject.org|
 Fedora Extras|orage|Time-managing application for Xfce4|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ORBit|CORBA Object Request Broker library for GNOME-1 compatibility|paul at city-fan.org|extras-qa at fedoraproject.org|
@@ -2553,6 +2553,7 @@
 Fedora Extras|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
+Fedora Extras|Zim|Desktop wiki & notekeeper|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|zvbi|Raw VBI, Teletext and Closed Caption decoding library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|zynaddsubfx|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 17:58:12 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:58:12 -0500
Subject: rpms/Zim/devel Zim.spec,1.1,1.2
Message-ID: <200611211758.kALHwCZR023341@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/Zim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23309

Modified Files:
	Zim.spec 
Log Message:
release bump


Index: Zim.spec
===================================================================
RCS file: /cvs/extras/rpms/Zim/devel/Zim.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Zim.spec	21 Nov 2006 17:53:31 -0000	1.1
+++ Zim.spec	21 Nov 2006 17:57:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           Zim
 Version:        0.17 
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Desktop wiki & notekeeper
 
 Group:          Applications/Editors
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.17-3
+- bump
+
 * Thu Nov 16 2006 Chris Weyl  0.17-2
 - add requires on shared-mime-info
 



From fedora-extras-commits at redhat.com  Tue Nov 21 17:58:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:58:48 -0500
Subject: rpms/perl-Net-DBus - New directory
Message-ID: <200611211758.kALHwmKh023403@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23399/perl-Net-DBus

Log Message:
Directory /cvs/extras/rpms/perl-Net-DBus added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 17:58:53 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:58:53 -0500
Subject: rpms/perl-Net-DBus/devel - New directory
Message-ID: <200611211758.kALHwr87023416@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23399/perl-Net-DBus/devel

Log Message:
Directory /cvs/extras/rpms/perl-Net-DBus/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 17:59:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:59:01 -0500
Subject: rpms/perl-Net-DBus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611211759.kALHx1aZ023437@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23431

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Net-DBus


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Net-DBus
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  Tue Nov 21 17:59:07 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:59:07 -0500
Subject: rpms/perl-Net-DBus/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611211759.kALHx7Ff023452@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23431/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Net-DBus


--- 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 Nov 21 17:59:44 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:59:44 -0500
Subject: rpms/perl-Net-DBus/devel perl-Net-DBus.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611211759.kALHxio4023514@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23476/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-DBus.spec 
Log Message:
auto-import perl-Net-DBus-0.33.4-2.fc6 on branch devel from perl-Net-DBus-0.33.4-2.fc6.src.rpm


--- NEW FILE perl-Net-DBus.spec ---
Name:           perl-Net-DBus
Version:        0.33.4
Release:        2%{?dist}
Summary:        Use and provide DBus services
License:        GPL or Artistic 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Net-DBus/
Source0:        http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(XML::Grove)
BuildRequires:  perl(XML::Parser)
BuildRequires:  perl(XML::Twig)
BuildRequires:  dbus-devel  >= 0.33, pkgconfig

# testing
BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Net::DBus provides a Perl API for the DBus message system. The DBus Perl
interface is currently operating against the 0.33 development version of
DBus, but should work with later versions too, providing the API changes
have not been too drastic.

%prep
%setup -q -n Net-DBus-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES COPYING README examples/
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Net*
%{_mandir}/man3/*

%changelog
* Sat Nov 11 2006 Chris Weyl  0.33.4-2
- add additional BR's
- update summary

* Tue Nov 07 2006 Chris Weyl  0.33.4-1
- update to 0.33.4
- nix now-unneeded source regexp/tweak

* Sat Nov 04 2006 Chris Weyl  0.33.3-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-DBus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 17:59:07 -0000	1.1
+++ .cvsignore	21 Nov 2006 17:59:14 -0000	1.2
@@ -0,0 +1 @@
+Net-DBus-0.33.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-DBus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 17:59:07 -0000	1.1
+++ sources	21 Nov 2006 17:59:14 -0000	1.2
@@ -0,0 +1 @@
+7138571b3d8df29faa65d1db509f9d32  Net-DBus-0.33.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 17:59:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 12:59:43 -0500
Subject: rpms/perl-Net-DBus import.log,1.1,1.2
Message-ID: <200611211759.kALHxhxJ023510@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23476

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-DBus-0.33.4-2.fc6 on branch devel from perl-Net-DBus-0.33.4-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-DBus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 17:59:01 -0000	1.1
+++ import.log	21 Nov 2006 17:59:13 -0000	1.2
@@ -0,0 +1 @@
+perl-Net-DBus-0_33_4-2_fc6:HEAD:perl-Net-DBus-0.33.4-2.fc6.src.rpm:1164131965



From fedora-extras-commits at redhat.com  Tue Nov 21 18:02:18 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 13:02:18 -0500
Subject: owners owners.list,1.1985,1.1986
Message-ID: <200611211802.kALI2I7L023619@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23600

Modified Files:
	owners.list 
Log Message:
add perl-Net-DBus


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1985
retrieving revision 1.1986
diff -u -r1.1985 -r1.1986
--- owners.list	21 Nov 2006 17:57:23 -0000	1.1985
+++ owners.list	21 Nov 2006 18:01:48 -0000	1.1986
@@ -1588,6 +1588,7 @@
 Fedora Extras|perl-Moose-Policy|Police your project/company-wide Moose policies|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MP3-Info|Manipulate / fetch info from MP3 audio files|chris.stone at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-DBus|perl DBus interface|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Jabber|Net::Jabber - Jabber client library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Nov 21 18:22:35 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 21 Nov 2006 13:22:35 -0500
Subject: rpms/python-basemap/FC-6 .cvsignore, 1.8, 1.9 python-basemap.spec, 
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200611211822.kALIMZ0H023697@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23678

Modified Files:
	.cvsignore python-basemap.spec sources 
Log Message:
Update to upstream 0.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2006 16:07:53 -0000	1.8
+++ .cvsignore	21 Nov 2006 18:22:05 -0000	1.9
@@ -1 +1 @@
-basemap-0.9.3.tar.gz
+basemap-0.9.4.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/FC-6/python-basemap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-basemap.spec	18 Oct 2006 16:07:53 -0000	1.10
+++ python-basemap.spec	21 Nov 2006 18:22:05 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-basemap
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Mon Nov 20 2006 Orion Poplawski  0.9.4-1
+- Update to upstream 0.9.4
+
 * Wed Oct 18 2006 Orion Poplawski  0.9.3-1
 - Update to upstream 0.9.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2006 16:07:53 -0000	1.8
+++ sources	21 Nov 2006 18:22:05 -0000	1.9
@@ -1 +1 @@
-1d02d6230286262a3bb6c11aad3f58ce  basemap-0.9.3.tar.gz
+0bbe631db05dbb987bb0bf8e8422039c  basemap-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 18:33:15 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 21 Nov 2006 13:33:15 -0500
Subject: rpms/dejavu-fonts import.log,1.91,1.92
Message-ID: <200611211833.kALIXFPW023823@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23793

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.12-1.rc1.fc7 on branch devel from dejavu-fonts-2.12-1.rc1.fc7.src.rpm
2.12


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- import.log	16 Nov 2006 21:52:05 -0000	1.91
+++ import.log	21 Nov 2006 18:32:45 -0000	1.92
@@ -88,3 +88,4 @@
 dejavu-fonts-2_11-1_fc5:FC-5:dejavu-fonts-2.11-1.fc5.src.rpm:1161540378
 dejavu-fonts-2_12-0_1_rc1_fc7:HEAD:dejavu-fonts-2.12-0.1.rc1.fc7.src.rpm:1163713579
 dejavu-fonts-2_12-0_2_rc1_fc7:HEAD:dejavu-fonts-2.12-0.2.rc1.fc7.src.rpm:1163713911
+dejavu-fonts-2_12-1_rc1_fc7:HEAD:dejavu-fonts-2.12-1.rc1.fc7.src.rpm:1164133959



From fedora-extras-commits at redhat.com  Tue Nov 21 18:33:15 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 21 Nov 2006 13:33:15 -0500
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.25, 1.26 dejavu-fonts.spec,
	1.49, 1.50 sources, 1.25, 1.26
Message-ID: <200611211833.kALIXFQD023828@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23793/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.12-1.rc1.fc7 on branch devel from dejavu-fonts-2.12-1.rc1.fc7.src.rpm
2.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Nov 2006 21:46:35 -0000	1.25
+++ .cvsignore	21 Nov 2006 18:32:45 -0000	1.26
@@ -1 +1 @@
-dejavu-sfd-20061115-1287.tar.gz
+dejavu-sfd-2.12.tar.bz2


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- dejavu-fonts.spec	16 Nov 2006 21:52:06 -0000	1.49
+++ dejavu-fonts.spec	21 Nov 2006 18:32:45 -0000	1.50
@@ -1,8 +1,9 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define alphatag        .rc1
+#%define alphatag        .rc1
 
-%define archiveversion  20061115-1287
+#%define archiveversion  20061115-1287
+%define archiveversion  %{version}
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 
@@ -12,12 +13,12 @@
 
 Name:      dejavu-fonts
 Version:   2.12
-Release:   0.2%{?alphatag}%{?dist}
+Release:   1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
 URL:       http://dejavu.sf.net/
-Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz
+Source0:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.bz2
 # DejaVu fontconfig setup
 Source1:   %{name}-fontconfig.conf
 # DejaVu fontconfig setup (experimental families)
@@ -154,6 +155,10 @@
 
 
 %changelog
+* Tue Nov 21 2006  Nicolas Mailhot 
+- 2.12
+- only in devel for now
+
 * Thu Nov 16 2006 Nicolas Mailhot 
 - 2.12-0.2.rc1
 - 2.12-rc1 (a.k.a. 20061115svn1287)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	16 Nov 2006 21:46:35 -0000	1.25
+++ sources	21 Nov 2006 18:32:45 -0000	1.26
@@ -1 +1 @@
-2320d60a8bd5d080fa2dfc040f459149  dejavu-sfd-20061115-1287.tar.gz
+9dc019f130d23d54cf01f7936158a482  dejavu-sfd-2.12.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 18:38:33 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 21 Nov 2006 13:38:33 -0500
Subject: rpms/TurboGears/devel TurboGears.spec,1.5,1.6
Message-ID: <200611211838.kALIcXOw023945@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23930

Modified Files:
	TurboGears.spec 
Log Message:
Add python-psycopg to Requires


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurboGears.spec	17 Oct 2006 15:21:43 -0000	1.5
+++ TurboGears.spec	21 Nov 2006 18:38:03 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0b1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -24,7 +24,7 @@
 Requires:       python-turbokid >= 0.9.8 python-tgfastdata
 Requires:       python-simplejson >= 1.3 python-paste-script >= 0.9.7
 Requires:       python-configobj >= 4.3.2 python-ruledispatch
-Requires:       python-nose >= 0.9
+Requires:       python-nose >= 0.9 python-psycopg
 
 %description
 TurboGears brings together four major pieces to create an
@@ -76,6 +76,9 @@
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Fri Nov 21 2006 Luke Macken  1.0b1-2
+- Add python-psycopg to Requires
+
 * Mon Sep 11 2006 Luke Macken  1.0b1-1
 - 1.0b1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 18:53:38 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 13:53:38 -0500
Subject: rpms/perl-Net-DBus/devel perl-Net-DBus.spec,1.1,1.2
Message-ID: <200611211853.kALIrccv024174@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Net-DBus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24157

Modified Files:
	perl-Net-DBus.spec 
Log Message:
deal with errant test :)



Index: perl-Net-DBus.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-DBus/devel/perl-Net-DBus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-DBus.spec	21 Nov 2006 17:59:14 -0000	1.1
+++ perl-Net-DBus.spec	21 Nov 2006 18:53:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Net-DBus
 Version:        0.33.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Use and provide DBus services
 License:        GPL or Artistic 
 Group:          Development/Libraries
@@ -42,6 +42,10 @@
 %{_fixperms} %{buildroot}/*
 
 %check
+# test fails incorrectly on newer versions of dbus.  slated to be corrected:
+# http://rt.cpan.org/Public/Bug/Display.html?id=22850
+rm t/30-server.t
+
 make test
 
 %clean
@@ -55,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.33.4-3
+- nix t/30-server.t until the test is fixed
+
 * Sat Nov 11 2006 Chris Weyl  0.33.4-2
 - add additional BR's
 - update summary



From fedora-extras-commits at redhat.com  Tue Nov 21 18:55:21 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 21 Nov 2006 13:55:21 -0500
Subject: rpms/gnash/FC-6 .cvsignore, 1.2, 1.3 gnash.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200611211855.kALItLH9024239@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnash/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24220

Modified Files:
	.cvsignore gnash.spec sources 
Log Message:
* Sat Nov  6 2006 Patrice Dumas  0.7.2-1
- update for 0.7.2 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnash/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Aug 2006 08:39:02 -0000	1.2
+++ .cvsignore	21 Nov 2006 18:54:51 -0000	1.3
@@ -1 +1 @@
-gnash-0.7.1.tar.bz2
+gnash-0.7.2.tar.bz2


Index: gnash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnash/FC-6/gnash.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnash.spec	4 Oct 2006 22:21:54 -0000	1.3
+++ gnash.spec	21 Nov 2006 18:54:51 -0000	1.4
@@ -1,24 +1,27 @@
 Name:           gnash
-Version:        0.7.1
-Release:        9%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        GNU flash movie player
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/gnash/
 Source0:        http://ftp.gnu.org/gnu/gnash/%{version}/%{name}-%{version}.tar.bz2
-Source1:        gnash-README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libxml2-devel libjpeg-devel libogg-devel libXmu-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  libxml2-devel libpng-devel libjpeg-devel libogg-devel
+BuildRequires:  boost-devel curl-devel 
+# the opengl devel packages are required by gtkglext-devel
+# monolithic Xorg
+#BuildRequires:  xorg-x11-devel
+# modular Xorg 
+#BuildRequires:  libGLU-devel libGL-devel
+BuildRequires:  SDL-devel 
 BuildRequires:  kdelibs-devel
 BuildRequires:  gtkglext-devel
-## GStreamer isn't used yet, but will be in the near future.
-#BuildRequires:  gstreamer-devel
 BuildRequires:  docbook2X
+BuildRequires:  gstreamer-devel >= 0.10
 BuildRequires:  scrollkeeper
-BuildRequires:  automake, libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -26,23 +29,16 @@
 Requires(postun): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Patch1:         gnash-configure-pkgconfig.patch
-Patch2:		gnash-continue_on_info_install_error.patch
-Patch3:         gnash-plugin-tempfile-dir.patch
 
 %description
 Gnash is a GNU Flash movie player based on GameSWF,
 and supports many SWF v7 features.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %package plugin
-Summary:   Flash movie player plugin for Mozilla Browser
+Summary:   Web-client flash movie player plugin 
 Requires:  %{name} = %{version}-%{release}
 # this doesn't prevent wrong dependencies, in case a package
-# provides %{_libdir}/mozilla/plugins (like kdebase for konqueror)
+# provides %%{_libdir}/mozilla/plugins (like kdebase for konqueror)
 # and another unrelated webbrowser is installed, like w3m-el.
 # Moreover konqueror could provide webclient some day
 Requires:  %{_libdir}/mozilla/plugins webclient
@@ -51,10 +47,6 @@
 %description plugin
 The gnash flash movie player plugin for firefox or mozilla.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %package klash
 Summary:   Konqueror flash movie player plugin
 Requires:  %{name} = %{version}-%{release}
@@ -63,35 +55,32 @@
 %description klash
 The gnash flash movie player plugin for Konqueror.
 
-Note that Gnash does not work yet for newer flash sites, is known to
-crash and can even trigger bugs that crash the graphical system.
-
-
 %prep
 %setup -q
-cp -p %{SOURCE1} README.fedora
-%patch1 -p1 -b .1
-%patch2 -p0 -b .2
-%patch3 -p0 -b .3
-autoreconf
-
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
-  --enable-ghelp --enable-docbook --enable-klash --disable-rpath \
-  --disable-dependency-tracking --with-qtdir=$QTDIR
+  --enable-ghelp --enable-docbook --enable-sound=GST \
+  --disable-dependency-tracking --disable-rpath \
+  --with-qtdir=$QTDIR
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,so}
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,18 +90,15 @@
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 /sbin/install-info --entry="* Gnash: (gnash). GNU Flash Player" %{_infodir}/%{name}.info %{_infodir}/dir || :
 
-
 %preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
-
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q || :
 
-
 %files
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS 
@@ -121,19 +107,16 @@
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
+%{_libdir}/libgnash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
 %{_datadir}/omf/gnash/
-%{_libdir}/libgnash*.so.*
-
 
 %files plugin
 %defattr(-,root,root,-)
-%doc README.fedora
 %{_libdir}/mozilla/plugins/libgnashplugin.so
 
-
 %files klash
 %defattr(-,root,root,-)
 %{_bindir}/klash
@@ -142,13 +125,15 @@
 %{_datadir}/config/klashrc
 %{_datadir}/services/klash_part.desktop
 
-
 %changelog
+* Sat Nov  6 2006 Patrice Dumas  0.7.2-1
+- update for 0.7.2 release.
+
 * Thu Oct 05 2006 Christian Iseli  0.7.1-9
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Sun Sep 24 2006 Patrice Dumas  0.7.1-8
-- plugin requires %{_libdir}/mozilla/plugins. Fix (incompletly and 
+- plugin requires %%{_libdir}/mozilla/plugins. Fix (incompletly and 
   temporarily, but there is no better solution yet) #207613
 
 * Sun Aug 27 2006 Patrice Dumas  - 0.7.1-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnash/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Aug 2006 08:39:02 -0000	1.2
+++ sources	21 Nov 2006 18:54:51 -0000	1.3
@@ -1 +1 @@
-d860981aeaac0fc941a28abc3c24223c  gnash-0.7.1.tar.bz2
+ccef0f45be01a4c2992b46c2363a514f  gnash-0.7.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 19:15:54 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 21 Nov 2006 14:15:54 -0500
Subject: rpms/mail-notification/devel
	mail-notification-mail-reader-launch.patch, NONE,
	1.1 mail-notification.spec, 1.32, 1.33
Message-ID: <200611211915.kALJFsPm024659@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24641

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-mail-reader-launch.patch 
Log Message:
3.0-11 -- add mail-notification-mail-reader-launch.patch (#215119, credits go to John Conroy)

mail-notification-mail-reader-launch.patch:

--- NEW FILE mail-notification-mail-reader-launch.patch ---
--- mail-notification-3.0.org/src/mn-conf.c	2006-05-18 09:23:42.000000000 -0400
+++ mail-notification-3.0/src/mn-conf.c	2006-11-11 07:58:01.000000000 -0500
@@ -1119,14 +1119,15 @@
   if (strip_format)
     {
       GString *stripped;
-      char *start;
-      char *p;
 
       stripped = g_string_new(NULL);
+      g_string_append_len(stripped, command, strstr(command, " ") - command);
 
-      for (start = command; (p = strstr(start, "%s")); start = p + 2)
-	g_string_append_len(stripped, start, p - start);
-      g_string_append(stripped, start);
+      if (!strcmp(stripped->str, "mozilla"))
+        g_string_append(stripped, " -mail");
+
+      if (!strcmp(stripped->str, "evolution"))
+        g_string_append(stripped, " --component=mail");
 
       g_free(command);
       command = g_string_free(stripped, FALSE);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mail-notification.spec	9 Nov 2006 10:53:20 -0000	1.32
+++ mail-notification.spec	21 Nov 2006 19:15:24 -0000	1.33
@@ -2,7 +2,7 @@
 
 Name:           mail-notification
 Version:        3.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz
 Source1:        mail-notification-README.FEDORA
 Patch0:         mail-notification-fedora-plugin-hint.patch
+Patch1:         mail-notification-mail-reader-launch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -57,6 +58,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .patch0
+%patch1 -p1 -b .patch1
 cp %{SOURCE1} ./README.FEDORA
 # FIXME -- quick workaround for now
 sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
@@ -133,6 +135,10 @@
 
 
 %changelog
+* 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
 



From fedora-extras-commits at redhat.com  Tue Nov 21 19:24:19 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 21 Nov 2006 14:24:19 -0500
Subject: rpms/glipper import.log,1.7,1.8
Message-ID: <200611211924.kALJOJdE025255@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25220

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.95.1-1 on branch devel from glipper-0.95.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	14 Nov 2006 17:35:09 -0000	1.7
+++ import.log	21 Nov 2006 19:23:49 -0000	1.8
@@ -4,3 +4,4 @@
 glipper-0_89-5:HEAD:glipper-0.89-5.src.rpm:1161029170
 glipper-0_95-1:HEAD:glipper-0.95-1.src.rpm:1163448587
 glipper-0_95-2:HEAD:glipper-0.95-2.src.rpm:1163525699
+glipper-0_95_1-1:HEAD:glipper-0.95.1-1.src.rpm:1164137034



From fedora-extras-commits at redhat.com  Tue Nov 21 19:24:19 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 21 Nov 2006 14:24:19 -0500
Subject: rpms/glipper/devel .cvsignore, 1.3, 1.4 glipper.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200611211924.kALJOJKi025260@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25220/devel

Modified Files:
	.cvsignore glipper.spec sources 
Log Message:
auto-import glipper-0.95.1-1 on branch devel from glipper-0.95.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Nov 2006 20:09:49 -0000	1.3
+++ .cvsignore	21 Nov 2006 19:23:49 -0000	1.4
@@ -1 +1 @@
-glipper-0.95.tar.gz
+glipper-0.95.1.tar.gz


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glipper.spec	14 Nov 2006 17:35:10 -0000	1.6
+++ glipper.spec	21 Nov 2006 19:23:49 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           glipper
-Version:        0.95
-Release:        2%{?dist}
+Version:        0.95.1
+Release:        1%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
 
 
 %description
@@ -47,6 +47,12 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 21 2006 Damien Durand  - 0.95.1
+- Upgrade to 0.95.1
+
+* Sun Nov 18 2006 Damien Durand  - 0.95-3
+- Add glade2-devel in BR
+
 * Tue Nov 14 2006 Damien Durand  - 0.95-2
 - Add gnome-doc-utils in BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2006 20:09:49 -0000	1.3
+++ sources	21 Nov 2006 19:23:49 -0000	1.4
@@ -1 +1 @@
-d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz
+aa6524f59342d72fee8bed36e6267746  glipper-0.95.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:30:44 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 21 Nov 2006 14:30:44 -0500
Subject: rpms/codeblocks/devel .cvsignore, 1.6, 1.7 codeblocks.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611211930.kALJUiF7025448@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25422

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3253


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2006 09:31:04 -0000	1.6
+++ .cvsignore	21 Nov 2006 19:30:14 -0000	1.7
@@ -1 +1 @@
-codeblocks-svn3202.tar.bz2
+codeblocks-svn3253.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- codeblocks.spec	11 Nov 2006 09:31:04 -0000	1.5
+++ codeblocks.spec	21 Nov 2006 19:30:14 -0000	1.6
@@ -1,9 +1,9 @@
-%define		rev	3202
-%define		date	20061110
+%define		rev	3253
+%define		date	20061121
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.13.%{date}svn%{rev}%{?dist}
+Release:	0.14.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
+- update to revision 3253
+
 * Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
 - update to revision 3202
 - fixed plugin loading on 64-bit platforms


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Nov 2006 09:31:04 -0000	1.6
+++ sources	21 Nov 2006 19:30:14 -0000	1.7
@@ -1 +1 @@
-ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2
+1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 19:32:56 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 21 Nov 2006 14:32:56 -0500
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.6, 1.7 codeblocks.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611211932.kALJWuVv025528@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25509

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3253


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2006 09:37:05 -0000	1.6
+++ .cvsignore	21 Nov 2006 19:32:26 -0000	1.7
@@ -1 +1 @@
-codeblocks-svn3202.tar.bz2
+codeblocks-svn3253.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- codeblocks.spec	11 Nov 2006 09:37:05 -0000	1.5
+++ codeblocks.spec	21 Nov 2006 19:32:26 -0000	1.6
@@ -1,9 +1,9 @@
-%define		rev	3202
-%define		date	20061110
+%define		rev	3253
+%define		date	20061121
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.13.%{date}svn%{rev}%{?dist}
+Release:	0.14.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
+- update to revision 3253
+
 * Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
 - update to revision 3202
 - fixed plugin loading on 64-bit platforms


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Nov 2006 09:37:05 -0000	1.6
+++ sources	21 Nov 2006 19:32:26 -0000	1.7
@@ -1 +1 @@
-ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2
+1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 19:38:20 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 21 Nov 2006 14:38:20 -0500
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.6, 1.7 codeblocks.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611211938.kALJcKoK025620@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25601

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3253


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2006 09:39:56 -0000	1.6
+++ .cvsignore	21 Nov 2006 19:37:50 -0000	1.7
@@ -1 +1 @@
-codeblocks-svn3202.tar.bz2
+codeblocks-svn3253.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- codeblocks.spec	11 Nov 2006 09:39:56 -0000	1.5
+++ codeblocks.spec	21 Nov 2006 19:37:50 -0000	1.6
@@ -1,9 +1,9 @@
-%define		rev	3202
-%define		date	20061110
+%define		rev	3253
+%define		date	20061121
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.13.%{date}svn%{rev}%{?dist}
+Release:	0.14.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
+- update to revision 3253
+
 * Fri Nov 10 2006 Dan Horak  1.0-0.13.20061110svn3202
 - update to revision 3202
 - fixed plugin loading on 64-bit platforms


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Nov 2006 09:39:56 -0000	1.6
+++ sources	21 Nov 2006 19:37:50 -0000	1.7
@@ -1 +1 @@
-ce1054b4451df382a6b7fa34562fe1ed  codeblocks-svn3202.tar.bz2
+1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 19:44:32 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 14:44:32 -0500
Subject: rpms/perl-WWW-Myspace/FC-5 perl-WWW-Myspace.spec, 1.11, 1.12 sources,
	1.11, 1.12
Message-ID: <200611211944.kALJiWsL025749@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693/FC-5

Modified Files:
	perl-WWW-Myspace.spec sources 
Log Message:
 update to 0.60



Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-5/perl-WWW-Myspace.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-WWW-Myspace.spec	19 Oct 2006 03:27:41 -0000	1.11
+++ perl-WWW-Myspace.spec	21 Nov 2006 19:44:02 -0000	1.12
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.59
+Version:  0.60
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -48,6 +48,9 @@
 %prep
 %setup -q -n WWW-Myspace-%{version}
 
+# nix a bunch of weird files that seem to have creeped in...
+rm `find . -type f -name '.*'`
+
 # exec + doc == bad
 cd sample_scripts
 chmod -x *
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.60-1
+- update to 0.60
+
 * Wed Oct 18 2006 Chris Weyl  0.59-1
 - update to 0.59
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 03:27:41 -0000	1.11
+++ sources	21 Nov 2006 19:44:02 -0000	1.12
@@ -1 +1 @@
-324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz
+ecd95ed4b157a58cb9365061f61570d2  WWW-Myspace-0.60.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:44:32 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 14:44:32 -0500
Subject: rpms/perl-WWW-Myspace/FC-6 perl-WWW-Myspace.spec, 1.13, 1.14 sources,
	1.11, 1.12
Message-ID: <200611211944.kALJiW2p025753@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693/FC-6

Modified Files:
	perl-WWW-Myspace.spec sources 
Log Message:
 update to 0.60



Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-6/perl-WWW-Myspace.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-WWW-Myspace.spec	19 Oct 2006 03:27:42 -0000	1.13
+++ perl-WWW-Myspace.spec	21 Nov 2006 19:44:02 -0000	1.14
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.59
+Version:  0.60
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -48,6 +48,9 @@
 %prep
 %setup -q -n WWW-Myspace-%{version}
 
+# nix a bunch of weird files that seem to have creeped in...
+rm `find . -type f -name '.*'`
+
 # exec + doc == bad
 cd sample_scripts
 chmod -x *
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.60-1
+- update to 0.60
+
 * Wed Oct 18 2006 Chris Weyl  0.59-1
 - update to 0.59
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 03:27:42 -0000	1.11
+++ sources	21 Nov 2006 19:44:02 -0000	1.12
@@ -1 +1 @@
-324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz
+ecd95ed4b157a58cb9365061f61570d2  WWW-Myspace-0.60.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:44:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 14:44:37 -0500
Subject: rpms/perl-WWW-Myspace/devel .cvsignore, 1.11,
	1.12 perl-WWW-Myspace.spec, 1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200611211944.kALJib1l025758@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-WWW-Myspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693/devel

Modified Files:
	.cvsignore perl-WWW-Myspace.spec sources 
Log Message:
 update to 0.60



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Oct 2006 03:27:42 -0000	1.11
+++ .cvsignore	21 Nov 2006 19:44:07 -0000	1.12
@@ -1 +1 @@
-WWW-Myspace-0.59.tar.gz
+WWW-Myspace-0.60.tar.gz


Index: perl-WWW-Myspace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/perl-WWW-Myspace.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-WWW-Myspace.spec	19 Oct 2006 03:27:42 -0000	1.13
+++ perl-WWW-Myspace.spec	21 Nov 2006 19:44:07 -0000	1.14
@@ -11,7 +11,7 @@
 
 
 Name:     perl-WWW-Myspace
-Version:  0.59
+Version:  0.60
 Release:  1%{?dist}
 Summary:  Access your myspace.com profile in Perl!
 
@@ -48,6 +48,9 @@
 %prep
 %setup -q -n WWW-Myspace-%{version}
 
+# nix a bunch of weird files that seem to have creeped in...
+rm `find . -type f -name '.*'`
+
 # exec + doc == bad
 cd sample_scripts
 chmod -x *
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.60-1
+- update to 0.60
+
 * Wed Oct 18 2006 Chris Weyl  0.59-1
 - update to 0.59
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Myspace/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Oct 2006 03:27:42 -0000	1.11
+++ sources	21 Nov 2006 19:44:07 -0000	1.12
@@ -1 +1 @@
-324a80c61b444cec30924abf180c5d2d  WWW-Myspace-0.59.tar.gz
+ecd95ed4b157a58cb9365061f61570d2  WWW-Myspace-0.60.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:50:23 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 14:50:23 -0500
Subject: rpms/numpy/FC-5 numpy-1.0-gfortran.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 numpy.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611211950.kALJoNBL026844@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/numpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26806

Modified Files:
	.cvsignore numpy.spec sources 
Added Files:
	numpy-1.0-gfortran.patch 
Log Message:
Bump to numpy 1.0 release

numpy-1.0-gfortran.patch:

--- NEW FILE numpy-1.0-gfortran.patch ---
diff -ur numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py numpy-1.0/numpy/distutils/fcompiler/gnu.py
--- numpy-1.0.orig/numpy/distutils/fcompiler/gnu.py	2006-10-09 03:46:59.000000000 -0400
+++ numpy-1.0/numpy/distutils/fcompiler/gnu.py	2006-10-25 13:51:18.000000000 -0400
@@ -30,7 +30,7 @@
         'compiler_f77' : [fc_exe, "-g", "-Wall","-fno-second-underscore"],
         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
         'compiler_fix' : None,
-        'linker_so'    : [fc_exe, "-g", "-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-g", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe, "-g", "-Wall"]
@@ -255,7 +255,7 @@
         'compiler_f77' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
         'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
         'compiler_fix' : [fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
-        'linker_so'    : [fc_exe,"-Wall"],
+        'linker_so'    : [fc_exe,"-shared", "-Wall"],
         'archiver'     : ["ar", "-cr"],
         'ranlib'       : ["ranlib"],
         'linker_exe'   : [fc_exe,"-Wall"]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Sep 2006 16:54:50 -0000	1.5
+++ .cvsignore	21 Nov 2006 19:49:53 -0000	1.6
@@ -1,2 +1,3 @@
 numpy-0.9.6.tar.gz
 numpy-0.9.8.tar.gz
+numpy-1.0.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/numpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- numpy.spec	25 Sep 2006 16:54:50 -0000	1.6
+++ numpy.spec	21 Nov 2006 19:49:53 -0000	1.7
@@ -3,7 +3,7 @@
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
 
 Name:           numpy
-Version:        0.9.8
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -12,8 +12,7 @@
 URL:            http://numeric.scipy.org/
 Source0:        http://dl.sourceforge.net/numpy/%{name}-%{version}.tar.gz
 Patch0:         numpy-0.9.4-f2pynumpy.patch
-Patch1:         numpy-0.9.8-gfortran.patch
-Patch2:         numpy-0.9.8-check_types.patch
+Patch1:         numpy-1.0-gfortran.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel atlas-devel blas-devel lapack-devel python-setuptools gcc-gfortran
@@ -34,7 +33,6 @@
 %setup -q
 %patch0 -p1 -b .f2pynumpy
 %patch1 -p1 -b .gfortran
-%patch2 -p1 -b .check_types
 
 %build
 ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -43,7 +41,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# skip-build currently broken, this works around it for now
+ATLAS=%{_libdir} FFTW=%{_libdir} BLAS=%{_libdir} \
+    LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" \
+    %{__python} setup.py install --root $RPM_BUILD_ROOT
 rm -rf docs-f2py ; mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/docs docs-f2py
 mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/f2py/f2py.1 f2py.1
 rm -rf doc ; mv -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/doc .
@@ -68,6 +70,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Oct 25 2006 Jarod Wilson  1.0-1
+- New upstream release
+
 * Tue Sep 06 2006 Jarod Wilson  0.9.8-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Sep 2006 16:54:50 -0000	1.5
+++ sources	21 Nov 2006 19:49:53 -0000	1.6
@@ -1 +1 @@
-ca528d2b460a6567d70bb6bdf0dc1805  numpy-0.9.8.tar.gz
+47dd0daa82e7b3f0fe74b969b388d7b3  numpy-1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 19:50:28 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Tue, 21 Nov 2006 14:50:28 -0500
Subject: comps comps-fe6.xml.in,1.226,1.227
Message-ID: <200611211950.kALJoSNi026847@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26792/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
Adding clement in the 'servers' entries



Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- comps-fe6.xml.in	21 Nov 2006 10:35:31 -0000	1.226
+++ comps-fe6.xml.in	21 Nov 2006 19:49:58 -0000	1.227
@@ -747,6 +747,7 @@
       clamav
       clamav-data
       clamav-milter
+      clement
       crm114
       cyrus-imapd
       enemies-of-carlotta



From fedora-extras-commits at redhat.com  Tue Nov 21 19:56:25 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 21 Nov 2006 14:56:25 -0500
Subject: rpms/TurboGears/FC-6 TurboGears.spec,1.5,1.6
Message-ID: <200611211956.kALJuPJ3026918@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26903

Modified Files:
	TurboGears.spec 
Log Message:
Add python-psycopg to Requires


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/FC-6/TurboGears.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurboGears.spec	17 Oct 2006 15:21:43 -0000	1.5
+++ TurboGears.spec	21 Nov 2006 19:55:55 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0b1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -24,7 +24,7 @@
 Requires:       python-turbokid >= 0.9.8 python-tgfastdata
 Requires:       python-simplejson >= 1.3 python-paste-script >= 0.9.7
 Requires:       python-configobj >= 4.3.2 python-ruledispatch
-Requires:       python-nose >= 0.9
+Requires:       python-nose >= 0.9 python-psycopg
 
 %description
 TurboGears brings together four major pieces to create an
@@ -76,6 +76,9 @@
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Fri Nov 21 2006 Luke Macken  1.0b1-2
+- Add python-psycopg to Requires
+
 * Mon Sep 11 2006 Luke Macken  1.0b1-1
 - 1.0b1
 



From fedora-extras-commits at redhat.com  Tue Nov 21 19:58:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 21 Nov 2006 14:58:39 -0500
Subject: rpms/qtparted/devel qtparted.spec,1.18,1.19
Message-ID: <200611211958.kALJwd76027012@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26988

Modified Files:
	qtparted.spec 
Log Message:
Yet another rebuild.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qtparted.spec	29 Oct 2006 00:48:38 -0000	1.18
+++ qtparted.spec	21 Nov 2006 19:58:09 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Steven Pritchard  - 0.4.5-11
+- Yet another rebuild.
+
 * Fri Oct 27 2006 Steven Pritchard  - 0.4.5-10
 - Enable ntfs support.
 - Make desktop-file-install happy with our categories again.



From fedora-extras-commits at redhat.com  Tue Nov 21 19:59:20 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Tue, 21 Nov 2006 14:59:20 -0500
Subject: comps comps-fe7.xml.in,1.25,1.26
Message-ID: <200611211959.kALJxKki027074@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27006/comps

Modified Files:
	comps-fe7.xml.in 
Log Message:
Adding clement to the 'server' group for fc7



Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- comps-fe7.xml.in	21 Nov 2006 10:35:31 -0000	1.25
+++ comps-fe7.xml.in	21 Nov 2006 19:58:50 -0000	1.26
@@ -747,6 +747,7 @@
       clamav
       clamav-data
       clamav-milter
+      clement
       crm114
       cyrus-imapd
       enemies-of-carlotta



From fedora-extras-commits at redhat.com  Tue Nov 21 20:03:12 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 21 Nov 2006 15:03:12 -0500
Subject: rpms/deskbar-applet/FC-6 .cvsignore, 1.14, 1.15 deskbar-applet.spec,
	1.31, 1.32 sources, 1.14, 1.15
Message-ID: <200611212003.kALK3CMK027190@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27171

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
2.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Oct 2006 22:03:15 -0000	1.14
+++ .cvsignore	21 Nov 2006 20:02:42 -0000	1.15
@@ -1 +1 @@
-deskbar-applet-2.16.0.tar.bz2
+deskbar-applet-2.17.2.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-6/deskbar-applet.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- deskbar-applet.spec	1 Oct 2006 22:03:15 -0000	1.31
+++ deskbar-applet.spec	21 Nov 2006 20:02:42 -0000	1.32
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.16.0
+Version:        2.17.2
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -16,7 +16,7 @@
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
 BuildRequires:  libSM-devel gnome-python2-applet desktop-file-utils
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	perl(XML::Parser) gnome-python2
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo
 Requires:       gnome-python2-gconf pygtk2 gnome-python2-libwnck
 Requires(pre):  GConf2
@@ -91,6 +91,16 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Tue Nov 21 2006 Luke Macken  - 2.17.2-1
+- 2.17.2
+
+* Wed Nov  2 2006 Luke Macken  - 2.16.1-2
+- 2.16.1
+- Add gnome-python2 to BuildRequires
+
+* Sat Oct 28 2006 Luke Macken  - 2.16.0-2
+- Rebuild
+
 * Sun Oct  1 2006 Luke Macken  - 2.16.0-1
 - 2.16.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Oct 2006 22:03:15 -0000	1.14
+++ sources	21 Nov 2006 20:02:42 -0000	1.15
@@ -1 +1 @@
-9f14a65f75142cd5b233bf9376a1f946  deskbar-applet-2.16.0.tar.bz2
+825cd32ffff8c3a105cd3f4e04ec646e  deskbar-applet-2.17.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 20:04:43 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 21 Nov 2006 15:04:43 -0500
Subject: rpms/glipper import.log,1.8,1.9
Message-ID: <200611212004.kALK4hTo027292@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27254

Modified Files:
	import.log 
Log Message:
auto-import glipper-0.95.1-2 on branch devel from glipper-0.95.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glipper/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	21 Nov 2006 19:23:49 -0000	1.8
+++ import.log	21 Nov 2006 20:04:13 -0000	1.9
@@ -5,3 +5,4 @@
 glipper-0_95-1:HEAD:glipper-0.95-1.src.rpm:1163448587
 glipper-0_95-2:HEAD:glipper-0.95-2.src.rpm:1163525699
 glipper-0_95_1-1:HEAD:glipper-0.95.1-1.src.rpm:1164137034
+glipper-0_95_1-2:HEAD:glipper-0.95.1-2.src.rpm:1164139459



From fedora-extras-commits at redhat.com  Tue Nov 21 20:04:43 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Tue, 21 Nov 2006 15:04:43 -0500
Subject: rpms/glipper/devel glipper.spec,1.7,1.8
Message-ID: <200611212004.kALK4h5s027295@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27254/devel

Modified Files:
	glipper.spec 
Log Message:
auto-import glipper-0.95.1-2 on branch devel from glipper-0.95.1-2.src.rpm


Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/devel/glipper.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glipper.spec	21 Nov 2006 19:23:49 -0000	1.7
+++ glipper.spec	21 Nov 2006 20:04:13 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           glipper
 Version:        0.95.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
 Group:          Applications/Text
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils, libgnome-devel
 
 
 %description
@@ -47,7 +47,10 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
-* Tue Nov 21 2006 Damien Durand  - 0.95.1
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-2
+- Add libgnome-devel in BR
+
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-1
 - Upgrade to 0.95.1
 
 * Sun Nov 18 2006 Damien Durand  - 0.95-3



From fedora-extras-commits at redhat.com  Tue Nov 21 20:24:42 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 15:24:42 -0500
Subject: rpms/beryl-core/devel beryl-core.spec,1.3,1.4
Message-ID: <200611212024.kALKOgrU027932@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27912

Modified Files:
	beryl-core.spec 
Log Message:
Disable R: on vidcap pkg until its in FE, fix up some GL library linking, fix R:/BR: on mesa-libGL-devel


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-core.spec	16 Nov 2006 23:22:09 -0000	1.3
+++ beryl-core.spec	21 Nov 2006 20:24:12 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
-BuildRequires:  libXinerama-devel
+BuildRequires:  libXinerama-devel, mesa-libGL-devel >= 6.5-9
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -46,6 +46,7 @@
 Requires: libXdamage-devel, libXcomposite-devel >= 0.3
 Requires: libXext-devel, libXinerama-devel, libXrandr-devel
 Requires: libSM-devel, libpng-devel, startup-notification-devel
+Requires: mesa-libGL-devel >= 6.5-9
 
 %description devel
 The beryl-core-devel package includes the header
@@ -70,7 +71,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
 Requires: beryl-plugins >= %{version}, beryl-dbus >= %{version}
-Requires: beryl-vidcap >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: heliodor >= %{version}
 
@@ -84,7 +85,8 @@
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
-Requires: beryl-plugins >= %{version}, beryl-vidcap >= %{version}
+Requires: beryl-plugins >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: aquamarine >= %{version}
 
@@ -101,7 +103,7 @@
 
 
 %build
-%configure
+%configure --x-includes=%{_includedir}/X11/ --x-libraries=%{_libdir}/X11/
 ln -s %{_includedir}/X11 mesa/include/
 ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
 # Parallel builds currently broken
@@ -152,6 +154,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 21 2006 Jarod Wilson  0.1.2-6
+- Dump R: beryl-vidcap until its into FE
+- Fix up GL library linking to resolve some undefined symbols
+- R: and BR: for mesa-libGL-devel
+
 * Thu Nov 16 2006 Jarod Wilson  0.1.2-5
 - Add BR: libXinerama-devel
 - Fix up R: for beryl-core-devel



From fedora-extras-commits at redhat.com  Tue Nov 21 20:29:22 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Tue, 21 Nov 2006 15:29:22 -0500
Subject: rpms/beryl-core/FC-6 beryl-core.spec,1.3,1.4
Message-ID: <200611212029.kALKTMA2028045@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-serv28023

Modified Files:
	beryl-core.spec 
Log Message:
Disable R: on vidcap pkg until its in FE, fix up some GL library linking, fix R:/BR: on mesa-libGL-devel


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-core.spec	16 Nov 2006 23:22:54 -0000	1.3
+++ beryl-core.spec	21 Nov 2006 20:28:51 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
-BuildRequires:  libXinerama-devel
+BuildRequires:  libXinerama-devel, mesa-libGL-devel >= 6.5-9
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -46,6 +46,7 @@
 Requires: libXdamage-devel, libXcomposite-devel >= 0.3
 Requires: libXext-devel, libXinerama-devel, libXrandr-devel
 Requires: libSM-devel, libpng-devel, startup-notification-devel
+Requires: mesa-libGL-devel >= 6.5-9
 
 %description devel
 The beryl-core-devel package includes the header
@@ -70,7 +71,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
 Requires: beryl-plugins >= %{version}, beryl-dbus >= %{version}
-Requires: beryl-vidcap >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: heliodor >= %{version}
 
@@ -84,7 +85,8 @@
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
-Requires: beryl-plugins >= %{version}, beryl-vidcap >= %{version}
+Requires: beryl-plugins >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: aquamarine >= %{version}
 
@@ -101,7 +103,7 @@
 
 
 %build
-%configure
+%configure --x-includes=%{_includedir}/X11/ --x-libraries=%{_libdir}/X11/
 ln -s %{_includedir}/X11 mesa/include/
 ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
 # Parallel builds currently broken
@@ -152,6 +154,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 21 2006 Jarod Wilson  0.1.2-6
+- Dump R: beryl-vidcap until its into FE
+- Fix up GL library linking to resolve some undefined symbols
+- R: and BR: for mesa-libGL-devel
+
 * Thu Nov 16 2006 Jarod Wilson  0.1.2-5
 - Add BR: libXinerama-devel
 - Fix up R: for beryl-core-devel



From fedora-extras-commits at redhat.com  Tue Nov 21 21:00:18 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:00:18 -0500
Subject: rpms/gtkmozembedmm - New directory
Message-ID: <200611212100.kALL0Iti028948@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944/gtkmozembedmm

Log Message:
Directory /cvs/extras/rpms/gtkmozembedmm added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 21:00:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:00:23 -0500
Subject: rpms/gtkmozembedmm/devel - New directory
Message-ID: <200611212100.kALL0NlU028961@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944/gtkmozembedmm/devel

Log Message:
Directory /cvs/extras/rpms/gtkmozembedmm/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 21 21:00:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:00:48 -0500
Subject: rpms/gtkmozembedmm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611212100.kALL0mwZ028999@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28993

Added Files:
	Makefile import.log 
Log Message:
Setup of module gtkmozembedmm


--- NEW FILE Makefile ---
# Top level Makefile for module gtkmozembedmm
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  Tue Nov 21 21:00:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:00:48 -0500
Subject: rpms/gtkmozembedmm/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611212100.kALL0m9I029015@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28993/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtkmozembedmm


--- 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 Nov 21 21:02:37 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:02:37 -0500
Subject: rpms/gtkmozembedmm import.log,1.1,1.2
Message-ID: <200611212102.kALL2b5l029136@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100

Modified Files:
	import.log 
Log Message:
auto-import gtkmozembedmm-1.4.2.cvs20060817-5 on branch devel from gtkmozembedmm-1.4.2.cvs20060817-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Nov 2006 21:00:48 -0000	1.1
+++ import.log	21 Nov 2006 21:02:07 -0000	1.2
@@ -0,0 +1 @@
+gtkmozembedmm-1_4_2_cvs20060817-5:HEAD:gtkmozembedmm-1.4.2.cvs20060817-5.src.rpm:1164142906



From fedora-extras-commits at redhat.com  Tue Nov 21 21:02:37 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:02:37 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm-cvs.sh, NONE,
	1.1 gtkmozembedmm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611212102.kALL2baW029140@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29100/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtkmozembedmm-cvs.sh gtkmozembedmm.spec 
Log Message:
auto-import gtkmozembedmm-1.4.2.cvs20060817-5 on branch devel from gtkmozembedmm-1.4.2.cvs20060817-5.src.rpm


--- NEW FILE gtkmozembedmm-cvs.sh ---
#! /bin/bash
# script to fetch a snapshot of gtkmozembedmm from cvs
# and generate a tarball suitable for building a rpm
# by H. Gu??mar v. 0.1 du 12/09/2006


# date format YYYYMMDD
TIME="2006-08-17"
TIME_STAMP="20060817"

if ( (test -d gtkmozembedmm) || (test -d gtkmozembedmm-1.4.2.cvs${TIME_STAMP})); then
    rm -rf ./gtkmozembedmm*/
    echo "@ previous cvs snapshot has been deleted"
fi
echo "***** Please hit Enter when asked to login *****"
cvs -d :pserver:anonymous at anoncvs.gnome.org:/cvs/gnome login
# get CVS snapshot
# use export for not including cvs files
cvs -z3 -d :pserver:anonymous at anoncvs.gnome.org:/cvs/gnome export -D${TIME}  gtkmozembedmm
if [ -d gtkmozembedmm ]; then
    echo "cvs snapshot has been successfully retrieved"
else
    echo "@ ERROR: cvs snapshot has not been retrieved"
    exit 0  
fi

# launch autogen.sh script
echo "***** Generate autotools scripts *****"
cd gtkmozembedmm
# dirty workaround not to launch configure script
sed 's/.*maintainer/# &'/ autogen.sh > autogen.tmp
mv autogen.tmp autogen.sh
chmod +x autogen.sh
sh autogen.sh
cd ..

# Build tarball
if ( test -e gtkmozembedmm-1.4.2.cvs${TIME_STAMP}.tar.bz2); then
    rm gtkmozembedmm-1.4.2.cvs${TIME_STAMP}.tar.bz2
    echo "@ previous tarball has been deleted"
fi
echo "***** tarball build *****"
mv ./gtkmozembedmm/ gtkmozembedmm-1.4.2.cvs${TIME_STAMP}
tar -cjf gtkmozembedmm-1.4.2.cvs${TIME_STAMP}.tar.bz2 ./gtkmozembedmm-1.4.2.cvs${TIME_STAMP}/
if ( test -e gtkmozembedmm-1.4.2.cvs${TIME_STAMP}.tar.bz2); then
    echo "@ Success"
else
    echo "@ ERROR: tarball has not been built"
fi


--- NEW FILE gtkmozembedmm.spec ---
Name:           gtkmozembedmm
Version:        1.4.2.cvs20060817
Release:        5%{?dist}

Summary:        C++ wrapper for GtkMozembed

Group:          System Environment/Libraries
License:        LGPL
URL:            http://gtkmm.sourceforge.net/
Source0:        gtkmozembedmm-%{version}.tar.bz2
# script to generate tarball from cvs
Source1:        gtkmozembedmm-cvs.sh
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


BuildRequires:  gtkmm24-devel >= 2.4.0
BuildRequires:  gnome-vfsmm26 >= 2.12.0
BuildRequires:  libgnomemm26 >= 2.12.0
BuildRequires:  libgnomeuimm26-devel >= 2.12.0
# Use mozilla-devel up to FC5, and firefox-devel for FC6+
%if %{!?fedora:6}%{?fedora} >= 6
BuildRequires: gecko-devel 
Requires: gecko-libs = 1.5.0.8
%else
BuildRequires: mozilla-devel
%endif
BuildRequires:  automake >= 1.9.6
BuildRequires:  libtool
Requires(post):   /sbin/ldconfig
Requires(postun): /sbin/ldconfig


%description
This package provides a C++/gtkmm wrapper for GtkMozEmbed 
from Mozilla 1.4.x to 1.7.x.
The wrapper provides a convenient interface for C++ programmers 
to use the Gtkmozembed HTML-rendering widget inside their software.

%package devel
Summary:        Headers for developing programs that will use gtkmozembedmm
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtkmm24-devel
%if %{!?fedora:6}%{?fedora} >= 6
BuildRequires: gecko-devel
%else
BuildRequires: mozilla-devel 
%endif

%description devel
This package contains the headers that programmers will need to
develop applications which will use gtkmozembedmm.


%prep
%setup -q -n gtkmozembedmm-%{version}
%if %{!?fedora:6}%{?fedora} >= 6
%{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
%endif
%ifarch x86_64
# correct a path issue that prevent gtkmozembedmm to build on x86_64
%{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure
%{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure.ac
%endif

%build
# enable maintainer specific parts in makefiles
# prevent the build to fail
%configure --disable-static   --enable-maintainer-mode "$@"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so
mkdir $RPM_BUILD_ROOT%{_includedir}/gtkmozembedmm-1.4/proc/
mv $RPM_BUILD_ROOT%{_libdir}/gtkmozembedmm-1.4/include/gtkmozembedmmconfig.h \
   $RPM_BUILD_ROOT%{_includedir}/gtkmozembedmm-1.4/gtkmozembedmmconfig.h
mv $RPM_BUILD_ROOT%{_libdir}/gtkmozembedmm-1.4/proc \
   $RPM_BUILD_ROOT%{_includedir}/gtkmozembedmm-1.4/proc/

%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog TODO NEWS README
%{_libdir}/*.so.*

%files devel
%defattr(-, root, root, -)
%doc
%{_includedir}/gtkmozembedmm-1.4/
%{_libdir}/*.so
%{_libdir}/gtkmozembedmm-1.4/
%{_libdir}/pkgconfig/*.pc


%changelog
* Sun Nov 12 2006 Karl  - 1.4.2.cvs20060817-5
- Fixed x86_64 build issue.

* Tue Sep 12 2006 Karl  - 1.4.2.cvs20060817-4
- fixed shared lib permission, moved m4 macros into /usr/include, 
added libtool as BR, provides a script to generate cvs snapshot.

* Fri Sep 08 2006 Karl  - 1.4.2.cvs20060817-3
- added automake as BR, conditional dependency on firefox-devel for 
FC6+ to build under Mock.

* Thu Aug 17 2006 Karl  - 1.4.2.cvs20060817-2
- updated to cvs20060817

* Sat May 20 2006 Karl  - 1.4.2-1
- First Packaging from cvs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 21:00:48 -0000	1.1
+++ .cvsignore	21 Nov 2006 21:02:07 -0000	1.2
@@ -0,0 +1 @@
+gtkmozembedmm-1.4.2.cvs20060817.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 21:00:48 -0000	1.1
+++ sources	21 Nov 2006 21:02:07 -0000	1.2
@@ -0,0 +1 @@
+2151171fb009ee69dc8e7e3ffec1b578  gtkmozembedmm-1.4.2.cvs20060817.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 21:07:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:07:52 -0500
Subject: owners owners.list,1.1986,1.1987
Message-ID: <200611212107.kALL7qTk029205@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29188

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1986
retrieving revision 1.1987
diff -u -r1.1986 -r1.1987
--- owners.list	21 Nov 2006 18:01:48 -0000	1.1986
+++ owners.list	21 Nov 2006 21:07:22 -0000	1.1987
@@ -656,6 +656,7 @@
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmozembedmm|A C++ wrapper for gtkmozembed widget|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtksharp|gtk 1.2 bindings for mono|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gtksourceview-sharp|C# bindings for gtksourceview|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 21 21:21:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Tue, 21 Nov 2006 16:21:45 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.1,1.2
Message-ID: <200611212121.kALLLj6r029685@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29649

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkmozembedmm.spec	21 Nov 2006 21:02:07 -0000	1.1
+++ gtkmozembedmm.spec	21 Nov 2006 21:21:15 -0000	1.2
@@ -17,10 +17,10 @@
 BuildRequires:  gnome-vfsmm26 >= 2.12.0
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
-# Use mozilla-devel up to FC5, and firefox-devel for FC6+
+# Use mozilla-devel up to FC5, and gecko-devel for FC6+
 %if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: gecko-devel 
-Requires: gecko-libs = 1.5.0.8
+Requires: gecko-libs = 2.0
 %else
 BuildRequires: mozilla-devel
 %endif



From fedora-extras-commits at redhat.com  Tue Nov 21 21:43:29 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:43:29 -0500
Subject: rpms/moomps/devel .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <200611212143.kALLhTHS030010@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29993

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Oct 2006 18:12:34 -0000	1.9
+++ .cvsignore	21 Nov 2006 21:42:59 -0000	1.10
@@ -1 +1 @@
-moomps-5.7.tar.bz2
+moomps-5.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Oct 2006 18:12:34 -0000	1.9
+++ sources	21 Nov 2006 21:42:59 -0000	1.10
@@ -1 +1 @@
-47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2
+24f49a6df9c0701d23f99d62b030d72b  moomps-5.8.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 21:44:23 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:44:23 -0500
Subject: rpms/moodss/devel .cvsignore,1.11,1.12 sources,1.12,1.13
Message-ID: <200611212144.kALLiNGG030053@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30016

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 19:37:39 -0000	1.11
+++ .cvsignore	21 Nov 2006 21:43:53 -0000	1.12
@@ -1 +0,0 @@
-moodss-21.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2006 19:37:40 -0000	1.12
+++ sources	21 Nov 2006 21:43:53 -0000	1.13
@@ -1 +0,0 @@
-3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 21:44:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 21 Nov 2006 16:44:42 -0500
Subject: rpms/plt-scheme/FC-6 .cvsignore, 1.8, 1.9 plt-scheme.spec, 1.28,
	1.29 sources, 1.9, 1.10
Message-ID: <200611212144.kALLigdP030058@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30035

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 360


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jul 2006 13:00:38 -0000	1.8
+++ .cvsignore	21 Nov 2006 21:44:12 -0000	1.9
@@ -1 +1 @@
-plt-352-src-unix.tgz
+plt-360-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-6/plt-scheme.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plt-scheme.spec	2 Oct 2006 20:08:12 -0000	1.28
+++ plt-scheme.spec	21 Nov 2006 21:44:12 -0000	1.29
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        352
-Release:        3%{?dist}
+Version:        360
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/352/plt/plt-352-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/360/plt/plt-360-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,7 +59,7 @@
 
 
 %prep
-%setup -q -n plt
+%setup -q -n plt-360
 %ifarch x86_64
 %patch0 -p1
 %endif
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gerard Milmeister  - 360-1
+- new version 360
+
 * Mon Oct  2 2006 Gerard Milmeister  - 352-3
 - rename conflicting binary planet to plt-planet
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2006 13:00:38 -0000	1.9
+++ sources	21 Nov 2006 21:44:12 -0000	1.10
@@ -1 +1 @@
-e79fd305fe431e0477f861902f2ef9e1  plt-352-src-unix.tgz
+84bcab3ff30c333ae3c6b732518bdf27  plt-360-src-unix.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 21:47:07 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:47:07 -0500
Subject: rpms/moodss/devel .cvsignore,1.12,1.13 sources,1.13,1.14
Message-ID: <200611212147.kALLl71X030137@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30115

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Nov 2006 21:43:53 -0000	1.12
+++ .cvsignore	21 Nov 2006 21:46:37 -0000	1.13
@@ -0,0 +1 @@
+moodss-21.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Nov 2006 21:43:53 -0000	1.13
+++ sources	21 Nov 2006 21:46:37 -0000	1.14
@@ -0,0 +1 @@
+4d05f8135c05d7f39dd0a8868c899897  moodss-21.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 21:49:01 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:49:01 -0500
Subject: rpms/moodss/devel moodss.spec,1.25,1.26
Message-ID: <200611212149.kALLn1Nv030174@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30149

Modified Files:
	moodss.spec 
Log Message:
21.5 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- moodss.spec	31 Oct 2006 19:44:28 -0000	1.25
+++ moodss.spec	21 Nov 2006 21:48:31 -0000	1.26
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.4
+Version: 21.5
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.5.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  21.5-1
+- 21.5 upstream release
+
 * Mon Oct 25 2006 Jean-Luc Fontaine  21.4-1
 - 21.4 upstream release
 



From fedora-extras-commits at redhat.com  Tue Nov 21 21:51:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 21 Nov 2006 16:51:17 -0500
Subject: rpms/plt-scheme/FC-5 .cvsignore, 1.8, 1.9 plt-scheme.spec, 1.27,
	1.28 sources, 1.9, 1.10
Message-ID: <200611212151.kALLpHwL030263@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30226/FC-5

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 360


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jul 2006 12:57:29 -0000	1.8
+++ .cvsignore	21 Nov 2006 21:50:47 -0000	1.9
@@ -1 +1 @@
-plt-352-src-unix.tgz
+plt-360-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-5/plt-scheme.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- plt-scheme.spec	2 Oct 2006 20:10:46 -0000	1.27
+++ plt-scheme.spec	21 Nov 2006 21:50:47 -0000	1.28
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        352
-Release:        3%{?dist}
+Version:        360
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/352/plt/plt-352-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/360/plt/plt-360-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,7 +59,7 @@
 
 
 %prep
-%setup -q -n plt
+%setup -q -n plt-360
 %ifarch x86_64
 %patch0 -p1
 %endif
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gerard Milmeister  - 360-1
+- new version 360
+
 * Mon Oct  2 2006 Gerard Milmeister  - 352-3
 - rename conflicting binary planet to plt-planet
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2006 12:57:29 -0000	1.9
+++ sources	21 Nov 2006 21:50:47 -0000	1.10
@@ -1 +1 @@
-e79fd305fe431e0477f861902f2ef9e1  plt-352-src-unix.tgz
+84bcab3ff30c333ae3c6b732518bdf27  plt-360-src-unix.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 21:51:17 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Tue, 21 Nov 2006 16:51:17 -0500
Subject: rpms/plt-scheme/devel .cvsignore, 1.8, 1.9 plt-scheme.spec, 1.28,
	1.29 sources, 1.9, 1.10
Message-ID: <200611212151.kALLpH3S030268@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30226/devel

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version 360


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jul 2006 13:00:38 -0000	1.8
+++ .cvsignore	21 Nov 2006 21:50:47 -0000	1.9
@@ -1 +1 @@
-plt-352-src-unix.tgz
+plt-360-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plt-scheme.spec	2 Oct 2006 20:08:12 -0000	1.28
+++ plt-scheme.spec	21 Nov 2006 21:50:47 -0000	1.29
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        352
-Release:        3%{?dist}
+Version:        360
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/352/plt/plt-352-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/360/plt/plt-360-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,7 +59,7 @@
 
 
 %prep
-%setup -q -n plt
+%setup -q -n plt-360
 %ifarch x86_64
 %patch0 -p1
 %endif
@@ -138,6 +138,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Gerard Milmeister  - 360-1
+- new version 360
+
 * Mon Oct  2 2006 Gerard Milmeister  - 352-3
 - rename conflicting binary planet to plt-planet
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Jul 2006 13:00:38 -0000	1.9
+++ sources	21 Nov 2006 21:50:47 -0000	1.10
@@ -1 +1 @@
-e79fd305fe431e0477f861902f2ef9e1  plt-352-src-unix.tgz
+84bcab3ff30c333ae3c6b732518bdf27  plt-360-src-unix.tgz



From fedora-extras-commits at redhat.com  Tue Nov 21 21:51:52 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 16:51:52 -0500
Subject: rpms/moomps/devel moomps.spec,1.16,1.17
Message-ID: <200611212151.kALLpqsw030295@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30227

Modified Files:
	moomps.spec 
Log Message:
5.8 upstream release, pass library directories to make also at install stage.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- moomps.spec	12 Nov 2006 18:36:48 -0000	1.16
+++ moomps.spec	21 Nov 2006 21:51:22 -0000	1.17
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.7
-Release: 3%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.8.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl >= 8.4.7
@@ -32,7 +32,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOTDIR=$RPM_BUILD_ROOT install
+make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir TCLLIBDIR=%_libdir install
 
 %pre
 # if not present, add moomps user (even when upgrading):
@@ -80,6 +80,10 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  5.8-1
+- 5.8 upstream release
+- pass library directories to make also at install stage
+
 * Tue Nov 7 2006 Jean-Luc Fontaine  5.7-3
 - made package architecture dependant since for example Tcl
   packages are under /usr/lib on i386 and /usr/lib64 on x86_64



From fedora-extras-commits at redhat.com  Tue Nov 21 22:04:29 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 17:04:29 -0500
Subject: rpms/ortp/FC-6 .cvsignore, 1.5, 1.6 ortp.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200611212204.kALM4TgS030469@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30447

Modified Files:
	.cvsignore ortp.spec sources 
Log Message:
Update to 0.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 13:16:53 -0000	1.5
+++ .cvsignore	21 Nov 2006 22:03:59 -0000	1.6
@@ -1 +1 @@
-ortp-0.11.0.tar.gz
+ortp-0.12.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-6/ortp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ortp.spec	9 Oct 2006 14:33:45 -0000	1.11
+++ ortp.spec	21 Nov 2006 22:03:59 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ortp
-Version:        0.11.0
-Release:        2%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -50,7 +50,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
-* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.12.0-1
+- Update to 0.12.0
+
+* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-2
 - Bring back -Werror patch (needed for building on PPC)
 
 * Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 13:16:53 -0000	1.5
+++ sources	21 Nov 2006 22:03:59 -0000	1.6
@@ -1 +1 @@
-c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz
+c36142acaed25806824dd4fac1d666b3  ortp-0.12.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 22:11:44 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 17:11:44 -0500
Subject: rpms/ortp/devel .cvsignore, 1.5, 1.6 ortp.spec, 1.11, 1.12 sources, 
	1.5, 1.6
Message-ID: <200611212211.kALMBi1L030559@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30540

Modified Files:
	.cvsignore ortp.spec sources 
Log Message:
Update to 0.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 13:16:53 -0000	1.5
+++ .cvsignore	21 Nov 2006 22:11:14 -0000	1.6
@@ -1 +1 @@
-ortp-0.11.0.tar.gz
+ortp-0.12.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ortp.spec	9 Oct 2006 14:33:45 -0000	1.11
+++ ortp.spec	21 Nov 2006 22:11:14 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           ortp
-Version:        0.11.0
-Release:        2%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -50,7 +50,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
-* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.12.0-1
+- Update to 0.12.0
+
+* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-2
 - Bring back -Werror patch (needed for building on PPC)
 
 * Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 13:16:53 -0000	1.5
+++ sources	21 Nov 2006 22:11:14 -0000	1.6
@@ -1 +1 @@
-c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz
+c36142acaed25806824dd4fac1d666b3  ortp-0.12.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 22:12:44 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 17:12:44 -0500
Subject: rpms/ortp/FC-5 .cvsignore, 1.5, 1.6 ortp.spec, 1.10, 1.11 sources,
	1.5, 1.6
Message-ID: <200611212212.kALMCi4f030622@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/ortp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30603

Modified Files:
	.cvsignore ortp.spec sources 
Log Message:
Update to 0.12.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Oct 2006 14:07:19 -0000	1.5
+++ .cvsignore	21 Nov 2006 22:12:14 -0000	1.6
@@ -1 +1 @@
-ortp-0.11.0.tar.gz
+ortp-0.12.0.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/ortp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ortp.spec	9 Oct 2006 14:52:52 -0000	1.10
+++ ortp.spec	21 Nov 2006 22:12:14 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ortp
-Version:        0.11.0
-Release:        2%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
@@ -50,7 +50,10 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
-* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 0.12.0-1
+- Update to 0.12.0
+
+* Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-2
 - Bring back -Werror patch (needed for building on PPC)
 
 * Mon Oct  9 2006 Jeffrey C. Ollie  - 0.11.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Oct 2006 14:07:19 -0000	1.5
+++ sources	21 Nov 2006 22:12:14 -0000	1.6
@@ -1 +1 @@
-c2595b0caf99f922946fcb16e3250787  ortp-0.11.0.tar.gz
+c36142acaed25806824dd4fac1d666b3  ortp-0.12.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 21 22:30:48 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 17:30:48 -0500
Subject: rpms/moodss/FC-5 .cvsignore, 1.11, 1.12 moodss.spec, 1.24,
	1.25 sources, 1.12, 1.13
Message-ID: <200611212230.kALMUmHJ030839@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30818

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.5 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 19:46:33 -0000	1.11
+++ .cvsignore	21 Nov 2006 22:30:18 -0000	1.12
@@ -1 +1 @@
-moodss-21.4.tar.bz2
+moodss-21.5.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/moodss.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- moodss.spec	31 Oct 2006 19:46:33 -0000	1.24
+++ moodss.spec	21 Nov 2006 22:30:18 -0000	1.25
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.4
+Version: 21.5
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.5.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  21.5-1
+- 21.5 upstream release
+
 * Mon Oct 25 2006 Jean-Luc Fontaine  21.4-1
 - 21.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2006 19:46:33 -0000	1.12
+++ sources	21 Nov 2006 22:30:18 -0000	1.13
@@ -1 +1 @@
-3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2
+4d05f8135c05d7f39dd0a8868c899897  moodss-21.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 22:32:12 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 17:32:12 -0500
Subject: rpms/moodss/FC-6 .cvsignore, 1.11, 1.12 moodss.spec, 1.25,
	1.26 sources, 1.12, 1.13
Message-ID: <200611212232.kALMWCuj030904@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30883

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.5 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Oct 2006 19:57:18 -0000	1.11
+++ .cvsignore	21 Nov 2006 22:31:42 -0000	1.12
@@ -1 +1 @@
-moodss-21.4.tar.bz2
+moodss-21.5.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/moodss.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- moodss.spec	31 Oct 2006 19:57:18 -0000	1.25
+++ moodss.spec	21 Nov 2006 22:31:42 -0000	1.26
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.4
+Version: 21.5
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.5.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  21.5-1
+- 21.5 upstream release
+
 * Mon Oct 25 2006 Jean-Luc Fontaine  21.4-1
 - 21.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2006 19:57:18 -0000	1.12
+++ sources	21 Nov 2006 22:31:42 -0000	1.13
@@ -1 +1 @@
-3d311da4a8bec35562650c9efebf0381  moodss-21.4.tar.bz2
+4d05f8135c05d7f39dd0a8868c899897  moodss-21.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 22:35:24 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 17:35:24 -0500
Subject: rpms/moomps/FC-5 .cvsignore, 1.9, 1.10 moomps.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <200611212235.kALMZOiA030980@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30961

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.8 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Oct 2006 18:51:57 -0000	1.9
+++ .cvsignore	21 Nov 2006 22:34:54 -0000	1.10
@@ -1 +1 @@
-moomps-5.7.tar.bz2
+moomps-5.8.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- moomps.spec	4 Nov 2006 12:29:30 -0000	1.14
+++ moomps.spec	21 Nov 2006 22:34:54 -0000	1.15
@@ -1,12 +1,11 @@
 Name: moomps
-Version: 5.7
-Release: 2%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.8.tar.bz2
 URL: http://moodss.sourceforge.net/
-BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl >= 8.4.7
 Requires(pre): fedora-usermgmt >= 0.8
@@ -33,7 +32,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOTDIR=$RPM_BUILD_ROOT install
+make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir TCLLIBDIR=%_libdir install
 
 %pre
 # if not present, add moomps user (even when upgrading):
@@ -81,6 +80,14 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  5.8-1
+- 5.8 upstream release
+- pass library directories to make also at install stage
+
+* Tue Nov 7 2006 Jean-Luc Fontaine  5.7-3
+- made package architecture dependant since for example Tcl
+  packages are under /usr/lib on i386 and /usr/lib64 on x86_64
+
 * Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
 - properly support 64 bit architecture by passing library
   directories to make


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Oct 2006 18:51:57 -0000	1.9
+++ sources	21 Nov 2006 22:34:54 -0000	1.10
@@ -1 +1 @@
-47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2
+24f49a6df9c0701d23f99d62b030d72b  moomps-5.8.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 22:36:45 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Tue, 21 Nov 2006 17:36:45 -0500
Subject: rpms/moomps/FC-6 .cvsignore, 1.9, 1.10 moomps.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <200611212236.kALMaj88031043@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31024

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.8 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Oct 2006 18:54:15 -0000	1.9
+++ .cvsignore	21 Nov 2006 22:36:15 -0000	1.10
@@ -1 +1 @@
-moomps-5.7.tar.bz2
+moomps-5.8.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/moomps.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- moomps.spec	4 Nov 2006 12:28:04 -0000	1.15
+++ moomps.spec	21 Nov 2006 22:36:15 -0000	1.16
@@ -1,12 +1,11 @@
 Name: moomps
-Version: 5.7
-Release: 2%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.7.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.8.tar.bz2
 URL: http://moodss.sourceforge.net/
-BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl >= 8.4.7
 Requires(pre): fedora-usermgmt >= 0.8
@@ -33,7 +32,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make ROOTDIR=$RPM_BUILD_ROOT install
+make ROOTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir TCLLIBDIR=%_libdir install
 
 %pre
 # if not present, add moomps user (even when upgrading):
@@ -81,6 +80,14 @@
 
 
 %changelog
+* Sun Nov 12 2006 Jean-Luc Fontaine  5.8-1
+- 5.8 upstream release
+- pass library directories to make also at install stage
+
+* Tue Nov 7 2006 Jean-Luc Fontaine  5.7-3
+- made package architecture dependant since for example Tcl
+  packages are under /usr/lib on i386 and /usr/lib64 on x86_64
+
 * Sat Nov 4 2006 Jean-Luc Fontaine  5.7-2
 - properly support 64 bit architecture by passing library
   directories to make


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 Oct 2006 18:54:15 -0000	1.9
+++ sources	21 Nov 2006 22:36:15 -0000	1.10
@@ -1 +1 @@
-47d3f8c78b5d99c7b95893e14c12fade  moomps-5.7.tar.bz2
+24f49a6df9c0701d23f99d62b030d72b  moomps-5.8.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 21 23:57:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 18:57:29 -0500
Subject: rpms/php-pear-MDB2/devel .cvsignore, 1.2, 1.3 php-pear-MDB2.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611212357.kALNvTBv032359@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32340

Modified Files:
	.cvsignore php-pear-MDB2.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 22:02:55 -0000	1.2
+++ .cvsignore	21 Nov 2006 23:56:59 -0000	1.3
@@ -1 +1 @@
-MDB2-2.2.2.tgz
+MDB2-2.3.0.tgz


Index: php-pear-MDB2.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/devel/php-pear-MDB2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-MDB2.spec	7 Sep 2006 01:41:33 -0000	1.2
+++ php-pear-MDB2.spec	21 Nov 2006 23:56:59 -0000	1.3
@@ -2,8 +2,8 @@
 %define ClassName MDB2
 
 Name:           php-pear-MDB2
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -48,6 +48,7 @@
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{ClassName}/LICENSE docdir/%{ClassName}/docs
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,6 +83,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Christopher Stone  2.3.0-1
+- Upstream sync
+- Move LICENSE file from %%{pear_datadir} to %%doc
+
 * Thu Sep 07 2006 Christopher Stone  2.2.2-2
 - Sync up with latest pear template
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 22:02:55 -0000	1.2
+++ sources	21 Nov 2006 23:56:59 -0000	1.3
@@ -1 +1 @@
-aef4a12a1c07b80118545cc43637ab43  MDB2-2.2.2.tgz
+31c7294943b665c293f1453e1c4b20a4  MDB2-2.3.0.tgz



From fedora-extras-commits at redhat.com  Wed Nov 22 00:07:00 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 19:07:00 -0500
Subject: comps comps-fe5.xml.in, 1.202, 1.203 comps-fe6.xml.in, 1.227,
	1.228 comps-fe7.xml.in, 1.26, 1.27
Message-ID: <200611220007.kAM070WU032620@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32598

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
Add Zim.



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- comps-fe5.xml.in	21 Nov 2006 10:35:31 -0000	1.202
+++ comps-fe5.xml.in	22 Nov 2006 00:06:30 -0000	1.203
@@ -785,6 +785,7 @@
       tinyerp
       tinyerp-server
       xchm
+      Zim
     
   
   


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- comps-fe6.xml.in	21 Nov 2006 19:49:58 -0000	1.227
+++ comps-fe6.xml.in	22 Nov 2006 00:06:30 -0000	1.228
@@ -837,6 +837,7 @@
       tinyerp
       tinyerp-server
       xchm
+      Zim
     
   
   


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- comps-fe7.xml.in	21 Nov 2006 19:58:50 -0000	1.26
+++ comps-fe7.xml.in	22 Nov 2006 00:06:30 -0000	1.27
@@ -837,6 +837,7 @@
       tinyerp
       tinyerp-server
       xchm
+      Zim
     
   
   



From fedora-extras-commits at redhat.com  Wed Nov 22 00:11:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 19:11:47 -0500
Subject: rpms/php-pear-MDB2/FC-6 .cvsignore, 1.2, 1.3 php-pear-MDB2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611220011.kAM0BlKE032672@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32653

Modified Files:
	.cvsignore php-pear-MDB2.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 22:02:55 -0000	1.2
+++ .cvsignore	22 Nov 2006 00:11:17 -0000	1.3
@@ -1 +1 @@
-MDB2-2.2.2.tgz
+MDB2-2.3.0.tgz


Index: php-pear-MDB2.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-6/php-pear-MDB2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-MDB2.spec	7 Sep 2006 01:41:33 -0000	1.2
+++ php-pear-MDB2.spec	22 Nov 2006 00:11:17 -0000	1.3
@@ -2,8 +2,8 @@
 %define ClassName MDB2
 
 Name:           php-pear-MDB2
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -48,6 +48,7 @@
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{ClassName}/LICENSE docdir/%{ClassName}/docs
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,6 +83,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Christopher Stone  2.3.0-1
+- Upstream sync
+- Move LICENSE file from %%{pear_datadir} to %%doc
+
 * Thu Sep 07 2006 Christopher Stone  2.2.2-2
 - Sync up with latest pear template
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 22:02:55 -0000	1.2
+++ sources	22 Nov 2006 00:11:17 -0000	1.3
@@ -1 +1 @@
-aef4a12a1c07b80118545cc43637ab43  MDB2-2.2.2.tgz
+31c7294943b665c293f1453e1c4b20a4  MDB2-2.3.0.tgz



From fedora-extras-commits at redhat.com  Wed Nov 22 00:13:16 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 21 Nov 2006 19:13:16 -0500
Subject: rpms/php-pear-MDB2/FC-5 .cvsignore, 1.2, 1.3 php-pear-MDB2.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611220013.kAM0DGBP032756@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32737

Modified Files:
	.cvsignore php-pear-MDB2.spec sources 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2006 22:02:55 -0000	1.2
+++ .cvsignore	22 Nov 2006 00:12:46 -0000	1.3
@@ -1 +1 @@
-MDB2-2.2.2.tgz
+MDB2-2.3.0.tgz


Index: php-pear-MDB2.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-5/php-pear-MDB2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-MDB2.spec	7 Sep 2006 01:41:33 -0000	1.2
+++ php-pear-MDB2.spec	22 Nov 2006 00:12:46 -0000	1.3
@@ -2,8 +2,8 @@
 %define ClassName MDB2
 
 Name:           php-pear-MDB2
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        Database Abstraction Layer
 
 Group:          Development/Libraries
@@ -48,6 +48,7 @@
 # Move documentation
 mkdir -p docdir
 mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_datadir}/%{ClassName}/LICENSE docdir/%{ClassName}/docs
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,6 +83,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Christopher Stone  2.3.0-1
+- Upstream sync
+- Move LICENSE file from %%{pear_datadir} to %%doc
+
 * Thu Sep 07 2006 Christopher Stone  2.2.2-2
 - Sync up with latest pear template
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2006 22:02:55 -0000	1.2
+++ sources	22 Nov 2006 00:12:46 -0000	1.3
@@ -1 +1 @@
-aef4a12a1c07b80118545cc43637ab43  MDB2-2.2.2.tgz
+31c7294943b665c293f1453e1c4b20a4  MDB2-2.3.0.tgz



From fedora-extras-commits at redhat.com  Wed Nov 22 01:04:42 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 21 Nov 2006 20:04:42 -0500
Subject: rpms/db4o/devel .cvsignore, 1.2, 1.3 db4o.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200611220104.kAM14gxm000716@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/db4o/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv681/devel

Modified Files:
	.cvsignore db4o.spec sources 
Log Message:
auto-import db4o-6.0-3.1 on branch devel from db4o-6.0-3.1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/db4o/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Aug 2006 15:36:27 -0000	1.2
+++ .cvsignore	22 Nov 2006 01:04:12 -0000	1.3
@@ -1 +1 @@
-db4o-5.5-mono.tar.gz
+db4o-6.0-mono.tar.gz


Index: db4o.spec
===================================================================
RCS file: /cvs/extras/rpms/db4o/devel/db4o.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- db4o.spec	31 Aug 2006 22:09:49 -0000	1.4
+++ db4o.spec	22 Nov 2006 01:04:12 -0000	1.5
@@ -2,11 +2,11 @@
 
 Summary: A native OODBMS for Java/.NET/Mono - Mono version
 Name: db4o
-Version: 5.5
-Release: 10%{?dist}
+Version: 6.0
+Release: 3.1%{?dist}
 License: GPL
 Group: Development/Libraries
-Source: http://213.203.204.172/downloads/db4o-5.5-mono.tar.gz
+Source: http://213.203.204.172/downloads/%{name}-%{version}-mono.tar.gz
 URL: http://www.db4o.com/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: mono-devel
@@ -34,23 +34,32 @@
 
 %prep
 %setup -q 
-sed -i 's/\r//' doc/tutorial/vb/index.html
-sed -i 's/\r//' doc/tutorial/index.html
+#sed -i 's/\r//' doc/tutorial/vb/index.html
+#sed -i 's/\r//' doc/tutorial/index.html
 sed 's!/usr/lib!%{_libdir}!' -i Makefile
 
 %build
 rm -rf %{buildroot}
-make buildtest
+make
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig
 mkdir -p %{buildroot}/%{_libdir}/mono/gac
-gacutil -i dll/db4o.dll -f -package db4o -root %{buildroot}%{_libdir}
+mkdir -p %{buildroot}/%{_bindir}
+gacutil -i bin/Db4objects.Db4o.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i bin/Db4objects.Db4o.Tools.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i bin/Db4oUnit.dll -f -package db4o -root %{buildroot}%{_libdir}
+gacutil -i bin/Db4oUnit.Extensions.dll -f -package db4o -root %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_libdir}/mono/db4o
 cp %{buildroot}%{_libdir}/db4o/* %{buildroot}%{_libdir}/mono/db4o
 rm -rf %{buildroot}%{_libdir}/db4o
+cp bin/*.exe %{buildroot}%{_bindir}/
+mv %{buildroot}%{_bindir}/Db4oAdmin.exe %{buildroot}%{_bindir}/Db4oAdmin
+mv %{buildroot}%{_bindir}/Db4objects.Db4o.Tests.exe %{buildroot}%{_bindir}/Db4oTests
+#ln -s %{buildroot}%{_bindir}/Db4oAdmin %{buildroot}/%{_libdir}/mono/db4o/Db4oAdmin.exe
+#ln -s %{buildroot}%{_bindir}/Db4oTests %{buildroot}/%{_libdir}/mono/db4o/Db4objects.Db4o.Tests.exe
 
 cat <%{buildroot}/%{_libdir}/pkgconfig/db4o.pc
 prefix=%{_prefix}
@@ -59,8 +68,8 @@
 
 Name: db4o
 Description: db4o - an object based database system
-Version: 5.5
-Libs: -r:%{_libdir}/mono/db4o/db4o.dll
+Version: 6.0
+Libs: -r:%{_libdir}/mono/db4o/Db4objects.Db4o.dll
 EOF
 
 %clean
@@ -68,9 +77,9 @@
 
 %files
 %defattr(-,root,root)
-%doc README.txt
+%{_bindir}/*
 %{_libdir}/mono/db4o/
-%{_libdir}/mono/gac/db4o/
+%{_libdir}/mono/gac/Db4*
 
 %files doc
 %doc doc/*
@@ -79,6 +88,10 @@
 %{_libdir}/pkgconfig/db4o.pc
 
 %changelog
+* Wed Nov 22 2006 Paul F. Johnson  6.0.3-1
+- bump to new dev version
+- minor spec file fixes
+
 * Wed Aug 24 2006 Paul F. Johnson  5.5-10
 - Removed monodir hack
 - Added makefile patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/db4o/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Aug 2006 15:36:27 -0000	1.2
+++ sources	22 Nov 2006 01:04:12 -0000	1.3
@@ -1 +1 @@
-4aea1da3b96a2b92c9ac69ee2ccb9a63  db4o-5.5-mono.tar.gz
+35ec1e62a326012df46eecbf48d41e2b  db4o-6.0-mono.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 01:04:42 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 21 Nov 2006 20:04:42 -0500
Subject: rpms/db4o import.log,1.4,1.5
Message-ID: <200611220104.kAM14g77000711@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/db4o
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv681

Modified Files:
	import.log 
Log Message:
auto-import db4o-6.0-3.1 on branch devel from db4o-6.0-3.1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/db4o/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	31 Aug 2006 22:09:48 -0000	1.4
+++ import.log	22 Nov 2006 01:04:12 -0000	1.5
@@ -1,3 +1,4 @@
 db4o-5_5-7:HEAD:db4o-5.5-7.src.rpm:1155137782
 db4o-5_5-9:HEAD:db4o-5.5-9.src.rpm:1156458606
 db4o-5_5-10:HEAD:db4o-5.5-10.src.rpm:1157062175
+db4o-6_0-3_1:HEAD:db4o-6.0-3.1.src.rpm:1164157457



From fedora-extras-commits at redhat.com  Wed Nov 22 02:06:27 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:06:27 -0500
Subject: rpms/labyrinth - New directory
Message-ID: <200611220206.kAM26RMv001035@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031/labyrinth

Log Message:
Directory /cvs/extras/rpms/labyrinth added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 02:06:33 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:06:33 -0500
Subject: rpms/labyrinth/devel - New directory
Message-ID: <200611220206.kAM26W6O001048@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031/labyrinth/devel

Log Message:
Directory /cvs/extras/rpms/labyrinth/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 02:06:43 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:06:43 -0500
Subject: rpms/labyrinth Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611220206.kAM26hka001078@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1072

Added Files:
	Makefile import.log 
Log Message:
Setup of module labyrinth


--- NEW FILE Makefile ---
# Top level Makefile for module labyrinth
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  Wed Nov 22 02:06:48 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:06:48 -0500
Subject: rpms/labyrinth/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611220206.kAM26mAx001093@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1072/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module labyrinth


--- 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 Nov 22 02:07:46 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:07:46 -0500
Subject: rpms/labyrinth import.log,1.1,1.2
Message-ID: <200611220207.kAM27kU4001176@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1140

Modified Files:
	import.log 
Log Message:
auto-import labyrinth-0.3-1 on branch devel from labyrinth-0.3-1.src.rpm
Initial import (APPROVED in bug #216363)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/labyrinth/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 02:06:43 -0000	1.1
+++ import.log	22 Nov 2006 02:07:16 -0000	1.2
@@ -0,0 +1 @@
+labyrinth-0_3-1:HEAD:labyrinth-0.3-1.src.rpm:1164161251



From fedora-extras-commits at redhat.com  Wed Nov 22 02:07:46 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:07:46 -0500
Subject: rpms/labyrinth/devel labyrinth-fix-interpreters.patch, NONE,
	1.1 labyrinth.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611220207.kAM27kb0001180@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1140/devel

Modified Files:
	.cvsignore sources 
Added Files:
	labyrinth-fix-interpreters.patch labyrinth.spec 
Log Message:
auto-import labyrinth-0.3-1 on branch devel from labyrinth-0.3-1.src.rpm
Initial import (APPROVED in bug #216363)

labyrinth-fix-interpreters.patch:

--- NEW FILE labyrinth-fix-interpreters.patch ---
--- labyrinth-0.3/src/Links.py.old	2006-11-15 21:56:09.000000000 -0800
+++ labyrinth-0.3/src/Links.py	2006-11-15 21:56:18.000000000 -0800
@@ -1,4 +1,4 @@
-#! /usr/bin env python
+#! /usr/bin/env python
 
 # Link.py
 # This file is part of Labyrinth
--- labyrinth-0.3/src/MainWindow.py.old	2006-11-15 21:56:31.000000000 -0800
+++ labyrinth-0.3/src/MainWindow.py	2006-11-15 21:56:44.000000000 -0800
@@ -1,4 +1,4 @@
-#! /usr/bin env python
+#! /usr/bin/env python
 
 # MainWindow.py
 # This file is part of Labyrinth


--- NEW FILE labyrinth.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define	python_module_name	%{name}

Name:		labyrinth
Version:	0.3
Release:	1%{?dist}
Summary:	A simple yet powerful mind-mapping tool for the GNOME desktop

Group:		Applications/Productivity
License:	GPL
URL:		http://www.gnome.org/~dscorgie/labyrinth.html

Source0:	http://www.gnome.org/~dscorgie/files/%{name}-%{version}.tar.bz2
Patch0:		%{name}-fix-interpreters.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

BuildRequires:	gettext
BuildRequires:	perl(XML::Parser)
BuildRequires:	pygtk2-devel >= 2.8
BuildRequires:	gnome-python2-devel >= 2.12
BuildRequires:	gnome-desktop-devel >= 2.14
BuildRequires:	desktop-file-utils

Requires:	pygtk2-libglade >= 2.8
Requires:	PyXML

## Taken from the website's "About" page, as well as Wikipedia's explanation
## of a mind-map.
%description
Labyrinth is a lightweight mind-mapping tool, written in Python using Gtk and
Cairo to do the drawing. It is intended to be as light and intuitive as
possible, but still provide a wide range of powerful features.

A mind-map is a diagram used to represent words, ideas, tasks or other items
linked to and arranged radially around a central key word or idea. It is used
to generate, visualize, structure and classify ideas, and as an aid in study,
organization, problem solving, and decision making.


%prep
%setup -q
%patch0 -p1
%configure


%build
make %{?_smp_flags} 


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} 
%find_lang %{name} 
desktop-file-install --vendor fedora	\
	--dir %{buildroot}%{_datadir}/applications	\
	--delete-original	\
	--remove-category=Application	\
	%{buildroot}/%{_datadir}/applications/%{name}.desktop
chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/TextThought.py
chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/Links.py
chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/MMapArea.py
chmod +x %{buildroot}/%{python_sitelib}/%{python_module_name}/MainWindow.py


%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 ||:


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{python_sitelib}/%{python_module_name}/
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/fedora-%{name}.desktop


%changelog
* Wed Nov 15 2006 Peter Gordon  - 0.3-1
- Initial packaging.
- Add patch to fix interpreters on MainWindow.py and Links.py scripts:
  + fix-interpreters.patch

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/labyrinth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 02:06:48 -0000	1.1
+++ .cvsignore	22 Nov 2006 02:07:16 -0000	1.2
@@ -0,0 +1 @@
+labyrinth-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/labyrinth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 02:06:48 -0000	1.1
+++ sources	22 Nov 2006 02:07:16 -0000	1.2
@@ -0,0 +1 @@
+d06a89239d53ae31846344c18b0df731  labyrinth-0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 02:11:42 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:11:42 -0500
Subject: owners owners.list,1.1987,1.1988
Message-ID: <200611220211.kAM2Bgm2001266@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1251/owners

Modified Files:
	owners.list 
Log Message:
Add entry for labyrinth


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1987
retrieving revision 1.1988
diff -u -r1.1987 -r1.1988
--- owners.list	21 Nov 2006 21:07:22 -0000	1.1987
+++ owners.list	22 Nov 2006 02:11:12 -0000	1.1988
@@ -853,6 +853,7 @@
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xelerance.com|extras-qa at fedoraproject.org|
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|labyrinth|A simple yet powerful mind-mapping tool for the GNOME desktop|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|lacewing|Asteroid like game with many different ships|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lagan|Local, global, and multiple alignment of DNA sequences|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 02:24:33 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 21 Nov 2006 21:24:33 -0500
Subject: rpms/TurboGears/devel TurboGears.spec,1.6,1.7
Message-ID: <200611220224.kAM2OXLY001402@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1387

Modified Files:
	TurboGears.spec 
Log Message:
add python-TestGears back to Requires


Index: TurboGears.spec
===================================================================
RCS file: /cvs/extras/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurboGears.spec	21 Nov 2006 18:38:03 -0000	1.6
+++ TurboGears.spec	22 Nov 2006 02:24:03 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0b1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -24,7 +24,7 @@
 Requires:       python-turbokid >= 0.9.8 python-tgfastdata
 Requires:       python-simplejson >= 1.3 python-paste-script >= 0.9.7
 Requires:       python-configobj >= 4.3.2 python-ruledispatch
-Requires:       python-nose >= 0.9 python-psycopg
+Requires:       python-nose >= 0.9 python-psycopg python-TestGears
 
 %description
 TurboGears brings together four major pieces to create an
@@ -76,6 +76,9 @@
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Fri Nov 21 2006 Luke Macken  1.0b1-3
+- Add python-TestGears back to Requires
+
 * Fri Nov 21 2006 Luke Macken  1.0b1-2
 - Add python-psycopg to Requires
 



From fedora-extras-commits at redhat.com  Wed Nov 22 02:41:21 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Tue, 21 Nov 2006 21:41:21 -0500
Subject: comps comps-fe7.xml.in,1.27,1.28
Message-ID: <200611220241.kAM2fLLN001495@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1480/comps

Modified Files:
	comps-fe7.xml.in 
Log Message:
Add entry for labyrinth


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- comps-fe7.xml.in	22 Nov 2006 00:06:30 -0000	1.27
+++ comps-fe7.xml.in	22 Nov 2006 02:40:51 -0000	1.28
@@ -826,6 +826,7 @@
       hnb
       koffice-suite
       krecipes
+      labyrinth
       lyx
       notecase
       pybliographer



From fedora-extras-commits at redhat.com  Wed Nov 22 04:15:38 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 21 Nov 2006 23:15:38 -0500
Subject: rpms/cmake/devel .cvsignore, 1.4, 1.5 cmake-2.4.2-fedora.patch, 1.2,
	1.3 cmake.spec, 1.9, 1.10 sources, 1.4,
	1.5 cmake-2.4.3-soname.patch, 1.1, NONE
Message-ID: <200611220415.kAM4Fc6k002304@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2276

Modified Files:
	.cvsignore cmake-2.4.2-fedora.patch cmake.spec sources 
Removed Files:
	cmake-2.4.3-soname.patch 
Log Message:
Update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 16:46:34 -0000	1.4
+++ .cvsignore	22 Nov 2006 04:15:08 -0000	1.5
@@ -1 +1 @@
-cmake-2.4.3.tar.gz
+cmake-2.4.4.tar.gz

cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/cmake-2.4.2-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.4.2-fedora.patch	31 Oct 2006 23:11:16 -0000	1.2
+++ cmake-2.4.2-fedora.patch	22 Nov 2006 04:15:08 -0000	1.3
@@ -1,29 +1,3 @@
---- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
-+++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
-@@ -9,6 +9,7 @@
- 
- SET(RUBY_POSSIBLE_INCLUDE_PATHS
--  /usr/lib/ruby/1.8/i386-linux
-+  /usr/lib/ruby/*/i386-linux
-+  /usr/lib64/ruby/*/x86_64-linux
-   )
- 
- SET(RUBY_POSSIBLE_LIB_PATHS
-@@ -19,12 +20,12 @@
-   ${RUBY_POSSIBLE_INCLUDE_PATHS})
- 
- FIND_LIBRARY(RUBY_LIBRARY
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-   )
- 
- FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS
-   /usr/bin
-   /usr/local/bin
 --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
 +++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
 @@ -7,13 +7,11 @@


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cmake.spec	31 Oct 2006 23:11:16 -0000	1.9
+++ cmake.spec	22 Nov 2006 04:15:08 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.3
-Release:	4%{?dist}
+Version:	2.4.4
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
 Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.3-soname.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
 
@@ -25,7 +24,6 @@
 %prep
 %setup -q
 %patch -p1 -b .fedora
-%patch1 -p0 -b .soname
 
 
 %build
@@ -62,6 +60,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Orion Poplawski  - 2.4.4-1
+- Update to 2.4.4
+
 * Tue Oct 31 2006 Orion Poplawski  - 2.4.3-4
 - Add /usr/lib/jvm/java to FindJNI search paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 16:46:34 -0000	1.4
+++ sources	22 Nov 2006 04:15:08 -0000	1.5
@@ -1 +1 @@
-c9b50c488a24edd5297ffc3230ecd0f2  cmake-2.4.3.tar.gz
+8c99af9e6e70f154314cf0d160b61e6e  cmake-2.4.4.tar.gz


--- cmake-2.4.3-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 04:20:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:20:55 -0500
Subject: rpms/perl-Algorithm-C3 Makefile,1.1,1.2
Message-ID: <200611220420.kAM4KtJZ002419@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Algorithm-C3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359

Modified Files:
	Makefile 
Log Message:
- update to 0.06



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 04:40:02 -0000	1.1
+++ Makefile	22 Nov 2006 04:20:25 -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  Wed Nov 22 04:21:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:21:01 -0500
Subject: rpms/perl-Algorithm-C3/FC-6 perl-Algorithm-C3.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200611220421.kAM4L1hq002427@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Algorithm-C3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359/FC-6

Modified Files:
	perl-Algorithm-C3.spec sources 
Log Message:
- update to 0.06



Index: perl-Algorithm-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/FC-6/perl-Algorithm-C3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Algorithm-C3.spec	7 Sep 2006 04:41:44 -0000	1.2
+++ perl-Algorithm-C3.spec	22 Nov 2006 04:20:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-C3
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Module for merging hierarchies using the C3 algorithm
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.06-1
+- update to 0.06
+
 * Wed Sep 06 2006 Chris Weyl  0.05-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:40:57 -0000	1.2
+++ sources	22 Nov 2006 04:20:30 -0000	1.3
@@ -1 +1 @@
-d087e68c937e7076bb07396b281685c1  Algorithm-C3-0.05.tar.gz
+4c05e0ebf31ffb2fa556016b97bd6bcb  Algorithm-C3-0.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:20:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:20:55 -0500
Subject: rpms/perl-Algorithm-C3/FC-5 perl-Algorithm-C3.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200611220421.kAM4KtGL002423@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Algorithm-C3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359/FC-5

Modified Files:
	perl-Algorithm-C3.spec sources 
Log Message:
- update to 0.06



Index: perl-Algorithm-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/FC-5/perl-Algorithm-C3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Algorithm-C3.spec	7 Sep 2006 04:41:44 -0000	1.2
+++ perl-Algorithm-C3.spec	22 Nov 2006 04:20:25 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-C3
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Module for merging hierarchies using the C3 algorithm
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.06-1
+- update to 0.06
+
 * Wed Sep 06 2006 Chris Weyl  0.05-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:40:57 -0000	1.2
+++ sources	22 Nov 2006 04:20:25 -0000	1.3
@@ -1 +1 @@
-d087e68c937e7076bb07396b281685c1  Algorithm-C3-0.05.tar.gz
+4c05e0ebf31ffb2fa556016b97bd6bcb  Algorithm-C3-0.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:21:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:21:01 -0500
Subject: rpms/perl-Algorithm-C3/devel .cvsignore, 1.2,
	1.3 perl-Algorithm-C3.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611220421.kAM4L1t2002432@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Algorithm-C3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2359/devel

Modified Files:
	.cvsignore perl-Algorithm-C3.spec sources 
Log Message:
- update to 0.06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 04:40:57 -0000	1.2
+++ .cvsignore	22 Nov 2006 04:20:31 -0000	1.3
@@ -1 +1 @@
-Algorithm-C3-0.05.tar.gz
+Algorithm-C3-0.06.tar.gz


Index: perl-Algorithm-C3.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/devel/perl-Algorithm-C3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Algorithm-C3.spec	7 Sep 2006 04:41:44 -0000	1.2
+++ perl-Algorithm-C3.spec	22 Nov 2006 04:20:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Algorithm-C3
-Version:        0.05
-Release:        2%{?dist}
+Version:        0.06
+Release:        1%{?dist}
 Summary:        Module for merging hierarchies using the C3 algorithm
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  0.06-1
+- update to 0.06
+
 * Wed Sep 06 2006 Chris Weyl  0.05-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-C3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:40:57 -0000	1.2
+++ sources	22 Nov 2006 04:20:31 -0000	1.3
@@ -1 +1 @@
-d087e68c937e7076bb07396b281685c1  Algorithm-C3-0.05.tar.gz
+4c05e0ebf31ffb2fa556016b97bd6bcb  Algorithm-C3-0.06.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:35:38 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:35:38 -0500
Subject: rpms/hfsplus-tools Makefile,1.1,1.2
Message-ID: <200611220435.kAM4Zcac002632@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/hfsplus-tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571

Modified Files:
	Makefile 
Log Message:
include hfsbootdata image



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/hfsplus-tools/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	19 Aug 2006 00:34:23 -0000	1.1
+++ Makefile	22 Nov 2006 04:35:08 -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  Wed Nov 22 04:35:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:35:43 -0500
Subject: rpms/hfsplus-tools/FC-6 hfsplus-tools.spec,1.3,1.4
Message-ID: <200611220435.kAM4Zhbi002638@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/hfsplus-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571/FC-6

Modified Files:
	hfsplus-tools.spec 
Log Message:
include hfsbootdata image



Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/hfsplus-tools/FC-6/hfsplus-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hfsplus-tools.spec	1 Sep 2006 00:22:02 -0000	1.3
+++ hfsplus-tools.spec	22 Nov 2006 04:35:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
@@ -70,6 +70,11 @@
 cp newfs_hfs.tproj/newfs_hfs %{buildroot}/%{_sbindir}/mkfs.hfsplus
 cp fsck_hfs.tproj/fsck_hfs %{buildroot}/%{_sbindir}/fsck.hfsplus
 
+# and install the hfs boot blob...
+mkdir -p %{buildroot}%{_datadir}/misc
+cp newfs_hfs.tproj/hfsbootdata.img %{buildroot}%{_datadir}/misc/hfsbootdata
+chmod 0444 %{buildroot}%{_datadir}/misc/hfsbootdata
+
 # man pages -- a mildly non-invasive name change is in order
 mkdir -p %{buildroot}/%{_mandir}/man8
 cat fsck_hfs.tproj/fsck_hfs.8 | sed -e 's/[F|f]sck_hfs/fsck.hfsplus/g' \
@@ -97,6 +102,7 @@
 %{_sbindir}/mkfs.hfs
 %{_sbindir}/fsck.hfsplus
 %{_sbindir}/fsck.hfs
+%{_datadir}/misc/hfsbootdata
 %{_mandir}/man8/mkfs.hfsplus.8.gz
 %{_mandir}/man8/mkfs.hfs.8.gz
 %{_mandir}/man8/fsck.hfsplus.8.gz
@@ -104,6 +110,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  332.14-4
+- include hfsbootdata (BZ#213365)
+
 * Thu Aug 31 2006 Chris Weyl  332.14-3
 - bump for mass rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 22 04:35:38 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:35:38 -0500
Subject: rpms/hfsplus-tools/FC-5 hfsplus-tools.spec,1.2,1.3
Message-ID: <200611220435.kAM4ZcPk002635@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/hfsplus-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571/FC-5

Modified Files:
	hfsplus-tools.spec 
Log Message:
include hfsbootdata image



Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/hfsplus-tools/FC-5/hfsplus-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hfsplus-tools.spec	19 Aug 2006 00:36:58 -0000	1.2
+++ hfsplus-tools.spec	22 Nov 2006 04:35:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
@@ -70,6 +70,11 @@
 cp newfs_hfs.tproj/newfs_hfs %{buildroot}/%{_sbindir}/mkfs.hfsplus
 cp fsck_hfs.tproj/fsck_hfs %{buildroot}/%{_sbindir}/fsck.hfsplus
 
+# and install the hfs boot blob...
+mkdir -p %{buildroot}%{_datadir}/misc
+cp newfs_hfs.tproj/hfsbootdata.img %{buildroot}%{_datadir}/misc/hfsbootdata
+chmod 0444 %{buildroot}%{_datadir}/misc/hfsbootdata
+
 # man pages -- a mildly non-invasive name change is in order
 mkdir -p %{buildroot}/%{_mandir}/man8
 cat fsck_hfs.tproj/fsck_hfs.8 | sed -e 's/[F|f]sck_hfs/fsck.hfsplus/g' \
@@ -97,6 +102,7 @@
 %{_sbindir}/mkfs.hfs
 %{_sbindir}/fsck.hfsplus
 %{_sbindir}/fsck.hfs
+%{_datadir}/misc/hfsbootdata
 %{_mandir}/man8/mkfs.hfsplus.8.gz
 %{_mandir}/man8/mkfs.hfs.8.gz
 %{_mandir}/man8/fsck.hfsplus.8.gz
@@ -104,6 +110,12 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  332.14-4
+- include hfsbootdata (BZ#213365)
+
+* Thu Aug 31 2006 Chris Weyl  332.14-3
+- bump for mass rebuild
+
 * Fri Aug 18 2006 Chris Weyl  332.14-2
 - bump 
 



From fedora-extras-commits at redhat.com  Wed Nov 22 04:35:44 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 21 Nov 2006 23:35:44 -0500
Subject: rpms/hfsplus-tools/devel hfsplus-tools.spec,1.3,1.4
Message-ID: <200611220435.kAM4Zik6002641@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/hfsplus-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2571/devel

Modified Files:
	hfsplus-tools.spec 
Log Message:
include hfsbootdata image



Index: hfsplus-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/hfsplus-tools/devel/hfsplus-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hfsplus-tools.spec	1 Sep 2006 00:22:02 -0000	1.3
+++ hfsplus-tools.spec	22 Nov 2006 04:35:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           hfsplus-tools
 Version:        332.14 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tools to create/check Apple HFS+ filesystems
 
 Group:          System Environment/Base
@@ -70,6 +70,11 @@
 cp newfs_hfs.tproj/newfs_hfs %{buildroot}/%{_sbindir}/mkfs.hfsplus
 cp fsck_hfs.tproj/fsck_hfs %{buildroot}/%{_sbindir}/fsck.hfsplus
 
+# and install the hfs boot blob...
+mkdir -p %{buildroot}%{_datadir}/misc
+cp newfs_hfs.tproj/hfsbootdata.img %{buildroot}%{_datadir}/misc/hfsbootdata
+chmod 0444 %{buildroot}%{_datadir}/misc/hfsbootdata
+
 # man pages -- a mildly non-invasive name change is in order
 mkdir -p %{buildroot}/%{_mandir}/man8
 cat fsck_hfs.tproj/fsck_hfs.8 | sed -e 's/[F|f]sck_hfs/fsck.hfsplus/g' \
@@ -97,6 +102,7 @@
 %{_sbindir}/mkfs.hfs
 %{_sbindir}/fsck.hfsplus
 %{_sbindir}/fsck.hfs
+%{_datadir}/misc/hfsbootdata
 %{_mandir}/man8/mkfs.hfsplus.8.gz
 %{_mandir}/man8/mkfs.hfs.8.gz
 %{_mandir}/man8/fsck.hfsplus.8.gz
@@ -104,6 +110,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Chris Weyl  332.14-4
+- include hfsbootdata (BZ#213365)
+
 * Thu Aug 31 2006 Chris Weyl  332.14-3
 - bump for mass rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 22 04:51:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 23:51:26 -0500
Subject: rpms/linphone/devel linphone-1.5.1-osipcompat.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 linphone.spec, 1.24, 1.25 sources, 1.6, 1.7
Message-ID: <200611220451.kAM4pQPV002838@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2812

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.5.1-osipcompat.patch 
Log Message:
Update to 1.5.1

linphone-1.5.1-osipcompat.patch:

--- NEW FILE linphone-1.5.1-osipcompat.patch ---
Index: console/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/console/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- console/Makefile.am	18 Oct 2006 13:41:21 -0000	1.45
+++ console/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -6,7 +6,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/exosip \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: coreapi/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/coreapi/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- coreapi/Makefile.am	21 Jul 2006 14:35:35 -0000	1.38
+++ coreapi/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -10,7 +10,7 @@
 	-I$(top_srcdir)/exosip\
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include/ 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 lib_LTLIBRARIES=liblinphone.la
Index: exosip/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/exosip/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- exosip/Makefile.am	15 Feb 2005 16:12:13 -0000	1.3
+++ exosip/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libeXosip.la
 
 
-AM_CFLAGS = $(EXOSIP_CFLAGS)
+AM_CFLAGS = $(EXOSIP_CFLAGS) $(OSIP_CFLAGS)
 
 libeXosip_la_SOURCES =       eXosip.c  \
 jrequest.c jresponse.c    jcallback.c  jdialog.c   udp.c  \
Index: gnome/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/gnome/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- gnome/Makefile.am	25 Aug 2006 14:15:17 -0000	1.33
+++ gnome/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -20,7 +20,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/coreapi \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: m4/osip.m4
===================================================================
RCS file: /sources/linphone/linphone/m4/osip.m4,v
retrieving revision 1.2
diff -u -r1.2 osip.m4
--- m4/osip.m4	22 Feb 2005 17:31:03 -0000	1.2
+++ m4/osip.m4	22 Nov 2006 04:02:09 -0000
@@ -6,7 +6,7 @@
 AC_SUBST(osip_prefix)
 
 
-OSIP_CFLAGS="-I$osip_prefix/include"
+OSIP_CFLAGS="-I$osip_prefix/include/osip2-2.2.2"
 OSIP_LIBS="-L$osip_prefix/lib"
 
 dnl check osip2 headers
@@ -20,11 +20,11 @@
 LDFLAGS=$OSIP_LIBS
 dnl AC_CHECK_LIB adds osipparser2 to LIBS, I don't want that !
 LIBS_save=$LIBS
-AC_CHECK_LIB(osipparser2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
+AC_CHECK_LIB(osipparser2-2.2.2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
 LDFLAGS=$LDFLAGS_save
 LIBS=$LIBS_save
 
-OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
+OSIP_LIBS="$OSIP_LIBS -losipparser2-2.2.2 -losip2-2.2.2"
 
 AC_SUBST(OSIP_CFLAGS)
 AC_SUBST(OSIP_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Oct 2006 13:46:59 -0000	1.6
+++ .cvsignore	22 Nov 2006 04:50:55 -0000	1.7
@@ -1 +1 @@
-linphone-1.5.0.tar.gz
+linphone-1.5.1.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linphone.spec	26 Oct 2006 13:46:59 -0000	1.24
+++ linphone.spec	22 Nov 2006 04:50:55 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           linphone
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,10 +9,11 @@
 Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
 Patch1:         linphone-1.4.1-libs.patch
+Patch2:		linphone-1.5.1-osipcompat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libosip2-devel
-BuildRequires:  ortp-devel = 0.11.0
+BuildRequires:  compat-libosip2-devel
+BuildRequires:  ortp-devel = 0.12.0
 
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
@@ -59,12 +60,14 @@
 Libraries and headers required to develop software with linphone.
 
 %prep
-%setup -q
-%patch -p 1 -b .old
-%patch1 -p 1 -b .libs
+%setup0 -q
+%patch0 -p1 -b .old
+%patch1 -p1 -b .libs
+%patch2 -p0 -b .osip
 
 rm -r oRTP
 
+%build
 libtoolize --copy --force
 autoheader
 aclocal -I m4
@@ -80,7 +83,6 @@
 autoconf
 popd
 
-%build
 %configure --disable-static --disable-video
 make %{?_smp_mflags}
 
@@ -116,6 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
+%{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -133,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 1.5.1-1
+- Update to 1.5.1
+
 * Thu Oct 26 2006 Jeffrey C. Ollie  - 1.5.0-2
 - Don't forget to add new files and remove old ones!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Oct 2006 13:46:59 -0000	1.6
+++ sources	22 Nov 2006 04:50:55 -0000	1.7
@@ -1 +1 @@
-e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz
+196f817d77aba906e7c1a896f8501a0f  linphone-1.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:52:30 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 21 Nov 2006 23:52:30 -0500
Subject: rpms/linphone/FC-6 linphone-1.5.1-osipcompat.patch, NONE,
	1.1 .cvsignore, 1.6, 1.7 linphone.spec, 1.23, 1.24 sources, 1.6, 1.7
Message-ID: <200611220452.kAM4qUWp002904@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2882

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.5.1-osipcompat.patch 
Log Message:
Update to 1.5.1

linphone-1.5.1-osipcompat.patch:

--- NEW FILE linphone-1.5.1-osipcompat.patch ---
Index: console/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/console/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- console/Makefile.am	18 Oct 2006 13:41:21 -0000	1.45
+++ console/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -6,7 +6,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/exosip \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: coreapi/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/coreapi/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- coreapi/Makefile.am	21 Jul 2006 14:35:35 -0000	1.38
+++ coreapi/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -10,7 +10,7 @@
 	-I$(top_srcdir)/exosip\
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include/ 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 lib_LTLIBRARIES=liblinphone.la
Index: exosip/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/exosip/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- exosip/Makefile.am	15 Feb 2005 16:12:13 -0000	1.3
+++ exosip/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libeXosip.la
 
 
-AM_CFLAGS = $(EXOSIP_CFLAGS)
+AM_CFLAGS = $(EXOSIP_CFLAGS) $(OSIP_CFLAGS)
 
 libeXosip_la_SOURCES =       eXosip.c  \
 jrequest.c jresponse.c    jcallback.c  jdialog.c   udp.c  \
Index: gnome/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/gnome/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- gnome/Makefile.am	25 Aug 2006 14:15:17 -0000	1.33
+++ gnome/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -20,7 +20,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/coreapi \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: m4/osip.m4
===================================================================
RCS file: /sources/linphone/linphone/m4/osip.m4,v
retrieving revision 1.2
diff -u -r1.2 osip.m4
--- m4/osip.m4	22 Feb 2005 17:31:03 -0000	1.2
+++ m4/osip.m4	22 Nov 2006 04:02:09 -0000
@@ -6,7 +6,7 @@
 AC_SUBST(osip_prefix)
 
 
-OSIP_CFLAGS="-I$osip_prefix/include"
+OSIP_CFLAGS="-I$osip_prefix/include/osip2-2.2.2"
 OSIP_LIBS="-L$osip_prefix/lib"
 
 dnl check osip2 headers
@@ -20,11 +20,11 @@
 LDFLAGS=$OSIP_LIBS
 dnl AC_CHECK_LIB adds osipparser2 to LIBS, I don't want that !
 LIBS_save=$LIBS
-AC_CHECK_LIB(osipparser2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
+AC_CHECK_LIB(osipparser2-2.2.2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
 LDFLAGS=$LDFLAGS_save
 LIBS=$LIBS_save
 
-OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
+OSIP_LIBS="$OSIP_LIBS -losipparser2-2.2.2 -losip2-2.2.2"
 
 AC_SUBST(OSIP_CFLAGS)
 AC_SUBST(OSIP_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Nov 2006 17:52:58 -0000	1.6
+++ .cvsignore	22 Nov 2006 04:52:00 -0000	1.7
@@ -1 +1 @@
-linphone-1.5.0.tar.gz
+linphone-1.5.1.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/linphone.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linphone.spec	9 Nov 2006 17:52:58 -0000	1.23
+++ linphone.spec	22 Nov 2006 04:52:00 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           linphone
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,10 +9,11 @@
 Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
 Patch1:         linphone-1.4.1-libs.patch
+Patch2:		linphone-1.5.1-osipcompat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libosip2-devel
-BuildRequires:  ortp-devel = 0.11.0
+BuildRequires:  compat-libosip2-devel
+BuildRequires:  ortp-devel = 0.12.0
 
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
@@ -59,12 +60,14 @@
 Libraries and headers required to develop software with linphone.
 
 %prep
-%setup -q
-%patch -p 1 -b .old
-%patch1 -p 1 -b .libs
+%setup0 -q
+%patch0 -p1 -b .old
+%patch1 -p1 -b .libs
+%patch2 -p0 -b .osip
 
 rm -r oRTP
 
+%build
 libtoolize --copy --force
 autoheader
 aclocal -I m4
@@ -80,7 +83,6 @@
 autoconf
 popd
 
-%build
 %configure --disable-static --disable-video
 make %{?_smp_mflags}
 
@@ -116,6 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
+%{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -133,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie  - 1.5.1-1
+- Update to 1.5.1
+
 * Thu Oct 26 2006 Jeffrey C. Ollie  - 1.5.0-2
 - Don't forget to add new files and remove old ones!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Nov 2006 17:52:58 -0000	1.6
+++ sources	22 Nov 2006 04:52:00 -0000	1.7
@@ -1 +1 @@
-e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz
+196f817d77aba906e7c1a896f8501a0f  linphone-1.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 04:53:11 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Tue, 21 Nov 2006 23:53:11 -0500
Subject: rpms/plone/FC-6 plone.spec,1.20,1.21
Message-ID: <200611220453.kAM4rB0G002972@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2835/plone/FC-6

Modified Files:
	plone.spec 
Log Message:
Updated so plone provides the product 'Five' rather then Zope. Zope needed
to provide Five in Plone 2.5. In Plone 2.5.1, Plone now provides Five. Fun.



Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-6/plone.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plone.spec	4 Nov 2006 09:14:19 -0000	1.20
+++ plone.spec	22 Nov 2006 04:52:41 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
@@ -45,8 +45,8 @@
 cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
 #rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
 
-# Included in Zope 2.9
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+# Commented out because Plone, again, provides Five for version 2.5.1
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
 
 # Avoid conflicts, put those in %%doc
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 Jonathan Steffan  2.5.1-4
+- Updated so plone now provides the correct version of the Five product
+
 * Sat Nov 04 2006 Aurelien Bompard  2.5.1-3
 - add Plone Hotfix 20061031 (bug 213983)
 



From fedora-extras-commits at redhat.com  Wed Nov 22 04:53:12 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Tue, 21 Nov 2006 23:53:12 -0500
Subject: rpms/zope/FC-6 zope.spec,1.25,1.26
Message-ID: <200611220453.kAM4rCqX002975@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2835/zope/FC-6

Modified Files:
	zope.spec 
Log Message:
Updated so plone provides the product 'Five' rather then Zope. Zope needed
to provide Five in Plone 2.5. In Plone 2.5.1, Plone now provides Five. Fun.



Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- zope.spec	30 Aug 2006 11:58:35 -0000	1.25
+++ zope.spec	22 Nov 2006 04:52:42 -0000	1.26
@@ -13,7 +13,7 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
@@ -120,6 +120,9 @@
 # included in %%doc
 rm -rf $RPM_BUILD_ROOT%{zope_home}/doc
 
+#now included with plone 2.5.1 version 1.3.7
+rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+
 # write version.txt
 echo "Zope %{version}-%{release}" > \
     "$RPM_BUILD_ROOT%{software_home}/version.txt"
@@ -187,6 +190,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Jonathan Steffan  2.9.4-3
+- Removed Five from zope package (plone 2.5.1 now provides the needed
+  version.)
+
 * Wed Aug 30 2006 Aurelien Bompard  2.9.4-2
 - fix path on x86_64
 



From fedora-extras-commits at redhat.com  Wed Nov 22 05:48:27 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Wed, 22 Nov 2006 00:48:27 -0500
Subject: owners owners.list,1.1988,1.1989
Message-ID: <200611220548.kAM5mRGa003254@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3229/owners

Modified Files:
	owners.list 
Log Message:
Added myself as owner of plone and zope.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1988
retrieving revision 1.1989
diff -u -r1.1988 -r1.1989
--- owners.list	22 Nov 2006 02:11:12 -0000	1.1988
+++ owners.list	22 Nov 2006 05:47:57 -0000	1.1989
@@ -1872,7 +1872,7 @@
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|plib|Set of portable libraries especially useful for games|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|matthias at rpmforge.net
 Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
-Fedora Extras|plone|User friendly and powerful open source Content Management System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|plone|User friendly and powerful open source Content Management System|extras-qa at fedoraproject.org|jonathansteffan at gmail.com
 Fedora Extras|plotmm|GTKmm plot widget for scientific applications|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|plotutils|GNU vector and raster graphics utilities and libraries|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -2557,7 +2557,7 @@
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|Zim|Desktop wiki & notekeeper|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
-Fedora Extras|zope|Application server in Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|zope|Application server in Python|extras-qa at fedoraproject.org|jonathansteffan at gmail.com
 Fedora Extras|zvbi|Raw VBI, Teletext and Closed Caption decoding library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|zynaddsubfx|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 07:27:34 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed, 22 Nov 2006 02:27:34 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet.spec,1.36,1.37
Message-ID: <200611220727.kAM7RYpE003973@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3958

Modified Files:
	deskbar-applet.spec 
Log Message:
Run gtk-update-icon-cache in post and postun scripts (Bug #216827)


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- deskbar-applet.spec	12 Nov 2006 09:10:18 -0000	1.36
+++ deskbar-applet.spec	22 Nov 2006 07:27:04 -0000	1.37
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.17.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -71,6 +71,9 @@
   %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 killall -HUP gconfd-2 || :
 
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -79,6 +82,10 @@
     killall -HUP gconfd-2 || :
 fi
 
+%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 README
@@ -91,6 +98,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Wed Nov 22 2006 Luke Macken  - 2.17.2-2
+- Run gtk-update-icon-cache in post and postun scripts (Bug #216827)
+
 * Sun Nov 12 2006 Luke Macken  - 2.17.2-1
 - 2.17.2
 



From fedora-extras-commits at redhat.com  Wed Nov 22 08:03:31 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 22 Nov 2006 03:03:31 -0500
Subject: rpms/gparted/devel gparted.spec,1.15,1.16
Message-ID: <200611220803.kAM83VqS004346@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4326

Modified Files:
	gparted.spec 
Log Message:
* Wed Nov 23 2006 Deji Akingunola  - 0.3.1-3
- Backport a fix from cvs to properly check for libparted version



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gparted.spec	21 Nov 2006 07:40:08 -0000	1.15
+++ gparted.spec	22 Nov 2006 08:03:01 -0000	1.16
@@ -1,11 +1,12 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Patch0: gparted-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) 
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .config
 
 %build
 %configure
@@ -77,6 +79,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Wed Nov 23 2006 Deji Akingunola  - 0.3.1-3
+- Backport a fix from cvs to properly check for libparted version
+
 * Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
 - Rebuild for new parted
 



From fedora-extras-commits at redhat.com  Wed Nov 22 08:04:48 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 22 Nov 2006 03:04:48 -0500
Subject: rpms/gparted/devel gparted-configure.patch,NONE,1.1
Message-ID: <200611220804.kAM84meI004364@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4357

Added Files:
	gparted-configure.patch 
Log Message:
* Wed Nov 23 2006 Deji Akingunola  - 0.3.1-3
- Backport a fix from cvs to properly check for libparted version


gparted-configure.patch:

--- NEW FILE gparted-configure.patch ---
--- configure.keep	2006-09-11 05:39:49.000000000 -0400
+++ configure	2006-11-22 02:46:15.000000000 -0500
@@ -22160,9 +22160,11 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for libparted >= 1.7.1" >&5
-echo $ECHO_N "checking for libparted >= 1.7.1... $ECHO_C" >&6; }
-LDFLAGS=-lparted
+LIBPARTED_VERSION=1.7.1
+{ echo "$as_me:$LINENO: checking for libparted >= $LIBPARTED_VERSION" >&5
+echo $ECHO_N "checking for libparted >= $LIBPARTED_VERSION... $ECHO_C" >&6; }
+LIBS_save="$LIBS"
+LIBS="-lparted"
 if test "$cross_compiling" = yes; then
   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
@@ -22181,14 +22183,26 @@
 
 int main ()
 {
+	int min_major ;
+	int min_minor ;
+	int min_micro ;
 	int major ;
 	int minor ;
 	int micro ;
 
-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
-		printf( "Found libparted %s\t", ped_get_version() ) ;
+	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
+	{
+		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+		{
+			printf( "Found libparted %s\t", ped_get_version() ) ;
+
+			return ! ((major > min_major) ||
+           			 ((major == min_major) && (minor > min_minor)) ||
+           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
+		}
+	}
 
-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
+	return 1 ;
 }
 
 _ACEOF



From fedora-extras-commits at redhat.com  Wed Nov 22 09:14:29 2006
From: fedora-extras-commits at redhat.com (Gianluca Sforna (giallu))
Date: Wed, 22 Nov 2006 04:14:29 -0500
Subject: rpms/sysprof-kmod/devel sysprof-kmod.spec,1.12,1.13
Message-ID: <200611220914.kAM9ET3C005321@cvs-int.fedora.redhat.com>

Author: giallu

Update of /cvs/extras/rpms/sysprof-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5290

Modified Files:
	sysprof-kmod.spec 
Log Message:
Really fix EVR problem for upgrading from FC6



Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/sysprof-kmod/devel/sysprof-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sysprof-kmod.spec	21 Nov 2006 13:07:39 -0000	1.12
+++ sysprof-kmod.spec	22 Nov 2006 09:13:59 -0000	1.13
@@ -30,7 +30,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        1.0.7
-Release:        1.1.%(echo %{kverrel} | tr - _)
+Release:        1.%(echo %{kverrel} | tr - _).1
 Summary:        Sysprof kernel module
 
 Group:          System Environment/Kernel



From fedora-extras-commits at redhat.com  Wed Nov 22 12:34:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 22 Nov 2006 07:34:00 -0500
Subject: rpms/xchm/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xchm.desktop,
	1.3, 1.4 xchm.spec, 1.7, 1.8
Message-ID: <200611221234.kAMCY0ff015297@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/xchm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15276

Modified Files:
	.cvsignore sources xchm.desktop xchm.spec 
Log Message:
* Wed Nov 22 2006 Patrice Dumas  1.10-1
- update to 1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jul 2006 11:18:43 -0000	1.2
+++ .cvsignore	22 Nov 2006 12:33:29 -0000	1.3
@@ -1 +1 @@
-xchm-1.9.tar.gz
+xchm-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jul 2006 11:18:43 -0000	1.2
+++ sources	22 Nov 2006 12:33:29 -0000	1.3
@@ -1 +1 @@
-12e1faf49447c743c5c936636cd8a172  xchm-1.9.tar.gz
+df4d42e3bb11187139f4475b89c4ab96  xchm-1.10.tar.gz


Index: xchm.desktop
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xchm.desktop	24 Sep 2006 09:51:42 -0000	1.3
+++ xchm.desktop	22 Nov 2006 12:33:29 -0000	1.4
@@ -11,4 +11,4 @@
 Terminal=false
 Type=Application
 MimeType=application/x-chm;
-Categories=Application;Utility;
+Categories=Utility;


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/devel/xchm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchm.spec	4 Oct 2006 22:17:22 -0000	1.7
+++ xchm.spec	22 Nov 2006 12:33:29 -0000	1.8
@@ -1,10 +1,11 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
-Version:        1.9
-Release:        6%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Publishing
-Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://heanet.dl.sourceforge.net/sourceforge/xchm/xchm-%{version}.tar.gz
 Source1:        %{name}.desktop
 URL:            http://xchm.sourceforge.net/
 BuildRequires:  chmlib-devel
@@ -34,7 +35,6 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications/
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE1}
 for resolution in 16 32 48 128; do
   dir=${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${resolution}x${resolution}/
@@ -67,6 +67,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Nov 22 2006 Patrice Dumas  1.10-1
+- update to 1.10
+
 * Thu Oct 05 2006 Christian Iseli  1.9-6
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Wed Nov 22 12:50:53 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 22 Nov 2006 07:50:53 -0500
Subject: rpms/xchm/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xchm.spec, 1.5,
	1.6
Message-ID: <200611221250.kAMCorgk015405@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/xchm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15371/FC-5

Modified Files:
	.cvsignore sources xchm.spec 
Log Message:
* Wed Nov 22 2006 Patrice Dumas  1.10-1
- update to 1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jul 2006 11:18:43 -0000	1.2
+++ .cvsignore	22 Nov 2006 12:50:23 -0000	1.3
@@ -1 +1 @@
-xchm-1.9.tar.gz
+xchm-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jul 2006 11:18:43 -0000	1.2
+++ sources	22 Nov 2006 12:50:23 -0000	1.3
@@ -1 +1 @@
-12e1faf49447c743c5c936636cd8a172  xchm-1.9.tar.gz
+df4d42e3bb11187139f4475b89c4ab96  xchm-1.10.tar.gz


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-5/xchm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xchm.spec	25 Sep 2006 20:35:32 -0000	1.5
+++ xchm.spec	22 Nov 2006 12:50:23 -0000	1.6
@@ -1,10 +1,11 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
-Version:        1.9
-Release:        5%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Publishing
-Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://heanet.dl.sourceforge.net/sourceforge/xchm/xchm-%{version}.tar.gz
 Source1:        %{name}.desktop
 URL:            http://xchm.sourceforge.net/
 BuildRequires:  chmlib-devel
@@ -34,7 +35,6 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications/
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE1}
 for resolution in 16 32 48 128; do
   dir=${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${resolution}x${resolution}/
@@ -67,6 +67,12 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Nov 22 2006 Patrice Dumas  1.10-1
+- update to 1.10
+
+* Thu Oct 05 2006 Christian Iseli  1.9-6
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
 * Mon Sep 25 2006 Patrice Dumas  1.9-5
 - install the icon for the chm file type
 
@@ -77,6 +83,9 @@
 - install icons in %%{_datadir}/icons/ instead of %%{_datadir}/pixmaps/
   fix #207759
 
+* Tue Sep 12 2006 Patrice Dumas  1.9-2
+- rebuild for FC6
+
 * Fri Jun  2 2006 Patrice Dumas  1.9-1
 - update to 1.9
 



From fedora-extras-commits at redhat.com  Wed Nov 22 12:50:53 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 22 Nov 2006 07:50:53 -0500
Subject: rpms/xchm/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xchm.spec, 1.7,
	1.8
Message-ID: <200611221250.kAMCorRd015410@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/xchm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15371/FC-6

Modified Files:
	.cvsignore sources xchm.spec 
Log Message:
* Wed Nov 22 2006 Patrice Dumas  1.10-1
- update to 1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jul 2006 11:18:43 -0000	1.2
+++ .cvsignore	22 Nov 2006 12:50:23 -0000	1.3
@@ -1 +1 @@
-xchm-1.9.tar.gz
+xchm-1.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jul 2006 11:18:43 -0000	1.2
+++ sources	22 Nov 2006 12:50:23 -0000	1.3
@@ -1 +1 @@
-12e1faf49447c743c5c936636cd8a172  xchm-1.9.tar.gz
+df4d42e3bb11187139f4475b89c4ab96  xchm-1.10.tar.gz


Index: xchm.spec
===================================================================
RCS file: /cvs/extras/rpms/xchm/FC-6/xchm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xchm.spec	4 Oct 2006 22:17:22 -0000	1.7
+++ xchm.spec	22 Nov 2006 12:50:23 -0000	1.8
@@ -1,10 +1,11 @@
 Summary:        A GUI front-end to CHMlib
 Name:           xchm
-Version:        1.9
-Release:        6%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Publishing
-Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://heanet.dl.sourceforge.net/sourceforge/xchm/xchm-%{version}.tar.gz
 Source1:        %{name}.desktop
 URL:            http://xchm.sourceforge.net/
 BuildRequires:  chmlib-devel
@@ -34,7 +35,6 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications/
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE1}
 for resolution in 16 32 48 128; do
   dir=${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/${resolution}x${resolution}/
@@ -67,6 +67,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Nov 22 2006 Patrice Dumas  1.10-1
+- update to 1.10
+
 * Thu Oct 05 2006 Christian Iseli  1.9-6
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Wed Nov 22 13:46:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 08:46:52 -0500
Subject: rpms/eric/devel eric.spec,1.7,1.8
Message-ID: <200611221346.kAMDkqad015762@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15747

Modified Files:
	eric.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter  3.9.2-1
- 3.9.2 
- Provides: eric3 (get ready for PyQt4-based eric4)



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eric.spec	14 Nov 2006 03:21:53 -0000	1.7
+++ eric.spec	22 Nov 2006 13:46:22 -0000	1.8
@@ -23,6 +23,8 @@
 Patch2: gen_python_api-env.patch
 Patch3: gen_sip_api-PyQt4.patch
 
+Provides: eric3 = %{version}-%{release}
+
 BuildRequires: desktop-file-utils
 BuildRequires: PyQt-qscintilla-devel
 # PyQt api's
@@ -38,8 +40,7 @@
 %endif
 
 %description
-eric3 is a full featured Python IDE that is written in PyQt using
-the QScintilla editor widget. 
+eric3 is a full featured Python IDE.
 
 
 %prep
@@ -139,14 +140,15 @@
 
 
 %changelog
-* Mon Nov 13 2006 Rex Dieter  5.9.2-1
-- 5.9.2
+* Wed Nov 22 2006 Rex Dieter  3.9.2-1
+- 3.9.2 
+- Provides: eric3 (get ready for PyQt4-based eric4)
 
-* Mon Nov 06 2006 Rex Dieter  5.9.1-4
+* Mon Nov 06 2006 Rex Dieter  3.9.1-4
 - BR: PyQt-qscintilla-devel
 - (unversioned) Requires: PyQt-qscintilla
 
-* Thu Sep 07 2006 Rex Dieter  5.9.1-3
+* Thu Sep 07 2006 Rex Dieter  3.9.1-3
 - include .py[c,o] files again (with no %%ghost'ing)
 
 * Thu Jul 27 2006 Rex Dieter  3.9.1-2



From fedora-extras-commits at redhat.com  Wed Nov 22 13:49:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 08:49:19 -0500
Subject: rpms/eric/devel eric.spec,1.8,1.9
Message-ID: <200611221349.kAMDnJGu015849@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/eric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15834

Modified Files:
	eric.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter  3.9.2-2
- Provides: eric3 (get ready for PyQt4-based eric4)
- fix biffed %version's in %changelog
- simplify %description



Index: eric.spec
===================================================================
RCS file: /cvs/extras/rpms/eric/devel/eric.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eric.spec	22 Nov 2006 13:46:22 -0000	1.8
+++ eric.spec	22 Nov 2006 13:48:49 -0000	1.9
@@ -5,7 +5,7 @@
 Name:	 eric
 Summary: Python IDE
 Version: 3.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:	 Development/Tools
@@ -140,9 +140,13 @@
 
 
 %changelog
-* Wed Nov 22 2006 Rex Dieter  3.9.2-1
-- 3.9.2 
+* Wed Nov 22 2006 Rex Dieter  3.9.2-2
 - Provides: eric3 (get ready for PyQt4-based eric4)
+- fix biffed %%version's in %%changelog
+- simplify %%description
+
+* Mon Nov 13 2006 Rex Dieter  3.9.2-1
+- 3.9.2 
 
 * Mon Nov 06 2006 Rex Dieter  3.9.1-4
 - BR: PyQt-qscintilla-devel



From fedora-extras-commits at redhat.com  Wed Nov 22 14:01:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:01:47 -0500
Subject: rpms/perl-Email-Address/FC-5 .cvsignore, 1.7,
	1.8 perl-Email-Address.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200611221401.kAME1lno016073@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16015/FC-5

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.882.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 17:55:48 -0000	1.7
+++ .cvsignore	22 Nov 2006 14:01:17 -0000	1.8
@@ -1 +1 @@
-Email-Address-1.880.tar.gz
+Email-Address-1.882.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/perl-Email-Address.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Address.spec	11 Nov 2006 17:55:48 -0000	1.6
+++ perl-Email-Address.spec	22 Nov 2006 14:01:17 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.880
+Version:        1.882
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -49,12 +49,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README bench/
+%doc Changes LICENSE README bench/
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
+- Update to 1.882.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
 - Update to 1.880.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 17:55:48 -0000	1.7
+++ sources	22 Nov 2006 14:01:17 -0000	1.8
@@ -1 +1 @@
-8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz
+1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:01:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:01:52 -0500
Subject: rpms/perl-Email-Address/devel .cvsignore, 1.7,
	1.8 perl-Email-Address.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200611221401.kAME1qRo016083@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16015/devel

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.882.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 17:55:49 -0000	1.7
+++ .cvsignore	22 Nov 2006 14:01:22 -0000	1.8
@@ -1 +1 @@
-Email-Address-1.880.tar.gz
+Email-Address-1.882.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Address.spec	11 Nov 2006 17:55:49 -0000	1.6
+++ perl-Email-Address.spec	22 Nov 2006 14:01:22 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.880
+Version:        1.882
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -49,12 +49,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README bench/
+%doc Changes LICENSE README bench/
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
+- Update to 1.882.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
 - Update to 1.880.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 17:55:49 -0000	1.7
+++ sources	22 Nov 2006 14:01:22 -0000	1.8
@@ -1 +1 @@
-8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz
+1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:01:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:01:47 -0500
Subject: rpms/perl-Email-Address/FC-6 .cvsignore, 1.7,
	1.8 perl-Email-Address.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200611221401.kAME1lSX016078@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16015/FC-6

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.882.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 17:55:49 -0000	1.7
+++ .cvsignore	22 Nov 2006 14:01:17 -0000	1.8
@@ -1 +1 @@
-Email-Address-1.880.tar.gz
+Email-Address-1.882.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/perl-Email-Address.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Email-Address.spec	11 Nov 2006 17:55:49 -0000	1.6
+++ perl-Email-Address.spec	22 Nov 2006 14:01:17 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.880
+Version:        1.882
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -49,12 +49,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README bench/
+%doc Changes LICENSE README bench/
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
+- Update to 1.882.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 1.880-1
 - Update to 1.880.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 17:55:49 -0000	1.7
+++ sources	22 Nov 2006 14:01:17 -0000	1.8
@@ -1 +1 @@
-8896620e19e527301645b6222b399925  Email-Address-1.880.tar.gz
+1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:06:00 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 09:06:00 -0500
Subject: rpms/libosip2/devel libosip2.spec,1.10,1.11
Message-ID: <200611221406.kAME60eZ016251@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16230

Modified Files:
	libosip2.spec 
Log Message:
Bump release and rebuild.


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/devel/libosip2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libosip2.spec	14 Nov 2006 21:03:51 -0000	1.10
+++ libosip2.spec	22 Nov 2006 14:05:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 3.0.1-2
+- Bump release and rebuild
+
 * Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
 - Update to 3.0.1 and remove unnecessary patch.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 14:07:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:07:24 -0500
Subject: rpms/perl-PadWalker/FC-5 .cvsignore, 1.2, 1.3 perl-PadWalker.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611221407.kAME7Oic016356@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PadWalker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16306/FC-5

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
Update to 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 May 2006 21:17:41 -0000	1.2
+++ .cvsignore	22 Nov 2006 14:06:54 -0000	1.3
@@ -1 +1 @@
-PadWalker-1.0.tar.gz
+PadWalker-1.2.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-5/perl-PadWalker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PadWalker.spec	20 May 2006 21:17:41 -0000	1.1
+++ perl-PadWalker.spec	22 Nov 2006 14:06:54 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-PadWalker
-Version:        1.0
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Play with other peoples' lexical variables
 
@@ -52,5 +52,14 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.2-1
+- Update to 1.2.
+
+* Mon Oct 23 2006 Jose Pedro Oliveira  - 1.1-1
+- Update to 1.1.
+
+* Sun Sep 10 2006 Jose Pedro Oliveira  - 1.0-2
+- Rebuild for FC6.
+
 * Fri May 19 2006 Jose Pedro Oliveira  - 1.0-1
 - First build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 May 2006 21:17:41 -0000	1.2
+++ sources	22 Nov 2006 14:06:54 -0000	1.3
@@ -1 +1 @@
-05d684ce2f17ef4f058ec2e912b5f95c  PadWalker-1.0.tar.gz
+a33cce19a5be0c83297e7b2ba1878e08  PadWalker-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:07:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:07:25 -0500
Subject: rpms/perl-PadWalker/devel .cvsignore, 1.3, 1.4 perl-PadWalker.spec, 
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611221407.kAME7PxJ016364@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PadWalker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16306/devel

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
Update to 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Oct 2006 12:27:48 -0000	1.3
+++ .cvsignore	22 Nov 2006 14:06:54 -0000	1.4
@@ -1 +1 @@
-PadWalker-1.1.tar.gz
+PadWalker-1.2.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/perl-PadWalker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-PadWalker.spec	23 Oct 2006 12:27:48 -0000	1.3
+++ perl-PadWalker.spec	22 Nov 2006 14:06:54 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-PadWalker
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Play with other peoples' lexical variables
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.2-1
+- Update to 1.2.
+
 * Mon Oct 23 2006 Jose Pedro Oliveira  - 1.1-1
 - Update to 1.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Oct 2006 12:27:48 -0000	1.3
+++ sources	22 Nov 2006 14:06:54 -0000	1.4
@@ -1 +1 @@
-193821660d7da7a5944776e21fceda7e  PadWalker-1.1.tar.gz
+a33cce19a5be0c83297e7b2ba1878e08  PadWalker-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:07:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:07:24 -0500
Subject: rpms/perl-PadWalker/FC-6 .cvsignore, 1.3, 1.4 perl-PadWalker.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611221407.kAME7Oke016361@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-PadWalker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16306/FC-6

Modified Files:
	.cvsignore perl-PadWalker.spec sources 
Log Message:
Update to 1.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Oct 2006 12:27:48 -0000	1.3
+++ .cvsignore	22 Nov 2006 14:06:54 -0000	1.4
@@ -1 +1 @@
-PadWalker-1.1.tar.gz
+PadWalker-1.2.tar.gz


Index: perl-PadWalker.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-6/perl-PadWalker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-PadWalker.spec	23 Oct 2006 12:27:48 -0000	1.3
+++ perl-PadWalker.spec	22 Nov 2006 14:06:54 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-PadWalker
-Version:        1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        Play with other peoples' lexical variables
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.2-1
+- Update to 1.2.
+
 * Mon Oct 23 2006 Jose Pedro Oliveira  - 1.1-1
 - Update to 1.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PadWalker/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Oct 2006 12:27:48 -0000	1.3
+++ sources	22 Nov 2006 14:06:54 -0000	1.4
@@ -1 +1 @@
-193821660d7da7a5944776e21fceda7e  PadWalker-1.1.tar.gz
+a33cce19a5be0c83297e7b2ba1878e08  PadWalker-1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:08:50 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 09:08:50 -0500
Subject: rpms/libosip2/FC-6 libosip2.spec,1.10,1.11
Message-ID: <200611221408.kAME8oQw016507@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16451

Modified Files:
	libosip2.spec 
Log Message:
Bump release and rebuild.


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-6/libosip2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libosip2.spec	14 Nov 2006 20:51:50 -0000	1.10
+++ libosip2.spec	22 Nov 2006 14:08:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 3.0.1-2
+- Bump release and rebuild
+
 * Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
 - Update to 3.0.1 and remove unnecessary patch.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 14:09:52 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 09:09:52 -0500
Subject: rpms/libosip2/FC-5 libosip2.spec,1.9,1.10
Message-ID: <200611221409.kAME9qNJ016578@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libosip2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16553

Modified Files:
	libosip2.spec 
Log Message:
Bump release and rebuild.


Index: libosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libosip2/FC-5/libosip2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libosip2.spec	15 Nov 2006 17:30:51 -0000	1.9
+++ libosip2.spec	22 Nov 2006 14:09:22 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           libosip2
 Version:        3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        oSIP is an implementation of SIP
 
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 3.0.1-2
+- Bump release and rebuild
+
 * Sat Nov 11 2006 Jeffrey C. Ollie  - 3.0.1-1
 - Update to 3.0.1 and remove unnecessary patch.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 14:17:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:17:02 -0500
Subject: rpms/perl-ExtUtils-ParseXS/FC-5 .cvsignore, 1.9,
	1.10 perl-ExtUtils-ParseXS.spec, 1.14, 1.15 sources, 1.9, 1.10
Message-ID: <200611221417.kAMEH21v016776@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16727/FC-5

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Sep 2006 17:02:33 -0000	1.9
+++ .cvsignore	22 Nov 2006 14:16:32 -0000	1.10
@@ -1 +1 @@
-ExtUtils-ParseXS-2.16.tar.gz
+ExtUtils-ParseXS-2.17.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-5/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-ExtUtils-ParseXS.spec	16 Sep 2006 17:02:33 -0000	1.14
+++ perl-ExtUtils-ParseXS.spec	22 Nov 2006 14:16:32 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           perl-ExtUtils-ParseXS
-Version:        2.16
+Version:        2.17
 Release:        1%{?dist}
 Summary:        Module and a script for converting Perl XS code into C code
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 2.17-1
+- Update to 2.17.
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 2.16-1
 - Update to 2.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Sep 2006 17:02:33 -0000	1.9
+++ sources	22 Nov 2006 14:16:32 -0000	1.10
@@ -1 +1 @@
-c64fddf17ee2b27d8a90ceb455c3e570  ExtUtils-ParseXS-2.16.tar.gz
+36553d14f8cc424ed124130f8d8823f3  ExtUtils-ParseXS-2.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:17:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:17:03 -0500
Subject: rpms/perl-ExtUtils-ParseXS/devel .cvsignore, 1.9,
	1.10 perl-ExtUtils-ParseXS.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200611221417.kAMEH32E016786@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16727/devel

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Sep 2006 17:02:34 -0000	1.9
+++ .cvsignore	22 Nov 2006 14:16:33 -0000	1.10
@@ -1 +1 @@
-ExtUtils-ParseXS-2.16.tar.gz
+ExtUtils-ParseXS-2.17.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-ExtUtils-ParseXS.spec	16 Sep 2006 17:02:34 -0000	1.15
+++ perl-ExtUtils-ParseXS.spec	22 Nov 2006 14:16:33 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-ExtUtils-ParseXS
-Version:        2.16
+Version:        2.17
 Release:        1%{?dist}
 Summary:        Module and a script for converting Perl XS code into C code
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 2.17-1
+- Update to 2.17.
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 2.16-1
 - Update to 2.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Sep 2006 17:02:34 -0000	1.9
+++ sources	22 Nov 2006 14:16:33 -0000	1.10
@@ -1 +1 @@
-c64fddf17ee2b27d8a90ceb455c3e570  ExtUtils-ParseXS-2.16.tar.gz
+36553d14f8cc424ed124130f8d8823f3  ExtUtils-ParseXS-2.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:17:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:17:03 -0500
Subject: rpms/perl-ExtUtils-ParseXS/FC-6 .cvsignore, 1.9,
	1.10 perl-ExtUtils-ParseXS.spec, 1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200611221417.kAMEH3Sm016781@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16727/FC-6

Modified Files:
	.cvsignore perl-ExtUtils-ParseXS.spec sources 
Log Message:
Update to 2.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Sep 2006 17:02:34 -0000	1.9
+++ .cvsignore	22 Nov 2006 14:16:33 -0000	1.10
@@ -1 +1 @@
-ExtUtils-ParseXS-2.16.tar.gz
+ExtUtils-ParseXS-2.17.tar.gz


Index: perl-ExtUtils-ParseXS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-6/perl-ExtUtils-ParseXS.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-ExtUtils-ParseXS.spec	16 Sep 2006 17:02:34 -0000	1.15
+++ perl-ExtUtils-ParseXS.spec	22 Nov 2006 14:16:33 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           perl-ExtUtils-ParseXS
-Version:        2.16
+Version:        2.17
 Release:        1%{?dist}
 Summary:        Module and a script for converting Perl XS code into C code
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 2.17-1
+- Update to 2.17.
+
 * Sat Sep 16 2006 Jose Pedro Oliveira  - 2.16-1
 - Update to 2.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-ParseXS/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Sep 2006 17:02:34 -0000	1.9
+++ sources	22 Nov 2006 14:16:33 -0000	1.10
@@ -1 +1 @@
-c64fddf17ee2b27d8a90ceb455c3e570  ExtUtils-ParseXS-2.16.tar.gz
+36553d14f8cc424ed124130f8d8823f3  ExtUtils-ParseXS-2.17.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:19:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:19:46 -0500
Subject: rpms/perl-Wx/devel .cvsignore, 1.5, 1.6 perl-Wx.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611221419.kAMEJkGd016946@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16925

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Update to 0.63.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Nov 2006 10:56:57 -0000	1.5
+++ .cvsignore	22 Nov 2006 14:19:16 -0000	1.6
@@ -1 +1 @@
-Wx-0.62.tar.gz
+Wx-0.63.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/perl-Wx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Wx.spec	14 Nov 2006 10:56:57 -0000	1.4
+++ perl-Wx.spec	22 Nov 2006 14:19:16 -0000	1.5
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.62
+Version:        0.63
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.63-1
+- Update to 0.63.
+
 * Tue Nov 14 2006 Jose Pedro Oliveira  - 0.62-1
 - Update to 0.62.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Nov 2006 10:56:57 -0000	1.5
+++ sources	22 Nov 2006 14:19:16 -0000	1.6
@@ -1 +1 @@
-1e1edb47fd78931852268a04f096d47b  Wx-0.62.tar.gz
+214bf025166a603506b160823d5e9013  Wx-0.63.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:35:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:35:24 -0500
Subject: rpms/perl-Glib/devel .cvsignore, 1.12, 1.13 perl-Glib.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <200611221435.kAMEZO1g017121@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17097

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Update to 1.141.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Sep 2006 14:06:38 -0000	1.12
+++ .cvsignore	22 Nov 2006 14:34:54 -0000	1.13
@@ -1 +1 @@
-Glib-1.140.tar.gz
+Glib-1.141.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Glib.spec	6 Sep 2006 14:06:38 -0000	1.17
+++ perl-Glib.spec	22 Nov 2006 14:34:54 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           perl-Glib
-Version:        1.140
+Version:        1.141
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
@@ -62,10 +62,13 @@
 %doc AUTHORS ChangeLog LICENSE NEWS README TODO
 %{perl_vendorarch}/auto/Glib/
 %{perl_vendorarch}/Glib*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.141-1
+- Update to 1.141.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira  - 1.140-1
 - Update to 1.140.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Sep 2006 14:06:38 -0000	1.12
+++ sources	22 Nov 2006 14:34:54 -0000	1.13
@@ -1 +1 @@
-36a4ba906ae9542b10568501f1f99602  Glib-1.140.tar.gz
+ab90e68a745e771a8b6af8fadcce4c38  Glib-1.141.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:40:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 09:40:44 -0500
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.15, 1.16 perl-Gtk2.spec, 1.20,
	1.21 sources, 1.15, 1.16
Message-ID: <200611221440.kAMEeiXx017269@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17248

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.141.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	6 Sep 2006 14:21:22 -0000	1.15
+++ .cvsignore	22 Nov 2006 14:40:14 -0000	1.16
@@ -1 +1 @@
-Gtk2-1.140.tar.gz
+Gtk2-1.141.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-Gtk2.spec	6 Sep 2006 14:21:22 -0000	1.20
+++ perl-Gtk2.spec	22 Nov 2006 14:40:14 -0000	1.21
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Gtk2
-Version:        1.140
+Version:        1.141
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -82,10 +82,13 @@
 %doc examples/ gtk-demo/
 %{perl_vendorarch}/auto/Gtk2/
 %{perl_vendorarch}/Gtk2*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 1.141-1
+- Update to 1.141.
+
 * Wed Sep  6 2006 Jose Pedro Oliveira  - 1.140-1
 - Update to 1.140.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Sep 2006 14:21:22 -0000	1.15
+++ sources	22 Nov 2006 14:40:14 -0000	1.16
@@ -1 +1 @@
-0951835b2d032a3813320de235b96273  Gtk2-1.140.tar.gz
+bc7f61c80bef55ae9e0edd4badedddd3  Gtk2-1.141.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 14:48:02 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 09:48:02 -0500
Subject: rpms/liferea/devel liferea-1.0.26-fonts.patch, NONE, 1.1 .cvsignore,
	1.37, 1.38 liferea.spec, 1.56, 1.57 sources, 1.38, 1.39
Message-ID: <200611221448.kAMEm2dq017376@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17354

Modified Files:
	.cvsignore liferea.spec sources 
Added Files:
	liferea-1.0.26-fonts.patch 
Log Message:
* Tue Nov 21 2006 Brian Pepple  - 1.0.26-1
- Update to 1.0.26.
- Add patch to use document font name. (#216813)


liferea-1.0.26-fonts.patch:

--- NEW FILE liferea-1.0.26-fonts.patch ---
--- liferea-1.0.26/src/conf.h.fonts	2006-07-22 05:00:54.000000000 -0400
+++ liferea-1.0.26/src/conf.h	2006-11-19 18:47:38.000000000 -0500
@@ -34,7 +34,7 @@
 #define BROWSER_MODULE			"/apps/liferea/browser-module"
 #define GNOME_DEFAULT_BROWSER_COMMAND	"gnome-open '%s'"
 #define DEFAULT_BROWSER_COMMAND		"mozilla '%s'"
-#define DEFAULT_FONT			"/desktop/gnome/interface/font_name"
+#define DEFAULT_FONT			"/desktop/gnome/interface/document_font_name"
 #define USER_FONT			"/apps/liferea/browser-font"
 #define REFOCUS_TIMEOUT			"/apps/liferea/refocus-timeout"
 #define DISABLE_JAVASCRIPT		"/apps/liferea/disable-javascript"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	27 Oct 2006 15:22:54 -0000	1.37
+++ .cvsignore	22 Nov 2006 14:47:32 -0000	1.38
@@ -1 +1 @@
-liferea-1.0.25.tar.gz
+liferea-1.0.26.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- liferea.spec	29 Oct 2006 22:26:18 -0000	1.56
+++ liferea.spec	22 Nov 2006 14:47:32 -0000	1.57
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.25
-Release:        3%{?dist}
+Version:        1.0.26
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-1.0.23-fedorafeed.patch
+Patch1:		%{name}-1.0.26-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml2-devel
@@ -42,6 +43,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
+%patch1 -p1 -b .fonts
 
 
 %build
@@ -108,6 +110,10 @@
 
 
 %changelog
+* Tue Nov 21 2006 Brian Pepple  - 1.0.26-1
+- Update to 1.0.26.
+- Add patch to use document font name. (#216813)
+
 * Sun Oct 29 2006 Brian Pepple  - 1.0.25-3
 - Actually use the correct version for firefox.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	27 Oct 2006 15:22:54 -0000	1.38
+++ sources	22 Nov 2006 14:47:32 -0000	1.39
@@ -1 +1 @@
-45d511c9eb829797336a60a4a86b5939  liferea-1.0.25.tar.gz
+8d48a070c9709a986a6f3d7a2ba7ec6c  liferea-1.0.26.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:07:45 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 10:07:45 -0500
Subject: rpms/python-xmpp/devel .cvsignore, 1.2, 1.3 python-xmpp.spec, 1.3, 
	1.4 sources, 1.2, 1.3
Message-ID: <200611221507.kAMF7jRq017595@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-xmpp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17576

Modified Files:
	.cvsignore python-xmpp.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 May 2006 13:24:44 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:07:15 -0000	1.3
@@ -1 +1 @@
-xmpppy-0.3.1.tar.gz
+xmpppy-0.4.0.tar.gz


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/devel/python-xmpp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-xmpp.spec	15 Aug 2006 04:32:25 -0000	1.3
+++ python-xmpp.spec	22 Nov 2006 15:07:15 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -49,7 +49,10 @@
 %{python_sitelib}/xmpp
 
 %changelog
-* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0
+
+* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Remove unneeded python_sitearch macro
 - Remove unneeded python-abi requirement
 - No longer ghost *.pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 May 2006 13:24:44 -0000	1.2
+++ sources	22 Nov 2006 15:07:15 -0000	1.3
@@ -1 +1 @@
-56e8df54288e57bd626cb53b31e2b41c  xmpppy-0.3.1.tar.gz
+bcec3068bc297e672a1d5b258090ee3d  xmpppy-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:11:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 10:11:21 -0500
Subject: rpms/python-xmpp/FC-6 .cvsignore, 1.2, 1.3 python-xmpp.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200611221511.kAMFBLso017670@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-xmpp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17643

Modified Files:
	.cvsignore python-xmpp.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 May 2006 13:24:44 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:10:51 -0000	1.3
@@ -1 +1 @@
-xmpppy-0.3.1.tar.gz
+xmpppy-0.4.0.tar.gz


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-6/python-xmpp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-xmpp.spec	15 Aug 2006 04:32:25 -0000	1.3
+++ python-xmpp.spec	22 Nov 2006 15:10:51 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -49,7 +49,10 @@
 %{python_sitelib}/xmpp
 
 %changelog
-* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0
+
+* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Remove unneeded python_sitearch macro
 - Remove unneeded python-abi requirement
 - No longer ghost *.pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 May 2006 13:24:44 -0000	1.2
+++ sources	22 Nov 2006 15:10:51 -0000	1.3
@@ -1 +1 @@
-56e8df54288e57bd626cb53b31e2b41c  xmpppy-0.3.1.tar.gz
+bcec3068bc297e672a1d5b258090ee3d  xmpppy-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:12:26 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 10:12:26 -0500
Subject: rpms/python-xmpp/FC-5 .cvsignore, 1.2, 1.3 python-xmpp.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611221512.kAMFCQ41017748@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-xmpp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17724

Modified Files:
	.cvsignore python-xmpp.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 May 2006 13:24:44 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:11:56 -0000	1.3
@@ -1 +1 @@
-xmpppy-0.3.1.tar.gz
+xmpppy-0.4.0.tar.gz


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-5/python-xmpp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-xmpp.spec	15 Aug 2006 04:33:10 -0000	1.2
+++ python-xmpp.spec	22 Nov 2006 15:11:56 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -49,7 +49,10 @@
 %{python_sitelib}/xmpp
 
 %changelog
-* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0
+
+* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Remove unneeded python_sitearch macro
 - Remove unneeded python-abi requirement
 - No longer ghost *.pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 May 2006 13:24:44 -0000	1.2
+++ sources	22 Nov 2006 15:11:56 -0000	1.3
@@ -1 +1 @@
-56e8df54288e57bd626cb53b31e2b41c  xmpppy-0.3.1.tar.gz
+bcec3068bc297e672a1d5b258090ee3d  xmpppy-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:13:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 10:13:21 -0500
Subject: rpms/python-xmpp/FC-4 .cvsignore, 1.2, 1.3 python-xmpp.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611221513.kAMFDLcS017811@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/python-xmpp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17792

Modified Files:
	.cvsignore python-xmpp.spec sources 
Log Message:
Update to 0.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 May 2006 13:24:44 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:12:51 -0000	1.3
@@ -1 +1 @@
-xmpppy-0.3.1.tar.gz
+xmpppy-0.4.0.tar.gz


Index: python-xmpp.spec
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-4/python-xmpp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-xmpp.spec	15 Aug 2006 04:34:08 -0000	1.2
+++ python-xmpp.spec	22 Nov 2006 15:12:51 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmpp
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Python library for easy scripting with Jabber
 
 Group:          Development/Languages
@@ -49,7 +49,10 @@
 %{python_sitelib}/xmpp
 
 %changelog
-* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 0.4.0-1
+- Update to 0.4.0
+
+* Mon Aug 14 2006 Jeffrey C. Ollie  - 0.3.1-2
 - Remove unneeded python_sitearch macro
 - Remove unneeded python-abi requirement
 - No longer ghost *.pyo files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-xmpp/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 May 2006 13:24:44 -0000	1.2
+++ sources	22 Nov 2006 15:12:51 -0000	1.3
@@ -1 +1 @@
-56e8df54288e57bd626cb53b31e2b41c  xmpppy-0.3.1.tar.gz
+bcec3068bc297e672a1d5b258090ee3d  xmpppy-0.4.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:16:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 10:16:00 -0500
Subject: rpms/perl-Wx/FC-5 .cvsignore, 1.4, 1.5 perl-Wx.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611221516.kAMFG01D017906@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17865/FC-5

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2006 18:10:07 -0000	1.4
+++ .cvsignore	22 Nov 2006 15:15:30 -0000	1.5
@@ -1 +1 @@
-Wx-0.60.tar.gz
+Wx-0.63.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/perl-Wx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Wx.spec	11 Nov 2006 18:10:07 -0000	1.3
+++ perl-Wx.spec	22 Nov 2006 15:15:30 -0000	1.4
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.60
+Version:        0.63
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.63-1
+- Update to 0.63.
+
+* Tue Nov 14 2006 Jose Pedro Oliveira  - 0.62-1
+- Update to 0.62.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
 - Update to 0.60.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2006 18:10:07 -0000	1.4
+++ sources	22 Nov 2006 15:15:30 -0000	1.5
@@ -1 +1 @@
-be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz
+214bf025166a603506b160823d5e9013  Wx-0.63.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:16:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 10:16:00 -0500
Subject: rpms/perl-Wx/FC-6 .cvsignore, 1.4, 1.5 perl-Wx.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200611221516.kAMFG0cK017911@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Wx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17865/FC-6

Modified Files:
	.cvsignore perl-Wx.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2006 18:10:08 -0000	1.4
+++ .cvsignore	22 Nov 2006 15:15:30 -0000	1.5
@@ -1 +1 @@
-Wx-0.60.tar.gz
+Wx-0.63.tar.gz


Index: perl-Wx.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/perl-Wx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Wx.spec	11 Nov 2006 18:10:08 -0000	1.3
+++ perl-Wx.spec	22 Nov 2006 15:15:30 -0000	1.4
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Wx
-Version:        0.60
+Version:        0.63
 Release:        1%{?dist}
 Summary:        Interface to the wxWidgets cross-platform GUI toolkit
 
@@ -81,6 +81,12 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.63-1
+- Update to 0.63.
+
+* Tue Nov 14 2006 Jose Pedro Oliveira  - 0.62-1
+- Update to 0.62.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.60-1
 - Update to 0.60.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Wx/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2006 18:10:08 -0000	1.4
+++ sources	22 Nov 2006 15:15:30 -0000	1.5
@@ -1 +1 @@
-be163b920b3834de9f7ebd38c6b8befd  Wx-0.60.tar.gz
+214bf025166a603506b160823d5e9013  Wx-0.63.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:18:59 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 22 Nov 2006 10:18:59 -0500
Subject: owners owners.list,1.1989,1.1990
Message-ID: <200611221518.kAMFIxep018036@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18021

Modified Files:
	owners.list 
Log Message:
fix plone+zope mess


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1989
retrieving revision 1.1990
diff -u -r1.1989 -r1.1990
--- owners.list	22 Nov 2006 05:47:57 -0000	1.1989
+++ owners.list	22 Nov 2006 15:18:29 -0000	1.1990
@@ -1872,7 +1872,7 @@
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|plib|Set of portable libraries especially useful for games|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|matthias at rpmforge.net
 Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|j.w.r.degoede at hhs.nl
-Fedora Extras|plone|User friendly and powerful open source Content Management System|extras-qa at fedoraproject.org|jonathansteffan at gmail.com
+Fedora Extras|plone|User friendly and powerful open source Content Management System|jonathansteffan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|plotmm|GTKmm plot widget for scientific applications|karlthered at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|plotutils|GNU vector and raster graphics utilities and libraries|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -2557,7 +2557,7 @@
 Fedora Extras|zidrav|Zorba's Incredible Data Repairer And Verifier|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|Zim|Desktop wiki & notekeeper|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
-Fedora Extras|zope|Application server in Python|extras-qa at fedoraproject.org|jonathansteffan at gmail.com
+Fedora Extras|zope|Application server in Python|jonathansteffan at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zvbi|Raw VBI, Teletext and Closed Caption decoding library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|zynaddsubfx|Real-time software synthesizer|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 15:35:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:35:43 -0500
Subject: rpms/dd2 - New directory
Message-ID: <200611221535.kAMFZhcq018202@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18198/dd2

Log Message:
Directory /cvs/extras/rpms/dd2 added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 15:35:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:35:48 -0500
Subject: rpms/dd2/devel - New directory
Message-ID: <200611221535.kAMFZmTY018215@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18198/dd2/devel

Log Message:
Directory /cvs/extras/rpms/dd2/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 15:36:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:36:05 -0500
Subject: rpms/dd2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221536.kAMFa5w7018245@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18239

Added Files:
	Makefile import.log 
Log Message:
Setup of module dd2


--- NEW FILE Makefile ---
# Top level Makefile for module dd2
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  Wed Nov 22 15:36:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:36:10 -0500
Subject: rpms/dd2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611221536.kAMFaAPx018261@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18239/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dd2


--- 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 Nov 22 15:37:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:37:22 -0500
Subject: rpms/dd2 import.log,1.1,1.2
Message-ID: <200611221537.kAMFbMMm018389@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18315

Modified Files:
	import.log 
Log Message:
auto-import dd2-0.2.1-1.fc7 on branch devel from dd2-0.2.1-1.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dd2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 15:36:05 -0000	1.1
+++ import.log	22 Nov 2006 15:36:51 -0000	1.2
@@ -0,0 +1 @@
+dd2-0_2_1-1_fc7:HEAD:dd2-0.2.1-1.fc7.src.rpm:1164209909



From fedora-extras-commits at redhat.com  Wed Nov 22 15:37:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:37:22 -0500
Subject: rpms/dd2/devel dd2-0.2.1-glob-highscore.patch, NONE, 1.1 dd2.desktop,
	NONE, 1.1 dd2.png, NONE, 1.1 dd2.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611221537.kAMFbM0T018393@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dd2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18315/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dd2-0.2.1-glob-highscore.patch dd2.desktop dd2.png dd2.spec 
Log Message:
auto-import dd2-0.2.1-1.fc7 on branch devel from dd2-0.2.1-1.fc7.src.rpm

dd2-0.2.1-glob-highscore.patch:

--- NEW FILE dd2-0.2.1-glob-highscore.patch ---
--- dd2-0.2.1/src/menu.c.highscore	2004-07-02 17:36:33.000000000 +0200
+++ dd2-0.2.1/src/menu.c	2006-11-18 20:01:04.000000000 +0100
@@ -17,6 +17,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#include
 #include"SDL.h"
 #include"SDL_mixer.h"
 #include"menu.h"
--- dd2-0.2.1/src/main.c.highscore	2004-07-02 17:40:48.000000000 +0200
+++ dd2-0.2.1/src/main.c	2006-11-18 20:01:04.000000000 +0100
@@ -17,6 +17,13 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#ifndef WIN32
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
+#endif
+#include
+#endif
+#include
 #include
 #include
 #include"main.h"
@@ -44,7 +51,7 @@
 Uint32 tick, ntick;
 float scroll=0,scroll2=0;
 
-bool pause;
+bool paused;
 Uint32 pause_tick;
 
 extern bool boss;
@@ -130,7 +137,7 @@
 					{
 						writeCString(gfx, screen, 98, 20, "game paused", 0);
 						SDL_Flip(screen);
-						pause=pause ? false : true;
+						paused=paused ? false : true;
 						pause_tick=SDL_GetTicks()+200;
 						continue;
 					}
@@ -156,7 +163,7 @@
 				control_player(&player[1]);
 		}
 
-		if(pause)
+		if(paused)
 			continue;
 		
 		/* frame rate calculation */
@@ -270,8 +277,19 @@
     char buffer[512];
 	SDL_VideoInfo *vi;
 	unsigned char bpp=8;
+	FILE *scoreFile;
 
 #ifndef WIN32
+	gid_t realgid;
+
+	scoreFile = fopen("/var/games/dd2-hiscore", "r+");
+	realgid = getgid();
+
+        if (setresgid(-1, realgid, realgid) != 0) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
+	
 	if(argc==2)
 		if(argv[1][0]=='-' && argv[1][1]=='v') {
 			printf("%s v%s\nCopyright (c) 2003,2004 Juan J. Martinez \n", PACKAGE, VERSION);
@@ -292,11 +310,12 @@
 	sprintf(buffer,"%s/dd2.cfg",DD2_DATA);
 	if(!loadCFG(buffer,&conf))
 		fprintf(stderr,"unable to read configuration, using defaults\n");
-#endif
-
+		
 	/* read hi-scores */
 	sprintf(buffer,"%s/dd2-hiscore",DD2_DATA);
-	if(!loadScore(buffer,hiscore))
+	scoreFile = fopen(buffer, "r+");
+#endif
+	if(!loadScore(scoreFile,hiscore))
 		fprintf(stderr,"unable to read hi-scores, using defaults\n");
 
 	/* don't init sound if it's not needed */
@@ -393,7 +412,7 @@
 		player[0].joy=(int)conf.control[0]==JOYSTICK;
 		player[1].joy=(int)conf.control[1]==JOYSTICK;
 
-		pause=0;
+		paused=0;
 		pause_tick=0;
 		boss=0;
 		gameLoop();
@@ -462,10 +481,8 @@
 	saveCFG(buffer,&conf);
 
 	/* save hi-scores */
-	sprintf(buffer,"%s/dd2-hiscore",DD2_DATA);
-	if(!saveScore(buffer,hiscore))
-		fprintf(stderr,"unable to save hi-scores\ndo you have permissions to write into %s?\n"
-			,buffer);
-
+	if(!saveScore(scoreFile,hiscore))
+		fprintf(stderr,"unable to save hi-scores\n");
+	
 	return 0;
 }
--- dd2-0.2.1/src/control.c.highscore	2006-11-18 20:04:24.000000000 +0100
+++ dd2-0.2.1/src/control.c	2006-11-18 20:04:32.000000000 +0100
@@ -22,13 +22,13 @@
 #include "control.h"
 #include "SDL_plus.h"
 
-extern bool pause;
+extern bool paused;
 
 void control_player_joy(SDL_Joystick *joy, pDesc *p)
 {
 	int x,y,but;
 	
-	if(pause)
+	if(paused)
 		return;
 
 	SDL_JoystickUpdate();
@@ -68,7 +68,7 @@
 
 	keys=SDL_GetKeyState(NULL);	
 
-	if(pause)
+	if(paused)
 		return;
 	
 	if(keys[p->keys[0]]) {
--- dd2-0.2.1/src/data/Makefile.am.highscore	2004-05-17 16:41:00.000000000 +0200
+++ dd2-0.2.1/src/data/Makefile.am	2006-11-18 20:01:04.000000000 +0100
@@ -3,7 +3,3 @@
 efx6.wav efx7.wav efx8.wav gfx.bmp dd2.cfg game.act dd2-hiscore
 EXTRA_DIST = bgm1.xm bgm2.xm efx1.wav efx2.wav efx3.wav efx4.wav efx5.wav \
 efx6.wav efx7.wav efx8.wav gfx.bmp dd2.cfg game.act dd2-hiscore
-
-install-data-hook:
-	chmod a+rw $(pkgdatadir)/dd2-hiscore
-
--- dd2-0.2.1/src/data/Makefile.in.highscore	2004-07-02 17:43:12.000000000 +0200
+++ dd2-0.2.1/src/data/Makefile.in	2006-11-18 20:01:04.000000000 +0100
@@ -140,7 +140,6 @@
 
 install-data-am: install-pkgdataDATA
 	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-data: install-data-am
 
 install-am: all-am
@@ -190,10 +189,6 @@
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-install-data-hook:
-	chmod a+rw $(pkgdatadir)/dd2-hiscore
-
 # 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.
 .NOEXPORT:
--- dd2-0.2.1/src/cfg.c.highscore	2004-06-10 20:07:23.000000000 +0200
+++ dd2-0.2.1/src/cfg.c	2006-11-18 20:01:04.000000000 +0100
@@ -88,9 +88,8 @@
 }
 
 int
-loadScore(char *path, score *hisc)
+loadScore(FILE *f, score *hisc)
 {
-	FILE *f;
 	int i,j;
 	score swp;
 
@@ -101,19 +100,15 @@
 		hisc[i].score=10000-(i*1000);
 	}
 
-	f=fopen(path,"rt");
 	if(!f)
 		return 0;
 
 	for(i=0;i<10;i++)
 		if(fscanf(f,"%8[^:]:%i:%i\n", hisc[i].name, &hisc[i].stage,
 			&hisc[i].score)!=3) {
-				fclose(f);
 				return 0;
 		}
 
-	fclose(f);
-
 	/* it's needed the score is ordered */
 	for(i=0;i<9;i++)
 		for(j=i;j<10;j++) {
@@ -134,14 +129,14 @@
 }
 
 int
-saveScore(char *path, score *hisc)
+saveScore(FILE *f, score *hisc)
 {
-	FILE *f;
 	int i;
 
-	f=fopen(path,"wt");
 	if(!f)
 		return 0;
+		
+	rewind(f);
 
 	for(i=0;i<10;i++)
 		fprintf(f,"%s:%i:%i\n", hisc[i].name, hisc[i].stage,
--- dd2-0.2.1/src/cfg.h.highscore	2004-05-17 11:02:40.000000000 +0200
+++ dd2-0.2.1/src/cfg.h	2006-11-18 20:01:04.000000000 +0100
@@ -20,6 +20,8 @@
 #ifndef _CFG_H_
 #define _CFG_H_
 
+#include 
+
 #define NO_SOUND	0
 #define SOUND_LOW	1
 #define SOUND_MED	2
@@ -45,7 +47,7 @@
 int loadCFG(char *path, cfg *c);
 int saveCFG(char *path, cfg *c);
 
-int loadScore(char *path, score *hisc);
-int saveScore(char *path, score *hisc);
+int loadScore(FILE *f, score *hisc);
+int saveScore(FILE *f, score *hisc);
 
 #endif


--- NEW FILE dd2.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Dodgin' Diamond 2
Comment=Shoot'em up arcade game
Exec=dd2
Icon=dd2.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE dd2.spec ---
Name:           dd2
Version:        0.2.1
Release:        1%{?dist}
Summary:        Dodgin' Diamond 2 - Shoot'em up arcade game
Group:          Amusements/Games
License:        GPL
URL:            http://www.usebox.net/jjm/dd2/
Source0:        http://www.usebox.net/jjm/dd2/releases/dd2-%{version}.tar.gz
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         dd2-0.2.1-glob-highscore.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_mixer-devel desktop-file-utils

%description
This is a little shoot'em up arcade game for one or two players. It aims to
be an 'old school' arcade game with low resolution graphics, top-down scroll
action, energy based gameplay and different weapons with several levels of
power.


%prep
%setup -q
%patch0 -p1 -z .highscore
#stop autoxxx from rerunning
touch src/data/Makefile.in


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
mkdir -p $RPM_BUILD_ROOT%{_var}/games
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-hiscore \
  $RPM_BUILD_ROOT%{_var}/games

# 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/24x24/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/%{name}.png


%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 ChangeLog COPYING NEWS README TODO
%attr(2755,root,games) %{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
%config(noreplace) %attr (0664,root,games) %{_var}/games/%{name}-hiscore


%changelog
* Sat Nov 18 2006 Hans de Goede  0.2.1-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dd2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 15:36:10 -0000	1.1
+++ .cvsignore	22 Nov 2006 15:36:52 -0000	1.2
@@ -0,0 +1 @@
+dd2-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dd2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 15:36:10 -0000	1.1
+++ sources	22 Nov 2006 15:36:52 -0000	1.2
@@ -0,0 +1 @@
+fe713b8393e05ee6417108db968f34ac  dd2-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:41:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 10:41:13 -0500
Subject: owners owners.list,1.1990,1.1991
Message-ID: <200611221541.kAMFfDl3018581@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18563

Modified Files:
	owners.list 
Log Message:
added dd2


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1990
retrieving revision 1.1991
diff -u -r1.1990 -r1.1991
--- owners.list	22 Nov 2006 15:18:29 -0000	1.1990
+++ owners.list	22 Nov 2006 15:40:43 -0000	1.1991
@@ -289,6 +289,7 @@
 Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|dbus-qt|Qt-based library for using D-BUS|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dclib|Direct Connect file sharing library|lmacken at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|dd2|Dodgin' Diamond 2 - Shoot'em up arcade game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
 Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ddclient|A client to update dynamic DNS host entries|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|thomas at apestaart.org
 Fedora Extras|ddd|GUI for several command-line debuggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 15:41:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:41:54 -0500
Subject: rpms/perl-Gnome2-Print - New directory
Message-ID: <200611221541.kAMFfsPi018630@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18626/perl-Gnome2-Print

Log Message:
Directory /cvs/extras/rpms/perl-Gnome2-Print added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 15:41:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:41:59 -0500
Subject: rpms/perl-Gnome2-Print/devel - New directory
Message-ID: <200611221541.kAMFfxka018643@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18626/perl-Gnome2-Print/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gnome2-Print/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 15:42:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:05 -0500
Subject: owners owners.list,1.1991,1.1992
Message-ID: <200611221542.kAMFg59L018654@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18606

Modified Files:
	owners.list 
Log Message:
added perl-Gnome2-Print


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1991
retrieving revision 1.1992
diff -u -r1.1991 -r1.1992
--- owners.list	22 Nov 2006 15:40:43 -0000	1.1991
+++ owners.list	22 Nov 2006 15:41:34 -0000	1.1992
@@ -1474,6 +1474,7 @@
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gnome2-Canvas|Perl interface to Gnome Canvas|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
 Fedora Extras|perl-Gnome2-GConf|Perl wrappers for the GConf configuration engine|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Gnome2-Print|Perl wrappers for the Gnome Print utilities|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Graphics-ColorNames|Defines RGB values for common color names|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Nov 22 15:42:07 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:07 -0500
Subject: rpms/perl-Gnome2-Print Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221542.kAMFg7l2018667@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18661

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Gnome2-Print


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gnome2-Print
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  Wed Nov 22 15:42:12 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:12 -0500
Subject: rpms/perl-Gnome2-Print/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611221542.kAMFgCTJ018682@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18661/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gnome2-Print


--- 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 Nov 22 15:42:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:54 -0500
Subject: rpms/perl-Gnome2-Print import.log,1.1,1.2
Message-ID: <200611221542.kAMFgsEZ018736@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18706

Modified Files:
	import.log 
Log Message:
auto-import perl-Gnome2-Print-1.000-1.fc6 on branch devel from perl-Gnome2-Print-1.000-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 15:42:07 -0000	1.1
+++ import.log	22 Nov 2006 15:42:24 -0000	1.2
@@ -0,0 +1 @@
+perl-Gnome2-Print-1_000-1_fc6:HEAD:perl-Gnome2-Print-1.000-1.fc6.src.rpm:1164210170



From fedora-extras-commits at redhat.com  Wed Nov 22 15:42:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:42:54 -0500
Subject: rpms/perl-Gnome2-Print/devel perl-Gnome2-Print.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611221542.kAMFgsCs018740@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18706/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Gnome2-Print.spec 
Log Message:
auto-import perl-Gnome2-Print-1.000-1.fc6 on branch devel from perl-Gnome2-Print-1.000-1.fc6.src.rpm


--- NEW FILE perl-Gnome2-Print.spec ---
Name:           perl-Gnome2-Print
Version:        1.000
Release:        1%{?dist}
Summary:        Perl wrappers for the Gnome Print utilities
License:        LGPL
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Gnome2-Print/
Source0:        http://www.cpan.org/authors/id/E/EB/EBASSI/Gnome2-Print-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(ExtUtils::Depends)   >= 0.1
BuildRequires:  perl(ExtUtils::PkgConfig) >= 1.03
BuildRequires:  perl(Glib)                >= 1.120
BuildRequires:  perl(Gtk2)                >= 1.120
BuildRequires:  libgnomeprintui22-devel   >= 2.2.0.0

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module allows you to use the GNOME Print libraries within your
applications written using the gtk2-perl wrapper. The GNOME Print libraries
(also known as libgnomeprint and libgnomeprintui) allow you to create
printable documents (using various frontends) and offer standard widgets in
order to mainatin a UI consistent for all GNOME applications.

%prep
%setup -q -n Gnome2-Print-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog doctypes gnomeprint.typemap maps NEWS README examples/
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Gnome2*
%{_mandir}/man3/*

%changelog
* Tue Nov 21 2006 Chris Weyl  1.000-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 15:42:12 -0000	1.1
+++ .cvsignore	22 Nov 2006 15:42:24 -0000	1.2
@@ -0,0 +1 @@
+Gnome2-Print-1.000.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 15:42:12 -0000	1.1
+++ sources	22 Nov 2006 15:42:24 -0000	1.2
@@ -0,0 +1 @@
+66578c2ffaebbe035a0735e65ad71c3f  Gnome2-Print-1.000.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 15:44:13 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 10:44:13 -0500
Subject: rpms/perl-Gnome2-Print/devel perl-Gnome2-Print.spec,1.1,1.2
Message-ID: <200611221544.kAMFiDLY018789@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774

Modified Files:
	perl-Gnome2-Print.spec 
Log Message:
release bump


Index: perl-Gnome2-Print.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/devel/perl-Gnome2-Print.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gnome2-Print.spec	22 Nov 2006 15:42:24 -0000	1.1
+++ perl-Gnome2-Print.spec	22 Nov 2006 15:43:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Gnome2-Print
 Version:        1.000
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl wrappers for the Gnome Print utilities
 License:        LGPL
 Group:          Development/Libraries
@@ -55,5 +55,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 22 2006 Chris Weyl  1.000-2
+- bump
+
 * Tue Nov 21 2006 Chris Weyl  1.000-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Wed Nov 22 15:46:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 10:46:40 -0500
Subject: rpms/python-eyed3/devel .cvsignore, 1.2, 1.3 python-eyed3.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611221546.kAMFke1m018865@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846

Modified Files:
	.cvsignore python-eyed3.spec sources 
Log Message:
* Wed Nov 22 2006 Brian Pepple  - 0.6.11-1
- Update to 0.6.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 18:03:35 -0000	1.2
+++ .cvsignore	22 Nov 2006 15:46:10 -0000	1.3
@@ -1 +1 @@
-eyeD3-0.6.10.tar.gz
+eyeD3-0.6.11.tar.gz


Index: python-eyed3.spec
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/python-eyed3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-eyed3.spec	7 Oct 2006 18:03:35 -0000	1.1
+++ python-eyed3.spec	22 Nov 2006 15:46:10 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-eyed3
-Version:        0.6.10
-Release:        2%{?dist}
+Version:        0.6.11
+Release:        1%{?dist}
 Summary:        Python module for processing ID3 tags
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@
 
 
 %description
-Aa Python module and program for processing ID3 tags. Information about
+A Python module and program for processing ID3 tags. Information about
 mp3 files(i.e bit rate, sample frequency, play time, etc.) is also
 provided. The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Brian Pepple  - 0.6.11-1
+- Update to 0.6.11.
+
 * Sat Oct  7 2006 Brian Pepple  - 0.6.10-2
 - Change BR to python.
 - Remove unnecessary make in build section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 18:03:35 -0000	1.2
+++ sources	22 Nov 2006 15:46:10 -0000	1.3
@@ -1 +1 @@
-2f7ee6749b993faba3b5d10d9621d314  eyeD3-0.6.10.tar.gz
+e296d7b896a31abf429d542dd26c90a3  eyeD3-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:09:50 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:09:50 -0500
Subject: rpms/openct/FC-6 .cvsignore, 1.10, 1.11 openct.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200611221609.kAMG9o4V019092@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19055/FC-6

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
- 0.6.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 18:18:03 -0000	1.10
+++ .cvsignore	22 Nov 2006 16:09:20 -0000	1.11
@@ -1 +1 @@
-openct-0.6.10.tar.gz
+openct-0.6.11.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/openct.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openct.spec	11 Nov 2006 18:18:03 -0000	1.20
+++ openct.spec	22 Nov 2006 16:09:20 -0000	1.21
@@ -1,7 +1,7 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.10
+Version:        0.6.11
 Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
+- 0.6.11.
+
 * Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
 - 0.6.10, udev rules fixed upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 18:18:03 -0000	1.10
+++ sources	22 Nov 2006 16:09:20 -0000	1.11
@@ -1 +1 @@
-fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz
+1cdd16b2c1443ecb986abf125af50e7f  openct-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:09:50 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:09:50 -0500
Subject: rpms/openct/devel .cvsignore, 1.10, 1.11 openct.spec, 1.20,
	1.21 sources, 1.10, 1.11
Message-ID: <200611221609.kAMG9omx019097@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19055/devel

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
- 0.6.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 18:18:04 -0000	1.10
+++ .cvsignore	22 Nov 2006 16:09:20 -0000	1.11
@@ -1 +1 @@
-openct-0.6.10.tar.gz
+openct-0.6.11.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openct.spec	11 Nov 2006 18:18:04 -0000	1.20
+++ openct.spec	22 Nov 2006 16:09:20 -0000	1.21
@@ -1,7 +1,7 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.10
+Version:        0.6.11
 Release:        1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
+- 0.6.11.
+
 * Sat Nov 11 2006 Ville Skytt??  - 0.6.10-1
 - 0.6.10, udev rules fixed upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 18:18:04 -0000	1.10
+++ sources	22 Nov 2006 16:09:20 -0000	1.11
@@ -1 +1 @@
-fc91a7cda636b0dc5de74f1d22c2d914  openct-0.6.10.tar.gz
+1cdd16b2c1443ecb986abf125af50e7f  openct-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:19:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 11:19:51 -0500
Subject: rpms/wxMaxima/devel wxMaxima.spec,1.6,1.7
Message-ID: <200611221619.kAMGJpqZ019260@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19245

Modified Files:
	wxMaxima.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter  0.7.0a-4
- --remove-category=Science;Utility (#215748)



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wxMaxima.spec	9 Oct 2006 14:02:24 -0000	1.6
+++ wxMaxima.spec	22 Nov 2006 16:19:21 -0000	1.7
@@ -5,7 +5,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -31,7 +31,15 @@
 
 %patch1 -p1 -b .mp
 
-sed -i -e "s|^Icon=.*|Icon=wxmaxima|" wxmaxima.desktop
+## wxmaxima.desktop fixups
+# do (some) Categories munging here, some versions of desktop-file-install 
+# (*cough rhel4*) truncate Categories if --remove-category'd items is a
+# substr of another (ie, X-Red-Hat-Base X-Red-Hat-Base-Only)
+sed -i \
+  -e "s|^Categories=.*|Categories=Utility;|" \
+  -e "s|^Icon=.*|Icon=wxmaxima|" \
+  -e "s|^Terminal=0|Terminal=false|" \
+  wxmaxima.desktop
 
 
 %build
@@ -49,12 +57,10 @@
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="" \
-  --add-category="Science" \
+  --vendor="" \
   --add-category="Education" \
   --add-category="Math" \
-  --remove-category="X-Red-Hat-Base" \
-  --remove-category="X-Red-Hat-Base-Only" \
+  --remove-category="Utility" \
   wxmaxima.desktop 
 
 # app icon
@@ -92,6 +98,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Rex Dieter  0.7.0a-4
+- --remove-category=Science;Utility (#215748)
+
 * Mon Oct 09 2006 Rex Dieter  0.7.0a-3
 - (re)fix typo in %%description
 



From fedora-extras-commits at redhat.com  Wed Nov 22 16:29:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 11:29:26 -0500
Subject: rpms/gdl/devel .cvsignore, 1.5, 1.6 gdl.spec, 1.18, 1.19 sources,
	1.5, 1.6 gdl-0.9pre2-specialization.patch, 1.1, NONE
Message-ID: <200611221629.kAMGTQZ3019419@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19393

Modified Files:
	.cvsignore gdl.spec sources 
Removed Files:
	gdl-0.9pre2-specialization.patch 
Log Message:
Update to 0.9pre3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jun 2006 22:22:18 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:28:56 -0000	1.6
@@ -1 +1 @@
-gdl-0.9pre2.tar.gz
+gdl-0.9pre3.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gdl.spec	3 Oct 2006 22:21:24 -0000	1.18
+++ gdl.spec	22 Nov 2006 16:28:56 -0000	1.19
@@ -1,13 +1,12 @@
 Name:           gdl
 Version:        0.9
-Release:        0.pre3.1%{?dist}
+Release:        0.pre3.2%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://dl.sf.net/gnudata/%{name}-%{version}pre2.tar.gz
-Patch0:         gdl-0.9pre2-specialization.patch
+Source0:        http://dl.sf.net/gnudata/%{name}-%{version}pre3.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel, ncurses-devel
@@ -24,8 +23,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
-%patch -p1
+%setup -q -n %{name}-%{version}pre3
 
 
 %build
@@ -51,6 +49,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 - Orion Poplawski  - 0.9-0.pre3.2
+- Update to 0.9pre3
+
 * Wed Oct  3 2006 - Orion Poplawski  - 0.9-0.pre3.1
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 22:22:18 -0000	1.5
+++ sources	22 Nov 2006 16:28:56 -0000	1.6
@@ -1 +1 @@
-41a3a2184dad0292affe090e146308ca  gdl-0.9pre2.tar.gz
+0bf35ded3b585507c021f8292ad6f611  gdl-0.9pre3.tar.gz


--- gdl-0.9pre2-specialization.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 16:35:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:35:45 -0500
Subject: rpms/perl-MIME-Types/FC-6 .cvsignore, 1.5, 1.6 perl-MIME-Types.spec,
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611221635.kAMGZj7Z019547@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MIME-Types/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19511/FC-6

Modified Files:
	.cvsignore perl-MIME-Types.spec sources 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 1.18-1
- 1.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Aug 2006 08:43:01 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:35:15 -0000	1.6
@@ -1 +1 @@
-MIME-Types-1.17.tar.gz
+MIME-Types-1.18.tar.gz


Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/FC-6/perl-MIME-Types.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-MIME-Types.spec	15 Sep 2006 16:27:43 -0000	1.10
+++ perl-MIME-Types.spec	22 Nov 2006 16:35:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Types
-Version:        1.17
-Release:        2%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Summary:        MIME types module for Perl
 
 License:        GPL or Artistic
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 1.18-1
+- 1.18.
+
 * Fri Sep 15 2006 Ville Skytt??  - 1.17-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Aug 2006 08:43:01 -0000	1.5
+++ sources	22 Nov 2006 16:35:15 -0000	1.6
@@ -1 +1 @@
-687f985c74d4cdacd2a6ee8a2c51971d  MIME-Types-1.17.tar.gz
+fec1a57dfc4a0d7177b98fd75844685b  MIME-Types-1.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:35:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:35:45 -0500
Subject: rpms/perl-MIME-Types/devel .cvsignore, 1.5, 1.6 perl-MIME-Types.spec,
	1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200611221635.kAMGZjSx019552@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MIME-Types/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19511/devel

Modified Files:
	.cvsignore perl-MIME-Types.spec sources 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 1.18-1
- 1.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Aug 2006 08:43:01 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:35:15 -0000	1.6
@@ -1 +1 @@
-MIME-Types-1.17.tar.gz
+MIME-Types-1.18.tar.gz


Index: perl-MIME-Types.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/perl-MIME-Types.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-MIME-Types.spec	15 Sep 2006 16:27:43 -0000	1.10
+++ perl-MIME-Types.spec	22 Nov 2006 16:35:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-MIME-Types
-Version:        1.17
-Release:        2%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Summary:        MIME types module for Perl
 
 License:        GPL or Artistic
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 1.18-1
+- 1.18.
+
 * Fri Sep 15 2006 Ville Skytt??  - 1.17-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-Types/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Aug 2006 08:43:01 -0000	1.5
+++ sources	22 Nov 2006 16:35:15 -0000	1.6
@@ -1 +1 @@
-687f985c74d4cdacd2a6ee8a2c51971d  MIME-Types-1.17.tar.gz
+fec1a57dfc4a0d7177b98fd75844685b  MIME-Types-1.18.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 16:46:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:46:32 -0500
Subject: rpms/kid3/FC-6 .cvsignore, 1.5, 1.6 kid3.spec, 1.13, 1.14 sources,
	1.5, 1.6 kid3-0.7-mimetypes.patch, 1.1, NONE
Message-ID: <200611221646.kAMGkWZX019746@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kid3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19703/FC-6

Modified Files:
	.cvsignore kid3.spec sources 
Removed Files:
	kid3-0.7-mimetypes.patch 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.8.1-1
- 0.8.1, desktop entry fixes applied upstream.
- Re-enable musicbrainz support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jun 2006 18:48:38 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-kid3-0.7.tar.gz
+kid3-0.8.1.tar.gz


Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/kid3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kid3.spec	2 Oct 2006 18:37:39 -0000	1.13
+++ kid3.spec	22 Nov 2006 16:46:02 -0000	1.14
@@ -1,24 +1,19 @@
-%bcond_with     tunepimp
-
 Name:           kid3
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://kid3.sourceforge.net/
-Source0:        http://download.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.7-mimetypes.patch
+Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
+BuildRequires:  taglib-devel >= 1.4
 BuildRequires:  flac-devel
-%if %{with tunepimp}
 BuildRequires:  libtunepimp-devel
-%endif
-BuildRequires:  desktop-file-utils
 BuildRequires:  perl(File::Spec)
 
 %description
@@ -30,17 +25,14 @@
 
 %prep
 %setup -q
-%patch0 -p1
 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
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-%configure \
-%if ! %{with tunepimp}
-  --disable-musicbrainz \
-%endif
-  --disable-rpath --disable-dependency-tracking
+%configure --disable-rpath --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -48,13 +40,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 debian/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 644 \
-  --vendor fedora \
-  --add-category X-Fedora \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kid3.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
+# preserve desktop entry location for from < 0.8 upgrades
+mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde/kid3,fedora-kid3}.desktop
+rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde
 %find_lang %{name}
 abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
 for file in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -type l) ; do
@@ -78,17 +66,22 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE README
-%lang(en) %{_docdir}/HTML/en/kid3/
-%lang(de) %{_docdir}/HTML/de/
+%doc AUTHORS ChangeLog COPYING LICENSE README
 %{_bindir}/kid3
 %{_datadir}/applications/*kid3.desktop
 %{_datadir}/apps/kid3/
-%{_datadir}/icons/hicolor/*/apps/kid3.png
+%{_datadir}/icons/hicolor/*x*/apps/kid3.png
+%{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
+%lang(en) %{_docdir}/HTML/en/kid3/
+%lang(de) %{_docdir}/HTML/de/
 %{_mandir}/man1/kid3.1*
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.8.1-1
+- 0.8.1, desktop entry fixes applied upstream.
+- Re-enable musicbrainz support.
+
 * Mon Oct  2 2006 Ville Skytt??  - 0.7-4
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 18:48:38 -0000	1.5
+++ sources	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-e5f8262e3456d9b0bdba4e4b56ca3aee  kid3-0.7.tar.gz
+df03e94061330e3ec088911727f85059  kid3-0.8.1.tar.gz


--- kid3-0.7-mimetypes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 16:46:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 11:46:32 -0500
Subject: rpms/kid3/devel .cvsignore, 1.5, 1.6 kid3.spec, 1.13, 1.14 sources, 
	1.5, 1.6 kid3-0.7-mimetypes.patch, 1.1, NONE
Message-ID: <200611221646.kAMGkWNC019751@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kid3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19703/devel

Modified Files:
	.cvsignore kid3.spec sources 
Removed Files:
	kid3-0.7-mimetypes.patch 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.8.1-1
- 0.8.1, desktop entry fixes applied upstream.
- Re-enable musicbrainz support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jun 2006 18:48:38 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-kid3-0.7.tar.gz
+kid3-0.8.1.tar.gz


Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kid3.spec	2 Oct 2006 18:37:39 -0000	1.13
+++ kid3.spec	22 Nov 2006 16:46:02 -0000	1.14
@@ -1,24 +1,19 @@
-%bcond_with     tunepimp
-
 Name:           kid3
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://kid3.sourceforge.net/
-Source0:        http://download.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.7-mimetypes.patch
+Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
+BuildRequires:  taglib-devel >= 1.4
 BuildRequires:  flac-devel
-%if %{with tunepimp}
 BuildRequires:  libtunepimp-devel
-%endif
-BuildRequires:  desktop-file-utils
 BuildRequires:  perl(File::Spec)
 
 %description
@@ -30,17 +25,14 @@
 
 %prep
 %setup -q
-%patch0 -p1
 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
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-%configure \
-%if ! %{with tunepimp}
-  --disable-musicbrainz \
-%endif
-  --disable-rpath --disable-dependency-tracking
+%configure --disable-rpath --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -48,13 +40,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 debian/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 644 \
-  --vendor fedora \
-  --add-category X-Fedora \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kid3.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
+# preserve desktop entry location for from < 0.8 upgrades
+mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde/kid3,fedora-kid3}.desktop
+rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde
 %find_lang %{name}
 abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
 for file in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -type l) ; do
@@ -78,17 +66,22 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE README
-%lang(en) %{_docdir}/HTML/en/kid3/
-%lang(de) %{_docdir}/HTML/de/
+%doc AUTHORS ChangeLog COPYING LICENSE README
 %{_bindir}/kid3
 %{_datadir}/applications/*kid3.desktop
 %{_datadir}/apps/kid3/
-%{_datadir}/icons/hicolor/*/apps/kid3.png
+%{_datadir}/icons/hicolor/*x*/apps/kid3.png
+%{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
+%lang(en) %{_docdir}/HTML/en/kid3/
+%lang(de) %{_docdir}/HTML/de/
 %{_mandir}/man1/kid3.1*
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.8.1-1
+- 0.8.1, desktop entry fixes applied upstream.
+- Re-enable musicbrainz support.
+
 * Mon Oct  2 2006 Ville Skytt??  - 0.7-4
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kid3/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 18:48:38 -0000	1.5
+++ sources	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-e5f8262e3456d9b0bdba4e4b56ca3aee  kid3-0.7.tar.gz
+df03e94061330e3ec088911727f85059  kid3-0.8.1.tar.gz


--- kid3-0.7-mimetypes.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 16:48:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 11:48:27 -0500
Subject: rpms/cmucl/devel .cvsignore, 1.3, 1.4 cmucl.spec, 1.7, 1.8 sources, 
	1.3, 1.4
Message-ID: <200611221648.kAMGmRYN019871@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/cmucl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19852

Modified Files:
	.cvsignore cmucl.spec sources 
Log Message:
* Thu Nov 16 2006 Rex Dieter  19d-1
- cmucl-19d



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmucl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Sep 2006 20:20:13 -0000	1.3
+++ .cvsignore	22 Nov 2006 16:47:57 -0000	1.4
@@ -2,3 +2,5 @@
 cmucl-src-19c.tar.bz2
 cmucl-19c-x86-linux.tar.bz2.asc
 cmucl-src-19c.tar.bz2.asc
+cmucl-19d-x86-linux.tar.bz2.asc
+cmucl-src-19d.tar.bz2


Index: cmucl.spec
===================================================================
RCS file: /cvs/extras/rpms/cmucl/devel/cmucl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cmucl.spec	7 Sep 2006 20:20:13 -0000	1.7
+++ cmucl.spec	22 Nov 2006 16:47:57 -0000	1.8
@@ -1,29 +1,29 @@
 
 Summary: CMU Common Lisp compiler
 Name: 	 cmucl
-Version: 19c
-Release: 7%{?dist}
+Version: 19d
+Release: 1%{?dist}
 
 License: Public Domain/MIT
 Group: 	 Development/Languages
 URL:	 http://www.cons.org/cmucl/
-Source0: ftp://ftp.common-lisp.net/pub/project/cmucl/release/19c/cmucl-src-19c.tar.bz2
-Source1: ftp://ftp.common-lisp.net/pub/project/cmucl/release/19c/cmucl-src-19c.tar.bz2.asc
+Source0: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2
+#Source1: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2.asc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 # bootstrap available for %%ix86 only: http://bugzilla.redhat.com/185085
 ExclusiveArch: %{ix86}
 
 ## ix86 section
 %ifarch %{ix86}
 %define cmucl_arch x86
-%define bootstrap cmucl 
-%define bootstrap_pkg cmucl
+#define bootstrap cmucl 
 %if "%{?bootstrap}" == "%{nil}"
-Source10: ftp://ftp.common-lisp.net/pub/project/cmucl/release/19c/cmucl-19c-x86-linux.tar.bz2
-Source11: ftp://ftp.common-lisp.net/pub/project/cmucl/release/19c/cmucl-19c-x86-linux.tar.bz2.asc
+Source10: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2
+Source11: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2.asc
 %define bootstrap_src -a 10 
 %else
-BuildRequires: %{?bootstrap_pkg}
+BuildRequires: cmucl 
 %endif
 %endif
 
@@ -39,10 +39,15 @@
 Patch1: cmucl-19c-motif-shared.patch
 Patch2: cmucl-19c-optflags.patch
 
-BuildRequires: sed >= 4.0 
-BuildRequires: lesstif-devel
+BuildRequires: sed
 BuildRequires: time
 BuildRequires: bc
+# Until we have a generic BR: motif-devel -- Rex
+%if "%{?fedora}" > "5"
+BuildRequires: lesstif-devel
+%else
+BuildRequires: openmotif-devel
+%endif
 
 %description
 CMUCL is a free, high performance implementation of the Common Lisp
@@ -194,6 +199,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Rex Dieter  19d-1
+- cmucl-19d
+
 * Thu Sep 07 2006 Rex Dieter  19c-7
 - BR: openmotif-devel -> lesstif-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmucl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Sep 2006 20:20:13 -0000	1.3
+++ sources	22 Nov 2006 16:47:57 -0000	1.4
@@ -1,4 +1,3 @@
-04bf7da2a49a309080bf504d0b1e8c28  cmucl-19c-x86-linux.tar.bz2
-c791f18c764e3c21970fecbbfb5b4524  cmucl-src-19c.tar.bz2
-1fda1ac8c0c5f9c5d1f9e2d7541a4513  cmucl-19c-x86-linux.tar.bz2.asc
-b123ec0d2583b314648e1c99f7f453dd  cmucl-src-19c.tar.bz2.asc
+806b3c1a9f68caa9106a5d03cf7bebce  cmucl-19d-x86-linux.tar.bz2.asc
+802cd8b05e376ff04c9006dd04f5bc7e  cmucl-19d-x86-linux.tar.bz2
+3a3dba371a7e1db7fa4b8f338acd72a3  cmucl-src-19d.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 16:57:42 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 11:57:42 -0500
Subject: rpms/jd/devel .cvsignore, 1.20, 1.21 jd.spec, 1.27, 1.28 sources,
	1.20, 1.21
Message-ID: <200611221657.kAMGvgqM019960@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19941

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061122
- cvs 061122 (25:50 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	21 Nov 2006 16:05:39 -0000	1.20
+++ .cvsignore	22 Nov 2006 16:57:12 -0000	1.21
@@ -1 +1 @@
-jd-1.8.1-cvs061121.tgz
+jd-1.8.1-cvs061122.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jd.spec	21 Nov 2006 16:05:39 -0000	1.27
+++ jd.spec	22 Nov 2006 16:57:12 -0000	1.28
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061121
+%define         strtag        cvs061122
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Nov 21 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061121
-- cvs 061121 (25:00 JST)
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061122
+- cvs 061122 (25:50 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 Nov 2006 16:05:39 -0000	1.20
+++ sources	22 Nov 2006 16:57:12 -0000	1.21
@@ -1 +1 @@
-c26742d0e0b634d5a8ad49bc6cb7fd04  jd-1.8.1-cvs061121.tgz
+456375f5bb55a1785572d5f6912adb1b  jd-1.8.1-cvs061122.tgz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:06:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:06:05 -0500
Subject: rpms/perl-Module-ScanDeps/FC-5 .cvsignore, 1.10,
	1.11 perl-Module-ScanDeps.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <200611221706.kAMH65G6020148@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-serv20099/FC-5

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 15:20:02 -0000	1.10
+++ .cvsignore	22 Nov 2006 17:05:35 -0000	1.11
@@ -1 +1 @@
-Module-ScanDeps-0.69.tar.gz
+Module-ScanDeps-0.70.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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Module-ScanDeps.spec	11 Nov 2006 15:20:02 -0000	1.10
+++ perl-Module-ScanDeps.spec	22 Nov 2006 17:05:35 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.69
+Version:        0.70
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.70-1
+- Update to 0.70.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
 - Update to 0.69.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 15:20:02 -0000	1.10
+++ sources	22 Nov 2006 17:05:35 -0000	1.11
@@ -1 +1 @@
-c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz
+e43e148b53291191a463d440bc18d2f7  Module-ScanDeps-0.70.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:06:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:06:05 -0500
Subject: rpms/perl-Module-ScanDeps/FC-6 .cvsignore, 1.10,
	1.11 perl-Module-ScanDeps.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <200611221706.kAMH65EA020153@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-serv20099/FC-6

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 15:20:03 -0000	1.10
+++ .cvsignore	22 Nov 2006 17:05:35 -0000	1.11
@@ -1 +1 @@
-Module-ScanDeps-0.69.tar.gz
+Module-ScanDeps-0.70.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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Module-ScanDeps.spec	11 Nov 2006 15:20:03 -0000	1.10
+++ perl-Module-ScanDeps.spec	22 Nov 2006 17:05:35 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.69
+Version:        0.70
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.70-1
+- Update to 0.70.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
 - Update to 0.69.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 15:20:03 -0000	1.10
+++ sources	22 Nov 2006 17:05:35 -0000	1.11
@@ -1 +1 @@
-c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz
+e43e148b53291191a463d440bc18d2f7  Module-ScanDeps-0.70.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:06:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:06:10 -0500
Subject: rpms/perl-Module-ScanDeps/devel .cvsignore, 1.10,
	1.11 perl-Module-ScanDeps.spec, 1.10, 1.11 sources, 1.10, 1.11
Message-ID: <200611221706.kAMH6Akk020158@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-serv20099/devel

Modified Files:
	.cvsignore perl-Module-ScanDeps.spec sources 
Log Message:
Update to 0.70.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Nov 2006 15:20:03 -0000	1.10
+++ .cvsignore	22 Nov 2006 17:05:40 -0000	1.11
@@ -1 +1 @@
-Module-ScanDeps-0.69.tar.gz
+Module-ScanDeps-0.70.tar.gz


Index: perl-Module-ScanDeps.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/perl-Module-ScanDeps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Module-ScanDeps.spec	11 Nov 2006 15:20:04 -0000	1.10
+++ perl-Module-ScanDeps.spec	22 Nov 2006 17:05:40 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Module-ScanDeps
-Version:        0.69
+Version:        0.70
 Release:        1%{?dist}
 Summary:        Recursively scan Perl code for dependencies
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.70-1
+- Update to 0.70.
+
 * Sat Nov 11 2006 Jose Pedro Oliveira  - 0.69-1
 - Update to 0.69.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-ScanDeps/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Nov 2006 15:20:04 -0000	1.10
+++ sources	22 Nov 2006 17:05:40 -0000	1.11
@@ -1 +1 @@
-c8305e0213b27f611be3296d9e10e61f  Module-ScanDeps-0.69.tar.gz
+e43e148b53291191a463d440bc18d2f7  Module-ScanDeps-0.70.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:11:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:11:17 -0500
Subject: rpms/perl-HTTP-Server-Simple/FC-6 .cvsignore, 1.8,
	1.9 perl-HTTP-Server-Simple.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200611221711.kAMHBHP3020408@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20354/FC-6

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Oct 2006 12:48:40 -0000	1.8
+++ .cvsignore	22 Nov 2006 17:10:47 -0000	1.9
@@ -1 +1 @@
-HTTP-Server-Simple-0.23.tar.gz
+HTTP-Server-Simple-0.24.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-6/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-HTTP-Server-Simple.spec	23 Oct 2006 12:48:40 -0000	1.9
+++ perl-HTTP-Server-Simple.spec	22 Nov 2006 17:10:47 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.23
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q -n HTTP-Server-Simple-%{version}
-chmod a-x lib/HTTP/Server/*.pm
+chmod -c a-x lib/HTTP/Server/*.pm
 %{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' ex/sample_server
 
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.24-1
+- Update to 0.24.
+
 * Mon Oct 23 2006 Jose Pedro Oliveira  - 0.23-1
 - Update to 0.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Oct 2006 12:48:40 -0000	1.8
+++ sources	22 Nov 2006 17:10:47 -0000	1.9
@@ -1 +1 @@
-5d410b9585c4c09426a6d6d14d0af6b1  HTTP-Server-Simple-0.23.tar.gz
+302f487fc5ae544529cc87784eccd89f  HTTP-Server-Simple-0.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:11:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:11:17 -0500
Subject: rpms/perl-HTTP-Server-Simple/FC-5 .cvsignore, 1.7,
	1.8 perl-HTTP-Server-Simple.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200611221711.kAMHBHmQ020403@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20354/FC-5

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Jun 2006 22:22:40 -0000	1.7
+++ .cvsignore	22 Nov 2006 17:10:47 -0000	1.8
@@ -1 +1 @@
-HTTP-Server-Simple-0.20.tar.gz
+HTTP-Server-Simple-0.24.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-5/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-HTTP-Server-Simple.spec	20 Jun 2006 22:22:40 -0000	1.8
+++ perl-HTTP-Server-Simple.spec	22 Nov 2006 17:10:47 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.20
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -10,6 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
+BuildRequires:  perl(URI::Escape)
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -21,7 +22,7 @@
 
 %prep
 %setup -q -n HTTP-Server-Simple-%{version}
-chmod a-x lib/HTTP/Server/*.pm
+chmod -c a-x lib/HTTP/Server/*.pm
 %{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' ex/sample_server
 
 
@@ -54,6 +55,12 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.24-1
+- Update to 0.24.
+
+* Mon Oct 23 2006 Jose Pedro Oliveira  - 0.23-1
+- Update to 0.23.
+
 * Tue Jun 20 2006 Jose Pedro Oliveira  - 0.20-1
 - Update to 0.20.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Jun 2006 22:22:40 -0000	1.7
+++ sources	22 Nov 2006 17:10:47 -0000	1.8
@@ -1 +1 @@
-31b88af89c4966183bf6e95ca2b40050  HTTP-Server-Simple-0.20.tar.gz
+302f487fc5ae544529cc87784eccd89f  HTTP-Server-Simple-0.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:11:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 22 Nov 2006 12:11:22 -0500
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.8,
	1.9 perl-HTTP-Server-Simple.spec, 1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200611221711.kAMHBM9i020413@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20354/devel

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.24.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Oct 2006 12:48:40 -0000	1.8
+++ .cvsignore	22 Nov 2006 17:10:52 -0000	1.9
@@ -1 +1 @@
-HTTP-Server-Simple-0.23.tar.gz
+HTTP-Server-Simple-0.24.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-HTTP-Server-Simple.spec	23 Oct 2006 12:48:40 -0000	1.9
+++ perl-HTTP-Server-Simple.spec	22 Nov 2006 17:10:52 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.23
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q -n HTTP-Server-Simple-%{version}
-chmod a-x lib/HTTP/Server/*.pm
+chmod -c a-x lib/HTTP/Server/*.pm
 %{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' ex/sample_server
 
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jose Pedro Oliveira  - 0.24-1
+- Update to 0.24.
+
 * Mon Oct 23 2006 Jose Pedro Oliveira  - 0.23-1
 - Update to 0.23.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Oct 2006 12:48:40 -0000	1.8
+++ sources	22 Nov 2006 17:10:52 -0000	1.9
@@ -1 +1 @@
-5d410b9585c4c09426a6d6d14d0af6b1  HTTP-Server-Simple-0.23.tar.gz
+302f487fc5ae544529cc87784eccd89f  HTTP-Server-Simple-0.24.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:13:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 12:13:08 -0500
Subject: rpms/cmucl/devel cmucl.spec,1.8,1.9
Message-ID: <200611221713.kAMHD8RB020579@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/cmucl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20560

Modified Files:
	cmucl.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter  19d-2
- move bootstrap sources outside of %ifarch block



Index: cmucl.spec
===================================================================
RCS file: /cvs/extras/rpms/cmucl/devel/cmucl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cmucl.spec	22 Nov 2006 16:47:57 -0000	1.8
+++ cmucl.spec	22 Nov 2006 17:12:38 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: CMU Common Lisp compiler
 Name: 	 cmucl
 Version: 19d
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: Public Domain/MIT
 Group: 	 Development/Languages
@@ -15,12 +15,12 @@
 ExclusiveArch: %{ix86}
 
 ## ix86 section
+Source10: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2
+Source11: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2.asc
 %ifarch %{ix86}
 %define cmucl_arch x86
 #define bootstrap cmucl 
 %if "%{?bootstrap}" == "%{nil}"
-Source10: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2
-Source11: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2.asc
 %define bootstrap_src -a 10 
 %else
 BuildRequires: cmucl 
@@ -199,6 +199,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Rex Dieter  19d-2
+- move bootstrap sources outside of %%ifarch block
+
 * Thu Nov 16 2006 Rex Dieter  19d-1
 - cmucl-19d
 



From fedora-extras-commits at redhat.com  Wed Nov 22 17:16:19 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:16:19 -0500
Subject: rpms/kleansweep - New directory
Message-ID: <200611221716.kAMHGJnF020666@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20662/kleansweep

Log Message:
Directory /cvs/extras/rpms/kleansweep added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 17:16:24 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:16:24 -0500
Subject: rpms/kleansweep/devel - New directory
Message-ID: <200611221716.kAMHGO9U020679@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20662/kleansweep/devel

Log Message:
Directory /cvs/extras/rpms/kleansweep/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 17:16:48 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:16:48 -0500
Subject: rpms/kleansweep Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221716.kAMHGm1r020709@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20703

Added Files:
	Makefile import.log 
Log Message:
Setup of module kleansweep


--- NEW FILE Makefile ---
# Top level Makefile for module kleansweep
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  Wed Nov 22 17:16:54 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:16:54 -0500
Subject: rpms/kleansweep/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611221716.kAMHGsNO020724@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20703/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kleansweep


--- 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 Nov 22 17:18:38 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:18:38 -0500
Subject: rpms/kleansweep import.log,1.1,1.2
Message-ID: <200611221718.kAMHIcV3020812@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20771

Modified Files:
	import.log 
Log Message:
auto-import kleansweep-0.2.9-3 on branch devel from kleansweep-0.2.9-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kleansweep/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 17:16:48 -0000	1.1
+++ import.log	22 Nov 2006 17:18:08 -0000	1.2
@@ -0,0 +1 @@
+kleansweep-0_2_9-3:HEAD:kleansweep-0.2.9-3.src.rpm:1164216223



From fedora-extras-commits at redhat.com  Wed Nov 22 17:18:38 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:18:38 -0500
Subject: rpms/kleansweep/devel kleansweep.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611221718.kAMHIcmM020818@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/kleansweep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20771/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kleansweep.spec 
Log Message:
auto-import kleansweep-0.2.9-3 on branch devel from kleansweep-0.2.9-3.src.rpm


--- NEW FILE kleansweep.spec ---
Name:          kleansweep
Version:       0.2.9
Release:       3%{?dist}
Summary:       Reclaim disk space by finding unneeded files

License:       GPL
Group:         Applications/System
URL:           http://linux.bydg.org/~yogin/

Source:        http://linux.bydg.org/~yogin/kleansweep-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: kdelibs-devel, gettext, scons

%description
KleanSweep allows you to reclaim disk space by finding unneeded files. It
can search for files based on several criteria: you can seek for empty
files, backup files, broken symbolic links, dead menu entries, duplicated
files, orphaned files (files not found in the RPM database), and more.

%prep
%setup -q


%build
# disables rpath
sed -i 's|^env.KDEuse("environ rpath")|env.KDEuse("environ")|g' SConstruct

CFLAGS="$RPM_OPT_FLAGS"
export CFLAGS

scons %{?_smp_mflags}


%install
%{__rm} -rf $RPM_BUILD_ROOT
scons install prefix=$RPM_BUILD_ROOT%{_prefix}

desktop-file-install --vendor ""             \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category "System"                    \
  --delete-original                          \
  $RPM_BUILD_ROOT%{_datadir}/applnk/System/kleansweep.desktop

%find_lang %{name}

%post
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:

%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING README THANKS TODO
%{_datadir}/apps/%{name}/
%{_datadir}/applications/kleansweep.desktop
%{_datadir}/icons/*/*/apps/kleansweep.png
%{_bindir}/kleansweep*


%Changelog
* Sun Nov 19 2006 Chitlesh Goorah  - 0.2.9-3
- using preferred value for the buildroot tag

* Sun Nov 19 2006 Chitlesh Goorah  - 0.2.9-2
- replaced %%{buildroot} by $$RPM_BUILD_ROOT

* Sat Nov 18 2006 Chitlesh Goorah  - 0.2.9-1
- Initial Package.

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kleansweep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 17:16:53 -0000	1.1
+++ .cvsignore	22 Nov 2006 17:18:08 -0000	1.2
@@ -0,0 +1 @@
+kleansweep-0.2.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kleansweep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 17:16:53 -0000	1.1
+++ sources	22 Nov 2006 17:18:08 -0000	1.2
@@ -0,0 +1 @@
+eb4530dc77fbe35ede8267e89275e5e9  kleansweep-0.2.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 17:26:09 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 12:26:09 -0500
Subject: owners owners.list,1.1992,1.1993
Message-ID: <200611221726.kAMHQ9JY020900@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20885/owners

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1992
retrieving revision 1.1993
diff -u -r1.1992 -r1.1993
--- owners.list	22 Nov 2006 15:41:34 -0000	1.1992
+++ owners.list	22 Nov 2006 17:25:39 -0000	1.1993
@@ -821,6 +821,7 @@
 Fedora Extras|kismet|WLAN detector, sniffer and IDS|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|kita|2ch client for KDE|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|klamav|Clam Anti-Virus on the KDE Desktop|andy at smile.org.ua|extras-qa at fedoraproject.org|
+Fedora Extras|kleansweep|Reclaim disk space by finding unneeded files|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kmenu-gnome|K Menu with Gnome directory|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kmobiletools|Make your mobile phone communicate with your PC|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kmymoney2|Personal finance|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 17:27:48 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 12:27:48 -0500
Subject: rpms/perl-Gnome2-Print/devel perl-Gnome2-Print.spec,1.2,1.3
Message-ID: <200611221727.kAMHRmUT020925@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gnome2-Print/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20905

Modified Files:
	perl-Gnome2-Print.spec 
Log Message:
one word spelling fix :)



Index: perl-Gnome2-Print.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gnome2-Print/devel/perl-Gnome2-Print.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Gnome2-Print.spec	22 Nov 2006 15:43:43 -0000	1.2
+++ perl-Gnome2-Print.spec	22 Nov 2006 17:27:18 -0000	1.3
@@ -21,7 +21,7 @@
 applications written using the gtk2-perl wrapper. The GNOME Print libraries
 (also known as libgnomeprint and libgnomeprintui) allow you to create
 printable documents (using various frontends) and offer standard widgets in
-order to mainatin a UI consistent for all GNOME applications.
+order to maintain a UI consistent for all GNOME applications.
 
 %prep
 %setup -q -n Gnome2-Print-%{version}



From fedora-extras-commits at redhat.com  Wed Nov 22 17:49:02 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 12:49:02 -0500
Subject: rpms/panelfm/devel .cvsignore, 1.2, 1.3 panelfm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611221749.kAMHn20j024884@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24865

Modified Files:
	.cvsignore panelfm.spec sources 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 14:20:30 -0000	1.2
+++ .cvsignore	22 Nov 2006 17:48:32 -0000	1.3
@@ -1 +1 @@
-panelfm.tar.gz
+panelfm-v1.2.tar.gz


Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/panelfm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- panelfm.spec	11 Nov 2006 14:20:30 -0000	1.1
+++ panelfm.spec	22 Nov 2006 17:48:32 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           panelfm
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
 License:        GPL
 URL:            http://panelfm.sourceforge.net/
-Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}.tar.gz
+Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}-v%{version}.tar.gz
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel
@@ -28,6 +28,9 @@
    -e '/^LDFLAGS/s|^\(.*\)$|\1\n\nCFLAGS += $(OPTFLAGS)|' \
    makefile
 
+# Oh!!
+%{__make} clean
+
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
 
@@ -61,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
+- 1.2
+
 * Fri Nov 10 2006 Mamoru Tasaka  - 1.1-2
 - Change BuildRoot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 14:20:30 -0000	1.2
+++ sources	22 Nov 2006 17:48:32 -0000	1.3
@@ -1 +1 @@
-5a18f0beba718d6efaace22ed13c1b9e  panelfm.tar.gz
+60416a8534fd31403ac85bf69eb4897f  panelfm-v1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:50:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 12:50:41 -0500
Subject: rpms/panelfm/FC-6 .cvsignore, 1.2, 1.3 panelfm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611221750.kAMHof71024922@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24901

Modified Files:
	.cvsignore panelfm.spec sources 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 14:20:30 -0000	1.2
+++ .cvsignore	22 Nov 2006 17:50:11 -0000	1.3
@@ -1 +1 @@
-panelfm.tar.gz
+panelfm-v1.2.tar.gz


Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-6/panelfm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- panelfm.spec	11 Nov 2006 14:20:30 -0000	1.1
+++ panelfm.spec	22 Nov 2006 17:50:11 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           panelfm
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
 License:        GPL
 URL:            http://panelfm.sourceforge.net/
-Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}.tar.gz
+Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}-v%{version}.tar.gz
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel
@@ -28,6 +28,9 @@
    -e '/^LDFLAGS/s|^\(.*\)$|\1\n\nCFLAGS += $(OPTFLAGS)|' \
    makefile
 
+# Oh!!
+%{__make} clean
+
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
 
@@ -61,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
+- 1.2
+
 * Fri Nov 10 2006 Mamoru Tasaka  - 1.1-2
 - Change BuildRoot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 14:20:30 -0000	1.2
+++ sources	22 Nov 2006 17:50:11 -0000	1.3
@@ -1 +1 @@
-5a18f0beba718d6efaace22ed13c1b9e  panelfm.tar.gz
+60416a8534fd31403ac85bf69eb4897f  panelfm-v1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:51:43 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 12:51:43 -0500
Subject: rpms/farsight/devel .cvsignore, 1.2, 1.3 farsight.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611221751.kAMHphBb024990@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/farsight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24944

Modified Files:
	.cvsignore farsight.spec sources 
Log Message:
* Wed Nov 22 2006 Brian Pepple  - 0.1.10-1
- Update to 0.1.10.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/farsight/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Sep 2006 02:42:08 -0000	1.2
+++ .cvsignore	22 Nov 2006 17:51:13 -0000	1.3
@@ -1 +1 @@
-farsight-0.1.8.tar.gz
+farsight-0.1.10.tar.gz


Index: farsight.spec
===================================================================
RCS file: /cvs/extras/rpms/farsight/devel/farsight.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- farsight.spec	4 Oct 2006 22:22:19 -0000	1.2
+++ farsight.spec	22 Nov 2006 17:51:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		farsight
-Version:	0.1.8
-Release:	3%{?dist}
+Version:	0.1.10
+Release:	1%{?dist}
 Summary:	A audio/video conferencing framework
 
 Group:		System Environment/Libraries
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Brian Pepple  - 0.1.10-1
+- Update to 0.1.10.
+
 * Thu Oct 05 2006 Christian Iseli  0.1.8-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/farsight/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Sep 2006 02:42:08 -0000	1.2
+++ sources	22 Nov 2006 17:51:13 -0000	1.3
@@ -1 +1 @@
-68daa710087201064680fd02c8a4951a  farsight-0.1.8.tar.gz
+e908f1d121cbd55f619241a8f7dee0f7  farsight-0.1.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:51:57 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 12:51:57 -0500
Subject: rpms/panelfm/FC-5 .cvsignore, 1.2, 1.3 panelfm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611221751.kAMHpv0Q024999@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24969

Modified Files:
	.cvsignore panelfm.spec sources 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Nov 2006 14:20:30 -0000	1.2
+++ .cvsignore	22 Nov 2006 17:51:27 -0000	1.3
@@ -1 +1 @@
-panelfm.tar.gz
+panelfm-v1.2.tar.gz


Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-5/panelfm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- panelfm.spec	11 Nov 2006 14:20:30 -0000	1.1
+++ panelfm.spec	22 Nov 2006 17:51:27 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           panelfm
-Version:        1.1
-Release:        2%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
 License:        GPL
 URL:            http://panelfm.sourceforge.net/
-Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}.tar.gz
+Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}-v%{version}.tar.gz
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel
@@ -28,6 +28,9 @@
    -e '/^LDFLAGS/s|^\(.*\)$|\1\n\nCFLAGS += $(OPTFLAGS)|' \
    makefile
 
+# Oh!!
+%{__make} clean
+
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
 
@@ -61,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
+- 1.2
+
 * Fri Nov 10 2006 Mamoru Tasaka  - 1.1-2
 - Change BuildRoot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Nov 2006 14:20:30 -0000	1.2
+++ sources	22 Nov 2006 17:51:27 -0000	1.3
@@ -1 +1 @@
-5a18f0beba718d6efaace22ed13c1b9e  panelfm.tar.gz
+60416a8534fd31403ac85bf69eb4897f  panelfm-v1.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 17:59:05 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 12:59:05 -0500
Subject: rpms/telepathy-butterfly/FC-6 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 telepathy-butterfly.spec, 1.3, 1.4
Message-ID: <200611221759.kAMHx5kw025262@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/telepathy-butterfly/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25243

Modified Files:
	.cvsignore sources telepathy-butterfly.spec 
Log Message:
* Wed Nov 22 2006 Brian Pepple  - 0.1.3-1
- Update to 0.1.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Oct 2006 17:07:49 -0000	1.4
+++ .cvsignore	22 Nov 2006 17:58:35 -0000	1.5
@@ -1 +1 @@
-telepathy-butterfly-0.1.2.tar.gz
+telepathy-butterfly-0.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Oct 2006 17:07:49 -0000	1.4
+++ sources	22 Nov 2006 17:58:35 -0000	1.5
@@ -1 +1 @@
-e52f238d9716b45961d28b424a9c0e6e  telepathy-butterfly-0.1.2.tar.gz
+288494daa096eeb685d57bdad8bc5b5f  telepathy-butterfly-0.1.3.tar.gz


Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/extras/rpms/telepathy-butterfly/FC-6/telepathy-butterfly.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- telepathy-butterfly.spec	8 Oct 2006 17:07:49 -0000	1.3
+++ telepathy-butterfly.spec	22 Nov 2006 17:58:35 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           telepathy-butterfly
-Version:        0.1.2
+Version:        0.1.3
 Release:        1%{?dist}
 Summary:        MSN connection manager for Telepathy
 
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Brian Pepple  - 0.1.3-1
+- Update to 0.1.3.
+
 * Sun Oct  8 2006 Brian Pepple  - 0.1.2-1
 - Update to 0.1.2.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:00:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 22 Nov 2006 13:00:34 -0500
Subject: owners owners.list,1.1993,1.1994
Message-ID: <200611221800.kAMI0YLu025342@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25268

Modified Files:
	owners.list 
Log Message:
koffice: +rdieter CC: 
qscintilla: fix CC typo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1993
retrieving revision 1.1994
diff -u -r1.1993 -r1.1994
--- owners.list	22 Nov 2006 17:25:39 -0000	1.1993
+++ owners.list	22 Nov 2006 18:00:04 -0000	1.1994
@@ -829,7 +829,7 @@
 Fedora Extras|knetstats|Network monitor in KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|knetworkmanager|KDE applet for Network Manager|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|koan|Client side provisioning app for cobbler|mdehaan at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|rdieter at math.unl.edu,extras-qa at fedoraproject.org|
 Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
@@ -2035,7 +2035,7 @@
 Fedora Extras|qjackctl|Qt based JACK control application|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org|icon at fedoraproject.org
+Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org,icon at fedoraproject.org|
 Fedora Extras|qstat|Real-time Game Server Status for FPS game servers|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|qsynth|Qt based Fluidsynth GUI front end|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 18:17:43 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 13:17:43 -0500
Subject: rpms/panelfm/devel panelfm.spec,1.2,1.3
Message-ID: <200611221817.kAMIHh0C028450@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28418

Modified Files:
	panelfm.spec 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
- Bump



Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/devel/panelfm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- panelfm.spec	22 Nov 2006 17:48:32 -0000	1.2
+++ panelfm.spec	22 Nov 2006 18:17:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           panelfm
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
@@ -64,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
+- Bump
+
 * Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
 - 1.2
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:18:46 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 13:18:46 -0500
Subject: rpms/panelfm/FC-6 panelfm.spec,1.2,1.3
Message-ID: <200611221818.kAMIIkjm028532@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28491

Modified Files:
	panelfm.spec 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
- Bump



Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-6/panelfm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- panelfm.spec	22 Nov 2006 17:50:11 -0000	1.2
+++ panelfm.spec	22 Nov 2006 18:18:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           panelfm
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
@@ -64,6 +64,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
+- Bump
+
 * Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
 - 1.2
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:18:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 22 Nov 2006 13:18:53 -0500
Subject: rpms/openct/devel openct.spec,1.21,1.22
Message-ID: <200611221818.kAMIIr16028544@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28512

Modified Files:
	openct.spec 
Log Message:
* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-2
- Don't run autotools during build.



Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openct.spec	22 Nov 2006 16:09:20 -0000	1.21
+++ openct.spec	22 Nov 2006 18:18:23 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           openct
 Version:        0.6.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -16,7 +16,6 @@
 BuildRequires:  pcsc-lite-devel >= 1.3.0
 BuildRequires:  libusb-devel
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  libtool
 Requires:       %{_libdir}/ctapi
 # TODO: verify minimum udev version
 Requires:       udev >= 062
@@ -55,7 +54,7 @@
 
 %prep
 %setup -q
-sh bootstrap # avoid standard rpaths on lib64 archs
+sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure # lib64 std rpaths
 sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
 
 
@@ -159,6 +158,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skytt??  - 0.6.11-2
+- Don't run autotools during build.
+
 * Wed Nov 22 2006 Ville Skytt??  - 0.6.11-1
 - 0.6.11.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:18:57 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:18:57 -0500
Subject: rpms/gliv - New directory
Message-ID: <200611221818.kAMIIvfl028555@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28551/gliv

Log Message:
Directory /cvs/extras/rpms/gliv added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 18:19:02 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:19:02 -0500
Subject: rpms/gliv/devel - New directory
Message-ID: <200611221819.kAMIJ2SO028602@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28551/gliv/devel

Log Message:
Directory /cvs/extras/rpms/gliv/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 18:19:28 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:19:28 -0500
Subject: rpms/gliv Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221819.kAMIJSZP028715@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28707

Added Files:
	Makefile import.log 
Log Message:
Setup of module gliv


--- NEW FILE Makefile ---
# Top level Makefile for module gliv
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  Wed Nov 22 18:19:34 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:19:34 -0500
Subject: rpms/gliv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611221819.kAMIJY4m028734@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28707/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gliv


--- 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 Nov 22 18:20:56 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:20:56 -0500
Subject: rpms/gliv import.log,1.1,1.2
Message-ID: <200611221820.kAMIKuMN028828@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28791

Modified Files:
	import.log 
Log Message:
auto-import gliv-1.9.6-2 on branch devel from gliv-1.9.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gliv/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 18:19:28 -0000	1.1
+++ import.log	22 Nov 2006 18:20:26 -0000	1.2
@@ -0,0 +1 @@
+gliv-1_9_6-2:HEAD:gliv-1.9.6-2.src.rpm:1164219639



From fedora-extras-commits at redhat.com  Wed Nov 22 18:20:56 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:20:56 -0500
Subject: rpms/gliv/devel gliv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611221821.kAMIKuaR028832@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28791/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gliv.spec 
Log Message:
auto-import gliv-1.9.6-2 on branch devel from gliv-1.9.6-2.src.rpm


--- NEW FILE gliv.spec ---
# $Id: gliv.spec 3051 2005-03-24 14:59:59Z dag $
# Authority: dag
# Upstream: Guillaume Chazarain 

Summary:	Image viewing utility
Name:		gliv
Version:	1.9.6
Release:	2%{?dist}
License:	GPL
Group:		Applications/Multimedia
URL:		http://guichaz.free.fr/gliv/
Source:		http://guichaz.free.fr/gliv/files/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: gtkglext-devel >= 0.7.0
BuildRequires: desktop-file-utils

%description
GLiv is an OpenGL image viewer. GLiv is very fast and smooth at rotating,
panning and zooming if you have an OpenGL accelerated graphics board.

%prep
%setup -q

%{__cat} <gliv.desktop
[Desktop Entry]
Name=Gliv Image Viewer
Comment=View images fast and smoothly
Exec=gliv
Icon=gliv.png
Terminal=false
Type=Application
MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-bmp;image/png;image/x-tiff;image/x-tga;
Categories=GNOME;Graphics;
EOF

%{__cat} <gliv.applications
gliv
	command=gliv
	name=Gliv Image Viewer
	can_open_multiple_files=true
	expects_uris=no
	requires_terminal=false
	all_gnome_vfs_schemes_supported=yes
	uses_gnomevfs=true
	startup_notify=true
	mime_types=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-bmp;image/png;image/x-tiff;image/x-tga;
EOF


%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install
%find_lang %{name}

%{__install} -Dp -m0644 gliv.applications %{buildroot}%{_datadir}/application-registry/gliv.applications

%{__install} -Dp -m0644 gliv.png %{buildroot}%{_datadir}/pixmaps/gliv.png

%{__install} -d -m0755 %{buildroot}%{_datadir}/applications/
desktop-file-install \
	--vendor fedora \
	--dir %{buildroot}%{_datadir}/applications \
	gliv.desktop

%clean
%{__rm} -rf %{buildroot}

%post
update-desktop-database &> /dev/null ||:

%postun
update-desktop-database &> /dev/null ||:

%files -f %{name}.lang
%defattr(-, root, root, -)
%doc COPYING NEWS README THANKS
%{_mandir}/man1/gliv.1*
%{_mandir}/*/man1/gliv.1*
%{_bindir}/gliv
%{_datadir}/applications/*-gliv.desktop
%{_datadir}/application-registry/gliv.applications
%{_datadir}/pixmaps/gliv.png

%changelog

* Wed Nov 22 2006 Peter Lemenkov  1.9.6-2
- Spec cleanup

* Wed Nov 22 2006 Peter Lemenkov  1.9.6-1
- Upgrade to ver. 1.9.6
- Missing BR added

* Tue Nov 21 2006 Peter Lemenkov  1.9.5-2
- Little cleanups in spec file

* Sun May 28 2006 Adrien BUSTANY  - 1.9.5-1
- Updated to release 1.9.5

* Fri May 27 2005 Dag Wieers  - 1.9.3-1 - 3051+/dag
- Updated to release 1.9.3.

* Tue Mar 22 2005 Dag Wieers  - 1.9.2-1
- Updated to release 1.9.2.

* Wed Jan 05 2005 Dag Wieers  - 1.9.1-1
- Updated to release 1.9.1.

* Thu Aug 05 2004 Dag Wieers  - 1.8.4-1
- Updated to release 1.8.4.

* Thu Jun 24 2004 Dag Wieers  - 1.8.3-1
- Updated to release 1.8.3.

* Sat Feb 07 2004 Dag Wieers  - 1.8.1-0
- Updated to release 1.8.1.

* Sat Jan 24 2004 Dag Wieers  - 1.8-0
- Initial package. (using DAR)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gliv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 18:19:34 -0000	1.1
+++ .cvsignore	22 Nov 2006 18:20:26 -0000	1.2
@@ -0,0 +1 @@
+gliv-1.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gliv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 18:19:34 -0000	1.1
+++ sources	22 Nov 2006 18:20:26 -0000	1.2
@@ -0,0 +1 @@
+e51838ed643f3af5143a20a12f432b9d  gliv-1.9.6.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 18:23:02 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Wed, 22 Nov 2006 13:23:02 -0500
Subject: rpms/zope/FC-6 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 zope.spec,
	1.26, 1.27 zope-2.8.3-pythonwarning.patch, 1.1, NONE
Message-ID: <200611221823.kAMIN2Y9028910@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878

Modified Files:
	.cvsignore sources zope.spec 
Removed Files:
	zope-2.8.3-pythonwarning.patch 
Log Message:
Updated to 2.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Aug 2006 11:41:41 -0000	1.13
+++ .cvsignore	22 Nov 2006 18:22:32 -0000	1.14
@@ -1 +1 @@
-Zope-2.9.4-final.tgz
+Zope-2.9.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Aug 2006 11:41:41 -0000	1.13
+++ sources	22 Nov 2006 18:22:32 -0000	1.14
@@ -1 +1 @@
-7d7ffe62eabc84d0c438e450e344c29f  Zope-2.9.4-final.tgz
+17cd06a6974dbdd0e4982a343b79fb00  Zope-2.9.5-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- zope.spec	22 Nov 2006 04:52:42 -0000	1.26
+++ zope.spec	22 Nov 2006 18:22:32 -0000	1.27
@@ -12,13 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.4
-Release: 3%{?dist}
+Version: 2.9.5
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,7 +27,6 @@
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
-Patch1:  zope-2.8.3-pythonwarning.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -46,18 +44,11 @@
 After starting Zope, you can access it by pointing your browser to
 http://localhost:8080
 
-WARNING: this zope package has been built on python 2.4.X, which is not
-supported ! Do not file bugreports or ask for support on zope.org if you
-choose to use this package.
-
-
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
-# Warning on the default index_html about python 2.4 & zope 2.8
-#%patch1 -p1 -b .pythonwarning
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -188,8 +179,10 @@
 %attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
 
 
-
 %changelog
+* Tue Nov 22 2006 Jonathan Steffan  2.9.5-1
+- Updated to 2.9.5 and removed not needed patches
+
 * Tue Nov 21 2006 Jonathan Steffan  2.9.4-3
 - Removed Five from zope package (plone 2.5.1 now provides the needed
   version.)


--- zope-2.8.3-pythonwarning.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 18:26:32 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 13:26:32 -0500
Subject: owners owners.list,1.1994,1.1995
Message-ID: <200611221826.kAMIQWgk028948@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28932

Modified Files:
	owners.list 
Log Message:
Gliv added


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -r1.1994 -r1.1995
--- owners.list	22 Nov 2006 18:00:04 -0000	1.1994
+++ owners.list	22 Nov 2006 18:26:02 -0000	1.1995
@@ -554,6 +554,7 @@
 Fedora Extras|Glide3-libGL|Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|glipper|Glipper is a simple Clipboardmanager for the GNOME Desktop Environment|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|glitz|OpenGL image compositing library|work.eric at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|gliv|Image viewing utility|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|glom|Database Designer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 18:28:32 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 13:28:32 -0500
Subject: rpms/gdl/devel gdl-0.9pre3-const.patch,NONE,1.1 gdl.spec,1.19,1.20
Message-ID: <200611221828.kAMISWot029022@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29000

Modified Files:
	gdl.spec 
Added Files:
	gdl-0.9pre3-const.patch 
Log Message:
Add patch to fix some typing issues


gdl-0.9pre3-const.patch:

--- NEW FILE gdl-0.9pre3-const.patch ---
--- gdl-0.9pre3/src/ncdf_att_cl.cpp.const	2006-11-22 10:15:39.000000000 -0700
+++ gdl-0.9pre3/src/ncdf_att_cl.cpp	2006-11-22 10:16:59.000000000 -0700
@@ -237,7 +237,7 @@
 	    ncdf_att_handle_error(e,status,"NCDF_ATTGET",ip);
 
 
-	    dimension dim((size_t *) &length, (size_t) 1);
+	    dimension dim((const SizeT *) &length, (SizeT) 1);
 	    DLongGDL* temp=new DLongGDL(dim, BaseGDL::NOZERO);
 	    memcpy(&(*temp)[0],&(*ip),length*sizeof(int));	      
 	    delete ip;
@@ -255,7 +255,7 @@
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",sp);
 	  
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DIntGDL* temp=new DIntGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*sp),length*sizeof(short));	      
@@ -277,7 +277,7 @@
 	    ncdf_att_handle_error(e,status,"NCDF_ATTGET",fp);
 
 
-	    dimension dim((size_t *) &length, (size_t) 1);
+	    dimension dim((const SizeT *) &length, (SizeT) 1);
 	    DFloatGDL* temp=new DFloatGDL(dim, BaseGDL::NOZERO);
 
 	    memcpy(&(*temp)[0],&(*fp),length*sizeof(float));	      
@@ -299,7 +299,7 @@
 	  
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",dp);
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DDoubleGDL* temp=new DDoubleGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*dp),length*sizeof(double));	      	 
@@ -339,7 +339,7 @@
 	  
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",bp);
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DByteGDL* temp=new DByteGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*bp),length*sizeof(unsigned char));	      	 
--- gdl-0.9pre3/src/ncdf_var_cl.cpp.const	2006-11-22 07:34:57.000000000 -0700
+++ gdl-0.9pre3/src/ncdf_var_cl.cpp	2006-11-22 10:46:03.000000000 -0700
@@ -161,7 +161,7 @@
     DStructGDL* inq=new DStructGDL(ncdf_varinq);
     inq->InitTag("NAME",DStringGDL(var_name));
 
-    dimension dim((size_t *) &var_ndims, (size_t) 1);
+    dimension dim((const SizeT *) &var_ndims, (SizeT) 1);
     DULongGDL* dims_res = new DULongGDL(dim, BaseGDL::NOZERO);
     for( size_t i=0; i

Author: orion

Update of /cvs/extras/rpms/gdl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29090

Modified Files:
	.cvsignore gdl.spec sources 
Added Files:
	gdl-0.9pre3-const.patch 
Removed Files:
	gdl-0.9pre2-specialization.patch 
Log Message:
Update to 0.9pre3


gdl-0.9pre3-const.patch:

--- NEW FILE gdl-0.9pre3-const.patch ---
--- gdl-0.9pre3/src/ncdf_att_cl.cpp.const	2006-11-22 10:15:39.000000000 -0700
+++ gdl-0.9pre3/src/ncdf_att_cl.cpp	2006-11-22 10:16:59.000000000 -0700
@@ -237,7 +237,7 @@
 	    ncdf_att_handle_error(e,status,"NCDF_ATTGET",ip);
 
 
-	    dimension dim((size_t *) &length, (size_t) 1);
+	    dimension dim((const SizeT *) &length, (SizeT) 1);
 	    DLongGDL* temp=new DLongGDL(dim, BaseGDL::NOZERO);
 	    memcpy(&(*temp)[0],&(*ip),length*sizeof(int));	      
 	    delete ip;
@@ -255,7 +255,7 @@
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",sp);
 	  
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DIntGDL* temp=new DIntGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*sp),length*sizeof(short));	      
@@ -277,7 +277,7 @@
 	    ncdf_att_handle_error(e,status,"NCDF_ATTGET",fp);
 
 
-	    dimension dim((size_t *) &length, (size_t) 1);
+	    dimension dim((const SizeT *) &length, (SizeT) 1);
 	    DFloatGDL* temp=new DFloatGDL(dim, BaseGDL::NOZERO);
 
 	    memcpy(&(*temp)[0],&(*fp),length*sizeof(float));	      
@@ -299,7 +299,7 @@
 	  
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",dp);
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DDoubleGDL* temp=new DDoubleGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*dp),length*sizeof(double));	      	 
@@ -339,7 +339,7 @@
 	  
 	  ncdf_att_handle_error(e,status,"NCDF_ATTGET",bp);
 	  
-	  dimension dim((size_t *) &length, (size_t) 1);
+	  dimension dim((const SizeT *) &length, (SizeT) 1);
 	  DByteGDL* temp=new DByteGDL(dim, BaseGDL::NOZERO);
 	  
 	  memcpy(&(*temp)[0],&(*bp),length*sizeof(unsigned char));	      	 
--- gdl-0.9pre3/src/ncdf_var_cl.cpp.const	2006-11-22 07:34:57.000000000 -0700
+++ gdl-0.9pre3/src/ncdf_var_cl.cpp	2006-11-22 10:46:03.000000000 -0700
@@ -161,7 +161,7 @@
     DStructGDL* inq=new DStructGDL(ncdf_varinq);
     inq->InitTag("NAME",DStringGDL(var_name));
 
-    dimension dim((size_t *) &var_ndims, (size_t) 1);
+    dimension dim((const SizeT *) &var_ndims, (SizeT) 1);
     DULongGDL* dims_res = new DULongGDL(dim, BaseGDL::NOZERO);
     for( size_t i=0; i - 0.9-0.pre3.2
+- Update to 0.9pre3
+
 * Wed Oct  3 2006 - Orion Poplawski  - 0.9-0.pre3.1
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdl/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 22:22:18 -0000	1.5
+++ sources	22 Nov 2006 18:31:11 -0000	1.6
@@ -1 +1 @@
-41a3a2184dad0292affe090e146308ca  gdl-0.9pre2.tar.gz
+0bf35ded3b585507c021f8292ad6f611  gdl-0.9pre3.tar.gz


--- gdl-0.9pre2-specialization.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 22 18:37:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 22 Nov 2006 13:37:22 -0500
Subject: rpms/panelfm/FC-5 panelfm-1.2-remove-header.patch, NONE,
	1.1 panelfm.spec, 1.2, 1.3
Message-ID: <200611221837.kAMIbMxq029241@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/panelfm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29223

Modified Files:
	panelfm.spec 
Added Files:
	panelfm-1.2-remove-header.patch 
Log Message:
* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
- Remove unnecessary header file use.


panelfm-1.2-remove-header.patch:

--- NEW FILE panelfm-1.2-remove-header.patch ---
--- panelfm.c.header	2006-11-15 21:29:26.000000000 +0900
+++ panelfm.c	2006-11-23 03:33:00.000000000 +0900
@@ -38,7 +38,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "panelfm.xpm"
 
 #define     MAX_BUF   1024


Index: panelfm.spec
===================================================================
RCS file: /cvs/extras/rpms/panelfm/FC-5/panelfm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- panelfm.spec	22 Nov 2006 17:51:27 -0000	1.2
+++ panelfm.spec	22 Nov 2006 18:36:51 -0000	1.3
@@ -1,12 +1,13 @@
 Name:           panelfm
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Quick File Manager Applet
 
 Group:          Applications/File
 License:        GPL
 URL:            http://panelfm.sourceforge.net/
 Source0:        http://umn.dl.sourceforge.net/sourceforge/%{name}/%{name}-v%{version}.tar.gz
+Patch0:		panelfm-1.2-remove-header.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q -n PanelFM
+%patch0 -p0 -b .header
 
 %{__sed} -i.local \
    -e 's|%{_prefix}/local|%{_prefix}|g' \
@@ -64,6 +66,9 @@
 %{_libdir}/bonobo/servers/*.server
 
 %changelog
+* Wed Nov 22 2006 Mamoru Tasaka  - 1.2-2
+- Remove unnecessary header file use.
+
 * Wed Nov 22 2006 Mamoru Tasaka  - 1.2-1
 - 1.2
 



From fedora-extras-commits at redhat.com  Wed Nov 22 18:40:59 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Wed, 22 Nov 2006 13:40:59 -0500
Subject: rpms/glipper/FC-5 glipper.spec,1.5,1.6 sources,1.3,1.4
Message-ID: <200611221840.kAMIexlq029312@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29289

Modified Files:
	glipper.spec sources 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/glipper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glipper.spec	14 Nov 2006 17:39:42 -0000	1.5
+++ glipper.spec	22 Nov 2006 18:40:29 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           glipper
-Version:        0.95
+Version:        0.95.1
 Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils, libgnome-devel
 
 
 %description
@@ -47,6 +47,15 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-2
+- Add libgnome-devel in BR
+
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-1
+- Upgrade to 0.95.1
+
+* Sun Nov 18 2006 Damien Durand  - 0.95-3
+- Add glade2-devel in BR
+
 * Tue Nov 14 2006 Damien Durand  - 0.95-2
 - Add gnome-doc-utils in BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2006 20:14:35 -0000	1.3
+++ sources	22 Nov 2006 18:40:29 -0000	1.4
@@ -1 +1 @@
-d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz
+aa6524f59342d72fee8bed36e6267746  glipper-0.95.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 18:42:59 2006
From: fedora-extras-commits at redhat.com (Damien Durand (splinux))
Date: Wed, 22 Nov 2006 13:42:59 -0500
Subject: rpms/glipper/FC-6 glipper.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200611221842.kAMIgx4U029373@cvs-int.fedora.redhat.com>

Author: splinux

Update of /cvs/extras/rpms/glipper/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356

Modified Files:
	glipper.spec sources 
Log Message:



Index: glipper.spec
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/glipper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glipper.spec	14 Nov 2006 17:38:00 -0000	1.6
+++ glipper.spec	22 Nov 2006 18:42:29 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           glipper
-Version:        0.95
+Version:        0.95.1
 Release:        2%{?dist}
 Summary:        A simple Clipboardmanager for GNOME
 
@@ -9,7 +9,7 @@
 Source0:        http://superb-west.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gtk2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils
+BuildRequires: libglade2-devel, desktop-file-utils, gettext, intltool, gnome-doc-utils, libgnome-devel
 
 
 %description
@@ -47,6 +47,15 @@
 %{_datadir}/gnome/help/%{name}/
 
 %changelog
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-2
+- Add libgnome-devel in BR
+
+* Tue Nov 21 2006 Damien Durand  - 0.95.1-1
+- Upgrade to 0.95.1
+
+* Sun Nov 18 2006 Damien Durand  - 0.95-3
+- Add glade2-devel in BR
+
 * Tue Nov 14 2006 Damien Durand  - 0.95-2
 - Add gnome-doc-utils in BR
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glipper/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Nov 2006 20:13:07 -0000	1.3
+++ sources	22 Nov 2006 18:42:29 -0000	1.4
@@ -1 +1 @@
-d5bb51a394d793b81cae089b34459819  glipper-0.95.tar.gz
+aa6524f59342d72fee8bed36e6267746  glipper-0.95.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:11:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 22 Nov 2006 14:11:48 -0500
Subject: rpms/bsd-games/devel bsd-games.spec,1.8,1.9 config.params,1.3,1.4
Message-ID: <200611221911.kAMJBmIO032546@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32529

Modified Files:
	bsd-games.spec config.params 
Log Message:
Drop the useless 'wargames' non-game.




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bsd-games.spec	15 Oct 2006 05:17:22 -0000	1.8
+++ bsd-games.spec	22 Nov 2006 19:11:18 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -30,7 +30,7 @@
 bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku,
 hunt, mille, mpoly, morse, number, phantasia, pig, pom, ppt, primes,
 quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon,
-tetris-bsd, trek, wargames, worm, worms and wump.
+tetris-bsd, trek, worm, worms and wump.
 
 %prep
 %setup -q
@@ -134,7 +134,6 @@
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
 %{_bindir}/vert-banner
-%{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
 %{_bindir}/wtf
@@ -161,6 +160,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Nov 18 2006 Wart  2.17-16
+- Drop the useless game 'wargames'
+
 * Sat Oct 14 2006 Wart  2.17-15
 - Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
 


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/config.params,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.params	15 Oct 2006 05:17:22 -0000	1.3
+++ config.params	22 Nov 2006 19:11:18 -0000	1.4
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune wargames"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@



From fedora-extras-commits at redhat.com  Wed Nov 22 19:12:47 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 22 Nov 2006 14:12:47 -0500
Subject: owners owners.list,1.1995,1.1996
Message-ID: <200611221912.kAMJCl3o032610@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32552

Modified Files:
	owners.list 
Log Message:
Grrr, Rex! ;-)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1995
retrieving revision 1.1996
diff -u -r1.1995 -r1.1996
--- owners.list	22 Nov 2006 18:26:02 -0000	1.1995
+++ owners.list	22 Nov 2006 19:12:17 -0000	1.1996
@@ -830,7 +830,7 @@
 Fedora Extras|knetstats|Network monitor in KDE|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|knetworkmanager|KDE applet for Network Manager|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|koan|Client side provisioning app for cobbler|mdehaan at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|rdieter at math.unl.edu,extras-qa at fedoraproject.org|
+Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|rdieter at math.unl.edu
 Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|kompose|Provides a full screen view of all open windows|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
@@ -2036,7 +2036,7 @@
 Fedora Extras|qjackctl|Qt based JACK control application|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qof|QOF provides a query engine library for C objects|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|qps|Visual process status monitor|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org,icon at fedoraproject.org|
+Fedora Extras|qscintilla|A Scintilla port to Qt|rdieter at math.unl.edu|extras-qa at fedoraproject.org|icon at fedoraproject.org
 Fedora Extras|qstat|Real-time Game Server Status for FPS game servers|andy at smile.org.ua|extras-qa at fedoraproject.org|
 Fedora Extras|qsynth|Qt based Fluidsynth GUI front end|nando at ccrma.stanford.edu|extras-qa at fedoraproject.org|
 Fedora Extras|qt4|Qt GUI toolkit|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 19:30:09 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:30:09 -0500
Subject: rpms/fuse import.log,1.9,1.10
Message-ID: <200611221930.kAMJU9BC000306@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-6 from fuse-2.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	11 Nov 2006 06:14:35 -0000	1.9
+++ import.log	22 Nov 2006 19:29:39 -0000	1.10
@@ -6,3 +6,4 @@
 fuse-2_5_3-1:FC-4:fuse-2.5.3-1.src.rpm:1146646544
 fuse-2_5_3-1:FC-5:fuse-2.5.3-1.src.rpm:1146646666
 fuse-2_6_0-1:HEAD:fuse-2.6.0-1.src.rpm:1163225659
+fuse-2_6_0-1:FC-6:fuse-2.6.0-1.src.rpm:1164223780



From fedora-extras-commits at redhat.com  Wed Nov 22 19:30:09 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:30:09 -0500
Subject: rpms/fuse/FC-6 .cvsignore, 1.6, 1.7 fuse-udev_rules.patch, 1.6,
	1.7 fuse.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200611221930.kAMJU9ft000315@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/FC-6

Modified Files:
	.cvsignore fuse-udev_rules.patch fuse.spec sources 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-6 from fuse-2.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 May 2006 08:54:29 -0000	1.6
+++ .cvsignore	22 Nov 2006 19:29:39 -0000	1.7
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse-udev_rules.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse-udev_rules.patch	29 Oct 2006 19:30:31 -0000	1.6
+++ fuse-udev_rules.patch	22 Nov 2006 19:29:39 -0000	1.7
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fuse.spec	29 Oct 2006 19:30:31 -0000	1.13
+++ fuse.spec	22 Nov 2006 19:29:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov  2.5.3-5
 - Fixed udev-rule again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 May 2006 08:54:29 -0000	1.6
+++ sources	22 Nov 2006 19:29:39 -0000	1.7
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:35:10 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:35:10 -0500
Subject: rpms/beryl-manager/devel beryl-manager.desktop, NONE,
	1.1 beryl-manager.svg, NONE, 1.1 beryl-manager.spec, 1.1, 1.2
Message-ID: <200611221935.kAMJZAks000478@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv421

Modified Files:
	beryl-manager.spec 
Added Files:
	beryl-manager.desktop beryl-manager.svg 
Log Message:
trimmed BR: and added desktop file


--- NEW FILE beryl-manager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beryl Manager
Comment=Manage Beryl
Icon=/usr/share/pixmaps/beryl-manager.svg
Exec=beryl-manager
Terminal=false
Type=Application
Categories=Settings;
MimeType=application/x-beryl-manager;



--- NEW FILE beryl-manager.svg ---



  
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
      
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
  
  
    
      
        image/svg+xml
        
      
    
  
  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-manager.spec	15 Nov 2006 21:11:15 -0000	1.1
+++ beryl-manager.spec	22 Nov 2006 19:34:40 -0000	1.2
@@ -3,11 +3,13 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        2%{?dist}
+Release:        3%{?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.svg
+Source2:        beryl-manager.desktop
 Patch0:         beryl-manager-0.1.1-pidof.patch
 
 # libdrm is not available on these arches
@@ -16,8 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  libtool, gettext-devel
-BuildRequires:  dbus-glib, dbus-devel, intltool, perl-XML-Parser
+BuildRequires:  perl-XML-Parser, gettext-devel
 
 
 %description
@@ -36,9 +37,6 @@
 %setup -q
 # Use absolute path to pidof, not in most users' $PATH
 %patch0 -p1 -b .pidof
-#autoreconf -v --install
-#glib-gettextize --copy --force
-#intltoolize --automake --copy --force
 
 
 %build
@@ -49,6 +47,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+desktop-file-install --vendor fedora \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category X-Fedora %{SOURCE2}
 %find_lang %{name}
 
 
@@ -56,15 +58,31 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/beryl-manager
 %{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*.svg
+%{_datadir}/applications/*.desktop
 %{_mandir}/man1/beryl-manager.1.gz
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-4
+- Add desktop file
+- Trim BR:
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-2
 - Use upstream tarball, now that there is one
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:35:24 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:35:24 -0500
Subject: rpms/fuse import.log,1.10,1.11
Message-ID: <200611221935.kAMJZOaX000484@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv447

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-5 from fuse-2.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	22 Nov 2006 19:29:39 -0000	1.10
+++ import.log	22 Nov 2006 19:34:54 -0000	1.11
@@ -7,3 +7,4 @@
 fuse-2_5_3-1:FC-5:fuse-2.5.3-1.src.rpm:1146646666
 fuse-2_6_0-1:HEAD:fuse-2.6.0-1.src.rpm:1163225659
 fuse-2_6_0-1:FC-6:fuse-2.6.0-1.src.rpm:1164223780
+fuse-2_6_0-1:FC-5:fuse-2.6.0-1.src.rpm:1164224103



From fedora-extras-commits at redhat.com  Wed Nov 22 19:35:25 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:35:25 -0500
Subject: rpms/fuse/FC-5 .cvsignore, 1.6, 1.7 fuse-udev_rules.patch, 1.6,
	1.7 fuse.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200611221935.kAMJZPDo000493@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv447/FC-5

Modified Files:
	.cvsignore fuse-udev_rules.patch fuse.spec sources 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-5 from fuse-2.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 May 2006 08:58:07 -0000	1.6
+++ .cvsignore	22 Nov 2006 19:34:55 -0000	1.7
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse-udev_rules.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fuse-udev_rules.patch	29 Oct 2006 19:30:30 -0000	1.6
+++ fuse-udev_rules.patch	22 Nov 2006 19:34:55 -0000	1.7
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fuse.spec	29 Oct 2006 19:30:30 -0000	1.12
+++ fuse.spec	22 Nov 2006 19:34:55 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov  2.5.3-5
 - Fixed udev-rule again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 May 2006 08:58:07 -0000	1.6
+++ sources	22 Nov 2006 19:34:55 -0000	1.7
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:28 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:37:28 -0500
Subject: rpms/fuse import.log,1.11,1.12
Message-ID: <200611221937.kAMJbSHu000723@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622

Modified Files:
	import.log 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-4 from fuse-2.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	22 Nov 2006 19:34:54 -0000	1.11
+++ import.log	22 Nov 2006 19:36:58 -0000	1.12
@@ -8,3 +8,4 @@
 fuse-2_6_0-1:HEAD:fuse-2.6.0-1.src.rpm:1163225659
 fuse-2_6_0-1:FC-6:fuse-2.6.0-1.src.rpm:1164223780
 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



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:33 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 14:37:33 -0500
Subject: rpms/ktechlab/FC-5 ktechlab.spec,1.2,1.3
Message-ID: <200611221937.kAMJbXw2000736@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv658/FC-5

Modified Files:
	ktechlab.spec 
Log Message:
auto-import ktechlab-0.3-6 on branch FC-5 from ktechlab-0.3-6.src.rpm


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/FC-5/ktechlab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ktechlab.spec	13 Oct 2006 15:42:05 -0000	1.2
+++ ktechlab.spec	22 Nov 2006 19:37:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -97,6 +97,9 @@
 
 
 %Changelog
+* Wed Nov 22 2006 Chitlesh Goorah  - 0.3-6
+- Rebuilt due to new gpsim-devel release
+
 * Fri Oct 13 2006 Mamoru Tasaka  - 0.3-5
 - Try to fix compilation on ppc.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:32 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 14:37:32 -0500
Subject: rpms/ktechlab import.log,1.2,1.3
Message-ID: <200611221937.kAMJbW61000733@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv658

Modified Files:
	import.log 
Log Message:
auto-import ktechlab-0.3-6 on branch FC-5 from ktechlab-0.3-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	27 Sep 2006 17:22:50 -0000	1.2
+++ import.log	22 Nov 2006 19:37:02 -0000	1.3
@@ -1 +1,2 @@
 ktechlab-0_3-3:HEAD:ktechlab-0.3-3.src.rpm:1159378075
+ktechlab-0_3-6:FC-5:ktechlab-0.3-6.src.rpm:1164224558



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:29 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Wed, 22 Nov 2006 14:37:29 -0500
Subject: rpms/fuse/FC-4 .cvsignore, 1.4, 1.5 fuse-udev_rules.patch, 1.4,
	1.5 fuse.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200611221937.kAMJbTId000732@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622/FC-4

Modified Files:
	.cvsignore fuse-udev_rules.patch fuse.spec sources 
Log Message:
auto-import fuse-2.6.0-1 on branch FC-4 from fuse-2.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 May 2006 08:56:04 -0000	1.4
+++ .cvsignore	22 Nov 2006 19:36:58 -0000	1.5
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse-udev_rules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fuse-udev_rules.patch	29 Oct 2006 19:30:29 -0000	1.4
+++ fuse-udev_rules.patch	22 Nov 2006 19:36:58 -0000	1.5
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fuse.spec	29 Oct 2006 19:30:30 -0000	1.8
+++ fuse.spec	22 Nov 2006 19:36:58 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov  2.5.3-5
 - Fixed udev-rule again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 May 2006 08:56:04 -0000	1.4
+++ sources	22 Nov 2006 19:36:58 -0000	1.5
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:37:47 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:37:47 -0500
Subject: rpms/beryl-manager/devel beryl-manager.spec,1.2,1.3
Message-ID: <200611221937.kAMJblph000801@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv703

Modified Files:
	beryl-manager.spec 
Log Message:
Fix release number in changelog


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beryl-manager.spec	22 Nov 2006 19:34:40 -0000	1.2
+++ beryl-manager.spec	22 Nov 2006 19:37:17 -0000	1.3
@@ -79,7 +79,7 @@
 
 
 %changelog
-* Wed Nov 22 2006 Jarod Wilson  0.1.2-4
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-3
 - Add desktop file
 - Trim BR:
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:39:20 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:39:20 -0500
Subject: rpms/beryl-manager/FC-6 beryl-manager.desktop, NONE,
	1.1 beryl-manager.svg, NONE, 1.1 beryl-manager.spec, 1.1, 1.2
Message-ID: <200611221939.kAMJdK2r000912@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-serv856

Modified Files:
	beryl-manager.spec 
Added Files:
	beryl-manager.desktop beryl-manager.svg 
Log Message:
trimmed BR: and added desktop file


--- NEW FILE beryl-manager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beryl Manager
Comment=Manage Beryl
Icon=/usr/share/pixmaps/beryl-manager.svg
Exec=beryl-manager
Terminal=false
Type=Application
Categories=Settings;
MimeType=application/x-beryl-manager;



--- NEW FILE beryl-manager.svg ---



  
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
    
    
      
      
      
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  
  
    
  
  
    
      
        image/svg+xml
        
      
    
  
  
    
    
    
    
    
    
    
    
    
    
    
    
    
    
  


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-manager.spec	15 Nov 2006 21:11:15 -0000	1.1
+++ beryl-manager.spec	22 Nov 2006 19:38:49 -0000	1.2
@@ -3,11 +3,13 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        2%{?dist}
+Release:        3%{?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.svg
+Source2:        beryl-manager.desktop
 Patch0:         beryl-manager-0.1.1-pidof.patch
 
 # libdrm is not available on these arches
@@ -16,8 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  libtool, gettext-devel
-BuildRequires:  dbus-glib, dbus-devel, intltool, perl-XML-Parser
+BuildRequires:  perl-XML-Parser, gettext-devel
 
 
 %description
@@ -36,9 +37,6 @@
 %setup -q
 # Use absolute path to pidof, not in most users' $PATH
 %patch0 -p1 -b .pidof
-#autoreconf -v --install
-#glib-gettextize --copy --force
-#intltoolize --automake --copy --force
 
 
 %build
@@ -49,6 +47,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+desktop-file-install --vendor fedora \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category X-Fedora %{SOURCE2}
 %find_lang %{name}
 
 
@@ -56,15 +58,31 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/beryl-manager
 %{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*.svg
+%{_datadir}/applications/*.desktop
 %{_mandir}/man1/beryl-manager.1.gz
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-3
+- Add desktop file
+- Trim BR:
+
 * Tue Nov 14 2006 Jarod Wilson  0.1.2-2
 - Use upstream tarball, now that there is one
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:41:10 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 22 Nov 2006 14:41:10 -0500
Subject: rpms/manaworld/FC-6 .cvsignore, 1.4, 1.5 manaworld.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200611221941.kAMJfAxv001033@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/manaworld/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1014

Modified Files:
	.cvsignore manaworld.spec sources 
Log Message:
Update to 0.0.21.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 03:22:08 -0000	1.4
+++ .cvsignore	22 Nov 2006 19:40:40 -0000	1.5
@@ -1 +1 @@
-tmw-0.0.21.tar.gz
+tmw-0.0.21.1.tar.gz


Index: manaworld.spec
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-6/manaworld.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- manaworld.spec	15 Oct 2006 03:22:08 -0000	1.4
+++ manaworld.spec	22 Nov 2006 19:40:40 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           manaworld
-Version:        0.0.21
+Version:        0.0.21.1
 Release:        1%{?dist}
 Summary:        2D MMORPG world
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Wart  0.0.21.1-1
+- Update to 0.0.21.1
+
 * Sat Oct 14 2006 Wart  0.0.21
 - Update to 0.0.21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/manaworld/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 03:22:08 -0000	1.4
+++ sources	22 Nov 2006 19:40:40 -0000	1.5
@@ -1 +1 @@
-e13a748b8e279fa694db5eb14ac4a8a9  tmw-0.0.21.tar.gz
+d5eacb0f5355ea105771bc5383bd99aa  tmw-0.0.21.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:45:58 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:45:58 -0500
Subject: rpms/njb-sharp - New directory
Message-ID: <200611221945.kAMJjwFo001158@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1154/njb-sharp

Log Message:
Directory /cvs/extras/rpms/njb-sharp added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 19:46:03 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:46:03 -0500
Subject: rpms/njb-sharp/devel - New directory
Message-ID: <200611221946.kAMJk3ti001177@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1154/njb-sharp/devel

Log Message:
Directory /cvs/extras/rpms/njb-sharp/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 19:46:24 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:46:24 -0500
Subject: rpms/njb-sharp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611221946.kAMJkOtQ001248@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1241

Added Files:
	Makefile import.log 
Log Message:
Setup of module njb-sharp


--- NEW FILE Makefile ---
# Top level Makefile for module njb-sharp
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  Wed Nov 22 19:46:29 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:46:29 -0500
Subject: rpms/njb-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611221946.kAMJkTAp001269@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1241/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module njb-sharp


--- 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 Nov 22 19:47:16 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 14:47:16 -0500
Subject: rpms/ktechlab import.log,1.3,1.4
Message-ID: <200611221947.kAMJlGbS001400@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1309

Modified Files:
	import.log 
Log Message:
auto-import ktechlab-0.3-6 on branch FC-6 from ktechlab-0.3-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	22 Nov 2006 19:37:02 -0000	1.3
+++ import.log	22 Nov 2006 19:46:46 -0000	1.4
@@ -1,2 +1,3 @@
 ktechlab-0_3-3:HEAD:ktechlab-0.3-3.src.rpm:1159378075
 ktechlab-0_3-6:FC-5:ktechlab-0.3-6.src.rpm:1164224558
+ktechlab-0_3-6:FC-6:ktechlab-0.3-6.src.rpm:1164225141



From fedora-extras-commits at redhat.com  Wed Nov 22 19:47:25 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 22 Nov 2006 14:47:25 -0500
Subject: rpms/prboom/FC-6 .cvsignore, 1.8, 1.9 prboom.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200611221947.kAMJlP41001412@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1365

Modified Files:
	.cvsignore prboom.spec sources 
Log Message:
Update to 2.4.7




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Oct 2006 03:01:59 -0000	1.8
+++ .cvsignore	22 Nov 2006 19:46:55 -0000	1.9
@@ -1 +1 @@
-prboom-2.4.6.tar.gz
+prboom-2.4.7.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-6/prboom.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- prboom.spec	18 Oct 2006 03:01:59 -0000	1.12
+++ prboom.spec	22 Nov 2006 19:46:55 -0000	1.13
@@ -1,14 +1,14 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.4.6
+Version:        2.4.7
 Release:        1%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://prboom.sourceforge.net/
-Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.6.tar.gz
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.7.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -58,6 +58,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Wed Nov 22 2006 Wart  2.4.7-1
+- Update to 2.4.7
+
 * Tue Oct 17 2006 Wart  2.4.6-1
 - Update to 2.4.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Oct 2006 03:01:59 -0000	1.8
+++ sources	22 Nov 2006 19:46:55 -0000	1.9
@@ -1 +1 @@
-0f60f3ad6a8dad5b2c6d4360f181ac22  prboom-2.4.6.tar.gz
+9942f521764d7f89df2218a456da4f02  prboom-2.4.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 19:47:16 2006
From: fedora-extras-commits at redhat.com (Chitlesh GOORAH (chitlesh))
Date: Wed, 22 Nov 2006 14:47:16 -0500
Subject: rpms/ktechlab/FC-6 ktechlab.spec,1.4,1.5
Message-ID: <200611221947.kAMJlGRq001404@cvs-int.fedora.redhat.com>

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1309/FC-6

Modified Files:
	ktechlab.spec 
Log Message:
auto-import ktechlab-0.3-6 on branch FC-6 from ktechlab-0.3-6.src.rpm


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/FC-6/ktechlab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ktechlab.spec	13 Oct 2006 15:29:20 -0000	1.4
+++ ktechlab.spec	22 Nov 2006 19:46:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPL
@@ -97,6 +97,9 @@
 
 
 %Changelog
+* Wed Nov 22 2006 Chitlesh Goorah  - 0.3-6
+- Rebuilt due to new gpsim-devel release
+
 * Fri Oct 13 2006 Mamoru Tasaka  - 0.3-5
 - Try to fix compilation on ppc.
 



From fedora-extras-commits at redhat.com  Wed Nov 22 19:48:31 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:48:31 -0500
Subject: rpms/njb-sharp/devel njb-sharp.patch, NONE, 1.1 njb-sharp.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611221948.kAMJmVsw001557@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1510/devel

Modified Files:
	.cvsignore sources 
Added Files:
	njb-sharp.patch njb-sharp.spec 
Log Message:
auto-import njb-sharp-0.3.0-5 on branch devel from njb-sharp-0.3.0-5.src.rpm

njb-sharp.patch:

--- NEW FILE njb-sharp.patch ---
--- njb-sharp-0.3.0/njb-sharp.pc.in	2006-03-30 05:10:52.000000000 +0100
+++ njb-sharp-0.3.0/njb-sharp-new.pc.in	2006-10-07 21:55:22.000000000 +0100
@@ -2,8 +2,8 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Libraries=@prefix@/lib/njb-sharp/njb-sharp.dll
-LibraryBase=@prefix@/lib/njb-sharp/
+Libraries=@libdir@/njb-sharp/njb-sharp.dll
+LibraryBase=@libdir@/njb-sharp/
 
 Name: njb-sharp
 Description: njb-sharp - Mono/C# Bindings to libnjb


--- NEW FILE njb-sharp.spec ---
# This is only a temporary fix until FC5 is brought in
# line with FC6.
%if "%{?fedora}" == "5"
%define monodir %{_prefix}/lib
%else
%define monodir %{_libdir}
%endif

Name: 		njb-sharp
Version:	0.3.0
Release:	5%{?dist}
URL:		http://banshee-project.org/Subprojects/Njb-sharp
Summary:	C sharp library to control the Nomad jukebox database
Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
Patch0:		%{name}.patch
License:	BSD
Group:		System Environment/Libraries
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	mono-devel
BuildRequires:	monodoc-devel
BuildRequires:	libnjb-devel >= 2.2.4
Requires(post): monodoc
Requires(postun): monodoc

%description
njb-sharp: Mono/C# Bindings to libnjb

%package devel
Summary: Package config for njb-sharp
Group: Documentation
Requires: %{name} = %{version}-%{release} pkgconfig

%description devel
Package configuration file for njb-sharp

%prep
%setup -q
%if "%{?fedora}" > "5"
%patch0 -p1
%endif

%build
%configure
# G??tz Waschk claim parallel makeing is broken in this package
# Paul F. Johnson verified it to be broken on x86 Fedora.
make

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
rm -f %{buildroot}%{monodir}/%{name}/*.a
cat > %{buildroot}%{monodir}/%{name}/%{name}.dll.config << EOF

  
  

EOF

%clean
rm -rf %{buildroot}

%post
%{_bindir}/monodoc --make-index > /dev/null

%postun
if [ "$1" = "0" -a -x %{_bindir}/monodoc ]; then %{_bindir}/monodoc --make-index > /dev/null
fi

%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING NEWS README
%{monodir}/%{name}
%{monodir}/monodoc/sources/*

%files devel
%defattr(-,root,root)
%{monodir}/pkgconfig/*

%changelog
* Sat Oct 21 2006 Linus Walleij  0.3.0-5
- More picking around in the spec...

* Tue Oct 17 2006 Linus Walleij  0.3.0-4
- Consistent macro naming
- Switched parallel make back on

* Sun Oct 8 2006 Linus Walleij  0.3.0-3
- Minor tweaks, comments etc.

* Sat Oct 07 2006 Paul F. Johnson  0.3.0-2
- added devel package
- added FC5 mono hackery for x86_64
- added new patch files for x86_64 stuff
- re-enabled the use of monodoc
- fixed group

* Wed Aug 30 2006 Linus Walleij  0.3.0-1
- Stole Mandriva package and used as base for the Fedora Extras.
- Also proudly stole some stuff out of the SuSE equivalent by jpr at suse.de.

* Fri Aug 25 2006 G??tz Waschk  0.3.0-4mdv2007.0
- add libnjbglue path to dll map

* Sun Jul 23 2006 G??tz Waschk  0.3.0-3mdv2007.0
- rebuild for new mono

* Tue Jul 18 2006 G??tz Waschk  0.3.0-2mdv2007.0
- fix postun script

* Tue May 02 2006 G??tz Waschk  0.3.0-1mdk
- New release 0.3.0

* Mon Jan 16 2006 G??tz Waschk  0.2.2-3mdk
- lib64 fix

* Fri Jan 13 2006 G??tz Waschk  0.2.2-2mdk
- 

* Fri Jan  6 2006 G??tz Waschk  0.2.2-1mdk
- fix URL
- New release 0.2.2

* Thu Dec 22 2005 G??tz Waschk  0.2.1-1mdk
- new version

* Wed Dec  7 2005 G??tz Waschk  0.2.0-0.54024.1mdk
- add dll map
- new version

* Wed Dec  7 2005 G??tz Waschk  0.2.0-0.54023.1mdk
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 19:46:29 -0000	1.1
+++ .cvsignore	22 Nov 2006 19:48:01 -0000	1.2
@@ -0,0 +1 @@
+njb-sharp-0.3.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 19:46:29 -0000	1.1
+++ sources	22 Nov 2006 19:48:01 -0000	1.2
@@ -0,0 +1 @@
+bb46c6e500ce92ca5e272f3fd58ee83e  njb-sharp-0.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 22 19:48:31 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 14:48:31 -0500
Subject: rpms/njb-sharp import.log,1.1,1.2
Message-ID: <200611221948.kAMJmVjV001553@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1510

Modified Files:
	import.log 
Log Message:
auto-import njb-sharp-0.3.0-5 on branch devel from njb-sharp-0.3.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 19:46:24 -0000	1.1
+++ import.log	22 Nov 2006 19:48:01 -0000	1.2
@@ -0,0 +1 @@
+njb-sharp-0_3_0-5:HEAD:njb-sharp-0.3.0-5.src.rpm:1164224902



From fedora-extras-commits at redhat.com  Wed Nov 22 19:50:50 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:50:50 -0500
Subject: rpms/beryl-manager/FC-6 beryl-manager.spec,1.2,1.3
Message-ID: <200611221950.kAMJooUD001680@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-serv1600

Modified Files:
	beryl-manager.spec 
Log Message:
D'oh, need to BR: desktop-file-utils now...


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beryl-manager.spec	22 Nov 2006 19:38:49 -0000	1.2
+++ beryl-manager.spec	22 Nov 2006 19:50:20 -0000	1.3
@@ -18,7 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  perl-XML-Parser, gettext-devel
+BuildRequires:  perl-XML-Parser, gettext-devel, desktop-file-utils
 
 
 %description
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-4
+- Add new missing BR: desktop-file-utils
+
 * Wed Nov 22 2006 Jarod Wilson  0.1.2-3
 - Add desktop file
 - Trim BR:



From fedora-extras-commits at redhat.com  Wed Nov 22 19:52:30 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:52:30 -0500
Subject: rpms/beryl-manager/FC-6 beryl-manager.spec,1.3,1.4
Message-ID: <200611221952.kAMJqUFZ001800@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-serv1747

Modified Files:
	beryl-manager.spec 
Log Message:
Not my day... (bump rev)


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-manager.spec	22 Nov 2006 19:50:20 -0000	1.3
+++ beryl-manager.spec	22 Nov 2006 19:52:00 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Beryl window decorator and theme management utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-extras-commits at redhat.com  Wed Nov 22 19:54:51 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 22 Nov 2006 14:54:51 -0500
Subject: rpms/beryl-manager/devel beryl-manager.spec,1.3,1.4
Message-ID: <200611221954.kAMJspXh001934@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1883

Modified Files:
	beryl-manager.spec 
Log Message:
D'oh, need to BR: desktop-file-utils now...


Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/beryl-manager.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-manager.spec	22 Nov 2006 19:37:17 -0000	1.3
+++ beryl-manager.spec	22 Nov 2006 19:54:21 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Beryl window decorator and theme management utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  perl-XML-Parser, gettext-devel
+BuildRequires:  perl-XML-Parser, gettext-devel, desktop-file-utils
 
 
 %description
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson  0.1.2-4
+- Add new missing BR: desktop-file-utils
+
 * Wed Nov 22 2006 Jarod Wilson  0.1.2-3
 - Add desktop file
 - Trim BR:



From fedora-extras-commits at redhat.com  Wed Nov 22 19:57:32 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Wed, 22 Nov 2006 14:57:32 -0500
Subject: rpms/zope/FC-6 zope.configure-2.9.5.patch,NONE,1.1
Message-ID: <200611221957.kAMJvW7s002008@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1999

Added Files:
	zope.configure-2.9.5.patch 
Log Message:
Added configure script patch for python 2.4.4


zope.configure-2.9.5.patch:

--- NEW FILE zope.configure-2.9.5.patch ---
*** configure   2006-11-22 12:54:48.000000000 -0700
--- configure.orig      2006-11-22 12:52:19.000000000 -0700
*************** TARGET="2.4.3"
*** 18,24 ****
  # sys.version) below in "best" to "worst" order, not including the
  # target version.  Up to six acceptable python versions are allowed.
  # Do not include the target version number in this list!
! ACCEPTABLE="2.4.2 2.4.4"
  
  # provide the executable names for all the acceptable versions
  # (and the target version) below
--- 18,24 ----
  # sys.version) below in "best" to "worst" order, not including the
  # target version.  Up to six acceptable python versions are allowed.
  # Do not include the target version number in this list!
! ACCEPTABLE="2.4.2"
  
  # provide the executable names for all the acceptable versions
  # (and the target version) below



From fedora-extras-commits at redhat.com  Wed Nov 22 20:05:35 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 22 Nov 2006 15:05:35 -0500
Subject: owners owners.list,1.1996,1.1997
Message-ID: <200611222005.kAMK5ZcM005249@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5217

Modified Files:
	owners.list 
Log Message:
Adding njb-sharp



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1996
retrieving revision 1.1997
diff -u -r1.1996 -r1.1997
--- owners.list	22 Nov 2006 19:12:17 -0000	1.1996
+++ owners.list	22 Nov 2006 20:05:05 -0000	1.1997
@@ -1192,6 +1192,7 @@
 Fedora Extras|ninja|A text based Internet Relay Chat (IRC) client|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|nip2|Interactive image processing system|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|njam|Maze-game, eat all the cookies while avoiding the badguys|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|njb-sharp|C-sharp bindings to libnjb|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|nmh|A mail handling system with a command line interface|bressers at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nomadsync|Synchronization agent for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|nomarch|GPLed Arc de-archiver|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 20:39:51 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 22 Nov 2006 15:39:51 -0500
Subject: rpms/celestia/devel celestia-1.4.1-strictalias.patch, NONE,
	1.1 celestia.spec, 1.20, 1.21
Message-ID: <200611222039.kAMKdpln005877@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5859

Modified Files:
	celestia.spec 
Added Files:
	celestia-1.4.1-strictalias.patch 
Log Message:
Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
Hopefully really handle the gconf schema properly.


celestia-1.4.1-strictalias.patch:

--- NEW FILE celestia-1.4.1-strictalias.patch ---
--- celestia-1.4.1/src/celengine/modelfile.cpp.strictalias	2006-11-22 14:04:15.000000000 +0100
+++ celestia-1.4.1/src/celengine/modelfile.cpp	2006-11-22 14:01:27.000000000 +0100
@@ -1080,7 +1080,9 @@
 static float readFloat(istream& in)
 {
     int i = readUint(in);
-    return *((float*) &i);
+    float f;
+    memcpy(&f, &i, sizeof(float));
+    return f;
 }
 
 


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- celestia.spec	28 Aug 2006 23:50:49 -0000	1.20
+++ celestia.spec	22 Nov 2006 20:39:21 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           celestia
 Version:        1.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OpenGL real-time visual space simulation
 Group:          Amusements/Graphics
 License:        GPL
@@ -9,6 +9,7 @@
 Patch0:         celestia-1.4.0-compile.patch
 Patch1:         celestia-1.4.1-lua51.patch
 Patch2:         celestia-1.4.1-lua51-resume.patch
+Patch3:         celestia-1.4.1-strictalias.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,8 +23,8 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  lua-devel
-BuildRequires:  automake17
 BuildRequires:  gettext-devel
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -46,21 +47,28 @@
 %patch0 -p0
 %patch1 -p1 -b .lua51
 %patch2 -p1 -b .lua51-resume
+%patch3 -p1 -b .strictalias
+
+# Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede).
+sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure
+sed -i 's/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS \$CELESTIA_CXXFLAGS"/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS"/' configure
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
+
 
 %build
 export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
-# http://www.shatters.net/forum/viewtopic.php?t=9605
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-%configure --with-gnome --with-lua --disable-schemas-install
+%configure --with-gnome --with-lua
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
@@ -86,15 +94,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 || :
+fi
 
 %post
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
 %preun
-if [ "$1" = "0" ] ; then
-  GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+if [ "$1" -eq "0" ] ; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 || :
 fi
 
 
@@ -105,12 +123,17 @@
 # Seem to have gone away in post-1.4.0 CVS...
 #%doc manual/*.html manual/*.css
 %{_bindir}/*
+%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.png
 
 
 %changelog
+* Wed Nov 22 2006 Steven Pritchard  1.4.1-7
+- Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
+- Hopefully really handle the gconf schema properly.
+
 * Mon Aug 28 2006 Steven Pritchard  1.4.1-6
 - Add --disable-schemas-install to configure.
 
@@ -218,4 +241,3 @@
 
 * Tue May 14 2002 Julien MOUTTE 
 - Initial RPM release.
-



From fedora-extras-commits at redhat.com  Wed Nov 22 20:54:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 22 Nov 2006 15:54:19 -0500
Subject: rpms/celestia/devel celestia.spec,1.21,1.22
Message-ID: <200611222054.kAMKsJnA006156@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6141

Modified Files:
	celestia.spec 
Log Message:
Quiet killall.


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- celestia.spec	22 Nov 2006 20:39:21 -0000	1.21
+++ celestia.spec	22 Nov 2006 20:53:49 -0000	1.22
@@ -99,7 +99,7 @@
     GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
         gconftool-2 --makefile-uninstall-rule \
             %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &>/dev/null || :
 fi
 
 %post
@@ -112,7 +112,7 @@
     GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
         gconftool-2 --makefile-uninstall-rule \
             %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &>/dev/null || :
 fi
 
 



From fedora-extras-commits at redhat.com  Wed Nov 22 21:36:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 16:36:53 -0500
Subject: rpms/id3lib/devel id3lib.spec,1.12,1.13
Message-ID: <200611222136.kAMLarVW009604@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/id3lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9583

Modified Files:
	id3lib.spec 
Log Message:
* Wed Nov 22 2006 Hans de Goede  3.8.3-15
- Link libid3-3.8.so.3 with -lz (bug #216783)



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/devel/id3lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- id3lib.spec	28 Aug 2006 11:37:56 -0000	1.12
+++ id3lib.spec	22 Nov 2006 21:36:23 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Library for manipulating ID3v1 and ID3v2 tags
 Name:		id3lib
 Version:	3.8.3
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://id3lib.sourceforge.net/
@@ -45,7 +45,7 @@
 
 %build
 %configure --disable-dependency-tracking --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} libid3_la_LIBADD=-lz
 
 
 %install
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Hans de Goede  3.8.3-15
+- Link libid3-3.8.so.3 with -lz (bug #216783)
+
 * Mon Aug 28 2006 Hans de Goede  3.8.3-14
 - Taking over as maintainer since Anvil has other priorities
 - FE6 Rebuild



From fedora-extras-commits at redhat.com  Wed Nov 22 21:38:08 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 16:38:08 -0500
Subject: rpms/id3lib/FC-6 id3lib.spec,1.12,1.13
Message-ID: <200611222138.kAMLc8hD009668@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/id3lib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9653

Modified Files:
	id3lib.spec 
Log Message:
* Wed Nov 22 2006 Hans de Goede  3.8.3-15
- Link libid3-3.8.so.3 with -lz (bug #216783)



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/FC-6/id3lib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- id3lib.spec	28 Aug 2006 11:37:56 -0000	1.12
+++ id3lib.spec	22 Nov 2006 21:37:38 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Library for manipulating ID3v1 and ID3v2 tags
 Name:		id3lib
 Version:	3.8.3
-Release:	14%{?dist}
+Release:	15%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://id3lib.sourceforge.net/
@@ -45,7 +45,7 @@
 
 %build
 %configure --disable-dependency-tracking --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} libid3_la_LIBADD=-lz
 
 
 %install
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Hans de Goede  3.8.3-15
+- Link libid3-3.8.so.3 with -lz (bug #216783)
+
 * Mon Aug 28 2006 Hans de Goede  3.8.3-14
 - Taking over as maintainer since Anvil has other priorities
 - FE6 Rebuild



From fedora-extras-commits at redhat.com  Wed Nov 22 21:40:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 16:40:07 -0500
Subject: rpms/id3lib/FC-5 id3lib.spec,1.11,1.12
Message-ID: <200611222140.kAMLe7kU009739@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/id3lib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717

Modified Files:
	id3lib.spec 
Log Message:
* Wed Nov 22 2006 Hans de Goede  3.8.3-15
- Link libid3-3.8.so.3 with -lz (bug #216783)



Index: id3lib.spec
===================================================================
RCS file: /cvs/extras/rpms/id3lib/FC-5/id3lib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- id3lib.spec	18 Feb 2006 13:02:49 -0000	1.11
+++ id3lib.spec	22 Nov 2006 21:39:37 -0000	1.12
@@ -1,24 +1,17 @@
 Summary:	Library for manipulating ID3v1 and ID3v2 tags
 Name:		id3lib
 Version:	3.8.3
-Release:	13%{?dist}
+Release:	15%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://id3lib.sourceforge.net/
-Source0:	http://download.sf.net/id3lib/%{name}-%{version}.tar.gz
+Source0:	http://dl.sf.net/sourceforge/id3lib/%{name}-%{version}.tar.gz
 Patch0:		id3lib-dox.patch
 Patch1:		id3lib-3.8.3-libtool-autofoo.patch.bz2
 Patch2:		id3lib-3.8.3-io_helpers-163101.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	zlib-devel doxygen
 
-%package devel
-Summary:	Development tools for the id3lib library
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	zlib-devel
-
-
 %description
 This package provides a software library for manipulating ID3v1 and
 ID3v2 tags. It provides a convenient interface for software developers
@@ -28,6 +21,13 @@
 (de)compression, and optional padding facilities. Additionally, it can
 tell mp3 header info, like bitrate etc.
 
+
+%package devel
+Summary:	Development tools for the id3lib library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	zlib-devel
+
 %description devel
 This package provides files needed to develop with the id3lib.
 
@@ -45,7 +45,7 @@
 
 %build
 %configure --disable-dependency-tracking --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} libid3_la_LIBADD=-lz
 
 
 %install
@@ -83,6 +83,13 @@
 
 
 %changelog
+* Wed Nov 22 2006 Hans de Goede  3.8.3-15
+- Link libid3-3.8.so.3 with -lz (bug #216783)
+
+* Mon Aug 28 2006 Hans de Goede  3.8.3-14
+- Taking over as maintainer since Anvil has other priorities
+- FE6 Rebuild
+
 * Sat Feb 18 2006 Ville Skytt??  - 3.8.3-13
 - Don't ship static libs.
 - Build with dependency tracking disabled.



From fedora-extras-commits at redhat.com  Wed Nov 22 21:43:39 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 16:43:39 -0500
Subject: rpms/ppracer/devel tree.png,NONE,1.1
Message-ID: <200611222143.kAMLhd6J009829@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9824

Added Files:
	tree.png 
Log Message:
fixed version of tree as requested (bz 199011)



From fedora-extras-commits at redhat.com  Wed Nov 22 21:55:31 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Wed, 22 Nov 2006 16:55:31 -0500
Subject: rpms/zope/FC-6 zope.configure-2.9.5.patch, 1.1, 1.2 zope.spec, 1.27,
	1.28
Message-ID: <200611222155.kAMLtVtJ009904@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9874

Modified Files:
	zope.configure-2.9.5.patch zope.spec 
Log Message:
Added patch to enable support for python 2.4.4


zope.configure-2.9.5.patch:

Index: zope.configure-2.9.5.patch
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.configure-2.9.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.configure-2.9.5.patch	22 Nov 2006 19:57:32 -0000	1.1
+++ zope.configure-2.9.5.patch	22 Nov 2006 21:55:01 -0000	1.2
@@ -1,19 +1,11 @@
-*** configure   2006-11-22 12:54:48.000000000 -0700
---- configure.orig      2006-11-22 12:52:19.000000000 -0700
-*************** TARGET="2.4.3"
-*** 18,24 ****
-  # sys.version) below in "best" to "worst" order, not including the
-  # target version.  Up to six acceptable python versions are allowed.
-  # Do not include the target version number in this list!
-! ACCEPTABLE="2.4.2 2.4.4"
-  
-  # provide the executable names for all the acceptable versions
-  # (and the target version) below
---- 18,24 ----
-  # sys.version) below in "best" to "worst" order, not including the
-  # target version.  Up to six acceptable python versions are allowed.
-  # Do not include the target version number in this list!
-! ACCEPTABLE="2.4.2"
-  
-  # provide the executable names for all the acceptable versions
-  # (and the target version) below
+--- Zope-2.9.5-final.orig/configure     2006-10-02 09:53:36.000000000 -0600
++++ Zope-2.9.5-final/configure  2006-11-22 14:28:48.000000000 -0700
+@@ -18,7 +18,7 @@
+ # sys.version) below in "best" to "worst" order, not including the
+ # target version.  Up to six acceptable python versions are allowed.
+ # Do not include the target version number in this list!
+-ACCEPTABLE="2.4.2"
++ACCEPTABLE="2.4.2 2.4.4"
+ 
+ # provide the executable names for all the acceptable versions
+ # (and the target version) below


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- zope.spec	22 Nov 2006 18:22:32 -0000	1.27
+++ zope.spec	22 Nov 2006 21:55:01 -0000	1.28
@@ -27,6 +27,7 @@
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
+Patch1:  zope.configure-2.9.5.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -47,6 +48,7 @@
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
+%patch1 -p1
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
 



From fedora-extras-commits at redhat.com  Wed Nov 22 22:14:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 17:14:44 -0500
Subject: rpms/scorched3d/devel .cvsignore, 1.5, 1.6 scorched3d.spec, 1.19,
	1.20 sources, 1.5, 1.6
Message-ID: <200611222214.kAMMEinX013058@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13037

Modified Files:
	.cvsignore scorched3d.spec sources 
Log Message:
* Sat Nov 18 2006 Hans de Goede  40.1d-1
- New upstream release 40.1d



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Nov 2006 20:45:26 -0000	1.5
+++ .cvsignore	22 Nov 2006 22:14:14 -0000	1.6
@@ -1 +1 @@
-Scorched3D-40.1c-src.tar.gz
+Scorched3D-40.1d-src.tar.gz


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scorched3d.spec	3 Nov 2006 05:47:50 -0000	1.19
+++ scorched3d.spec	22 Nov 2006 22:14:14 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           scorched3d
-Version:        40.1c
-Release:        2%{?dist}
+Version:        40.1d
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Hans de Goede  40.1d-1
+- New upstream release 40.1d
+
 * Fri Nov  3 2006 Hans de Goede  40.1c-2
 - Add libvorbis-devel BR so that ogg/vorbis support gets build in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Nov 2006 20:45:26 -0000	1.5
+++ sources	22 Nov 2006 22:14:14 -0000	1.6
@@ -1 +1 @@
-a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz
+263d2c1be168860d783426c4d6c7060c  Scorched3D-40.1d-src.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 22:16:00 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 17:16:00 -0500
Subject: rpms/scorched3d/FC-6 .cvsignore, 1.5, 1.6 scorched3d.spec, 1.19,
	1.20 sources, 1.5, 1.6
Message-ID: <200611222216.kAMMG0D5013121@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13102

Modified Files:
	.cvsignore scorched3d.spec sources 
Log Message:
* Sat Nov 18 2006 Hans de Goede  40.1d-1
- New upstream release 40.1d



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Nov 2006 20:48:36 -0000	1.5
+++ .cvsignore	22 Nov 2006 22:15:30 -0000	1.6
@@ -1 +1 @@
-Scorched3D-40.1c-src.tar.gz
+Scorched3D-40.1d-src.tar.gz


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/scorched3d.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scorched3d.spec	3 Nov 2006 11:21:09 -0000	1.19
+++ scorched3d.spec	22 Nov 2006 22:15:30 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           scorched3d
-Version:        40.1c
-Release:        2%{?dist}
+Version:        40.1d
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Hans de Goede  40.1d-1
+- New upstream release 40.1d
+
 * Fri Nov  3 2006 Hans de Goede  40.1c-2
 - Add libvorbis-devel BR so that ogg/vorbis support gets build in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Nov 2006 20:48:36 -0000	1.5
+++ sources	22 Nov 2006 22:15:30 -0000	1.6
@@ -1 +1 @@
-a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz
+263d2c1be168860d783426c4d6c7060c  Scorched3D-40.1d-src.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 22:18:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Wed, 22 Nov 2006 17:18:17 -0500
Subject: rpms/scorched3d/FC-5 .cvsignore, 1.5, 1.6 scorched3d.spec, 1.17,
	1.18 sources, 1.5, 1.6
Message-ID: <200611222218.kAMMIHMo013198@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13170

Modified Files:
	.cvsignore scorched3d.spec sources 
Log Message:
* Sat Nov 18 2006 Hans de Goede  40.1d-1
- New upstream release 40.1d



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 11:23:38 -0000	1.5
+++ .cvsignore	22 Nov 2006 22:17:47 -0000	1.6
@@ -1 +1 @@
-Scorched3D-40.1c-src.tar.gz
+Scorched3D-40.1d-src.tar.gz


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scorched3d.spec	3 Nov 2006 11:23:38 -0000	1.17
+++ scorched3d.spec	22 Nov 2006 22:17:47 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           scorched3d
-Version:        40.1c
-Release:        2%{?dist}
+Version:        40.1d
+Release:        1%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPL
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Hans de Goede  40.1d-1
+- New upstream release 40.1d
+
 * Fri Nov  3 2006 Hans de Goede  40.1c-2
 - Add libvorbis-devel BR so that ogg/vorbis support gets build in
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 11:23:38 -0000	1.5
+++ sources	22 Nov 2006 22:17:47 -0000	1.6
@@ -1 +1 @@
-a45c9446af99c943a19a4c9a7602531f  Scorched3D-40.1c-src.tar.gz
+263d2c1be168860d783426c4d6c7060c  Scorched3D-40.1d-src.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 22:22:25 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:22:25 -0500
Subject: rpms/netcdf-perl - New directory
Message-ID: <200611222222.kAMMMPPl013383@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13379/netcdf-perl

Log Message:
Directory /cvs/extras/rpms/netcdf-perl added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 22:22:31 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:22:31 -0500
Subject: rpms/netcdf-perl/devel - New directory
Message-ID: <200611222222.kAMMMVff013400@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13379/netcdf-perl/devel

Log Message:
Directory /cvs/extras/rpms/netcdf-perl/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 22 22:22:49 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 22 Nov 2006 17:22:49 -0500
Subject: rpms/libtelepathy/devel .cvsignore, 1.3, 1.4 libtelepathy.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611222222.kAMMMnRD013444@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libtelepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13359

Modified Files:
	.cvsignore libtelepathy.spec sources 
Log Message:
* Wed Nov 22 2006 Brian Pepple  - 0.0.39-1
- Update to 0.0.39.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2006 16:43:00 -0000	1.3
+++ .cvsignore	22 Nov 2006 22:22:19 -0000	1.4
@@ -1 +1 @@
-libtelepathy-0.0.38.tar.gz
+libtelepathy-0.0.39.tar.gz


Index: libtelepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/libtelepathy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtelepathy.spec	12 Oct 2006 16:43:00 -0000	1.2
+++ libtelepathy.spec	22 Nov 2006 22:22:19 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           libtelepathy
-Version:        0.0.38
+Version:        0.0.39
 Release:        1%{?dist}
 Summary:        A GLib library to ease writing telepathy clients
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Brian Pepple  - 0.0.39-1
+- Update to 0.0.39.
+
 * Thu Oct 12 2006 Brian Pepple  - 0.0.38-1
 - Update to 0.0.38.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtelepathy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2006 16:43:00 -0000	1.3
+++ sources	22 Nov 2006 22:22:19 -0000	1.4
@@ -1 +1 @@
-145358f6275acf1ce3d7633f7865b7b9  libtelepathy-0.0.38.tar.gz
+4935790c13b3e412572598fead8ce159  libtelepathy-0.0.39.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 22 22:22:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:22:52 -0500
Subject: rpms/netcdf-perl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611222222.kAMMMqvo013454@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13448

Added Files:
	Makefile import.log 
Log Message:
Setup of module netcdf-perl


--- NEW FILE Makefile ---
# Top level Makefile for module netcdf-perl
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  Wed Nov 22 22:22:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:22:57 -0500
Subject: rpms/netcdf-perl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611222222.kAMMMvrv013469@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13448/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module netcdf-perl


--- 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 Nov 22 22:23:14 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:23:14 -0500
Subject: owners owners.list,1.1997,1.1998
Message-ID: <200611222223.kAMMNEpd013527@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13415

Modified Files:
	owners.list 
Log Message:
Add netcdf-perl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1997
retrieving revision 1.1998
diff -u -r1.1997 -r1.1998
--- owners.list	22 Nov 2006 20:05:05 -0000	1.1997
+++ owners.list	22 Nov 2006 22:22:44 -0000	1.1998
@@ -1167,6 +1167,7 @@
 Fedora Extras|nessus-libraries|Support libraries for nessus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|net6|A TCP protocol abstraction for library C++|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|netcdf-perl|Perl extension module for scientific data access via the netCDF API|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|netgo|Networking profile manager|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 22 22:24:09 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:24:09 -0500
Subject: rpms/netcdf-perl import.log,1.1,1.2
Message-ID: <200611222224.kAMMO9sr013589@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13558

Modified Files:
	import.log 
Log Message:
auto-import netcdf-perl-1.2.3-2.fc6 on branch devel from netcdf-perl-1.2.3-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/netcdf-perl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Nov 2006 22:22:52 -0000	1.1
+++ import.log	22 Nov 2006 22:23:39 -0000	1.2
@@ -0,0 +1 @@
+netcdf-perl-1_2_3-2_fc6:HEAD:netcdf-perl-1.2.3-2.fc6.src.rpm:1164234240



From fedora-extras-commits at redhat.com  Wed Nov 22 22:24:09 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 22 Nov 2006 17:24:09 -0500
Subject: rpms/netcdf-perl/devel netcdf-2.3, NONE, 1.1 netcdf-perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611222224.kAMMO9uE013593@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/netcdf-perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13558/devel

Modified Files:
	.cvsignore sources 
Added Files:
	netcdf-2.3 netcdf-perl.spec 
Log Message:
auto-import netcdf-perl-1.2.3-2.fc6 on branch devel from netcdf-perl-1.2.3-2.fc6.src.rpm


--- NEW FILE netcdf-2.3 ---
.TH NETCDF 3 "26 February 1993" "Printed: \n(yr.\n(mo.\n(dy" "UNIDATA LIBRARY FUNCTIONS"
.SH NAME
netcdf \- Unidata Network Common Data Form (netCDF-2) library
.SH WARNING
The interface described here is obsolete, but included because the perl
module still use it.
.SH SYNOPSIS
.ft B
.na
.nh
.HP
#include 
.HP 6
int nccreate(const char* path, int cmode)
.HP
int ncopen(const char* path, int mode)
.HP
int ncredef(int ncid)
.HP
int ncsetfill(int ncid, int fillmode)
.HP
int ncendef(int ncid)
.HP
int ncclose(int ncid)
.HP
int ncinquire(int ncid, int* ndims, int* nvars, int*\ natts, int*\ recdim)
.HP
int ncsync(int ncid)
.HP
int ncabort(int ncid)
.HP
int ncdimdef(int ncid, const char* name, long length)
.HP
int ncdimid(int ncid, const char* name)
.HP
int ncdiminq(int ncid, int dimid, char* name, long*\ length)
.HP
int ncdimrename(int ncid, int dimid, const char* name)
.HP
int ncvardef(int ncid, const char* name, nc_type datatype, int\ ndims,
const int\ dimids[])
.HP
int ncvarid(int ncid, const char* name)
.HP
int ncvarinq(int ncid, int varid, char* name, nc_type*\ datatype, int*\ ndims,
int\ dimids[], int*\ natts)
.HP
int ncvarput1(int ncid, int varid, const long coords[], const void*\ value)
.HP
int ncvarget1(int ncid, int varid, const long coords[], void*\ value)
.HP
int ncvarput(int ncid, int varid, const long start[], const long\ count[],
const void*\ value)
.HP
int ncvarget(int ncid, int varid, const long start[], const long\ count[],
void*\ value)
.HP
int ncvarputg(int ncid, int varid, const long start[], const long\ count[],
const long\ stride[], const long\ imap[], const void*\ value)
.HP
int ncvargetg(int ncid, int varid, const long start[], const long\ count[],
const long\ stride[], const long\ imap[], void*\ value)
.HP
int ncrecput(int ncid, long\ recnum, void*\ const\ valuep[])
.HP
int ncrecget(int ncid, long\ recnum, void*\ valuep[])
.HP
int ncrecinq(int ncid, int*\ nrvars, int\ rvarids[], long\ rsizes[])
.HP
int ncvarrename(int ncid, int varid, const char* name)
.HP
int ncattput(int ncid, int varid, const char* name, nc_type\ datatype,
int\ len, const void*\ value)
.HP
int ncattinq(int ncid, int varid, const char* name, nc_type*\ datatype,
int*\ len)
.HP
int ncattget(int ncid, int varid, const char* name, void*\ value)
.HP
int ncattcopy(int inncid, int invar, const char* name, int\ outncid, 
int\ outvar)
.HP
int ncattname(int ncid, int varid, int attnum, char*\ name)
.HP
int ncattrename(int ncid, int varid, const char* name, const char*\ newname)
.HP
int ncattdel(int ncid, int varid, const char* name)
.HP
int nctypelen(nc_type datatype)
.ad
.hy
.SH "FUNCTION DESCRIPTIONS"
.LP
These routines implement the Unidata netCDF data-access interface for
the C programming language.
Only those arguments which are unique to the function being described are 
documented in this section.  See the section "COMMON ARGUMENT DESCRIPTIONS"
for descriptions of the other arguments.
.HP 4
\fBint nccreate(const char* \fIpath\fB, int \fIcmode\fB)\fR
.sp
Creates the new netCDF file, returning a netCDF ID that 
can subsequently be used to refer to the netCDF file.
The new netCDF file is placed in define mode.
The mode parameter, \fIcmode\fP,
should be either \fBNC_CLOBBER\fP or \fBNC_NOCLOBBER\fP.
\fBNC_CLOBBER\fP means that even if the file already exists, you want to
create a new file with the same name, erasing the old file's contents.
\fBNC_NOCLOBBER\fP means you want to create a new netCDF file only if the
given file name does not refer to a file that already exists.
If an error occurs, this function returns -1.
.HP
\fBint ncopen(const char* \fIpath\fB, int \fImode\fB)\fR
.sp
Opens the existing netCDF file for access.
The mode parameter, \fImode\fP, should be either
\fBNC_WRITE\fP, to open the file for writing, or \fBNC_NOWRITE\fP, to
open the file read-only.  "Writing" means any kind of change to the
file, including appending or changing data, adding or renaming dimensions,
variables, or attributes, or deleting attributes.
If an error occurs, this function returns -1.
.HP
\fBint ncredef(int \fIncid\fB)\fR
.sp
Puts an open netCDF file into define mode, 
so dimensions, variables, and attributes can be added or renamed and 
attributes can be deleted.
If an error occurs, this function returns -1.
.HP
\fBint ncsetfill(int \fIncid\fB, int \fIfillmode\fB)\fR
.sp
Determines whether or not variable prefilling will be done (see 
\fBVARIABLE PREFILLING\fP below).
The netCDF file shall be writable.
\fIfillmode\fP is either \fBNC_FILL\fP to enable prefilling (the
default) or \fBNC_NOFILL\fP to disable prefilling.
This function returns the previous setting or -1 if an error occurs.
.HP
\fBint ncendef(int \fIncid\fB)\fR
.sp
Takes an open netCDF file out of define mode.
The changes made to the netCDF file
while it was in define mode are checked and committed to disk if no
problems occurred.  
In particular, non-record variables are filled with their fill-values 
unless \fBncsetfill(\|)\fP has been called with the argument 
\fBNC_NOFILL\fP.
The netCDF file is then placed in data mode, so that
variable data can be read or written.
If an error occurs, this function returns -1.
.HP
\fBint ncclose(int \fIncid\fB)\fR
.sp
Closes an open netCDF file.
If the file is in define mode, \fBncendef(\|)\fP
will be called before closing.
(In this case, if
\fBncendef(\|)\fP returns an error, \fBncabort(\|)\fP
will automatically be called to restore the file to the
consistent state before define mode was last entered.)  
After an open netCDF file is closed, its netCDF ID will be reassigned to 
the next netCDF file that is opened or created.
If an error occurs, this function returns -1.
.HP
\fBint ncinquire(int \fIncid\fB, int* \fIndims\fB, int* \fInvars\fB, int* \fInatts\fB, int* \fIrecdim)\fR
.sp
Returns information about an open netCDF file.
Upon successful return,
\fIndims\fP will contain the
number of dimensions defined for this netCDF file,
\fInvars\fP will contain the
number of variables,
\fInatts\fP will contain the
number of attributes, and
\fIrecdim\fP will contain the
ID of the unlimited dimension if one exists, or -1 otherwise.
If any of the
return parameters is a \fBNULL\fP pointer, then the corresponding information
will not be returned; hence, no space need be allocated for it.
If an error occurs, this function returns -1.
.HP
\fBint ncsync(int \fIncid\fB)\fR
.sp
Updates a writable netCDF file.
The netCDF file must be in data mode.
A netCDF file in define mode is synchronized
to disk only when \fBncendef(\|)\fP is called.
It can be expensive in computer resources to always synchronize to disk after
every write of variable data or change of an attribute value.  There are two
reasons you might want to synchronize after writes: 1) to minimize data 
loss in case of abnormal termination; and 2) to make data available to other
processes for reading immediately after it is written.
Data is automatically synchronized to disk when a netCDF file is closed,
or whenever you leave define mode.
If an error occurs, this function returns -1.
.HP
\fBint ncabort(int \fIncid\fB)\fR
.sp
Closes or deletes a netCDF file.
If the netCDF file isn't in define mode, then the file is closed.
If the file is being created and is still in define mode, the file is deleted.
If define mode was entered by a call to \fBncredef(\|)\fP,
the netCDF file is restored to its state before definition mode was entered 
and the file is closed.
The main reason for calling \fBncabort(\|)\fP
is to restore the netCDF to a known consistent state in
case anything goes wrong during the definition of new dimensions,
variables, or attributes.
This function is called automatically if \fBncclose(\|)\fP
is called from define mode and the call to leave define
mode before closing fails.
If an error occurs, this function returns -1.
.HP
\fBint ncdimdef(int \fIncid\fB, const char* \fIname\fB, long \fIlength\fB)\fR
.sp
Adds a new dimension to an open netCDF file, which must be 
in define mode.
\fIname\fP is the dimension name.
If an error occurs, this function returns -1.
.HP
\fBint ncdimid(int \fIncid\fB, const char* \fIname\fB)\fR
.sp
Returns the ID of a netCDF dimension, given the name of the dimension.
If an error occurs, this function returns -1.
.HP
\fBint ncdiminq(int \fIncid\fB, int \fIdimid\fB, char* \fIname\fB, long*\ \fIsize\fB)\fR
.sp
Returns the name and size of a dimension, given its ID.  If either the
\fIname\fP parameter or \fIsize\fP parameter is a \fBNULL\fP pointer, the
associated information will not be returned, so no space needs to be
allocated.  For the unlimited dimension, the returned size is the current
maximum value used for writing any record variables, (i.e. the maximum
record number).  If an error occurs, this function returns -1.
.HP
\fBint ncdimrename(int \fIncid\fB, int \fIdimid\fB, const char* \fIname\fB)\fR
.sp
Renames an existing dimension in an open netCDF file.
If the new name is longer than the old name, the netCDF must be in 
define mode.
You cannot rename a dimension to have the same name as another dimension.
If an error occurs, this function returns -1.
.HP
\fBint ncvardef(int \fIncid\fB, const char* \fIname\fB, nc_type \fIdatatype\fB,
int \fIndims\fB, const int \fIdimids[]\fB)\fR
.sp
Adds a new variable to an open netCDF file in define mode.
It returns a netCDF variable ID.
If an error occurs, this function returns -1.
.HP
\fBint ncvarid(int \fIncid\fB, const char* \fIname\fB)\fR
.sp
Returns the ID of a netCDF variable, given its name.
If an error occurs, this function returns -1.
.HP
\fBint ncvarinq(int \fIncid\fB, int \fIvarid\fB, char* \fIname\fB, 
nc_type* \fIdatatype\fB, int* \fIndims\fB, int \fIdimids[]\fB, int* \fInatts)\fR
.sp
Returns information about a netCDF variable, given its ID.  If any of the
return parameters (\fIname\fP, \fIdatatype\fP, \fIndims\fI, \fIdimids\fI, or
\fInatts\fP) is a \fBNULL\fP pointer, then the corresponding information
will not be returned; hence, no space need be allocated for it.  If an error
occurs, this function returns -1.
.HP
\fBint ncvarput1(int \fIncid\fB, int \fIvarid\fB, const long \fIcoords[]\fB, 
const void* \fIvalue\fB)\fR
.sp
Puts a single data value into a variable of an open netCDF file
that is in data mode.
If an error occurs, this function returns -1.
.HP
\fBint ncvarget1(int \fIncid\fB, int \fIvarid\fB, const long \fIcoords[]\fB, 
void* \fIvalue\fB)\fR
.sp
Gets a single data value from a variable of an open netCDF file
that is in data mode.
If an error occurs, this function returns -1.
.HP
\fBint ncvarput(int \fIncid\fB, int \fIvarid\fB, const long \fIstart[]\fB, 
const long \fIcount[]\fB, const void* \fIvalue\fB)\fR
.sp
Writes a hyperslab of values into a netCDF variable of an open
netCDF file, which must be in data mode.
If an error occurs, this function returns -1.
.HP
\fBint ncvarget(int \fIncid\fB, int \fIvarid\fB, const long \fIstart[]\fB, 
const long \fIcount[]\fB, void* \fIvalue\fB)\fR
.sp
Reads a hyperslab of values from a netCDF variable of an open
netCDF file, which must be in data mode.
If an error occurs, this function returns -1.
.HP
\fBint ncvarputg(int \fIncid\fB, int \fIvarid\fB, const long \fIstart[]\fB, 
const long \fIcount[]\fB, const long \fIstride[]\fB, const long \fIimap[]\fB, 
const void* \fIvalue\fB)\fR
.sp
Writes a general hyperslab of values into a netCDF variable 
of an open netCDF file, which must be in data mode.
The locations of the memory-resident data values may be arbitrary, though
they are constrained to have a regular structure.
In addition, the values of the netCDF variable may be accessed using
non-unity strides.
If an error occurs, this function returns -1.
.HP
\fBint ncvargetg(int \fIncid\fB, int \fIvarid\fB, const long \fIstart[]\fB,
const long \fIcount[]\fB, const long \fIstride[]\fB, const long \fIimap[]\fB,
void* \fIvalue\fB)\fR
.sp
Reads a general hyperslab of values from a netCDF variable 
of an open netCDF file, which must be in data mode.
The locations of the memory-resident data values may be arbitrary, though
they are constrained to have a regular structure.
In addition, the values of the netCDF variable may be accessed using
non-unity strides.
If an error occurs, this function returns -1.
.HP
\fBint ncrecput(int\ \fIncid\fP, long\ \fIrecnum\fP, const void*\ \fIvaluep[]\fP)\fR
.sp
Writes a record (or a subset of a record) of values into the record
variables of an open netCDF file, which must be in data mode.  The record
number, \fIrecnum\fP, must be a nonnegative number that specifies which
record (which value of the unlimited or record dimension) to write.  The
array of pointers to blocks of data to be written, \fIvaluep\fP, should have
one pointer for each record variable.  The pointer to the data to be written
to the \fIn\fP-th record variable, \fIvaluep[n]\fP, points to one record's
worth of data of the appropriate type to be written into the \fIrecnum\fP-th
record of that netCDF variable.  If the pointer for any record variable is
the \fBNULL\fP pointer, no data is written for that variable.  Hence any
subset of record variables may be written by specifying non-\fBNULL\fP
pointers for the desired record variables.  Invoking this function is
equivalent to a sequence of invocations of ncvarput() for all record
variables for which a non-\fBNULL\fP pointer is specified.  If an error
occurs, this function returns -1.
.HP
\fBint ncrecget(int\ \fIncid\fP, long\ \fIrecnum\fP, void*\ \fIvaluep[]\fP)\fR
.sp
Reads a record (or a subset of a record) of values from the record variables
of an open netCDF file, which must be in data mode.  The record number,
\fIrecnum\fP, must be a nonnegative number that specifies which record to
read.  The array of pointers to blocks of data to be read, \fIvaluep\fP,
should have one pointer for each record variable.  The pointer to the data
to be read for the \fIn\fP-th record variable, \fIvaluep[n]\fP, shall point
to enough space to hold one record's worth of data of the appropriate type
for that netCDF record variable.  If the pointer for any record variable is
the \fBNULL\fP pointer, no data is read from that variable.  Hence any
subset of record variables may be read by specifying non-\fBNULL\fP pointers
for only the desired record variables.  Invoking this function is equivalent
to a sequence of invocations of ncvarget() for all record variables for
which a non-\fBNULL\fP pointer is specified.  If an error occurs, this
function returns -1.
.HP
\fBint ncrecinq(int \fIncid\fP, int*\ \fInrvars\fP, int\ \fIrvarids[]\fP, long\ \fIrsizes[]\fP)\fR
.sp 
Returns information about the record variables (variables that use the
unlimited dimension) of an open netCDF file.  Upon successful return,
\fInrvars\fP will contain the number of record variables, \fIrvarids\fP will
contain the variable IDs of those record variables, and \fIrsizes\fP will
contain the size in bytes for a record's worth of data for each record
variable.  If any of the return parameters (\fInrvars\fP, \fIrvarids\fP, or
\fIrsizes\fP) is a \fBNULL\fP pointer, the specified information will not be
returned; hence no space needs to be allocated for it.  If an error occurs,
this function returns -1.
.HP
\fBint ncvarrename(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB)\fR
.sp
Changes the name of a netCDF variable in an open netCDF.
If the new name is longer than the old name, the netCDF must be in define mode.
You cannot rename a variable to have the name of any existing variable.
If an error occurs, this function returns -1.
.HP
\fBint ncattput(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB, 
nc_type \fIdatatype\fB, int \fIlen\fB, const void* \fIvalue\fB)\fR
.sp
Adds or changes a variable attribute or global attribute of an
open netCDF file.  If this attribute is new, or if the space required to
store the attribute is greater than before, the netCDF file must be in
define mode.
If an error occurs, this function returns -1.
.HP
\fBint ncattinq(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB, 
nc_type* \fIdatatype\fB, int* \fIlen\fB)\fR
.sp
Returns information about a netCDF attribute, given its variable ID and
name.  The information returned is the type and length of the attribute.  If
either of the return parameters is a \fBNULL\fP pointer, the specified
information will not be returned; hence no space needs to be allocated for
it.  If an error occurs, this function returns -1.
.HP
\fBint ncattget(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB,
void* \fIvalue\fB)\fR
.sp
Gets the value(s) of a netCDF attribute, given its
variable ID and name.
All elements of the vector of attribute
values are returned, so you must allocate enough space to hold
them.  If you don't know how much space to reserve, call \fBncattinq(\|)\fP
first to find out the length of the attribute.
If an error occurs, this function returns -1.
.HP
\fBint ncattcopy(int \fIinncid\fB, int \fIinvar\fB, const char* \fIname\fB,
int \fIoutncid\fB, int \fIoutvar\fB)\fR
.sp
Copies an
attribute from one open netCDF file to another.  It can also be used to
copy an attribute from one variable to another within the same netCDF.
\fIinncid\fP is the netCDF ID of an input netCDF file from which the
attribute will be copied.
\fIinvar\fP
is the ID of the variable in the input netCDF file from which the
attribute will be copied, or \fBNC_GLOBAL\fP for a global attribute.
\fIname\fP
is the name of the attribute in the input netCDF file to be copied.
\fIoutncid\fP
is the netCDF ID of the output netCDF file to which the attribute will be 
copied.
It is permissible for the input and output netCDF IDs to be the same.  The
output netCDF file should be in define mode if the attribute to be
copied does not already exist for the target variable, or if it would
cause an existing target attribute to grow.
\fIoutvar\fP
is the ID of the variable in the output netCDF file to which the attribute will
be copied, or \fBNC_GLOBAL\fP to copy to a global attribute.
If an error occurs, this function returns -1.
.HP
\fBint ncattname(int \fIncid\fB, int \fIvarid\fB, int \fIattnum\fB, 
char* \fIname\fB)\fR
.sp
Gets the
name of an attribute, given its variable ID and number as an attribute
of that variable.  This function is useful in generic applications that
need to get the names of all the attributes associated with a variable,
since attributes are accessed by name rather than number in all other
attribute functions.  The number of an attribute is more volatile than
the name, since it can change when other attributes of the same variable
are deleted.  This is why an attribute number is not called an attribute
ID.
\fIattnum\fP
is the number of the attribute.  The attributes for each variable are numbered
from 0 (the first attribute) to \fInvatts\fP-1, where \fInvatts\fP is
the number of attributes for the variable, as returned from a call to
\fBncvarinq(\|)\fP.
If the \fIname\fP parameter is a \fBNULL\fP pointer, no name will be
returned and no space need be allocated.
If an error occurs, this function returns -1.
.HP
\fBint ncattrename(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB,
const char* \fInewname\fB)\fR
.sp
Changes the
name of an attribute.  If the new name is longer than the original name,
the netCDF must be in define mode.  You cannot rename an attribute to
have the same name as another attribute of the same variable.
\fIname\fP
is the original attribute name.
\fInewname\fP
is the new name to be assigned to the specified attribute.  If the new name
is longer than the old name, the netCDF file must be in define mode.
If an error occurs, this function returns -1.
.HP
\fBint ncattdel(int \fIncid\fB, int \fIvarid\fB, const char* \fIname\fB)\fR
.sp
Deletes a
netCDF attribute from an open netCDF file.  The netCDF file must be in
define mode.
If an error occurs, this function returns -1.
.HP
\fBint nctypelen(nc_type \fIdatatype\fB)\fR
.sp
Returns the number of bytes in a netCDF data type.
If an error occurs, this function returns -1.
.SH "COMMON ARGUMENT DESCRIPTIONS"
.TP 4
.BI "char* " name
is the name of a dimension, variable, or attribute.
It shall begin with an alphabetic character, followed by
zero or more alphanumeric characters including the underscore
(`_').  Case is significant.
As an input argument, 
it shall be a pointer to a 0-terminated string; as an output argument, it 
shall be the address of a buffer in which to hold such a string.
The maximum allowable number of characters (excluding the terminating 0) is
MAX_NC_NAME.
Attribute names that begin with an underscore (`_') are reserved for use
by the netCDF interface.
.TP
.BI "char* " path
is the pathname of a netCDF file.  It may be absolute or relative.
.TP
.BI "int " ncid
is the netCDF ID returned from a previous, successful call to
\fBncopen(\|)\fP or \fBnccreate(\|)\fP.
.TP
.BI "int " dimids []
is a vector of dimension ID's and defines the shape of a netCDF variable.
The size of the vector shall be greater than or equal to the
rank (i.e. the number of dimensions) of the variable (\fIndims\fP).
The vector shall be ordered by the speed with which a dimension varies:
\fIdimids\fP[\fIndims\fP-1] shall be the dimension ID of the most rapidly
varying dimension and
\fIdimids\fP[0] shall be the dimension ID of the most slowly
varying dimension.
Consequently, if a variable is a record variable, then \fIdimids\fP[0] 
shall be the dimension ID of the record dimension.
The maximum possible number of
dimensions for a variable is given by the symbolic constant
\fBMAX_VAR_DIMS\fP.
.TP
.BI "int " dimid
is the ID of a netCDF dimension.
netCDF dimension ID's are allocated sequentially from the non-negative 
integers beginning with 0.
.TP
.BI "int " len
is the number of values associated with an attribute.
If the attribute is of type \fBNC_CHAR\fP, then this is one more than 
the string length (since the terminating 0 is stored).
.TP
.BI "int " ndims
is either the total number of dimensions in a netCDF dataset or the rank
(i.e. the number of dimensions) of a netCDF variable.
The value shall not be negative or greater than the symbolic constant 
\fBMAX_VAR_DIMS\fP.
.TP
.BI "int " varid
is the ID of a netCDF variable or (for the attribute-access functions) 
the symbolic constant \fBNC_GLOBAL\fP,
which is used to reference global attributes.
netCDF variable ID's are allocated sequentially from the non-negative 
integers beginning with 0.
.TP
.BI "int " natts
is the number of global attributes in a netCDF dataset  for the
\fBncinquire(\|)\fP function or the number
of attributes associated with a netCDF variable for the \fBncvarinq(\|)\fP
function.
.TP
.BI "long " imap []
is the index mapping vector that specifies how data values associated with a 
netCDF variable are arranged in memory.
The offset, in bytes, from the memory location pointed to by the \fIvalue\fP
argument to a particular datum is given by the
inner (dot) product of the index mapping vector with the coordinates of 
the datum.
For example,
on a machine where `\fBsizeof(float) == 4\fP',
the index mapping vector for the array `\fBfloat u[3][5];\fP' is 
`\fBlong imap[2] = {20,4}\fP'.
Note that the index mapping vector can be
used to access memory-resident data values in a manner that differs 
radically from the nominal structure of the associated netCDF variable.
For example, the following definitions
.sp
.RS +8
.nf
struct vel {
    int flags;
    float u;
    float v;
} vel[NX][NY];
long imap[2] = {
    sizeof(struct vel),
    sizeof(struct vel)*NY};
.fi
.RE
.sp
.TP
\&
can be used to access the memory-resident values of the netCDF variable,
`\fBu[NY][NX]\fP', even
though the dimensions are transposed and the data is contained in a 2-D array
of structures rather than a 2-D array of floating-point values.
The index mapping vector may contain negative values if the
\fIvalue\fP argument is appropriately set.
A \fBNULL\fP index mapping vector argument obtains the default behavior in
which the memory-resident values are assumed to have the same structure as the 
associated netCDF variable.
.TP
.BI "long " coords []
specifies the indicial coordinates of the netCDF data value to be accessed.
The indices are relative to 0; thus, for example, the first data value of a
two-dimensional variable is \fB(0,0)\fP.
The size of the vector shall be at least the rank of the associated
netCDF variable and its elements shall correspond, in order, to the
variable's dimensions.
Consequently, if the variable is a record variable, then the first 
index is the record number.
.TP
.BI "long " count []
specifies the number of data values to be accessed in terms of the 
lengths of the sides of the hyperslab.
Thus, to access a single value, for example, specify \fIcount\fP as
\fB(1, 1, ..., 1)\fP.
Note that, for generalized hyperslab I/O, this argument must be adjusted
to be compatible with the \fIstride\fP and \fIstart\fP arguments so that 
the interaction of the
three does not attempt to access an invalid data co-ordinate.
For example, to
access every \fIstride\fB(\fIi\fB)\fR'th datum along dimension \fIi\fP
beginning with point \fIstart\fB(\fIi\fB), 
\fIcounts\fB(\fIi\fB)\fR should be 
\fB1+(\fInpts\fB(\fIi\fB)-1-\fIstart\fB(\fIi\fB))/\fIstride\fB(\fIi\fB)\fR:
where \fInpts\fB(\fIi\fB)\fR is the size of dimension \fIi\fR.
The size of the \fIcount\fP vector shall be at least the rank of the associated
netCDF variable and its elements shall correspond, in order, to the
variable's dimensions.
Consequently, if the variable is a record variable, then the first 
element of \fIcount\fP is the number of records to access.
.TP
.BI "long " length
is the size of a netCDF dimension.
As an input argument, it shall be a positive integer or the symbolic constant
\fBNC_UNLIMITED\fP.
At most one such unlimited size dimension, called the record dimension,
shall be defined in a netCDF dataset.
As an output argument, it shall be a positive integer.
.TP
.BI "long " start []
specifies 
the starting point
for accessing a netCDF variable's data values
in terms of the indicial coordinates of 
the corner of the hyperslab.
The indices are relative to 0; thus, the first data
value of a variable is \fB(0, 0, ..., 0)\fP.
The size of the vector shall be at least the rank of the associated
netCDF variable and its elements shall correspond, in order, to the
variable's dimensions.
Consequently, if the variable is a record variable, then the first index 
is the starting record number for accessing the netCDF variable's data values.
.TP
.BI "long " stride []
specifies,
for each dimension,
the interval between the accessed values of a netCDF variable.
The size of the vector shall be at least the rank of the associated
netCDF variable and its elements shall correspond, in order, to the
variable's dimensions.
A value of 1 accesses adjacent values of the netCDF variable 
in the corresponding dimension;
a value of 2 accesses every other value of the netCDF variable in the
corresponding dimension; and so on.
Attempting to access a data value that lies outside the defined data space
of a variable is an error.
A \fBNULL\fP stride argument obtains the default behavior in which
adjacent values are accessed along each dimension.
.TP
.BI "nc_type " datatype
specifies the data type of a netCDF variable and is one of the following:
\fBNC_BYTE\fP, \fBNC_CHAR\fP, \fBNC_SHORT\fP, \fBNC_LONG\fP, 
\fBNC_FLOAT\fP, or \fBNC_DOUBLE\fP.
.TP
.BI "void* " value
points to the start of the memory-resident data values to be accessed.
The pointer is declared to be
of type \fBvoid*\fP because it can point to data of any of the basic
netCDF types.
The data should be of the appropriate type for the netCDF
variable:
.sp
.RS +8
.TS
tab(|);
c c
l l.
\fBnetCDF Type|C Type\fP

NC_BYTE|unsigned char
NC_CHAR|char
NC_SHORT|short
NC_LONG|\fBnclong\fP
NC_FLOAT|float
NC_DOUBLE|double
.TE
.RE
.IP
NOTE: The C type corresponding to the netCDF type \fBNC_LONG\fP is
\fBnclong\fP.  
This type is defined in the netCDF header file and
is guaranteed to hold at least 32 bits.
It is defined as either a C `\fBint\fP' or a C `\fBlong\fP' -- depending on the
platform.
.IP
\fBWarning: neither the compiler nor the netCDF software
can detect if the wrong type of data is used.\fP
.SH "VARIABLE PREFILLING"
.LP
By default, the netCDF interface sets the values of
all newly-defined variables of finite length (i.e. not having an unlimited, 
record dimension) to the type-dependent fill-value associated with each 
variable.  This is done when `\fBncendef()\fP' is called.  The
fill-value for a variable may be changed from the default value by
defining the attribute `\fB_FillValue\fP' for the variable.  This
attribute must have the same type as the variable and be of length one.
.LP
Variables with an unlimited record dimension are also prefilled, but on
an `as needed' basis.  For example, if the first write of a record
variable is to position 5, then positions 0 through 4 (and no others)
would be set to the fill-value at the same time.
.LP
This default prefilling of data values may be disabled by calling the
function \fBncsetfill(\|)\fP with the argument \fBNC_NOFILL\fP.  Note
that, for non-record variables, this call must be made before
\fBncendef()\fP; whereas, for record-variables, this call may be made at
any time.
.LP
One can obtain increased performance of the netCDF interface by using 
this feature, but only at the expense of requiring the application to set
every single data value.
.SH "GLOBAL OPTIONS"
.LP
The global variable `\fBncopts\fP', which is defined in
`\fBnetcdf.h\fP', affects the actions of the netCDF interface. It may
be set by the user to the bitwise OR of any of the following, non-zero,
symbolic bit-values:
.TP 14
.B NC_VERBOSE
Print error-messages on standard error.
.TP
.B NC_FATAL
Abort.  Call `\fBexit()\fP' with an error-condition if an error
occurs.
.LP
By default, `\fBncopts\fP' is `\fBNC_VERBOSE | NC_FATAL\fP'.
.SH "ENVIRONMENT VARIABLES"
.TP 4
.B NETCDF_FFIOSPEC
Specifies the Flexible File I/O buffers for netCDF I/O when executing
under the UNICOS operating system (the variable is ignored on other
operating systems).
An appropriate specification can greatly increase the efficiency of 
netCDF I/O -- to the extent that it can actually surpass FORTRAN binary 
I/O.
The default specification is \fBbufa:336:2\fP.
See UNICOS Flexible File I/O for more information.
.SH "MAILING-LISTS"
.LP
Both a mailing list and a digest are available for
discussion of the netCDF interface and announcements about netCDF bugs,
fixes, and enhancements.
To begin or change your subscription to either the mailing-list or the
digest, send one of the following in the body (not
the subject line) of an email message to "Majordomo at unidata.ucar.edu".
Use your email address in place of \fIjdoe at host.inst.domain\fP.
.sp
To subscribe to the netCDF mailing list:
.RS
\fBsubscribe netcdfgroup \fIjdoe at host.inst.domain\fR
.RE
To unsubscribe from the netCDF mailing list:
.RS
\fBunsubscribe netcdfgroup \fIjdoe at host.inst.domain\fR
.RE
To subscribe to the netCDF digest:
.RS
\fBsubscribe netcdfdigest \fIjdoe at host.inst.domain\fR
.RE
To unsubscribe from the netCDF digest:
.RS
\fBunsubscribe netcdfdigest \fIjdoe at host.inst.domain\fR
.RE
To retrieve the general introductory information for the mailing list:
.RS
\fBinfo netcdfgroup\fR
.RE
To get a synopsis of other majordomo commands:
.RS
\fBhelp\fR
.RE
.SH "SEE ALSO"
.BR ncdump (1),
.BR ncgen (1),
.BR netcdf (3f).
.LP
\fInetCDF User's Guide\fP, published
by the Unidata Program Center, University Corporation for Atmospheric
Research, located in Boulder, Colorado.


--- NEW FILE netcdf-perl.spec ---
Name:           netcdf-perl
Version:        1.2.3
Release:        2%{?dist}
Summary:        Perl extension module for scientific data access via the netCDF API

Group:          Development/Libraries
License:        NetCDF
URL:            http://www.unidata.ucar.edu/software/netcdf-perl/
Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf-perl/netcdf-perl-%{version}.tar.Z
Source1:        netcdf-2.3
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl, netcdf-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:  perl-NetCDF = %{version}-%{release}


%description
The netCDF Perl package is a perl extension module for scientific data access
via the netCDF API.


%prep
%setup -q
sed -i -e '1s,/usr/local/bin/perl,%{_bindir}/perl,' src/perl/test.pl


%build
cd src
export PERL_MANDIR=%{_mandir}
export CPP_NETCDF=-I%{_includedir}/netcdf-3
export LD_NETCDF="-L%{_libdir}/netcdf-3 -lnetcdf"
%configure
cd perl
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
cd src
# use the top-level Makefile only for manpage installation
make installed_manuals MANDIR=$RPM_BUILD_ROOT%{_mandir}
cd perl
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' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

# install netcdf-2 man page
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man3
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man3


%check
cd src
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc src/COPYRIGHT src/HISTORY src/README src/perl/test.pl
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/NetCDF.pm
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*


%changelog
* Tue Nov 14 2006 - Orion Poplawski  - 1.2.3-2
- Changed license to NetCDF, will be changed upstream next release
- Add src/perl/test.pl to %%doc
- Added netcdf-2 man page
- Only use top level Makefile for installing man pages

* Mon Nov 13 2006 - Orion Poplawski  - 1.2.3-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf-perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Nov 2006 22:22:57 -0000	1.1
+++ .cvsignore	22 Nov 2006 22:23:39 -0000	1.2
@@ -0,0 +1 @@
+netcdf-perl-1.2.3.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf-perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Nov 2006 22:22:57 -0000	1.1
+++ sources	22 Nov 2006 22:23:39 -0000	1.2
@@ -0,0 +1 @@
+936c91794d82ff8cfe2a955d4cad4c27  netcdf-perl-1.2.3.tar.Z



From fedora-extras-commits at redhat.com  Wed Nov 22 22:48:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 22 Nov 2006 17:48:32 -0500
Subject: rpms/celestia/FC-6 celestia-1.4.1-strictalias.patch, NONE,
	1.1 celestia.spec, 1.20, 1.21
Message-ID: <200611222248.kAMMmW34013835@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13817

Modified Files:
	celestia.spec 
Added Files:
	celestia-1.4.1-strictalias.patch 
Log Message:
Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
Hopefully really handle the gconf schema properly.


celestia-1.4.1-strictalias.patch:

--- NEW FILE celestia-1.4.1-strictalias.patch ---
--- celestia-1.4.1/src/celengine/modelfile.cpp.strictalias	2006-11-22 14:04:15.000000000 +0100
+++ celestia-1.4.1/src/celengine/modelfile.cpp	2006-11-22 14:01:27.000000000 +0100
@@ -1080,7 +1080,9 @@
 static float readFloat(istream& in)
 {
     int i = readUint(in);
-    return *((float*) &i);
+    float f;
+    memcpy(&f, &i, sizeof(float));
+    return f;
 }
 
 


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-6/celestia.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- celestia.spec	28 Aug 2006 23:50:49 -0000	1.20
+++ celestia.spec	22 Nov 2006 22:48:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           celestia
 Version:        1.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OpenGL real-time visual space simulation
 Group:          Amusements/Graphics
 License:        GPL
@@ -9,6 +9,7 @@
 Patch0:         celestia-1.4.0-compile.patch
 Patch1:         celestia-1.4.1-lua51.patch
 Patch2:         celestia-1.4.1-lua51-resume.patch
+Patch3:         celestia-1.4.1-strictalias.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,8 +23,8 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  lua-devel
-BuildRequires:  automake17
 BuildRequires:  gettext-devel
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -46,21 +47,28 @@
 %patch0 -p0
 %patch1 -p1 -b .lua51
 %patch2 -p1 -b .lua51-resume
+%patch3 -p1 -b .strictalias
+
+# Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede).
+sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure
+sed -i 's/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS \$CELESTIA_CXXFLAGS"/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS"/' configure
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
+
 
 %build
 export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
-# http://www.shatters.net/forum/viewtopic.php?t=9605
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-%configure --with-gnome --with-lua --disable-schemas-install
+%configure --with-gnome --with-lua
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
@@ -86,15 +94,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 &>/dev/null || :
+fi
 
 %post
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
 %preun
-if [ "$1" = "0" ] ; then
-  GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+if [ "$1" -eq "0" ] ; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 &>/dev/null || :
 fi
 
 
@@ -105,12 +123,17 @@
 # Seem to have gone away in post-1.4.0 CVS...
 #%doc manual/*.html manual/*.css
 %{_bindir}/*
+%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.png
 
 
 %changelog
+* Wed Nov 22 2006 Steven Pritchard  1.4.1-7
+- Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
+- Hopefully really handle the gconf schema properly.
+
 * Mon Aug 28 2006 Steven Pritchard  1.4.1-6
 - Add --disable-schemas-install to configure.
 
@@ -218,4 +241,3 @@
 
 * Tue May 14 2002 Julien MOUTTE 
 - Initial RPM release.
-



From fedora-extras-commits at redhat.com  Wed Nov 22 22:50:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 22 Nov 2006 17:50:40 -0500
Subject: rpms/celestia/FC-5 celestia-1.4.1-strictalias.patch, NONE,
	1.1 celestia.spec, 1.18, 1.19
Message-ID: <200611222250.kAMMoeTR013905@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13884

Modified Files:
	celestia.spec 
Added Files:
	celestia-1.4.1-strictalias.patch 
Log Message:
Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
Hopefully really handle the gconf schema properly.


celestia-1.4.1-strictalias.patch:

--- NEW FILE celestia-1.4.1-strictalias.patch ---
--- celestia-1.4.1/src/celengine/modelfile.cpp.strictalias	2006-11-22 14:04:15.000000000 +0100
+++ celestia-1.4.1/src/celengine/modelfile.cpp	2006-11-22 14:01:27.000000000 +0100
@@ -1080,7 +1080,9 @@
 static float readFloat(istream& in)
 {
     int i = readUint(in);
-    return *((float*) &i);
+    float f;
+    memcpy(&f, &i, sizeof(float));
+    return f;
 }
 
 


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-5/celestia.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- celestia.spec	22 Aug 2006 16:48:27 -0000	1.18
+++ celestia.spec	22 Nov 2006 22:50:10 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           celestia
 Version:        1.4.1
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        OpenGL real-time visual space simulation
 Group:          Amusements/Graphics
 License:        GPL
@@ -9,6 +9,7 @@
 Patch0:         celestia-1.4.0-compile.patch
 Patch1:         celestia-1.4.1-lua51.patch
 Patch2:         celestia-1.4.1-lua51-resume.patch
+Patch3:         celestia-1.4.1-strictalias.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,8 +23,8 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  lua-devel
-BuildRequires:  automake17
 BuildRequires:  gettext-devel
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -46,11 +47,20 @@
 %patch0 -p0
 %patch1 -p1 -b .lua51
 %patch2 -p1 -b .lua51-resume
+%patch3 -p1 -b .strictalias
+
+# Make sure we compile with the right CFLAGS/CXXFLAGS (from Hans de Goede).
+sed -i 's/CFLAGS="\$CFLAGS \$CELESTIAFLAGS \$CELESTIA_CFLAGS"/CFLAGS="\$CFLAGS \$CELESTIAFLAGS"/' configure
+sed -i 's/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS \$CELESTIA_CXXFLAGS"/CXXFLAGS="\$CXXFLAGS \$CELESTIAFLAGS"/' configure
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch config.h.in
+touch `find -name Makefile.in`
+
 
 %build
 export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
-# http://www.shatters.net/forum/viewtopic.php?t=9605
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 %configure --with-gnome --with-lua
 make %{?_smp_mflags}
 
@@ -58,9 +68,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -p -m 644 -D src/celestia/kde/data/hi48-app-celestia.png \
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
@@ -86,15 +94,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 &>/dev/null || :
+fi
 
 %post
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
 %preun
-if [ "$1" = "0" ] ; then
-  GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+if [ "$1" -eq "0" ] ; then
+    GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
+    killall -HUP gconfd-2 &>/dev/null || :
 fi
 
 
@@ -112,6 +130,13 @@
 
 
 %changelog
+* Wed Nov 22 2006 Steven Pritchard  1.4.1-7
+- Really fix the cmod models problem (#203525).  (Thanks to Hans de Goede.)
+- Hopefully really handle the gconf schema properly.
+
+* Mon Aug 28 2006 Steven Pritchard  1.4.1-6
+- Add --disable-schemas-install to configure.
+
 * Tue Aug 22 2006 Steven Pritchard  1.4.1-5
 - Turn on -fno-strict-aliasing to work around bug #203525.
 
@@ -216,4 +241,3 @@
 
 * Tue May 14 2002 Julien MOUTTE 
 - Initial RPM release.
-



From fedora-extras-commits at redhat.com  Wed Nov 22 23:16:29 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 22 Nov 2006 18:16:29 -0500
Subject: rpms/mhonarc/FC-6 mhonarc.spec,1.15,1.16
Message-ID: <200611222316.kAMNGTBD017226@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/mhonarc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182/FC-6

Modified Files:
	mhonarc.spec 
Log Message:
build on x86_64 now that perl-Unicode-Map8 builds there too


Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/FC-6/mhonarc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mhonarc.spec	30 Aug 2006 15:52:44 -0000	1.15
+++ mhonarc.spec	22 Nov 2006 23:15:59 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mhonarc
 Version:        2.6.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
@@ -12,9 +12,6 @@
 BuildArch:      noarch
 Provides:       MHonArc = %{version}-%{release}
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch:    x86_64
-
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail
@@ -54,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Aurelien Bompard  2.6.16-3
+- rebuild, perl-Unicode-Map8 now builds on x86_64
+
 * Wed Aug 30 2006 Aurelien Bompard  2.6.16-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 22 23:16:29 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 22 Nov 2006 18:16:29 -0500
Subject: rpms/mhonarc/FC-5 mhonarc.spec,1.14,1.15
Message-ID: <200611222316.kAMNGTM5017223@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/mhonarc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182/FC-5

Modified Files:
	mhonarc.spec 
Log Message:
build on x86_64 now that perl-Unicode-Map8 builds there too


Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/FC-5/mhonarc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mhonarc.spec	15 Jun 2006 18:56:39 -0000	1.14
+++ mhonarc.spec	22 Nov 2006 23:15:59 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mhonarc
 Version:        2.6.16
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
@@ -12,9 +12,6 @@
 BuildArch:      noarch
 Provides:       MHonArc = %{version}-%{release}
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch: x86_64
-
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail
@@ -54,6 +51,12 @@
 
 
 %changelog
+* Sat Nov 18 2006 Aurelien Bompard  2.6.16-3
+- rebuild, perl-Unicode-Map8 now builds on x86_64
+
+* Wed Aug 30 2006 Aurelien Bompard  2.6.16-2
+- rebuild
+
 * Thu Jun 15 2006 Aurelien Bompard  2.6.16-1
 - version 2.6.16
 



From fedora-extras-commits at redhat.com  Wed Nov 22 23:16:35 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 22 Nov 2006 18:16:35 -0500
Subject: rpms/mhonarc/devel mhonarc.spec,1.15,1.16
Message-ID: <200611222316.kAMNGZ8w017229@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/mhonarc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182/devel

Modified Files:
	mhonarc.spec 
Log Message:
build on x86_64 now that perl-Unicode-Map8 builds there too


Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mhonarc.spec	30 Aug 2006 15:52:44 -0000	1.15
+++ mhonarc.spec	22 Nov 2006 23:16:05 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mhonarc
 Version:        2.6.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
@@ -12,9 +12,6 @@
 BuildArch:      noarch
 Provides:       MHonArc = %{version}-%{release}
 
-# perl-Unicode-Map8 does not work on x86_64, see bug #182514
-ExcludeArch:    x86_64
-
 
 %description
 MHonArc is a Perl mail-to-HTML converter. MHonArc provides HTML mail
@@ -54,6 +51,9 @@
 
 
 %changelog
+* Sat Nov 18 2006 Aurelien Bompard  2.6.16-3
+- rebuild, perl-Unicode-Map8 now builds on x86_64
+
 * Wed Aug 30 2006 Aurelien Bompard  2.6.16-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 00:04:31 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 22 Nov 2006 19:04:31 -0500
Subject: owners owners.list,1.1998,1.1999
Message-ID: <200611230004.kAN04VM4020580@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20565

Modified Files:
	owners.list 
Log Message:
fix dd2 entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1998
retrieving revision 1.1999
diff -u -r1.1998 -r1.1999
--- owners.list	22 Nov 2006 22:22:44 -0000	1.1998
+++ owners.list	23 Nov 2006 00:04:00 -0000	1.1999
@@ -289,7 +289,7 @@
 Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|dbus-qt|Qt-based library for using D-BUS|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dclib|Direct Connect file sharing library|lmacken at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|dd2|Dodgin' Diamond 2 - Shoot'em up arcade game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org
+Fedora Extras|dd2|Dodgin' Diamond 2 - Shoot'em up arcade game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ddclient|A client to update dynamic DNS host entries|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|thomas at apestaart.org
 Fedora Extras|ddd|GUI for several command-line debuggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 23 00:09:03 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:09:03 -0500
Subject: rpms/VLGothic-fonts - New directory
Message-ID: <200611230009.kAN093U7020636@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632/VLGothic-fonts

Log Message:
Directory /cvs/extras/rpms/VLGothic-fonts added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 00:09:09 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:09:09 -0500
Subject: rpms/VLGothic-fonts/devel - New directory
Message-ID: <200611230009.kAN099Lk020649@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632/VLGothic-fonts/devel

Log Message:
Directory /cvs/extras/rpms/VLGothic-fonts/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 00:09:26 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:09:26 -0500
Subject: rpms/VLGothic-fonts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611230009.kAN09QPG020684@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20678

Added Files:
	Makefile import.log 
Log Message:
Setup of module VLGothic-fonts


--- NEW FILE Makefile ---
# Top level Makefile for module VLGothic-fonts
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 Nov 23 00:09:32 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:09:32 -0500
Subject: rpms/VLGothic-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611230009.kAN09WLV020702@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20678/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module VLGothic-fonts


--- 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 Nov 23 00:10:29 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 22 Nov 2006 19:10:29 -0500
Subject: rpms/bsd-games/FC-6 bsd-games.spec,1.8,1.9 config.params,1.3,1.4
Message-ID: <200611230010.kAN0ATOu020817@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20742

Modified Files:
	bsd-games.spec config.params 
Log Message:
Drop 'wargames' non-game from the package




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-6/bsd-games.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bsd-games.spec	15 Oct 2006 05:17:22 -0000	1.8
+++ bsd-games.spec	23 Nov 2006 00:09:59 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -21,7 +21,7 @@
 # Add patches for man page renames
 Patch8: bsd-games-2.17-monop-rename.patch
 Patch9: bsd-games-2.17-banner-rename.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libtermcap-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
 
@@ -30,7 +30,7 @@
 bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku,
 hunt, mille, mpoly, morse, number, phantasia, pig, pom, ppt, primes,
 quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon,
-tetris-bsd, trek, wargames, worm, worms and wump.
+tetris-bsd, trek, worm, worms and wump.
 
 %prep
 %setup -q
@@ -134,7 +134,6 @@
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
 %{_bindir}/vert-banner
-%{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
 %{_bindir}/wtf
@@ -161,6 +160,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Wed Nov 22 2006 Wart  2.17-16
+- Drop the useless game 'wargames'
+
 * Sat Oct 14 2006 Wart  2.17-15
 - Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
 
@@ -241,7 +243,7 @@
 - kill countmail, no longer require frm from elm
 
 * Mon Jun 5 2000 Tim Powers 
-- fixed man page location to be in %{_mandir}
+- fixed man page location to be in %%{_mandir}
 - fixed so that regular users can build
 
 * Fri May 5 2000 Tim Powers 
@@ -258,7 +260,7 @@
 - updated source to 2.8
 - fixed problem with ospeed being defined in the source instead of including
 	termcap.h (new ospeed patch)
-- using files list in %files section instead of entering
+- using files list in %%files section instead of entering
 	_every_single_filename_.
 
 * Sat Aug 21 1999 Bill Nottingham 


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-6/config.params,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.params	15 Oct 2006 05:17:22 -0000	1.3
+++ config.params	23 Nov 2006 00:09:59 -0000	1.4
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune wargames"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@



From fedora-extras-commits at redhat.com  Thu Nov 23 00:10:53 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:10:53 -0500
Subject: rpms/VLGothic-fonts import.log,1.1,1.2
Message-ID: <200611230010.kAN0ArEA020863@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20789

Modified Files:
	import.log 
Log Message:
auto-import VLGothic-fonts-20061026-3 on branch devel from VLGothic-fonts-20061026-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Nov 2006 00:09:26 -0000	1.1
+++ import.log	23 Nov 2006 00:10:23 -0000	1.2
@@ -0,0 +1 @@
+VLGothic-fonts-20061026-3:HEAD:VLGothic-fonts-20061026-3.src.rpm:1164240642



From fedora-extras-commits at redhat.com  Thu Nov 23 00:10:53 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 19:10:53 -0500
Subject: rpms/VLGothic-fonts/devel 30-VLGothic.conf, NONE,
	1.1 VLGothic-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611230010.kAN0ArSG020865@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20789/devel

Modified Files:
	.cvsignore sources 
Added Files:
	30-VLGothic.conf VLGothic-fonts.spec 
Log Message:
auto-import VLGothic-fonts-20061026-3 on branch devel from VLGothic-fonts-20061026-3.src.rpm


--- NEW FILE 30-VLGothic.conf ---



    
        
            VL Gothic
        
        
            false
        
    
    
    
        
            VL PGothic
        
        
            false
        
    
    
    
        
            ja
            en
        
        
            en
        
    
    
    
        monospace
        
            VL Gothic
        
    

    
        sans-serif
        
            VL PGothic
        
    



--- NEW FILE VLGothic-fonts.spec ---
Name: VLGothic-fonts
Version: 20061026
Release: 3%{?_dist}
Summary: VLGothic the Japanese TrueType font

License: Distributable
Group: User Interface/X
URL: http://dicey.org/vlgothic
Source0: http://vinelinux.org/~daisuke/vlgothic/VLGothic-%{version}.tar.bz2
Source1: 30-VLGothic.conf
BuildRoot: %{_tmppath}/VLGothic-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

Requires: fontconfig
Obsoletes: VLGothic <= %{version}-%{release}
Provides:  VLGothic = %{version}-%{release}

%description
VLGothic is a Japanese TrueType font maden by Vine Linux project.
The most of grphys are imported from M+ fonts and sazanami mincho, 
and later patched by them.

%prep
%setup -q -n VLGothic


%build


%install
rm -rf ${RPM_BUILD_ROOT}

mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
install -p -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d

mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/fonts/japanese/TrueType
mv *.ttf ${RPM_BUILD_ROOT}/%{_datadir}/fonts/japanese/TrueType


%clean
rm -rf ${RPM_BUILD_ROOT}


%files
%defattr(-,root,root,-)
%doc README* LICENSE*
%dir %{_datadir}/fonts/japanese/
%dir %{_datadir}/fonts/japanese/TrueType
%config(noreplace) %{_sysconfdir}/fonts/conf.d/30-VLGothic.conf
%{_datadir}/fonts/japanese/TrueType/*.ttf


%changelog
* Sat Nov 18 2006 Ryo Dairiki  - 20061026-3
- Modify the specfile along with the Fedora Extras packaging policy.

* Sun Nov 12 2006 Ryo Dairiki  - 20061026-2
- Modify the specfile.

* Sun Nov 12 2006 Ryo Dairiki  - 20061026-1
- Preparing for Fedora Extras.

* Sat Oct 28 2006 Ryo Dairiki  - 20061021-2
- Update to 20061021.

* Tue Sep 19 2006 Ryo Dairiki  - 20060913-2
- Update to 20060913.

* Thu Aug 31 2006 Ryo Dairiki  - 20060831-1
- Initial packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Nov 2006 00:09:32 -0000	1.1
+++ .cvsignore	23 Nov 2006 00:10:23 -0000	1.2
@@ -0,0 +1 @@
+VLGothic-20061026.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Nov 2006 00:09:32 -0000	1.1
+++ sources	23 Nov 2006 00:10:23 -0000	1.2
@@ -0,0 +1 @@
+b827b4a513f044edef080f1d65e0f861  VLGothic-20061026.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 01:33:24 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 22 Nov 2006 20:33:24 -0500
Subject: owners owners.list,1.1999,1.2000
Message-ID: <200611230133.kAN1XOdT024117@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24090

Modified Files:
	owners.list 
Log Message:
Add "VLGothic-fonts"



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.1999
retrieving revision 1.2000
diff -u -r1.1999 -r1.2000
--- owners.list	23 Nov 2006 00:04:00 -0000	1.1999
+++ owners.list	23 Nov 2006 01:32:54 -0000	1.2000
@@ -2390,6 +2390,7 @@
 Fedora Extras|vips|Library for processing large images|adam at spicenitz.org|extras-qa at fedoraproject.org|
 Fedora Extras|viruskiller|Frantic shooting game where viruses invade your computer|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|vkeybd|Virtual MIDI keyboard|green at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|VLGothic-fonts|VLGothic the Japanese TrueType font|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|vnc-reflector|A specialized, multiplexing vnc proxy server|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|vnstat|Console-based network traffic monitor|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 23 04:10:16 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 22 Nov 2006 23:10:16 -0500
Subject: rpms/labyrinth/FC-5 labyrinth.spec,1.1,1.2
Message-ID: <200611230410.kAN4AGgc001420@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1401

Modified Files:
	labyrinth.spec 
Log Message:
FC5 doesn't have the -devel package split from the gnome-python2 main package, so update the BR to reflect that.


Index: labyrinth.spec
===================================================================
RCS file: /cvs/extras/rpms/labyrinth/FC-5/labyrinth.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- labyrinth.spec	22 Nov 2006 02:07:16 -0000	1.1
+++ labyrinth.spec	23 Nov 2006 04:09:46 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:		labyrinth
 Version:	0.3
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	A simple yet powerful mind-mapping tool for the GNOME desktop
 
 Group:		Applications/Productivity
@@ -18,7 +18,7 @@
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
 BuildRequires:	pygtk2-devel >= 2.8
-BuildRequires:	gnome-python2-devel >= 2.12
+BuildRequires:	gnome-python2 >= 2.12
 BuildRequires:	gnome-desktop-devel >= 2.14
 BuildRequires:	desktop-file-utils
 
@@ -88,7 +88,11 @@
 
 
 %changelog
+* Wed Nov 22 2006 Peter Gordon  - 0.3-1.1
+- Update BR (FC5 doesn't have the -devel package split out):
+  from gnome-python2-devel to gnome-python2
+
 * Wed Nov 15 2006 Peter Gordon  - 0.3-1
 - Initial packaging.
 - Add patch to fix interpreters on MainWindow.py and Links.py scripts:
-  + fix-interpreters.patch
\ No newline at end of file
+  + fix-interpreters.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 04:13:17 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 23:13:17 -0500
Subject: rpms/linphone/devel linphone.spec,1.25,1.26
Message-ID: <200611230413.kAN4DHrk001479@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1464

Modified Files:
	linphone.spec 
Log Message:
Mark translated man pages with lang macro


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- linphone.spec	22 Nov 2006 04:50:55 -0000	1.25
+++ linphone.spec	23 Nov 2006 04:12:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -118,7 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
-%{_mandir}/cs/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -136,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 1.5.1-2
+- Mark translated man pages with lang macro
+
 * Tue Nov 21 2006 Jeffrey C. Ollie  - 1.5.1-1
 - Update to 1.5.1
 



From fedora-extras-commits at redhat.com  Thu Nov 23 04:15:00 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed, 22 Nov 2006 23:15:00 -0500
Subject: rpms/linphone/FC-6 linphone.spec,1.24,1.25
Message-ID: <200611230415.kAN4F0FH001540@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/linphone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1525

Modified Files:
	linphone.spec 
Log Message:
Mark translated man pages with lang macro


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/linphone.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- linphone.spec	22 Nov 2006 04:52:00 -0000	1.24
+++ linphone.spec	23 Nov 2006 04:14:30 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -118,7 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
-%{_mandir}/cs/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -136,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Nov 22 2006 Jeffrey C. Ollie  - 1.5.1-2
+- Mark translated man pages with lang macro
+
 * Tue Nov 21 2006 Jeffrey C. Ollie  - 1.5.1-1
 - Update to 1.5.1
 



From fedora-extras-commits at redhat.com  Thu Nov 23 04:23:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 23:23:58 -0500
Subject: rpms/perl-Sub-Install Makefile,1.1,1.2
Message-ID: <200611230423.kAN4NwmC001821@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Install
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1763

Modified Files:
	Makefile 
Log Message:
update to 0.924



Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Sep 2006 04:52:43 -0000	1.1
+++ Makefile	23 Nov 2006 04:23:28 -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  Thu Nov 23 04:23:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 23:23:59 -0500
Subject: rpms/perl-Sub-Install/FC-5 perl-Sub-Install.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <200611230424.kAN4NxlK001825@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Install/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1763/FC-5

Modified Files:
	perl-Sub-Install.spec sources 
Log Message:
update to 0.924



Index: perl-Sub-Install.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/FC-5/perl-Sub-Install.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Sub-Install.spec	7 Sep 2006 05:05:09 -0000	1.2
+++ perl-Sub-Install.spec	23 Nov 2006 04:23:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Install
-Version:        0.922
-Release:        2%{?dist}
+Version:        0.924
+Release:        1%{?dist}
 Summary:        Install subroutines into packages easily
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# testing
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Perl::Critic)
 
 %description
 This module makes it easy to install subroutines into packages without the
@@ -50,6 +52,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 22 2006 Chris Weyl  0.924-1
+- update to 0.924
+- add perl(Test::Perl::Critic) to BR's
+
 * Wed Sep 06 2006 Chris Weyl  0.922-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:53:21 -0000	1.2
+++ sources	23 Nov 2006 04:23:29 -0000	1.3
@@ -1 +1 @@
-48e8e9f72cdd5b3f5f7115b8b7de3ddf  Sub-Install-0.922.tar.gz
+eae66cb5cbd2064ae02b3aeacf6338e4  Sub-Install-0.924.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 04:24:04 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 23:24:04 -0500
Subject: rpms/perl-Sub-Install/devel .cvsignore, 1.2,
	1.3 perl-Sub-Install.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611230424.kAN4O4Cx001834@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Install/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1763/devel

Modified Files:
	.cvsignore perl-Sub-Install.spec sources 
Log Message:
update to 0.924



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 04:53:21 -0000	1.2
+++ .cvsignore	23 Nov 2006 04:23:34 -0000	1.3
@@ -1 +1 @@
-Sub-Install-0.922.tar.gz
+Sub-Install-0.924.tar.gz


Index: perl-Sub-Install.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/devel/perl-Sub-Install.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Sub-Install.spec	7 Sep 2006 04:54:30 -0000	1.2
+++ perl-Sub-Install.spec	23 Nov 2006 04:23:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Install
-Version:        0.922
-Release:        2%{?dist}
+Version:        0.924
+Release:        1%{?dist}
 Summary:        Install subroutines into packages easily
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# testing
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Perl::Critic)
 
 %description
 This module makes it easy to install subroutines into packages without the
@@ -50,6 +52,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 22 2006 Chris Weyl  0.924-1
+- update to 0.924
+- add perl(Test::Perl::Critic) to BR's
+
 * Wed Sep 06 2006 Chris Weyl  0.922-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:53:21 -0000	1.2
+++ sources	23 Nov 2006 04:23:34 -0000	1.3
@@ -1 +1 @@
-48e8e9f72cdd5b3f5f7115b8b7de3ddf  Sub-Install-0.922.tar.gz
+eae66cb5cbd2064ae02b3aeacf6338e4  Sub-Install-0.924.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 04:24:04 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 22 Nov 2006 23:24:04 -0500
Subject: rpms/perl-Sub-Install/FC-6 perl-Sub-Install.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <200611230424.kAN4O4C1001829@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Sub-Install/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1763/FC-6

Modified Files:
	perl-Sub-Install.spec sources 
Log Message:
update to 0.924



Index: perl-Sub-Install.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/FC-6/perl-Sub-Install.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Sub-Install.spec	7 Sep 2006 04:54:30 -0000	1.2
+++ perl-Sub-Install.spec	23 Nov 2006 04:23:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Sub-Install
-Version:        0.922
-Release:        2%{?dist}
+Version:        0.924
+Release:        1%{?dist}
 Summary:        Install subroutines into packages easily
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# testing
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Test::Perl::Critic)
 
 %description
 This module makes it easy to install subroutines into packages without the
@@ -50,6 +52,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 22 2006 Chris Weyl  0.924-1
+- update to 0.924
+- add perl(Test::Perl::Critic) to BR's
+
 * Wed Sep 06 2006 Chris Weyl  0.922-2
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Install/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 04:53:21 -0000	1.2
+++ sources	23 Nov 2006 04:23:34 -0000	1.3
@@ -1 +1 @@
-48e8e9f72cdd5b3f5f7115b8b7de3ddf  Sub-Install-0.922.tar.gz
+eae66cb5cbd2064ae02b3aeacf6338e4  Sub-Install-0.924.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 04:33:52 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Wed, 22 Nov 2006 23:33:52 -0500
Subject: rpms/labyrinth/FC-5 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch,
	1.1, NONE labyrinth-fix-interpreters.patch, 1.1,
	NONE labyrinth.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200611230433.kAN4Xq9S001982@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/labyrinth/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1977/FC-5

Removed Files:
	.cvsignore Makefile branch labyrinth-fix-interpreters.patch 
	labyrinth.spec sources 
Log Message:
FC-5 doesn't meet the minimum build requirements for Labyrinth (pygobject2 >= 2.10), unfortunately. Apologies that I didn't catch that before requesting the branch.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- labyrinth-fix-interpreters.patch DELETED ---


--- labyrinth.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 23 05:58:07 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 23 Nov 2006 00:58:07 -0500
Subject: rpms/flow-tools/FC-5 flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.7, 1.8
Message-ID: <200611230558.kAN5w7bm005425@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353/FC-5

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz#212928


flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/FC-5/flow-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- flow-tools.spec	18 Jun 2006 16:12:28 -0000	1.7
+++ flow-tools.spec	23 Nov 2006 05:57:37 -0000	1.8
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 8%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,9 +14,10 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel
+BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,18 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
+* Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
+- rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-10
+- Rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-9
+- Fix build in mock with minimal build environment #197706
+
 * Sat Jun 10 2006 Paul P Komkoff Jr  0.68-8
 - Split patches in more convenient way (and bug upstream)
 - Fix 2 unitialized variable bugs



From fedora-extras-commits at redhat.com  Thu Nov 23 05:58:06 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 23 Nov 2006 00:58:06 -0500
Subject: rpms/flow-tools/FC-3 flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.4, 1.5
Message-ID: <200611230558.kAN5w6N6005421@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353/FC-3

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz#212928


flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/FC-3/flow-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flow-tools.spec	18 Jun 2006 16:12:22 -0000	1.4
+++ flow-tools.spec	23 Nov 2006 05:57:36 -0000	1.5
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 8%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,9 +14,10 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel
+BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,18 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
+* Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
+- rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-10
+- Rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-9
+- Fix build in mock with minimal build environment #197706
+
 * Sat Jun 10 2006 Paul P Komkoff Jr  0.68-8
 - Split patches in more convenient way (and bug upstream)
 - Fix 2 unitialized variable bugs



From fedora-extras-commits at redhat.com  Thu Nov 23 05:58:12 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 23 Nov 2006 00:58:12 -0500
Subject: rpms/flow-tools/FC-6 flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.10, 1.11
Message-ID: <200611230558.kAN5wCH1005430@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353/FC-6

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz#212928


flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/FC-6/flow-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flow-tools.spec	10 Sep 2006 09:22:53 -0000	1.10
+++ flow-tools.spec	23 Nov 2006 05:57:42 -0000	1.11
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,6 +14,7 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
 * Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 05:58:07 2006
From: fedora-extras-commits at redhat.com (Paul P Komkoff Jr (stingray))
Date: Thu, 23 Nov 2006 00:58:07 -0500
Subject: rpms/flow-tools/FC-4 flow-tools-0.68.rpt72.patch, NONE,
	1.1 flow-tools.spec, 1.4, 1.5
Message-ID: <200611230558.kAN5w7IH005424@cvs-int.fedora.redhat.com>

Author: stingray

Update of /cvs/extras/rpms/flow-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5353/FC-4

Modified Files:
	flow-tools.spec 
Added Files:
	flow-tools-0.68.rpt72.patch 
Log Message:
Fix flow report 72 (by reaper at surnet.ru) bz#212928


flow-tools-0.68.rpt72.patch:

--- NEW FILE flow-tools-0.68.rpt72.patch ---
--- flow-tools-0.68/lib/ftstat.c.orig   2005-05-10 21:48:12.000000000 +0600
+++ flow-tools-0.68/lib/ftstat.c        2006-04-10 14:59:28.000000000 +0600
@@ -11673,10 +11673,10 @@
     ftch_recprefix_tag, ftch_recprefix_tagp);
 
   FT_RECGET_DSTADDR(cur,rec,*fo);
-  FT_RECGET_DST_TAG(cur,rec,*fo);
+  FT_RECGET_SRC_TAG(cur,rec,*fo);
  
   ftch_recprefix_tag.prefix = cur.dstaddr;
-  ftch_recprefix_tag.tag = cur.dst_tag;
+  ftch_recprefix_tag.tag = cur.src_tag;
 
   /* only use mask if option set */
   if (rpt->options & (FT_STAT_OPT_DST_PREFIX_MASK|FT_STAT_OPT_DST_PREFIX_LEN)) {


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/FC-4/flow-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flow-tools.spec	18 Jun 2006 16:12:22 -0000	1.4
+++ flow-tools.spec	23 Nov 2006 05:57:36 -0000	1.5
@@ -1,7 +1,7 @@
 Version: 0.68
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 8%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://www.splintered.net/sw/flow-tools/
@@ -14,9 +14,10 @@
 Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
 Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
 Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
+Patch9: flow-tools-0.68.rpt72.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel
+BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -54,6 +55,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 autoreconf -f -i -s
@@ -92,6 +94,18 @@
 %{_includedir}/*.h
 
 %changelog
+* Thu Nov 16 2006 Paul P Komkoff Jr  - 0.68-12
+- Fix flow report 72 (by reaper at surnet.ru) bz#212928
+
+* Sun Sep 10 2006 Paul P Komkoff Jr  - 0.68-11
+- rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-10
+- Rebuild
+
+* Sun Jul  9 2006 Paul P Komkoff Jr  0.68-9
+- Fix build in mock with minimal build environment #197706
+
 * Sat Jun 10 2006 Paul P Komkoff Jr  0.68-8
 - Split patches in more convenient way (and bug upstream)
 - Fix 2 unitialized variable bugs



From fedora-extras-commits at redhat.com  Thu Nov 23 06:14:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 01:14:52 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.2,1.3
Message-ID: <200611230614.kAN6Eqxv008699@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8682

Modified Files:
	gtkmozembedmm.spec 
Log Message:

Fixed dependency issue in rawhide



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtkmozembedmm.spec	21 Nov 2006 21:21:15 -0000	1.2
+++ gtkmozembedmm.spec	23 Nov 2006 06:14:22 -0000	1.3
@@ -1,6 +1,7 @@
+%define gecko_version 1.8.1
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -19,8 +20,8 @@
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
 %if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel 
-Requires: gecko-libs = 2.0
+BuildRequires: gecko-devel = %{gecko_version}
+Requires: gecko-libs = %{gecko_version}
 %else
 BuildRequires: mozilla-devel
 %endif
@@ -42,7 +43,7 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
 %if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel
+BuildRequires: gecko-devel = %{gecko_version}
 %else
 BuildRequires: mozilla-devel 
 %endif
@@ -105,6 +106,9 @@
 
 
 %changelog
+* Thur Nov 23 2006 Karl  - 1.4.2.cvs20060817-6
+- Fixed build issue in rawhide
+
 * Sun Nov 12 2006 Karl  - 1.4.2.cvs20060817-5
 - Fixed x86_64 build issue.
 



From fedora-extras-commits at redhat.com  Thu Nov 23 06:16:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 01:16:30 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.3,1.4
Message-ID: <200611230616.kAN6GUYj008740@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8725

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkmozembedmm.spec	23 Nov 2006 06:14:22 -0000	1.3
+++ gtkmozembedmm.spec	23 Nov 2006 06:16:00 -0000	1.4
@@ -106,7 +106,7 @@
 
 
 %changelog
-* Thur Nov 23 2006 Karl  - 1.4.2.cvs20060817-6
+* Thu Nov 23 2006 Karl  - 1.4.2.cvs20060817-6
 - Fixed build issue in rawhide
 
 * Sun Nov 12 2006 Karl  - 1.4.2.cvs20060817-5



From fedora-extras-commits at redhat.com  Thu Nov 23 08:29:16 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 23 Nov 2006 03:29:16 -0500
Subject: comps comps-fe6.xml.in,1.228,1.229
Message-ID: <200611230829.kAN8TGC4015566@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15551/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
Add entry for labyrinth


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- comps-fe6.xml.in	22 Nov 2006 00:06:30 -0000	1.228
+++ comps-fe6.xml.in	23 Nov 2006 08:28:46 -0000	1.229
@@ -826,6 +826,7 @@
       hnb
       koffice-suite
       krecipes
+      labyrinth
       lyx
       notecase
       pybliographer



From fedora-extras-commits at redhat.com  Thu Nov 23 08:56:28 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 03:56:28 -0500
Subject: rpms/streamtuner/devel streamtuner-0.99.99-defaultconfig.patch, 1.1,
	1.2
Message-ID: <200611230856.kAN8uStn015652@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15634

Modified Files:
	streamtuner-0.99.99-defaultconfig.patch 
Log Message:
FC6 uses audacious instead beep-media-player - dependency changed

streamtuner-0.99.99-defaultconfig.patch:

Index: streamtuner-0.99.99-defaultconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner-0.99.99-defaultconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner-0.99.99-defaultconfig.patch	6 Jan 2006 13:37:47 -0000	1.1
+++ streamtuner-0.99.99-defaultconfig.patch	23 Nov 2006 08:55:58 -0000	1.2
@@ -1,5 +1,5 @@
 --- src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
-+++ src/plugins/live365/live365.c	2005-12-29 12:49:29.000000000 +0100
++++ src/plugins/live365/live365.c	2006-11-23 10:10:11.000000000 +0100
 @@ -1410,8 +1410,8 @@
    init_handler();
  
@@ -7,33 +7,33 @@
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
  
    return TRUE;
  }
 
 --- src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
-+++ src/plugins/local/local.c	2005-12-29 12:50:21.000000000 +0100
++++ src/plugins/local/local.c	2006-11-23 10:10:11.000000000 +0100
 @@ -1057,8 +1057,8 @@
  
    init_handler();
  
 -  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
  
    return TRUE;
  }
 
 --- src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
-+++ src/plugins/shoutcast/shoutcast.c	2005-12-29 12:48:50.000000000 +0100
++++ src/plugins/shoutcast/shoutcast.c	2006-11-23 10:10:11.000000000 +0100
 @@ -959,9 +959,9 @@
  
    init_handler();
    
 -  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
@@ -42,19 +42,19 @@
  }
 
 --- src/plugins/xiph/xiph.c	2004-12-13 10:57:33.000000000 +0100
-+++ src/plugins/xiph/xiph.c	2005-12-29 12:50:54.000000000 +0100
++++ src/plugins/xiph/xiph.c	2006-11-23 10:10:11.000000000 +0100
 @@ -957,7 +957,7 @@
    init_handler();
  
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
  
    return TRUE;
  }
 
 --- src/streamtuner/st-action.c	2004-12-18 10:56:42.000000000 +0100
-+++ src/streamtuner/st-action.c	2005-12-29 12:41:20.000000000 +0100
++++ src/streamtuner/st-action.c	2006-11-23 10:10:11.000000000 +0100
 @@ -123,7 +123,7 @@
  {
    actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
@@ -66,13 +66,13 @@
  
 
 --- src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
-+++ src/streamtuner/st-preselections.c	2005-12-29 12:04:04.000000000 +0100
++++ src/streamtuner/st-preselections.c	2006-11-23 10:10:11.000000000 +0100
 @@ -390,9 +390,9 @@
  {
    st_preselections_init_handler();
    
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");



From fedora-extras-commits at redhat.com  Thu Nov 23 09:04:35 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 04:04:35 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.8,1.9
Message-ID: <200611230904.kAN94Zrh018861@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18842

Modified Files:
	streamtuner.spec 
Log Message:
FC6 uses audacious instead beep-media-player - dependency changed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- streamtuner.spec	6 Nov 2006 13:19:53 -0000	1.8
+++ streamtuner.spec	23 Nov 2006 09:04:05 -0000	1.9
@@ -11,7 +11,7 @@
 Patch3: %{name}-%{version}-pkgconfig.patch
 License: BSD
 Group: Applications/Internet
-Requires: python, pygtk2, htmlview, bmp, xterm
+Requires: python, pygtk2, htmlview, audacious, xterm
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
@@ -116,8 +116,10 @@
 
 
 %changelog
-* Mon Nov 06 2006 Jindrich Novy  - 0.99.99-14
-- rebuild against new curl
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-14
+- FC6 uses audacious instead beep-media-player
+- defaultconfig.patch changed
+- dependency changed
 
 * Fri Sep 15 2006 Matthias Haase  - 0.99.99-13
 - Rebuild for Fedora Extras 6



From fedora-extras-commits at redhat.com  Thu Nov 23 09:39:31 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 23 Nov 2006 04:39:31 -0500
Subject: rpms/k3d/devel .cvsignore, 1.7, 1.8 k3d.spec, 1.9, 1.10 sources, 1.7,
	1.8
Message-ID: <200611230939.kAN9dV7j019645@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19626

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Oct 2006 09:11:12 -0000	1.7
+++ .cvsignore	23 Nov 2006 09:39:00 -0000	1.8
@@ -1 +1 @@
-k3d-0.6.3.1-src.tar.bz2
+k3d-0.6.4.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- k3d.spec	10 Oct 2006 09:11:12 -0000	1.9
+++ k3d.spec	23 Nov 2006 09:39:00 -0000	1.10
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.3.1
+Version:        0.6.4.0
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Denis Leroy  - 0.6.4.0
+- Update to 0.6.4.0
+
 * Tue Oct 10 2006 Denis Leroy  - 0.6.3.1
 - Update to 0.6.3.1
 
@@ -198,4 +201,3 @@
 
 * Tue Mar  7 2006 Denis Leroy  - 0.5.0.39-1
 - First version
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Oct 2006 09:11:12 -0000	1.7
+++ sources	23 Nov 2006 09:39:00 -0000	1.8
@@ -1 +1 @@
-7f5b53711a02779e3f9c036bcc21483a  k3d-0.6.3.1-src.tar.bz2
+3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 09:47:53 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 23 Nov 2006 04:47:53 -0500
Subject: rpms/pstoedit/devel pstoedit.spec,1.3,1.4
Message-ID: <200611230947.kAN9lraB019714@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/pstoedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19699

Modified Files:
	pstoedit.spec 
Log Message:
Added EMF support


Index: pstoedit.spec
===================================================================
RCS file: /cvs/extras/rpms/pstoedit/devel/pstoedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pstoedit.spec	28 Aug 2006 11:37:46 -0000	1.3
+++ pstoedit.spec	23 Nov 2006 09:47:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pstoedit
 Version:        3.44
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -16,6 +16,7 @@
 BuildRequires:	dos2unix
 BuildRequires:	ghostscript
 BuildRequires:	plotutils-devel
+BuildRequires:	libEMF-devel
 
 %description
 Pstoedit converts PostScript and PDF files to various vector graphic
@@ -42,7 +43,7 @@
 dos2unix doc/*.htm doc/readme.txt
 
 %build
-%configure --disable-static --without-emf --without-swf
+%configure --disable-static --with-emf --without-swf
 make
 
 
@@ -83,6 +84,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Nov 22 2006 Denis Leroy  - 3.44-5
+- Added libEMF support
+
 * Mon Aug 28 2006 Denis Leroy  - 3.44-4
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 09:50:13 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 23 Nov 2006 04:50:13 -0500
Subject: rpms/pstoedit/FC-6 pstoedit.spec,1.3,1.4
Message-ID: <200611230950.kAN9oDDd019780@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/pstoedit/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19763

Modified Files:
	pstoedit.spec 
Log Message:
Added libEMF support


Index: pstoedit.spec
===================================================================
RCS file: /cvs/extras/rpms/pstoedit/FC-6/pstoedit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pstoedit.spec	28 Aug 2006 11:37:46 -0000	1.3
+++ pstoedit.spec	23 Nov 2006 09:49:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           pstoedit
 Version:        3.44
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -42,7 +42,7 @@
 dos2unix doc/*.htm doc/readme.txt
 
 %build
-%configure --disable-static --without-emf --without-swf
+%configure --disable-static --with-emf --without-swf
 make
 
 
@@ -83,6 +83,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Nov 23 2006 Denis Leroy  - 3.44-5
+- Added libEMF support
+
 * Mon Aug 28 2006 Denis Leroy  - 3.44-4
 - FE6 Rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 09:51:36 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 23 Nov 2006 04:51:36 -0500
Subject: rpms/pstoedit/FC-5 pstoedit.spec,1.2,1.3
Message-ID: <200611230951.kAN9paMc019850@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/pstoedit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19831

Modified Files:
	pstoedit.spec 
Log Message:
Added libEMF support


Index: pstoedit.spec
===================================================================
RCS file: /cvs/extras/rpms/pstoedit/FC-5/pstoedit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pstoedit.spec	18 Aug 2006 22:07:22 -0000	1.2
+++ pstoedit.spec	23 Nov 2006 09:51:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pstoedit
 Version:        3.44
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
@@ -13,6 +13,7 @@
 BuildRequires:	gd-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:	libpng-devel
+BuildRequires:  libEMF-devel
 BuildRequires:	dos2unix
 BuildRequires:	ghostscript
 BuildRequires:	plotutils-devel
@@ -42,7 +43,7 @@
 dos2unix doc/*.htm doc/readme.txt
 
 %build
-%configure --disable-static --without-emf --without-swf
+%configure --disable-static --with-emf --without-swf
 make
 
 
@@ -83,6 +84,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Nov 23 2006 Denis Leroy  - 3.44-4
+- Add support for libEMF
+
 * Fri Aug 18 2006 Denis Leroy  - 3.44-3
 - Added svg/libplot support
 



From fedora-extras-commits at redhat.com  Thu Nov 23 12:09:41 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 07:09:41 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.4,1.5
Message-ID: <200611231209.kANC9fdd029302@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29281

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkmozembedmm.spec	23 Nov 2006 06:16:00 -0000	1.4
+++ gtkmozembedmm.spec	23 Nov 2006 12:09:11 -0000	1.5
@@ -42,7 +42,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-%if %{!?fedora:6}%{?fedora} >= 6
+%if %{!?fedora} >= 6
 BuildRequires: gecko-devel = %{gecko_version}
 %else
 BuildRequires: mozilla-devel 
@@ -55,7 +55,7 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
-%if %{!?fedora:6}%{?fedora} >= 6
+%if %{!?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
 %endif
 %ifarch x86_64



From fedora-extras-commits at redhat.com  Thu Nov 23 12:12:43 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 07:12:43 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.5,1.6
Message-ID: <200611231212.kANCChPS029367@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29349

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtkmozembedmm.spec	23 Nov 2006 12:09:11 -0000	1.5
+++ gtkmozembedmm.spec	23 Nov 2006 12:12:13 -0000	1.6
@@ -19,12 +19,8 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-%if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: gecko-devel = %{gecko_version}
 Requires: gecko-libs = %{gecko_version}
-%else
-BuildRequires: mozilla-devel
-%endif
 BuildRequires:  automake >= 1.9.6
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -42,11 +38,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-%if %{!?fedora} >= 6
 BuildRequires: gecko-devel = %{gecko_version}
-%else
-BuildRequires: mozilla-devel 
-%endif
 
 %description devel
 This package contains the headers that programmers will need to
@@ -55,9 +47,7 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
-%if %{!?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
-%endif
 %ifarch x86_64
 # correct a path issue that prevent gtkmozembedmm to build on x86_64
 %{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure



From fedora-extras-commits at redhat.com  Thu Nov 23 12:13:27 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:13:27 -0500
Subject: rpms/streamtuner/FC-6 streamtuner.spec,1.7,1.8
Message-ID: <200611231213.kANCDR0D029418@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29373

Modified Files:
	streamtuner.spec 
Log Message:
FC6 uses audacious instead beep-media-player - dependency changed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- streamtuner.spec	15 Sep 2006 08:34:08 -0000	1.7
+++ streamtuner.spec	23 Nov 2006 12:12:57 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 13%{?dist}
+Release: 14%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -11,7 +11,7 @@
 Patch3: %{name}-%{version}-pkgconfig.patch
 License: BSD
 Group: Applications/Internet
-Requires: python, pygtk2, htmlview, bmp, xterm
+Requires: python, pygtk2, htmlview, audacious, xterm
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
@@ -116,6 +116,11 @@
 
 
 %changelog
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-14
+- FC6 uses audacious instead beep-media-player
+- defaultconfig.patch changed
+- dependency changed
+
 * Fri Sep 15 2006 Matthias Haase  - 0.99.99-13
 - Rebuild for Fedora Extras 6
 



From fedora-extras-commits at redhat.com  Thu Nov 23 12:15:43 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:15:43 -0500
Subject: rpms/streamtuner/FC-6 streamtuner-0.99.99-defaultconfig.patch, 1.1, 
	1.2
Message-ID: <200611231215.kANCFhCH029492@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29474

Modified Files:
	streamtuner-0.99.99-defaultconfig.patch 
Log Message:
FC6 uses audacious instead beep-media-player - defaultconfig.patch changed

streamtuner-0.99.99-defaultconfig.patch:

Index: streamtuner-0.99.99-defaultconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner-0.99.99-defaultconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner-0.99.99-defaultconfig.patch	6 Jan 2006 13:37:47 -0000	1.1
+++ streamtuner-0.99.99-defaultconfig.patch	23 Nov 2006 12:15:13 -0000	1.2
@@ -1,5 +1,5 @@
 --- src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
-+++ src/plugins/live365/live365.c	2005-12-29 12:49:29.000000000 +0100
++++ src/plugins/live365/live365.c	2006-11-23 10:10:11.000000000 +0100
 @@ -1410,8 +1410,8 @@
    init_handler();
  
@@ -7,33 +7,33 @@
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
  
    return TRUE;
  }
 
 --- src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
-+++ src/plugins/local/local.c	2005-12-29 12:50:21.000000000 +0100
++++ src/plugins/local/local.c	2006-11-23 10:10:11.000000000 +0100
 @@ -1057,8 +1057,8 @@
  
    init_handler();
  
 -  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
  
    return TRUE;
  }
 
 --- src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
-+++ src/plugins/shoutcast/shoutcast.c	2005-12-29 12:48:50.000000000 +0100
++++ src/plugins/shoutcast/shoutcast.c	2006-11-23 10:10:11.000000000 +0100
 @@ -959,9 +959,9 @@
  
    init_handler();
    
 -  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
++  st_action_register("play-m3u", _("Listen to a .m3u file"), "audacious %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
@@ -42,19 +42,19 @@
  }
 
 --- src/plugins/xiph/xiph.c	2004-12-13 10:57:33.000000000 +0100
-+++ src/plugins/xiph/xiph.c	2005-12-29 12:50:54.000000000 +0100
++++ src/plugins/xiph/xiph.c	2006-11-23 10:10:11.000000000 +0100
 @@ -957,7 +957,7 @@
    init_handler();
  
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
  
    return TRUE;
  }
 
 --- src/streamtuner/st-action.c	2004-12-18 10:56:42.000000000 +0100
-+++ src/streamtuner/st-action.c	2005-12-29 12:41:20.000000000 +0100
++++ src/streamtuner/st-action.c	2006-11-23 10:10:11.000000000 +0100
 @@ -123,7 +123,7 @@
  {
    actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
@@ -66,13 +66,13 @@
  
 
 --- src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
-+++ src/streamtuner/st-preselections.c	2005-12-29 12:04:04.000000000 +0100
++++ src/streamtuner/st-preselections.c	2006-11-23 10:10:11.000000000 +0100
 @@ -390,9 +390,9 @@
  {
    st_preselections_init_handler();
    
 -  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
++  st_action_register("play-stream", _("Listen to a stream"), "audacious %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");



From fedora-extras-commits at redhat.com  Thu Nov 23 12:20:43 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:20:43 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.9,1.10
Message-ID: <200611231220.kANCKhrx029561@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29544

Modified Files:
	streamtuner.spec 
Log Message:
bump up release


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- streamtuner.spec	23 Nov 2006 09:04:05 -0000	1.9
+++ streamtuner.spec	23 Nov 2006 12:20:13 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 14%{?dist}
+Release: 15%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-15
+- bump up release 
+
 * Thu Nov 23 2006 Matthias Haase  - 0.99.99-14
 - FC6 uses audacious instead beep-media-player
 - defaultconfig.patch changed



From fedora-extras-commits at redhat.com  Thu Nov 23 12:32:11 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:32:11 -0500
Subject: rpms/streamtuner/FC-6 streamtuner.spec,1.8,1.9
Message-ID: <200611231232.kANCWBlg029718@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29700

Modified Files:
	streamtuner.spec 
Log Message:
bump up release


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- streamtuner.spec	23 Nov 2006 12:12:57 -0000	1.8
+++ streamtuner.spec	23 Nov 2006 12:31:41 -0000	1.9
@@ -120,6 +120,7 @@
 - FC6 uses audacious instead beep-media-player
 - defaultconfig.patch changed
 - dependency changed
+- bump up release
 
 * Fri Sep 15 2006 Matthias Haase  - 0.99.99-13
 - Rebuild for Fedora Extras 6



From fedora-extras-commits at redhat.com  Thu Nov 23 12:46:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 07:46:34 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.6,1.7
Message-ID: <200611231246.kANCkYca029890@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29857

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkmozembedmm.spec	23 Nov 2006 12:12:13 -0000	1.6
+++ gtkmozembedmm.spec	23 Nov 2006 12:46:04 -0000	1.7
@@ -1,7 +1,6 @@
-%define gecko_version 1.8.1
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        6%{?dist}
+Release:        5%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -19,8 +18,12 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-BuildRequires: gecko-devel = %{gecko_version}
-Requires: gecko-libs = %{gecko_version}
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: gecko-devel 
+Requires: gecko-libs = 2.0
+%else
+BuildRequires: mozilla-devel
+%endif
 BuildRequires:  automake >= 1.9.6
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -38,7 +41,11 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-BuildRequires: gecko-devel = %{gecko_version}
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: gecko-devel
+%else
+BuildRequires: mozilla-devel 
+%endif
 
 %description devel
 This package contains the headers that programmers will need to
@@ -47,7 +54,9 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
+%if %{!?fedora:6}%{?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
+%endif
 %ifarch x86_64
 # correct a path issue that prevent gtkmozembedmm to build on x86_64
 %{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure
@@ -96,9 +105,6 @@
 
 
 %changelog
-* Thu Nov 23 2006 Karl  - 1.4.2.cvs20060817-6
-- Fixed build issue in rawhide
-
 * Sun Nov 12 2006 Karl  - 1.4.2.cvs20060817-5
 - Fixed x86_64 build issue.
 



From fedora-extras-commits at redhat.com  Thu Nov 23 12:46:52 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 07:46:52 -0500
Subject: rpms/streamtuner/FC-6 streamtuner.spec,1.9,1.10
Message-ID: <200611231246.kANCkqds029893@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29875

Modified Files:
	streamtuner.spec 
Log Message:
bump up release again


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- streamtuner.spec	23 Nov 2006 12:31:41 -0000	1.9
+++ streamtuner.spec	23 Nov 2006 12:46:22 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 14%{?dist}
+Release: 14%{?dist}.1
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-14.1
+- bump up release again
+
 * Thu Nov 23 2006 Matthias Haase  - 0.99.99-14
 - FC6 uses audacious instead beep-media-player
 - defaultconfig.patch changed



From fedora-extras-commits at redhat.com  Thu Nov 23 13:07:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 23 Nov 2006 08:07:39 -0500
Subject: rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.7,1.8
Message-ID: <200611231307.kAND7dKl000593@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv578

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkmozembedmm.spec	23 Nov 2006 12:46:04 -0000	1.7
+++ gtkmozembedmm.spec	23 Nov 2006 13:07:08 -0000	1.8
@@ -1,6 +1,7 @@
+%define gecko_ver 1.8.1
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -18,12 +19,8 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-%if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel 
-Requires: gecko-libs = 2.0
-%else
-BuildRequires: mozilla-devel
-%endif
+BuildRequires: gecko-devel = %{gecko_ver}
+Requires: gecko-libs = %{gecko_ver}
 BuildRequires:  automake >= 1.9.6
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -41,11 +38,8 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-%if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel
-%else
-BuildRequires: mozilla-devel 
-%endif
+BuildRequires: gecko-devel = %{gecko_ver}
+
 
 %description devel
 This package contains the headers that programmers will need to
@@ -54,9 +48,7 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
-%if %{!?fedora:6}%{?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
-%endif
 %ifarch x86_64
 # correct a path issue that prevent gtkmozembedmm to build on x86_64
 %{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure



From fedora-extras-commits at redhat.com  Thu Nov 23 13:18:40 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Thu, 23 Nov 2006 08:18:40 -0500
Subject: rpms/streamtuner/FC-6 streamtuner.spec,1.10,1.11
Message-ID: <200611231318.kANDIeAu000697@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv676

Modified Files:
	streamtuner.spec 
Log Message:
bump up release once again proper formated


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-6/streamtuner.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- streamtuner.spec	23 Nov 2006 12:46:22 -0000	1.10
+++ streamtuner.spec	23 Nov 2006 13:18:10 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 14%{?dist}.1
+Release: 14.2%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Matthias Haase  - 0.99.99-14.2
+- bum up release once again proper formated
+
 * Thu Nov 23 2006 Matthias Haase  - 0.99.99-14.1
 - bump up release again
 



From fedora-extras-commits at redhat.com  Thu Nov 23 13:29:15 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:29:15 -0500
Subject: rpms/gcin/devel gcin_update.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec, 1.14, 1.15 im-client.patch,
	1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231329.kANDTFOj000824@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv795

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Added Files:
	gcin_update.patch 
Log Message:
update to 1.3.0.1

gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i scripts/noseeing-inst.tmp
@@ -109,6 +109,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
 * Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-3
 - add gcin129update.patch
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 06:49:04 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:28:44 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 06:49:04 -0000	1.9
+++ sources	23 Nov 2006 13:28:44 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 13:36:46 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 23 Nov 2006 08:36:46 -0500
Subject: rpms/d4x/devel d4x.spec,1.14,1.15
Message-ID: <200611231336.kANDakMA000932@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv911

Modified Files:
	d4x.spec 
Log Message:
Change man page rename to work when compression is set in /etc/man.config.



Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- d4x.spec	28 Aug 2006 09:21:09 -0000	1.14
+++ d4x.spec	23 Nov 2006 13:36:16 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
 Version: 2.5.7.1
-Release: 2%{?pre:.%{pre}}%{?dist}
+Release: 3%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
@@ -49,8 +49,7 @@
   share/nt.desktop
 
 # Rename the man page to match the binary name
-%{__mv} %{buildroot}%{_mandir}/man1/nt.1 \
-        %{buildroot}%{_mandir}/man1/d4x.1
+rename nt.1 d4x.1 %{buildroot}%{_mandir}/man1/nt.1*
 
 
 %clean
@@ -70,6 +69,9 @@
 
 
 %changelog
+* Tue Nov 21 2006 V??ctor Daniel  2.5.7.1-3
+- Change man page rename to work when compression is set in /etc/man.config.
+
 * Mon Aug 28 2006 Matthias Saou  2.5.7.1-2
 - FC6 rebuild.
 - Remove gcc-c++ build requirement, it's a default.



From fedora-extras-commits at redhat.com  Thu Nov 23 13:37:24 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:37:24 -0500
Subject: rpms/gcin/FC-6 .cvsignore, 1.9, 1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec,
	1.13, 1.14 im-client.patch, 1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231337.kANDbOPm000960@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv929

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Log Message:
update to 1.3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Nov 2006 06:58:05 -0000	1.9
+++ .cvsignore	23 Nov 2006 13:36:53 -0000	1.10
@@ -1 +1 @@
-gcin-1.2.9.tar.bz2
+gcin-1.3.0.1.tar.bz2


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 NewCJ3.cin
Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/NewCJ3.cin,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewCJ3.cin	17 Nov 2006 00:29:32 -0000	1.2
+++ NewCJ3.cin	23 Nov 2006 13:36:53 -0000	1.3
@@ -40,6 +40,32 @@
 ` ???	???????????????????????? gcin ????????? ` ????????????????????????
 , ???
 ,, ???
+,a ???????????????????????????
+,b ?????????????????????
+,c ?????????????????????
+,d ?????????????????????
+,e ???????????????????????????
+,f ????????????
+,g ????????????
+,h ????????????????????????
+,i ??????????????????
+,j ??????????????????
+,k ?????????????????????
+,l ?????????????????????
+,m ?????????????????????
+,n ?????????????????????
+,o ?????????????????????
+,p ?????????????????????
+,q ?????????????????????
+,r ?????????????????????
+,s ?????????????????????
+,t ?????????????????????
+,u ??????????????????
+,v ???????????????????????????
+,w ?????????????????????
+,x ???????????????????????????
+,y ???????????????????????????
+,z ??????
 . ???
 .. ???
 .. ???
@@ -168,39 +194,549 @@
 ]]] ???
 ]]] ???
 ;a ???
-;b ???
+;b ???
+;bb ???
 ;c ???
+;cu ???
 ;d ???
 ;e ???
 ;f ???
+;fh ???
 ;g ???
 ;h ???
 ;i ???
-;ii ??????
 ;i; ???
+;ia ??????
+;iai ?????????
+;iao ?????????
+;iau ?????????
+;ib ??????
+;ibi ?????????
+;ibo ?????????
+;ibu ?????????
+;id ??????
+;idi ?????????
+;idm ?????????
+;ido ?????????
+;idu ?????????
+;if ??????
+;ify ?????????
+;ig ??????
+;ih ??????
+;ihb ?????????
+;ihbp ????????????
+;ihp ?????????
+;ii ??????
+;iii ?????????
+;iio ?????????
+;iip ??????
+;iiu ?????????
+;ik ??????
+;il ??????
+;ili ?????????
+;ilo ?????????
+;ilu ?????????
+;im ??????
+;imb ??????
+;imd ?????????
+;imf ??????
+;imi ?????????
+;imm ?????????
+;imo ?????????
+;imu ?????????
+;imv ?????????
+;imz ?????????
+;io ??????
+;ip ??????
+;ipi ?????????
+;ipo ?????????
+;ipu ?????????
+;ir ??????
+;iri ?????????
+;irih ????????????
+;iro ?????????
+;iroh ????????????
+;iru ?????????
+;iruh ????????????
+;is ??????
+;isv ?????????
+;iu ??????
+;iv ??????
+;ivi ?????????
+;ivo ?????????
+;ivu ?????????
+;iy ??????
+;iz ??????
+;izi ?????????
+;izo ?????????
+;izu ?????????
+;izv ??????
 ;j ???
 ;k ???
 ;l ???
 ;l ???
-;l; ???
 ;m ???
 ;n ???
-;o ???
+;o ???
+;oa ??????
+;oai ?????????
+;oao ?????????
+;oau ?????????
+;ob ??????
+;obi ?????????
+;obo ?????????
+;obu ?????????
+;od ??????
+;odi ?????????
+;odm ?????????
+;odo ?????????
+;odu ?????????
+;of ??????
+;ofy ?????????
+;og ??????
+;oh ??????
+;ohb ?????????
+;ohbp ????????????
+;ohp ?????????
+;oi ??????
+;oii ?????????
+;oio ?????????
+;oip ??????
+;oiu ?????????
+;ok ??????
+;ol ??????
+;oli ?????????
+;olo ?????????
+;olu ?????????
+;om ??????
+;omb ??????
+;omd ?????????
+;omf ??????
+;omi ?????????
+;omm ?????????
+;omo ?????????
+;omu ?????????
+;omv ?????????
+;omz ?????????
+;oo ??????
+;op ??????
+;opi ?????????
+;opo ?????????
+;opu ?????????
+;or ??????
+;ori ?????????
+;orih ????????????
+;oro ?????????
+;oroh ????????????
+;oru ?????????
+;oruh ????????????
+;os ??????
+;osv ?????????
+;ou ??????
+;ov ??????
+;ovi ?????????
+;ovo ?????????
+;ovu ?????????
+;oy ??????
+;oz ??????
+;ozi ?????????
+;ozo ?????????
+;ozu ?????????
+;ozv ??????
 ;p ???
+;pu ???
[...20673 lines suppressed...]
+;ytje ????????????
+;ytjy ????????????
+;ytko ????????????
+;ytky ??????????????????
+;ytlj ????????????
+;ytmf ????????????
+;ytmg ????????????
+;ytml ????????????
+;ytmn ?????????????????????
+;ytmo ????????????
+;ytmw ????????????
+;ytnr ????????????
+;ytod ????????????
+;ytoh ????????????
+;ytoj ????????????
+;ytoo ????????????
+;ytqo ????????????
+;ytsy ????????????
+;ytth ????????????
+;ytto ????????????
+;ytty ????????????
+;ytve ????????????
+;ytwe ????????????
+;ytyq ????????????
+;ytyt ????????????
+;ytyy ????????????
+;yuah ????????????
+;yuar ????????????
+;yuee ????????????
+;yuee ????????????
+;yume ????????????
+;yuog ????????????
+;yuph ????????????
+;yuyh ????????????
+;yuyo ????????????
+;yvfy ????????????
+;yvfy ????????????
+;yvhw ????????????
+;yvid ????????????
+;yvjy ????????????
+;yvkq ????????????
+;yvlh ????????????
+;yvlt ????????????
+;yvmt ????????????
+;yvmv ????????????
+;yvmv ????????????
+;yvmv ????????????
+;yvol ????????????
+;yvot ????????????
+;yvoy ????????????
+;yvpp ????????????
+;yvqr ????????????
+;yvtm ????????????
+;yvva ????????????
+;yvvw ????????????
+;yvvy ????????????
+;yvya ????????????
+;yvyf ????????????
+;yvyg ????????????
+;yvym ????????????
+;yvyt ????????????
+;yvyv ???????????????
+;yvyw ????????????
+;ywhe ????????????
+;ywiy ????????????
+;ywkh ????????????
+;ywki ????????????
+;ywlo ????????????
+;ywmm ???????????????
+;ywmy ???????????????
+;ywnt ????????????
+;ywny ????????????
+;ywsj ????????????
+;ywyt ????????????
+;yyay ????????????
+;yybf ????????????
+;yycr ????????????
+;yycr ????????????
+;yydc ???????????????
+;yydd ????????????
+;yyde ????????????
+;yydt ????????????
+;yyei ????????????
+;yyen ????????????
+;yyeu ????????????
+;yyff ????????????
+;yygg ????????????
+;yygg ????????????
+;yyha ????????????
+;yyhh ????????????
+;yyhh ????????????
+;yyhj ????????????
+;yyhk ????????????
+;yyhl ????????????
+;yyhq ????????????
+;yyht ????????????
+;yyhu ????????????
+;yyhv ????????????
+;yyhw ????????????
+;yyhy ????????????
+;yyhy ????????????
+;yyia ????????????
+;yyif ????????????
+;yyiw ????????????
+;yyiw ????????????
+;yyjj ????????????
+;yyjj ????????????
+;yyjm ????????????
+;yyjo ????????????
+;yyjs ????????????
+;yyjy ????????????
+;yyjy ????????????
+;yyjy ????????????
+;yykh ????????????
+;yykl ????????????
+;yykp ????????????
+;yyky ????????????
+;yyky ????????????
+;yyky ????????????
+;yylb ????????????
+;yyma ????????????
+;yymb ????????????
+;yymb ??????????????????
+;yymb ???????????????
+;yymb ????????????
+;yymg ????????????
+;yymh ????????????
+;yymi ????????????
+;yymm ????????????
+;yymm ????????????
+;yymo ????????????
+;yymt ????????????
+;yymt ????????????
+;yymv ??????????????????
+;yymw ????????????
+;yymy ????????????
+;yymy ????????????
+;yynh ????????????
+;yynj ????????????
+;yynn ????????????
+;yynv ????????????
+;yynv ????????????
+;yyny ????????????
+;yyoa ????????????
+;yyoh ????????????
+;yyoh ????????????
+;yyoh ????????????
+;yyoj ????????????
+;yyol ????????????
+;yyoo ????????????
+;yyop ????????????
+;yyor ????????????
+;yyos ????????????
+;yyos ????????????
+;yyot ????????????
+;yyov ????????????
+;yyoy ????????????
+;yyoy ???????????????
+;yypb ????????????
+;yypd ????????????
+;yyph ????????????
+;yyqb ????????????
+;yyqb ????????????
+;yyqo ????????????
+;yyqq ????????????
+;yyrm ????????????
+;yyru ????????????
+;yysn ????????????
+;yysn ????????????
+;yysq ????????????
+;yytb ????????????
+;yytj ????????????
+;yytj ????????????
+;yytj ????????????
+;yytm ????????????
+;yyto ????????????
+;yytq ????????????
+;yytt ????????????
+;yyty ????????????
+;yyvc ????????????
+;yyvv ????????????
+;yyvv ????????????
+;yyvy ????????????
+;yywg ????????????
+;yyyc ????????????
+;yyyg ????????????
+;yyyj ????????????
+;yyyl ????????????
+;yyym ????????????
+;yyym ????????????
+;yyyn ????????????
+;yyyt ????????????
+;yyyt ????????????
+;yyyu ????????????
+;yyyv ????????????
+;yyyy ????????????
+;yyyy ??????????????????
+;yyyy ????????????
+zhaou ????????????????????????????????????????????????????????????????????????
 %chardef end


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec	17 Nov 2006 00:29:32 -0000	1.13
+++ gcin.spec	23 Nov 2006 13:36:53 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcin
-Version:        1.2.9
-Release:        2%{?dist}
+Version:        1.3.0.1
+Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
-Patch5:         gcin129update.patch
+Patch5:         gcin_update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,14 +29,14 @@
 Gcin is an input method for Traditional Chinese with a GTK user interface.
 
 %prep
-%setup -q -a 2
+%setup -q
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
 %patch5 -p1 -b .up
-cp -f gcinicon/gtab.list data/
-cp -f gcinicon/*.png icons/
+#cp -f gcinicon/gtab.list data/
+#cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
@@ -109,8 +109,13 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
-* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-3
 - add gcin129update.patch
+
+* Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
 - update NewCJ3.cin
 
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-1

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 06:58:05 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:36:53 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 06:58:05 -0000	1.9
+++ sources	23 Nov 2006 13:36:53 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 13:40:15 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:40:15 -0500
Subject: rpms/gcin/FC-5 .cvsignore, 1.9, 1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec,
	1.13, 1.14 im-client.patch, 1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231340.kANDeFKs001044@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1010

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Log Message:
update to 1.3.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Nov 2006 07:07:12 -0000	1.9
+++ .cvsignore	23 Nov 2006 13:39:44 -0000	1.10
@@ -1 +1 @@
-gcin-1.2.9.tar.bz2
+gcin-1.3.0.1.tar.bz2


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 NewCJ3.cin
Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/NewCJ3.cin,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewCJ3.cin	17 Nov 2006 00:32:51 -0000	1.2
+++ NewCJ3.cin	23 Nov 2006 13:39:44 -0000	1.3
@@ -40,6 +40,32 @@
 ` ???	???????????????????????? gcin ????????? ` ????????????????????????
 , ???
 ,, ???
+,a ???????????????????????????
+,b ?????????????????????
+,c ?????????????????????
+,d ?????????????????????
+,e ???????????????????????????
+,f ????????????
+,g ????????????
+,h ????????????????????????
+,i ??????????????????
+,j ??????????????????
+,k ?????????????????????
+,l ?????????????????????
+,m ?????????????????????
+,n ?????????????????????
+,o ?????????????????????
+,p ?????????????????????
+,q ?????????????????????
+,r ?????????????????????
+,s ?????????????????????
+,t ?????????????????????
+,u ??????????????????
+,v ???????????????????????????
+,w ?????????????????????
+,x ???????????????????????????
+,y ???????????????????????????
+,z ??????
 . ???
 .. ???
 .. ???
@@ -168,39 +194,549 @@
 ]]] ???
 ]]] ???
 ;a ???
-;b ???
+;b ???
+;bb ???
 ;c ???
+;cu ???
 ;d ???
 ;e ???
 ;f ???
+;fh ???
 ;g ???
 ;h ???
 ;i ???
-;ii ??????
 ;i; ???
+;ia ??????
+;iai ?????????
+;iao ?????????
+;iau ?????????
+;ib ??????
+;ibi ?????????
+;ibo ?????????
+;ibu ?????????
+;id ??????
+;idi ?????????
+;idm ?????????
+;ido ?????????
+;idu ?????????
+;if ??????
+;ify ?????????
+;ig ??????
+;ih ??????
+;ihb ?????????
+;ihbp ????????????
+;ihp ?????????
+;ii ??????
+;iii ?????????
+;iio ?????????
+;iip ??????
+;iiu ?????????
+;ik ??????
+;il ??????
+;ili ?????????
+;ilo ?????????
+;ilu ?????????
+;im ??????
+;imb ??????
+;imd ?????????
+;imf ??????
+;imi ?????????
+;imm ?????????
+;imo ?????????
+;imu ?????????
+;imv ?????????
+;imz ?????????
+;io ??????
+;ip ??????
+;ipi ?????????
+;ipo ?????????
+;ipu ?????????
+;ir ??????
+;iri ?????????
+;irih ????????????
+;iro ?????????
+;iroh ????????????
+;iru ?????????
+;iruh ????????????
+;is ??????
+;isv ?????????
+;iu ??????
+;iv ??????
+;ivi ?????????
+;ivo ?????????
+;ivu ?????????
+;iy ??????
+;iz ??????
+;izi ?????????
+;izo ?????????
+;izu ?????????
+;izv ??????
 ;j ???
 ;k ???
 ;l ???
 ;l ???
-;l; ???
 ;m ???
 ;n ???
-;o ???
+;o ???
+;oa ??????
+;oai ?????????
+;oao ?????????
+;oau ?????????
+;ob ??????
+;obi ?????????
+;obo ?????????
+;obu ?????????
+;od ??????
+;odi ?????????
+;odm ?????????
+;odo ?????????
+;odu ?????????
+;of ??????
+;ofy ?????????
+;og ??????
+;oh ??????
+;ohb ?????????
+;ohbp ????????????
+;ohp ?????????
+;oi ??????
+;oii ?????????
+;oio ?????????
+;oip ??????
+;oiu ?????????
+;ok ??????
+;ol ??????
+;oli ?????????
+;olo ?????????
+;olu ?????????
+;om ??????
+;omb ??????
+;omd ?????????
+;omf ??????
+;omi ?????????
+;omm ?????????
+;omo ?????????
+;omu ?????????
+;omv ?????????
+;omz ?????????
+;oo ??????
+;op ??????
+;opi ?????????
+;opo ?????????
+;opu ?????????
+;or ??????
+;ori ?????????
+;orih ????????????
+;oro ?????????
+;oroh ????????????
+;oru ?????????
+;oruh ????????????
+;os ??????
+;osv ?????????
+;ou ??????
+;ov ??????
+;ovi ?????????
+;ovo ?????????
+;ovu ?????????
+;oy ??????
+;oz ??????
+;ozi ?????????
+;ozo ?????????
+;ozu ?????????
+;ozv ??????
 ;p ???
+;pu ???
[...20673 lines suppressed...]
+;ytje ????????????
+;ytjy ????????????
+;ytko ????????????
+;ytky ??????????????????
+;ytlj ????????????
+;ytmf ????????????
+;ytmg ????????????
+;ytml ????????????
+;ytmn ?????????????????????
+;ytmo ????????????
+;ytmw ????????????
+;ytnr ????????????
+;ytod ????????????
+;ytoh ????????????
+;ytoj ????????????
+;ytoo ????????????
+;ytqo ????????????
+;ytsy ????????????
+;ytth ????????????
+;ytto ????????????
+;ytty ????????????
+;ytve ????????????
+;ytwe ????????????
+;ytyq ????????????
+;ytyt ????????????
+;ytyy ????????????
+;yuah ????????????
+;yuar ????????????
+;yuee ????????????
+;yuee ????????????
+;yume ????????????
+;yuog ????????????
+;yuph ????????????
+;yuyh ????????????
+;yuyo ????????????
+;yvfy ????????????
+;yvfy ????????????
+;yvhw ????????????
+;yvid ????????????
+;yvjy ????????????
+;yvkq ????????????
+;yvlh ????????????
+;yvlt ????????????
+;yvmt ????????????
+;yvmv ????????????
+;yvmv ????????????
+;yvmv ????????????
+;yvol ????????????
+;yvot ????????????
+;yvoy ????????????
+;yvpp ????????????
+;yvqr ????????????
+;yvtm ????????????
+;yvva ????????????
+;yvvw ????????????
+;yvvy ????????????
+;yvya ????????????
+;yvyf ????????????
+;yvyg ????????????
+;yvym ????????????
+;yvyt ????????????
+;yvyv ???????????????
+;yvyw ????????????
+;ywhe ????????????
+;ywiy ????????????
+;ywkh ????????????
+;ywki ????????????
+;ywlo ????????????
+;ywmm ???????????????
+;ywmy ???????????????
+;ywnt ????????????
+;ywny ????????????
+;ywsj ????????????
+;ywyt ????????????
+;yyay ????????????
+;yybf ????????????
+;yycr ????????????
+;yycr ????????????
+;yydc ???????????????
+;yydd ????????????
+;yyde ????????????
+;yydt ????????????
+;yyei ????????????
+;yyen ????????????
+;yyeu ????????????
+;yyff ????????????
+;yygg ????????????
+;yygg ????????????
+;yyha ????????????
+;yyhh ????????????
+;yyhh ????????????
+;yyhj ????????????
+;yyhk ????????????
+;yyhl ????????????
+;yyhq ????????????
+;yyht ????????????
+;yyhu ????????????
+;yyhv ????????????
+;yyhw ????????????
+;yyhy ????????????
+;yyhy ????????????
+;yyia ????????????
+;yyif ????????????
+;yyiw ????????????
+;yyiw ????????????
+;yyjj ????????????
+;yyjj ????????????
+;yyjm ????????????
+;yyjo ????????????
+;yyjs ????????????
+;yyjy ????????????
+;yyjy ????????????
+;yyjy ????????????
+;yykh ????????????
+;yykl ????????????
+;yykp ????????????
+;yyky ????????????
+;yyky ????????????
+;yyky ????????????
+;yylb ????????????
+;yyma ????????????
+;yymb ????????????
+;yymb ??????????????????
+;yymb ???????????????
+;yymb ????????????
+;yymg ????????????
+;yymh ????????????
+;yymi ????????????
+;yymm ????????????
+;yymm ????????????
+;yymo ????????????
+;yymt ????????????
+;yymt ????????????
+;yymv ??????????????????
+;yymw ????????????
+;yymy ????????????
+;yymy ????????????
+;yynh ????????????
+;yynj ????????????
+;yynn ????????????
+;yynv ????????????
+;yynv ????????????
+;yyny ????????????
+;yyoa ????????????
+;yyoh ????????????
+;yyoh ????????????
+;yyoh ????????????
+;yyoj ????????????
+;yyol ????????????
+;yyoo ????????????
+;yyop ????????????
+;yyor ????????????
+;yyos ????????????
+;yyos ????????????
+;yyot ????????????
+;yyov ????????????
+;yyoy ????????????
+;yyoy ???????????????
+;yypb ????????????
+;yypd ????????????
+;yyph ????????????
+;yyqb ????????????
+;yyqb ????????????
+;yyqo ????????????
+;yyqq ????????????
+;yyrm ????????????
+;yyru ????????????
+;yysn ????????????
+;yysn ????????????
+;yysq ????????????
+;yytb ????????????
+;yytj ????????????
+;yytj ????????????
+;yytj ????????????
+;yytm ????????????
+;yyto ????????????
+;yytq ????????????
+;yytt ????????????
+;yyty ????????????
+;yyvc ????????????
+;yyvv ????????????
+;yyvv ????????????
+;yyvy ????????????
+;yywg ????????????
+;yyyc ????????????
+;yyyg ????????????
+;yyyj ????????????
+;yyyl ????????????
+;yyym ????????????
+;yyym ????????????
+;yyyn ????????????
+;yyyt ????????????
+;yyyt ????????????
+;yyyu ????????????
+;yyyv ????????????
+;yyyy ????????????
+;yyyy ??????????????????
+;yyyy ????????????
+zhaou ????????????????????????????????????????????????????????????????????????
 %chardef end


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec	17 Nov 2006 00:32:51 -0000	1.13
+++ gcin.spec	23 Nov 2006 13:39:45 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gcin
-Version:        1.2.9
-Release:        2%{?dist}
+Version:        1.3.0.1
+Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
-Patch5:         gcin129update.patch
+Patch5:         gcin_update.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,14 +29,14 @@
 Gcin is an input method for Traditional Chinese with a GTK user interface.
 
 %prep
-%setup -q -a 2
+%setup -q
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
 %patch5 -p1 -b .up
-cp -f gcinicon/gtab.list data/
-cp -f gcinicon/*.png icons/
+#cp -f gcinicon/gtab.list data/
+#cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
 echo "#!/bin/bash" > scripts/noseeing-inst.tmp
@@ -109,6 +109,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
 * Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
 - add gcin129update.patch
 - update NewCJ3.cin

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 07:07:12 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:39:45 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 07:07:12 -0000	1.9
+++ sources	23 Nov 2006 13:39:45 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 13:43:23 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:43:23 -0500
Subject: rpms/gcin/FC-6 gcin_update.patch,NONE,1.1 gcin.spec,1.14,1.15
Message-ID: <200611231343.kANDhNsj001125@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1106

Modified Files:
	gcin.spec 
Added Files:
	gcin_update.patch 
Log Message:
update to 1.3.0.1

gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i - 1.3.0.1-2
+- rebuild
+
 * Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
 - update to 1.3.0.1
 



From fedora-extras-commits at redhat.com  Thu Nov 23 13:44:33 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:44:33 -0500
Subject: rpms/gcin/FC-5 gcin_update.patch,NONE,1.1
Message-ID: <200611231344.kANDiXMd001185@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1178

Added Files:
	gcin_update.patch 
Log Message:
add gcin_update.patch


gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1249

Modified Files:
	gcin.spec 
Log Message:
update to 1.3.0.1


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcin.spec	23 Nov 2006 13:28:44 -0000	1.15
+++ gcin.spec	23 Nov 2006 13:46:07 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -109,6 +109,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-2
+- rebuild
+
 * Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
 - update to 1.3.0.1
 



From fedora-extras-commits at redhat.com  Thu Nov 23 13:50:25 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:50:25 -0500
Subject: rpms/gcin/FC-4 gcin_update.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec, 1.14, 1.15 im-client.patch,
	1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231350.kANDoPQP001349@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1318

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Added Files:
	gcin_update.patch 
Log Message:
update to 1.3.0.1

gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i scripts/noseeing-inst.tmp
@@ -107,6 +107,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
 * Fri Nov 17 2006 Chung-Yen Chang  - 1.2.9-2
 - add gcin129update.patch
 - update NewCJ3.cin

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 07:14:44 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:49:54 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 07:14:44 -0000	1.9
+++ sources	23 Nov 2006 13:49:54 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 13:55:44 2006
From: fedora-extras-commits at redhat.com (Chung-Yen Chang (candyz))
Date: Thu, 23 Nov 2006 08:55:44 -0500
Subject: rpms/gcin/FC-3 gcin_update.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 NewCJ3.cin, 1.1, 1.2 gcin.spec, 1.13, 1.14 im-client.patch,
	1.3, 1.4 sources, 1.9, 1.10
Message-ID: <200611231355.kANDtip9001442@cvs-int.fedora.redhat.com>

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec im-client.patch sources 
Added Files:
	gcin_update.patch 
Log Message:
update to 1.3.0.1

gcin_update.patch:

--- NEW FILE gcin_update.patch ---
diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
--- gcin-1.3.0.1.orig/gcin.h	2006-10-05 14:05:00.000000000 +0800
+++ gcin-1.3.0.1/gcin.h	2006-11-22 18:00:42.000000000 +0800
@@ -117,6 +117,7 @@
 gboolean utf8_str_eq(char *a, char *b, int len);
 void utf8cpyN(char *t, char *s, int N);
 int utf8_str_N(char *str);
+void utf8cpyn(char *t, char *s, int n);
 
 void get_gcin_dir(char *tt);
 Atom get_gcin_atom(Display *dpy);
diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
--- gcin-1.3.0.1.orig/gtab.c	2006-11-20 13:04:59.000000000 +0800
+++ gcin-1.3.0.1/gtab.c	2006-11-22 18:00:14.000000000 +0800
@@ -80,13 +80,15 @@
   return strlen(a) - strlen(b);
 }
 
-#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
-#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
+#define tblch(i) tblch2(cur_inmd, i)
+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
 void set_key_codes_label(char *s);
 
 void lookup_gtab(char *ch, char out[])
 {
-  char *tbuf[32];
+  char *tbuf[128];
   int tbufN=0;
   INMD *tinmd = &inmd[default_input_method];
 
@@ -98,7 +100,7 @@
 
   int i;
   for(i=0; i < tinmd->DefChars; i++) {
-    char *chi = tblch(i);
+    char *chi = tblch2(tinmd, i);
 
     if (!(chi[0] & 0x80))
       continue;
@@ -112,7 +114,7 @@
     int tlen=0;
     char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
 
-    for(j=Max_tab_key_num - 1; j>=0; j--) {
+    for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
 
       int sh = j * KeyBits;
       int k = (key >> sh) & 0x3f;
@@ -516,8 +518,6 @@
 
   fclose(fp);
 
-  inp->max_keyN = 5;
-
   if (usenow) {
     cur_inmd=inp;
 //    reset_inp();
@@ -525,7 +525,6 @@
     DispInArea();
   }
 
-
   dbg("key64: %d\n", inp->key64);
 
   if (gtab_space_auto_first == GTAB_space_auto_first_none)
@@ -689,7 +688,9 @@
 
 static u_int vmask[]=
 { 0,
-  0x3f<<24,  (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
+ (0x3f<<24),
+ (0x3f<<24)|(0x3f<<18),
+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
  (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
 };
@@ -881,7 +882,9 @@
         strcat(strcat(tt, seltab[i]), " ");
         strcat(tt, "");
       } else {
-        strcat(strcat(tt, seltab[i]), " ");
+        char uu[512];
+        utf8cpyn(uu, seltab[i], 6);
+        strcat(strcat(tt, uu), " ");
       }
     } else {
       extern gboolean b_use_full_space;
@@ -960,14 +963,13 @@
 
   bzero(seltab_phrase, sizeof(seltab_phrase));
 
-
 //  dbg("uuuuu %x %x\n", key, kbstate);
 
   if (!cur_inmd)
     return 0;
 
   if (kbstate & (Mod1Mask|ControlMask)) {
-      return 0;
+    return 0;
   }
 
 
@@ -1074,7 +1076,6 @@
 
       if (wild_mode) {
         // request from tetralet
-        dbg("zzz %d %d\n",wild_page, defselN);
         if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
           sel1st_i = 0;
           goto direct_select;
@@ -1189,7 +1190,6 @@
 
       pselkey=ptr_selkey(key);
 
-
       if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
 //        dbg("%x %x sel1st_i:%d  '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
         if (seltab[sel1st_i][0])
@@ -1198,7 +1198,6 @@
         return 0;
       }
 
-
       inkey=cur_inmd->keymap[key];
 
 //      dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
@@ -1308,8 +1307,9 @@
             return 0;
         }
 
-        if (defselN)
+        if (defselN) {
           goto YYYY;
+        }
      }
   } /* switch */
 
@@ -1347,19 +1347,11 @@
     s1++;
 
   last_idx=s1;
+
 #if 0
-  dbg("inch %d %d   val:%x\n", inch[0], inch[1], val);
-  u_char *tbl_ch = tblch(s1);
-  dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-     ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
-
-  dbg("pselkey:%x  %d  defselN:%d\n", pselkey,
-       (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-       defselN);
+  dbg("ci:%d  %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
 #endif
 
-  vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
-
   if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
                   ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
       (pselkey && ( pendkey || spc_pressed)) ) ) {
@@ -1412,7 +1404,6 @@
   j=s1;
 
   if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-    int shiftb=(KEY_N - 1 -ci) * KeyBits;
 
     exa_match=0;
     bzero(seltab, sizeof(seltab));
@@ -1423,32 +1414,29 @@
       j++;
     }
 
-
     defselN=exa_match;
 
     if (defselN > cur_inmd->M_DUP_SEL)
       defselN--;
 
+    int shiftb=(KEY_N - 1 -ci) * KeyBits;
+
     if (gtab_disp_partial_match)
-    while((CONVT2(cur_inmd, j) & vmask[ci])==val && jkeycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
       u_char *tbl_ch = tblch(j);
-
+#if 0
+      dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
+#endif
       if (!seltab[fff][0] || seltab_phrase[fff] ||
            (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
 #if 0
-        if (tbl_ch[0] >= 0x80) {
-          bchcpy(seltab[fff], tbl_ch);
-          defselN++;
-        }
-        else
-        if (!seltab[fff][0]) {
-          load_phr(j, seltab[fff]);
-          seltab_phrase[fff] = TRUE;
-        }
-#endif
         if (!(seltab_phrase[fff] = load_seltab(j, fff)))
           defselN++;
+#else
+        seltab_phrase[fff] = load_seltab(j, fff);
+        defselN++;
+#endif
       }
 
       j++;
diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
--- gcin-1.3.0.1.orig/locale.c	2006-10-05 14:05:16.000000000 +0800
+++ gcin-1.3.0.1/locale.c	2006-11-22 18:00:41.000000000 +0800
@@ -165,3 +165,19 @@
 
   return N;
 }
+
+void utf8cpyn(char *t, char *s, int n)
+{
+  int tn=0;
+  int i;
+
+  for (i=0; i < n && *s; i++) {
+    int sz = utf8_sz(s);
+
+    memcpy(t+tn, s, sz);
+    tn+=sz;
+    s+=sz;
+  }
+
+  t[tn]=0;
+}
diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
--- gcin-1.3.0.1.orig/tsin-parse.c	2006-10-20 15:06:34.000000000 +0800
+++ gcin-1.3.0.1/tsin-parse.c	2006-11-22 11:08:59.000000000 +0800
@@ -96,7 +96,7 @@
       if (i < plen)
         continue;
 
-      int score;
+      float score;
 
       score = plen;
       if (match_len > plen) {
@@ -116,7 +116,7 @@
         continue;
       }
 
-      score = usecount + 50 * plen * plen;
+      score = (float)usecount + 200 * plen * plen * plen;
 
       if (pbestscore >= score)
         continue;
--- gcin-1.3.0.1/gcin2tab.c.orig	2006-08-20 16:26:34.000000000 +0800
+++ gcin-1.3.0.1/gcin2tab.c	2006-11-23 17:31:11.000000000 +0800
@@ -13,7 +13,7 @@
 #include 
 #include "gcin.h"
 #include "gtab.h"
-
+#include "gcin-endian.h"
 
 FILE *fr, *fw;
 int lineno;
@@ -149,13 +149,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -166,13 +160,7 @@
   if (a->key > b->key) return 1;
   if (a->key < b->key) return -1;
 
-#if FREEBSD
-  if (a->oseq > b->oseq) return 1;
-  if (a->oseq < b->oseq) return -1;
-  return 0;
-#else
   return a->oseq - b->oseq;
-#endif
 }
 
 
@@ -423,7 +411,6 @@
 
     if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
       char out[CH_SZ+1];
-      int u8len = utf8_sz(arg);
 
       bzero(out, sizeof(out));
       memcpy(out, arg, len);
@@ -446,7 +433,7 @@
       }
 
       if (len > MAX_CIN_PHR)
-        p_err("phrase too long: %s\n", arg);
+        p_err("phrase too long: %s  max:%d bytes\n", arg, MAX_CIN_PHR);
 
       phridx = trealloc(phridx, int, phr_cou+1);
       phridx[phr_cou++]=prbf_cou;
@@ -467,7 +454,6 @@
     qsort(itar, chno,sizeof(ITEM2), qcmp2);
 
 
-
   if (key64) {
     for(i=0;iDefChars = chno;
 
+#if FREEBSD
+#define _sort mergesort
+#else
+#define _sort qsort
+#endif
+
   if (key64)
-    qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
+    _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
   else
-    qsort(itmp,chno,sizeof(ITEM2),qcmp);
-
+    _sort(itmp,chno,sizeof(ITEM2),qcmp);
 
   if (key64) {
-    for(i=0;i scripts/noseeing-inst.tmp
@@ -107,6 +109,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 23 2006 Chung-Yen Chang  - 1.3.0.1-1
+- update to 1.3.0.1
+
 * Wed Nov 15 2006 Chung-Yen Chang  - 1.2.9-2
 - add tray.patch
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch	15 Nov 2006 07:21:32 -0000	1.3
+++ im-client.patch	23 Nov 2006 13:55:13 -0000	1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
+--- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
++++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+@@ -10,7 +10,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
          -DFREEBSD=$(FREEBSD)
@@ -22,7 +36,7 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -30,25 +44,25 @@
 +	$(CC) -c -fpic $(CFLAGS) -o $@ $<
 +
  clean:
- 	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ 	rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
  
---- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
+--- gcin-1.3.0.1.orig/Makefile	2006-11-21 11:03:53.000000000 +0800
++++ gcin-1.3.0.1/Makefile	2006-11-23 16:26:15.000000000 +0800
+@@ -8,10 +8,10 @@
  gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
  gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
  
 -GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
  
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
 -     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
 +     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
       $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
  
  OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
 +#gcin1.so: $(gcin1_so)
 +#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
  install:
  	install -d $(datadir)/icons
  	install gcin.png $(datadir)/icons
- 	install -d $(GCIN_ICON_DIR_i)
- 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ 	$(MAKE) -C icons install
 -	install -d $(gcinlibdir)
 -	install $(GCIN_SO) $(gcinlibdir)
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
- 
--im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
--	export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- 	rm -f core.*
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Nov 2006 07:21:32 -0000	1.9
+++ sources	23 Nov 2006 13:55:13 -0000	1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9  gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87  gcin-1.3.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 15:11:24 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 23 Nov 2006 10:11:24 -0500
Subject: rpms/jd/devel .cvsignore, 1.21, 1.22 jd.spec, 1.28, 1.29 sources,
	1.21, 1.22
Message-ID: <200611231511.kANFBOpn007780@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7761

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Nov 23 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061123
- cvs 061123 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	22 Nov 2006 16:57:12 -0000	1.21
+++ .cvsignore	23 Nov 2006 15:10:54 -0000	1.22
@@ -1 +1 @@
-jd-1.8.1-cvs061122.tgz
+jd-1.8.1-cvs061123.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jd.spec	22 Nov 2006 16:57:12 -0000	1.28
+++ jd.spec	23 Nov 2006 15:10:54 -0000	1.29
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061122
+%define         strtag        cvs061123
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Wed Nov 22 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061122
-- cvs 061122 (25:50 JST)
+* Thu Nov 23 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061123
+- cvs 061123 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Nov 2006 16:57:12 -0000	1.21
+++ sources	23 Nov 2006 15:10:54 -0000	1.22
@@ -1 +1 @@
-456375f5bb55a1785572d5f6912adb1b  jd-1.8.1-cvs061122.tgz
+8fedda8b763698253b919393eff9fef4  jd-1.8.1-cvs061123.tgz



From fedora-extras-commits at redhat.com  Thu Nov 23 16:31:01 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:31:01 -0500
Subject: rpms/mediawiki/FC-6 mediawiki.spec,1.9,1.10
Message-ID: <200611231631.kANGV10J011223@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11195/FC-6

Modified Files:
	mediawiki.spec 
Log Message:
Try to fix 212600, 213997, 214758, 215968.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-6/mediawiki.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mediawiki.spec	2 Nov 2006 13:56:14 -0000	1.9
+++ mediawiki.spec	23 Nov 2006 16:30:31 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name: mediawiki
 Version: 1.8.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A wiki engine
 
 Group: Applications/Internet
@@ -28,7 +28,6 @@
 
 Mathematics support is included in the package mediawiki-math.
 
-
 %package math
 Summary: Mathematical formula support for MediaWiki
 Group: Applications/Internet
@@ -40,28 +39,31 @@
 %description math
 This package includes the support for mathematical formulas in MediaWiki.
 
-
 %prep
 %setup -q
 install -D -m 644 %{SOURCE2} ./INSTALL.fedora
 rm -rf tests includes/zhtable skins/disabled
 rm -f `find -name ".[ch]*"`
 
-
 %build
 cd math
 make
 
-
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}%{wikidir}
-cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+#cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
+#cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+cp -a * %{buildroot}%{wikidir}/
+find %{buildroot} -name .svnignore | xargs rm
+find %{buildroot} -name \*.cmi | xargs rm
+find %{buildroot} -name \*.c | xargs rm
+find %{buildroot} -name Makefile | xargs rm
 %{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
 
-install -d %{buildroot}%{wikidir}/math
-install math/texvc %{buildroot}%{wikidir}/math
+#install -d %{buildroot}%{wikidir}/math
+#install math/texvc %{buildroot}%{wikidir}/math
+
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
@@ -90,6 +92,9 @@
 
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Thu Nov 23 16:31:01 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:31:01 -0500
Subject: rpms/mediawiki/devel mediawiki.spec,1.9,1.10
Message-ID: <200611231631.kANGV1lo011226@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11195/devel

Modified Files:
	mediawiki.spec 
Log Message:
Try to fix 212600, 213997, 214758, 215968.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mediawiki.spec	5 Nov 2006 22:09:03 -0000	1.9
+++ mediawiki.spec	23 Nov 2006 16:30:31 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name: mediawiki
 Version: 1.8.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A wiki engine
 
 Group: Applications/Internet
@@ -28,7 +28,6 @@
 
 Mathematics support is included in the package mediawiki-math.
 
-
 %package math
 Summary: Mathematical formula support for MediaWiki
 Group: Applications/Internet
@@ -40,28 +39,31 @@
 %description math
 This package includes the support for mathematical formulas in MediaWiki.
 
-
 %prep
 %setup -q
 install -D -m 644 %{SOURCE2} ./INSTALL.fedora
 rm -rf tests includes/zhtable skins/disabled
 rm -f `find -name ".[ch]*"`
 
-
 %build
 cd math
 make
 
-
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}%{wikidir}
-cp -pr *.php config extensions images includes languages %{buildroot}%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+#cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
+#cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
+cp -a * %{buildroot}%{wikidir}/
+find %{buildroot} -name .svnignore | xargs rm
+find %{buildroot} -name \*.cmi | xargs rm
+find %{buildroot} -name \*.c | xargs rm
+find %{buildroot} -name Makefile | xargs rm
 %{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
 
-install -d %{buildroot}%{wikidir}/math
-install math/texvc %{buildroot}%{wikidir}/math
+#install -d %{buildroot}%{wikidir}/math
+#install math/texvc %{buildroot}%{wikidir}/math
+
 install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
@@ -90,6 +92,9 @@
 
 
 %changelog
+* 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.



From fedora-extras-commits at redhat.com  Thu Nov 23 16:46:18 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:46:18 -0500
Subject: rpms/apt/FC-4 apt.spec,1.22,1.23 sources,1.6,1.7
Message-ID: <200611231646.kANGkIFI011426@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/FC-4

Modified Files:
	apt.spec sources 
Log Message:
Try to fix #210833, some anti-aging make-up.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-4/apt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apt.spec	16 Sep 2006 09:45:07 -0000	1.22
+++ apt.spec	23 Nov 2006 16:45:48 -0000	1.23
@@ -3,99 +3,102 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-Summary:        Debian's Advanced Packaging Tool with RPM support
-Name:           apt
-Version:        0.5.15lorg3.2
-Release:        7%{?dist}
-Group:          System Environment/Base
-URL:            http://apt-rpm.org/
-License:        GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
 
-#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0:	http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
-Source1:        apt.conf
-Source2:        sources.list
-Source3:        vendors.list
-Source4:        apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5:        rpmpriorities
-Source19:       comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
 
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source51:       upgradevirt.lua
+Source51: upgradevirt.lua
 
 # 150-199 for apt.conf.d
 # "factory defaults"
-Source150:      default.conf
+Source150: default.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  libxml2-devel
-BuildRequires:  rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  gettext
-BuildRequires:  docbook-utils
-BuildRequires:  perl
-BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 %if %{generate_rpmpriorities}
-BuildRequires:  %{_bindir}/xsltproc
-BuildRequires:  %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
-BuildRequires:  pkgconfig
-Requires:       gnupg
-Requires:       bzip2
-Requires:       fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
-Obsoletes:      %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
 %endif
-Requires:	apt-config
+Requires: apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
 It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages.  APT features complete installation
+install and upgrade packages. APT features complete installation
 ordering, multiple source capability and several other useful
 features.
 
-%package        devel
-Summary:        Development files and documentation for APT's libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
 
-%description    devel
+%description devel
 This package contains development files for developing with APT's
 libapt-pkg package manipulation library, modified for RPM.
 
-%package        python
-Summary:        Python bindings for libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
-%description    python
+%description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
-%package        groupinstall
-Summary:        Additional commands to install and remove package groups
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl
-Requires:       comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
 
-%description    groupinstall
+%description groupinstall
 This package adds four new commands to apt for installing, removing
 and viewing groups of packages:
 apt-cache groupnames
@@ -110,19 +113,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc
 
 # fix docs to reference correct paths
 perl -pi -e \
-  's|\bconfigure-index\.gz\b|configure-index| ;
-   s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+  s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f | xargs chmod 0644
 
-
 %build
 %configure --disable-dependency-tracking --disable-static
 
@@ -130,81 +133,81 @@
 make %{?_smp_mflags}
 
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
 
 cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
 %endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
 %find_lang %{name}
 
 # The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
 
 # install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
 # GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
 for script in %{SOURCE51} ; do
-  install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
 done
 
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
 
 # apt-groupinstall from contrib
 %if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
 install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
-  $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
 %endif
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -212,8 +215,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/apt stop &>/dev/null || :
-  /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
 fi
 
 %postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.5.15lorg3.2-7
 - Un%%ghost pyo files.
 
@@ -301,7 +308,7 @@
 * Thu May 11 2006 Axel Thimm  - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
-* Mon May  8 2006 Axel Thimm  - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm  - 0.5.15lorg3-2
 - Split off configuration files from apt.
 
 * Tue Apr 25 2006 Axel Thimm  - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
 * Mon Apr 10 2006 Ville Skytt?? 
 - Remove mirror select remainders (thanks to Panu).
 
-* Sun Apr  9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.
 
@@ -322,7 +329,7 @@
 - use /var/lib/apt instead of obsolete /var/state/apt
 - support FC4 as well
 
-* Fri Apr  7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
 * Fri Mar 24 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
 - 0.5.15lorg3-pre2
 - set distroverpkg to fedora-release
 - add distro version and arch independent default source list entries for 
-  fedora core, extras + updates
+ fedora core, extras + updates
 - remove old nasty fedora.us-time hacks from post scriptlets
 
 * Sun Mar 19 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
 * Tue Apr 19 2005 Seth Vidal 
 - tobuild test
 
-* Fri Apr  1 2005 Michael Schwendt  - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt  - 0.5.15cnc7-3
 - Include apt-pkg includedir in -devel package
 
 * Sat Mar 26 2005 Ville Skytt??  - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
 - Drop not-installed Fedora Legacy key from SRPM.
 - Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
-  packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
 
 * Sat Jan 29 2005 Warren Togami  - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 
 * Fri Jan 28 2005 Ville Skytt??  - 0:0.5.15cnc6-14.r362
 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
-  apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
 
 * Sun Jan 23 2005 Ville Skytt??  - 0:0.5.15cnc6-13.r362
 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Jun 2006 09:53:03 -0000	1.6
+++ sources	23 Nov 2006 16:45:48 -0000	1.7
@@ -1 +1,2 @@
 ce05fcc7e0e614fa6e2175008945bb59  apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 16:46:18 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:46:18 -0500
Subject: rpms/apt/FC-6 apt.spec,1.34,1.35 sources,1.13,1.14
Message-ID: <200611231646.kANGkItu011432@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/FC-6

Modified Files:
	apt.spec sources 
Log Message:
Try to fix #210833, some anti-aging make-up.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-6/apt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apt.spec	16 Sep 2006 09:45:13 -0000	1.34
+++ apt.spec	23 Nov 2006 16:45:48 -0000	1.35
@@ -3,99 +3,102 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-Summary:        Debian's Advanced Packaging Tool with RPM support
-Name:           apt
-Version:        0.5.15lorg3.2
-Release:        7%{?dist}
-Group:          System Environment/Base
-URL:            http://apt-rpm.org/
-License:        GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
 
-#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0:	http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
-Source1:        apt.conf
-Source2:        sources.list
-Source3:        vendors.list
-Source4:        apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5:        rpmpriorities
-Source19:       comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
 
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source51:       upgradevirt.lua
+Source51: upgradevirt.lua
 
 # 150-199 for apt.conf.d
 # "factory defaults"
-Source150:      default.conf
+Source150: default.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  libxml2-devel
-BuildRequires:  rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  gettext
-BuildRequires:  docbook-utils
-BuildRequires:  perl
-BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 %if %{generate_rpmpriorities}
-BuildRequires:  %{_bindir}/xsltproc
-BuildRequires:  %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
-BuildRequires:  pkgconfig
-Requires:       gnupg
-Requires:       bzip2
-Requires:       fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
-Obsoletes:      %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
 %endif
-Requires:	apt-config
+Requires: apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
 It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages.  APT features complete installation
+install and upgrade packages. APT features complete installation
 ordering, multiple source capability and several other useful
 features.
 
-%package        devel
-Summary:        Development files and documentation for APT's libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
 
-%description    devel
+%description devel
 This package contains development files for developing with APT's
 libapt-pkg package manipulation library, modified for RPM.
 
-%package        python
-Summary:        Python bindings for libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
-%description    python
+%description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
-%package        groupinstall
-Summary:        Additional commands to install and remove package groups
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl
-Requires:       comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
 
-%description    groupinstall
+%description groupinstall
 This package adds four new commands to apt for installing, removing
 and viewing groups of packages:
 apt-cache groupnames
@@ -110,19 +113,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc
 
 # fix docs to reference correct paths
 perl -pi -e \
-  's|\bconfigure-index\.gz\b|configure-index| ;
-   s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+  s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f | xargs chmod 0644
 
-
 %build
 %configure --disable-dependency-tracking --disable-static
 
@@ -130,81 +133,81 @@
 make %{?_smp_mflags}
 
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
 
 cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
 %endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
 %find_lang %{name}
 
 # The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
 
 # install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
 # GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
 for script in %{SOURCE51} ; do
-  install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
 done
 
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
 
 # apt-groupinstall from contrib
 %if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
 install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
-  $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
 %endif
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -212,8 +215,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/apt stop &>/dev/null || :
-  /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
 fi
 
 %postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.5.15lorg3.2-7
 - Un%%ghost pyo files.
 
@@ -301,7 +308,7 @@
 * Thu May 11 2006 Axel Thimm  - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
-* Mon May  8 2006 Axel Thimm  - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm  - 0.5.15lorg3-2
 - Split off configuration files from apt.
 
 * Tue Apr 25 2006 Axel Thimm  - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
 * Mon Apr 10 2006 Ville Skytt?? 
 - Remove mirror select remainders (thanks to Panu).
 
-* Sun Apr  9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.
 
@@ -322,7 +329,7 @@
 - use /var/lib/apt instead of obsolete /var/state/apt
 - support FC4 as well
 
-* Fri Apr  7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
 * Fri Mar 24 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
 - 0.5.15lorg3-pre2
 - set distroverpkg to fedora-release
 - add distro version and arch independent default source list entries for 
-  fedora core, extras + updates
+ fedora core, extras + updates
 - remove old nasty fedora.us-time hacks from post scriptlets
 
 * Sun Mar 19 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
 * Tue Apr 19 2005 Seth Vidal 
 - tobuild test
 
-* Fri Apr  1 2005 Michael Schwendt  - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt  - 0.5.15cnc7-3
 - Include apt-pkg includedir in -devel package
 
 * Sat Mar 26 2005 Ville Skytt??  - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
 - Drop not-installed Fedora Legacy key from SRPM.
 - Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
-  packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
 
 * Sat Jan 29 2005 Warren Togami  - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 
 * Fri Jan 28 2005 Ville Skytt??  - 0:0.5.15cnc6-14.r362
 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
-  apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
 
 * Sun Jan 23 2005 Ville Skytt??  - 0:0.5.15cnc6-13.r362
 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Jun 2006 09:53:10 -0000	1.13
+++ sources	23 Nov 2006 16:45:48 -0000	1.14
@@ -1 +1,2 @@
 ce05fcc7e0e614fa6e2175008945bb59  apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 16:46:18 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:46:18 -0500
Subject: rpms/apt/FC-5 apt.spec,1.22,1.23 sources,1.6,1.7
Message-ID: <200611231646.kANGkIiM011430@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/FC-5

Modified Files:
	apt.spec sources 
Log Message:
Try to fix #210833, some anti-aging make-up.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-5/apt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apt.spec	16 Sep 2006 09:45:13 -0000	1.22
+++ apt.spec	23 Nov 2006 16:45:48 -0000	1.23
@@ -3,99 +3,102 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-Summary:        Debian's Advanced Packaging Tool with RPM support
-Name:           apt
-Version:        0.5.15lorg3.2
-Release:        7%{?dist}
-Group:          System Environment/Base
-URL:            http://apt-rpm.org/
-License:        GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
 
-#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0:	http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
-Source1:        apt.conf
-Source2:        sources.list
-Source3:        vendors.list
-Source4:        apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5:        rpmpriorities
-Source19:       comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
 
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source51:       upgradevirt.lua
+Source51: upgradevirt.lua
 
 # 150-199 for apt.conf.d
 # "factory defaults"
-Source150:      default.conf
+Source150: default.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  libxml2-devel
-BuildRequires:  rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  gettext
-BuildRequires:  docbook-utils
-BuildRequires:  perl
-BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 %if %{generate_rpmpriorities}
-BuildRequires:  %{_bindir}/xsltproc
-BuildRequires:  %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
-BuildRequires:  pkgconfig
-Requires:       gnupg
-Requires:       bzip2
-Requires:       fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
-Obsoletes:      %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
 %endif
-Requires:	apt-config
+Requires: apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
 It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages.  APT features complete installation
+install and upgrade packages. APT features complete installation
 ordering, multiple source capability and several other useful
 features.
 
-%package        devel
-Summary:        Development files and documentation for APT's libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
 
-%description    devel
+%description devel
 This package contains development files for developing with APT's
 libapt-pkg package manipulation library, modified for RPM.
 
-%package        python
-Summary:        Python bindings for libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
-%description    python
+%description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
-%package        groupinstall
-Summary:        Additional commands to install and remove package groups
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl
-Requires:       comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
 
-%description    groupinstall
+%description groupinstall
 This package adds four new commands to apt for installing, removing
 and viewing groups of packages:
 apt-cache groupnames
@@ -110,19 +113,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc
 
 # fix docs to reference correct paths
 perl -pi -e \
-  's|\bconfigure-index\.gz\b|configure-index| ;
-   s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+  s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f | xargs chmod 0644
 
-
 %build
 %configure --disable-dependency-tracking --disable-static
 
@@ -130,81 +133,81 @@
 make %{?_smp_mflags}
 
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
 
 cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
 %endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
 %find_lang %{name}
 
 # The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
 
 # install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
 # GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
 for script in %{SOURCE51} ; do
-  install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
 done
 
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
 
 # apt-groupinstall from contrib
 %if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
 install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
-  $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
 %endif
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -212,8 +215,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/apt stop &>/dev/null || :
-  /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
 fi
 
 %postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.5.15lorg3.2-7
 - Un%%ghost pyo files.
 
@@ -301,7 +308,7 @@
 * Thu May 11 2006 Axel Thimm  - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
-* Mon May  8 2006 Axel Thimm  - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm  - 0.5.15lorg3-2
 - Split off configuration files from apt.
 
 * Tue Apr 25 2006 Axel Thimm  - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
 * Mon Apr 10 2006 Ville Skytt?? 
 - Remove mirror select remainders (thanks to Panu).
 
-* Sun Apr  9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.
 
@@ -322,7 +329,7 @@
 - use /var/lib/apt instead of obsolete /var/state/apt
 - support FC4 as well
 
-* Fri Apr  7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
 * Fri Mar 24 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
 - 0.5.15lorg3-pre2
 - set distroverpkg to fedora-release
 - add distro version and arch independent default source list entries for 
-  fedora core, extras + updates
+ fedora core, extras + updates
 - remove old nasty fedora.us-time hacks from post scriptlets
 
 * Sun Mar 19 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
 * Tue Apr 19 2005 Seth Vidal 
 - tobuild test
 
-* Fri Apr  1 2005 Michael Schwendt  - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt  - 0.5.15cnc7-3
 - Include apt-pkg includedir in -devel package
 
 * Sat Mar 26 2005 Ville Skytt??  - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
 - Drop not-installed Fedora Legacy key from SRPM.
 - Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
-  packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
 
 * Sat Jan 29 2005 Warren Togami  - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 
 * Fri Jan 28 2005 Ville Skytt??  - 0:0.5.15cnc6-14.r362
 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
-  apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
 
 * Sun Jan 23 2005 Ville Skytt??  - 0:0.5.15cnc6-13.r362
 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Jun 2006 09:53:04 -0000	1.6
+++ sources	23 Nov 2006 16:45:48 -0000	1.7
@@ -1 +1,2 @@
 ce05fcc7e0e614fa6e2175008945bb59  apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 16:46:19 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:46:19 -0500
Subject: rpms/apt/devel .cvsignore, 1.13, 1.14 apt.spec, 1.34, 1.35 sources, 
	1.13, 1.14
Message-ID: <200611231646.kANGkJsA011437@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11366/devel

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
Try to fix #210833, some anti-aging make-up.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Jun 2006 09:53:10 -0000	1.13
+++ .cvsignore	23 Nov 2006 16:45:49 -0000	1.14
@@ -1 +1,2 @@
 apt-0.5.15lorg3.2.tar.bz2
+apt-0.5.15lorg3.2-ppc.patch


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apt.spec	16 Sep 2006 09:45:13 -0000	1.34
+++ apt.spec	23 Nov 2006 16:45:49 -0000	1.35
@@ -3,99 +3,102 @@
 %define generate_rpmpriorities 0
 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
 
-Summary:        Debian's Advanced Packaging Tool with RPM support
-Name:           apt
-Version:        0.5.15lorg3.2
-Release:        7%{?dist}
-Group:          System Environment/Base
-URL:            http://apt-rpm.org/
-License:        GPL
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3.2
+Release: 8%{?dist}
+Group: System Environment/Base
+URL: http://apt-rpm.org/
+License: GPL
 
-#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
-Source0:	http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
-Source1:        apt.conf
-Source2:        sources.list
-Source3:        vendors.list
-Source4:        apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
 
 # rpmpriorities generated + manually tweaked from comps.xml core group
-Source5:        rpmpriorities
-Source19:       comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
 
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source51:       upgradevirt.lua
+Source51: upgradevirt.lua
 
 # 150-199 for apt.conf.d
 # "factory defaults"
-Source150:      default.conf
+Source150: default.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix ppc mapping
+Patch0: apt-0.5.15lorg3.2-ppc.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
-BuildRequires:  python-devel >= 2.2
-BuildRequires:  libxml2-devel
-BuildRequires:  rpm-devel, beecrypt-devel, elfutils-libelf-devel
-BuildRequires:  zlib-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  gettext
-BuildRequires:  docbook-utils
-BuildRequires:  perl
-BuildRequires:  readline-devel
-BuildRequires:  ncurses-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel, beecrypt-devel, elfutils-libelf-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 %if %{generate_rpmpriorities}
-BuildRequires:  %{_bindir}/xsltproc
-BuildRequires:  %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
 %endif
 # libxml2-devel, #183689
-BuildRequires:  pkgconfig
-Requires:       gnupg
-Requires:       bzip2
-Requires:       fedora-release >= 4
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+Requires: fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
-Obsoletes:      %{name}-groupinstall < %{version}-%{release}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
 %endif
-Requires:	apt-config
+Requires: apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
 It provides the apt-get utility that provides a simple, safe way to
-install and upgrade packages.  APT features complete installation
+install and upgrade packages. APT features complete installation
 ordering, multiple source capability and several other useful
 features.
 
-%package        devel
-Summary:        Development files and documentation for APT's libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       rpm-devel
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
 
-%description    devel
+%description devel
 This package contains development files for developing with APT's
 libapt-pkg package manipulation library, modified for RPM.
 
-%package        python
-Summary:        Python bindings for libapt-pkg
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
-%description    python
+%description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
-%package        groupinstall
-Summary:        Additional commands to install and remove package groups
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl
-Requires:       comps
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
 
-%description    groupinstall
+%description groupinstall
 This package adds four new commands to apt for installing, removing
 and viewing groups of packages:
 apt-cache groupnames
@@ -110,19 +113,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc
 
 # fix docs to reference correct paths
 perl -pi -e \
-  's|\bconfigure-index\.gz\b|configure-index| ;
-   s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
-  doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
+ 's|\bconfigure-index\.gz\b|configure-index| ;
+  s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
 
 install -pm 644 %{SOURCE19} comps2prio.xsl
 
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f | xargs chmod 0644
 
-
 %build
 %configure --disable-dependency-tracking --disable-static
 
@@ -130,81 +133,81 @@
 make %{?_smp_mflags}
 
 make -C python %{?_smp_mflags} PYTHON="%{__python}"
-%{__python} -O -c "import py_compile; py_compile.compile('python/apt.py')"
+python -O -c "import py_compile; py_compile.compile('python/apt.py')"
 
 cp -p %{SOURCE5} rpmpriorities
 %if %{generate_rpmpriorities}
-%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+xsltproc -o rpmpriorities comps2prio.xsl %{comps}
 %endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
+make install DESTDIR=%{buildroot} includedir=%{_includedir}/apt-pkg
 %find_lang %{name}
 
 # The state files
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist
+mkdir -p %{buildroot}%{_localstatedir}/cache/apt/gensrclist
+mkdir -p %{buildroot}%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+mkdir -p %{buildroot}%{_sysconfdir}/apt
+mkdir -p %{buildroot}%{_sysconfdir}/apt/apt.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/sources.list.d
+mkdir -p %{buildroot}%{_sysconfdir}/apt/vendors.list.d
+install -pm 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities %{buildroot}/%{_sysconfdir}/apt/
 
 # install config parts
-install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE150} %{buildroot}%{_sysconfdir}/apt/apt.conf.d/
 
 # GPG keys
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+mkdir -p %{buildroot}%{_sysconfdir}/apt/gpg/
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
 ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
+ %{buildroot}%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+mkdir -p %{buildroot}%{_datadir}/apt/scripts
 for script in %{SOURCE51} ; do
-  install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+ install -pm 755 $script %{buildroot}%{_datadir}/apt/scripts
 done
 
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 644 python/apt.py* $RPM_BUILD_ROOT%{python_sitearch}/
-touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+mkdir -p %{buildroot}%{python_sitearch}/
+install -pm 755 python/_apt.so %{buildroot}%{python_sitearch}/
+install -pm 644 python/apt.py* %{buildroot}%{python_sitearch}/
+touch %{buildroot}%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init %{buildroot}/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron %{buildroot}/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig %{buildroot}/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
-install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+install -pm 755 contrib/gpg-check/*.lua %{buildroot}/%{_datadir}/apt/scripts
 
 # apt-groupinstall from contrib
 %if 0%{?_with_groupinstall:1}
-install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
-touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} %{buildroot}/%{_datadir}/apt/scripts
+touch %{buildroot}%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
 install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
-  $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+ %{buildroot}/%{_sysconfdir}/apt/apt.conf.d/
 %endif
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -212,8 +215,8 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/apt stop &>/dev/null || :
-  /sbin/chkconfig --del apt
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
 fi
 
 %postun -p /sbin/ldconfig
@@ -284,6 +287,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 0.5.15lorg3.2-8
+- Fix ppc mapping (#210833).
+- make-up.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.5.15lorg3.2-7
 - Un%%ghost pyo files.
 
@@ -301,7 +308,7 @@
 * Thu May 11 2006 Axel Thimm  - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
-* Mon May  8 2006 Axel Thimm  - 0.5.15lorg3-2
+* Mon May 8 2006 Axel Thimm  - 0.5.15lorg3-2
 - Split off configuration files from apt.
 
 * Tue Apr 25 2006 Axel Thimm  - 0.5.15lorg3-1
@@ -314,7 +321,7 @@
 * Mon Apr 10 2006 Ville Skytt?? 
 - Remove mirror select remainders (thanks to Panu).
 
-* Sun Apr  9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
+* Sun Apr 9 2006 Ville Skytt??  - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.
 
@@ -322,7 +329,7 @@
 - use /var/lib/apt instead of obsolete /var/state/apt
 - support FC4 as well
 
-* Fri Apr  7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
+* Fri Apr 7 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
 * Fri Mar 24 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre3
@@ -336,7 +343,7 @@
 - 0.5.15lorg3-pre2
 - set distroverpkg to fedora-release
 - add distro version and arch independent default source list entries for 
-  fedora core, extras + updates
+ fedora core, extras + updates
 - remove old nasty fedora.us-time hacks from post scriptlets
 
 * Sun Mar 19 2006 Ville Skytt??  - 0.5.15lorg3-0.2.pre1
@@ -365,7 +372,7 @@
 * Tue Apr 19 2005 Seth Vidal 
 - tobuild test
 
-* Fri Apr  1 2005 Michael Schwendt  - 0.5.15cnc7-3
+* Fri Apr 1 2005 Michael Schwendt  - 0.5.15cnc7-3
 - Include apt-pkg includedir in -devel package
 
 * Sat Mar 26 2005 Ville Skytt??  - 0.5.15cnc7-2
@@ -381,14 +388,14 @@
 - Add Extras GPG key (Panu), and add it to fedora-vendors.list.
 - Drop not-installed Fedora Legacy key from SRPM.
 - Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
-  packages take care of that automatically (Panu).
+ packages take care of that automatically (Panu).
 
 * Sat Jan 29 2005 Warren Togami  - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 
 * Fri Jan 28 2005 Ville Skytt??  - 0:0.5.15cnc6-14.r362
 - Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
-  apt.conf.d/default.conf.
+ apt.conf.d/default.conf.
 
 * Sun Jan 23 2005 Ville Skytt??  - 0:0.5.15cnc6-13.r362
 - Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Jun 2006 09:53:10 -0000	1.13
+++ sources	23 Nov 2006 16:45:49 -0000	1.14
@@ -1 +1,2 @@
 ce05fcc7e0e614fa6e2175008945bb59  apt-0.5.15lorg3.2.tar.bz2
+319591417226d12f0264cce78a1c95fa  apt-0.5.15lorg3.2-ppc.patch



From fedora-extras-commits at redhat.com  Thu Nov 23 16:52:02 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 11:52:02 -0500
Subject: rpms/mediawiki/devel mediawiki.spec,1.10,1.11
Message-ID: <200611231652.kANGq2q7011614@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11599

Modified Files:
	mediawiki.spec 
Log Message:
Add -r to xargs in case of an empty set.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mediawiki.spec	23 Nov 2006 16:30:31 -0000	1.10
+++ mediawiki.spec	23 Nov 2006 16:51:32 -0000	1.11
@@ -55,10 +55,10 @@
 #cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
 #cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
 cp -a * %{buildroot}%{wikidir}/
-find %{buildroot} -name .svnignore | xargs rm
-find %{buildroot} -name \*.cmi | xargs rm
-find %{buildroot} -name \*.c | xargs rm
-find %{buildroot} -name Makefile | xargs rm
+find %{buildroot} -name .svnignore | xargs -r rm
+find %{buildroot} -name \*.cmi | xargs -r rm
+find %{buildroot} -name \*.c | xargs -r rm
+find %{buildroot} -name Makefile | xargs -r rm
 %{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
 
 #install -d %{buildroot}%{wikidir}/math



From fedora-extras-commits at redhat.com  Thu Nov 23 17:06:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 23 Nov 2006 12:06:19 -0500
Subject: owners owners.list,1.2000,1.2001
Message-ID: <200611231706.kANH6JV1014703@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14688

Modified Files:
	owners.list 
Log Message:
Orphan gdome2, perl-String-Ediff, python-htmltmpl, python-id3.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2000
retrieving revision 1.2001
diff -u -r1.2000 -r1.2001
--- owners.list	23 Nov 2006 01:32:54 -0000	1.2000
+++ owners.list	23 Nov 2006 17:05:49 -0000	1.2001
@@ -505,7 +505,7 @@
 Fedora Extras|gdk-pixbuf|An image loading library used with Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdmap|A tool which allows to visualize disk space|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gdome2|DOM level 2 library for accessing XML files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|geda-docs|Documentation for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-examples|Circuit examples for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|geda-gattrib|Attribute editor for gEDA|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
@@ -709,7 +709,7 @@
 Fedora Extras|html-xml-utils|A number of simple utilities for manipulating HTML and XML files|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|html401-dtds|HTML 4.01 specification and document type definitions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htmldoc|A tool for converting HTML source files into HTML, PostScript, or PDF|adam at spicenitz.org|extras-qa at fedoraproject.org|
-Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|htop|Interactive process viewer|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hugs98|Haskell Interpreter|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -723,7 +723,7 @@
 Fedora Extras|ices|Source streaming for Icecast|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|id3-py|Python ID3 tag library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|id3-py|Python ID3 tag library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ifm|Interactive Fiction Mapper|chris at chrisgrau.com|extras-qa at fedoraproject.org|
@@ -1692,7 +1692,7 @@
 Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Statistics-Descriptive|Perl module of basic descriptive statistical functions|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Format|Sprintf-like string formatting capabilities with arbitrary format definitions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Exporter|Sophisticated exporter for custom-built routines|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1958,8 +1958,8 @@
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|jamatos at fc.up.pt|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
-Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|python-id3|ID3 tag library for Python|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|python-htmltmpl|Templating engine for separation of code and HTML|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-id3|ID3 tag library for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-imaging|Python's own image processing library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-json|A JSON reader and writer for Python|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 23 17:17:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:17:33 -0500
Subject: rpms/mediawiki/devel mediawiki.spec,1.11,1.12
Message-ID: <200611231717.kANHHXCu014748@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14731

Modified Files:
	mediawiki.spec 
Log Message:
Reduce set of installed files some more.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mediawiki.spec	23 Nov 2006 16:51:32 -0000	1.11
+++ mediawiki.spec	23 Nov 2006 17:17:03 -0000	1.12
@@ -55,16 +55,15 @@
 #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
-find %{buildroot} -name \*.cmi | xargs -r rm
-find %{buildroot} -name \*.c | xargs -r rm
-find %{buildroot} -name Makefile | xargs -r rm
 %{__chmod} 755 %{buildroot}%{wikidir}/maintenance/*.pl
 
-#install -d %{buildroot}%{wikidir}/math
-#install math/texvc %{buildroot}%{wikidir}/math
+install -d %{buildroot}%{wikidir}/math
+install math/texvc %{buildroot}%{wikidir}/math
 
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+install -D -m 644 %{SOURCE1} \
+  %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Thu Nov 23 17:28:46 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:28:46 -0500
Subject: rpms/fedora-package-config-apt/FC-6 fedora-package-config-apt.spec, 
	1.3, 1.4 fedora.conf, 1.2, 1.3
Message-ID: <200611231728.kANHSk90014848@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14817/FC-6

Modified Files:
	fedora-package-config-apt.spec fedora.conf 
Log Message:
Try to fix #215260.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/FC-6/fedora-package-config-apt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-package-config-apt.spec	30 Aug 2006 00:27:39 -0000	1.3
+++ fedora-package-config-apt.spec	23 Nov 2006 17:28:16 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
-Version: 5.92
-Release: 4
+Version: 6
+Release: 5
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 6-5
+- Add xen and PAE to possible kernel flavours.
+
 * Sat May 20 2006 Axel Thimm 
 - Move some FC specific config bits from apt.
 


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/FC-6/fedora.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora.conf	20 May 2006 16:55:18 -0000	1.2
+++ fedora.conf	23 Nov 2006 17:28:16 -0000	1.3
@@ -20,14 +20,14 @@
   Order "true";
   // Allow multiple kernel and kernel-related packages to be installed
   Allow-Duplicated {
-    "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+    "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
     "^kmod-.+$";
   };
   // XXX: not used currently
   //Allow-Duplicated-Upgrade {
-  //  "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+  //  "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
   //  "^kmod-.+$";
   //  "^gpg-pubkey$";
   //};



From fedora-extras-commits at redhat.com  Thu Nov 23 17:28:46 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:28:46 -0500
Subject: rpms/fedora-package-config-apt/devel fedora-package-config-apt.spec,
	1.3, 1.4 fedora.conf, 1.2, 1.3
Message-ID: <200611231728.kANHSk71014852@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14817/devel

Modified Files:
	fedora-package-config-apt.spec fedora.conf 
Log Message:
Try to fix #215260.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora-package-config-apt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-package-config-apt.spec	30 Aug 2006 00:27:39 -0000	1.3
+++ fedora-package-config-apt.spec	23 Nov 2006 17:28:16 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
-Version: 5.92
-Release: 4
+Version: 6.89
+Release: 6
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm  - 6.89-6
+- Add xen and PAE to possible kernel flavours.
+
 * Sat May 20 2006 Axel Thimm 
 - Move some FC specific config bits from apt.
 


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora.conf	20 May 2006 16:55:18 -0000	1.2
+++ fedora.conf	23 Nov 2006 17:28:16 -0000	1.3
@@ -20,14 +20,14 @@
   Order "true";
   // Allow multiple kernel and kernel-related packages to be installed
   Allow-Duplicated {
-    "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+    "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
     "^kmod-.+$";
   };
   // XXX: not used currently
   //Allow-Duplicated-Upgrade {
-  //  "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+  //  "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
   //  "^kmod-.+$";
   //  "^gpg-pubkey$";
   //};



From fedora-extras-commits at redhat.com  Thu Nov 23 17:30:33 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:30:33 -0500
Subject: rpms/mediawiki/FC-5 mediawiki.spec,1.5,1.6
Message-ID: <200611231730.kANHUX7L014879@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14864

Modified Files:
	mediawiki.spec 
Log Message:
Backport FC7 fixes.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-5/mediawiki.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mediawiki.spec	3 Apr 2006 13:44:34 -0000	1.5
+++ mediawiki.spec	23 Nov 2006 17:30:03 -0000	1.6
@@ -1,23 +1,24 @@
 %define wikidir %{_var}/www/mediawiki
 
-Name:           mediawiki
-Version:        1.5.8
-Release:        1%{?dist}
-Summary:        The PHP-based wiki software behind Wikipedia
-
-Group:          Applications/Internet
-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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:       httpd
-Requires:       php >= 4.1.2
-Requires:	php-mysql
+Name: mediawiki
+Version: 1.8.2
+Release: 6%{?dist}
+Summary: A wiki engine
+
+Group: Applications/Internet
+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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Requires: httpd
+Requires: php >= 5
+Requires: php-mysql
+Requires: php-gd, diffutils, ImageMagick
 # to make sure the "apache" group is created before mediawiki is installed
-Requires(pre):  httpd
+Requires(pre): httpd
 
 %description
 MediaWiki is the software used for Wikipedia (http://www.wikipedia.org) and
@@ -27,44 +28,45 @@
 
 Mathematics support is included in the package mediawiki-math.
 
-
 %package math
-Summary:        Mathematical formula support for MediaWiki
-Group:          Applications/Internet
+Summary: Mathematical formula support for MediaWiki
+Group: Applications/Internet
 
-BuildRequires:  ocaml
-Requires:	mediawiki = %{version}-%{release}
-Requires:       ImageMagick tetex-latex tetex-dvips
+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.
 
-
 %prep
 %setup -q
 install -D -m 644 %{SOURCE2} ./INSTALL.fedora
 rm -rf tests includes/zhtable skins/disabled
 rm -f `find -name ".[ch]*"`
 
-
 %build
 cd math
-make %{?_smp_mflags}
-
+make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{wikidir}
-cp -pr config extensions images includes languages $RPM_BUILD_ROOT%{wikidir}
-cp -pr maintenance skins [[:lower:]]*.*  $RPM_BUILD_ROOT%{wikidir}
-%{__chmod} 755 $RPM_BUILD_ROOT%{wikidir}/maintenance/*.pl
-
-install -d $RPM_BUILD_ROOT%{wikidir}/math
-install math/texvc $RPM_BUILD_ROOT%{wikidir}/math
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+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
+
+install -D -m 644 %{SOURCE1} \
+  %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -89,6 +91,24 @@
 
 
 %changelog
+* 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.
+
+* Sat Oct 14 2006 Axel Thimm  - 1.8.2-4
+- Update to 1.8.2.
+
+* Wed Oct 11 2006 Axel Thimm  - 1.8.1-3
+- Update to 1.8.1.
+
+* Wed Oct 11 2006 Axel Thimm  - 1.8.0-2
+- Update to 1.8.0.
+- And php-gd, diffutils, ImageMagick as dependencies
+
 * Mon Apr 03 2006 Roozbeh Pournader  - 1.5.8-1
 - Update to upstream 1.5.8 (contains security fixes)
 
@@ -100,7 +120,7 @@
 
 * Mon Feb 06 2006 Roozbeh Pournader  - 1.5.6-5
 - Put internal doc files in the right directory, renaming it
-  back to docs (#180177)
+ back to docs (#180177)
 
 * Sat Feb 04 2006 Roozbeh Pournader  - 1.5.6-4
 - Use Requires(pre) instead of PreReq (Mike McGrath)



From fedora-extras-commits at redhat.com  Thu Nov 23 17:43:24 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 23 Nov 2006 12:43:24 -0500
Subject: rpms/mediawiki/FC-6 mediawiki.spec,1.10,1.11
Message-ID: <200611231743.kANHhO9g015005@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/mediawiki/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14990

Modified Files:
	mediawiki.spec 
Log Message:
Backport FC7 fixes.


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-6/mediawiki.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mediawiki.spec	23 Nov 2006 16:30:31 -0000	1.10
+++ mediawiki.spec	23 Nov 2006 17:42:54 -0000	1.11
@@ -55,16 +55,15 @@
 #cp -pr *.php config extensions images includes languages serialized %{buildroot}%{wikidir}
 #cp -pr maintenance skins [[:lower:]]*.* %{buildroot}%{wikidir}
 cp -a * %{buildroot}%{wikidir}/
-find %{buildroot} -name .svnignore | xargs rm
-find %{buildroot} -name \*.cmi | xargs rm
-find %{buildroot} -name \*.c | xargs rm
-find %{buildroot} -name Makefile | xargs rm
+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
+install -d %{buildroot}%{wikidir}/math
+install math/texvc %{buildroot}%{wikidir}/math
 
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
+install -D -m 644 %{SOURCE1} \
+  %{buildroot}%{_sysconfdir}/httpd/conf.d/mediawiki.conf
 
 %clean
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Thu Nov 23 18:44:02 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 23 Nov 2006 13:44:02 -0500
Subject: rpms/sword/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 sword.spec, 
	1.11, 1.12
Message-ID: <200611231844.kANIi2gY018358@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18339

Modified Files:
	.cvsignore sources sword.spec 
Log Message:
* Thu Nov 23 2006 Deji Akingunola  - 1.5.9-1
- New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 18:57:47 -0000	1.3
+++ .cvsignore	23 Nov 2006 18:43:32 -0000	1.4
@@ -1 +1 @@
-sword-1.5.9-1.src.rpm
+sword-1.5.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 18:57:47 -0000	1.3
+++ sources	23 Nov 2006 18:43:32 -0000	1.4
@@ -1 +1 @@
-2718a640384bf378fc8d229514f8abbd  sword-1.5.9-1.src.rpm
+e1f1af8c2add8310d0bbcddc9af523b8  sword-1.5.9.tar.gz


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-6/sword.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sword.spec	4 Oct 2006 22:36:34 -0000	1.11
+++ sword.spec	23 Nov 2006 18:43:32 -0000	1.12
@@ -1,21 +1,19 @@
 Name:           sword           
-Version:        1.5.8
-Release:        10%{?dist}
+Version:        1.5.9
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
-Source1:        ar_EG-cp1256.conf
-Source2:        ar_EG-utf8.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sed >= 3.95
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libicu-devel icu
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -40,13 +38,9 @@
 
 %prep
 %setup -q
-%{__sed} -i 's?\r??' include/ftptrans.h
-%{__sed} -i 's?\r??' include/ftplibftpt.h
-%{__sed} -i 's?\r??' include/curlftpt.h
-
 
 %build
-%configure --disable-static
+%configure --disable-static --with-icu
 make 
 #%%{?_smp_mflags} sometimes causes build failure
 
@@ -55,8 +49,6 @@
 rm -rf %buildroot
 make install DESTDIR=%buildroot
 %__mkdir_p %buildroot%_datadir/sword/modules
-install -p -m644 %{SOURCE1} %buildroot%_datadir/sword/locales.d/
-install -p -m644 %{SOURCE2} %buildroot%_datadir/sword/locales.d/
 
 find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';'
 
@@ -75,7 +67,7 @@
 %doc samples doc
 %config(noreplace) %_sysconfdir/sword.conf
 %_bindir/*
-%dir %_libdir/sword
+%_libdir/sword/
 %_libdir/libsword-%{version}.so
 %_datadir/sword
 
@@ -88,6 +80,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Deji Akingunola  - 1.5.9-1
+- New release
+
 * Thu Oct 05 2006 Christian Iseli  1.5.8-10
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 



From fedora-extras-commits at redhat.com  Thu Nov 23 18:45:38 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 23 Nov 2006 13:45:38 -0500
Subject: rpms/sword/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sword.spec,
	1.8, 1.9
Message-ID: <200611231845.kANIjcFo018468@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/sword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18433

Modified Files:
	.cvsignore sources sword.spec 
Log Message:
* Thu Nov 23 2006 Deji Akingunola  - 1.5.9-1
- New release
 
* Fri Feb 17 2006 Michael A. Peters  - 1.5.8-7
- Rebuild in devel branch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jun 2005 11:54:45 -0000	1.2
+++ .cvsignore	23 Nov 2006 18:45:08 -0000	1.3
@@ -1 +1 @@
-sword-1.5.8.tar.gz
+sword-1.5.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jun 2005 11:54:45 -0000	1.2
+++ sources	23 Nov 2006 18:45:08 -0000	1.3
@@ -1 +1 @@
-c36398c84bfb044c0c66ef3ffcf29400  sword-1.5.8.tar.gz
+e1f1af8c2add8310d0bbcddc9af523b8  sword-1.5.9.tar.gz


Index: sword.spec
===================================================================
RCS file: /cvs/extras/rpms/sword/FC-5/sword.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sword.spec	17 Feb 2006 12:11:01 -0000	1.8
+++ sword.spec	23 Nov 2006 18:45:08 -0000	1.9
@@ -1,21 +1,19 @@
 Name:           sword           
-Version:        1.5.8
-Release:        7%{?dist}
+Version:        1.5.9
+Release:        1%{?dist}
 Summary:        Free Bible Software Project
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.crosswire.org/sword/
 Source0:        http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz
-Source1:        ar_EG-cp1256.conf
-Source2:        ar_EG-utf8.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  sed >= 3.95
 BuildRequires:  openssl-devel
 BuildRequires:  curl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libicu-devel icu
 
 %description
 The SWORD Project is the CrossWire Bible Society's free Bible software
@@ -30,6 +28,7 @@
 Summary:  Development files for the sword project
 Group:    Development/Libraries
 Requires: %{name} = %{version}
+Requires: pkgconfig
 
 %description devel
 This package contains the development headers and libraries for the
@@ -39,13 +38,9 @@
 
 %prep
 %setup -q
-%{__sed} -i 's?\r??' include/ftptrans.h
-%{__sed} -i 's?\r??' include/ftplibftpt.h
-%{__sed} -i 's?\r??' include/curlftpt.h
-
 
 %build
-%configure --disable-static
+%configure --disable-static --with-icu
 make 
 #%%{?_smp_mflags} sometimes causes build failure
 
@@ -54,8 +49,6 @@
 rm -rf %buildroot
 make install DESTDIR=%buildroot
 %__mkdir_p %buildroot%_datadir/sword/modules
-install -p -m644 %{SOURCE1} %buildroot%_datadir/sword/locales.d/
-install -p -m644 %{SOURCE2} %buildroot%_datadir/sword/locales.d/
 
 find %buildroot%_libdir -type f -name "*.la" -exec rm -f {} ';'
 
@@ -74,7 +67,7 @@
 %doc samples doc
 %config(noreplace) %_sysconfdir/sword.conf
 %_bindir/*
-%dir %_libdir/sword
+%_libdir/sword/
 %_libdir/libsword-%{version}.so
 %_datadir/sword
 
@@ -87,6 +80,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Deji Akingunola  - 1.5.9-1
+- New release
+ 
 * Fri Feb 17 2006 Michael A. Peters  - 1.5.8-7
 - Rebuild in devel branch
 



From fedora-extras-commits at redhat.com  Thu Nov 23 18:58:07 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Thu, 23 Nov 2006 13:58:07 -0500
Subject: rpms/openbox/devel openbox.spec,1.19,1.20
Message-ID: <200611231858.kANIw7vc018617@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/openbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18602

Modified Files:
	openbox.spec 
Log Message:
Do not own the %{_datadir}/gnome/wm-properties directory. That's now part of gnome-session in Rawhide.


Index: openbox.spec
===================================================================
RCS file: /cvs/extras/rpms/openbox/devel/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	23 Nov 2006 18:57:37 -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
@@ -12,6 +12,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{_datadir}/themes
+Requires:	%{_datadir}/gnome/wm-properties
 
 BuildRequires:	gettext
 BuildRequires:	pango-devel
@@ -84,7 +85,6 @@
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/%{name}/
-%dir %{_datadir}/gnome/wm-properties
 %{_datadir}/gnome/wm-properties/%{name}.desktop
 %{_datadir}/xsessions/%{name}.desktop
 %{_libdir}/libobrender.so.*
@@ -107,6 +107,11 @@
 
 
 %changelog
+* 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
+  Core packages.
+
 * 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  Thu Nov 23 19:10:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 14:10:17 -0500
Subject: comps comps-fe5.xml.in, 1.203, 1.204 comps-fe6.xml.in, 1.229,
	1.230 comps-fe7.xml.in, 1.28, 1.29
Message-ID: <200611231910.kANJAHnm021748@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21727/comps

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add scummvm, dd2


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- comps-fe5.xml.in	22 Nov 2006 00:06:30 -0000	1.203
+++ comps-fe5.xml.in	23 Nov 2006 19:09:47 -0000	1.204
@@ -379,6 +379,7 @@
       rocksndiamonds
       rogue
       scorched3d
+      scummvm
       shippy
       sirius
       sopwith


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- comps-fe6.xml.in	23 Nov 2006 08:28:46 -0000	1.229
+++ comps-fe6.xml.in	23 Nov 2006 19:09:47 -0000	1.230
@@ -431,6 +431,7 @@
       rocksndiamonds
       rogue
       scorched3d
+      scummvm
       shippy
       sopwith
       starfighter


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- comps-fe7.xml.in	22 Nov 2006 02:40:51 -0000	1.28
+++ comps-fe7.xml.in	23 Nov 2006 19:09:47 -0000	1.29
@@ -376,6 +376,7 @@
       crystal-stacker-themes
       csmash
       cyphesis
+      dd2
       enigma
       fbg
       fillets-ng
@@ -431,6 +432,7 @@
       rocksndiamonds
       rogue
       scorched3d
+      scummvm
       shippy
       sopwith
       starfighter



From fedora-extras-commits at redhat.com  Thu Nov 23 19:27:23 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 23 Nov 2006 14:27:23 -0500
Subject: rpms/gnomesword/FC-6 .cvsignore, 1.4, 1.5 gnomesword.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200611231927.kANJRNEY021854@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21835

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Thu Nov 23 2006 Deji Akingunola  - 2.1.9-1
- New release (2.1.9)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Apr 2006 07:41:35 -0000	1.4
+++ .cvsignore	23 Nov 2006 19:26:53 -0000	1.5
@@ -1,3 +1 @@
-gnomesword-2.1.2.tar.gz
-gnomesword-2.1.3.tar.gz
-gnomesword-2.1.6.tar.gz
+gnomesword-2.1.9.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-6/gnomesword.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnomesword.spec	4 Oct 2006 22:36:09 -0000	1.13
+++ gnomesword.spec	23 Nov 2006 19:26:53 -0000	1.14
@@ -1,17 +1,16 @@
 Name:           gnomesword           
-Version:        2.1.6
-Release:        5%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.6-svn1213-kjvot.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
-BuildRequires:  sword-devel >= 1.5.8
+BuildRequires:  sword-devel >= 1.5.9
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
@@ -20,6 +19,7 @@
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  perl(XML::Parser)
+BuildRequires:  libicu-devel icu
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -34,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
@@ -42,8 +41,8 @@
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
-make %{?_smp_mflags}
-
+#make %{?_smp_mflags} //fail to build with this
+make
 
 %install
 rm -rf %buildroot
@@ -83,6 +82,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Deji Akingunola  - 2.1.9-1
+- New release (2.1.9)
+
 * Thu Oct 05 2006 Christian Iseli  2.1.6-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2006 07:41:35 -0000	1.5
+++ sources	23 Nov 2006 19:26:53 -0000	1.6
@@ -1,2 +1 @@
-61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
-7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz
+f6c5ebd5a7ee6d248682289e809f36bf  gnomesword-2.1.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 19:39:12 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 23 Nov 2006 14:39:12 -0500
Subject: rpms/gnomesword/FC-5 .cvsignore, 1.3, 1.4 gnomesword.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200611231939.kANJdC3Z021966@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gnomesword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21947

Modified Files:
	.cvsignore gnomesword.spec sources 
Log Message:
* Thu Nov 23 2006 Deji Akingunola  - 2.1.9-1
- New release (2.1.9)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2005 21:18:31 -0000	1.3
+++ .cvsignore	23 Nov 2006 19:38:42 -0000	1.4
@@ -1,2 +1 @@
-gnomesword-2.1.2.tar.gz
-gnomesword-2.1.3.tar.gz
+gnomesword-2.1.9.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/gnomesword.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnomesword.spec	2 May 2006 15:50:24 -0000	1.11
+++ gnomesword.spec	23 Nov 2006 19:38:42 -0000	1.12
@@ -1,17 +1,16 @@
 Name:           gnomesword           
-Version:        2.1.6
-Release:        2%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-Patch0:         gnomesword-2.1.6-svn1213-kjvot.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
-BuildRequires:  sword-devel >= 1.5.8
+BuildRequires:  sword-devel >= 1.5.9
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-spell
@@ -19,6 +18,8 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  libicu-devel icu
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -33,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
@@ -41,8 +41,8 @@
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
-make %{?_smp_mflags}
-
+#make %{?_smp_mflags} //fail to build with this
+make
 
 %install
 rm -rf %buildroot
@@ -82,6 +82,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Deji Akingunola  - 2.1.9-1
+- New release (2.1.9)
+
 * Tue May 02 2006 Michael A. Peters  - 2.1.6-2
 - Fixed crash when viewing OT using KJV module (Patch0)
 - Closes bug 190413


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2006 07:43:47 -0000	1.5
+++ sources	23 Nov 2006 19:38:42 -0000	1.6
@@ -1,2 +1 @@
-61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
-7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz
+f6c5ebd5a7ee6d248682289e809f36bf  gnomesword-2.1.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 20:10:24 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 23 Nov 2006 15:10:24 -0500
Subject: rpms/zope/FC-4 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 zope.spec,
	1.19, 1.20
Message-ID: <200611232010.kANKAOhK025891@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25838

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
added hotfix



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Oct 2005 14:01:46 -0000	1.10
+++ .cvsignore	23 Nov 2006 20:09:54 -0000	1.11
@@ -1 +1,3 @@
 Zope-2.8.3-final.tgz
+Hotfix_20060821.tar.gz
+Hotfix_20060705.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Jul 2006 13:02:51 -0000	1.11
+++ sources	23 Nov 2006 20:09:54 -0000	1.12
@@ -1,2 +1,3 @@
 49fd128fde4f3201d12821782bcfc211  Zope-2.8.3-final.tgz
+5cb921d15ff6d290bfc73bdc20ff67c1  Hotfix_20060821.tar.gz
 6dec58130117fd860adc7fd58f8062e7  Hotfix_20060705.tar.gz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- zope.spec	2 Aug 2006 18:46:08 -0000	1.19
+++ zope.spec	23 Nov 2006 20:09:54 -0000	1.20
@@ -13,12 +13,13 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.8.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
 Source0: http://zope.org/Products/Zope/2.8.3/Zope-2.8.3-final.tgz
 Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source20: http://www.zope.org/Products/Zope/Hotfix-2006-08-21/Hotfix-20060821/Hotfix_20060821.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -112,8 +113,9 @@
 # Actually copy all the other files over
 make install
 
-# Hotfix
+# Hotfix(s)
 tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
+tar -xzf %{SOURCE20} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
 
 chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
@@ -188,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Jonathan Steffan  2.8.3-6
+- Added Hotfix_20060821 (#198106#c2)
+
 * Wed Aug  2 2006 Ville Skytt??  - 2.8.3-5
 - Security: fix world-writable permissions on logrotate config files
   and README.Fedora (#200794).



From fedora-extras-commits at redhat.com  Thu Nov 23 20:16:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:16:01 -0500
Subject: rpms/liquidwar - New directory
Message-ID: <200611232016.kANKG1TT026033@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26029/liquidwar

Log Message:
Directory /cvs/extras/rpms/liquidwar added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 20:16:06 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:16:06 -0500
Subject: rpms/liquidwar/devel - New directory
Message-ID: <200611232016.kANKG6oO026046@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26029/liquidwar/devel

Log Message:
Directory /cvs/extras/rpms/liquidwar/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 20:16:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:16:24 -0500
Subject: rpms/liquidwar Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611232016.kANKGOPr026076@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26070

Added Files:
	Makefile import.log 
Log Message:
Setup of module liquidwar


--- NEW FILE Makefile ---
# Top level Makefile for module liquidwar
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 Nov 23 20:16:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:16:29 -0500
Subject: rpms/liquidwar/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611232016.kANKGTp0026091@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26070/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module liquidwar


--- 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 Nov 23 20:18:25 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 23 Nov 2006 15:18:25 -0500
Subject: rpms/zope/FC-4 zope.spec,1.20,1.21
Message-ID: <200611232018.kANKIPRo026149@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26127

Modified Files:
	zope.spec 
Log Message:
oops




Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- zope.spec	23 Nov 2006 20:09:54 -0000	1.20
+++ zope.spec	23 Nov 2006 20:17:55 -0000	1.21
@@ -13,7 +13,7 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.8.3
-Release: 6%{?dist}
+Release: 6%{?dist}.1
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/



From fedora-extras-commits at redhat.com  Thu Nov 23 20:19:19 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:19:19 -0500
Subject: rpms/liquidwar import.log,1.1,1.2
Message-ID: <200611232019.kANKJJvS026202@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26165

Modified Files:
	import.log 
Log Message:
auto-import liquidwar-5.6.3-1.fc7 on branch devel from liquidwar-5.6.3-1.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Nov 2006 20:16:24 -0000	1.1
+++ import.log	23 Nov 2006 20:18:49 -0000	1.2
@@ -0,0 +1 @@
+liquidwar-5_6_3-1_fc7:HEAD:liquidwar-5.6.3-1.fc7.src.rpm:1164313931



From fedora-extras-commits at redhat.com  Thu Nov 23 20:19:19 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:19:19 -0500
Subject: rpms/liquidwar/devel liquidwar.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611232019.kANKJJHY026206@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26165/devel

Modified Files:
	.cvsignore sources 
Added Files:
	liquidwar.spec 
Log Message:
auto-import liquidwar-5.6.3-1.fc7 on branch devel from liquidwar-5.6.3-1.fc7.src.rpm


--- NEW FILE liquidwar.spec ---
Name:           liquidwar
Version:        5.6.3
Release:        1%{?dist}
Summary:        Multiplayer wargame with liquid armies
Group:          Amusements/Games
License:        GPL
URL:            http://www.ufoot.org/liquidwar/v5
Source:         http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel allegro-tools tetex-latex python texinfo
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
Liquid War is a unique multiplayer wargame. You control an army of liquid
and have to try and eat your opponents. A single player mode is available,
but the game is definitely designed to be multiplayer, and has network
support. 


%package doc
Summary:        Documentation for the LiquidWar game in additional formats
Group:          Documentation
Requires:       %{name} = %{version}-%{release}

%description doc
This package contains the documentation of LiquidWar in html, pdf, ps and txt
format.


%prep
%setup -q
# don't strip the binaries please 
sed -i 's/install -s/install/g' Makefile.in
# fix manpage doc reference
sed -i \
  -e 's:^\.B /usr/share/doc/liquidwar $:\.B %{_docdir}/%{name}-doc-%{version}:' \
  -e 's:^or $:directory (from :' \
  -e 's:^\.B /usr/local/share/doc/liquidwar$:the %{name}-doc :' \
  -e 's:^directories, :package), :' \
  doc/man/begin.man.in
# fix metaserer url
sed -i 's#http://www.ufoot.org/liquidwar/metaserver.php3#http://www.ufoot.org/liquidwar/v5/metaserver#g' \
  doc/xml/*.xml


%build
%configure \
%ifnarch %{ix86}
  --disable-asm
%endif

make %{?_smp_mflags} GAMEDIR=%{_bindir} DATADIR=%{_datadir}/%{name}

# make docs utf-8
iconv -f ISO-8859-1 -t UTF8 doc/man/%{name}.6 | gzip > doc/man/%{name}.6.gz
gzip -cd doc/info/%{name}.info.gz | \
  iconv -f ISO-8859-1 -t UTF8 > doc/info/%{name}.info
gzip -f doc/info/%{name}.info


%install
rm -rf $RPM_BUILD_ROOT
make install_nolink DESTDIR=$RPM_BUILD_ROOT GAMEDIR=%{_bindir} \
  DATADIR=%{_datadir}/%{name} 
mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} liquidwardocs
rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm

# below is the desktop file and icon stuff.
desktop-file-install --delete-original --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications        \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{32x32,48x48}/apps
install -p -m 644 misc/%{name}_32x32.xpm \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
install -p -m 644 misc/%{name}.xpm \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%preun
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
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 COPYING README
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_infodir}/%{name}.*
%{_mandir}/man6/%{name}*.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.xpm

%files doc
%defattr(-,root,root,-)
%doc liquidwardocs/*


%changelog
* Sun Nov 19 2006 Hans de Goede  5.6.3-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Nov 2006 20:16:29 -0000	1.1
+++ .cvsignore	23 Nov 2006 20:18:49 -0000	1.2
@@ -0,0 +1 @@
+liquidwar-5.6.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Nov 2006 20:16:29 -0000	1.1
+++ sources	23 Nov 2006 20:18:49 -0000	1.2
@@ -0,0 +1 @@
+a41473c281f214c1ac96ab50f98537c9  liquidwar-5.6.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 23 20:21:36 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 23 Nov 2006 15:21:36 -0500
Subject: rpms/zope/FC-4 zope.spec,1.21,1.22
Message-ID: <200611232021.kANKLa3n026261@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26244

Modified Files:
	zope.spec 
Log Message:
updated changelog



Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-4/zope.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- zope.spec	23 Nov 2006 20:17:55 -0000	1.21
+++ zope.spec	23 Nov 2006 20:21:06 -0000	1.22
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Jonathan Steffan  2.8.3-6.fc4.1
+- Retag
+
 * Thu Nov 23 2006 Jonathan Steffan  2.8.3-6
 - Added Hotfix_20060821 (#198106#c2)
 



From fedora-extras-commits at redhat.com  Thu Nov 23 20:24:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 23 Nov 2006 15:24:13 -0500
Subject: owners owners.list,1.2001,1.2002
Message-ID: <200611232024.kANKODjh026380@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26341

Modified Files:
	owners.list 
Log Message:
added liquidwar


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2001
retrieving revision 1.2002
diff -u -r1.2001 -r1.2002
--- owners.list	23 Nov 2006 17:05:49 -0000	1.2001
+++ owners.list	23 Nov 2006 20:23:43 -0000	1.2002
@@ -1030,6 +1030,7 @@
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|jeff at ocjtech.us|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|kevin at tummy.com
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|liquidwar|Multiplayer wargame with liquid armies|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|lirc-kmod|LIRC kernel modules|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi
 Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi



From fedora-extras-commits at redhat.com  Thu Nov 23 20:25:09 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 23 Nov 2006 15:25:09 -0500
Subject: comps Makefile,1.3,1.4
Message-ID: <200611232025.kANKP9FD026403@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26388

Modified Files:
	Makefile 
Log Message:
explicitly specify Makefile


Index: Makefile
===================================================================
RCS file: /cvs/extras/comps/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile	29 Oct 2006 11:55:48 -0000	1.3
+++ Makefile	23 Nov 2006 20:24:39 -0000	1.4
@@ -4,7 +4,7 @@
 all: po $(XMLFILES)
 
 po: $(XMLINFILES)
-	make -C po || exit 1
+	make -C po -f Makefile || exit 1
 
 clean:
 	@rm -fv *~



From fedora-extras-commits at redhat.com  Thu Nov 23 20:26:35 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 23 Nov 2006 15:26:35 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.16,1.17
Message-ID: <200611232026.kANKQZpT026432@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415

Modified Files:
	ppracer.spec 
Log Message:
install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede)
add dist tag



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ppracer.spec	28 Aug 2006 13:50:10 -0000	1.16
+++ ppracer.spec	23 Nov 2006 20:26:05 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 7
+Release: 8%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,9 @@
 Source1: ppracer.png
 Source2: ppracer.desktop
 
+# temporary workaround for libGLU deficiencies
+Source3: tree.png
+
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
 Patch2: ppracer-0.3.1-c++.patch
@@ -57,6 +60,12 @@
 %patch1 -p1 -b .lib64
 %patch2 -p1 -b .c++
 
+# temporary workaround for libGLU deficiencies
+if [ ! -f data/courses/themes/models/common/tree.png.brokenlibGLU ]; then
+    mv data/courses/themes/models/common/tree.png data/courses/themes/models/common/tree.png.brokenlibGLU
+    cp %{SOURCE3} data/courses/themes/models/common/tree.png
+fi
+
 %build
 autoconf
 %configure --with-data-dir=%{_datadir}/ppracer
@@ -85,6 +94,11 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* 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)
+- add dist tag
+
 * Mon Aug 28 2006 Nils Philippsen  0.3.1-7
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 20:39:13 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Thu, 23 Nov 2006 15:39:13 -0500
Subject: rpms/zope/FC-3 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 zope.spec,
	1.10, 1.11
Message-ID: <200611232039.kANKdDeZ026661@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26642

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
added hotfix



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2005 20:50:46 -0000	1.7
+++ .cvsignore	23 Nov 2006 20:38:43 -0000	1.8
@@ -1 +1,2 @@
 Zope-2.8.0-final.tar.gz
+Hotfix_20060821.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jul 2006 13:02:44 -0000	1.8
+++ sources	23 Nov 2006 20:38:43 -0000	1.9
@@ -1,2 +1,3 @@
 f734fa4c55f36b5038f36be9a6d4e61e  Zope-2.8.0-final.tar.gz
 6dec58130117fd860adc7fd58f8062e7  Hotfix_20060705.tar.gz
+5cb921d15ff6d290bfc73bdc20ff67c1  Hotfix_20060821.tar.gz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-3/zope.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zope.spec	2 Aug 2006 18:46:07 -0000	1.10
+++ zope.spec	23 Nov 2006 20:38:43 -0000	1.11
@@ -13,12 +13,13 @@
 Name:    zope
 Summary: Web application server for flexible content management applications
 Version: 2.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
 Source0: http://zope.org/Products/Zope/2.8.0/Zope-2.8.0-final.tar.gz
 Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source20: http://www.zope.org/Products/Zope/Hotfix-2006-08-21/Hotfix-20060821/Hotfix_20060821.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -103,6 +104,7 @@
 
 # Hotfix
 tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
+tar -xzf %{SOURCE20} -C $RPM_BUILD_ROOT%{zope_home}/lib/python/Products
 
 chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
@@ -177,6 +179,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Jonathan Steffan  2.8.0-5
+- Added Hotfix_20060821 (#198106#c2)
+
 * Wed Aug  2 2006 Ville Skytt??  - 2.8.0-4
 - Security: fix world-writable permissions on logrotate config files
   and README.Fedora (#200794).



From fedora-extras-commits at redhat.com  Thu Nov 23 20:57:13 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 23 Nov 2006 15:57:13 -0500
Subject: rpms/ppracer/FC-6 ppracer.spec,1.16,1.17
Message-ID: <200611232057.kANKvDpf026828@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26448

Modified Files:
	ppracer.spec 
Log Message:
install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede)
add dist tag



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/FC-6/ppracer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ppracer.spec	28 Aug 2006 13:50:10 -0000	1.16
+++ ppracer.spec	23 Nov 2006 20:56:43 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 7
+Release: 8%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,9 @@
 Source1: ppracer.png
 Source2: ppracer.desktop
 
+# temporary workaround for libGLU deficiencies
+Source3: tree.png
+
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
 Patch2: ppracer-0.3.1-c++.patch
@@ -57,6 +60,12 @@
 %patch1 -p1 -b .lib64
 %patch2 -p1 -b .c++
 
+# temporary workaround for libGLU deficiencies
+if [ ! -f data/courses/themes/models/common/tree.png.brokenlibGLU ]; then
+    mv data/courses/themes/models/common/tree.png data/courses/themes/models/common/tree.png.brokenlibGLU
+    cp %{SOURCE3} data/courses/themes/models/common/tree.png
+fi
+
 %build
 autoconf
 %configure --with-data-dir=%{_datadir}/ppracer
@@ -85,6 +94,11 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* 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)
+- add dist tag
+
 * Mon Aug 28 2006 Nils Philippsen  0.3.1-7
 - FC6 mass rebuild
 



From fedora-extras-commits at redhat.com  Thu Nov 23 20:58:37 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Thu, 23 Nov 2006 15:58:37 -0500
Subject: rpms/ppracer/FC-6 tree.png,NONE,1.1
Message-ID: <200611232058.kANKwbGA026881@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26876

Added Files:
	tree.png 
Log Message:
install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede)
add dist tag




From fedora-extras-commits at redhat.com  Thu Nov 23 21:31:03 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 23 Nov 2006 16:31:03 -0500
Subject: rpms/libsexy/devel libsexy.spec,1.11,1.12
Message-ID: <200611232131.kANLV3D4030155@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libsexy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30138

Modified Files:
	libsexy.spec 
Log Message:
* Thu Nov 23 2006 Brian Pepple  - 0.1.10-2
- Update URL (#217073).



Index: libsexy.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexy/devel/libsexy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsexy.spec	5 Sep 2006 13:35:30 -0000	1.11
+++ libsexy.spec	23 Nov 2006 21:30:33 -0000	1.12
@@ -1,11 +1,11 @@
 Name:           libsexy
 Version:        0.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://wiki.chipx86.com/wiki/Libsexy
+URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/%{name}/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Brian Pepple  - 0.1.10-2
+- Update URL (#217073).
+
 * Tue Sep  5 2006 Brian Pepple  - 0.1.10-1
 - Update to 0.1.10.
 



From fedora-extras-commits at redhat.com  Thu Nov 23 21:32:26 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 23 Nov 2006 16:32:26 -0500
Subject: rpms/libsexy/FC-6 libsexy.spec,1.11,1.12
Message-ID: <200611232132.kANLWQkN030192@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/libsexy/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30177

Modified Files:
	libsexy.spec 
Log Message:
* Thu Nov 23 2006 Brian Pepple  - 0.1.10-2
- Update URL (#217073).



Index: libsexy.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexy/FC-6/libsexy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsexy.spec	5 Sep 2006 13:35:30 -0000	1.11
+++ libsexy.spec	23 Nov 2006 21:31:55 -0000	1.12
@@ -1,11 +1,11 @@
 Name:           libsexy
 Version:        0.1.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://wiki.chipx86.com/wiki/Libsexy
+URL:            http://www.chipx86.com/wiki/Libsexy
 Source0:        http://releases.chipx86.com/%{name}/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Brian Pepple  - 0.1.10-2
+- Update URL (#217073).
+
 * Tue Sep  5 2006 Brian Pepple  - 0.1.10-1
 - Update to 0.1.10.
 



From fedora-extras-commits at redhat.com  Thu Nov 23 23:16:32 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:16:32 -0500
Subject: rpms/php-pear-Date/FC-6 .cvsignore, 1.2, 1.3 php-pear-Date.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611232316.kANNGWGr004098@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4041/FC-6

Modified Files:
	.cvsignore php-pear-Date.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 21:07:53 -0000	1.2
+++ .cvsignore	23 Nov 2006 23:16:02 -0000	1.3
@@ -1 +1 @@
-Date-1.4.6.tgz
+Date-1.4.7.tgz


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/php-pear-Date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Date.spec	7 Sep 2006 21:07:53 -0000	1.1
+++ php-pear-Date.spec	23 Nov 2006 23:16:02 -0000	1.2
@@ -2,7 +2,7 @@
 %define ClassName Date
 
 Name:           php-pear-Date
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Date and Time Zone Classes
 
@@ -83,5 +83,8 @@
 
 
 %changelog
+* Thu Nov 23 2006 Christopher Stone  1.4.7-1
+- Upstream Sync
+
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 21:07:53 -0000	1.2
+++ sources	23 Nov 2006 23:16:02 -0000	1.3
@@ -1 +1 @@
-9acd7e19d094877c6d26be1fbabe79cb  Date-1.4.6.tgz
+6d34306e484d46c205002f8900ce6da3  Date-1.4.7.tgz



From fedora-extras-commits at redhat.com  Thu Nov 23 23:16:32 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:16:32 -0500
Subject: rpms/php-pear-Date/FC-5 .cvsignore, 1.2, 1.3 php-pear-Date.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611232316.kANNGWiA004093@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4041/FC-5

Modified Files:
	.cvsignore php-pear-Date.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 21:07:53 -0000	1.2
+++ .cvsignore	23 Nov 2006 23:16:02 -0000	1.3
@@ -1 +1 @@
-Date-1.4.6.tgz
+Date-1.4.7.tgz


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-5/php-pear-Date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Date.spec	7 Sep 2006 21:07:53 -0000	1.1
+++ php-pear-Date.spec	23 Nov 2006 23:16:02 -0000	1.2
@@ -2,7 +2,7 @@
 %define ClassName Date
 
 Name:           php-pear-Date
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Date and Time Zone Classes
 
@@ -83,5 +83,8 @@
 
 
 %changelog
+* Thu Nov 23 2006 Christopher Stone  1.4.7-1
+- Upstream Sync
+
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 21:07:53 -0000	1.2
+++ sources	23 Nov 2006 23:16:02 -0000	1.3
@@ -1 +1 @@
-9acd7e19d094877c6d26be1fbabe79cb  Date-1.4.6.tgz
+6d34306e484d46c205002f8900ce6da3  Date-1.4.7.tgz



From fedora-extras-commits at redhat.com  Thu Nov 23 23:16:38 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:16:38 -0500
Subject: rpms/php-pear-Date/devel .cvsignore, 1.2, 1.3 php-pear-Date.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611232316.kANNGcoE004103@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4041/devel

Modified Files:
	.cvsignore php-pear-Date.spec sources 
Log Message:
Upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2006 21:07:53 -0000	1.2
+++ .cvsignore	23 Nov 2006 23:16:08 -0000	1.3
@@ -1 +1 @@
-Date-1.4.6.tgz
+Date-1.4.7.tgz


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/php-pear-Date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Date.spec	7 Sep 2006 21:07:53 -0000	1.1
+++ php-pear-Date.spec	23 Nov 2006 23:16:08 -0000	1.2
@@ -2,7 +2,7 @@
 %define ClassName Date
 
 Name:           php-pear-Date
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        Date and Time Zone Classes
 
@@ -83,5 +83,8 @@
 
 
 %changelog
+* Thu Nov 23 2006 Christopher Stone  1.4.7-1
+- Upstream Sync
+
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2006 21:07:53 -0000	1.2
+++ sources	23 Nov 2006 23:16:08 -0000	1.3
@@ -1 +1 @@
-9acd7e19d094877c6d26be1fbabe79cb  Date-1.4.6.tgz
+6d34306e484d46c205002f8900ce6da3  Date-1.4.7.tgz



From fedora-extras-commits at redhat.com  Thu Nov 23 23:27:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:27:02 -0500
Subject: rpms/php-pear-Date/FC-5 php-pear-Date.spec,1.2,1.3
Message-ID: <200611232327.kANNR2RW004208@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/FC-5

Modified Files:
	php-pear-Date.spec 
Log Message:
Some fixes for new release


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-5/php-pear-Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Date.spec	23 Nov 2006 23:16:02 -0000	1.2
+++ php-pear-Date.spec	23 Nov 2006 23:26:32 -0000	1.3
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -57,6 +57,9 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# Fix end of line encoding
+dos2unix docdir/%{ClassName}/docs/TODO
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
+%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
 %{pear_xmldir}/%{ClassName}.xml
 %{pear_testdir}/%{ClassName}
 %{pear_phpdir}/%{ClassName}
@@ -85,6 +88,8 @@
 %changelog
 * Thu Nov 23 2006 Christopher Stone  1.4.7-1
 - Upstream Sync
+- Fix end-of-line encoding for TODO
+- Remove docs dir from %doc
 
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Nov 23 23:27:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:27:02 -0500
Subject: rpms/php-pear-Date/FC-6 php-pear-Date.spec,1.2,1.3
Message-ID: <200611232327.kANNR28B004211@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/FC-6

Modified Files:
	php-pear-Date.spec 
Log Message:
Some fixes for new release


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/FC-6/php-pear-Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Date.spec	23 Nov 2006 23:16:02 -0000	1.2
+++ php-pear-Date.spec	23 Nov 2006 23:26:32 -0000	1.3
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -57,6 +57,9 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# Fix end of line encoding
+dos2unix docdir/%{ClassName}/docs/TODO
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
+%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
 %{pear_xmldir}/%{ClassName}.xml
 %{pear_testdir}/%{ClassName}
 %{pear_phpdir}/%{ClassName}
@@ -85,6 +88,8 @@
 %changelog
 * Thu Nov 23 2006 Christopher Stone  1.4.7-1
 - Upstream Sync
+- Fix end-of-line encoding for TODO
+- Remove docs dir from %doc
 
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Nov 23 23:27:02 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 23 Nov 2006 18:27:02 -0500
Subject: rpms/php-pear-Date/devel php-pear-Date.spec,1.2,1.3
Message-ID: <200611232327.kANNR2w8004214@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/php-pear-Date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4167/devel

Modified Files:
	php-pear-Date.spec 
Log Message:
Some fixes for new release


Index: php-pear-Date.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Date/devel/php-pear-Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-pear-Date.spec	23 Nov 2006 23:16:08 -0000	1.2
+++ php-pear-Date.spec	23 Nov 2006 23:26:32 -0000	1.3
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
+BuildRequires:  php-pear >= 1:1.4.9-1.2 dos2unix
 Requires:       php-pear(PEAR)
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -57,6 +57,9 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# Fix end of line encoding
+dos2unix docdir/%{ClassName}/docs/TODO
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +78,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{ClassName}-%{version}/docdir/%{ClassName}/*
+%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
 %{pear_xmldir}/%{ClassName}.xml
 %{pear_testdir}/%{ClassName}
 %{pear_phpdir}/%{ClassName}
@@ -85,6 +88,8 @@
 %changelog
 * Thu Nov 23 2006 Christopher Stone  1.4.7-1
 - Upstream Sync
+- Fix end-of-line encoding for TODO
+- Remove docs dir from %doc
 
 * Fri Jun 30 2006 Christopher Stone  1.4.6-1
 - Initial Release



From fedora-extras-commits at redhat.com  Thu Nov 23 23:42:12 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:42:12 -0500
Subject: rpms/xdms - New directory
Message-ID: <200611232342.kANNgCgi004414@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4410/xdms

Log Message:
Directory /cvs/extras/rpms/xdms added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 23:42:18 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:42:18 -0500
Subject: rpms/xdms/devel - New directory
Message-ID: <200611232342.kANNgIHC004428@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4410/xdms/devel

Log Message:
Directory /cvs/extras/rpms/xdms/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 23 23:42:36 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:42:36 -0500
Subject: rpms/xdms Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611232342.kANNgaPt004457@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4451

Added Files:
	Makefile import.log 
Log Message:
Setup of module xdms


--- NEW FILE Makefile ---
# Top level Makefile for module xdms
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 Nov 23 23:42:41 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:42:41 -0500
Subject: rpms/xdms/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611232342.kANNgf6D004472@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4451/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xdms


--- 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 Nov 23 23:43:45 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:43:45 -0500
Subject: rpms/xdms import.log,1.1,1.2
Message-ID: <200611232343.kANNhjE9004541@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4511

Modified Files:
	import.log 
Log Message:
auto-import xdms-1.3.2-3 on branch devel from xdms-1.3.2-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xdms/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Nov 2006 23:42:36 -0000	1.1
+++ import.log	23 Nov 2006 23:43:15 -0000	1.2
@@ -0,0 +1 @@
+xdms-1_3_2-3:HEAD:xdms-1.3.2-3.src.rpm:1164329521



From fedora-extras-commits at redhat.com  Thu Nov 23 23:43:45 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:43:45 -0500
Subject: rpms/xdms/devel xdms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611232343.kANNhjTE004545@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/rpms/xdms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4511/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xdms.spec 
Log Message:
auto-import xdms-1.3.2-3 on branch devel from xdms-1.3.2-3.src.rpm


--- NEW FILE xdms.spec ---
Name:           xdms
Version:        1.3.2
Release:        3%{?dist}
Summary:        Extracts Amiga DMS archives

Group:          Applications/Archiving
License:        Public Domain
URL:            http://zakalwe.fi/~shd/foss/%{name}
Source0:        http://zakalwe.fi/~shd/foss/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Extracts Amiga DMS (Disk Masher) archives which are compressed Amiga disk
images. Xdms is particularly useful with Amiga emulators.


%prep
%setup -q


%build
# Non standard configure script that does not support libdir for example.
CFLAGS="%{optflags}" ./configure --prefix=%{_usr}
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man1
install -p -m0644 xdms.1 %{buildroot}%{_mandir}/man1
install -p -m0755 src/xdms %{buildroot}%{_bindir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/xdms
%{_mandir}/man1/xdms.1.*
%doc ChangeLog.txt %{name}.txt


%changelog
* Sat Nov 18 2006 Ian Chapman  1.3.2-3
- Minor spec cleanups

* Mon Nov 06 2006 Ian Chapman  1.3.2-2
- Possible migration to FE

* Mon Oct 23 2006 Ian Chapman  1.3.2-1
- Upgrade to 1.3.2

* Mon May 29 2006 Ian Chapman  1.3.1-3
- Replace %%{__rm} in clean section with rm
- Use rpmoptflags

* Mon May 01 2006 Ian Chapman  1.3.1-2.iss
- Altered spec file to follow Fedora style more closely
- Removed readdisk as this was actually an Amiga binary

* Sun Dec 18 2005 Ian Chapman  1.3.1-1.iss
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdms/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Nov 2006 23:42:41 -0000	1.1
+++ .cvsignore	23 Nov 2006 23:43:15 -0000	1.2
@@ -0,0 +1 @@
+xdms-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdms/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Nov 2006 23:42:41 -0000	1.1
+++ sources	23 Nov 2006 23:43:15 -0000	1.2
@@ -0,0 +1 @@
+f687a5beba88964ef0afd478efe99849  xdms-1.3.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 23 23:46:24 2006
From: fedora-extras-commits at redhat.com (Ian Chapman (oddsocks))
Date: Thu, 23 Nov 2006 18:46:24 -0500
Subject: owners owners.list,1.2002,1.2003
Message-ID: <200611232346.kANNkOMA004601@cvs-int.fedora.redhat.com>

Author: oddsocks

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4580

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2002
retrieving revision 1.2003
diff -u -r1.2002 -r1.2003
--- owners.list	23 Nov 2006 20:23:43 -0000	1.2002
+++ owners.list	23 Nov 2006 23:45:54 -0000	1.2003
@@ -2455,6 +2455,7 @@
 Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xdg-utils|Basic desktop integration functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|xdms|Extracts Amiga DMS archives|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
 Fedora Extras|xdrawchem|2D chemical structures drawing tool|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 24 03:47:12 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 23 Nov 2006 22:47:12 -0500
Subject: rpms/snort/devel .cvsignore, 1.6, 1.7 snort.spec, 1.18, 1.19 sources,
	1.6, 1.7
Message-ID: <200611240347.kAO3lC8m017342@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/snort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17323

Modified Files:
	.cvsignore snort.spec sources 
Log Message:
update to 2.6.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Oct 2006 17:38:28 -0000	1.6
+++ .cvsignore	24 Nov 2006 03:46:42 -0000	1.7
@@ -1 +1 @@
-snort-2.6.0.2.tar.gz
+snort-2.6.1.1.tar.gz


Index: snort.spec
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- snort.spec	9 Oct 2006 18:59:52 -0000	1.18
+++ snort.spec	24 Nov 2006 03:46:42 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:        Intrusion detection system
 Name:           snort
-Version:        2.6.0.2
-Release:        2%{?dist}
+Version:        2.6.1.1
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Internet
 Source0:        http://www.snort.org/dl/current/snort-%{version}.tar.gz
@@ -24,7 +24,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 
 %package        mysql
@@ -37,7 +36,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 BuildRequires:  mysql-devel
 
@@ -51,7 +49,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 BuildRequires:  postgresql-devel
 
@@ -66,7 +63,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 BuildRequires:  net-snmp-devel
 BuildRequires:  openssl-devel
@@ -75,7 +71,6 @@
 Summary:        Snort with Flexible Response
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:       libnet10
 BuildRequires:  libnet10
 BuildRequires:  net-snmp-devel
 BuildRequires:  postgresql-devel
@@ -425,6 +420,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Dennis Gilmore  - 2.6.1.1-1
+-upgrade to 2.6.1.1
+
 * Mon Oct 09 2006 Dennis Gilmore  - 2.6.0.2-2
 - disable smp  as it breaks build on the buildsys
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/snort/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Oct 2006 17:38:28 -0000	1.6
+++ sources	24 Nov 2006 03:46:42 -0000	1.7
@@ -1 +1 @@
-5c094ff6d82db845a5f023e4a492103e  snort-2.6.0.2.tar.gz
+a7313ff4346317c301af361e211a7cd4  snort-2.6.1.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 06:52:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 24 Nov 2006 01:52:30 -0500
Subject: rpms/liquidwar/devel liquidwar.init, NONE, 1.1 liquidwar.logrotate, 
	NONE, 1.1 liquidwar.sysconfig, NONE, 1.1 liquidwar.spec, 1.1, 1.2
Message-ID: <200611240652.kAO6qUH0026953@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26933

Modified Files:
	liquidwar.spec 
Added Files:
	liquidwar.init liquidwar.logrotate liquidwar.sysconfig 
Log Message:
Added support for running liquidwar as a daemon




--- NEW FILE liquidwar.init ---
#!/bin/sh
#
# liquidwar    This shell script takes care of starting and stopping
#              the liquidwar game server.
#
# chkconfig:   - 15 85
# description: The liquidwar server supports playing networked \
#              multi-player games.
# processname: liquidwar-server
# config:      /etc/sysconfig/liquidwar
# pidfile:     /var/run/liquidwar-server.pid

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0

exec="/usr/bin/liquidwar-server"
prog=$(basename $exec)
name=liquidwar
pidfile=/var/run/$prog.pid

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting liquidwar game server: "
    if [ -n "`/sbin/pidof $prog`" ]; then
        echo -n $"$prog already running"
        failure
        echo
        return 1
    fi

    # This doesn't properly detect startup failures
    daemon --user liquidwar $exec $LIQUIDWAR_OPTIONS >>/var/log/${prog}.log 2>&1 &
    retval=$?
    if [ $retval -eq 0 ]; then
        success
        touch $lockfile
    else
        failure
    fi
    echo
    return $retval
}

stop() {
    echo -n $"Stopping liquidwar game server: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
        [ ! -f $lockfile ] || restart
    ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE liquidwar.logrotate ---
/var/log/liquidwar-server.log {
    copytruncate
    notifempty
    missingok
}


--- NEW FILE liquidwar.sysconfig ---
#
# liquidwar-server(6) options. Pick a custom port here if needed, for example.
#

# The default options call for a 2 player game that is not advertised to
# the public metaserver.  The default port that the game uses is tcp/8035.  Be
# sure to open up this port in your firewall, or change the port in the
# options below.
LIQUIDWAR_OPTIONS="-2 -private"


Index: liquidwar.spec
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/liquidwar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liquidwar.spec	23 Nov 2006 20:18:49 -0000	1.1
+++ liquidwar.spec	24 Nov 2006 06:52:00 -0000	1.2
@@ -1,15 +1,23 @@
 Name:           liquidwar
 Version:        5.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiplayer wargame with liquid armies
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.ufoot.org/liquidwar/v5
-Source:         http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source1:        liquidwar.init 
+Source2:        liquidwar.sysconfig 
+Source3:        liquidwar.logrotate 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel allegro-tools tetex-latex python texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
 
 %description
 Liquid War is a unique multiplayer wargame. You control an army of liquid
@@ -27,6 +35,13 @@
 This package contains the documentation of LiquidWar in html, pdf, ps and txt
 format.
 
+%package server
+Summary:        Network game server for the LiquidWar game
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
+%description server
+This package contains the server for hosting network LiquidWar games.
+
 
 %prep
 %setup -q
@@ -76,6 +91,12 @@
 install -p -m 644 misc/%{name}.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
 
+install -p -D -m 755 %{SOURCE1} \
+        $RPM_BUILD_ROOT/%{_initrddir}/%{name}-server
+install -p -D -m 644 %{SOURCE2} \
+        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server
+install -p -D -m 644 %{SOURCE3} \
+        $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,14 +120,38 @@
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+%pre server
+user_uid=`id -u %{name} 2>/dev/null`
+if [ x"$user_uid" = x ] ; then
+    useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
+            -c 'LiquidWar Server' \
+            %{name} >/dev/null || :
+fi
+
+%post server
+/sbin/chkconfig --add %{name}-server
+
+%preun server
+if [ "$1" -le "0" ]; then
+    /sbin/service %{name}-server stop > /dev/null 2>&1
+    /sbin/chkconfig --del %{name}-server
+fi
+
+%postun server
+if [ "$1" -ge "1" ]; then
+    /sbin/service %{name}-server condrestart > /dev/null 2>&1
+fi
+
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_bindir}/%{name}*
+%{_bindir}/%{name}
+%{_bindir}/%{name}-mapgen
 %{_datadir}/%{name}
 %{_infodir}/%{name}.*
-%{_mandir}/man6/%{name}*.6.gz
+%{_mandir}/man6/%{name}.6.gz
+%{_mandir}/man6/%{name}-mapgen.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.xpm
 
@@ -114,7 +159,17 @@
 %defattr(-,root,root,-)
 %doc liquidwardocs/*
 
+%files server
+%{_bindir}/%{name}-server
+%{_mandir}/man6/%{name}-server.6.gz
+%{_initrddir}/%{name}-server
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server
+
 
 %changelog
+* Thu Nov 23 2006 Wart  5.6.3-2
+- Added init.d startup script for the game server
+
 * Sun Nov 19 2006 Hans de Goede  5.6.3-1
 - Initial Fedora Extras package



From fedora-extras-commits at redhat.com  Fri Nov 24 07:43:58 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Fri, 24 Nov 2006 02:43:58 -0500
Subject: rpms/python-nose/devel .cvsignore, 1.3, 1.4 python-nose.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <200611240743.kAO7hw2i030242@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30223

Modified Files:
	.cvsignore python-nose.spec sources 
Log Message:
0.9.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Sep 2006 07:03:54 -0000	1.3
+++ .cvsignore	24 Nov 2006 07:43:28 -0000	1.4
@@ -1 +1 @@
-nose-0.9.0.tar.gz
+nose-0.9.1.tar.gz


Index: python-nose.spec
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/python-nose.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-nose.spec	8 Sep 2006 07:03:54 -0000	1.2
+++ python-nose.spec	24 Nov 2006 07:43:28 -0000	1.3
@@ -3,7 +3,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-nose
-Version:        0.9.0
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        A discovery-based unittest extension for Python
 
@@ -14,7 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools >= 0.6a9
+BuildRequires:  python-devel python-setuptools
 
 %description
 nose: a discovery-based unittest extension.
@@ -44,6 +44,9 @@
 %{python_sitelib}/nose
 
 %changelog
+* Fri Nov 24 2006 Luke Macken  0.9.1-1
+- 0.9.1
+
 * Fri Sep  8 2006 Luke Macken  0.9.0-1
 - 0.9.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Sep 2006 07:03:54 -0000	1.3
+++ sources	24 Nov 2006 07:43:28 -0000	1.4
@@ -1 +1 @@
-1901f18ae082a711773d6f77cc312db2  nose-0.9.0.tar.gz
+97771e186ff3680e1abe5566a939966c  nose-0.9.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 07:48:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Fri, 24 Nov 2006 02:48:06 -0500
Subject: rpms/python-simplejson/devel .cvsignore, 1.2,
	1.3 python-simplejson.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611240748.kAO7m6Bq030338@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-simplejson/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30319

Modified Files:
	.cvsignore python-simplejson.spec sources 
Log Message:
1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simplejson/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2006 19:47:10 -0000	1.2
+++ .cvsignore	24 Nov 2006 07:47:36 -0000	1.3
@@ -1 +1 @@
-simplejson-1.3.tar.gz
+simplejson-1.4.tar.gz


Index: python-simplejson.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simplejson/devel/python-simplejson.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-simplejson.spec	4 Sep 2006 00:52:09 -0000	1.2
+++ python-simplejson.spec	24 Nov 2006 07:47:36 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-simplejson
-Version:        1.3
-Release:        4%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Simple, fast, extensible JSON encoder/decoder for Python
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Luke Macken  - 1.4-1
+- 1.4
+
 * Sun Sep  3 2006 Luke Macken  - 1.3-4
 - Rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simplejson/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2006 19:47:10 -0000	1.2
+++ sources	24 Nov 2006 07:47:36 -0000	1.3
@@ -1 +1 @@
-fbe039b9b863572651a0f665acea34c9  simplejson-1.3.tar.gz
+5fbad786a4b151d44a9b1e1e157e5510  simplejson-1.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 09:56:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 04:56:45 -0500
Subject: rpms/liquidwar/devel liquidwar.spec,1.2,1.3
Message-ID: <200611240956.kAO9ujqg005025@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/liquidwar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5010

Modified Files:
	liquidwar.spec 
Log Message:
* Thu Nov 23 2006 Wart  5.6.3-2
- Added init.d startup and logrotate scripts for the game server
- Put the game server in its own subpackage



Index: liquidwar.spec
===================================================================
RCS file: /cvs/extras/rpms/liquidwar/devel/liquidwar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- liquidwar.spec	24 Nov 2006 06:52:00 -0000	1.2
+++ liquidwar.spec	24 Nov 2006 09:56:15 -0000	1.3
@@ -13,11 +13,6 @@
 BuildRequires:  allegro-devel allegro-tools tetex-latex python texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Requires(post): /sbin/chkconfig
-Requires(post): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
 
 %description
 Liquid War is a unique multiplayer wargame. You control an army of liquid
@@ -35,10 +30,16 @@
 This package contains the documentation of LiquidWar in html, pdf, ps and txt
 format.
 
+
 %package server
 Summary:        Network game server for the LiquidWar game
 Group:          Amusements/Games
 Requires:       %{name} = %{version}-%{release}
+Requires(pre):  /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig /sbin/service
+Requires(postun): /sbin/service
+
 %description server
 This package contains the server for hosting network LiquidWar games.
 
@@ -98,6 +99,7 @@
 install -p -D -m 644 %{SOURCE3} \
         $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -120,10 +122,11 @@
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %pre server
 user_uid=`id -u %{name} 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
+    /usr/sbin/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
             -c 'LiquidWar Server' \
             %{name} >/dev/null || :
 fi
@@ -169,7 +172,8 @@
 
 %changelog
 * Thu Nov 23 2006 Wart  5.6.3-2
-- Added init.d startup script for the game server
+- Added init.d startup and logrotate scripts for the game server
+- Put the game server in its own subpackage
 
 * Sun Nov 19 2006 Hans de Goede  5.6.3-1
 - Initial Fedora Extras package



From fedora-extras-commits at redhat.com  Fri Nov 24 10:16:53 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Fri, 24 Nov 2006 05:16:53 -0500
Subject: rpms/ppracer/FC-5 tree.png,NONE,1.1 ppracer.spec,1.15,1.16
Message-ID: <200611241016.kAOAGrqh008183@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8158

Modified Files:
	ppracer.spec 
Added Files:
	tree.png 
Log Message:
install 256px x 256px tree.png as a temporary workaround for libGLU deficiencies (#199011, image supplied by Hans de Goede)
add dist tag



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/FC-5/ppracer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ppracer.spec	17 Feb 2006 15:13:51 -0000	1.15
+++ ppracer.spec	24 Nov 2006 10:16:23 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 6
+Release: 8%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,9 @@
 Source1: ppracer.png
 Source2: ppracer.desktop
 
+# temporary workaround for libGLU deficiencies
+Source3: tree.png
+
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
 Patch2: ppracer-0.3.1-c++.patch
@@ -57,6 +60,12 @@
 %patch1 -p1 -b .lib64
 %patch2 -p1 -b .c++
 
+# temporary workaround for libGLU deficiencies
+if [ ! -f data/courses/themes/models/common/tree.png.brokenlibGLU ]; then
+    mv data/courses/themes/models/common/tree.png data/courses/themes/models/common/tree.png.brokenlibGLU
+    cp %{SOURCE3} data/courses/themes/models/common/tree.png
+fi
+
 %build
 autoconf
 %configure --with-data-dir=%{_datadir}/ppracer
@@ -85,6 +94,14 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* 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)
+- add dist tag
+
+* Mon Aug 28 2006 Nils Philippsen  0.3.1-7
+- FC6 mass rebuild
+
 * Fri Feb 17 2006 Nils Philippsen 
 - rebuild
 



From fedora-extras-commits at redhat.com  Fri Nov 24 11:04:16 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 24 Nov 2006 06:04:16 -0500
Subject: rpms/synaptic/FC-6 synaptic.spec,1.20,1.21
Message-ID: <200611241104.kAOB4G9Y011473@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/synaptic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445/FC-6

Modified Files:
	synaptic.spec 
Log Message:
Rebuild for new apt.


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/FC-6/synaptic.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- synaptic.spec	30 Aug 2006 00:27:40 -0000	1.20
+++ synaptic.spec	24 Nov 2006 11:03:46 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 5.1%{?dist}
+Release: 5.2%{?dist}
 
 License: GPL
 Group: Applications/System



From fedora-extras-commits at redhat.com  Fri Nov 24 11:04:16 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Fri, 24 Nov 2006 06:04:16 -0500
Subject: rpms/synaptic/devel synaptic.spec,1.20,1.21
Message-ID: <200611241104.kAOB4GGL011476@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/synaptic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11445/devel

Modified Files:
	synaptic.spec 
Log Message:
Rebuild for new apt.


Index: synaptic.spec
===================================================================
RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- synaptic.spec	30 Aug 2006 00:27:40 -0000	1.20
+++ synaptic.spec	24 Nov 2006 11:03:46 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 5.1%{?dist}
+Release: 5.2%{?dist}
 
 License: GPL
 Group: Applications/System



From fedora-extras-commits at redhat.com  Fri Nov 24 15:09:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Fri, 24 Nov 2006 10:09:38 -0500
Subject: rpms/jd/devel .cvsignore, 1.22, 1.23 jd.spec, 1.29, 1.30 sources,
	1.22, 1.23
Message-ID: <200611241509.kAOF9ccm027635@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27523

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Fri Nov 24 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061124
- cvs 061124 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Nov 2006 15:10:54 -0000	1.22
+++ .cvsignore	24 Nov 2006 15:09:08 -0000	1.23
@@ -1 +1 @@
-jd-1.8.1-cvs061123.tgz
+jd-1.8.1-cvs061124.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jd.spec	23 Nov 2006 15:10:54 -0000	1.29
+++ jd.spec	24 Nov 2006 15:09:08 -0000	1.30
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061123
+%define         strtag        cvs061124
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Thu Nov 23 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061123
-- cvs 061123 (23:59 JST)
+* Fri Nov 24 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061124
+- cvs 061124 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	23 Nov 2006 15:10:54 -0000	1.22
+++ sources	24 Nov 2006 15:09:08 -0000	1.23
@@ -1 +1 @@
-8fedda8b763698253b919393eff9fef4  jd-1.8.1-cvs061123.tgz
+74ebe9ef9e826e2134fe7bcdf43b0797  jd-1.8.1-cvs061124.tgz



From fedora-extras-commits at redhat.com  Fri Nov 24 15:13:26 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 24 Nov 2006 10:13:26 -0500
Subject: rpms/python-telepathy/devel .cvsignore, 1.3,
	1.4 python-telepathy.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611241513.kAOFDQwq027996@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27974

Modified Files:
	.cvsignore python-telepathy.spec sources 
Log Message:
* Fri Nov 24 2006 Brian Pepple  - 0.13.7-1
- Update to 0.13.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Oct 2006 15:54:32 -0000	1.3
+++ .cvsignore	24 Nov 2006 15:12:56 -0000	1.4
@@ -1 +1 @@
-telepathy-python-0.13.3.tar.gz
+telepathy-python-0.13.7.tar.gz


Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-telepathy.spec	10 Oct 2006 15:54:32 -0000	1.4
+++ python-telepathy.spec	24 Nov 2006 15:12:56 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.13.3
+Version:        0.13.7
 Release:        1%{?dist}
 Summary:        Python libraries for Telepathy
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Brian Pepple  - 0.13.7-1
+- Update to 0.13.7.
+
 * Tue Oct 10 2006 Brian Pepple  - 0.13.3-1
 - Update to 0.13.3.
 - Drop connection-manager patch, fixed upstream.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Oct 2006 15:54:32 -0000	1.3
+++ sources	24 Nov 2006 15:12:56 -0000	1.4
@@ -1 +1 @@
-1ca0c6670d0feb827b45ecbfe46f1e8d  telepathy-python-0.13.3.tar.gz
+2c565587e49e36a1c0cfb519d8888b53  telepathy-python-0.13.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 16:00:58 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 11:00:58 -0500
Subject: rpms/magicor/devel magicor.desktop, 1.1, 1.2 magicor.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611241600.kAOG0wXN028290@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28269

Modified Files:
	magicor.desktop magicor.spec sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: magicor.desktop
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/magicor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.desktop	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.desktop	24 Nov 2006 16:00:28 -0000	1.2
@@ -7,4 +7,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;LogicGame;
+Categories=Game;LogicGame;


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/magicor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magicor.spec	2 Nov 2006 19:50:36 -0000	1.2
+++ magicor.spec	24 Nov 2006 16:00:28 -0000	1.3
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define pre_version rc1
+%define pre_version rc2
 
 Name:           magicor
 Version:        1.0
-Release:        0.1.%{pre_version}%{?dist}
+Release:        0.2.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz
 Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
@@ -27,13 +27,11 @@
 
 %prep
 %setup -q -b 1 -n %{name}-%{version}-%{pre_version}
-sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
-sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
-  scripts/Magicor-LevelEditor.py
-sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf
+sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
+sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
 
-# %build
+%build
 # nothing to build, python code + data only
 
 
@@ -44,10 +42,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
-install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
+install -m 644 etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 755 Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
+install -m 755 Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
 cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -55,7 +52,6 @@
 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/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -81,8 +77,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc LICENSE README
+%config(noreplace) %{_sysconfdir}/%{name}*.conf
 %{_bindir}/%{name}*
 %{python_sitelib}/%{name}
 %{_datadir}/%{name}
@@ -91,6 +87,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
+- New upstream release 1.0-rc2
+
 * Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
 - New upstream release 1.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 19:50:36 -0000	1.3
+++ sources	24 Nov 2006 16:00:28 -0000	1.4
@@ -1,2 +1,2 @@
-ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
-9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 16:01:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 11:01:55 -0500
Subject: rpms/magicor/devel .cvsignore,1.3,1.4 sources,1.4,1.5
Message-ID: <200611241601.kAOG1tdF031370@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31342

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 19:50:36 -0000	1.3
+++ .cvsignore	24 Nov 2006 16:01:25 -0000	1.4
@@ -1,2 +0,0 @@
-magicor-1.0-rc1.tar.gz
-magicor-data-1.0-rc1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Nov 2006 16:00:28 -0000	1.4
+++ sources	24 Nov 2006 16:01:25 -0000	1.5
@@ -1,2 +0,0 @@
-bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
-8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 16:03:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 11:03:05 -0500
Subject: rpms/magicor/devel .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200611241603.kAOG35us031452@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31433

Modified Files:
	.cvsignore sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Nov 2006 16:01:25 -0000	1.4
+++ .cvsignore	24 Nov 2006 16:02:35 -0000	1.5
@@ -0,0 +1,2 @@
+magicor-data-1.0-rc2.tar.gz
+magicor-source-1.0-rc2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Nov 2006 16:01:25 -0000	1.5
+++ sources	24 Nov 2006 16:02:35 -0000	1.6
@@ -0,0 +1,2 @@
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 16:32:21 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 24 Nov 2006 11:32:21 -0500
Subject: rpms/python-telepathy/devel python-telepathy.spec,1.5,1.6
Message-ID: <200611241632.kAOGWL6c031587@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-telepathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31570

Modified Files:
	python-telepathy.spec 
Log Message:
* Fri Nov 24 2006 Brian Pepple  - 0.13.7-2
- Add BR & Requires on dbus-python.



Index: python-telepathy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-telepathy/devel/python-telepathy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-telepathy.spec	24 Nov 2006 15:12:56 -0000	1.5
+++ python-telepathy.spec	24 Nov 2006 16:31:51 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           python-telepathy
 Version:        0.13.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
@@ -13,6 +13,9 @@
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+BuildRequires:	dbus-python
+
+Requires:	dbus-python
 
 
 %description
@@ -43,6 +46,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Brian Pepple  - 0.13.7-2
+- Add BR & Requires on dbus-python.
+
 * Fri Nov 24 2006 Brian Pepple  - 0.13.7-1
 - Update to 0.13.7.
 



From fedora-extras-commits at redhat.com  Fri Nov 24 18:37:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:37:36 -0500
Subject: rpms/sdparm - New directory
Message-ID: <200611241837.kAOIbapt005803@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5798/sdparm

Log Message:
Directory /cvs/extras/rpms/sdparm added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 18:37:41 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:37:41 -0500
Subject: rpms/sdparm/devel - New directory
Message-ID: <200611241837.kAOIbfUU005817@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5798/sdparm/devel

Log Message:
Directory /cvs/extras/rpms/sdparm/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 18:37:59 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:37:59 -0500
Subject: rpms/sdparm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611241837.kAOIbxe1005862@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5841/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sdparm


--- 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  Fri Nov 24 18:37:59 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:37:59 -0500
Subject: rpms/sdparm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611241837.kAOIbxbm005847@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5841

Added Files:
	Makefile import.log 
Log Message:
Setup of module sdparm


--- NEW FILE Makefile ---
# Top level Makefile for module sdparm
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  Fri Nov 24 18:39:02 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:39:02 -0500
Subject: rpms/sdparm import.log,1.1,1.2
Message-ID: <200611241839.kAOId2n3005931@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5901

Modified Files:
	import.log 
Log Message:
auto-import sdparm-1.00-4 on branch devel from sdparm-1.00-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sdparm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Nov 2006 18:37:59 -0000	1.1
+++ import.log	24 Nov 2006 18:38:32 -0000	1.2
@@ -0,0 +1 @@
+sdparm-1_00-4:HEAD:sdparm-1.00-4.src.rpm:1164393565



From fedora-extras-commits at redhat.com  Fri Nov 24 18:39:03 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:39:03 -0500
Subject: rpms/sdparm/devel sdparm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611241839.kAOId3AG005935@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/sdparm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5901/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sdparm.spec 
Log Message:
auto-import sdparm-1.00-4 on branch devel from sdparm-1.00-4.src.rpm


--- NEW FILE sdparm.spec ---
Summary: List or change SCSI/SATA disk parameters
Name: sdparm
Version: 1.00
Release: 4%{?dist}
License: BSD
Group: Applications/System
URL: http://www.torque.net/sg/sdparm.html
Source0: http://www.torque.net/sg/p/%{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description 
SCSI disk parameters are held in mode pages. This utility lists or
changes those parameters. Other SCSI devices (or devices that use the
SCSI command set e.g. some SATA devices) such as CD/DVD and tape
drives may also find parts of sdparm useful. Requires the linux kernel
2.4 series or later. In the 2.6 series any device node the understands
a SCSI command set may be used (e.g. /dev/sda). In the 2.4 series SCSI
device node may be used.

Fetches Vital Product Data pages. Can send commands to start or stop
the media and load or unload removable media.

Warning: It is possible (but unlikely) to change SCSI disk settings
such that the disk stops operating or is slowed down. Use with care.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc ChangeLog README CREDITS AUTHORS COPYING notes.txt
%{_bindir}/%{name}
%{_mandir}/man8/%{name}*

%changelog
* Mon Nov 20 2006 Terje Rosten  - 1.00-4
- Fix changelog
- Don't install INSTALL

* Mon Nov 20 2006 Terje Rosten  - 1.00-3
- Maybe we should build in %%build :-)
- Remove check in %%clean/%%install

* Mon Nov 20 2006 Terje Rosten  - 1.00-2
- fix license, buildroot and group
- remove hardcoded packager tag
- use %%configure macro
- dist tag
- make install on single line
- fix files section
- remove strange use of macros (name, version and release)
- untabify

* Mon Oct 16 2006 Douglas Gilbert  - 1.00
- update Background control mode subpage, vendor specific mode pages
- sdparm-1.00

* Sat Jul 08 2006 Douglas Gilbert  - 0.99
- add old power condition page for disks
- sdparm-0.99

* Thu May 18 2006 Douglas Gilbert  - 0.98
- add medium configuration mode page
- sdparm-0.98

* Wed Jan 25 2006 Douglas Gilbert  - 0.97 
- add SAT pATA control and medium partition mode (sub)pages
- sdparm-0.97

* Fri Nov 18 2005 Douglas Gilbert  - 0.96
- add capacity, ready and sync commands
- sdparm-0.96

* Tue Sep 20 2005 Douglas Gilbert  - 0.95
- add debian build directory, decode more VPD pages
- sdparm-0.95

* Thu Jul 28 2005 Douglas Gilbert  - 0.94
- add '--command=' option
- sdparm-0.94

* Thu Jun 02 2005 Douglas Gilbert  - 0.93
- add '--transport=' and '--dbd' options
- sdparm-0.93

* Fri May 20 2005 Douglas Gilbert  - 0.92
- add some tape, cd/dvd, disk, ses and rbc mode pages
- sdparm-0.92

* Fri May 06 2005 Douglas Gilbert  - 0.91
- if lk 2.4 detected, map non-sg SCSI device node to sg equivalent
- sdparm-0.91

* Mon Apr 18 2005 Douglas Gilbert  - 0.90
- initial version
- sdparm-0.90


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sdparm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Nov 2006 18:37:59 -0000	1.1
+++ .cvsignore	24 Nov 2006 18:38:33 -0000	1.2
@@ -0,0 +1 @@
+sdparm-1.00.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sdparm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Nov 2006 18:37:59 -0000	1.1
+++ sources	24 Nov 2006 18:38:33 -0000	1.2
@@ -0,0 +1 @@
+1d46f85ed07e697f64fc40ddad31ddb5  sdparm-1.00.tgz



From fedora-extras-commits at redhat.com  Fri Nov 24 18:44:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:44:36 -0500
Subject: owners owners.list,1.2003,1.2004
Message-ID: <200611241844.kAOIiaWq006014@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5994

Modified Files:
	owners.list 
Log Message:
New package: sdparm.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2003
retrieving revision 1.2004
diff -u -r1.2003 -r1.2004
--- owners.list	23 Nov 2006 23:45:54 -0000	1.2003
+++ owners.list	24 Nov 2006 18:44:06 -0000	1.2004
@@ -2156,6 +2156,7 @@
 Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_pango|Rendering of internationalized text for SDL|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|sdparm|List or change SCSI/SATA disk parameters|terjeros at phys.ntnu.no|extras-qa at fedoraproject.org|
 Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|seamonkey|Web browser, e-mail, news, IRC client, HTML editor|kengert at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sec|Simple Event Correlator|lists at forevermore.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 24 18:58:42 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:58:42 -0500
Subject: rpms/gq - New directory
Message-ID: <200611241858.kAOIwgwx006133@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129/gq

Log Message:
Directory /cvs/extras/rpms/gq added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 18:58:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:58:47 -0500
Subject: rpms/gq/devel - New directory
Message-ID: <200611241858.kAOIwl5b006146@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6129/gq/devel

Log Message:
Directory /cvs/extras/rpms/gq/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 18:59:04 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:59:04 -0500
Subject: rpms/gq Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611241859.kAOIx49a006176@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6170

Added Files:
	Makefile import.log 
Log Message:
Setup of module gq


--- NEW FILE Makefile ---
# Top level Makefile for module gq
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  Fri Nov 24 18:59:10 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 13:59:10 -0500
Subject: rpms/gq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611241859.kAOIxAjU006191@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6170/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gq


--- 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  Fri Nov 24 19:00:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:00:23 -0500
Subject: rpms/gq/devel gq-1.2.1-desktop.patch, NONE, 1.1 gq.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611241900.kAOJ0Ne3006286@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6243/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gq-1.2.1-desktop.patch gq.spec 
Log Message:
auto-import gq-1.2.2-2 on branch devel from gq-1.2.2-2.src.rpm

gq-1.2.1-desktop.patch:

--- NEW FILE gq-1.2.1-desktop.patch ---
--- gq-1.2.1.old/data/gq.desktop.in	2006-10-04 16:50:43.000000000 +0200
+++ gq-1.2.1/data/gq.desktop.in	2006-11-19 20:24:08.000000000 +0100
@@ -8,6 +8,6 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=gq
-Categories=Application;Network;GNOME;GTK;LDAP;
+Icon=redhat-system_tools
+Categories=Application;Network;System;GTK;LDAP;
 #MimeType=text/x-ldif


--- NEW FILE gq.spec ---
%define langver 1.2.1

Summary: Graphical LDAP directory browser and editor
Name: gq
Version: 1.2.2
Release: 2%{?dist}
License: GPL
Group: Applications/Internet
URL: http://www.gq-project.org/
Source0: http://dl.sf.net/sourceforge/gqclient/%{name}-%{version}.tar.gz
Source1: http://dl.sf.net/sourceforge/gqclient/%{name}-%{langver}-langpack-1.tar.gz
Patch0: gq-1.2.1-desktop.patch
BuildRequires: libgcrypt-devel libglade2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext gnome-keyring-devel
BuildRequires: openldap-devel openssl-devel
BuildRequires: perl(XML::Parser)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
GQ is a graphical browser for LDAP directories and schemas.  Using GQ,
an administrator can search through a directory and modify objects
stored in that directory.

%prep
%setup -q
%patch -p1
%setup -q -T -D -a 1

%build

# Set up langpack
%{name}-%{langver}-langpack-1/langpack .
cp -p %{name}-%{langver}-langpack-1/po/LINGUAS po/

%configure --with-included-gettext --disable-update-mimedb
# --enable-cache --enable-browser-dnd

make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

desktop-file-install --vendor fedora --delete-original      \
        --dir %{buildroot}%{_datadir}/applications          \
        %{buildroot}%{_datadir}/applications/%{name}.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%post
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
update-mime-database %{_datadir}/mime &> /dev/null || :

%files -f %{name}.lang
%defattr(-, root, root,-)

%doc AUTHORS ChangeLog COPYING NEWS README* TODO
%{_bindir}/%{name}
%{_datadir}/%{name}/%{name}.glade
%{_datadir}/pixmaps/%{name}/*.xpm
%{_datadir}/pixmaps/%{name}/*.png
%{_datadir}/mime/packages/%{name}-ldif.xml
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/pixmaps/%{name}
%dir %{_datadir}/%{name}

%changelog
* Mon Nov 20 2006 Terje R??sten  - 1.2.2-2
- Fix patch/source naming
- Add gettext to BuildReq
- Move %%post/%%postun
- Remove cp macro
- Add libgcrypt-devel to BuildReq

* Sun Nov 19 2006 Terje R??sten  - 1.2.2-1
- 1.2.2

* Sun Nov 19 2006 Terje R??sten  - 1.2.1-3
- Fix defattr
- Remove X-Fedora as category in desktop file
- libglade2-devel pulls in gtk2-devel and libxml2-devel in BuildReq
- Use perl modules, not perl package name in BuildReq
- Remove ldconfig from %%post
- Fix install of translations
- Remove some macros (rm, make and install)
- Fix mime: script and remove shared-mime-info from BuildReq
- Patch, not replace desktop file
- Switch icon to redhat-system_tools

* Sun Nov 12 2006 Terje R??sten  - 1.2.1-2
- Don't use %%makeinstall
- Some more buildreq: gnome-keyring-devel, libglade2-devel
- Add --disable-update-mimedb to configure

* Sat Oct 15 2006 Terje R??sten  - 1.2.1-1
- 1.2.1
- Add perl-XML-Parser to buildreq
- Translations broken, skip
- Fix mime stuff (stolen from planner.spec)

* Fri Sep 06 2006 Terje R??sten  - 1.2.0-1
- 1.2.0

* Sat Aug 06 2006 Terje R??sten  - 1.0.1-1
- 1.0.1

* Tue May 02 2006 Terje R??sten  - 1.0.0-4
- Fix source urls

* Tue May 02 2006 Terje R??sten  - 1.0.0-3
- More desktop file work

* Mon May 01 2006 Terje R??sten  - 1.0.0-2
- Proper desktop file handling
- Drop krb5-devel in buildrequires
- Add langpack

* Fri Apr 28 2006 Terje R??sten  - 1.0.0-1
- 1.0.0

* Mon Apr 10 2006 Terje R??sten  - 1.0-0.5.rc1
- 1.0-rc1

* Thu Apr 06 2006 Terje R??sten  - 1.0-0.4.beta2
- 1.0-beta2
- Remove patches now upstream
- Add libxml2-devel to build requires
- Include pix

* Mon Jun 20 2005 Terje R??sten  - 1.0-0.3.beta1
- Fix some rpmlint warnings

* Thu Jun 16 2005 Terje R??sten  - 1.0-beta1.0.2
- Build on fc4
- Add gcc4 patch
   

* Wed Mar 29 2005 Terje R??sten  - 1.0-beta1.0.1
- OpenLDAP 2.2 patch 
  
- build with: setarch i686 rpmbuild -ba --target=x86-64 ...

* Wed Jun 09 2004 Dag Wieers  - 0.6.0-4
- Merged SPEC file with my version
- Changes to build on older releases
- Added improved desktop file

* Wed May 19 2004 Matthias Saou  1.0-0.beta1.1
- Update to 1.0beta1.
- Rebuild for Fedora Core 2

* Thu Nov 13 2003 Matthias Saou  0.6.0-3
- Rebuild for Fedora Core 1

* Mon Mar 31 2003 Matthias Saou 
- Rebuilt for Red Hat Linux 9
- Added new desktop entry
- Added find_lang usage

* Wed Jan 29 2003 Matthias Saou 
- Update to 0.6.0

* Tue May 21 2002 Matthias Saou 
- Update to 0.5.0

* Fri Feb 22 2002 Nalin Dahyabhai  0.4.0-5
- rebuild

* Wed Jan 09 2002 Tim Powers 
- automated rebuild

* Tue Jun 19 2001 Nalin Dahyabhai 
- rebuild in new environment

* Fri Mar  2 2001 Nalin Dahyabhai 
- rebuild in new environment

* Tue Feb 20 2001 Nalin Dahyabhai 
- update to 0.4.0, fixes bugs #24160, #24161

* Wed Dec 27 2000 Nalin Dahyabhai 
- update to 0.3.1

* Fri Dec  1 2000 Nalin Dahyabhai 
- rebuild in new environment

* Fri Nov 10 2000 Nalin Dahyabhai 
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Nov 2006 18:59:10 -0000	1.1
+++ .cvsignore	24 Nov 2006 18:59:53 -0000	1.2
@@ -0,0 +1,2 @@
+gq-1.2.1-langpack-1.tar.gz
+gq-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Nov 2006 18:59:10 -0000	1.1
+++ sources	24 Nov 2006 18:59:53 -0000	1.2
@@ -0,0 +1,2 @@
+9429d161c91e12d000c8b0c2f6e21d63  gq-1.2.1-langpack-1.tar.gz
+107d8a971c14b52b2bedbf3944840bea  gq-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 19:00:23 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:00:23 -0500
Subject: rpms/gq import.log,1.1,1.2
Message-ID: <200611241900.kAOJ0NBb006282@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/gq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6243

Modified Files:
	import.log 
Log Message:
auto-import gq-1.2.2-2 on branch devel from gq-1.2.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gq/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Nov 2006 18:59:04 -0000	1.1
+++ import.log	24 Nov 2006 18:59:53 -0000	1.2
@@ -0,0 +1 @@
+gq-1_2_2-2:HEAD:gq-1.2.2-2.src.rpm:1164394846



From fedora-extras-commits at redhat.com  Fri Nov 24 19:03:52 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:03:52 -0500
Subject: owners owners.list,1.2004,1.2005
Message-ID: <200611241903.kAOJ3qSB009341@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9326

Modified Files:
	owners.list 
Log Message:
New package: gq.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2004
retrieving revision 1.2005
diff -u -r1.2004 -r1.2005
--- owners.list	24 Nov 2006 18:44:06 -0000	1.2004
+++ owners.list	24 Nov 2006 19:03:22 -0000	1.2005
@@ -622,6 +622,7 @@
 Fedora Extras|gpsd|Service daemon for mediating access to a GPS|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
+Fedora Extras|gq|Graphical LDAP directory browser and editor|terjeros at phys.ntnu.no|extras-qa at fedoraproject.org|
 Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|grace|Numerical Data Processing and Visualization Tool|jamatos at fc.up.pt|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 24 19:12:30 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:12:30 -0500
Subject: rpms/libast - New directory
Message-ID: <200611241912.kAOJCUC9009469@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9465/libast

Log Message:
Directory /cvs/extras/rpms/libast added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 19:12:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:12:36 -0500
Subject: rpms/libast/devel - New directory
Message-ID: <200611241912.kAOJCaUr009483@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9465/libast/devel

Log Message:
Directory /cvs/extras/rpms/libast/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 19:12:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:12:54 -0500
Subject: rpms/libast Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611241912.kAOJCsSh009512@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9506

Added Files:
	Makefile import.log 
Log Message:
Setup of module libast


--- NEW FILE Makefile ---
# Top level Makefile for module libast
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  Fri Nov 24 19:12:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:12:54 -0500
Subject: rpms/libast/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611241912.kAOJCsdd009527@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9506/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libast


--- 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  Fri Nov 24 19:13:53 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:13:53 -0500
Subject: rpms/libast import.log,1.1,1.2
Message-ID: <200611241913.kAOJDr25009601@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9566

Modified Files:
	import.log 
Log Message:
auto-import libast-0.7.1-0.1.20060818cvs on branch devel from libast-0.7.1-0.1.20060818cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libast/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Nov 2006 19:12:54 -0000	1.1
+++ import.log	24 Nov 2006 19:13:23 -0000	1.2
@@ -0,0 +1 @@
+libast-0_7_1-0_1_20060818cvs:HEAD:libast-0.7.1-0.1.20060818cvs.src.rpm:1164395657



From fedora-extras-commits at redhat.com  Fri Nov 24 19:13:54 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:13:54 -0500
Subject: rpms/libast/devel libast.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611241913.kAOJDsVu009605@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/libast/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9566/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libast.spec 
Log Message:
auto-import libast-0.7.1-0.1.20060818cvs on branch devel from libast-0.7.1-0.1.20060818cvs.src.rpm


--- NEW FILE libast.spec ---
Summary: Library of Assorted Spiffy Things
Name: libast
Version: 0.7.1
Release: 0.1.20060818cvs%{?dist}
Group: System Environment/Libraries
License: BSD
URL: http://www.eterm.org/
Source: http://www.eterm.org/download/%{name}-%{version}.tar.gz
BuildRequires: imlib2-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
LibAST is the Library of Assorted Spiffy Things.  It contains various
handy routines and drop-in substitutes for some good-but-non-portable
functions.  It currently has a built-in memory tracking subsystem as
well as some debugging aids and other similar tools.

It's not documented yet, mostly because it's not finished.  Hence the
version number that begins with 0.

%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

%build
%configure
%{__make} %{?_smp_mflags}

%install
rm -rf "$RPM_BUILD_ROOT"
%makeinstall

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%clean
rm -rf "$RPM_BUILD_ROOT"

%files
%defattr(-, root, root, 0755)
%doc ChangeLog DESIGN README LICENSE
%{_libdir}/libast.so.*

%files devel
%defattr(-, root, root, 0755)
%dir %{_includedir}/libast
%{_bindir}/libast-config
%{_libdir}/libast.so
%{_includedir}/libast.h
%{_includedir}/libast/*.h
%{_datadir}/aclocal/libast.m4
%exclude %{_libdir}/*.la
%exclude %{_libdir}/*.a

%changelog
* Sat Sep  2 2006 Terje R??sten  - 0.7.1-0.1.20060818cvs
- 0.7.1 (from CVS)
- LICENCE now included in upstrean package

* Sun Feb 26 2006 Terje R??sten  - 0.7-3
- Add LICENSE

* Tue Feb 21 2006 Terje R??sten  - 0.7-2
- Fix buildroot var
- Clean buildroot before install
- Remove static libs
- Add imlib2 to buildrequires

* Sun Feb 19 2006 Terje R??sten  - 0.7-1
- Initial packaging based on upstream spec file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libast/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Nov 2006 19:12:54 -0000	1.1
+++ .cvsignore	24 Nov 2006 19:13:24 -0000	1.2
@@ -0,0 +1 @@
+libast-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libast/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Nov 2006 19:12:54 -0000	1.1
+++ sources	24 Nov 2006 19:13:24 -0000	1.2
@@ -0,0 +1 @@
+f005abce4638da890e1757e8e0d97bcf  libast-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 19:17:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Fri, 24 Nov 2006 14:17:26 -0500
Subject: owners owners.list,1.2005,1.2006
Message-ID: <200611241917.kAOJHQ3X009666@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9649

Modified Files:
	owners.list 
Log Message:
New package: libast.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2005
retrieving revision 1.2006
diff -u -r1.2005 -r1.2006
--- owners.list	24 Nov 2006 19:03:22 -0000	1.2005
+++ owners.list	24 Nov 2006 19:16:56 -0000	1.2006
@@ -881,6 +881,7 @@
 Fedora Extras|libassa|C++ network-oriented application framework|3rdshift at comcast.net|extras-qa at fedoraproject.org|
 Fedora Extras|libassetml|XML resource database library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|libast|Library of Assorted Spiffy Things|terjeros at phys.ntnu.no|extras-qa at fedoraproject.org|
 Fedora Extras|libatomic_ops|Atomic memory update operations|drzeus-bugzilla at drzeus.cx|extras-qa at fedoraproject.org|
 Fedora Extras|libbinio|A binary stream interface class library for C++|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libburn|Library for reading, mastering and writing optical discs|jkeating at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Nov 24 19:21:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 14:21:17 -0500
Subject: rpms/magicor/FC-6 .cvsignore, 1.3, 1.4 magicor.desktop, 1.1,
	1.2 magicor.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611241921.kAOJLHFA009742@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9721

Modified Files:
	.cvsignore magicor.desktop magicor.spec sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 19:51:48 -0000	1.3
+++ .cvsignore	24 Nov 2006 19:20:47 -0000	1.4
@@ -1,2 +1,2 @@
-magicor-1.0-rc1.tar.gz
-magicor-data-1.0-rc1.tar.gz
+magicor-data-1.0-rc2.tar.gz
+magicor-source-1.0-rc2.tar.gz


Index: magicor.desktop
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/magicor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.desktop	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.desktop	24 Nov 2006 19:20:47 -0000	1.2
@@ -7,4 +7,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;LogicGame;
+Categories=Game;LogicGame;


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/magicor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magicor.spec	2 Nov 2006 19:51:48 -0000	1.2
+++ magicor.spec	24 Nov 2006 19:20:47 -0000	1.3
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define pre_version rc1
+%define pre_version rc2
 
 Name:           magicor
 Version:        1.0
-Release:        0.1.%{pre_version}%{?dist}
+Release:        0.2.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz
 Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
@@ -27,13 +27,11 @@
 
 %prep
 %setup -q -b 1 -n %{name}-%{version}-%{pre_version}
-sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
-sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
-  scripts/Magicor-LevelEditor.py
-sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf
+sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
+sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
 
-# %build
+%build
 # nothing to build, python code + data only
 
 
@@ -44,10 +42,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
-install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
+install -m 644 etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 755 Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
+install -m 755 Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
 cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -55,7 +52,6 @@
 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/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -81,8 +77,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc LICENSE README
+%config(noreplace) %{_sysconfdir}/%{name}*.conf
 %{_bindir}/%{name}*
 %{python_sitelib}/%{name}
 %{_datadir}/%{name}
@@ -91,6 +87,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
+- New upstream release 1.0-rc2
+
 * Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
 - New upstream release 1.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 19:51:48 -0000	1.3
+++ sources	24 Nov 2006 19:20:47 -0000	1.4
@@ -1,2 +1,2 @@
-ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
-9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 19:22:19 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 24 Nov 2006 14:22:19 -0500
Subject: rpms/magicor/FC-5 .cvsignore, 1.3, 1.4 magicor.desktop, 1.1,
	1.2 magicor.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611241922.kAOJMJVT009807@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/magicor/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9786

Modified Files:
	.cvsignore magicor.desktop magicor.spec sources 
Log Message:
* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
- New upstream release 1.0-rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2006 19:52:41 -0000	1.3
+++ .cvsignore	24 Nov 2006 19:21:49 -0000	1.4
@@ -1,2 +1,2 @@
-magicor-1.0-rc1.tar.gz
-magicor-data-1.0-rc1.tar.gz
+magicor-data-1.0-rc2.tar.gz
+magicor-source-1.0-rc2.tar.gz


Index: magicor.desktop
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/magicor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magicor.desktop	21 Oct 2006 20:11:54 -0000	1.1
+++ magicor.desktop	24 Nov 2006 19:21:49 -0000	1.2
@@ -7,4 +7,4 @@
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;LogicGame;
+Categories=Game;LogicGame;


Index: magicor.spec
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/magicor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magicor.spec	2 Nov 2006 19:52:41 -0000	1.2
+++ magicor.spec	24 Nov 2006 19:21:49 -0000	1.3
@@ -1,15 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define pre_version rc1
+%define pre_version rc2
 
 Name:           magicor
 Version:        1.0
-Release:        0.1.%{pre_version}%{?dist}
+Release:        0.2.%{pre_version}%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
 URL:            http://magicor.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}-%{pre_version}.tar.gz
+Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-source-%{version}-%{pre_version}.tar.gz
 Source1:        http://dl.sf.net/sourceforge/%{name}/%{name}-data-%{version}-%{pre_version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
@@ -27,13 +27,11 @@
 
 %prep
 %setup -q -b 1 -n %{name}-%{version}-%{pre_version}
-sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' scripts/Magicor.py
-sed -i 's:###GLADE_FILE###:%{_datadir}/%{name}/editor.glade:' \
-  scripts/Magicor-LevelEditor.py
-sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/default.conf
+sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
+sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
 
-# %build
+%build
 # nothing to build, python code + data only
 
 
@@ -44,10 +42,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 644 etc/default.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
-install -m 644 etc/editor.glade $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 scripts/Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
-install -m 755 scripts/Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
+install -m 644 etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 755 Magicor.py $RPM_BUILD_ROOT%{_bindir}/magicor
+install -m 755 Magicor-LevelEditor.py $RPM_BUILD_ROOT%{_bindir}/magicor-editor
 cp -fr magicor/* $RPM_BUILD_ROOT%{python_sitelib}/%{name}
 cp -fr data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -55,7 +52,6 @@
 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/48x48/apps
 install -p -m 644 %{SOURCE3} \
@@ -81,8 +77,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE README
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%doc LICENSE README
+%config(noreplace) %{_sysconfdir}/%{name}*.conf
 %{_bindir}/%{name}*
 %{python_sitelib}/%{name}
 %{_datadir}/%{name}
@@ -91,6 +87,9 @@
 
 
 %changelog
+* Fri Nov 24 2006 Hans de Goede  1.0-0.2.rc2
+- New upstream release 1.0-rc2
+
 * Thu Nov  2 2006 Hans de Goede  1.0-0.1.rc1
 - New upstream release 1.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magicor/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2006 19:52:41 -0000	1.3
+++ sources	24 Nov 2006 19:21:49 -0000	1.4
@@ -1,2 +1,2 @@
-ad3e7562cd7e0d6a443951a08c4ab94b  magicor-1.0-rc1.tar.gz
-9c58c3ec1d0638f6f40db5e723bedbc2  magicor-data-1.0-rc1.tar.gz
+bc2004e9d28268d00f286b5172781827  magicor-data-1.0-rc2.tar.gz
+8914ec1bcc05f05cc7c9a3d47993a2c8  magicor-source-1.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 19:37:36 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 24 Nov 2006 14:37:36 -0500
Subject: rpms/php-idn/devel .cvsignore, 1.2, 1.3 php-idn.spec, 1.2,
	1.3 sources, 1.2, 1.3 php-idn-1.1-gcc41.patch, 1.1, NONE
Message-ID: <200611241937.kAOJbabE009990@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/php-idn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9971

Modified Files:
	.cvsignore php-idn.spec sources 
Removed Files:
	php-idn-1.1-gcc41.patch 
Log Message:
Upgrade to 1.2b (includes a minor fix for the 1.2 release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jun 2006 20:33:05 -0000	1.2
+++ .cvsignore	24 Nov 2006 19:37:06 -0000	1.3
@@ -1 +1 @@
-idn_1.1.tar.gz
+idn_1.2b.tar.gz


Index: php-idn.spec
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/php-idn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-idn.spec	3 Sep 2006 20:58:51 -0000	1.2
+++ php-idn.spec	24 Nov 2006 19:37:06 -0000	1.3
@@ -2,13 +2,12 @@
 
 Summary:	PHP API for GNU LibIDN
 Name:		php-idn
-Version:	1.1
-Release:	7%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/Languages
-Source0:	http://php-idn.bayour.com/idn_%{version}.tar.gz
+Source0:	http://php-idn.bayour.com/idn_%{version}b.tar.gz
 Source1:	idn.ini
-Patch0:		php-idn-1.1-gcc41.patch
 URL:		http://php-idn.bayour.com/
 BuildRequires:	php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake
 Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -20,8 +19,7 @@
 have international characters in the DNS system.
 
 %prep
-%setup -q -n idn-%{version}
-%patch0 -p1 -b .gcc41
+%setup -q -n idn-%{version}b
 export PHP_RPATH=no
 phpize
 %configure
@@ -44,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/idn.ini
 
 %changelog
+* Fri Nov 24 2006 Robert Scheck  1.2-1
+- Upgrade to 1.2b (includes a minor fix for the 1.2 release)
+
 * Sun Sep 03 2006 Robert Scheck  1.1-7
 - Rebuild for Fedora Core 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2006 20:33:05 -0000	1.2
+++ sources	24 Nov 2006 19:37:06 -0000	1.3
@@ -1 +1 @@
-5767e959d9a2ec22880f46eb344d6836  idn_1.1.tar.gz
+518ed0ee59c901987096599af58f4530  idn_1.2b.tar.gz


--- php-idn-1.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 24 19:38:50 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 24 Nov 2006 14:38:50 -0500
Subject: rpms/php-idn/FC-6 .cvsignore, 1.2, 1.3 php-idn.spec, 1.2,
	1.3 sources, 1.2, 1.3 php-idn-1.1-gcc41.patch, 1.1, NONE
Message-ID: <200611241938.kAOJco5l010023@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/php-idn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10001

Modified Files:
	.cvsignore php-idn.spec sources 
Removed Files:
	php-idn-1.1-gcc41.patch 
Log Message:
Upgrade to 1.2b (includes a minor fix for the 1.2 release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jun 2006 20:33:05 -0000	1.2
+++ .cvsignore	24 Nov 2006 19:38:20 -0000	1.3
@@ -1 +1 @@
-idn_1.1.tar.gz
+idn_1.2b.tar.gz


Index: php-idn.spec
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-6/php-idn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-idn.spec	3 Sep 2006 20:58:51 -0000	1.2
+++ php-idn.spec	24 Nov 2006 19:38:20 -0000	1.3
@@ -2,13 +2,12 @@
 
 Summary:	PHP API for GNU LibIDN
 Name:		php-idn
-Version:	1.1
-Release:	7%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/Languages
-Source0:	http://php-idn.bayour.com/idn_%{version}.tar.gz
+Source0:	http://php-idn.bayour.com/idn_%{version}b.tar.gz
 Source1:	idn.ini
-Patch0:		php-idn-1.1-gcc41.patch
 URL:		http://php-idn.bayour.com/
 BuildRequires:	php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake
 Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -20,8 +19,7 @@
 have international characters in the DNS system.
 
 %prep
-%setup -q -n idn-%{version}
-%patch0 -p1 -b .gcc41
+%setup -q -n idn-%{version}b
 export PHP_RPATH=no
 phpize
 %configure
@@ -44,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/idn.ini
 
 %changelog
+* Fri Nov 24 2006 Robert Scheck  1.2-1
+- Upgrade to 1.2b (includes a minor fix for the 1.2 release)
+
 * Sun Sep 03 2006 Robert Scheck  1.1-7
 - Rebuild for Fedora Core 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2006 20:33:05 -0000	1.2
+++ sources	24 Nov 2006 19:38:20 -0000	1.3
@@ -1 +1 @@
-5767e959d9a2ec22880f46eb344d6836  idn_1.1.tar.gz
+518ed0ee59c901987096599af58f4530  idn_1.2b.tar.gz


--- php-idn-1.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 24 19:40:11 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Fri, 24 Nov 2006 14:40:11 -0500
Subject: rpms/php-idn/FC-5 .cvsignore, 1.2, 1.3 php-idn.spec, 1.2,
	1.3 sources, 1.2, 1.3 php-idn-1.1-gcc41.patch, 1.1, NONE
Message-ID: <200611241940.kAOJeBaP010059@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/php-idn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10038

Modified Files:
	.cvsignore php-idn.spec sources 
Removed Files:
	php-idn-1.1-gcc41.patch 
Log Message:
Upgrade to 1.2b (includes a minor fix for the 1.2 release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jun 2006 20:33:05 -0000	1.2
+++ .cvsignore	24 Nov 2006 19:39:41 -0000	1.3
@@ -1 +1 @@
-idn_1.1.tar.gz
+idn_1.2b.tar.gz


Index: php-idn.spec
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-5/php-idn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-idn.spec	3 Sep 2006 20:59:34 -0000	1.2
+++ php-idn.spec	24 Nov 2006 19:39:41 -0000	1.3
@@ -2,13 +2,12 @@
 
 Summary:	PHP API for GNU LibIDN
 Name:		php-idn
-Version:	1.1
-Release:	7%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/Languages
-Source0:	http://php-idn.bayour.com/idn_%{version}.tar.gz
+Source0:	http://php-idn.bayour.com/idn_%{version}b.tar.gz
 Source1:	idn.ini
-Patch0:		php-idn-1.1-gcc41.patch
 URL:		http://php-idn.bayour.com/
 BuildRequires:	php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake
 Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
@@ -20,8 +19,7 @@
 have international characters in the DNS system.
 
 %prep
-%setup -q -n idn-%{version}
-%patch0 -p1 -b .gcc41
+%setup -q -n idn-%{version}b
 export PHP_RPATH=no
 phpize
 %configure
@@ -44,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/idn.ini
 
 %changelog
+* Fri Nov 24 2006 Robert Scheck  1.2-1
+- Upgrade to 1.2b (includes a minor fix for the 1.2 release)
+
 * Sun Sep 03 2006 Robert Scheck  1.1-7
 - Rebuild for Fedora Core 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-idn/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2006 20:33:05 -0000	1.2
+++ sources	24 Nov 2006 19:39:41 -0000	1.3
@@ -1 +1 @@
-5767e959d9a2ec22880f46eb344d6836  idn_1.1.tar.gz
+518ed0ee59c901987096599af58f4530  idn_1.2b.tar.gz


--- php-idn-1.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Nov 24 19:48:26 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:48:26 -0500
Subject: rpms/Django - New directory
Message-ID: <200611241948.kAOJmQJG010237@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10233/Django

Log Message:
Directory /cvs/extras/rpms/Django added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 19:48:31 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:48:31 -0500
Subject: rpms/Django/devel - New directory
Message-ID: <200611241948.kAOJmVpg010250@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10233/Django/devel

Log Message:
Directory /cvs/extras/rpms/Django/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Nov 24 19:48:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:48:43 -0500
Subject: rpms/Django Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611241948.kAOJmh1Y010280@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10274

Added Files:
	Makefile import.log 
Log Message:
Setup of module Django


--- NEW FILE Makefile ---
# Top level Makefile for module Django
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  Fri Nov 24 19:48:48 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:48:48 -0500
Subject: rpms/Django/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611241948.kAOJmmJM010295@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10274/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Django


--- 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  Fri Nov 24 19:50:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:50:18 -0500
Subject: rpms/Django import.log,1.1,1.2
Message-ID: <200611241950.kAOJoIp5010366@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10336

Modified Files:
	import.log 
Log Message:
auto-import Django-0.95-1 on branch devel from Django-0.95-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Django/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Nov 2006 19:48:43 -0000	1.1
+++ import.log	24 Nov 2006 19:49:48 -0000	1.2
@@ -0,0 +1 @@
+Django-0_95-1:HEAD:Django-0.95-1.src.rpm:1164397853



From fedora-extras-commits at redhat.com  Fri Nov 24 19:50:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Fri, 24 Nov 2006 14:50:18 -0500
Subject: rpms/Django/devel Django.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611241950.kAOJoIDc010370@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/Django/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10336/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Django.spec 
Log Message:
auto-import Django-0.95-1 on branch devel from Django-0.95-1.src.rpm


--- NEW FILE Django.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

Name:           Django
Version:        0.95
Release:        1%{?dist}
Summary:        A high-level Python Web framework

Group:          Development/Languages
License:        BSD
URL:            http://www.djangoproject.com/
Source0:        http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
# Note: No longer required in development version > 0.95
BuildRequires:  python-setuptools
#Requires:       

%description
Django is a high-level Python Web framework that encourages rapid
development and a clean, pragmatic design. It focuses on automating as
much as possible and adhering to the DRY (Don't Repeat Yourself)
principle.


%package docs
Summary:  Documentation for Django
Group:    Documentation
Requires: %{name} = %{version}-%{release}

%description docs
This package contains the documentation for the Django high-level
Python Web framework.


%prep
%setup -q


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT

# Documentation
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
chmod +x examples/manage.py
mv examples $RPM_BUILD_ROOT%{_datadir}/%{name}/

# Permission fixes
pushd $RPM_BUILD_ROOT%{python_sitelib}/django
chmod +x conf/project_template/manage.py
cd bin
chmod +x {{compile,unique,make}-messages,django-admin}.py
popd

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
%{_bindir}/django-admin.py
%exclude %{_bindir}/django-admin.py?
%{python_sitelib}/django
%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info

%files docs
%defattr(-,root,root,-)
%doc docs/*
%{_datadir}/%{name}

%changelog
* Sun Nov 12 2006 Michel Salim  - 0.95-1
- Initial package

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Django/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Nov 2006 19:48:48 -0000	1.1
+++ .cvsignore	24 Nov 2006 19:49:48 -0000	1.2
@@ -0,0 +1 @@
+Django-0.95.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Django/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Nov 2006 19:48:48 -0000	1.1
+++ sources	24 Nov 2006 19:49:48 -0000	1.2
@@ -0,0 +1 @@
+9ed7d6a0daa147c012e31d0894802951  Django-0.95.tar.gz



From fedora-extras-commits at redhat.com  Fri Nov 24 21:56:56 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 24 Nov 2006 16:56:56 -0500
Subject: check-mirrors samplelist,1.1,1.2
Message-ID: <200611242157.kAOLuuH1016974@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16959

Modified Files:
	samplelist 
Log Message:
Added return for mailsync test


Index: samplelist
===================================================================
RCS file: /cvs/fedora/check-mirrors/samplelist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samplelist	9 Jul 2006 23:47:47 -0000	1.1
+++ samplelist	24 Nov 2006 21:56:56 -0000	1.2
@@ -45,3 +45,4 @@
 ftp://fedora.bu.edu/fedora/core/5/$ARCH/os/
 http://mirror.pacific.net.au/linux/fedora/linux/core/5/$ARCH/os/
 
+



From fedora-extras-commits at redhat.com  Fri Nov 24 22:22:25 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 24 Nov 2006 17:22:25 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.16,1.17
Message-ID: <200611242222.kAOMMPV9020053@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20038

Modified Files:
	Push.py 
Log Message:
test for commit mail


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Push.py	24 Nov 2006 21:21:04 -0000	1.16
+++ Push.py	24 Nov 2006 22:22:25 -0000	1.17
@@ -15,6 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+
 import errno
 import fcntl, fnmatch
 import os, sys



From fedora-extras-commits at redhat.com  Fri Nov 24 22:22:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 24 Nov 2006 17:22:46 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.17,1.18
Message-ID: <200611242222.kAOMMk3U020074@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20059

Modified Files:
	Push.py 
Log Message:
test for commit mail


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Push.py	24 Nov 2006 22:22:25 -0000	1.17
+++ Push.py	24 Nov 2006 22:22:46 -0000	1.18
@@ -15,7 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
 import errno
 import fcntl, fnmatch
 import os, sys



From fedora-extras-commits at redhat.com  Fri Nov 24 23:00:39 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 24 Nov 2006 18:00:39 -0500
Subject: rpms/pth/devel .cvsignore, 1.6, 1.7 pth.spec, 1.15, 1.16 sources,
	1.6, 1.7
Message-ID: <200611242300.kAON0dMk025559@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/pth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25540

Modified Files:
	.cvsignore pth.spec sources 
Log Message:
* Sat Nov 25 2006 Michael Schwendt  - 2.0.7-1
- Update to 2.0.7 (very minor maintenance updates only).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pth/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 01:12:42 -0000	1.6
+++ .cvsignore	24 Nov 2006 23:00:09 -0000	1.7
@@ -1,2 +1,2 @@
-pth-2.0.6.tar.gz.sig
-pth-2.0.6.tar.gz
+pth-2.0.7.tar.gz
+pth-2.0.7.tar.gz.sig


Index: pth.spec
===================================================================
RCS file: /cvs/extras/rpms/pth/devel/pth.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pth.spec	28 Aug 2006 00:13:38 -0000	1.15
+++ pth.spec	24 Nov 2006 23:00:09 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:        The GNU Portable Threads library
 Name:           pth
-Version:        2.0.6
-Release: 3%{?dist}
+Version:        2.0.7
+Release:        1%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://www.gnu.org/software/pth/
@@ -44,7 +44,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=${RPM_BUILD_ROOT} install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
@@ -74,7 +74,10 @@
 
 
 %changelog
-* Mon Aug 28 2006 Michael Schwendt 
+* Sat Nov 25 2006 Michael Schwendt  - 2.0.7-1
+- Update to 2.0.7 (very minor maintenance updates only).
+
+* Mon Aug 28 2006 Michael Schwendt  - 2.0.6-3
 - rebuilt
 
 * Mon May 22 2006 Michael Schwendt  - 2.0.6-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pth/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 01:12:42 -0000	1.6
+++ sources	24 Nov 2006 23:00:09 -0000	1.7
@@ -1,2 +1,2 @@
-42c9fc92e73a3e6eb8dd9cb0d7bad65a  pth-2.0.6.tar.gz.sig
-bdee96babed9b177484ed2dbfd5b127b  pth-2.0.6.tar.gz
+9cb4a25331a4c4db866a31cbe507c793  pth-2.0.7.tar.gz
+2371608ef1866b310393ef262800609c  pth-2.0.7.tar.gz.sig



From fedora-extras-commits at redhat.com  Sat Nov 25 01:10:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 24 Nov 2006 20:10:04 -0500
Subject: rpms/perl-IPC-Cmd/devel .cvsignore, 1.5, 1.6 perl-IPC-Cmd.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611250110.kAP1A40K002805@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2778

Modified Files:
	.cvsignore perl-IPC-Cmd.spec sources 
Log Message:
Update to 0.36.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Nov 2006 22:36:49 -0000	1.5
+++ .cvsignore	25 Nov 2006 01:09:34 -0000	1.6
@@ -1 +1 @@
-IPC-Cmd-0.34.tar.gz
+IPC-Cmd-0.36.tar.gz


Index: perl-IPC-Cmd.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/perl-IPC-Cmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IPC-Cmd.spec	3 Nov 2006 22:36:49 -0000	1.4
+++ perl-IPC-Cmd.spec	25 Nov 2006 01:09:34 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-IPC-Cmd
-Version:        0.34
+Version:        0.36
 Release:        1%{?dist}
 Summary:        Finding and running system commands made easy
 License:        GPL or Artistic
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Nov 24 2006 Steven Pritchard  0.36-1
+- Update to 0.36.
+
 * Fri Nov 03 2006 Steven Pritchard  0.34-1
 - Update to 0.34.
 - Explicitly BR Params::Check >= 0.20.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Nov 2006 22:36:49 -0000	1.5
+++ sources	25 Nov 2006 01:09:34 -0000	1.6
@@ -1 +1 @@
-cfd848ecb76e2a71757f74501396dd48  IPC-Cmd-0.34.tar.gz
+56c6a27022ba5ebc2701364313f751b9  IPC-Cmd-0.36.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 02:02:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 24 Nov 2006 21:02:08 -0500
Subject: rpms/xfce4-diskperf-plugin/devel
	xfce4-diskperf-plugin-01_random_fixes.patch, NONE,
	1.1 xfce4-diskperf-plugin.spec, 1.6, 1.7
Message-ID: <200611250202.kAP2286w006172@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6147

Modified Files:
	xfce4-diskperf-plugin.spec 
Added Files:
	xfce4-diskperf-plugin-01_random_fixes.patch 
Log Message:
fix for #215863

xfce4-diskperf-plugin-01_random_fixes.patch:

--- NEW FILE xfce4-diskperf-plugin-01_random_fixes.patch ---
diff -Nur xfce4-diskperf-plugin-2.0/panel-plugin/main.c xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c
--- xfce4-diskperf-plugin-2.0/panel-plugin/main.c	2005-10-11 22:18:15.000000000 +0300
+++ xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c	2006-10-07 10:15:34.000000000 +0300
@@ -141,6 +141,8 @@
 
 	/**************************************************************/
 
+static int timerNeedsUpdate = 0;
+
 static int DisplayPerf (struct diskperf_t *p_poPlugin)
  /* Get the last disk perfomance data, compute the statistics and update
     the panel-docked monitor bars */
@@ -273,6 +275,12 @@
 
     DisplayPerf (poPlugin);
 
+    if (timerNeedsUpdate) {
+        g_source_remove (poPlugin->iTimerId);
+        poPlugin->iTimerId = 0;
+        timerNeedsUpdate = 0;
+    }
+
     if (!poPlugin->iTimerId)
         poPlugin->iTimerId = g_timeout_add (poConf->iPeriod_ms,
 					    (GSourceFunc) SetTimer, poPlugin);
@@ -773,6 +781,7 @@
     struct param_t *poConf = &(poPlugin->oConf.oParam);
     float           r;
 
+    timerNeedsUpdate = 1;
     TRACE ("SetPeriod()\n");
     r = gtk_spin_button_get_value (GTK_SPIN_BUTTON (p_wSc));
     poConf->iPeriod_ms = (r * 1000) + 0.5;	/* rounded */
@@ -1096,8 +1105,6 @@
 {
     diskperf_t *diskperf = diskperf_create_control (plugin);
 
-    diskperf_read_config (plugin, diskperf);
-
     g_signal_connect (plugin, "free-data", G_CALLBACK (diskperf_free), 
                       diskperf);
 
@@ -1120,7 +1127,9 @@
     gtk_container_add (GTK_CONTAINER (plugin), diskperf->oMonitor.wEventBox);
 
     CreateMonitorBars (diskperf, xfce_panel_plugin_get_orientation (plugin));
-    
+
+    diskperf_read_config (plugin, diskperf);
+    DevPerfInit();
     SetTimer (diskperf);
 }
 


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-diskperf-plugin.spec	5 Oct 2006 12:13:39 -0000	1.6
+++ xfce4-diskperf-plugin.spec	25 Nov 2006 02:01:38 -0000	1.7
@@ -1,12 +1,13 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-01_random_fixes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .random_fixes
 
 %build
 %configure --disable-static
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 25 2006 Christoph Wickert  - 2.0-4
+- Add patch to fix bug bugzilla.xfce.org #1842 (#215863)
+
 * Thu Oct 05 2006 Christoph Wickert  - 2.0-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 02:13:43 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 24 Nov 2006 21:13:43 -0500
Subject: rpms/xfce4-diskperf-plugin/FC-6
	xfce4-diskperf-plugin-01_random_fixes.patch, NONE,
	1.1 xfce4-diskperf-plugin.spec, 1.6, 1.7
Message-ID: <200611250213.kAP2Dh2N006274@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6256

Modified Files:
	xfce4-diskperf-plugin.spec 
Added Files:
	xfce4-diskperf-plugin-01_random_fixes.patch 
Log Message:
fix for #215863

xfce4-diskperf-plugin-01_random_fixes.patch:

--- NEW FILE xfce4-diskperf-plugin-01_random_fixes.patch ---
diff -Nur xfce4-diskperf-plugin-2.0/panel-plugin/main.c xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c
--- xfce4-diskperf-plugin-2.0/panel-plugin/main.c	2005-10-11 22:18:15.000000000 +0300
+++ xfce4-diskperf-plugin-2.0.new/panel-plugin/main.c	2006-10-07 10:15:34.000000000 +0300
@@ -141,6 +141,8 @@
 
 	/**************************************************************/
 
+static int timerNeedsUpdate = 0;
+
 static int DisplayPerf (struct diskperf_t *p_poPlugin)
  /* Get the last disk perfomance data, compute the statistics and update
     the panel-docked monitor bars */
@@ -273,6 +275,12 @@
 
     DisplayPerf (poPlugin);
 
+    if (timerNeedsUpdate) {
+        g_source_remove (poPlugin->iTimerId);
+        poPlugin->iTimerId = 0;
+        timerNeedsUpdate = 0;
+    }
+
     if (!poPlugin->iTimerId)
         poPlugin->iTimerId = g_timeout_add (poConf->iPeriod_ms,
 					    (GSourceFunc) SetTimer, poPlugin);
@@ -773,6 +781,7 @@
     struct param_t *poConf = &(poPlugin->oConf.oParam);
     float           r;
 
+    timerNeedsUpdate = 1;
     TRACE ("SetPeriod()\n");
     r = gtk_spin_button_get_value (GTK_SPIN_BUTTON (p_wSc));
     poConf->iPeriod_ms = (r * 1000) + 0.5;	/* rounded */
@@ -1096,8 +1105,6 @@
 {
     diskperf_t *diskperf = diskperf_create_control (plugin);
 
-    diskperf_read_config (plugin, diskperf);
-
     g_signal_connect (plugin, "free-data", G_CALLBACK (diskperf_free), 
                       diskperf);
 
@@ -1120,7 +1127,9 @@
     gtk_container_add (GTK_CONTAINER (plugin), diskperf->oMonitor.wEventBox);
 
     CreateMonitorBars (diskperf, xfce_panel_plugin_get_orientation (plugin));
-    
+
+    diskperf_read_config (plugin, diskperf);
+    DevPerfInit();
     SetTimer (diskperf);
 }
 


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/FC-6/xfce4-diskperf-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-diskperf-plugin.spec	5 Oct 2006 12:13:39 -0000	1.6
+++ xfce4-diskperf-plugin.spec	25 Nov 2006 02:13:13 -0000	1.7
@@ -1,12 +1,13 @@
 Name:		xfce4-diskperf-plugin
 Version:	2.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-01_random_fixes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .random_fixes
 
 %build
 %configure --disable-static
@@ -38,6 +40,9 @@
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sat Nov 25 2006 Christoph Wickert  - 2.0-4
+- Add patch to fix bug bugzilla.xfce.org #1842 (#215863)
+
 * Thu Oct 05 2006 Christoph Wickert  - 2.0-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 04:08:17 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Fri, 24 Nov 2006 23:08:17 -0500
Subject: rpms/mlton/devel mlton-20051202-pdf-docs.patch, NONE,
	1.1 mlton-20061107-debuginfo.patch, NONE,
	1.1 mlton-20061107-optflags.patch, NONE, 1.1 mlton.spec, 1.5,
	1.6 mlton-debuginfo.patch, 1.2, NONE mlton-pdf-docs.patch, 1.1, NONE
Message-ID: <200611250408.kAP48HPR012695@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667

Modified Files:
	mlton.spec 
Added Files:
	mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch 
	mlton-20061107-optflags.patch 
Removed Files:
	mlton-debuginfo.patch mlton-pdf-docs.patch 
Log Message:
fixes

mlton-20051202-pdf-docs.patch:

--- NEW FILE mlton-20051202-pdf-docs.patch ---
diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
--- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
+++ mlton-20051202/Makefile	2006-06-19 23:26:55.000000000 -0400
@@ -431,8 +431,8 @@
 		; do 							\
 		$(CP) $(SRC)/regression/$$f.sml $(TEXM)/; 		\
 	done
-	$(GZIP) -c $(LEX)/$(LEX).ps >$(TDOC)/$(LEX).ps.gz
-	$(GZIP) -c $(YACC)/$(YACC).ps >$(TDOC)/$(YACC).ps.gz
+	$(CP) $(LEX)/$(LEX).pdf $(TDOC)
+	$(CP) $(YACC)/$(YACC).pdf $(TDOC)
 	find $(TDOC)/ -name .svn -type d | xargs rm -rf
 	find $(TDOC)/ -name .ignore -type f | xargs rm -rf
 	find $(TEXM)/ -name .svn -type d | xargs rm -rf
diff -ur mlton-20051202~/mllex/Makefile mlton-20051202/mllex/Makefile
--- mlton-20051202~/mllex/Makefile	2005-10-11 16:47:54.000000000 -0400
+++ mlton-20051202/mllex/Makefile	2006-06-19 22:39:39.000000000 -0400
@@ -47,7 +47,7 @@
 	../bin/clean
 
 .PHONY: docs
-docs: mllex.ps
+docs: mllex.pdf
 
 .PHONY: test
 test: $(NAME)
diff -ur mlton-20051202~/mlyacc/doc/Makefile mlton-20051202/mlyacc/doc/Makefile
--- mlton-20051202~/mlyacc/doc/Makefile	2005-11-06 15:04:36.000000000 -0500
+++ mlton-20051202/mlyacc/doc/Makefile	2006-06-19 22:47:41.000000000 -0400
@@ -6,7 +6,7 @@
  # See the file MLton-LICENSE for details.
  ##
 
-all: mlyacc.ps
+all: mlyacc.pdf
 
 html/index.html: $(TEX_FILES)
 	mkdir -p html
diff -ur mlton-20051202~/mlyacc/Makefile mlton-20051202/mlyacc/Makefile
--- mlton-20051202~/mlyacc/Makefile	2005-10-11 16:48:34.000000000 -0400
+++ mlton-20051202/mlyacc/Makefile	2006-06-19 22:48:23.000000000 -0400
@@ -38,15 +38,21 @@
 doc/mlyacc.ps:
 	$(MAKE) -C doc mlyacc.ps
 
+doc/mlyacc.pdf:
+	$(MAKE) -C doc mlyacc.pdf
+
 mlyacc.ps: doc/mlyacc.ps
 	cp doc/mlyacc.ps .
 
+mlyacc.pdf: doc/mlyacc.pdf
+	cp doc/mlyacc.pdf .
+
 .PHONY: clean
 clean:
 	../bin/clean
 
 .PHONY: docs
-docs: mlyacc.ps
+docs: mlyacc.pdf
 
 .PHONY: test
 test: $(NAME)

mlton-20061107-debuginfo.patch:

--- NEW FILE mlton-20061107-debuginfo.patch ---
--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
+++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
@@ -411,18 +411,7 @@
 	if $(GZIP_MAN); then						\
 		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
 	fi
-	case "$(TARGET_OS)" in						\
-	aix|cygwin|darwin|solaris)					\
-	;;								\
-	*)								\
-		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
-			$(TBIN)/$(NLFFIGEN)$(EXE) $(TBIN)/$(PROF)$(EXE)	\
-			$(TBIN)/$(YACC)$(EXE); do			\
-			strip --remove-section=.comment			\
-				--remove-section=.note $$f; 		\
-		done							\
-	esac
 
 .PHONY: install-docs
 install-docs:

mlton-20061107-optflags.patch:

--- NEW FILE mlton-20061107-optflags.patch ---
diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/bytecode/Makefile	2006-11-18 12:27:39.000000000 -0500
@@ -10,8 +10,9 @@
 all: interpret.o interpret-gdb.o print-opcodes
 
 CC = gcc -std=gnu99
-CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
-DEBUGFLAGS = $(CFLAGS)
+OPTFLAGS = -fomit-frame-pointer
+DEBUGFLAGS = -fomit-frame-pointer
+CFLAGS = -I../runtime -I../include -Wall
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)
 DEBUGFLAGS += -gstabs+
@@ -20,21 +21,23 @@
 DEBUGFLAGS += -g2
 
 ifeq ($(TARGET_ARCH), amd64)
-CFLAGS += -mtune=opteron -m32 
-endif 
+OPTFLAGS += -mtune=opteron
+CFLAGS += -m32
+endif
 
 ifeq ($(TARGET_OS), freebsd)
 CFLAGS += -I/usr/local/include
 endif
 
 interpret.o: interpret.c interpret.h opcode.h
-	$(CC) $(CFLAGS) -c -O2 interpret.c
+	$(CC) $(CFLAGS) -c -O2 $(OPTFLAGS) interpret.c
 
 interpret-gdb.o: interpret.c interpret.h
-	$(CC) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
+	$(CC) $(CFLAGS) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
 
 print-opcodes: print-opcodes.c opcode.h
-	$(CC) $(CFLAGS) -o print-opcodes -I../runtime -L../runtime	\
+	$(CC) $(CFLAGS) $(OPTFLAGS) -o print-opcodes \
+		-I../runtime -L../runtime	\
 		print-opcodes.c -lmlton
 
 .PHONY: clean
diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/runtime/Makefile	2006-11-18 12:29:40.000000000 -0500
@@ -13,22 +13,25 @@
 TARGET_OS = $(shell ../bin/host-os)
 GCC_VERSION = $(shell gcc -v 2>&1 | grep 'gcc version' | sed 's/.*gcc version \(.\).*/\1/')
 
-FLAGS = -fomit-frame-pointer
+OPTFLAGS = -fomit-frame-pointer
+FLAGS =
 
 ifeq ($(TARGET_ARCH), x86)
 ifneq ($(findstring $(GCC_VERSION), 3 4),)
-FLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
+OPTFLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
 else
-FLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
+OPTFLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
 endif
 endif
 
 ifeq ($(TARGET_ARCH), amd64)
-FLAGS += -mtune=opteron -m32
+OPTFLAGS += -mtune=opteron
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_ARCH), sparc)
-FLAGS += -mcpu=v8 -m32
+OPTFLAGS += -mcpu=v8
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_OS), freebsd)
@@ -36,7 +39,7 @@
 endif
 
 ifeq ($(TARGET_OS), solaris)
-FLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
+OPTFLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
 endif
 
 ifeq ($(TARGET), self)
@@ -49,7 +52,7 @@
 endif
 
 CC = gcc -std=gnu99
-CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
+CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS) $(OPTFLAGS)
 DEBUGFLAGS = $(CFLAGS)
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mlton.spec	16 Nov 2006 04:07:29 -0000	1.5
+++ mlton.spec	25 Nov 2006 04:07:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:		mlton
 Version:	20061107
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -15,8 +15,9 @@
 Source2:	mlton-bootstrap.ppc.tar.bz2
 %endif
 
-Patch0:		mlton-pdf-docs.patch
-Patch1:		mlton-debuginfo.patch
+Patch0:		mlton-20051202-pdf-docs.patch
+Patch1:		mlton-20061107-debuginfo.patch
+Patch2:		mlton-20061107-optflags.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +46,14 @@
 %setup -q
 
 # instantiate version numbers
-make version
+make version VERSION=%{version}
 
 # build documentation as PDF
-%patch -P 0 -p1
-# enable -g and disable strip so debuginfo packages work
-%patch -P 1 -p1
+%patch -P 0 -p1 -b .pdf-docs
+# disable strip so debuginfo packages work
+%patch -P 1 -p1 -b .debuginfo
+# enable RPM_OPT_FLAGS
+%patch -P 2 -p1 -b .optflags
 
 # set correct version of PDF guide until this is fixed upstream
 sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
@@ -73,7 +76,7 @@
 export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
 %endif
 
-make
+make OPTFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -102,7 +105,13 @@
 %{_libdir}/mlton
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Nov 24 2006 Adam Goode  - 20061107-2
+- Use RPM_OPT_FLAGS
+- Correctly instantiate version
+- Adjust patches
+
 * Sun Nov 12 2006 Adam Goode  - 20061107-1
 - New release, taken from svn://mlton.org/mlton/tags/on-20061107
 


--- mlton-debuginfo.patch DELETED ---


--- mlton-pdf-docs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 10:43:46 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 05:43:46 -0500
Subject: rpms/fuse/FC-4 fuse.spec,1.9,1.10
Message-ID: <200611251043.kAPAhko0032660@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606/FC-4

Modified Files:
	fuse.spec 
Log Message:
fixed nasty typo (see bug #217075)


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fuse.spec	22 Nov 2006 19:36:58 -0000	1.9
+++ fuse.spec	25 Nov 2006 10:43:15 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -100,8 +100,7 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) 
-%{_bindir}/fusermount
+%attr(4754,root,fuse) %{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
@@ -124,6 +123,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.6.0-2
+- fixed nasty typo (see bug #217075)
+
 * Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
 - Ver. 2.6.0
 



From fedora-extras-commits at redhat.com  Sat Nov 25 10:43:51 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 05:43:51 -0500
Subject: rpms/fuse/FC-6 fuse.spec,1.14,1.15
Message-ID: <200611251043.kAPAhp6U032666@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606/FC-6

Modified Files:
	fuse.spec 
Log Message:
fixed nasty typo (see bug #217075)


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-6/fuse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fuse.spec	22 Nov 2006 19:29:39 -0000	1.14
+++ fuse.spec	25 Nov 2006 10:43:21 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -100,8 +100,7 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) 
-%{_bindir}/fusermount
+%attr(4754,root,fuse) %{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
@@ -124,6 +123,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.6.0-2
+- fixed nasty typo (see bug #217075)
+
 * Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
 - Ver. 2.6.0
 



From fedora-extras-commits at redhat.com  Sat Nov 25 10:43:46 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 05:43:46 -0500
Subject: rpms/fuse/FC-5 fuse.spec,1.13,1.14
Message-ID: <200611251043.kAPAhk5w032663@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606/FC-5

Modified Files:
	fuse.spec 
Log Message:
fixed nasty typo (see bug #217075)


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fuse.spec	22 Nov 2006 19:34:55 -0000	1.13
+++ fuse.spec	25 Nov 2006 10:43:16 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -100,8 +100,7 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) 
-%{_bindir}/fusermount
+%attr(4754,root,fuse) %{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
@@ -124,6 +123,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.6.0-2
+- fixed nasty typo (see bug #217075)
+
 * Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
 - Ver. 2.6.0
 



From fedora-extras-commits at redhat.com  Sat Nov 25 10:43:51 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 05:43:51 -0500
Subject: rpms/fuse/devel fuse.spec,1.14,1.15
Message-ID: <200611251043.kAPAhpad032671@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606/devel

Modified Files:
	fuse.spec 
Log Message:
fixed nasty typo (see bug #217075)


Index: fuse.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fuse.spec	11 Nov 2006 06:14:37 -0000	1.14
+++ fuse.spec	25 Nov 2006 10:43:21 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -100,8 +100,7 @@
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) 
-%{_bindir}/fusermount
+%attr(4754,root,fuse) %{_bindir}/fusermount
 %{_bindir}/ulockmgr_server
 %{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
@@ -124,6 +123,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.6.0-2
+- fixed nasty typo (see bug #217075)
+
 * Fri Nov  3 2006 Peter Lemenkov  2.6.0-1
 - Ver. 2.6.0
 



From fedora-extras-commits at redhat.com  Sat Nov 25 10:55:09 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 05:55:09 -0500
Subject: rpms/fontforge/devel fontforge-20061025-usFirstCharIndex.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 fontforge.spec, 1.21, 1.22 sources,
	1.10, 1.11
Message-ID: <200611251055.kAPAt9FC000417@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv394

Modified Files:
	.cvsignore fontforge.spec sources 
Added Files:
	fontforge-20061025-usFirstCharIndex.patch 
Log Message:
* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
- Update to 20061025
- Patch to correct usFirstCharIndex (George Williams)


fontforge-20061025-usFirstCharIndex.patch:

--- NEW FILE fontforge-20061025-usFirstCharIndex.patch ---
--- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
+++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
@@ -3187,7 +3187,6 @@
 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
 	os2->lastcharindex  = 0xf000 + last;
     } else {
-	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
 	os2->firstcharindex = first;
 	os2->lastcharindex = last;
 	OS2FigureCodePages(sf, os2->ulCodePage);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	20 Oct 2006 18:40:41 -0000	1.10
+++ .cvsignore	25 Nov 2006 10:54:38 -0000	1.11
@@ -1,2 +1,2 @@
-fontforge_full-20061019.tar.bz2
 fontforge_htdocs-20061014.tar.bz2
+fontforge_full-20061025.tar.bz2


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fontforge.spec	20 Oct 2006 18:40:41 -0000	1.21
+++ fontforge.spec	25 Nov 2006 10:54:38 -0000	1.22
@@ -2,7 +2,7 @@
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061019
+Version:        20061025
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -12,6 +12,7 @@
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+Patch1:         fontforge-20061025-usFirstCharIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .usFirstCharIndex
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -112,6 +114,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
+- Update to 20061025
+- Patch to correct usFirstCharIndex (George Williams)
+
 * Fri Oct 20 2006 Kevin Fenzi  - 20061019-1
 - Update to 20061019
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Oct 2006 18:40:41 -0000	1.10
+++ sources	25 Nov 2006 10:54:38 -0000	1.11
@@ -1,2 +1,2 @@
-17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
 c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2
+5fcfa3497d237bf68d1d388254f78448  fontforge_full-20061025.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 11:20:06 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 06:20:06 -0500
Subject: rpms/fontforge/FC-6 fontforge-20061025-usFirstCharIndex.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 fontforge.spec, 1.21, 1.22
Message-ID: <200611251120.kAPBK66k003564@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3541

Modified Files:
	.cvsignore fontforge.spec 
Added Files:
	fontforge-20061025-usFirstCharIndex.patch 
Log Message:
* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
- Update to 20061025
- Patch to correct usFirstCharIndex (George Williams)


fontforge-20061025-usFirstCharIndex.patch:

--- NEW FILE fontforge-20061025-usFirstCharIndex.patch ---
--- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
+++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
@@ -3187,7 +3187,6 @@
 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
 	os2->lastcharindex  = 0xf000 + last;
     } else {
-	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
 	os2->firstcharindex = first;
 	os2->lastcharindex = last;
 	OS2FigureCodePages(sf, os2->ulCodePage);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	20 Oct 2006 18:40:41 -0000	1.10
+++ .cvsignore	25 Nov 2006 11:19:36 -0000	1.11
@@ -1,2 +1,2 @@
-fontforge_full-20061019.tar.bz2
 fontforge_htdocs-20061014.tar.bz2
+fontforge_full-20061025.tar.bz2


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-6/fontforge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fontforge.spec	20 Oct 2006 18:40:41 -0000	1.21
+++ fontforge.spec	25 Nov 2006 11:19:36 -0000	1.22
@@ -2,7 +2,7 @@
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061019
+Version:        20061025
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -12,6 +12,7 @@
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+Patch1:         fontforge-20061025-usFirstCharIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .usFirstCharIndex
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -112,6 +114,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
+- Update to 20061025
+- Patch to correct usFirstCharIndex (George Williams)
+
 * Fri Oct 20 2006 Kevin Fenzi  - 20061019-1
 - Update to 20061019
 



From fedora-extras-commits at redhat.com  Sat Nov 25 11:24:46 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 06:24:46 -0500
Subject: rpms/fontforge/FC-5 fontforge-20061025-usFirstCharIndex.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 fontforge.spec, 1.18, 1.19
Message-ID: <200611251124.kAPBOkRt003682@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3647

Modified Files:
	.cvsignore fontforge.spec 
Added Files:
	fontforge-20061025-usFirstCharIndex.patch 
Log Message:
* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
- Update to 20061025
- Patch to correct usFirstCharIndex (George Williams)


fontforge-20061025-usFirstCharIndex.patch:

--- NEW FILE fontforge-20061025-usFirstCharIndex.patch ---
--- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
+++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
@@ -3187,7 +3187,6 @@
 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
 	os2->lastcharindex  = 0xf000 + last;
     } else {
-	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
 	os2->firstcharindex = first;
 	os2->lastcharindex = last;
 	OS2FigureCodePages(sf, os2->ulCodePage);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 Oct 2006 19:00:02 -0000	1.9
+++ .cvsignore	25 Nov 2006 11:24:16 -0000	1.10
@@ -1,2 +1,2 @@
-fontforge_full-20061019.tar.bz2
 fontforge_htdocs-20061014.tar.bz2
+fontforge_full-20061025.tar.bz2


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/fontforge.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fontforge.spec	20 Oct 2006 19:00:02 -0000	1.18
+++ fontforge.spec	25 Nov 2006 11:24:16 -0000	1.19
@@ -2,7 +2,7 @@
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061019
+Version:        20061025
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -12,6 +12,7 @@
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+Patch1:         fontforge-20061025-usFirstCharIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .usFirstCharIndex
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -112,6 +114,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Roozbeh Pournader  - 20061025-1
+- Update to 20061025
+- Patch to correct usFirstCharIndex (George Williams)
+
 * Fri Oct 20 2006 Kevin Fenzi  - 20061019-1
 - Update to 20061019
 



From fedora-extras-commits at redhat.com  Sat Nov 25 11:30:14 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 06:30:14 -0500
Subject: rpms/fontforge/FC-6 sources,1.10,1.11
Message-ID: <200611251130.kAPBUEKj003775@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3753

Modified Files:
	sources 
Log Message:
Forgot to commit sources with last commit



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Oct 2006 18:40:41 -0000	1.10
+++ sources	25 Nov 2006 11:29:44 -0000	1.11
@@ -1,2 +1,2 @@
-17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
 c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2
+5fcfa3497d237bf68d1d388254f78448  fontforge_full-20061025.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 11:31:19 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 25 Nov 2006 06:31:19 -0500
Subject: rpms/fontforge/FC-5 sources,1.9,1.10
Message-ID: <200611251131.kAPBVJN8003804@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3781

Modified Files:
	sources 
Log Message:
Forgot to commit 'sources' with last commit



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Oct 2006 19:00:02 -0000	1.9
+++ sources	25 Nov 2006 11:30:49 -0000	1.10
@@ -1,2 +1,2 @@
-17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
 c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2
+5fcfa3497d237bf68d1d388254f78448  fontforge_full-20061025.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 12:42:06 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 25 Nov 2006 07:42:06 -0500
Subject: rpms/mhash/devel .cvsignore, 1.4, 1.5 mhash.spec, 1.12, 1.13 sources,
	1.4, 1.5
Message-ID: <200611251242.kAPCg6YR007189@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/mhash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7170

Modified Files:
	.cvsignore mhash.spec sources 
Log Message:
* Sat Nov 25 2006 Michael Schwendt  - 0.9.7.1-1
- Update to 0.9.7.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2005 16:15:06 -0000	1.4
+++ .cvsignore	25 Nov 2006 12:41:36 -0000	1.5
@@ -1 +1 @@
-mhash-*.tar*
+mhash-0.9.7.1.tar.bz2


Index: mhash.spec
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mhash.spec	28 Aug 2006 10:34:30 -0000	1.12
+++ mhash.spec	25 Nov 2006 12:41:36 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Thread-safe hash algorithms library
 Name: mhash
-Version: 0.9.2
-Release: 5
+Version: 0.9.7.1
+Release: 1
 URL: http://mhash.sourceforge.net/
 License: LGPL
 Group: System Environment/Libraries
@@ -17,9 +17,9 @@
 and other signatures. The HMAC support implements the basics for
 message authentication, following RFC 2104. In the later versions
 some key generation algorithms, which use hash algorithms, have been
-added. Currently, the library supports the algorithms: SHA1, GOST,
+added. Currently, the library supports the algorithms: ADLER32, GOST,
 HAVAL256, HAVAL224, HAVAL192, HAVAL160, HAVAL128, MD5, MD4, MD2,
-RIPEMD128/160/256/320, TIGER, TIGER160, TIGER128, SHA224/384/512,
+RIPEMD128/160/256/320, TIGER, TIGER160, TIGER128, SHA1/224/256/384/512,
 Whirlpool, SNEFRU128/256, CRC32B and CRC32 checksums.
 
 
@@ -45,7 +45,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=${RPM_BUILD_ROOT} install
+
+# Eliminate some autoheader definitions which should not enter a public API.
+# There are more which wait for a fix upstream.
+sed -i 's!\(#define \(PACKAGE\|VERSION \).*\)!/* \1 */!g' ${RPM_BUILD_ROOT}%{_includedir}/mutils/mhash_config.h
 
 
 %post -n %{name} -p /sbin/ldconfig
@@ -68,6 +72,7 @@
 %defattr(-,root,root,-)
 %doc ChangeLog ./doc/*.txt ./doc/*.c ./doc/skid2-authentication
 %{_includedir}/*.h
+%{_includedir}/mutils/
 %{?_with_static: %{_libdir}/*.a}
 %{_libdir}/*.so
 %exclude %{_libdir}/*.la
@@ -75,7 +80,10 @@
 
 
 %changelog
-* Mon Aug 28 2006 Michael Schwendt 
+* Sat Nov 25 2006 Michael Schwendt  - 0.9.7.1-1
+- Update to 0.9.7.1.
+
+* Mon Aug 28 2006 Michael Schwendt  - 0.9.2-5
 - rebuilt
 
 * Wed Feb 22 2006 Michael Schwendt  - 0.9.2-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Feb 2005 03:27:13 -0000	1.4
+++ sources	25 Nov 2006 12:41:36 -0000	1.5
@@ -1 +1 @@
-507e0034985eee6364d404bfc761ee02  mhash-0.9.2.tar.bz2
+e2a7f6594d468c5d0edbfa788dbdca0f  mhash-0.9.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 12:55:23 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:55:23 -0500
Subject: rpms/perl-Apache-DBI - New directory
Message-ID: <200611251255.kAPCtNwi007365@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7361/perl-Apache-DBI

Log Message:
Directory /cvs/extras/rpms/perl-Apache-DBI added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 12:55:29 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:55:29 -0500
Subject: rpms/perl-Apache-DBI/devel - New directory
Message-ID: <200611251255.kAPCtTcV007378@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7361/perl-Apache-DBI/devel

Log Message:
Directory /cvs/extras/rpms/perl-Apache-DBI/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 12:55:48 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:55:48 -0500
Subject: rpms/perl-Apache-DBI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611251255.kAPCtmEO007408@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7402

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Apache-DBI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Apache-DBI
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  Sat Nov 25 12:55:53 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:55:53 -0500
Subject: rpms/perl-Apache-DBI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611251255.kAPCtrat007423@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7402/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Apache-DBI


--- 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  Sat Nov 25 12:56:57 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:56:57 -0500
Subject: rpms/perl-Apache-DBI import.log,1.1,1.2
Message-ID: <200611251256.kAPCuvbm007492@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7462

Modified Files:
	import.log 
Log Message:
auto-import perl-Apache-DBI-1.05-2.fc7 on branch devel from perl-Apache-DBI-1.05-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-DBI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 12:55:48 -0000	1.1
+++ import.log	25 Nov 2006 12:56:27 -0000	1.2
@@ -0,0 +1 @@
+perl-Apache-DBI-1_05-2_fc7:HEAD:perl-Apache-DBI-1.05-2.fc7.src.rpm:1164459451



From fedora-extras-commits at redhat.com  Sat Nov 25 12:56:58 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 07:56:58 -0500
Subject: rpms/perl-Apache-DBI/devel perl-Apache-DBI.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611251257.kAPCuwgE007496@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/perl-Apache-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7462/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Apache-DBI.spec 
Log Message:
auto-import perl-Apache-DBI-1.05-2.fc7 on branch devel from perl-Apache-DBI-1.05-2.fc7.src.rpm


--- NEW FILE perl-Apache-DBI.spec ---
%define perlname Apache-DBI

Name:      perl-Apache-DBI
Version:   1.05
Release:   2%{?dist}
Summary:   Persistent database connections with Apache/mod_perl

Group:     Development/Libraries
License:   GPL or Artistic
URL:       http://search.cpan.org/dist/Apache-DBI/
Source:    http://search.cpan.org/CPAN/authors/id/P/PG/PGOLLUCCI/%{perlname}-%{version}.tar.gz

BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(DBD::mysql)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is version %{version} of Apache::AuthDBI and Apache::DBI.

These modules are supposed to be used with the Apache server together with 
an embedded perl interpreter like mod_perl. They provide support for basic 
authentication and authorization as well as support for persistent database 
connections via Perl's Database Independent Interface (DBI). 

o DBI.pm provides persistent database connections: 
  - connections can be established during server-startup 
  - configurable rollback to ensure data integrity 
  - configurable verification of the connections to avoid time-outs. 

o AuthDBI.pm provides authentication and authorization: 
  - optional shared cache for passwords to minimize database load 
  - configurable cleanup-handler deletes outdated entries from the cache 

Apache::DBI has been in widespread deployment on many platforms for
years.  Apache::DBI is one of the most widely used mod_perl related
modules.  It can be considered stable.

%prep
%setup -q -n %{perlname}-%{version}
%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' eg/startup.pl
chmod 644 eg/startup.pl


%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 TODO traces.txt eg/
%{_mandir}/man3/Apache*
%{perl_vendorlib}/Apache

%changelog
* Sat Nov 25 2006 Remi Collet  1.05-2
- change from review (-perldoc +traces +eg)

* Sat Nov 25 2006 Remi Collet  1.05-1
- initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-DBI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 12:55:53 -0000	1.1
+++ .cvsignore	25 Nov 2006 12:56:28 -0000	1.2
@@ -0,0 +1 @@
+Apache-DBI-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-DBI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 12:55:53 -0000	1.1
+++ sources	25 Nov 2006 12:56:28 -0000	1.2
@@ -0,0 +1 @@
+ba0b6e345870c052e8ce6d6d73b4bfe4  Apache-DBI-1.05.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 13:02:17 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Sat, 25 Nov 2006 08:02:17 -0500
Subject: owners owners.list,1.2006,1.2007
Message-ID: <200611251302.kAPD2HSx010575@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558

Modified Files:
	owners.list 
Log Message:
	perl-Apache-DBI



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2006
retrieving revision 1.2007
diff -u -r1.2006 -r1.2007
--- owners.list	24 Nov 2006 19:16:56 -0000	1.2006
+++ owners.list	25 Nov 2006 13:01:47 -0000	1.2007
@@ -1301,6 +1301,7 @@
 Fedora Extras|perl-aliased|Use shorter versions of class names|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Alien-wxWidgets|Building, finding and using wxWidgets binaries|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AnyData|Easy access to data in many formats|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Apache-DBI|Persistent database connections with Apache/mod_perl|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-LogRegex|Perl module for parsing a line from an Apache logfile into a hash|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
 Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Nov 25 13:45:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 08:45:56 -0500
Subject: rpms/libassuan/devel .cvsignore, 1.8, 1.9 libassuan.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <200611251345.kAPDjuER010890@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10871

Modified Files:
	.cvsignore libassuan.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  - 1.0.1-1
- libassuan-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Nov 2006 21:25:32 -0000	1.8
+++ .cvsignore	25 Nov 2006 13:45:26 -0000	1.9
@@ -1,4 +1,4 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-1.0.0.tar.bz2
-libassuan-1.0.0.tar.bz2.sig
+libassuan-1.0.1.tar.bz2.sig
+libassuan-1.0.1.tar.bz2


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libassuan.spec	13 Nov 2006 21:25:32 -0000	1.21
+++ libassuan.spec	25 Nov 2006 13:45:26 -0000	1.22
@@ -1,7 +1,7 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 1.0.0 
+Version: 1.0.1
 Release: 1%{?dist}
 
 License: LGPL
@@ -82,8 +82,11 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  - 1.0.1-1
+- libassuan-1.0.1
+
 * Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
-- 1.0.0
+- libassuan-1.0.0
 - rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
 
 * Wed Oct 18 2006 Rex Dieter  - 0.9.3-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Nov 2006 21:25:32 -0000	1.8
+++ sources	25 Nov 2006 13:45:26 -0000	1.9
@@ -1,2 +1,2 @@
-f1580ef149e629629a9639a5afdb5908  libassuan-1.0.0.tar.bz2
-c00497327001dcccf7d3a952f56030e4  libassuan-1.0.0.tar.bz2.sig
+003d24e08f2eeee14b5afcc1a1998f40  libassuan-1.0.1.tar.bz2.sig
+6109ea5c8c34ee5591afbd4618dd5ab4  libassuan-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 14:03:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 09:03:17 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.61,1.62
Message-ID: <200611251403.kAPE3HFJ013978@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13963

Modified Files:
	gnupg2.spec 
Log Message:
* Sat Nov 25 2006 Rex Dieter  2.0.1-0.1.rc1
- gnupg-2.0.1rc1 



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnupg2.spec	16 Nov 2006 20:57:49 -0000	1.61
+++ gnupg2.spec	25 Nov 2006 14:02:47 -0000	1.62
@@ -7,15 +7,17 @@
 %define kde_scriptdir %{_prefix}
 %endif
 
+%define beta rc1
+
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.0
-Release: 4%{?dist}
+Version: 2.0.1
+Release: 0.1.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,7 +32,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-static >= 1.0.0 
+BuildRequires: libassuan-static >= 1.0.1 
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -78,7 +80,7 @@
 
 
 %prep
-%setup -q -n gnupg-%{version}
+%setup -q -n gnupg-%{version}%{?beta}
 
 #patch1 -p1 -b .testverbose
 
@@ -178,6 +180,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  2.0.1-0.1.rc1
+- gnupg-2.0.1rc1 
+
 * Thu Nov 16 2006 Rex Dieter  2.0.0-4
 - update %%description
 - drop dearmor patch
@@ -186,7 +191,7 @@
 - BR: libassuan-static >= 1.0.0
 
 * Mon Nov 13 2006 Rex Dieter  2.0.0-2
-- 2.0.0
+- gnupg-2.0.0
 
 * Fri Nov 10 2006 Rex Dieter  1.9.95-3
 - upstream 64bit patch



From fedora-extras-commits at redhat.com  Sat Nov 25 14:08:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 09:08:11 -0500
Subject: rpms/gnupg2/devel .cvsignore, 1.17, 1.18 gnupg2.spec, 1.62,
	1.63 sources, 1.19, 1.20
Message-ID: <200611251408.kAPE8B8V014059@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14040

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
fix sources, Release++



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Nov 2006 20:36:26 -0000	1.17
+++ .cvsignore	25 Nov 2006 14:07:41 -0000	1.18
@@ -1,4 +1,4 @@
-gnupg-1.9.95.tar.bz2
-gnupg-1.9.95.tar.bz2.sig
 gnupg-2.0.0.tar.bz2
 gnupg-2.0.0.tar.bz2.sig
+gnupg-2.0.1rc1.tar.bz2
+gnupg-2.0.1rc1.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnupg2.spec	25 Nov 2006 14:02:47 -0000	1.62
+++ gnupg2.spec	25 Nov 2006 14:07:41 -0000	1.63
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.1
-Release: 0.1.%{beta}%{?dist}
+Release: 0.2.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -180,7 +180,7 @@
 
 
 %changelog
-* Sat Nov 25 2006 Rex Dieter  2.0.1-0.1.rc1
+* Sat Nov 25 2006 Rex Dieter  2.0.1-0.2.rc1
 - gnupg-2.0.1rc1 
 
 * Thu Nov 16 2006 Rex Dieter  2.0.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Nov 2006 20:36:26 -0000	1.19
+++ sources	25 Nov 2006 14:07:41 -0000	1.20
@@ -1,2 +1,2 @@
-65dc5da3bd4ec127f81c584c8200d813  gnupg-2.0.0.tar.bz2.sig
-13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2
+e782017943dcf59e3f5b71556e921be4  gnupg-2.0.1rc1.tar.bz2
+2dee9b82c53b42c13267b794aa3fae00  gnupg-2.0.1rc1.tar.bz2.sig



From fedora-extras-commits at redhat.com  Sat Nov 25 14:39:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 09:39:17 -0500
Subject: rpms/perl-Log-Dispatch/devel .cvsignore, 1.4,
	1.5 perl-Log-Dispatch.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611251439.kAPEdHlk014277@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14254

Modified Files:
	.cvsignore perl-Log-Dispatch.spec sources 
Log Message:
Update to 2.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Sep 2006 20:46:03 -0000	1.4
+++ .cvsignore	25 Nov 2006 14:38:47 -0000	1.5
@@ -1 +1 @@
-Log-Dispatch-2.13.tar.gz
+Log-Dispatch-2.14.tar.gz


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Log-Dispatch.spec	26 Sep 2006 20:46:03 -0000	1.6
+++ perl-Log-Dispatch.spec	25 Nov 2006 14:38:47 -0000	1.7
@@ -7,7 +7,7 @@
 
 
 Name:           perl-Log-Dispatch
-Version:        2.13
+Version:        2.14
 Release:        1%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 2.14-1
+- Update to 2.14.
+
 * Tue Sep 26 2006 Jose Pedro Oliveira  - 2.13-1
 - Update to 2.13.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Sep 2006 20:46:03 -0000	1.4
+++ sources	25 Nov 2006 14:38:47 -0000	1.5
@@ -1 +1 @@
-88349394af92f521e1ccc845d64fb9f2  Log-Dispatch-2.13.tar.gz
+163825c45fcb359faf9803e10f7f9c58  Log-Dispatch-2.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 15:04:10 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 25 Nov 2006 10:04:10 -0500
Subject: rpms/jd/devel .cvsignore, 1.23, 1.24 jd.spec, 1.30, 1.31 sources,
	1.23, 1.24
Message-ID: <200611251504.kAPF4A1n017498@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17470

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Nov 25 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061125
- cvs 061125 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	24 Nov 2006 15:09:08 -0000	1.23
+++ .cvsignore	25 Nov 2006 15:03:40 -0000	1.24
@@ -1 +1 @@
-jd-1.8.1-cvs061124.tgz
+jd-1.8.1-cvs061125.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jd.spec	24 Nov 2006 15:09:08 -0000	1.30
+++ jd.spec	25 Nov 2006 15:03:40 -0000	1.31
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061124
+%define         strtag        cvs061125
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Nov 24 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061124
-- cvs 061124 (23:59 JST)
+* Sat Nov 25 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061125
+- cvs 061125 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	24 Nov 2006 15:09:08 -0000	1.23
+++ sources	25 Nov 2006 15:03:40 -0000	1.24
@@ -1 +1 @@
-74ebe9ef9e826e2134fe7bcdf43b0797  jd-1.8.1-cvs061124.tgz
+1bcf2b13a48d65cabe60a30034b603d0  jd-1.8.1-cvs061125.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 15:12:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sat, 25 Nov 2006 10:12:41 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.8, 1.9 ochusha.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200611251512.kAPFCf7h017596@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17577

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Sat Nov 25 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
- 0.5.99.63.6 cvs 061125 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Nov 2006 07:43:13 -0000	1.8
+++ .cvsignore	25 Nov 2006 15:12:11 -0000	1.9
@@ -1 +1 @@
-ochusha-0.5.99.63.5-cvs061120.tar.bz2
+ochusha-0.5.99.63.6-cvs061125.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ochusha.spec	21 Nov 2006 07:43:13 -0000	1.8
+++ ochusha.spec	25 Nov 2006 15:12:11 -0000	1.9
@@ -1,8 +1,8 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.5
-%define              strtag          cvs061120
+%define              main_ver        0.5.99.63.6
+%define              strtag          cvs061125
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -56,6 +56,9 @@
 # change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
+# set htmlview as a default browser
+%{__sed} -i -e 's|firefox|htmlview|' ochusha/preferences.cc
+
 %build
 sh autogen.sh
 
@@ -152,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Mon Nov 20 2006 Mamoru Tasaka  0.5.99.63.5-0.1.cvs061120
-- 0.5.99.63.5 cvs 061120 (20:00 JST)
+* Sat Nov 25 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
+- 0.5.99.63.6 cvs 061125 (23:59 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Nov 2006 07:43:13 -0000	1.8
+++ sources	25 Nov 2006 15:12:11 -0000	1.9
@@ -1 +1 @@
-d3ce8f7cfe119ab7490cb4043d8357bb  ochusha-0.5.99.63.5-cvs061120.tar.bz2
+51ba6482844fb7c9c1d5fa3a666027f3  ochusha-0.5.99.63.6-cvs061125.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 15:31:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 25 Nov 2006 10:31:44 -0500
Subject: fedora-security/audit fe3, 1.32, 1.33 fe4, 1.99, 1.100 fe5, 1.107, 
	1.108 fe6, 1.23, 1.24
Message-ID: <200611251531.kAPFVi8v017757@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17736

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fe3	23 Nov 2006 21:34:37 -0000	1.32
+++ fe3	25 Nov 2006 15:31:44 -0000	1.33
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5602 VULNERABLE (xsupplicant) #212699


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fe4	23 Nov 2006 21:34:37 -0000	1.99
+++ fe4	25 Nov 2006 15:31:44 -0000	1.100
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fe5	23 Nov 2006 21:34:37 -0000	1.107
+++ fe5	25 Nov 2006 15:31:44 -0000	1.108
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fe6	23 Nov 2006 21:34:37 -0000	1.23
+++ fe6	25 Nov 2006 15:31:44 -0000	1.24
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077



From fedora-extras-commits at redhat.com  Sat Nov 25 15:55:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 10:55:37 -0500
Subject: rpms/kile/devel .cvsignore, 1.7, 1.8 kile.spec, 1.30, 1.31 sources, 
	1.7, 1.8
Message-ID: <200611251555.kAPFtbSI017828@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17809

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Aug 2006 15:39:34 -0000	1.7
+++ .cvsignore	25 Nov 2006 15:55:07 -0000	1.8
@@ -1 +1,2 @@
 kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kile.spec	29 Aug 2006 15:37:07 -0000	1.30
+++ kile.spec	25 Nov 2006 15:55:07 -0000	1.31
@@ -1,8 +1,8 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.2
-Release: 4%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
 * Tue Aug 29 2006 Rex Dieter  1.9.2-4
 - revert to saner/simpler symlink handling
 
@@ -127,10 +130,10 @@
 - fc6 respin
 
 * Sun Aug 27 2006 Rex Dieter  1.9.2-1
-- 1.9.2
+- kile-1.9.2
 
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Aug 2006 15:39:34 -0000	1.7
+++ sources	25 Nov 2006 15:55:07 -0000	1.8
@@ -1 +1 @@
-2f4fa752595c9011fd9292d7ff99d124  kile-1.9.2.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 15:57:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 10:57:26 -0500
Subject: rpms/gnupg2/devel gnupg2.spec,1.63,1.64
Message-ID: <200611251557.kAPFvQ66017917@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17902

Modified Files:
	gnupg2.spec 
Log Message:
fix %files



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnupg2.spec	25 Nov 2006 14:07:41 -0000	1.63
+++ gnupg2.spec	25 Nov 2006 15:56:56 -0000	1.64
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.1
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -167,7 +167,6 @@
 %{_bindir}/watchgnupg
 %{_sbindir}/*
 %{_datadir}/gnupg/
-%{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
 %{_mandir}/man?/*
@@ -180,7 +179,7 @@
 
 
 %changelog
-* Sat Nov 25 2006 Rex Dieter  2.0.1-0.2.rc1
+* Sat Nov 25 2006 Rex Dieter  2.0.1-0.3.rc1
 - gnupg-2.0.1rc1 
 
 * Thu Nov 16 2006 Rex Dieter  2.0.0-4



From fedora-extras-commits at redhat.com  Sat Nov 25 16:14:28 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:14:28 -0500
Subject: rpms/xerces-c - New directory
Message-ID: <200611251614.kAPGESw0021062@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21058/xerces-c

Log Message:
Directory /cvs/extras/rpms/xerces-c added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 16:14:33 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:14:33 -0500
Subject: rpms/xerces-c/devel - New directory
Message-ID: <200611251614.kAPGEXwK021075@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21058/xerces-c/devel

Log Message:
Directory /cvs/extras/rpms/xerces-c/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 16:15:12 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:15:12 -0500
Subject: rpms/xerces-c Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611251615.kAPGFCxV021105@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21099

Added Files:
	Makefile import.log 
Log Message:
Setup of module xerces-c


--- NEW FILE Makefile ---
# Top level Makefile for module xerces-c
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  Sat Nov 25 16:15:18 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:15:18 -0500
Subject: rpms/xerces-c/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611251615.kAPGFI82021121@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21099/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xerces-c


--- 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  Sat Nov 25 16:19:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:19:08 -0500
Subject: rpms/kile/FC-6 .cvsignore, 1.7, 1.8 kile.spec, 1.30, 1.31 sources,
	1.7, 1.8
Message-ID: <200611251619.kAPGJ834021174@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21151

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Aug 2006 15:39:34 -0000	1.7
+++ .cvsignore	25 Nov 2006 16:18:38 -0000	1.8
@@ -1 +1,2 @@
 kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-6/kile.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kile.spec	29 Aug 2006 15:37:07 -0000	1.30
+++ kile.spec	25 Nov 2006 16:18:38 -0000	1.31
@@ -1,8 +1,8 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.2
-Release: 4%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -120,6 +120,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
 * Tue Aug 29 2006 Rex Dieter  1.9.2-4
 - revert to saner/simpler symlink handling
 
@@ -127,10 +130,10 @@
 - fc6 respin
 
 * Sun Aug 27 2006 Rex Dieter  1.9.2-1
-- 1.9.2
+- kile-1.9.2
 
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Aug 2006 15:39:34 -0000	1.7
+++ sources	25 Nov 2006 16:18:38 -0000	1.8
@@ -1 +1 @@
-2f4fa752595c9011fd9292d7ff99d124  kile-1.9.2.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 16:21:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:21:17 -0500
Subject: rpms/kile/FC-6 kile.spec,1.31,1.32
Message-ID: <200611251621.kAPGLHio021249@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21227

Modified Files:
	kile.spec 
Log Message:
micro increment Release, dup'd tag



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-6/kile.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kile.spec	25 Nov 2006 16:18:38 -0000	1.31
+++ kile.spec	25 Nov 2006 16:20:47 -0000	1.32
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.3
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 Group: 	 Applications/Publishing



From fedora-extras-commits at redhat.com  Sat Nov 25 16:21:58 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:21:58 -0500
Subject: rpms/xerces-c import.log,1.1,1.2
Message-ID: <200611251621.kAPGLwLv021329@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21259

Modified Files:
	import.log 
Log Message:
auto-import xerces-c-2.7.0-5 on branch devel from xerces-c-2.7.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xerces-c/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 16:15:12 -0000	1.1
+++ import.log	25 Nov 2006 16:21:28 -0000	1.2
@@ -0,0 +1 @@
+xerces-c-2_7_0-5:HEAD:xerces-c-2.7.0-5.src.rpm:1164471744



From fedora-extras-commits at redhat.com  Sat Nov 25 16:21:59 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:21:59 -0500
Subject: rpms/xerces-c/devel xerces-c.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611251622.kAPGLx0C021333@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21259/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xerces-c.spec 
Log Message:
auto-import xerces-c-2.7.0-5 on branch devel from xerces-c-2.7.0-5.src.rpm


--- NEW FILE xerces-c.spec ---
Summary:	Validating XML Parser
Name: 		xerces-c
Version: 	2.7.0
Release:	5%{?dist}
License:	Apache Software License
Group:		System Environment/Libraries
URL: 		http://xml.apache.org/xerces-c/
Source: 	http://www.apache.org/dist/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Xerces-C is a validating XML parser written in a portable subset of
C++. Xerces-C makes it easy to give your application the ability to
read and write XML data. A shared library is provided for parsing,
generating, manipulating, and validating XML documents. Xerces-C is
faithful to the XML 1.0 recommendation and associated standards ( DOM
1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).

%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.

%package doc
Group:		Documentation
Summary:	Documentation for Xerces-C++ validating XML parser

%description doc
Documentation for Xerces-C++.

Xerces-C++ is a validating XML parser written in a portable subset of C++.
Xerces-C++ makes it easy to give your application the ability to read and
write XML data. A shared library is provided for parsing, generating,
manipulating, and validating XML documents.

#%package	samples
#Summary:	Sample applications using Xerces-C++
#Group:		Applications/Text
#Requires:	%{name} = %{version}-devel-%{release}

#%description	samples
#Sample applications using Xerces-C++.


%prep
%setup -q -n xerces-c-src_2_7_0
rm -rf doc/html/resources/.svn
find ./doc -type f -perm 755 -exec chmod 644 {} \;
find ./samples -type f -perm 755 -exec chmod 644 {} \;
%{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.inw

%build
export XERCESCROOT="$PWD"

# Let Makefiles be verbose
find -name 'Makefile.*' | while read f; do
	sed -i -e 's/$Q//g' \
	-e 's/{MAKE} -s/(MAKE)/g' \
	-e '/echo \"  (/d' \
	$f
done

# Remove conflicting flags from runConfigure
find -name runConfigure | while read f; do
	sed -i -e 's/-w -O -DNDEBUG/-DNDEBUG/g' $f
done

cd $XERCESCROOT/src/xercesc
%ifarch alpha ppc64 s390x sparc64 x86_64
CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b64 -P %{_prefix} -C --libdir="%{_libdir}"
%else
CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthreads -b32 -P %{_prefix} -C --libdir="%{_libdir}"
%endif
# not smp safe
%{__make}
#cd $XERCESCROOT/samples
#CXXFLAGS="${RPM_OPT_FLAGS}" CFLAGS="${RPM_OPT_FLAGS}" ./runConfigure -plinux -cgcc -xg++
#%{__make}

%install
%{__rm} -rf $RPM_BUILD_ROOT
export XERCESCROOT="$PWD"
%{__make} install -C src/xercesc DESTDIR="$RPM_BUILD_ROOT"
#mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
#rm -rf $XERCESCROOT/samples/Projects
#cp -a $XERCESCROOT/samples $RPM_BUILD_ROOT%{_datadir}/%{name}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_libdir}/libxerces*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/libxerces*.so
%{_includedir}/xercesc/

%files doc
%defattr(-,root,root,-)
%doc Readme.html LICENSE NOTICE STATUS credits.txt doc samples

#%files samples
#%defattr(-,root,root,-)
#%{_datadir}/%{name}/samples

%changelog

* Sat Nov 25 2006 Peter Lemenkov  2.7.0-5
- fixed some rpmlint warnings

* Fri Nov 24 2006 Peter Lemenkov  2.7.0-4
- Added samples to docs-package

* Sat Nov 18 2006 Peter Lemenkov  2.7.0-3
- improvements suggested by Aurelien Bompard

* Sat Oct 14 2006 Peter Lemenkov  2.7.0-2
- Disabled package 'samples'

* Fri Oct 13 2006 Peter Lemenkov  2.7.0-1
- initial build for FE

* Fri Jan 06 2006 Dag Wieers  - 2.7.0-1 - 3891/dag
- Cleaned SPEC file.

* Tue Jan 03 2006 Dries Verachtert  - 2.7.0-1
- Updated to release 2.7.0.

* Thu Sep 22 2005 C.Lee Taylor  2.6.1-1
- Update to 2.6.1
- Build for FC4 32/64bit

* Sat Aug 20 2005 Che
- initial rpm release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xerces-c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 16:15:18 -0000	1.1
+++ .cvsignore	25 Nov 2006 16:21:29 -0000	1.2
@@ -0,0 +1 @@
+xerces-c-src_2_7_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xerces-c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 16:15:18 -0000	1.1
+++ sources	25 Nov 2006 16:21:29 -0000	1.2
@@ -0,0 +1 @@
+04169609449a8846bc1e6891c04cadf4  xerces-c-src_2_7_0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 16:22:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:22:33 -0500
Subject: rpms/kile/FC-5 .cvsignore, 1.7, 1.8 kile.spec, 1.27, 1.28 sources,
	1.7, 1.8
Message-ID: <200611251622.kAPGMXfc021384@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21337

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Aug 2006 15:40:09 -0000	1.7
+++ .cvsignore	25 Nov 2006 16:22:03 -0000	1.8
@@ -1 +1,2 @@
 kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/kile.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kile.spec	27 Aug 2006 15:40:09 -0000	1.27
+++ kile.spec	25 Nov 2006 16:22:03 -0000	1.28
@@ -1,7 +1,7 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.2
+Version: 1.9.3
 Release: 1%{?dist}
 
 License: GPL
@@ -47,7 +47,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -62,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --add-category="X-Fedora" --vendor="" \
@@ -72,29 +71,18 @@
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML (1.1)
+# HTML (1.0)
 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
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    ## NEW: automated abs symlink -> rel symlink conversion -- Rex
-    ## not sure if this is worth the extra effort, but here it is...
+    # replace absolute symlinks with relative ones
     pushd $lang_dir
-    ROOT=$(echo $(pwd) | sed -e "s|$RPM_BUILD_ROOT||")
-    LINKS=$(find . -type l )
-    for LINK in $LINKS ; do
-    DST=$(echo $LINK | sed -e "s|./||" )
-    PRE=$(echo $DST | tr -c -d '/' | sed -e 's|/|../|g')
-    # skip if $SRC not inside $ROOT
-    test -z "$PRE" && continue
-    POST=$(readlink $LINK | sed -e "s|$ROOT||" )
-    # skip if not abs symlink
-    test -z "$(echo $POST | grep '^/')" && continue
-    SRC=$(echo $PRE$POST | sed -e 's|//|/|g')
-    rm -f $DST && ln -s $SRC $DST
-    done
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
     popd
   fi
 done
@@ -132,11 +120,20 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
+* Tue Aug 29 2006 Rex Dieter  1.9.2-4
+- revert to saner/simpler symlink handling
+
+* Mon Aug 28 2006 Rex Dieter  1.9.2-3
+- fc6 respin
+
 * Sun Aug 27 2006 Rex Dieter  1.9.2-1
-- 1.9.2
+- kile-1.9.2
 
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Aug 2006 15:40:09 -0000	1.7
+++ sources	25 Nov 2006 16:22:03 -0000	1.8
@@ -1 +1 @@
-2f4fa752595c9011fd9292d7ff99d124  kile-1.9.2.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 16:25:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:25:35 -0500
Subject: rpms/kile/FC-4 .cvsignore, 1.5, 1.6 kile.spec, 1.21, 1.22 sources,
	1.6, 1.7
Message-ID: <200611251625.kAPGPZLa021476@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21452

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Jun 2006 17:22:27 -0000	1.5
+++ .cvsignore	25 Nov 2006 16:25:05 -0000	1.6
@@ -1 +1,2 @@
-kile-1.9.1.tar.bz2
+kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kile.spec	24 Jun 2006 17:22:27 -0000	1.21
+++ kile.spec	25 Nov 2006 16:25:05 -0000	1.22
@@ -1,7 +1,7 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.1
+Version: 1.9.3
 Release: 1%{?dist}
 
 License: GPL
@@ -20,8 +20,8 @@
 #Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
-Obsoletes: kile-i18n < %{version}
-#Provides: kile-i18n = %{version}
+Obsoletes: kile-i18n < %{version}=%{release}
+#Provides: kile-i18n = %{version}-%{release}
 
 %description
 Kile is a user friendly (La)TeX editor.  The main features are:
@@ -47,7 +47,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -62,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --add-category="X-Fedora" --vendor="" \
@@ -72,29 +71,18 @@
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML (1.1)
+# HTML (1.0)
 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
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    ## NEW: automated abs symlink -> rel symlink conversion -- Rex
-    ## not sure if this is worth the extra effort, but here it is...
+    # replace absolute symlinks with relative ones
     pushd $lang_dir
-    ROOT=$(echo $(pwd) | sed -e "s|$RPM_BUILD_ROOT||")
-    LINKS=$(find . -type l )
-    for LINK in $LINKS ; do
-    DST=$(echo $LINK | sed -e "s|./||" )
-    PRE=$(echo $DST | tr -c -d '/' | sed -e 's|/|../|g')
-    # skip if $SRC not inside $ROOT
-    test -z "$PRE" && continue
-    POST=$(readlink $LINK | sed -e "s|$ROOT||" )
-    # skip if not abs symlink
-    test -z "$(echo $POST | grep '^/')" && continue
-    SRC=$(echo $PRE$POST | sed -e 's|//|/|g')
-    rm -f $DST && ln -s $SRC $DST
-    done
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
     popd
   fi
 done
@@ -132,8 +120,20 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
+* Tue Aug 29 2006 Rex Dieter  1.9.2-4
+- revert to saner/simpler symlink handling
+
+* Mon Aug 28 2006 Rex Dieter  1.9.2-3
+- fc6 respin
+
+* Sun Aug 27 2006 Rex Dieter  1.9.2-1
+- kile-1.9.2
+
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Jun 2006 17:22:27 -0000	1.6
+++ sources	25 Nov 2006 16:25:05 -0000	1.7
@@ -1 +1 @@
-8add30e9d9667f7b31c2fc1e752d70ab  kile-1.9.1.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 16:26:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 11:26:32 -0500
Subject: rpms/kile/FC-3 .cvsignore, 1.5, 1.6 kile.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200611251626.kAPGQWZ0021575@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21522

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  1.9.3-1
- kile-1.9.3, CVE-2006-6085 (#217238)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jun 2006 23:26:39 -0000	1.5
+++ .cvsignore	25 Nov 2006 16:26:02 -0000	1.6
@@ -1 +1,2 @@
-kile-1.9.1.tar.bz2
+kile-1.9.2.tar.bz2
+kile-1.9.3.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kile.spec	25 Jun 2006 23:26:39 -0000	1.17
+++ kile.spec	25 Nov 2006 16:26:02 -0000	1.18
@@ -1,7 +1,7 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.9.1
+Version: 1.9.3
 Release: 1%{?dist}
 
 License: GPL
@@ -20,8 +20,8 @@
 #Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
-Obsoletes: kile-i18n < %{version}
-#Provides: kile-i18n = %{version}
+Obsoletes: kile-i18n < %{version}=%{release}
+#Provides: kile-i18n = %{version}-%{release}
 
 %description
 Kile is a user friendly (La)TeX editor.  The main features are:
@@ -47,7 +47,6 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -62,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
   --add-category="X-Fedora" --vendor="" \
@@ -72,29 +71,18 @@
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
-# HTML (1.1)
+# HTML (1.0)
 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
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-    ## NEW: automated abs symlink -> rel symlink conversion -- Rex
-    ## not sure if this is worth the extra effort, but here it is...
+    # replace absolute symlinks with relative ones
     pushd $lang_dir
-    ROOT=$(echo $(pwd) | sed -e "s|$RPM_BUILD_ROOT||")
-    LINKS=$(find . -type l )
-    for LINK in $LINKS ; do
-    DST=$(echo $LINK | sed -e "s|./||" )
-    PRE=$(echo $DST | tr -c -d '/' | sed -e 's|/|../|g')
-    # skip if $SRC not inside $ROOT
-    test -z "$PRE" && continue
-    POST=$(readlink $LINK | sed -e "s|$ROOT||" )
-    # skip if not abs symlink
-    test -z "$(echo $POST | grep '^/')" && continue
-    SRC=$(echo $PRE$POST | sed -e 's|//|/|g')
-    rm -f $DST && ln -s $SRC $DST
-    done
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
     popd
   fi
 done
@@ -132,8 +120,20 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  1.9.3-1
+- kile-1.9.3, CVE-2006-6085 (#217238)
+
+* Tue Aug 29 2006 Rex Dieter  1.9.2-4
+- revert to saner/simpler symlink handling
+
+* Mon Aug 28 2006 Rex Dieter  1.9.2-3
+- fc6 respin
+
+* Sun Aug 27 2006 Rex Dieter  1.9.2-1
+- kile-1.9.2
+
 * Sat Jun 24 2006 Rex Dieter  1.9.1-1
-- 1.9.1
+- kile-1.9.1
 
 * Mon May 08 2006 Rex Dieter  1.9-2
 - safer abs->rel symlink conversion 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Jun 2006 23:26:39 -0000	1.6
+++ sources	25 Nov 2006 16:26:02 -0000	1.7
@@ -1 +1 @@
-8add30e9d9667f7b31c2fc1e752d70ab  kile-1.9.1.tar.bz2
+0404b4be7bced7123111c49918130a1f  kile-1.9.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Nov 25 16:31:00 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 25 Nov 2006 11:31:00 -0500
Subject: rpms/smart/FC-4 distro.py, 1.1, 1.2 smart.desktop, 1.1,
	1.2 smart.spec, 1.10, 1.11
Message-ID: <200611251631.kAPGV0G6021703@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/FC-4

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:30 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:30 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smart.spec	16 Sep 2006 09:45:00 -0000	1.10
+++ smart.spec	25 Nov 2006 16:30:30 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 38%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel >= 2.3
 BuildRequires: desktop-file-utils
+
 BuildRequires: autoconf, automake, gettext, gcc-c++
 BuildRequires: xorg-x11-devel
 BuildRequires: qt-devel >= 1:3.2, kdelibs-devel
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,21 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm  - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skytt?? 
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
+* Sat Sep 30 2006 Axel Thimm  - 0.42-39
+- Fix the autofs5 patch.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.42-38
 - Un%%ghost pyo files.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 16:31:00 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 25 Nov 2006 11:31:00 -0500
Subject: rpms/smart/FC-5 distro.py, 1.1, 1.2 smart.desktop, 1.1,
	1.2 smart.spec, 1.9, 1.10
Message-ID: <200611251631.kAPGV06j021708@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/FC-5

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:30 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:30 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smart.spec	16 Sep 2006 09:45:01 -0000	1.9
+++ smart.spec	25 Nov 2006 16:30:30 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 38%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 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
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,21 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm  - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skytt?? 
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
+* Sat Sep 30 2006 Axel Thimm  - 0.42-39
+- Fix the autofs5 patch.
+
 * Sat Sep 16 2006 Axel Thimm  - 0.42-38
 - Un%%ghost pyo files.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 16:31:05 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 25 Nov 2006 11:31:05 -0500
Subject: rpms/smart/FC-6 distro.py, 1.1, 1.2 smart.desktop, 1.1,
	1.2 smart.spec, 1.10, 1.11
Message-ID: <200611251631.kAPGV59C021713@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/FC-6

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-6/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:35 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-6/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:35 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-6/smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smart.spec	30 Sep 2006 09:29:31 -0000	1.10
+++ smart.spec	25 Nov 2006 16:30:35 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 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
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,18 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm  - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skytt?? 
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
 * Sat Sep 30 2006 Axel Thimm  - 0.42-39
 - Fix the autofs5 patch.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 16:31:05 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Sat, 25 Nov 2006 11:31:05 -0500
Subject: rpms/smart/devel distro.py, 1.1, 1.2 smart.desktop, 1.1,
	1.2 smart.spec, 1.10, 1.11
Message-ID: <200611251631.kAPGV5ZL021718@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21639/devel

Modified Files:
	distro.py smart.desktop smart.spec 
Log Message:
Several fixes, see #205034.


Index: distro.py
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/distro.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distro.py	10 Apr 2006 17:22:47 -0000	1.1
+++ distro.py	25 Nov 2006 16:30:35 -0000	1.2
@@ -5,7 +5,7 @@
                      "type": "rpm-sys",
                      "name": "RPM Database"})
 
-    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
+    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-PAE", "-xen", "-xen0", "-xenU", "-kdump"):
         pkgconf.setFlag("multi-version", "kernel%s" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
         pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)


Index: smart.desktop
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.desktop	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.desktop	25 Nov 2006 16:30:35 -0000	1.2
@@ -4,10 +4,9 @@
 Name[pt_BR]=Gerenciador de Pacotes Smart
 Comment=Next generation package handling tool
 Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
-Icon=smart.png
+Icon=smart
 Exec=smart-root --gui
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Application;System;
-X-Desktop-File-Install-Version=0.2
+Categories=System;PackageManager;GTK;


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smart.spec	30 Sep 2006 09:29:31 -0000	1.10
+++ smart.spec	25 Nov 2006 16:30:35 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.42
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -17,6 +17,7 @@
 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
@@ -24,6 +25,7 @@
 
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
+
 Requires: smart-config
 
 %description
@@ -44,6 +46,7 @@
 Requires: smart = %{version}-%{release}
 Requires: pygtk2 >= 2.4
 Requires: usermode
+Provides: smart-gtk = %{version}-%{release}
 
 %description gui
 Graphical user interface for the smart package manager.
@@ -72,7 +75,7 @@
 # ksmarttray
 pushd contrib/ksmarttray
 make -f admin/Makefile.common
-%configure
+%configure --disable-rpath
 make
 popd
 
@@ -88,11 +91,11 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}
 
 # ksmarttray
-make -C contrib/ksmarttray install DESTDIR=%{buildroot}
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE5}
+make -C contrib/ksmarttray install DESTDIR=%{buildroot} \
+  iconsdir=%{_datadir}/icons/hicolor/48x48/apps
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE5}
 
 # usermode support
 ln -sf consolehelper %{buildroot}%{_bindir}/smart-root
@@ -106,14 +109,13 @@
 install -p -m 4755 contrib/smart-update/smart-update %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir %{buildroot}%{_datadir}/applications              \
-        --add-category X-Fedora                                 \
-        %{SOURCE3}
+desktop-file-install --vendor=""             \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
 
-mkdir -p  %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 smart/interfaces/images/smart.png \
-    %{buildroot}%{_datadir}/pixmaps/smart.png
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 # distro.py and distro.d support
 install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
@@ -157,8 +159,8 @@
 %files gui
 %defattr(-,root,root,-)
 %{python_sitearch}/smart/interfaces/gtk
-%{_datadir}/applications/*-smart.desktop
-%{_datadir}/pixmaps/smart.png
+%{_datadir}/applications/smart.desktop
+%{_datadir}/icons/hicolor/48x48/apps/smart.png
 
 %{_bindir}/smart-root
 %config %{_sysconfdir}/security/console.apps/smart-root
@@ -168,9 +170,18 @@
 %defattr(-,root,root,-)
 %{_bindir}/ksmarttray
 %{_datadir}/apps/ksmarttray
-%{_datadir}/applications/*-ksmarttray.desktop
+%{_datadir}/applications/ksmarttray.desktop
+%{_datadir}/icons/hicolor/48x48/apps/ksmarttray.png
 
 %changelog
+* Sat Nov 25 2006 Axel Thimm  - 0.42-40
+- Start preparing virtual provides for upcoming qt gui.
+
+* Sat Nov 25 2006 Ville Skytt?? 
+- Flag -xen and -PAE kernels as multi-version.
+- Update desktop entry categories and icon installation paths.
+- Avoid lib64 RPATHs in ksmarttray, fix menu icon.
+
 * Sat Sep 30 2006 Axel Thimm  - 0.42-39
 - Fix the autofs5 patch.
 



From fedora-extras-commits at redhat.com  Sat Nov 25 16:32:23 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 11:32:23 -0500
Subject: owners owners.list,1.2007,1.2008
Message-ID: <200611251632.kAPGWN0P021744@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21727

Modified Files:
	owners.list 
Log Message:
Added xerces-c


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2007
retrieving revision 1.2008
diff -u -r1.2007 -r1.2008
--- owners.list	25 Nov 2006 13:01:47 -0000	1.2007
+++ owners.list	25 Nov 2006 16:31:53 -0000	1.2008
@@ -2465,6 +2465,7 @@
 Fedora Extras|xemacs-packages-base|Base lisp packages for XEmacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-packages-extra|Collection of XEmacs lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xerces-c|Validating XML Parser|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xeuphoric|An oric emulator capable of emulating the full family|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xfcalendar|Time-managing application for Xfce4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce-mcs-manager|Multi channel settings manager|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 17:01:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 12:01:18 -0500
Subject: rpms/kile/FC-3 kile.spec,1.18,1.19
Message-ID: <200611251701.kAPH1IdE024975@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21964

Modified Files:
	kile.spec 
Log Message:
+QTLIB workaround for older qt



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kile.spec	25 Nov 2006 16:26:02 -0000	1.18
+++ kile.spec	25 Nov 2006 17:00:47 -0000	1.19
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.3
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -47,6 +47,7 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \



From fedora-extras-commits at redhat.com  Sat Nov 25 17:09:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:09:49 -0500
Subject: rpms/xsp import.log,1.20,1.21
Message-ID: <200611251709.kAPH9nJR025116@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25082

Modified Files:
	import.log 
Log Message:
auto-import xsp-1.2.1-1 on branch devel from xsp-1.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xsp/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import.log	14 Oct 2006 21:43:48 -0000	1.20
+++ import.log	25 Nov 2006 17:09:19 -0000	1.21
@@ -17,3 +17,4 @@
 xsp-1_1_17-1:HEAD:xsp-1.1.17-1.src.rpm:1157061679
 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



From fedora-extras-commits at redhat.com  Sat Nov 25 17:09:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:09:49 -0500
Subject: rpms/xsp/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xsp.spec, 1.12,
	1.13
Message-ID: <200611251709.kAPH9nff025121@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/xsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25082/devel

Modified Files:
	.cvsignore sources xsp.spec 
Log Message:
auto-import xsp-1.2.1-1 on branch devel from xsp-1.2.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/.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	25 Nov 2006 17:09:19 -0000	1.8
@@ -1 +1 @@
-xsp-1.1.18.tar.gz
+xsp-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/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	25 Nov 2006 17:09:19 -0000	1.8
@@ -1 +1 @@
-6c39f7cbdc2f7c59f25bedaf5495721a  xsp-1.1.18.tar.gz
+37333caaf4c4570ec76cf0ef9218b402  xsp-1.2.1.tar.gz


Index: xsp.spec
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/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	25 Nov 2006 17:09:19 -0000	1.13
@@ -1,5 +1,5 @@
 Name:     	xsp
-Version: 	1.1.18
+Version: 	1.2.1
 Release:	1%{?dist}
 License:	BSD
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/xsp*
 
 %changelog
+* 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  Sat Nov 25 17:13:52 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sat, 25 Nov 2006 12:13:52 -0500
Subject: rpms/xerces-c/devel xerces-c.spec,1.1,1.2
Message-ID: <200611251713.kAPHDqJR025200@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/xerces-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25183

Modified Files:
	xerces-c.spec 
Log Message:
Typo fix


Index: xerces-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xerces-c/devel/xerces-c.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces-c.spec	25 Nov 2006 16:21:29 -0000	1.1
+++ xerces-c.spec	25 Nov 2006 17:13:22 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Validating XML Parser
 Name: 		xerces-c
 Version: 	2.7.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	Apache Software License
 Group:		System Environment/Libraries
 URL: 		http://xml.apache.org/xerces-c/
@@ -52,7 +52,7 @@
 rm -rf doc/html/resources/.svn
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 find ./samples -type f -perm 755 -exec chmod 644 {} \;
-%{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.inw
+%{__perl} -pi.orig -e 's|(PREFIX.)/lib\b|$1/%{_lib}|g' src/xercesc/configure */Makefile.in
 
 %build
 export XERCESCROOT="$PWD"
@@ -116,6 +116,9 @@
 
 %changelog
 
+* Sat Nov 25 2006 Peter Lemenkov  2.7.0-6
+- typo fix
+
 * Sat Nov 25 2006 Peter Lemenkov  2.7.0-5
 - fixed some rpmlint warnings
 



From fedora-extras-commits at redhat.com  Sat Nov 25 17:19:25 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 12:19:25 -0500
Subject: owners owners.list,1.2008,1.2009
Message-ID: <200611251719.kAPHJPf6025270@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25251

Modified Files:
	owners.list 
Log Message:
Adding Django



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2008
retrieving revision 1.2009
diff -u -r1.2008 -r1.2009
--- owners.list	25 Nov 2006 16:31:53 -0000	1.2008
+++ owners.list	25 Nov 2006 17:18:55 -0000	1.2009
@@ -316,6 +316,7 @@
 Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dirmngr|Client for Managing/Downloading CRLs|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|dirvish|Fast, disk based, rotating network backup system|robert at marcanoonline.com|extras-qa at fedoraproject.org|
+Fedora Extras|Django|A high-level Python Web framework|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|dkms|Dynamic Kernel Module Support (DKMS) method for installing module RPMS|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|tcallawa at redhat.com,gary_lerhaupt at dell.com
 Fedora Extras|dnsmasq|A lightweight DHCP/caching DNS server|jima at beer.tclug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 17:22:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:22:16 -0500
Subject: rpms/monodoc import.log,1.25,1.26
Message-ID: <200611251722.kAPHMGMA025320@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25290

Modified Files:
	import.log 
Log Message:
auto-import monodoc-1.2.1-1 on branch devel from monodoc-1.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/monodoc/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- import.log	14 Oct 2006 21:32:39 -0000	1.25
+++ import.log	25 Nov 2006 17:21:45 -0000	1.26
@@ -22,3 +22,4 @@
 monodoc-1_1_17-3:FC-5:monodoc-1.1.17-3.src.rpm:1157584285
 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



From fedora-extras-commits at redhat.com  Sat Nov 25 17:22:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:22:16 -0500
Subject: rpms/monodoc/devel .cvsignore, 1.5, 1.6 monodoc.spec, 1.18,
	1.19 sources, 1.5, 1.6
Message-ID: <200611251722.kAPHMG6R025325@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/monodoc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25290/devel

Modified Files:
	.cvsignore monodoc.spec sources 
Log Message:
auto-import monodoc-1.2.1-1 on branch devel from monodoc-1.2.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Oct 2006 21:32:40 -0000	1.5
+++ .cvsignore	25 Nov 2006 17:21:46 -0000	1.6
@@ -1 +1 @@
-monodoc-1.1.18.zip
+monodoc-1.2.1.zip


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- monodoc.spec	14 Oct 2006 22:16:45 -0000	1.18
+++ monodoc.spec	25 Nov 2006 17:21:46 -0000	1.19
@@ -8,8 +8,8 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.1.18
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
@@ -61,12 +61,18 @@
 %{monodir}/%{name}/
 %{_bindir}/md*
 %{_bindir}/mo*
+%{_mandir}/man1/md*
+%{_mandir}/man1/monodoc*
 
 %files devel
 %defattr (-, root, root)
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Sat Nov 25 2006 Paul F. Johnson  1.2.1-1
+- bump
+- added new manuals
+
 * Sat Oct 14 2006 Paul F. Johnson  1.1.18-2
 - fc5 fix for pkgconfig
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Oct 2006 21:32:40 -0000	1.5
+++ sources	25 Nov 2006 17:21:46 -0000	1.6
@@ -1 +1 @@
-71981a3ed2c1eadd9ec0493c4b9f1bf1  monodoc-1.1.18.zip
+19437a8652ee009364abb04b767b65ba  monodoc-1.2.1.zip



From fedora-extras-commits at redhat.com  Sat Nov 25 17:24:43 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:24:43 -0500
Subject: rpms/mod_mono import.log,1.5,1.6
Message-ID: <200611251724.kAPHOhVh025421@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25391

Modified Files:
	import.log 
Log Message:
auto-import mod_mono-1.2.1-1 on branch devel 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	14 Oct 2006 21:36:07 -0000	1.5
+++ import.log	25 Nov 2006 17:24:13 -0000	1.6
@@ -2,3 +2,4 @@
 mod_mono-1_1_17-3:FC-5:mod_mono-1.1.17-3.src.rpm:1157924766
 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



From fedora-extras-commits at redhat.com  Sat Nov 25 17:24:43 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat, 25 Nov 2006 12:24:43 -0500
Subject: rpms/mod_mono/devel .cvsignore, 1.3, 1.4 mod_mono.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200611251724.kAPHOhT3025426@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/mod_mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25391/devel

Modified Files:
	.cvsignore mod_mono.spec sources 
Log Message:
auto-import mod_mono-1.2.1-1 on branch devel from mod_mono-1.2.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_mono/devel/.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	25 Nov 2006 17:24:13 -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/devel/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	25 Nov 2006 17:24:13 -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/devel/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	25 Nov 2006 17:24:13 -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  Sat Nov 25 18:13:11 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sat, 25 Nov 2006 13:13:11 -0500
Subject: rpms/mlton/FC-6 mlton-20051202-pdf-docs.patch, NONE,
	1.1 mlton-20061107-debuginfo.patch, NONE,
	1.1 mlton-20061107-optflags.patch, NONE, 1.1 mlton.spec, 1.4,
	1.5 mlton-debuginfo.patch, 1.2, NONE mlton-pdf-docs.patch, 1.1, NONE
Message-ID: <200611251813.kAPIDB7b028713@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28689

Modified Files:
	mlton.spec 
Added Files:
	mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch 
	mlton-20061107-optflags.patch 
Removed Files:
	mlton-debuginfo.patch mlton-pdf-docs.patch 
Log Message:
fixes

mlton-20051202-pdf-docs.patch:

--- NEW FILE mlton-20051202-pdf-docs.patch ---
diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
--- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
+++ mlton-20051202/Makefile	2006-06-19 23:26:55.000000000 -0400
@@ -431,8 +431,8 @@
 		; do 							\
 		$(CP) $(SRC)/regression/$$f.sml $(TEXM)/; 		\
 	done
-	$(GZIP) -c $(LEX)/$(LEX).ps >$(TDOC)/$(LEX).ps.gz
-	$(GZIP) -c $(YACC)/$(YACC).ps >$(TDOC)/$(YACC).ps.gz
+	$(CP) $(LEX)/$(LEX).pdf $(TDOC)
+	$(CP) $(YACC)/$(YACC).pdf $(TDOC)
 	find $(TDOC)/ -name .svn -type d | xargs rm -rf
 	find $(TDOC)/ -name .ignore -type f | xargs rm -rf
 	find $(TEXM)/ -name .svn -type d | xargs rm -rf
diff -ur mlton-20051202~/mllex/Makefile mlton-20051202/mllex/Makefile
--- mlton-20051202~/mllex/Makefile	2005-10-11 16:47:54.000000000 -0400
+++ mlton-20051202/mllex/Makefile	2006-06-19 22:39:39.000000000 -0400
@@ -47,7 +47,7 @@
 	../bin/clean
 
 .PHONY: docs
-docs: mllex.ps
+docs: mllex.pdf
 
 .PHONY: test
 test: $(NAME)
diff -ur mlton-20051202~/mlyacc/doc/Makefile mlton-20051202/mlyacc/doc/Makefile
--- mlton-20051202~/mlyacc/doc/Makefile	2005-11-06 15:04:36.000000000 -0500
+++ mlton-20051202/mlyacc/doc/Makefile	2006-06-19 22:47:41.000000000 -0400
@@ -6,7 +6,7 @@
  # See the file MLton-LICENSE for details.
  ##
 
-all: mlyacc.ps
+all: mlyacc.pdf
 
 html/index.html: $(TEX_FILES)
 	mkdir -p html
diff -ur mlton-20051202~/mlyacc/Makefile mlton-20051202/mlyacc/Makefile
--- mlton-20051202~/mlyacc/Makefile	2005-10-11 16:48:34.000000000 -0400
+++ mlton-20051202/mlyacc/Makefile	2006-06-19 22:48:23.000000000 -0400
@@ -38,15 +38,21 @@
 doc/mlyacc.ps:
 	$(MAKE) -C doc mlyacc.ps
 
+doc/mlyacc.pdf:
+	$(MAKE) -C doc mlyacc.pdf
+
 mlyacc.ps: doc/mlyacc.ps
 	cp doc/mlyacc.ps .
 
+mlyacc.pdf: doc/mlyacc.pdf
+	cp doc/mlyacc.pdf .
+
 .PHONY: clean
 clean:
 	../bin/clean
 
 .PHONY: docs
-docs: mlyacc.ps
+docs: mlyacc.pdf
 
 .PHONY: test
 test: $(NAME)

mlton-20061107-debuginfo.patch:

--- NEW FILE mlton-20061107-debuginfo.patch ---
--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
+++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
@@ -411,18 +411,7 @@
 	if $(GZIP_MAN); then						\
 		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
 	fi
-	case "$(TARGET_OS)" in						\
-	aix|cygwin|darwin|solaris)					\
-	;;								\
-	*)								\
-		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
-			$(TBIN)/$(NLFFIGEN)$(EXE) $(TBIN)/$(PROF)$(EXE)	\
-			$(TBIN)/$(YACC)$(EXE); do			\
-			strip --remove-section=.comment			\
-				--remove-section=.note $$f; 		\
-		done							\
-	esac
 
 .PHONY: install-docs
 install-docs:

mlton-20061107-optflags.patch:

--- NEW FILE mlton-20061107-optflags.patch ---
diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/bytecode/Makefile	2006-11-18 12:27:39.000000000 -0500
@@ -10,8 +10,9 @@
 all: interpret.o interpret-gdb.o print-opcodes
 
 CC = gcc -std=gnu99
-CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
-DEBUGFLAGS = $(CFLAGS)
+OPTFLAGS = -fomit-frame-pointer
+DEBUGFLAGS = -fomit-frame-pointer
+CFLAGS = -I../runtime -I../include -Wall
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)
 DEBUGFLAGS += -gstabs+
@@ -20,21 +21,23 @@
 DEBUGFLAGS += -g2
 
 ifeq ($(TARGET_ARCH), amd64)
-CFLAGS += -mtune=opteron -m32 
-endif 
+OPTFLAGS += -mtune=opteron
+CFLAGS += -m32
+endif
 
 ifeq ($(TARGET_OS), freebsd)
 CFLAGS += -I/usr/local/include
 endif
 
 interpret.o: interpret.c interpret.h opcode.h
-	$(CC) $(CFLAGS) -c -O2 interpret.c
+	$(CC) $(CFLAGS) -c -O2 $(OPTFLAGS) interpret.c
 
 interpret-gdb.o: interpret.c interpret.h
-	$(CC) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
+	$(CC) $(CFLAGS) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
 
 print-opcodes: print-opcodes.c opcode.h
-	$(CC) $(CFLAGS) -o print-opcodes -I../runtime -L../runtime	\
+	$(CC) $(CFLAGS) $(OPTFLAGS) -o print-opcodes \
+		-I../runtime -L../runtime	\
 		print-opcodes.c -lmlton
 
 .PHONY: clean
diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/runtime/Makefile	2006-11-18 12:29:40.000000000 -0500
@@ -13,22 +13,25 @@
 TARGET_OS = $(shell ../bin/host-os)
 GCC_VERSION = $(shell gcc -v 2>&1 | grep 'gcc version' | sed 's/.*gcc version \(.\).*/\1/')
 
-FLAGS = -fomit-frame-pointer
+OPTFLAGS = -fomit-frame-pointer
+FLAGS =
 
 ifeq ($(TARGET_ARCH), x86)
 ifneq ($(findstring $(GCC_VERSION), 3 4),)
-FLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
+OPTFLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
 else
-FLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
+OPTFLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
 endif
 endif
 
 ifeq ($(TARGET_ARCH), amd64)
-FLAGS += -mtune=opteron -m32
+OPTFLAGS += -mtune=opteron
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_ARCH), sparc)
-FLAGS += -mcpu=v8 -m32
+OPTFLAGS += -mcpu=v8
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_OS), freebsd)
@@ -36,7 +39,7 @@
 endif
 
 ifeq ($(TARGET_OS), solaris)
-FLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
+OPTFLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
 endif
 
 ifeq ($(TARGET), self)
@@ -49,7 +52,7 @@
 endif
 
 CC = gcc -std=gnu99
-CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
+CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS) $(OPTFLAGS)
 DEBUGFLAGS = $(CFLAGS)
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-6/mlton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mlton.spec	16 Nov 2006 06:26:14 -0000	1.4
+++ mlton.spec	25 Nov 2006 18:12:41 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		mlton
 Version:	20061107
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -15,8 +15,9 @@
 Source2:	mlton-bootstrap.ppc.tar.bz2
 %endif
 
-Patch0:		mlton-pdf-docs.patch
-Patch1:		mlton-debuginfo.patch
+Patch0:		mlton-20051202-pdf-docs.patch
+Patch1:		mlton-20061107-debuginfo.patch
+Patch2:		mlton-20061107-optflags.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +46,14 @@
 %setup -q
 
 # instantiate version numbers
-make version
+make version VERSION=%{version}
 
 # build documentation as PDF
-%patch -P 0 -p1
-# enable -g and disable strip so debuginfo packages work
-%patch -P 1 -p1
+%patch -P 0 -p1 -b .pdf-docs
+# disable strip so debuginfo packages work
+%patch -P 1 -p1 -b .debuginfo
+# enable RPM_OPT_FLAGS
+%patch -P 2 -p1 -b .optflags
 
 # set correct version of PDF guide until this is fixed upstream
 sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
@@ -73,7 +76,7 @@
 export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
 %endif
 
-make
+make OPTFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -102,7 +105,13 @@
 %{_libdir}/mlton
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Nov 24 2006 Adam Goode  - 20061107-2
+- Use RPM_OPT_FLAGS
+- Correctly instantiate version
+- Adjust patches
+
 * Sun Nov 12 2006 Adam Goode  - 20061107-1
 - New release, taken from svn://mlton.org/mlton/tags/on-20061107
 


--- mlton-debuginfo.patch DELETED ---


--- mlton-pdf-docs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 19:12:33 2006
From: fedora-extras-commits at redhat.com (Adam Goode (agoode))
Date: Sat, 25 Nov 2006 14:12:33 -0500
Subject: rpms/mlton/FC-5 mlton-20051202-pdf-docs.patch, NONE,
	1.1 mlton-20061107-debuginfo.patch, NONE,
	1.1 mlton-20061107-optflags.patch, NONE, 1.1 mlton.spec, 1.3,
	1.4 mlton-debuginfo.patch, 1.2, NONE mlton-pdf-docs.patch, 1.1, NONE
Message-ID: <200611251912.kAPJCXsx032016@cvs-int.fedora.redhat.com>

Author: agoode

Update of /cvs/extras/rpms/mlton/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31992

Modified Files:
	mlton.spec 
Added Files:
	mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch 
	mlton-20061107-optflags.patch 
Removed Files:
	mlton-debuginfo.patch mlton-pdf-docs.patch 
Log Message:
fixes

mlton-20051202-pdf-docs.patch:

--- NEW FILE mlton-20051202-pdf-docs.patch ---
diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
--- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
+++ mlton-20051202/Makefile	2006-06-19 23:26:55.000000000 -0400
@@ -431,8 +431,8 @@
 		; do 							\
 		$(CP) $(SRC)/regression/$$f.sml $(TEXM)/; 		\
 	done
-	$(GZIP) -c $(LEX)/$(LEX).ps >$(TDOC)/$(LEX).ps.gz
-	$(GZIP) -c $(YACC)/$(YACC).ps >$(TDOC)/$(YACC).ps.gz
+	$(CP) $(LEX)/$(LEX).pdf $(TDOC)
+	$(CP) $(YACC)/$(YACC).pdf $(TDOC)
 	find $(TDOC)/ -name .svn -type d | xargs rm -rf
 	find $(TDOC)/ -name .ignore -type f | xargs rm -rf
 	find $(TEXM)/ -name .svn -type d | xargs rm -rf
diff -ur mlton-20051202~/mllex/Makefile mlton-20051202/mllex/Makefile
--- mlton-20051202~/mllex/Makefile	2005-10-11 16:47:54.000000000 -0400
+++ mlton-20051202/mllex/Makefile	2006-06-19 22:39:39.000000000 -0400
@@ -47,7 +47,7 @@
 	../bin/clean
 
 .PHONY: docs
-docs: mllex.ps
+docs: mllex.pdf
 
 .PHONY: test
 test: $(NAME)
diff -ur mlton-20051202~/mlyacc/doc/Makefile mlton-20051202/mlyacc/doc/Makefile
--- mlton-20051202~/mlyacc/doc/Makefile	2005-11-06 15:04:36.000000000 -0500
+++ mlton-20051202/mlyacc/doc/Makefile	2006-06-19 22:47:41.000000000 -0400
@@ -6,7 +6,7 @@
  # See the file MLton-LICENSE for details.
  ##
 
-all: mlyacc.ps
+all: mlyacc.pdf
 
 html/index.html: $(TEX_FILES)
 	mkdir -p html
diff -ur mlton-20051202~/mlyacc/Makefile mlton-20051202/mlyacc/Makefile
--- mlton-20051202~/mlyacc/Makefile	2005-10-11 16:48:34.000000000 -0400
+++ mlton-20051202/mlyacc/Makefile	2006-06-19 22:48:23.000000000 -0400
@@ -38,15 +38,21 @@
 doc/mlyacc.ps:
 	$(MAKE) -C doc mlyacc.ps
 
+doc/mlyacc.pdf:
+	$(MAKE) -C doc mlyacc.pdf
+
 mlyacc.ps: doc/mlyacc.ps
 	cp doc/mlyacc.ps .
 
+mlyacc.pdf: doc/mlyacc.pdf
+	cp doc/mlyacc.pdf .
+
 .PHONY: clean
 clean:
 	../bin/clean
 
 .PHONY: docs
-docs: mlyacc.ps
+docs: mlyacc.pdf
 
 .PHONY: test
 test: $(NAME)

mlton-20061107-debuginfo.patch:

--- NEW FILE mlton-20061107-debuginfo.patch ---
--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
+++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
@@ -411,18 +411,7 @@
 	if $(GZIP_MAN); then						\
 		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
 	fi
-	case "$(TARGET_OS)" in						\
-	aix|cygwin|darwin|solaris)					\
-	;;								\
-	*)								\
-		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
-			$(TBIN)/$(NLFFIGEN)$(EXE) $(TBIN)/$(PROF)$(EXE)	\
-			$(TBIN)/$(YACC)$(EXE); do			\
-			strip --remove-section=.comment			\
-				--remove-section=.note $$f; 		\
-		done							\
-	esac
 
 .PHONY: install-docs
 install-docs:

mlton-20061107-optflags.patch:

--- NEW FILE mlton-20061107-optflags.patch ---
diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/bytecode/Makefile	2006-11-18 12:27:39.000000000 -0500
@@ -10,8 +10,9 @@
 all: interpret.o interpret-gdb.o print-opcodes
 
 CC = gcc -std=gnu99
-CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
-DEBUGFLAGS = $(CFLAGS)
+OPTFLAGS = -fomit-frame-pointer
+DEBUGFLAGS = -fomit-frame-pointer
+CFLAGS = -I../runtime -I../include -Wall
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)
 DEBUGFLAGS += -gstabs+
@@ -20,21 +21,23 @@
 DEBUGFLAGS += -g2
 
 ifeq ($(TARGET_ARCH), amd64)
-CFLAGS += -mtune=opteron -m32 
-endif 
+OPTFLAGS += -mtune=opteron
+CFLAGS += -m32
+endif
 
 ifeq ($(TARGET_OS), freebsd)
 CFLAGS += -I/usr/local/include
 endif
 
 interpret.o: interpret.c interpret.h opcode.h
-	$(CC) $(CFLAGS) -c -O2 interpret.c
+	$(CC) $(CFLAGS) -c -O2 $(OPTFLAGS) interpret.c
 
 interpret-gdb.o: interpret.c interpret.h
-	$(CC) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
+	$(CC) $(CFLAGS) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
 
 print-opcodes: print-opcodes.c opcode.h
-	$(CC) $(CFLAGS) -o print-opcodes -I../runtime -L../runtime	\
+	$(CC) $(CFLAGS) $(OPTFLAGS) -o print-opcodes \
+		-I../runtime -L../runtime	\
 		print-opcodes.c -lmlton
 
 .PHONY: clean
diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
+++ mlton-20061107/runtime/Makefile	2006-11-18 12:29:40.000000000 -0500
@@ -13,22 +13,25 @@
 TARGET_OS = $(shell ../bin/host-os)
 GCC_VERSION = $(shell gcc -v 2>&1 | grep 'gcc version' | sed 's/.*gcc version \(.\).*/\1/')
 
-FLAGS = -fomit-frame-pointer
+OPTFLAGS = -fomit-frame-pointer
+FLAGS =
 
 ifeq ($(TARGET_ARCH), x86)
 ifneq ($(findstring $(GCC_VERSION), 3 4),)
-FLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
+OPTFLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
 else
-FLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
+OPTFLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
 endif
 endif
 
 ifeq ($(TARGET_ARCH), amd64)
-FLAGS += -mtune=opteron -m32
+OPTFLAGS += -mtune=opteron
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_ARCH), sparc)
-FLAGS += -mcpu=v8 -m32
+OPTFLAGS += -mcpu=v8
+FLAGS += -m32
 endif
 
 ifeq ($(TARGET_OS), freebsd)
@@ -36,7 +39,7 @@
 endif
 
 ifeq ($(TARGET_OS), solaris)
-FLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
+OPTFLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
 endif
 
 ifeq ($(TARGET), self)
@@ -49,7 +52,7 @@
 endif
 
 CC = gcc -std=gnu99
-CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
+CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS) $(OPTFLAGS)
 DEBUGFLAGS = $(CFLAGS)
 ifneq ($(TARGET_ARCH), ia64)
 ifneq ($(TARGET_ARCH), powerpc)


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/FC-5/mlton.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mlton.spec	17 Nov 2006 00:27:22 -0000	1.3
+++ mlton.spec	25 Nov 2006 19:12:03 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		mlton
 Version:	20061107
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -15,8 +15,9 @@
 Source2:	mlton-bootstrap.ppc.tar.bz2
 %endif
 
-Patch0:		mlton-pdf-docs.patch
-Patch1:		mlton-debuginfo.patch
+Patch0:		mlton-20051202-pdf-docs.patch
+Patch1:		mlton-20061107-debuginfo.patch
+Patch2:		mlton-20061107-optflags.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +46,14 @@
 %setup -q
 
 # instantiate version numbers
-make version
+make version VERSION=%{version}
 
 # build documentation as PDF
-%patch -P 0 -p1
-# enable -g and disable strip so debuginfo packages work
-%patch -P 1 -p1
+%patch -P 0 -p1 -b .pdf-docs
+# disable strip so debuginfo packages work
+%patch -P 1 -p1 -b .debuginfo
+# enable RPM_OPT_FLAGS
+%patch -P 2 -p1 -b .optflags
 
 # set correct version of PDF guide until this is fixed upstream
 sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
@@ -73,7 +76,7 @@
 export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
 %endif
 
-make
+make OPTFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -102,7 +105,13 @@
 %{_libdir}/mlton
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Nov 24 2006 Adam Goode  - 20061107-2
+- Use RPM_OPT_FLAGS
+- Correctly instantiate version
+- Adjust patches
+
 * Sun Nov 12 2006 Adam Goode  - 20061107-1
 - New release, taken from svn://mlton.org/mlton/tags/on-20061107
 


--- mlton-debuginfo.patch DELETED ---


--- mlton-pdf-docs.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 19:41:11 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:41:11 -0500
Subject: rpms/python-alsaaudio - New directory
Message-ID: <200611251941.kAPJfBXk032303@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/python-alsaaudio

Log Message:
Directory /cvs/extras/rpms/python-alsaaudio added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 19:41:17 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:41:17 -0500
Subject: rpms/python-alsaaudio/devel - New directory
Message-ID: <200611251941.kAPJfHFR032319@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/python-alsaaudio/devel

Log Message:
Directory /cvs/extras/rpms/python-alsaaudio/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 19:41:28 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:41:28 -0500
Subject: rpms/python-alsaaudio Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611251941.kAPJfSKl032349@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32343

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-alsaaudio


--- NEW FILE Makefile ---
# Top level Makefile for module python-alsaaudio
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  Sat Nov 25 19:41:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:41:34 -0500
Subject: rpms/python-alsaaudio/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611251941.kAPJfYlj032367@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32343/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-alsaaudio


--- 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  Sat Nov 25 19:42:25 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:42:25 -0500
Subject: rpms/python-alsaaudio import.log,1.1,1.2
Message-ID: <200611251942.kAPJgPxj032445@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32409

Modified Files:
	import.log 
Log Message:
auto-import python-alsaaudio-0.2-1 on branch devel from python-alsaaudio-0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-alsaaudio/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 19:41:28 -0000	1.1
+++ import.log	25 Nov 2006 19:41:55 -0000	1.2
@@ -0,0 +1 @@
+python-alsaaudio-0_2-1:HEAD:python-alsaaudio-0.2-1.src.rpm:1164483788



From fedora-extras-commits at redhat.com  Sat Nov 25 19:42:25 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:42:25 -0500
Subject: rpms/python-alsaaudio/devel python-alsaaudio.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611251942.kAPJgPa4032449@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-alsaaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32409/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-alsaaudio.spec 
Log Message:
auto-import python-alsaaudio-0.2-1 on branch devel from python-alsaaudio-0.2-1.src.rpm


--- NEW FILE python-alsaaudio.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:		python-alsaaudio
Version:	0.2
Release:	1%{?dist}
Summary:	Python Alsa Bindings

Group:		Development/Languages
License:	PSF - see LICENSE
URL:		http://sourceforge.net/projects/pyalsaaudio
Source0:	http://download.sourceforge.net/pyalsaaudio/pyalsaaudio-%{version}.tgz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python-devel
BuildRequires:	alsa-lib-devel


%description
The Python-AlsaAudio package contains bindings for the ALSA sound API.


%prep
%setup -q -n pyalsaaudio-%{version}


%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

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE 
%{python_sitearch}/*


%changelog
* Thu Nov  2 2006 Brian Pepple  - 0.2-1
- Initial FE spec.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-alsaaudio/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 19:41:34 -0000	1.1
+++ .cvsignore	25 Nov 2006 19:41:55 -0000	1.2
@@ -0,0 +1 @@
+pyalsaaudio-0.2.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-alsaaudio/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 19:41:34 -0000	1.1
+++ sources	25 Nov 2006 19:41:55 -0000	1.2
@@ -0,0 +1 @@
+23163f572f8f3a0b295f48f90165e767  pyalsaaudio-0.2.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 19:45:29 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 25 Nov 2006 14:45:29 -0500
Subject: owners owners.list,1.2009,1.2010
Message-ID: <200611251945.kAPJjTrd032529@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32514

Modified Files:
	owners.list 
Log Message:
add python-alsaaudio


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2009
retrieving revision 1.2010
diff -u -r1.2009 -r1.2010
--- owners.list	25 Nov 2006 17:18:55 -0000	1.2009
+++ owners.list	25 Nov 2006 19:44:59 -0000	1.2010
@@ -1935,6 +1935,7 @@
 Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|rvokal at redhat.com|extras-qa at fedoraproject.org|byte at fedoraproject.org
+Fedora Extras|python-alsaaudio|Python Alsa Bindings|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|jamatos at fc.up.pt|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|python-basemap|Plots data on map projections (with continental and political boundaries)|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-basemap-data|Data for python-basemap|orion at cora.nwra.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 20:35:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 25 Nov 2006 15:35:11 -0500
Subject: rpms/kile/FC-3 kile.spec,1.19,1.20
Message-ID: <200611252035.kAPKZBL3003298@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3278

Modified Files:
	kile.spec 
Log Message:
respin for previous seemingly borked build



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kile.spec	25 Nov 2006 17:00:47 -0000	1.19
+++ kile.spec	25 Nov 2006 20:34:41 -0000	1.20
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.3
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 
 License: GPL
 Group: 	 Applications/Publishing



From fedora-extras-commits at redhat.com  Sat Nov 25 20:51:43 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 15:51:43 -0500
Subject: rpms/quarry/devel .cvsignore, 1.4, 1.5 quarry.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200611252051.kAPKphEp003429@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3409

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
Update -devel to 0.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Nov 2006 02:36:37 -0000	1.4
+++ .cvsignore	25 Nov 2006 20:51:13 -0000	1.5
@@ -1 +1 @@
-quarry-0.1.20.tar.gz
+quarry-0.2.0.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quarry.spec	1 Nov 2006 02:36:37 -0000	1.5
+++ quarry.spec	25 Nov 2006 20:51:13 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           quarry
-Version:        0.1.20
+Version:        0.2.0
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
@@ -38,7 +38,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
@@ -64,12 +63,14 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime/packages/quarry.xml
 %{_datadir}/pixmaps/quarry.png
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Nov 19 2006 Michel Salim  - 0.2.0-1
+- Update to 0.2.0, first stable version
+
 * Tue Oct 31 2006 Michel Salim  - 0.1.20-1
 - Update to 0.1.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Nov 2006 02:36:37 -0000	1.4
+++ sources	25 Nov 2006 20:51:13 -0000	1.5
@@ -1 +1 @@
-c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz
+388b47fbf8fcfcca6e1ad6dd821bfcee  quarry-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 20:58:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:58:13 -0500
Subject: rpms/arrows - New directory
Message-ID: <200611252058.kAPKwDIe003520@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3515/arrows

Log Message:
Directory /cvs/extras/rpms/arrows added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 20:58:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:58:18 -0500
Subject: rpms/arrows/devel - New directory
Message-ID: <200611252058.kAPKwIcD003535@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3515/arrows/devel

Log Message:
Directory /cvs/extras/rpms/arrows/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 20:58:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:58:35 -0500
Subject: rpms/arrows Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252058.kAPKwZ9O003566@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3560

Added Files:
	Makefile import.log 
Log Message:
Setup of module arrows


--- NEW FILE Makefile ---
# Top level Makefile for module arrows
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  Sat Nov 25 20:58:40 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:58:40 -0500
Subject: rpms/arrows/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611252058.kAPKweKM003582@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3560/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module arrows


--- 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  Sat Nov 25 20:59:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:59:50 -0500
Subject: rpms/arrows import.log,1.1,1.2
Message-ID: <200611252059.kAPKxogq003678@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3637

Modified Files:
	import.log 
Log Message:
auto-import arrows-0.6-2.fc7 on branch devel from arrows-0.6-2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/arrows/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 20:58:35 -0000	1.1
+++ import.log	25 Nov 2006 20:59:20 -0000	1.2
@@ -0,0 +1 @@
+arrows-0_6-2_fc7:HEAD:arrows-0.6-2.fc7.src.rpm:1164489205



From fedora-extras-commits at redhat.com  Sat Nov 25 20:59:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 15:59:51 -0500
Subject: rpms/arrows/devel arrows.desktop, NONE, 1.1 arrows.png, NONE,
	1.1 arrows.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252059.kAPKxpQu003683@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/arrows/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3637/devel

Modified Files:
	.cvsignore sources 
Added Files:
	arrows.desktop arrows.png arrows.spec 
Log Message:
auto-import arrows-0.6-2.fc7 on branch devel from arrows-0.6-2.fc7.src.rpm


--- NEW FILE arrows.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Arrows
Comment=Follow the arrows to reach the exit
Exec=arrows
Icon=arrows.png
Terminal=false
Type=Application
Categories=Game;LogicGame;


--- NEW FILE arrows.spec ---
Name:           arrows
Version:        0.6
Release:        2%{?dist}
Summary:        Neat little maze game
Group:          Amusements/Games
License:        GPL
URL:            http://noreason.ca/?file=software
Source0:        http://noreason.ca/data/arrows-%{version}.tar.gz
Source1:        arrows.desktop
Source2:        arrows.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  gtk2-devel desktop-file-utils
Requires:       hicolor-icon-theme

%description
It's a maze game of sorts. Guide the spinning blue thing through
the maze of arrows, creating and destroying arrows as necessary
to collect the green things.


%prep
%setup -q
make clean


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}

# 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/24x24/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/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 LICENSE README
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/24x24/apps/%{name}.png


%changelog
* Sat Nov 25 2006 Hans de Goede  0.6-2
- Add Requires hicolor-icon-theme, drop GNOME from desktop catagories
  (bz 217239)

* Sat Nov 25 2006 Hans de Goede  0.6-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/arrows/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 20:58:40 -0000	1.1
+++ .cvsignore	25 Nov 2006 20:59:20 -0000	1.2
@@ -0,0 +1 @@
+arrows-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/arrows/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 20:58:40 -0000	1.1
+++ sources	25 Nov 2006 20:59:20 -0000	1.2
@@ -0,0 +1 @@
+d6cf52ff319c295b9fb6982c023ec7f0  arrows-0.6.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:02:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 16:02:01 -0500
Subject: owners owners.list,1.2010,1.2011
Message-ID: <200611252102.kAPL21Qd006780@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6763

Modified Files:
	owners.list 
Log Message:
added arrows


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2010
retrieving revision 1.2011
diff -u -r1.2010 -r1.2011
--- owners.list	25 Nov 2006 19:44:59 -0000	1.2010
+++ owners.list	25 Nov 2006 21:01:31 -0000	1.2011
@@ -70,6 +70,7 @@
 Fedora Extras|ardour|Multichannel Digital Audio Workstation|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|arj|Archiver for .arj files|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|arrows|Neat little maze game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|tcallawa at redhat.com|extras-qa at fedoraproject.org|andreas.bierfert at lowlatency.de
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 21:07:43 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 25 Nov 2006 16:07:43 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.18,1.19
Message-ID: <200611252107.kAPL7h1e006822@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6807

Modified Files:
	Push.py 
Log Message:
skip bad rpms and improve status output in such an error condition


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Push.py	24 Nov 2006 22:22:46 -0000	1.18
+++ Push.py	25 Nov 2006 21:07:43 -0000	1.19
@@ -234,7 +234,11 @@
 def naevr(pkg):
     """return nevra from the package srpm"""
 
-    hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg)
+    try:
+        hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg)
+    except rpmUtils.RpmUtilsError:
+        print 'WARNING: %s is BAD' % pkg
+        raise
     name = hdr['name']
     ver = hdr['version']
     rel = hdr['release']
@@ -506,8 +510,11 @@
                     targetroot = destroot
                 try:
                     push(dist,needsignroot,targetroot,name,pkgrelroot,buildreport)
+                # TODO: report these via mail (or so)
                 except PushWarning, e:
                     print e
+                except rpmUtils.RpmUtilsError, e:
+                    print e
     except:
         shutil.rmtree(signtmpdir)
         raise



From fedora-extras-commits at redhat.com  Sat Nov 25 21:12:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 25 Nov 2006 16:12:32 -0500
Subject: comps comps-fe7.xml.in,1.29,1.30
Message-ID: <200611252112.kAPLCWiA006893@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6868

Modified Files:
	comps-fe7.xml.in 
Log Message:
add arrows


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- comps-fe7.xml.in	23 Nov 2006 19:09:47 -0000	1.29
+++ comps-fe7.xml.in	25 Nov 2006 21:12:02 -0000	1.30
@@ -356,6 +356,7 @@
       abe
       abuse
       alex4
+      arrows
       atomix
       auriferous
       ballbuster



From fedora-extras-commits at redhat.com  Sat Nov 25 21:14:36 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:14:36 -0500
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-4 .cvsignore, 1.3,
	1.4 perl-Log-Dispatch-FileRotate.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252114.kAPLEa32006991@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/FC-4

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 23:32:45 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:14:06 -0000	1.4
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.15.tar.gz
+Log-Dispatch-FileRotate-1.16.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:32:45 -0000	1.2
+++ perl-Log-Dispatch-FileRotate.spec	25 Nov 2006 21:14:06 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.16-1
+- Update to 1.16.
+
 * Wed Apr 26 2006 Jose Pedro Oliveira  - 1.15-1
 - Update to 1.15.
 - The author corrected the licensing terms (License: GPL or Artistic).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 23:32:45 -0000	1.3
+++ sources	25 Nov 2006 21:14:06 -0000	1.4
@@ -1 +1 @@
-96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz
+3cd1d75510a6297df487ca016763bdbe  Log-Dispatch-FileRotate-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:14:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:14:37 -0500
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-5 .cvsignore, 1.3,
	1.4 perl-Log-Dispatch-FileRotate.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252114.kAPLEbM0006996@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/FC-5

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 23:33:10 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:14:07 -0000	1.4
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.15.tar.gz
+Log-Dispatch-FileRotate-1.16.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:10 -0000	1.2
+++ perl-Log-Dispatch-FileRotate.spec	25 Nov 2006 21:14:07 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.16-1
+- Update to 1.16.
+
 * Wed Apr 26 2006 Jose Pedro Oliveira  - 1.15-1
 - Update to 1.15.
 - The author corrected the licensing terms (License: GPL or Artistic).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 23:33:10 -0000	1.3
+++ sources	25 Nov 2006 21:14:07 -0000	1.4
@@ -1 +1 @@
-96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz
+3cd1d75510a6297df487ca016763bdbe  Log-Dispatch-FileRotate-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:14:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:14:42 -0500
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-6 .cvsignore, 1.3,
	1.4 perl-Log-Dispatch-FileRotate.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252114.kAPLEgY9007001@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/FC-6

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 23:33:11 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:14:12 -0000	1.4
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.15.tar.gz
+Log-Dispatch-FileRotate-1.16.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-6/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:11 -0000	1.2
+++ perl-Log-Dispatch-FileRotate.spec	25 Nov 2006 21:14:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.16-1
+- Update to 1.16.
+
 * Wed Apr 26 2006 Jose Pedro Oliveira  - 1.15-1
 - Update to 1.15.
 - The author corrected the licensing terms (License: GPL or Artistic).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 23:33:11 -0000	1.3
+++ sources	25 Nov 2006 21:14:12 -0000	1.4
@@ -1 +1 @@
-96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz
+3cd1d75510a6297df487ca016763bdbe  Log-Dispatch-FileRotate-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:14:42 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:14:42 -0500
Subject: rpms/perl-Log-Dispatch-FileRotate/devel .cvsignore, 1.3,
	1.4 perl-Log-Dispatch-FileRotate.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252114.kAPLEggF007006@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/devel

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
Update to 1.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Apr 2006 23:33:11 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:14:12 -0000	1.4
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.15.tar.gz
+Log-Dispatch-FileRotate-1.16.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:11 -0000	1.2
+++ perl-Log-Dispatch-FileRotate.spec	25 Nov 2006 21:14:12 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.15
+Version:        1.16
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.16-1
+- Update to 1.16.
+
 * Wed Apr 26 2006 Jose Pedro Oliveira  - 1.15-1
 - Update to 1.15.
 - The author corrected the licensing terms (License: GPL or Artistic).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Apr 2006 23:33:11 -0000	1.3
+++ sources	25 Nov 2006 21:14:12 -0000	1.4
@@ -1 +1 @@
-96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz
+3cd1d75510a6297df487ca016763bdbe  Log-Dispatch-FileRotate-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:24:30 -0500
Subject: rpms/perl-Log-Log4perl/FC-4 .cvsignore, 1.5,
	1.6 perl-Log-Log4perl.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200611252124.kAPLOUgo007316@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7219/FC-4

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jul 2006 15:53:56 -0000	1.5
+++ .cvsignore	25 Nov 2006 21:24:00 -0000	1.6
@@ -1 +1 @@
-Log-Log4perl-1.06.tar.gz
+Log-Log4perl-1.08.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/perl-Log-Log4perl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Log-Log4perl.spec	21 Jul 2006 15:53:56 -0000	1.6
+++ perl-Log-Log4perl.spec	25 Nov 2006 21:24:00 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.06
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -33,9 +33,9 @@
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
 %patch1 -p1
-find lib -name "*.pm" -exec chmod a-x {} ';'
+find lib -name "*.pm" -exec chmod -c a-x {} ';'
 %{__perl} -pi -e 's|^#!/usr/local/bin/perl|#!%{__perl}|' eg/newsyslog-test
-chmod a-x eg/* 
+chmod -c a-x eg/* 
 
 
 %build
@@ -67,6 +67,12 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
+* Sat Oct 21 2006 Jose Pedro Oliveira  - 1.07-1
+- Update to 1.07.
+
 * Fri Jul 21 2006 Jose Pedro Oliveira  - 1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Jul 2006 15:53:56 -0000	1.5
+++ sources	25 Nov 2006 21:24:00 -0000	1.6
@@ -1 +1 @@
-a7bda690ec0ad0bed457fa525e28034a  Log-Log4perl-1.06.tar.gz
+54fa5628deac4130f34208e4cb18328b  Log-Log4perl-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 16:24:34 -0500
Subject: rpms/quarry/FC-5 .cvsignore, 1.4, 1.5 quarry.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200611252124.kAPLOYbX007326@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7210/FC-5

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
0.2.0 update for FC-5 and -6 as well



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Nov 2006 02:36:31 -0000	1.4
+++ .cvsignore	25 Nov 2006 21:24:03 -0000	1.5
@@ -1 +1 @@
-quarry-0.1.20.tar.gz
+quarry-0.2.0.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/quarry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quarry.spec	1 Nov 2006 02:36:31 -0000	1.5
+++ quarry.spec	25 Nov 2006 21:24:03 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           quarry
-Version:        0.1.20
+Version:        0.2.0
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
@@ -38,7 +38,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
@@ -64,12 +63,14 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime/packages/quarry.xml
 %{_datadir}/pixmaps/quarry.png
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Nov 19 2006 Michel Salim  - 0.2.0-1
+- Update to 0.2.0, first stable version
+
 * Tue Oct 31 2006 Michel Salim  - 0.1.20-1
 - Update to 0.1.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Nov 2006 02:36:31 -0000	1.4
+++ sources	25 Nov 2006 21:24:03 -0000	1.5
@@ -1 +1 @@
-c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz
+388b47fbf8fcfcca6e1ad6dd821bfcee  quarry-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:24:35 -0500
Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.6,
	1.7 perl-Log-Log4perl.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200611252124.kAPLOZ0x007339@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-serv7219/devel

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
+++ .cvsignore	25 Nov 2006 21:24:05 -0000	1.7
@@ -1 +1 @@
-Log-Log4perl-1.07.tar.gz
+Log-Log4perl-1.08.tar.gz


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
+++ perl-Log-Log4perl.spec	25 Nov 2006 21:24:05 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 1.07-1
 - Update to 1.07.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2006 14:30:38 -0000	1.6
+++ sources	25 Nov 2006 21:24:05 -0000	1.7
@@ -1 +1 @@
-dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz
+54fa5628deac4130f34208e4cb18328b  Log-Log4perl-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:34 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 16:24:34 -0500
Subject: rpms/quarry/FC-6 .cvsignore, 1.4, 1.5 quarry.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200611252124.kAPLOYUN007331@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/quarry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7210/FC-6

Modified Files:
	.cvsignore quarry.spec sources 
Log Message:
0.2.0 update for FC-5 and -6 as well



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Nov 2006 02:36:31 -0000	1.4
+++ .cvsignore	25 Nov 2006 21:24:04 -0000	1.5
@@ -1 +1 @@
-quarry-0.1.20.tar.gz
+quarry-0.2.0.tar.gz


Index: quarry.spec
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/quarry.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quarry.spec	1 Nov 2006 02:36:31 -0000	1.5
+++ quarry.spec	25 Nov 2006 21:24:04 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           quarry
-Version:        0.1.20
+Version:        0.2.0
 Release:        1%{?dist}
 Summary:        A multi-purpose board game GUI
 
@@ -38,7 +38,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category X-Fedora \
@@ -64,12 +63,14 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime/packages/quarry.xml
 %{_datadir}/pixmaps/quarry.png
-#%{_datadir}/locale/*/LC_MESSAGES/quarry.mo
 %{_datadir}/omf/quarry/
 %{_datadir}/quarry/
 
 
 %changelog
+* Sun Nov 19 2006 Michel Salim  - 0.2.0-1
+- Update to 0.2.0, first stable version
+
 * Tue Oct 31 2006 Michel Salim  - 0.1.20-1
 - Update to 0.1.20
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quarry/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Nov 2006 02:36:31 -0000	1.4
+++ sources	25 Nov 2006 21:24:04 -0000	1.5
@@ -1 +1 @@
-c731ca556e356635b3140d3efe2ded80  quarry-0.1.20.tar.gz
+388b47fbf8fcfcca6e1ad6dd821bfcee  quarry-0.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:24:30 -0500
Subject: rpms/perl-Log-Log4perl/FC-5 .cvsignore, 1.6,
	1.7 perl-Log-Log4perl.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200611252124.kAPLOUnX007321@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-serv7219/FC-5

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
+++ .cvsignore	25 Nov 2006 21:24:00 -0000	1.7
@@ -1 +1 @@
-Log-Log4perl-1.07.tar.gz
+Log-Log4perl-1.08.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
+++ perl-Log-Log4perl.spec	25 Nov 2006 21:24:00 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 1.07-1
 - Update to 1.07.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2006 14:30:38 -0000	1.6
+++ sources	25 Nov 2006 21:24:00 -0000	1.7
@@ -1 +1 @@
-dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz
+54fa5628deac4130f34208e4cb18328b  Log-Log4perl-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:24:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:24:35 -0500
Subject: rpms/perl-Log-Log4perl/FC-6 .cvsignore, 1.6,
	1.7 perl-Log-Log4perl.spec, 1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200611252124.kAPLOZo6007334@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-serv7219/FC-6

Modified Files:
	.cvsignore perl-Log-Log4perl.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Oct 2006 14:30:38 -0000	1.6
+++ .cvsignore	25 Nov 2006 21:24:05 -0000	1.7
@@ -1 +1 @@
-Log-Log4perl-1.07.tar.gz
+Log-Log4perl-1.08.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Log-Log4perl.spec	21 Oct 2006 14:30:38 -0000	1.8
+++ perl-Log-Log4perl.spec	25 Nov 2006 21:24:05 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Log-Log4perl
-Version:        1.07
+Version:        1.08
 Release:        1%{?dist}
 Summary:        Log4j implementation for Perl
 
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.08-1
+- Update to 1.08.
+
 * Sat Oct 21 2006 Jose Pedro Oliveira  - 1.07-1
 - Update to 1.07.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Oct 2006 14:30:38 -0000	1.6
+++ sources	25 Nov 2006 21:24:05 -0000	1.7
@@ -1 +1 @@
-dbc2ff6fa33871b6f58dc2e8c09b01d0  Log-Log4perl-1.07.tar.gz
+54fa5628deac4130f34208e4cb18328b  Log-Log4perl-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:37:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:37:37 -0500
Subject: rpms/perl-Email-Address/FC-5 .cvsignore, 1.8,
	1.9 perl-Email-Address.spec, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <200611252137.kAPLbbCV007698@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7644/FC-5

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.883.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Nov 2006 14:01:17 -0000	1.8
+++ .cvsignore	25 Nov 2006 21:37:07 -0000	1.9
@@ -1 +1 @@
-Email-Address-1.882.tar.gz
+Email-Address-1.883.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/perl-Email-Address.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Email-Address.spec	22 Nov 2006 14:01:17 -0000	1.7
+++ perl-Email-Address.spec	25 Nov 2006 21:37:07 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.882
+Version:        1.883
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.883-1
+- Update to 1.883.
+
 * Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
 - Update to 1.882.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Nov 2006 14:01:17 -0000	1.8
+++ sources	25 Nov 2006 21:37:07 -0000	1.9
@@ -1 +1 @@
-1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz
+7de141ff7c159851e60776e2dcc43e99  Email-Address-1.883.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:37:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:37:43 -0500
Subject: rpms/perl-Email-Address/devel .cvsignore, 1.8,
	1.9 perl-Email-Address.spec, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <200611252137.kAPLbhMV007708@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7644/devel

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.883.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Nov 2006 14:01:22 -0000	1.8
+++ .cvsignore	25 Nov 2006 21:37:13 -0000	1.9
@@ -1 +1 @@
-Email-Address-1.882.tar.gz
+Email-Address-1.883.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/perl-Email-Address.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Email-Address.spec	22 Nov 2006 14:01:22 -0000	1.7
+++ perl-Email-Address.spec	25 Nov 2006 21:37:13 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.882
+Version:        1.883
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.883-1
+- Update to 1.883.
+
 * Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
 - Update to 1.882.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Nov 2006 14:01:22 -0000	1.8
+++ sources	25 Nov 2006 21:37:13 -0000	1.9
@@ -1 +1 @@
-1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz
+7de141ff7c159851e60776e2dcc43e99  Email-Address-1.883.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:37:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:37:37 -0500
Subject: rpms/perl-Email-Address/FC-6 .cvsignore, 1.8,
	1.9 perl-Email-Address.spec, 1.7, 1.8 sources, 1.8, 1.9
Message-ID: <200611252137.kAPLbbhP007703@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7644/FC-6

Modified Files:
	.cvsignore perl-Email-Address.spec sources 
Log Message:
Update to 1.883.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Nov 2006 14:01:17 -0000	1.8
+++ .cvsignore	25 Nov 2006 21:37:07 -0000	1.9
@@ -1 +1 @@
-Email-Address-1.882.tar.gz
+Email-Address-1.883.tar.gz


Index: perl-Email-Address.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/perl-Email-Address.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Email-Address.spec	22 Nov 2006 14:01:17 -0000	1.7
+++ perl-Email-Address.spec	25 Nov 2006 21:37:07 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Email-Address
-Version:        1.882
+Version:        1.883
 Release:        1%{?dist}
 Summary:        RFC 2822 Address Parsing and Creation
 
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.883-1
+- Update to 1.883.
+
 * Wed Nov 22 2006 Jose Pedro Oliveira  - 1.882-1
 - Update to 1.882.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Nov 2006 14:01:17 -0000	1.8
+++ sources	25 Nov 2006 21:37:07 -0000	1.9
@@ -1 +1 @@
-1a3beb03cff79fc2795ae5abe7cb1dd7  Email-Address-1.882.tar.gz
+7de141ff7c159851e60776e2dcc43e99  Email-Address-1.883.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:42:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:42:45 -0500
Subject: rpms/eterm - New directory
Message-ID: <200611252142.kAPLgjvn007896@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7892/eterm

Log Message:
Directory /cvs/extras/rpms/eterm added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 21:42:50 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:42:50 -0500
Subject: rpms/eterm/devel - New directory
Message-ID: <200611252142.kAPLgo73007909@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7892/eterm/devel

Log Message:
Directory /cvs/extras/rpms/eterm/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 21:43:08 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:43:08 -0500
Subject: rpms/eterm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252143.kAPLh83p007939@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7933

Added Files:
	Makefile import.log 
Log Message:
Setup of module eterm


--- NEW FILE Makefile ---
# Top level Makefile for module eterm
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  Sat Nov 25 21:43:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:43:13 -0500
Subject: rpms/eterm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611252143.kAPLhDhU007955@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7933/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module eterm


--- 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  Sat Nov 25 21:44:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:44:36 -0500
Subject: rpms/eterm import.log,1.1,1.2
Message-ID: <200611252144.kAPLia0N008049@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013

Modified Files:
	import.log 
Log Message:
auto-import eterm-0.9.4-2.fc6 on branch devel from eterm-0.9.4-2.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/eterm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 21:43:08 -0000	1.1
+++ import.log	25 Nov 2006 21:44:06 -0000	1.2
@@ -0,0 +1 @@
+eterm-0_9_4-2_fc6:HEAD:eterm-0.9.4-2.fc6.src.rpm:1164491117



From fedora-extras-commits at redhat.com  Sat Nov 25 21:44:36 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:44:36 -0500
Subject: rpms/eterm/devel Eterm-0.9.4-no-rpath.patch, NONE, 1.1 eterm.png,
	NONE, 
	1.1 eterm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252144.kAPLia1m008053@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Eterm-0.9.4-no-rpath.patch eterm.png eterm.spec 
Log Message:
auto-import eterm-0.9.4-2.fc6 on branch devel from eterm-0.9.4-2.fc6.src.rpm

Eterm-0.9.4-no-rpath.patch:

--- NEW FILE Eterm-0.9.4-no-rpath.patch ---
diff -uNr Eterm-0.9.4.orig/src/Makefile.am Eterm-0.9.4/src/Makefile.am
--- Eterm-0.9.4.orig/src/Makefile.am	2006-08-22 20:23:11.000000000 +0200
+++ Eterm-0.9.4/src/Makefile.am	2006-09-02 18:27:49.000000000 +0200
@@ -36,7 +36,6 @@
 
 Eterm_SOURCES = main.c
 Eterm_DEPENDENCIES = libEterm.la
-Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 Eterm_LDADD = libEterm.la 
 
 EXTRA_DIST = gdb.scr mmx_cmod.S sse2_cmod.c
diff -uNr Eterm-0.9.4.orig/utils/Makefile.am Eterm-0.9.4/utils/Makefile.am
--- Eterm-0.9.4.orig/utils/Makefile.am	2005-04-26 15:42:09.000000000 +0200
+++ Eterm-0.9.4/utils/Makefile.am	2006-09-02 18:28:01.000000000 +0200
@@ -4,7 +4,6 @@
 bin_SCRIPTS = Etcolors Etsearch kEsetroot Etbg_update_list
 
 Esetroot_SOURCES = Esetroot.c
-Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 Etbg_SOURCES = Etbg.c
 Ettable_SOURCES = Ettable.c


--- NEW FILE eterm.spec ---
Summary: Enlightened terminal emulator
Name: eterm
Version: 0.9.4
Release: 2%{?dist}
License: BSD
Group: User Interface/Desktops
Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
Source1: http://www.eterm.org/download/Eterm-bg-0.9.4.tar.gz
Source2: %{name}.png
Patch: Eterm-0.9.4-no-rpath.patch
URL: http://www.eterm.org/
Requires: imlib2
BuildRequires: imlib2-devel libast-devel libXmu-devel 
BuildRequires: pcre-devel desktop-file-utils
BuildRequires: autoconf automake libtool
Provides: Eterm = %{version}-%{release}
Obsoletes: Eterm <= 0.9.2
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Eterm is a color vt102 terminal emulator with enhanced graphical
capabilities.  Eterm is intended to be a replacement for xterm for
Enlightenment window manager users, but it can also be used as a
replacement for xterm by users without Enlightenment.  Eterm supports
various themes and is very configurable, in keeping with the
philosophy of Enlightenment.

%prep
%setup -a 1 -q -n Eterm-%{version}
%patch -p1

%build
# Touching Makefile.am
./autogen.sh
%configure --enable-multi-charset \
           --enable-escreen       \
           --enable-auto-encoding \
           --enable-trans         \
           --disable-etwin        \
           --disable-mmx

%{__make}

%install
rm -rf %{buildroot}

%makeinstall

echo -e "[Desktop Entry]
Encoding=UTF-8
Name=Eterm	
Comment=Eterm
TryExec=Eterm
Exec=Eterm
Icon=eterm.png
Type=Application
Categories=Application;Utility;TerminalEmulator;" > %{name}.desktop

install -d %{buildroot}%{_datadir}/applications
install -m 0644 %{name}.desktop %{buildroot}%{_datadir}/applications

desktop-file-install --vendor fedora --delete-original           \
  --dir %{buildroot}%{_datadir}/applications  \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

install -d %{buildroot}%{_datadir}/pixmaps
install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root, 0755)
%doc doc/Eterm_reference.html doc/Eterm.1.html doc/Eterm.tcap 
%doc doc/Eterm.ti doc/README.Escreen LICENSE
%doc README ReleaseNotes ReleaseNotes.1 ChangeLog
%dir %{_datadir}/Eterm
%{_bindir}/Esetroot
%{_bindir}/Etbg
%{_bindir}/Etbg_update_list
%{_bindir}/Etcolors
%{_bindir}/Eterm
%{_bindir}/Etsearch
%{_bindir}/Ettable
%{_bindir}/kEsetroot
%{_libdir}/libEterm-%{version}.so
%exclude %{_libdir}/libEterm.a
%exclude %{_libdir}/libEterm.la
%exclude %{_libdir}/libEterm.so
%{_mandir}/man1/Eterm.1*
%{_datadir}/Eterm/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png

%changelog
* Fri Nov 24 2006 Terje R??sten  - 0.9.4-2
- Add libXmu-devel and pcre-devel to BuildReq
- Simplify desktop file handling
- Add --disable-etwin to configure

* Sat Sep  2 2006 Terje R??sten  - 0.9.4-1
- 0.9.4
- LICENSE now included in upstream package
- Add rpath patch
- Touching Makefile.am, add auto* tools buildreq.

* Sun Feb 19 2006 Terje R??sten  - 0.9.3-2
- Add LICENSE
- UTF-8 specfile
- Fix buildroot var
- Not explicit depend on libast

* Sun Feb 19 2006 Terje R??sten  - 0.9.3-1
- 0.9.3

* Wed Nov 13 2002 Che
- initial rpm release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 21:43:13 -0000	1.1
+++ .cvsignore	25 Nov 2006 21:44:06 -0000	1.2
@@ -0,0 +1,2 @@
+Eterm-0.9.4.tar.gz
+Eterm-bg-0.9.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 21:43:13 -0000	1.1
+++ sources	25 Nov 2006 21:44:06 -0000	1.2
@@ -0,0 +1,2 @@
+b8869ee9c9b9516231af9eefa595cee3  Eterm-0.9.4.tar.gz
+e8c6567b13d7fb760bded56c1d1a181d  Eterm-bg-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:45:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:45:18 -0500
Subject: rpms/perl-Email-MIME-ContentType/FC-5 .cvsignore, 1.3,
	1.4 perl-Email-MIME-ContentType.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252145.kAPLjIhu008137@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088/FC-5

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.012.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 19:52:32 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:44:48 -0000	1.4
@@ -1 +1 @@
-Email-MIME-ContentType-1.011.tar.gz
+Email-MIME-ContentType-1.012.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:32 -0000	1.2
+++ perl-Email-MIME-ContentType.spec	25 Nov 2006 21:44:48 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.011
+Version:        1.012
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Email-MIME-ContentType/
-Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-ContentType-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Email-MIME-ContentType-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes LICENSE README
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.012-1
+- Update to 1.012.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.011-1
 - Update to 1.011.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 19:52:32 -0000	1.3
+++ sources	25 Nov 2006 21:44:48 -0000	1.4
@@ -1 +1 @@
-b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz
+d114672c67aff4a60ae7cc8c7ab73f24  Email-MIME-ContentType-1.012.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:45:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:45:19 -0500
Subject: rpms/perl-Email-MIME-ContentType/FC-6 .cvsignore, 1.3,
	1.4 perl-Email-MIME-ContentType.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252145.kAPLjJR6008142@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088/FC-6

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.012.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 19:52:33 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:44:48 -0000	1.4
@@ -1 +1 @@
-Email-MIME-ContentType-1.011.tar.gz
+Email-MIME-ContentType-1.012.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-6/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:33 -0000	1.2
+++ perl-Email-MIME-ContentType.spec	25 Nov 2006 21:44:48 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.011
+Version:        1.012
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Email-MIME-ContentType/
-Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-ContentType-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Email-MIME-ContentType-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes LICENSE README
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.012-1
+- Update to 1.012.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.011-1
 - Update to 1.011.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 19:52:33 -0000	1.3
+++ sources	25 Nov 2006 21:44:48 -0000	1.4
@@ -1 +1 @@
-b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz
+d114672c67aff4a60ae7cc8c7ab73f24  Email-MIME-ContentType-1.012.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:45:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 16:45:24 -0500
Subject: rpms/perl-Email-MIME-ContentType/devel .cvsignore, 1.3,
	1.4 perl-Email-MIME-ContentType.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200611252145.kAPLjOLs008147@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088/devel

Modified Files:
	.cvsignore perl-Email-MIME-ContentType.spec sources 
Log Message:
Update to 1.012.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Oct 2006 19:52:33 -0000	1.3
+++ .cvsignore	25 Nov 2006 21:44:54 -0000	1.4
@@ -1 +1 @@
-Email-MIME-ContentType-1.011.tar.gz
+Email-MIME-ContentType-1.012.tar.gz


Index: perl-Email-MIME-ContentType.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/perl-Email-MIME-ContentType.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Email-MIME-ContentType.spec	13 Oct 2006 19:52:33 -0000	1.2
+++ perl-Email-MIME-ContentType.spec	25 Nov 2006 21:44:54 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           perl-Email-MIME-ContentType
-Version:        1.011
+Version:        1.012
 Release:        1%{?dist}
 Summary:        Parse a MIME Content-Type Header
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Email-MIME-ContentType/
-Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-ContentType-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Email-MIME-ContentType-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -46,12 +46,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes LICENSE README
 %{perl_vendorlib}/Email/
 %{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 1.012-1
+- Update to 1.012.
+
 * Fri Oct 13 2006 Jose Pedro Oliveira  - 1.011-1
 - Update to 1.011.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2006 19:52:33 -0000	1.3
+++ sources	25 Nov 2006 21:44:54 -0000	1.4
@@ -1 +1 @@
-b46eb316a6164c13501076ed57cd6586  Email-MIME-ContentType-1.011.tar.gz
+d114672c67aff4a60ae7cc8c7ab73f24  Email-MIME-ContentType-1.012.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 21:49:01 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 16:49:01 -0500
Subject: owners owners.list,1.2011,1.2012
Message-ID: <200611252149.kAPLn1RK008293@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8278

Modified Files:
	owners.list 
Log Message:
New package: eterm.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2011
retrieving revision 1.2012
diff -u -r1.2011 -r1.2012
--- owners.list	25 Nov 2006 21:01:31 -0000	1.2011
+++ owners.list	25 Nov 2006 21:48:31 -0000	1.2012
@@ -383,6 +383,7 @@
 Fedora Extras|erlang-esdl|Erlang OpenGL/SDL api and utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|redhat-bugzilla at linuxnetz.de
 Fedora Extras|espeak|Software speech synthesizer (text-to-speech)|faucamp at csir.co.za|extras-qa at fedoraproject.org|
+Fedora Extras|eterm|Enlightened terminal emulator|terjeros at phys.ntnu.no|extras-qa at fedoraproject.org|
 Fedora Extras|evas|A hardware-accelerated canvas API|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|eventlog|Syslog-ng v2 support library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|evolution-bogofilter|A plugin for bogofilter support in evolution|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 22:02:03 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:02:03 -0500
Subject: rpms/libmpd - New directory
Message-ID: <200611252202.kAPM23Q3011455@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11451/libmpd

Log Message:
Directory /cvs/extras/rpms/libmpd added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 22:02:08 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:02:08 -0500
Subject: rpms/libmpd/devel - New directory
Message-ID: <200611252202.kAPM28ce011473@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11451/libmpd/devel

Log Message:
Directory /cvs/extras/rpms/libmpd/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 22:03:16 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:03:16 -0500
Subject: rpms/libmpd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252203.kAPM3GvU011529@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11523

Added Files:
	Makefile import.log 
Log Message:
Setup of module libmpd


--- NEW FILE Makefile ---
# Top level Makefile for module libmpd
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  Sat Nov 25 22:03:21 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:03:21 -0500
Subject: rpms/libmpd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611252203.kAPM3LRU011544@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11523/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libmpd


--- 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  Sat Nov 25 22:03:24 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 17:03:24 -0500
Subject: rpms/grhino/devel .cvsignore, 1.7, 1.8 grhino.spec, 1.9,
	1.10 sources, 1.7, 1.8 grhino-configure-gettext.patch, 1.1,
	NONE grhino-icon.patch, 1.1, NONE grhino-omf.patch, 1.1,
	NONE grhino-scrollkeeper.patch, 1.1, NONE grhino.desktop, 1.3, NONE
Message-ID: <200611252203.kAPM3ODj011556@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11501

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-configure-gettext.patch grhino-icon.patch 
	grhino-omf.patch grhino-scrollkeeper.patch grhino.desktop 
Log Message:
Update -devel to 0.16.0. All patches are upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Nov 2006 21:28:51 -0000	1.7
+++ .cvsignore	25 Nov 2006 22:02:54 -0000	1.8
@@ -1,2 +1 @@
-grhino.png
-grhino-0.15.2.tar.gz
+grhino-0.16.0.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grhino.spec	10 Nov 2006 21:28:51 -0000	1.9
+++ grhino.spec	25 Nov 2006 22:02:54 -0000	1.10
@@ -1,27 +1,21 @@
 Name:           grhino
-Version:        0.15.2
-Release:        4.1%{?dist}
+Version:        0.16.0
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:        %{name}.desktop
-Source2:        %{name}.png
-Patch0:         grhino-scrollkeeper.patch
-Patch1:         grhino-configure-gettext.patch
-Patch2:         grhino-omf.patch
-Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:  scrollkeeper
+BuildRequires:	scrollkeeper
 #Requires:       
-Requires(post):         scrollkeeper
-Requires(postun):       scrollkeeper
+Requires(post):		scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -40,10 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -b .scrollkeeper
-%patch1 -p1 -b .gettext
-%patch2 -b .omf
-%patch3 -p1 -b .icon
 
 
 %build
@@ -54,20 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# move omf files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
-mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/grhino/*/grhino-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category X-Fedora \
-        %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	desktop/%{name}.desktop
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
 %find_lang %{name}
 
@@ -94,8 +79,9 @@
 
 
 %changelog
-* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
-- Push both source files to build server
+* Sat Nov 25 2006 Michel Salim  - 0.16.0-1
+- Update to 0.16.0
+- Remove unneeded patches
 
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Nov 2006 21:28:51 -0000	1.7
+++ sources	25 Nov 2006 22:02:54 -0000	1.8
@@ -1,2 +1 @@
-b98f0e178f6291232babfcb1c4925ea0  grhino.png
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+51d975cc1645112d12bb5fd030db1f7f  grhino-0.16.0.tar.gz


--- grhino-configure-gettext.patch DELETED ---


--- grhino-icon.patch DELETED ---


--- grhino-omf.patch DELETED ---


--- grhino-scrollkeeper.patch DELETED ---


--- grhino.desktop DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 22:06:13 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:06:13 -0500
Subject: rpms/libmpd import.log,1.1,1.2
Message-ID: <200611252206.kAPM6DXY011656@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626

Modified Files:
	import.log 
Log Message:
auto-import libmpd-0.12.0-2 on branch devel from libmpd-0.12.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmpd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 22:03:16 -0000	1.1
+++ import.log	25 Nov 2006 22:05:42 -0000	1.2
@@ -0,0 +1 @@
+libmpd-0_12_0-2:HEAD:libmpd-0.12.0-2.src.rpm:1164492358



From fedora-extras-commits at redhat.com  Sat Nov 25 22:06:13 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:06:13 -0500
Subject: rpms/libmpd/devel libmpd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611252206.kAPM6DF0011660@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11626/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libmpd.spec 
Log Message:
auto-import libmpd-0.12.0-2 on branch devel from libmpd-0.12.0-2.src.rpm


--- NEW FILE libmpd.spec ---
Summary: Music Player Daemon Library
Name: libmpd
Version: 0.12.0
Release: 2%{?dist}
License: GPL
Url: http://cms.qballcow.nl/index.php?page=libmpd
Group: Applications/Multimedia
Source: http://download.qballcow.nl/programs/gmpc-0.13/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%package devel
Summary: Header files for developing programs with libmpd
Requires: %{name} = %{version}
Group: Development/Libraries

%description
libmpd is an abstraction around libmpdclient. It provides an easy and
reliable callback based interface to mpd.

%description devel
libmpd-devel is a sub-package which contains header files and static libraries
for developing program with libmpd.

%prep
%setup -q

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} DESTDIR="$RPM_BUILD_ROOT" install
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr (-,root,root)
%doc ChangeLog COPYING README
%{_libdir}/libmpd.so.0*

%files devel
%defattr (-,root,root)
%{_libdir}/libmpd.so
%{_libdir}/pkgconfig/libmpd.pc
%{_prefix}/include/libmpd

%changelog
* Sat Nov 25 2006 Adrian Reber  - 0.12.0-2
- small changes for FE submission

* Mon Mar 27 2006 Jan "Yenya" Kasprzak  0.12.0-1
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 22:03:21 -0000	1.1
+++ .cvsignore	25 Nov 2006 22:05:43 -0000	1.2
@@ -0,0 +1 @@
+libmpd-0.12.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 22:03:21 -0000	1.1
+++ sources	25 Nov 2006 22:05:43 -0000	1.2
@@ -0,0 +1 @@
+bbfe28a5c3d7ef72b042030e3af52208  libmpd-0.12.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Nov 25 22:19:22 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sat, 25 Nov 2006 17:19:22 -0500
Subject: rpms/eterm/devel eterm.spec,1.1,1.2
Message-ID: <200611252219.kAPMJMg7011766@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11747

Modified Files:
	eterm.spec 
Log Message:
Must have automake-1.9.




Index: eterm.spec
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/eterm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eterm.spec	25 Nov 2006 21:44:06 -0000	1.1
+++ eterm.spec	25 Nov 2006 22:18:52 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Enlightened terminal emulator
 Name: eterm
 Version: 0.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: User Interface/Desktops
 Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
@@ -12,7 +12,7 @@
 Requires: imlib2
 BuildRequires: imlib2-devel libast-devel libXmu-devel 
 BuildRequires: pcre-devel desktop-file-utils
-BuildRequires: autoconf automake libtool
+BuildRequires: /usr/bin/automake-1.9 autoconf libtool
 Provides: Eterm = %{version}-%{release}
 Obsoletes: Eterm <= 0.9.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,8 @@
 
 %build
 # Touching Makefile.am
+# Need automake 1.9
+export AUTOMAKE=/usr/bin/automake-1.9
 ./autogen.sh
 %configure --enable-multi-charset \
            --enable-escreen       \
@@ -96,6 +98,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sat Nov 25 2006 Terje R??sten  - 0.9.4-3
+- Use automake-1.9
+
 * Fri Nov 24 2006 Terje R??sten  - 0.9.4-2
 - Add libXmu-devel and pcre-devel to BuildReq
 - Simplify desktop file handling



From fedora-extras-commits at redhat.com  Sat Nov 25 22:25:46 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:25:46 -0500
Subject: owners owners.list,1.2012,1.2013
Message-ID: <200611252225.kAPMPkAd011836@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11820

Modified Files:
	owners.list 
Log Message:
added libmpd



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2012
retrieving revision 1.2013
diff -u -r1.2012 -r1.2013
--- owners.list	25 Nov 2006 21:48:31 -0000	1.2012
+++ owners.list	25 Nov 2006 22:25:16 -0000	1.2013
@@ -946,6 +946,7 @@
 Fedora Extras|libmodelfile|Library for accessing various model file formats|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|libmpd|Music Player Daemon Library|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmtp|MTP client library|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libnasl|Nessus Attack Scripting Language|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 22:34:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 17:34:55 -0500
Subject: rpms/grhino/FC-6 .cvsignore, 1.7, 1.8 grhino.spec, 1.10,
	1.11 sources, 1.9, 1.10 grhino-configure-gettext.patch, 1.1,
	NONE grhino-icon.patch, 1.1, NONE grhino-omf.patch, 1.1,
	NONE grhino-scrollkeeper.patch, 1.1, NONE grhino.desktop, 1.3, NONE
Message-ID: <200611252234.kAPMYtuJ011981@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942/FC-6

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-configure-gettext.patch grhino-icon.patch 
	grhino-omf.patch grhino-scrollkeeper.patch grhino.desktop 
Log Message:
Update FC-5 and -6 to 0.16.0 too



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Nov 2006 21:28:50 -0000	1.7
+++ .cvsignore	25 Nov 2006 22:34:25 -0000	1.8
@@ -1,2 +1 @@
-grhino.png
-grhino-0.15.2.tar.gz
+grhino-0.16.0.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grhino.spec	10 Nov 2006 21:28:50 -0000	1.10
+++ grhino.spec	25 Nov 2006 22:34:25 -0000	1.11
@@ -1,27 +1,21 @@
 Name:           grhino
-Version:        0.15.2
-Release:        4.1%{?dist}
+Version:        0.16.0
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:        %{name}.desktop
-Source2:        %{name}.png
-Patch0:         grhino-scrollkeeper.patch
-Patch1:         grhino-configure-gettext.patch
-Patch2:         grhino-omf.patch
-Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:  scrollkeeper
+BuildRequires:	scrollkeeper
 #Requires:       
-Requires(post):         scrollkeeper
-Requires(postun):       scrollkeeper
+Requires(post):		scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -40,10 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -b .scrollkeeper
-%patch1 -p1 -b .gettext
-%patch2 -b .omf
-%patch3 -p1 -b .icon
 
 
 %build
@@ -54,20 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# move omf files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
-mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/grhino/*/grhino-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category X-Fedora \
-        %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	desktop/%{name}.desktop
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
 %find_lang %{name}
 
@@ -94,8 +79,9 @@
 
 
 %changelog
-* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
-- Push both source files to build server
+* Sat Nov 25 2006 Michel Salim  - 0.16.0-1
+- Update to 0.16.0
+- Remove unneeded patches
 
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Nov 2006 21:28:50 -0000	1.9
+++ sources	25 Nov 2006 22:34:25 -0000	1.10
@@ -1,2 +1 @@
-b98f0e178f6291232babfcb1c4925ea0  grhino.png
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+51d975cc1645112d12bb5fd030db1f7f  grhino-0.16.0.tar.gz


--- grhino-configure-gettext.patch DELETED ---


--- grhino-icon.patch DELETED ---


--- grhino-omf.patch DELETED ---


--- grhino-scrollkeeper.patch DELETED ---


--- grhino.desktop DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 22:34:55 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Sat, 25 Nov 2006 17:34:55 -0500
Subject: rpms/grhino/FC-5 .cvsignore, 1.7, 1.8 grhino.spec, 1.8, 1.9 sources,
	1.7, 1.8 grhino-configure-gettext.patch, 1.1,
	NONE grhino-icon.patch, 1.1, NONE grhino-omf.patch, 1.1,
	NONE grhino-scrollkeeper.patch, 1.1, NONE grhino.desktop, 1.3, NONE
Message-ID: <200611252234.kAPMYtAj011976@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942/FC-5

Modified Files:
	.cvsignore grhino.spec sources 
Removed Files:
	grhino-configure-gettext.patch grhino-icon.patch 
	grhino-omf.patch grhino-scrollkeeper.patch grhino.desktop 
Log Message:
Update FC-5 and -6 to 0.16.0 too



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Nov 2006 21:28:49 -0000	1.7
+++ .cvsignore	25 Nov 2006 22:34:25 -0000	1.8
@@ -1,2 +1 @@
-grhino.png
-grhino-0.15.2.tar.gz
+grhino-0.16.0.tar.gz


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/grhino.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grhino.spec	10 Nov 2006 21:28:49 -0000	1.8
+++ grhino.spec	25 Nov 2006 22:34:25 -0000	1.9
@@ -1,27 +1,21 @@
 Name:           grhino
-Version:        0.15.2
-Release:        4.1%{?dist}
+Version:        0.16.0
+Release:        1%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-Source1:        %{name}.desktop
-Source2:        %{name}.png
-Patch0:         grhino-scrollkeeper.patch
-Patch1:         grhino-configure-gettext.patch
-Patch2:         grhino-omf.patch
-Patch3:         grhino-icon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:  scrollkeeper
+BuildRequires:	scrollkeeper
 #Requires:       
-Requires(post):         scrollkeeper
-Requires(postun):       scrollkeeper
+Requires(post):		scrollkeeper
+Requires(postun):	scrollkeeper
 
 %description
 GRhino, or Rhino its former name, is a Reversi game on Linux and other
@@ -40,10 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -b .scrollkeeper
-%patch1 -p1 -b .gettext
-%patch2 -b .omf
-%patch3 -p1 -b .icon
 
 
 %build
@@ -54,20 +44,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-# move omf files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
-mv $RPM_BUILD_ROOT%{_datadir}/gnome/help/grhino/*/grhino-*.omf $RPM_BUILD_ROOT%{_datadir}/omf/grhino/
 
 # desktop file
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category X-Fedora \
-        %{SOURCE1}
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--add-category X-Fedora \
+	desktop/%{name}.desktop
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
 %find_lang %{name}
 
@@ -94,8 +79,9 @@
 
 
 %changelog
-* Fri Nov 10 2006 Michel Salim  - 0.15.2-4.1
-- Push both source files to build server
+* Sat Nov 25 2006 Michel Salim  - 0.16.0-1
+- Update to 0.16.0
+- Remove unneeded patches
 
 * Fri Nov 10 2006 Michel Salim  - 0.15.2-4
 - Add application icon


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Nov 2006 21:28:49 -0000	1.7
+++ sources	25 Nov 2006 22:34:25 -0000	1.8
@@ -1,2 +1 @@
-b98f0e178f6291232babfcb1c4925ea0  grhino.png
-9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz
+51d975cc1645112d12bb5fd030db1f7f  grhino-0.16.0.tar.gz


--- grhino-configure-gettext.patch DELETED ---


--- grhino-icon.patch DELETED ---


--- grhino-omf.patch DELETED ---


--- grhino-scrollkeeper.patch DELETED ---


--- grhino.desktop DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 22:36:53 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sat, 25 Nov 2006 17:36:53 -0500
Subject: rpms/libmpd/devel libmpd.spec,1.1,1.2
Message-ID: <200611252236.kAPMar5J012088@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/libmpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12073

Modified Files:
	libmpd.spec 
Log Message:
* Sat Nov 25 2006 Adrian Reber  - 0.12.0-3
- added requires pkgconfig to -devel package



Index: libmpd.spec
===================================================================
RCS file: /cvs/extras/rpms/libmpd/devel/libmpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmpd.spec	25 Nov 2006 22:05:43 -0000	1.1
+++ libmpd.spec	25 Nov 2006 22:36:23 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Music Player Daemon Library
 Name: libmpd
 Version: 0.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Url: http://cms.qballcow.nl/index.php?page=libmpd
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@
 Summary: Header files for developing programs with libmpd
 Requires: %{name} = %{version}
 Group: Development/Libraries
+Requires: pkgconfig
 
 %description
 libmpd is an abstraction around libmpdclient. It provides an easy and
@@ -52,6 +53,9 @@
 %{_prefix}/include/libmpd
 
 %changelog
+* Sat Nov 25 2006 Adrian Reber  - 0.12.0-3
+- added requires pkgconfig to -devel package
+
 * Sat Nov 25 2006 Adrian Reber  - 0.12.0-2
 - small changes for FE submission
 



From fedora-extras-commits at redhat.com  Sat Nov 25 22:51:45 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 25 Nov 2006 17:51:45 -0500
Subject: rpms/perl-Log-Dispatch/devel perl-Log-Dispatch.spec, 1.7,
	1.8 Log-Dispatch-2.11-mod_perl2.patch, 1.1, NONE
Message-ID: <200611252251.kAPMpjvo012170@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12155

Modified Files:
	perl-Log-Dispatch.spec 
Removed Files:
	Log-Dispatch-2.11-mod_perl2.patch 
Log Message:
Log-Dispatch-2.11-mod_perl2.patch no longer needed.


Index: perl-Log-Dispatch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch/devel/perl-Log-Dispatch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Log-Dispatch.spec	25 Nov 2006 14:38:47 -0000	1.7
+++ perl-Log-Dispatch.spec	25 Nov 2006 22:51:15 -0000	1.8
@@ -8,15 +8,14 @@
 
 Name:           perl-Log-Dispatch
 Version:        2.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dispatches messages to one or more outputs
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Log-Dispatch/
 Source0:        http://www.cpan.org/authors/id/D/DR/DROLSKY/Log-Dispatch-%{version}.tar.gz
-Patch0:         Log-Dispatch-2.11-mod_perl2.patch
-Patch1:         Log-Dispatch-2.11-enable-mail-tests.patch
+Patch0:         Log-Dispatch-2.11-enable-mail-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,11 +38,8 @@
 
 %prep
 %setup -q -n Log-Dispatch-%{version}
-if %{__perl} -e 'use Apache2::Log' ; then
-%patch0 -p1
-fi
 %if %{mailtests}
-%patch1 -p1
+%patch0 -p1
 %endif
 
 # Requirements list: exclude mod_perl
@@ -83,6 +79,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Jose Pedro Oliveira  - 2.14-2
+- Log-Dispatch-2.11-mod_perl2.patch no longer needed.
+
 * Sat Nov 25 2006 Jose Pedro Oliveira  - 2.14-1
 - Update to 2.14.
 


--- Log-Dispatch-2.11-mod_perl2.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Nov 25 23:19:49 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:19:49 -0500
Subject: rpms/tclparser - New directory
Message-ID: <200611252319.kAPNJn6e015628@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624/tclparser

Log Message:
Directory /cvs/extras/rpms/tclparser added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:19:54 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:19:54 -0500
Subject: rpms/tclparser/devel - New directory
Message-ID: <200611252319.kAPNJs6H015669@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15624/tclparser/devel

Log Message:
Directory /cvs/extras/rpms/tclparser/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:20:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:20:06 -0500
Subject: rpms/tclparser Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252320.kAPNK66h015698@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15692

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclparser


--- NEW FILE Makefile ---
# Top level Makefile for module tclparser
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  Sat Nov 25 23:20:11 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:20:11 -0500
Subject: rpms/tclparser/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611252320.kAPNKBLh015714@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15692/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclparser


--- 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  Sat Nov 25 23:21:08 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:21:08 -0500
Subject: rpms/tclparser import.log,1.1,1.2
Message-ID: <200611252321.kAPNL8Y6015793@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15757

Modified Files:
	import.log 
Log Message:
auto-import tclparser-1.4-1.20061030cvs on branch devel from tclparser-1.4-1.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclparser/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 23:20:06 -0000	1.1
+++ import.log	25 Nov 2006 23:20:38 -0000	1.2
@@ -0,0 +1 @@
+tclparser-1_4-1_20061030cvs:HEAD:tclparser-1.4-1.20061030cvs.src.rpm:1164496913



From fedora-extras-commits at redhat.com  Sat Nov 25 23:21:08 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:21:08 -0500
Subject: rpms/tclparser/devel tclparser-1.4-configure.patch, NONE,
	1.1 tclparser.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252321.kAPNL83x015797@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15757/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tclparser-1.4-configure.patch tclparser.spec 
Log Message:
auto-import tclparser-1.4-1.20061030cvs on branch devel from tclparser-1.4-1.20061030cvs.src.rpm

tclparser-1.4-configure.patch:

--- NEW FILE tclparser-1.4-configure.patch ---
--- configure.orig	2006-11-01 08:25:07.000000000 -0800
+++ configure	2006-11-01 08:25:37.000000000 -0800
@@ -1500,10 +1500,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -7046,7 +7048,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


--- NEW FILE tclparser.spec ---
%define cvsdate 20061030

Summary: Tcl syntax parser
Name: tclparser
Version: 1.4
Release: 1.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclparser-20061030cvs tclparser
# tar czf tclparser-20061030cvs.tgz ./tclparser-20061030cvs
Source0: tclparser-%{cvsdate}cvs.tgz
Patch0:  tclparser-1.4-configure.patch
URL: http://tclpro.sourceforge.net/
Requires: tcl
BuildRequires: tcl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
A parser for the Tcl scripting language.  It is used by the Tcl syntax checker
to parse a Tcl script into commands, words and tokens.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch -p0

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog license.terms
%defattr(-,root,root)
%{_libdir}/%{name}%{version}

%changelog
* Tue Oct 31 2006 Wart  1.4-1.20061030cvs
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclparser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:20:11 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:20:38 -0000	1.2
@@ -0,0 +1 @@
+tclparser-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclparser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:20:11 -0000	1.1
+++ sources	25 Nov 2006 23:20:38 -0000	1.2
@@ -0,0 +1 @@
+2efb266a55faff5a9b2c5e53f9edc50f  tclparser-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 23:29:36 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:29:36 -0500
Subject: rpms/tclchecker - New directory
Message-ID: <200611252329.kAPNTaJY015938@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15934/tclchecker

Log Message:
Directory /cvs/extras/rpms/tclchecker added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:29:42 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:29:42 -0500
Subject: rpms/tclchecker/devel - New directory
Message-ID: <200611252329.kAPNTgOs015951@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15934/tclchecker/devel

Log Message:
Directory /cvs/extras/rpms/tclchecker/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:29:53 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:29:53 -0500
Subject: rpms/tclchecker Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252329.kAPNTrMi015981@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15975

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclchecker


--- NEW FILE Makefile ---
# Top level Makefile for module tclchecker
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  Sat Nov 25 23:29:58 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:29:58 -0500
Subject: rpms/tclchecker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611252329.kAPNTw62015996@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15975/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclchecker


--- 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  Sat Nov 25 23:31:02 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:31:02 -0500
Subject: rpms/tclchecker import.log,1.1,1.2
Message-ID: <200611252331.kAPNV2Gi016084@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16047

Modified Files:
	import.log 
Log Message:
auto-import tclchecker-1.4-1.20061030cvs on branch devel from tclchecker-1.4-1.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclchecker/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 23:29:53 -0000	1.1
+++ import.log	25 Nov 2006 23:30:32 -0000	1.2
@@ -0,0 +1 @@
+tclchecker-1_4-1_20061030cvs:HEAD:tclchecker-1.4-1.20061030cvs.src.rpm:1164497508



From fedora-extras-commits at redhat.com  Sat Nov 25 23:31:02 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:31:02 -0500
Subject: rpms/tclchecker/devel tclchecker-1.4-destdir.patch, NONE,
	1.1 tclchecker-1.4-tclm4.patch, NONE, 1.1 tclchecker.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252331.kAPNV2ML016089@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16047/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tclchecker-1.4-destdir.patch tclchecker-1.4-tclm4.patch 
	tclchecker.spec 
Log Message:
auto-import tclchecker-1.4-1.20061030cvs on branch devel from tclchecker-1.4-1.20061030cvs.src.rpm

tclchecker-1.4-destdir.patch:

--- NEW FILE tclchecker-1.4-destdir.patch ---
--- Makefile.in.orig	2006-11-01 09:46:23.000000000 -0800
+++ Makefile.in	2006-11-01 16:33:04.000000000 -0800
@@ -144,11 +144,13 @@
 infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
+datadir = @datadir@
 oldincludedir = /usr/include
 
 DESTDIR =
 
 pkglibdir = $(prefix)/lib/@PACKAGE@@VERSION@
+pkgdatadir = $(datadir)/tclchecker at VERSION@
 
 top_builddir = .
 
@@ -268,15 +270,15 @@
 #========================================================================
 
 install-libraries: libraries installdirs
-	@echo "Installing Tcl files in $(pkglibdir)"
+	@echo "Installing Tcl files in $(DESTDIR)$(pkgdatadir)"
 	@for i in $(LIB_FILES) ; do \
-	    $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkgdatadir) ; \
 	done;
 	@for i in $(PCX_FILES) ; do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkgdatadir) ; \
 	done;
-	$(INSTALL_SCRIPT) pkgIndex.tcl $(pkglibdir) ; \
+	$(INSTALL_SCRIPT) pkgIndex.tcl $(DESTDIR)$(pkgdatadir) ; \
 
 #========================================================================
 # Install documentation.  Unix manpages should go in the $(mandir)
@@ -472,7 +474,7 @@
 
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(libdir)
-	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
+	$(mkinstalldirs)  $(DESTDIR)$(pkgdatadir)
 
 .PHONY: all binaries clean depend distclean doc install installdirs \
 libraries test

tclchecker-1.4-tclm4.patch:

--- NEW FILE tclchecker-1.4-tclm4.patch ---
--- config/tcl.m4.orig	2006-11-01 09:33:41.000000000 -0800
+++ config/tcl.m4	2006-11-01 09:33:20.000000000 -0800
@@ -68,7 +68,10 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -588,7 +591,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


--- NEW FILE tclchecker.spec ---
%define cvsdate 20061030

Summary: Tcl syntax checker
Name: tclchecker
Version: 1.4
Release: 1.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclchecker-20061030cvs tclchecker
# tar czf tclchecker-20061030cvs.tgz ./tclchecker-20061030cvs
Source0: tclchecker-%{cvsdate}cvs.tgz
Patch0:  tclchecker-1.4-tclm4.patch
Patch1:  tclchecker-1.4-destdir.patch
URL: http://tclpro.sourceforge.net/
Requires: tcl tbcload tclparser
BuildRequires: tcl-devel autoconf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%description
A syntax checker for the Tcl scripting language.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch0 -p0
%patch1 -p0
autoconf

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.tcl
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.pcx

%check
# Disabling unit tests as they require tools that haven't been built yet.
#make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog license.terms doc/messageIDs.txt
%defattr(-,root,root)
%{_datadir}/%{name}%{version}

%changelog
* Tue Oct 31 2006 Wart  1.4-1.20061030cvs
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclchecker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:29:58 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:30:32 -0000	1.2
@@ -0,0 +1 @@
+tclchecker-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclchecker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:29:58 -0000	1.1
+++ sources	25 Nov 2006 23:30:32 -0000	1.2
@@ -0,0 +1 @@
+1c76f983b7ccb0d9ca0ee2c3348b18e1  tclchecker-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 23:34:49 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:34:49 -0500
Subject: rpms/tcldebugger - New directory
Message-ID: <200611252334.kAPNYnga016171@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16167/tcldebugger

Log Message:
Directory /cvs/extras/rpms/tcldebugger added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:34:55 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:34:55 -0500
Subject: rpms/tcldebugger/devel - New directory
Message-ID: <200611252334.kAPNYtlj016184@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16167/tcldebugger/devel

Log Message:
Directory /cvs/extras/rpms/tcldebugger/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:35:07 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:35:07 -0500
Subject: rpms/tcldebugger Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252335.kAPNZ7bb016218@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212

Added Files:
	Makefile import.log 
Log Message:
Setup of module tcldebugger


--- NEW FILE Makefile ---
# Top level Makefile for module tcldebugger
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  Sat Nov 25 23:35:12 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:35:12 -0500
Subject: rpms/tcldebugger/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611252335.kAPNZCO5016235@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16212/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcldebugger


--- 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  Sat Nov 25 23:36:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:36:30 -0500
Subject: rpms/tcldebugger/devel tcldebugger-1.4-destdir.patch, NONE,
	1.1 tcldebugger-1.4-shebang.patch, NONE,
	1.1 tcldebugger-1.4-shortsplash.patch, NONE,
	1.1 tcldebugger-1.4-tclm4.patch, NONE,
	1.1 tcldebugger-1.4-tkupdate.patch, NONE, 1.1 tcldebugger.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252336.kAPNaUfR016356@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tcldebugger-1.4-destdir.patch tcldebugger-1.4-shebang.patch 
	tcldebugger-1.4-shortsplash.patch tcldebugger-1.4-tclm4.patch 
	tcldebugger-1.4-tkupdate.patch tcldebugger.spec 
Log Message:
auto-import tcldebugger-1.4-1.20061030cvs on branch devel from tcldebugger-1.4-1.20061030cvs.src.rpm

tcldebugger-1.4-destdir.patch:

--- NEW FILE tcldebugger-1.4-destdir.patch ---
--- Makefile.in.orig	2006-11-01 10:59:45.000000000 -0800
+++ Makefile.in	2006-11-01 11:39:49.000000000 -0800
@@ -184,12 +184,13 @@
 infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
+datadir = @datadir@
 oldincludedir = /usr/include
 
 DESTDIR =
 
 pkgdatadir = $(exec_prefix)/bin/
-pkglibdir = $(prefix)/lib/@PACKAGE@@VERSION@
+pkglibdir = $(datadir)/tcldebugger at VERSION@
 imagelibdir = $(pkglibdir)/images
 
 top_builddir = .
@@ -309,23 +310,23 @@
 #========================================================================
 
 install-libraries: libraries installdirs
-	@echo "Installing Tcl files in $(pkglibdir)"
+	@echo "Installing Tcl files in $(DESTDIR)$(pkglibdir)"
 	@for i in $(LIB_FILES) ; do \
-	    $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibdir) ; \
 	done;
-	@$(INSTALL_SCRIPT) $(DEBUG_NUB_SCRIPT) $(pkglibdir)
-	@$(INSTALL_SCRIPT) pkgIndex.tcl $(pkglibdir) 
-	@echo "Installing PDX files in $(pkglibdir)"
+	@$(INSTALL_SCRIPT) $(DEBUG_NUB_SCRIPT) $(DESTDIR)$(pkglibdir)
+	@$(INSTALL_SCRIPT) pkgIndex.tcl $(DESTDIR)$(pkglibdir) 
+	@echo "Installing PDX files in $(DESTDIR)$(pkglibdir)"
 	@for i in $(DEBUG_PDX_FILES) ; do \
-	    $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibdir) ; \
 	done;
-	@echo "Installing Image files in $(imagelibdir)"
+	@echo "Installing Image files in $(DESTDIR)$(imagelibdir)"
 	@for i in $(srcdir)/images/*.gif ; do \
-	    $(INSTALL_DATA) $$i $(imagelibdir) ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(imagelibdir) ; \
 	done;
-	@echo "Installing support scripts in $(bindir)"
-	@$(INSTALL_SCRIPT) $(DEBUG_LAUNCH_SCRIPT) $(bindir)
-	@$(INSTALL_SCRIPT) $(DEBUG_INIT_SCRIPT) $(bindir)
+	@echo "Installing support scripts in $(DESTDIR)$(bindir)"
+	@$(INSTALL_SCRIPT) $(DEBUG_LAUNCH_SCRIPT) $(DESTDIR)$(bindir)
+	@$(INSTALL_SCRIPT) $(DEBUG_INIT_SCRIPT) $(DESTDIR)$(bindir)
 
 #========================================================================
 # Install documentation.  Unix manpages should go in the $(mandir)
@@ -333,7 +334,7 @@
 #========================================================================
 
 install-doc: doc installdirs
-	$(INSTALL_DATA) $(srcdir)/docs/initdebug.n $(mandir)/mann
+	$(INSTALL_DATA) $(srcdir)/docs/initdebug.n $(DESTDIR)$(mandir)/mann
 
 test: $(TCLSH_PROG)
 	TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
@@ -611,6 +612,7 @@
 	done
 
 installdirs:
+	@$(mkinstalldirs)  $(DESTDIR)$(bindir)
 	@$(mkinstalldirs)  $(DESTDIR)$(libdir)
 	@$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
 	@$(mkinstalldirs)  $(DESTDIR)$(imagelibdir)

tcldebugger-1.4-shebang.patch:

--- NEW FILE tcldebugger-1.4-shebang.patch ---
--- appLaunch.tcl.orig	2006-11-01 21:45:06.000000000 -0800
+++ appLaunch.tcl	2006-11-01 21:45:48.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec tclsh "$0" ${1+"$@"}
+
 # appLaunch.tcl --
 #
 #	This script takes care of initializing the nub and invoking the
--- initdebug.tcl.orig	2006-11-01 21:45:11.000000000 -0800
+++ initdebug.tcl	2006-11-01 21:45:50.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec tclsh "$0" ${1+"$@"}
+
 # initdebug.tcl --
 #
 #	This file contains the public routines used to start debugging user

tcldebugger-1.4-shortsplash.patch:

--- NEW FILE tcldebugger-1.4-shortsplash.patch ---
--- debugger.tcl.in.orig	2006-11-01 16:03:09.000000000 -0800
+++ debugger.tcl.in	2006-11-01 16:03:18.000000000 -0800
@@ -240,7 +240,7 @@
     # Display the splash screen and set a timer to remove it.
 
     set about [gui::showAboutWindow]
-    after 2500 [list destroy $about]
+    after 500 [list destroy $about]
 
     # Remove the send command.  This will keep other applications
     # from being able to poke into our interp via the send command.

tcldebugger-1.4-tclm4.patch:

--- NEW FILE tcldebugger-1.4-tclm4.patch ---
--- config/tcl.m4.orig	2006-11-01 10:45:21.000000000 -0800
+++ config/tcl.m4	2006-11-01 10:45:06.000000000 -0800
@@ -68,7 +68,10 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -161,7 +164,10 @@
 	    fi
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tkConfig.sh" ; then
@@ -588,7 +594,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -1580,7 +1586,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`

tcldebugger-1.4-tkupdate.patch:

--- NEW FILE tcldebugger-1.4-tkupdate.patch ---
Index: bindings.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/bindings.tcl,v
retrieving revision 1.5
diff -u -r1.5 bindings.tcl
--- bindings.tcl	31 Oct 2000 23:30:57 -0000	1.5
+++ bindings.tcl	1 Nov 2006 22:41:29 -0000
@@ -157,124 +157,124 @@
     }
 
     bind noEdit  {
-	set tkPriv(x) %x
-	set tkPriv(y) %y
+	set tk::Priv(x) %x
+	set tk::Priv(y) %y
 	code::tkTextAutoScan $code::codeWin
 	break;
     }
     bind noEdit  {
-	tkCancelRepeat
+	tk::CancelRepeat
 	break
     }
     bind noEdit  {
-	tkCancelRepeat
+	tk::CancelRepeat
 	break
     }
     bind noEdit <1> {
-	tkTextButton1 %W %x %y
+	tk::TextButton1 %W %x %y
 	%W tag remove sel 0.0 end
     }
     bind noEdit  {
-	set tkPriv(x) %x
-	set tkPriv(y) %y
-	tkTextSelectTo %W %x %y
+	set tk::Priv(x) %x
+	set tk::Priv(y) %y
+	tk::TextSelectTo %W %x %y
     }
     bind noEdit  {
-	set tkPriv(selectMode) word
-	tkTextSelectTo %W %x %y
+	set tk::Priv(selectMode) word
+	tk::TextSelectTo %W %x %y
 	catch {%W mark set insert sel.first}
     }
     bind noEdit  {
-	set tkPriv(selectMode) line
-	tkTextSelectTo %W %x %y
+	set tk::Priv(selectMode) line
+	tk::TextSelectTo %W %x %y
 	catch {%W mark set insert sel.first}
     }
     bind noEdit  {
-	tkTextResetAnchor %W @%x,%y
-	set tkPriv(selectMode) char
-	tkTextSelectTo %W %x %y
+	tk::TextResetAnchor %W @%x,%y
+	set tk::Priv(selectMode) char
+	tk::TextSelectTo %W %x %y
     }
     bind noEdit 	{
-	set tkPriv(selectMode) word
-	tkTextSelectTo %W %x %y
+	set tk::Priv(selectMode) word
+	tk::TextSelectTo %W %x %y
     }
     bind noEdit 	{
-	set tkPriv(selectMode) line
-	tkTextSelectTo %W %x %y
+	set tk::Priv(selectMode) line
+	tk::TextSelectTo %W %x %y
     }
     bind noEdit  {
-	set tkPriv(x) %x
-	set tkPriv(y) %y
-	tkTextAutoScan %W
+	set tk::Priv(x) %x
+	set tk::Priv(y) %y
+	tk::TextAutoScan %W
     }
     bind noEdit  {
-	tkCancelRepeat
+	tk::CancelRepeat
     }
     bind noEdit  {
-	tkCancelRepeat
+	tk::CancelRepeat
     }
     bind noEdit  {
 	%W mark set insert @%x,%y
     }
     bind noEdit  {
-	tkTextSetCursor %W insert-1c
+	tk::TextSetCursor %W insert-1c
     }
     bind noEdit  {
-	tkTextSetCursor %W insert+1c
+	tk::TextSetCursor %W insert+1c
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextUpDownLine %W -1]
+	tk::TextSetCursor %W [tk::TextUpDownLine %W -1]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextUpDownLine %W 1]
+	tk::TextSetCursor %W [tk::TextUpDownLine %W 1]
     }
     bind noEdit  {
-	tkTextKeySelect %W [%W index {insert - 1c}]
+	tk::TextKeySelect %W [%W index {insert - 1c}]
     }
     bind noEdit  {
-	tkTextKeySelect %W [%W index {insert + 1c}]
+	tk::TextKeySelect %W [%W index {insert + 1c}]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextUpDownLine %W -1]
+	tk::TextKeySelect %W [tk::TextUpDownLine %W -1]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextUpDownLine %W 1]
+	tk::TextKeySelect %W [tk::TextUpDownLine %W 1]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
+	tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextNextWord %W insert]
+	tk::TextSetCursor %W [tk::TextNextWord %W insert]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextPrevPara %W insert]
+	tk::TextSetCursor %W [tk::TextPrevPara %W insert]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextNextPara %W insert]
+	tk::TextSetCursor %W [tkTextNextPara %W insert]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
+	tk::TextKeySelect %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextNextWord %W insert]
+	tk::TextKeySelect %W [tk::TextNextWord %W insert]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextPrevPara %W insert]
+	tk::TextKeySelect %W [tk::TextPrevPara %W insert]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextNextPara %W insert]
+	tk::TextKeySelect %W [tkTextNextPara %W insert]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextScrollPages %W -1]
+	tk::TextSetCursor %W [tk::TextScrollPages %W -1]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextScrollPages %W -1]
+	tk::TextKeySelect %W [tk::TextScrollPages %W -1]
     }
     bind noEdit  {
-	tkTextSetCursor %W [tkTextScrollPages %W 1]
+	tk::TextSetCursor %W [tk::TextScrollPages %W 1]
     }
     bind noEdit  {
-	tkTextKeySelect %W [tkTextScrollPages %W 1]
+	tk::TextKeySelect %W [tk::TextScrollPages %W 1]
     }
     bind noEdit  {
 	%W xview scroll -1 page
@@ -283,28 +283,28 @@
 	%W xview scroll 1 page
     }
     bind noEdit  {
-	tkTextSetCursor %W {insert linestart}
+	tk::TextSetCursor %W {insert linestart}
     }
     bind noEdit  {
-	tkTextKeySelect %W {insert linestart}
+	tk::TextKeySelect %W {insert linestart}
     }
     bind noEdit  {
-	tkTextSetCursor %W {insert lineend}
+	tk::TextSetCursor %W {insert lineend}
     }
     bind noEdit  {
-	tkTextKeySelect %W {insert lineend}
+	tk::TextKeySelect %W {insert lineend}
     }
     bind noEdit  {
-	tkTextSetCursor %W 1.0
+	tk::TextSetCursor %W 1.0
     }
     bind noEdit  {
-	tkTextKeySelect %W 1.0
+	tk::TextKeySelect %W 1.0
     }
     bind noEdit  {
-	tkTextSetCursor %W {end - 1 char}
+	tk::TextSetCursor %W {end - 1 char}
     }
     bind noEdit  {
-	tkTextKeySelect %W {end - 1 char}
+	tk::TextKeySelect %W {end - 1 char}
     }
     bind noEdit  {
 	%W mark set anchor insert
@@ -313,12 +313,12 @@
 	%W mark set anchor insert
     }
     bind noEdit  {
-	set tkPriv(selectMode) char
-	tkTextKeyExtend %W insert
+	set tk::Priv(selectMode) char
+	tk::TextKeyExtend %W insert
     }
     bind noEdit  {
-	set tkPriv(selectMode) char
-	tkTextKeyExtend %W insert
+	set tk::Priv(selectMode) char
+	tk::TextKeyExtend %W insert
     }
     bind noEdit  {
 	%W tag add sel 1.0 end
Index: breakWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/breakWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 breakWin.tcl
--- breakWin.tcl	31 Oct 2000 23:30:57 -0000	1.3
+++ breakWin.tcl	1 Nov 2006 22:41:30 -0000
@@ -109,9 +109,9 @@
 	    -command {destroy $gui::gui(breakDbgWin)}]
     pack $showBut $remBut $allBut $closeBut -fill x -padx $pad -pady 3
 
-    grid $breakLbl -row 0 -col 0 -sticky nwe -columnspan 2 -padx 4
-    grid $breakSubFrm -row 1 -col 0 -sticky nswe -padx $pad -pady $pad
-    grid $butFrm  -row 1 -col 1 -sticky ns
+    grid $breakLbl -row 0 -column 0 -sticky nwe -columnspan 2 -padx 4
+    grid $breakSubFrm -row 1 -column 0 -sticky nswe -padx $pad -pady $pad
+    grid $butFrm  -row 1 -column 1 -sticky ns
     grid columnconfigure $breakFrm 0 -weight 1
     grid rowconfigure $breakFrm 1 -weight 1
 
Index: codeWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/codeWin.tcl,v
retrieving revision 1.8
diff -u -r1.8 codeWin.tcl
--- codeWin.tcl	17 Oct 2001 18:08:33 -0000	1.8
+++ codeWin.tcl	1 Nov 2006 22:41:31 -0000
@@ -569,24 +569,24 @@
 #	None.
 
 proc code::tkTextAutoScan {w} {
-    global tkPriv
+    global tk::Priv
     if {![winfo exists $w]} return
-    if {$tkPriv(y) >= [winfo height $w]} {
+    if {$tk::Priv(y) >= [winfo height $w]} {
 	$code::codeBar yview scroll 2 units
 	$code::lineBar yview scroll 2 units
 	$code::codeWin yview scroll 2 units
-    } elseif {$tkPriv(y) < 0} {
+    } elseif {$tk::Priv(y) < 0} {
 	$code::codeBar yview scroll -2 units
 	$code::lineBar yview scroll -2 units
 	$code::codeWin yview scroll -2 units
-    } elseif {$tkPriv(x) >= [winfo width $w]} {
+    } elseif {$tk::Priv(x) >= [winfo width $w]} {
 	$code::codeWin xview scroll 2 units
-    } elseif {$tkPriv(x) < 0} {
+    } elseif {$tk::Priv(x) < 0} {
 	$code::codeWin xview scroll -2 units
     } else {
 	return
     }
-    set tkPriv(afterId) [after 50 code::tkTextAutoScan $w]
+    set tk::Priv(afterId) [after 50 code::tkTextAutoScan $w]
 }
 
 # code::toggleLBP --
Index: coverage.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/coverage.tcl,v
retrieving revision 1.6
diff -u -r1.6 coverage.tcl
--- coverage.tcl	31 Oct 2000 23:30:57 -0000	1.6
+++ coverage.tcl	1 Nov 2006 22:41:33 -0000
@@ -246,11 +246,11 @@
     pack $clearAllBut -fill x
     pack $closeBut -fill x -anchor s
 
-    grid $radio(uncvr) -row 1 -col 0 -sticky nw -columnspan 3
-    grid $radio(cvr) -row 2 -col 0 -sticky nw -columnspan 3
-    grid $coverText -row 3 -col 0 -sticky nswe -padx $pad -pady $pad \
+    grid $radio(uncvr) -row 1 -column 0 -sticky nw -columnspan 3
+    grid $radio(cvr) -row 2 -column 0 -sticky nw -columnspan 3
+    grid $coverText -row 3 -column 0 -sticky nswe -padx $pad -pady $pad \
 	    -columnspan 2
-    grid $butFrm  -row 3 -col 2 -sticky nwe -padx $pad -pady $pad
+    grid $butFrm  -row 3 -column 2 -sticky nwe -padx $pad -pady $pad
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 3 -weight 1
 
Index: find.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/find.tcl,v
retrieving revision 1.3
diff -u -r1.3 find.tcl
--- find.tcl	31 Oct 2000 23:30:58 -0000	1.3
+++ find.tcl	1 Nov 2006 22:41:33 -0000
@@ -160,11 +160,11 @@
     set closeBut [button $mainFrm.closeBut -text "Close" -default normal \
 	    -command {destroy $gui::gui(findDbgWin)}]
 
-    grid $findFrm  -row 0 -col 0 -sticky nwe -columnspan 2 -padx $pad
-    grid $findBut  -row 0 -col 2 -sticky nwe -padx $pad -pady $pad
-    grid $closeBut  -row 1 -col 2 -sticky nwe -padx $pad -pady $pad
-    grid $checkFrm -row 1 -col 0 -sticky nsw
-    grid $dirFrm   -row 1 -col 1 -sticky nswe -padx $pad -pady $pad
+    grid $findFrm  -row 0 -column 0 -sticky nwe -columnspan 2 -padx $pad
+    grid $findBut  -row 0 -column 2 -sticky nwe -padx $pad -pady $pad
+    grid $closeBut  -row 1 -column 2 -sticky nwe -padx $pad -pady $pad
+    grid $checkFrm -row 1 -column 0 -sticky nsw
+    grid $dirFrm   -row 1 -column 1 -sticky nswe -padx $pad -pady $pad
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 2 -weight 1
     pack $mainFrm -fill both -expand true -padx $pad -pady $pad
@@ -594,15 +594,15 @@
     set closeBut [button $placeFrm.closeBut -text Close -default normal\
 	    -command {destroy $gui::gui(gotoDbgWin)} -width 10]
 
-    grid $gotoBut   -row 0 -col 0 -sticky w -padx $pad
-    grid $closeBut  -row 0 -col 1 -sticky w -padx $pad
+    grid $gotoBut   -row 0 -column 0 -sticky w -padx $pad
+    grid $closeBut  -row 0 -column 1 -sticky w -padx $pad
     grid rowconfigure $placeFrm 0 -weight 1
 
-    grid $choiceLbl -row 0 -col 0 -sticky nw -padx $pad -pady $pad
-    grid $lineLbl   -row 0 -col 1 -sticky nw -pady $pad
-    grid $choiceBox -row 1 -col 0 -sticky w -padx $pad 
-    grid $lineEnt   -row 1 -col 1 -sticky we
-    grid $placeFrm  -row 2 -col 0 -columnspan 2 -padx $pad -pady $pad
+    grid $choiceLbl -row 0 -column 0 -sticky nw -padx $pad -pady $pad
+    grid $lineLbl   -row 0 -column 1 -sticky nw -pady $pad
+    grid $choiceBox -row 1 -column 0 -sticky w -padx $pad 
+    grid $lineEnt   -row 1 -column 1 -sticky we
+    grid $placeFrm  -row 2 -column 0 -columnspan 2 -padx $pad -pady $pad
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 2 -weight 1
     pack $mainFrm -fill both -expand true -padx $pad -pady $pad 
Index: gui.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/gui.tcl,v
retrieving revision 1.15
diff -u -r1.15 gui.tcl
--- gui.tcl	17 Oct 2001 18:08:33 -0000	1.15
+++ gui.tcl	1 Nov 2006 22:41:33 -0000
@@ -1875,8 +1875,8 @@
 
     pack $infoText -side left -fill x -expand 1
     pack $fillFrm  -side left -fill x
-    grid $instLbl  -row 0 -col 0 -sticky we
-    grid $fileText -row 0 -col 1 -sticky we -padx 2
+    grid $instLbl  -row 0 -column 0 -sticky we
+    grid $fileText -row 0 -column 1 -sticky we -padx 2
     grid columnconfigure $fileFrm 1 -weight 1
     grid columnconfigure $fileFrm 0 -minsize $width
 
@@ -2595,16 +2595,16 @@
 
 	grid $m.title -columnspan 2 -pady 10
 	#grid $m.t -columnspan 2
-	grid $m.l1 -row 1 -col 0 -sticky e
-	grid $m.r1 -row 1 -col 1 -sticky w
-	grid $m.l2 -row 2 -col 0 -sticky e
-	grid $m.r2 -row 2 -col 1 -sticky w
-	grid $m.l3 -row 3 -col 0 -sticky e
-	grid $m.r3 -row 3 -col 1 -sticky w
-	grid $m.l4 -row 4 -col 0 -sticky e
-	grid $m.r4 -row 4 -col 1 -sticky w
-	grid $m.l5 -row 5 -col 0 -sticky e
-	grid $m.r5 -row 5 -col 1 -sticky w
+	grid $m.l1 -row 1 -column 0 -sticky e
+	grid $m.r1 -row 1 -column 1 -sticky w
+	grid $m.l2 -row 2 -column 0 -sticky e
+	grid $m.r2 -row 2 -column 1 -sticky w
+	grid $m.l3 -row 3 -column 0 -sticky e
+	grid $m.r3 -row 3 -column 1 -sticky w
+	grid $m.l4 -row 4 -column 0 -sticky e
+	grid $m.r4 -row 4 -column 1 -sticky w
+	grid $m.l5 -row 5 -column 0 -sticky e
+	grid $m.r5 -row 5 -column 1 -sticky w
 	grid $m.b -columnspan 2 -pady 10
     }
 
Index: inspectorWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/inspectorWin.tcl,v
retrieving revision 1.4
diff -u -r1.4 inspectorWin.tcl
--- inspectorWin.tcl	31 Oct 2000 23:30:58 -0000	1.4
+++ inspectorWin.tcl	1 Nov 2006 22:41:34 -0000
@@ -226,9 +226,9 @@
     set yscroll [scrollbar $varFrm.yscroll -command [list $varText yview]]
     set xscroll [scrollbar $varFrm.xscroll -command [list $varText xview] \
 	    -orient horizontal]
-    grid $varText -row 0 -col 0 -sticky nswe
-    grid $yscroll -row 0 -col 1 -sticky ns
-    grid $xscroll -row 1 -col 0 -sticky we
+    grid $varText -row 0 -column 0 -sticky nswe
+    grid $yscroll -row 0 -column 1 -sticky ns
+    grid $xscroll -row 1 -column 0 -sticky we
     grid columnconfigure $varFrm 0 -weight 1
     grid rowconfigure $varFrm 0 -weight 1
 
Index: menu.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/menu.tcl,v
retrieving revision 1.15
diff -u -r1.15 menu.tcl
--- menu.tcl	31 Oct 2000 23:30:59 -0000	1.15
+++ menu.tcl	1 Nov 2006 22:41:34 -0000
@@ -929,11 +929,11 @@
     pack $selectText -side left -fill both -expand true
     pack $showBut $canBut -fill x
     pack $canBut -pady $pad -fill x
-    grid $selectLbl -row 0 -col 0 -padx $pad -sticky nw
-    grid $selectFrm -row 1 -col 0 -padx $pad -pady $pad -sticky nswe \
+    grid $selectLbl -row 0 -column 0 -padx $pad -sticky nw
+    grid $selectFrm -row 1 -column 0 -padx $pad -pady $pad -sticky nswe \
 	    -rowspan 2
-    grid $butFrm  -row 1 -col 1 -padx $pad -pady $pad -sticky nwe
-    grid $instLbl -row 3 -col 0 -padx $pad -sticky nw -columnspan 2
+    grid $butFrm  -row 1 -column 1 -padx $pad -pady $pad -sticky nwe
+    grid $instLbl -row 3 -column 0 -padx $pad -sticky nw -columnspan 2
     grid columnconfigure $mainFrm 0 -weight 1
     grid rowconfigure $mainFrm 1 -weight 1
     pack $mainFrm -fill both -expand true -padx $pad -pady $pad
Index: portWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/portWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 portWin.tcl
--- portWin.tcl	31 Oct 2000 23:31:00 -0000	1.5
+++ portWin.tcl	1 Nov 2006 22:41:34 -0000
@@ -97,9 +97,9 @@
     pack $portEnt  -side right
     pack $portLabel -side right
 
-    grid $imageLbl  -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $msgLbl    -row 0 -col 1 -sticky w -padx $pad -pady $pad
-    grid $portFrm   -row 2 -col 1 -sticky w -padx $pad -pady $pad
+    grid $imageLbl  -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $msgLbl    -row 0 -column 1 -sticky w -padx $pad -pady $pad
+    grid $portFrm   -row 2 -column 1 -sticky w -padx $pad -pady $pad
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 1 -weight 1
 
Index: prefWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/prefWin.tcl,v
retrieving revision 1.4
diff -u -r1.4 prefWin.tcl
--- prefWin.tcl	31 Oct 2000 23:31:00 -0000	1.4
+++ prefWin.tcl	1 Nov 2006 22:41:35 -0000
@@ -321,10 +321,10 @@
 		     -listwidth 6 -listheight 1 \
 		     -textvariable [pref::prefVar fontSize TempPref]]
 
-    grid $typeLbl -row 0 -col 0 -sticky w  -padx $pad -pady $pad
-    grid $typeBox -row 0 -col 1 -sticky we -pady $pad
-    grid $sizeLbl -row 0 -col 3 -sticky w  -padx $pad -pady $pad
-    grid $sizeBox -row 0 -col 4 -sticky we -pady $pad
+    grid $typeLbl -row 0 -column 0 -sticky w  -padx $pad -pady $pad
+    grid $typeBox -row 0 -column 1 -sticky we -pady $pad
+    grid $sizeLbl -row 0 -column 3 -sticky w  -padx $pad -pady $pad
+    grid $sizeBox -row 0 -column 4 -sticky we -pady $pad
     grid columnconfigure $subFrm 1 -weight 1
     grid columnconfigure $subFrm 2 -minsize 20
     grid columnconfigure $subFrm 5 -weight 1
@@ -385,12 +385,12 @@
     pack propagate $cmdresultFrm 0
     pack $cmdresultBut -fill both
 
-    grid $highLbl  -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $highFrm  -row 0 -col 1 -sticky w -pady $pad 
-    grid $errorLbl -row 0 -col 3 -sticky w -padx $pad -pady $pad
-    grid $errorFrm -row 0 -col 4 -sticky w -pady $pad
-    grid $cmdresultLbl -row 0 -col 6 -sticky w -padx $pad -pady $pad
-    grid $cmdresultFrm -row 0 -col 7 -sticky w -pady $pad
+    grid $highLbl  -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $highFrm  -row 0 -column 1 -sticky w -pady $pad 
+    grid $errorLbl -row 0 -column 3 -sticky w -padx $pad -pady $pad
+    grid $errorFrm -row 0 -column 4 -sticky w -pady $pad
+    grid $cmdresultLbl -row 0 -column 6 -sticky w -padx $pad -pady $pad
+    grid $cmdresultFrm -row 0 -column 7 -sticky w -pady $pad
     grid columnconfigure $subFrm 2 -minsize 20
     grid columnconfigure $subFrm 5 -minsize 20
     grid columnconfigure $subFrm 8 -weight 1
@@ -456,10 +456,10 @@
     set histryEnt [entry $subFrm.histryEnt -justify right -width 6 \
 		       -textvariable [pref::prefVar historySize TempPref]]
 
-    grid $screenLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $screenEnt -row 0 -col 1 -sticky w -pady $pad
-    grid $histryLbl -row 0 -col 3 -sticky w -padx $pad -pady $pad
-    grid $histryEnt -row 0 -col 4 -sticky w -pady $pad
+    grid $screenLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $screenEnt -row 0 -column 1 -sticky w -pady $pad
+    grid $histryLbl -row 0 -column 3 -sticky w -padx $pad -pady $pad
+    grid $histryEnt -row 0 -column 4 -sticky w -pady $pad
     grid columnconfigure $subFrm 2 -minsize 20
     grid columnconfigure $subFrm 5 -weight 1
 
@@ -490,8 +490,8 @@
     set tabEnt [entry $subFrm.screenEnt -justify right -width 6 \
 		    -textvariable [pref::prefVar tabSize TempPref]]
 
-    grid $tabLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $tabEnt -row 0 -col 1 -sticky w -pady $pad
+    grid $tabLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $tabEnt -row 0 -column 1 -sticky w -pady $pad
     grid columnconfigure $subFrm 3 -weight 1
 
     pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -510,7 +510,7 @@
     set reloadChk [checkbutton $subFrm.reloadChk \
 		     -text "Reload the previous project on startup." \
 		     -variable [pref::prefVar projectReload TempPref]]
-    grid $reloadChk -row 0 -col 0 -sticky w -padx $pad
+    grid $reloadChk -row 0 -column 0 -sticky w -padx $pad
     grid columnconfigure $subFrm 1 -weight 1
 
     pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -542,10 +542,10 @@
 		     -text "Warn before killing the application." \
 		     -variable [pref::prefVar warnOnKill TempPref]]
     
-    grid $askRad  -row 0 -col 0 -sticky w -padx $pad
-    grid $killRad -row 1 -col 0 -sticky w -padx $pad
-    grid $runRad  -row 2 -col 0 -sticky w -padx $pad
-    grid $warnChk -row 0 -col 2 -sticky w -padx $pad
+    grid $askRad  -row 0 -column 0 -sticky w -padx $pad
+    grid $killRad -row 1 -column 0 -sticky w -padx $pad
+    grid $runRad  -row 2 -column 0 -sticky w -padx $pad
+    grid $warnChk -row 0 -column 2 -sticky w -padx $pad
     grid columnconfigure $subFrm 1 -minsize 20
     grid columnconfigure $subFrm 3 -weight 1
 
@@ -579,7 +579,7 @@
     set mvBpChk [checkbutton $subFrm.mvBpChk \
 		     -text "Warn when moving invalid breakpoints." \
 		     -variable [pref::prefVar warnInvalidBp TempPref]]
-    grid $mvBpChk -row 0 -col 0 -sticky w -padx $pad
+    grid $mvBpChk -row 0 -column 0 -sticky w -padx $pad
     grid columnconfigure $subFrm 1 -weight 1
 
     pack $subFrm -fill both -expand true -padx $pad -pady $pad2
Index: procWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/procWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 procWin.tcl
--- procWin.tcl	31 Oct 2000 23:31:00 -0000	1.5
+++ procWin.tcl	1 Nov 2006 22:41:35 -0000
@@ -131,15 +131,15 @@
 	    -command {destroy $gui::gui(procDbgWin)}]
     pack $showBut $instruBut $uninstruBut $closeBut -fill x -pady 3
 
-    grid $patLbl -row 0 -col 0 -sticky we -pady $pad
-    grid $patEnt -row 0 -col 1 -sticky we -padx $pad -pady $pad
-    grid $patBut -row 0 -col 2 -sticky we -padx $pad -pady $pad
-    grid $sepFrm -row 1 -col 0 -sticky we -padx $pad -pady 3 -columnspan 3
-    grid $showChk -row 2 -col 0 -sticky nw -columnspan 3
-    grid $procText -row 3 -col 0 -sticky nswe -padx $pad -pady $pad \
+    grid $patLbl -row 0 -column 0 -sticky we -pady $pad
+    grid $patEnt -row 0 -column 1 -sticky we -padx $pad -pady $pad
+    grid $patBut -row 0 -column 2 -sticky we -padx $pad -pady $pad
+    grid $sepFrm -row 1 -column 0 -sticky we -padx $pad -pady 3 -columnspan 3
+    grid $showChk -row 2 -column 0 -sticky nw -columnspan 3
+    grid $procText -row 3 -column 0 -sticky nswe -padx $pad -pady $pad \
 	    -columnspan 2
-    grid $butFrm  -row 3 -col 2 -sticky nwe -padx $pad -pady $pad
-    grid $instLbl -row 4 -col 0 -sticky nw -padx $pad -columnspan 3
+    grid $butFrm  -row 3 -column 2 -sticky nwe -padx $pad -pady $pad
+    grid $instLbl -row 4 -column 0 -sticky nw -padx $pad -columnspan 3
     grid columnconfigure $mainFrm 1 -weight 1
     grid rowconfigure $mainFrm 3 -weight 1
 
Index: projWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/projWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 projWin.tcl
--- projWin.tcl	31 Oct 2000 23:31:00 -0000	1.5
+++ projWin.tcl	1 Nov 2006 22:41:36 -0000
@@ -562,8 +562,8 @@
     set portEnt [entry $remoteFrm.screenEnt -justify right -width 6 \
 	    -textvariable [pref::prefVar portRemote TempProj]]
 
-    grid $localRad  -row 0 -col 0 -sticky w -padx $pad
-    grid $remoteRad -row 0 -col 1 -sticky w -padx $pad
+    grid $localRad  -row 0 -column 0 -sticky w -padx $pad
+    grid $remoteRad -row 0 -column 1 -sticky w -padx $pad
     grid columnconfigure $appFrm 1 -weight 1 -minsize 20
     grid columnconfigure $appFrm 2 -weight 1 -minsize 20
 
@@ -585,8 +585,8 @@
     grid configure $interpCombo -sticky nwe
     grid columnconfigure $localFrm 0 -weight 1
 
-    grid $portLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
-    grid $portEnt -row 0 -col 1 -sticky w -pady $pad
+    grid $portLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+    grid $portEnt -row 0 -column 1 -sticky w -pady $pad
     grid columnconfigure $remoteFrm 3 -weight 1
 
     pack $appFrm -fill x -expand true -padx $pad -pady $pad2
@@ -688,9 +688,9 @@
 	    -variable [pref::prefVar errorAction TempProj] \
 	    -value 0]
     
-    grid $errRad1 -row 0 -col 0 -sticky w -padx $pad
-    grid $errRad2   -row 1 -col 0 -sticky w -padx $pad
-    grid $errRad3   -row 2 -col 0 -sticky w -padx $pad
+    grid $errRad1 -row 0 -column 0 -sticky w -padx $pad
+    grid $errRad2   -row 1 -column 0 -sticky w -padx $pad
+    grid $errRad3   -row 2 -column 0 -sticky w -padx $pad
     grid columnconfigure $subFrm 0 -weight 1
 
     pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -761,17 +761,17 @@
 
     pack $instLbl -side left -anchor nw
     pack $instEnt -side left -anchor ne -fill x -expand true
-    grid $entFrm -row 0 -col 0 -columnspan 3 -sticky new -padx $pad -pady $pad
+    grid $entFrm -row 0 -column 0 -columnspan 3 -sticky new -padx $pad -pady $pad
 
-    grid $instDoLbl  -row 1 -col 0 -columnspan 3 -sticky nsw -padx $pad 
-    grid $doInstText -row 2 -col 0 -sticky nswe
-    grid $sbDoInst   -row 2 -col 1 -sticky nsw
-    grid $doButFrm   -row 2 -col 2 -sticky new -padx $pad
+    grid $instDoLbl  -row 1 -column 0 -columnspan 3 -sticky nsw -padx $pad 
+    grid $doInstText -row 2 -column 0 -sticky nswe
+    grid $sbDoInst   -row 2 -column 1 -sticky nsw
+    grid $doButFrm   -row 2 -column 2 -sticky new -padx $pad
     
-    grid $instNoLbl  -row 3 -col 0 -columnspan 3 -sticky nsw -padx $pad 
-    grid $noInstText -row 4 -col 0 -sticky nswe
-    grid $sbNoInst   -row 4 -col 1 -sticky nsw
-    grid $noButFrm   -row 4 -col 2 -sticky new -padx $pad
+    grid $instNoLbl  -row 3 -column 0 -columnspan 3 -sticky nsw -padx $pad 
+    grid $noInstText -row 4 -column 0 -sticky nswe
+    grid $sbNoInst   -row 4 -column 1 -sticky nsw
+    grid $noButFrm   -row 4 -column 2 -sticky new -padx $pad
 
     grid columnconfigure $subFrm 0 -weight 1 -minsize $pad
     grid rowconfigure $subFrm [list 2 4] -weight 1 -minsize $pad
@@ -872,11 +872,11 @@
 	    -text "Instrument Expect." \
 	    -variable [pref::prefVar instrumentExpect]]
 
-    grid $dynChk  -row 0 -col 0 -sticky w -padx $pad
-    grid $autoChk -row 1 -col 0 -sticky w -padx $pad
-    grid $incrChk  -row 0 -col 1 -sticky w -padx $pad
-    grid $tclxChk  -row 1 -col 1 -sticky w -padx $pad
-    grid $expectChk  -row 2 -col 1 -sticky w -padx $pad
+    grid $dynChk  -row 0 -column 0 -sticky w -padx $pad
+    grid $autoChk -row 1 -column 0 -sticky w -padx $pad
+    grid $incrChk  -row 0 -column 1 -sticky w -padx $pad
+    grid $tclxChk  -row 1 -column 1 -sticky w -padx $pad
+    grid $expectChk  -row 2 -column 1 -sticky w -padx $pad
     grid columnconfigure $subFrm 1 -minsize 20
     grid columnconfigure $subFrm 3 -weight 1
 
Index: selection.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/selection.tcl,v
retrieving revision 1.3
diff -u -r1.3 selection.tcl
--- selection.tcl	31 Oct 2000 23:31:01 -0000	1.3
+++ selection.tcl	1 Nov 2006 22:41:37 -0000
@@ -91,15 +91,15 @@
     # 	or re-enters the text widget.
 
     bind scrollText  {
-	set tkPriv(x) %x
-	set tkPriv(y) %y
+	set tk::Priv(x) %x
+	set tk::Priv(y) %y
 	sel::tkTextAutoScan %W
     }
     bind scrollText  {
-	tkCancelRepeat
+	tk::CancelRepeat
     }
     bind scrollText  {
-	tkCancelRepeat
+	tk::CancelRepeat
     }
 
     # selectFocus --
@@ -1052,7 +1052,7 @@
 #	This procedure is invoked when the mouse leaves a text window
 # 	with button 1 down.  It scrolls the window up, down, left, or right,
 # 	depending on where the mouse is (this information was saved in
-# 	tkPriv(x) and tkPriv(y)), and reschedules itself as an "after"
+# 	tk::Priv(x) and tk::Priv(y)), and reschedules itself as an "after"
 # 	command so that the window continues to scroll until the mouse
 # 	moves back into the window or the mouse button is released.
 #
@@ -1063,19 +1063,19 @@
 #	None.
 
 proc sel::tkTextAutoScan {w} {
-    global tkPriv
+    global tk::Priv
     if {![winfo exists $w]} return
-    if {$tkPriv(y) >= [winfo height $w]} {
+    if {$tk::Priv(y) >= [winfo height $w]} {
 	$w yview scroll 2 units
-    } elseif {$tkPriv(y) < 0} {
+    } elseif {$tk::Priv(y) < 0} {
 	$w yview scroll -2 units
-    } elseif {$tkPriv(x) >= [winfo width $w]} {
+    } elseif {$tk::Priv(x) >= [winfo width $w]} {
 	$w xview scroll 2 units
-    } elseif {$tkPriv(x) < 0} {
+    } elseif {$tk::Priv(x) < 0} {
 	$w xview scroll -2 units
     } else {
 	return
     }
-    set tkPriv(afterId) [after 50 sel::tkTextAutoScan $w]
+    set tk::Priv(afterId) [after 50 sel::tkTextAutoScan $w]
 }
 
Index: system.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/system.tcl,v
retrieving revision 1.22
diff -u -r1.22 system.tcl
--- system.tcl	31 Oct 2000 23:31:01 -0000	1.22
+++ system.tcl	1 Nov 2006 22:41:37 -0000
@@ -1053,10 +1053,10 @@
 		-variable [pref::prefVar browserDefault] \
 		-command "system::checkBrowserWindowState $otherLbl $otherEnt"]
 	
-	grid $defaultRad -row 0 -col 0 -sticky w  -padx $pad -columnspan 2
-	grid $otherRad   -row 1 -col 0 -sticky w  -padx $pad -columnspan 2
-	grid $otherLbl   -row 2 -col 1 -sticky w  -padx $pad  
-	grid $otherEnt   -row 3 -col 1 -sticky we -padx $pad 
+	grid $defaultRad -row 0 -column 0 -sticky w  -padx $pad -columnspan 2
+	grid $otherRad   -row 1 -column 0 -sticky w  -padx $pad -columnspan 2
+	grid $otherLbl   -row 2 -column 1 -sticky w  -padx $pad  
+	grid $otherEnt   -row 3 -column 1 -sticky we -padx $pad 
 	grid columnconfigure $subFrm 0 -minsize 40
 	grid columnconfigure $subFrm 1 -weight 1
 	pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -1072,8 +1072,8 @@
 	set browserBox [guiUtil::ComboBox $subFrm.browserBox \
 			    -textvariable [pref::prefVar browserCmd TempPref]]
 
-	grid $browserLbl -row 0 -col 0 -sticky w  -padx $pad
-	grid $browserBox -row 1 -col 0 -sticky we -padx $pad
+	grid $browserLbl -row 0 -column 0 -sticky w  -padx $pad
+	grid $browserBox -row 1 -column 0 -sticky we -padx $pad
 	grid columnconfigure $subFrm 0 -weight 1
 	pack $subFrm -fill both -expand true -padx $pad -pady $pad2
 
Index: tkcon.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/tkcon.tcl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tkcon.tcl
--- tkcon.tcl	18 Sep 1999 01:13:34 -0000	1.1.1.1
+++ tkcon.tcl	1 Nov 2006 22:41:38 -0000
@@ -466,7 +466,7 @@
     global tcl_platform tk_version
 
     #-----------------------------------------------------------------------
-    # Elements of tkPriv that are used in this file:
+    # Elements of tk::Priv that are used in this file:
     #
     # char -		Character position on the line;  kept in order
     #			to allow moving up or down past short lines while
@@ -572,9 +572,9 @@
     }
     bind TkConsole  {
 	if {[%W compare {limit linestart} == {insert linestart}]} {
-	    tkTextSetCursor %W limit
+	    tk::TextSetCursor %W limit
 	} else {
-	    tkTextSetCursor %W {insert linestart}
+	    tk::TextSetCursor %W {insert linestart}
 	}
     }
     bind TkConsole  {
@@ -597,14 +597,14 @@
     }
     bind TkConsole <> {
 	if {[%W compare {insert linestart} != {limit linestart}]} {
-	    tkTextSetCursor %W [tkTextUpDownLine %W -1]
+	    tk::TextSetCursor %W [tk::TextUpDownLine %W -1]
 	} else {
 	    tkCon::Event -1
 	}
     }
     bind TkConsole <> {
 	if {[%W compare {insert linestart} != {end-1c linestart}]} {
-	    tkTextSetCursor %W [tkTextUpDownLine %W 1]
+	    tk::TextSetCursor %W [tk::TextUpDownLine %W 1]
 	} else {
 	    tkCon::Event 1
 	}
@@ -623,7 +623,7 @@
     }
     bind TkConsole <>	{
 	## Transpose current and previous chars
-	if {[%W compare insert > "limit+1c"]} { tkTextTranspose %W }
+	if {[%W compare insert > "limit+1c"]} { tk::TextTranspose %W }
     }
     bind TkConsole <> {
 	## Clear command line (Unix shell staple)
@@ -641,10 +641,10 @@
 	tkCon::Insert %W $tkCon::TKCON(tmp)
 	%W see end
     }
-    catch {bind TkConsole    { tkTextScrollPages %W -1 }}
-    catch {bind TkConsole      { tkTextScrollPages %W -1 }}
-    catch {bind TkConsole  { tkTextScrollPages %W 1 }}
-    catch {bind TkConsole       { tkTextScrollPages %W 1 }}
+    catch {bind TkConsole    { tk::TextScrollPages %W -1 }}
+    catch {bind TkConsole      { tk::TextScrollPages %W -1 }}
+    catch {bind TkConsole  { tk::TextScrollPages %W 1 }}
+    catch {bind TkConsole       { tk::TextScrollPages %W 1 }}
     bind TkConsole <$TKCON(meta)-d> {
 	if {[%W compare insert >= limit]} {
 	    %W delete insert {insert wordend}
@@ -662,7 +662,7 @@
     }
     bind TkConsole  {
 	if {
-	    (!$tkPriv(mouseMoved) || $tk_strictMotif) && \
+	    (!$tk::Priv(mouseMoved) || $tk_strictMotif) && \
 	    (![catch {selection get -displayof %W} tkCon::TKCON(tmp)] || \
 	    ![catch {selection get -displayof %W -type TEXT} tkCon::TKCON(tmp)]\
 	    || ![catch {selection get -displayof %W \
Index: varWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/varWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 varWin.tcl
--- varWin.tcl	31 Oct 2000 23:31:01 -0000	1.3
+++ varWin.tcl	1 Nov 2006 22:41:38 -0000
@@ -51,7 +51,7 @@
     pack $vbpFrm   -side left -fill y
     pack $vbpText  -side left -fill both -expand true
     pack $nameText -side left -fill both -expand true
-    grid $valuText -sticky wnse -row 0 -col 0
+    grid $valuText -sticky wnse -row 0 -column 0
     grid columnconfigure $valuFrm 0 -weight 1
     grid rowconfigure $valuFrm 0 -weight 1
     guiUtil::tableCreate $varFrm $nameFrm $valuFrm \
Index: watchWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/watchWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 watchWin.tcl
--- watchWin.tcl	31 Oct 2000 23:31:01 -0000	1.3
+++ watchWin.tcl	1 Nov 2006 22:41:39 -0000
@@ -153,7 +153,7 @@
     pack $vbpFrm   -side left -fill y
     pack $vbpText  -side left -fill both -expand true
     pack $nameText -side left -fill both -expand true
-    grid $valuText -sticky wnse -row 0 -col 0
+    grid $valuText -sticky wnse -row 0 -column 0
     grid columnconfigure $valuFrm 0 -weight 1
     grid rowconfigure $valuFrm 0 -weight 1
     guiUtil::tableCreate $varFrm $nameFrm $valuFrm \
@@ -173,11 +173,11 @@
 	    -command {destroy $gui::gui(watchDbgWin)}] 
     pack $inspectBut $remBut $allBut $closeBut -fill x -pady 3
 
-    grid $addFrm -row 0 -col 0 -sticky we -padx $pad -pady $pad
-    grid $addBut -row 0 -col 1 -sticky we -padx $pad -pady $pad2
-    grid $sepFrm -row 1 -col 0 -columnspan 2 -sticky we -padx $pad
-    grid $varFrm -row 2 -col 0 -sticky nswe -padx $pad -pady $pad2
-    grid $butFrm -row 2 -col 1 -sticky nwe -padx $pad -pady [expr {$pad2 - 3}]
+    grid $addFrm -row 0 -column 0 -sticky we -padx $pad -pady $pad
+    grid $addBut -row 0 -column 1 -sticky we -padx $pad -pady $pad2
+    grid $sepFrm -row 1 -column 0 -columnspan 2 -sticky we -padx $pad
+    grid $varFrm -row 2 -column 0 -sticky nswe -padx $pad -pady $pad2
+    grid $butFrm -row 2 -column 1 -sticky nwe -padx $pad -pady [expr {$pad2 - 3}]
     grid columnconfigure $mainFrm 0 -weight 1
     grid rowconfigure $mainFrm 2 -weight 1
     pack $mainFrm -fill both -expand true -padx $pad -pady $pad
@@ -558,7 +558,7 @@
     $vbpText  configure -padx 2
 
     $valuText configure -yscroll [list gui::scrollDbgText $valuText $sb \
-	    [list grid $sb -sticky nse -row 0 -col 1]]
+	    [list grid $sb -sticky nse -row 0 -column 1]]
     
     # Special bindings on the nameText widget; toggling
     # VBPs on/off/enabled/disabled.


--- NEW FILE tcldebugger.spec ---
%define cvsdate 20061030

Summary: Tcl debugging library
Name: tcldebugger
Version: 1.4
Release: 1.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tcldebugger-20061030cvs tcldebugger
# tar czf tcldebugger-20061030cvs.tgz ./tcldebugger-20061030cvs
Source0: tcldebugger-%{cvsdate}cvs.tgz
Patch0:  tcldebugger-1.4-tclm4.patch
Patch1:  tcldebugger-1.4-destdir.patch
Patch2:  tcldebugger-1.4-tkupdate.patch
Patch3:  tcldebugger-1.4-shortsplash.patch
Patch4:  tcldebugger-1.4-shebang.patch
URL: http://tclpro.sourceforge.net/
BuildRequires: tcl-devel autoconf
Requires: tk tclparser tcllib tbcload
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%description
A debugging library for Tcl.  This is used by the graphical TclPro debugger.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
autoconf

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Fix a few file permissions for rpmlint
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.tcl
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.pdx

%check
# Disabling unit tests as they require tools that haven't been built yet.
#make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog license.terms
%defattr(-,root,root)
%{_bindir}/initdebug.tcl
%{_bindir}/appLaunch.tcl
%{_datadir}/%{name}%{version}
%{_mandir}/mann/*.gz

%changelog
* Tue Oct 31 2006 Wart  1.4-1.20061030cvs
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcldebugger/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:35:12 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:36:00 -0000	1.2
@@ -0,0 +1 @@
+tcldebugger-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcldebugger/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:35:12 -0000	1.1
+++ sources	25 Nov 2006 23:36:00 -0000	1.2
@@ -0,0 +1 @@
+2e58832337b39db415a39b121de89707  tcldebugger-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Sat Nov 25 23:36:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:36:30 -0500
Subject: rpms/tcldebugger import.log,1.1,1.2
Message-ID: <200611252336.kAPNaUUj016352@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldebugger
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307

Modified Files:
	import.log 
Log Message:
auto-import tcldebugger-1.4-1.20061030cvs on branch devel from tcldebugger-1.4-1.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tcldebugger/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 23:35:07 -0000	1.1
+++ import.log	25 Nov 2006 23:36:00 -0000	1.2
@@ -0,0 +1 @@
+tcldebugger-1_4-1_20061030cvs:HEAD:tcldebugger-1.4-1.20061030cvs.src.rpm:1164497833



From fedora-extras-commits at redhat.com  Sat Nov 25 23:38:34 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:38:34 -0500
Subject: owners owners.list,1.2013,1.2014
Message-ID: <200611252338.kAPNcYxJ016409@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16394

Modified Files:
	owners.list 
Log Message:
Added tclchecker, tcldebugger, and tclparser




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2013
retrieving revision 1.2014
diff -u -r1.2013 -r1.2014
--- owners.list	25 Nov 2006 22:25:16 -0000	1.2013
+++ owners.list	25 Nov 2006 23:38:04 -0000	1.2014
@@ -2266,10 +2266,13 @@
 Fedora Extras|tbcload|Tcl bytecode loader|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|tclchecker|Tcl syntax checker|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclcompiler|Tcl bytecode compiler|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tcldebugger|Tcl debugging library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tclparser|Tcl syntax parser|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclsoap|Tcl commands for SOAP remote procedure calls|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcltls|OpenSSL extension for Tcl|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Nov 25 23:48:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:48:51 -0500
Subject: rpms/tclpro - New directory
Message-ID: <200611252348.kAPNmpW3016496@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16492/tclpro

Log Message:
Directory /cvs/extras/rpms/tclpro added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:48:57 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:48:57 -0500
Subject: rpms/tclpro/devel - New directory
Message-ID: <200611252348.kAPNmvsO016509@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16492/tclpro/devel

Log Message:
Directory /cvs/extras/rpms/tclpro/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Nov 25 23:49:09 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:49:09 -0500
Subject: rpms/tclpro Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611252349.kAPNn9Ws016539@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16533

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclpro


--- NEW FILE Makefile ---
# Top level Makefile for module tclpro
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  Sat Nov 25 23:49:14 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:49:14 -0500
Subject: rpms/tclpro/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611252349.kAPNnEFl016554@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16533/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclpro


--- 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  Sat Nov 25 23:50:53 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:50:53 -0500
Subject: rpms/tclpro import.log,1.1,1.2
Message-ID: <200611252350.kAPNor0C016708@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16654

Modified Files:
	import.log 
Log Message:
auto-import tclpro-1.5.0-6.20061030cvs on branch devel from tclpro-1.5.0-6.20061030cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclpro/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Nov 2006 23:49:09 -0000	1.1
+++ import.log	25 Nov 2006 23:50:23 -0000	1.2
@@ -0,0 +1 @@
+tclpro-1_5_0-6_20061030cvs:HEAD:tclpro-1.5.0-6.20061030cvs.src.rpm:1164498698



From fedora-extras-commits at redhat.com  Sat Nov 25 23:50:54 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 18:50:54 -0500
Subject: rpms/tclpro/devel procomp_pkgIndex.tcl, NONE, 1.1 prodebug.png, NONE,
	1.1 tclpro-1.5.0-about.patch, NONE,
	1.1 tclpro-1.5.0-helpurl.patch, NONE,
	1.1 tclpro-1.5.0-tclm4cvs.patch, NONE,
	1.1 tclpro-checker-startup.patch, NONE,
	1.1 tclpro-compiler-package.patch, NONE,
	1.1 tclpro-compiler-startup.patch, NONE,
	1.1 tclpro-projectInfo.patch, NONE, 1.1 tclpro.desktop, NONE,
	1.1 tclpro.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611252350.kAPNosdd016712@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclpro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16654/devel

Modified Files:
	.cvsignore sources 
Added Files:
	procomp_pkgIndex.tcl prodebug.png tclpro-1.5.0-about.patch 
	tclpro-1.5.0-helpurl.patch tclpro-1.5.0-tclm4cvs.patch 
	tclpro-checker-startup.patch tclpro-compiler-package.patch 
	tclpro-compiler-startup.patch tclpro-projectInfo.patch 
	tclpro.desktop tclpro.spec 
Log Message:
auto-import tclpro-1.5.0-6.20061030cvs on branch devel from tclpro-1.5.0-6.20061030cvs.src.rpm


--- NEW FILE procomp_pkgIndex.tcl ---
package ifneeded procomp 1.0 [list source [file join $dir procomp.tcl]]

tclpro-1.5.0-about.patch:

--- NEW FILE tclpro-1.5.0-about.patch ---
--- modules/debugger/src/startup.tcl.orig	2006-11-01 15:41:10.000000000 -0800
+++ modules/debugger/src/startup.tcl	2006-11-01 21:38:34.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #	This file is the primary entry point for the 
@@ -11,11 +15,13 @@
 # Initialize the debugger library
 
 package require projectInfo
+  
+set imageDir @imagedir@
 
 # Specify the additional debugger parameters.
 
 set parameters [list \
-	aboutCmd {::TclProAboutBox images/about.gif images/logo.gif} \
+	aboutCmd "::TclProAboutBox $imageDir/images/about.gif $imageDir/images/logo.gif" \
 	aboutCopyright "$::projectInfo::copyright\nVersion $::projectInfo::patchLevel" \
 	appType local \
 	]
@@ -24,7 +30,7 @@
     package require Winico
     lappend parameters iconImage [winico load dbg scicons.dll]
 } else {
-    lappend parameters iconImage images/debugUnixIcon.gif
+    lappend parameters iconImage $imageDir/images/debugUnixIcon.gif
 }
 
 # ::TclProAboutBox --
@@ -73,23 +79,17 @@
     set f2 [frame $f1.f2 -bg white -bd 0]
     pack $f2 -padx 6 -pady 6 -side bottom -fill both -expand 1
 
-    label $f2.logo -bd 0 -bg white -padx 0 -pady 0 -highlightthickness 0 \
-	    -image logo
-    pack $f2.logo -side left -anchor nw -padx 0 -pady 0
-
-if {0} {
-    # No room for this
     set okBut [button $f2.ok -text "OK" -width 6 -default active \
 	    -command {destroy .about}]
-    pack $okBut -side right -anchor se -padx 0 -pady 0
-}
+    pack $okBut -side left -anchor nw -padx 0 -pady 0
 
     label $f2.version -bd 0 -bg white -padx 10 -pady 0 -highlightthickness 0 \
-	    -text $::debugger::parameters(aboutCopyright) -justify left
+	    -text $::debugger::parameters(aboutCopyright) -justify left \
+            -wraplength 400
     pack $f2.version -side top -anchor nw
 
     label $f2.url -bd 0 -bg white -padx 10 -pady 0 -highlightthickness 0 \
-	    -text "http://www.ajubasolutions.com" -fg blue \
+	    -text "http://tclpro.sourceforge.net" -fg blue \
 	    -cursor hand2
     pack $f2.url -side top -anchor nw
 

tclpro-1.5.0-helpurl.patch:

--- NEW FILE tclpro-1.5.0-helpurl.patch ---
--- modules/projectInfo/projectInfo.tcl.orig	2006-11-01 16:10:57.000000000 -0800
+++ modules/projectInfo/projectInfo.tcl	2006-11-01 16:11:05.000000000 -0800
@@ -215,7 +215,7 @@
 	set helpFile(thisProduct) $tmp
     } else {
 	set helpFile(thisProduct) \
-		http://www.ajubasolutions.com/products/tclpro/doc/
+		http://tclpro.sourceforge.net
     }
 
     # By defining these variables the startup sequence will check licenses

tclpro-1.5.0-tclm4cvs.patch:

--- NEW FILE tclpro-1.5.0-tclm4cvs.patch ---
--- config/tcl.m4.orig	2006-11-01 12:17:21.000000000 -0800
+++ config/tcl.m4	2006-11-01 12:18:23.000000000 -0800
@@ -68,7 +68,10 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -161,7 +164,10 @@
 	    fi
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		        `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` ; do
 		    if test -f "$i/tkConfig.sh" ; then
@@ -588,7 +594,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -1580,7 +1586,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`

tclpro-checker-startup.patch:

--- NEW FILE tclpro-checker-startup.patch ---
--- modules/checker/src/startup.tcl.orig	2006-11-01 21:37:22.000000000 -0800
+++ modules/checker/src/startup.tcl	2006-11-01 21:38:46.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #	This file is the primary entry point for the 

tclpro-compiler-package.patch:

--- NEW FILE tclpro-compiler-package.patch ---
Index: modules/compiler/src/procomp.tcl
===================================================================
RCS file: /cvsroot/tclpro/tclpro/modules/compiler/src/procomp.tcl,v
retrieving revision 1.4
diff -c -r1.4 procomp.tcl
*** modules/compiler/src/procomp.tcl	8 Feb 2001 21:40:55 -0000	1.4
--- modules/compiler/src/procomp.tcl	29 Nov 2005 19:41:41 -0000
***************
*** 20,25 ****
--- 20,26 ----
  
  package require Tcl 8.0
  package require compiler 1.0
+ package require cmdline
  
  package provide procomp 1.0
  

tclpro-compiler-startup.patch:

--- NEW FILE tclpro-compiler-startup.patch ---
--- modules/compiler/src/startup.tcl.orig	2006-11-01 21:39:11.000000000 -0800
+++ modules/compiler/src/startup.tcl	2006-11-01 21:39:38.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec wish "$0" ${1+"$@"}
+
 # startup.tcl --
 #
 #  Startup script for the TclPro bytecode compiler.

tclpro-projectInfo.patch:

--- NEW FILE tclpro-projectInfo.patch ---
Index: modules/projectInfo/Makefile.in
===================================================================
RCS file: /cvsroot/tclpro/tclpro/modules/projectInfo/Makefile.in,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile.in
*** modules/projectInfo/Makefile.in	23 Nov 1999 22:04:18 -0000	1.1.1.1
--- modules/projectInfo/Makefile.in	29 Nov 2005 01:13:02 -0000
***************
*** 29,35 ****
  exec_prefix = @exec_prefix@
  bindir = @bindir@
  
! pkglibdir = ${prefix}/lib/@PACKAGE@@VERSION@
  
  top_builddir = .
  
--- 29,35 ----
  exec_prefix = @exec_prefix@
  bindir = @bindir@
  
! pkgdatadir = @datadir@/@PACKAGE@@VERSION@
  
  top_builddir = .
  
***************
*** 70,85 ****
  install-binaries:
  
  install-libraries: installdirs
! 	@echo "Installing script files in $(pkglibdir)"
  	@for i in $(PROJECTINFO_SOURCES) ; do \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$i $(pkglibdir) ; \
  	done;
! 	$(INSTALL_SCRIPT) $(PKGINDEX_TCL) $(pkglibdir)
  
  install-doc:
  
  installdirs:
! 	$(mkinstalldirs) $(pkglibdir)
  
  clean:  
  	-test -z "$(BINARIES)" || rm -f $(BINARIES)
--- 70,85 ----
  install-binaries:
  
  install-libraries: installdirs
! 	@echo "Installing script files in $(DESTDIR)$(pkgdatadir)"
  	@for i in $(PROJECTINFO_SOURCES) ; do \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir) ; \
  	done;
! 	$(INSTALL_SCRIPT) $(PKGINDEX_TCL) $(DESTDIR)$(pkgdatadir)
  
  install-doc:
  
  installdirs:
! 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
  
  clean:  
  	-test -z "$(BINARIES)" || rm -f $(BINARIES)


--- NEW FILE tclpro.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=TclPro Debugger
GenericName=TclPro Debugger
Comment=Graphical debugger for Tcl applications
Exec=prodebug
Icon=prodebug.png
Terminal=false
Type=Application
Categories=Application;Programming;Development;
Version=1.5.0


--- NEW FILE tclpro.spec ---
%define cvsdate 20061030

Summary: Development and debugging tools for Tcl applications
Name: tclpro
Version: 1.5.0
Release: 6.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Tools
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tclpro-20061030cvs tbcload
# tar czf tclpro-20061030cvs.tgz ./tclpro-20061030cvs
Source0: tclpro-%{cvsdate}cvs.tgz
Source1: tclpro.desktop
Source2: prodebug.png
Source3: procomp_pkgIndex.tcl
Patch0: tclpro-projectInfo.patch
Patch1: tclpro-checker-startup.patch
Patch2: tclpro-compiler-startup.patch
Patch3: tclpro-compiler-package.patch
Patch4: tclpro-1.5.0-tclm4cvs.patch
Patch5: tclpro-1.5.0-about.patch
Patch6: tclpro-1.5.0-helpurl.patch
URL: http://tclpro.sourceforge.net/
Requires: tk >= 0:8.3.2 tcllib tclcompiler tcldebugger tclchecker
BuildRequires: tcl-devel autoconf
BuildRequires: desktop-file-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch

%description
The TclPro tool set includes a graphical debugger, a static code checker,
a compiler that writes out Tcl byte codes, and a loader that reads
byte codes.

%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6

for i in debugger checker projectInfo compiler ; do 
    pushd modules/$i
    autoconf
    popd
done

%build
pushd modules/projectInfo
%configure
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd modules/projectInfo
make install DESTDIR=$RPM_BUILD_ROOT
popd
mkdir -p $RPM_BUILD_ROOT%{_bindir}
sed -e 's#@imagedir@#%{_datadir}/tcldebugger1.4#' < modules/debugger/src/startup.tcl > $RPM_BUILD_ROOT/%{_bindir}/prodebug
chmod 755 $RPM_BUILD_ROOT/%{_bindir}/prodebug
install -m 755 modules/checker/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procheck
install -m 755 modules/compiler/src/startup.tcl $RPM_BUILD_ROOT/%{_bindir}/procompile

# The Tcl compiler application needs an extra file/package to run.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/procomp1.5
install -m 644 %{SOURCE3} modules/compiler/src/procomp.tcl $RPM_BUILD_ROOT/%{_datadir}/procomp1.5/

# Fix a few file permissions for rpmlint
chmod a-x $RPM_BUILD_ROOT%{_datadir}/projectInfo1.4/*.tcl


desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%doc ChangeLog
%defattr(-,root,root)
%{_bindir}/procheck
%{_bindir}/prodebug
%{_bindir}/procompile
%{_datadir}/procomp1.5
%{_datadir}/projectInfo1.4
%{_datadir}/applications/fedora-tclpro.desktop
%{_datadir}/pixmaps/prodebug.png

%changelog
* Tue Oct 31 2006 Wart  1.5.0-6.20061030cvs
- Initial package for Fedora

* Mon Jul 10 2006 Wart  1.5.0-5.1
- Clean up a few rpmlint warnings

* Tue Mar 28 2006 Wart  1.5.0-5
- Update tcl.m4 to fix quoting bug exposed in Fedora Core 5

* Mon Dec 5 2005 Wart  1.5.0-3
- Replace older tk* commands with proper tk::* namespaced commands.

* Mon Nov 28 2005 Wart  1.5.0-2
- Added the TclPro compiler.

* Sun Nov 27 2005 Wart  1.5.0-1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclpro/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 23:49:14 -0000	1.1
+++ .cvsignore	25 Nov 2006 23:50:24 -0000	1.2
@@ -0,0 +1 @@
+tclpro-20061030cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclpro/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 23:49:14 -0000	1.1
+++ sources	25 Nov 2006 23:50:24 -0000	1.2
@@ -0,0 +1 @@
+16eae8daa867effb355a6daaf7f2d2c6  tclpro-20061030cvs.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 01:24:28 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 25 Nov 2006 20:24:28 -0500
Subject: owners owners.list,1.2014,1.2015
Message-ID: <200611260124.kAQ1OSld023022@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23005

Modified Files:
	owners.list 
Log Message:
Added tclpro




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2014
retrieving revision 1.2015
diff -u -r1.2014 -r1.2015
--- owners.list	25 Nov 2006 23:38:04 -0000	1.2014
+++ owners.list	26 Nov 2006 01:23:58 -0000	1.2015
@@ -2273,6 +2273,7 @@
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclparser|Tcl syntax parser|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tclpro|Development and debugging tools for Tcl applications|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclsoap|Tcl commands for SOAP remote procedure calls|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcltls|OpenSSL extension for Tcl|sander at hoentjen.eu|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 04:56:36 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:56:36 -0500
Subject: rpms/clipsmm - New directory
Message-ID: <200611260456.kAQ4uavT000432@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv428/clipsmm

Log Message:
Directory /cvs/extras/rpms/clipsmm added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 04:56:42 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:56:42 -0500
Subject: rpms/clipsmm/devel - New directory
Message-ID: <200611260456.kAQ4ugum000445@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv428/clipsmm/devel

Log Message:
Directory /cvs/extras/rpms/clipsmm/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 04:56:51 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:56:51 -0500
Subject: rpms/clipsmm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611260456.kAQ4up69000475@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv469

Added Files:
	Makefile import.log 
Log Message:
Setup of module clipsmm


--- NEW FILE Makefile ---
# Top level Makefile for module clipsmm
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 Nov 26 04:56:56 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:56:56 -0500
Subject: rpms/clipsmm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611260456.kAQ4uukN000490@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv469/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clipsmm


--- 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 Nov 26 04:57:50 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:57:50 -0500
Subject: rpms/clipsmm import.log,1.1,1.2
Message-ID: <200611260457.kAQ4voqe000559@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv529

Modified Files:
	import.log 
Log Message:
auto-import clipsmm-0.0.7-1 on branch devel from clipsmm-0.0.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clipsmm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 04:56:50 -0000	1.1
+++ import.log	26 Nov 2006 04:57:20 -0000	1.2
@@ -0,0 +1 @@
+clipsmm-0_0_7-1:HEAD:clipsmm-0.0.7-1.src.rpm:1164517121



From fedora-extras-commits at redhat.com  Sun Nov 26 04:57:50 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sat, 25 Nov 2006 23:57:50 -0500
Subject: rpms/clipsmm/devel clipsmm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611260457.kAQ4vofK000563@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/clipsmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv529/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clipsmm.spec 
Log Message:
auto-import clipsmm-0.0.7-1 on branch devel from clipsmm-0.0.7-1.src.rpm


--- NEW FILE clipsmm.spec ---

Summary:          Clipsmm is a C++ wrapper for the CLIPS C library
Name:             clipsmm
Version:          0.0.7
Release:          1%{?dist}
License:          GPL
URL:              http://clipsmm.sourceforge.net
Group:            System Environment/Libraries
Source:           http://download.sourceforge.net/clipsmm/clipsmm-0.0.7.tar.bz2
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    clips-devel >= 6.24 glibmm24-devel >= 2.6.0 cppunit-devel >= 1.11 pkgconfig m4

%description
The clipsmm library provides a C++ interface to the CLIPS C library.

%package          devel
Summary:          Headers for developing programs that will use clipsmm
Group:            Development/Libraries
Requires:         clipsmm = %{version}-%{release}
Requires:         clips-devel >= 6.24 glibmm24-devel >= 2.6.0 pkgconfig

%description    devel
This package contains the libraries and header files needed for
developing clipsmm applications.

%prep
%setup -q

%build
%configure --enable-static=no
%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}

%{__make} DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
# Copy the docs into a different place in the dist hierarchy so they
# install as /usr/share/doc/package-x.x.x-devel/reference
%{__cp} -ar docs/reference .

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
%doc AUTHORS COPYING

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_libdir}/pkgconfig/clipsmm*.pc
%{_includedir}/clipsmm-0.0/
%doc ChangeLog reference


%changelog
* Sun Nov 12 2006 Rick L Vinyard Jr  - 0.0.7-1
- New release

* Sun Aug  6 2006 Rick L Vinyard Jr  - 0.0.6-1
- New release
- Added m4 to BuildRequires

* Mon Jul 31 2006 Rick L Vinyard Jr  - 0.0.5-1
- New release fixes autoconf generated headers
- Removed pkgconfig from BuildRequires
- Added pkgconfig to -devel Requires

* Sun Jul 30 2006 Rick L Vinyard Jr  - 0.0.4-2
- Changed make to %%{__make}
- Changed %%{name} to autoconf subst that puts specific name in devel requires
- Added comment regarding why cp occurs for docs
- Added package name to globs in so libs, .pc and demos
- Changed clips-libs BuildRequires to clips-devel
- Added cppunit-devel BuildRequires

* Sat Jul 29 2006 Rick L Vinyard Jr  - 0.0.4-1
- New release

* Sat Jul 21 2006 Rick L Vinyard Jr  - 0.0.3-1
- New release

* Sat Jul 20 2006 Rick L Vinyard Jr  - 0.0.2-1
- New release

* Sun Jun 25 2006 Rick L Vinyard Jr  - 0.0.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clipsmm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 04:56:56 -0000	1.1
+++ .cvsignore	26 Nov 2006 04:57:20 -0000	1.2
@@ -0,0 +1 @@
+clipsmm-0.0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clipsmm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 04:56:56 -0000	1.1
+++ sources	26 Nov 2006 04:57:20 -0000	1.2
@@ -0,0 +1 @@
+462cad31023799926ab67f78b628e719  clipsmm-0.0.7.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 05:00:32 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard, Jr. (rvinyard))
Date: Sun, 26 Nov 2006 00:00:32 -0500
Subject: owners owners.list,1.2015,1.2016
Message-ID: <200611260500.kAQ50WHR000637@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv613

Modified Files:
	owners.list 
Log Message:
Added clipsmm




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2015
retrieving revision 1.2016
diff -u -r1.2015 -r1.2016
--- owners.list	26 Nov 2006 01:23:58 -0000	1.2015
+++ owners.list	26 Nov 2006 05:00:02 -0000	1.2016
@@ -207,6 +207,7 @@
 Fedora Extras|clearsilver|HTML template system|joost.soeterbroek at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|clement|An application to filter and manage E-mail traffic|jmp at safe.ca|extras-qa at fedoraproject.org|
 Fedora Extras|clips|CLIPS language for expert systems|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
+Fedora Extras|clipsmm|Clipsmm is a C++ wrapper for the CLIPS C library|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|clusterssh|Secure concurrent multi-server terminal control|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 06:52:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 26 Nov 2006 01:52:47 -0500
Subject: fedora-security/audit fe3, 1.33, 1.34 fe4, 1.100, 1.101 fe5, 1.108, 
	1.109 fe6, 1.24, 1.25
Message-ID: <200611260652.kAQ6ql3W006949@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6928

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
kile was fixed


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fe3	25 Nov 2006 15:31:44 -0000	1.33
+++ fe3	26 Nov 2006 06:52:47 -0000	1.34
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
+CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
 CVE-2006-5602 VULNERABLE (xsupplicant) #212699


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- fe4	25 Nov 2006 15:31:44 -0000	1.100
+++ fe4	26 Nov 2006 06:52:47 -0000	1.101
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
+CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fe5	25 Nov 2006 15:31:44 -0000	1.108
+++ fe5	26 Nov 2006 06:52:47 -0000	1.109
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
+CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fe6	25 Nov 2006 15:31:44 -0000	1.24
+++ fe6	26 Nov 2006 06:52:47 -0000	1.25
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6085 VULNERABLE (kile, fixed 1.9.3) #217238
+CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077



From fedora-extras-commits at redhat.com  Sun Nov 26 09:59:29 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 04:59:29 -0500
Subject: rpms/mlmmj/devel .cvsignore, 1.9, 1.10 mlmmj.spec, 1.24,
	1.25 sources, 1.9, 1.10
Message-ID: <200611260959.kAQ9xT9q004577@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4556

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  1.2.12-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Jan 2006 22:42:20 -0000	1.9
+++ .cvsignore	26 Nov 2006 09:58:59 -0000	1.10
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mlmmj.spec	3 Sep 2006 06:24:32 -0000	1.24
+++ mlmmj.spec	26 Nov 2006 09:58:59 -0000	1.25
@@ -2,8 +2,8 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
-Release: 5%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  1.2.12-1
+- New upstream release
+
 * Sun Sep 3 2006 Michael Fleming  1.2.11-5
 - Rebuild 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jan 2006 22:42:20 -0000	1.9
+++ sources	26 Nov 2006 09:58:59 -0000	1.10
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 10:02:39 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:02:39 -0500
Subject: rpms/mlmmj/FC-6 .cvsignore, 1.9, 1.10 mlmmj.spec, 1.24, 1.25 sources,
	1.9, 1.10
Message-ID: <200611261002.kAQA2dE8007670@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7647

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  1.2.12-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Jan 2006 22:42:20 -0000	1.9
+++ .cvsignore	26 Nov 2006 10:02:09 -0000	1.10
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-6/mlmmj.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mlmmj.spec	3 Sep 2006 06:24:32 -0000	1.24
+++ mlmmj.spec	26 Nov 2006 10:02:09 -0000	1.25
@@ -2,8 +2,8 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
-Release: 5%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  1.2.12-1
+- New upstream release
+
 * Sun Sep 3 2006 Michael Fleming  1.2.11-5
 - Rebuild 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jan 2006 22:42:20 -0000	1.9
+++ sources	26 Nov 2006 10:02:09 -0000	1.10
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 10:05:17 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:05:17 -0500
Subject: rpms/mlmmj/FC-5 .cvsignore, 1.9, 1.10 mlmmj.spec, 1.22, 1.23 sources,
	1.9, 1.10
Message-ID: <200611261005.kAQA5HtC007739@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7720

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  1.2.12-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Jan 2006 22:42:20 -0000	1.9
+++ .cvsignore	26 Nov 2006 10:04:47 -0000	1.10
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-5/mlmmj.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mlmmj.spec	17 Mar 2006 23:33:43 -0000	1.22
+++ mlmmj.spec	26 Nov 2006 10:04:47 -0000	1.23
@@ -2,8 +2,8 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
-Release: 4%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  1.2.12-1
+- New upstream release.
+
 * Sat Mar 18 2006 Michael Fleming  1.2.11-4
 - Bump for FC5 final. Really
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jan 2006 22:42:20 -0000	1.9
+++ sources	26 Nov 2006 10:04:47 -0000	1.10
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 10:14:36 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:14:36 -0500
Subject: rpms/mod_cband/devel .cvsignore, 1.4, 1.5 mod_cband.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611261014.kAQAEaZs007859@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_cband/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7840

Modified Files:
	.cvsignore mod_cband.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 May 2006 09:02:51 -0000	1.4
+++ .cvsignore	26 Nov 2006 10:14:06 -0000	1.5
@@ -1 +1 @@
-mod-cband-0.9.7.4.tgz
+mod-cband-0.9.7.5.tgz


Index: mod_cband.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/devel/mod_cband.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_cband.spec	3 Sep 2006 06:29:42 -0000	1.5
+++ mod_cband.spec	26 Nov 2006 10:14:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           mod_cband
-Version:        0.9.7.4
-Release:        2%{?dist}
+Version:        0.9.7.5
+Release:        1%{?dist}
 Summary:        Bandwidth limiting for virtual hosts
 Group:          System Environment/Daemons
 License:        GPL
@@ -42,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
+- New upstream release.
+
 * Sun Sep 3 2006 Michael Fleming  0.9.7.4-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 09:02:51 -0000	1.5
+++ sources	26 Nov 2006 10:14:06 -0000	1.6
@@ -1 +1 @@
-ff635d7b55bf7ca648d319247dfb45e3  mod-cband-0.9.7.4.tgz
+5c5d65dc9abe6cdc6931b6dd33be5018  mod-cband-0.9.7.5.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 10:16:40 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:16:40 -0500
Subject: rpms/mod_cband/FC-6 .cvsignore, 1.4, 1.5 mod_cband.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200611261016.kAQAGeBZ007941@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_cband/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7916

Modified Files:
	.cvsignore mod_cband.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 May 2006 09:02:51 -0000	1.4
+++ .cvsignore	26 Nov 2006 10:16:10 -0000	1.5
@@ -1 +1 @@
-mod-cband-0.9.7.4.tgz
+mod-cband-0.9.7.5.tgz


Index: mod_cband.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-6/mod_cband.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_cband.spec	3 Sep 2006 06:29:42 -0000	1.5
+++ mod_cband.spec	26 Nov 2006 10:16:10 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           mod_cband
-Version:        0.9.7.4
-Release:        2%{?dist}
+Version:        0.9.7.5
+Release:        1%{?dist}
 Summary:        Bandwidth limiting for virtual hosts
 Group:          System Environment/Daemons
 License:        GPL
@@ -42,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
+- New upstream release.
+
 * Sun Sep 3 2006 Michael Fleming  0.9.7.4-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 May 2006 09:02:51 -0000	1.5
+++ sources	26 Nov 2006 10:16:10 -0000	1.6
@@ -1 +1 @@
-ff635d7b55bf7ca648d319247dfb45e3  mod-cband-0.9.7.4.tgz
+5c5d65dc9abe6cdc6931b6dd33be5018  mod-cband-0.9.7.5.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 10:17:42 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 26 Nov 2006 05:17:42 -0500
Subject: rpms/testdisk/devel testdisk.spec,1.8,1.9
Message-ID: <200611261017.kAQAHgTX007996@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7938

Modified Files:
	testdisk.spec 
Log Message:
Updated spec file to build TestDisk against ntfsprogs (BUG 217261)



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testdisk.spec	24 Oct 2006 06:27:17 -0000	1.8
+++ testdisk.spec	26 Nov 2006 10:17:12 -0000	1.9
@@ -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(pl):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
+Summary(fr):	Outil pour v??rifier et restorer des partitions
+Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:  ntfsprogs-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,18 +22,18 @@
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l pl
-Narz?dzie sprawdzaj?ce i odzyskujace partycje. Pracuje z partycjami:
+Narz??dzie sprawdzaj??ce i odzyskujace partycje. Pracuje z partycjami:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr
-Outil pour v?rifier et restorer des partitions. Fonctionne avec
+Outil pour v??rifier et restorer des partitions. Fonctionne avec
 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
-????????? ??? ???????? ? ?????????????? ???????? ?????.
-???????????? ????????? ???? ????????:
+?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
+???????????????????????? ?????????????????? ???????? ????????????????:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
@@ -57,6 +58,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Nov 26 2006 Christophe Grenier  6.5-2
+- Use ntfsprogs to provide NTFS listing capabilities to TestDisk
+
 * Tue Oct 24 2006 Christophe Grenier  6.5-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Sun Nov 26 10:20:16 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:20:16 -0500
Subject: rpms/mod_cband/FC-5 .cvsignore, 1.4, 1.5 mod_cband.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611261020.kAQAKGCO008071@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_cband/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8052

Modified Files:
	.cvsignore mod_cband.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2006 12:19:54 -0000	1.4
+++ .cvsignore	26 Nov 2006 10:19:46 -0000	1.5
@@ -1 +1 @@
-mod-cband-0.9.7.4.tgz
+mod-cband-0.9.7.5.tgz


Index: mod_cband.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-5/mod_cband.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_cband.spec	31 May 2006 12:19:54 -0000	1.4
+++ mod_cband.spec	26 Nov 2006 10:19:46 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           mod_cband
-Version:        0.9.7.4
+Version:        0.9.7.5
 Release:        1%{?dist}
 Summary:        Bandwidth limiting for virtual hosts
 Group:          System Environment/Daemons
@@ -42,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
+- New upstream release
+
 * Mon May 29 2006 Michael Fleming  0.9.7.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 May 2006 12:19:54 -0000	1.5
+++ sources	26 Nov 2006 10:19:46 -0000	1.6
@@ -1 +1 @@
-ff635d7b55bf7ca648d319247dfb45e3  mod-cband-0.9.7.4.tgz
+5c5d65dc9abe6cdc6931b6dd33be5018  mod-cband-0.9.7.5.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 10:26:16 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sun, 26 Nov 2006 05:26:16 -0500
Subject: rpms/mod_cband/FC-4 .cvsignore, 1.4, 1.5 mod_cband.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200611261026.kAQAQGda008145@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_cband/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8126

Modified Files:
	.cvsignore mod_cband.spec sources 
Log Message:
* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 May 2006 12:27:49 -0000	1.4
+++ .cvsignore	26 Nov 2006 10:25:46 -0000	1.5
@@ -1 +1 @@
-mod-cband-0.9.7.4.tgz
+mod-cband-0.9.7.5.tgz


Index: mod_cband.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-4/mod_cband.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_cband.spec	31 May 2006 12:27:49 -0000	1.4
+++ mod_cband.spec	26 Nov 2006 10:25:46 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           mod_cband
-Version:        0.9.7.4
+Version:        0.9.7.5
 Release:        1%{?dist}
 Summary:        Bandwidth limiting for virtual hosts
 Group:          System Environment/Daemons
@@ -42,6 +42,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf
 
 %changelog
+* Sun Nov 26 2006 Michael Fleming  0.9.7.5-1
+- New upstream release
+
 * Mon May 29 2006 Michael Fleming  0.9.7.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_cband/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 May 2006 12:27:49 -0000	1.5
+++ sources	26 Nov 2006 10:25:46 -0000	1.6
@@ -1 +1 @@
-ff635d7b55bf7ca648d319247dfb45e3  mod-cband-0.9.7.4.tgz
+5c5d65dc9abe6cdc6931b6dd33be5018  mod-cband-0.9.7.5.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 10:51:41 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 26 Nov 2006 05:51:41 -0500
Subject: rpms/testdisk/FC-5 testdisk.spec,1.8,1.9
Message-ID: <200611261051.kAQApfIT008268@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8233/FC-5

Modified Files:
	testdisk.spec 
Log Message:
Rebuild TestDisk with ntfsprogs to be able to list files from NTFS filesystem.



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-5/testdisk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testdisk.spec	24 Oct 2006 06:36:29 -0000	1.8
+++ testdisk.spec	26 Nov 2006 10:51:11 -0000	1.9
@@ -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(pl):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
+Summary(fr):	Outil pour v??rifier et restorer des partitions
+Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:  ntfsprogs-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,18 +22,18 @@
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l pl
-Narz?dzie sprawdzaj?ce i odzyskujace partycje. Pracuje z partycjami:
+Narz??dzie sprawdzaj??ce i odzyskujace partycje. Pracuje z partycjami:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr
-Outil pour v?rifier et restorer des partitions. Fonctionne avec
+Outil pour v??rifier et restorer des partitions. Fonctionne avec
 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
-????????? ??? ???????? ? ?????????????? ???????? ?????.
-???????????? ????????? ???? ????????:
+?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
+???????????????????????? ?????????????????? ???????? ????????????????:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
@@ -57,6 +58,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Nov 26 2006 Christophe Grenier  6.5-2
+- Use ntfsprogs to provide NTFS listing capabilities to TestDisk
+
 * Tue Oct 24 2006 Christophe Grenier  6.5-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Sun Nov 26 10:51:41 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 26 Nov 2006 05:51:41 -0500
Subject: rpms/testdisk/FC-6 testdisk.spec,1.8,1.9
Message-ID: <200611261051.kAQApf0a008271@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8233/FC-6

Modified Files:
	testdisk.spec 
Log Message:
Rebuild TestDisk with ntfsprogs to be able to list files from NTFS filesystem.



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-6/testdisk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testdisk.spec	24 Oct 2006 16:17:38 -0000	1.8
+++ testdisk.spec	26 Nov 2006 10:51:11 -0000	1.9
@@ -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(pl):	Narz??dzie sprawdzaj??ce i odzyskuj??ce partycje
+Summary(fr):	Outil pour v??rifier et restorer des partitions
+Summary(ru_RU.KOI8-R): ?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????
 Name:		testdisk
 Version:	6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -12,6 +12,7 @@
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:  ntfsprogs-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,18 +22,18 @@
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l pl
-Narz?dzie sprawdzaj?ce i odzyskujace partycje. Pracuje z partycjami:
+Narz??dzie sprawdzaj??ce i odzyskujace partycje. Pracuje z partycjami:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %description -l fr
-Outil pour v?rifier et restorer des partitions. Fonctionne avec
+Outil pour v??rifier et restorer des partitions. Fonctionne avec
 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
-????????? ??? ???????? ? ?????????????? ???????? ?????.
-???????????? ????????? ???? ????????:
+?????????????????? ?????? ???????????????? ?? ???????????????????????????? ???????????????? ??????????.
+???????????????????????? ?????????????????? ???????? ????????????????:
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
@@ -57,6 +58,9 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Tue Nov 26 2006 Christophe Grenier  6.5-2
+- Use ntfsprogs to provide NTFS listing capabilities to TestDisk
+
 * Tue Oct 24 2006 Christophe Grenier  6.5-1
 - Update to latest version
 



From fedora-extras-commits at redhat.com  Sun Nov 26 11:40:05 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:40:05 -0500
Subject: rpms/libtorrent/devel .cvsignore, 1.5, 1.6 libtorrent.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200611261140.kAQBe5oC011708@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11689

Modified Files:
	.cvsignore libtorrent.spec sources 
Log Message:
Upgrade to new version and work around compiler triggered bug


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Sep 2006 09:55:14 -0000	1.5
+++ .cvsignore	26 Nov 2006 11:39:35 -0000	1.6
@@ -1 +1 @@
-libtorrent-0.10.2.tar.gz
+libtorrent-0.10.4.tar.gz


Index: libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/libtorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libtorrent.spec	2 Oct 2006 21:18:48 -0000	1.12
+++ libtorrent.spec	26 Nov 2006 11:39:35 -0000	1.13
@@ -1,8 +1,8 @@
 Name:          libtorrent
 License:       GPL
 Group:         System Environment/Libraries
-Version:       0.10.2
-Release:       3%{?dist}
+Version:       0.10.4
+Release:       1%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -29,6 +29,12 @@
 %setup -q
 
 %build
+
+# work around a bug thats triggered by gcc 4.1
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export CFLAGS=$RPM_OPT_FLAGS
+export CXXFLAGS=$RPM_OPT_FLAGS
+
 %configure
 make %{?_smp_mflags}
 
@@ -46,7 +52,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README NEWS TODO
+%doc AUTHORS COPYING INSTALL README NEWS
 %{_libdir}/libtorrent.so.*
 
 %files devel
@@ -56,6 +62,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Nov 26 2006 Chris Chabot  - 0.10.4-1
+- New upstream version
+- Compile with -Os to work around a gcc 4.1 incompatibility
+
 * Mon Oct 02 2006 Chris Chabot  - 0.10.2-3
 - Bump EVR to fix broken upgrade path (BZ #208985)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2006 09:55:14 -0000	1.6
+++ sources	26 Nov 2006 11:39:35 -0000	1.7
@@ -1 +1 @@
-99f1daa0f6ce0aa8d53745c494df9b36  libtorrent-0.10.2.tar.gz
+3154a686d9616f04012596b8daa2ff52  libtorrent-0.10.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 11:41:16 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:41:16 -0500
Subject: rpms/libtorrent/FC-6 libtorrent.spec,1.12,1.13 sources,1.6,1.7
Message-ID: <200611261141.kAQBfGu4011731@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11714

Modified Files:
	libtorrent.spec sources 
Log Message:
Upgrade to new version and work around compiler triggered bug


Index: libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/FC-6/libtorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libtorrent.spec	2 Oct 2006 21:18:48 -0000	1.12
+++ libtorrent.spec	26 Nov 2006 11:40:46 -0000	1.13
@@ -1,8 +1,8 @@
 Name:          libtorrent
 License:       GPL
 Group:         System Environment/Libraries
-Version:       0.10.2
-Release:       3%{?dist}
+Version:       0.10.4
+Release:       1%{?dist}
 Summary:       BitTorrent library with a focus on high performance & good code
 URL:           http://libtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
@@ -29,6 +29,12 @@
 %setup -q
 
 %build
+
+# work around a bug thats triggered by gcc 4.1
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export CFLAGS=$RPM_OPT_FLAGS
+export CXXFLAGS=$RPM_OPT_FLAGS
+
 %configure
 make %{?_smp_mflags}
 
@@ -46,7 +52,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README NEWS TODO
+%doc AUTHORS COPYING INSTALL README NEWS
 %{_libdir}/libtorrent.so.*
 
 %files devel
@@ -56,6 +62,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Sun Nov 26 2006 Chris Chabot  - 0.10.4-1
+- New upstream version
+- Compile with -Os to work around a gcc 4.1 incompatibility
+
 * Mon Oct 02 2006 Chris Chabot  - 0.10.2-3
 - Bump EVR to fix broken upgrade path (BZ #208985)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2006 09:55:14 -0000	1.6
+++ sources	26 Nov 2006 11:40:46 -0000	1.7
@@ -1 +1 @@
-99f1daa0f6ce0aa8d53745c494df9b36  libtorrent-0.10.2.tar.gz
+3154a686d9616f04012596b8daa2ff52  libtorrent-0.10.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 11:47:13 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:47:13 -0500
Subject: rpms/rtorrent/devel .cvsignore, 1.6, 1.7 rtorrent.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200611261147.kAQBlDaT011847@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11828

Modified Files:
	.cvsignore rtorrent.spec sources 
Log Message:
New upstream version and work around a compiler bug


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Sep 2006 09:52:34 -0000	1.6
+++ .cvsignore	26 Nov 2006 11:46:43 -0000	1.7
@@ -1 +1,2 @@
-rtorrent-0.6.2.tar.gz
+rtorrent-0.6.4.tar.gz
+rtorrent.rc.example


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rtorrent.spec	6 Nov 2006 12:57:33 -0000	1.13
+++ rtorrent.spec	26 Nov 2006 11:46:43 -0000	1.14
@@ -1,15 +1,15 @@
 Name:          rtorrent
 License:       GPL
 Group:         Applications/Internet
-Version:       0.6.2
-Release:       5%{?dist}
+Version:       0.6.4
+Release:       1%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.0, curl-devel, ncurses-devel
-Requires:      libtorrent >= 0.10.0
+BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
+Requires:      libtorrent >= 0.10.4
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -22,6 +22,10 @@
 %setup -q
 
 %build
+# work around a bug thats triggered by gcc 4.1                                                           
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export CFLAGS=$RPM_OPT_FLAGS
+export CXXFLAGS=$RPM_OPT_FLAGS
 install -m 644 %{SOURCE1} .
 %configure
 make %{?_smp_mflags}
@@ -40,6 +44,10 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Sun Nov 26 2006 Chris Chabot  - 0.6.4-1
+- New upstream version
+- Compile with -Os to work around a gcc 4.1 incompatibility
+
 * Mon Nov 06 2006 Jindrich Novy  - 0.6.2-5
 - rebuild against new curl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2006 09:52:34 -0000	1.6
+++ sources	26 Nov 2006 11:46:43 -0000	1.7
@@ -1 +1,2 @@
-b199ca24ba4a5c0f59b587cd4fa11670  rtorrent-0.6.2.tar.gz
+9077817e5a0f505e0b71add9c57b89f7  rtorrent-0.6.4.tar.gz
+e362ef8649f0c015f894c29cb6c932be  rtorrent.rc.example



From fedora-extras-commits at redhat.com  Sun Nov 26 11:48:39 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:48:39 -0500
Subject: rpms/rtorrent/FC-6 rtorrent.spec,1.12,1.13 sources,1.6,1.7
Message-ID: <200611261148.kAQBmdao011906@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11889

Modified Files:
	rtorrent.spec sources 
Log Message:
New upstream version and work around a compiler bug


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/FC-6/rtorrent.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rtorrent.spec	29 Sep 2006 10:06:28 -0000	1.12
+++ rtorrent.spec	26 Nov 2006 11:48:09 -0000	1.13
@@ -1,15 +1,15 @@
 Name:          rtorrent
 License:       GPL
 Group:         Applications/Internet
-Version:       0.6.2
-Release:       4%{?dist}
+Version:       0.6.4
+Release:       1%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.0, curl-devel, ncurses-devel
-Requires:      libtorrent >= 0.10.0
+BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
+Requires:      libtorrent >= 0.10.4
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -22,6 +22,10 @@
 %setup -q
 
 %build
+# work around a bug thats triggered by gcc 4.1                                                           
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export CFLAGS=$RPM_OPT_FLAGS
+export CXXFLAGS=$RPM_OPT_FLAGS
 install -m 644 %{SOURCE1} .
 %configure
 make %{?_smp_mflags}
@@ -40,6 +44,13 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Sun Nov 26 2006 Chris Chabot  - 0.6.4-1
+- New upstream version
+- Compile with -Os to work around a gcc 4.1 incompatibility
+
+* Mon Nov 06 2006 Jindrich Novy  - 0.6.2-5
+- rebuild against new curl
+
 * Fri Sep 29 2006 Chris Chabot  - 0.6.2-4
 - re-tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Sep 2006 09:52:34 -0000	1.6
+++ sources	26 Nov 2006 11:48:09 -0000	1.7
@@ -1 +1,2 @@
-b199ca24ba4a5c0f59b587cd4fa11670  rtorrent-0.6.2.tar.gz
+9077817e5a0f505e0b71add9c57b89f7  rtorrent-0.6.4.tar.gz
+e362ef8649f0c015f894c29cb6c932be  rtorrent.rc.example



From fedora-extras-commits at redhat.com  Sun Nov 26 11:49:43 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 06:49:43 -0500
Subject: rpms/buoh/devel .cvsignore, 1.2, 1.3 buoh.spec, 1.18, 1.19 sources, 
	1.2, 1.3
Message-ID: <200611261149.kAQBnhF2011973@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11952

Modified Files:
	.cvsignore buoh.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Dec 2005 22:14:29 -0000	1.2
+++ .cvsignore	26 Nov 2006 11:49:13 -0000	1.3
@@ -1 +1 @@
-buoh-0.8.1.tar.gz
+buoh-0.8.2.tar.bz2


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- buoh.spec	21 Nov 2006 07:56:13 -0000	1.18
+++ buoh.spec	26 Nov 2006 11:49:13 -0000	1.19
@@ -76,7 +76,7 @@
 %{_datadir}/pixmaps/buoh*.png
 
 %changelog
-* Tue Nov 21 2006 Chris Chabot  - 0.8.2-1
+* Tue Nov 26 2006 Chris Chabot  - 0.8.2-1
 - New upstream version
 
 * Mon Sep 11 2006 Chris Chabot  - 0.8.1-13


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2005 22:14:29 -0000	1.2
+++ sources	26 Nov 2006 11:49:13 -0000	1.3
@@ -1 +1 @@
-5d05a51d7c6616d93e93df3465b49fe7  buoh-0.8.1.tar.gz
+50474a8712ad20ab36d8f8058a4647fb  buoh-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:01:15 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 26 Nov 2006 07:01:15 -0500
Subject: rpms/codeblocks/devel .cvsignore, 1.7, 1.8 codeblocks.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200611261201.kAQC1FPT015022@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11998

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3268
 - fixes #217081



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Nov 2006 19:30:14 -0000	1.7
+++ .cvsignore	26 Nov 2006 12:00:45 -0000	1.8
@@ -1 +1 @@
-codeblocks-svn3253.tar.bz2
+codeblocks-svn3268.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- codeblocks.spec	21 Nov 2006 19:30:14 -0000	1.6
+++ codeblocks.spec	26 Nov 2006 12:00:45 -0000	1.7
@@ -1,9 +1,9 @@
-%define		rev	3253
-%define		date	20061121
+%define		rev	3268
+%define		date	20061125
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.14.%{date}svn%{rev}%{?dist}
+Release:	0.15.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
+- update to revision 3268
+- fixes #217081
+
 * Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
 - update to revision 3253
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2006 19:30:14 -0000	1.7
+++ sources	26 Nov 2006 12:00:45 -0000	1.8
@@ -1 +1 @@
-1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2
+a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:02:53 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:02:53 -0500
Subject: rpms/buoh/devel buoh.spec,1.19,1.20
Message-ID: <200611261202.kAQC2rQv015068@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15041

Modified Files:
	buoh.spec 
Log Message:
Spec file fixups


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/devel/buoh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- buoh.spec	26 Nov 2006 11:49:13 -0000	1.19
+++ buoh.spec	26 Nov 2006 12:02:23 -0000	1.20
@@ -2,10 +2,10 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.2
-Release:          1
+Release:          2
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
-Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.bz2
+Source:           http://buoh.steve-o.org/downloads/buoh-%{version}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
 Requires(post):   GConf2
@@ -29,9 +29,6 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-/usr/bin/install -m 644 $RPM_BUILD_ROOT%{_datadir}/buoh/pixmaps/buoh*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-
 perl -pi -e "s,Terminal=0,Terminal=false,g" $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
 desktop-file-install --delete-original			\
   --vendor=fedora								\
@@ -46,6 +43,10 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/buoh.schemas > /dev/null  || :
 killall -HUP gconfd-2 &>/dev/null || :
+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
 if [ "$1" -gt 1 ]; then
@@ -53,6 +54,10 @@
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/buoh.schemas >/dev/null || :
   killall -HUP gconfd-2 &>/dev/null || :
 fi
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -72,10 +77,13 @@
 %{_datadir}/applications/fedora-buoh.desktop
 %{_datadir}/buoh/comics/comics.xml
 %{_datadir}/buoh/ui/buoh-ui.xml
-%{_datadir}/buoh/pixmaps/buoh*.png
-%{_datadir}/pixmaps/buoh*.png
+%{_datadir}/icons/hicolor/64x64/apps/buoh.png
+%{_datadir}/icons/hicolor/16x16/apps/buoh.png
 
 %changelog
+* Tue Nov 26 2006 Chris Chabot  - 0.8.2-2
+- fixed spec file glitch
+
 * Tue Nov 26 2006 Chris Chabot  - 0.8.2-1
 - New upstream version
 



From fedora-extras-commits at redhat.com  Sun Nov 26 12:04:04 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:04:04 -0500
Subject: rpms/buoh/FC-6 buoh.spec,1.18,1.19 sources,1.3,1.4
Message-ID: <200611261204.kAQC446v015185@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15148

Modified Files:
	buoh.spec sources 
Log Message:
new upstream version


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/buoh.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- buoh.spec	21 Nov 2006 07:54:16 -0000	1.18
+++ buoh.spec	26 Nov 2006 12:03:34 -0000	1.19
@@ -2,10 +2,10 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.2
-Release:          1
+Release:          2
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
-Source:           http://buoh.steve-o.org/downloads/buoh-0.8.1.tar.bz2
+Source:           http://buoh.steve-o.org/downloads/buoh-%{version}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    desktop-file-utils,perl, perl-XML-Parser, gettext, gtk2-devel, libsoup-devel, libgnomeui-devel, GConf2-devel
 Requires(post):   GConf2
@@ -29,9 +29,6 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-/usr/bin/install -m 644 $RPM_BUILD_ROOT%{_datadir}/buoh/pixmaps/buoh*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-
 perl -pi -e "s,Terminal=0,Terminal=false,g" $RPM_BUILD_ROOT%{_datadir}/applications/buoh.desktop
 desktop-file-install --delete-original			\
   --vendor=fedora								\
@@ -46,6 +43,10 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/buoh.schemas > /dev/null  || :
 killall -HUP gconfd-2 &>/dev/null || :
+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
 if [ "$1" -gt 1 ]; then
@@ -53,6 +54,10 @@
   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/buoh.schemas >/dev/null || :
   killall -HUP gconfd-2 &>/dev/null || :
 fi
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -72,11 +77,14 @@
 %{_datadir}/applications/fedora-buoh.desktop
 %{_datadir}/buoh/comics/comics.xml
 %{_datadir}/buoh/ui/buoh-ui.xml
-%{_datadir}/buoh/pixmaps/buoh*.png
-%{_datadir}/pixmaps/buoh*.png
+%{_datadir}/icons/hicolor/64x64/apps/buoh.png
+%{_datadir}/icons/hicolor/16x16/apps/buoh.png
 
 %changelog
-* Tue Nov 21 2006 Chris Chabot  - 0.8.2-1
+* Tue Nov 26 2006 Chris Chabot  - 0.8.2-2
+- fixed spec file glitch
+
+* Tue Nov 26 2006 Chris Chabot  - 0.8.2-1
 - New upstream version
 
 * Mon Sep 11 2006 Chris Chabot  - 0.8.1-13


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2006 07:54:16 -0000	1.3
+++ sources	26 Nov 2006 12:03:34 -0000	1.4
@@ -0,0 +1 @@
+50474a8712ad20ab36d8f8058a4647fb  buoh-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:05:36 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 26 Nov 2006 07:05:36 -0500
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.7, 1.8 codeblocks.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200611261205.kAQC5aiA015253@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15226

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3268
 - fixes #217081



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Nov 2006 19:32:26 -0000	1.7
+++ .cvsignore	26 Nov 2006 12:05:06 -0000	1.8
@@ -1 +1 @@
-codeblocks-svn3253.tar.bz2
+codeblocks-svn3268.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- codeblocks.spec	21 Nov 2006 19:32:26 -0000	1.6
+++ codeblocks.spec	26 Nov 2006 12:05:06 -0000	1.7
@@ -1,9 +1,9 @@
-%define		rev	3253
-%define		date	20061121
+%define		rev	3268
+%define		date	20061125
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.14.%{date}svn%{rev}%{?dist}
+Release:	0.15.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
+- update to revision 3268
+- fixes #217081
+
 * Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
 - update to revision 3253
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2006 19:32:26 -0000	1.7
+++ sources	26 Nov 2006 12:05:06 -0000	1.8
@@ -1 +1 @@
-1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2
+a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:06:07 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:06:07 -0500
Subject: rpms/buoh/FC-6 buoh.spec,1.19,1.20
Message-ID: <200611261206.kAQC672d015278@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/buoh/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15250

Modified Files:
	buoh.spec 
Log Message:
fix specfile glitch


Index: buoh.spec
===================================================================
RCS file: /cvs/extras/rpms/buoh/FC-6/buoh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- buoh.spec	26 Nov 2006 12:03:34 -0000	1.19
+++ buoh.spec	26 Nov 2006 12:05:37 -0000	1.20
@@ -2,7 +2,7 @@
 License:          GPL
 Group:            Applications/Internet
 Version:          0.8.2
-Release:          2
+Release:          2%{?dist}
 Summary:          Online comics reader
 URL:              http://buoh.steve-o.org/
 Source:           http://buoh.steve-o.org/downloads/buoh-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:09:47 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sun, 26 Nov 2006 07:09:47 -0500
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.7, 1.8 codeblocks.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200611261209.kAQC9lmC015406@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15342

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3268
 - fixes #217081



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Nov 2006 19:37:50 -0000	1.7
+++ .cvsignore	26 Nov 2006 12:09:17 -0000	1.8
@@ -1 +1 @@
-codeblocks-svn3253.tar.bz2
+codeblocks-svn3268.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- codeblocks.spec	21 Nov 2006 19:37:50 -0000	1.6
+++ codeblocks.spec	26 Nov 2006 12:09:17 -0000	1.7
@@ -1,9 +1,9 @@
-%define		rev	3253
-%define		date	20061121
+%define		rev	3268
+%define		date	20061125
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.14.%{date}svn%{rev}%{?dist}
+Release:	0.15.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,10 @@
 
 
 %changelog
+* Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
+- update to revision 3268
+- fixes #217081
+
 * Tue Nov 21 2006 Dan Horak  1.0-0.14.20061121svn3253
 - update to revision 3253
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2006 19:37:50 -0000	1.7
+++ sources	26 Nov 2006 12:09:17 -0000	1.8
@@ -1 +1 @@
-1eade2ad665ef9d46537adaceccc5a47  codeblocks-svn3253.tar.bz2
+a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 12:18:37 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:18:37 -0500
Subject: rpms/rtorrent/devel rtorrent.spec,1.14,1.15
Message-ID: <200611261218.kAQCIbj5015557@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15542

Modified Files:
	rtorrent.spec 
Log Message:
Added libstdc++ BR


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rtorrent.spec	26 Nov 2006 11:46:43 -0000	1.14
+++ rtorrent.spec	26 Nov 2006 12:18:07 -0000	1.15
@@ -2,13 +2,13 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.6.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
+BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
 Requires:      libtorrent >= 0.10.4
 
 %description



From fedora-extras-commits at redhat.com  Sun Nov 26 12:21:04 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 26 Nov 2006 07:21:04 -0500
Subject: rpms/rtorrent/FC-6 rtorrent.spec,1.13,1.14
Message-ID: <200611261221.kAQCL4MV015623@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15608

Modified Files:
	rtorrent.spec 
Log Message:
Added libstdc++ BR


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/FC-6/rtorrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rtorrent.spec	26 Nov 2006 11:48:09 -0000	1.13
+++ rtorrent.spec	26 Nov 2006 12:20:34 -0000	1.14
@@ -2,13 +2,13 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.6.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
+BuildRequires: libstdc++-devel, pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.10.4, curl-devel, ncurses-devel
 Requires:      libtorrent >= 0.10.4
 
 %description



From fedora-extras-commits at redhat.com  Sun Nov 26 12:57:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 07:57:00 -0500
Subject: rpms/libpqxx/FC-4 libpqxx.spec,1.7,1.8
Message-ID: <200611261257.kAQCv0rE015864@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15810/FC-4

Modified Files:
	libpqxx.spec 
Log Message:
add missing %defattr in %files devel section



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libpqxx.spec	21 Oct 2006 07:08:47 -0000	1.7
+++ libpqxx.spec	26 Nov 2006 12:56:29 -0000	1.8
@@ -58,6 +58,7 @@
 %{_libdir}/libpqxx-*.so
 
 %files devel
+%defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
 %{_libdir}/libpqxx.so



From fedora-extras-commits at redhat.com  Sun Nov 26 12:57:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 07:57:05 -0500
Subject: rpms/libpqxx/FC-6 libpqxx.spec,1.12,1.13
Message-ID: <200611261257.kAQCv5sU015872@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15810/FC-6

Modified Files:
	libpqxx.spec 
Log Message:
add missing %defattr in %files devel section



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-6/libpqxx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libpqxx.spec	4 Oct 2006 19:37:03 -0000	1.12
+++ libpqxx.spec	26 Nov 2006 12:56:35 -0000	1.13
@@ -71,6 +71,7 @@
 %{_libdir}/libpqxx-*.so
 
 %files devel
+%defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
 %{_libdir}/libpqxx.so



From fedora-extras-commits at redhat.com  Sun Nov 26 12:57:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 07:57:00 -0500
Subject: rpms/libpqxx/FC-5 libpqxx.spec,1.9,1.10
Message-ID: <200611261257.kAQCv0NS015867@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15810/FC-5

Modified Files:
	libpqxx.spec 
Log Message:
add missing %defattr in %files devel section



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/FC-5/libpqxx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libpqxx.spec	21 Oct 2006 07:08:48 -0000	1.9
+++ libpqxx.spec	26 Nov 2006 12:56:30 -0000	1.10
@@ -58,6 +58,7 @@
 %{_libdir}/libpqxx-*.so
 
 %files devel
+%defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
 %{_libdir}/libpqxx.so



From fedora-extras-commits at redhat.com  Sun Nov 26 12:57:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 07:57:05 -0500
Subject: rpms/libpqxx/devel libpqxx.spec,1.12,1.13
Message-ID: <200611261257.kAQCv5HW015875@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libpqxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15810/devel

Modified Files:
	libpqxx.spec 
Log Message:
add missing %defattr in %files devel section



Index: libpqxx.spec
===================================================================
RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libpqxx.spec	4 Oct 2006 19:37:03 -0000	1.12
+++ libpqxx.spec	26 Nov 2006 12:56:35 -0000	1.13
@@ -71,6 +71,7 @@
 %{_libdir}/libpqxx-*.so
 
 %files devel
+%defattr(-,root,root,-)
 %doc README-UPGRADE
 %{_bindir}/pqxx-config
 %{_libdir}/libpqxx.so



From fedora-extras-commits at redhat.com  Sun Nov 26 13:33:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:33:38 -0500
Subject: rpms/libtcd/devel - New directory
Message-ID: <200611261333.kAQDXcDH019054@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19037/libtcd/devel

Log Message:
Directory /cvs/extras/rpms/libtcd/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 13:33:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:33:38 -0500
Subject: rpms/libtcd - New directory
Message-ID: <200611261333.kAQDXcT7019041@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19037/libtcd

Log Message:
Directory /cvs/extras/rpms/libtcd added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 13:34:16 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:34:16 -0500
Subject: rpms/libtcd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611261334.kAQDYG1m019087@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081

Added Files:
	Makefile import.log 
Log Message:
Setup of module libtcd


--- NEW FILE Makefile ---
# Top level Makefile for module libtcd
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 Nov 26 13:34:21 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:34:21 -0500
Subject: rpms/libtcd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611261334.kAQDYLo0019102@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19081/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libtcd


--- 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 Nov 26 13:35:20 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:35:20 -0500
Subject: rpms/libtcd import.log,1.1,1.2
Message-ID: <200611261335.kAQDZK4S019181@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142

Modified Files:
	import.log 
Log Message:
auto-import libtcd-2.2-1 on branch devel from libtcd-2.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libtcd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 13:34:16 -0000	1.1
+++ import.log	26 Nov 2006 13:34:50 -0000	1.2
@@ -0,0 +1 @@
+libtcd-2_2-1:HEAD:libtcd-2.2-1.src.rpm:1164548172



From fedora-extras-commits at redhat.com  Sun Nov 26 13:35:20 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:35:20 -0500
Subject: rpms/libtcd/devel libtcd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611261335.kAQDZKKI019185@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libtcd.spec 
Log Message:
auto-import libtcd-2.2-1 on branch devel from libtcd-2.2-1.src.rpm


--- NEW FILE libtcd.spec ---
Name:		libtcd
Version:	2.2
Release:	1%{?dist}
Summary:	Tide Constituent Database Library

Group:		System Environment/Libraries
License:	Public Domain
URL:		http://www.flaterco.com/xtide/
Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
libtcd provides a software API for reading and writing Tide
Constituent Database (TCD) files.

%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT

%{__make} DESTDIR=$RPM_BUILD_ROOT install

# remove unneeded files
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc *.html

%{_includedir}/*.h
%{_libdir}/*.so

%changelog
* Thu Nov 23 2006 Mamoru Tasaka  - 2.2-1
- Formal 2.2 release.

* Mon Nov 21 2006 Mamoru Tasaka  - 2.2-0.1.dev1
- Re-split from xtide, import to Fedora Extras (see bug 211626)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 13:34:21 -0000	1.1
+++ .cvsignore	26 Nov 2006 13:34:50 -0000	1.2
@@ -0,0 +1 @@
+libtcd-2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 13:34:21 -0000	1.1
+++ sources	26 Nov 2006 13:34:50 -0000	1.2
@@ -0,0 +1 @@
+d6cfa1b0d808d5772c9b2798b8a90df0  libtcd-2.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 13:36:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:36:47 -0500
Subject: rpms/tcd-utils - New directory
Message-ID: <200611261336.kAQDalE5019306@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19302/tcd-utils

Log Message:
Directory /cvs/extras/rpms/tcd-utils added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 13:36:47 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:36:47 -0500
Subject: rpms/tcd-utils/devel - New directory
Message-ID: <200611261336.kAQDal7J019319@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19302/tcd-utils/devel

Log Message:
Directory /cvs/extras/rpms/tcd-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 13:37:04 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:37:04 -0500
Subject: rpms/tcd-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611261337.kAQDb4Ah019354@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19348

Added Files:
	Makefile import.log 
Log Message:
Setup of module tcd-utils


--- NEW FILE Makefile ---
# Top level Makefile for module tcd-utils
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 Nov 26 13:37:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:37:09 -0500
Subject: rpms/tcd-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611261337.kAQDb9CG019369@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19348/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tcd-utils


--- 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 Nov 26 13:38:07 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:38:07 -0500
Subject: rpms/tcd-utils import.log,1.1,1.2
Message-ID: <200611261338.kAQDc7kx019439@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408

Modified Files:
	import.log 
Log Message:
auto-import tcd-utils-20061120-1.fc7 on branch devel from tcd-utils-20061120-1.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 13:37:04 -0000	1.1
+++ import.log	26 Nov 2006 13:37:37 -0000	1.2
@@ -0,0 +1 @@
+tcd-utils-20061120-1_fc7:HEAD:tcd-utils-20061120-1.fc7.src.rpm:1164548340



From fedora-extras-commits at redhat.com  Sun Nov 26 13:38:08 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:38:08 -0500
Subject: rpms/tcd-utils/devel tcd-utils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611261338.kAQDc8jl019443@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19408/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tcd-utils.spec 
Log Message:
auto-import tcd-utils-20061120-1.fc7 on branch devel from tcd-utils-20061120-1.fc7.src.rpm


--- NEW FILE tcd-utils.spec ---
Name:		tcd-utils
Version:	20061120
Release:	1%{?dist}
Summary:	TCD (Tide Constituent Database) Utils

Group:		Applications/Engineering
License:	Public Domain
URL:		http://www.flaterco.com/xtide/
Source0:	ftp://ftp.flaterco.com/xtide/tcd-utils-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libtcd-devel

%description
TCD Utils includes:
* build_tide_db to convert harmonics.txt, offsets.xml, and NAVO
  formats to harmonics.tcd;
* restore_tide_db to generate harmonics.txt and offsets.xml from
  harmonics.tcd

%prep
%setup -q -n %{name}

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT

%{__mkdir_p} $RPM_BUILD_ROOT
%{__make} DESTDIR=$RPM_BUILD_ROOT install
 
%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_bindir}/*

%changelog
* Thu Nov 23 2006 Mamoru Tasaka  - 20061120-1
- Formal 20061120 released
- Versioning change

* Mon Nov 20 2006 Mamoru Tasaka 
- Split from xtide, repackaging (see bug 211626)
- Remove tideEditor, which was split into different package.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 13:37:09 -0000	1.1
+++ .cvsignore	26 Nov 2006 13:37:37 -0000	1.2
@@ -0,0 +1 @@
+tcd-utils-20061120.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 13:37:09 -0000	1.1
+++ sources	26 Nov 2006 13:37:37 -0000	1.2
@@ -0,0 +1 @@
+f0d58145520be7eeaf5d78229dae4aa7  tcd-utils-20061120.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 13:40:42 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:40:42 -0500
Subject: owners owners.list,1.2016,1.2017
Message-ID: <200611261340.kAQDegkD019507@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19492

Modified Files:
	owners.list 
Log Message:
add libtcd. tcd-utils


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2016
retrieving revision 1.2017
diff -u -r1.2016 -r1.2017
--- owners.list	26 Nov 2006 05:00:02 -0000	1.2016
+++ owners.list	26 Nov 2006 13:40:12 -0000	1.2017
@@ -1004,6 +1004,7 @@
 Fedora Extras|libsynaptics|Synaptics touchpad driver library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|libtcd|Tide Constituent Database Library|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|libtelepathy|GLib library to ease writing telepathy clients|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|libtlen|Tlen.pl client library|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libtomoe-gtk|Gtk library for tomoe Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
@@ -2265,6 +2266,7 @@
 Fedora Extras|tango-icon-theme|Icons from Tango Project|raven at pmail.pl|extras-qa at fedoraproject.org|
 Fedora Extras|taskjuggler|Project management tool|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tbcload|Tcl bytecode loader|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tcd-utils|TCD (Tide Constituent Database) Utils|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|tcl-thread|The Thread extension to Tcl|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclabc|A Tcl interface and a Tk GUI to the ABC notation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tclchecker|Tcl syntax checker|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 13:47:52 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:47:52 -0500
Subject: rpms/xtide/devel sources, 1.4, 1.5 xtide-2.9dev-rcinit.diff, NONE, 
	1.1 xtide-README.fedora, NONE, 1.1 xtide-get_harmonics-data.sh,
	NONE, 1.1 xtide.desktop, 1.2, 1.3 xtide.spec, 1.11,
	1.12 xttpd-wrapper.sh, NONE, 1.1 xttpd.conf, NONE,
	1.1 dead.package, 1.1, NONE
Message-ID: <200611261347.kAQDlqGH019633@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19607

Added Files:
	sources xtide-2.9dev-rcinit.diff xtide-README.fedora 
	xtide-get_harmonics-data.sh xtide.desktop xtide.spec 
	xttpd-wrapper.sh xttpd.conf 
Removed Files:
	dead.package 
Log Message:
unorphan xtide (bug 211626)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	26 Nov 2006 13:47:22 -0000	1.5
@@ -0,0 +1 @@
+efc6b3eb603e5b51c13c5dbb7bd29548  xtide-2.9dev-20061122.tar.bz2

xtide-2.9dev-rcinit.diff:

--- NEW FILE xtide-2.9dev-rcinit.diff ---
--- rc.xttpd.fedora	2006-11-23 07:22:31.000000000 +0900
+++ rc.xttpd	2006-11-23 20:33:49.000000000 +0900
@@ -26,22 +26,15 @@
 start(){
     echo -n $"Starting $PROG: "
     if ! test -f "$DAEMON" ; then 
-	echo $"$DAEMON is not set." >&2
-	echo_failure
+	echo -n $"$DAEMON is not set."
+	failure
 	echo
 	RETVAL=1
 	return $RETVAL
     fi
     if test -z "$PORT" ; then
-	echo $"PORT environment is not set." >&2
-	echo_failure
-	echo
-	RETVAL=1
-	return $RETVAL
-    fi
-    if test -z "$HOME" ; then
-	echo $"HOME environment is not set." >&2
-	echo_failure
+	echo -n $"PORT environment is not set."
+	failure
 	echo
 	RETVAL=1
 	return $RETVAL
@@ -100,3 +93,4 @@
 esac
 
 exit $?
+


--- NEW FILE xtide-README.fedora ---
================================================
# xtide-README.fedora
# Written by Patrice Dumas and Mamoru Tasaka

# If you have some questions, please report it
# with redhat bugzilla:
# https://bugzilla.redhat.com/bugzilla/index.cgi
================================================

Availability and installation of harmonics files
================================================

To use xtide and related utilities (like xttpd, 
tideEditor), you need an harmonics file.
However, existing files cannot be distributed as part of Fedora, 
because their license restricts commercial redistribution and selling,
which is too restrictive for Fedora. These files should therefore 
be installed after the package installation by yourself.

Such files are available at:
http://www.flaterco.com/xtide/files.html
As the time of writing, the latest harmonics file is:
ftp://ftp.flaterco.com/xtide/harmonics-dwf-20060708.tcd.bz2
The utilities can only use uncompressed harmonics files.

There are 2 possibilities to have the utilities become aware of
the harmonics file location:

1) by editing /etc/xtide.conf, and setting the first line of the file
  to the path of the directory containing the harmonics files, or  
  to the harmonics file location (the utilities will also accept a colon `:' 
  delimited list of paths). 
  The second line of /etc/xtide.conf sets the directory which 
  contains world vector shoreline data. The second line can accept only
  one directory and cannot be colon-delimited.
  
  The default content of /etc/xtide.conf used by fedora is:

  /usr/share/xtide-harmonics/
  /usr/share/wvs-data/

  which means that all the files in /usr/share/xtide-harmonics
  are considered to be harmonics files and all under /usr/share/wvs-data
  are considered to be WVS data.

2) by setting the environment variable HFILE_PATH. You can also
   set WVS_PATH to specify the directory under which WVS data are
   stored.

You can run the provided script xtide-get_harmonics-data.sh
under /usr/sbin to install harmonics files to 
/usr/share/xtide-harmonics. This script requires 
administrator previledges.


--- NEW FILE xtide-get_harmonics-data.sh ---
#!/bin/sh

DATE=${DATE:-20060708}
INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}

FILE=harmonics-dwf-${DATE}.tcd.bz2

if [ "`id -u -n`" != "root" ] ; then
    echo "You must do this by root"
    exit 1
fi

wget -N ftp://ftp.flaterco.com/xtide/$FILE || \
    ( echo ; echo "Downloading failed." ; exit 1 )

bzip2 -d $FILE
mkdir -p $INSTALL_DIR
install -m 644 harmonics-dwf-${DATE}.tcd $INSTALL_DIR
rm -f ${FILE%.bz2}


Index: xtide.desktop
===================================================================
RCS file: xtide.desktop
diff -N xtide.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xtide.desktop	26 Nov 2006 13:47:22 -0000	1.3
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=XTide
+Comment=Predict tides
+Exec=xtide
+Icon=xtide
+Terminal=false
+Type=Application
+Categories=Application;Science;Education;
+


Index: xtide.spec
===================================================================
RCS file: xtide.spec
diff -N xtide.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xtide.spec	26 Nov 2006 13:47:22 -0000	1.12
@@ -0,0 +1,382 @@
+%{!?with_harmonics: %define   with_harmonics 0}
+%define          src_date   20061122    
+
+Summary:         Calculate tide all over the world
+Name:            xtide
+Version:         2.9
+Release:         0.2.date%{src_date}%{?dist}
+
+URL:             http://www.flaterco.com/xtide/
+Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2
+%if %{with_harmonics}
+Source1:         http://harmonics.unh.edu/xtide/harmonics.txt.gz
+%endif
+
+Patch18:         xtide-2.9dev-rcinit.diff
+
+Source11:        xttpd.conf
+Source14:        xtide-get_harmonics-data.sh
+Source15:        xttpd-wrapper.sh
+Source20:        %{name}.desktop
+Source30:        xtide-README.fedora
+
+License:         GPL
+Group:           Applications/Engineering
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:   autoconf
+
+BuildRequires:   libXaw-devel
+BuildRequires:   libXext-devel
+BuildRequires:   libpng-devel
+BuildRequires:   zlib-devel
+Buildrequires:   desktop-file-utils
+BuildRequires:   libtcd-devel
+%if %{with_harmonics}
+BuildRequires:   tcd-utils
+%endif
+Requires:        wvs-data
+Requires:        xtide-common
+
+Requires(pre):      %{_sbindir}/useradd
+Requires(preun):    /sbin/service
+Requires(preun):    /sbin/chkconfig
+Requires(postun):   /sbin/service
+Requires(post):     /sbin/chkconfig
+
+%package         common
+Summary:         Xtide common files
+Group:           Applications/Engineering
+License:         Public Domain
+Requires:        bzip2
+Requires:        wget
+
+%description
+XTide is a package that provides tide and current
+predictions in a wide variety of formats.  Graphs, text listings, and
+calendars can be generated, or a tide clock can be provided on your
+desktop.
+
+XTide can work with X-windows, plain text terminals, or the web. This
+is accomplished with three separate programs: the interactive
+interface (xtide), the non-interactive or command line interface
+(tide), and the web interface.
+
+The algorithm that XTide uses to predict tides is the one used by the
+National Ocean Service in the U.S.  It is significantly more accurate
+than the simple tide clocks that can be bought in novelty stores.
+However, it takes more to predict tides accurately than just a spiffy
+algorithm -- you also need some special data for each and every
+location for which you want to predict tides.  XTide reads this data
+from harmonics files.  See http://www.flaterco.com/xtide/files.html
+for details on where to get these (note: please also see README.fedora
+in common package for Fedora specific issue.).
+
+Ultimately, XTide's predictions can only be as good as the available
+harmonics data.  Due to issues of data availability and of
+compatibility with non-U.S. tide systems, the predictions for
+U.S. locations tend to be a lot better on average than those for
+locations outside of the U.S.  It is up to you to verify that the
+predictions for your locale match up acceptably well with the
+officially sanctioned ones.
+
+    * Deviations of 1 minute from official predictions are typical for
+      U.S. locations having the latest data.
+    * Deviations of 20 minutes are typical for non-U.S. locations or
+      U.S. locations that are using obsolete data.
+    * Much longer deviations indicate a problem.
+
+%description common
+This package contains common files needed by xtide, xttpd and
+tideEditor.
+Please read README.fedora for Fedora specific issue.
+
+%prep
+%setup -q -n %{name}-2.9dev
+
+pushd scripts/Fedora
+%patch18 -p0 -b .fedora
+popd
+
+%build
+export xttpd_user=xttpd
+export xttpd_group=xttpd
+%configure
+
+%{__make} %{?_smp_mflags}
+
+# harmonics file
+%if %{with_harmonics}
+%{__install} -c -p -m 644 %{SOURCE1} .
+%{__gzip} -d harmoni*
+
+for f in harmonics*.txt ; do
+   TCD=${f%.txt}.tcd
+done
+
+build_tide_db $TCD harmonics-*.txt &> harmonics.out
+%endif
+
+echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
+echo "%{_datadir}/wvs-data/" >> %{name}.conf
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__mkdir_p} $RPM_BUILD_ROOT
+ 
+# 1. install xtide
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
+
+# xttpd treatment
+# xttpd is wrapped
+%{__install} -c -p -m 755 %{SOURCE14} \
+   $RPM_BUILD_ROOT%{_sbindir}
+%{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir}
+%{__install} -c -p -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_sbindir}/xttpd
+# ensure xttpd binary installation directory (original
+# wrapper script is hardcorded
+%{__sed} -i -e 's|/usr/libexec|%{_libexecdir}|' \
+   $RPM_BUILD_ROOT%{_sbindir}/xttpd
+
+
+# 1A Install harmonics file
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics
+%if %{with_harmonics}
+%{__install} -c -p -m 644 harmonics*.tcd \
+   ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics/
+%endif
+
+# 1B Add configuration file
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}
+%{__install} -c -p -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/
+
+# 1C Add desktop entry (xtide)
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install \
+   --vendor fedora \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   --remove-category Application \
+   %{SOURCE20}
+
+# 1D Install icon
+for f in iconsrc/icon_*_orig.png ; do
+   %{__install} -c -p -m 644 $f $RPM_BUILD_ROOT%{_datadir}/%{name}/
+done
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+%{__ln_s} -f ../../../../%{name}/icon_16x16_orig.png \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{__ln_s} -f ../../../../%{name}/icon_48x48_orig.png \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+# 1E install xttpd conf file
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xtide
+%{__install} -c -p -m 755 scripts/Fedora/rc.xttpd \
+   $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xttpd
+%{__install} -c -p -m 644 %{SOURCE11} \
+   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd
+
+# 1F and others
+%{__install} -c -p -m 644 %{SOURCE30} README.fedora
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+/sbin/chkconfig --add xttpd
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+if [ $1 -ge 1 ] ; then
+   /sbin/service xttpd condrestart &>/dev/null || :
+fi
+
+%pre 
+%{_sbindir}/useradd \
+   -c "XTide web server" \
+   -d %{_sysconfdir}/%{name} \
+   -r \
+   -s /sbin/nologin \
+   xttpd 2>/dev/null || :
+
+%preun
+if [ $1 = 0 ] ; then
+   /sbin/service xttpd stop &>/dev/null
+   /sbin/chkconfig --del xttpd
+fi
+
+%files common
+%doc README.fedora
+%config(noreplace) %{_sysconfdir}/%{name}.conf
+
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}-harmonics
+%dir %{_sysconfdir}/%{name}
+%if %{with_harmonics}
+%{_datadir}/%{name}-harmonics/harmonics*.tcd
+%endif
+
+%{_sbindir}/xtide-get*.sh
+
+%files
+%defattr(-,root,root,-)
+
+%doc AUTHORS COPYING README README-QUICK
+# xtide
+%{_mandir}/man1/*tide.1*
+
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/%{name}/icon_*_orig.png
+
+%{_bindir}/*tide
+
+# xttpd
+%config(noreplace) %{_sysconfdir}/sysconfig/xttpd
+%{_sysconfdir}/rc.d/init.d/xttpd
+
+%{_sbindir}/xttpd
+%{_libexecdir}/xttpd
+%{_datadir}/man/man8/xttpd.8*
+
+%changelog
+* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122
+- Ensure the hardcorded directories in some scripts can be 
+  appropriately changed.
+- Fix some typo in README.fedora
+
+* Thu Nov 23 2006 Mamoru Tasaka  - 2.9-0.1.date20061122
+- 2.9 dev 20061122 release
+
+* Mon Nov 20 2006 Mamoru Tasaka  - 2.9-0.1.dev1
+- Version down temporarily
+- re-split libtcd, tcd-utils (see bug 211626)
+- again include xttpd
+
+* Sun Oct 29 2006 Mamoru Tasaka  - 2.9-0.14.dev20061027
+- xtide-2.9dev20061029, tcd-utils-1.3.11(2005-08-11),
+  update patches.
+- Remove -DCOMPAT114 as required by newer tcd-utils
+- Bump somajor of tcd-utils for API change.
+
+* Fri Oct 27 2006 Mamoru Tasaka  - 2.9-0.13.dev20061015
+- Fix some change in xtide-2.9dev-change-uidgid.patch
+
+* Fri Oct 27 2006 Mamoru Tasaka  - 2.9-0.12.dev20061015
+- More restrictive uid/gid mode for xttpd
+- Another fix for xttpd.init
+
+* Thu Oct 26 2006 Mamoru Tasaka  - 2.9-0.11.dev20061015
+- Other fixes for xttpd.init, xttpd.conf
+- Create "xttpd" user and use xttpd user for daemon.
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.10.dev20061015
+- xtide doesn't need wrapperd, however, xttpd does.
+- Fix xttpd init script
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.9.dev20061015
+- Adjustment for WVS data directory change.
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.8.dev20061015
+- Split WVS data.
+- desktop-file-utils 0.11 change: X-Fedora, Application is no longer
+  accepted (will be fixed in rawhide).
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.7.dev20061015
+- Drop harmonics data for now.
+- Define WVS_DIR, then rewrite tideEditor-wrapper.sh and wrap xtide
+- Add fedora-specific document
+- Include WVS data
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.6.dev20061015
+- Install 48x48 icon as well.
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.5.dev20061015
+- Use icon in xtide source
+- Fix Group entry
+- Re-source profile shell script for easier rebuilding
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.4.dev20061015
+- Introduce common files package.
+- CFLAGS treatment change.
+- Treak configuration files and their locations.
+
+* Sat Oct 21 2006 Mamoru Tasaka  - 2.9-0.3.dev20061015
+- Various changes about compilation optflags.
+- Change libtcd soname numbering
+- Sprit xttpd, include scripts
+- tideEditor wrapper script included and desktop files added.
+- use "/sbin/ldconfig -n"
+- Lots of help from Michael Schwendt and Patrice Dumas, thanks!!
+
+* Sat Oct 21 2006 Mamoru Tasaka  - 2.9-0.2.dev20061015
+- Re-unify libtcd and xtide, and include tcd-utils, 
+  build all at once.
+
+* Fri Oct 20 2006 Mamoru Tasaka  - 2.9-0.1.dev20061015
+- Resubmit to Fedora Extras (bug #211626)
+- Split libtcd to another package, require tcd-utils to
+  rebuild tcd data.
+
+* Sun May 22 2005 Jeremy Katz  - 2.8-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
+* Fri Dec 17 2004 David M. Kaplan  0:2.8-2
+- Made a small hack that should make it compile on x86_64 systems.
+
+* Wed Dec 15 2004 David M. Kaplan  0:2.8-1
+- Updated to version 2.8
+- Cleaned up spec file because much of the tricks to get it to work
+  are no longer necessary.
+
+* Mon Dec  8 2003 David M. Kaplan  0:2.6.4-0.fdr.4
+- Removed 644 permissions.
+
+* Tue Dec  2 2003 David M. Kaplan  0:2.6.4-0.fdr.3
+- Fixed problem with debuginfo rpm and lex.xml.c.
+- Changed attributes to 644/755 to agree with Fedora specification.
+
+* Mon Nov 17 2003 David M. Kaplan  0:2.6.4-0.fdr.1
+- Updated to 2.6.4 version of xtide
+
+* Mon Oct 20 2003 David M. Kaplan  0:2.6.3-0.fdr.2
+- Made changes to spec and patch as per Michael Schwendt's suggestions
+
+* Fri Oct 17 2003 David M. Kaplan  0:2.6.3-0.fdr.1
+- Modified spec file to meet requirements for fedora
+
+* Tue Oct 14 2003 David M. Kaplan  2.6.3-0.fdr.0
+- Modify for Fedora submission
+
+* Tue Oct 14 2003 David M. Kaplan  2.6.3-0
+- Update to XTide 2.6.3
+
+* Fri Sep 05 2003 David M. Kaplan 
+- Updated to XTide 2.6.2
+
+* Thu Feb 17 2003 David M. Kaplan 
+- Updated to XTide 2.6 FINAL (2003-02-12)
+
+* Thu Feb 17 2003 David M. Kaplan 
+- Updated to XTide 2.6 DEVELOPMENT (2003-02-12)
+
+* Thu Jan 23 2003 David M. Kaplan 
+- Updated to XTide 2.6 DEVELOPMENT (2003-01-17)
+
+* Sat Dec 28 2002 David M. Kaplan 
+- First RPM build.
+


--- NEW FILE xttpd-wrapper.sh ---
#!/bin/sh

unset XTTPD_ARG
for ARG in $* ; do
   case $ARG in
      *=* )
	eval export $ARG
        ;;
      * )
        XTTPD_ARG="$XTTPD_ARG $ARG"
	;;
   esac
done
			
exec /usr/libexec/xttpd $XTTPD_ARG

--- NEW FILE xttpd.conf ---
# Originally from debian.
# The following is from debian's comment.
#---------------------------------------------------------
#
# skeleton	example file to build /etc/init.d/ scripts.
#		This file should be used to construct scripts for /etc/init.d.
#
#		Written by Miquel van Smoorenburg .
#		Modified for Debian GNU/Linux
#		by Ian Murdock .
#
# Version:	@(#)skeleton  1.6  11-Nov-1996  miquels at cistron.nl
#
# This file by Peter S Galbraith  for the xtide package.

#---------------------------------------
# Configuration:  
#  
#  Uncommenting the PORT line below enables this daemon at bootup.
#  To start the server after uncommenting the line, there is no need 
#  to reboot, simply invoke:
#                            # /etc/init.d/xttpd start
#
#  PORT: Port number used by xttpd
#   - If you use 80, xttpd will be your standard web server and will be 
#     visible as http://localhost  (Make sure no other web server is installed)
#   - Alternatively, use a higher unprivileged port number (e.g. 8080) to have
#     xttpd running in addition to a standard web server.  xttpd would then 
#     be visble as http://localhost:8080/
#  XTTPD_FEEDBACK:
#   - Set the environment variable XTTPD_FEEDBACK to change the feedback 
#     address email address.
#PORT=8080
#XTTPD_FEEDBACK=user at your.site
#-Edit-lines-above-and-uncomment--------


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 26 13:52:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:52:28 -0500
Subject: rpms/xtide/devel Makefile,1.3,1.4
Message-ID: <200611261352.kAQDqS6b019672@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19657

Added Files:
	Makefile 
Log Message:
add makefile


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	26 Nov 2006 13:51:58 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: xtide
+# $Id$
+NAME := xtide
+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)



From fedora-extras-commits at redhat.com  Sun Nov 26 13:57:50 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 08:57:50 -0500
Subject: owners owners.list,1.2017,1.2018
Message-ID: <200611261357.kAQDvodt019805@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19784

Modified Files:
	owners.list 
Log Message:
un-orphan xtide (bug 211626)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2017
retrieving revision 1.2018
diff -u -r1.2017 -r1.2018
--- owners.list	26 Nov 2006 13:40:12 -0000	1.2017
+++ owners.list	26 Nov 2006 13:57:20 -0000	1.2018
@@ -2563,7 +2563,7 @@
 Fedora Extras|xscreensaver|X screen saver and locker|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|jwz at jwz.org
 Fedora Extras|xsp|ASP.NET page server|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xtide|Calculate tide all over the world|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xwrits|A program to remind you to take wrist breaks|jlayton at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|yadex|A DOOM level editor|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 15:00:18 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 26 Nov 2006 10:00:18 -0500
Subject: rpms/SDL_image/devel SDL_image-1.2.5-IMG_xpm.patch, NONE,
	1.1 SDL_image.spec, 1.9, 1.10
Message-ID: <200611261500.kAQF0IPK023097@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_image/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23069

Modified Files:
	SDL_image.spec 
Added Files:
	SDL_image-1.2.5-IMG_xpm.patch 
Log Message:
* Tue Oct 31 2006 Brian Pepple  - 1.2.5-3
- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)


SDL_image-1.2.5-IMG_xpm.patch:

--- NEW FILE SDL_image-1.2.5-IMG_xpm.patch ---
--- IMG_xpm.c~	2006-05-12 05:02:44.000000000 +0200
+++ IMG_xpm.c	2006-10-31 19:03:25.000000000 +0100
@@ -326,7 +326,8 @@
 	linebuf = NULL;
 	buflen = 0;
 
-	start = SDL_RWtell(src);
+    if(src)
+        start = SDL_RWtell(src);
 
 	if(xpm)
 		xpmlines = &xpm;
@@ -453,7 +454,8 @@
 
 done:
 	if(error) {
-		SDL_RWseek(src, start, SEEK_SET);
+        if (src)
+            SDL_RWseek(src, start, SEEK_SET);
 		if ( image ) {
 			SDL_FreeSurface(image);
 			image = NULL;


Index: SDL_image.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/devel/SDL_image.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SDL_image.spec	31 Aug 2006 21:47:34 -0000	1.9
+++ SDL_image.spec	26 Nov 2006 14:59:48 -0000	1.10
@@ -1,12 +1,13 @@
 Name:		SDL_image
 Version:	1.2.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Image loading library for SDL
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_image/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch0:		%{name}-1.2.5-IMG_xpm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	SDL-devel >= 1.2.10
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .imgxpm
 
 
 %build
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Tue Oct 31 2006 Brian Pepple  - 1.2.5-3
+- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)
+
 * Thu Aug 31 2006 Brian Pepple  - 1.2.5-2
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Sun Nov 26 15:15:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 26 Nov 2006 10:15:00 -0500
Subject: rpms/SDL_image/FC-6 SDL_image-1.2.5-IMG_xpm.patch, NONE,
	1.1 SDL_image.spec, 1.9, 1.10
Message-ID: <200611261515.kAQFF0K5026255@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_image/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26237

Modified Files:
	SDL_image.spec 
Added Files:
	SDL_image-1.2.5-IMG_xpm.patch 
Log Message:
* Sun Nov 26 2006 Brian Pepple  - 1.2.5-3
- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)


SDL_image-1.2.5-IMG_xpm.patch:

--- NEW FILE SDL_image-1.2.5-IMG_xpm.patch ---
--- IMG_xpm.c~	2006-05-12 05:02:44.000000000 +0200
+++ IMG_xpm.c	2006-10-31 19:03:25.000000000 +0100
@@ -326,7 +326,8 @@
 	linebuf = NULL;
 	buflen = 0;
 
-	start = SDL_RWtell(src);
+    if(src)
+        start = SDL_RWtell(src);
 
 	if(xpm)
 		xpmlines = &xpm;
@@ -453,7 +454,8 @@
 
 done:
 	if(error) {
-		SDL_RWseek(src, start, SEEK_SET);
+        if (src)
+            SDL_RWseek(src, start, SEEK_SET);
 		if ( image ) {
 			SDL_FreeSurface(image);
 			image = NULL;


Index: SDL_image.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_image/FC-6/SDL_image.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SDL_image.spec	31 Aug 2006 21:47:34 -0000	1.9
+++ SDL_image.spec	26 Nov 2006 15:14:30 -0000	1.10
@@ -1,12 +1,13 @@
 Name:		SDL_image
 Version:	1.2.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Image loading library for SDL
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_image/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
+Patch0:		%{name}-1.2.5-IMG_xpm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	SDL-devel >= 1.2.10
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .imgxpm
 
 
 %build
@@ -77,6 +79,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Brian Pepple  - 1.2.5-3
+- Add patch to fix IMG_ReadXPMFromArray crash. (#213282)
+
 * Thu Aug 31 2006 Brian Pepple  - 1.2.5-2
 - Rebuild for FC6.
 



From fedora-extras-commits at redhat.com  Sun Nov 26 15:17:01 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 10:17:01 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.9, 1.10 ochusha.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200611261517.kAQFH1b0026352@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26328

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Sun Nov 26 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
- 0.5.99.63.6 cvs 061126 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	25 Nov 2006 15:12:11 -0000	1.9
+++ .cvsignore	26 Nov 2006 15:16:30 -0000	1.10
@@ -1 +1 @@
-ochusha-0.5.99.63.6-cvs061125.tar.bz2
+ochusha-0.5.99.63.6-cvs061126.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ochusha.spec	25 Nov 2006 15:12:11 -0000	1.9
+++ ochusha.spec	26 Nov 2006 15:16:30 -0000	1.10
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.6
-%define              strtag          cvs061125
+%define              strtag          cvs061126
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -155,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Sat Nov 25 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
-- 0.5.99.63.6 cvs 061125 (23:59 JST)
+* Sun Nov 26 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
+- 0.5.99.63.6 cvs 061126 (23:59 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	25 Nov 2006 15:12:11 -0000	1.9
+++ sources	26 Nov 2006 15:16:30 -0000	1.10
@@ -1 +1 @@
-51ba6482844fb7c9c1d5fa3a666027f3  ochusha-0.5.99.63.6-cvs061125.tar.bz2
+87fee38e3cf73238a9bffdce22fde293  ochusha-0.5.99.63.6-cvs061126.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 15:22:54 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Sun, 26 Nov 2006 10:22:54 -0500
Subject: rpms/jd/devel .cvsignore, 1.24, 1.25 jd.spec, 1.31, 1.32 sources,
	1.24, 1.25
Message-ID: <200611261522.kAQFMsN2026509@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26461

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Nov 26 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061126
- cvs 061126 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	25 Nov 2006 15:03:40 -0000	1.24
+++ .cvsignore	26 Nov 2006 15:22:24 -0000	1.25
@@ -1 +1 @@
-jd-1.8.1-cvs061125.tgz
+jd-1.8.1-cvs061126.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jd.spec	25 Nov 2006 15:03:40 -0000	1.31
+++ jd.spec	26 Nov 2006 15:22:24 -0000	1.32
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061125
+%define         strtag        cvs061126
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sat Nov 25 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061125
-- cvs 061125 (23:59 JST)
+* Sun Nov 26 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061126
+- cvs 061126 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	25 Nov 2006 15:03:40 -0000	1.24
+++ sources	26 Nov 2006 15:22:24 -0000	1.25
@@ -1 +1 @@
-1bcf2b13a48d65cabe60a30034b603d0  jd-1.8.1-cvs061125.tgz
+22545b686df97a6578add31e6567978c  jd-1.8.1-cvs061126.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 15:31:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Terje_R=C3=B8sten?= (terjeros))
Date: Sun, 26 Nov 2006 10:31:45 -0500
Subject: rpms/eterm/devel Eterm-0.9.4-automake-1.10.patch, NONE,
	1.1 eterm.spec, 1.2, 1.3
Message-ID: <200611261531.kAQFVjML026602@cvs-int.fedora.redhat.com>

Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26581

Modified Files:
	eterm.spec 
Added Files:
	Eterm-0.9.4-automake-1.10.patch 
Log Message:
Add patch to build with autmake-1.10.



Eterm-0.9.4-automake-1.10.patch:

--- NEW FILE Eterm-0.9.4-automake-1.10.patch ---
diff -uNr -x '*~' Eterm-0.9.4.orig/configure.in Eterm-0.9.4/configure.in
--- Eterm-0.9.4.orig/configure.in	2006-01-04 09:44:14.000000000 +0100
+++ Eterm-0.9.4/configure.in	2006-11-26 16:06:19.000000000 +0100
@@ -91,6 +91,9 @@
     CFLAGS="$CCOPTS"
 fi
 
+dnl# required from automake-1.10 
+AM_PROG_AS
+
 AC_ARG_WITH(cc, [  --with-cc=compiler      force Eterm to build with a particular compiler (like pgcc, egcs, etc.)], [
             CC=$withval, 
   if test -z "$CC"; then


Index: eterm.spec
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/eterm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eterm.spec	25 Nov 2006 22:18:52 -0000	1.2
+++ eterm.spec	26 Nov 2006 15:31:15 -0000	1.3
@@ -1,18 +1,19 @@
 Summary: Enlightened terminal emulator
 Name: eterm
 Version: 0.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: User Interface/Desktops
 Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
 Source1: http://www.eterm.org/download/Eterm-bg-0.9.4.tar.gz
 Source2: %{name}.png
-Patch: Eterm-0.9.4-no-rpath.patch
+Patch1: Eterm-0.9.4-no-rpath.patch
+Patch2: Eterm-0.9.4-automake-1.10.patch
 URL: http://www.eterm.org/
 Requires: imlib2
 BuildRequires: imlib2-devel libast-devel libXmu-devel 
 BuildRequires: pcre-devel desktop-file-utils
-BuildRequires: /usr/bin/automake-1.9 autoconf libtool
+BuildRequires: autoconf automake libtool
 Provides: Eterm = %{version}-%{release}
 Obsoletes: Eterm <= 0.9.2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,12 +28,11 @@
 
 %prep
 %setup -a 1 -q -n Eterm-%{version}
-%patch -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 # Touching Makefile.am
-# Need automake 1.9
-export AUTOMAKE=/usr/bin/automake-1.9
 ./autogen.sh
 %configure --enable-multi-charset \
            --enable-escreen       \
@@ -41,7 +41,7 @@
            --disable-etwin        \
            --disable-mmx
 
-%{__make}
+%{__make} %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -98,6 +98,10 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Nov 26 2006 Terje R??sten  - 0.9.4-4
+- Add patch to build with automake-1.10
+- Add smp flags to make
+
 * Sat Nov 25 2006 Terje R??sten  - 0.9.4-3
 - Use automake-1.9
 



From fedora-extras-commits at redhat.com  Sun Nov 26 16:38:32 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 26 Nov 2006 11:38:32 -0500
Subject: rpms/gaim-meanwhile/FC-6
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-04_blist-memleak.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch,
	NONE, 1.1 gaim-2.0.0beta5-silc-edit-account-crash.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 gaim-meanwhile.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200611261638.kAQGcWtD029951@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29905

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Added Files:
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch 
	gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch 
	gaim-2.0.0beta5-debian-04_blist-memleak.patch 
	gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch 
	gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch 
	gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch 
	gaim-2.0.0beta5-silc-edit-account-crash.patch 
Log Message:
Update to latest beta release.  Fixes bug 217040


gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch:

--- NEW FILE gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch ---
--- console/plugins/gnthistory.orig	2006-10-18 20:54:41.000000000 -0400
+++ console/plugins/gnthistory.c	2006-10-18 20:54:45.000000000 -0400
@@ -173,7 +173,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	NULL,
+	GAIM_GNT_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,

gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch:

--- NEW FILE gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch ---
diff -Nur gaim-2.0.0+beta5/gtk/gtksound.c gaim-2.0.0+beta5.new/gtk/gtksound.c
--- gaim-2.0.0+beta5/gtk/gtksound.c	2006-11-10 02:23:00.000000000 -0500
+++ gaim-2.0.0+beta5.new/gtk/gtksound.c	2006-11-11 15:44:05.000000000 -0500
@@ -448,9 +448,7 @@
 		return;
 	volume = (float)(CLAMP(gaim_prefs_get_int("/gaim/gtk/sound/volume"),0,100)) / 50;
 	if (!strcmp(method, "automatic")) {
-		if (gaim_running_gnome()) {
-			sink = gst_element_factory_make("gconfaudiosink", "sink");
-		}
+		sink = gst_element_factory_make("gconfaudiosink", "sink");
 		if (!sink)
 			sink = gst_element_factory_make("autoaudiosink", "sink");
 	} else if (!strcmp(method, "esd")) {

gaim-2.0.0beta5-debian-04_blist-memleak.patch:

--- NEW FILE gaim-2.0.0beta5-debian-04_blist-memleak.patch ---
--- trunk/gtk/gtkblist.c	(revision 17621)
+++ trunk/gtk/gtkblist.c	(revision 17774)
@@ -560,7 +560,7 @@
 rebuild_joinchat_entries(GaimGtkJoinChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -569,11 +569,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 	data->entries = NULL;
@@ -5111,7 +5108,7 @@
 rebuild_addchat_entries(GaimGtkAddChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -5120,11 +5117,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 
@@ -5965,8 +5959,7 @@
 		menuitem = l->data;
 
 		if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Add\\/Edit")))
-			gtk_container_remove(GTK_CONTAINER(accountmenu),
-			                     menuitem);
+			gtk_widget_destroy(menuitem);
 	}
 
 	for (accounts = gaim_accounts_get_all(); accounts; accounts = accounts->next) {
@@ -6122,23 +6115,7 @@
 
 	/* Remove old plugin action submenus from the Tools menu */
 	for (l = plugin_submenus; l; l = l->next)
-	{
-		GList *menuitems;
-
-		submenu = l->data;
-
-		menuitems = gtk_container_get_children(GTK_CONTAINER(submenu));
-		while (menuitems != NULL)
-		{
-			GaimPluginAction *action;
-			menuitem = menuitems->data;
-			action = g_object_get_data(G_OBJECT(menuitem), "plugin_action");
-			g_free(action);
-			menuitems = g_list_delete_link(menuitems, menuitems);
-		}
-
-		gtk_container_remove(GTK_CONTAINER(pluginmenu), GTK_WIDGET(submenu));
-	}
+		gtk_widget_destroy(GTK_WIDGET(l->data));
 	g_list_free(plugin_submenus);
 	plugin_submenus = NULL;
 

gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch:

--- NEW FILE gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch ---
--- trunk/libgaim/gaim-url-handler	2006/09/12 09:04:04	17260
+++ trunk/libgaim/gaim-url-handler	2006/11/18 05:25:31	17773
@@ -189,15 +189,26 @@
 
 def xmpp(uri):
     protocol = "prpl-jabber"
-    match = re.match(r"^xmpp:(//([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
+    match = re.match(r"^xmpp:((//)?([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
     if not match:
         print "Invalid xmpp URI: %s" % uri
         return
 
-    accountname = urllib.unquote_plus(match.group(2)) or ""
-    screenname = urllib.unquote_plus(match.group(4))
-    command = urllib.unquote_plus(match.group(6))
-    paramstring = match.group(8)
+    tmp = match.group(3)
+    if (tmp):
+        accountname = urllib.unquote_plus(tmp)
+    else:
+        accountname = ""
+
+    screenname = urllib.unquote_plus(match.group(5))
+
+    tmp = match.group(7)
+    if (tmp):
+        command = urllib.unquote_plus(tmp)
+    else:
+        command = ""
+
+    paramstring = match.group(9)
     params = {}
     if paramstring:
         for param in paramstring.split(";"):

gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch:

--- NEW FILE gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch ---
Index: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c	(revision 17787)
+++ trunk/libgaim/protocols/jabber/jabber.c	(revision 17788)
@@ -926,10 +926,17 @@
 	}
 
 	if(!js->gsc) {
-		if (gaim_proxy_connect(gc, account, server,
-				gaim_account_get_int(account, "port", 5222),
-				jabber_login_callback, gc) == NULL)
-			gaim_connection_error(gc, _("Unable to create socket"));
+		if (connect_server[0]) {
+			jabber_login_connect(js, server,
+			                     gaim_account_get_int(account,
+			                                          "port", 5222));
+		} else {
+			js->srv_query_data = gaim_srv_resolve("xmpp-client",
+			                                      "tcp",
+			                                      js->user->domain,
+			                                      srv_resolved_cb,
+			                                      js);
+		}
 	}
 }
 

gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch:

--- NEW FILE gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch ---
Index: trunk/libgaim/protocols/msn/object.c
===================================================================
--- trunk/libgaim/protocols/msn/object.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/object.c	(revision 17766)
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "object.h"
+#include "debug.h"
 
 #define GET_STRING_TAG(field, id) \
 	if ((tag = strstr(str, id "=\"")) != NULL) \
@@ -94,6 +95,7 @@
 	if (obj->creator == NULL || obj->size == 0 || obj->type == 0
 			|| obj->location == NULL || obj->friendly == NULL
 			|| obj->sha1d == NULL || obj->sha1c == NULL) {
+		gaim_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
 		msn_object_destroy(obj);
 		obj = NULL;
 	}
@@ -106,24 +108,13 @@
 {
 	g_return_if_fail(obj != NULL);
 
-	if (obj->creator != NULL)
-		g_free(obj->creator);
+	g_free(obj->creator);
+	g_free(obj->location);
+	g_free(obj->real_location);
+	g_free(obj->friendly);
+	g_free(obj->sha1d);
+	g_free(obj->sha1c);
 
-	if (obj->location != NULL)
-		g_free(obj->location);
-
-	if (obj->real_location != NULL)
-		g_free(obj->real_location);
-
-	if (obj->friendly != NULL)
-		g_free(obj->friendly);
-
-	if (obj->sha1d != NULL)
-		g_free(obj->sha1d);
-
-	if (obj->sha1c != NULL)
-		g_free(obj->sha1c);
-
 	if (obj->local)
 		local_objs = g_list_remove(local_objs, obj);
 
Index: trunk/libgaim/protocols/msn/slplink.c
===================================================================
--- trunk/libgaim/protocols/msn/slplink.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/slplink.c	(revision 17766)
@@ -147,6 +147,9 @@
 {
 	MsnSlpLink *slplink;
 
+	g_return_val_if_fail(session != NULL, NULL);
+	g_return_val_if_fail(username != NULL, NULL);
+
 	slplink = msn_session_find_slplink(session, username);
 
 	if (slplink == NULL)
Index: trunk/libgaim/protocols/msn/slp.c
===================================================================
--- trunk/libgaim/protocols/msn/slp.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/slp.c	(revision 17766)
@@ -819,6 +819,9 @@
 		smile = tokens[tok];
 		obj = msn_object_new_from_string(gaim_url_decode(tokens[tok + 1]));
 
+		if (obj == NULL)
+			break;
+
 		who = msn_object_get_creator(obj);
 		sha1c = msn_object_get_sha1c(obj);
 

gaim-2.0.0beta5-silc-edit-account-crash.patch:

--- NEW FILE gaim-2.0.0beta5-silc-edit-account-crash.patch ---
http://gaim.svn.sourceforge.net/viewvc/gaim/trunk/gtk/gtkaccount.c?r1=17800&r2=17799&view=patch&pathrev=17800
We shouldn't be freeing kvp->value, which is put in the list store as G_TYPE_POINTER.
This was causing crashes for people editing SILC accounts (nothing else uses GAIM_PREF_STRING_LIST).

--- trunk/gtk/gtkaccount.c	2006/11/21 04:34:38	17799
+++ trunk/gtk/gtkaccount.c	2006/11/21 05:32:55	17800
@@ -810,7 +810,7 @@
 					if (node->data != NULL) {
 						kvp = (GaimKeyValuePair *) node->data;
 						if ((kvp->value != NULL) && (str_value != NULL) &&
-							!g_utf8_collate(kvp->value, str_value))
+						    !g_utf8_collate(kvp->value, str_value))
 							idx = i;
 
 						gtk_list_store_append(model, &iter);
@@ -1247,7 +1247,6 @@
 					gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter);
 					gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1);
 					gaim_account_set_string(account, setting, value2);
-					g_free(value2);
 					break;
 
 				default:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Oct 2006 15:39:13 -0000	1.10
+++ .cvsignore	26 Nov 2006 16:38:02 -0000	1.11
@@ -1 +1 @@
-gaim-2.0.0beta4.tar.bz2
+gaim-2.0.0beta5.tar.bz2


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/gaim-meanwhile.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gaim-meanwhile.spec	30 Oct 2006 15:39:13 -0000	1.16
+++ gaim-meanwhile.spec	26 Nov 2006 16:38:02 -0000	1.17
@@ -23,7 +23,7 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta4
+%define betaver	beta5
 
 Name:		gaim-meanwhile
 Version:	2.0.0
@@ -52,6 +52,16 @@
 # to be replaced by upstream fix
 Patch5:		gaim2-PIE.patch
 
+## Patches 100+: To be Included in Future Upstream
+Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
+Patch103: gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch
+Patch104: gaim-2.0.0beta5-debian-04_blist-memleak.patch
+Patch105: gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch
+Patch106: gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch
+Patch107: gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch
+
+Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
 
@@ -122,6 +132,15 @@
 %prep
 %setup -q -n gaim-%{version}%{betaver}
 #%patch5 -p1
+## Patches 100+: To be Included in Future Upstream
+%patch102 -p0
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+
+%patch150 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Oct 2006 15:39:13 -0000	1.10
+++ sources	26 Nov 2006 16:38:02 -0000	1.11
@@ -1 +1 @@
-ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2
+84099216123de25402fa7e904ceca437  gaim-2.0.0beta5.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 16:39:47 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 26 Nov 2006 11:39:47 -0500
Subject: rpms/liferea/FC-6 liferea-1.0.26-fonts.patch, NONE, 1.1 .cvsignore, 
	1.37, 1.38 liferea.spec, 1.55, 1.56 sources, 1.38, 1.39
Message-ID: <200611261639.kAQGdl3v030039@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30017

Modified Files:
	.cvsignore liferea.spec sources 
Added Files:
	liferea-1.0.26-fonts.patch 
Log Message:
* Thu Nov 23 2006 Brian Pepple  - 1.0.26-1
- Update to 1.0.26.
- Add patch to use document font name. (#216813)


liferea-1.0.26-fonts.patch:

--- NEW FILE liferea-1.0.26-fonts.patch ---
--- liferea-1.0.26/src/conf.h.fonts	2006-07-22 05:00:54.000000000 -0400
+++ liferea-1.0.26/src/conf.h	2006-11-19 18:47:38.000000000 -0500
@@ -34,7 +34,7 @@
 #define BROWSER_MODULE			"/apps/liferea/browser-module"
 #define GNOME_DEFAULT_BROWSER_COMMAND	"gnome-open '%s'"
 #define DEFAULT_BROWSER_COMMAND		"mozilla '%s'"
-#define DEFAULT_FONT			"/desktop/gnome/interface/font_name"
+#define DEFAULT_FONT			"/desktop/gnome/interface/document_font_name"
 #define USER_FONT			"/apps/liferea/browser-font"
 #define REFOCUS_TIMEOUT			"/apps/liferea/refocus-timeout"
 #define DISABLE_JAVASCRIPT		"/apps/liferea/disable-javascript"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	27 Oct 2006 16:04:43 -0000	1.37
+++ .cvsignore	26 Nov 2006 16:39:17 -0000	1.38
@@ -1 +1 @@
-liferea-1.0.25.tar.gz
+liferea-1.0.26.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/liferea.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- liferea.spec	10 Nov 2006 09:47:59 -0000	1.55
+++ liferea.spec	26 Nov 2006 16:39:17 -0000	1.56
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.25
-Release:        2%{?dist}
+Version:        1.0.26
+Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-1.0.23-fedorafeed.patch
+Patch1:		%{name}-1.0.26-fonts.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml2-devel
@@ -43,6 +44,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
+%patch1 -p1 -b .fonts
 
 
 %build
@@ -109,6 +111,10 @@
 
 
 %changelog
+* Thu Nov 23 2006 Brian Pepple  - 1.0.26-1
+- Update to 1.0.26.
+- Add patch to use document font name. (#216813)
+
 * Fri Nov 10 2006 Michael Schwendt  - 1.0.25-2
 - Rebuild for new Firefox version (and update the Firefox "Requires").
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-6/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	27 Oct 2006 16:04:43 -0000	1.38
+++ sources	26 Nov 2006 16:39:17 -0000	1.39
@@ -1 +1 @@
-45d511c9eb829797336a60a4a86b5939  liferea-1.0.25.tar.gz
+8d48a070c9709a986a6f3d7a2ba7ec6c  liferea-1.0.26.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 18:23:26 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:23:26 -0500
Subject: rpms/audacious-plugins - New directory
Message-ID: <200611261823.kAQINQnZ003995@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3991/audacious-plugins

Log Message:
Directory /cvs/extras/rpms/audacious-plugins added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 18:23:32 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:23:32 -0500
Subject: rpms/audacious-plugins/devel - New directory
Message-ID: <200611261823.kAQINWg5004008@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3991/audacious-plugins/devel

Log Message:
Directory /cvs/extras/rpms/audacious-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 18:23:59 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:23:59 -0500
Subject: rpms/audacious-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611261823.kAQINxlK004056@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4034/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module audacious-plugins


--- 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 Nov 26 18:23:54 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:23:54 -0500
Subject: rpms/audacious-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611261823.kAQINsM0004040@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4034

Added Files:
	Makefile import.log 
Log Message:
Setup of module audacious-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module audacious-plugins
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 Nov 26 18:26:17 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:26:17 -0500
Subject: rpms/audacious-plugins/devel
	audacious-plugins-1.2.2-cddb-buffer.patch, NONE,
	1.1 audacious-plugins.desktop, NONE, 1.1 audacious-plugins.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611261826.kAQIQHI8004142@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104/devel

Modified Files:
	.cvsignore sources 
Added Files:
	audacious-plugins-1.2.2-cddb-buffer.patch 
	audacious-plugins.desktop audacious-plugins.spec 
Log Message:
auto-import audacious-plugins-1.2.2-0.8.sky on branch devel from audacious-plugins-1.2.2-0.8.sky.src.rpm

audacious-plugins-1.2.2-cddb-buffer.patch:

--- NEW FILE audacious-plugins-1.2.2-cddb-buffer.patch ---
diff -uNr audacious-plugins-fedora-1.2.2-orig/src/cdaudio/cddb.c audacious-plugins-fedora-1.2.2/src/cdaudio/cddb.c
--- audacious-plugins-fedora-1.2.2-orig/src/cdaudio/cddb.c	2006-11-21 09:59:31.000000000 +0100
+++ audacious-plugins-fedora-1.2.2/src/cdaudio/cddb.c	2006-11-21 10:02:48.000000000 +0100
@@ -109,14 +109,17 @@
 cddb_generate_offset_string(cdda_disc_toc_t * info)
 {
     gchar *buffer;
+    gchar number[20];
     int i;
 
     buffer = g_malloc(info->last_track * 7 + 1);
 
     sprintf(buffer, "%d", LBA(info->track[info->first_track]));
 
-    for (i = info->first_track + 1; i <= info->last_track; i++)
-        sprintf(buffer, "%s+%d", buffer, LBA(info->track[i]));
+    for (i = info->first_track + 1; i <= info->last_track; i++) {
+        sprintf(number, "+%d", LBA(info->track[i]));
+        strcat(buffer, number);
+    }
 
     return buffer;
 }


--- NEW FILE audacious-plugins.desktop ---
[Desktop Entry]
Name=Audacious
Comment=Play music
Comment[hu]=Zene lej??tsz??sa
Exec=audacious
Icon=audacious.png
MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/x-wav;application/x-ogg;
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
Encoding=UTF-8
X-Desktop-File-Install-Version=0.10
NoDisplay=true


--- NEW FILE audacious-plugins.spec ---
Name:           audacious-plugins
Version:        1.2.2
Release:        0.8%{?dist}
Summary:        Plugins for the Audacious media player

Group:          Applications/Multimedia
License:        GPL
URL:            http://audacious-media-player.org/
# The original source files contain various codecs which clash
# with the FE license guidelines. They are removed in the -fedora-
# file.
# Source0:        http://audacious-media-player.org/beta/audacious-plugins-1.2.2.tgz
Source0:        audacious-plugins-fedora-%{version}.tar.gz
Source1:        audacious-plugins.desktop
Patch0:         audacious-plugins-1.2.2-cddb-buffer.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  audacious-devel >= 1.2.1-0.7%{dist}, esound-devel >= 0.2, libvorbis-devel >= 1.0
BuildRequires:  zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel
BuildRequires:  libsidplay-devel, libnotify-devel
BuildRequires:  libmpcdec-devel, libmusicbrainz-devel
BuildRequires:  taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2
BuildRequires:  libvisual-devel >= 0.2, SDL-devel >= 1.2.9
BuildRequires:  gettext, libsndfile-devel, curl-devel, libbinio-devel
BuildRequires:  arts-devel, libmodplug-devel, lirc-devel
BuildRequires:  jack-audio-connection-kit-devel, libsamplerate-devel
BuildRequires:  pulseaudio-devel, fluidsynth-devel

Requires:       audacious >= 1.2.0

Requires(post):   desktop-file-utils >= 0.9, /sbin/ldconfig
Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig

%description
Audacious is a media player that currently uses a skinned
user interface based on Winamp 2.x skins. It is based on ("forked off")
BMP.
This package provides essential plugins for audio input, audio output
and visualization.


%package        jack
Summary:        Audacious output plugin for JACK sound service
Group:          Applications/Multimedia
Obsoletes:      audacious-jack <= 1.1.2

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    jack
This package provides an Audacious output plugin that uses the
JACK sound service.


%package        esd
Summary:        Audacious output plugin for esd sound service
Group:          Applications/Multimedia
Obsoletes:      audacious-esd <= 1.1.2

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    esd
This package provides an Audacious output plugin that uses the
ESD sound server.


%package        arts
Summary:        Audacious output plugin for KDE arts sound service
Group:          Applications/Multimedia
Obsoletes:      audacious-arts <= 1.1.2

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    arts
This package provides an Audacious output plugin that uses the
KDE arts sound server.


%package        pulseaudio
Summary:        Audacious output plugin for PulseAudio
Group:          Applications/Multimedia

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    pulseaudio
This package provides an Audacious output plugin that uses the
PulseAudio sound server.



%package        amidi
Summary:        Audacious imput plugin for amidi
Group:          Applications/Multimedia

Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0

%description    amidi
This package provides an Audacious input plugin that uses the
amidi sound service.



%prep
%setup -q -n audacious-plugins-fedora-%{version}

# Fix incorrect use of sprintf in the cdaudio plugin
%patch0 -p1 -b .cddb-buffer

%build
%configure \
    --disable-rpath \
    --enable-gconf \
    --disable-gnome-vfs \
    --enable-chardet \
    --disable-dependency-tracking \
    --enable-amidiplug \
    --disable-amidiplug-dummy

make V=1 %{?_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   \
    %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
update-desktop-database %{_datadir}/applications


%postun
/sbin/ldconfig
update-desktop-database %{_datadir}/applications


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS
%{_libdir}/audacious
%exclude %{_libdir}/audacious/Input/libamidi-plug.so
%exclude %{_libdir}/audacious/Output/libjackout.so
%exclude %{_libdir}/audacious/Output/libarts.so
%exclude %{_libdir}/audacious/Output/libESD.so
%exclude %{_libdir}/audacious/Output/libpulse_audio.so
%{_datadir}/applications/fedora-audacious-plugins.desktop
%{_datadir}/audacious/images/audioscrobbler.png
%{_datadir}/audacious/images/audioscrobbler_badge.png

%files jack
%defattr(-,root,root,-)
%{_libdir}/audacious/Output/libjackout.so

%files arts
%defattr(-,root,root,-)
%{_bindir}/audacious-arts-helper
%{_libdir}/audacious/Output/libarts.so

%files esd
%defattr(-,root,root,-)
%{_libdir}/audacious/Output/libESD.so

%files pulseaudio
%defattr(-,root,root,-)
%{_libdir}/audacious/Output/libpulse_audio.so

%files amidi
%defattr(-,root,root,-)
%{_libdir}/audacious/Input/libamidi-plug.so
%{_libdir}/amidi-plug


%changelog
* Wed Nov 8 2006 Ralf Ertzinger  1.2.2-0.8.fc7
- Initial RPM build for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 18:23:59 -0000	1.1
+++ .cvsignore	26 Nov 2006 18:25:47 -0000	1.2
@@ -0,0 +1 @@
+audacious-plugins-fedora-1.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 18:23:59 -0000	1.1
+++ sources	26 Nov 2006 18:25:47 -0000	1.2
@@ -0,0 +1 @@
+8ac7f73da7432e1ffed6c2b9b0fced8c  audacious-plugins-fedora-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 18:26:17 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:26:17 -0500
Subject: rpms/audacious-plugins import.log,1.1,1.2
Message-ID: <200611261826.kAQIQHpA004138@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104

Modified Files:
	import.log 
Log Message:
auto-import audacious-plugins-1.2.2-0.8.sky on branch devel from audacious-plugins-1.2.2-0.8.sky.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 18:23:54 -0000	1.1
+++ import.log	26 Nov 2006 18:25:47 -0000	1.2
@@ -0,0 +1 @@
+audacious-plugins-1_2_2-0_8_sky:HEAD:audacious-plugins-1.2.2-0.8.sky.src.rpm:1164565629



From fedora-extras-commits at redhat.com  Sun Nov 26 18:34:19 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:34:19 -0500
Subject: rpms/audacious/devel audacious-1.2.1-relative-links.patch, NONE,
	1.1 audacious-1.2.1-shaded-skin.patch, NONE, 1.1 audacious.spec,
	1.16, 1.17 audacious-1.1.0-relative-links.patch, 1.2,
	NONE audacious-1.1.1-shaded-skin.patch, 1.1, NONE
Message-ID: <200611261834.kAQIYJe7004253@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4231

Modified Files:
	audacious.spec 
Added Files:
	audacious-1.2.1-relative-links.patch 
	audacious-1.2.1-shaded-skin.patch 
Removed Files:
	audacious-1.1.0-relative-links.patch 
	audacious-1.1.1-shaded-skin.patch 
Log Message:

- Update to 1.2.1
- Split off libaudacious into a separate package to handle the
  (now externally provided and built) plugins better


audacious-1.2.1-relative-links.patch:

--- NEW FILE audacious-1.2.1-relative-links.patch ---
diff -uNr audacious-1.2.1-orig/libaudacious/Makefile audacious-1.2.1/libaudacious/Makefile
--- audacious-1.2.1-orig/libaudacious/Makefile	2006-10-29 11:35:12.000000000 +0100
+++ audacious-1.2.1/libaudacious/Makefile	2006-10-29 11:35:50.000000000 +0100
@@ -47,7 +47,7 @@
 
 install-posthook:
 	@mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0
-	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4.0.0 \
+	@ln -sf libaudacious$(SHARED_SUFFIX).4.0.0 \
 		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).4
-	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).4 \
+	@ln -sf libaudacious$(SHARED_SUFFIX).4 \
 		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)

audacious-1.2.1-shaded-skin.patch:

--- NEW FILE audacious-1.2.1-shaded-skin.patch ---
diff -uNr audacious-1.2.1-orig/audacious/widgets/skin.c audacious-1.2.1/audacious/widgets/skin.c
--- audacious-1.2.1-orig/audacious/widgets/skin.c	2006-10-29 11:35:14.000000000 +0100
+++ audacious-1.2.1/audacious/widgets/skin.c	2006-10-29 12:40:56.000000000 +0100
@@ -1795,7 +1795,7 @@
                          (i * 25) + 25, 0, 25, 14);
 
     /* right corner */
-    skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 57 : 42,
+    skin_draw_pixmap(skin, drawable, gc, SKIN_PLEDIT, 99, focus ? 42 : 57,
                      width - 50, 0, 50, 14);
 }
 


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacious.spec	9 Nov 2006 14:13:19 -0000	1.16
+++ audacious.spec	26 Nov 2006 18:33:48 -0000	1.17
@@ -1,55 +1,62 @@
 Name:           audacious
-Version:        1.1.2
-Release:        8%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://audacious-media-player.org/
-# The original source files contain various codecs which clash
-# with the FE license guidelines. They are removed in the -fedora-
-# file.
-# Source0:        http://audacious-media-player.org/beta/audacious-1.1.0-dr2.tgz
-Source0:        audacious-fedora-%{version}.tar.gz
+
+Source0:        audacious-%{version}.tgz
 Patch0:         audacious-1.1.0-xmms-skins.patch
 Patch1:         audacious-1.1.0-default-skin.patch
-Patch2:         audacious-1.1.0-no-rpath.patch
-Patch3:         audacious-1.1.0-relative-links.patch
+# Patch2:         audacious-1.1.0-no-rpath.patch
+Patch3:         audacious-1.2.1-relative-links.patch
 Patch4:         audacious-1.1.0-quoting.patch
-Patch5:         audacious-1.1.0-amidi-backend.patch
-Patch6:         audacious-1.1.1-shaded-skin.patch
+# Patch5:         audacious-1.1.0-amidi-backend.patch
+Patch6:         audacious-1.2.1-shaded-skin.patch
 Patch7:         audacious-1.1.1-controlsocket-name.patch
-Patch8:         audacious-1.1.1-playlist-twenty.patch
+# Patch8:         audacious-1.1.1-playlist-twenty.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
-BuildRequires:  zlib-devel, desktop-file-utils >= 0.9, alsa-lib-devel
-BuildRequires:  gnome-vfs2-devel, libglade2-devel >= 2.4, libsidplay-devel
-BuildRequires:  libmpcdec-devel, libmusicbrainz-devel, GConf2-devel
-BuildRequires:  taglib-devel >= 1.4, libogg-devel >= 1.0, flac-devel >= 1.1.2
-BuildRequires:  libvisual-devel >= 0.2, SDL-devel >= 1.2.9
-BuildRequires:  gettext, libsndfile-devel, curl-devel, libbinio-devel
-BuildRequires:  arts-devel, libmodplug-devel, lirc-devel
-BuildRequires:  jack-audio-connection-kit-devel, libsamplerate-devel
+BuildRequires:  gtk2-devel >= 2.6
+BuildRequires:  zlib-devel, desktop-file-utils >= 0.9
+BuildRequires:  libglade2-devel >= 2.4
+BuildRequires:  GConf2-devel
+BuildRequires:  gettext
+
+Requires:       audacious-plugins >= 1.2.0
 
-Requires(post):  desktop-file-utils >= 0.9, /sbin/ldconfig
-Requires(postun): desktop-file-utils >= 0.9, /sbin/ldconfig
+Requires(post):   desktop-file-utils >= 0.9
+Requires(postun): desktop-file-utils >= 0.9
 
-Obsoletes:      bmp <= 0.9.7.1, bmp-flac2 <= 009
-Provides:       bmp = 0.9.7.1, bmp-flac2 = 009
+Obsoletes:      bmp <= 0.9.7.1
+Provides:       bmp = 0.9.7.1
 
 %description
 Audacious is a media player that currently uses a skinned
 user interface based on Winamp 2.x skins. It is based on ("forked off")
 BMP.
 
+
+%package        libs
+Summary:        Library files for Audacious
+Group:          System Environment/Libraries
+
+%description    libs
+Library files for Audacious
+
+
 %package        devel
 Summary:        Development files for Audacious
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       glib2-devel gtk2-devel gnome-vfs2-devel GConf2-devel
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       glib2-devel, gtk2-devel >= 2.6, GConf2-devel, libglade2-devel >= 2.4
 Requires:       pkgconfig
 
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 Obsoletes:      bmp-devel <= 0.9.7.1
 Provides:       bmp-devel = 0.9.7.1
 
@@ -57,38 +64,8 @@
 Development files for Audacious
 
 
-%package        jack
-Summary:        Audacious output plugin for JACK sound service
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
-
-%description    jack
-This package provides an Audacious output plugin that uses the
-JACK sound service.
-
-
-%package        esd
-Summary:        Audacious output plugin for esd sound service
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
-
-%description    esd
-This package provides an Audacious output plugin that uses the
-ESD sound server.
-
-
-%package        arts
-Summary:        Audacious output plugin for KDE arts sound service
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
-
-%description    arts
-This package provides an Audacious output plugin that uses the
-KDE arts sound server.
-
-
 %prep
-%setup -q -n %{name}-fedora-%{version}
+%setup -q
 
 # Read xmms skins directory
 %patch0 -p1 -b .xmms-skins
@@ -97,7 +74,7 @@
 %patch1 -p1 -b .default-skin
 
 # No rpath in binaries
-%patch2 -p1 -b .no-rpath
+# %patch2 -p1 -b .no-rpath
 
 # Relative symlink paths
 %patch3 -p1 -b .relative-links
@@ -115,17 +92,15 @@
 %patch7 -p1 -b controlsocket-name
 
 # Fix "%20" in playlist entries
-%patch8 -p1 -b playlist-twenty
+# %patch8 -p1 -b playlist-twenty
 
 %build
 %configure \
-	--disable-rpath \
-	--enable-gconf \
-	--disable-gnome-vfs \
-	--enable-amidiplug \
-	--disable-amidiplug-dummy \
-	--enable-chardet \
-	--disable-dependency-tracking
+    --disable-rpath \
+    --enable-gconf \
+    --disable-gnome-vfs \
+    --enable-chardet \
+    --disable-dependency-tracking
 make V=1 %{?_smp_mflags}
 
 
@@ -136,13 +111,17 @@
 
 desktop-file-install --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-    --add-category X-Fedora  \
-    --add-category Application  \
+    --delete-original \
+    --remove-mime-type audio/x-scpls \
+    --remove-mime-type audio/x-mpegurl \
+    --remove-mime-type audio/mpegurl \
     --remove-mime-type audio/mp3 \
     --remove-mime-type audio/x-mp3 \
     --remove-mime-type audio/mpeg \
     --remove-mime-type audio/x-mpeg \
-    --delete-original \
+    --remove-mime-type audio/x-wav \
+    --remove-mime-type application/x-ogg \
+    --remove-category Application \
     $RPM_BUILD_ROOT%{_datadir}/applications/audacious.desktop
 
 install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
@@ -155,7 +134,6 @@
 
 
 %post
-/sbin/ldconfig
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -164,64 +142,43 @@
 
 
 %postun
-/sbin/ldconfig
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/audacious
 %{_bindir}/audtool
-%{_libdir}/*.so.*
-%{_libdir}/audacious
-%{_libdir}/amidi-plug
 %{_datadir}/audacious
-%exclude %{_libdir}/audacious/Output/libjackout.so
-%exclude %{_libdir}/audacious/Output/libarts.so
-%exclude %{_libdir}/audacious/Output/libESD.so
 %{_mandir}/man[^3]/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/48x48/apps/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/audacious
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
-%files jack
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Output/libjackout.so
-
-%files arts
-%defattr(-,root,root,-)
-%{_bindir}/audacious-arts-helper
-%{_libdir}/audacious/Output/libarts.so
-
-%files esd
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Output/libESD.so
-
 
 %changelog
-* Thu Nov 9 2006 Ralf Ertzinger  1.1.2-8.fc7
-- Drop the main window update patch
-
-* Tue Nov 7 2006 Ralf Ertzinger  1.1.2-7.fc7
-- Disable gnome-vfs, it causes too much trouble
-- Add --enable-chardet
- 
-* Mon Nov 06 2006 Ralf Ertzinger  1.1.2-4.fc7
-- Decrease main window update frequency somewhat
-
-* Mon Nov 06 2006 Jindrich Novy  1.1.2-3.fc6
-- Rebuild because of the new curl
-- Don't BuildRequire desktop-file-utils twice
+* Sun Nov 26 2006 Ralf Ertzinger  1.2.1-1.fc7
+- Update to 1.2.1
+- Split off libaudacious into a separate package to handle the
+  (now externally provided and built) plugins better
 
 * Wed Oct 18 2006 Ralf Ertzinger  1.1.2-2.fc6
 - Add Obsoletes/Provides for BMP
@@ -230,10 +187,10 @@
 - Update to 1.1.2
 
 * Thu Aug 17 2006 Ralf Ertzinger  1.1.1-6.fc6
-- Another go at the %20 problem
+- Another go at the %%20 problem
 
 * Mon Aug 14 2006 Ralf Ertzinger  1.1.1-4.fc6
-- Fix %20 in playlist entries
+- Fix %%20 in playlist entries
 
 * Sun Jul 30 2006 Ralf Ertzinger  1.1.1-3.fc6
 - Bump for rebuild


--- audacious-1.1.0-relative-links.patch DELETED ---


--- audacious-1.1.1-shaded-skin.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Nov 26 18:38:23 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:38:23 -0500
Subject: rpms/audacious/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200611261838.kAQIcNjh004300@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4283

Modified Files:
	.cvsignore sources 
Log Message:
new source files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Sep 2006 20:17:34 -0000	1.5
+++ .cvsignore	26 Nov 2006 18:37:53 -0000	1.6
@@ -1 +1 @@
-audacious-fedora-1.1.2.tar.gz
+audacious-1.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Sep 2006 20:17:34 -0000	1.5
+++ sources	26 Nov 2006 18:37:53 -0000	1.6
@@ -1 +1 @@
-066a2d88a4e2115a43b0c3c8e9008bf5  audacious-fedora-1.1.2.tar.gz
+f718f66ec0cab46bf6210d2243d12be1  audacious-1.2.1.tgz



From fedora-extras-commits at redhat.com  Sun Nov 26 18:40:21 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 13:40:21 -0500
Subject: rpms/audacious-plugins/devel audacious-plugins.spec,1.1,1.2
Message-ID: <200611261840.kAQIeLEC004370@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4355

Modified Files:
	audacious-plugins.spec 
Log Message:
- Initial RPM build for FE


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-plugins.spec	26 Nov 2006 18:25:47 -0000	1.1
+++ audacious-plugins.spec	26 Nov 2006 18:39:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           audacious-plugins
 Version:        1.2.2
-Release:        0.8%{?dist}
+Release:        1%{?dist}
 Summary:        Plugins for the Audacious media player
 
 Group:          Applications/Multimedia
@@ -177,5 +177,5 @@
 
 
 %changelog
-* Wed Nov 8 2006 Ralf Ertzinger  1.2.2-0.8.fc7
+* Sun Nov 26 2006 Ralf Ertzinger  1.2.2-1.fc7
 - Initial RPM build for FE



From fedora-extras-commits at redhat.com  Sun Nov 26 18:42:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:42:44 -0500
Subject: rpms/atomorun - New directory
Message-ID: <200611261842.kAQIgiKE004454@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4450/atomorun

Log Message:
Directory /cvs/extras/rpms/atomorun added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 18:42:49 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:42:49 -0500
Subject: rpms/atomorun/devel - New directory
Message-ID: <200611261842.kAQIgnLB004467@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4450/atomorun/devel

Log Message:
Directory /cvs/extras/rpms/atomorun/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 18:43:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:43:07 -0500
Subject: rpms/atomorun Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611261843.kAQIh7Rq004497@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4491

Added Files:
	Makefile import.log 
Log Message:
Setup of module atomorun


--- NEW FILE Makefile ---
# Top level Makefile for module atomorun
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 Nov 26 18:43:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:43:07 -0500
Subject: rpms/atomorun/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611261843.kAQIh7aj004512@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4491/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module atomorun


--- 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 Nov 26 18:45:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:45:14 -0500
Subject: rpms/atomorun import.log,1.1,1.2
Message-ID: <200611261845.kAQIjE3H004590@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4558

Modified Files:
	import.log 
Log Message:
auto-import atomorun-1.1-0.2.pre2.fc7 on branch devel from atomorun-1.1-0.2.pre2.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/atomorun/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 18:43:07 -0000	1.1
+++ import.log	26 Nov 2006 18:44:44 -0000	1.2
@@ -0,0 +1 @@
+atomorun-1_1-0_2_pre2_fc7:HEAD:atomorun-1.1-0.2.pre2.fc7.src.rpm:1164567547



From fedora-extras-commits at redhat.com  Sun Nov 26 18:45:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:45:14 -0500
Subject: rpms/atomorun/devel atomorun.desktop, NONE, 1.1 atomorun.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611261845.kAQIjEKV004594@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4558/devel

Modified Files:
	.cvsignore sources 
Added Files:
	atomorun.desktop atomorun.spec 
Log Message:
auto-import atomorun-1.1-0.2.pre2.fc7 on branch devel from atomorun-1.1-0.2.pre2.fc7.src.rpm


--- NEW FILE atomorun.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Atomorun
Comment=Jump&Run game where you have to flee an exploding nuclear bomb
Exec=atomorun
Icon=atomorun.png
Terminal=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE atomorun.spec ---
%define prever pre2

Name:           atomorun
Version:        1.1
Release:        0.2.%{prever}%{?dist}
Summary:        Jump&Run game where you have to flee an exploding nuclear bomb
Group:          Amusements/Games
License:        GPL
URL:            http://atomorun.whosme.de/index.php
Source0:        http://atomorun.whosme.de/downloads/%{name}-%{version}_%{prever}.tar.gz
Source1:        atomorun.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_mixer-devel SDL_image-devel libtiff-devel libvorbis-devel
BuildRequires:  alsa-lib-devel desktop-file-utils ImageMagick
Requires:       hicolor-icon-theme

%description
Atomorun is a OpenGL Jump&Run game where you have to flee an exploding
nuclear bomb.


%prep
%setup -q -n %{name}-%{version}_%{prever}


%build
%configure
make %{?_smp_mflags}
convert pixmaps/atomorun_winicon.ico %{name}.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/pixmaps/atomorun_winicon.ico
rm -rf $RPM_BUILD_ROOT%{_prefix}/doc/%{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
install -p -m 644 %{name}.png \
  $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 ChangeLog COPYING README TODO
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sun Nov 26 2006 Hans de Goede  1.1-0.2.pre2
- Add Requires hicolor-icon-theme (bz 217249)

* Sat Nov 25 2006 Hans de Goede  1.1-0.1.pre2
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/atomorun/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Nov 2006 18:43:07 -0000	1.1
+++ .cvsignore	26 Nov 2006 18:44:44 -0000	1.2
@@ -0,0 +1 @@
+atomorun-1.1_pre2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/atomorun/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Nov 2006 18:43:07 -0000	1.1
+++ sources	26 Nov 2006 18:44:44 -0000	1.2
@@ -0,0 +1 @@
+41522a330c0da7c6e79c46baa2c1d8c3  atomorun-1.1_pre2.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 18:49:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:49:52 -0500
Subject: owners owners.list,1.2018,1.2019
Message-ID: <200611261849.kAQInqPl004670@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4655

Modified Files:
	owners.list 
Log Message:
added atomorun


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2018
retrieving revision 1.2019
diff -u -r1.2018 -r1.2019
--- owners.list	26 Nov 2006 13:57:20 -0000	1.2018
+++ owners.list	26 Nov 2006 18:49:22 -0000	1.2019
@@ -84,6 +84,7 @@
 Fedora Extras|atlas|Automatically Tuned Linear Algebra Software|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|atlascpp|WorldForge message protocol library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|atomix|Little mind game where you have to build molecules out of atoms lying around|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|atomorun|Jump&Run game where you have to flee an exploding nuclear bomb|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|audacious|A GTK2 based media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|aumix|Audio mixer based on ncurses|somlo at cmu.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 18:52:20 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 26 Nov 2006 13:52:20 -0500
Subject: comps comps-fe7.xml.in,1.30,1.31
Message-ID: <200611261852.kAQIqKkU004701@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4684

Modified Files:
	comps-fe7.xml.in 
Log Message:
add liquidwar, atomorun


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- comps-fe7.xml.in	25 Nov 2006 21:12:02 -0000	1.30
+++ comps-fe7.xml.in	26 Nov 2006 18:51:50 -0000	1.31
@@ -358,6 +358,7 @@
       alex4
       arrows
       atomix
+      atomorun
       auriferous
       ballbuster
       beneath-a-steel-sky
@@ -401,6 +402,7 @@
       gweled
       lacewing
       lincity-ng
+      liquidwar
       lmarbles
       lucidlife
       Maelstrom



From fedora-extras-commits at redhat.com  Sun Nov 26 19:54:05 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 26 Nov 2006 14:54:05 -0500
Subject: rpms/gaim-meanwhile/devel
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-04_blist-memleak.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch, NONE,
	1.1 gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch,
	NONE, 1.1 gaim-2.0.0beta5-silc-edit-account-crash.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 gaim-meanwhile.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200611261954.kAQJs58P008226@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8128

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Added Files:
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch 
	gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch 
	gaim-2.0.0beta5-debian-04_blist-memleak.patch 
	gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch 
	gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch 
	gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch 
	gaim-2.0.0beta5-silc-edit-account-crash.patch 
Log Message:
Update to latest beta code


gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch:

--- NEW FILE gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch ---
--- console/plugins/gnthistory.orig	2006-10-18 20:54:41.000000000 -0400
+++ console/plugins/gnthistory.c	2006-10-18 20:54:45.000000000 -0400
@@ -173,7 +173,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	NULL,
+	GAIM_GNT_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,

gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch:

--- NEW FILE gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch ---
diff -Nur gaim-2.0.0+beta5/gtk/gtksound.c gaim-2.0.0+beta5.new/gtk/gtksound.c
--- gaim-2.0.0+beta5/gtk/gtksound.c	2006-11-10 02:23:00.000000000 -0500
+++ gaim-2.0.0+beta5.new/gtk/gtksound.c	2006-11-11 15:44:05.000000000 -0500
@@ -448,9 +448,7 @@
 		return;
 	volume = (float)(CLAMP(gaim_prefs_get_int("/gaim/gtk/sound/volume"),0,100)) / 50;
 	if (!strcmp(method, "automatic")) {
-		if (gaim_running_gnome()) {
-			sink = gst_element_factory_make("gconfaudiosink", "sink");
-		}
+		sink = gst_element_factory_make("gconfaudiosink", "sink");
 		if (!sink)
 			sink = gst_element_factory_make("autoaudiosink", "sink");
 	} else if (!strcmp(method, "esd")) {

gaim-2.0.0beta5-debian-04_blist-memleak.patch:

--- NEW FILE gaim-2.0.0beta5-debian-04_blist-memleak.patch ---
--- trunk/gtk/gtkblist.c	(revision 17621)
+++ trunk/gtk/gtkblist.c	(revision 17774)
@@ -560,7 +560,7 @@
 rebuild_joinchat_entries(GaimGtkJoinChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -569,11 +569,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 	data->entries = NULL;
@@ -5111,7 +5108,7 @@
 rebuild_addchat_entries(GaimGtkAddChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -5120,11 +5117,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 
@@ -5965,8 +5959,7 @@
 		menuitem = l->data;
 
 		if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Add\\/Edit")))
-			gtk_container_remove(GTK_CONTAINER(accountmenu),
-			                     menuitem);
+			gtk_widget_destroy(menuitem);
 	}
 
 	for (accounts = gaim_accounts_get_all(); accounts; accounts = accounts->next) {
@@ -6122,23 +6115,7 @@
 
 	/* Remove old plugin action submenus from the Tools menu */
 	for (l = plugin_submenus; l; l = l->next)
-	{
-		GList *menuitems;
-
-		submenu = l->data;
-
-		menuitems = gtk_container_get_children(GTK_CONTAINER(submenu));
-		while (menuitems != NULL)
-		{
-			GaimPluginAction *action;
-			menuitem = menuitems->data;
-			action = g_object_get_data(G_OBJECT(menuitem), "plugin_action");
-			g_free(action);
-			menuitems = g_list_delete_link(menuitems, menuitems);
-		}
-
-		gtk_container_remove(GTK_CONTAINER(pluginmenu), GTK_WIDGET(submenu));
-	}
+		gtk_widget_destroy(GTK_WIDGET(l->data));
 	g_list_free(plugin_submenus);
 	plugin_submenus = NULL;
 

gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch:

--- NEW FILE gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch ---
--- trunk/libgaim/gaim-url-handler	2006/09/12 09:04:04	17260
+++ trunk/libgaim/gaim-url-handler	2006/11/18 05:25:31	17773
@@ -189,15 +189,26 @@
 
 def xmpp(uri):
     protocol = "prpl-jabber"
-    match = re.match(r"^xmpp:(//([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
+    match = re.match(r"^xmpp:((//)?([^/?#]*))?(/?([^?#]*))(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
     if not match:
         print "Invalid xmpp URI: %s" % uri
         return
 
-    accountname = urllib.unquote_plus(match.group(2)) or ""
-    screenname = urllib.unquote_plus(match.group(4))
-    command = urllib.unquote_plus(match.group(6))
-    paramstring = match.group(8)
+    tmp = match.group(3)
+    if (tmp):
+        accountname = urllib.unquote_plus(tmp)
+    else:
+        accountname = ""
+
+    screenname = urllib.unquote_plus(match.group(5))
+
+    tmp = match.group(7)
+    if (tmp):
+        command = urllib.unquote_plus(tmp)
+    else:
+        command = ""
+
+    paramstring = match.group(9)
     params = {}
     if paramstring:
         for param in paramstring.split(";"):

gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch:

--- NEW FILE gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch ---
Index: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c	(revision 17787)
+++ trunk/libgaim/protocols/jabber/jabber.c	(revision 17788)
@@ -926,10 +926,17 @@
 	}
 
 	if(!js->gsc) {
-		if (gaim_proxy_connect(gc, account, server,
-				gaim_account_get_int(account, "port", 5222),
-				jabber_login_callback, gc) == NULL)
-			gaim_connection_error(gc, _("Unable to create socket"));
+		if (connect_server[0]) {
+			jabber_login_connect(js, server,
+			                     gaim_account_get_int(account,
+			                                          "port", 5222));
+		} else {
+			js->srv_query_data = gaim_srv_resolve("xmpp-client",
+			                                      "tcp",
+			                                      js->user->domain,
+			                                      srv_resolved_cb,
+			                                      js);
+		}
 	}
 }
 

gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch:

--- NEW FILE gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch ---
Index: trunk/libgaim/protocols/msn/object.c
===================================================================
--- trunk/libgaim/protocols/msn/object.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/object.c	(revision 17766)
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "object.h"
+#include "debug.h"
 
 #define GET_STRING_TAG(field, id) \
 	if ((tag = strstr(str, id "=\"")) != NULL) \
@@ -94,6 +95,7 @@
 	if (obj->creator == NULL || obj->size == 0 || obj->type == 0
 			|| obj->location == NULL || obj->friendly == NULL
 			|| obj->sha1d == NULL || obj->sha1c == NULL) {
+		gaim_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
 		msn_object_destroy(obj);
 		obj = NULL;
 	}
@@ -106,24 +108,13 @@
 {
 	g_return_if_fail(obj != NULL);
 
-	if (obj->creator != NULL)
-		g_free(obj->creator);
+	g_free(obj->creator);
+	g_free(obj->location);
+	g_free(obj->real_location);
+	g_free(obj->friendly);
+	g_free(obj->sha1d);
+	g_free(obj->sha1c);
 
-	if (obj->location != NULL)
-		g_free(obj->location);
-
-	if (obj->real_location != NULL)
-		g_free(obj->real_location);
-
-	if (obj->friendly != NULL)
-		g_free(obj->friendly);
-
-	if (obj->sha1d != NULL)
-		g_free(obj->sha1d);
-
-	if (obj->sha1c != NULL)
-		g_free(obj->sha1c);
-
 	if (obj->local)
 		local_objs = g_list_remove(local_objs, obj);
 
Index: trunk/libgaim/protocols/msn/slplink.c
===================================================================
--- trunk/libgaim/protocols/msn/slplink.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/slplink.c	(revision 17766)
@@ -147,6 +147,9 @@
 {
 	MsnSlpLink *slplink;
 
+	g_return_val_if_fail(session != NULL, NULL);
+	g_return_val_if_fail(username != NULL, NULL);
+
 	slplink = msn_session_find_slplink(session, username);
 
 	if (slplink == NULL)
Index: trunk/libgaim/protocols/msn/slp.c
===================================================================
--- trunk/libgaim/protocols/msn/slp.c	(revision 17765)
+++ trunk/libgaim/protocols/msn/slp.c	(revision 17766)
@@ -819,6 +819,9 @@
 		smile = tokens[tok];
 		obj = msn_object_new_from_string(gaim_url_decode(tokens[tok + 1]));
 
+		if (obj == NULL)
+			break;
+
 		who = msn_object_get_creator(obj);
 		sha1c = msn_object_get_sha1c(obj);
 

gaim-2.0.0beta5-silc-edit-account-crash.patch:

--- NEW FILE gaim-2.0.0beta5-silc-edit-account-crash.patch ---
http://gaim.svn.sourceforge.net/viewvc/gaim/trunk/gtk/gtkaccount.c?r1=17800&r2=17799&view=patch&pathrev=17800
We shouldn't be freeing kvp->value, which is put in the list store as G_TYPE_POINTER.
This was causing crashes for people editing SILC accounts (nothing else uses GAIM_PREF_STRING_LIST).

--- trunk/gtk/gtkaccount.c	2006/11/21 04:34:38	17799
+++ trunk/gtk/gtkaccount.c	2006/11/21 05:32:55	17800
@@ -810,7 +810,7 @@
 					if (node->data != NULL) {
 						kvp = (GaimKeyValuePair *) node->data;
 						if ((kvp->value != NULL) && (str_value != NULL) &&
-							!g_utf8_collate(kvp->value, str_value))
+						    !g_utf8_collate(kvp->value, str_value))
 							idx = i;
 
 						gtk_list_store_append(model, &iter);
@@ -1247,7 +1247,6 @@
 					gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter);
 					gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1);
 					gaim_account_set_string(account, setting, value2);
-					g_free(value2);
 					break;
 
 				default:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	31 Oct 2006 01:31:13 -0000	1.10
+++ .cvsignore	26 Nov 2006 19:53:35 -0000	1.11
@@ -1 +1 @@
-gaim-2.0.0beta4.tar.bz2
+gaim-2.0.0beta5.tar.bz2


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gaim-meanwhile.spec	31 Oct 2006 01:31:13 -0000	1.16
+++ gaim-meanwhile.spec	26 Nov 2006 19:53:35 -0000	1.17
@@ -23,7 +23,7 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta4
+%define betaver	beta5
 
 Name:		gaim-meanwhile
 Version:	2.0.0
@@ -52,6 +52,16 @@
 # to be replaced by upstream fix
 Patch5:		gaim2-PIE.patch
 
+## Patches 100+: To be Included in Future Upstream
+Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
+Patch103: gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch
+Patch104: gaim-2.0.0beta5-debian-04_blist-memleak.patch
+Patch105: gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch
+Patch106: gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch
+Patch107: gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch
+
+Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
 
@@ -88,7 +98,7 @@
 %endif
 # Evolution integration (FC3+)
 %if %{evolution_integration}
-BuildRequires:	evolution-data-server-devel >= 1.9.1
+BuildRequires:	evolution-data-server-devel
 %endif
 # SILC integration (FC3+)
 %if %{silc_integration}
@@ -121,8 +131,16 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
-#PIE patch is broken
 #%patch5 -p1
+## Patches 100+: To be Included in Future Upstream
+%patch102 -p0
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+
+%patch150 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Oct 2006 01:31:13 -0000	1.10
+++ sources	26 Nov 2006 19:53:35 -0000	1.11
@@ -1 +1 @@
-ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2
+84099216123de25402fa7e904ceca437  gaim-2.0.0beta5.tar.bz2



From fedora-extras-commits at redhat.com  Sun Nov 26 20:10:09 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Sun, 26 Nov 2006 15:10:09 -0500
Subject: owners owners.list,1.2019,1.2020
Message-ID: <200611262010.kAQKA93d011372@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11353

Modified Files:
	owners.list 
Log Message:
Add audacious-plugins


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2019
retrieving revision 1.2020
diff -u -r1.2019 -r1.2020
--- owners.list	26 Nov 2006 18:49:22 -0000	1.2019
+++ owners.list	26 Nov 2006 20:09:39 -0000	1.2020
@@ -86,6 +86,7 @@
 Fedora Extras|atomix|Little mind game where you have to build molecules out of atoms lying around|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|atomorun|Jump&Run game where you have to flee an exploding nuclear bomb|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|audacious|A GTK2 based media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
+Fedora Extras|audacious-plugins|Plugins for the Audacious media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|aumix|Audio mixer based on ncurses|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|auriferous|Game inspired by the classic Loderunner|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Nov 26 20:17:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 26 Nov 2006 15:17:04 -0500
Subject: rpms/pcsc-tools/FC-6 .cvsignore, 1.8, 1.9 pcsc-tools.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200611262017.kAQKH4wD011444@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11410/FC-6

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Log Message:
* Sun Nov 26 2006 Ville Skytt??  - 1.4.8-1
- 1.4.8.
- Drop X-Fedora desktop entry category.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Oct 2006 16:27:18 -0000	1.8
+++ .cvsignore	26 Nov 2006 20:16:34 -0000	1.9
@@ -1,2 +1 @@
-pcsc-tools-1.4.7.tar.gz
-smartcard_list.txt
+pcsc-tools-1.4.8.tar.gz


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-6/pcsc-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pcsc-tools.spec	8 Oct 2006 16:27:18 -0000	1.9
+++ pcsc-tools.spec	26 Nov 2006 20:16:34 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           pcsc-tools
-Version:        1.4.7
+Version:        1.4.8
 Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
@@ -7,7 +7,7 @@
 License:        GPL
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
-Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
+#Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,7 +25,7 @@
 %prep
 %setup -q
 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
-cp %{SOURCE1} .
+#cp %{SOURCE1} .
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
@@ -36,12 +36,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT%{_prefix}
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode=644 \
-  --add-category=X-Fedora \
-  gscriptor.desktop
+desktop-file-install --vendor=fedora --mode=644 \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications gscriptor.desktop
 # TODO: icon
 
 
@@ -52,13 +48,23 @@
 %files
 %defattr(-,root,root,-)
 %doc Changelog LICENCE README TODO
-%{_bindir}/*
+%{_bindir}/ATR_analysis
+%{_bindir}/gscriptor
+%{_bindir}/pcsc_scan
+%{_bindir}/scriptor
 %{_datadir}/applications/*gscriptor.desktop
 %{_datadir}/pcsc/
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/ATR_analysis.1*
+%{_mandir}/man1/gscriptor.1*
+%{_mandir}/man1/pcsc_scan.1*
+%{_mandir}/man1/scriptor.1*
 
 
 %changelog
+* Sun Nov 26 2006 Ville Skytt??  - 1.4.8-1
+- 1.4.8.
+- Drop X-Fedora desktop entry category.
+
 * Sun Oct  8 2006 Ville Skytt??  - 1.4.7-1
 - 1.4.7, Oct 8 smartcard_list.txt.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Oct 2006 16:27:18 -0000	1.8
+++ sources	26 Nov 2006 20:16:34 -0000	1.9
@@ -1,2 +1 @@
-fb4129779df83a0eb57e8bdf7fec1535  pcsc-tools-1.4.7.tar.gz
-371764708e8690d67f23af02c44320bb  smartcard_list.txt
+f0086eab17b61aba496cd88af8b80332  pcsc-tools-1.4.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 20:17:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 26 Nov 2006 15:17:04 -0500
Subject: rpms/pcsc-tools/devel .cvsignore, 1.8, 1.9 pcsc-tools.spec, 1.9,
	1.10 sources, 1.8, 1.9
Message-ID: <200611262017.kAQKH4l6011449@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11410/devel

Modified Files:
	.cvsignore pcsc-tools.spec sources 
Log Message:
* Sun Nov 26 2006 Ville Skytt??  - 1.4.8-1
- 1.4.8.
- Drop X-Fedora desktop entry category.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Oct 2006 16:27:18 -0000	1.8
+++ .cvsignore	26 Nov 2006 20:16:34 -0000	1.9
@@ -1,2 +1 @@
-pcsc-tools-1.4.7.tar.gz
-smartcard_list.txt
+pcsc-tools-1.4.8.tar.gz


Index: pcsc-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pcsc-tools.spec	8 Oct 2006 16:27:18 -0000	1.9
+++ pcsc-tools.spec	26 Nov 2006 20:16:34 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           pcsc-tools
-Version:        1.4.7
+Version:        1.4.8
 Release:        1%{?dist}
 Summary:        Tools to be used with smart cards and PC/SC
 
@@ -7,7 +7,7 @@
 License:        GPL
 URL:            http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 Source0:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/%{name}-%{version}.tar.gz
-Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
+#Source1:        http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,7 +25,7 @@
 %prep
 %setup -q
 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile
-cp %{SOURCE1} .
+#cp %{SOURCE1} .
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
@@ -36,12 +36,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT%{_prefix}
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode=644 \
-  --add-category=X-Fedora \
-  gscriptor.desktop
+desktop-file-install --vendor=fedora --mode=644 \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications gscriptor.desktop
 # TODO: icon
 
 
@@ -52,13 +48,23 @@
 %files
 %defattr(-,root,root,-)
 %doc Changelog LICENCE README TODO
-%{_bindir}/*
+%{_bindir}/ATR_analysis
+%{_bindir}/gscriptor
+%{_bindir}/pcsc_scan
+%{_bindir}/scriptor
 %{_datadir}/applications/*gscriptor.desktop
 %{_datadir}/pcsc/
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/ATR_analysis.1*
+%{_mandir}/man1/gscriptor.1*
+%{_mandir}/man1/pcsc_scan.1*
+%{_mandir}/man1/scriptor.1*
 
 
 %changelog
+* Sun Nov 26 2006 Ville Skytt??  - 1.4.8-1
+- 1.4.8.
+- Drop X-Fedora desktop entry category.
+
 * Sun Oct  8 2006 Ville Skytt??  - 1.4.7-1
 - 1.4.7, Oct 8 smartcard_list.txt.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Oct 2006 16:27:18 -0000	1.8
+++ sources	26 Nov 2006 20:16:34 -0000	1.9
@@ -1,2 +1 @@
-fb4129779df83a0eb57e8bdf7fec1535  pcsc-tools-1.4.7.tar.gz
-371764708e8690d67f23af02c44320bb  smartcard_list.txt
+f0086eab17b61aba496cd88af8b80332  pcsc-tools-1.4.8.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 21:47:21 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 26 Nov 2006 16:47:21 -0500
Subject: rpms/xfce4-notes-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-notes-plugin.spec, 1.5, 1.6
Message-ID: <200611262147.kAQLlLLq015008@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14987

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
update to 1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 12:43:10 -0000	1.3
+++ .cvsignore	26 Nov 2006 21:46:51 -0000	1.4
@@ -1 +1 @@
-xfce4-notes-plugin-1.3.99.1.tar.bz2
+xfce4-notes-plugin-1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 12:43:10 -0000	1.3
+++ sources	26 Nov 2006 21:46:51 -0000	1.4
@@ -1 +1 @@
-e77f1150459d8ab6a1ae0d86af09f44c  xfce4-notes-plugin-1.3.99.1.tar.bz2
+5f466f0ccb68b1f14ded77571baa1145  xfce4-notes-plugin-1.4.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-notes-plugin.spec	5 Oct 2006 12:43:10 -0000	1.5
+++ xfce4-notes-plugin.spec	26 Nov 2006 21:46:51 -0000	1.6
@@ -1,11 +1,11 @@
 Name:		xfce4-notes-plugin
-Version:	1.3.99.1
-Release:	3%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://goodies.xfce.org/
+URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +42,9 @@
 %{_bindir}/xfce4-popup-notes
 
 %changelog
+* Sun Nov 26 2006 Christoph Wickert  - 1.4-1
+- Update to 1.4.
+
 * Thu Oct 05 2006 Christoph Wickert  - 1.3.99.1-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sun Nov 26 21:50:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 26 Nov 2006 16:50:23 -0500
Subject: rpms/xfce4-notes-plugin/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 xfce4-notes-plugin.spec, 1.5, 1.6
Message-ID: <200611262150.kAQLoNTo015090@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15071

Modified Files:
	.cvsignore sources xfce4-notes-plugin.spec 
Log Message:
update to 1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Oct 2006 12:43:10 -0000	1.3
+++ .cvsignore	26 Nov 2006 21:49:53 -0000	1.4
@@ -1 +1 @@
-xfce4-notes-plugin-1.3.99.1.tar.bz2
+xfce4-notes-plugin-1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2006 12:43:10 -0000	1.3
+++ sources	26 Nov 2006 21:49:53 -0000	1.4
@@ -1 +1 @@
-e77f1150459d8ab6a1ae0d86af09f44c  xfce4-notes-plugin-1.3.99.1.tar.bz2
+5f466f0ccb68b1f14ded77571baa1145  xfce4-notes-plugin-1.4.tar.bz2


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-6/xfce4-notes-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-notes-plugin.spec	5 Oct 2006 12:43:10 -0000	1.5
+++ xfce4-notes-plugin.spec	26 Nov 2006 21:49:53 -0000	1.6
@@ -1,11 +1,11 @@
 Name:		xfce4-notes-plugin
-Version:	1.3.99.1
-Release:	3%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPL
-URL:		http://goodies.xfce.org/
+URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +42,9 @@
 %{_bindir}/xfce4-popup-notes
 
 %changelog
+* Sun Nov 26 2006 Christoph Wickert  - 1.4-1
+- Update to 1.4.
+
 * Thu Oct 05 2006 Christoph Wickert  - 1.3.99.1-3
 - Bump release for devel checkin.
 



From fedora-extras-commits at redhat.com  Sun Nov 26 22:36:20 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sun, 26 Nov 2006 17:36:20 -0500
Subject: rpms/python-vobject/FC-6 .cvsignore, 1.4, 1.5 python-vobject.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611262236.kAQMaKGv018315@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18296

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
0.4.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 19:24:14 -0000	1.4
+++ .cvsignore	26 Nov 2006 22:35:50 -0000	1.5
@@ -1 +1 @@
-vobject-0.4.3.tar.gz
+vobject-0.4.4.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-6/python-vobject.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-vobject.spec	7 Oct 2006 19:24:14 -0000	1.4
+++ python-vobject.spec	26 Nov 2006 22:35:50 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.4.3 
+Version:        0.4.4 
 Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
@@ -73,6 +73,9 @@
 %{python_sitelib}/vobject*egg-info
 
 %changelog
+* Sun Nov 26 2006 James Bowes  - 0.4.4-1
+- New version released.
+
 * Sat Oct 07 2006 James Bowes  - 0.4.3-1
 - New version released.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 19:24:14 -0000	1.4
+++ sources	26 Nov 2006 22:35:50 -0000	1.5
@@ -1 +1 @@
-f6405e4620dfcc403f53b825d2eee529  vobject-0.4.3.tar.gz
+d0ee0a3f6a78212cf49c7f1c2de2d9c0  vobject-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 22:42:08 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sun, 26 Nov 2006 17:42:08 -0500
Subject: rpms/python-vobject/devel .cvsignore, 1.4, 1.5 python-vobject.spec, 
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611262242.kAQMg867018426@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/python-vobject/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18407

Modified Files:
	.cvsignore python-vobject.spec sources 
Log Message:
0.4.4-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Oct 2006 19:24:14 -0000	1.4
+++ .cvsignore	26 Nov 2006 22:41:38 -0000	1.5
@@ -1 +1 @@
-vobject-0.4.3.tar.gz
+vobject-0.4.4.tar.gz


Index: python-vobject.spec
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/python-vobject.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-vobject.spec	7 Oct 2006 19:24:14 -0000	1.4
+++ python-vobject.spec	26 Nov 2006 22:41:38 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-vobject 
-Version:        0.4.3 
+Version:        0.4.4 
 Release:        1%{?dist}
 Summary:        A python library for manipulating vCard and vCalendar files
 
@@ -73,6 +73,9 @@
 %{python_sitelib}/vobject*egg-info
 
 %changelog
+* Sun Nov 26 2006 James Bowes  - 0.4.4-1
+- New version released.
+
 * Sat Oct 07 2006 James Bowes  - 0.4.3-1
 - New version released.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-vobject/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Oct 2006 19:24:14 -0000	1.4
+++ sources	26 Nov 2006 22:41:38 -0000	1.5
@@ -1 +1 @@
-f6405e4620dfcc403f53b825d2eee529  vobject-0.4.3.tar.gz
+d0ee0a3f6a78212cf49c7f1c2de2d9c0  vobject-0.4.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Nov 26 23:02:29 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:02:29 -0500
Subject: rpms/firefox-32 - New directory
Message-ID: <200611262302.kAQN2Tv3021644@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/firefox-32

Log Message:
Directory /cvs/extras/rpms/firefox-32 added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 23:02:35 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:02:35 -0500
Subject: rpms/firefox-32/devel - New directory
Message-ID: <200611262302.kAQN2ZhX021657@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640/firefox-32/devel

Log Message:
Directory /cvs/extras/rpms/firefox-32/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Nov 26 23:02:46 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:02:46 -0500
Subject: rpms/firefox-32 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611262302.kAQN2kpw021687@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21681

Added Files:
	Makefile import.log 
Log Message:
Setup of module firefox-32


--- NEW FILE Makefile ---
# Top level Makefile for module firefox-32
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 Nov 26 23:02:51 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:02:51 -0500
Subject: rpms/firefox-32/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611262302.kAQN2pfT021702@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21681/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module firefox-32


--- 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 Nov 26 23:03:06 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:03:06 -0500
Subject: rpms/firefox-32/devel firefox-32.desktop, NONE, 1.1 firefox-32.spec,
	NONE, 1.1 setup-firefox-32.sh, NONE, 1.1
Message-ID: <200611262303.kAQN36sr021762@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21744/devel

Added Files:
	firefox-32.desktop firefox-32.spec setup-firefox-32.sh 
Log Message:
auto-import firefox-32-0.0.1-4 on branch devel from firefox-32-0.0.1-4.src.rpm


--- NEW FILE firefox-32.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Firefox Web Browser (32 bit)
GenericName=Web Browser
Comment=Browse the Web
Exec=firefox-32 %u
Icon=redhat-web-browser.png
Terminal=false
Type=Application
NoDisplay=false
Categories=Network;Application;X-Fedora;
StartupNotify=true


--- NEW FILE firefox-32.spec ---
Name:           firefox-32
Version:        0.0.1
Release:        4%{?dist}
Summary:        Alternate Launcher for 32bit Firefox

Group:          Applications/Internet
License:        Public Domain
URL:            http://people.redhat.com/wtogami/firefox-32
# This is a shell script maintained in the package SCM, so there is no upstream.
Source0:        setup-firefox-32.sh
Source1:        firefox-32.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# This is actually noarch (shell script) , but it only makes sense to install on these archs
ExclusiveArch:  x86_64 ppc64 s390x
BuildArch:      noarch
BuildRequires:  desktop-file-utils
# Unfortunately, we cannot have a Requires line that explicitly means /usr/lib/ 32bit firefox.
Requires:       firefox

%description
Alternate Launcher for 32bit Firefox on Multilib Systems
If you have both 32bit and 64bit Firefox installed, the standard 
/usr/bin/firefox launcher will run only the 64bit version.  This 
launcher allows you to choose to run the 32bit browser by running 
/usr/bin/firefox-32.  Please be sure  that all Firefox instances 
are closed before running this launcher.

# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214100
# This package exists because a few simple lines of logic were rejected
# from the main Fedora firefox package that would have provided the 
# ability to easily choose your runtime arch on a multilib system.
# For the long-term, Fedora hopes to obviate the need to run a 32bit
# browser entirely by getting nspluginwrapper to work fully instead.

%prep
echo "Nothing to prep!"

%build
echo "Nothing to build!"

%install
rm -rf $RPM_BUILD_ROOT
install -D -m 0755 %SOURCE0 $RPM_BUILD_ROOT%{_libdir}/firefox-32/setup-firefox-32.sh
mkdir -p   $RPM_BUILD_ROOT%{_bindir}
touch      $RPM_BUILD_ROOT%{_bindir}/firefox-32
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/firefox-32

desktop-file-install --vendor="fedora"                     \
        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications    \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

# Upon install, generate /usr/bin/firefox-32 based upon the contents of /usr/bin/firefox
%post
%{_libdir}/firefox-32/setup-firefox-32.sh

# Whenever firefox is upgraded, regenerate /usr/bin/firefox-32
%triggerin -- firefox
%{_libdir}/firefox-32/setup-firefox-32.sh

%files
%defattr(-,root,root,-)
# libdir instead of /usr/share because it is meant to be executable
# only on 64bit multilib systems
%{_libdir}/firefox-32/setup-firefox-32.sh
%dir %{_libdir}/firefox-32/
%{_datadir}/applications/fedora-firefox-32.desktop
%ghost %{_bindir}/firefox-32

%changelog
* Sun Nov 26 2006 Christopher Stone  - 0.0.1-4
- Add desktop-file-install command to install .desktop entry
- Modify .desktop entry to more closely match firefox
- Add BuildArch: noarch

* Sun Nov 26 2006 Warren Togami  - 0.0.1-3
- change license to Public Domain
- own firefox-32 directory
- fix .desktop file s/True/true/

* Wed Nov 22 2006 Warren Togami  - 0.0.1-2
- use Source instead of Patch for source files (#215256)

* Sun Nov 12 2006 Warren Togami  - 0.0.1-1
- initial version


--- NEW FILE setup-firefox-32.sh ---
#!/bin/bash
FIREFOX32=/usr/bin/firefox-32
cp /usr/bin/firefox $FIREFOX32
sed -i "s/lib64/lib/g" $FIREFOX32



From fedora-extras-commits at redhat.com  Sun Nov 26 23:03:36 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:03:36 -0500
Subject: rpms/firefox-32 import.log,1.1,1.2
Message-ID: <200611262303.kAQN3a6o021776@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21744

Modified Files:
	import.log 
Log Message:
auto-import firefox-32-0.0.1-4 on branch devel from firefox-32-0.0.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/firefox-32/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Nov 2006 23:02:46 -0000	1.1
+++ import.log	26 Nov 2006 23:03:06 -0000	1.2
@@ -0,0 +1 @@
+firefox-32-0_0_1-4:HEAD:firefox-32-0.0.1-4.src.rpm:1164582290



From fedora-extras-commits at redhat.com  Sun Nov 26 23:06:54 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:06:54 -0500
Subject: rpms/firefox-32/devel firefox-32.spec,1.1,1.2
Message-ID: <200611262306.kAQN6stW021833@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21818

Modified Files:
	firefox-32.spec 
Log Message:
remove erroneous buildarch



Index: firefox-32.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox-32/devel/firefox-32.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-32.spec	26 Nov 2006 23:03:06 -0000	1.1
+++ firefox-32.spec	26 Nov 2006 23:06:24 -0000	1.2
@@ -13,7 +13,6 @@
 
 # This is actually noarch (shell script) , but it only makes sense to install on these archs
 ExclusiveArch:  x86_64 ppc64 s390x
-BuildArch:      noarch
 BuildRequires:  desktop-file-utils
 # Unfortunately, we cannot have a Requires line that explicitly means /usr/lib/ 32bit firefox.
 Requires:       firefox



From fedora-extras-commits at redhat.com  Sun Nov 26 23:08:39 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 26 Nov 2006 18:08:39 -0500
Subject: rpms/firefox-32/devel firefox-32.spec,1.2,1.3
Message-ID: <200611262308.kAQN8dSi021858@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/firefox-32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21839

Modified Files:
	firefox-32.spec 
Log Message:
bump



Index: firefox-32.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox-32/devel/firefox-32.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- firefox-32.spec	26 Nov 2006 23:06:24 -0000	1.2
+++ firefox-32.spec	26 Nov 2006 23:08:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           firefox-32
 Version:        0.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Alternate Launcher for 32bit Firefox
 
 Group:          Applications/Internet
@@ -70,6 +70,9 @@
 %ghost %{_bindir}/firefox-32
 
 %changelog
+* Sun Nov 26 2006 Warren Togami  - 0.0.1-5
+- remove buildarch: noarch
+
 * Sun Nov 26 2006 Christopher Stone  - 0.0.1-4
 - Add desktop-file-install command to install .desktop entry
 - Modify .desktop entry to more closely match firefox



From fedora-extras-commits at redhat.com  Sun Nov 26 23:32:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 26 Nov 2006 18:32:12 -0500
Subject: comps comps-fe6.xml.in,1.230,1.231 comps-fe7.xml.in,1.31,1.32
Message-ID: <200611262332.kAQNWCgh022043@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22023

Modified Files:
	comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add xfce4-dict-plugin xfce4-eyes-plugin and xfce4-dev-tools


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- comps-fe6.xml.in	23 Nov 2006 19:09:47 -0000	1.230
+++ comps-fe6.xml.in	26 Nov 2006 23:31:42 -0000	1.231
@@ -1152,7 +1152,9 @@
       xfce4-clipman-plugin
       xfce4-cpugraph-plugin
       xfce4-datetime-plugin
+      xfce4-dict-plugin
       xfce4-diskperf-plugin
+      xfce4-eyes-plugin
       xfce4-fsguard-plugin
       xfce4-genmon-plugin
       xfce4-minicmd-plugin
@@ -1188,6 +1190,7 @@
       xfce-mcs-manager-devel
       xfce4-panel-devel
       xfce4-session-devel
+      xfce4-dev-tools
     
   
   


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- comps-fe7.xml.in	26 Nov 2006 18:51:50 -0000	1.31
+++ comps-fe7.xml.in	26 Nov 2006 23:31:42 -0000	1.32
@@ -1157,7 +1157,9 @@
       xfce4-clipman-plugin
       xfce4-cpugraph-plugin
       xfce4-datetime-plugin
+      xfce4-dict-plugin
       xfce4-diskperf-plugin
+      xfce4-eyes-plugin
       xfce4-fsguard-plugin
       xfce4-genmon-plugin
       xfce4-minicmd-plugin
@@ -1193,6 +1195,7 @@
       xfce-mcs-manager-devel
       xfce4-panel-devel
       xfce4-session-devel
+      xfce4-dev-tools
     
   
   



From fedora-extras-commits at redhat.com  Sun Nov 26 23:58:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun, 26 Nov 2006 18:58:04 -0500
Subject: rpms/kaffeine/devel .cvsignore, 1.2, 1.3 kaffeine.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611262358.kAQNw4DC022146@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22127

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Sun Nov 26 2006 Rex Dieter  0.8.3-1
- 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
+++ .cvsignore	26 Nov 2006 23:57:34 -0000	1.3
@@ -1 +1,2 @@
 kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kaffeine.spec	14 Nov 2006 04:11:06 -0000	1.1
+++ kaffeine.spec	26 Nov 2006 23:57:34 -0000	1.2
@@ -11,29 +11,26 @@
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?dist}
 
+%if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
-
 %define  _with_lame --with-lame
 Requires: kaffeine = %{version}
 Patch1: kaffeine-0.8.2-codecs.patch
 # split occurred here
 Conflicts: kaffeine < 0.8.2-2
-
 %else
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %endif
 
-Version: 0.8.2
-Release: 5%{?dist}
-
 License: GPL
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -108,7 +105,7 @@
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
@@ -205,6 +202,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Rex Dieter  0.8.3-1
+- 0.8.3
+
 * Sat Nov 04 2006 Rex Dieter  0.8.2-6
 - %%doc README
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2006 04:11:06 -0000	1.2
+++ sources	26 Nov 2006 23:57:34 -0000	1.3
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 01:58:07 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 26 Nov 2006 20:58:07 -0500
Subject: comps comps-fe7.xml.in,1.32,1.33
Message-ID: <200611270158.kAR1w71u032536@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32521

Modified Files:
	comps-fe7.xml.in 
Log Message:
Added tclpro




Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- comps-fe7.xml.in	26 Nov 2006 23:31:42 -0000	1.32
+++ comps-fe7.xml.in	27 Nov 2006 01:57:37 -0000	1.33
@@ -197,6 +197,7 @@
       svnmailer
       sysconftool
       sysprof
+      tclpro
       tkcvs
       tla
       tolua++



From fedora-extras-commits at redhat.com  Mon Nov 27 03:30:06 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 26 Nov 2006 22:30:06 -0500
Subject: rpms/ddclient/FC-6 .cvsignore, 1.3, 1.4 ddclient.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200611270330.kAR3U6bw006611@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/ddclient/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6592

Modified Files:
	.cvsignore ddclient.spec sources 
Log Message:
Update to latest 3.6 release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ddclient/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2005 07:13:12 -0000	1.3
+++ .cvsignore	27 Nov 2006 03:29:36 -0000	1.4
@@ -1 +1 @@
-ddclient-3.6.6.tar.bz2
+ddclient-3.6.7.tar.bz2


Index: ddclient.spec
===================================================================
RCS file: /cvs/extras/rpms/ddclient/FC-6/ddclient.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ddclient.spec	20 Sep 2006 18:51:13 -0000	1.7
+++ ddclient.spec	27 Nov 2006 03:29:36 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           ddclient
-Version:        3.6.6
+Version:        3.6.7
 Release:        2%{?dist}
 Summary:        Client to update dynamic DNS host entries
 
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Josh Boyer  - 3.6.7-1
+- Update to latest 3.6 release
+
 * Sat Jul 30 2005 Ville Skytt??  - 3.6.6-1
 - 3.6.6, update URLs (#165272).
 - Restart service on future package upgrades (still manually needed this time).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ddclient/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2005 07:13:12 -0000	1.3
+++ sources	27 Nov 2006 03:29:36 -0000	1.4
@@ -1 +1 @@
-5fd0f82446fbed857c841a4deb83cdb9  ddclient-3.6.6.tar.bz2
+b07a29a891dcf40b941b9bc5ef3ce598  ddclient-3.6.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 04:19:28 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 26 Nov 2006 23:19:28 -0500
Subject: rpms/perl-Cache-Simple-TimedExpiry/devel .cvsignore, 1.3,
	1.4 perl-Cache-Simple-TimedExpiry.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611270419.kAR4JS9m010017@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9996

Modified Files:
	.cvsignore perl-Cache-Simple-TimedExpiry.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2006 11:48:21 -0000	1.3
+++ .cvsignore	27 Nov 2006 04:18:58 -0000	1.4
@@ -1 +1 @@
-Cache-Simple-TimedExpiry-0.26.tar.gz
+Cache-Simple-TimedExpiry-0.27.tar.gz


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/devel/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Cache-Simple-TimedExpiry.spec	5 Sep 2006 11:48:21 -0000	1.4
+++ perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:18:58 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Cache-Simple-TimedExpiry
-Version: 	0.26
+Version: 	0.27
 Release: 	1%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL or Artistic
@@ -41,6 +41,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 0.26-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2006 11:48:21 -0000	1.3
+++ sources	27 Nov 2006 04:18:58 -0000	1.4
@@ -1 +1 @@
-f44e43af0a29ac4effb702e016650512  Cache-Simple-TimedExpiry-0.26.tar.gz
+4ef124ab7776f3c257b9ffbed917e67a  Cache-Simple-TimedExpiry-0.27.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 04:21:19 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 26 Nov 2006 23:21:19 -0500
Subject: rpms/perl-Cache-Simple-TimedExpiry/FC-6 .cvsignore, 1.3,
	1.4 perl-Cache-Simple-TimedExpiry.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200611270421.kAR4LJwP010080@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10061

Modified Files:
	.cvsignore perl-Cache-Simple-TimedExpiry.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2006 11:48:21 -0000	1.3
+++ .cvsignore	27 Nov 2006 04:20:49 -0000	1.4
@@ -1 +1 @@
-Cache-Simple-TimedExpiry-0.26.tar.gz
+Cache-Simple-TimedExpiry-0.27.tar.gz


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-6/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Cache-Simple-TimedExpiry.spec	5 Sep 2006 11:48:21 -0000	1.4
+++ perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:20:49 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Cache-Simple-TimedExpiry
-Version: 	0.26
+Version: 	0.27
 Release: 	1%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL or Artistic
@@ -41,6 +41,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
+- Upstream update.
+
 * Tue Sep 05 2006 Ralf Cors??pius  - 0.26-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2006 11:48:21 -0000	1.3
+++ sources	27 Nov 2006 04:20:49 -0000	1.4
@@ -1 +1 @@
-f44e43af0a29ac4effb702e016650512  Cache-Simple-TimedExpiry-0.26.tar.gz
+4ef124ab7776f3c257b9ffbed917e67a  Cache-Simple-TimedExpiry-0.27.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 04:48:13 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Sun, 26 Nov 2006 23:48:13 -0500
Subject: rpms/perl-Cache-Simple-TimedExpiry/FC-5 .cvsignore, 1.2,
	1.3 perl-Cache-Simple-TimedExpiry.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611270448.kAR4mDKL010149@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10130

Modified Files:
	.cvsignore perl-Cache-Simple-TimedExpiry.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2005 15:14:16 -0000	1.2
+++ .cvsignore	27 Nov 2006 04:47:43 -0000	1.3
@@ -1 +1 @@
-Cache-Simple-TimedExpiry-0.23.tar.gz
+Cache-Simple-TimedExpiry-0.27.tar.gz


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-5/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Cache-Simple-TimedExpiry.spec	24 Feb 2006 04:39:58 -0000	1.2
+++ perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 04:47:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
-Version: 	0.23
-Release: 	3%{?dist}
+Version: 	0.27
+Release: 	1%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -41,6 +41,15 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.26-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.23-4
+- Mass rebuild.
+
 * Fri Feb 24 2006 Ralf Cors??pius  - 0.23-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2005 15:14:16 -0000	1.2
+++ sources	27 Nov 2006 04:47:43 -0000	1.3
@@ -1 +1 @@
-35cb46fc96272591db75491c9250a48d  Cache-Simple-TimedExpiry-0.23.tar.gz
+4ef124ab7776f3c257b9ffbed917e67a  Cache-Simple-TimedExpiry-0.27.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 05:50:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 00:50:39 -0500
Subject: rpms/perl-Cache-Simple-TimedExpiry/FC-4 .cvsignore, 1.2,
	1.3 perl-Cache-Simple-TimedExpiry.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200611270550.kAR5odIT013934@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13911

Modified Files:
	.cvsignore perl-Cache-Simple-TimedExpiry.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Aug 2005 15:14:16 -0000	1.2
+++ .cvsignore	27 Nov 2006 05:50:09 -0000	1.3
@@ -1 +1 @@
-Cache-Simple-TimedExpiry-0.23.tar.gz
+Cache-Simple-TimedExpiry-0.27.tar.gz


Index: perl-Cache-Simple-TimedExpiry.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-4/perl-Cache-Simple-TimedExpiry.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Cache-Simple-TimedExpiry.spec	26 Aug 2005 15:14:16 -0000	1.1
+++ perl-Cache-Simple-TimedExpiry.spec	27 Nov 2006 05:50:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		perl-Cache-Simple-TimedExpiry
-Version: 	0.23
-Release: 	2%{?dist}
+Version: 	0.27
+Release: 	1%{?dist}
 Summary: 	A lightweight cache with timed expiration
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -41,6 +41,18 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.27-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.26-1
+- Upstream update.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 0.23-4
+- Mass rebuild.
+
+* Fri Feb 24 2006 Ralf Cors??pius  - 0.23-3
+- Rebuild for perl-5.8.8.
+
 * Fri Aug 26 2005 Ralf Corsepius  - 0.23-2
 - Spec cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cache-Simple-TimedExpiry/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Aug 2005 15:14:16 -0000	1.2
+++ sources	27 Nov 2006 05:50:09 -0000	1.3
@@ -1 +1 @@
-35cb46fc96272591db75491c9250a48d  Cache-Simple-TimedExpiry-0.23.tar.gz
+4ef124ab7776f3c257b9ffbed917e67a  Cache-Simple-TimedExpiry-0.27.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 06:16:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 01:16:47 -0500
Subject: rpms/perl-File-Remove/devel .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611270616.kAR6GlKl017165@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17146

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.
- Fix URL in Source0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:43:18 -0000	1.4
+++ .cvsignore	27 Nov 2006 06:16:17 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Remove.spec	3 Nov 2006 05:43:18 -0000	1.6
+++ perl-File-Remove.spec	27 Nov 2006 06:16:17 -0000	1.7
@@ -1,11 +1,11 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
-Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -46,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+- Fix URL in Source0.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:43:18 -0000	1.4
+++ sources	27 Nov 2006 06:16:17 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 06:19:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 01:19:48 -0500
Subject: rpms/perl-File-Remove/FC-6 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200611270619.kAR6JmBv017242@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17223

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.
- Fix URL in Source0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:43:58 -0000	1.4
+++ .cvsignore	27 Nov 2006 06:19:18 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/perl-File-Remove.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Remove.spec	3 Nov 2006 05:43:58 -0000	1.6
+++ perl-File-Remove.spec	27 Nov 2006 06:19:18 -0000	1.7
@@ -1,11 +1,11 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
-Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -46,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+- Fix URL in Source0.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:43:58 -0000	1.4
+++ sources	27 Nov 2006 06:19:18 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 06:21:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 01:21:47 -0500
Subject: rpms/perl-File-Remove/FC-5 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200611270621.kAR6LlV6017305@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17286

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.
- Fix URL in Source0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:44:38 -0000	1.4
+++ .cvsignore	27 Nov 2006 06:21:17 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/perl-File-Remove.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-File-Remove.spec	3 Nov 2006 05:44:38 -0000	1.5
+++ perl-File-Remove.spec	27 Nov 2006 06:21:17 -0000	1.6
@@ -1,11 +1,11 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
-Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -46,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+- Fix URL in Source0.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:44:38 -0000	1.4
+++ sources	27 Nov 2006 06:21:17 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 06:29:37 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 27 Nov 2006 01:29:37 -0500
Subject: rpms/spandsp/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 spandsp.spec, 1.4, 1.5
Message-ID: <200611270629.kAR6Tbhj017391@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17372

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Nov 2006 16:50:44 -0000	1.5
+++ .cvsignore	27 Nov 2006 06:29:07 -0000	1.6
@@ -1 +1 @@
-spandsp-0.0.3pre25.tgz
+spandsp-0.0.3pre26.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Nov 2006 16:50:44 -0000	1.5
+++ sources	27 Nov 2006 06:29:07 -0000	1.6
@@ -1 +1 @@
-6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz
+304f24f67b55c4ac3e3e7a6df5aaa4a2  spandsp-0.0.3pre26.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/devel/spandsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spandsp.spec	21 Nov 2006 16:50:44 -0000	1.4
+++ spandsp.spec	27 Nov 2006 06:29:07 -0000	1.5
@@ -1,4 +1,4 @@
-%define pre 25
+%define pre 26
 
 Summary: A DSP library for telephony
 Name: spandsp



From fedora-extras-commits at redhat.com  Mon Nov 27 06:31:08 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 27 Nov 2006 01:31:08 -0500
Subject: rpms/spandsp/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 spandsp.spec, 1.4, 1.5
Message-ID: <200611270631.kAR6V8db017460@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17435

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Nov 2006 16:54:20 -0000	1.5
+++ .cvsignore	27 Nov 2006 06:30:38 -0000	1.6
@@ -1 +1 @@
-spandsp-0.0.3pre25.tgz
+spandsp-0.0.3pre26.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Nov 2006 16:54:20 -0000	1.5
+++ sources	27 Nov 2006 06:30:38 -0000	1.6
@@ -1 +1 @@
-6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz
+304f24f67b55c4ac3e3e7a6df5aaa4a2  spandsp-0.0.3pre26.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-6/spandsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spandsp.spec	21 Nov 2006 16:54:20 -0000	1.4
+++ spandsp.spec	27 Nov 2006 06:30:38 -0000	1.5
@@ -1,4 +1,4 @@
-%define pre 25
+%define pre 26
 
 Summary: A DSP library for telephony
 Name: spandsp



From fedora-extras-commits at redhat.com  Mon Nov 27 06:32:51 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Mon, 27 Nov 2006 01:32:51 -0500
Subject: rpms/spandsp/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 spandsp.spec, 1.4, 1.5
Message-ID: <200611270632.kAR6WpT1017523@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/spandsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17504

Modified Files:
	.cvsignore sources spandsp.spec 
Log Message:
Update to 0.0.3pre26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Nov 2006 16:55:37 -0000	1.5
+++ .cvsignore	27 Nov 2006 06:32:21 -0000	1.6
@@ -1 +1 @@
-spandsp-0.0.3pre25.tgz
+spandsp-0.0.3pre26.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Nov 2006 16:55:37 -0000	1.5
+++ sources	27 Nov 2006 06:32:21 -0000	1.6
@@ -1 +1 @@
-6341833d7273c2b44d538638e51ac533  spandsp-0.0.3pre25.tgz
+304f24f67b55c4ac3e3e7a6df5aaa4a2  spandsp-0.0.3pre26.tgz


Index: spandsp.spec
===================================================================
RCS file: /cvs/extras/rpms/spandsp/FC-5/spandsp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spandsp.spec	21 Nov 2006 16:55:37 -0000	1.4
+++ spandsp.spec	27 Nov 2006 06:32:21 -0000	1.5
@@ -1,4 +1,4 @@
-%define pre 25
+%define pre 26
 
 Summary: A DSP library for telephony
 Name: spandsp



From fedora-extras-commits at redhat.com  Mon Nov 27 06:39:26 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Mon, 27 Nov 2006 01:39:26 -0500
Subject: rpms/perl-File-Remove/FC-4 .cvsignore, 1.4,
	1.5 perl-File-Remove.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200611270639.kAR6dQAo017608@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17587

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
- Upstream update.
- Fix URL in Source0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Nov 2006 05:45:19 -0000	1.4
+++ .cvsignore	27 Nov 2006 06:38:56 -0000	1.5
@@ -1 +1 @@
-File-Remove-0.33.tar.gz
+File-Remove-0.34.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/perl-File-Remove.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-Remove.spec	3 Nov 2006 05:45:19 -0000	1.4
+++ perl-File-Remove.spec	27 Nov 2006 06:38:56 -0000	1.5
@@ -1,11 +1,11 @@
 Name: 		perl-File-Remove
-Version:	0.33
+Version:	0.34
 Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
 URL: 		http://search.cpan.org/dist/File-Remove/
-Source0: 	http://search.cpan.org/CPAN/authors/id/R/RS/RSOD/File-Remove-%{version}.tar.gz
+Source0: 	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -46,6 +46,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Ralf Cors??pius  - 0.34-1
+- Upstream update.
+- Fix URL in Source0.
+
 * Fri Nov 03 2006 Ralf Cors??pius  - 0.33-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Nov 2006 05:45:19 -0000	1.4
+++ sources	27 Nov 2006 06:38:56 -0000	1.5
@@ -1 +1 @@
-a72672453ccf9884121c788ea859b12d  File-Remove-0.33.tar.gz
+91d2a50209c0cf070e26e407b888b3d4  File-Remove-0.34.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 08:27:46 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 03:27:46 -0500
Subject: rpms/tcd-utils/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tcd-utils.spec, 1.1, 1.2
Message-ID: <200611270827.kAR8RkcQ024067@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24043

Modified Files:
	.cvsignore sources tcd-utils.spec 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
- Update to 20061127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:37:37 -0000	1.2
+++ .cvsignore	27 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-tcd-utils-20061120.tar.bz2
+tcd-utils-20061127.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:37:37 -0000	1.2
+++ sources	27 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-f0d58145520be7eeaf5d78229dae4aa7  tcd-utils-20061120.tar.bz2
+c1ad8793179a505b705729f51b9f5d90  tcd-utils-20061127.tar.bz2


Index: tcd-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/devel/tcd-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcd-utils.spec	26 Nov 2006 13:37:37 -0000	1.1
+++ tcd-utils.spec	27 Nov 2006 08:27:16 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		tcd-utils
-Version:	20061120
+Version:	20061127
 Release:	1%{?dist}
 Summary:	TCD (Tide Constituent Database) Utils
 
@@ -27,8 +27,6 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir_p} $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
  
 %clean
@@ -40,6 +38,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
+- Update to 20061127
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 20061120-1
 - Formal 20061120 released
 - Versioning change



From fedora-extras-commits at redhat.com  Mon Nov 27 08:29:14 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 03:29:14 -0500
Subject: rpms/tcd-utils/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tcd-utils.spec, 1.1, 1.2
Message-ID: <200611270829.kAR8TEcR024108@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24087

Modified Files:
	.cvsignore sources tcd-utils.spec 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
- Update to 20061127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:37:37 -0000	1.2
+++ .cvsignore	27 Nov 2006 08:28:44 -0000	1.3
@@ -1 +1 @@
-tcd-utils-20061120.tar.bz2
+tcd-utils-20061127.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:37:37 -0000	1.2
+++ sources	27 Nov 2006 08:28:44 -0000	1.3
@@ -1 +1 @@
-f0d58145520be7eeaf5d78229dae4aa7  tcd-utils-20061120.tar.bz2
+c1ad8793179a505b705729f51b9f5d90  tcd-utils-20061127.tar.bz2


Index: tcd-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-5/tcd-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcd-utils.spec	26 Nov 2006 13:37:37 -0000	1.1
+++ tcd-utils.spec	27 Nov 2006 08:28:44 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		tcd-utils
-Version:	20061120
+Version:	20061127
 Release:	1%{?dist}
 Summary:	TCD (Tide Constituent Database) Utils
 
@@ -27,8 +27,6 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir_p} $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
  
 %clean
@@ -40,6 +38,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
+- Update to 20061127
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 20061120-1
 - Formal 20061120 released
 - Versioning change



From fedora-extras-commits at redhat.com  Mon Nov 27 08:33:02 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 03:33:02 -0500
Subject: rpms/tcd-utils/FC-6 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tcd-utils.spec, 1.1, 1.2
Message-ID: <200611270833.kAR8X2c9024223@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tcd-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24204

Modified Files:
	.cvsignore sources tcd-utils.spec 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
- Update to 20061127



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:37:37 -0000	1.2
+++ .cvsignore	27 Nov 2006 08:32:32 -0000	1.3
@@ -1 +1 @@
-tcd-utils-20061120.tar.bz2
+tcd-utils-20061127.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:37:37 -0000	1.2
+++ sources	27 Nov 2006 08:32:32 -0000	1.3
@@ -1 +1 @@
-f0d58145520be7eeaf5d78229dae4aa7  tcd-utils-20061120.tar.bz2
+c1ad8793179a505b705729f51b9f5d90  tcd-utils-20061127.tar.bz2


Index: tcd-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/tcd-utils/FC-6/tcd-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcd-utils.spec	26 Nov 2006 13:37:37 -0000	1.1
+++ tcd-utils.spec	27 Nov 2006 08:32:32 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		tcd-utils
-Version:	20061120
+Version:	20061127
 Release:	1%{?dist}
 Summary:	TCD (Tide Constituent Database) Utils
 
@@ -27,8 +27,6 @@
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-
-%{__mkdir_p} $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
  
 %clean
@@ -40,6 +38,9 @@
 %{_bindir}/*
 
 %changelog
+* Mon Nov 27 2006 Mamoru Tasaka  - 20061127-1
+- Update to 20061127
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 20061120-1
 - Formal 20061120 released
 - Versioning change



From fedora-extras-commits at redhat.com  Mon Nov 27 09:00:17 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:00:17 -0500
Subject: rpms/mlmmj/FC-3 .cvsignore, 1.8, 1.9 mlmmj.spec, 1.15, 1.16 sources,
	1.8, 1.9
Message-ID: <200611270900.kAR90HoT024489@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24458

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.2.12-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Jan 2006 02:19:07 -0000	1.8
+++ .cvsignore	27 Nov 2006 08:59:47 -0000	1.9
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/mlmmj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mlmmj.spec	24 Jan 2006 02:19:07 -0000	1.15
+++ mlmmj.spec	27 Nov 2006 08:59:47 -0000	1.16
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
+Version: 1.2.12
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Mon Nov 27 2006 Michael Fleming  1.2.12-1
+- New upstream release
+
 * Tue Jan 24 2006 Michael Fleming  1.2.11-1
 - New upstream release (Fixes for address handling).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Jan 2006 02:19:07 -0000	1.8
+++ sources	27 Nov 2006 08:59:47 -0000	1.9
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 09:03:12 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:03:12 -0500
Subject: rpms/mlmmj/FC-4 .cvsignore, 1.8, 1.9 mlmmj.spec, 1.15, 1.16 sources,
	1.8, 1.9
Message-ID: <200611270903.kAR93Ckq027734@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27713

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.2.12-1
- New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Jan 2006 22:44:39 -0000	1.8
+++ .cvsignore	27 Nov 2006 09:02:42 -0000	1.9
@@ -1 +1 @@
-mlmmj-1.2.11.tar.bz2
+mlmmj-1.2.12.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/mlmmj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mlmmj.spec	23 Jan 2006 22:44:39 -0000	1.15
+++ mlmmj.spec	27 Nov 2006 09:02:42 -0000	1.16
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.11
+Version: 1.2.12
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Mon Nov 27 2006 Michael Fleming  1.2.12-1
+- New upstream release.
+
 * Tue Jan 24 2006 Michael Fleming  1.2.11-1
 - New upstream release (fixes to address handling/parsing).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Jan 2006 22:44:39 -0000	1.8
+++ sources	27 Nov 2006 09:02:42 -0000	1.9
@@ -1 +1 @@
-dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2
+88e43c13a656c586d1f9149bd35ecce8  mlmmj-1.2.12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 09:31:15 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:31:15 -0500
Subject: rpms/GeoIP/FC-6 GeoIP.spec,1.6,1.7
Message-ID: <200611270931.kAR9VF9g028198@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28182

Modified Files:
	GeoIP.spec 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.4.0-4
- Fix %install scripts to satisfy newer mock builds



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-6/GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GeoIP.spec	3 Sep 2006 08:28:22 -0000	1.6
+++ GeoIP.spec	27 Nov 2006 09:30:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -73,6 +73,9 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Mon Nov 27 2006 Michael Fleming  1.4.0-4
+- Fix %%install scripts to satisfy newer mock builds
+
 * Sun Sep 3 2006 Michael Fleming  1.4.0-3
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license



From fedora-extras-commits at redhat.com  Mon Nov 27 09:33:00 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:33:00 -0500
Subject: rpms/GeoIP/devel GeoIP.spec,1.6,1.7
Message-ID: <200611270933.kAR9X0dJ028260@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28242

Modified Files:
	GeoIP.spec 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.4.0-4
- Fix %install scripts to satisfy newer mock builds



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/devel/GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GeoIP.spec	3 Sep 2006 08:28:22 -0000	1.6
+++ GeoIP.spec	27 Nov 2006 09:32:30 -0000	1.7
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -73,6 +73,9 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Mon Nov 27 2006 Michael Fleming  1.4.0-4
+- Fix %%install scripts to satisfy newer mock builds
+
 * Sun Sep 3 2006 Michael Fleming  1.4.0-3
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license



From fedora-extras-commits at redhat.com  Mon Nov 27 09:37:03 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:37:03 -0500
Subject: rpms/GeoIP/FC-5 GeoIP.spec,1.6,1.7
Message-ID: <200611270937.kAR9b34n028340@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28325

Modified Files:
	GeoIP.spec 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.4.0-1
- Upstream upgrade
- Added LICENSE.txt file to %doc, covering GeoIP country/city data license
  (bz #198137)
- Fix %install section to satisfy newer mock builders



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GeoIP.spec	14 Nov 2006 11:40:54 -0000	1.6
+++ GeoIP.spec	27 Nov 2006 09:36:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -73,10 +73,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
-* Tue Nov 14 2006 Michael Fleming  1.4.0-3
+* Mon Nov 27 2006 Michael Fleming  1.4.0-1
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
   (bz #198137)
+- Fix %%install section to satisfy newer mock builders
 
 * Mon May 15 2006 Michael Fleming  1.3.17-1
 - New upstream release (minor fixes)



From fedora-extras-commits at redhat.com  Mon Nov 27 09:40:08 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 27 Nov 2006 04:40:08 -0500
Subject: rpms/GeoIP/FC-4 GeoIP.spec,1.4,1.5
Message-ID: <200611270940.kAR9e8Xo028405@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/GeoIP/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28390

Modified Files:
	GeoIP.spec 
Log Message:
* Mon Nov 27 2006 Michael Fleming  1.4.0-1
- Upstream upgrade
- Added LICENSE.txt file to %doc, covering GeoIP country/city data license
  (bz #198137)
- Fix %install section to satisfy newer mock builders



Index: GeoIP.spec
===================================================================
RCS file: /cvs/extras/rpms/GeoIP/FC-4/GeoIP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GeoIP.spec	12 Nov 2006 10:52:48 -0000	1.4
+++ GeoIP.spec	27 Nov 2006 09:39:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name: GeoIP           
 Version: 1.4.0
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: C library for country/city/organization to IP address or hostname mapping     
 Group: Development/Libraries         
 License: GPL
@@ -39,7 +39,7 @@
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -73,10 +73,11 @@
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
-* Sun Sep 3 2006 Michael Fleming  1.4.0-3
+* Mon Nov 27 2006 Michael Fleming  1.4.0-1
 - Upstream upgrade
 - Added LICENSE.txt file to %%doc, covering GeoIP country/city data license
   (bz #198137)
+- Fix %%install section to satisfy newer mock builders
 
 * Mon May 15 2006 Michael Fleming  1.3.17-1
 - New upstream release (minor fixes)



From fedora-extras-commits at redhat.com  Mon Nov 27 10:52:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 27 Nov 2006 05:52:55 -0500
Subject: rpms/atomorun/FC-5 atomorun.spec,1.1,1.2
Message-ID: <200611271052.kARAqtie032027@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/atomorun/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32010

Modified Files:
	atomorun.spec 
Log Message:
Add libGLU-devel as BR since SDL-devel doesn't drag it in on FC-5


Index: atomorun.spec
===================================================================
RCS file: /cvs/extras/rpms/atomorun/FC-5/atomorun.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- atomorun.spec	26 Nov 2006 18:44:44 -0000	1.1
+++ atomorun.spec	27 Nov 2006 10:52:25 -0000	1.2
@@ -11,7 +11,7 @@
 Source1:        atomorun.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_image-devel libtiff-devel libvorbis-devel
-BuildRequires:  alsa-lib-devel desktop-file-utils ImageMagick
+BuildRequires:  alsa-lib-devel desktop-file-utils ImageMagick libGLU-devel
 Requires:       hicolor-icon-theme
 
 %description



From fedora-extras-commits at redhat.com  Mon Nov 27 12:18:52 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:18:52 -0500
Subject: rpms/tideEditor - New directory
Message-ID: <200611271218.kARCIqmq006078@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6074/tideEditor

Log Message:
Directory /cvs/extras/rpms/tideEditor added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 12:18:57 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:18:57 -0500
Subject: rpms/tideEditor/devel - New directory
Message-ID: <200611271218.kARCIvoM006091@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6074/tideEditor/devel

Log Message:
Directory /cvs/extras/rpms/tideEditor/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 12:19:14 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:19:14 -0500
Subject: rpms/tideEditor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611271219.kARCJEAM006123@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117

Added Files:
	Makefile import.log 
Log Message:
Setup of module tideEditor


--- NEW FILE Makefile ---
# Top level Makefile for module tideEditor
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  Mon Nov 27 12:19:19 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:19:19 -0500
Subject: rpms/tideEditor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611271219.kARCJJb1006139@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tideEditor


--- 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 Nov 27 12:20:21 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:20:21 -0500
Subject: rpms/tideEditor import.log,1.1,1.2
Message-ID: <200611271220.kARCKLdI006209@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6177

Modified Files:
	import.log 
Log Message:
auto-import tideEditor-1.3.12-3 on branch devel from tideEditor-1.3.12-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 12:19:14 -0000	1.1
+++ import.log	27 Nov 2006 12:19:51 -0000	1.2
@@ -0,0 +1 @@
+tideEditor-1_3_12-3:HEAD:tideEditor-1.3.12-3.src.rpm:1164630088



From fedora-extras-commits at redhat.com  Mon Nov 27 12:20:21 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:20:21 -0500
Subject: rpms/tideEditor/devel tideEditor.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611271220.kARCKLDM006213@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6177/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tideEditor.spec 
Log Message:
auto-import tideEditor-1.3.12-3 on branch devel from tideEditor-1.3.12-3.src.rpm


--- NEW FILE tideEditor.spec ---
Name:		tideEditor
Version:	1.3.12
Release:	3%{?dist}
Summary:	Editor for Tide Constituent Database (TCD) files

Group:		Applications/Engineering
License:	GPL
URL:		http://www.flaterco.com/xtide/
Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	qt-devel
BuildRequires:	libtcd-devel
Requires:	xtide-common

%description
tideEditor is an editor for Tide Constituent Database (TCD) files.  It
was written by Jan C. Depner but is now jointly maintained by David
Flater and Jan Depner.

%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,-)
%doc COPYING ChangeLog README
%{_bindir}/tideEditor

%changelog
* Mon Nov 27 2006 Mamoru Tasaka  - 1.3.12-3
- Remove unneeded BR

* Sun Nov 26 2006 Mamoru Tasaka  - 1.3.12-2
- Drop desktop file after discuss with David Flater (upstream) and
  Patrice Dumas (reviewer)

* Thu Nov 23 2006 Mamoru Tasaka  - 1.3.12-1
- 1.3.12 release
- Introduce a shell script for GNOME desktop usage.

* Mon Nov 20 2006 Mamoru Tasaka  - 1.3.12-0.1.dev1
- Split from xtide, repackaging (see bug 211626)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 12:19:19 -0000	1.1
+++ .cvsignore	27 Nov 2006 12:19:51 -0000	1.2
@@ -0,0 +1 @@
+tideEditor-1.3.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 12:19:19 -0000	1.1
+++ sources	27 Nov 2006 12:19:51 -0000	1.2
@@ -0,0 +1 @@
+f833a2b7ccd4721c719642845ec2da47  tideEditor-1.3.12.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 12:44:24 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 07:44:24 -0500
Subject: owners owners.list,1.2020,1.2021
Message-ID: <200611271244.kARCiOVd006439@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6424

Modified Files:
	owners.list 
Log Message:
add tideEditor


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2020
retrieving revision 1.2021
diff -u -r1.2020 -r1.2021
--- owners.list	26 Nov 2006 20:09:39 -0000	1.2020
+++ owners.list	27 Nov 2006 12:43:54 -0000	1.2021
@@ -2323,6 +2323,7 @@
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|Thunar|Thunar File Manager|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|tideEditor|Editor for Tide Constituent Database (TCD) files|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|tiger|Security auditing tool for UNIX systems|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tile|Modernized widgets for Tk|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 27 13:35:53 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:35:53 -0500
Subject: rpms/GraphicsMagick - New directory
Message-ID: <200611271335.kARDZrF1009785@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9781/GraphicsMagick

Log Message:
Directory /cvs/extras/rpms/GraphicsMagick added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 13:35:58 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:35:58 -0500
Subject: rpms/GraphicsMagick/devel - New directory
Message-ID: <200611271335.kARDZwxg009798@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9781/GraphicsMagick/devel

Log Message:
Directory /cvs/extras/rpms/GraphicsMagick/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 13:36:25 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:36:25 -0500
Subject: rpms/GraphicsMagick Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611271336.kARDaP8e009828@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9822

Added Files:
	Makefile import.log 
Log Message:
Setup of module GraphicsMagick


--- NEW FILE Makefile ---
# Top level Makefile for module GraphicsMagick
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  Mon Nov 27 13:36:30 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:36:30 -0500
Subject: rpms/GraphicsMagick/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611271336.kARDaUu6009843@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9822/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module GraphicsMagick


--- 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 Nov 27 13:38:11 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:38:11 -0500
Subject: rpms/GraphicsMagick import.log,1.1,1.2
Message-ID: <200611271338.kARDcBO7009920@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887

Modified Files:
	import.log 
Log Message:
auto-import GraphicsMagick-1.1.7-2 on branch devel from GraphicsMagick-1.1.7-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 13:36:25 -0000	1.1
+++ import.log	27 Nov 2006 13:37:41 -0000	1.2
@@ -0,0 +1 @@
+GraphicsMagick-1_1_7-2:HEAD:GraphicsMagick-1.1.7-2.src.rpm:1164634754



From fedora-extras-commits at redhat.com  Mon Nov 27 13:38:11 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 27 Nov 2006 08:38:11 -0500
Subject: rpms/GraphicsMagick/devel GraphicsMagick-gslib.patch, NONE,
	1.1 GraphicsMagick.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200611271338.kARDcB8x009924@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/devel

Modified Files:
	.cvsignore sources 
Added Files:
	GraphicsMagick-gslib.patch GraphicsMagick.spec 
Log Message:
auto-import GraphicsMagick-1.1.7-2 on branch devel from GraphicsMagick-1.1.7-2.src.rpm

GraphicsMagick-gslib.patch:

--- NEW FILE GraphicsMagick-gslib.patch ---
--- GraphicsMagick-1.1.7/configure.ac.orig	2006-07-31 00:24:43.000000000 +0200
+++ GraphicsMagick-1.1.7/configure.ac	2006-07-31 00:25:02.000000000 +0200
@@ -1684,8 +1684,8 @@
     AC_MSG_RESULT()
     failed=0;
     passed=0;
-    AC_CHECK_HEADER(ps/iapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-    AC_CHECK_HEADER(ps/errors.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_HEADER(ghostscript/iapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_HEADER(ghostscript/errors.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_CHECK_LIB(gs,gsapi_new_instance,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
     AC_MSG_CHECKING(if Ghostscript library package is complete)
     if test $passed -gt 0
--- GraphicsMagick-1.1.7/magick/delegate.h.orig	2006-07-31 00:25:33.000000000 +0200
+++ GraphicsMagick-1.1.7/magick/delegate.h	2006-07-31 00:25:51.000000000 +0200
@@ -46,8 +46,8 @@
 #if defined(MAGICK_IMPLEMENTATION)
 
 #if defined(HasGS)
-#include "ps/iapi.h"
-#include "ps/errors.h"
+#include "ghostscript/iapi.h"
+#include "ghostscript/errors.h"
 #endif
 
 #ifndef gs_main_instance_DEFINED


--- NEW FILE GraphicsMagick.spec ---
Summary: An GraphicsMagick fork, offering faster image generation and better quality
Name: GraphicsMagick
Version: 1.1.7
Release: 2%{?dist}
License: MIT
Group: Applications/Multimedia
Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
Patch0: GraphicsMagick-gslib.patch

Url: http://www.graphicsmagick.org/
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl
BuildRequires: freetype-devel >= 2.0.1
BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
BuildRequires: ghostscript-devel
BuildRequires: libwmf-devel
BuildRequires: libX11-devel, libXext-devel, libXt-devel
BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel

%description
GraphicsMagick is a comprehensive image processing package which is initially
based on ImageMagick 5.5.2, but which has undergone significant re-work by
the GraphicsMagick Group to significantly improve the quality and performance
of the software.

%package devel
Summary: Static libraries and header files for GraphicsMagick app development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libX11-devel, libXext-devel, libXt-devel
Requires: ghostscript-devel
Requires: bzip2-devel
Requires: libtiff-devel
Requires: libjpeg-devel
Requires: lcms-devel
Requires: pkgconfig

%description devel
GraphicsMagick-devel contains the static libraries and header files you'll
need to develop GraphicsMagick applications. GraphicsMagick is an image
manipulation program.

If you want to create applications that will use GraphicsMagick code or
APIs, you need to install GraphicsMagick-devel as well as GraphicsMagick.
You do not need to install it if you just want to use GraphicsMagick,
however.

%package perl
Summary: GraphicsMagick perl bindings
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: perl >= 5.6.0
%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}')
BuildRequires: %{perl_vendorarch}

%description perl
Perl bindings to GraphicsMagick.

Install GraphicsMagick-perl if you want to use any perl scripts that use
GraphicsMagick.

%package c++
Summary: GraphicsMagick Magick++ library (C++ bindings)
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description c++
This package contains the GraphicsMagick++ library, a C++ binding to the 
GraphicsMagick graphics manipulation library.

Install GraphicsMagick-c++ if you want to use any applications that use 
GraphicsMagick++.

%package c++-devel
Summary: C++ bindings for the GraphicsMagick library
Group: Development/Libraries
Requires: %{name}-c++ = %{version}-%{release}
Requires: %{name}-devel = %{version}%{release}

%description c++-devel
GraphicsMagick-devel contains the static libraries and header files you'll
need to develop GraphicsMagick applications using the Magick++ C++ bindings.
GraphicsMagick is an image manipulation program.

If you want to create applications that will use Magick++ code
or APIs, you'll need to install GraphicsMagick-c++-devel, ImageMagick-devel and
GraphicsMagick.
You don't need to install it if you just want to use GraphicsMagick, or if you
want to develop/compile applications using the GraphicsMagick C interface,
however.

%prep
%setup -q
%patch0 -p 1 -b .gslib 
# Regenerating configure script
autoconf

%build
%configure --enable-shared \
           --with-modules \
           --with-perl \
           --with-x \
           --with-threads \
           --with-magick_plus_plus \
           --with-gslib \
           --with-wmf \
           --with-lzw \
           --with-lcms \
           --with-rsvg \
           --with-xml \
           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
           --without-dps

make

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}

# perlmagick: fix perl path of demo files
%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl

find %{buildroot} -name "*.bs" |xargs rm -f
find %{buildroot} -name ".packlist" |xargs rm -f
find %{buildroot} -name "perllocal.pod" |xargs rm -f

chmod 755 %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so

# perlmagick: build files list
echo "%defattr(-,root,root)" > perl-pkg-files
find %{buildroot}/%{_libdir}/perl* -type f -print \
    | sed "s@^%{buildroot}@@g" > perl-pkg-files 
find %{buildroot}%{perl_vendorarch} -type d -print \
    | sed "s@^%{buildroot}@%dir @g" \
    | grep -v '^%dir %{perl_vendorarch}$' \
    | grep -v '/auto$' >> perl-pkg-files 
if [ -z perl-pkg-files ] ; then
    echo "ERROR: EMPTY FILE LIST"
    exit -1
fi

rm -rf %{buildroot}%{_datadir}/GraphicsMagick
# Keep config
rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
rm -rf %{buildroot}%{_libdir}/libltdl.*
rm -f  %{buildroot}%{_libdir}/GraphicsMagick-*/modules*/*/*.a
rm -f  %{buildroot}%{_libdir}/*.{a,la}

# fix multilib issues
%ifarch x86_64 s390x ia64 ppc64
%define wordsize 64
%else
%define wordsize 32
%endif

mv %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config.h \
   %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config-%{wordsize}.h

cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_config.h <

#if __WORDSIZE == 32
# include "magick_config-32.h"
#elif __WORDSIZE == 64
# include "magick-config_64.h"
#else
# error "unexpected value for __WORDSIZE macro"
#endif

#endif
EOF


%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%post c++ -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%postun c++ -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc ChangeLog Copyright.txt
%doc index.html www/ images/
%doc README.txt AUTHORS NEWS 
%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
%{_bindir}/[a-z]*
%{_libdir}/GraphicsMagick*
%{_datadir}/GraphicsMagick*
%{_mandir}/man[145]/[a-z]*

%files devel
%defattr(-,root,root,-)
%{_bindir}/GraphicsMagick-config
%{_bindir}/GraphicsMagickWand-config
%{_libdir}/libGraphicsMagick.so
%{_libdir}/libGraphicsMagickWand.so
%{_libdir}/pkgconfig/GraphicsMagick.pc
%{_libdir}/pkgconfig/GraphicsMagickWand.pc
%{_includedir}/GraphicsMagick/
%{_mandir}/man1/GraphicsMagick-config.*
%{_mandir}/man1/GraphicsMagickWand-config.*

%files c++
%defattr(-,root,root,-)
%{_libdir}/libGraphicsMagick++.so.*

%files c++-devel
%defattr(-,root,root,-)
%{_bindir}/GraphicsMagick++-config
%{_includedir}/GraphicsMagick/Magick++
%{_includedir}/GraphicsMagick/Magick++.h
%{_libdir}/libGraphicsMagick++.so
%{_libdir}/pkgconfig/GraphicsMagick++.pc
%{_mandir}/man1/GraphicsMagick++-config.*

%files perl -f perl-pkg-files
%defattr(-,root,root,-)
%{_mandir}/man3/*
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt

%changelog
* Sun Nov 26 2006 Andreas Thienemann  - 1.1.7-2
- Fixed various stuff


* Mon Jul 24 2006 Andreas Thienemann  - 1.1.7-1
- Initial Package for FE based on ImageMagick.spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 13:36:30 -0000	1.1
+++ .cvsignore	27 Nov 2006 13:37:41 -0000	1.2
@@ -0,0 +1 @@
+GraphicsMagick-1.1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 13:36:30 -0000	1.1
+++ sources	27 Nov 2006 13:37:41 -0000	1.2
@@ -0,0 +1 @@
+f75d830ca623bf10385b3ad62c48437a  GraphicsMagick-1.1.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 14:41:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 27 Nov 2006 09:41:17 -0500
Subject: comps comps-fe5.xml.in,1.204,1.205 comps-fe6.xml.in,1.231,1.232
Message-ID: <200611271441.kAREfHbE013740@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13723

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Add arrows atomix dd2 liquidwar


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- comps-fe5.xml.in	23 Nov 2006 19:09:47 -0000	1.204
+++ comps-fe5.xml.in	27 Nov 2006 14:40:47 -0000	1.205
@@ -305,7 +305,9 @@
       abe
       abuse
       alex4
+      arrows
       atomix
+      atomorun
       auriferous
       ballbuster
       beneath-a-steel-sky
@@ -324,6 +326,7 @@
       crystal-stacker
       crystal-stacker-themes
       csmash
+      dd2
       enigma
       fbg
       fillets-ng
@@ -346,6 +349,7 @@
       gweled
       lacewing
       lincity-ng
+      liquidwar
       lmarbles
       lucidlife
       Maelstrom


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- comps-fe6.xml.in	26 Nov 2006 23:31:42 -0000	1.231
+++ comps-fe6.xml.in	27 Nov 2006 14:40:47 -0000	1.232
@@ -356,7 +356,9 @@
       abe
       abuse
       alex4
+      arrows
       atomix
+      atomorun
       auriferous
       ballbuster
       beneath-a-steel-sky
@@ -376,6 +378,7 @@
       crystal-stacker-themes
       csmash
       cyphesis
+      dd2
       enigma
       fbg
       fillets-ng
@@ -399,6 +402,7 @@
       gweled
       lacewing
       lincity-ng
+      liquidwar
       lmarbles
       lucidlife
       Maelstrom



From fedora-extras-commits at redhat.com  Mon Nov 27 15:21:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 10:21:22 -0500
Subject: rpms/jd/devel .cvsignore, 1.25, 1.26 jd.spec, 1.32, 1.33 sources,
	1.25, 1.26
Message-ID: <200611271521.kARFLM2O017033@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17014

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061127
- cvs 061127 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	26 Nov 2006 15:22:24 -0000	1.25
+++ .cvsignore	27 Nov 2006 15:20:52 -0000	1.26
@@ -1 +1 @@
-jd-1.8.1-cvs061126.tgz
+jd-1.8.1-cvs061127.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jd.spec	26 Nov 2006 15:22:24 -0000	1.32
+++ jd.spec	27 Nov 2006 15:20:52 -0000	1.33
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061126
+%define         strtag        cvs061127
 %define         repoid        22722
 
 
@@ -103,8 +103,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Sun Nov 26 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061126
-- cvs 061126 (23:59 JST)
+* Mon Nov 27 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061127
+- cvs 061127 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	26 Nov 2006 15:22:24 -0000	1.25
+++ sources	27 Nov 2006 15:20:52 -0000	1.26
@@ -1 +1 @@
-22545b686df97a6578add31e6567978c  jd-1.8.1-cvs061126.tgz
+9804dd8951bc1bbf9dc0be8d89b19f60  jd-1.8.1-cvs061127.tgz



From fedora-extras-commits at redhat.com  Mon Nov 27 15:24:11 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Mon, 27 Nov 2006 10:24:11 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.10, 1.11 ochusha.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200611271524.kARFOBE3017135@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17116

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Mon Nov 27 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061127
- 0.5.99.63.6 cvs 061127 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	26 Nov 2006 15:16:30 -0000	1.10
+++ .cvsignore	27 Nov 2006 15:23:41 -0000	1.11
@@ -1 +1 @@
-ochusha-0.5.99.63.6-cvs061126.tar.bz2
+ochusha-0.5.99.63.6-cvs061127.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ochusha.spec	26 Nov 2006 15:16:30 -0000	1.10
+++ ochusha.spec	27 Nov 2006 15:23:41 -0000	1.11
@@ -2,7 +2,7 @@
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
 %define              main_ver        0.5.99.63.6
-%define              strtag          cvs061126
+%define              strtag          cvs061127
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -155,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Sun Nov 26 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061126
-- 0.5.99.63.6 cvs 061126 (23:59 JST)
+* Mon Nov 27 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061127
+- 0.5.99.63.6 cvs 061127 (23:59 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	26 Nov 2006 15:16:30 -0000	1.10
+++ sources	27 Nov 2006 15:23:41 -0000	1.11
@@ -1 +1 @@
-87fee38e3cf73238a9bffdce22fde293  ochusha-0.5.99.63.6-cvs061126.tar.bz2
+bcf4e008319305ba074c9509a55fcf2f  ochusha-0.5.99.63.6-cvs061127.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 15:53:24 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Mon, 27 Nov 2006 10:53:24 -0500
Subject: rpms/clement import.log,1.4,1.5
Message-ID: <200611271553.kARFrOf6017551@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/rpms/clement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17521

Modified Files:
	import.log 
Log Message:
auto-import clement-2.1-241 on branch devel from clement-2.1-241.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clement/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	4 Sep 2006 16:58:13 -0000	1.4
+++ import.log	27 Nov 2006 15:52:54 -0000	1.5
@@ -1,3 +1,4 @@
 clement-2_1-197:HEAD:clement-2.1-197.src.rpm:1156124434
 clement-2_1-202:HEAD:clement-2.1-202.src.rpm:1156246052
 clement-2_1-209:HEAD:clement-2.1-209.src.rpm:1157389089
+clement-2_1-241:HEAD:clement-2.1-241.src.rpm:1164642869



From fedora-extras-commits at redhat.com  Mon Nov 27 15:53:25 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Mon, 27 Nov 2006 10:53:25 -0500
Subject: rpms/clement/devel .cvsignore, 1.4, 1.5 clement.spec, 1.20,
	1.21 sources, 1.4, 1.5
Message-ID: <200611271553.kARFrPB0017556@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/rpms/clement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17521/devel

Modified Files:
	.cvsignore clement.spec sources 
Log Message:
auto-import clement-2.1-241 on branch devel from clement-2.1-241.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clement/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Sep 2006 16:58:13 -0000	1.4
+++ .cvsignore	27 Nov 2006 15:52:55 -0000	1.5
@@ -1 +1 @@
-clement-2.1-209.tar.gz
+clement-2.1-241.tar.gz


Index: clement.spec
===================================================================
RCS file: /cvs/extras/rpms/clement/devel/clement.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- clement.spec	19 Oct 2006 17:52:23 -0000	1.20
+++ clement.spec	27 Nov 2006 15:52:55 -0000	1.21
@@ -1,11 +1,11 @@
 Name: clement
 Version: 2.1
-Release: 210%{?dist}
+Release: 241%{?dist}
 URL: http://www.clement.safe.ca
 License: GPL
 Summary: An application to filter and manage E-mail traffic
 Group: System Environment/Daemons
-Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-209.tar.gz
+Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz
 buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: byacc
@@ -38,10 +38,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# This package attempts to install a yum repository, which is terrible idea.
-# Remove it here.
-%{__rm} -rf %{buildroot}/%{_sysconfdir}/yum.repos.d
-
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -104,14 +100,30 @@
 
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
+%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
 
 
 %changelog
-* Thu Oct 19 2006 Jason L Tibbitts III  - 2.1-210
-- Remove errant repository.
+* Mon Nov 27 2006 Jean-Marc Pigeon  2.1-241
+- Marker:
+    * Release
+- Bug-Fix:
+    * Fixed loop between collectdata and getstream when
+      E-mail data-part end abnormalie (not detecting
+      stream contents empty).
+    * Fixed Email header mist-match when there is no
+      '\n' within the received data line, this bug was
+      a side effect of 2.1.0.216 bug-fix.
+    * Fixed case where header line was longer than
+      512 characteres (line is not splitted anymore)
+-Improvement:
+    * Web log show up difference between delayed E-mail
+      and Rejected E-mail.
+    * ipc_getpost routine, return the message stamping
+       date up to the millisec.
 
 * Mon Sep  3 2006 Jean-Marc Pigeon  2.1-209
 - Bug-Fix:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clement/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Sep 2006 16:58:13 -0000	1.4
+++ sources	27 Nov 2006 15:52:55 -0000	1.5
@@ -1 +1 @@
-8f4fe15216bea2e6c3320bfce330bfe7  clement-2.1-209.tar.gz
+277b1e13bf16fa3cfc0ffa7870f751cc  clement-2.1-241.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 16:59:52 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 27 Nov 2006 11:59:52 -0500
Subject: rpms/gramps/devel .cvsignore, 1.15, 1.16 gramps.spec, 1.23,
	1.24 sources, 1.15, 1.16
Message-ID: <200611271659.kARGxq8t021546@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21523

Modified Files:
	.cvsignore gramps.spec sources 
Log Message:
* Mon Nov 27 2006 Brian Pepple  - 2.2.3-1
- Update to 2.2.3.
- Add scalable mimetype icons to files section.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Nov 2006 16:51:59 -0000	1.15
+++ .cvsignore	27 Nov 2006 16:59:22 -0000	1.16
@@ -1 +1 @@
-gramps-2.2.2.tar.gz
+gramps-2.2.3.tar.gz


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gramps.spec	4 Nov 2006 16:51:59 -0000	1.23
+++ gramps.spec	27 Nov 2006 16:59:22 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           gramps
-Version:        2.2.2
+Version:        2.2.3
 Release:        1%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
@@ -123,12 +123,17 @@
 %{_datadir}/mime-info/*
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
+%{_datadir}/icons/gnome/scalable/mimetypes/*.svg
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/gnome/help/%{name}/
 
 
 %changelog
+* Mon Nov 27 2006 Brian Pepple  - 2.2.3-1
+- Update to 2.2.3.
+- Add scalable mimetype icons to files section.
+
 * Sat Nov  4 2006 Brian Pepple  - 2.2.2-1
 - Update to 2.2.2.
 - Add scriptlet for gtk+ icon cache.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Nov 2006 16:51:59 -0000	1.15
+++ sources	27 Nov 2006 16:59:22 -0000	1.16
@@ -1 +1 @@
-c640782457bccc7324d17c1baf21701c  gramps-2.2.2.tar.gz
+7107d1ad5555aecb812e4c370a74f0bf  gramps-2.2.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 17:27:26 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Mon, 27 Nov 2006 12:27:26 -0500
Subject: rpms/clement import.log,1.5,1.6
Message-ID: <200611271727.kARHRQVZ024966@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/rpms/clement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24936

Modified Files:
	import.log 
Log Message:
auto-import clement-2.1-241 on branch FC-6 from clement-2.1-241.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clement/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	27 Nov 2006 15:52:54 -0000	1.5
+++ import.log	27 Nov 2006 17:26:56 -0000	1.6
@@ -2,3 +2,4 @@
 clement-2_1-202:HEAD:clement-2.1-202.src.rpm:1156246052
 clement-2_1-209:HEAD:clement-2.1-209.src.rpm:1157389089
 clement-2_1-241:HEAD:clement-2.1-241.src.rpm:1164642869
+clement-2_1-241:FC-6:clement-2.1-241.src.rpm:1164648516



From fedora-extras-commits at redhat.com  Mon Nov 27 17:27:27 2006
From: fedora-extras-commits at redhat.com (Jean-Marc Pigeon (jmrcpn))
Date: Mon, 27 Nov 2006 12:27:27 -0500
Subject: rpms/clement/FC-6 .cvsignore, 1.4, 1.5 clement.spec, 1.20,
	1.21 sources, 1.4, 1.5
Message-ID: <200611271727.kARHRRG3024971@cvs-int.fedora.redhat.com>

Author: jmrcpn

Update of /cvs/extras/rpms/clement/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24936/FC-6

Modified Files:
	.cvsignore clement.spec sources 
Log Message:
auto-import clement-2.1-241 on branch FC-6 from clement-2.1-241.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clement/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Sep 2006 16:58:13 -0000	1.4
+++ .cvsignore	27 Nov 2006 17:26:57 -0000	1.5
@@ -1 +1 @@
-clement-2.1-209.tar.gz
+clement-2.1-241.tar.gz


Index: clement.spec
===================================================================
RCS file: /cvs/extras/rpms/clement/FC-6/clement.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- clement.spec	19 Oct 2006 17:52:23 -0000	1.20
+++ clement.spec	27 Nov 2006 17:26:57 -0000	1.21
@@ -1,11 +1,11 @@
 Name: clement
 Version: 2.1
-Release: 210%{?dist}
+Release: 241%{?dist}
 URL: http://www.clement.safe.ca
 License: GPL
 Summary: An application to filter and manage E-mail traffic
 Group: System Environment/Daemons
-Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-209.tar.gz
+Source: ftp://ftp.safe.ca/pub/%{name}-%{version}/srctgz/%{name}-%{version}-241.tar.gz
 buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: byacc
@@ -38,10 +38,6 @@
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# This package attempts to install a yum repository, which is terrible idea.
-# Remove it here.
-%{__rm} -rf %{buildroot}/%{_sysconfdir}/yum.repos.d
-
 %clean 
 %{__rm} -rf %{buildroot}
 
@@ -104,14 +100,30 @@
 
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(-,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}-%{version}/
+%config(noreplace) %{_sysconfdir}/yum.repos.d/%{name}.repo
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/pki/%{name}-%{version}/trusted.pem
 %config(noreplace) %{_sysconfdir}/httpd/conf/%{name}.conf
 
 
 %changelog
-* Thu Oct 19 2006 Jason L Tibbitts III  - 2.1-210
-- Remove errant repository.
+* Mon Nov 27 2006 Jean-Marc Pigeon  2.1-241
+- Marker:
+    * Release
+- Bug-Fix:
+    * Fixed loop between collectdata and getstream when
+      E-mail data-part end abnormalie (not detecting
+      stream contents empty).
+    * Fixed Email header mist-match when there is no
+      '\n' within the received data line, this bug was
+      a side effect of 2.1.0.216 bug-fix.
+    * Fixed case where header line was longer than
+      512 characteres (line is not splitted anymore)
+-Improvement:
+    * Web log show up difference between delayed E-mail
+      and Rejected E-mail.
+    * ipc_getpost routine, return the message stamping
+       date up to the millisec.
 
 * Mon Sep  3 2006 Jean-Marc Pigeon  2.1-209
 - Bug-Fix:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clement/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Sep 2006 16:58:13 -0000	1.4
+++ sources	27 Nov 2006 17:26:57 -0000	1.5
@@ -1 +1 @@
-8f4fe15216bea2e6c3320bfce330bfe7  clement-2.1-209.tar.gz
+277b1e13bf16fa3cfc0ffa7870f751cc  clement-2.1-241.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 17:44:09 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Mon, 27 Nov 2006 12:44:09 -0500
Subject: rpms/nsd/devel .cvsignore, 1.5, 1.6 nsd.init, 1.4, 1.5 nsd.spec,
	1.15, 1.16 sources, 1.5, 1.6
Message-ID: <200611271744.kARHi9Po025240@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25202

Modified Files:
	.cvsignore nsd.init nsd.spec sources 
Log Message:
* Mon Nov 27 2006 Paul Wouters  3.0.2-1
- Upgraded to 3.0.2.
- Use new configuration file nsd.conf. Still needs migration script.
  patch from Farkas Levente 

Postponing release to FC-x until we have a migration script.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2006 19:43:29 -0000	1.5
+++ .cvsignore	27 Nov 2006 17:43:39 -0000	1.6
@@ -1,2 +1,4 @@
 nsd-2.3.5.tar.gz
 nsd-2.3.6.tar.gz
+nsd.init
+nsd-3.0.2.tar.gz


Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsd.init	12 Oct 2006 19:43:29 -0000	1.4
+++ nsd.init	27 Nov 2006 17:43:39 -0000	1.5
@@ -6,7 +6,7 @@
 # description:  NSD is a complete implementation of an authoritative \
 #               DNS name server. 
 # processname: /usr/sbin/nsd
-# config: /etc/nsd/nsdc.config
+# config: /etc/nsd/nsd.conf
 #
 ### BEGIN INIT INFO
 # Provides: nsd
@@ -18,21 +18,13 @@
 ### END INIT INFO
 
 # Sanity checks.
-[ -f /etc/nsd/nsdc.conf ] || exit 0
-[ -f /etc/nsd/nsd.zones ] || exit 0
+[ -f /etc/nsd/nsd.conf ] || exit 0
 [ -x /usr/sbin/nsd ] || exit 0
 
 #extra verbosity
 #ZONEC_VERBOSE=-v
 OTHER_NSD_OPTS=""
 
-#fixed in 2.3.6
-#work around for bug in nsd-2.3.x when no ipv6 is available
-#if [ ! -d /proc/sys/net/ipv6/ ]
-#then
-#        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
-#fi
-
 # Source function library.
 . /etc/init.d/functions
 


Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nsd.spec	16 Oct 2006 13:52:51 -0000	1.15
+++ nsd.spec	27 Nov 2006 17:43:39 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.6
-Release: 2%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -34,20 +34,20 @@
 install -d 0700 %{buildroot}%{_localstatedir}/run/%{name}
 
 # change .sample to normal config files
-mv %{buildroot}%{_sysconfdir}/nsd/nsdc.conf.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsdc.conf
-mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \
-   %{buildroot}%{_sysconfdir}/nsd/nsd.zones
+mv %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample \
+   %{buildroot}%{_sysconfdir}/nsd/nsd.conf
+#mv %{buildroot}%{_sysconfdir}/nsd/nsd.zones.sample \
+#   %{buildroot}%{_sysconfdir}/nsd/nsd.zones
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files 
 %defattr(-,root,root,-)
-%doc README LICENSE NSD-DATABASE DIFFERENCES TODO RELNOTES REQUIREMENTS
+%doc doc/*
 %dir %{_sysconfdir}/nsd/
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsdc.conf
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.conf
+#%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/nsd/nsd.zones
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 %{_sbindir}/*
@@ -73,6 +73,11 @@
 fi
 
 %changelog
+* Mon Nov 27 2006 Paul Wouters  3.0.2-1
+- Upgraded to 3.0.2.
+- Use new configuration file nsd.conf. Still needs migration script.
+  patch from Farkas Levente 
+
 * Mon Oct 16 2006  Paul Wouters  2.3.6-2
 - Bump version for upgrade path
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2006 19:43:29 -0000	1.5
+++ sources	27 Nov 2006 17:43:39 -0000	1.6
@@ -1,2 +1,4 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
 72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz
+e64633bb4e6eb46e8e16049e87333cb9  nsd.init
+a51f7d2146d8f5901b825b2c0672c86a  nsd-3.0.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 17:53:37 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 27 Nov 2006 12:53:37 -0500
Subject: rpms/proftpd/devel .cvsignore, 1.8, 1.9 proftpd.spec, 1.24,
	1.25 sources, 1.8, 1.9
Message-ID: <200611271753.kARHrbKf025419@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25376

Modified Files:
	.cvsignore proftpd.spec sources 
Log Message:
Update to 1.3.0a which fixes CVE-2006-5815.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Apr 2006 17:05:11 -0000	1.8
+++ .cvsignore	27 Nov 2006 17:53:07 -0000	1.9
@@ -1 +1 @@
-proftpd-1.3.0.tar.bz2
+proftpd-1.3.0a.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- proftpd.spec	21 Nov 2006 13:18:24 -0000	1.24
+++ proftpd.spec	27 Nov 2006 17:53:07 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.0
-Release: 10%{?dist}
+Version: 1.3.0a
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Matthias Saou  1.3.0a-1
+- Update to 1.3.0a, which actually fixes CVE-2006-5815... yes, #214820!).
+
 * Thu Nov 16 2006 Matthias Saou  1.3.0-10
 - Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Apr 2006 17:05:11 -0000	1.8
+++ sources	27 Nov 2006 17:53:07 -0000	1.9
@@ -1 +1 @@
-fae47d01b52e035eb6b7190e74c17722  proftpd-1.3.0.tar.bz2
+cc2e99f38a810982f91d5cbe1f4091f0  proftpd-1.3.0a.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 18:36:32 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 27 Nov 2006 13:36:32 -0500
Subject: rpms/seahorse/FC-6 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200611271836.kARIaWhl028888@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/seahorse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28871

Modified Files:
	.cvsignore sources 
Log Message:

source checkin



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seahorse/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Aug 2006 04:32:01 -0000	1.7
+++ .cvsignore	27 Nov 2006 18:36:02 -0000	1.8
@@ -1 +1 @@
-seahorse-0.8.1.tar.gz
+seahorse-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seahorse/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Aug 2006 04:32:01 -0000	1.7
+++ sources	27 Nov 2006 18:36:02 -0000	1.8
@@ -1 +1 @@
-1f16678e465f20758aff293676e7e291  seahorse-0.8.1.tar.gz
+ee7de41490edd7123de6e99880c34efd  seahorse-0.8.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 18:39:06 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 27 Nov 2006 13:39:06 -0500
Subject: rpms/seahorse/FC-6 seahorse.spec,1.21,1.22
Message-ID: <200611271839.kARId6kC028915@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/rpms/seahorse/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28894

Modified Files:
	seahorse.spec 
Log Message:

check in new spec for 0.8.2 - thanks to bpepple for this patch and the
changes



Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/FC-6/seahorse.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- seahorse.spec	29 Aug 2006 03:14:09 -0000	1.21
+++ seahorse.spec	27 Nov 2006 18:38:36 -0000	1.22
@@ -1,11 +1,11 @@
 Name: 		seahorse
-Version: 	0.8.1
-Release:    2%{?dist}
-Summary:	GNOME2 interface for gnupg
+Version: 	0.8.2
+Release:    	1%{?dist}
+Summary:	GNOME interface for gnupg
 Group: 		User Interface/Desktops
 License: 	GPL
-URL:        http://seahorse.sourceforge.net/
-Source:     http://ftp.gnome.org/pub/GNOME/sources/seahorse/%{version}/%{name}-%{version}.tar.gz
+URL:        	http://seahorse.sourceforge.net/
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -13,104 +13,115 @@
 BuildRequires:  gedit-devel
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
-BuildRequires:  libgnomeui-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  scrollkeeper
 BuildRequires:  nautilus-devel
 BuildRequires:  libsoup-devel
-BuildRequires: openldap-devel
-Requires(post): desktop-file-utils
+BuildRequires: 	openldap-devel
+
+Requires(pre): GConf2
 Requires(post): GConf2
+Requires(preun): GConf2
 Requires(post): scrollkeeper
-Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
 Requires(postun): scrollkeeper
-Requires(postun): shared-mime-info
+
 
 %description
-Seahorse is a gnome2 interface for gnupg.
-It uses gpgme as the backend.
+Seahorse is a GNOME interface for gnupg. It uses gpgme as the backend.
 
 
 %prep
 %setup -q
-sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.in
-sed -i "s/update-mime-database/#update-mime-database/g" plugins/nautilus/Makefile.am
+
 
 %build
-%configure --disable-schemas-install
+%configure --disable-schemas-install --disable-static --disable-update-mime-database
 make %{?_smp_mflags}
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang seahorse
+make install DESTDIR=${RPM_BUILD_ROOT}
+%find_lang %{name}
 
 rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-encrypted.desktop
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
-  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-signature.desktop
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category GNOME                                  \
   --add-category Utility                                \
-  --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse.desktop
 
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
+%pre
+if [ "$1" -gt 1 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
+	for i in $SCHEMAS; do
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
+	done
+fi
+
+
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 \
-     --makefile-install-rule \
-     %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-scrollkeeper-update -q ||:
-update-mime-database %{_datadir}/mime/ > /dev/null
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
+for i in $SCHEMAS; do
+	gconftool-2 --makefile-install-rule \
+		%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
+done
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	SCHEMAS="seahorse-gedit.schemas seahorse.schemas"
+	for i in $SCHEMAS; do
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
+	done   
+fi
 
 
 %postun
 /sbin/ldconfig
 scrollkeeper-update -q ||:
-update-mime-database %{_datadir}/mime/ > /dev/null
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
 %{_datadir}/control-center-2.0/capplets/*.desktop
-%dir %{_datadir}/gnome/help/%{name}
-%{_datadir}/gnome/help/%{name}/*
+%{_datadir}/gnome/help/%{name}/
 %{_datadir}/mime-info/seahorse.keys
 %{_datadir}/mime-info/seahorse.mime
 %{_datadir}/mime/packages/*
-%dir %{_datadir}/omf/%{name}
-%{_datadir}/omf/%{name}/*
+%{_datadir}/omf/%{name}/
 %{_datadir}/pixmaps/*
 %{_libdir}/libseahorse-internal*
 %{_libdir}/gedit-2/plugins/*
@@ -119,6 +130,16 @@
 
 
 %changelog
+* Tue Nov 21 2006 Brian Pepple  - 0.8.2-1
+- Update to 0.8.2.
+- Minor tweak to summary & description.
+- Drop BR on libgnomeui-devel, since eel2-devel pulls this in.
+- Use -disable-update-mime-database instead of editing makefiles.
+- Update scriptlets, and adjust Requires to follow wiki guidelines.
+- Remove X-Fedora category from desktop files.
+- Don't bother building static libs.
+- Remove unnecessary disabling of schemas in install section.
+
 * Mon Aug 28 2006 Seth Vidal 
 - rebuild
 



From fedora-extras-commits at redhat.com  Mon Nov 27 18:45:53 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:45:53 -0500
Subject: rpms/perl-Gtk2-Notify - New directory
Message-ID: <200611271845.kARIjrrD029013@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29009/perl-Gtk2-Notify

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Notify added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 18:45:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:45:58 -0500
Subject: rpms/perl-Gtk2-Notify/devel - New directory
Message-ID: <200611271845.kARIjw4D029026@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29009/perl-Gtk2-Notify/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Notify/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 18:46:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:05 -0500
Subject: rpms/perl-Gtk2-Notify Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611271846.kARIk5Ch029047@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29041

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Gtk2-Notify


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gtk2-Notify
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  Mon Nov 27 18:46:06 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:06 -0500
Subject: owners owners.list,1.2021,1.2022
Message-ID: <200611271846.kARIk6dA029072@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28989

Modified Files:
	owners.list 
Log Message:
added perl-Gtk2-Notify


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2021
retrieving revision 1.2022
diff -u -r1.2021 -r1.2022
--- owners.list	27 Nov 2006 12:43:54 -0000	1.2021
+++ owners.list	27 Nov 2006 18:45:36 -0000	1.2022
@@ -1497,6 +1497,7 @@
 Fedora Extras|perl-GStreamer|GStreamer Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
+Fedora Extras|perl-Gtk2-Notify|Gtk2::Notify Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-Sexy|Perl interface to the sexy widget collection|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-Spell|Perl interface to gtkspell|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-TrayIcon|Perl interface to the EggTrayIcon library|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Nov 27 18:46:05 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:05 -0500
Subject: rpms/perl-Gtk2-Notify/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611271846.kARIk57Z029062@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29041/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gtk2-Notify


--- 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 Nov 27 18:46:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:45 -0500
Subject: rpms/perl-Gtk2-Notify/devel perl-Gtk2-Notify.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611271846.kARIkjwG029127@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29089/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Gtk2-Notify.spec 
Log Message:
auto-import perl-Gtk2-Notify-0.02-3.fc6 on branch devel from perl-Gtk2-Notify-0.02-3.fc6.src.rpm


--- NEW FILE perl-Gtk2-Notify.spec ---
Name:           perl-Gtk2-Notify
Version:        0.02
Release:        3%{?dist}
Summary:        Gtk2::Notify Perl module
License:        LGPL
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Gtk2-Notify/

#Source0:        http://www.cpan.org/modules/by-module/Gtk2/Gtk2-Notify-%{version}.tar.gz
Source0: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Gtk2-Notify-%{version}.tar.gz

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  perl(Glib) >= 1.093, perl(Gtk2)
BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
BuildRequires:  perl(ExtUtils::MakeMaker), libnotify-devel

# for tests...
%{?_with_display_tests:BuildRequires:  perl(Test::Pod::Coverage) >= 1.04, perl(Test::Pod) >= 1.14}

# libnotify-devel seems to be missing this.  see BZ#216946
BuildRequires:  gtk2-devel

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl bindings to libnotify.  This module will allow one to use the notify
functionality from within a perl application.

%prep
%setup -q -n Gtk2-Notify-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}

%install
rm -rf %{buildroot}

make pure_install PERL_INSTALL_ROOT=%{buildroot}

find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
# tests all bomb under mock, unfortunately
%{?_with_display_tests: make test}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes maps README examples/
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Gtk2*
%{_mandir}/man3/*

%changelog
* Mon Nov 27 2006 Chris Weyl 
- change source0 to pull from an alternate CPAN location

* Wed Nov 22 2006 Chris Weyl  0.02-2
- conditionalize tests as they tend to die horribly under mock

* Wed Nov 22 2006 Chris Weyl  0.02-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 18:46:05 -0000	1.1
+++ .cvsignore	27 Nov 2006 18:46:15 -0000	1.2
@@ -0,0 +1 @@
+Gtk2-Notify-0.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 18:46:05 -0000	1.1
+++ sources	27 Nov 2006 18:46:15 -0000	1.2
@@ -0,0 +1 @@
+77a64c944cf1516bcc514456de22a82b  Gtk2-Notify-0.02.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 18:46:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:46:45 -0500
Subject: rpms/perl-Gtk2-Notify import.log,1.1,1.2
Message-ID: <200611271846.kARIkjA1029123@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29089

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-Notify-0.02-3.fc6 on branch devel from perl-Gtk2-Notify-0.02-3.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 18:46:05 -0000	1.1
+++ import.log	27 Nov 2006 18:46:15 -0000	1.2
@@ -0,0 +1 @@
+perl-Gtk2-Notify-0_02-3_fc6:HEAD:perl-Gtk2-Notify-0.02-3.fc6.src.rpm:1164653281



From fedora-extras-commits at redhat.com  Mon Nov 27 18:47:30 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Mon, 27 Nov 2006 13:47:30 -0500
Subject: rpms/perl-Gtk2-Notify/devel perl-Gtk2-Notify.spec,1.1,1.2
Message-ID: <200611271847.kARIlUOH029183@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Notify/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29168

Modified Files:
	perl-Gtk2-Notify.spec 
Log Message:
release bump


Index: perl-Gtk2-Notify.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Notify/devel/perl-Gtk2-Notify.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gtk2-Notify.spec	27 Nov 2006 18:46:15 -0000	1.1
+++ perl-Gtk2-Notify.spec	27 Nov 2006 18:47:00 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Notify
 Version:        0.02
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gtk2::Notify Perl module
 License:        LGPL
 Group:          Development/Libraries
@@ -59,6 +59,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Nov 27 2006 Chris Weyl  0.02-4
+- bump
+
 * Mon Nov 27 2006 Chris Weyl 
 - change source0 to pull from an alternate CPAN location
 



From fedora-extras-commits at redhat.com  Mon Nov 27 19:30:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:30:09 -0500
Subject: rpms/gwenview/FC-6 .cvsignore, 1.6, 1.7 gwenview.spec, 1.19,
	1.20 sources, 1.6, 1.7
Message-ID: <200611271930.kARJU9Ue032504@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32470/FC-6

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
version 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Oct 2006 08:47:17 -0000	1.6
+++ .cvsignore	27 Nov 2006 19:29:39 -0000	1.7
@@ -1,2 +1,2 @@
-gwenview-1.4.0.tar.bz2
-gwenview-i18n-1.4.0.tar.bz2
+gwenview-1.4.1.tar.bz2
+gwenview-i18n-1.4.1.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/gwenview.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gwenview.spec	3 Oct 2006 15:25:01 -0000	1.19
+++ gwenview.spec	27 Nov 2006 19:29:39 -0000	1.20
@@ -1,13 +1,13 @@
 Name:           gwenview
-Version:        1.4.0
-Release:        3%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
-Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-%{version}.tar.bz2
+Source1:        http://dl.sf.net/gwenview/gwenview-i18n-%{version}.tar.bz2
 # Patch for libexif >= 0.6.13
 Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +17,7 @@
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
 BuildRequires:  libexif-devel
+BuildRequires:  exiv2-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  1.4.1-1
+- version 1.4.1
+
 * Tue Oct 03 2006 Aurelien Bompard  1.4.0-3
 - patch for latest libexif-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Oct 2006 08:47:17 -0000	1.6
+++ sources	27 Nov 2006 19:29:39 -0000	1.7
@@ -1,2 +1,2 @@
-82f15fca494ffd2aabad9828c5c66d94  gwenview-1.4.0.tar.bz2
-2b978ab4b76cbd4fb857d63100f0d5da  gwenview-i18n-1.4.0.tar.bz2
+df5df7ace3e7bec73f96bf1646ab27b0  gwenview-1.4.1.tar.bz2
+9a38efa209d7357b3baec1189d366928  gwenview-i18n-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 19:30:09 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:30:09 -0500
Subject: rpms/gwenview/devel .cvsignore, 1.6, 1.7 gwenview.spec, 1.19,
	1.20 sources, 1.6, 1.7
Message-ID: <200611271930.kARJU9Pl032509@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32470/devel

Modified Files:
	.cvsignore gwenview.spec sources 
Log Message:
version 1.4.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Oct 2006 08:47:17 -0000	1.6
+++ .cvsignore	27 Nov 2006 19:29:39 -0000	1.7
@@ -1,2 +1,2 @@
-gwenview-1.4.0.tar.bz2
-gwenview-i18n-1.4.0.tar.bz2
+gwenview-1.4.1.tar.bz2
+gwenview-i18n-1.4.1.tar.bz2


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gwenview.spec	3 Oct 2006 15:25:01 -0000	1.19
+++ gwenview.spec	27 Nov 2006 19:29:39 -0000	1.20
@@ -1,13 +1,13 @@
 Name:           gwenview
-Version:        1.4.0
-Release:        3%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://gwenview.sf.net
-Source0:        http://dl.sf.net/gwenview/gwenview-1.4.0.tar.bz2
-Source1:        http://dl.sf.net/gwenview/gwenview-i18n-1.4.0.tar.bz2
+Source0:        http://dl.sf.net/gwenview/gwenview-%{version}.tar.bz2
+Source1:        http://dl.sf.net/gwenview/gwenview-i18n-%{version}.tar.bz2
 # Patch for libexif >= 0.6.13
 Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +17,7 @@
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
 BuildRequires:  libexif-devel
+BuildRequires:  exiv2-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
@@ -116,6 +117,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  1.4.1-1
+- version 1.4.1
+
 * Tue Oct 03 2006 Aurelien Bompard  1.4.0-3
 - patch for latest libexif-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Oct 2006 08:47:17 -0000	1.6
+++ sources	27 Nov 2006 19:29:39 -0000	1.7
@@ -1,2 +1,2 @@
-82f15fca494ffd2aabad9828c5c66d94  gwenview-1.4.0.tar.bz2
-2b978ab4b76cbd4fb857d63100f0d5da  gwenview-i18n-1.4.0.tar.bz2
+df5df7ace3e7bec73f96bf1646ab27b0  gwenview-1.4.1.tar.bz2
+9a38efa209d7357b3baec1189d366928  gwenview-i18n-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 19:33:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:33:44 -0500
Subject: rpms/glest-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611271933.kARJXiH3000321@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv315

Added Files:
	Makefile import.log 
Log Message:
Setup of module glest-data


--- NEW FILE Makefile ---
# Top level Makefile for module glest-data
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  Mon Nov 27 19:33:49 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:33:49 -0500
Subject: rpms/glest-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611271933.kARJXnVG000343@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv315/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module glest-data


--- 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 Nov 27 20:06:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:06:17 -0500
Subject: rpms/glest import.log,1.1,1.2
Message-ID: <200611272006.kARK6HGI005979@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942

Modified Files:
	import.log 
Log Message:
auto-import glest-2.0.0-1 on branch devel from glest-2.0.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glest/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 20:04:39 -0000	1.1
+++ import.log	27 Nov 2006 20:05:47 -0000	1.2
@@ -0,0 +1 @@
+glest-2_0_0-1:HEAD:glest-2.0.0-1.src.rpm:1164658046



From fedora-extras-commits at redhat.com  Mon Nov 27 20:06:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:06:17 -0500
Subject: rpms/glest/devel glest-2.0.0-gcc41.patch, NONE,
	1.1 glest-2.0.0-unicode.patch, NONE, 1.1 glest.sh, NONE,
	1.1 glest.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611272006.kARK6Hed005983@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glest-2.0.0-gcc41.patch glest-2.0.0-unicode.patch glest.sh 
	glest.spec 
Log Message:
auto-import glest-2.0.0-1 on branch devel from glest-2.0.0-1.src.rpm

glest-2.0.0-gcc41.patch:

--- NEW FILE glest-2.0.0-gcc41.patch ---
--- ./source/shared_lib/include/graphics/particle.h.gcc41	2006-11-05 23:01:03.000000000 +0100
+++ ./source/shared_lib/include/graphics/particle.h	2006-11-05 23:01:22.000000000 +0100
@@ -310,7 +310,7 @@
 	void setTrajectoryFrequency(float trajectoryFrequency)	{this->trajectoryFrequency= trajectoryFrequency;}
 	void setPath(Vec3f startPos, Vec3f endPos);
 
-	static Trajectory ProjectileParticleSystem::strToTrajectory(const string &str);
+	static Trajectory strToTrajectory(const string &str);
 };
 
 // =====================================================

glest-2.0.0-unicode.patch:

--- NEW FILE glest-2.0.0-unicode.patch ---
--- ./mk/linux/configure.ac.unicode	2006-11-05 22:54:30.000000000 +0100
+++ ./mk/linux/configure.ac	2006-11-05 22:54:44.000000000 +0100
@@ -134,7 +134,7 @@
 XIPH_PATH_OGG(, [AC_MSG_ERROR([Please install ogg/vorbis])])
 
 AM_OPTIONS_WXCONFIG
-AM_PATH_WXCONFIG([2.6.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl], [--unicode=no])
+AM_PATH_WXCONFIG([2.6.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl])
 AC_SUBST([WX_AVAILABLE])
 
 AC_INIT_JAM


--- NEW FILE glest.sh ---
#!/bin/sh

GLEST_LOCAL_DIR=$HOME/.glest
GLEST_DATA_DIR=/usr/share/glest
GLEST_EXECUTABLE=/usr/libexec/glest/glest

tmplang="$LANG"
test "$LC_MESSAGES" != "" && tmplang="$LC_MESSAGES"
test "$LC_ALL"      != "" && tmplang="$LC_ALL"
test "$LANGUAGE"    != "" && tmplang="$LANGUAGE"

lang=`echo $tmplang|cut -d "_" -f 1`

case $lang in
  da)
    lang=dansk.lng
  ;;
  de)
    lang=german.lng
  ;;
  eu)
    lang=euskara.lng
  ;;
  es)
    lang=$(echo espa??ol.lng | iconv -f UTF-8 -t ISO-8859-1)
  ;;
  fr)
    lang=francais.lng
  ;;
  gl)
    lang=galego.lng
  ;;
  hu)
    lang=magyar.lng
  ;;
  it)
    lang=italiano.lng
  ;;
  nb|nn)
    lang=norsk.lng
  ;;
  pt)
    lang=portugues.lng
  ;;
  tr)
    lang=turkish.lng
  ;;
  *)
    lang=english.lng
  ;;
esac

mkdir -p $GLEST_LOCAL_DIR
cd $GLEST_LOCAL_DIR
for dir in techs data maps tilesets; do
    ln -snf $GLEST_DATA_DIR/$dir $dir
done
test -L screens && rm screens

# glest.ini
if [ ! -e glest.ini ]; then
  X=$(xdpyinfo|grep "dimensions:"|awk '{print $2}'|cut -d "x" -f 1)
  Y=$(xdpyinfo|grep "dimensions:"|awk '{print $2}'|cut -d "x" -f 2)
  sed -e s/ScreenWidth=.*/ScreenWidth=$X/g \
      -e s/ScreenHeight=.*/ScreenHeight=$Y/g \
      $GLEST_DATA_DIR/glest.ini > glest.ini
  if [ -f $GLEST_DATA_DIR/data/lang/$lang ]; then
    sed -i -e s/Lang=.*/Lang=$lang/g glest.ini
  fi
else
  # convert configuration from glest 1.1 to glest 1.2
  grep -q -e ChangeDisplay -e PathFindLevelsMax glest.ini
  if [ $? -eq 0 ]; then
    sed -e s/ChangeDisplay=1/Windowed=0/g \
        -e s/ChangeDisplay=0/Windowed=1/g \
        -e s/PathFindLevelsMax/PathFindNodesMax/g \
        -i glest.ini
  fi
fi
exec $GLEST_EXECUTABLE "$@"


--- NEW FILE glest.spec ---
Name:           glest
Version:        2.0.0
Release:        1%{?dist}
Summary:        3D real time strategy game

Group:          Amusements/Games
License:        GPL
URL:            http://glest.org
Source0:        http://dl.sf.net/glest/glest_source_2.0.0.zip
Source1:        glest.sh
Patch0:         glest-2.0.0-unicode.patch
Patch1:         glest-2.0.0-gcc41.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
BuildRequires:  libogg-devel, libvorbis-devel, autoconf, automake
BuildRequires:  desktop-file-utils

Requires:       glest-data = %{version}

%description
Glest  is a free 3D real time strategy game, that can be modified
using XML and a set of tools

%prep
%setup -q -n %{name}_source_%{version}
%patch0 -p1 -b .unicode
%patch1 -p1 -b .gcc41
find . -type f | xargs sed -i -e "s/\r//g" 
#find . -type f | while read file; do
#  grep -qs "\r\n" $file && dos2unix $file
#done


%build
cd mk/linux
#sed -i -e "s/\r//g" autogen.sh configure.ac glest.ini Jamfile Jamrules mk/jam/* mk/autoconf/*
chmod +x autogen.sh
./autogen.sh
%configure
#jam %{?_smp_mflags}
jam


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/glest
mkdir -p $RPM_BUILD_ROOT%{_datadir}/glest
install -p -m 755 mk/linux/glest $RPM_BUILD_ROOT%{_libexecdir}/glest/
install -p -m 644 mk/linux/glest.ini $RPM_BUILD_ROOT%{_datadir}/glest/

# Wrapper
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/glest

# Desktop file
cat > glest.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=Glest
Comment=Real Time Strategy game
Exec=glest
Icon=%{_datadir}/glest/glest-0.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Application;Game;StrategyGame;
EOF
desktop-file-install  --vendor fedora \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        glest.desktop



%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/README.linux docs/license.txt
%{_bindir}/glest
%{_datadir}/applications/*.desktop
%{_libexecdir}/glest
%{_datadir}/glest


%changelog
* Wed Jul 19 2006 Aurelien Bompard  2.0.0-1
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 20:04:44 -0000	1.1
+++ .cvsignore	27 Nov 2006 20:05:47 -0000	1.2
@@ -0,0 +1 @@
+glest_source_2.0.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 20:04:44 -0000	1.1
+++ sources	27 Nov 2006 20:05:47 -0000	1.2
@@ -0,0 +1 @@
+f7716da7a044dbe108c619b0f52621bb  glest_source_2.0.0.zip



From fedora-extras-commits at redhat.com  Mon Nov 27 20:04:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:04:18 -0500
Subject: rpms/glest - New directory
Message-ID: <200611272004.kARK4Ixg005830@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5825/glest

Log Message:
Directory /cvs/extras/rpms/glest added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 19:33:15 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:33:15 -0500
Subject: rpms/glest-data - New directory
Message-ID: <200611271933.kARJXFCi032709@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32704/glest-data

Log Message:
Directory /cvs/extras/rpms/glest-data added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 20:04:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:04:18 -0500
Subject: rpms/glest/devel - New directory
Message-ID: <200611272004.kARK4I4o005843@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5825/glest/devel

Log Message:
Directory /cvs/extras/rpms/glest/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 19:33:20 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:33:20 -0500
Subject: rpms/glest-data/devel - New directory
Message-ID: <200611271933.kARJXKK9032729@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32704/glest-data/devel

Log Message:
Directory /cvs/extras/rpms/glest-data/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 20:04:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:04:44 -0500
Subject: rpms/glest/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611272004.kARK4iUa005888@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5867/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module glest


--- 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 Nov 27 20:04:39 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:04:39 -0500
Subject: rpms/glest Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611272004.kARK4dUb005873@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5867

Added Files:
	Makefile import.log 
Log Message:
Setup of module glest


--- NEW FILE Makefile ---
# Top level Makefile for module glest
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  Mon Nov 27 19:55:00 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:55:00 -0500
Subject: rpms/glest-data import.log,1.1,1.2
Message-ID: <200611271955.kARJt0D4001994@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1925

Modified Files:
	import.log 
Log Message:
auto-import glest-data-2.0.0-2 on branch devel from glest-data-2.0.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glest-data/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 19:33:44 -0000	1.1
+++ import.log	27 Nov 2006 19:54:30 -0000	1.2
@@ -0,0 +1 @@
+glest-data-2_0_0-2:HEAD:glest-data-2.0.0-2.src.rpm:1164657369



From fedora-extras-commits at redhat.com  Mon Nov 27 19:55:00 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 14:55:00 -0500
Subject: rpms/glest-data/devel glest-data.spec, NONE,
	1.1 glest-get-translations.sh, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611271955.kARJt0fJ001999@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1925/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glest-data.spec glest-get-translations.sh 
Log Message:
auto-import glest-data-2.0.0-2 on branch devel from glest-data-2.0.0-2.src.rpm


--- NEW FILE glest-data.spec ---
Name:           glest-data
Version:        2.0.0
Release:        2%{?dist}
Summary:        Data files for the game Glest

Group:          Amusements/Games
License:        Distributable
URL:            http://www.glest.org
Source0:        http://dl.sf.net/glest/glest_data_%{version}.zip
# Script used to create SOURCE2
Source1:        glest-get-translations.sh
Source2:        glest-translations-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch

BuildRequires:  ImageMagick
Requires:       glest = %{version}

%description
Glest  is a free 3D real time strategy game, that can be modified
using XML and a set of tools.
This package contains the data files for the game.

%prep
%setup -q -n glest_game
# dos2unix some docs files
find docs -type f | xargs sed -i -e "s/\r//g"


%build
# Only data files, no build.

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/glest/
cp -a * $RPM_BUILD_ROOT%{_datadir}/glest/
# provided by the binary package
rm -f $RPM_BUILD_ROOT%{_datadir}/glest/glest.ini
# Needs to be writeable (in the user's homedir)
rm -f $RPM_BUILD_ROOT%{_datadir}/glest/glest.log
# Icon
convert $RPM_BUILD_ROOT%{_datadir}/glest/glest.ico \
        $RPM_BUILD_ROOT%{_datadir}/glest/glest.png
rm -f $RPM_BUILD_ROOT%{_datadir}/glest/glest.ico
# Translations
tar -xf %{SOURCE2} -C $RPM_BUILD_ROOT%{_datadir}/glest/data/lang/
pushd $RPM_BUILD_ROOT%{_datadir}/glest/data/lang/
for langfile in translations/*.zip; do
    unzip $langfile
done
rm -rf translations
chmod 644 *.lng
popd
# Documentation: put everything in the glest docdir (more logical)
mkdir -p $RPM_BUILD_ROOT%{_docdir}/glest-%{version}/
mv $RPM_BUILD_ROOT%{_datadir}/glest/docs/* $RPM_BUILD_ROOT%{_docdir}/glest-%{version}/
rmdir $RPM_BUILD_ROOT%{_datadir}/glest/docs
# Conflics with the glest package
mv $RPM_BUILD_ROOT%{_docdir}/glest-%{version}/license{.txt,-data.txt}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc %{_docdir}/glest-%{version}/*
%{_datadir}/glest/*



%changelog
* Sun Nov 26 2006 Aurelien Bompard  2.0.0-2
- fix Licence tag

* Thu Nov 09 2006 Aurelien Bompard  2.0.0-1
- initial package


--- NEW FILE glest-get-translations.sh ---
#!/bin/sh

version=$1

if [ -z "$version" ]; then
    echo "Usage: $0 "
    exit 2
fi

rm -rf translations
mkdir translations
cd translations
wget -r -N -l 1 -np -nd -A "*_$version.zip" http://www.glest.org/files/contrib/translations/
rm -f robots.txt
cd ..
tar -czf glest-translations-$version.tar.gz translations
rm -rf translations


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glest-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 19:33:49 -0000	1.1
+++ .cvsignore	27 Nov 2006 19:54:30 -0000	1.2
@@ -0,0 +1,2 @@
+glest-translations-2.0.0.tar.gz
+glest_data_2.0.0.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glest-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 19:33:49 -0000	1.1
+++ sources	27 Nov 2006 19:54:30 -0000	1.2
@@ -0,0 +1,2 @@
+aa9652c67a7dfcca11fe1f9e41cb1cd8  glest-translations-2.0.0.tar.gz
+8b6902e82874011e768c64e20fbeead5  glest_data_2.0.0.zip



From fedora-extras-commits at redhat.com  Mon Nov 27 20:10:27 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:10:27 -0500
Subject: owners owners.list,1.2022,1.2023
Message-ID: <200611272010.kARKARBh006042@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6027

Modified Files:
	owners.list 
Log Message:
add glest and glest-data


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2022
retrieving revision 1.2023
diff -u -r1.2022 -r1.2023
--- owners.list	27 Nov 2006 18:45:36 -0000	1.2022
+++ owners.list	27 Nov 2006 20:09:57 -0000	1.2023
@@ -554,6 +554,8 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|peter at thecodergeek.com|extras-qa at fedoraproject.org|jspaleta at gmail.com
+Fedora Extras|glest|3D real time strategy game|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|glest-data|Data files for the game Glest|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|glib|A library of handy utility functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 library for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 27 20:18:24 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:18:24 -0500
Subject: rpms/gwenview/FC-6 gwenview.spec,1.20,1.21
Message-ID: <200611272018.kARKIOIM006125@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6097/FC-6

Modified Files:
	gwenview.spec 
Log Message:
remove patch


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/gwenview.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gwenview.spec	27 Nov 2006 19:29:39 -0000	1.20
+++ gwenview.spec	27 Nov 2006 20:17:54 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,15 +8,12 @@
 URL:            http://gwenview.sf.net
 Source0:        http://dl.sf.net/gwenview/gwenview-%{version}.tar.bz2
 Source1:        http://dl.sf.net/gwenview/gwenview-i18n-%{version}.tar.bz2
-# Patch for libexif >= 0.6.13
-Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
-BuildRequires:  libexif-devel
 BuildRequires:  exiv2-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
@@ -36,9 +33,6 @@
 
 %prep
 %setup -q -a 1
-%if "%{fedora}" >= "6"
-%patch0 -p0
-%endif
 
 
 %build
@@ -117,6 +111,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  1.4.1-2
+- remove patch (gwenview now uses exiv2 instead of libexif)
+
 * Mon Nov 27 2006 Aurelien Bompard  1.4.1-1
 - version 1.4.1
 



From fedora-extras-commits at redhat.com  Mon Nov 27 20:18:25 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 15:18:25 -0500
Subject: rpms/gwenview/devel gwenview.spec,1.20,1.21
Message-ID: <200611272018.kARKIPPQ006128@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6097/devel

Modified Files:
	gwenview.spec 
Log Message:
remove patch


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gwenview.spec	27 Nov 2006 19:29:39 -0000	1.20
+++ gwenview.spec	27 Nov 2006 20:17:55 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,15 +8,12 @@
 URL:            http://gwenview.sf.net
 Source0:        http://dl.sf.net/gwenview/gwenview-%{version}.tar.bz2
 Source1:        http://dl.sf.net/gwenview/gwenview-i18n-%{version}.tar.bz2
-# Patch for libexif >= 0.6.13
-Patch0:         gwenview-1.4.0-libexif.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel >= 6:3.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
-BuildRequires:  libexif-devel
 BuildRequires:  exiv2-devel
 %if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
@@ -36,9 +33,6 @@
 
 %prep
 %setup -q -a 1
-%if "%{fedora}" >= "6"
-%patch0 -p0
-%endif
 
 
 %build
@@ -117,6 +111,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  1.4.1-2
+- remove patch (gwenview now uses exiv2 instead of libexif)
+
 * Mon Nov 27 2006 Aurelien Bompard  1.4.1-1
 - version 1.4.1
 



From fedora-extras-commits at redhat.com  Mon Nov 27 20:49:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 27 Nov 2006 15:49:18 -0500
Subject: fedora-security/audit fe3, 1.34, 1.35 fe4, 1.101, 1.102 fe5, 1.109, 
	1.110 fe6, 1.25, 1.26
Message-ID: <200611272049.kARKnIYV006376@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6355

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
Note CVE-2006-0804, CVE-2006-6122 (tin)


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fe3	26 Nov 2006 06:52:47 -0000	1.34
+++ fe3	27 Nov 2006 20:49:17 -0000	1.35
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
@@ -59,6 +60,7 @@
 CVE-2006-0840 VULNERABLE (mantis) bz#191089
 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297
 CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
+CVE-2006-0804 VULNERABLE (tin, fixed 1.8.1) #217422
 CVE-2006-0760 ** version (lighttpd, fixed 1.4.10))
 CVE-2006-0665 VULNERABLE (mantis) bz#191089
 CVE-2006-0664 VULNERABLE (mantis) bz#191089


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- fe4	26 Nov 2006 06:52:47 -0000	1.101
+++ fe4	27 Nov 2006 20:49:17 -0000	1.102
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
@@ -159,6 +160,7 @@
 CVE-2006-0162 version (clamav, fixed 0.88)
 CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
 CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0804 ignore (tin, <= 1.8.0 not shipped)
 CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507
 CVE-2006-0042 version (libapreq2, fixed 2.0.7)


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fe5	26 Nov 2006 06:52:47 -0000	1.109
+++ fe5	27 Nov 2006 20:49:17 -0000	1.110
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
@@ -165,6 +166,7 @@
 CVE-2006-0162 version (clamav, fixed 0.88)
 CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
 CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0804 ignore (tin, <= 1.8.0 not shipped)
 CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507
 CVE-2006-0042 version (libapreq2, fixed 2.0.7)


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fe6	26 Nov 2006 06:52:47 -0000	1.25
+++ fe6	27 Nov 2006 20:49:17 -0000	1.26
@@ -2,6 +2,7 @@
 
 ** are items that need attention
 
+CVE-2006-6122 ignore (tin, <= 1.8.1 not shipped)
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263
 CVE-2006-5864 VULNERABLE (gv) #215136
@@ -166,6 +167,7 @@
 CVE-2006-0162 version (clamav, fixed 0.88)
 CVE-2006-0126 version (rxvt-unicode, fixed 7.5)
 CVE-2006-0106 version (wine, fixed 0.9.10)
+CVE-2006-0804 ignore (tin, <= 1.8.0 not shipped)
 CVE-2006-0071 ignore (pinentry, Gentoo-specific problem)
 CVE-2006-0047 version (freeciv, fixed 2.0.8) bz#184507
 CVE-2006-0042 version (libapreq2, fixed 2.0.7)



From fedora-extras-commits at redhat.com  Mon Nov 27 21:00:30 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 27 Nov 2006 16:00:30 -0500
Subject: rpms/tin/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tin.spec, 1.11,
	1.12
Message-ID: <200611272100.kARL0UAf006442@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/tin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6423

Modified Files:
	.cvsignore sources tin.spec 
Log Message:
* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
- updated to 1.8.2
- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
- fix for #217420



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Mar 2006 03:37:49 -0000	1.5
+++ .cvsignore	27 Nov 2006 20:59:59 -0000	1.6
@@ -1,2 +1,3 @@
 tin-1.8.1.tar.bz2
 tin-1.8.1.tar.bz2.sign
+tin-1.8.2.tar.bz2.sign


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Mar 2006 03:37:49 -0000	1.5
+++ sources	27 Nov 2006 20:59:59 -0000	1.6
@@ -1,2 +1,4 @@
 efeecdf72683213d9e705c28de87ea2e  tin-1.8.1.tar.bz2
 4f7dd48ddd79d79203dc0094f692999f  tin-1.8.1.tar.bz2.sign
+8ee7304568012d05c68123e656654c4d  tin-1.8.2.tar.bz2.sign
+b6726c7f3e01b821b3b20d446ac2da9b  tin-1.8.2.tar.bz2


Index: tin.spec
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-5/tin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tin.spec	13 Mar 2006 03:37:49 -0000	1.11
+++ tin.spec	27 Nov 2006 20:59:59 -0000	1.12
@@ -1,12 +1,12 @@
 Name: tin
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{?dist}
 Summary: Basic Internet news reader
 Group: Applications/Internet
 License: Distributable
 URL: http://www.tin.org/
-Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2
-Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2.sign
+Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2
+Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2.sign
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel
 
@@ -86,6 +86,11 @@
 
 
 %changelog
+* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
+- updated to 1.8.2
+- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
+- fix for #217420
+
 * Sun Mar 13 2006 Adrian Reber  - 1.8.1-1
 - updated to 1.8.1
 



From fedora-extras-commits at redhat.com  Mon Nov 27 21:04:12 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 27 Nov 2006 16:04:12 -0500
Subject: rpms/tin/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tin.spec, 1.11,
	1.12
Message-ID: <200611272104.kARL4C54009541@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/tin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9522

Modified Files:
	.cvsignore sources tin.spec 
Log Message:
* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
- updated to 1.8.2
- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
- fix for #217420



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 May 2006 12:48:52 -0000	1.5
+++ .cvsignore	27 Nov 2006 21:03:42 -0000	1.6
@@ -1,2 +1,3 @@
 tin-1.8.1.tar.bz2
 tin-1.8.1.tar.bz2.sign
+tin-1.8.2.tar.bz2.sign


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 May 2006 12:48:52 -0000	1.5
+++ sources	27 Nov 2006 21:03:42 -0000	1.6
@@ -1,2 +1,4 @@
 efeecdf72683213d9e705c28de87ea2e  tin-1.8.1.tar.bz2
 4f7dd48ddd79d79203dc0094f692999f  tin-1.8.1.tar.bz2.sign
+8ee7304568012d05c68123e656654c4d  tin-1.8.2.tar.bz2.sign
+b6726c7f3e01b821b3b20d446ac2da9b  tin-1.8.2.tar.bz2


Index: tin.spec
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-4/tin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tin.spec	18 May 2006 12:48:52 -0000	1.11
+++ tin.spec	27 Nov 2006 21:03:42 -0000	1.12
@@ -1,12 +1,12 @@
 Name: tin
-Version: 1.8.1
+Version: 1.8.2
 Release: 1%{?dist}
 Summary: Basic Internet news reader
 Group: Applications/Internet
 License: Distributable
 URL: http://www.tin.org/
-Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2
-Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2.sign
+Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2
+Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2.sign
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel
 
@@ -86,6 +86,11 @@
 
 
 %changelog
+* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
+- updated to 1.8.2
+- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
+- fix for #217420
+
 * Sun Mar 13 2006 Adrian Reber  - 1.8.1-1
 - updated to 1.8.1
 



From fedora-extras-commits at redhat.com  Mon Nov 27 21:06:34 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 27 Nov 2006 16:06:34 -0500
Subject: rpms/libfwbuilder/devel .cvsignore, 1.7, 1.8 libfwbuilder.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200611272106.kARL6YjY009627@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9603

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Log Message:
- Update to 2.1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2006 12:52:05 -0000	1.7
+++ .cvsignore	27 Nov 2006 21:06:04 -0000	1.8
@@ -1 +1 @@
-libfwbuilder-2.1.6.tar.gz
+libfwbuilder-2.1.7.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libfwbuilder.spec	24 Oct 2006 12:52:05 -0000	1.14
+++ libfwbuilder.spec	27 Nov 2006 21:06:04 -0000	1.15
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        2.1.6
-Release:        0.0.beta%{?dist}
+Version:        2.1.7
+Release:        0.1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Tue Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
+- Update to 2.1.7
+
 * Tue Oct 24 2006 Ralf Ertzinger  2.1.6-0.0.beta.fc7
 - Update to the 2.1.6 beta
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Oct 2006 12:52:05 -0000	1.7
+++ sources	27 Nov 2006 21:06:04 -0000	1.8
@@ -1 +1 @@
-34a5f0c2ae1c5cc45287e4b53ba23816  libfwbuilder-2.1.6.tar.gz
+fde9444d2f48e8b643de1a90c812951f  libfwbuilder-2.1.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 21:08:45 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 27 Nov 2006 16:08:45 -0500
Subject: rpms/tin/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5 tin.spec,1.7,1.8
Message-ID: <200611272108.kARL8jOf009674@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/tin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9649

Modified Files:
	.cvsignore sources tin.spec 
Log Message:
* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
- updated to 1.8.2
- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
- fix for #217420
- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-0804
- fix for #217422



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Nov 2004 05:27:38 -0000	1.4
+++ .cvsignore	27 Nov 2006 21:08:15 -0000	1.5
@@ -1 +1,3 @@
-tin-1.6.2.tar.bz2
+tin-1.8.1.tar.bz2
+tin-1.8.1.tar.bz2.sign
+tin-1.8.2.tar.bz2.sign


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Nov 2004 05:27:38 -0000	1.4
+++ sources	27 Nov 2006 21:08:15 -0000	1.5
@@ -1 +1,4 @@
-3ab61ba7c7d3b7a3596ba199c570c4e4  tin-1.6.2.tar.bz2
+efeecdf72683213d9e705c28de87ea2e  tin-1.8.1.tar.bz2
+4f7dd48ddd79d79203dc0094f692999f  tin-1.8.1.tar.bz2.sign
+8ee7304568012d05c68123e656654c4d  tin-1.8.2.tar.bz2.sign
+b6726c7f3e01b821b3b20d446ac2da9b  tin-1.8.2.tar.bz2


Index: tin.spec
===================================================================
RCS file: /cvs/extras/rpms/tin/FC-3/tin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tin.spec	10 Dec 2004 22:03:12 -0000	1.7
+++ tin.spec	27 Nov 2006 21:08:15 -0000	1.8
@@ -1,16 +1,15 @@
 Name: tin
-Version: 1.6.2
-Release: 2
-Epoch: 0
-Summary: A basic Internet news reader.
+Version: 1.8.2
+Release: 1%{?dist}
+Summary: Basic Internet news reader
 Group: Applications/Internet
 License: Distributable
 URL: http://www.tin.org/
-Source:  ftp://ftp.tin.org/pub/news/clients/tin/v1.6/tin-1.6.2.tar.bz2
+Source0:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2
+Source1:  ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.2.tar.bz2.sign
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel
 
-#---------------------------------------------------------------------
 
 %description
 Tin is a basic, easy to use Internet news reader.  Tin can read news
@@ -19,12 +18,10 @@
 
 Install tin if you need a basic news reader.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q
 
-#---------------------------------------------------------------------
 
 %build
 %configure \
@@ -44,7 +41,6 @@
 %{__make} clean %{?_smp_mflags}
 %{__make} build %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/pcre"
 
-#---------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -69,12 +65,10 @@
 # url_handler.sh conflicts with mutt
 %{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/url_handler.sh
 
-#---------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root)
@@ -84,14 +78,30 @@
 %{_bindir}/metamutt
 %{_bindir}/opt-case.pl
 %{_bindir}/w2r.pl
+%{_bindir}/tinews.pl
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 /usr/share/locale/*/*/*
 %{_datadir}/applications/*%{name}.desktop
 
-#---------------------------------------------------------------------
 
 %changelog
+* Mon Nov 27 2006 Adrian Reber  - 1.8.2-1
+- updated to 1.8.2
+- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-6122
+- fix for #217420
+- fix for http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-0804
+- fix for #217422
+
+* Sun Mar 13 2006 Adrian Reber  - 1.8.1-1
+- updated to 1.8.1
+
+* Sun May 22 2005 Jeremy Katz  - 1.6.2-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Thu Jun 24 2004 Adrian Reber  - 0:1.6.2-0.fdr.2
 - changed BuildRequires from bison to byacc
 - added pcre-devel as BuildRequires
@@ -150,7 +160,7 @@
 - fix libdir=/var/lib/news (#7).
 - fix spooldir=/var/spool/news.
 
-* Sun Mar 21 1999 Cristian Gafton  
+* Sun Mar 21 1999 Cristian Gafton 
 - auto rebuild in the new build environment (release 3)
 
 * Tue Mar 09 1999 Preston Brown 



From fedora-extras-commits at redhat.com  Mon Nov 27 21:12:07 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 27 Nov 2006 16:12:07 -0500
Subject: rpms/fwbuilder/devel .cvsignore, 1.8, 1.9 fwbuilder.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <200611272112.kARLC7c4009780@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9755

Modified Files:
	.cvsignore fwbuilder.spec sources 
Log Message:
- Update to 2.1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Oct 2006 12:58:12 -0000	1.8
+++ .cvsignore	27 Nov 2006 21:11:37 -0000	1.9
@@ -1 +1 @@
-fwbuilder-2.1.6.tar.gz
+fwbuilder-2.1.7.tar.gz


Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fwbuilder.spec	24 Oct 2006 12:58:12 -0000	1.15
+++ fwbuilder.spec	27 Nov 2006 21:11:37 -0000	1.16
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
-Version:        2.1.6
-Release:        0.0.beta%{?dist}
+Version:        2.1.7
+Release:        0.1%{?dist}
 
 License:        GPL
 Group:          Applications/System
@@ -36,17 +36,17 @@
 # The beta releases are meant to be installed in parallel, we do
 # not want that. So we have to mangle some filenames
 #
-perl -pi -e 's,(fwb(?:edit|lookup|uilder|_ipf|_ipfw|_ipt|_pf))21,$1,' \
-    doc/doc.pro \
-    src/ipf/ipf.pro \
-    src/fwbedit/fwbedit.pro \
-    src/gui/gui.pro \
-    src/pf/pf.pro \
-    src/fwblookup/fwblookup.pro \
-    src/ipt/ipt.pro \
-    src/ipfw/ipfw.pro
-
-/usr/bin/rename 21.1 .1 doc/*21.1
+# perl -pi -e 's,(fwb(?:edit|lookup|uilder|_ipf|_ipfw|_ipt|_pf))21,$1,' \
+#     doc/doc.pro \
+#     src/ipf/ipf.pro \
+#     src/fwbedit/fwbedit.pro \
+#     src/gui/gui.pro \
+#     src/pf/pf.pro \
+#     src/fwblookup/fwblookup.pro \
+#     src/ipt/ipt.pro \
+#     src/ipfw/ipfw.pro
+# 
+# /usr/bin/rename 21.1 .1 doc/*21.1
 
 %configure \
     --with-templatedir=%{_datadir}/fwbuilder \
@@ -83,9 +83,9 @@
 %{_datadir}/fwbuilder
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/fwbuilder.png
-%{_bindir}/fwbuilder
-%{_bindir}/fwblookup
-%{_bindir}/fwbedit
+%{_bindir}/fwbuilder21
+%{_bindir}/fwblookup21
+%{_bindir}/fwbedit21
 %doc doc/AUTHORS
 %doc doc/COPYING
 %doc doc/Credits
@@ -94,9 +94,9 @@
 %doc doc/README.floppyfw
 %doc doc/ReleaseNotes_*.txt
 %doc doc/ReleaseNotes_*.html
-%{_mandir}/man1/fwbuilder.1*
-%{_mandir}/man1/fwblookup.1*
-%{_mandir}/man1/fwbedit.1*
+%{_mandir}/man1/fwbuilder21.1*
+%{_mandir}/man1/fwblookup21.1*
+%{_mandir}/man1/fwbedit21.1*
 
 
 %package pf
@@ -159,6 +159,9 @@
 %{_mandir}/man1/fwb_ipt.1*
 
 %changelog
+* Tue Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
+- Update to 2.1.7
+
 * Tue Oct 24 2006 Ralf Ertzinger  2.1.6-0.0.beta.fc7
 - Update to beta release 2.1.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2006 12:58:12 -0000	1.8
+++ sources	27 Nov 2006 21:11:37 -0000	1.9
@@ -1 +1 @@
-12638ce0987c87dd81cc54a8c5b906bb  fwbuilder-2.1.6.tar.gz
+229b23b37e20f8184b189ab76a98ba22  fwbuilder-2.1.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 21:15:21 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Mon, 27 Nov 2006 16:15:21 -0500
Subject: rpms/openpbx/devel .cvsignore, 1.3, 1.4 openpbx.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200611272115.kARLFLeF010211@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10192

Modified Files:
	.cvsignore openpbx.spec sources 
Log Message:
RC2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2006 16:17:46 -0000	1.3
+++ .cvsignore	27 Nov 2006 21:14:51 -0000	1.4
@@ -1 +1,2 @@
 openpbx-r1984.tar.gz
+openpbx-r2135.tar.gz


Index: openpbx.spec
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/openpbx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openpbx.spec	18 Oct 2006 16:17:46 -0000	1.3
+++ openpbx.spec	27 Nov 2006 21:14:51 -0000	1.4
@@ -1,4 +1,4 @@
-%define snap 1984
+%define snap 2135
 
 %bcond_without misdn
 %bcond_without zaptel
@@ -7,7 +7,7 @@
 
 Name:		openpbx
 Version:	1.2
-Release:	2.rc1.svn%{snap}%{?dist}
+Release:	3.rc2.svn%{snap}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -353,6 +353,9 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Mon Nov 27 2006 David Woodhouse  1.2-3.rc2.svn2135
+- Update to RC2
+
 * Wed Oct 18 2006 David Woodhouse  1.2-2.rc1.svn1984
 - Build with mISDN and MySQL support
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Oct 2006 16:17:46 -0000	1.3
+++ sources	27 Nov 2006 21:14:51 -0000	1.4
@@ -1 +1,2 @@
 8aed2d6afedbd13082d8ce4318b8f163  openpbx-r1984.tar.gz
+6f26c9fadd92caf464aa064e2801385c  openpbx-r2135.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 21:21:52 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 27 Nov 2006 16:21:52 -0500
Subject: rpms/glest/devel glest.spec,1.1,1.2
Message-ID: <200611272121.kARLLqDg010278@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10260

Modified Files:
	glest.spec 
Log Message:
fix description


Index: glest.spec
===================================================================
RCS file: /cvs/extras/rpms/glest/devel/glest.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glest.spec	27 Nov 2006 20:05:47 -0000	1.1
+++ glest.spec	27 Nov 2006 21:21:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           glest
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -19,8 +19,13 @@
 Requires:       glest-data = %{version}
 
 %description
-Glest  is a free 3D real time strategy game, that can be modified
-using XML and a set of tools
+Glest is a free 3D real time strategy game, that can be modified
+using XML and a set of tools.
+
+Glest takes place in a context which could be compared to that of
+the pre-renaissance Europe, with the licence that magic forces
+exist in the environment and can be controlled.
+
 
 %prep
 %setup -q -n %{name}_source_%{version}
@@ -86,5 +91,8 @@
 
 
 %changelog
+* Mon Nov 27 2006 Aurelien Bompard  2.0.0-2
+- fix description
+
 * Wed Jul 19 2006 Aurelien Bompard  2.0.0-1
 - initial package



From fedora-extras-commits at redhat.com  Mon Nov 27 22:04:18 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:04:18 -0500
Subject: rpms/cmake/FC-6 .cvsignore, 1.4, 1.5 cmake.spec, 1.9, 1.10 sources, 
	1.4, 1.5 cmake-2.4.3-soname.patch, 1.1, NONE
Message-ID: <200611272204.kARM4IDu014330@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14309

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.4.3-soname.patch 
Log Message:
Update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 16:46:34 -0000	1.4
+++ .cvsignore	27 Nov 2006 22:03:48 -0000	1.5
@@ -1 +1 @@
-cmake-2.4.3.tar.gz
+cmake-2.4.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/cmake.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cmake.spec	31 Oct 2006 23:13:40 -0000	1.9
+++ cmake.spec	27 Nov 2006 22:03:48 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.3
-Release:	4%{?dist}
+Version:	2.4.4
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
 Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.3-soname.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
 
@@ -25,7 +24,6 @@
 %prep
 %setup -q
 %patch -p1 -b .fedora
-%patch1 -p0 -b .soname
 
 
 %build
@@ -62,6 +60,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Orion Poplawski  - 2.4.4-1
+- Update to 2.4.4
+
 * Tue Oct 31 2006 Orion Poplawski  - 2.4.3-4
 - Add /usr/lib/jvm/java to FindJNI search paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 16:46:34 -0000	1.4
+++ sources	27 Nov 2006 22:03:48 -0000	1.5
@@ -1 +1 @@
-c9b50c488a24edd5297ffc3230ecd0f2  cmake-2.4.3.tar.gz
+8c99af9e6e70f154314cf0d160b61e6e  cmake-2.4.4.tar.gz


--- cmake-2.4.3-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 27 22:07:53 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:07:53 -0500
Subject: rpms/cmake/FC-5 .cvsignore, 1.4, 1.5 cmake.spec, 1.5, 1.6 sources,
	1.4, 1.5 cmake-2.4.3-soname.patch, 1.1, NONE
Message-ID: <200611272207.kARM7rs3014409@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14390

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.4.3-soname.patch 
Log Message:
Update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 17:18:17 -0000	1.4
+++ .cvsignore	27 Nov 2006 22:07:23 -0000	1.5
@@ -1 +1 @@
-cmake-2.4.3.tar.gz
+cmake-2.4.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cmake.spec	31 Oct 2006 23:13:39 -0000	1.5
+++ cmake.spec	27 Nov 2006 22:07:23 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.3
-Release:	3%{?dist}
+Version:	2.4.4
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
 Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.3-soname.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
 
@@ -25,7 +24,6 @@
 %prep
 %setup -q
 %patch -p1 -b .fedora
-%patch1 -p0 -b .soname
 
 
 %build
@@ -62,6 +60,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Orion Poplawski  - 2.4.4-1
+- Update to 2.4.4
+
 * Tue Oct 31 2006 Orion Poplawski  - 2.4.3-3
 - Add /usr/lib/jvm/java to FindJNI search paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 17:18:17 -0000	1.4
+++ sources	27 Nov 2006 22:07:23 -0000	1.5
@@ -1 +1 @@
-c9b50c488a24edd5297ffc3230ecd0f2  cmake-2.4.3.tar.gz
+8c99af9e6e70f154314cf0d160b61e6e  cmake-2.4.4.tar.gz


--- cmake-2.4.3-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 27 22:10:15 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:10:15 -0500
Subject: rpms/cmake/FC-4 .cvsignore, 1.4, 1.5 cmake.spec, 1.7, 1.8 sources,
	1.4, 1.5 cmake-2.4.3-soname.patch, 1.1, NONE
Message-ID: <200611272210.kARMAFjY014486@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14467

Modified Files:
	.cvsignore cmake.spec sources 
Removed Files:
	cmake-2.4.3-soname.patch 
Log Message:
Update to 2.4.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Aug 2006 17:18:16 -0000	1.4
+++ .cvsignore	27 Nov 2006 22:09:45 -0000	1.5
@@ -1 +1 @@
-cmake-2.4.3.tar.gz
+cmake-2.4.4.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/cmake.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cmake.spec	31 Oct 2006 23:15:32 -0000	1.7
+++ cmake.spec	27 Nov 2006 22:09:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		cmake
-Version:	2.4.3
-Release:	3%{?dist}
+Version:	2.4.4
+Release:	1%{?dist}
 Summary:	Cross-platform make system
 
 Group:		Development/Tools
@@ -9,7 +9,6 @@
 Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
 Source1:        cmake-init-fedora
 Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.3-soname.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, xorg-x11-devel
 
@@ -25,7 +24,6 @@
 %prep
 %setup -q
 %patch -p1 -b .fedora
-%patch1 -p0 -b .soname
 
 
 %build
@@ -67,6 +65,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Orion Poplawski  - 2.4.4-1
+- Update to 2.4.4
+
 * Tue Oct 31 2006 Orion Poplawski  - 2.4.3-3
 - Add /usr/lib/jvm/java to FindJNI search paths
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Aug 2006 17:18:16 -0000	1.4
+++ sources	27 Nov 2006 22:09:45 -0000	1.5
@@ -1 +1 @@
-c9b50c488a24edd5297ffc3230ecd0f2  cmake-2.4.3.tar.gz
+8c99af9e6e70f154314cf0d160b61e6e  cmake-2.4.4.tar.gz


--- cmake-2.4.3-soname.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Nov 27 22:16:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:16:57 -0500
Subject: rpms/cmake/FC-6 cmake-2.4.2-fedora.patch,1.2,1.3
Message-ID: <200611272216.kARMGvlA014610@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573

Modified Files:
	cmake-2.4.2-fedora.patch 
Log Message:
Update patch for 2.4.4


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-6/cmake-2.4.2-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:40 -0000	1.2
+++ cmake-2.4.2-fedora.patch	27 Nov 2006 22:16:27 -0000	1.3
@@ -1,29 +1,3 @@
---- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
-+++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
-@@ -9,6 +9,7 @@
- 
- SET(RUBY_POSSIBLE_INCLUDE_PATHS
--  /usr/lib/ruby/1.8/i386-linux
-+  /usr/lib/ruby/*/i386-linux
-+  /usr/lib64/ruby/*/x86_64-linux
-   )
- 
- SET(RUBY_POSSIBLE_LIB_PATHS
-@@ -19,12 +20,12 @@
-   ${RUBY_POSSIBLE_INCLUDE_PATHS})
- 
- FIND_LIBRARY(RUBY_LIBRARY
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-   )
- 
- FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS
-   /usr/bin
-   /usr/local/bin
 --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
 +++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
 @@ -7,13 +7,11 @@



From fedora-extras-commits at redhat.com  Mon Nov 27 22:17:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:17:52 -0500
Subject: rpms/cmake/FC-4 cmake-2.4.2-fedora.patch,1.2,1.3
Message-ID: <200611272217.kARMHqiZ014712@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14657/FC-4

Modified Files:
	cmake-2.4.2-fedora.patch 
Log Message:
Update patch for 2.4.4


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-4/cmake-2.4.2-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.4.2-fedora.patch	31 Oct 2006 23:15:32 -0000	1.2
+++ cmake-2.4.2-fedora.patch	27 Nov 2006 22:17:22 -0000	1.3
@@ -1,29 +1,3 @@
---- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
-+++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
-@@ -9,6 +9,7 @@
- 
- SET(RUBY_POSSIBLE_INCLUDE_PATHS
--  /usr/lib/ruby/1.8/i386-linux
-+  /usr/lib/ruby/*/i386-linux
-+  /usr/lib64/ruby/*/x86_64-linux
-   )
- 
- SET(RUBY_POSSIBLE_LIB_PATHS
-@@ -19,12 +20,12 @@
-   ${RUBY_POSSIBLE_INCLUDE_PATHS})
- 
- FIND_LIBRARY(RUBY_LIBRARY
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-   )
- 
- FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS
-   /usr/bin
-   /usr/local/bin
 --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
 +++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
 @@ -7,13 +7,11 @@



From fedora-extras-commits at redhat.com  Mon Nov 27 22:17:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 27 Nov 2006 17:17:52 -0500
Subject: rpms/cmake/FC-5 cmake-2.4.2-fedora.patch,1.2,1.3
Message-ID: <200611272217.kARMHqr5014715@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14657/FC-5

Modified Files:
	cmake-2.4.2-fedora.patch 
Log Message:
Update patch for 2.4.4


cmake-2.4.2-fedora.patch:

Index: cmake-2.4.2-fedora.patch
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake-2.4.2-fedora.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmake-2.4.2-fedora.patch	31 Oct 2006 23:13:39 -0000	1.2
+++ cmake-2.4.2-fedora.patch	27 Nov 2006 22:17:22 -0000	1.3
@@ -1,29 +1,3 @@
---- cmake-2.4.2/Modules/FindRuby.cmake.fedora	2006-07-11 10:20:14.000000000 -0600
-+++ cmake-2.4.2/Modules/FindRuby.cmake	2006-07-11 10:20:38.000000000 -0600
-@@ -9,6 +9,7 @@
- 
- SET(RUBY_POSSIBLE_INCLUDE_PATHS
--  /usr/lib/ruby/1.8/i386-linux
-+  /usr/lib/ruby/*/i386-linux
-+  /usr/lib64/ruby/*/x86_64-linux
-   )
- 
- SET(RUBY_POSSIBLE_LIB_PATHS
-@@ -19,12 +20,12 @@
-   ${RUBY_POSSIBLE_INCLUDE_PATHS})
- 
- FIND_LIBRARY(RUBY_LIBRARY
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS ${RUBY_POSSIBLE_LIB_PATHS}
-   )
- 
- FIND_PROGRAM(RUBY_EXECUTABLE
--  NAMES ruby1.8
-+  NAMES ruby
-   PATHS
-   /usr/bin
-   /usr/local/bin
 --- cmake-2.4.2/Modules/FindSWIG.cmake.fedora	2006-07-11 10:21:11.000000000 -0600
 +++ cmake-2.4.2/Modules/FindSWIG.cmake	2006-07-11 10:22:47.000000000 -0600
 @@ -7,13 +7,11 @@



From fedora-extras-commits at redhat.com  Mon Nov 27 22:18:18 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:18:18 -0500
Subject: rpms/libdvdread - New directory
Message-ID: <200611272218.kARMII2V014787@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14783/libdvdread

Log Message:
Directory /cvs/extras/rpms/libdvdread added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 22:18:23 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:18:23 -0500
Subject: rpms/libdvdread/devel - New directory
Message-ID: <200611272218.kARMINEh014802@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14783/libdvdread/devel

Log Message:
Directory /cvs/extras/rpms/libdvdread/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Nov 27 22:18:41 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:18:41 -0500
Subject: rpms/libdvdread Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611272218.kARMIfBv014845@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14839

Added Files:
	Makefile import.log 
Log Message:
Setup of module libdvdread


--- NEW FILE Makefile ---
# Top level Makefile for module libdvdread
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  Mon Nov 27 22:18:46 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:18:46 -0500
Subject: rpms/libdvdread/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611272218.kARMIkR5014864@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14839/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libdvdread


--- 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 Nov 27 22:22:57 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:22:57 -0500
Subject: rpms/libdvdread import.log,1.1,1.2
Message-ID: <200611272222.kARMMv1k014980@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14941

Modified Files:
	import.log 
Log Message:
auto-import libdvdread-0.9.7-1 on branch devel from libdvdread-0.9.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Nov 2006 22:18:41 -0000	1.1
+++ import.log	27 Nov 2006 22:22:27 -0000	1.2
@@ -0,0 +1 @@
+libdvdread-0_9_7-1:HEAD:libdvdread-0.9.7-1.src.rpm:1164666338



From fedora-extras-commits at redhat.com  Mon Nov 27 22:22:58 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:22:58 -0500
Subject: rpms/libdvdread/devel libdvdread.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611272223.kARMMwcJ014984@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14941/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libdvdread.spec 
Log Message:
auto-import libdvdread-0.9.7-1 on branch devel from libdvdread-0.9.7-1.src.rpm


--- NEW FILE libdvdread.spec ---
Name:           libdvdread
Version:        0.9.7
Release:        1%{?dist}
Summary:        Simple foundation for reading DVD video disks

Group:          System Environment/Libraries
License:        GPL
URL:            http://www.dtek.chalmers.se/groups/dvd/
Source0:        http://www.dtek.chalmers.se/groups/dvd/dist/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
libdvdread provides a simple foundation for reading DVD video disks.
It provides the functionality that is required to access many DVDs.

%package        devel
Summary:        Development files for libdvdread
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
libdvdread provides a simple foundation for reading DVD video disks.
It provides the functionality that is required to access many DVDs.

This package contains development files for libdvdread.


%prep
%setup -q
for f in AUTHORS NEWS ; do
    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
done


%build
%configure --disable-dependency-tracking --disable-static --without-libdvdcss
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
%{_libdir}/libdvdread.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/dvdread
%{_libdir}/libdvdread.so


%changelog
* Fri Oct  6 2006 Dams  - 0.9.7-1
- Updated to 0.9.7

* Wed Sep 20 2006 Ville Skytt??  - 0.9.6-2
- Rebuild.

* Sun Jul 23 2006 Ville Skytt??  - 0.9.6-1
- 0.9.6.
- Specfile cleanup.

* Thu Mar 16 2006 Ville Skytt??  - 0.9.4-4
- Fix linking with libdl on x86_64.
- Don't ship static libs.
- Build with dependency tracking disabled.
- Convert specfile and docs to UTF-8.
- Improve package descriptions.

* Thu Mar 16 2006 Dams  - 0.9.4-3
- We BuildConflicting libdvdcss-devel at build time

* Mon Mar 13 2006 Thorsten Leemhuis  0.9.4-2 
- Drop Epoch completely

* Thu Mar 09 2006 Andreas Bierfert 
- switch to new release field
- drop Epoch

* Tue Feb 28 2006 Andreas Bierfert 
- add dist

* Thu Apr  3 2003 Marius Johndal  0:0.9.4-0.fdr.1
- Initial Fedora RPM release.

* Mon Mar 31 2003 Matthias Saou 
- Rebuilt for Red Hat Linux 9.
- Exclude .la file.

* Sun Feb 16 2003 Matthias Saou 
- Update to 0.9.4.

* Thu Sep 26 2002 Matthias Saou 
- Updated to the latest cvs release.
- Rebuilt for Red Hat Linux 8.0.
- Updated URLs.

* Mon May 27 2002 Matthias Saou 
- Update to 0.9.3.

* Wed May 15 2002 Matthias Saou 
- Fixed the libdvdcss.so.0/1/2 problem again.

* Thu May  2 2002 Matthias Saou 
- Back to using libdvdcss 1.1.1, now it's all merged and fine.
- Rebuilt against Red Hat Linux 7.3.
- Added the %{?_smp_mflags} expansion.

* Sat Jan 12 2002 Matthias Saou 
- Reverted back to using libdvdcss 0.0.3.ogle3 since it works MUCH better
  than 1.0.x. Doh!

* Tue Nov 13 2001 Matthias Saou 
- Rebuilt against libdvdcss 1.0.0 (added a patch).

* Mon Oct 29 2001 Matthias Saou 
- Spec file cleanup and fixes.

* Thu Oct 11 2001 Martin Norb??ck 
- Updated to version 0.9.2

* Tue Sep 25 2001 Martin Norb??ck 
- Added small patch to fix the ldopen of libdvdcss

* Tue Sep 18 2001 Martin Norb??ck 
- Updated to version 0.9.1

* Fri Sep 14 2001 Martin Norb??ck 
- Split into normal and devel package

* Thu Sep 6 2001 Martin Norb??ck 
- Updated to version 0.9.0

* Tue Jul 03 2001 Martin Norb??ck 
- initial version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Nov 2006 22:18:46 -0000	1.1
+++ .cvsignore	27 Nov 2006 22:22:27 -0000	1.2
@@ -0,0 +1 @@
+libdvdread-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Nov 2006 22:18:46 -0000	1.1
+++ sources	27 Nov 2006 22:22:27 -0000	1.2
@@ -0,0 +1 @@
+078788c9241ae16763529e1235502337  libdvdread-0.9.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Nov 27 22:29:23 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Mon, 27 Nov 2006 17:29:23 -0500
Subject: owners owners.list,1.2023,1.2024
Message-ID: <200611272229.kARMTNG5015161@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15133

Modified Files:
	owners.list 
Log Message:
Add myself as libdvdread maintainer


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2023
retrieving revision 1.2024
diff -u -r1.2023 -r1.2024
--- owners.list	27 Nov 2006 20:09:57 -0000	1.2023
+++ owners.list	27 Nov 2006 22:28:53 -0000	1.2024
@@ -904,6 +904,7 @@
 Fedora Extras|libdap|The C++ DAP2 library from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|jima at beer.tclug.org|extras-qa at fedoraproject.org|oliver at linux-kernel.at
 Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|libdvdread|Simple foundation for reading DVD video disks|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|libebml|The Extensible Binary Meta Language library|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libedit|The NetBSD Editline library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libEMF|A library for generating Enhanced Metafiles|rpm at greysector.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Nov 27 23:20:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 18:20:29 -0500
Subject: rpms/tracker/devel tracker-desktop.patch, 1.1, 1.2 tracker.spec, 1.3,
	1.4
Message-ID: <200611272320.kARNKTD3018661@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18641

Modified Files:
	tracker-desktop.patch tracker.spec 
Log Message:
* Mon Nov 27 2006 Deji Akingunola  - 0.5.2-2
- Apply patch on Makefile.am instead of Makefile.in


tracker-desktop.patch:

Index: tracker-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracker-desktop.patch	21 Nov 2006 07:43:59 -0000	1.1
+++ tracker-desktop.patch	27 Nov 2006 23:19:59 -0000	1.2
@@ -1,27 +1,16 @@
---- Makefile.in	2006-11-20 13:34:48.000000000 -0500
-+++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
-@@ -66,8 +66,9 @@
-     *) f=$$p;; \
-   esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
- pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-+xdgconfigDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(pkgconfig_DATA)
- ETAGS = etags
- CTAGS = ctags
-@@ -299,7 +300,9 @@
- target_alias = @target_alias@
+--- Makefile.am	2006-11-20 23:57:45.000000000 -0500
++++ Makefile.am.new	2006-11-20 23:58:00.000000000 -0500
+@@ -1,7 +1,9 @@
  SUBDIRS = data src filters thumbnailers docs po
+ 
  pkgconfigdir = $(libdir)/pkgconfig
 +xdgconfigdir = $(sysconfdir)/xdg/autostart
  pkgconfig_DATA = tracker.pc
-+xdgconfig_DATA= trackerd.desktop
++xdgconfig_DATA = trackerd.desktop
+ 
  debian_files = \
  	debian/changelog \
- 	debian/compat \
-@@ -331,12 +334,11 @@
+@@ -34,12 +36,11 @@
  
  EXTRA_DIST = \
  	$(pkgconfig_DATA) \
@@ -35,54 +24,6 @@
  	intltool-extract.in \
  	intltool-merge.in \
  	intltool-update.in \
-@@ -422,6 +424,15 @@
- 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- 	done
-+install-xdgconfigDATA: $(xdgconfig_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
-+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
-+	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
-+	done
- 
- uninstall-pkgconfigDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -430,6 +441,13 @@
- 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- 	done
-+uninstall-xdgconfigDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
-+	done
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -710,7 +728,7 @@
- all-am: Makefile $(DATA) config.h
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-+	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-recursive
-@@ -758,7 +776,7 @@
- 
- info-am:
- 
--install-data-am: install-pkgconfigDATA
-+install-data-am: install-pkgconfigDATA install-xdgconfigDATA
- 
- install-exec-am:
- 
 --- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
 +++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
 @@ -8,5 +8,8 @@


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tracker.spec	21 Nov 2006 07:43:59 -0000	1.3
+++ tracker.spec	27 Nov 2006 23:19:59 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
@@ -17,6 +17,8 @@
 %else
 BuildRequires: dbus-devel, dbus-glib
 %endif
+#Temporarily
+BuildRequires: automake autoconf
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -48,6 +50,9 @@
 %patch -p0 -b .desktop
 
 %build
+aclocal
+automake
+autoconf
 %if "%fedora" >= "6"
 %configure --disable-static --enable-external-sqlite
 %else
@@ -103,6 +108,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 27 2006 Deji Akingunola  - 0.5.2-2
+- Apply patch on Makefile.am instead of Makefile.in
+
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
 - Update to 0.5.2
 



From fedora-extras-commits at redhat.com  Mon Nov 27 23:23:45 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 18:23:45 -0500
Subject: rpms/gparted/devel gparted-parted-check.patch, NONE,
	1.1 gparted.spec, 1.16, 1.17
Message-ID: <200611272323.kARNNjRJ018786@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18734

Modified Files:
	gparted.spec 
Added Files:
	gparted-parted-check.patch 
Log Message:
* Mon Nov 27 2006 Deji Akingunola  - 0.3.1-4
- Complete fix for parted check and apply patch on configure.in


gparted-parted-check.patch:

--- NEW FILE gparted-parted-check.patch ---
--- configure.in	2006/09/11 09:46:42	1.62
+++ configure.in	2006/09/14 20:34:49	1.63
@@ -33,7 +33,8 @@
 AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
 
 dnl libparted
-AC_MSG_CHECKING(for libparted >= 1.7.1)
+LIBPARTED_VERSION=1.7.1
+AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
 LDFLAGS=-lparted
 AC_TRY_RUN(
 #include 
@@ -41,16 +42,28 @@
 
 int main ()
 {
+	int min_major ;
+	int min_minor ;
+	int min_micro ;
 	int major ;
 	int minor ;
 	int micro ;
 
-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
-		printf( "Found libparted %s\t", ped_get_version() ) ;
+	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
+	{
+		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+		{
+			printf( "Found libparted %s\t", ped_get_version() ) ;
+
+			return ! ((major > min_major) ||
+           			 ((major == min_major) && (minor > min_minor)) ||
+           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
+		}
+	}
 
-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
+	return 1 ;
 }
-,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= 1.7.1) )
+,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= $LIBPARTED_VERSION) )
 
 
 dnl GTKMM


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gparted.spec	22 Nov 2006 08:03:01 -0000	1.16
+++ gparted.spec	27 Nov 2006 23:23:15 -0000	1.17
@@ -1,16 +1,18 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gparted-configure.patch
+Patch0: gparted-parted-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires: desktop-file-utils
+#Temporarily
+BuildRequires: automake autoconf
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -21,9 +23,12 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .config
+%patch0 -p0 -b .parted
 
 %build
+aclocal
+automake
+autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -79,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 27 2006 Deji Akingunola  - 0.3.1-4
+- Complete fix for parted check and apply patch on configure.in
+
 * Wed Nov 23 2006 Deji Akingunola  - 0.3.1-3
 - Backport a fix from cvs to properly check for libparted version
 



From fedora-extras-commits at redhat.com  Mon Nov 27 23:26:21 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 27 Nov 2006 18:26:21 -0500
Subject: rpms/smb4k/FC-5 .cvsignore, 1.11, 1.12 smb4k.spec, 1.14,
	1.15 sources, 1.11, 1.12
Message-ID: <200611272326.kARNQLKP018871@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Nov 2006 21:59:36 -0000	1.11
+++ .cvsignore	27 Nov 2006 23:25:51 -0000	1.12
@@ -1 +1 @@
-smb4k-0.7.4.tar.bz2
+smb4k-0.7.5.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smb4k.spec	14 Nov 2006 21:59:36 -0000	1.14
+++ smb4k.spec	27 Nov 2006 23:25:51 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.4
+Version:	0.7.5
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.7.5-1
+- Updated to version 0.7.5
+
 * Tue Nov 14 2006 Marcin Garski  0.7.4-1
 - Updated to version 0.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Nov 2006 21:59:36 -0000	1.11
+++ sources	27 Nov 2006 23:25:51 -0000	1.12
@@ -1 +1 @@
-69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2
+020d1d034e1647df90c2ab9b81b18f5a  smb4k-0.7.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 23:28:14 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 27 Nov 2006 18:28:14 -0500
Subject: rpms/smb4k/FC-6 .cvsignore, 1.11, 1.12 smb4k.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <200611272328.kARNSEbR018948@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18925

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Nov 2006 21:32:02 -0000	1.11
+++ .cvsignore	27 Nov 2006 23:27:44 -0000	1.12
@@ -1 +1 @@
-smb4k-0.7.4.tar.bz2
+smb4k-0.7.5.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/smb4k.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smb4k.spec	14 Nov 2006 21:32:02 -0000	1.15
+++ smb4k.spec	27 Nov 2006 23:27:44 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.4
+Version:	0.7.5
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.7.5-1
+- Updated to version 0.7.5
+
 * Tue Nov 14 2006 Marcin Garski  0.7.4-1
 - Updated to version 0.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Nov 2006 21:32:02 -0000	1.11
+++ sources	27 Nov 2006 23:27:44 -0000	1.12
@@ -1 +1 @@
-69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2
+020d1d034e1647df90c2ab9b81b18f5a  smb4k-0.7.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 23:29:26 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 27 Nov 2006 18:29:26 -0500
Subject: rpms/smb4k/devel .cvsignore, 1.11, 1.12 smb4k.spec, 1.15,
	1.16 sources, 1.11, 1.12
Message-ID: <200611272329.kARNTQYi019023@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19002

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	14 Nov 2006 22:00:45 -0000	1.11
+++ .cvsignore	27 Nov 2006 23:28:56 -0000	1.12
@@ -1 +1 @@
-smb4k-0.7.4.tar.bz2
+smb4k-0.7.5.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smb4k.spec	14 Nov 2006 22:00:45 -0000	1.15
+++ smb4k.spec	27 Nov 2006 23:28:56 -0000	1.16
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.7.4
+Version:	0.7.5
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.7.5-1
+- Updated to version 0.7.5
+
 * Tue Nov 14 2006 Marcin Garski  0.7.4-1
 - Updated to version 0.7.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	14 Nov 2006 22:00:45 -0000	1.11
+++ sources	27 Nov 2006 23:28:56 -0000	1.12
@@ -1 +1 @@
-69a4e7dcfe9ff2539bf56d6a15fe2c79  smb4k-0.7.4.tar.bz2
+020d1d034e1647df90c2ab9b81b18f5a  smb4k-0.7.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Nov 27 23:46:21 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 18:46:21 -0500
Subject: rpms/gparted/devel gparted.spec,1.17,1.18
Message-ID: <200611272346.kARNkLjh019174@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19159

Modified Files:
	gparted.spec 
Log Message:
* Mon Nov 27 2006 Deji Akingunola  - 0.3.1-5
- Add more BRs



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gparted.spec	27 Nov 2006 23:23:15 -0000	1.17
+++ gparted.spec	27 Nov 2006 23:45:51 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
@@ -12,7 +12,7 @@
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires: desktop-file-utils
 #Temporarily
-BuildRequires: automake autoconf
+BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -84,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 27 2006 Deji Akingunola  - 0.3.1-5
+- Add more BRs
+
 * Mon Nov 27 2006 Deji Akingunola  - 0.3.1-4
 - Complete fix for parted check and apply patch on configure.in
 



From fedora-extras-commits at redhat.com  Mon Nov 27 23:52:20 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 18:52:20 -0500
Subject: extras-repoclosure rc-report.py,1.25,1.26
Message-ID: <200611272352.kARNqK8M019258@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243

Modified Files:
	rc-report.py 
Log Message:
hack: reformat and mail less often


Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rc-report.py	30 Sep 2006 19:24:11 -0000	1.25
+++ rc-report.py	27 Nov 2006 23:52:20 -0000	1.26
@@ -3,21 +3,18 @@
 
 import commands
 import datetime, time
-import os, sys
+import os, sys, stat, shutil
 import pickle
 import re
 import smtplib
 
-import sys
-sys.path.append('/srv/extras-push/work/extras-repoclosure')
 from PackageOwners import PackageOwners
+
 sys.path.append('/srv/extras-push/work/buildsys-utils/pushscript')
 import Utils, RepoSupport
-
 cfg = Utils.load_config_module('Extras')
 
 domail = True
-mailsummary = True
 combinedreport = False
 
 maxmailsize = 39*1024
@@ -108,7 +105,8 @@
         if d.days >= 2:
             return '(%s days)' % d.days
         return ''
-    
+
+
 def mail(smtp, fromaddr, toaddrs, replytoaddr, subject, body):
     from email.Header import Header
     from email.MIMEText import MIMEText
@@ -184,6 +182,7 @@
 #owners.FromCVS(workdir=ownersworkdir)
 if not owners.FromURL():
     sys.exit(1)
+reportssummary = ''
 summail = ''
 pkgbyowner = {}  # map, pkgbyowner[email], list of pkgids for all owner's broken packages
 summary = {}  # map of maps, summary[repoid][pkgid], unresolved deps line by line
@@ -207,7 +206,6 @@
 
     if not combinedreport:
         mailsubject = subject + ' ' + release + ' - ' + datestring
-        summail = ''
         pkgbyowner = {}
         summary = {}
         report = {}
@@ -255,7 +253,7 @@
             if ownedby == '':
                 ownedby = 'UNKNOWN OWNER'
                 x = 'ERROR: %s not in owners.list\nERROR: source rpm is %s' % ( name, srcrpm )
-                summail += x + '\n\n'
+                reportssummary += x + '\n\n'
             # name-EVR.arch
             pkgid = w[1]+'-'+w[3]
             pkgid2 = w[1]+' - '+w[3]
@@ -285,11 +283,18 @@
     history.Save()
 
 
-# Add list of broken packages sorted by owner to beginning of summary mail.
+# Create summary mail text.
+sep = '='*70+'\n'
+for toaddr,body in report.iteritems():
+    reportssummary += 'New report for: %s\n\n%s\n' % ( toaddr.replace('@',' AT '), body)
+    reportssummary += sep
+summail += reportssummary
+
+# Add list of broken packages sorted by owner.
 ownerlist = pkgbyowner.keys()
 ownerlist.sort()
 if len(ownerlist):
-    summail += ('Summary of broken packages (by owner):\n') + '-'*70+'\n'
+    summail += ('Summary of broken packages (by owner):\n') + '\n'
 for owner in ownerlist:
     summail += '    '+owner.replace('@',' AT ')+'\n'
     pkgs = pkgbyowner[owner]
@@ -306,19 +311,19 @@
 allrepoids = []
 for release in rs.AllReleases():
     allrepoids += rs.GenerateRepoIds(release)
-
 # Add details about broken packages, sorted by repository id.
 repoids = summary.keys()
 for repoid in allrepoids:
     if repoid not in repoids:
         continue
-    summail += ('Broken packages in %s:\n' % repoid) + '-'*70+'\n'
+    summail += sep+('Broken packages in %s:\n\n' % repoid)
     pkgs = summary[repoid].keys()
     pkgs.sort()
     for pkg in pkgs:
         for dep in summary[repoid][pkg]:
             summail += ( '    %s  requires  %s\n' % (pkg,dep) )
-    summail += '\n'
+    summail += '\n\n'
+
 
 # Mail init.
 if domail:
@@ -333,19 +338,32 @@
 
 # Send mail to every package owner with broken package dependencies.
 for toaddr,body in report.iteritems():
-    x = '='*70
-    summail += x+'\n'
-    x = 'New report for: %s\n\n%s' % ( toaddr.replace('@',' AT '), body)
-    summail += x
-
     mailtext = 'This is an automated mail created by an experimental script.\nYour following packages in the repository contain broken dependencies:\n\n'
     mailtext += body
     if domail and toaddr != 'UNKNOWN OWNER':
         mailsplit( srv, fromaddr, toaddr, replytoaddr, mailsubject, mailtext )
 
+
+# Decrease the "spam" a bit. Mail a summary (even if there are no new
+# reports) every 7 days.
+timestampfile = os.path.join(ownersworkdir,'lastsummary.timestamp')
+try:
+    timestamp = os.stat(timestampfile).st_mtime
+except OSError:
+    timestamp = 0
+    shutil.copy('/dev/null',timestampfile)
+if len(reportssummary) or (datetime.date.fromtimestamp(timestamp)+datetime.timedelta(days=7) < today):
+    shutil.copy('/dev/null',timestampfile)
+    mailsummary = True
+else:
+    mailsummary = False
+
+# Send summary to mailing-list
+# if there are new reports.
+# TODO: weekly summary?
 if domail and mailsummary and (len(summail) or mailsubject.find('development') >= 0):  # avoid sending empty reports for stable/old branches
     if not len(summail):
-        summail = 'no broken packages'
+        summail = 'no broken dependencies'
     toaddr = replytoaddr  # mail summary to list
     mailsplit( srv, fromaddr, toaddr, '', sumsubject, summail )
 



From fedora-extras-commits at redhat.com  Mon Nov 27 23:55:59 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 18:55:59 -0500
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.16,1.17
Message-ID: <200611272356.kARNtxWl019279@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19264

Modified Files:
	Config_Extras.py 
Log Message:
move repoclosure out of path


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Config_Extras.py	23 Nov 2006 20:24:03 -0000	1.16
+++ Config_Extras.py	27 Nov 2006 23:55:59 -0000	1.17
@@ -139,7 +139,7 @@
 
 #post_cmds = []
 post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
-             'nohup rc-run-all.py &'
+             'nohup /srv/rpmbuild/extras-repoclosure/rc-run-all.py &'
              ]
 
 # Build report.



From fedora-extras-commits at redhat.com  Tue Nov 28 00:01:27 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:01:27 -0500
Subject: extras-repoclosure rc-run.py,1.18,1.19
Message-ID: <200611280001.kAS01RKP022367@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22352

Modified Files:
	rc-run.py 
Log Message:
move repoclosure out of path


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rc-run.py	29 Sep 2006 21:02:10 -0000	1.18
+++ rc-run.py	28 Nov 2006 00:01:26 -0000	1.19
@@ -33,7 +33,7 @@
         # -n, --newest : yum-utils 0.5
         # -d : modified version only
         Utils.fix_mdcache_access(workdir,cachedir)
-        rc = os.system('rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
+        rc = os.system('./rc-modified -q -d %s -n -c %s %s >> %s' % (cachedir,conffile,rcargs,logfilename))
         Utils.fix_mdcache_access(workdir,cachedir)
         if rc:
             return False
@@ -89,8 +89,7 @@
         sys.exit(22)
     releases = [release]
 
-conffile = rs.GenerateConfig(rs.AllReleases(),
-                             cachedir='/srv/rpmbuild/extras-repoclosure/mdcache')
+conffile = rs.GenerateConfig(rs.AllReleases(),cachedir)
 
 goodlogs = []
 badlogs = []
@@ -113,10 +112,10 @@
     args = ''
     for (release,logfilename) in goodlogs:
         args += ('%s %s ' % (release,logfilename))
-    rc = os.system('rc-report.py %s' % args)
+    rc = os.system('./rc-report.py %s' % args)
 else:
     for (release,logfilename) in goodlogs:
-        rc = os.system('rc-report.py %s %s' % (release,logfilename))
+        rc = os.system('./rc-report.py %s %s' % (release,logfilename))
 
 fcntl.flock(f, fcntl.LOCK_UN)
 f.close()



From fedora-extras-commits at redhat.com  Tue Nov 28 00:07:19 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 19:07:19 -0500
Subject: rpms/tracker/devel tracker.spec,1.4,1.5
Message-ID: <200611280007.kAS07JcJ022436@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22421

Modified Files:
	tracker.spec 
Log Message:
Add libtool to BR



Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tracker.spec	27 Nov 2006 23:19:59 -0000	1.4
+++ tracker.spec	28 Nov 2006 00:06:49 -0000	1.5
@@ -18,7 +18,7 @@
 BuildRequires: dbus-devel, dbus-glib
 %endif
 #Temporarily
-BuildRequires: automake autoconf
+BuildRequires: automake autoconf libtool
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
@@ -110,6 +110,7 @@
 %changelog
 * Mon Nov 27 2006 Deji Akingunola  - 0.5.2-2
 - Apply patch on Makefile.am instead of Makefile.in
+- Add libtool to BR
 
 * Mon Nov 06 2006 Deji Akingunola  - 0.5.2-1
 - Update to 0.5.2



From fedora-extras-commits at redhat.com  Tue Nov 28 00:07:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:07:46 -0500
Subject: extras-repoclosure rc-run.py,1.19,1.20
Message-ID: <200611280007.kAS07kfl022490@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22475

Modified Files:
	rc-run.py 
Log Message:
move repoclosure out of path


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rc-run.py	28 Nov 2006 00:01:26 -0000	1.19
+++ rc-run.py	28 Nov 2006 00:07:46 -0000	1.20
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 # -*- mode: Python; indent-tabs-mode: nil; -*-
 
+# Fedora Extras repoclosure
 # If executed as "rc-run-all.py" it processes all releases.
 
 import fcntl, os, sys
@@ -11,12 +12,8 @@
 workdir = '/srv/rpmbuild/extras-repoclosure'
 cachedir = '/srv/rpmbuild/extras-repoclosure/mdcache'
 
-import sys
-sys.path.append('/srv/extras-push/work/extras-repoclosure')
-from RepoSupport import RepoSupport
-
 sys.path.append('/srv/extras-push/work/buildsys-utils/pushscript')
-import Utils
+import Utils, RepoSupport
 
 
 def makereport():
@@ -27,8 +24,8 @@
     for arch in rs.ReleaseArchsDict()[release]:
         print '%s (%s)' % (release,arch)
         rcargs = ('-a %s ' % rs.targetarchs[arch])
-        for r in rs.ReleaseRepoDict()[release]:
-            repoid = '%s-%s-%s' % (r,release,arch)
+        for r in rs.ReleaseRepoList(release):
+            repoid = rs.RepoId(r,release,arch)
             rcargs += ('-r %s ' % repoid)
         # -n, --newest : yum-utils 0.5
         # -d : modified version only
@@ -71,7 +68,7 @@
     print 'ERROR: %s: %s' % (strerr,lockfilename)
     sys.exit(11)
 
-rs = RepoSupport()
+rs = RepoSupport.RepoSupport(cfg)
 releases = []
 combinedreport = False
 
@@ -117,6 +114,7 @@
     for (release,logfilename) in goodlogs:
         rc = os.system('./rc-report.py %s %s' % (release,logfilename))
 
+os.remove(conffile)
 fcntl.flock(f, fcntl.LOCK_UN)
 f.close()
 os.chdir(cwd)



From fedora-extras-commits at redhat.com  Tue Nov 28 00:08:22 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:08:22 -0500
Subject: extras-buildsys/utils rc-run.py,1.2,NONE
Message-ID: <200611280008.kAS08MxA022518@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22505

Removed Files:
	rc-run.py 
Log Message:
move repoclosure out of path


--- rc-run.py DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 00:09:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 27 Nov 2006 19:09:26 -0500
Subject: rpms/tracker/devel tracker.spec,1.5,1.6
Message-ID: <200611280009.kAS09Q18022555@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/tracker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22528

Modified Files:
	tracker.spec 
Log Message:
Bump



Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/devel/tracker.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tracker.spec	28 Nov 2006 00:06:49 -0000	1.5
+++ tracker.spec	28 Nov 2006 00:08:56 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
 Version: 0.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/



From fedora-extras-commits at redhat.com  Tue Nov 28 00:11:38 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:11:38 -0500
Subject: extras-repoclosure rc-run.py,1.20,1.21
Message-ID: <200611280011.kAS0BcpU022614@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22601

Modified Files:
	rc-run.py 
Log Message:
this is the right work dir


Index: rc-run.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-run.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rc-run.py	28 Nov 2006 00:07:46 -0000	1.20
+++ rc-run.py	28 Nov 2006 00:11:37 -0000	1.21
@@ -9,8 +9,8 @@
 import datetime, time
 import tempfile
 
-workdir = '/srv/rpmbuild/extras-repoclosure'
-cachedir = '/srv/rpmbuild/extras-repoclosure/mdcache'
+workdir = '/srv/extras-push/work/extras-repoclosure'
+cachedir = '/srv/extras-push/work/extras-repoclosure/mdcache'
 
 sys.path.append('/srv/extras-push/work/buildsys-utils/pushscript')
 import Utils, RepoSupport



From fedora-extras-commits at redhat.com  Tue Nov 28 00:15:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:15:12 -0500
Subject: extras-buildsys/utils/pushscript Config_Extras.py,1.17,1.18
Message-ID: <200611280015.kAS0FCgR022652@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22637

Modified Files:
	Config_Extras.py 
Log Message:
this is the right work dir


Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Config_Extras.py	27 Nov 2006 23:55:59 -0000	1.17
+++ Config_Extras.py	28 Nov 2006 00:15:12 -0000	1.18
@@ -139,7 +139,7 @@
 
 #post_cmds = []
 post_cmds = ['upgradecheck.py -c %s' % os.path.expanduser('~/work/upgradecheck/upgradecheck-core+extras.conf'),
-             'nohup /srv/rpmbuild/extras-repoclosure/rc-run-all.py &'
+             'nohup /srv/extras-push/work/extras-repoclosure/rc-run-all.py &'
              ]
 
 # Build report.



From fedora-extras-commits at redhat.com  Tue Nov 28 00:19:02 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 27 Nov 2006 19:19:02 -0500
Subject: extras-buildsys/utils/pushscript README,1.8,1.9
Message-ID: <200611280019.kAS0J2jL022699@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22684

Modified Files:
	README 
Log Message:
move repoclosure out of path


Index: README
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- README	9 Nov 2006 10:33:47 -0000	1.8
+++ README	28 Nov 2006 00:19:01 -0000	1.9
@@ -21,11 +21,6 @@
   extras-push          -> pushscript/extras-push
   extras-sync          -> pushscript/extras-sync
 
-  rc-modified          -> extras-repoclosure/rc-modified
-  rc-report.py         -> extras-repoclosure/rc-report.py
-  rc-run.py            -> extras-buildsys/utils/rc-run.py
-  rc-run-all.py        -> rc-run.py
-
   upgradecheck.py
 
 Optional:



From fedora-extras-commits at redhat.com  Tue Nov 28 03:19:54 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 27 Nov 2006 22:19:54 -0500
Subject: rpms/ssmtp/devel ssmtp-defaultvalues.patch, NONE, 1.1 ssmtp.spec,
	1.1, 1.2
Message-ID: <200611280319.kAS3Js1C032663@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32615

Modified Files:
	ssmtp.spec 
Added Files:
	ssmtp-defaultvalues.patch 
Log Message:


ssmtp-defaultvalues.patch:

--- NEW FILE ssmtp-defaultvalues.patch ---
--- ssmtp-2.61/ssmtp.conf~	2006-11-26 11:44:21.000000000 +0200
+++ ssmtp-2.61/ssmtp.conf	2006-11-26 11:46:39.000000000 +0200
@@ -1,6 +1,9 @@
 #
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #
+# See the ssmtp.conf(5) man page for a more verbose explanation of the
+# available options.
+#
 
 # The person who gets all mail for userids < 500
 # Make this empty to disable rewriting.
@@ -19,10 +22,10 @@
 # mailhub=mail.your.domain:465
 
 # Where will the mail seem to come from?
-rewriteDomain=
+#RewriteDomain=
 
 # The full hostname
-hostname=_HOSTNAME_
+#Hostname=
 
 # Set this to never rewrite the "From:" line (unless not given) and to
 # use that address in the "from line" of the envelope.


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp.spec	12 Nov 2006 23:11:51 -0000	1.1
+++ ssmtp.spec	28 Nov 2006 03:19:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPL
@@ -9,6 +9,7 @@
 #Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
 Patch0:		%{name}-%{version}.6.patch
 Patch1:		%{name}-2.50.3-maxsysuid.patch
+Patch2:		%{name}-defaultvalues.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
@@ -30,6 +31,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -103,6 +105,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 lonely wolf  2.61-9
+- included Ville Skytta's patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
+
 * Mon Oct 10 2006 lonely wolf  2.61-8
 - enabled IPv6 (just added this option to %%configure, the capability was already there)
 - removed yet another man page from %%Provides



From fedora-extras-commits at redhat.com  Tue Nov 28 03:37:19 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 27 Nov 2006 22:37:19 -0500
Subject: rpms/ssmtp/devel ssmtp.spec,1.2,1.3
Message-ID: <200611280337.kAS3bJTm000386@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv367

Modified Files:
	ssmtp.spec 
Log Message:
includes patch for Bugzilla Bug 217270


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ssmtp.spec	28 Nov 2006 03:19:23 -0000	1.2
+++ ssmtp.spec	28 Nov 2006 03:36:49 -0000	1.3
@@ -106,7 +106,7 @@
 
 %changelog
 * Tue Nov 28 2006 lonely wolf  2.61-9
-- included Ville Skytta's patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
+- included Ville Skytt??'s patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
 
 * Mon Oct 10 2006 lonely wolf  2.61-8
 - enabled IPv6 (just added this option to %%configure, the capability was already there)



From fedora-extras-commits at redhat.com  Tue Nov 28 03:45:10 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Mon, 27 Nov 2006 22:45:10 -0500
Subject: rpms/ssmtp/devel ssmtp.spec,1.3,1.4
Message-ID: <200611280345.kAS3jAJK000474@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458

Modified Files:
	ssmtp.spec 
Log Message:
typo fix


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ssmtp.spec	28 Nov 2006 03:36:49 -0000	1.3
+++ ssmtp.spec	28 Nov 2006 03:44:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPL
@@ -105,6 +105,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 lonely wolf  2.61-10
+- fix silly typo in changelog
+
 * Tue Nov 28 2006 lonely wolf  2.61-9
 - included Ville Skytt??'s patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 04:35:19 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:35:19 -0500
Subject: rpms/openvrml/FC-6 openvrml.spec,1.1,1.2
Message-ID: <200611280435.kAS4ZJMZ003902@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868/FC-6

Modified Files:
	openvrml.spec 
Log Message:
Removed -fvisibility=hidden from CXXFLAGS.  Mozilla development headers are not wise to gcc symbol visibility mojo and as a result NPAPI entry points wound up not visible.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/openvrml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvrml.spec	21 Nov 2006 14:53:10 -0000	1.1
+++ openvrml.spec	28 Nov 2006 04:34:49 -0000	1.2
@@ -83,7 +83,7 @@
 %patch -p1
 
 %build
-%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -150,6 +150,11 @@
 
 
 %changelog
+* Mon Nov 27 2006  Braden McDaniel   - 0.16.1-5
+- openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
+  development headers are not wise to gcc symbol visibility mojo and as
+  a result NPAPI entry points wound up not visible.
+
 * Wed Nov 15 2006  Braden McDaniel   - 0.16.1-4
 - Patch openvrml-gtkplug.info.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 04:35:20 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:35:20 -0500
Subject: rpms/openvrml/devel openvrml.spec,1.1,1.2
Message-ID: <200611280435.kAS4ZKam003905@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868/devel

Modified Files:
	openvrml.spec 
Log Message:
Removed -fvisibility=hidden from CXXFLAGS.  Mozilla development headers are not wise to gcc symbol visibility mojo and as a result NPAPI entry points wound up not visible.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvrml.spec	21 Nov 2006 14:53:10 -0000	1.1
+++ openvrml.spec	28 Nov 2006 04:34:50 -0000	1.2
@@ -83,7 +83,7 @@
 %patch -p1
 
 %build
-%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+%configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG"
 %{__make} %{?_smp_mflags}
 
 %install
@@ -150,6 +150,11 @@
 
 
 %changelog
+* Mon Nov 27 2006  Braden McDaniel   - 0.16.1-5
+- openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
+  development headers are not wise to gcc symbol visibility mojo and as
+  a result NPAPI entry points wound up not visible.
+
 * Wed Nov 15 2006  Braden McDaniel   - 0.16.1-4
 - Patch openvrml-gtkplug.info.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 04:39:16 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:39:16 -0500
Subject: rpms/openvrml/FC-6 openvrml.spec,1.2,1.3
Message-ID: <200611280439.kAS4dGuE003975@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3945/FC-6

Modified Files:
	openvrml.spec 
Log Message:
Incremented release number.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/openvrml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openvrml.spec	28 Nov 2006 04:34:49 -0000	1.2
+++ openvrml.spec	28 Nov 2006 04:38:46 -0000	1.3
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.16.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPL
 Group:          System Environment/Libraries



From fedora-extras-commits at redhat.com  Tue Nov 28 04:39:16 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:39:16 -0500
Subject: rpms/openvrml/devel openvrml.spec,1.2,1.3
Message-ID: <200611280439.kAS4dGqN003978@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3945/devel

Modified Files:
	openvrml.spec 
Log Message:
Incremented release number.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openvrml.spec	28 Nov 2006 04:34:50 -0000	1.2
+++ openvrml.spec	28 Nov 2006 04:38:46 -0000	1.3
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.16.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPL
 Group:          System Environment/Libraries



From fedora-extras-commits at redhat.com  Tue Nov 28 04:44:09 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Mon, 27 Nov 2006 23:44:09 -0500
Subject: rpms/openvrml/devel openvrml.spec,1.3,1.4
Message-ID: <200611280444.kAS4i9ZF004049@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4034

Modified Files:
	openvrml.spec 
Log Message:
Require firefox 2.0.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openvrml.spec	28 Nov 2006 04:38:46 -0000	1.3
+++ openvrml.spec	28 Nov 2006 04:43:39 -0000	1.4
@@ -19,7 +19,7 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  gtk2-devel
-Requires:       firefox = 1.5.0.8
+Requires:       firefox = 2.0
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -36,7 +36,7 @@
 Requires:       libjpeg-devel
 Requires:       fontconfig-devel
 Requires:       freetype-devel
-Requires:       firefox-devel = 1.5.0.8
+Requires:       firefox-devel = 2.0
 %description devel
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
@@ -154,6 +154,8 @@
 - openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
   development headers are not wise to gcc symbol visibility mojo and as
   a result NPAPI entry points wound up not visible.
+- openvrml: Require firefox 2.0.
+- openvrml-devel: Require firefox-devel 2.0.
 
 * Wed Nov 15 2006  Braden McDaniel   - 0.16.1-4
 - Patch openvrml-gtkplug.info.



From fedora-extras-commits at redhat.com  Tue Nov 28 05:25:55 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 28 Nov 2006 00:25:55 -0500
Subject: rpms/xfce4-session/devel xfce4-session.spec,1.13,1.14
Message-ID: <200611280525.kAS5PtnQ007330@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7315

Modified Files:
	xfce4-session.spec 
Log Message:
Add dbus-devel and GConf2-devel to BuildRequires, fixes bug #217082



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/devel/xfce4-session.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-session.spec	11 Nov 2006 07:50:49 -0000	1.13
+++ xfce4-session.spec	28 Nov 2006 05:25:25 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.3.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-session-4.3.99.2.tar.bz2
@@ -19,6 +19,7 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
+BuildRequires: dbus-devel GConf2-devel
 Requires: fortune-mod
 
 %description
@@ -44,7 +45,7 @@
 %setup -q
 
 %build
-%configure
+%configure --enable-gnome --enable-final
 
 make %{?_smp_mflags}
 
@@ -113,6 +114,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Mon Nov 27 2006 Kevin Fenzi  - 4.3.99.2-2
+- Add dbus-devel and GConf2-devel to BuildRequires, fixes bug #217082
+
 * Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
 - Update to 4.3.99.2
 



From fedora-extras-commits at redhat.com  Tue Nov 28 05:45:34 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Tue, 28 Nov 2006 00:45:34 -0500
Subject: rpms/xfce4-session/FC-6 xfce4-session.spec,1.13,1.14
Message-ID: <200611280545.kAS5jYWl007450@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/xfce4-session/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7435

Modified Files:
	xfce4-session.spec 
Log Message:
Add dbus-devel and GConf2-devel to BuildRequires, fixes bug #217082



Index: xfce4-session.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-session/FC-6/xfce4-session.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-session.spec	11 Nov 2006 19:35:04 -0000	1.13
+++ xfce4-session.spec	28 Nov 2006 05:45:04 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.3.99.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-session-4.3.99.2.tar.bz2
@@ -19,6 +19,7 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
+BuildRequires: dbus-devel GConf2-devel
 Requires: fortune-mod
 
 %description
@@ -44,7 +45,7 @@
 %setup -q
 
 %build
-%configure
+%configure --enable-gnome --enable-final
 
 make %{?_smp_mflags}
 
@@ -113,6 +114,9 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Mon Nov 27 2006 Kevin Fenzi  - 4.3.99.2-2
+- Add dbus-devel and GConf2-devel to BuildRequires, fixes bug #217082
+
 * Fri Nov 10 2006 Kevin Fenzi  - 4.3.99.2-1
 - Update to 4.3.99.2
 



From fedora-extras-commits at redhat.com  Tue Nov 28 05:50:28 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Tue, 28 Nov 2006 00:50:28 -0500
Subject: rpms/zope/FC-5 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 zope.spec,
	1.24, 1.25
Message-ID: <200611280550.kAS5oSvv007602@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7545

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
updated to 2.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Aug 2006 11:41:40 -0000	1.13
+++ .cvsignore	28 Nov 2006 05:49:58 -0000	1.14
@@ -1 +1 @@
-Zope-2.9.4-final.tgz
+Zope-2.9.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Aug 2006 11:41:40 -0000	1.13
+++ sources	28 Nov 2006 05:49:58 -0000	1.14
@@ -1 +1 @@
-7d7ffe62eabc84d0c438e450e344c29f  Zope-2.9.4-final.tgz
+17cd06a6974dbdd0e4982a343b79fb00  Zope-2.9.5-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-5/zope.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- zope.spec	30 Aug 2006 11:58:35 -0000	1.24
+++ zope.spec	28 Nov 2006 05:49:58 -0000	1.25
@@ -12,13 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.4
-Release: 2%{?dist}
+Version: 2.9.5
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,7 +27,6 @@
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
-Patch1:  zope-2.8.3-pythonwarning.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -46,18 +44,12 @@
 After starting Zope, you can access it by pointing your browser to
 http://localhost:8080
 
-WARNING: this zope package has been built on python 2.4.X, which is not
-supported ! Do not file bugreports or ask for support on zope.org if you
-choose to use this package.
-
 
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
-# Warning on the default index_html about python 2.4 & zope 2.8
-#%patch1 -p1 -b .pythonwarning
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -120,6 +112,9 @@
 # included in %%doc
 rm -rf $RPM_BUILD_ROOT%{zope_home}/doc
 
+#now included with plone 2.5.1 version 1.3.7
+rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+
 # write version.txt
 echo "Zope %{version}-%{release}" > \
     "$RPM_BUILD_ROOT%{software_home}/version.txt"
@@ -187,6 +182,11 @@
 
 
 %changelog
+* Mon Nov 27 2006 Jonathan Steffan  2.9.5-1
+- Updated to 2.9.5
+- Removed Five from zope package (plone 2.5.1 now provides the needed
+  version.)
+
 * Wed Aug 30 2006 Aurelien Bompard  2.9.4-2
 - fix path on x86_64
 



From fedora-extras-commits at redhat.com  Tue Nov 28 06:08:52 2006
From: fedora-extras-commits at redhat.com (Jonathan Steffan (jsteffan))
Date: Tue, 28 Nov 2006 01:08:52 -0500
Subject: rpms/plone/FC-5 plone.spec, 1.20, 1.21 Plone-2.5-atxmlperms.patch,
	1.1, NONE
Message-ID: <200611280608.kAS68qR4010796@cvs-int.fedora.redhat.com>

Author: jsteffan

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10777

Modified Files:
	plone.spec 
Removed Files:
	Plone-2.5-atxmlperms.patch 
Log Message:
Updated so plone now provides Five



Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plone.spec	4 Nov 2006 09:14:18 -0000	1.20
+++ plone.spec	28 Nov 2006 06:08:22 -0000	1.21
@@ -6,15 +6,13 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
-#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 Source10:       http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz
-#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,18 +43,13 @@
 cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
 #rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
 
-# Included in Zope 2.9
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+# Plone now provides Five
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
 
 # Avoid conflicts, put those in %%doc
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
-# Fixed version of PasswordResetTool
-#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,6 +66,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Jonathan Steffan  2.5.1-4
+- Updated so plone now provides the correct version of the Five product
+
 * Sat Nov 04 2006 Aurelien Bompard  2.5.1-3
 - add Plone Hotfix 20061031 (bug 213983)
 


--- Plone-2.5-atxmlperms.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 06:57:27 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 28 Nov 2006 01:57:27 -0500
Subject: rpms/mail-notification/devel .cvsignore, 1.7,
	1.8 mail-notification.spec, 1.33, 1.34 sources, 1.7,
	1.8 mail-notification-README.FEDORA, 1.1,
	NONE mail-notification-mail-reader-launch.patch, 1.1, NONE
Message-ID: <200611280657.kAS6vRvE011078@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11059

Modified Files:
	.cvsignore mail-notification.spec sources 
Removed Files:
	mail-notification-README.FEDORA 
	mail-notification-mail-reader-launch.patch 
Log Message:
4.0-0.1.rc1 -- Update to 4.0rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/.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	28 Nov 2006 06:56:57 -0000	1.8
@@ -1 +1 @@
-mail-notification-3.0.tar.gz
+mail-notification-4.0-rc1.tar.gz


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mail-notification.spec	21 Nov 2006 19:15:24 -0000	1.33
+++ mail-notification.spec	28 Nov 2006 06:56:57 -0000	1.34
@@ -1,17 +1,13 @@
-# FIXME -- remove evo 2.10 workaround
-
 Name:           mail-notification
-Version:        3.0
-Release:        11%{?dist}
+Version:        4.0
+Release:        0.1%{?dist}.rc1
 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://savannah.nongnu.org/download/mailnotify/mail-notification-4.0-rc1.tar.gz
 Patch0:         mail-notification-fedora-plugin-hint.patch
-Patch1:         mail-notification-mail-reader-launch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -29,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
@@ -56,12 +53,8 @@
 Evolution support for Mail Notification.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-rc1
 %patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
-cp %{SOURCE1} ./README.FEDORA
-# FIXME -- quick workaround for now
-sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
 
 %build
 %configure --disable-schemas-install  --enable-evolution
@@ -101,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
@@ -111,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
@@ -125,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,-)
@@ -135,6 +131,11 @@
 
 
 %changelog
+* 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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/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	28 Nov 2006 06:56:57 -0000	1.8
@@ -1 +1 @@
-d19fb5c96a0f54d1b1541fbddf73488e  mail-notification-3.0.tar.gz
+91c09b72a59d161564b47fff033be37e  mail-notification-4.0-rc1.tar.gz


--- mail-notification-README.FEDORA DELETED ---


--- mail-notification-mail-reader-launch.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 08:28:32 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Tue, 28 Nov 2006 03:28:32 -0500
Subject: owners owners.list,1.2024,1.2025
Message-ID: <200611280828.kAS8SWqc017509@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17491

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2024
retrieving revision 1.2025
diff -u -r1.2024 -r1.2025
--- owners.list	27 Nov 2006 22:28:53 -0000	1.2024
+++ owners.list	28 Nov 2006 08:28:01 -0000	1.2025
@@ -1986,7 +1986,7 @@
 Fedora Extras|python-logilab-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-lxml|ElementTree-like Python bindings for libxml2 and libxslt|shahms at shahms.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|jspaleta at gmail.com|
 Fedora Extras|python-mechanize|Stateful programmatic web browsing|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-musicbrainz2|Library which provides access to the MusicBrainz Database|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-mutagen|Python module to handle audio metadata|mr.ecik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 08:59:27 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Tue, 28 Nov 2006 03:59:27 -0500
Subject: rpms/k3d/devel k3d.spec,1.10,1.11
Message-ID: <200611280859.kAS8xRFD017676@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17655

Modified Files:
	k3d.spec 
Log Message:
release tag fixed


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- k3d.spec	23 Nov 2006 09:39:00 -0000	1.10
+++ k3d.spec	28 Nov 2006 08:58:57 -0000	1.11
@@ -152,10 +152,10 @@
 
 
 %changelog
-* Thu Nov 23 2006 Denis Leroy  - 0.6.4.0
+* Thu Nov 23 2006 Denis Leroy  - 0.6.4.0-1
 - Update to 0.6.4.0
 
-* Tue Oct 10 2006 Denis Leroy  - 0.6.3.1
+* Tue Oct 10 2006 Denis Leroy  - 0.6.3.1-1
 - Update to 0.6.3.1
 
 * Mon Oct  9 2006 Denis Leroy  - 0.6.3.0-1



From fedora-extras-commits at redhat.com  Tue Nov 28 10:48:24 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 28 Nov 2006 05:48:24 -0500
Subject: rpms/gtkwave/devel gtkwave.spec, 1.28, 1.29 sources, 1.26,
	1.27 .cvsignore, 1.26, 1.27
Message-ID: <200611281048.kASAmOrC024865@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24846

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 3.0.17


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gtkwave.spec	14 Nov 2006 10:28:13 -0000	1.28
+++ gtkwave.spec	28 Nov 2006 10:47:54 -0000	1.29
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.16
+Version:		3.0.17
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 28 2006 Paul Howarth  3.0.17-1
+- update to 3.0.17
+
 * Tue Nov 14 2006 Paul Howarth  3.0.16-1
 - update to 3.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Nov 2006 10:28:13 -0000	1.26
+++ sources	28 Nov 2006 10:47:54 -0000	1.27
@@ -1 +1 @@
-d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz
+78b65baccb8ecdc7d1e1dcb2b32a161d  gtkwave-3.0.17.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2006 10:28:13 -0000	1.26
+++ .cvsignore	28 Nov 2006 10:47:54 -0000	1.27
@@ -1 +1 @@
-gtkwave-3.0.16.tar.gz
+gtkwave-3.0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 11:18:15 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 28 Nov 2006 06:18:15 -0500
Subject: rpms/gtkwave/FC-6 gtkwave.spec, 1.28, 1.29 sources, 1.26,
	1.27 .cvsignore, 1.26, 1.27
Message-ID: <200611281118.kASBIFjZ028038@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28019

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 3.0.17


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/gtkwave.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gtkwave.spec	14 Nov 2006 11:59:18 -0000	1.28
+++ gtkwave.spec	28 Nov 2006 11:17:45 -0000	1.29
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.16
+Version:		3.0.17
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 28 2006 Paul Howarth  3.0.17-1
+- update to 3.0.17
+
 * Tue Nov 14 2006 Paul Howarth  3.0.16-1
 - update to 3.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Nov 2006 11:59:18 -0000	1.26
+++ sources	28 Nov 2006 11:17:45 -0000	1.27
@@ -1 +1 @@
-d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz
+78b65baccb8ecdc7d1e1dcb2b32a161d  gtkwave-3.0.17.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-6/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2006 11:59:17 -0000	1.26
+++ .cvsignore	28 Nov 2006 11:17:45 -0000	1.27
@@ -1 +1 @@
-gtkwave-3.0.16.tar.gz
+gtkwave-3.0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 11:20:13 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 28 Nov 2006 06:20:13 -0500
Subject: rpms/gtkwave/FC-5 gtkwave.spec, 1.26, 1.27 sources, 1.26,
	1.27 .cvsignore, 1.26, 1.27
Message-ID: <200611281120.kASBKD6h028107@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28088

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 3.0.17


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/gtkwave.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtkwave.spec	14 Nov 2006 12:00:31 -0000	1.26
+++ gtkwave.spec	28 Nov 2006 11:19:43 -0000	1.27
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.16
+Version:		3.0.17
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 28 2006 Paul Howarth  3.0.17-1
+- update to 3.0.17
+
 * Tue Nov 14 2006 Paul Howarth  3.0.16-1
 - update to 3.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Nov 2006 12:00:31 -0000	1.26
+++ sources	28 Nov 2006 11:19:43 -0000	1.27
@@ -1 +1 @@
-d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz
+78b65baccb8ecdc7d1e1dcb2b32a161d  gtkwave-3.0.17.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2006 12:00:31 -0000	1.26
+++ .cvsignore	28 Nov 2006 11:19:43 -0000	1.27
@@ -1 +1 @@
-gtkwave-3.0.16.tar.gz
+gtkwave-3.0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 11:22:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 28 Nov 2006 06:22:10 -0500
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.25, 1.26 sources, 1.26,
	1.27 .cvsignore, 1.26, 1.27
Message-ID: <200611281122.kASBMAg1028173@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28154

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 3.0.17


Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtkwave.spec	14 Nov 2006 12:01:56 -0000	1.25
+++ gtkwave.spec	28 Nov 2006 11:21:40 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		3.0.16
+Version:		3.0.17
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -89,6 +89,9 @@
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Tue Nov 28 2006 Paul Howarth  3.0.17-1
+- update to 3.0.17
+
 * Tue Nov 14 2006 Paul Howarth  3.0.16-1
 - update to 3.0.16
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Nov 2006 12:01:56 -0000	1.26
+++ sources	28 Nov 2006 11:21:40 -0000	1.27
@@ -1 +1 @@
-d64023fd737d83af15391df627675120  gtkwave-3.0.16.tar.gz
+78b65baccb8ecdc7d1e1dcb2b32a161d  gtkwave-3.0.17.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2006 12:01:56 -0000	1.26
+++ .cvsignore	28 Nov 2006 11:21:40 -0000	1.27
@@ -1 +1 @@
-gtkwave-3.0.16.tar.gz
+gtkwave-3.0.17.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 11:32:06 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 28 Nov 2006 06:32:06 -0500
Subject: rpms/allegro/devel allegro.spec, 1.37,
	1.38 allegro-4.2.0-64bit.patch, 
	1.1, NONE allegro-4.2.0-alsa-big-endian.patch, 1.1,
	NONE allegro-4.2.0-digmid.patch, 1.1,
	NONE allegro-4.2.0-fullscreen.patch, 1.1,
	NONE allegro-4.2.0-fullscreen2.patch, 1.1,
	NONE allegro-4.2.0-mprotect.patch, 1.2,
	NONE allegro-4.2.0-nicevsync.patch, 1.1,
	NONE allegro-4.2.0-no-execheap.patch, 1.1, NONE
Message-ID: <200611281132.kASBW60e028303@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28288

Modified Files:
	allegro.spec 
Removed Files:
	allegro-4.2.0-64bit.patch allegro-4.2.0-alsa-big-endian.patch 
	allegro-4.2.0-digmid.patch allegro-4.2.0-fullscreen.patch 
	allegro-4.2.0-fullscreen2.patch allegro-4.2.0-mprotect.patch 
	allegro-4.2.0-nicevsync.patch allegro-4.2.0-no-execheap.patch 
Log Message:
update to 4.2.1


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- allegro.spec	15 Oct 2006 17:13:04 -0000	1.37
+++ allegro.spec	28 Nov 2006 11:31:36 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           allegro
-Version:        4.2.0
-Release:        18%{?dist}
+Version:        4.2.1
+Release:        1%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -15,15 +15,6 @@
 Patch1:         allegro-4.0.3-libdir.patch
 Patch2:         allegro-4.0.3-cfg.patch
 Patch3:         allegro-4.2.0-nostrip.patch
-Patch4:         allegro-4.2.0-digmid.patch
-Patch5:         allegro-4.2.0-alsa-big-endian.patch
-Patch6:         allegro-4.2.0-64bit.patch
-Patch7:         allegro-4.2.0-fullscreen2.patch
-Patch8:         allegro-4.2.0-mprotect.patch
-Patch9:         allegro-4.2.0-no-execheap.patch
-Patch10:        allegro-4.2.0-nicevsync.patch
-Patch11:        allegro-4.2.0-noexecstack.patch
-Patch12:        allegro-4.2.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -131,15 +122,6 @@
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
-%patch4 -p1 -z .digmid
-%patch5 -p1 -z .alsa-big-endian
-%patch6 -p1 -z .64bit
-%patch7 -p1 -z .fullscreen
-%patch8 -p1 -z .mprotect
-%patch9 -p1 -z .execheap
-%patch10 -p1 -z .nicevsync
-%patch11 -p1 -z .noexecstack
-%patch12 -p1 -z .multilib
 
 
 %build
@@ -155,8 +137,6 @@
 %else
 make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/kde/artsc"
 %endif
-MKDATA_PRELOAD=../../lib/unix/liballeg-%{version}.so \
-  DAT=../../tools/dat sh misc/mkdata.sh
 
 
 %install
@@ -230,6 +210,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Jindrich Novy  4.2.1-1
+- update to 4.2.1
+
 * Sun Oct 15 2006 Hans de Goede  4.2.0-18
 - Multilib devel goodness (make allegro-devel i386 and x86_64 parallel
   installable)


--- allegro-4.2.0-64bit.patch DELETED ---


--- allegro-4.2.0-alsa-big-endian.patch DELETED ---


--- allegro-4.2.0-digmid.patch DELETED ---


--- allegro-4.2.0-fullscreen.patch DELETED ---


--- allegro-4.2.0-fullscreen2.patch DELETED ---


--- allegro-4.2.0-mprotect.patch DELETED ---


--- allegro-4.2.0-nicevsync.patch DELETED ---


--- allegro-4.2.0-no-execheap.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 12:03:35 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Tue, 28 Nov 2006 07:03:35 -0500
Subject: rpms/allegro/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200611281203.kASC3Zwc031506@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31487

Modified Files:
	.cvsignore sources 
Log Message:
new source tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Nov 2005 20:53:44 -0000	1.3
+++ .cvsignore	28 Nov 2006 12:03:05 -0000	1.4
@@ -1 +1,2 @@
 allegro-4.2.0.tar.gz
+allegro-4.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Nov 2005 20:53:44 -0000	1.3
+++ sources	28 Nov 2006 12:03:05 -0000	1.4
@@ -1 +1 @@
-a8b2c85c58b16345fe735f72763f3a6e  allegro-4.2.0.tar.gz
+0a09d0144ee8652fb8fa00f6cbb324fe  allegro-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 13:01:57 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 08:01:57 -0500
Subject: owners owners.list,1.2025,1.2026
Message-ID: <200611281301.kASD1vBY002391@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2372

Modified Files:
	owners.list 
Log Message:
Unorphan wbxml2.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2025
retrieving revision 1.2026
diff -u -r1.2025 -r1.2026
--- owners.list	28 Nov 2006 08:28:01 -0000	1.2025
+++ owners.list	28 Nov 2006 13:01:27 -0000	1.2026
@@ -2426,7 +2426,7 @@
 Fedora Extras|wallpapoz|Gnome Multi Backgrounds and Wallpapers Configuration Tool|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|wavbreaker|wave file splitter|dmaley at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wavpack|A completely open audiocodec|lemenkov at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|
 Fedora Extras|wcstools|Software utilities to display and manipulate the WCS of a FITS image|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|wfmath|WorldForge client math library|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 13:10:06 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 08:10:06 -0500
Subject: rpms/wbxml2/devel .cvsignore, 1.3, 1.4 Makefile, 1.3, 1.4 sources,
	1.3, 1.4 wbxml2-0.9.2-autoreconf.patch, NONE,
	1.1 wbxml2-0.9.2-cflags.patch, NONE,
	1.1 wbxml2-0.9.2-no-doc.patch, NONE, 1.1 wbxml2.spec, 1.8, 1.9
Message-ID: <200611281310.kASDA68n002466@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2434

Added Files:
	.cvsignore Makefile sources wbxml2-0.9.2-autoreconf.patch 
	wbxml2-0.9.2-cflags.patch wbxml2-0.9.2-no-doc.patch 
	wbxml2.spec 
Log Message:
unorphan wbxml2, review request #217180


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	28 Nov 2006 13:09:36 -0000	1.4
@@ -0,0 +1 @@
+wbxml2-0.9.2.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	28 Nov 2006 13:09:36 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wbxml2
+# $Id$
+NAME := wbxml2
+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)


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	28 Nov 2006 13:09:36 -0000	1.4
@@ -0,0 +1 @@
+67a48fd9b69db8818a4dca5375c7993a  wbxml2-0.9.2.tar.gz

wbxml2-0.9.2-autoreconf.patch:

--- NEW FILE wbxml2-0.9.2-autoreconf.patch ---
diff -N -r -u wbxml2-0.9.2-orig/aclocal.m4 wbxml2-0.9.2/aclocal.m4
--- wbxml2-0.9.2-orig/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ wbxml2-0.9.2/aclocal.m4	2006-11-24 18:35:59.000000000 +0100
@@ -0,0 +1,7256 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 48 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
[...93844 lines suppressed...]
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# 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.
+.NOEXPORT:

wbxml2-0.9.2-cflags.patch:

--- NEW FILE wbxml2-0.9.2-cflags.patch ---
--- wbxml2-0.9.2/tools/Makefile.am.cflags	2006-11-24 17:51:58.000000000 +0100
+++ wbxml2-0.9.2/tools/Makefile.am	2006-11-24 17:52:09.000000000 +0100
@@ -3,7 +3,7 @@
 INCLUDES =\
 	 -I. -I../src -I/usr/include
 
-CFLAGS =\
+AM_CFLAGS =\
 	 -DHAVE_CONFIG_H\
 	 -DHAVE_EXPAT\
 	 -D_REENTRANT\
--- wbxml2-0.9.2/src/Makefile.am.cflags	2006-11-24 17:51:51.000000000 +0100
+++ wbxml2-0.9.2/src/Makefile.am	2006-11-24 17:52:12.000000000 +0100
@@ -3,7 +3,7 @@
 INCLUDES =\
 	 -I. -I/usr/include
 
-CFLAGS =\
+AM_CFLAGS =\
 	 -DHAVE_CONFIG_H\
 	 -DHAVE_EXPAT\
 	 -D_REENTRANT\

wbxml2-0.9.2-no-doc.patch:

--- NEW FILE wbxml2-0.9.2-no-doc.patch ---
--- wbxml2-0.9.2/Makefile.am.no-doc	2006-07-11 13:47:43.000000000 +0200
+++ wbxml2-0.9.2/Makefile.am	2006-11-24 17:35:47.000000000 +0100
@@ -8,26 +8,6 @@
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = libwbxml2.pc
 
-wbxmldocdir = ${prefix}/share/doc/wbxml2-${VERSION}
-wbxmldoc_DATA = \
-	AUTHORS\
-	bootstrap\
-	BUGS\
-	ChangeLog\
-	COPYING\
-	GNU-LGPL\
-	INSTALL\
-	NEWS\
-	README\
-	References\
-	THANKS\
-	TODO\
-	doxygen.h
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
-	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
-
 dist-bz2: distdir
 	sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
 	mv $(distdir)/wbxml2.spec.aux $(distdir)/wbxml2.spec


Index: wbxml2.spec
===================================================================
RCS file: wbxml2.spec
diff -N wbxml2.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wbxml2.spec	28 Nov 2006 13:09:36 -0000	1.9
@@ -0,0 +1,114 @@
+Name:           wbxml2
+Version:        0.9.2
+Release:        4%{?dist}
+Summary:        WBXML parser and compiler library
+
+Group:          System Environment/Libraries
+License:        LGPL
+URL:            http://libwbxml.aymerick.com:8080/
+Source0:        http://dl.sourceforge.net/wbxmllib/%{name}-%{version}.tar.gz
+
+# Do not install doc files
+Patch0:         wbxml2-0.9.2-no-doc.patch
+# Fix CFLAGS
+Patch1:         wbxml2-0.9.2-cflags.patch
+# libtool, automake and autoconf stuffs, done by autoreconf
+Patch2:         wbxml2-0.9.2-autoreconf.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  expat-devel zlib-devel popt 
+BuildRequires:  recode
+
+%description
+The WBXML Library (libwbxml) contains a library and its associated tools to
+parse, encode and handle WBXML documents. The WBXML format is a binary
+representation of XML, defined by the Wap Forum, and used to reduce
+bandwidth in mobile communications.
+
+%package devel
+Group:         Development/Libraries
+Summary:       Development files of WBXML
+Requires:      %{name} = %{version}-%{release}
+%description devel
+%{summary}.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+chmod a+x configure
+
+# Recode to UTF-8 several doc files
+for file in ChangeLog README NEWS References; do
+  recode l1..utf8 $file
+done
+
+# no line terminator, add one
+echo >> THANKS
+
+%build
+%configure --disable-rpath --disable-static
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS BUGS ChangeLog COPYING GNU-LGPL NEWS README References THANKS TODO
+%{_bindir}/wbxml2xml
+%{_bindir}/xml2wbxml
+%{_libdir}/libwbxml2.so.0*
+%exclude %{_libdir}/libwbxml2.la
+
+%files devel
+%defattr(-,root,root,-)
+%doc AUTHORS BUGS ChangeLog COPYING GNU-LGPL NEWS README References THANKS TODO
+%{_includedir}/wbxml*.h
+%{_libdir}/libwbxml2.so
+%{_libdir}/pkgconfig/libwbxml2.pc
+
+
+
+
+%changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
+- Added BR: popt zlib-devel
+- Improved changelog.
+
+* Fri Nov 24 2006 Laurent Rineau  - 0.9.2-3
+- Recode some %%doc files.
+
+* Fri Nov 24 2006 Laurent Rineau  - 0.9.2-1
+- New upstream release 0.9.2.
+- Unorphaned for FE-6 and rawhide. New maintainer. Review request #217180
+- New spec file.
+- Header are know in %%{_includedir} instead of %%{_includedir}/wbxml2
+- New licence.
+
+* Sun May 22 2005 Jeremy Katz  - 0.9.0-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
+* Wed Jun 30 2004 Michael Schwendt  0:0.9.0-0.fdr.2
+- Set group, own include dir, fix devel description,
+  make %%doc files chmod -x.
+
+* Wed Jun 30 2004 Panu Matilainen  0:0.9.0-0.fdr.1
+- Initial RPM release.



From fedora-extras-commits at redhat.com  Tue Nov 28 13:43:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 08:43:47 -0500
Subject: rpms/exiv2/devel .cvsignore, 1.4, 1.5 exiv2.spec, 1.7, 1.8 sources, 
	1.4, 1.5 exiv2-0.11-pkgconfig.patch, 1.2, NONE
Message-ID: <200611281343.kASDhl1R002690@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/exiv2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2671

Modified Files:
	.cvsignore exiv2.spec sources 
Removed Files:
	exiv2-0.11-pkgconfig.patch 
Log Message:
* Tue Nov 28 2006 Rex Dieter  0.12-1
- exiv2-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2006 19:06:40 -0000	1.4
+++ .cvsignore	28 Nov 2006 13:43:17 -0000	1.5
@@ -1,2 +1,3 @@
 exiv2-0.10.tar.gz
 exiv2-0.11.tar.gz
+exiv2-0.12.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/exiv2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- exiv2.spec	4 Oct 2006 19:19:25 -0000	1.7
+++ exiv2.spec	28 Nov 2006 13:43:17 -0000	1.8
@@ -1,8 +1,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.11
-Release: 3%{?dist} 
+Version: 0.12
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -14,8 +14,6 @@
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
-# http://dev.robotbattle.com/bugs/view.php?id=489
-Patch3: exiv2-0.11-pkgconfig.patch
 
 
 %description
@@ -48,7 +46,6 @@
 
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .deps
-%patch3 -p1 -b .pkgconfig
 
 
 %build
@@ -97,6 +94,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  0.12-1
+- exiv2-0.12
+
 * Wed Oct 04 2006 Rex Dieter  0.11-3
 - respin
 
@@ -104,7 +104,7 @@
 - BR: zlib-devel
 
 * Tue Sep 19 2006 Rex Dieter  0.11-1
-- 0.11
+- exiv2-0.11
 
 * Tue Aug 29 2006 Rex Dieter  0.10-2
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exiv2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2006 19:06:40 -0000	1.4
+++ sources	28 Nov 2006 13:43:17 -0000	1.5
@@ -1 +1 @@
-269ce822946c56549d086f0c08dffc79  exiv2-0.11.tar.gz
+a97a4e489df7ec99458e3e33b506c3e6  exiv2-0.12.tar.gz


--- exiv2-0.11-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 13:57:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 08:57:31 -0500
Subject: rpms/kphotoalbum/devel .cvsignore,1.2,1.3 kphotoalbum.spec,1.6,1.7
Message-ID: <200611281357.kASDvV2X002772@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kphotoalbum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2755

Modified Files:
	.cvsignore kphotoalbum.spec 
Log Message:
* Tue Nov 28 2006 Rex Dieter  2.2-7
- BR: exiv2-devel >= 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:45:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 13:57:01 -0000	1.3
@@ -1 +1,2 @@
+clog
 kphotoalbum-2.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kphotoalbum.spec	4 Oct 2006 19:23:38 -0000	1.6
+++ kphotoalbum.spec	28 Nov 2006 13:57:01 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -13,14 +13,13 @@
 Obsoletes: kimdaba < %{version}
 #Provides:  kimdaba = %{version}
 
-BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libkipi-devel 
 BuildRequires: qt-devel
 BuildRequires: kdelibs-devel
 # versioning isn't strictly required, just need to be sure we're 
 # building against the latest exiv2 -- Rex
-BuildRequires: exiv2-devel >= 0.11
+BuildRequires: exiv2-devel >= 0.12
 
 ## Optional, not strictly required.
 #Requires(hint): kipi-plugins
@@ -56,11 +55,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category "X-Fedora" --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -109,6 +103,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  2.2-7
+- BR: exiv2-devel >= 0.12
+
 * Wed Oct 04 2006 Rex Dieter  2.2-6
 - respin
 - drop deprecated Provides: kimdaba



From fedora-extras-commits at redhat.com  Tue Nov 28 15:05:05 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 10:05:05 -0500
Subject: rpms/wbxml2/devel dead.package,1.1,NONE
Message-ID: <200611281505.kASF556R009702@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9697

Removed Files:
	dead.package 
Log Message:
well, wbxml2 is no longer a dead package.


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 15:10:40 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 10:10:40 -0500
Subject: rpms/wbxml2/FC-5 wbxml2-0.9.2-autoreconf.patch, NONE,
	1.1 wbxml2-0.9.2-cflags.patch, NONE,
	1.1 wbxml2-0.9.2-no-doc.patch, NONE, 1.1 sources, 1.2,
	1.3 wbxml2.spec, 1.7, 1.8 wbxml2-0.9.0-am_cflags.patch, 1.1, NONE
Message-ID: <200611281510.kASFAeAk009778@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9752

Modified Files:
	sources wbxml2.spec 
Added Files:
	wbxml2-0.9.2-autoreconf.patch wbxml2-0.9.2-cflags.patch 
	wbxml2-0.9.2-no-doc.patch 
Removed Files:
	wbxml2-0.9.0-am_cflags.patch 
Log Message:
wbxml2 is unorphan. Update the FC-5 branch too. Tag/build will follow.

wbxml2-0.9.2-autoreconf.patch:

--- NEW FILE wbxml2-0.9.2-autoreconf.patch ---
diff -N -r -u wbxml2-0.9.2-orig/aclocal.m4 wbxml2-0.9.2/aclocal.m4
--- wbxml2-0.9.2-orig/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ wbxml2-0.9.2/aclocal.m4	2006-11-24 18:35:59.000000000 +0100
@@ -0,0 +1,7256 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 48 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
[...93844 lines suppressed...]
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
+
+# 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.
+.NOEXPORT:

wbxml2-0.9.2-cflags.patch:

--- NEW FILE wbxml2-0.9.2-cflags.patch ---
--- wbxml2-0.9.2/tools/Makefile.am.cflags	2006-11-24 17:51:58.000000000 +0100
+++ wbxml2-0.9.2/tools/Makefile.am	2006-11-24 17:52:09.000000000 +0100
@@ -3,7 +3,7 @@
 INCLUDES =\
 	 -I. -I../src -I/usr/include
 
-CFLAGS =\
+AM_CFLAGS =\
 	 -DHAVE_CONFIG_H\
 	 -DHAVE_EXPAT\
 	 -D_REENTRANT\
--- wbxml2-0.9.2/src/Makefile.am.cflags	2006-11-24 17:51:51.000000000 +0100
+++ wbxml2-0.9.2/src/Makefile.am	2006-11-24 17:52:12.000000000 +0100
@@ -3,7 +3,7 @@
 INCLUDES =\
 	 -I. -I/usr/include
 
-CFLAGS =\
+AM_CFLAGS =\
 	 -DHAVE_CONFIG_H\
 	 -DHAVE_EXPAT\
 	 -D_REENTRANT\

wbxml2-0.9.2-no-doc.patch:

--- NEW FILE wbxml2-0.9.2-no-doc.patch ---
--- wbxml2-0.9.2/Makefile.am.no-doc	2006-07-11 13:47:43.000000000 +0200
+++ wbxml2-0.9.2/Makefile.am	2006-11-24 17:35:47.000000000 +0100
@@ -8,26 +8,6 @@
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = libwbxml2.pc
 
-wbxmldocdir = ${prefix}/share/doc/wbxml2-${VERSION}
-wbxmldoc_DATA = \
-	AUTHORS\
-	bootstrap\
-	BUGS\
-	ChangeLog\
-	COPYING\
-	GNU-LGPL\
-	INSTALL\
-	NEWS\
-	README\
-	References\
-	THANKS\
-	TODO\
-	doxygen.h
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
-	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
-
 dist-bz2: distdir
 	sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
 	mv $(distdir)/wbxml2.spec.aux $(distdir)/wbxml2.spec


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:31:34 -0000	1.2
+++ sources	28 Nov 2006 15:10:10 -0000	1.3
@@ -1 +1 @@
-3f9b5bf104ec523b8eebe69f93919ded  wbxml2-0.9.0-src.tar.gz
+67a48fd9b69db8818a4dca5375c7993a  wbxml2-0.9.2.tar.gz


Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-5/wbxml2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wbxml2.spec	4 Mar 2006 13:26:54 -0000	1.7
+++ wbxml2.spec	28 Nov 2006 15:10:10 -0000	1.8
@@ -1,60 +1,55 @@
 Name:           wbxml2
-Version:        0.9.0
-Release: 4
-
-Summary:        Library and tools to parse, encode and handle WBXML documents
+Version:        0.9.2
+Release:        4%{?dist}
+Summary:        WBXML parser and compiler library
 
 Group:          System Environment/Libraries
-License:        GPL
-URL:            http://libwbxml.aymerick.com/
-Source0:        http://dl.sf.net/sourceforge/wbxmllib/wbxml2-0.9.0-src.tar.gz
-Patch0:         wbxml2-0.9.0-am_cflags.patch
+License:        LGPL
+URL:            http://libwbxml.aymerick.com:8080/
+Source0:        http://dl.sourceforge.net/wbxmllib/%{name}-%{version}.tar.gz
+
+# Do not install doc files
+Patch0:         wbxml2-0.9.2-no-doc.patch
+# Fix CFLAGS
+Patch1:         wbxml2-0.9.2-cflags.patch
+# libtool, automake and autoconf stuffs, done by autoreconf
+Patch2:         wbxml2-0.9.2-autoreconf.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  popt, expat-devel, zlib-devel
-BuildRequires:  libtool, automake, autoconf
+BuildRequires:  expat-devel zlib-devel popt 
+BuildRequires:  recode
 
 %description
-The WBXML Library (aka libwbxml) contains a library and its associated tools
-to Parse, Encode and Handle WBXML documents.
-
-The WBXML format is a binary representation of XML, defined by the Wap Forum,
-and used to reduce bandwidth in mobile communications.
-
-
-
-%package        devel
-Summary:        %{summary}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-This package contains the libraries, include files and documentation
-to develop WBXML applications.
-
-The WBXML format is a binary representation of XML, defined by the Wap Forum,
-and used to reduce bandwidth in mobile communications.
-
+The WBXML Library (libwbxml) contains a library and its associated tools to
+parse, encode and handle WBXML documents. The WBXML format is a binary
+representation of XML, defined by the Wap Forum, and used to reduce
+bandwidth in mobile communications.
+
+%package devel
+Group:         Development/Libraries
+Summary:       Development files of WBXML
+Requires:      %{name} = %{version}-%{release}
+%description devel
+%{summary}.
 
 %prep
-cat<> THANKS
 
 %build
-libtoolize
-aclocal
-autoheader
-automake --add-missing
-autoconf
-%configure --includedir=%{_includedir}/%{name}
+%configure --disable-rpath --disable-static
 make %{?_smp_mflags}
 
 
@@ -62,8 +57,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,22 +69,37 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_libdir}/*.so.*
-%defattr(0644,root,root,0755)
-%doc AUTHORS THANKS COPYING ChangeLog NEWS README TODO GNU-GPL References BUGS
+%doc AUTHORS BUGS ChangeLog COPYING GNU-LGPL NEWS README References THANKS TODO
+%{_bindir}/wbxml2xml
+%{_bindir}/xml2wbxml
+%{_libdir}/libwbxml2.so.0*
+%exclude %{_libdir}/libwbxml2.la
 
 %files devel
 %defattr(-,root,root,-)
-# the README says this documentation is obsolete since 0.7.2 so not included
-#%doc doc/*
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/wbxml*.h
-%{_libdir}/*.a
-%{_libdir}/*.so
+%doc AUTHORS BUGS ChangeLog COPYING GNU-LGPL NEWS README References THANKS TODO
+%{_includedir}/wbxml*.h
+%{_libdir}/libwbxml2.so
+%{_libdir}/pkgconfig/libwbxml2.pc
+
+
 
 
 %changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
+- Added BR: popt zlib-devel
+- Improved changelog.
+
+* Fri Nov 24 2006 Laurent Rineau  - 0.9.2-3
+- Recode some %%doc files.
+
+* Fri Nov 24 2006 Laurent Rineau  - 0.9.2-1
+- New upstream release 0.9.2.
+- Unorphaned for FE-6 and rawhide. New maintainer. Review request #217180
+- New spec file.
+- Header are know in %%{_includedir} instead of %%{_includedir}/wbxml2
+- New licence.
+
 * Sun May 22 2005 Jeremy Katz  - 0.9.0-4
 - rebuild on all arches
 


--- wbxml2-0.9.0-am_cflags.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 15:12:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:12:59 -0500
Subject: rpms/kaffeine/FC-6 .cvsignore, 1.2, 1.3 kaffeine.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611281512.kASFCx1r009851@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9830

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Sun Nov 26 2006 Rex Dieter  0.8.3-1
- 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:12:29 -0000	1.3
@@ -1 +1,2 @@
 kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/kaffeine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kaffeine.spec	14 Nov 2006 04:11:06 -0000	1.1
+++ kaffeine.spec	28 Nov 2006 15:12:29 -0000	1.2
@@ -11,33 +11,29 @@
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?dist}
 
+%if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
-
 %define  _with_lame --with-lame
 Requires: kaffeine = %{version}
 Patch1: kaffeine-0.8.2-codecs.patch
 # split occurred here
 Conflicts: kaffeine < 0.8.2-2
-
 %else
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %endif
 
-Version: 0.8.2
-Release: 5%{?dist}
-
 License: GPL
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
@@ -108,7 +104,7 @@
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
@@ -128,11 +124,6 @@
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --vendor="" \
-  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} 
@@ -205,6 +196,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Rex Dieter  0.8.3-1
+- 0.8.3
+
 * Sat Nov 04 2006 Rex Dieter  0.8.2-6
 - %%doc README
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2006 04:11:06 -0000	1.2
+++ sources	28 Nov 2006 15:12:29 -0000	1.3
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:21:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:21:04 -0500
Subject: rpms/kaffeine/FC-5 .cvsignore, 1.2, 1.3 kaffeine.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611281521.kASFL4o0009998@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9979

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Sun Nov 26 2006 Rex Dieter  0.8.3-1
- 0.8.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2006 04:11:06 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:20:34 -0000	1.3
@@ -1 +1,2 @@
 kaffeine-0.8.2.tar.bz2
+kaffeine-0.8.3.tar.bz2


Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-5/kaffeine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kaffeine.spec	14 Nov 2006 04:11:06 -0000	1.1
+++ kaffeine.spec	28 Nov 2006 15:20:34 -0000	1.2
@@ -11,33 +11,29 @@
 ## define to build nonfree bits (for that other repo)
 #define nonfree 1
 
-%if "%{?nonfree:1}" == "1"
+Version: 0.8.3
+Release: 1%{?dist}
 
+%if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
-
 %define  _with_lame --with-lame
 Requires: kaffeine = %{version}
 Patch1: kaffeine-0.8.2-codecs.patch
 # split occurred here
 Conflicts: kaffeine < 0.8.2-2
-
 %else
 # Fedora Review: http://bugzilla.redhat.com/213432
 Name:    kaffeine
 %endif
 
-Version: 0.8.2
-Release: 5%{?dist}
-
 License: GPL
 Summary: Xine-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
-Source:  http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Source: http://dl.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
@@ -108,7 +104,7 @@
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final \
+  --disable-dependency-tracking --disable-final \
   %{?_without_dvb} \
   %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \
   %{?_with_lame} %{!?_with_lame:--without-lame}
@@ -128,11 +124,6 @@
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --vendor="" \
-  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} 
@@ -205,6 +196,9 @@
 
 
 %changelog
+* Sun Nov 26 2006 Rex Dieter  0.8.3-1
+- 0.8.3
+
 * Sat Nov 04 2006 Rex Dieter  0.8.2-6
 - %%doc README
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2006 04:11:06 -0000	1.2
+++ sources	28 Nov 2006 15:20:34 -0000	1.3
@@ -1 +1 @@
-bfb57b62fa72267cc5b01ce9b037cb41  kaffeine-0.8.2.tar.bz2
+667dd56cf02f1343b3a466a685afdf24  kaffeine-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:34:13 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:34:13 -0500
Subject: rpms/libtcd/devel .cvsignore, 1.2, 1.3 libtcd.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200611281534.kASFYD6K010214@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10184

Modified Files:
	.cvsignore libtcd.spec sources 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
- 2.2-r2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:34:50 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:33:43 -0000	1.3
@@ -1 +1 @@
-libtcd-2.2.tar.bz2
+libtcd-2.2-r2.tar.bz2


Index: libtcd.spec
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/libtcd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtcd.spec	26 Nov 2006 13:34:50 -0000	1.1
+++ libtcd.spec	28 Nov 2006 15:33:43 -0000	1.2
@@ -1,12 +1,15 @@
+%define		src_ver		2.2-r2
+%define		dir_ver		2.2
+
 Name:		libtcd
-Version:	2.2
+Version:	2.2.0.2
 Release:	1%{?dist}
 Summary:	Tide Constituent Database Library
 
 Group:		System Environment/Libraries
 License:	Public Domain
 URL:		http://www.flaterco.com/xtide/
-Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{src_ver}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,7 +28,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dir_ver}
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
+- 2.2-r2.
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 2.2-1
 - Formal 2.2 release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtcd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:34:50 -0000	1.2
+++ sources	28 Nov 2006 15:33:43 -0000	1.3
@@ -1 +1 @@
-d6cfa1b0d808d5772c9b2798b8a90df0  libtcd-2.2.tar.bz2
+f2381e7dc9ddbe4319bfde3c72e7ba6a  libtcd-2.2-r2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:35:25 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:35:25 -0500
Subject: rpms/tideEditor/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 tideEditor.spec, 1.1, 1.2
Message-ID: <200611281535.kASFZPlf010310@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/tideEditor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10261

Modified Files:
	.cvsignore sources tideEditor.spec 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 1.3.12.0.2-1
- 1.3.12-r2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Nov 2006 12:19:51 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:34:55 -0000	1.3
@@ -1 +1 @@
-tideEditor-1.3.12.tar.bz2
+tideEditor-1.3.12-r2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Nov 2006 12:19:51 -0000	1.2
+++ sources	28 Nov 2006 15:34:55 -0000	1.3
@@ -1 +1 @@
-f833a2b7ccd4721c719642845ec2da47  tideEditor-1.3.12.tar.bz2
+2f3681d4bf52427e8dbebe0408b2fa9d  tideEditor-1.3.12-r2.tar.bz2


Index: tideEditor.spec
===================================================================
RCS file: /cvs/extras/rpms/tideEditor/devel/tideEditor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tideEditor.spec	27 Nov 2006 12:19:51 -0000	1.1
+++ tideEditor.spec	28 Nov 2006 15:34:55 -0000	1.2
@@ -1,12 +1,15 @@
+%define		src_ver		1.3.12-r2
+%define		dir_ver		1.3.12
+
 Name:		tideEditor
-Version:	1.3.12
-Release:	3%{?dist}
+Version:	1.3.12.0.2
+Release:	1%{?dist}
 Summary:	Editor for Tide Constituent Database (TCD) files
 
 Group:		Applications/Engineering
 License:	GPL
 URL:		http://www.flaterco.com/xtide/
-Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{src_ver}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel
@@ -19,7 +22,7 @@
 Flater and Jan Depner.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dir_ver}
 
 %build
 %configure
@@ -38,6 +41,9 @@
 %{_bindir}/tideEditor
 
 %changelog
+* Tue Nov 28 2006 Mamoru Tasaka  - 1.3.12.0.2-1
+- 1.3.12-r2.
+
 * Mon Nov 27 2006 Mamoru Tasaka  - 1.3.12-3
 - Remove unneeded BR
 



From fedora-extras-commits at redhat.com  Tue Nov 28 15:35:39 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:35:39 -0500
Subject: rpms/libtcd/FC-6 .cvsignore, 1.2, 1.3 libtcd.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200611281535.kASFZdMw010324@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10286

Modified Files:
	.cvsignore libtcd.spec sources 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
- 2.2-r2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:34:50 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:35:09 -0000	1.3
@@ -1 +1 @@
-libtcd-2.2.tar.bz2
+libtcd-2.2-r2.tar.bz2


Index: libtcd.spec
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-6/libtcd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtcd.spec	26 Nov 2006 13:34:50 -0000	1.1
+++ libtcd.spec	28 Nov 2006 15:35:09 -0000	1.2
@@ -1,12 +1,15 @@
+%define		src_ver		2.2-r2
+%define		dir_ver		2.2
+
 Name:		libtcd
-Version:	2.2
+Version:	2.2.0.2
 Release:	1%{?dist}
 Summary:	Tide Constituent Database Library
 
 Group:		System Environment/Libraries
 License:	Public Domain
 URL:		http://www.flaterco.com/xtide/
-Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{src_ver}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,7 +28,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dir_ver}
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
+- 2.2-r2.
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 2.2-1
 - Formal 2.2 release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:34:50 -0000	1.2
+++ sources	28 Nov 2006 15:35:09 -0000	1.3
@@ -1 +1 @@
-d6cfa1b0d808d5772c9b2798b8a90df0  libtcd-2.2.tar.bz2
+f2381e7dc9ddbe4319bfde3c72e7ba6a  libtcd-2.2-r2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:37:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:37:41 -0500
Subject: rpms/libtcd/FC-5 .cvsignore, 1.2, 1.3 libtcd.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200611281537.kASFbfCN010394@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/libtcd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10364

Modified Files:
	.cvsignore libtcd.spec sources 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
- 2.2-r2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 13:34:50 -0000	1.2
+++ .cvsignore	28 Nov 2006 15:37:11 -0000	1.3
@@ -1 +1 @@
-libtcd-2.2.tar.bz2
+libtcd-2.2-r2.tar.bz2


Index: libtcd.spec
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-5/libtcd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtcd.spec	26 Nov 2006 13:34:50 -0000	1.1
+++ libtcd.spec	28 Nov 2006 15:37:11 -0000	1.2
@@ -1,12 +1,15 @@
+%define		src_ver		2.2-r2
+%define		dir_ver		2.2
+
 Name:		libtcd
-Version:	2.2
+Version:	2.2.0.2
 Release:	1%{?dist}
 Summary:	Tide Constituent Database Library
 
 Group:		System Environment/Libraries
 License:	Public Domain
 URL:		http://www.flaterco.com/xtide/
-Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.flaterco.com/xtide/%{name}-%{src_ver}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,7 +28,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{dir_ver}
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Mamoru Tasaka  - 2.2.0.2-1
+- 2.2-r2.
+
 * Thu Nov 23 2006 Mamoru Tasaka  - 2.2-1
 - Formal 2.2 release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtcd/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 13:34:50 -0000	1.2
+++ sources	28 Nov 2006 15:37:11 -0000	1.3
@@ -1 +1 @@
-d6cfa1b0d808d5772c9b2798b8a90df0  libtcd-2.2.tar.bz2
+f2381e7dc9ddbe4319bfde3c72e7ba6a  libtcd-2.2-r2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 15:38:38 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 10:38:38 -0500
Subject: rpms/jd/devel .cvsignore, 1.26, 1.27 jd.spec, 1.33, 1.34 sources,
	1.26, 1.27
Message-ID: <200611281538.kASFcc7R010441@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10415

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Tue Nov 28 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061128
- cvs 061128 (24:15 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	27 Nov 2006 15:20:52 -0000	1.26
+++ .cvsignore	28 Nov 2006 15:38:07 -0000	1.27
@@ -1 +1 @@
-jd-1.8.1-cvs061127.tgz
+jd-1.8.1-cvs061128.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jd.spec	27 Nov 2006 15:20:52 -0000	1.33
+++ jd.spec	28 Nov 2006 15:38:07 -0000	1.34
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061127
+%define         strtag        cvs061128
 %define         repoid        22722
 
 
@@ -65,6 +65,9 @@
 %build
 sh autogen.sh
 
+# set TZ for __TIME__
+export TZ='Asia/Tokyo'
+
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -103,8 +106,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Nov 27 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061127
-- cvs 061127 (23:59 JST)
+* Tue Nov 28 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061128
+- cvs 061128 (24:15 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Nov 2006 15:20:52 -0000	1.26
+++ sources	28 Nov 2006 15:38:07 -0000	1.27
@@ -1 +1 @@
-9804dd8951bc1bbf9dc0be8d89b19f60  jd-1.8.1-cvs061127.tgz
+bd4e2e11e608980dcd35d28ef8ab4e1f  jd-1.8.1-cvs061128.tgz



From fedora-extras-commits at redhat.com  Tue Nov 28 15:40:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:40:26 -0500
Subject: rpms/exiv2/FC-6 .cvsignore, 1.4, 1.5 exiv2.spec, 1.7, 1.8 sources,
	1.4, 1.5 exiv2-0.11-pkgconfig.patch, 1.2, NONE
Message-ID: <200611281540.kASFeQx7010518@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/exiv2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10459

Modified Files:
	.cvsignore exiv2.spec sources 
Removed Files:
	exiv2-0.11-pkgconfig.patch 
Log Message:
* Tue Nov 28 2006 Rex Dieter  0.12-1
- exiv2-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2006 19:06:40 -0000	1.4
+++ .cvsignore	28 Nov 2006 15:39:56 -0000	1.5
@@ -1,2 +1,3 @@
 exiv2-0.10.tar.gz
 exiv2-0.11.tar.gz
+exiv2-0.12.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-6/exiv2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- exiv2.spec	4 Oct 2006 19:19:25 -0000	1.7
+++ exiv2.spec	28 Nov 2006 15:39:56 -0000	1.8
@@ -1,8 +1,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.11
-Release: 3%{?dist} 
+Version: 0.12
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -14,8 +14,6 @@
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
-# http://dev.robotbattle.com/bugs/view.php?id=489
-Patch3: exiv2-0.11-pkgconfig.patch
 
 
 %description
@@ -48,7 +46,6 @@
 
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .deps
-%patch3 -p1 -b .pkgconfig
 
 
 %build
@@ -97,6 +94,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  0.12-1
+- exiv2-0.12
+
 * Wed Oct 04 2006 Rex Dieter  0.11-3
 - respin
 
@@ -104,7 +104,7 @@
 - BR: zlib-devel
 
 * Tue Sep 19 2006 Rex Dieter  0.11-1
-- 0.11
+- exiv2-0.11
 
 * Tue Aug 29 2006 Rex Dieter  0.10-2
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2006 19:06:40 -0000	1.4
+++ sources	28 Nov 2006 15:39:56 -0000	1.5
@@ -1 +1 @@
-269ce822946c56549d086f0c08dffc79  exiv2-0.11.tar.gz
+a97a4e489df7ec99458e3e33b506c3e6  exiv2-0.12.tar.gz


--- exiv2-0.11-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 15:41:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:41:26 -0500
Subject: rpms/exiv2/FC-5 .cvsignore, 1.4, 1.5 exiv2.spec, 1.4, 1.5 sources,
	1.4, 1.5 exiv2-0.11-pkgconfig.patch, 1.1, NONE
Message-ID: <200611281541.kASFfQTq010771@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/exiv2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10638

Modified Files:
	.cvsignore exiv2.spec sources 
Removed Files:
	exiv2-0.11-pkgconfig.patch 
Log Message:
* Tue Nov 28 2006 Rex Dieter  0.12-1
- exiv2-0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Sep 2006 19:29:50 -0000	1.4
+++ .cvsignore	28 Nov 2006 15:40:55 -0000	1.5
@@ -1,2 +1,3 @@
 exiv2-0.10.tar.gz
 exiv2-0.11.tar.gz
+exiv2-0.12.tar.gz


Index: exiv2.spec
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-5/exiv2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- exiv2.spec	19 Sep 2006 19:29:50 -0000	1.4
+++ exiv2.spec	28 Nov 2006 15:40:55 -0000	1.5
@@ -1,8 +1,8 @@
 
 Summary: Exif and Iptc metadata manipulation library
 Name:	 exiv2
-Version: 0.11
-Release: 2%{?dist} 
+Version: 0.12
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -14,7 +14,6 @@
 
 Patch1: exiv2-0.11-no_rpath.patch
 Patch2: exiv2-0.9.1-deps.patch
-Patch3: exiv2-0.11-pkgconfig.patch
 
 
 %description
@@ -47,7 +46,6 @@
 
 %patch1 -p1 -b .no_rpath
 %patch2 -p1 -b .deps
-%patch3 -p1 -b .pkgconfig
 
 
 %build
@@ -96,11 +94,17 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  0.12-1
+- exiv2-0.12
+
+* Wed Oct 04 2006 Rex Dieter  0.11-3
+- respin
+
 * Tue Sep 19 2006 Rex Dieter  0.11-2
 - BR: zlib-devel
 
 * Tue Sep 19 2006 Rex Dieter  0.11-1
-- 0.11
+- exiv2-0.11
 
 * Tue Aug 29 2006 Rex Dieter  0.10-2
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exiv2/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Sep 2006 19:29:50 -0000	1.4
+++ sources	28 Nov 2006 15:40:55 -0000	1.5
@@ -1 +1 @@
-269ce822946c56549d086f0c08dffc79  exiv2-0.11.tar.gz
+a97a4e489df7ec99458e3e33b506c3e6  exiv2-0.12.tar.gz


--- exiv2-0.11-pkgconfig.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Nov 28 15:43:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 10:43:33 -0500
Subject: rpms/kile/devel kile.spec,1.31,1.32
Message-ID: <200611281543.kASFhXkC010805@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10790

Modified Files:
	kile.spec 
Log Message:
* Tue Nov 28 2006 Rex Dieter  1.9.3-2
- drop desktop-file-utils usage



Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kile.spec	25 Nov 2006 15:55:07 -0000	1.31
+++ kile.spec	28 Nov 2006 15:43:03 -0000	1.32
@@ -2,7 +2,7 @@
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
 Version: 1.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -11,7 +11,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
@@ -63,11 +62,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --add-category="X-Fedora" --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-  
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -120,6 +114,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  1.9.3-2
+- drop desktop-file-utils usage
+
 * Sat Nov 25 2006 Rex Dieter  1.9.3-1
 - kile-1.9.3, CVE-2006-6085 (#217238)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 16:02:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 11:02:11 -0500
Subject: rpms/kphotoalbum/FC-6 .cvsignore,1.2,1.3 kphotoalbum.spec,1.6,1.7
Message-ID: <200611281602.kASG2Bt7013928@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kphotoalbum/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13911

Modified Files:
	.cvsignore kphotoalbum.spec 
Log Message:
* Tue Nov 28 2006 Rex Dieter  2.2-7
- BR: exiv2-devel >= 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:45:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 16:01:40 -0000	1.3
@@ -1 +1,2 @@
+clog
 kphotoalbum-2.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/FC-6/kphotoalbum.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kphotoalbum.spec	4 Oct 2006 19:23:38 -0000	1.6
+++ kphotoalbum.spec	28 Nov 2006 16:01:40 -0000	1.7
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -13,14 +13,13 @@
 Obsoletes: kimdaba < %{version}
 #Provides:  kimdaba = %{version}
 
-BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libkipi-devel 
 BuildRequires: qt-devel
 BuildRequires: kdelibs-devel
 # versioning isn't strictly required, just need to be sure we're 
 # building against the latest exiv2 -- Rex
-BuildRequires: exiv2-devel >= 0.11
+BuildRequires: exiv2-devel >= 0.12
 
 ## Optional, not strictly required.
 #Requires(hint): kipi-plugins
@@ -56,11 +55,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category "X-Fedora" --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -109,6 +103,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  2.2-7
+- BR: exiv2-devel >= 0.12
+
 * Wed Oct 04 2006 Rex Dieter  2.2-6
 - respin
 - drop deprecated Provides: kimdaba



From fedora-extras-commits at redhat.com  Tue Nov 28 16:11:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 11:11:43 -0500
Subject: rpms/kphotoalbum/FC-5 .cvsignore,1.2,1.3 kphotoalbum.spec,1.4,1.5
Message-ID: <200611281611.kASGBhVt014008@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kphotoalbum/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13991

Modified Files:
	.cvsignore kphotoalbum.spec 
Log Message:
* Tue Nov 28 2006 Rex Dieter  2.2-7
- BR: exiv2-devel >= 0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2006 19:45:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 16:11:13 -0000	1.3
@@ -1 +1,2 @@
+clog
 kphotoalbum-2.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/extras/rpms/kphotoalbum/FC-5/kphotoalbum.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kphotoalbum.spec	19 Sep 2006 19:40:40 -0000	1.4
+++ kphotoalbum.spec	28 Nov 2006 16:11:13 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 2.2
-Release: 5%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group:   Applications/Multimedia 
@@ -11,16 +11,15 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kimdaba < %{version}
-Provides:  kimdaba = %{version}
+#Provides:  kimdaba = %{version}
 
-BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libkipi-devel 
 BuildRequires: qt-devel
 BuildRequires: kdelibs-devel
 # versioning isn't strictly required, just need to be sure we're 
 # building against the latest exiv2 -- Rex
-BuildRequires: exiv2-devel >= 0.11
+BuildRequires: exiv2-devel >= 0.12
 
 ## Optional, not strictly required.
 #Requires(hint): kipi-plugins
@@ -56,11 +55,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  --add-category "X-Fedora" --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} || touch %{name}.lang
@@ -109,6 +103,13 @@
 
 
 %changelog
+* Tue Nov 28 2006 Rex Dieter  2.2-7
+- BR: exiv2-devel >= 0.12
+
+* Wed Oct 04 2006 Rex Dieter  2.2-6
+- respin
+- drop deprecated Provides: kimdaba
+
 * Tue Sep 19 2006 Rex Dieter  2.2-5
 - BR: exiv2-devel >= 0.11
 



From fedora-extras-commits at redhat.com  Tue Nov 28 16:56:17 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 11:56:17 -0500
Subject: rpms/libassuan/FC-6 .cvsignore, 1.8, 1.9 libassuan.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <200611281656.kASGuHNV014299@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libassuan/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14279

Modified Files:
	.cvsignore libassuan.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  - 1.0.1-1
- libassuan-1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Nov 2006 03:05:29 -0000	1.8
+++ .cvsignore	28 Nov 2006 16:55:47 -0000	1.9
@@ -1,4 +1,4 @@
 libassuan-0.6.10.tar.gz
 libassuan-0.6.10.tar.gz.sig
-libassuan-1.0.0.tar.bz2
-libassuan-1.0.0.tar.bz2.sig
+libassuan-1.0.1.tar.bz2.sig
+libassuan-1.0.1.tar.bz2


Index: libassuan.spec
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/libassuan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libassuan.spec	14 Nov 2006 03:05:29 -0000	1.21
+++ libassuan.spec	28 Nov 2006 16:55:47 -0000	1.22
@@ -1,7 +1,7 @@
 
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 1.0.0 
+Version: 1.0.1
 Release: 1%{?dist}
 
 License: LGPL
@@ -82,8 +82,11 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  - 1.0.1-1
+- libassuan-1.0.1
+
 * Mon Nov 13 2006 Rex Dieter  - 1.0.0-1
-- 1.0.0
+- libassuan-1.0.0
 - rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
 
 * Wed Oct 18 2006 Rex Dieter  - 0.9.3-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassuan/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Nov 2006 03:05:29 -0000	1.8
+++ sources	28 Nov 2006 16:55:47 -0000	1.9
@@ -1,2 +1,2 @@
-f1580ef149e629629a9639a5afdb5908  libassuan-1.0.0.tar.bz2
-c00497327001dcccf7d3a952f56030e4  libassuan-1.0.0.tar.bz2.sig
+003d24e08f2eeee14b5afcc1a1998f40  libassuan-1.0.1.tar.bz2.sig
+6109ea5c8c34ee5591afbd4618dd5ab4  libassuan-1.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 17:06:33 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:06:33 -0500
Subject: rpms/heartbeat/devel heartbeat.spec,1.10,1.11
Message-ID: <200611281706.kASH6XjU017461@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17444

Modified Files:
	heartbeat.spec 
Log Message:
* Tue Nov 28 2006 Joost Soeterbroek  - 2.0.7-4
- rebuild for updated net-snmp, soname change



Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- heartbeat.spec	29 Oct 2006 11:08:28 -0000	1.10
+++ heartbeat.spec	28 Nov 2006 17:06:03 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          3%{?dist}
+Release:          4%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
@@ -301,6 +301,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 2.0.7-4
+- rebuild for updated net-snmp, soname change
+
 * Sun Oct 29 2006 Joost Soeterbroek  - 2.0.7-3
 - fix preun, postun to check for upgrade (#212133)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:07:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 12:07:04 -0500
Subject: rpms/gnupg2/FC-6 .cvsignore, 1.15, 1.16 gnupg2.spec, 1.54,
	1.55 sources, 1.17, 1.18
Message-ID: <200611281707.kASH74J3017485@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17465

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Sat Nov 25 2006 Rex Dieter  2.0.1-0.3.rc1
- gnupg-2.0.1rc1 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Nov 2006 20:59:45 -0000	1.15
+++ .cvsignore	28 Nov 2006 17:06:34 -0000	1.16
@@ -1,4 +1,5 @@
-gnupg-1.9.95.tar.bz2
-gnupg-1.9.95.tar.bz2.sig
+clog
 gnupg-2.0.0.tar.bz2
 gnupg-2.0.0.tar.bz2.sig
+gnupg-2.0.1rc1.tar.bz2
+gnupg-2.0.1rc1.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/gnupg2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnupg2.spec	16 Nov 2006 20:59:45 -0000	1.54
+++ gnupg2.spec	28 Nov 2006 17:06:34 -0000	1.55
@@ -7,15 +7,17 @@
 %define kde_scriptdir %{_prefix}
 %endif
 
+%define beta rc1
+
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.0
-Release: 4%{?dist}
+Version: 2.0.1
+Release: 0.3.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,7 +32,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-BuildRequires: libassuan-static >= 1.0.0 
+BuildRequires: libassuan-static >= 1.0.1 
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.0
@@ -78,7 +80,7 @@
 
 
 %prep
-%setup -q -n gnupg-%{version}
+%setup -q -n gnupg-%{version}%{?beta}
 
 #patch1 -p1 -b .testverbose
 
@@ -165,7 +167,6 @@
 %{_bindir}/watchgnupg
 %{_sbindir}/*
 %{_datadir}/gnupg/
-%{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
 %{_mandir}/man?/*
@@ -178,6 +179,9 @@
 
 
 %changelog
+* Sat Nov 25 2006 Rex Dieter  2.0.1-0.3.rc1
+- gnupg-2.0.1rc1 
+
 * Thu Nov 16 2006 Rex Dieter  2.0.0-4
 - update %%description
 - drop dearmor patch
@@ -186,7 +190,7 @@
 - BR: libassuan-static >= 1.0.0
 
 * Mon Nov 13 2006 Rex Dieter  2.0.0-2
-- 2.0.0
+- gnupg-2.0.0
 
 * Fri Nov 10 2006 Rex Dieter  1.9.95-3
 - upstream 64bit patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	16 Nov 2006 20:59:46 -0000	1.17
+++ sources	28 Nov 2006 17:06:34 -0000	1.18
@@ -1,2 +1,2 @@
-65dc5da3bd4ec127f81c584c8200d813  gnupg-2.0.0.tar.bz2.sig
-13c0d43bd1f4a129de470dda20192284  gnupg-2.0.0.tar.bz2
+e782017943dcf59e3f5b71556e921be4  gnupg-2.0.1rc1.tar.bz2
+2dee9b82c53b42c13267b794aa3fae00  gnupg-2.0.1rc1.tar.bz2.sig



From fedora-extras-commits at redhat.com  Tue Nov 28 17:11:51 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:11:51 -0500
Subject: rpms/trac/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 trac.spec,
	1.11, 1.12
Message-ID: <200611281711.kASHBp1P017611@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17592

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
- upstream release 0.10.2 (#217539)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 11:50:06 -0000	1.7
+++ .cvsignore	28 Nov 2006 17:11:21 -0000	1.8
@@ -1 +1 @@
-trac-0.10.1.tar.gz
+trac-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 11:50:06 -0000	1.7
+++ sources	28 Nov 2006 17:11:21 -0000	1.8
@@ -1 +1 @@
-55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz
+18df3bb6c9699297c6f41a5a1a448ff9  trac-0.10.2.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- trac.spec	11 Nov 2006 11:50:06 -0000	1.11
+++ trac.spec	28 Nov 2006 17:11:21 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
+- upstream release 0.10.2 (#217539)
+
 * Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
 - upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:21:56 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:21:56 -0500
Subject: rpms/trac/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 trac.spec,
	1.10, 1.11
Message-ID: <200611281721.kASHLuaY017849@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17790/FC-5

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.2 (#217539)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 14:30:19 -0000	1.7
+++ .cvsignore	28 Nov 2006 17:21:26 -0000	1.8
@@ -1 +1 @@
-trac-0.10.1.tar.gz
+trac-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 14:30:19 -0000	1.7
+++ sources	28 Nov 2006 17:21:26 -0000	1.8
@@ -1 +1 @@
-55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz
+18df3bb6c9699297c6f41a5a1a448ff9  trac-0.10.2.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/trac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trac.spec	11 Nov 2006 14:30:19 -0000	1.10
+++ trac.spec	28 Nov 2006 17:21:26 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
+- upstream release 0.10.2 (#217539)
+
 * Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
 - upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:21:55 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:21:55 -0500
Subject: rpms/trac/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 trac.spec,
	1.10, 1.11
Message-ID: <200611281721.kASHLtg3017844@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17790/FC-4

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.2 (#217539)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 14:30:18 -0000	1.7
+++ .cvsignore	28 Nov 2006 17:21:25 -0000	1.8
@@ -1 +1 @@
-trac-0.10.1.tar.gz
+trac-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 14:30:18 -0000	1.7
+++ sources	28 Nov 2006 17:21:25 -0000	1.8
@@ -1 +1 @@
-55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz
+18df3bb6c9699297c6f41a5a1a448ff9  trac-0.10.2.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- trac.spec	11 Nov 2006 14:30:18 -0000	1.10
+++ trac.spec	28 Nov 2006 17:21:25 -0000	1.11
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
+- upstream release 0.10.2 (#217539)
+
 * Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
 - upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:22:01 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 28 Nov 2006 12:22:01 -0500
Subject: rpms/trac/FC-6 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 trac.spec,
	1.11, 1.12
Message-ID: <200611281722.kASHM14Z017854@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17790/FC-6

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
upstream release 0.10.2 (#217539)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Nov 2006 14:30:24 -0000	1.7
+++ .cvsignore	28 Nov 2006 17:21:31 -0000	1.8
@@ -1 +1 @@
-trac-0.10.1.tar.gz
+trac-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	11 Nov 2006 14:30:24 -0000	1.7
+++ sources	28 Nov 2006 17:21:31 -0000	1.8
@@ -1 +1 @@
-55e10547c92cf39d64ab7ae4040c238d  trac-0.10.1.tar.gz
+18df3bb6c9699297c6f41a5a1a448ff9  trac-0.10.2.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-6/trac.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- trac.spec	11 Nov 2006 14:30:24 -0000	1.11
+++ trac.spec	28 Nov 2006 17:21:31 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.10.1
+Version:        0.10.2
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
@@ -116,6 +116,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Nov 28 2006 Joost Soeterbroek  - 0.10.2
+- upstream release 0.10.2 (#217539)
+
 * Sat Nov 11 2006 Joost Soeterbroek  - 0.10.1
 - upstream release 0.10.1 (fixes CSRF vulnerability, bugzilla #215077)
 



From fedora-extras-commits at redhat.com  Tue Nov 28 17:27:20 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 28 Nov 2006 12:27:20 -0500
Subject: rpms/gnonlin/devel .cvsignore, 1.5, 1.6 gnonlin.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200611281727.kASHRKZY018024@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnonlin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18005

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
* Tue Nov 28 2006 Brian Pepple  - 0.10.6-1
- Add dist tag.
- Update to 0.10.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Jul 2006 04:14:58 -0000	1.5
+++ .cvsignore	28 Nov 2006 17:26:50 -0000	1.6
@@ -1 +1 @@
-gnonlin-0.10.5.tar.gz
+gnonlin-0.10.6.tar.bz2


Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnonlin.spec	16 Oct 2006 16:19:41 -0000	1.10
+++ gnonlin.spec	28 Nov 2006 17:26:50 -0000	1.11
@@ -2,14 +2,14 @@
 %define		gst_plugins_base_req	0.10.4
 
 Name: 		gnonlin
-Version: 	0.10.5
-Release:	3
+Version: 	0.10.6
+Release:	1%{?dist}
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
 License: 	LGPL
 URL:		http://gnonlin.sourceforge.net/
-Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: 	gstreamer-devel >= %{gst_req}
@@ -30,7 +30,7 @@
 
 
 %build
-%configure --enable-static=no
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -51,6 +51,10 @@
 
 
 %changelog
+* Tue Nov 28 2006 Brian Pepple  - 0.10.6-1
+- Add dist tag.
+- Update to 0.10.6.
+
 * Mon Oct 16 2006 Brian Pepple  - 0.10.5-3
 - Unorphan & rebuild.
 - Require gstreamer-plugins-base.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Jul 2006 04:14:58 -0000	1.5
+++ sources	28 Nov 2006 17:26:50 -0000	1.6
@@ -1 +1 @@
-9c3ecac08be2f9786edf65c623f69014  gnonlin-0.10.5.tar.gz
+9ea0467c03113b927e6953709e823dba  gnonlin-0.10.6.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 17:31:51 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:31:51 -0500
Subject: rpms/libsyncml - New directory
Message-ID: <200611281731.kASHVpOM018140@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18136/libsyncml

Log Message:
Directory /cvs/extras/rpms/libsyncml added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 28 17:31:56 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:31:56 -0500
Subject: rpms/libsyncml/devel - New directory
Message-ID: <200611281731.kASHVuwQ018153@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18136/libsyncml/devel

Log Message:
Directory /cvs/extras/rpms/libsyncml/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Nov 28 17:32:13 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:32:13 -0500
Subject: rpms/libsyncml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611281732.kASHWDFQ018187@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18181

Added Files:
	Makefile import.log 
Log Message:
Setup of module libsyncml


--- NEW FILE Makefile ---
# Top level Makefile for module libsyncml
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  Tue Nov 28 17:32:18 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:32:18 -0500
Subject: rpms/libsyncml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611281732.kASHWIvI018202@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18181/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libsyncml


--- 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 Nov 28 17:32:49 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:32:49 -0500
Subject: owners owners.list,1.2026,1.2027
Message-ID: <200611281732.kASHWnUh018247@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18169

Modified Files:
	owners.list 
Log Message:
Add libsyncml. Review request #217524 accepted.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -r1.2026 -r1.2027
--- owners.list	28 Nov 2006 13:01:27 -0000	1.2026
+++ owners.list	28 Nov 2006 17:32:19 -0000	1.2027
@@ -1007,6 +1007,7 @@
 Fedora Extras|libsvg-cairo|Renders SVG content using cairo|work.eric at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libsx|Simple X library|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libsynaptics|Synaptics touchpad driver library|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsyncml|SyncML protocol library|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|libtcd|Tide Constituent Database Library|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 17:33:38 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:33:38 -0500
Subject: rpms/libsyncml import.log,1.1,1.2
Message-ID: <200611281733.kASHXcvD018296@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263

Modified Files:
	import.log 
Log Message:
auto-import libsyncml-0.4.2-1 on branch devel from libsyncml-0.4.2-1.src.rpm
Initial import of libsyncml into FE. Review request #217524 accepted.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libsyncml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Nov 2006 17:32:13 -0000	1.1
+++ import.log	28 Nov 2006 17:33:08 -0000	1.2
@@ -0,0 +1 @@
+libsyncml-0_4_2-1:HEAD:libsyncml-0.4.2-1.src.rpm:1164735304



From fedora-extras-commits at redhat.com  Tue Nov 28 17:33:38 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Tue, 28 Nov 2006 12:33:38 -0500
Subject: rpms/libsyncml/devel libsyncml-0.4.2.doctype.patch, NONE,
	1.1 libsyncml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611281733.kASHXcj1018300@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/libsyncml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libsyncml-0.4.2.doctype.patch libsyncml.spec 
Log Message:
auto-import libsyncml-0.4.2-1 on branch devel from libsyncml-0.4.2-1.src.rpm
Initial import of libsyncml into FE. Review request #217524 accepted.

libsyncml-0.4.2.doctype.patch:

--- NEW FILE libsyncml-0.4.2.doctype.patch ---
Index: trunk/libsyncml/parser/sml_xml_assm.c
===================================================================
--- trunk/libsyncml/parser/sml_xml_assm.c (revision 193)
+++ trunk/libsyncml/parser/sml_xml_assm.c (revision 212)
@@ -1442,12 +1442,15 @@
 	switch (assm->session->version) {
 		case SML_VERSION_10:
+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"");
 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML10, error))
 				goto error_free_writer;
 			break;
 		case SML_VERSION_11:
+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"");
 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML11, error))
 				goto error_free_writer;
 			break;
 		case SML_VERSION_12:
+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"");
 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML12, error))
 				goto error_free_writer;


--- NEW FILE libsyncml.spec ---
Name:		libsyncml
Version:	0.4.2
Release:	1%{?dist}
Summary:	SyncML protocol library

Group:		System Environment/Libraries
License:	LGPL
URL:		http://libsyncml.opensync.org/
# Get the tarball from http://libsyncml.opensync.org/attachment/wiki/download/%{name}-%{version}.tar.gz?rev=&format=raw
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:	openobex-devel bluez-libs-devel

%description
%{summary}.

%package	devel
Summary:	Development files for %{name}
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description	devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q
%patch0 -p1

# Fix some permissions
chmod a-x libsyncml/syncml.h

%build
%configure --disable-static --disable-unit-tests

# Disable rpath.
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/syncml-http-server
%{_bindir}/syncml-obex-client
%{_libdir}/libsyncml.so.0*
%{_mandir}/man1/syncml-http-server.1.gz
%{_mandir}/man1/syncml-obex-client.1.gz

%files devel
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_includedir}/libsyncml-1.0/
%{_libdir}/libsyncml.so
%exclude %{_libdir}/libsyncml.la
%{_libdir}/pkgconfig/libsyncml-1.0.pc


%changelog
* Mon Nov 27 2006 Laurent Rineau  - 0.4.2-1
- Initial release for Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsyncml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Nov 2006 17:32:18 -0000	1.1
+++ .cvsignore	28 Nov 2006 17:33:08 -0000	1.2
@@ -0,0 +1 @@
+libsyncml-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsyncml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Nov 2006 17:32:18 -0000	1.1
+++ sources	28 Nov 2006 17:33:08 -0000	1.2
@@ -0,0 +1 @@
+66fad49f54e78ce34c1453c62958e037  libsyncml-0.4.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 18:53:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 13:53:36 -0500
Subject: owners owners.list,1.2027,1.2028
Message-ID: <200611281853.kASIra9S021986@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21957

Modified Files:
	owners.list 
Log Message:
Fix OpenEXR entry for co-maintainership, (again? Could have sworn I fixed it before recently)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2027
retrieving revision 1.2028
diff -u -r1.2027 -r1.2028
--- owners.list	28 Nov 2006 17:32:19 -0000	1.2027
+++ owners.list	28 Nov 2006 18:53:06 -0000	1.2028
@@ -1249,7 +1249,7 @@
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|rc040203 at freenet.de|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
+Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org,ivazquez at ivazquez.net|
 Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 18:54:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 13:54:59 -0500
Subject: owners owners.list,1.2028,1.2029
Message-ID: <200611281854.kASIsxnc022036@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21997

Modified Files:
	owners.list 
Log Message:
OK, re-reading header/comments shows I was wrong, unfixing.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2028
retrieving revision 1.2029
diff -u -r1.2028 -r1.2029
--- owners.list	28 Nov 2006 18:53:06 -0000	1.2028
+++ owners.list	28 Nov 2006 18:54:28 -0000	1.2029
@@ -1249,7 +1249,7 @@
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|rc040203 at freenet.de|extras-qa at fedoraproject.org|nomis80 at nomis80.org
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org,ivazquez at ivazquez.net|
+Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|rdieter at math.unl.edu|extras-qa at fedoraproject.org|ivazquez at ivazquez.net
 Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 18:56:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 13:56:31 -0500
Subject: owners owners.list,1.2029,1.2030
Message-ID: <200611281856.kASIuVcV022063@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22046

Modified Files:
	owners.list 
Log Message:
libpqxx: +cc: rdieter



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2029
retrieving revision 1.2030
diff -u -r1.2029 -r1.2030
--- owners.list	28 Nov 2006 18:54:28 -0000	1.2029
+++ owners.list	28 Nov 2006 18:56:01 -0000	1.2030
@@ -982,7 +982,7 @@
 Fedora Extras|libpaper|Library and tools for handling papersize|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libpng10|Old version of libpng, needed to run old binaries|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|libpolyxmass|Polymer chemistry-related functionalities|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|rdieter at math.unl.edu
 Fedora Extras|libpri|An implementation of Primary Rate ISDN|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|libqalculate|Multi-purpose calculator library|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|libreadline-java|A Java wrapper around EditLine|ifoox at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Nov 28 19:33:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 14:33:59 -0500
Subject: rpms/PyQt-qscintilla/FC-6 PyQt-qscintilla.spec,1.6,1.7
Message-ID: <200611281933.kASJXxoC025638@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/PyQt-qscintilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25618

Modified Files:
	PyQt-qscintilla.spec 
Log Message:
BR: python-devel



Index: PyQt-qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/PyQt-qscintilla/FC-6/PyQt-qscintilla.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PyQt-qscintilla.spec	6 Nov 2006 15:20:21 -0000	1.6
+++ PyQt-qscintilla.spec	28 Nov 2006 19:33:29 -0000	1.7
@@ -13,9 +13,12 @@
 BuildRequires: qt-devel
 BuildRequires: qscintilla-devel
 BuildRequires: sip-devel
+BuildRequires: python-devel
 %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"
 Requires: python-abi = %{python_ver}
+%endif
 Requires: PyQt = %{version}
 
 %description



From fedora-extras-commits at redhat.com  Tue Nov 28 20:27:27 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 28 Nov 2006 15:27:27 -0500
Subject: rpms/codeblocks/devel .cvsignore, 1.8, 1.9 codeblocks.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200611282027.kASKRRsr029836@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29817

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3295


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Nov 2006 12:00:45 -0000	1.8
+++ .cvsignore	28 Nov 2006 20:26:57 -0000	1.9
@@ -1 +1 @@
-codeblocks-svn3268.tar.bz2
+codeblocks-svn3295.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- codeblocks.spec	26 Nov 2006 12:00:45 -0000	1.7
+++ codeblocks.spec	28 Nov 2006 20:26:57 -0000	1.8
@@ -1,9 +1,9 @@
-%define		rev	3268
-%define		date	20061125
+%define		rev	3295
+%define		date	20061128
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.15.%{date}svn%{rev}%{?dist}
+Release:	0.16.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
+- update to revision 3295
+
 * Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
 - update to revision 3268
 - fixes #217081


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Nov 2006 12:00:45 -0000	1.8
+++ sources	28 Nov 2006 20:26:57 -0000	1.9
@@ -1 +1 @@
-a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2
+74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 20:34:19 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 28 Nov 2006 15:34:19 -0500
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.8, 1.9 codeblocks.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200611282034.kASKYJP0029952@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29929

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3295


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Nov 2006 12:05:06 -0000	1.8
+++ .cvsignore	28 Nov 2006 20:33:49 -0000	1.9
@@ -1 +1 @@
-codeblocks-svn3268.tar.bz2
+codeblocks-svn3295.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- codeblocks.spec	26 Nov 2006 12:05:06 -0000	1.7
+++ codeblocks.spec	28 Nov 2006 20:33:49 -0000	1.8
@@ -1,9 +1,9 @@
-%define		rev	3268
-%define		date	20061125
+%define		rev	3295
+%define		date	20061128
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.15.%{date}svn%{rev}%{?dist}
+Release:	0.16.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
+- update to revision 3295
+
 * Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
 - update to revision 3268
 - fixes #217081


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Nov 2006 12:05:06 -0000	1.8
+++ sources	28 Nov 2006 20:33:49 -0000	1.9
@@ -1 +1 @@
-a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2
+74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 20:36:47 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Tue, 28 Nov 2006 15:36:47 -0500
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.8, 1.9 codeblocks.spec, 1.7,
	1.8 sources, 1.8, 1.9
Message-ID: <200611282036.kASKalXQ030034@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3295


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	26 Nov 2006 12:09:17 -0000	1.8
+++ .cvsignore	28 Nov 2006 20:36:17 -0000	1.9
@@ -1 +1 @@
-codeblocks-svn3268.tar.bz2
+codeblocks-svn3295.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- codeblocks.spec	26 Nov 2006 12:09:17 -0000	1.7
+++ codeblocks.spec	28 Nov 2006 20:36:17 -0000	1.8
@@ -1,9 +1,9 @@
-%define		rev	3268
-%define		date	20061125
+%define		rev	3295
+%define		date	20061128
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.15.%{date}svn%{rev}%{?dist}
+Release:	0.16.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
+- update to revision 3295
+
 * Sat Nov 25 2006 Dan Horak  1.0-0.15.20061125svn3268
 - update to revision 3268
 - fixes #217081


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Nov 2006 12:09:17 -0000	1.8
+++ sources	28 Nov 2006 20:36:17 -0000	1.9
@@ -1 +1 @@
-a4df6bd9b8101b9722a1d2161a697fd8  codeblocks-svn3268.tar.bz2
+74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 21:11:11 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 28 Nov 2006 16:11:11 -0500
Subject: rpms/digikam/devel .cvsignore, 1.6, 1.7 digikam.spec, 1.26,
	1.27 sources, 1.6, 1.7
Message-ID: <200611282111.kASLBBDv000874@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv835

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Update to version 0.9.0-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Aug 2006 20:13:53 -0000	1.6
+++ .cvsignore	28 Nov 2006 21:10:41 -0000	1.7
@@ -1 +1 @@
-digikam-0.8.2.tar.bz2
+digikam-0.9.0-rc1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- digikam.spec	31 Aug 2006 22:59:24 -0000	1.26
+++ digikam.spec	28 Nov 2006 21:10:41 -0000	1.27
@@ -1,17 +1,19 @@
+%define prever rc1
+
 Name:		digikam
-Version:	0.8.2
-Release:	3%{?dist}
+Version:	0.9.0
+Release:	0.1.%{alphatag}%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}%{?prever:-%{prever}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
-BuildRequires:	imlib2-devel libkexif-devel >= 0.2.4 libkipi-devel >= 0.1
-BuildRequires:	libtiff-devel libpng-devel sqlite-devel >= 3.0.0 gettext
+BuildRequires:	libkipi-devel >= 0.1 lcms-devel exiv2-devel libtiff-devel
+BuildRequires:	libpng-devel >= 1.2.7 sqlite-devel >= 3.0.0 gettext
 BuildRequires:	pkgconfig desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -37,7 +39,7 @@
 needed to develop applications using %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?prever:-%{prever}}
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -46,8 +48,9 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
+# Broken on 0.9.0-rc1
+#	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -97,7 +100,7 @@
 
 %files -f %name.lang
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING HACKING README TODO
+%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
 %{_bindir}/*
 %{_libdir}/libdigikam.so.*
 %{_libdir}/kde3/digikamimageplugin_core.la
@@ -106,8 +109,10 @@
 %{_libdir}/kde3/kio_digikam*.so
 %{_datadir}/applications/*.desktop
 %{_datadir}/apps/digikam/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*/apps/*.png
+%{_mandir}/man1/*.1*
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -118,6 +123,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.9.0-0.1.rc1
+- Update to version 0.9.0-rc1
+
 * Fri Sep 01 2006 Marcin Garski  0.8.2-3
 - Rebuild for Fedora Core 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Aug 2006 20:13:53 -0000	1.6
+++ sources	28 Nov 2006 21:10:41 -0000	1.7
@@ -1 +1 @@
-fd57b7bfe4577dc2e2efd6d33122a46b  digikam-0.8.2.tar.bz2
+a28353bb20b3ab284965ff07054699e6  digikam-0.9.0-rc1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 21:11:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 16:11:37 -0500
Subject: rpms/qscintilla/FC-6 .cvsignore, 1.2, 1.3 qscintilla.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200611282111.kASLBbDc000879@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qscintilla/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv855

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Thu Nov 09 2006 Rex Dieter  - 1.7-1
- QScintilla1-1.71-gpl-1.7 (#214192)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 21:11:07 -0000	1.3
@@ -1 +1,2 @@
 qscintilla-1.65-gpl-1.6.tar.gz
+QScintilla1-1.71-gpl-1.7.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-6/qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qscintilla.spec	3 Sep 2006 19:10:45 -0000	1.4
+++ qscintilla.spec	28 Nov 2006 21:11:07 -0000	1.5
@@ -1,24 +1,28 @@
-%define         scintilla_ver   1.65
-%define         qtdir           %{_libdir}/qt-3.3
+
+%define         scintilla_ver   1.71
 
 Name:	        qscintilla 
-Version:        1.6
-Release:        3.3%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPL
 Group:          Development/Tools
 Url:            http://www.riverbankcomputing.co.uk/qscintilla/
-Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
-Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
+Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla1-%{scintilla_ver}-gpl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4
+Patch1: 	qscintilla-1.61-gpl-1.4-designer-incpath.patch
+
+BuildRequires:  qt-devel
+
+%global qtdir	%(qmake -query QT_INSTALL_PREFIX)
+%global qtdata	%(qmake -query QT_INSTALL_DATA)
+%global qtinc	%{qtdir}/include 
+%global qtlib	%{qtdir}/lib 
 
 %description
-QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
-and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
-MacOS/X).  Qt v3 or later is required.
+QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
 This version of QScintilla is based on Scintilla v%{scintilla_ver}.
 
@@ -27,28 +31,27 @@
 Summary:        QScintilla designer plugin 
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4
-
+Requires:       qt-designer
 %description designer
-QScintillla designer plugin.
-
+%{summary}.
 
 %package devel
 Summary:        QScintilla Development Files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4
-
+Requires:       qt-devel 
 %description devel
-These are the development files for QScintilla, needed to build against
-QScintilla.
+%{summary}.
 
 
 %prep
-%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
+%setup -q -n QScintilla1-%{scintilla_ver}-gpl-%{version}
+
 %patch1 -p1 -b .designer-incpath
+
 # fixups to support RPM_BUILD_ROOT/DESTDIR
 sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
+
 # fix permissions on doc files
 find doc example -type f -exec chmod 0644 {} ';'
 
@@ -84,29 +87,31 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
-%{qtdir}/lib/*.so.*
-%{qtdir}/translations/*
-
+%{qtlib}/lib*.so.*
+%{qtdata}/translations/*
 
 %files designer
 %defattr(-,root,root,-)
 %{qtdir}/plugins/designer/*
 
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html doc/Scintilla example
-%{qtdir}/lib/*.so
-%{qtdir}/include/*
+%{qtlib}/lib*.so
+%{qtinc}/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  - 1.7-1
+- QScintilla1-1.71-gpl-1.7 (#214192)
+
 * Sun Sep 03 2006 Konstantin Ryabitsev  - 1.6-3.3
 - FC6 rebuild.
 - Export flags.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 15:10:44 -0000	1.2
+++ sources	28 Nov 2006 21:11:07 -0000	1.3
@@ -1 +1 @@
-8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz
+145321e9e3ae7d4edc7f2bf6954b6763  QScintilla1-1.71-gpl-1.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 21:13:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 28 Nov 2006 16:13:48 -0500
Subject: rpms/qscintilla/FC-5 .cvsignore, 1.2, 1.3 qscintilla.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200611282113.kASLDmBj000969@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/qscintilla/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv934

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Thu Nov 09 2006 Rex Dieter  - 1.7-1
- QScintilla1-1.71-gpl-1.7 (#214192)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
+++ .cvsignore	28 Nov 2006 21:13:18 -0000	1.3
@@ -1 +1,2 @@
 qscintilla-1.65-gpl-1.6.tar.gz
+QScintilla1-1.71-gpl-1.7.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qscintilla.spec	3 Sep 2006 19:10:45 -0000	1.4
+++ qscintilla.spec	28 Nov 2006 21:13:18 -0000	1.5
@@ -1,24 +1,28 @@
-%define         scintilla_ver   1.65
-%define         qtdir           %{_libdir}/qt-3.3
+
+%define         scintilla_ver   1.71
 
 Name:	        qscintilla 
-Version:        1.6
-Release:        3.3%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPL
 Group:          Development/Tools
 Url:            http://www.riverbankcomputing.co.uk/qscintilla/
-Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
-Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
+Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla1-%{scintilla_ver}-gpl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4
+Patch1: 	qscintilla-1.61-gpl-1.4-designer-incpath.patch
+
+BuildRequires:  qt-devel
+
+%global qtdir	%(qmake -query QT_INSTALL_PREFIX)
+%global qtdata	%(qmake -query QT_INSTALL_DATA)
+%global qtinc	%{qtdir}/include 
+%global qtlib	%{qtdir}/lib 
 
 %description
-QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
-and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
-MacOS/X).  Qt v3 or later is required.
+QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
 This version of QScintilla is based on Scintilla v%{scintilla_ver}.
 
@@ -27,28 +31,27 @@
 Summary:        QScintilla designer plugin 
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4
-
+Requires:       qt-designer
 %description designer
-QScintillla designer plugin.
-
+%{summary}.
 
 %package devel
 Summary:        QScintilla Development Files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4
-
+Requires:       qt-devel 
 %description devel
-These are the development files for QScintilla, needed to build against
-QScintilla.
+%{summary}.
 
 
 %prep
-%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
+%setup -q -n QScintilla1-%{scintilla_ver}-gpl-%{version}
+
 %patch1 -p1 -b .designer-incpath
+
 # fixups to support RPM_BUILD_ROOT/DESTDIR
 sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
+
 # fix permissions on doc files
 find doc example -type f -exec chmod 0644 {} ';'
 
@@ -84,29 +87,31 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
-%{qtdir}/lib/*.so.*
-%{qtdir}/translations/*
-
+%{qtlib}/lib*.so.*
+%{qtdata}/translations/*
 
 %files designer
 %defattr(-,root,root,-)
 %{qtdir}/plugins/designer/*
 
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html doc/Scintilla example
-%{qtdir}/lib/*.so
-%{qtdir}/include/*
+%{qtlib}/lib*.so
+%{qtinc}/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter  - 1.7-1
+- QScintilla1-1.71-gpl-1.7 (#214192)
+
 * Sun Sep 03 2006 Konstantin Ryabitsev  - 1.6-3.3
 - FC6 rebuild.
 - Export flags.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 15:10:44 -0000	1.2
+++ sources	28 Nov 2006 21:13:18 -0000	1.3
@@ -1 +1 @@
-8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz
+145321e9e3ae7d4edc7f2bf6954b6763  QScintilla1-1.71-gpl-1.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 21:13:55 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 28 Nov 2006 16:13:55 -0500
Subject: rpms/digikam/devel digikam.spec,1.27,1.28
Message-ID: <200611282113.kASLDtrM001010@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv930

Modified Files:
	digikam.spec 
Log Message:
- Typo



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- digikam.spec	28 Nov 2006 21:10:41 -0000	1.27
+++ digikam.spec	28 Nov 2006 21:13:25 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:		digikam
 Version:	0.9.0
-Release:	0.1.%{alphatag}%{?dist}
+Release:	0.1%{?prever:.%{prever}}%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia



From fedora-extras-commits at redhat.com  Tue Nov 28 21:21:27 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 28 Nov 2006 16:21:27 -0500
Subject: rpms/digikam/devel digikam.spec,1.28,1.29
Message-ID: <200611282121.kASLLRBb001177@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1155

Modified Files:
	digikam.spec 
Log Message:
- Rebuild



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- digikam.spec	28 Nov 2006 21:13:25 -0000	1.28
+++ digikam.spec	28 Nov 2006 21:20:56 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:		digikam
 Version:	0.9.0
-Release:	0.1%{?prever:.%{prever}}%{?dist}
+Release:	0.2%{?prever:.%{prever}}%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -123,6 +123,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Nov 28 2006 Marcin Garski  0.9.0-0.2.rc1
+- Rebuild
+
 * Tue Nov 28 2006 Marcin Garski  0.9.0-0.1.rc1
 - Update to version 0.9.0-rc1
 



From fedora-extras-commits at redhat.com  Tue Nov 28 22:18:36 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 28 Nov 2006 17:18:36 -0500
Subject: rpms/python-eyed3/FC-6 .cvsignore, 1.2, 1.3 python-eyed3.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200611282218.kASMIagD004580@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/python-eyed3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557

Modified Files:
	.cvsignore python-eyed3.spec sources 
Log Message:
* Tue Nov 28 2006 Brian Pepple  - 0.6.11-1
- Update to 0.6.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Oct 2006 18:03:35 -0000	1.2
+++ .cvsignore	28 Nov 2006 22:18:06 -0000	1.3
@@ -1 +1 @@
-eyeD3-0.6.10.tar.gz
+eyeD3-0.6.11.tar.gz


Index: python-eyed3.spec
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/FC-6/python-eyed3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-eyed3.spec	7 Oct 2006 18:03:35 -0000	1.1
+++ python-eyed3.spec	28 Nov 2006 22:18:06 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-eyed3
-Version:        0.6.10
-Release:        2%{?dist}
+Version:        0.6.11
+Release:        1%{?dist}
 Summary:        Python module for processing ID3 tags
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@
 
 
 %description
-Aa Python module and program for processing ID3 tags. Information about
+A Python module and program for processing ID3 tags. Information about
 mp3 files(i.e bit rate, sample frequency, play time, etc.) is also
 provided. The formats supported are ID3 v1.0/v1.1 and v2.3/v2.4.
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Brian Pepple  - 0.6.11-1
+- Update to 0.6.11.
+
 * Sat Oct  7 2006 Brian Pepple  - 0.6.10-2
 - Change BR to python.
 - Remove unnecessary make in build section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-eyed3/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Oct 2006 18:03:35 -0000	1.2
+++ sources	28 Nov 2006 22:18:06 -0000	1.3
@@ -1 +1 @@
-2f7ee6749b993faba3b5d10d9621d314  eyeD3-0.6.10.tar.gz
+e296d7b896a31abf429d542dd26c90a3  eyeD3-0.6.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Nov 28 22:46:25 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Tue, 28 Nov 2006 17:46:25 -0500
Subject: rpms/njb-sharp/FC-5 njb-sharp.spec,1.1,1.2
Message-ID: <200611282246.kASMkPtg004753@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/njb-sharp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4738

Modified Files:
	njb-sharp.spec 
Log Message:
Iterative build tries.



Index: njb-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/njb-sharp/FC-5/njb-sharp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- njb-sharp.spec	22 Nov 2006 19:48:01 -0000	1.1
+++ njb-sharp.spec	28 Nov 2006 22:45:55 -0000	1.2
@@ -1,14 +1,14 @@
 # This is only a temporary fix until FC5 is brought in
 # line with FC6.
-%if "%{?fedora}" == "5"
-%define monodir %{_prefix}/lib
-%else
+#%if "%{?fedora}" == "5"
+#%define monodir %{_prefix}/lib
+#%else
 %define monodir %{_libdir}
-%endif
+#%endif
 
 Name: 		njb-sharp
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 URL:		http://banshee-project.org/Subprojects/Njb-sharp
 Summary:	C sharp library to control the Nomad jukebox database
 Source0:	http://banshee-project.org/files/%{name}/%{name}-%{version}.tar.bz2
@@ -35,9 +35,9 @@
 
 %prep
 %setup -q
-%if "%{?fedora}" > "5"
-%patch0 -p1
-%endif
+#%if "%{?fedora}" > "5"
+#%patch0 -p1
+#%endif
 
 %build
 %configure
@@ -77,6 +77,9 @@
 %{monodir}/pkgconfig/*
 
 %changelog
+* Tue Nov 28 2006 Linus Walleij  0.3.0-6
+- See if FC5 happen to be aligned with FC6 now.
+
 * Sat Oct 21 2006 Linus Walleij  0.3.0-5
 - More picking around in the spec...
 



From fedora-extras-commits at redhat.com  Tue Nov 28 22:59:20 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Tue, 28 Nov 2006 17:59:20 -0500
Subject: rpms/VLGothic-fonts/FC-6 VLGothic-fonts.spec,1.1,1.2
Message-ID: <200611282259.kASMxKjB004902@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4875

Modified Files:
	VLGothic-fonts.spec 
Log Message:
Fix the misstyped dist tag.



Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/FC-6/VLGothic-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VLGothic-fonts.spec	23 Nov 2006 00:10:23 -0000	1.1
+++ VLGothic-fonts.spec	28 Nov 2006 22:58:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20061026
-Release: 3%{?_dist}
+Release: 3%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: Distributable
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Ryo Dairiki  - 20061026-4
+- Fix the misstyped dist tag.
+
 * Sat Nov 18 2006 Ryo Dairiki  - 20061026-3
 - Modify the specfile along with the Fedora Extras packaging policy.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 23:00:56 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Tue, 28 Nov 2006 18:00:56 -0500
Subject: rpms/VLGothic-fonts/FC-6 VLGothic-fonts.spec,1.2,1.3
Message-ID: <200611282300.kASN0u1e004974@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4947

Modified Files:
	VLGothic-fonts.spec 
Log Message:



Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/FC-6/VLGothic-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VLGothic-fonts.spec	28 Nov 2006 22:58:50 -0000	1.2
+++ VLGothic-fonts.spec	28 Nov 2006 23:00:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20061026
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: Distributable



From fedora-extras-commits at redhat.com  Tue Nov 28 23:02:31 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Tue, 28 Nov 2006 18:02:31 -0500
Subject: rpms/VLGothic-fonts/FC-5 VLGothic-fonts.spec,1.1,1.2
Message-ID: <200611282302.kASN2Vud008079@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8054

Modified Files:
	VLGothic-fonts.spec 
Log Message:
Fix the misstyped dist tag.



Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/FC-5/VLGothic-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VLGothic-fonts.spec	23 Nov 2006 00:10:23 -0000	1.1
+++ VLGothic-fonts.spec	28 Nov 2006 23:02:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20061026
-Release: 3%{?_dist}
+Release: 4%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: Distributable
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Ryo Dairiki  - 20061026-4
+- Fix the misstyped dist tag.
+
 * Sat Nov 18 2006 Ryo Dairiki  - 20061026-3
 - Modify the specfile along with the Fedora Extras packaging policy.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 23:04:00 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Tue, 28 Nov 2006 18:04:00 -0500
Subject: rpms/VLGothic-fonts/devel VLGothic-fonts.spec,1.1,1.2
Message-ID: <200611282304.kASN40fT008188@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8169

Modified Files:
	VLGothic-fonts.spec 
Log Message:
Fix the misstyped dist tag.


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/VLGothic-fonts/devel/VLGothic-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VLGothic-fonts.spec	23 Nov 2006 00:10:23 -0000	1.1
+++ VLGothic-fonts.spec	28 Nov 2006 23:03:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20061026
-Release: 3%{?_dist}
+Release: 4%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: Distributable
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Ryo Dairiki  - 20061026-4
+- Fix the misstyped dist tag.
+
 * Sat Nov 18 2006 Ryo Dairiki  - 20061026-3
 - Modify the specfile along with the Fedora Extras packaging policy.
 



From fedora-extras-commits at redhat.com  Tue Nov 28 23:05:41 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 18:05:41 -0500
Subject: rpms/xtide/devel .cvsignore,1.4,1.5
Message-ID: <200611282305.kASN5ffJ008280@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8265

Added Files:
	.cvsignore 
Log Message:
add missing .cvsignore


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	28 Nov 2006 23:05:11 -0000	1.5
@@ -0,0 +1 @@
+xtide-2.9dev-20061122.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 23:35:28 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 18:35:28 -0500
Subject: rpms/xtide/FC-6 .cvsignore,1.4,1.5
Message-ID: <200611282335.kASNZSq6008415@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400

Added Files:
	.cvsignore 
Log Message:
add missing .cvsignore


Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	28 Nov 2006 23:34:58 -0000	1.5
@@ -0,0 +1 @@
+xtide-2.9dev-20061122.tar.bz2



From fedora-extras-commits at redhat.com  Tue Nov 28 23:59:08 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 18:59:08 -0500
Subject: rpms/xtide/FC-5 xtide-2.9dev-rcinit.diff, NONE,
	1.1 xtide-README.fedora, NONE, 1.1 xtide-get_harmonics-data.sh,
	NONE, 1.1 xttpd-wrapper.sh, NONE, 1.1 xttpd.conf, NONE,
	1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xtide.spec, 1.10,
	1.11 xtide-2.8.for_x86_64.patch, 1.1, NONE xtide.desktop, 1.1, NONE
Message-ID: <200611282359.kASNx83p008648@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8614

Modified Files:
	.cvsignore sources xtide.spec 
Added Files:
	xtide-2.9dev-rcinit.diff xtide-README.fedora 
	xtide-get_harmonics-data.sh xttpd-wrapper.sh xttpd.conf 
Removed Files:
	xtide-2.8.for_x86_64.patch xtide.desktop 
Log Message:
* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122
- Ensure the hardcorded directories in some scripts can be 
  appropriately changed.
- Fix some typo in README.fedora


xtide-2.9dev-rcinit.diff:

--- NEW FILE xtide-2.9dev-rcinit.diff ---
--- rc.xttpd.fedora	2006-11-23 07:22:31.000000000 +0900
+++ rc.xttpd	2006-11-23 20:33:49.000000000 +0900
@@ -26,22 +26,15 @@
 start(){
     echo -n $"Starting $PROG: "
     if ! test -f "$DAEMON" ; then 
-	echo $"$DAEMON is not set." >&2
-	echo_failure
+	echo -n $"$DAEMON is not set."
+	failure
 	echo
 	RETVAL=1
 	return $RETVAL
     fi
     if test -z "$PORT" ; then
-	echo $"PORT environment is not set." >&2
-	echo_failure
-	echo
-	RETVAL=1
-	return $RETVAL
-    fi
-    if test -z "$HOME" ; then
-	echo $"HOME environment is not set." >&2
-	echo_failure
+	echo -n $"PORT environment is not set."
+	failure
 	echo
 	RETVAL=1
 	return $RETVAL
@@ -100,3 +93,4 @@
 esac
 
 exit $?
+


--- NEW FILE xtide-README.fedora ---
================================================
# xtide-README.fedora
# Written by Patrice Dumas and Mamoru Tasaka

# If you have some questions, please report it
# with redhat bugzilla:
# https://bugzilla.redhat.com/bugzilla/index.cgi
================================================

Availability and installation of harmonics files
================================================

To use xtide and related utilities (like xttpd, 
tideEditor), you need an harmonics file.
However, existing files cannot be distributed as part of Fedora, 
because their license restricts commercial redistribution and selling,
which is too restrictive for Fedora. These files should therefore 
be installed after the package installation by yourself.

Such files are available at:
http://www.flaterco.com/xtide/files.html
As the time of writing, the latest harmonics file is:
ftp://ftp.flaterco.com/xtide/harmonics-dwf-20060708.tcd.bz2
The utilities can only use uncompressed harmonics files.

There are 2 possibilities to have the utilities become aware of
the harmonics file location:

1) by editing /etc/xtide.conf, and setting the first line of the file
  to the path of the directory containing the harmonics files, or  
  to the harmonics file location (the utilities will also accept a colon `:' 
  delimited list of paths). 
  The second line of /etc/xtide.conf sets the directory which 
  contains world vector shoreline data. The second line can accept only
  one directory and cannot be colon-delimited.
  
  The default content of /etc/xtide.conf used by fedora is:

  /usr/share/xtide-harmonics/
  /usr/share/wvs-data/

  which means that all the files in /usr/share/xtide-harmonics
  are considered to be harmonics files and all under /usr/share/wvs-data
  are considered to be WVS data.

2) by setting the environment variable HFILE_PATH. You can also
   set WVS_PATH to specify the directory under which WVS data are
   stored.

You can run the provided script xtide-get_harmonics-data.sh
under /usr/sbin to install harmonics files to 
/usr/share/xtide-harmonics. This script requires 
administrator previledges.


--- NEW FILE xtide-get_harmonics-data.sh ---
#!/bin/sh

DATE=${DATE:-20060708}
INSTALL_DIR=${INSTALL_DIR:-/usr/share/xtide-harmonics/}

FILE=harmonics-dwf-${DATE}.tcd.bz2

if [ "`id -u -n`" != "root" ] ; then
    echo "You must do this by root"
    exit 1
fi

wget -N ftp://ftp.flaterco.com/xtide/$FILE || \
    ( echo ; echo "Downloading failed." ; exit 1 )

bzip2 -d $FILE
mkdir -p $INSTALL_DIR
install -m 644 harmonics-dwf-${DATE}.tcd $INSTALL_DIR
rm -f ${FILE%.bz2}


--- NEW FILE xttpd-wrapper.sh ---
#!/bin/sh

unset XTTPD_ARG
for ARG in $* ; do
   case $ARG in
      *=* )
	eval export $ARG
        ;;
      * )
        XTTPD_ARG="$XTTPD_ARG $ARG"
	;;
   esac
done
			
exec /usr/libexec/xttpd $XTTPD_ARG

--- NEW FILE xttpd.conf ---
# Originally from debian.
# The following is from debian's comment.
#---------------------------------------------------------
#
# skeleton	example file to build /etc/init.d/ scripts.
#		This file should be used to construct scripts for /etc/init.d.
#
#		Written by Miquel van Smoorenburg .
#		Modified for Debian GNU/Linux
#		by Ian Murdock .
#
# Version:	@(#)skeleton  1.6  11-Nov-1996  miquels at cistron.nl
#
# This file by Peter S Galbraith  for the xtide package.

#---------------------------------------
# Configuration:  
#  
#  Uncommenting the PORT line below enables this daemon at bootup.
#  To start the server after uncommenting the line, there is no need 
#  to reboot, simply invoke:
#                            # /etc/init.d/xttpd start
#
#  PORT: Port number used by xttpd
#   - If you use 80, xttpd will be your standard web server and will be 
#     visible as http://localhost  (Make sure no other web server is installed)
#   - Alternatively, use a higher unprivileged port number (e.g. 8080) to have
#     xttpd running in addition to a standard web server.  xttpd would then 
#     be visble as http://localhost:8080/
#  XTTPD_FEEDBACK:
#   - Set the environment variable XTTPD_FEEDBACK to change the feedback 
#     address email address.
#PORT=8080
#XTTPD_FEEDBACK=user at your.site
#-Edit-lines-above-and-uncomment--------


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Jan 2005 06:27:05 -0000	1.3
+++ .cvsignore	28 Nov 2006 23:58:38 -0000	1.4
@@ -1,2 +1 @@
-harmonics-dwf-2004-12-10-v2.tcd.gz
-xtide-2.8.tar.gz
+xtide-2.9-0.2.date20061122.fc6.src.rpm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Jan 2005 06:27:05 -0000	1.3
+++ sources	28 Nov 2006 23:58:38 -0000	1.4
@@ -1,2 +1 @@
-cc55cdf906c9cb5e7938731391f486e0  harmonics-dwf-2004-12-10-v2.tcd.gz
-17e34e7d7fc1dcf7b564b2970f821d0e  xtide-2.8.tar.gz
+aaf397a58557feb1fdf3096900edd155  xtide-2.9-0.2.date20061122.fc6.src.rpm


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xtide.spec	26 Feb 2006 07:51:41 -0000	1.10
+++ xtide.spec	28 Nov 2006 23:58:38 -0000	1.11
@@ -1,23 +1,55 @@
-Summary: Calculate tide all over the world
-Name: xtide
-Version: 2.8
-Release: 4
-
-URL: http://www.flaterco.com/xtide/
-Source0: ftp://ftp.flaterco.com/xtide/%{name}-%{version}.tar.gz
-Source1: ftp://ftp.flaterco.com/xtide/harmonics-dwf-2004-12-10-v2.tcd.gz
-Source2: %{name}.desktop
-Patch0: %{name}-%{version}.for_x86_64.patch
-License: GPL
-Group: Applications/Engineering
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libpng-devel
-BuildRequires: XFree86-devel
-BuildRequires: zlib-devel
-Buildrequires: desktop-file-utils
-Buildrequires: flex
-Buildrequires: bison
-Provides: xttpd = %{version}-%{release}
+%{!?with_harmonics: %define   with_harmonics 0}
+%define          src_date   20061122    
+
+Summary:         Calculate tide all over the world
+Name:            xtide
+Version:         2.9
+Release:         0.2.date%{src_date}%{?dist}
+
+URL:             http://www.flaterco.com/xtide/
+Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2
+%if %{with_harmonics}
+Source1:         http://harmonics.unh.edu/xtide/harmonics.txt.gz
+%endif
+
+Patch18:         xtide-2.9dev-rcinit.diff
+
+Source11:        xttpd.conf
+Source14:        xtide-get_harmonics-data.sh
+Source15:        xttpd-wrapper.sh
+Source20:        %{name}.desktop
+Source30:        xtide-README.fedora
+
+License:         GPL
+Group:           Applications/Engineering
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:   autoconf
+
+BuildRequires:   libXaw-devel
+BuildRequires:   libXext-devel
+BuildRequires:   libpng-devel
+BuildRequires:   zlib-devel
+Buildrequires:   desktop-file-utils
+BuildRequires:   libtcd-devel
+%if %{with_harmonics}
+BuildRequires:   tcd-utils
+%endif
+Requires:        wvs-data
+Requires:        xtide-common
+
+Requires(pre):      %{_sbindir}/useradd
+Requires(preun):    /sbin/service
+Requires(preun):    /sbin/chkconfig
+Requires(postun):   /sbin/service
+Requires(post):     /sbin/chkconfig
+
+%package         common
+Summary:         Xtide common files
+Group:           Applications/Engineering
+License:         Public Domain
+Requires:        bzip2
+Requires:        wget
 
 %description
 XTide is a package that provides tide and current
@@ -25,10 +57,10 @@
 calendars can be generated, or a tide clock can be provided on your
 desktop.
 
-XTide can work with X-windows, plain text terminals, or the web.  This
+XTide can work with X-windows, plain text terminals, or the web. This
 is accomplished with three separate programs: the interactive
 interface (xtide), the non-interactive or command line interface
-(tide), and the web interface (xttpd).
+(tide), and the web interface.
 
 The algorithm that XTide uses to predict tides is the one used by the
 National Ocean Service in the U.S.  It is significantly more accurate
@@ -37,7 +69,8 @@
 algorithm -- you also need some special data for each and every
 location for which you want to predict tides.  XTide reads this data
 from harmonics files.  See http://www.flaterco.com/xtide/files.html
-for details on where to get these.
+for details on where to get these (note: please also see README.fedora
+in common package for Fedora specific issue.).
 
 Ultimately, XTide's predictions can only be as good as the available
 harmonics data.  Due to issues of data availability and of
@@ -49,88 +82,253 @@
 
     * Deviations of 1 minute from official predictions are typical for
       U.S. locations having the latest data.
-
     * Deviations of 20 minutes are typical for non-U.S. locations or
       U.S. locations that are using obsolete data.
-
     * Much longer deviations indicate a problem.
 
-%prep
-cat< harmonics.out
+%endif
 
-echo "%{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd" > %{name}.conf
+echo "%{_datadir}/xtide-harmonics/" > %{name}.conf
+echo "%{_datadir}/wvs-data/" >> %{name}.conf
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
+%{__mkdir_p} $RPM_BUILD_ROOT
+ 
+# 1. install xtide
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
+
+# xttpd treatment
+# xttpd is wrapped
+%{__install} -c -p -m 755 %{SOURCE14} \
+   $RPM_BUILD_ROOT%{_sbindir}
+%{__mv} $RPM_BUILD_ROOT%{_sbindir}/xttpd $RPM_BUILD_ROOT%{_libexecdir}
+%{__install} -c -p -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_sbindir}/xttpd
+# ensure xttpd binary installation directory (original
+# wrapper script is hardcorded
+%{__sed} -i -e 's|/usr/libexec|%{_libexecdir}|' \
+   $RPM_BUILD_ROOT%{_sbindir}/xttpd
+
+
+# 1A Install harmonics file
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics
+%if %{with_harmonics}
+%{__install} -c -p -m 644 harmonics*.tcd \
+   ${RPM_BUILD_ROOT}%{_datadir}/%{name}-harmonics/
+%endif
 
-%makeinstall
+# 1B Add configuration file
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}
+%{__install} -c -p -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/
+
+# 1C Add desktop entry (xtide)
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install \
+   --vendor fedora \
+   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   --remove-category Application \
+   %{SOURCE20}
+
+# 1D Install icon
+for f in iconsrc/icon_*_orig.png ; do
+   %{__install} -c -p -m 644 $f $RPM_BUILD_ROOT%{_datadir}/%{name}/
+done
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+%{__ln_s} -f ../../../../%{name}/icon_16x16_orig.png \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{__ln_s} -f ../../../../%{name}/icon_48x48_orig.png \
+   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+# 1E install xttpd conf file
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xtide
+%{__install} -c -p -m 755 scripts/Fedora/rc.xttpd \
+   $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xttpd
+%{__install} -c -p -m 644 %{SOURCE11} \
+   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/xttpd
 
-# Install harmonics file.
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}
-install -m 644 harmonics-dwf-2004-12-10-v2.tcd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/
-
-# Add configuration file
-mkdir ${RPM_BUILD_ROOT}%{_sysconfdir}
-install -m 644 %{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}.conf
-
-# Add desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora --delete-original      \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Fedora                            \
-  %{name}.desktop
+# 1F and others
+%{__install} -c -p -m 644 %{SOURCE30} README.fedora
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
-%files
-
-%defattr(-,root,root,-)
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+/sbin/chkconfig --add xttpd
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+if [ $1 -ge 1 ] ; then
+   /sbin/service xttpd condrestart &>/dev/null || :
+fi
+
+%pre 
+%{_sbindir}/useradd \
+   -c "XTide web server" \
+   -d %{_sysconfdir}/%{name} \
+   -r \
+   -s /sbin/nologin \
+   xttpd 2>/dev/null || :
+
+%preun
+if [ $1 = 0 ] ; then
+   /sbin/service xttpd stop &>/dev/null
+   /sbin/chkconfig --del xttpd
+fi
+
+%files common
+%doc README.fedora
+%config(noreplace) %{_sysconfdir}/%{name}.conf
 
-# Documentation
-%doc DOCUMENTATION/{GPL,qui,ver}*
-%{_mandir}/man1/*
-%{_mandir}/man8/*
-
-# Harmonics dir
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}-harmonics
+%dir %{_sysconfdir}/%{name}
+%if %{with_harmonics}
+%{_datadir}/%{name}-harmonics/harmonics*.tcd
+%endif
 
-# TCD file
-%config(missingok) %{_datadir}/%{name}/harmonics-dwf-2004-12-10-v2.tcd
-
-# Config file
-%config(noreplace) %{_sysconfdir}/*
+%{_sbindir}/xtide-get*.sh
 
-# Desktop entry
-%{_datadir}/applications/*
+%files
+%defattr(-,root,root,-)
 
-# Executables
-%{_bindir}/*
-%{_sbindir}/*
+%doc AUTHORS COPYING README README-QUICK
+# xtide
+%{_mandir}/man1/*tide.1*
+
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/%{name}/icon_*_orig.png
+
+%{_bindir}/*tide
+
+# xttpd
+%config(noreplace) %{_sysconfdir}/sysconfig/xttpd
+%{_sysconfdir}/rc.d/init.d/xttpd
+
+%{_sbindir}/xttpd
+%{_libexecdir}/xttpd
+%{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122
+- Ensure the hardcorded directories in some scripts can be 
+  appropriately changed.
+- Fix some typo in README.fedora
+
+* Thu Nov 23 2006 Mamoru Tasaka  - 2.9-0.1.date20061122
+- 2.9 dev 20061122 release
+
+* Mon Nov 20 2006 Mamoru Tasaka  - 2.9-0.1.dev1
+- Version down temporarily
+- re-split libtcd, tcd-utils (see bug 211626)
+- again include xttpd
+
+* Sun Oct 29 2006 Mamoru Tasaka  - 2.9-0.14.dev20061027
+- xtide-2.9dev20061029, tcd-utils-1.3.11(2005-08-11),
+  update patches.
+- Remove -DCOMPAT114 as required by newer tcd-utils
+- Bump somajor of tcd-utils for API change.
+
+* Fri Oct 27 2006 Mamoru Tasaka  - 2.9-0.13.dev20061015
+- Fix some change in xtide-2.9dev-change-uidgid.patch
+
+* Fri Oct 27 2006 Mamoru Tasaka  - 2.9-0.12.dev20061015
+- More restrictive uid/gid mode for xttpd
+- Another fix for xttpd.init
+
+* Thu Oct 26 2006 Mamoru Tasaka  - 2.9-0.11.dev20061015
+- Other fixes for xttpd.init, xttpd.conf
+- Create "xttpd" user and use xttpd user for daemon.
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.10.dev20061015
+- xtide doesn't need wrapperd, however, xttpd does.
+- Fix xttpd init script
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.9.dev20061015
+- Adjustment for WVS data directory change.
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.8.dev20061015
+- Split WVS data.
+- desktop-file-utils 0.11 change: X-Fedora, Application is no longer
+  accepted (will be fixed in rawhide).
+
+* Wed Oct 25 2006 Mamoru Tasaka  - 2.9-0.7.dev20061015
+- Drop harmonics data for now.
+- Define WVS_DIR, then rewrite tideEditor-wrapper.sh and wrap xtide
+- Add fedora-specific document
+- Include WVS data
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.6.dev20061015
+- Install 48x48 icon as well.
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.5.dev20061015
+- Use icon in xtide source
+- Fix Group entry
+- Re-source profile shell script for easier rebuilding
+
+* Sun Oct 22 2006 Mamoru Tasaka  - 2.9-0.4.dev20061015
+- Introduce common files package.
+- CFLAGS treatment change.
+- Treak configuration files and their locations.
+
+* Sat Oct 21 2006 Mamoru Tasaka  - 2.9-0.3.dev20061015
+- Various changes about compilation optflags.
+- Change libtcd soname numbering
+- Sprit xttpd, include scripts
+- tideEditor wrapper script included and desktop files added.
+- use "/sbin/ldconfig -n"
+- Lots of help from Michael Schwendt and Patrice Dumas, thanks!!
+
+* Sat Oct 21 2006 Mamoru Tasaka  - 2.9-0.2.dev20061015
+- Re-unify libtcd and xtide, and include tcd-utils, 
+  build all at once.
+
+* Fri Oct 20 2006 Mamoru Tasaka  - 2.9-0.1.dev20061015
+- Resubmit to Fedora Extras (bug #211626)
+- Split libtcd to another package, require tcd-utils to
+  rebuild tcd data.
+
 * Sun May 22 2005 Jeremy Katz  - 2.8-4
 - rebuild on all arches
 


--- xtide-2.8.for_x86_64.patch DELETED ---


--- xtide.desktop DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 00:00:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 19:00:22 -0500
Subject: rpms/xtide/FC-5 xtide.desktop,1.2,1.3
Message-ID: <200611290000.kAT00M2f008683@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8664

Added Files:
	xtide.desktop 
Log Message:
readd xtide.desktop


Index: xtide.desktop
===================================================================
RCS file: xtide.desktop
diff -N xtide.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xtide.desktop	28 Nov 2006 23:59:52 -0000	1.3
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=XTide
+Comment=Predict tides
+Exec=xtide
+Icon=xtide
+Terminal=false
+Type=Application
+Categories=Application;Science;Education;
+



From fedora-extras-commits at redhat.com  Wed Nov 29 00:04:44 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Tue, 28 Nov 2006 19:04:44 -0500
Subject: rpms/xtide/FC-5 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200611290004.kAT04iX9011757@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11738

Modified Files:
	.cvsignore sources 
Log Message:
Oops.. fixing tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2006 23:58:38 -0000	1.4
+++ .cvsignore	29 Nov 2006 00:04:13 -0000	1.5
@@ -1 +1 @@
-xtide-2.9-0.2.date20061122.fc6.src.rpm
+xtide-2.9dev-20061122.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2006 23:58:38 -0000	1.4
+++ sources	29 Nov 2006 00:04:13 -0000	1.5
@@ -1 +1 @@
-aaf397a58557feb1fdf3096900edd155  xtide-2.9-0.2.date20061122.fc6.src.rpm
+efc6b3eb603e5b51c13c5dbb7bd29548  xtide-2.9dev-20061122.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 00:32:44 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:32:44 -0500
Subject: rpms/rlwrap - New directory
Message-ID: <200611290032.kAT0WiV1011974@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11970/rlwrap

Log Message:
Directory /cvs/extras/rpms/rlwrap added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 00:32:49 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:32:49 -0500
Subject: rpms/rlwrap/devel - New directory
Message-ID: <200611290032.kAT0Wnmj011987@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11970/rlwrap/devel

Log Message:
Directory /cvs/extras/rpms/rlwrap/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 00:33:02 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:33:02 -0500
Subject: rpms/rlwrap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611290033.kAT0X2Wi012017@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011

Added Files:
	Makefile import.log 
Log Message:
Setup of module rlwrap


--- NEW FILE Makefile ---
# Top level Makefile for module rlwrap
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  Wed Nov 29 00:33:07 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:33:07 -0500
Subject: rpms/rlwrap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611290033.kAT0X7Ed012032@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rlwrap


--- 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 Nov 29 00:34:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:34:18 -0500
Subject: rpms/rlwrap import.log,1.1,1.2
Message-ID: <200611290034.kAT0YIFr012105@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12071

Modified Files:
	import.log 
Log Message:
auto-import rlwrap-0.28-1 on branch devel from rlwrap-0.28-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rlwrap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Nov 2006 00:33:02 -0000	1.1
+++ import.log	29 Nov 2006 00:33:48 -0000	1.2
@@ -0,0 +1 @@
+rlwrap-0_28-1:HEAD:rlwrap-0.28-1.src.rpm:1164760558



From fedora-extras-commits at redhat.com  Wed Nov 29 00:34:18 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 19:34:18 -0500
Subject: rpms/rlwrap/devel rlwrap.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611290034.kAT0YIH5012109@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/rpms/rlwrap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12071/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rlwrap.spec 
Log Message:
auto-import rlwrap-0.28-1 on branch devel from rlwrap-0.28-1.src.rpm


--- NEW FILE rlwrap.spec ---
Name:           rlwrap
Version:        0.28
Release:        1%{?dist}
Summary:        Wrapper for GNU readline

Group:          Applications/Text
License:        GPL
URL:            http://utopia.knoware.nl/~hlub/rlwrap/
Source0:        http://utopia.knoware.nl/~hlub/rlwrap/rlwrap-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  readline-devel
#Requires:       

%description
rlwrap is a 'readline wrapper' that uses the GNU readline library to
allow the editing of keyboard input for any other command. Input
history is remembered across invocations, separately for each command;
history completion and search work as in bash and completion word
lists can be specified on the command line.


%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,-)
%doc AUTHORS COPYING NEWS README
%{_bindir}/rlwrap
%{_mandir}/*/rlwrap.*
%{_datadir}/rlwrap



%changelog
* Tue Nov 28 2006 Michel Salim  0.28-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rlwrap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Nov 2006 00:33:07 -0000	1.1
+++ .cvsignore	29 Nov 2006 00:33:48 -0000	1.2
@@ -0,0 +1 @@
+rlwrap-0.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rlwrap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Nov 2006 00:33:07 -0000	1.1
+++ sources	29 Nov 2006 00:33:48 -0000	1.2
@@ -0,0 +1 @@
+057871cb04d9dec237ac565aff5a93d7  rlwrap-0.28.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 01:01:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:01:06 -0500
Subject: rpms/memchan - New directory
Message-ID: <200611290101.kAT116ST015266@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15256/memchan

Log Message:
Directory /cvs/extras/rpms/memchan added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 01:01:11 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:01:11 -0500
Subject: rpms/memchan/devel - New directory
Message-ID: <200611290101.kAT11B1C015284@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15256/memchan/devel

Log Message:
Directory /cvs/extras/rpms/memchan/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 01:01:22 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:01:22 -0500
Subject: rpms/memchan Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611290101.kAT11Mw4015314@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308

Added Files:
	Makefile import.log 
Log Message:
Setup of module memchan


--- NEW FILE Makefile ---
# Top level Makefile for module memchan
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  Wed Nov 29 01:01:27 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:01:27 -0500
Subject: rpms/memchan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611290101.kAT11RWB015329@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module memchan


--- 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 Nov 29 01:02:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:02:46 -0500
Subject: rpms/memchan/devel memchan-2.2.1-configure.patch, NONE,
	1.1 memchan-2.2.1-vpath.patch, NONE, 1.1 memchan.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611290102.kAT12kMa015424@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15380/devel

Modified Files:
	.cvsignore sources 
Added Files:
	memchan-2.2.1-configure.patch memchan-2.2.1-vpath.patch 
	memchan.spec 
Log Message:
auto-import memchan-2.2.1-1 on branch devel from memchan-2.2.1-1.src.rpm

memchan-2.2.1-configure.patch:

--- NEW FILE memchan-2.2.1-configure.patch ---
--- configure.orig	2006-11-27 22:25:20.000000000 -0800
+++ configure	2006-11-27 22:26:08.000000000 -0800
@@ -1507,10 +1507,12 @@
 
 	    # check in a few common install locations
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
-		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+		for i in `ls -d ${libdir} 2>/dev/null` \
+		        `ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
@@ -6373,7 +6375,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`

memchan-2.2.1-vpath.patch:

--- NEW FILE memchan-2.2.1-vpath.patch ---
--- Makefile.in.orig	2006-11-27 22:28:08.000000000 -0800
+++ Makefile.in	2006-11-27 22:32:28.000000000 -0800
@@ -29,37 +29,37 @@
 #========================================================================
 
 Memchan_SOURCES	=		\
-		memchan.c	\
-		init.c		\
-		counter.c	\
-		fifo.c		\
-		fifo2.c		\
-		null.c		\
-		zero.c		\
-		random.c	\
-		buf.c		\
-		bufFix.c	\
-		bufExt.c	\
-		bufRange.c	\
-		bufQueue.c	\
-		bufStubInit.c	\
-		bufStubLib.c	\
-		memchanStubInit.c	\
-		memchanStubLib.c	\
-		randport.c      \
+		generic/memchan.c	\
+		generic/init.c		\
+		generic/counter.c	\
+		generic/fifo.c		\
+		generic/fifo2.c		\
+		generic/null.c		\
+		generic/zero.c		\
+		generic/random.c	\
+		generic/buf.c		\
+		generic/bufFix.c	\
+		generic/bufExt.c	\
+		generic/bufRange.c	\
+		generic/bufQueue.c	\
+		generic/bufStubInit.c	\
+		generic/bufStubLib.c	\
+		generic/memchanStubInit.c	\
+		generic/memchanStubLib.c	\
+		isaac/randport.c      \
 		@EXTRA_SOURCES@
 
 WIN_SOURCES	= 
 UNIX_SOURCES	= 
 
 DOC_SOURCES = \
-	memchan.man \
-	memchanapi.man \
-	fifo.man \
-	fifo2.man \
-	null.man \
-	zero.man \
-	random.man
+	doc/memchan.man \
+	doc/memchanapi.man \
+	doc/fifo.man \
+	doc/fifo2.man \
+	doc/null.man \
+	doc/zero.man \
+	doc/random.man
 
 #========================================================================
 # Identify the object files.  This replaces .c with .$(OBJEXT) for all
@@ -76,10 +76,10 @@
 Memchan_OBJECTS	= $(Memchan_SOURCES:.c=. at OBJEXT@)
 Memchan_LIB_FILE= @Memchan_LIB_FILE@
 
-Memchanstub_OBJECTS=	bufStubLib.$(OBJEXT) memchanStubLib.$(OBJEXT)
+Memchanstub_OBJECTS=	generic/bufStubLib.$(OBJEXT) generic/memchanStubLib.$(OBJEXT)
 Memchanstub_LIB_FILE= @Memchanstub_LIB_FILE@
 
-CHANTEST_OBJECTS=chantest.$(OBJEXT)
+CHANTEST_OBJECTS=generic/chantest.$(OBJEXT)
 CHANTEST_LIB_FILE=libChantest0.1.so
 
 DOC_NROFF = $(DOC_SOURCES:.man=.n)


--- NEW FILE memchan.spec ---
Name:           memchan
Version:        2.2.1
Release:        1%{?dist}
Summary:        In-memory channels for Tcl

Group:          Development/Libraries
License:        BSD
URL:            http://memchan.sourceforge.net/
Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Patch0:         memchan-2.2.1-configure.patch
Patch1:         memchan-2.2.1-vpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tcl-devel
#Requires:       

%description
Memchan is an extension library to the script language Tcl, as created by John
Ousterhout. It provides several new channel types for in-memory channels and
the appropriate commands for their creation.

%package devel
Summary: Development files for compiling against the Tcl memchan extension
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
Development files for compiling against the Tcl memchan extension

%prep
%setup -q
%patch0
%patch1


%build
%configure --enable-threads
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/license.terms doc/*.html ChangeLog
%{_mandir}/mann/*.gz
%{_libdir}/Memchan%{version}/*.so
%{_libdir}/Memchan%{version}/*.tcl

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/Memchan%{version}/*.a



%changelog
* Mon Nov 27 2006 Wart  - 2.2.1-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/memchan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Nov 2006 01:01:27 -0000	1.1
+++ .cvsignore	29 Nov 2006 01:02:16 -0000	1.2
@@ -0,0 +1 @@
+memchan-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/memchan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Nov 2006 01:01:27 -0000	1.1
+++ sources	29 Nov 2006 01:02:16 -0000	1.2
@@ -0,0 +1 @@
+07ef0aabff7a980959aa1a07bc73a520  memchan-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 01:02:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:02:46 -0500
Subject: rpms/memchan import.log,1.1,1.2
Message-ID: <200611290102.kAT12k9B015420@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15380

Modified Files:
	import.log 
Log Message:
auto-import memchan-2.2.1-1 on branch devel from memchan-2.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/memchan/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Nov 2006 01:01:22 -0000	1.1
+++ import.log	29 Nov 2006 01:02:16 -0000	1.2
@@ -0,0 +1 @@
+memchan-2_2_1-1:HEAD:memchan-2.2.1-1.src.rpm:1164762261



From fedora-extras-commits at redhat.com  Wed Nov 29 01:05:01 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Tue, 28 Nov 2006 20:05:01 -0500
Subject: owners owners.list,1.2030,1.2031
Message-ID: <200611290105.kAT151JC015485@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15468

Modified Files:
	owners.list 
Log Message:
Added memchan





Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2030
retrieving revision 1.2031
diff -u -r1.2030 -r1.2031
--- owners.list	28 Nov 2006 18:56:01 -0000	1.2030
+++ owners.list	29 Nov 2006 01:04:31 -0000	1.2031
@@ -1090,6 +1090,7 @@
 Fedora Extras|mediawiki|The PHP-based wiki software behind Wikipedia|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|fedora at theholbrooks.org,roozbeh at farsiweb.info
 Fedora Extras|MegaMek|A portable, network-enabled BattleTech engine|fitzsim at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|memchan|Memory-based channels for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercator|Terrain library for WorldForge client/server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mesa-libGLw|Xt and Motif widgets for OpenGL|ajackson at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 01:30:24 2006
From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma))
Date: Tue, 28 Nov 2006 20:30:24 -0500
Subject: owners owners.list,1.2031,1.2032
Message-ID: <200611290130.kAT1UOgx015661@cvs-int.fedora.redhat.com>

Author: salimma

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15644

Modified Files:
	owners.list 
Log Message:
Adding rlwrap to repository


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2031
retrieving revision 1.2032
diff -u -r1.2031 -r1.2032
--- owners.list	29 Nov 2006 01:04:31 -0000	1.2031
+++ owners.list	29 Nov 2006 01:29:54 -0000	1.2032
@@ -2100,6 +2100,7 @@
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|tamaster at pobox.com
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|rlwrap|Wrapper for GNU readline|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|rman|Converts man pages to various other formats|mpeters at mac.com|extras-qa at fedoraproject.org|jamatos at fc.up.pt
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rogue|The original roguelike game|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 01:33:12 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 28 Nov 2006 20:33:12 -0500
Subject: owners owners.list,1.2032,1.2033
Message-ID: <200611290133.kAT1XCwq015692@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15677

Modified Files:
	owners.list 
Log Message:
Added GraphicsMagick


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2032
retrieving revision 1.2033
diff -u -r1.2032 -r1.2033
--- owners.list	29 Nov 2006 01:29:54 -0000	1.2032
+++ owners.list	29 Nov 2006 01:32:42 -0000	1.2033
@@ -472,6 +472,7 @@
 Fedora Extras|fwfstab|A graphical file system table editor|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|GraphicsMagick|An ImageMagick fork, offering faster image generation and better quality|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 01:35:44 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 28 Nov 2006 20:35:44 -0500
Subject: rpms/GraphicsMagick/FC-5 GraphicsMagick.spec,1.1,1.2
Message-ID: <200611290135.kAT1Zi78015763@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15722/FC-5

Modified Files:
	GraphicsMagick.spec 
Log Message:
TypoFix


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-5/GraphicsMagick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick.spec	27 Nov 2006 13:37:41 -0000	1.1
+++ GraphicsMagick.spec	29 Nov 2006 01:35:14 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: An GraphicsMagick fork, offering faster image generation and better quality
+Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
 Release: 2%{?dist}



From fedora-extras-commits at redhat.com  Wed Nov 29 01:35:44 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 28 Nov 2006 20:35:44 -0500
Subject: rpms/GraphicsMagick/FC-6 GraphicsMagick.spec,1.1,1.2
Message-ID: <200611290135.kAT1ZiRU015766@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15722/FC-6

Modified Files:
	GraphicsMagick.spec 
Log Message:
TypoFix


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-6/GraphicsMagick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick.spec	27 Nov 2006 13:37:41 -0000	1.1
+++ GraphicsMagick.spec	29 Nov 2006 01:35:14 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: An GraphicsMagick fork, offering faster image generation and better quality
+Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
 Release: 2%{?dist}



From fedora-extras-commits at redhat.com  Wed Nov 29 01:35:49 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 28 Nov 2006 20:35:49 -0500
Subject: rpms/GraphicsMagick/devel GraphicsMagick.spec,1.1,1.2
Message-ID: <200611290135.kAT1Zne3015769@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15722/devel

Modified Files:
	GraphicsMagick.spec 
Log Message:
TypoFix


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick.spec	27 Nov 2006 13:37:41 -0000	1.1
+++ GraphicsMagick.spec	29 Nov 2006 01:35:19 -0000	1.2
@@ -1,4 +1,4 @@
-Summary: An GraphicsMagick fork, offering faster image generation and better quality
+Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
 Release: 2%{?dist}



From fedora-extras-commits at redhat.com  Wed Nov 29 06:15:58 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 29 Nov 2006 01:15:58 -0500
Subject: rpms/ruby-bdb/devel .cvsignore, 1.2, 1.3 ruby-bdb.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611290615.kAT6FwAp000735@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv708

Modified Files:
	.cvsignore ruby-bdb.spec sources 
Log Message:
Update package to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2006 22:34:53 -0000	1.2
+++ .cvsignore	29 Nov 2006 06:15:28 -0000	1.3
@@ -1 +1 @@
-bdb-0.5.9.tar.gz
+bdb-0.6.0.tar.gz


Index: ruby-bdb.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/ruby-bdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-bdb.spec	1 Nov 2006 22:34:53 -0000	1.1
+++ ruby-bdb.spec	29 Nov 2006 06:15:28 -0000	1.2
@@ -3,8 +3,8 @@
 %define        tarname bdb
 Summary:       Sleepycat Berkeley DB and DB XML
 Name:          ruby-bdb
-Version:       0.5.9
-Release:       6%{?dist}
+Version:       0.6.0
+Release:       1%{?dist}
 License:       Ruby License 
 Group:         Development/Libraries
 Source:        ftp://moulon.inra.fr/pub/ruby/%{tarname}-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %{ruby_sitearch}/bdb.so
 
 %changelog
+* Wed Nov 29 2006 Michael Rice  - 0.6.0-1
+- version update to 0.6.0
+
 * Fri Oct 20 2006 Michael Rice  - 0.5.9-6
 - Adjust to make 'test'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2006 22:34:53 -0000	1.2
+++ sources	29 Nov 2006 06:15:28 -0000	1.3
@@ -1 +1 @@
-b4bb9f2811e395f9c7e49c7fd9a977b0  bdb-0.5.9.tar.gz
+75ed9523bc695beb2bf2c9bea2676b87  bdb-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 06:25:56 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 29 Nov 2006 01:25:56 -0500
Subject: rpms/ruby-bdb/FC-5 .cvsignore, 1.2, 1.3 ruby-bdb.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611290625.kAT6PuwX000869@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv848

Modified Files:
	.cvsignore ruby-bdb.spec sources 
Log Message:
Update package to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2006 22:34:53 -0000	1.2
+++ .cvsignore	29 Nov 2006 06:25:26 -0000	1.3
@@ -1 +1 @@
-bdb-0.5.9.tar.gz
+bdb-0.6.0.tar.gz


Index: ruby-bdb.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-5/ruby-bdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-bdb.spec	1 Nov 2006 22:34:53 -0000	1.1
+++ ruby-bdb.spec	29 Nov 2006 06:25:26 -0000	1.2
@@ -3,8 +3,8 @@
 %define        tarname bdb
 Summary:       Sleepycat Berkeley DB and DB XML
 Name:          ruby-bdb
-Version:       0.5.9
-Release:       6%{?dist}
+Version:       0.6.0
+Release:       1%{?dist}
 License:       Ruby License 
 Group:         Development/Libraries
 Source:        ftp://moulon.inra.fr/pub/ruby/%{tarname}-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %{ruby_sitearch}/bdb.so
 
 %changelog
+* Wed Nov 29 2006 Michael Rice  - 0.6.0-1
+- version update to 0.6.0
+
 * Fri Oct 20 2006 Michael Rice  - 0.5.9-6
 - Adjust to make 'test'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2006 22:34:53 -0000	1.2
+++ sources	29 Nov 2006 06:25:26 -0000	1.3
@@ -1 +1 @@
-b4bb9f2811e395f9c7e49c7fd9a977b0  bdb-0.5.9.tar.gz
+75ed9523bc695beb2bf2c9bea2676b87  bdb-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 06:28:54 2006
From: fedora-extras-commits at redhat.com (Michael Rice (errr))
Date: Wed, 29 Nov 2006 01:28:54 -0500
Subject: rpms/ruby-bdb/FC-6 .cvsignore, 1.2, 1.3 ruby-bdb.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200611290628.kAT6SsYx000944@cvs-int.fedora.redhat.com>

Author: errr

Update of /cvs/extras/rpms/ruby-bdb/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv923

Modified Files:
	.cvsignore ruby-bdb.spec sources 
Log Message:
Update package to 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2006 22:34:53 -0000	1.2
+++ .cvsignore	29 Nov 2006 06:28:24 -0000	1.3
@@ -1 +1 @@
-bdb-0.5.9.tar.gz
+bdb-0.6.0.tar.gz


Index: ruby-bdb.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-6/ruby-bdb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-bdb.spec	1 Nov 2006 22:34:53 -0000	1.1
+++ ruby-bdb.spec	29 Nov 2006 06:28:24 -0000	1.2
@@ -3,8 +3,8 @@
 %define        tarname bdb
 Summary:       Sleepycat Berkeley DB and DB XML
 Name:          ruby-bdb
-Version:       0.5.9
-Release:       6%{?dist}
+Version:       0.6.0
+Release:       1%{?dist}
 License:       Ruby License 
 Group:         Development/Libraries
 Source:        ftp://moulon.inra.fr/pub/ruby/%{tarname}-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %{ruby_sitearch}/bdb.so
 
 %changelog
+* Wed Nov 29 2006 Michael Rice  - 0.6.0-1
+- version update to 0.6.0
+
 * Fri Oct 20 2006 Michael Rice  - 0.5.9-6
 - Adjust to make 'test'
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-bdb/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2006 22:34:53 -0000	1.2
+++ sources	29 Nov 2006 06:28:24 -0000	1.3
@@ -1 +1 @@
-b4bb9f2811e395f9c7e49c7fd9a977b0  bdb-0.5.9.tar.gz
+75ed9523bc695beb2bf2c9bea2676b87  bdb-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 06:33:35 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Wed, 29 Nov 2006 01:33:35 -0500
Subject: rpms/python-matplotlib/FC-6 matplotlib-0.87.7-matplotlibrc.patch,
	NONE, 
	1.1 matplotlib-0.87.7-tkagg-check.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 python-matplotlib.spec, 1.20, 1.21 sources, 1.13,
	1.14 matplotlib-0.87-matplotlibrc.patch, 1.1, NONE
Message-ID: <200611290633.kAT6XZdj001093@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/python-matplotlib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1047/FC-6

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Added Files:
	matplotlib-0.87.7-matplotlibrc.patch 
	matplotlib-0.87.7-tkagg-check.patch 
Removed Files:
	matplotlib-0.87-matplotlibrc.patch 
Log Message:
auto-import python-matplotlib-0.87.7-1.fc6 on branch FC-6 from python-matplotlib-0.87.7-1.fc6.src.rpm
update to 0.87.7 now that numpy has been updated

matplotlib-0.87.7-matplotlibrc.patch:

--- NEW FILE matplotlib-0.87.7-matplotlibrc.patch ---
--- matplotlib-0.87/setup.py.orig	2006-02-14 11:11:32.000000000 -0700
+++ matplotlib-0.87/setup.py	2006-02-27 15:19:28.000000000 -0700
@@ -258,8 +258,8 @@
 
 # packagers: set rc['numerix'] and rc['backend'] here to override the auto
 # defaults, eg
-#rc['numerix'] = numpy
-#rc['backend'] = GTKAgg
+rc['numerix'] = 'numpy'
+rc['backend'] = 'GTKAgg'
 if sys.platform=='win32':
     rc = dict(backend='TkAgg', numerix='Numeric')
 template = file('matplotlibrc.template').read()

matplotlib-0.87.7-tkagg-check.patch:

--- NEW FILE matplotlib-0.87.7-tkagg-check.patch ---
--- matplotlib-0.87.7/setup.py.fix	2006-11-20 19:49:56.000000000 -0900
+++ matplotlib-0.87.7/setup.py	2006-11-20 19:51:03.000000000 -0900
@@ -251,16 +251,9 @@
         print 'Tkinter present but import failed'
         BUILD_TKAGG = 0
     else:
-        try:
-            tk = Tkinter.Tk()
-            tk.withdraw()
-        except Tkinter.TclError:
-            print 'Tkinter present, but window failed to open'
-            BUILD_TKAGG = 0
-        else:
-            BUILD_AGG = 1
-            build_tkagg(ext_modules, packages, NUMERIX)
-            rc['backend'] = 'TkAgg'
+        BUILD_AGG = 1
+        build_tkagg(ext_modules, packages, NUMERIX)
+        rc['backend'] = 'TkAgg'
 
 if BUILD_WXAGG:
     try:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Oct 2006 17:32:24 -0000	1.13
+++ .cvsignore	29 Nov 2006 06:33:05 -0000	1.14
@@ -1 +1 @@
-matplotlib-0.87.6.tar.gz
+matplotlib-0.87.7.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-6/python-matplotlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-matplotlib.spec	6 Oct 2006 17:32:24 -0000	1.20
+++ python-matplotlib.spec	29 Nov 2006 06:33:05 -0000	1.21
@@ -1,7 +1,7 @@
 %{!?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.6
+Version:        0.87.7
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -9,7 +9,8 @@
 License:        Python Software Foundation License 
 URL:            http://sourceforge.net/projects/matplotlib
 Source0:        http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
-Patch0:         matplotlib-0.87-matplotlibrc.patch
+Patch0:         matplotlib-0.87.7-matplotlibrc.patch
+Patch1:         matplotlib-0.87.7-tkagg-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
@@ -38,7 +39,8 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
-%patch -p1 -b .matplotlibrc
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b setup.py 
 chmod -x images/*.svg
 
 %build
@@ -71,6 +73,11 @@
 
 
 %changelog
+* Tue Nov  21 2006 Orion Poplawski  0.87.7-1
+- Update to 0.87.7 and fix up the defaults to use numpy
+- Force build of tkagg backend without X server
+- Use src.rpm from Jef Spaleta, closes bug 216578
+
 * Fri Oct  6 2006 Orion Poplawski  0.87.6-1
 - Update to 0.87.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Oct 2006 17:32:24 -0000	1.13
+++ sources	29 Nov 2006 06:33:05 -0000	1.14
@@ -1 +1 @@
-30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz
+cca3d3a644c1a84d6dcf4af8a9856b7b  matplotlib-0.87.7.tar.gz


--- matplotlib-0.87-matplotlibrc.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 06:33:34 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Wed, 29 Nov 2006 01:33:34 -0500
Subject: rpms/python-matplotlib import.log,1.2,1.3
Message-ID: <200611290633.kAT6XYJm001088@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/python-matplotlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1047

Modified Files:
	import.log 
Log Message:
auto-import python-matplotlib-0.87.7-1.fc6 on branch FC-6 from python-matplotlib-0.87.7-1.fc6.src.rpm
update to 0.87.7 now that numpy has been updated


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	30 Jun 2005 21:40:06 -0000	1.2
+++ import.log	29 Nov 2006 06:33:04 -0000	1.3
@@ -1 +1,2 @@
 python-matplotlib-0_82-2:HEAD:python-matplotlib-0.82-2.src.rpm:1120167602
+python-matplotlib-0_87_7-1_fc6:FC-6:python-matplotlib-0.87.7-1.fc6.src.rpm:1164782110



From fedora-extras-commits at redhat.com  Wed Nov 29 08:16:26 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:16:26 -0500
Subject: fedora-security/audit fc5,1.398,1.399 fc6,1.150,1.151
Message-ID: <200611290816.kAT8GQUm007767@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7750/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6060



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- fc5	24 Nov 2006 09:36:42 -0000	1.398
+++ fc5	29 Nov 2006 08:16:26 -0000	1.399
@@ -3,7 +3,7 @@
 
 ** are items that need attention
 
-CVE-2006-6060 ** kernel
+CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
 CVE-2006-6058 ** kernel
 CVE-2006-6057 ** kernel
 CVE-2006-6056 ** kernel


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- fc6	24 Nov 2006 09:36:42 -0000	1.150
+++ fc6	29 Nov 2006 08:16:26 -0000	1.151
@@ -3,7 +3,7 @@
 
 ** are items that need attention
 
-CVE-2006-6060 ** kernel
+CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
 CVE-2006-6058 ** kernel
 CVE-2006-6057 ** kernel
 CVE-2006-6056 ** kernel



From fedora-extras-commits at redhat.com  Wed Nov 29 08:19:47 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:19:47 -0500
Subject: fedora-security/audit fc5,1.399,1.400 fc6,1.151,1.152
Message-ID: <200611290819.kAT8JlLF007849@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7832/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6058



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- fc5	29 Nov 2006 08:16:26 -0000	1.399
+++ fc5	29 Nov 2006 08:19:47 -0000	1.400
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
-CVE-2006-6058 ** kernel
+CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 ** kernel
 CVE-2006-6056 ** kernel
 CVE-2006-6054 ** kernel


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- fc6	29 Nov 2006 08:16:26 -0000	1.151
+++ fc6	29 Nov 2006 08:19:47 -0000	1.152
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
-CVE-2006-6058 ** kernel
+CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 ** kernel
 CVE-2006-6056 ** kernel
 CVE-2006-6054 ** kernel



From fedora-extras-commits at redhat.com  Wed Nov 29 08:38:39 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:38:39 -0500
Subject: fedora-security/audit fc5,1.400,1.401 fc6,1.152,1.153
Message-ID: <200611290838.kAT8cdJ4007910@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7891/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6057



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- fc5	29 Nov 2006 08:19:47 -0000	1.400
+++ fc5	29 Nov 2006 08:38:39 -0000	1.401
@@ -5,7 +5,7 @@
 
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
 CVE-2006-6058 VULNERABLE (kernel, fixed **)
-CVE-2006-6057 ** kernel
+CVE-2006-6057 ignore (kernel, fixed **) separate modules
 CVE-2006-6056 ** kernel
 CVE-2006-6054 ** kernel
 CVE-2006-6053 ** kernel





From fedora-extras-commits at redhat.com  Wed Nov 29 08:42:31 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 29 Nov 2006 03:42:31 -0500
Subject: fedora-security/audit fc5,1.401,1.402
Message-ID: <200611290842.kAT8gVVE007953@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7938

Modified Files:
	fc5 
Log Message:
test commit



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- fc5	29 Nov 2006 08:38:39 -0000	1.401
+++ fc5	29 Nov 2006 08:42:30 -0000	1.402
@@ -1,6 +1,7 @@
 Up to date CVE as of CVE email 20061123
 Up to date FC5 as of 20061123
 
+
 ** are items that need attention
 
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support



From fedora-extras-commits at redhat.com  Wed Nov 29 08:56:42 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:56:42 -0500
Subject: fedora-security/audit fc5,1.402,1.403 fc6,1.153,1.154
Message-ID: <200611290856.kAT8ugia008007@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7990/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6054



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- fc5	29 Nov 2006 08:42:30 -0000	1.402
+++ fc5	29 Nov 2006 08:56:42 -0000	1.403
@@ -8,7 +8,7 @@
 CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 ignore (kernel, fixed **) separate modules
 CVE-2006-6056 ** kernel
-CVE-2006-6054 ** kernel
+CVE-2006-6054 VULNERABLE (kernel, fixed **)
 CVE-2006-6053 ** kernel
 CVE-2006-5989 ** mod_auth_kerb
 CVE-2006-5973 ** dovecot


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- fc6	29 Nov 2006 08:38:39 -0000	1.153
+++ fc6	29 Nov 2006 08:56:42 -0000	1.154
@@ -7,7 +7,7 @@
 CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 VULNERABLE (kernel, fixed **)
 CVE-2006-6056 ** kernel
-CVE-2006-6054 ** kernel
+CVE-2006-6054 VULNERABLE (kernel, fixed **)
 CVE-2006-6053 ** kernel
 CVE-2006-5989 ** mod_auth_kerb
 CVE-2006-5973 ** dovecot



From fedora-extras-commits at redhat.com  Wed Nov 29 08:58:59 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 29 Nov 2006 03:58:59 -0500
Subject: fedora-security/audit fc5,1.403,1.404 fc6,1.154,1.155
Message-ID: <200611290859.kAT8wxu3008047@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8030/audit

Modified Files:
	fc5 fc6 
Log Message:
Update CVE-2006-6053



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- fc5	29 Nov 2006 08:56:42 -0000	1.403
+++ fc5	29 Nov 2006 08:58:59 -0000	1.404
@@ -9,7 +9,7 @@
 CVE-2006-6057 ignore (kernel, fixed **) separate modules
 CVE-2006-6056 ** kernel
 CVE-2006-6054 VULNERABLE (kernel, fixed **)
-CVE-2006-6053 ** kernel
+CVE-2006-6053 backport (kernel) [since FEDORA-2006-1221]
 CVE-2006-5989 ** mod_auth_kerb
 CVE-2006-5973 ** dovecot
 CVE-2006-5925 backport (elinks) #215734 [since FEDORA-2006-1277]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- fc6	29 Nov 2006 08:56:42 -0000	1.154
+++ fc6	29 Nov 2006 08:58:59 -0000	1.155
@@ -8,7 +8,7 @@
 CVE-2006-6057 VULNERABLE (kernel, fixed **)
 CVE-2006-6056 ** kernel
 CVE-2006-6054 VULNERABLE (kernel, fixed **)
-CVE-2006-6053 ** kernel
+CVE-2006-6053 backport (kernel) [since FEDORA-2006-1223]
 CVE-2006-5989 ** mod_auth_kerb
 CVE-2006-5973 ** dovecot
 CVE-2006-5925 backport (elinks) [since FEDORA-2006-1278] but was never vulneable as didn't have smbclient support



From fedora-extras-commits at redhat.com  Wed Nov 29 09:21:15 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:21:15 -0500
Subject: rpms/OpenSceneGraph/FC-5 OpenSceneGraph-1.2.diff,NONE,1.1
Message-ID: <200611290921.kAT9LFdg011649@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11641

Added Files:
	OpenSceneGraph-1.2.diff 
Log Message:
New (from devel)

OpenSceneGraph-1.2.diff:

--- NEW FILE OpenSceneGraph-1.2.diff ---
? diff
Index: OpenSceneGraph/Make/instexamplesrc
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/instexamplesrc,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/Make/instexamplesrc	4 Oct 2006 08:01:33 -0000	1.1.1.1
+++ OpenSceneGraph/Make/instexamplesrc	4 Oct 2006 10:49:35 -0000	1.1.1.1.2.1
@@ -32,7 +32,7 @@
             cd $TOPDIR/examples/$d
             [ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
             echo "         installing $d"
-            for f in `$MAKE __instfiles | grep -v $MAKE`
+            for f in `$MAKE __instfiles | grep -v $MAKE | grep -v Entering | grep -v Leaving`
            do
                 src=`echo $f | cut -f1 -d"="`
                 dst=`echo $f | cut -f2 -d"="`
Index: OpenSceneGraph/Make/libdefs
===================================================================
RCS file: OpenSceneGraph/Make/libdefs
diff -N OpenSceneGraph/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ OpenSceneGraph/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(VERSION_MAJOR)
+endif
+
Index: OpenSceneGraph/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- OpenSceneGraph/Make/makedefs	4 Oct 2006 10:12:01 -0000	1.1.1.3
+++ OpenSceneGraph/Make/makedefs	4 Oct 2006 11:02:09 -0000	1.1.1.2.2.2
@@ -354,14 +354,6 @@
       ARCHINST        = 
     endif
   else
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.0
-endif
-
-#    LDFLAGS         += `getconf LFS_LDFLAGS`
-#    DEF             += `getconf LFS_CFLAGS`
-
     LIBS            = -lstdc++
 #    DEF             += -W -Wall -fPIC -pipe -Woverloaded-virtual
     DEF             += -W -Wall -fPIC -pipe
Index: OpenSceneGraph/include/osg/Shader
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/include/osg/Shader,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -u -r1.1.1.2 -r1.1.1.2.2.1
--- OpenSceneGraph/include/osg/Shader	4 Oct 2006 08:07:18 -0000	1.1.1.2
+++ OpenSceneGraph/include/osg/Shader	4 Oct 2006 10:49:36 -0000	1.1.1.2.2.1
@@ -39,6 +39,8 @@
   * configuration.
   */
 
+class Program;
+
 class OSG_EXPORT Shader : public osg::Object
 {
     public:
Index: OpenSceneGraph/src/osgPlugins/gif/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	4 Oct 2006 08:01:33 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/gif/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -5,15 +5,7 @@
 	ReaderWriterGIF.cpp\
 
 
-ifeq ($(OS),HP-UX)
 INC   += $(GIF_INCLUDE)
-else
-INC   += -I/usr/local/include\
-	 -I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-endif
-
 
 LIBS  += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS)
 
Index: OpenSceneGraph/src/osgPlugins/png/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/png/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/png/GNUmakefile	4 Oct 2006 08:01:34 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/png/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -5,14 +5,7 @@
         ReaderWriterPNG.cpp\
 
 LIBS  += $(OSG_LIBS) $(PNG_LIBS) $(OTHER_LIBS)
-ifneq ($(OS),HP-UX)
-INC  += -I/usr/local/include\
-	-I/usr/freeware/include\
-
-LINKARGS += -L/usr/freeware/lib$(ARCH)
-else
 INC += $(PNG_INCLUDE)
-endif
 
 TARGET_BASENAME = png
 include $(TOPDIR)/Make/cygwin_plugin_def
Index: OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile
===================================================================
RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	4 Oct 2006 08:01:34 -0000	1.1.1.1
+++ OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile	4 Oct 2006 10:49:36 -0000	1.1.1.1.2.1
@@ -6,12 +6,7 @@
 
 LIBS  += $(OSG_LIBS) $(TIFF_LIB) $(OTHER_LIBS)
 
-ifeq ($(OS),HP-UX)
 INC     += $(TIFF_INCLUDE)
-else
-INC     += -I/usr/local/include
-LDFLAGS += -L/usr/local/lib
-endif
 
 TARGET_BASENAME = tiff
 include $(TOPDIR)/Make/cygwin_plugin_def
Index: OpenThreads/Make/libdefs
===================================================================
RCS file: OpenThreads/Make/libdefs
diff -N OpenThreads/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ OpenThreads/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,3 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
Index: OpenThreads/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- OpenThreads/Make/makedefs	4 Oct 2006 10:12:04 -0000	1.1.1.3
+++ OpenThreads/Make/makedefs	4 Oct 2006 11:03:13 -0000	1.1.1.2.2.2
@@ -227,12 +227,6 @@
     ifeq (x$(CXX),x)
       CXX               = g++
     endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
-    ###DEF               += -fPIC
     OPTF              = -O2
     DBGF              = -ggdb -gstabs
     ifeq ($(SYSARCH),x86_64)
Index: OpenThreads/pthread_src/PThread.c++
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/pthread_src/PThread.c++,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.2 -r1.1.1.1.2.2
--- OpenThreads/pthread_src/PThread.c++	4 Oct 2006 10:12:04 -0000	1.1.1.2
+++ OpenThreads/pthread_src/PThread.c++	4 Oct 2006 11:03:13 -0000	1.1.1.1.2.2
@@ -572,27 +572,18 @@
 
     PThreadPrivateData *pd = static_cast (_prvData);
 
-    size_t defaultStackSize;
+    size_t defaultStackSize = 0;
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     if(defaultStackSize < pd->stackSize) {
 
 	pthread_attr_setstacksize( &thread_attr, pd->stackSize);
-	if(status != 0) {
-	    return status;
-	}
     }
 
     //-------------------------------------------------------------------------
     // Now get what we actually have...
     //
     pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
-    if(status != 0) {
-	return status;
-    }
 
     pd->stackSize = defaultStackSize;
 
Index: OpenThreads/pthread_src/PThreadPrivateData.h
===================================================================
RCS file: /var/cvs/local/OSG/OpenThreads/pthread_src/PThreadPrivateData.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.2 -r1.1.1.1.2.2
--- OpenThreads/pthread_src/PThreadPrivateData.h	4 Oct 2006 10:12:04 -0000	1.1.1.2
+++ OpenThreads/pthread_src/PThreadPrivateData.h	4 Oct 2006 11:03:14 -0000	1.1.1.1.2.2
@@ -43,7 +43,7 @@
 
 private:
 
-    PThreadPrivateData() {};
+    PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {};
 
     virtual ~PThreadPrivateData() {};
 
Index: Producer/Make/libdefs
===================================================================
RCS file: Producer/Make/libdefs
diff -N Producer/Make/libdefs
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Producer/Make/libdefs	4 Oct 2006 10:49:36 -0000	1.1.2.1
@@ -0,0 +1,4 @@
+ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
+endif
+
Index: Producer/Make/makedefs
===================================================================
RCS file: /var/cvs/local/OSG/Producer/Make/makedefs,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.3 -r1.1.1.2.2.2
--- Producer/Make/makedefs	4 Oct 2006 10:12:05 -0000	1.1.1.3
+++ Producer/Make/makedefs	4 Oct 2006 11:03:14 -0000	1.1.1.2.2.2
@@ -248,11 +248,6 @@
     ifeq (x$(CXX),x)
       CXX               = g++
     endif
-
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
-    LDFLAGS         += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-endif
-
     DEF               += -fPIC -pthread
     OPTF              = -O2
     DBGF              = -ggdb -gstabs
Index: Producer/include/Producer/Keyboard
===================================================================
RCS file: /var/cvs/local/OSG/Producer/include/Producer/Keyboard,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Producer/include/Producer/Keyboard	4 Oct 2006 08:01:36 -0000	1.1.1.1
+++ Producer/include/Producer/Keyboard	4 Oct 2006 10:49:37 -0000	1.1.1.1.2.1
@@ -539,6 +539,7 @@
         KeyboardKey    _key;
 };
 
+class KeyboardMouseImplementation;
 
 class PR_EXPORT Keyboard : public Producer::Referenced
 {
Index: debian/Doxyfile-openscenegraph
===================================================================
RCS file: debian/Doxyfile-openscenegraph
diff -N debian/Doxyfile-openscenegraph
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-openscenegraph	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = OpenSceneGraph
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = OpenSceneGraph/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = OpenSceneGraph/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/Doxyfile-openthreads
===================================================================
RCS file: debian/Doxyfile-openthreads
diff -N debian/Doxyfile-openthreads
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-openthreads	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = OpenThreads
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = OpenThreads/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = OpenThreads/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/Doxyfile-producer
===================================================================
RCS file: debian/Doxyfile-producer
diff -N debian/Doxyfile-producer
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/Doxyfile-producer	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = Producer
+PROJECT_NUMBER         = 
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                = 
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = YES
+WARNINGS               = NO
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = Producer/include
+FILE_PATTERNS          = *
+RECURSIVE              = YES
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = Producer/html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
Index: debian/osgexamples.1
===================================================================
RCS file: debian/osgexamples.1
diff -N debian/osgexamples.1
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ debian/osgexamples.1	4 Oct 2006 10:55:23 -0000	1.1.2.1
@@ -0,0 +1,28 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH OpenSceneGraph 1 "2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp     insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+OpenSceneGraph examples \- set of examples program
+.SH SYNOPSIS
+.B program
+.RI --help
+.SH DESCRIPTION
+Use --help to figure out what the example does.
+See http://www.openscenegraph.org/ for more information.
+.SH AUTHOR
+This manual page was written by Loic Dachary 
+for the Debian project (but may be used by others).



From fedora-extras-commits at redhat.com  Wed Nov 29 09:22:11 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:22:11 -0500
Subject: rpms/OpenSceneGraph/FC-6 OpenSceneGraph-1.1.diff,1.1,NONE
Message-ID: <200611290922.kAT9MBXN011673@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11668

Removed Files:
	OpenSceneGraph-1.1.diff 
Log Message:
Remove (unused).


--- OpenSceneGraph-1.1.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 09:22:47 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:22:47 -0500
Subject: rpms/OpenSceneGraph/devel OpenSceneGraph-1.1.diff,1.1,NONE
Message-ID: <200611290922.kAT9MlYY011699@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11694

Removed Files:
	OpenSceneGraph-1.1.diff 
Log Message:
Remove (unused).


--- OpenSceneGraph-1.1.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 09:24:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:24:45 -0500
Subject: rpms/OpenSceneGraph/FC-5 .cvsignore, 1.5, 1.6 OpenSceneGraph.spec, 
	1.13, 1.14 sources, 1.5, 1.6
Message-ID: <200611290924.kAT9OjbP011739@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11720

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Log Message:
Sync with devel (PR 197941).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2006 05:57:55 -0000	1.5
+++ .cvsignore	29 Nov 2006 09:24:15 -0000	1.6
@@ -1 +1 @@
-OSG_OP_OT-1.1.zip
+OSG_OP_OT-1.2.zip


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/OpenSceneGraph.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- OpenSceneGraph.spec	27 Aug 2006 05:57:55 -0000	1.13
+++ OpenSceneGraph.spec	29 Nov 2006 09:24:15 -0000	1.14
@@ -5,7 +5,7 @@
 #
 
 %define apivers 1.0
-%define srcvers 1.1
+%define srcvers 1.2
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
@@ -21,7 +21,6 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	flex bison
 BuildRequires:  libGL-devel
 BuildRequires: 	libGLU-devel
 BuildRequires:	libXmu-devel
@@ -48,7 +47,7 @@
 
 %prep
 %setup -q -n OSG_OP_OT-%{srcvers}
-%patch0 -p1
+%patch0 -p0
 
 # backup, we hack this file later
 cp OpenSceneGraph/Make/dependencies \
@@ -237,7 +236,9 @@
 %{_bindir}/osgdepthpartition
 %{_bindir}/osgdepthshadow
 %{_bindir}/osgdistortion
+%if "%{version}" < "1.2"
 %{_bindir}/osgfbo
+%endif
 %{_bindir}/osgforest
 %{_bindir}/osgfxbrowser
 %{_bindir}/osggeodemo
@@ -261,7 +262,9 @@
 %{_bindir}/osgparametric
 %{_bindir}/osgparticle
 %{_bindir}/osgparticleeffects
+%if "%{version}" < "1.2"
 %{_bindir}/osgpbuffer
+%endif
 %{_bindir}/osgpick
 %{_bindir}/osgplanets
 %{_bindir}/osgpoints
@@ -392,9 +395,20 @@
 %{_includedir}/Producer
 
 %changelog
+* Wed Oct 05 2006 Ralf Cors??pius  - 1.2-1
+- Upstream update.
+- Remove BR: flex bison.
+- Drop osgfbo and osgpbuffer.
+
+* Tue Sep 05 2006 Ralf Cors??pius  - 1.1-2
+- Mass rebuild.
+
 * Thu Aug 24 2006 Ralf Cors??pius  - 1.1-1
 - Upstream update.
 
+* Sat Jul 08 2006 Ralf Cors??pius  - 1.0-5
+- Rebuilt to with gcc-4.1.1-6.
+
 * Tue Jun 07 2006 Ralf Cors??pius  - 1.0-4
 - Try to avoid adding SONAMEs on plugins and applications.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2006 05:57:55 -0000	1.5
+++ sources	29 Nov 2006 09:24:15 -0000	1.6
@@ -1 +1 @@
-c140e0f53f577af6e807108dd1a8f65f  OSG_OP_OT-1.1.zip
+e08e0ef1f250dfc17122926ef00b1559  OSG_OP_OT-1.2.zip



From fedora-extras-commits at redhat.com  Wed Nov 29 09:25:45 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?Ralf_Cors=C3=A9pius?= (corsepiu))
Date: Wed, 29 Nov 2006 04:25:45 -0500
Subject: rpms/OpenSceneGraph/FC-5 OpenSceneGraph-1.1.diff,1.1,NONE
Message-ID: <200611290925.kAT9Pjwv011794@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11789

Removed Files:
	OpenSceneGraph-1.1.diff 
Log Message:
Remove (unused).


--- OpenSceneGraph-1.1.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 09:53:48 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:53:48 -0500
Subject: rpms/urlgfe - New directory
Message-ID: <200611290953.kAT9rmd9011938@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11934/urlgfe

Log Message:
Directory /cvs/extras/rpms/urlgfe added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 09:53:53 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:53:53 -0500
Subject: rpms/urlgfe/devel - New directory
Message-ID: <200611290953.kAT9rreD011951@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11934/urlgfe/devel

Log Message:
Directory /cvs/extras/rpms/urlgfe/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Nov 29 09:54:14 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:54:14 -0500
Subject: rpms/urlgfe/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611290954.kAT9sEbH011996@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11975/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module urlgfe


--- 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 Nov 29 09:54:09 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:54:09 -0500
Subject: rpms/urlgfe Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611290954.kAT9s9Pl011981@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11975

Added Files:
	Makefile import.log 
Log Message:
Setup of module urlgfe


--- NEW FILE Makefile ---
# Top level Makefile for module urlgfe
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  Wed Nov 29 09:55:15 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:55:15 -0500
Subject: rpms/urlgfe import.log,1.1,1.2
Message-ID: <200611290955.kAT9tFag012065@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12035

Modified Files:
	import.log 
Log Message:
auto-import urlgfe-1.0-1 on branch devel from urlgfe-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/urlgfe/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Nov 2006 09:54:09 -0000	1.1
+++ import.log	29 Nov 2006 09:54:45 -0000	1.2
@@ -0,0 +1 @@
+urlgfe-1_0-1:HEAD:urlgfe-1.0-1.src.rpm:1164794213



From fedora-extras-commits at redhat.com  Wed Nov 29 09:55:15 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 04:55:15 -0500
Subject: rpms/urlgfe/devel urlgfe.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611290955.kAT9tF30012069@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/urlgfe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12035/devel

Modified Files:
	.cvsignore sources 
Added Files:
	urlgfe.spec 
Log Message:
auto-import urlgfe-1.0-1 on branch devel from urlgfe-1.0-1.src.rpm


--- NEW FILE urlgfe.spec ---
Name:		urlgfe
Version:	1.0
Release:	1%{?dist}
Summary:	Urlgfe download manager

Group:		Applications/Internet
License:	LGPL
URL:		http://urlget.sourceforge.net/
Source0:	http://superb-west.dl.sourceforge.net/sourceforge/urlget/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	curl-devel
BuildRequires:	expat-devel
BuildRequires:	gtk2-devel
BuildRequires:	krb5-devel
BuildRequires:	pcre-devel
BuildRequires:	desktop-file-utils

%description
Urlgfe is a download manager that uses GTK+2 ,libcurl, and pcre.

It allows you to classify URLs before downloading them, and 
allows you to import URLs from HTML files. Every category has 
an independent configuration that can be inherited by 
each download in that category.

%prep
%setup -q

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"

desktop-file-install \
	--delete-original \
	--vendor fedora \
	--remove-category Application \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

for f in [A-Z]* ; do \
	%{__sed} -i.encoding -e 's|\r||g' $f
done
	
%{find_lang} %{name}

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS
%doc README

%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}*.png
%{_datadir}/applications/fedora-%{name}.desktop

%changelog
* Wed Nov 29 2006 Mamoru Tasaka  - 1.0-1
- Initial packaging to import to Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/urlgfe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Nov 2006 09:54:14 -0000	1.1
+++ .cvsignore	29 Nov 2006 09:54:45 -0000	1.2
@@ -0,0 +1 @@
+urlgfe-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/urlgfe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Nov 2006 09:54:14 -0000	1.1
+++ sources	29 Nov 2006 09:54:45 -0000	1.2
@@ -0,0 +1 @@
+9a5284665e09cac3397c3ea5d7baf6d8  urlgfe-1.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 10:09:24 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 05:09:24 -0500
Subject: owners owners.list,1.2033,1.2034
Message-ID: <200611291009.kATA9OQK015314@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15299

Modified Files:
	owners.list 
Log Message:
add urlgfe


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2033
retrieving revision 1.2034
diff -u -r1.2033 -r1.2034
--- owners.list	29 Nov 2006 01:32:42 -0000	1.2033
+++ owners.list	29 Nov 2006 10:08:54 -0000	1.2034
@@ -2396,6 +2396,7 @@
 Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|urlgfe|Urlgfe download manager|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
 Fedora Extras|ushare|UPnP (TM) A/V Media Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 10:16:10 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 29 Nov 2006 05:16:10 -0500
Subject: rpms/k3d/FC-6 .cvsignore,1.7,1.8 k3d.spec,1.9,1.10 sources,1.7,1.8
Message-ID: <200611291016.kATAGAtL015387@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15363

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Oct 2006 09:11:12 -0000	1.7
+++ .cvsignore	29 Nov 2006 10:15:40 -0000	1.8
@@ -1 +1 @@
-k3d-0.6.3.1-src.tar.bz2
+k3d-0.6.4.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-6/k3d.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- k3d.spec	10 Oct 2006 09:11:12 -0000	1.9
+++ k3d.spec	29 Nov 2006 10:15:40 -0000	1.10
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.3.1
+Version:        0.6.4.0
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -152,7 +152,10 @@
 
 
 %changelog
-* Tue Oct 10 2006 Denis Leroy  - 0.6.3.1
+* Tue Nov 28 2006 Denis Leroy  - 0.6.4.0-1
+- Update to 0.6.4.0
+
+* Tue Oct 10 2006 Denis Leroy  - 0.6.3.1-1
 - Update to 0.6.3.1
 
 * Mon Oct  9 2006 Denis Leroy  - 0.6.3.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Oct 2006 09:11:12 -0000	1.7
+++ sources	29 Nov 2006 10:15:40 -0000	1.8
@@ -1 +1 @@
-7f5b53711a02779e3f9c036bcc21483a  k3d-0.6.3.1-src.tar.bz2
+3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 10:19:26 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Wed, 29 Nov 2006 05:19:26 -0500
Subject: rpms/wbxml2/FC-5 wbxml2.spec,1.8,1.9
Message-ID: <200611291019.kATAJQoG015594@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15524/FC-5

Modified Files:
	wbxml2.spec 
Log Message:
wbxml-0.9.2-5: Changed the Summarys and descriptions.


Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-5/wbxml2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wbxml2.spec	28 Nov 2006 15:10:10 -0000	1.8
+++ wbxml2.spec	29 Nov 2006 10:18:56 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        4%{?dist}
-Summary:        WBXML parser and compiler library
+Release:        5%{?dist}
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -28,10 +28,11 @@
 
 %package devel
 Group:         Development/Libraries
-Summary:       Development files of WBXML
+Summary:       Development files of %{name}
 Requires:      %{name} = %{version}-%{release}
 %description devel
-%{summary}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
+- Changed the Summarys and descriptions.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
 - Added BR: popt zlib-devel
 - Improved changelog.



From fedora-extras-commits at redhat.com  Wed Nov 29 10:19:26 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Wed, 29 Nov 2006 05:19:26 -0500
Subject: rpms/wbxml2/FC-6 wbxml2.spec,1.9,1.10
Message-ID: <200611291019.kATAJQlr015597@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15524/FC-6

Modified Files:
	wbxml2.spec 
Log Message:
wbxml-0.9.2-5: Changed the Summarys and descriptions.


Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-6/wbxml2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wbxml2.spec	28 Nov 2006 13:09:36 -0000	1.9
+++ wbxml2.spec	29 Nov 2006 10:18:56 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        4%{?dist}
-Summary:        WBXML parser and compiler library
+Release:        5%{?dist}
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -28,10 +28,11 @@
 
 %package devel
 Group:         Development/Libraries
-Summary:       Development files of WBXML
+Summary:       Development files of %{name}
 Requires:      %{name} = %{version}-%{release}
 %description devel
-%{summary}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
+- Changed the Summarys and descriptions.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
 - Added BR: popt zlib-devel
 - Improved changelog.



From fedora-extras-commits at redhat.com  Wed Nov 29 10:19:31 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Wed, 29 Nov 2006 05:19:31 -0500
Subject: rpms/wbxml2/devel wbxml2.spec,1.9,1.10
Message-ID: <200611291019.kATAJVYm015603@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15524/devel

Modified Files:
	wbxml2.spec 
Log Message:
wbxml-0.9.2-5: Changed the Summarys and descriptions.


Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/devel/wbxml2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wbxml2.spec	28 Nov 2006 13:09:36 -0000	1.9
+++ wbxml2.spec	29 Nov 2006 10:19:01 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        4%{?dist}
-Summary:        WBXML parser and compiler library
+Release:        5%{?dist}
+Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
 License:        LGPL
@@ -28,10 +28,11 @@
 
 %package devel
 Group:         Development/Libraries
-Summary:       Development files of WBXML
+Summary:       Development files of %{name}
 Requires:      %{name} = %{version}-%{release}
 %description devel
-%{summary}.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %prep
 %setup -q
@@ -86,6 +87,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
+- Changed the Summarys and descriptions.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-4
 - Added BR: popt zlib-devel
 - Improved changelog.



From fedora-extras-commits at redhat.com  Wed Nov 29 10:25:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 05:25:41 -0500
Subject: rpms/frozen-bubble/FC-5 .cvsignore, 1.3, 1.4 frozen-bubble.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200611291025.kATAPfqI015765@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711/FC-5

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
+++ .cvsignore	29 Nov 2006 10:25:11 -0000	1.4
@@ -1 +1 @@
-frozen-bubble-2.0.0.tar.bz2
+frozen-bubble-2.1.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/frozen-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frozen-bubble.spec	14 Nov 2006 12:18:36 -0000	1.3
+++ frozen-bubble.spec	29 Nov 2006 10:25:11 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  2.1.0-1
+- Update to 2.1.0 (fixes #216248).
+
 * Fri Oct 27 2006 Matthias Saou  2.0.0-1
 - Update to 2.0.0.
 - Add new SDL_Pango dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:18:36 -0000	1.3
+++ sources	29 Nov 2006 10:25:11 -0000	1.4
@@ -1 +1 @@
-9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2
+f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 10:25:46 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 05:25:46 -0500
Subject: rpms/frozen-bubble/devel .cvsignore, 1.3, 1.4 frozen-bubble.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200611291025.kATAPkaY015775@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711/devel

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 11:42:43 -0000	1.3
+++ .cvsignore	29 Nov 2006 10:25:16 -0000	1.4
@@ -1 +1 @@
-frozen-bubble-2.0.0.tar.bz2
+frozen-bubble-2.1.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frozen-bubble.spec	14 Nov 2006 11:42:43 -0000	1.3
+++ frozen-bubble.spec	29 Nov 2006 10:25:16 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  2.1.0-1
+- Update to 2.1.0 (fixes #216248).
+
 * Fri Oct 27 2006 Matthias Saou  2.0.0-1
 - Update to 2.0.0.
 - Add new SDL_Pango dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 11:42:43 -0000	1.3
+++ sources	29 Nov 2006 10:25:16 -0000	1.4
@@ -1 +1 @@
-9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2
+f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 10:25:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 05:25:41 -0500
Subject: rpms/frozen-bubble/FC-6 .cvsignore, 1.3, 1.4 frozen-bubble.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200611291025.kATAPfml015770@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711/FC-6

Modified Files:
	.cvsignore frozen-bubble.spec sources 
Log Message:
Update to 2.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Nov 2006 12:18:36 -0000	1.3
+++ .cvsignore	29 Nov 2006 10:25:11 -0000	1.4
@@ -1 +1 @@
-frozen-bubble-2.0.0.tar.bz2
+frozen-bubble-2.1.0.tar.bz2


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/frozen-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- frozen-bubble.spec	14 Nov 2006 12:18:37 -0000	1.3
+++ frozen-bubble.spec	29 Nov 2006 10:25:11 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:        Frozen Bubble arcade game
 Name:           frozen-bubble
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 License:        GPL
 Group:          Amusements/Games
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  2.1.0-1
+- Update to 2.1.0 (fixes #216248).
+
 * Fri Oct 27 2006 Matthias Saou  2.0.0-1
 - Update to 2.0.0.
 - Add new SDL_Pango dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Nov 2006 12:18:37 -0000	1.3
+++ sources	29 Nov 2006 10:25:11 -0000	1.4
@@ -1 +1 @@
-9fdd84f56e5221e6c58c12eab72459d9  frozen-bubble-2.0.0.tar.bz2
+f5eb984897e1ccd52a0d8820d8359861  frozen-bubble-2.1.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 10:54:28 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Wed, 29 Nov 2006 05:54:28 -0500
Subject: owners owners.list,1.2034,1.2035
Message-ID: <200611291054.kATAsSdr016211@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16185

Modified Files:
	owners.list 
Log Message:
fix python-matplotlib entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2034
retrieving revision 1.2035
diff -u -r1.2034 -r1.2035
--- owners.list	29 Nov 2006 10:08:54 -0000	1.2034
+++ owners.list	29 Nov 2006 10:53:58 -0000	1.2035
@@ -1989,7 +1989,7 @@
 Fedora Extras|python-logilab-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-lxml|ElementTree-like Python bindings for libxml2 and libxslt|shahms at shahms.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|jspaleta at gmail.com|
+Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.com|extras-qa at fedoraproject.org|jspaleta at gmail.com
 Fedora Extras|python-mechanize|Stateful programmatic web browsing|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-musicbrainz2|Library which provides access to the MusicBrainz Database|jeff at ocjtech.us|extras-qa at fedoraproject.org|
 Fedora Extras|python-mutagen|Python module to handle audio metadata|mr.ecik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Nov 29 11:59:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 06:59:57 -0500
Subject: rpms/GraphicsMagick/FC-6 GraphicsMagick.spec,1.2,1.3
Message-ID: <200611291159.kATBxvrK019960@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19906/FC-6

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-6/GraphicsMagick.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsMagick.spec	29 Nov 2006 01:35:14 -0000	1.2
+++ GraphicsMagick.spec	29 Nov 2006 11:59:27 -0000	1.3
@@ -76,7 +76,7 @@
 Summary: C++ bindings for the GraphicsMagick library
 Group: Development/Libraries
 Requires: %{name}-c++ = %{version}-%{release}
-Requires: %{name}-devel = %{version}%{release}
+Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
 GraphicsMagick-devel contains the static libraries and header files you'll
@@ -231,9 +231,11 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
+- Fixed devel requirement.
+
 * Sun Nov 26 2006 Andreas Thienemann  - 1.1.7-2
 - Fixed various stuff
 
-
 * Mon Jul 24 2006 Andreas Thienemann  - 1.1.7-1
 - Initial Package for FE based on ImageMagick.spec



From fedora-extras-commits at redhat.com  Wed Nov 29 11:59:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 06:59:57 -0500
Subject: rpms/GraphicsMagick/FC-5 GraphicsMagick.spec,1.2,1.3
Message-ID: <200611291159.kATBxvt1019957@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19906/FC-5

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-5/GraphicsMagick.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsMagick.spec	29 Nov 2006 01:35:14 -0000	1.2
+++ GraphicsMagick.spec	29 Nov 2006 11:59:27 -0000	1.3
@@ -76,7 +76,7 @@
 Summary: C++ bindings for the GraphicsMagick library
 Group: Development/Libraries
 Requires: %{name}-c++ = %{version}-%{release}
-Requires: %{name}-devel = %{version}%{release}
+Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
 GraphicsMagick-devel contains the static libraries and header files you'll
@@ -231,9 +231,11 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
+- Fixed devel requirement.
+
 * Sun Nov 26 2006 Andreas Thienemann  - 1.1.7-2
 - Fixed various stuff
 
-
 * Mon Jul 24 2006 Andreas Thienemann  - 1.1.7-1
 - Initial Package for FE based on ImageMagick.spec



From fedora-extras-commits at redhat.com  Wed Nov 29 12:00:03 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 07:00:03 -0500
Subject: rpms/GraphicsMagick/devel GraphicsMagick.spec,1.2,1.3
Message-ID: <200611291200.kATC03Qo019965@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19906/devel

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsMagick.spec	29 Nov 2006 01:35:19 -0000	1.2
+++ GraphicsMagick.spec	29 Nov 2006 11:59:33 -0000	1.3
@@ -76,7 +76,7 @@
 Summary: C++ bindings for the GraphicsMagick library
 Group: Development/Libraries
 Requires: %{name}-c++ = %{version}-%{release}
-Requires: %{name}-devel = %{version}%{release}
+Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
 GraphicsMagick-devel contains the static libraries and header files you'll
@@ -231,9 +231,11 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
+- Fixed devel requirement.
+
 * Sun Nov 26 2006 Andreas Thienemann  - 1.1.7-2
 - Fixed various stuff
 
-
 * Mon Jul 24 2006 Andreas Thienemann  - 1.1.7-1
 - Initial Package for FE based on ImageMagick.spec



From fedora-extras-commits at redhat.com  Wed Nov 29 12:00:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 07:00:41 -0500
Subject: rpms/ucarp/devel vip-001.list.example, NONE, 1.1 vip-down, NONE,
	1.1 vip-helper.sh, NONE, 1.1 vip-up, NONE, 1.1 carp.init, 1.3,
	1.4 ucarp.spec, 1.11, 1.12 vip-001.conf.example, 1.2, 1.3
Message-ID: <200611291200.kATC0fcs019996@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/ucarp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19956

Modified Files:
	carp.init ucarp.spec vip-001.conf.example 
Added Files:
	vip-001.list.example vip-down vip-helper.sh vip-up 
Log Message:
Improvements from Denis Ovsienko (#200395) and rebuild against new libpcap.



--- NEW FILE vip-001.list.example ---
# Comments are filtered out atomatically...
10.0.0.254/24 dev eth0

# ... and empty lines too.
192.168.1.254/24 dev eth1

# You can assign as many VIPs to a single virtual router, as you need.
172.16.2.32/24 dev eth2
172.16.3.67/24 dev eth2
172.16.4.88/24 dev eth2


--- NEW FILE vip-down ---
#!/bin/sh

usage()
{
	echo "This script is intended to be run by 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
		;;
esac



--- NEW FILE vip-helper.sh ---
#!/bin/sh

usage()
{
	echo "This script is intended to be invoked by vip-up.sh or vip-down.sh"
	exit 1
}

[ $# -eq 2 ] || usage

VRID=$1
OP=$2
MYDIR=`dirname $0`

if [ "$VRID" -lt "1" -o "$VRID" -gt 255 ]; then
	echo "VRID must be in 1..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
fi

egrep ^[^#] $LISTFILE | sed -e 's/^ *\(.*\) *$/\1/' \
	| xargs --max-lines=1 ip address $OP &>/dev/null



--- NEW FILE vip-up ---
#!/bin/sh

usage()
{
	echo "This script is intended to be run by 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
		;;
esac



Index: carp.init
===================================================================
RCS file: /cvs/extras/rpms/ucarp/devel/carp.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- carp.init	22 Aug 2006 13:08:17 -0000	1.3
+++ carp.init	29 Nov 2006 12:00:11 -0000	1.4
@@ -2,8 +2,7 @@
 # $Id$
 #
 # chkconfig: - 91 09
-# description: Starts and stops ucarp. \
-#	       used to provide common address redundancy.
+# description: Starts and stops the common address redundancy protocol daemon
 
 # Source function library.
 . /etc/init.d/functions
@@ -15,129 +14,136 @@
 [ ${NETWORKING} = "no" ] && exit 0
 
 get_files() {
-    FILES=`find /etc/sysconfig/carp -maxdepth 1 -type f -name 'vip-*.conf' \
-           -printf "%f\n" | LC_COLLATE="C" sort`
+    FILES=`find $CONFDIR -maxdepth 1 -type f -name 'vip-*.conf' \
+        -printf "%f\n" | egrep '^vip-[[:digit:]]+\.conf$' | LC_COLLATE="C" sort`
 }
 
 prog=$"common address redundancy protocol daemon"
-RETVAL=0
+OUR_INITLOG_ARGS="-n carp -e 2 -s"
+OUR_INITLOG="initlog ${OUR_INITLOG_ARGS}"
+CONFDIR=/etc/sysconfig/carp
+UPSCRIPT=$CONFDIR/vip-up
+DOWNSCRIPT=$CONFDIR/vip-down
 
 start() {
+    RETVAL=-1
+    VIP_RETVAL=0
+
     echo -n $"Starting ${prog}: "
 
     get_files
 
     if [ -z "${FILES}" ]; then
-        failure $"no virtual addresses are configured in /etc/sysconfig/carp/"
+        failure $"no virtual addresses are configured in $CONFDIR:"
         RETVAL=1
     else
         for FILE in ${FILES}; do
             # Check that the file name gives us an ID between 1 and 255
             ID=`echo ${FILE}| sed 's/^vip-\(.*\).conf/\1/'`
             if [ ${ID} -lt 1 -o ${ID} -gt 255 ]; then
-                initlog $INITLOG_ARGS -n carp -s "configuration file name ${FILE} gave us a bad ID of ${ID}:" -e 2
-                RETVAL=1
-                break
+                ${OUR_INITLOG} $"ID out of range (1-255) for ${FILE}, skipped VIP ID ${ID}:"
+                continue
             fi
 
+            unset PASSWORD BIND_INTERFACE BIND_ADDRESS VIP OPTIONS
             # Source ucarp settings
-            . /etc/sysconfig/carp/${FILE}
+            . $CONFDIR/${FILE}
+            TMP_RETVAL=0
 
-            # Check that we have the ifcfg- file for the main interface
-            if [ -f /etc/sysconfig/network-scripts/ifcfg-${BIND_INTERFACE} ]; then
-                . /etc/sysconfig/network-scripts/ifcfg-${BIND_INTERFACE}
-            else
-                initlog $INITLOG_ARGS -n carp -s $"no ifcfg-${BIND_INTERFACE} file found for carp ${FILE} configuration:" -e 2
-                RETVAL=1
-                break
+            if [ -z "${PASSWORD}" ]; then
+                ${OUR_INITLOG} $"no PASSWORD found in ${FILE}, skipped VIP ID ${ID}:"
+                TMP_RETVAL=1
             fi
-            # Check that the ifcfg- file does have an IPADDR
-            BIND_ADDRESS=${IPADDR}
             if [ -z "${BIND_ADDRESS}" ]; then
-                initlog $INITLOG_ARGS -n carp -s $"no IPADDR found in interface file ifcfg-${BIND_INTERFACE}:" -e 2
-                RETVAL=1
-                break
-            fi
-
-            # Check that we have the ifcfg- file for the virtual interface
-            if [ -f /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE} ]; then
-                . /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE}
-            else
-                initlog $INITLOG_ARGS -n carp -s $"no ifcfg-${VIP_INTERFACE} file found for carp ${FILE} configuration:" -e 2
-                RETVAL=1
-                break
+                ${OUR_INITLOG} $"no BIND_ADDRESS found in ${FILE}, skipped VIP ID ${ID}:"
+                TMP_RETVAL=1
             fi
-            # Check that the ifcfg- file does have an IPADDR
-            VIP_ADDRESS=${IPADDR}
             if [ -z "${VIP_ADDRESS}" ]; then
-                initlog $INITLOG_ARGS -n carp -s "no IPADDR found in interface file ifcfg-${VIP_INTERFACE}:" -e 2
-                RETVAL=1
-                break
+                ${OUR_INITLOG} $"no VIP_ADDRESS found in ${FILE}, skipped VIP ID ${ID}:"
+                TMP_RETVAL=1
+            fi
+
+            # If one of more of the above failed, skip the daemon launch
+            if [ ${TMP_RETVAL} -ne 0 ]; then
+                VIP_RETVAL=1
+                continue
             fi
 
-            daemon /usr/sbin/ucarp -v ${ID} -p ${PASSWORD} -s ${BIND_ADDRESS} -a ${VIP_ADDRESS} -i ${VIP_INTERFACE} ${OPTIONS} -B --upscript=/etc/sysconfig/carp/vip-up --downscript=/etc/sysconfig/carp/vip-down
+            [ ${RETVAL} -eq -1 ] && RETVAL=0
+            daemon /usr/sbin/ucarp -v ${ID} -m ${ID} -p ${PASSWORD} -s ${BIND_ADDRESS} -a ${VIP_ADDRESS} -i ${BIND_INTERFACE} ${OPTIONS} -B --upscript=$UPSCRIPT --downscript=$DOWNSCRIPT >/dev/null
             LAUNCH_RETVAL=$?
             [ ${LAUNCH_RETVAL} -ne 0 ] && RETVAL=1
         done
-        [ "${RETVAL}" -ne 0 ] && failure $"error in one or more of the carp configurations, see above:"
+
+        # failure/success or warning if launch worked with some vip errors
+        if [ ${RETVAL} -eq 0 -a ${VIP_RETVAL} -eq 0 ]; then
+            success $"all carp configurations were applied successfully:"
+            touch /var/lock/subsys/carp
+        elif [ ${RETVAL} -eq 0 -a ${VIP_RETVAL} -eq 1 ]; then
+            warning $"error in one or more of the carp configurations:"
+        else
+            failure $"error running one or more of the ucarp daemon instances:"
+        fi
     fi
     echo
-    [ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/carp
 }
 
 stop() {
-    echo -n $"Shutting down $prog: "
-    killproc /usr/sbin/ucarp
+    echo -n $"Stopping $prog: "
+    killproc /usr/sbin/ucarp >/dev/null
     RETVAL=$?
 
-    # We put all interfaces managed by ucarp down when stopping the service
-    # to avoid conflicting "leftovers"
+    # We unassign all UCARP-managed VIPs when stopping the service
+    # to avoid conflicting "leftovers".
 
     get_files
 
     [ ! -z "${FILES}" ] && \
     for FILE in ${FILES}; do
-
+        ID=`echo ${FILE}| sed 's/^vip-\(.*\).conf/\1/'`
+        unset PASSWORD BIND_INTERFACE BIND_ADDRESS VIP OPTIONS
         # Source ucarp settings
-        . /etc/sysconfig/carp/${FILE}
-
-        # Check that we have the ifcfg- file for the virtual interface
-        if [ -f /etc/sysconfig/network-scripts/ifcfg-${VIP_INTERFACE} ]; then
-            if /sbin/ifconfig ${VIP_INTERFACE} down >/dev/null 2>&1; then
-                initlog $INITLOG_ARGS -n carp -s $"bringing down carp managed interface ${VIP_INTERFACE}:" -e 1
-            else
-                initlog $INITLOG_ARGS -n carp -s $"bringing down carp managed interface ${VIP_INTERFACE}:" -e 2
-            fi
-        fi
+        . $CONFDIR/${FILE}
+        $DOWNSCRIPT $BIND_INTERFACE $VIP_ADDRESS ${ID} &>/dev/null
+        #TMP_RETVAL=$?
+        #[ ${TMP_RETVAL} -ne 0 ] && VIP_RETVAL=1
     done
+
+    # failure/success (no warning, too complicated to handle properly)
+    if [ ${RETVAL} -eq 1 ]; then
+        failure $"it seems like no ucarp daemon were running:"
+    else
+        success $"all ucarp daemons stopped and IP addresses unassigned:"
+        rm -f /var/lock/subsys/carp
+    fi
     echo
-    [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/carp
 }
 
 # See how we were called.
 case "$1" in
   start)
-	start
-	;;
+    start
+    ;;
   stop)
-	stop
-	;;
-  restart|reload)
-	stop
-	start
-	;;
+    stop
+    ;;
+  restart)
+    stop
+    start
+    ;;
   condrestart)
-	if [ -f /var/lock/subsys/carp ]; then
-	    stop
-	    start
-	fi
-	;;
+    if [ -f /var/lock/subsys/carp ]; then
+      stop
+      start
+    fi
+    ;;
   status)
-	status /usr/sbin/ucarp
-	;;
+    status /usr/sbin/ucarp
+    ;;
   *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
+    echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+    exit 1
 esac
 
 exit $RETVAL
+


Index: ucarp.spec
===================================================================
RCS file: /cvs/extras/rpms/ucarp/devel/ucarp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ucarp.spec	28 Aug 2006 16:40:12 -0000	1.11
+++ ucarp.spec	29 Nov 2006 12:00:11 -0000	1.12
@@ -1,13 +1,17 @@
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
 Version: 1.2
-Release: 4%{?dist}
+Release: 6%{?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
 Source2: vip-001.conf.example
+Source3: vip-001.list.example
+Source4: vip-up
+Source5: vip-down
+Source6: vip-helper.sh
 Patch0: ucarp-1.3-pre.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
@@ -45,32 +49,22 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 # Install the init script
-%{__install} -D -m 0755 %{SOURCE1} \
+%{__install} -D -p -m 0755 %{SOURCE1} \
     %{buildroot}/etc/rc.d/init.d/carp
 
-# Install the example config file
-%{__install} -D -m 0600 %{SOURCE2} \
-    %{buildroot}/etc/sysconfig/carp/vip-001.conf.example
-
-# Install trivial interface up/down scripts
-%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-up
-#!/bin/sh
-# We could use ifup directly, but it complains if the address is already used
-#/sbin/ifup $1
-. /etc/sysconfig/network-scripts/ifcfg-$1
-#exec /sbin/ip addr add ${IPADDR}/${NETMASK} dev "$1"
-exec /sbin/ifconfig $1 ${IPADDR} netmask ${NETMASK} up
-EOF
-%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-down
-#!/bin/sh
-#. /etc/sysconfig/network-scripts/ifcfg-$1
-#exec /sbin/ip addr del ${IPADDR}/${NETMASK} dev "$1"
-exec /sbin/ifconfig $1 down
-EOF
+%{__mkdir_p} %{buildroot}/etc/sysconfig/carp
+
+# Install the example config files
+%{__install} -D -p -m 0600 %{SOURCE2} %{SOURCE3} \
+    %{buildroot}/etc/sysconfig/carp/
+
+# Install helper scripts
+%{__install} -D -p -m 0700 %{SOURCE4} %{SOURCE5} %{SOURCE6} \
+    %{buildroot}/etc/sysconfig/carp/
 
 
 %clean
@@ -84,28 +78,36 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service carp stop >/dev/null 2>&1 || :
+    /sbin/service carp stop &>/dev/null || :
     /sbin/chkconfig --del carp
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-    /sbin/service carp condrestart >/dev/null 2>&1 || :
+    /sbin/service carp condrestart &>/dev/null || :
 fi
 
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README examples/linux/*.sh
+%doc AUTHORS COPYING ChangeLog NEWS README
 /etc/rc.d/init.d/carp
 %dir /etc/sysconfig/carp/
 /etc/sysconfig/carp/vip-001.conf.example
-%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-up
-%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-down
+/etc/sysconfig/carp/vip-001.list.example
+/etc/sysconfig/carp/vip-up
+/etc/sysconfig/carp/vip-down
+/etc/sysconfig/carp/vip-helper.sh
 %{_sbindir}/ucarp
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  1.2-6
+- Rebuild against new libpcap.
+
+* Mon Nov 13 2006 Matthias Saou  1.2-5
+- Include all improvements from Denis Ovsienko (#200395).
+
 * Mon Aug 28 2006 Matthias Saou  1.2-4
 - FC6 rebuild.
 


Index: vip-001.conf.example
===================================================================
RCS file: /cvs/extras/rpms/ucarp/devel/vip-001.conf.example,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vip-001.conf.example	22 Jun 2006 10:05:17 -0000	1.2
+++ vip-001.conf.example	29 Nov 2006 12:00:11 -0000	1.3
@@ -2,19 +2,46 @@
 # The number (from 001 to 255) in the name of the file is the identifier
 # $Id$
 
-# Set the same password on all mamchines sharing the same virtual IP
+# Set the same password on all machines sharing the same virtual router ID.
 PASSWORD="love"
 
-# You are required to have an IPADDR= line in the configuration file for
-# this interface (so no DHCP allowed)
+# UCARP daemon by default uses the first PCAP-capable interface as returned by
+# pcap_lookupdev(), this is often "eth0". This option allows you to change
+# this behaviour.
 BIND_INTERFACE="eth0"
 
-# Do *NOT* use a main interface for the virtual IP, use an ethX:Y alias
-# with the corresponding /etc/sysconfig/network-scripts/ifcfg-ethX:Y file
-# already configured and ith ONBOOT=no
-VIP_INTERFACE="eth0:0"
+# This is a mandatory option. UCARP daemon will use this IP address for its
+# announces regardless of the addresses actually assigned to the interface.
+#BIND_ADDRESS="10.0.0.2"
+
+# There is a simple and an advanced way to configure UCARP. In both ways you
+# have two physical routers with distinct IP addresses on the same IP network.
+
+# In the simple scenario, you want a single virtual IP address from the _same_
+# network to be taken over by one of the routers. You configure this VIP right
+# here then:
+#VIP_ADDRESS="10.10.10.10"
+
+# In the complex scenario, your virtual router consists of more than one IP
+# address. For example, you might want to assign to the virtual router not only
+# the address which is used as the default gateway on the LAN, but also the only
+# real IP address, which you got from your ISP. Your configuration would have
+# two steps then:
+# 1. Configure the VIP_ADDRESS to "255.255.255.255"
+# 2. Create a file in the same directory which holds vip-XXX.conf, with a name
+# vip-XXX.list. For example, if the .conf file is named vip-001.conf, the .list
+# file would be vip-001.list. Each meaningful line of this file will be used as
+# an argument for "ip address add" and "ip address del" commands. This way you
+# can control, which IP addresses will be assigned to which interfaces.
+#VIP_ADDRESS="255.255.255.255"
 
 # If you have extra options to add, see "ucarp --help" output
 # (the lower the "-k " the higher priority and "-P" to become master ASAP)
-OPTIONS="-k 128 -P"
+# Please note you can use only the following options here:
+# --preempt (-P): becomes a master as soon as possible
+# --neutral (-n): don't run downscript at start if backup
+# --advbase= (-b ): advertisement frequency
+# --advskew= (-k ): advertisement skew (0-255)
+# The rest of options list is built up by the UCARP initscript.
 
+OPTIONS="-k 128 -P"



From fedora-extras-commits at redhat.com  Wed Nov 29 12:01:47 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 07:01:47 -0500
Subject: rpms/GraphicsMagick/devel GraphicsMagick.spec,1.3,1.4
Message-ID: <200611291201.kATC1llc023087@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23068/devel

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphicsMagick.spec	29 Nov 2006 11:59:33 -0000	1.3
+++ GraphicsMagick.spec	29 Nov 2006 12:01:17 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 12:04:23 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 07:04:23 -0500
Subject: rpms/GraphicsMagick/FC-5 GraphicsMagick.spec,1.3,1.4
Message-ID: <200611291204.kATC4NRV023290@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251/FC-5

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-5/GraphicsMagick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphicsMagick.spec	29 Nov 2006 11:59:27 -0000	1.3
+++ GraphicsMagick.spec	29 Nov 2006 12:03:53 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 12:04:23 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 29 Nov 2006 07:04:23 -0500
Subject: rpms/GraphicsMagick/FC-6 GraphicsMagick.spec,1.3,1.4
Message-ID: <200611291204.kATC4NZN023293@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/GraphicsMagick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251/FC-6

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Sun Nov 29 2006 Andreas Thienemann  - 1.1.7-3
- Fixed devel requirement.



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-6/GraphicsMagick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphicsMagick.spec	29 Nov 2006 11:59:27 -0000	1.3
+++ GraphicsMagick.spec	29 Nov 2006 12:03:53 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 12:05:02 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 07:05:02 -0500
Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.24,1.25
Message-ID: <200611291205.kATC5211023416@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23297

Modified Files:
	php-eaccelerator.spec 
Log Message:
Rebuild against PHP 5.2.0.



Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- php-eaccelerator.spec	8 Nov 2006 12:10:55 -0000	1.24
+++ php-eaccelerator.spec	29 Nov 2006 12:04:32 -0000	1.25
@@ -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.1.6
+%define default_version 5.2.0
 
 %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/
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Matthias Saou  5.2.0_0.9.5-1
+- Rebuild against PHP 5.2.0.
+
 * Wed Nov  8 2006 Matthias Saou  5.1.6_0.9.5-2
 - Change to require php-common instead of php, for fastcgi without apache.
 



From fedora-extras-commits at redhat.com  Wed Nov 29 12:29:33 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 29 Nov 2006 07:29:33 -0500
Subject: rpms/optipng/FC-6 optipng-0.5.4-makefile-destdir.patch, NONE,
	1.1 optipng-0.5.4-makefile-externlibs.patch, NONE,
	1.1 optipngr.txt, NONE, 1.1 optipng.spec, 1.3,
	1.4 optipng-0.5.4-makefile.patch, 1.1, NONE
Message-ID: <200611291229.kATCTXI4023679@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632/FC-6

Modified Files:
	optipng.spec 
Added Files:
	optipng-0.5.4-makefile-destdir.patch 
	optipng-0.5.4-makefile-externlibs.patch optipngr.txt 
Removed Files:
	optipng-0.5.4-makefile.patch 
Log Message:
- splitting makefile patches
- make LDFLAGS=$RPM_OPT_FLAGS
- Use own makefile define
- Fixing 216784 with upstream patch


optipng-0.5.4-makefile-destdir.patch:

--- NEW FILE optipng-0.5.4-makefile-destdir.patch ---
diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
--- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 11:55:25.000000000 +0100
+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 11:56:28.000000000 +0100
@@ -64,17 +64,17 @@
 
 
 install: $(OPTIPNG)
-	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
-	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
-	- at rm -f ${bindir}/$(OPTIPNG)
-	- at rm -f ${man1dir}/optipng.1
-	cp -p $(OPTIPNG) ${bindir}
-	cp -p ../man/optipng.1 ${man1dir}
+	- at if [ ! -d ${DESTDIR}/${bindir} ]; then mkdir -p ${DESTDIR}/${bindir}; fi
+	- at if [ ! -d ${DESTDIR}/${man1dir} ]; then mkdir -p ${DESTDIR}/${man1dir}; fi
+	- at rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	- at rm -f ${DESTDIR}/${man1dir}/optipng.1
+	cp -p $(OPTIPNG) ${DESTDIR}/${bindir}
+	cp -p ../man/optipng.1 ${DESTDIR}/${man1dir}
 
 
 uninstall:
-	rm -f ${bindir}/$(OPTIPNG)
-	rm -f ${man1dir}/optipng.1
+	rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	rm -f ${DESTDIR}/${man1dir}/optipng.1
 
 
 clean:

optipng-0.5.4-makefile-externlibs.patch:

--- NEW FILE optipng-0.5.4-makefile-externlibs.patch ---
diff -ru optipng-0.5.4/lib/pngxtern/scripts/gcc.mak optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak
--- optipng-0.5.4/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:53.000000000 +0100
+++ optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:55.000000000 +0100
@@ -39,7 +39,7 @@
 all: pngxtern$(A)
 
 .c$(O):
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) $<
+	$(CC) -c $(CFLAGS)  $<
 
 pngxtern$(A): $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
--- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 12:05:22.000000000 +0100
+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 12:05:21.000000000 +0100
@@ -19,24 +19,20 @@
 ZLIB     = libz.a
 PNGLIB   = libpng.a
 PNGXLIB  = pngxtern.a
-ZMAK     = Makefile
-PNGMAK   = scripts/makefile.gcc
 PNGXMAK  = scripts/gcc.mak
-ZDIR     = ../lib/zlib
-PNGDIR   = ../lib/libpng
 PNGXDIR  = ../lib/pngxtern
 BACKHERE = ../../src
 
 OBJS = optipng.o opngio.o opngreduc.o cbitset.o osys.o strutil.o
-LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
+LIBS = $(PNGXDIR)/$(PNGXLIB)
 
 
 $(OPTIPNG): $(OBJS) $(LIBS)
-	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) $*.c
+	$(CC) -c $(CFLAGS) -I$(PNGXDIR) $*.c
 
 optipng.o  : optipng.c proginfo.h opng.h cexcept.h cbitset.h osys.h strutil.h
 opngio.o   : opngio.c opng.h
@@ -46,23 +42,11 @@
 strutil.o  : strutil.c strutil.h
 
 
-$(PNGXDIR)/$(PNGXLIB): $(ZDIR)/$(ZLIB) $(PNGDIR)/$(PNGLIB)
+$(PNGXDIR)/$(PNGXLIB):
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) $(PNGXLIB); \
 	cd $(BACKHERE)
 
-$(PNGDIR)/$(PNGLIB): $(ZDIR)/$(ZLIB)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) $(PNGLIB); \
-	cd $(BACKHERE)
-
-$(ZDIR)/$(ZLIB):
-	cd $(ZDIR); \
-	./configure; \
-	$(MAKE) -f $(ZMAK) $(ZLIB); \
-	cd $(BACKHERE)
-
-
 install: $(OPTIPNG)
 	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
 	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
@@ -82,9 +66,3 @@
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) clean; \
 	cd $(BACKHERE)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) clean; \
-	cd $(BACKHERE)
-	cd $(ZDIR); \
-	$(MAKE) -f $(ZMAK) clean; \
-	cd $(BACKHERE)


--- NEW FILE optipngr.txt ---
diff -urN optipng-0.5.4.orig/src/opngreduc.c optipng-0.5.4/src/opngreduc.c
--- optipng-0.5.4.orig/src/opngreduc.c	2006-11-28 01:55:45.000000000 -0200
+++ optipng-0.5.4/src/opngreduc.c	2006-11-28 01:56:54.000000000 -0200
@@ -80,10 +80,6 @@
    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
       if (sig_bit != &info_ptr->sig_bit)
          goto error;
-   if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values))
-      if (trans != info_ptr->trans || num_trans != info_ptr->num_trans ||
-          trans_values != &info_ptr->trans_values)
-         goto error;
 
    /* Also check png_ptr.  (It's not much, but we're doing what we can.) */
    if (png_get_compression_buffer_size(png_ptr) != png_ptr->zbuf_size)


Index: optipng.spec
===================================================================
RCS file: /cvs/extras/rpms/optipng/FC-6/optipng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- optipng.spec	11 Oct 2006 20:38:24 -0000	1.3
+++ optipng.spec	29 Nov 2006 12:29:03 -0000	1.4
@@ -1,13 +1,15 @@
 Name:           optipng
 Version:        0.5.4
-Release:        3%{?dist}
+Release:        4%{?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.patch
+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
@@ -22,18 +24,23 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%define makefile gcc.mak
 
 %build
 cd src/
-make -f scripts/gcc.mak %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make -f scripts/%{makefile} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"\
+                                            LDFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 cd src/
-make -f scripts/gcc.mak install DESTDIR="$RPM_BUILD_ROOT"\
-                                prefix="%{_prefix}" \
-                                man1dir="%{_mandir}/man1"
+make -f scripts/%{makefile} install DESTDIR="$RPM_BUILD_ROOT"\
+                                    prefix="%{_prefix}" \
+                                    man1dir="%{_mandir}/man1"
 
 
 %clean
@@ -48,20 +55,31 @@
 
 
 %changelog
+* 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
 - bumping release because of errors while importing to extras
+
 * Tue Oct 10 2006 Till Maas  - 0.5.4-2
 - shortening Summary
+
 * 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
 - 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
 - Changed license tag from zlib/libpng to zlib
+
 * Tue Jul 04 2006 Till Maas  - 0.5.2-1
 - Created from scratch for fedora extras


--- optipng-0.5.4-makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 12:29:34 2006
From: fedora-extras-commits at redhat.com (Till Maas (till))
Date: Wed, 29 Nov 2006 07:29:34 -0500
Subject: rpms/optipng/devel optipng-0.5.4-makefile-destdir.patch, NONE,
	1.1 optipng-0.5.4-makefile-externlibs.patch, NONE,
	1.1 optipngr.txt, NONE, 1.1 optipng.spec, 1.3,
	1.4 optipng-0.5.4-makefile.patch, 1.1, NONE
Message-ID: <200611291229.kATCTYto023682@cvs-int.fedora.redhat.com>

Author: till

Update of /cvs/extras/rpms/optipng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23632/devel

Modified Files:
	optipng.spec 
Added Files:
	optipng-0.5.4-makefile-destdir.patch 
	optipng-0.5.4-makefile-externlibs.patch optipngr.txt 
Removed Files:
	optipng-0.5.4-makefile.patch 
Log Message:
- splitting makefile patches
- make LDFLAGS=$RPM_OPT_FLAGS
- Use own makefile define
- Fixing 216784 with upstream patch


optipng-0.5.4-makefile-destdir.patch:

--- NEW FILE optipng-0.5.4-makefile-destdir.patch ---
diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
--- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 11:55:25.000000000 +0100
+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 11:56:28.000000000 +0100
@@ -64,17 +64,17 @@
 
 
 install: $(OPTIPNG)
-	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
-	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
-	- at rm -f ${bindir}/$(OPTIPNG)
-	- at rm -f ${man1dir}/optipng.1
-	cp -p $(OPTIPNG) ${bindir}
-	cp -p ../man/optipng.1 ${man1dir}
+	- at if [ ! -d ${DESTDIR}/${bindir} ]; then mkdir -p ${DESTDIR}/${bindir}; fi
+	- at if [ ! -d ${DESTDIR}/${man1dir} ]; then mkdir -p ${DESTDIR}/${man1dir}; fi
+	- at rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	- at rm -f ${DESTDIR}/${man1dir}/optipng.1
+	cp -p $(OPTIPNG) ${DESTDIR}/${bindir}
+	cp -p ../man/optipng.1 ${DESTDIR}/${man1dir}
 
 
 uninstall:
-	rm -f ${bindir}/$(OPTIPNG)
-	rm -f ${man1dir}/optipng.1
+	rm -f ${DESTDIR}/${bindir}/$(OPTIPNG)
+	rm -f ${DESTDIR}/${man1dir}/optipng.1
 
 
 clean:

optipng-0.5.4-makefile-externlibs.patch:

--- NEW FILE optipng-0.5.4-makefile-externlibs.patch ---
diff -ru optipng-0.5.4/lib/pngxtern/scripts/gcc.mak optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak
--- optipng-0.5.4/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:53.000000000 +0100
+++ optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:55.000000000 +0100
@@ -39,7 +39,7 @@
 all: pngxtern$(A)
 
 .c$(O):
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) $<
+	$(CC) -c $(CFLAGS)  $<
 
 pngxtern$(A): $(OBJS)
 	$(AR_RC) $@ $(OBJS)
diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
--- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 12:05:22.000000000 +0100
+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 12:05:21.000000000 +0100
@@ -19,24 +19,20 @@
 ZLIB     = libz.a
 PNGLIB   = libpng.a
 PNGXLIB  = pngxtern.a
-ZMAK     = Makefile
-PNGMAK   = scripts/makefile.gcc
 PNGXMAK  = scripts/gcc.mak
-ZDIR     = ../lib/zlib
-PNGDIR   = ../lib/libpng
 PNGXDIR  = ../lib/pngxtern
 BACKHERE = ../../src
 
 OBJS = optipng.o opngio.o opngreduc.o cbitset.o osys.o strutil.o
-LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
+LIBS = $(PNGXDIR)/$(PNGXLIB)
 
 
 $(OPTIPNG): $(OBJS) $(LIBS)
-	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) $*.c
+	$(CC) -c $(CFLAGS) -I$(PNGXDIR) $*.c
 
 optipng.o  : optipng.c proginfo.h opng.h cexcept.h cbitset.h osys.h strutil.h
 opngio.o   : opngio.c opng.h
@@ -46,23 +42,11 @@
 strutil.o  : strutil.c strutil.h
 
 
-$(PNGXDIR)/$(PNGXLIB): $(ZDIR)/$(ZLIB) $(PNGDIR)/$(PNGLIB)
+$(PNGXDIR)/$(PNGXLIB):
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) $(PNGXLIB); \
 	cd $(BACKHERE)
 
-$(PNGDIR)/$(PNGLIB): $(ZDIR)/$(ZLIB)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) $(PNGLIB); \
-	cd $(BACKHERE)
-
-$(ZDIR)/$(ZLIB):
-	cd $(ZDIR); \
-	./configure; \
-	$(MAKE) -f $(ZMAK) $(ZLIB); \
-	cd $(BACKHERE)
-
-
 install: $(OPTIPNG)
 	- at if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
 	- at if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
@@ -82,9 +66,3 @@
 	cd $(PNGXDIR); \
 	$(MAKE) -f $(PNGXMAK) clean; \
 	cd $(BACKHERE)
-	cd $(PNGDIR); \
-	$(MAKE) -f $(PNGMAK) clean; \
-	cd $(BACKHERE)
-	cd $(ZDIR); \
-	$(MAKE) -f $(ZMAK) clean; \
-	cd $(BACKHERE)


--- NEW FILE optipngr.txt ---
diff -urN optipng-0.5.4.orig/src/opngreduc.c optipng-0.5.4/src/opngreduc.c
--- optipng-0.5.4.orig/src/opngreduc.c	2006-11-28 01:55:45.000000000 -0200
+++ optipng-0.5.4/src/opngreduc.c	2006-11-28 01:56:54.000000000 -0200
@@ -80,10 +80,6 @@
    if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
       if (sig_bit != &info_ptr->sig_bit)
          goto error;
-   if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values))
-      if (trans != info_ptr->trans || num_trans != info_ptr->num_trans ||
-          trans_values != &info_ptr->trans_values)
-         goto error;
 
    /* Also check png_ptr.  (It's not much, but we're doing what we can.) */
    if (png_get_compression_buffer_size(png_ptr) != png_ptr->zbuf_size)


Index: optipng.spec
===================================================================
RCS file: /cvs/extras/rpms/optipng/devel/optipng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- optipng.spec	11 Oct 2006 20:38:24 -0000	1.3
+++ optipng.spec	29 Nov 2006 12:29:04 -0000	1.4
@@ -1,13 +1,15 @@
 Name:           optipng
 Version:        0.5.4
-Release:        3%{?dist}
+Release:        4%{?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.patch
+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
@@ -22,18 +24,23 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%define makefile gcc.mak
 
 %build
 cd src/
-make -f scripts/gcc.mak %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make -f scripts/%{makefile} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"\
+                                            LDFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 cd src/
-make -f scripts/gcc.mak install DESTDIR="$RPM_BUILD_ROOT"\
-                                prefix="%{_prefix}" \
-                                man1dir="%{_mandir}/man1"
+make -f scripts/%{makefile} install DESTDIR="$RPM_BUILD_ROOT"\
+                                    prefix="%{_prefix}" \
+                                    man1dir="%{_mandir}/man1"
 
 
 %clean
@@ -48,20 +55,31 @@
 
 
 %changelog
+* 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
 - bumping release because of errors while importing to extras
+
 * Tue Oct 10 2006 Till Maas  - 0.5.4-2
 - shortening Summary
+
 * 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
 - 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
 - Changed license tag from zlib/libpng to zlib
+
 * Tue Jul 04 2006 Till Maas  - 0.5.2-1
 - Created from scratch for fedora extras


--- optipng-0.5.4-makefile.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 12:30:47 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Wed, 29 Nov 2006 07:30:47 -0500
Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.15,1.16
Message-ID: <200611291230.kATCUls8023795@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23731

Modified Files:
	libfwbuilder.spec 
Log Message:
- Update release for build


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libfwbuilder.spec	27 Nov 2006 21:06:04 -0000	1.15
+++ libfwbuilder.spec	29 Nov 2006 12:30:17 -0000	1.16
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
 Version:        2.1.7
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -77,7 +77,10 @@
 
 
 %changelog
-* Tue Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
+* Wed Nov 29 2006 Ralf Ertzinger  2.1.7-1.fc7
+- Update release for build
+
+* Mon Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
 - Update to 2.1.7
 
 * Tue Oct 24 2006 Ralf Ertzinger  2.1.6-0.0.beta.fc7



From fedora-extras-commits at redhat.com  Wed Nov 29 12:35:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 07:35:36 -0500
Subject: rpms/libmal/devel libmal.spec,1.5,1.6
Message-ID: <200611291235.kATCZai3023872@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23857

Modified Files:
	libmal.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.31-5
- respin against new pilot-link



Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/devel/libmal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmal.spec	29 Aug 2006 18:09:37 -0000	1.5
+++ libmal.spec	29 Nov 2006 12:35:06 -0000	1.6
@@ -2,13 +2,13 @@
 Summary: A convenience library for malsync
 Name:    libmal
 # NOTE: this isn't the latest version, but is the last version known to 
-# work with kdepim
+# work with kdepim-3.5.x
 Version: 0.31 
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: MPL	
 Url: 	 http://jasonday.home.att.net/code/libmal/ 
-Source:  http://jasonday.home.att.net/code/libmal/libmal-0.31.tar.gz 
+Source0: http://jasonday.home.att.net/code/libmal/libmal-%{version}.tar.gz 
 Group:   System Environment/Libraries	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.31-5
+- respin against new pilot-link
+
 * Tue Aug 29 2006 Rex Dieter  0.31-4
 - fc6 respin
 



From fedora-extras-commits at redhat.com  Wed Nov 29 12:45:18 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 07:45:18 -0500
Subject: rpms/proftpd/FC-5 proftpd-1.3.0-cmdbufsize.patch, NONE,
	1.1 proftpd-1.3.0-mod_tls.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 proftpd.spec, 1.17, 1.18 sources, 1.8, 1.9
Message-ID: <200611291245.kATCjIvo023996@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23950/FC-5

Modified Files:
	.cvsignore proftpd.spec sources 
Added Files:
	proftpd-1.3.0-cmdbufsize.patch proftpd-1.3.0-mod_tls.patch 
Log Message:
Backport 1.3.0a update and patches to FC-5 and FC-6 branches.


proftpd-1.3.0-cmdbufsize.patch:

--- NEW FILE proftpd-1.3.0-cmdbufsize.patch ---
--- proftpd-1.3.0/src/main.c.cmdbufsize	2006-03-15 19:41:01.000000000 +0000
+++ proftpd-1.3.0/src/main.c	2006-11-17 16:53:35.000000000 +0000
@@ -116,6 +116,8 @@
 
 static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
 
+#define PR_DEFAULT_CMD_BUFSZ 512
+
 static char **Argv = NULL;
 static char *LastArgv = NULL;
 static const char *PidPath = PR_PID_FILE_PATH;
@@ -823,13 +825,26 @@
       long *buf_size = get_param_ptr(main_server->conf,
         "CommandBufferSize", FALSE);
 
-      if (buf_size == NULL || *buf_size <= 0)
-        cmd_buf_size = 512;
+      if (buf_size == NULL) {
+        pr_log_debug(DEBUG1, "no CommandBufferSize size given, "
+          "using default buffer size (%u)", (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*buf_size <= 0) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
+          "given, resetting to default buffer size (%u)",
+          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*buf_size + 1 > sizeof(buf)) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
+          "given, resetting to default buffer size (%u)",
+          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 
-      else if (*buf_size + 1 > sizeof(buf)) {
-	pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
-          "Resetting to 512.");
-	cmd_buf_size = 512;
+      } else {
+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %ld", *buf_size);
+        cmd_buf_size = (long) *buf_size;
       }
     }
 

proftpd-1.3.0-mod_tls.patch:

--- NEW FILE proftpd-1.3.0-mod_tls.patch ---
This is a possible fix Ralf S. Engelschall 
has made myself for the X.509 issue of mod_tls.c

Index: contrib/mod_tls.c
--- contrib/mod_tls.c.orig      2005-11-08 18:59:49 +0100
+++ contrib/mod_tls.c   2006-11-15 17:54:43 +0100
@@ -2421,6 +2421,8 @@
      datalen = BIO_get_mem_data(mem, &data);

   if (data) {
+    if (datalen > sizeof(buf)-1)
+        datalen = sizeof(buf)-1;
     memset(&buf, '\0', sizeof(buf));
     memcpy(buf, data, datalen);
     buf[datalen] = '\0';


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 May 2006 15:47:53 -0000	1.8
+++ .cvsignore	29 Nov 2006 12:44:48 -0000	1.9
@@ -1 +1 @@
-proftpd-1.3.0.tar.bz2
+proftpd-1.3.0a.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-5/proftpd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- proftpd.spec	23 Aug 2006 14:45:53 -0000	1.17
+++ proftpd.spec	29 Nov 2006 12:44:48 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.0
-Release: 6%{?dist}
+Version: 1.3.0a
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -14,6 +14,8 @@
 Source6: proftpd.pam
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
+Patch2: proftpd-1.3.0-cmdbufsize.patch
+Patch3: proftpd-1.3.0-mod_tls.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +68,8 @@
 %setup
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
+%patch2 -p1 -b .cmdbufsize
+%patch3 -p0 -b .mod_tls
 
 
 %build
@@ -186,7 +190,22 @@
 
 
 %changelog
-* Mon Aug 23 2006 Matthias Saou  1.3.0-6
+* Mon Nov 27 2006 Matthias Saou  1.3.0a-1
+- Update to 1.3.0a, which actually fixes CVE-2006-5815... yes, #214820!).
+
+* Thu Nov 16 2006 Matthias Saou  1.3.0-10
+- Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
+
+* Thu Nov 16 2006 Matthias Saou  1.3.0-9
+- Include mod_tls patch (#214820 too).
+
+* Mon Nov 13 2006 Matthias Saou  1.3.0-8
+- Include cmdbufsize patch (#214820).
+
+* Mon Aug 28 2006 Matthias Saou  1.3.0-7
+- FC6 rebuild.
+
+* Mon Aug 21 2006 Matthias Saou  1.3.0-6
 - Add mod_quotatab, _file, _ldap and _sql (#134291).
 
 * Mon Jul  3 2006 Matthias Saou  1.3.0-5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 May 2006 15:47:53 -0000	1.8
+++ sources	29 Nov 2006 12:44:48 -0000	1.9
@@ -1 +1 @@
-fae47d01b52e035eb6b7190e74c17722  proftpd-1.3.0.tar.bz2
+cc2e99f38a810982f91d5cbe1f4091f0  proftpd-1.3.0a.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 12:45:19 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 29 Nov 2006 07:45:19 -0500
Subject: rpms/proftpd/FC-6 proftpd-1.3.0-cmdbufsize.patch, NONE,
	1.1 proftpd-1.3.0-mod_tls.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 proftpd.spec, 1.20, 1.21 sources, 1.8, 1.9
Message-ID: <200611291245.kATCjJvQ024001@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23950/FC-6

Modified Files:
	.cvsignore proftpd.spec sources 
Added Files:
	proftpd-1.3.0-cmdbufsize.patch proftpd-1.3.0-mod_tls.patch 
Log Message:
Backport 1.3.0a update and patches to FC-5 and FC-6 branches.


proftpd-1.3.0-cmdbufsize.patch:

--- NEW FILE proftpd-1.3.0-cmdbufsize.patch ---
--- proftpd-1.3.0/src/main.c.cmdbufsize	2006-03-15 19:41:01.000000000 +0000
+++ proftpd-1.3.0/src/main.c	2006-11-17 16:53:35.000000000 +0000
@@ -116,6 +116,8 @@
 
 static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
 
+#define PR_DEFAULT_CMD_BUFSZ 512
+
 static char **Argv = NULL;
 static char *LastArgv = NULL;
 static const char *PidPath = PR_PID_FILE_PATH;
@@ -823,13 +825,26 @@
       long *buf_size = get_param_ptr(main_server->conf,
         "CommandBufferSize", FALSE);
 
-      if (buf_size == NULL || *buf_size <= 0)
-        cmd_buf_size = 512;
+      if (buf_size == NULL) {
+        pr_log_debug(DEBUG1, "no CommandBufferSize size given, "
+          "using default buffer size (%u)", (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*buf_size <= 0) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
+          "given, resetting to default buffer size (%u)",
+          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
+
+      } else if (*buf_size + 1 > sizeof(buf)) {
+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
+          "given, resetting to default buffer size (%u)",
+          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
+	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 
-      else if (*buf_size + 1 > sizeof(buf)) {
-	pr_log_pri(PR_LOG_WARNING, "Invalid CommandBufferSize size given. "
-          "Resetting to 512.");
-	cmd_buf_size = 512;
+      } else {
+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %ld", *buf_size);
+        cmd_buf_size = (long) *buf_size;
       }
     }
 

proftpd-1.3.0-mod_tls.patch:

--- NEW FILE proftpd-1.3.0-mod_tls.patch ---
This is a possible fix Ralf S. Engelschall 
has made myself for the X.509 issue of mod_tls.c

Index: contrib/mod_tls.c
--- contrib/mod_tls.c.orig      2005-11-08 18:59:49 +0100
+++ contrib/mod_tls.c   2006-11-15 17:54:43 +0100
@@ -2421,6 +2421,8 @@
      datalen = BIO_get_mem_data(mem, &data);

   if (data) {
+    if (datalen > sizeof(buf)-1)
+        datalen = sizeof(buf)-1;
     memset(&buf, '\0', sizeof(buf));
     memcpy(buf, data, datalen);
     buf[datalen] = '\0';


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Apr 2006 17:05:11 -0000	1.8
+++ .cvsignore	29 Nov 2006 12:44:49 -0000	1.9
@@ -1 +1 @@
-proftpd-1.3.0.tar.bz2
+proftpd-1.3.0a.tar.bz2


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-6/proftpd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- proftpd.spec	28 Aug 2006 12:28:49 -0000	1.20
+++ proftpd.spec	29 Nov 2006 12:44:49 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
-Version: 1.3.0
-Release: 7%{?dist}
+Version: 1.3.0a
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -14,6 +14,8 @@
 Source6: proftpd.pam
 Patch0: proftpd-1.3.0-rpath.patch
 Patch1: proftpd-1.3.0-ctrls-restart.patch
+Patch2: proftpd-1.3.0-cmdbufsize.patch
+Patch3: proftpd-1.3.0-mod_tls.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -66,6 +68,8 @@
 %setup
 %patch0 -p1 -b .rpath
 %patch1 -p0 -b .ctrls-restart
+%patch2 -p1 -b .cmdbufsize
+%patch3 -p0 -b .mod_tls
 
 
 %build
@@ -186,6 +190,18 @@
 
 
 %changelog
+* Mon Nov 27 2006 Matthias Saou  1.3.0a-1
+- Update to 1.3.0a, which actually fixes CVE-2006-5815... yes, #214820!).
+
+* Thu Nov 16 2006 Matthias Saou  1.3.0-10
+- Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
+
+* Thu Nov 16 2006 Matthias Saou  1.3.0-9
+- Include mod_tls patch (#214820 too).
+
+* Mon Nov 13 2006 Matthias Saou  1.3.0-8
+- Include cmdbufsize patch (#214820).
+
 * Mon Aug 28 2006 Matthias Saou  1.3.0-7
 - FC6 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Apr 2006 17:05:11 -0000	1.8
+++ sources	29 Nov 2006 12:44:49 -0000	1.9
@@ -1 +1 @@
-fae47d01b52e035eb6b7190e74c17722  proftpd-1.3.0.tar.bz2
+cc2e99f38a810982f91d5cbe1f4091f0  proftpd-1.3.0a.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 13:06:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 08:06:36 -0500
Subject: rpms/libtunepimp/devel .cvsignore, 1.7, 1.8 libtunepimp.spec, 1.23, 
	1.24 sources, 1.6, 1.7
Message-ID: <200611291306.kATD6aO9027263@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27244

Modified Files:
	.cvsignore libtunepimp.spec sources 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.5.3-1
- libtunepimp-0.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Oct 2006 21:02:35 -0000	1.7
+++ .cvsignore	29 Nov 2006 13:06:05 -0000	1.8
@@ -1,2 +1,3 @@
 clog
 libtunepimp-0.5.2.tar.gz
+libtunepimp-0.5.3.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libtunepimp.spec	31 Oct 2006 15:08:29 -0000	1.23
+++ libtunepimp.spec	29 Nov 2006 13:06:05 -0000	1.24
@@ -1,13 +1,14 @@
 
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
-Version: 0.5.2
-Release: 4%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
 URL:	 http://www.musicbrainz.org/products/tunepimp/
-Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
+# see http://musicbrainz.org/doc/libtunepimpDownload
+Source0: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define pkglibdir %{_libdir}/tunepimp
@@ -133,6 +134,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.5.3-1
+- libtunepimp-0.5.3
+
 * Tue Oct 31 2006 Rex Dieter  0.5.2-4
 - respin for curl update (fc7)
 
@@ -144,7 +148,7 @@
 - build python-libtunepimp subpackage (#209961)
 
 * Mon Oct 02 2006 Rex Dieter  0.5.2-1
-- 0.5.2
+- libtunepimp-0.5.2
 
 * Tue Sep 26 2006 Rex Dieter  0.5.1-2
 - drop -tools subpkg


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Oct 2006 16:29:30 -0000	1.6
+++ sources	29 Nov 2006 13:06:05 -0000	1.7
@@ -1 +1 @@
-655b254539013f5e7fe50ac035c26dcb  libtunepimp-0.5.2.tar.gz
+09649f983acef679a548344ba7a9bb2f  libtunepimp-0.5.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 13:59:33 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Wed, 29 Nov 2006 08:59:33 -0500
Subject: rpms/argus/devel argus.spec,1.6,1.7
Message-ID: <200611291359.kATDxXf7027797@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27782

Modified Files:
	argus.spec 
Log Message:
rebuilt for libpcap 0.9.5



Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- argus.spec	8 Sep 2006 13:57:21 -0000	1.6
+++ argus.spec	29 Nov 2006 13:59:03 -0000	1.7
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Wed Nov 29 2006 Gabriel Somlo  2.0.6.fixes.1-13
+- rebuilt against libpcap 0.9.5
+
 * Fri Sep 08 2006 Gabriel Somlo  2.0.6.fixes.1-12
 - rebuilt for FC6MassRebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 29 14:39:55 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 09:39:55 -0500
Subject: rpms/xtide/FC-5 xtide.spec,1.11,1.12
Message-ID: <200611291439.kATEdtsU031104@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31086

Modified Files:
	xtide.spec 
Log Message:
* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122.fc5.1
- Add more BuildRequires only for FC-5.



Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xtide.spec	28 Nov 2006 23:58:38 -0000	1.11
+++ xtide.spec	29 Nov 2006 14:39:25 -0000	1.12
@@ -4,7 +4,7 @@
 Summary:         Calculate tide all over the world
 Name:            xtide
 Version:         2.9
-Release:         0.2.date%{src_date}%{?dist}
+Release:         0.2.date%{src_date}%{?dist}.1
 
 URL:             http://www.flaterco.com/xtide/
 Source0:         ftp://ftp.flaterco.com/xtide/%{name}-%{version}dev-%{src_date}.tar.bz2
@@ -26,6 +26,10 @@
 
 BuildRequires:   autoconf
 
+%if 0%{?fedora} == 5
+BuildRequires:   libXpm-devel
+BuildRequires:   libXt-devel
+%endif
 BuildRequires:   libXaw-devel
 BuildRequires:   libXext-devel
 BuildRequires:   libpng-devel
@@ -251,6 +255,9 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
+* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122.fc5.1
+- Add more BuildRequires only for FC-5.
+
 * Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122
 - Ensure the hardcorded directories in some scripts can be 
   appropriately changed.



From fedora-extras-commits at redhat.com  Wed Nov 29 14:41:07 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 09:41:07 -0500
Subject: rpms/xtide/FC-5 xtide.spec,1.12,1.13
Message-ID: <200611291441.kATEf7O4031137@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/xtide/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31122

Modified Files:
	xtide.spec 
Log Message:
Fix changelog date...


Index: xtide.spec
===================================================================
RCS file: /cvs/extras/rpms/xtide/FC-5/xtide.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xtide.spec	29 Nov 2006 14:39:25 -0000	1.12
+++ xtide.spec	29 Nov 2006 14:40:37 -0000	1.13
@@ -255,7 +255,7 @@
 %{_datadir}/man/man8/xttpd.8*
 
 %changelog
-* Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122.fc5.1
+* Wed Nov 29 2006 Mamoru Tasaka  - 2.9-0.2.date20061122.fc5.1
 - Add more BuildRequires only for FC-5.
 
 * Sun Nov 26 2006 Mamoru Tasaka  - 2.9-0.2.date20061122



From fedora-extras-commits at redhat.com  Wed Nov 29 15:11:03 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 10:11:03 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.11, 1.12 ochusha.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200611291511.kATFB3Vm001904@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1885

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061129
- 0.5.99.63.7 cvs 061129 (23:00 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	27 Nov 2006 15:23:41 -0000	1.11
+++ .cvsignore	29 Nov 2006 15:10:33 -0000	1.12
@@ -1 +1 @@
-ochusha-0.5.99.63.6-cvs061127.tar.bz2
+ochusha-0.5.99.63.7-cvs061129.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ochusha.spec	27 Nov 2006 15:23:41 -0000	1.11
+++ ochusha.spec	29 Nov 2006 15:10:33 -0000	1.12
@@ -1,8 +1,8 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.6
-%define              strtag          cvs061127
+%define              main_ver        0.5.99.63.7
+%define              strtag          cvs061129
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -122,7 +122,7 @@
 }
 
 change_encoding EUCJP \
-   BUGS ChangeLog INSTALL.jp NEWS README TODO \
+   BUGS ChangeLog NEWS README TODO \
    ochusha/ochusha-gtkrc.gray
 
 %clean
@@ -155,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Mon Nov 27 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061127
-- 0.5.99.63.6 cvs 061127 (23:59 JST)
+* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061129
+- 0.5.99.63.7 cvs 061129 (23:00 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	27 Nov 2006 15:23:41 -0000	1.11
+++ sources	29 Nov 2006 15:10:33 -0000	1.12
@@ -1 +1 @@
-bcf4e008319305ba074c9509a55fcf2f  ochusha-0.5.99.63.6-cvs061127.tar.bz2
+691eaa88b5c402f929bcac37734625e2  ochusha-0.5.99.63.7-cvs061129.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 15:12:02 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Wed, 29 Nov 2006 10:12:02 -0500
Subject: rpms/ochusha/devel ochusha.spec,1.12,1.13
Message-ID: <200611291512.kATFC2Zj001936@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1915

Modified Files:
	ochusha.spec 
Log Message:
fix changelog version...


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ochusha.spec	29 Nov 2006 15:10:33 -0000	1.12
+++ ochusha.spec	29 Nov 2006 15:11:32 -0000	1.13
@@ -155,7 +155,7 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.6-0.1.cvs061129
+* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.7-0.1.cvs061129
 - 0.5.99.63.7 cvs 061129 (23:00 JST)
 
 * Sat Nov 18 2006 



From fedora-extras-commits at redhat.com  Wed Nov 29 15:12:44 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Wed, 29 Nov 2006 10:12:44 -0500
Subject: rpms/fwbuilder/devel fwbuilder.spec,1.16,1.17
Message-ID: <200611291512.kATFCi5M001999@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/fwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1973

Modified Files:
	fwbuilder.spec 
Log Message:

- Bump release for build
- Add fwbuilder symlink



Index: fwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fwbuilder.spec	27 Nov 2006 21:11:37 -0000	1.16
+++ fwbuilder.spec	29 Nov 2006 15:12:14 -0000	1.17
@@ -1,7 +1,7 @@
 Name:           fwbuilder
 Summary:        Firewall Builder
 Version:        2.1.7
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 
 License:        GPL
 Group:          Applications/System
@@ -13,7 +13,6 @@
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  libfwbuilder-devel = %{version}
-BuildRequires:  /usr/bin/rename
 
 %description
 Firewall Builder consists of a GUI and set of policy compilers for
@@ -68,6 +67,8 @@
   --add-category X-Fedora                          \
   %{SOURCE1}
 
+%{__ln_s} fwbuilder21 $RPM_BUILD_ROOT%{_bindir}/fwbuilder
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,6 +84,7 @@
 %{_datadir}/fwbuilder
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/fwbuilder.png
+%{_bindir}/fwbuilder
 %{_bindir}/fwbuilder21
 %{_bindir}/fwblookup21
 %{_bindir}/fwbedit21
@@ -109,9 +111,9 @@
 
 %files pf
 %defattr(-,root,root)
-%{_bindir}/fwb_pf
+%{_bindir}/fwb_pf21
 %doc doc/README.pf
-%{_mandir}/man1/fwb_pf.1*
+%{_mandir}/man1/fwb_pf21.1*
 
 
 %package ipf
@@ -124,9 +126,9 @@
 
 %files ipf
 %defattr(-,root,root)
-%{_bindir}/fwb_ipf
+%{_bindir}/fwb_ipf21
 %doc doc/README.ipf
-%{_mandir}/man1/fwb_ipf.1*
+%{_mandir}/man1/fwb_ipf21.1*
 
 
 %package ipfw
@@ -139,9 +141,9 @@
 
 %files ipfw
 %defattr(-,root,root)
-%{_bindir}/fwb_ipfw
+%{_bindir}/fwb_ipfw21
 %doc doc/README.ipfw
-%{_mandir}/man1/fwb_ipfw.1*
+%{_mandir}/man1/fwb_ipfw21.1*
 
 
 %package ipt
@@ -154,12 +156,16 @@
 
 %files ipt
 %defattr(-,root,root)
-%{_bindir}/fwb_ipt
+%{_bindir}/fwb_ipt21
 %doc doc/README.ipt
-%{_mandir}/man1/fwb_ipt.1*
+%{_mandir}/man1/fwb_ipt21.1*
 
 %changelog
-* Tue Nov 27 2006 Ralf Ertzinger  2.1.7-0.1.fc7
+* Wed Nov 29 2006 Ralf Ertzinger  2.1.7-1.fc7
+- Bump release for build
+- Add fwbuilder symlink
+
+* Mon Nov 27 2006 Ralf Ertzinger  2.1.7-0.2.fc7
 - Update to 2.1.7
 
 * Tue Oct 24 2006 Ralf Ertzinger  2.1.6-0.0.beta.fc7



From fedora-extras-commits at redhat.com  Wed Nov 29 15:21:04 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 29 Nov 2006 10:21:04 -0500
Subject: rpms/ip6sic/FC-6 ip6sic.spec,1.3,1.4
Message-ID: <200611291521.kATFL4Vv002102@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ip6sic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2087

Modified Files:
	ip6sic.spec 
Log Message:
Bump and rebuild for new libpcap


Index: ip6sic.spec
===================================================================
RCS file: /cvs/extras/rpms/ip6sic/FC-6/ip6sic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ip6sic.spec	5 Sep 2006 14:07:36 -0000	1.3
+++ ip6sic.spec	29 Nov 2006 15:20:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ip6sic
 Version:        0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        IPv6 Stack Integrity Checker
 
 Group:          Applications/Internet
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jarod Wilson  0.1-5
+- Rebuild against new libpcap
+
 * Tue Sep 05 2006 Jarod Wilson  0.1-4
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Wed Nov 29 15:34:24 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 29 Nov 2006 10:34:24 -0500
Subject: rpms/zabbix/devel zabbix.spec,1.1,1.2
Message-ID: <200611291534.kATFYOPH002253@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/zabbix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2230

Modified Files:
	zabbix.spec 
Log Message:
Bump and rebuild for new libnetsnmp


Index: zabbix.spec
===================================================================
RCS file: /cvs/extras/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix.spec	16 Nov 2006 18:56:31 -0000	1.1
+++ zabbix.spec	29 Nov 2006 15:33:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           zabbix
 Version:        1.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -213,6 +213,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Nov 29 2006 Jarod Wilson  1.1.4-3
+- Rebuild for updated libnetsnmp
+
 * Thu Nov 16 2006 Jarod Wilson  1.1.4-2
 - Fix up pt_br
 - Add Req-pre on useradd



From fedora-extras-commits at redhat.com  Wed Nov 29 15:37:58 2006
From: fedora-extras-commits at redhat.com (Jarod Wilson (jwilson))
Date: Wed, 29 Nov 2006 10:37:58 -0500
Subject: rpms/ip6sic/devel ip6sic.spec,1.3,1.4
Message-ID: <200611291537.kATFbwN7002326@cvs-int.fedora.redhat.com>

Author: jwilson

Update of /cvs/extras/rpms/ip6sic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2307

Modified Files:
	ip6sic.spec 
Log Message:
Bump for new libpcap


Index: ip6sic.spec
===================================================================
RCS file: /cvs/extras/rpms/ip6sic/devel/ip6sic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ip6sic.spec	5 Sep 2006 14:07:36 -0000	1.3
+++ ip6sic.spec	29 Nov 2006 15:37:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ip6sic
 Version:        0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        IPv6 Stack Integrity Checker
 
 Group:          Applications/Internet
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jarod Wilson  0.1-5
+- Rebuild against new libpcap
+
 * Tue Sep 05 2006 Jarod Wilson  0.1-4
 - Rebuild for new glibc
 



From fedora-extras-commits at redhat.com  Wed Nov 29 15:51:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 10:51:46 -0500
Subject: rpms/gnupg2/devel .cvsignore, 1.18, 1.19 gnupg2.spec, 1.64,
	1.65 sources, 1.20, 1.21
Message-ID: <200611291551.kATFpkkG002430@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2409

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Wed Nov 29 2006 Rex Dieter  2.0.1-1
- gnupg-2.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	25 Nov 2006 14:07:41 -0000	1.18
+++ .cvsignore	29 Nov 2006 15:51:16 -0000	1.19
@@ -1,4 +1,3 @@
-gnupg-2.0.0.tar.bz2
-gnupg-2.0.0.tar.bz2.sig
-gnupg-2.0.1rc1.tar.bz2
-gnupg-2.0.1rc1.tar.bz2.sig
+clog
+gnupg-2.0.1.tar.bz2
+gnupg-2.0.1.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnupg2.spec	25 Nov 2006 15:56:56 -0000	1.64
+++ gnupg2.spec	29 Nov 2006 15:51:16 -0000	1.65
@@ -7,17 +7,15 @@
 %define kde_scriptdir %{_prefix}
 %endif
 
-%define beta rc1
-
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.1
-Release: 0.3.%{beta}%{?dist}
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}%{?beta}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -179,6 +177,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  2.0.1-1
+- gnupg-2.0.1
+
 * 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	25 Nov 2006 14:07:41 -0000	1.20
+++ sources	29 Nov 2006 15:51:16 -0000	1.21
@@ -1,2 +1,2 @@
-e782017943dcf59e3f5b71556e921be4  gnupg-2.0.1rc1.tar.bz2
-2dee9b82c53b42c13267b794aa3fae00  gnupg-2.0.1rc1.tar.bz2.sig
+eb24e258db73f4cb53a3ce18375efa21  gnupg-2.0.1.tar.bz2
+58b1bbc2f34c0882ab1a49542a8ffd45  gnupg-2.0.1.tar.bz2.sig



From fedora-extras-commits at redhat.com  Wed Nov 29 16:34:23 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 11:34:23 -0500
Subject: rpms/lightning/devel .cvsignore, 1.2, 1.3 lightning.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200611291634.kATGYNX5005803@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/lightning/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5767

Modified Files:
	.cvsignore lightning.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 May 2006 16:55:31 -0000	1.2
+++ .cvsignore	29 Nov 2006 16:33:52 -0000	1.3
@@ -1 +1 @@
-lightning-1.2.tar.gz
+lightning-1.2a.tar.gz


Index: lightning.spec
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/lightning.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lightning.spec	3 Sep 2006 19:36:26 -0000	1.2
+++ lightning.spec	29 Nov 2006 16:33:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lightning
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.2a
+Release:        1%{?dist}
 Summary:        GNU Lightning
 
 Group:          Development/Libraries
@@ -19,12 +19,14 @@
 that compiles assembly code at run time.
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.2
 
 %build
 %configure
 make %{?_smp_mflags}
 
+%check
+make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +58,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  1.2a-1
+- New upstream version
+
 * Sun Sep  3 2006 Jochen Schmitt  1.2-4
 - Rebuild for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lightning/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 May 2006 16:55:31 -0000	1.2
+++ sources	29 Nov 2006 16:33:52 -0000	1.3
@@ -1 +1 @@
-dcd2c46ee4dd5d99edd9930022ad2153  lightning-1.2.tar.gz
+993ee16b006198b40cf9fe243c9514ec  lightning-1.2a.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 16:46:04 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 29 Nov 2006 11:46:04 -0500
Subject: rpms/ngrep/devel ngrep-system-pcre.patch, 1.1, 1.2 ngrep.spec, 1.5, 
	1.6 sources, 1.2, 1.3
Message-ID: <200611291646.kATGk44G005937@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/ngrep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5901

Modified Files:
	ngrep-system-pcre.patch ngrep.spec sources 
Log Message:

* Wed Nov 29 2006 Patrick "Jima" Laughton  1.45-1
- Upgrade to 1.45
- Enable IPv6 support
- Rebuild due to libpcap upgrade


ngrep-system-pcre.patch:

Index: ngrep-system-pcre.patch
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/ngrep-system-pcre.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ngrep-system-pcre.patch	25 Aug 2005 08:11:02 -0000	1.1
+++ ngrep-system-pcre.patch	29 Nov 2006 16:45:34 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Naru ngrep-1.43.orig/configure.in ngrep-1.43/configure.in
---- ngrep-1.43.orig/configure.in	2005-02-24 06:25:20.000000000 +0200
-+++ ngrep-1.43/configure.in	2005-02-24 20:48:38.486652640 +0200
+diff -urN ngrep-1.45/configure.in ngrep-1.45-patched/configure.in
+--- ngrep-1.45/configure.in	2006-11-14 21:43:56.000000000 -0600
++++ ngrep-1.45-patched/configure.in	2006-11-29 10:34:48.000000000 -0600
 @@ -28,8 +28,8 @@
  dnl
  
@@ -12,33 +12,42 @@
  
  
  dnl
-@@ -114,7 +114,7 @@
+@@ -130,8 +130,8 @@
    echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
    echo 
  
--  ( cd pcre-5.0; ./configure && make libtool chartables.c )
-+  dnl ( cd pcre-5.0; ./configure && make libtool chartables.c )
- 
-   REGEX_TARGET='pcre'
-   REGEX_OBJS='pcre.o study.o'
-diff -Naru ngrep-1.43.orig/Makefile.in ngrep-1.43/Makefile.in
---- ngrep-1.43.orig/Makefile.in	2005-02-24 01:15:12.000000000 +0200
-+++ ngrep-1.43/Makefile.in	2005-02-24 20:46:56.868138920 +0200
-@@ -38,8 +38,8 @@
+-  REGEX_DIR='pcre-5.0'
+-  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
++#  REGEX_DIR='pcre-5.0'
++#  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
+   USE_PCRE="1"
+ 
+ else
+@@ -146,7 +146,7 @@
+ 
+ fi
+ 
+-( cd $REGEX_DIR && ./configure )
++#( cd $REGEX_DIR && ./configure )
+ 
+ AC_SUBST(REGEX_DIR)
+ AC_SUBST(REGEX_OBJS)
+diff -urN ngrep-1.45/Makefile.in ngrep-1.45-patched/Makefile.in
+--- ngrep-1.45/Makefile.in	2006-11-28 07:35:37.000000000 -0600
++++ ngrep-1.45-patched/Makefile.in	2006-11-29 08:20:32.000000000 -0600
+@@ -38,7 +38,7 @@
  
  all: $(TARGET) 
  
--$(TARGET): $(REGEX_TARGET) $(OBJS) 
--	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
+-$(TARGET): $(REGEX_OBJS) $(OBJS) 
 +$(TARGET): $(OBJS) 
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(LIBS) 
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
  
- debug: $(REGEX_TARGET) $(OBJS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-diff -Naru ngrep-1.43.orig/ngrep.c ngrep-1.43/ngrep.c
---- ngrep-1.43.orig/ngrep.c	2005-02-20 07:52:42.000000000 +0200
-+++ ngrep-1.43/ngrep.c	2005-02-24 20:47:17.740672140 +0200
-@@ -79,7 +79,7 @@
+ debug: $(REGEX_OBJS) $(OBJS)
+diff -urN ngrep-1.45/ngrep.c ngrep-1.45-patched/ngrep.c
+--- ngrep-1.45/ngrep.c	2006-11-28 07:38:43.000000000 -0600
++++ ngrep-1.45-patched/ngrep.c	2006-11-29 08:10:48.000000000 -0600
+@@ -92,7 +92,7 @@
  #endif
  
  #if USE_PCRE


Index: ngrep.spec
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/ngrep.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ngrep.spec	4 Oct 2006 19:53:01 -0000	1.5
+++ ngrep.spec	29 Nov 2006 16:45:34 -0000	1.6
@@ -4,14 +4,14 @@
 Name:				ngrep
 Summary:			Network layer grep tool
 
-Version:			1.44
-Release:			7%{?dist}
+Version:			1.45
+Release:			1%{?dist}
 
 Group:				Applications/Internet
 License:			BSD-like
 URL:				http://ngrep.sourceforge.net/
 
-Source0:			http://download.sourceforge.net/ngrep/%{name}-%{version}-1.tar.bz2
+Source0:			http://download.sourceforge.net/ngrep/%{name}-%{version}.tar.bz2
 Source1:			%{name}-README.fedora
 Patch0:				%{name}-system-pcre.patch
 
@@ -39,7 +39,7 @@
 %build
 export EXTRA_INCLUDES=$(pcre-config --cflags)
 export EXTRA_LIBS=$(pcre-config --libs)
-%configure --enable-pcre
+%configure --enable-pcre --enable-ipv6
 make %{?_smp_mflags} STRIPFLAG=
 
 %install
@@ -56,6 +56,11 @@
 %{_mandir}/man8/ngrep.8*
 
 %changelog
+* Wed Nov 29 2006 Patrick "Jima" Laughton  1.45-1
+- Upgrade to 1.45
+- Enable IPv6 support
+- Rebuild due to libpcap upgrade
+
 * Wed Oct 04 2006 Patrick "Jima" Laughton  1.44-7
 - Bump-n-build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ngrep/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Aug 2005 08:11:02 -0000	1.2
+++ sources	29 Nov 2006 16:45:34 -0000	1.3
@@ -1 +1 @@
-c8aed4d0fac077cc09524b3c7d623974  ngrep-1.44-1.tar.bz2
+bc8150331601f3b869549c94866b4f1c  ngrep-1.45.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 16:47:25 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 29 Nov 2006 11:47:25 -0500
Subject: rpms/memchan/devel memchan.spec,1.1,1.2
Message-ID: <200611291647.kATGlPFs006031@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/memchan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6016

Modified Files:
	memchan.spec 
Log Message:
Fix unowned directory




Index: memchan.spec
===================================================================
RCS file: /cvs/extras/rpms/memchan/devel/memchan.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memchan.spec	29 Nov 2006 01:02:16 -0000	1.1
+++ memchan.spec	29 Nov 2006 16:46:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           memchan
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        In-memory channels for Tcl
 
 Group:          Development/Libraries
@@ -53,6 +53,7 @@
 %defattr(-,root,root,-)
 %doc doc/license.terms doc/*.html ChangeLog
 %{_mandir}/mann/*.gz
+%dir %{_libdir}/Memchan%{version}
 %{_libdir}/Memchan%{version}/*.so
 %{_libdir}/Memchan%{version}/*.tcl
 
@@ -64,5 +65,8 @@
 
 
 %changelog
+* Wed Nov 29 2006 Wart  - 2.2.1-2
+- Fix unowned directory
+
 * Mon Nov 27 2006 Wart  - 2.2.1-1
 - Initial package for Fedora



From fedora-extras-commits at redhat.com  Wed Nov 29 17:02:09 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 29 Nov 2006 12:02:09 -0500
Subject: rpms/scanssh/devel scanssh.spec,1.5,1.6
Message-ID: <200611291702.kATH29cW009224@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/scanssh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9181

Modified Files:
	scanssh.spec 
Log Message:

* Wed Nov 29 2006 Patrick "Jima" Laughton  2.1-10
- Rebuild due to libpcap upgrade



Index: scanssh.spec
===================================================================
RCS file: /cvs/extras/rpms/scanssh/devel/scanssh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scanssh.spec	4 Oct 2006 20:00:19 -0000	1.5
+++ scanssh.spec	29 Nov 2006 17:01:39 -0000	1.6
@@ -2,7 +2,7 @@
 Summary:		Fast SSH server and open proxy scanner
 
 Version:		2.1
-Release:		9%{?dist}
+Release:		10%{?dist}
 
 Group:			Applications/Internet
 License:		BSD
@@ -45,6 +45,9 @@
 %{_mandir}/man1/scanssh*
 
 %changelog
+* Wed Nov 29 2006 Patrick "Jima" Laughton  2.1-10
+- Rebuild due to libpcap upgrade
+
 * Wed Oct 04 2006 Patrick "Jima" Laughton  2.1-9
 - Bump-n-build
 



From fedora-extras-commits at redhat.com  Wed Nov 29 17:02:36 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Wed, 29 Nov 2006 12:02:36 -0500
Subject: rpms/lft/devel lft.spec,1.22,1.23
Message-ID: <200611291702.kATH2aVB009235@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9209

Modified Files:
	lft.spec 
Log Message:
* Wed Nov 29 2006 Jason L Tibbitts III  - 1:2.5-7
- Rebuild with new libpcap.



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lft.spec	2 Oct 2006 02:25:50 -0000	1.22
+++ lft.spec	29 Nov 2006 17:02:06 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        Alternate traceroute tool
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Jason L Tibbitts III  - 1:2.5-7
+- Rebuild with new libpcap.
+
 * Sun Oct 01 2006 Jason L Tibbitts III  - 1:2.5-6
 - Rebuild due to gcc bug.
 



From fedora-extras-commits at redhat.com  Wed Nov 29 17:21:27 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Wed, 29 Nov 2006 12:21:27 -0500
Subject: rpms/ssmtp/FC-5 ssmtp-defaultvalues.patch, NONE, 1.1 ssmtp.spec, 1.1,
	1.2
Message-ID: <200611291721.kATHLRb8009440@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9417

Modified Files:
	ssmtp.spec 
Added Files:
	ssmtp-defaultvalues.patch 
Log Message:
improved default values in ssmtp.conf

ssmtp-defaultvalues.patch:

--- NEW FILE ssmtp-defaultvalues.patch ---
--- ssmtp-2.61/ssmtp.conf~	2006-11-26 11:44:21.000000000 +0200
+++ ssmtp-2.61/ssmtp.conf	2006-11-26 11:46:39.000000000 +0200
@@ -1,6 +1,9 @@
 #
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #
+# See the ssmtp.conf(5) man page for a more verbose explanation of the
+# available options.
+#
 
 # The person who gets all mail for userids < 500
 # Make this empty to disable rewriting.
@@ -19,10 +22,10 @@
 # mailhub=mail.your.domain:465
 
 # Where will the mail seem to come from?
-rewriteDomain=
+#RewriteDomain=
 
 # The full hostname
-hostname=_HOSTNAME_
+#Hostname=
 
 # Set this to never rewrite the "From:" line (unless not given) and to
 # use that address in the "from line" of the envelope.


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/FC-5/ssmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp.spec	12 Nov 2006 23:11:51 -0000	1.1
+++ ssmtp.spec	29 Nov 2006 17:20:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	8%{?dist}
+Release:	10%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPL
@@ -9,6 +9,7 @@
 #Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
 Patch0:		%{name}-%{version}.6.patch
 Patch1:		%{name}-2.50.3-maxsysuid.patch
+Patch2:		%{name}-defaultvalues.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
@@ -30,6 +31,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -103,6 +105,12 @@
 
 
 %changelog
+* Tue Nov 28 2006 lonely wolf  2.61-10
+- fix silly typo in changelog
+
+* Tue Nov 28 2006 lonely wolf  2.61-9
+- included Ville Skytt??'s patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
+
 * Mon Oct 10 2006 lonely wolf  2.61-8
 - enabled IPv6 (just added this option to %%configure, the capability was already there)
 - removed yet another man page from %%Provides



From fedora-extras-commits at redhat.com  Wed Nov 29 17:23:50 2006
From: fedora-extras-commits at redhat.com (Manuel Wolfshant (wolfy))
Date: Wed, 29 Nov 2006 12:23:50 -0500
Subject: rpms/ssmtp/FC-6 ssmtp-defaultvalues.patch, NONE, 1.1 ssmtp.spec, 1.1,
	1.2
Message-ID: <200611291723.kATHNoRA009515@cvs-int.fedora.redhat.com>

Author: wolfy

Update of /cvs/extras/rpms/ssmtp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9496

Modified Files:
	ssmtp.spec 
Added Files:
	ssmtp-defaultvalues.patch 
Log Message:
improved default values in ssmtp.conf

ssmtp-defaultvalues.patch:

--- NEW FILE ssmtp-defaultvalues.patch ---
--- ssmtp-2.61/ssmtp.conf~	2006-11-26 11:44:21.000000000 +0200
+++ ssmtp-2.61/ssmtp.conf	2006-11-26 11:46:39.000000000 +0200
@@ -1,6 +1,9 @@
 #
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #
+# See the ssmtp.conf(5) man page for a more verbose explanation of the
+# available options.
+#
 
 # The person who gets all mail for userids < 500
 # Make this empty to disable rewriting.
@@ -19,10 +22,10 @@
 # mailhub=mail.your.domain:465
 
 # Where will the mail seem to come from?
-rewriteDomain=
+#RewriteDomain=
 
 # The full hostname
-hostname=_HOSTNAME_
+#Hostname=
 
 # Set this to never rewrite the "From:" line (unless not given) and to
 # use that address in the "from line" of the envelope.


Index: ssmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/ssmtp/FC-6/ssmtp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp.spec	12 Nov 2006 23:11:51 -0000	1.1
+++ ssmtp.spec	29 Nov 2006 17:23:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	8%{?dist}
+Release:	10%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPL
@@ -9,6 +9,7 @@
 #Patch0		http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-9.diff.gz
 Patch0:		%{name}-%{version}.6.patch
 Patch1:		%{name}-2.50.3-maxsysuid.patch
+Patch2:		%{name}-defaultvalues.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	MTA smtpdaemon %{_sbindir}/sendmail 
 Requires(post):	%{_sbindir}/alternatives
@@ -30,6 +31,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -103,6 +105,12 @@
 
 
 %changelog
+* Tue Nov 28 2006 lonely wolf  2.61-10
+- fix silly typo in changelog
+
+* Tue Nov 28 2006 lonely wolf  2.61-9
+- included Ville Skytt??'s patch for saner default values in ssmtp.conf (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217270)
+
 * Mon Oct 10 2006 lonely wolf  2.61-8
 - enabled IPv6 (just added this option to %%configure, the capability was already there)
 - removed yet another man page from %%Provides



From fedora-extras-commits at redhat.com  Wed Nov 29 17:26:14 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Wed, 29 Nov 2006 12:26:14 -0500
Subject: rpms/p0f/devel p0f.spec,1.12,1.13
Message-ID: <200611291726.kATHQEWa009579@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/p0f/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9564

Modified Files:
	p0f.spec 
Log Message:
Rebuild for new libpcap



Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- p0f.spec	11 Nov 2006 08:57:04 -0000	1.12
+++ p0f.spec	29 Nov 2006 17:25:44 -0000	1.13
@@ -1,6 +1,6 @@
 Name: p0f
 Version: 2.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: Versatile passive OS fingerprinting tool
 Group: Applications/Internet
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Kevin Fenzi  - 2.0.8-2
+- Rebuild for new libpcap
+
 * Sat Nov 11 2006 Kevin Fenzi  - 2.0.8-1
 - Update to 2.0.8
 



From fedora-extras-commits at redhat.com  Wed Nov 29 17:53:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 12:53:26 -0500
Subject: rpms/dirmngr/devel .cvsignore, 1.4, 1.5 dirmngr.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200611291753.kATHrQYP009717@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dirmngr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9698

Modified Files:
	.cvsignore dirmngr.spec sources 
Log Message:
* Wed Nov 29 2006 Rex Dieter  1.0.0-1
- dirmngr-1.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Sep 2006 20:04:03 -0000	1.4
+++ .cvsignore	29 Nov 2006 17:52:56 -0000	1.5
@@ -2,3 +2,4 @@
 dirmngr-0.9.4.tar.bz2.sig
 dirmngr-0.9.6.tar.bz2
 dirmngr-0.9.6.tar.bz2.sig
+dirmngr-1.0.0.tar.bz2.sig


Index: dirmngr.spec
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dirmngr.spec	13 Nov 2006 22:14:31 -0000	1.5
+++ dirmngr.spec	29 Nov 2006 17:52:56 -0000	1.6
@@ -4,14 +4,14 @@
 
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
-Version: 0.9.6
-Release: 2%{?dist} 
+Version: 1.0.0
+Release: 1%{?dist} 
 
 License: GPL
 Group:	 System Environment/Libraries
 URL:	 http://www.gnupg.org/
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/dirmngr-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/dirmngr-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/dirmngr/dirmngr-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source10: dirmngr.conf
@@ -118,11 +118,14 @@
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  1.0.0-1
+- dirmngr-1.0.0
+
 * Mon Nov 13 2006 Rex Dieter  0.9.6-2
 - BR: libassuan-static
 
 * Tue Sep 05 2006 Rex Dieter  0.9.6-1
-- 0.9.6
+- dirmngr-0.9.6
 
 * Tue Aug 29 2006 Rex Dieter  0.9.4-5
 - fc6 respin


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Sep 2006 20:04:03 -0000	1.4
+++ sources	29 Nov 2006 17:52:56 -0000	1.5
@@ -1,2 +1,2 @@
-6663cde008cf82fdaa9d0e44e15d5c58  dirmngr-0.9.6.tar.bz2
-4a57064bb86ee9ec54eb2c3c6183171e  dirmngr-0.9.6.tar.bz2.sig
+ee36129c1ff0a8d09056fc67df95b112  dirmngr-1.0.0.tar.bz2.sig
+59b263b33a59bfdb954d4a5cb001e5cc  dirmngr-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 18:01:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 13:01:13 -0500
Subject: rpms/dirmngr/devel dirmngr.spec,1.6,1.7
Message-ID: <200611291801.kATI1DT7012833@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dirmngr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9787

Modified Files:
	dirmngr.spec 
Log Message:
fix %files



Index: dirmngr.spec
===================================================================
RCS file: /cvs/extras/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dirmngr.spec	29 Nov 2006 17:52:56 -0000	1.6
+++ dirmngr.spec	29 Nov 2006 18:00:43 -0000	1.7
@@ -5,7 +5,7 @@
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
 Version: 1.0.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 
 License: GPL
 Group:	 System Environment/Libraries
@@ -98,7 +98,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING README README-alpha ChangeLog NEWS
+%doc COPYING README ChangeLog NEWS
 %{_bindir}/dirmngr*
 %{_libexecdir}/dirmngr_ldap
 %{_infodir}/dirmngr.info*
@@ -118,7 +118,7 @@
 
 
 %changelog
-* Wed Nov 29 2006 Rex Dieter  1.0.0-1
+* Wed Nov 29 2006 Rex Dieter  1.0.0-2
 - dirmngr-1.0.0
 
 * Mon Nov 13 2006 Rex Dieter  0.9.6-2



From fedora-extras-commits at redhat.com  Wed Nov 29 18:04:06 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 29 Nov 2006 13:04:06 -0500
Subject: rpms/rssowl/devel .cvsignore, 1.4, 1.5 rssowl-build1.patch, 1.2,
	1.3 rssowl.script, 1.9, 1.10 rssowl.spec, 1.18, 1.19 sources, 1.4, 1.5
Message-ID: <200611291804.kATI46IS012920@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12889

Modified Files:
	.cvsignore rssowl-build1.patch rssowl.script rssowl.spec 
	sources 
Log Message:
* Wed Nov 29 2006 Andrew Overholt  1.2.3-1
- 1.2.3.
- Guard against rebuild-gcj-db presence and installation ordering.
- Symlink to swt in %%{_libdir} where it now resides.
- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
- Remove symlink to org.eclipse.ui.forms - no longer needed.
- Remove requirement on eclipse-platform - no longer needed.
- Add xerces-j2 requirement.
- Update build1 patch.
- Remove ui.forms from rssowl.script.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2006 01:51:18 -0000	1.4
+++ .cvsignore	29 Nov 2006 18:03:36 -0000	1.5
@@ -1 +1 @@
-rssowl_1_2_2_src-CLEAN.tar.gz
+rssowl_1_2_3_src-CLEAN.tar.gz

rssowl-build1.patch:

Index: rssowl-build1.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl-build1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl-build1.patch	31 Jul 2006 18:29:57 -0000	1.2
+++ rssowl-build1.patch	29 Nov 2006 18:03:36 -0000	1.3
@@ -1,6 +1,6 @@
---- src/build.xml.orig	2006-05-06 09:45:03.000000000 -0700
-+++ src/build.xml	2006-05-06 09:46:34.000000000 -0700
-@@ -182,18 +182,7 @@
+--- src/build.xml.orig	2006-11-26 09:22:39.000000000 -0500
++++ src/build.xml	2006-11-29 11:27:18.000000000 -0500
+@@ -184,17 +189,6 @@
  		Pack compiled RSSOwl into executable JAR file.
      -->
  	
@@ -8,10 +8,9 @@
 -		
 -		
 -		
--		
 -		
 -		
- 		
+-		
 -		
 -		
 -		


Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rssowl.script	6 Nov 2006 19:39:49 -0000	1.9
+++ rssowl.script	29 Nov 2006 18:03:36 -0000	1.10
@@ -10,7 +10,7 @@
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
 
 
 


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rssowl.spec	6 Nov 2006 19:43:29 -0000	1.18
+++ rssowl.spec	29 Nov 2006 18:03:36 -0000	1.19
@@ -1,6 +1,6 @@
 %define name    rssowl
-%define version 1.2.2
-%define release 7%{?dist}
+%define version 1.2.3
+%define release 1%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -11,7 +11,7 @@
 URL:            http://www.rssowl.org
 # This is identical to the upstream tar ball, except that all binary
 # code jar files have been removed.
-Source0:        rssowl_1_2_2_src-CLEAN.tar.gz
+Source0:        rssowl_1_2_3_src-CLEAN.tar.gz
 Source1:        %{name}.script
 Source2:        %{name}.desktop
 Patch0:         %{name}-use-jce.patch
@@ -23,15 +23,15 @@
 Requires:       jre >= 1.4.2-
 BuildRequires:  java-sdk >= 1.4.2
 BuildRequires:  ImageMagick
-BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
+BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
 BuildRequires:  libgconf-java
-BuildRequires:  ant, jpackage-utils >= 1.5
+BuildRequires:  xerces-j2, jpackage-utils >= 1.5
 BuildRequires:	dos2unix
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
-Requires:       libgconf-java
+Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
+Requires:       xerces-j2, libgconf-java
 Requires:       firefox
 BuildRequires:    desktop-file-utils
 Requires(post):   desktop-file-utils
@@ -50,7 +50,7 @@
 integrierte Browser.
 
 %prep
-%setup -q -n rssowl_1_2_2_src
+%setup -q -n rssowl_1_2_3_src
 %patch0 -p0
 %patch1 -p0
 %patch3 -p0
@@ -59,9 +59,8 @@
 rm doc/mpl-v11.txt
 
 %build
-build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
-ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
-ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
+build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 xerces-j2
+ln -s %{_datadir}/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
 ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar lib
 cd src
 ant deploy_linux
@@ -106,7 +105,10 @@
 aot-compile-rpm
 
 %post 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -115,7 +117,10 @@
 fi
 
 %postun 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -137,6 +142,17 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Nov 29 2006 Andrew Overholt  1.2.3-1
+- 1.2.3.
+- Guard against rebuild-gcj-db presence and installation ordering.
+- Symlink to swt in %%{_libdir} where it now resides.
+- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
+- Remove symlink to org.eclipse.ui.forms - no longer needed.
+- Remove requirement on eclipse-platform - no longer needed.
+- Add xerces-j2 requirement.
+- Update build1 patch.
+- Remove ui.forms from rssowl.script.
+
 * Mon Nov 06 2006 Andrew Overholt  1.2.2-7
 - Use SWT in new %%{_libdir} location.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2006 01:51:18 -0000	1.4
+++ sources	29 Nov 2006 18:03:36 -0000	1.5
@@ -1 +1 @@
-63caafbb8d07fc131b994729e744a2b9  rssowl_1_2_2_src-CLEAN.tar.gz
+ae4e26a3665c84af24589aa9877d20be  rssowl_1_2_3_src-CLEAN.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 18:04:51 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 29 Nov 2006 13:04:51 -0500
Subject: rpms/rssowl/FC-6 .cvsignore, 1.4, 1.5 rssowl-build1.patch, 1.2,
	1.3 rssowl.script, 1.8, 1.9 rssowl.spec, 1.16, 1.17 sources, 1.4, 1.5
Message-ID: <200611291804.kATI4p9j012952@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/rssowl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12926

Modified Files:
	.cvsignore rssowl-build1.patch rssowl.script rssowl.spec 
	sources 
Log Message:
* Wed Nov 29 2006 Andrew Overholt  1.2.3-1
- 1.2.3.
- Guard against rebuild-gcj-db presence and installation ordering.
- Symlink to swt in %%{_libdir} where it now resides.
- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
- Remove symlink to org.eclipse.ui.forms - no longer needed.
- Remove requirement on eclipse-platform - no longer needed.
- Add xerces-j2 requirement.
- Update build1 patch.
- Remove ui.forms from rssowl.script.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2006 01:51:18 -0000	1.4
+++ .cvsignore	29 Nov 2006 18:04:21 -0000	1.5
@@ -1 +1 @@
-rssowl_1_2_2_src-CLEAN.tar.gz
+rssowl_1_2_3_src-CLEAN.tar.gz

rssowl-build1.patch:

Index: rssowl-build1.patch
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/rssowl-build1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rssowl-build1.patch	31 Jul 2006 18:29:57 -0000	1.2
+++ rssowl-build1.patch	29 Nov 2006 18:04:21 -0000	1.3
@@ -1,6 +1,6 @@
---- src/build.xml.orig	2006-05-06 09:45:03.000000000 -0700
-+++ src/build.xml	2006-05-06 09:46:34.000000000 -0700
-@@ -182,18 +182,7 @@
+--- src/build.xml.orig	2006-11-26 09:22:39.000000000 -0500
++++ src/build.xml	2006-11-29 11:27:18.000000000 -0500
+@@ -184,17 +189,6 @@
  		Pack compiled RSSOwl into executable JAR file.
      -->
  	
@@ -8,10 +8,9 @@
 -		
 -		
 -		
--		
 -		
 -		
- 		
+-		
 -		
 -		
 -		


Index: rssowl.script
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/rssowl.script,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rssowl.script	4 Oct 2006 14:00:51 -0000	1.8
+++ rssowl.script	29 Nov 2006 18:04:21 -0000	1.9
@@ -10,7 +10,7 @@
 fi
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
 
-exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar:/usr/share/java/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/share/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
+exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar:/usr/share/eclipse/plugins/org.eclipse.core.commands_3.2.0.I20060605-1400.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar:/usr/lib/eclipse/plugins/com.ibm.icu_3.4.5.jar:/usr/share/eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"
 
 
 


Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/rssowl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rssowl.spec	4 Oct 2006 15:04:50 -0000	1.16
+++ rssowl.spec	29 Nov 2006 18:04:21 -0000	1.17
@@ -1,6 +1,6 @@
 %define name    rssowl
-%define version 1.2.2
-%define release 6%{?dist}
+%define version 1.2.3
+%define release 1%{?dist}
 
 Name:           %name
 Summary:        An RSS, RDF and Atom Newsreader
@@ -11,7 +11,7 @@
 URL:            http://www.rssowl.org
 # This is identical to the upstream tar ball, except that all binary
 # code jar files have been removed.
-Source0:        rssowl_1_2_2_src-CLEAN.tar.gz
+Source0:        rssowl_1_2_3_src-CLEAN.tar.gz
 Source1:        %{name}.script
 Source2:        %{name}.desktop
 Patch0:         %{name}-use-jce.patch
@@ -23,15 +23,15 @@
 Requires:       jre >= 1.4.2-
 BuildRequires:  java-sdk >= 1.4.2
 BuildRequires:  ImageMagick
-BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
+BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
 BuildRequires:  libgconf-java
-BuildRequires:  ant, jpackage-utils >= 1.5
+BuildRequires:  xerces-j2, jpackage-utils >= 1.5
 BuildRequires:	dos2unix
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform >= 3.2.1
-Requires:       libgconf-java
+Requires:       itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-rcp >= 3.2.1
+Requires:       xerces-j2, libgconf-java
 Requires:       firefox
 BuildRequires:    desktop-file-utils
 Requires(post):   desktop-file-utils
@@ -50,7 +50,7 @@
 integrierte Browser.
 
 %prep
-%setup -q -n rssowl_1_2_2_src
+%setup -q -n rssowl_1_2_3_src
 %patch0 -p0
 %patch1 -p0
 %patch3 -p0
@@ -59,9 +59,9 @@
 rm doc/mpl-v11.txt
 
 %build
-build-jar-repository -p lib swt-gtk-3.2 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
-ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
-ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar lib
+build-jar-repository -p lib jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8 xerces-j2
+ln -s %{_datadir}/eclipse/plugins/org.eclipse.jface_3.2.1.M20060908-1000.jar lib
+ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar lib
 cd src
 ant deploy_linux
 
@@ -105,7 +105,10 @@
 aot-compile-rpm
 
 %post 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -114,7 +117,10 @@
 fi
 
 %postun 
-%{_bindir}/rebuild-gcj-db
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
 update-desktop-database %{_datadir}/applications
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -136,6 +142,20 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Nov 29 2006 Andrew Overholt  1.2.3-1
+- 1.2.3.
+- Guard against rebuild-gcj-db presence and installation ordering.
+- Symlink to swt in %%{_libdir} where it now resides.
+- Use %%{_datadir}/eclipse instead of /usr/share/eclipse.
+- Remove symlink to org.eclipse.ui.forms - no longer needed.
+- Remove requirement on eclipse-platform - no longer needed.
+- Add xerces-j2 requirement.
+- Update build1 patch.
+- Remove ui.forms from rssowl.script.
+
+* Mon Nov 06 2006 Andrew Overholt  1.2.2-7
+- Use SWT in new %%{_libdir} location.
+
 * Wed Oct  4 2006 Anthony Green  - 1.2.2-6
 - Fix build classpath.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2006 01:51:18 -0000	1.4
+++ sources	29 Nov 2006 18:04:21 -0000	1.5
@@ -1 +1 @@
-63caafbb8d07fc131b994729e744a2b9  rssowl_1_2_2_src-CLEAN.tar.gz
+ae4e26a3665c84af24589aa9877d20be  rssowl_1_2_3_src-CLEAN.tar.gz



From fedora-extras-commits at redhat.com  Wed Nov 29 18:13:05 2006
From: fedora-extras-commits at redhat.com (Andrew Overholt (overholt))
Date: Wed, 29 Nov 2006 13:13:05 -0500
Subject: rpms/azureus/FC-6 azureus.script,1.10,1.11 azureus.spec,1.38,1.39
Message-ID: <200611291813.kATID5cL013048@cvs-int.fedora.redhat.com>

Author: overholt

Update of /cvs/extras/rpms/azureus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029

Modified Files:
	azureus.script azureus.spec 
Log Message:
* Mon Nov 29 2006 Andrew Overholt  2.5.0.0-9
- Use new swt jar location.
- Need to wait to build until forthcoming eclipse update (currently in
  fc6-updates-testing).



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.script,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- azureus.script	28 Oct 2006 14:14:28 -0000	1.10
+++ azureus.script	29 Nov 2006 18:12:35 -0000	1.11
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:`build-classpath jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- azureus.spec	28 Oct 2006 14:14:28 -0000	1.38
+++ azureus.spec	29 Nov 2006 18:12:35 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -101,8 +101,9 @@
 
 %build
 mkdir -p build/libs
-build-jar-repository -p build/libs jakarta-commons-cli swt-gtk-3.2 log4j gnu-crypto gtk2.8 glib0.2
+build-jar-repository -p build/libs jakarta-commons-cli log4j gnu-crypto gtk2.8 glib0.2
 ln -s /usr/share/java/gcj-endorsed/bcprov-1.33.jar build/libs
+ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar build/libs
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -115,7 +116,7 @@
 cd plugins/azplugins
 unzip -q %{SOURCE5}
 rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:.
 find ./ -name \*java | xargs rm
 jar cvf azplugins_1.9.jar .
 cd ../..
@@ -124,7 +125,7 @@
 cd plugins/bdcc
 unzip *.jar
 rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:.
 find ./ -name \*java | xargs rm
 jar cvf bdcc_2.2.2.jar .
 cd ../..
@@ -206,6 +207,11 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Nov 29 2006 Andrew Overholt  2.5.0.0-9
+- Use new swt jar location.
+- Need to wait to build until forthcoming eclipse update (currently in
+  fc6-updates-testing).
+
 * Sat Oct 28 2006 Anthony Green  2.5.0.0-8
 - Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it
   will run on non-gcj java alternatives.



From fedora-extras-commits at redhat.com  Wed Nov 29 18:15:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 13:15:25 -0500
Subject: rpms/kaffeine/devel kaffeine.spec,1.2,1.3
Message-ID: <200611291815.kATIFPH0013079@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13058

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.8.3-2
- include libkaffeinepart.so in main pkg (not -devel)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kaffeine.spec	26 Nov 2006 23:57:34 -0000	1.2
+++ kaffeine.spec	29 Nov 2006 18:14:55 -0000	1.3
@@ -12,7 +12,7 @@
 #define nonfree 1
 
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
@@ -34,7 +34,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
-BuildRequires: desktop-file-utils
 BuildRequires: kdelibs-devel
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: libvorbis-devel
@@ -125,11 +124,6 @@
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --vendor="" \
-  --dir="$RPM_BUILD_ROOT%{_datadir}/applications/kde" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
 %find_lang %{name} 
@@ -184,6 +178,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
 %{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
 %{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -198,10 +193,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
 %endif
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
 * Sun Nov 26 2006 Rex Dieter  0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:34:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 29 Nov 2006 13:34:47 -0500
Subject: rpms/gwenview/FC-6 gwenview.spec,1.21,1.22
Message-ID: <200611291834.kATIYlpC013341@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13312/FC-6

Modified Files:
	gwenview.spec 
Log Message:
rebuild


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-6/gwenview.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gwenview.spec	27 Nov 2006 20:17:54 -0000	1.21
+++ gwenview.spec	29 Nov 2006 18:34:17 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Aurelien Bompard  1.4.1-3
+- rebuild
+
 * Mon Nov 27 2006 Aurelien Bompard  1.4.1-2
 - remove patch (gwenview now uses exiv2 instead of libexif)
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:34:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 29 Nov 2006 13:34:47 -0500
Subject: rpms/gwenview/devel gwenview.spec,1.21,1.22
Message-ID: <200611291834.kATIYllP013344@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13312/devel

Modified Files:
	gwenview.spec 
Log Message:
rebuild


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gwenview.spec	27 Nov 2006 20:17:55 -0000	1.21
+++ gwenview.spec	29 Nov 2006 18:34:17 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Aurelien Bompard  1.4.1-3
+- rebuild
+
 * Mon Nov 27 2006 Aurelien Bompard  1.4.1-2
 - remove patch (gwenview now uses exiv2 instead of libexif)
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:39:51 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 29 Nov 2006 13:39:51 -0500
Subject: rpms/iftop/devel iftop.spec,1.13,1.14
Message-ID: <200611291839.kATIdpT8013457@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/iftop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13432

Modified Files:
	iftop.spec 
Log Message:
rebuild


Index: iftop.spec
===================================================================
RCS file: /cvs/extras/rpms/iftop/devel/iftop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iftop.spec	30 Aug 2006 15:15:51 -0000	1.13
+++ iftop.spec	29 Nov 2006 18:39:21 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           iftop
 Version:        0.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Command line tool that displays bandwidth usage on an interface
 
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Aurelien Bompard  0.17-4
+- rebuild
+
 * Wed Aug 30 2006 Aurelien Bompard  0.17-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:40:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 13:40:44 -0500
Subject: rpms/kaffeine/FC-6 kaffeine.spec,1.2,1.3
Message-ID: <200611291840.kATIei2M013516@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13497

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.8.3-2
- include libkaffeinepart.so in main pkg (not -devel)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-6/kaffeine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kaffeine.spec	28 Nov 2006 15:12:29 -0000	1.2
+++ kaffeine.spec	29 Nov 2006 18:40:14 -0000	1.3
@@ -12,7 +12,7 @@
 #define nonfree 1
 
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
@@ -178,6 +178,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
 %{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
 %{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -192,10 +193,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
 %endif
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
 * Sun Nov 26 2006 Rex Dieter  0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Wed Nov 29 18:41:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 29 Nov 2006 13:41:58 -0500
Subject: rpms/kaffeine/FC-5 kaffeine.spec,1.2,1.3
Message-ID: <200611291841.kATIfw4U013585@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kaffeine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13570

Modified Files:
	kaffeine.spec 
Log Message:
* Wed Nov 29 2006 Rex Dieter  0.8.3-2
- include libkaffeinepart.so in main pkg (not -devel)



Index: kaffeine.spec
===================================================================
RCS file: /cvs/extras/rpms/kaffeine/FC-5/kaffeine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kaffeine.spec	28 Nov 2006 15:20:34 -0000	1.2
+++ kaffeine.spec	29 Nov 2006 18:41:28 -0000	1.3
@@ -12,7 +12,7 @@
 #define nonfree 1
 
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if "%{?nonfree:1}" == "1"
 Name:    kaffeine-extras-nonfree
@@ -178,6 +178,7 @@
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kaffeine
 %{_libdir}/lib*.so.*
+%{_libdir}/libkaffeinepart.so
 %{_libdir}/kde3/lib*.*
 %{_datadir}/appl*/*/*.desktop
 %{?_with_gstreamer:%{_datadir}/apps/gstreamerpart/}
@@ -192,10 +193,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkaffeinepart.so
 %endif
 
 
 %changelog
+* Wed Nov 29 2006 Rex Dieter  0.8.3-2
+- include libkaffeinepart.so in main pkg (not -devel)
+
 * Sun Nov 26 2006 Rex Dieter  0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:31:08 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 29 Nov 2006 16:31:08 -0500
Subject: rpms/libdvdread/devel libdvdread.spec,1.1,1.2
Message-ID: <200611292131.kATLV8Wx023330@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23315

Modified Files:
	libdvdread.spec 
Log Message:
- Rebuild.


Index: libdvdread.spec
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/devel/libdvdread.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdvdread.spec	27 Nov 2006 22:22:27 -0000	1.1
+++ libdvdread.spec	29 Nov 2006 21:30:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libdvdread
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple foundation for reading DVD video disks
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Nov 26 2006 Dominik Mierzejewski  0.9.7-2
+- Rebuild.
+
 * Fri Oct  6 2006 Dams  - 0.9.7-1
 - Updated to 0.9.7
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:33:47 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 29 Nov 2006 16:33:47 -0500
Subject: rpms/libdvdread/FC-6 libdvdread.spec,1.1,1.2
Message-ID: <200611292133.kATLXlbn023442@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23427

Modified Files:
	libdvdread.spec 
Log Message:
- Rebuild


Index: libdvdread.spec
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/FC-6/libdvdread.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdvdread.spec	27 Nov 2006 22:22:27 -0000	1.1
+++ libdvdread.spec	29 Nov 2006 21:33:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libdvdread
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple foundation for reading DVD video disks
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Nov 26 2006 Dominik Mierzejewski  0.9.7-2
+- Rebuild.
+
 * Fri Oct  6 2006 Dams  - 0.9.7-1
 - Updated to 0.9.7
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:37:00 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Wed, 29 Nov 2006 16:37:00 -0500
Subject: rpms/libdvdread/FC-5 libdvdread.spec,1.1,1.2
Message-ID: <200611292137.kATLb008023617@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/libdvdread/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23601

Modified Files:
	libdvdread.spec 
Log Message:
- Rebuild


Index: libdvdread.spec
===================================================================
RCS file: /cvs/extras/rpms/libdvdread/FC-5/libdvdread.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdvdread.spec	27 Nov 2006 22:22:27 -0000	1.1
+++ libdvdread.spec	29 Nov 2006 21:36:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libdvdread
 Version:        0.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple foundation for reading DVD video disks
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Nov 26 2006 Dominik Mierzejewski  0.9.7-2
+- Rebuild.
+
 * Fri Oct  6 2006 Dams  - 0.9.7-1
 - Updated to 0.9.7
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:40:00 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:40:00 -0500
Subject: rpms/pdftk/devel .cvsignore, 1.2, 1.3 pdftk.spec, 1.6, 1.7 sources, 
	1.2, 1.3
Message-ID: <200611292140.kATLe0YQ023688@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23669

Modified Files:
	.cvsignore pdftk.spec sources 
Log Message:
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2005 17:51:01 -0000	1.2
+++ .cvsignore	29 Nov 2006 21:39:30 -0000	1.3
@@ -1 +1 @@
-pdftk-1.12.tar.bz2
+pdftk-1.41.tar.bz2


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pdftk.spec	3 Sep 2006 19:38:58 -0000	1.6
+++ pdftk.spec	29 Nov 2006 21:39:30 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
-Version: 	1.12
-Release: 	8%{?dist}
+Version: 	1.41
+Release: 	1%{?dist}
 License:	GPL
-URL: 		http://www.accesspdf.com/pdftk/
+URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
-Patch1:         pdftk-1.12-rmsid.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -56,6 +54,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  1.41-1
+- New upstream release
+
 * Sun Sep  3 2006 Jochen Schmitt  1.12-8
 - Rebuild for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2005 17:51:01 -0000	1.2
+++ sources	29 Nov 2006 21:39:30 -0000	1.3
@@ -1 +1 @@
-ec1b6d9e06109c6f05e19033f1d91d8a  pdftk-1.12.tar.bz2
+7214230b937dc996d209c05b7b7b3518  pdftk-1.41.tar.bz2



From fedora-extras-commits at redhat.com  Wed Nov 29 21:41:30 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:41:30 -0500
Subject: rpms/pdftk/devel pdftk-1.12-rmsid.patch,1.1,NONE
Message-ID: <200611292141.kATLfUOJ023771@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23766

Removed Files:
	pdftk-1.12-rmsid.patch 
Log Message:
Remove unnecessary patch


--- pdftk-1.12-rmsid.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 21:43:04 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 29 Nov 2006 16:43:04 -0500
Subject: rpms/intuitively/devel intuitively.spec,1.6,1.7
Message-ID: <200611292143.kATLh4Bh023890@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23850

Modified Files:
	intuitively.spec 
Log Message:
* Wed Nov 29 2006 Patrice Dumas  0.7-11
- Rebuild for libcap soname change (0.9.5)



Index: intuitively.spec
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/intuitively.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- intuitively.spec	29 Aug 2006 17:58:17 -0000	1.6
+++ intuitively.spec	29 Nov 2006 21:42:34 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:      Automatic IP detection utility
 Name:         intuitively
 Version:      0.7
-Release:      10%{?dist}
+Release:      11%{?dist}
 URL:          http://home.samfundet.no/~tfheen/intuitively.html
 Source0:      http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz
 License:      GPL
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Patrice Dumas  0.7-11
+- Rebuild for libcap soname change (0.9.5)
+
 * Tue Aug 29 2006 Patrice Dumas  0.7-10
 - Rebuild for FC6
 



From fedora-extras-commits at redhat.com  Wed Nov 29 21:43:11 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:43:11 -0500
Subject: rpms/pdftk/devel pdftk.spec,1.7,1.8
Message-ID: <200611292143.kATLhBha023893@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23870

Modified Files:
	pdftk.spec 
Log Message:
Bunp Release


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/devel/pdftk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pdftk.spec	29 Nov 2006 21:39:30 -0000	1.7
+++ pdftk.spec	29 Nov 2006 21:42:41 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
 Version: 	1.41
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	GPL
 URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
@@ -54,7 +54,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Wed Nov 29 2006 Jochen Schmitt  1.41-1
+* Wed Nov 29 2006 Jochen Schmitt  1.41-2
 - New upstream release
 
 * Sun Sep  3 2006 Jochen Schmitt  1.12-8



From fedora-extras-commits at redhat.com  Wed Nov 29 21:45:09 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 29 Nov 2006 16:45:09 -0500
Subject: rpms/intuitively/devel intuitively.spec,1.7,1.8
Message-ID: <200611292145.kATLj9IQ024008@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/intuitively/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23973

Modified Files:
	intuitively.spec 
Log Message:
bump


Index: intuitively.spec
===================================================================
RCS file: /cvs/extras/rpms/intuitively/devel/intuitively.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- intuitively.spec	29 Nov 2006 21:42:34 -0000	1.7
+++ intuitively.spec	29 Nov 2006 21:44:39 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:      Automatic IP detection utility
 Name:         intuitively
 Version:      0.7
-Release:      11%{?dist}
+Release:      12%{?dist}
 URL:          http://home.samfundet.no/~tfheen/intuitively.html
 Source0:      http://ftp.debian.org/debian/pool/main/i/intuitively/intuitively_%{version}.orig.tar.gz
 License:      GPL
@@ -56,7 +56,7 @@
 
 
 %changelog
-* Wed Nov 29 2006 Patrice Dumas  0.7-11
+* Wed Nov 29 2006 Patrice Dumas  0.7-12
 - Rebuild for libcap soname change (0.9.5)
 
 * Tue Aug 29 2006 Patrice Dumas  0.7-10



From fedora-extras-commits at redhat.com  Wed Nov 29 21:45:11 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:45:11 -0500
Subject: rpms/pdftk/FC-6 pdftk.spec, 1.6, 1.7 sources, 1.2,
	1.3 pdftk-1.12-rmsid.patch, 1.1, NONE
Message-ID: <200611292145.kATLjB3c024012@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23990

Modified Files:
	pdftk.spec sources 
Removed Files:
	pdftk-1.12-rmsid.patch 
Log Message:
New upstream version


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/FC-6/pdftk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pdftk.spec	3 Sep 2006 19:38:58 -0000	1.6
+++ pdftk.spec	29 Nov 2006 21:44:41 -0000	1.7
@@ -1,12 +1,11 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
-Version: 	1.12
-Release: 	8%{?dist}
+Version: 	1.41
+Release: 	2%{?dist}
 License:	GPL
-URL: 		http://www.accesspdf.com/pdftk/
+URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
-Patch1:         pdftk-1.12-rmsid.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -56,6 +54,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  1.41-2
+- New upstream release
+
 * Sun Sep  3 2006 Jochen Schmitt  1.12-8
 - Rebuild for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdftk/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2005 17:51:01 -0000	1.2
+++ sources	29 Nov 2006 21:44:41 -0000	1.3
@@ -1 +1 @@
-ec1b6d9e06109c6f05e19033f1d91d8a  pdftk-1.12.tar.bz2
+7214230b937dc996d209c05b7b7b3518  pdftk-1.41.tar.bz2


--- pdftk-1.12-rmsid.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 21:46:52 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 16:46:52 -0500
Subject: rpms/pdftk/FC-5 pdftk.spec, 1.5, 1.6 sources, 1.2,
	1.3 pdftk-1.12-rmsid.patch, 1.1, NONE
Message-ID: <200611292146.kATLkqFY024153@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/pdftk/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24123

Modified Files:
	pdftk.spec sources 
Removed Files:
	pdftk-1.12-rmsid.patch 
Log Message:
New upstream release


Index: pdftk.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftk/FC-5/pdftk.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pdftk.spec	31 Jul 2006 17:46:54 -0000	1.5
+++ pdftk.spec	29 Nov 2006 21:46:22 -0000	1.6
@@ -1,12 +1,11 @@
 Summary: 	The PDF Tool Kit
 Name: 		pdftk
-Version: 	1.12
-Release: 	7%{?dist}
+Version: 	1.41
+Release: 	2%{?dist}
 License:	GPL
-URL: 		http://www.accesspdf.com/pdftk/
+URL: 		http://www.pdfhacks.com/pdftk/
 Source0: 	http://www.pdfhacks.com/pdftk/%{name}-%{version}.tar.bz2
 Source1:        gpl.txt
-Patch1:         pdftk-1.12-rmsid.patch
 Group: 		Applications/Publishing
 BuildRoot: 	%{_tmppath}/%{name}-root
 BuildRequires:	gcc-java
@@ -33,7 +32,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .org
 
 %build
 unset CLASSPATH && cd pdftk && make -f Makefile.RedHat && cd -
@@ -56,6 +54,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  1.41-2
+- New upstream release
+
+* Sun Sep  3 2006 Jochen Schmitt  1.12-8
+- Rebuild for FC-6
+
 * Mon Jul 31 2006 Jochen Schmitt  1.12-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pdftk/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2005 17:51:01 -0000	1.2
+++ sources	29 Nov 2006 21:46:22 -0000	1.3
@@ -1 +1 @@
-ec1b6d9e06109c6f05e19033f1d91d8a  pdftk-1.12.tar.bz2
+7214230b937dc996d209c05b7b7b3518  pdftk-1.41.tar.bz2


--- pdftk-1.12-rmsid.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 21:48:12 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 29 Nov 2006 16:48:12 -0500
Subject: rpms/hping3/devel hping3.spec,1.3,1.4
Message-ID: <200611292148.kATLmCeJ024256@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/hping3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24165

Modified Files:
	hping3.spec 
Log Message:
Fix changelog.



Index: hping3.spec
===================================================================
RCS file: /cvs/extras/rpms/hping3/devel/hping3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hping3.spec	7 Sep 2006 19:52:09 -0000	1.3
+++ hping3.spec	29 Nov 2006 21:47:42 -0000	1.4
@@ -1,7 +1,7 @@
 %define	cvs	20051105
 Name:    hping3
 Version: 0.0.%{cvs}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: TCP/IP stack auditing and much more
 
 Group: Applications/Internet
@@ -59,6 +59,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Nov 29 2006 Paul Wouters  0.0.20051105-5
+* 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  Wed Nov 29 21:49:11 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Wed, 29 Nov 2006 16:49:11 -0500
Subject: rpms/alsa-tools/devel Makefile, 1.3, 1.4 alsa-tools.spec, 1.11,
	1.12 sources, 1.7, 1.8 dead.package, 1.1, NONE
Message-ID: <200611292149.kATLnBZr024291@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/alsa-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24264

Added Files:
	Makefile alsa-tools.spec sources 
Removed Files:
	dead.package 
Log Message:
Unorphan alsa-tools (#217256)


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	29 Nov 2006 21:48:41 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: alsa-tools
+# $Id$
+NAME := alsa-tools
+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)


Index: alsa-tools.spec
===================================================================
RCS file: alsa-tools.spec
diff -N alsa-tools.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ alsa-tools.spec	29 Nov 2006 21:48:41 -0000	1.12
@@ -0,0 +1,228 @@
+%{?!_without_tools:     %define builddirstools as10k1 envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
+%{?_without_tools:      %{!?_with_firmware: %define _with_firmware 1}}
+%{?_with_firmware:      %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
+
+# The source tarball has been pruned to remove the "ac3dec" directory, due
+# to legal concerns that the contents might be subject to patent claims
+
+Summary:        Specialist tools for ALSA
+Name:           alsa-tools
+Version:        1.0.12
+Release:        3%{?dist}
+License:        GPL
+Group:          Applications/Multimedia
+URL:            http://www.alsa-project.org/
+Source0:        %{name}-%{version}-pruned.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  alsa-lib-devel >= %{version}
+%if 0%{!?_without_tools:1}
+BuildRequires:  gtk+-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  fltk-devel
+Buildrequires:  desktop-file-utils
+%endif
+
+%description
+This package contains several specialist tools for use with ALSA, including
+a number of programs that provide access to special hardware facilities on
+certain sound cards.
+
+* as10k1 - AS10k1 Assembler
+* cspctl - Sound Blaster 16 ASP/CSP control program
+* envy24control - Control tool for Envy24 (ice1712) based soundcards
+* hdspmixer - Mixer for the RME Hammerfall DSP cards
+* rmedigicontrol - Control panel for RME Hammerfall cards
+* sbiload - An OPL2/3 FM instrument loader for ALSA sequencer
+* sscape_ctl - ALSA SoundScape control utility
+* us428control - Control tool for Tascam 428
+
+
+%package firmware
+Summary:        ALSA tools for uploading firmware to some soundcards
+Group:          Applications/System
+Requires:       udev alsa-firmware
+
+
+%description firmware
+This package contains tools for flashing firmware into certain sound cards.
+The following tools are available:
+
+* hdsploader   - for RME Hammerfall DSP cards
+* mixartloader - for Digigram miXart soundcards
+* vxloader     - for Digigram VX soundcards
+* usx2yloader  - second phase firmware loader for Tascam USX2Y USB soundcards
+
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+mv seq/sbiload . ; rmdir seq
+for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
+do
+  cd $i ; %configure
+  %{__make} %{?_smp_mflags} || exit 1
+  cd ..
+done
+
+
+%install
+%{__rm} -rf $RPM_BUILD_ROOT
+
+for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
+do 
+  case $i in
+    hdspconf)
+      (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+      ;;
+    hdspmixer)
+      (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+      ;;
+    usx2yloader)
+      (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
+      ;;
+    *) (cd $i ; %makeinstall) || exit 1
+   esac
+   if [[ -s "${i}"/README ]] 
+   then
+      if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
+      then
+         mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+      fi
+      cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+   fi
+   if [[ -s "${i}"/COPYING ]] 
+   then
+      if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
+      then
+         mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+      fi
+      cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
+   fi 
+   if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then
+      desktop-file-install --vendor fedora \
+        --add-category "X-Fedora" \
+        --delete-original \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop
+   fi
+done
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%if 0%{!?_without_tools:1}
+%files
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/as10k1
+%doc %{_docdir}/%{name}-%{version}/envy24control
+%doc %{_docdir}/%{name}-%{version}/hdspconf
+%doc %{_docdir}/%{name}-%{version}/hdspmixer
+%doc %{_docdir}/%{name}-%{version}/rmedigicontrol
+%doc %{_docdir}/%{name}-%{version}/sbiload
+%doc %{_docdir}/%{name}-%{version}/sb16_csp
+%{_bindir}/as10k1
+%{_bindir}/cspctl
+%{_bindir}/envy24control
+%{_bindir}/hdspconf
+%{_bindir}/hdspmixer
+%{_bindir}/rmedigicontrol
+%{_bindir}/sbiload
+%{_bindir}/sscape_ctl
+%{_bindir}/us428control
+%{_datadir}/applications/fedora-hdspconf.desktop
+%{_datadir}/applications/fedora-hdspmixer.desktop
+%{_datadir}/man/man1/cspctl.1.gz
+%{_datadir}/man/man1/envy24control.1.gz
+%{_datadir}/pixmaps/hdspconf.png
+%{_datadir}/pixmaps/hdspmixer.png
+%{_datadir}/sounds/
+%endif # ?!_without_tools
+
+%if 0%{?_with_firmware:1}
+%files firmware
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/hdsploader
+%doc %{_docdir}/%{name}-%{version}/mixartloader
+%doc %{_docdir}/%{name}-%{version}/usx2yloader
+%doc %{_docdir}/%{name}-%{version}/vxloader
+%{_sysconfdir}/hotplug/usb/tascam_fpga
+%{_sysconfdir}/hotplug/usb/tascam_fw
+%{_sysconfdir}/hotplug/usb/tascam_fw.usermap
+%{_bindir}/hdsploader
+%{_bindir}/mixartloader
+%{_bindir}/usx2yloader
+%{_bindir}/vxloader
+%endif # ?_with_firmware
+
+%changelog
+* Sun Nov 26 2006 Tim Jackson  - 1.0.12-3
+- Add gtk2-devel BR
+
+* Sun Nov 26 2006 Tim Jackson  - 1.0.12-2
+- Own our docdir explicitly
+
+* Sat Nov 25 2006 Tim Jackson  - 1.0.12-1
+- Update to 1.0.12
+- Resubmit to Fedora Extras 6
+- Replace hotplug requirement with udev
+
+* Mon Feb 13 2006 Thorsten Leemhuis 
+- Rebuild for Fedora Extras 5
+
+* Tue Dec 06 2005 Thorsten Leemhuis  - 1.0.10-1
+- Update to 1.0.10
+
+* Fri May 06 2005 Thorsten Leemhuis  - 1.0.9-1
+- Update to 1.0.9
+- Use disttag
+- Remove gcc4 patch
+
+* Fri May 06 2005 Thorsten Leemhuis  - 1.0.8-3
+- prune ac3dec from sources
+
+* Thu May 05 2005 Thorsten Leemhuis  - 1.0.8-2
+- don't build ac3dec -- use a52dec instead
+
+* Wed Apr 06 2005 Thorsten Leemhuis  - 1.0.8-1
+- Update to 1.0.8
+
+* Sun Mar 29 2005 Thorsten Leemhuis  - 0:1.0.6-2
+- Add "--without tools" and "--with firmware" options
+- Drop unneeded BR: automake
+
+* Sun Jan 02 2005 Thorsten Leemhuis  - 0:1.0.6-0.fdr.1
+- Update to 1.0.6 for FC3
+- add new files in {_datadir}/sounds/
+- add patch0 for as10k1 
+
+* Sat Apr 03 2004 Thorsten Leemhuis  - 0:1.0.4-0.fdr.1
+- Update to 1.0.4
+
+* Fri Jan 16 2004 Thorsten Leemhuis  - 0:1.0.1-0.fdr.2
+- Integrate Michaels patch that fixes:
+- fix desktop files for fedora.us, adds buildreq desktop-file-utils
+- fix %%install section for short-circuit installs
+
+* Fri Jan 09 2004 Thorsten Leemhuis  - 0:1.0.1-0.fdr.1
+- Update to 1.0.1
+
+* Sun Dec 14 2003 Thorsten Leemhuis  1.0.0-0.fdr.0.3.rc2
+- exit if error during build or install
+- fix install errors hdspconf, hdspmixer, usx2yloader
+- Split package in alsa-tools and alsa-tools-firmware
+- Integrate more docs
+
+* Fri Dec 06 2003 Thorsten Leemhuis  1.0.0-0.fdr.0.2.rc2
+- Update to 1.0.0rc2
+- some minor corrections in style
+
+* Thu Dec 04 2003 Thorsten Leemhuis  1.0.0-0.fdr.0.1.rc1
+- Update to 1.0.0rc1
+- Remove firmware files -- extra package now.
+- Add description
+
+* Wed Aug 13 2003 Dams  0:tools-0.fdr.1
+- Initial build.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	29 Nov 2006 21:48:41 -0000	1.8
@@ -0,0 +1 @@
+7342056614623273abccb1cd38a674d8  alsa-tools-1.0.12-pruned.tar.bz2


--- dead.package DELETED ---



From fedora-extras-commits at redhat.com  Wed Nov 29 21:51:46 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Wed, 29 Nov 2006 16:51:46 -0500
Subject: rpms/hping3/FC-6 hping3.spec,1.3,1.4
Message-ID: <200611292151.kATLpkLF024394@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/hping3/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24379

Modified Files:
	hping3.spec 
Log Message:
* Wed Nov 29 2006 Paul Wouters  0.0.20051105-5
- Rebuild for new libpcap dependancy



Index: hping3.spec
===================================================================
RCS file: /cvs/extras/rpms/hping3/FC-6/hping3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hping3.spec	7 Sep 2006 19:52:09 -0000	1.3
+++ hping3.spec	29 Nov 2006 21:51:16 -0000	1.4
@@ -1,7 +1,7 @@
 %define	cvs	20051105
 Name:    hping3
 Version: 0.0.%{cvs}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: TCP/IP stack auditing and much more
 
 Group: Applications/Internet
@@ -59,6 +59,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Nov 29 2006 Paul Wouters  0.0.20051105-5
+- 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  Wed Nov 29 22:08:28 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 29 Nov 2006 17:08:28 -0500
Subject: rpms/blender/devel blender.spec,1.33,1.34
Message-ID: <200611292208.kATM8SEl027537@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27520

Modified Files:
	blender.spec 
Log Message:
Rebuilt to solve broken deps


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- blender.spec	31 Oct 2006 17:31:11 -0000	1.33
+++ blender.spec	29 Nov 2006 22:07:58 -0000	1.34
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -160,6 +160,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Wed Nov 29 2006 Jochen Schmitt  2.42a-6
+- Rebuild to solve broken deps
+
 * Tue Oct 31 2006 Jochen Schmitt  2.42a-5
 - Rebuilt to fix broken deps
 



From fedora-extras-commits at redhat.com  Wed Nov 29 23:22:31 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 29 Nov 2006 18:22:31 -0500
Subject: rpms/python-matplotlib/FC-6 python-matplotlib.spec,1.21,1.22
Message-ID: <200611292322.kATNMVgt031515@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31455/FC-6

Modified Files:
	python-matplotlib.spec 
Log Message:
Fix pycairo requirement



Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-6/python-matplotlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-matplotlib.spec	29 Nov 2006 06:33:05 -0000	1.21
+++ python-matplotlib.spec	29 Nov 2006 23:22:01 -0000	1.22
@@ -17,7 +17,7 @@
 BuildRequires:  pygtk2-devel, gtk2-devel, tkinter, tk-devel
 BuildRequires:  python-numeric, pytz, python-dateutil, numpy, python-numarray
 Requires:       python-numeric, pytz, python-dateutil
-Requires:       pycairo >= 1.0.2
+Requires:       pycairo >= 1.2.0
 
 
 %description



From fedora-extras-commits at redhat.com  Wed Nov 29 23:22:31 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed, 29 Nov 2006 18:22:31 -0500
Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.21,1.22
Message-ID: <200611292322.kATNMVsO031518@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31455/devel

Modified Files:
	python-matplotlib.spec 
Log Message:
Fix pycairo requirement



Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-matplotlib.spec	21 Nov 2006 15:36:32 -0000	1.21
+++ python-matplotlib.spec	29 Nov 2006 23:22:01 -0000	1.22
@@ -17,7 +17,7 @@
 BuildRequires:  pygtk2-devel, gtk2-devel, tkinter, tk-devel
 BuildRequires:  python-numeric, pytz, python-dateutil, numpy, python-numarray
 Requires:       python-numeric, pytz, python-dateutil
-Requires:       pycairo >= 1.0.2
+Requires:       pycairo >= 1.2.0
 
 
 %description



From fedora-extras-commits at redhat.com  Thu Nov 30 02:57:20 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Wed, 29 Nov 2006 21:57:20 -0500
Subject: accounts2 fedoraGroup.schema, 1.2, 1.3 fedoraPerson.schema, 1.4,
	1.5 fedoraMembership.schema, 1.2, NONE
Message-ID: <200611300257.kAU2vKG9009102@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9085

Modified Files:
	fedoraGroup.schema fedoraPerson.schema 
Removed Files:
	fedoraMembership.schema 
Log Message:
added fedora to the begining of attributes



Index: fedoraGroup.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraGroup.schema,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedoraGroup.schema	12 Oct 2006 00:18:37 -0000	1.2
+++ fedoraGroup.schema	30 Nov 2006 02:57:19 -0000	1.3
@@ -3,34 +3,35 @@
 #owner (the owner's DN) 
 #group_type 
 #needs_sponsor 
-#user_can_remove (will be handled by ACLs, but we need to clue the interface about it) #prerequisite_id (no idea what that is, so maybe not)  -- not included yet
+#user_can_remove (will be handled by ACLs, but we need to clue the interface about it) 
+#prerequisite_id (no idea what that is, so maybe not)  -- not included yet
 #joinmsg 
 
 
-attributeType ( 2.5.444.10 NAME 'groupowner'
+attributeType ( 2.5.444.10 NAME 'fedoraGroupOwner'
                 DESC 'group owner'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
 
-attributeType ( 2.5.444.11 NAME 'grouptype'
+attributeType ( 2.5.444.11 NAME 'fedoraGroupType'
                 DESC 'the type of group'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.444.12 NAME 'needssponsor'
+attributeType ( 2.5.444.12 NAME 'fedoraGroupNeedsSponsor'
                 DESC 'boolean indicating whether or not the group needs a sponsor'
                 EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.444.13 NAME 'usercanremove'
+attributeType ( 2.5.444.13 NAME 'fedoraGroupUserCanRemove'
                 DESC 'boolean indicating whether or not the user can remove the group'
                 EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.444.14 NAME 'joinmsg'
+attributeType ( 2.5.444.14 NAME 'fedoraGroupJoinMsg'
                 DESC 'message received upon joining the group'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
 
@@ -38,10 +39,7 @@
 objectclass	( 2.5.555.3
     NAME 'fedoraGroup'
 	DESC 'A object describing a group entry'
-    STRUCTURAL
-	MAY (
-		joinmsg $ usercanremove $ grouptype $ needssponsor $ 
-		usercanremove )
-	)
-	MUST ( 
-		cn $ groupowner )
+   STRUCTURAL
+	MAY (  fedoraGroupJoinMsg $ fedoraGroupUsercanRemove $ fedoraGroupType $ fedoraGroupNeedsSponsor $ fedoraGroupUserCanRemove )
+	MUST ( 	cn $ fedoraGroupOwner )
+ )


Index: fedoraPerson.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraPerson.schema,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedoraPerson.schema	22 Nov 2006 00:25:45 -0000	1.4
+++ fedoraPerson.schema	30 Nov 2006 02:57:19 -0000	1.5
@@ -3,33 +3,33 @@
 #attribues added onto it for use by the Account system
 #for now this is the contents
 #sshkey bugzillaemail ircNick approvalStatus creationDate
-attributeType ( 2.5.444.8 NAME 'sshKey'
+attributeType ( 2.5.444.8 NAME 'fedoraPersonSshKey'
                 DESC 'ssh key for this member'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} 
 	    SINGLE-VALUE)
 
-attributeType ( 2.5.444.9 NAME 'bugzillaMail'
+attributeType ( 2.5.444.9 NAME 'fedoraPersonBugzillaMail'
         DESC 'members preferred bugzilla email address'
 	EQUALITY caseIgnoreIA5Match
 	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-attributeType ( 2.5.444.16 NAME 'ircNick'
+attributeType ( 2.5.444.16 NAME 'fedoraPersonIrcNick'
                 DESC 'irc nick of the user on freenode'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{100} )
 
-attributetype ( 2.5.444.17 NAME 'personCreationDate'
+attributetype ( 2.5.444.17 NAME 'fedoraPersonCreationDate'
  	DESC 'date entry was created'
  	EQUALITY caseIgnoreIA5Match
  	SUBSTR caseIgnoreIA5SubstringsMatch
  	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
  	SINGLE-VALUE )
 
-attributeType ( 2.5.444.18 NAME 'approvalStatus'
+attributeType ( 2.5.444.18 NAME 'fedoraPersonApprovalStatus'
                DESC 'users approval status'
                EQUALITY caseIgnoreMatch
                SUBSTR caseIgnoreSubstringsMatch
@@ -44,6 +44,6 @@
     DESC 'A member of the fedoraproject group'
     SUP inetOrgPerson
     STRUCTURAL
-	MUST ( sshKey $ mail $ personCreationDate )
-	MAY  (ircNick $ approvalStatus $ bugzillaMail )
+	MUST ( fedoraPersonSshKey $ mail $ fedoraPersonCreationDate )
+	MAY  (fedoraPersonIrcNick $ fedoraPersonApprovalStatus $ fedoraPersonBugzillaMail )
    )


--- fedoraMembership.schema DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 30 03:02:01 2006
From: fedora-extras-commits at redhat.com (Tom Lynema (lyz))
Date: Wed, 29 Nov 2006 22:02:01 -0500
Subject: accounts2 PgToLDAP.py,1.1,1.2
Message-ID: <200611300302.kAU321bO012238@cvs-int.fedora.redhat.com>

Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12219

Modified Files:
	PgToLDAP.py 
Log Message:
Mathes new schema now



Index: PgToLDAP.py
===================================================================
RCS file: /cvs/fedora/accounts2/PgToLDAP.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PgToLDAP.py	22 Nov 2006 00:25:45 -0000	1.1
+++ PgToLDAP.py	30 Nov 2006 03:02:00 -0000	1.2
@@ -22,7 +22,7 @@
 import ldap, ldif, pgdb, ldap.modlist
 from optparse import OptionParser
 
-version = "0.11"
+version = "0.111"
 
 def parseArgs():
     parser = OptionParser(version="%prog " + version)
@@ -189,13 +189,15 @@
         ldifWriter = openLdifFile(options.outFile)
 
     # Copy all users from db to ldap/ldif
+    # this will to queries and mappings
+    
     try:
         if verbose:
             print "Selecting all users from Postgres Database"
         userCursor = dbConn.cursor()
         userCursor.execute ("SELECT * FROM person")
 
-	#id, username, email, human_name, gpg_keyid, ssh_key, password, comments, postal_address, telephone, facsimile, affiliation, creation, approval_status, internal_comments, wiki_prefs, ircnick
+	#id, username, email 2, human_name 3, gpg_keyid 4, ssh_key 5, password 6, comments 7,  postal_address 8, telephone 9, facsimile 10, affiliation 11, creation 12, approval_status 13, internal_comments 14, wiki_prefs 15, ircnick 16
     except:
         print "Error selecting users from db"
         raise
@@ -211,10 +213,9 @@
         else:
             print "Adding ldif info for " + user[3] + "."
 
-	    #userLdif = {"objectClass" : ["fedoraPerson"] , "displayName":  [user[1],"Tom"] , "mail": [user[2]] , "givenName" : [user[3]] , "userCertificate" : [user[4]] , "userPassword" : [user[6]] , "o":["fedoraproject"] , "postalAddress" : [user[8]] , "telephoneNumber" : [user[9]] , "fax" : [user [10]]}
-	    userLdif = [["objectClass",["fedoraPerson"]] , [ "displayName",[ user[1] ] ]] 
+	    userLdif = [["objectClass",["fedoraPerson","organizationalUnit"]] , [ "displayName",[ user[1] ] ] ] 
 	    userLdif.append(["mail",[str(user[2])]])
-	    userLdif.append(["bugzillaMail",[str(user[2])]])
+	    userLdif.append(["fedoraPersonBugzillaMail",[str(user[2])]])
 	    userLdif.append(["cn",[str(user[3])]])
 	    userLdif.append(["givenName",[str(user[3])]])
 	    userLdif.append(["userCertificate",[str(user[4])]])
@@ -223,11 +224,12 @@
 	    userLdif.append(["postalAddress",[str(user[8])]])
 	    userLdif.append(["telephoneNumber",[str(user[9])]])
 	    userLdif.append(["fax",[str(user[10])]])
-	    userLdif.append(["o",[str(user[11])]]) # affiliation is set to the o
-	    userLdif.append(["personCreationDate",[str(user[12])]])
-	    userLdif.append(["approvalStatus",[str(user[13])]])
+	    userLdif.append(["o",[str(user[11])]]) # affiliation is set to the o -- another stretch ??
+	    userLdif.append(["fedoraPersonCreationDate",[str(user[12])]])
+	    userLdif.append(["fedoraPersonApprovalStatus",[str(user[13])]])
 	    userLdif.append(["description",[str(user[14])]]) #this one may be a streach -- original field was internal comments
-	    userLdif.append(["ircNick",[str(user[16])]])
+	    userLdif.append(["fedoraPersonIrcNick",[str(user[16])]])
+	    userLdif.append(["ou",["roles"]])
 	   
 	    print userLdif
 	    #for userKey in userLdif.keys():
@@ -241,20 +243,23 @@
 	    ldifWriter.unparse("cn=" + str(user[3]) +",ou=People,dc=fedoraproject,dc=org" , userLdif )
 	    #ldifWriter.unparse("dc=fedoraproject,dc=org, cn=" + user[3] , [ ['ano',['domini']],['uances',['od']] ])
 
-	    time.sleep (2)
+	    #time.sleep (2)
 	
         		
             #ldapConn.add_s(dn, entry)
 
     userCursor.close()
-
+    
     # Select all groups from the DB
+    
     try:
         if verbose:
             print "Selecting all groups from Postgres Database"
         groupCursor = dbConn.cursor()
         groupCursor.execute ("SELECT * FROM project_group")
-	#id, name, owner_id, group_type, needs_sponsor, user_can_remove, prerequisite_id, joinmsg
+
+
+
     except:
         print "Error selecting groups from db"
         raise
@@ -271,11 +276,38 @@
             #ldapConn.add_s(dn, entry)
 	    
             print "Adding group info for " + group[1] + "."
+            #id0, name1, owner_id2, group_type3, needs_sponsor4, user_can_remove5, prerequisite_id6, joinmsg7
 
+            uidLookupCursor = dbConn.cursor()
+            uidLookupCursor.execute ("SELECT username FROM person where id =" + str(group[2]) )
+            owner = uidLookupCursor.fetchone()
+            if str(group[6]) != "None" :
+                uidLookupCursor.execute ("SELECT name FROM project_group where id =" + str(group[6]) )
+	        prereq = uidLookupCursor.fetchone()
+                print prereq
+	    else:
+		prereq=["None"]
+	    print owner
+
+
+            #id0, name1, owner_id2, group_type3, needs_sponsor4, user_can_remove5, prerequisite_id6, joinmsg7
+	    userLdif = [["objectClass",["fedoraGroup"]] ] 
+	    userLdif.append(["cn",[str(group[1])]])
+	    userLdif.append(["fedoraGroupOwner",owner]) # need to get a cn for this not just the id
+	    #userLdif.append(["groupOwner",[str(group[2])]]) # need to get a cn for this not just the id
+	    userLdif.append(["fedoraGroupType",[str(group[3])]])
+	    userLdif.append(["fedoraGroupNeedsSponsor",[str(group[4])]]) #need to convert to bool
+	    userLdif.append(["fedoraGroupUserCanRemove",[str(group[5])]])
+	    #userLdif.append(["groupPrerequisite",[str(group[6])]])
+	    #userLdif.append(["groupPrerequisite",prereq]) not currently in the schema
+	    userLdif.append(["fedoraGroupJoinMsg",[str(group[7])]])
+	    ldifWriter.unparse("cn=" + str(group[1]) +",ou=fedoraGroups,dc=fedoraproject,dc=org" , userLdif )
 
 
-    userCursor.close()        
+    groupCursor.close()        
+    
     # Select all roles from the DB
+    
     try:
         if verbose:
             print "Selecting all roles from Postgres Database"
@@ -296,8 +328,44 @@
             ldifWriter.unparse(dn, entry)
         else:
             #ldapConn.add_s(dn, entry)
-            print "Adding role info for " + role[4] + "for user" + str(role[1]) + "." 
-    userCursor.close()
+            #person_id0, group_project_id1, role_type2, role_domain3, role_status4, internal_comments5, sponsor_id6, creation7, approval8
+
+
+	    uidRoleCursor = dbConn.cursor()
+            uidRoleCursor.execute ("SELECT username FROM person where id =" + str(role[0]) )
+            username = uidRoleCursor.fetchone()
+            uidRoleCursor.execute ("SELECT name FROM project_group where id =" + str(role[1]) )
+            group = uidRoleCursor.fetchone()
+            if str(role[6]) != "None" :
+                uidRoleCursor.execute ("SELECT username FROM person where id =" + str(role[6]) )
+                sponsor = uidRoleCursor.fetchone()
+	    else:
+		sponsor = ["None"]
+
+            print "Adding " + str(role[4]) + " role info for " + group[0] + " for user " + username[0] + "."
+            #if str(group[6]) != "None" :
+            #    uidLookupCursor.execute ("SELECT name FROM project_group where id =" + str(group[6]) )
+	    #    prereq = uidLookupCursor.fetchone()
+            #    print prereq
+	    #else:
+	    #	prereq=["None"]
+	    #print owner 
+
+  #person_id0, group_project_id1, role_type2, role_domain3, role_status4, internal_comments5, sponsor_id6, creation7, approval8
+
+            roleLdif = [["objectClass",["fedoraRole"]] ] 
+	    #roleLdif.append(["cn",[str(role[1]),str(role[2])]]) #Fix me
+	    roleLdif.append(["fedoraRoleType",[str(role[2])]])
+	    roleLdif.append(["fedoraRoleDomain",[str(role[3])]])
+	    roleLdif.append(["fedoraRoleStatus",[str(role[4])]])
+	    roleLdif.append(["fedoraRoleSponsor",sponsor])
+	    roleLdif.append(["fedoraRoleCreationDate",[str(role[7])]])
+	    roleLdif.append(["fedoraRoleApprovalDate",[str(role[8])]])
+
+	    ldifWriter.unparse("cn=" + group[0] + ",cn=" + str(role[2]) +",cn=" + username[0] + " ou=Roles, ou=fedoraGroups,dc=fedoraproject,dc=org" , roleLdif )
+
+    roleCursor.close()
+      
     sys.exit(1)    
 if __name__ == "__main__":
     main()



From fedora-extras-commits at redhat.com  Thu Nov 30 04:05:26 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:05:26 -0500
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200611300405.kAU45QrT015579@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15547/FC-6

Modified Files:
	gaim-gaym.spec sources 
Log Message:
update to svn rel 293



Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gaim-gaym.spec	11 Nov 2006 22:31:58 -0000	1.4
+++ gaim-gaym.spec	30 Nov 2006 04:04:56 -0000	1.5
@@ -6,12 +6,17 @@
 
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
-#   svn release: 290
-%define alphatag 291svn
+#   svn release: 293
+#
+# Check out latest with:
+#   svn checkout \
+#       http://svn.berlios.de/svnroot/repos/qrc/qrc/branches/fork-for-gaim-2
+#
+%define alphatag 293svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.5.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.6.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -75,6 +80,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.96-3.6.293svn
+- update to svn rel 293, tag fork-for-gaim-2
+
 * Sat Nov 11 2006 Chris Weyl  0.96-3.5.291svn
 - update to svn rel 291, tag fork-for-gaim-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Nov 2006 22:31:58 -0000	1.5
+++ sources	30 Nov 2006 04:04:56 -0000	1.6
@@ -1,2 +1 @@
-9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz
-a54d56efc5021c996dacf2d100f5da51  qrc-0.96-291svn.tar.gz
+3bf6718fc366db509a783c0329169103  qrc-0.96-293svn.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 04:05:26 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:05:26 -0500
Subject: rpms/gaim-gaym/devel .cvsignore, 1.6, 1.7 gaim-gaym.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200611300405.kAU45QS5015584@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15547/devel

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
update to svn rel 293



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Nov 2006 22:31:59 -0000	1.6
+++ .cvsignore	30 Nov 2006 04:04:56 -0000	1.7
@@ -1,3 +1 @@
-qrc-0.96-290svn.tar.gz
-gaim-2.0.0beta4.tar.gz
-qrc-0.96-291svn.tar.gz
+qrc-0.96-293svn.tar.gz


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gaim-gaym.spec	11 Nov 2006 22:31:59 -0000	1.5
+++ gaim-gaym.spec	30 Nov 2006 04:04:56 -0000	1.6
@@ -6,12 +6,17 @@
 
 # it's not quite 0.97, but it's definitely:
 #   branch:      fork-for-gaim-2
-#   svn release: 290
-%define alphatag 291svn
+#   svn release: 293
+#
+# Check out latest with:
+#   svn checkout \
+#       http://svn.berlios.de/svnroot/repos/qrc/qrc/branches/fork-for-gaim-2
+#
+%define alphatag 293svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.5.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.6.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -75,6 +80,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.96-3.6.293svn
+- update to svn rel 293, tag fork-for-gaim-2
+
 * Sat Nov 11 2006 Chris Weyl  0.96-3.5.291svn
 - update to svn rel 291, tag fork-for-gaim-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Nov 2006 22:31:59 -0000	1.6
+++ sources	30 Nov 2006 04:04:56 -0000	1.7
@@ -1,2 +1 @@
-9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz
-a54d56efc5021c996dacf2d100f5da51  qrc-0.96-291svn.tar.gz
+3bf6718fc366db509a783c0329169103  qrc-0.96-293svn.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 04:17:36 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:17:36 -0500
Subject: rpms/gaim-gaym/devel sources,1.7,1.8
Message-ID: <200611300417.kAU4HaZb015761@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15730/devel

Modified Files:
	sources 
Log Message:
Always something...



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Nov 2006 04:04:56 -0000	1.7
+++ sources	30 Nov 2006 04:17:06 -0000	1.8
@@ -1 +1,2 @@
 3bf6718fc366db509a783c0329169103  qrc-0.96-293svn.tar.gz
+9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 04:17:35 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:17:35 -0500
Subject: rpms/gaim-gaym/FC-6 sources,1.6,1.7
Message-ID: <200611300417.kAU4HZTv015758@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15730/FC-6

Modified Files:
	sources 
Log Message:
Always something...



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Nov 2006 04:04:56 -0000	1.6
+++ sources	30 Nov 2006 04:17:05 -0000	1.7
@@ -1 +1,2 @@
 3bf6718fc366db509a783c0329169103  qrc-0.96-293svn.tar.gz
+9bd1d2a9191d4083ff8161b5683cc8a7  gaim-2.0.0beta4.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 04:19:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:19:43 -0500
Subject: rpms/gaim-gaym/FC-6 gaim-gaym.spec,1.5,1.6
Message-ID: <200611300419.kAU4JhLa015896@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15868/FC-6

Modified Files:
	gaim-gaym.spec 
Log Message:
bump


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/FC-6/gaim-gaym.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gaim-gaym.spec	30 Nov 2006 04:04:56 -0000	1.5
+++ gaim-gaym.spec	30 Nov 2006 04:19:13 -0000	1.6
@@ -16,7 +16,7 @@
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.6.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.7.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.96-3.7.293svn
+- bump
+
 * Wed Nov 29 2006 Chris Weyl  0.96-3.6.293svn
 - update to svn rel 293, tag fork-for-gaim-2
 



From fedora-extras-commits at redhat.com  Thu Nov 30 04:19:43 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Wed, 29 Nov 2006 23:19:43 -0500
Subject: rpms/gaim-gaym/devel gaim-gaym.spec,1.6,1.7
Message-ID: <200611300419.kAU4Jhm1015899@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15868/devel

Modified Files:
	gaim-gaym.spec 
Log Message:
bump


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-gaym.spec	30 Nov 2006 04:04:56 -0000	1.6
+++ gaim-gaym.spec	30 Nov 2006 04:19:13 -0000	1.7
@@ -16,7 +16,7 @@
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        3%{?alphatag:.6.%{alphatag}}%{?dist}
+Release:        3%{?alphatag:.7.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.96-3.7.293svn
+- bump
+
 * Wed Nov 29 2006 Chris Weyl  0.96-3.6.293svn
 - update to svn rel 293, tag fork-for-gaim-2
 



From fedora-extras-commits at redhat.com  Thu Nov 30 06:03:04 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:03:04 -0500
Subject: rpms/ocsinventory-client - New directory
Message-ID: <200611300603.kAU634n7022325@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22321/ocsinventory-client

Log Message:
Directory /cvs/extras/rpms/ocsinventory-client added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:03:09 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:03:09 -0500
Subject: rpms/ocsinventory-client/devel - New directory
Message-ID: <200611300603.kAU639hV022338@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22321/ocsinventory-client/devel

Log Message:
Directory /cvs/extras/rpms/ocsinventory-client/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:03:25 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:03:25 -0500
Subject: rpms/ocsinventory-client Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611300603.kAU63Pxe022368@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22362

Added Files:
	Makefile import.log 
Log Message:
Setup of module ocsinventory-client


--- NEW FILE Makefile ---
# Top level Makefile for module ocsinventory-client
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 Nov 30 06:03:30 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:03:30 -0500
Subject: rpms/ocsinventory-client/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611300603.kAU63UMv022383@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22362/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ocsinventory-client


--- 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 Nov 30 06:04:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:04:55 -0500
Subject: rpms/ocsinventory-client import.log,1.1,1.2
Message-ID: <200611300604.kAU64teB022472@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22437

Modified Files:
	import.log 
Log Message:
auto-import ocsinventory-client-1.0-0.5.RC3.fc7 on branch devel from ocsinventory-client-1.0-0.5.RC3.fc7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 06:03:25 -0000	1.1
+++ import.log	30 Nov 2006 06:04:24 -0000	1.2
@@ -0,0 +1 @@
+ocsinventory-client-1_0-0_5_RC3_fc7:HEAD:ocsinventory-client-1.0-0.5.RC3.fc7.src.rpm:1164866802



From fedora-extras-commits at redhat.com  Thu Nov 30 06:04:55 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:04:55 -0500
Subject: rpms/ocsinventory-client/devel ocsinventory-client.README, NONE,
	1.1 ocsinventory-client.README.fr, NONE,
	1.1 ocsinventory-client.patch, NONE,
	1.1 ocsinventory-client.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611300605.kAU64tRb022476@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22437/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ocsinventory-client.README ocsinventory-client.README.fr 
	ocsinventory-client.patch ocsinventory-client.spec 
Log Message:
auto-import ocsinventory-client-1.0-0.5.RC3.fc7 on branch devel from ocsinventory-client-1.0-0.5.RC3.fc7.src.rpm


--- NEW FILE ocsinventory-client.README ---
Thie RPM install the OCS Inventory NG client
It is configure to generate a local report:

	/var/log/ocsinventory-client/.ocs

If you want it to automaticaly transfer the result
to your organization communication server, 
edit the configuration file:

	/etc/ocsinventory-client/ocsinv.conf

Change the line
	local
To
	ocsserver.domain.tld:port

If you want to use the ocs TAG,
edit the administrative file:

	/etc/ocsinventory-client/ocsinv.adm

Change the lines
	TAG
	
To
	TAG
	tagvalue

If you want to deploy this client on a important number of
computer, you can generate a already configured RPM with

rpmbuild -bb \
	--define "ocstag    tagvalue" \
	--define "ocsserver ocsserver.domain.tld:port" \
	ocsinventory-client-.src.rpm

Result will be : ocsinventory-client-...rpm



--- NEW FILE ocsinventory-client.README.fr ---
Ce RPM installe le client d"OCS Inventory NG"
Il est configur?? pour g??n??rer un rapport local :

	/var/log/ocsinventory-client/.ocs

Si vous souhaitez transmettre ce rapport au serveur
de communication de votre organisation, ??ditez le
fichier de configuration :

	/etc/ocsinventory-client/ocsinv.conf

Modifiez la ligne
	local
en
	ocsserver.domain.tld:port

Si vous souhaitez utilise le TAG ocs,
??ditez le fichier admistratif :

	/etc/ocsinventory-client/ocsinv.adm

Modifiez les lignes
	TAG
	
en
	TAG
	tagvalue

Si vous d??sirez d??ployer ce client sur un parc important, vous
pouvez g??n??rer un RPM pr??configur?? ?? l'aide de la commande

rpmbuild -bb \
	--define "ocstag    tagvalue" \
	--define "ocsserver ocsserver.domain.tld:port" \
	ocsinventory-client-.src.rpm

Le r??sultat sera : ocsinventory-client-...rpm


ocsinventory-client.patch:

--- NEW FILE ocsinventory-client.patch ---
--- Ocsinventory/ocsinventory-client.pl.fedora	2006-07-03 22:27:03.000000000 +0200
+++ Ocsinventory/ocsinventory-client.pl	2006-11-28 19:04:59.000000000 +0100
@@ -35,7 +35,8 @@
 #
 use constant VERSION =>13;
 #
-my $log_path		= "/var/log/ocsinventory-client/ocsinv.log";
+my $log_folder		= "/var/log/ocsinventory-client";
+my $log_path		= $log_folder. "/ocsinv.log";
 my $default_server	= "ocsinventory-ng";
 my $install_path	= "/etc/ocsinventory-client";
 my $exe_path		= "/usr/sbin";
@@ -263,9 +264,6 @@
 	}elsif(-e "/etc/mandrake-release"){
 		$distro = 'Mandrake';
 		$distro_file = "/etc/mandrake-release";
-	}elsif(-e "/etc/redhat-release"){
-		$distro = 'Redhat';
-		$distro_file = "/etc/redhat-release";
 	}elsif(-e "/etc/SuSE-release"){
 		$distro = 'SuSe';
 		$distro_file = "/etc/SuSE-release";
@@ -276,11 +274,14 @@
 		$distro = 'Knoppix'; 
 		$distro_file = "/etc/knoppix_version";
 	}elsif(-e "/etc/fedora-release"){
-	   	$distro = 'Fedora Core';
+	   	$distro = 'Fedora';
 		$distro_file = "/etc/fedora-release";
 	}elsif(-e "/etc/trustix-release"){
 	   	$distro = 'Trustix';
 		$distro_file = "/etc/trustix-release";
+	}elsif(-e "/etc/redhat-release"){
+		$distro = 'Redhat';
+		$distro_file = "/etc/redhat-release";
 	}
 	
 	open DISTRO, $distro_file;
@@ -713,6 +714,7 @@
 
 sub _monitors{
 	# Looking for XFConfig
+	-e "/etc/X11/xorg.conf" and $xfree = "/etc/X11/xorg.conf";
 	-e "/etc/X11/XF86Config" and $xfree = "/etc/X11/XF86Config";
 	-e "/etc/X11/XF86Config-4" and $xfree = "/etc/X11/XF86Config-4";
 	-e "/etc/XF86Config" and $xfree = "/etc/XF86Config";
@@ -846,7 +848,7 @@
 		my $dpkg_path = &_get_path('dpkg');
 		@liste = `$dpkg_path -l`;
 		$dpkg = 1;
-	}elsif($distro=~/mandrake|redhat|suse/i){
+	}elsif($distro=~/mandrake|redhat|fedora|suse/i){
 		my $rpm_path = &_get_path('rpm');
 		my $buff;
 		foreach(`rpm -qa --queryformat "%{NAME} %{VERSION}-%{RELEASE} %{SUMMARY}\n--\n"`) {
@@ -894,23 +896,16 @@
 
 	# If $ServerName is local, we know that the inventory is generated on the local machine
 	if(($ServerName eq 'local') or $xml){
-		$err=1;
 
-		while($err){
-			print "\n\n\tChoose your target directory ? :  ";
-
-			chomp($ptmontage=);
+			$ptmontage=$log_folder;
 
 			# Checking existence and permissions of the destination directory
 			if(!(-e $ptmontage)){
-				print "The directory do not exist .\n";
-				$err++;
+				die("The directory do not exist .\n");
 			}elsif(!(-w $ptmontage)){
-				print "The mount point is not writeable.\n";
-				$err++;
+				die("The mount point is not writeable.\n");
 			# Generate...
 			}else{
-				$err = 0;
 				open XML, ">$ptmontage/$DeviceID.ocs" or die localtime()." => Cannot create file : $!\n";
 
 				if($xml){
@@ -924,8 +919,6 @@
 				close XML;
 			}
 
-			die("Abort.\n") if $err>3;
-		}
 		print localtime()." => Inventory generated...\n";
 	}else{
 		# Sending inventory to web server


--- NEW FILE ocsinventory-client.spec ---
%define tarname OCSNG_LINUX_AGENT_1.0RC3

# Can, optionaly, be define at build time (see README.fedora)
# - ocstag    : administrative tag
# - ocsserver : OCS Inventory NG communication serveur

Name:      ocsinventory-client
Version:   1.0
Release:   0.5.RC3%{?dist}%{?ocstag:.}%{?ocstag}
Summary:   Open Computer and Software Inventory Next Generation client

Group:     Development/Libraries
License:   GPL
URL:       http://ocsinventory.sourceforge.net/
Source0:   http://heanet.dl.sourceforge.net/sourceforge/ocsinventory/%{tarname}.tar.gz
Source1:   ocsinventory-client.README
Source2:   ocsinventory-client.README.fr
Patch0:    ocsinventory-client.patch

# Not noarch because of ipdiscover.c - BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: %{_sbindir}/dmidecode, perl
%if %{?fedora}0
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%else
%define perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
%endif
Requires:  perl(HTTP::Request)
Requires:  %{_sbindir}/dmidecode, coreutils, net-tools, pciutils
Requires:  %{_sysconfdir}/logrotate.d, %{_sysconfdir}/cron.daily

%description
Open Computer and Software Inventory Next Generation is an application
designed to help a network or system administrator keep track of computer
configuration and software installed on the network. 

It also allows deploying softwares, commands or files on Windows and 
Linux client computers.

%{name} provide the client agent for Linux.

%description -l fr
Open Computer and Software Inventory Next Generation est une application
destin??e ?? aider l'administrateur syst??me ou r??seau ?? garder un oeil sur
la configuration des machines du r??seau et sur les logiciels qui y sont
install??s. 

Elle autorise aussi la t??l??diffusion (ou d??ploiement) de logiciels, 
de commandes ou de fichiers sur les clients Windows ou Linux.

%{name} fournit l'agent client pour Linux.

%prep
%setup -q -n %{tarname}
%patch0 -p0 -b .fedora
%{__sed} -i -e 's/\r//' changelogs

cat <ocsinv.conf

  OCS_AGENT_DEVICE_ID
  $(%{_sbindir}/dmidecode --version)
  3
  %{?ocsserver}%{!?ocsserver:local}
  0

EOF

cat <ocsinv.adm

  
    TAG
    %{?ocstag}
  

EOF

cat <cron
#!/bin/sh
%{_sbindir}/ocsinventory-client.pl &>/dev/null
EOF

%{__sed} -i -e 's|PATH_TO_LOG_DIRECTORY|%{_localstatedir}/log/%{name}|' logrotate.ocsinventory-client

cp %{SOURCE1} README.fedora
cp %{SOURCE2} README.fedora.fr

%build
pushd Ocsinventory
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
popd
%{__cc} %{optflags} -o ipdiscover ipdiscover.c

%install
rm -rf %{buildroot}

pushd Ocsinventory
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+rwX,go+rX,go-w %{buildroot}/*
rm %{buildroot}%{perl_vendorlib}/Ocsinventory/ocsinventory-client.pl
popd

%{__install} -m 755 ipdiscover %{buildroot}%{_sbindir}

%{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}

%{__mkdir_p} %{buildroot}%{_sysconfdir}/%{name}
%{__install} -m 644 ocsinv.conf ocsinv.adm %{buildroot}%{_sysconfdir}/%{name}

%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d
%{__install} -m 644 logrotate.ocsinventory-client %{buildroot}%{_sysconfdir}/logrotate.d/%{name}

%{__mkdir_p} %{buildroot}%{_sysconfdir}/cron.daily
%{__install} -m 755 cron %{buildroot}%{_sysconfdir}/cron.daily/%{name}

%clean
rm -rf %{buildroot}

%post
# First install : generate DEVICE_ID
if [ "$1" -eq "1" ]
then   
    OCS_AGENT_DEVICE_ID=$(hostname)-$(date +%%Y-%%m-%%d-%%H-%%M-%%S)
    %{__sed} -i -e "s/OCS_AGENT_DEVICE_ID/$OCS_AGENT_DEVICE_ID/" %{_sysconfdir}/%{name}/ocsinv.conf
fi

%files
%defattr(-, root, root, -)
%doc changelogs README README.fedora
%lang(fr) %doc README.fedora.fr
%{perl_vendorlib}/Ocsinventory
%{_sbindir}/ocsinventory-client.pl
%{_sbindir}/ipdiscover
%dir %{_localstatedir}/log/%{name}
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/ocsinv.*
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%{_sysconfdir}/cron.daily/%{name}


%changelog
* Wed Nov 29 2006 Remi Collet  1.0-0.5.RC3
- Requires %%{_sysconfdir}/logrotate.d and %%{_sysconfdir}/cron.daily
- define perl_vendorlib on non-fedora (for RHEL3)

* Tue Nov 28 2006 Remi Collet  1.0-0.4.RC3
- requires %%{_sbindir}/dmidecode (kernel-utils in FC3) rather than dmidecode 
- requires perl(:MODULE_COMPAT) only on Fedora (not provided on RHEL3)
- patch improved (Fedora is RPM based)

* Mon Nov 27 2006 Remi Collet  1.0-0.3.RC3
- $RPM_OPT_FLAGS changed to %%{optflags}. 
- add not detected Requires perl(HTTP::Request)

* Sun Nov 26 2006 Remi Collet  1.0-0.2.RC3
- replace perl and dos2unix by sed
- split README.fedora

* Sun Nov 26 2006 Remi Collet  1.0-0.1.RC3
- initial spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 06:03:30 -0000	1.1
+++ .cvsignore	30 Nov 2006 06:04:25 -0000	1.2
@@ -0,0 +1 @@
+OCSNG_LINUX_AGENT_1.0RC3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 06:03:30 -0000	1.1
+++ sources	30 Nov 2006 06:04:25 -0000	1.2
@@ -0,0 +1 @@
+34edd057f1937245d06c3515c0ff50ad  OCSNG_LINUX_AGENT_1.0RC3.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 06:07:51 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:07:51 -0500
Subject: owners owners.list,1.2035,1.2036
Message-ID: <200611300607.kAU67pvY022533@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22518

Modified Files:
	owners.list 
Log Message:
	ocsinventory-client



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2035
retrieving revision 1.2036
diff -u -r1.2035 -r1.2036
--- owners.list	29 Nov 2006 10:53:58 -0000	1.2035
+++ owners.list	30 Nov 2006 06:07:21 -0000	1.2036
@@ -1232,6 +1232,7 @@
 Fedora Extras|obmenu|A graphical menu editor for the Openbox window manager|peter at thecodergeek.com|extras-qa at fedoraproject.org|
 Fedora Extras|ocaml|The Objective Caml compiler and programming environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ochusha|A GTK+ 2ch.net BBS Browser|mtasaka at ioa.s.u-tokyo.ac.jp|extras-qa at fedoraproject.org|
+Fedora Extras|ocsinventory-client|Open Computer and Software Inventory Next Generation client|Fedora at FamilleCollet.com|extras-qa at fedoraproject.org|
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oddjob|A D-BUS service which runs odd jobs on behalf of client applications|nalin at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 06:33:52 2006
From: fedora-extras-commits at redhat.com (Remi Collet (remi))
Date: Thu, 30 Nov 2006 01:33:52 -0500
Subject: rpms/ocsinventory-client/devel ocsinventory-client.spec,1.1,1.2
Message-ID: <200611300633.kAU6XqAj022651@cvs-int.fedora.redhat.com>

Author: remi

Update of /cvs/extras/rpms/ocsinventory-client/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22633

Modified Files:
	ocsinventory-client.spec 
Log Message:
	ExclusiveArch: i386 x86_64



Index: ocsinventory-client.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-client/devel/ocsinventory-client.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocsinventory-client.spec	30 Nov 2006 06:04:25 -0000	1.1
+++ ocsinventory-client.spec	30 Nov 2006 06:33:22 -0000	1.2
@@ -4,9 +4,11 @@
 # - ocstag    : administrative tag
 # - ocsserver : OCS Inventory NG communication serveur
 
+ExclusiveArch: i386 x86_64
+
 Name:      ocsinventory-client
 Version:   1.0
-Release:   0.5.RC3%{?dist}%{?ocstag:.}%{?ocstag}
+Release:   0.6.RC3%{?dist}%{?ocstag:.}%{?ocstag}
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Group:     Development/Libraries
@@ -142,6 +144,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Remi Collet  1.0-0.6.RC3
+- ExclusiveArch: i386 x86_64 (no dmidecode on other arch)
+
 * Wed Nov 29 2006 Remi Collet  1.0-0.5.RC3
 - Requires %%{_sysconfdir}/logrotate.d and %%{_sysconfdir}/cron.daily
 - define perl_vendorlib on non-fedora (for RHEL3)



From fedora-extras-commits at redhat.com  Thu Nov 30 06:40:01 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:01 -0500
Subject: rpms/perl-Gtk2-Ex-Utils/devel - New directory
Message-ID: <200611300640.kAU6e1F3022774@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22757/perl-Gtk2-Ex-Utils/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:39:55 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:39:55 -0500
Subject: rpms/perl-Gtk2-Ex-Utils - New directory
Message-ID: <200611300639.kAU6dt1s022761@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22757/perl-Gtk2-Ex-Utils

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Ex-Utils added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:40:09 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:09 -0500
Subject: rpms/perl-Gtk2-Ex-Utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611300640.kAU6e9gp022804@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22798

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Gtk2-Ex-Utils


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gtk2-Ex-Utils
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 Nov 30 06:40:14 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:14 -0500
Subject: rpms/perl-Gtk2-Ex-Utils/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200611300640.kAU6eEF0022819@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22798/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gtk2-Ex-Utils


--- 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 Nov 30 06:40:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:58 -0500
Subject: rpms/perl-Gtk2-Ex-Utils import.log,1.1,1.2
Message-ID: <200611300640.kAU6ewLs022907@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22862

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-Ex-Utils-0.09-1.fc6 on branch devel from perl-Gtk2-Ex-Utils-0.09-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 06:40:09 -0000	1.1
+++ import.log	30 Nov 2006 06:40:28 -0000	1.2
@@ -0,0 +1 @@
+perl-Gtk2-Ex-Utils-0_09-1_fc6:HEAD:perl-Gtk2-Ex-Utils-0.09-1.fc6.src.rpm:1164868972



From fedora-extras-commits at redhat.com  Thu Nov 30 06:40:58 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:40:58 -0500
Subject: rpms/perl-Gtk2-Ex-Utils/devel perl-Gtk2-Ex-Utils.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611300641.kAU6ewbL022911@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22862/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Gtk2-Ex-Utils.spec 
Log Message:
auto-import perl-Gtk2-Ex-Utils-0.09-1.fc6 on branch devel from perl-Gtk2-Ex-Utils-0.09-1.fc6.src.rpm


--- NEW FILE perl-Gtk2-Ex-Utils.spec ---
Name:           perl-Gtk2-Ex-Utils
Version:        0.09
Release:        1%{?dist}
Summary:        Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl
License:        LGPL 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Gtk2-Ex-Utils/
Source0:        http://www.cpan.org/authors/id/K/KC/KCK/Gtk2-Ex-Utils-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Gtk2) >= 1.04

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides simple utility functions useful for Gnome2/Gtk2 Perl
programming.

%prep
%setup -q -n Gtk2-Ex-Utils-%{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 {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes COPYRIGHT README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Nov 29 2006 Chris Weyl  0.09-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 06:40:14 -0000	1.1
+++ .cvsignore	30 Nov 2006 06:40:28 -0000	1.2
@@ -0,0 +1 @@
+Gtk2-Ex-Utils-0.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 06:40:14 -0000	1.1
+++ sources	30 Nov 2006 06:40:28 -0000	1.2
@@ -0,0 +1 @@
+076bb6914470fb077f7028fef0a795f8  Gtk2-Ex-Utils-0.09.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 06:41:02 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:41:02 -0500
Subject: owners owners.list,1.2036,1.2037
Message-ID: <200611300641.kAU6f2XP022912@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22888

Modified Files:
	owners.list 
Log Message:
added perl-Gtk2-Ex-Utils


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -r1.2036 -r1.2037
--- owners.list	30 Nov 2006 06:07:21 -0000	1.2036
+++ owners.list	30 Nov 2006 06:40:32 -0000	1.2037
@@ -472,7 +472,6 @@
 Fedora Extras|fwfstab|A graphical file system table editor|s.adam at diffingo.com|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|GraphicsMagick|An ImageMagick fork, offering faster image generation and better quality|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
@@ -638,6 +637,7 @@
 Fedora Extras|grads|Tool for easy acces, manipulation, and visualization of data|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|granule|Flashcards program based on Leitner methodology|3rdshift at comcast.net|extras-qa at fedoraproject.org|
+Fedora Extras|GraphicsMagick|An ImageMagick fork, offering faster image generation and better quality|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|graphviz|Graph Visualization Tools|jima at beer.tclug.org|extras-qa at fedoraproject.org|ellson at research.att.com
 Fedora Extras|graveman|A frontend for cdrtools, dvd+rw-tools and sox|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|grepmail|Search mailboxes for a particular email|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1503,6 +1503,7 @@
 Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GStreamer|GStreamer Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Gtk2-Ex-Utils|Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
 Fedora Extras|perl-Gtk2-Notify|Gtk2::Notify Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-Sexy|Perl interface to the sexy widget collection|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Nov 30 06:45:57 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:45:57 -0500
Subject: rpms/perl-Gtk2-Ex-Utils/devel perl-Gtk2-Ex-Utils.spec,1.1,1.2
Message-ID: <200611300645.kAU6jvxO023000@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22985

Modified Files:
	perl-Gtk2-Ex-Utils.spec 
Log Message:
release bump


Index: perl-Gtk2-Ex-Utils.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Utils/devel/perl-Gtk2-Ex-Utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gtk2-Ex-Utils.spec	30 Nov 2006 06:40:28 -0000	1.1
+++ perl-Gtk2-Ex-Utils.spec	30 Nov 2006 06:45:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-Utils
 Version:        0.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl
 License:        LGPL 
 Group:          Development/Libraries
@@ -47,5 +47,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.09-2
+- bump
+
 * Wed Nov 29 2006 Chris Weyl  0.09-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Thu Nov 30 06:53:40 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:40 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs - New directory
Message-ID: <200611300653.kAU6relm023115@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23111/perl-Gtk2-Ex-Dialogs

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:53:37 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:37 -0500
Subject: owners owners.list,1.2037,1.2038
Message-ID: <200611300653.kAU6rbeT023100@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23082

Modified Files:
	owners.list 
Log Message:
added perl-Gtk2-Ex-Dialogs


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2037
retrieving revision 1.2038
diff -u -r1.2037 -r1.2038
--- owners.list	30 Nov 2006 06:40:32 -0000	1.2037
+++ owners.list	30 Nov 2006 06:53:07 -0000	1.2038
@@ -1503,6 +1503,7 @@
 Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GStreamer|GStreamer Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Gtk2-Ex-Dialogs|Useful tools for Gnome2/Gtk2 Perl GUI design|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-Ex-Utils|Extra Gtk2 Utilities for working with Gnome2/Gtk2 in Perl|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ghenry at suretecsystems.com
 Fedora Extras|perl-Gtk2-Notify|Gtk2::Notify Perl module|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Nov 30 06:53:45 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:45 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel - New directory
Message-ID: <200611300653.kAU6rjqv023128@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23111/perl-Gtk2-Ex-Dialogs/devel

Log Message:
Directory /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 06:53:54 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:54 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611300653.kAU6rsgL023158@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23152

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Gtk2-Ex-Dialogs


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Gtk2-Ex-Dialogs
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 Nov 30 06:53:59 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:53:59 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611300653.kAU6rxoA023174@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23152/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Gtk2-Ex-Dialogs


--- 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 Nov 30 06:54:42 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:54:42 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs import.log,1.1,1.2
Message-ID: <200611300654.kAU6sg4u023243@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23212

Modified Files:
	import.log 
Log Message:
auto-import perl-Gtk2-Ex-Dialogs-0.11-1.fc6 on branch devel from perl-Gtk2-Ex-Dialogs-0.11-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 06:53:54 -0000	1.1
+++ import.log	30 Nov 2006 06:54:12 -0000	1.2
@@ -0,0 +1 @@
+perl-Gtk2-Ex-Dialogs-0_11-1_fc6:HEAD:perl-Gtk2-Ex-Dialogs-0.11-1.fc6.src.rpm:1164869797



From fedora-extras-commits at redhat.com  Thu Nov 30 06:54:42 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:54:42 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel perl-Gtk2-Ex-Dialogs.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611300654.kAU6sgmm023247@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23212/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Gtk2-Ex-Dialogs.spec 
Log Message:
auto-import perl-Gtk2-Ex-Dialogs-0.11-1.fc6 on branch devel from perl-Gtk2-Ex-Dialogs-0.11-1.fc6.src.rpm


--- NEW FILE perl-Gtk2-Ex-Dialogs.spec ---
Name:           perl-Gtk2-Ex-Dialogs
Version:        0.11
Release:        1%{?dist}
Summary:        Useful tools for Gnome2/Gtk2 Perl GUI design
License:        LGPL 
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Gtk2-Ex-Dialogs/
Source0:        http://www.cpan.org/authors/id/K/KC/KCK/Gtk2-Ex-Dialogs-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(File::Type) >= 0.22
BuildRequires:  perl(Gtk2) >= 1.04
BuildRequires:  perl(Gtk2::Ex::Utils) >= 0.08
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides a clean, simple, quick api to generate and use common
Gtk2 dialogs, either from within a full-blown Gtk2 app or as a one-off deal
inside a non-Gtk2 perl application.

%prep
%setup -q -n Gtk2-Ex-Dialogs-%{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 {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;

%{_fixperms} %{buildroot}/*

%check
make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes COPYRIGHT README TODO examples/
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Wed Nov 29 2006 Chris Weyl  0.11-1
- Specfile autogenerated by cpanspec 1.69.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 06:53:59 -0000	1.1
+++ .cvsignore	30 Nov 2006 06:54:12 -0000	1.2
@@ -0,0 +1 @@
+Gtk2-Ex-Dialogs-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 06:53:59 -0000	1.1
+++ sources	30 Nov 2006 06:54:12 -0000	1.2
@@ -0,0 +1 @@
+1ad86e1b3088971835a9393c710dbbfc  Gtk2-Ex-Dialogs-0.11.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 06:55:34 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Thu, 30 Nov 2006 01:55:34 -0500
Subject: rpms/perl-Gtk2-Ex-Dialogs/devel perl-Gtk2-Ex-Dialogs.spec,1.1,1.2
Message-ID: <200611300655.kAU6tYC1023317@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23299

Modified Files:
	perl-Gtk2-Ex-Dialogs.spec 
Log Message:
release bump


Index: perl-Gtk2-Ex-Dialogs.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2-Ex-Dialogs/devel/perl-Gtk2-Ex-Dialogs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Gtk2-Ex-Dialogs.spec	30 Nov 2006 06:54:12 -0000	1.1
+++ perl-Gtk2-Ex-Dialogs.spec	30 Nov 2006 06:55:04 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Gtk2-Ex-Dialogs
 Version:        0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Useful tools for Gnome2/Gtk2 Perl GUI design
 License:        LGPL 
 Group:          Development/Libraries
@@ -48,5 +48,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 29 2006 Chris Weyl  0.11-2
+- bump
+
 * Wed Nov 29 2006 Chris Weyl  0.11-1
 - Specfile autogenerated by cpanspec 1.69.1.



From fedora-extras-commits at redhat.com  Thu Nov 30 07:06:00 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Thu, 30 Nov 2006 02:06:00 -0500
Subject: rpms/openvrml/FC-6 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200611300706.kAU760kD026483@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26466

Modified Files:
	.cvsignore sources 
Log Message:
Uploaded openvrml-0.16.2.tar.gz.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Nov 2006 14:53:10 -0000	1.2
+++ .cvsignore	30 Nov 2006 07:05:30 -0000	1.3
@@ -1 +1 @@
-openvrml-0.16.1.tar.gz
+openvrml-0.16.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Nov 2006 14:53:10 -0000	1.2
+++ sources	30 Nov 2006 07:05:30 -0000	1.3
@@ -1 +1 @@
-6628c0d18078805d2b662b3509f537d3  openvrml-0.16.1.tar.gz
+8f93af7603ac8ddb22897658ccedc754  openvrml-0.16.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 07:31:22 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 30 Nov 2006 02:31:22 -0500
Subject: comps comps-fe5.xml.in, 1.205, 1.206 comps-fe6.xml.in, 1.232,
	1.233 comps-fe7.xml.in, 1.33, 1.34
Message-ID: <200611300731.kAU7VMci026770@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26746

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in comps-fe7.xml.in 
Log Message:
add xtide related and urlgfe


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- comps-fe5.xml.in	27 Nov 2006 14:40:47 -0000	1.205
+++ comps-fe5.xml.in	30 Nov 2006 07:30:52 -0000	1.206
@@ -255,6 +255,7 @@
       lapack
       libctl
       libmatheval
+      libtcd
       ncarg
       nco
       ncview
@@ -278,10 +279,13 @@
       scrip
       sextractor
       SIBsim4
+      tcd-utils
+      tideEditor
       toped
       wcstools
       wvs-data
       xdrawchem
+      xtide
     
   
   
@@ -548,6 +552,7 @@
       sylpheed
       sylpheed-claws
       transmission
+      urlgfe
       valknut
       x3270-x11
       xchat-gnome


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- comps-fe6.xml.in	27 Nov 2006 14:40:47 -0000	1.232
+++ comps-fe6.xml.in	30 Nov 2006 07:30:52 -0000	1.233
@@ -302,6 +302,7 @@
       lapack
       libctl
       libmatheval
+      libtcd
       ncarg
       nco
       ncview
@@ -327,12 +328,15 @@
       scrip
       sextractor
       SIBsim4
+      tcd-utils
+      tideEditor
       toped
       veusz
       wcstools
       wvs-data
       xcircuit
       xdrawchem
+      xtide
     
   
   
@@ -600,6 +604,7 @@
       sylpheed-claws
       transmission
       twinkle
+      urlgfe
       valknut
       x3270-x11
       xchat-gnome


Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- comps-fe7.xml.in	27 Nov 2006 01:57:37 -0000	1.33
+++ comps-fe7.xml.in	30 Nov 2006 07:30:52 -0000	1.34
@@ -303,6 +303,7 @@
       lapack
       libctl
       libmatheval
+      libtcd
       ncarg
       nco
       ncview
@@ -328,12 +329,15 @@
       scrip
       sextractor
       SIBsim4
+      tcd-utils
+      tideEditor
       toped
       veusz
       wcstools
       wvs-data
       xcircuit
       xdrawchem
+      xtide
     
   
   
@@ -601,6 +605,7 @@
       sylpheed-claws
       transmission
       twinkle
+      urlgfe
       valknut
       x3270-x11
       xchat-gnome



From fedora-extras-commits at redhat.com  Thu Nov 30 07:34:09 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Thu, 30 Nov 2006 02:34:09 -0500
Subject: rpms/openvrml/FC-6 openvrml.spec, 1.3,
	1.4 openvrml-gtkplug-info.patch, 1.1, NONE
Message-ID: <200611300734.kAU7Y9cP026840@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26783/FC-6

Modified Files:
	openvrml.spec 
Removed Files:
	openvrml-gtkplug-info.patch 
Log Message:
Updated to openvrml-0.16.2.


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/FC-6/openvrml.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openvrml.spec	28 Nov 2006 04:38:46 -0000	1.3
+++ openvrml.spec	30 Nov 2006 07:33:39 -0000	1.4
@@ -1,12 +1,11 @@
 # -*- rpm-spec -*-
 Name:           openvrml
-Version:        0.16.1
-Release:        5%{?dist}
+Version:        0.16.2
+Release:        1%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPL
 Group:          System Environment/Libraries
-Source:         http://prdownloads.sf.net/openvrml/%{name}-%{version}.tar.gz
-Patch:          openvrml-gtkplug-info.patch
+Source:         http://downloads.sf.net/openvrml/%{name}-%{version}.tar.gz
 URL:            http://openvrml.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig >= 0.12.0
@@ -80,8 +79,6 @@
 %prep
 %setup
 
-%patch -p1
-
 %build
 %configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG"
 %{__make} %{?_smp_mflags}
@@ -150,6 +147,10 @@
 
 
 %changelog
+* Thu Nov 30 2006  Braden McDaniel   - 0.16.2-1
+- Updated to 0.16.2; openvrml-gtkplug-info.patch is no longer
+  necessary.
+
 * Mon Nov 27 2006  Braden McDaniel   - 0.16.1-5
 - openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
   development headers are not wise to gcc symbol visibility mojo and as


--- openvrml-gtkplug-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 30 07:34:10 2006
From: fedora-extras-commits at redhat.com (Braden McDaniel (braden))
Date: Thu, 30 Nov 2006 02:34:10 -0500
Subject: rpms/openvrml/devel .cvsignore, 1.2, 1.3 openvrml.spec, 1.4,
	1.5 sources, 1.2, 1.3 openvrml-gtkplug-info.patch, 1.1, NONE
Message-ID: <200611300734.kAU7YALg026845@cvs-int.fedora.redhat.com>

Author: braden

Update of /cvs/extras/rpms/openvrml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26783/devel

Modified Files:
	.cvsignore openvrml.spec sources 
Removed Files:
	openvrml-gtkplug-info.patch 
Log Message:
Updated to openvrml-0.16.2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Nov 2006 14:53:10 -0000	1.2
+++ .cvsignore	30 Nov 2006 07:33:40 -0000	1.3
@@ -1 +1 @@
-openvrml-0.16.1.tar.gz
+openvrml-0.16.2.tar.gz


Index: openvrml.spec
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openvrml.spec	28 Nov 2006 04:43:39 -0000	1.4
+++ openvrml.spec	30 Nov 2006 07:33:40 -0000	1.5
@@ -1,12 +1,11 @@
 # -*- rpm-spec -*-
 Name:           openvrml
-Version:        0.16.1
-Release:        5%{?dist}
+Version:        0.16.2
+Release:        1%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPL
 Group:          System Environment/Libraries
-Source:         http://prdownloads.sf.net/openvrml/%{name}-%{version}.tar.gz
-Patch:          openvrml-gtkplug-info.patch
+Source:         http://downloads.sf.net/openvrml/%{name}-%{version}.tar.gz
 URL:            http://openvrml.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig >= 0.12.0
@@ -80,8 +79,6 @@
 %prep
 %setup
 
-%patch -p1
-
 %build
 %configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG"
 %{__make} %{?_smp_mflags}
@@ -150,6 +147,10 @@
 
 
 %changelog
+* Thu Nov 30 2006  Braden McDaniel   - 0.16.2-1
+- Updated to 0.16.2; openvrml-gtkplug-info.patch is no longer
+  necessary.
+
 * Mon Nov 27 2006  Braden McDaniel   - 0.16.1-5
 - openvrml: Removed -fvisibility=hidden from CXXFLAGS.  Mozilla
   development headers are not wise to gcc symbol visibility mojo and as


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvrml/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Nov 2006 14:53:10 -0000	1.2
+++ sources	30 Nov 2006 07:33:40 -0000	1.3
@@ -1 +1 @@
-6628c0d18078805d2b662b3509f537d3  openvrml-0.16.1.tar.gz
+8f93af7603ac8ddb22897658ccedc754  openvrml-0.16.2.tar.gz


--- openvrml-gtkplug-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Nov 30 09:37:07 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 30 Nov 2006 04:37:07 -0500
Subject: rpms/audacious/devel .cvsignore, 1.6, 1.7 audacious.spec, 1.17,
	1.18 sources, 1.6, 1.7
Message-ID: <200611300937.kAU9b7en001435@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1416

Modified Files:
	.cvsignore audacious.spec sources 
Log Message:

- Update to 1.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Nov 2006 18:37:53 -0000	1.6
+++ .cvsignore	30 Nov 2006 09:36:37 -0000	1.7
@@ -1 +1 @@
-audacious-1.2.1.tgz
+audacious-1.2.2.tgz


Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audacious.spec	26 Nov 2006 18:33:48 -0000	1.17
+++ audacious.spec	30 Nov 2006 09:36:37 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           audacious
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        A GTK2 based media player similar to xmms
 
@@ -12,7 +12,7 @@
 Patch1:         audacious-1.1.0-default-skin.patch
 # Patch2:         audacious-1.1.0-no-rpath.patch
 Patch3:         audacious-1.2.1-relative-links.patch
-Patch4:         audacious-1.1.0-quoting.patch
+# Patch4:         audacious-1.1.0-quoting.patch
 # Patch5:         audacious-1.1.0-amidi-backend.patch
 Patch6:         audacious-1.2.1-shaded-skin.patch
 Patch7:         audacious-1.1.1-controlsocket-name.patch
@@ -80,7 +80,7 @@
 %patch3 -p1 -b .relative-links
 
 # Filename quoting
-%patch4 -p1 -b .quoting
+# %patch4 -p1 -b .quoting
 
 # Amidi backends path
 # %patch5 -p1 -b .amidi-backend
@@ -175,6 +175,9 @@
 
 
 %changelog
+* Sun Nov 30 2006 Ralf Ertzinger  1.2.2-1.fc7
+- Update to 1.2.2
+
 * Sun Nov 26 2006 Ralf Ertzinger  1.2.1-1.fc7
 - Update to 1.2.1
 - Split off libaudacious into a separate package to handle the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Nov 2006 18:37:53 -0000	1.6
+++ sources	30 Nov 2006 09:36:37 -0000	1.7
@@ -1 +1 @@
-f718f66ec0cab46bf6210d2243d12be1  audacious-1.2.1.tgz
+e774afbda04220e6e1b0a9bff350522e  audacious-1.2.2.tgz



From fedora-extras-commits at redhat.com  Thu Nov 30 09:46:14 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Thu, 30 Nov 2006 04:46:14 -0500
Subject: rpms/audacious-plugins/devel .cvsignore, 1.2,
	1.3 audacious-plugins.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200611300946.kAU9kEan001635@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/audacious-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1616

Modified Files:
	.cvsignore audacious-plugins.spec sources 
Log Message:

- Update to 1.2.5
- Add audacious-plugins-wavpack for WavPack input plugin
- Drop cddb patch, included upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2006 18:25:47 -0000	1.2
+++ .cvsignore	30 Nov 2006 09:45:44 -0000	1.3
@@ -1 +1 @@
-audacious-plugins-fedora-1.2.2.tar.gz
+audacious-plugins-fedora-1.2.5.tar.gz


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audacious-plugins.spec	26 Nov 2006 18:39:51 -0000	1.2
+++ audacious-plugins.spec	30 Nov 2006 09:45:44 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           audacious-plugins
-Version:        1.2.2
+Version:        1.2.5
 Release:        1%{?dist}
 Summary:        Plugins for the Audacious media player
 
@@ -25,6 +25,7 @@
 BuildRequires:  arts-devel, libmodplug-devel, lirc-devel
 BuildRequires:  jack-audio-connection-kit-devel, libsamplerate-devel
 BuildRequires:  pulseaudio-devel, fluidsynth-devel
+BuildRequires:  wavpack-devel >= 4.31
 
 Requires:       audacious >= 1.2.0
 
@@ -99,11 +100,23 @@
 
 
 
+%package        wavpack
+Summary:        Audacious imput plugin for wavpack
+Group:          Applications/Multimedia
+
+Requires:       audacious >= 1.2.0, audacious-plugins >= 1.2.0
+
+%description    wavpack
+This package provides an Audacious input plugin that reads WavPack
+compressed files.
+
+
+
 %prep
 %setup -q -n audacious-plugins-fedora-%{version}
 
 # Fix incorrect use of sprintf in the cdaudio plugin
-%patch0 -p1 -b .cddb-buffer
+# %patch0 -p1 -b .cddb-buffer
 
 %build
 %configure \
@@ -145,6 +158,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_libdir}/audacious
 %exclude %{_libdir}/audacious/Input/libamidi-plug.so
+%exclude %{_libdir}/audacious/Input/libwavpack.so
 %exclude %{_libdir}/audacious/Output/libjackout.so
 %exclude %{_libdir}/audacious/Output/libarts.so
 %exclude %{_libdir}/audacious/Output/libESD.so
@@ -152,6 +166,7 @@
 %{_datadir}/applications/fedora-audacious-plugins.desktop
 %{_datadir}/audacious/images/audioscrobbler.png
 %{_datadir}/audacious/images/audioscrobbler_badge.png
+%{_datadir}/audacious-plugins/paranormal
 
 %files jack
 %defattr(-,root,root,-)
@@ -175,7 +190,16 @@
 %{_libdir}/audacious/Input/libamidi-plug.so
 %{_libdir}/amidi-plug
 
+%files wavpack
+%defattr(-,root,root,-)
+%{_libdir}/audacious/Input/libwavpack.so
+
 
 %changelog
+* Thu Nov 30 2006 Ralf Ertzinger  1.2.5-1.fc7
+- Update to 1.2.5
+- Add audacious-plugins-wavpack for WavPack input plugin
+- Drop cddb patch, included upstream
+
 * Sun Nov 26 2006 Ralf Ertzinger  1.2.2-1.fc7
 - Initial RPM build for FE


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2006 18:25:47 -0000	1.2
+++ sources	30 Nov 2006 09:45:44 -0000	1.3
@@ -1 +1 @@
-8ac7f73da7432e1ffed6c2b9b0fced8c  audacious-plugins-fedora-1.2.2.tar.gz
+85311ebd8580d372fb3f7e0733185514  audacious-plugins-fedora-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 10:53:55 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 30 Nov 2006 05:53:55 -0500
Subject: extras-buildsys/utils/pushscript WhatsNew.py,NONE,1.1
Message-ID: <200611301054.kAUArtxT004968@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4954

Added Files:
	WhatsNew.py 
Log Message:
trying something


--- NEW FILE WhatsNew.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 errno, os, sys
import fnmatch
import pickle
import rpmUtils.transaction, rpmUtils.miscutils

import Utils

names = {}

def rebuild(dist,srcdir):
    ts = rpmUtils.transaction.initReadOnlyTransaction()

    # Create map of maps: dist -> src.rpm %name -> True
    names.setdefault(dist,{})
   
    for root, dirs, files in os.walk(srcdir):
            for f in fnmatch.filter(files,'*.src.rpm'):
                srcfile = os.path.join(root,f)
                hdr = rpmUtils.miscutils.hdrFromPackage(ts,srcfile)
                set(dist,hdr['name'])


def set(dist,name):
    names[dist].setdefault(name,True)


def get(dist,name):
    return names[dist].has_key(name)


def save(workdir):
    f = file(os.path.join(workdir,'pkgnamesdict.pickle'),'w')
    pickle.dump(names,f)
    f.close()


def load(workdir):
    global names
    names = {}
    try:
        f = file(os.path.join(workdir,'pkgnamesdict.pickle'),'r')
    except:
        return
    names = pickle.load(f)
    f.close()


def main(cfg):
    global names
    names = {}
    for dist in cfg.alldists:
        srcdir = os.path.join(cfg.treedir,dist,'SRPMS')
        rebuild(dist,srcdir)
    save(cfg.rundir)


if __name__ == '__main__':
    if len(sys.argv) < 2:
        print 'Usage: %s \n' % os.path.basename(sys.argv[0])
        sys.exit(errno.EINVAL)

    cfg = Utils.load_config_module(sys.argv[1])

    Utils.signer_gid_check(cfg.signersgid)
    os.umask(cfg.signersumask)
    
    main(cfg)
    sys.exit(0)



From fedora-extras-commits at redhat.com  Thu Nov 30 10:56:49 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Thu, 30 Nov 2006 05:56:49 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.19,1.20
Message-ID: <200611301056.kAUAunBl005002@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4987

Modified Files:
	Push.py 
Log Message:
trying something


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Push.py	25 Nov 2006 21:07:43 -0000	1.19
+++ Push.py	30 Nov 2006 10:56:49 -0000	1.20
@@ -24,7 +24,7 @@
 import tempfile
 import time
 
-import Utils, MultiLib, Comps
+import Utils, MultiLib, Comps, WhatsNew
 import RepoBuild, RepoPrune, RepoView
 
 DEBUG = False
@@ -365,7 +365,17 @@
     if not os.path.exists(destloc):
         rollback.append(destloc)
         Utils.install_move(package,destloc)
-        buildreportinfo = '%s-%s-%s\n' % (n,v,r)
+        if WhatsNew.get(dist,name):
+            buildreportinfo = '%s-%s-%s\n' % (n,v,r)
+        else:
+            tmp1 = '%s-%s-%s' % (n,v,r)
+            tmp1len = len(tmp1)
+            linelen = 66
+            if tmp1len < linelen:
+                buildreportinfo = tmp1+' '*(linelen-tmp1len)
+            else:
+                buildreportinfo = tmp1+'    '
+            buildreportinfo += 'NEW\n'
     else:  # src.rpm published before, exclude entire build job
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
         buildreportinfo = 'Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
@@ -487,6 +497,8 @@
     repolock.unlock()
 
     try:
+        WhatsNew.load(cfg.rundir)
+        
         print "Signing Packages:"
         rv = sign_pkgs( find_files(signtmpdir,'*.rpm') )
         if rv:
@@ -515,6 +527,9 @@
                     print e
                 except rpmUtils.RpmUtilsError, e:
                     print e
+            WhatsNew.set(dist,name)
+        
+        WhatsNew.save(cfg.rundir)
     except:
         shutil.rmtree(signtmpdir)
         raise



From fedora-extras-commits at redhat.com  Thu Nov 30 11:33:18 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:33:18 -0500
Subject: rpms/tachyon - New directory
Message-ID: <200611301133.kAUBXIjY008233@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8229/tachyon

Log Message:
Directory /cvs/extras/rpms/tachyon added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 11:33:23 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:33:23 -0500
Subject: rpms/tachyon/devel - New directory
Message-ID: <200611301133.kAUBXN3s008246@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8229/tachyon/devel

Log Message:
Directory /cvs/extras/rpms/tachyon/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 11:33:41 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:33:41 -0500
Subject: rpms/tachyon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611301133.kAUBXfI7008291@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8270/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tachyon


--- 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 Nov 30 11:33:41 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:33:41 -0500
Subject: rpms/tachyon Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611301133.kAUBXfLc008276@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8270

Added Files:
	Makefile import.log 
Log Message:
Setup of module tachyon


--- NEW FILE Makefile ---
# Top level Makefile for module tachyon
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 Nov 30 11:53:21 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:53:21 -0500
Subject: rpms/tachyon import.log,1.1,1.2
Message-ID: <200611301153.kAUBrLZl008432@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8396

Modified Files:
	import.log 
Log Message:
auto-import tachyon-0.97-2 on branch devel from tachyon-0.97-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tachyon/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 11:33:41 -0000	1.1
+++ import.log	30 Nov 2006 11:52:51 -0000	1.2
@@ -0,0 +1 @@
+tachyon-0_97-2:HEAD:tachyon-0.97-2.src.rpm:1164887822



From fedora-extras-commits at redhat.com  Thu Nov 30 11:53:22 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 06:53:22 -0500
Subject: rpms/tachyon/devel tachyon-rpm.patch, NONE, 1.1 tachyon.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611301153.kAUBrM1D008436@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tachyon-rpm.patch tachyon.spec 
Log Message:
auto-import tachyon-0.97-2 on branch devel from tachyon-0.97-2.src.rpm

tachyon-rpm.patch:

--- NEW FILE tachyon-rpm.patch ---
--- tachyon/unix/Make-arch.r	2005-03-18 16:28:05.000000000 +0100
+++ tachyon/unix/Make-arch	2006-11-29 19:54:45.000000000 +0100
@@ -15,7 +15,7 @@
 
 MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
 MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC)
-MISCFLAGS=$(MISCDEFS) $(MISCINC)
+MISCFLAGS=$(MISCDEFS) $(MISCINC) $(OPTFLAGS)
 MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
 
 default:
@@ -915,7 +915,7 @@
 	"CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
 
@@ -927,7 +927,7 @@
 	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
 
@@ -936,10 +936,10 @@
 	$(MAKE) all \
 	"ARCH = linux-64-thr" \
 	"CC = gcc" \
-	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
+	"CFLAGS = -m64 -Wall -O2 -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
 
@@ -1035,10 +1035,10 @@
 	$(MAKE) all \
 	"ARCH = linux-thr" \
 	"CC = gcc" \
-	"CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
 
@@ -1047,7 +1047,7 @@
 	$(MAKE) all \
 	"ARCH = linux-thr-ogl" \
 	"CC = cc" \
-	"CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+	"CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
 	"STRIP = touch" \
@@ -1081,37 +1081,61 @@
 linux-lam:
 	$(MAKE) all \
 	"ARCH = linux-lam" \
-	"CC = hcc" \
-	"CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+	"CC = mpicc" \
+	"CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
+
+# Linux x86 using LAM MPI, with OpenGL display
+linux-lam-ogl:
+	$(MAKE) all \
+	"ARCH = linux-lam-ogl" \
+	"CC = mpicc" \
+	"CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
-	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
 
 # Linux AMD64/EM64T using LAM MPI
-linux-lam-64:
+linux-64-lam:
 	$(MAKE) all \
-	"ARCH = linux-lam-64" \
-	"CC = hcc" \
-	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
+	"ARCH = linux-64-lam" \
+	"CC = mpicc" \
+	"CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
-	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
 
 # Linux AMD64/EM64T using LAM MPI, with OpenGL display
-linux-lam-64-ogl:
+linux-64-lam-ogl:
 	$(MAKE) all \
-	"ARCH = linux-lam-64-ogl" \
-	"CC = hcc" \
-	"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"ARCH = linux-64-lam-ogl" \
+	"CC = mpicc" \
+	"CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
 	"AR = ar" \
 	"ARFLAGS = r" \
-	"STRIP = strip" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using threads with OpenGL display
+linux-64-thr-ogl:
+	$(MAKE) all \
+	"ARCH = linux-64-thr-ogl" \
+	"CC = gcc" \
+	"CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
 	"RANLIB = ranlib" \
-	"LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
 
 # Linux x86 using LAM MPI and threads
 linux-lam-thr:
@@ -1149,6 +1173,54 @@
 	"RANLIB = ranlib" \
 	"LIBS = -L. -ltachyon $(MISCLIB) -lm"
 
+# Linux PPC using gcc and threads
+linux-ppc-thr:
+	$(MAKE) all \
+	"ARCH = linux-ppc-thr" \
+	"CC = gcc" \
+	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
+
+# Linux PPC using threads with OpenGL display
+linux-ppc-thr-ogl:
+	$(MAKE) all \
+	"ARCH = linux-ppc-thr-ogl" \
+	"CC = gcc" \
+	"CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
+
+# Linux AMD64/EM64T using LAM MPI
+linux-ppc-lam:
+	$(MAKE) all \
+	"ARCH = linux-ppc-lam" \
+	"CC = mpicc" \
+	"CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using LAM MPI, with OpenGL display
+linux-ppc-lam-ogl:
+	$(MAKE) all \
+	"ARCH = linux-ppc-lam-ogl" \
+	"CC = mpicc" \
+	"CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+	"AR = ar" \
+	"ARFLAGS = r" \
+	"STRIP = touch" \
+	"RANLIB = ranlib" \
+	"LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
 # Linux PPC using gcc 
 linux-ps2:
 	$(MAKE) all \
--- tachyon/unix/Make-config.r	2004-03-05 20:41:03.000000000 +0100
+++ tachyon/unix/Make-config	2006-11-29 19:51:01.000000000 +0100
@@ -57,7 +57,7 @@
 ##########################################################################
 
 # Standard MPICH installation location
-MPIDIR=/usr/local/mpi
+MPIDIR=/usr
 
 # UMR CS Dept
 #MPIDIR=/software/all/mpi
@@ -108,14 +108,14 @@
 #   http://www.ijg.org/files/
 ##########################################################################
 # Uncomment the following lines to disable JPEG support
-USEJPEG=
-JPEGINC=
-JPEGLIB=
+#USEJPEG=
+#JPEGINC=
+#JPEGLIB=
 
 # Uncomment the following lines to enable JPEG support
-#USEJPEG= -DUSEJPEG
-#JPEGINC= -I/usr/local/include
-#JPEGLIB= -L/usr/local/lib -ljpeg
+USEJPEG= -DUSEJPEG
+JPEGINC= 
+JPEGLIB= -ljpeg
 
 
 ##########################################################################
@@ -128,14 +128,14 @@
 #   http://www.libpng.org/
 ##########################################################################
 # Uncomment the following lines to disable PNG support
-USEPNG=
-PNGINC=
-PNGLIB=
+#USEPNG=
+#PNGINC=
+#PNGLIB=
 
 # Uncomment the following lines to enable PNG support
-#USEPNG= -DUSEPNG
-#PNGINC= -I/usr/local/include
-#PNGLIB= -L/usr/local/lib -lpng -lz
+USEPNG= -DUSEPNG
+PNGINC= `pkg-config --cflags libpng`
+PNGLIB= `pkg-config --libs libpng`
 
 
 ##########################################################################
--- tachyon/unix/Make-opengl.r	2004-02-04 07:36:06.000000000 +0100
+++ tachyon/unix/Make-opengl	2006-11-29 19:51:01.000000000 +0100
@@ -9,8 +9,8 @@
 #
 # Generic Mesa OpenGL / GLX include and link specs, for most platforms
 #
-MESA_GLX_INCS = -I/usr/local/include
-MESA_GLX_LIBS = -L/usr/local/lib -lMesaGL -lMesaGLU
+MESA_GLX_INCS = 
+MESA_GLX_LIBS = -lGL -lGLU -lX11
 
 
 #
@@ -37,8 +37,8 @@
 #
 # Linux OpenGL / GLX include and link specs
 #
-LINUX_GLX_INCS = -I/usr/X11R6/include
-LINUX_GLX_LIBS = -L/usr/X11R6/lib -lGL -lGLU -lX11
+LINUX_GLX_INCS = 
+LINUX_GLX_LIBS = -lGL -lGLU -lX11
 
 
 #


--- NEW FILE tachyon.spec ---
%ifarch %{ix86}
%define target linux
%endif
%ifarch x86_64
%define target linux-64
%endif
%ifarch ppc
%define target linux-ppc
%endif

Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
Version: 0.97
Release: 2%{?dist}
URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
Group: Applications/Engineering
Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz
Patch0: %{name}-rpm.patch
License: BSD
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: mesa-libGLU-devel
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: lam-devel

%description
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations.  Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application.  The distribution also includes a simple scene
file parser front-end which reads a few different formats.

This package contains pthread build.

%package gl
Summary: Parallel / Multiprocessor Ray Tracing System
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}

%description gl
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations.  Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application.  The distribution also includes a simple scene
file parser front-end which reads a few different formats.

This package contains pthread build with OpenGL display.

%package lam
Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}

%description lam
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations.  Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application.  The distribution also includes a simple scene
file parser front-end which reads a few different formats.

This package contains LAM build.

%package lam-gl
Summary: Parallel / Multiprocessor Ray Tracing System with OpenGL display
Group: Applications/Engineering
Provides: %{name} = %{version}-%{release}

%description lam-gl
A portable, high performance parallel ray tracing system supporting MPI
and multithreaded implementations.  Tachyon is built as a C callable
library, which can be used with the included demo programs or within
your own application.  The distribution also includes a simple scene
file parser front-end which reads a few different formats.

This package contains LAM build with OpenGL display.

%package docs
Summary: Documentation and example scenes for tachyon
Group: Documentation
Requires: %{name} = %{version}-%{release}

%description docs
This package contains documentation and example scenes for rendering
with tachyon.

%prep
%setup -q -n %{name}
%patch0 -p1 -b .r
find . -name CVS | xargs %{__rm} -rf
chmod 644 src/hash.*
chmod 644 demosrc/trackball.c
chmod 644 scenes/imaps/*

%build
pushd unix
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr-ogl
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam
%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam-ogl
popd

%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon}
for variant in -thr -thr-ogl -lam -lam-ogl ; do
  install -pm755 compile/%{target}$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon$variant
done
rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
%{__rm} docs/tachyon/images.idx
%{__mv} docs/tachyon docs/html
%{__cp} -pr scenes $RPM_BUILD_ROOT%{_datadir}/tachyon/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}

%files gl
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-ogl

%files lam
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-lam

%files lam-gl
%defattr(644,root,root,755)
%doc Changes Copyright README
%attr(755,root,root) %{_bindir}/%{name}-lam-ogl

%files docs
%defattr(644,root,root,755)
%doc docs/tachyon.pdf docs/tachyon.ps docs/html
%{_datadir}/tachyon

%changelog
* Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski  0.97-2
- use only kosher CFLAGS
- fix target setting

* Tue Nov 28 2006 Dominik 'Rathann' Mierzejewski  0.97-1
- initial build
- patch to add necessary build targets


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tachyon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 11:33:41 -0000	1.1
+++ .cvsignore	30 Nov 2006 11:52:52 -0000	1.2
@@ -0,0 +1 @@
+tachyon-0.97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tachyon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 11:33:41 -0000	1.1
+++ sources	30 Nov 2006 11:52:52 -0000	1.2
@@ -0,0 +1 @@
+198953aea283a7158eef2ee079e909f6  tachyon-0.97.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 12:09:39 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 07:09:39 -0500
Subject: owners owners.list,1.2038,1.2039
Message-ID: <200611301209.kAUC9dqT011601@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11586

Modified Files:
	owners.list 
Log Message:
Add myself as the maintainer of tachyon


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2038
retrieving revision 1.2039
diff -u -r1.2038 -r1.2039
--- owners.list	30 Nov 2006 06:53:07 -0000	1.2038
+++ owners.list	30 Nov 2006 12:09:08 -0000	1.2039
@@ -2274,6 +2274,7 @@
 Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|jamatos at fc.up.pt,roozbeh at farsiweb.info
 Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|jamatos at fc.up.pt,roozbeh at farsiweb.info
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
+Fedora Extras|tachyon|Parallel / Multiprocessor Ray Tracing System|rpm at greysector.net|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|tango-icon-theme|Icons from Tango Project|raven at pmail.pl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 13:29:59 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 30 Nov 2006 08:29:59 -0500
Subject: rpms/k3d/FC-5 .cvsignore,1.4,1.5 k3d.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200611301329.kAUDTxWO015568@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15547

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Aug 2006 11:38:10 -0000	1.4
+++ .cvsignore	30 Nov 2006 13:29:29 -0000	1.5
@@ -1 +1 @@
-k3d-0.6.0.0-src.tar.bz2
+k3d-0.6.4.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-5/k3d.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- k3d.spec	22 Aug 2006 11:41:41 -0000	1.3
+++ k3d.spec	30 Nov 2006 13:29:29 -0000	1.4
@@ -1,7 +1,7 @@
 
 Name:           k3d
-Version:        0.6.0.0
-Release:        1%{?dist}.1
+Version:        0.6.4.0
+Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -152,6 +152,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Denis Leroy  - 0.6.4.0-1
+- Update to 0.6.4.0
+
 * Tue Aug 22 2006 Denis Leroy  - 0.6.0.0-1.1
 - Updated sources
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Aug 2006 11:38:10 -0000	1.4
+++ sources	30 Nov 2006 13:29:29 -0000	1.5
@@ -1 +1 @@
-c9642b1483ddd3e1adc6d4118ba677e4  k3d-0.6.0.0-src.tar.bz2
+3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 13:47:57 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 30 Nov 2006 08:47:57 -0500
Subject: rpms/wbxml2/FC-5 wbxml2.spec,1.9,1.10
Message-ID: <200611301347.kAUDlvwN015693@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15631/FC-5

Modified Files:
	wbxml2.spec 
Log Message:
- Use iconv instead of mock. Bug #217848.



Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-5/wbxml2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wbxml2.spec	29 Nov 2006 10:18:56 -0000	1.9
+++ wbxml2.spec	30 Nov 2006 13:47:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel zlib-devel popt 
-BuildRequires:  recode
 
 %description
 The WBXML Library (libwbxml) contains a library and its associated tools to
@@ -43,7 +42,7 @@
 
 # Recode to UTF-8 several doc files
 for file in ChangeLog README NEWS References; do
-  recode l1..utf8 $file
+  /usr/bin/iconv -f iso8859-1 -t utf-8 $file
 done
 
 # no line terminator, add one
@@ -87,6 +86,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Laurent Rineau  - 0.9.2-6
+- Use iconv instead of mock. Bug #217848.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
 - Changed the Summarys and descriptions.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 13:47:58 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 30 Nov 2006 08:47:58 -0500
Subject: rpms/wbxml2/FC-6 wbxml2.spec,1.10,1.11
Message-ID: <200611301348.kAUDlwII015696@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15631/FC-6

Modified Files:
	wbxml2.spec 
Log Message:
- Use iconv instead of mock. Bug #217848.



Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/FC-6/wbxml2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wbxml2.spec	29 Nov 2006 10:18:56 -0000	1.10
+++ wbxml2.spec	30 Nov 2006 13:47:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel zlib-devel popt 
-BuildRequires:  recode
 
 %description
 The WBXML Library (libwbxml) contains a library and its associated tools to
@@ -43,7 +42,7 @@
 
 # Recode to UTF-8 several doc files
 for file in ChangeLog README NEWS References; do
-  recode l1..utf8 $file
+  /usr/bin/iconv -f iso8859-1 -t utf-8 $file
 done
 
 # no line terminator, add one
@@ -87,6 +86,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Laurent Rineau  - 0.9.2-6
+- Use iconv instead of mock. Bug #217848.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
 - Changed the Summarys and descriptions.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 13:48:02 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 30 Nov 2006 08:48:02 -0500
Subject: rpms/gparted/FC-6 gparted-parted-check.patch, NONE, 1.1 gparted.spec,
	1.14, 1.15
Message-ID: <200611301348.kAUDm2Hd015697@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15659

Modified Files:
	gparted.spec 
Added Files:
	gparted-parted-check.patch 
Log Message:
* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
- Rebuild for new parted


gparted-parted-check.patch:

--- NEW FILE gparted-parted-check.patch ---
--- configure.in	2006/09/11 09:46:42	1.62
+++ configure.in	2006/09/14 20:34:49	1.63
@@ -33,7 +33,8 @@
 AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
 
 dnl libparted
-AC_MSG_CHECKING(for libparted >= 1.7.1)
+LIBPARTED_VERSION=1.7.1
+AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
 LDFLAGS=-lparted
 AC_TRY_RUN(
 #include 
@@ -41,16 +42,28 @@
 
 int main ()
 {
+	int min_major ;
+	int min_minor ;
+	int min_micro ;
 	int major ;
 	int minor ;
 	int micro ;
 
-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
-		printf( "Found libparted %s\t", ped_get_version() ) ;
+	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
+	{
+		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+		{
+			printf( "Found libparted %s\t", ped_get_version() ) ;
+
+			return ! ((major > min_major) ||
+           			 ((major == min_major) && (minor > min_minor)) ||
+           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
+		}
+	}
 
-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
+	return 1 ;
 }
-,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= 1.7.1) )
+,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= $LIBPARTED_VERSION) )
 
 
 dnl GTKMM


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-6/gparted.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gparted.spec	13 Sep 2006 22:36:12 -0000	1.14
+++ gparted.spec	30 Nov 2006 13:47:32 -0000	1.15
@@ -1,15 +1,18 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Patch0: gparted-parted-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) 
 BuildRequires: desktop-file-utils
+#Temporarily
+BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -20,8 +23,12 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .parted
 
 %build
+aclocal
+automake
+autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -77,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
+- Rebuild for new parted
+
 * Wed Sep 13 2006 Deji Akingunola  - 0.3.1-1
 - New version 0.3.1
 



From fedora-extras-commits at redhat.com  Thu Nov 30 13:48:03 2006
From: fedora-extras-commits at redhat.com (Laurent Rineau (rineau))
Date: Thu, 30 Nov 2006 08:48:03 -0500
Subject: rpms/wbxml2/devel wbxml2.spec,1.10,1.11
Message-ID: <200611301348.kAUDm3aj015700@cvs-int.fedora.redhat.com>

Author: rineau

Update of /cvs/extras/rpms/wbxml2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15631/devel

Modified Files:
	wbxml2.spec 
Log Message:
- Use iconv instead of mock. Bug #217848.



Index: wbxml2.spec
===================================================================
RCS file: /cvs/extras/rpms/wbxml2/devel/wbxml2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wbxml2.spec	29 Nov 2006 10:19:01 -0000	1.10
+++ wbxml2.spec	30 Nov 2006 13:47:33 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           wbxml2
 Version:        0.9.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Library and tools to parse, encode and handle WBXML documents
 
 Group:          System Environment/Libraries
@@ -18,7 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel zlib-devel popt 
-BuildRequires:  recode
 
 %description
 The WBXML Library (libwbxml) contains a library and its associated tools to
@@ -43,7 +42,7 @@
 
 # Recode to UTF-8 several doc files
 for file in ChangeLog README NEWS References; do
-  recode l1..utf8 $file
+  /usr/bin/iconv -f iso8859-1 -t utf-8 $file
 done
 
 # no line terminator, add one
@@ -87,6 +86,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Laurent Rineau  - 0.9.2-6
+- Use iconv instead of mock. Bug #217848.
+
 * Mon Nov 27 2006 Laurent Rineau  - 0.9.2-5
 - Changed the Summarys and descriptions.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 13:49:47 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 30 Nov 2006 08:49:47 -0500
Subject: rpms/gparted/FC-5 gparted-parted-check.patch, NONE, 1.1 gparted.spec,
	1.12, 1.13
Message-ID: <200611301349.kAUDnlDR015796@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15767

Modified Files:
	gparted.spec 
Added Files:
	gparted-parted-check.patch 
Log Message:
* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
- Rebuild for new parted


gparted-parted-check.patch:

--- NEW FILE gparted-parted-check.patch ---
--- configure.in	2006/09/11 09:46:42	1.62
+++ configure.in	2006/09/14 20:34:49	1.63
@@ -33,7 +33,8 @@
 AC_CHECK_LIB(dl, dlopen,          [], AC_MSG_ERROR([*** dl library (libdl) not found]))
 
 dnl libparted
-AC_MSG_CHECKING(for libparted >= 1.7.1)
+LIBPARTED_VERSION=1.7.1
+AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
 LDFLAGS=-lparted
 AC_TRY_RUN(
 #include 
@@ -41,16 +42,28 @@
 
 int main ()
 {
+	int min_major ;
+	int min_minor ;
+	int min_micro ;
 	int major ;
 	int minor ;
 	int micro ;
 
-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
-		printf( "Found libparted %s\t", ped_get_version() ) ;
+	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
+	{
+		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+		{
+			printf( "Found libparted %s\t", ped_get_version() ) ;
+
+			return ! ((major > min_major) ||
+           			 ((major == min_major) && (minor > min_minor)) ||
+           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
+		}
+	}
 
-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
+	return 1 ;
 }
-,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= 1.7.1) )
+,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= $LIBPARTED_VERSION) )
 
 
 dnl GTKMM


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gparted.spec	13 Sep 2006 22:36:51 -0000	1.12
+++ gparted.spec	30 Nov 2006 13:49:17 -0000	1.13
@@ -1,15 +1,18 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Patch0: gparted-parted-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
-BuildRequires: e2fsprogs-devel gettext
+BuildRequires: e2fsprogs-devel gettext perl(XML::Parser)
 BuildRequires: desktop-file-utils
+#Temporarily
+BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -20,8 +23,12 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .parted
 
 %build
+aclocal
+automake
+autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -77,6 +84,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
+- Rebuild for new parted
+
 * Wed Sep 13 2006 Deji Akingunola  - 0.3.1-1
 - New version 0.3.1
 



From fedora-extras-commits at redhat.com  Thu Nov 30 15:03:10 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 30 Nov 2006 10:03:10 -0500
Subject: rpms/gparted/FC-5 gparted-parted-check.patch, 1.1, 1.2 gparted.spec,
	1.13, 1.14
Message-ID: <200611301503.kAUF3Al4022525@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22498

Modified Files:
	gparted-parted-check.patch gparted.spec 
Log Message:
* Thu Nov 30 2006 Deji Akingunola  - 0.3.1-2
- Patch the generated configure to allow rebuild


gparted-parted-check.patch:

Index: gparted-parted-check.patch
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted-parted-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gparted-parted-check.patch	30 Nov 2006 13:49:17 -0000	1.1
+++ gparted-parted-check.patch	30 Nov 2006 15:02:40 -0000	1.2
@@ -43,3 +43,50 @@
  
  
  dnl GTKMM
+--- configure.keep	2006-09-11 05:39:49.000000000 -0400
++++ configure	2006-11-22 02:46:15.000000000 -0500
+@@ -22160,9 +22160,11 @@
+ fi
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for libparted >= 1.7.1" >&5
+-echo $ECHO_N "checking for libparted >= 1.7.1... $ECHO_C" >&6; }
+-LDFLAGS=-lparted
++LIBPARTED_VERSION=1.7.1
++{ echo "$as_me:$LINENO: checking for libparted >= $LIBPARTED_VERSION" >&5
++echo $ECHO_N "checking for libparted >= $LIBPARTED_VERSION... $ECHO_C" >&6; }
++LIBS_save="$LIBS"
++LIBS="-lparted"
+ if test "$cross_compiling" = yes; then
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+@@ -22181,14 +22183,26 @@
+ 
+ int main ()
+ {
++	int min_major ;
++	int min_minor ;
++	int min_micro ;
+ 	int major ;
+ 	int minor ;
+ 	int micro ;
+ 
+-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
+-		printf( "Found libparted %s\t", ped_get_version() ) ;
++	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
++	{
++		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 )
++		{
++			printf( "Found libparted %s\t", ped_get_version() ) ;
++
++			return ! ((major > min_major) ||
++           			 ((major == min_major) && (minor > min_minor)) ||
++           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
++		}
++	}
+ 
+-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
++	return 1 ;
+ }
+ 
+ _ACEOF


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gparted.spec	30 Nov 2006 13:49:17 -0000	1.13
+++ gparted.spec	30 Nov 2006 15:02:40 -0000	1.14
@@ -1,18 +1,16 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gparted-parted-check.patch
+Patch0: gparted-parted-check2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser)
 BuildRequires: desktop-file-utils
-#Temporarily
-BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -26,9 +24,6 @@
 %patch0 -p0 -b .parted
 
 %build
-aclocal
-automake
-autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -84,6 +79,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Thu Nov 30 2006 Deji Akingunola  - 0.3.1-2
+- Patch the generated configure to allow rebuild
+
 * Mon Nov 21 2006 Deji Akingunola  - 0.3.1-2
 - Rebuild for new parted
 



From fedora-extras-commits at redhat.com  Thu Nov 30 15:08:31 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 30 Nov 2006 10:08:31 -0500
Subject: rpms/ochusha/devel .cvsignore, 1.12, 1.13 ochusha.spec, 1.13,
	1.14 sources, 1.12, 1.13
Message-ID: <200611301508.kAUF8VWN022684@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22643

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Thu Nov 30 2006 Mamoru Tasaka  0.5.99.63.8-0.1.cvs061130
- 0.5.99.63.8 cvs 061130 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Nov 2006 15:10:33 -0000	1.12
+++ .cvsignore	30 Nov 2006 15:08:01 -0000	1.13
@@ -1 +1 @@
-ochusha-0.5.99.63.7-cvs061129.tar.bz2
+ochusha-0.5.99.63.8-cvs061130.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ochusha.spec	29 Nov 2006 15:11:32 -0000	1.13
+++ ochusha.spec	30 Nov 2006 15:08:01 -0000	1.14
@@ -1,8 +1,8 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.7
-%define              strtag          cvs061129
+%define              main_ver        0.5.99.63.8
+%define              strtag          cvs061130
 
 %define              vendor_rel      1
 %define              pre_release     1
@@ -155,8 +155,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Wed Nov 29 2006 Mamoru Tasaka  0.5.99.63.7-0.1.cvs061129
-- 0.5.99.63.7 cvs 061129 (23:00 JST)
+* Thu Nov 30 2006 Mamoru Tasaka  0.5.99.63.8-0.1.cvs061130
+- 0.5.99.63.8 cvs 061130 (23:59 JST)
 
 * Sat Nov 18 2006 
 - COPYING files of oniguruma and libochushagtk_lgpl will be installed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Nov 2006 15:10:33 -0000	1.12
+++ sources	30 Nov 2006 15:08:01 -0000	1.13
@@ -1 +1 @@
-691eaa88b5c402f929bcac37734625e2  ochusha-0.5.99.63.7-cvs061129.tar.bz2
+7a3557076d5e673361a5a73c756befbe  ochusha-0.5.99.63.8-cvs061130.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 15:08:42 2006
From: fedora-extras-commits at redhat.com (Mamoru Tasaka (mtasaka))
Date: Thu, 30 Nov 2006 10:08:42 -0500
Subject: rpms/jd/devel .cvsignore, 1.27, 1.28 jd.spec, 1.34, 1.35 sources,
	1.27, 1.28
Message-ID: <200611301508.kAUF8gGO022720@cvs-int.fedora.redhat.com>

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22663

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Thu Nov 30 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061130
- cvs 061130 (23:59 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	28 Nov 2006 15:38:07 -0000	1.27
+++ .cvsignore	30 Nov 2006 15:08:12 -0000	1.28
@@ -1 +1 @@
-jd-1.8.1-cvs061128.tgz
+jd-1.8.1-cvs061130.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jd.spec	28 Nov 2006 15:38:07 -0000	1.34
+++ jd.spec	30 Nov 2006 15:08:12 -0000	1.35
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      1.8.1
-%define         strtag        cvs061128
+%define         strtag        cvs061130
 %define         repoid        22722
 
 
@@ -106,8 +106,8 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Tue Nov 28 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061128
-- cvs 061128 (24:15 JST)
+* Thu Nov 30 2006 Mamoru Tasaka  - 1.8.1-0.1.cvs061130
+- cvs 061130 (23:59 JST)
 
 * Tue Nov 14 2006 Mamoru Tasaka  - 1.8.0-1
 - 1.8.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	28 Nov 2006 15:38:07 -0000	1.27
+++ sources	30 Nov 2006 15:08:12 -0000	1.28
@@ -1 +1 @@
-bd4e2e11e608980dcd35d28ef8ab4e1f  jd-1.8.1-cvs061128.tgz
+d02411e2afcf06df689001133cd8ce54  jd-1.8.1-cvs061130.tgz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:10:50 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 30 Nov 2006 10:10:50 -0500
Subject: rpms/gparted/FC-5 gparted.spec,1.14,1.15
Message-ID: <200611301510.kAUFAoKh022803@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22771

Modified Files:
	gparted.spec 
Log Message:
Fix typo



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gparted.spec	30 Nov 2006 15:02:40 -0000	1.14
+++ gparted.spec	30 Nov 2006 15:10:20 -0000	1.15
@@ -1,12 +1,12 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 2%{?dist}.1
+Release: 2%{?dist}.2
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gparted-parted-check2.patch
+Patch0: gparted-parted-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser)



From fedora-extras-commits at redhat.com  Thu Nov 30 15:16:33 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:16:33 -0500
Subject: rpms/libnl - New directory
Message-ID: <200611301516.kAUFGXCf022958@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22954/libnl

Log Message:
Directory /cvs/extras/rpms/libnl added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 15:16:38 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:16:38 -0500
Subject: rpms/libnl/devel - New directory
Message-ID: <200611301516.kAUFGc9p022971@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22954/libnl/devel

Log Message:
Directory /cvs/extras/rpms/libnl/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 15:16:54 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:16:54 -0500
Subject: rpms/libnl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611301516.kAUFGs8E023001@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22995

Added Files:
	Makefile import.log 
Log Message:
Setup of module libnl


--- NEW FILE Makefile ---
# Top level Makefile for module libnl
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 Nov 30 15:17:00 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:17:00 -0500
Subject: rpms/libnl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200611301517.kAUFH0ix023016@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22995/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libnl


--- 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 Nov 30 15:18:04 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:18:04 -0500
Subject: rpms/libnl/devel libnl-1.0-debuginfo.patch, NONE,
	1.1 libnl-Doxyfile-versionfix.patch, NONE, 1.1 libnl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611301518.kAUFI4CM023195@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23073/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libnl-1.0-debuginfo.patch libnl-Doxyfile-versionfix.patch 
	libnl.spec 
Log Message:
auto-import libnl-1.0-0.4.pre6 on branch devel from libnl-1.0-0.4.pre6.src.rpm

libnl-1.0-debuginfo.patch:

--- NEW FILE libnl-1.0-debuginfo.patch ---
--- libnl-1.0-pre6/lib/Makefile.orig	2006-11-28 16:03:08.442164047 -0500
+++ libnl-1.0-pre6/lib/Makefile	2006-11-28 16:03:16.530079501 -0500
@@ -58,7 +58,7 @@ distclean:
 
 install:
 	mkdir -p $(DESTDIR)$(libdir)/
-	install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir)
+	install -m 0755 $(OUT_SLIB) $(DESTDIR)$(libdir)
 	rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB)
 	$(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB)
 	rm -f $(DESTDIR)$(libdir)/$(LN_SLIB)

libnl-Doxyfile-versionfix.patch:

--- NEW FILE libnl-Doxyfile-versionfix.patch ---
--- libnl-1.0-pre6/doc/Doxyfile.orig	2006-11-29 11:01:56.626599706 -0500
+++ libnl-1.0-pre6/doc/Doxyfile	2006-11-29 11:02:03.009741514 -0500
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = libnl
-PROJECT_NUMBER         = 1.0-pre2
+PROJECT_NUMBER         = 1.0-pre6
 OUTPUT_DIRECTORY       = ./
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English


--- NEW FILE libnl.spec ---
%define alphatag pre6
Summary: Netlink socket support library
Name: libnl 
Version: 1.0 
Release:  0.4.%{alphatag}%{?dist} 
Source0: http://people.suug.ch/~tgr/libnl/files/libnl-1.0-pre6.tar.gz
URL: http://people.suug.ch/~tgr/libnl
License: LGPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, graphviz, tetex-latex, tetex-dvips, ghostscript

Patch0: libnl-1.0-debuginfo.patch
Patch1: libnl-Doxyfile-versionfix.patch

%description
libnl is the netlink assist library.  It provides infrastructure to make 
writing programs that use netlink sockets easier

%package devel
Summary: Header files for use with libnl development
Group: Development/Libraries
Requires: libnl = %{version} 

%description devel
The header files for use in development with libnl

%prep
%setup -q -n %{name}-%{version}-%{alphatag}
%patch0 -p1
%patch1 -p1

%build
%configure
%{__make} %{?_smp_mflags}
%{__make} gendoc

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/libnl.so.1*
%doc COPYING 
%doc doc/html

%files devel
%defattr(-,root,root,-)
%{_libdir}/libnl.so
%{_libdir}/pkgconfig/libnl-1.pc
%{_includedir}/*


%changelog
* Tue Nov 29 2006 Neil Horman  - 1.0-0.4.pre6%{?dist}
- Fixing more BuildRequires for bz 27336

* Tue Nov 29 2006 Neil Horman  - 1.0-0.3.pre6%{?dist}
- Add doxygen to BuildRequires

* Tue Nov 28 2006 Neil Horman  - 1.0-0.2.pre6%{?dist}
- More corrections for bz 217366

* Mon Nov 27 2006 Neil Horman  - 1.0-0.1.pre6%{?dist}
- Corrected packaging problems for Fedora Extras review (bz 217366)

* Wed Nov 22 2006 Neil Horman 
- built the package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 15:17:00 -0000	1.1
+++ .cvsignore	30 Nov 2006 15:17:34 -0000	1.2
@@ -0,0 +1 @@
+libnl-1.0-pre6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 15:17:00 -0000	1.1
+++ sources	30 Nov 2006 15:17:34 -0000	1.2
@@ -0,0 +1 @@
+0f57cb7085dc27e054691bff858613c9  libnl-1.0-pre6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:08 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:08 -0500
Subject: rpms/nagios/FC-4 nagios.spec,1.18,1.19 sources,1.9,1.10
Message-ID: <200611301518.kAUFI82M023205@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/FC-4

Modified Files:
	nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nagios.spec	3 Aug 2006 04:25:16 -0000	1.18
+++ nagios.spec	30 Nov 2006 15:17:38 -0000	1.19
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,12 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
+* Thu Sep 07 2006 Mike McGrath  2.5-3
+- Release bump for mass rebuild
+
 * Wed Aug 02 2006 Mike McGrath  2.5-2
 - Fixed default permissions for private and the resource file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2006 15:49:29 -0000	1.9
+++ sources	30 Nov 2006 15:17:38 -0000	1.10
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:04 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:18:04 -0500
Subject: rpms/libnl import.log,1.1,1.2
Message-ID: <200611301518.kAUFI4sO023191@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/rpms/libnl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23073

Modified Files:
	import.log 
Log Message:
auto-import libnl-1.0-0.4.pre6 on branch devel from libnl-1.0-0.4.pre6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libnl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 15:16:54 -0000	1.1
+++ import.log	30 Nov 2006 15:17:34 -0000	1.2
@@ -0,0 +1 @@
+libnl-1_0-0_4_pre6:HEAD:libnl-1.0-0.4.pre6.src.rpm:1164900000



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:08 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:08 -0500
Subject: rpms/nagios/FC-3 nagios.spec,1.11,1.12 sources,1.6,1.7
Message-ID: <200611301518.kAUFI8X7023201@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/FC-3

Modified Files:
	nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/nagios.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nagios.spec	3 Aug 2006 04:25:16 -0000	1.11
+++ nagios.spec	30 Nov 2006 15:17:38 -0000	1.12
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,12 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
+* Thu Sep 07 2006 Mike McGrath  2.5-3
+- Release bump for mass rebuild
+
 * Wed Aug 02 2006 Mike McGrath  2.5-2
 - Fixed default permissions for private and the resource file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jul 2006 15:49:28 -0000	1.6
+++ sources	30 Nov 2006 15:17:38 -0000	1.7
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:13 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:13 -0500
Subject: rpms/nagios/FC-5 nagios.spec,1.18,1.19 sources,1.8,1.9
Message-ID: <200611301518.kAUFIDnH023235@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/FC-5

Modified Files:
	nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-5/nagios.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nagios.spec	3 Aug 2006 04:25:17 -0000	1.18
+++ nagios.spec	30 Nov 2006 15:17:43 -0000	1.19
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,12 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
+* Thu Sep 07 2006 Mike McGrath  2.5-3
+- Release bump for mass rebuild
+
 * Wed Aug 02 2006 Mike McGrath  2.5-2
 - Fixed default permissions for private and the resource file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Jul 2006 15:49:35 -0000	1.8
+++ sources	30 Nov 2006 15:17:43 -0000	1.9
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:14 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:14 -0500
Subject: rpms/nagios/FC-6 nagios.spec,1.25,1.26 sources,1.9,1.10
Message-ID: <200611301518.kAUFIEVe023239@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/FC-6

Modified Files:
	nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-6/nagios.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nagios.spec	7 Sep 2006 17:07:35 -0000	1.25
+++ nagios.spec	30 Nov 2006 15:17:44 -0000	1.26
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 3%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
 * Thu Sep 07 2006 Mike McGrath  2.5-3
 - Release bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2006 15:49:35 -0000	1.9
+++ sources	30 Nov 2006 15:17:44 -0000	1.10
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:18:14 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 30 Nov 2006 10:18:14 -0500
Subject: rpms/nagios/devel .cvsignore, 1.9, 1.10 nagios.spec, 1.25,
	1.26 sources, 1.9, 1.10
Message-ID: <200611301518.kAUFIEm9023244@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23108/devel

Modified Files:
	.cvsignore nagios.spec sources 
Log Message:
Upstream released nagios-2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jul 2006 15:49:35 -0000	1.9
+++ .cvsignore	30 Nov 2006 15:17:44 -0000	1.10
@@ -1 +1 @@
-nagios-2.5.tar.gz
+nagios-2.6.tar.gz


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nagios.spec	7 Sep 2006 17:07:35 -0000	1.25
+++ nagios.spec	30 Nov 2006 15:17:44 -0000	1.26
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 2.5
-Release: 3%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -161,6 +161,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Nov 30 2006 Mike McGrath  2.6-1
+- Upstream released 2.6
+
 * Thu Sep 07 2006 Mike McGrath  2.5-3
 - Release bump for mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jul 2006 15:49:35 -0000	1.9
+++ sources	30 Nov 2006 15:17:44 -0000	1.10
@@ -1 +1 @@
-1a77528f6797bd3c0320da5e4fae2b1a  nagios-2.5.tar.gz
+a032edba07bf389b803ce817e9406c02  nagios-2.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 15:22:47 2006
From: fedora-extras-commits at redhat.com (Neil Horman (nhorman))
Date: Thu, 30 Nov 2006 10:22:47 -0500
Subject: owners owners.list,1.2039,1.2040
Message-ID: <200611301522.kAUFMlIc023506@cvs-int.fedora.redhat.com>

Author: nhorman

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23486

Modified Files:
	owners.list 
Log Message:
adding libnl entry to owners file



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2039
retrieving revision 1.2040
diff -u -r1.2039 -r1.2040
--- owners.list	30 Nov 2006 12:09:08 -0000	1.2039
+++ owners.list	30 Nov 2006 15:22:17 -0000	1.2040
@@ -963,6 +963,7 @@
 Fedora Extras|libnetfilter_conntrack|Netfilter conntrack userspace library|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|libnfnetlink|Netfilter netlink userspace library|i at stingr.net|extras-qa at fedoraproject.org|
 Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
+Fedora Extras|libnl|Library for managing netlink sockets|nhorman at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libofa|Open Fingerprint Architecture library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 15:25:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 30 Nov 2006 10:25:13 -0500
Subject: rpms/qtparted/FC-6 qtparted.spec,1.17,1.18
Message-ID: <200611301525.kAUFPDrI023573@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23531

Modified Files:
	qtparted.spec 
Log Message:
Sync with devel.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/FC-6/qtparted.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qtparted.spec	28 Aug 2006 19:45:48 -0000	1.17
+++ qtparted.spec	30 Nov 2006 15:24:43 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -18,7 +18,7 @@
 
 BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 1.6.6
 BuildRequires:  desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
-BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs
+BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs, ntfsprogs-devel
 BuildRequires:  automake, perl, autoconf
 Requires:       usermode-gtk, e2fsprogs, jfsutils, xfsprogs
 
@@ -41,8 +41,7 @@
 
 %configure \
   --with-log-dir=%{_localstatedir}/log \
-  --disable-reiserfs \
-  --disable-ntfs
+  --disable-reiserfs
 make %{?_smp_mflags}
 
 
@@ -54,7 +53,6 @@
   --vendor fedora \
   --mode 644 \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   $RPM_BUILD_ROOT%{_datadir}/applnk/System/qtparted.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 ln -s %{_datadir}/qtparted/pics/qtparted_32.png \
@@ -108,6 +106,13 @@
 
 
 %changelog
+* Tue Nov 21 2006 Steven Pritchard  - 0.4.5-11
+- Yet another rebuild.
+
+* Fri Oct 27 2006 Steven Pritchard  - 0.4.5-10
+- Enable ntfs support.
+- Make desktop-file-install happy with our categories again.
+
 * Mon Aug 28 2006 Steven Pritchard  - 0.4.5-9
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 15:27:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 30 Nov 2006 10:27:53 -0500
Subject: rpms/qtparted/FC-5 qtparted.spec,1.13,1.14
Message-ID: <200611301527.kAUFRrSP023693@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23676

Modified Files:
	qtparted.spec 
Log Message:
Sync with devel.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/FC-5/qtparted.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qtparted.spec	30 Aug 2006 18:37:53 -0000	1.13
+++ qtparted.spec	30 Nov 2006 15:27:23 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -18,7 +18,7 @@
 
 BuildRequires:  qt-devel >= 1:3.1.0, parted-devel >= 1.6.6
 BuildRequires:  desktop-file-utils, qt-designer, e2fsprogs-devel, jfsutils
-BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs
+BuildRequires:  zlib-devel, libjpeg-devel, xfsprogs, ntfsprogs-devel
 BuildRequires:  automake, perl, autoconf
 Requires:       usermode-gtk, e2fsprogs, jfsutils, xfsprogs
 
@@ -41,8 +41,7 @@
 
 %configure \
   --with-log-dir=%{_localstatedir}/log \
-  --disable-reiserfs \
-  --disable-ntfs
+  --disable-reiserfs
 make %{?_smp_mflags}
 
 
@@ -54,7 +53,6 @@
   --vendor fedora \
   --mode 644 \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   $RPM_BUILD_ROOT%{_datadir}/applnk/System/qtparted.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
 ln -s %{_datadir}/qtparted/pics/qtparted_32.png \
@@ -108,6 +106,13 @@
 
 
 %changelog
+* Tue Nov 21 2006 Steven Pritchard  - 0.4.5-11
+- Yet another rebuild.
+
+* Fri Oct 27 2006 Steven Pritchard  - 0.4.5-10
+- Enable ntfs support.
+- Make desktop-file-install happy with our categories again.
+
 * Mon Aug 28 2006 Steven Pritchard  - 0.4.5-9
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 15:40:30 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Thu, 30 Nov 2006 10:40:30 -0500
Subject: rpms/k3d/FC-4 .cvsignore,1.3,1.4 k3d.spec,1.4,1.5 sources,1.3,1.4
Message-ID: <200611301540.kAUFeUBS024351@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/k3d/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24290

Modified Files:
	.cvsignore k3d.spec sources 
Log Message:
Update to 0.6.4.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Aug 2006 08:46:05 -0000	1.3
+++ .cvsignore	30 Nov 2006 15:40:00 -0000	1.4
@@ -1 +1 @@
-k3d-0.6.0.0-src.tar.bz2
+k3d-0.6.4.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-4/k3d.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- k3d.spec	28 Aug 2006 08:46:05 -0000	1.4
+++ k3d.spec	30 Nov 2006 15:40:00 -0000	1.5
@@ -1,6 +1,6 @@
 
 Name:           k3d
-Version:        0.6.0.0
+Version:        0.6.4.0
 Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Tue Nov 28 2006 Denis Leroy  - 0.6.4.0-1
+- Update to 0.6.4.0
+
 * Mon Aug 28 2006 Denis Leroy  - 0.6.0.0-1
 - Update to 0.6.0.0
 - Split example documents into separate package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Aug 2006 08:46:05 -0000	1.3
+++ sources	30 Nov 2006 15:40:00 -0000	1.4
@@ -1 +1 @@
-c9642b1483ddd3e1adc6d4118ba677e4  k3d-0.6.0.0-src.tar.bz2
+3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 15:45:07 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 30 Nov 2006 10:45:07 -0500
Subject: rpms/rpmlint/EL-4 rpmlint.spec,1.13,1.14
Message-ID: <200611301545.kAUFj7Wg024601@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/rpmlint/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24584

Modified Files:
	rpmlint.spec 
Log Message:
add disttag



Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/EL-4/rpmlint.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rpmlint.spec	20 Jun 2005 18:02:32 -0000	1.13
+++ rpmlint.spec	30 Nov 2006 15:44:37 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.70
-Release:        1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Tool for checking common errors in RPM packages
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Dennis Gilmore  - 0.70-1
+- add disttag
+
 * Mon Jun 20 2005 Ville Skytt??  - 0:0.70-1
 - 0.70, use sed instead of perl during build.
 - Default configuration improvements: allow Development/Debug group (for



From fedora-extras-commits at redhat.com  Thu Nov 30 16:45:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:45:27 -0500
Subject: rpms/wdm - New directory
Message-ID: <200611301645.kAUGjRFf028782@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28778/wdm

Log Message:
Directory /cvs/extras/rpms/wdm added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 16:45:33 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:45:33 -0500
Subject: rpms/wdm/devel - New directory
Message-ID: <200611301645.kAUGjXMA028795@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28778/wdm/devel

Log Message:
Directory /cvs/extras/rpms/wdm/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 16:45:50 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:45:50 -0500
Subject: rpms/wdm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611301645.kAUGjowo028825@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28819

Added Files:
	Makefile import.log 
Log Message:
Setup of module wdm


--- NEW FILE Makefile ---
# Top level Makefile for module wdm
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 Nov 30 16:45:56 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:45:56 -0500
Subject: rpms/wdm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200611301645.kAUGjuoK028840@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28819/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wdm


--- 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 Nov 30 16:47:28 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:47:28 -0500
Subject: rpms/wdm import.log,1.1,1.2
Message-ID: <200611301647.kAUGlSeu028976@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28926

Modified Files:
	import.log 
Log Message:
auto-import wdm-1.28-7 on branch devel from wdm-1.28-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wdm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 16:45:50 -0000	1.1
+++ import.log	30 Nov 2006 16:46:58 -0000	1.2
@@ -0,0 +1 @@
+wdm-1_28-7:HEAD:wdm-1.28-7.src.rpm:1164905324



From fedora-extras-commits at redhat.com  Thu Nov 30 16:47:28 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:47:28 -0500
Subject: rpms/wdm/devel wdm-1.28-failsafe_tmp.patch, NONE,
	1.1 wdm-1.28-fedora.patch, NONE, 1.1 wdm-1.28-reconf.patch, NONE,
	1.1 wdm-Xsession, NONE, 1.1 wdm-update_wdm_wmlist, NONE,
	1.1 wdm.pam, NONE, 1.1 wdm.spec, NONE, 1.1 wdm_1.28-2.1.diff,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611301647.kAUGlShp028980@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/wdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28926/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wdm-1.28-failsafe_tmp.patch wdm-1.28-fedora.patch 
	wdm-1.28-reconf.patch wdm-Xsession wdm-update_wdm_wmlist 
	wdm.pam wdm.spec wdm_1.28-2.1.diff 
Log Message:
auto-import wdm-1.28-7 on branch devel from wdm-1.28-7.src.rpm

wdm-1.28-failsafe_tmp.patch:

--- NEW FILE wdm-1.28-failsafe_tmp.patch ---
--- wdm-1.28/configs/Xsession.in.failsafe_tmp	2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/Xsession.in	2006-11-29 10:21:25.000000000 +0100
@@ -16,22 +16,30 @@
 1)
         case $1 in
         failsafe)
-                exec @FAILSAFE@ -geometry 80x24-0-0
+                exec @FAILSAFE_PATH@ -geometry 80x24-0-0
                 ;;
         esac
         echo $1 >$HOME/.wm_style
 esac
 
 # redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-        if ( cp /dev/null "$errfile" 2> /dev/null )
-        then
-                chmod 600 "$errfile"
-                exec > "$errfile" 2>&1
-                break
-        fi
-done
+errfile="$HOME/.xsession-errors"
+if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
+then
+	exec > "$errfile" 2>&1
+else
+
+	mktemp=/bin/mktemp
+ 	for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+	do
+		if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
+		then
+			exec > "$ef" 2>&1
+			mv "$ef" "$errfile" 2> /dev/null
+ 			break
+ 		fi
+	done
+fi
 
 # clean up after xbanner
 # (RedHat code: need freetemp executed IF xbanner is run by Xsetup_0)
--- wdm-1.28/configs/Xclients.in.failsafe_tmp	2006-11-29 10:23:02.000000000 +0100
+++ wdm-1.28/configs/Xclients.in	2006-11-29 10:24:04.000000000 +0100
@@ -36,7 +36,6 @@
 
 # these files are left sitting around by TheNextLevel.
 rm -f $HOME/Xrootenv.0
-rm -f /tmp/fvwmrc* 2>/dev/null
 
 # check for and set x-resources
 if [ -f $HOME/.Xresources ] ; then

wdm-1.28-fedora.patch:

--- NEW FILE wdm-1.28-fedora.patch ---
--- wdm-1.28/configs/wdm-config.in.fedora	2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/wdm-config.in	2006-10-20 11:50:48.000000000 +0200
@@ -2,8 +2,8 @@
 !
 ! wdm configuration file input (sed in Makefile)
 !
-DisplayManager.errorLogFile:    @LOGDIR@/xdm-errors.log
-DisplayManager.pidFile:         @RUNDIR@/xdm-pid
+DisplayManager.errorLogFile:    @LOGDIR@/wdm-errors.log
+DisplayManager.pidFile:         @RUNDIR@/wdm.pid
 DisplayManager.keyFile:         @DMDIR@/xdm-keys
 DisplayManager.servers:         @DMDIR@/Xservers
 DisplayManager.accessFile:      @DMDIR@/Xaccess
@@ -25,11 +25,12 @@
 ! display screen background--if not set or set to none, then the
 !                            background is not set by wdm.
 ! DisplayManager*wdmBg:         none
-DisplayManager*wdmBg:           solid:RoyalBlue
+! DisplayManager*wdmBg:           solid:RoyalBlue
 ! DisplayManager*wdmBg:         dgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         hgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         vgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         pixmap:@GFXDIR@/Stars.jpg
+DisplayManager*wdmBg:         pixmap:@GFXDIR@/../../backgrounds/images/default.jpg
 !
 ! optional pixmap for logo
 @PIXMAPCOMMENT at DisplayManager*wdmLogo:  @GFXDIR@/@PIXMAPFILE@
@@ -65,7 +66,7 @@
 ! DisplayManager*wdmHalt:       @SHUTDOWN@ -t3 -h now
 !
 ! true/false to require valid username/passwd to reboot,halt, or exit
-DisplayManager*wdmVerify:       true
+DisplayManager*wdmVerify:       false
 ! true/false to require root as valid username/passwd to reboot,halt, or exit
 DisplayManager*wdmRoot:         false
 ! true=enable, false=disable shake and rollup animations

wdm-1.28-reconf.patch:

--- NEW FILE wdm-1.28-reconf.patch ---
--- wdm-1.28/configs/wdmReconfig.in.reconf	2005-03-26 14:57:04.000000000 +0100
+++ wdm-1.28/configs/wdmReconfig.in	2006-11-29 18:14:42.000000000 +0100
@@ -87,6 +87,7 @@
 		-e "s:@SHUTDOWN\@:@SHUTDOWN@:" \
 		-e "s:@LOGDIR\@:@LOGDIR@:" \
 		-e "s:@RUNDIR\@:@RUNDIR@:" \
+		-e "s:@GFXDIR\@:@GFXDIR@:" \
 		-e "s:@PIXMAPFILE\@:@PIXMAPFILE@:" \
 		-e "s:@PIXMAPCOMMENT\@:@PIXMAPCOMMENT@:" \
 		-e "s:@exec_prefix\@:@exec_prefix@:" \
@@ -99,6 +100,8 @@
 	configfile=@DMDIR@/Xclients
 	rm -f $configfile
 	sed -e "s:@XRDB_PATH\@:@XRDB_PATH@:" \
+	    -e "s:@SHELL_LOGIN\@:@SHELL_LOGIN@:" \
+	    -e "s:@configure_input\@:configs/Xclients.  Generated from Xclients.in by wdmReconfig:" \
 	    -e "s'@WMAKER_PATH\@'$WMAKER_PATH'" \
 	    -e "s'@AFTERSTEP_PATH\@'$AFTERSTEP_PATH'" \
 	    -e "s'@BLACKBOX_PATH\@'$BLACKBOX_PATH'" \


--- NEW FILE wdm-Xsession ---
#! /bin/sh

wm=

case $# in
1)
        wm=$1
        case $wm in
        failsafe|custom)
             ;;
        *) 
             echo $wm >$HOME/.wm_style
             ;;
        esac
    ;;
0)
        if [ -f $HOME/.wm_style ] ; then
             wm=`cat $HOME/.wm_style`
        fi
    ;;
esac

exec /etc/X11/xinit/Xsession $wm


--- NEW FILE wdm-update_wdm_wmlist ---
#!/usr/bin/perl -w
#
# update_wdm_wmlist, (c) 1998 Marcelo Magall?n 
# rewriten to use the x-window-manager alternative
# modified to also use the x-session-manager alternative by Arthur Korn
# Copyright 2000 Wichert Akkerman 
# Modified to use the freedesktop.org .desktop like kdm and gdm
#
# This script will read the list of installed window managers from
# the freedesktop .desktop files in /X11/sessions/:/dm/Sessions/:
# /xsessions/
# and update the DisplayManager*wdmWm resource in /etc/X11/wdm/wdm-config.
# BEWARE: It doesn't ask any questions about this. It just does it. It
# takes an optional list of window managers.

use strict;
use File::DesktopEntry;

my $wm_list='';
my %desktop_files;

unless (@ARGV) {
    #my @wm_list = ('default');
    my @wm_list;
    foreach my $dir ('/etc/X11/sessions/','/etc/dm/Sessions/','/usr/share/xsessions/') {
	    next unless (opendir DIR, $dir);
	    my @files;
	    @files = grep { /\.desktop$/ && -r "$dir/$_" } readdir(DIR);
	    foreach my $file (@files) {
		   push @{$desktop_files{$file}}, "$dir/$file";
	    }
    }
    DESKTOP: foreach my $desktop_file (keys(%desktop_files)) {
	    foreach my $file (@{$desktop_files{$desktop_file}}) {
		    my $entry = File::DesktopEntry->new_from_file($file);
		    next DESKTOP if (defined($entry->get_value('Hidden'))
			and $entry->get_value('Hidden') eq 'true');
		    if ($entry->get_value('Name') =~ /^gnome$/i) {
			    push (@wm_list, 'gnome');
		    }
		    elsif ($entry->get_value('Name') =~ /^kde$/i) {
			    push (@wm_list, 'kde');
		    }
		    elsif (defined($entry->get_value('Exec'))) {
			    push (@wm_list, $entry->get_value('Exec'));
		    }
		    else { # not found, go to next file
			    next;
		    }
		    # found, proceed to next destop file
		    next DESKTOP;
	    }
    }
   $wm_list = join (':', sort @wm_list) . ':custom';
} else {
    $wm_list = join (':', sort @ARGV);
}

open (WDM_CONFIG_FILE, '/etc/wdm/wdm-config.new')
    or die "Can't open /etc/wdm/wdm-config.new for writing: $!";

while () {
    s|^(!?\s*.*wdmWm:\s*).*|$1$wm_list|;
    print NEW_WDM_CONFIG_FILE;
}

close(WDM_CONFIG_FILE);
close(NEW_WDM_CONFIG_FILE);

rename '/etc/wdm/wdm-config.new', '/etc/wdm/wdm-config'
    or die "Can't rename /etc/wdm/wdw-config.new: $!";

exit 0;


--- NEW FILE wdm.pam ---
#%PAM-1.0
auth       required	pam_env.so
auth       include	system-auth
account    required	pam_nologin.so
account    include	system-auth
password   include	system-auth
session    optional	pam_keyinit.so force revoke
session    include	system-auth
session    required	pam_loginuid.so
session    optional	pam_console.so


--- NEW FILE wdm.spec ---
Name:           wdm
Version:        1.28
Release:        7%{?dist}
Summary:        WINGs Display Manager

Group:          User Interface/X
License:        GPL
URL:            http://voins.program.ru/wdm/
Source0:        http://voins.program.ru/wdm/wdm-%{version}.tar.bz2
# stolen from xdm
Source1:        %{name}.pam
# adapted from debian to use freedesktop
Source2:        wdm-update_wdm_wmlist
# record and reuse previous session before launching generic Xsession
Source3:        wdm-Xsession
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# debian patch modified to remove the configure patching
#Patch0:         http://ftp.debian.org/debian/pool/main/w/wdm/wdm_1.28-2.1.diff.gz
Patch0:         wdm_1.28-2.1.diff
# use fedora background/icon and match gdm default config
Patch1:         wdm-1.28-fedora.patch
# fix failsafe path and insecure use of /tmp
Patch2:         wdm-1.28-failsafe_tmp.patch
# fix reconfiguration script
Patch3:         wdm-1.28-reconf.patch

BuildRequires:  WindowMaker-devel gettext libselinux-devel pam-devel
BuildRequires:  libXt-devel libXmu-devel
BuildRequires:  xrdb xterm /sbin/shutdown
Requires:       xrdb xterm /sbin/shutdown
Requires:       %{_sysconfdir}/pam.d
# we don't want to have new files, we reuse the kdm/xdm files
Requires:       xdm xorg-x11-xinit
# we use 'include' in the pam file, so
Requires:       pam >= 0.80
# reuse the images
Requires:       desktop-backgrounds-basic fedora-logos

%description
wdm combines the functions of a graphical display manager identifying 
and authenticating a user on a system with some of the functions of a 
session manager in selecting and starting a window manager. Optionally, 
wdm can shutdown (reboot or halt) the system.

wdm is a modification of XFree86's xdm package for graphically handling 
authentication and system login. Most of xdm has been preserved 
(XFree86 4.2.1.1) with the Login interface based on a WINGs. Tom 
Rothamel's "external greet" interface (see AUTHORS) was used to 
communicate wdm with wdmLogin. 

In fedora, wdm may be called through a wrapper, wdm-dynwm, which determines
the available window managers using the freedesktop information and modifies
the wdm-config configuration file accordingly, before launching wdm.

%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .fedora
%patch2 -p1 -b .failsafe_tmp
%patch3 -p1 -b .reconf

%build

export DEF_SERVER='%{_bindir}/X -nolisten tcp'
export INSTALL='install -p'

%configure \
   --with-pamdir=%{_sysconfdir}/pam.d \
   --with-logdir=%{_localstatedir}/log \
   --with-runlockdir=%{_localstatedir}/run \
   --with-wdmdir=%{_sysconfdir}/wdm \
   --with-nlsdir=%{_datadir}/locale \
   --with-fakehome=%{_localstatedir}/run/wdm \
   --with-gfxdir=%{_datadir}/pixmaps/wdm \
   --with-Logo=../../backgrounds/tiles/default_blue.jpg \
   --with-defuserpath='/bin:%{_bindir}' \
   --with-defsystempath='/sbin:%{_sbindir}:/bin:%{_bindir}' \
   --enable-selinux \
   --enable-aafont 


make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update_wdm_wmlist

# do a wdm wrapper which updates the window manager list before
# launching wdm
cat > $RPM_BUILD_ROOT%{_bindir}/wdm-dynwm << EOF
#!/bin/sh
update_wdm_wmlist
wdm "\$@"
EOF

chmod 0755 $RPM_BUILD_ROOT%{_bindir}/wdm-dynwm

# move the reconfiguration script to _bindir
mv $RPM_BUILD_ROOT%{_sysconfdir}/wdm/wdmReconfig $RPM_BUILD_ROOT%{_bindir}

chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/wdm/wdm-config

install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wdm

# remove old X session script, and old XFree86 session script
rm $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.orig
rm $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.XFree86

# use xdm/kdm files 
# first rename wdm files
for file in Xaccess Xsession Xsetup_0 GiveConsole TakeConsole; do
mv $RPM_BUILD_ROOT%{_sysconfdir}/wdm/$file $RPM_BUILD_ROOT%{_sysconfdir}/wdm/$file.wdm
done

# then use symlinks or wrapper
# calls /etc/X11xinit/Xsession
install -p -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession
ln -s ../X11/xdm/Xaccess $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xaccess
ln -s ../X11/xdm/Xsetup_0 $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsetup_0
ln -s ../X11/xdm/GiveConsole $RPM_BUILD_ROOT%{_sysconfdir}/wdm/GiveConsole
ln -s ../X11/xdm/TakeConsole $RPM_BUILD_ROOT%{_sysconfdir}/wdm/TakeConsole
ln -s ../X11/xdm/Xsession $RPM_BUILD_ROOT%{_sysconfdir}/wdm/Xsession.xorg

%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog* NEWS README* TODO NASA_image_guideline.html 
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pam.d/wdm
%dir %{_sysconfdir}/wdm/
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/wdm-config
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/wdm-config.in
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/Xresources
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/wdm/Xservers
%config %{_sysconfdir}/wdm/GiveConsole.wdm
%config %{_sysconfdir}/wdm/TakeConsole.wdm
%config %{_sysconfdir}/wdm/Xaccess.wdm
%config %{_sysconfdir}/wdm/Xclients
%config %{_sysconfdir}/wdm/Xclients.in
%config %{_sysconfdir}/wdm/Xservers.fs
%config %{_sysconfdir}/wdm/Xservers.ws
%config %{_sysconfdir}/wdm/Xsession
%config %{_sysconfdir}/wdm/Xsession.wdm
%config %{_sysconfdir}/wdm/Xsetup_0.wdm
# links
%config %{_sysconfdir}/wdm/GiveConsole
%config %{_sysconfdir}/wdm/TakeConsole
%config %{_sysconfdir}/wdm/Xaccess
%config %{_sysconfdir}/wdm/Xsession.xorg
%config %{_sysconfdir}/wdm/Xsetup_0
%{_bindir}/wdm*
%{_bindir}/update_wdm_wmlist
%{_mandir}/man1/wdm*.1*
%{_datadir}/pixmaps/wdm/
%dir %{_localstatedir}/run/wdm


%changelog
* Thu Nov 30 2006 Patrice Dumas  1.28-7
- keep timestamps for shipped files
- enable aa fonts

* Wed Nov 29 2006 Patrice Dumas  1.28-6
- fix reconfiguration script
- requires pam recent enough
- don't set noreplace for scripts and example config files

* Wed Nov 29 2006 Patrice Dumas  1.28-5
- fix insecure use of /tmp in original wdm script
- remove obsolete session scripts

* Sun Nov 12 2006 Patrice Dumas  1.28-4
- add BR libXt-devel and libXmu-devel

* Fri Oct 20 2006 Patrice Dumas  1.28-3
- correct wdm-dynwm

* Fri Oct 20 2006 Patrice Dumas  1.28-2
- use images from desktop-backgrounds-basic fedora-logos
- record session style before calling the generic Xsession, and add
  previous session and custom session handling.
- ship the original config files
- fix a bug in the default config files

* Thu Oct 19 2006 Patrice Dumas  1.28-1
- initial packaging

wdm_1.28-2.1.diff:

--- NEW FILE wdm_1.28-2.1.diff ---
--- wdm-1.28.orig/debian/changelog
+++ wdm-1.28/debian/changelog
@@ -0,0 +1,647 @@
+wdm (1.28-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Split xlibs-dev build-dep (Closes: #347055).
+  * Added Swedish debconf translation (Closes: #332556).
+  * Added Portuguese debconf translation (Closes: #336233).
+
+ -- Luk Claes   Sat, 21 Jan 2006 16:19:30 +0100
+
+wdm (1.28-2) unstable; urgency=low
+
+  * New maintainer: Vladimir Shakhov  
+    (Closes: #323600,#287873).
+  * Mark /etc/logrotate.d/wdm as conf file and use dh_installlogrotate 
+    instead of manual copying. lintian cleanup. Place dh_installlogrotate
+    above sed hack to generate debian/conffiles.
+  * Use dh_installpam instead of manual copying. debian/wdm.pamd rename to
+    debian/wdm.pam.
+  * Use dh_installdirs instead call "install -d".
+  * /usr/X11R6 replacement with /usr (as Debian Policy, paragraph 11.8.7,
+    said). Some debian/wdm.config and debian/wdm.postinst changes to provide
+    clean upgrade.
+  * TODO updated (Closes: #319573).
+  * Prevent ChangeLog duplication (Closes: #320321).
+  * Current package already use newest upstream version (Closes: #303868).
+  * Build-Depends against libwraster3 (Closes: #281328).
+  
+ -- Vladimir Shakhov   Wed, 17 Aug 2005 19:25:13 +0300
+
+wdm (1.28-1) unstable; urgency=low
+
+  * new upstream version (see /usr/share/doc/wdm/NEWS.gz for details)
+  * enable SELinux (Closes: #283372)
+
+ -- Noah Meyerhans   Wed, 20 Apr 2005 21:15:39 -0400
+
+wdm (1.27-2.2) unstable; urgency=medium
+
+  * NMU.
+  * Removed dependency on libproplist0-dev (bug #294719)
+  * Added update translations (bugs #267130, #283974, #286093)
+  * Kept urgency=medium in order to enter testing quickly.
+
+ -- Giuseppe Sacco   Wed, 23 Feb 2005 15:08:21 +0100
+
+wdm (1.27-2.1) unstable; urgency=medium
+
+  * NMU.
+  * Updated Build-Depends to libwraster3-dev (Closes: #282287).
+  * Add libxft-dev to Build-Depends.
+  * Add missing -lXft to configure.ac and configure (but did not run
+    autoconf; touch'ing configure instead in debian/rules).
+
+ -- Christoph Berg   Wed,  1 Dec 2004 22:53:39 +0100
+
+wdm (1.27-2) unstable; urgency=medium
+
+  * Remove unnecessary build-dep on libtiff3g-dev (Closes: #264576)
+  * Re-enable ExitLogin functionality. (Closes: #260249)
+
+ -- Noah Meyerhans   Wed, 18 Aug 2004 15:44:29 -0400
+
+wdm (1.27-1) unstable; urgency=low
+
+  * New upstream release
+  * Rotate /var/log/wdm.log (closes: #241441)
+  * Update default config to properly initialize syslog
+    (closes: #242155)
+  * Add Czech debconf traslation, thanks to Miroslav Kure
+     (closes: #237987)
+  * Add Turkish debconf translation, thanks to Recai Oktas
+     (closes: #248327)
+  * Add manual page for the wdmlogin.conf file (closes: #239928)
+  * Fix prerm to reconfigure /etc/X11/default-display-manager
+    (closes: #219184)
+
+ -- Noah Meyerhans   Thu, 27 May 2004 23:54:31 -0400
+
+wdm (1.26-1) unstable; urgency=low
+
+  * New upstream version.  See /usr/share/doc/wdm/ChangeLog.gz for details.
+  * Update PAM configuration to use new @include functionality.
+  * Explicitly set the wdmLocale resource in wdm-config, since wdmLogin
+    will not display help text otherwise.
+
+ -- Noah Meyerhans   Tue, 30 Sep 2003 19:54:45 -0400
+
+wdm (1.25-1) unstable; urgency=low
+
+  * New upstream version (Closes: #202818)
+  * wdmLogin geometry option added upstream (Closes: #155459)
+  * Added dependency on xbase-clients (Closes: #203311)
+  * wdm man page cleanup (Closes: #189340)
+  * Applied patch from Christian Perrier  to provide
+    gettext-based debconf templates (Closes: #203102)
+  * corrected some errors in output of update_wdm_wmlist (Closes: #192780)
+  * Cleaned up the source tree, resulting in a cleaner merge of my
+    CVS stuff with upstream's source.  Got rid of some files left over
+    from patches that are no longer relevant.
+  * Install localized message files in /usr/share/locale (Closes: #193899)
+
+ -- Noah Meyerhans   Sun, 10 Aug 2003 17:21:09 -0400
+
+wdm (1.22.1-2) unstable; urgency=low
+
+  * PAM fix after I accidentally sucked in upstream's pam file that is
+    not Debian-friendly.  (Closes: #182161)
+
+ -- Noah Meyerhans   Sun, 23 Feb 2003 16:44:16 -0500
+
+wdm (1.22.1-1) unstable; urgency=low
+
+  * New upstream version fixes PAM bug introduced in 1.22.  PAM
+    service name had erroneously been set to "xdm".  (Closes: #181838)
+
+ -- Noah Meyerhans   Fri, 21 Feb 2003 15:23:47 -0500
+
+wdm (1.22-2) unstable; urgency=low
+
+  * Fix prerm script to abort if wdm is managing a display the user
+    chooses not to stop it. (Closes: Bug#177609)
+
+ -- Noah Meyerhans   Tue, 18 Feb 2003 16:57:58 -0500
+
+wdm (1.22-1) unstable; urgency=low
+
+  * New upstream release (Closes: Bug#180810, Bug#80542, Bug#108734)
+  * Small update to build-depends (Closes: Bug#170236)
+  * Bumped standards version.
+  * Updated copyright.
+
+ -- Noah Meyerhans   Mon, 17 Feb 2003 23:32:19 -0500
+
+wdm (1.20-18) unstable; urgency=low
+
+  * debian/control: build-depend on libpng12-0-dev
+  * Rebuild with new libproplist
+
+ -- Noah Meyerhans   Thu, 23 Jan 2003 19:24:42 -0500
+
+wdm (1.20-17) unstable; urgency=low
+
+  * Really fixed the maintainer field.
+  * Changed build deps to depend on libungif4-dev (Closes: Bug#165542)
+  * Applied a patch from Frederik Schueler to Login.c to fix the 
+    buggy help display.  (Closes: Bug#122430)
+
+ -- Noah Meyerhans   Fri, 25 Oct 2002 18:51:05 -0400
+
+wdm (1.20-16) unstable; urgency=low
+
+  * added -nolisten tcp to X server flags.
+  * set DisplayManager.requestPort to 0 in /etc/X11/wdm/wdm-config
+    to disable XDMCP by default.
+  * Updated the manual page to include much of the content of the XDM
+    man page.  This eliminates the need to refer to the XDM man page,
+    which is usually not installed on systems that run wdm.
+  * (closes: #145980)  The previous 3 changelog entries close this bug.
+  * Added polish debconf translation (Closes: #142541)
+  * Added a Xinerama patch from Will Andrews 
+    (Closes: #142930)
+  * updated the Maintainer field to point to the right email address.
+  * Note that we still depend on libpng2 until libwraster2 updates to
+    libpng3.
+
+ -- Noah Meyerhans   Wed,  4 Sep 2002 15:59:33 -0400
+
+wdm (1.20-15) unstable; urgency=low
+
+  * Added code to postrm to delete /var/lib/wdm/ if possible
+    (Closes: Bug#114788).
+  * Added references to update_wdm_wmlist(8) and wdm.options(5) in
+    the wdm.1x man page.  (Closes: Bug#135693)
+  * Stopped creating /usr/X11R6/share/man/man1. (Closes: Bug#122042)
+  * Added debconf translations for French, Spanish, and Japanese
+    (Closes: Bug#137939, Bug#134462, Bug#137141)
+
+ -- Noah Meyerhans   Tue, 12 Mar 2002 19:26:18 -0500
+
+wdm (1.20-14) unstable; urgency=low
+
+  * Removed a bashism from /etc/X11/wdm/Xsession (Closes: Bug#121990)
+  * Fixed a typo in prerm that prevented wdm from properly giving
+    control to another display manager in the event that it was purged.
+
+ -- Noah Meyerhans   Mon, 14 Jan 2002 14:10:39 -0500
+
+wdm (1.20-13) unstable; urgency=high
+
+  * Fixed incoherent references to authentication directory.  This was
+    a serious security flaw that allowed wdm to allow all clients to
+    access the display it was managing.  (Closes: Bug#121056)
+  * Added Brazilian portuguese localized debconf template.
+  * Applied a small change to Login.c to prevent array bounds overruns
+    when >13 window managers are installed.  A cleanup is in order, as
+    there's no reason to hardcode a 13 WM limit, but I'll save the more
[...4215 lines suppressed...]
+running wdm process is found to have no children.  In the event the wdm daemon
+is not stopped and restarted, the administrator will have to do so by hand
+(probably with "/etc/init.d/wdm restart", or by rebooting the system) before
+the newly installed wdm binary is used.
+.IP run-xconsole
+This option opens an
+.BR xconsole (1)
+client to catch messages that would normally go to the Linux virtual
+console and thus be missed in many cases by the user.  By default, this
+option is only supported in the Xsetup file for display :0
+.RI ( /etc/X11/xdm/Xsetup_0 ),
+but any Xsetup script may use it if appropriately edited.
+.IP use-sessreg
+If this option is enabled (the Debian default), the sessreg program will
+be invoked to register X sessions managed by wdm in the utmp and wtmp
+files.  Otherwise, it is not, and the utmp and wtmp files will have no
+record of wdm sessions.
+.SH HISTORY
+Flags controlling wdm used to be kept in
+.I /etc/X11/config
+on Debian/GNU Linux systems.
+.SH SEE ALSO
+.BR sessreg (1),
+.BR xconsole (1),
+.BR xmessage (1),
+.BR wdm (1)
+.SH AUTHOR
+This manpage was written by Branden Robinson for Debian GNU/Linux and
+modified by Marcelo Magallon for wdm.
--- wdm-1.28.orig/debian/man/wdmLogin.1x
+++ wdm-1.28/debian/man/wdmLogin.1x
@@ -0,0 +1,76 @@
+.TH wdmLogin 1x "August 1998"
+.SH NAME
+wdmLogin \- wdm login panel
+.SH SYNOPSIS
+\fBwdmLogin\fP [-d \fIdisplay\fP] [-l \fIlogo\fP] [-w \fI\fP] [-b \fIbackground\fP] [-h \fIhelpfile\fP] [-u \fIusername\fP] [-p \fIpassword\fP]
+.SH DESCRIPTION
+\fBwdmLogin\fP is greeter designed to work with \fBwdm\fP(1x). It has
+several features not found on xdm's greeter. wdmLogin should not be
+called directly, that's wdm's task.
+.SH OPTIONS
+.TP
+.B \-d
+starts on the specified \fIdisplay\fP
+.TP
+.B \-l
+uses the specified \fIlogo\fP for the panel. The logo will be \fBresized\fP
+to 200 by 130 pixels.
+.TP
+.B \-w
+presents the \fBcolon separated\fP list of \fIwindow managers\fP, for
+the user to pick one, or None if you want only NoChange to appear.
+.TP
+.B \-a
+enables animations consisting of 
+shaking the Login panel (if an error) and 
+rolling up the image (when closing the panel).
+.TP
+.B \-h
+uses the specified text file to display in the help panel instead of
+the static help message which is in the sources. Take care of long lines
+which may cause display trouble in the help panel.
+.TP
+.B \-u
+use the default username and password as specified in wdm-config if nothing is typed
+by the user. USE WITH EXTREME CAUTION.
+.TP
+.B \-b
+uses the specified background image (see the next section).  If this is
+not specified, then the background is \fBNOT\fP set.
+.SH BACKGROUND IMAGE SPECIFICATION
+There are several possible ways of specifing a background image. The
+generic format is \-b\fItype\fP:\fIimage\fP. \fItype\fP can be any of:
+.TP
+.B none
+do not set the background.  This user can still set the background
+via other means.
+.TP
+.B solid
+it renders a solid backgroud, and \fIimage\fP is a color name
+.TP
+\fBhgradient\fP, \fBvgradient\fP, \fBdgradient\fP
+a gradient (either horizontal, vertical or diagonal) will be
+rendered. \fIimage\fP is \fBcomma separated\fP of color names, and any
+number of colors can be specified.
+.TP
+\fBpixmap\fP
+a pixmap will be used for the background. \fIimage\fP is the full path
+to an image file (tiff, png, jpeg and xpm allowed) and it will be
+scaled to use the full screen.
+.SH FILES
+\fBwdmLogin\fP can be customized by modifying \fI/etc/X11/wdm/wdm-config\fP.
+.SH ENVIRONMENT VARIABLES
+Some variables that defines locale affects the look of wdmLogin. wdm program
+will set LANG environment variable according to `wdmLocale' resource in wdm-config
+file.
+.SH SEE ALSO
+.BR wdm (1x)
+,
+.BR locale (1)
+.SH AUTHOR
+wmdLogin was written by Gene Czarcinski . wdm is
+based on work by Tom Rothamel (xdm's external greeter protocol) and
+xdm itself, (c) 1988 X Consortium
+.PP
+This man page was written by Marcelo Magallon 
+and modified by Jerome Alet 
--- wdm-1.28.orig/debian/man/wdmlogin.conf.5
+++ wdm-1.28/debian/man/wdmlogin.conf.5
@@ -0,0 +1,63 @@
+.\" This manpage is copyright (C) 2004 Noah Meyerhans 
+.\"
+.\" This is free software; you may 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,
+.\" or (at your option) any later version.
+.\"
+.\" This 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 apt; if not, write to the Free Software
+.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+.\" 02111-1307 USA
+.TH wmlogin.conf 5 "27 May 2004" "Debian GNU/Linux"
+
+.SH NAME
+wdmlogin.conf \- configuration options for wdmLogin
+
+.SH DESCRIPTION
+.I /etc/X11/wdm/wdmlogin.conf
+specifies geometry and font attributes for wdmLogin, the login widget
+that is a component of the wdm package.  An alternate location for
+this file can be specified via the wdmLoginConfig resource in
+/etc/X11/wdm/wdm.config.
+
+.I wdmlogin.conf
+uses the somewhat ill-documented libproplist file format.  The file
+must begin and end with an open- and close-brace, respectively.
+Between the braces, three options are available:
+
+.IP "geometry = (w, h, x, y);"
+If set, this option allows the wdmLogin window to be resized and
+repositioned within the screen.  The x and y coordinates specify the
+location of the top left corner of the window and are optional.
+
+.IP "aa = ;"
+If set to yes, then support for antialiased fonts is enabled.  Note
+that this is not currently supported by libWINGs in Debian, and thus
+has no effect.
+
+.IP "multibyte = ;"
+If set to yes, then support for multibyte character sets is enabled.
+Note that this is not currently supported by libWINGs in Debian, and
+thus has no effect.
+
+.SH EXAMPLE
+ {
+        geometry = (530, 240);
+        aa = no;
+        multibyte = no;
+ }
+
+.SH SEE ALSO
+.BR wdm(1x)
+.BR wdmLogin(1x)
+
+.SH AUTHOR
+This manual page was written by Noah Meyerhans for Debian GNU/Linux.
+The wdm package was written by a long list of names that can be found
+in /usr/share/doc/wdm/AUTHORS
--- wdm-1.28.orig/debian/TODO.old
+++ wdm-1.28/debian/TODO.old
@@ -0,0 +1,13 @@
+Things to do for the Debian package:
+
+ * Check X4 behaviour
+ * Check xdm->wdm, wdm->xdm, gdm->wdm, wdm->gdm upgrading 
+   behaviour (bug #38391)
+ * Implement alternatives for gdm, wdm, xdm, kdm (bug #64966)
+ * Check ability to serve indirect and broadcast XDMCP requests
+ * Add chooser to wdm. Right now, indirect or broadcast XDMCP calls
+   can't be handled without one (bug #52215)
+ * Correct handling of on which vt X is started (bug #60892)
+ * Add check on +x of /etc/X11/Xsession in npostinst script (bug #78413)
+
+-- Bas Zoetekouw  Wed Nov 15 21:05:22 CET 2000
--- wdm-1.28.orig/debian/NEWS.Debian
+++ wdm-1.28/debian/NEWS.Debian
@@ -0,0 +1,7 @@
+wdm (1.28-2) unstable; urgency=low
+  
+  * Previous versions of WDM package use policy-incompatible files layout.
+    Since 1.28-2, WDM placed in /usr/{bin,share/man}. I suppose, that was 
+    not problems with upgrade, but if you have one - please report me.
+
+ -- Vladimir Shakhov   Wed, 18 Aug 2005 03:25:13 +0300


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wdm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 16:45:56 -0000	1.1
+++ .cvsignore	30 Nov 2006 16:46:58 -0000	1.2
@@ -0,0 +1 @@
+wdm-1.28.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wdm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 16:45:56 -0000	1.1
+++ sources	30 Nov 2006 16:46:58 -0000	1.2
@@ -0,0 +1 @@
+4da8ffe3af233305786d9b6aab78b838  wdm-1.28.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 16:52:04 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 30 Nov 2006 11:52:04 -0500
Subject: owners owners.list,1.2040,1.2041
Message-ID: <200611301652.kAUGq4Is029089@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29074

Modified Files:
	owners.list 
Log Message:
add wdm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -r1.2040 -r1.2041
--- owners.list	30 Nov 2006 15:22:17 -0000	1.2040
+++ owners.list	30 Nov 2006 16:51:34 -0000	1.2041
@@ -2438,6 +2438,7 @@
 Fedora Extras|wavpack|A completely open audiocodec|lemenkov at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|laurent.rineau__fedora_extras at normalesup.org|extras-qa at fedoraproject.org|
 Fedora Extras|wcstools|Software utilities to display and manipulate the WCS of a FITS image|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
+Fedora Extras|wdm|WINGs Display Manager|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|wfmath|WorldForge client math library|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|wfut|WorldForge updater tool|wart at kobold.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 16:57:16 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 11:57:16 -0500
Subject: extras-buildsys/utils/pushscript Push.py,1.20,1.21
Message-ID: <200611301657.kAUGvGgB029133@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29118

Modified Files:
	Push.py 
Log Message:
Make invalid rebuilds stand out.


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Push.py	30 Nov 2006 10:56:49 -0000	1.20
+++ Push.py	30 Nov 2006 16:57:16 -0000	1.21
@@ -378,7 +378,7 @@
             buildreportinfo += 'NEW\n'
     else:  # src.rpm published before, exclude entire build job
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
-        buildreportinfo = 'Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        buildreportinfo = '*** Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
         if buildreport:
             rundirfile.write(buildreportinfo)
         rundirfile.close()



From fedora-extras-commits at redhat.com  Thu Nov 30 17:03:46 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Thu, 30 Nov 2006 12:03:46 -0500
Subject: rpms/heartbeat/devel heartbeat.spec,1.11,1.12
Message-ID: <200611301703.kAUH3kdT032257@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32240

Modified Files:
	heartbeat.spec 
Log Message:
* Thu Nov 30 2006 Joost Soeterbroek  - 2.0.7-5
- add Requires net-snmp-libs to stonith , add BuildReqs net-snmp-devel >= 5.4



Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- heartbeat.spec	28 Nov 2006 17:06:03 -0000	1.11
+++ heartbeat.spec	30 Nov 2006 17:03:16 -0000	1.12
@@ -6,7 +6,7 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.0.7
-Release:          4%{?dist}
+Release:          5%{?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
+BuildRequires:    net-snmp-devel >= 5.4
 BuildRequires:    bzip2-devel 
 BuildRequires:    ncurses-devel
 %if %{ENABLE_MGMT}
@@ -72,6 +72,7 @@
 
 %package -n stonith
 Requires:       pils = %{version}-%{release}
+Requires:       net-snmp-libs
 Summary:        Provides an interface to Shoot The Other Node In The Head 
 Group:          System Environment/Daemons
 
@@ -301,6 +302,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Nov 30 2006 Joost Soeterbroek  - 2.0.7-5
+- add Requires net-snmp-libs to stonith , add BuildReqs net-snmp-devel >= 5.4
+
 * Tue Nov 28 2006 Joost Soeterbroek  - 2.0.7-4
 - rebuild for updated net-snmp, soname change
 



From fedora-extras-commits at redhat.com  Thu Nov 30 17:14:39 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 30 Nov 2006 12:14:39 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.25, 1.26 abcm2ps.spec, 1.28,
	1.29 sources, 1.25, 1.26
Message-ID: <200611301714.kAUHEd9X032362@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32343

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Nov 2006 20:54:07 -0000	1.25
+++ .cvsignore	30 Nov 2006 17:14:09 -0000	1.26
@@ -1,2 +1,2 @@
-abcm2ps-5.1.2.tar.gz
+abcm2ps-5.2.0.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- abcm2ps.spec	14 Nov 2006 20:54:07 -0000	1.28
+++ abcm2ps.spec	30 Nov 2006 17:14:09 -0000	1.29
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.2
+Version:        5.2.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.2.0.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Gerard Milmeister  - 5.2.0-1
+- new version 5.2.0
+
 * Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
 - new version 5.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Nov 2006 20:54:07 -0000	1.25
+++ sources	30 Nov 2006 17:14:09 -0000	1.26
@@ -1,2 +1,2 @@
-2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
+d962713c080a4200ef12c4a7fa32f1de  abcm2ps-5.2.0.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Thu Nov 30 17:16:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 30 Nov 2006 12:16:48 -0500
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.24, 1.25 abcm2ps.spec, 1.26,
	1.27 sources, 1.24, 1.25
Message-ID: <200611301716.kAUHGmEa032448@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32411/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	14 Nov 2006 20:54:06 -0000	1.24
+++ .cvsignore	30 Nov 2006 17:16:18 -0000	1.25
@@ -1,2 +1,2 @@
-abcm2ps-5.1.2.tar.gz
+abcm2ps-5.2.0.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/abcm2ps.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- abcm2ps.spec	14 Nov 2006 20:54:06 -0000	1.26
+++ abcm2ps.spec	30 Nov 2006 17:16:18 -0000	1.27
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.2
+Version:        5.2.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.2.0.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Gerard Milmeister  - 5.2.0-1
+- new version 5.2.0
+
 * Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
 - new version 5.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	14 Nov 2006 20:54:06 -0000	1.24
+++ sources	30 Nov 2006 17:16:18 -0000	1.25
@@ -1,2 +1,2 @@
-2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
+d962713c080a4200ef12c4a7fa32f1de  abcm2ps-5.2.0.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Thu Nov 30 17:16:48 2006
From: fedora-extras-commits at redhat.com (=?utf-8?q?G=C3=A9rard_Milmeister?= (gemi))
Date: Thu, 30 Nov 2006 12:16:48 -0500
Subject: rpms/abcm2ps/FC-6 .cvsignore, 1.25, 1.26 abcm2ps.spec, 1.28,
	1.29 sources, 1.25, 1.26
Message-ID: <200611301716.kAUHGmSD032453@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32411/FC-6

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 5.2.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Nov 2006 20:54:07 -0000	1.25
+++ .cvsignore	30 Nov 2006 17:16:18 -0000	1.26
@@ -1,2 +1,2 @@
-abcm2ps-5.1.2.tar.gz
+abcm2ps-5.2.0.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/abcm2ps.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- abcm2ps.spec	14 Nov 2006 20:54:07 -0000	1.28
+++ abcm2ps.spec	30 Nov 2006 17:16:18 -0000	1.29
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        5.1.2
+Version:        5.2.0
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-5.1.2.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-5.2.0.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Gerard Milmeister  - 5.2.0-1
+- new version 5.2.0
+
 * Tue Nov 14 2006 Gerard Milmeister  - 5.1.2-1
 - new version 5.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-6/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Nov 2006 20:54:07 -0000	1.25
+++ sources	30 Nov 2006 17:16:18 -0000	1.26
@@ -1,2 +1,2 @@
-2ff55e961fac9110bec652fd330f88e5  abcm2ps-5.1.2.tar.gz
+d962713c080a4200ef12c4a7fa32f1de  abcm2ps-5.2.0.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Thu Nov 30 17:26:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 30 Nov 2006 12:26:57 -0500
Subject: rpms/apcupsd/devel apcupsd-net-snmp.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 apcupsd.spec, 1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200611301726.kAUHQv3N000578@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv556

Modified Files:
	.cvsignore apcupsd.spec sources 
Added Files:
	apcupsd-net-snmp.patch 
Log Message:
Update to 3.13.9, add gui package


apcupsd-net-snmp.patch:

--- NEW FILE apcupsd-net-snmp.patch ---
--- apcupsd-3.13.9/src/drivers/snmp/snmp.h.net-snmp	2006-07-07 07:06:57.000000000 -0600
+++ apcupsd-3.13.9/src/drivers/snmp/snmp.h	2006-11-29 13:42:14.000000000 -0700
@@ -39,6 +39,7 @@
 #else
 
 # ifdef HAVE_NET_SNMP
+#  include 
 #  include 
 #  include 
 #  include 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Aug 2006 16:43:01 -0000	1.6
+++ .cvsignore	30 Nov 2006 17:26:26 -0000	1.7
@@ -1 +1 @@
-apcupsd-3.12.4.tar.gz
+apcupsd-3.13.9.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apcupsd.spec	9 Oct 2006 16:47:43 -0000	1.11
+++ apcupsd.spec	30 Nov 2006 17:26:26 -0000	1.12
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.12.4
-Release:      3%{?dist}
+Version:      3.13.9
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -10,10 +10,12 @@
 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: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers
+BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils
 Requires:      /bin/mail
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -40,13 +42,24 @@
 A CGI interface to the APC UPS monitoring daemon.
 
 
+%package gui
+Summary:      GUI interface for apcupsd
+Group:        Applications/System
+Requires:     %{name} = %{version}-%{release}
+
+%description gui
+A GUI interface to the APC UPS monitoring daemon.
+
+
 %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
 
+
 %build
 %configure \
         --sysconfdir="%{_sysconfdir}/apcupsd" \
@@ -54,7 +67,6 @@
         --enable-cgi \
         --enable-pthreads \
         --enable-net \
-        --enable-master-slave \
         --enable-apcsmart \
         --enable-dumb \
         --enable-net-snmp \
@@ -62,13 +74,13 @@
         --enable-usb \
         --enable-powerflute \
         --enable-nls \
+        --enable-gapcmon \
+        --enable-pcnet \
         --with-libwrap=%{_libdir} \
         --with-serial-dev= \
         --with-upstype=usb \
         --with-upscable=usb \
         APCUPSD_MAIL=/bin/mail
-
-
 make
 
 
@@ -93,6 +105,12 @@
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
+desktop-file-install --vendor="fedora" \
+        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+        --delete-original \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop
+
+# Cleanup for later %doc processing
 chmod -x examples/*.conf examples/*.c
 rm examples/*.in
 
@@ -127,6 +145,17 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf
 %{_localstatedir}/www/apcupsd/
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/gapcmon
+%{_datadir}/applications/fedora-gapcmon.desktop
+%{_datadir}/pixmaps/apcupsd.png
+%{_datadir}/pixmaps/charging.png
+%{_datadir}/pixmaps/gapc_prefs.png
+%{_datadir}/pixmaps/onbatt.png
+%{_datadir}/pixmaps/online.png
+%{_datadir}/pixmaps/unplugged.png
+
 
 %post
 # add our links
@@ -143,6 +172,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 - Orion Poplawski  - 3.13.9-1
+- Update to 3.13.9, add gui package
+
 * Mon Oct  9 2006 - Orion Poplawski  - 3.12.4-3
 - Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
   Patch from Clive Messer (clive at vacuumtube.org.uk)
@@ -179,13 +211,13 @@
 - Compile in snmp, net-snmp, powerflute, nls, add tcp_wrappers support
 
 * Mon Oct 17 2005 - Orion Poplawski  - 3.10.18-3
-- Removed %{_smp_mflags} from make, broke builds
+- Removed %%{_smp_mflags} from make, broke builds
 - Patch init file to not start automatically and add reload
 - Mark css file config
 - Require /sbin/chkconfig
 
 * Mon Oct 17 2005 - Orion Poplawski  - 3.10.18-2
-- Add %defattr to -cgi package
+- Add %%defattr to -cgi package
 
 * Wed Aug 17 2005 - Orion Poplawski  - 3.10.18-1
 - Initial Fedora Version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Aug 2006 16:43:01 -0000	1.6
+++ sources	30 Nov 2006 17:26:26 -0000	1.7
@@ -1 +1 @@
-669c833ec02a2bc29fa98f845e5f5de5  apcupsd-3.12.4.tar.gz
+a58f1a1c4387da5b2fa3666a246c8165  apcupsd-3.13.9.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 17:27:50 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 30 Nov 2006 12:27:50 -0500
Subject: rpms/fedora-usermgmt/EL-4 fedora-usermgmt.spec,1.6,1.7
Message-ID: <200611301727.kAUHRo7p000601@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/fedora-usermgmt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv584

Modified Files:
	fedora-usermgmt.spec 
Log Message:
add disttag




Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/EL-4/fedora-usermgmt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-usermgmt.spec	10 Dec 2005 11:59:18 -0000	1.6
+++ fedora-usermgmt.spec	30 Nov 2006 17:27:20 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
 Version:	0.8
-Release:	1
+Release:	1%{?dist}
 
 License:	GPL
 BuildArch:	noarch
@@ -145,6 +145,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Dennis Gilmore  - 0.8-1
+- add disttag
+
 * Sat Dec 10 2005 Enrico Scholz  - 0.8-1
 - fixed URL metadata (bz #172758)
 - execute 'nscd -i ...' before and after creating users/groups; this



From fedora-extras-commits at redhat.com  Thu Nov 30 17:40:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 12:40:01 -0500
Subject: fedora-security/audit fe5,1.110,1.111 fe6,1.26,1.27
Message-ID: <200611301740.kAUHe1r9000859@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv842

Modified Files:
	fe5 fe6 
Log Message:
CVE-2006-5815 should be fixed for FE5+


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fe5	27 Nov 2006 20:49:17 -0000	1.110
+++ fe5	30 Nov 2006 17:40:00 -0000	1.111
@@ -6,7 +6,7 @@
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
-CVE-2006-5815 ** (proftpd) #214820
+CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
 CVE-2006-5748 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 VULNERABLE (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fe6	27 Nov 2006 20:49:17 -0000	1.26
+++ fe6	30 Nov 2006 17:40:00 -0000	1.27
@@ -7,7 +7,7 @@
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077
-CVE-2006-5815 ** (proftpd) #214820
+CVE-2006-5815 version (proftpd, fixed 1.3.0a) #214820
 CVE-2006-5748 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5747 version (seamonkey, fixed 1.0.6) #214822
 CVE-2006-5705 VULNERABLE (wordpress, fixed 2.0.5) #213985



From fedora-extras-commits at redhat.com  Thu Nov 30 18:04:48 2006
From: fedora-extras-commits at redhat.com (Dominik Mierzejewski (rathann))
Date: Thu, 30 Nov 2006 13:04:48 -0500
Subject: rpms/tachyon/FC-5 tachyon.spec,1.1,1.2
Message-ID: <200611301804.kAUI4mLJ004282@cvs-int.fedora.redhat.com>

Author: rathann

Update of /cvs/extras/rpms/tachyon/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4266

Modified Files:
	tachyon.spec 
Log Message:
- work around libpng bug #217903


Index: tachyon.spec
===================================================================
RCS file: /cvs/extras/rpms/tachyon/FC-5/tachyon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tachyon.spec	30 Nov 2006 11:52:52 -0000	1.1
+++ tachyon.spec	30 Nov 2006 18:04:18 -0000	1.2
@@ -11,7 +11,7 @@
 Summary: Parallel / Multiprocessor Ray Tracing System
 Name: tachyon
 Version: 0.97
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
 Group: Applications/Engineering
 Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz
@@ -22,6 +22,7 @@
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: lam-devel
+BuildRequires: pkgconfig
 
 %description
 A portable, high performance parallel ray tracing system supporting MPI
@@ -139,6 +140,9 @@
 %{_datadir}/tachyon
 
 %changelog
+* Thu Nov 30 2006 Dominik 'Rathann' Mierzejewski  0.97-2.fc5.1
+- work around libpng bug #217903
+
 * Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski  0.97-2
 - use only kosher CFLAGS
 - fix target setting



From fedora-extras-commits at redhat.com  Thu Nov 30 18:43:44 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Thu, 30 Nov 2006 13:43:44 -0500
Subject: rpms/tcpick/devel tcpick.spec,1.3,1.4
Message-ID: <200611301843.kAUIhiuc004723@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4708

Modified Files:
	tcpick.spec 
Log Message:
Rebuilt



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/devel/tcpick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcpick.spec	9 Sep 2006 22:39:43 -0000	1.3
+++ tcpick.spec	30 Nov 2006 18:43:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPL
 Group: 		Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/it/man8/%{name}.8.gz
 
 %changelog
+* Wed Nov 29 2006 Robert Scheck  0.2.1-11
+- Rebuilt
+
 * Sun Sep 10 2006 Robert Scheck  0.2.1-10
 - Better workaround for CVE-2006-0048 to make tcpick usable again
 - Added patches for double-free, broken pointers and getopt on ppc



From fedora-extras-commits at redhat.com  Thu Nov 30 18:44:49 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Thu, 30 Nov 2006 13:44:49 -0500
Subject: rpms/tcpick/FC-6 tcpick.spec,1.3,1.4
Message-ID: <200611301844.kAUIinW8004792@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4774

Modified Files:
	tcpick.spec 
Log Message:
Rebuilt



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/FC-6/tcpick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcpick.spec	9 Sep 2006 22:39:43 -0000	1.3
+++ tcpick.spec	30 Nov 2006 18:44:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPL
 Group: 		Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/it/man8/%{name}.8.gz
 
 %changelog
+* Wed Nov 29 2006 Robert Scheck  0.2.1-11
+- Rebuilt
+
 * Sun Sep 10 2006 Robert Scheck  0.2.1-10
 - Better workaround for CVE-2006-0048 to make tcpick usable again
 - Added patches for double-free, broken pointers and getopt on ppc



From fedora-extras-commits at redhat.com  Thu Nov 30 18:45:59 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Thu, 30 Nov 2006 13:45:59 -0500
Subject: rpms/tcpick/FC-5 tcpick.spec,1.3,1.4
Message-ID: <200611301845.kAUIjxbF004882@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4862

Modified Files:
	tcpick.spec 
Log Message:
Rebuilt



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/FC-5/tcpick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcpick.spec	9 Sep 2006 22:41:35 -0000	1.3
+++ tcpick.spec	30 Nov 2006 18:45:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPL
 Group: 		Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/it/man8/%{name}.8.gz
 
 %changelog
+* Wed Nov 29 2006 Robert Scheck  0.2.1-11
+- Rebuilt
+
 * Sun Sep 10 2006 Robert Scheck  0.2.1-10
 - Better workaround for CVE-2006-0048 to make tcpick usable again
 - Added patches for double-free, broken pointers and getopt on ppc



From fedora-extras-commits at redhat.com  Thu Nov 30 18:47:08 2006
From: fedora-extras-commits at redhat.com (Robert Scheck (robert))
Date: Thu, 30 Nov 2006 13:47:08 -0500
Subject: rpms/tcpick/FC-4 tcpick.spec,1.3,1.4
Message-ID: <200611301847.kAUIl8QV004951@cvs-int.fedora.redhat.com>

Author: robert

Update of /cvs/extras/rpms/tcpick/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4931

Modified Files:
	tcpick.spec 
Log Message:
Rebuilt



Index: tcpick.spec
===================================================================
RCS file: /cvs/extras/rpms/tcpick/FC-4/tcpick.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tcpick.spec	9 Sep 2006 22:43:15 -0000	1.3
+++ tcpick.spec	30 Nov 2006 18:46:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		tcpick
 Version: 	0.2.1
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 Summary:  	A tcp stream sniffer, tracker and capturer
 License: 	GPL
 Group: 		Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/it/man8/%{name}.8.gz
 
 %changelog
+* Wed Nov 29 2006 Robert Scheck  0.2.1-11
+- Rebuilt
+
 * Sun Sep 10 2006 Robert Scheck  0.2.1-10
 - Better workaround for CVE-2006-0048 to make tcpick usable again
 - Added patches for double-free, broken pointers and getopt on ppc



From fedora-extras-commits at redhat.com  Thu Nov 30 19:27:06 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 30 Nov 2006 14:27:06 -0500
Subject: rpms/plague/FC-3 plague-0.4.4-old-createrepo.patch,NONE,1.1
Message-ID: <200611301927.kAUJR6vX008322@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8315

Added Files:
	plague-0.4.4-old-createrepo.patch 
Log Message:
work around older createrepo versions that lack caching

plague-0.4.4-old-createrepo.patch:

--- NEW FILE plague-0.4.4-old-createrepo.patch ---
--- plague-0.4.4.1/server/Repo.py.old-createrepo	2006-11-30 14:29:59.000000000 -0500
+++ plague-0.4.4.1/server/Repo.py	2006-11-30 14:30:18.000000000 -0500
@@ -118,7 +118,7 @@
 
         self._repo_additions = []
 
-        (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % (self._repo_cache_dir, self._repodir))
+        (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % self._repodir)
         if s != 0:
             print "Error: createrepo failed with exit status %d!  Output: '%s'" % (s, o)
 



From fedora-extras-commits at redhat.com  Thu Nov 30 19:43:57 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 30 Nov 2006 14:43:57 -0500
Subject: rpms/syck/devel syck.spec,1.6,1.7
Message-ID: <200611301943.kAUJhvJO008441@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/syck/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8421

Modified Files:
	syck.spec 
Log Message:
* Thu Nov 30 2006 Jason L Tibbitts III  - 0.55-11
- Rebuild for updated php.



Index: syck.spec
===================================================================
RCS file: /cvs/extras/rpms/syck/devel/syck.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- syck.spec	1 Sep 2006 14:04:00 -0000	1.6
+++ syck.spec	30 Nov 2006 19:43:27 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:		YAML for C, Python, and PHP
 
 Version:		0.55
-Release:		10%{?dist}
+Release:		11%{?dist}
 
 License:		BSD
 Group:			System Environment/Libraries
@@ -185,6 +185,9 @@
 %{php_extdir}/*.so
 
 %changelog
+* Thu Nov 30 2006 Jason L Tibbitts III  - 0.55-11
+- Rebuild for updated php.
+
 * Fri Sep 01 2006 Jason L Tibbitts III  - 0.55-10
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Thu Nov 30 19:48:41 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?SGHDr2tlbCBHdcOpbWFy?= (hguemar))
Date: Thu, 30 Nov 2006 14:48:41 -0500
Subject: rpms/gtkmozembedmm/FC-6 gtkmozembedmm.spec,1.8,1.9
Message-ID: <200611301948.kAUJmf3Y008519@cvs-int.fedora.redhat.com>

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8493

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/FC-6/gtkmozembedmm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtkmozembedmm.spec	23 Nov 2006 13:07:08 -0000	1.8
+++ gtkmozembedmm.spec	30 Nov 2006 19:48:11 -0000	1.9
@@ -1,4 +1,4 @@
-%define gecko_ver 1.8.1
+%define gecko_ver 1.8.0.8
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
 Release:        6%{?dist}



From fedora-extras-commits at redhat.com  Thu Nov 30 20:17:40 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Thu, 30 Nov 2006 15:17:40 -0500
Subject: rpms/gliv/FC-5 gliv.spec,1.1,1.2
Message-ID: <200611302017.kAUKHeRP011721@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/gliv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11702/FC-5

Modified Files:
	gliv.spec 
Log Message:
Added missing BR for FC5


Index: gliv.spec
===================================================================
RCS file: /cvs/extras/rpms/gliv/FC-5/gliv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gliv.spec	22 Nov 2006 18:20:26 -0000	1.1
+++ gliv.spec	30 Nov 2006 20:17:10 -0000	1.2
@@ -5,7 +5,7 @@
 Summary:	Image viewing utility
 Name:		gliv
 Version:	1.9.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://guichaz.free.fr/gliv/
@@ -14,6 +14,7 @@
 BuildRequires: gtk2-devel >= 2.6.0
 BuildRequires: gtkglext-devel >= 0.7.0
 BuildRequires: desktop-file-utils
+BuildRequires: libGL-devel
 
 %description
 GLiv is an OpenGL image viewer. GLiv is very fast and smooth at rotating,
@@ -88,6 +89,9 @@
 
 %changelog
 
+* Thu Nov 30 2006 Peter Lemenkov  1.9.6-3
+- added missing BR
+
 * Wed Nov 22 2006 Peter Lemenkov  1.9.6-2
 - Spec cleanup
 



From fedora-extras-commits at redhat.com  Thu Nov 30 20:42:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 15:42:45 -0500
Subject: fedora-security/audit fe3, 1.35, 1.36 fe4, 1.102, 1.103 fe5, 1.111,
	1.112
Message-ID: <200611302042.kAUKgjmj011888@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11869

Modified Files:
	fe3 fe4 fe5 
Log Message:
Note FE[345] tin fixes.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fe3	27 Nov 2006 20:49:17 -0000	1.35
+++ fe3	30 Nov 2006 20:42:45 -0000	1.36
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
+CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077
 CVE-2006-5815 ** (proftpd) #214820
@@ -60,7 +60,7 @@
 CVE-2006-0840 VULNERABLE (mantis) bz#191089
 CVE-2006-0839 version (snort, fixed in 2.4.4) bz#183297
 CVE-2006-0814 ignore (lighttpd, Windows-specific problem)
-CVE-2006-0804 VULNERABLE (tin, fixed 1.8.1) #217422
+CVE-2006-0804 version (tin, fixed 1.8.1) #217422
 CVE-2006-0760 ** version (lighttpd, fixed 1.4.10))
 CVE-2006-0665 VULNERABLE (mantis) bz#191089
 CVE-2006-0664 VULNERABLE (mantis) bz#191089


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- fe4	27 Nov 2006 20:49:17 -0000	1.102
+++ fe4	30 Nov 2006 20:42:45 -0000	1.103
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
+CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fe5	30 Nov 2006 17:40:00 -0000	1.111
+++ fe5	30 Nov 2006 20:42:45 -0000	1.112
@@ -2,7 +2,7 @@
 
 ** are items that need attention
 
-CVE-2006-6122 VULNERABLE (tin, fixed 1.8.2) #217420
+CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136
 CVE-2006-5848 version (trac, fixed 0.10.1) #215077



From fedora-extras-commits at redhat.com  Thu Nov 30 20:53:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 15:53:25 -0500
Subject: rpms/lirc/devel .cvsignore, 1.12, 1.13 lirc.spec, 1.18, 1.19 sources,
	1.12, 1.13
Message-ID: <200611302053.kAUKrPnP011951@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11932

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Thu Nov 30 2006 Ville Skytt??  - 0.8.1-0.2.pre3
- 0.8.1pre3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 Oct 2006 20:24:14 -0000	1.12
+++ .cvsignore	30 Nov 2006 20:52:55 -0000	1.13
@@ -1 +1 @@
-lirc-0.8.1pre2.tar.bz2
+lirc-0.8.1pre3.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lirc.spec	15 Oct 2006 20:23:20 -0000	1.18
+++ lirc.spec	30 Nov 2006 20:52:55 -0000	1.19
@@ -16,14 +16,14 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre2%{?dist}
+Release:        0.2.pre3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre2.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre3.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +81,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}pre3
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Thu Nov 30 2006 Ville Skytt??  - 0.8.1-0.2.pre3
+- 0.8.1pre3.
+
 * Sun Oct 15 2006 Ville Skytt??  - 0.8.1-0.2.pre2
 - 0.8.1pre2, optflags patch no longer needed.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 Oct 2006 20:24:14 -0000	1.12
+++ sources	30 Nov 2006 20:52:55 -0000	1.13
@@ -1 +1 @@
-c8c1f5f692222050bcbafbf1ba6a1217  lirc-0.8.1pre2.tar.bz2
+68ea2f504f45e528ee8b5d3ff23c5181  lirc-0.8.1pre3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 20:58:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 15:58:36 -0500
Subject: fedora-security/audit fe3, 1.36, 1.37 fe4, 1.103, 1.104 fe5, 1.112, 
	1.113 fe6, 1.27, 1.28
Message-ID: <200611302058.kAUKwaQO012079@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12058

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
Catch up with new proftpd 1.3.0* CVE ids.


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fe3	30 Nov 2006 20:42:45 -0000	1.36
+++ fe3	30 Nov 2006 20:58:36 -0000	1.37
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-6171 VULNERABLE (proftpd) #214820
+CVE-2006-6170 VULNERABLE (proftpd) #214820
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fe4	30 Nov 2006 20:42:45 -0000	1.103
+++ fe4	30 Nov 2006 20:58:36 -0000	1.104
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-6171 VULNERABLE (proftpd) #214820
+CVE-2006-6170 VULNERABLE (proftpd) #214820
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fe5	30 Nov 2006 20:42:45 -0000	1.112
+++ fe5	30 Nov 2006 20:58:36 -0000	1.113
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fe6	30 Nov 2006 17:40:00 -0000	1.27
+++ fe6	30 Nov 2006 20:58:36 -0000	1.28
@@ -2,6 +2,8 @@
 
 ** are items that need attention
 
+CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
 CVE-2006-6122 ignore (tin, <= 1.8.1 not shipped)
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263



From fedora-extras-commits at redhat.com  Thu Nov 30 20:58:59 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 30 Nov 2006 15:58:59 -0500
Subject: rpms/codeblocks/devel .cvsignore, 1.9, 1.10 codeblocks.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200611302058.kAUKwxXx012084@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12038

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3315


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Nov 2006 20:26:57 -0000	1.9
+++ .cvsignore	30 Nov 2006 20:58:29 -0000	1.10
@@ -1 +1 @@
-codeblocks-svn3295.tar.bz2
+codeblocks-svn3315.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- codeblocks.spec	28 Nov 2006 20:26:57 -0000	1.8
+++ codeblocks.spec	30 Nov 2006 20:58:29 -0000	1.9
@@ -1,9 +1,9 @@
-%define		rev	3295
-%define		date	20061128
+%define		rev	3315
+%define		date	20061130
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.16.%{date}svn%{rev}%{?dist}
+Release:	0.17.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -67,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -207,6 +207,7 @@
 %{pkgdatadir}/keybinder.zip
 %{pkgdatadir}/lib_finder.zip
 %{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/RegExTestbed.zip
 %{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
@@ -223,11 +224,15 @@
 %{plugindir}/libkeybinder.so
 %{plugindir}/liblib_finder.so
 %{plugindir}/libProfiler.so
+%{plugindir}/libRegExTestbed.so
 %{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Thu Nov 30 2006 Dan Horak  1.0-0.17.20061130svn3315
+- update to revision 3315
+
 * Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
 - update to revision 3295
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Nov 2006 20:26:57 -0000	1.9
+++ sources	30 Nov 2006 20:58:29 -0000	1.10
@@ -1 +1 @@
-74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2
+be8df0b63fa5f452b7f2be72413aab33  codeblocks-svn3315.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 21:04:32 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 30 Nov 2006 16:04:32 -0500
Subject: rpms/codeblocks/FC-6 .cvsignore, 1.9, 1.10 codeblocks.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200611302104.kAUL4WhD015230@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15207

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3315


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Nov 2006 20:33:49 -0000	1.9
+++ .cvsignore	30 Nov 2006 21:04:02 -0000	1.10
@@ -1 +1 @@
-codeblocks-svn3295.tar.bz2
+codeblocks-svn3315.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- codeblocks.spec	28 Nov 2006 20:33:49 -0000	1.8
+++ codeblocks.spec	30 Nov 2006 21:04:02 -0000	1.9
@@ -1,9 +1,9 @@
-%define		rev	3295
-%define		date	20061128
+%define		rev	3315
+%define		date	20061130
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.16.%{date}svn%{rev}%{?dist}
+Release:	0.17.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -67,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -207,6 +207,7 @@
 %{pkgdatadir}/keybinder.zip
 %{pkgdatadir}/lib_finder.zip
 %{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/RegExTestbed.zip
 %{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
@@ -223,11 +224,15 @@
 %{plugindir}/libkeybinder.so
 %{plugindir}/liblib_finder.so
 %{plugindir}/libProfiler.so
+%{plugindir}/libRegExTestbed.so
 %{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Thu Nov 30 2006 Dan Horak  1.0-0.17.20061130svn3315
+- update to revision 3315
+
 * Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
 - update to revision 3295
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Nov 2006 20:33:49 -0000	1.9
+++ sources	30 Nov 2006 21:04:02 -0000	1.10
@@ -1 +1 @@
-74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2
+be8df0b63fa5f452b7f2be72413aab33  codeblocks-svn3315.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 21:07:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 30 Nov 2006 16:07:46 -0500
Subject: fedora-security/audit fe3, 1.37, 1.38 fe4, 1.104, 1.105 fe5, 1.113, 
	1.114 fe6, 1.28, 1.29
Message-ID: <200611302107.kAUL7k0e015316@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15295

Modified Files:
	fe3 fe4 fe5 fe6 
Log Message:
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950


Index: fe3
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe3,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- fe3	30 Nov 2006 20:58:36 -0000	1.37
+++ fe3	30 Nov 2006 21:07:45 -0000	1.38
@@ -4,6 +4,7 @@
 
 CVE-2006-6171 VULNERABLE (proftpd) #214820
 CVE-2006-6170 VULNERABLE (proftpd) #214820
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5848 VULNERABLE (trac, fixed 0.10.1) #215077


Index: fe4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe4,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fe4	30 Nov 2006 20:58:36 -0000	1.104
+++ fe4	30 Nov 2006 21:07:45 -0000	1.105
@@ -4,6 +4,7 @@
 
 CVE-2006-6171 VULNERABLE (proftpd) #214820
 CVE-2006-6170 VULNERABLE (proftpd) #214820
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe5,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fe5	30 Nov 2006 20:58:36 -0000	1.113
+++ fe5	30 Nov 2006 21:07:45 -0000	1.114
@@ -4,6 +4,7 @@
 
 CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
 CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950
 CVE-2006-6122 version (tin, fixed 1.8.2) #217420
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5864 VULNERABLE (gv) #215136


Index: fe6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fe6,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fe6	30 Nov 2006 20:58:36 -0000	1.28
+++ fe6	30 Nov 2006 21:07:45 -0000	1.29
@@ -4,6 +4,7 @@
 
 CVE-2006-6171 patch (proftpd, fixed 1.3.0a-1) #214820
 CVE-2006-6170 patch (proftpd, fixed 1.3.0a-1) #214820
+CVE-2006-6169 VULNERABLE (gnupg2, fixed 2.0.1) #217950
 CVE-2006-6122 ignore (tin, <= 1.8.1 not shipped)
 CVE-2006-6085 version (kile, fixed 1.9.3) #217238
 CVE-2006-5793 version (libpng10, fixed 1.0.21) #216263



From fedora-extras-commits at redhat.com  Thu Nov 30 21:10:32 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Thu, 30 Nov 2006 16:10:32 -0500
Subject: rpms/codeblocks/FC-5 .cvsignore, 1.9, 1.10 codeblocks.spec, 1.8,
	1.9 sources, 1.9, 1.10
Message-ID: <200611302110.kAULAWcS015354@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15331

Modified Files:
	.cvsignore codeblocks.spec sources 
Log Message:
 - update to revision 3315


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Nov 2006 20:36:17 -0000	1.9
+++ .cvsignore	30 Nov 2006 21:10:02 -0000	1.10
@@ -1 +1 @@
-codeblocks-svn3295.tar.bz2
+codeblocks-svn3315.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/codeblocks.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- codeblocks.spec	28 Nov 2006 20:36:17 -0000	1.8
+++ codeblocks.spec	30 Nov 2006 21:10:02 -0000	1.9
@@ -1,9 +1,9 @@
-%define		rev	3295
-%define		date	20061128
+%define		rev	3315
+%define		date	20061130
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.16.%{date}svn%{rev}%{?dist}
+Release:	0.17.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -67,7 +67,7 @@
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
 done
 
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler source_exporter symtab wxSmith
+for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith
 do
 	sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
 done
@@ -207,6 +207,7 @@
 %{pkgdatadir}/keybinder.zip
 %{pkgdatadir}/lib_finder.zip
 %{pkgdatadir}/Profiler.zip
+%{pkgdatadir}/RegExTestbed.zip
 %{pkgdatadir}/SymTab.zip
 %{pkgdatadir}/wxsmith.zip
 %{pkgdatadir}/images/codesnippets
@@ -223,11 +224,15 @@
 %{plugindir}/libkeybinder.so
 %{plugindir}/liblib_finder.so
 %{plugindir}/libProfiler.so
+%{plugindir}/libRegExTestbed.so
 %{plugindir}/libSymTab.so
 %{plugindir}/libwxsmith.so
 
 
 %changelog
+* Thu Nov 30 2006 Dan Horak  1.0-0.17.20061130svn3315
+- update to revision 3315
+
 * Tue Nov 28 2006 Dan Horak  1.0-0.16.20061128svn3295
 - update to revision 3295
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Nov 2006 20:36:17 -0000	1.9
+++ sources	30 Nov 2006 21:10:02 -0000	1.10
@@ -1 +1 @@
-74486ce4508b97c6f63f665a8dabb866  codeblocks-svn3295.tar.bz2
+be8df0b63fa5f452b7f2be72413aab33  codeblocks-svn3315.tar.bz2



From fedora-extras-commits at redhat.com  Thu Nov 30 21:45:27 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Thu, 30 Nov 2006 16:45:27 -0500
Subject: fedora-security/audit fc5,1.404,1.405 fc6,1.155,1.156
Message-ID: <200611302145.kAULjRRE015595@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15578

Modified Files:
	fc5 fc6 
Log Message:
Note a new libgsf issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- fc5	29 Nov 2006 08:58:59 -0000	1.404
+++ fc5	30 Nov 2006 21:45:26 -0000	1.405
@@ -3,7 +3,6 @@
 
 
 ** are items that need attention
-
 CVE-2006-6060 ignore (kernel, fixed 2.6.19-rc2) no NTFS support
 CVE-2006-6058 VULNERABLE (kernel, fixed **)
 CVE-2006-6057 ignore (kernel, fixed **) separate modules
@@ -105,6 +104,7 @@
 CVE-2006-4561 VULNERABLE (firefox)
 CVE-2006-4538 version (kernel, fixed 2.6.18) [since FEDORA-2006-1022] ia64 and sparc only
 CVE-2006-4535 version (kernel, fixed 2.6.17.12, fixed 2.6.18-rc6) [since FEDORA-2006-967]
+CVE-2006-4514 VULNERABLE (libgsf, fixed 1.14.2) #217957
 CVE-2006-4507 ignore (libtiff) can't reproduce
 CVE-2006-4486 version (php, fixed 5.1.6) [since FEDORA-2006-1024]
 CVE-2006-4485 version (php, fixed 5.1.5) [since FEDORA-2006-1024]


Index: fc6
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc6,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- fc6	29 Nov 2006 08:58:59 -0000	1.155
+++ fc6	30 Nov 2006 21:45:27 -0000	1.156
@@ -98,6 +98,7 @@
 CVE-2006-4561 VULNERABLE (firefox)
 CVE-2006-4538 version (kernel, fixed after 2.6.18-rc6)
 CVE-2006-4535 version (kernel, fixed 2.6.18-rc6)
+CVE-2006-4514 VULNERABLE (libgsf, fixed 1.14.2) #217957
 CVE-2006-4507 ignore (libtiff) can't reproduce
 CVE-2006-4486 version (php, fixed 5.1.6)
 CVE-2006-4485 version (php, fixed 5.1.5)



From fedora-extras-commits at redhat.com  Thu Nov 30 22:17:23 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:17:23 -0500
Subject: rpms/devilspie - New directory
Message-ID: <200611302217.kAUMHNEt018817@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18813/devilspie

Log Message:
Directory /cvs/extras/rpms/devilspie added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 22:17:28 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:17:28 -0500
Subject: rpms/devilspie/devel - New directory
Message-ID: <200611302217.kAUMHSSD018830@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18813/devilspie/devel

Log Message:
Directory /cvs/extras/rpms/devilspie/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 22:17:47 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:17:47 -0500
Subject: rpms/devilspie Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611302217.kAUMHlGw018867@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18861

Added Files:
	Makefile import.log 
Log Message:
Setup of module devilspie


--- NEW FILE Makefile ---
# Top level Makefile for module devilspie
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 Nov 30 22:17:52 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:17:52 -0500
Subject: rpms/devilspie/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611302217.kAUMHqqF018884@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18861/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module devilspie


--- 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 Nov 30 22:19:04 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:19:04 -0500
Subject: rpms/devilspie import.log,1.1,1.2
Message-ID: <200611302219.kAUMJ4hL018963@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18933

Modified Files:
	import.log 
Log Message:
auto-import devilspie-0.18-1.fc6 on branch devel from devilspie-0.18-1.fc6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/devilspie/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 22:17:47 -0000	1.1
+++ import.log	30 Nov 2006 22:18:34 -0000	1.2
@@ -0,0 +1 @@
+devilspie-0_18-1_fc6:HEAD:devilspie-0.18-1.fc6.src.rpm:1164925319



From fedora-extras-commits at redhat.com  Thu Nov 30 22:19:05 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:19:05 -0500
Subject: rpms/devilspie/devel devilspie.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200611302219.kAUMJ5mE018967@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/rpms/devilspie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18933/devel

Modified Files:
	.cvsignore sources 
Added Files:
	devilspie.spec 
Log Message:
auto-import devilspie-0.18-1.fc6 on branch devel from devilspie-0.18-1.fc6.src.rpm


--- NEW FILE devilspie.spec ---
Name:           devilspie
Version:        0.18
Release:        1%{?dist}
Summary:        A window-matching utility

Group:          User Interface/X
License:        GPL
URL:            http://www.burtonini.com/blog/computers/devilspie
Source0:        http://www.burtonini.com/computing/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libwnck-devel
BuildRequires:  libpng-devel
BuildRequires:  libxml2-devel
BuildRequires:  gettext
BuildRequires:  gob2
BuildRequires:  perl-XML-Parser

%description
A window-matching utility, inspired by Sawfish's "Matched Windows" option and
the lack such functionality in Metacity. Devil's Pie can be configured to
detect windows as they are created, and match the window to a set of rules. If
the window matches the rules, it can perform a series of actions on that
window. 

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING TODO
%{_bindir}/devilspie
%{_mandir}/man1/devilspie.1.gz

%changelog
* Wed Oct 25 2006 Sebastian Vahl  0.18-1
- New upstream version: 0.18

* Wed Aug 23 2006 Sebastian Vahl  0.17.1-2
- removed redundant dependencies: atk-devel gtk2-devel pango-devel
- shorten summary and description
- fixed rpmlint in spec error: mixed-use-of-spaces-and-tabs

* Wed Mar 08 2006 Sebastian Vahl  0.17.1-1
- New upstream version: 0.17.1

* Mon Jan 09 2006 Sebastian Vahl  0.16-1
- New upstream version: 0.16

* Mon Jul 18 2005 Menno Smits  0.10-1
- initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/devilspie/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 22:17:52 -0000	1.1
+++ .cvsignore	30 Nov 2006 22:18:34 -0000	1.2
@@ -0,0 +1 @@
+devilspie-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/devilspie/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 22:17:52 -0000	1.1
+++ sources	30 Nov 2006 22:18:34 -0000	1.2
@@ -0,0 +1 @@
+148537a51037875aaba91b3822055332  devilspie-0.18.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 22:24:32 2006
From: fedora-extras-commits at redhat.com (Sebastian Vahl (svahl))
Date: Thu, 30 Nov 2006 17:24:32 -0500
Subject: owners owners.list,1.2041,1.2042
Message-ID: <200611302224.kAUMOWjl019047@cvs-int.fedora.redhat.com>

Author: svahl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19017

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2041
retrieving revision 1.2042
diff -u -r1.2041 -r1.2042
--- owners.list	30 Nov 2006 16:51:34 -0000	1.2041
+++ owners.list	30 Nov 2006 22:24:02 -0000	1.2042
@@ -305,6 +305,7 @@
 Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|deutex|Doom wad manipulation tool|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|DevIL|A cross-platform image library|packages at amiga-hardware.com|extras-qa at fedoraproject.org|
+Fedora Extras|devilspie|A window-matching utility|fedora at deadbabylon.de|extras-qa at fedoraproject.org|
 Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|dia|A diagram drawing program|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 22:27:07 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:27:07 -0500
Subject: rpms/pgfouine - New directory
Message-ID: <200611302227.kAUMR74D019123@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19119/pgfouine

Log Message:
Directory /cvs/extras/rpms/pgfouine added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 22:27:12 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:27:12 -0500
Subject: rpms/pgfouine/devel - New directory
Message-ID: <200611302227.kAUMRCVR019137@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19119/pgfouine/devel

Log Message:
Directory /cvs/extras/rpms/pgfouine/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Nov 30 22:27:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:27:34 -0500
Subject: rpms/pgfouine Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200611302227.kAUMRYCL019177@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19171

Added Files:
	Makefile import.log 
Log Message:
Setup of module pgfouine


--- NEW FILE Makefile ---
# Top level Makefile for module pgfouine
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 Nov 30 22:27:40 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:27:40 -0500
Subject: rpms/pgfouine/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200611302227.kAUMRere019192@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19171/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pgfouine


--- 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 Nov 30 22:29:21 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:29:21 -0500
Subject: rpms/pgfouine import.log,1.1,1.2
Message-ID: <200611302229.kAUMTL1k019284@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19248

Modified Files:
	import.log 
Log Message:
auto-import pgfouine-0.7.1-2 on branch devel from pgfouine-0.7.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Nov 2006 22:27:34 -0000	1.1
+++ import.log	30 Nov 2006 22:28:51 -0000	1.2
@@ -0,0 +1 @@
+pgfouine-0_7_1-2:HEAD:pgfouine-0.7.1-2.src.rpm:1164925885



From fedora-extras-commits at redhat.com  Thu Nov 30 22:29:22 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 17:29:22 -0500
Subject: rpms/pgfouine/devel pgfouine-0.7-include_path.patch, NONE,
	1.1 pgfouine-tutorial.txt, NONE, 1.1 pgfouine.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200611302229.kAUMTM60019288@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/rpms/pgfouine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19248/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pgfouine-0.7-include_path.patch pgfouine-tutorial.txt 
	pgfouine.spec 
Log Message:
auto-import pgfouine-0.7.1-2 on branch devel from pgfouine-0.7.1-2.src.rpm

pgfouine-0.7-include_path.patch:

--- NEW FILE pgfouine-0.7-include_path.patch ---
--- pgfouine_vacuum.php.orig	2006-08-11 00:13:57.797229593 +0200
+++ pgfouine_vacuum.php	2006-08-11 00:15:16.800770504 +0200
@@ -30,6 +30,8 @@
 	error_reporting(E_ALL);
 }
 
+ini_set('include_path', '@INCLUDEPATH@');
+
 include('version.php');
 require_once('include/lib/common.lib.php');
 require_once('include/base.lib.php');

--- pgfouine.php.orig	2006-08-11 00:17:07.628330143 +0200
+++ pgfouine.php	2006-08-11 00:18:39.298492488 +0200
@@ -30,6 +30,8 @@
 	error_reporting(E_ALL);
 }
 
+ini_set('include_path', '@INCLUDEPATH@');
+
 include('version.php');
 require_once('include/lib/common.lib.php');
 require_once('include/base.lib.php');


--- NEW FILE pgfouine-tutorial.txt ---
Installation instructions & Tutorial
Installation

You can either untar the pgFouine tarball or install the RPM package.

    * If you use the tarball, pgFouine is installed locally and can be 
run with ./pgfouine.php in the directory where you installed it.
    * If you install the RPM package, pgFouine is installed globally 
and you can run pgFouine with pgfouine.php.

How to enable query logging
PostgreSQL 7.x

Edit your postgresql.conf file (usually located in 
/var/lib/pgsql/data/) and set the following configuration directives:

    * To log queries slower than n milliseconds:

      syslog = 2
      log_min_duration_statement = n
      log_duration = false
      log_statement = false

      To log every query executed, set log_min_duration_statement to 0. 
Set it to -1 to disable query logging.
    * To log queries slower than n milliseconds AND duration for ALL 
queries (it only works with PostgreSQL 7.x; pgFouine counts every 
duration only once):

      syslog = 2
      log_min_duration_statement = n
      log_duration = true
      log_statement = false

Then edit your /etc/syslog.conf to set up a PostgreSQL facility:

local0.*		-/var/log/pgsql

You should also ignore PostgreSQL facility for the default log file otherwise you will log the queries twice:

*.info;mail.none;authpriv.none;cron.none;local0.none                /var/log/messages

Restart syslogd and PostgreSQL.

Apart from the extra I/O, the overhead of logging is barely noticeable. 
You can set syslog to send the log to another server through the 
network with @ip.ad.dr.ess.


PostgreSQL 8.x
Syslog configuration

Edit your postgresql.conf file (usually located in 
/var/lib/pgsql/data/) and set the following configuration directives:

    * To enable syslog logging:

      log_destination = 'syslog'
      redirect_stderr = off
      silent_mode = on

    * To log queries slower than n milliseconds:

      log_min_duration_statement = n
      log_duration = off
      log_statement = 'none'

      To log every query executed, set log_min_duration_statement to 0. Set it to -1 to disable query logging.

Then edit your /etc/syslog.conf to set up a PostgreSQL facility:

local0.*		-/var/log/pgsql

You should also ignore PostgreSQL facility for the default log file 
otherwise you will log the queries twice:

*.info;mail.none;authpriv.none;cron.none;local0.none                /var/log/messages

Restart syslogd and PostgreSQL.

Apart from the extra I/O, the overhead of logging is barely noticeable. 
You can set syslog to send the log to another server through the 
network with @ip.ad.dr.ess.


Filter on database and/or user

You can filter your log file on database and user using the -database 
and -user options. To do so, you need to configure the following 
log_line_prefix:

log_line_prefix = 'user=%u,db=%d'

Using stderr log file

Using the following configuration, you can log to stderr instead of 
syslog. This is not recommended as we cannot guarantee the consistency 
of statements if they are multilines.

log_destination = 'stderr'
redirect_stderr = on
log_line_prefix = '%t [%p]: [%l-1] '

Usage

pgFouine is an easy to use command line tool. The following command 
generates an HTML report with all default options:

$ pgfouine.php -file your/log/file.log > your-report.html

The following command line displays a text report with only 10 queries 
in each list to the standard output:

$ pgfouine.php -file your/log/file.log -top 10 -format text

By using pgfouine.php -help, you can display the usage information.


--- NEW FILE pgfouine.spec ---
Summary:	PgFouine PostgreSQL log analyzer
Name:		pgfouine
Version:	0.7.1
Release:	2%{?dist}
BuildArch:	noarch
License:	GPL
Group:		Development/Tools
Source0:	http://pgfouine.projects.postgresql.org/releases/%{name}-%{version}.tar.gz
Source2:	pgfouine-tutorial.txt
URL: 		http://pgfouine.projects.postgresql.org
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch1:		pgfouine-0.7-include_path.patch

%description
pgFouine is a PostgreSQL log analyzer. It generates text 
or HTML reports from PostgreSQL log files. These reports 
contain the list of the slowest queries, the queries that 
take the most time and so on.

pgFouine can also:
- analyze VACUUM VERBOSE output to help you improve your 
VACUUM strategy,
- generate Tsung sessions file to benchmark your 
PostgreSQL server.

%prep
%setup -q 
%patch1 -p0
sed -i 's!@INCLUDEPATH@!%{_datadir}/%{name}!' pgfouine_vacuum.php
sed -i 's!@INCLUDEPATH@!%{_datadir}/%{name}!' pgfouine.php

cp %{SOURCE2} .

%build

%install
# cleaning build environment
rm -rf %{buildroot}

# creating required directories
install -m 755 -d %{buildroot}/%{_datadir}/%{name}
install -m 755 -d %{buildroot}/%{_bindir}

# installing pgFouine
for i in include version.php; do
	cp -rp $i %{buildroot}/%{_datadir}/%{name}/
done

install -m 755 pgfouine.php %{buildroot}/%{_bindir}/
install -m 755 pgfouine_vacuum.php %{buildroot}/%{_bindir}/

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING THANKS README pgfouine-tutorial.txt
%attr(0755, root, root) %{_bindir}/pgfouine.php
%attr(0755, root, root) %{_bindir}/pgfouine_vacuum.php
%{_datadir}/%{name}

%changelog 
* Thu Nov 30 2006 Devrim Gunduz  - 0.7.1-2
- Added tutorial.txt per bugzilla review
* Sat Oct 28 2006 Guillaume Smet  - 0.7.1-1
- released 0.7.1
* Sun Sep 3 2006 Guillaume Smet  - 0.7-4
- fixed spec according to bugzilla #202901 comment #2
* Thu Aug 18 2006 Devrim Gunduz  - 0.7-3
- fixed spec, per bugzilla review
* Thu Aug 17 2006 Devrim Gunduz  - 0.7-2
- fixed rpmlint warnings, and made cosmetic changes
* Thu Aug 17 2006 Guillaume Smet 
- released 0.7
* Thu Aug 10 2006 Guillaume Smet 
- fixed RPM packaging for 0.7
* Wed Jul 19 2006 Guillaume Smet 
- added pgfouine_vacuum.php
* Sun May 21 2006 Guillaume Smet 
- released 0.6
* Sun Mar 26 2006 Guillaume Smet 
- released 0.5
* Tue Jan 10 2006 Guillaume Smet 
- released 0.2.1
* Sun Dec 4 2005 Guillaume Smet 
- released 0.2
* Fri Nov 18 2005 Guillaume Smet 
- initial RPM packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Nov 2006 22:27:40 -0000	1.1
+++ .cvsignore	30 Nov 2006 22:28:52 -0000	1.2
@@ -0,0 +1 @@
+pgfouine-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgfouine/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Nov 2006 22:27:40 -0000	1.1
+++ sources	30 Nov 2006 22:28:52 -0000	1.2
@@ -0,0 +1 @@
+79df9b088a9cd0a7741de0b5857dc3e7  pgfouine-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Nov 30 23:49:34 2006
From: fedora-extras-commits at redhat.com (=?utf-8?b?RGV2cmltIEfDnE5Ew5xa?= (devrim))
Date: Thu, 30 Nov 2006 18:49:34 -0500
Subject: owners owners.list,1.2042,1.2043
Message-ID: <200611302349.kAUNnYBU023230@cvs-int.fedora.redhat.com>

Author: devrim

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23205/owners

Modified Files:
	owners.list 
Log Message:
Added pgFouine



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.2042
retrieving revision 1.2043
diff -u -r1.2042 -r1.2043
--- owners.list	30 Nov 2006 22:24:02 -0000	1.2042
+++ owners.list	30 Nov 2006 23:49:04 -0000	1.2043
@@ -1820,6 +1820,7 @@
 Fedora Extras|pessulus|A lockdown editor for GNOME|splinux at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|pgfouine|PgFouine PostgreSQL log analyzer|devrim at commandprompt.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|php-adodb|Active Data Objects Data Base|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Nov 30 23:50:28 2006
From: fedora-extras-commits at redhat.com (Scott Baker (muerte))
Date: Thu, 30 Nov 2006 18:50:28 -0500
Subject: rpms/qcomicbook/devel .cvsignore, 1.3, 1.4 qcomicbook.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200611302350.kAUNoSLN023257@cvs-int.fedora.redhat.com>

Author: muerte

Update of /cvs/extras/rpms/qcomicbook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23236

Modified Files:
	.cvsignore qcomicbook.spec sources 
Log Message:
Testing a new build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Oct 2006 16:29:41 -0000	1.3
+++ .cvsignore	30 Nov 2006 23:49:58 -0000	1.4
@@ -1 +1 @@
-qcomicbook-0.3.3.tar.gz
+qcomicbook-0.3.4.tar.gz


Index: qcomicbook.spec
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/qcomicbook.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qcomicbook.spec	9 Oct 2006 16:43:27 -0000	1.8
+++ qcomicbook.spec	30 Nov 2006 23:49:58 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A viewer for comic book archives
 Name: qcomicbook
-Version: 0.3.3
-Release: 5%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://linux.bydg.org/~yogin
@@ -60,6 +60,9 @@
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
+* Thu Nov 11 2006 Scott Baker  - 0.3.4-1
+- Update to the latest version
+
 * Mon Oct 09 2006 Scott Baker  - 0.3.3-5
 - Build on FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qcomicbook/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Oct 2006 16:29:41 -0000	1.3
+++ sources	30 Nov 2006 23:49:58 -0000	1.4
@@ -1 +1 @@
-a52b768ccca632a820094739e6aaec36  qcomicbook-0.3.3.tar.gz
+f93f29e0635f8fe64f036bf654050438  qcomicbook-0.3.4.tar.gz